diff --git a/.circleci/config.yml b/.circleci/config.yml index 67a3b66b7..711be39d7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,6 +21,7 @@ jobs: # CCACHE_COMPRESS: true # WFLAGS: -Wno-unsuffixed-float-constants # GCC48: true + resource_class: large steps: - run: name: Add i386 arch @@ -32,6 +33,12 @@ jobs: apt-get -qq -y install dirmngr apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0B1702D71499D9C25F986507F240F4449D3B0EC6 echo "deb http://ppa.launchpad.net/stjr/srb2/ubuntu trusty main" >> /etc/apt/sources.list + - run: + name: Make APT cache folder + command: mkdir -p /root/.cache/apt/archives/partial + - run: + name: Make APT cache usage by _apt + command: chown -Rv _apt:root /root/.cache/apt/archives/partial - run: name: Update APT listing command: apt-get -qq update @@ -43,32 +50,37 @@ jobs: - v1-SRB2-APT - run: name: Install SDK - command: apt-get -qq -y --no-install-recommends install git build-essential nasm libpng-dev:i386 libsdl2-mixer-dev:i386 libgme-dev:i386 libcurl4-openssl-dev:i386 libopenmpt-dev:i386 gettext ccache wget gcc-multilib upx openssh-client - + command: apt-get -o Dir::Cache="/root/.cache/apt" -qq -y --no-install-recommends install git build-essential nasm libpng-dev:i386 libsdl2-mixer-dev:i386 libgme-dev:i386 libcurl4-openssl-dev:i386 libopenmpt-dev:i386 gettext ccache wget gcc-multilib upx openssh-client + - run: + name: make md5sum + command: find /root/.cache/apt/archives -type f -print0 | sort -z | xargs -r0 md5sum > /root/.cache/apt_archives.md5 - save_cache: - key: v1-SRB2-APT + key: v1-SRB2-APT-{{ checksum "/root/.cache/apt_archives.md5" }} paths: - - /var/cache/apt/archives + - /root/.cache/apt - checkout - run: name: Compile without network support - command: make -C src LINUX=1 ERRORMODE=1 -k NONET=1 + command: make -C src LINUX=1 ERRORMODE=1 -k NONET=1 -j4 - run: name: wipe build command: make -C src LINUX=1 cleandep - run: name: rebuild depend command: make -C src LINUX=1 clean + - run: + name: make master depend file + command: find make/linux/SDL/deps/ -type f -print0 | sort -z | xargs -r0 cat > make/linux/SDL.deps - restore_cache: keys: - - v1-SRB2-{{ .Branch }}-{{ checksum "objs/Linux/SDL/Release/depend.dep" }} + - v1-SRB2-{{ .Branch }}-{{ checksum "make/linux/SDL.deps" }} - run: name: Compile - command: make -C src LINUX=1 ERRORMODE=1 -k + command: make -C src LINUX=1 ERRORMODE=1 -k -j4 - store_artifacts: - path: /root/SRB2/bin/Linux/Release/ + path: /root/SRB2/bin/ destination: bin - save_cache: - key: v1-SRB2-{{ .Branch }}-{{ checksum "objs/Linux/SDL/Release/depend.dep" }} + key: v1-SRB2-{{ .Branch }}-{{ checksum "make/linux/SDL.deps" }} paths: - /root/.ccache diff --git a/.gitignore b/.gitignore index 3090417dd..cd828dc11 100644 --- a/.gitignore +++ b/.gitignore @@ -13,11 +13,13 @@ Win32_LIB_ASM_Release *.dgb *.debug *.debug.txt -/bin/VC10/ -/objs/VC10/ *.user *.db *.opendb /.vs /debian /assets/debian +/make +/bin +/build +/build.* diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d2d4a7e6..915912af5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,17 +1,15 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.14 FATAL_ERROR) -# Enable CCache early -set(SRB2_USE_CCACHE OFF CACHE BOOL "Use CCache") -if (${SRB2_USE_CCACHE}) - find_program(CCACHE_PROGRAM ccache) - if(CCACHE_PROGRAM) - message(STATUS "Found CCache: ${CCACHE_PROGRAM}") - set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}") - else() - message(WARNING "You have specified to use CCACHE but it was not found. Object files will not be cached.") - endif() +if("${CMAKE_CURRENT_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") + message(FATAL_ERROR "In-source builds are blocked. Please build from a separate directory.") endif() +# Set up CMAKE path +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") + +include(CMakeDependentOption) +include(cmake/CPM.cmake) + file(STRINGS src/version.h SRB2_VERSION) string(REGEX MATCH "[0-9]+\\.[0-9.]+" SRB2_VERSION ${SRB2_VERSION}) @@ -19,7 +17,99 @@ string(REGEX MATCH "[0-9]+\\.[0-9.]+" SRB2_VERSION ${SRB2_VERSION}) # Version change is fine. project(SRB2 VERSION ${SRB2_VERSION} - LANGUAGES C) + LANGUAGES C CXX) + +##### PACKAGE CONFIGURATION ##### + +set(SRB2_CPACK_GENERATOR "" CACHE STRING "Generator to use for making a package. E.g., ZIP, TGZ, DragNDrop (OSX only). Leave blank for default generator.") + +if("${SRB2_CPACK_GENERATOR}" STREQUAL "") + if("${CMAKE_SYSTEM_NAME}" MATCHES "Windows") + set(SRB2_CPACK_GENERATOR "ZIP") + elseif("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") + set(SRB2_CPACK_GENERATOR "TGZ") + elseif("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin") + set(SRB2_CPACK_GENERATOR "TGZ") + endif() +endif() + +set(CPACK_GENERATOR ${SRB2_CPACK_GENERATOR}) +set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Sonic Robo Blast 2" CACHE STRING "Program name for display purposes") +set(CPACK_PACKAGE_VENDOR "Sonic Team Jr." CACHE STRING "Vendor name for display purposes") +#set(CPACK_PACKAGE_DESCRIPTION_FILE ) +set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") +set(CPACK_PACKAGE_VERSION_MAJOR ${SRB2_VERSION_MAJOR}) +set(CPACK_PACKAGE_VERSION_MINOR ${SRB2_VERSION_MINOR}) +set(CPACK_PACKAGE_VERSION_PATCH ${SRB2_VERSION_PATCH}) +set(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${CMAKE_VERSION_MAJOR}.${CMAKE_VERSION_MINOR}") +SET(CPACK_OUTPUT_FILE_PREFIX package) +include(CPack) + +# Options + +if("${CMAKE_SYSTEM_NAME}" MATCHES Linux) + set(SRB2_CONFIG_SYSTEM_LIBRARIES_DEFAULT ON) +else() + set(SRB2_CONFIG_SYSTEM_LIBRARIES_DEFAULT OFF) +endif() + +option( + SRB2_CONFIG_SYSTEM_LIBRARIES + "Link dependencies using CMake's find_package and do not use internal builds" + ${SRB2_CONFIG_SYSTEM_LIBRARIES_DEFAULT} +) +# 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_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) +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.") + +# 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() + CPMAddPackage( + NAME Ccache.cmake + GITHUB_REPOSITORY TheLartians/Ccache.cmake + VERSION 1.2 + ) +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 REQUIRED) + find_package(GME REQUIRED) +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.") @@ -29,53 +119,13 @@ 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() -# Set up CMAKE path -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") - -### Useful functions - -# Prepend sources with current source directory -function(prepend_sources SOURCE_FILES) - foreach(SOURCE_FILE ${${SOURCE_FILES}}) - set(MODIFIED ${MODIFIED} ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE_FILE}) - endforeach() - set(${SOURCE_FILES} ${MODIFIED} PARENT_SCOPE) +# Add sources from Sourcefile +function(target_sourcefile type) + file(STRINGS Sourcefile list + REGEX "[-0-9A-Za-z_]+\.${type}") + target_sources(SRB2SDL2 PRIVATE ${list}) 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} - $/${dllname} - ) - endforeach() - endif() -endmacro() - # bitness check set(SRB2_SYSTEM_BITS 0) if(CMAKE_SIZEOF_VOID_P EQUAL 8) @@ -90,26 +140,6 @@ if(${SRB2_SYSTEM_BITS} EQUAL 0) message(STATUS "Target bitness is unknown") endif() -# OS macros -if (UNIX) - add_definitions(-DUNIXCOMMON) -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_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") @@ -130,29 +160,3 @@ git_current_branch(SRB2_GIT_BRANCH "${CMAKE_SOURCE_DIR}") set(SRB2_COMP_BRANCH "${SRB2_GIT_BRANCH}") set(SRB2_COMP_REVISION "${SRB2_COMP_COMMIT}") configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/src/config.h) - -##### PACKAGE CONFIGURATION ##### - -set(SRB2_CPACK_GENERATOR "" CACHE STRING "Generator to use for making a package. E.g., ZIP, TGZ, DragNDrop (OSX only). Leave blank for default generator.") - -if("${SRB2_CPACK_GENERATOR}" STREQUAL "") - if(${CMAKE_SYSTEM} MATCHES "Windows") - set(SRB2_CPACK_GENERATOR "ZIP") - elseif(${CMAKE_SYSTEM} MATCHES "Linux") - set(SRB2_CPACK_GENERATOR "TGZ") - elseif(${CMAKE_SYSTEM} MATCHES "Darwin") - set(SRB2_CPACK_GENERATOR "TGZ") - endif() -endif() - -set(CPACK_GENERATOR ${SRB2_CPACK_GENERATOR}) -set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Sonic Robo Blast 2" CACHE STRING "Program name for display purposes") -set(CPACK_PACKAGE_VENDOR "Sonic Team Jr." CACHE STRING "Vendor name for display purposes") -#set(CPACK_PACKAGE_DESCRIPTION_FILE ) -set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") -set(CPACK_PACKAGE_VERSION_MAJOR ${SRB2_VERSION_MAJOR}) -set(CPACK_PACKAGE_VERSION_MINOR ${SRB2_VERSION_MINOR}) -set(CPACK_PACKAGE_VERSION_PATCH ${SRB2_VERSION_PATCH}) -set(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${CMAKE_VERSION_MAJOR}.${CMAKE_VERSION_MINOR}") -SET(CPACK_OUTPUT_FILE_PREFIX package) -include(CPack) diff --git a/Makefile b/Makefile new file mode 100644 index 000000000..7ee12d837 --- /dev/null +++ b/Makefile @@ -0,0 +1,8 @@ +ifdef SILENT +MAKEFLAGS+=--no-print-directory +endif + +all : + +% :: + @$(MAKE) -C src $(MAKECMDGOALS) diff --git a/appveyor.yml b/appveyor.yml index e94a709cd..e3348d35c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,16 +1,12 @@ -version: 2.2.9.{branch}-{build} +version: 2.2.11.{branch}-{build} os: MinGW environment: - CC: ccache - CCACHE_CC: i686-w64-mingw32-gcc - CCACHE_CC_64: x86_64-w64-mingw32-gcc + CC: i686-w64-mingw32-gcc WINDRES: windres # c:\mingw-w64 i686 has gcc 6.3.0, so use c:\msys64 7.3.0 instead MINGW_SDK: c:\msys64\mingw32 - # c:\msys64 x86_64 has gcc 8.2.0, so use c:\mingw-w64 7.3.0 instead - MINGW_SDK_64: C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64 - CFLAGS: -Wall -W -Werror -Wno-error=implicit-fallthrough -Wimplicit-fallthrough=3 -Wno-tautological-compare -Wno-error=suggest-attribute=noreturn + CFLAGS: -Wno-implicit-fallthrough NASM_ZIP: nasm-2.12.01 NASM_URL: http://www.nasm.us/pub/nasm/releasebuilds/2.12.01/win64/nasm-2.12.01-win64.zip UPX_ZIP: upx391w @@ -19,8 +15,6 @@ environment: CCACHE_URL: http://alam.srb2.org/ccache.exe CCACHE_COMPRESS: true CCACHE_DIR: C:\Users\appveyor\.ccache - # Disable UPX by default. The user can override this in their Appveyor project settings - NOUPX: 1 ############################## # DEPLOYER VARIABLES # DPL_ENABLED=1 builds installers for branch names starting with `deployer`. @@ -53,11 +47,6 @@ cache: - C:\Users\appveyor\srb2_cache install: -- if [%CONFIGURATION%] == [SDL64] ( set "X86_64=1" ) -- if [%CONFIGURATION%] == [SDL64] ( set "CONFIGURATION=SDL" ) -- if [%X86_64%] == [1] ( set "MINGW_SDK=%MINGW_SDK_64%" ) -- if [%X86_64%] == [1] ( set "CCACHE_CC=%CCACHE_CC_64%" ) - - if not exist "%NASM_ZIP%.zip" appveyor DownloadFile "%NASM_URL%" -FileName "%NASM_ZIP%.zip" - 7z x -y "%NASM_ZIP%.zip" -o%TMP% >null - robocopy /S /xx /ns /nc /nfl /ndl /np /njh /njs "%TMP%\%NASM_ZIP%" "%MINGW_SDK%\bin" nasm.exe || exit 0 @@ -72,43 +61,31 @@ install: configuration: - SDL -- SDL64 before_build: - set "Path=%MINGW_SDK%\bin;%Path%" -- if [%X86_64%] == [1] ( x86_64-w64-mingw32-gcc --version ) else ( i686-w64-mingw32-gcc --version ) - mingw32-make --version -- if not [%X86_64%] == [1] ( nasm -v ) +- nasm -v - if not [%NOUPX%] == [1] ( upx -V ) - ccache -V - ccache -s -- if [%NOUPX%] == [1] ( set "NOUPX=NOUPX=1" ) else ( set "NOUPX=" ) - if defined [%APPVEYOR_PULL_REQUEST_HEAD_COMMIT%] ( set "COMMIT=%APPVEYOR_PULL_REQUEST_HEAD_COMMIT%" ) else ( set "COMMIT=%APPVEYOR_REPO_COMMIT%" ) - cmd: git rev-parse --short %COMMIT%>%TMP%/gitshort.txt - cmd: set /P GITSHORT=<%TMP%/gitshort.txt # for pull requests, take the owner's name only, if this isn't the same repo of course - set "REPO=%APPVEYOR_REPO_BRANCH%" - if not [%APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME%] == [] ( if not [%APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME%] == [%APPVEYOR_REPO_NAME%] ( for /f "delims=/" %%a in ("%APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME%") do set "REPO=%%a-%APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH%" ) ) -- set "EXENAME=EXENAME=srb2win-%REPO%-%GITSHORT%.exe" -- set "SRB2_MFLAGS=-C src WARNINGMODE=1 CCACHE=1 NOOBJDUMP=1 %NOUPX% %EXENAME%" -- if [%X86_64%] == [1] ( set "MINGW_FLAGS=MINGW64=1 X86_64=1 GCC81=1" ) else ( set "MINGW_FLAGS=MINGW=1 GCC91=1" ) -- set "SRB2_MFLAGS=%SRB2_MFLAGS% %MINGW_FLAGS% %CONFIGURATION%=1" +- set "SRB2_MFLAGS=-C src NOECHOFILENAMES=1 CCACHE=1 EXENAME=srb2win-%REPO%-%GITSHORT%.exe" build_script: - cmd: mingw32-make.exe %SRB2_MFLAGS% clean - cmd: mingw32-make.exe %SRB2_MFLAGS% ERRORMODE=1 -k after_build: -- if [%X86_64%] == [1] ( - set "BUILD_PATH=bin\Mingw64\Release" - ) else ( - set "BUILD_PATH=bin\Mingw\Release" - ) -- if [%X86_64%] == [1] ( set "CONFIGURATION=%CONFIGURATION%64" ) - ccache -s - set BUILD_ARCHIVE=%REPO%-%GITSHORT%-%CONFIGURATION%.7z - set BUILDSARCHIVE=%REPO%-%CONFIGURATION%.7z -- cmd: 7z a %BUILD_ARCHIVE% %BUILD_PATH% -xr!.gitignore +- cmd: 7z a %BUILD_ARCHIVE% bin -xr!.gitignore - appveyor PushArtifact %BUILD_ARCHIVE% #- cmd: copy %BUILD_ARCHIVE% %BUILDSARCHIVE% #- appveyor PushArtifact %BUILDSARCHIVE% @@ -139,3 +116,4 @@ test: off on_finish: #- cmd: echo xfreerdp /u:appveyor /cert-ignore +clipboard /v:: #- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) +# vim: et ts=1 diff --git a/assets/CMakeLists.txt b/assets/CMakeLists.txt index 3ea7c28df..dfb2f4180 100644 --- a/assets/CMakeLists.txt +++ b/assets/CMakeLists.txt @@ -1,72 +1,51 @@ ## Assets Target Configuration ## -# For prepending the current source path, later -FUNCTION(PREPEND var prefix) - SET(listVar "") - FOREACH(f ${ARGN}) - LIST(APPEND listVar "${prefix}/${f}") - ENDFOREACH(f) - SET(${var} "${listVar}" PARENT_SCOPE) -ENDFUNCTION(PREPEND) +if(${CMAKE_SYSTEM} MATCHES Linux) + # Asset installation isn't part of the Linux target + return() +endif() -set(SRB2_ASSET_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/installer" - CACHE STRING "Path to directory that contains all asset files for the installer.") +if("${SRB2_CONFIG_ASSET_DIRECTORY}" STREQUAL "") + message(WARNING "SRB2_CONFIG_ASSET_DIRECTORY is not set, so installation will not contain data files.") + return() +endif() -set(SRB2_ASSET_INSTALL ON - CACHE BOOL "Insert asset files into the install directory or package.") +get_filename_component(SRB2_ASSET_DIRECTORY_ABSOLUTE "${SRB2_CONFIG_ASSET_DIRECTORY}" ABSOLUTE) + +set(SRB2_ASSETS_DOCS + "README.txt" + "README-SDL.txt" + "LICENSE.txt" + "LICENSE-3RD-PARTY.txt" +) +list(TRANSFORM SRB2_ASSETS_DOCS PREPEND "/") +list(TRANSFORM SRB2_ASSETS_DOCS PREPEND "${SRB2_ASSET_DIRECTORY_ABSOLUTE}") #################### # POST-V2.2 NOTE: Do not forget to add patch.pk3 to the end of this list! #################### -set(SRB2_ASSET_HASHED -"srb2.pk3;\ -player.dta;\ -zones.pk3;\ -patch.pk3" - CACHE STRING "Asset filenames to apply MD5 checks. No spaces between entries!" +set(SRB2_ASSETS_GAME + "srb2.pk3" + "player.dta" + "zones.pk3" + "patch.pk3" + "music.dta" + "models.dat" ) +list(TRANSFORM SRB2_ASSETS_GAME PREPEND "/") +list(TRANSFORM SRB2_ASSETS_GAME PREPEND "${SRB2_ASSET_DIRECTORY_ABSOLUTE}") -set(SRB2_ASSET_DOCS -"README.txt;\ -LICENSE.txt;\ -LICENSE-3RD-PARTY.txt;\ -README-SDL.txt" - CACHE STRING "Documentation filenames. In OS X, these are packaged separately from other assets. No spaces between entries!" -) - -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() +set(SRB2_ASSETS ${SRB2_ASSET_DOCS} ${SRB2_ASSETS_GAME}) # Installation if(${CMAKE_SYSTEM} MATCHES Darwin) get_target_property(outname SRB2SDL2 OUTPUT_NAME) - if(${SRB2_ASSET_INSTALL}) - install(DIRECTORY "${SRB2_ASSET_DIRECTORY}/" - DESTINATION "${outname}.app/Contents/Resources" - ) - endif() - # Always install the doc files, even in non-asset packages. - install(FILES ${SRB2_ASSET_DOCS} - DESTINATION . - OPTIONAL - ) + install(FILES ${SRB2_ASSETS} DESTINATION "${outname}.app/Contents/Resources") + install(DIRECTORY "${SRB2_ASSET_DIRECTORY_ABSOLUTE}/models" DESTINATION "${outname}.app/Contents/Resources") + install(FILES ${SRB2_ASSETS_DOCS} DESTINATION .) else() - if(${SRB2_ASSET_INSTALL}) - install(DIRECTORY "${SRB2_ASSET_DIRECTORY}/" - DESTINATION . - ) - # Docs are assumed to be located in SRB2_ASSET_DIRECTORY, so don't install them in their own call. - else() - # Always install the doc files, even in non-asset packages. - install(FILES ${SRB2_ASSET_DOCS} - DESTINATION . - OPTIONAL - ) - endif() + install(FILES ${SRB2_ASSETS} DESTINATION .) + install(DIRECTORY "${SRB2_ASSET_DIRECTORY_ABSOLUTE}/models" DESTINATION .) endif() diff --git a/assets/README.txt b/assets/README.txt index 8d2fefa54..e384333ed 100644 --- a/assets/README.txt +++ b/assets/README.txt @@ -1,24 +1,21 @@ SONIC ROBO BLAST 2 -Sonic Robo Blast 2 (SRB2) is a 3D Sonic the Hedgehog fangame based on a -modified version of Doom Legacy. +Sonic Robo Blast 2 (SRB2) is a 3D Sonic the Hedgehog fangame, based on a modified version of Doom Legacy. + +https://www.srb2.org LICENSE -The source code for SRB2 is licensed under the GNU General Public -License, Version 2. See LICENSE.txt for the full text of this license. +The source code for SRB2 is licensed under the GNU General Public License, Version 2. See LICENSE.txt for the full text of this license. -SRB2 uses various third-party libraries, including SDL, SDL Mixer, and -their dependencies. See LICENSE-3RD-PARTY.txt for the licenses of these -libraries. +SRB2 uses various third-party libraries, including SDL, SDL Mixer, and their dependencies. See LICENSE-3RD-PARTY.txt for the licenses of these libraries. SOURCE CODE -You may obtain the source code for SRB2, including the source code for -specific version releases, at the following web sites: +You may obtain the source code for SRB2, including the source code for specific version releases, at the following web sites: STJr GitLab: -https://git.magicalgirl.moe/STJr/SRB2 +https://git.do.srb2.org/STJr/SRB2 GitHub: https://github.com/STJr/SRB2 @@ -27,25 +24,27 @@ CONTACT You may contact Sonic Team Junior via the following web sites: -SRB2.ORG: -https://www.srb2.org - SRB2 Message Board: https://mb.srb2.org SRB2 Official Discord: -https://discord.gg/pYDXzpX (13+) +https://discord.gg/b3BGb8A + +Twitter: +https://twitter.com/SonicTeamJr + +Facebook: +https://facebook.com/SonicRoboBlast2 + COPYRIGHT AND DISCLAIMER -Design and content on SRB2 is copyright 1998-2019 by Sonic Team Junior. -All non-original material on SRB2.ORG is copyrighted by their -respective owners, and no copyright infringement is intended. The owner -of the SRB2.ORG domain is only acting as an ISP, and is therefore not -responsible for any content on SRB2.ORG under the 1998 DMCA. This -site, its webmaster, and its staff make no profit whatsoever (in fact, -we lose money). Sonic Team Junior assumes no responsibility for the -content on any Sonic Team Junior fan sites. +Design and content in Sonic Robo Blast 2 is copyright 1998-2023 by Sonic Team Jr. -Sonic Team Junior is in no way affiliated with SEGA or Sonic Team. We do -not claim ownership of any of SEGA's intellectual property used in SRB2. +All original material in this game is copyrighted by their respective owners, and no copyright infringement is intended. Sonic Team Jr. is in no way affiliated with SEGA or Sonic Team, and we do not claim ownership of any of SEGA's intellectual property used in SRB2. + +Sonic Robo Blast 2 is not commercial software. If you purchased this game, you have been scammed! Sonic Team Jr.'s staff makes no profit whatsoever (in fact, we lose money). + +The owner of the srb2.org domain is only acting as an ISP, and is therefore not responsible for any content on srb2.org under the 1998 DMCA. Sonic Team Jr. assumes no responsibility for the content on any Sonic Team Jr. fan sites. + +This software is provided as-is with no warranty whatsoever. diff --git a/bin/FreeBSD/Debug/.gitignore b/bin/FreeBSD/Debug/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/bin/FreeBSD/Debug/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/bin/FreeBSD/Release/.gitignore b/bin/FreeBSD/Release/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/bin/FreeBSD/Release/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/bin/Linux/Debug/.gitignore b/bin/Linux/Debug/.gitignore deleted file mode 100644 index 56dee6f95..000000000 --- a/bin/Linux/Debug/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lsdlsrb2 diff --git a/bin/Linux/Release/.gitignore b/bin/Linux/Release/.gitignore deleted file mode 100644 index 5b5c54a54..000000000 --- a/bin/Linux/Release/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/lsdlsrb2 -/pnd -/*.mo diff --git a/bin/Linux64/Debug/.gitignore b/bin/Linux64/Debug/.gitignore deleted file mode 100644 index 56dee6f95..000000000 --- a/bin/Linux64/Debug/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lsdlsrb2 diff --git a/bin/Linux64/Release/.gitignore b/bin/Linux64/Release/.gitignore deleted file mode 100644 index 56dee6f95..000000000 --- a/bin/Linux64/Release/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lsdlsrb2 diff --git a/bin/Mingw/Debug/.gitignore b/bin/Mingw/Debug/.gitignore deleted file mode 100644 index 834f313e3..000000000 --- a/bin/Mingw/Debug/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -*.exe -*.mo -r_opengl.dll diff --git a/bin/Mingw/Release/.gitignore b/bin/Mingw/Release/.gitignore deleted file mode 100644 index 3458ff764..000000000 --- a/bin/Mingw/Release/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -*.exe -*.mo -r_opengl.dll -*.bat diff --git a/bin/Mingw64/Debug/.gitignore b/bin/Mingw64/Debug/.gitignore deleted file mode 100644 index e431dca5d..000000000 --- a/bin/Mingw64/Debug/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/srb2sdl.exe -/srb2win.exe -/r_opengl.dll diff --git a/bin/Mingw64/Release/.gitignore b/bin/Mingw64/Release/.gitignore deleted file mode 100644 index e431dca5d..000000000 --- a/bin/Mingw64/Release/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/srb2sdl.exe -/srb2win.exe -/r_opengl.dll diff --git a/bin/SDL/Debug/.gitignore b/bin/SDL/Debug/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/bin/SDL/Debug/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/bin/SDL/Release/.gitignore b/bin/SDL/Release/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/bin/SDL/Release/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/bin/VC/.gitignore b/bin/VC/.gitignore deleted file mode 100644 index e52f825b2..000000000 --- a/bin/VC/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/Release -/Debug diff --git a/bin/VC9/.gitignore b/bin/VC9/.gitignore deleted file mode 100644 index 205fe45de..000000000 --- a/bin/VC9/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/Win32 -/x64 diff --git a/bin/dummy/.gitignore b/bin/dummy/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/bin/dummy/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/cmake/CPM.cmake b/cmake/CPM.cmake new file mode 100644 index 000000000..772103fc3 --- /dev/null +++ b/cmake/CPM.cmake @@ -0,0 +1,21 @@ +set(CPM_DOWNLOAD_VERSION 0.36.0) + +if(CPM_SOURCE_CACHE) + set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake") +elseif(DEFINED ENV{CPM_SOURCE_CACHE}) + set(CPM_DOWNLOAD_LOCATION "$ENV{CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake") +else() + set(CPM_DOWNLOAD_LOCATION "${CMAKE_BINARY_DIR}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake") +endif() + +# Expand relative path. This is important if the provided path contains a tilde (~) +get_filename_component(CPM_DOWNLOAD_LOCATION ${CPM_DOWNLOAD_LOCATION} ABSOLUTE) +if(NOT (EXISTS ${CPM_DOWNLOAD_LOCATION})) + message(STATUS "Downloading CPM.cmake to ${CPM_DOWNLOAD_LOCATION}") + file(DOWNLOAD + https://github.com/cpm-cmake/CPM.cmake/releases/download/v${CPM_DOWNLOAD_VERSION}/CPM.cmake + ${CPM_DOWNLOAD_LOCATION} + ) +endif() + +include(${CPM_DOWNLOAD_LOCATION}) diff --git a/cmake/Modules/FindGME.cmake b/cmake/Modules/FindGME.cmake index ea80af454..3af0a94be 100644 --- a/cmake/Modules/FindGME.cmake +++ b/cmake/Modules/FindGME.cmake @@ -20,4 +20,14 @@ find_library(GME_LIBRARY set(GME_PROCESS_INCLUDES GME_INCLUDE_DIR) set(GME_PROCESS_LIBS GME_LIBRARY) -libfind_process(GME) \ No newline at end of file +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() diff --git a/cmake/Modules/FindOPENMPT.cmake b/cmake/Modules/FindOPENMPT.cmake index 2d334b6f0..7e5b2d5a3 100644 --- a/cmake/Modules/FindOPENMPT.cmake +++ b/cmake/Modules/FindOPENMPT.cmake @@ -20,4 +20,14 @@ find_library(OPENMPT_LIBRARY set(OPENMPT_PROCESS_INCLUDES OPENMPT_INCLUDE_DIR) set(OPENMPT_PROCESS_LIBS OPENMPT_LIBRARY) -libfind_process(OPENMPT) \ No newline at end of file +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() diff --git a/cmake/Modules/FindSDL2.cmake b/cmake/Modules/FindSDL2.cmake index 2fc833cef..2d625f84c 100644 --- a/cmake/Modules/FindSDL2.cmake +++ b/cmake/Modules/FindSDL2.cmake @@ -31,3 +31,13 @@ find_library(SDL2_LIBRARY set(SDL2_PROCESS_INCLUDES SDL2_INCLUDE_DIR) set(SDL2_PROCESS_LIBS SDL2_LIBRARY) 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() diff --git a/cmake/Modules/FindSDL2_mixer.cmake b/cmake/Modules/FindSDL2_mixer.cmake index 9af3e26dd..637498e53 100644 --- a/cmake/Modules/FindSDL2_mixer.cmake +++ b/cmake/Modules/FindSDL2_mixer.cmake @@ -32,3 +32,13 @@ find_library(SDL2_MIXER_LIBRARY set(SDL2_MIXER_PROCESS_INCLUDES SDL2_MIXER_INCLUDE_DIR) set(SDL2_MIXER_PROCESS_LIBS SDL2_MIXER_LIBRARY) 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() diff --git a/cmake/launch-c.in b/cmake/launch-c.in deleted file mode 100644 index c60558232..000000000 --- a/cmake/launch-c.in +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -export CCACHE_CPP2=true -exec "${RULE_LAUNCH_COMPILE}" "${CMAKE_C_COMPILER}" "$@" diff --git a/cmake/launch-cxx.in b/cmake/launch-cxx.in deleted file mode 100644 index c60558232..000000000 --- a/cmake/launch-cxx.in +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -export CCACHE_CPP2=true -exec "${RULE_LAUNCH_COMPILE}" "${CMAKE_C_COMPILER}" "$@" diff --git a/comptime.sh b/comptime.sh index d5ef7271a..ce771f631 100755 --- a/comptime.sh +++ b/comptime.sh @@ -1,54 +1,44 @@ -#!/bin/bash -e +#!/bin/sh path="." if [ x"$1" != x ]; then path="$1" fi -versiongit() { - gitbranch=`git rev-parse --abbrev-ref HEAD` - gitversion=`git rev-parse HEAD` - cat < $path/comptime.h +version() { + cat < "$path/comptime.h" // Do not edit! This file was autogenerated // by the $0 script with git // -const char* compbranch = "$gitbranch"; -const char* comprevision = "${gitversion:0:8}"; +const char* compbranch = "$1"; +const char* comprevision = "$2"; EOF -exit 0 +} + +versiongit() { + gitbranch="$(git rev-parse --abbrev-ref HEAD)" + gitversion="$(git rev-parse HEAD | cut -c -8)" + version "$gitbranch" "$gitversion"; + exit 0 } versionsvn() { - svnrevision=`svnversion -n $1` - cat < $path/comptime.h - -// Do not edit! This file was autogenerated -// by the $0 script with subversion -// -const char* compbranch = "Subversion"; -const char* comprevision = "r$svnrevision"; -EOF -exit 0 + svnrevision="$(svnversion -n "$1")" + version "Subversion" "r$svnrevision"; + exit 0 } versionfake() { - cat < $path/comptime.h - -// Do not edit! This file was autogenerated -// by the $0 script with an unknown or nonexist SCM -// -const char* compbranch = "Unknown"; -const char* comprevision = "illegal"; -EOF + version "Unknown" "illegal"; } compversion() { -touch $path/comptime.c -versionfake -test -d $path/.svn && versionsvn -test -d $path/../.git && versiongit -exit 1 + touch "$path/comptime.c" + versionfake + [ -d "$path/.svn" ] && versionsvn "$@" + [ -d "$path/../.git" ] && versiongit + exit 1 } -test -f $path/comptime.c && compversion +[ -f "$path/comptime.c" ] && compversion "$@" exit 2 diff --git a/debian-template/rules b/debian-template/rules index 0a77624cb..12ceaf98b 100644 --- a/debian-template/rules +++ b/debian-template/rules @@ -78,7 +78,7 @@ NONX86 = $(shell test "`echo $(CROSS_COMPILE_HOST) | grep 'i[3-6]86'`" || echo " MAKEARGS = $(OS) $(NONX86) $(PREFIX) EXENAME=$(EXENAME) DBGNAME=$(DBGNAME) NOOBJDUMP=1 # SDL_PKGCONFIG=sdl2 PNG_PKGCONFIG=libpng MENUFILE1 = ?package($(PACKAGE)):needs="X11" section="$(SECTION)" MENUFILE2 = title="$(TITLE)" command="/$(PKGDIR)/$(PACKAGE)" -BINDIR := $(DIR)/bin/Linux/Release +BINDIR := $(DIR)/bin/ # FIXME pkg-config dir hacks # Launchpad doesn't need this; it actually makes i386 builds fail due to cross-compile diff --git a/dep/.gitignore b/dep/.gitignore deleted file mode 100644 index fb941664f..000000000 --- a/dep/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -#All folders -*.d diff --git a/dep/FreeBSD/SDL/Debug/.gitignore b/dep/FreeBSD/SDL/Debug/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/dep/FreeBSD/SDL/Debug/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/dep/FreeBSD/SDL/Release/.gitignore b/dep/FreeBSD/SDL/Release/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/dep/FreeBSD/SDL/Release/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/dep/Linux/SDL/Debug/.gitignore b/dep/Linux/SDL/Debug/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/dep/Linux/SDL/Debug/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/dep/Linux/SDL/Release/.gitignore b/dep/Linux/SDL/Release/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/dep/Linux/SDL/Release/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/dep/Linux64/SDL/Debug/.gitignore b/dep/Linux64/SDL/Debug/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/dep/Linux64/SDL/Debug/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/dep/Linux64/SDL/Release/.gitignore b/dep/Linux64/SDL/Release/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/dep/Linux64/SDL/Release/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/dep/MasterClient/.gitignore b/dep/MasterClient/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/dep/MasterClient/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/dep/MasterServer/.gitignore b/dep/MasterServer/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/dep/MasterServer/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/dep/Mingw/Debug/.gitignore b/dep/Mingw/Debug/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/dep/Mingw/Debug/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/dep/Mingw/Release/.gitignore b/dep/Mingw/Release/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/dep/Mingw/Release/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/dep/Mingw/SDL/Debug/.gitignore b/dep/Mingw/SDL/Debug/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/dep/Mingw/SDL/Debug/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/dep/Mingw/SDL/Release/.gitignore b/dep/Mingw/SDL/Release/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/dep/Mingw/SDL/Release/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/dep/Mingw64/Debug/.gitignore b/dep/Mingw64/Debug/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/dep/Mingw64/Debug/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/dep/Mingw64/Release/.gitignore b/dep/Mingw64/Release/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/dep/Mingw64/Release/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/dep/Mingw64/SDL/Debug/.gitignore b/dep/Mingw64/SDL/Debug/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/dep/Mingw64/SDL/Debug/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/dep/Mingw64/SDL/Release/.gitignore b/dep/Mingw64/SDL/Release/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/dep/Mingw64/SDL/Release/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/dep/SDL/Release/.gitignore b/dep/SDL/Release/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/dep/SDL/Release/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/dep/VC/.gitignore b/dep/VC/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/dep/VC/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/dep/VC9/.gitignore b/dep/VC9/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/dep/VC9/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/dep/cygwin/Debug/.gitignore b/dep/cygwin/Debug/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/dep/cygwin/Debug/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/dep/cygwin/Release/.gitignore b/dep/cygwin/Release/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/dep/cygwin/Release/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/dep/dummy/.gitignore b/dep/dummy/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/dep/dummy/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/extras/conf/SRB2-22.cfg b/extras/conf/SRB2-22.cfg index 5a464eb5d..dd5cdb46b 100644 --- a/extras/conf/SRB2-22.cfg +++ b/extras/conf/SRB2-22.cfg @@ -41,6 +41,9 @@ linetagindicatesectors = true; // The format interface handles the map data format - DoomMapSetIO for SRB2DB2, SRB2MapSetIO for Zone Builder formatinterface = "SRB2MapSetIO"; + +//Maximum safe map size check (0 means skip check) +safeboundary = 0; //Sky textures for vanilla maps defaultskytextures @@ -77,7 +80,7 @@ defaultskytextures defaultlumpname = "MAP01"; // Default testing parameters -testparameters = "-file \"%AP\" \"%F\" -warp %L"; +testparameters = "-folder \"%AF\" -file \"%AA\" \"%F\" -warp %L"; testshortpaths = true; // Default nodebuilder configurations @@ -425,21 +428,22 @@ sectortypes 12 = "Space Countdown"; 13 = "Ramp Sector (double step-up/down)"; 14 = "Non-Ramp Sector (no step-down)"; - 15 = "Bouncy FOF"; + 15 = "Bouncy FOF "; 16 = "Trigger Line Ex. (Pushable Objects)"; 32 = "Trigger Line Ex. (Anywhere, All Players)"; 48 = "Trigger Line Ex. (Floor Touch, All Players)"; 64 = "Trigger Line Ex. (Anywhere in Sector)"; 80 = "Trigger Line Ex. (Floor Touch)"; - 96 = "Trigger Line Ex. (Emerald Check)"; - 112 = "Trigger Line Ex. (NiGHTS Mare)"; + 96 = "Trigger Line Ex. (Emerald Check) "; + 112 = "Trigger Line Ex. (NiGHTS Mare) "; 128 = "Check for Linedef Executor on FOFs"; 144 = "Egg Capsule"; - 160 = "Special Stage Time/Spheres Parameters"; - 176 = "Custom Global Gravity"; - 512 = "Wind/Current"; - 1024 = "Conveyor Belt"; + 160 = "Special Stage Time/Spheres Parameters "; + 176 = "Custom Global Gravity "; + 512 = "Wind/Current "; + 1024 = "Conveyor Belt "; 1280 = "Speed Pad"; + 1536 = "Flip Gravity on Jump"; 4096 = "Star Post Activator"; 8192 = "Exit/Special Stage Pit/Return Flag"; 12288 = "CTF Red Team Base"; @@ -475,7 +479,7 @@ gen_sectortypes 12 = "Space Countdown"; 13 = "Ramp Sector (double step-up/down)"; 14 = "Non-Ramp Sector (no step-down)"; - 15 = "Bouncy FOF"; + 15 = "Bouncy FOF "; } second @@ -486,20 +490,21 @@ gen_sectortypes 48 = "Trigger Line Ex. (Floor Touch, All Players)"; 64 = "Trigger Line Ex. (Anywhere in Sector)"; 80 = "Trigger Line Ex. (Floor Touch)"; - 96 = "Trigger Line Ex. (Emerald Check)"; - 112 = "Trigger Line Ex. (NiGHTS Mare)"; + 96 = "Trigger Line Ex. (Emerald Check) "; + 112 = "Trigger Line Ex. (NiGHTS Mare) "; 128 = "Check for Linedef Executor on FOFs"; 144 = "Egg Capsule"; - 160 = "Special Stage Time/Spheres Parameters"; - 176 = "Custom Global Gravity"; + 160 = "Special Stage Time/Spheres Parameters "; + 176 = "Custom Global Gravity "; } third { 0 = "Normal"; - 512 = "Wind/Current"; - 1024 = "Conveyor Belt"; + 512 = "Wind/Current "; + 1024 = "Conveyor Belt "; 1280 = "Speed Pad"; + 1536 = "Flip Gravity on Jump"; } fourth @@ -580,6 +585,7 @@ linedeftypes title = "Per-Sector Gravity"; prefix = "(1)"; flags64text = "[6] Flip in reverse gravity"; + flags8192text = "[13] Cancel MF2_OBJECTFLIP"; } 5 @@ -642,35 +648,35 @@ linedeftypes 96 { - title = "Apply Tag to Tagged Sectors"; + title = "Add Front Sector Tag to Tagged Sectors"; prefix = "(96)"; flags1024text = "[10] Offsets are target tags"; - flags8192text = "[13] Use front side offsets"; - flags32768text = "[15] Use back side offsets"; + flags8192text = "[13] Add front side offsets"; + flags32768text = "[15] Add back side offsets"; } 97 { - title = "Apply Tag to Front Sector"; + title = "Add Tag to Front Sector"; prefix = "(97)"; - flags8192text = "[13] Use front side offsets"; - flags32768text = "[15] Use back side offsets"; + flags8192text = "[13] Add front side offsets"; + flags32768text = "[15] Add back side offsets"; } 98 { - title = "Apply Tag to Back Sector"; + title = "Add Tag to Back Sector"; prefix = "(98)"; - flags8192text = "[13] Use front side offsets"; - flags32768text = "[15] Use back side offsets"; + flags8192text = "[13] Add front side offsets"; + flags32768text = "[15] Add back side offsets"; } 99 { - title = "Apply Tag to Front and Back Sectors"; + title = "Add Tag to Front and Back Sectors"; prefix = "(99)"; - flags8192text = "[13] Use front side offsets"; - flags32768text = "[15] Use back side offsets"; + flags8192text = "[13] Add front side offsets"; + flags32768text = "[15] Add back side offsets"; } 540 @@ -771,6 +777,12 @@ linedeftypes flags2text = "[1] Use control sector tag"; flags64text = "[6] No sound effect"; } + + 76 + { + title = "Make FOF Bouncy"; + prefix = "(76)"; + } } polyobject @@ -985,6 +997,7 @@ linedeftypes flags128text = "[7] Only block non-players"; 3dfloor = true; 3dfloorflags = "47"; + invisiblefof = true; } 140 @@ -1091,6 +1104,7 @@ linedeftypes { title = "Water, Opaque"; prefix = "(120)"; + flags2text = "[1] Make lava intangible"; flags8text = "[3] Slope skew sides"; flags64text = "[6] Use two light levels"; flags512text = "[9] Use target light level"; @@ -1106,6 +1120,7 @@ linedeftypes { title = "Water, Translucent"; prefix = "(121)"; + flags2text = "[1] Make lava intangible"; flags8text = "[3] Slope skew sides"; flags64text = "[6] Use two light levels"; flags512text = "[9] Use target light level"; @@ -1122,6 +1137,7 @@ linedeftypes { title = "Water, Opaque, No Sides"; prefix = "(122)"; + flags2text = "[1] Make lava intangible"; flags64text = "[6] Use two light levels"; flags512text = "[9] Use target light level"; flags1024text = "[10] Ripple effect"; @@ -1136,6 +1152,7 @@ linedeftypes { title = "Water, Translucent, No Sides"; prefix = "(123)"; + flags2text = "[1] Make lava intangible"; flags64text = "[6] Use two light levels"; flags512text = "[9] Use target light level"; flags1024text = "[10] Ripple effect"; @@ -1151,6 +1168,7 @@ linedeftypes { title = "Goo Water, Translucent"; prefix = "(124)"; + flags2text = "[1] Make lava intangible"; flags8text = "[3] Slope skew sides"; flags64text = "[6] Use two light levels"; flags512text = "[9] Use target light level"; @@ -1167,6 +1185,7 @@ linedeftypes { title = "Goo Water, Translucent, No Sides"; prefix = "(125)"; + flags2text = "[1] Make lava intangible"; flags64text = "[6] Use two light levels"; flags512text = "[9] Use target light level"; flags1024text = "[10] Ripple effect"; @@ -1216,6 +1235,7 @@ linedeftypes prefix = "(223)"; 3dfloor = true; 3dfloorflags = "41"; + invisiblefof = true; } } @@ -1273,7 +1293,7 @@ linedeftypes 160 { - title = "Floating, Bobbing"; + title = "Water Bobbing"; prefix = "(160)"; flags8text = "[3] Slope skew sides"; flags32text = "[5] Only block player"; @@ -1513,6 +1533,7 @@ linedeftypes prefix = "(200)"; 3dfloor = true; 3dfloorflags = "20201"; + invisiblefof = true; } 201 @@ -1521,6 +1542,7 @@ linedeftypes prefix = "(201)"; 3dfloor = true; 3dfloorflags = "201"; + invisiblefof = true; } 202 @@ -1528,7 +1550,8 @@ linedeftypes title = "Fog Block"; prefix = "(202)"; 3dfloor = true; - 3dfloorflags = "3EF19"; + 3dfloorflags = "3EF01"; + invisiblefof = true; } 250 @@ -1669,12 +1692,14 @@ linedeftypes { title = "Continuous"; prefix = "(300)"; + flags1024text = "[10] Use faster, unordered execution"; } 301 { title = "Each Time"; prefix = "(301)"; + flags1024text = "[10] Use faster, unordered execution"; flags16384text = "[14] Also trigger on exit"; } @@ -1682,6 +1707,7 @@ linedeftypes { title = "Once"; prefix = "(302)"; + flags1024text = "[10] Use faster, unordered execution"; } 303 @@ -1691,6 +1717,7 @@ linedeftypes flags2text = "[1] Rings greater or equal"; flags64text = "[6] Rings less or equal"; flags512text = "[9] Consider all players"; + flags1024text = "[10] Use faster, unordered execution"; } 304 @@ -1700,18 +1727,21 @@ linedeftypes flags2text = "[1] Rings greater or equal"; flags64text = "[6] Rings less or equal"; flags512text = "[9] Consider all players"; + flags1024text = "[10] Use faster, unordered execution"; } 305 { title = "Character Ability - Continuous"; prefix = "(305)"; + flags1024text = "[10] Use faster, unordered execution"; } 306 { title = "Character Ability - Each Time"; prefix = "(306)"; + flags1024text = "[10] Use faster, unordered execution"; flags16384text = "[14] Also trigger on exit"; } @@ -1719,24 +1749,28 @@ linedeftypes { title = "Character Ability - Once"; prefix = "(307)"; + flags1024text = "[10] Use faster, unordered execution"; } 308 { title = "Race Only - Once"; prefix = "(308)"; + flags1024text = "[10] Use faster, unordered execution"; } 309 { title = "CTF Red Team - Continuous"; prefix = "(309)"; + flags1024text = "[10] Use faster, unordered execution"; } 310 { title = "CTF Red Team - Each Time"; prefix = "(310)"; + flags1024text = "[10] Use faster, unordered execution"; flags16384text = "[14] Also trigger on exit"; } @@ -1744,12 +1778,14 @@ linedeftypes { title = "CTF Blue Team - Continuous"; prefix = "(311)"; + flags1024text = "[10] Use faster, unordered execution"; } 312 { title = "CTF Blue Team - Each Time"; prefix = "(312)"; + flags1024text = "[10] Use faster, unordered execution"; flags16384text = "[14] Also trigger on exit"; } @@ -1757,6 +1793,7 @@ linedeftypes { title = "No More Enemies - Once"; prefix = "(313)"; + flags1024text = "[10] Use faster, unordered execution"; } 314 @@ -1765,6 +1802,7 @@ linedeftypes prefix = "(314)"; flags64text = "[6] Number greater or equal"; flags512text = "[9] Number less"; + flags1024text = "[10] Use faster, unordered execution"; } 315 @@ -1773,30 +1811,35 @@ linedeftypes prefix = "(315)"; flags64text = "[6] Number greater or equal"; flags512text = "[9] Number less"; + flags1024text = "[10] Use faster, unordered execution"; } 317 { title = "Condition Set Trigger - Continuous"; prefix = "(317)"; + flags1024text = "[10] Use faster, unordered execution"; } 318 { title = "Condition Set Trigger - Once"; prefix = "(318)"; + flags1024text = "[10] Use faster, unordered execution"; } 319 { title = "Unlockable - Continuous"; prefix = "(319)"; + flags1024text = "[10] Use faster, unordered execution"; } 320 { title = "Unlockable - Once"; prefix = "(320)"; + flags1024text = "[10] Use faster, unordered execution"; } 321 @@ -1804,6 +1847,7 @@ linedeftypes title = "Trigger After X Calls - Continuous"; prefix = "(321)"; flags64text = "[6] Trigger more than once"; + flags1024text = "[10] Use faster, unordered execution"; } @@ -1812,6 +1856,7 @@ linedeftypes title = "Trigger After X Calls - Each Time"; prefix = "(322)"; flags64text = "[6] Trigger more than once"; + flags1024text = "[10] Use faster, unordered execution"; } 323 @@ -1826,6 +1871,7 @@ linedeftypes flags128text = "[7] Lap >= Front Y Offset"; flags256text = "[8] Count laps from Bonus Time"; flags512text = "[9] Count from triggering player"; + flags1024text = "[10] Use faster, unordered execution"; flags16384text = "[14] Run if no more mares"; flags32768text = "[15] Run if player is not NiGHTS"; } @@ -1833,6 +1879,7 @@ linedeftypes 324 { title = "NiGHTSerize - Once"; + prefix = "(324)"; flags2text = "[1] Mare >= Front X Offset"; flags8text = "[3] Run only if player is NiGHTS"; flags16text = "[4] Count from lowest of players"; @@ -1841,14 +1888,15 @@ linedeftypes flags128text = "[7] Lap >= Front Y Offset"; flags256text = "[8] Count laps from Bonus Time"; flags512text = "[9] Count from triggering player"; + flags1024text = "[10] Use faster, unordered execution"; flags16384text = "[14] Run if no more mares"; flags32768text = "[15] Run if player is not NiGHTS"; - prefix = "(324)"; } 325 { title = "De-NiGHTSerize - Each Time"; + prefix = "(325)"; flags2text = "[1] Mare >= Front X Offset"; flags8text = "[3] Run if anyone is NiGHTS"; flags16text = "[4] Count from lowest of players"; @@ -1857,13 +1905,14 @@ linedeftypes flags128text = "[7] Lap >= Front Y Offset"; flags256text = "[8] Count laps from Bonus Time"; flags512text = "[9] Count from triggering player"; + flags1024text = "[10] Use faster, unordered execution"; flags32768text = "[15] Run if no one is NiGHTS"; - prefix = "(325)"; } 326 { title = "De-NiGHTSerize - Once"; + prefix = "(326)"; flags2text = "[1] Mare >= Front X Offset"; flags8text = "[3] Run if anyone is NiGHTS"; flags16text = "[4] Count from lowest of players"; @@ -1872,13 +1921,14 @@ linedeftypes flags128text = "[7] Lap >= Front Y Offset"; flags256text = "[8] Count laps from Bonus Time"; flags512text = "[9] Count from triggering player"; + flags1024text = "[10] Use faster, unordered execution"; flags32768text = "[15] Run if no one is NiGHTS"; - prefix = "(326)"; } 327 { title = "NiGHTS Lap - Each Time"; + prefix = "(327)"; flags2text = "[1] Mare >= Front X Offset"; flags16text = "[4] Count from lowest of players"; flags32text = "[5] Lap <= Front Y Offset"; @@ -1886,12 +1936,13 @@ linedeftypes flags128text = "[7] Lap >= Front Y Offset"; flags256text = "[8] Count laps from Bonus Time"; flags512text = "[9] Count from triggering player"; - prefix = "(327)"; + flags1024text = "[10] Use faster, unordered execution"; } 328 { title = "NiGHTS Lap - Once"; + prefix = "(328)"; flags2text = "[1] Mare >= Front X Offset"; flags16text = "[4] Count from lowest of players"; flags32text = "[5] Lap <= Front Y Offset"; @@ -1899,12 +1950,13 @@ linedeftypes flags128text = "[7] Lap >= Front Y Offset"; flags256text = "[8] Count laps from Bonus Time"; flags512text = "[9] Count from triggering player"; - prefix = "(328)"; + flags1024text = "[10] Use faster, unordered execution"; } 329 { title = "Ideya Capture Touch - Each Time"; + prefix = "(329)"; flags2text = "[1] Mare >= Front X Offset"; flags8text = "[3] Run regardless of spheres"; flags16text = "[4] Count from lowest of players"; @@ -1913,14 +1965,15 @@ linedeftypes flags128text = "[7] Lap >= Front Y Offset"; flags256text = "[8] Count laps from Bonus Time"; flags512text = "[9] Count from triggering player"; + flags1024text = "[10] Use faster, unordered execution"; flags16384text = "[14] Only if not enough spheres"; flags32768text = "[15] Run when entering Capture"; - prefix = "(329)"; } 330 { title = "Ideya Capture Touch - Once"; + prefix = "(330)"; flags2text = "[1] Mare >= Front X Offset"; flags8text = "[3] Run regardless of spheres"; flags16text = "[4] Count from lowest of players"; @@ -1929,57 +1982,130 @@ linedeftypes flags128text = "[7] Lap >= Front Y Offset"; flags256text = "[8] Count laps from Bonus Time"; flags512text = "[9] Count from triggering player"; + flags1024text = "[10] Use faster, unordered execution"; flags16384text = "[14] Only if not enough spheres"; flags32768text = "[15] Run when entering Capture"; - prefix = "(330)"; } 331 { title = "Player Skin - Continuous"; - flags64text = "[6] Disable for this skin"; prefix = "(331)"; + flags64text = "[6] Disable for this skin"; + flags1024text = "[10] Use faster, unordered execution"; } 332 { title = "Player Skin - Each Time"; - flags64text = "[6] Disable for this skin"; prefix = "(332)"; + flags64text = "[6] Disable for this skin"; + flags1024text = "[10] Use faster, unordered execution"; } 333 { title = "Player Skin - Once"; - flags64text = "[6] Disable for this skin"; prefix = "(333)"; + flags64text = "[6] Disable for this skin"; + flags1024text = "[10] Use faster, unordered execution"; } 334 { title = "Object Dye - Continuous"; - flags64text = "[6] Disable for this color"; prefix = "(334)"; + flags64text = "[6] Disable for this color"; + flags1024text = "[10] Use faster, unordered execution"; } 335 { title = "Object Dye - Each Time"; - flags64text = "[6] Disable for this color"; prefix = "(335)"; + flags64text = "[6] Disable for this color"; + flags1024text = "[10] Use faster, unordered execution"; } 336 { title = "Object Dye - Once"; - flags64text = "[6] Disable for this color"; prefix = "(336)"; + flags64text = "[6] Disable for this color"; + flags1024text = "[10] Use faster, unordered execution"; + } + + 337 + { + title = "Emerald Check - Continuous"; + prefix = "(337)"; + } + + 338 + { + title = "Emerald Check - Each Time"; + prefix = "(338)"; + } + + 339 + { + title = "Emerald Check - Once"; + prefix = "(339)"; + } + + 340 + { + title = "NiGHTS Mare - Continuous"; + flags2text = "[1] Mare greater or equal"; + flags64text = "[6] Mare less or equal"; + prefix = "(340)"; + } + + 341 + { + title = "NiGHTS Mare - Each Time"; + flags2text = "[1] Mare greater or equal"; + flags64text = "[6] Mare less or equal"; + prefix = "(341)"; + } + + 342 + { + title = "NiGHTS Mare - Once"; + flags2text = "[1] Mare greater or equal"; + flags64text = "[6] Mare less or equal"; + prefix = "(342)"; + } + + 343 + { + title = "Gravity Check - Continuous"; + flags2text = "[1] Check temporary reverse gravity"; + flags64text = "[6] Check for reverse gravity"; + prefix = "(343)"; + } + + 344 + { + title = "Gravity Check - Each Time"; + flags2text = "[1] Check temporary reverse gravity"; + flags64text = "[6] Check for reverse gravity"; + prefix = "(344)"; + } + + 345 + { + title = "Gravity Check - Once"; + flags2text = "[1] Check temporary reverse gravity"; + flags64text = "[6] Check for reverse gravity"; + prefix = "(345)"; } 399 { title = "Level Load"; prefix = "(399)"; + flags1024text = "[10] Use faster, unordered execution"; } } @@ -1992,7 +2118,7 @@ linedeftypes title = "Set Tagged Sector's Floor Height/Texture"; prefix = "(400)"; flags8text = "[3] Set delay by backside sector"; - flags64text = "[6] Keep floor flat"; + flags64text = "[6] Don't change floor texture"; } 401 @@ -2000,27 +2126,40 @@ linedeftypes title = "Set Tagged Sector's Ceiling Height/Texture"; prefix = "(401)"; flags8text = "[3] Set delay by backside sector"; + flags64text = "[6] Don't change ceiling texture"; } 402 { - title = "Set Tagged Sector's Light Level"; + title = "Copy Light Level to Tagged Sectors"; prefix = "(402)"; flags8text = "[3] Set delay by backside sector"; } + 408 + { + title = "Set Tagged Sector's Flats"; + prefix = "(408)"; + flags64text = "[6] Don't set floor flat"; + flags512text = "[9] Don't set ceiling flat"; + } + 409 { title = "Change Tagged Sector's Tag"; prefix = "(409)"; + flags2text = "[1] Remove tag"; flags8text = "[3] Set delay by backside sector"; + flags64text = "[6] Add tag"; } 410 { title = "Change Front Sector's Tag"; prefix = "(410)"; + flags2text = "[1] Remove tag"; flags8text = "[3] Set delay by backside sector"; + flags64text = "[6] Add tag"; } 416 @@ -2078,6 +2217,14 @@ linedeftypes prefix = "(435)"; flags8text = "[3] Set delay by backside sector"; } + + 467 + { + title = "Set Tagged Sector's Light Level"; + prefix = "(467)"; + flags8text = "[3] Set delay by backside sector"; + flags256text = "[8] Set relative to current"; + } } linedefexecplane @@ -2090,7 +2237,7 @@ linedeftypes prefix = "(403)"; flags2text = "[1] Trigger linedef executor"; flags8text = "[3] Set delay by backside sector"; - flags64text = "[6] Change floor flat"; + flags64text = "[6] Change floor texture"; } 404 @@ -2099,7 +2246,7 @@ linedeftypes prefix = "(404)"; flags2text = "[1] Trigger linedef executor"; flags8text = "[3] Set delay by backside sector"; - flags64text = "[6] Change ceiling flat"; + flags64text = "[6] Change ceiling texture"; } 405 @@ -2206,7 +2353,9 @@ linedeftypes { title = "Enable/Disable Gravity Flip"; prefix = "(433)"; + flags2text = "[1] Force MFE_VERTICALFLIP"; flags8text = "[3] Set delay by backside sector"; + flags32text = "[5] Invert current gravity"; flags64text = "[6] Return to normal"; } @@ -2373,6 +2522,7 @@ linedeftypes prefix = "(439)"; flags8text = "[3] Set delay by backside sector"; flags64text = "[6] Only existing"; + flags8192text = "[13] Use backside textures"; } 440 @@ -2661,7 +2811,7 @@ linedeftypes 502 { - title = "Scroll Tagged Wall"; + title = "Scroll Tagged Walls"; prefix = "(502)"; flags128text = "[7] Use texture offsets"; flags256text = "[8] Scroll back side"; @@ -2669,7 +2819,7 @@ linedeftypes 503 { - title = "Scroll Tagged Wall (Accelerative)"; + title = "Scroll Tagged Walls (Accelerative)"; prefix = "(503)"; flags128text = "[7] Use texture offsets"; flags256text = "[8] Scroll back side"; @@ -2677,7 +2827,7 @@ linedeftypes 504 { - title = "Scroll Tagged Wall (Displacement)"; + title = "Scroll Tagged Walls (Displacement)"; prefix = "(504)"; flags128text = "[7] Use texture offsets"; flags256text = "[8] Scroll back side"; @@ -2716,36 +2866,63 @@ linedeftypes { title = "Scroll Floor Texture"; prefix = "(510)"; + flags8192text = "[13] Use angle and X offset"; } 511 { title = "Scroll Floor Texture (Accelerative)"; prefix = "(511)"; + flags8192text = "[13] Use angle and X offset"; } 512 { title = "Scroll Floor Texture (Displacement)"; prefix = "(512)"; + flags8192text = "[13] Use angle and X offset"; } 513 { title = "Scroll Ceiling Texture"; prefix = "(513)"; + flags8192text = "[13] Use angle and X offset"; } 514 { title = "Scroll Ceiling Texture (Accelerative)"; prefix = "(514)"; + flags8192text = "[13] Use angle and X offset"; } 515 { title = "Scroll Ceiling Texture (Displacement)"; prefix = "(515)"; + flags8192text = "[13] Use angle and X offset"; + } + + 516 + { + title = "Scroll Floor and Ceiling Texture"; + prefix = "(516)"; + flags8192text = "[13] Use angle and X offset"; + } + + 517 + { + title = "Scroll Floor and Ceiling Texture (Accelerative)"; + prefix = "(517)"; + flags8192text = "[13] Use angle and X offset"; + } + + 518 + { + title = "Scroll Floor and Ceiling Texture (Displacement)"; + prefix = "(518)"; + flags8192text = "[13] Use angle and X offset"; } 520 @@ -2753,6 +2930,7 @@ linedeftypes title = "Carry Objects on Floor"; prefix = "(520)"; flags64text = "[6] Exclusive"; + flags8192text = "[13] Use angle and X offset"; } 521 @@ -2760,6 +2938,7 @@ linedeftypes title = "Carry Objects on Floor (Accelerative)"; prefix = "(521)"; flags64text = "[6] Exclusive"; + flags8192text = "[13] Use angle and X offset"; } 522 @@ -2767,6 +2946,7 @@ linedeftypes title = "Carry Objects on Floor (Displacement)"; prefix = "(522)"; flags64text = "[6] Exclusive"; + flags8192text = "[13] Use angle and X offset"; } 523 @@ -2774,6 +2954,7 @@ linedeftypes title = "Carry Objects on Ceiling"; prefix = "(523)"; flags64text = "[6] Exclusive"; + flags8192text = "[13] Use angle and X offset"; } 524 @@ -2781,6 +2962,7 @@ linedeftypes title = "Carry Objects on Ceiling (Accelerative)"; prefix = "(524)"; flags64text = "[6] Exclusive"; + flags8192text = "[13] Use angle and X offset"; } 525 @@ -2788,6 +2970,31 @@ linedeftypes title = "Carry Objects on Ceiling (Displacement)"; prefix = "(525)"; flags64text = "[6] Exclusive"; + flags8192text = "[13] Use angle and X offset"; + } + + 526 + { + title = "Carry Objects on Floor and Ceiling"; + prefix = "(526)"; + flags64text = "[6] Exclusive"; + flags8192text = "[13] Use angle and X offset"; + } + + 527 + { + title = "Carry Objects on Floor and Ceiling (Accelerative)"; + prefix = "(527)"; + flags64text = "[6] Exclusive"; + flags8192text = "[13] Use angle and X offset"; + } + + 528 + { + title = "Carry Objects on Floor and Ceiling (Displacement)"; + prefix = "(528)"; + flags64text = "[6] Exclusive"; + flags8192text = "[13] Use angle and X offset"; } 530 @@ -2795,6 +3002,7 @@ linedeftypes title = "Scroll Floor Texture and Carry Objects"; prefix = "(530)"; flags64text = "[6] Exclusive"; + flags8192text = "[13] Use angle and X offset"; } 531 @@ -2802,6 +3010,7 @@ linedeftypes title = "Scroll Floor Texture and Carry Objects (Accelerative)"; prefix = "(531)"; flags64text = "[6] Exclusive"; + flags8192text = "[13] Use angle and X offset"; } 532 @@ -2809,6 +3018,7 @@ linedeftypes title = "Scroll Floor Texture and Carry Objects (Displacement)"; prefix = "(532)"; flags64text = "[6] Exclusive"; + flags8192text = "[13] Use angle and X offset"; } 533 @@ -2816,6 +3026,7 @@ linedeftypes title = "Scroll Ceiling Texture and Carry Objects"; prefix = "(533)"; flags64text = "[6] Exclusive"; + flags8192text = "[13] Use angle and X offset"; } 534 @@ -2823,6 +3034,7 @@ linedeftypes title = "Scroll Ceiling Texture and Carry Objects (Accelerative)"; prefix = "(534)"; flags64text = "[6] Exclusive"; + flags8192text = "[13] Use angle and X offset"; } 535 @@ -2830,6 +3042,31 @@ linedeftypes title = "Scroll Ceiling Texture and Carry Objects (Displacement)"; prefix = "(535)"; flags64text = "[6] Exclusive"; + flags8192text = "[13] Use angle and X offset"; + } + + 536 + { + title = "Scroll Floor and Ceiling Texture and Carry Objects"; + prefix = "(536)"; + flags64text = "[6] Exclusive"; + flags8192text = "[13] Use angle and X offset"; + } + + 537 + { + title = "Scroll Floor and Ceiling Texture and Carry Objects (Accelerative)"; + prefix = "(537)"; + flags64text = "[6] Exclusive"; + flags8192text = "[13] Use angle and X offset"; + } + + 538 + { + title = "Scroll Floor and Ceiling Texture and Carry Objects (Displacement)"; + prefix = "(538)"; + flags64text = "[6] Exclusive"; + flags8192text = "[13] Use angle and X offset"; } } @@ -2841,48 +3078,54 @@ linedeftypes { title = "Wind"; prefix = "(541)"; - flags512text = "[9] Player slides"; flags64text = "[6] Exclusive"; + flags512text = "[9] Player slides"; + flags8192text = "[13] Use angle and X offset"; } 542 { title = "Upwards Wind"; prefix = "(542)"; - flags512text = "[9] Player slides"; flags64text = "[6] Exclusive"; + flags512text = "[9] Player slides"; + flags8192text = "[13] Use X offset"; } 543 { title = "Downwards Wind"; prefix = "(543)"; - flags512text = "[9] Player slides"; flags64text = "[6] Exclusive"; + flags512text = "[9] Player slides"; + flags8192text = "[13] Use X offset"; } 544 { title = "Current"; prefix = "(544)"; - flags512text = "[9] Player slides"; flags64text = "[6] Exclusive"; + flags512text = "[9] Player slides"; + flags8192text = "[13] Use angle and X offset"; } 545 { title = "Upwards Current"; prefix = "(545)"; - flags512text = "[9] Player slides"; flags64text = "[6] Exclusive"; + flags512text = "[9] Player slides"; + flags8192text = "[13] Use X offset"; } 546 { title = "Downwards Current"; prefix = "(546)"; - flags512text = "[9] Player slides"; flags64text = "[6] Exclusive"; + flags512text = "[9] Player slides"; + flags8192text = "[13] Use X offset"; } 547 @@ -2890,6 +3133,7 @@ linedeftypes title = "Push/Pull"; prefix = "(547)"; flags64text = "[6] Exclusive"; + flags8192text = "[13] Use X offset"; } } @@ -2950,8 +3194,10 @@ linedeftypes prefix = "(700)"; flags2048text = "[11] No physics"; flags4096text = "[12] Dynamic"; + flags32768text = "[15] Copy to other side"; slope = "regular"; slopeargs = 1; + copyslopeargs = 1; } 701 @@ -2960,8 +3206,10 @@ linedeftypes prefix = "(701)"; flags2048text = "[11] No physics"; flags4096text = "[12] Dynamic"; + flags32768text = "[15] Copy to other side"; slope = "regular"; slopeargs = 2; + copyslopeargs = 4; } 702 @@ -2970,8 +3218,10 @@ linedeftypes prefix = "(702)"; flags2048text = "[11] No physics"; flags4096text = "[12] Dynamic"; + flags32768text = "[15] Copy to other side"; slope = "regular"; slopeargs = 3; + copyslopeargs = 5; } 703 @@ -2980,8 +3230,10 @@ linedeftypes prefix = "(703)"; flags2048text = "[11] No physics"; flags4096text = "[12] Dynamic"; + flags32768text = "[15] Copy to other side"; slope = "regular"; slopeargs = 9; + copyslopeargs = 8; } 704 @@ -3012,8 +3264,10 @@ linedeftypes prefix = "(710)"; flags2048text = "[11] No physics"; flags4096text = "[12] Dynamic"; + flags32768text = "[15] Copy to other side"; slope = "regular"; slopeargs = 4; + copyslopeargs = 2; } 711 @@ -3022,8 +3276,10 @@ linedeftypes prefix = "(711)"; flags2048text = "[11] No physics"; flags4096text = "[12] Dynamic"; + flags32768text = "[15] Copy to other side"; slope = "regular"; slopeargs = 8; + copyslopeargs = 8; } 712 @@ -3032,8 +3288,10 @@ linedeftypes prefix = "(712)"; flags2048text = "[11] No physics"; flags4096text = "[12] Dynamic"; + flags32768text = "[15] Copy to other side"; slope = "regular"; slopeargs = 12; + copyslopeargs = 10; } 713 @@ -3042,8 +3300,10 @@ linedeftypes prefix = "(713)"; flags2048text = "[11] No physics"; flags4096text = "[12] Dynamic"; + flags32768text = "[15] Copy to other side"; slope = "regular"; slopeargs = 6; + copyslopeargs = 6; } 714 @@ -3095,7 +3355,7 @@ linedeftypes 723 { title = "Copy Backside Floor Slope from Line Tag"; - prefix = "(720)"; + prefix = "(723)"; slope = "copy"; slopeargs = 4; } @@ -3103,7 +3363,7 @@ linedeftypes 724 { title = "Copy Backside Ceiling Slope from Line Tag"; - prefix = "(721)"; + prefix = "(724)"; slope = "copy"; slopeargs = 8; } @@ -3111,7 +3371,7 @@ linedeftypes 725 { title = "Copy Backside Floor and Ceiling Slope from Line Tag"; - prefix = "(722)"; + prefix = "(725)"; slope = "copy"; slopeargs = 12; } @@ -3168,12 +3428,13 @@ linedeftypes { title = "Set Tagged Dynamic Slope Vertex to Front Sector Height"; prefix = "(799)"; + flags64text = "[6] Use relative heights"; } } transwall { - title = "Translucent Wall"; + title = "Translucent Walls"; 900 { @@ -3234,6 +3495,192 @@ linedeftypes title = "Fog Wall"; prefix = "(909)"; } + + 910 + { + title = "100% Additive"; + prefix = "(910)"; + } + + 911 + { + title = "90% Additive"; + prefix = "(911)"; + } + + 912 + { + title = "80% Additive"; + prefix = "(912)"; + } + + 913 + { + title = "70% Additive"; + prefix = "(913)"; + } + + 914 + { + title = "60% Additive"; + prefix = "(914)"; + } + + 915 + { + title = "50% Additive"; + prefix = "(915)"; + } + + 916 + { + title = "40% Additive"; + prefix = "(916)"; + } + + 917 + { + title = "30% Additive"; + prefix = "(917)"; + } + + 918 + { + title = "20% Additive"; + prefix = "(918)"; + } + + 919 + { + title = "10% Additive"; + prefix = "(919)"; + } + + 920 + { + title = "100% Subtractive"; + prefix = "(920)"; + } + + 921 + { + title = "90% Subtractive"; + prefix = "(921)"; + } + + 922 + { + title = "80% Subtractive"; + prefix = "(922)"; + } + + 923 + { + title = "70% Subtractive"; + prefix = "(923)"; + } + + 924 + { + title = "60% Subtractive"; + prefix = "(924)"; + } + + 925 + { + title = "50% Subtractive"; + prefix = "(925)"; + } + + 926 + { + title = "40% Subtractive"; + prefix = "(926)"; + } + + 927 + { + title = "30% Subtractive"; + prefix = "(927)"; + } + + 928 + { + title = "20% Subtractive"; + prefix = "(928)"; + } + + 929 + { + title = "10% Subtractive"; + prefix = "(929)"; + } + + 930 + { + title = "100% Reverse Subtractive"; + prefix = "(930)"; + } + + 931 + { + title = "90% Reverse Subtractive"; + prefix = "(931)"; + } + + 932 + { + title = "80% Reverse Subtractive"; + prefix = "(932)"; + } + + 933 + { + title = "70% Reverse Subtractive"; + prefix = "(933)"; + } + + 934 + { + title = "60% Reverse Subtractive"; + prefix = "(934)"; + } + + 935 + { + title = "50% Reverse Subtractive"; + prefix = "(935)"; + } + + 936 + { + title = "40% Reverse Subtractive"; + prefix = "(936)"; + } + + 937 + { + title = "30% Reverse Subtractive"; + prefix = "(937)"; + } + + 938 + { + title = "20% Reverse Subtractive"; + prefix = "(938)"; + } + + 939 + { + title = "10% Reverse Subtractive"; + prefix = "(939)"; + } + + 940 + { + title = "Modulate"; + prefix = "(940)"; + } } } @@ -3283,7 +3730,7 @@ thingtypes 3328 = "3D Mode Start"; } - + starts { color = 1; // Blue @@ -3473,7 +3920,7 @@ thingtypes enemies { - color = 9; // Light_Blue + color = 9; // Light Blue arrow = 1; title = "Enemies"; @@ -3589,6 +4036,7 @@ thingtypes sprite = "ARCHA1"; width = 24; height = 32; + flags8text = "[8] Don't jump away"; } 118 { @@ -3762,6 +4210,7 @@ thingtypes sprite = "BUMBA1"; width = 16; height = 32; + flags8text = "[8] Cannot move"; } 124 { @@ -3781,7 +4230,7 @@ thingtypes bosses { - color = 8; // Dark_Gray + color = 4; // Dark Red arrow = 1; title = "Bosses"; @@ -3789,17 +4238,16 @@ thingtypes { title = "Egg Mobile"; sprite = "EGGMA1"; - width = 24; - height = 76; + width = 36; + height = 84; flags4text = "[4] End level on death"; - flags8text = "[8] Alternate laser attack"; } 201 { title = "Egg Slimer"; sprite = "EGGNA1"; - width = 24; - height = 76; + width = 36; + height = 84; flags4text = "[4] End level on death"; flags8text = "[8] Speed up when hit"; } @@ -3807,7 +4255,7 @@ thingtypes { title = "Sea Egg"; sprite = "EGGOA1"; - width = 32; + width = 36; height = 116; flags4text = "[4] End level on death"; } @@ -3815,8 +4263,8 @@ thingtypes { title = "Egg Colosseum"; sprite = "EGGPA1"; - width = 24; - height = 76; + width = 36; + height = 84; flags4text = "[4] End level on death"; } 204 @@ -3827,6 +4275,7 @@ thingtypes height = 60; flags1text = "[1] Grayscale mode"; flags4text = "[4] End level on death"; + flags8text = "[8] Skip intro"; } 206 { @@ -3880,6 +4329,7 @@ thingtypes sprite = "internal:capsule"; angletext = "Tag"; fixedrotation = 1; + tagthing = true; } 292 { @@ -3967,13 +4417,13 @@ thingtypes 308 { title = "CTF Team Ring (Red)"; - sprite = "internal:TRNGA0r"; + sprite = "internal:TRNGA0R"; width = 16; } 309 { title = "CTF Team Ring (Blue)"; - sprite = "internal:TRNGA0b"; + sprite = "internal:TRNGA0B"; width = 16; } 330 @@ -4010,7 +4460,7 @@ thingtypes collectibles { - color = 10; // Light_Green + color = 10; // Light Green title = "Other Collectibles"; width = 16; height = 32; @@ -4114,6 +4564,7 @@ thingtypes flags8text = "[8] Random (Weak)"; angletext = "Tag"; fixedrotation = 1; + tagthing = true; 400 { @@ -4246,6 +4697,7 @@ thingtypes flags1text = "[1] Run linedef executor on pop"; angletext = "Tag"; fixedrotation = 1; + tagthing = true; 431 { @@ -4316,7 +4768,7 @@ thingtypes generic { - color = 11; // Light_Cyan + color = 11; // Light Cyan title = "Generic Items & Hazards"; 500 @@ -4422,7 +4874,7 @@ thingtypes springs { - color = 12; // Light_Red + color = 12; // Light Red title = "Springs and Fans"; width = 20; height = 16; @@ -4584,13 +5036,13 @@ thingtypes { arrow = 0; title = "5 Vertical Rings (Yellow Spring)"; - sprite = "RINGA0"; + sprite = "internal:ringverticalyellow"; } 601 { arrow = 0; title = "5 Vertical Rings (Red Spring)"; - sprite = "RINGA0"; + sprite = "internal:ringverticalred"; height = 1024; } 602 @@ -4608,7 +5060,7 @@ thingtypes 604 { title = "Circle of Rings"; - sprite = "RINGA0"; + sprite = "internal:circlering"; width = 96; height = 192; unflippable = true; @@ -4617,7 +5069,7 @@ thingtypes 605 { title = "Circle of Rings (Big)"; - sprite = "RINGA0"; + sprite = "internal:circlebigring"; width = 192; unflippable = true; centerHitbox = true; @@ -4625,7 +5077,7 @@ thingtypes 606 { title = "Circle of Blue Spheres"; - sprite = "SPHRA0"; + sprite = "internal:circlesphere"; width = 96; height = 192; unflippable = true; @@ -4634,7 +5086,7 @@ thingtypes 607 { title = "Circle of Blue Spheres (Big)"; - sprite = "SPHRA0"; + sprite = "internal:circlebigsphere"; width = 192; unflippable = true; centerHitbox = true; @@ -4642,7 +5094,7 @@ thingtypes 608 { title = "Circle of Rings and Spheres"; - sprite = "SPHRA0"; + sprite = "internal:circleringsphere"; width = 96; height = 192; unflippable = true; @@ -4651,13 +5103,77 @@ thingtypes 609 { title = "Circle of Rings and Spheres (Big)"; - sprite = "SPHRA0"; + sprite = "internal:circlebigringsphere"; width = 192; unflippable = true; centerHitbox = true; } } + ambience + { + color = 8; // Dark Gray + title = "Ambience"; + width = 8; + height = 16; + sprite = "internal:ambiance"; + + 700 + { + title = "Water Ambience A (Large)"; + } + + 701 + { + title = "Water Ambience B (Large)"; + } + + 702 + { + title = "Water Ambience C (Medium)"; + } + + 703 + { + title = "Water Ambience D (Medium)"; + } + + 704 + { + title = "Water Ambience E (Small)"; + } + + 705 + { + title = "Water Ambience F (Small)"; + } + + 706 + { + title = "Water Ambience G (Extra Large)"; + } + + 707 + { + title = "Water Ambience H (Extra Large)"; + } + + 708 + { + title = "Disco Ambience"; + } + + 709 + { + title = "Volcano Ambience"; + } + + 710 + { + title = "Machine Ambience"; + } + } + invisible { color = 15; // White @@ -4666,72 +5182,6 @@ thingtypes height = 16; sprite = "UNKNA0"; - 700 - { - title = "Water Ambience A (Large)"; - sprite = "internal:ambiance"; - } - - 701 - { - title = "Water Ambience B (Large)"; - sprite = "internal:ambiance"; - } - - 702 - { - title = "Water Ambience C (Medium)"; - sprite = "internal:ambiance"; - } - - 703 - { - title = "Water Ambience D (Medium)"; - sprite = "internal:ambiance"; - } - - 704 - { - title = "Water Ambience E (Small)"; - sprite = "internal:ambiance"; - } - - 705 - { - title = "Water Ambience F (Small)"; - sprite = "internal:ambiance"; - } - - 706 - { - title = "Water Ambience G (Extra Large)"; - sprite = "internal:ambiance"; - } - - 707 - { - title = "Water Ambience H (Extra Large)"; - sprite = "internal:ambiance"; - } - - 708 - { - title = "Disco Ambience"; - sprite = "internal:ambiance"; - } - - 709 - { - title = "Volcano Ambience"; - sprite = "internal:ambiance"; - } - - 710 - { - title = "Machine Ambience"; - sprite = "internal:ambiance"; - } - 750 { title = "Slope Vertex"; @@ -4740,6 +5190,7 @@ thingtypes fixedrotation = 1; parametertext = "Absolute?"; flagsvaluetext = "Absolute Z"; + tagthing = true; } 751 @@ -4785,20 +5236,22 @@ thingtypes 756 { title = "Blast Linedef Executor"; - sprite = "TOADA0"; + sprite = "internal:blastexec"; width = 32; height = 16; angletext = "Tag"; fixedrotation = 1; + tagthing = true; } 757 { title = "Fan Particle Generator"; - sprite = "PRTLA0"; + sprite = "internal:fanparticles"; width = 8; height = 16; angletext = "Tag"; fixedrotation = 1; + tagthing = true; } 758 { @@ -4811,6 +5264,8 @@ thingtypes sprite = "internal:polyanchor"; angletext = "Tag"; fixedrotation = 1; + tagthing = true; + unflippable = true; } 761 @@ -4819,6 +5274,8 @@ thingtypes sprite = "internal:polycenter"; angletext = "Tag"; fixedrotation = 1; + tagthing = true; + unflippable = true; } 762 @@ -4827,6 +5284,8 @@ thingtypes sprite = "internal:polycentercrush"; angletext = "Tag"; fixedrotation = 1; + tagthing = true; + unflippable = true; } 780 { @@ -4840,7 +5299,7 @@ thingtypes greenflower { - color = 10; // Green + color = 2; // Green title = "Greenflower"; 800 @@ -4945,7 +5404,7 @@ thingtypes technohill { - color = 10; // Green + color = 2; // Green title = "Techno Hill"; 900 @@ -4989,7 +5448,7 @@ thingtypes deepsea { - color = 10; // Green + color = 2; // Green title = "Deep Sea"; 1000 @@ -5028,7 +5487,7 @@ thingtypes width = 8; height = 16; hangs = 1; - angletext = "Dripping interval"; + angletext = "Dripping delay"; fixedrotation = 1; } 1003 @@ -5124,7 +5583,7 @@ thingtypes castleeggman { - color = 10; // Green + color = 2; // Green title = "Castle Eggman"; 1100 @@ -5173,6 +5632,7 @@ thingtypes angletext = "Tag"; parametertext = "Spokes"; fixedrotation = 1; + tagthing = true; } 1105 { @@ -5185,6 +5645,7 @@ thingtypes angletext = "Tag"; parametertext = "Spokes"; fixedrotation = 1; + tagthing = true; } 1106 { @@ -5197,23 +5658,25 @@ thingtypes angletext = "Tag"; parametertext = "Spokes"; fixedrotation = 1; + tagthing = true; } 1107 { title = "Chain Spawnpoint"; - sprite = "BMCHA0"; + sprite = "BMCHB0"; width = 17; height = 34; flags8text = "[8] Double size"; angletext = "Tag"; parametertext = "Spokes"; fixedrotation = 1; + tagthing = true; } 1108 { arrow = 1; title = "Hidden Chain Spawnpoint"; - sprite = "internal:chain3"; + sprite = "SMCHA0"; width = 17; height = 34; flags8text = "[8] Double size"; @@ -5229,6 +5692,7 @@ thingtypes angletext = "Tag"; parametertext = "Spokes"; fixedrotation = 1; + tagthing = true; } 1110 { @@ -5240,6 +5704,7 @@ thingtypes angletext = "Tag"; parametertext = "Spokes"; fixedrotation = 1; + tagthing = true; } 1111 { @@ -5370,6 +5835,8 @@ thingtypes width = 20; height = 72; arrow = 1; + flags4text = "[4] Move right"; + flags8text = "[8] Move left"; } 1128 { @@ -5391,7 +5858,7 @@ thingtypes aridcanyon { - color = 10; // Green + color = 2; // Green title = "Arid Canyon"; 1200 @@ -5419,6 +5886,7 @@ thingtypes height = 16; angletext = "Tag"; fixedrotation = 1; + tagthing = true; } 1203 { @@ -5522,6 +5990,7 @@ thingtypes width = 24; height = 63; arrow = 1; + flags8text = "[8] Not pushable"; } 1217 { @@ -5609,7 +6078,7 @@ thingtypes redvolcano { - color = 10; // Green + color = 2; // Green title = "Red Volcano"; 1300 @@ -5657,6 +6126,7 @@ thingtypes height = 32; angletext = "Initial delay"; fixedrotation = 1; + hangs = 1; flags8text = "[8] Double size"; } 1305 @@ -5708,7 +6178,7 @@ thingtypes botanicserenity { - color = 10; // Green + color = 2; // Green title = "Botanic Serenity"; width = 16; height = 32; @@ -5951,7 +6421,7 @@ thingtypes azuretemple { - color = 10; // Green + color = 2; // Green title = "Azure Temple"; 1500 @@ -6027,7 +6497,7 @@ thingtypes dreamhill { - color = 10; // Green + color = 2; // Green title = "Dream Hill"; 1600 @@ -6046,17 +6516,17 @@ thingtypes } 1602 { - title = "Pian"; - sprite = "NTPNALAR"; + title = "Nightopian"; + sprite = "NTPNA1"; width = 16; - height = 32; + height = 40; } } nightstrk { - color = 13; // Pink - title = "NiGHTS Track"; + color = 16; // Light Pink + title = "NiGHTS Track & Basics"; width = 8; height = 4096; sprite = "UNKNA0"; @@ -6091,6 +6561,19 @@ thingtypes flagsvaluetext = "Order"; parametertext = "Mare"; } + 1703 + { + title = "Ideya Drone"; + sprite = "NDRNA1"; + width = 16; + height = 56; + flags1text = "[1] Align player to middle"; + flags4text = "[4] Align player to top"; + flags8text = "[8] Die upon time up"; + angletext = "Time limit"; + fixedrotation = 1; + parametertext = "Height"; + } 1710 { title = "Ideya Capture"; @@ -6108,20 +6591,6 @@ thingtypes title = "NiGHTS Items"; width = 16; height = 32; - - 1703 - { - title = "Ideya Drone"; - sprite = "NDRNA1"; - width = 16; - height = 56; - flags1text = "[1] Align player to middle"; - flags4text = "[4] Align player to top"; - flags8text = "[8] Die upon time up"; - angletext = "Time limit"; - fixedrotation = 1; - parametertext = "Height"; - } 1704 { arrow = 1; @@ -6132,20 +6601,19 @@ thingtypes unflippable = true; flagsvaluetext = "Pitch"; angletext = "Yaw"; - fixedrotation = 1; } 1705 { arrow = 1; title = "Hoop (Generic)"; - sprite = "HOOPA0"; + sprite = "internal:nightshoop"; width = 80; height = 160; unflippable = true; centerHitbox = true; flagsvaluetext = "Height"; angletext = "Pitch/Yaw"; - fixedrotation = 1; + parametertext = "Degrees?"; } 1706 { @@ -6155,7 +6623,6 @@ thingtypes height = 24; flags8height = 24; flags8text = "[8] Float"; - unflippable = true; } 1707 { @@ -6200,11 +6667,13 @@ thingtypes flags2text = "[2] Radius +32"; flags4text = "[4] Radius +64"; flags8text = "[8] Radius +128"; - sprite = "HOOPA0"; + sprite = "internal:nightshoop"; width = 80; height = 160; unflippable = true; centerHitbox = true; + angletext = "Pitch/Yaw"; + parametertext = "Degrees?"; } 1714 { @@ -6308,7 +6777,7 @@ thingtypes christmasdisco { - color = 10; // Green + color = 2; // Green title = "Christmas & Disco"; 1850 @@ -6411,7 +6880,7 @@ thingtypes stalagmites { - color = 10; // Green + color = 2; // Green title = "Stalagmites"; width = 16; height = 40; @@ -6490,7 +6959,7 @@ thingtypes hauntedheights { - color = 10; // Green + color = 2; // Green title = "Haunted Heights"; 2000 @@ -6579,7 +7048,7 @@ thingtypes frozenhillside { - color = 10; // Green + color = 2; // Green title = "Frozen Hillside"; 2100 @@ -6628,9 +7097,24 @@ thingtypes } } + tutorial + { + color = 2; // Green + title = "Tutorial"; + + 799 + { + title = "Tutorial Plant"; + sprite = "TUPFH0"; + width = 40; + height = 144; + parametertext = "Start frame"; + } + } + flickies { - color = 10; // Green + color = 3; // Teal title = "Flickies"; width = 8; height = 20; diff --git a/extras/conf/udb/Includes/SRB222_common.cfg b/extras/conf/udb/Includes/SRB222_common.cfg index d67835aeb..9a574d6f2 100644 --- a/extras/conf/udb/Includes/SRB222_common.cfg +++ b/extras/conf/udb/Includes/SRB222_common.cfg @@ -15,7 +15,7 @@ common ignoredextensions = "wad pk3 pk7 bak backup1 backup2 backup3 zip rar 7z"; // Default testing parameters - testparameters = "-file \"%AP\" \"%F\" -warp %L"; + testparameters = "-folder \"%AF\" -file \"%AA\" \"%F\" -warp %L"; testshortpaths = true; // Action special help @@ -26,7 +26,7 @@ common generalizedsectors = true; // Maximum safe map size check (0 means skip check) - safeboundary = 1; + safeboundary = 0; // Map boundaries. Map objects can only be placed within these boundaries leftboundary = -32768; @@ -40,6 +40,8 @@ common defaultflatscale = 1.0f; scaledtextureoffsets = true; + maxcolormapalpha = 25; + // Thing number for start position in 3D Mode start3dmode = 3328; @@ -68,131 +70,6 @@ common } } -mapformat_doom -{ - // The format interface handles the map data format - formatinterface = "DoomMapSetIO"; - - // Default nodebuilder configurations - defaultsavecompiler = "zennode_normal"; - defaulttestcompiler = "zennode_fast"; - - /* - GAME DETECT PATTERN - Used to guess the game for which a WAD file is made. - - 1 = One of these lumps must exist - 2 = None of these lumps must exist - 3 = All of these lumps must exist - */ - - gamedetect - { - EXTENDED = 2; - - - BEHAVIOR = 2; - - E#M# = 2; - - MAP?? = 1; - } - - /* - MAP LUMP NAMES - Map lumps are loaded with the map as long as they are right after each other. When the editor - meets a lump which is not defined in this list it will ignore the map if not satisfied. - The order of items defines the order in which lumps will be written to WAD file on save. - To indicate the map header lump, use ~MAP - - Legenda: - required = Lump is required to exist. - blindcopy = Lump will be copied along with the map blindly. (usefull for lumps Doom Builder doesn't use) - nodebuild = The nodebuilder generates this lump. - allowempty = The nodebuilder is allowed to leave this lump empty. - script = This lump is a text-based script. Specify the filename of the script configuration to use. - */ - - maplumpnames - { - include("SRB222_misc.cfg", "doommaplumpnames"); - } - - // When this is set to true, sectors with the same tag will light up when a line is highlighted - linetagindicatesectors = true; - - // Special linedefs - include("SRB222_misc.cfg", "speciallinedefs"); - - // Default flags for first new thing - defaultthingflags - { - } - - // DEFAULT SECTOR BRIGHTNESS LEVELS - sectorbrightness - { - include("SRB222_misc.cfg", "sectorbrightness"); - } - - // SECTOR TYPES - sectortypes - { - include("SRB222_sectors.cfg", "sectortypes"); - } - - // GENERALISED SECTOR TYPES - gen_sectortypes - { - include("SRB222_sectors.cfg", "gen_sectortypes"); - } - - // LINEDEF FLAGS - linedefflags - { - include("SRB222_misc.cfg", "linedefflags"); - } - - // Linedef flags UDMF translation table - // This is needed for copy/paste and prefabs to work properly - // When the UDMF field name is prefixed with ! it is inverted - linedefflagstranslation - { - include("SRB222_misc.cfg", "linedefflagstranslation"); - } - - // LINEDEF ACTIVATIONS - linedefactivations - { - } - - // LINEDEF TYPES - linedeftypes - { - include("SRB222_linedefs.cfg", "doom"); - } - - // THING FLAGS - thingflags - { - include("SRB222_misc.cfg", "thingflags"); - } - - // Thing flags UDMF translation table - // This is needed for copy/paste and prefabs to work properly - // When the UDMF field name is prefixed with ! it is inverted - thingflagstranslation - { - include("SRB222_misc.cfg", "thingflagstranslation"); - } - - // THING FLAGS ERROR MASK - // Mask for the thing flags which indicates the options - // that make the same thing appear in the same modes - thingflagsmask1 = 7; // 1 + 2 + 4 - thingflagsmask2 = 0; -} - mapformat_udmf { // The format interface handles the map data format @@ -216,9 +93,17 @@ mapformat_udmf { include("SRB222_misc.cfg", "universalfields"); } + + // Disable Doom-related modes that don't make sense for SRB2 + soundsupport = false; + automapsupport = false; // When this is set to true, sectors with the same tag will light up when a line is highlighted linetagindicatesectors = false; + localsidedeftextureoffsets = false; + distinctfloorandceilingbrightness = true; + + planeequationsupport = true; // Special linedefs include("SRB222_misc.cfg", "speciallinedefs_udmf"); @@ -234,23 +119,19 @@ mapformat_udmf include("SRB222_misc.cfg", "sectorflags"); } + sectorflagscategories + { + include("SRB222_misc.cfg", "sectorflagscategories"); + } + // DEFAULT SECTOR BRIGHTNESS LEVELS sectorbrightness { include("SRB222_misc.cfg", "sectorbrightness"); } - // SECTOR TYPES - sectortypes - { - include("SRB222_sectors.cfg", "sectortypes"); - } - - // GENERALISED SECTOR TYPES - gen_sectortypes - { - include("SRB222_sectors.cfg", "gen_sectortypes"); - } + damagetypes = "Generic Water Fire Lava Electric Spike DeathPitTilt DeathPitNoTilt Instakill SpecialStage"; + triggerertypes = "Player AllPlayers Mobj"; // LINEDEF FLAGS linedefflags @@ -264,10 +145,10 @@ mapformat_udmf } // LINEDEF RENDERSTYLES - /*linedefrenderstyles + linedefrenderstyles { include("SRB222_misc.cfg", "linedefrenderstyles"); - }*/ + } // THING FLAGS thingflags @@ -286,7 +167,12 @@ mapformat_udmf // How to compare thing flags (for the stuck things error checker) thingflagscompare { - include("UDMF_misc.cfg", "thingflagscompare"); + } + + // THING TYPES + thingtypes + { + include("SRB222_things.cfg", "udmf"); } // LINEDEF TYPES diff --git a/extras/conf/udb/Includes/SRB222_linedefs.cfg b/extras/conf/udb/Includes/SRB222_linedefs.cfg index 1f87c2c3a..621b4abd5 100644 --- a/extras/conf/udb/Includes/SRB222_linedefs.cfg +++ b/extras/conf/udb/Includes/SRB222_linedefs.cfg @@ -1,4 +1,4 @@ -doom +udmf { misc { @@ -9,60 +9,67 @@ doom title = "None"; prefix = "(0)"; } - 1 - { - title = "Per-Sector Gravity"; - prefix = "(1)"; - } - 5 - { - title = "Camera Scanner"; - prefix = "(5)"; - } + 7 { title = "Sector Flat Alignment"; prefix = "(7)"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Affected planes"; + type = 11; + enum = "floorceiling"; + default = 2; + } } + 10 { title = "Culling Plane"; prefix = "(10)"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Culling behavior"; + type = 11; + enum + { + 0 = "Always"; + 1 = "Only while in sector"; + } + } } - 13 - { - title = "Heat Wave Effect"; - prefix = "(13)"; - } + 40 { title = "Visual Portal Between Tagged Linedefs"; prefix = "(40)"; } + 41 { title = "Horizon Effect"; prefix = "(41)"; } - 50 - { - title = "Instantly Lower Floor on Level Load"; - prefix = "(50)"; - } - 51 - { - title = "Instantly Raise Ceiling on Level Load"; - prefix = "(51)"; - } + 63 { title = "Fake Floor/Ceiling Planes"; prefix = "(63)"; - } - 540 - { - title = "Floor Friction"; - prefix = "(540)"; + arg0 + { + title = "Target sector tag"; + type = 13; + } } } @@ -74,1445 +81,175 @@ doom { title = "Custom Exit"; prefix = "(2)"; + arg0 + { + title = "Next map"; + } + arg1 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Skip score tally"; + 2 = "Check emeralds"; + } + } + arg2 + { + title = "Next map (all emeralds)"; + } } + 3 { title = "Zoom Tube Parameters"; prefix = "(3)"; + arg0 + { + title = "Speed"; + } + arg1 + { + title = "Sequence"; + } + arg2 + { + title = "Check player direction?"; + type = 11; + enum = "yesno"; + } } + 4 { title = "Speed Pad Parameters"; prefix = "(4)"; + arg0 + { + title = "Speed"; + } + arg1 + { + title = "Flags"; + type = 12; + enum + { + 1 = "No teleport to center"; + 2 = "Force spinning frames"; + } + } + stringarg0 + { + title = "Sound"; + type = 2; + } } + 8 { - title = "Special Sector Properties"; + title = "Set Camera Collision Planes"; prefix = "(8)"; + arg0 + { + title = "Target sector tag"; + type = 13; + } } - 9 - { - title = "Chain Parameters"; - prefix = "(9)"; - } + 11 { title = "Rope Hang Parameters"; prefix = "(11)"; + arg0 + { + title = "Speed"; + } + arg1 + { + title = "Sequence"; + } + arg2 + { + title = "Loop?"; + type = 11; + enum = "yesno"; + } } - 12 - { - title = "Rock Spawner Parameters"; - prefix = "(12)"; - } + 14 { title = "Bustable Block Parameters"; prefix = "(14)"; + arg0 + { + title = "Debris spacing"; + } + arg1 + { + title = "Debris lifetime"; + } + arg2 + { + title = "Launch from center?"; + type = 11; + enum = "noyes"; + } + stringarg0 + { + title = "Debris object type"; + type = 2; + } } + 15 { - title = "Fan Particle Spawner Parameters"; + title = "Fan Particle Generator Heights"; prefix = "(15)"; } + 16 { title = "Minecart Parameters"; prefix = "(16)"; + arg0 + { + title = "Order"; + } } + 64 { title = "Continuously Appearing/Disappearing FOF"; prefix = "(64)"; - } - 65 - { - title = "Bridge Thinker "; - prefix = "(65)"; - } - } - - polyobject - { - title = "PolyObject"; - - 20 - { - title = "First Line"; - prefix = "(20)"; - } - 21 - { - title = "Explicitly Include Line "; - prefix = "(21)"; - } - 22 - { - title = "Parameters"; - prefix = "(22)"; - } - 30 - { - title = "Waving Flag"; - prefix = "(30)"; - } - 31 - { - title = "Displacement by Front Sector"; - prefix = "(31)"; - } - 32 - { - title = "Angular Displacement by Front Sector"; - prefix = "(32)"; - } - } - - planemove - { - title = "Plane Movement"; - - 52 - { - title = "Continuously Falling Sector"; - prefix = "(52)"; - } - 53 - { - title = "Continuous Floor/Ceiling Mover"; - prefix = "(53)"; - } - 54 - { - title = "Continuous Floor Mover"; - prefix = "(54)"; - } - 55 - { - title = "Continuous Ceiling Mover"; - prefix = "(55)"; - } - 56 - { - title = "Continuous Two-Speed Floor/Ceiling Mover"; - prefix = "(56)"; - } - 57 - { - title = "Continuous Two-Speed Floor Mover"; - prefix = "(57)"; - } - 58 - { - title = "Continuous Two-Speed Ceiling Mover"; - prefix = "(58)"; - } - 59 - { - title = "Activate Moving Platform"; - prefix = "(59)"; - } - 60 - { - title = "Activate Moving Platform (Adjustable Speed)"; - prefix = "(60)"; - } - 61 - { - title = "Crusher (Ceiling to Floor)"; - prefix = "(61)"; - } - 62 - { - title = "Crusher (Floor to Ceiling)"; - prefix = "(62)"; - } - 66 - { - title = "Move Floor by Displacement"; - prefix = "(66)"; - } - 67 - { - title = "Move Ceiling by Displacement"; - prefix = "(67)"; - } - 68 - { - title = "Move Floor and Ceiling by Displacement"; - prefix = "(68)"; - } - } - - fofsolid - { - title = "FOF (solid)"; - - 100 - { - title = "Solid, Opaque"; - prefix = "(100)"; - } - 101 - { - title = "Solid, Opaque, No Shadow"; - prefix = "(101)"; - } - 102 - { - title = "Solid, Translucent"; - prefix = "(102)"; - } - 103 - { - title = "Solid, Sides Only"; - prefix = "(103)"; - } - 104 - { - title = "Solid, No Sides"; - prefix = "(104)"; - } - 105 - { - title = "Solid, Invisible"; - prefix = "(105)"; - } - 140 - { - title = "Intangible from Bottom, Opaque"; - prefix = "(140)"; - } - 141 - { - title = "Intangible from Bottom, Translucent"; - prefix = "(141)"; - } - 142 - { - title = "Intangible from Bottom, Translucent, No Sides"; - prefix = "(142)"; - } - 143 - { - title = "Intangible from Top, Opaque"; - prefix = "(143)"; - } - 144 - { - title = "Intangible from Top, Translucent"; - prefix = "(144)"; - } - 145 - { - title = "Intangible from Top, Translucent, No Sides"; - prefix = "(145)"; - } - 146 - { - title = "Only Tangible from Sides"; - prefix = "(146)"; - } - } - - fofintangible - { - title = "FOF (intangible)"; - - 120 - { - title = "Water, Opaque"; - prefix = "(120)"; - } - 121 - { - title = "Water, Translucent"; - prefix = "(121)"; - } - 122 - { - title = "Water, Opaque, No Sides"; - prefix = "(122)"; - } - 123 - { - title = "Water, Translucent, No Sides"; - prefix = "(123)"; - } - 124 - { - title = "Goo Water, Translucent"; - prefix = "(124)"; - } - 125 - { - title = "Goo Water, Translucent, No Sides"; - prefix = "(125)"; - } - 220 - { - title = "Intangible, Opaque"; - prefix = "(220)"; - } - 221 - { - title = "Intangible, Translucent"; - prefix = "(221)"; - } - 222 - { - title = "Intangible, Sides Only"; - prefix = "(222)"; - } - 223 - { - title = "Intangible, Invisible"; - prefix = "(223)"; - } - } - - fofmoving - { - title = "FOF (moving)"; - - 150 - { - title = "Air Bobbing"; - prefix = "(150)"; - } - 151 - { - title = "Air Bobbing (Adjustable)"; - prefix = "(151)"; - } - 152 - { - title = "Reverse Air Bobbing (Adjustable)"; - prefix = "(152)"; - } - 153 - { - title = "Dynamically Sinking Platform"; - prefix = "(153)"; - } - 160 - { - title = "Floating, Bobbing"; - prefix = "(160)"; - } - 190 - { - title = "Rising Platform, Solid, Opaque"; - prefix = "(190)"; - } - 191 - { - title = "Rising Platform, Solid, Opaque, No Shadow"; - prefix = "(191)"; - } - 192 - { - title = "Rising Platform, Solid, Translucent"; - prefix = "(192)"; - } - 193 - { - title = "Rising Platform, Solid, Invisible"; - prefix = "(193)"; - } - 194 - { - title = "Rising Platform, Intangible from Bottom, Opaque"; - prefix = "(194)"; - } - 195 - { - title = "Rising Platform, Intangible from Bottom, Translucent"; - prefix = "(195)"; - } - } - - fofcrumbling - { - title = "FOF (crumbling)"; - - 170 - { - title = "Crumbling, Respawn"; - prefix = "(170)"; - } - 171 - { - title = "Crumbling, No Respawn"; - prefix = "(171)"; - } - 172 - { - title = "Crumbling, Respawn, Intangible from Bottom"; - prefix = "(172)"; - } - 173 - { - title = "Crumbling, No Respawn, Intangible from Bottom"; - prefix = "(173)"; - } - 174 - { - title = "Crumbling, Respawn, Int. from Bottom, Translucent"; - prefix = "(174)"; - } - 175 - { - title = "Crumbling, No Respawn, Int. from Bottom, Translucent"; - prefix = "(175)"; - } - 176 - { - title = "Crumbling, Respawn, Floating, Bobbing"; - prefix = "(176)"; - } - 177 - { - title = "Crumbling, No Respawn, Floating, Bobbing"; - prefix = "(177)"; - } - 178 - { - title = "Crumbling, Respawn, Floating"; - prefix = "(178)"; - } - 179 - { - title = "Crumbling, No Respawn, Floating"; - prefix = "(179)"; - } - 180 - { - title = "Crumbling, Respawn, Air Bobbing"; - prefix = "(180)"; - } - } - - fofspecial - { - title = "FOF (special)"; - - 200 - { - title = "Light Block"; - prefix = "(200)"; - } - 201 - { - title = "Half Light Block"; - prefix = "(201)"; - } - 202 - { - title = "Fog Block"; - prefix = "(202)"; - } - 250 - { - title = "Mario Block"; - prefix = "(250)"; - } - 251 - { - title = "Thwomp Block"; - prefix = "(251)"; - } - 252 - { - title = "Shatter Block"; - prefix = "(252)"; - } - 253 - { - title = "Shatter Block, Translucent"; - prefix = "(253)"; - } - 254 - { - title = "Bustable Block"; - prefix = "(254)"; - } - 255 - { - title = "Spin-Bustable Block"; - prefix = "(255)"; - } - 256 - { - title = "Spin-Bustable Block, Translucent"; - prefix = "(256)"; - } - 257 - { - title = "Quicksand"; - prefix = "(257)"; - } - 258 - { - title = "Laser"; - prefix = "(258)"; - } - 259 - { - title = "Custom FOF"; - prefix = "(259)"; - } - } - - linedeftrigger - { - title = "Linedef Executor Trigger"; - - 300 - { - title = "Continuous"; - prefix = "(300)"; - } - 301 - { - title = "Each Time"; - prefix = "(301)"; - } - 302 - { - title = "Once"; - prefix = "(302)"; - } - 303 - { - title = "Ring Count - Continuous"; - prefix = "(303)"; - } - 304 - { - title = "Ring Count - Once"; - prefix = "(304)"; - } - 305 - { - title = "Character Ability - Continuous"; - prefix = "(305)"; - } - 306 - { - title = "Character Ability - Each Time"; - prefix = "(306)"; - } - 307 - { - title = "Character Ability - Once"; - prefix = "(307)"; - } - 308 - { - title = "Race Only - Once"; - prefix = "(308)"; - } - 309 - { - title = "CTF Red Team - Continuous"; - prefix = "(309)"; - } - 310 - { - title = "CTF Red Team - Each Time"; - prefix = "(310)"; - } - 311 - { - title = "CTF Blue Team - Continuous"; - prefix = "(311)"; - } - 312 - { - title = "CTF Blue Team - Each Time"; - prefix = "(312)"; - } - 313 - { - title = "No More Enemies - Once"; - prefix = "(313)"; - } - 314 - { - title = "Number of Pushables - Continuous"; - prefix = "(314)"; - } - 315 - { - title = "Number of Pushables - Once"; - prefix = "(315)"; - } - 317 - { - title = "Condition Set Trigger - Continuous"; - prefix = "(317)"; - } - 318 - { - title = "Condition Set Trigger - Once"; - prefix = "(318)"; - } - 319 - { - title = "Unlockable - Continuous"; - prefix = "(319)"; - } - 320 - { - title = "Unlockable - Once"; - prefix = "(320)"; - } - 321 - { - title = "Trigger After X Calls - Continuous"; - prefix = "(321)"; - } - 322 - { - title = "Trigger After X Calls - Each Time"; - prefix = "(322)"; - } - 323 - { - title = "NiGHTSerize - Each Time"; - prefix = "(323)"; - } - 324 - { - title = "NiGHTSerize - Once"; - prefix = "(324)"; - } - 325 - { - title = "De-NiGHTSerize - Each Time"; - prefix = "(325)"; - } - 326 - { - title = "De-NiGHTSerize - Once"; - prefix = "(326)"; - } - 327 - { - title = "NiGHTS Lap - Each Time"; - prefix = "(327)"; - } - 328 - { - title = "NiGHTS Lap - Once"; - prefix = "(328)"; - } - 329 - { - title = "Ideya Capture Touch - Each Time"; - prefix = "(329)"; - } - 330 - { - title = "Ideya Capture Touch - Once"; - prefix = "(330)"; - } - 331 - { - title = "Player Skin - Continuous"; - flags64text = "[6] Disable for this skin"; - prefix = "(331)"; - } - 332 - { - title = "Player Skin - Each Time"; - prefix = "(332)"; - } - 333 - { - title = "Player Skin - Once"; - prefix = "(333)"; - } - 399 - { - title = "Level Load"; - prefix = "(399)"; - } - } - - linedefexecsector - { - title = "Linedef Executor (sector)"; - - 400 - { - title = "Set Tagged Sector's Floor Height/Texture"; - prefix = "(400)"; - } - 401 - { - title = "Set Tagged Sector's Ceiling Height/Texture"; - prefix = "(401)"; - } - 402 - { - title = "Set Tagged Sector's Light Level"; - prefix = "(402)"; - } - 409 - { - title = "Change Tagged Sector's Tag"; - prefix = "(409)"; - } - 410 - { - title = "Change Front Sector's Tag"; - prefix = "(410)"; - } - 416 - { - title = "Start Adjustable Flickering Light"; - prefix = "(416)"; - } - 417 - { - title = "Start Adjustable Pulsating Light"; - prefix = "(417)"; - } - 418 - { - title = "Start Adjustable Blinking Light (unsynchronized)"; - prefix = "(418)"; - } - 419 - { - title = "Start Adjustable Blinking Light (synchronized)"; - prefix = "(419)"; - } - 420 - { - title = "Fade Light Level"; - prefix = "(420)"; - } - 421 - { - title = "Stop Lighting Effect"; - prefix = "(421)"; - } - 435 - { - title = "Change Plane Scroller Direction"; - prefix = "(435)"; - } - } - - linedefexecplane - { - title = "Linedef Executor (plane movement)"; - - 403 - { - title = "Move Tagged Sector's Floor"; - prefix = "(403)"; - } - 404 - { - title = "Move Tagged Sector's Ceiling"; - prefix = "(404)"; - } - 405 - { - title = "Move Floor According to Front Texture Offsets"; - prefix = "(405)"; - } - 407 - { - title = "Move Ceiling According to Front Texture Offsets"; - prefix = "(407)"; - } - 411 - { - title = "Stop Plane Movement"; - prefix = "(411)"; - } - 428 - { - title = "Start Platform Movement"; - prefix = "(428)"; - } - 429 - { - title = "Crush Ceiling Once"; - prefix = "(429)"; - } - 430 - { - title = "Crush Floor Once"; - prefix = "(430)"; - } - 431 - { - title = "Crush Floor and Ceiling Once"; - prefix = "(431)"; - } - } - - linedefexecplayer - { - title = "Linedef Executor (player/object)"; - - 412 - { - title = "Teleporter"; - prefix = "(412)"; - } - 425 - { - title = "Change Object State"; - prefix = "(425)"; - } - 426 - { - title = "Stop Object"; - prefix = "(426)"; - } - 427 - { - title = "Award Score"; - prefix = "(427)"; - } - 432 - { - title = "Enable/Disable 2D Mode"; - prefix = "(432)"; - } - 433 - { - title = "Enable/Disable Gravity Flip"; - prefix = "(433)"; - } - 434 - { - title = "Award Power-Up"; - prefix = "(434)"; - } - 437 - { - title = "Disable Player Control"; - prefix = "(437)"; - } - 438 - { - title = "Change Object Size"; - prefix = "(438)"; - } - 442 - { - title = "Change Object Type State"; - prefix = "(442)"; - } - 457 - { - title = "Track Object's Angle"; - prefix = "(457)"; - } - 458 - { - title = "Stop Tracking Object's Angle"; - prefix = "(458)"; - } - 460 - { - title = "Award Rings"; - prefix = "(460)"; - } - 461 - { - title = "Spawn Object"; - prefix = "(461)"; - } - 462 - { - title = "Stop Timer/Exit Stage in Record Attack"; - prefix = "(462)"; - } - } - - linedefexecmisc - { - title = "Linedef Executor (misc.)"; - - 413 - { - title = "Change Music"; - prefix = "(413)"; - } - 414 - { - title = "Play Sound Effect"; - prefix = "(414)"; - } - 415 - { - title = "Run Script"; - prefix = "(415)"; - } - 422 - { - title = "Switch to Cut-Away View"; - prefix = "(422)"; - } - 423 - { - title = "Change Sky"; - prefix = "(423)"; - } - 424 - { - title = "Change Weather"; - prefix = "(424)"; - } - 436 - { - title = "Shatter FOF"; - prefix = "(436)"; - } - 439 - { - title = "Change Tagged Linedef's Textures"; - prefix = "(439)"; - } - 440 - { - title = "Start Metal Sonic Race"; - prefix = "(440)"; - } - 441 - { - title = "Condition Set Trigger"; - prefix = "(441)"; - } - 443 - { - title = "Call Lua Function"; - prefix = "(443)"; - } - 444 - { - title = "Earthquake"; - prefix = "(444)"; - } - 445 - { - title = "Make FOF Disappear/Reappear"; - prefix = "(445)"; - } - 446 - { - title = "Make FOF Crumble"; - prefix = "(446)"; - } - 447 - { - title = "Change Tagged Sector's Colormap"; - prefix = "(447)"; - } - 448 - { - title = "Change Skybox"; - prefix = "(448)"; - } - 449 - { - title = "Enable Bosses with Parameter"; - prefix = "(449)"; - } - 450 - { - title = "Execute Linedef Executor (specific tag)"; - prefix = "(450)"; - } - 451 - { - title = "Execute Linedef Executor (random tag in range)"; - prefix = "(451)"; - } - 452 - { - title = "Set FOF Translucency"; - prefix = "(452)"; - } - 453 - { - title = "Fade FOF"; - prefix = "(453)"; - } - 454 - { - title = "Stop Fading FOF"; - prefix = "(454)"; - } - 455 - { - title = "Fade Tagged Sector's Colormap"; - prefix = "(455)"; - } - 456 - { - title = "Stop Fading Tagged Sector's Colormap"; - prefix = "(456)"; - } - 459 - { - title = "Control Text Prompt"; - prefix = "(459)"; - } - } - - linedefexecpoly - { - title = "Linedef Executor (polyobject)"; - - 480 - { - title = "Door Slide"; - prefix = "(480)"; - } - 481 - { - title = "Door Swing"; - prefix = "(481)"; - } - 482 - { - title = "Move"; - prefix = "(482)"; - } - 483 - { - title = "Move, Override"; - prefix = "(483)"; - } - 484 - { - title = "Rotate Right"; - prefix = "(484)"; - } - 485 - { - title = "Rotate Right, Override"; - prefix = "(485)"; - } - 486 - { - title = "Rotate Left"; - prefix = "(486)"; - } - 487 - { - title = "Rotate Left, Override"; - prefix = "(487)"; - } - 488 - { - title = "Move by Waypoints"; - prefix = "(488)"; - } - 489 - { - title = "Turn Invisible, Intangible"; - prefix = "(489)"; - } - 490 - { - title = "Turn Visible, Tangible"; - prefix = "(490)"; - } - 491 - { - title = "Set Translucency"; - prefix = "(491)"; - } - 492 - { - title = "Fade Translucency"; - prefix = "(492)"; - } - } - - wallscroll - { - title = "Wall Scrolling"; - - 500 - { - title = "Scroll Wall Front Side Left"; - prefix = "(500)"; - } - 501 - { - title = "Scroll Wall Front Side Right"; - prefix = "(501)"; - } - 502 - { - title = "Scroll Wall According to Linedef"; - prefix = "(502)"; - } - 503 - { - title = "Scroll Wall According to Linedef (Accelerative)"; - prefix = "(503)"; - } - 504 - { - title = "Scroll Wall According to Linedef (Displacement)"; - prefix = "(504)"; - } - 505 - { - title = "Scroll Texture by Front Side Offsets"; - prefix = "(505)"; - } - 506 - { - title = "Scroll Texture by Back Side Offsets"; - prefix = "(506)"; - } - } - - planescroll - { - title = "Plane Scrolling"; - - 510 - { - title = "Scroll Floor Texture"; - prefix = "(510)"; - } - 511 - { - title = "Scroll Floor Texture (Accelerative)"; - prefix = "(511)"; - } - 512 - { - title = "Scroll Floor Texture (Displacement)"; - prefix = "(512)"; - } - 513 - { - title = "Scroll Ceiling Texture"; - prefix = "(513)"; - } - 514 - { - title = "Scroll Ceiling Texture (Accelerative)"; - prefix = "(514)"; - } - 515 - { - title = "Scroll Ceiling Texture (Displacement)"; - prefix = "(515)"; - } - 520 - { - title = "Carry Objects on Floor"; - prefix = "(520)"; - } - 521 - { - title = "Carry Objects on Floor (Accelerative)"; - prefix = "(521)"; - } - 522 - { - title = "Carry Objects on Floor (Displacement)"; - prefix = "(522)"; - } - 523 - { - title = "Carry Objects on Ceiling"; - prefix = "(523)"; - } - 524 - { - title = "Carry Objects on Ceiling (Accelerative)"; - prefix = "(524)"; - } - 525 - { - title = "Carry Objects on Ceiling (Displacement)"; - prefix = "(525)"; - } - 530 - { - title = "Scroll Floor Texture and Carry Objects"; - prefix = "(530)"; - } - 531 - { - title = "Scroll Floor Texture and Carry Objects (Accelerative)"; - prefix = "(531)"; - } - 532 - { - title = "Scroll Floor Texture and Carry Objects (Displacement)"; - prefix = "(532)"; - } - 533 - { - title = "Scroll Ceiling Texture and Carry Objects"; - prefix = "(533)"; - } - 534 - { - title = "Scroll Ceiling Texture and Carry Objects (Accelerative)"; - prefix = "(534)"; - } - 535 - { - title = "Scroll Ceiling Texture and Carry Objects (Displacement)"; - prefix = "(535)"; - } - } - - pusher - { - title = "Pusher"; - - 541 - { - title = "Wind"; - prefix = "(541)"; - } - 542 - { - title = "Upwards Wind"; - prefix = "(542)"; - } - 543 - { - title = "Downwards Wind"; - prefix = "(543)"; - } - 544 - { - title = "Current"; - prefix = "(544)"; - } - 545 - { - title = "Upwards Current"; - prefix = "(545)"; - } - 546 - { - title = "Downwards Current"; - prefix = "(546)"; - } - 547 - { - title = "Push/Pull"; - prefix = "(547)"; - } - } - - light - { - title = "Lighting"; - - 600 - { - title = "Floor Lighting"; - prefix = "(600)"; - } - 601 - { - title = "Ceiling Lighting"; - prefix = "(601)"; - } - 602 - { - title = "Adjustable Pulsating Light"; - prefix = "(602)"; - } - 603 - { - title = "Adjustable Flickering Light"; - prefix = "(603)"; - } - 604 - { - title = "Adjustable Blinking Light (unsynchronized)"; - prefix = "(604)"; - } - 605 - { - title = "Adjustable Blinking Light (synchronized)"; - prefix = "(605)"; - } - 606 - { - title = "Colormap"; - prefix = "(606)"; - } - } - - slope - { - title = "Slope"; - - 700 - { - title = "Slope Frontside Floor"; - prefix = "(700)"; - } - 701 - { - title = "Slope Frontside Ceiling"; - prefix = "(701)"; - } - 702 - { - title = "Slope Frontside Floor and Ceiling"; - prefix = "(702)"; - } - 703 - { - title = "Slope Frontside Floor and Backside Ceiling"; - prefix = "(703)"; -´ } - 704 - { - title = "Slope Frontside Floor by 3 Tagged Vertex Things"; - prefix = "(704)"; - } - 705 - { - title = "Slope Frontside Ceiling by 3 Tagged Vertex Things"; - prefix = "(705)"; - } - 710 - { - title = "Slope Backside Floor"; - prefix = "(710)"; - } - 711 - { - title = "Slope Backside Ceiling"; - prefix = "(711)"; - } - 712 - { - title = "Slope Backside Floor and Ceiling"; - prefix = "(712)"; - } - 713 - { - title = "Slope Backside Floor and Frontside Ceiling"; - prefix = "(713)"; - } - 714 - { - title = "Slope Backside Floor by 3 Tagged Vertex Things"; - prefix = "(714)"; - } - 715 - { - title = "Slope Backside Ceiling by 3 Tagged Vertex Things"; - prefix = "(715)"; - } - 720 - { - title = "Copy Frontside Floor Slope from Line Tag"; - prefix = "(720)"; - } - 721 - { - title = "Copy Frontside Ceiling Slope from Line Tag"; - prefix = "(721)"; - } - 722 - { - title = "Copy Frontside Floor and Ceiling Slope from Line Tag"; - prefix = "(722)"; - } - 799 - { - title = "Set Tagged Dynamic Slope Vertex to Front Sector Height"; - prefix = "(799)"; - } - } - - transwall - { - title = "Translucent Wall"; - - 900 - { - title = "90% Opaque"; - prefix = "(900)"; - } - 901 - { - title = "80% Opaque"; - prefix = "(901)"; - } - 902 - { - title = "70% Opaque"; - prefix = "(902)"; - } - 903 - { - title = "60% Opaque"; - prefix = "(903)"; - } - 904 - { - title = "50% Opaque"; - prefix = "(904)"; - } - 905 - { - title = "40% Opaque"; - prefix = "(905)"; - } - 906 - { - title = "30% Opaque"; - prefix = "(906)"; - } - 907 - { - title = "20% Opaque"; - prefix = "(907)"; - } - 908 - { - title = "10% Opaque"; - prefix = "(908)"; - } - 909 - { - title = "Fog Wall"; - prefix = "(909)"; - } - } -} - -udmf -{ - misc - { - title = "Miscellaneous"; - - 0 - { - title = "None"; - prefix = "(0)"; + arg0 + { + title = "Control linedef tag"; + type = 15; + } + arg1 + { + title = "Control sector tag"; + type = 13; + } + arg2 + { + title = "On time"; + } + arg3 + { + title = "Off time"; + } + arg4 + { + title = "Initial delay"; + } + arg5 + { + title = "Play sound?"; + type = 11; + enum = "yesno"; + } } } @@ -1559,6 +296,412 @@ udmf type = 15; } } + + 30 + { + title = "Waving Flag"; + prefix = "(30)"; + arg0 + { + title = "PolyObject ID"; + type = 14; + } + arg1 + { + title = "Speed"; + } + arg2 + { + title = "Distance"; + } + } + + 31 + { + title = "Displacement by Front Sector"; + prefix = "(31)"; + arg0 + { + title = "PolyObject ID"; + type = 14; + } + arg1 + { + title = "Base speed"; + } + } + + 32 + { + title = "Angular Displacement by Front Sector"; + prefix = "(32)"; + arg0 + { + title = "PolyObject ID"; + type = 14; + } + arg1 + { + title = "Plane factor"; + default = 128; + } + arg2 + { + title = "Rotation factor"; + default = 90; + } + arg3 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Don't turn others"; + 2 = "Turn players"; + } + } + } + } + + planemove + { + title = "Plane Movement"; + + 52 + { + title = "Continuously Falling Sector"; + prefix = "(52)"; + arg0 + { + title = "Speed"; + } + arg1 + { + title = "Direction"; + type = 11; + enum + { + 0 = "Fall"; + 1 = "Rise"; + } + } + } + + 53 + { + title = "Continuous Plane Mover (Slowdown)"; + prefix = "(53)"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Affected planes"; + type = 11; + enum = "floorceiling"; + } + arg2 + { + title = "Forward speed"; + } + arg3 + { + title = "Return speed"; + } + arg4 + { + title = "Starting delay"; + } + arg5 + { + title = "Delay before flip"; + } + } + + 56 + { + title = "Continuous Plane Mover (Constant)"; + prefix = "(56)"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Affected planes"; + type = 11; + enum = "floorceiling"; + } + arg2 + { + title = "Forward speed"; + } + arg3 + { + title = "Return speed"; + } + arg4 + { + title = "Starting delay"; + } + arg5 + { + title = "Delay before flip"; + } + } + + 60 + { + title = "Activate Moving Platform"; + prefix = "(60)"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Speed"; + } + arg2 + { + title = "Starting delay"; + } + arg3 + { + title = "Delay before flip"; + } + arg4 + { + title = "Starting direction"; + type = 11; + enum = "downup"; + } + } + + 61 + { + title = "Ceiling Crusher"; + prefix = "(61)"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Starting direction"; + type = 11; + enum + { + 0 = "Crush"; + 1 = "Retract"; + } + } + arg2 + { + title = "Crush speed"; + } + arg3 + { + title = "Retract speed"; + } + } + + 66 + { + title = "Move Planes by Displacement"; + prefix = "(66)"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Affected planes"; + type = 11; + enum = "floorceiling"; + } + arg2 + { + title = "Translation factor"; + default = 256; + } + } + } + + fofmodifiers + { + title = "FOF Modifiers"; + + 70 + { + title = "Add Raise Thinker"; + prefix = "(70)"; + arg0 + { + title = "Control linedef tag"; + type = 15; + } + arg1 + { + title = "Speed"; + } + arg2 + { + title = "Destination height"; + } + arg3 + { + title = "Require spindash?"; + type = 11; + enum = "noyes"; + } + } + + 71 + { + title = "Add Air Bobbing Thinker"; + prefix = "(71)"; + arg0 + { + title = "Control linedef tag"; + type = 15; + } + arg1 + { + title = "Bobbing distance"; + } + arg2 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Raise"; + 2 = "Require spindash"; + 4 = "Dynamic"; + } + } + } + + 72 + { + title = "Add Thwomp Thinker"; + prefix = "(72)"; + arg0 + { + title = "Control linedef tag"; + type = 15; + } + arg1 + { + title = "Falling speed"; + } + arg2 + { + title = "Rising speed"; + } + stringarg0 + { + title = "Crushing sound"; + type = 2; + } + } + + 73 + { + title = "Add Laser Thinker"; + prefix = "(73)"; + arg0 + { + title = "Control linedef tag"; + type = 15; + } + arg1 + { + title = "Damage bosses?"; + type = 11; + enum = "yesno"; + } + } + + 74 + { + title = "Make FOF Bustable"; + prefix = "(74)"; + arg0 + { + title = "Control linedef tag"; + type = 15; + } + arg1 + { + title = "Bustable type"; + type = 11; + enum + { + 0 = "Touch"; + 1 = "Spin"; + 2 = "Regular"; + 3 = "Strong"; + } + } + arg2 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Bustable by pushables"; + 2 = "Trigger linedef executor"; + 4 = "Only bustable from below"; + } + } + arg3 + { + title = "Linedef executor tag"; + type = 15; + } + } + + 75 + { + title = "Make FOF Quicksand"; + prefix = "(75)"; + arg0 + { + title = "Control linedef tag"; + type = 15; + } + arg1 + { + title = "Sinking speed"; + } + arg2 + { + title = "Friction"; + } + } + + 76 + { + title = "Make FOF Bouncy"; + prefix = "(76)"; + arg0 + { + title = "Control linedef tag"; + type = 15; + } + arg1 + { + title = "Bounce strength"; + } + } } fof @@ -1569,6 +712,7 @@ udmf { title = "Solid"; prefix = "(100)"; + id = "srb2_fofsolid"; arg0 { title = "Target sector tag"; @@ -1576,25 +720,134 @@ udmf } arg1 { - title = "Visibility"; + title = "Alpha"; + default = 255; + } + arg2 + { + title = "Blending mode"; + type = 11; + enum = "blendmodes"; + } + arg3 + { + title = "Appearance"; type = 12; enum { 1 = "Don't render planes"; 2 = "Don't render sides"; + 4 = "Render insides"; + 8 = "Render only insides"; + 16 = "No shadow"; + 32 = "Cut cyan flat pixels"; } } + arg4 + { + title = "Tangibility"; + type = 12; + enum = "tangibility"; + } + } + + 120 + { + title = "Water"; + prefix = "(120)"; + id = "srb2_fofwater"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Alpha"; + default = 128; + } arg2 { - title = "Translucency"; + title = "Blending mode"; type = 11; + enum = "blendmodes"; + } + arg3 + { + title = "Flags"; + type = 12; enum { - 0 = "Opaque"; - 1 = "Translucent, no insides"; - 2 = "Translucent, render insides"; + 1 = "Don't render sides"; + 2 = "Render separate light level"; + 4 = "Use target light level"; + 8 = "No ripple effect"; + 16 = "Goo physics"; + 32 = "Cut cyan flat pixels"; } } + } + + 150 + { + title = "Air Bobbing"; + prefix = "(150)"; + id = "srb2_fofsolidopaque"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Bobbing distance"; + } + arg2 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Raise"; + 2 = "Require spindash"; + 4 = "Dynamic"; + } + } + } + + 160 + { + title = "Water Bobbing"; + prefix = "(160)"; + id = "srb2_fofsolidopaque"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + } + + 170 + { + title = "Crumbling"; + prefix = "(170)"; + id = "srb2_fofcrumbling"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Alpha"; + default = 255; + } + arg2 + { + title = "Blending mode"; + type = 11; + enum = "blendmodes"; + } arg3 { title = "Tangibility"; @@ -1603,16 +856,1078 @@ udmf } arg4 { - title = "Cast shadow?"; + title = "Flags"; + type = 12; + enum + { + 1 = "No shadow"; + 2 = "No respawn"; + 4 = "Air bobbing"; + 8 = "Float on water"; + 16 = "Cut cyan flat pixels"; + } + } + } + + 190 + { + title = "Rising"; + prefix = "(190)"; + id = "srb2_fofsolid"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Alpha"; + default = 255; + } + arg2 + { + title = "Blending mode"; type = 11; - enum = "yesno"; + enum = "blendmodes"; + } + arg3 + { + title = "Appearance"; + type = 12; + enum + { + 1 = "Don't render planes"; + 2 = "Don't render sides"; + 4 = "Render insides"; + 8 = "Render only insides"; + 16 = "No shadow"; + 32 = "Cut cyan flat pixels"; + } + } + arg4 + { + title = "Tangibility"; + type = 12; + enum = "tangibility"; + } + arg5 + { + title = "Speed"; + } + arg6 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Lower"; + 2 = "Require spindash"; + } } } - 120 + 200 { - title = "Water"; - prefix = "(120)"; + title = "Light Block"; + prefix = "(200)"; + id = "srb2_foflight"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Expand to bottom?"; + type = 11; + enum = "noyes"; + } + } + + 202 + { + title = "Fog Block"; + prefix = "(202)"; + id = "srb2_foffog"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + } + + 220 + { + title = "Intangible"; + prefix = "(220)"; + id = "srb2_fofintangible"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Alpha"; + default = 255; + } + arg2 + { + title = "Blending mode"; + type = 11; + enum = "blendmodes"; + } + arg3 + { + title = "Appearance"; + type = 12; + enum + { + 1 = "Don't render planes"; + 2 = "Don't render sides"; + 4 = "Don't render insides"; + 8 = "Render only insides"; + 16 = "No shadow"; + 32 = "Cut cyan flat pixels"; + } + } + } + + 223 + { + title = "Intangible, Invisible"; + prefix = "(223)"; + id = "srb2_fofintangibleinvisible"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + } + + 250 + { + title = "Mario Block"; + prefix = "(250)"; + id = "srb2_fofsolidopaque"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Block type"; + type = 12; + enum + { + 1 = "Brick"; + 2 = "Invisible"; + } + } + } + + 251 + { + title = "Thwomp Block"; + prefix = "(251)"; + id = "srb2_fofsolidopaque"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Falling speed"; + } + arg2 + { + title = "Rising speed"; + } + stringarg0 + { + title = "Crushing sound"; + type = 2; + } + } + + 254 + { + title = "Bustable Block"; + prefix = "(254)"; + id = "srb2_fofbustable"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Alpha"; + default = 255; + } + arg2 + { + title = "Blending mode"; + type = 11; + enum = "blendmodes"; + } + arg3 + { + title = "Bustable type"; + type = 11; + enum + { + 0 = "Touch"; + 1 = "Spin"; + 2 = "Regular"; + 3 = "Strong"; + } + } + arg4 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Bustable by pushables"; + 2 = "Trigger linedef executor"; + 4 = "Only bustable from below"; + 8 = "Cut cyan flat pixels"; + } + } + arg5 + { + title = "Linedef executor tag"; + type = 15; + } + } + + 257 + { + title = "Quicksand"; + prefix = "(257)"; + id = "srb2_fofsolidopaque"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Ripple effect?"; + type = 11; + enum = "yesno"; + } + arg2 + { + title = "Sinking speed"; + } + arg3 + { + title = "Friction"; + } + } + + 258 + { + title = "Laser"; + prefix = "(258)"; + id = "srb2_foflaser"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Alpha"; + default = 128; + } + arg2 + { + title = "Blending mode"; + type = 11; + enum = "blendmodes"; + } + arg3 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Don't damage bosses"; + 2 = "Cut cyan flat pixels"; + } + } + } + + 259 + { + title = "Custom"; + prefix = "(259)"; + id = "srb2_fofcustom"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Alpha"; + default = 255; + } + arg2 + { + title = "Blending mode"; + type = 11; + enum = "blendmodes"; + } + arg3 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Exists"; + 2 = "Block player"; + 4 = "Block others"; + 8 = "Render sides"; + 16 = "Render planes"; + 32 = "Water"; + 64 = "No shadow"; + 128 = "Cut solid walls"; + 256 = "Cut extra walls"; + 512 = "Split sprites"; + 1024 = "Render inside planes"; + 2048 = "Extra"; + 8192 = "Fog"; + 16384 = "Only render inside planes"; + 32768 = "Render inside walls"; + 65536 = "Only render inside walls"; + 131072 = "Double shadow"; + 262144 = "Water bobbing"; + 524288 = "Don't respawn"; + 1048576 = "Crumbling"; + 2097152 = "Goo water"; + 4194304 = "Mario block"; + 33554432 = "Intangible from below"; + 67108864 = "Intangible from above"; + 134217728 = "Ripple effect"; + 268435456 = "Don't copy light level"; + 536870912 = "Bouncy"; + 1073741824 = "Cut cyan flat pixels"; + } + } + } + 260 + { + title = "Generalized 3D Floor"; + prefix = "(260)"; + id = "Sector_Set3dFloor"; + requiresactivation = false; + + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Type"; + type = 26; + default = 1; + enum + { + 1 = "Solid"; + 2 = "Water"; + 3 = "Intangible"; + } + flags + { + 4 = "Render insides"; + 16 = "Only render insides"; + } + } + arg2 + { + title = "Flags"; + type = 12; + enum + { + 1 = "No shadow"; + 2 = "Double shadow"; + 4 = "Fog"; + } + } + arg3 + { + title = "Alpha"; + default = 255; + } + } + } + + linedeftrigger + { + title = "Linedef Executor Trigger"; + + 300 + { + title = "Basic"; + prefix = "(300)"; + arg0 + { + title = "Trigger type"; + type = 11; + enum = "triggertype"; + } + } + + 303 + { + title = "Ring Count"; + prefix = "(303)"; + arg0 + { + title = "Trigger type"; + type = 11; + enum = "triggertype"; + } + arg1 + { + title = "Rings"; + } + arg2 + { + title = "Comparison"; + type = 11; + enum = "comparison"; + } + arg3 + { + title = "Count all players?"; + type = 11; + enum = "noyes"; + } + } + + 305 + { + title = "Character Ability"; + prefix = "(305)"; + arg0 + { + title = "Trigger type"; + type = 11; + enum = "triggertype"; + } + arg1 + { + title = "Ability"; + type = 11; + enum + { + 0 = "None"; + 1 = "Thok"; + 2 = "Fly"; + 3 = "Glide and climb"; + 4 = "Homing attack"; + 5 = "Swim"; + 6 = "Double jump"; + 7 = "Float"; + 8 = "Float with slow descent"; + 9 = "Telekinesis"; + 10 = "Fall switch"; + 11 = "Jump boost"; + 12 = "Air drill"; + 13 = "Jump-thok"; + 14 = "Pogo bounce"; + 15 = "Twin spin"; + } + } + } + + 308 + { + title = "Gametype"; + prefix = "(308)"; + arg0 + { + title = "Trigger type"; + type = 11; + enum = "triggertype"; + } + arg1 + { + title = "Rules"; + type = 12; + enum + { + 1 = "Campaign"; + 2 = "Ringslinger"; + 4 = "Spectators"; + 8 = "Lives"; + 16 = "Teams"; + 32 = "First person"; + 64 = "Match emeralds"; + 128 = "Team flags"; + 256 = "Coop"; + 512 = "Allow special stages"; + 1024 = "Spawn emerald tokens"; + 2048 = "Emerald hunt"; + 4096 = "Race"; + 8192 = "Tag"; + 16384 = "Point limit"; + 32768 = "Time limit"; + 65536 = "Overtime"; + 131072 = "Hurt messages"; + 262144 = "Friendly fire"; + 524288 = "Hide time countdown"; + 1048576 = "Frozen after hide time"; + 2097152 = "Blindfolded view"; + 4194304 = "Respawn delay"; + 8388608 = "Award pity shield"; + 16777216 = "Death score penalty"; + 33554432 = "No spectator spawn"; + 67108864 = "Use match starts"; + 134217728 = "Spawn invincibility"; + 268435456 = "Allow enemies"; + 536870912 = "Allow exit sectors"; + 1073741824 = "No title card"; + 2147483648 = "Allow cutscenes"; + } + } + arg2 + { + title = "Check if"; + type = 11; + enum = "flagcheck"; + } + } + + 309 + { + title = "CTF Team"; + prefix = "(309)"; + arg0 + { + title = "Trigger type"; + type = 11; + enum = "triggertype"; + } + arg1 + { + title = "Team"; + type = 11; + enum = "team"; + } + } + + 313 + { + title = "No More Enemies"; + prefix = "(313)"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + } + + 314 + { + title = "Number of Pushables"; + prefix = "(314)"; + arg0 + { + title = "Trigger type"; + type = 11; + enum = "triggertype"; + } + arg1 + { + title = "Pushables"; + } + arg2 + { + title = "Comparison"; + type = 11; + enum = "comparison"; + } + } + + 317 + { + title = "Condition Set Trigger"; + prefix = "(317)"; + arg0 + { + title = "Trigger type"; + type = 11; + enum = "triggertype"; + } + arg1 + { + title = "Trigger ID"; + } + } + + 319 + { + title = "Unlockable"; + prefix = "(319)"; + arg0 + { + title = "Trigger type"; + type = 11; + enum = "triggertype"; + } + arg1 + { + title = "Unlockable ID"; + } + } + + 321 + { + title = "Trigger After X Calls"; + prefix = "(321)"; + arg0 + { + title = "Trigger type"; + type = 11; + enum = "xtriggertype"; + } + arg1 + { + title = "Calls"; + } + arg2 + { + title = "Can retrigger?"; + type = 11; + enum = "noyes"; + } + arg3 + { + title = "Starting calls"; + } + } + + 323 + { + title = "NiGHTSerize"; + prefix = "(323)"; + arg0 + { + title = "Trigger type"; + type = 11; + enum + { + 0 = "Each time"; + 1 = "Once"; + } + } + arg1 + { + title = "Mare number"; + } + arg2 + { + title = "Lap number"; + } + arg3 + { + title = "Mare comparison"; + type = 11; + enum = "comparison"; + } + arg4 + { + title = "Lap comparison"; + type = 11; + enum = "comparison"; + } + arg5 + { + title = "Compared player"; + type = 11; + enum + { + 0 = "Fastest"; + 1 = "Slowest"; + 2 = "Triggerer"; + } + } + arg6 + { + title = "NiGHTS check"; + type = 11; + enum + { + 0 = "No check"; + 1 = "Trigger if player was not NiGHTS"; + 2 = "Trigger if player was already NiGHTS"; + } + } + arg7 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Only count bonus time laps"; + 2 = "Only trigger if final mare completed"; + } + } + } + 325 + { + title = "De-NiGHTSerize"; + prefix = "(325)"; + arg0 + { + title = "Trigger type"; + type = 11; + enum + { + 0 = "Each time"; + 1 = "Once"; + } + } + arg1 + { + title = "Mare number"; + } + arg2 + { + title = "Lap number"; + } + arg3 + { + title = "Mare comparison"; + type = 11; + enum = "comparison"; + } + arg4 + { + title = "Lap comparison"; + type = 11; + enum = "comparison"; + } + arg5 + { + title = "Compared player"; + type = 11; + enum + { + 0 = "Fastest"; + 1 = "Slowest"; + 2 = "Triggerer"; + } + } + arg6 + { + title = "NiGHTS check"; + type = 11; + enum + { + 0 = "No check"; + 1 = "Trigger if nobody is now NiGHTS"; + 2 = "Trigger if somebody is still NiGHTS"; + } + } + arg7 + { + title = "Only bonus laps?"; + type = 11; + enum = "noyes"; + } + } + 327 + { + title = "NiGHTS Lap"; + prefix = "(327)"; + arg0 + { + title = "Trigger type"; + type = 11; + enum + { + 0 = "Each time"; + 1 = "Once"; + } + } + arg1 + { + title = "Mare number"; + } + arg2 + { + title = "Lap number"; + } + arg3 + { + title = "Mare comparison"; + type = 11; + enum = "comparison"; + } + arg4 + { + title = "Lap comparison"; + type = 11; + enum = "comparison"; + } + arg5 + { + title = "Compared player"; + type = 11; + enum + { + 0 = "Fastest"; + 1 = "Slowest"; + 2 = "Triggerer"; + } + } + arg6 + { + title = "Only bonus laps?"; + type = 11; + enum = "noyes"; + } + } + 329 + { + title = "Ideya Capture Touch"; + prefix = "(329)"; + arg0 + { + title = "Trigger type"; + type = 11; + enum + { + 0 = "Each time"; + 1 = "Once"; + } + } + arg1 + { + title = "Mare number"; + } + arg2 + { + title = "Lap number"; + } + arg3 + { + title = "Mare comparison"; + type = 11; + enum = "comparison"; + } + arg4 + { + title = "Lap comparison"; + type = 11; + enum = "comparison"; + } + arg5 + { + title = "Compared player"; + type = 11; + enum + { + 0 = "Fastest"; + 1 = "Slowest"; + 2 = "Triggerer"; + } + } + arg6 + { + title = "Spheres check"; + type = 11; + enum + { + 0 = "Trigger if enough spheres"; + 1 = "Trigger if not enough spheres"; + 2 = "Trigger regardless of spheres"; + } + } + arg7 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Only count bonus time laps"; + 2 = "Trigger upon entering Ideya Capture"; + } + } + } + + 331 + { + title = "Player Skin"; + prefix = "(331)"; + arg0 + { + title = "Trigger type"; + type = 11; + enum = "triggertype"; + } + arg1 + { + title = "Invert choice?"; + type = 11; + enum = "noyes"; + } + stringarg0 + { + title = "Skin name"; + type = 2; + } + } + + 334 + { + title = "Object Dye"; + prefix = "(334)"; + arg0 + { + title = "Trigger type"; + type = 11; + enum = "triggertype"; + } + arg1 + { + title = "Invert choice?"; + type = 11; + enum = "noyes"; + } + stringarg0 + { + title = "Color"; + type = 2; + } + } + + 337 + { + title = "Emerald Check"; + prefix = "(337)"; + arg0 + { + title = "Trigger type"; + type = 11; + enum = "triggertype"; + } + arg1 + { + title = "Emeralds"; + type = 12; + enum + { + 1 = "Emerald 1"; + 2 = "Emerald 2"; + 4 = "Emerald 3"; + 8 = "Emerald 4"; + 16 = "Emerald 5"; + 32 = "Emerald 6"; + 64 = "Emerald 7"; + } + } + arg2 + { + title = "Check if"; + type = 11; + enum = "flagcheck"; + } + } + + 340 + { + title = "NiGHTS Mare"; + prefix = "(340)"; + arg0 + { + title = "Trigger type"; + type = 11; + enum = "triggertype"; + } + arg1 + { + title = "Mare"; + } + arg2 + { + title = "Comparison"; + type = 11; + enum = "comparison"; + } + } + + 343 + { + title = "Gravity Check"; + prefix = "(343)"; + arg0 + { + title = "Trigger type"; + type = 11; + enum = "triggertype"; + } + arg1 + { + title = "Gravity"; + type = 11; + enum + { + 0 = "Normal gravity"; + 1 = "Reverse gravity"; + 2 = "Reverse gravity (no MF2_OBJECTFLIP)"; + } + } + } + + 399 + { + title = "Level Load"; + prefix = "(399)"; + } + } + + linedefexecsector + { + title = "Linedef Executor (sector)"; + + 400 + { + title = "Set Tagged Sector's Heights/Textures"; + prefix = "(400)"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Affected planes"; + type = 11; + enum = "floorceiling"; + } + arg2 + { + title = "Set flats?"; + type = 11; + enum = "noyes"; + } + } + + 402 + { + title = "Copy Light Level to Tagged Sectors"; + prefix = "(402)"; arg0 { title = "Target sector tag"; @@ -1624,12 +1939,790 @@ udmf type = 12; enum { - 1 = "Opaque"; - 2 = "Don't render sides"; - 4 = "Render separate light level"; - 8 = "Use target light level"; - 16 = "No ripple effect"; - 32 = "Goo physics"; + 1 = "Don't copy main light level"; + 2 = "Don't copy floor light level"; + 4 = "Don't copy ceiling light level"; + } + } + } + + 408 + { + title = "Set Tagged Sector's Flats"; + prefix = "(408)"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Affected planes"; + type = 11; + enum = "floorceiling"; + } + } + + 409 + { + title = "Change Tagged Sector's Tag"; + prefix = "(409)"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Tag"; + type = 13; + } + arg2 + { + title = "Behavior"; + type = 11; + enum + { + 0 = "Add tag"; + 1 = "Remove tag"; + 2 = "Replace first tag"; + 3 = "Change trigger tag"; + } + } + } + + 410 + { + title = "Change Front Sector's Tag"; + prefix = "(410)"; + arg0 + { + title = "Tag"; + type = 13; + } + arg1 + { + title = "Behavior"; + type = 11; + enum + { + 0 = "Add tag"; + 1 = "Remove tag"; + 2 = "Replace first tag"; + 3 = "Change trigger tag"; + } + } + } + + 416 + { + title = "Start Adjustable Flickering Light"; + prefix = "(416)"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Speed"; + } + arg2 + { + title = "Brightness 1"; + } + arg3 + { + title = "Use target brightness?"; + type = 11; + enum = "noyes"; + } + arg4 + { + title = "Brightness 2"; + } + } + + 417 + { + title = "Start Adjustable Pulsating Light"; + prefix = "(417)"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Speed"; + } + arg2 + { + title = "Brightness 1"; + } + arg3 + { + title = "Use target brightness?"; + type = 11; + enum = "noyes"; + } + arg4 + { + title = "Brightness 2"; + } + } + + 418 + { + title = "Start Adjustable Blinking Light"; + prefix = "(418)"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Brightness 1 tics"; + } + arg2 + { + title = "Brightness 2 tics"; + } + arg3 + { + title = "Brightness 1"; + } + arg4 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Use target brightness"; + 2 = "Synchronized"; + } + } + arg5 + { + title = "Brightness 2"; + } + } + + 420 + { + title = "Fade Light Level"; + prefix = "(420)"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Destination light level"; + } + arg2 + { + title = "Fading speed"; + } + arg3 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Add to current light level"; + 2 = "Interrupt ongoing fades"; + 4 = "Speed is duration"; + } + } + } + + 421 + { + title = "Stop Lighting Effect"; + prefix = "(421)"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + } + + 435 + { + title = "Change Plane Scroller Direction"; + prefix = "(435)"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Speed"; + } + } + + 467 + { + title = "Set Tagged Sector's Light Level"; + prefix = "(467)"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Light level"; + } + arg2 + { + title = "Affected area"; + type = 11; + enum + { + 0 = "Sector"; + 1 = "Floor"; + 2 = "Ceiling"; + } + } + arg3 + { + title = "Set/Add?"; + type = 11; + enum = "setadd"; + } + } + + 469 + { + title = "Change Tagged Sector's Gravity"; + prefix = "(469)"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Set/Multiply?"; + type = 11; + enum + { + 0 = "Set"; + 1 = "Multiply"; + } + } + arg2 + { + title = "Flip flag"; + type = 11; + enum + { + 0 = "Don't change"; + 1 = "Set"; + 2 = "Remove"; + } + } + arg3 + { + title = "Override gravity?"; + type = 11; + enum + { + 0 = "No"; + 1 = "Yes"; + } + } + stringarg0 + { + title = "Gravity value"; + type = 2; + } + } + } + + linedefexecplane + { + title = "Linedef Executor (plane movement)"; + + 403 + { + title = "Move Tagged Sector's Planes"; + prefix = "(403)"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Affected planes"; + type = 11; + enum = "floorceiling"; + } + arg2 + { + title = "Speed"; + } + arg3 + { + title = "Linedef executor tag"; + type = 15; + } + arg4 + { + title = "Set flats?"; + type = 11; + enum = "noyes"; + } + } + + 405 + { + title = "Move Planes by Distance"; + prefix = "(405)"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Affected planes"; + type = 11; + enum = "floorceiling"; + } + arg2 + { + title = "Distance"; + } + arg3 + { + title = "Speed"; + } + arg4 + { + title = "Instant?"; + type = 11; + enum = "noyes"; + } + } + + 411 + { + title = "Stop Plane Movement"; + prefix = "(411)"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + } + + 428 + { + title = "Start Platform Movement"; + prefix = "(428)"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Speed"; + } + arg2 + { + title = "Starting delay"; + } + arg3 + { + title = "Delay before flip"; + } + arg4 + { + title = "Starting direction"; + type = 11; + enum + { + 0 = "Down"; + 1 = "Up"; + } + } + } + + 429 + { + title = "Crush Planes Once"; + prefix = "(429)"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Affected planes"; + type = 11; + enum = "floorceiling"; + } + arg2 + { + title = "Crush speed"; + } + arg3 + { + title = "Retract speed"; + } + } + } + + linedefexecplayer + { + title = "Linedef Executor (player/object)"; + + 412 + { + title = "Teleporter"; + prefix = "(412)"; + arg0 + { + title = "Destination tag"; + type = 14; + } + arg1 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Silent"; + 2 = "Keep angle"; + 4 = "Keep momentum"; + 8 = "Relative silent"; + } + } + arg2 + { + title = "X offset"; + } + arg3 + { + title = "Y offset"; + } + arg4 + { + title = "Z offset"; + } + } + + 425 + { + title = "Change Object State"; + prefix = "(425)"; + stringarg0 + { + title = "State"; + type = 2; + } + } + + 426 + { + title = "Stop Object"; + prefix = "(426)"; + arg0 + { + title = "Move to center?"; + type = 11; + enum = "noyes"; + } + } + + 427 + { + title = "Award Score"; + prefix = "(427)"; + arg0 + { + title = "Score"; + } + } + + 432 + { + title = "Enable/Disable 2D Mode"; + prefix = "(432)"; + arg0 + { + title = "Mode"; + type = 11; + enum + { + 0 = "2D"; + 1 = "3D"; + } + } + } + + 433 + { + title = "Enable/Disable Gravity Flip"; + prefix = "(433)"; + arg0 + { + title = "Set gravity"; + type = 11; + enum + { + 0 = "Reverse"; + 1 = "Normal"; + } + } + arg1 + { + title = "Invert current gravity"; + type = 11; + enum + { + 0 = "No"; + 1 = "Yes"; + } + } + arg2 + { + title = "Force MFE_VERTICALFLIP"; + type = 11; + enum + { + 0 = "No"; + 1 = "Yes"; + } + } + } + + 434 + { + title = "Award Power-Up"; + prefix = "(434)"; + stringarg0 + { + title = "Power"; + type = 2; + } + stringarg1 + { + title = "Duration/Amount"; + type = 2; + } + } + + 437 + { + title = "Disable Player Control"; + prefix = "(437)"; + arg0 + { + title = "Time"; + } + arg1 + { + title = "Allow jumping?"; + type = 11; + enum = "noyes"; + } + } + + 438 + { + title = "Change Object Size"; + prefix = "(438)"; + arg0 + { + title = "Size (%)"; + default = 100; + } + } + + 442 + { + title = "Change Object Type State"; + prefix = "(442)"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Change to"; + type = 11; + enum + { + 0 = "Specified state"; + 1 = "Next state"; + } + } + stringarg0 + { + title = "Object type"; + type = 2; + } + stringarg1 + { + title = "State"; + type = 2; + } + } + + 457 + { + title = "Track Object's Angle"; + prefix = "(457)"; + arg0 + { + title = "Anchor tag"; + type = 14; + } + arg1 + { + title = "Angle tolerance"; + type = 8; + } + arg2 + { + title = "Time tolerance"; + } + arg3 + { + title = "Trigger linedef tag"; + type = 15; + } + arg4 + { + title = "Track after failure?"; + type = 11; + enum = "noyes"; + } + } + + 458 + { + title = "Stop Tracking Object's Angle"; + prefix = "(458)"; + } + + 460 + { + title = "Award Rings"; + prefix = "(460)"; + arg0 + { + title = "Rings"; + } + arg1 + { + title = "Periodicity"; + } + } + + 461 + { + title = "Spawn Object"; + prefix = "(461)"; + arg0 + { + title = "X position"; + } + arg1 + { + title = "Y position"; + } + arg2 + { + title = "Z position"; + } + arg3 + { + title = "Angle"; + type = 8; + } + arg4 + { + title = "Randomize position?"; + type = 11; + enum = "noyes"; + } + arg5 + { + title = "Max X position"; + } + arg6 + { + title = "Max Y position"; + } + arg7 + { + title = "Max Z position"; + } + stringarg0 + { + title = "Object type"; + type = 2; + } + } + + 462 + { + title = "Stop Timer/Exit Stage in Record Attack"; + prefix = "(462)"; + } + + 463 + { + title = "Dye Object"; + prefix = "(463)"; + stringarg0 + { + title = "Skin color"; + type = 2; + } + } + + 464 + { + title = "Trigger Egg Capsule"; + prefix = "(464)"; + arg0 + { + title = "Egg Capsule tag"; + type = 14; + } + arg1 + { + title = "End level?"; + type = 11; + enum = "yesno"; + } + } + + 466 + { + title = "Set Level Failure State"; + prefix = "(466)"; + arg0 + { + title = "State"; + type = 11; + enum + { + 0 = "Failure"; + 1 = "Success"; } } } @@ -1639,6 +2732,225 @@ udmf { title = "Linedef Executor (misc.)"; + 413 + { + title = "Change Music"; + prefix = "(413)"; + arg0 + { + title = "Flags"; + type = 12; + enum + { + 1 = "For all players"; + 2 = "Seek offset from current position"; + 4 = "Fade to custom volume"; + 8 = "Don't reload after death"; + 16 = "Force music reload"; + 32 = "Don't loop"; + } + } + arg1 + { + title = "Position"; + } + arg2 + { + title = "Fade out time"; + } + arg3 + { + title = "Fade in time"; + } + arg4 + { + title = "Fade destination volume"; + } + arg5 + { + title = "Fade start volume"; + default = -1; + } + arg6 + { + title = "Track number"; + } + stringarg0 + { + title = "Music name"; + type = 2; + } + } + + 414 + { + title = "Play Sound Effect"; + prefix = "(414)"; + arg0 + { + title = "Source"; + type = 11; + enum + { + 0 = "Triggering object"; + 1 = "Trigger sector"; + 2 = "Nowhere"; + 3 = "Tagged sectors"; + } + } + arg1 + { + title = "Listener"; + type = 11; + enum + { + 0 = "Triggering player"; + 1 = "Everyone"; + 2 = "Everyone touching tagged sectors"; + } + } + arg2 + { + title = "Target sector tag"; + type = 13; + } + stringarg0 + { + title = "Sound name"; + type = 2; + } + } + + 415 + { + title = "Run Script"; + prefix = "(415)"; + stringarg0 + { + title = "Lump name"; + type = 2; + } + } + + 422 + { + title = "Switch to Cut-Away View"; + prefix = "(422)"; + arg0 + { + title = "Viewpoint tag"; + type = 14; + } + arg1 + { + title = "Time"; + } + } + + 423 + { + title = "Change Sky"; + prefix = "(423)"; + arg0 + { + title = "Sky number"; + } + arg1 + { + title = "For all players?"; + type = 11; + enum = "noyes"; + } + } + + 424 + { + title = "Change Weather"; + prefix = "(424)"; + arg0 + { + title = "Weather"; + type = 11; + enum + { + 0 = "None"; + 1 = "Storm (thunder, lightning and rain)"; + 2 = "Snow"; + 3 = "Rain"; + 4 = "Preloaded"; + 5 = "Storm (no rain)"; + 6 = "Storm (no lightning)"; + } + } + arg1 + { + title = "For all players?"; + type = 11; + enum = "noyes"; + } + } + + 436 + { + title = "Shatter FOF"; + prefix = "(436)"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Control sector tag"; + type = 13; + } + } + + 439 + { + title = "Change Tagged Linedef's Textures"; + prefix = "(439)"; + arg0 + { + title = "Target linedef tag"; + type = 15; + } + arg1 + { + title = "Affected sides"; + type = 11; + enum = "frontbackboth"; + } + arg2 + { + title = "Change unset textures?"; + type = 11; + enum = "yesno"; + } + arg3 + { + title = "Use backside textures?"; + type = 11; + enum = "noyes"; + } + } + + 440 + { + title = "Start Metal Sonic Race"; + prefix = "(440)"; + } + + 441 + { + title = "Condition Set Trigger"; + prefix = "(441)"; + arg0 + { + title = "Trigger number"; + } + } + 443 { title = "Call Lua Function"; @@ -1650,6 +2962,74 @@ udmf } } + 444 + { + title = "Earthquake"; + prefix = "(444)"; + arg0 + { + title = "Duration"; + } + arg1 + { + title = "Intensity"; + } + } + + 445 + { + title = "Make FOF Disappear/Reappear"; + prefix = "(445)"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Control sector tag"; + type = 13; + } + arg2 + { + title = "Effect"; + type = 11; + enum + { + 0 = "Disappear"; + 1 = "Reappear"; + } + } + } + + 446 + { + title = "Make FOF Crumble"; + prefix = "(446)"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Control sector tag"; + type = 13; + } + arg2 + { + title = "Respawn?"; + type = 11; + enum + { + 0 = "Yes"; + 1 = "No"; + 2 = "Unless FF_NORETURN"; + 3 = "Only if FF_NORETURN"; + } + } + } + 447 { title = "Change Tagged Sector's Colormap"; @@ -1686,6 +3066,178 @@ udmf } } + 448 + { + title = "Change Skybox"; + prefix = "(448)"; + arg0 + { + title = "Viewpoint ID"; + } + arg1 + { + title = "Centerpoint ID"; + } + arg2 + { + title = "Change?"; + type = 11; + enum + { + 0 = "Viewpoint"; + 1 = "Centerpoint"; + 2 = "Both"; + } + } + arg3 + { + title = "For all players?"; + type = 11; + enum = "noyes"; + } + } + + 449 + { + title = "Enable Bosses with Parameter"; + prefix = "(449)"; + arg0 + { + title = "Boss ID"; + } + arg1 + { + title = "Effect"; + type = 11; + enum + { + 0 = "Enable"; + 1 = "Disable"; + } + } + } + + 450 + { + title = "Execute Linedef Executor (specific tag)"; + prefix = "(450)"; + arg0 + { + title = "Trigger linedef tag"; + type = 15; + } + } + + 451 + { + title = "Execute Linedef Executor (random tag in range)"; + prefix = "(451)"; + arg0 + { + title = "Start of tag range"; + type = 15; + } + arg1 + { + title = "End of tag range"; + type = 15; + } + } + + 452 + { + title = "Set FOF Translucency"; + prefix = "(452)"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Control sector tag"; + type = 13; + } + arg2 + { + title = "Alpha"; + } + arg3 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Add to current translucency"; + 2 = "Don't handle FF_TRANSLUCENT"; + } + } + } + + 453 + { + title = "Fade FOF"; + prefix = "(453)"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Control sector tag"; + type = 13; + } + arg2 + { + title = "Alpha"; + } + arg3 + { + title = "Fading speed"; + } + arg4 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Add to current translucency"; + 2 = "Interrupt ongoing fades"; + 4 = "Speed is duration"; + 8 = "Don't change collision"; + 16 = "No collision during fade"; + 32 = "Don't handle FF_TRANSLUCENT"; + 64 = "Don't handle FF_EXISTS"; + 128 = "Don't fade lighting"; + 256 = "Don't fade colormap"; + 512 = "Use exact alpha in OpenGL"; + } + } + } + + 454 + { + title = "Stop Fading FOF"; + prefix = "(454)"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Control sector tag"; + type = 13; + } + arg2 + { + title = "Finalize collision?"; + type = 11; + enum = "yesno"; + } + } + 455 { title = "Fade Tagged Sector's Colormap"; @@ -1739,6 +3291,42 @@ udmf } } + 459 + { + title = "Control Text Prompt"; + prefix = "(459)"; + arg0 + { + title = "Prompt number"; + } + arg1 + { + title = "Page number"; + } + arg2 + { + title = "Flags"; + type = 11; + enum + { + 1 = "Close current text prompt"; + 2 = "Trigger linedef executor on close"; + 4 = "Find prompt by name"; + 8 = "Don't disable controls"; + } + } + arg3 + { + title = "Trigger linedef tag"; + type = 15; + } + stringarg0 + { + title = "Prompt name"; + type = 2; + } + } + 465 { title = "Set Linedef Executor Delay"; @@ -1754,12 +3342,400 @@ udmf } arg2 { - title = "Set/add?"; + title = "Set/Add?"; + type = 11; + enum = "setadd"; + } + } + + 468 + { + title = "Change Linedef Argument"; + prefix = "(468)"; + arg0 + { + title = "Linedef tag"; + type = 15; + } + arg1 + { + title = "Argument"; + } + arg2 + { + title = "Value"; + } + arg3 + { + title = "Set/Add?"; + type = 11; + enum = "setadd"; + } + } + } + + linedefexecpoly + { + title = "Linedef Executor (polyobject)"; + + 480 + { + title = "Door Slide"; + prefix = "(480)"; + arg0 + { + title = "PolyObject ID"; + type = 14; + } + arg1 + { + title = "Speed"; + } + arg2 + { + title = "Distance"; + } + arg3 + { + title = "Return delay"; + } + } + + 481 + { + title = "Door Swing"; + prefix = "(481)"; + arg0 + { + title = "PolyObject ID"; + type = 14; + } + arg1 + { + title = "Speed"; + } + arg2 + { + title = "Rotation"; + type = 8; + } + arg3 + { + title = "Return delay"; + } + } + + 482 + { + title = "Move"; + prefix = "(482)"; + arg0 + { + title = "PolyObject ID"; + type = 14; + } + arg1 + { + title = "Speed"; + } + arg2 + { + title = "Distance"; + } + arg3 + { + title = "Override?"; + type = 11; + enum = "noyes"; + } + } + + 484 + { + title = "Rotate"; + prefix = "(484)"; + arg0 + { + title = "PolyObject ID"; + type = 14; + } + arg1 + { + title = "Speed"; + } + arg2 + { + title = "Rotation"; + type = 8; + } + arg3 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Don't turn others"; + 2 = "Turn players"; + 4 = "Continuous rotation"; + 8 = "Override"; + } + } + } + + 488 + { + title = "Move by Waypoints"; + prefix = "(488)"; + arg0 + { + title = "PolyObject ID"; + type = 14; + } + arg1 + { + title = "Speed"; + } + arg2 + { + title = "Waypoint sequence"; + } + arg3 + { + title = "Return behavior"; type = 11; enum { - 0 = "Set"; - 1 = "Add"; + 0 = "Don't return"; + 1 = "Return to first waypoint"; + 2 = "Repeat sequence in reverse"; + } + } + arg4 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Move in reverse"; + 2 = "Loop movement"; + } + } + } + + 489 + { + title = "Set Visibility, Tangibility"; + prefix = "(489)"; + arg0 + { + title = "PolyObject ID"; + type = 14; + } + arg1 + { + title = "Visibility"; + type = 11; + enum + { + 0 = "No change"; + 1 = "Visible"; + 2 = "Invisible"; + } + } + arg2 + { + title = "Tangibility"; + type = 11; + enum + { + 0 = "No change"; + 1 = "Tangible"; + 2 = "Intangible"; + } + } + } + + 491 + { + title = "Set Translucency"; + prefix = "(491)"; + arg0 + { + title = "PolyObject ID"; + type = 14; + } + arg1 + { + title = "Translucency level"; + } + arg2 + { + title = "Set/Add?"; + type = 11; + enum = "setadd"; + } + } + + 492 + { + title = "Fade Translucency"; + prefix = "(492)"; + arg0 + { + title = "PolyObject ID"; + type = 14; + } + arg1 + { + title = "Translucency level"; + } + arg2 + { + title = "Fading speed"; + } + arg3 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Add to current translucency"; + 2 = "Interrupt ongoing fades"; + 4 = "Speed is duration"; + 8 = "Don't change collision"; + 16 = "No collision during fade"; + } + } + } + } + + scrollpush + { + title = "Scrollers and Pushers"; + + 500 + { + title = "Scroll Walls"; + prefix = "(500)"; + arg0 + { + title = "Side"; + type = 11; + enum = "frontbackboth"; + } + arg1 + { + title = "Horizontal speed"; + } + arg2 + { + title = "Vertical speed"; + } + } + + 502 + { + title = "Scroll Walls Remotely"; + prefix = "(502)"; + arg0 + { + title = "Linedef tag"; + type = 15; + } + arg1 + { + title = "Side"; + type = 11; + enum = "frontbackboth"; + } + arg2 + { + title = "Horizontal speed"; + } + arg3 + { + title = "Vertical speed"; + } + arg4 + { + title = "Type"; + type = 11; + enum = "scrolltype"; + } + } + + 510 + { + title = "Scroll Planes"; + prefix = "(510)"; + arg0 + { + title = "Sector tag"; + type = 13; + } + arg1 + { + title = "Affected planes"; + type = 11; + enum = "floorceiling"; + } + arg2 + { + title = "Scroll/Carry?"; + type = 11; + enum = "scrollcarry"; + } + arg3 + { + title = "Base speed"; + } + arg4 + { + title = "Type"; + type = 26; + enum = "scrolltype"; + flags + { + 4 = "Non-exclusive"; + } + } + } + + 541 + { + title = "Wind/Current"; + prefix = "(541)"; + arg0 + { + title = "Sector tag"; + type = 13; + } + arg1 + { + title = "Horizontal speed"; + } + arg2 + { + title = "Vertical speed"; + } + arg3 + { + title = "Type"; + type = 11; + enum + { + 0 = "Wind"; + 1 = "Current"; + } + } + arg4 + { + title = "Flags"; + type = 12; + flags + { + 1 = "Slide"; + 2 = "Non-exclusive"; } } } @@ -1767,6 +3743,120 @@ udmf light { + title = "Lighting"; + + 600 + { + title = "Copy Light Level to Tagged Sector's Planes"; + prefix = "(600)"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Affected planes"; + type = 11; + enum = "floorceiling"; + } + } + + 602 + { + title = "Adjustable Pulsating Light"; + prefix = "(602)"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Speed"; + } + arg2 + { + title = "Brightness 1"; + } + arg3 + { + title = "Use target brightness?"; + type = 11; + enum = "noyes"; + } + arg4 + { + title = "Brightness 2"; + } + } + + 603 + { + title = "Adjustable Flickering Light"; + prefix = "(603)"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Speed"; + } + arg2 + { + title = "Brightness 1"; + } + arg3 + { + title = "Use target brightness?"; + type = 11; + enum = "noyes"; + } + arg4 + { + title = "Brightness 2"; + } + } + + 604 + { + title = "Adjustable Blinking Light"; + prefix = "(604)"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Brightness 1 tics"; + } + arg2 + { + title = "Brightness 2 tics"; + } + arg3 + { + title = "Brightness 1"; + } + arg4 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Use target brightness"; + 2 = "Synchronized"; + } + } + arg5 + { + title = "Brightness 2"; + } + } + 606 { title = "Copy Colormap"; @@ -1813,6 +3903,7 @@ udmf { 1 = "No physics"; 2 = "Dynamic"; + 4 = "Copy to other side"; } } } @@ -1821,6 +3912,7 @@ udmf { title = "Create Vertex-Based Slope"; prefix = "(704)"; + id = "srb2_vertexslope"; arg0 { title = "Plane"; @@ -1864,6 +3956,7 @@ udmf { title = "Copy Slope"; prefix = "(720)"; + id = "plane_copy"; arg0 { title = "Front floor tag"; @@ -1897,5 +3990,21 @@ udmf } } } + + 799 + { + title = "Set Tagged Dynamic Slope Vertex to Front Sector Height"; + prefix = "(799)"; + arg0 + { + title = "Apply height"; + type = 11; + enum + { + 0 = "Absolute"; + 1 = "Relative"; + } + } + } } -} \ No newline at end of file +} diff --git a/extras/conf/udb/Includes/SRB222_misc.cfg b/extras/conf/udb/Includes/SRB222_misc.cfg index 68629149e..e274fece6 100644 --- a/extras/conf/udb/Includes/SRB222_misc.cfg +++ b/extras/conf/udb/Includes/SRB222_misc.cfg @@ -1,24 +1,3 @@ -linedefflags -{ - 1 = "[0] Impassable"; - 2 = "[1] Block Enemies"; - 4 = "[2] Double-Sided"; - 8 = "[3] Upper Unpegged"; - 16 = "[4] Lower Unpegged"; - 32 = "[5] Slope Skew (E1)"; - 64 = "[6] Not Climbable"; - 128 = "[7] No Midtexture Skew (E2)"; - 256 = "[8] Peg Midtexture (E3)"; - 512 = "[9] Solid Midtexture (E4)"; - 1024 = "[10] Repeat Midtexture (E5)"; - 2048 = "[11] Netgame Only"; - 4096 = "[12] No Netgame"; - 8192 = "[13] Effect 6"; - 16384 = "[14] Bouncy Wall"; - 32768 = "[15] Transfer Line"; -} - - // Linedef flags UDMF translation table // This is needed for copy/paste and prefabs to work properly // When the UDMF field name is prefixed with ! it is inverted @@ -42,7 +21,6 @@ linedefflagstranslation 32768 = "transfer"; } - linedefflags_udmf { blocking = "Impassable"; @@ -58,42 +36,99 @@ linedefflags_udmf wrapmidtex = "Repeat Midtexture"; netonly = "Netgame Only"; nonet = "No Netgame"; - effect6 = "Effect 6"; bouncy = "Bouncy Wall"; transfer = "Transfer Line"; } -/*linedefrenderstyles +linedefrenderstyles { translucent = "Translucent"; + add = "Add"; + subtract = "Subtract"; + reversesubtract = "Reverse subtract"; + modulate = "Modulate"; fog = "Fog"; -}*/ +} sectorflags { - colormapfog = "Fog Planes in Colormap"; - colormapfadesprites = "Fade Fullbright in Colormap"; - colormapprotected = "Protected Colormap"; + invertprecip = "Invert Precipitation"; + gravityflip = "Flip Objects in Reverse Gravity"; + heatwave = "Heat Wave"; + noclipcamera = "Intangible to the Camera"; + colormapfog = "Fog Planes"; + colormapfadesprites = "Fade Fullbright"; + colormapprotected = "Protected from Tagging"; + outerspace = "Space Countdown"; + doublestepup = "Ramp Sector (double step-up/down)"; + nostepdown = "Non-Ramp Sector (No step-down)"; + speedpad = "Speed Pad"; + starpostactivator = "Star Post Activator"; + exit = "Exit"; + specialstagepit = "Special Stage Pit"; + returnflag = "Return Flag"; + redteambase = "Red Team Base"; + blueteambase = "Blue Team Base"; + fan = "Fan Sector"; + supertransform = "Super Sonic Transform"; + forcespin = "Force Spin"; + zoomtubestart = "Zoom Tube Start"; + zoomtubeend = "Zoom Tube End"; + finishline = "Circuit Finish Line"; + ropehang = "Rope Hang"; + jumpflip = "Flip Gravity on Jump"; + gravityoverride = "Make Reverse Gravity Temporary"; + flipspecial_nofloor = "No Trigger on Floor Touch"; + flipspecial_ceiling = "Trigger on Ceiling Touch"; + triggerspecial_touch = "Trigger on Edge Touch"; + triggerspecial_headbump = "Trigger on Headbump"; + triggerline_plane = "Linedef Trigger Requires Plane Touch"; + triggerline_mobj = "Non-Pushables Can Trigger Linedef"; } -thingflags +sectorflagscategories { - 1 = "[1] Extra"; - 2 = "[2] Flip"; - 4 = "[4] Special"; - 8 = "[8] Ambush"; + invertprecip = "regular"; + gravityflip = "regular"; + heatwave = "regular"; + noclipcamera = "regular"; + colormapfog = "colormap"; + colormapfadesprites = "colormap"; + colormapprotected = "colormap"; + outerspace = "special"; + doublestepup = "special"; + nostepdown = "special"; + speedpad = "special"; + starpostactivator = "special"; + exit = "special"; + specialstagepit = "special"; + returnflag = "special"; + redteambase = "special"; + blueteambase = "special"; + fan = "special"; + supertransform = "special"; + forcespin = "special"; + zoomtubestart = "special"; + zoomtubeend = "special"; + finishline = "special"; + ropehang = "special"; + jumpflip = "special"; + gravityoverride = "special"; + flipspecial_nofloor = "trigger"; + flipspecial_ceiling = "trigger"; + triggerspecial_touch = "trigger"; + triggerspecial_headbump = "trigger"; + triggerline_plane = "trigger"; + triggerline_mobj = "trigger"; } // THING FLAGS thingflags_udmf { - extra = "Extra"; flip = "Flip"; - special = "Special"; - ambush = "Ambush"; + absolutez = "Absolute Z height"; } - // Thing flags UDMF translation table // This is needed for copy/paste and prefabs to work properly // When the UDMF field name is prefixed with ! it is inverted @@ -103,9 +138,9 @@ thingflagstranslation 2 = "flip"; 4 = "special"; 8 = "ambush"; + 16 = "absolutez"; } - // DEFAULT SECTOR BRIGHTNESS LEVELS sectorbrightness { @@ -144,6 +179,8 @@ sectorbrightness 0; } +numbrightnesslevels = 32; + /* TEXTURES AND FLAT SOURCES This tells Doom Builder where to find the information for textures @@ -194,68 +231,14 @@ universalfields { sector { - lightalpha - { - type = 0; - default = 25; - } - - fadealpha - { - type = 0; - default = 25; - } - - fadestart - { - type = 0; - default = 0; - } - - fadeend - { - type = 0; - default = 33; - } - - foglighting - { - type = 3; - default = false; - } } linedef { - arg5 - { - type = 0; - default = 0; - } - stringarg0 - { - type = 2; - default = ""; - } - stringarg1 - { - type = 2; - default = ""; - } - executordelay - { - type = 0; - default = 0; - } } sidedef { - repeatcnt - { - type = 0; - default = 0; - } } thing @@ -278,87 +261,6 @@ allowempty = The nodebuilder is allowed to leave this lump empty. scriptbuild = This lump is a text-based script, which should be compiled using current script compiler; script = This lump is a text-based script. Specify the filename of the script configuration to use. */ - -doommaplumpnames -{ - ~MAP - { - required = true; - blindcopy = true; - nodebuild = false; - } - - THINGS - { - required = true; - nodebuild = true; - allowempty = true; - } - - LINEDEFS - { - required = true; - nodebuild = true; - allowempty = false; - } - - SIDEDEFS - { - required = true; - nodebuild = true; - allowempty = false; - } - - VERTEXES - { - required = true; - nodebuild = true; - allowempty = false; - } - - SEGS - { - required = false; - nodebuild = true; - allowempty = false; - } - - SSECTORS - { - required = false; - nodebuild = true; - allowempty = false; - } - - NODES - { - required = false; - nodebuild = true; - allowempty = false; - } - - SECTORS - { - required = true; - nodebuild = true; - allowempty = false; - } - - REJECT - { - required = false; - nodebuild = true; - allowempty = false; - } - - BLOCKMAP - { - required = false; - nodebuild = true; - allowempty = true; - } -} - udmfmaplumpnames { ZNODES @@ -406,6 +308,12 @@ enums 1 = "Yes"; } + setadd + { + 0 = "Set"; + 1 = "Add"; + } + onoff { 0 = "On"; @@ -437,6 +345,13 @@ enums 2 = "Back"; } + frontbackboth + { + 0 = "Front"; + 1 = "Back"; + 2 = "Front and back"; + } + tangibility { 1 = "Intangible from top"; @@ -444,6 +359,100 @@ enums 4 = "Don't block players"; 8 = "Don't block non-players"; } + + floorceiling + { + 0 = "Floor"; + 1 = "Ceiling"; + 2 = "Both"; + } + + scrollcarry + { + 0 = "Scroll and carry"; + 1 = "Scroll"; + 2 = "Carry"; + } + + scrolltype + { + 0 = "Regular"; + 1 = "Accelerative"; + 2 = "Displacement"; + } + + comparison + { + 0 = "Equal"; + 1 = "Less than or equal"; + 2 = "Greater than or equal"; + } + + triggertype + { + 0 = "Continuous"; + 1 = "Once"; + 2 = "Each time on entry"; + 3 = "Each time on entry/exit"; + } + + xtriggertype + { + 0 = "Continuous"; + 1 = "Each time on entry"; + 2 = "Each time on entry/exit"; + } + + team + { + 0 = "Red"; + 1 = "Blue"; + } + + flagcheck + { + 0 = "Has all"; + 1 = "Has any"; + 2 = "Has exactly"; + 3 = "Doesn't have all"; + 4 = "Doesn't have any"; + } + + maceflags + { + 1 = "Double size"; + 2 = "No sounds"; + 4 = "Player-turnable chain"; + 8 = "Swing instead of spin"; + 16 = "Make chain from end item"; + 32 = "Spawn link at origin"; + 64 = "Clip inside ground"; + 128 = "No distance check"; + } + + pushablebehavior + { + 0 = "Normal"; + 1 = "Slide"; + 2 = "Immovable"; + 3 = "Classic"; + } + + monitorrespawn + { + 0 = "Same item"; + 1 = "Random (Weak)"; + 2 = "Random (Strong)"; + } + + blendmodes + { + 0 = "Translucent"; + 1 = "Add"; + 2 = "Subtract"; + 3 = "Reverse subtract"; + 4 = "Modulate"; + } } //Default things filters @@ -475,48 +484,32 @@ thingsfilters } + //filter3 + //{ + // name = "Normal Gravity"; + // category = ""; + // type = -1; + // + // fields + // { + // 2 = false; + // } + //} - filter3 - { - name = "Normal Gravity"; - category = ""; - type = -1; - - fields - { - 2 = false; - } - - } - - - filter4 - { - name = "Reverse Gravity"; - category = ""; - type = -1; - - fields - { - 2 = true; - } - - } + //filter4 + //{ + // name = "Reverse Gravity"; + // category = ""; + // type = -1; + // + // fields + // { + // 2 = true; + // } + //} } // Special linedefs -speciallinedefs -{ - soundlinedefflag = 64; // See linedefflags - singlesidedflag = 1; // See linedefflags - doublesidedflag = 4; // See linedefflags - impassableflag = 1; - upperunpeggedflag = 8; - lowerunpeggedflag = 16; - repeatmidtextureflag = 1024; - pegmidtextureflag = 256; -} - speciallinedefs_udmf { soundlinedefflag = "noclimb"; @@ -527,6 +520,8 @@ speciallinedefs_udmf lowerunpeggedflag = "dontpegbottom"; repeatmidtextureflag = "wrapmidtex"; pegmidtextureflag = "midpeg"; + slopeskewflag = "skewtd"; + nomidtextureskewflag = "noskew"; } scriptlumpnames @@ -622,4 +617,4 @@ flats start = "F_START"; end = "FF_END"; } -} \ No newline at end of file +} diff --git a/extras/conf/udb/Includes/SRB222_sectors.cfg b/extras/conf/udb/Includes/SRB222_sectors.cfg deleted file mode 100644 index 5cc14ad0f..000000000 --- a/extras/conf/udb/Includes/SRB222_sectors.cfg +++ /dev/null @@ -1,109 +0,0 @@ -sectortypes -{ - 0 = "Normal"; - 1 = "Damage"; - 2 = "Damage (Water)"; - 3 = "Damage (Fire)"; - 4 = "Damage (Electrical)"; - 5 = "Spikes"; - 6 = "Death Pit (Camera Tilt)"; - 7 = "Death Pit (No Camera Tilt)"; - 8 = "Instant Kill"; - 9 = "Ring Drainer (Floor Touch)"; - 10 = "Ring Drainer (Anywhere in Sector)"; - 11 = "Special Stage Damage"; - 12 = "Space Countdown"; - 13 = "Ramp Sector (double step-up/down)"; - 14 = "Non-Ramp Sector (no step-down)"; - 15 = "Bouncy FOF"; - 16 = "Trigger Line Ex. (Pushable Objects)"; - 32 = "Trigger Line Ex. (Anywhere, All Players)"; - 48 = "Trigger Line Ex. (Floor Touch, All Players)"; - 64 = "Trigger Line Ex. (Anywhere in Sector)"; - 80 = "Trigger Line Ex. (Floor Touch)"; - 96 = "Trigger Line Ex. (Emerald Check)"; - 112 = "Trigger Line Ex. (NiGHTS Mare)"; - 128 = "Check for Linedef Executor on FOFs"; - 144 = "Egg Capsule"; - 160 = "Special Stage Time/Spheres Parameters"; - 176 = "Custom Global Gravity"; - 512 = "Wind/Current"; - 1024 = "Conveyor Belt"; - 1280 = "Speed Pad"; - 4096 = "Star Post Activator"; - 8192 = "Exit/Special Stage Pit/Return Flag"; - 12288 = "CTF Red Team Base"; - 16384 = "CTF Blue Team Base"; - 20480 = "Fan Sector"; - 24576 = "Super Sonic Transform"; - 28672 = "Force Spin"; - 32768 = "Zoom Tube Start"; - 36864 = "Zoom Tube End"; - 40960 = "Circuit Finish Line"; - 45056 = "Rope Hang"; - 49152 = "Intangible to the Camera"; -} - -gen_sectortypes -{ - first - { - 0 = "Normal"; - 1 = "Damage"; - 2 = "Damage (Water)"; - 3 = "Damage (Fire)"; - 4 = "Damage (Electrical)"; - 5 = "Spikes"; - 6 = "Death Pit (Camera Tilt)"; - 7 = "Death Pit (No Camera Tilt)"; - 8 = "Instant Kill"; - 9 = "Ring Drainer (Floor Touch)"; - 10 = "Ring Drainer (Anywhere in Sector)"; - 11 = "Special Stage Damage"; - 12 = "Space Countdown"; - 13 = "Ramp Sector (double step-up/down)"; - 14 = "Non-Ramp Sector (no step-down)"; - 15 = "Bouncy FOF"; - } - - second - { - 0 = "Normal"; - 16 = "Trigger Line Ex. (Pushable Objects)"; - 32 = "Trigger Line Ex. (Anywhere, All Players)"; - 48 = "Trigger Line Ex. (Floor Touch, All Players)"; - 64 = "Trigger Line Ex. (Anywhere in Sector)"; - 80 = "Trigger Line Ex. (Floor Touch)"; - 96 = "Trigger Line Ex. (Emerald Check)"; - 112 = "Trigger Line Ex. (NiGHTS Mare)"; - 128 = "Check for Linedef Executor on FOFs"; - 144 = "Egg Capsule"; - 160 = "Special Stage Time/Spheres Parameters"; - 176 = "Custom Global Gravity"; - } - - third - { - 0 = "Normal"; - 512 = "Wind/Current"; - 1024 = "Conveyor Belt"; - 1280 = "Speed Pad"; - } - - fourth - { - 0 = "Normal"; - 4096 = "Star Post Activator"; - 8192 = "Exit/Special Stage Pit/Return Flag"; - 12288 = "CTF Red Team Base"; - 16384 = "CTF Blue Team Base"; - 20480 = "Fan Sector"; - 24576 = "Super Sonic Transform"; - 28672 = "Force Spin"; - 32768 = "Zoom Tube Start"; - 36864 = "Zoom Tube End"; - 40960 = "Circuit Finish Line"; - 45056 = "Rope Hang"; - 49152 = "Intangible to the Camera"; - } -} \ No newline at end of file diff --git a/extras/conf/udb/Includes/SRB222_things.cfg b/extras/conf/udb/Includes/SRB222_things.cfg index 113c1a4c2..df08e3ac5 100644 --- a/extras/conf/udb/Includes/SRB222_things.cfg +++ b/extras/conf/udb/Includes/SRB222_things.cfg @@ -3,3140 +3,5394 @@ // 8-Dark_Gray 9-Blue 10-Green 11-Cyan 12-Red 13-Magenta // 14-Yellow 15-White 16-Pink 17-Orange 18-Gold 19-Cream -editor +udmf { - color = 15; // White - arrow = 1; - title = ""; - error = -1; - width = 8; - height = 16; - sort = 1; - 3328 = "3D Mode Start"; -} - -starts -{ - color = 1; // Blue - arrow = 1; - title = "Player Starts"; - width = 16; - height = 48; - sprite = "PLAYA0"; - - 1 + starts { - title = "Player 01 Start"; - sprite = "PLAYA0"; - } - 2 - { - title = "Player 02 Start"; - sprite = "PLAYA0"; - } - 3 - { - title = "Player 03 Start"; - sprite = "PLAYA0"; - } - 4 - { - title = "Player 04 Start"; - sprite = "PLAYA0"; - } - 5 - { - title = "Player 05 Start"; - sprite = "PLAYA0"; - } - 6 - { - title = "Player 06 Start"; - sprite = "PLAYA0"; - } - 7 - { - title = "Player 07 Start"; - sprite = "PLAYA0"; - } - 8 - { - title = "Player 08 Start"; - sprite = "PLAYA0"; - } - 9 - { - title = "Player 09 Start"; - sprite = "PLAYA0"; - } - 10 - { - title = "Player 10 Start"; - sprite = "PLAYA0"; - } - 11 - { - title = "Player 11 Start"; - sprite = "PLAYA0"; - } - 12 - { - title = "Player 12 Start"; - sprite = "PLAYA0"; - } - 13 - { - title = "Player 13 Start"; - sprite = "PLAYA0"; - } - 14 - { - title = "Player 14 Start"; - sprite = "PLAYA0"; - } - 15 - { - title = "Player 15 Start"; - sprite = "PLAYA0"; - } - 16 - { - title = "Player 16 Start"; - sprite = "PLAYA0"; - } - 17 - { - title = "Player 17 Start"; - sprite = "PLAYA0"; - } - 18 - { - title = "Player 18 Start"; - sprite = "PLAYA0"; - } - 19 - { - title = "Player 19 Start"; - sprite = "PLAYA0"; - } - 20 - { - title = "Player 20 Start"; - sprite = "PLAYA0"; - } - 21 - { - title = "Player 21 Start"; - sprite = "PLAYA0"; - } - 22 - { - title = "Player 22 Start"; - sprite = "PLAYA0"; - } - 23 - { - title = "Player 23 Start"; - sprite = "PLAYA0"; - } - 24 - { - title = "Player 24 Start"; - sprite = "PLAYA0"; - } - 25 - { - title = "Player 25 Start"; - sprite = "PLAYA0"; - } - 26 - { - title = "Player 26 Start"; - sprite = "PLAYA0"; - } - 27 - { - title = "Player 27 Start"; - sprite = "PLAYA0"; - } - 28 - { - title = "Player 28 Start"; - sprite = "PLAYA0"; - } - 29 - { - title = "Player 29 Start"; - sprite = "PLAYA0"; - } - 30 - { - title = "Player 30 Start"; - sprite = "PLAYA0"; - } - 31 - { - title = "Player 31 Start"; - sprite = "PLAYA0"; - } - 32 - { - title = "Player 32 Start"; - sprite = "PLAYA0"; - } - 33 - { - title = "Match Start"; - sprite = "NDRNA2A8"; - } - 34 - { - title = "CTF Red Team Start"; - sprite = "SIGNG0"; - } - 35 - { - title = "CTF Blue Team Start"; - sprite = "SIGNE0"; - } -} - -enemies -{ - color = 9; // Light_Blue - arrow = 1; - title = "Enemies"; - - 100 - { - title = "Crawla (Blue)"; - sprite = "POSSA1"; - width = 24; - height = 32; - } - 101 - { - title = "Crawla (Red)"; - sprite = "SPOSA1"; - width = 24; - height = 32; - } - 102 - { - title = "Stupid Dumb Unnamed RoboFish"; - sprite = "FISHA0"; - width = 8; - height = 28; - } - 103 - { - title = "Buzz (Gold)"; - sprite = "BUZZA1"; - width = 28; - height = 40; - } - 104 - { - title = "Buzz (Red)"; - sprite = "RBUZA1"; - width = 28; - height = 40; - } - 108 - { - title = "Deton"; - sprite = "DETNA1"; - width = 20; - height = 32; - } - 110 - { - title = "Turret"; - sprite = "TRETA1"; - width = 16; - height = 32; - } - 111 - { - title = "Pop-up Turret"; - sprite = "TURRI1"; - width = 12; - height = 64; - } - 122 - { - title = "Spring Shell (Green)"; - sprite = "SSHLA1"; - width = 24; - height = 40; - } - 125 - { - title = "Spring Shell (Yellow)"; - sprite = "SSHLI1"; - width = 24; - height = 40; - } - 109 - { - title = "Skim"; - sprite = "SKIMA1"; - width = 16; - height = 24; - } - 113 - { - title = "Jet Jaw"; - sprite = "JJAWA3A7"; - width = 12; - height = 20; - } - 126 - { - title = "Crushstacean"; - sprite = "CRABA0"; - width = 24; - height = 32; - } - 138 - { - title = "Banpyura"; - sprite = "CR2BA0"; - width = 24; - height = 32; - } - 117 - { - title = "Robo-Hood"; - sprite = "ARCHA1"; - width = 24; - height = 32; - } - 118 - { - title = "Lance-a-Bot"; - sprite = "CBFSA1"; - width = 32; - height = 72; - } - 1113 - { - title = "Suspicious Lance-a-Bot Statue"; - sprite = "CBBSA1"; - width = 32; - height = 72; - } - 119 - { - title = "Egg Guard"; - sprite = "ESHIA1"; + color = 1; // Blue + arrow = 1; + title = "Player Starts"; width = 16; height = 48; - } - 115 - { - title = "Bird Aircraft Strike Hazard"; - sprite = "VLTRF1"; - width = 12; - height = 24; - } - 120 - { - title = "Green Snapper"; - sprite = "GSNPA1"; - width = 24; - height = 24; - } - 121 - { - title = "Minus"; - sprite = "MNUSA0"; - width = 24; - height = 32; - } - 134 - { - title = "Canarivore"; - sprite = "CANAA0"; - width = 12; - height = 80; - hangs = 1; - } - 123 - { - title = "Unidus"; - sprite = "UNIDA1"; - width = 18; - height = 36; - } - 135 - { - title = "Pterabyte Spawner"; - sprite = "PTERA2A8"; - width = 16; - height = 16; - } - 136 - { - title = "Pyre Fly"; - sprite = "PYREA0"; - width = 24; - height = 34; - } - 137 - { - title = "Dragonbomber"; - sprite = "DRABA1"; - width = 28; - height = 48; - } - 105 - { - title = "Jetty-Syn Bomber"; - sprite = "JETBB1"; - width = 20; - height = 50; - } - 106 - { - title = "Jetty-Syn Gunner"; - sprite = "JETGB1"; - width = 20; - height = 48; - } - 112 - { - title = "Spincushion"; - sprite = "SHRPA1"; - width = 16; - height = 24; - } - 114 - { - title = "Snailer"; - sprite = "SNLRA3A7"; - width = 24; - height = 48; - } - 129 - { - title = "Penguinator"; - sprite = "PENGA1"; - width = 24; - height = 32; - } - 130 - { - title = "Pophat"; - sprite = "POPHA1"; - width = 24; - height = 32; - } - 107 - { - title = "Crawla Commander"; - sprite = "CCOMA1"; - width = 16; - height = 32; - } - 131 - { - title = "Spinbobert"; - sprite = "SBOBB0"; - width = 32; - height = 32; - } - 132 - { - title = "Cacolantern"; - sprite = "CACOA0"; - width = 32; - height = 32; - } - 133 - { - title = "Hangster"; - sprite = "HBATC1"; - width = 24; - height = 24; - hangs = 1; - } - 127 - { - title = "Hive Elemental"; - sprite = "HIVEA0"; - width = 32; - height = 80; - } - 128 - { - title = "Bumblebore"; - sprite = "BUMBA1"; - width = 16; - height = 32; - } - 124 - { - title = "Buggle"; - sprite = "BBUZA1"; - width = 20; - height = 24; - } - 116 - { - title = "Pointy"; - sprite = "PNTYA1"; - width = 8; - height = 16; - } -} + sprite = "PLAYA0"; -bosses -{ - color = 8; // Dark_Gray - arrow = 1; - title = "Bosses"; + 1 + { + title = "Player 01 Start"; + sprite = "PLAYA0"; + arg0 + { + title = "Spawn on ceiling?"; + type = 11; + enum = "noyes"; + } + } + 2 + { + title = "Player 02 Start"; + sprite = "PLAYA0"; + arg0 + { + title = "Spawn on ceiling?"; + type = 11; + enum = "noyes"; + } + } + 3 + { + title = "Player 03 Start"; + sprite = "PLAYA0"; + arg0 + { + title = "Spawn on ceiling?"; + type = 11; + enum = "noyes"; + } + } + 4 + { + title = "Player 04 Start"; + sprite = "PLAYA0"; + arg0 + { + title = "Spawn on ceiling?"; + type = 11; + enum = "noyes"; + } + } + 5 + { + title = "Player 05 Start"; + sprite = "PLAYA0"; + arg0 + { + title = "Spawn on ceiling?"; + type = 11; + enum = "noyes"; + } + } + 6 + { + title = "Player 06 Start"; + sprite = "PLAYA0"; + arg0 + { + title = "Spawn on ceiling?"; + type = 11; + enum = "noyes"; + } + } + 7 + { + title = "Player 07 Start"; + sprite = "PLAYA0"; + arg0 + { + title = "Spawn on ceiling?"; + type = 11; + enum = "noyes"; + } + } + 8 + { + title = "Player 08 Start"; + sprite = "PLAYA0"; + arg0 + { + title = "Spawn on ceiling?"; + type = 11; + enum = "noyes"; + } + } + 9 + { + title = "Player 09 Start"; + sprite = "PLAYA0"; + arg0 + { + title = "Spawn on ceiling?"; + type = 11; + enum = "noyes"; + } + } + 10 + { + title = "Player 10 Start"; + sprite = "PLAYA0"; + arg0 + { + title = "Spawn on ceiling?"; + type = 11; + enum = "noyes"; + } + } + 11 + { + title = "Player 11 Start"; + sprite = "PLAYA0"; + arg0 + { + title = "Spawn on ceiling?"; + type = 11; + enum = "noyes"; + } + } + 12 + { + title = "Player 12 Start"; + sprite = "PLAYA0"; + arg0 + { + title = "Spawn on ceiling?"; + type = 11; + enum = "noyes"; + } + } + 13 + { + title = "Player 13 Start"; + sprite = "PLAYA0"; + arg0 + { + title = "Spawn on ceiling?"; + type = 11; + enum = "noyes"; + } + } + 14 + { + title = "Player 14 Start"; + sprite = "PLAYA0"; + arg0 + { + title = "Spawn on ceiling?"; + type = 11; + enum = "noyes"; + } + } + 15 + { + title = "Player 15 Start"; + sprite = "PLAYA0"; + arg0 + { + title = "Spawn on ceiling?"; + type = 11; + enum = "noyes"; + } + } + 16 + { + title = "Player 16 Start"; + sprite = "PLAYA0"; + arg0 + { + title = "Spawn on ceiling?"; + type = 11; + enum = "noyes"; + } + } + 17 + { + title = "Player 17 Start"; + sprite = "PLAYA0"; + arg0 + { + title = "Spawn on ceiling?"; + type = 11; + enum = "noyes"; + } + } + 18 + { + title = "Player 18 Start"; + sprite = "PLAYA0"; + arg0 + { + title = "Spawn on ceiling?"; + type = 11; + enum = "noyes"; + } + } + 19 + { + title = "Player 19 Start"; + sprite = "PLAYA0"; + arg0 + { + title = "Spawn on ceiling?"; + type = 11; + enum = "noyes"; + } + } + 20 + { + title = "Player 20 Start"; + sprite = "PLAYA0"; + arg0 + { + title = "Spawn on ceiling?"; + type = 11; + enum = "noyes"; + } + } + 21 + { + title = "Player 21 Start"; + sprite = "PLAYA0"; + arg0 + { + title = "Spawn on ceiling?"; + type = 11; + enum = "noyes"; + } + } + 22 + { + title = "Player 22 Start"; + sprite = "PLAYA0"; + arg0 + { + title = "Spawn on ceiling?"; + type = 11; + enum = "noyes"; + } + } + 23 + { + title = "Player 23 Start"; + sprite = "PLAYA0"; + arg0 + { + title = "Spawn on ceiling?"; + type = 11; + enum = "noyes"; + } + } + 24 + { + title = "Player 24 Start"; + sprite = "PLAYA0"; + arg0 + { + title = "Spawn on ceiling?"; + type = 11; + enum = "noyes"; + } + } + 25 + { + title = "Player 25 Start"; + sprite = "PLAYA0"; + arg0 + { + title = "Spawn on ceiling?"; + type = 11; + enum = "noyes"; + } + } + 26 + { + title = "Player 26 Start"; + sprite = "PLAYA0"; + arg0 + { + title = "Spawn on ceiling?"; + type = 11; + enum = "noyes"; + } + } + 27 + { + title = "Player 27 Start"; + sprite = "PLAYA0"; + arg0 + { + title = "Spawn on ceiling?"; + type = 11; + enum = "noyes"; + } + } + 28 + { + title = "Player 28 Start"; + sprite = "PLAYA0"; + arg0 + { + title = "Spawn on ceiling?"; + type = 11; + enum = "noyes"; + } + } + 29 + { + title = "Player 29 Start"; + sprite = "PLAYA0"; + arg0 + { + title = "Spawn on ceiling?"; + type = 11; + enum = "noyes"; + } + } + 30 + { + title = "Player 30 Start"; + sprite = "PLAYA0"; + arg0 + { + title = "Spawn on ceiling?"; + type = 11; + enum = "noyes"; + } + } + 31 + { + title = "Player 31 Start"; + sprite = "PLAYA0"; + arg0 + { + title = "Spawn on ceiling?"; + type = 11; + enum = "noyes"; + } + } + 32 + { + title = "Player 32 Start"; + sprite = "PLAYA0"; + arg0 + { + title = "Spawn on ceiling?"; + type = 11; + enum = "noyes"; + } + } + 33 + { + title = "Match Start"; + sprite = "NDRNA2A8"; + arg0 + { + title = "Spawn on ceiling?"; + type = 11; + enum = "noyes"; + } + } + 34 + { + title = "CTF Red Team Start"; + sprite = "SIGNG0"; + arg0 + { + title = "Spawn on ceiling?"; + type = 11; + enum = "noyes"; + } + } + 35 + { + title = "CTF Blue Team Start"; + sprite = "SIGNE0"; + arg0 + { + title = "Spawn on ceiling?"; + type = 11; + enum = "noyes"; + } + } + } - 200 + enemies { - title = "Egg Mobile"; - sprite = "EGGMA1"; - width = 24; - height = 76; - } - 201 - { - title = "Egg Slimer"; - sprite = "EGGNA1"; - width = 24; - height = 76; - } - 202 - { - title = "Sea Egg"; - sprite = "EGGOA1"; - width = 32; - height = 116; - } - 203 - { - title = "Egg Colosseum"; - sprite = "EGGPA1"; - width = 24; - height = 76; - } - 204 - { - title = "Fang"; - sprite = "FANGA1"; - width = 24; - height = 60; - } - 206 - { - title = "Brak Eggman (Old)"; - sprite = "BRAKB1"; - width = 48; - height = 160; - } - 207 - { - title = "Metal Sonic (Race)"; - sprite = "METLI1"; - width = 16; - height = 48; - } - 208 - { - title = "Metal Sonic (Battle)"; - sprite = "METLC1"; - width = 16; - height = 48; - } - 209 - { - title = "Brak Eggman"; - sprite = "BRAK01"; - width = 48; - height = 160; - } - 290 - { - arrow = 0; - title = "Boss Escape Point"; - width = 8; - height = 16; - sprite = "internal:eggmanend"; - } - 291 - { - arrow = 0; - title = "Egg Capsule Center"; - width = 8; - height = 16; - sprite = "internal:capsule"; - } - 292 - { - arrow = 0; - title = "Boss Waypoint"; - width = 8; - height = 16; - sprite = "internal:eggmanway"; - } - 293 - { - title = "Metal Sonic Gather Point"; - sprite = "internal:metal"; - width = 8; - height = 16; - } - 294 - { - title = "Fang Waypoint"; - sprite = "internal:eggmanway"; - width = 8; - height = 16; - } -} + color = 9; // Light_Blue + arrow = 1; + title = "Enemies"; -rings -{ - color = 14; // Yellow - title = "Rings and Weapon Panels"; - width = 24; - height = 24; - sprite = "RINGA0"; + 100 + { + title = "Crawla (Blue)"; + sprite = "POSSA1"; + width = 24; + height = 32; + } + 101 + { + title = "Crawla (Red)"; + sprite = "SPOSA1"; + width = 24; + height = 32; + } + 102 + { + title = "Stupid Dumb Unnamed RoboFish"; + sprite = "FISHA0"; + width = 8; + height = 28; + arg0 + { + title = "Jump strength"; + } + } + 103 + { + title = "Buzz (Gold)"; + sprite = "BUZZA1"; + width = 28; + height = 40; + arg0 + { + title = "Can move?"; + type = 11; + enum = "yesno"; + } + } + 104 + { + title = "Buzz (Red)"; + sprite = "RBUZA1"; + width = 28; + height = 40; + arg0 + { + title = "Can move?"; + type = 11; + enum = "yesno"; + } + } + 108 + { + title = "Deton"; + sprite = "DETNA1"; + width = 20; + height = 32; + } + 110 + { + title = "Turret"; + sprite = "TRETA1"; + width = 16; + height = 32; + arg0 + { + title = "Death trigger tag"; + type = 15; + } + } + 111 + { + title = "Pop-up Turret"; + sprite = "TURRI1"; + width = 12; + height = 64; + arg0 + { + title = "Firing delay"; + } + } + 122 + { + title = "Spring Shell (Green)"; + sprite = "SSHLA1"; + width = 24; + height = 40; + } + 125 + { + title = "Spring Shell (Yellow)"; + sprite = "SSHLI1"; + width = 24; + height = 40; + } + 109 + { + title = "Skim"; + sprite = "SKIMA1"; + width = 16; + height = 24; + } + 113 + { + title = "Jet Jaw"; + sprite = "JJAWA3A7"; + width = 12; + height = 20; + } + 126 + { + title = "Crushstacean"; + sprite = "CRABA0"; + width = 24; + height = 32; + arg0 + { + title = "Spawn direction"; + type = 11; + enum + { + 0 = "Right"; + 1 = "Left"; + } + } + } + 138 + { + title = "Banpyura"; + sprite = "CR2BA0"; + width = 24; + height = 32; + arg0 + { + title = "Spawn direction"; + type = 11; + enum + { + 0 = "Right"; + 1 = "Left"; + } + } + } + 117 + { + title = "Robo-Hood"; + sprite = "ARCHA1"; + width = 24; + height = 32; + arg0 + { + title = "Can jump?"; + type = 11; + enum = "yesno"; + } + } + 118 + { + title = "Lance-a-Bot"; + sprite = "CBFSA1"; + width = 32; + height = 72; + } + 1113 + { + title = "Suspicious Lance-a-Bot Statue"; + sprite = "CBBSA1"; + width = 32; + height = 72; + arg0 + { + title = "Push behavior"; + type = 11; + enum = "pushablebehavior"; + } + } + 119 + { + title = "Egg Guard"; + sprite = "ESHIA1"; + width = 16; + height = 48; + arg0 + { + title = "Turn direction"; + type = 11; + enum + { + 0 = "Back"; + 1 = "Right"; + 2 = "Left"; + } + } + arg1 + { + title = "Double speed?"; + type = 11; + enum = "noyes"; + } + } + 115 + { + title = "Bird Aircraft Strike Hazard"; + sprite = "VLTRF1"; + width = 12; + height = 24; + } + 120 + { + title = "Green Snapper"; + sprite = "GSNPA1"; + width = 24; + height = 24; + } + 121 + { + title = "Minus"; + sprite = "MNUSA0"; + width = 24; + height = 32; + } + 134 + { + title = "Canarivore"; + sprite = "CANAA0"; + width = 12; + height = 80; + hangs = 1; + } + 123 + { + title = "Unidus"; + sprite = "UNIDA1"; + width = 18; + height = 36; + } + 135 + { + title = "Pterabyte Spawner"; + sprite = "PTERA2A8"; + width = 16; + height = 16; + arg0 + { + title = "Number of Pterabytes"; + default = 1; + } + } + 136 + { + title = "Pyre Fly"; + sprite = "PYREA0"; + width = 24; + height = 34; + arg0 + { + title = "Start on fire?"; + type = 11; + enum = "noyes"; + } + } + 137 + { + title = "Dragonbomber"; + sprite = "DRABA1"; + width = 28; + height = 48; + } + 105 + { + title = "Jetty-Syn Bomber"; + sprite = "JETBB1"; + width = 20; + height = 50; + arg0 + { + title = "Can move?"; + type = 11; + enum = "yesno"; + } + } + 106 + { + title = "Jetty-Syn Gunner"; + sprite = "JETGB1"; + width = 20; + height = 48; + arg0 + { + title = "Can move?"; + type = 11; + enum = "yesno"; + } + } + 112 + { + title = "Spincushion"; + sprite = "SHRPA1"; + width = 16; + height = 24; + } + 114 + { + title = "Snailer"; + sprite = "SNLRA3A7"; + width = 24; + height = 48; + } + 129 + { + title = "Penguinator"; + sprite = "PENGA1"; + width = 24; + height = 32; + } + 130 + { + title = "Pophat"; + sprite = "POPHA1"; + width = 24; + height = 32; + } + 107 + { + title = "Crawla Commander"; + sprite = "CCOMA1"; + width = 16; + height = 32; + } + 131 + { + title = "Spinbobert"; + sprite = "SBOBB0"; + width = 32; + height = 32; + } + 132 + { + title = "Cacolantern"; + sprite = "CACOA0"; + width = 32; + height = 32; + arg0 + { + title = "Can move?"; + type = 11; + enum = "yesno"; + } + } + 133 + { + title = "Hangster"; + sprite = "HBATC1"; + width = 24; + height = 24; + hangs = 1; + } + 127 + { + title = "Hive Elemental"; + sprite = "HIVEA0"; + width = 32; + height = 80; + arg0 + { + title = "Number of bees"; + } + } + 128 + { + title = "Bumblebore"; + sprite = "BUMBA1"; + width = 16; + height = 32; + arg0 + { + title = "Can move?"; + type = 11; + enum = "yesno"; + } + } + 124 + { + title = "Buggle"; + sprite = "BBUZA1"; + width = 20; + height = 24; + } + 116 + { + title = "Pointy"; + sprite = "PNTYA1"; + width = 8; + height = 16; + } + } - 300 + bosses { - title = "Ring"; + color = 4; // Dark Red + arrow = 1; + title = "Bosses"; + + 200 + { + title = "Egg Mobile"; + sprite = "EGGMA1"; + width = 24; + height = 76; + arg0 + { + title = "Boss ID"; + } + arg1 + { + title = "End level on death?"; + type = 11; + enum = "noyes"; + } + arg2 + { + title = "Death trigger tag"; + type = 15; + } + arg3 + { + title = "Victory trigger tag"; + type = 15; + } + arg4 + { + title = "Pinch trigger tag"; + type = 15; + } + } + 201 + { + title = "Egg Slimer"; + sprite = "EGGNA1"; + width = 24; + height = 76; + arg0 + { + title = "Boss ID"; + } + arg1 + { + title = "End level on death?"; + type = 11; + enum = "noyes"; + } + arg2 + { + title = "Death trigger tag"; + type = 15; + } + arg3 + { + title = "Victory trigger tag"; + type = 15; + } + arg4 + { + title = "Pinch trigger tag"; + type = 15; + } + arg5 + { + title = "Speed up when hit?"; + type = 11; + enum = "yesno"; + } + } + 202 + { + title = "Sea Egg"; + sprite = "EGGOA1"; + width = 32; + height = 116; + arg0 + { + title = "Boss ID"; + } + arg1 + { + title = "End level on death?"; + type = 11; + enum = "noyes"; + } + arg2 + { + title = "Death trigger tag"; + type = 15; + } + arg3 + { + title = "Victory trigger tag"; + type = 15; + } + arg4 + { + title = "Pinch trigger tag"; + type = 15; + } + } + 203 + { + title = "Egg Colosseum"; + sprite = "EGGPA1"; + width = 24; + height = 76; + arg0 + { + title = "Boss ID"; + } + arg1 + { + title = "End level on death?"; + type = 11; + enum = "noyes"; + } + arg2 + { + title = "Death trigger tag"; + type = 15; + } + arg3 + { + title = "Victory trigger tag"; + type = 15; + } + arg4 + { + title = "Pinch trigger tag"; + type = 15; + } + arg5 + { + title = "Cage drop trigger tag"; + type = 15; + } + } + 204 + { + title = "Fang"; + sprite = "FANGA1"; + width = 24; + height = 60; + arg0 + { + title = "Boss ID"; + } + arg1 + { + title = "End level on death?"; + type = 11; + enum = "noyes"; + } + arg2 + { + title = "Death trigger tag"; + type = 15; + } + arg3 + { + title = "Victory trigger tag"; + type = 15; + } + arg4 + { + title = "Pinch trigger tag"; + type = 15; + } + arg5 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Grayscale"; + 2 = "Skip intro"; + } + } + } + 206 + { + title = "Brak Eggman (Old)"; + sprite = "BRAKB1"; + width = 48; + height = 160; + arg0 + { + title = "Boss ID"; + } + arg1 + { + title = "End level on death?"; + type = 11; + enum = "noyes"; + } + arg2 + { + title = "Death trigger tag"; + type = 15; + } + arg3 + { + title = "Victory trigger tag"; + type = 15; + } + arg4 + { + title = "Pinch trigger tag"; + type = 15; + } + arg5 + { + title = "Platform trigger tag"; + type = 15; + } + } + 207 + { + title = "Metal Sonic (Race)"; + sprite = "METLI1"; + width = 16; + height = 48; + arg0 + { + title = "Grayscale?"; + type = 11; + enum = "noyes"; + } + } + 208 + { + title = "Metal Sonic (Battle)"; + sprite = "METLC1"; + width = 16; + height = 48; + arg0 + { + title = "Boss ID"; + } + arg1 + { + title = "End level on death?"; + type = 11; + enum = "noyes"; + } + arg2 + { + title = "Death trigger tag"; + type = 15; + } + arg3 + { + title = "Victory trigger tag"; + type = 15; + } + arg4 + { + title = "Pinch trigger tag"; + type = 15; + } + arg5 + { + title = "Grayscale?"; + type = 11; + enum = "noyes"; + } + } + 209 + { + title = "Brak Eggman"; + sprite = "BRAK01"; + width = 48; + height = 160; + arg0 + { + title = "Boss ID"; + } + arg1 + { + title = "End level on death?"; + type = 11; + enum = "noyes"; + } + arg2 + { + title = "Death trigger tag"; + type = 15; + } + arg3 + { + title = "Victory trigger tag"; + type = 15; + } + arg4 + { + title = "Pinch trigger tag"; + type = 15; + } + arg5 + { + title = "Attack trigger tag"; + type = 15; + } + arg6 + { + title = "Flags"; + type = 12; + enum + { + 1 = "No origin-fling death"; + 2 = "Electric barrier"; + } + } + } + 290 + { + arrow = 0; + title = "Boss Escape Point"; + width = 8; + height = 16; + sprite = "internal:eggmanend"; + } + 291 + { + arrow = 0; + title = "Egg Capsule Center"; + width = 8; + height = 16; + sprite = "internal:capsule"; + } + 292 + { + arrow = 0; + title = "Boss Waypoint"; + width = 8; + height = 16; + sprite = "internal:eggmanway"; + arg0 + { + title = "Sea Egg sequence"; + } + arg1 + { + title = "Brak Eggman sequence"; + } + } + 293 + { + title = "Metal Sonic Gather Point"; + sprite = "internal:metal"; + width = 8; + height = 16; + } + 294 + { + title = "Fang Waypoint"; + sprite = "internal:eggmanway"; + width = 8; + height = 16; + arg0 + { + title = "Center waypoint?"; + type = 11; + enum = "noyes"; + } + } + } + + rings + { + color = 14; // Yellow + title = "Rings and Weapon Panels"; + width = 24; + height = 24; sprite = "RINGA0"; - width = 16; - } - 301 - { - title = "Bounce Ring"; - sprite = "internal:RNGBA0"; - } - 302 - { - title = "Rail Ring"; - sprite = "internal:RNGRA0"; - } - 303 - { - title = "Infinity Ring"; - sprite = "internal:RNGIA0"; - } - 304 - { - title = "Automatic Ring"; - sprite = "internal:RNGAA0"; - } - 305 - { - title = "Explosion Ring"; - sprite = "internal:RNGEA0"; - } - 306 - { - title = "Scatter Ring"; - sprite = "internal:RNGSA0"; - } - 307 - { - title = "Grenade Ring"; - sprite = "internal:RNGGA0"; - } - 308 - { - title = "CTF Team Ring (Red)"; - sprite = "internal:RRNGA0"; - width = 16; - } - 309 - { - title = "CTF Team Ring (Blue)"; - sprite = "internal:BRNGA0"; - width = 16; - } - 330 - { - title = "Bounce Ring Panel"; - sprite = "internal:PIKBA0"; - } - 331 - { - title = "Rail Ring Panel"; - sprite = "internal:PIKRA0"; - } - 332 - { - title = "Automatic Ring Panel"; - sprite = "internal:PIKAA0"; - } - 333 - { - title = "Explosion Ring Panel"; - sprite = "internal:PIKEA0"; - } - 334 - { - title = "Scatter Ring Panel"; - sprite = "internal:PIKSA0"; - } - 335 - { - title = "Grenade Ring Panel"; - sprite = "internal:PIKGA0"; - } -} -collectibles -{ - color = 10; // Light_Green - title = "Other Collectibles"; - width = 16; - height = 32; - sort = 1; - sprite = "CEMGA0"; + 300 + { + title = "Ring"; + sprite = "RINGA0"; + width = 16; + arg0 + { + title = "Float?"; + type = 11; + enum = "yesno"; + } + } + 301 + { + title = "Bounce Ring"; + sprite = "RNGBA0"; + arg0 + { + title = "Float?"; + type = 11; + enum = "yesno"; + } + } + 302 + { + title = "Rail Ring"; + sprite = "RNGRA0"; + arg0 + { + title = "Float?"; + type = 11; + enum = "yesno"; + } + } + 303 + { + title = "Infinity Ring"; + sprite = "RNGIA0"; + arg0 + { + title = "Float?"; + type = 11; + enum = "yesno"; + } + } + 304 + { + title = "Automatic Ring"; + sprite = "RNGAA0"; + arg0 + { + title = "Float?"; + type = 11; + enum = "yesno"; + } + } + 305 + { + title = "Explosion Ring"; + sprite = "RNGEA0"; + arg0 + { + title = "Float?"; + type = 11; + enum = "yesno"; + } + } + 306 + { + title = "Scatter Ring"; + sprite = "RNGSA0"; + arg0 + { + title = "Float?"; + type = 11; + enum = "yesno"; + } + } + 307 + { + title = "Grenade Ring"; + sprite = "RNGGA0"; + arg0 + { + title = "Float?"; + type = 11; + enum = "yesno"; + } + } + 308 + { + title = "CTF Team Ring (Red)"; + sprite = "internal:TRNGA0R"; + width = 16; + arg0 + { + title = "Float?"; + type = 11; + enum = "yesno"; + } + } + 309 + { + title = "CTF Team Ring (Blue)"; + sprite = "internal:TRNGA0B"; + width = 16; + arg0 + { + title = "Float?"; + type = 11; + enum = "yesno"; + } + } + 330 + { + title = "Bounce Ring Panel"; + sprite = "PIKBA0"; + arg0 + { + title = "Float?"; + type = 11; + enum = "yesno"; + } + } + 331 + { + title = "Rail Ring Panel"; + sprite = "PIKRA0"; + arg0 + { + title = "Float?"; + type = 11; + enum = "yesno"; + } + } + 332 + { + title = "Automatic Ring Panel"; + sprite = "PIKAA0"; + arg0 + { + title = "Float?"; + type = 11; + enum = "yesno"; + } + } + 333 + { + title = "Explosion Ring Panel"; + sprite = "PIKEA0"; + arg0 + { + title = "Float?"; + type = 11; + enum = "yesno"; + } + } + 334 + { + title = "Scatter Ring Panel"; + sprite = "PIKSA0"; + arg0 + { + title = "Float?"; + type = 11; + enum = "yesno"; + } + } + 335 + { + title = "Grenade Ring Panel"; + sprite = "PIKGA0"; + arg0 + { + title = "Float?"; + type = 11; + enum = "yesno"; + } + } + } - 310 + collectibles { - title = "CTF Red Flag"; - sprite = "RFLGA0"; - width = 24; - height = 64; - } - 311 - { - title = "CTF Blue Flag"; - sprite = "BFLGA0"; - width = 24; - height = 64; - } - 312 - { - title = "Emerald Token"; - sprite = "TOKEA0"; + color = 10; // Light_Green + title = "Other Collectibles"; width = 16; height = 32; - } - 313 - { - title = "Chaos Emerald 1 (Green)"; + sort = 1; sprite = "CEMGA0"; - } - 314 - { - title = "Chaos Emerald 2 (Purple)"; - sprite = "CEMGB0"; - } - 315 - { - title = "Chaos Emerald 3 (Blue)"; - sprite = "CEMGC0"; - } - 316 - { - title = "Chaos Emerald 4 (Cyan)"; - sprite = "CEMGD0"; - } - 317 - { - title = "Chaos Emerald 5 (Orange)"; - sprite = "CEMGE0"; - } - 318 - { - title = "Chaos Emerald 6 (Red)"; - sprite = "CEMGF0"; - } - 319 - { - title = "Chaos Emerald 7 (Gray)"; - sprite = "CEMGG0"; - } - 320 - { - title = "Emerald Hunt Location"; - sprite = "SHRDA0"; - } - 321 - { - title = "Match Chaos Emerald Spawn"; - sprite = "CEMGA0"; - } - 322 - { - title = "Emblem"; - sprite = "EMBMA0"; - width = 16; - height = 30; - } -} -boxes -{ - color = 7; // Gray - blocking = 2; - title = "Monitors"; - width = 18; - height = 40; + 310 + { + title = "CTF Red Flag"; + sprite = "RFLGA0"; + width = 24; + height = 64; + } + 311 + { + title = "CTF Blue Flag"; + sprite = "BFLGA0"; + width = 24; + height = 64; + } + 312 + { + title = "Emerald Token"; + sprite = "TOKEA0"; + width = 16; + height = 32; + arg0 + { + title = "Float?"; + type = 11; + enum = "yesno"; + } + } + 313 + { + title = "Chaos Emerald 1 (Green)"; + sprite = "CEMGA0"; + } + 314 + { + title = "Chaos Emerald 2 (Purple)"; + sprite = "CEMGB0"; + } + 315 + { + title = "Chaos Emerald 3 (Blue)"; + sprite = "CEMGC0"; + } + 316 + { + title = "Chaos Emerald 4 (Cyan)"; + sprite = "CEMGD0"; + } + 317 + { + title = "Chaos Emerald 5 (Orange)"; + sprite = "CEMGE0"; + } + 318 + { + title = "Chaos Emerald 6 (Red)"; + sprite = "CEMGF0"; + } + 319 + { + title = "Chaos Emerald 7 (Gray)"; + sprite = "CEMGG0"; + } + 320 + { + title = "Emerald Hunt Location"; + sprite = "SHRDA0"; + arg0 + { + title = "Float?"; + type = 11; + enum = "yesno"; + } + } + 321 + { + title = "Match Chaos Emerald Spawn"; + sprite = "CEMGA0"; + arg0 + { + title = "Float?"; + type = 11; + enum = "yesno"; + } + } + 322 + { + title = "Emblem"; + sprite = "EMBMA0"; + width = 16; + height = 30; + arg1 + { + title = "Float?"; + type = 11; + enum = "yesno"; + } + } + } - 400 + boxes { - title = "Super Ring (10 Rings)"; - sprite = "TVRIA0"; - } - 401 - { - title = "Pity Shield"; - sprite = "TVPIA0"; - } - 402 - { - title = "Attraction Shield"; - sprite = "TVATA0"; - } - 403 - { - title = "Force Shield"; - sprite = "TVFOA0"; - } - 404 - { - title = "Armageddon Shield"; - sprite = "TVARA0"; - } - 405 - { - title = "Whirlwind Shield"; - sprite = "TVWWA0"; - } - 406 - { - title = "Elemental Shield"; - sprite = "TVELA0"; - } - 407 - { - title = "Super Sneakers"; - sprite = "TVSSA0"; - } - 408 - { - title = "Invincibility"; - sprite = "TVIVA0"; - } - 409 - { - title = "Extra Life"; - sprite = "TV1UA0"; - } - 410 - { - title = "Eggman"; - sprite = "TVEGA0"; - } - 411 - { - title = "Teleporter"; - sprite = "TVMXA0"; - } - 413 - { - title = "Gravity Boots"; - sprite = "TVGVA0"; - } - 414 - { - title = "CTF Team Ring Monitor (Red)"; - sprite = "TRRIA0"; - } - 415 - { - title = "CTF Team Ring Monitor (Blue)"; - sprite = "TBRIA0"; - } - 416 - { - title = "Recycler"; - sprite = "TVRCA0"; - } - 418 - { - title = "Score (1,000 Points)"; - sprite = "TV1KA0"; - } - 419 - { - title = "Score (10,000 Points)"; - sprite = "TVTKA0"; - } - 420 - { - title = "Flame Shield"; - sprite = "TVFLA0"; - } - 421 - { - title = "Water Shield"; - sprite = "TVBBA0"; - } - 422 - { - title = "Lightning Shield"; - sprite = "TVZPA0"; - } -} + color = 7; // Gray + blocking = 2; + title = "Monitors"; + width = 18; + height = 40; -boxes2 -{ - color = 18; // Gold - blocking = 2; - title = "Monitors (Respawning)"; - width = 20; - height = 44; + 400 + { + title = "Super Ring (10 Rings)"; + sprite = "TVRIA0"; + arg0 + { + title = "Death trigger tag"; + type = 15; + } + arg1 + { + title = "Respawn behavior"; + type = 11; + enum = "monitorrespawn"; + } + } + 401 + { + title = "Pity Shield"; + sprite = "TVPIA0"; + arg0 + { + title = "Death trigger tag"; + type = 15; + } + arg1 + { + title = "Respawn behavior"; + type = 11; + enum = "monitorrespawn"; + } + } + 402 + { + title = "Attraction Shield"; + sprite = "TVATA0"; + arg0 + { + title = "Death trigger tag"; + type = 15; + } + arg1 + { + title = "Respawn behavior"; + type = 11; + enum = "monitorrespawn"; + } + } + 403 + { + title = "Force Shield"; + sprite = "TVFOA0"; + arg0 + { + title = "Death trigger tag"; + type = 15; + } + arg1 + { + title = "Respawn behavior"; + type = 11; + enum = "monitorrespawn"; + } + } + 404 + { + title = "Armageddon Shield"; + sprite = "TVARA0"; + arg0 + { + title = "Death trigger tag"; + type = 15; + } + arg1 + { + title = "Respawn behavior"; + type = 11; + enum = "monitorrespawn"; + } + } + 405 + { + title = "Whirlwind Shield"; + sprite = "TVWWA0"; + arg0 + { + title = "Death trigger tag"; + type = 15; + } + arg1 + { + title = "Respawn behavior"; + type = 11; + enum = "monitorrespawn"; + } + } + 406 + { + title = "Elemental Shield"; + sprite = "TVELA0"; + arg0 + { + title = "Death trigger tag"; + type = 15; + } + arg1 + { + title = "Respawn behavior"; + type = 11; + enum = "monitorrespawn"; + } + } + 407 + { + title = "Super Sneakers"; + sprite = "TVSSA0"; + arg0 + { + title = "Death trigger tag"; + type = 15; + } + arg1 + { + title = "Respawn behavior"; + type = 11; + enum = "monitorrespawn"; + } + } + 408 + { + title = "Invincibility"; + sprite = "TVIVA0"; + arg0 + { + title = "Death trigger tag"; + type = 15; + } + arg1 + { + title = "Respawn behavior"; + type = 11; + enum = "monitorrespawn"; + } + } + 409 + { + title = "Extra Life"; + sprite = "TV1UA0"; + arg0 + { + title = "Death trigger tag"; + type = 15; + } + arg1 + { + title = "Respawn behavior"; + type = 11; + enum = "monitorrespawn"; + } + arg2 + { + title = "Points"; + type = 11; + enum + { + 0 = "1,000"; + 1 = "10,000"; + } + } + } + 410 + { + title = "Eggman"; + sprite = "TVEGA0"; + arg0 + { + title = "Death trigger tag"; + type = 15; + } + } + 411 + { + title = "Teleporter"; + sprite = "TVMXA0"; + arg0 + { + title = "Death trigger tag"; + type = 15; + } + arg1 + { + title = "Respawn behavior"; + type = 11; + enum = "monitorrespawn"; + } + } + 413 + { + title = "Gravity Boots"; + sprite = "TVGVA0"; + arg0 + { + title = "Death trigger tag"; + type = 15; + } + } + 414 + { + title = "CTF Team Ring Monitor (Red)"; + sprite = "TRRIA0"; + arg0 + { + title = "Death trigger tag"; + type = 15; + } + } + 415 + { + title = "CTF Team Ring Monitor (Blue)"; + sprite = "TBRIA0"; + arg0 + { + title = "Death trigger tag"; + type = 15; + } + } + 416 + { + title = "Recycler"; + sprite = "TVRCA0"; + arg0 + { + title = "Death trigger tag"; + type = 15; + } + arg1 + { + title = "Respawn behavior"; + type = 11; + enum = "monitorrespawn"; + } + } + 418 + { + title = "Score (1,000 Points)"; + sprite = "TV1KA0"; + arg0 + { + title = "Death trigger tag"; + type = 15; + } + } + 419 + { + title = "Score (10,000 Points)"; + sprite = "TVTKA0"; + arg0 + { + title = "Death trigger tag"; + type = 15; + } + } + 420 + { + title = "Flame Shield"; + sprite = "TVFLA0"; + arg0 + { + title = "Death trigger tag"; + type = 15; + } + arg1 + { + title = "Respawn behavior"; + type = 11; + enum = "monitorrespawn"; + } + } + 421 + { + title = "Water Shield"; + sprite = "TVBBA0"; + arg0 + { + title = "Death trigger tag"; + type = 15; + } + arg1 + { + title = "Respawn behavior"; + type = 11; + enum = "monitorrespawn"; + } + } + 422 + { + title = "Lightning Shield"; + sprite = "TVZPA0"; + arg0 + { + title = "Death trigger tag"; + type = 15; + } + arg1 + { + title = "Respawn behavior"; + type = 11; + enum = "monitorrespawn"; + } + } + } - 431 + boxes2 { - title = "Pity Shield (Respawn)"; - sprite = "TVPIB0"; - } - 432 - { - title = "Attraction Shield (Respawn)"; - sprite = "TVATB0"; - } - 433 - { - title = "Force Shield (Respawn)"; - sprite = "TVFOB0"; - } - 434 - { - title = "Armageddon Shield (Respawn)"; - sprite = "TVARB0"; - } - 435 - { - title = "Whirlwind Shield (Respawn)"; - sprite = "TVWWB0"; - } - 436 - { - title = "Elemental Shield (Respawn)"; - sprite = "TVELB0"; - } - 437 - { - title = "Super Sneakers (Respawn)"; - sprite = "TVSSB0"; - } - 438 - { - title = "Invincibility (Respawn)"; - sprite = "TVIVB0"; - } - 440 - { - title = "Eggman (Respawn)"; - sprite = "TVEGB0"; - } - 443 - { - title = "Gravity Boots (Respawn)"; - sprite = "TVGVB0"; - } - 450 - { - title = "Flame Shield (Respawn)"; - sprite = "TVFLB0"; - } - 451 - { - title = "Water Shield (Respawn)"; - sprite = "TVBBB0"; - } - 452 - { - title = "Lightning Shield (Respawn)"; - sprite = "TVZPB0"; - } -} + color = 18; // Gold + blocking = 2; + title = "Monitors (Respawning)"; + width = 20; + height = 44; -generic -{ - color = 11; // Light_Cyan - title = "Generic Items & Hazards"; + 431 + { + title = "Pity Shield (Respawn)"; + sprite = "TVPIB0"; + arg0 + { + title = "Death trigger tag"; + type = 15; + } + } + 432 + { + title = "Attraction Shield (Respawn)"; + sprite = "TVATB0"; + arg0 + { + title = "Death trigger tag"; + type = 15; + } + } + 433 + { + title = "Force Shield (Respawn)"; + sprite = "TVFOB0"; + arg0 + { + title = "Death trigger tag"; + type = 15; + } + } + 434 + { + title = "Armageddon Shield (Respawn)"; + sprite = "TVARB0"; + arg0 + { + title = "Death trigger tag"; + type = 15; + } + } + 435 + { + title = "Whirlwind Shield (Respawn)"; + sprite = "TVWWB0"; + arg0 + { + title = "Death trigger tag"; + type = 15; + } + } + 436 + { + title = "Elemental Shield (Respawn)"; + sprite = "TVELB0"; + arg0 + { + title = "Death trigger tag"; + type = 15; + } + } + 437 + { + title = "Super Sneakers (Respawn)"; + sprite = "TVSSB0"; + arg0 + { + title = "Death trigger tag"; + type = 15; + } + } + 438 + { + title = "Invincibility (Respawn)"; + sprite = "TVIVB0"; + arg0 + { + title = "Death trigger tag"; + type = 15; + } + } + 440 + { + title = "Eggman (Respawn)"; + sprite = "TVEGB0"; + arg0 + { + title = "Death trigger tag"; + type = 15; + } + } + 443 + { + title = "Gravity Boots (Respawn)"; + sprite = "TVGVB0"; + arg0 + { + title = "Death trigger tag"; + type = 15; + } + } + 450 + { + title = "Flame Shield (Respawn)"; + sprite = "TVFLB0"; + arg0 + { + title = "Death trigger tag"; + type = 15; + } + } + 451 + { + title = "Water Shield (Respawn)"; + sprite = "TVBBB0"; + arg0 + { + title = "Death trigger tag"; + type = 15; + } + } + 452 + { + title = "Lightning Shield (Respawn)"; + sprite = "TVZPB0"; + arg0 + { + title = "Death trigger tag"; + type = 15; + } + } + } - 500 + generic { - title = "Air Bubble Patch"; - sprite = "BUBLE0"; - width = 8; + color = 11; // Light_Cyan + title = "Generic Items & Hazards"; + + 500 + { + title = "Air Bubble Patch"; + sprite = "BUBLE0"; + width = 8; + height = 16; + arg0 + { + title = "Distance check?"; + type = 11; + enum = "yesno"; + } + } + 501 + { + title = "Signpost"; + sprite = "SIGND0"; + width = 8; + height = 32; + } + 502 + { + arrow = 1; + title = "Star Post"; + sprite = "STPTA0M0"; + width = 64; + height = 128; + arg0 + { + title = "Order"; + } + arg1 + { + title = "Respawn at center?"; + type = 11; + enum = "noyes"; + } + } + 520 + { + title = "Bomb Sphere"; + sprite = "SPHRD0"; + width = 16; + height = 24; + arg0 + { + title = "Float?"; + type = 11; + enum = "yesno"; + } + } + 521 + { + title = "Spikeball"; + sprite = "SPIKA0"; + width = 12; + height = 8; + arg0 + { + title = "Float?"; + type = 11; + enum = "yesno"; + } + } + 522 + { + title = "Wall Spike"; + sprite = "WSPKALAR"; + width = 16; + height = 14; + arrow = 1; + arg0 + { + title = "Retraction interval"; + } + arg1 + { + title = "Start interval"; + } + arg2 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Start retracted"; + 2 = "Intangible"; + } + } + } + 523 + { + title = "Spike"; + sprite = "USPKA0"; + width = 8; + height = 32; + arg0 + { + title = "Retraction interval"; + } + arg1 + { + title = "Start interval"; + } + arg2 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Start retracted"; + 2 = "Intangible"; + } + } + } + 1130 + { + title = "Small Mace"; + sprite = "SMCEA0"; + width = 17; + height = 34; + } + 1131 + { + title = "Big Mace"; + sprite = "BMCEA0"; + width = 34; + height = 68; + } + 1136 + { + title = "Small Fireball"; + sprite = "SFBRA0"; + width = 17; + height = 34; + } + 1137 + { + title = "Large Fireball"; + sprite = "BFBRA0"; + width = 34; + height = 68; + } + } + + springs + { + color = 12; // Light_Red + title = "Springs and Fans"; + width = 20; height = 16; - } - 501 - { - title = "Signpost"; - sprite = "SIGND0"; - width = 8; - height = 32; - } - 502 - { - arrow = 1; - title = "Star Post"; - sprite = "STPTA0M0"; - width = 64; - height = 128; - } - 520 - { - title = "Bomb Sphere"; - sprite = "SPHRD0"; - width = 16; - height = 24; - } - 521 - { - title = "Spikeball"; - sprite = "SPIKA0"; - width = 12; - height = 8; - } - 522 - { - title = "Wall Spike"; - sprite = "WSPKALAR"; - width = 16; - height = 14; - arrow = 1; - } - 523 - { - title = "Spike"; - sprite = "USPKA0"; - width = 8; - height = 32; - } - 1130 - { - title = "Small Mace"; - sprite = "SMCEA0"; - width = 17; - height = 34; - } - 1131 - { - title = "Big Mace"; - sprite = "BMCEA0"; - width = 34; - height = 68; - } - 1136 - { - title = "Small Fireball"; - sprite = "SFBRA0"; - width = 17; - height = 34; - } - 1137 - { - title = "Large Fireball"; - sprite = "BFBRA0"; - width = 34; - height = 68; - } -} - -springs -{ - color = 12; // Light_Red - title = "Springs and Fans"; - width = 20; - height = 16; - sprite = "RSPRD2"; - - 540 - { - title = "Fan"; - sprite = "FANSA0D0"; - width = 16; - height = 8; - } - 541 - { - title = "Gas Jet"; - sprite = "STEMD0"; - width = 32; - } - 542 - { - title = "Bumper"; - sprite = "BUMPA0"; - width = 32; - height = 64; - } - 543 - { - title = "Balloon"; - sprite = "BLONA0"; - width = 32; - height = 64; - } - 550 - { - title = "Yellow Spring"; - sprite = "SPRYA0"; - } - 551 - { - title = "Red Spring"; - sprite = "SPRRA0"; - } - 552 - { - title = "Blue Spring"; - sprite = "SPRBA0"; - } - 555 - { - arrow = 1; - title = "Diagonal Yellow Spring"; - sprite = "YSPRD2"; - width = 16; - } - 556 - { - arrow = 1; - title = "Diagonal Red Spring"; sprite = "RSPRD2"; - width = 16; - } - 557 - { - arrow = 1; - title = "Diagonal Blue Spring"; - sprite = "BSPRD2"; - width = 16; - } - 558 - { - arrow = 1; - title = "Horizontal Yellow Spring"; - sprite = "SSWYD2D8"; - width = 16; - height = 32; - } - 559 - { - arrow = 1; - title = "Horizontal Red Spring"; - sprite = "SSWRD2D8"; - width = 16; - height = 32; - } - 560 - { - arrow = 1; - title = "Horizontal Blue Spring"; - sprite = "SSWBD2D8"; - width = 16; - height = 32; - } - 1134 - { - title = "Yellow Spring Ball"; - sprite = "YSPBA0"; - width = 17; - height = 34; - } - 1135 - { - title = "Red Spring Ball"; - sprite = "RSPBA0"; - width = 17; - height = 34; - } - 544 - { - arrow = 1; - title = "Yellow Boost Panel"; - sprite = "BSTYA0"; - width = 28; - height = 2; - } - 545 - { - arrow = 1; - title = "Red Boost Panel"; - sprite = "BSTRA0"; - width = 28; - height = 2; - } -} -patterns -{ - color = 5; // Magenta - arrow = 1; - title = "Special Placement Patterns"; - width = 16; - height = 384; - sprite = "RINGA0"; + 540 + { + title = "Fan"; + sprite = "FANSA0D0"; + width = 16; + height = 8; + arg0 + { + title = "Lift height"; + } + arg1 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Invisible"; + 2 = "No distance check"; + } + } + } + 541 + { + title = "Gas Jet"; + sprite = "STEMD0"; + width = 32; + arg0 + { + title = "Play sound?"; + type = 11; + enum = "yesno"; + } + } + 542 + { + title = "Bumper"; + sprite = "BUMPA0"; + width = 32; + height = 64; + } + 543 + { + title = "Balloon"; + sprite = "BLONA0"; + width = 32; + height = 64; + arg0 + { + title = "Respawn?"; + type = 11; + enum = "noyes"; + } + stringarg0 + { + title = "Color"; + } + } + 550 + { + title = "Yellow Spring"; + sprite = "SPRYA0"; + } + 551 + { + title = "Red Spring"; + sprite = "SPRRA0"; + } + 552 + { + title = "Blue Spring"; + sprite = "SPRBA0"; + } + 555 + { + arrow = 1; + title = "Diagonal Yellow Spring"; + sprite = "YSPRD2"; + width = 16; + arg0 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Ignore gravity"; + 2 = "Rotate 22.5° CCW"; + } + } + } + 556 + { + arrow = 1; + title = "Diagonal Red Spring"; + sprite = "RSPRD2"; + width = 16; + arg0 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Ignore gravity"; + 2 = "Rotate 22.5° CCW"; + } + } + } + 557 + { + arrow = 1; + title = "Diagonal Blue Spring"; + sprite = "BSPRD2"; + width = 16; + arg0 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Ignore gravity"; + 2 = "Rotate 22.5° CCW"; + } + } + } + 558 + { + arrow = 1; + title = "Horizontal Yellow Spring"; + sprite = "SSWYD2D8"; + width = 16; + height = 32; + arg0 + { + title = "Float?"; + type = 11; + enum = "yesno"; + } + } + 559 + { + arrow = 1; + title = "Horizontal Red Spring"; + sprite = "SSWRD2D8"; + width = 16; + height = 32; + arg0 + { + title = "Float?"; + type = 11; + enum = "yesno"; + } + } + 560 + { + arrow = 1; + title = "Horizontal Blue Spring"; + sprite = "SSWBD2D8"; + width = 16; + height = 32; + arg0 + { + title = "Float?"; + type = 11; + enum = "yesno"; + } + } + 1134 + { + title = "Yellow Spring Ball"; + sprite = "YSPBA0"; + width = 17; + height = 34; + } + 1135 + { + title = "Red Spring Ball"; + sprite = "RSPBA0"; + width = 17; + height = 34; + } + 544 + { + arrow = 1; + title = "Yellow Boost Panel"; + sprite = "BSTYA0"; + width = 28; + height = 2; + arg0 + { + title = "Force spin?"; + type = 11; + enum = "noyes"; + } + } + 545 + { + arrow = 1; + title = "Red Boost Panel"; + sprite = "BSTRA0"; + width = 28; + height = 2; + arg0 + { + title = "Force spin?"; + type = 11; + enum = "noyes"; + } + } + } - 600 + patterns { - arrow = 0; - title = "5 Vertical Rings (Yellow Spring)"; + color = 5; // Magenta + arrow = 1; + title = "Special Placement Patterns"; + width = 16; + height = 384; sprite = "RINGA0"; - } - 601 - { - arrow = 0; - title = "5 Vertical Rings (Red Spring)"; - sprite = "RINGA0"; - height = 1024; - } - 602 - { - title = "5 Diagonal Rings (Yellow Spring)"; - sprite = "RINGA0"; - height = 32; - } - 603 - { - title = "10 Diagonal Rings (Red Spring)"; - sprite = "RINGA0"; - height = 32; - } - 604 - { - title = "Circle of Rings"; - sprite = "RINGA0"; - width = 96; - height = 192; - } - 605 - { - title = "Circle of Rings (Big)"; - sprite = "RINGA0"; - width = 192; - } - 606 - { - title = "Circle of Blue Spheres"; - sprite = "SPHRA0"; - width = 96; - height = 192; - } - 607 - { - title = "Circle of Blue Spheres (Big)"; - sprite = "SPHRA0"; - width = 192; - } - 608 - { - title = "Circle of Rings and Spheres"; - sprite = "SPHRA0"; - width = 96; - height = 192; - } - 609 - { - title = "Circle of Rings and Spheres (Big)"; - sprite = "SPHRA0"; - width = 192; - } -} -invisible -{ - color = 15; // White - title = "Misc. Invisible"; - width = 0; - height = 0; - sprite = "UNKNA0"; - sort = 1; - fixedsize = true; - blocking = 0; - - 700 - { - title = "Water Ambience A (Large)"; - sprite = "internal:ambiance"; + 600 + { + arrow = 0; + title = "5 Vertical Rings (Yellow Spring)"; + sprite = "internal:ringverticalyellow"; + } + 601 + { + arrow = 0; + title = "5 Vertical Rings (Red Spring)"; + sprite = "internal:ringverticalred"; + height = 1024; + } + 602 + { + title = "5 Diagonal Rings (Yellow Spring)"; + sprite = "RINGA0"; + height = 32; + } + 603 + { + title = "10 Diagonal Rings (Red Spring)"; + sprite = "RINGA0"; + height = 32; + } + 604 + { + title = "Circle of Rings"; + sprite = "internal:circlering"; + width = 96; + height = 192; + centerhitbox = true; + } + 605 + { + title = "Circle of Rings (Big)"; + sprite = "internal:circlebigring"; + width = 192; + centerhitbox = true; + } + 606 + { + title = "Circle of Blue Spheres"; + sprite = "internal:circlesphere"; + width = 96; + height = 192; + centerhitbox = true; + } + 607 + { + title = "Circle of Blue Spheres (Big)"; + sprite = "internal:circlebigsphere"; + width = 192; + centerhitbox = true; + } + 608 + { + title = "Circle of Rings and Spheres"; + sprite = "internal:circleringsphere"; + width = 96; + height = 192; + centerhitbox = true; + } + 609 + { + title = "Circle of Rings and Spheres (Big)"; + sprite = "internal:circlebigringsphere"; + width = 192; + centerhitbox = true; + } + 610 + { + title = "Row of Items"; + sprite = "RINGA0"; + arg0 + { + title = "Number of items"; + } + arg1 + { + title = "Horizontal spacing"; + } + arg2 + { + title = "Vertical spacing"; + } + stringarg0 + { + title = "Object types"; + } + } + 611 + { + title = "Circle of Items"; + sprite = "RINGA0"; + width = 96; + height = 192; + centerhitbox = true; + arg0 + { + title = "Number of items"; + } + arg1 + { + title = "Radius"; + } + stringarg0 + { + title = "Object types"; + } + } } - 701 + invisible { - title = "Water Ambience B (Large)"; - sprite = "internal:ambiance"; + color = 15; // White + title = "Misc. Invisible"; + width = 0; + height = 0; + sprite = "UNKNA0"; + sort = 1; + fixedsize = true; + blocking = 0; + + 700 + { + title = "Ambient Sound Effect"; + sprite = "internal:ambiance"; + arg0 + { + title = "Repeat speed"; + } + stringarg0 + { + title = "Sound"; + } + } + + 750 + { + title = "Slope Vertex"; + sprite = "internal:vertexslope"; + arg0 + { + title = "Absolute height?"; + type = 11; + enum = "noyes"; + } + } + + 751 + { + arrow = 1; + title = "Teleport Destination"; + sprite = "internal:tele"; + } + + 752 + { + arrow = 1; + title = "Alternate View Point"; + sprite = "internal:view"; + } + + 753 + { + title = "Zoom Tube Waypoint"; + sprite = "internal:zoom"; + arg0 + { + title = "Sequence"; + } + arg1 + { + title = "Order"; + } + } + + 754 + { + title = "Push/Pull Point"; + sprite = "GWLGA0"; + arg0 + { + title = "Radius"; + } + arg1 + { + title = "Strength"; + } + arg2 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Fade using XY"; + 2 = "Push using XYZ"; + 4 = "Non-exclusive"; + } + } + } + 756 + { + title = "Blast Linedef Executor"; + sprite = "internal:blastexec"; + width = 32; + height = 16; + arg0 + { + title = "Linedef tag"; + type = 15; + } + } + 757 + { + title = "Fan Particle Generator"; + sprite = "internal:fanparticles"; + width = 8; + height = 16; + arg0 + { + title = "Particles"; + } + arg1 + { + title = "Radius"; + } + arg2 + { + title = "Rising speed"; + } + arg3 + { + title = "Rotation speed"; + type = 8; + } + arg4 + { + title = "Spawn interval"; + } + arg5 + { + title = "Rising distance"; + } + arg6 + { + title = "Heights control linedef"; + type = 15; + } + } + 758 + { + title = "Object Angle Anchor"; + sprite = "internal:view"; + } + 760 + { + title = "PolyObject Anchor"; + sprite = "internal:polyanchor"; + } + 761 + { + title = "PolyObject Spawn Point"; + sprite = "internal:polycenter"; + } + 780 + { + title = "Skybox View Point"; + sprite = "internal:skyb"; + arg0 + { + title = "Type"; + type = 11; + enum + { + 0 = "Viewpoint"; + 1 = "Centerpoint"; + } + } + } } - 702 + greenflower { - title = "Water Ambience C (Medium)"; - sprite = "internal:ambiance"; + color = 2; // Green + title = "Greenflower"; + + 800 + { + title = "GFZ Flower"; + sprite = "FWR1A0"; + width = 16; + height = 40; + } + 801 + { + title = "Sunflower"; + sprite = "FWR2A0"; + width = 16; + height = 96; + } + 802 + { + title = "Budding Flower"; + sprite = "FWR3A0"; + width = 8; + height = 32; + } + 803 + { + title = "Blueberry Bush"; + sprite = "BUS3A0"; + width = 16; + height = 32; + } + 804 + { + title = "Berry Bush"; + sprite = "BUS1A0"; + width = 16; + height = 32; + } + 805 + { + title = "Bush"; + sprite = "BUS2A0"; + width = 16; + height = 32; + } + 806 + { + title = "GFZ Tree"; + sprite = "TRE1A0"; + width = 20; + height = 128; + } + 807 + { + title = "GFZ Berry Tree"; + sprite = "TRE1B0"; + width = 20; + height = 128; + } + 808 + { + title = "GFZ Cherry Tree"; + sprite = "TRE1C0"; + width = 20; + height = 128; + } + 809 + { + title = "Checkered Tree"; + sprite = "TRE2A0"; + width = 20; + height = 200; + } + 810 + { + title = "Checkered Tree (Sunset)"; + sprite = "TRE2B0"; + width = 20; + height = 200; + } + 811 + { + title = "Polygon Tree"; + sprite = "TRE4A0"; + width = 20; + height = 200; + } + 812 + { + title = "Bush Tree"; + sprite = "TRE5A0"; + width = 20; + height = 200; + } + 813 + { + title = "Red Bush Tree"; + sprite = "TRE5B0"; + width = 20; + height = 200; + } } - 703 + technohill { - title = "Water Ambience D (Medium)"; - sprite = "internal:ambiance"; + color = 2; // Green + title = "Techno Hill"; + + 900 + { + title = "THZ Steam Flower"; + sprite = "THZPA0"; + width = 8; + height = 32; + } + 901 + { + title = "Alarm"; + sprite = "ALRMA0"; + width = 8; + height = 16; + hangs = 1; + } + 902 + { + title = "THZ Spin Flower (Red)"; + sprite = "FWR5A0"; + width = 16; + height = 64; + } + 903 + { + title = "THZ Spin Flower (Yellow)"; + sprite = "FWR6A0"; + width = 16; + height = 64; + } + 904 + { + arrow = 1; + title = "Whistlebush"; + sprite = "THZTA0"; + width = 16; + height = 64; + } } - 704 + deepsea { - title = "Water Ambience E (Small)"; - sprite = "internal:ambiance"; + color = 2; // Green + title = "Deep Sea"; + + 1000 + { + arrow = 1; + blocking = 2; + title = "Gargoyle"; + sprite = "GARGA1"; + width = 16; + height = 40; + arg0 + { + title = "Push behavior"; + type = 11; + enum = "pushablebehavior"; + } + } + 1009 + { + arrow = 1; + blocking = 2; + title = "Gargoyle (Big)"; + sprite = "GARGB1"; + width = 32; + height = 80; + arg0 + { + title = "Push behavior"; + type = 11; + enum = "pushablebehavior"; + } + } + 1001 + { + title = "Seaweed"; + sprite = "SEWEA0"; + width = 24; + height = 56; + } + 1002 + { + title = "Dripping Water"; + sprite = "DRIPD0"; + width = 8; + height = 16; + hangs = 1; + arg0 + { + title = "Dripping delay"; + } + } + 1003 + { + title = "Coral (Green)"; + sprite = "CORLA0"; + width = 29; + height = 40; + } + 1004 + { + title = "Coral (Red)"; + sprite = "CORLB0"; + width = 30; + height = 53; + } + 1005 + { + title = "Coral (Orange)"; + sprite = "CORLC0"; + width = 28; + height = 41; + } + 1006 + { + title = "Blue Crystal"; + sprite = "BCRYA1"; + width = 8; + height = 16; + } + 1007 + { + title = "Kelp"; + sprite = "KELPA0"; + width = 16; + height = 292; + arg0 + { + title = "Double size?"; + type = 11; + enum = "noyes"; + } + } + 1008 + { + title = "Stalagmite (DSZ1)"; + sprite = "DSTGA0"; + width = 8; + height = 116; + arg0 + { + title = "Double size?"; + type = 11; + enum = "noyes"; + } + } + 1010 + { + arrow = 1; + title = "Light Beam"; + sprite = "LIBEARAL"; + width = 16; + height = 16; + } + 1011 + { + title = "Stalagmite (DSZ2)"; + sprite = "DSTGA0"; + width = 8; + height = 116; + arg0 + { + title = "Double size?"; + type = 11; + enum = "noyes"; + } + } + 1012 + { + arrow = 1; + title = "Big Floating Mine"; + width = 28; + height = 56; + sprite = "BMNEA1"; + } + 1013 + { + title = "Animated Kelp"; + sprite = "ALGAA0"; + width = 48; + height = 120; + } + 1014 + { + title = "Large Coral (Brown)"; + sprite = "CORLD0"; + width = 56; + height = 112; + } + 1015 + { + title = "Large Coral (Beige)"; + sprite = "CORLE0"; + width = 56; + height = 112; + } } - 705 + castleeggman { - title = "Water Ambience F (Small)"; - sprite = "internal:ambiance"; + color = 2; // Green + title = "Castle Eggman"; + + 1100 + { + title = "Chain (Decorative)"; + sprite = "CHANA0"; + width = 4; + height = 128; + hangs = 1; + } + 1101 + { + title = "Torch"; + sprite = "FLAMA0E0"; + width = 8; + height = 32; + arg0 + { + title = "Corona?"; + type = 11; + enum = "noyes"; + } + } + 1102 + { + arrow = 1; + blocking = 2; + title = "Eggman Statue"; + sprite = "ESTAA1"; + width = 32; + height = 240; + arg0 + { + title = "Push behavior"; + type = 11; + enum = "pushablebehavior"; + } + arg1 + { + title = "Solid gold?"; + type = 11; + enum = "noyes"; + } + } + 1103 + { + title = "CEZ Flower"; + sprite = "FWR4A0"; + width = 16; + height = 40; + } + 1104 + { + title = "Mace Spawnpoint"; + sprite = "SMCEA0"; + width = 17; + height = 34; + arg0 + { + title = "Number of links"; + } + arg1 + { + title = "Number of spokes"; + } + arg2 + { + title = "Width"; + } + arg3 + { + title = "Speed"; + } + arg4 + { + title = "Phase"; + type = 8; + } + arg5 + { + title = "Pinch"; + type = 8; + } + arg6 + { + title = "Omitted spokes"; + } + arg7 + { + title = "Omitted links"; + } + arg8 + { + title = "Flags"; + type = 12; + enum = "maceflags"; + } + } + 1105 + { + title = "Chain with Maces Spawnpoint"; + sprite = "SMCEA0"; + width = 17; + height = 34; + arg0 + { + title = "Number of links"; + } + arg1 + { + title = "Number of spokes"; + } + arg2 + { + title = "Width"; + } + arg3 + { + title = "Speed"; + } + arg4 + { + title = "Phase"; + type = 8; + } + arg5 + { + title = "Pinch"; + type = 8; + } + arg6 + { + title = "Omitted spokes"; + } + arg7 + { + title = "Omitted links"; + } + arg8 + { + title = "Flags"; + type = 12; + enum = "maceflags"; + } + } + 1106 + { + title = "Chained Spring Spawnpoint"; + sprite = "YSPBA0"; + width = 17; + height = 34; + arg0 + { + title = "Number of links"; + } + arg1 + { + title = "Number of spokes"; + } + arg2 + { + title = "Width"; + } + arg3 + { + title = "Speed"; + } + arg4 + { + title = "Phase"; + type = 8; + } + arg5 + { + title = "Pinch"; + type = 8; + } + arg6 + { + title = "Omitted spokes"; + } + arg7 + { + title = "Omitted links"; + } + arg8 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Red spring"; + 2 = "No sounds"; + 4 = "Player-turnable chain"; + 8 = "Swing instead of spin"; + 16 = "Make chain from end item"; + 32 = "Spawn link at origin"; + 64 = "Clip inside ground"; + 128 = "No distance check"; + } + } + } + 1107 + { + title = "Chain Spawnpoint"; + sprite = "BMCHA0"; + width = 17; + height = 34; + arg0 + { + title = "Number of links"; + } + arg1 + { + title = "Number of spokes"; + } + arg2 + { + title = "Width"; + } + arg3 + { + title = "Speed"; + } + arg4 + { + title = "Phase"; + type = 8; + } + arg5 + { + title = "Pinch"; + type = 8; + } + arg6 + { + title = "Omitted spokes"; + } + arg7 + { + title = "Omitted links"; + } + arg8 + { + title = "Flags"; + type = 12; + enum = "maceflags"; + + } + } + 1108 + { + arrow = 1; + title = "Hidden Chain Spawnpoint"; + sprite = "internal:chain3"; + width = 17; + height = 34; + } + 1109 + { + title = "Firebar Spawnpoint"; + sprite = "BFBRA0"; + width = 17; + height = 34; + arg0 + { + title = "Number of links"; + } + arg1 + { + title = "Number of spokes"; + } + arg2 + { + title = "Width"; + } + arg3 + { + title = "Speed"; + } + arg4 + { + title = "Phase"; + type = 8; + } + arg5 + { + title = "Pinch"; + type = 8; + } + arg6 + { + title = "Omitted spokes"; + } + arg7 + { + title = "Omitted links"; + } + arg8 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Double size"; + 2 = "No sounds"; + 4 = "Player-turnable chain"; + 8 = "Swing instead of spin"; + 16 = "Omit chain links"; + 32 = "Spawn link at origin"; + 64 = "Clip inside ground"; + 128 = "No distance check"; + } + } + } + 1110 + { + title = "Custom Mace Spawnpoint"; + sprite = "SMCEA0"; + width = 17; + height = 34; + arg0 + { + title = "Number of links"; + } + arg1 + { + title = "Number of spokes"; + } + arg2 + { + title = "Width"; + } + arg3 + { + title = "Speed"; + } + arg4 + { + title = "Phase"; + type = 8; + } + arg5 + { + title = "Pinch"; + type = 8; + } + arg6 + { + title = "Omitted spokes"; + } + arg7 + { + title = "Omitted links"; + } + arg8 + { + title = "Flags"; + type = 12; + enum = "maceflags"; + } + stringarg0 + { + title = "Mace object type"; + type = 2; + } + stringarg1 + { + title = "Link object type"; + type = 2; + } + } + 1111 + { + arrow = 1; + blocking = 2; + title = "Crawla Statue"; + sprite = "CSTAA1"; + width = 16; + height = 40; + arg0 + { + title = "Push behavior"; + type = 11; + enum = "pushablebehavior"; + } + } + 1112 + { + arrow = 1; + blocking = 2; + title = "Lance-a-Bot Statue"; + sprite = "CBBSA1"; + width = 32; + height = 72; + arg0 + { + title = "Push behavior"; + type = 11; + enum = "pushablebehavior"; + } + } + 1114 + { + title = "Pine Tree"; + sprite = "PINEA0"; + width = 16; + height = 628; + } + 1115 + { + title = "CEZ Shrub (Small)"; + sprite = "CEZBA0"; + width = 16; + height = 24; + } + 1116 + { + title = "CEZ Shrub (Large)"; + sprite = "CEZBB0"; + width = 32; + height = 48; + } + 1117 + { + arrow = 1; + title = "Pole Banner (Red)"; + sprite = "BANRA0"; + width = 40; + height = 224; + } + 1118 + { + arrow = 1; + title = "Pole Banner (Blue)"; + sprite = "BANRA0"; + width = 40; + height = 224; + } + 1119 + { + title = "Candle"; + sprite = "CNDLA0"; + width = 8; + height = 48; + arg0 + { + title = "Corona?"; + type = 11; + enum = "noyes"; + } + } + 1120 + { + title = "Candle Pricket"; + sprite = "CNDLB0"; + width = 8; + height = 176; + arg0 + { + title = "Corona?"; + type = 11; + enum = "noyes"; + } + } + 1121 + { + title = "Flame Holder"; + sprite = "FLMHA0"; + width = 24; + height = 80; + arg0 + { + title = "Flags"; + type = 12; + enum + { + 1 = "No flame"; + 2 = "Add corona"; + } + } + } + 1122 + { + title = "Fire Torch"; + sprite = "CTRCA0"; + width = 16; + height = 80; + } + 1123 + { + title = "Cannonball Launcher"; + sprite = "internal:cannonball"; + width = 8; + height = 16; + } + 1124 + { + blocking = 2; + title = "Cannonball"; + sprite = "CBLLA0"; + width = 20; + height = 40; + arg0 + { + title = "Push behavior"; + type = 11; + enum = "pushablebehavior"; + } + } + 1125 + { + title = "Brambles"; + sprite = "CABRALAR"; + width = 48; + height = 32; + } + 1126 + { + title = "Invisible Lockon Object"; + sprite = "LCKNC0"; + width = 16; + height = 32; + } + 1127 + { + title = "Spectator Eggrobo"; + sprite = "EGR1A1"; + width = 20; + height = 72; + arg0 + { + title = "Movement"; + type = 11; + enum + { + 0 = "None"; + 1 = "Right"; + 2 = "Left"; + } + } + } + 1128 + { + arrow = 1; + title = "Waving Flag (Red)"; + sprite = "CFLGA0"; + width = 8; + height = 208; + } + 1129 + { + arrow = 1; + title = "Waving Flag (Blue)"; + sprite = "CFLGA0"; + width = 8; + height = 208; + } } - 706 + aridcanyon { - title = "Water Ambience G (Extra Large)"; - sprite = "internal:ambiance"; + color = 2; // Green + title = "Arid Canyon"; + + 1200 + { + title = "Tumbleweed (Big)"; + sprite = "BTBLA0"; + width = 24; + height = 48; + arg0 + { + title = "Move perpetually?"; + type = 11; + enum = "noyes"; + } + } + 1201 + { + title = "Tumbleweed (Small)"; + sprite = "STBLA0"; + width = 12; + height = 24; + arg0 + { + title = "Move perpetually?"; + type = 11; + enum = "noyes"; + } + } + 1202 + { + arrow = 1; + title = "Rock Spawner"; + sprite = "ROIAA0"; + width = 8; + height = 16; + arg0 + { + title = "Speed"; + } + arg1 + { + title = "Spawn interval"; + } + arg2 + { + title = "Randomize speed?"; + type = 11; + enum = "noyes"; + } + stringarg0 + { + title = "Object type"; + type = 2; + } + } + 1203 + { + title = "Tiny Red Flower Cactus"; + sprite = "CACTA0"; + width = 13; + height = 24; + } + 1204 + { + title = "Small Red Flower Cactus"; + sprite = "CACTB0"; + width = 15; + height = 52; + } + 1205 + { + title = "Tiny Blue Flower Cactus"; + sprite = "CACTC0"; + width = 13; + height = 24; + } + 1206 + { + title = "Small Blue Flower Cactus"; + sprite = "CACTD0"; + width = 15; + height = 52; + } + 1207 + { + title = "Prickly Pear"; + sprite = "CACTE0"; + width = 32; + height = 96; + } + 1208 + { + title = "Barrel Cactus"; + sprite = "CACTF0"; + width = 20; + height = 128; + } + 1209 + { + title = "Tall Barrel Cactus"; + sprite = "CACTG0"; + width = 24; + height = 224; + } + 1210 + { + title = "Armed Cactus"; + sprite = "CACTH0"; + width = 24; + height = 256; + } + 1211 + { + title = "Ball Cactus"; + sprite = "CACTI0"; + width = 48; + height = 96; + } + 1212 + { + title = "Caution Sign"; + sprite = "WWSGAR"; + width = 22; + height = 64; + wallsprite = true; + } + 1213 + { + title = "Cacti Sign"; + sprite = "WWS2AR"; + width = 22; + height = 64; + wallsprite = true; + } + 1214 + { + title = "Sharp Turn Sign"; + sprite = "WWS3ALAR"; + width = 16; + height = 192; + wallsprite = true; + } + 1215 + { + title = "Mine Oil Lamp"; + sprite = "OILLA0"; + width = 22; + height = 64; + hangs = 1; + } + 1216 + { + title = "TNT Barrel"; + sprite = "BARRA1"; + width = 24; + height = 63; + arg0 + { + title = "Push behavior"; + type = 11; + enum = "pushablebehavior"; + } + } + 1217 + { + title = "TNT Proximity Shell"; + sprite = "REMTA0"; + width = 64; + height = 40; + } + 1218 + { + title = "Dust Devil"; + sprite = "TAZDCR"; + width = 80; + height = 416; + } + 1219 + { + title = "Minecart Spawner"; + sprite = "MCRTCLFR"; + width = 22; + height = 32; + } + 1220 + { + title = "Minecart Stopper"; + sprite = "MCRTIR"; + width = 32; + height = 32; + } + 1221 + { + title = "Minecart Saloon Door"; + sprite = "SALDARAL"; + width = 96; + height = 160; + arg0 + { + title = "Allow non-minecart players?"; + type = 11; + enum = "noyes"; + } + } + 1222 + { + title = "Train Cameo Spawner"; + sprite = "TRAEBRBL"; + width = 28; + height = 32; + } + 1223 + { + title = "Train Dust Spawner"; + sprite = "ADSTA0"; + width = 4; + height = 4; + } + 1224 + { + title = "Train Steam Spawner"; + sprite = "STEAA0"; + width = 4; + height = 4; + } + 1229 + { + title = "Minecart Switch Point"; + sprite = "internal:zoom"; + width = 8; + height = 16; + arg0 + { + title = "Type"; + type = 11; + enum + { + 0 = "Disable"; + 1 = "Enable"; + } + } + } + 1230 + { + title = "Tiny Cactus"; + sprite = "CACTJ0"; + width = 13; + height = 28; + } + 1231 + { + title = "Small Cactus"; + sprite = "CACTK0"; + width = 15; + height = 60; + } } - 707 + redvolcano { - title = "Water Ambience H (Extra Large)"; - sprite = "internal:ambiance"; + color = 2; // Green + title = "Red Volcano"; + + 1300 + { + arrow = 1; + title = "Flame Jet (Horizontal)"; + sprite = "internal:flameh"; + width = 16; + height = 40; + arg0 + { + title = "On time"; + } + arg1 + { + title = "Off time"; + } + arg2 + { + title = "Strength"; + } + arg3 + { + title = "Waving direction"; + type = 11; + enum + { + 0 = "Horizontal"; + 1 = "Vertical"; + } + } + } + 1301 + { + title = "Flame Jet (Vertical)"; + sprite = "internal:flamev"; + width = 16; + height = 40; + arg0 + { + title = "On time"; + } + arg1 + { + title = "Off time"; + } + arg2 + { + title = "Strength"; + } + arg3 + { + title = "Shooting direction"; + type = 11; + enum + { + 0 = "Upwards"; + 1 = "Downwards"; + } + } + } + 1302 + { + title = "Spinning Flame Jet (Counter-Clockwise)"; + sprite = "internal:flame2"; + width = 16; + height = 24; + } + 1303 + { + title = "Spinning Flame Jet (Clockwise)"; + sprite = "internal:flame1"; + width = 16; + height = 24; + } + 1304 + { + title = "Lavafall"; + sprite = "LFALF0"; + width = 30; + height = 32; + arg0 + { + title = "Initial delay"; + } + arg1 + { + title = "Double size?"; + type = 11; + enum = "noyes"; + } + } + 1305 + { + title = "Rollout Rock"; + sprite = "PUMIA1A5"; + width = 30; + height = 60; + arg0 + { + title = "Buoyant?"; + type = 11; + enum = "yesno"; + } + } + 1306 + { + title = "Big Fern"; + sprite = "JPLAB0"; + width = 32; + height = 48; + } + 1307 + { + title = "Jungle Palm"; + sprite = "JPLAC0"; + width = 32; + height = 48; + } + 1308 + { + title = "Torch Flower"; + sprite = "TFLOA0"; + width = 14; + height = 110; + } + 1309 + { + title = "RVZ1 Wall Vine (Long)"; + sprite = "WVINALAR"; + width = 1; + height = 288; + } + 1310 + { + title = "RVZ1 Wall Vine (Short)"; + sprite = "WVINBLBR"; + width = 1; + height = 288; + } } - 708 + botanicserenity { - title = "Disco Ambience"; - sprite = "internal:ambiance"; - } - - 709 - { - title = "Volcano Ambience"; - sprite = "internal:ambiance"; - } - - 710 - { - title = "Machine Ambience"; - sprite = "internal:ambiance"; - } - - 750 - { - title = "Slope Vertex"; - sprite = "internal:vertexslope"; - } - - 751 - { - arrow = 1; - title = "Teleport Destination"; - sprite = "internal:tele"; - } - - 752 - { - arrow = 1; - title = "Alternate View Point"; - sprite = "internal:view"; - } - - 753 - { - title = "Zoom Tube Waypoint"; - sprite = "internal:zoom"; - } - - 754 - { - title = "Push Point"; - sprite = "GWLGA0"; - } - 755 - { - title = "Pull Point"; - sprite = "GWLRA0"; - } - 756 - { - title = "Blast Linedef Executor"; - sprite = "TOADA0"; - width = 32; - height = 16; - } - 757 - { - title = "Fan Particle Generator"; - sprite = "PRTLA0"; - width = 8; - height = 16; - } - 758 - { - title = "Object Angle Anchor"; - sprite = "internal:view"; - } - 760 - { - title = "PolyObject Anchor"; - sprite = "internal:polyanchor"; - } - 761 - { - title = "PolyObject Spawn Point"; - sprite = "internal:polycenter"; - } - 762 - { - title = "PolyObject Spawn Point (Crush)"; - sprite = "internal:polycentercrush"; - } - 780 - { - title = "Skybox View Point"; - sprite = "internal:skyb"; - } -} - -greenflower -{ - color = 10; // Green - title = "Greenflower"; - - 800 - { - title = "GFZ Flower"; - sprite = "FWR1A0"; - width = 16; - height = 40; - } - 801 - { - title = "Sunflower"; - sprite = "FWR2A0"; - width = 16; - height = 96; - } - 802 - { - title = "Budding Flower"; - sprite = "FWR3A0"; - width = 8; - height = 32; - } - 803 - { - title = "Blueberry Bush"; - sprite = "BUS3A0"; + color = 2; // Green + title = "Botanic Serenity"; width = 16; height = 32; - } - 804 - { - title = "Berry Bush"; - sprite = "BUS1A0"; - width = 16; - height = 32; - } - 805 - { - title = "Bush"; - sprite = "BUS2A0"; - width = 16; - height = 32; - } - 806 - { - title = "GFZ Tree"; - sprite = "TRE1A0"; - width = 20; - height = 128; - } - 807 - { - title = "GFZ Berry Tree"; - sprite = "TRE1B0"; - width = 20; - height = 128; - } - 808 - { - title = "GFZ Cherry Tree"; - sprite = "TRE1C0"; - width = 20; - height = 128; - } - 809 - { - title = "Checkered Tree"; - sprite = "TRE2A0"; - width = 20; - height = 200; - } - 810 - { - title = "Checkered Tree (Sunset)"; - sprite = "TRE2B0"; - width = 20; - height = 200; - } - 811 - { - title = "Polygon Tree"; - sprite = "TRE4A0"; - width = 20; - height = 200; - } - 812 - { - title = "Bush Tree"; - sprite = "TRE5A0"; - width = 20; - height = 200; - } - 813 - { - title = "Red Bush Tree"; - sprite = "TRE5B0"; - width = 20; - height = 200; - } -} - -technohill -{ - color = 10; // Green - title = "Techno Hill"; - - 900 - { - title = "THZ Steam Flower"; - sprite = "THZPA0"; - width = 8; - height = 32; - } - 901 - { - title = "Alarm"; - sprite = "ALRMA0"; - width = 8; - height = 16; - hangs = 1; - } - 902 - { - title = "THZ Spin Flower (Red)"; - sprite = "FWR5A0"; - width = 16; - height = 64; - } - 903 - { - title = "THZ Spin Flower (Yellow)"; - sprite = "FWR6A0"; - width = 16; - height = 64; - } - 904 - { - arrow = 1; - title = "Whistlebush"; - sprite = "THZTA0"; - width = 16; - height = 64; - } -} - -deepsea -{ - color = 10; // Green - title = "Deep Sea"; - - 1000 - { - arrow = 1; - blocking = 2; - title = "Gargoyle"; - sprite = "GARGA1"; - width = 16; - height = 40; - } - 1009 - { - arrow = 1; - blocking = 2; - title = "Gargoyle (Big)"; - sprite = "GARGB1"; - width = 32; - height = 80; - } - 1001 - { - title = "Seaweed"; - sprite = "SEWEA0"; - width = 24; - height = 56; - } - 1002 - { - title = "Dripping Water"; - sprite = "DRIPD0"; - width = 8; - height = 16; - hangs = 1; - } - 1003 - { - title = "Coral (Green)"; - sprite = "CORLA0"; - width = 29; - height = 40; - } - 1004 - { - title = "Coral (Red)"; - sprite = "CORLB0"; - width = 30; - height = 53; - } - 1005 - { - title = "Coral (Orange)"; - sprite = "CORLC0"; - width = 28; - height = 41; - } - 1006 - { - title = "Blue Crystal"; - sprite = "BCRYA1"; - width = 8; - height = 16; - } - 1007 - { - title = "Kelp"; - sprite = "KELPA0"; - width = 16; - height = 292; - } - 1008 - { - title = "Stalagmite (DSZ1)"; - sprite = "DSTGA0"; - width = 8; - height = 116; - } - 1010 - { - arrow = 1; - title = "Light Beam"; - sprite = "LIBEARAL"; - width = 16; - height = 16; - } - 1011 - { - title = "Stalagmite (DSZ2)"; - sprite = "DSTGA0"; - width = 8; - height = 116; - } - 1012 - { - arrow = 1; - title = "Big Floating Mine"; - width = 28; - height = 56; - sprite = "BMNEA1"; - } - 1013 - { - title = "Animated Kelp"; - sprite = "ALGAA0"; - width = 48; - height = 120; - } - 1014 - { - title = "Large Coral (Brown)"; - sprite = "CORLD0"; - width = 56; - height = 112; - } - 1015 - { - title = "Large Coral (Beige)"; - sprite = "CORLE0"; - width = 56; - height = 112; - } -} - -castleeggman -{ - color = 10; // Green - title = "Castle Eggman"; - - 1100 - { - title = "Chain (Decorative)"; - sprite = "CHANA0"; - width = 4; - height = 128; - hangs = 1; - } - 1101 - { - title = "Torch"; - sprite = "FLAMA0E0"; - width = 8; - height = 32; - } - 1102 - { - arrow = 1; - blocking = 2; - title = "Eggman Statue"; - sprite = "ESTAA1"; - width = 32; - height = 240; - } - 1103 - { - title = "CEZ Flower"; - sprite = "FWR4A0"; - width = 16; - height = 40; - } - 1104 - { - title = "Mace Spawnpoint"; - sprite = "SMCEA0"; - width = 17; - height = 34; - } - 1105 - { - title = "Chain with Maces Spawnpoint"; - sprite = "SMCEA0"; - width = 17; - height = 34; - } - 1106 - { - title = "Chained Spring Spawnpoint"; - sprite = "YSPBA0"; - width = 17; - height = 34; - } - 1107 - { - title = "Chain Spawnpoint"; - sprite = "BMCHA0"; - width = 17; - height = 34; - } - 1108 - { - arrow = 1; - title = "Hidden Chain Spawnpoint"; - sprite = "internal:chain3"; - width = 17; - height = 34; - } - 1109 - { - title = "Firebar Spawnpoint"; - sprite = "BFBRA0"; - width = 17; - height = 34; - } - 1110 - { - title = "Custom Mace Spawnpoint"; - sprite = "SMCEA0"; - width = 17; - height = 34; - } - 1111 - { - arrow = 1; - blocking = 2; - title = "Crawla Statue"; - sprite = "CSTAA1"; - width = 16; - height = 40; - } - 1112 - { - arrow = 1; - blocking = 2; - title = "Lance-a-Bot Statue"; - sprite = "CBBSA1"; - width = 32; - height = 72; - } - 1114 - { - title = "Pine Tree"; - sprite = "PINEA0"; - width = 16; - height = 628; - } - 1115 - { - title = "CEZ Shrub (Small)"; - sprite = "CEZBA0"; - width = 16; - height = 24; - } - 1116 - { - title = "CEZ Shrub (Large)"; - sprite = "CEZBB0"; - width = 32; - height = 48; - } - 1117 - { - arrow = 1; - title = "Pole Banner (Red)"; - sprite = "BANRA0"; - width = 40; - height = 224; - } - 1118 - { - arrow = 1; - title = "Pole Banner (Blue)"; - sprite = "BANRA0"; - width = 40; - height = 224; - } - 1119 - { - title = "Candle"; - sprite = "CNDLA0"; - width = 8; - height = 48; - } - 1120 - { - title = "Candle Pricket"; - sprite = "CNDLB0"; - width = 8; - height = 176; - } - 1121 - { - title = "Flame Holder"; - sprite = "FLMHA0"; - width = 24; - height = 80; - } - 1122 - { - title = "Fire Torch"; - sprite = "CTRCA0"; - width = 16; - height = 80; - } - 1123 - { - title = "Cannonball Launcher"; - sprite = "internal:cannonball"; - width = 8; - height = 16; - } - 1124 - { - blocking = 2; - title = "Cannonball"; - sprite = "CBLLA0"; - width = 20; - height = 40; - } - 1125 - { - title = "Brambles"; - sprite = "CABRALAR"; - width = 48; - height = 32; - } - 1126 - { - title = "Invisible Lockon Object"; - sprite = "LCKNC0"; - width = 16; - height = 32; - } - 1127 - { - title = "Spectator Eggrobo"; - sprite = "EGR1A1"; - width = 20; - height = 72; - } - 1128 - { - arrow = 1; - title = "Waving Flag (Red)"; - sprite = "CFLGA0"; - width = 8; - height = 208; - } - 1129 - { - arrow = 1; - title = "Waving Flag (Blue)"; - sprite = "CFLGA0"; - width = 8; - height = 208; - } -} - -aridcanyon -{ - color = 10; // Green - title = "Arid Canyon"; - - 1200 - { - title = "Tumbleweed (Big)"; - sprite = "BTBLA0"; - width = 24; - height = 48; - } - 1201 - { - title = "Tumbleweed (Small)"; - sprite = "STBLA0"; - width = 12; - height = 24; - } - 1202 - { - arrow = 1; - title = "Rock Spawner"; - sprite = "ROIAA0"; - width = 8; - height = 16; - } - 1203 - { - title = "Tiny Red Flower Cactus"; - sprite = "CACTA0"; - width = 13; - height = 24; - } - 1204 - { - title = "Small Red Flower Cactus"; - sprite = "CACTB0"; - width = 15; - height = 52; - } - 1205 - { - title = "Tiny Blue Flower Cactus"; - sprite = "CACTC0"; - width = 13; - height = 24; - } - 1206 - { - title = "Small Blue Flower Cactus"; - sprite = "CACTD0"; - width = 15; - height = 52; - } - 1207 - { - title = "Prickly Pear"; - sprite = "CACTE0"; - width = 32; - height = 96; - } - 1208 - { - title = "Barrel Cactus"; - sprite = "CACTF0"; - width = 20; - height = 128; - } - 1209 - { - title = "Tall Barrel Cactus"; - sprite = "CACTG0"; - width = 24; - height = 224; - } - 1210 - { - title = "Armed Cactus"; - sprite = "CACTH0"; - width = 24; - height = 256; - } - 1211 - { - title = "Ball Cactus"; - sprite = "CACTI0"; - width = 48; - height = 96; - } - 1212 - { - title = "Caution Sign"; - sprite = "WWSGAR"; - width = 22; - height = 64; - } - 1213 - { - title = "Cacti Sign"; - sprite = "WWS2AR"; - width = 22; - height = 64; - } - 1214 - { - title = "Sharp Turn Sign"; - sprite = "WWS3ALAR"; - width = 16; - height = 192; - } - 1215 - { - title = "Mine Oil Lamp"; - sprite = "OILLA0"; - width = 22; - height = 64; - hangs = 1; - } - 1216 - { - title = "TNT Barrel"; - sprite = "BARRA1"; - width = 24; - height = 63; - } - 1217 - { - title = "TNT Proximity Shell"; - sprite = "REMTA0"; - width = 64; - height = 40; - } - 1218 - { - title = "Dust Devil"; - sprite = "TAZDCR"; - width = 80; - height = 416; - } - 1219 - { - title = "Minecart Spawner"; - sprite = "MCRTCLFR"; - width = 22; - height = 32; - } - 1220 - { - title = "Minecart Stopper"; - sprite = "MCRTIR"; - width = 32; - height = 32; - } - 1221 - { - title = "Minecart Saloon Door"; - sprite = "SALDARAL"; - width = 96; - height = 160; - } - 1222 - { - title = "Train Cameo Spawner"; - sprite = "TRAEBRBL"; - width = 28; - height = 32; - } - 1223 - { - title = "Train Dust Spawner"; - sprite = "ADSTA0"; - width = 4; - height = 4; - } - 1224 - { - title = "Train Steam Spawner"; - sprite = "STEAA0"; - width = 4; - height = 4; - } - 1229 - { - title = "Minecart Switch Point"; - sprite = "internal:zoom"; - width = 8; - height = 16; - } - 1230 - { - title = "Tiny Cactus"; - sprite = "CACTJ0"; - width = 13; - height = 28; - } - 1231 - { - title = "Small Cactus"; - sprite = "CACTK0"; - width = 15; - height = 60; - } -} - -redvolcano -{ - color = 10; // Green - title = "Red Volcano"; - - 1300 - { - arrow = 1; - title = "Flame Jet (Horizontal)"; - sprite = "internal:flameh"; - width = 16; - height = 40; - } - 1301 - { - title = "Flame Jet (Vertical)"; - sprite = "internal:flamev"; - width = 16; - height = 40; - } - 1302 - { - title = "Spinning Flame Jet (Counter-Clockwise)"; - sprite = "internal:flame2"; - width = 16; - height = 24; - } - 1303 - { - title = "Spinning Flame Jet (Clockwise)"; - sprite = "internal:flame1"; - width = 16; - height = 24; - } - 1304 - { - title = "Lavafall"; - sprite = "LFALF0"; - width = 30; - height = 32; - } - 1305 - { - title = "Rollout Rock"; - sprite = "PUMIA1A5"; - width = 30; - height = 60; - } - 1306 - { - title = "Big Fern"; - sprite = "JPLAB0"; - width = 32; - height = 48; - } - 1307 - { - title = "Jungle Palm"; - sprite = "JPLAC0"; - width = 32; - height = 48; - } - 1308 - { - title = "Torch Flower"; - sprite = "TFLOA0"; - width = 14; - height = 110; - } - 1309 - { - title = "RVZ1 Wall Vine (Long)"; - sprite = "WVINALAR"; - width = 1; - height = 288; - } - 1310 - { - title = "RVZ1 Wall Vine (Short)"; - sprite = "WVINBLBR"; - width = 1; - height = 288; - } -} - -botanicserenity -{ - color = 10; // Green - title = "Botanic Serenity"; - width = 16; - height = 32; - sprite = "BSZ1A0"; - 1400 - { - title = "Tall Flower (Red)"; sprite = "BSZ1A0"; + 1400 + { + title = "Tall Flower (Red)"; + sprite = "BSZ1A0"; + } + 1401 + { + title = "Tall Flower (Purple)"; + sprite = "BSZ1B0"; + } + 1402 + { + title = "Tall Flower (Blue)"; + sprite = "BSZ1C0"; + } + 1403 + { + title = "Tall Flower (Cyan)"; + sprite = "BSZ1D0"; + } + 1404 + { + title = "Tall Flower (Yellow)"; + sprite = "BSZ1E0"; + } + 1405 + { + title = "Tall Flower (Orange)"; + sprite = "BSZ1F0"; + } + 1410 + { + title = "Medium Flower (Red)"; + sprite = "BSZ2A0"; + } + 1411 + { + title = "Medium Flower (Purple)"; + sprite = "BSZ2B0"; + } + 1412 + { + title = "Medium Flower (Blue)"; + sprite = "BSZ2C0"; + } + 1413 + { + title = "Medium Flower (Cyan)"; + sprite = "BSZ2D0"; + } + 1414 + { + title = "Medium Flower (Yellow)"; + sprite = "BSZ2E0"; + } + 1415 + { + title = "Medium Flower (Orange)"; + sprite = "BSZ2F0"; + } + 1420 + { + title = "Short Flower (Red)"; + sprite = "BSZ3A0"; + } + 1421 + { + title = "Short Flower (Purple)"; + sprite = "BSZ3B0"; + } + 1422 + { + title = "Short Flower (Blue)"; + sprite = "BSZ3C0"; + } + 1423 + { + title = "Short Flower (Cyan)"; + sprite = "BSZ3D0"; + } + 1424 + { + title = "Short Flower (Yellow)"; + sprite = "BSZ3E0"; + } + 1425 + { + title = "Short Flower (Orange)"; + sprite = "BSZ3F0"; + } + 1430 + { + title = "Tulip (Red)"; + sprite = "BST1A0"; + } + 1431 + { + title = "Tulip (Purple)"; + sprite = "BST2A0"; + } + 1432 + { + title = "Tulip (Blue)"; + sprite = "BST3A0"; + } + 1433 + { + title = "Tulip (Cyan)"; + sprite = "BST4A0"; + } + 1434 + { + title = "Tulip (Yellow)"; + sprite = "BST5A0"; + } + 1435 + { + title = "Tulip (Orange)"; + sprite = "BST6A0"; + } + 1440 + { + title = "Cluster (Red)"; + sprite = "BSZ5A0"; + } + 1441 + { + title = "Cluster (Purple)"; + sprite = "BSZ5B0"; + } + 1442 + { + title = "Cluster (Blue)"; + sprite = "BSZ5C0"; + } + 1443 + { + title = "Cluster (Cyan)"; + sprite = "BSZ5D0"; + } + 1444 + { + title = "Cluster (Yellow)"; + sprite = "BSZ5E0"; + } + 1445 + { + title = "Cluster (Orange)"; + sprite = "BSZ5F0"; + } + 1450 + { + title = "Bush (Red)"; + sprite = "BSZ6A0"; + } + 1451 + { + title = "Bush (Purple)"; + sprite = "BSZ6B0"; + } + 1452 + { + title = "Bush (Blue)"; + sprite = "BSZ6C0"; + } + 1453 + { + title = "Bush (Cyan)"; + sprite = "BSZ6D0"; + } + 1454 + { + title = "Bush (Yellow)"; + sprite = "BSZ6E0"; + } + 1455 + { + title = "Bush (Orange)"; + sprite = "BSZ6F0"; + } + 1460 + { + title = "Vine (Red)"; + sprite = "BSZ7A0"; + } + 1461 + { + title = "Vine (Purple)"; + sprite = "BSZ7B0"; + } + 1462 + { + title = "Vine (Blue)"; + sprite = "BSZ7C0"; + } + 1463 + { + title = "Vine (Cyan)"; + sprite = "BSZ7D0"; + } + 1464 + { + title = "Vine (Yellow)"; + sprite = "BSZ7E0"; + } + 1465 + { + title = "Vine (Orange)"; + sprite = "BSZ7F0"; + } + 1470 + { + title = "BSZ Shrub"; + sprite = "BSZ8A0"; + } + 1471 + { + title = "BSZ Clover"; + sprite = "BSZ8B0"; + } + 1473 + { + title = "Palm Tree (Big)"; + width = 16; + height = 160; + sprite = "BSZ8D0"; + } + 1475 + { + title = "Palm Tree (Small)"; + width = 16; + height = 80; + sprite = "BSZ8F0"; + } } - 1401 - { - title = "Tall Flower (Purple)"; - sprite = "BSZ1B0"; - } - 1402 - { - title = "Tall Flower (Blue)"; - sprite = "BSZ1C0"; - } - 1403 - { - title = "Tall Flower (Cyan)"; - sprite = "BSZ1D0"; - } - 1404 - { - title = "Tall Flower (Yellow)"; - sprite = "BSZ1E0"; - } - 1405 - { - title = "Tall Flower (Orange)"; - sprite = "BSZ1F0"; - } - 1410 - { - title = "Medium Flower (Red)"; - sprite = "BSZ2A0"; - } - 1411 - { - title = "Medium Flower (Purple)"; - sprite = "BSZ2B0"; - } - 1412 - { - title = "Medium Flower (Blue)"; - sprite = "BSZ2C0"; - } - 1413 - { - title = "Medium Flower (Cyan)"; - sprite = "BSZ2D0"; - } - 1414 - { - title = "Medium Flower (Yellow)"; - sprite = "BSZ2E0"; - } - 1415 - { - title = "Medium Flower (Orange)"; - sprite = "BSZ2F0"; - } - 1420 - { - title = "Short Flower (Red)"; - sprite = "BSZ3A0"; - } - 1421 - { - title = "Short Flower (Purple)"; - sprite = "BSZ3B0"; - } - 1422 - { - title = "Short Flower (Blue)"; - sprite = "BSZ3C0"; - } - 1423 - { - title = "Short Flower (Cyan)"; - sprite = "BSZ3D0"; - } - 1424 - { - title = "Short Flower (Yellow)"; - sprite = "BSZ3E0"; - } - 1425 - { - title = "Short Flower (Orange)"; - sprite = "BSZ3F0"; - } - 1430 - { - title = "Tulip (Red)"; - sprite = "BST1A0"; - } - 1431 - { - title = "Tulip (Purple)"; - sprite = "BST2A0"; - } - 1432 - { - title = "Tulip (Blue)"; - sprite = "BST3A0"; - } - 1433 - { - title = "Tulip (Cyan)"; - sprite = "BST4A0"; - } - 1434 - { - title = "Tulip (Yellow)"; - sprite = "BST5A0"; - } - 1435 - { - title = "Tulip (Orange)"; - sprite = "BST6A0"; - } - 1440 - { - title = "Cluster (Red)"; - sprite = "BSZ5A0"; - } - 1441 - { - title = "Cluster (Purple)"; - sprite = "BSZ5B0"; - } - 1442 - { - title = "Cluster (Blue)"; - sprite = "BSZ5C0"; - } - 1443 - { - title = "Cluster (Cyan)"; - sprite = "BSZ5D0"; - } - 1444 - { - title = "Cluster (Yellow)"; - sprite = "BSZ5E0"; - } - 1445 - { - title = "Cluster (Orange)"; - sprite = "BSZ5F0"; - } - 1450 - { - title = "Bush (Red)"; - sprite = "BSZ6A0"; - } - 1451 - { - title = "Bush (Purple)"; - sprite = "BSZ6B0"; - } - 1452 - { - title = "Bush (Blue)"; - sprite = "BSZ6C0"; - } - 1453 - { - title = "Bush (Cyan)"; - sprite = "BSZ6D0"; - } - 1454 - { - title = "Bush (Yellow)"; - sprite = "BSZ6E0"; - } - 1455 - { - title = "Bush (Orange)"; - sprite = "BSZ6F0"; - } - 1460 - { - title = "Vine (Red)"; - sprite = "BSZ7A0"; - } - 1461 - { - title = "Vine (Purple)"; - sprite = "BSZ7B0"; - } - 1462 - { - title = "Vine (Blue)"; - sprite = "BSZ7C0"; - } - 1463 - { - title = "Vine (Cyan)"; - sprite = "BSZ7D0"; - } - 1464 - { - title = "Vine (Yellow)"; - sprite = "BSZ7E0"; - } - 1465 - { - title = "Vine (Orange)"; - sprite = "BSZ7F0"; - } - 1470 - { - title = "BSZ Shrub"; - sprite = "BSZ8A0"; - } - 1471 - { - title = "BSZ Clover"; - sprite = "BSZ8B0"; - } - 1473 - { - title = "Palm Tree (Big)"; - width = 16; - height = 160; - sprite = "BSZ8D0"; - } - 1475 - { - title = "Palm Tree (Small)"; - width = 16; - height = 80; - sprite = "BSZ8F0"; - } -} -azuretemple -{ - color = 10; // Green - title = "Azure Temple"; + azuretemple + { + color = 2; // Green + title = "Azure Temple"; - 1500 - { - arrow = 1; - blocking = 2; - title = "Glaregoyle"; - sprite = "BGARA1"; - width = 16; - height = 40; + 1500 + { + arrow = 1; + blocking = 2; + title = "Glaregoyle"; + sprite = "BGARA1"; + width = 16; + height = 40; + arg0 + { + title = "Push behavior"; + type = 11; + enum = "pushablebehavior"; + } + arg1 + { + title = "Starting delay"; + } + } + 1501 + { + arrow = 1; + blocking = 2; + title = "Glaregoyle (Up)"; + sprite = "BGARA1"; + width = 16; + height = 40; + arg0 + { + title = "Push behavior"; + type = 11; + enum = "pushablebehavior"; + } + arg1 + { + title = "Starting delay"; + } + } + 1502 + { + arrow = 1; + blocking = 2; + title = "Glaregoyle (Down)"; + sprite = "BGARA1"; + width = 16; + height = 40; + arg0 + { + title = "Push behavior"; + type = 11; + enum = "pushablebehavior"; + } + arg1 + { + title = "Starting delay"; + } + } + 1503 + { + arrow = 1; + blocking = 2; + title = "Glaregoyle (Long)"; + sprite = "BGARA1"; + width = 16; + height = 40; + arg0 + { + title = "Push behavior"; + type = 11; + enum = "pushablebehavior"; + } + arg1 + { + title = "Starting delay"; + } + } + 1504 + { + title = "ATZ Target"; + sprite = "RCRYB0"; + width = 24; + height = 32; + } + 1505 + { + title = "Green Flame"; + sprite = "CFLMA0E0"; + width = 8; + height = 32; + } + 1506 + { + arrow = 1; + blocking = 2; + title = "Blue Gargoyle"; + sprite = "BGARD1"; + width = 16; + height = 40; + arg0 + { + title = "Push behavior"; + type = 11; + enum = "pushablebehavior"; + } + } } - 1501 + + dreamhill { - arrow = 1; - blocking = 2; - title = "Glaregoyle (Up)"; - sprite = "BGARA1"; - width = 16; - height = 40; + color = 2; // Green + title = "Dream Hill"; + + 1600 + { + title = "Spring Tree"; + sprite = "TRE6A0"; + width = 16; + height = 32; + } + 1601 + { + title = "Shleep"; + sprite = "SHLPA0"; + width = 24; + height = 32; + } + 1602 + { + title = "Nightopian"; + sprite = "NTPNA1"; + width = 16; + height = 40; + arg0 + { + title = "Can move?"; + type = 11; + enum = "yesno"; + } + } } - 1502 + + nightstrk { - arrow = 1; - blocking = 2; - title = "Glaregoyle (Down)"; - sprite = "BGARA1"; - width = 16; - height = 40; - } - 1503 - { - arrow = 1; - blocking = 2; - title = "Glaregoyle (Long)"; - sprite = "BGARA1"; - width = 16; - height = 40; - } - 1504 - { - title = "ATZ Target"; - sprite = "RCRYB0"; - width = 24; - height = 32; - } - 1505 - { - title = "Green Flame"; - sprite = "CFLMA0E0"; + color = 16; // Light Pink + title = "NiGHTS Track & Misc."; width = 8; - height = 32; + height = 4096; + sprite = "UNKNA0"; + + 1700 + { + title = "Axis"; + sprite = "internal:axis1"; + circle = 1; + arg0 + { + title = "Mare"; + } + arg1 + { + title = "Order"; + } + arg2 + { + title = "Radius"; + } + arg3 + { + title = "Direction"; + type = 11; + enum + { + 0 = "Counterclockwise"; + 1 = "Clockwise"; + } + } + } + 1701 + { + title = "Axis Transfer"; + sprite = "internal:axis2"; + arg0 + { + title = "Mare"; + } + arg1 + { + title = "Order"; + } + } + 1702 + { + title = "Axis Transfer Line"; + sprite = "internal:axis3"; + arg0 + { + title = "Mare"; + } + arg1 + { + title = "Order"; + } + } + 1703 + { + title = "Ideya Drone"; + sprite = "NDRNA1"; + width = 16; + height = 56; + arg0 + { + title = "Time limit"; + } + arg1 + { + title = "Height"; + } + arg2 + { + title = "Radius"; + } + arg3 + { + title = "Alignment"; + type = 11; + enum + { + 0 = "Bottom with offset"; + 1 = "Bottom"; + 2 = "Middle"; + 3 = "Top"; + } + } + arg4 + { + title = "Die upon time up?"; + type = 11; + enum = "noyes"; + } + } + 1710 + { + title = "Ideya Capture"; + sprite = "CAPSA0"; + width = 72; + height = 144; + arg0 + { + title = "Mare"; + } + arg1 + { + title = "Required spheres"; + } + } + 1714 + { + title = "Ideya Anchor Point"; + sprite = "internal:ideya"; + width = 8; + height = 16; + arg0 + { + title = "Mare"; + } + } } - 1506 + + nights { - arrow = 1; - blocking = 2; - title = "Blue Gargoyle"; - sprite = "BGARD1"; + color = 13; // Pink + title = "NiGHTS Items"; + width = 16; + height = 32; + + 1704 + { + arrow = 1; + title = "NiGHTS Bumper"; + sprite = "NBMPG3G7"; + width = 32; + height = 64; + } + 1706 + { + title = "Blue Sphere"; + sprite = "SPHRA0"; + width = 16; + height = 24; + arg0 + { + title = "Float?"; + type = 11; + enum = "yesno"; + } + } + 1707 + { + title = "Super Paraloop"; + sprite = "NPRUA0"; + arg0 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Bonus time only"; + 2 = "Spawn immediately"; + } + } + } + 1708 + { + title = "Drill Refill"; + sprite = "NPRUB0"; + arg0 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Bonus time only"; + 2 = "Spawn immediately"; + } + } + } + 1709 + { + title = "Nightopian Helper"; + sprite = "NPRUC0"; + arg0 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Bonus time only"; + 2 = "Spawn immediately"; + } + } + } + 1711 + { + title = "Extra Time"; + sprite = "NPRUD0"; + arg0 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Bonus time only"; + 2 = "Spawn immediately"; + } + } + } + 1712 + { + title = "Link Freeze"; + sprite = "NPRUE0"; + arg0 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Bonus time only"; + 2 = "Spawn immediately"; + } + } + } + 1713 + { + arrow = 1; + title = "Hoop"; + sprite = "internal:nightshoop"; + width = 80; + height = 160; + centerhitbox = true; + arg0 + { + title = "Radius"; + } + } + } + + mario + { + color = 6; // Brown + title = "Mario"; + + 1800 + { + title = "Coin"; + sprite = "COINA0"; + width = 16; + height = 24; + arg0 + { + title = "Float?"; + type = 11; + enum = "yesno"; + } + } + 1801 + { + arrow = 1; + title = "Goomba"; + sprite = "GOOMA0"; + width = 24; + height = 32; + } + 1802 + { + arrow = 1; + title = "Goomba (Blue)"; + sprite = "BGOMA0"; + width = 24; + height = 32; + } + 1803 + { + title = "Fire Flower"; + sprite = "FFWRB0"; + width = 16; + height = 32; + } + 1804 + { + title = "Koopa Shell"; + sprite = "SHLLA1"; + width = 16; + height = 20; + } + 1805 + { + title = "Puma (Jumping Fireball)"; + sprite = "PUMAA0"; + width = 8; + height = 16; + arg0 + { + title = "Jump strength"; + } + } + 1806 + { + title = "King Bowser"; + sprite = "KOOPA0"; + width = 16; + height = 48; + arg0 + { + title = "Death trigger tag"; + type = 15; + } + } + 1807 + { + title = "Axe"; + sprite = "MAXEA0"; + width = 8; + height = 16; + arg0 + { + title = "Death trigger tag"; + type = 15; + } + } + 1808 + { + title = "Bush (Short)"; + sprite = "MUS1A0"; + width = 16; + height = 32; + } + 1809 + { + title = "Bush (Tall)"; + sprite = "MUS2A0"; + width = 16; + height = 32; + } + 1810 + { + title = "Toad"; + sprite = "TOADA0"; + width = 8; + height = 32; + } + } + + christmasdisco + { + color = 2; // Green + title = "Christmas & Disco"; + + 1850 + { + title = "Christmas Pole"; + sprite = "XMS1A0"; + width = 16; + height = 40; + } + 1851 + { + title = "Candy Cane"; + sprite = "XMS2A0"; + width = 8; + height = 32; + } + 1852 + { + blocking = 2; + title = "Snowman"; + sprite = "XMS3A0"; + width = 16; + height = 64; + arg0 + { + title = "Push behavior"; + type = 11; + enum = "pushablebehavior"; + } + } + 1853 + { + blocking = 2; + title = "Snowman (With Hat)"; + sprite = "XMS3B0"; + width = 16; + height = 80; + arg0 + { + title = "Push behavior"; + type = 11; + enum = "pushablebehavior"; + } + } + 1854 + { + title = "Lamp Post"; + sprite = "XMS4A0"; + width = 8; + height = 120; + } + 1855 + { + title = "Lamp Post (Snow)"; + sprite = "XMS4B0"; + width = 8; + height = 120; + } + 1856 + { + title = "Hanging Star"; + sprite = "XMS5A0"; + width = 4; + height = 80; + hangs = 1; + } + 1857 + { + title = "Berry Bush (Snow)"; + sprite = "BUS1B0"; + width = 16; + height = 32; + } + 1858 + { + title = "Bush (Snow)"; + sprite = "BUS2B0"; + width = 16; + height = 32; + } + 1859 + { + title = "Blueberry Bush (Snow)"; + sprite = "BUS3B0"; + width = 16; + height = 32; + } + 1875 + { + title = "Disco Ball"; + sprite = "DBALA0"; + width = 16; + height = 54; + hangs = 1; + } + 1876 + { + arrow = 1; + blocking = 2; + title = "Eggman Disco Statue"; + sprite = "ESTAB1"; + width = 20; + height = 96; + arg0 + { + title = "Push behavior"; + type = 11; + enum = "pushablebehavior"; + } + } + } + + stalagmites + { + color = 2; // Green + title = "Stalagmites"; width = 16; height = 40; - } -} -dreamhill -{ - color = 10; // Green - title = "Dream Hill"; + 1900 + { + title = "Brown Stalagmite (Tall)"; + sprite = "STLGA0"; + width = 16; + height = 40; + } + 1901 + { + title = "Brown Stalagmite"; + sprite = "STLGB0"; + width = 16; + height = 40; + } + 1902 + { + title = "Orange Stalagmite (Tall)"; + sprite = "STLGC0"; + width = 16; + height = 40; + } + 1903 + { + title = "Orange Stalagmite"; + sprite = "STLGD0"; + width = 16; + height = 40; + } + 1904 + { + title = "Red Stalagmite (Tall)"; + sprite = "STLGE0"; + width = 16; + height = 40; + } + 1905 + { + title = "Red Stalagmite"; + sprite = "STLGF0"; + width = 16; + height = 40; + } + 1906 + { + title = "Gray Stalagmite (Tall)"; + sprite = "STLGG0"; + width = 24; + height = 96; + } + 1907 + { + title = "Gray Stalagmite"; + sprite = "STLGH0"; + width = 16; + height = 40; + } + 1908 + { + title = "Blue Stalagmite (Tall)"; + sprite = "STLGI0"; + width = 16; + height = 40; + } + 1909 + { + title = "Blue Stalagmite"; + sprite = "STLGJ0"; + width = 16; + height = 40; + } + } - 1600 + hauntedheights { - title = "Spring Tree"; - sprite = "TRE6A0"; - width = 16; - height = 32; - } - 1601 - { - title = "Shleep"; - sprite = "SHLPA0"; - width = 24; - height = 32; - } - 1602 - { - title = "Pian"; - sprite = "NTPNALAR"; - width = 16; - height = 32; - } -} + color = 2; // Green + title = "Haunted Heights"; -nightstrk -{ - color = 13; // Pink - title = "NiGHTS Track"; - width = 8; - height = 4096; - sprite = "UNKNA0"; + 2000 + { + title = "Smashing Spikeball"; + sprite = "FMCEA0"; + width = 18; + height = 28; + arg0 + { + title = "Initial delay"; + } + } + 2001 + { + title = "HHZ Grass"; + sprite = "HHZMA0"; + width = 16; + height = 40; + } + 2002 + { + title = "HHZ Tentacle 1"; + sprite = "HHZMB0"; + width = 16; + height = 40; + } + 2003 + { + title = "HHZ Tentacle 2"; + sprite = "HHZMC0"; + width = 16; + height = 40; + } + 2004 + { + title = "HHZ Stalagmite (Tall)"; + sprite = "HHZME0"; + width = 16; + height = 40; + } + 2005 + { + title = "HHZ Stalagmite (Short)"; + sprite = "HHZMF0"; + width = 16; + height = 40; + } + 2006 + { + title = "Jack-o'-lantern 1"; + sprite = "PUMKA0"; + width = 16; + height = 40; + arg0 + { + title = "Flicker"; + type = 11; + enum = "yesno"; + } + } + 2007 + { + title = "Jack-o'-lantern 2"; + sprite = "PUMKB0"; + width = 16; + height = 40; + arg0 + { + title = "Flicker"; + type = 11; + enum = "yesno"; + } + } + 2008 + { + title = "Jack-o'-lantern 3"; + sprite = "PUMKC0"; + width = 16; + height = 40; + arg0 + { + title = "Flicker"; + type = 11; + enum = "yesno"; + } + } + 2009 + { + title = "Purple Mushroom"; + sprite = "SHRMD0"; + width = 16; + height = 48; + } + 2010 + { + title = "HHZ Tree"; + sprite = "HHPLC0"; + width = 12; + height = 40; + } + } - 1700 + frozenhillside { - title = "Axis"; - sprite = "internal:axis1"; - circle = 1; - } - 1701 - { - title = "Axis Transfer"; - sprite = "internal:axis2"; - } - 1702 - { - title = "Axis Transfer Line"; - sprite = "internal:axis3"; - } - 1710 - { - title = "Ideya Capture"; - sprite = "CAPSA0"; - width = 72; - height = 144; - } -} + color = 2; // Green + title = "Frozen Hillside"; -nights -{ - color = 13; // Pink - title = "NiGHTS Items"; - width = 16; - height = 32; + 2100 + { + title = "Ice Shard (Small)"; + sprite = "FHZIA0"; + width = 8; + height = 32; + } + 2101 + { + title = "Ice Shard (Large)"; + sprite = "FHZIB0"; + width = 8; + height = 32; + } + 2102 + { + title = "Crystal Tree (Aqua)"; + sprite = "TRE3A0"; + width = 20; + height = 200; + } + 2103 + { + title = "Crystal Tree (Pink)"; + sprite = "TRE3B0"; + width = 20; + height = 200; + } + 2104 + { + title = "Amy Cameo"; + sprite = "ROSYA1"; + width = 16; + height = 48; + arg0 + { + title = "Grayscale?"; + type = 11; + enum = "noyes"; + } + } + 2105 + { + title = "Mistletoe"; + sprite = "XMS6A0"; + width = 52; + height = 106; + } + } - 1703 + tutorial { - title = "Ideya Drone"; - sprite = "NDRNA1"; - width = 16; - height = 56; + color = 2; // Green + title = "Tutorial"; + + 799 + { + title = "Tutorial Plant"; + sprite = "TUPFH0"; + width = 40; + height = 144; + arg0 + { + title = "Start frame"; + } + } } - 1704 + + flickies { - arrow = 1; - title = "NiGHTS Bumper"; - sprite = "NBMPG3G7"; - width = 32; - height = 64; - } - 1705 - { - arrow = 1; - title = "Hoop (Generic)"; - sprite = "HOOPA0"; - width = 80; - height = 160; - } - 1706 - { - title = "Blue Sphere"; - sprite = "SPHRA0"; - width = 16; - height = 24; - } - 1707 - { - title = "Super Paraloop"; - sprite = "NPRUA0"; - } - 1708 - { - title = "Drill Refill"; - sprite = "NPRUB0"; - } - 1709 - { - title = "Nightopian Helper"; - sprite = "NPRUC0"; - } - 1711 - { - title = "Extra Time"; - sprite = "NPRUD0"; - } - 1712 - { - title = "Link Freeze"; - sprite = "NPRUE0"; - } - 1713 - { - arrow = 1; - title = "Hoop (Customizable)"; - sprite = "HOOPA0"; - width = 80; - height = 160; - } - 1714 - { - title = "Ideya Anchor Point"; - sprite = "internal:axis1"; + color = 2; // Green + title = "Flickies"; width = 8; - height = 16; - } -} - -mario -{ - color = 6; // Brown - title = "Mario"; - - 1800 - { - title = "Coin"; - sprite = "COINA0"; - width = 16; - height = 24; - } - 1801 - { - arrow = 1; - title = "Goomba"; - sprite = "GOOMA0"; - width = 24; - height = 32; - } - 1802 - { - arrow = 1; - title = "Goomba (Blue)"; - sprite = "BGOMA0"; - width = 24; - height = 32; - } - 1803 - { - title = "Fire Flower"; - sprite = "FFWRB0"; - width = 16; - height = 32; - } - 1804 - { - title = "Koopa Shell"; - sprite = "SHLLA1"; - width = 16; height = 20; - } - 1805 - { - title = "Puma (Jumping Fireball)"; - sprite = "PUMAA0"; - width = 8; - height = 16; - } - 1806 - { - title = "King Bowser"; - sprite = "KOOPA0"; - width = 16; - height = 48; - } - 1807 - { - title = "Axe"; - sprite = "MAXEA0"; - width = 8; - height = 16; - } - 1808 - { - title = "Bush (Short)"; - sprite = "MUS1A0"; - width = 16; - height = 32; - } - 1809 - { - title = "Bush (Tall)"; - sprite = "MUS2A0"; - width = 16; - height = 32; - } - 1810 - { - title = "Toad"; - sprite = "TOADA0"; - width = 8; - height = 32; - } -} -christmasdisco -{ - color = 10; // Green - title = "Christmas & Disco"; - - 1850 - { - title = "Christmas Pole"; - sprite = "XMS1A0"; - width = 16; - height = 40; + 2200 + { + title = "Bluebird"; + sprite = "FL01A1"; + arg0 + { + title = "Radius"; + } + arg1 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Move aimlessly"; + 2 = "No movement"; + 4 = "Hop"; + } + } + } + 2201 + { + title = "Rabbit"; + sprite = "FL02A1"; + arg0 + { + title = "Radius"; + } + arg1 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Move aimlessly"; + 2 = "No movement"; + 4 = "Hop"; + } + } + } + 2202 + { + title = "Chicken"; + sprite = "FL03A1"; + arg0 + { + title = "Radius"; + } + arg1 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Move aimlessly"; + 2 = "No movement"; + 4 = "Hop"; + } + } + } + 2203 + { + title = "Seal"; + sprite = "FL04A1"; + arg0 + { + title = "Radius"; + } + arg1 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Move aimlessly"; + 2 = "No movement"; + 4 = "Hop"; + } + } + } + 2204 + { + title = "Pig"; + sprite = "FL05A1"; + arg0 + { + title = "Radius"; + } + arg1 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Move aimlessly"; + 2 = "No movement"; + 4 = "Hop"; + } + } + } + 2205 + { + title = "Chipmunk"; + sprite = "FL06A1"; + arg0 + { + title = "Radius"; + } + arg1 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Move aimlessly"; + 2 = "No movement"; + 4 = "Hop"; + } + } + } + 2206 + { + title = "Penguin"; + sprite = "FL07A1"; + arg0 + { + title = "Radius"; + } + arg1 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Move aimlessly"; + 2 = "No movement"; + 4 = "Hop"; + } + } + } + 2207 + { + title = "Fish"; + sprite = "FL08A1"; + arg0 + { + title = "Radius"; + } + arg1 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Move aimlessly"; + 2 = "No movement"; + 4 = "Hop"; + } + } + arg2 + { + title = "Color"; + type = 11; + enum + { + 0 = "Random"; + 1 = "Red"; + 2 = "Cyan"; + 3 = "Blue"; + 4 = "Vapor"; + 5 = "Purple"; + 6 = "Bubblegum"; + 7 = "Neon"; + 8 = "Black"; + 9 = "Beige"; + 10 = "Lavender"; + 11 = "Ruby"; + 12 = "Salmon"; + 13 = "Sunset"; + 14 = "Orange"; + 15 = "Yellow"; + } + } + } + 2208 + { + title = "Ram"; + sprite = "FL09A1"; + arg0 + { + title = "Radius"; + } + arg1 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Move aimlessly"; + 2 = "No movement"; + 4 = "Hop"; + } + } + } + 2209 + { + title = "Puffin"; + sprite = "FL10A1"; + arg0 + { + title = "Radius"; + } + arg1 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Move aimlessly"; + 2 = "No movement"; + 4 = "Hop"; + } + } + } + 2210 + { + title = "Cow"; + sprite = "FL11A1"; + arg0 + { + title = "Radius"; + } + arg1 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Move aimlessly"; + 2 = "No movement"; + 4 = "Hop"; + } + } + } + 2211 + { + title = "Rat"; + sprite = "FL12A1"; + arg0 + { + title = "Radius"; + } + arg1 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Move aimlessly"; + 2 = "No movement"; + 4 = "Hop"; + } + } + } + 2212 + { + title = "Bear"; + sprite = "FL13A1"; + arg0 + { + title = "Radius"; + } + arg1 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Move aimlessly"; + 2 = "No movement"; + 4 = "Hop"; + } + } + } + 2213 + { + title = "Dove"; + sprite = "FL14A1"; + arg0 + { + title = "Radius"; + } + arg1 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Move aimlessly"; + 2 = "No movement"; + 4 = "Hop"; + } + } + } + 2214 + { + title = "Cat"; + sprite = "FL15A1"; + arg0 + { + title = "Radius"; + } + arg1 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Move aimlessly"; + 2 = "No movement"; + 4 = "Hop"; + } + } + } + 2215 + { + title = "Canary"; + sprite = "FL16A1"; + arg0 + { + title = "Radius"; + } + arg1 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Move aimlessly"; + 2 = "No movement"; + 4 = "Hop"; + } + } + } + 2216 + { + title = "Spider"; + sprite = "FS01A1"; + arg0 + { + title = "Radius"; + } + arg1 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Move aimlessly"; + 2 = "No movement"; + 4 = "Hop"; + } + } + } + 2217 + { + title = "Bat"; + sprite = "FS02A0"; + arg0 + { + title = "Radius"; + } + arg1 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Move aimlessly"; + 2 = "No movement"; + 4 = "Hop"; + } + } + } } - 1851 - { - title = "Candy Cane"; - sprite = "XMS2A0"; - width = 8; - height = 32; - } - 1852 - { - blocking = 2; - title = "Snowman"; - sprite = "XMS3A0"; - width = 16; - height = 64; - } - 1853 - { - blocking = 2; - title = "Snowman (With Hat)"; - sprite = "XMS3B0"; - width = 16; - height = 80; - } - 1854 - { - title = "Lamp Post"; - sprite = "XMS4A0"; - width = 8; - height = 120; - } - 1855 - { - title = "Lamp Post (Snow)"; - sprite = "XMS4B0"; - width = 8; - height = 120; - } - 1856 - { - title = "Hanging Star"; - sprite = "XMS5A0"; - width = 4; - height = 80; - hangs = 1; - } - 1857 - { - title = "Berry Bush (Snow)"; - sprite = "BUS1B0"; - width = 16; - height = 32; - } - 1858 - { - title = "Bush (Snow)"; - sprite = "BUS2B0"; - width = 16; - height = 32; - } - 1859 - { - title = "Blueberry Bush (Snow)"; - sprite = "BUS3B0"; - width = 16; - height = 32; - } - 1875 - { - title = "Disco Ball"; - sprite = "DBALA0"; - width = 16; - height = 54; - hangs = 1; - } - 1876 + + editor { + color = 15; // White arrow = 1; - blocking = 2; - title = "Eggman Disco Statue"; - sprite = "ESTAB1"; - width = 20; - height = 96; - } -} - -stalagmites -{ - color = 10; // Green - title = "Stalagmites"; - width = 16; - height = 40; - - 1900 - { - title = "Brown Stalagmite (Tall)"; - sprite = "STLGA0"; - width = 16; - height = 40; - } - 1901 - { - title = "Brown Stalagmite"; - sprite = "STLGB0"; - width = 16; - height = 40; - } - 1902 - { - title = "Orange Stalagmite (Tall)"; - sprite = "STLGC0"; - width = 16; - height = 40; - } - 1903 - { - title = "Orange Stalagmite"; - sprite = "STLGD0"; - width = 16; - height = 40; - } - 1904 - { - title = "Red Stalagmite (Tall)"; - sprite = "STLGE0"; - width = 16; - height = 40; - } - 1905 - { - title = "Red Stalagmite"; - sprite = "STLGF0"; - width = 16; - height = 40; - } - 1906 - { - title = "Gray Stalagmite (Tall)"; - sprite = "STLGG0"; - width = 24; - height = 96; - } - 1907 - { - title = "Gray Stalagmite"; - sprite = "STLGH0"; - width = 16; - height = 40; - } - 1908 - { - title = "Blue Stalagmite (Tall)"; - sprite = "STLGI0"; - width = 16; - height = 40; - } - 1909 - { - title = "Blue Stalagmite"; - sprite = "STLGJ0"; - width = 16; - height = 40; - } -} - -hauntedheights -{ - color = 10; // Green - title = "Haunted Heights"; - - 2000 - { - title = "Smashing Spikeball"; - sprite = "FMCEA0"; - width = 18; - height = 28; - } - 2001 - { - title = "HHZ Grass"; - sprite = "HHZMA0"; - width = 16; - height = 40; - } - 2002 - { - title = "HHZ Tentacle 1"; - sprite = "HHZMB0"; - width = 16; - height = 40; - } - 2003 - { - title = "HHZ Tentacle 2"; - sprite = "HHZMC0"; - width = 16; - height = 40; - } - 2004 - { - title = "HHZ Stalagmite (Tall)"; - sprite = "HHZME0"; - width = 16; - height = 40; - } - 2005 - { - title = "HHZ Stalagmite (Short)"; - sprite = "HHZMF0"; - width = 16; - height = 40; - } - 2006 - { - title = "Jack-o'-lantern 1"; - sprite = "PUMKA0"; - width = 16; - height = 40; - } - 2007 - { - title = "Jack-o'-lantern 2"; - sprite = "PUMKB0"; - width = 16; - height = 40; - } - 2008 - { - title = "Jack-o'-lantern 3"; - sprite = "PUMKC0"; - width = 16; - height = 40; - } - 2009 - { - title = "Purple Mushroom"; - sprite = "SHRMD0"; - width = 16; - height = 48; - } - 2010 - { - title = "HHZ Tree"; - sprite = "HHPLC0"; - width = 12; - height = 40; - } -} - -frozenhillside -{ - color = 10; // Green - title = "Frozen Hillside"; - - 2100 - { - title = "Ice Shard (Small)"; - sprite = "FHZIA0"; + title = "3D Mode Start"; + error = -1; width = 8; - height = 32; - } - 2101 - { - title = "Ice Shard (Large)"; - sprite = "FHZIB0"; - width = 8; - height = 32; - } - 2102 - { - title = "Crystal Tree (Aqua)"; - sprite = "TRE3A0"; - width = 20; - height = 200; - } - 2103 - { - title = "Crystal Tree (Pink)"; - sprite = "TRE3B0"; - width = 20; - height = 200; - } - 2104 - { - title = "Amy Cameo"; - sprite = "ROSYA1"; - width = 16; - height = 48; - } - 2105 - { - title = "Mistletoe"; - sprite = "XMS6A0"; - width = 52; - height = 106; - } -} + height = 16; + sort = 1; -flickies -{ - color = 10; // Green - title = "Flickies"; - width = 8; - height = 20; - - 2200 - { - title = "Bluebird"; - sprite = "FL01A1"; - } - 2201 - { - title = "Rabbit"; - sprite = "FL02A1"; - } - 2202 - { - title = "Chicken"; - sprite = "FL03A1"; - } - 2203 - { - title = "Seal"; - sprite = "FL04A1"; - } - 2204 - { - title = "Pig"; - sprite = "FL05A1"; - } - 2205 - { - title = "Chipmunk"; - sprite = "FL06A1"; - } - 2206 - { - title = "Penguin"; - sprite = "FL07A1"; - } - 2207 - { - title = "Fish"; - sprite = "FL08A1"; - } - 2208 - { - title = "Ram"; - sprite = "FL09A1"; - } - 2209 - { - title = "Puffin"; - sprite = "FL10A1"; - } - 2210 - { - title = "Cow"; - sprite = "FL11A1"; - } - 2211 - { - title = "Rat"; - sprite = "FL12A1"; - } - 2212 - { - title = "Bear"; - sprite = "FL13A1"; - } - 2213 - { - title = "Dove"; - sprite = "FL14A1"; - } - 2214 - { - title = "Cat"; - sprite = "FL15A1"; - } - 2215 - { - title = "Canary"; - sprite = "FL16A1"; - } - 2216 - { - title = "Spider"; - sprite = "FS01A1"; - } - 2217 - { - title = "Bat"; - sprite = "FS02A0"; + 3328 = "3D Mode Start"; } } \ No newline at end of file diff --git a/extras/conf/udb/SRB2_22Doom.cfg b/extras/conf/udb/SRB2_22Doom.cfg deleted file mode 100644 index 891b9d507..000000000 --- a/extras/conf/udb/SRB2_22Doom.cfg +++ /dev/null @@ -1,38 +0,0 @@ -/************************************************************************\ - Ultimate Doom Builder Game Configuration for Sonic Robo Blast 2 Version 2.2 -\************************************************************************/ - -// This is required to prevent accidental use of a different configuration -type = "Doom Builder 2 Game Configuration"; - -// This is the title to show for this game -game = "Sonic Robo Blast 2 - 2.2 (Doom format)"; - -// This is the simplified game engine/sourceport name -engine = "zdoom"; - -// Settings common to all games and all map formats -include("Includes\\SRB222_common.cfg", "common"); - -// Settings common to Doom map format -include("Includes\\SRB222_common.cfg", "mapformat_doom"); - -include("Includes\\Game_SRB222.cfg"); - -// Script lumps detection -scriptlumpnames -{ - include("Includes\\SRB222_misc.cfg", "scriptlumpnames"); -} - -// THING TYPES -thingtypes -{ - include("Includes\\SRB222_things.cfg"); -} - -//Default things filters -thingsfilters -{ - include("Includes\\SRB222_misc.cfg", "thingsfilters"); -} \ No newline at end of file diff --git a/extras/conf/udb/SRB2_22UDMF.cfg b/extras/conf/udb/SRB2_22UDMF.cfg index 749cf499a..b6bd22478 100644 --- a/extras/conf/udb/SRB2_22UDMF.cfg +++ b/extras/conf/udb/SRB2_22UDMF.cfg @@ -25,12 +25,6 @@ scriptlumpnames include("Includes\\SRB222_misc.cfg", "scriptlumpnames"); } -// THING TYPES -thingtypes -{ - include("Includes\\SRB222_things.cfg"); -} - //Default things filters thingsfilters { diff --git a/libs/FMOD.props b/libs/FMOD.props deleted file mode 100644 index 785f11ce1..000000000 --- a/libs/FMOD.props +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - $(SolutionDir)libs\fmodex\inc;$(IncludePath) - $(SolutionDir)libs\fmodex\lib;$(LibraryPath) - - - - - fmodexL64_vc.lib;%(AdditionalDependencies) - - - - - fmodexL_vc.lib;%(AdditionalDependencies) - - - - \ No newline at end of file diff --git a/libs/SDL2/BUGS.txt b/libs/SDL2/BUGS.txt index a8e6b952e..b1463e777 100644 --- a/libs/SDL2/BUGS.txt +++ b/libs/SDL2/BUGS.txt @@ -1,7 +1,7 @@ -Bugs are now managed in the SDL bug tracker, here: +Bugs are now managed in the SDL issue tracker, here: - https://bugzilla.libsdl.org/ + https://github.com/libsdl-org/SDL/issues You may report bugs there, and search to see if a given issue has already been reported, discussed, and maybe even fixed. @@ -11,6 +11,6 @@ You may also find help at the SDL forums/mailing list: https://discourse.libsdl.org/ -Bug reports are welcome here, but we really appreciate if you use Bugzilla, as - bugs discussed on the mailing list may be forgotten or missed. +Bug reports are welcome here, but we really appreciate if you use the issue + tracker, as bugs discussed on the mailing list may be forgotten or missed. diff --git a/libs/SDL2/COPYING.txt b/libs/SDL2/COPYING.txt index 9cdb5f8bb..0e2bef3fc 100644 --- a/libs/SDL2/COPYING.txt +++ b/libs/SDL2/COPYING.txt @@ -1,6 +1,6 @@ Simple DirectMedia Layer -Copyright (C) 1997-2019 Sam Lantinga +Copyright (C) 1997-2020 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/WhatsNew.txt b/libs/SDL2/WhatsNew.txt index 7f305012f..1a6156533 100644 --- a/libs/SDL2/WhatsNew.txt +++ b/libs/SDL2/WhatsNew.txt @@ -1,6 +1,247 @@ This is a list of major changes in SDL's version history. +--------------------------------------------------------------------------- +2.0.20: +--------------------------------------------------------------------------- + +General: +* SDL_RenderGeometryRaw() takes a pointer to SDL_Color, not int. You can cast color data in SDL_PIXELFORMAT_RGBA32 format (SDL_PIXELFORMAT_ABGR8888 on little endian systems) for this parameter. +* Improved accuracy of horizontal and vertical line drawing when using OpenGL or OpenGLES +* Added the hint SDL_HINT_RENDER_LINE_METHOD to control the method of line drawing used, to select speed, correctness, and compatibility. + +Windows: +* Fixed size of custom cursors + +Linux: +* Fixed hotplug controller detection, broken in 2.0.18 + + +--------------------------------------------------------------------------- +2.0.18: +--------------------------------------------------------------------------- + +General: +* The SDL wiki documentation and development headers are automatically kept in sync +* Each function has information about in which version of SDL it was introduced +* SDL-specific CMake options are now prefixed with 'SDL_'. Be sure to update your CMake build scripts accordingly! +* Added the hint SDL_HINT_APP_NAME to let SDL know the name of your application for various places it might show up in system information +* Added SDL_RenderGeometry() and SDL_RenderGeometryRaw() to allow rendering of arbitrary shapes using the SDL 2D render API +* Added SDL_SetTextureUserData() and SDL_GetTextureUserData() to associate application data with an SDL texture +* Added SDL_RenderWindowToLogical() and SDL_RenderLogicalToWindow() to convert between window coordinates and logical render coordinates +* Added SDL_RenderSetVSync() to change whether a renderer present is synchronized with vblank at runtime +* Added SDL_PremultiplyAlpha() to premultiply alpha on a block of SDL_PIXELFORMAT_ARGB8888 pixels +* Added a window event SDL_WINDOWEVENT_DISPLAY_CHANGED which is sent when a window changes what display it's centered on +* Added SDL_GetWindowICCProfile() to query a window's ICC profile, and a window event SDL_WINDOWEVENT_ICCPROF_CHANGED that is sent when it changes +* Added the hint SDL_HINT_VIDEO_EGL_ALLOW_TRANSPARENCY to allow EGL windows to be transparent instead of opaque +* SDL_WaitEvent() has been redesigned to use less CPU in most cases +* Added SDL_SetWindowMouseRect() and SDL_GetWindowMouseRect() to confine the mouse cursor to an area of a window +* You can now read precise mouse wheel motion using 'preciseX' and 'preciseY' event fields +* Added SDL_GameControllerHasRumble() and SDL_GameControllerHasRumbleTriggers() to query whether a game controller supports rumble +* Added SDL_JoystickHasRumble() and SDL_JoystickHasRumbleTriggers() to query whether a joystick supports rumble +* SDL's hidapi implementation is now available as a public API in SDL_hidapi.h + +Windows: +* Improved relative mouse motion over Windows Remote Desktop +* Added the hint SDL_HINT_IME_SHOW_UI to show native UI components instead of hiding them (defaults off) + +Windows/UWP: +* WGI is used instead of XInput for better controller support in UWP apps + +Linux: +* Added the hint SDL_HINT_SCREENSAVER_INHIBIT_ACTIVITY_NAME to set the activity that's displayed by the system when the screensaver is disabled +* Added the hint SDL_HINT_LINUX_JOYSTICK_CLASSIC to control whether /dev/input/js* or /dev/input/event* are used as joystick devices +* Added the hint SDL_HINT_JOYSTICK_DEVICE to allow the user to specify devices that will be opened in addition to the normal joystick detection +* Added SDL_LinuxSetThreadPriorityAndPolicy() for more control over a thread priority on Linux + +Android: +* Added support for audio output and capture using AAudio on Android 8.1 and newer +* Steam Controller support is disabled by default, and can be enabled by setting the hint SDL_HINT_JOYSTICK_HIDAPI_STEAM to "1" before calling SDL_Init() + +Apple Arcade: +* Added SDL_GameControllerGetAppleSFSymbolsNameForButton() and SDL_GameControllerGetAppleSFSymbolsNameForAxis() to support Apple Arcade titles + +iOS: +* Added documentation that the UIApplicationSupportsIndirectInputEvents key must be set to true in your application's Info.plist in order to get real Bluetooth mouse events. +* Steam Controller support is disabled by default, and can be enabled by setting the hint SDL_HINT_JOYSTICK_HIDAPI_STEAM to "1" before calling SDL_Init() + + +--------------------------------------------------------------------------- +2.0.16: +--------------------------------------------------------------------------- +General: +* Added SDL_FlashWindow() to get a user's attention +* Added SDL_GetAudioDeviceSpec() to get the preferred audio format of a device +* Added SDL_SetWindowAlwaysOnTop() to dynamically change the SDL_WINDOW_ALWAYS_ON_TOP flag for a window +* Added SDL_SetWindowKeyboardGrab() to support grabbing the keyboard independently of the mouse +* Added SDL_SoftStretchLinear() to do bilinear scaling between 32-bit software surfaces +* Added SDL_UpdateNVTexture() to update streaming NV12/21 textures +* Added SDL_GameControllerSendEffect() and SDL_JoystickSendEffect() to allow sending custom trigger effects to the DualSense controller +* Added SDL_GameControllerGetSensorDataRate() to get the sensor data rate for PlayStation and Nintendo Switch controllers +* Added support for the Amazon Luna game controller +* Added rumble support for the Google Stadia controller using the HIDAPI driver +* Added SDL_GameControllerType constants for the Amazon Luna and Google Stadia controllers +* Added analog rumble for Nintendo Switch Pro controllers using the HIDAPI driver +* Reduced CPU usage when using SDL_WaitEvent() and SDL_WaitEventTimeout() + +Windows: +* Added SDL_SetWindowsMessageHook() to set a function that is called for all Windows messages +* Added SDL_RenderGetD3D11Device() to get the D3D11 device used by the SDL renderer + +Linux: +* Greatly improved Wayland support +* Added support for audio output and capture using Pipewire +* Added the hint SDL_HINT_AUDIO_INCLUDE_MONITORS to control whether PulseAudio recording should include monitor devices +* Added the hint SDL_HINT_AUDIO_DEVICE_STREAM_ROLE to describe the role of your application for audio control panels + +Android: +* Added SDL_AndroidShowToast() to show a lightweight notification + +iOS: +* Added support for mouse relative mode on iOS 14.1 and newer +* Added support for the Xbox Series X controller + +tvOS: +* Added support for the Xbox Series X controller + + +--------------------------------------------------------------------------- +2.0.14: +--------------------------------------------------------------------------- +General: +* Added support for PS5 DualSense and Xbox Series X controllers to the HIDAPI controller driver +* Added game controller button constants for paddles and new buttons +* Added game controller functions to get additional information: + * SDL_GameControllerGetSerial() + * SDL_GameControllerHasAxis() + * SDL_GameControllerHasButton() + * SDL_GameControllerGetNumTouchpads() + * SDL_GameControllerGetNumTouchpadFingers() + * SDL_GameControllerGetTouchpadFinger() + * SDL_GameControllerHasSensor() + * SDL_GameControllerSetSensorEnabled() + * SDL_GameControllerIsSensorEnabled() + * SDL_GameControllerGetSensorData() + * SDL_GameControllerRumbleTriggers() + * SDL_GameControllerHasLED() + * SDL_GameControllerSetLED() +* Added the hint SDL_HINT_JOYSTICK_HIDAPI_PS5 to control whether the HIDAPI driver for PS5 controllers should be used. +* Added joystick functions to get additional information: + * SDL_JoystickGetSerial() + * SDL_JoystickRumbleTriggers() + * SDL_JoystickHasLED() + * SDL_JoystickSetLED() +* Added an API to allow the application to create virtual joysticks: + * SDL_JoystickAttachVirtual() + * SDL_JoystickDetachVirtual() + * SDL_JoystickIsVirtual() + * SDL_JoystickSetVirtualAxis() + * SDL_JoystickSetVirtualButton() + * SDL_JoystickSetVirtualHat() +* Added SDL_LockSensors() and SDL_UnlockSensors() to guarantee exclusive access to the sensor list +* Added SDL_HAPTIC_STEERING_AXIS to play an effect on the steering wheel +* Added the hint SDL_HINT_MOUSE_RELATIVE_SCALING to control whether relative motion is scaled by the screen DPI or renderer logical size +* The default value for SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS is now false for better compatibility with modern window managers +* Added SDL_GetPreferredLocales() to get the application's current locale setting +* Added the hint SDL_HINT_PREFERRED_LOCALES to override your application's default locale setting +* Added SDL_OpenURL() to open a URL in the system's default browser +* Added SDL_HasSurfaceRLE() to tell whether a surface is currently using RLE encoding +* Added SDL_SIMDRealloc() to reallocate memory obtained from SDL_SIMDAlloc() +* Added SDL_GetErrorMsg() to get the last error in a thread-safe way +* Added SDL_crc32(), SDL_wcscasecmp(), SDL_wcsncasecmp(), SDL_trunc(), SDL_truncf() +* Added clearer names for RGB pixel formats, e.g. SDL_PIXELFORMAT_XRGB8888, SDL_PIXELFORMAT_XBGR8888, etc. + +Windows: +* Added the RAWINPUT controller driver to support more than 4 Xbox controllers simultaneously +* Added the hint SDL_HINT_JOYSTICK_RAWINPUT to control whether the RAWINPUT driver should be used +* Added the hint SDL_HINT_JOYSTICK_HIDAPI_CORRELATE_XINPUT to control whether XInput and WGI should be used to for complete controller functionality with the RAWINPUT driver. + +macOS: +* Added the SDL_WINDOW_METAL flag to specify that a window should be created with a Metal view +* Added SDL_Metal_GetLayer() to get the CAMetalLayer backing a Metal view +* Added SDL_Metal_GetDrawableSize() to get the size of a window's drawable, in pixels + +Linux: +* Added the hint SDL_HINT_AUDIO_DEVICE_APP_NAME to specify the name that shows up in PulseAudio for your application +* Added the hint SDL_HINT_AUDIO_DEVICE_STREAM_NAME to specify the name that shows up in PulseAudio associated with your audio stream +* Added the hint SDL_HINT_LINUX_JOYSTICK_DEADZONES to control whether HID defined dead zones should be respected on Linux +* Added the hint SDL_HINT_THREAD_PRIORITY_POLICY to specify the thread scheduler policy +* Added the hint SDL_HINT_THREAD_FORCE_REALTIME_TIME_CRITICAL to allow time critical threads to use a realtime scheduling policy + +Android: +* Added SDL_AndroidRequestPermission() to request a specific system permission +* Added the hint SDL_HINT_ANDROID_BLOCK_ON_PAUSE_PAUSEAUDIO to control whether audio will pause when the application goes intot he background + +OS/2: +* Added support for OS/2, see docs/README-os2.md for details + +Emscripten (running in a web browser): +* Added the hint SDL_HINT_EMSCRIPTEN_ASYNCIFY to control whether SDL should call emscripten_sleep internally + + +--------------------------------------------------------------------------- +2.0.12: +--------------------------------------------------------------------------- + +General: +* Added SDL_GetTextureScaleMode() and SDL_SetTextureScaleMode() to get and set the scaling mode used for a texture +* Added SDL_LockTextureToSurface(), similar to SDL_LockTexture() but the locked area is exposed as a SDL surface. +* Added new blend mode, SDL_BLENDMODE_MUL, which does a modulate and blend operation +* Added the hint SDL_HINT_DISPLAY_USABLE_BOUNDS to override the results of SDL_GetDisplayUsableBounds() for display index 0. +* Added the window underneath the finger to the SDL_TouchFingerEvent +* Added SDL_GameControllerTypeForIndex(), SDL_GameControllerGetType() to return the type of a game controller (Xbox 360, Xbox One, PS3, PS4, or Nintendo Switch Pro) +* Added the hint SDL_HINT_GAMECONTROLLERTYPE to override the automatic game controller type detection +* Added SDL_JoystickFromPlayerIndex() and SDL_GameControllerFromPlayerIndex() to get the device associated with a player index +* Added SDL_JoystickSetPlayerIndex() and SDL_GameControllerSetPlayerIndex() to set the player index associated with a device +* Added the hint SDL_HINT_GAMECONTROLLER_USE_BUTTON_LABELS to specify whether Nintendo Switch Pro controllers should use the buttons as labeled or swapped to match positional layout. The default is to use the buttons as labeled. +* Added support for Nintendo GameCube controllers to the HIDAPI driver, and a hint SDL_HINT_JOYSTICK_HIDAPI_GAMECUBE to control whether this is used. +* Improved support for Xbox 360 and Xbox One controllers when using the HIDAPI driver +* Added support for many game controllers, including: + * 8BitDo FC30 Pro + * 8BitDo M30 GamePad + * BDA PS4 Fightpad + * HORI Fighting Commander + * Hyperkin Duke + * Hyperkin X91 + * MOGA XP5-A Plus + * NACON GC-400ES + * NVIDIA Controller v01.04 + * PDP Versus Fighting Pad + * Razer Raion Fightpad for PS4 + * Razer Serval + * Stadia Controller + * SteelSeries Stratus Duo + * Victrix Pro Fight Stick for PS4 + * Xbox One Elite Series 2 +* Fixed blocking game controller rumble calls when using the HIDAPI driver +* Added SDL_zeroa() macro to zero an array of elements +* Added SDL_HasARMSIMD() which returns true if the CPU has ARM SIMD (ARMv6+) features + +Windows: +* Fixed crash when using the release SDL DLL with applications built with gcc +* Fixed performance regression in event handling introduced in 2.0.10 +* Added support for SDL_SetThreadPriority() for UWP applications + +Linux: +* Added the hint SDL_HINT_VIDEO_X11_WINDOW_VISUALID to specify the visual chosen for new X11 windows +* Added the hint SDL_HINT_VIDEO_X11_FORCE_EGL to specify whether X11 should use GLX or EGL by default + +iOS / tvOS / macOS: +* Added SDL_Metal_CreateView() and SDL_Metal_DestroyView() to create CAMetalLayer-backed NSView/UIView and attach it to the specified window. + +iOS/ tvOS: +* Added support for Bluetooth Steam Controllers as game controllers + +tvOS: +* Fixed support for surround sound on Apple TV + +Android: +* Added SDL_GetAndroidSDKVersion() to return the API level of the current device +* Added support for audio capture using OpenSL-ES +* Added support for Bluetooth Steam Controllers as game controllers +* Fixed rare crashes when the app goes into the background or terminates + + --------------------------------------------------------------------------- 2.0.10: --------------------------------------------------------------------------- diff --git a/libs/SDL2/docs/README-android.md b/libs/SDL2/docs/README-android.md index 9893dfeaf..fb835a5aa 100644 --- a/libs/SDL2/docs/README-android.md +++ b/libs/SDL2/docs/README-android.md @@ -10,8 +10,7 @@ If you are using the older ant build process, it is no longer officially supported, but you can use the "android-project-ant" directory as a template. -================================================================================ - Requirements +Requirements ================================================================================ Android SDK (version 26 or later) @@ -23,8 +22,7 @@ https://developer.android.com/tools/sdk/ndk/index.html Minimum API level supported by SDL: 16 (Android 4.1) -================================================================================ - How the port works +How the port works ================================================================================ - Android applications are Java-based, optionally with parts written in C @@ -42,8 +40,7 @@ dispatches to native functions implemented in the SDL library: src/core/android/SDL_android.c -================================================================================ - Building an app +Building an app ================================================================================ For simple projects you can use the script located at build-scripts/androidbuild.sh @@ -82,6 +79,23 @@ For more complex projects, follow these instructions: 4b. If you want to build manually, run './gradlew installDebug' in the project directory. This compiles the .java, creates an .apk with the native code embedded, and installs it on any connected Android device + +If you already have a project that uses CMake, the instructions change somewhat: + +1. Do points 1 and 2 from the instruction above. +2. Edit "/app/build.gradle" to comment out or remove sections containing ndk-build + and uncomment the cmake sections. Add arguments to the CMake invocation as needed. +3. Edit "/app/jni/CMakeLists.txt" to include your project (it defaults to + adding the "src" subdirectory). Note that you'll have SDL2, SDL2main and SDL2-static + as targets in your project, so you should have "target_link_libraries(yourgame SDL2 SDL2main)" + in your CMakeLists.txt file. Also be aware that you should use add_library() instead of + add_executable() for the target containing your "main" function. + +If you wish to use Android Studio, you can skip the last step. + +4. Run './gradlew installDebug' or './gradlew installRelease' in the project directory. It will build and install your .apk on any + connected Android device + Here's an explanation of the files in the Android project, so you can customize them: android-project/app @@ -90,10 +104,12 @@ Here's an explanation of the files in the Android project, so you can customize jni/ - directory holding native code jni/Application.mk - Application JNI settings, including target platform and STL library jni/Android.mk - Android makefile that can call recursively the Android.mk files in all subdirectories + jni/CMakeLists.txt - Top-level CMake project that adds SDL as a subproject jni/SDL/ - (symlink to) directory holding the SDL library files jni/SDL/Android.mk - Android makefile for creating the SDL shared library jni/src/ - directory holding your C/C++ source jni/src/Android.mk - Android makefile that you should customize to include your source code and any library references + jni/src/CMakeLists.txt - CMake file that you may customize to include your source code and any library references src/main/assets/ - directory holding asset files for your application src/main/res/ - directory holding resources for your application src/main/res/mipmap-* - directories holding icons for different phone hardware @@ -101,8 +117,7 @@ Here's an explanation of the files in the Android project, so you can customize src/main/java/org/libsdl/app/SDLActivity.java - the Java class handling the initialization and binding to SDL. Be very careful changing this, as the SDL library relies on this implementation. You should instead subclass this for your application. -================================================================================ - Customizing your application name +Customizing your application name ================================================================================ To customize your application name, edit AndroidManifest.xml and replace @@ -132,8 +147,7 @@ Then replace "SDLActivity" in AndroidManifest.xml with the name of your class, .e.g. "MyGame" -================================================================================ - Customizing your application icon +Customizing your application icon ================================================================================ Conceptually changing your icon is just replacing the "ic_launcher.png" files in @@ -141,8 +155,7 @@ the drawable directories under the res directory. There are several directories for different screen sizes. -================================================================================ - Loading assets +Loading assets ================================================================================ Any files you put in the "app/src/main/assets" directory of your project @@ -170,8 +183,7 @@ disable this behaviour, see for example: http://ponystyle.com/blog/2010/03/26/dealing-with-asset-compression-in-android-apps/ -================================================================================ - Pause / Resume behaviour +Pause / Resume behaviour ================================================================================ If SDL_HINT_ANDROID_BLOCK_ON_PAUSE hint is set (the default), @@ -186,13 +198,37 @@ app can continue to operate as it was. However, there's a chance (on older hardware, or on systems under heavy load), where the GL context can not be restored. In that case you have to listen for -a specific message, (which is not yet implemented!) and restore your textures -manually or quit the app (which is actually the kind of behaviour you'll see -under iOS, if the OS can not restore your GL context it will just kill your app) +a specific message (SDL_RENDER_DEVICE_RESET) and restore your textures +manually or quit the app. +You should not use the SDL renderer API while the app going in background: +- SDL_APP_WILLENTERBACKGROUND: + after you read this message, GL context gets backed-up and you should not + use the SDL renderer API. +- SDL_APP_DIDENTERFOREGROUND: + GL context is restored, and the SDL renderer API is available (unless you + receive SDL_RENDER_DEVICE_RESET). + +Mouse / Touch events ================================================================================ - Threads and the Java VM + +In some case, SDL generates synthetic mouse (resp. touch) events for touch +(resp. mouse) devices. +To enable/disable this behavior, see SDL_hints.h: +- SDL_HINT_TOUCH_MOUSE_EVENTS +- SDL_HINT_MOUSE_TOUCH_EVENTS + +Misc +================================================================================ + +For some device, it appears to works better setting explicitly GL attributes +before creating a window: + SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 5); + SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 6); + SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 5); + +Threads and the Java VM ================================================================================ For a quick tour on how Linux native threads interoperate with the Java VM, take @@ -207,8 +243,17 @@ your thread automatically anyway (when you make an SDL call), but it'll never detach it. -================================================================================ - Using STL +If you ever want to use JNI in a native thread (created by "SDL_CreateThread()"), +it won't be able to find your java class and method because of the java class loader +which is different for native threads, than for java threads (eg your "main()"). + +the work-around is to find class/method, in you "main()" thread, and to use them +in your native thread. + +see: +https://developer.android.com/training/articles/perf-jni#faq:-why-didnt-findclass-find-my-class + +Using STL ================================================================================ You can use STL in your project by creating an Application.mk file in the jni @@ -220,8 +265,7 @@ For more information go here: https://developer.android.com/ndk/guides/cpp-support -================================================================================ - Using the emulator +Using the emulator ================================================================================ There are some good tips and tricks for getting the most out of the @@ -233,8 +277,7 @@ Notice that this software emulator is incredibly slow and needs a lot of disk sp Using a real device works better. -================================================================================ - Troubleshooting +Troubleshooting ================================================================================ You can see if adb can see any devices with the following command: @@ -313,8 +356,7 @@ If you need to build without optimization turned on, you can create a file calle APP_OPTIM := debug -================================================================================ - Memory debugging +Memory debugging ================================================================================ The best (and slowest) way to debug memory issues on Android is valgrind. @@ -365,8 +407,7 @@ When you're done instrumenting with valgrind, you can disable the wrapper: adb shell setprop wrap.org.libsdl.app "" -================================================================================ - Graphics debugging +Graphics debugging ================================================================================ If you are developing on a compatible Tegra-based tablet, NVidia provides @@ -379,8 +420,7 @@ The Tegra Graphics Debugger is available from NVidia here: https://developer.nvidia.com/tegra-graphics-debugger -================================================================================ - Why is API level 16 the minimum required? +Why is API level 16 the minimum required? ================================================================================ The latest NDK toolchain doesn't support targeting earlier than API level 16. @@ -389,8 +429,7 @@ about 99% of the Android devices accessing Google Play support API level 16 or higher (January 2018). -================================================================================ - A note regarding the use of the "dirty rectangles" rendering technique +A note regarding the use of the "dirty rectangles" rendering technique ================================================================================ If your app uses a variation of the "dirty rectangles" rendering technique, @@ -408,8 +447,7 @@ screen each frame. Reference: http://www.khronos.org/registry/egl/specs/EGLTechNote0001.html -================================================================================ - Ending your application +Ending your application ================================================================================ Two legitimate ways: @@ -426,8 +464,7 @@ Don't call exit() as it stops the activity badly. NB: "Back button" can be handled as a SDL_KEYDOWN/UP events, with Keycode SDLK_AC_BACK, for any purpose. -================================================================================ - Known issues +Known issues ================================================================================ - The number of buttons reported for each joystick is hardcoded to be 36, which diff --git a/libs/SDL2/docs/README-cmake.md b/libs/SDL2/docs/README-cmake.md index db318602a..0eeb6d7dd 100644 --- a/libs/SDL2/docs/README-cmake.md +++ b/libs/SDL2/docs/README-cmake.md @@ -15,7 +15,7 @@ platforms: * Linux * VS.NET 2010 * MinGW and Msys -* OS X with support for XCode +* macOS, iOS, and tvOS, with support for XCode ================================================================================ @@ -30,3 +30,55 @@ Assuming the source for SDL is located at ~/sdl cmake ../sdl This will build the static and dynamic versions of SDL in the ~/build directory. + + +================================================================================ +Usage, iOS/tvOS +================================================================================ + +CMake 3.14+ natively includes support for iOS and tvOS. SDL binaries may be built +using Xcode or Make, possibly among other build-systems. + +When using a recent version of CMake (3.14+), it should be possible to: + +- build SDL for iOS, both static and dynamic +- build SDL test apps (as iOS/tvOS .app bundles) +- generate a working SDL_config.h for iOS (using SDL_config.h.cmake as a basis) + +To use, set the following CMake variables when running CMake's configuration stage: + +- `CMAKE_SYSTEM_NAME=` (either `iOS` or `tvOS`) +- `CMAKE_OSX_SYSROOT=` (examples: `iphoneos`, `iphonesimulator`, `iphoneos12.4`, `/full/path/to/iPhoneOS.sdk`, + `appletvos`, `appletvsimulator`, `appletvos12.4`, `/full/path/to/AppleTVOS.sdk`, etc.) +- `CMAKE_OSX_ARCHITECTURES=` (example: "arm64;armv7s;x86_64") + + +### Examples (for iOS/tvOS): + +- for iOS-Simulator, using the latest, installed SDK: + + `cmake ~/sdl -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphonesimulator -DCMAKE_OSX_ARCHITECTURES=x86_64` + +- for iOS-Device, using the latest, installed SDK, 64-bit only + + `cmake ~/sdl -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphoneos -DCMAKE_OSX_ARCHITECTURES=arm64` + +- for iOS-Device, using the latest, installed SDK, mixed 32/64 bit + + `cmake ~/sdl -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphoneos -DCMAKE_OSX_ARCHITECTURES="arm64;armv7s"` + +- for iOS-Device, using a specific SDK revision (iOS 12.4, in this example): + + `cmake ~/sdl -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphoneos12.4 -DCMAKE_OSX_ARCHITECTURES=arm64` + +- for iOS-Simulator, using the latest, installed SDK, and building SDL test apps (as .app bundles): + + `cmake ~/sdl -DSDL_TEST=1 -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphonesimulator -DCMAKE_OSX_ARCHITECTURES=x86_64` + +- for tvOS-Simulator, using the latest, installed SDK: + + `cmake ~/sdl -DCMAKE_SYSTEM_NAME=tvOS -DCMAKE_OSX_SYSROOT=appletvsimulator -DCMAKE_OSX_ARCHITECTURES=x86_64` + +- for tvOS-Device, using the latest, installed SDK: + + `cmake ~/sdl -DCMAKE_SYSTEM_NAME=tvOS -DCMAKE_OSX_SYSROOT=appletvos -DCMAKE_OSX_ARCHITECTURES=arm64` diff --git a/libs/SDL2/docs/README-dynapi.md b/libs/SDL2/docs/README-dynapi.md index b9a58bce1..782745886 100644 --- a/libs/SDL2/docs/README-dynapi.md +++ b/libs/SDL2/docs/README-dynapi.md @@ -1,7 +1,6 @@ -Dynamic API -================================================================================ -Originally posted by Ryan at: - https://plus.google.com/103391075724026391227/posts/TB8UfnDYu4U +# Dynamic API + +Originally posted on Ryan's Google+ account. Background: @@ -35,10 +34,12 @@ So here's what we did: SDL now has, internally, a table of function pointers. So, this is what SDL_Init now looks like: - UInt32 SDL_Init(Uint32 flags) - { - return jump_table.SDL_Init(flags); - } +```c +UInt32 SDL_Init(Uint32 flags) +{ + return jump_table.SDL_Init(flags); +} +``` Except that is all done with a bunch of macro magic so we don't have to maintain every one of these. @@ -47,22 +48,26 @@ What is jump_table.SDL_init()? Eventually, that's a function pointer of the real SDL_Init() that you've been calling all this time. But at startup, it looks more like this: - Uint32 SDL_Init_DEFAULT(Uint32 flags) - { - SDL_InitDynamicAPI(); - return jump_table.SDL_Init(flags); - } +```c +Uint32 SDL_Init_DEFAULT(Uint32 flags) +{ + SDL_InitDynamicAPI(); + return jump_table.SDL_Init(flags); +} +``` SDL_InitDynamicAPI() fills in jump_table with all the actual SDL function -pointers, which means that this _DEFAULT function never gets called again. +pointers, which means that this `_DEFAULT` function never gets called again. First call to any SDL function sets the whole thing up. So you might be asking, what was the value in that? Isn't this what the operating system's dynamic loader was supposed to do for us? Yes, but now we've got this level of indirection, we can do things like this: - export SDL_DYNAMIC_API=/my/actual/libSDL-2.0.so.0 - ./MyGameThatIsStaticallyLinkedToSDL2 +```bash +export SDL_DYNAMIC_API=/my/actual/libSDL-2.0.so.0 +./MyGameThatIsStaticallyLinkedToSDL2 +``` And now, this game that is statically linked to SDL, can still be overridden with a newer, or better, SDL. The statically linked one will only be used as @@ -94,7 +99,9 @@ SDL's function pointers (which might be statically linked into a program, or in a shared library of its own). If so, it loads that library and looks for and calls a single function: - SInt32 SDL_DYNAPI_entry(Uint32 version, void *table, Uint32 tablesize); +```c +SInt32 SDL_DYNAPI_entry(Uint32 version, void *table, Uint32 tablesize); +``` That function takes a version number (more on that in a moment), the address of the jump table, and the size, in bytes, of the table. @@ -116,6 +123,7 @@ Steam Client, this isn't a bad option. Finally, I'm sure some people are reading this and thinking, "I don't want that overhead in my project!" + To which I would point out that the extra function call through the jump table probably wouldn't even show up in a profile, but lucky you: this can all be disabled. You can build SDL without this if you absolutely must, but we would diff --git a/libs/SDL2/docs/README-git.md b/libs/SDL2/docs/README-git.md new file mode 100644 index 000000000..3f03488ae --- /dev/null +++ b/libs/SDL2/docs/README-git.md @@ -0,0 +1,19 @@ +git +========= + +The latest development version of SDL is available via git. +Git allows you to get up-to-the-minute fixes and enhancements; +as a developer works on a source tree, you can use "git" to mirror that +source tree instead of waiting for an official release. Please look +at the Git website ( https://git-scm.com/ ) for more +information on using git, where you can also download software for +macOS, Windows, and Unix systems. + + git clone https://github.com/libsdl-org/SDL + +If you are building SDL via configure, you will need to run autogen.sh +before running configure. + +There is a web interface to the Git repository at: + http://github.com/libsdl-org/SDL/ + diff --git a/libs/SDL2/docs/README-hg.md b/libs/SDL2/docs/README-hg.md index 2449d555d..4e35683bd 100644 --- a/libs/SDL2/docs/README-hg.md +++ b/libs/SDL2/docs/README-hg.md @@ -1,22 +1,4 @@ -Mercurial -========= +We are no longer hosted in Mercurial. Please see README-git.md for details. -The latest development version of SDL is available via Mercurial. -Mercurial allows you to get up-to-the-minute fixes and enhancements; -as a developer works on a source tree, you can use "hg" to mirror that -source tree instead of waiting for an official release. Please look -at the Mercurial website ( https://www.mercurial-scm.org/ ) for more -information on using hg, where you can also download software for -Mac OS X, Windows, and Unix systems. - - hg clone http://hg.libsdl.org/SDL - -If you are building SDL via configure, you will need to run autogen.sh -before running configure. - -There is a web interface to the subversion repository at: - http://hg.libsdl.org/SDL/ - -There is an RSS feed available at that URL, for those that want to -track commits in real time. +Thanks! diff --git a/libs/SDL2/docs/README-ios.md b/libs/SDL2/docs/README-ios.md index 7627a3978..2bcb19681 100644 --- a/libs/SDL2/docs/README-ios.md +++ b/libs/SDL2/docs/README-ios.md @@ -1,7 +1,6 @@ iOS ====== -============================================================================== Building the Simple DirectMedia Layer for iOS 5.1+ ============================================================================== @@ -9,57 +8,29 @@ Requirements: Mac OS X 10.8 or later and the iOS 7+ SDK. Instructions: -1. Open SDL.xcodeproj (located in Xcode-iOS/SDL) in Xcode. -2. Select your desired target, and hit build. - -There are three build targets: -- libSDL.a: - Build SDL as a statically linked library -- testsdl: - Build a test program (there are known test failures which are fine) -- Template: - Package a project template together with the SDL for iPhone static libraries and copies of the SDL headers. The template includes proper references to the SDL library and headers, skeleton code for a basic SDL program, and placeholder graphics for the application icon and startup screen. +1. Open SDL.xcodeproj (located in Xcode/SDL) in Xcode. +2. Select your desired target, and hit build. -============================================================================== -Build SDL for iOS from the command line -============================================================================== - -1. cd (PATH WHERE THE SDL CODE IS)/build-scripts -2. ./iosbuild.sh - -If everything goes fine, you should see a build/ios directory, inside there's -two directories "lib" and "include". -"include" contains a copy of the SDL headers that you'll need for your project, -make sure to configure XCode to look for headers there. -"lib" contains find two files, libSDL2.a and libSDL2main.a, you have to add both -to your XCode project. These libraries contain three architectures in them, -armv6 for legacy devices, armv7, and i386 (for the simulator). -By default, iosbuild.sh will autodetect the SDK version you have installed using -xcodebuild -showsdks, and build for iOS >= 3.0, you can override this behaviour -by setting the MIN_OS_VERSION variable, ie: - -MIN_OS_VERSION=4.2 ./iosbuild.sh - -============================================================================== Using the Simple DirectMedia Layer for iOS ============================================================================== -FIXME: This needs to be updated for the latest methods +1. Run Xcode and create a new project using the iOS Game template, selecting the Objective C language and Metal game technology. +2. In the main view, delete all files except for Assets and LaunchScreen +3. Right click the project in the main view, select "Add Files...", and add the SDL project, Xcode/SDL/SDL.xcodeproj +4. Select the project in the main view, go to the "Info" tab and under "Custom iOS Target Properties" remove the line "Main storyboard file base name" +5. Select the project in the main view, go to the "Build Settings" tab, select "All", and edit "Header Search Path" and drag over the SDL "Public Headers" folder from the left +6. Select the project in the main view, go to the "Build Phases" tab, select "Link Binary With Libraries", and add SDL2.framework from "Framework-iOS" +7. Select the project in the main view, go to the "General" tab, scroll down to "Frameworks, Libraries, and Embedded Content", and select "Embed & Sign" for the SDL library. +8. In the main view, expand SDL -> Library Source -> main -> uikit and drag SDL_uikit_main.c into your game files +9. Add the source files that you would normally have for an SDL program, making sure to have #include "SDL.h" at the top of the file containing your main() function. +10. Add any assets that your application needs. +11. Enjoy! -Here is the easiest method: -1. Build the SDL library (libSDL2.a) and the iPhone SDL Application template. -2. Install the iPhone SDL Application template by copying it to one of Xcode's template directories. I recommend creating a directory called "SDL" in "/Developer/Platforms/iOS.platform/Developer/Library/Xcode/Project Templates/" and placing it there. -3. Start a new project using the template. The project should be immediately ready for use with SDL. -Here is a more manual method: -1. Create a new iOS view based application. -2. Build the SDL static library (libSDL2.a) for iOS and include them in your project. Xcode will ignore the library that is not currently of the correct architecture, hence your app will work both on iOS and in the iOS Simulator. -3. Include the SDL header files in your project. -4. Remove the ApplicationDelegate.h and ApplicationDelegate.m files -- SDL for iOS provides its own UIApplicationDelegate. Remove MainWindow.xib -- SDL for iOS produces its user interface programmatically. -5. Delete the contents of main.m and program your app as a regular SDL program instead. You may replace main.m with your own main.c, but you must tell Xcode not to use the project prefix file, as it includes Objective-C code. +TODO: Add information regarding App Store requirements such as icons, etc. + -============================================================================== Notes -- Retina / High-DPI and window sizes ============================================================================== @@ -88,7 +59,7 @@ orthographic projection matrix using the size in screen coordinates (SDL_GetWindowSize()) can be used in order to display content at the same scale no matter whether a Retina device is used or not. -============================================================================== + Notes -- Application events ============================================================================== @@ -151,7 +122,6 @@ e.g. } -============================================================================== Notes -- Accelerometer as Joystick ============================================================================== @@ -159,7 +129,7 @@ SDL for iPhone supports polling the built in accelerometer as a joystick device. The main thing to note when using the accelerometer with SDL is that while the iPhone natively reports accelerometer as floating point values in units of g-force, SDL_JoystickGetAxis() reports joystick values as signed integers. Hence, in order to convert between the two, some clamping and scaling is necessary on the part of the iPhone SDL joystick driver. To convert SDL_JoystickGetAxis() reported values BACK to units of g-force, simply multiply the values by SDL_IPHONE_MAX_GFORCE / 0x7FFF. -============================================================================== + Notes -- OpenGL ES ============================================================================== @@ -179,7 +149,7 @@ OpenGL ES on iOS doesn't use the traditional system-framebuffer setup provided i The above objects can be obtained via SDL_GetWindowWMInfo() (in SDL_syswm.h). -============================================================================== + Notes -- Keyboard ============================================================================== @@ -195,7 +165,12 @@ SDL_bool SDL_IsTextInputActive() -- returns whether or not text events are enabled (and the onscreen keyboard is visible) +Notes -- Mouse ============================================================================== + +iOS now supports Bluetooth mice on iPad, but by default will provide the mouse input as touch. In order for SDL to see the real mouse events, you should set the key UIApplicationSupportsIndirectInputEvents to true in your Info.plist + + Notes -- Reading and Writing files ============================================================================== @@ -215,7 +190,7 @@ When your SDL based iPhone application starts up, it sets the working directory More information on this subject is available here: http://developer.apple.com/library/ios/#documentation/iPhone/Conceptual/iPhoneOSProgrammingGuide/Introduction/Introduction.html -============================================================================== + Notes -- iPhone SDL limitations ============================================================================== @@ -228,7 +203,23 @@ Textures: Loading Shared Objects: This is disabled by default since it seems to break the terms of the iOS SDK agreement for iOS versions prior to iOS 8. It can be re-enabled in SDL_config_iphoneos.h. + +Notes -- CoreBluetooth.framework ============================================================================== + +SDL_JOYSTICK_HIDAPI is disabled by default. It can give you access to a lot +more game controller devices, but it requires permission from the user before +your app will be able to talk to the Bluetooth hardware. "Made For iOS" +branded controllers do not need this as we don't have to speak to them +directly with raw bluetooth, so many apps can live without this. + +You'll need to link with CoreBluetooth.framework and add something like this +to your Info.plist: + +NSBluetoothPeripheralUsageDescription +MyApp would like to remain connected to nearby bluetooth Game Controllers and Game Pads even when you're not using the app. + + Game Center ============================================================================== @@ -266,7 +257,7 @@ e.g. return 0; } -============================================================================== + Deploying to older versions of iOS ============================================================================== diff --git a/libs/SDL2/docs/README-kmsbsd.md b/libs/SDL2/docs/README-kmsbsd.md new file mode 100644 index 000000000..01db5e8aa --- /dev/null +++ b/libs/SDL2/docs/README-kmsbsd.md @@ -0,0 +1,27 @@ +KMSDRM on *BSD +================================================== + +KMSDRM is supported on FreeBSD and OpenBSD. DragonFlyBSD works but requires being a root user. NetBSD isn't supported yet because the application will crash when creating the KMSDRM screen. + +WSCONS support has been brought back, but only as an input backend. It will not be brought back as a video backend to ease maintenance. + +OpenBSD note: Note that the video backend assumes that the user has read/write permissions to the /dev/drm* devices. + + +SDL2 WSCONS input backend features +=================================================== +1. It is keymap-aware; it will work properly with different keymaps. +2. It has mouse support. +3. Accent input is supported. +4. Compose keys are supported. +5. AltGr and Meta Shift keys work as intended. + +Partially working or no input on OpenBSD/NetBSD. +================================================== + +The WSCONS input backend needs read/write access to the /dev/wskbd* devices, without which it will not work properly. /dev/wsmouse must also be read/write accessible, otherwise mouse input will not work. + +Partially working or no input on FreeBSD. +================================================== + +The evdev devices are only accessible to the root user by default. Edit devfs rules to allow access to such devices. The /dev/kbd* devices are also only accessible to the root user by default. Edit devfs rules to allow access to such devices. diff --git a/libs/SDL2/docs/README-linux.md b/libs/SDL2/docs/README-linux.md index bb3b1d9a4..230bad963 100644 --- a/libs/SDL2/docs/README-linux.md +++ b/libs/SDL2/docs/README-linux.md @@ -9,25 +9,35 @@ at runtime, and you won't get a missing library error, at least with the default configuration parameters. -================================================================================ Build Dependencies -================================================================================ - -Ubuntu 13.04, all available features enabled: +-------------------------------------------------------------------------------- -sudo apt-get install build-essential mercurial make cmake autoconf automake \ -libtool libasound2-dev libpulse-dev libaudio-dev libx11-dev libxext-dev \ -libxrandr-dev libxcursor-dev libxi-dev libxinerama-dev libxxf86vm-dev \ -libxss-dev libgl1-mesa-dev libesd0-dev libdbus-1-dev libudev-dev \ -libgles1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev libibus-1.0-dev \ -fcitx-libs-dev libsamplerate0-dev libsndio-dev +Ubuntu 20.04, all available features enabled: -Ubuntu 16.04+ can also add "libwayland-dev libxkbcommon-dev wayland-protocols" -to that command line for Wayland support. + sudo apt-get install build-essential git make cmake autoconf automake \ + libtool pkg-config libasound2-dev libpulse-dev libaudio-dev libjack-dev \ + libx11-dev libxext-dev libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev \ + libxinerama-dev libxxf86vm-dev libxss-dev libgl1-mesa-dev libdbus-1-dev \ + libudev-dev libgles2-mesa-dev libegl1-mesa-dev libibus-1.0-dev \ + fcitx-libs-dev libsamplerate0-dev libsndio-dev libwayland-dev \ + libxkbcommon-dev libdrm-dev libgbm-dev + +Fedora 35, all available features enabled: + + sudo yum install gcc git-core make cmake autoconf automake libtool \ + alsa-lib-devel pulseaudio-libs-devel nas-devel pipewire-devel \ + libX11-devel libXext-devel libXrandr-devel libXcursor-devel libXfixes-devel \ + libXi-devel libXinerama-devel libXxf86vm-devel libXScrnSaver-devel \ + dbus-devel ibus-devel fcitx-devel systemd-devel mesa-libGL-devel \ + libxkbcommon-devel mesa-libGLES-devel mesa-libEGL-devel vulkan-devel \ + wayland-devel wayland-protocols-devel libdrm-devel mesa-libgbm-devel \ + libusb-devel pipewire-jack-audio-connection-kit-devel libdecor-devel \ + libsamplerate-devel NOTES: -- This includes all the audio targets except arts, because Ubuntu pulled the - artsc0-dev package, but in theory SDL still supports it. +- This includes all the audio targets except arts and esd, because Ubuntu + (and/or Debian) pulled their packages, but in theory SDL still supports them. + The sndio audio target is also unavailable on Fedora. - libsamplerate0-dev lets SDL optionally link to libresamplerate at runtime for higher-quality audio resampling. SDL will work without it if the library is missing, so it's safe to build in support even if the end user doesn't @@ -37,9 +47,8 @@ NOTES: configure script to include DirectFB support. Send patches. :) -================================================================================ Joystick does not work -================================================================================ +-------------------------------------------------------------------------------- If you compiled or are using a version of SDL with udev support (and you should!) there's a few issues that may cause SDL to fail to detect your joystick. To @@ -69,8 +78,8 @@ you need to set up an udev rule to force this variable. A combined rule for the Saitek Pro Flight Rudder Pedals to fix both issues looks like: - SUBSYSTEM=="input", ATTRS{idProduct}=="0763", ATTRS{idVendor}=="06a3", MODE="0666", ENV{ID_INPUT_JOYSTICK}="1" - SUBSYSTEM=="input", ATTRS{idProduct}=="0764", ATTRS{idVendor}=="06a3", MODE="0666", ENV{ID_INPUT_JOYSTICK}="1" + SUBSYSTEM=="input", ATTRS{idProduct}=="0763", ATTRS{idVendor}=="06a3", MODE="0666", ENV{ID_INPUT_JOYSTICK}="1" + SUBSYSTEM=="input", ATTRS{idProduct}=="0764", ATTRS{idVendor}=="06a3", MODE="0666", ENV{ID_INPUT_JOYSTICK}="1" You can set up similar rules for your device by changing the values listed in idProduct and idVendor. To obtain these values, try: diff --git a/libs/SDL2/docs/README-macos.md b/libs/SDL2/docs/README-macos.md new file mode 100644 index 000000000..d7bc98afd --- /dev/null +++ b/libs/SDL2/docs/README-macos.md @@ -0,0 +1,286 @@ +# Mac OS X (aka macOS). + +These instructions are for people using Apple's Mac OS X (pronounced +"ten"), which in newer versions is just referred to as "macOS". + +From the developer's point of view, macOS is a sort of hybrid Mac and +Unix system, and you have the option of using either traditional +command line tools or Apple's IDE Xcode. + +# Command Line Build + +To build SDL using the command line, use the standard configure and make +process: + +```bash +mkdir build +cd build +../configure +make +sudo make install +``` + +CMake is also known to work, although it continues to be a work in progress: + +```bash +mkdir build +cd build +cmake -DCMAKE_BUILD_TYPE=Release .. +make +sudo make install +``` + + +You can also build SDL as a Universal library (a single binary for both +64-bit Intel and ARM architectures), by using the build-scripts/clang-fat.sh +script. + +```bash +mkdir build +cd build +CC=$PWD/../build-scripts/clang-fat.sh ../configure +make +sudo make install +``` + +This script builds SDL with 10.6 ABI compatibility on 64-bit Intel and 11.0 +ABI compatibility on ARM64 architectures. For best compatibility you +should compile your application the same way. + +Please note that building SDL requires at least Xcode 4.6 and the 10.7 SDK +(even if you target back to 10.6 systems). PowerPC support for Mac OS X has +been officially dropped as of SDL 2.0.2. 32-bit Intel, using an older Xcode +release, is still supported at the time of this writing, but current Xcode +releases no longer support it, and eventually neither will SDL. + +To use the library once it's built, you essential have two possibilities: +use the traditional autoconf/automake/make method, or use Xcode. + + +# Caveats for using SDL with Mac OS X + +If you register your own NSApplicationDelegate (using [NSApp setDelegate:]), +SDL will not register its own. This means that SDL will not terminate using +SDL_Quit if it receives a termination request, it will terminate like a +normal app, and it will not send a SDL_DROPFILE when you request to open a +file with the app. To solve these issues, put the following code in your +NSApplicationDelegate implementation: + + +```objc +- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender +{ + if (SDL_GetEventState(SDL_QUIT) == SDL_ENABLE) { + SDL_Event event; + event.type = SDL_QUIT; + SDL_PushEvent(&event); + } + + return NSTerminateCancel; +} + +- (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename +{ + if (SDL_GetEventState(SDL_DROPFILE) == SDL_ENABLE) { + SDL_Event event; + event.type = SDL_DROPFILE; + event.drop.file = SDL_strdup([filename UTF8String]); + return (SDL_PushEvent(&event) > 0); + } + + return NO; +} +``` + +# Using the Simple DirectMedia Layer with a traditional Makefile + +An existing autoconf/automake build system for your SDL app has good chances +to work almost unchanged on macOS. However, to produce a "real" Mac binary +that you can distribute to users, you need to put the generated binary into a +so called "bundle", which is basically a fancy folder with a name like +"MyCoolGame.app". + +To get this build automatically, add something like the following rule to +your Makefile.am: + +```make +bundle_contents = APP_NAME.app/Contents +APP_NAME_bundle: EXE_NAME + mkdir -p $(bundle_contents)/MacOS + mkdir -p $(bundle_contents)/Resources + echo "APPL????" > $(bundle_contents)/PkgInfo + $(INSTALL_PROGRAM) $< $(bundle_contents)/MacOS/ +``` + +You should replace `EXE_NAME` with the name of the executable. `APP_NAME` is +what will be visible to the user in the Finder. Usually it will be the same +as `EXE_NAME` but capitalized. E.g. if `EXE_NAME` is "testgame" then `APP_NAME` +usually is "TestGame". You might also want to use `@PACKAGE@` to use the +package name as specified in your configure.ac file. + +If your project builds more than one application, you will have to do a bit +more. For each of your target applications, you need a separate rule. + +If you want the created bundles to be installed, you may want to add this +rule to your Makefile.am: + +```make +install-exec-hook: APP_NAME_bundle + rm -rf $(DESTDIR)$(prefix)/Applications/APP_NAME.app + mkdir -p $(DESTDIR)$(prefix)/Applications/ + cp -r $< /$(DESTDIR)$(prefix)Applications/ +``` + +This rule takes the Bundle created by the rule from step 3 and installs them +into "$(DESTDIR)$(prefix)/Applications/". + +Again, if you want to install multiple applications, you will have to augment +the make rule accordingly. + +But beware! That is only part of the story! With the above, you end up with +a barebones .app bundle, which is double-clickable from the Finder. But +there are some more things you should do before shipping your product... + +1. The bundle right now probably is dynamically linked against SDL. That + means that when you copy it to another computer, *it will not run*, + unless you also install SDL on that other computer. A good solution + for this dilemma is to static link against SDL. On OS X, you can + achieve that by linking against the libraries listed by + + ```bash + sdl-config --static-libs + ``` + + instead of those listed by + + ```bash + sdl-config --libs + ``` + + Depending on how exactly SDL is integrated into your build systems, the + way to achieve that varies, so I won't describe it here in detail + +2. Add an 'Info.plist' to your application. That is a special XML file which + contains some meta-information about your application (like some copyright + information, the version of your app, the name of an optional icon file, + and other things). Part of that information is displayed by the Finder + when you click on the .app, or if you look at the "Get Info" window. + More information about Info.plist files can be found on Apple's homepage. + + +As a final remark, let me add that I use some of the techniques (and some +variations of them) in [Exult](https://github.com/exult/exult) and +[ScummVM](https://github.com/scummvm/scummvm); both are available in source on +the net, so feel free to take a peek at them for inspiration! + + +# Using the Simple DirectMedia Layer with Xcode + +These instructions are for using Apple's Xcode IDE to build SDL applications. + +## First steps + +The first thing to do is to unpack the Xcode.tar.gz archive in the +top level SDL directory (where the Xcode.tar.gz archive resides). +Because Stuffit Expander will unpack the archive into a subdirectory, +you should unpack the archive manually from the command line: + +```bash +cd [path_to_SDL_source] +tar zxf Xcode.tar.gz +``` + +This will create a new folder called Xcode, which you can browse +normally from the Finder. + +## Building the Framework + +The SDL Library is packaged as a framework bundle, an organized +relocatable folder hierarchy of executable code, interface headers, +and additional resources. For practical purposes, you can think of a +framework as a more user and system-friendly shared library, whose library +file behaves more or less like a standard UNIX shared library. + +To build the framework, simply open the framework project and build it. +By default, the framework bundle "SDL.framework" is installed in +/Library/Frameworks. Therefore, the testers and project stationary expect +it to be located there. However, it will function the same in any of the +following locations: + +* ~/Library/Frameworks +* /Local/Library/Frameworks +* /System/Library/Frameworks + +## Build Options + +There are two "Build Styles" (See the "Targets" tab) for SDL. +"Deployment" should be used if you aren't tweaking the SDL library. +"Development" should be used to debug SDL apps or the library itself. + +## Building the Testers + +Open the SDLTest project and build away! + +## Using the Project Stationary + +Copy the stationary to the indicated folders to access it from +the "New Project" and "Add target" menus. What could be easier? + +## Setting up a new project by hand + +Some of you won't want to use the Stationary so I'll give some tips: + +(this is accurate as of Xcode 12.5.) + +* Click "File" -> "New" -> "Project... +* Choose "macOS" and then "App" from the "Application" section. +* Fill out the options in the next window. User interface is "XIB" and + Language is "Objective-C". +* Remove "main.m" from your project +* Remove "MainMenu.xib" from your project +* Remove "AppDelegates.*" from your project +* Add "\$(HOME)/Library/Frameworks/SDL.framework/Headers" to include path +* Add "\$(HOME)/Library/Frameworks" to the frameworks search path +* Add "-framework SDL -framework Foundation -framework AppKit" to "OTHER_LDFLAGS" +* Add your files +* Clean and build + +## Building from command line + +Use `xcode-build` in the same directory as your .pbxproj file + +## Running your app + +You can send command line args to your app by either invoking it from +the command line (in *.app/Contents/MacOS) or by entering them in the +Executables" panel of the target settings. + +# Implementation Notes + +Some things that may be of interest about how it all works... + +## Working directory + +In SDL 1.2, the working directory of your SDL app is by default set to its +parent, but this is no longer the case in SDL 2.0. SDL2 does change the +working directory, which means it'll be whatever the command line prompt +that launched the program was using, or if launched by double-clicking in +the finger, it will be "/", the _root of the filesystem_. Plan accordingly! +You can use SDL_GetBasePath() to find where the program is running from and +chdir() there directly. + + +## You have a Cocoa App! + +Your SDL app is essentially a Cocoa application. When your app +starts up and the libraries finish loading, a Cocoa procedure is called, +which sets up the working directory and calls your main() method. +You are free to modify your Cocoa app with generally no consequence +to SDL. You cannot, however, easily change the SDL window itself. +Functionality may be added in the future to help this. + +# Bug reports + +Bugs are tracked at [the GitHub issue tracker](https://github.com/libsdl-org/SDL/issues/). +Please feel free to report bugs there! + diff --git a/libs/SDL2/docs/README-os2.md b/libs/SDL2/docs/README-os2.md new file mode 100644 index 000000000..1815b944d --- /dev/null +++ b/libs/SDL2/docs/README-os2.md @@ -0,0 +1,92 @@ +Simple DirectMedia Layer 2 for OS/2 & eComStation +================================================================================ +SDL port for OS/2, authored by Andrey Vasilkin , 2016 + + +OpenGL and audio capture not supported by this port. + +Additional optional environment variables: + +SDL_AUDIO_SHARE + Values: 0 or 1, default is 0 + Initializes the device as shareable or exclusively acquired. + +SDL_VIDEODRIVER + Values: DIVE or VMAN, default is DIVE + Use video subsystem: Direct interface video extensions (DIVE) or + Video Manager (VMAN). + +You may significantly increase video output speed with OS4 kernel and patched +files vman.dll and dive.dll or with latest versions of ACPI support and video +driver Panorama. + +Latest versions of OS/4 kernel: + http://gus.biysk.ru/os4/ + (Info: https://www.os2world.com/wiki/index.php/Phoenix_OS/4) + +Patched files vman.dll and dive.dll: + http://gus.biysk.ru/os4/test/pached_dll/PATCHED_DLL.RAR + + +Compiling: +---------- + +Open Watcom 1.9 or newer is tested. For the new Open Watcom V2 fork, see: +https://github.com/open-watcom/ and https://open-watcom.github.io +WATCOM environment variable must to be set to the Open Watcom install +directory. To compile, run: wmake -f Makefile.os2 + + +Installing: +----------- + +- eComStation: + + If you have previously installed SDL2, make a Backup copy of SDL2.dll + located in D:\ecs\dll (where D: is disk on which installed eComStation). + Stop all programs running with SDL2. Copy SDL2.dll to D:\ecs\dll + +- OS/2: + + Copy SDL2.dll to any directory on your LIBPATH. If you have a previous + version installed, close all SDL2 applications before replacing the old + copy. Also make sure that any other older versions of DLLs are removed + from your system. + + +Joysticks in SDL2: +------------------ + +The joystick code in SDL2 is a direct forward-port from the SDL-1.2 version. +Here is the original documentation from SDL-1.2: + +The Joystick detection only works for standard joysticks (2 buttons, 2 axes +and the like). Therefore, if you use a non-standard joystick, you should +specify its features in the SDL_OS2_JOYSTICK environment variable in a batch +file or CONFIG.SYS, so SDL applications can provide full capability to your +device. The syntax is: + +SET SDL_OS2_JOYSTICK=[JOYSTICK_NAME] [AXES] [BUTTONS] [HATS] [BALLS] + +So, it you have a Gravis GamePad with 4 axes, 2 buttons, 2 hats and 0 balls, +the line should be: + +SET SDL_OS2_JOYSTICK=Gravis_GamePad 4 2 2 0 + +If you want to add spaces in your joystick name, just surround it with +quotes or double-quotes: + +SET SDL_OS2_JOYSTICK='Gravis GamePad' 4 2 2 0 + +or + +SET SDL_OS2_JOYSTICK="Gravis GamePad" 4 2 2 0 + + Note however that Balls and Hats are not supported under OS/2, and the +value will be ignored... but it is wise to define these correctly because +in the future those can be supported. + + Also the number of buttons is limited to 2 when using two joysticks, +4 when using one joystick with 4 axes, 6 when using a joystick with 3 axes +and 8 when using a joystick with 2 axes. Notice however these are limitations +of the Joystick Port hardware, not OS/2. diff --git a/libs/SDL2/docs/README-psp.md b/libs/SDL2/docs/README-psp.md index 0acc93d4c..f2b0fb869 100644 --- a/libs/SDL2/docs/README-psp.md +++ b/libs/SDL2/docs/README-psp.md @@ -9,10 +9,22 @@ Credit to Building -------- -To build for the PSP, make sure psp-config is in the path and run: +To build SDL2 library for the PSP, make sure psp-config is in the path and run: make -f Makefile.psp +Getting PSP toolchain +--------------------- +https://github.com/pspdev/psptoolchain + +Running on PPSSPP Emulator +-------------------------- +https://github.com/hrydgard/ppsspp +( https://github.com/hrydgard/ppsspp/wiki/Build-instructions ) + +Compiling an HelloWorld +----------------------- +https://psp-dev.org/doku.php?id=tutorial:hello_world To Do ------ diff --git a/libs/SDL2/docs/README-raspberrypi.md b/libs/SDL2/docs/README-raspberrypi.md index 2c95e0649..6a85c3cf4 100644 --- a/libs/SDL2/docs/README-raspberrypi.md +++ b/libs/SDL2/docs/README-raspberrypi.md @@ -1,13 +1,12 @@ Raspberry Pi -================================================================================ +============ Requirements: Raspbian (other Linux distros may work as well). -================================================================================ - Features -================================================================================ +Features +-------- * Works without X11 * Hardware accelerated OpenGL ES 2.x @@ -16,9 +15,8 @@ Raspbian (other Linux distros may work as well). * Hotplugging of input devices via UDEV -================================================================================ - Raspbian Build Dependencies -================================================================================ +Raspbian Build Dependencies +--------------------------- sudo apt-get install libudev-dev libasound2-dev libdbus-1-dev @@ -28,18 +26,17 @@ OpenGL ES 2.x, it usually comes pre-installed, but in any case: sudo apt-get install libraspberrypi0 libraspberrypi-bin libraspberrypi-dev -================================================================================ - NEON -================================================================================ +NEON +---- If your Pi has NEON support, make sure you add -mfpu=neon to your CFLAGS so that SDL will select some otherwise-disabled highly-optimized code. The original Pi units don't have NEON, the Pi2 probably does, and the Pi3 definitely does. -================================================================================ - Cross compiling from x86 Linux -================================================================================ + +Cross compiling from x86 Linux +------------------------------ To cross compile SDL for Raspbian from your desktop machine, you'll need a Raspbian system root and the cross compilation tools. We'll assume these tools @@ -92,9 +89,8 @@ To be able to deploy this to /usr/local in the Raspbian system you need to fix u perl -w -pi -e "s#$PWD/rpi-sdl2-installed#/usr/local#g;" ./rpi-sdl2-installed/lib/libSDL2.la ./rpi-sdl2-installed/lib/pkgconfig/sdl2.pc ./rpi-sdl2-installed/bin/sdl2-config -================================================================================ - Apps don't work or poor video/audio performance -================================================================================ +Apps don't work or poor video/audio performance +----------------------------------------------- If you get sound problems, buffer underruns, etc, run "sudo rpi-update" to update the RPi's firmware. Note that doing so will fix these problems, but it @@ -108,17 +104,15 @@ See here how to configure this setting: http://elinux.org/RPiconfig Using a fixed gpu_mem=128 is the best option (specially if you updated the firmware, using CMA probably won't work, at least it's the current case). -================================================================================ - No input -================================================================================ +No input +-------- Make sure you belong to the "input" group. sudo usermod -aG input `whoami` -================================================================================ - No HDMI Audio -================================================================================ +No HDMI Audio +------------- If you notice that ALSA works but there's no audio over HDMI, try adding: @@ -128,9 +122,8 @@ to your config.txt file and reboot. Reference: http://www.raspberrypi.org/phpBB3/viewtopic.php?t=5062 -================================================================================ - Text Input API support -================================================================================ +Text Input API support +---------------------- The Text Input API is supported, with translation of scan codes done via the kernel symbol tables. For this to work, SDL needs access to a valid console. @@ -160,9 +153,9 @@ this determining the CAPS LOCK behavior: sudo dpkg-reconfigure locales -================================================================================ - OpenGL problems -================================================================================ + +OpenGL problems +--------------- If you have desktop OpenGL headers installed at build time in your RPi or cross compilation environment, support for it will be built in. However, the chipset @@ -177,9 +170,8 @@ environment variable: export SDL_RENDER_DRIVER=opengles2 -================================================================================ - Notes -================================================================================ +Notes +----- * When launching apps remotely (via SSH), SDL can prevent local keystrokes from leaking into the console only if it has root privileges. Launching apps locally diff --git a/libs/SDL2/docs/README-riscos.md b/libs/SDL2/docs/README-riscos.md new file mode 100644 index 000000000..76b27e0aa --- /dev/null +++ b/libs/SDL2/docs/README-riscos.md @@ -0,0 +1,41 @@ +RISC OS +======= + +Requirements: + +* RISC OS 3.5 or later. +* [SharedUnixLibrary](http://www.riscos.info/packages/LibraryDetails.html#SharedUnixLibraryarm). +* [DigitalRenderer](http://www.riscos.info/packages/LibraryDetails.html#DRendererarm), for audio support. +* [Iconv](http://www.netsurf-browser.org/projects/iconv/), for `SDL_iconv` and related functions. + + +Compiling: +---------- + +Currently, SDL2 for RISC OS only supports compiling with GCCSDK under Linux. Both the autoconf and CMake build systems are supported. + +The following commands can be used to build SDL2 for RISC OS using autoconf: + + ./configure --host=arm-unknown-riscos --prefix=$GCCSDK_INSTALL_ENV --disable-gcc-atomics + make + make install + +The following commands can be used to build SDL2 for RISC OS using CMake: + + cmake -Bbuild-riscos -DCMAKE_TOOLCHAIN_FILE=$GCCSDK_INSTALL_ENV/toolchain-riscos.cmake -DRISCOS=ON -DCMAKE_INSTALL_PREFIX=$GCCSDK_INSTALL_ENV -DCMAKE_BUILD_TYPE=Release -DSDL_GCC_ATOMICS=OFF + cmake --build build-riscos + cmake --build build-riscos --target install + + +Current level of implementation +------------------------------- + +The video driver currently provides full screen video support with keyboard and mouse input. Windowed mode is not yet supported, but is planned in the future. Only software rendering is supported. + +The filesystem APIs return either Unix-style paths or RISC OS-style paths based on the value of the `__riscosify_control` symbol, as is standard for UnixLib functions. + +The audio, loadso, thread and timer APIs are currently provided by UnixLib. + +GCC atomics are currently broken on some platforms, meaning it's currently necessary to compile with `--disable-gcc-atomics` using autotools or `-DSDL_GCC_ATOMICS=OFF` using CMake. + +The joystick, locale and power APIs are not yet implemented. diff --git a/libs/SDL2/docs/README-visualc.md b/libs/SDL2/docs/README-visualc.md new file mode 100644 index 000000000..ea2bc1852 --- /dev/null +++ b/libs/SDL2/docs/README-visualc.md @@ -0,0 +1,114 @@ +Using SDL with Microsoft Visual C++ +=================================== + +### by [Lion Kimbro](mailto:snowlion@sprynet.com) with additions by [James Turk](mailto:james@conceptofzero.net) + +You can either use the precompiled libraries from the [SDL](https://www.libsdl.org/download.php) web site, or you can build SDL +yourself. + +### Building SDL + +0. To build SDL, your machine must, at a minimum, have the DirectX9.0c SDK installed. It may or may not be retrievable from +the [Microsoft](https://www.microsoft.com) website, so you might need to locate it [online](https://duckduckgo.com/?q=directx9.0c+sdk+download&t=h_&ia=web). +_Editor's note: I've been able to successfully build SDL using Visual Studio 2019 **without** the DX9.0c SDK_ + +1. Open the Visual Studio solution file at `./VisualC/SDL.sln`. + +2. Your IDE will likely prompt you to upgrade this solution file to whatever later version of the IDE you're using. In the `Retarget Projects` dialog, +all of the affected project files should be checked allowing you to use the latest `Windows SDK Version` you have installed, along with +the `Platform Toolset`. + +If you choose *NOT* to upgrade to use the latest `Windows SDK Version` or `Platform Toolset`, then you'll need the `Visual Studio 2010 Platform Toolset`. + +3. Build the `.dll` and `.lib` files by right clicking on each project in turn (Projects are listed in the _Workspace_ +panel in the _FileView_ tab), and selecting `Build`. + +You may get a few warnings, but you should not get any errors. + +Later, we will refer to the following `.lib` and `.dll` files that have just been generated: + +- `./VisualC/Win32/Debug/SDL2.dll` or `./VisualC/Win32/Release/SDL2.dll` +- `./VisualC/Win32/Debug/SDL2.lib` or `./VisualC/Win32/Release/SDL2.lib` +- `./VisualC/Win32/Debug/SDL2main.lib` or `./VisualC/Win32/Release/SDL2main.lib` + +_Note for the `x64` versions, just replace `Win32` in the path with `x64`_ + +### Creating a Project with SDL + +- Create a project as a `Win32 Application`. + +- Create a C++ file for your project. + +- Set the C runtime to `Multi-threaded DLL` in the menu: +`Project|Settings|C/C++ tab|Code Generation|Runtime Library `. + +- Add the SDL `include` directory to your list of includes in the menu: +`Project|Settings|C/C++ tab|Preprocessor|Additional include directories ` + +*VC7 Specific: Instead of doing this, I find it easier to add the +include and library directories to the list that VC7 keeps. Do this by +selecting Tools|Options|Projects|VC++ Directories and under the "Show +Directories For:" dropbox select "Include Files", and click the "New +Directory Icon" and add the [SDLROOT]\\include directory (e.g. If you +installed to c:\\SDL\\ add c:\\SDL\\include). Proceed to change the +dropbox selection to "Library Files" and add [SDLROOT]\\lib.* + +The "include directory" I am referring to is the `./include` folder. + +Now we're going to use the files that we had created earlier in the *Build SDL* step. + +Copy the following file into your Project directory: + +- `SDL2.dll` + +Add the following files to your project (It is not necessary to copy them to your project directory): + +- `SDL2.lib` +- `SDL2main.lib` + +To add them to your project, right click on your project, and select +`Add files to project`. + +**Instead of adding the files to your project, it is more desirable to add them to the linker options: Project|Properties|Linker|Command Line +and type the names of the libraries to link with in the "Additional Options:" box. Note: This must be done for each build configuration +(e.g. Release,Debug).** + +### Hello SDL2 + +Here's a sample SDL snippet to verify everything is setup in your IDE: + +``` + #include "SDL.h" + + int main( int argc, char* argv[] ) + { + const int WIDTH = 640; + const int HEIGHT = 480; + SDL_Window* window = NULL; + SDL_Renderer* renderer = NULL; + + SDL_Init(SDL_INIT_VIDEO); + window = SDL_CreateWindow("SDL2 Test", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, WIDTH, HEIGHT, SDL_WINDOW_SHOWN); + renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC); + + SDL_DestroyRenderer(renderer); + SDL_DestroyWindow(window); + SDL_Quit(); + return 0; + } + ``` + +### That's it! + +I hope that this document has helped you get through the most difficult part of using the SDL: installing it. +Suggestions for improvements should be posted to the [Github Issues](https://github.com/libsdl-org/SDL/issues). + +### Credits + +Thanks to [Paulus Esterhazy](mailto:pesterhazy@gmx.net), for the work on VC++ port. + +This document was originally called "VisualC.txt", and was written by [Sam Lantinga](mailto:slouken@libsdl.org). + +Later, it was converted to HTML and expanded into the document that you see today by [Lion Kimbro](mailto:snowlion@sprynet.com). + +Minor Fixes and Visual C++ 7 Information (In Green) was added by [James Turk](mailto:james@conceptofzero.net) diff --git a/libs/SDL2/docs/README-vita.md b/libs/SDL2/docs/README-vita.md new file mode 100644 index 000000000..aefa19703 --- /dev/null +++ b/libs/SDL2/docs/README-vita.md @@ -0,0 +1,30 @@ +PS Vita +======= +SDL port for the Sony Playstation Vita and Sony Playstation TV + +Credit to +* xerpi and rsn8887 for initial (vita2d) port +* vitasdk/dolcesdk devs +* CBPS discord (Namely Graphene and SonicMastr) + +Building +-------- +To build for the PSVita, make sure you have vitasdk and cmake installed and run: +``` + cmake -S. -Bbuild -DCMAKE_TOOLCHAIN_FILE=${VITASDK}/share/vita.toolchain.cmake -DCMAKE_BUILD_TYPE=Release + cmake --build build + cmake --install build +``` + + +Notes +----- +* gles1/gles2 support and renderers are disabled by default and can be enabled by configuring with `-DVIDEO_VITA_PVR=ON` + These renderers support 720p and 1080i resolutions. These can be specified with: + `SDL_setenv("VITA_RESOLUTION", "720", 1);` and `SDL_setenv("VITA_RESOLUTION", "1080", 1);` +* gles2 support via PIB is disabled by default and can be enabled by configuring with `-DVIDEO_VITA_PIB=ON` +* By default SDL emits mouse events for touch events on every touchscreen. + Vita has two touchscreens, so it's recommended to use `SDL_SetHint(SDL_HINT_TOUCH_MOUSE_EVENTS, "0");` and handle touch events instead. + Individual touchscreens can be disabled with: + `SDL_setenv("VITA_DISABLE_TOUCH_FRONT", "1", 1);` and `SDL_setenv("VITA_DISABLE_TOUCH_BACK", "1", 1);` +* Support for L2/R2/R3/R3 buttons, haptic feedback and gamepad led only available on PSTV, or when using external ds4 gamepad on vita. diff --git a/libs/SDL2/docs/README-winrt.md b/libs/SDL2/docs/README-winrt.md index fe539d83b..87052ff1d 100644 --- a/libs/SDL2/docs/README-winrt.md +++ b/libs/SDL2/docs/README-winrt.md @@ -352,38 +352,41 @@ source file, such as, "main.cpp". your project, and open the file in Visual C++'s text editor. 7. Copy and paste the following code into the new file, then save it. - - #include +```c +#include - int main(int argc, char **argv) - { - SDL_DisplayMode mode; - SDL_Window * window = NULL; - SDL_Renderer * renderer = NULL; - SDL_Event evt; +int main(int argc, char **argv) +{ + SDL_DisplayMode mode; + SDL_Window * window = NULL; + SDL_Renderer * renderer = NULL; + SDL_Event evt; + SDL_bool keep_going = SDL_TRUE; + + if (SDL_Init(SDL_INIT_VIDEO) != 0) { + return 1; + } else if (SDL_GetCurrentDisplayMode(0, &mode) != 0) { + return 1; + } else if (SDL_CreateWindowAndRenderer(mode.w, mode.h, SDL_WINDOW_FULLSCREEN, &window, &renderer) != 0) { + return 1; + } - if (SDL_Init(SDL_INIT_VIDEO) != 0) { - return 1; + while (keep_going) { + while (SDL_PollEvent(&evt)) { + if ((evt.type == SDL_KEYDOWN) && (evt.key.keysym.sym == SDLK_ESCAPE)) { + keep_going = SDL_FALSE; + } } - if (SDL_GetCurrentDisplayMode(0, &mode) != 0) { - return 1; - } - - if (SDL_CreateWindowAndRenderer(mode.w, mode.h, SDL_WINDOW_FULLSCREEN, &window, &renderer) != 0) { - return 1; - } - - while (1) { - while (SDL_PollEvent(&evt)) { - } - - SDL_SetRenderDrawColor(renderer, 0, 255, 0, 255); - SDL_RenderClear(renderer); - SDL_RenderPresent(renderer); - } + SDL_SetRenderDrawColor(renderer, 0, 255, 0, 255); + SDL_RenderClear(renderer); + SDL_RenderPresent(renderer); } + SDL_Quit(); + return 0; +} +``` #### 6.B. Adding code and assets #### diff --git a/libs/SDL2/docs/README.md b/libs/SDL2/docs/README.md index f34811335..635290822 100644 --- a/libs/SDL2/docs/README.md +++ b/libs/SDL2/docs/README.md @@ -21,7 +21,7 @@ SDL is written in C, works natively with C++, and there are bindings available for several other languages, including C# and Python. This library is distributed under the zlib license, which can be found -in the file "COPYING.txt". +in the file "LICENSE.txt". The best way to learn how to use SDL is to check out the header files in the "include" subdirectory and the programs in the "test" subdirectory. @@ -35,10 +35,11 @@ More documentation and FAQs are available online at [the wiki](http://wiki.libsd - [DynAPI](README-dynapi.md) - [Emscripten](README-emscripten.md) - [Gesture](README-gesture.md) -- [Mercurial](README-hg.md) +- [Git](README-git.md) - [iOS](README-ios.md) - [Linux](README-linux.md) - [OS X](README-macosx.md) +- [OS/2](README-os2.md) - [Native Client](README-nacl.md) - [Pandora](README-pandora.md) - [Supported Platforms](README-platforms.md) @@ -49,15 +50,16 @@ More documentation and FAQs are available online at [the wiki](http://wiki.libsd - [WinCE](README-wince.md) - [Windows](README-windows.md) - [WinRT](README-winrt.md) +- [PSVita](README-vita.md) If you need help with the library, or just want to discuss SDL related -issues, you can join the [developers mailing list](http://www.libsdl.org/mailing-list.php) +issues, you can join the [SDL Discourse](https://discourse.libsdl.org/), +which can be used as a web forum or a mailing list, at your preference. If you want to report bugs or contribute patches, please submit them to -[bugzilla](https://bugzilla.libsdl.org/) +[our bug tracker](https://github.com/libsdl-org/SDL/issues) Enjoy! Sam Lantinga - diff --git a/libs/SDL2/i686-w64-mingw32/bin/SDL2.dll b/libs/SDL2/i686-w64-mingw32/bin/SDL2.dll index 3673be1ab..343dd68c6 100755 Binary files a/libs/SDL2/i686-w64-mingw32/bin/SDL2.dll and b/libs/SDL2/i686-w64-mingw32/bin/SDL2.dll differ diff --git a/libs/SDL2/i686-w64-mingw32/bin/sdl2-config b/libs/SDL2/i686-w64-mingw32/bin/sdl2-config index 18acfa7f7..29ad1bda2 100755 --- a/libs/SDL2/i686-w64-mingw32/bin/sdl2-config +++ b/libs/SDL2/i686-w64-mingw32/bin/sdl2-config @@ -39,7 +39,7 @@ while test $# -gt 0; do echo $exec_prefix ;; --version) - echo 2.0.10 + echo 2.0.20 ;; --cflags) echo -I${prefix}/include/SDL2 -Dmain=SDL_main @@ -49,7 +49,7 @@ while test $# -gt 0; do ;; --static-libs) # --libs|--static-libs) - echo -L${exec_prefix}/lib -lmingw32 -lSDL2main -lSDL2 -mwindows -Wl,--no-undefined -Wl,--dynamicbase -Wl,--nxcompat -lm -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion -luuid -static-libgcc + echo -L${exec_prefix}/lib -lmingw32 -lSDL2main -lSDL2 -mwindows -Wl,--dynamicbase -Wl,--nxcompat -lm -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion -luuid ;; *) echo "${usage}" 1>&2 diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL.h index 88dce0c03..7cdd3243d 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -42,11 +42,13 @@ #include "SDL_filesystem.h" #include "SDL_gamecontroller.h" #include "SDL_haptic.h" +#include "SDL_hidapi.h" #include "SDL_hints.h" #include "SDL_joystick.h" #include "SDL_loadso.h" #include "SDL_log.h" #include "SDL_messagebox.h" +#include "SDL_metal.h" #include "SDL_mutex.h" #include "SDL_power.h" #include "SDL_render.h" @@ -58,6 +60,8 @@ #include "SDL_timer.h" #include "SDL_version.h" #include "SDL_video.h" +#include "SDL_locale.h" +#include "SDL_misc.h" #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ @@ -90,37 +94,130 @@ extern "C" { /* @} */ /** - * This function initializes the subsystems specified by \c flags + * Initialize the SDL library. + * + * SDL_Init() simply forwards to calling SDL_InitSubSystem(). Therefore, the + * two may be used interchangeably. Though for readability of your code + * SDL_InitSubSystem() might be preferred. + * + * The file I/O (for example: SDL_RWFromFile) and threading (SDL_CreateThread) + * subsystems are initialized by default. Message boxes + * (SDL_ShowSimpleMessageBox) also attempt to work without initializing the + * video subsystem, in hopes of being useful in showing an error dialog when + * SDL_Init fails. You must specifically initialize other subsystems if you + * use them in your application. + * + * Logging (such as SDL_Log) works without initialization, too. + * + * `flags` may be any of the following OR'd together: + * + * - `SDL_INIT_TIMER`: timer subsystem + * - `SDL_INIT_AUDIO`: audio subsystem + * - `SDL_INIT_VIDEO`: video subsystem; automatically initializes the events + * subsystem + * - `SDL_INIT_JOYSTICK`: joystick subsystem; automatically initializes the + * events subsystem + * - `SDL_INIT_HAPTIC`: haptic (force feedback) subsystem + * - `SDL_INIT_GAMECONTROLLER`: controller subsystem; automatically + * initializes the joystick subsystem + * - `SDL_INIT_EVENTS`: events subsystem + * - `SDL_INIT_EVERYTHING`: all of the above subsystems + * - `SDL_INIT_NOPARACHUTE`: compatibility; this flag is ignored + * + * Subsystem initialization is ref-counted, you must call SDL_QuitSubSystem() + * for each SDL_InitSubSystem() to correctly shutdown a subsystem manually (or + * call SDL_Quit() to force shutdown). If a subsystem is already loaded then + * this call will increase the ref-count and return. + * + * \param flags subsystem initialization flags + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_InitSubSystem + * \sa SDL_Quit + * \sa SDL_SetMainReady + * \sa SDL_WasInit */ extern DECLSPEC int SDLCALL SDL_Init(Uint32 flags); /** - * This function initializes specific SDL subsystems + * Compatibility function to initialize the SDL library. * - * Subsystem initialization is ref-counted, you must call - * SDL_QuitSubSystem() for each SDL_InitSubSystem() to correctly - * shutdown a subsystem manually (or call SDL_Quit() to force shutdown). - * If a subsystem is already loaded then this call will - * increase the ref-count and return. + * In SDL2, this function and SDL_Init() are interchangeable. + * + * \param flags any of the flags used by SDL_Init(); see SDL_Init for details. + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Init + * \sa SDL_Quit + * \sa SDL_QuitSubSystem */ extern DECLSPEC int SDLCALL SDL_InitSubSystem(Uint32 flags); /** - * This function cleans up specific SDL subsystems + * Shut down specific SDL subsystems. + * + * If you start a subsystem using a call to that subsystem's init function + * (for example SDL_VideoInit()) instead of SDL_Init() or SDL_InitSubSystem(), + * SDL_QuitSubSystem() and SDL_WasInit() will not work. You will need to use + * that subsystem's quit function (SDL_VideoQuit()) directly instead. But + * generally, you should not be using those functions directly anyhow; use + * SDL_Init() instead. + * + * You still need to call SDL_Quit() even if you close all open subsystems + * with SDL_QuitSubSystem(). + * + * \param flags any of the flags used by SDL_Init(); see SDL_Init for details. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_InitSubSystem + * \sa SDL_Quit */ extern DECLSPEC void SDLCALL SDL_QuitSubSystem(Uint32 flags); /** - * This function returns a mask of the specified subsystems which have - * previously been initialized. + * Get a mask of the specified subsystems which are currently initialized. * - * If \c flags is 0, it returns a mask of all initialized subsystems. + * \param flags any of the flags used by SDL_Init(); see SDL_Init for details. + * \returns a mask of all initialized subsystems if `flags` is 0, otherwise it + * returns the initialization status of the specified subsystems. + * + * The return value does not include SDL_INIT_NOPARACHUTE. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Init + * \sa SDL_InitSubSystem */ extern DECLSPEC Uint32 SDLCALL SDL_WasInit(Uint32 flags); /** - * This function cleans up all initialized subsystems. You should - * call it upon all exit conditions. + * Clean up all initialized subsystems. + * + * You should call this function even if you have already shutdown each + * initialized subsystem with SDL_QuitSubSystem(). It is safe to call this + * function even in the case of errors in initialization. + * + * If you start a subsystem using a call to that subsystem's init function + * (for example SDL_VideoInit()) instead of SDL_Init() or SDL_InitSubSystem(), + * then you must use that subsystem's quit function (SDL_VideoQuit()) to shut + * it down before calling SDL_Quit(). But generally, you should not be using + * those functions directly anyhow; use SDL_Init() instead. + * + * You can use this function with atexit() to ensure that it is run when your + * application is shutdown, but it is not wise to do this from a library or + * other dynamically loaded code. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Init + * \sa SDL_QuitSubSystem */ extern DECLSPEC void SDLCALL SDL_Quit(void); diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_assert.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_assert.h index 8baecb63e..defadf137 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_assert.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_assert.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -53,6 +53,10 @@ assert can have unique static variables associated with it. #define SDL_TriggerBreakpoint() __debugbreak() #elif ( (!defined(__NACL__)) && ((defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__))) ) #define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "int $3\n\t" ) +#elif ( defined(__APPLE__) && (defined(__arm64__) || defined(__aarch64__)) ) /* this might work on other ARM targets, but this is a known quantity... */ + #define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "brk #22\n\t" ) +#elif defined(__APPLE__) && defined(__arm__) + #define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "bkpt #22\n\t" ) #elif defined(__386__) && defined(__WATCOMC__) #define SDL_TriggerBreakpoint() { _asm { int 0x03 } } #elif defined(HAVE_SIGNAL_H) && !defined(__WATCOMC__) @@ -185,92 +189,121 @@ extern DECLSPEC SDL_AssertState SDLCALL SDL_ReportAssertion(SDL_AssertData *, #define SDL_assert_always(condition) SDL_enabled_assert(condition) +/** + * A callback that fires when an SDL assertion fails. + * + * \param data a pointer to the SDL_AssertData structure corresponding to the + * current assertion + * \param userdata what was passed as `userdata` to SDL_SetAssertionHandler() + * \returns an SDL_AssertState value indicating how to handle the failure. + */ typedef SDL_AssertState (SDLCALL *SDL_AssertionHandler)( const SDL_AssertData* data, void* userdata); /** - * \brief Set an application-defined assertion handler. + * Set an application-defined assertion handler. * - * This allows an app to show its own assertion UI and/or force the - * response to an assertion failure. If the app doesn't provide this, SDL - * will try to do the right thing, popping up a system-specific GUI dialog, - * and probably minimizing any fullscreen windows. + * This function allows an application to show its own assertion UI and/or + * force the response to an assertion failure. If the application doesn't + * provide this, SDL will try to do the right thing, popping up a + * system-specific GUI dialog, and probably minimizing any fullscreen windows. * - * This callback may fire from any thread, but it runs wrapped in a mutex, so - * it will only fire from one thread at a time. + * This callback may fire from any thread, but it runs wrapped in a mutex, so + * it will only fire from one thread at a time. * - * Setting the callback to NULL restores SDL's original internal handler. + * This callback is NOT reset to SDL's internal handler upon SDL_Quit()! * - * This callback is NOT reset to SDL's internal handler upon SDL_Quit()! + * \param handler the SDL_AssertionHandler function to call when an assertion + * fails or NULL for the default handler + * \param userdata a pointer that is passed to `handler` * - * Return SDL_AssertState value of how to handle the assertion failure. + * \since This function is available since SDL 2.0.0. * - * \param handler Callback function, called when an assertion fails. - * \param userdata A pointer passed to the callback as-is. + * \sa SDL_GetAssertionHandler */ extern DECLSPEC void SDLCALL SDL_SetAssertionHandler( SDL_AssertionHandler handler, void *userdata); /** - * \brief Get the default assertion handler. + * Get the default assertion handler. * - * This returns the function pointer that is called by default when an - * assertion is triggered. This is an internal function provided by SDL, - * that is used for assertions when SDL_SetAssertionHandler() hasn't been - * used to provide a different function. + * This returns the function pointer that is called by default when an + * assertion is triggered. This is an internal function provided by SDL, that + * is used for assertions when SDL_SetAssertionHandler() hasn't been used to + * provide a different function. * - * \return The default SDL_AssertionHandler that is called when an assert triggers. + * \returns the default SDL_AssertionHandler that is called when an assert + * triggers. + * + * \since This function is available since SDL 2.0.2. + * + * \sa SDL_GetAssertionHandler */ extern DECLSPEC SDL_AssertionHandler SDLCALL SDL_GetDefaultAssertionHandler(void); /** - * \brief Get the current assertion handler. + * Get the current assertion handler. * - * This returns the function pointer that is called when an assertion is - * triggered. This is either the value last passed to - * SDL_SetAssertionHandler(), or if no application-specified function is - * set, is equivalent to calling SDL_GetDefaultAssertionHandler(). + * This returns the function pointer that is called when an assertion is + * triggered. This is either the value last passed to + * SDL_SetAssertionHandler(), or if no application-specified function is set, + * is equivalent to calling SDL_GetDefaultAssertionHandler(). * - * \param puserdata Pointer to a void*, which will store the "userdata" - * pointer that was passed to SDL_SetAssertionHandler(). - * This value will always be NULL for the default handler. - * If you don't care about this data, it is safe to pass - * a NULL pointer to this function to ignore it. - * \return The SDL_AssertionHandler that is called when an assert triggers. + * The parameter `puserdata` is a pointer to a void*, which will store the + * "userdata" pointer that was passed to SDL_SetAssertionHandler(). This value + * will always be NULL for the default handler. If you don't care about this + * data, it is safe to pass a NULL pointer to this function to ignore it. + * + * \param puserdata pointer which is filled with the "userdata" pointer that + * was passed to SDL_SetAssertionHandler() + * \returns the SDL_AssertionHandler that is called when an assert triggers. + * + * \since This function is available since SDL 2.0.2. + * + * \sa SDL_SetAssertionHandler */ extern DECLSPEC SDL_AssertionHandler SDLCALL SDL_GetAssertionHandler(void **puserdata); /** - * \brief Get a list of all assertion failures. + * Get a list of all assertion failures. * - * Get all assertions triggered since last call to SDL_ResetAssertionReport(), - * or the start of the program. + * This function gets all assertions triggered since the last call to + * SDL_ResetAssertionReport(), or the start of the program. * - * The proper way to examine this data looks something like this: + * The proper way to examine this data looks something like this: * - * - * const SDL_AssertData *item = SDL_GetAssertionReport(); - * while (item) { - * printf("'%s', %s (%s:%d), triggered %u times, always ignore: %s.\\n", - * item->condition, item->function, item->filename, - * item->linenum, item->trigger_count, - * item->always_ignore ? "yes" : "no"); - * item = item->next; - * } - * + * ```c + * const SDL_AssertData *item = SDL_GetAssertionReport(); + * while (item) { + * printf("'%s', %s (%s:%d), triggered %u times, always ignore: %s.\\n", + * item->condition, item->function, item->filename, + * item->linenum, item->trigger_count, + * item->always_ignore ? "yes" : "no"); + * item = item->next; + * } + * ``` * - * \return List of all assertions. - * \sa SDL_ResetAssertionReport + * \returns a list of all failed assertions or NULL if the list is empty. This + * memory should not be modified or freed by the application. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ResetAssertionReport */ extern DECLSPEC const SDL_AssertData * SDLCALL SDL_GetAssertionReport(void); /** - * \brief Reset the list of all assertion failures. + * Clear the list of all assertion failures. * - * Reset list of all assertions triggered. + * This function will clear the list of all assertions triggered up to that + * point. Immediately following this call, SDL_GetAssertionReport will return + * no items. In addition, any previously-triggered assertions will be reset to + * a trigger_count of zero, and their always_ignore state will be false. * - * \sa SDL_GetAssertionReport + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetAssertionReport */ extern DECLSPEC void SDLCALL SDL_ResetAssertionReport(void); diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_atomic.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_atomic.h index deee35f91..b29ceeac2 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_atomic.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_atomic.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -89,25 +89,51 @@ extern "C" { typedef int SDL_SpinLock; /** - * \brief Try to lock a spin lock by setting it to a non-zero value. + * Try to lock a spin lock by setting it to a non-zero value. * - * \param lock Points to the lock. + * ***Please note that spinlocks are dangerous if you don't know what you're + * doing. Please be careful using any sort of spinlock!*** * - * \return SDL_TRUE if the lock succeeded, SDL_FALSE if the lock is already held. + * \param lock a pointer to a lock variable + * \returns SDL_TRUE if the lock succeeded, SDL_FALSE if the lock is already + * held. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AtomicLock + * \sa SDL_AtomicUnlock */ extern DECLSPEC SDL_bool SDLCALL SDL_AtomicTryLock(SDL_SpinLock *lock); /** - * \brief Lock a spin lock by setting it to a non-zero value. + * Lock a spin lock by setting it to a non-zero value. * - * \param lock Points to the lock. + * ***Please note that spinlocks are dangerous if you don't know what you're + * doing. Please be careful using any sort of spinlock!*** + * + * \param lock a pointer to a lock variable + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AtomicTryLock + * \sa SDL_AtomicUnlock */ extern DECLSPEC void SDLCALL SDL_AtomicLock(SDL_SpinLock *lock); /** - * \brief Unlock a spin lock by setting it to 0. Always returns immediately + * Unlock a spin lock by setting it to 0. * - * \param lock Points to the lock. + * Always returns immediately. + * + * ***Please note that spinlocks are dangerous if you don't know what you're + * doing. Please be careful using any sort of spinlock!*** + * + * \param lock a pointer to a lock variable + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AtomicLock + * \sa SDL_AtomicTryLock */ extern DECLSPEC void SDLCALL SDL_AtomicUnlock(SDL_SpinLock *lock); @@ -126,7 +152,7 @@ void _ReadWriteBarrier(void); /* This is correct for all CPUs when using GCC or Solaris Studio 12.1+. */ #define SDL_CompilerBarrier() __asm__ __volatile__ ("" : : : "memory") #elif defined(__WATCOMC__) -extern _inline void SDL_CompilerBarrier (void); +extern __inline void SDL_CompilerBarrier(void); #pragma aux SDL_CompilerBarrier = "" parm [] modify exact []; #else #define SDL_CompilerBarrier() \ @@ -137,20 +163,22 @@ extern _inline void SDL_CompilerBarrier (void); * Memory barriers are designed to prevent reads and writes from being * reordered by the compiler and being seen out of order on multi-core CPUs. * - * A typical pattern would be for thread A to write some data and a flag, - * and for thread B to read the flag and get the data. In this case you - * would insert a release barrier between writing the data and the flag, + * A typical pattern would be for thread A to write some data and a flag, and + * for thread B to read the flag and get the data. In this case you would + * insert a release barrier between writing the data and the flag, * guaranteeing that the data write completes no later than the flag is - * written, and you would insert an acquire barrier between reading the - * flag and reading the data, to ensure that all the reads associated - * with the flag have completed. + * written, and you would insert an acquire barrier between reading the flag + * and reading the data, to ensure that all the reads associated with the flag + * have completed. * - * In this pattern you should always see a release barrier paired with - * an acquire barrier and you should gate the data reads/writes with a - * single flag variable. + * In this pattern you should always see a release barrier paired with an + * acquire barrier and you should gate the data reads/writes with a single + * flag variable. * * For more information on these semantics, take a look at the blog post: * http://preshing.com/20120913/acquire-and-release-semantics + * + * \since This function is available since SDL 2.0.6. */ extern DECLSPEC void SDLCALL SDL_MemoryBarrierReleaseFunction(void); extern DECLSPEC void SDLCALL SDL_MemoryBarrierAcquireFunction(void); @@ -216,32 +244,73 @@ typedef void (*SDL_KernelMemoryBarrierFunc)(); typedef struct { int value; } SDL_atomic_t; /** - * \brief Set an atomic variable to a new value if it is currently an old value. + * Set an atomic variable to a new value if it is currently an old value. * - * \return SDL_TRUE if the atomic variable was set, SDL_FALSE otherwise. + * ***Note: If you don't know what this function is for, you shouldn't use + * it!*** * - * \note If you don't know what this function is for, you shouldn't use it! -*/ + * \param a a pointer to an SDL_atomic_t variable to be modified + * \param oldval the old value + * \param newval the new value + * \returns SDL_TRUE if the atomic variable was set, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AtomicCASPtr + * \sa SDL_AtomicGet + * \sa SDL_AtomicSet + */ extern DECLSPEC SDL_bool SDLCALL SDL_AtomicCAS(SDL_atomic_t *a, int oldval, int newval); /** - * \brief Set an atomic variable to a value. + * Set an atomic variable to a value. * - * \return The previous value of the atomic variable. + * This function also acts as a full memory barrier. + * + * ***Note: If you don't know what this function is for, you shouldn't use + * it!*** + * + * \param a a pointer to an SDL_atomic_t variable to be modified + * \param v the desired value + * \returns the previous value of the atomic variable. + * + * \since This function is available since SDL 2.0.2. + * + * \sa SDL_AtomicGet */ extern DECLSPEC int SDLCALL SDL_AtomicSet(SDL_atomic_t *a, int v); /** - * \brief Get the value of an atomic variable + * Get the value of an atomic variable. + * + * ***Note: If you don't know what this function is for, you shouldn't use + * it!*** + * + * \param a a pointer to an SDL_atomic_t variable + * \returns the current value of an atomic variable. + * + * \since This function is available since SDL 2.0.2. + * + * \sa SDL_AtomicSet */ extern DECLSPEC int SDLCALL SDL_AtomicGet(SDL_atomic_t *a); /** - * \brief Add to an atomic variable. + * Add to an atomic variable. * - * \return The previous value of the atomic variable. + * This function also acts as a full memory barrier. * - * \note This same style can be used for any number operation + * ***Note: If you don't know what this function is for, you shouldn't use + * it!*** + * + * \param a a pointer to an SDL_atomic_t variable to be modified + * \param v the desired value to add + * \returns the previous value of the atomic variable. + * + * \since This function is available since SDL 2.0.2. + * + * \sa SDL_AtomicDecRef + * \sa SDL_AtomicIncRef */ extern DECLSPEC int SDLCALL SDL_AtomicAdd(SDL_atomic_t *a, int v); @@ -263,23 +332,54 @@ extern DECLSPEC int SDLCALL SDL_AtomicAdd(SDL_atomic_t *a, int v); #endif /** - * \brief Set a pointer to a new value if it is currently an old value. + * Set a pointer to a new value if it is currently an old value. * - * \return SDL_TRUE if the pointer was set, SDL_FALSE otherwise. + * ***Note: If you don't know what this function is for, you shouldn't use + * it!*** * - * \note If you don't know what this function is for, you shouldn't use it! -*/ + * \param a a pointer to a pointer + * \param oldval the old pointer value + * \param newval the new pointer value + * \returns SDL_TRUE if the pointer was set, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AtomicCAS + * \sa SDL_AtomicGetPtr + * \sa SDL_AtomicSetPtr + */ extern DECLSPEC SDL_bool SDLCALL SDL_AtomicCASPtr(void **a, void *oldval, void *newval); /** - * \brief Set a pointer to a value atomically. + * Set a pointer to a value atomically. * - * \return The previous value of the pointer. + * ***Note: If you don't know what this function is for, you shouldn't use + * it!*** + * + * \param a a pointer to a pointer + * \param v the desired pointer value + * \returns the previous value of the pointer. + * + * \since This function is available since SDL 2.0.2. + * + * \sa SDL_AtomicCASPtr + * \sa SDL_AtomicGetPtr */ extern DECLSPEC void* SDLCALL SDL_AtomicSetPtr(void **a, void* v); /** - * \brief Get the value of a pointer atomically. + * Get the value of a pointer atomically. + * + * ***Note: If you don't know what this function is for, you shouldn't use + * it!*** + * + * \param a a pointer to a pointer + * \returns the current value of a pointer. + * + * \since This function is available since SDL 2.0.2. + * + * \sa SDL_AtomicCASPtr + * \sa SDL_AtomicSetPtr */ extern DECLSPEC void* SDLCALL SDL_AtomicGetPtr(void **a); diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_audio.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_audio.h index 305c01a9d..181f66c57 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_audio.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_audio.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -19,6 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ +/* !!! FIXME: several functions in here need Doxygen comments. */ + /** * \file SDL_audio.h * @@ -212,9 +214,12 @@ typedef void (SDLCALL * SDL_AudioFilter) (struct SDL_AudioCVT * cvt, * set both its (buf) field to a pointer that is aligned to 16 bytes, and its * (len) field to something that's a multiple of 16, if possible. */ -#ifdef __GNUC__ +#if defined(__GNUC__) && !defined(__CHERI_PURE_CAPABILITY__) /* This structure is 84 bytes on 32-bit architectures, make sure GCC doesn't pad it out to 88 bytes to guarantee ABI compatibility between compilers. + This is not a concern on CHERI architectures, where pointers must be stored + at aligned locations otherwise they will become invalid, and thus structs + containing pointers cannot be packed without giving a warning or error. vvv The next time we rev the ABI, make sure to size the ints and add padding. */ @@ -248,7 +253,48 @@ typedef struct SDL_AudioCVT * order that they are normally initialized by default. */ /* @{ */ + +/** + * Use this function to get the number of built-in audio drivers. + * + * This function returns a hardcoded number. This never returns a negative + * value; if there are no drivers compiled into this build of SDL, this + * function returns zero. The presence of a driver in this list does not mean + * it will function, it just means SDL is capable of interacting with that + * interface. For example, a build of SDL might have esound support, but if + * there's no esound server available, SDL's esound driver would fail if used. + * + * By default, SDL tries all drivers, in its preferred order, until one is + * found to be usable. + * + * \returns the number of built-in audio drivers. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetAudioDriver + */ extern DECLSPEC int SDLCALL SDL_GetNumAudioDrivers(void); + +/** + * Use this function to get the name of a built in audio driver. + * + * The list of audio drivers is given in the order that they are normally + * initialized by default; the drivers that seem more reasonable to choose + * first (as far as the SDL developers believe) are earlier in the list. + * + * The names of drivers are all simple, low-ASCII identifiers, like "alsa", + * "coreaudio" or "xaudio2". These never have Unicode characters, and are not + * meant to be proper names. + * + * \param index the index of the audio driver; the value ranges from 0 to + * SDL_GetNumAudioDrivers() - 1 + * \returns the name of the audio driver at the requested index, or NULL if an + * invalid index was specified. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetNumAudioDrivers + */ extern DECLSPEC const char *SDLCALL SDL_GetAudioDriver(int index); /* @} */ @@ -260,60 +306,103 @@ extern DECLSPEC const char *SDLCALL SDL_GetAudioDriver(int index); * use. You should normally use SDL_Init() or SDL_InitSubSystem(). */ /* @{ */ + +/** + * Use this function to initialize a particular audio driver. + * + * This function is used internally, and should not be used unless you have a + * specific need to designate the audio driver you want to use. You should + * normally use SDL_Init() or SDL_InitSubSystem(). + * + * \param driver_name the name of the desired audio driver + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AudioQuit + */ extern DECLSPEC int SDLCALL SDL_AudioInit(const char *driver_name); + +/** + * Use this function to shut down audio if you initialized it with + * SDL_AudioInit(). + * + * This function is used internally, and should not be used unless you have a + * specific need to specify the audio driver you want to use. You should + * normally use SDL_Quit() or SDL_QuitSubSystem(). + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AudioInit + */ extern DECLSPEC void SDLCALL SDL_AudioQuit(void); /* @} */ /** - * This function returns the name of the current audio driver, or NULL - * if no driver has been initialized. + * Get the name of the current audio driver. + * + * The returned string points to internal static memory and thus never becomes + * invalid, even if you quit the audio subsystem and initialize a new driver + * (although such a case would return a different static string from another + * call to this function, of course). As such, you should not modify or free + * the returned string. + * + * \returns the name of the current audio driver or NULL if no driver has been + * initialized. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AudioInit */ extern DECLSPEC const char *SDLCALL SDL_GetCurrentAudioDriver(void); /** - * This function opens the audio device with the desired parameters, and - * returns 0 if successful, placing the actual hardware parameters in the - * structure pointed to by \c obtained. If \c obtained is NULL, the audio - * data passed to the callback function will be guaranteed to be in the - * requested format, and will be automatically converted to the hardware - * audio format if necessary. This function returns -1 if it failed - * to open the audio device, or couldn't set up the audio thread. + * This function is a legacy means of opening the audio device. * - * When filling in the desired audio spec structure, - * - \c desired->freq should be the desired audio frequency in samples-per- - * second. - * - \c desired->format should be the desired audio format. - * - \c desired->samples is the desired size of the audio buffer, in - * samples. This number should be a power of two, and may be adjusted by - * the audio driver to a value more suitable for the hardware. Good values - * seem to range between 512 and 8096 inclusive, depending on the - * application and CPU speed. Smaller values yield faster response time, - * but can lead to underflow if the application is doing heavy processing - * and cannot fill the audio buffer in time. A stereo sample consists of - * both right and left channels in LR ordering. - * Note that the number of samples is directly related to time by the - * following formula: \code ms = (samples*1000)/freq \endcode - * - \c desired->size is the size in bytes of the audio buffer, and is - * calculated by SDL_OpenAudio(). - * - \c desired->silence is the value used to set the buffer to silence, - * and is calculated by SDL_OpenAudio(). - * - \c desired->callback should be set to a function that will be called - * when the audio device is ready for more data. It is passed a pointer - * to the audio buffer, and the length in bytes of the audio buffer. - * This function usually runs in a separate thread, and so you should - * protect data structures that it accesses by calling SDL_LockAudio() - * and SDL_UnlockAudio() in your code. Alternately, you may pass a NULL - * pointer here, and call SDL_QueueAudio() with some frequency, to queue - * more audio samples to be played (or for capture devices, call - * SDL_DequeueAudio() with some frequency, to obtain audio samples). - * - \c desired->userdata is passed as the first parameter to your callback - * function. If you passed a NULL callback, this value is ignored. + * This function remains for compatibility with SDL 1.2, but also because it's + * slightly easier to use than the new functions in SDL 2.0. The new, more + * powerful, and preferred way to do this is SDL_OpenAudioDevice(). * - * The audio device starts out playing silence when it's opened, and should - * be enabled for playing by calling \c SDL_PauseAudio(0) when you are ready - * for your audio callback function to be called. Since the audio driver - * may modify the requested size of the audio buffer, you should allocate - * any local mixing buffers after you open the audio device. + * This function is roughly equivalent to: + * + * ```c + * SDL_OpenAudioDevice(NULL, 0, desired, obtained, SDL_AUDIO_ALLOW_ANY_CHANGE); + * ``` + * + * With two notable exceptions: + * + * - If `obtained` is NULL, we use `desired` (and allow no changes), which + * means desired will be modified to have the correct values for silence, + * etc, and SDL will convert any differences between your app's specific + * request and the hardware behind the scenes. + * - The return value is always success or failure, and not a device ID, which + * means you can only have one device open at a time with this function. + * + * \param desired an SDL_AudioSpec structure representing the desired output + * format. Please refer to the SDL_OpenAudioDevice + * documentation for details on how to prepare this structure. + * \param obtained an SDL_AudioSpec structure filled in with the actual + * parameters, or NULL. + * \returns 0 if successful, placing the actual hardware parameters in the + * structure pointed to by `obtained`. + * + * If `obtained` is NULL, the audio data passed to the callback + * function will be guaranteed to be in the requested format, and + * will be automatically converted to the actual hardware audio + * format if necessary. If `obtained` is NULL, `desired` will have + * fields modified. + * + * This function returns a negative error code on failure to open the + * audio device or failure to set up the audio thread; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CloseAudio + * \sa SDL_LockAudio + * \sa SDL_PauseAudio + * \sa SDL_UnlockAudio */ extern DECLSPEC int SDLCALL SDL_OpenAudio(SDL_AudioSpec * desired, SDL_AudioSpec * obtained); @@ -330,59 +419,223 @@ extern DECLSPEC int SDLCALL SDL_OpenAudio(SDL_AudioSpec * desired, typedef Uint32 SDL_AudioDeviceID; /** - * Get the number of available devices exposed by the current driver. - * Only valid after a successfully initializing the audio subsystem. - * Returns -1 if an explicit list of devices can't be determined; this is - * not an error. For example, if SDL is set up to talk to a remote audio - * server, it can't list every one available on the Internet, but it will - * still allow a specific host to be specified to SDL_OpenAudioDevice(). + * Get the number of built-in audio devices. * - * In many common cases, when this function returns a value <= 0, it can still - * successfully open the default device (NULL for first argument of - * SDL_OpenAudioDevice()). + * This function is only valid after successfully initializing the audio + * subsystem. + * + * Note that audio capture support is not implemented as of SDL 2.0.4, so the + * `iscapture` parameter is for future expansion and should always be zero for + * now. + * + * This function will return -1 if an explicit list of devices can't be + * determined. Returning -1 is not an error. For example, if SDL is set up to + * talk to a remote audio server, it can't list every one available on the + * Internet, but it will still allow a specific host to be specified in + * SDL_OpenAudioDevice(). + * + * In many common cases, when this function returns a value <= 0, it can still + * successfully open the default device (NULL for first argument of + * SDL_OpenAudioDevice()). + * + * This function may trigger a complete redetect of available hardware. It + * should not be called for each iteration of a loop, but rather once at the + * start of a loop: + * + * ```c + * // Don't do this: + * for (int i = 0; i < SDL_GetNumAudioDevices(0); i++) + * + * // do this instead: + * const int count = SDL_GetNumAudioDevices(0); + * for (int i = 0; i < count; ++i) { do_something_here(); } + * ``` + * + * \param iscapture zero to request playback devices, non-zero to request + * recording devices + * \returns the number of available devices exposed by the current driver or + * -1 if an explicit list of devices can't be determined. A return + * value of -1 does not necessarily mean an error condition. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetAudioDeviceName + * \sa SDL_OpenAudioDevice */ extern DECLSPEC int SDLCALL SDL_GetNumAudioDevices(int iscapture); /** - * Get the human-readable name of a specific audio device. - * Must be a value between 0 and (number of audio devices-1). - * Only valid after a successfully initializing the audio subsystem. - * The values returned by this function reflect the latest call to - * SDL_GetNumAudioDevices(); recall that function to redetect available - * hardware. + * Get the human-readable name of a specific audio device. * - * The string returned by this function is UTF-8 encoded, read-only, and - * managed internally. You are not to free it. If you need to keep the - * string for any length of time, you should make your own copy of it, as it - * will be invalid next time any of several other SDL functions is called. + * This function is only valid after successfully initializing the audio + * subsystem. The values returned by this function reflect the latest call to + * SDL_GetNumAudioDevices(); re-call that function to redetect available + * hardware. + * + * The string returned by this function is UTF-8 encoded, read-only, and + * managed internally. You are not to free it. If you need to keep the string + * for any length of time, you should make your own copy of it, as it will be + * invalid next time any of several other SDL functions are called. + * + * \param index the index of the audio device; valid values range from 0 to + * SDL_GetNumAudioDevices() - 1 + * \param iscapture non-zero to query the list of recording devices, zero to + * query the list of output devices. + * \returns the name of the audio device at the requested index, or NULL on + * error. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetNumAudioDevices */ extern DECLSPEC const char *SDLCALL SDL_GetAudioDeviceName(int index, int iscapture); +/** + * Get the preferred audio format of a specific audio device. + * + * This function is only valid after a successfully initializing the audio + * subsystem. The values returned by this function reflect the latest call to + * SDL_GetNumAudioDevices(); re-call that function to redetect available + * hardware. + * + * `spec` will be filled with the sample rate, sample format, and channel + * count. All other values in the structure are filled with 0. When the + * supported struct members are 0, SDL was unable to get the property from the + * backend. + * + * \param index the index of the audio device; valid values range from 0 to + * SDL_GetNumAudioDevices() - 1 + * \param iscapture non-zero to query the list of recording devices, zero to + * query the list of output devices. + * \param spec The SDL_AudioSpec to be initialized by this function. + * \returns 0 on success, nonzero on error + * + * \since This function is available since SDL 2.0.16. + * + * \sa SDL_GetNumAudioDevices + */ +extern DECLSPEC int SDLCALL SDL_GetAudioDeviceSpec(int index, + int iscapture, + SDL_AudioSpec *spec); + /** - * Open a specific audio device. Passing in a device name of NULL requests - * the most reasonable default (and is equivalent to calling SDL_OpenAudio()). + * Open a specific audio device. * - * The device name is a UTF-8 string reported by SDL_GetAudioDeviceName(), but - * some drivers allow arbitrary and driver-specific strings, such as a - * hostname/IP address for a remote audio server, or a filename in the - * diskaudio driver. + * SDL_OpenAudio(), unlike this function, always acts on device ID 1. As such, + * this function will never return a 1 so as not to conflict with the legacy + * function. * - * \return 0 on error, a valid device ID that is >= 2 on success. + * Please note that SDL 2.0 before 2.0.5 did not support recording; as such, + * this function would fail if `iscapture` was not zero. Starting with SDL + * 2.0.5, recording is implemented and this value can be non-zero. * - * SDL_OpenAudio(), unlike this function, always acts on device ID 1. + * Passing in a `device` name of NULL requests the most reasonable default + * (and is equivalent to what SDL_OpenAudio() does to choose a device). The + * `device` name is a UTF-8 string reported by SDL_GetAudioDeviceName(), but + * some drivers allow arbitrary and driver-specific strings, such as a + * hostname/IP address for a remote audio server, or a filename in the + * diskaudio driver. + * + * An opened audio device starts out paused, and should be enabled for playing + * by calling SDL_PauseAudioDevice(devid, 0) when you are ready for your audio + * callback function to be called. Since the audio driver may modify the + * requested size of the audio buffer, you should allocate any local mixing + * buffers after you open the audio device. + * + * The audio callback runs in a separate thread in most cases; you can prevent + * race conditions between your callback and other threads without fully + * pausing playback with SDL_LockAudioDevice(). For more information about the + * callback, see SDL_AudioSpec. + * + * Managing the audio spec via 'desired' and 'obtained': + * + * When filling in the desired audio spec structure: + * + * - `desired->freq` should be the frequency in sample-frames-per-second (Hz). + * - `desired->format` should be the audio format (`AUDIO_S16SYS`, etc). + * - `desired->samples` is the desired size of the audio buffer, in _sample + * frames_ (with stereo output, two samples--left and right--would make a + * single sample frame). This number should be a power of two, and may be + * adjusted by the audio driver to a value more suitable for the hardware. + * Good values seem to range between 512 and 8096 inclusive, depending on + * the application and CPU speed. Smaller values reduce latency, but can + * lead to underflow if the application is doing heavy processing and cannot + * fill the audio buffer in time. Note that the number of sample frames is + * directly related to time by the following formula: `ms = + * (sampleframes*1000)/freq` + * - `desired->size` is the size in _bytes_ of the audio buffer, and is + * calculated by SDL_OpenAudioDevice(). You don't initialize this. + * - `desired->silence` is the value used to set the buffer to silence, and is + * calculated by SDL_OpenAudioDevice(). You don't initialize this. + * - `desired->callback` should be set to a function that will be called when + * the audio device is ready for more data. It is passed a pointer to the + * audio buffer, and the length in bytes of the audio buffer. This function + * usually runs in a separate thread, and so you should protect data + * structures that it accesses by calling SDL_LockAudioDevice() and + * SDL_UnlockAudioDevice() in your code. Alternately, you may pass a NULL + * pointer here, and call SDL_QueueAudio() with some frequency, to queue + * more audio samples to be played (or for capture devices, call + * SDL_DequeueAudio() with some frequency, to obtain audio samples). + * - `desired->userdata` is passed as the first parameter to your callback + * function. If you passed a NULL callback, this value is ignored. + * + * `allowed_changes` can have the following flags OR'd together: + * + * - `SDL_AUDIO_ALLOW_FREQUENCY_CHANGE` + * - `SDL_AUDIO_ALLOW_FORMAT_CHANGE` + * - `SDL_AUDIO_ALLOW_CHANNELS_CHANGE` + * - `SDL_AUDIO_ALLOW_ANY_CHANGE` + * + * These flags specify how SDL should behave when a device cannot offer a + * specific feature. If the application requests a feature that the hardware + * doesn't offer, SDL will always try to get the closest equivalent. + * + * For example, if you ask for float32 audio format, but the sound card only + * supports int16, SDL will set the hardware to int16. If you had set + * SDL_AUDIO_ALLOW_FORMAT_CHANGE, SDL will change the format in the `obtained` + * structure. If that flag was *not* set, SDL will prepare to convert your + * callback's float32 audio to int16 before feeding it to the hardware and + * will keep the originally requested format in the `obtained` structure. + * + * The resulting audio specs, varying depending on hardware and on what + * changes were allowed, will then be written back to `obtained`. + * + * If your application can only handle one specific data format, pass a zero + * for `allowed_changes` and let SDL transparently handle any differences. + * + * \param device a UTF-8 string reported by SDL_GetAudioDeviceName() or a + * driver-specific name as appropriate. NULL requests the most + * reasonable default device. + * \param iscapture non-zero to specify a device should be opened for + * recording, not playback + * \param desired an SDL_AudioSpec structure representing the desired output + * format; see SDL_OpenAudio() for more information + * \param obtained an SDL_AudioSpec structure filled in with the actual output + * format; see SDL_OpenAudio() for more information + * \param allowed_changes 0, or one or more flags OR'd together + * \returns a valid device ID that is > 0 on success or 0 on failure; call + * SDL_GetError() for more information. + * + * For compatibility with SDL 1.2, this will never return 1, since + * SDL reserves that ID for the legacy SDL_OpenAudio() function. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CloseAudioDevice + * \sa SDL_GetAudioDeviceName + * \sa SDL_LockAudioDevice + * \sa SDL_OpenAudio + * \sa SDL_PauseAudioDevice + * \sa SDL_UnlockAudioDevice */ -extern DECLSPEC SDL_AudioDeviceID SDLCALL SDL_OpenAudioDevice(const char - *device, - int iscapture, - const - SDL_AudioSpec * - desired, - SDL_AudioSpec * - obtained, - int - allowed_changes); +extern DECLSPEC SDL_AudioDeviceID SDLCALL SDL_OpenAudioDevice( + const char *device, + int iscapture, + const SDL_AudioSpec *desired, + SDL_AudioSpec *obtained, + int allowed_changes); @@ -398,10 +651,39 @@ typedef enum SDL_AUDIO_PLAYING, SDL_AUDIO_PAUSED } SDL_AudioStatus; + +/** + * This function is a legacy means of querying the audio device. + * + * New programs might want to use SDL_GetAudioDeviceStatus() instead. This + * function is equivalent to calling... + * + * ```c + * SDL_GetAudioDeviceStatus(1); + * ``` + * + * ...and is only useful if you used the legacy SDL_OpenAudio() function. + * + * \returns the SDL_AudioStatus of the audio device opened by SDL_OpenAudio(). + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetAudioDeviceStatus + */ extern DECLSPEC SDL_AudioStatus SDLCALL SDL_GetAudioStatus(void); -extern DECLSPEC SDL_AudioStatus SDLCALL -SDL_GetAudioDeviceStatus(SDL_AudioDeviceID dev); +/** + * Use this function to get the current audio state of an audio device. + * + * \param dev the ID of an audio device previously opened with + * SDL_OpenAudioDevice() + * \returns the SDL_AudioStatus of the specified audio device. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_PauseAudioDevice + */ +extern DECLSPEC SDL_AudioStatus SDLCALL SDL_GetAudioDeviceStatus(SDL_AudioDeviceID dev); /* @} *//* Audio State */ /** @@ -414,62 +696,140 @@ SDL_GetAudioDeviceStatus(SDL_AudioDeviceID dev); * Silence will be written to the audio device during the pause. */ /* @{ */ + +/** + * This function is a legacy means of pausing the audio device. + * + * New programs might want to use SDL_PauseAudioDevice() instead. This + * function is equivalent to calling... + * + * ```c + * SDL_PauseAudioDevice(1, pause_on); + * ``` + * + * ...and is only useful if you used the legacy SDL_OpenAudio() function. + * + * \param pause_on non-zero to pause, 0 to unpause + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetAudioStatus + * \sa SDL_PauseAudioDevice + */ extern DECLSPEC void SDLCALL SDL_PauseAudio(int pause_on); + +/** + * Use this function to pause and unpause audio playback on a specified + * device. + * + * This function pauses and unpauses the audio callback processing for a given + * device. Newly-opened audio devices start in the paused state, so you must + * call this function with **pause_on**=0 after opening the specified audio + * device to start playing sound. This allows you to safely initialize data + * for your callback function after opening the audio device. Silence will be + * written to the audio device while paused, and the audio callback is + * guaranteed to not be called. Pausing one device does not prevent other + * unpaused devices from running their callbacks. + * + * Pausing state does not stack; even if you pause a device several times, a + * single unpause will start the device playing again, and vice versa. This is + * different from how SDL_LockAudioDevice() works. + * + * If you just need to protect a few variables from race conditions vs your + * callback, you shouldn't pause the audio device, as it will lead to dropouts + * in the audio playback. Instead, you should use SDL_LockAudioDevice(). + * + * \param dev a device opened by SDL_OpenAudioDevice() + * \param pause_on non-zero to pause, 0 to unpause + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LockAudioDevice + */ extern DECLSPEC void SDLCALL SDL_PauseAudioDevice(SDL_AudioDeviceID dev, int pause_on); /* @} *//* Pause audio functions */ /** - * \brief Load the audio data of a WAVE file into memory + * Load the audio data of a WAVE file into memory. * - * Loading a WAVE file requires \c src, \c spec, \c audio_buf and \c audio_len - * to be valid pointers. The entire data portion of the file is then loaded - * into memory and decoded if necessary. + * Loading a WAVE file requires `src`, `spec`, `audio_buf` and `audio_len` to + * be valid pointers. The entire data portion of the file is then loaded into + * memory and decoded if necessary. * - * If \c freesrc is non-zero, the data source gets automatically closed and - * freed before the function returns. + * If `freesrc` is non-zero, the data source gets automatically closed and + * freed before the function returns. * - * Supported are RIFF WAVE files with the formats PCM (8, 16, 24, and 32 bits), - * IEEE Float (32 bits), Microsoft ADPCM and IMA ADPCM (4 bits), and A-law and - * µ-law (8 bits). Other formats are currently unsupported and cause an error. + * Supported formats are RIFF WAVE files with the formats PCM (8, 16, 24, and + * 32 bits), IEEE Float (32 bits), Microsoft ADPCM and IMA ADPCM (4 bits), and + * A-law and mu-law (8 bits). Other formats are currently unsupported and + * cause an error. * - * If this function succeeds, the pointer returned by it is equal to \c spec - * and the pointer to the audio data allocated by the function is written to - * \c audio_buf and its length in bytes to \c audio_len. The \ref SDL_AudioSpec - * members \c freq, \c channels, and \c format are set to the values of the - * audio data in the buffer. The \c samples member is set to a sane default and - * all others are set to zero. + * If this function succeeds, the pointer returned by it is equal to `spec` + * and the pointer to the audio data allocated by the function is written to + * `audio_buf` and its length in bytes to `audio_len`. The SDL_AudioSpec + * members `freq`, `channels`, and `format` are set to the values of the audio + * data in the buffer. The `samples` member is set to a sane default and all + * others are set to zero. * - * It's necessary to use SDL_FreeWAV() to free the audio data returned in - * \c audio_buf when it is no longer used. + * It's necessary to use SDL_FreeWAV() to free the audio data returned in + * `audio_buf` when it is no longer used. * - * Because of the underspecification of the Waveform format, there are many - * problematic files in the wild that cause issues with strict decoders. To - * provide compatibility with these files, this decoder is lenient in regards - * to the truncation of the file, the fact chunk, and the size of the RIFF - * chunk. The hints SDL_HINT_WAVE_RIFF_CHUNK_SIZE, SDL_HINT_WAVE_TRUNCATION, - * and SDL_HINT_WAVE_FACT_CHUNK can be used to tune the behavior of the - * loading process. + * Because of the underspecification of the .WAV format, there are many + * problematic files in the wild that cause issues with strict decoders. To + * provide compatibility with these files, this decoder is lenient in regards + * to the truncation of the file, the fact chunk, and the size of the RIFF + * chunk. The hints `SDL_HINT_WAVE_RIFF_CHUNK_SIZE`, + * `SDL_HINT_WAVE_TRUNCATION`, and `SDL_HINT_WAVE_FACT_CHUNK` can be used to + * tune the behavior of the loading process. * - * Any file that is invalid (due to truncation, corruption, or wrong values in - * the headers), too big, or unsupported causes an error. Additionally, any - * critical I/O error from the data source will terminate the loading process - * with an error. The function returns NULL on error and in all cases (with the - * exception of \c src being NULL), an appropriate error message will be set. + * Any file that is invalid (due to truncation, corruption, or wrong values in + * the headers), too big, or unsupported causes an error. Additionally, any + * critical I/O error from the data source will terminate the loading process + * with an error. The function returns NULL on error and in all cases (with + * the exception of `src` being NULL), an appropriate error message will be + * set. * - * It is required that the data source supports seeking. + * It is required that the data source supports seeking. * - * Example: - * \code - * SDL_LoadWAV_RW(SDL_RWFromFile("sample.wav", "rb"), 1, ...); - * \endcode + * Example: * - * \param src The data source with the WAVE data - * \param freesrc A integer value that makes the function close the data source if non-zero - * \param spec A pointer filled with the audio format of the audio data - * \param audio_buf A pointer filled with the audio data allocated by the function - * \param audio_len A pointer filled with the length of the audio data buffer in bytes - * \return NULL on error, or non-NULL on success. + * ```c + * SDL_LoadWAV_RW(SDL_RWFromFile("sample.wav", "rb"), 1, &spec, &buf, &len); + * ``` + * + * Note that the SDL_LoadWAV macro does this same thing for you, but in a less + * messy way: + * + * ```c + * SDL_LoadWAV("sample.wav", &spec, &buf, &len); + * ``` + * + * \param src The data source for the WAVE data + * \param freesrc If non-zero, SDL will _always_ free the data source + * \param spec An SDL_AudioSpec that will be filled in with the wave file's + * format details + * \param audio_buf A pointer filled with the audio data, allocated by the + * function. + * \param audio_len A pointer filled with the length of the audio data buffer + * in bytes + * \returns This function, if successfully called, returns `spec`, which will + * be filled with the audio data format of the wave source data. + * `audio_buf` will be filled with a pointer to an allocated buffer + * containing the audio data, and `audio_len` is filled with the + * length of that audio buffer in bytes. + * + * This function returns NULL if the .WAV file cannot be opened, uses + * an unknown data format, or is corrupt; call SDL_GetError() for + * more information. + * + * When the application is done with the data returned in + * `audio_buf`, it should call SDL_FreeWAV() to dispose of it. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_FreeWAV + * \sa SDL_LoadWAV */ extern DECLSPEC SDL_AudioSpec *SDLCALL SDL_LoadWAV_RW(SDL_RWops * src, int freesrc, @@ -485,18 +845,53 @@ extern DECLSPEC SDL_AudioSpec *SDLCALL SDL_LoadWAV_RW(SDL_RWops * src, SDL_LoadWAV_RW(SDL_RWFromFile(file, "rb"),1, spec,audio_buf,audio_len) /** - * This function frees data previously allocated with SDL_LoadWAV_RW() + * Free data previously allocated with SDL_LoadWAV() or SDL_LoadWAV_RW(). + * + * After a WAVE file has been opened with SDL_LoadWAV() or SDL_LoadWAV_RW() + * its data can eventually be freed with SDL_FreeWAV(). It is safe to call + * this function with a NULL pointer. + * + * \param audio_buf a pointer to the buffer created by SDL_LoadWAV() or + * SDL_LoadWAV_RW() + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LoadWAV + * \sa SDL_LoadWAV_RW */ extern DECLSPEC void SDLCALL SDL_FreeWAV(Uint8 * audio_buf); /** - * This function takes a source format and rate and a destination format - * and rate, and initializes the \c cvt structure with information needed - * by SDL_ConvertAudio() to convert a buffer of audio data from one format - * to the other. An unsupported format causes an error and -1 will be returned. + * Initialize an SDL_AudioCVT structure for conversion. * - * \return 0 if no conversion is needed, 1 if the audio filter is set up, - * or -1 on error. + * Before an SDL_AudioCVT structure can be used to convert audio data it must + * be initialized with source and destination information. + * + * This function will zero out every field of the SDL_AudioCVT, so it must be + * called before the application fills in the final buffer information. + * + * Once this function has returned successfully, and reported that a + * conversion is necessary, the application fills in the rest of the fields in + * SDL_AudioCVT, now that it knows how large a buffer it needs to allocate, + * and then can call SDL_ConvertAudio() to complete the conversion. + * + * \param cvt an SDL_AudioCVT structure filled in with audio conversion + * information + * \param src_format the source format of the audio data; for more info see + * SDL_AudioFormat + * \param src_channels the number of channels in the source + * \param src_rate the frequency (sample-frames-per-second) of the source + * \param dst_format the destination format of the audio data; for more info + * see SDL_AudioFormat + * \param dst_channels the number of channels in the destination + * \param dst_rate the frequency (sample-frames-per-second) of the destination + * \returns 1 if the audio filter is prepared, 0 if no conversion is needed, + * or a negative error code on failure; call SDL_GetError() for more + * information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ConvertAudio */ extern DECLSPEC int SDLCALL SDL_BuildAudioCVT(SDL_AudioCVT * cvt, SDL_AudioFormat src_format, @@ -507,16 +902,42 @@ extern DECLSPEC int SDLCALL SDL_BuildAudioCVT(SDL_AudioCVT * cvt, int dst_rate); /** - * Once you have initialized the \c cvt structure using SDL_BuildAudioCVT(), - * created an audio buffer \c cvt->buf, and filled it with \c cvt->len bytes of - * audio data in the source format, this function will convert it in-place - * to the desired format. + * Convert audio data to a desired audio format. * - * The data conversion may expand the size of the audio data, so the buffer - * \c cvt->buf should be allocated after the \c cvt structure is initialized by - * SDL_BuildAudioCVT(), and should be \c cvt->len*cvt->len_mult bytes long. + * This function does the actual audio data conversion, after the application + * has called SDL_BuildAudioCVT() to prepare the conversion information and + * then filled in the buffer details. * - * \return 0 on success or -1 if \c cvt->buf is NULL. + * Once the application has initialized the `cvt` structure using + * SDL_BuildAudioCVT(), allocated an audio buffer and filled it with audio + * data in the source format, this function will convert the buffer, in-place, + * to the desired format. + * + * The data conversion may go through several passes; any given pass may + * possibly temporarily increase the size of the data. For example, SDL might + * expand 16-bit data to 32 bits before resampling to a lower frequency, + * shrinking the data size after having grown it briefly. Since the supplied + * buffer will be both the source and destination, converting as necessary + * in-place, the application must allocate a buffer that will fully contain + * the data during its largest conversion pass. After SDL_BuildAudioCVT() + * returns, the application should set the `cvt->len` field to the size, in + * bytes, of the source data, and allocate a buffer that is `cvt->len * + * cvt->len_mult` bytes long for the `buf` field. + * + * The source data should be copied into this buffer before the call to + * SDL_ConvertAudio(). Upon successful return, this buffer will contain the + * converted audio, and `cvt->len_cvt` will be the size of the converted data, + * in bytes. Any bytes in the buffer past `cvt->len_cvt` are undefined once + * this function returns. + * + * \param cvt an SDL_AudioCVT structure that was previously set up by + * SDL_BuildAudioCVT(). + * \returns 0 if the conversion was completed successfully or a negative error + * code on failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_BuildAudioCVT */ extern DECLSPEC int SDLCALL SDL_ConvertAudio(SDL_AudioCVT * cvt); @@ -532,22 +953,24 @@ struct _SDL_AudioStream; typedef struct _SDL_AudioStream SDL_AudioStream; /** - * Create a new audio stream + * Create a new audio stream. * - * \param src_format The format of the source audio - * \param src_channels The number of channels of the source audio - * \param src_rate The sampling rate of the source audio - * \param dst_format The format of the desired audio output - * \param dst_channels The number of channels of the desired audio output - * \param dst_rate The sampling rate of the desired audio output - * \return 0 on success, or -1 on error. + * \param src_format The format of the source audio + * \param src_channels The number of channels of the source audio + * \param src_rate The sampling rate of the source audio + * \param dst_format The format of the desired audio output + * \param dst_channels The number of channels of the desired audio output + * \param dst_rate The sampling rate of the desired audio output + * \returns 0 on success, or -1 on error. * - * \sa SDL_AudioStreamPut - * \sa SDL_AudioStreamGet - * \sa SDL_AudioStreamAvailable - * \sa SDL_AudioStreamFlush - * \sa SDL_AudioStreamClear - * \sa SDL_FreeAudioStream + * \since This function is available since SDL 2.0.7. + * + * \sa SDL_AudioStreamPut + * \sa SDL_AudioStreamGet + * \sa SDL_AudioStreamAvailable + * \sa SDL_AudioStreamFlush + * \sa SDL_AudioStreamClear + * \sa SDL_FreeAudioStream */ extern DECLSPEC SDL_AudioStream * SDLCALL SDL_NewAudioStream(const SDL_AudioFormat src_format, const Uint8 src_channels, @@ -557,110 +980,164 @@ extern DECLSPEC SDL_AudioStream * SDLCALL SDL_NewAudioStream(const SDL_AudioForm const int dst_rate); /** - * Add data to be converted/resampled to the stream + * Add data to be converted/resampled to the stream. * - * \param stream The stream the audio data is being added to - * \param buf A pointer to the audio data to add - * \param len The number of bytes to write to the stream - * \return 0 on success, or -1 on error. + * \param stream The stream the audio data is being added to + * \param buf A pointer to the audio data to add + * \param len The number of bytes to write to the stream + * \returns 0 on success, or -1 on error. * - * \sa SDL_NewAudioStream - * \sa SDL_AudioStreamGet - * \sa SDL_AudioStreamAvailable - * \sa SDL_AudioStreamFlush - * \sa SDL_AudioStreamClear - * \sa SDL_FreeAudioStream + * \since This function is available since SDL 2.0.7. + * + * \sa SDL_NewAudioStream + * \sa SDL_AudioStreamGet + * \sa SDL_AudioStreamAvailable + * \sa SDL_AudioStreamFlush + * \sa SDL_AudioStreamClear + * \sa SDL_FreeAudioStream */ extern DECLSPEC int SDLCALL SDL_AudioStreamPut(SDL_AudioStream *stream, const void *buf, int len); /** - * Get converted/resampled data from the stream + * Get converted/resampled data from the stream * - * \param stream The stream the audio is being requested from - * \param buf A buffer to fill with audio data - * \param len The maximum number of bytes to fill - * \return The number of bytes read from the stream, or -1 on error + * \param stream The stream the audio is being requested from + * \param buf A buffer to fill with audio data + * \param len The maximum number of bytes to fill + * \returns the number of bytes read from the stream, or -1 on error * - * \sa SDL_NewAudioStream - * \sa SDL_AudioStreamPut - * \sa SDL_AudioStreamAvailable - * \sa SDL_AudioStreamFlush - * \sa SDL_AudioStreamClear - * \sa SDL_FreeAudioStream + * \since This function is available since SDL 2.0.7. + * + * \sa SDL_NewAudioStream + * \sa SDL_AudioStreamPut + * \sa SDL_AudioStreamAvailable + * \sa SDL_AudioStreamFlush + * \sa SDL_AudioStreamClear + * \sa SDL_FreeAudioStream */ extern DECLSPEC int SDLCALL SDL_AudioStreamGet(SDL_AudioStream *stream, void *buf, int len); /** - * Get the number of converted/resampled bytes available. The stream may be - * buffering data behind the scenes until it has enough to resample - * correctly, so this number might be lower than what you expect, or even - * be zero. Add more data or flush the stream if you need the data now. + * Get the number of converted/resampled bytes available. * - * \sa SDL_NewAudioStream - * \sa SDL_AudioStreamPut - * \sa SDL_AudioStreamGet - * \sa SDL_AudioStreamFlush - * \sa SDL_AudioStreamClear - * \sa SDL_FreeAudioStream + * The stream may be buffering data behind the scenes until it has enough to + * resample correctly, so this number might be lower than what you expect, or + * even be zero. Add more data or flush the stream if you need the data now. + * + * \since This function is available since SDL 2.0.7. + * + * \sa SDL_NewAudioStream + * \sa SDL_AudioStreamPut + * \sa SDL_AudioStreamGet + * \sa SDL_AudioStreamFlush + * \sa SDL_AudioStreamClear + * \sa SDL_FreeAudioStream */ extern DECLSPEC int SDLCALL SDL_AudioStreamAvailable(SDL_AudioStream *stream); /** * Tell the stream that you're done sending data, and anything being buffered - * should be converted/resampled and made available immediately. + * should be converted/resampled and made available immediately. * - * It is legal to add more data to a stream after flushing, but there will - * be audio gaps in the output. Generally this is intended to signal the - * end of input, so the complete output becomes available. + * It is legal to add more data to a stream after flushing, but there will be + * audio gaps in the output. Generally this is intended to signal the end of + * input, so the complete output becomes available. * - * \sa SDL_NewAudioStream - * \sa SDL_AudioStreamPut - * \sa SDL_AudioStreamGet - * \sa SDL_AudioStreamAvailable - * \sa SDL_AudioStreamClear - * \sa SDL_FreeAudioStream + * \since This function is available since SDL 2.0.7. + * + * \sa SDL_NewAudioStream + * \sa SDL_AudioStreamPut + * \sa SDL_AudioStreamGet + * \sa SDL_AudioStreamAvailable + * \sa SDL_AudioStreamClear + * \sa SDL_FreeAudioStream */ extern DECLSPEC int SDLCALL SDL_AudioStreamFlush(SDL_AudioStream *stream); /** - * Clear any pending data in the stream without converting it + * Clear any pending data in the stream without converting it * - * \sa SDL_NewAudioStream - * \sa SDL_AudioStreamPut - * \sa SDL_AudioStreamGet - * \sa SDL_AudioStreamAvailable - * \sa SDL_AudioStreamFlush - * \sa SDL_FreeAudioStream + * \since This function is available since SDL 2.0.7. + * + * \sa SDL_NewAudioStream + * \sa SDL_AudioStreamPut + * \sa SDL_AudioStreamGet + * \sa SDL_AudioStreamAvailable + * \sa SDL_AudioStreamFlush + * \sa SDL_FreeAudioStream */ extern DECLSPEC void SDLCALL SDL_AudioStreamClear(SDL_AudioStream *stream); /** * Free an audio stream * - * \sa SDL_NewAudioStream - * \sa SDL_AudioStreamPut - * \sa SDL_AudioStreamGet - * \sa SDL_AudioStreamAvailable - * \sa SDL_AudioStreamFlush - * \sa SDL_AudioStreamClear + * \since This function is available since SDL 2.0.7. + * + * \sa SDL_NewAudioStream + * \sa SDL_AudioStreamPut + * \sa SDL_AudioStreamGet + * \sa SDL_AudioStreamAvailable + * \sa SDL_AudioStreamFlush + * \sa SDL_AudioStreamClear */ extern DECLSPEC void SDLCALL SDL_FreeAudioStream(SDL_AudioStream *stream); #define SDL_MIX_MAXVOLUME 128 + /** - * This takes two audio buffers of the playing audio format and mixes - * them, performing addition, volume adjustment, and overflow clipping. - * The volume ranges from 0 - 128, and should be set to ::SDL_MIX_MAXVOLUME - * for full audio volume. Note this does not change hardware volume. - * This is provided for convenience -- you can mix your own audio data. + * This function is a legacy means of mixing audio. + * + * This function is equivalent to calling... + * + * ```c + * SDL_MixAudioFormat(dst, src, format, len, volume); + * ``` + * + * ...where `format` is the obtained format of the audio device from the + * legacy SDL_OpenAudio() function. + * + * \param dst the destination for the mixed audio + * \param src the source audio buffer to be mixed + * \param len the length of the audio buffer in bytes + * \param volume ranges from 0 - 128, and should be set to SDL_MIX_MAXVOLUME + * for full audio volume + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_MixAudioFormat */ extern DECLSPEC void SDLCALL SDL_MixAudio(Uint8 * dst, const Uint8 * src, Uint32 len, int volume); /** - * This works like SDL_MixAudio(), but you specify the audio format instead of - * using the format of audio device 1. Thus it can be used when no audio - * device is open at all. + * Mix audio data in a specified format. + * + * This takes an audio buffer `src` of `len` bytes of `format` data and mixes + * it into `dst`, performing addition, volume adjustment, and overflow + * clipping. The buffer pointed to by `dst` must also be `len` bytes of + * `format` data. + * + * This is provided for convenience -- you can mix your own audio data. + * + * Do not use this function for mixing together more than two streams of + * sample data. The output from repeated application of this function may be + * distorted by clipping, because there is no accumulator with greater range + * than the input (not to mention this being an inefficient way of doing it). + * + * It is a common misconception that this function is required to write audio + * data to an output stream in an audio callback. While you can do that, + * SDL_MixAudioFormat() is really only needed when you're mixing a single + * audio stream with a volume adjustment. + * + * \param dst the destination for the mixed audio + * \param src the source audio buffer to be mixed + * \param format the SDL_AudioFormat structure representing the desired audio + * format + * \param len the length of the audio buffer in bytes + * \param volume ranges from 0 - 128, and should be set to SDL_MIX_MAXVOLUME + * for full audio volume + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC void SDLCALL SDL_MixAudioFormat(Uint8 * dst, const Uint8 * src, @@ -668,161 +1145,166 @@ extern DECLSPEC void SDLCALL SDL_MixAudioFormat(Uint8 * dst, Uint32 len, int volume); /** - * Queue more audio on non-callback devices. + * Queue more audio on non-callback devices. * - * (If you are looking to retrieve queued audio from a non-callback capture - * device, you want SDL_DequeueAudio() instead. This will return -1 to - * signify an error if you use it with capture devices.) + * If you are looking to retrieve queued audio from a non-callback capture + * device, you want SDL_DequeueAudio() instead. SDL_QueueAudio() will return + * -1 to signify an error if you use it with capture devices. * - * SDL offers two ways to feed audio to the device: you can either supply a - * callback that SDL triggers with some frequency to obtain more audio - * (pull method), or you can supply no callback, and then SDL will expect - * you to supply data at regular intervals (push method) with this function. + * SDL offers two ways to feed audio to the device: you can either supply a + * callback that SDL triggers with some frequency to obtain more audio (pull + * method), or you can supply no callback, and then SDL will expect you to + * supply data at regular intervals (push method) with this function. * - * There are no limits on the amount of data you can queue, short of - * exhaustion of address space. Queued data will drain to the device as - * necessary without further intervention from you. If the device needs - * audio but there is not enough queued, it will play silence to make up - * the difference. This means you will have skips in your audio playback - * if you aren't routinely queueing sufficient data. + * There are no limits on the amount of data you can queue, short of + * exhaustion of address space. Queued data will drain to the device as + * necessary without further intervention from you. If the device needs audio + * but there is not enough queued, it will play silence to make up the + * difference. This means you will have skips in your audio playback if you + * aren't routinely queueing sufficient data. * - * This function copies the supplied data, so you are safe to free it when - * the function returns. This function is thread-safe, but queueing to the - * same device from two threads at once does not promise which buffer will - * be queued first. + * This function copies the supplied data, so you are safe to free it when the + * function returns. This function is thread-safe, but queueing to the same + * device from two threads at once does not promise which buffer will be + * queued first. * - * You may not queue audio on a device that is using an application-supplied - * callback; doing so returns an error. You have to use the audio callback - * or queue audio with this function, but not both. + * You may not queue audio on a device that is using an application-supplied + * callback; doing so returns an error. You have to use the audio callback or + * queue audio with this function, but not both. * - * You should not call SDL_LockAudio() on the device before queueing; SDL - * handles locking internally for this function. + * You should not call SDL_LockAudio() on the device before queueing; SDL + * handles locking internally for this function. * - * \param dev The device ID to which we will queue audio. - * \param data The data to queue to the device for later playback. - * \param len The number of bytes (not samples!) to which (data) points. - * \return 0 on success, or -1 on error. + * Note that SDL2 does not support planar audio. You will need to resample + * from planar audio formats into a non-planar one (see SDL_AudioFormat) + * before queuing audio. * - * \sa SDL_GetQueuedAudioSize - * \sa SDL_ClearQueuedAudio + * \param dev the device ID to which we will queue audio + * \param data the data to queue to the device for later playback + * \param len the number of bytes (not samples!) to which `data` points + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.4. + * + * \sa SDL_ClearQueuedAudio + * \sa SDL_GetQueuedAudioSize */ extern DECLSPEC int SDLCALL SDL_QueueAudio(SDL_AudioDeviceID dev, const void *data, Uint32 len); /** - * Dequeue more audio on non-callback devices. + * Dequeue more audio on non-callback devices. * - * (If you are looking to queue audio for output on a non-callback playback - * device, you want SDL_QueueAudio() instead. This will always return 0 - * if you use it with playback devices.) + * If you are looking to queue audio for output on a non-callback playback + * device, you want SDL_QueueAudio() instead. SDL_DequeueAudio() will always + * return 0 if you use it with playback devices. * - * SDL offers two ways to retrieve audio from a capture device: you can - * either supply a callback that SDL triggers with some frequency as the - * device records more audio data, (push method), or you can supply no - * callback, and then SDL will expect you to retrieve data at regular - * intervals (pull method) with this function. + * SDL offers two ways to retrieve audio from a capture device: you can either + * supply a callback that SDL triggers with some frequency as the device + * records more audio data, (push method), or you can supply no callback, and + * then SDL will expect you to retrieve data at regular intervals (pull + * method) with this function. * - * There are no limits on the amount of data you can queue, short of - * exhaustion of address space. Data from the device will keep queuing as - * necessary without further intervention from you. This means you will - * eventually run out of memory if you aren't routinely dequeueing data. + * There are no limits on the amount of data you can queue, short of + * exhaustion of address space. Data from the device will keep queuing as + * necessary without further intervention from you. This means you will + * eventually run out of memory if you aren't routinely dequeueing data. * - * Capture devices will not queue data when paused; if you are expecting - * to not need captured audio for some length of time, use - * SDL_PauseAudioDevice() to stop the capture device from queueing more - * data. This can be useful during, say, level loading times. When - * unpaused, capture devices will start queueing data from that point, - * having flushed any capturable data available while paused. + * Capture devices will not queue data when paused; if you are expecting to + * not need captured audio for some length of time, use SDL_PauseAudioDevice() + * to stop the capture device from queueing more data. This can be useful + * during, say, level loading times. When unpaused, capture devices will start + * queueing data from that point, having flushed any capturable data available + * while paused. * - * This function is thread-safe, but dequeueing from the same device from - * two threads at once does not promise which thread will dequeued data - * first. + * This function is thread-safe, but dequeueing from the same device from two + * threads at once does not promise which thread will dequeue data first. * - * You may not dequeue audio from a device that is using an - * application-supplied callback; doing so returns an error. You have to use - * the audio callback, or dequeue audio with this function, but not both. + * You may not dequeue audio from a device that is using an + * application-supplied callback; doing so returns an error. You have to use + * the audio callback, or dequeue audio with this function, but not both. * - * You should not call SDL_LockAudio() on the device before queueing; SDL - * handles locking internally for this function. + * You should not call SDL_LockAudio() on the device before dequeueing; SDL + * handles locking internally for this function. * - * \param dev The device ID from which we will dequeue audio. - * \param data A pointer into where audio data should be copied. - * \param len The number of bytes (not samples!) to which (data) points. - * \return number of bytes dequeued, which could be less than requested. + * \param dev the device ID from which we will dequeue audio + * \param data a pointer into where audio data should be copied + * \param len the number of bytes (not samples!) to which (data) points + * \returns the number of bytes dequeued, which could be less than requested; + * call SDL_GetError() for more information. * - * \sa SDL_GetQueuedAudioSize - * \sa SDL_ClearQueuedAudio + * \since This function is available since SDL 2.0.5. + * + * \sa SDL_ClearQueuedAudio + * \sa SDL_GetQueuedAudioSize */ extern DECLSPEC Uint32 SDLCALL SDL_DequeueAudio(SDL_AudioDeviceID dev, void *data, Uint32 len); /** - * Get the number of bytes of still-queued audio. + * Get the number of bytes of still-queued audio. * - * For playback device: + * For playback devices: this is the number of bytes that have been queued for + * playback with SDL_QueueAudio(), but have not yet been sent to the hardware. * - * This is the number of bytes that have been queued for playback with - * SDL_QueueAudio(), but have not yet been sent to the hardware. This - * number may shrink at any time, so this only informs of pending data. + * Once we've sent it to the hardware, this function can not decide the exact + * byte boundary of what has been played. It's possible that we just gave the + * hardware several kilobytes right before you called this function, but it + * hasn't played any of it yet, or maybe half of it, etc. * - * Once we've sent it to the hardware, this function can not decide the - * exact byte boundary of what has been played. It's possible that we just - * gave the hardware several kilobytes right before you called this - * function, but it hasn't played any of it yet, or maybe half of it, etc. + * For capture devices, this is the number of bytes that have been captured by + * the device and are waiting for you to dequeue. This number may grow at any + * time, so this only informs of the lower-bound of available data. * - * For capture devices: + * You may not queue or dequeue audio on a device that is using an + * application-supplied callback; calling this function on such a device + * always returns 0. You have to use the audio callback or queue audio, but + * not both. * - * This is the number of bytes that have been captured by the device and - * are waiting for you to dequeue. This number may grow at any time, so - * this only informs of the lower-bound of available data. + * You should not call SDL_LockAudio() on the device before querying; SDL + * handles locking internally for this function. * - * You may not queue audio on a device that is using an application-supplied - * callback; calling this function on such a device always returns 0. - * You have to queue audio with SDL_QueueAudio()/SDL_DequeueAudio(), or use - * the audio callback, but not both. + * \param dev the device ID of which we will query queued audio size + * \returns the number of bytes (not samples!) of queued audio. * - * You should not call SDL_LockAudio() on the device before querying; SDL - * handles locking internally for this function. + * \since This function is available since SDL 2.0.4. * - * \param dev The device ID of which we will query queued audio size. - * \return Number of bytes (not samples!) of queued audio. - * - * \sa SDL_QueueAudio - * \sa SDL_ClearQueuedAudio + * \sa SDL_ClearQueuedAudio + * \sa SDL_QueueAudio + * \sa SDL_DequeueAudio */ extern DECLSPEC Uint32 SDLCALL SDL_GetQueuedAudioSize(SDL_AudioDeviceID dev); /** - * Drop any queued audio data. For playback devices, this is any queued data - * still waiting to be submitted to the hardware. For capture devices, this - * is any data that was queued by the device that hasn't yet been dequeued by - * the application. + * Drop any queued audio data waiting to be sent to the hardware. * - * Immediately after this call, SDL_GetQueuedAudioSize() will return 0. For - * playback devices, the hardware will start playing silence if more audio - * isn't queued. Unpaused capture devices will start filling the queue again - * as soon as they have more data available (which, depending on the state - * of the hardware and the thread, could be before this function call - * returns!). + * Immediately after this call, SDL_GetQueuedAudioSize() will return 0. For + * output devices, the hardware will start playing silence if more audio isn't + * queued. For capture devices, the hardware will start filling the empty + * queue with new data if the capture device isn't paused. * - * This will not prevent playback of queued audio that's already been sent - * to the hardware, as we can not undo that, so expect there to be some - * fraction of a second of audio that might still be heard. This can be - * useful if you want to, say, drop any pending music during a level change - * in your game. + * This will not prevent playback of queued audio that's already been sent to + * the hardware, as we can not undo that, so expect there to be some fraction + * of a second of audio that might still be heard. This can be useful if you + * want to, say, drop any pending music or any unprocessed microphone input + * during a level change in your game. * - * You may not queue audio on a device that is using an application-supplied - * callback; calling this function on such a device is always a no-op. - * You have to queue audio with SDL_QueueAudio()/SDL_DequeueAudio(), or use - * the audio callback, but not both. + * You may not queue or dequeue audio on a device that is using an + * application-supplied callback; calling this function on such a device + * always returns 0. You have to use the audio callback or queue audio, but + * not both. * - * You should not call SDL_LockAudio() on the device before clearing the - * queue; SDL handles locking internally for this function. + * You should not call SDL_LockAudio() on the device before clearing the + * queue; SDL handles locking internally for this function. * - * This function always succeeds and thus returns void. + * This function always succeeds and thus returns void. * - * \param dev The device ID of which to clear the audio queue. + * \param dev the device ID of which to clear the audio queue * - * \sa SDL_QueueAudio - * \sa SDL_GetQueuedAudioSize + * \since This function is available since SDL 2.0.4. + * + * \sa SDL_GetQueuedAudioSize + * \sa SDL_QueueAudio + * \sa SDL_DequeueAudio */ extern DECLSPEC void SDLCALL SDL_ClearQueuedAudio(SDL_AudioDeviceID dev); @@ -836,16 +1318,139 @@ extern DECLSPEC void SDLCALL SDL_ClearQueuedAudio(SDL_AudioDeviceID dev); * function or you will cause deadlock. */ /* @{ */ + +/** + * This function is a legacy means of locking the audio device. + * + * New programs might want to use SDL_LockAudioDevice() instead. This function + * is equivalent to calling... + * + * ```c + * SDL_LockAudioDevice(1); + * ``` + * + * ...and is only useful if you used the legacy SDL_OpenAudio() function. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LockAudioDevice + * \sa SDL_UnlockAudio + * \sa SDL_UnlockAudioDevice + */ extern DECLSPEC void SDLCALL SDL_LockAudio(void); + +/** + * Use this function to lock out the audio callback function for a specified + * device. + * + * The lock manipulated by these functions protects the audio callback + * function specified in SDL_OpenAudioDevice(). During a + * SDL_LockAudioDevice()/SDL_UnlockAudioDevice() pair, you can be guaranteed + * that the callback function for that device is not running, even if the + * device is not paused. While a device is locked, any other unpaused, + * unlocked devices may still run their callbacks. + * + * Calling this function from inside your audio callback is unnecessary. SDL + * obtains this lock before calling your function, and releases it when the + * function returns. + * + * You should not hold the lock longer than absolutely necessary. If you hold + * it too long, you'll experience dropouts in your audio playback. Ideally, + * your application locks the device, sets a few variables and unlocks again. + * Do not do heavy work while holding the lock for a device. + * + * It is safe to lock the audio device multiple times, as long as you unlock + * it an equivalent number of times. The callback will not run until the + * device has been unlocked completely in this way. If your application fails + * to unlock the device appropriately, your callback will never run, you might + * hear repeating bursts of audio, and SDL_CloseAudioDevice() will probably + * deadlock. + * + * Internally, the audio device lock is a mutex; if you lock from two threads + * at once, not only will you block the audio callback, you'll block the other + * thread. + * + * \param dev the ID of the device to be locked + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_UnlockAudioDevice + */ extern DECLSPEC void SDLCALL SDL_LockAudioDevice(SDL_AudioDeviceID dev); + +/** + * This function is a legacy means of unlocking the audio device. + * + * New programs might want to use SDL_UnlockAudioDevice() instead. This + * function is equivalent to calling... + * + * ```c + * SDL_UnlockAudioDevice(1); + * ``` + * + * ...and is only useful if you used the legacy SDL_OpenAudio() function. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LockAudio + * \sa SDL_UnlockAudioDevice + */ extern DECLSPEC void SDLCALL SDL_UnlockAudio(void); + +/** + * Use this function to unlock the audio callback function for a specified + * device. + * + * This function should be paired with a previous SDL_LockAudioDevice() call. + * + * \param dev the ID of the device to be unlocked + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LockAudioDevice + */ extern DECLSPEC void SDLCALL SDL_UnlockAudioDevice(SDL_AudioDeviceID dev); /* @} *//* Audio lock functions */ /** - * This function shuts down audio processing and closes the audio device. + * This function is a legacy means of closing the audio device. + * + * This function is equivalent to calling... + * + * ```c + * SDL_CloseAudioDevice(1); + * ``` + * + * ...and is only useful if you used the legacy SDL_OpenAudio() function. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_OpenAudio */ extern DECLSPEC void SDLCALL SDL_CloseAudio(void); + +/** + * Use this function to shut down audio processing and close the audio device. + * + * The application should close open audio devices once they are no longer + * needed. Calling this function will wait until the device's audio callback + * is not running, release the audio hardware and then clean up internal + * state. No further audio will play from this device once this function + * returns. + * + * This function may block briefly while pending audio data is played by the + * hardware, so that applications don't drop the last buffer of data they + * supplied. + * + * The device ID is invalid as soon as the device is closed, and is eligible + * for reuse in a new SDL_OpenAudioDevice() call immediately. + * + * \param dev an audio device previously opened with SDL_OpenAudioDevice() + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_OpenAudioDevice + */ extern DECLSPEC void SDLCALL SDL_CloseAudioDevice(SDL_AudioDeviceID dev); /* Ends C function definitions when using C++ */ diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_bits.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_bits.h index b116cc8d0..22cb85314 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_bits.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_bits.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -45,13 +45,12 @@ extern "C" { * with 0. This operation can also be stated as "count leading zeroes" and * "log base 2". * - * \return Index of the most significant bit, or -1 if the value is 0. + * \return the index of the most significant bit, or -1 if the value is 0. */ #if defined(__WATCOMC__) && defined(__386__) -extern _inline int _SDL_clz_watcom (Uint32); -#pragma aux _SDL_clz_watcom = \ +extern __inline int _SDL_bsr_watcom(Uint32); +#pragma aux _SDL_bsr_watcom = \ "bsr eax, eax" \ - "xor eax, 31" \ parm [eax] nomemory \ value [eax] \ modify exact [eax] nomemory; @@ -72,7 +71,13 @@ SDL_MostSignificantBitIndex32(Uint32 x) if (x == 0) { return -1; } - return 31 - _SDL_clz_watcom(x); + return _SDL_bsr_watcom(x); +#elif defined(_MSC_VER) + unsigned long index; + if (_BitScanReverse(&index, x)) { + return index; + } + return -1; #else /* Based off of Bit Twiddling Hacks by Sean Eron Anderson * , released in the public domain. diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_blendmode.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_blendmode.h index 6f0a22b99..b6d140dbb 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_blendmode.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_blendmode.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -50,6 +50,9 @@ typedef enum SDL_BLENDMODE_MOD = 0x00000004, /**< color modulate dstRGB = srcRGB * dstRGB dstA = dstA */ + SDL_BLENDMODE_MUL = 0x00000008, /**< color multiply + dstRGB = (srcRGB * dstRGB) + (dstRGB * (1-srcA)) + dstA = (srcA * dstA) + (dstA * (1-srcA)) */ SDL_BLENDMODE_INVALID = 0x7FFFFFFF /* Additional custom blend modes can be returned by SDL_ComposeCustomBlendMode() */ @@ -88,19 +91,96 @@ typedef enum } SDL_BlendFactor; /** - * \brief Create a custom blend mode, which may or may not be supported by a given renderer + * Compose a custom blend mode for renderers. * - * \param srcColorFactor source color factor - * \param dstColorFactor destination color factor - * \param colorOperation color operation - * \param srcAlphaFactor source alpha factor - * \param dstAlphaFactor destination alpha factor - * \param alphaOperation alpha operation + * The functions SDL_SetRenderDrawBlendMode and SDL_SetTextureBlendMode accept + * the SDL_BlendMode returned by this function if the renderer supports it. * - * The result of the blend mode operation will be: - * dstRGB = dstRGB * dstColorFactor colorOperation srcRGB * srcColorFactor - * and - * dstA = dstA * dstAlphaFactor alphaOperation srcA * srcAlphaFactor + * A blend mode controls how the pixels from a drawing operation (source) get + * combined with the pixels from the render target (destination). First, the + * components of the source and destination pixels get multiplied with their + * blend factors. Then, the blend operation takes the two products and + * calculates the result that will get stored in the render target. + * + * Expressed in pseudocode, it would look like this: + * + * ```c + * dstRGB = colorOperation(srcRGB * srcColorFactor, dstRGB * dstColorFactor); + * dstA = alphaOperation(srcA * srcAlphaFactor, dstA * dstAlphaFactor); + * ``` + * + * Where the functions `colorOperation(src, dst)` and `alphaOperation(src, + * dst)` can return one of the following: + * + * - `src + dst` + * - `src - dst` + * - `dst - src` + * - `min(src, dst)` + * - `max(src, dst)` + * + * The red, green, and blue components are always multiplied with the first, + * second, and third components of the SDL_BlendFactor, respectively. The + * fourth component is not used. + * + * The alpha component is always multiplied with the fourth component of the + * SDL_BlendFactor. The other components are not used in the alpha + * calculation. + * + * Support for these blend modes varies for each renderer. To check if a + * specific SDL_BlendMode is supported, create a renderer and pass it to + * either SDL_SetRenderDrawBlendMode or SDL_SetTextureBlendMode. They will + * return with an error if the blend mode is not supported. + * + * This list describes the support of custom blend modes for each renderer in + * SDL 2.0.6. All renderers support the four blend modes listed in the + * SDL_BlendMode enumeration. + * + * - **direct3d**: Supports `SDL_BLENDOPERATION_ADD` with all factors. + * - **direct3d11**: Supports all operations with all factors. However, some + * factors produce unexpected results with `SDL_BLENDOPERATION_MINIMUM` and + * `SDL_BLENDOPERATION_MAXIMUM`. + * - **opengl**: Supports the `SDL_BLENDOPERATION_ADD` operation with all + * factors. OpenGL versions 1.1, 1.2, and 1.3 do not work correctly with SDL + * 2.0.6. + * - **opengles**: Supports the `SDL_BLENDOPERATION_ADD` operation with all + * factors. Color and alpha factors need to be the same. OpenGL ES 1 + * implementation specific: May also support `SDL_BLENDOPERATION_SUBTRACT` + * and `SDL_BLENDOPERATION_REV_SUBTRACT`. May support color and alpha + * operations being different from each other. May support color and alpha + * factors being different from each other. + * - **opengles2**: Supports the `SDL_BLENDOPERATION_ADD`, + * `SDL_BLENDOPERATION_SUBTRACT`, `SDL_BLENDOPERATION_REV_SUBTRACT` + * operations with all factors. + * - **psp**: No custom blend mode support. + * - **software**: No custom blend mode support. + * + * Some renderers do not provide an alpha component for the default render + * target. The `SDL_BLENDFACTOR_DST_ALPHA` and + * `SDL_BLENDFACTOR_ONE_MINUS_DST_ALPHA` factors do not have an effect in this + * case. + * + * \param srcColorFactor the SDL_BlendFactor applied to the red, green, and + * blue components of the source pixels + * \param dstColorFactor the SDL_BlendFactor applied to the red, green, and + * blue components of the destination pixels + * \param colorOperation the SDL_BlendOperation used to combine the red, + * green, and blue components of the source and + * destination pixels + * \param srcAlphaFactor the SDL_BlendFactor applied to the alpha component of + * the source pixels + * \param dstAlphaFactor the SDL_BlendFactor applied to the alpha component of + * the destination pixels + * \param alphaOperation the SDL_BlendOperation used to combine the alpha + * component of the source and destination pixels + * \returns an SDL_BlendMode that represents the chosen factors and + * operations. + * + * \since This function is available since SDL 2.0.6. + * + * \sa SDL_SetRenderDrawBlendMode + * \sa SDL_GetRenderDrawBlendMode + * \sa SDL_SetTextureBlendMode + * \sa SDL_GetTextureBlendMode */ extern DECLSPEC SDL_BlendMode SDLCALL SDL_ComposeCustomBlendMode(SDL_BlendFactor srcColorFactor, SDL_BlendFactor dstColorFactor, diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_clipboard.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_clipboard.h index c4f8766ce..935136305 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_clipboard.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_clipboard.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -39,23 +39,46 @@ extern "C" { /* Function prototypes */ /** - * \brief Put UTF-8 text into the clipboard + * Put UTF-8 text into the clipboard. * - * \sa SDL_GetClipboardText() + * \param text the text to store in the clipboard + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetClipboardText + * \sa SDL_HasClipboardText */ extern DECLSPEC int SDLCALL SDL_SetClipboardText(const char *text); /** - * \brief Get UTF-8 text from the clipboard, which must be freed with SDL_free() + * Get UTF-8 text from the clipboard, which must be freed with SDL_free(). * - * \sa SDL_SetClipboardText() + * This functions returns empty string if there was not enough memory left for + * a copy of the clipboard's content. + * + * \returns the clipboard text on success or an empty string on failure; call + * SDL_GetError() for more information. Caller must call SDL_free() + * on the returned pointer when done with it (even if there was an + * error). + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HasClipboardText + * \sa SDL_SetClipboardText */ extern DECLSPEC char * SDLCALL SDL_GetClipboardText(void); /** - * \brief Returns a flag indicating whether the clipboard exists and contains a text string that is non-empty + * Query whether the clipboard exists and contains a non-empty text string. * - * \sa SDL_GetClipboardText() + * \returns SDL_TRUE if the clipboard has text, or SDL_FALSE if it does not. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetClipboardText + * \sa SDL_SetClipboardText */ extern DECLSPEC SDL_bool SDLCALL SDL_HasClipboardText(void); diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_config.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_config.h index 395ad7c26..c9ed1cfea 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_config.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_config.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -25,10 +25,23 @@ #include "SDL_platform.h" +/* winsdkver.h defines _WIN32_MAXVER for SDK version detection. It is present since at least the Windows 7 SDK, + * but out of caution we'll only use it if the compiler supports __has_include() to confirm its presence. + * If your compiler doesn't support __has_include() but you have winsdkver.h, define HAVE_WINSDKVER_H. */ +#if !defined(HAVE_WINSDKVER_H) && defined(__has_include) +#if __has_include() +#define HAVE_WINSDKVER_H 1 +#endif +#endif + +#ifdef HAVE_WINSDKVER_H +#include +#endif + /* This is a set of defines to configure the SDL features */ #if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H) -#if defined(__GNUC__) || defined(__DMC__) || defined(__WATCOMC__) +#if defined(__GNUC__) || defined(__DMC__) || defined(__WATCOMC__) || defined(__clang__) || defined(__BORLANDC__) || defined(__CODEGEARC__) #define HAVE_STDINT_H 1 #elif defined(_MSC_VER) typedef signed __int8 int8_t; @@ -82,9 +95,23 @@ typedef unsigned int uintptr_t; #define HAVE_DSOUND_H 1 #define HAVE_DXGI_H 1 #define HAVE_XINPUT_H 1 +#if defined(_WIN32_MAXVER) && _WIN32_MAXVER >= 0x0A00 /* Windows 10 SDK */ +#define HAVE_WINDOWS_GAMING_INPUT_H 1 +#endif +#if defined(_WIN32_MAXVER) && _WIN32_MAXVER >= 0x0602 /* Windows 8 SDK */ +#define HAVE_D3D11_H 1 +#endif #define HAVE_MMDEVICEAPI_H 1 #define HAVE_AUDIOCLIENT_H 1 -#define HAVE_ENDPOINTVOLUME_H 1 +#define HAVE_TPCSHRD_H 1 +#define HAVE_SENSORSAPI_H 1 +#if (defined(_M_IX86) || defined(_M_X64) || defined(_M_AMD64)) && (defined(_MSC_VER) && _MSC_VER >= 1600) +#define HAVE_IMMINTRIN_H 1 +#elif defined(__has_include) && (defined(__i386__) || defined(__x86_64)) +# if __has_include() +# define HAVE_IMMINTRIN_H 1 +# endif +#endif /* This is disabled by default to avoid C runtime dependencies and manifest requirements */ #ifdef HAVE_LIBC @@ -118,6 +145,7 @@ typedef unsigned int uintptr_t; #define HAVE_STRCHR 1 #define HAVE_STRRCHR 1 #define HAVE_STRSTR 1 +/* #undef HAVE_STRTOK_R */ /* These functions have security warnings, so we won't use them */ /* #undef HAVE__LTOA */ /* #undef HAVE__ULTOA */ @@ -130,6 +158,9 @@ typedef unsigned int uintptr_t; #define HAVE_STRNCMP 1 #define HAVE__STRICMP 1 #define HAVE__STRNICMP 1 +#define HAVE__WCSICMP 1 +#define HAVE__WCSNICMP 1 +#define HAVE__WCSDUP 1 #define HAVE_ACOS 1 #define HAVE_ACOSF 1 #define HAVE_ASIN 1 @@ -139,7 +170,7 @@ typedef unsigned int uintptr_t; #define HAVE_ATAN2 1 #define HAVE_ATAN2F 1 #define HAVE_CEILF 1 -#define HAVE__COPYSIGN 1 +#define HAVE__COPYSIGN 1 #define HAVE_COS 1 #define HAVE_COSF 1 #define HAVE_EXP 1 @@ -166,9 +197,16 @@ typedef unsigned int uintptr_t; /* These functions were added with the VC++ 2013 C runtime library */ #if _MSC_VER >= 1800 #define HAVE_STRTOLL 1 +#define HAVE_STRTOULL 1 #define HAVE_VSSCANF 1 +#define HAVE_LROUND 1 +#define HAVE_LROUNDF 1 +#define HAVE_ROUND 1 +#define HAVE_ROUNDF 1 #define HAVE_SCALBN 1 -#define HAVE_SCALBNF 1 +#define HAVE_SCALBNF 1 +#define HAVE_TRUNC 1 +#define HAVE_TRUNCF 1 #endif /* This function is available with at least the VC++ 2008 C runtime library */ #if _MSC_VER >= 1400 @@ -192,18 +230,26 @@ typedef unsigned int uintptr_t; /* Enable various input drivers */ #define SDL_JOYSTICK_DINPUT 1 -#define SDL_JOYSTICK_XINPUT 1 #define SDL_JOYSTICK_HIDAPI 1 +#ifndef __WINRT__ +#define SDL_JOYSTICK_RAWINPUT 1 +#endif +#define SDL_JOYSTICK_VIRTUAL 1 +#ifdef HAVE_WINDOWS_GAMING_INPUT_H +#define SDL_JOYSTICK_WGI 1 +#endif +#define SDL_JOYSTICK_XINPUT 1 #define SDL_HAPTIC_DINPUT 1 #define SDL_HAPTIC_XINPUT 1 -/* Enable the dummy sensor driver */ -#define SDL_SENSOR_DUMMY 1 +/* Enable the sensor driver */ +#define SDL_SENSOR_WINDOWS 1 /* Enable various shared object loading systems */ #define SDL_LOADSO_WINDOWS 1 /* Enable various threading systems */ +#define SDL_THREAD_GENERIC_COND_SUFFIX 1 #define SDL_THREAD_WINDOWS 1 /* Enable various timer systems */ @@ -216,8 +262,8 @@ typedef unsigned int uintptr_t; #ifndef SDL_VIDEO_RENDER_D3D #define SDL_VIDEO_RENDER_D3D 1 #endif -#ifndef SDL_VIDEO_RENDER_D3D11 -#define SDL_VIDEO_RENDER_D3D11 0 +#if !defined(SDL_VIDEO_RENDER_D3D11) && defined(HAVE_D3D11_H) +#define SDL_VIDEO_RENDER_D3D11 1 #endif /* Enable OpenGL support */ @@ -255,3 +301,5 @@ typedef unsigned int uintptr_t; #endif #endif /* SDL_config_windows_h_ */ + +/* vi: set ts=4 sw=4 expandtab: */ diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_cpuinfo.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_cpuinfo.h index 296df01aa..1fc40991d 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_cpuinfo.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_cpuinfo.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -34,11 +34,20 @@ /* Visual Studio 2005 has a bug where intrin.h conflicts with winnt.h */ #if defined(_MSC_VER) && (_MSC_VER >= 1500) && (defined(_M_IX86) || defined(_M_X64)) #ifdef __clang__ -/* Many of the intrinsics SDL uses are not implemented by clang with Visual Studio */ -#undef __MMX__ -#undef __SSE__ -#undef __SSE2__ -#else +/* As of Clang 11, '_m_prefetchw' is conflicting with the winnt.h's version, + so we define the needed '_m_prefetch' here as a pseudo-header, until the issue is fixed. */ + +#ifndef __PRFCHWINTRIN_H +#define __PRFCHWINTRIN_H + +static __inline__ void __attribute__((__always_inline__, __nodebug__)) +_m_prefetch(void *__P) +{ + __builtin_prefetch (__P, 0, 3 /* _MM_HINT_T0 */); +} + +#endif /* __PRFCHWINTRIN_H */ +#endif /* __clang__ */ #include #ifndef _WIN64 #ifndef __MMX__ @@ -54,9 +63,14 @@ #ifndef __SSE2__ #define __SSE2__ #endif -#endif /* __clang__ */ +#ifndef __SSE3__ +#define __SSE3__ +#endif #elif defined(__MINGW64_VERSION_MAJOR) #include +#if !defined(SDL_DISABLE_ARM_NEON_H) && defined(__ARM_NEON) +# include +#endif #else /* altivec.h redefining bool causes a number of problems, see bugs 3993 and 4392, so you need to explicitly define SDL_ENABLE_ALTIVEC_H to have it included. */ #if defined(HAVE_ALTIVEC_H) && defined(__ALTIVEC__) && !defined(__APPLE_ALTIVEC__) && defined(SDL_ENABLE_ALTIVEC_H) @@ -73,12 +87,14 @@ # define __ARM_NEON 1 /* Set __ARM_NEON so that it can be used elsewhere, at compile time */ # endif # if defined (_M_ARM64) -# include -# include +# include +# include # define __ARM_NEON 1 /* Set __ARM_NEON so that it can be used elsewhere, at compile time */ # endif # endif #endif +#endif /* compiler version */ + #if defined(__3dNOW__) && !defined(SDL_DISABLE_MM3DNOW_H) #include #endif @@ -98,7 +114,6 @@ #include #endif #endif /* HAVE_IMMINTRIN_H */ -#endif /* compiler version */ #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ @@ -114,151 +129,425 @@ extern "C" { #define SDL_CACHELINE_SIZE 128 /** - * This function returns the number of CPU cores available. + * Get the number of CPU cores available. + * + * \returns the total number of logical CPU cores. On CPUs that include + * technologies such as hyperthreading, the number of logical cores + * may be more than the number of physical cores. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC int SDLCALL SDL_GetCPUCount(void); /** - * This function returns the L1 cache line size of the CPU + * Determine the L1 cache line size of the CPU. * - * This is useful for determining multi-threaded structure padding - * or SIMD prefetch sizes. + * This is useful for determining multi-threaded structure padding or SIMD + * prefetch sizes. + * + * \returns the L1 cache line size of the CPU, in bytes. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC int SDLCALL SDL_GetCPUCacheLineSize(void); /** - * This function returns true if the CPU has the RDTSC instruction. + * Determine whether the CPU has the RDTSC instruction. + * + * This always returns false on CPUs that aren't using Intel instruction sets. + * + * \returns SDL_TRUE if the CPU has the RDTSC instruction or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Has3DNow + * \sa SDL_HasAltiVec + * \sa SDL_HasAVX + * \sa SDL_HasAVX2 + * \sa SDL_HasMMX + * \sa SDL_HasSSE + * \sa SDL_HasSSE2 + * \sa SDL_HasSSE3 + * \sa SDL_HasSSE41 + * \sa SDL_HasSSE42 */ extern DECLSPEC SDL_bool SDLCALL SDL_HasRDTSC(void); /** - * This function returns true if the CPU has AltiVec features. + * Determine whether the CPU has AltiVec features. + * + * This always returns false on CPUs that aren't using PowerPC instruction + * sets. + * + * \returns SDL_TRUE if the CPU has AltiVec features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Has3DNow + * \sa SDL_HasAVX + * \sa SDL_HasAVX2 + * \sa SDL_HasMMX + * \sa SDL_HasRDTSC + * \sa SDL_HasSSE + * \sa SDL_HasSSE2 + * \sa SDL_HasSSE3 + * \sa SDL_HasSSE41 + * \sa SDL_HasSSE42 */ extern DECLSPEC SDL_bool SDLCALL SDL_HasAltiVec(void); /** - * This function returns true if the CPU has MMX features. + * Determine whether the CPU has MMX features. + * + * This always returns false on CPUs that aren't using Intel instruction sets. + * + * \returns SDL_TRUE if the CPU has MMX features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Has3DNow + * \sa SDL_HasAltiVec + * \sa SDL_HasAVX + * \sa SDL_HasAVX2 + * \sa SDL_HasRDTSC + * \sa SDL_HasSSE + * \sa SDL_HasSSE2 + * \sa SDL_HasSSE3 + * \sa SDL_HasSSE41 + * \sa SDL_HasSSE42 */ extern DECLSPEC SDL_bool SDLCALL SDL_HasMMX(void); /** - * This function returns true if the CPU has 3DNow! features. + * Determine whether the CPU has 3DNow! features. + * + * This always returns false on CPUs that aren't using AMD instruction sets. + * + * \returns SDL_TRUE if the CPU has 3DNow! features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HasAltiVec + * \sa SDL_HasAVX + * \sa SDL_HasAVX2 + * \sa SDL_HasMMX + * \sa SDL_HasRDTSC + * \sa SDL_HasSSE + * \sa SDL_HasSSE2 + * \sa SDL_HasSSE3 + * \sa SDL_HasSSE41 + * \sa SDL_HasSSE42 */ extern DECLSPEC SDL_bool SDLCALL SDL_Has3DNow(void); /** - * This function returns true if the CPU has SSE features. + * Determine whether the CPU has SSE features. + * + * This always returns false on CPUs that aren't using Intel instruction sets. + * + * \returns SDL_TRUE if the CPU has SSE features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Has3DNow + * \sa SDL_HasAltiVec + * \sa SDL_HasAVX + * \sa SDL_HasAVX2 + * \sa SDL_HasMMX + * \sa SDL_HasRDTSC + * \sa SDL_HasSSE2 + * \sa SDL_HasSSE3 + * \sa SDL_HasSSE41 + * \sa SDL_HasSSE42 */ extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE(void); /** - * This function returns true if the CPU has SSE2 features. + * Determine whether the CPU has SSE2 features. + * + * This always returns false on CPUs that aren't using Intel instruction sets. + * + * \returns SDL_TRUE if the CPU has SSE2 features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Has3DNow + * \sa SDL_HasAltiVec + * \sa SDL_HasAVX + * \sa SDL_HasAVX2 + * \sa SDL_HasMMX + * \sa SDL_HasRDTSC + * \sa SDL_HasSSE + * \sa SDL_HasSSE3 + * \sa SDL_HasSSE41 + * \sa SDL_HasSSE42 */ extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE2(void); /** - * This function returns true if the CPU has SSE3 features. + * Determine whether the CPU has SSE3 features. + * + * This always returns false on CPUs that aren't using Intel instruction sets. + * + * \returns SDL_TRUE if the CPU has SSE3 features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Has3DNow + * \sa SDL_HasAltiVec + * \sa SDL_HasAVX + * \sa SDL_HasAVX2 + * \sa SDL_HasMMX + * \sa SDL_HasRDTSC + * \sa SDL_HasSSE + * \sa SDL_HasSSE2 + * \sa SDL_HasSSE41 + * \sa SDL_HasSSE42 */ extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE3(void); /** - * This function returns true if the CPU has SSE4.1 features. + * Determine whether the CPU has SSE4.1 features. + * + * This always returns false on CPUs that aren't using Intel instruction sets. + * + * \returns SDL_TRUE if the CPU has SSE4.1 features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Has3DNow + * \sa SDL_HasAltiVec + * \sa SDL_HasAVX + * \sa SDL_HasAVX2 + * \sa SDL_HasMMX + * \sa SDL_HasRDTSC + * \sa SDL_HasSSE + * \sa SDL_HasSSE2 + * \sa SDL_HasSSE3 + * \sa SDL_HasSSE42 */ extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE41(void); /** - * This function returns true if the CPU has SSE4.2 features. + * Determine whether the CPU has SSE4.2 features. + * + * This always returns false on CPUs that aren't using Intel instruction sets. + * + * \returns SDL_TRUE if the CPU has SSE4.2 features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Has3DNow + * \sa SDL_HasAltiVec + * \sa SDL_HasAVX + * \sa SDL_HasAVX2 + * \sa SDL_HasMMX + * \sa SDL_HasRDTSC + * \sa SDL_HasSSE + * \sa SDL_HasSSE2 + * \sa SDL_HasSSE3 + * \sa SDL_HasSSE41 */ extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE42(void); /** - * This function returns true if the CPU has AVX features. + * Determine whether the CPU has AVX features. + * + * This always returns false on CPUs that aren't using Intel instruction sets. + * + * \returns SDL_TRUE if the CPU has AVX features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.2. + * + * \sa SDL_Has3DNow + * \sa SDL_HasAltiVec + * \sa SDL_HasAVX2 + * \sa SDL_HasMMX + * \sa SDL_HasRDTSC + * \sa SDL_HasSSE + * \sa SDL_HasSSE2 + * \sa SDL_HasSSE3 + * \sa SDL_HasSSE41 + * \sa SDL_HasSSE42 */ extern DECLSPEC SDL_bool SDLCALL SDL_HasAVX(void); /** - * This function returns true if the CPU has AVX2 features. + * Determine whether the CPU has AVX2 features. + * + * This always returns false on CPUs that aren't using Intel instruction sets. + * + * \returns SDL_TRUE if the CPU has AVX2 features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.4. + * + * \sa SDL_Has3DNow + * \sa SDL_HasAltiVec + * \sa SDL_HasAVX + * \sa SDL_HasMMX + * \sa SDL_HasRDTSC + * \sa SDL_HasSSE + * \sa SDL_HasSSE2 + * \sa SDL_HasSSE3 + * \sa SDL_HasSSE41 + * \sa SDL_HasSSE42 */ extern DECLSPEC SDL_bool SDLCALL SDL_HasAVX2(void); /** - * This function returns true if the CPU has AVX-512F (foundation) features. + * Determine whether the CPU has AVX-512F (foundation) features. + * + * This always returns false on CPUs that aren't using Intel instruction sets. + * + * \returns SDL_TRUE if the CPU has AVX-512F features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.9. + * + * \sa SDL_HasAVX */ extern DECLSPEC SDL_bool SDLCALL SDL_HasAVX512F(void); /** - * This function returns true if the CPU has NEON (ARM SIMD) features. + * Determine whether the CPU has ARM SIMD (ARMv6) features. + * + * This is different from ARM NEON, which is a different instruction set. + * + * This always returns false on CPUs that aren't using ARM instruction sets. + * + * \returns SDL_TRUE if the CPU has ARM SIMD features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.12. + * + * \sa SDL_HasNEON + */ +extern DECLSPEC SDL_bool SDLCALL SDL_HasARMSIMD(void); + +/** + * Determine whether the CPU has NEON (ARM SIMD) features. + * + * This always returns false on CPUs that aren't using ARM instruction sets. + * + * \returns SDL_TRUE if the CPU has ARM NEON features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.6. */ extern DECLSPEC SDL_bool SDLCALL SDL_HasNEON(void); /** - * This function returns the amount of RAM configured in the system, in MB. + * Get the amount of RAM configured in the system. + * + * \returns the amount of RAM configured in the system in MB. + * + * \since This function is available since SDL 2.0.1. */ extern DECLSPEC int SDLCALL SDL_GetSystemRAM(void); /** - * \brief Report the alignment this system needs for SIMD allocations. + * Report the alignment this system needs for SIMD allocations. * * This will return the minimum number of bytes to which a pointer must be - * aligned to be compatible with SIMD instructions on the current machine. - * For example, if the machine supports SSE only, it will return 16, but if - * it supports AVX-512F, it'll return 64 (etc). This only reports values for - * instruction sets SDL knows about, so if your SDL build doesn't have - * SDL_HasAVX512F(), then it might return 16 for the SSE support it sees and - * not 64 for the AVX-512 instructions that exist but SDL doesn't know about. - * Plan accordingly. + * aligned to be compatible with SIMD instructions on the current machine. For + * example, if the machine supports SSE only, it will return 16, but if it + * supports AVX-512F, it'll return 64 (etc). This only reports values for + * instruction sets SDL knows about, so if your SDL build doesn't have + * SDL_HasAVX512F(), then it might return 16 for the SSE support it sees and + * not 64 for the AVX-512 instructions that exist but SDL doesn't know about. + * Plan accordingly. + * + * \returns the alignment in bytes needed for available, known SIMD + * instructions. + * + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC size_t SDLCALL SDL_SIMDGetAlignment(void); /** - * \brief Allocate memory in a SIMD-friendly way. + * Allocate memory in a SIMD-friendly way. * * This will allocate a block of memory that is suitable for use with SIMD - * instructions. Specifically, it will be properly aligned and padded for - * the system's supported vector instructions. + * instructions. Specifically, it will be properly aligned and padded for the + * system's supported vector instructions. * - * The memory returned will be padded such that it is safe to read or write - * an incomplete vector at the end of the memory block. This can be useful - * so you don't have to drop back to a scalar fallback at the end of your - * SIMD processing loop to deal with the final elements without overflowing - * the allocated buffer. + * The memory returned will be padded such that it is safe to read or write an + * incomplete vector at the end of the memory block. This can be useful so you + * don't have to drop back to a scalar fallback at the end of your SIMD + * processing loop to deal with the final elements without overflowing the + * allocated buffer. * - * You must free this memory with SDL_FreeSIMD(), not free() or SDL_free() - * or delete[], etc. + * You must free this memory with SDL_FreeSIMD(), not free() or SDL_free() or + * delete[], etc. * - * Note that SDL will only deal with SIMD instruction sets it is aware of; - * for example, SDL 2.0.8 knows that SSE wants 16-byte vectors - * (SDL_HasSSE()), and AVX2 wants 32 bytes (SDL_HasAVX2()), but doesn't - * know that AVX-512 wants 64. To be clear: if you can't decide to use an - * instruction set with an SDL_Has*() function, don't use that instruction - * set with memory allocated through here. + * Note that SDL will only deal with SIMD instruction sets it is aware of; for + * example, SDL 2.0.8 knows that SSE wants 16-byte vectors (SDL_HasSSE()), and + * AVX2 wants 32 bytes (SDL_HasAVX2()), but doesn't know that AVX-512 wants + * 64. To be clear: if you can't decide to use an instruction set with an + * SDL_Has*() function, don't use that instruction set with memory allocated + * through here. * * SDL_AllocSIMD(0) will return a non-NULL pointer, assuming the system isn't - * out of memory. + * out of memory, but you are not allowed to dereference it (because you only + * own zero bytes of that buffer). * - * \param len The length, in bytes, of the block to allocated. The actual - * allocated block might be larger due to padding, etc. - * \return Pointer to newly-allocated block, NULL if out of memory. + * \param len The length, in bytes, of the block to allocate. The actual + * allocated block might be larger due to padding, etc. + * \returns a pointer to the newly-allocated block, NULL if out of memory. + * + * \since This function is available since SDL 2.0.10. * * \sa SDL_SIMDAlignment + * \sa SDL_SIMDRealloc * \sa SDL_SIMDFree */ extern DECLSPEC void * SDLCALL SDL_SIMDAlloc(const size_t len); /** - * \brief Deallocate memory obtained from SDL_SIMDAlloc + * Reallocate memory obtained from SDL_SIMDAlloc * * It is not valid to use this function on a pointer from anything but - * SDL_SIMDAlloc(). It can't be used on pointers from malloc, realloc, - * SDL_malloc, memalign, new[], etc. + * SDL_SIMDAlloc(). It can't be used on pointers from malloc, realloc, + * SDL_malloc, memalign, new[], etc. + * + * \param mem The pointer obtained from SDL_SIMDAlloc. This function also + * accepts NULL, at which point this function is the same as + * calling SDL_SIMDAlloc with a NULL pointer. + * \param len The length, in bytes, of the block to allocated. The actual + * allocated block might be larger due to padding, etc. Passing 0 + * will return a non-NULL pointer, assuming the system isn't out of + * memory. + * \returns a pointer to the newly-reallocated block, NULL if out of memory. + * + * \since This function is available since SDL 2.0.14. + * + * \sa SDL_SIMDAlignment + * \sa SDL_SIMDAlloc + * \sa SDL_SIMDFree + */ +extern DECLSPEC void * SDLCALL SDL_SIMDRealloc(void *mem, const size_t len); + +/** + * Deallocate memory obtained from SDL_SIMDAlloc + * + * It is not valid to use this function on a pointer from anything but + * SDL_SIMDAlloc() or SDL_SIMDRealloc(). It can't be used on pointers from + * malloc, realloc, SDL_malloc, memalign, new[], etc. * * However, SDL_SIMDFree(NULL) is a legal no-op. * + * The memory pointed to by `ptr` is no longer valid for access upon return, + * and may be returned to the system or reused by a future allocation. The + * pointer passed to this function is no longer safe to dereference once this + * function returns, and should be discarded. + * + * \param ptr The pointer, returned from SDL_SIMDAlloc or SDL_SIMDRealloc, to + * deallocate. NULL is a legal no-op. + * + * \since This function is available since SDL 2.0.10. + * * \sa SDL_SIMDAlloc + * \sa SDL_SIMDRealloc */ extern DECLSPEC void SDLCALL SDL_SIMDFree(void *ptr); -/* vi: set ts=4 sw=4 expandtab: */ /* Ends C function definitions when using C++ */ #ifdef __cplusplus } diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_egl.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_egl.h index f50fa5c9b..f90e27b26 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_egl.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_egl.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -24,7 +24,11 @@ * * This is a simple file to encapsulate the EGL API headers. */ -#if !defined(_MSC_VER) && !defined(__ANDROID__) +#if !defined(_MSC_VER) && !defined(__ANDROID__) && !defined(SDL_USE_BUILTIN_OPENGL_DEFINITIONS) + +#if defined(__vita__) || defined(__psp2__) +#include +#endif #include #include @@ -37,7 +41,7 @@ #define __khrplatform_h_ /* -** Copyright (c) 2008-2009 The Khronos Group Inc. +** Copyright (c) 2008-2018 The Khronos Group Inc. ** ** Permission is hereby granted, free of charge, to any person obtaining a ** copy of this software and/or associated documentation files (the @@ -60,104 +64,112 @@ */ /* Khronos platform-specific types and definitions. -* -* $Revision: 23298 $ on $Date: 2013-09-30 17:07:13 -0700 (Mon, 30 Sep 2013) $ -* -* Adopters may modify this file to suit their platform. Adopters are -* encouraged to submit platform specific modifications to the Khronos -* group so that they can be included in future versions of this file. -* Please submit changes by sending them to the public Khronos Bugzilla -* (http://khronos.org/bugzilla) by filing a bug against product -* "Khronos (general)" component "Registry". -* -* A predefined template which fills in some of the bug fields can be -* reached using http://tinyurl.com/khrplatform-h-bugreport, but you -* must create a Bugzilla login first. -* -* -* See the Implementer's Guidelines for information about where this file -* should be located on your system and for more details of its use: -* http://www.khronos.org/registry/implementers_guide.pdf -* -* This file should be included as -* #include -* by Khronos client API header files that use its types and defines. -* -* The types in khrplatform.h should only be used to define API-specific types. -* -* Types defined in khrplatform.h: -* khronos_int8_t signed 8 bit -* khronos_uint8_t unsigned 8 bit -* khronos_int16_t signed 16 bit -* khronos_uint16_t unsigned 16 bit -* khronos_int32_t signed 32 bit -* khronos_uint32_t unsigned 32 bit -* khronos_int64_t signed 64 bit -* khronos_uint64_t unsigned 64 bit -* khronos_intptr_t signed same number of bits as a pointer -* khronos_uintptr_t unsigned same number of bits as a pointer -* khronos_ssize_t signed size -* khronos_usize_t unsigned size -* khronos_float_t signed 32 bit floating point -* khronos_time_ns_t unsigned 64 bit time in nanoseconds -* khronos_utime_nanoseconds_t unsigned time interval or absolute time in -* nanoseconds -* khronos_stime_nanoseconds_t signed time interval in nanoseconds -* khronos_boolean_enum_t enumerated boolean type. This should -* only be used as a base type when a client API's boolean type is -* an enum. Client APIs which use an integer or other type for -* booleans cannot use this as the base type for their boolean. -* -* Tokens defined in khrplatform.h: -* -* KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values. -* -* KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0. -* KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0. -* -* Calling convention macros defined in this file: -* KHRONOS_APICALL -* KHRONOS_APIENTRY -* KHRONOS_APIATTRIBUTES -* -* These may be used in function prototypes as: -* -* KHRONOS_APICALL void KHRONOS_APIENTRY funcname( -* int arg1, -* int arg2) KHRONOS_APIATTRIBUTES; -*/ + * + * The master copy of khrplatform.h is maintained in the Khronos EGL + * Registry repository at https://github.com/KhronosGroup/EGL-Registry + * The last semantic modification to khrplatform.h was at commit ID: + * 67a3e0864c2d75ea5287b9f3d2eb74a745936692 + * + * Adopters may modify this file to suit their platform. Adopters are + * encouraged to submit platform specific modifications to the Khronos + * group so that they can be included in future versions of this file. + * Please submit changes by filing pull requests or issues on + * the EGL Registry repository linked above. + * + * + * See the Implementer's Guidelines for information about where this file + * should be located on your system and for more details of its use: + * http://www.khronos.org/registry/implementers_guide.pdf + * + * This file should be included as + * #include + * by Khronos client API header files that use its types and defines. + * + * The types in khrplatform.h should only be used to define API-specific types. + * + * Types defined in khrplatform.h: + * khronos_int8_t signed 8 bit + * khronos_uint8_t unsigned 8 bit + * khronos_int16_t signed 16 bit + * khronos_uint16_t unsigned 16 bit + * khronos_int32_t signed 32 bit + * khronos_uint32_t unsigned 32 bit + * khronos_int64_t signed 64 bit + * khronos_uint64_t unsigned 64 bit + * khronos_intptr_t signed same number of bits as a pointer + * khronos_uintptr_t unsigned same number of bits as a pointer + * khronos_ssize_t signed size + * khronos_usize_t unsigned size + * khronos_float_t signed 32 bit floating point + * khronos_time_ns_t unsigned 64 bit time in nanoseconds + * khronos_utime_nanoseconds_t unsigned time interval or absolute time in + * nanoseconds + * khronos_stime_nanoseconds_t signed time interval in nanoseconds + * khronos_boolean_enum_t enumerated boolean type. This should + * only be used as a base type when a client API's boolean type is + * an enum. Client APIs which use an integer or other type for + * booleans cannot use this as the base type for their boolean. + * + * Tokens defined in khrplatform.h: + * + * KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values. + * + * KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0. + * KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0. + * + * Calling convention macros defined in this file: + * KHRONOS_APICALL + * KHRONOS_APIENTRY + * KHRONOS_APIATTRIBUTES + * + * These may be used in function prototypes as: + * + * KHRONOS_APICALL void KHRONOS_APIENTRY funcname( + * int arg1, + * int arg2) KHRONOS_APIATTRIBUTES; + */ + +#if defined(__SCITECH_SNAP__) && !defined(KHRONOS_STATIC) +# define KHRONOS_STATIC 1 +#endif /*------------------------------------------------------------------------- -* Definition of KHRONOS_APICALL -*------------------------------------------------------------------------- -* This precedes the return type of the function in the function prototype. -*/ -#if defined(_WIN32) && !defined(__SCITECH_SNAP__) && !defined(SDL_VIDEO_STATIC_ANGLE) + * Definition of KHRONOS_APICALL + *------------------------------------------------------------------------- + * This precedes the return type of the function in the function prototype. + */ +#if defined(KHRONOS_STATIC) + /* If the preprocessor constant KHRONOS_STATIC is defined, make the + * header compatible with static linking. */ +# define KHRONOS_APICALL +#elif defined(_WIN32) # define KHRONOS_APICALL __declspec(dllimport) #elif defined (__SYMBIAN32__) # define KHRONOS_APICALL IMPORT_C +#elif defined(__ANDROID__) +# define KHRONOS_APICALL __attribute__((visibility("default"))) #else # define KHRONOS_APICALL #endif /*------------------------------------------------------------------------- -* Definition of KHRONOS_APIENTRY -*------------------------------------------------------------------------- -* This follows the return type of the function and precedes the function -* name in the function prototype. -*/ + * Definition of KHRONOS_APIENTRY + *------------------------------------------------------------------------- + * This follows the return type of the function and precedes the function + * name in the function prototype. + */ #if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__) -/* Win32 but not WinCE */ + /* Win32 but not WinCE */ # define KHRONOS_APIENTRY __stdcall #else # define KHRONOS_APIENTRY #endif /*------------------------------------------------------------------------- -* Definition of KHRONOS_APIATTRIBUTES -*------------------------------------------------------------------------- -* This follows the closing parenthesis of the function prototype arguments. -*/ + * Definition of KHRONOS_APIATTRIBUTES + *------------------------------------------------------------------------- + * This follows the closing parenthesis of the function prototype arguments. + */ #if defined (__ARMCC_2__) #define KHRONOS_APIATTRIBUTES __softfp #else @@ -165,14 +177,14 @@ #endif /*------------------------------------------------------------------------- -* basic type definitions -*-----------------------------------------------------------------------*/ + * basic type definitions + *-----------------------------------------------------------------------*/ #if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC__) || defined(__SCO__) || defined(__USLC__) /* -* Using -*/ + * Using + */ #include typedef int32_t khronos_int32_t; typedef uint32_t khronos_uint32_t; @@ -184,8 +196,8 @@ typedef uint64_t khronos_uint64_t; #elif defined(__VMS ) || defined(__sgi) /* -* Using -*/ + * Using + */ #include typedef int32_t khronos_int32_t; typedef uint32_t khronos_uint32_t; @@ -197,8 +209,8 @@ typedef uint64_t khronos_uint64_t; #elif defined(_WIN32) && !defined(__SCITECH_SNAP__) /* -* Win32 -*/ + * Win32 + */ typedef __int32 khronos_int32_t; typedef unsigned __int32 khronos_uint32_t; typedef __int64 khronos_int64_t; @@ -209,8 +221,8 @@ typedef unsigned __int64 khronos_uint64_t; #elif defined(__sun__) || defined(__digital__) /* -* Sun or Digital -*/ + * Sun or Digital + */ typedef int khronos_int32_t; typedef unsigned int khronos_uint32_t; #if defined(__arch64__) || defined(_LP64) @@ -226,8 +238,8 @@ typedef unsigned long long int khronos_uint64_t; #elif 0 /* -* Hypothetical platform with no float or int64 support -*/ + * Hypothetical platform with no float or int64 support + */ typedef int khronos_int32_t; typedef unsigned int khronos_uint32_t; #define KHRONOS_SUPPORT_INT64 0 @@ -236,8 +248,8 @@ typedef unsigned int khronos_uint32_t; #else /* -* Generic fallback -*/ + * Generic fallback + */ #include typedef int32_t khronos_int32_t; typedef uint32_t khronos_uint32_t; @@ -250,18 +262,18 @@ typedef uint64_t khronos_uint64_t; /* -* Types that are (so far) the same on all platforms -*/ + * Types that are (so far) the same on all platforms + */ typedef signed char khronos_int8_t; typedef unsigned char khronos_uint8_t; typedef signed short int khronos_int16_t; typedef unsigned short int khronos_uint16_t; /* -* Types that differ between LLP64 and LP64 architectures - in LLP64, -* pointers are 64 bits, but 'long' is still 32 bits. Win64 appears -* to be the only LLP64 architecture in current use. -*/ + * Types that differ between LLP64 and LP64 architectures - in LLP64, + * pointers are 64 bits, but 'long' is still 32 bits. Win64 appears + * to be the only LLP64 architecture in current use. + */ #ifdef _WIN64 typedef signed long long int khronos_intptr_t; typedef unsigned long long int khronos_uintptr_t; @@ -276,41 +288,41 @@ typedef unsigned long int khronos_usize_t; #if KHRONOS_SUPPORT_FLOAT /* -* Float type -*/ + * Float type + */ typedef float khronos_float_t; #endif #if KHRONOS_SUPPORT_INT64 /* Time types -* -* These types can be used to represent a time interval in nanoseconds or -* an absolute Unadjusted System Time. Unadjusted System Time is the number -* of nanoseconds since some arbitrary system event (e.g. since the last -* time the system booted). The Unadjusted System Time is an unsigned -* 64 bit value that wraps back to 0 every 584 years. Time intervals -* may be either signed or unsigned. -*/ + * + * These types can be used to represent a time interval in nanoseconds or + * an absolute Unadjusted System Time. Unadjusted System Time is the number + * of nanoseconds since some arbitrary system event (e.g. since the last + * time the system booted). The Unadjusted System Time is an unsigned + * 64 bit value that wraps back to 0 every 584 years. Time intervals + * may be either signed or unsigned. + */ typedef khronos_uint64_t khronos_utime_nanoseconds_t; typedef khronos_int64_t khronos_stime_nanoseconds_t; #endif /* -* Dummy value used to pad enum types to 32 bits. -*/ + * Dummy value used to pad enum types to 32 bits. + */ #ifndef KHRONOS_MAX_ENUM #define KHRONOS_MAX_ENUM 0x7FFFFFFF #endif /* -* Enumerated boolean type -* -* Values other than zero should be considered to be true. Therefore -* comparisons should not be made against KHRONOS_TRUE. -*/ + * Enumerated boolean type + * + * Values other than zero should be considered to be true. Therefore + * comparisons should not be made against KHRONOS_TRUE. + */ typedef enum { KHRONOS_FALSE = 0, - KHRONOS_TRUE = 1, + KHRONOS_TRUE = 1, KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM } khronos_boolean_enum_t; @@ -321,49 +333,30 @@ typedef enum { #define __eglplatform_h_ /* -** Copyright (c) 2007-2009 The Khronos Group Inc. -** -** Permission is hereby granted, free of charge, to any person obtaining a -** copy of this software and/or associated documentation files (the -** "Materials"), to deal in the Materials without restriction, including -** without limitation the rights to use, copy, modify, merge, publish, -** distribute, sublicense, and/or sell copies of the Materials, and to -** permit persons to whom the Materials are furnished to do so, subject to -** the following conditions: -** -** The above copyright notice and this permission notice shall be included -** in all copies or substantial portions of the Materials. -** -** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. +** Copyright 2007-2020 The Khronos Group Inc. +** SPDX-License-Identifier: Apache-2.0 */ /* Platform-specific types and definitions for egl.h -* $Revision: 12306 $ on $Date: 2010-08-25 09:51:28 -0700 (Wed, 25 Aug 2010) $ -* -* Adopters may modify khrplatform.h and this file to suit their platform. -* You are encouraged to submit all modifications to the Khronos group so that -* they can be included in future versions of this file. Please submit changes -* by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla) -* by filing a bug against product "EGL" component "Registry". -*/ + * + * Adopters may modify khrplatform.h and this file to suit their platform. + * You are encouraged to submit all modifications to the Khronos group so that + * they can be included in future versions of this file. Please submit changes + * by filing an issue or pull request on the public Khronos EGL Registry, at + * https://www.github.com/KhronosGroup/EGL-Registry/ + */ /*#include */ /* Macros used in EGL function prototype declarations. -* -* EGL functions should be prototyped as: -* -* EGLAPI return-type EGLAPIENTRY eglFunction(arguments); -* typedef return-type (EXPAPIENTRYP PFNEGLFUNCTIONPROC) (arguments); -* -* KHRONOS_APICALL and KHRONOS_APIENTRY are defined in KHR/khrplatform.h -*/ + * + * EGL functions should be prototyped as: + * + * EGLAPI return-type EGLAPIENTRY eglFunction(arguments); + * typedef return-type (EXPAPIENTRYP PFNEGLFUNCTIONPROC) (arguments); + * + * KHRONOS_APICALL and KHRONOS_APIENTRY are defined in KHR/khrplatform.h + */ #ifndef EGLAPI #define EGLAPI KHRONOS_APICALL @@ -375,39 +368,44 @@ typedef enum { #define EGLAPIENTRYP EGLAPIENTRY* /* The types NativeDisplayType, NativeWindowType, and NativePixmapType -* are aliases of window-system-dependent types, such as X Display * or -* Windows Device Context. They must be defined in platform-specific -* code below. The EGL-prefixed versions of Native*Type are the same -* types, renamed in EGL 1.3 so all types in the API start with "EGL". -* -* Khronos STRONGLY RECOMMENDS that you use the default definitions -* provided below, since these changes affect both binary and source -* portability of applications using EGL running on different EGL -* implementations. -*/ + * are aliases of window-system-dependent types, such as X Display * or + * Windows Device Context. They must be defined in platform-specific + * code below. The EGL-prefixed versions of Native*Type are the same + * types, renamed in EGL 1.3 so all types in the API start with "EGL". + * + * Khronos STRONGLY RECOMMENDS that you use the default definitions + * provided below, since these changes affect both binary and source + * portability of applications using EGL running on different EGL + * implementations. + */ -#if defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */ +#if defined(EGL_NO_PLATFORM_SPECIFIC_TYPES) + +typedef void *EGLNativeDisplayType; +typedef void *EGLNativePixmapType; +typedef void *EGLNativeWindowType; + +#elif defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */ #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN 1 #endif #include -#if __WINRT__ -#include -typedef IUnknown * EGLNativeWindowType; -typedef IUnknown * EGLNativePixmapType; -typedef IUnknown * EGLNativeDisplayType; -#else typedef HDC EGLNativeDisplayType; typedef HBITMAP EGLNativePixmapType; typedef HWND EGLNativeWindowType; -#endif + +#elif defined(__EMSCRIPTEN__) + +typedef int EGLNativeDisplayType; +typedef int EGLNativePixmapType; +typedef int EGLNativeWindowType; #elif defined(__WINSCW__) || defined(__SYMBIAN32__) /* Symbian */ typedef int EGLNativeDisplayType; -typedef void *EGLNativeWindowType; typedef void *EGLNativePixmapType; +typedef void *EGLNativeWindowType; #elif defined(WL_EGL_PLATFORM) @@ -421,31 +419,22 @@ typedef struct gbm_device *EGLNativeDisplayType; typedef struct gbm_bo *EGLNativePixmapType; typedef void *EGLNativeWindowType; -#elif defined(__ANDROID__) /* Android */ +#elif defined(__ANDROID__) || defined(ANDROID) struct ANativeWindow; struct egl_native_pixmap_t; -typedef struct ANativeWindow *EGLNativeWindowType; -typedef struct egl_native_pixmap_t *EGLNativePixmapType; -typedef void *EGLNativeDisplayType; +typedef void* EGLNativeDisplayType; +typedef struct egl_native_pixmap_t* EGLNativePixmapType; +typedef struct ANativeWindow* EGLNativeWindowType; -#elif defined(MIR_EGL_PLATFORM) +#elif defined(USE_OZONE) -#include -typedef MirEGLNativeDisplayType EGLNativeDisplayType; -typedef void *EGLNativePixmapType; -typedef MirEGLNativeWindowType EGLNativeWindowType; +typedef intptr_t EGLNativeDisplayType; +typedef intptr_t EGLNativePixmapType; +typedef intptr_t EGLNativeWindowType; -#elif defined(__unix__) - -#ifdef MESA_EGL_NO_X11_HEADERS - -typedef void *EGLNativeDisplayType; -typedef khronos_uintptr_t EGLNativePixmapType; -typedef khronos_uintptr_t EGLNativeWindowType; - -#else +#elif defined(USE_X11) /* X11 (tentative) */ #include @@ -455,7 +444,31 @@ typedef Display *EGLNativeDisplayType; typedef Pixmap EGLNativePixmapType; typedef Window EGLNativeWindowType; -#endif /* MESA_EGL_NO_X11_HEADERS */ +#elif defined(__unix__) + +typedef void *EGLNativeDisplayType; +typedef khronos_uintptr_t EGLNativePixmapType; +typedef khronos_uintptr_t EGLNativeWindowType; + +#elif defined(__APPLE__) + +typedef int EGLNativeDisplayType; +typedef void *EGLNativePixmapType; +typedef void *EGLNativeWindowType; + +#elif defined(__HAIKU__) + +#include + +typedef void *EGLNativeDisplayType; +typedef khronos_uintptr_t EGLNativePixmapType; +typedef khronos_uintptr_t EGLNativeWindowType; + +#elif defined(__Fuchsia__) + +typedef void *EGLNativeDisplayType; +typedef khronos_uintptr_t EGLNativePixmapType; +typedef khronos_uintptr_t EGLNativeWindowType; #else #error "Platform not recognized" @@ -468,16 +481,25 @@ typedef EGLNativeWindowType NativeWindowType; /* Define EGLint. This must be a signed integral type large enough to contain -* all legal attribute names and values passed into and out of EGL, whether -* their type is boolean, bitmask, enumerant (symbolic constant), integer, -* handle, or other. While in general a 32-bit integer will suffice, if -* handles are 64 bit types, then EGLint should be defined as a signed 64-bit -* integer type. -*/ + * all legal attribute names and values passed into and out of EGL, whether + * their type is boolean, bitmask, enumerant (symbolic constant), integer, + * handle, or other. While in general a 32-bit integer will suffice, if + * handles are 64 bit types, then EGLint should be defined as a signed 64-bit + * integer type. + */ typedef khronos_int32_t EGLint; + +/* C++ / C typecast macros for special EGL handle values */ +#if defined(__cplusplus) +#define EGL_CAST(type, value) (static_cast(value)) +#else +#define EGL_CAST(type, value) ((type) (value)) +#endif + #endif /* __eglplatform_h */ + #ifndef __egl_h_ #define __egl_h_ 1 @@ -486,39 +508,24 @@ extern "C" { #endif /* -** Copyright (c) 2013-2015 The Khronos Group Inc. +** Copyright 2013-2020 The Khronos Group Inc. +** SPDX-License-Identifier: Apache-2.0 ** -** Permission is hereby granted, free of charge, to any person obtaining a -** copy of this software and/or associated documentation files (the -** "Materials"), to deal in the Materials without restriction, including -** without limitation the rights to use, copy, modify, merge, publish, -** distribute, sublicense, and/or sell copies of the Materials, and to -** permit persons to whom the Materials are furnished to do so, subject to -** the following conditions: -** -** The above copyright notice and this permission notice shall be included -** in all copies or substantial portions of the Materials. -** -** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ -/* -** This header is generated from the Khronos OpenGL / OpenGL ES XML -** API Registry. The current version of the Registry, generator scripts +** This header is generated from the Khronos EGL XML API Registry. +** The current version of the Registry, generator scripts ** used to make the header, and the header can be found at -** http://www.opengl.org/registry/ +** http://www.khronos.org/registry/egl ** -** Khronos $Revision: 31566 $ on $Date: 2015-06-23 08:48:48 -0700 (Tue, 23 Jun 2015) $ +** Khronos $Git commit SHA1: b35e89ca9a $ on $Git commit date: 2021-09-01 09:34:00 +0530 $ */ /*#include */ -/* Generated on date 20150623 */ +#ifndef EGL_EGL_PROTOTYPES +#define EGL_EGL_PROTOTYPES 1 +#endif + +/* Generated on date 20210901 */ /* Generated C header for: * API: egl @@ -533,6 +540,8 @@ extern "C" { #define EGL_VERSION_1_0 1 typedef unsigned int EGLBoolean; typedef void *EGLDisplay; +/*#include */ +/*#include */ typedef void *EGLConfig; typedef void *EGLSurface; typedef void *EGLContext; @@ -556,7 +565,7 @@ typedef void (*__eglMustCastToProperFunctionPointerType)(void); #define EGL_CONFIG_ID 0x3028 #define EGL_CORE_NATIVE_ENGINE 0x305B #define EGL_DEPTH_SIZE 0x3025 -#define EGL_DONT_CARE ((EGLint)-1) +#define EGL_DONT_CARE EGL_CAST(EGLint,-1) #define EGL_DRAW 0x3059 #define EGL_EXTENSIONS 0x3055 #define EGL_FALSE 0 @@ -573,9 +582,9 @@ typedef void (*__eglMustCastToProperFunctionPointerType)(void); #define EGL_NONE 0x3038 #define EGL_NON_CONFORMANT_CONFIG 0x3051 #define EGL_NOT_INITIALIZED 0x3001 -#define EGL_NO_CONTEXT ((EGLContext)0) -#define EGL_NO_DISPLAY ((EGLDisplay)0) -#define EGL_NO_SURFACE ((EGLSurface)0) +#define EGL_NO_CONTEXT EGL_CAST(EGLContext,0) +#define EGL_NO_DISPLAY EGL_CAST(EGLDisplay,0) +#define EGL_NO_SURFACE EGL_CAST(EGLSurface,0) #define EGL_PBUFFER_BIT 0x0001 #define EGL_PIXMAP_BIT 0x0002 #define EGL_READ 0x305A @@ -596,6 +605,31 @@ typedef void (*__eglMustCastToProperFunctionPointerType)(void); #define EGL_VERSION 0x3054 #define EGL_WIDTH 0x3057 #define EGL_WINDOW_BIT 0x0004 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLCHOOSECONFIGPROC) (EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLCOPYBUFFERSPROC) (EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target); +typedef EGLContext (EGLAPIENTRYP PFNEGLCREATECONTEXTPROC) (EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list); +typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPBUFFERSURFACEPROC) (EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list); +typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPIXMAPSURFACEPROC) (EGLDisplay dpy, EGLConfig config, EGLNativePixmapType pixmap, const EGLint *attrib_list); +typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEWINDOWSURFACEPROC) (EGLDisplay dpy, EGLConfig config, EGLNativeWindowType win, const EGLint *attrib_list); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYCONTEXTPROC) (EGLDisplay dpy, EGLContext ctx); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYSURFACEPROC) (EGLDisplay dpy, EGLSurface surface); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETCONFIGATTRIBPROC) (EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint *value); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETCONFIGSPROC) (EGLDisplay dpy, EGLConfig *configs, EGLint config_size, EGLint *num_config); +typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETCURRENTDISPLAYPROC) (void); +typedef EGLSurface (EGLAPIENTRYP PFNEGLGETCURRENTSURFACEPROC) (EGLint readdraw); +typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETDISPLAYPROC) (EGLNativeDisplayType display_id); +typedef EGLint (EGLAPIENTRYP PFNEGLGETERRORPROC) (void); +typedef __eglMustCastToProperFunctionPointerType (EGLAPIENTRYP PFNEGLGETPROCADDRESSPROC) (const char *procname); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLINITIALIZEPROC) (EGLDisplay dpy, EGLint *major, EGLint *minor); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLMAKECURRENTPROC) (EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYCONTEXTPROC) (EGLDisplay dpy, EGLContext ctx, EGLint attribute, EGLint *value); +typedef const char *(EGLAPIENTRYP PFNEGLQUERYSTRINGPROC) (EGLDisplay dpy, EGLint name); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSURFACEPROC) (EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint *value); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSPROC) (EGLDisplay dpy, EGLSurface surface); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLTERMINATEPROC) (EGLDisplay dpy); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLWAITGLPROC) (void); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLWAITNATIVEPROC) (EGLint engine); +#if EGL_EGL_PROTOTYPES EGLAPI EGLBoolean EGLAPIENTRY eglChooseConfig (EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config); EGLAPI EGLBoolean EGLAPIENTRY eglCopyBuffers (EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target); EGLAPI EGLContext EGLAPIENTRY eglCreateContext (EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list); @@ -620,6 +654,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffers (EGLDisplay dpy, EGLSurface surface EGLAPI EGLBoolean EGLAPIENTRY eglTerminate (EGLDisplay dpy); EGLAPI EGLBoolean EGLAPIENTRY eglWaitGL (void); EGLAPI EGLBoolean EGLAPIENTRY eglWaitNative (EGLint engine); +#endif #endif /* EGL_VERSION_1_0 */ #ifndef EGL_VERSION_1_1 @@ -638,10 +673,16 @@ EGLAPI EGLBoolean EGLAPIENTRY eglWaitNative (EGLint engine); #define EGL_TEXTURE_RGB 0x305D #define EGL_TEXTURE_RGBA 0x305E #define EGL_TEXTURE_TARGET 0x3081 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLBINDTEXIMAGEPROC) (EGLDisplay dpy, EGLSurface surface, EGLint buffer); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLRELEASETEXIMAGEPROC) (EGLDisplay dpy, EGLSurface surface, EGLint buffer); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSURFACEATTRIBPROC) (EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPINTERVALPROC) (EGLDisplay dpy, EGLint interval); +#if EGL_EGL_PROTOTYPES EGLAPI EGLBoolean EGLAPIENTRY eglBindTexImage (EGLDisplay dpy, EGLSurface surface, EGLint buffer); EGLAPI EGLBoolean EGLAPIENTRY eglReleaseTexImage (EGLDisplay dpy, EGLSurface surface, EGLint buffer); EGLAPI EGLBoolean EGLAPIENTRY eglSurfaceAttrib (EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value); EGLAPI EGLBoolean EGLAPIENTRY eglSwapInterval (EGLDisplay dpy, EGLint interval); +#endif #endif /* EGL_VERSION_1_1 */ #ifndef EGL_VERSION_1_2 @@ -675,13 +716,20 @@ typedef void *EGLClientBuffer; #define EGL_RGB_BUFFER 0x308E #define EGL_SINGLE_BUFFER 0x3085 #define EGL_SWAP_BEHAVIOR 0x3093 -#define EGL_UNKNOWN ((EGLint)-1) +#define EGL_UNKNOWN EGL_CAST(EGLint,-1) #define EGL_VERTICAL_RESOLUTION 0x3091 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLBINDAPIPROC) (EGLenum api); +typedef EGLenum (EGLAPIENTRYP PFNEGLQUERYAPIPROC) (void); +typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPBUFFERFROMCLIENTBUFFERPROC) (EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer, EGLConfig config, const EGLint *attrib_list); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLRELEASETHREADPROC) (void); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLWAITCLIENTPROC) (void); +#if EGL_EGL_PROTOTYPES EGLAPI EGLBoolean EGLAPIENTRY eglBindAPI (EGLenum api); EGLAPI EGLenum EGLAPIENTRY eglQueryAPI (void); EGLAPI EGLSurface EGLAPIENTRY eglCreatePbufferFromClientBuffer (EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer, EGLConfig config, const EGLint *attrib_list); EGLAPI EGLBoolean EGLAPIENTRY eglReleaseThread (void); EGLAPI EGLBoolean EGLAPIENTRY eglWaitClient (void); +#endif #endif /* EGL_VERSION_1_2 */ #ifndef EGL_VERSION_1_3 @@ -702,7 +750,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglWaitClient (void); #ifndef EGL_VERSION_1_4 #define EGL_VERSION_1_4 1 -#define EGL_DEFAULT_DISPLAY ((EGLNativeDisplayType)0) +#define EGL_DEFAULT_DISPLAY EGL_CAST(EGLNativeDisplayType,0) #define EGL_MULTISAMPLE_RESOLVE_BOX_BIT 0x0200 #define EGL_MULTISAMPLE_RESOLVE 0x3099 #define EGL_MULTISAMPLE_RESOLVE_DEFAULT 0x309A @@ -710,7 +758,10 @@ EGLAPI EGLBoolean EGLAPIENTRY eglWaitClient (void); #define EGL_OPENGL_API 0x30A2 #define EGL_OPENGL_BIT 0x0008 #define EGL_SWAP_BEHAVIOR_PRESERVED_BIT 0x0400 +typedef EGLContext (EGLAPIENTRYP PFNEGLGETCURRENTCONTEXTPROC) (void); +#if EGL_EGL_PROTOTYPES EGLAPI EGLContext EGLAPIENTRY eglGetCurrentContext (void); +#endif #endif /* EGL_VERSION_1_4 */ #ifndef EGL_VERSION_1_5 @@ -744,7 +795,7 @@ typedef void *EGLImage; #define EGL_FOREVER 0xFFFFFFFFFFFFFFFFull #define EGL_TIMEOUT_EXPIRED 0x30F5 #define EGL_CONDITION_SATISFIED 0x30F6 -#define EGL_NO_SYNC ((EGLSync)0) +#define EGL_NO_SYNC EGL_CAST(EGLSync,0) #define EGL_SYNC_FENCE 0x30F9 #define EGL_GL_COLORSPACE 0x309D #define EGL_GL_COLORSPACE_SRGB 0x3089 @@ -761,7 +812,18 @@ typedef void *EGLImage; #define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x30B7 #define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x30B8 #define EGL_IMAGE_PRESERVED 0x30D2 -#define EGL_NO_IMAGE ((EGLImage)0) +#define EGL_NO_IMAGE EGL_CAST(EGLImage,0) +typedef EGLSync (EGLAPIENTRYP PFNEGLCREATESYNCPROC) (EGLDisplay dpy, EGLenum type, const EGLAttrib *attrib_list); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYSYNCPROC) (EGLDisplay dpy, EGLSync sync); +typedef EGLint (EGLAPIENTRYP PFNEGLCLIENTWAITSYNCPROC) (EGLDisplay dpy, EGLSync sync, EGLint flags, EGLTime timeout); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBPROC) (EGLDisplay dpy, EGLSync sync, EGLint attribute, EGLAttrib *value); +typedef EGLImage (EGLAPIENTRYP PFNEGLCREATEIMAGEPROC) (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLAttrib *attrib_list); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYIMAGEPROC) (EGLDisplay dpy, EGLImage image); +typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETPLATFORMDISPLAYPROC) (EGLenum platform, void *native_display, const EGLAttrib *attrib_list); +typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPLATFORMWINDOWSURFACEPROC) (EGLDisplay dpy, EGLConfig config, void *native_window, const EGLAttrib *attrib_list); +typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPLATFORMPIXMAPSURFACEPROC) (EGLDisplay dpy, EGLConfig config, void *native_pixmap, const EGLAttrib *attrib_list); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLWAITSYNCPROC) (EGLDisplay dpy, EGLSync sync, EGLint flags); +#if EGL_EGL_PROTOTYPES EGLAPI EGLSync EGLAPIENTRY eglCreateSync (EGLDisplay dpy, EGLenum type, const EGLAttrib *attrib_list); EGLAPI EGLBoolean EGLAPIENTRY eglDestroySync (EGLDisplay dpy, EGLSync sync); EGLAPI EGLint EGLAPIENTRY eglClientWaitSync (EGLDisplay dpy, EGLSync sync, EGLint flags, EGLTime timeout); @@ -772,6 +834,7 @@ EGLAPI EGLDisplay EGLAPIENTRY eglGetPlatformDisplay (EGLenum platform, void *nat EGLAPI EGLSurface EGLAPIENTRY eglCreatePlatformWindowSurface (EGLDisplay dpy, EGLConfig config, void *native_window, const EGLAttrib *attrib_list); EGLAPI EGLSurface EGLAPIENTRY eglCreatePlatformPixmapSurface (EGLDisplay dpy, EGLConfig config, void *native_pixmap, const EGLAttrib *attrib_list); EGLAPI EGLBoolean EGLAPIENTRY eglWaitSync (EGLDisplay dpy, EGLSync sync, EGLint flags); +#endif #endif /* EGL_VERSION_1_5 */ #ifdef __cplusplus @@ -781,7 +844,6 @@ EGLAPI EGLBoolean EGLAPIENTRY eglWaitSync (EGLDisplay dpy, EGLSync sync, EGLint #endif /* __egl_h_ */ - #ifndef __eglext_h_ #define __eglext_h_ 1 @@ -790,39 +852,20 @@ extern "C" { #endif /* -** Copyright (c) 2013-2015 The Khronos Group Inc. +** Copyright 2013-2020 The Khronos Group Inc. +** SPDX-License-Identifier: Apache-2.0 ** -** Permission is hereby granted, free of charge, to any person obtaining a -** copy of this software and/or associated documentation files (the -** "Materials"), to deal in the Materials without restriction, including -** without limitation the rights to use, copy, modify, merge, publish, -** distribute, sublicense, and/or sell copies of the Materials, and to -** permit persons to whom the Materials are furnished to do so, subject to -** the following conditions: -** -** The above copyright notice and this permission notice shall be included -** in all copies or substantial portions of the Materials. -** -** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ -/* -** This header is generated from the Khronos OpenGL / OpenGL ES XML -** API Registry. The current version of the Registry, generator scripts +** This header is generated from the Khronos EGL XML API Registry. +** The current version of the Registry, generator scripts ** used to make the header, and the header can be found at -** http://www.opengl.org/registry/ +** http://www.khronos.org/registry/egl ** -** Khronos $Revision: 31566 $ on $Date: 2015-06-23 08:48:48 -0700 (Tue, 23 Jun 2015) $ +** Khronos $Git commit SHA1: b35e89ca9a $ on $Git commit date: 2021-09-01 09:34:00 +0530 $ */ /*#include */ -#define EGL_EGLEXT_VERSION 20150623 +#define EGL_EGLEXT_VERSION 20210901 /* Generated C header for: * API: egl @@ -861,6 +904,13 @@ EGLAPI EGLSyncKHR EGLAPIENTRY eglCreateSync64KHR (EGLDisplay dpy, EGLenum type, #define EGL_VG_ALPHA_FORMAT_PRE_BIT_KHR 0x0040 #endif /* EGL_KHR_config_attribs */ +#ifndef EGL_KHR_context_flush_control +#define EGL_KHR_context_flush_control 1 +#define EGL_CONTEXT_RELEASE_BEHAVIOR_NONE_KHR 0 +#define EGL_CONTEXT_RELEASE_BEHAVIOR_KHR 0x2097 +#define EGL_CONTEXT_RELEASE_BEHAVIOR_FLUSH_KHR 0x2098 +#endif /* EGL_KHR_context_flush_control */ + #ifndef EGL_KHR_create_context #define EGL_KHR_create_context 1 #define EGL_CONTEXT_MAJOR_VERSION_KHR 0x3098 @@ -883,6 +933,42 @@ EGLAPI EGLSyncKHR EGLAPIENTRY eglCreateSync64KHR (EGLDisplay dpy, EGLenum type, #define EGL_CONTEXT_OPENGL_NO_ERROR_KHR 0x31B3 #endif /* EGL_KHR_create_context_no_error */ +#ifndef EGL_KHR_debug +#define EGL_KHR_debug 1 +typedef void *EGLLabelKHR; +typedef void *EGLObjectKHR; +typedef void (EGLAPIENTRY *EGLDEBUGPROCKHR)(EGLenum error,const char *command,EGLint messageType,EGLLabelKHR threadLabel,EGLLabelKHR objectLabel,const char* message); +#define EGL_OBJECT_THREAD_KHR 0x33B0 +#define EGL_OBJECT_DISPLAY_KHR 0x33B1 +#define EGL_OBJECT_CONTEXT_KHR 0x33B2 +#define EGL_OBJECT_SURFACE_KHR 0x33B3 +#define EGL_OBJECT_IMAGE_KHR 0x33B4 +#define EGL_OBJECT_SYNC_KHR 0x33B5 +#define EGL_OBJECT_STREAM_KHR 0x33B6 +#define EGL_DEBUG_MSG_CRITICAL_KHR 0x33B9 +#define EGL_DEBUG_MSG_ERROR_KHR 0x33BA +#define EGL_DEBUG_MSG_WARN_KHR 0x33BB +#define EGL_DEBUG_MSG_INFO_KHR 0x33BC +#define EGL_DEBUG_CALLBACK_KHR 0x33B8 +typedef EGLint (EGLAPIENTRYP PFNEGLDEBUGMESSAGECONTROLKHRPROC) (EGLDEBUGPROCKHR callback, const EGLAttrib *attrib_list); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYDEBUGKHRPROC) (EGLint attribute, EGLAttrib *value); +typedef EGLint (EGLAPIENTRYP PFNEGLLABELOBJECTKHRPROC) (EGLDisplay display, EGLenum objectType, EGLObjectKHR object, EGLLabelKHR label); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLint EGLAPIENTRY eglDebugMessageControlKHR (EGLDEBUGPROCKHR callback, const EGLAttrib *attrib_list); +EGLAPI EGLBoolean EGLAPIENTRY eglQueryDebugKHR (EGLint attribute, EGLAttrib *value); +EGLAPI EGLint EGLAPIENTRY eglLabelObjectKHR (EGLDisplay display, EGLenum objectType, EGLObjectKHR object, EGLLabelKHR label); +#endif +#endif /* EGL_KHR_debug */ + +#ifndef EGL_KHR_display_reference +#define EGL_KHR_display_reference 1 +#define EGL_TRACK_REFERENCES_KHR 0x3352 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYDISPLAYATTRIBKHRPROC) (EGLDisplay dpy, EGLint name, EGLAttrib *value); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglQueryDisplayAttribKHR (EGLDisplay dpy, EGLint name, EGLAttrib *value); +#endif +#endif /* EGL_KHR_display_reference */ + #ifndef EGL_KHR_fence_sync #define EGL_KHR_fence_sync 1 typedef khronos_utime_nanoseconds_t EGLTimeKHR; @@ -945,7 +1031,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglGetSyncAttribKHR (EGLDisplay dpy, EGLSyncKHR sy #define EGL_KHR_image 1 typedef void *EGLImageKHR; #define EGL_NATIVE_PIXMAP_KHR 0x30B0 -#define EGL_NO_IMAGE_KHR ((EGLImageKHR)0) +#define EGL_NO_IMAGE_KHR EGL_CAST(EGLImageKHR,0) typedef EGLImageKHR (EGLAPIENTRYP PFNEGLCREATEIMAGEKHRPROC) (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list); typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYIMAGEKHRPROC) (EGLDisplay dpy, EGLImageKHR image); #ifdef EGL_EGLEXT_PROTOTYPES @@ -1007,6 +1093,16 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQuerySurface64KHR (EGLDisplay dpy, EGLSurface s #endif #endif /* EGL_KHR_lock_surface3 */ +#ifndef EGL_KHR_mutable_render_buffer +#define EGL_KHR_mutable_render_buffer 1 +#define EGL_MUTABLE_RENDER_BUFFER_BIT_KHR 0x1000 +#endif /* EGL_KHR_mutable_render_buffer */ + +#ifndef EGL_KHR_no_config_context +#define EGL_KHR_no_config_context 1 +#define EGL_NO_CONFIG_KHR EGL_CAST(EGLConfig,0) +#endif /* EGL_KHR_no_config_context */ + #ifndef EGL_KHR_partial_update #define EGL_KHR_partial_update 1 #define EGL_BUFFER_AGE_KHR 0x313D @@ -1049,7 +1145,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSetDamageRegionKHR (EGLDisplay dpy, EGLSurface #define EGL_SYNC_REUSABLE_KHR 0x30FA #define EGL_SYNC_FLUSH_COMMANDS_BIT_KHR 0x0001 #define EGL_FOREVER_KHR 0xFFFFFFFFFFFFFFFFull -#define EGL_NO_SYNC_KHR ((EGLSyncKHR)0) +#define EGL_NO_SYNC_KHR EGL_CAST(EGLSyncKHR,0) typedef EGLBoolean (EGLAPIENTRYP PFNEGLSIGNALSYNCKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLenum mode); #ifdef EGL_EGLEXT_PROTOTYPES EGLAPI EGLBoolean EGLAPIENTRY eglSignalSyncKHR (EGLDisplay dpy, EGLSyncKHR sync, EGLenum mode); @@ -1062,7 +1158,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSignalSyncKHR (EGLDisplay dpy, EGLSyncKHR sync, typedef void *EGLStreamKHR; typedef khronos_uint64_t EGLuint64KHR; #ifdef KHRONOS_SUPPORT_INT64 -#define EGL_NO_STREAM_KHR ((EGLStreamKHR)0) +#define EGL_NO_STREAM_KHR EGL_CAST(EGLStreamKHR,0) #define EGL_CONSUMER_LATENCY_USEC_KHR 0x3210 #define EGL_PRODUCER_FRAME_KHR 0x3212 #define EGL_CONSUMER_FRAME_KHR 0x3213 @@ -1090,6 +1186,24 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQueryStreamu64KHR (EGLDisplay dpy, EGLStreamKHR #endif /* KHRONOS_SUPPORT_INT64 */ #endif /* EGL_KHR_stream */ +#ifndef EGL_KHR_stream_attrib +#define EGL_KHR_stream_attrib 1 +#ifdef KHRONOS_SUPPORT_INT64 +typedef EGLStreamKHR (EGLAPIENTRYP PFNEGLCREATESTREAMATTRIBKHRPROC) (EGLDisplay dpy, const EGLAttrib *attrib_list); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSETSTREAMATTRIBKHRPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLAttrib value); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSTREAMATTRIBKHRPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLAttrib *value); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMCONSUMERACQUIREATTRIBKHRPROC) (EGLDisplay dpy, EGLStreamKHR stream, const EGLAttrib *attrib_list); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMCONSUMERRELEASEATTRIBKHRPROC) (EGLDisplay dpy, EGLStreamKHR stream, const EGLAttrib *attrib_list); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLStreamKHR EGLAPIENTRY eglCreateStreamAttribKHR (EGLDisplay dpy, const EGLAttrib *attrib_list); +EGLAPI EGLBoolean EGLAPIENTRY eglSetStreamAttribKHR (EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLAttrib value); +EGLAPI EGLBoolean EGLAPIENTRY eglQueryStreamAttribKHR (EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLAttrib *value); +EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerAcquireAttribKHR (EGLDisplay dpy, EGLStreamKHR stream, const EGLAttrib *attrib_list); +EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerReleaseAttribKHR (EGLDisplay dpy, EGLStreamKHR stream, const EGLAttrib *attrib_list); +#endif +#endif /* KHRONOS_SUPPORT_INT64 */ +#endif /* EGL_KHR_stream_attrib */ + #ifndef EGL_KHR_stream_consumer_gltexture #define EGL_KHR_stream_consumer_gltexture 1 #ifdef EGL_KHR_stream @@ -1109,7 +1223,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerReleaseKHR (EGLDisplay dpy, EGLSt #define EGL_KHR_stream_cross_process_fd 1 typedef int EGLNativeFileDescriptorKHR; #ifdef EGL_KHR_stream -#define EGL_NO_FILE_DESCRIPTOR_KHR ((EGLNativeFileDescriptorKHR)(-1)) +#define EGL_NO_FILE_DESCRIPTOR_KHR EGL_CAST(EGLNativeFileDescriptorKHR,-1) typedef EGLNativeFileDescriptorKHR (EGLAPIENTRYP PFNEGLGETSTREAMFILEDESCRIPTORKHRPROC) (EGLDisplay dpy, EGLStreamKHR stream); typedef EGLStreamKHR (EGLAPIENTRYP PFNEGLCREATESTREAMFROMFILEDESCRIPTORKHRPROC) (EGLDisplay dpy, EGLNativeFileDescriptorKHR file_descriptor); #ifdef EGL_EGLEXT_PROTOTYPES @@ -1156,9 +1270,9 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreateStreamProducerSurfaceKHR (EGLDisplay dpy, #ifndef EGL_KHR_swap_buffers_with_damage #define EGL_KHR_swap_buffers_with_damage 1 -typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSWITHDAMAGEKHRPROC) (EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSWITHDAMAGEKHRPROC) (EGLDisplay dpy, EGLSurface surface, const EGLint *rects, EGLint n_rects); #ifdef EGL_EGLEXT_PROTOTYPES -EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffersWithDamageKHR (EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects); +EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffersWithDamageKHR (EGLDisplay dpy, EGLSurface surface, const EGLint *rects, EGLint n_rects); #endif #endif /* EGL_KHR_swap_buffers_with_damage */ @@ -1175,6 +1289,10 @@ EGLAPI EGLint EGLAPIENTRY eglWaitSyncKHR (EGLDisplay dpy, EGLSyncKHR sync, EGLin #endif #endif /* EGL_KHR_wait_sync */ +#ifndef EGL_ANDROID_GLES_layers +#define EGL_ANDROID_GLES_layers 1 +#endif /* EGL_ANDROID_GLES_layers */ + #ifndef EGL_ANDROID_blob_cache #define EGL_ANDROID_blob_cache 1 typedef khronos_ssize_t EGLsizeiANDROID; @@ -1186,11 +1304,69 @@ EGLAPI void EGLAPIENTRY eglSetBlobCacheFuncsANDROID (EGLDisplay dpy, EGLSetBlobF #endif #endif /* EGL_ANDROID_blob_cache */ +#ifndef EGL_ANDROID_create_native_client_buffer +#define EGL_ANDROID_create_native_client_buffer 1 +#define EGL_NATIVE_BUFFER_USAGE_ANDROID 0x3143 +#define EGL_NATIVE_BUFFER_USAGE_PROTECTED_BIT_ANDROID 0x00000001 +#define EGL_NATIVE_BUFFER_USAGE_RENDERBUFFER_BIT_ANDROID 0x00000002 +#define EGL_NATIVE_BUFFER_USAGE_TEXTURE_BIT_ANDROID 0x00000004 +typedef EGLClientBuffer (EGLAPIENTRYP PFNEGLCREATENATIVECLIENTBUFFERANDROIDPROC) (const EGLint *attrib_list); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLClientBuffer EGLAPIENTRY eglCreateNativeClientBufferANDROID (const EGLint *attrib_list); +#endif +#endif /* EGL_ANDROID_create_native_client_buffer */ + #ifndef EGL_ANDROID_framebuffer_target #define EGL_ANDROID_framebuffer_target 1 #define EGL_FRAMEBUFFER_TARGET_ANDROID 0x3147 #endif /* EGL_ANDROID_framebuffer_target */ +#ifndef EGL_ANDROID_front_buffer_auto_refresh +#define EGL_ANDROID_front_buffer_auto_refresh 1 +#define EGL_FRONT_BUFFER_AUTO_REFRESH_ANDROID 0x314C +#endif /* EGL_ANDROID_front_buffer_auto_refresh */ + +#ifndef EGL_ANDROID_get_frame_timestamps +#define EGL_ANDROID_get_frame_timestamps 1 +typedef khronos_stime_nanoseconds_t EGLnsecsANDROID; +#define EGL_TIMESTAMP_PENDING_ANDROID EGL_CAST(EGLnsecsANDROID,-2) +#define EGL_TIMESTAMP_INVALID_ANDROID EGL_CAST(EGLnsecsANDROID,-1) +#define EGL_TIMESTAMPS_ANDROID 0x3430 +#define EGL_COMPOSITE_DEADLINE_ANDROID 0x3431 +#define EGL_COMPOSITE_INTERVAL_ANDROID 0x3432 +#define EGL_COMPOSITE_TO_PRESENT_LATENCY_ANDROID 0x3433 +#define EGL_REQUESTED_PRESENT_TIME_ANDROID 0x3434 +#define EGL_RENDERING_COMPLETE_TIME_ANDROID 0x3435 +#define EGL_COMPOSITION_LATCH_TIME_ANDROID 0x3436 +#define EGL_FIRST_COMPOSITION_START_TIME_ANDROID 0x3437 +#define EGL_LAST_COMPOSITION_START_TIME_ANDROID 0x3438 +#define EGL_FIRST_COMPOSITION_GPU_FINISHED_TIME_ANDROID 0x3439 +#define EGL_DISPLAY_PRESENT_TIME_ANDROID 0x343A +#define EGL_DEQUEUE_READY_TIME_ANDROID 0x343B +#define EGL_READS_DONE_TIME_ANDROID 0x343C +typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETCOMPOSITORTIMINGSUPPORTEDANDROIDPROC) (EGLDisplay dpy, EGLSurface surface, EGLint name); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETCOMPOSITORTIMINGANDROIDPROC) (EGLDisplay dpy, EGLSurface surface, EGLint numTimestamps, const EGLint *names, EGLnsecsANDROID *values); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETNEXTFRAMEIDANDROIDPROC) (EGLDisplay dpy, EGLSurface surface, EGLuint64KHR *frameId); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETFRAMETIMESTAMPSUPPORTEDANDROIDPROC) (EGLDisplay dpy, EGLSurface surface, EGLint timestamp); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETFRAMETIMESTAMPSANDROIDPROC) (EGLDisplay dpy, EGLSurface surface, EGLuint64KHR frameId, EGLint numTimestamps, const EGLint *timestamps, EGLnsecsANDROID *values); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglGetCompositorTimingSupportedANDROID (EGLDisplay dpy, EGLSurface surface, EGLint name); +EGLAPI EGLBoolean EGLAPIENTRY eglGetCompositorTimingANDROID (EGLDisplay dpy, EGLSurface surface, EGLint numTimestamps, const EGLint *names, EGLnsecsANDROID *values); +EGLAPI EGLBoolean EGLAPIENTRY eglGetNextFrameIdANDROID (EGLDisplay dpy, EGLSurface surface, EGLuint64KHR *frameId); +EGLAPI EGLBoolean EGLAPIENTRY eglGetFrameTimestampSupportedANDROID (EGLDisplay dpy, EGLSurface surface, EGLint timestamp); +EGLAPI EGLBoolean EGLAPIENTRY eglGetFrameTimestampsANDROID (EGLDisplay dpy, EGLSurface surface, EGLuint64KHR frameId, EGLint numTimestamps, const EGLint *timestamps, EGLnsecsANDROID *values); +#endif +#endif /* EGL_ANDROID_get_frame_timestamps */ + +#ifndef EGL_ANDROID_get_native_client_buffer +#define EGL_ANDROID_get_native_client_buffer 1 +struct AHardwareBuffer; +typedef EGLClientBuffer (EGLAPIENTRYP PFNEGLGETNATIVECLIENTBUFFERANDROIDPROC) (const struct AHardwareBuffer *buffer); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLClientBuffer EGLAPIENTRY eglGetNativeClientBufferANDROID (const struct AHardwareBuffer *buffer); +#endif +#endif /* EGL_ANDROID_get_native_client_buffer */ + #ifndef EGL_ANDROID_image_native_buffer #define EGL_ANDROID_image_native_buffer 1 #define EGL_NATIVE_BUFFER_ANDROID 0x3140 @@ -1208,6 +1384,14 @@ EGLAPI EGLint EGLAPIENTRY eglDupNativeFenceFDANDROID (EGLDisplay dpy, EGLSyncKHR #endif #endif /* EGL_ANDROID_native_fence_sync */ +#ifndef EGL_ANDROID_presentation_time +#define EGL_ANDROID_presentation_time 1 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLPRESENTATIONTIMEANDROIDPROC) (EGLDisplay dpy, EGLSurface surface, EGLnsecsANDROID time); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglPresentationTimeANDROID (EGLDisplay dpy, EGLSurface surface, EGLnsecsANDROID time); +#endif +#endif /* EGL_ANDROID_presentation_time */ + #ifndef EGL_ANDROID_recordable #define EGL_ANDROID_recordable 1 #define EGL_RECORDABLE_ANDROID 0x3142 @@ -1236,16 +1420,40 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQuerySurfacePointerANGLE (EGLDisplay dpy, EGLSu #define EGL_ANGLE_surface_d3d_texture_2d_share_handle 1 #endif /* EGL_ANGLE_surface_d3d_texture_2d_share_handle */ +#ifndef EGL_ANGLE_sync_control_rate +#define EGL_ANGLE_sync_control_rate 1 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETMSCRATEANGLEPROC) (EGLDisplay dpy, EGLSurface surface, EGLint *numerator, EGLint *denominator); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglGetMscRateANGLE (EGLDisplay dpy, EGLSurface surface, EGLint *numerator, EGLint *denominator); +#endif +#endif /* EGL_ANGLE_sync_control_rate */ + #ifndef EGL_ANGLE_window_fixed_size #define EGL_ANGLE_window_fixed_size 1 #define EGL_FIXED_SIZE_ANGLE 0x3201 #endif /* EGL_ANGLE_window_fixed_size */ +#ifndef EGL_ARM_image_format +#define EGL_ARM_image_format 1 +#define EGL_COLOR_COMPONENT_TYPE_UNSIGNED_INTEGER_ARM 0x3287 +#define EGL_COLOR_COMPONENT_TYPE_INTEGER_ARM 0x3288 +#endif /* EGL_ARM_image_format */ + +#ifndef EGL_ARM_implicit_external_sync +#define EGL_ARM_implicit_external_sync 1 +#define EGL_SYNC_PRIOR_COMMANDS_IMPLICIT_EXTERNAL_ARM 0x328A +#endif /* EGL_ARM_implicit_external_sync */ + #ifndef EGL_ARM_pixmap_multisample_discard #define EGL_ARM_pixmap_multisample_discard 1 #define EGL_DISCARD_SAMPLES_ARM 0x3286 #endif /* EGL_ARM_pixmap_multisample_discard */ +#ifndef EGL_EXT_bind_to_front +#define EGL_EXT_bind_to_front 1 +#define EGL_FRONT_BUFFER_EXT 0x3464 +#endif /* EGL_EXT_bind_to_front */ + #ifndef EGL_EXT_buffer_age #define EGL_EXT_buffer_age 1 #define EGL_BUFFER_AGE_EXT 0x313D @@ -1255,6 +1463,45 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQuerySurfacePointerANGLE (EGLDisplay dpy, EGLSu #define EGL_EXT_client_extensions 1 #endif /* EGL_EXT_client_extensions */ +#ifndef EGL_EXT_client_sync +#define EGL_EXT_client_sync 1 +#define EGL_SYNC_CLIENT_EXT 0x3364 +#define EGL_SYNC_CLIENT_SIGNAL_EXT 0x3365 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLCLIENTSIGNALSYNCEXTPROC) (EGLDisplay dpy, EGLSync sync, const EGLAttrib *attrib_list); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglClientSignalSyncEXT (EGLDisplay dpy, EGLSync sync, const EGLAttrib *attrib_list); +#endif +#endif /* EGL_EXT_client_sync */ + +#ifndef EGL_EXT_compositor +#define EGL_EXT_compositor 1 +#define EGL_PRIMARY_COMPOSITOR_CONTEXT_EXT 0x3460 +#define EGL_EXTERNAL_REF_ID_EXT 0x3461 +#define EGL_COMPOSITOR_DROP_NEWEST_FRAME_EXT 0x3462 +#define EGL_COMPOSITOR_KEEP_NEWEST_FRAME_EXT 0x3463 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLCOMPOSITORSETCONTEXTLISTEXTPROC) (const EGLint *external_ref_ids, EGLint num_entries); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLCOMPOSITORSETCONTEXTATTRIBUTESEXTPROC) (EGLint external_ref_id, const EGLint *context_attributes, EGLint num_entries); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLCOMPOSITORSETWINDOWLISTEXTPROC) (EGLint external_ref_id, const EGLint *external_win_ids, EGLint num_entries); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLCOMPOSITORSETWINDOWATTRIBUTESEXTPROC) (EGLint external_win_id, const EGLint *window_attributes, EGLint num_entries); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLCOMPOSITORBINDTEXWINDOWEXTPROC) (EGLint external_win_id); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLCOMPOSITORSETSIZEEXTPROC) (EGLint external_win_id, EGLint width, EGLint height); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLCOMPOSITORSWAPPOLICYEXTPROC) (EGLint external_win_id, EGLint policy); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglCompositorSetContextListEXT (const EGLint *external_ref_ids, EGLint num_entries); +EGLAPI EGLBoolean EGLAPIENTRY eglCompositorSetContextAttributesEXT (EGLint external_ref_id, const EGLint *context_attributes, EGLint num_entries); +EGLAPI EGLBoolean EGLAPIENTRY eglCompositorSetWindowListEXT (EGLint external_ref_id, const EGLint *external_win_ids, EGLint num_entries); +EGLAPI EGLBoolean EGLAPIENTRY eglCompositorSetWindowAttributesEXT (EGLint external_win_id, const EGLint *window_attributes, EGLint num_entries); +EGLAPI EGLBoolean EGLAPIENTRY eglCompositorBindTexWindowEXT (EGLint external_win_id); +EGLAPI EGLBoolean EGLAPIENTRY eglCompositorSetSizeEXT (EGLint external_win_id, EGLint width, EGLint height); +EGLAPI EGLBoolean EGLAPIENTRY eglCompositorSwapPolicyEXT (EGLint external_win_id, EGLint policy); +#endif +#endif /* EGL_EXT_compositor */ + +#ifndef EGL_EXT_config_select_group +#define EGL_EXT_config_select_group 1 +#define EGL_CONFIG_SELECT_GROUP_EXT 0x34C0 +#endif /* EGL_EXT_config_select_group */ + #ifndef EGL_EXT_create_context_robustness #define EGL_EXT_create_context_robustness 1 #define EGL_CONTEXT_OPENGL_ROBUST_ACCESS_EXT 0x30BF @@ -1266,7 +1513,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQuerySurfacePointerANGLE (EGLDisplay dpy, EGLSu #ifndef EGL_EXT_device_base #define EGL_EXT_device_base 1 typedef void *EGLDeviceEXT; -#define EGL_NO_DEVICE_EXT ((EGLDeviceEXT)(0)) +#define EGL_NO_DEVICE_EXT EGL_CAST(EGLDeviceEXT,0) #define EGL_BAD_DEVICE_EXT 0x322B #define EGL_DEVICE_EXT 0x322C typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYDEVICEATTRIBEXTPROC) (EGLDeviceEXT device, EGLint attribute, EGLAttrib *value); @@ -1284,8 +1531,14 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQueryDisplayAttribEXT (EGLDisplay dpy, EGLint a #ifndef EGL_EXT_device_drm #define EGL_EXT_device_drm 1 #define EGL_DRM_DEVICE_FILE_EXT 0x3233 +#define EGL_DRM_MASTER_FD_EXT 0x333C #endif /* EGL_EXT_device_drm */ +#ifndef EGL_EXT_device_drm_render_node +#define EGL_EXT_device_drm_render_node 1 +#define EGL_DRM_RENDER_NODE_FILE_EXT 0x3377 +#endif /* EGL_EXT_device_drm_render_node */ + #ifndef EGL_EXT_device_enumeration #define EGL_EXT_device_enumeration 1 #endif /* EGL_EXT_device_enumeration */ @@ -1293,12 +1546,64 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQueryDisplayAttribEXT (EGLDisplay dpy, EGLint a #ifndef EGL_EXT_device_openwf #define EGL_EXT_device_openwf 1 #define EGL_OPENWF_DEVICE_ID_EXT 0x3237 +#define EGL_OPENWF_DEVICE_EXT 0x333D #endif /* EGL_EXT_device_openwf */ +#ifndef EGL_EXT_device_persistent_id +#define EGL_EXT_device_persistent_id 1 +#define EGL_DEVICE_UUID_EXT 0x335C +#define EGL_DRIVER_UUID_EXT 0x335D +#define EGL_DRIVER_NAME_EXT 0x335E +typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYDEVICEBINARYEXTPROC) (EGLDeviceEXT device, EGLint name, EGLint max_size, void *value, EGLint *size); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglQueryDeviceBinaryEXT (EGLDeviceEXT device, EGLint name, EGLint max_size, void *value, EGLint *size); +#endif +#endif /* EGL_EXT_device_persistent_id */ + #ifndef EGL_EXT_device_query #define EGL_EXT_device_query 1 #endif /* EGL_EXT_device_query */ +#ifndef EGL_EXT_device_query_name +#define EGL_EXT_device_query_name 1 +#define EGL_RENDERER_EXT 0x335F +#endif /* EGL_EXT_device_query_name */ + +#ifndef EGL_EXT_gl_colorspace_bt2020_linear +#define EGL_EXT_gl_colorspace_bt2020_linear 1 +#define EGL_GL_COLORSPACE_BT2020_LINEAR_EXT 0x333F +#endif /* EGL_EXT_gl_colorspace_bt2020_linear */ + +#ifndef EGL_EXT_gl_colorspace_bt2020_pq +#define EGL_EXT_gl_colorspace_bt2020_pq 1 +#define EGL_GL_COLORSPACE_BT2020_PQ_EXT 0x3340 +#endif /* EGL_EXT_gl_colorspace_bt2020_pq */ + +#ifndef EGL_EXT_gl_colorspace_display_p3 +#define EGL_EXT_gl_colorspace_display_p3 1 +#define EGL_GL_COLORSPACE_DISPLAY_P3_EXT 0x3363 +#endif /* EGL_EXT_gl_colorspace_display_p3 */ + +#ifndef EGL_EXT_gl_colorspace_display_p3_linear +#define EGL_EXT_gl_colorspace_display_p3_linear 1 +#define EGL_GL_COLORSPACE_DISPLAY_P3_LINEAR_EXT 0x3362 +#endif /* EGL_EXT_gl_colorspace_display_p3_linear */ + +#ifndef EGL_EXT_gl_colorspace_display_p3_passthrough +#define EGL_EXT_gl_colorspace_display_p3_passthrough 1 +#define EGL_GL_COLORSPACE_DISPLAY_P3_PASSTHROUGH_EXT 0x3490 +#endif /* EGL_EXT_gl_colorspace_display_p3_passthrough */ + +#ifndef EGL_EXT_gl_colorspace_scrgb +#define EGL_EXT_gl_colorspace_scrgb 1 +#define EGL_GL_COLORSPACE_SCRGB_EXT 0x3351 +#endif /* EGL_EXT_gl_colorspace_scrgb */ + +#ifndef EGL_EXT_gl_colorspace_scrgb_linear +#define EGL_EXT_gl_colorspace_scrgb_linear 1 +#define EGL_GL_COLORSPACE_SCRGB_LINEAR_EXT 0x3350 +#endif /* EGL_EXT_gl_colorspace_scrgb_linear */ + #ifndef EGL_EXT_image_dma_buf_import #define EGL_EXT_image_dma_buf_import 1 #define EGL_LINUX_DMA_BUF_EXT 0x3270 @@ -1325,6 +1630,39 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQueryDisplayAttribEXT (EGLDisplay dpy, EGLint a #define EGL_YUV_CHROMA_SITING_0_5_EXT 0x3285 #endif /* EGL_EXT_image_dma_buf_import */ +#ifndef EGL_EXT_image_dma_buf_import_modifiers +#define EGL_EXT_image_dma_buf_import_modifiers 1 +#define EGL_DMA_BUF_PLANE3_FD_EXT 0x3440 +#define EGL_DMA_BUF_PLANE3_OFFSET_EXT 0x3441 +#define EGL_DMA_BUF_PLANE3_PITCH_EXT 0x3442 +#define EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT 0x3443 +#define EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT 0x3444 +#define EGL_DMA_BUF_PLANE1_MODIFIER_LO_EXT 0x3445 +#define EGL_DMA_BUF_PLANE1_MODIFIER_HI_EXT 0x3446 +#define EGL_DMA_BUF_PLANE2_MODIFIER_LO_EXT 0x3447 +#define EGL_DMA_BUF_PLANE2_MODIFIER_HI_EXT 0x3448 +#define EGL_DMA_BUF_PLANE3_MODIFIER_LO_EXT 0x3449 +#define EGL_DMA_BUF_PLANE3_MODIFIER_HI_EXT 0x344A +typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYDMABUFFORMATSEXTPROC) (EGLDisplay dpy, EGLint max_formats, EGLint *formats, EGLint *num_formats); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYDMABUFMODIFIERSEXTPROC) (EGLDisplay dpy, EGLint format, EGLint max_modifiers, EGLuint64KHR *modifiers, EGLBoolean *external_only, EGLint *num_modifiers); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglQueryDmaBufFormatsEXT (EGLDisplay dpy, EGLint max_formats, EGLint *formats, EGLint *num_formats); +EGLAPI EGLBoolean EGLAPIENTRY eglQueryDmaBufModifiersEXT (EGLDisplay dpy, EGLint format, EGLint max_modifiers, EGLuint64KHR *modifiers, EGLBoolean *external_only, EGLint *num_modifiers); +#endif +#endif /* EGL_EXT_image_dma_buf_import_modifiers */ + +#ifndef EGL_EXT_image_gl_colorspace +#define EGL_EXT_image_gl_colorspace 1 +#define EGL_GL_COLORSPACE_DEFAULT_EXT 0x314D +#endif /* EGL_EXT_image_gl_colorspace */ + +#ifndef EGL_EXT_image_implicit_sync_control +#define EGL_EXT_image_implicit_sync_control 1 +#define EGL_IMPORT_SYNC_TYPE_EXT 0x3470 +#define EGL_IMPORT_IMPLICIT_SYNC_EXT 0x3471 +#define EGL_IMPORT_EXPLICIT_SYNC_EXT 0x3472 +#endif /* EGL_EXT_image_implicit_sync_control */ + #ifndef EGL_EXT_multiview_window #define EGL_EXT_multiview_window 1 #define EGL_MULTIVIEW_VIEW_COUNT_EXT 0x3134 @@ -1334,8 +1672,8 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQueryDisplayAttribEXT (EGLDisplay dpy, EGLint a #define EGL_EXT_output_base 1 typedef void *EGLOutputLayerEXT; typedef void *EGLOutputPortEXT; -#define EGL_NO_OUTPUT_LAYER_EXT ((EGLOutputLayerEXT)0) -#define EGL_NO_OUTPUT_PORT_EXT ((EGLOutputPortEXT)0) +#define EGL_NO_OUTPUT_LAYER_EXT EGL_CAST(EGLOutputLayerEXT,0) +#define EGL_NO_OUTPUT_PORT_EXT EGL_CAST(EGLOutputPortEXT,0) #define EGL_BAD_OUTPUT_LAYER_EXT 0x322D #define EGL_BAD_OUTPUT_PORT_EXT 0x322E #define EGL_SWAP_INTERVAL_EXT 0x322F @@ -1372,6 +1710,13 @@ EGLAPI const char *EGLAPIENTRY eglQueryOutputPortStringEXT (EGLDisplay dpy, EGLO #define EGL_OPENWF_PORT_ID_EXT 0x3239 #endif /* EGL_EXT_output_openwf */ +#ifndef EGL_EXT_pixel_format_float +#define EGL_EXT_pixel_format_float 1 +#define EGL_COLOR_COMPONENT_TYPE_EXT 0x3339 +#define EGL_COLOR_COMPONENT_TYPE_FIXED_EXT 0x333A +#define EGL_COLOR_COMPONENT_TYPE_FLOAT_EXT 0x333B +#endif /* EGL_EXT_pixel_format_float */ + #ifndef EGL_EXT_platform_base #define EGL_EXT_platform_base 1 typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETPLATFORMDISPLAYEXTPROC) (EGLenum platform, void *native_display, const EGLint *attrib_list); @@ -1400,9 +1745,24 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreatePlatformPixmapSurfaceEXT (EGLDisplay dpy, #define EGL_PLATFORM_X11_SCREEN_EXT 0x31D6 #endif /* EGL_EXT_platform_x11 */ +#ifndef EGL_EXT_platform_xcb +#define EGL_EXT_platform_xcb 1 +#define EGL_PLATFORM_XCB_EXT 0x31DC +#define EGL_PLATFORM_XCB_SCREEN_EXT 0x31DE +#endif /* EGL_EXT_platform_xcb */ + +#ifndef EGL_EXT_present_opaque +#define EGL_EXT_present_opaque 1 +#define EGL_PRESENT_OPAQUE_EXT 0x31DF +#endif /* EGL_EXT_present_opaque */ + +#ifndef EGL_EXT_protected_content +#define EGL_EXT_protected_content 1 +#define EGL_PROTECTED_CONTENT_EXT 0x32C0 +#endif /* EGL_EXT_protected_content */ + #ifndef EGL_EXT_protected_surface #define EGL_EXT_protected_surface 1 -#define EGL_PROTECTED_CONTENT_EXT 0x32C0 #endif /* EGL_EXT_protected_surface */ #ifndef EGL_EXT_stream_consumer_egloutput @@ -1413,14 +1773,43 @@ EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerOutputEXT (EGLDisplay dpy, EGLStr #endif #endif /* EGL_EXT_stream_consumer_egloutput */ +#ifndef EGL_EXT_surface_CTA861_3_metadata +#define EGL_EXT_surface_CTA861_3_metadata 1 +#define EGL_CTA861_3_MAX_CONTENT_LIGHT_LEVEL_EXT 0x3360 +#define EGL_CTA861_3_MAX_FRAME_AVERAGE_LEVEL_EXT 0x3361 +#endif /* EGL_EXT_surface_CTA861_3_metadata */ + +#ifndef EGL_EXT_surface_SMPTE2086_metadata +#define EGL_EXT_surface_SMPTE2086_metadata 1 +#define EGL_SMPTE2086_DISPLAY_PRIMARY_RX_EXT 0x3341 +#define EGL_SMPTE2086_DISPLAY_PRIMARY_RY_EXT 0x3342 +#define EGL_SMPTE2086_DISPLAY_PRIMARY_GX_EXT 0x3343 +#define EGL_SMPTE2086_DISPLAY_PRIMARY_GY_EXT 0x3344 +#define EGL_SMPTE2086_DISPLAY_PRIMARY_BX_EXT 0x3345 +#define EGL_SMPTE2086_DISPLAY_PRIMARY_BY_EXT 0x3346 +#define EGL_SMPTE2086_WHITE_POINT_X_EXT 0x3347 +#define EGL_SMPTE2086_WHITE_POINT_Y_EXT 0x3348 +#define EGL_SMPTE2086_MAX_LUMINANCE_EXT 0x3349 +#define EGL_SMPTE2086_MIN_LUMINANCE_EXT 0x334A +#define EGL_METADATA_SCALING_EXT 50000 +#endif /* EGL_EXT_surface_SMPTE2086_metadata */ + #ifndef EGL_EXT_swap_buffers_with_damage #define EGL_EXT_swap_buffers_with_damage 1 -typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSWITHDAMAGEEXTPROC) (EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSWITHDAMAGEEXTPROC) (EGLDisplay dpy, EGLSurface surface, const EGLint *rects, EGLint n_rects); #ifdef EGL_EGLEXT_PROTOTYPES -EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffersWithDamageEXT (EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects); +EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffersWithDamageEXT (EGLDisplay dpy, EGLSurface surface, const EGLint *rects, EGLint n_rects); #endif #endif /* EGL_EXT_swap_buffers_with_damage */ +#ifndef EGL_EXT_sync_reuse +#define EGL_EXT_sync_reuse 1 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLUNSIGNALSYNCEXTPROC) (EGLDisplay dpy, EGLSync sync, const EGLAttrib *attrib_list); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglUnsignalSyncEXT (EGLDisplay dpy, EGLSync sync, const EGLAttrib *attrib_list); +#endif +#endif /* EGL_EXT_sync_reuse */ + #ifndef EGL_EXT_yuv_surface #define EGL_EXT_yuv_surface 1 #define EGL_YUV_ORDER_EXT 0x3301 @@ -1481,6 +1870,12 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreatePixmapSurfaceHI (EGLDisplay dpy, EGLConfi #define EGL_CONTEXT_PRIORITY_LOW_IMG 0x3103 #endif /* EGL_IMG_context_priority */ +#ifndef EGL_IMG_image_plane_attribs +#define EGL_IMG_image_plane_attribs 1 +#define EGL_NATIVE_BUFFER_MULTIPLANE_SEPARATE_IMG 0x3105 +#define EGL_NATIVE_BUFFER_PLANE_OFFSET_IMG 0x3106 +#endif /* EGL_IMG_image_plane_attribs */ + #ifndef EGL_MESA_drm_image #define EGL_MESA_drm_image 1 #define EGL_DRM_BUFFER_FORMAT_MESA 0x31D0 @@ -1490,6 +1885,7 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreatePixmapSurfaceHI (EGLDisplay dpy, EGLConfi #define EGL_DRM_BUFFER_STRIDE_MESA 0x31D4 #define EGL_DRM_BUFFER_USE_SCANOUT_MESA 0x00000001 #define EGL_DRM_BUFFER_USE_SHARE_MESA 0x00000002 +#define EGL_DRM_BUFFER_USE_CURSOR_MESA 0x00000004 typedef EGLImageKHR (EGLAPIENTRYP PFNEGLCREATEDRMIMAGEMESAPROC) (EGLDisplay dpy, const EGLint *attrib_list); typedef EGLBoolean (EGLAPIENTRYP PFNEGLEXPORTDRMIMAGEMESAPROC) (EGLDisplay dpy, EGLImageKHR image, EGLint *name, EGLint *handle, EGLint *stride); #ifdef EGL_EGLEXT_PROTOTYPES @@ -1513,6 +1909,21 @@ EGLAPI EGLBoolean EGLAPIENTRY eglExportDMABUFImageMESA (EGLDisplay dpy, EGLImage #define EGL_PLATFORM_GBM_MESA 0x31D7 #endif /* EGL_MESA_platform_gbm */ +#ifndef EGL_MESA_platform_surfaceless +#define EGL_MESA_platform_surfaceless 1 +#define EGL_PLATFORM_SURFACELESS_MESA 0x31DD +#endif /* EGL_MESA_platform_surfaceless */ + +#ifndef EGL_MESA_query_driver +#define EGL_MESA_query_driver 1 +typedef char *(EGLAPIENTRYP PFNEGLGETDISPLAYDRIVERCONFIGPROC) (EGLDisplay dpy); +typedef const char *(EGLAPIENTRYP PFNEGLGETDISPLAYDRIVERNAMEPROC) (EGLDisplay dpy); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI char *EGLAPIENTRY eglGetDisplayDriverConfig (EGLDisplay dpy); +EGLAPI const char *EGLAPIENTRY eglGetDisplayDriverName (EGLDisplay dpy); +#endif +#endif /* EGL_MESA_query_driver */ + #ifndef EGL_NOK_swap_region #define EGL_NOK_swap_region 1 typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSREGIONNOKPROC) (EGLDisplay dpy, EGLSurface surface, EGLint numRects, const EGLint *rects); @@ -1539,6 +1950,11 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffersRegion2NOK (EGLDisplay dpy, EGLSurfa #define EGL_AUTO_STEREO_NV 0x3136 #endif /* EGL_NV_3dvision_surface */ +#ifndef EGL_NV_context_priority_realtime +#define EGL_NV_context_priority_realtime 1 +#define EGL_CONTEXT_PRIORITY_REALTIME_NV 0x3357 +#endif /* EGL_NV_context_priority_realtime */ + #ifndef EGL_NV_coverage_sample #define EGL_NV_coverage_sample 1 #define EGL_COVERAGE_BUFFERS_NV 0x30E0 @@ -1596,6 +2012,181 @@ EGLAPI EGLBoolean EGLAPIENTRY eglPostSubBufferNV (EGLDisplay dpy, EGLSurface sur #endif #endif /* EGL_NV_post_sub_buffer */ +#ifndef EGL_NV_quadruple_buffer +#define EGL_NV_quadruple_buffer 1 +#define EGL_QUADRUPLE_BUFFER_NV 0x3231 +#endif /* EGL_NV_quadruple_buffer */ + +#ifndef EGL_NV_robustness_video_memory_purge +#define EGL_NV_robustness_video_memory_purge 1 +#define EGL_GENERATE_RESET_ON_VIDEO_MEMORY_PURGE_NV 0x334C +#endif /* EGL_NV_robustness_video_memory_purge */ + +#ifndef EGL_NV_stream_consumer_eglimage +#define EGL_NV_stream_consumer_eglimage 1 +#define EGL_STREAM_CONSUMER_IMAGE_NV 0x3373 +#define EGL_STREAM_IMAGE_ADD_NV 0x3374 +#define EGL_STREAM_IMAGE_REMOVE_NV 0x3375 +#define EGL_STREAM_IMAGE_AVAILABLE_NV 0x3376 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMIMAGECONSUMERCONNECTNVPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLint num_modifiers, EGLuint64KHR *modifiers, EGLAttrib *attrib_list); +typedef EGLint (EGLAPIENTRYP PFNEGLQUERYSTREAMCONSUMEREVENTNVPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLTime timeout, EGLenum *event, EGLAttrib *aux); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMACQUIREIMAGENVPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLImage *pImage, EGLSync sync); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMRELEASEIMAGENVPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLImage image, EGLSync sync); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglStreamImageConsumerConnectNV (EGLDisplay dpy, EGLStreamKHR stream, EGLint num_modifiers, EGLuint64KHR *modifiers, EGLAttrib *attrib_list); +EGLAPI EGLint EGLAPIENTRY eglQueryStreamConsumerEventNV (EGLDisplay dpy, EGLStreamKHR stream, EGLTime timeout, EGLenum *event, EGLAttrib *aux); +EGLAPI EGLBoolean EGLAPIENTRY eglStreamAcquireImageNV (EGLDisplay dpy, EGLStreamKHR stream, EGLImage *pImage, EGLSync sync); +EGLAPI EGLBoolean EGLAPIENTRY eglStreamReleaseImageNV (EGLDisplay dpy, EGLStreamKHR stream, EGLImage image, EGLSync sync); +#endif +#endif /* EGL_NV_stream_consumer_eglimage */ + +#ifndef EGL_NV_stream_consumer_gltexture_yuv +#define EGL_NV_stream_consumer_gltexture_yuv 1 +#define EGL_YUV_PLANE0_TEXTURE_UNIT_NV 0x332C +#define EGL_YUV_PLANE1_TEXTURE_UNIT_NV 0x332D +#define EGL_YUV_PLANE2_TEXTURE_UNIT_NV 0x332E +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMCONSUMERGLTEXTUREEXTERNALATTRIBSNVPROC) (EGLDisplay dpy, EGLStreamKHR stream, const EGLAttrib *attrib_list); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerGLTextureExternalAttribsNV (EGLDisplay dpy, EGLStreamKHR stream, const EGLAttrib *attrib_list); +#endif +#endif /* EGL_NV_stream_consumer_gltexture_yuv */ + +#ifndef EGL_NV_stream_cross_display +#define EGL_NV_stream_cross_display 1 +#define EGL_STREAM_CROSS_DISPLAY_NV 0x334E +#endif /* EGL_NV_stream_cross_display */ + +#ifndef EGL_NV_stream_cross_object +#define EGL_NV_stream_cross_object 1 +#define EGL_STREAM_CROSS_OBJECT_NV 0x334D +#endif /* EGL_NV_stream_cross_object */ + +#ifndef EGL_NV_stream_cross_partition +#define EGL_NV_stream_cross_partition 1 +#define EGL_STREAM_CROSS_PARTITION_NV 0x323F +#endif /* EGL_NV_stream_cross_partition */ + +#ifndef EGL_NV_stream_cross_process +#define EGL_NV_stream_cross_process 1 +#define EGL_STREAM_CROSS_PROCESS_NV 0x3245 +#endif /* EGL_NV_stream_cross_process */ + +#ifndef EGL_NV_stream_cross_system +#define EGL_NV_stream_cross_system 1 +#define EGL_STREAM_CROSS_SYSTEM_NV 0x334F +#endif /* EGL_NV_stream_cross_system */ + +#ifndef EGL_NV_stream_dma +#define EGL_NV_stream_dma 1 +#define EGL_STREAM_DMA_NV 0x3371 +#define EGL_STREAM_DMA_SERVER_NV 0x3372 +#endif /* EGL_NV_stream_dma */ + +#ifndef EGL_NV_stream_fifo_next +#define EGL_NV_stream_fifo_next 1 +#define EGL_PENDING_FRAME_NV 0x3329 +#define EGL_STREAM_TIME_PENDING_NV 0x332A +#endif /* EGL_NV_stream_fifo_next */ + +#ifndef EGL_NV_stream_fifo_synchronous +#define EGL_NV_stream_fifo_synchronous 1 +#define EGL_STREAM_FIFO_SYNCHRONOUS_NV 0x3336 +#endif /* EGL_NV_stream_fifo_synchronous */ + +#ifndef EGL_NV_stream_flush +#define EGL_NV_stream_flush 1 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMFLUSHNVPROC) (EGLDisplay dpy, EGLStreamKHR stream); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglStreamFlushNV (EGLDisplay dpy, EGLStreamKHR stream); +#endif +#endif /* EGL_NV_stream_flush */ + +#ifndef EGL_NV_stream_frame_limits +#define EGL_NV_stream_frame_limits 1 +#define EGL_PRODUCER_MAX_FRAME_HINT_NV 0x3337 +#define EGL_CONSUMER_MAX_FRAME_HINT_NV 0x3338 +#endif /* EGL_NV_stream_frame_limits */ + +#ifndef EGL_NV_stream_metadata +#define EGL_NV_stream_metadata 1 +#define EGL_MAX_STREAM_METADATA_BLOCKS_NV 0x3250 +#define EGL_MAX_STREAM_METADATA_BLOCK_SIZE_NV 0x3251 +#define EGL_MAX_STREAM_METADATA_TOTAL_SIZE_NV 0x3252 +#define EGL_PRODUCER_METADATA_NV 0x3253 +#define EGL_CONSUMER_METADATA_NV 0x3254 +#define EGL_PENDING_METADATA_NV 0x3328 +#define EGL_METADATA0_SIZE_NV 0x3255 +#define EGL_METADATA1_SIZE_NV 0x3256 +#define EGL_METADATA2_SIZE_NV 0x3257 +#define EGL_METADATA3_SIZE_NV 0x3258 +#define EGL_METADATA0_TYPE_NV 0x3259 +#define EGL_METADATA1_TYPE_NV 0x325A +#define EGL_METADATA2_TYPE_NV 0x325B +#define EGL_METADATA3_TYPE_NV 0x325C +typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYDISPLAYATTRIBNVPROC) (EGLDisplay dpy, EGLint attribute, EGLAttrib *value); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSETSTREAMMETADATANVPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLint n, EGLint offset, EGLint size, const void *data); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSTREAMMETADATANVPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLenum name, EGLint n, EGLint offset, EGLint size, void *data); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglQueryDisplayAttribNV (EGLDisplay dpy, EGLint attribute, EGLAttrib *value); +EGLAPI EGLBoolean EGLAPIENTRY eglSetStreamMetadataNV (EGLDisplay dpy, EGLStreamKHR stream, EGLint n, EGLint offset, EGLint size, const void *data); +EGLAPI EGLBoolean EGLAPIENTRY eglQueryStreamMetadataNV (EGLDisplay dpy, EGLStreamKHR stream, EGLenum name, EGLint n, EGLint offset, EGLint size, void *data); +#endif +#endif /* EGL_NV_stream_metadata */ + +#ifndef EGL_NV_stream_origin +#define EGL_NV_stream_origin 1 +#define EGL_STREAM_FRAME_ORIGIN_X_NV 0x3366 +#define EGL_STREAM_FRAME_ORIGIN_Y_NV 0x3367 +#define EGL_STREAM_FRAME_MAJOR_AXIS_NV 0x3368 +#define EGL_CONSUMER_AUTO_ORIENTATION_NV 0x3369 +#define EGL_PRODUCER_AUTO_ORIENTATION_NV 0x336A +#define EGL_LEFT_NV 0x336B +#define EGL_RIGHT_NV 0x336C +#define EGL_TOP_NV 0x336D +#define EGL_BOTTOM_NV 0x336E +#define EGL_X_AXIS_NV 0x336F +#define EGL_Y_AXIS_NV 0x3370 +#endif /* EGL_NV_stream_origin */ + +#ifndef EGL_NV_stream_remote +#define EGL_NV_stream_remote 1 +#define EGL_STREAM_STATE_INITIALIZING_NV 0x3240 +#define EGL_STREAM_TYPE_NV 0x3241 +#define EGL_STREAM_PROTOCOL_NV 0x3242 +#define EGL_STREAM_ENDPOINT_NV 0x3243 +#define EGL_STREAM_LOCAL_NV 0x3244 +#define EGL_STREAM_PRODUCER_NV 0x3247 +#define EGL_STREAM_CONSUMER_NV 0x3248 +#define EGL_STREAM_PROTOCOL_FD_NV 0x3246 +#endif /* EGL_NV_stream_remote */ + +#ifndef EGL_NV_stream_reset +#define EGL_NV_stream_reset 1 +#define EGL_SUPPORT_RESET_NV 0x3334 +#define EGL_SUPPORT_REUSE_NV 0x3335 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLRESETSTREAMNVPROC) (EGLDisplay dpy, EGLStreamKHR stream); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglResetStreamNV (EGLDisplay dpy, EGLStreamKHR stream); +#endif +#endif /* EGL_NV_stream_reset */ + +#ifndef EGL_NV_stream_socket +#define EGL_NV_stream_socket 1 +#define EGL_STREAM_PROTOCOL_SOCKET_NV 0x324B +#define EGL_SOCKET_HANDLE_NV 0x324C +#define EGL_SOCKET_TYPE_NV 0x324D +#endif /* EGL_NV_stream_socket */ + +#ifndef EGL_NV_stream_socket_inet +#define EGL_NV_stream_socket_inet 1 +#define EGL_SOCKET_TYPE_INET_NV 0x324F +#endif /* EGL_NV_stream_socket_inet */ + +#ifndef EGL_NV_stream_socket_unix +#define EGL_NV_stream_socket_unix 1 +#define EGL_SOCKET_TYPE_UNIX_NV 0x324E +#endif /* EGL_NV_stream_socket_unix */ + #ifndef EGL_NV_stream_sync #define EGL_NV_stream_sync 1 #define EGL_SYNC_NEW_FRAME_NV 0x321F @@ -1622,7 +2213,7 @@ typedef khronos_utime_nanoseconds_t EGLTimeNV; #define EGL_SYNC_TYPE_NV 0x30ED #define EGL_SYNC_CONDITION_NV 0x30EE #define EGL_SYNC_FENCE_NV 0x30EF -#define EGL_NO_SYNC_NV ((EGLSyncNV)0) +#define EGL_NO_SYNC_NV EGL_CAST(EGLSyncNV,0) typedef EGLSyncNV (EGLAPIENTRYP PFNEGLCREATEFENCESYNCNVPROC) (EGLDisplay dpy, EGLenum condition, const EGLint *attrib_list); typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYSYNCNVPROC) (EGLSyncNV sync); typedef EGLBoolean (EGLAPIENTRYP PFNEGLFENCENVPROC) (EGLSyncNV sync); @@ -1653,6 +2244,11 @@ EGLAPI EGLuint64NV EGLAPIENTRY eglGetSystemTimeNV (void); #endif /* KHRONOS_SUPPORT_INT64 */ #endif /* EGL_NV_system_time */ +#ifndef EGL_NV_triple_buffer +#define EGL_NV_triple_buffer 1 +#define EGL_TRIPLE_BUFFER_NV 0x3230 +#endif /* EGL_NV_triple_buffer */ + #ifndef EGL_TIZEN_image_native_buffer #define EGL_TIZEN_image_native_buffer 1 #define EGL_NATIVE_BUFFER_TIZEN 0x32A0 @@ -1663,11 +2259,44 @@ EGLAPI EGLuint64NV EGLAPIENTRY eglGetSystemTimeNV (void); #define EGL_NATIVE_SURFACE_TIZEN 0x32A1 #endif /* EGL_TIZEN_image_native_surface */ +#ifndef EGL_WL_bind_wayland_display +#define EGL_WL_bind_wayland_display 1 +#define PFNEGLBINDWAYLANDDISPLAYWL PFNEGLBINDWAYLANDDISPLAYWLPROC +#define PFNEGLUNBINDWAYLANDDISPLAYWL PFNEGLUNBINDWAYLANDDISPLAYWLPROC +#define PFNEGLQUERYWAYLANDBUFFERWL PFNEGLQUERYWAYLANDBUFFERWLPROC +struct wl_display; +struct wl_resource; +#define EGL_WAYLAND_BUFFER_WL 0x31D5 +#define EGL_WAYLAND_PLANE_WL 0x31D6 +#define EGL_TEXTURE_Y_U_V_WL 0x31D7 +#define EGL_TEXTURE_Y_UV_WL 0x31D8 +#define EGL_TEXTURE_Y_XUXV_WL 0x31D9 +#define EGL_TEXTURE_EXTERNAL_WL 0x31DA +#define EGL_WAYLAND_Y_INVERTED_WL 0x31DB +typedef EGLBoolean (EGLAPIENTRYP PFNEGLBINDWAYLANDDISPLAYWLPROC) (EGLDisplay dpy, struct wl_display *display); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLUNBINDWAYLANDDISPLAYWLPROC) (EGLDisplay dpy, struct wl_display *display); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYWAYLANDBUFFERWLPROC) (EGLDisplay dpy, struct wl_resource *buffer, EGLint attribute, EGLint *value); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglBindWaylandDisplayWL (EGLDisplay dpy, struct wl_display *display); +EGLAPI EGLBoolean EGLAPIENTRY eglUnbindWaylandDisplayWL (EGLDisplay dpy, struct wl_display *display); +EGLAPI EGLBoolean EGLAPIENTRY eglQueryWaylandBufferWL (EGLDisplay dpy, struct wl_resource *buffer, EGLint attribute, EGLint *value); +#endif +#endif /* EGL_WL_bind_wayland_display */ + +#ifndef EGL_WL_create_wayland_buffer_from_image +#define EGL_WL_create_wayland_buffer_from_image 1 +#define PFNEGLCREATEWAYLANDBUFFERFROMIMAGEWL PFNEGLCREATEWAYLANDBUFFERFROMIMAGEWLPROC +struct wl_buffer; +typedef struct wl_buffer *(EGLAPIENTRYP PFNEGLCREATEWAYLANDBUFFERFROMIMAGEWLPROC) (EGLDisplay dpy, EGLImageKHR image); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI struct wl_buffer *EGLAPIENTRY eglCreateWaylandBufferFromImageWL (EGLDisplay dpy, EGLImageKHR image); +#endif +#endif /* EGL_WL_create_wayland_buffer_from_image */ + #ifdef __cplusplus } #endif #endif /* __eglext_h_ */ - #endif /* _MSC_VER */ diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_endian.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_endian.h index 54d5d486d..46c296253 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_endian.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_endian.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -30,6 +30,23 @@ #include "SDL_stdinc.h" +#if defined(_MSC_VER) && (_MSC_VER >= 1400) +/* As of Clang 11, '_m_prefetchw' is conflicting with the winnt.h's version, + so we define the needed '_m_prefetch' here as a pseudo-header, until the issue is fixed. */ +#ifdef __clang__ +#ifndef __PRFCHWINTRIN_H +#define __PRFCHWINTRIN_H +static __inline__ void __attribute__((__always_inline__, __nodebug__)) +_m_prefetch(void *__P) +{ + __builtin_prefetch (__P, 0, 3 /* _MM_HINT_T0 */); +} +#endif /* __PRFCHWINTRIN_H */ +#endif /* __clang__ */ + +#include +#endif + /** * \name The two types of endianness */ @@ -42,10 +59,16 @@ #ifdef __linux__ #include #define SDL_BYTEORDER __BYTE_ORDER -#else /* __linux__ */ +#elif defined(__OpenBSD__) +#include +#define SDL_BYTEORDER BYTE_ORDER +#elif defined(__FreeBSD__) || defined(__NetBSD__) +#include +#define SDL_BYTEORDER BYTE_ORDER +#else #if defined(__hppa__) || \ defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || \ - (defined(__MIPS__) && defined(__MISPEB__)) || \ + (defined(__MIPS__) && defined(__MIPSEB__)) || \ defined(__ppc__) || defined(__POWERPC__) || defined(_M_PPC) || \ defined(__sparc__) #define SDL_BYTEORDER SDL_BIG_ENDIAN @@ -65,22 +88,45 @@ extern "C" { /** * \file SDL_endian.h */ -#if defined(__GNUC__) && defined(__i386__) && \ - !(__GNUC__ == 2 && __GNUC_MINOR__ == 95 /* broken gcc version */) + +/* various modern compilers may have builtin swap */ +#if defined(__GNUC__) || defined(__clang__) +# define HAS_BUILTIN_BSWAP16 (_SDL_HAS_BUILTIN(__builtin_bswap16)) || \ + (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)) +# define HAS_BUILTIN_BSWAP32 (_SDL_HAS_BUILTIN(__builtin_bswap32)) || \ + (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) +# define HAS_BUILTIN_BSWAP64 (_SDL_HAS_BUILTIN(__builtin_bswap64)) || \ + (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) + + /* this one is broken */ +# define HAS_BROKEN_BSWAP (__GNUC__ == 2 && __GNUC_MINOR__ <= 95) +#else +# define HAS_BUILTIN_BSWAP16 0 +# define HAS_BUILTIN_BSWAP32 0 +# define HAS_BUILTIN_BSWAP64 0 +# define HAS_BROKEN_BSWAP 0 +#endif + +#if HAS_BUILTIN_BSWAP16 +#define SDL_Swap16(x) __builtin_bswap16(x) +#elif defined(_MSC_VER) && (_MSC_VER >= 1400) +#pragma intrinsic(_byteswap_ushort) +#define SDL_Swap16(x) _byteswap_ushort(x) +#elif defined(__i386__) && !HAS_BROKEN_BSWAP SDL_FORCE_INLINE Uint16 SDL_Swap16(Uint16 x) { __asm__("xchgb %b0,%h0": "=q"(x):"0"(x)); return x; } -#elif defined(__GNUC__) && defined(__x86_64__) +#elif defined(__x86_64__) SDL_FORCE_INLINE Uint16 SDL_Swap16(Uint16 x) { __asm__("xchgb %b0,%h0": "=Q"(x):"0"(x)); return x; } -#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__)) +#elif (defined(__powerpc__) || defined(__ppc__)) SDL_FORCE_INLINE Uint16 SDL_Swap16(Uint16 x) { @@ -89,7 +135,7 @@ SDL_Swap16(Uint16 x) __asm__("rlwimi %0,%2,8,16,23": "=&r"(result):"0"(x >> 8), "r"(x)); return (Uint16)result; } -#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__) +#elif (defined(__m68k__) && !defined(__mcoldfire__)) SDL_FORCE_INLINE Uint16 SDL_Swap16(Uint16 x) { @@ -97,7 +143,7 @@ SDL_Swap16(Uint16 x) return x; } #elif defined(__WATCOMC__) && defined(__386__) -extern _inline Uint16 SDL_Swap16(Uint16); +extern __inline Uint16 SDL_Swap16(Uint16); #pragma aux SDL_Swap16 = \ "xchg al, ah" \ parm [ax] \ @@ -110,32 +156,37 @@ SDL_Swap16(Uint16 x) } #endif -#if defined(__GNUC__) && defined(__i386__) +#if HAS_BUILTIN_BSWAP32 +#define SDL_Swap32(x) __builtin_bswap32(x) +#elif defined(_MSC_VER) && (_MSC_VER >= 1400) +#pragma intrinsic(_byteswap_ulong) +#define SDL_Swap32(x) _byteswap_ulong(x) +#elif defined(__i386__) && !HAS_BROKEN_BSWAP SDL_FORCE_INLINE Uint32 SDL_Swap32(Uint32 x) { __asm__("bswap %0": "=r"(x):"0"(x)); return x; } -#elif defined(__GNUC__) && defined(__x86_64__) +#elif defined(__x86_64__) SDL_FORCE_INLINE Uint32 SDL_Swap32(Uint32 x) { __asm__("bswapl %0": "=r"(x):"0"(x)); return x; } -#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__)) +#elif (defined(__powerpc__) || defined(__ppc__)) SDL_FORCE_INLINE Uint32 SDL_Swap32(Uint32 x) { Uint32 result; - __asm__("rlwimi %0,%2,24,16,23": "=&r"(result):"0"(x >> 24), "r"(x)); - __asm__("rlwimi %0,%2,8,8,15": "=&r"(result):"0"(result), "r"(x)); - __asm__("rlwimi %0,%2,24,0,7": "=&r"(result):"0"(result), "r"(x)); + __asm__("rlwimi %0,%2,24,16,23": "=&r"(result): "0" (x>>24), "r"(x)); + __asm__("rlwimi %0,%2,8,8,15" : "=&r"(result): "0" (result), "r"(x)); + __asm__("rlwimi %0,%2,24,0,7" : "=&r"(result): "0" (result), "r"(x)); return result; } -#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__) +#elif (defined(__m68k__) && !defined(__mcoldfire__)) SDL_FORCE_INLINE Uint32 SDL_Swap32(Uint32 x) { @@ -143,20 +194,11 @@ SDL_Swap32(Uint32 x) return x; } #elif defined(__WATCOMC__) && defined(__386__) -extern _inline Uint32 SDL_Swap32(Uint32); -#ifndef __SW_3 /* 486+ */ +extern __inline Uint32 SDL_Swap32(Uint32); #pragma aux SDL_Swap32 = \ "bswap eax" \ parm [eax] \ modify [eax]; -#else /* 386-only */ -#pragma aux SDL_Swap32 = \ - "xchg al, ah" \ - "ror eax, 16" \ - "xchg al, ah" \ - parm [eax] \ - modify [eax]; -#endif #else SDL_FORCE_INLINE Uint32 SDL_Swap32(Uint32 x) @@ -166,31 +208,42 @@ SDL_Swap32(Uint32 x) } #endif -#if defined(__GNUC__) && defined(__i386__) +#if HAS_BUILTIN_BSWAP64 +#define SDL_Swap64(x) __builtin_bswap64(x) +#elif defined(_MSC_VER) && (_MSC_VER >= 1400) +#pragma intrinsic(_byteswap_uint64) +#define SDL_Swap64(x) _byteswap_uint64(x) +#elif defined(__i386__) && !HAS_BROKEN_BSWAP SDL_FORCE_INLINE Uint64 SDL_Swap64(Uint64 x) { - union - { - struct - { + union { + struct { Uint32 a, b; } s; Uint64 u; } v; v.u = x; - __asm__("bswapl %0 ; bswapl %1 ; xchgl %0,%1": "=r"(v.s.a), "=r"(v.s.b):"0"(v.s.a), - "1"(v.s. - b)); + __asm__("bswapl %0 ; bswapl %1 ; xchgl %0,%1" + : "=r"(v.s.a), "=r"(v.s.b) + : "0" (v.s.a), "1"(v.s.b)); return v.u; } -#elif defined(__GNUC__) && defined(__x86_64__) +#elif defined(__x86_64__) SDL_FORCE_INLINE Uint64 SDL_Swap64(Uint64 x) { __asm__("bswapq %0": "=r"(x):"0"(x)); return x; } +#elif defined(__WATCOMC__) && defined(__386__) +extern __inline Uint64 SDL_Swap64(Uint64); +#pragma aux SDL_Swap64 = \ + "bswap eax" \ + "bswap edx" \ + "xchg eax,edx" \ + parm [eax edx] \ + modify [eax edx]; #else SDL_FORCE_INLINE Uint64 SDL_Swap64(Uint64 x) @@ -212,8 +265,7 @@ SDL_Swap64(Uint64 x) SDL_FORCE_INLINE float SDL_SwapFloat(float x) { - union - { + union { float f; Uint32 ui32; } swapper; @@ -222,6 +274,11 @@ SDL_SwapFloat(float x) return swapper.f; } +/* remove extra macros */ +#undef HAS_BROKEN_BSWAP +#undef HAS_BUILTIN_BSWAP16 +#undef HAS_BUILTIN_BSWAP32 +#undef HAS_BUILTIN_BSWAP64 /** * \name Swap to native @@ -229,22 +286,22 @@ SDL_SwapFloat(float x) */ /* @{ */ #if SDL_BYTEORDER == SDL_LIL_ENDIAN -#define SDL_SwapLE16(X) (X) -#define SDL_SwapLE32(X) (X) -#define SDL_SwapLE64(X) (X) +#define SDL_SwapLE16(X) (X) +#define SDL_SwapLE32(X) (X) +#define SDL_SwapLE64(X) (X) #define SDL_SwapFloatLE(X) (X) -#define SDL_SwapBE16(X) SDL_Swap16(X) -#define SDL_SwapBE32(X) SDL_Swap32(X) -#define SDL_SwapBE64(X) SDL_Swap64(X) +#define SDL_SwapBE16(X) SDL_Swap16(X) +#define SDL_SwapBE32(X) SDL_Swap32(X) +#define SDL_SwapBE64(X) SDL_Swap64(X) #define SDL_SwapFloatBE(X) SDL_SwapFloat(X) #else -#define SDL_SwapLE16(X) SDL_Swap16(X) -#define SDL_SwapLE32(X) SDL_Swap32(X) -#define SDL_SwapLE64(X) SDL_Swap64(X) +#define SDL_SwapLE16(X) SDL_Swap16(X) +#define SDL_SwapLE32(X) SDL_Swap32(X) +#define SDL_SwapLE64(X) SDL_Swap64(X) #define SDL_SwapFloatLE(X) SDL_SwapFloat(X) -#define SDL_SwapBE16(X) (X) -#define SDL_SwapBE32(X) (X) -#define SDL_SwapBE64(X) (X) +#define SDL_SwapBE16(X) (X) +#define SDL_SwapBE32(X) (X) +#define SDL_SwapBE64(X) (X) #define SDL_SwapFloatBE(X) (X) #endif /* @} *//* Swap to native */ diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_error.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_error.h index 24416e693..5c961e428 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_error.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_error.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -37,9 +37,96 @@ extern "C" { #endif /* Public functions */ -/* SDL_SetError() unconditionally returns -1. */ + + +/** + * Set the SDL error message for the current thread. + * + * Calling this function will replace any previous error message that was set. + * + * This function always returns -1, since SDL frequently uses -1 to signify an + * failing result, leading to this idiom: + * + * ```c + * if (error_code) { + * return SDL_SetError("This operation has failed: %d", error_code); + * } + * ``` + * + * \param fmt a printf()-style message format string + * \param ... additional parameters matching % tokens in the `fmt` string, if + * any + * \returns always -1. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ClearError + * \sa SDL_GetError + */ extern DECLSPEC int SDLCALL SDL_SetError(SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(1); + +/** + * Retrieve a message about the last error that occurred on the current + * thread. + * + * It is possible for multiple errors to occur before calling SDL_GetError(). + * Only the last error is returned. + * + * The message is only applicable when an SDL function has signaled an error. + * You must check the return values of SDL function calls to determine when to + * appropriately call SDL_GetError(). You should *not* use the results of + * SDL_GetError() to decide if an error has occurred! Sometimes SDL will set + * an error string even when reporting success. + * + * SDL will *not* clear the error string for successful API calls. You *must* + * check return values for failure cases before you can assume the error + * string applies. + * + * Error strings are set per-thread, so an error set in a different thread + * will not interfere with the current thread's operation. + * + * The returned string is internally allocated and must not be freed by the + * application. + * + * \returns a message with information about the specific error that occurred, + * or an empty string if there hasn't been an error message set since + * the last call to SDL_ClearError(). The message is only applicable + * when an SDL function has signaled an error. You must check the + * return values of SDL function calls to determine when to + * appropriately call SDL_GetError(). + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ClearError + * \sa SDL_SetError + */ extern DECLSPEC const char *SDLCALL SDL_GetError(void); + +/** + * Get the last error message that was set for the current thread. + * + * This allows the caller to copy the error string into a provided buffer, but + * otherwise operates exactly the same as SDL_GetError(). + * + * \param errstr A buffer to fill with the last error message that was set for + * the current thread + * \param maxlen The size of the buffer pointed to by the errstr parameter + * \returns the pointer passed in as the `errstr` parameter. + * + * \since This function is available since SDL 2.0.14. + * + * \sa SDL_GetError + */ +extern DECLSPEC char * SDLCALL SDL_GetErrorMsg(char *errstr, int maxlen); + +/** + * Clear any previous error message for this thread. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetError + * \sa SDL_SetError + */ extern DECLSPEC void SDLCALL SDL_ClearError(void); /** diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_events.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_events.h index 282b9fb76..3722a6311 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_events.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_events.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -50,7 +50,7 @@ extern "C" { #define SDL_PRESSED 1 /** - * \brief The types of events that can be delivered. + * The types of events that can be delivered. */ typedef enum { @@ -85,6 +85,8 @@ typedef enum Called on Android in onResume() */ + SDL_LOCALECHANGED, /**< The user's locale preferences have changed. */ + /* Display events */ SDL_DISPLAYEVENT = 0x150, /**< Display state change */ @@ -123,6 +125,10 @@ typedef enum SDL_CONTROLLERDEVICEADDED, /**< A new Game controller has been inserted into the system */ SDL_CONTROLLERDEVICEREMOVED, /**< An opened Game controller has been removed */ SDL_CONTROLLERDEVICEREMAPPED, /**< The controller mapping was updated */ + SDL_CONTROLLERTOUCHPADDOWN, /**< Game controller touchpad was touched */ + SDL_CONTROLLERTOUCHPADMOTION, /**< Game controller touchpad finger was moved */ + SDL_CONTROLLERTOUCHPADUP, /**< Game controller touchpad finger was lifted */ + SDL_CONTROLLERSENSORUPDATE, /**< Game controller sensor was updated */ /* Touch events */ SDL_FINGERDOWN = 0x700, @@ -154,6 +160,9 @@ typedef enum SDL_RENDER_TARGETS_RESET = 0x2000, /**< The render targets have been reset and their contents need to be updated */ SDL_RENDER_DEVICE_RESET, /**< The device has been reset and all textures need to be recreated */ + /* Internal events */ + SDL_POLLSENTINEL = 0x7F00, /**< Signals the end of an event poll cycle */ + /** Events ::SDL_USEREVENT through ::SDL_LASTEVENT are for your use, * and should be allocated with SDL_RegisterEvents() */ @@ -292,6 +301,8 @@ typedef struct SDL_MouseWheelEvent Sint32 x; /**< The amount scrolled horizontally, positive to the right and negative to the left */ Sint32 y; /**< The amount scrolled vertically, positive away from the user and negative toward the user */ Uint32 direction; /**< Set to one of the SDL_MOUSEWHEEL_* defines. When FLIPPED the values in X and Y will be opposite. Multiply by -1 to change them back */ + float preciseX; /**< The amount scrolled horizontally, positive to the right and negative to the left, with float precision (added in 2.0.18) */ + float preciseY; /**< The amount scrolled vertically, positive away from the user and negative toward the user, with float precision (added in 2.0.18) */ } SDL_MouseWheelEvent; /** @@ -413,6 +424,33 @@ typedef struct SDL_ControllerDeviceEvent Sint32 which; /**< The joystick device index for the ADDED event, instance id for the REMOVED or REMAPPED event */ } SDL_ControllerDeviceEvent; +/** + * \brief Game controller touchpad event structure (event.ctouchpad.*) + */ +typedef struct SDL_ControllerTouchpadEvent +{ + Uint32 type; /**< ::SDL_CONTROLLERTOUCHPADDOWN or ::SDL_CONTROLLERTOUCHPADMOTION or ::SDL_CONTROLLERTOUCHPADUP */ + Uint32 timestamp; /**< In milliseconds, populated using SDL_GetTicks() */ + SDL_JoystickID which; /**< The joystick instance id */ + Sint32 touchpad; /**< The index of the touchpad */ + Sint32 finger; /**< The index of the finger on the touchpad */ + float x; /**< Normalized in the range 0...1 with 0 being on the left */ + float y; /**< Normalized in the range 0...1 with 0 being at the top */ + float pressure; /**< Normalized in the range 0...1 */ +} SDL_ControllerTouchpadEvent; + +/** + * \brief Game controller sensor event structure (event.csensor.*) + */ +typedef struct SDL_ControllerSensorEvent +{ + Uint32 type; /**< ::SDL_CONTROLLERSENSORUPDATE */ + Uint32 timestamp; /**< In milliseconds, populated using SDL_GetTicks() */ + SDL_JoystickID which; /**< The joystick instance id */ + Sint32 sensor; /**< The type of the sensor, one of the values of ::SDL_SensorType */ + float data[3]; /**< Up to 3 values from the sensor, as defined in SDL_sensor.h */ +} SDL_ControllerSensorEvent; + /** * \brief Audio device event structure (event.adevice.*) */ @@ -442,6 +480,7 @@ typedef struct SDL_TouchFingerEvent float dx; /**< Normalized in the range -1...1 */ float dy; /**< Normalized in the range -1...1 */ float pressure; /**< Normalized in the range 0...1 */ + Uint32 windowID; /**< The window underneath the finger, if any */ } SDL_TouchFingerEvent; @@ -556,56 +595,79 @@ typedef struct SDL_SysWMEvent */ typedef union SDL_Event { - Uint32 type; /**< Event type, shared with all events */ - SDL_CommonEvent common; /**< Common event data */ - SDL_DisplayEvent display; /**< Window event data */ - SDL_WindowEvent window; /**< Window event data */ - SDL_KeyboardEvent key; /**< Keyboard event data */ - SDL_TextEditingEvent edit; /**< Text editing event data */ - SDL_TextInputEvent text; /**< Text input event data */ - SDL_MouseMotionEvent motion; /**< Mouse motion event data */ - SDL_MouseButtonEvent button; /**< Mouse button event data */ - SDL_MouseWheelEvent wheel; /**< Mouse wheel event data */ - SDL_JoyAxisEvent jaxis; /**< Joystick axis event data */ - SDL_JoyBallEvent jball; /**< Joystick ball event data */ - SDL_JoyHatEvent jhat; /**< Joystick hat event data */ - SDL_JoyButtonEvent jbutton; /**< Joystick button event data */ - SDL_JoyDeviceEvent jdevice; /**< Joystick device change event data */ - SDL_ControllerAxisEvent caxis; /**< Game Controller axis event data */ - SDL_ControllerButtonEvent cbutton; /**< Game Controller button event data */ - SDL_ControllerDeviceEvent cdevice; /**< Game Controller device event data */ - SDL_AudioDeviceEvent adevice; /**< Audio device event data */ - SDL_SensorEvent sensor; /**< Sensor event data */ - SDL_QuitEvent quit; /**< Quit request event data */ - SDL_UserEvent user; /**< Custom event data */ - SDL_SysWMEvent syswm; /**< System dependent window event data */ - SDL_TouchFingerEvent tfinger; /**< Touch finger event data */ - SDL_MultiGestureEvent mgesture; /**< Gesture event data */ - SDL_DollarGestureEvent dgesture; /**< Gesture event data */ - SDL_DropEvent drop; /**< Drag and drop event data */ + Uint32 type; /**< Event type, shared with all events */ + SDL_CommonEvent common; /**< Common event data */ + SDL_DisplayEvent display; /**< Display event data */ + SDL_WindowEvent window; /**< Window event data */ + SDL_KeyboardEvent key; /**< Keyboard event data */ + SDL_TextEditingEvent edit; /**< Text editing event data */ + SDL_TextInputEvent text; /**< Text input event data */ + SDL_MouseMotionEvent motion; /**< Mouse motion event data */ + SDL_MouseButtonEvent button; /**< Mouse button event data */ + SDL_MouseWheelEvent wheel; /**< Mouse wheel event data */ + SDL_JoyAxisEvent jaxis; /**< Joystick axis event data */ + SDL_JoyBallEvent jball; /**< Joystick ball event data */ + SDL_JoyHatEvent jhat; /**< Joystick hat event data */ + SDL_JoyButtonEvent jbutton; /**< Joystick button event data */ + SDL_JoyDeviceEvent jdevice; /**< Joystick device change event data */ + SDL_ControllerAxisEvent caxis; /**< Game Controller axis event data */ + SDL_ControllerButtonEvent cbutton; /**< Game Controller button event data */ + SDL_ControllerDeviceEvent cdevice; /**< Game Controller device event data */ + SDL_ControllerTouchpadEvent ctouchpad; /**< Game Controller touchpad event data */ + SDL_ControllerSensorEvent csensor; /**< Game Controller sensor event data */ + SDL_AudioDeviceEvent adevice; /**< Audio device event data */ + SDL_SensorEvent sensor; /**< Sensor event data */ + SDL_QuitEvent quit; /**< Quit request event data */ + SDL_UserEvent user; /**< Custom event data */ + SDL_SysWMEvent syswm; /**< System dependent window event data */ + SDL_TouchFingerEvent tfinger; /**< Touch finger event data */ + SDL_MultiGestureEvent mgesture; /**< Gesture event data */ + SDL_DollarGestureEvent dgesture; /**< Gesture event data */ + SDL_DropEvent drop; /**< Drag and drop event data */ - /* This is necessary for ABI compatibility between Visual C++ and GCC - Visual C++ will respect the push pack pragma and use 52 bytes for - this structure, and GCC will use the alignment of the largest datatype - within the union, which is 8 bytes. + /* This is necessary for ABI compatibility between Visual C++ and GCC. + Visual C++ will respect the push pack pragma and use 52 bytes (size of + SDL_TextEditingEvent, the largest structure for 32-bit and 64-bit + architectures) for this union, and GCC will use the alignment of the + largest datatype within the union, which is 8 bytes on 64-bit + architectures. So... we'll add padding to force the size to be 56 bytes for both. + + On architectures where pointers are 16 bytes, this needs rounding up to + the next multiple of 16, 64, and on architectures where pointers are + even larger the size of SDL_UserEvent will dominate as being 3 pointers. */ - Uint8 padding[56]; + Uint8 padding[sizeof(void *) <= 8 ? 56 : sizeof(void *) == 16 ? 64 : 3 * sizeof(void *)]; } SDL_Event; /* Make sure we haven't broken binary compatibility */ -SDL_COMPILE_TIME_ASSERT(SDL_Event, sizeof(SDL_Event) == 56); +SDL_COMPILE_TIME_ASSERT(SDL_Event, sizeof(SDL_Event) == sizeof(((SDL_Event *)NULL)->padding)); /* Function prototypes */ /** - * Pumps the event loop, gathering events from the input devices. + * Pump the event loop, gathering events from the input devices. * - * This function updates the event queue and internal input device state. + * This function updates the event queue and internal input device state. * - * This should only be run in the thread that sets the video mode. + * **WARNING**: This should only be run in the thread that initialized the + * video subsystem, and for extra safety, you should consider only doing those + * things on the main thread in any case. + * + * SDL_PumpEvents() gathers all the pending input information from devices and + * places it in the event queue. Without calls to SDL_PumpEvents() no events + * would ever be placed on the queue. Often the need for calls to + * SDL_PumpEvents() is hidden from the user since SDL_PollEvent() and + * SDL_WaitEvent() implicitly call SDL_PumpEvents(). However, if you are not + * polling or waiting for events (e.g. you are filtering them), then you must + * call SDL_PumpEvents() to force an event queue update. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_PollEvent + * \sa SDL_WaitEvent */ extern DECLSPEC void SDLCALL SDL_PumpEvents(void); @@ -618,22 +680,42 @@ typedef enum } SDL_eventaction; /** - * Checks the event queue for messages and optionally returns them. + * Check the event queue for messages and optionally return them. * - * If \c action is ::SDL_ADDEVENT, up to \c numevents events will be added to - * the back of the event queue. + * `action` may be any of the following: * - * If \c action is ::SDL_PEEKEVENT, up to \c numevents events at the front - * of the event queue, within the specified minimum and maximum type, - * will be returned and will not be removed from the queue. + * - `SDL_ADDEVENT`: up to `numevents` events will be added to the back of the + * event queue. + * - `SDL_PEEKEVENT`: `numevents` events at the front of the event queue, + * within the specified minimum and maximum type, will be returned to the + * caller and will _not_ be removed from the queue. + * - `SDL_GETEVENT`: up to `numevents` events at the front of the event queue, + * within the specified minimum and maximum type, will be returned to the + * caller and will be removed from the queue. * - * If \c action is ::SDL_GETEVENT, up to \c numevents events at the front - * of the event queue, within the specified minimum and maximum type, - * will be returned and will be removed from the queue. + * You may have to call SDL_PumpEvents() before calling this function. + * Otherwise, the events may not be ready to be filtered when you call + * SDL_PeepEvents(). * - * \return The number of events actually stored, or -1 if there was an error. + * This function is thread-safe. * - * This function is thread-safe. + * \param events destination buffer for the retrieved events + * \param numevents if action is SDL_ADDEVENT, the number of events to add + * back to the event queue; if action is SDL_PEEKEVENT or + * SDL_GETEVENT, the maximum number of events to retrieve + * \param action action to take; see [[#action|Remarks]] for details + * \param minType minimum value of the event type to be considered; + * SDL_FIRSTEVENT is a safe choice + * \param maxType maximum value of the event type to be considered; + * SDL_LASTEVENT is a safe choice + * \returns the number of events actually stored or a negative error code on + * failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_PollEvent + * \sa SDL_PumpEvents + * \sa SDL_PushEvent */ extern DECLSPEC int SDLCALL SDL_PeepEvents(SDL_Event * events, int numevents, SDL_eventaction action, @@ -641,113 +723,354 @@ extern DECLSPEC int SDLCALL SDL_PeepEvents(SDL_Event * events, int numevents, /* @} */ /** - * Checks to see if certain event types are in the event queue. + * Check for the existence of a certain event type in the event queue. + * + * If you need to check for a range of event types, use SDL_HasEvents() + * instead. + * + * \param type the type of event to be queried; see SDL_EventType for details + * \returns SDL_TRUE if events matching `type` are present, or SDL_FALSE if + * events matching `type` are not present. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HasEvents */ extern DECLSPEC SDL_bool SDLCALL SDL_HasEvent(Uint32 type); + + +/** + * Check for the existence of certain event types in the event queue. + * + * If you need to check for a single event type, use SDL_HasEvent() instead. + * + * \param minType the low end of event type to be queried, inclusive; see + * SDL_EventType for details + * \param maxType the high end of event type to be queried, inclusive; see + * SDL_EventType for details + * \returns SDL_TRUE if events with type >= `minType` and <= `maxType` are + * present, or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HasEvents + */ extern DECLSPEC SDL_bool SDLCALL SDL_HasEvents(Uint32 minType, Uint32 maxType); /** - * This function clears events from the event queue - * This function only affects currently queued events. If you want to make - * sure that all pending OS events are flushed, you can call SDL_PumpEvents() - * on the main thread immediately before the flush call. + * Clear events of a specific type from the event queue. + * + * This will unconditionally remove any events from the queue that match + * `type`. If you need to remove a range of event types, use SDL_FlushEvents() + * instead. + * + * It's also normal to just ignore events you don't care about in your event + * loop without calling this function. + * + * This function only affects currently queued events. If you want to make + * sure that all pending OS events are flushed, you can call SDL_PumpEvents() + * on the main thread immediately before the flush call. + * + * \param type the type of event to be cleared; see SDL_EventType for details + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_FlushEvents */ extern DECLSPEC void SDLCALL SDL_FlushEvent(Uint32 type); + +/** + * Clear events of a range of types from the event queue. + * + * This will unconditionally remove any events from the queue that are in the + * range of `minType` to `maxType`, inclusive. If you need to remove a single + * event type, use SDL_FlushEvent() instead. + * + * It's also normal to just ignore events you don't care about in your event + * loop without calling this function. + * + * This function only affects currently queued events. If you want to make + * sure that all pending OS events are flushed, you can call SDL_PumpEvents() + * on the main thread immediately before the flush call. + * + * \param minType the low end of event type to be cleared, inclusive; see + * SDL_EventType for details + * \param maxType the high end of event type to be cleared, inclusive; see + * SDL_EventType for details + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_FlushEvent + */ extern DECLSPEC void SDLCALL SDL_FlushEvents(Uint32 minType, Uint32 maxType); /** - * \brief Polls for currently pending events. + * Poll for currently pending events. * - * \return 1 if there are any pending events, or 0 if there are none available. + * If `event` is not NULL, the next event is removed from the queue and stored + * in the SDL_Event structure pointed to by `event`. The 1 returned refers to + * this event, immediately stored in the SDL Event structure -- not an event + * to follow. * - * \param event If not NULL, the next event is removed from the queue and - * stored in that area. + * If `event` is NULL, it simply returns 1 if there is an event in the queue, + * but will not remove it from the queue. + * + * As this function may implicitly call SDL_PumpEvents(), you can only call + * this function in the thread that set the video mode. + * + * SDL_PollEvent() is the favored way of receiving system events since it can + * be done from the main loop and does not suspend the main loop while waiting + * on an event to be posted. + * + * The common practice is to fully process the event queue once every frame, + * usually as a first step before updating the game's state: + * + * ```c + * while (game_is_still_running) { + * SDL_Event event; + * while (SDL_PollEvent(&event)) { // poll until all events are handled! + * // decide what to do with this event. + * } + * + * // update game state, draw the current frame + * } + * ``` + * + * \param event the SDL_Event structure to be filled with the next event from + * the queue, or NULL + * \returns 1 if there is a pending event or 0 if there are none available. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetEventFilter + * \sa SDL_PeepEvents + * \sa SDL_PushEvent + * \sa SDL_SetEventFilter + * \sa SDL_WaitEvent + * \sa SDL_WaitEventTimeout */ extern DECLSPEC int SDLCALL SDL_PollEvent(SDL_Event * event); /** - * \brief Waits indefinitely for the next available event. + * Wait indefinitely for the next available event. * - * \return 1, or 0 if there was an error while waiting for events. + * If `event` is not NULL, the next event is removed from the queue and stored + * in the SDL_Event structure pointed to by `event`. * - * \param event If not NULL, the next event is removed from the queue and - * stored in that area. + * As this function may implicitly call SDL_PumpEvents(), you can only call + * this function in the thread that initialized the video subsystem. + * + * \param event the SDL_Event structure to be filled in with the next event + * from the queue, or NULL + * \returns 1 on success or 0 if there was an error while waiting for events; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_PollEvent + * \sa SDL_PumpEvents + * \sa SDL_WaitEventTimeout */ extern DECLSPEC int SDLCALL SDL_WaitEvent(SDL_Event * event); /** - * \brief Waits until the specified timeout (in milliseconds) for the next - * available event. + * Wait until the specified timeout (in milliseconds) for the next available + * event. * - * \return 1, or 0 if there was an error while waiting for events. + * If `event` is not NULL, the next event is removed from the queue and stored + * in the SDL_Event structure pointed to by `event`. * - * \param event If not NULL, the next event is removed from the queue and - * stored in that area. - * \param timeout The timeout (in milliseconds) to wait for next event. + * As this function may implicitly call SDL_PumpEvents(), you can only call + * this function in the thread that initialized the video subsystem. + * + * \param event the SDL_Event structure to be filled in with the next event + * from the queue, or NULL + * \param timeout the maximum number of milliseconds to wait for the next + * available event + * \returns 1 on success or 0 if there was an error while waiting for events; + * call SDL_GetError() for more information. This also returns 0 if + * the timeout elapsed without an event arriving. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_PollEvent + * \sa SDL_PumpEvents + * \sa SDL_WaitEvent */ extern DECLSPEC int SDLCALL SDL_WaitEventTimeout(SDL_Event * event, int timeout); /** - * \brief Add an event to the event queue. + * Add an event to the event queue. * - * \return 1 on success, 0 if the event was filtered, or -1 if the event queue - * was full or there was some other error. + * The event queue can actually be used as a two way communication channel. + * Not only can events be read from the queue, but the user can also push + * their own events onto it. `event` is a pointer to the event structure you + * wish to push onto the queue. The event is copied into the queue, and the + * caller may dispose of the memory pointed to after SDL_PushEvent() returns. + * + * Note: Pushing device input events onto the queue doesn't modify the state + * of the device within SDL. + * + * This function is thread-safe, and can be called from other threads safely. + * + * Note: Events pushed onto the queue with SDL_PushEvent() get passed through + * the event filter but events added with SDL_PeepEvents() do not. + * + * For pushing application-specific events, please use SDL_RegisterEvents() to + * get an event type that does not conflict with other code that also wants + * its own custom event types. + * + * \param event the SDL_Event to be added to the queue + * \returns 1 on success, 0 if the event was filtered, or a negative error + * code on failure; call SDL_GetError() for more information. A + * common reason for error is the event queue being full. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_PeepEvents + * \sa SDL_PollEvent + * \sa SDL_RegisterEvents */ extern DECLSPEC int SDLCALL SDL_PushEvent(SDL_Event * event); +/** + * A function pointer used for callbacks that watch the event queue. + * + * \param userdata what was passed as `userdata` to SDL_SetEventFilter() + * or SDL_AddEventWatch, etc + * \param event the event that triggered the callback + * \returns 1 to permit event to be added to the queue, and 0 to disallow + * it. When used with SDL_AddEventWatch, the return value is ignored. + * + * \sa SDL_SetEventFilter + * \sa SDL_AddEventWatch + */ typedef int (SDLCALL * SDL_EventFilter) (void *userdata, SDL_Event * event); /** - * Sets up a filter to process all events before they change internal state and - * are posted to the internal event queue. + * Set up a filter to process all events before they change internal state and + * are posted to the internal event queue. * - * The filter is prototyped as: - * \code - * int SDL_EventFilter(void *userdata, SDL_Event * event); - * \endcode + * If the filter function returns 1 when called, then the event will be added + * to the internal queue. If it returns 0, then the event will be dropped from + * the queue, but the internal state will still be updated. This allows + * selective filtering of dynamically arriving events. * - * If the filter returns 1, then the event will be added to the internal queue. - * If it returns 0, then the event will be dropped from the queue, but the - * internal state will still be updated. This allows selective filtering of - * dynamically arriving events. + * **WARNING**: Be very careful of what you do in the event filter function, + * as it may run in a different thread! * - * \warning Be very careful of what you do in the event filter function, as - * it may run in a different thread! + * On platforms that support it, if the quit event is generated by an + * interrupt signal (e.g. pressing Ctrl-C), it will be delivered to the + * application at the next event poll. * - * There is one caveat when dealing with the ::SDL_QuitEvent event type. The - * event filter is only called when the window manager desires to close the - * application window. If the event filter returns 1, then the window will - * be closed, otherwise the window will remain open if possible. + * There is one caveat when dealing with the ::SDL_QuitEvent event type. The + * event filter is only called when the window manager desires to close the + * application window. If the event filter returns 1, then the window will be + * closed, otherwise the window will remain open if possible. * - * If the quit event is generated by an interrupt signal, it will bypass the - * internal queue and be delivered to the application at the next event poll. + * Note: Disabled events never make it to the event filter function; see + * SDL_EventState(). + * + * Note: If you just want to inspect events without filtering, you should use + * SDL_AddEventWatch() instead. + * + * Note: Events pushed onto the queue with SDL_PushEvent() get passed through + * the event filter, but events pushed onto the queue with SDL_PeepEvents() do + * not. + * + * \param filter An SDL_EventFilter function to call when an event happens + * \param userdata a pointer that is passed to `filter` + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AddEventWatch + * \sa SDL_EventState + * \sa SDL_GetEventFilter + * \sa SDL_PeepEvents + * \sa SDL_PushEvent */ extern DECLSPEC void SDLCALL SDL_SetEventFilter(SDL_EventFilter filter, void *userdata); /** - * Return the current event filter - can be used to "chain" filters. - * If there is no event filter set, this function returns SDL_FALSE. + * Query the current event filter. + * + * This function can be used to "chain" filters, by saving the existing filter + * before replacing it with a function that will call that saved filter. + * + * \param filter the current callback function will be stored here + * \param userdata the pointer that is passed to the current event filter will + * be stored here + * \returns SDL_TRUE on success or SDL_FALSE if there is no event filter set. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetEventFilter */ extern DECLSPEC SDL_bool SDLCALL SDL_GetEventFilter(SDL_EventFilter * filter, void **userdata); /** - * Add a function which is called when an event is added to the queue. + * Add a callback to be triggered when an event is added to the event queue. + * + * `filter` will be called when an event happens, and its return value is + * ignored. + * + * **WARNING**: Be very careful of what you do in the event filter function, + * as it may run in a different thread! + * + * If the quit event is generated by a signal (e.g. SIGINT), it will bypass + * the internal queue and be delivered to the watch callback immediately, and + * arrive at the next event poll. + * + * Note: the callback is called for events posted by the user through + * SDL_PushEvent(), but not for disabled events, nor for events by a filter + * callback set with SDL_SetEventFilter(), nor for events posted by the user + * through SDL_PeepEvents(). + * + * \param filter an SDL_EventFilter function to call when an event happens. + * \param userdata a pointer that is passed to `filter` + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_DelEventWatch + * \sa SDL_SetEventFilter */ extern DECLSPEC void SDLCALL SDL_AddEventWatch(SDL_EventFilter filter, void *userdata); /** - * Remove an event watch function added with SDL_AddEventWatch() + * Remove an event watch callback added with SDL_AddEventWatch(). + * + * This function takes the same input as SDL_AddEventWatch() to identify and + * delete the corresponding callback. + * + * \param filter the function originally passed to SDL_AddEventWatch() + * \param userdata the pointer originally passed to SDL_AddEventWatch() + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AddEventWatch */ extern DECLSPEC void SDLCALL SDL_DelEventWatch(SDL_EventFilter filter, void *userdata); /** - * Run the filter function on the current event queue, removing any - * events for which the filter returns 0. + * Run a specific filter function on the current event queue, removing any + * events for which the filter returns 0. + * + * See SDL_SetEventFilter() for more information. Unlike SDL_SetEventFilter(), + * this function does not change the filter permanently, it only uses the + * supplied filter until this function returns. + * + * \param filter the SDL_EventFilter function to call when an event happens + * \param userdata a pointer that is passed to `filter` + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetEventFilter + * \sa SDL_SetEventFilter */ extern DECLSPEC void SDLCALL SDL_FilterEvents(SDL_EventFilter filter, void *userdata); @@ -759,24 +1082,45 @@ extern DECLSPEC void SDLCALL SDL_FilterEvents(SDL_EventFilter filter, #define SDL_ENABLE 1 /** - * This function allows you to set the state of processing certain events. - * - If \c state is set to ::SDL_IGNORE, that event will be automatically - * dropped from the event queue and will not be filtered. - * - If \c state is set to ::SDL_ENABLE, that event will be processed - * normally. - * - If \c state is set to ::SDL_QUERY, SDL_EventState() will return the - * current processing state of the specified event. + * Set the state of processing events by type. + * + * `state` may be any of the following: + * + * - `SDL_QUERY`: returns the current processing state of the specified event + * - `SDL_IGNORE` (aka `SDL_DISABLE`): the event will automatically be dropped + * from the event queue and will not be filtered + * - `SDL_ENABLE`: the event will be processed normally + * + * \param type the type of event; see SDL_EventType for details + * \param state how to process the event + * \returns `SDL_DISABLE` or `SDL_ENABLE`, representing the processing state + * of the event before this function makes any changes to it. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetEventState */ extern DECLSPEC Uint8 SDLCALL SDL_EventState(Uint32 type, int state); /* @} */ #define SDL_GetEventState(type) SDL_EventState(type, SDL_QUERY) /** - * This function allocates a set of user-defined events, and returns - * the beginning event number for that set of events. + * Allocate a set of user-defined events, and return the beginning event + * number for that set of events. * - * If there aren't enough user-defined events left, this function - * returns (Uint32)-1 + * Calling this function with `numevents` <= 0 is an error and will return + * (Uint32)-1. + * + * Note, (Uint32)-1 means the maximum unsigned 32-bit integer value (or + * 0xFFFFFFFF), but is clearer to write. + * + * \param numevents the number of events to be allocated + * \returns the beginning event number, or (Uint32)-1 if there are not enough + * user-defined events left. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_PushEvent */ extern DECLSPEC Uint32 SDLCALL SDL_RegisterEvents(int numevents); diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_filesystem.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_filesystem.h index 6d97e5896..16f02e287 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_filesystem.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_filesystem.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -38,88 +38,97 @@ extern "C" { #endif /** - * \brief Get the path where the application resides. + * Get the directory where the application was run from. * - * Get the "base path". This is the directory where the application was run - * from, which is probably the installation directory, and may or may not - * be the process's current working directory. + * This is not necessarily a fast call, so you should call this once near + * startup and save the string if you need it. * - * This returns an absolute path in UTF-8 encoding, and is guaranteed to - * end with a path separator ('\\' on Windows, '/' most other places). + * **Mac OS X and iOS Specific Functionality**: If the application is in a + * ".app" bundle, this function returns the Resource directory (e.g. + * MyApp.app/Contents/Resources/). This behaviour can be overridden by adding + * a property to the Info.plist file. Adding a string key with the name + * SDL_FILESYSTEM_BASE_DIR_TYPE with a supported value will change the + * behaviour. * - * The pointer returned by this function is owned by you. Please call - * SDL_free() on the pointer when you are done with it, or it will be a - * memory leak. This is not necessarily a fast call, though, so you should - * call this once near startup and save the string if you need it. + * Supported values for the SDL_FILESYSTEM_BASE_DIR_TYPE property (Given an + * application in /Applications/SDLApp/MyApp.app): * - * Some platforms can't determine the application's path, and on other - * platforms, this might be meaningless. In such cases, this function will - * return NULL. + * - `resource`: bundle resource directory (the default). For example: + * `/Applications/SDLApp/MyApp.app/Contents/Resources` + * - `bundle`: the Bundle directory. For example: + * `/Applications/SDLApp/MyApp.app/` + * - `parent`: the containing directory of the bundle. For example: + * `/Applications/SDLApp/` * - * \return String of base dir in UTF-8 encoding, or NULL on error. + * The returned path is guaranteed to end with a path separator ('\' on + * Windows, '/' on most other platforms). + * + * The pointer returned is owned by the caller. Please call SDL_free() on the + * pointer when done with it. + * + * \returns an absolute path in UTF-8 encoding to the application data + * directory. NULL will be returned on error or when the platform + * doesn't implement this functionality, call SDL_GetError() for more + * information. + * + * \since This function is available since SDL 2.0.1. * * \sa SDL_GetPrefPath */ extern DECLSPEC char *SDLCALL SDL_GetBasePath(void); /** - * \brief Get the user-and-app-specific path where files can be written. + * Get the user-and-app-specific path where files can be written. * * Get the "pref dir". This is meant to be where users can write personal - * files (preferences and save games, etc) that are specific to your - * application. This directory is unique per user, per application. + * files (preferences and save games, etc) that are specific to your + * application. This directory is unique per user, per application. * - * This function will decide the appropriate location in the native filesystem, - * create the directory if necessary, and return a string of the absolute - * path to the directory in UTF-8 encoding. + * This function will decide the appropriate location in the native + * filesystem, create the directory if necessary, and return a string of the + * absolute path to the directory in UTF-8 encoding. * * On Windows, the string might look like: - * "C:\\Users\\bob\\AppData\\Roaming\\My Company\\My Program Name\\" * - * On Linux, the string might look like: - * "/home/bob/.local/share/My Program Name/" + * `C:\\Users\\bob\\AppData\\Roaming\\My Company\\My Program Name\\` + * + * On Linux, the string might look like" + * + * `/home/bob/.local/share/My Program Name/` * * On Mac OS X, the string might look like: - * "/Users/bob/Library/Application Support/My Program Name/" * - * (etc.) + * `/Users/bob/Library/Application Support/My Program Name/` * - * You specify the name of your organization (if it's not a real organization, - * your name or an Internet domain you own might do) and the name of your - * application. These should be untranslated proper names. + * You should assume the path returned by this function is the only safe place + * to write files (and that SDL_GetBasePath(), while it might be writable, or + * even the parent of the returned path, isn't where you should be writing + * things). * - * Both the org and app strings may become part of a directory name, so - * please follow these rules: + * Both the org and app strings may become part of a directory name, so please + * follow these rules: * - * - Try to use the same org string (including case-sensitivity) for - * all your applications that use this function. - * - Always use a unique app string for each one, and make sure it never - * changes for an app once you've decided on it. - * - Unicode characters are legal, as long as it's UTF-8 encoded, but... - * - ...only use letters, numbers, and spaces. Avoid punctuation like - * "Game Name 2: Bad Guy's Revenge!" ... "Game Name 2" is sufficient. + * - Try to use the same org string (_including case-sensitivity_) for all + * your applications that use this function. + * - Always use a unique app string for each one, and make sure it never + * changes for an app once you've decided on it. + * - Unicode characters are legal, as long as it's UTF-8 encoded, but... + * - ...only use letters, numbers, and spaces. Avoid punctuation like "Game + * Name 2: Bad Guy's Revenge!" ... "Game Name 2" is sufficient. * - * This returns an absolute path in UTF-8 encoding, and is guaranteed to - * end with a path separator ('\\' on Windows, '/' most other places). + * The returned path is guaranteed to end with a path separator ('\' on + * Windows, '/' on most other platforms). * - * The pointer returned by this function is owned by you. Please call - * SDL_free() on the pointer when you are done with it, or it will be a - * memory leak. This is not necessarily a fast call, though, so you should - * call this once near startup and save the string if you need it. + * The pointer returned is owned by the caller. Please call SDL_free() on the + * pointer when done with it. * - * You should assume the path returned by this function is the only safe - * place to write files (and that SDL_GetBasePath(), while it might be - * writable, or even the parent of the returned path, aren't where you - * should be writing things). + * \param org the name of your organization + * \param app the name of your application + * \returns a UTF-8 string of the user directory in platform-dependent + * notation. NULL if there's a problem (creating directory failed, + * etc.). * - * Some platforms can't determine the pref path, and on other - * platforms, this might be meaningless. In such cases, this function will - * return NULL. - * - * \param org The name of your organization. - * \param app The name of your application. - * \return UTF-8 string of user dir in platform-dependent notation. NULL - * if there's a problem (creating directory failed, etc). + * \since This function is available since SDL 2.0.1. * * \sa SDL_GetBasePath */ diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_gamecontroller.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_gamecontroller.h index ebde38715..bdd9b8993 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_gamecontroller.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_gamecontroller.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -31,6 +31,7 @@ #include "SDL_stdinc.h" #include "SDL_error.h" #include "SDL_rwops.h" +#include "SDL_sensor.h" #include "SDL_joystick.h" #include "begin_code.h" @@ -57,6 +58,19 @@ extern "C" { struct _SDL_GameController; typedef struct _SDL_GameController SDL_GameController; +typedef enum +{ + SDL_CONTROLLER_TYPE_UNKNOWN = 0, + SDL_CONTROLLER_TYPE_XBOX360, + SDL_CONTROLLER_TYPE_XBOXONE, + SDL_CONTROLLER_TYPE_PS3, + SDL_CONTROLLER_TYPE_PS4, + SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_PRO, + SDL_CONTROLLER_TYPE_VIRTUAL, + SDL_CONTROLLER_TYPE_PS5, + SDL_CONTROLLER_TYPE_AMAZON_LUNA, + SDL_CONTROLLER_TYPE_GOOGLE_STADIA +} SDL_GameControllerType; typedef enum { @@ -87,6 +101,8 @@ typedef struct SDL_GameControllerButtonBind /** * To count the number of game controllers in the system for the following: + * + * ```c * int nJoysticks = SDL_NumJoysticks(); * int nGameControllers = 0; * for (int i = 0; i < nJoysticks; i++) { @@ -94,6 +110,7 @@ typedef struct SDL_GameControllerButtonBind * nGameControllers++; * } * } + * ``` * * Using the SDL_HINT_GAMECONTROLLERCONFIG hint or the SDL_GameControllerAddMapping() you can add support for controllers SDL is unaware of or cause an existing controller to have a different binding. The format is: * guid,name,mappings @@ -107,17 +124,39 @@ typedef struct SDL_GameControllerButtonBind * Buttons can be used as a controller axis and vice versa. * * This string shows an example of a valid mapping for a controller - * "03000000341a00003608000000000000,PS3 Controller,a:b1,b:b2,y:b3,x:b0,start:b9,guide:b12,back:b8,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftshoulder:b4,rightshoulder:b5,leftstick:b10,rightstick:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7", * + * ```c + * "03000000341a00003608000000000000,PS3 Controller,a:b1,b:b2,y:b3,x:b0,start:b9,guide:b12,back:b8,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftshoulder:b4,rightshoulder:b5,leftstick:b10,rightstick:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7", + * ``` */ /** - * Load a set of mappings from a seekable SDL data stream (memory or file), filtered by the current SDL_GetPlatform() - * A community sourced database of controllers is available at https://raw.github.com/gabomdq/SDL_GameControllerDB/master/gamecontrollerdb.txt + * Load a set of Game Controller mappings from a seekable SDL data stream. * - * If \c freerw is non-zero, the stream will be closed after being read. - * - * \return number of mappings added, -1 on error + * You can call this function several times, if needed, to load different + * database files. + * + * If a new mapping is loaded for an already known controller GUID, the later + * version will overwrite the one currently loaded. + * + * Mappings not belonging to the current platform or with no platform field + * specified will be ignored (i.e. mappings for Linux will be ignored in + * Windows, etc). + * + * This function will load the text database entirely in memory before + * processing it, so take this into consideration if you are in a memory + * constrained environment. + * + * \param rw the data stream for the mappings to be added + * \param freerw non-zero to close the stream after being read + * \returns the number of mappings added or -1 on error; call SDL_GetError() + * for more information. + * + * \since This function is available since SDL 2.0.2. + * + * \sa SDL_GameControllerAddMapping + * \sa SDL_GameControllerAddMappingsFromFile + * \sa SDL_GameControllerMappingForGUID */ extern DECLSPEC int SDLCALL SDL_GameControllerAddMappingsFromRW(SDL_RWops * rw, int freerw); @@ -129,133 +168,372 @@ extern DECLSPEC int SDLCALL SDL_GameControllerAddMappingsFromRW(SDL_RWops * rw, #define SDL_GameControllerAddMappingsFromFile(file) SDL_GameControllerAddMappingsFromRW(SDL_RWFromFile(file, "rb"), 1) /** - * Add or update an existing mapping configuration + * Add support for controllers that SDL is unaware of or to cause an existing + * controller to have a different binding. * - * \return 1 if mapping is added, 0 if updated, -1 on error + * The mapping string has the format "GUID,name,mapping", where GUID is the + * string value from SDL_JoystickGetGUIDString(), name is the human readable + * string for the device and mappings are controller mappings to joystick + * ones. Under Windows there is a reserved GUID of "xinput" that covers all + * XInput devices. The mapping format for joystick is: {| |bX |a joystick + * button, index X |- |hX.Y |hat X with value Y |- |aX |axis X of the joystick + * |} Buttons can be used as a controller axes and vice versa. + * + * This string shows an example of a valid mapping for a controller: + * + * ```c + * "341a3608000000000000504944564944,Afterglow PS3 Controller,a:b1,b:b2,y:b3,x:b0,start:b9,guide:b12,back:b8,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftshoulder:b4,rightshoulder:b5,leftstick:b10,rightstick:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7" + * ``` + * + * \param mappingString the mapping string + * \returns 1 if a new mapping is added, 0 if an existing mapping is updated, + * -1 on error; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerMapping + * \sa SDL_GameControllerMappingForGUID */ extern DECLSPEC int SDLCALL SDL_GameControllerAddMapping(const char* mappingString); /** - * Get the number of mappings installed + * Get the number of mappings installed. * - * \return the number of mappings + * \returns the number of mappings. + * + * \since This function is available since SDL 2.0.6. */ extern DECLSPEC int SDLCALL SDL_GameControllerNumMappings(void); /** - * Get the mapping at a particular index. + * Get the mapping at a particular index. * - * \return the mapping string. Must be freed with SDL_free(). Returns NULL if the index is out of range. + * \returns the mapping string. Must be freed with SDL_free(). Returns NULL if + * the index is out of range. + * + * \since This function is available since SDL 2.0.6. */ extern DECLSPEC char * SDLCALL SDL_GameControllerMappingForIndex(int mapping_index); /** - * Get a mapping string for a GUID + * Get the game controller mapping string for a given GUID. * - * \return the mapping string. Must be freed with SDL_free(). Returns NULL if no mapping is available + * The returned string must be freed with SDL_free(). + * + * \param guid a structure containing the GUID for which a mapping is desired + * \returns a mapping string or NULL on error; call SDL_GetError() for more + * information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickGetDeviceGUID + * \sa SDL_JoystickGetGUID */ extern DECLSPEC char * SDLCALL SDL_GameControllerMappingForGUID(SDL_JoystickGUID guid); /** - * Get a mapping string for an open GameController + * Get the current mapping of a Game Controller. * - * \return the mapping string. Must be freed with SDL_free(). Returns NULL if no mapping is available + * The returned string must be freed with SDL_free(). + * + * Details about mappings are discussed with SDL_GameControllerAddMapping(). + * + * \param gamecontroller the game controller you want to get the current + * mapping for + * \returns a string that has the controller's mapping or NULL if no mapping + * is available; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerAddMapping + * \sa SDL_GameControllerMappingForGUID */ -extern DECLSPEC char * SDLCALL SDL_GameControllerMapping(SDL_GameController * gamecontroller); +extern DECLSPEC char * SDLCALL SDL_GameControllerMapping(SDL_GameController *gamecontroller); /** - * Is the joystick on this index supported by the game controller interface? + * Check if the given joystick is supported by the game controller interface. + * + * `joystick_index` is the same as the `device_index` passed to + * SDL_JoystickOpen(). + * + * \param joystick_index the device_index of a device, up to + * SDL_NumJoysticks() + * \returns SDL_TRUE if the given joystick is supported by the game controller + * interface, SDL_FALSE if it isn't or it's an invalid index. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerNameForIndex + * \sa SDL_GameControllerOpen */ extern DECLSPEC SDL_bool SDLCALL SDL_IsGameController(int joystick_index); /** - * Get the implementation dependent name of a game controller. - * This can be called before any controllers are opened. - * If no name can be found, this function returns NULL. + * Get the implementation dependent name for the game controller. + * + * This function can be called before any controllers are opened. + * + * `joystick_index` is the same as the `device_index` passed to + * SDL_JoystickOpen(). + * + * \param joystick_index the device_index of a device, from zero to + * SDL_NumJoysticks()-1 + * \returns the implementation-dependent name for the game controller, or NULL + * if there is no name or the index is invalid. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerName + * \sa SDL_GameControllerOpen + * \sa SDL_IsGameController */ extern DECLSPEC const char *SDLCALL SDL_GameControllerNameForIndex(int joystick_index); /** - * Get the mapping of a game controller. - * This can be called before any controllers are opened. + * Get the type of a game controller. * - * \return the mapping string. Must be freed with SDL_free(). Returns NULL if no mapping is available + * This can be called before any controllers are opened. + * + * \param joystick_index the device_index of a device, from zero to + * SDL_NumJoysticks()-1 + * \returns the controller type. + * + * \since This function is available since SDL 2.0.12. + */ +extern DECLSPEC SDL_GameControllerType SDLCALL SDL_GameControllerTypeForIndex(int joystick_index); + +/** + * Get the mapping of a game controller. + * + * This can be called before any controllers are opened. + * + * \param joystick_index the device_index of a device, from zero to + * SDL_NumJoysticks()-1 + * \returns the mapping string. Must be freed with SDL_free(). Returns NULL if + * no mapping is available. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC char *SDLCALL SDL_GameControllerMappingForDeviceIndex(int joystick_index); /** - * Open a game controller for use. - * The index passed as an argument refers to the N'th game controller on the system. - * This index is not the value which will identify this controller in future - * controller events. The joystick's instance id (::SDL_JoystickID) will be - * used there instead. + * Open a game controller for use. * - * \return A controller identifier, or NULL if an error occurred. + * `joystick_index` is the same as the `device_index` passed to + * SDL_JoystickOpen(). + * + * The index passed as an argument refers to the N'th game controller on the + * system. This index is not the value which will identify this controller in + * future controller events. The joystick's instance id (SDL_JoystickID) will + * be used there instead. + * + * \param joystick_index the device_index of a device, up to + * SDL_NumJoysticks() + * \returns a gamecontroller identifier or NULL if an error occurred; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerClose + * \sa SDL_GameControllerNameForIndex + * \sa SDL_IsGameController */ extern DECLSPEC SDL_GameController *SDLCALL SDL_GameControllerOpen(int joystick_index); /** - * Return the SDL_GameController associated with an instance id. + * Get the SDL_GameController associated with an instance id. + * + * \param joyid the instance id to get the SDL_GameController for + * \returns an SDL_GameController on success or NULL on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.4. */ extern DECLSPEC SDL_GameController *SDLCALL SDL_GameControllerFromInstanceID(SDL_JoystickID joyid); /** - * Return the name for this currently opened controller + * Get the SDL_GameController associated with a player index. + * + * Please note that the player index is _not_ the device index, nor is it the + * instance id! + * + * \param player_index the player index, which is not the device index or the + * instance id! + * \returns the SDL_GameController associated with a player index. + * + * \since This function is available since SDL 2.0.12. + * + * \sa SDL_GameControllerGetPlayerIndex + * \sa SDL_GameControllerSetPlayerIndex + */ +extern DECLSPEC SDL_GameController *SDLCALL SDL_GameControllerFromPlayerIndex(int player_index); + +/** + * Get the implementation-dependent name for an opened game controller. + * + * This is the same name as returned by SDL_GameControllerNameForIndex(), but + * it takes a controller identifier instead of the (unstable) device index. + * + * \param gamecontroller a game controller identifier previously returned by + * SDL_GameControllerOpen() + * \returns the implementation dependent name for the game controller, or NULL + * if there is no name or the identifier passed is invalid. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerNameForIndex + * \sa SDL_GameControllerOpen */ extern DECLSPEC const char *SDLCALL SDL_GameControllerName(SDL_GameController *gamecontroller); /** - * Get the player index of an opened game controller, or -1 if it's not available + * Get the type of this currently opened controller * - * For XInput controllers this returns the XInput user index. + * This is the same name as returned by SDL_GameControllerTypeForIndex(), but + * it takes a controller identifier instead of the (unstable) device index. + * + * \param gamecontroller the game controller object to query. + * \returns the controller type. + * + * \since This function is available since SDL 2.0.12. + */ +extern DECLSPEC SDL_GameControllerType SDLCALL SDL_GameControllerGetType(SDL_GameController *gamecontroller); + +/** + * Get the player index of an opened game controller. + * + * For XInput controllers this returns the XInput user index. + * + * \param gamecontroller the game controller object to query. + * \returns the player index for controller, or -1 if it's not available. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC int SDLCALL SDL_GameControllerGetPlayerIndex(SDL_GameController *gamecontroller); /** - * Get the USB vendor ID of an opened controller, if available. - * If the vendor ID isn't available this function returns 0. + * Set the player index of an opened game controller. + * + * \param gamecontroller the game controller object to adjust. + * \param player_index Player index to assign to this controller. + * + * \since This function is available since SDL 2.0.12. */ -extern DECLSPEC Uint16 SDLCALL SDL_GameControllerGetVendor(SDL_GameController * gamecontroller); +extern DECLSPEC void SDLCALL SDL_GameControllerSetPlayerIndex(SDL_GameController *gamecontroller, int player_index); /** - * Get the USB product ID of an opened controller, if available. - * If the product ID isn't available this function returns 0. + * Get the USB vendor ID of an opened controller, if available. + * + * If the vendor ID isn't available this function returns 0. + * + * \param gamecontroller the game controller object to query. + * \return the USB vendor ID, or zero if unavailable. + * + * \since This function is available since SDL 2.0.6. */ -extern DECLSPEC Uint16 SDLCALL SDL_GameControllerGetProduct(SDL_GameController * gamecontroller); +extern DECLSPEC Uint16 SDLCALL SDL_GameControllerGetVendor(SDL_GameController *gamecontroller); /** - * Get the product version of an opened controller, if available. - * If the product version isn't available this function returns 0. + * Get the USB product ID of an opened controller, if available. + * + * If the product ID isn't available this function returns 0. + * + * \param gamecontroller the game controller object to query. + * \return the USB product ID, or zero if unavailable. + * + * \since This function is available since SDL 2.0.6. */ -extern DECLSPEC Uint16 SDLCALL SDL_GameControllerGetProductVersion(SDL_GameController * gamecontroller); +extern DECLSPEC Uint16 SDLCALL SDL_GameControllerGetProduct(SDL_GameController *gamecontroller); /** - * Returns SDL_TRUE if the controller has been opened and currently connected, - * or SDL_FALSE if it has not. + * Get the product version of an opened controller, if available. + * + * If the product version isn't available this function returns 0. + * + * \param gamecontroller the game controller object to query. + * \return the USB product version, or zero if unavailable. + * + * \since This function is available since SDL 2.0.6. + */ +extern DECLSPEC Uint16 SDLCALL SDL_GameControllerGetProductVersion(SDL_GameController *gamecontroller); + +/** + * Get the serial number of an opened controller, if available. + * + * Returns the serial number of the controller, or NULL if it is not + * available. + * + * \param gamecontroller the game controller object to query. + * \return the serial number, or NULL if unavailable. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC const char * SDLCALL SDL_GameControllerGetSerial(SDL_GameController *gamecontroller); + +/** + * Check if a controller has been opened and is currently connected. + * + * \param gamecontroller a game controller identifier previously returned by + * SDL_GameControllerOpen() + * \returns SDL_TRUE if the controller has been opened and is currently + * connected, or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerClose + * \sa SDL_GameControllerOpen */ extern DECLSPEC SDL_bool SDLCALL SDL_GameControllerGetAttached(SDL_GameController *gamecontroller); /** - * Get the underlying joystick object used by a controller + * Get the Joystick ID from a Game Controller. + * + * This function will give you a SDL_Joystick object, which allows you to use + * the SDL_Joystick functions with a SDL_GameController object. This would be + * useful for getting a joystick's position at any given time, even if it + * hasn't moved (moving it would produce an event, which would have the axis' + * value). + * + * The pointer returned is owned by the SDL_GameController. You should not + * call SDL_JoystickClose() on it, for example, since doing so will likely + * cause SDL to crash. + * + * \param gamecontroller the game controller object that you want to get a + * joystick from + * \returns a SDL_Joystick object; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC SDL_Joystick *SDLCALL SDL_GameControllerGetJoystick(SDL_GameController *gamecontroller); /** - * Enable/disable controller event polling. + * Query or change current state of Game Controller events. * - * If controller events are disabled, you must call SDL_GameControllerUpdate() - * yourself and check the state of the controller when you want controller - * information. + * If controller events are disabled, you must call SDL_GameControllerUpdate() + * yourself and check the state of the controller when you want controller + * information. * - * The state can be one of ::SDL_QUERY, ::SDL_ENABLE or ::SDL_IGNORE. + * Any number can be passed to SDL_GameControllerEventState(), but only -1, 0, + * and 1 will have any effect. Other numbers will just be returned. + * + * \param state can be one of `SDL_QUERY`, `SDL_IGNORE`, or `SDL_ENABLE` + * \returns the same value passed to the function, with exception to -1 + * (SDL_QUERY), which will return the current state. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickEventState */ extern DECLSPEC int SDLCALL SDL_GameControllerEventState(int state); /** - * Update the current state of the open game controllers. + * Manually pump game controller updates if not using the loop. * - * This is called automatically by the event loop if any game controller - * events are enabled. + * This function is called automatically by the event loop if events are + * enabled. Under such circumstances, it will not be necessary to call this + * function. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC void SDLCALL SDL_GameControllerUpdate(void); @@ -282,33 +560,94 @@ typedef enum } SDL_GameControllerAxis; /** - * turn this string into a axis mapping + * Convert a string into SDL_GameControllerAxis enum. + * + * This function is called internally to translate SDL_GameController mapping + * strings for the underlying joystick device into the consistent + * SDL_GameController mapping. You do not normally need to call this function + * unless you are parsing SDL_GameController mappings in your own code. + * + * Note specially that "righttrigger" and "lefttrigger" map to + * `SDL_CONTROLLER_AXIS_TRIGGERRIGHT` and `SDL_CONTROLLER_AXIS_TRIGGERLEFT`, + * respectively. + * + * \param str string representing a SDL_GameController axis + * \returns the SDL_GameControllerAxis enum corresponding to the input string, + * or `SDL_CONTROLLER_AXIS_INVALID` if no match was found. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerGetStringForAxis */ -extern DECLSPEC SDL_GameControllerAxis SDLCALL SDL_GameControllerGetAxisFromString(const char *pchString); +extern DECLSPEC SDL_GameControllerAxis SDLCALL SDL_GameControllerGetAxisFromString(const char *str); /** - * turn this axis enum into a string mapping + * Convert from an SDL_GameControllerAxis enum to a string. + * + * The caller should not SDL_free() the returned string. + * + * \param axis an enum value for a given SDL_GameControllerAxis + * \returns a string for the given axis, or NULL if an invalid axis is + * specified. The string returned is of the format used by + * SDL_GameController mapping strings. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerGetAxisFromString */ extern DECLSPEC const char* SDLCALL SDL_GameControllerGetStringForAxis(SDL_GameControllerAxis axis); /** - * Get the SDL joystick layer binding for this controller button mapping + * Get the SDL joystick layer binding for a controller axis mapping. + * + * \param gamecontroller a game controller + * \param axis an axis enum value (one of the SDL_GameControllerAxis values) + * \returns a SDL_GameControllerButtonBind describing the bind. On failure + * (like the given Controller axis doesn't exist on the device), its + * `.bindType` will be `SDL_CONTROLLER_BINDTYPE_NONE`. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerGetBindForButton */ extern DECLSPEC SDL_GameControllerButtonBind SDLCALL SDL_GameControllerGetBindForAxis(SDL_GameController *gamecontroller, SDL_GameControllerAxis axis); /** - * Get the current state of an axis control on a game controller. + * Query whether a game controller has a given axis. * - * The state is a value ranging from -32768 to 32767 (except for the triggers, - * which range from 0 to 32767). + * This merely reports whether the controller's mapping defined this axis, as + * that is all the information SDL has about the physical device. * - * The axis indices start at index 0. + * \param gamecontroller a game controller + * \param axis an axis enum value (an SDL_GameControllerAxis value) + * \returns SDL_TRUE if the controller has this axis, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC SDL_bool SDLCALL +SDL_GameControllerHasAxis(SDL_GameController *gamecontroller, SDL_GameControllerAxis axis); + +/** + * Get the current state of an axis control on a game controller. + * + * The axis indices start at index 0. + * + * The state is a value ranging from -32768 to 32767. Triggers, however, range + * from 0 to 32767 (they never return a negative value). + * + * \param gamecontroller a game controller + * \param axis an axis index (one of the SDL_GameControllerAxis values) + * \returns axis state (including 0) on success or 0 (also) on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerGetButton */ extern DECLSPEC Sint16 SDLCALL -SDL_GameControllerGetAxis(SDL_GameController *gamecontroller, - SDL_GameControllerAxis axis); +SDL_GameControllerGetAxis(SDL_GameController *gamecontroller, SDL_GameControllerAxis axis); /** * The list of buttons available from a controller @@ -331,53 +670,325 @@ typedef enum SDL_CONTROLLER_BUTTON_DPAD_DOWN, SDL_CONTROLLER_BUTTON_DPAD_LEFT, SDL_CONTROLLER_BUTTON_DPAD_RIGHT, + SDL_CONTROLLER_BUTTON_MISC1, /* Xbox Series X share button, PS5 microphone button, Nintendo Switch Pro capture button, Amazon Luna microphone button */ + SDL_CONTROLLER_BUTTON_PADDLE1, /* Xbox Elite paddle P1 */ + SDL_CONTROLLER_BUTTON_PADDLE2, /* Xbox Elite paddle P3 */ + SDL_CONTROLLER_BUTTON_PADDLE3, /* Xbox Elite paddle P2 */ + SDL_CONTROLLER_BUTTON_PADDLE4, /* Xbox Elite paddle P4 */ + SDL_CONTROLLER_BUTTON_TOUCHPAD, /* PS4/PS5 touchpad button */ SDL_CONTROLLER_BUTTON_MAX } SDL_GameControllerButton; /** - * turn this string into a button mapping + * Convert a string into an SDL_GameControllerButton enum. + * + * This function is called internally to translate SDL_GameController mapping + * strings for the underlying joystick device into the consistent + * SDL_GameController mapping. You do not normally need to call this function + * unless you are parsing SDL_GameController mappings in your own code. + * + * \param str string representing a SDL_GameController axis + * \returns the SDL_GameControllerButton enum corresponding to the input + * string, or `SDL_CONTROLLER_AXIS_INVALID` if no match was found. + * + * \since This function is available since SDL 2.0.0. */ -extern DECLSPEC SDL_GameControllerButton SDLCALL SDL_GameControllerGetButtonFromString(const char *pchString); +extern DECLSPEC SDL_GameControllerButton SDLCALL SDL_GameControllerGetButtonFromString(const char *str); /** - * turn this button enum into a string mapping + * Convert from an SDL_GameControllerButton enum to a string. + * + * The caller should not SDL_free() the returned string. + * + * \param button an enum value for a given SDL_GameControllerButton + * \returns a string for the given button, or NULL if an invalid axis is + * specified. The string returned is of the format used by + * SDL_GameController mapping strings. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerGetButtonFromString */ extern DECLSPEC const char* SDLCALL SDL_GameControllerGetStringForButton(SDL_GameControllerButton button); /** - * Get the SDL joystick layer binding for this controller button mapping + * Get the SDL joystick layer binding for a controller button mapping. + * + * \param gamecontroller a game controller + * \param button an button enum value (an SDL_GameControllerButton value) + * \returns a SDL_GameControllerButtonBind describing the bind. On failure + * (like the given Controller button doesn't exist on the device), + * its `.bindType` will be `SDL_CONTROLLER_BINDTYPE_NONE`. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerGetBindForAxis */ extern DECLSPEC SDL_GameControllerButtonBind SDLCALL SDL_GameControllerGetBindForButton(SDL_GameController *gamecontroller, SDL_GameControllerButton button); +/** + * Query whether a game controller has a given button. + * + * This merely reports whether the controller's mapping defined this button, + * as that is all the information SDL has about the physical device. + * + * \param gamecontroller a game controller + * \param button a button enum value (an SDL_GameControllerButton value) + * \returns SDL_TRUE if the controller has this button, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC SDL_bool SDLCALL SDL_GameControllerHasButton(SDL_GameController *gamecontroller, + SDL_GameControllerButton button); /** - * Get the current state of a button on a game controller. + * Get the current state of a button on a game controller. * - * The button indices start at index 0. + * \param gamecontroller a game controller + * \param button a button index (one of the SDL_GameControllerButton values) + * \returns 1 for pressed state or 0 for not pressed state or error; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerGetAxis */ extern DECLSPEC Uint8 SDLCALL SDL_GameControllerGetButton(SDL_GameController *gamecontroller, SDL_GameControllerButton button); /** - * Trigger a rumble effect - * Each call to this function cancels any previous rumble effect, and calling it with 0 intensity stops any rumbling. + * Get the number of touchpads on a game controller. * - * \param gamecontroller The controller to vibrate - * \param low_frequency_rumble The intensity of the low frequency (left) rumble motor, from 0 to 0xFFFF - * \param high_frequency_rumble The intensity of the high frequency (right) rumble motor, from 0 to 0xFFFF - * \param duration_ms The duration of the rumble effect, in milliseconds + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC int SDLCALL SDL_GameControllerGetNumTouchpads(SDL_GameController *gamecontroller); + +/** + * Get the number of supported simultaneous fingers on a touchpad on a game + * controller. * - * \return 0, or -1 if rumble isn't supported on this joystick + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC int SDLCALL SDL_GameControllerGetNumTouchpadFingers(SDL_GameController *gamecontroller, int touchpad); + +/** + * Get the current state of a finger on a touchpad on a game controller. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC int SDLCALL SDL_GameControllerGetTouchpadFinger(SDL_GameController *gamecontroller, int touchpad, int finger, Uint8 *state, float *x, float *y, float *pressure); + +/** + * Return whether a game controller has a particular sensor. + * + * \param gamecontroller The controller to query + * \param type The type of sensor to query + * \returns SDL_TRUE if the sensor exists, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC SDL_bool SDLCALL SDL_GameControllerHasSensor(SDL_GameController *gamecontroller, SDL_SensorType type); + +/** + * Set whether data reporting for a game controller sensor is enabled. + * + * \param gamecontroller The controller to update + * \param type The type of sensor to enable/disable + * \param enabled Whether data reporting should be enabled + * \returns 0 or -1 if an error occurred. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC int SDLCALL SDL_GameControllerSetSensorEnabled(SDL_GameController *gamecontroller, SDL_SensorType type, SDL_bool enabled); + +/** + * Query whether sensor data reporting is enabled for a game controller. + * + * \param gamecontroller The controller to query + * \param type The type of sensor to query + * \returns SDL_TRUE if the sensor is enabled, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC SDL_bool SDLCALL SDL_GameControllerIsSensorEnabled(SDL_GameController *gamecontroller, SDL_SensorType type); + +/** + * Get the data rate (number of events per second) of a game controller + * sensor. + * + * \param gamecontroller The controller to query + * \param type The type of sensor to query + * \return the data rate, or 0.0f if the data rate is not available. + * + * \since This function is available since SDL 2.0.16. + */ +extern DECLSPEC float SDLCALL SDL_GameControllerGetSensorDataRate(SDL_GameController *gamecontroller, SDL_SensorType type); + +/** + * Get the current state of a game controller sensor. + * + * The number of values and interpretation of the data is sensor dependent. + * See SDL_sensor.h for the details for each type of sensor. + * + * \param gamecontroller The controller to query + * \param type The type of sensor to query + * \param data A pointer filled with the current sensor state + * \param num_values The number of values to write to data + * \return 0 or -1 if an error occurred. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC int SDLCALL SDL_GameControllerGetSensorData(SDL_GameController *gamecontroller, SDL_SensorType type, float *data, int num_values); + +/** + * Start a rumble effect on a game controller. + * + * Each call to this function cancels any previous rumble effect, and calling + * it with 0 intensity stops any rumbling. + * + * \param gamecontroller The controller to vibrate + * \param low_frequency_rumble The intensity of the low frequency (left) + * rumble motor, from 0 to 0xFFFF + * \param high_frequency_rumble The intensity of the high frequency (right) + * rumble motor, from 0 to 0xFFFF + * \param duration_ms The duration of the rumble effect, in milliseconds + * \returns 0, or -1 if rumble isn't supported on this controller + * + * \since This function is available since SDL 2.0.9. + * + * \sa SDL_GameControllerHasRumble */ extern DECLSPEC int SDLCALL SDL_GameControllerRumble(SDL_GameController *gamecontroller, Uint16 low_frequency_rumble, Uint16 high_frequency_rumble, Uint32 duration_ms); /** - * Close a controller previously opened with SDL_GameControllerOpen(). + * Start a rumble effect in the game controller's triggers. + * + * Each call to this function cancels any previous trigger rumble effect, and + * calling it with 0 intensity stops any rumbling. + * + * Note that this is rumbling of the _triggers_ and not the game controller as + * a whole. The first controller to offer this feature was the PlayStation 5's + * DualShock 5. + * + * \param gamecontroller The controller to vibrate + * \param left_rumble The intensity of the left trigger rumble motor, from 0 + * to 0xFFFF + * \param right_rumble The intensity of the right trigger rumble motor, from 0 + * to 0xFFFF + * \param duration_ms The duration of the rumble effect, in milliseconds + * \returns 0, or -1 if trigger rumble isn't supported on this controller + * + * \since This function is available since SDL 2.0.14. + * + * \sa SDL_GameControllerHasRumbleTriggers + */ +extern DECLSPEC int SDLCALL SDL_GameControllerRumbleTriggers(SDL_GameController *gamecontroller, Uint16 left_rumble, Uint16 right_rumble, Uint32 duration_ms); + +/** + * Query whether a game controller has an LED. + * + * \param gamecontroller The controller to query + * \returns SDL_TRUE, or SDL_FALSE if this controller does not have a + * modifiable LED + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC SDL_bool SDLCALL SDL_GameControllerHasLED(SDL_GameController *gamecontroller); + +/** + * Query whether a game controller has rumble support. + * + * \param gamecontroller The controller to query + * \returns SDL_TRUE, or SDL_FALSE if this controller does not have rumble + * support + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_GameControllerRumble + */ +extern DECLSPEC SDL_bool SDLCALL SDL_GameControllerHasRumble(SDL_GameController *gamecontroller); + +/** + * Query whether a game controller has rumble support on triggers. + * + * \param gamecontroller The controller to query + * \returns SDL_TRUE, or SDL_FALSE if this controller does not have trigger + * rumble support + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_GameControllerRumbleTriggers + */ +extern DECLSPEC SDL_bool SDLCALL SDL_GameControllerHasRumbleTriggers(SDL_GameController *gamecontroller); + +/** + * Update a game controller's LED color. + * + * \param gamecontroller The controller to update + * \param red The intensity of the red LED + * \param green The intensity of the green LED + * \param blue The intensity of the blue LED + * \returns 0, or -1 if this controller does not have a modifiable LED + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC int SDLCALL SDL_GameControllerSetLED(SDL_GameController *gamecontroller, Uint8 red, Uint8 green, Uint8 blue); + +/** + * Send a controller specific effect packet + * + * \param gamecontroller The controller to affect + * \param data The data to send to the controller + * \param size The size of the data to send to the controller + * \returns 0, or -1 if this controller or driver doesn't support effect + * packets + * + * \since This function is available since SDL 2.0.16. + */ +extern DECLSPEC int SDLCALL SDL_GameControllerSendEffect(SDL_GameController *gamecontroller, const void *data, int size); + +/** + * Close a game controller previously opened with SDL_GameControllerOpen(). + * + * \param gamecontroller a game controller identifier previously returned by + * SDL_GameControllerOpen() + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerOpen */ extern DECLSPEC void SDLCALL SDL_GameControllerClose(SDL_GameController *gamecontroller); +/** + * Return the sfSymbolsName for a given button on a game controller on Apple + * platforms. + * + * \param gamecontroller the controller to query + * \param button a button on the game controller + * \returns the sfSymbolsName or NULL if the name can't be found + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_GameControllerGetAppleSFSymbolsNameForAxis + */ +extern DECLSPEC const char* SDLCALL SDL_GameControllerGetAppleSFSymbolsNameForButton(SDL_GameController *gamecontroller, SDL_GameControllerButton button); + +/** + * Return the sfSymbolsName for a given axis on a game controller on Apple + * platforms. + * + * \param gamecontroller the controller to query + * \param axis an axis on the game controller + * \returns the sfSymbolsName or NULL if the name can't be found + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_GameControllerGetAppleSFSymbolsNameForButton + */ +extern DECLSPEC const char* SDLCALL SDL_GameControllerGetAppleSFSymbolsNameForAxis(SDL_GameController *gamecontroller, SDL_GameControllerAxis axis); + /* Ends C function definitions when using C++ */ #ifdef __cplusplus diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_gesture.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_gesture.h index 9d25e9c1d..e2caea2a9 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_gesture.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_gesture.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -46,36 +46,66 @@ typedef Sint64 SDL_GestureID; /* Function prototypes */ /** - * \brief Begin Recording a gesture on the specified touch, or all touches (-1) + * Begin recording a gesture on a specified touch device or all touch devices. * + * If the parameter `touchId` is -1 (i.e., all devices), this function will + * always return 1, regardless of whether there actually are any devices. * + * \param touchId the touch device id, or -1 for all touch devices + * \returns 1 on success or 0 if the specified device could not be found. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetTouchDevice */ extern DECLSPEC int SDLCALL SDL_RecordGesture(SDL_TouchID touchId); /** - * \brief Save all currently loaded Dollar Gesture templates + * Save all currently loaded Dollar Gesture templates. * + * \param dst a SDL_RWops to save to + * \returns the number of saved templates on success or 0 on failure; call + * SDL_GetError() for more information. * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LoadDollarTemplates + * \sa SDL_SaveDollarTemplate */ extern DECLSPEC int SDLCALL SDL_SaveAllDollarTemplates(SDL_RWops *dst); /** - * \brief Save a currently loaded Dollar Gesture template + * Save a currently loaded Dollar Gesture template. * + * \param gestureId a gesture id + * \param dst a SDL_RWops to save to + * \returns 1 on success or 0 on failure; call SDL_GetError() for more + * information. * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LoadDollarTemplates + * \sa SDL_SaveAllDollarTemplates */ extern DECLSPEC int SDLCALL SDL_SaveDollarTemplate(SDL_GestureID gestureId,SDL_RWops *dst); /** - * \brief Load Dollar Gesture templates from a file + * Load Dollar Gesture templates from a file. * + * \param touchId a touch id + * \param src a SDL_RWops to load from + * \returns the number of loaded templates on success or a negative error code + * (or 0) on failure; call SDL_GetError() for more information. * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SaveAllDollarTemplates + * \sa SDL_SaveDollarTemplate */ extern DECLSPEC int SDLCALL SDL_LoadDollarTemplates(SDL_TouchID touchId, SDL_RWops *src); - /* Ends C function definitions when using C++ */ #ifdef __cplusplus } diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_haptic.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_haptic.h index 075627685..f240ae927 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_haptic.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_haptic.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -76,7 +76,7 @@ * } * * // Create the effect - * memset( &effect, 0, sizeof(SDL_HapticEffect) ); // 0 is safe default + * SDL_memset( &effect, 0, sizeof(SDL_HapticEffect) ); // 0 is safe default * effect.type = SDL_HAPTIC_SINE; * effect.periodic.direction.type = SDL_HAPTIC_POLAR; // Polar coordinates * effect.periodic.direction.dir[0] = 18000; // Force comes from south @@ -336,6 +336,14 @@ typedef struct _SDL_Haptic SDL_Haptic; */ #define SDL_HAPTIC_SPHERICAL 2 +/** + * \brief Use this value to play an effect on the steering wheel axis. This + * provides better compatibility across platforms and devices as SDL will guess + * the correct axis. + * \sa SDL_HapticDirection + */ +#define SDL_HAPTIC_STEERING_AXIS 3 + /* @} *//* Direction encodings */ /* @} *//* Haptic features */ @@ -444,6 +452,7 @@ typedef struct _SDL_Haptic SDL_Haptic; * \sa SDL_HAPTIC_POLAR * \sa SDL_HAPTIC_CARTESIAN * \sa SDL_HAPTIC_SPHERICAL + * \sa SDL_HAPTIC_STEERING_AXIS * \sa SDL_HapticEffect * \sa SDL_HapticNumAxes */ @@ -811,419 +820,513 @@ typedef union SDL_HapticEffect /* Function prototypes */ + /** - * \brief Count the number of haptic devices attached to the system. + * Count the number of haptic devices attached to the system. * - * \return Number of haptic devices detected on the system. + * \returns the number of haptic devices detected on the system or a negative + * error code on failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticName */ extern DECLSPEC int SDLCALL SDL_NumHaptics(void); /** - * \brief Get the implementation dependent name of a haptic device. + * Get the implementation dependent name of a haptic device. * - * This can be called before any joysticks are opened. - * If no name can be found, this function returns NULL. + * This can be called before any joysticks are opened. If no name can be + * found, this function returns NULL. * - * \param device_index Index of the device to get its name. - * \return Name of the device or NULL on error. + * \param device_index index of the device to query. + * \returns the name of the device or NULL on failure; call SDL_GetError() for + * more information. * - * \sa SDL_NumHaptics + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_NumHaptics */ extern DECLSPEC const char *SDLCALL SDL_HapticName(int device_index); /** - * \brief Opens a haptic device for use. + * Open a haptic device for use. * - * The index passed as an argument refers to the N'th haptic device on this - * system. + * The index passed as an argument refers to the N'th haptic device on this + * system. * - * When opening a haptic device, its gain will be set to maximum and - * autocenter will be disabled. To modify these values use - * SDL_HapticSetGain() and SDL_HapticSetAutocenter(). + * When opening a haptic device, its gain will be set to maximum and + * autocenter will be disabled. To modify these values use SDL_HapticSetGain() + * and SDL_HapticSetAutocenter(). * - * \param device_index Index of the device to open. - * \return Device identifier or NULL on error. + * \param device_index index of the device to open + * \returns the device identifier or NULL on failure; call SDL_GetError() for + * more information. * - * \sa SDL_HapticIndex - * \sa SDL_HapticOpenFromMouse - * \sa SDL_HapticOpenFromJoystick - * \sa SDL_HapticClose - * \sa SDL_HapticSetGain - * \sa SDL_HapticSetAutocenter - * \sa SDL_HapticPause - * \sa SDL_HapticStopAll + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticClose + * \sa SDL_HapticIndex + * \sa SDL_HapticOpenFromJoystick + * \sa SDL_HapticOpenFromMouse + * \sa SDL_HapticPause + * \sa SDL_HapticSetAutocenter + * \sa SDL_HapticSetGain + * \sa SDL_HapticStopAll */ extern DECLSPEC SDL_Haptic *SDLCALL SDL_HapticOpen(int device_index); /** - * \brief Checks if the haptic device at index has been opened. + * Check if the haptic device at the designated index has been opened. * - * \param device_index Index to check to see if it has been opened. - * \return 1 if it has been opened or 0 if it hasn't. + * \param device_index the index of the device to query + * \returns 1 if it has been opened, 0 if it hasn't or on failure; call + * SDL_GetError() for more information. * - * \sa SDL_HapticOpen - * \sa SDL_HapticIndex + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticIndex + * \sa SDL_HapticOpen */ extern DECLSPEC int SDLCALL SDL_HapticOpened(int device_index); /** - * \brief Gets the index of a haptic device. + * Get the index of a haptic device. * - * \param haptic Haptic device to get the index of. - * \return The index of the haptic device or -1 on error. + * \param haptic the SDL_Haptic device to query + * \returns the index of the specified haptic device or a negative error code + * on failure; call SDL_GetError() for more information. * - * \sa SDL_HapticOpen - * \sa SDL_HapticOpened + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticOpen + * \sa SDL_HapticOpened */ extern DECLSPEC int SDLCALL SDL_HapticIndex(SDL_Haptic * haptic); /** - * \brief Gets whether or not the current mouse has haptic capabilities. + * Query whether or not the current mouse has haptic capabilities. * - * \return SDL_TRUE if the mouse is haptic, SDL_FALSE if it isn't. + * \returns SDL_TRUE if the mouse is haptic or SDL_FALSE if it isn't. * - * \sa SDL_HapticOpenFromMouse + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticOpenFromMouse */ extern DECLSPEC int SDLCALL SDL_MouseIsHaptic(void); /** - * \brief Tries to open a haptic device from the current mouse. + * Try to open a haptic device from the current mouse. * - * \return The haptic device identifier or NULL on error. + * \returns the haptic device identifier or NULL on failure; call + * SDL_GetError() for more information. * - * \sa SDL_MouseIsHaptic - * \sa SDL_HapticOpen + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticOpen + * \sa SDL_MouseIsHaptic */ extern DECLSPEC SDL_Haptic *SDLCALL SDL_HapticOpenFromMouse(void); /** - * \brief Checks to see if a joystick has haptic features. + * Query if a joystick has haptic features. * - * \param joystick Joystick to test for haptic capabilities. - * \return SDL_TRUE if the joystick is haptic, SDL_FALSE if it isn't - * or -1 if an error occurred. + * \param joystick the SDL_Joystick to test for haptic capabilities + * \returns SDL_TRUE if the joystick is haptic, SDL_FALSE if it isn't, or a + * negative error code on failure; call SDL_GetError() for more + * information. * - * \sa SDL_HapticOpenFromJoystick + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticOpenFromJoystick */ extern DECLSPEC int SDLCALL SDL_JoystickIsHaptic(SDL_Joystick * joystick); /** - * \brief Opens a haptic device for use from a joystick device. + * Open a haptic device for use from a joystick device. * - * You must still close the haptic device separately. It will not be closed - * with the joystick. + * You must still close the haptic device separately. It will not be closed + * with the joystick. * - * When opening from a joystick you should first close the haptic device before - * closing the joystick device. If not, on some implementations the haptic - * device will also get unallocated and you'll be unable to use force feedback - * on that device. + * When opened from a joystick you should first close the haptic device before + * closing the joystick device. If not, on some implementations the haptic + * device will also get unallocated and you'll be unable to use force feedback + * on that device. * - * \param joystick Joystick to create a haptic device from. - * \return A valid haptic device identifier on success or NULL on error. + * \param joystick the SDL_Joystick to create a haptic device from + * \returns a valid haptic device identifier on success or NULL on failure; + * call SDL_GetError() for more information. * - * \sa SDL_HapticOpen - * \sa SDL_HapticClose + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticClose + * \sa SDL_HapticOpen + * \sa SDL_JoystickIsHaptic */ extern DECLSPEC SDL_Haptic *SDLCALL SDL_HapticOpenFromJoystick(SDL_Joystick * joystick); /** - * \brief Closes a haptic device previously opened with SDL_HapticOpen(). + * Close a haptic device previously opened with SDL_HapticOpen(). * - * \param haptic Haptic device to close. + * \param haptic the SDL_Haptic device to close + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticOpen */ extern DECLSPEC void SDLCALL SDL_HapticClose(SDL_Haptic * haptic); /** - * \brief Returns the number of effects a haptic device can store. + * Get the number of effects a haptic device can store. * - * On some platforms this isn't fully supported, and therefore is an - * approximation. Always check to see if your created effect was actually - * created and do not rely solely on SDL_HapticNumEffects(). + * On some platforms this isn't fully supported, and therefore is an + * approximation. Always check to see if your created effect was actually + * created and do not rely solely on SDL_HapticNumEffects(). * - * \param haptic The haptic device to query effect max. - * \return The number of effects the haptic device can store or - * -1 on error. + * \param haptic the SDL_Haptic device to query + * \returns the number of effects the haptic device can store or a negative + * error code on failure; call SDL_GetError() for more information. * - * \sa SDL_HapticNumEffectsPlaying - * \sa SDL_HapticQuery + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticNumEffectsPlaying + * \sa SDL_HapticQuery */ extern DECLSPEC int SDLCALL SDL_HapticNumEffects(SDL_Haptic * haptic); /** - * \brief Returns the number of effects a haptic device can play at the same - * time. + * Get the number of effects a haptic device can play at the same time. * - * This is not supported on all platforms, but will always return a value. - * Added here for the sake of completeness. + * This is not supported on all platforms, but will always return a value. * - * \param haptic The haptic device to query maximum playing effects. - * \return The number of effects the haptic device can play at the same time - * or -1 on error. + * \param haptic the SDL_Haptic device to query maximum playing effects + * \returns the number of effects the haptic device can play at the same time + * or a negative error code on failure; call SDL_GetError() for more + * information. * - * \sa SDL_HapticNumEffects - * \sa SDL_HapticQuery + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticNumEffects + * \sa SDL_HapticQuery */ extern DECLSPEC int SDLCALL SDL_HapticNumEffectsPlaying(SDL_Haptic * haptic); /** - * \brief Gets the haptic device's supported features in bitwise manner. + * Get the haptic device's supported features in bitwise manner. * - * Example: - * \code - * if (SDL_HapticQuery(haptic) & SDL_HAPTIC_CONSTANT) { - * printf("We have constant haptic effect!\n"); - * } - * \endcode + * \param haptic the SDL_Haptic device to query + * \returns a list of supported haptic features in bitwise manner (OR'd), or 0 + * on failure; call SDL_GetError() for more information. * - * \param haptic The haptic device to query. - * \return Haptic features in bitwise manner (OR'd). + * \since This function is available since SDL 2.0.0. * - * \sa SDL_HapticNumEffects - * \sa SDL_HapticEffectSupported + * \sa SDL_HapticEffectSupported + * \sa SDL_HapticNumEffects */ extern DECLSPEC unsigned int SDLCALL SDL_HapticQuery(SDL_Haptic * haptic); /** - * \brief Gets the number of haptic axes the device has. + * Get the number of haptic axes the device has. * - * \sa SDL_HapticDirection + * The number of haptic axes might be useful if working with the + * SDL_HapticDirection effect. + * + * \param haptic the SDL_Haptic device to query + * \returns the number of axes on success or a negative error code on failure; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC int SDLCALL SDL_HapticNumAxes(SDL_Haptic * haptic); /** - * \brief Checks to see if effect is supported by haptic. + * Check to see if an effect is supported by a haptic device. * - * \param haptic Haptic device to check on. - * \param effect Effect to check to see if it is supported. - * \return SDL_TRUE if effect is supported, SDL_FALSE if it isn't or -1 on error. + * \param haptic the SDL_Haptic device to query + * \param effect the desired effect to query + * \returns SDL_TRUE if effect is supported, SDL_FALSE if it isn't, or a + * negative error code on failure; call SDL_GetError() for more + * information. * - * \sa SDL_HapticQuery - * \sa SDL_HapticNewEffect + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticNewEffect + * \sa SDL_HapticQuery */ extern DECLSPEC int SDLCALL SDL_HapticEffectSupported(SDL_Haptic * haptic, SDL_HapticEffect * effect); /** - * \brief Creates a new haptic effect on the device. + * Create a new haptic effect on a specified device. * - * \param haptic Haptic device to create the effect on. - * \param effect Properties of the effect to create. - * \return The identifier of the effect on success or -1 on error. + * \param haptic an SDL_Haptic device to create the effect on + * \param effect an SDL_HapticEffect structure containing the properties of + * the effect to create + * \returns the ID of the effect on success or a negative error code on + * failure; call SDL_GetError() for more information. * - * \sa SDL_HapticUpdateEffect - * \sa SDL_HapticRunEffect - * \sa SDL_HapticDestroyEffect + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticDestroyEffect + * \sa SDL_HapticRunEffect + * \sa SDL_HapticUpdateEffect */ extern DECLSPEC int SDLCALL SDL_HapticNewEffect(SDL_Haptic * haptic, SDL_HapticEffect * effect); /** - * \brief Updates the properties of an effect. + * Update the properties of an effect. * - * Can be used dynamically, although behavior when dynamically changing - * direction may be strange. Specifically the effect may reupload itself - * and start playing from the start. You cannot change the type either when - * running SDL_HapticUpdateEffect(). + * Can be used dynamically, although behavior when dynamically changing + * direction may be strange. Specifically the effect may re-upload itself and + * start playing from the start. You also cannot change the type either when + * running SDL_HapticUpdateEffect(). * - * \param haptic Haptic device that has the effect. - * \param effect Identifier of the effect to update. - * \param data New effect properties to use. - * \return 0 on success or -1 on error. + * \param haptic the SDL_Haptic device that has the effect + * \param effect the identifier of the effect to update + * \param data an SDL_HapticEffect structure containing the new effect + * properties to use + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_HapticNewEffect - * \sa SDL_HapticRunEffect - * \sa SDL_HapticDestroyEffect + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticDestroyEffect + * \sa SDL_HapticNewEffect + * \sa SDL_HapticRunEffect */ extern DECLSPEC int SDLCALL SDL_HapticUpdateEffect(SDL_Haptic * haptic, int effect, SDL_HapticEffect * data); /** - * \brief Runs the haptic effect on its associated haptic device. + * Run the haptic effect on its associated haptic device. * - * If iterations are ::SDL_HAPTIC_INFINITY, it'll run the effect over and over - * repeating the envelope (attack and fade) every time. If you only want the - * effect to last forever, set ::SDL_HAPTIC_INFINITY in the effect's length - * parameter. + * To repeat the effect over and over indefinitely, set `iterations` to + * `SDL_HAPTIC_INFINITY`. (Repeats the envelope - attack and fade.) To make + * one instance of the effect last indefinitely (so the effect does not fade), + * set the effect's `length` in its structure/union to `SDL_HAPTIC_INFINITY` + * instead. * - * \param haptic Haptic device to run the effect on. - * \param effect Identifier of the haptic effect to run. - * \param iterations Number of iterations to run the effect. Use - * ::SDL_HAPTIC_INFINITY for infinity. - * \return 0 on success or -1 on error. + * \param haptic the SDL_Haptic device to run the effect on + * \param effect the ID of the haptic effect to run + * \param iterations the number of iterations to run the effect; use + * `SDL_HAPTIC_INFINITY` to repeat forever + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_HapticStopEffect - * \sa SDL_HapticDestroyEffect - * \sa SDL_HapticGetEffectStatus + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticDestroyEffect + * \sa SDL_HapticGetEffectStatus + * \sa SDL_HapticStopEffect */ extern DECLSPEC int SDLCALL SDL_HapticRunEffect(SDL_Haptic * haptic, int effect, Uint32 iterations); /** - * \brief Stops the haptic effect on its associated haptic device. + * Stop the haptic effect on its associated haptic device. * - * \param haptic Haptic device to stop the effect on. - * \param effect Identifier of the effect to stop. - * \return 0 on success or -1 on error. + * * * - * \sa SDL_HapticRunEffect - * \sa SDL_HapticDestroyEffect + * \param haptic the SDL_Haptic device to stop the effect on + * \param effect the ID of the haptic effect to stop + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticDestroyEffect + * \sa SDL_HapticRunEffect */ extern DECLSPEC int SDLCALL SDL_HapticStopEffect(SDL_Haptic * haptic, int effect); /** - * \brief Destroys a haptic effect on the device. + * Destroy a haptic effect on the device. * - * This will stop the effect if it's running. Effects are automatically - * destroyed when the device is closed. + * This will stop the effect if it's running. Effects are automatically + * destroyed when the device is closed. * - * \param haptic Device to destroy the effect on. - * \param effect Identifier of the effect to destroy. + * \param haptic the SDL_Haptic device to destroy the effect on + * \param effect the ID of the haptic effect to destroy * - * \sa SDL_HapticNewEffect + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticNewEffect */ extern DECLSPEC void SDLCALL SDL_HapticDestroyEffect(SDL_Haptic * haptic, int effect); /** - * \brief Gets the status of the current effect on the haptic device. + * Get the status of the current effect on the specified haptic device. * - * Device must support the ::SDL_HAPTIC_STATUS feature. + * Device must support the SDL_HAPTIC_STATUS feature. * - * \param haptic Haptic device to query the effect status on. - * \param effect Identifier of the effect to query its status. - * \return 0 if it isn't playing, 1 if it is playing or -1 on error. + * \param haptic the SDL_Haptic device to query for the effect status on + * \param effect the ID of the haptic effect to query its status + * \returns 0 if it isn't playing, 1 if it is playing, or a negative error + * code on failure; call SDL_GetError() for more information. * - * \sa SDL_HapticRunEffect - * \sa SDL_HapticStopEffect + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticRunEffect + * \sa SDL_HapticStopEffect */ extern DECLSPEC int SDLCALL SDL_HapticGetEffectStatus(SDL_Haptic * haptic, int effect); /** - * \brief Sets the global gain of the device. + * Set the global gain of the specified haptic device. * - * Device must support the ::SDL_HAPTIC_GAIN feature. + * Device must support the SDL_HAPTIC_GAIN feature. * - * The user may specify the maximum gain by setting the environment variable - * SDL_HAPTIC_GAIN_MAX which should be between 0 and 100. All calls to - * SDL_HapticSetGain() will scale linearly using SDL_HAPTIC_GAIN_MAX as the - * maximum. + * The user may specify the maximum gain by setting the environment variable + * `SDL_HAPTIC_GAIN_MAX` which should be between 0 and 100. All calls to + * SDL_HapticSetGain() will scale linearly using `SDL_HAPTIC_GAIN_MAX` as the + * maximum. * - * \param haptic Haptic device to set the gain on. - * \param gain Value to set the gain to, should be between 0 and 100. - * \return 0 on success or -1 on error. + * \param haptic the SDL_Haptic device to set the gain on + * \param gain value to set the gain to, should be between 0 and 100 (0 - 100) + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_HapticQuery + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticQuery */ extern DECLSPEC int SDLCALL SDL_HapticSetGain(SDL_Haptic * haptic, int gain); /** - * \brief Sets the global autocenter of the device. + * Set the global autocenter of the device. * - * Autocenter should be between 0 and 100. Setting it to 0 will disable - * autocentering. + * Autocenter should be between 0 and 100. Setting it to 0 will disable + * autocentering. * - * Device must support the ::SDL_HAPTIC_AUTOCENTER feature. + * Device must support the SDL_HAPTIC_AUTOCENTER feature. * - * \param haptic Haptic device to set autocentering on. - * \param autocenter Value to set autocenter to, 0 disables autocentering. - * \return 0 on success or -1 on error. + * \param haptic the SDL_Haptic device to set autocentering on + * \param autocenter value to set autocenter to (0-100) + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_HapticQuery + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticQuery */ extern DECLSPEC int SDLCALL SDL_HapticSetAutocenter(SDL_Haptic * haptic, int autocenter); /** - * \brief Pauses a haptic device. + * Pause a haptic device. * - * Device must support the ::SDL_HAPTIC_PAUSE feature. Call - * SDL_HapticUnpause() to resume playback. + * Device must support the `SDL_HAPTIC_PAUSE` feature. Call + * SDL_HapticUnpause() to resume playback. * - * Do not modify the effects nor add new ones while the device is paused. - * That can cause all sorts of weird errors. + * Do not modify the effects nor add new ones while the device is paused. That + * can cause all sorts of weird errors. * - * \param haptic Haptic device to pause. - * \return 0 on success or -1 on error. + * \param haptic the SDL_Haptic device to pause + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_HapticUnpause + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticUnpause */ extern DECLSPEC int SDLCALL SDL_HapticPause(SDL_Haptic * haptic); /** - * \brief Unpauses a haptic device. + * Unpause a haptic device. * - * Call to unpause after SDL_HapticPause(). + * Call to unpause after SDL_HapticPause(). * - * \param haptic Haptic device to unpause. - * \return 0 on success or -1 on error. + * \param haptic the SDL_Haptic device to unpause + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_HapticPause + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticPause */ extern DECLSPEC int SDLCALL SDL_HapticUnpause(SDL_Haptic * haptic); /** - * \brief Stops all the currently playing effects on a haptic device. + * Stop all the currently playing effects on a haptic device. * - * \param haptic Haptic device to stop. - * \return 0 on success or -1 on error. + * \param haptic the SDL_Haptic device to stop + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC int SDLCALL SDL_HapticStopAll(SDL_Haptic * haptic); /** - * \brief Checks to see if rumble is supported on a haptic device. + * Check whether rumble is supported on a haptic device. * - * \param haptic Haptic device to check to see if it supports rumble. - * \return SDL_TRUE if effect is supported, SDL_FALSE if it isn't or -1 on error. + * \param haptic haptic device to check for rumble support + * \returns SDL_TRUE if effect is supported, SDL_FALSE if it isn't, or a + * negative error code on failure; call SDL_GetError() for more + * information. * - * \sa SDL_HapticRumbleInit - * \sa SDL_HapticRumblePlay - * \sa SDL_HapticRumbleStop + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticRumbleInit + * \sa SDL_HapticRumblePlay + * \sa SDL_HapticRumbleStop */ extern DECLSPEC int SDLCALL SDL_HapticRumbleSupported(SDL_Haptic * haptic); /** - * \brief Initializes the haptic device for simple rumble playback. + * Initialize a haptic device for simple rumble playback. * - * \param haptic Haptic device to initialize for simple rumble playback. - * \return 0 on success or -1 on error. + * \param haptic the haptic device to initialize for simple rumble playback + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_HapticOpen - * \sa SDL_HapticRumbleSupported - * \sa SDL_HapticRumblePlay - * \sa SDL_HapticRumbleStop + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticOpen + * \sa SDL_HapticRumblePlay + * \sa SDL_HapticRumbleStop + * \sa SDL_HapticRumbleSupported */ extern DECLSPEC int SDLCALL SDL_HapticRumbleInit(SDL_Haptic * haptic); /** - * \brief Runs simple rumble on a haptic device + * Run a simple rumble effect on a haptic device. * - * \param haptic Haptic device to play rumble effect on. - * \param strength Strength of the rumble to play as a 0-1 float value. - * \param length Length of the rumble to play in milliseconds. - * \return 0 on success or -1 on error. + * \param haptic the haptic device to play the rumble effect on + * \param strength strength of the rumble to play as a 0-1 float value + * \param length length of the rumble to play in milliseconds + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_HapticRumbleSupported - * \sa SDL_HapticRumbleInit - * \sa SDL_HapticRumbleStop + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticRumbleInit + * \sa SDL_HapticRumbleStop + * \sa SDL_HapticRumbleSupported */ extern DECLSPEC int SDLCALL SDL_HapticRumblePlay(SDL_Haptic * haptic, float strength, Uint32 length ); /** - * \brief Stops the simple rumble on a haptic device. + * Stop the simple rumble on a haptic device. * - * \param haptic Haptic to stop the rumble on. - * \return 0 on success or -1 on error. + * \param haptic the haptic device to stop the rumble effect on + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_HapticRumbleSupported - * \sa SDL_HapticRumbleInit - * \sa SDL_HapticRumblePlay + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticRumbleInit + * \sa SDL_HapticRumblePlay + * \sa SDL_HapticRumbleSupported */ extern DECLSPEC int SDLCALL SDL_HapticRumbleStop(SDL_Haptic * haptic); diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_hidapi.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_hidapi.h new file mode 100644 index 000000000..354af5c52 --- /dev/null +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_hidapi.h @@ -0,0 +1,451 @@ +/* + Simple DirectMedia Layer + Copyright (C) 1997-2022 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ + +/** + * \file SDL_hidapi.h + * + * Header file for SDL HIDAPI functions. + * + * This is an adaptation of the original HIDAPI interface by Alan Ott, + * and includes source code licensed under the following BSD license: + * + Copyright (c) 2010, Alan Ott, Signal 11 Software + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of Signal 11 Software nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + * + * If you would like a version of SDL without this code, you can build SDL + * with SDL_HIDAPI_DISABLED defined to 1. You might want to do this for example + * on iOS or tvOS to avoid a dependency on the CoreBluetooth framework. + */ + +#ifndef SDL_hidapi_h_ +#define SDL_hidapi_h_ + +#include "SDL_stdinc.h" + +#include "begin_code.h" +/* Set up for C function definitions, even when using C++ */ +#ifdef __cplusplus +extern "C" { +#endif + +/** + * \brief A handle representing an open HID device + */ +struct SDL_hid_device_; +typedef struct SDL_hid_device_ SDL_hid_device; /**< opaque hidapi structure */ + +/** hidapi info structure */ +/** + * \brief Information about a connected HID device + */ +typedef struct SDL_hid_device_info +{ + /** Platform-specific device path */ + char *path; + /** Device Vendor ID */ + unsigned short vendor_id; + /** Device Product ID */ + unsigned short product_id; + /** Serial Number */ + wchar_t *serial_number; + /** Device Release Number in binary-coded decimal, + also known as Device Version Number */ + unsigned short release_number; + /** Manufacturer String */ + wchar_t *manufacturer_string; + /** Product string */ + wchar_t *product_string; + /** Usage Page for this Device/Interface + (Windows/Mac only). */ + unsigned short usage_page; + /** Usage for this Device/Interface + (Windows/Mac only).*/ + unsigned short usage; + /** The USB interface which this logical device + represents. + + * Valid on both Linux implementations in all cases. + * Valid on the Windows implementation only if the device + contains more than one interface. */ + int interface_number; + + /** Additional information about the USB interface. + Valid on libusb and Android implementations. */ + int interface_class; + int interface_subclass; + int interface_protocol; + + /** Pointer to the next device */ + struct SDL_hid_device_info *next; +} SDL_hid_device_info; + + +/** + * Initialize the HIDAPI library. + * + * This function initializes the HIDAPI library. Calling it is not strictly + * necessary, as it will be called automatically by SDL_hid_enumerate() and + * any of the SDL_hid_open_*() functions if it is needed. This function should + * be called at the beginning of execution however, if there is a chance of + * HIDAPI handles being opened by different threads simultaneously. + * + * Each call to this function should have a matching call to SDL_hid_exit() + * + * \returns 0 on success and -1 on error. + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_hid_exit + */ +extern DECLSPEC int SDLCALL SDL_hid_init(void); + +/** + * Finalize the HIDAPI library. + * + * This function frees all of the static data associated with HIDAPI. It + * should be called at the end of execution to avoid memory leaks. + * + * \returns 0 on success and -1 on error. + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_hid_init + */ +extern DECLSPEC int SDLCALL SDL_hid_exit(void); + +/** + * Check to see if devices may have been added or removed. + * + * Enumerating the HID devices is an expensive operation, so you can call this + * to see if there have been any system device changes since the last call to + * this function. A change in the counter returned doesn't necessarily mean + * that anything has changed, but you can call SDL_hid_enumerate() to get an + * updated device list. + * + * Calling this function for the first time may cause a thread or other system + * resource to be allocated to track device change notifications. + * + * \returns a change counter that is incremented with each potential device + * change, or 0 if device change detection isn't available. + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_hid_enumerate + */ +extern DECLSPEC Uint32 SDLCALL SDL_hid_device_change_count(void); + +/** + * Enumerate the HID Devices. + * + * This function returns a linked list of all the HID devices attached to the + * system which match vendor_id and product_id. If `vendor_id` is set to 0 + * then any vendor matches. If `product_id` is set to 0 then any product + * matches. If `vendor_id` and `product_id` are both set to 0, then all HID + * devices will be returned. + * + * \param vendor_id The Vendor ID (VID) of the types of device to open. + * \param product_id The Product ID (PID) of the types of device to open. + * \returns a pointer to a linked list of type SDL_hid_device_info, containing + * information about the HID devices attached to the system, or NULL + * in the case of failure. Free this linked list by calling + * SDL_hid_free_enumeration(). + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_hid_device_change_count + */ +extern DECLSPEC SDL_hid_device_info * SDLCALL SDL_hid_enumerate(unsigned short vendor_id, unsigned short product_id); + +/** + * Free an enumeration Linked List + * + * This function frees a linked list created by SDL_hid_enumerate(). + * + * \param devs Pointer to a list of struct_device returned from + * SDL_hid_enumerate(). + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC void SDLCALL SDL_hid_free_enumeration(SDL_hid_device_info *devs); + +/** + * Open a HID device using a Vendor ID (VID), Product ID (PID) and optionally + * a serial number. + * + * If `serial_number` is NULL, the first device with the specified VID and PID + * is opened. + * + * \param vendor_id The Vendor ID (VID) of the device to open. + * \param product_id The Product ID (PID) of the device to open. + * \param serial_number The Serial Number of the device to open (Optionally + * NULL). + * \returns a pointer to a SDL_hid_device object on success or NULL on + * failure. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC SDL_hid_device * SDLCALL SDL_hid_open(unsigned short vendor_id, unsigned short product_id, const wchar_t *serial_number); + +/** + * Open a HID device by its path name. + * + * The path name be determined by calling SDL_hid_enumerate(), or a + * platform-specific path name can be used (eg: /dev/hidraw0 on Linux). + * + * \param path The path name of the device to open + * \returns a pointer to a SDL_hid_device object on success or NULL on + * failure. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC SDL_hid_device * SDLCALL SDL_hid_open_path(const char *path, int bExclusive /* = false */); + +/** + * Write an Output report to a HID device. + * + * The first byte of `data` must contain the Report ID. For devices which only + * support a single report, this must be set to 0x0. The remaining bytes + * contain the report data. Since the Report ID is mandatory, calls to + * SDL_hid_write() will always contain one more byte than the report contains. + * For example, if a hid report is 16 bytes long, 17 bytes must be passed to + * SDL_hid_write(), the Report ID (or 0x0, for devices with a single report), + * followed by the report data (16 bytes). In this example, the length passed + * in would be 17. + * + * SDL_hid_write() will send the data on the first OUT endpoint, if one + * exists. If it does not, it will send the data through the Control Endpoint + * (Endpoint 0). + * + * \param dev A device handle returned from SDL_hid_open(). + * \param data The data to send, including the report number as the first + * byte. + * \param length The length in bytes of the data to send. + * \returns the actual number of bytes written and -1 on error. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_hid_write(SDL_hid_device *dev, const unsigned char *data, size_t length); + +/** + * Read an Input report from a HID device with timeout. + * + * Input reports are returned to the host through the INTERRUPT IN endpoint. + * The first byte will contain the Report number if the device uses numbered + * reports. + * + * \param dev A device handle returned from SDL_hid_open(). + * \param data A buffer to put the read data into. + * \param length The number of bytes to read. For devices with multiple + * reports, make sure to read an extra byte for the report + * number. + * \param milliseconds timeout in milliseconds or -1 for blocking wait. + * \returns the actual number of bytes read and -1 on error. If no packet was + * available to be read within the timeout period, this function + * returns 0. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_hid_read_timeout(SDL_hid_device *dev, unsigned char *data, size_t length, int milliseconds); + +/** + * Read an Input report from a HID device. + * + * Input reports are returned to the host through the INTERRUPT IN endpoint. + * The first byte will contain the Report number if the device uses numbered + * reports. + * + * \param dev A device handle returned from SDL_hid_open(). + * \param data A buffer to put the read data into. + * \param length The number of bytes to read. For devices with multiple + * reports, make sure to read an extra byte for the report + * number. + * \returns the actual number of bytes read and -1 on error. If no packet was + * available to be read and the handle is in non-blocking mode, this + * function returns 0. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_hid_read(SDL_hid_device *dev, unsigned char *data, size_t length); + +/** + * Set the device handle to be non-blocking. + * + * In non-blocking mode calls to SDL_hid_read() will return immediately with a + * value of 0 if there is no data to be read. In blocking mode, SDL_hid_read() + * will wait (block) until there is data to read before returning. + * + * Nonblocking can be turned on and off at any time. + * + * \param dev A device handle returned from SDL_hid_open(). + * \param nonblock enable or not the nonblocking reads - 1 to enable + * nonblocking - 0 to disable nonblocking. + * \returns 0 on success and -1 on error. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_hid_set_nonblocking(SDL_hid_device *dev, int nonblock); + +/** + * Send a Feature report to the device. + * + * Feature reports are sent over the Control endpoint as a Set_Report + * transfer. The first byte of `data` must contain the Report ID. For devices + * which only support a single report, this must be set to 0x0. The remaining + * bytes contain the report data. Since the Report ID is mandatory, calls to + * SDL_hid_send_feature_report() will always contain one more byte than the + * report contains. For example, if a hid report is 16 bytes long, 17 bytes + * must be passed to SDL_hid_send_feature_report(): the Report ID (or 0x0, for + * devices which do not use numbered reports), followed by the report data (16 + * bytes). In this example, the length passed in would be 17. + * + * \param dev A device handle returned from SDL_hid_open(). + * \param data The data to send, including the report number as the first + * byte. + * \param length The length in bytes of the data to send, including the report + * number. + * \returns the actual number of bytes written and -1 on error. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_hid_send_feature_report(SDL_hid_device *dev, const unsigned char *data, size_t length); + +/** + * Get a feature report from a HID device. + * + * Set the first byte of `data` to the Report ID of the report to be read. + * Make sure to allow space for this extra byte in `data`. Upon return, the + * first byte will still contain the Report ID, and the report data will start + * in data[1]. + * + * \param dev A device handle returned from SDL_hid_open(). + * \param data A buffer to put the read data into, including the Report ID. + * Set the first byte of `data` to the Report ID of the report to + * be read, or set it to zero if your device does not use numbered + * reports. + * \param length The number of bytes to read, including an extra byte for the + * report ID. The buffer can be longer than the actual report. + * \returns the number of bytes read plus one for the report ID (which is + * still in the first byte), or -1 on error. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_hid_get_feature_report(SDL_hid_device *dev, unsigned char *data, size_t length); + +/** + * Close a HID device. + * + * \param dev A device handle returned from SDL_hid_open(). + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC void SDLCALL SDL_hid_close(SDL_hid_device *dev); + +/** + * Get The Manufacturer String from a HID device. + * + * \param dev A device handle returned from SDL_hid_open(). + * \param string A wide string buffer to put the data into. + * \param maxlen The length of the buffer in multiples of wchar_t. + * \returns 0 on success and -1 on error. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_hid_get_manufacturer_string(SDL_hid_device *dev, wchar_t *string, size_t maxlen); + +/** + * Get The Product String from a HID device. + * + * \param dev A device handle returned from SDL_hid_open(). + * \param string A wide string buffer to put the data into. + * \param maxlen The length of the buffer in multiples of wchar_t. + * \returns 0 on success and -1 on error. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_hid_get_product_string(SDL_hid_device *dev, wchar_t *string, size_t maxlen); + +/** + * Get The Serial Number String from a HID device. + * + * \param dev A device handle returned from SDL_hid_open(). + * \param string A wide string buffer to put the data into. + * \param maxlen The length of the buffer in multiples of wchar_t. + * \returns 0 on success and -1 on error. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_hid_get_serial_number_string(SDL_hid_device *dev, wchar_t *string, size_t maxlen); + +/** + * Get a string from a HID device, based on its string index. + * + * \param dev A device handle returned from SDL_hid_open(). + * \param string_index The index of the string to get. + * \param string A wide string buffer to put the data into. + * \param maxlen The length of the buffer in multiples of wchar_t. + * \returns 0 on success and -1 on error. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_hid_get_indexed_string(SDL_hid_device *dev, int string_index, wchar_t *string, size_t maxlen); + +/** + * Start or stop a BLE scan on iOS and tvOS to pair Steam Controllers + * + * \param active SDL_TRUE to start the scan, SDL_FALSE to stop the scan + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC void SDLCALL SDL_hid_ble_scan(SDL_bool active); + +/* Ends C function definitions when using C++ */ +#ifdef __cplusplus +} +#endif +#include "close_code.h" + +#endif /* SDL_hidapi_h_ */ + +/* vi: set sts=4 ts=4 sw=4 expandtab: */ diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_hints.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_hints.h index 8fa0dd660..1185f4222 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_hints.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_hints.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -48,316 +48,122 @@ extern "C" { #endif /** - * \brief A variable controlling how 3D acceleration is used to accelerate the SDL screen surface. - * - * SDL can try to accelerate the SDL screen surface by using streaming - * textures with a 3D rendering engine. This variable controls whether and - * how this is done. + * \brief A variable controlling whether the Android / iOS built-in + * accelerometer should be listed as a joystick device. * * This variable can be set to the following values: - * "0" - Disable 3D acceleration - * "1" - Enable 3D acceleration, using the default renderer. - * "X" - Enable 3D acceleration, using X where X is one of the valid rendering drivers. (e.g. "direct3d", "opengl", etc.) - * - * By default SDL tries to make a best guess for each platform whether - * to use acceleration or not. + * "0" - The accelerometer is not listed as a joystick + * "1" - The accelerometer is available as a 3 axis joystick (the default). */ -#define SDL_HINT_FRAMEBUFFER_ACCELERATION "SDL_FRAMEBUFFER_ACCELERATION" +#define SDL_HINT_ACCELEROMETER_AS_JOYSTICK "SDL_ACCELEROMETER_AS_JOYSTICK" /** - * \brief A variable specifying which render driver to use. + * \brief Specify the behavior of Alt+Tab while the keyboard is grabbed. * - * If the application doesn't pick a specific renderer to use, this variable - * specifies the name of the preferred renderer. If the preferred renderer - * can't be initialized, the normal default renderer is used. + * By default, SDL emulates Alt+Tab functionality while the keyboard is grabbed + * and your window is full-screen. This prevents the user from getting stuck in + * your application if you've enabled keyboard grab. * - * This variable is case insensitive and can be set to the following values: - * "direct3d" - * "opengl" - * "opengles2" - * "opengles" - * "metal" - * "software" - * - * The default varies by platform, but it's the first one in the list that - * is available on the current platform. - */ -#define SDL_HINT_RENDER_DRIVER "SDL_RENDER_DRIVER" + * The variable can be set to the following values: + * "0" - SDL will not handle Alt+Tab. Your application is responsible + for handling Alt+Tab while the keyboard is grabbed. + * "1" - SDL will minimize your window when Alt+Tab is pressed (default) +*/ +#define SDL_HINT_ALLOW_ALT_TAB_WHILE_GRABBED "SDL_ALLOW_ALT_TAB_WHILE_GRABBED" /** - * \brief A variable controlling whether the OpenGL render driver uses shaders if they are available. + * \brief If set to "0" then never set the top most bit on a SDL Window, even if the video mode expects it. + * This is a debugging aid for developers and not expected to be used by end users. The default is "1" * * This variable can be set to the following values: - * "0" - Disable shaders - * "1" - Enable shaders - * - * By default shaders are used if OpenGL supports them. + * "0" - don't allow topmost + * "1" - allow topmost */ -#define SDL_HINT_RENDER_OPENGL_SHADERS "SDL_RENDER_OPENGL_SHADERS" +#define SDL_HINT_ALLOW_TOPMOST "SDL_ALLOW_TOPMOST" /** - * \brief A variable controlling whether the Direct3D device is initialized for thread-safe operations. + * \brief Android APK expansion main file version. Should be a string number like "1", "2" etc. * - * This variable can be set to the following values: - * "0" - Thread-safety is not enabled (faster) - * "1" - Thread-safety is enabled + * Must be set together with SDL_HINT_ANDROID_APK_EXPANSION_PATCH_FILE_VERSION. * - * By default the Direct3D device is created with thread-safety disabled. + * If both hints were set then SDL_RWFromFile() will look into expansion files + * after a given relative path was not found in the internal storage and assets. + * + * By default this hint is not set and the APK expansion files are not searched. */ -#define SDL_HINT_RENDER_DIRECT3D_THREADSAFE "SDL_RENDER_DIRECT3D_THREADSAFE" +#define SDL_HINT_ANDROID_APK_EXPANSION_MAIN_FILE_VERSION "SDL_ANDROID_APK_EXPANSION_MAIN_FILE_VERSION" + +/** + * \brief Android APK expansion patch file version. Should be a string number like "1", "2" etc. + * + * Must be set together with SDL_HINT_ANDROID_APK_EXPANSION_MAIN_FILE_VERSION. + * + * If both hints were set then SDL_RWFromFile() will look into expansion files + * after a given relative path was not found in the internal storage and assets. + * + * By default this hint is not set and the APK expansion files are not searched. + */ +#define SDL_HINT_ANDROID_APK_EXPANSION_PATCH_FILE_VERSION "SDL_ANDROID_APK_EXPANSION_PATCH_FILE_VERSION" /** - * \brief A variable controlling whether to enable Direct3D 11+'s Debug Layer. + * \brief A variable to control whether the event loop will block itself when the app is paused. * - * This variable does not have any effect on the Direct3D 9 based renderer. + * The variable can be set to the following values: + * "0" - Non blocking. + * "1" - Blocking. (default) * - * This variable can be set to the following values: - * "0" - Disable Debug Layer use - * "1" - Enable Debug Layer use - * - * By default, SDL does not use Direct3D Debug Layer. + * The value should be set before SDL is initialized. */ -#define SDL_HINT_RENDER_DIRECT3D11_DEBUG "SDL_RENDER_DIRECT3D11_DEBUG" +#define SDL_HINT_ANDROID_BLOCK_ON_PAUSE "SDL_ANDROID_BLOCK_ON_PAUSE" /** - * \brief A variable controlling the scaling policy for SDL_RenderSetLogicalSize. + * \brief A variable to control whether SDL will pause audio in background + * (Requires SDL_ANDROID_BLOCK_ON_PAUSE as "Non blocking") * - * This variable can be set to the following values: - * "0" or "letterbox" - Uses letterbox/sidebars to fit the entire rendering on screen - * "1" or "overscan" - Will zoom the rendering so it fills the entire screen, allowing edges to be drawn offscreen + * The variable can be set to the following values: + * "0" - Non paused. + * "1" - Paused. (default) * - * By default letterbox is used + * The value should be set before SDL is initialized. */ -#define SDL_HINT_RENDER_LOGICAL_SIZE_MODE "SDL_RENDER_LOGICAL_SIZE_MODE" +#define SDL_HINT_ANDROID_BLOCK_ON_PAUSE_PAUSEAUDIO "SDL_ANDROID_BLOCK_ON_PAUSE_PAUSEAUDIO" /** - * \brief A variable controlling the scaling quality + * \brief A variable to control whether we trap the Android back button to handle it manually. + * This is necessary for the right mouse button to work on some Android devices, or + * to be able to trap the back button for use in your code reliably. If set to true, + * the back button will show up as an SDL_KEYDOWN / SDL_KEYUP pair with a keycode of + * SDL_SCANCODE_AC_BACK. * - * This variable can be set to the following values: - * "0" or "nearest" - Nearest pixel sampling - * "1" or "linear" - Linear filtering (supported by OpenGL and Direct3D) - * "2" or "best" - Currently this is the same as "linear" + * The variable can be set to the following values: + * "0" - Back button will be handled as usual for system. (default) + * "1" - Back button will be trapped, allowing you to handle the key press + * manually. (This will also let right mouse click work on systems + * where the right mouse button functions as back.) * - * By default nearest pixel sampling is used + * The value of this hint is used at runtime, so it can be changed at any time. */ -#define SDL_HINT_RENDER_SCALE_QUALITY "SDL_RENDER_SCALE_QUALITY" +#define SDL_HINT_ANDROID_TRAP_BACK_BUTTON "SDL_ANDROID_TRAP_BACK_BUTTON" /** - * \brief A variable controlling whether updates to the SDL screen surface should be synchronized with the vertical refresh, to avoid tearing. - * - * This variable can be set to the following values: - * "0" - Disable vsync - * "1" - Enable vsync - * - * By default SDL does not sync screen surface updates with vertical refresh. - */ -#define SDL_HINT_RENDER_VSYNC "SDL_RENDER_VSYNC" - -/** - * \brief A variable controlling whether the screensaver is enabled. - * - * This variable can be set to the following values: - * "0" - Disable screensaver - * "1" - Enable screensaver - * - * By default SDL will disable the screensaver. - */ -#define SDL_HINT_VIDEO_ALLOW_SCREENSAVER "SDL_VIDEO_ALLOW_SCREENSAVER" - -/** - * \brief A variable controlling whether the X11 VidMode extension should be used. - * - * This variable can be set to the following values: - * "0" - Disable XVidMode - * "1" - Enable XVidMode - * - * By default SDL will use XVidMode if it is available. - */ -#define SDL_HINT_VIDEO_X11_XVIDMODE "SDL_VIDEO_X11_XVIDMODE" - -/** - * \brief A variable controlling whether the X11 Xinerama extension should be used. - * - * This variable can be set to the following values: - * "0" - Disable Xinerama - * "1" - Enable Xinerama - * - * By default SDL will use Xinerama if it is available. - */ -#define SDL_HINT_VIDEO_X11_XINERAMA "SDL_VIDEO_X11_XINERAMA" - -/** - * \brief A variable controlling whether the X11 XRandR extension should be used. - * - * This variable can be set to the following values: - * "0" - Disable XRandR - * "1" - Enable XRandR - * - * By default SDL will not use XRandR because of window manager issues. - */ -#define SDL_HINT_VIDEO_X11_XRANDR "SDL_VIDEO_X11_XRANDR" - -/** - * \brief A variable controlling whether the X11 _NET_WM_PING protocol should be supported. - * - * This variable can be set to the following values: - * "0" - Disable _NET_WM_PING - * "1" - Enable _NET_WM_PING - * - * By default SDL will use _NET_WM_PING, but for applications that know they - * will not always be able to respond to ping requests in a timely manner they can - * turn it off to avoid the window manager thinking the app is hung. - * The hint is checked in CreateWindow. - */ -#define SDL_HINT_VIDEO_X11_NET_WM_PING "SDL_VIDEO_X11_NET_WM_PING" - -/** - * \brief A variable controlling whether the X11 _NET_WM_BYPASS_COMPOSITOR hint should be used. - * - * This variable can be set to the following values: - * "0" - Disable _NET_WM_BYPASS_COMPOSITOR - * "1" - Enable _NET_WM_BYPASS_COMPOSITOR - * - * By default SDL will use _NET_WM_BYPASS_COMPOSITOR + * \brief Specify an application name. * + * This hint lets you specify the application name sent to the OS when + * required. For example, this will often appear in volume control applets for + * audio streams, and in lists of applications which are inhibiting the + * screensaver. You should use a string that describes your program ("My Game + * 2: The Revenge") + * + * Setting this to "" or leaving it unset will have SDL use a reasonable + * default: probably the application's name or "SDL Application" if SDL + * doesn't have any better information. + * + * Note that, for audio streams, this can be overridden with + * SDL_HINT_AUDIO_DEVICE_APP_NAME. + * + * On targets where this is not supported, this hint does nothing. */ -#define SDL_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR "SDL_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR" - -/** - * \brief A variable controlling whether the window frame and title bar are interactive when the cursor is hidden - * - * This variable can be set to the following values: - * "0" - The window frame is not interactive when the cursor is hidden (no move, resize, etc) - * "1" - The window frame is interactive when the cursor is hidden - * - * By default SDL will allow interaction with the window frame when the cursor is hidden - */ -#define SDL_HINT_WINDOW_FRAME_USABLE_WHILE_CURSOR_HIDDEN "SDL_WINDOW_FRAME_USABLE_WHILE_CURSOR_HIDDEN" - -/** - * \brief A variable to specify custom icon resource id from RC file on Windows platform - */ -#define SDL_HINT_WINDOWS_INTRESOURCE_ICON "SDL_WINDOWS_INTRESOURCE_ICON" -#define SDL_HINT_WINDOWS_INTRESOURCE_ICON_SMALL "SDL_WINDOWS_INTRESOURCE_ICON_SMALL" - -/** - * \brief A variable controlling whether the windows message loop is processed by SDL - * - * This variable can be set to the following values: - * "0" - The window message loop is not run - * "1" - The window message loop is processed in SDL_PumpEvents() - * - * By default SDL will process the windows message loop - */ -#define SDL_HINT_WINDOWS_ENABLE_MESSAGELOOP "SDL_WINDOWS_ENABLE_MESSAGELOOP" - -/** - * \brief A variable controlling whether grabbing input grabs the keyboard - * - * This variable can be set to the following values: - * "0" - Grab will affect only the mouse - * "1" - Grab will affect mouse and keyboard - * - * By default SDL will not grab the keyboard so system shortcuts still work. - */ -#define SDL_HINT_GRAB_KEYBOARD "SDL_GRAB_KEYBOARD" - -/** - * \brief A variable setting the double click time, in milliseconds. - */ -#define SDL_HINT_MOUSE_DOUBLE_CLICK_TIME "SDL_MOUSE_DOUBLE_CLICK_TIME" - -/** - * \brief A variable setting the double click radius, in pixels. - */ -#define SDL_HINT_MOUSE_DOUBLE_CLICK_RADIUS "SDL_MOUSE_DOUBLE_CLICK_RADIUS" - -/** - * \brief A variable setting the speed scale for mouse motion, in floating point, when the mouse is not in relative mode - */ -#define SDL_HINT_MOUSE_NORMAL_SPEED_SCALE "SDL_MOUSE_NORMAL_SPEED_SCALE" - -/** - * \brief A variable setting the scale for mouse motion, in floating point, when the mouse is in relative mode - */ -#define SDL_HINT_MOUSE_RELATIVE_SPEED_SCALE "SDL_MOUSE_RELATIVE_SPEED_SCALE" - -/** - * \brief A variable controlling whether relative mouse mode is implemented using mouse warping - * - * This variable can be set to the following values: - * "0" - Relative mouse mode uses raw input - * "1" - Relative mouse mode uses mouse warping - * - * By default SDL will use raw input for relative mouse mode - */ -#define SDL_HINT_MOUSE_RELATIVE_MODE_WARP "SDL_MOUSE_RELATIVE_MODE_WARP" - -/** - * \brief Allow mouse click events when clicking to focus an SDL window - * - * This variable can be set to the following values: - * "0" - Ignore mouse clicks that activate a window - * "1" - Generate events for mouse clicks that activate a window - * - * By default SDL will ignore mouse clicks that activate a window - */ -#define SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH "SDL_MOUSE_FOCUS_CLICKTHROUGH" - -/** - * \brief A variable controlling whether touch events should generate synthetic mouse events - * - * This variable can be set to the following values: - * "0" - Touch events will not generate mouse events - * "1" - Touch events will generate mouse events - * - * By default SDL will generate mouse events for touch events - */ -#define SDL_HINT_TOUCH_MOUSE_EVENTS "SDL_TOUCH_MOUSE_EVENTS" - -/** - * \brief A variable controlling whether mouse events should generate synthetic touch events - * - * This variable can be set to the following values: - * "0" - Mouse events will not generate touch events (default for desktop platforms) - * "1" - Mouse events will generate touch events (default for mobile platforms, such as Android and iOS) - */ - -#define SDL_HINT_MOUSE_TOUCH_EVENTS "SDL_MOUSE_TOUCH_EVENTS" - -/** - * \brief Minimize your SDL_Window if it loses key focus when in fullscreen mode. Defaults to true. - * - */ -#define SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS "SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS" - -/** - * \brief A variable controlling whether the idle timer is disabled on iOS. - * - * When an iOS app does not receive touches for some time, the screen is - * dimmed automatically. For games where the accelerometer is the only input - * this is problematic. This functionality can be disabled by setting this - * hint. - * - * As of SDL 2.0.4, SDL_EnableScreenSaver() and SDL_DisableScreenSaver() - * accomplish the same thing on iOS. They should be preferred over this hint. - * - * This variable can be set to the following values: - * "0" - Enable idle timer - * "1" - Disable idle timer - */ -#define SDL_HINT_IDLE_TIMER_DISABLED "SDL_IOS_IDLE_TIMER_DISABLED" - -/** - * \brief A variable controlling which orientations are allowed on iOS/Android. - * - * In some circumstances it is necessary to be able to explicitly control - * which UI orientations are allowed. - * - * This variable is a space delimited list of the following values: - * "LandscapeLeft", "LandscapeRight", "Portrait" "PortraitUpsideDown" - */ -#define SDL_HINT_ORIENTATIONS "SDL_IOS_ORIENTATIONS" +#define SDL_HINT_APP_NAME "SDL_APP_NAME" /** * \brief A variable controlling whether controllers used with the Apple TV @@ -388,53 +194,240 @@ extern "C" { #define SDL_HINT_APPLE_TV_REMOTE_ALLOW_ROTATION "SDL_APPLE_TV_REMOTE_ALLOW_ROTATION" /** - * \brief A variable controlling whether the home indicator bar on iPhone X - * should be hidden. + * \brief A variable controlling the audio category on iOS and Mac OS X * * This variable can be set to the following values: - * "0" - The indicator bar is not hidden (default for windowed applications) - * "1" - The indicator bar is hidden and is shown when the screen is touched (useful for movie playback applications) - * "2" - The indicator bar is dim and the first swipe makes it visible and the second swipe performs the "home" action (default for fullscreen applications) + * + * "ambient" - Use the AVAudioSessionCategoryAmbient audio category, will be muted by the phone mute switch (default) + * "playback" - Use the AVAudioSessionCategoryPlayback category + * + * For more information, see Apple's documentation: + * https://developer.apple.com/library/content/documentation/Audio/Conceptual/AudioSessionProgrammingGuide/AudioSessionCategoriesandModes/AudioSessionCategoriesandModes.html */ -#define SDL_HINT_IOS_HIDE_HOME_INDICATOR "SDL_IOS_HIDE_HOME_INDICATOR" +#define SDL_HINT_AUDIO_CATEGORY "SDL_AUDIO_CATEGORY" /** - * \brief A variable controlling whether the Android / iOS built-in - * accelerometer should be listed as a joystick device. + * \brief Specify an application name for an audio device. + * + * Some audio backends (such as PulseAudio) allow you to describe your audio + * stream. Among other things, this description might show up in a system + * control panel that lets the user adjust the volume on specific audio + * streams instead of using one giant master volume slider. + * + * This hints lets you transmit that information to the OS. The contents of + * this hint are used while opening an audio device. You should use a string + * that describes your program ("My Game 2: The Revenge") + * + * Setting this to "" or leaving it unset will have SDL use a reasonable + * default: this will be the name set with SDL_HINT_APP_NAME, if that hint is + * set. Otherwise, it'll probably the application's name or "SDL Application" + * if SDL doesn't have any better information. + * + * On targets where this is not supported, this hint does nothing. + */ +#define SDL_HINT_AUDIO_DEVICE_APP_NAME "SDL_AUDIO_DEVICE_APP_NAME" + +/** + * \brief Specify an application name for an audio device. + * + * Some audio backends (such as PulseAudio) allow you to describe your audio + * stream. Among other things, this description might show up in a system + * control panel that lets the user adjust the volume on specific audio + * streams instead of using one giant master volume slider. + * + * This hints lets you transmit that information to the OS. The contents of + * this hint are used while opening an audio device. You should use a string + * that describes your what your program is playing ("audio stream" is + * probably sufficient in many cases, but this could be useful for something + * like "team chat" if you have a headset playing VoIP audio separately). + * + * Setting this to "" or leaving it unset will have SDL use a reasonable + * default: "audio stream" or something similar. + * + * On targets where this is not supported, this hint does nothing. + */ +#define SDL_HINT_AUDIO_DEVICE_STREAM_NAME "SDL_AUDIO_DEVICE_STREAM_NAME" + +/** + * \brief Specify an application role for an audio device. + * + * Some audio backends (such as Pipewire) allow you to describe the role of + * your audio stream. Among other things, this description might show up in + * a system control panel or software for displaying and manipulating media + * playback/capture graphs. + * + * This hints lets you transmit that information to the OS. The contents of + * this hint are used while opening an audio device. You should use a string + * that describes your what your program is playing (Game, Music, Movie, + * etc...). + * + * Setting this to "" or leaving it unset will have SDL use a reasonable + * default: "Game" or something similar. + * + * On targets where this is not supported, this hint does nothing. + */ +#define SDL_HINT_AUDIO_DEVICE_STREAM_ROLE "SDL_AUDIO_DEVICE_STREAM_ROLE" + +/** + * \brief A variable controlling speed/quality tradeoff of audio resampling. + * + * If available, SDL can use libsamplerate ( http://www.mega-nerd.com/SRC/ ) + * to handle audio resampling. There are different resampling modes available + * that produce different levels of quality, using more CPU. + * + * If this hint isn't specified to a valid setting, or libsamplerate isn't + * available, SDL will use the default, internal resampling algorithm. + * + * Note that this is currently only applicable to resampling audio that is + * being written to a device for playback or audio being read from a device + * for capture. SDL_AudioCVT always uses the default resampler (although this + * might change for SDL 2.1). + * + * This hint is currently only checked at audio subsystem initialization. * * This variable can be set to the following values: - * "0" - The accelerometer is not listed as a joystick - * "1" - The accelerometer is available as a 3 axis joystick (the default). + * + * "0" or "default" - Use SDL's internal resampling (Default when not set - low quality, fast) + * "1" or "fast" - Use fast, slightly higher quality resampling, if available + * "2" or "medium" - Use medium quality resampling, if available + * "3" or "best" - Use high quality resampling, if available */ -#define SDL_HINT_ACCELEROMETER_AS_JOYSTICK "SDL_ACCELEROMETER_AS_JOYSTICK" +#define SDL_HINT_AUDIO_RESAMPLING_MODE "SDL_AUDIO_RESAMPLING_MODE" /** - * \brief A variable controlling whether the Android / tvOS remotes - * should be listed as joystick devices, instead of sending keyboard events. + * \brief A variable controlling whether SDL updates joystick state when getting input events * * This variable can be set to the following values: - * "0" - Remotes send enter/escape/arrow key events - * "1" - Remotes are available as 2 axis, 2 button joysticks (the default). + * + * "0" - You'll call SDL_JoystickUpdate() manually + * "1" - SDL will automatically call SDL_JoystickUpdate() (default) + * + * This hint can be toggled on and off at runtime. */ -#define SDL_HINT_TV_REMOTE_AS_JOYSTICK "SDL_TV_REMOTE_AS_JOYSTICK" +#define SDL_HINT_AUTO_UPDATE_JOYSTICKS "SDL_AUTO_UPDATE_JOYSTICKS" /** - * \brief A variable that lets you disable the detection and use of Xinput gamepad devices + * \brief A variable controlling whether SDL updates sensor state when getting input events + * + * This variable can be set to the following values: + * + * "0" - You'll call SDL_SensorUpdate() manually + * "1" - SDL will automatically call SDL_SensorUpdate() (default) + * + * This hint can be toggled on and off at runtime. + */ +#define SDL_HINT_AUTO_UPDATE_SENSORS "SDL_AUTO_UPDATE_SENSORS" + +/** + * \brief Prevent SDL from using version 4 of the bitmap header when saving BMPs. + * + * The bitmap header version 4 is required for proper alpha channel support and + * SDL will use it when required. Should this not be desired, this hint can + * force the use of the 40 byte header version which is supported everywhere. + * + * The variable can be set to the following values: + * "0" - Surfaces with a colorkey or an alpha channel are saved to a + * 32-bit BMP file with an alpha mask. SDL will use the bitmap + * header version 4 and set the alpha mask accordingly. + * "1" - Surfaces with a colorkey or an alpha channel are saved to a + * 32-bit BMP file without an alpha mask. The alpha channel data + * will be in the file, but applications are going to ignore it. + * + * The default value is "0". + */ +#define SDL_HINT_BMP_SAVE_LEGACY_FORMAT "SDL_BMP_SAVE_LEGACY_FORMAT" + +/** + * \brief Override for SDL_GetDisplayUsableBounds() + * + * If set, this hint will override the expected results for + * SDL_GetDisplayUsableBounds() for display index 0. Generally you don't want + * to do this, but this allows an embedded system to request that some of the + * screen be reserved for other uses when paired with a well-behaved + * application. + * + * The contents of this hint must be 4 comma-separated integers, the first + * is the bounds x, then y, width and height, in that order. + */ +#define SDL_HINT_DISPLAY_USABLE_BOUNDS "SDL_DISPLAY_USABLE_BOUNDS" + +/** + * \brief Disable giving back control to the browser automatically + * when running with asyncify + * + * With -s ASYNCIFY, SDL2 calls emscripten_sleep during operations + * such as refreshing the screen or polling events. + * + * This hint only applies to the emscripten platform + * + * The variable can be set to the following values: + * "0" - Disable emscripten_sleep calls (if you give back browser control manually or use asyncify for other purposes) + * "1" - Enable emscripten_sleep calls (the default) + */ +#define SDL_HINT_EMSCRIPTEN_ASYNCIFY "SDL_EMSCRIPTEN_ASYNCIFY" + +/** + * \brief override the binding element for keyboard inputs for Emscripten builds + * + * This hint only applies to the emscripten platform + * + * The variable can be one of + * "#window" - The javascript window object (this is the default) + * "#document" - The javascript document object + * "#screen" - the javascript window.screen object + * "#canvas" - the WebGL canvas element + * any other string without a leading # sign applies to the element on the page with that ID. + */ +#define SDL_HINT_EMSCRIPTEN_KEYBOARD_ELEMENT "SDL_EMSCRIPTEN_KEYBOARD_ELEMENT" + +/** + * \brief A variable that controls whether Steam Controllers should be exposed using the SDL joystick and game controller APIs * * The variable can be set to the following values: - * "0" - Disable XInput detection (only uses direct input) - * "1" - Enable XInput detection (the default) + * "0" - Do not scan for Steam Controllers + * "1" - Scan for Steam Controllers (the default) + * + * The default value is "1". This hint must be set before initializing the joystick subsystem. */ -#define SDL_HINT_XINPUT_ENABLED "SDL_XINPUT_ENABLED" +#define SDL_HINT_ENABLE_STEAM_CONTROLLERS "SDL_ENABLE_STEAM_CONTROLLERS" /** - * \brief A variable that causes SDL to use the old axis and button mapping for XInput devices. + * \brief A variable controlling whether SDL logs all events pushed onto its internal queue. * - * This hint is for backwards compatibility only and will be removed in SDL 2.1 + * This variable can be set to the following values: * - * The default value is "0". This hint must be set before SDL_Init() + * "0" - Don't log any events (default) + * "1" - Log all events except mouse and finger motion, which are pretty spammy. + * "2" - Log all events. + * + * This is generally meant to be used to debug SDL itself, but can be useful + * for application developers that need better visibility into what is going + * on in the event queue. Logged events are sent through SDL_Log(), which + * means by default they appear on stdout on most platforms or maybe + * OutputDebugString() on Windows, and can be funneled by the app with + * SDL_LogSetOutputFunction(), etc. + * + * This hint can be toggled on and off at runtime, if you only need to log + * events for a small subset of program execution. */ -#define SDL_HINT_XINPUT_USE_OLD_JOYSTICK_MAPPING "SDL_XINPUT_USE_OLD_JOYSTICK_MAPPING" +#define SDL_HINT_EVENT_LOGGING "SDL_EVENT_LOGGING" + +/** + * \brief A variable controlling how 3D acceleration is used to accelerate the SDL screen surface. + * + * SDL can try to accelerate the SDL screen surface by using streaming + * textures with a 3D rendering engine. This variable controls whether and + * how this is done. + * + * This variable can be set to the following values: + * "0" - Disable 3D acceleration + * "1" - Enable 3D acceleration, using the default renderer. + * "X" - Enable 3D acceleration, using X where X is one of the valid rendering drivers. (e.g. "direct3d", "opengl", etc.) + * + * By default SDL tries to make a best guess for each platform whether + * to use acceleration or not. + */ +#define SDL_HINT_FRAMEBUFFER_ACCELERATION "SDL_FRAMEBUFFER_ACCELERATION" /** * \brief A variable that lets you manually hint extra gamecontroller db entries. @@ -456,6 +449,25 @@ extern "C" { */ #define SDL_HINT_GAMECONTROLLERCONFIG_FILE "SDL_GAMECONTROLLERCONFIG_FILE" +/** + * \brief A variable that overrides the automatic controller type detection + * + * The variable should be comma separated entries, in the form: VID/PID=type + * + * The VID and PID should be hexadecimal with exactly 4 digits, e.g. 0x00fd + * + * The type should be one of: + * Xbox360 + * XboxOne + * PS3 + * PS4 + * PS5 + * SwitchPro + * + * This hint affects what driver is used, and must be set before calling SDL_Init(SDL_INIT_GAMECONTROLLER) + */ +#define SDL_HINT_GAMECONTROLLERTYPE "SDL_GAMECONTROLLERTYPE" + /** * \brief A variable containing a list of devices to skip when scanning for game controllers. * @@ -482,6 +494,89 @@ extern "C" { */ #define SDL_HINT_GAMECONTROLLER_IGNORE_DEVICES_EXCEPT "SDL_GAMECONTROLLER_IGNORE_DEVICES_EXCEPT" +/** + * \brief If set, game controller face buttons report their values according to their labels instead of their positional layout. + * + * For example, on Nintendo Switch controllers, normally you'd get: + * + * (Y) + * (X) (B) + * (A) + * + * but if this hint is set, you'll get: + * + * (X) + * (Y) (A) + * (B) + * + * The variable can be set to the following values: + * "0" - Report the face buttons by position, as though they were on an Xbox controller. + * "1" - Report the face buttons by label instead of position + * + * The default value is "1". This hint may be set at any time. + */ +#define SDL_HINT_GAMECONTROLLER_USE_BUTTON_LABELS "SDL_GAMECONTROLLER_USE_BUTTON_LABELS" + +/** + * \brief A variable controlling whether grabbing input grabs the keyboard + * + * This variable can be set to the following values: + * "0" - Grab will affect only the mouse + * "1" - Grab will affect mouse and keyboard + * + * By default SDL will not grab the keyboard so system shortcuts still work. + */ +#define SDL_HINT_GRAB_KEYBOARD "SDL_GRAB_KEYBOARD" + +/** + * \brief A variable controlling whether the idle timer is disabled on iOS. + * + * When an iOS app does not receive touches for some time, the screen is + * dimmed automatically. For games where the accelerometer is the only input + * this is problematic. This functionality can be disabled by setting this + * hint. + * + * As of SDL 2.0.4, SDL_EnableScreenSaver() and SDL_DisableScreenSaver() + * accomplish the same thing on iOS. They should be preferred over this hint. + * + * This variable can be set to the following values: + * "0" - Enable idle timer + * "1" - Disable idle timer + */ +#define SDL_HINT_IDLE_TIMER_DISABLED "SDL_IOS_IDLE_TIMER_DISABLED" + +/** + * \brief A variable to control whether certain IMEs should handle text editing internally instead of sending SDL_TEXTEDITING events. + * + * The variable can be set to the following values: + * "0" - SDL_TEXTEDITING events are sent, and it is the application's + * responsibility to render the text from these events and + * differentiate it somehow from committed text. (default) + * "1" - If supported by the IME then SDL_TEXTEDITING events are not sent, + * and text that is being composed will be rendered in its own UI. + */ +#define SDL_HINT_IME_INTERNAL_EDITING "SDL_IME_INTERNAL_EDITING" + +/** + * \brief A variable to control whether certain IMEs should show native UI components (such as the Candidate List) instead of suppressing them. + * + * The variable can be set to the following values: + * "0" - Native UI components are not display. (default) + * "1" - Native UI components are displayed. + */ +#define SDL_HINT_IME_SHOW_UI "SDL_IME_SHOW_UI" + +/** + * \brief A variable controlling whether the home indicator bar on iPhone X + * should be hidden. + * + * This variable can be set to the following values: + * "0" - The indicator bar is not hidden (default for windowed applications) + * "1" - The indicator bar is hidden and is shown when the screen is touched (useful for movie playback applications) + * "2" - The indicator bar is dim and the first swipe makes it visible and the second swipe performs the "home" action (default for fullscreen applications) + */ +#define SDL_HINT_IOS_HIDE_HOME_INDICATOR "SDL_IOS_HIDE_HOME_INDICATOR" + /** * \brief A variable that lets you enable joystick (and gamecontroller) events even when your app is in the background. * @@ -506,6 +601,39 @@ extern "C" { */ #define SDL_HINT_JOYSTICK_HIDAPI "SDL_JOYSTICK_HIDAPI" +/** + * \brief A variable controlling whether the HIDAPI driver for Nintendo GameCube controllers should be used. + * + * This variable can be set to the following values: + * "0" - HIDAPI driver is not used + * "1" - HIDAPI driver is used + * + * The default is the value of SDL_HINT_JOYSTICK_HIDAPI + */ +#define SDL_HINT_JOYSTICK_HIDAPI_GAMECUBE "SDL_JOYSTICK_HIDAPI_GAMECUBE" + + /** + * \brief A variable controlling whether Switch Joy-Cons should be treated the same as Switch Pro Controllers when using the HIDAPI driver. + * + * This variable can be set to the following values: + * "0" - basic Joy-Con support with no analog input (the default) + * "1" - Joy-Cons treated as half full Pro Controllers with analog inputs and sensors + * + * This does not combine Joy-Cons into a single controller. That's up to the user. + */ +#define SDL_HINT_JOYSTICK_HIDAPI_JOY_CONS "SDL_JOYSTICK_HIDAPI_JOY_CONS" + + /** + * \brief A variable controlling whether the HIDAPI driver for Amazon Luna controllers connected via Bluetooth should be used. + * + * This variable can be set to the following values: + * "0" - HIDAPI driver is not used + * "1" - HIDAPI driver is used + * + * The default is the value of SDL_HINT_JOYSTICK_HIDAPI + */ +#define SDL_HINT_JOYSTICK_HIDAPI_LUNA "SDL_JOYSTICK_HIDAPI_LUNA" + /** * \brief A variable controlling whether the HIDAPI driver for PS4 controllers should be used. * @@ -529,11 +657,16 @@ extern "C" { * * Once extended reports are enabled, they can not be disabled without * power cycling the controller. + * + * For compatibility with applications written for versions of SDL prior + * to the introduction of PS5 controller support, this value will also + * control the state of extended reports on PS5 controllers when the + * SDL_HINT_JOYSTICK_HIDAPI_PS5_RUMBLE hint is not explicitly set. */ #define SDL_HINT_JOYSTICK_HIDAPI_PS4_RUMBLE "SDL_JOYSTICK_HIDAPI_PS4_RUMBLE" /** - * \brief A variable controlling whether the HIDAPI driver for Steam Controllers should be used. + * \brief A variable controlling whether the HIDAPI driver for PS5 controllers should be used. * * This variable can be set to the following values: * "0" - HIDAPI driver is not used @@ -541,6 +674,57 @@ extern "C" { * * The default is the value of SDL_HINT_JOYSTICK_HIDAPI */ +#define SDL_HINT_JOYSTICK_HIDAPI_PS5 "SDL_JOYSTICK_HIDAPI_PS5" + +/** + * \brief A variable controlling whether the player LEDs should be lit to indicate which player is associated with a PS5 controller. + * + * This variable can be set to the following values: + * "0" - player LEDs are not enabled + * "1" - player LEDs are enabled (the default) + */ +#define SDL_HINT_JOYSTICK_HIDAPI_PS5_PLAYER_LED "SDL_JOYSTICK_HIDAPI_PS5_PLAYER_LED" + +/** + * \brief A variable controlling whether extended input reports should be used for PS5 controllers when using the HIDAPI driver. + * + * This variable can be set to the following values: + * "0" - extended reports are not enabled (the default) + * "1" - extended reports + * + * Extended input reports allow rumble on Bluetooth PS5 controllers, but + * break DirectInput handling for applications that don't use SDL. + * + * Once extended reports are enabled, they can not be disabled without + * power cycling the controller. + * + * For compatibility with applications written for versions of SDL prior + * to the introduction of PS5 controller support, this value defaults to + * the value of SDL_HINT_JOYSTICK_HIDAPI_PS4_RUMBLE. + */ +#define SDL_HINT_JOYSTICK_HIDAPI_PS5_RUMBLE "SDL_JOYSTICK_HIDAPI_PS5_RUMBLE" + +/** + * \brief A variable controlling whether the HIDAPI driver for Google Stadia controllers should be used. + * + * This variable can be set to the following values: + * "0" - HIDAPI driver is not used + * "1" - HIDAPI driver is used + * + * The default is the value of SDL_HINT_JOYSTICK_HIDAPI + */ +#define SDL_HINT_JOYSTICK_HIDAPI_STADIA "SDL_JOYSTICK_HIDAPI_STADIA" + +/** + * \brief A variable controlling whether the HIDAPI driver for Steam Controllers should be used. + * + * This variable can be set to the following values: + * "0" - HIDAPI driver is not used + * "1" - HIDAPI driver is used for Steam Controllers, which requires Bluetooth access + * and may prompt the user for permission on iOS and Android. + * + * The default is "0" + */ #define SDL_HINT_JOYSTICK_HIDAPI_STEAM "SDL_JOYSTICK_HIDAPI_STEAM" /** @@ -554,6 +738,17 @@ extern "C" { */ #define SDL_HINT_JOYSTICK_HIDAPI_SWITCH "SDL_JOYSTICK_HIDAPI_SWITCH" +/** + * \brief A variable controlling whether the Home button LED should be turned on when a Nintendo Switch controller is opened + * + * This variable can be set to the following values: + * "0" - home button LED is turned off + * "1" - home button LED is turned on + * + * By default the Home button LED state is not changed. + */ +#define SDL_HINT_JOYSTICK_HIDAPI_SWITCH_HOME_LED "SDL_JOYSTICK_HIDAPI_SWITCH_HOME_LED" + /** * \brief A variable controlling whether the HIDAPI driver for XBox controllers should be used. * @@ -561,48 +756,256 @@ extern "C" { * "0" - HIDAPI driver is not used * "1" - HIDAPI driver is used * - * The default is the value of SDL_HINT_JOYSTICK_HIDAPI + * The default is "0" on Windows, otherwise the value of SDL_HINT_JOYSTICK_HIDAPI */ #define SDL_HINT_JOYSTICK_HIDAPI_XBOX "SDL_JOYSTICK_HIDAPI_XBOX" + /** + * \brief A variable controlling whether the RAWINPUT joystick drivers should be used for better handling XInput-capable devices. + * + * This variable can be set to the following values: + * "0" - RAWINPUT drivers are not used + * "1" - RAWINPUT drivers are used (the default) + * + */ +#define SDL_HINT_JOYSTICK_RAWINPUT "SDL_JOYSTICK_RAWINPUT" + + /** + * \brief A variable controlling whether the RAWINPUT driver should pull correlated data from XInput. + * + * This variable can be set to the following values: + * "0" - RAWINPUT driver will only use data from raw input APIs + * "1" - RAWINPUT driver will also pull data from XInput, providing + * better trigger axes, guide button presses, and rumble support + * for Xbox controllers + * + * The default is "1". This hint applies to any joysticks opened after setting the hint. + */ +#define SDL_HINT_JOYSTICK_RAWINPUT_CORRELATE_XINPUT "SDL_JOYSTICK_RAWINPUT_CORRELATE_XINPUT" + + /** + * \brief A variable controlling whether a separate thread should be used + * for handling joystick detection and raw input messages on Windows + * + * This variable can be set to the following values: + * "0" - A separate thread is not used (the default) + * "1" - A separate thread is used for handling raw input messages + * + */ +#define SDL_HINT_JOYSTICK_THREAD "SDL_JOYSTICK_THREAD" + /** - * \brief A variable that controls whether Steam Controllers should be exposed using the SDL joystick and game controller APIs + * \brief Determines whether SDL enforces that DRM master is required in order + * to initialize the KMSDRM video backend. * - * The variable can be set to the following values: - * "0" - Do not scan for Steam Controllers - * "1" - Scan for Steam Controllers (the default) + * The DRM subsystem has a concept of a "DRM master" which is a DRM client that + * has the ability to set planes, set cursor, etc. When SDL is DRM master, it + * can draw to the screen using the SDL rendering APIs. Without DRM master, SDL + * is still able to process input and query attributes of attached displays, + * but it cannot change display state or draw to the screen directly. * - * The default value is "1". This hint must be set before initializing the joystick subsystem. + * In some cases, it can be useful to have the KMSDRM backend even if it cannot + * be used for rendering. An app may want to use SDL for input processing while + * using another rendering API (such as an MMAL overlay on Raspberry Pi) or + * using its own code to render to DRM overlays that SDL doesn't support. + * + * This hint must be set before initializing the video subsystem. + * + * This variable can be set to the following values: + * "0" - SDL will allow usage of the KMSDRM backend without DRM master + * "1" - SDL Will require DRM master to use the KMSDRM backend (default) */ -#define SDL_HINT_ENABLE_STEAM_CONTROLLERS "SDL_ENABLE_STEAM_CONTROLLERS" +#define SDL_HINT_KMSDRM_REQUIRE_DRM_MASTER "SDL_KMSDRM_REQUIRE_DRM_MASTER" + /** + * \brief A comma separated list of devices to open as joysticks + * + * This variable is currently only used by the Linux joystick driver. + */ +#define SDL_HINT_JOYSTICK_DEVICE "SDL_JOYSTICK_DEVICE" + + /** + * \brief A variable controlling whether to use the classic /dev/input/js* joystick interface or the newer /dev/input/event* joystick interface on Linux + * + * This variable can be set to the following values: + * "0" - Use /dev/input/event* + * "1" - Use /dev/input/js* + * + * By default the /dev/input/event* interfaces are used + */ +#define SDL_HINT_LINUX_JOYSTICK_CLASSIC "SDL_LINUX_JOYSTICK_CLASSIC" + + /** + * \brief A variable controlling whether joysticks on Linux adhere to their HID-defined deadzones or return unfiltered values. + * + * This variable can be set to the following values: + * "0" - Return unfiltered joystick axis values (the default) + * "1" - Return axis values with deadzones taken into account + */ +#define SDL_HINT_LINUX_JOYSTICK_DEADZONES "SDL_LINUX_JOYSTICK_DEADZONES" /** - * \brief If set to "0" then never set the top most bit on a SDL Window, even if the video mode expects it. - * This is a debugging aid for developers and not expected to be used by end users. The default is "1" +* \brief When set don't force the SDL app to become a foreground process +* +* This hint only applies to Mac OS X. +* +*/ +#define SDL_HINT_MAC_BACKGROUND_APP "SDL_MAC_BACKGROUND_APP" + +/** + * \brief A variable that determines whether ctrl+click should generate a right-click event on Mac + * + * If present, holding ctrl while left clicking will generate a right click + * event when on Mac. + */ +#define SDL_HINT_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK "SDL_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK" + +/** + * \brief A variable setting the double click radius, in pixels. + */ +#define SDL_HINT_MOUSE_DOUBLE_CLICK_RADIUS "SDL_MOUSE_DOUBLE_CLICK_RADIUS" + +/** + * \brief A variable setting the double click time, in milliseconds. + */ +#define SDL_HINT_MOUSE_DOUBLE_CLICK_TIME "SDL_MOUSE_DOUBLE_CLICK_TIME" + +/** + * \brief Allow mouse click events when clicking to focus an SDL window * * This variable can be set to the following values: - * "0" - don't allow topmost - * "1" - allow topmost + * "0" - Ignore mouse clicks that activate a window + * "1" - Generate events for mouse clicks that activate a window + * + * By default SDL will ignore mouse clicks that activate a window */ -#define SDL_HINT_ALLOW_TOPMOST "SDL_ALLOW_TOPMOST" +#define SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH "SDL_MOUSE_FOCUS_CLICKTHROUGH" /** - * \brief A variable that controls the timer resolution, in milliseconds. - * - * The higher resolution the timer, the more frequently the CPU services - * timer interrupts, and the more precise delays are, but this takes up - * power and CPU time. This hint is only used on Windows 7 and earlier. - * - * See this blog post for more information: - * http://randomascii.wordpress.com/2013/07/08/windows-timer-resolution-megawatts-wasted/ - * - * If this variable is set to "0", the system timer resolution is not set. - * - * The default value is "1". This hint may be set at any time. + * \brief A variable setting the speed scale for mouse motion, in floating point, when the mouse is not in relative mode */ -#define SDL_HINT_TIMER_RESOLUTION "SDL_TIMER_RESOLUTION" +#define SDL_HINT_MOUSE_NORMAL_SPEED_SCALE "SDL_MOUSE_NORMAL_SPEED_SCALE" +/** + * \brief A variable controlling whether relative mouse mode is implemented using mouse warping + * + * This variable can be set to the following values: + * "0" - Relative mouse mode uses raw input + * "1" - Relative mouse mode uses mouse warping + * + * By default SDL will use raw input for relative mouse mode + */ +#define SDL_HINT_MOUSE_RELATIVE_MODE_WARP "SDL_MOUSE_RELATIVE_MODE_WARP" + +/** + * \brief A variable controlling whether relative mouse motion is affected by renderer scaling + * + * This variable can be set to the following values: + * "0" - Relative motion is unaffected by DPI or renderer's logical size + * "1" - Relative motion is scaled according to DPI scaling and logical size + * + * By default relative mouse deltas are affected by DPI and renderer scaling + */ +#define SDL_HINT_MOUSE_RELATIVE_SCALING "SDL_MOUSE_RELATIVE_SCALING" + +/** + * \brief A variable setting the scale for mouse motion, in floating point, when the mouse is in relative mode + */ +#define SDL_HINT_MOUSE_RELATIVE_SPEED_SCALE "SDL_MOUSE_RELATIVE_SPEED_SCALE" + +/** + * \brief A variable controlling whether mouse events should generate synthetic touch events + * + * This variable can be set to the following values: + * "0" - Mouse events will not generate touch events (default for desktop platforms) + * "1" - Mouse events will generate touch events (default for mobile platforms, such as Android and iOS) + */ +#define SDL_HINT_MOUSE_TOUCH_EVENTS "SDL_MOUSE_TOUCH_EVENTS" + +/** + * \brief Tell SDL not to catch the SIGINT or SIGTERM signals. + * + * This hint only applies to Unix-like platforms, and should set before + * any calls to SDL_Init() + * + * The variable can be set to the following values: + * "0" - SDL will install a SIGINT and SIGTERM handler, and when it + * catches a signal, convert it into an SDL_QUIT event. + * "1" - SDL will not install a signal handler at all. + */ +#define SDL_HINT_NO_SIGNAL_HANDLERS "SDL_NO_SIGNAL_HANDLERS" + +/** + * \brief A variable controlling what driver to use for OpenGL ES contexts. + * + * On some platforms, currently Windows and X11, OpenGL drivers may support + * creating contexts with an OpenGL ES profile. By default SDL uses these + * profiles, when available, otherwise it attempts to load an OpenGL ES + * library, e.g. that provided by the ANGLE project. This variable controls + * whether SDL follows this default behaviour or will always load an + * OpenGL ES library. + * + * Circumstances where this is useful include + * - Testing an app with a particular OpenGL ES implementation, e.g ANGLE, + * or emulator, e.g. those from ARM, Imagination or Qualcomm. + * - Resolving OpenGL ES function addresses at link time by linking with + * the OpenGL ES library instead of querying them at run time with + * SDL_GL_GetProcAddress(). + * + * Caution: for an application to work with the default behaviour across + * different OpenGL drivers it must query the OpenGL ES function + * addresses at run time using SDL_GL_GetProcAddress(). + * + * This variable is ignored on most platforms because OpenGL ES is native + * or not supported. + * + * This variable can be set to the following values: + * "0" - Use ES profile of OpenGL, if available. (Default when not set.) + * "1" - Load OpenGL ES library using the default library names. + * + */ +#define SDL_HINT_OPENGL_ES_DRIVER "SDL_OPENGL_ES_DRIVER" + +/** + * \brief A variable controlling which orientations are allowed on iOS/Android. + * + * In some circumstances it is necessary to be able to explicitly control + * which UI orientations are allowed. + * + * This variable is a space delimited list of the following values: + * "LandscapeLeft", "LandscapeRight", "Portrait" "PortraitUpsideDown" + */ +#define SDL_HINT_ORIENTATIONS "SDL_IOS_ORIENTATIONS" + +/** + * \brief A variable controlling the use of a sentinel event when polling the event queue + * + * This variable can be set to the following values: + * "0" - Disable poll sentinels + * "1" - Enable poll sentinels + * + * When polling for events, SDL_PumpEvents is used to gather new events from devices. + * If a device keeps producing new events between calls to SDL_PumpEvents, a poll loop will + * become stuck until the new events stop. + * This is most noticable when moving a high frequency mouse. + * + * By default, poll sentinels are enabled. + */ +#define SDL_HINT_POLL_SENTINEL "SDL_POLL_SENTINEL" + +/** + * \brief Override for SDL_GetPreferredLocales() + * + * If set, this will be favored over anything the OS might report for the + * user's preferred locales. Changing this hint at runtime will not generate + * a SDL_LOCALECHANGED event (but if you can change the hint, you can push + * your own event, if you want). + * + * The format of this hint is a comma-separated list of language and locale, + * combined with an underscore, as is a common format: "en_GB". Locale is + * optional: "en". So you might have a list like this: "en_GB,jp,es_PT" + */ +#define SDL_HINT_PREFERRED_LOCALES "SDL_PREFERRED_LOCALES" /** * \brief A variable describing the content orientation on QtWayland-based platforms. @@ -632,6 +1035,208 @@ extern "C" { */ #define SDL_HINT_QTWAYLAND_WINDOW_FLAGS "SDL_QTWAYLAND_WINDOW_FLAGS" +/** + * \brief A variable controlling whether the 2D render API is compatible or efficient. + * + * This variable can be set to the following values: + * + * "0" - Don't use batching to make rendering more efficient. + * "1" - Use batching, but might cause problems if app makes its own direct OpenGL calls. + * + * Up to SDL 2.0.9, the render API would draw immediately when requested. Now + * it batches up draw requests and sends them all to the GPU only when forced + * to (during SDL_RenderPresent, when changing render targets, by updating a + * texture that the batch needs, etc). This is significantly more efficient, + * but it can cause problems for apps that expect to render on top of the + * render API's output. As such, SDL will disable batching if a specific + * render backend is requested (since this might indicate that the app is + * planning to use the underlying graphics API directly). This hint can + * be used to explicitly request batching in this instance. It is a contract + * that you will either never use the underlying graphics API directly, or + * if you do, you will call SDL_RenderFlush() before you do so any current + * batch goes to the GPU before your work begins. Not following this contract + * will result in undefined behavior. + */ +#define SDL_HINT_RENDER_BATCHING "SDL_RENDER_BATCHING" + +/** + * \brief A variable controlling how the 2D render API renders lines + * + * This variable can be set to the following values: + * "0" - Use the default line drawing method (Bresenham's line algorithm as of SDL 2.0.20) + * "1" - Use the driver point API using Bresenham's line algorithm (correct, draws many points) + * "2" - Use the driver line API (occasionally misses line endpoints based on hardware driver quirks, was the default before 2.0.20) + * "3" - Use the driver geometry API (correct, draws thicker diagonal lines) + * + * This variable should be set when the renderer is created. + */ +#define SDL_HINT_RENDER_LINE_METHOD "SDL_RENDER_LINE_METHOD" + +/** + * \brief A variable controlling whether to enable Direct3D 11+'s Debug Layer. + * + * This variable does not have any effect on the Direct3D 9 based renderer. + * + * This variable can be set to the following values: + * "0" - Disable Debug Layer use + * "1" - Enable Debug Layer use + * + * By default, SDL does not use Direct3D Debug Layer. + */ +#define SDL_HINT_RENDER_DIRECT3D11_DEBUG "SDL_RENDER_DIRECT3D11_DEBUG" + +/** + * \brief A variable controlling whether the Direct3D device is initialized for thread-safe operations. + * + * This variable can be set to the following values: + * "0" - Thread-safety is not enabled (faster) + * "1" - Thread-safety is enabled + * + * By default the Direct3D device is created with thread-safety disabled. + */ +#define SDL_HINT_RENDER_DIRECT3D_THREADSAFE "SDL_RENDER_DIRECT3D_THREADSAFE" + +/** + * \brief A variable specifying which render driver to use. + * + * If the application doesn't pick a specific renderer to use, this variable + * specifies the name of the preferred renderer. If the preferred renderer + * can't be initialized, the normal default renderer is used. + * + * This variable is case insensitive and can be set to the following values: + * "direct3d" + * "opengl" + * "opengles2" + * "opengles" + * "metal" + * "software" + * + * The default varies by platform, but it's the first one in the list that + * is available on the current platform. + */ +#define SDL_HINT_RENDER_DRIVER "SDL_RENDER_DRIVER" + +/** + * \brief A variable controlling the scaling policy for SDL_RenderSetLogicalSize. + * + * This variable can be set to the following values: + * "0" or "letterbox" - Uses letterbox/sidebars to fit the entire rendering on screen + * "1" or "overscan" - Will zoom the rendering so it fills the entire screen, allowing edges to be drawn offscreen + * + * By default letterbox is used + */ +#define SDL_HINT_RENDER_LOGICAL_SIZE_MODE "SDL_RENDER_LOGICAL_SIZE_MODE" + +/** + * \brief A variable controlling whether the OpenGL render driver uses shaders if they are available. + * + * This variable can be set to the following values: + * "0" - Disable shaders + * "1" - Enable shaders + * + * By default shaders are used if OpenGL supports them. + */ +#define SDL_HINT_RENDER_OPENGL_SHADERS "SDL_RENDER_OPENGL_SHADERS" + +/** + * \brief A variable controlling the scaling quality + * + * This variable can be set to the following values: + * "0" or "nearest" - Nearest pixel sampling + * "1" or "linear" - Linear filtering (supported by OpenGL and Direct3D) + * "2" or "best" - Currently this is the same as "linear" + * + * By default nearest pixel sampling is used + */ +#define SDL_HINT_RENDER_SCALE_QUALITY "SDL_RENDER_SCALE_QUALITY" + +/** + * \brief A variable controlling whether updates to the SDL screen surface should be synchronized with the vertical refresh, to avoid tearing. + * + * This variable can be set to the following values: + * "0" - Disable vsync + * "1" - Enable vsync + * + * By default SDL does not sync screen surface updates with vertical refresh. + */ +#define SDL_HINT_RENDER_VSYNC "SDL_RENDER_VSYNC" + + /** + * \brief A variable to control whether the return key on the soft keyboard + * should hide the soft keyboard on Android and iOS. + * + * The variable can be set to the following values: + * "0" - The return key will be handled as a key event. This is the behaviour of SDL <= 2.0.3. (default) + * "1" - The return key will hide the keyboard. + * + * The value of this hint is used at runtime, so it can be changed at any time. + */ +#define SDL_HINT_RETURN_KEY_HIDES_IME "SDL_RETURN_KEY_HIDES_IME" + +/** + * \brief Tell SDL which Dispmanx layer to use on a Raspberry PI + * + * Also known as Z-order. The variable can take a negative or positive value. + * The default is 10000. + */ +#define SDL_HINT_RPI_VIDEO_LAYER "SDL_RPI_VIDEO_LAYER" + +/** + * \brief Specify an "activity name" for screensaver inhibition. + * + * Some platforms, notably Linux desktops, list the applications which are + * inhibiting the screensaver or other power-saving features. + * + * This hint lets you specify the "activity name" sent to the OS when + * SDL_DisableScreenSaver() is used (or the screensaver is automatically + * disabled). The contents of this hint are used when the screensaver is + * disabled. You should use a string that describes what your program is doing + * (and, therefore, why the screensaver is disabled). For example, "Playing a + * game" or "Watching a video". + * + * Setting this to "" or leaving it unset will have SDL use a reasonable + * default: "Playing a game" or something similar. + * + * On targets where this is not supported, this hint does nothing. + */ +#define SDL_HINT_SCREENSAVER_INHIBIT_ACTIVITY_NAME "SDL_SCREENSAVER_INHIBIT_ACTIVITY_NAME" + +/** + * \brief Specifies whether SDL_THREAD_PRIORITY_TIME_CRITICAL should be treated as realtime. + * + * On some platforms, like Linux, a realtime priority thread may be subject to restrictions + * that require special handling by the application. This hint exists to let SDL know that + * the app is prepared to handle said restrictions. + * + * On Linux, SDL will apply the following configuration to any thread that becomes realtime: + * * The SCHED_RESET_ON_FORK bit will be set on the scheduling policy, + * * An RLIMIT_RTTIME budget will be configured to the rtkit specified limit. + * * Exceeding this limit will result in the kernel sending SIGKILL to the app, + * * Refer to the man pages for more information. + * + * This variable can be set to the following values: + * "0" - default platform specific behaviour + * "1" - Force SDL_THREAD_PRIORITY_TIME_CRITICAL to a realtime scheduling policy + */ +#define SDL_HINT_THREAD_FORCE_REALTIME_TIME_CRITICAL "SDL_THREAD_FORCE_REALTIME_TIME_CRITICAL" + +/** +* \brief A string specifying additional information to use with SDL_SetThreadPriority. +* +* By default SDL_SetThreadPriority will make appropriate system changes in order to +* apply a thread priority. For example on systems using pthreads the scheduler policy +* is changed automatically to a policy that works well with a given priority. +* Code which has specific requirements can override SDL's default behavior with this hint. +* +* pthread hint values are "current", "other", "fifo" and "rr". +* Currently no other platform hint values are defined but may be in the future. +* +* \note On Linux, the kernel may send SIGKILL to realtime tasks which exceed the distro +* configured execution budget for rtkit. This budget can be queried through RLIMIT_RTTIME +* after calling SDL_SetThreadPriority(). +*/ +#define SDL_HINT_THREAD_PRIORITY_POLICY "SDL_THREAD_PRIORITY_POLICY" + /** * \brief A string specifying SDL's threads stack size in bytes or "0" for the backend's default size * @@ -646,34 +1251,141 @@ extern "C" { */ #define SDL_HINT_THREAD_STACK_SIZE "SDL_THREAD_STACK_SIZE" +/** + * \brief A variable that controls the timer resolution, in milliseconds. + * + * The higher resolution the timer, the more frequently the CPU services + * timer interrupts, and the more precise delays are, but this takes up + * power and CPU time. This hint is only used on Windows. + * + * See this blog post for more information: + * http://randomascii.wordpress.com/2013/07/08/windows-timer-resolution-megawatts-wasted/ + * + * If this variable is set to "0", the system timer resolution is not set. + * + * The default value is "1". This hint may be set at any time. + */ +#define SDL_HINT_TIMER_RESOLUTION "SDL_TIMER_RESOLUTION" + +/** + * \brief A variable controlling whether touch events should generate synthetic mouse events + * + * This variable can be set to the following values: + * "0" - Touch events will not generate mouse events + * "1" - Touch events will generate mouse events + * + * By default SDL will generate mouse events for touch events + */ +#define SDL_HINT_TOUCH_MOUSE_EVENTS "SDL_TOUCH_MOUSE_EVENTS" + +/** + * \brief A variable controlling whether the Android / tvOS remotes + * should be listed as joystick devices, instead of sending keyboard events. + * + * This variable can be set to the following values: + * "0" - Remotes send enter/escape/arrow key events + * "1" - Remotes are available as 2 axis, 2 button joysticks (the default). + */ +#define SDL_HINT_TV_REMOTE_AS_JOYSTICK "SDL_TV_REMOTE_AS_JOYSTICK" + +/** + * \brief A variable controlling whether the screensaver is enabled. + * + * This variable can be set to the following values: + * "0" - Disable screensaver + * "1" - Enable screensaver + * + * By default SDL will disable the screensaver. + */ +#define SDL_HINT_VIDEO_ALLOW_SCREENSAVER "SDL_VIDEO_ALLOW_SCREENSAVER" + +/** + * \brief Tell the video driver that we only want a double buffer. + * + * By default, most lowlevel 2D APIs will use a triple buffer scheme that + * wastes no CPU time on waiting for vsync after issuing a flip, but + * introduces a frame of latency. On the other hand, using a double buffer + * scheme instead is recommended for cases where low latency is an important + * factor because we save a whole frame of latency. + * We do so by waiting for vsync immediately after issuing a flip, usually just + * after eglSwapBuffers call in the backend's *_SwapWindow function. + * + * Since it's driver-specific, it's only supported where possible and + * implemented. Currently supported the following drivers: + * + * - KMSDRM (kmsdrm) + * - Raspberry Pi (raspberrypi) + */ +#define SDL_HINT_VIDEO_DOUBLE_BUFFER "SDL_VIDEO_DOUBLE_BUFFER" + +/** + * \brief A variable controlling whether the EGL window is allowed to be + * composited as transparent, rather than opaque. + * + * Most window systems will always render windows opaque, even if the surface + * format has an alpha channel. This is not always true, however, so by default + * SDL will try to enforce opaque composition. To override this behavior, you + * can set this hint to "1". + */ +#define SDL_HINT_VIDEO_EGL_ALLOW_TRANSPARENCY "SDL_VIDEO_EGL_ALLOW_TRANSPARENCY" + +/** + * \brief A variable controlling whether the graphics context is externally managed. + * + * This variable can be set to the following values: + * "0" - SDL will manage graphics contexts that are attached to windows. + * "1" - Disable graphics context management on windows. + * + * By default SDL will manage OpenGL contexts in certain situations. For example, on Android the + * context will be automatically saved and restored when pausing the application. Additionally, some + * platforms will assume usage of OpenGL if Vulkan isn't used. Setting this to "1" will prevent this + * behavior, which is desireable when the application manages the graphics context, such as + * an externally managed OpenGL context or attaching a Vulkan surface to the window. + */ +#define SDL_HINT_VIDEO_EXTERNAL_CONTEXT "SDL_VIDEO_EXTERNAL_CONTEXT" + /** * \brief If set to 1, then do not allow high-DPI windows. ("Retina" on Mac and iOS) */ #define SDL_HINT_VIDEO_HIGHDPI_DISABLED "SDL_VIDEO_HIGHDPI_DISABLED" /** - * \brief A variable that determines whether ctrl+click should generate a right-click event on Mac + * \brief A variable that dictates policy for fullscreen Spaces on Mac OS X. * - * If present, holding ctrl while left clicking will generate a right click - * event when on Mac. + * This hint only applies to Mac OS X. + * + * The variable can be set to the following values: + * "0" - Disable Spaces support (FULLSCREEN_DESKTOP won't use them and + * SDL_WINDOW_RESIZABLE windows won't offer the "fullscreen" + * button on their titlebars). + * "1" - Enable Spaces support (FULLSCREEN_DESKTOP will use them and + * SDL_WINDOW_RESIZABLE windows will offer the "fullscreen" + * button on their titlebars). + * + * The default value is "1". Spaces are disabled regardless of this hint if + * the OS isn't at least Mac OS X Lion (10.7). This hint must be set before + * any windows are created. */ -#define SDL_HINT_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK "SDL_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK" +#define SDL_HINT_VIDEO_MAC_FULLSCREEN_SPACES "SDL_VIDEO_MAC_FULLSCREEN_SPACES" /** -* \brief A variable specifying which shader compiler to preload when using the Chrome ANGLE binaries -* -* SDL has EGL and OpenGL ES2 support on Windows via the ANGLE project. It -* can use two different sets of binaries, those compiled by the user from source -* or those provided by the Chrome browser. In the later case, these binaries require -* that SDL loads a DLL providing the shader compiler. -* -* This variable can be set to the following values: -* "d3dcompiler_46.dll" - default, best for Vista or later. -* "d3dcompiler_43.dll" - for XP support. -* "none" - do not load any library, useful if you compiled ANGLE from source and included the compiler in your binaries. -* -*/ -#define SDL_HINT_VIDEO_WIN_D3DCOMPILER "SDL_VIDEO_WIN_D3DCOMPILER" + * \brief Minimize your SDL_Window if it loses key focus when in fullscreen mode. Defaults to false. + * \warning Before SDL 2.0.14, this defaulted to true! In 2.0.14, we're + * seeing if "true" causes more problems than it solves in modern times. + * + */ +#define SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS "SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS" + +/** + * \brief A variable controlling whether the libdecor Wayland backend is allowed to be used. + * + * This variable can be set to the following values: + * "0" - libdecor use is disabled. + * "1" - libdecor use is enabled (default). + * + * libdecor is used over xdg-shell when xdg-decoration protocol is unavailable. + */ +#define SDL_HINT_VIDEO_WAYLAND_ALLOW_LIBDECOR "SDL_VIDEO_WAYLAND_ALLOW_LIBDECOR" /** * \brief A variable that is the address of another SDL_Window* (as a hex string formatted with "%p"). @@ -695,51 +1407,274 @@ extern "C" { #define SDL_HINT_VIDEO_WINDOW_SHARE_PIXEL_FORMAT "SDL_VIDEO_WINDOW_SHARE_PIXEL_FORMAT" /** - * \brief A URL to a WinRT app's privacy policy - * - * All network-enabled WinRT apps must make a privacy policy available to its - * users. On Windows 8, 8.1, and RT, Microsoft mandates that this policy be - * be available in the Windows Settings charm, as accessed from within the app. - * SDL provides code to add a URL-based link there, which can point to the app's - * privacy policy. - * - * To setup a URL to an app's privacy policy, set SDL_HINT_WINRT_PRIVACY_POLICY_URL - * before calling any SDL_Init() functions. The contents of the hint should - * be a valid URL. For example, "http://www.example.com". - * - * The default value is "", which will prevent SDL from adding a privacy policy - * link to the Settings charm. This hint should only be set during app init. - * - * The label text of an app's "Privacy Policy" link may be customized via another - * hint, SDL_HINT_WINRT_PRIVACY_POLICY_LABEL. - * - * Please note that on Windows Phone, Microsoft does not provide standard UI - * for displaying a privacy policy link, and as such, SDL_HINT_WINRT_PRIVACY_POLICY_URL - * will not get used on that platform. Network-enabled phone apps should display - * their privacy policy through some other, in-app means. - */ -#define SDL_HINT_WINRT_PRIVACY_POLICY_URL "SDL_WINRT_PRIVACY_POLICY_URL" +* \brief A variable specifying which shader compiler to preload when using the Chrome ANGLE binaries +* +* SDL has EGL and OpenGL ES2 support on Windows via the ANGLE project. It +* can use two different sets of binaries, those compiled by the user from source +* or those provided by the Chrome browser. In the later case, these binaries require +* that SDL loads a DLL providing the shader compiler. +* +* This variable can be set to the following values: +* "d3dcompiler_46.dll" - default, best for Vista or later. +* "d3dcompiler_43.dll" - for XP support. +* "none" - do not load any library, useful if you compiled ANGLE from source and included the compiler in your binaries. +* +*/ +#define SDL_HINT_VIDEO_WIN_D3DCOMPILER "SDL_VIDEO_WIN_D3DCOMPILER" -/** \brief Label text for a WinRT app's privacy policy link +/** + * \brief A variable controlling whether X11 should use GLX or EGL by default * - * Network-enabled WinRT apps must include a privacy policy. On Windows 8, 8.1, and RT, - * Microsoft mandates that this policy be available via the Windows Settings charm. - * SDL provides code to add a link there, with its label text being set via the - * optional hint, SDL_HINT_WINRT_PRIVACY_POLICY_LABEL. + * This variable can be set to the following values: + * "0" - Use GLX + * "1" - Use EGL * - * Please note that a privacy policy's contents are not set via this hint. A separate - * hint, SDL_HINT_WINRT_PRIVACY_POLICY_URL, is used to link to the actual text of the - * policy. - * - * The contents of this hint should be encoded as a UTF8 string. - * - * The default value is "Privacy Policy". This hint should only be set during app - * initialization, preferably before any calls to SDL_Init(). - * - * For additional information on linking to a privacy policy, see the documentation for - * SDL_HINT_WINRT_PRIVACY_POLICY_URL. + * By default SDL will use GLX when both are present. */ -#define SDL_HINT_WINRT_PRIVACY_POLICY_LABEL "SDL_WINRT_PRIVACY_POLICY_LABEL" +#define SDL_HINT_VIDEO_X11_FORCE_EGL "SDL_VIDEO_X11_FORCE_EGL" + +/** + * \brief A variable controlling whether the X11 _NET_WM_BYPASS_COMPOSITOR hint should be used. + * + * This variable can be set to the following values: + * "0" - Disable _NET_WM_BYPASS_COMPOSITOR + * "1" - Enable _NET_WM_BYPASS_COMPOSITOR + * + * By default SDL will use _NET_WM_BYPASS_COMPOSITOR + * + */ +#define SDL_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR "SDL_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR" + +/** + * \brief A variable controlling whether the X11 _NET_WM_PING protocol should be supported. + * + * This variable can be set to the following values: + * "0" - Disable _NET_WM_PING + * "1" - Enable _NET_WM_PING + * + * By default SDL will use _NET_WM_PING, but for applications that know they + * will not always be able to respond to ping requests in a timely manner they can + * turn it off to avoid the window manager thinking the app is hung. + * The hint is checked in CreateWindow. + */ +#define SDL_HINT_VIDEO_X11_NET_WM_PING "SDL_VIDEO_X11_NET_WM_PING" + +/** + * \brief A variable forcing the visual ID chosen for new X11 windows + * + */ +#define SDL_HINT_VIDEO_X11_WINDOW_VISUALID "SDL_VIDEO_X11_WINDOW_VISUALID" + +/** + * \brief A variable controlling whether the X11 Xinerama extension should be used. + * + * This variable can be set to the following values: + * "0" - Disable Xinerama + * "1" - Enable Xinerama + * + * By default SDL will use Xinerama if it is available. + */ +#define SDL_HINT_VIDEO_X11_XINERAMA "SDL_VIDEO_X11_XINERAMA" + +/** + * \brief A variable controlling whether the X11 XRandR extension should be used. + * + * This variable can be set to the following values: + * "0" - Disable XRandR + * "1" - Enable XRandR + * + * By default SDL will not use XRandR because of window manager issues. + */ +#define SDL_HINT_VIDEO_X11_XRANDR "SDL_VIDEO_X11_XRANDR" + +/** + * \brief A variable controlling whether the X11 VidMode extension should be used. + * + * This variable can be set to the following values: + * "0" - Disable XVidMode + * "1" - Enable XVidMode + * + * By default SDL will use XVidMode if it is available. + */ +#define SDL_HINT_VIDEO_X11_XVIDMODE "SDL_VIDEO_X11_XVIDMODE" + +/** + * \brief Controls how the fact chunk affects the loading of a WAVE file. + * + * The fact chunk stores information about the number of samples of a WAVE + * file. The Standards Update from Microsoft notes that this value can be used + * to 'determine the length of the data in seconds'. This is especially useful + * for compressed formats (for which this is a mandatory chunk) if they produce + * multiple sample frames per block and truncating the block is not allowed. + * The fact chunk can exactly specify how many sample frames there should be + * in this case. + * + * Unfortunately, most application seem to ignore the fact chunk and so SDL + * ignores it by default as well. + * + * This variable can be set to the following values: + * + * "truncate" - Use the number of samples to truncate the wave data if + * the fact chunk is present and valid + * "strict" - Like "truncate", but raise an error if the fact chunk + * is invalid, not present for non-PCM formats, or if the + * data chunk doesn't have that many samples + * "ignorezero" - Like "truncate", but ignore fact chunk if the number of + * samples is zero + * "ignore" - Ignore fact chunk entirely (default) + */ +#define SDL_HINT_WAVE_FACT_CHUNK "SDL_WAVE_FACT_CHUNK" + +/** + * \brief Controls how the size of the RIFF chunk affects the loading of a WAVE file. + * + * The size of the RIFF chunk (which includes all the sub-chunks of the WAVE + * file) is not always reliable. In case the size is wrong, it's possible to + * just ignore it and step through the chunks until a fixed limit is reached. + * + * Note that files that have trailing data unrelated to the WAVE file or + * corrupt files may slow down the loading process without a reliable boundary. + * By default, SDL stops after 10000 chunks to prevent wasting time. Use the + * environment variable SDL_WAVE_CHUNK_LIMIT to adjust this value. + * + * This variable can be set to the following values: + * + * "force" - Always use the RIFF chunk size as a boundary for the chunk search + * "ignorezero" - Like "force", but a zero size searches up to 4 GiB (default) + * "ignore" - Ignore the RIFF chunk size and always search up to 4 GiB + * "maximum" - Search for chunks until the end of file (not recommended) + */ +#define SDL_HINT_WAVE_RIFF_CHUNK_SIZE "SDL_WAVE_RIFF_CHUNK_SIZE" + +/** + * \brief Controls how a truncated WAVE file is handled. + * + * A WAVE file is considered truncated if any of the chunks are incomplete or + * the data chunk size is not a multiple of the block size. By default, SDL + * decodes until the first incomplete block, as most applications seem to do. + * + * This variable can be set to the following values: + * + * "verystrict" - Raise an error if the file is truncated + * "strict" - Like "verystrict", but the size of the RIFF chunk is ignored + * "dropframe" - Decode until the first incomplete sample frame + * "dropblock" - Decode until the first incomplete block (default) + */ +#define SDL_HINT_WAVE_TRUNCATION "SDL_WAVE_TRUNCATION" + +/** + * \brief Tell SDL not to name threads on Windows with the 0x406D1388 Exception. + * The 0x406D1388 Exception is a trick used to inform Visual Studio of a + * thread's name, but it tends to cause problems with other debuggers, + * and the .NET runtime. Note that SDL 2.0.6 and later will still use + * the (safer) SetThreadDescription API, introduced in the Windows 10 + * Creators Update, if available. + * + * The variable can be set to the following values: + * "0" - SDL will raise the 0x406D1388 Exception to name threads. + * This is the default behavior of SDL <= 2.0.4. + * "1" - SDL will not raise this exception, and threads will be unnamed. (default) + * This is necessary with .NET languages or debuggers that aren't Visual Studio. + */ +#define SDL_HINT_WINDOWS_DISABLE_THREAD_NAMING "SDL_WINDOWS_DISABLE_THREAD_NAMING" + +/** + * \brief A variable controlling whether the windows message loop is processed by SDL + * + * This variable can be set to the following values: + * "0" - The window message loop is not run + * "1" - The window message loop is processed in SDL_PumpEvents() + * + * By default SDL will process the windows message loop + */ +#define SDL_HINT_WINDOWS_ENABLE_MESSAGELOOP "SDL_WINDOWS_ENABLE_MESSAGELOOP" + +/** + * \brief Force SDL to use Critical Sections for mutexes on Windows. + * On Windows 7 and newer, Slim Reader/Writer Locks are available. + * They offer better performance, allocate no kernel ressources and + * use less memory. SDL will fall back to Critical Sections on older + * OS versions or if forced to by this hint. + * + * This variable can be set to the following values: + * "0" - Use SRW Locks when available. If not, fall back to Critical Sections. (default) + * "1" - Force the use of Critical Sections in all cases. + * + */ +#define SDL_HINT_WINDOWS_FORCE_MUTEX_CRITICAL_SECTIONS "SDL_WINDOWS_FORCE_MUTEX_CRITICAL_SECTIONS" + +/** + * \brief Force SDL to use Kernel Semaphores on Windows. + * Kernel Semaphores are inter-process and require a context + * switch on every interaction. On Windows 8 and newer, the + * WaitOnAddress API is available. Using that and atomics to + * implement semaphores increases performance. + * SDL will fall back to Kernel Objects on older OS versions + * or if forced to by this hint. + * + * This variable can be set to the following values: + * "0" - Use Atomics and WaitOnAddress API when available. If not, fall back to Kernel Objects. (default) + * "1" - Force the use of Kernel Objects in all cases. + * + */ +#define SDL_HINT_WINDOWS_FORCE_SEMAPHORE_KERNEL "SDL_WINDOWS_FORCE_SEMAPHORE_KERNEL" + +/** + * \brief A variable to specify custom icon resource id from RC file on Windows platform + */ +#define SDL_HINT_WINDOWS_INTRESOURCE_ICON "SDL_WINDOWS_INTRESOURCE_ICON" +#define SDL_HINT_WINDOWS_INTRESOURCE_ICON_SMALL "SDL_WINDOWS_INTRESOURCE_ICON_SMALL" + +/** + * \brief Tell SDL not to generate window-close events for Alt+F4 on Windows. + * + * The variable can be set to the following values: + * "0" - SDL will generate a window-close event when it sees Alt+F4. + * "1" - SDL will only do normal key handling for Alt+F4. + */ +#define SDL_HINT_WINDOWS_NO_CLOSE_ON_ALT_F4 "SDL_WINDOWS_NO_CLOSE_ON_ALT_F4" + +/** + * \brief Use the D3D9Ex API introduced in Windows Vista, instead of normal D3D9. + * Direct3D 9Ex contains changes to state management that can eliminate device + * loss errors during scenarios like Alt+Tab or UAC prompts. D3D9Ex may require + * some changes to your application to cope with the new behavior, so this + * is disabled by default. + * + * This hint must be set before initializing the video subsystem. + * + * For more information on Direct3D 9Ex, see: + * - https://docs.microsoft.com/en-us/windows/win32/direct3darticles/graphics-apis-in-windows-vista#direct3d-9ex + * - https://docs.microsoft.com/en-us/windows/win32/direct3darticles/direct3d-9ex-improvements + * + * This variable can be set to the following values: + * "0" - Use the original Direct3D 9 API (default) + * "1" - Use the Direct3D 9Ex API on Vista and later (and fall back if D3D9Ex is unavailable) + * + */ +#define SDL_HINT_WINDOWS_USE_D3D9EX "SDL_WINDOWS_USE_D3D9EX" + +/** + * \brief A variable controlling whether the window frame and title bar are interactive when the cursor is hidden + * + * This variable can be set to the following values: + * "0" - The window frame is not interactive when the cursor is hidden (no move, resize, etc) + * "1" - The window frame is interactive when the cursor is hidden + * + * By default SDL will allow interaction with the window frame when the cursor is hidden + */ +#define SDL_HINT_WINDOW_FRAME_USABLE_WHILE_CURSOR_HIDDEN "SDL_WINDOW_FRAME_USABLE_WHILE_CURSOR_HIDDEN" + +/** +* \brief A variable controlling whether the window is activated when the SDL_ShowWindow function is called +* +* This variable can be set to the following values: +* "0" - The window is activated when the SDL_ShowWindow function is called +* "1" - The window is not activated when the SDL_ShowWindow function is called +* +* By default SDL will activate the window when the SDL_ShowWindow function is called +*/ +#define SDL_HINT_WINDOW_NO_ACTIVATION_WHEN_SHOWN "SDL_WINDOW_NO_ACTIVATION_WHEN_SHOWN" /** \brief Allows back-button-press events on Windows Phone to be marked as handled * @@ -793,386 +1728,102 @@ extern "C" { */ #define SDL_HINT_WINRT_HANDLE_BACK_BUTTON "SDL_WINRT_HANDLE_BACK_BUTTON" -/** - * \brief A variable that dictates policy for fullscreen Spaces on Mac OS X. +/** \brief Label text for a WinRT app's privacy policy link * - * This hint only applies to Mac OS X. + * Network-enabled WinRT apps must include a privacy policy. On Windows 8, 8.1, and RT, + * Microsoft mandates that this policy be available via the Windows Settings charm. + * SDL provides code to add a link there, with its label text being set via the + * optional hint, SDL_HINT_WINRT_PRIVACY_POLICY_LABEL. + * + * Please note that a privacy policy's contents are not set via this hint. A separate + * hint, SDL_HINT_WINRT_PRIVACY_POLICY_URL, is used to link to the actual text of the + * policy. + * + * The contents of this hint should be encoded as a UTF8 string. + * + * The default value is "Privacy Policy". This hint should only be set during app + * initialization, preferably before any calls to SDL_Init(). + * + * For additional information on linking to a privacy policy, see the documentation for + * SDL_HINT_WINRT_PRIVACY_POLICY_URL. + */ +#define SDL_HINT_WINRT_PRIVACY_POLICY_LABEL "SDL_WINRT_PRIVACY_POLICY_LABEL" + +/** + * \brief A URL to a WinRT app's privacy policy + * + * All network-enabled WinRT apps must make a privacy policy available to its + * users. On Windows 8, 8.1, and RT, Microsoft mandates that this policy be + * be available in the Windows Settings charm, as accessed from within the app. + * SDL provides code to add a URL-based link there, which can point to the app's + * privacy policy. + * + * To setup a URL to an app's privacy policy, set SDL_HINT_WINRT_PRIVACY_POLICY_URL + * before calling any SDL_Init() functions. The contents of the hint should + * be a valid URL. For example, "http://www.example.com". + * + * The default value is "", which will prevent SDL from adding a privacy policy + * link to the Settings charm. This hint should only be set during app init. + * + * The label text of an app's "Privacy Policy" link may be customized via another + * hint, SDL_HINT_WINRT_PRIVACY_POLICY_LABEL. + * + * Please note that on Windows Phone, Microsoft does not provide standard UI + * for displaying a privacy policy link, and as such, SDL_HINT_WINRT_PRIVACY_POLICY_URL + * will not get used on that platform. Network-enabled phone apps should display + * their privacy policy through some other, in-app means. + */ +#define SDL_HINT_WINRT_PRIVACY_POLICY_URL "SDL_WINRT_PRIVACY_POLICY_URL" + +/** + * \brief Mark X11 windows as override-redirect. + * + * If set, this _might_ increase framerate at the expense of the desktop + * not working as expected. Override-redirect windows aren't noticed by the + * window manager at all. + * + * You should probably only use this for fullscreen windows, and you probably + * shouldn't even use it for that. But it's here if you want to try! + */ +#define SDL_HINT_X11_FORCE_OVERRIDE_REDIRECT "SDL_X11_FORCE_OVERRIDE_REDIRECT" + +/** + * \brief A variable that lets you disable the detection and use of Xinput gamepad devices * * The variable can be set to the following values: - * "0" - Disable Spaces support (FULLSCREEN_DESKTOP won't use them and - * SDL_WINDOW_RESIZABLE windows won't offer the "fullscreen" - * button on their titlebars). - * "1" - Enable Spaces support (FULLSCREEN_DESKTOP will use them and - * SDL_WINDOW_RESIZABLE windows will offer the "fullscreen" - * button on their titlebars). - * - * The default value is "1". Spaces are disabled regardless of this hint if - * the OS isn't at least Mac OS X Lion (10.7). This hint must be set before - * any windows are created. + * "0" - Disable XInput detection (only uses direct input) + * "1" - Enable XInput detection (the default) */ -#define SDL_HINT_VIDEO_MAC_FULLSCREEN_SPACES "SDL_VIDEO_MAC_FULLSCREEN_SPACES" +#define SDL_HINT_XINPUT_ENABLED "SDL_XINPUT_ENABLED" /** -* \brief When set don't force the SDL app to become a foreground process -* -* This hint only applies to Mac OS X. -* -*/ -#define SDL_HINT_MAC_BACKGROUND_APP "SDL_MAC_BACKGROUND_APP" + * \brief A variable that causes SDL to use the old axis and button mapping for XInput devices. + * + * This hint is for backwards compatibility only and will be removed in SDL 2.1 + * + * The default value is "0". This hint must be set before SDL_Init() + */ +#define SDL_HINT_XINPUT_USE_OLD_JOYSTICK_MAPPING "SDL_XINPUT_USE_OLD_JOYSTICK_MAPPING" /** - * \brief Android APK expansion main file version. Should be a string number like "1", "2" etc. + * \brief A variable that causes SDL to not ignore audio "monitors" * - * Must be set together with SDL_HINT_ANDROID_APK_EXPANSION_PATCH_FILE_VERSION. + * This is currently only used for PulseAudio and ignored elsewhere. * - * If both hints were set then SDL_RWFromFile() will look into expansion files - * after a given relative path was not found in the internal storage and assets. + * By default, SDL ignores audio devices that aren't associated with physical + * hardware. Changing this hint to "1" will expose anything SDL sees that + * appears to be an audio source or sink. This will add "devices" to the list + * that the user probably doesn't want or need, but it can be useful in + * scenarios where you want to hook up SDL to some sort of virtual device, + * etc. * - * By default this hint is not set and the APK expansion files are not searched. + * The default value is "0". This hint must be set before SDL_Init(). + * + * This hint is available since SDL 2.0.16. Before then, virtual devices are + * always ignored. */ -#define SDL_HINT_ANDROID_APK_EXPANSION_MAIN_FILE_VERSION "SDL_ANDROID_APK_EXPANSION_MAIN_FILE_VERSION" - -/** - * \brief Android APK expansion patch file version. Should be a string number like "1", "2" etc. - * - * Must be set together with SDL_HINT_ANDROID_APK_EXPANSION_MAIN_FILE_VERSION. - * - * If both hints were set then SDL_RWFromFile() will look into expansion files - * after a given relative path was not found in the internal storage and assets. - * - * By default this hint is not set and the APK expansion files are not searched. - */ -#define SDL_HINT_ANDROID_APK_EXPANSION_PATCH_FILE_VERSION "SDL_ANDROID_APK_EXPANSION_PATCH_FILE_VERSION" +#define SDL_HINT_AUDIO_INCLUDE_MONITORS "SDL_AUDIO_INCLUDE_MONITORS" -/** - * \brief A variable to control whether certain IMEs should handle text editing internally instead of sending SDL_TEXTEDITING events. - * - * The variable can be set to the following values: - * "0" - SDL_TEXTEDITING events are sent, and it is the application's - * responsibility to render the text from these events and - * differentiate it somehow from committed text. (default) - * "1" - If supported by the IME then SDL_TEXTEDITING events are not sent, - * and text that is being composed will be rendered in its own UI. - */ -#define SDL_HINT_IME_INTERNAL_EDITING "SDL_IME_INTERNAL_EDITING" - -/** - * \brief A variable to control whether we trap the Android back button to handle it manually. - * This is necessary for the right mouse button to work on some Android devices, or - * to be able to trap the back button for use in your code reliably. If set to true, - * the back button will show up as an SDL_KEYDOWN / SDL_KEYUP pair with a keycode of - * SDL_SCANCODE_AC_BACK. - * - * The variable can be set to the following values: - * "0" - Back button will be handled as usual for system. (default) - * "1" - Back button will be trapped, allowing you to handle the key press - * manually. (This will also let right mouse click work on systems - * where the right mouse button functions as back.) - * - * The value of this hint is used at runtime, so it can be changed at any time. - */ -#define SDL_HINT_ANDROID_TRAP_BACK_BUTTON "SDL_ANDROID_TRAP_BACK_BUTTON" - -/** - * \brief A variable to control whether the event loop will block itself when the app is paused. - * - * The variable can be set to the following values: - * "0" - Non blocking. - * "1" - Blocking. (default) - * - * The value should be set before SDL is initialized. - */ -#define SDL_HINT_ANDROID_BLOCK_ON_PAUSE "SDL_ANDROID_BLOCK_ON_PAUSE" - - /** - * \brief A variable to control whether the return key on the soft keyboard - * should hide the soft keyboard on Android and iOS. - * - * The variable can be set to the following values: - * "0" - The return key will be handled as a key event. This is the behaviour of SDL <= 2.0.3. (default) - * "1" - The return key will hide the keyboard. - * - * The value of this hint is used at runtime, so it can be changed at any time. - */ -#define SDL_HINT_RETURN_KEY_HIDES_IME "SDL_RETURN_KEY_HIDES_IME" - -/** - * \brief override the binding element for keyboard inputs for Emscripten builds - * - * This hint only applies to the emscripten platform - * - * The variable can be one of - * "#window" - The javascript window object (this is the default) - * "#document" - The javascript document object - * "#screen" - the javascript window.screen object - * "#canvas" - the WebGL canvas element - * any other string without a leading # sign applies to the element on the page with that ID. - */ -#define SDL_HINT_EMSCRIPTEN_KEYBOARD_ELEMENT "SDL_EMSCRIPTEN_KEYBOARD_ELEMENT" - -/** - * \brief Tell SDL not to catch the SIGINT or SIGTERM signals. - * - * This hint only applies to Unix-like platforms. - * - * The variable can be set to the following values: - * "0" - SDL will install a SIGINT and SIGTERM handler, and when it - * catches a signal, convert it into an SDL_QUIT event. - * "1" - SDL will not install a signal handler at all. - */ -#define SDL_HINT_NO_SIGNAL_HANDLERS "SDL_NO_SIGNAL_HANDLERS" - -/** - * \brief Tell SDL not to generate window-close events for Alt+F4 on Windows. - * - * The variable can be set to the following values: - * "0" - SDL will generate a window-close event when it sees Alt+F4. - * "1" - SDL will only do normal key handling for Alt+F4. - */ -#define SDL_HINT_WINDOWS_NO_CLOSE_ON_ALT_F4 "SDL_WINDOWS_NO_CLOSE_ON_ALT_F4" - -/** - * \brief Prevent SDL from using version 4 of the bitmap header when saving BMPs. - * - * The bitmap header version 4 is required for proper alpha channel support and - * SDL will use it when required. Should this not be desired, this hint can - * force the use of the 40 byte header version which is supported everywhere. - * - * The variable can be set to the following values: - * "0" - Surfaces with a colorkey or an alpha channel are saved to a - * 32-bit BMP file with an alpha mask. SDL will use the bitmap - * header version 4 and set the alpha mask accordingly. - * "1" - Surfaces with a colorkey or an alpha channel are saved to a - * 32-bit BMP file without an alpha mask. The alpha channel data - * will be in the file, but applications are going to ignore it. - * - * The default value is "0". - */ -#define SDL_HINT_BMP_SAVE_LEGACY_FORMAT "SDL_BMP_SAVE_LEGACY_FORMAT" - -/** - * \brief Tell SDL not to name threads on Windows with the 0x406D1388 Exception. - * The 0x406D1388 Exception is a trick used to inform Visual Studio of a - * thread's name, but it tends to cause problems with other debuggers, - * and the .NET runtime. Note that SDL 2.0.6 and later will still use - * the (safer) SetThreadDescription API, introduced in the Windows 10 - * Creators Update, if available. - * - * The variable can be set to the following values: - * "0" - SDL will raise the 0x406D1388 Exception to name threads. - * This is the default behavior of SDL <= 2.0.4. - * "1" - SDL will not raise this exception, and threads will be unnamed. (default) - * This is necessary with .NET languages or debuggers that aren't Visual Studio. - */ -#define SDL_HINT_WINDOWS_DISABLE_THREAD_NAMING "SDL_WINDOWS_DISABLE_THREAD_NAMING" - -/** - * \brief Tell SDL which Dispmanx layer to use on a Raspberry PI - * - * Also known as Z-order. The variable can take a negative or positive value. - * The default is 10000. - */ -#define SDL_HINT_RPI_VIDEO_LAYER "SDL_RPI_VIDEO_LAYER" - -/** - * \brief Tell the video driver that we only want a double buffer. - * - * By default, most lowlevel 2D APIs will use a triple buffer scheme that - * wastes no CPU time on waiting for vsync after issuing a flip, but - * introduces a frame of latency. On the other hand, using a double buffer - * scheme instead is recommended for cases where low latency is an important - * factor because we save a whole frame of latency. - * We do so by waiting for vsync immediately after issuing a flip, usually just - * after eglSwapBuffers call in the backend's *_SwapWindow function. - * - * Since it's driver-specific, it's only supported where possible and - * implemented. Currently supported the following drivers: - * - KMSDRM (kmsdrm) - * - Raspberry Pi (raspberrypi) - */ -#define SDL_HINT_VIDEO_DOUBLE_BUFFER "SDL_VIDEO_DOUBLE_BUFFER" - -/** - * \brief A variable controlling what driver to use for OpenGL ES contexts. - * - * On some platforms, currently Windows and X11, OpenGL drivers may support - * creating contexts with an OpenGL ES profile. By default SDL uses these - * profiles, when available, otherwise it attempts to load an OpenGL ES - * library, e.g. that provided by the ANGLE project. This variable controls - * whether SDL follows this default behaviour or will always load an - * OpenGL ES library. - * - * Circumstances where this is useful include - * - Testing an app with a particular OpenGL ES implementation, e.g ANGLE, - * or emulator, e.g. those from ARM, Imagination or Qualcomm. - * - Resolving OpenGL ES function addresses at link time by linking with - * the OpenGL ES library instead of querying them at run time with - * SDL_GL_GetProcAddress(). - * - * Caution: for an application to work with the default behaviour across - * different OpenGL drivers it must query the OpenGL ES function - * addresses at run time using SDL_GL_GetProcAddress(). - * - * This variable is ignored on most platforms because OpenGL ES is native - * or not supported. - * - * This variable can be set to the following values: - * "0" - Use ES profile of OpenGL, if available. (Default when not set.) - * "1" - Load OpenGL ES library using the default library names. - * - */ -#define SDL_HINT_OPENGL_ES_DRIVER "SDL_OPENGL_ES_DRIVER" - -/** - * \brief A variable controlling speed/quality tradeoff of audio resampling. - * - * If available, SDL can use libsamplerate ( http://www.mega-nerd.com/SRC/ ) - * to handle audio resampling. There are different resampling modes available - * that produce different levels of quality, using more CPU. - * - * If this hint isn't specified to a valid setting, or libsamplerate isn't - * available, SDL will use the default, internal resampling algorithm. - * - * Note that this is currently only applicable to resampling audio that is - * being written to a device for playback or audio being read from a device - * for capture. SDL_AudioCVT always uses the default resampler (although this - * might change for SDL 2.1). - * - * This hint is currently only checked at audio subsystem initialization. - * - * This variable can be set to the following values: - * - * "0" or "default" - Use SDL's internal resampling (Default when not set - low quality, fast) - * "1" or "fast" - Use fast, slightly higher quality resampling, if available - * "2" or "medium" - Use medium quality resampling, if available - * "3" or "best" - Use high quality resampling, if available - */ -#define SDL_HINT_AUDIO_RESAMPLING_MODE "SDL_AUDIO_RESAMPLING_MODE" - -/** - * \brief A variable controlling the audio category on iOS and Mac OS X - * - * This variable can be set to the following values: - * - * "ambient" - Use the AVAudioSessionCategoryAmbient audio category, will be muted by the phone mute switch (default) - * "playback" - Use the AVAudioSessionCategoryPlayback category - * - * For more information, see Apple's documentation: - * https://developer.apple.com/library/content/documentation/Audio/Conceptual/AudioSessionProgrammingGuide/AudioSessionCategoriesandModes/AudioSessionCategoriesandModes.html - */ -#define SDL_HINT_AUDIO_CATEGORY "SDL_AUDIO_CATEGORY" - -/** - * \brief A variable controlling whether the 2D render API is compatible or efficient. - * - * This variable can be set to the following values: - * - * "0" - Don't use batching to make rendering more efficient. - * "1" - Use batching, but might cause problems if app makes its own direct OpenGL calls. - * - * Up to SDL 2.0.9, the render API would draw immediately when requested. Now - * it batches up draw requests and sends them all to the GPU only when forced - * to (during SDL_RenderPresent, when changing render targets, by updating a - * texture that the batch needs, etc). This is significantly more efficient, - * but it can cause problems for apps that expect to render on top of the - * render API's output. As such, SDL will disable batching if a specific - * render backend is requested (since this might indicate that the app is - * planning to use the underlying graphics API directly). This hint can - * be used to explicitly request batching in this instance. It is a contract - * that you will either never use the underlying graphics API directly, or - * if you do, you will call SDL_RenderFlush() before you do so any current - * batch goes to the GPU before your work begins. Not following this contract - * will result in undefined behavior. - */ -#define SDL_HINT_RENDER_BATCHING "SDL_RENDER_BATCHING" - - -/** - * \brief A variable controlling whether SDL logs all events pushed onto its internal queue. - * - * This variable can be set to the following values: - * - * "0" - Don't log any events (default) - * "1" - Log all events except mouse and finger motion, which are pretty spammy. - * "2" - Log all events. - * - * This is generally meant to be used to debug SDL itself, but can be useful - * for application developers that need better visibility into what is going - * on in the event queue. Logged events are sent through SDL_Log(), which - * means by default they appear on stdout on most platforms or maybe - * OutputDebugString() on Windows, and can be funneled by the app with - * SDL_LogSetOutputFunction(), etc. - * - * This hint can be toggled on and off at runtime, if you only need to log - * events for a small subset of program execution. - */ -#define SDL_HINT_EVENT_LOGGING "SDL_EVENT_LOGGING" - - - -/** - * \brief Controls how the size of the RIFF chunk affects the loading of a WAVE file. - * - * The size of the RIFF chunk (which includes all the sub-chunks of the WAVE - * file) is not always reliable. In case the size is wrong, it's possible to - * just ignore it and step through the chunks until a fixed limit is reached. - * - * Note that files that have trailing data unrelated to the WAVE file or - * corrupt files may slow down the loading process without a reliable boundary. - * By default, SDL stops after 10000 chunks to prevent wasting time. Use the - * environment variable SDL_WAVE_CHUNK_LIMIT to adjust this value. - * - * This variable can be set to the following values: - * - * "force" - Always use the RIFF chunk size as a boundary for the chunk search - * "ignorezero" - Like "force", but a zero size searches up to 4 GiB (default) - * "ignore" - Ignore the RIFF chunk size and always search up to 4 GiB - * "maximum" - Search for chunks until the end of file (not recommended) - */ -#define SDL_HINT_WAVE_RIFF_CHUNK_SIZE "SDL_WAVE_RIFF_CHUNK_SIZE" - -/** - * \brief Controls how a truncated WAVE file is handled. - * - * A WAVE file is considered truncated if any of the chunks are incomplete or - * the data chunk size is not a multiple of the block size. By default, SDL - * decodes until the first incomplete block, as most applications seem to do. - * - * This variable can be set to the following values: - * - * "verystrict" - Raise an error if the file is truncated - * "strict" - Like "verystrict", but the size of the RIFF chunk is ignored - * "dropframe" - Decode until the first incomplete sample frame - * "dropblock" - Decode until the first incomplete block (default) - */ -#define SDL_HINT_WAVE_TRUNCATION "SDL_WAVE_TRUNCATION" - -/** - * \brief Controls how the fact chunk affects the loading of a WAVE file. - * - * The fact chunk stores information about the number of samples of a WAVE - * file. The Standards Update from Microsoft notes that this value can be used - * to 'determine the length of the data in seconds'. This is especially useful - * for compressed formats (for which this is a mandatory chunk) if they produce - * multiple sample frames per block and truncating the block is not allowed. - * The fact chunk can exactly specify how many sample frames there should be - * in this case. - * - * Unfortunately, most application seem to ignore the fact chunk and so SDL - * ignores it by default as well. - * - * This variable can be set to the following values: - * - * "truncate" - Use the number of samples to truncate the wave data if - * the fact chunk is present and valid - * "strict" - Like "truncate", but raise an error if the fact chunk - * is invalid, not present for non-PCM formats, or if the - * data chunk doesn't have that many samples - * "ignorezero" - Like "truncate", but ignore fact chunk if the number of - * samples is zero - * "ignore" - Ignore fact chunk entirely (default) - */ -#define SDL_HINT_WAVE_FACT_CHUNK "SDL_WAVE_FACT_CHUNK" /** * \brief An enumeration of hint priorities @@ -1186,71 +1837,121 @@ typedef enum /** - * \brief Set a hint with a specific priority + * Set a hint with a specific priority. * - * The priority controls the behavior when setting a hint that already - * has a value. Hints will replace existing hints of their priority and - * lower. Environment variables are considered to have override priority. + * The priority controls the behavior when setting a hint that already has a + * value. Hints will replace existing hints of their priority and lower. + * Environment variables are considered to have override priority. * - * \return SDL_TRUE if the hint was set, SDL_FALSE otherwise + * \param name the hint to set + * \param value the value of the hint variable + * \param priority the SDL_HintPriority level for the hint + * \returns SDL_TRUE if the hint was set, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetHint + * \sa SDL_SetHint */ extern DECLSPEC SDL_bool SDLCALL SDL_SetHintWithPriority(const char *name, const char *value, SDL_HintPriority priority); /** - * \brief Set a hint with normal priority + * Set a hint with normal priority. * - * \return SDL_TRUE if the hint was set, SDL_FALSE otherwise + * Hints will not be set if there is an existing override hint or environment + * variable that takes precedence. You can use SDL_SetHintWithPriority() to + * set the hint with override priority instead. + * + * \param name the hint to set + * \param value the value of the hint variable + * \returns SDL_TRUE if the hint was set, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetHint + * \sa SDL_SetHintWithPriority */ extern DECLSPEC SDL_bool SDLCALL SDL_SetHint(const char *name, const char *value); /** - * \brief Get a hint + * Get the value of a hint. * - * \return The string value of a hint variable. + * \param name the hint to query + * \returns the string value of a hint or NULL if the hint isn't set. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetHint + * \sa SDL_SetHintWithPriority */ extern DECLSPEC const char * SDLCALL SDL_GetHint(const char *name); /** - * \brief Get a hint + * Get the boolean value of a hint variable. * - * \return The boolean value of a hint variable. + * \param name the name of the hint to get the boolean value from + * \param default_value the value to return if the hint does not exist + * \returns the boolean value of a hint or the provided default value if the + * hint does not exist. + * + * \since This function is available since SDL 2.0.5. + * + * \sa SDL_GetHint + * \sa SDL_SetHint */ extern DECLSPEC SDL_bool SDLCALL SDL_GetHintBoolean(const char *name, SDL_bool default_value); /** - * \brief type definition of the hint callback function. + * Type definition of the hint callback function. + * + * \param userdata what was passed as `userdata` to SDL_AddHintCallback() + * \param name what was passed as `name` to SDL_AddHintCallback() + * \param oldValue the previous hint value + * \param newValue the new value hint is to be set to */ typedef void (SDLCALL *SDL_HintCallback)(void *userdata, const char *name, const char *oldValue, const char *newValue); /** - * \brief Add a function to watch a particular hint + * Add a function to watch a particular hint. * - * \param name The hint to watch - * \param callback The function to call when the hint value changes - * \param userdata A pointer to pass to the callback function + * \param name the hint to watch + * \param callback An SDL_HintCallback function that will be called when the + * hint value changes + * \param userdata a pointer to pass to the callback function + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_DelHintCallback */ extern DECLSPEC void SDLCALL SDL_AddHintCallback(const char *name, SDL_HintCallback callback, void *userdata); /** - * \brief Remove a function watching a particular hint + * Remove a function watching a particular hint. * - * \param name The hint being watched - * \param callback The function being called when the hint value changes - * \param userdata A pointer being passed to the callback function + * \param name the hint being watched + * \param callback An SDL_HintCallback function that will be called when the + * hint value changes + * \param userdata a pointer being passed to the callback function + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AddHintCallback */ extern DECLSPEC void SDLCALL SDL_DelHintCallback(const char *name, SDL_HintCallback callback, void *userdata); /** - * \brief Clear all hints + * Clear all hints. * - * This function is called during SDL_Quit() to free stored hints. + * This function is automatically called during SDL_Quit(). + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC void SDLCALL SDL_ClearHints(void); diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_joystick.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_joystick.h index 3a4c5d177..e80c0057f 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_joystick.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_joystick.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -30,10 +30,12 @@ * The term "instance_id" is the current instantiation of a joystick device in the system, if the joystick is removed and then re-inserted * then it will get a new instance_id, instance_id's are monotonically increasing identifiers of a joystick plugged in. * + * The term "player_index" is the number assigned to a player on a specific + * controller. For XInput controllers this returns the XInput user index. + * Many joysticks will not be able to supply this information. + * * The term JoystickGUID is a stable 128-bit identifier for a joystick device that does not change over time, it identifies class of * the device (a X360 wired controller for example). This identifier is platform dependent. - * - * */ #ifndef SDL_joystick_h_ @@ -105,6 +107,12 @@ typedef enum SDL_JOYSTICK_POWER_MAX } SDL_JoystickPowerLevel; +/* Set max recognized G-force from accelerometer + See src/joystick/uikit/SDL_sysjoystick.m for notes on why this is needed + */ +#define SDL_IPHONE_MAX_GFORCE 5.0 + + /* Function prototypes */ /** @@ -116,210 +124,605 @@ typedef enum * In particular, you are guaranteed that the joystick list won't change, so * the API functions that take a joystick index will be valid, and joystick * and game controller events will not be delivered. + * + * \since This function is available since SDL 2.0.7. */ extern DECLSPEC void SDLCALL SDL_LockJoysticks(void); + + +/** + * Unlocking for multi-threaded access to the joystick API + * + * If you are using the joystick API or handling events from multiple threads + * you should use these locking functions to protect access to the joysticks. + * + * In particular, you are guaranteed that the joystick list won't change, so + * the API functions that take a joystick index will be valid, and joystick + * and game controller events will not be delivered. + * + * \since This function is available since SDL 2.0.7. + */ extern DECLSPEC void SDLCALL SDL_UnlockJoysticks(void); /** - * Count the number of joysticks attached to the system right now + * Count the number of joysticks attached to the system. + * + * \returns the number of attached joysticks on success or a negative error + * code on failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickName + * \sa SDL_JoystickOpen */ extern DECLSPEC int SDLCALL SDL_NumJoysticks(void); /** - * Get the implementation dependent name of a joystick. - * This can be called before any joysticks are opened. - * If no name can be found, this function returns NULL. + * Get the implementation dependent name of a joystick. + * + * This can be called before any joysticks are opened. + * + * \param device_index the index of the joystick to query (the N'th joystick + * on the system) + * \returns the name of the selected joystick. If no name can be found, this + * function returns NULL; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickName + * \sa SDL_JoystickOpen */ extern DECLSPEC const char *SDLCALL SDL_JoystickNameForIndex(int device_index); /** - * Get the player index of a joystick, or -1 if it's not available - * This can be called before any joysticks are opened. + * Get the player index of a joystick, or -1 if it's not available This can be + * called before any joysticks are opened. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC int SDLCALL SDL_JoystickGetDevicePlayerIndex(int device_index); /** - * Return the GUID for the joystick at this index - * This can be called before any joysticks are opened. + * Get the implementation-dependent GUID for the joystick at a given device + * index. + * + * This function can be called before any joysticks are opened. + * + * \param device_index the index of the joystick to query (the N'th joystick + * on the system + * \returns the GUID of the selected joystick. If called on an invalid index, + * this function returns a zero GUID + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickGetGUID + * \sa SDL_JoystickGetGUIDString */ extern DECLSPEC SDL_JoystickGUID SDLCALL SDL_JoystickGetDeviceGUID(int device_index); /** - * Get the USB vendor ID of a joystick, if available. - * This can be called before any joysticks are opened. - * If the vendor ID isn't available this function returns 0. + * Get the USB vendor ID of a joystick, if available. + * + * This can be called before any joysticks are opened. If the vendor ID isn't + * available this function returns 0. + * + * \param device_index the index of the joystick to query (the N'th joystick + * on the system + * \returns the USB vendor ID of the selected joystick. If called on an + * invalid index, this function returns zero + * + * \since This function is available since SDL 2.0.6. */ extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetDeviceVendor(int device_index); /** - * Get the USB product ID of a joystick, if available. - * This can be called before any joysticks are opened. - * If the product ID isn't available this function returns 0. + * Get the USB product ID of a joystick, if available. + * + * This can be called before any joysticks are opened. If the product ID isn't + * available this function returns 0. + * + * \param device_index the index of the joystick to query (the N'th joystick + * on the system + * \returns the USB product ID of the selected joystick. If called on an + * invalid index, this function returns zero + * + * \since This function is available since SDL 2.0.6. */ extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetDeviceProduct(int device_index); /** - * Get the product version of a joystick, if available. - * This can be called before any joysticks are opened. - * If the product version isn't available this function returns 0. + * Get the product version of a joystick, if available. + * + * This can be called before any joysticks are opened. If the product version + * isn't available this function returns 0. + * + * \param device_index the index of the joystick to query (the N'th joystick + * on the system + * \returns the product version of the selected joystick. If called on an + * invalid index, this function returns zero + * + * \since This function is available since SDL 2.0.6. */ extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetDeviceProductVersion(int device_index); /** - * Get the type of a joystick, if available. - * This can be called before any joysticks are opened. + * Get the type of a joystick, if available. + * + * This can be called before any joysticks are opened. + * + * \param device_index the index of the joystick to query (the N'th joystick + * on the system + * \returns the SDL_JoystickType of the selected joystick. If called on an + * invalid index, this function returns `SDL_JOYSTICK_TYPE_UNKNOWN` + * + * \since This function is available since SDL 2.0.6. */ extern DECLSPEC SDL_JoystickType SDLCALL SDL_JoystickGetDeviceType(int device_index); /** - * Get the instance ID of a joystick. - * This can be called before any joysticks are opened. - * If the index is out of range, this function will return -1. + * Get the instance ID of a joystick. + * + * This can be called before any joysticks are opened. If the index is out of + * range, this function will return -1. + * + * \param device_index the index of the joystick to query (the N'th joystick + * on the system + * \returns the instance id of the selected joystick. If called on an invalid + * index, this function returns zero + * + * \since This function is available since SDL 2.0.6. */ extern DECLSPEC SDL_JoystickID SDLCALL SDL_JoystickGetDeviceInstanceID(int device_index); /** - * Open a joystick for use. - * The index passed as an argument refers to the N'th joystick on the system. - * This index is not the value which will identify this joystick in future - * joystick events. The joystick's instance id (::SDL_JoystickID) will be used - * there instead. + * Open a joystick for use. * - * \return A joystick identifier, or NULL if an error occurred. + * The `device_index` argument refers to the N'th joystick presently + * recognized by SDL on the system. It is **NOT** the same as the instance ID + * used to identify the joystick in future events. See + * SDL_JoystickInstanceID() for more details about instance IDs. + * + * The joystick subsystem must be initialized before a joystick can be opened + * for use. + * + * \param device_index the index of the joystick to query + * \returns a joystick identifier or NULL if an error occurred; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickClose + * \sa SDL_JoystickInstanceID */ extern DECLSPEC SDL_Joystick *SDLCALL SDL_JoystickOpen(int device_index); /** - * Return the SDL_Joystick associated with an instance id. - */ -extern DECLSPEC SDL_Joystick *SDLCALL SDL_JoystickFromInstanceID(SDL_JoystickID joyid); - -/** - * Return the name for this currently opened joystick. - * If no name can be found, this function returns NULL. - */ -extern DECLSPEC const char *SDLCALL SDL_JoystickName(SDL_Joystick * joystick); - -/** - * Get the player index of an opened joystick, or -1 if it's not available + * Get the SDL_Joystick associated with an instance id. * - * For XInput controllers this returns the XInput user index. + * \param instance_id the instance id to get the SDL_Joystick for + * \returns an SDL_Joystick on success or NULL on failure; call SDL_GetError() + * for more information. + * + * \since This function is available since SDL 2.0.4. */ -extern DECLSPEC int SDLCALL SDL_JoystickGetPlayerIndex(SDL_Joystick * joystick); +extern DECLSPEC SDL_Joystick *SDLCALL SDL_JoystickFromInstanceID(SDL_JoystickID instance_id); /** - * Return the GUID for this opened joystick + * Get the SDL_Joystick associated with a player index. + * + * \param player_index the player index to get the SDL_Joystick for + * \returns an SDL_Joystick on success or NULL on failure; call SDL_GetError() + * for more information. + * + * \since This function is available since SDL 2.0.12. */ -extern DECLSPEC SDL_JoystickGUID SDLCALL SDL_JoystickGetGUID(SDL_Joystick * joystick); +extern DECLSPEC SDL_Joystick *SDLCALL SDL_JoystickFromPlayerIndex(int player_index); /** - * Get the USB vendor ID of an opened joystick, if available. - * If the vendor ID isn't available this function returns 0. + * Attach a new virtual joystick. + * + * \returns the joystick's device index, or -1 if an error occurred. + * + * \since This function is available since SDL 2.0.14. */ -extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetVendor(SDL_Joystick * joystick); +extern DECLSPEC int SDLCALL SDL_JoystickAttachVirtual(SDL_JoystickType type, + int naxes, + int nbuttons, + int nhats); /** - * Get the USB product ID of an opened joystick, if available. - * If the product ID isn't available this function returns 0. + * Detach a virtual joystick. + * + * \param device_index a value previously returned from + * SDL_JoystickAttachVirtual() + * \returns 0 on success, or -1 if an error occurred. + * + * \since This function is available since SDL 2.0.14. */ -extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetProduct(SDL_Joystick * joystick); +extern DECLSPEC int SDLCALL SDL_JoystickDetachVirtual(int device_index); /** - * Get the product version of an opened joystick, if available. - * If the product version isn't available this function returns 0. + * Query whether or not the joystick at a given device index is virtual. + * + * \param device_index a joystick device index. + * \returns SDL_TRUE if the joystick is virtual, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.14. */ -extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetProductVersion(SDL_Joystick * joystick); +extern DECLSPEC SDL_bool SDLCALL SDL_JoystickIsVirtual(int device_index); /** - * Get the type of an opened joystick. + * Set values on an opened, virtual-joystick's axis. + * + * Please note that values set here will not be applied until the next call to + * SDL_JoystickUpdate, which can either be called directly, or can be called + * indirectly through various other SDL APIs, including, but not limited to + * the following: SDL_PollEvent, SDL_PumpEvents, SDL_WaitEventTimeout, + * SDL_WaitEvent. + * + * \param joystick the virtual joystick on which to set state. + * \param axis the specific axis on the virtual joystick to set. + * \param value the new value for the specified axis. + * \returns 0 on success, -1 on error. + * + * \since This function is available since SDL 2.0.14. */ -extern DECLSPEC SDL_JoystickType SDLCALL SDL_JoystickGetType(SDL_Joystick * joystick); +extern DECLSPEC int SDLCALL SDL_JoystickSetVirtualAxis(SDL_Joystick *joystick, int axis, Sint16 value); /** - * Return a string representation for this guid. pszGUID must point to at least 33 bytes - * (32 for the string plus a NULL terminator). + * Set values on an opened, virtual-joystick's button. + * + * Please note that values set here will not be applied until the next call to + * SDL_JoystickUpdate, which can either be called directly, or can be called + * indirectly through various other SDL APIs, including, but not limited to + * the following: SDL_PollEvent, SDL_PumpEvents, SDL_WaitEventTimeout, + * SDL_WaitEvent. + * + * \param joystick the virtual joystick on which to set state. + * \param button the specific button on the virtual joystick to set. + * \param value the new value for the specified button. + * \returns 0 on success, -1 on error. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC int SDLCALL SDL_JoystickSetVirtualButton(SDL_Joystick *joystick, int button, Uint8 value); + +/** + * Set values on an opened, virtual-joystick's hat. + * + * Please note that values set here will not be applied until the next call to + * SDL_JoystickUpdate, which can either be called directly, or can be called + * indirectly through various other SDL APIs, including, but not limited to + * the following: SDL_PollEvent, SDL_PumpEvents, SDL_WaitEventTimeout, + * SDL_WaitEvent. + * + * \param joystick the virtual joystick on which to set state. + * \param hat the specific hat on the virtual joystick to set. + * \param value the new value for the specified hat. + * \returns 0 on success, -1 on error. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC int SDLCALL SDL_JoystickSetVirtualHat(SDL_Joystick *joystick, int hat, Uint8 value); + +/** + * Get the implementation dependent name of a joystick. + * + * \param joystick the SDL_Joystick obtained from SDL_JoystickOpen() + * \returns the name of the selected joystick. If no name can be found, this + * function returns NULL; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickNameForIndex + * \sa SDL_JoystickOpen + */ +extern DECLSPEC const char *SDLCALL SDL_JoystickName(SDL_Joystick *joystick); + +/** + * Get the player index of an opened joystick. + * + * For XInput controllers this returns the XInput user index. Many joysticks + * will not be able to supply this information. + * + * \param joystick the SDL_Joystick obtained from SDL_JoystickOpen() + * \returns the player index, or -1 if it's not available. + * + * \since This function is available since SDL 2.0.9. + */ +extern DECLSPEC int SDLCALL SDL_JoystickGetPlayerIndex(SDL_Joystick *joystick); + +/** + * Set the player index of an opened joystick. + * + * \param joystick the SDL_Joystick obtained from SDL_JoystickOpen() + * \param player_index the player index to set. + * + * \since This function is available since SDL 2.0.12. + */ +extern DECLSPEC void SDLCALL SDL_JoystickSetPlayerIndex(SDL_Joystick *joystick, int player_index); + +/** + * Get the implementation-dependent GUID for the joystick. + * + * This function requires an open joystick. + * + * \param joystick the SDL_Joystick obtained from SDL_JoystickOpen() + * \returns the GUID of the given joystick. If called on an invalid index, + * this function returns a zero GUID; call SDL_GetError() for more + * information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickGetDeviceGUID + * \sa SDL_JoystickGetGUIDString + */ +extern DECLSPEC SDL_JoystickGUID SDLCALL SDL_JoystickGetGUID(SDL_Joystick *joystick); + +/** + * Get the USB vendor ID of an opened joystick, if available. + * + * If the vendor ID isn't available this function returns 0. + * + * \param joystick the SDL_Joystick obtained from SDL_JoystickOpen() + * \returns the USB vendor ID of the selected joystick, or 0 if unavailable. + * + * \since This function is available since SDL 2.0.6. + */ +extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetVendor(SDL_Joystick *joystick); + +/** + * Get the USB product ID of an opened joystick, if available. + * + * If the product ID isn't available this function returns 0. + * + * \param joystick the SDL_Joystick obtained from SDL_JoystickOpen() + * \returns the USB product ID of the selected joystick, or 0 if unavailable. + * + * \since This function is available since SDL 2.0.6. + */ +extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetProduct(SDL_Joystick *joystick); + +/** + * Get the product version of an opened joystick, if available. + * + * If the product version isn't available this function returns 0. + * + * \param joystick the SDL_Joystick obtained from SDL_JoystickOpen() + * \returns the product version of the selected joystick, or 0 if unavailable. + * + * \since This function is available since SDL 2.0.6. + */ +extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetProductVersion(SDL_Joystick *joystick); + +/** + * Get the serial number of an opened joystick, if available. + * + * Returns the serial number of the joystick, or NULL if it is not available. + * + * \param joystick the SDL_Joystick obtained from SDL_JoystickOpen() + * \returns the serial number of the selected joystick, or NULL if + * unavailable. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC const char * SDLCALL SDL_JoystickGetSerial(SDL_Joystick *joystick); + +/** + * Get the type of an opened joystick. + * + * \param joystick the SDL_Joystick obtained from SDL_JoystickOpen() + * \returns the SDL_JoystickType of the selected joystick. + * + * \since This function is available since SDL 2.0.6. + */ +extern DECLSPEC SDL_JoystickType SDLCALL SDL_JoystickGetType(SDL_Joystick *joystick); + +/** + * Get an ASCII string representation for a given SDL_JoystickGUID. + * + * You should supply at least 33 bytes for pszGUID. + * + * \param guid the SDL_JoystickGUID you wish to convert to string + * \param pszGUID buffer in which to write the ASCII string + * \param cbGUID the size of pszGUID + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickGetDeviceGUID + * \sa SDL_JoystickGetGUID + * \sa SDL_JoystickGetGUIDFromString */ extern DECLSPEC void SDLCALL SDL_JoystickGetGUIDString(SDL_JoystickGUID guid, char *pszGUID, int cbGUID); /** - * Convert a string into a joystick guid + * Convert a GUID string into a SDL_JoystickGUID structure. + * + * Performs no error checking. If this function is given a string containing + * an invalid GUID, the function will silently succeed, but the GUID generated + * will not be useful. + * + * \param pchGUID string containing an ASCII representation of a GUID + * \returns a SDL_JoystickGUID structure. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickGetGUIDString */ extern DECLSPEC SDL_JoystickGUID SDLCALL SDL_JoystickGetGUIDFromString(const char *pchGUID); /** - * Returns SDL_TRUE if the joystick has been opened and currently connected, or SDL_FALSE if it has not. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_JoystickGetAttached(SDL_Joystick * joystick); - -/** - * Get the instance ID of an opened joystick or -1 if the joystick is invalid. - */ -extern DECLSPEC SDL_JoystickID SDLCALL SDL_JoystickInstanceID(SDL_Joystick * joystick); - -/** - * Get the number of general axis controls on a joystick. - */ -extern DECLSPEC int SDLCALL SDL_JoystickNumAxes(SDL_Joystick * joystick); - -/** - * Get the number of trackballs on a joystick. + * Get the status of a specified joystick. * - * Joystick trackballs have only relative motion events associated - * with them and their state cannot be polled. - */ -extern DECLSPEC int SDLCALL SDL_JoystickNumBalls(SDL_Joystick * joystick); - -/** - * Get the number of POV hats on a joystick. - */ -extern DECLSPEC int SDLCALL SDL_JoystickNumHats(SDL_Joystick * joystick); - -/** - * Get the number of buttons on a joystick. - */ -extern DECLSPEC int SDLCALL SDL_JoystickNumButtons(SDL_Joystick * joystick); - -/** - * Update the current state of the open joysticks. + * \param joystick the joystick to query + * \returns SDL_TRUE if the joystick has been opened, SDL_FALSE if it has not; + * call SDL_GetError() for more information. * - * This is called automatically by the event loop if any joystick - * events are enabled. + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickClose + * \sa SDL_JoystickOpen + */ +extern DECLSPEC SDL_bool SDLCALL SDL_JoystickGetAttached(SDL_Joystick *joystick); + +/** + * Get the instance ID of an opened joystick. + * + * \param joystick an SDL_Joystick structure containing joystick information + * \returns the instance ID of the specified joystick on success or a negative + * error code on failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickOpen + */ +extern DECLSPEC SDL_JoystickID SDLCALL SDL_JoystickInstanceID(SDL_Joystick *joystick); + +/** + * Get the number of general axis controls on a joystick. + * + * Often, the directional pad on a game controller will either look like 4 + * separate buttons or a POV hat, and not axes, but all of this is up to the + * device and platform. + * + * \param joystick an SDL_Joystick structure containing joystick information + * \returns the number of axis controls/number of axes on success or a + * negative error code on failure; call SDL_GetError() for more + * information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickGetAxis + * \sa SDL_JoystickOpen + */ +extern DECLSPEC int SDLCALL SDL_JoystickNumAxes(SDL_Joystick *joystick); + +/** + * Get the number of trackballs on a joystick. + * + * Joystick trackballs have only relative motion events associated with them + * and their state cannot be polled. + * + * Most joysticks do not have trackballs. + * + * \param joystick an SDL_Joystick structure containing joystick information + * \returns the number of trackballs on success or a negative error code on + * failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickGetBall + */ +extern DECLSPEC int SDLCALL SDL_JoystickNumBalls(SDL_Joystick *joystick); + +/** + * Get the number of POV hats on a joystick. + * + * \param joystick an SDL_Joystick structure containing joystick information + * \returns the number of POV hats on success or a negative error code on + * failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickGetHat + * \sa SDL_JoystickOpen + */ +extern DECLSPEC int SDLCALL SDL_JoystickNumHats(SDL_Joystick *joystick); + +/** + * Get the number of buttons on a joystick. + * + * \param joystick an SDL_Joystick structure containing joystick information + * \returns the number of buttons on success or a negative error code on + * failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickGetButton + * \sa SDL_JoystickOpen + */ +extern DECLSPEC int SDLCALL SDL_JoystickNumButtons(SDL_Joystick *joystick); + +/** + * Update the current state of the open joysticks. + * + * This is called automatically by the event loop if any joystick events are + * enabled. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickEventState */ extern DECLSPEC void SDLCALL SDL_JoystickUpdate(void); /** - * Enable/disable joystick event polling. + * Enable/disable joystick event polling. * - * If joystick events are disabled, you must call SDL_JoystickUpdate() - * yourself and check the state of the joystick when you want joystick - * information. + * If joystick events are disabled, you must call SDL_JoystickUpdate() + * yourself and manually check the state of the joystick when you want + * joystick information. * - * The state can be one of ::SDL_QUERY, ::SDL_ENABLE or ::SDL_IGNORE. + * It is recommended that you leave joystick event handling enabled. + * + * **WARNING**: Calling this function may delete all events currently in SDL's + * event queue. + * + * \param state can be one of `SDL_QUERY`, `SDL_IGNORE`, or `SDL_ENABLE` + * \returns 1 if enabled, 0 if disabled, or a negative error code on failure; + * call SDL_GetError() for more information. + * + * If `state` is `SDL_QUERY` then the current state is returned, + * otherwise the new processing state is returned. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerEventState */ extern DECLSPEC int SDLCALL SDL_JoystickEventState(int state); #define SDL_JOYSTICK_AXIS_MAX 32767 #define SDL_JOYSTICK_AXIS_MIN -32768 + /** - * Get the current state of an axis control on a joystick. + * Get the current state of an axis control on a joystick. * - * The state is a value ranging from -32768 to 32767. + * SDL makes no promises about what part of the joystick any given axis refers + * to. Your game should have some sort of configuration UI to let users + * specify what each axis should be bound to. Alternately, SDL's higher-level + * Game Controller API makes a great effort to apply order to this lower-level + * interface, so you know that a specific axis is the "left thumb stick," etc. * - * The axis indices start at index 0. + * The value returned by SDL_JoystickGetAxis() is a signed integer (-32768 to + * 32767) representing the current position of the axis. It may be necessary + * to impose certain tolerances on these values to account for jitter. + * + * \param joystick an SDL_Joystick structure containing joystick information + * \param axis the axis to query; the axis indices start at index 0 + * \returns a 16-bit signed integer representing the current position of the + * axis or 0 on failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickNumAxes */ -extern DECLSPEC Sint16 SDLCALL SDL_JoystickGetAxis(SDL_Joystick * joystick, +extern DECLSPEC Sint16 SDLCALL SDL_JoystickGetAxis(SDL_Joystick *joystick, int axis); /** - * Get the initial state of an axis control on a joystick. + * Get the initial state of an axis control on a joystick. * - * The state is a value ranging from -32768 to 32767. + * The state is a value ranging from -32768 to 32767. * - * The axis indices start at index 0. + * The axis indices start at index 0. * - * \return SDL_TRUE if this axis has any initial value, or SDL_FALSE if not. + * \param joystick an SDL_Joystick structure containing joystick information + * \param axis the axis to query; the axis indices start at index 0 + * \param state Upon return, the initial value is supplied here. + * \return SDL_TRUE if this axis has any initial value, or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.6. */ -extern DECLSPEC SDL_bool SDLCALL SDL_JoystickGetAxisInitialState(SDL_Joystick * joystick, +extern DECLSPEC SDL_bool SDLCALL SDL_JoystickGetAxisInitialState(SDL_Joystick *joystick, int axis, Sint16 *state); /** @@ -338,64 +741,199 @@ extern DECLSPEC SDL_bool SDLCALL SDL_JoystickGetAxisInitialState(SDL_Joystick * /* @} */ /** - * Get the current state of a POV hat on a joystick. + * Get the current state of a POV hat on a joystick. * - * The hat indices start at index 0. + * The returned value will be one of the following positions: * - * \return The return value is one of the following positions: - * - ::SDL_HAT_CENTERED - * - ::SDL_HAT_UP - * - ::SDL_HAT_RIGHT - * - ::SDL_HAT_DOWN - * - ::SDL_HAT_LEFT - * - ::SDL_HAT_RIGHTUP - * - ::SDL_HAT_RIGHTDOWN - * - ::SDL_HAT_LEFTUP - * - ::SDL_HAT_LEFTDOWN + * - `SDL_HAT_CENTERED` + * - `SDL_HAT_UP` + * - `SDL_HAT_RIGHT` + * - `SDL_HAT_DOWN` + * - `SDL_HAT_LEFT` + * - `SDL_HAT_RIGHTUP` + * - `SDL_HAT_RIGHTDOWN` + * - `SDL_HAT_LEFTUP` + * - `SDL_HAT_LEFTDOWN` + * + * \param joystick an SDL_Joystick structure containing joystick information + * \param hat the hat index to get the state from; indices start at index 0 + * \returns the current hat position. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickNumHats */ -extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetHat(SDL_Joystick * joystick, +extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetHat(SDL_Joystick *joystick, int hat); /** - * Get the ball axis change since the last poll. + * Get the ball axis change since the last poll. * - * \return 0, or -1 if you passed it invalid parameters. + * Trackballs can only return relative motion since the last call to + * SDL_JoystickGetBall(), these motion deltas are placed into `dx` and `dy`. * - * The ball indices start at index 0. + * Most joysticks do not have trackballs. + * + * \param joystick the SDL_Joystick to query + * \param ball the ball index to query; ball indices start at index 0 + * \param dx stores the difference in the x axis position since the last poll + * \param dy stores the difference in the y axis position since the last poll + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickNumBalls */ -extern DECLSPEC int SDLCALL SDL_JoystickGetBall(SDL_Joystick * joystick, +extern DECLSPEC int SDLCALL SDL_JoystickGetBall(SDL_Joystick *joystick, int ball, int *dx, int *dy); /** - * Get the current state of a button on a joystick. + * Get the current state of a button on a joystick. * - * The button indices start at index 0. + * \param joystick an SDL_Joystick structure containing joystick information + * \param button the button index to get the state from; indices start at + * index 0 + * \returns 1 if the specified button is pressed, 0 otherwise. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickNumButtons */ -extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetButton(SDL_Joystick * joystick, +extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetButton(SDL_Joystick *joystick, int button); /** - * Trigger a rumble effect - * Each call to this function cancels any previous rumble effect, and calling it with 0 intensity stops any rumbling. + * Start a rumble effect. * - * \param joystick The joystick to vibrate - * \param low_frequency_rumble The intensity of the low frequency (left) rumble motor, from 0 to 0xFFFF - * \param high_frequency_rumble The intensity of the high frequency (right) rumble motor, from 0 to 0xFFFF - * \param duration_ms The duration of the rumble effect, in milliseconds + * Each call to this function cancels any previous rumble effect, and calling + * it with 0 intensity stops any rumbling. * - * \return 0, or -1 if rumble isn't supported on this joystick + * \param joystick The joystick to vibrate + * \param low_frequency_rumble The intensity of the low frequency (left) + * rumble motor, from 0 to 0xFFFF + * \param high_frequency_rumble The intensity of the high frequency (right) + * rumble motor, from 0 to 0xFFFF + * \param duration_ms The duration of the rumble effect, in milliseconds + * \returns 0, or -1 if rumble isn't supported on this joystick + * + * \since This function is available since SDL 2.0.9. + * + * \sa SDL_JoystickHasRumble */ -extern DECLSPEC int SDLCALL SDL_JoystickRumble(SDL_Joystick * joystick, Uint16 low_frequency_rumble, Uint16 high_frequency_rumble, Uint32 duration_ms); +extern DECLSPEC int SDLCALL SDL_JoystickRumble(SDL_Joystick *joystick, Uint16 low_frequency_rumble, Uint16 high_frequency_rumble, Uint32 duration_ms); /** - * Close a joystick previously opened with SDL_JoystickOpen(). + * Start a rumble effect in the joystick's triggers + * + * Each call to this function cancels any previous trigger rumble effect, and + * calling it with 0 intensity stops any rumbling. + * + * Note that this function is for _trigger_ rumble; the first joystick to + * support this was the PlayStation 5's DualShock 5 controller. If you want + * the (more common) whole-controller rumble, use SDL_JoystickRumble() + * instead. + * + * \param joystick The joystick to vibrate + * \param left_rumble The intensity of the left trigger rumble motor, from 0 + * to 0xFFFF + * \param right_rumble The intensity of the right trigger rumble motor, from 0 + * to 0xFFFF + * \param duration_ms The duration of the rumble effect, in milliseconds + * \returns 0, or -1 if trigger rumble isn't supported on this joystick + * + * \since This function is available since SDL 2.0.14. + * + * \sa SDL_JoystickHasRumbleTriggers */ -extern DECLSPEC void SDLCALL SDL_JoystickClose(SDL_Joystick * joystick); +extern DECLSPEC int SDLCALL SDL_JoystickRumbleTriggers(SDL_Joystick *joystick, Uint16 left_rumble, Uint16 right_rumble, Uint32 duration_ms); /** - * Return the battery level of this joystick + * Query whether a joystick has an LED. + * + * An example of a joystick LED is the light on the back of a PlayStation 4's + * DualShock 4 controller. + * + * \param joystick The joystick to query + * \return SDL_TRUE if the joystick has a modifiable LED, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.14. */ -extern DECLSPEC SDL_JoystickPowerLevel SDLCALL SDL_JoystickCurrentPowerLevel(SDL_Joystick * joystick); +extern DECLSPEC SDL_bool SDLCALL SDL_JoystickHasLED(SDL_Joystick *joystick); + +/** + * Query whether a joystick has rumble support. + * + * \param joystick The joystick to query + * \return SDL_TRUE if the joystick has rumble, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_JoystickRumble + */ +extern DECLSPEC SDL_bool SDLCALL SDL_JoystickHasRumble(SDL_Joystick *joystick); + +/** + * Query whether a joystick has rumble support on triggers. + * + * \param joystick The joystick to query + * \return SDL_TRUE if the joystick has trigger rumble, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_JoystickRumbleTriggers + */ +extern DECLSPEC SDL_bool SDLCALL SDL_JoystickHasRumbleTriggers(SDL_Joystick *joystick); + +/** + * Update a joystick's LED color. + * + * An example of a joystick LED is the light on the back of a PlayStation 4's + * DualShock 4 controller. + * + * \param joystick The joystick to update + * \param red The intensity of the red LED + * \param green The intensity of the green LED + * \param blue The intensity of the blue LED + * \returns 0 on success, -1 if this joystick does not have a modifiable LED + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC int SDLCALL SDL_JoystickSetLED(SDL_Joystick *joystick, Uint8 red, Uint8 green, Uint8 blue); + +/** + * Send a joystick specific effect packet + * + * \param joystick The joystick to affect + * \param data The data to send to the joystick + * \param size The size of the data to send to the joystick + * \returns 0, or -1 if this joystick or driver doesn't support effect packets + * + * \since This function is available since SDL 2.0.16. + */ +extern DECLSPEC int SDLCALL SDL_JoystickSendEffect(SDL_Joystick *joystick, const void *data, int size); + +/** + * Close a joystick previously opened with SDL_JoystickOpen(). + * + * \param joystick The joystick device to close + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickOpen + */ +extern DECLSPEC void SDLCALL SDL_JoystickClose(SDL_Joystick *joystick); + +/** + * Get the battery level of a joystick as SDL_JoystickPowerLevel. + * + * \param joystick the SDL_Joystick to query + * \returns the current battery level as SDL_JoystickPowerLevel on success or + * `SDL_JOYSTICK_POWER_UNKNOWN` if it is unknown + * + * \since This function is available since SDL 2.0.4. + */ +extern DECLSPEC SDL_JoystickPowerLevel SDLCALL SDL_JoystickCurrentPowerLevel(SDL_Joystick *joystick); /* Ends C function definitions when using C++ */ #ifdef __cplusplus diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_keyboard.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_keyboard.h index 4b2a055d8..a53dde68e 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_keyboard.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_keyboard.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -55,154 +55,253 @@ typedef struct SDL_Keysym /* Function prototypes */ /** - * \brief Get the window which currently has keyboard focus. + * Query the window which currently has keyboard focus. + * + * \returns the window with keyboard focus. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC SDL_Window * SDLCALL SDL_GetKeyboardFocus(void); /** - * \brief Get a snapshot of the current state of the keyboard. + * Get a snapshot of the current state of the keyboard. * - * \param numkeys if non-NULL, receives the length of the returned array. + * The pointer returned is a pointer to an internal SDL array. It will be + * valid for the whole lifetime of the application and should not be freed by + * the caller. * - * \return An array of key states. Indexes into this array are obtained by using ::SDL_Scancode values. + * A array element with a value of 1 means that the key is pressed and a value + * of 0 means that it is not. Indexes into this array are obtained by using + * SDL_Scancode values. * - * \b Example: - * \code - * const Uint8 *state = SDL_GetKeyboardState(NULL); - * if ( state[SDL_SCANCODE_RETURN] ) { - * printf(" is pressed.\n"); - * } - * \endcode + * Use SDL_PumpEvents() to update the state array. + * + * This function gives you the current state after all events have been + * processed, so if a key or button has been pressed and released before you + * process events, then the pressed state will never show up in the + * SDL_GetKeyboardState() calls. + * + * Note: This function doesn't take into account whether shift has been + * pressed or not. + * + * \param numkeys if non-NULL, receives the length of the returned array + * \returns a pointer to an array of key states. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_PumpEvents */ extern DECLSPEC const Uint8 *SDLCALL SDL_GetKeyboardState(int *numkeys); /** - * \brief Get the current key modifier state for the keyboard. + * Get the current key modifier state for the keyboard. + * + * \returns an OR'd combination of the modifier keys for the keyboard. See + * SDL_Keymod for details. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetKeyboardState + * \sa SDL_SetModState */ extern DECLSPEC SDL_Keymod SDLCALL SDL_GetModState(void); /** - * \brief Set the current key modifier state for the keyboard. + * Set the current key modifier state for the keyboard. * - * \note This does not change the keyboard state, only the key modifier flags. + * The inverse of SDL_GetModState(), SDL_SetModState() allows you to impose + * modifier key states on your application. Simply pass your desired modifier + * states into `modstate`. This value may be a bitwise, OR'd combination of + * SDL_Keymod values. + * + * This does not change the keyboard state, only the key modifier flags that + * SDL reports. + * + * \param modstate the desired SDL_Keymod for the keyboard + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetModState */ extern DECLSPEC void SDLCALL SDL_SetModState(SDL_Keymod modstate); /** - * \brief Get the key code corresponding to the given scancode according - * to the current keyboard layout. + * Get the key code corresponding to the given scancode according to the + * current keyboard layout. * - * See ::SDL_Keycode for details. + * See SDL_Keycode for details. * - * \sa SDL_GetKeyName() + * \param scancode the desired SDL_Scancode to query + * \returns the SDL_Keycode that corresponds to the given SDL_Scancode. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetKeyName + * \sa SDL_GetScancodeFromKey */ extern DECLSPEC SDL_Keycode SDLCALL SDL_GetKeyFromScancode(SDL_Scancode scancode); /** - * \brief Get the scancode corresponding to the given key code according to the - * current keyboard layout. + * Get the scancode corresponding to the given key code according to the + * current keyboard layout. * - * See ::SDL_Scancode for details. + * See SDL_Scancode for details. * - * \sa SDL_GetScancodeName() + * \param key the desired SDL_Keycode to query + * \returns the SDL_Scancode that corresponds to the given SDL_Keycode. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetKeyFromScancode + * \sa SDL_GetScancodeName */ extern DECLSPEC SDL_Scancode SDLCALL SDL_GetScancodeFromKey(SDL_Keycode key); /** - * \brief Get a human-readable name for a scancode. + * Get a human-readable name for a scancode. * - * \return A pointer to the name for the scancode. - * If the scancode doesn't have a name, this function returns - * an empty string (""). + * See SDL_Scancode for details. * - * \sa SDL_Scancode + * **Warning**: The returned name is by design not stable across platforms, + * e.g. the name for `SDL_SCANCODE_LGUI` is "Left GUI" under Linux but "Left + * Windows" under Microsoft Windows, and some scancodes like + * `SDL_SCANCODE_NONUSBACKSLASH` don't have any name at all. There are even + * scancodes that share names, e.g. `SDL_SCANCODE_RETURN` and + * `SDL_SCANCODE_RETURN2` (both called "Return"). This function is therefore + * unsuitable for creating a stable cross-platform two-way mapping between + * strings and scancodes. + * + * \param scancode the desired SDL_Scancode to query + * \returns a pointer to the name for the scancode. If the scancode doesn't + * have a name this function returns an empty string (""). + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetScancodeFromKey + * \sa SDL_GetScancodeFromName */ extern DECLSPEC const char *SDLCALL SDL_GetScancodeName(SDL_Scancode scancode); /** - * \brief Get a scancode from a human-readable name + * Get a scancode from a human-readable name. * - * \return scancode, or SDL_SCANCODE_UNKNOWN if the name wasn't recognized + * \param name the human-readable scancode name + * \returns the SDL_Scancode, or `SDL_SCANCODE_UNKNOWN` if the name wasn't + * recognized; call SDL_GetError() for more information. * - * \sa SDL_Scancode + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetKeyFromName + * \sa SDL_GetScancodeFromKey + * \sa SDL_GetScancodeName */ extern DECLSPEC SDL_Scancode SDLCALL SDL_GetScancodeFromName(const char *name); /** - * \brief Get a human-readable name for a key. + * Get a human-readable name for a key. * - * \return A pointer to a UTF-8 string that stays valid at least until the next - * call to this function. If you need it around any longer, you must - * copy it. If the key doesn't have a name, this function returns an - * empty string (""). + * See SDL_Scancode and SDL_Keycode for details. * - * \sa SDL_Keycode + * \param key the desired SDL_Keycode to query + * \returns a pointer to a UTF-8 string that stays valid at least until the + * next call to this function. If you need it around any longer, you + * must copy it. If the key doesn't have a name, this function + * returns an empty string (""). + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetKeyFromName + * \sa SDL_GetKeyFromScancode + * \sa SDL_GetScancodeFromKey */ extern DECLSPEC const char *SDLCALL SDL_GetKeyName(SDL_Keycode key); /** - * \brief Get a key code from a human-readable name + * Get a key code from a human-readable name. * - * \return key code, or SDLK_UNKNOWN if the name wasn't recognized + * \param name the human-readable key name + * \returns key code, or `SDLK_UNKNOWN` if the name wasn't recognized; call + * SDL_GetError() for more information. * - * \sa SDL_Keycode + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetKeyFromScancode + * \sa SDL_GetKeyName + * \sa SDL_GetScancodeFromName */ extern DECLSPEC SDL_Keycode SDLCALL SDL_GetKeyFromName(const char *name); /** - * \brief Start accepting Unicode text input events. - * This function will show the on-screen keyboard if supported. + * Start accepting Unicode text input events. * - * \sa SDL_StopTextInput() - * \sa SDL_SetTextInputRect() - * \sa SDL_HasScreenKeyboardSupport() + * This function will start accepting Unicode text input events in the focused + * SDL window, and start emitting SDL_TextInputEvent (SDL_TEXTINPUT) and + * SDL_TextEditingEvent (SDL_TEXTEDITING) events. Please use this function in + * pair with SDL_StopTextInput(). + * + * On some platforms using this function activates the screen keyboard. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetTextInputRect + * \sa SDL_StopTextInput */ extern DECLSPEC void SDLCALL SDL_StartTextInput(void); /** - * \brief Return whether or not Unicode text input events are enabled. + * Check whether or not Unicode text input events are enabled. * - * \sa SDL_StartTextInput() - * \sa SDL_StopTextInput() + * \returns SDL_TRUE if text input events are enabled else SDL_FALSE. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_StartTextInput */ extern DECLSPEC SDL_bool SDLCALL SDL_IsTextInputActive(void); /** - * \brief Stop receiving any text input events. - * This function will hide the on-screen keyboard if supported. + * Stop receiving any text input events. * - * \sa SDL_StartTextInput() - * \sa SDL_HasScreenKeyboardSupport() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_StartTextInput */ extern DECLSPEC void SDLCALL SDL_StopTextInput(void); /** - * \brief Set the rectangle used to type Unicode text inputs. - * This is used as a hint for IME and on-screen keyboard placement. + * Set the rectangle used to type Unicode text inputs. * - * \sa SDL_StartTextInput() + * \param rect the SDL_Rect structure representing the rectangle to receive + * text (ignored if NULL) + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_StartTextInput */ extern DECLSPEC void SDLCALL SDL_SetTextInputRect(SDL_Rect *rect); /** - * \brief Returns whether the platform has some screen keyboard support. + * Check whether the platform has screen keyboard support. * - * \return SDL_TRUE if some keyboard support is available else SDL_FALSE. + * \returns SDL_TRUE if the platform has some screen keyboard support or + * SDL_FALSE if not. * - * \note Not all screen keyboard functions are supported on all platforms. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_IsScreenKeyboardShown() + * \sa SDL_StartTextInput + * \sa SDL_IsScreenKeyboardShown */ extern DECLSPEC SDL_bool SDLCALL SDL_HasScreenKeyboardSupport(void); /** - * \brief Returns whether the screen keyboard is shown for given window. + * Check whether the screen keyboard is shown for given window. * - * \param window The window for which screen keyboard should be queried. + * \param window the window for which screen keyboard should be queried + * \returns SDL_TRUE if screen keyboard is shown or SDL_FALSE if not. * - * \return SDL_TRUE if screen keyboard is shown else SDL_FALSE. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_HasScreenKeyboardSupport() + * \sa SDL_HasScreenKeyboardSupport */ extern DECLSPEC SDL_bool SDLCALL SDL_IsScreenKeyboardShown(SDL_Window *window); diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_keycode.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_keycode.h index 3bceb418a..35602541a 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_keycode.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_keycode.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -47,12 +47,12 @@ typedef Sint32 SDL_Keycode; #define SDLK_SCANCODE_MASK (1<<30) #define SDL_SCANCODE_TO_KEYCODE(X) (X | SDLK_SCANCODE_MASK) -enum +typedef enum { SDLK_UNKNOWN = 0, SDLK_RETURN = '\r', - SDLK_ESCAPE = '\033', + SDLK_ESCAPE = '\x1B', SDLK_BACKSPACE = '\b', SDLK_TAB = '\t', SDLK_SPACE = ' ', @@ -88,9 +88,11 @@ enum SDLK_GREATER = '>', SDLK_QUESTION = '?', SDLK_AT = '@', + /* Skip uppercase letters */ + SDLK_LEFTBRACKET = '[', SDLK_BACKSLASH = '\\', SDLK_RIGHTBRACKET = ']', @@ -145,7 +147,7 @@ enum SDLK_INSERT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_INSERT), SDLK_HOME = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_HOME), SDLK_PAGEUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAGEUP), - SDLK_DELETE = '\177', + SDLK_DELETE = '\x7F', SDLK_END = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_END), SDLK_PAGEDOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAGEDOWN), SDLK_RIGHT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RIGHT), @@ -317,7 +319,7 @@ enum SDLK_AUDIOREWIND = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOREWIND), SDLK_AUDIOFASTFORWARD = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOFASTFORWARD) -}; +} SDL_KeyCode; /** * \brief Enumeration of valid key mods (possibly OR'd together). @@ -336,13 +338,15 @@ typedef enum KMOD_NUM = 0x1000, KMOD_CAPS = 0x2000, KMOD_MODE = 0x4000, - KMOD_RESERVED = 0x8000 -} SDL_Keymod; + KMOD_SCROLL = 0x8000, -#define KMOD_CTRL (KMOD_LCTRL|KMOD_RCTRL) -#define KMOD_SHIFT (KMOD_LSHIFT|KMOD_RSHIFT) -#define KMOD_ALT (KMOD_LALT|KMOD_RALT) -#define KMOD_GUI (KMOD_LGUI|KMOD_RGUI) + KMOD_CTRL = KMOD_LCTRL | KMOD_RCTRL, + KMOD_SHIFT = KMOD_LSHIFT | KMOD_RSHIFT, + KMOD_ALT = KMOD_LALT | KMOD_RALT, + KMOD_GUI = KMOD_LGUI | KMOD_RGUI, + + KMOD_RESERVED = KMOD_SCROLL /* This is for source-level compatibility with SDL 2.0.0. */ +} SDL_Keymod; #endif /* SDL_keycode_h_ */ diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_loadso.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_loadso.h index 793ba5358..61857c813 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_loadso.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_loadso.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -51,22 +51,56 @@ extern "C" { #endif /** - * This function dynamically loads a shared object and returns a pointer - * to the object handle (or NULL if there was an error). - * The 'sofile' parameter is a system dependent name of the object file. + * Dynamically load a shared object. + * + * \param sofile a system-dependent name of the object file + * \returns an opaque pointer to the object handle or NULL if there was an + * error; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LoadFunction + * \sa SDL_UnloadObject */ extern DECLSPEC void *SDLCALL SDL_LoadObject(const char *sofile); /** - * Given an object handle, this function looks up the address of the - * named function in the shared object and returns it. This address - * is no longer valid after calling SDL_UnloadObject(). + * Look up the address of the named function in a shared object. + * + * This function pointer is no longer valid after calling SDL_UnloadObject(). + * + * This function can only look up C function names. Other languages may have + * name mangling and intrinsic language support that varies from compiler to + * compiler. + * + * Make sure you declare your function pointers with the same calling + * convention as the actual library function. Your code will crash + * mysteriously if you do not do this. + * + * If the requested function doesn't exist, NULL is returned. + * + * \param handle a valid shared object handle returned by SDL_LoadObject() + * \param name the name of the function to look up + * \returns a pointer to the function or NULL if there was an error; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LoadObject + * \sa SDL_UnloadObject */ extern DECLSPEC void *SDLCALL SDL_LoadFunction(void *handle, const char *name); /** - * Unload a shared object from memory. + * Unload a shared object from memory. + * + * \param handle a valid shared object handle returned by SDL_LoadObject() + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LoadFunction + * \sa SDL_LoadObject */ extern DECLSPEC void SDLCALL SDL_UnloadObject(void *handle); diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_locale.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_locale.h new file mode 100644 index 000000000..751577994 --- /dev/null +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_locale.h @@ -0,0 +1,103 @@ +/* + Simple DirectMedia Layer + Copyright (C) 1997-2022 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ + +/** + * \file SDL_locale.h + * + * Include file for SDL locale services + */ + +#ifndef _SDL_locale_h +#define _SDL_locale_h + +#include "SDL_stdinc.h" +#include "SDL_error.h" + +#include "begin_code.h" +/* Set up for C function definitions, even when using C++ */ +#ifdef __cplusplus +/* *INDENT-OFF* */ +extern "C" { +/* *INDENT-ON* */ +#endif + + +typedef struct SDL_Locale +{ + const char *language; /**< A language name, like "en" for English. */ + const char *country; /**< A country, like "US" for America. Can be NULL. */ +} SDL_Locale; + +/** + * Report the user's preferred locale. + * + * This returns an array of SDL_Locale structs, the final item zeroed out. + * When the caller is done with this array, it should call SDL_free() on the + * returned value; all the memory involved is allocated in a single block, so + * a single SDL_free() will suffice. + * + * Returned language strings are in the format xx, where 'xx' is an ISO-639 + * language specifier (such as "en" for English, "de" for German, etc). + * Country strings are in the format YY, where "YY" is an ISO-3166 country + * code (such as "US" for the United States, "CA" for Canada, etc). Country + * might be NULL if there's no specific guidance on them (so you might get { + * "en", "US" } for American English, but { "en", NULL } means "English + * language, generically"). Language strings are never NULL, except to + * terminate the array. + * + * Please note that not all of these strings are 2 characters; some are three + * or more. + * + * The returned list of locales are in the order of the user's preference. For + * example, a German citizen that is fluent in US English and knows enough + * Japanese to navigate around Tokyo might have a list like: { "de", "en_US", + * "jp", NULL }. Someone from England might prefer British English (where + * "color" is spelled "colour", etc), but will settle for anything like it: { + * "en_GB", "en", NULL }. + * + * This function returns NULL on error, including when the platform does not + * supply this information at all. + * + * This might be a "slow" call that has to query the operating system. It's + * best to ask for this once and save the results. However, this list can + * change, usually because the user has changed a system preference outside of + * your program; SDL will send an SDL_LOCALECHANGED event in this case, if + * possible, and you can call this function again to get an updated copy of + * preferred locales. + * + * \return array of locales, terminated with a locale with a NULL language + * field. Will return NULL on error. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC SDL_Locale * SDLCALL SDL_GetPreferredLocales(void); + +/* Ends C function definitions when using C++ */ +#ifdef __cplusplus +/* *INDENT-OFF* */ +} +/* *INDENT-ON* */ +#endif +#include "close_code.h" + +#endif /* _SDL_locale_h */ + +/* vi: set ts=4 sw=4 expandtab: */ diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_log.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_log.h index 40f768d57..dbbcb1e6f 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_log.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_log.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -61,7 +61,7 @@ extern "C" { * at the VERBOSE level and all other categories are enabled at the * CRITICAL level. */ -enum +typedef enum { SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_CATEGORY_ERROR, @@ -94,7 +94,7 @@ enum }; */ SDL_LOG_CATEGORY_CUSTOM -}; +} SDL_LogCategory; /** * \brief The predefined log priorities @@ -112,90 +112,283 @@ typedef enum /** - * \brief Set the priority of all log categories + * Set the priority of all log categories. + * + * \param priority the SDL_LogPriority to assign + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LogSetPriority */ extern DECLSPEC void SDLCALL SDL_LogSetAllPriority(SDL_LogPriority priority); /** - * \brief Set the priority of a particular log category + * Set the priority of a particular log category. + * + * \param category the category to assign a priority to + * \param priority the SDL_LogPriority to assign + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LogGetPriority + * \sa SDL_LogSetAllPriority */ extern DECLSPEC void SDLCALL SDL_LogSetPriority(int category, SDL_LogPriority priority); /** - * \brief Get the priority of a particular log category + * Get the priority of a particular log category. + * + * \param category the category to query + * \returns the SDL_LogPriority for the requested category + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LogSetPriority */ extern DECLSPEC SDL_LogPriority SDLCALL SDL_LogGetPriority(int category); /** - * \brief Reset all priorities to default. + * Reset all priorities to default. * - * \note This is called in SDL_Quit(). + * This is called by SDL_Quit(). + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LogSetAllPriority + * \sa SDL_LogSetPriority */ extern DECLSPEC void SDLCALL SDL_LogResetPriorities(void); /** - * \brief Log a message with SDL_LOG_CATEGORY_APPLICATION and SDL_LOG_PRIORITY_INFO + * Log a message with SDL_LOG_CATEGORY_APPLICATION and SDL_LOG_PRIORITY_INFO. + * + * = * \param fmt a printf() style message format string + * + * \param ... additional parameters matching % tokens in the `fmt` string, if + * any + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LogCritical + * \sa SDL_LogDebug + * \sa SDL_LogError + * \sa SDL_LogInfo + * \sa SDL_LogMessage + * \sa SDL_LogMessageV + * \sa SDL_LogVerbose + * \sa SDL_LogWarn */ extern DECLSPEC void SDLCALL SDL_Log(SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(1); /** - * \brief Log a message with SDL_LOG_PRIORITY_VERBOSE + * Log a message with SDL_LOG_PRIORITY_VERBOSE. + * + * \param category the category of the message + * \param fmt a printf() style message format string + * \param ... additional parameters matching % tokens in the **fmt** string, + * if any + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Log + * \sa SDL_LogCritical + * \sa SDL_LogDebug + * \sa SDL_LogError + * \sa SDL_LogInfo + * \sa SDL_LogMessage + * \sa SDL_LogMessageV + * \sa SDL_LogWarn */ extern DECLSPEC void SDLCALL SDL_LogVerbose(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(2); /** - * \brief Log a message with SDL_LOG_PRIORITY_DEBUG + * Log a message with SDL_LOG_PRIORITY_DEBUG. + * + * \param category the category of the message + * \param fmt a printf() style message format string + * \param ... additional parameters matching % tokens in the **fmt** string, + * if any + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Log + * \sa SDL_LogCritical + * \sa SDL_LogError + * \sa SDL_LogInfo + * \sa SDL_LogMessage + * \sa SDL_LogMessageV + * \sa SDL_LogVerbose + * \sa SDL_LogWarn */ extern DECLSPEC void SDLCALL SDL_LogDebug(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(2); /** - * \brief Log a message with SDL_LOG_PRIORITY_INFO + * Log a message with SDL_LOG_PRIORITY_INFO. + * + * \param category the category of the message + * \param fmt a printf() style message format string + * \param ... additional parameters matching % tokens in the **fmt** string, + * if any + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Log + * \sa SDL_LogCritical + * \sa SDL_LogDebug + * \sa SDL_LogError + * \sa SDL_LogMessage + * \sa SDL_LogMessageV + * \sa SDL_LogVerbose + * \sa SDL_LogWarn */ extern DECLSPEC void SDLCALL SDL_LogInfo(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(2); /** - * \brief Log a message with SDL_LOG_PRIORITY_WARN + * Log a message with SDL_LOG_PRIORITY_WARN. + * + * \param category the category of the message + * \param fmt a printf() style message format string + * \param ... additional parameters matching % tokens in the **fmt** string, + * if any + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Log + * \sa SDL_LogCritical + * \sa SDL_LogDebug + * \sa SDL_LogError + * \sa SDL_LogInfo + * \sa SDL_LogMessage + * \sa SDL_LogMessageV + * \sa SDL_LogVerbose */ extern DECLSPEC void SDLCALL SDL_LogWarn(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(2); /** - * \brief Log a message with SDL_LOG_PRIORITY_ERROR + * Log a message with SDL_LOG_PRIORITY_ERROR. + * + * \param category the category of the message + * \param fmt a printf() style message format string + * \param ... additional parameters matching % tokens in the **fmt** string, + * if any + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Log + * \sa SDL_LogCritical + * \sa SDL_LogDebug + * \sa SDL_LogInfo + * \sa SDL_LogMessage + * \sa SDL_LogMessageV + * \sa SDL_LogVerbose + * \sa SDL_LogWarn */ extern DECLSPEC void SDLCALL SDL_LogError(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(2); /** - * \brief Log a message with SDL_LOG_PRIORITY_CRITICAL + * Log a message with SDL_LOG_PRIORITY_CRITICAL. + * + * \param category the category of the message + * \param fmt a printf() style message format string + * \param ... additional parameters matching % tokens in the **fmt** string, + * if any + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Log + * \sa SDL_LogDebug + * \sa SDL_LogError + * \sa SDL_LogInfo + * \sa SDL_LogMessage + * \sa SDL_LogMessageV + * \sa SDL_LogVerbose + * \sa SDL_LogWarn */ extern DECLSPEC void SDLCALL SDL_LogCritical(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(2); /** - * \brief Log a message with the specified category and priority. + * Log a message with the specified category and priority. + * + * \param category the category of the message + * \param priority the priority of the message + * \param fmt a printf() style message format string + * \param ... additional parameters matching % tokens in the **fmt** string, + * if any + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Log + * \sa SDL_LogCritical + * \sa SDL_LogDebug + * \sa SDL_LogError + * \sa SDL_LogInfo + * \sa SDL_LogMessageV + * \sa SDL_LogVerbose + * \sa SDL_LogWarn */ extern DECLSPEC void SDLCALL SDL_LogMessage(int category, SDL_LogPriority priority, SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(3); /** - * \brief Log a message with the specified category and priority. + * Log a message with the specified category and priority. + * + * \param category the category of the message + * \param priority the priority of the message + * \param fmt a printf() style message format string + * \param ap a variable argument list + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Log + * \sa SDL_LogCritical + * \sa SDL_LogDebug + * \sa SDL_LogError + * \sa SDL_LogInfo + * \sa SDL_LogMessage + * \sa SDL_LogVerbose + * \sa SDL_LogWarn */ extern DECLSPEC void SDLCALL SDL_LogMessageV(int category, SDL_LogPriority priority, const char *fmt, va_list ap); /** - * \brief The prototype for the log output function + * The prototype for the log output callback function. + * + * This function is called by SDL when there is new text to be logged. + * + * \param userdata what was passed as `userdata` to SDL_LogSetOutputFunction() + * \param category the category of the message + * \param priority the priority of the message + * \param message the message being output */ typedef void (SDLCALL *SDL_LogOutputFunction)(void *userdata, int category, SDL_LogPriority priority, const char *message); /** - * \brief Get the current log output function. + * Get the current log output function. + * + * \param callback an SDL_LogOutputFunction filled in with the current log + * callback + * \param userdata a pointer filled in with the pointer that is passed to + * `callback` + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LogSetOutputFunction */ extern DECLSPEC void SDLCALL SDL_LogGetOutputFunction(SDL_LogOutputFunction *callback, void **userdata); /** - * \brief This function allows you to replace the default log output - * function with one of your own. + * Replace the default log output function with one of your own. + * + * \param callback an SDL_LogOutputFunction to call instead of the default + * \param userdata a pointer that is passed to `callback` + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LogGetOutputFunction */ extern DECLSPEC void SDLCALL SDL_LogSetOutputFunction(SDL_LogOutputFunction callback, void *userdata); diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_main.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_main.h index 623f2d005..b3fec15fe 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_main.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_main.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -83,6 +83,15 @@ */ #define SDL_MAIN_NEEDED +#elif defined(__PSP__) +/* On PSP SDL provides a main function that sets the module info, + activates the GPU and starts the thread required to be able to exit + the software. + + If you provide this yourself, you may define SDL_MAIN_HANDLED + */ +#define SDL_MAIN_AVAILABLE + #endif #endif /* SDL_MAIN_HANDLED */ @@ -122,20 +131,62 @@ extern SDLMAIN_DECLSPEC int SDL_main(int argc, char *argv[]); /** - * This is called by the real SDL main function to let the rest of the - * library know that initialization was done properly. + * Circumvent failure of SDL_Init() when not using SDL_main() as an entry + * point. * - * Calling this yourself without knowing what you're doing can cause - * crashes and hard to diagnose problems with your application. + * This function is defined in SDL_main.h, along with the preprocessor rule to + * redefine main() as SDL_main(). Thus to ensure that your main() function + * will not be changed it is necessary to define SDL_MAIN_HANDLED before + * including SDL.h. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Init */ extern DECLSPEC void SDLCALL SDL_SetMainReady(void); #ifdef __WIN32__ /** - * This can be called to set the application class at startup + * Register a win32 window class for SDL's use. + * + * This can be called to set the application window class at startup. It is + * safe to call this multiple times, as long as every call is eventually + * paired with a call to SDL_UnregisterApp, but a second registration attempt + * while a previous registration is still active will be ignored, other than + * to increment a counter. + * + * Most applications do not need to, and should not, call this directly; SDL + * will call it when initializing the video subsystem. + * + * \param name the window class name, in UTF-8 encoding. If NULL, SDL + * currently uses "SDL_app" but this isn't guaranteed. + * \param style the value to use in WNDCLASSEX::style. If `name` is NULL, SDL + * currently uses `(CS_BYTEALIGNCLIENT | CS_OWNDC)` regardless of + * what is specified here. + * \param hInst the HINSTANCE to use in WNDCLASSEX::hInstance. If zero, SDL + * will use `GetModuleHandle(NULL)` instead. + * \returns 0 on success, -1 on error. SDL_GetError() may have details. + * + * \since This function is available since SDL 2.0.2. + */ +extern DECLSPEC int SDLCALL SDL_RegisterApp(const char *name, Uint32 style, void *hInst); + +/** + * Deregister the win32 window class from an SDL_RegisterApp call. + * + * This can be called to undo the effects of SDL_RegisterApp. + * + * Most applications do not need to, and should not, call this directly; SDL + * will call it when deinitializing the video subsystem. + * + * It is safe to call this multiple times, as long as every call is eventually + * paired with a prior call to SDL_RegisterApp. The window class will only be + * deregistered when the registration counter in SDL_RegisterApp decrements to + * zero through calls to this function. + * + * \since This function is available since SDL 2.0.2. */ -extern DECLSPEC int SDLCALL SDL_RegisterApp(char *name, Uint32 style, void *hInst); extern DECLSPEC void SDLCALL SDL_UnregisterApp(void); #endif /* __WIN32__ */ @@ -144,12 +195,14 @@ extern DECLSPEC void SDLCALL SDL_UnregisterApp(void); #ifdef __WINRT__ /** - * \brief Initializes and launches an SDL/WinRT application. + * Initialize and launch an SDL/WinRT application. * - * \param mainFunction The SDL app's C-style main(). - * \param reserved Reserved for future use; should be NULL - * \return 0 on success, -1 on failure. On failure, use SDL_GetError to retrieve more - * information on the failure. + * \param mainFunction the SDL app's C-style main(), an SDL_main_func + * \param reserved reserved for future use; should be NULL + * \returns 0 on success or -1 on failure; call SDL_GetError() to retrieve + * more information on the failure. + * + * \since This function is available since SDL 2.0.3. */ extern DECLSPEC int SDLCALL SDL_WinRTRunApp(SDL_main_func mainFunction, void * reserved); @@ -158,12 +211,14 @@ extern DECLSPEC int SDLCALL SDL_WinRTRunApp(SDL_main_func mainFunction, void * r #if defined(__IPHONEOS__) /** - * \brief Initializes and launches an SDL application. + * Initializes and launches an SDL application. * - * \param argc The argc parameter from the application's main() function - * \param argv The argv parameter from the application's main() function - * \param mainFunction The SDL app's C-style main(). - * \return the return value from mainFunction + * \param argc The argc parameter from the application's main() function + * \param argv The argv parameter from the application's main() function + * \param mainFunction The SDL app's C-style main(), an SDL_main_func + * \return the return value from mainFunction + * + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC int SDLCALL SDL_UIKitRunApp(int argc, char *argv[], SDL_main_func mainFunction); diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_messagebox.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_messagebox.h index e34b55477..d763534d2 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_messagebox.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_messagebox.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -32,17 +32,19 @@ extern "C" { #endif /** - * \brief SDL_MessageBox flags. If supported will display warning icon, etc. + * SDL_MessageBox flags. If supported will display warning icon, etc. */ typedef enum { - SDL_MESSAGEBOX_ERROR = 0x00000010, /**< error dialog */ - SDL_MESSAGEBOX_WARNING = 0x00000020, /**< warning dialog */ - SDL_MESSAGEBOX_INFORMATION = 0x00000040 /**< informational dialog */ + SDL_MESSAGEBOX_ERROR = 0x00000010, /**< error dialog */ + SDL_MESSAGEBOX_WARNING = 0x00000020, /**< warning dialog */ + SDL_MESSAGEBOX_INFORMATION = 0x00000040, /**< informational dialog */ + SDL_MESSAGEBOX_BUTTONS_LEFT_TO_RIGHT = 0x00000080, /**< buttons placed left to right */ + SDL_MESSAGEBOX_BUTTONS_RIGHT_TO_LEFT = 0x00000100 /**< buttons placed right to left */ } SDL_MessageBoxFlags; /** - * \brief Flags for SDL_MessageBoxButtonData. + * Flags for SDL_MessageBoxButtonData. */ typedef enum { @@ -51,7 +53,7 @@ typedef enum } SDL_MessageBoxButtonFlags; /** - * \brief Individual button data. + * Individual button data. */ typedef struct { @@ -61,7 +63,7 @@ typedef struct } SDL_MessageBoxButtonData; /** - * \brief RGB value used in a message box color scheme + * RGB value used in a message box color scheme */ typedef struct { @@ -79,7 +81,7 @@ typedef enum } SDL_MessageBoxColorType; /** - * \brief A set of colors to use for message box dialogs + * A set of colors to use for message box dialogs */ typedef struct { @@ -87,7 +89,7 @@ typedef struct } SDL_MessageBoxColorScheme; /** - * \brief MessageBox structure containing title, text, window, etc. + * MessageBox structure containing title, text, window, etc. */ typedef struct { @@ -103,32 +105,79 @@ typedef struct } SDL_MessageBoxData; /** - * \brief Create a modal message box. + * Create a modal message box. * - * \param messageboxdata The SDL_MessageBoxData structure with title, text, etc. - * \param buttonid The pointer to which user id of hit button should be copied. + * If your needs aren't complex, it might be easier to use + * SDL_ShowSimpleMessageBox. * - * \return -1 on error, otherwise 0 and buttonid contains user id of button - * hit or -1 if dialog was closed. + * This function should be called on the thread that created the parent + * window, or on the main thread if the messagebox has no parent. It will + * block execution of that thread until the user clicks a button or closes the + * messagebox. * - * \note This function should be called on the thread that created the parent - * window, or on the main thread if the messagebox has no parent. It will - * block execution of that thread until the user clicks a button or - * closes the messagebox. + * This function may be called at any time, even before SDL_Init(). This makes + * it useful for reporting errors like a failure to create a renderer or + * OpenGL context. + * + * On X11, SDL rolls its own dialog box with X11 primitives instead of a + * formal toolkit like GTK+ or Qt. + * + * Note that if SDL_Init() would fail because there isn't any available video + * target, this function is likely to fail for the same reasons. If this is a + * concern, check the return value from this function and fall back to writing + * to stderr if you can. + * + * \param messageboxdata the SDL_MessageBoxData structure with title, text and + * other options + * \param buttonid the pointer to which user id of hit button should be copied + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ShowSimpleMessageBox */ extern DECLSPEC int SDLCALL SDL_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid); /** - * \brief Create a simple modal message box + * Display a simple modal message box. * - * \param flags ::SDL_MessageBoxFlags - * \param title UTF-8 title text - * \param message UTF-8 message text - * \param window The parent window, or NULL for no parent + * If your needs aren't complex, this function is preferred over + * SDL_ShowMessageBox. * - * \return 0 on success, -1 on error + * `flags` may be any of the following: * - * \sa SDL_ShowMessageBox + * - `SDL_MESSAGEBOX_ERROR`: error dialog + * - `SDL_MESSAGEBOX_WARNING`: warning dialog + * - `SDL_MESSAGEBOX_INFORMATION`: informational dialog + * + * This function should be called on the thread that created the parent + * window, or on the main thread if the messagebox has no parent. It will + * block execution of that thread until the user clicks a button or closes the + * messagebox. + * + * This function may be called at any time, even before SDL_Init(). This makes + * it useful for reporting errors like a failure to create a renderer or + * OpenGL context. + * + * On X11, SDL rolls its own dialog box with X11 primitives instead of a + * formal toolkit like GTK+ or Qt. + * + * Note that if SDL_Init() would fail because there isn't any available video + * target, this function is likely to fail for the same reasons. If this is a + * concern, check the return value from this function and fall back to writing + * to stderr if you can. + * + * \param flags an SDL_MessageBoxFlags value + * \param title UTF-8 title text + * \param message UTF-8 message text + * \param window the parent window, or NULL for no parent + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ShowMessageBox */ extern DECLSPEC int SDLCALL SDL_ShowSimpleMessageBox(Uint32 flags, const char *title, const char *message, SDL_Window *window); diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_metal.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_metal.h new file mode 100644 index 000000000..9ecaa8151 --- /dev/null +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_metal.h @@ -0,0 +1,112 @@ +/* + Simple DirectMedia Layer + Copyright (C) 1997-2022 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ + +/** + * \file SDL_metal.h + * + * Header file for functions to creating Metal layers and views on SDL windows. + */ + +#ifndef SDL_metal_h_ +#define SDL_metal_h_ + +#include "SDL_video.h" + +#include "begin_code.h" +/* Set up for C function definitions, even when using C++ */ +#ifdef __cplusplus +extern "C" { +#endif + +/** + * \brief A handle to a CAMetalLayer-backed NSView (macOS) or UIView (iOS/tvOS). + * + * \note This can be cast directly to an NSView or UIView. + */ +typedef void *SDL_MetalView; + +/** + * \name Metal support functions + */ +/* @{ */ + +/** + * Create a CAMetalLayer-backed NSView/UIView and attach it to the specified + * window. + * + * On macOS, this does *not* associate a MTLDevice with the CAMetalLayer on + * its own. It is up to user code to do that. + * + * The returned handle can be casted directly to a NSView or UIView. To access + * the backing CAMetalLayer, call SDL_Metal_GetLayer(). + * + * \since This function is available since SDL 2.0.12. + * + * \sa SDL_Metal_DestroyView + * \sa SDL_Metal_GetLayer + */ +extern DECLSPEC SDL_MetalView SDLCALL SDL_Metal_CreateView(SDL_Window * window); + +/** + * Destroy an existing SDL_MetalView object. + * + * This should be called before SDL_DestroyWindow, if SDL_Metal_CreateView was + * called after SDL_CreateWindow. + * + * \since This function is available since SDL 2.0.12. + * + * \sa SDL_Metal_CreateView + */ +extern DECLSPEC void SDLCALL SDL_Metal_DestroyView(SDL_MetalView view); + +/** + * Get a pointer to the backing CAMetalLayer for the given view. + * + * \since This function is available since SDL 2.0.14. + * + * \sa SDL_MetalCreateView + */ +extern DECLSPEC void *SDLCALL SDL_Metal_GetLayer(SDL_MetalView view); + +/** + * Get the size of a window's underlying drawable in pixels (for use with + * setting viewport, scissor & etc). + * + * \param window SDL_Window from which the drawable size should be queried + * \param w Pointer to variable for storing the width in pixels, may be NULL + * + * \since This function is available since SDL 2.0.14. + * + * \sa SDL_GetWindowSize + * \sa SDL_CreateWindow + */ +extern DECLSPEC void SDLCALL SDL_Metal_GetDrawableSize(SDL_Window* window, int *w, + int *h); + +/* @} *//* Metal support functions */ + +/* Ends C function definitions when using C++ */ +#ifdef __cplusplus +} +#endif +#include "close_code.h" + +#endif /* SDL_metal_h_ */ diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_misc.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_misc.h new file mode 100644 index 000000000..261b6b871 --- /dev/null +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_misc.h @@ -0,0 +1,79 @@ +/* + Simple DirectMedia Layer + Copyright (C) 1997-2022 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ + +/** + * \file SDL_misc.h + * + * \brief Include file for SDL API functions that don't fit elsewhere. + */ + +#ifndef SDL_misc_h_ +#define SDL_misc_h_ + +#include "SDL_stdinc.h" + +#include "begin_code.h" + +/* Set up for C function definitions, even when using C++ */ +#ifdef __cplusplus +extern "C" { +#endif + +/** + * Open a URL/URI in the browser or other appropriate external application. + * + * Open a URL in a separate, system-provided application. How this works will + * vary wildly depending on the platform. This will likely launch what makes + * sense to handle a specific URL's protocol (a web browser for `http://`, + * etc), but it might also be able to launch file managers for directories and + * other things. + * + * What happens when you open a URL varies wildly as well: your game window + * may lose focus (and may or may not lose focus if your game was fullscreen + * or grabbing input at the time). On mobile devices, your app will likely + * move to the background or your process might be paused. Any given platform + * may or may not handle a given URL. + * + * If this is unimplemented (or simply unavailable) for a platform, this will + * fail with an error. A successful result does not mean the URL loaded, just + * that we launched _something_ to handle it (or at least believe we did). + * + * All this to say: this function can be useful, but you should definitely + * test it on every platform you target. + * + * \param url A valid URL/URI to open. Use `file:///full/path/to/file` for + * local files, if supported. + * \returns 0 on success, or -1 on error; call SDL_GetError() for more + * information. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC int SDLCALL SDL_OpenURL(const char *url); + +/* Ends C function definitions when using C++ */ +#ifdef __cplusplus +} +#endif +#include "close_code.h" + +#endif /* SDL_misc_h_ */ + +/* vi: set ts=4 sw=4 expandtab: */ diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_mouse.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_mouse.h index 277559d23..1d4a2db0d 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_mouse.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_mouse.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -72,150 +72,240 @@ typedef enum /* Function prototypes */ /** - * \brief Get the window which currently has mouse focus. + * Get the window which currently has mouse focus. + * + * \returns the window with mouse focus. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC SDL_Window * SDLCALL SDL_GetMouseFocus(void); /** - * \brief Retrieve the current state of the mouse. + * Retrieve the current state of the mouse. * - * The current button state is returned as a button bitmask, which can - * be tested using the SDL_BUTTON(X) macros, and x and y are set to the - * mouse cursor position relative to the focus window for the currently - * selected mouse. You can pass NULL for either x or y. + * The current button state is returned as a button bitmask, which can be + * tested using the `SDL_BUTTON(X)` macros (where `X` is generally 1 for the + * left, 2 for middle, 3 for the right button), and `x` and `y` are set to the + * mouse cursor position relative to the focus window. You can pass NULL for + * either `x` or `y`. + * + * \param x the x coordinate of the mouse cursor position relative to the + * focus window + * \param y the y coordinate of the mouse cursor position relative to the + * focus window + * \returns a 32-bit button bitmask of the current button state. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetGlobalMouseState + * \sa SDL_GetRelativeMouseState + * \sa SDL_PumpEvents */ extern DECLSPEC Uint32 SDLCALL SDL_GetMouseState(int *x, int *y); /** - * \brief Get the current state of the mouse, in relation to the desktop + * Get the current state of the mouse in relation to the desktop. * - * This works just like SDL_GetMouseState(), but the coordinates will be - * reported relative to the top-left of the desktop. This can be useful if - * you need to track the mouse outside of a specific window and - * SDL_CaptureMouse() doesn't fit your needs. For example, it could be - * useful if you need to track the mouse while dragging a window, where - * coordinates relative to a window might not be in sync at all times. + * This works similarly to SDL_GetMouseState(), but the coordinates will be + * reported relative to the top-left of the desktop. This can be useful if you + * need to track the mouse outside of a specific window and SDL_CaptureMouse() + * doesn't fit your needs. For example, it could be useful if you need to + * track the mouse while dragging a window, where coordinates relative to a + * window might not be in sync at all times. * - * \note SDL_GetMouseState() returns the mouse position as SDL understands - * it from the last pump of the event queue. This function, however, - * queries the OS for the current mouse position, and as such, might - * be a slightly less efficient function. Unless you know what you're - * doing and have a good reason to use this function, you probably want - * SDL_GetMouseState() instead. + * Note: SDL_GetMouseState() returns the mouse position as SDL understands it + * from the last pump of the event queue. This function, however, queries the + * OS for the current mouse position, and as such, might be a slightly less + * efficient function. Unless you know what you're doing and have a good + * reason to use this function, you probably want SDL_GetMouseState() instead. * - * \param x Returns the current X coord, relative to the desktop. Can be NULL. - * \param y Returns the current Y coord, relative to the desktop. Can be NULL. - * \return The current button state as a bitmask, which can be tested using the SDL_BUTTON(X) macros. + * \param x filled in with the current X coord relative to the desktop; can be + * NULL + * \param y filled in with the current Y coord relative to the desktop; can be + * NULL + * \returns the current button state as a bitmask which can be tested using + * the SDL_BUTTON(X) macros. * - * \sa SDL_GetMouseState + * \since This function is available since SDL 2.0.4. + * + * \sa SDL_CaptureMouse */ extern DECLSPEC Uint32 SDLCALL SDL_GetGlobalMouseState(int *x, int *y); /** - * \brief Retrieve the relative state of the mouse. + * Retrieve the relative state of the mouse. * - * The current button state is returned as a button bitmask, which can - * be tested using the SDL_BUTTON(X) macros, and x and y are set to the - * mouse deltas since the last call to SDL_GetRelativeMouseState(). + * The current button state is returned as a button bitmask, which can be + * tested using the `SDL_BUTTON(X)` macros (where `X` is generally 1 for the + * left, 2 for middle, 3 for the right button), and `x` and `y` are set to the + * mouse deltas since the last call to SDL_GetRelativeMouseState() or since + * event initialization. You can pass NULL for either `x` or `y`. + * + * \param x a pointer filled with the last recorded x coordinate of the mouse + * \param y a pointer filled with the last recorded y coordinate of the mouse + * \returns a 32-bit button bitmask of the relative button state. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetMouseState */ extern DECLSPEC Uint32 SDLCALL SDL_GetRelativeMouseState(int *x, int *y); /** - * \brief Moves the mouse to the given position within the window. + * Move the mouse cursor to the given position within the window. * - * \param window The window to move the mouse into, or NULL for the current mouse focus - * \param x The x coordinate within the window - * \param y The y coordinate within the window + * This function generates a mouse motion event. * - * \note This function generates a mouse motion event + * Note that this function will appear to succeed, but not actually move the + * mouse when used over Microsoft Remote Desktop. + * + * \param window the window to move the mouse into, or NULL for the current + * mouse focus + * \param x the x coordinate within the window + * \param y the y coordinate within the window + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_WarpMouseGlobal */ extern DECLSPEC void SDLCALL SDL_WarpMouseInWindow(SDL_Window * window, int x, int y); /** - * \brief Moves the mouse to the given position in global screen space. + * Move the mouse to the given position in global screen space. * - * \param x The x coordinate - * \param y The y coordinate - * \return 0 on success, -1 on error (usually: unsupported by a platform). + * This function generates a mouse motion event. * - * \note This function generates a mouse motion event + * A failure of this function usually means that it is unsupported by a + * platform. + * + * Note that this function will appear to succeed, but not actually move the + * mouse when used over Microsoft Remote Desktop. + * + * \param x the x coordinate + * \param y the y coordinate + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.4. + * + * \sa SDL_WarpMouseInWindow */ extern DECLSPEC int SDLCALL SDL_WarpMouseGlobal(int x, int y); /** - * \brief Set relative mouse mode. + * Set relative mouse mode. * - * \param enabled Whether or not to enable relative mode + * While the mouse is in relative mode, the cursor is hidden, and the driver + * will try to report continuous motion in the current window. Only relative + * motion events will be delivered, the mouse position will not change. * - * \return 0 on success, or -1 if relative mode is not supported. + * Note that this function will not be able to provide continuous relative + * motion when used over Microsoft Remote Desktop, instead motion is limited + * to the bounds of the screen. * - * While the mouse is in relative mode, the cursor is hidden, and the - * driver will try to report continuous motion in the current window. - * Only relative motion events will be delivered, the mouse position - * will not change. + * This function will flush any pending mouse motion. * - * \note This function will flush any pending mouse motion. + * \param enabled SDL_TRUE to enable relative mode, SDL_FALSE to disable. + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_GetRelativeMouseMode() + * If relative mode is not supported, this returns -1. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetRelativeMouseMode */ extern DECLSPEC int SDLCALL SDL_SetRelativeMouseMode(SDL_bool enabled); /** - * \brief Capture the mouse, to track input outside an SDL window. + * Capture the mouse and to track input outside an SDL window. * - * \param enabled Whether or not to enable capturing + * Capturing enables your app to obtain mouse events globally, instead of just + * within your window. Not all video targets support this function. When + * capturing is enabled, the current window will get all mouse events, but + * unlike relative mode, no change is made to the cursor and it is not + * restrained to your window. * - * Capturing enables your app to obtain mouse events globally, instead of - * just within your window. Not all video targets support this function. - * When capturing is enabled, the current window will get all mouse events, - * but unlike relative mode, no change is made to the cursor and it is - * not restrained to your window. + * This function may also deny mouse input to other windows--both those in + * your application and others on the system--so you should use this function + * sparingly, and in small bursts. For example, you might want to track the + * mouse while the user is dragging something, until the user releases a mouse + * button. It is not recommended that you capture the mouse for long periods + * of time, such as the entire time your app is running. For that, you should + * probably use SDL_SetRelativeMouseMode() or SDL_SetWindowGrab(), depending + * on your goals. * - * This function may also deny mouse input to other windows--both those in - * your application and others on the system--so you should use this - * function sparingly, and in small bursts. For example, you might want to - * track the mouse while the user is dragging something, until the user - * releases a mouse button. It is not recommended that you capture the mouse - * for long periods of time, such as the entire time your app is running. + * While captured, mouse events still report coordinates relative to the + * current (foreground) window, but those coordinates may be outside the + * bounds of the window (including negative values). Capturing is only allowed + * for the foreground window. If the window loses focus while capturing, the + * capture will be disabled automatically. * - * While captured, mouse events still report coordinates relative to the - * current (foreground) window, but those coordinates may be outside the - * bounds of the window (including negative values). Capturing is only - * allowed for the foreground window. If the window loses focus while - * capturing, the capture will be disabled automatically. + * While capturing is enabled, the current window will have the + * `SDL_WINDOW_MOUSE_CAPTURE` flag set. * - * While capturing is enabled, the current window will have the - * SDL_WINDOW_MOUSE_CAPTURE flag set. + * \param enabled SDL_TRUE to enable capturing, SDL_FALSE to disable. + * \returns 0 on success or -1 if not supported; call SDL_GetError() for more + * information. * - * \return 0 on success, or -1 if not supported. + * \since This function is available since SDL 2.0.4. + * + * \sa SDL_GetGlobalMouseState */ extern DECLSPEC int SDLCALL SDL_CaptureMouse(SDL_bool enabled); /** - * \brief Query whether relative mouse mode is enabled. + * Query whether relative mouse mode is enabled. * - * \sa SDL_SetRelativeMouseMode() + * \returns SDL_TRUE if relative mode is enabled or SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetRelativeMouseMode */ extern DECLSPEC SDL_bool SDLCALL SDL_GetRelativeMouseMode(void); /** - * \brief Create a cursor, using the specified bitmap data and - * mask (in MSB format). + * Create a cursor using the specified bitmap data and mask (in MSB format). * - * The cursor width must be a multiple of 8 bits. + * `mask` has to be in MSB (Most Significant Bit) format. * - * The cursor is created in black and white according to the following: - * - * - * - * - * - * - *
data mask resulting pixel on screen
0 1 White
1 1 Black
0 0 Transparent
1 0 Inverted color if possible, black - * if not.
+ * The cursor width (`w`) must be a multiple of 8 bits. * - * \sa SDL_FreeCursor() + * The cursor is created in black and white according to the following: + * + * - data=0, mask=1: white + * - data=1, mask=1: black + * - data=0, mask=0: transparent + * - data=1, mask=0: inverted color if possible, black if not. + * + * Cursors created with this function must be freed with SDL_FreeCursor(). + * + * If you want to have a color cursor, or create your cursor from an + * SDL_Surface, you should use SDL_CreateColorCursor(). Alternately, you can + * hide the cursor and draw your own as part of your game's rendering, but it + * will be bound to the framerate. + * + * Also, since SDL 2.0.0, SDL_CreateSystemCursor() is available, which + * provides twelve readily available system cursors to pick from. + * + * \param data the color value for each pixel of the cursor + * \param mask the mask value for each pixel of the cursor + * \param w the width of the cursor + * \param h the height of the cursor + * \param hot_x the X-axis location of the upper left corner of the cursor + * relative to the actual mouse position + * \param hot_y the Y-axis location of the upper left corner of the cursor + * relative to the actual mouse position + * \returns a new cursor with the specified parameters on success or NULL on + * failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_FreeCursor + * \sa SDL_SetCursor + * \sa SDL_ShowCursor */ extern DECLSPEC SDL_Cursor *SDLCALL SDL_CreateCursor(const Uint8 * data, const Uint8 * mask, @@ -223,60 +313,123 @@ extern DECLSPEC SDL_Cursor *SDLCALL SDL_CreateCursor(const Uint8 * data, int hot_y); /** - * \brief Create a color cursor. + * Create a color cursor. * - * \sa SDL_FreeCursor() + * \param surface an SDL_Surface structure representing the cursor image + * \param hot_x the x position of the cursor hot spot + * \param hot_y the y position of the cursor hot spot + * \returns the new cursor on success or NULL on failure; call SDL_GetError() + * for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateCursor + * \sa SDL_FreeCursor */ extern DECLSPEC SDL_Cursor *SDLCALL SDL_CreateColorCursor(SDL_Surface *surface, int hot_x, int hot_y); /** - * \brief Create a system cursor. + * Create a system cursor. * - * \sa SDL_FreeCursor() + * \param id an SDL_SystemCursor enum value + * \returns a cursor on success or NULL on failure; call SDL_GetError() for + * more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_FreeCursor */ extern DECLSPEC SDL_Cursor *SDLCALL SDL_CreateSystemCursor(SDL_SystemCursor id); /** - * \brief Set the active cursor. + * Set the active cursor. + * + * This function sets the currently active cursor to the specified one. If the + * cursor is currently visible, the change will be immediately represented on + * the display. SDL_SetCursor(NULL) can be used to force cursor redraw, if + * this is desired for any reason. + * + * \param cursor a cursor to make active + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateCursor + * \sa SDL_GetCursor + * \sa SDL_ShowCursor */ extern DECLSPEC void SDLCALL SDL_SetCursor(SDL_Cursor * cursor); /** - * \brief Return the active cursor. + * Get the active cursor. + * + * This function returns a pointer to the current cursor which is owned by the + * library. It is not necessary to free the cursor with SDL_FreeCursor(). + * + * \returns the active cursor or NULL if there is no mouse. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetCursor */ extern DECLSPEC SDL_Cursor *SDLCALL SDL_GetCursor(void); /** - * \brief Return the default cursor. + * Get the default cursor. + * + * \returns the default cursor on success or NULL on failure. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateSystemCursor */ extern DECLSPEC SDL_Cursor *SDLCALL SDL_GetDefaultCursor(void); /** - * \brief Frees a cursor created with SDL_CreateCursor() or similar functions. + * Free a previously-created cursor. * - * \sa SDL_CreateCursor() - * \sa SDL_CreateColorCursor() - * \sa SDL_CreateSystemCursor() + * Use this function to free cursor resources created with SDL_CreateCursor(), + * SDL_CreateColorCursor() or SDL_CreateSystemCursor(). + * + * \param cursor the cursor to free + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateColorCursor + * \sa SDL_CreateCursor + * \sa SDL_CreateSystemCursor */ extern DECLSPEC void SDLCALL SDL_FreeCursor(SDL_Cursor * cursor); /** - * \brief Toggle whether or not the cursor is shown. + * Toggle whether or not the cursor is shown. * - * \param toggle 1 to show the cursor, 0 to hide it, -1 to query the current - * state. + * The cursor starts off displayed but can be turned off. Passing `SDL_ENABLE` + * displays the cursor and passing `SDL_DISABLE` hides it. * - * \return 1 if the cursor is shown, or 0 if the cursor is hidden. + * The current state of the mouse cursor can be queried by passing + * `SDL_QUERY`; either `SDL_DISABLE` or `SDL_ENABLE` will be returned. + * + * \param toggle `SDL_ENABLE` to show the cursor, `SDL_DISABLE` to hide it, + * `SDL_QUERY` to query the current state without changing it. + * \returns `SDL_ENABLE` if the cursor is shown, or `SDL_DISABLE` if the + * cursor is hidden, or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateCursor + * \sa SDL_SetCursor */ extern DECLSPEC int SDLCALL SDL_ShowCursor(int toggle); /** - * Used as a mask when testing buttons in buttonstate. - * - Button 1: Left mouse button - * - Button 2: Middle mouse button - * - Button 3: Right mouse button + * Used as a mask when testing buttons in buttonstate. + * + * - Button 1: Left mouse button + * - Button 2: Middle mouse button + * - Button 3: Right mouse button */ #define SDL_BUTTON(X) (1 << ((X)-1)) #define SDL_BUTTON_LEFT 1 @@ -290,7 +443,6 @@ extern DECLSPEC int SDLCALL SDL_ShowCursor(int toggle); #define SDL_BUTTON_X1MASK SDL_BUTTON(SDL_BUTTON_X1) #define SDL_BUTTON_X2MASK SDL_BUTTON(SDL_BUTTON_X2) - /* Ends C function definitions when using C++ */ #ifdef __cplusplus } diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_mutex.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_mutex.h index 970e78713..173468f6a 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_mutex.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_mutex.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -59,38 +59,105 @@ struct SDL_mutex; typedef struct SDL_mutex SDL_mutex; /** - * Create a mutex, initialized unlocked. + * Create a new mutex. + * + * All newly-created mutexes begin in the _unlocked_ state. + * + * Calls to SDL_LockMutex() will not return while the mutex is locked by + * another thread. See SDL_TryLockMutex() to attempt to lock without blocking. + * + * SDL mutexes are reentrant. + * + * \returns the initialized and unlocked mutex or NULL on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_DestroyMutex + * \sa SDL_LockMutex + * \sa SDL_TryLockMutex + * \sa SDL_UnlockMutex */ extern DECLSPEC SDL_mutex *SDLCALL SDL_CreateMutex(void); /** - * Lock the mutex. + * Lock the mutex. * - * \return 0, or -1 on error. + * This will block until the mutex is available, which is to say it is in the + * unlocked state and the OS has chosen the caller as the next thread to lock + * it. Of all threads waiting to lock the mutex, only one may do so at a time. + * + * It is legal for the owning thread to lock an already-locked mutex. It must + * unlock it the same number of times before it is actually made available for + * other threads in the system (this is known as a "recursive mutex"). + * + * \param mutex the mutex to lock + * \return 0, or -1 on error. + * + * \since This function is available since SDL 2.0.0. */ -#define SDL_mutexP(m) SDL_LockMutex(m) extern DECLSPEC int SDLCALL SDL_LockMutex(SDL_mutex * mutex); +#define SDL_mutexP(m) SDL_LockMutex(m) /** - * Try to lock the mutex + * Try to lock a mutex without blocking. * - * \return 0, SDL_MUTEX_TIMEDOUT, or -1 on error + * This works just like SDL_LockMutex(), but if the mutex is not available, + * this function returns `SDL_MUTEX_TIMEOUT` immediately. + * + * This technique is useful if you need exclusive access to a resource but + * don't want to wait for it, and will return to it to try again later. + * + * \param mutex the mutex to try to lock + * \returns 0, `SDL_MUTEX_TIMEDOUT`, or -1 on error; call SDL_GetError() for + * more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateMutex + * \sa SDL_DestroyMutex + * \sa SDL_LockMutex + * \sa SDL_UnlockMutex */ extern DECLSPEC int SDLCALL SDL_TryLockMutex(SDL_mutex * mutex); /** - * Unlock the mutex. + * Unlock the mutex. * - * \return 0, or -1 on error. + * It is legal for the owning thread to lock an already-locked mutex. It must + * unlock it the same number of times before it is actually made available for + * other threads in the system (this is known as a "recursive mutex"). * - * \warning It is an error to unlock a mutex that has not been locked by - * the current thread, and doing so results in undefined behavior. + * It is an error to unlock a mutex that has not been locked by the current + * thread, and doing so results in undefined behavior. + * + * It is also an error to unlock a mutex that isn't locked at all. + * + * \param mutex the mutex to unlock. + * \returns 0, or -1 on error. + * + * \since This function is available since SDL 2.0.0. */ -#define SDL_mutexV(m) SDL_UnlockMutex(m) extern DECLSPEC int SDLCALL SDL_UnlockMutex(SDL_mutex * mutex); +#define SDL_mutexV(m) SDL_UnlockMutex(m) /** - * Destroy a mutex. + * Destroy a mutex created with SDL_CreateMutex(). + * + * This function must be called on any mutex that is no longer needed. Failure + * to destroy a mutex will result in a system memory or resource leak. While + * it is safe to destroy a mutex that is _unlocked_, it is not safe to attempt + * to destroy a locked mutex, and may result in undefined behavior depending + * on the platform. + * + * \param mutex the mutex to destroy + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateMutex + * \sa SDL_LockMutex + * \sa SDL_TryLockMutex + * \sa SDL_UnlockMutex */ extern DECLSPEC void SDLCALL SDL_DestroyMutex(SDL_mutex * mutex); @@ -107,50 +174,151 @@ struct SDL_semaphore; typedef struct SDL_semaphore SDL_sem; /** - * Create a semaphore, initialized with value, returns NULL on failure. + * Create a semaphore. + * + * This function creates a new semaphore and initializes it with the value + * `initial_value`. Each wait operation on the semaphore will atomically + * decrement the semaphore value and potentially block if the semaphore value + * is 0. Each post operation will atomically increment the semaphore value and + * wake waiting threads and allow them to retry the wait operation. + * + * \param initial_value the starting value of the semaphore + * \returns a new semaphore or NULL on failure; call SDL_GetError() for more + * information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_DestroySemaphore + * \sa SDL_SemPost + * \sa SDL_SemTryWait + * \sa SDL_SemValue + * \sa SDL_SemWait + * \sa SDL_SemWaitTimeout */ extern DECLSPEC SDL_sem *SDLCALL SDL_CreateSemaphore(Uint32 initial_value); /** - * Destroy a semaphore. + * Destroy a semaphore. + * + * It is not safe to destroy a semaphore if there are threads currently + * waiting on it. + * + * \param sem the semaphore to destroy + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateSemaphore + * \sa SDL_SemPost + * \sa SDL_SemTryWait + * \sa SDL_SemValue + * \sa SDL_SemWait + * \sa SDL_SemWaitTimeout */ extern DECLSPEC void SDLCALL SDL_DestroySemaphore(SDL_sem * sem); /** - * This function suspends the calling thread until the semaphore pointed - * to by \c sem has a positive count. It then atomically decreases the - * semaphore count. + * Wait until a semaphore has a positive value and then decrements it. + * + * This function suspends the calling thread until either the semaphore + * pointed to by `sem` has a positive value or the call is interrupted by a + * signal or error. If the call is successful it will atomically decrement the + * semaphore value. + * + * This function is the equivalent of calling SDL_SemWaitTimeout() with a time + * length of `SDL_MUTEX_MAXWAIT`. + * + * \param sem the semaphore wait on + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateSemaphore + * \sa SDL_DestroySemaphore + * \sa SDL_SemPost + * \sa SDL_SemTryWait + * \sa SDL_SemValue + * \sa SDL_SemWait + * \sa SDL_SemWaitTimeout */ extern DECLSPEC int SDLCALL SDL_SemWait(SDL_sem * sem); /** - * Non-blocking variant of SDL_SemWait(). + * See if a semaphore has a positive value and decrement it if it does. * - * \return 0 if the wait succeeds, ::SDL_MUTEX_TIMEDOUT if the wait would - * block, and -1 on error. + * This function checks to see if the semaphore pointed to by `sem` has a + * positive value and atomically decrements the semaphore value if it does. If + * the semaphore doesn't have a positive value, the function immediately + * returns SDL_MUTEX_TIMEDOUT. + * + * \param sem the semaphore to wait on + * \returns 0 if the wait succeeds, `SDL_MUTEX_TIMEDOUT` if the wait would + * block, or a negative error code on failure; call SDL_GetError() + * for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateSemaphore + * \sa SDL_DestroySemaphore + * \sa SDL_SemPost + * \sa SDL_SemValue + * \sa SDL_SemWait + * \sa SDL_SemWaitTimeout */ extern DECLSPEC int SDLCALL SDL_SemTryWait(SDL_sem * sem); /** - * Variant of SDL_SemWait() with a timeout in milliseconds. + * Wait until a semaphore has a positive value and then decrements it. * - * \return 0 if the wait succeeds, ::SDL_MUTEX_TIMEDOUT if the wait does not - * succeed in the allotted time, and -1 on error. + * This function suspends the calling thread until either the semaphore + * pointed to by `sem` has a positive value, the call is interrupted by a + * signal or error, or the specified time has elapsed. If the call is + * successful it will atomically decrement the semaphore value. * - * \warning On some platforms this function is implemented by looping with a - * delay of 1 ms, and so should be avoided if possible. + * \param sem the semaphore to wait on + * \param ms the length of the timeout, in milliseconds + * \returns 0 if the wait succeeds, `SDL_MUTEX_TIMEDOUT` if the wait does not + * succeed in the allotted time, or a negative error code on failure; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateSemaphore + * \sa SDL_DestroySemaphore + * \sa SDL_SemPost + * \sa SDL_SemTryWait + * \sa SDL_SemValue + * \sa SDL_SemWait */ extern DECLSPEC int SDLCALL SDL_SemWaitTimeout(SDL_sem * sem, Uint32 ms); /** - * Atomically increases the semaphore's count (not blocking). + * Atomically increment a semaphore's value and wake waiting threads. * - * \return 0, or -1 on error. + * \param sem the semaphore to increment + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateSemaphore + * \sa SDL_DestroySemaphore + * \sa SDL_SemTryWait + * \sa SDL_SemValue + * \sa SDL_SemWait + * \sa SDL_SemWaitTimeout */ extern DECLSPEC int SDLCALL SDL_SemPost(SDL_sem * sem); /** - * Returns the current count of the semaphore. + * Get the current value of a semaphore. + * + * \param sem the semaphore to query + * \returns the current value of the semaphore. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateSemaphore */ extern DECLSPEC Uint32 SDLCALL SDL_SemValue(SDL_sem * sem); @@ -167,72 +335,124 @@ struct SDL_cond; typedef struct SDL_cond SDL_cond; /** - * Create a condition variable. + * Create a condition variable. * - * Typical use of condition variables: + * \returns a new condition variable or NULL on failure; call SDL_GetError() + * for more information. * - * Thread A: - * SDL_LockMutex(lock); - * while ( ! condition ) { - * SDL_CondWait(cond, lock); - * } - * SDL_UnlockMutex(lock); + * \since This function is available since SDL 2.0.0. * - * Thread B: - * SDL_LockMutex(lock); - * ... - * condition = true; - * ... - * SDL_CondSignal(cond); - * SDL_UnlockMutex(lock); - * - * There is some discussion whether to signal the condition variable - * with the mutex locked or not. There is some potential performance - * benefit to unlocking first on some platforms, but there are some - * potential race conditions depending on how your code is structured. - * - * In general it's safer to signal the condition variable while the - * mutex is locked. + * \sa SDL_CondBroadcast + * \sa SDL_CondSignal + * \sa SDL_CondWait + * \sa SDL_CondWaitTimeout + * \sa SDL_DestroyCond */ extern DECLSPEC SDL_cond *SDLCALL SDL_CreateCond(void); /** - * Destroy a condition variable. + * Destroy a condition variable. + * + * \param cond the condition variable to destroy + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CondBroadcast + * \sa SDL_CondSignal + * \sa SDL_CondWait + * \sa SDL_CondWaitTimeout + * \sa SDL_CreateCond */ extern DECLSPEC void SDLCALL SDL_DestroyCond(SDL_cond * cond); /** - * Restart one of the threads that are waiting on the condition variable. + * Restart one of the threads that are waiting on the condition variable. * - * \return 0 or -1 on error. + * \param cond the condition variable to signal + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CondBroadcast + * \sa SDL_CondWait + * \sa SDL_CondWaitTimeout + * \sa SDL_CreateCond + * \sa SDL_DestroyCond */ extern DECLSPEC int SDLCALL SDL_CondSignal(SDL_cond * cond); /** - * Restart all threads that are waiting on the condition variable. + * Restart all threads that are waiting on the condition variable. * - * \return 0 or -1 on error. + * \param cond the condition variable to signal + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CondSignal + * \sa SDL_CondWait + * \sa SDL_CondWaitTimeout + * \sa SDL_CreateCond + * \sa SDL_DestroyCond */ extern DECLSPEC int SDLCALL SDL_CondBroadcast(SDL_cond * cond); /** - * Wait on the condition variable, unlocking the provided mutex. + * Wait until a condition variable is signaled. * - * \warning The mutex must be locked before entering this function! + * This function unlocks the specified `mutex` and waits for another thread to + * call SDL_CondSignal() or SDL_CondBroadcast() on the condition variable + * `cond`. Once the condition variable is signaled, the mutex is re-locked and + * the function returns. * - * The mutex is re-locked once the condition variable is signaled. + * The mutex must be locked before calling this function. * - * \return 0 when it is signaled, or -1 on error. + * This function is the equivalent of calling SDL_CondWaitTimeout() with a + * time length of `SDL_MUTEX_MAXWAIT`. + * + * \param cond the condition variable to wait on + * \param mutex the mutex used to coordinate thread access + * \returns 0 when it is signaled or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CondBroadcast + * \sa SDL_CondSignal + * \sa SDL_CondWaitTimeout + * \sa SDL_CreateCond + * \sa SDL_DestroyCond */ extern DECLSPEC int SDLCALL SDL_CondWait(SDL_cond * cond, SDL_mutex * mutex); /** - * Waits for at most \c ms milliseconds, and returns 0 if the condition - * variable is signaled, ::SDL_MUTEX_TIMEDOUT if the condition is not - * signaled in the allotted time, and -1 on error. + * Wait until a condition variable is signaled or a certain time has passed. * - * \warning On some platforms this function is implemented by looping with a - * delay of 1 ms, and so should be avoided if possible. + * This function unlocks the specified `mutex` and waits for another thread to + * call SDL_CondSignal() or SDL_CondBroadcast() on the condition variable + * `cond`, or for the specified time to elapse. Once the condition variable is + * signaled or the time elapsed, the mutex is re-locked and the function + * returns. + * + * The mutex must be locked before calling this function. + * + * \param cond the condition variable to wait on + * \param mutex the mutex used to coordinate thread access + * \param ms the maximum time to wait, in milliseconds, or `SDL_MUTEX_MAXWAIT` + * to wait indefinitely + * \returns 0 if the condition variable is signaled, `SDL_MUTEX_TIMEDOUT` if + * the condition is not signaled in the allotted time, or a negative + * error code on failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CondBroadcast + * \sa SDL_CondSignal + * \sa SDL_CondWait + * \sa SDL_CreateCond + * \sa SDL_DestroyCond */ extern DECLSPEC int SDLCALL SDL_CondWaitTimeout(SDL_cond * cond, SDL_mutex * mutex, Uint32 ms); diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_name.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_name.h index 690a8199b..6ff35b46e 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_name.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_name.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_opengl.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_opengl.h index 6685be73e..9aed5035a 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_opengl.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_opengl.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_opengl_glext.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_opengl_glext.h index cd3869fe7..6a402b15a 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_opengl_glext.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_opengl_glext.h @@ -40,6 +40,9 @@ extern "C" { #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN 1 #endif +#ifndef NOMINMAX /* don't define min() and max(). */ +#define NOMINMAX +#endif #include #endif diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_opengles.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_opengles.h index 1e0660c3d..8511b9607 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_opengles.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_opengles.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_opengles2.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_opengles2.h index df29d3840..172fcb3f4 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_opengles2.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_opengles2.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -26,7 +26,7 @@ */ #include "SDL_config.h" -#ifndef _MSC_VER +#if !defined(_MSC_VER) && !defined(SDL_USE_BUILTIN_OPENGL_DEFINITIONS) #ifdef __IPHONEOS__ #include diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_pixels.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_pixels.h index dcb7a980d..5d2c0c898 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_pixels.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_pixels.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -48,7 +48,7 @@ extern "C" { /* @} */ /** Pixel type. */ -enum +typedef enum { SDL_PIXELTYPE_UNKNOWN, SDL_PIXELTYPE_INDEX1, @@ -62,18 +62,18 @@ enum SDL_PIXELTYPE_ARRAYU32, SDL_PIXELTYPE_ARRAYF16, SDL_PIXELTYPE_ARRAYF32 -}; +} SDL_PixelType; /** Bitmap pixel order, high bit -> low bit. */ -enum +typedef enum { SDL_BITMAPORDER_NONE, SDL_BITMAPORDER_4321, SDL_BITMAPORDER_1234 -}; +} SDL_BitmapOrder; /** Packed component order, high bit -> low bit. */ -enum +typedef enum { SDL_PACKEDORDER_NONE, SDL_PACKEDORDER_XRGB, @@ -84,12 +84,12 @@ enum SDL_PACKEDORDER_BGRX, SDL_PACKEDORDER_ABGR, SDL_PACKEDORDER_BGRA -}; +} SDL_PackedOrder; /** Array component order, low byte -> high byte. */ /* !!! FIXME: in 2.1, make these not overlap differently with !!! FIXME: SDL_PACKEDORDER_*, so we can simplify SDL_ISPIXELFORMAT_ALPHA */ -enum +typedef enum { SDL_ARRAYORDER_NONE, SDL_ARRAYORDER_RGB, @@ -98,10 +98,10 @@ enum SDL_ARRAYORDER_BGR, SDL_ARRAYORDER_BGRA, SDL_ARRAYORDER_ABGR -}; +} SDL_ArrayOrder; /** Packed component layout. */ -enum +typedef enum { SDL_PACKEDLAYOUT_NONE, SDL_PACKEDLAYOUT_332, @@ -112,7 +112,7 @@ enum SDL_PACKEDLAYOUT_8888, SDL_PACKEDLAYOUT_2101010, SDL_PACKEDLAYOUT_1010102 -}; +} SDL_PackedLayout; #define SDL_DEFINE_PIXELFOURCC(A, B, C, D) SDL_FOURCC(A, B, C, D) @@ -188,15 +188,22 @@ typedef enum SDL_PIXELFORMAT_RGB332 = SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED8, SDL_PACKEDORDER_XRGB, SDL_PACKEDLAYOUT_332, 8, 1), - SDL_PIXELFORMAT_RGB444 = + SDL_PIXELFORMAT_XRGB4444 = SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XRGB, SDL_PACKEDLAYOUT_4444, 12, 2), - SDL_PIXELFORMAT_RGB555 = + SDL_PIXELFORMAT_RGB444 = SDL_PIXELFORMAT_XRGB4444, + SDL_PIXELFORMAT_XBGR4444 = + SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XBGR, + SDL_PACKEDLAYOUT_4444, 12, 2), + SDL_PIXELFORMAT_BGR444 = SDL_PIXELFORMAT_XBGR4444, + SDL_PIXELFORMAT_XRGB1555 = SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XRGB, SDL_PACKEDLAYOUT_1555, 15, 2), - SDL_PIXELFORMAT_BGR555 = + SDL_PIXELFORMAT_RGB555 = SDL_PIXELFORMAT_XRGB1555, + SDL_PIXELFORMAT_XBGR1555 = SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XBGR, SDL_PACKEDLAYOUT_1555, 15, 2), + SDL_PIXELFORMAT_BGR555 = SDL_PIXELFORMAT_XBGR1555, SDL_PIXELFORMAT_ARGB4444 = SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_ARGB, SDL_PACKEDLAYOUT_4444, 16, 2), @@ -233,15 +240,17 @@ typedef enum SDL_PIXELFORMAT_BGR24 = SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_ARRAYU8, SDL_ARRAYORDER_BGR, 0, 24, 3), - SDL_PIXELFORMAT_RGB888 = + SDL_PIXELFORMAT_XRGB8888 = SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_XRGB, SDL_PACKEDLAYOUT_8888, 24, 4), + SDL_PIXELFORMAT_RGB888 = SDL_PIXELFORMAT_XRGB8888, SDL_PIXELFORMAT_RGBX8888 = SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_RGBX, SDL_PACKEDLAYOUT_8888, 24, 4), - SDL_PIXELFORMAT_BGR888 = + SDL_PIXELFORMAT_XBGR8888 = SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_XBGR, SDL_PACKEDLAYOUT_8888, 24, 4), + SDL_PIXELFORMAT_BGR888 = SDL_PIXELFORMAT_XBGR8888, SDL_PIXELFORMAT_BGRX8888 = SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_BGRX, SDL_PACKEDLAYOUT_8888, 24, 4), @@ -292,6 +301,11 @@ typedef enum SDL_DEFINE_PIXELFOURCC('O', 'E', 'S', ' ') } SDL_PixelFormatEnum; +/** + * The bits of this structure can be directly reinterpreted as an integer-packed + * color which uses the SDL_PIXELFORMAT_RGBA32 format (SDL_PIXELFORMAT_ABGR8888 + * on little-endian systems and SDL_PIXELFORMAT_RGBA8888 on big-endian systems). + */ typedef struct SDL_Color { Uint8 r; @@ -336,16 +350,31 @@ typedef struct SDL_PixelFormat } SDL_PixelFormat; /** - * \brief Get the human readable name of a pixel format + * Get the human readable name of a pixel format. + * + * \param format the pixel format to query + * \returns the human readable name of the specified pixel format or + * `SDL_PIXELFORMAT_UNKNOWN` if the format isn't recognized. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC const char* SDLCALL SDL_GetPixelFormatName(Uint32 format); /** - * \brief Convert one of the enumerated pixel formats to a bpp and RGBA masks. + * Convert one of the enumerated pixel formats to a bpp value and RGBA masks. * - * \return SDL_TRUE, or SDL_FALSE if the conversion wasn't possible. + * \param format one of the SDL_PixelFormatEnum values + * \param bpp a bits per pixel value; usually 15, 16, or 32 + * \param Rmask a pointer filled in with the red mask for the format + * \param Gmask a pointer filled in with the green mask for the format + * \param Bmask a pointer filled in with the blue mask for the format + * \param Amask a pointer filled in with the alpha mask for the format + * \returns SDL_TRUE on success or SDL_FALSE if the conversion wasn't + * possible; call SDL_GetError() for more information. * - * \sa SDL_MasksToPixelFormatEnum() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_MasksToPixelFormatEnum */ extern DECLSPEC SDL_bool SDLCALL SDL_PixelFormatEnumToMasks(Uint32 format, int *bpp, @@ -355,12 +384,21 @@ extern DECLSPEC SDL_bool SDLCALL SDL_PixelFormatEnumToMasks(Uint32 format, Uint32 * Amask); /** - * \brief Convert a bpp and RGBA masks to an enumerated pixel format. + * Convert a bpp value and RGBA masks to an enumerated pixel format. * - * \return The pixel format, or ::SDL_PIXELFORMAT_UNKNOWN if the conversion - * wasn't possible. + * This will return `SDL_PIXELFORMAT_UNKNOWN` if the conversion wasn't + * possible. * - * \sa SDL_PixelFormatEnumToMasks() + * \param bpp a bits per pixel value; usually 15, 16, or 32 + * \param Rmask the red mask for the format + * \param Gmask the green mask for the format + * \param Bmask the blue mask for the format + * \param Amask the alpha mask for the format + * \returns one of the SDL_PixelFormatEnum values + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_PixelFormatEnumToMasks */ extern DECLSPEC Uint32 SDLCALL SDL_MasksToPixelFormatEnum(int bpp, Uint32 Rmask, @@ -369,84 +407,213 @@ extern DECLSPEC Uint32 SDLCALL SDL_MasksToPixelFormatEnum(int bpp, Uint32 Amask); /** - * \brief Create an SDL_PixelFormat structure from a pixel format enum. + * Create an SDL_PixelFormat structure corresponding to a pixel format. + * + * Returned structure may come from a shared global cache (i.e. not newly + * allocated), and hence should not be modified, especially the palette. Weird + * errors such as `Blit combination not supported` may occur. + * + * \param pixel_format one of the SDL_PixelFormatEnum values + * \returns the new SDL_PixelFormat structure or NULL on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_FreeFormat */ extern DECLSPEC SDL_PixelFormat * SDLCALL SDL_AllocFormat(Uint32 pixel_format); /** - * \brief Free an SDL_PixelFormat structure. + * Free an SDL_PixelFormat structure allocated by SDL_AllocFormat(). + * + * \param format the SDL_PixelFormat structure to free + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AllocFormat */ extern DECLSPEC void SDLCALL SDL_FreeFormat(SDL_PixelFormat *format); /** - * \brief Create a palette structure with the specified number of color - * entries. + * Create a palette structure with the specified number of color entries. * - * \return A new palette, or NULL if there wasn't enough memory. + * The palette entries are initialized to white. * - * \note The palette entries are initialized to white. + * \param ncolors represents the number of color entries in the color palette + * \returns a new SDL_Palette structure on success or NULL on failure (e.g. if + * there wasn't enough memory); call SDL_GetError() for more + * information. * - * \sa SDL_FreePalette() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_FreePalette */ extern DECLSPEC SDL_Palette *SDLCALL SDL_AllocPalette(int ncolors); /** - * \brief Set the palette for a pixel format structure. + * Set the palette for a pixel format structure. + * + * \param format the SDL_PixelFormat structure that will use the palette + * \param palette the SDL_Palette structure that will be used + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AllocPalette + * \sa SDL_FreePalette */ extern DECLSPEC int SDLCALL SDL_SetPixelFormatPalette(SDL_PixelFormat * format, SDL_Palette *palette); /** - * \brief Set a range of colors in a palette. + * Set a range of colors in a palette. * - * \param palette The palette to modify. - * \param colors An array of colors to copy into the palette. - * \param firstcolor The index of the first palette entry to modify. - * \param ncolors The number of entries to modify. + * \param palette the SDL_Palette structure to modify + * \param colors an array of SDL_Color structures to copy into the palette + * \param firstcolor the index of the first palette entry to modify + * \param ncolors the number of entries to modify + * \returns 0 on success or a negative error code if not all of the colors + * could be set; call SDL_GetError() for more information. * - * \return 0 on success, or -1 if not all of the colors could be set. + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AllocPalette + * \sa SDL_CreateRGBSurface */ extern DECLSPEC int SDLCALL SDL_SetPaletteColors(SDL_Palette * palette, const SDL_Color * colors, int firstcolor, int ncolors); /** - * \brief Free a palette created with SDL_AllocPalette(). + * Free a palette created with SDL_AllocPalette(). * - * \sa SDL_AllocPalette() + * \param palette the SDL_Palette structure to be freed + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AllocPalette */ extern DECLSPEC void SDLCALL SDL_FreePalette(SDL_Palette * palette); /** - * \brief Maps an RGB triple to an opaque pixel value for a given pixel format. + * Map an RGB triple to an opaque pixel value for a given pixel format. * - * \sa SDL_MapRGBA + * This function maps the RGB color value to the specified pixel format and + * returns the pixel value best approximating the given RGB color value for + * the given pixel format. + * + * If the format has a palette (8-bit) the index of the closest matching color + * in the palette will be returned. + * + * If the specified pixel format has an alpha component it will be returned as + * all 1 bits (fully opaque). + * + * If the pixel format bpp (color depth) is less than 32-bpp then the unused + * upper bits of the return value can safely be ignored (e.g., with a 16-bpp + * format the return value can be assigned to a Uint16, and similarly a Uint8 + * for an 8-bpp format). + * + * \param format an SDL_PixelFormat structure describing the pixel format + * \param r the red component of the pixel in the range 0-255 + * \param g the green component of the pixel in the range 0-255 + * \param b the blue component of the pixel in the range 0-255 + * \returns a pixel value + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetRGB + * \sa SDL_GetRGBA + * \sa SDL_MapRGBA */ extern DECLSPEC Uint32 SDLCALL SDL_MapRGB(const SDL_PixelFormat * format, Uint8 r, Uint8 g, Uint8 b); /** - * \brief Maps an RGBA quadruple to a pixel value for a given pixel format. + * Map an RGBA quadruple to a pixel value for a given pixel format. * - * \sa SDL_MapRGB + * This function maps the RGBA color value to the specified pixel format and + * returns the pixel value best approximating the given RGBA color value for + * the given pixel format. + * + * If the specified pixel format has no alpha component the alpha value will + * be ignored (as it will be in formats with a palette). + * + * If the format has a palette (8-bit) the index of the closest matching color + * in the palette will be returned. + * + * If the pixel format bpp (color depth) is less than 32-bpp then the unused + * upper bits of the return value can safely be ignored (e.g., with a 16-bpp + * format the return value can be assigned to a Uint16, and similarly a Uint8 + * for an 8-bpp format). + * + * \param format an SDL_PixelFormat structure describing the format of the + * pixel + * \param r the red component of the pixel in the range 0-255 + * \param g the green component of the pixel in the range 0-255 + * \param b the blue component of the pixel in the range 0-255 + * \param a the alpha component of the pixel in the range 0-255 + * \returns a pixel value + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetRGB + * \sa SDL_GetRGBA + * \sa SDL_MapRGB */ extern DECLSPEC Uint32 SDLCALL SDL_MapRGBA(const SDL_PixelFormat * format, Uint8 r, Uint8 g, Uint8 b, Uint8 a); /** - * \brief Get the RGB components from a pixel of the specified format. + * Get RGB values from a pixel in the specified format. * - * \sa SDL_GetRGBA + * This function uses the entire 8-bit [0..255] range when converting color + * components from pixel formats with less than 8-bits per RGB component + * (e.g., a completely white pixel in 16-bit RGB565 format would return [0xff, + * 0xff, 0xff] not [0xf8, 0xfc, 0xf8]). + * + * \param pixel a pixel value + * \param format an SDL_PixelFormat structure describing the format of the + * pixel + * \param r a pointer filled in with the red component + * \param g a pointer filled in with the green component + * \param b a pointer filled in with the blue component + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetRGBA + * \sa SDL_MapRGB + * \sa SDL_MapRGBA */ extern DECLSPEC void SDLCALL SDL_GetRGB(Uint32 pixel, const SDL_PixelFormat * format, Uint8 * r, Uint8 * g, Uint8 * b); /** - * \brief Get the RGBA components from a pixel of the specified format. + * Get RGBA values from a pixel in the specified format. * - * \sa SDL_GetRGB + * This function uses the entire 8-bit [0..255] range when converting color + * components from pixel formats with less than 8-bits per RGB component + * (e.g., a completely white pixel in 16-bit RGB565 format would return [0xff, + * 0xff, 0xff] not [0xf8, 0xfc, 0xf8]). + * + * If the surface has no alpha component, the alpha will be returned as 0xff + * (100% opaque). + * + * \param pixel a pixel value + * \param format an SDL_PixelFormat structure describing the format of the + * pixel + * \param r a pointer filled in with the red component + * \param g a pointer filled in with the green component + * \param b a pointer filled in with the blue component + * \param a a pointer filled in with the alpha component + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetRGB + * \sa SDL_MapRGB + * \sa SDL_MapRGBA */ extern DECLSPEC void SDLCALL SDL_GetRGBA(Uint32 pixel, const SDL_PixelFormat * format, @@ -454,7 +621,14 @@ extern DECLSPEC void SDLCALL SDL_GetRGBA(Uint32 pixel, Uint8 * a); /** - * \brief Calculate a 256 entry gamma ramp for a gamma value. + * Calculate a 256 entry gamma ramp for a gamma value. + * + * \param gamma a gamma value where 0.0 is black and 1.0 is identity + * \param ramp an array of 256 values filled in with the gamma ramp + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetWindowGammaRamp */ extern DECLSPEC void SDLCALL SDL_CalculateGammaRamp(float gamma, Uint16 * ramp); diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_platform.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_platform.h index c2cbc6b4e..79b8b6f45 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_platform.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_platform.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -70,6 +70,27 @@ /* lets us know what version of Mac OS X we're compiling on */ #include "AvailabilityMacros.h" #include "TargetConditionals.h" + +/* Fix building with older SDKs that don't define these + See this for more information: + https://stackoverflow.com/questions/12132933/preprocessor-macro-for-os-x-targets +*/ +#ifndef TARGET_OS_MACCATALYST +#define TARGET_OS_MACCATALYST 0 +#endif +#ifndef TARGET_OS_IOS +#define TARGET_OS_IOS 0 +#endif +#ifndef TARGET_OS_IPHONE +#define TARGET_OS_IPHONE 0 +#endif +#ifndef TARGET_OS_TV +#define TARGET_OS_TV 0 +#endif +#ifndef TARGET_OS_SIMULATOR +#define TARGET_OS_SIMULATOR 0 +#endif + #if TARGET_OS_TV #undef __TVOS__ #define __TVOS__ 1 @@ -175,6 +196,9 @@ #define __SDL_NOGETPROCADDR__ #endif +#if defined(__vita__) +#define __VITA__ 1 +#endif #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ @@ -183,7 +207,20 @@ extern "C" { #endif /** - * \brief Gets the name of the platform. + * Get the name of the platform. + * + * Here are the names returned for some (but not all) supported platforms: + * + * - "Windows" + * - "Mac OS X" + * - "Linux" + * - "iOS" + * - "Android" + * + * \returns the name of the platform. If the correct platform name is not + * available, returns a string beginning with the text "Unknown". + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC const char * SDLCALL SDL_GetPlatform (void); diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_power.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_power.h index 4831cb77e..ecb3f4b02 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_power.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_power.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -37,7 +37,7 @@ extern "C" { #endif /** - * \brief The basic state for the system's power supply. + * The basic state for the system's power supply. */ typedef enum { @@ -50,17 +50,30 @@ typedef enum /** - * \brief Get the current power supply details. + * Get the current power supply details. * - * \param secs Seconds of battery life left. You can pass a NULL here if - * you don't care. Will return -1 if we can't determine a - * value, or we're not running on a battery. + * You should never take a battery status as absolute truth. Batteries + * (especially failing batteries) are delicate hardware, and the values + * reported here are best estimates based on what that hardware reports. It's + * not uncommon for older batteries to lose stored power much faster than it + * reports, or completely drain when reporting it has 20 percent left, etc. * - * \param pct Percentage of battery life left, between 0 and 100. You can - * pass a NULL here if you don't care. Will return -1 if we - * can't determine a value, or we're not running on a battery. + * Battery status can change at any time; if you are concerned with power + * state, you should call this function frequently, and perhaps ignore changes + * until they seem to be stable for a few seconds. * - * \return The state of the battery (if any). + * It's possible a platform can only report battery percentage or time left + * but not both. + * + * \param secs seconds of battery life left, you can pass a NULL here if you + * don't care, will return -1 if we can't determine a value, or + * we're not running on a battery + * \param pct percentage of battery life left, between 0 and 100, you can pass + * a NULL here if you don't care, will return -1 if we can't + * determine a value, or we're not running on a battery + * \returns an SDL_PowerState enum representing the current battery state. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC SDL_PowerState SDLCALL SDL_GetPowerInfo(int *secs, int *pct); diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_quit.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_quit.h index c979983cb..4090f7f19 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_quit.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_quit.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_rect.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_rect.h index 71a411517..6616ba6a2 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_rect.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_rect.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -40,10 +40,10 @@ extern "C" { #endif /** - * \brief The structure that defines a point (integer) + * The structure that defines a point (integer) * - * \sa SDL_EnclosePoints - * \sa SDL_PointInRect + * \sa SDL_EnclosePoints + * \sa SDL_PointInRect */ typedef struct SDL_Point { @@ -52,10 +52,10 @@ typedef struct SDL_Point } SDL_Point; /** - * \brief The structure that defines a point (floating point) + * The structure that defines a point (floating point) * - * \sa SDL_EnclosePoints - * \sa SDL_PointInRect + * \sa SDL_EnclosePoints + * \sa SDL_PointInRect */ typedef struct SDL_FPoint { @@ -65,14 +65,14 @@ typedef struct SDL_FPoint /** - * \brief A rectangle, with the origin at the upper left (integer). + * A rectangle, with the origin at the upper left (integer). * - * \sa SDL_RectEmpty - * \sa SDL_RectEquals - * \sa SDL_HasIntersection - * \sa SDL_IntersectRect - * \sa SDL_UnionRect - * \sa SDL_EnclosePoints + * \sa SDL_RectEmpty + * \sa SDL_RectEquals + * \sa SDL_HasIntersection + * \sa SDL_IntersectRect + * \sa SDL_UnionRect + * \sa SDL_EnclosePoints */ typedef struct SDL_Rect { @@ -82,7 +82,7 @@ typedef struct SDL_Rect /** - * \brief A rectangle, with the origin at the upper left (floating point). + * A rectangle, with the origin at the upper left (floating point). */ typedef struct SDL_FRect { @@ -94,7 +94,7 @@ typedef struct SDL_FRect /** - * \brief Returns true if point resides inside a rectangle. + * Returns true if point resides inside a rectangle. */ SDL_FORCE_INLINE SDL_bool SDL_PointInRect(const SDL_Point *p, const SDL_Rect *r) { @@ -103,7 +103,7 @@ SDL_FORCE_INLINE SDL_bool SDL_PointInRect(const SDL_Point *p, const SDL_Rect *r) } /** - * \brief Returns true if the rectangle has no area. + * Returns true if the rectangle has no area. */ SDL_FORCE_INLINE SDL_bool SDL_RectEmpty(const SDL_Rect *r) { @@ -111,7 +111,7 @@ SDL_FORCE_INLINE SDL_bool SDL_RectEmpty(const SDL_Rect *r) } /** - * \brief Returns true if the two rectangles are equal. + * Returns true if the two rectangles are equal. */ SDL_FORCE_INLINE SDL_bool SDL_RectEquals(const SDL_Rect *a, const SDL_Rect *b) { @@ -120,33 +120,70 @@ SDL_FORCE_INLINE SDL_bool SDL_RectEquals(const SDL_Rect *a, const SDL_Rect *b) } /** - * \brief Determine whether two rectangles intersect. + * Determine whether two rectangles intersect. * - * \return SDL_TRUE if there is an intersection, SDL_FALSE otherwise. + * If either pointer is NULL the function will return SDL_FALSE. + * + * \param A an SDL_Rect structure representing the first rectangle + * \param B an SDL_Rect structure representing the second rectangle + * \returns SDL_TRUE if there is an intersection, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_IntersectRect */ extern DECLSPEC SDL_bool SDLCALL SDL_HasIntersection(const SDL_Rect * A, const SDL_Rect * B); /** - * \brief Calculate the intersection of two rectangles. + * Calculate the intersection of two rectangles. * - * \return SDL_TRUE if there is an intersection, SDL_FALSE otherwise. + * If `result` is NULL then this function will return SDL_FALSE. + * + * \param A an SDL_Rect structure representing the first rectangle + * \param B an SDL_Rect structure representing the second rectangle + * \param result an SDL_Rect structure filled in with the intersection of + * rectangles `A` and `B` + * \returns SDL_TRUE if there is an intersection, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HasIntersection */ extern DECLSPEC SDL_bool SDLCALL SDL_IntersectRect(const SDL_Rect * A, const SDL_Rect * B, SDL_Rect * result); /** - * \brief Calculate the union of two rectangles. + * Calculate the union of two rectangles. + * + * \param A an SDL_Rect structure representing the first rectangle + * \param B an SDL_Rect structure representing the second rectangle + * \param result an SDL_Rect structure filled in with the union of rectangles + * `A` and `B` + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC void SDLCALL SDL_UnionRect(const SDL_Rect * A, const SDL_Rect * B, SDL_Rect * result); /** - * \brief Calculate a minimal rectangle enclosing a set of points + * Calculate a minimal rectangle enclosing a set of points. * - * \return SDL_TRUE if any points were within the clipping rect + * If `clip` is not NULL then only points inside of the clipping rectangle are + * considered. + * + * \param points an array of SDL_Point structures representing points to be + * enclosed + * \param count the number of structures in the `points` array + * \param clip an SDL_Rect used for clipping or NULL to enclose all points + * \param result an SDL_Rect structure filled in with the minimal enclosing + * rectangle + * \returns SDL_TRUE if any points were enclosed or SDL_FALSE if all the + * points were outside of the clipping rectangle. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC SDL_bool SDLCALL SDL_EnclosePoints(const SDL_Point * points, int count, @@ -154,9 +191,22 @@ extern DECLSPEC SDL_bool SDLCALL SDL_EnclosePoints(const SDL_Point * points, SDL_Rect * result); /** - * \brief Calculate the intersection of a rectangle and line segment. + * Calculate the intersection of a rectangle and line segment. * - * \return SDL_TRUE if there is an intersection, SDL_FALSE otherwise. + * This function is used to clip a line segment to a rectangle. A line segment + * contained entirely within the rectangle or that does not intersect will + * remain unchanged. A line segment that crosses the rectangle at either or + * both ends will be clipped to the boundary of the rectangle and the new + * coordinates saved in `X1`, `Y1`, `X2`, and/or `Y2` as necessary. + * + * \param rect an SDL_Rect structure representing the rectangle to intersect + * \param X1 a pointer to the starting X-coordinate of the line + * \param Y1 a pointer to the starting Y-coordinate of the line + * \param X2 a pointer to the ending X-coordinate of the line + * \param Y2 a pointer to the ending Y-coordinate of the line + * \returns SDL_TRUE if there is an intersection, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC SDL_bool SDLCALL SDL_IntersectRectAndLine(const SDL_Rect * rect, int *X1, diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_render.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_render.h index 096b4a577..a7e4908a6 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_render.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_render.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -59,7 +59,7 @@ extern "C" { #endif /** - * \brief Flags used when creating a rendering context + * Flags used when creating a rendering context */ typedef enum { @@ -73,7 +73,7 @@ typedef enum } SDL_RendererFlags; /** - * \brief Information on the capabilities of a render driver or context. + * Information on the capabilities of a render driver or context. */ typedef struct SDL_RendererInfo { @@ -86,7 +86,27 @@ typedef struct SDL_RendererInfo } SDL_RendererInfo; /** - * \brief The access pattern allowed for a texture. + * Vertex structure + */ +typedef struct SDL_Vertex +{ + SDL_FPoint position; /**< Vertex position, in SDL_Renderer coordinates */ + SDL_Color color; /**< Vertex color */ + SDL_FPoint tex_coord; /**< Normalized texture coordinates, if needed */ +} SDL_Vertex; + +/** + * The scaling mode for a texture. + */ +typedef enum +{ + SDL_ScaleModeNearest, /**< nearest pixel sampling */ + SDL_ScaleModeLinear, /**< linear filtering */ + SDL_ScaleModeBest /**< anisotropic filtering */ +} SDL_ScaleMode; + +/** + * The access pattern allowed for a texture. */ typedef enum { @@ -96,7 +116,7 @@ typedef enum } SDL_TextureAccess; /** - * \brief The texture channel modulation used in SDL_RenderCopy(). + * The texture channel modulation used in SDL_RenderCopy(). */ typedef enum { @@ -106,7 +126,7 @@ typedef enum } SDL_TextureModulate; /** - * \brief Flip constants for SDL_RenderCopyEx + * Flip constants for SDL_RenderCopyEx */ typedef enum { @@ -116,58 +136,71 @@ typedef enum } SDL_RendererFlip; /** - * \brief A structure representing rendering state + * A structure representing rendering state */ struct SDL_Renderer; typedef struct SDL_Renderer SDL_Renderer; /** - * \brief An efficient driver-specific representation of pixel data + * An efficient driver-specific representation of pixel data */ struct SDL_Texture; typedef struct SDL_Texture SDL_Texture; - /* Function prototypes */ /** - * \brief Get the number of 2D rendering drivers available for the current - * display. + * Get the number of 2D rendering drivers available for the current display. * - * A render driver is a set of code that handles rendering and texture - * management on a particular display. Normally there is only one, but - * some drivers may have several available with different capabilities. + * A render driver is a set of code that handles rendering and texture + * management on a particular display. Normally there is only one, but some + * drivers may have several available with different capabilities. * - * \sa SDL_GetRenderDriverInfo() - * \sa SDL_CreateRenderer() + * There may be none if SDL was compiled without render support. + * + * \returns a number >= 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateRenderer + * \sa SDL_GetRenderDriverInfo */ extern DECLSPEC int SDLCALL SDL_GetNumRenderDrivers(void); /** - * \brief Get information about a specific 2D rendering driver for the current - * display. + * Get info about a specific 2D rendering driver for the current display. * - * \param index The index of the driver to query information about. - * \param info A pointer to an SDL_RendererInfo struct to be filled with - * information on the rendering driver. + * \param index the index of the driver to query information about + * \param info an SDL_RendererInfo structure to be filled with information on + * the rendering driver + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, -1 if the index was out of range. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_CreateRenderer() + * \sa SDL_CreateRenderer + * \sa SDL_GetNumRenderDrivers */ extern DECLSPEC int SDLCALL SDL_GetRenderDriverInfo(int index, SDL_RendererInfo * info); /** - * \brief Create a window and default renderer + * Create a window and default renderer. * - * \param width The width of the window - * \param height The height of the window - * \param window_flags The flags used to create the window - * \param window A pointer filled with the window, or NULL on error - * \param renderer A pointer filled with the renderer, or NULL on error + * \param width the width of the window + * \param height the height of the window + * \param window_flags the flags used to create the window (see + * SDL_CreateWindow()) + * \param window a pointer filled with the window, or NULL on error + * \param renderer a pointer filled with the renderer, or NULL on error + * \returns 0 on success, or -1 on error; call SDL_GetError() for more + * information. * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateRenderer + * \sa SDL_CreateWindow */ extern DECLSPEC int SDLCALL SDL_CreateWindowAndRenderer( int width, int height, Uint32 window_flags, @@ -175,69 +208,116 @@ extern DECLSPEC int SDLCALL SDL_CreateWindowAndRenderer( /** - * \brief Create a 2D rendering context for a window. + * Create a 2D rendering context for a window. * - * \param window The window where rendering is displayed. - * \param index The index of the rendering driver to initialize, or -1 to - * initialize the first one supporting the requested flags. - * \param flags ::SDL_RendererFlags. + * \param window the window where rendering is displayed + * \param index the index of the rendering driver to initialize, or -1 to + * initialize the first one supporting the requested flags + * \param flags 0, or one or more SDL_RendererFlags OR'd together + * \returns a valid rendering context or NULL if there was an error; call + * SDL_GetError() for more information. * - * \return A valid rendering context or NULL if there was an error. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_CreateSoftwareRenderer() - * \sa SDL_GetRendererInfo() - * \sa SDL_DestroyRenderer() + * \sa SDL_CreateSoftwareRenderer + * \sa SDL_DestroyRenderer + * \sa SDL_GetNumRenderDrivers + * \sa SDL_GetRendererInfo */ extern DECLSPEC SDL_Renderer * SDLCALL SDL_CreateRenderer(SDL_Window * window, int index, Uint32 flags); /** - * \brief Create a 2D software rendering context for a surface. + * Create a 2D software rendering context for a surface. * - * \param surface The surface where rendering is done. + * Two other API which can be used to create SDL_Renderer: + * SDL_CreateRenderer() and SDL_CreateWindowAndRenderer(). These can _also_ + * create a software renderer, but they are intended to be used with an + * SDL_Window as the final destination and not an SDL_Surface. * - * \return A valid rendering context or NULL if there was an error. + * \param surface the SDL_Surface structure representing the surface where + * rendering is done + * \returns a valid rendering context or NULL if there was an error; call + * SDL_GetError() for more information. * - * \sa SDL_CreateRenderer() - * \sa SDL_DestroyRenderer() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateRenderer + * \sa SDL_CreateWindowRenderer + * \sa SDL_DestroyRenderer */ extern DECLSPEC SDL_Renderer * SDLCALL SDL_CreateSoftwareRenderer(SDL_Surface * surface); /** - * \brief Get the renderer associated with a window. + * Get the renderer associated with a window. + * + * \param window the window to query + * \returns the rendering context on success or NULL on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateRenderer */ extern DECLSPEC SDL_Renderer * SDLCALL SDL_GetRenderer(SDL_Window * window); /** - * \brief Get information about a rendering context. + * Get information about a rendering context. + * + * \param renderer the rendering context + * \param info an SDL_RendererInfo structure filled with information about the + * current renderer + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateRenderer */ extern DECLSPEC int SDLCALL SDL_GetRendererInfo(SDL_Renderer * renderer, SDL_RendererInfo * info); /** - * \brief Get the output size in pixels of a rendering context. + * Get the output size in pixels of a rendering context. + * + * Due to high-dpi displays, you might end up with a rendering context that + * has more pixels than the window that contains it, so use this instead of + * SDL_GetWindowSize() to decide how much drawing area you have. + * + * \param renderer the rendering context + * \param w an int filled with the width + * \param h an int filled with the height + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetRenderer */ extern DECLSPEC int SDLCALL SDL_GetRendererOutputSize(SDL_Renderer * renderer, int *w, int *h); /** - * \brief Create a texture for a rendering context. + * Create a texture for a rendering context. * - * \param renderer The renderer. - * \param format The format of the texture. - * \param access One of the enumerated values in ::SDL_TextureAccess. - * \param w The width of the texture in pixels. - * \param h The height of the texture in pixels. + * You can set the texture scaling method by setting + * `SDL_HINT_RENDER_SCALE_QUALITY` before creating the texture. * - * \return The created texture is returned, or NULL if no rendering context was - * active, the format was unsupported, or the width or height were out - * of range. + * \param renderer the rendering context + * \param format one of the enumerated values in SDL_PixelFormatEnum + * \param access one of the enumerated values in SDL_TextureAccess + * \param w the width of the texture in pixels + * \param h the height of the texture in pixels + * \returns a pointer to the created texture or NULL if no rendering context + * was active, the format was unsupported, or the width or height + * were out of range; call SDL_GetError() for more information. * - * \note The contents of the texture are not defined at creation. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_QueryTexture() - * \sa SDL_UpdateTexture() - * \sa SDL_DestroyTexture() + * \sa SDL_CreateTextureFromSurface + * \sa SDL_DestroyTexture + * \sa SDL_QueryTexture + * \sa SDL_UpdateTexture */ extern DECLSPEC SDL_Texture * SDLCALL SDL_CreateTexture(SDL_Renderer * renderer, Uint32 format, @@ -245,165 +325,290 @@ extern DECLSPEC SDL_Texture * SDLCALL SDL_CreateTexture(SDL_Renderer * renderer, int h); /** - * \brief Create a texture from an existing surface. + * Create a texture from an existing surface. * - * \param renderer The renderer. - * \param surface The surface containing pixel data used to fill the texture. + * The surface is not modified or freed by this function. * - * \return The created texture is returned, or NULL on error. + * The SDL_TextureAccess hint for the created texture is + * `SDL_TEXTUREACCESS_STATIC`. * - * \note The surface is not modified or freed by this function. + * The pixel format of the created texture may be different from the pixel + * format of the surface. Use SDL_QueryTexture() to query the pixel format of + * the texture. * - * \sa SDL_QueryTexture() - * \sa SDL_DestroyTexture() + * \param renderer the rendering context + * \param surface the SDL_Surface structure containing pixel data used to fill + * the texture + * \returns the created texture or NULL on failure; call SDL_GetError() for + * more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateTexture + * \sa SDL_DestroyTexture + * \sa SDL_QueryTexture */ extern DECLSPEC SDL_Texture * SDLCALL SDL_CreateTextureFromSurface(SDL_Renderer * renderer, SDL_Surface * surface); /** - * \brief Query the attributes of a texture + * Query the attributes of a texture. * - * \param texture A texture to be queried. - * \param format A pointer filled in with the raw format of the texture. The - * actual format may differ, but pixel transfers will use this - * format. - * \param access A pointer filled in with the actual access to the texture. - * \param w A pointer filled in with the width of the texture in pixels. - * \param h A pointer filled in with the height of the texture in pixels. + * \param texture the texture to query + * \param format a pointer filled in with the raw format of the texture; the + * actual format may differ, but pixel transfers will use this + * format (one of the SDL_PixelFormatEnum values) + * \param access a pointer filled in with the actual access to the texture + * (one of the SDL_TextureAccess values) + * \param w a pointer filled in with the width of the texture in pixels + * \param h a pointer filled in with the height of the texture in pixels + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 if the texture is not valid. + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateTexture */ extern DECLSPEC int SDLCALL SDL_QueryTexture(SDL_Texture * texture, Uint32 * format, int *access, int *w, int *h); /** - * \brief Set an additional color value used in render copy operations. + * Set an additional color value multiplied into render copy operations. * - * \param texture The texture to update. - * \param r The red color value multiplied into copy operations. - * \param g The green color value multiplied into copy operations. - * \param b The blue color value multiplied into copy operations. + * When this texture is rendered, during the copy operation each source color + * channel is modulated by the appropriate color value according to the + * following formula: * - * \return 0 on success, or -1 if the texture is not valid or color modulation - * is not supported. + * `srcC = srcC * (color / 255)` * - * \sa SDL_GetTextureColorMod() + * Color modulation is not always supported by the renderer; it will return -1 + * if color modulation is not supported. + * + * \param texture the texture to update + * \param r the red color value multiplied into copy operations + * \param g the green color value multiplied into copy operations + * \param b the blue color value multiplied into copy operations + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetTextureColorMod + * \sa SDL_SetTextureAlphaMod */ extern DECLSPEC int SDLCALL SDL_SetTextureColorMod(SDL_Texture * texture, Uint8 r, Uint8 g, Uint8 b); /** - * \brief Get the additional color value used in render copy operations. + * Get the additional color value multiplied into render copy operations. * - * \param texture The texture to query. - * \param r A pointer filled in with the current red color value. - * \param g A pointer filled in with the current green color value. - * \param b A pointer filled in with the current blue color value. + * \param texture the texture to query + * \param r a pointer filled in with the current red color value + * \param g a pointer filled in with the current green color value + * \param b a pointer filled in with the current blue color value + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 if the texture is not valid. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_SetTextureColorMod() + * \sa SDL_GetTextureAlphaMod + * \sa SDL_SetTextureColorMod */ extern DECLSPEC int SDLCALL SDL_GetTextureColorMod(SDL_Texture * texture, Uint8 * r, Uint8 * g, Uint8 * b); /** - * \brief Set an additional alpha value used in render copy operations. + * Set an additional alpha value multiplied into render copy operations. * - * \param texture The texture to update. - * \param alpha The alpha value multiplied into copy operations. + * When this texture is rendered, during the copy operation the source alpha + * value is modulated by this alpha value according to the following formula: * - * \return 0 on success, or -1 if the texture is not valid or alpha modulation - * is not supported. + * `srcA = srcA * (alpha / 255)` * - * \sa SDL_GetTextureAlphaMod() + * Alpha modulation is not always supported by the renderer; it will return -1 + * if alpha modulation is not supported. + * + * \param texture the texture to update + * \param alpha the source alpha value multiplied into copy operations + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetTextureAlphaMod + * \sa SDL_SetTextureColorMod */ extern DECLSPEC int SDLCALL SDL_SetTextureAlphaMod(SDL_Texture * texture, Uint8 alpha); /** - * \brief Get the additional alpha value used in render copy operations. + * Get the additional alpha value multiplied into render copy operations. * - * \param texture The texture to query. - * \param alpha A pointer filled in with the current alpha value. + * \param texture the texture to query + * \param alpha a pointer filled in with the current alpha value + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 if the texture is not valid. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_SetTextureAlphaMod() + * \sa SDL_GetTextureColorMod + * \sa SDL_SetTextureAlphaMod */ extern DECLSPEC int SDLCALL SDL_GetTextureAlphaMod(SDL_Texture * texture, Uint8 * alpha); /** - * \brief Set the blend mode used for texture copy operations. + * Set the blend mode for a texture, used by SDL_RenderCopy(). * - * \param texture The texture to update. - * \param blendMode ::SDL_BlendMode to use for texture blending. + * If the blend mode is not supported, the closest supported mode is chosen + * and this function returns -1. * - * \return 0 on success, or -1 if the texture is not valid or the blend mode is - * not supported. + * \param texture the texture to update + * \param blendMode the SDL_BlendMode to use for texture blending + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \note If the blend mode is not supported, the closest supported mode is - * chosen. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_GetTextureBlendMode() + * \sa SDL_GetTextureBlendMode + * \sa SDL_RenderCopy */ extern DECLSPEC int SDLCALL SDL_SetTextureBlendMode(SDL_Texture * texture, SDL_BlendMode blendMode); /** - * \brief Get the blend mode used for texture copy operations. + * Get the blend mode used for texture copy operations. * - * \param texture The texture to query. - * \param blendMode A pointer filled in with the current blend mode. + * \param texture the texture to query + * \param blendMode a pointer filled in with the current SDL_BlendMode + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 if the texture is not valid. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_SetTextureBlendMode() + * \sa SDL_SetTextureBlendMode */ extern DECLSPEC int SDLCALL SDL_GetTextureBlendMode(SDL_Texture * texture, SDL_BlendMode *blendMode); /** - * \brief Update the given texture rectangle with new pixel data. + * Set the scale mode used for texture scale operations. * - * \param texture The texture to update - * \param rect A pointer to the rectangle of pixels to update, or NULL to - * update the entire texture. - * \param pixels The raw pixel data in the format of the texture. - * \param pitch The number of bytes in a row of pixel data, including padding between lines. + * If the scale mode is not supported, the closest supported mode is chosen. * - * The pixel data must be in the format of the texture. The pixel format can be - * queried with SDL_QueryTexture. + * \param texture The texture to update. + * \param scaleMode the SDL_ScaleMode to use for texture scaling. + * \returns 0 on success, or -1 if the texture is not valid. * - * \return 0 on success, or -1 if the texture is not valid. + * \since This function is available since SDL 2.0.12. * - * \note This is a fairly slow function. + * \sa SDL_GetTextureScaleMode + */ +extern DECLSPEC int SDLCALL SDL_SetTextureScaleMode(SDL_Texture * texture, + SDL_ScaleMode scaleMode); + +/** + * Get the scale mode used for texture scale operations. + * + * \param texture the texture to query. + * \param scaleMode a pointer filled in with the current scale mode. + * \return 0 on success, or -1 if the texture is not valid. + * + * \since This function is available since SDL 2.0.12. + * + * \sa SDL_SetTextureScaleMode + */ +extern DECLSPEC int SDLCALL SDL_GetTextureScaleMode(SDL_Texture * texture, + SDL_ScaleMode *scaleMode); + +/** + * Associate a user-specified pointer with a texture. + * + * \param texture the texture to update. + * \param userdata the pointer to associate with the texture. + * \returns 0 on success, or -1 if the texture is not valid. + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_GetTextureUserData + */ +extern DECLSPEC int SDLCALL SDL_SetTextureUserData(SDL_Texture * texture, + void *userdata); + +/** + * Get the user-specified pointer associated with a texture + * + * \param texture the texture to query. + * \return the pointer associated with the texture, or NULL if the texture is + * not valid. + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_SetTextureUserData + */ +extern DECLSPEC void * SDLCALL SDL_GetTextureUserData(SDL_Texture * texture); + +/** + * Update the given texture rectangle with new pixel data. + * + * The pixel data must be in the pixel format of the texture. Use + * SDL_QueryTexture() to query the pixel format of the texture. + * + * This is a fairly slow function, intended for use with static textures that + * do not change often. + * + * If the texture is intended to be updated often, it is preferred to create + * the texture as streaming and use the locking functions referenced below. + * While this function will work with streaming textures, for optimization + * reasons you may not get the pixels back if you lock the texture afterward. + * + * \param texture the texture to update + * \param rect an SDL_Rect structure representing the area to update, or NULL + * to update the entire texture + * \param pixels the raw pixel data in the format of the texture + * \param pitch the number of bytes in a row of pixel data, including padding + * between lines + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateTexture + * \sa SDL_LockTexture + * \sa SDL_UnlockTexture */ extern DECLSPEC int SDLCALL SDL_UpdateTexture(SDL_Texture * texture, const SDL_Rect * rect, const void *pixels, int pitch); /** - * \brief Update a rectangle within a planar YV12 or IYUV texture with new pixel data. + * Update a rectangle within a planar YV12 or IYUV texture with new pixel + * data. * - * \param texture The texture to update - * \param rect A pointer to the rectangle of pixels to update, or NULL to - * update the entire texture. - * \param Yplane The raw pixel data for the Y plane. - * \param Ypitch The number of bytes between rows of pixel data for the Y plane. - * \param Uplane The raw pixel data for the U plane. - * \param Upitch The number of bytes between rows of pixel data for the U plane. - * \param Vplane The raw pixel data for the V plane. - * \param Vpitch The number of bytes between rows of pixel data for the V plane. + * You can use SDL_UpdateTexture() as long as your pixel data is a contiguous + * block of Y and U/V planes in the proper order, but this function is + * available if your pixel data is not contiguous. * - * \return 0 on success, or -1 if the texture is not valid. + * \param texture the texture to update + * \param rect a pointer to the rectangle of pixels to update, or NULL to + * update the entire texture + * \param Yplane the raw pixel data for the Y plane + * \param Ypitch the number of bytes between rows of pixel data for the Y + * plane + * \param Uplane the raw pixel data for the U plane + * \param Upitch the number of bytes between rows of pixel data for the U + * plane + * \param Vplane the raw pixel data for the V plane + * \param Vpitch the number of bytes between rows of pixel data for the V + * plane + * \returns 0 on success or -1 if the texture is not valid; call + * SDL_GetError() for more information. * - * \note You can use SDL_UpdateTexture() as long as your pixel data is - * a contiguous block of Y and U/V planes in the proper order, but - * this function is available if your pixel data is not contiguous. + * \since This function is available since SDL 2.0.1. + * + * \sa SDL_UpdateTexture */ extern DECLSPEC int SDLCALL SDL_UpdateYUVTexture(SDL_Texture * texture, const SDL_Rect * rect, @@ -412,400 +617,771 @@ extern DECLSPEC int SDLCALL SDL_UpdateYUVTexture(SDL_Texture * texture, const Uint8 *Vplane, int Vpitch); /** - * \brief Lock a portion of the texture for write-only pixel access. + * Update a rectangle within a planar NV12 or NV21 texture with new pixels. * - * \param texture The texture to lock for access, which was created with - * ::SDL_TEXTUREACCESS_STREAMING. - * \param rect A pointer to the rectangle to lock for access. If the rect - * is NULL, the entire texture will be locked. - * \param pixels This is filled in with a pointer to the locked pixels, - * appropriately offset by the locked area. - * \param pitch This is filled in with the pitch of the locked pixels. + * You can use SDL_UpdateTexture() as long as your pixel data is a contiguous + * block of NV12/21 planes in the proper order, but this function is available + * if your pixel data is not contiguous. * - * \return 0 on success, or -1 if the texture is not valid or was not created with ::SDL_TEXTUREACCESS_STREAMING. + * \param texture the texture to update + * \param rect a pointer to the rectangle of pixels to update, or NULL to + * update the entire texture. + * \param Yplane the raw pixel data for the Y plane. + * \param Ypitch the number of bytes between rows of pixel data for the Y + * plane. + * \param UVplane the raw pixel data for the UV plane. + * \param UVpitch the number of bytes between rows of pixel data for the UV + * plane. + * \return 0 on success, or -1 if the texture is not valid. * - * \sa SDL_UnlockTexture() + * \since This function is available since SDL 2.0.16. + */ +extern DECLSPEC int SDLCALL SDL_UpdateNVTexture(SDL_Texture * texture, + const SDL_Rect * rect, + const Uint8 *Yplane, int Ypitch, + const Uint8 *UVplane, int UVpitch); + +/** + * Lock a portion of the texture for **write-only** pixel access. + * + * As an optimization, the pixels made available for editing don't necessarily + * contain the old texture data. This is a write-only operation, and if you + * need to keep a copy of the texture data you should do that at the + * application level. + * + * You must use SDL_UnlockTexture() to unlock the pixels and apply any + * changes. + * + * \param texture the texture to lock for access, which was created with + * `SDL_TEXTUREACCESS_STREAMING` + * \param rect an SDL_Rect structure representing the area to lock for access; + * NULL to lock the entire texture + * \param pixels this is filled in with a pointer to the locked pixels, + * appropriately offset by the locked area + * \param pitch this is filled in with the pitch of the locked pixels; the + * pitch is the length of one row in bytes + * \returns 0 on success or a negative error code if the texture is not valid + * or was not created with `SDL_TEXTUREACCESS_STREAMING`; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_UnlockTexture */ extern DECLSPEC int SDLCALL SDL_LockTexture(SDL_Texture * texture, const SDL_Rect * rect, void **pixels, int *pitch); /** - * \brief Unlock a texture, uploading the changes to video memory, if needed. + * Lock a portion of the texture for **write-only** pixel access, and expose + * it as a SDL surface. * - * \sa SDL_LockTexture() + * Besides providing an SDL_Surface instead of raw pixel data, this function + * operates like SDL_LockTexture. + * + * As an optimization, the pixels made available for editing don't necessarily + * contain the old texture data. This is a write-only operation, and if you + * need to keep a copy of the texture data you should do that at the + * application level. + * + * You must use SDL_UnlockTexture() to unlock the pixels and apply any + * changes. + * + * The returned surface is freed internally after calling SDL_UnlockTexture() + * or SDL_DestroyTexture(). The caller should not free it. + * + * \param texture the texture to lock for access, which was created with + * `SDL_TEXTUREACCESS_STREAMING` + * \param rect a pointer to the rectangle to lock for access. If the rect is + * NULL, the entire texture will be locked + * \param surface this is filled in with an SDL surface representing the + * locked area + * \returns 0 on success, or -1 if the texture is not valid or was not created + * with `SDL_TEXTUREACCESS_STREAMING` + * + * \since This function is available since SDL 2.0.12. + * + * \sa SDL_LockTexture + * \sa SDL_UnlockTexture + */ +extern DECLSPEC int SDLCALL SDL_LockTextureToSurface(SDL_Texture *texture, + const SDL_Rect *rect, + SDL_Surface **surface); + +/** + * Unlock a texture, uploading the changes to video memory, if needed. + * + * **Warning**: Please note that SDL_LockTexture() is intended to be + * write-only; it will not guarantee the previous contents of the texture will + * be provided. You must fully initialize any area of a texture that you lock + * before unlocking it, as the pixels might otherwise be uninitialized memory. + * + * Which is to say: locking and immediately unlocking a texture can result in + * corrupted textures, depending on the renderer in use. + * + * \param texture a texture locked by SDL_LockTexture() + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LockTexture */ extern DECLSPEC void SDLCALL SDL_UnlockTexture(SDL_Texture * texture); /** - * \brief Determines whether a window supports the use of render targets + * Determine whether a renderer supports the use of render targets. * - * \param renderer The renderer that will be checked + * \param renderer the renderer that will be checked + * \returns SDL_TRUE if supported or SDL_FALSE if not. * - * \return SDL_TRUE if supported, SDL_FALSE if not. + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetRenderTarget */ extern DECLSPEC SDL_bool SDLCALL SDL_RenderTargetSupported(SDL_Renderer *renderer); /** - * \brief Set a texture as the current rendering target. + * Set a texture as the current rendering target. * - * \param renderer The renderer. - * \param texture The targeted texture, which must be created with the SDL_TEXTUREACCESS_TARGET flag, or NULL for the default render target + * Before using this function, you should check the + * `SDL_RENDERER_TARGETTEXTURE` bit in the flags of SDL_RendererInfo to see if + * render targets are supported. * - * \return 0 on success, or -1 on error + * The default render target is the window for which the renderer was created. + * To stop rendering to a texture and render to the window again, call this + * function with a NULL `texture`. * - * \sa SDL_GetRenderTarget() + * \param renderer the rendering context + * \param texture the targeted texture, which must be created with the + * `SDL_TEXTUREACCESS_TARGET` flag, or NULL to render to the + * window instead of a texture. + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetRenderTarget */ extern DECLSPEC int SDLCALL SDL_SetRenderTarget(SDL_Renderer *renderer, SDL_Texture *texture); /** - * \brief Get the current render target or NULL for the default render target. + * Get the current render target. * - * \return The current render target + * The default render target is the window for which the renderer was created, + * and is reported a NULL here. * - * \sa SDL_SetRenderTarget() + * \param renderer the rendering context + * \returns the current render target or NULL for the default render target. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetRenderTarget */ extern DECLSPEC SDL_Texture * SDLCALL SDL_GetRenderTarget(SDL_Renderer *renderer); /** - * \brief Set device independent resolution for rendering + * Set a device independent resolution for rendering. * - * \param renderer The renderer for which resolution should be set. - * \param w The width of the logical resolution - * \param h The height of the logical resolution + * This function uses the viewport and scaling functionality to allow a fixed + * logical resolution for rendering, regardless of the actual output + * resolution. If the actual output resolution doesn't have the same aspect + * ratio the output rendering will be centered within the output display. * - * This function uses the viewport and scaling functionality to allow a fixed logical - * resolution for rendering, regardless of the actual output resolution. If the actual - * output resolution doesn't have the same aspect ratio the output rendering will be - * centered within the output display. + * If the output display is a window, mouse and touch events in the window + * will be filtered and scaled so they seem to arrive within the logical + * resolution. The SDL_HINT_MOUSE_RELATIVE_SCALING hint controls whether + * relative motion events are also scaled. * - * If the output display is a window, mouse events in the window will be filtered - * and scaled so they seem to arrive within the logical resolution. + * If this function results in scaling or subpixel drawing by the rendering + * backend, it will be handled using the appropriate quality hints. * - * \note If this function results in scaling or subpixel drawing by the - * rendering backend, it will be handled using the appropriate - * quality hints. + * \param renderer the renderer for which resolution should be set + * \param w the width of the logical resolution + * \param h the height of the logical resolution + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_RenderGetLogicalSize() - * \sa SDL_RenderSetScale() - * \sa SDL_RenderSetViewport() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderGetLogicalSize */ extern DECLSPEC int SDLCALL SDL_RenderSetLogicalSize(SDL_Renderer * renderer, int w, int h); /** - * \brief Get device independent resolution for rendering + * Get device independent resolution for rendering. * - * \param renderer The renderer from which resolution should be queried. - * \param w A pointer filled with the width of the logical resolution - * \param h A pointer filled with the height of the logical resolution + * This may return 0 for `w` and `h` if the SDL_Renderer has never had its + * logical size set by SDL_RenderSetLogicalSize() and never had a render + * target set. * - * \sa SDL_RenderSetLogicalSize() + * \param renderer a rendering context + * \param w an int to be filled with the width + * \param h an int to be filled with the height + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderSetLogicalSize */ extern DECLSPEC void SDLCALL SDL_RenderGetLogicalSize(SDL_Renderer * renderer, int *w, int *h); /** - * \brief Set whether to force integer scales for resolution-independent rendering + * Set whether to force integer scales for resolution-independent rendering. * - * \param renderer The renderer for which integer scaling should be set. - * \param enable Enable or disable integer scaling + * This function restricts the logical viewport to integer values - that is, + * when a resolution is between two multiples of a logical size, the viewport + * size is rounded down to the lower multiple. * - * This function restricts the logical viewport to integer values - that is, when - * a resolution is between two multiples of a logical size, the viewport size is - * rounded down to the lower multiple. + * \param renderer the renderer for which integer scaling should be set + * \param enable enable or disable the integer scaling for rendering + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_RenderSetLogicalSize() + * \since This function is available since SDL 2.0.5. + * + * \sa SDL_RenderGetIntegerScale + * \sa SDL_RenderSetLogicalSize */ extern DECLSPEC int SDLCALL SDL_RenderSetIntegerScale(SDL_Renderer * renderer, SDL_bool enable); /** - * \brief Get whether integer scales are forced for resolution-independent rendering + * Get whether integer scales are forced for resolution-independent rendering. * - * \param renderer The renderer from which integer scaling should be queried. + * \param renderer the renderer from which integer scaling should be queried + * \returns SDL_TRUE if integer scales are forced or SDL_FALSE if not and on + * failure; call SDL_GetError() for more information. * - * \sa SDL_RenderSetIntegerScale() + * \since This function is available since SDL 2.0.5. + * + * \sa SDL_RenderSetIntegerScale */ extern DECLSPEC SDL_bool SDLCALL SDL_RenderGetIntegerScale(SDL_Renderer * renderer); /** - * \brief Set the drawing area for rendering on the current target. + * Set the drawing area for rendering on the current target. * - * \param renderer The renderer for which the drawing area should be set. - * \param rect The rectangle representing the drawing area, or NULL to set the viewport to the entire target. + * When the window is resized, the viewport is reset to fill the entire new + * window size. * - * The x,y of the viewport rect represents the origin for rendering. + * \param renderer the rendering context + * \param rect the SDL_Rect structure representing the drawing area, or NULL + * to set the viewport to the entire target + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.0. * - * \note If the window associated with the renderer is resized, the viewport is automatically reset. - * - * \sa SDL_RenderGetViewport() - * \sa SDL_RenderSetLogicalSize() + * \sa SDL_RenderGetViewport */ extern DECLSPEC int SDLCALL SDL_RenderSetViewport(SDL_Renderer * renderer, const SDL_Rect * rect); /** - * \brief Get the drawing area for the current target. + * Get the drawing area for the current target. * - * \sa SDL_RenderSetViewport() + * \param renderer the rendering context + * \param rect an SDL_Rect structure filled in with the current drawing area + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderSetViewport */ extern DECLSPEC void SDLCALL SDL_RenderGetViewport(SDL_Renderer * renderer, SDL_Rect * rect); /** - * \brief Set the clip rectangle for the current target. + * Set the clip rectangle for rendering on the specified target. * - * \param renderer The renderer for which clip rectangle should be set. - * \param rect A pointer to the rectangle to set as the clip rectangle, or - * NULL to disable clipping. + * \param renderer the rendering context for which clip rectangle should be + * set + * \param rect an SDL_Rect structure representing the clip area, relative to + * the viewport, or NULL to disable clipping + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.0. * - * \sa SDL_RenderGetClipRect() + * \sa SDL_RenderGetClipRect + * \sa SDL_RenderIsClipEnabled */ extern DECLSPEC int SDLCALL SDL_RenderSetClipRect(SDL_Renderer * renderer, const SDL_Rect * rect); /** - * \brief Get the clip rectangle for the current target. + * Get the clip rectangle for the current target. * - * \param renderer The renderer from which clip rectangle should be queried. - * \param rect A pointer filled in with the current clip rectangle, or - * an empty rectangle if clipping is disabled. + * \param renderer the rendering context from which clip rectangle should be + * queried + * \param rect an SDL_Rect structure filled in with the current clipping area + * or an empty rectangle if clipping is disabled * - * \sa SDL_RenderSetClipRect() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderIsClipEnabled + * \sa SDL_RenderSetClipRect */ extern DECLSPEC void SDLCALL SDL_RenderGetClipRect(SDL_Renderer * renderer, SDL_Rect * rect); /** - * \brief Get whether clipping is enabled on the given renderer. + * Get whether clipping is enabled on the given renderer. * - * \param renderer The renderer from which clip state should be queried. + * \param renderer the renderer from which clip state should be queried + * \returns SDL_TRUE if clipping is enabled or SDL_FALSE if not; call + * SDL_GetError() for more information. * - * \sa SDL_RenderGetClipRect() + * \since This function is available since SDL 2.0.4. + * + * \sa SDL_RenderGetClipRect + * \sa SDL_RenderSetClipRect */ extern DECLSPEC SDL_bool SDLCALL SDL_RenderIsClipEnabled(SDL_Renderer * renderer); /** - * \brief Set the drawing scale for rendering on the current target. + * Set the drawing scale for rendering on the current target. * - * \param renderer The renderer for which the drawing scale should be set. - * \param scaleX The horizontal scaling factor - * \param scaleY The vertical scaling factor + * The drawing coordinates are scaled by the x/y scaling factors before they + * are used by the renderer. This allows resolution independent drawing with a + * single coordinate system. * - * The drawing coordinates are scaled by the x/y scaling factors - * before they are used by the renderer. This allows resolution - * independent drawing with a single coordinate system. + * If this results in scaling or subpixel drawing by the rendering backend, it + * will be handled using the appropriate quality hints. For best results use + * integer scaling factors. * - * \note If this results in scaling or subpixel drawing by the - * rendering backend, it will be handled using the appropriate - * quality hints. For best results use integer scaling factors. + * \param renderer a rendering context + * \param scaleX the horizontal scaling factor + * \param scaleY the vertical scaling factor + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_RenderGetScale() - * \sa SDL_RenderSetLogicalSize() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderGetScale + * \sa SDL_RenderSetLogicalSize */ extern DECLSPEC int SDLCALL SDL_RenderSetScale(SDL_Renderer * renderer, float scaleX, float scaleY); /** - * \brief Get the drawing scale for the current target. + * Get the drawing scale for the current target. * - * \param renderer The renderer from which drawing scale should be queried. - * \param scaleX A pointer filled in with the horizontal scaling factor - * \param scaleY A pointer filled in with the vertical scaling factor + * \param renderer the renderer from which drawing scale should be queried + * \param scaleX a pointer filled in with the horizontal scaling factor + * \param scaleY a pointer filled in with the vertical scaling factor * - * \sa SDL_RenderSetScale() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderSetScale */ extern DECLSPEC void SDLCALL SDL_RenderGetScale(SDL_Renderer * renderer, float *scaleX, float *scaleY); /** - * \brief Set the color used for drawing operations (Rect, Line and Clear). + * Get logical coordinates of point in renderer when given real coordinates of + * point in window. * - * \param renderer The renderer for which drawing color should be set. - * \param r The red value used to draw on the rendering target. - * \param g The green value used to draw on the rendering target. - * \param b The blue value used to draw on the rendering target. - * \param a The alpha value used to draw on the rendering target, usually - * ::SDL_ALPHA_OPAQUE (255). + * Logical coordinates will differ from real coordinates when render is scaled + * and logical renderer size set * - * \return 0 on success, or -1 on error + * \param renderer the renderer from which the logical coordinates should be + * calcualted + * \param windowX the real X coordinate in the window + * \param windowY the real Y coordinate in the window + * \param logicalX the pointer filled with the logical x coordinate + * \param logicalY the pointer filled with the logical y coordinate + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_RenderGetScale + * \sa SDL_RenderSetScale + * \sa SDL_RenderGetLogicalSize + * \sa SDL_RenderSetLogicalSize + */ +extern DECLSPEC void SDLCALL SDL_RenderWindowToLogical(SDL_Renderer * renderer, + int windowX, int windowY, + float *logicalX, float *logicalY); + + /** + * Get real coordinates of point in window when given logical coordinates of point in renderer. + * Logical coordinates will differ from real coordinates when render is scaled and logical renderer size set + * + * \param renderer the renderer from which the window coordinates should be calculated + * \param logicalX the logical x coordinate + * \param logicalY the logical y coordinate + * \param windowX the pointer filled with the real X coordinate in the window + * \param windowY the pointer filled with the real Y coordinate in the window + + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_RenderGetScale + * \sa SDL_RenderSetScale + * \sa SDL_RenderGetLogicalSize + * \sa SDL_RenderSetLogicalSize + */ +extern DECLSPEC void SDLCALL SDL_RenderLogicalToWindow(SDL_Renderer * renderer, + float logicalX, float logicalY, + int *windowX, int *windowY); + +/** + * Set the color used for drawing operations (Rect, Line and Clear). + * + * Set the color for drawing or filling rectangles, lines, and points, and for + * SDL_RenderClear(). + * + * \param renderer the rendering context + * \param r the red value used to draw on the rendering target + * \param g the green value used to draw on the rendering target + * \param b the blue value used to draw on the rendering target + * \param a the alpha value used to draw on the rendering target; usually + * `SDL_ALPHA_OPAQUE` (255). Use SDL_SetRenderDrawBlendMode to + * specify how the alpha channel is used + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetRenderDrawColor + * \sa SDL_RenderClear + * \sa SDL_RenderDrawLine + * \sa SDL_RenderDrawLines + * \sa SDL_RenderDrawPoint + * \sa SDL_RenderDrawPoints + * \sa SDL_RenderDrawRect + * \sa SDL_RenderDrawRects + * \sa SDL_RenderFillRect + * \sa SDL_RenderFillRects */ extern DECLSPEC int SDLCALL SDL_SetRenderDrawColor(SDL_Renderer * renderer, Uint8 r, Uint8 g, Uint8 b, Uint8 a); /** - * \brief Get the color used for drawing operations (Rect, Line and Clear). + * Get the color used for drawing operations (Rect, Line and Clear). * - * \param renderer The renderer from which drawing color should be queried. - * \param r A pointer to the red value used to draw on the rendering target. - * \param g A pointer to the green value used to draw on the rendering target. - * \param b A pointer to the blue value used to draw on the rendering target. - * \param a A pointer to the alpha value used to draw on the rendering target, - * usually ::SDL_ALPHA_OPAQUE (255). + * \param renderer the rendering context + * \param r a pointer filled in with the red value used to draw on the + * rendering target + * \param g a pointer filled in with the green value used to draw on the + * rendering target + * \param b a pointer filled in with the blue value used to draw on the + * rendering target + * \param a a pointer filled in with the alpha value used to draw on the + * rendering target; usually `SDL_ALPHA_OPAQUE` (255) + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetRenderDrawColor */ extern DECLSPEC int SDLCALL SDL_GetRenderDrawColor(SDL_Renderer * renderer, Uint8 * r, Uint8 * g, Uint8 * b, Uint8 * a); /** - * \brief Set the blend mode used for drawing operations (Fill and Line). + * Set the blend mode used for drawing operations (Fill and Line). * - * \param renderer The renderer for which blend mode should be set. - * \param blendMode ::SDL_BlendMode to use for blending. + * If the blend mode is not supported, the closest supported mode is chosen. * - * \return 0 on success, or -1 on error + * \param renderer the rendering context + * \param blendMode the SDL_BlendMode to use for blending + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \note If the blend mode is not supported, the closest supported mode is - * chosen. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_GetRenderDrawBlendMode() + * \sa SDL_GetRenderDrawBlendMode + * \sa SDL_RenderDrawLine + * \sa SDL_RenderDrawLines + * \sa SDL_RenderDrawPoint + * \sa SDL_RenderDrawPoints + * \sa SDL_RenderDrawRect + * \sa SDL_RenderDrawRects + * \sa SDL_RenderFillRect + * \sa SDL_RenderFillRects */ extern DECLSPEC int SDLCALL SDL_SetRenderDrawBlendMode(SDL_Renderer * renderer, SDL_BlendMode blendMode); /** - * \brief Get the blend mode used for drawing operations. + * Get the blend mode used for drawing operations. * - * \param renderer The renderer from which blend mode should be queried. - * \param blendMode A pointer filled in with the current blend mode. + * \param renderer the rendering context + * \param blendMode a pointer filled in with the current SDL_BlendMode + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.0. * - * \sa SDL_SetRenderDrawBlendMode() + * \sa SDL_SetRenderDrawBlendMode */ extern DECLSPEC int SDLCALL SDL_GetRenderDrawBlendMode(SDL_Renderer * renderer, SDL_BlendMode *blendMode); /** - * \brief Clear the current rendering target with the drawing color + * Clear the current rendering target with the drawing color. * - * This function clears the entire rendering target, ignoring the viewport and - * the clip rectangle. + * This function clears the entire rendering target, ignoring the viewport and + * the clip rectangle. * - * \return 0 on success, or -1 on error + * \param renderer the rendering context + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetRenderDrawColor */ extern DECLSPEC int SDLCALL SDL_RenderClear(SDL_Renderer * renderer); /** - * \brief Draw a point on the current rendering target. + * Draw a point on the current rendering target. * - * \param renderer The renderer which should draw a point. - * \param x The x coordinate of the point. - * \param y The y coordinate of the point. + * SDL_RenderDrawPoint() draws a single point. If you want to draw multiple, + * use SDL_RenderDrawPoints() instead. * - * \return 0 on success, or -1 on error + * \param renderer the rendering context + * \param x the x coordinate of the point + * \param y the y coordinate of the point + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderDrawLine + * \sa SDL_RenderDrawLines + * \sa SDL_RenderDrawPoints + * \sa SDL_RenderDrawRect + * \sa SDL_RenderDrawRects + * \sa SDL_RenderFillRect + * \sa SDL_RenderFillRects + * \sa SDL_RenderPresent + * \sa SDL_SetRenderDrawBlendMode + * \sa SDL_SetRenderDrawColor */ extern DECLSPEC int SDLCALL SDL_RenderDrawPoint(SDL_Renderer * renderer, int x, int y); /** - * \brief Draw multiple points on the current rendering target. + * Draw multiple points on the current rendering target. * - * \param renderer The renderer which should draw multiple points. - * \param points The points to draw - * \param count The number of points to draw + * \param renderer the rendering context + * \param points an array of SDL_Point structures that represent the points to + * draw + * \param count the number of points to draw + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderDrawLine + * \sa SDL_RenderDrawLines + * \sa SDL_RenderDrawPoint + * \sa SDL_RenderDrawRect + * \sa SDL_RenderDrawRects + * \sa SDL_RenderFillRect + * \sa SDL_RenderFillRects + * \sa SDL_RenderPresent + * \sa SDL_SetRenderDrawBlendMode + * \sa SDL_SetRenderDrawColor */ extern DECLSPEC int SDLCALL SDL_RenderDrawPoints(SDL_Renderer * renderer, const SDL_Point * points, int count); /** - * \brief Draw a line on the current rendering target. + * Draw a line on the current rendering target. * - * \param renderer The renderer which should draw a line. - * \param x1 The x coordinate of the start point. - * \param y1 The y coordinate of the start point. - * \param x2 The x coordinate of the end point. - * \param y2 The y coordinate of the end point. + * SDL_RenderDrawLine() draws the line to include both end points. If you want + * to draw multiple, connecting lines use SDL_RenderDrawLines() instead. * - * \return 0 on success, or -1 on error + * \param renderer the rendering context + * \param x1 the x coordinate of the start point + * \param y1 the y coordinate of the start point + * \param x2 the x coordinate of the end point + * \param y2 the y coordinate of the end point + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderDrawLines + * \sa SDL_RenderDrawPoint + * \sa SDL_RenderDrawPoints + * \sa SDL_RenderDrawRect + * \sa SDL_RenderDrawRects + * \sa SDL_RenderFillRect + * \sa SDL_RenderFillRects + * \sa SDL_RenderPresent + * \sa SDL_SetRenderDrawBlendMode + * \sa SDL_SetRenderDrawColor */ extern DECLSPEC int SDLCALL SDL_RenderDrawLine(SDL_Renderer * renderer, int x1, int y1, int x2, int y2); /** - * \brief Draw a series of connected lines on the current rendering target. + * Draw a series of connected lines on the current rendering target. * - * \param renderer The renderer which should draw multiple lines. - * \param points The points along the lines - * \param count The number of points, drawing count-1 lines + * \param renderer the rendering context + * \param points an array of SDL_Point structures representing points along + * the lines + * \param count the number of points, drawing count-1 lines + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderDrawLine + * \sa SDL_RenderDrawPoint + * \sa SDL_RenderDrawPoints + * \sa SDL_RenderDrawRect + * \sa SDL_RenderDrawRects + * \sa SDL_RenderFillRect + * \sa SDL_RenderFillRects + * \sa SDL_RenderPresent + * \sa SDL_SetRenderDrawBlendMode + * \sa SDL_SetRenderDrawColor */ extern DECLSPEC int SDLCALL SDL_RenderDrawLines(SDL_Renderer * renderer, const SDL_Point * points, int count); /** - * \brief Draw a rectangle on the current rendering target. + * Draw a rectangle on the current rendering target. * - * \param renderer The renderer which should draw a rectangle. - * \param rect A pointer to the destination rectangle, or NULL to outline the entire rendering target. + * \param renderer the rendering context + * \param rect an SDL_Rect structure representing the rectangle to draw, or + * NULL to outline the entire rendering target + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderDrawLine + * \sa SDL_RenderDrawLines + * \sa SDL_RenderDrawPoint + * \sa SDL_RenderDrawPoints + * \sa SDL_RenderDrawRects + * \sa SDL_RenderFillRect + * \sa SDL_RenderFillRects + * \sa SDL_RenderPresent + * \sa SDL_SetRenderDrawBlendMode + * \sa SDL_SetRenderDrawColor */ extern DECLSPEC int SDLCALL SDL_RenderDrawRect(SDL_Renderer * renderer, const SDL_Rect * rect); /** - * \brief Draw some number of rectangles on the current rendering target. + * Draw some number of rectangles on the current rendering target. * - * \param renderer The renderer which should draw multiple rectangles. - * \param rects A pointer to an array of destination rectangles. - * \param count The number of rectangles. + * \param renderer the rendering context + * \param rects an array of SDL_Rect structures representing the rectangles to + * be drawn + * \param count the number of rectangles + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderDrawLine + * \sa SDL_RenderDrawLines + * \sa SDL_RenderDrawPoint + * \sa SDL_RenderDrawPoints + * \sa SDL_RenderDrawRect + * \sa SDL_RenderFillRect + * \sa SDL_RenderFillRects + * \sa SDL_RenderPresent + * \sa SDL_SetRenderDrawBlendMode + * \sa SDL_SetRenderDrawColor */ extern DECLSPEC int SDLCALL SDL_RenderDrawRects(SDL_Renderer * renderer, const SDL_Rect * rects, int count); /** - * \brief Fill a rectangle on the current rendering target with the drawing color. + * Fill a rectangle on the current rendering target with the drawing color. * - * \param renderer The renderer which should fill a rectangle. - * \param rect A pointer to the destination rectangle, or NULL for the entire - * rendering target. + * The current drawing color is set by SDL_SetRenderDrawColor(), and the + * color's alpha value is ignored unless blending is enabled with the + * appropriate call to SDL_SetRenderDrawBlendMode(). * - * \return 0 on success, or -1 on error + * \param renderer the rendering context + * \param rect the SDL_Rect structure representing the rectangle to fill, or + * NULL for the entire rendering target + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderDrawLine + * \sa SDL_RenderDrawLines + * \sa SDL_RenderDrawPoint + * \sa SDL_RenderDrawPoints + * \sa SDL_RenderDrawRect + * \sa SDL_RenderDrawRects + * \sa SDL_RenderFillRects + * \sa SDL_RenderPresent + * \sa SDL_SetRenderDrawBlendMode + * \sa SDL_SetRenderDrawColor */ extern DECLSPEC int SDLCALL SDL_RenderFillRect(SDL_Renderer * renderer, const SDL_Rect * rect); /** - * \brief Fill some number of rectangles on the current rendering target with the drawing color. + * Fill some number of rectangles on the current rendering target with the + * drawing color. * - * \param renderer The renderer which should fill multiple rectangles. - * \param rects A pointer to an array of destination rectangles. - * \param count The number of rectangles. + * \param renderer the rendering context + * \param rects an array of SDL_Rect structures representing the rectangles to + * be filled + * \param count the number of rectangles + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderDrawLine + * \sa SDL_RenderDrawLines + * \sa SDL_RenderDrawPoint + * \sa SDL_RenderDrawPoints + * \sa SDL_RenderDrawRect + * \sa SDL_RenderDrawRects + * \sa SDL_RenderFillRect + * \sa SDL_RenderPresent */ extern DECLSPEC int SDLCALL SDL_RenderFillRects(SDL_Renderer * renderer, const SDL_Rect * rects, int count); /** - * \brief Copy a portion of the texture to the current rendering target. + * Copy a portion of the texture to the current rendering target. * - * \param renderer The renderer which should copy parts of a texture. - * \param texture The source texture. - * \param srcrect A pointer to the source rectangle, or NULL for the entire - * texture. - * \param dstrect A pointer to the destination rectangle, or NULL for the - * entire rendering target. + * The texture is blended with the destination based on its blend mode set + * with SDL_SetTextureBlendMode(). * - * \return 0 on success, or -1 on error + * The texture color is affected based on its color modulation set by + * SDL_SetTextureColorMod(). + * + * The texture alpha is affected based on its alpha modulation set by + * SDL_SetTextureAlphaMod(). + * + * \param renderer the rendering context + * \param texture the source texture + * \param srcrect the source SDL_Rect structure or NULL for the entire texture + * \param dstrect the destination SDL_Rect structure or NULL for the entire + * rendering target; the texture will be stretched to fill the + * given rectangle + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderCopyEx + * \sa SDL_SetTextureAlphaMod + * \sa SDL_SetTextureBlendMode + * \sa SDL_SetTextureColorMod */ extern DECLSPEC int SDLCALL SDL_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture, @@ -813,19 +1389,43 @@ extern DECLSPEC int SDLCALL SDL_RenderCopy(SDL_Renderer * renderer, const SDL_Rect * dstrect); /** - * \brief Copy a portion of the source texture to the current rendering target, rotating it by angle around the given center + * Copy a portion of the texture to the current rendering, with optional + * rotation and flipping. * - * \param renderer The renderer which should copy parts of a texture. - * \param texture The source texture. - * \param srcrect A pointer to the source rectangle, or NULL for the entire - * texture. - * \param dstrect A pointer to the destination rectangle, or NULL for the - * entire rendering target. - * \param angle An angle in degrees that indicates the rotation that will be applied to dstrect, rotating it in a clockwise direction - * \param center A pointer to a point indicating the point around which dstrect will be rotated (if NULL, rotation will be done around dstrect.w/2, dstrect.h/2). - * \param flip An SDL_RendererFlip value stating which flipping actions should be performed on the texture + * Copy a portion of the texture to the current rendering target, optionally + * rotating it by angle around the given center and also flipping it + * top-bottom and/or left-right. * - * \return 0 on success, or -1 on error + * The texture is blended with the destination based on its blend mode set + * with SDL_SetTextureBlendMode(). + * + * The texture color is affected based on its color modulation set by + * SDL_SetTextureColorMod(). + * + * The texture alpha is affected based on its alpha modulation set by + * SDL_SetTextureAlphaMod(). + * + * \param renderer the rendering context + * \param texture the source texture + * \param srcrect the source SDL_Rect structure or NULL for the entire texture + * \param dstrect the destination SDL_Rect structure or NULL for the entire + * rendering target + * \param angle an angle in degrees that indicates the rotation that will be + * applied to dstrect, rotating it in a clockwise direction + * \param center a pointer to a point indicating the point around which + * dstrect will be rotated (if NULL, rotation will be done + * around `dstrect.w / 2`, `dstrect.h / 2`) + * \param flip a SDL_RendererFlip value stating which flipping actions should + * be performed on the texture + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderCopy + * \sa SDL_SetTextureAlphaMod + * \sa SDL_SetTextureBlendMode + * \sa SDL_SetTextureColorMod */ extern DECLSPEC int SDLCALL SDL_RenderCopyEx(SDL_Renderer * renderer, SDL_Texture * texture, @@ -837,117 +1437,132 @@ extern DECLSPEC int SDLCALL SDL_RenderCopyEx(SDL_Renderer * renderer, /** - * \brief Draw a point on the current rendering target. + * Draw a point on the current rendering target at subpixel precision. * - * \param renderer The renderer which should draw a point. - * \param x The x coordinate of the point. - * \param y The y coordinate of the point. + * \param renderer The renderer which should draw a point. + * \param x The x coordinate of the point. + * \param y The y coordinate of the point. + * \return 0 on success, or -1 on error * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC int SDLCALL SDL_RenderDrawPointF(SDL_Renderer * renderer, float x, float y); /** - * \brief Draw multiple points on the current rendering target. + * Draw multiple points on the current rendering target at subpixel precision. * - * \param renderer The renderer which should draw multiple points. - * \param points The points to draw - * \param count The number of points to draw + * \param renderer The renderer which should draw multiple points. + * \param points The points to draw + * \param count The number of points to draw + * \return 0 on success, or -1 on error * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC int SDLCALL SDL_RenderDrawPointsF(SDL_Renderer * renderer, const SDL_FPoint * points, int count); /** - * \brief Draw a line on the current rendering target. + * Draw a line on the current rendering target at subpixel precision. * - * \param renderer The renderer which should draw a line. - * \param x1 The x coordinate of the start point. - * \param y1 The y coordinate of the start point. - * \param x2 The x coordinate of the end point. - * \param y2 The y coordinate of the end point. + * \param renderer The renderer which should draw a line. + * \param x1 The x coordinate of the start point. + * \param y1 The y coordinate of the start point. + * \param x2 The x coordinate of the end point. + * \param y2 The y coordinate of the end point. + * \return 0 on success, or -1 on error * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC int SDLCALL SDL_RenderDrawLineF(SDL_Renderer * renderer, float x1, float y1, float x2, float y2); /** - * \brief Draw a series of connected lines on the current rendering target. + * Draw a series of connected lines on the current rendering target at + * subpixel precision. * - * \param renderer The renderer which should draw multiple lines. - * \param points The points along the lines - * \param count The number of points, drawing count-1 lines + * \param renderer The renderer which should draw multiple lines. + * \param points The points along the lines + * \param count The number of points, drawing count-1 lines + * \return 0 on success, or -1 on error * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC int SDLCALL SDL_RenderDrawLinesF(SDL_Renderer * renderer, - const SDL_FPoint * points, - int count); + const SDL_FPoint * points, + int count); /** - * \brief Draw a rectangle on the current rendering target. + * Draw a rectangle on the current rendering target at subpixel precision. * - * \param renderer The renderer which should draw a rectangle. - * \param rect A pointer to the destination rectangle, or NULL to outline the entire rendering target. + * \param renderer The renderer which should draw a rectangle. + * \param rect A pointer to the destination rectangle, or NULL to outline the + * entire rendering target. + * \return 0 on success, or -1 on error * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC int SDLCALL SDL_RenderDrawRectF(SDL_Renderer * renderer, - const SDL_FRect * rect); + const SDL_FRect * rect); /** - * \brief Draw some number of rectangles on the current rendering target. + * Draw some number of rectangles on the current rendering target at subpixel + * precision. * - * \param renderer The renderer which should draw multiple rectangles. - * \param rects A pointer to an array of destination rectangles. - * \param count The number of rectangles. + * \param renderer The renderer which should draw multiple rectangles. + * \param rects A pointer to an array of destination rectangles. + * \param count The number of rectangles. + * \return 0 on success, or -1 on error * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC int SDLCALL SDL_RenderDrawRectsF(SDL_Renderer * renderer, const SDL_FRect * rects, int count); /** - * \brief Fill a rectangle on the current rendering target with the drawing color. + * Fill a rectangle on the current rendering target with the drawing color at + * subpixel precision. * - * \param renderer The renderer which should fill a rectangle. - * \param rect A pointer to the destination rectangle, or NULL for the entire - * rendering target. + * \param renderer The renderer which should fill a rectangle. + * \param rect A pointer to the destination rectangle, or NULL for the entire + * rendering target. + * \return 0 on success, or -1 on error * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC int SDLCALL SDL_RenderFillRectF(SDL_Renderer * renderer, const SDL_FRect * rect); /** - * \brief Fill some number of rectangles on the current rendering target with the drawing color. + * Fill some number of rectangles on the current rendering target with the + * drawing color at subpixel precision. * - * \param renderer The renderer which should fill multiple rectangles. - * \param rects A pointer to an array of destination rectangles. - * \param count The number of rectangles. + * \param renderer The renderer which should fill multiple rectangles. + * \param rects A pointer to an array of destination rectangles. + * \param count The number of rectangles. + * \return 0 on success, or -1 on error * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC int SDLCALL SDL_RenderFillRectsF(SDL_Renderer * renderer, const SDL_FRect * rects, int count); /** - * \brief Copy a portion of the texture to the current rendering target. + * Copy a portion of the texture to the current rendering target at subpixel + * precision. * - * \param renderer The renderer which should copy parts of a texture. - * \param texture The source texture. - * \param srcrect A pointer to the source rectangle, or NULL for the entire - * texture. - * \param dstrect A pointer to the destination rectangle, or NULL for the - * entire rendering target. + * \param renderer The renderer which should copy parts of a texture. + * \param texture The source texture. + * \param srcrect A pointer to the source rectangle, or NULL for the entire + * texture. + * \param dstrect A pointer to the destination rectangle, or NULL for the + * entire rendering target. + * \return 0 on success, or -1 on error * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC int SDLCALL SDL_RenderCopyF(SDL_Renderer * renderer, SDL_Texture * texture, @@ -955,19 +1570,25 @@ extern DECLSPEC int SDLCALL SDL_RenderCopyF(SDL_Renderer * renderer, const SDL_FRect * dstrect); /** - * \brief Copy a portion of the source texture to the current rendering target, rotating it by angle around the given center + * Copy a portion of the source texture to the current rendering target, with + * rotation and flipping, at subpixel precision. * - * \param renderer The renderer which should copy parts of a texture. - * \param texture The source texture. - * \param srcrect A pointer to the source rectangle, or NULL for the entire - * texture. - * \param dstrect A pointer to the destination rectangle, or NULL for the - * entire rendering target. - * \param angle An angle in degrees that indicates the rotation that will be applied to dstrect, rotating it in a clockwise direction - * \param center A pointer to a point indicating the point around which dstrect will be rotated (if NULL, rotation will be done around dstrect.w/2, dstrect.h/2). - * \param flip An SDL_RendererFlip value stating which flipping actions should be performed on the texture + * \param renderer The renderer which should copy parts of a texture. + * \param texture The source texture. + * \param srcrect A pointer to the source rectangle, or NULL for the entire + * texture. + * \param dstrect A pointer to the destination rectangle, or NULL for the + * entire rendering target. + * \param angle An angle in degrees that indicates the rotation that will be + * applied to dstrect, rotating it in a clockwise direction + * \param center A pointer to a point indicating the point around which + * dstrect will be rotated (if NULL, rotation will be done + * around dstrect.w/2, dstrect.h/2). + * \param flip An SDL_RendererFlip value stating which flipping actions should + * be performed on the texture + * \return 0 on success, or -1 on error * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC int SDLCALL SDL_RenderCopyExF(SDL_Renderer * renderer, SDL_Texture * texture, @@ -978,19 +1599,85 @@ extern DECLSPEC int SDLCALL SDL_RenderCopyExF(SDL_Renderer * renderer, const SDL_RendererFlip flip); /** - * \brief Read pixels from the current rendering target. + * Render a list of triangles, optionally using a texture and indices into the + * vertex array Color and alpha modulation is done per vertex + * (SDL_SetTextureColorMod and SDL_SetTextureAlphaMod are ignored). * - * \param renderer The renderer from which pixels should be read. - * \param rect A pointer to the rectangle to read, or NULL for the entire - * render target. - * \param format The desired format of the pixel data, or 0 to use the format - * of the rendering target - * \param pixels A pointer to be filled in with the pixel data - * \param pitch The pitch of the pixels parameter. + * \param texture (optional) The SDL texture to use. + * \param vertices Vertices. + * \param num_vertices Number of vertices. + * \param indices (optional) An array of integer indices into the 'vertices' + * array, if NULL all vertices will be rendered in sequential + * order. + * \param num_indices Number of indices. + * \return 0 on success, or -1 if the operation is not supported * - * \return 0 on success, or -1 if pixel reading is not supported. + * \since This function is available since SDL 2.0.18. * - * \warning This is a very slow operation, and should not be used frequently. + * \sa SDL_RenderGeometryRaw + * \sa SDL_Vertex + */ +extern DECLSPEC int SDLCALL SDL_RenderGeometry(SDL_Renderer *renderer, + SDL_Texture *texture, + const SDL_Vertex *vertices, int num_vertices, + const int *indices, int num_indices); + +/** + * Render a list of triangles, optionally using a texture and indices into the + * vertex arrays Color and alpha modulation is done per vertex + * (SDL_SetTextureColorMod and SDL_SetTextureAlphaMod are ignored). + * + * \param texture (optional) The SDL texture to use. + * \param xy Vertex positions + * \param xy_stride Byte size to move from one element to the next element + * \param color Vertex colors (as SDL_Color) + * \param color_stride Byte size to move from one element to the next element + * \param uv Vertex normalized texture coordinates + * \param uv_stride Byte size to move from one element to the next element + * \param num_vertices Number of vertices. + * \param indices (optional) An array of indices into the 'vertices' arrays, + * if NULL all vertices will be rendered in sequential order. + * \param num_indices Number of indices. + * \param size_indices Index size: 1 (byte), 2 (short), 4 (int) + * \return 0 on success, or -1 if the operation is not supported + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_RenderGeometry + * \sa SDL_Vertex + */ +extern DECLSPEC int SDLCALL SDL_RenderGeometryRaw(SDL_Renderer *renderer, + SDL_Texture *texture, + const float *xy, int xy_stride, + const SDL_Color *color, int color_stride, + const float *uv, int uv_stride, + int num_vertices, + const void *indices, int num_indices, int size_indices); + +/** + * Read pixels from the current rendering target to an array of pixels. + * + * **WARNING**: This is a very slow operation, and should not be used + * frequently. + * + * `pitch` specifies the number of bytes between rows in the destination + * `pixels` data. This allows you to write to a subrectangle or have padded + * rows in the destination. Generally, `pitch` should equal the number of + * pixels per row in the `pixels` data times the number of bytes per pixel, + * but it might contain additional padding (for example, 24bit RGB Windows + * Bitmap data pads all rows to multiples of 4 bytes). + * + * \param renderer the rendering context + * \param rect an SDL_Rect structure representing the area to read, or NULL + * for the entire render target + * \param format an SDL_PixelFormatEnum value of the desired format of the + * pixel data, or 0 to use the format of the rendering target + * \param pixels a pointer to the pixel data to copy into + * \param pitch the pitch of the `pixels` parameter + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC int SDLCALL SDL_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect, @@ -998,95 +1685,200 @@ extern DECLSPEC int SDLCALL SDL_RenderReadPixels(SDL_Renderer * renderer, void *pixels, int pitch); /** - * \brief Update the screen with rendering performed. + * Update the screen with any rendering performed since the previous call. + * + * SDL's rendering functions operate on a backbuffer; that is, calling a + * rendering function such as SDL_RenderDrawLine() does not directly put a + * line on the screen, but rather updates the backbuffer. As such, you compose + * your entire scene and *present* the composed backbuffer to the screen as a + * complete picture. + * + * Therefore, when using SDL's rendering API, one does all drawing intended + * for the frame, and then calls this function once per frame to present the + * final drawing to the user. + * + * The backbuffer should be considered invalidated after each present; do not + * assume that previous contents will exist between frames. You are strongly + * encouraged to call SDL_RenderClear() to initialize the backbuffer before + * starting each new frame's drawing, even if you plan to overwrite every + * pixel. + * + * \param renderer the rendering context + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderClear + * \sa SDL_RenderDrawLine + * \sa SDL_RenderDrawLines + * \sa SDL_RenderDrawPoint + * \sa SDL_RenderDrawPoints + * \sa SDL_RenderDrawRect + * \sa SDL_RenderDrawRects + * \sa SDL_RenderFillRect + * \sa SDL_RenderFillRects + * \sa SDL_SetRenderDrawBlendMode + * \sa SDL_SetRenderDrawColor */ extern DECLSPEC void SDLCALL SDL_RenderPresent(SDL_Renderer * renderer); /** - * \brief Destroy the specified texture. + * Destroy the specified texture. * - * \sa SDL_CreateTexture() - * \sa SDL_CreateTextureFromSurface() + * Passing NULL or an otherwise invalid texture will set the SDL error message + * to "Invalid texture". + * + * \param texture the texture to destroy + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateTexture + * \sa SDL_CreateTextureFromSurface */ extern DECLSPEC void SDLCALL SDL_DestroyTexture(SDL_Texture * texture); /** - * \brief Destroy the rendering context for a window and free associated - * textures. + * Destroy the rendering context for a window and free associated textures. * - * \sa SDL_CreateRenderer() + * \param renderer the rendering context + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateRenderer */ extern DECLSPEC void SDLCALL SDL_DestroyRenderer(SDL_Renderer * renderer); /** - * \brief Force the rendering context to flush any pending commands to the - * underlying rendering API. + * Force the rendering context to flush any pending commands to the underlying + * rendering API. * - * You do not need to (and in fact, shouldn't) call this function unless - * you are planning to call into OpenGL/Direct3D/Metal/whatever directly - * in addition to using an SDL_Renderer. + * You do not need to (and in fact, shouldn't) call this function unless you + * are planning to call into OpenGL/Direct3D/Metal/whatever directly in + * addition to using an SDL_Renderer. * - * This is for a very-specific case: if you are using SDL's render API, - * you asked for a specific renderer backend (OpenGL, Direct3D, etc), - * you set SDL_HINT_RENDER_BATCHING to "1", and you plan to make - * OpenGL/D3D/whatever calls in addition to SDL render API calls. If all of - * this applies, you should call SDL_RenderFlush() between calls to SDL's - * render API and the low-level API you're using in cooperation. + * This is for a very-specific case: if you are using SDL's render API, you + * asked for a specific renderer backend (OpenGL, Direct3D, etc), you set + * SDL_HINT_RENDER_BATCHING to "1", and you plan to make OpenGL/D3D/whatever + * calls in addition to SDL render API calls. If all of this applies, you + * should call SDL_RenderFlush() between calls to SDL's render API and the + * low-level API you're using in cooperation. * - * In all other cases, you can ignore this function. This is only here to - * get maximum performance out of a specific situation. In all other cases, - * SDL will do the right thing, perhaps at a performance loss. + * In all other cases, you can ignore this function. This is only here to get + * maximum performance out of a specific situation. In all other cases, SDL + * will do the right thing, perhaps at a performance loss. * - * This function is first available in SDL 2.0.10, and is not needed in - * 2.0.9 and earlier, as earlier versions did not queue rendering commands - * at all, instead flushing them to the OS immediately. + * This function is first available in SDL 2.0.10, and is not needed in 2.0.9 + * and earlier, as earlier versions did not queue rendering commands at all, + * instead flushing them to the OS immediately. + * + * \param renderer the rendering context + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC int SDLCALL SDL_RenderFlush(SDL_Renderer * renderer); /** - * \brief Bind the texture to the current OpenGL/ES/ES2 context for use with - * OpenGL instructions. + * Bind an OpenGL/ES/ES2 texture to the current context. * - * \param texture The SDL texture to bind - * \param texw A pointer to a float that will be filled with the texture width - * \param texh A pointer to a float that will be filled with the texture height + * This is for use with OpenGL instructions when rendering OpenGL primitives + * directly. * - * \return 0 on success, or -1 if the operation is not supported + * If not NULL, `texw` and `texh` will be filled with the width and height + * values suitable for the provided texture. In most cases, both will be 1.0, + * however, on systems that support the GL_ARB_texture_rectangle extension, + * these values will actually be the pixel width and height used to create the + * texture, so this factor needs to be taken into account when providing + * texture coordinates to OpenGL. + * + * You need a renderer to create an SDL_Texture, therefore you can only use + * this function with an implicit OpenGL context from SDL_CreateRenderer(), + * not with your own OpenGL context. If you need control over your OpenGL + * context, you need to write your own texture-loading methods. + * + * Also note that SDL may upload RGB textures as BGR (or vice-versa), and + * re-order the color channels in the shaders phase, so the uploaded texture + * may have swapped color channels. + * + * \param texture the texture to bind to the current OpenGL/ES/ES2 context + * \param texw a pointer to a float value which will be filled with the + * texture width or NULL if you don't need that value + * \param texh a pointer to a float value which will be filled with the + * texture height or NULL if you don't need that value + * \returns 0 on success, or -1 if the operation is not supported; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_MakeCurrent + * \sa SDL_GL_UnbindTexture */ extern DECLSPEC int SDLCALL SDL_GL_BindTexture(SDL_Texture *texture, float *texw, float *texh); /** - * \brief Unbind a texture from the current OpenGL/ES/ES2 context. + * Unbind an OpenGL/ES/ES2 texture from the current context. * - * \param texture The SDL texture to unbind + * See SDL_GL_BindTexture() for examples on how to use these functions * - * \return 0 on success, or -1 if the operation is not supported + * \param texture the texture to unbind from the current OpenGL/ES/ES2 context + * \returns 0 on success, or -1 if the operation is not supported + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_BindTexture + * \sa SDL_GL_MakeCurrent */ extern DECLSPEC int SDLCALL SDL_GL_UnbindTexture(SDL_Texture *texture); /** - * \brief Get the CAMetalLayer associated with the given Metal renderer + * Get the CAMetalLayer associated with the given Metal renderer. * - * \param renderer The renderer to query + * This function returns `void *`, so SDL doesn't have to include Metal's + * headers, but it can be safely cast to a `CAMetalLayer *`. * - * \return CAMetalLayer* on success, or NULL if the renderer isn't a Metal renderer + * \param renderer The renderer to query + * \returns a `CAMetalLayer *` on success, or NULL if the renderer isn't a + * Metal renderer * - * \sa SDL_RenderGetMetalCommandEncoder() + * \since This function is available since SDL 2.0.8. + * + * \sa SDL_RenderGetMetalCommandEncoder */ extern DECLSPEC void *SDLCALL SDL_RenderGetMetalLayer(SDL_Renderer * renderer); /** - * \brief Get the Metal command encoder for the current frame + * Get the Metal command encoder for the current frame * - * \param renderer The renderer to query + * This function returns `void *`, so SDL doesn't have to include Metal's + * headers, but it can be safely cast to an `id`. * - * \return id on success, or NULL if the renderer isn't a Metal renderer + * Note that as of SDL 2.0.18, this will return NULL if Metal refuses to give + * SDL a drawable to render to, which might happen if the window is + * hidden/minimized/offscreen. This doesn't apply to command encoders for + * render targets, just the window's backbacker. Check your return values! * - * \sa SDL_RenderGetMetalLayer() + * \param renderer The renderer to query + * \returns an `id` on success, or NULL if the + * renderer isn't a Metal renderer or there was an error. + * + * \since This function is available since SDL 2.0.8. + * + * \sa SDL_RenderGetMetalLayer */ extern DECLSPEC void *SDLCALL SDL_RenderGetMetalCommandEncoder(SDL_Renderer * renderer); +/** + * Toggle VSync of the given renderer. + * + * \param renderer The renderer to toggle + * \param vsync 1 for on, 0 for off. All other values are reserved + * \returns a 0 int on success, or non-zero on failure + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_RenderSetVSync(SDL_Renderer* renderer, int vsync); + /* Ends C function definitions when using C++ */ #ifdef __cplusplus } diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_revision.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_revision.h index 3b3fc85ea..3253d6df0 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_revision.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_revision.h @@ -1,2 +1,2 @@ -#define SDL_REVISION "hg-12952:bc90ce38f1e2" -#define SDL_REVISION_NUMBER 12952 +#define SDL_REVISION "https://github.com/libsdl-org/SDL.git@b424665e0899769b200231ba943353a5fee1b6b6" +#define SDL_REVISION_NUMBER 0 diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_rwops.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_rwops.h index f66119fb0..71e5c8db8 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_rwops.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_rwops.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -45,6 +45,9 @@ extern "C" { #define SDL_RWOPS_JNIFILE 3U /**< Android asset */ #define SDL_RWOPS_MEMORY 4U /**< Memory stream */ #define SDL_RWOPS_MEMORY_RO 5U /**< Read-Only memory stream */ +#if defined(__VITA__) +#define SDL_RWOPS_VITAFILE 6U /**< Vita file */ +#endif /** * This is the read/write operation structure -- very basic. @@ -96,15 +99,7 @@ typedef struct SDL_RWops #if defined(__ANDROID__) struct { - void *fileNameRef; - void *inputStreamRef; - void *readableByteChannelRef; - void *readMethod; - void *assetFileDescriptorRef; - long position; - long size; - long offset; - int fd; + void *asset; } androidio; #elif defined(__WIN32__) struct @@ -118,6 +113,17 @@ typedef struct SDL_RWops size_t left; } buffer; } windowsio; +#elif defined(__VITA__) + struct + { + int h; + struct + { + void *data; + size_t size; + size_t left; + } buffer; + } vitaio; #endif #ifdef HAVE_STDIO_H @@ -150,25 +156,228 @@ typedef struct SDL_RWops */ /* @{ */ +/** + * Use this function to create a new SDL_RWops structure for reading from + * and/or writing to a named file. + * + * The `mode` string is treated roughly the same as in a call to the C + * library's fopen(), even if SDL doesn't happen to use fopen() behind the + * scenes. + * + * Available `mode` strings: + * + * - "r": Open a file for reading. The file must exist. + * - "w": Create an empty file for writing. If a file with the same name + * already exists its content is erased and the file is treated as a new + * empty file. + * - "a": Append to a file. Writing operations append data at the end of the + * file. The file is created if it does not exist. + * - "r+": Open a file for update both reading and writing. The file must + * exist. + * - "w+": Create an empty file for both reading and writing. If a file with + * the same name already exists its content is erased and the file is + * treated as a new empty file. + * - "a+": Open a file for reading and appending. All writing operations are + * performed at the end of the file, protecting the previous content to be + * overwritten. You can reposition (fseek, rewind) the internal pointer to + * anywhere in the file for reading, but writing operations will move it + * back to the end of file. The file is created if it does not exist. + * + * **NOTE**: In order to open a file as a binary file, a "b" character has to + * be included in the `mode` string. This additional "b" character can either + * be appended at the end of the string (thus making the following compound + * modes: "rb", "wb", "ab", "r+b", "w+b", "a+b") or be inserted between the + * letter and the "+" sign for the mixed modes ("rb+", "wb+", "ab+"). + * Additional characters may follow the sequence, although they should have no + * effect. For example, "t" is sometimes appended to make explicit the file is + * a text file. + * + * This function supports Unicode filenames, but they must be encoded in UTF-8 + * format, regardless of the underlying operating system. + * + * As a fallback, SDL_RWFromFile() will transparently open a matching filename + * in an Android app's `assets`. + * + * Closing the SDL_RWops will close the file handle SDL is holding internally. + * + * \param file a UTF-8 string representing the filename to open + * \param mode an ASCII string representing the mode to be used for opening + * the file. + * \returns a pointer to the SDL_RWops structure that is created, or NULL on + * failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RWclose + * \sa SDL_RWFromConstMem + * \sa SDL_RWFromFP + * \sa SDL_RWFromMem + * \sa SDL_RWread + * \sa SDL_RWseek + * \sa SDL_RWtell + * \sa SDL_RWwrite + */ extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromFile(const char *file, const char *mode); #ifdef HAVE_STDIO_H -extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromFP(FILE * fp, - SDL_bool autoclose); + +extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromFP(FILE * fp, SDL_bool autoclose); + #else + +/** + * Use this function to create an SDL_RWops structure from a standard I/O file + * pointer (stdio.h's `FILE*`). + * + * This function is not available on Windows, since files opened in an + * application on that platform cannot be used by a dynamically linked + * library. + * + * On some platforms, the first parameter is a `void*`, on others, it's a + * `FILE*`, depending on what system headers are available to SDL. It is + * always intended to be the `FILE*` type from the C runtime's stdio.h. + * + * \param fp the `FILE*` that feeds the SDL_RWops stream + * \param autoclose SDL_TRUE to close the `FILE*` when closing the SDL_RWops, + * SDL_FALSE to leave the `FILE*` open when the RWops is + * closed + * \returns a pointer to the SDL_RWops structure that is created, or NULL on + * failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RWclose + * \sa SDL_RWFromConstMem + * \sa SDL_RWFromFile + * \sa SDL_RWFromMem + * \sa SDL_RWread + * \sa SDL_RWseek + * \sa SDL_RWtell + * \sa SDL_RWwrite + */ extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromFP(void * fp, SDL_bool autoclose); #endif +/** + * Use this function to prepare a read-write memory buffer for use with + * SDL_RWops. + * + * This function sets up an SDL_RWops struct based on a memory area of a + * certain size, for both read and write access. + * + * This memory buffer is not copied by the RWops; the pointer you provide must + * remain valid until you close the stream. Closing the stream will not free + * the original buffer. + * + * If you need to make sure the RWops never writes to the memory buffer, you + * should use SDL_RWFromConstMem() with a read-only buffer of memory instead. + * + * \param mem a pointer to a buffer to feed an SDL_RWops stream + * \param size the buffer size, in bytes + * \returns a pointer to a new SDL_RWops structure, or NULL if it fails; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RWclose + * \sa SDL_RWFromConstMem + * \sa SDL_RWFromFile + * \sa SDL_RWFromFP + * \sa SDL_RWFromMem + * \sa SDL_RWread + * \sa SDL_RWseek + * \sa SDL_RWtell + * \sa SDL_RWwrite + */ extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromMem(void *mem, int size); + +/** + * Use this function to prepare a read-only memory buffer for use with RWops. + * + * This function sets up an SDL_RWops struct based on a memory area of a + * certain size. It assumes the memory area is not writable. + * + * Attempting to write to this RWops stream will report an error without + * writing to the memory buffer. + * + * This memory buffer is not copied by the RWops; the pointer you provide must + * remain valid until you close the stream. Closing the stream will not free + * the original buffer. + * + * If you need to write to a memory buffer, you should use SDL_RWFromMem() + * with a writable buffer of memory instead. + * + * \param mem a pointer to a read-only buffer to feed an SDL_RWops stream + * \param size the buffer size, in bytes + * \returns a pointer to a new SDL_RWops structure, or NULL if it fails; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RWclose + * \sa SDL_RWFromConstMem + * \sa SDL_RWFromFile + * \sa SDL_RWFromFP + * \sa SDL_RWFromMem + * \sa SDL_RWread + * \sa SDL_RWseek + * \sa SDL_RWtell + */ extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromConstMem(const void *mem, int size); /* @} *//* RWFrom functions */ +/** + * Use this function to allocate an empty, unpopulated SDL_RWops structure. + * + * Applications do not need to use this function unless they are providing + * their own SDL_RWops implementation. If you just need a SDL_RWops to + * read/write a common data source, you should use the built-in + * implementations in SDL, like SDL_RWFromFile() or SDL_RWFromMem(), etc. + * + * You must free the returned pointer with SDL_FreeRW(). Depending on your + * operating system and compiler, there may be a difference between the + * malloc() and free() your program uses and the versions SDL calls + * internally. Trying to mix the two can cause crashing such as segmentation + * faults. Since all SDL_RWops must free themselves when their **close** + * method is called, all SDL_RWops must be allocated through this function, so + * they can all be freed correctly with SDL_FreeRW(). + * + * \returns a pointer to the allocated memory on success, or NULL on failure; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_FreeRW + */ extern DECLSPEC SDL_RWops *SDLCALL SDL_AllocRW(void); + +/** + * Use this function to free an SDL_RWops structure allocated by + * SDL_AllocRW(). + * + * Applications do not need to use this function unless they are providing + * their own SDL_RWops implementation. If you just need a SDL_RWops to + * read/write a common data source, you should use the built-in + * implementations in SDL, like SDL_RWFromFile() or SDL_RWFromMem(), etc, and + * call the **close** method on those SDL_RWops pointers when you are done + * with them. + * + * Only use SDL_FreeRW() on pointers returned by SDL_AllocRW(). The pointer is + * invalid as soon as this function returns. Any extra memory allocated during + * creation of the SDL_RWops is not freed by SDL_FreeRW(); the programmer must + * be responsible for managing that memory in their **close** method. + * + * \param area the SDL_RWops structure to be freed + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AllocRW + */ extern DECLSPEC void SDLCALL SDL_FreeRW(SDL_RWops * area); #define RW_SEEK_SET 0 /**< Seek from the beginning of data */ @@ -176,77 +385,218 @@ extern DECLSPEC void SDLCALL SDL_FreeRW(SDL_RWops * area); #define RW_SEEK_END 2 /**< Seek relative to the end of data */ /** - * Return the size of the file in this rwops, or -1 if unknown + * Use this function to get the size of the data stream in an SDL_RWops. + * + * Prior to SDL 2.0.10, this function was a macro. + * + * \param context the SDL_RWops to get the size of the data stream from + * \returns the size of the data stream in the SDL_RWops on success, -1 if + * unknown or a negative error code on failure; call SDL_GetError() + * for more information. + * + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC Sint64 SDLCALL SDL_RWsize(SDL_RWops *context); /** - * Seek to \c offset relative to \c whence, one of stdio's whence values: - * RW_SEEK_SET, RW_SEEK_CUR, RW_SEEK_END + * Seek within an SDL_RWops data stream. * - * \return the final offset in the data stream, or -1 on error. + * This function seeks to byte `offset`, relative to `whence`. + * + * `whence` may be any of the following values: + * + * - `RW_SEEK_SET`: seek from the beginning of data + * - `RW_SEEK_CUR`: seek relative to current read point + * - `RW_SEEK_END`: seek relative to the end of data + * + * If this stream can not seek, it will return -1. + * + * SDL_RWseek() is actually a wrapper function that calls the SDL_RWops's + * `seek` method appropriately, to simplify application development. + * + * Prior to SDL 2.0.10, this function was a macro. + * + * \param context a pointer to an SDL_RWops structure + * \param offset an offset in bytes, relative to **whence** location; can be + * negative + * \param whence any of `RW_SEEK_SET`, `RW_SEEK_CUR`, `RW_SEEK_END` + * \returns the final offset in the data stream after the seek or -1 on error. + * + * \since This function is available since SDL 2.0.10. + * + * \sa SDL_RWclose + * \sa SDL_RWFromConstMem + * \sa SDL_RWFromFile + * \sa SDL_RWFromFP + * \sa SDL_RWFromMem + * \sa SDL_RWread + * \sa SDL_RWtell + * \sa SDL_RWwrite */ extern DECLSPEC Sint64 SDLCALL SDL_RWseek(SDL_RWops *context, Sint64 offset, int whence); /** - * Return the current offset in the data stream, or -1 on error. + * Determine the current read/write offset in an SDL_RWops data stream. + * + * SDL_RWtell is actually a wrapper function that calls the SDL_RWops's `seek` + * method, with an offset of 0 bytes from `RW_SEEK_CUR`, to simplify + * application development. + * + * Prior to SDL 2.0.10, this function was a macro. + * + * \param context a SDL_RWops data stream object from which to get the current + * offset + * \returns the current offset in the stream, or -1 if the information can not + * be determined. + * + * \since This function is available since SDL 2.0.10. + * + * \sa SDL_RWclose + * \sa SDL_RWFromConstMem + * \sa SDL_RWFromFile + * \sa SDL_RWFromFP + * \sa SDL_RWFromMem + * \sa SDL_RWread + * \sa SDL_RWseek + * \sa SDL_RWwrite */ extern DECLSPEC Sint64 SDLCALL SDL_RWtell(SDL_RWops *context); /** - * Read up to \c maxnum objects each of size \c size from the data - * stream to the area pointed at by \c ptr. + * Read from a data source. * - * \return the number of objects read, or 0 at error or end of file. + * This function reads up to `maxnum` objects each of size `size` from the + * data source to the area pointed at by `ptr`. This function may read less + * objects than requested. It will return zero when there has been an error or + * the data stream is completely read. + * + * SDL_RWread() is actually a function wrapper that calls the SDL_RWops's + * `read` method appropriately, to simplify application development. + * + * Prior to SDL 2.0.10, this function was a macro. + * + * \param context a pointer to an SDL_RWops structure + * \param ptr a pointer to a buffer to read data into + * \param size the size of each object to read, in bytes + * \param maxnum the maximum number of objects to be read + * \returns the number of objects read, or 0 at error or end of file; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.10. + * + * \sa SDL_RWclose + * \sa SDL_RWFromConstMem + * \sa SDL_RWFromFile + * \sa SDL_RWFromFP + * \sa SDL_RWFromMem + * \sa SDL_RWseek + * \sa SDL_RWwrite */ extern DECLSPEC size_t SDLCALL SDL_RWread(SDL_RWops *context, - void *ptr, size_t size, size_t maxnum); + void *ptr, size_t size, + size_t maxnum); /** - * Write exactly \c num objects each of size \c size from the area - * pointed at by \c ptr to data stream. + * Write to an SDL_RWops data stream. * - * \return the number of objects written, or 0 at error or end of file. + * This function writes exactly `num` objects each of size `size` from the + * area pointed at by `ptr` to the stream. If this fails for any reason, it'll + * return less than `num` to demonstrate how far the write progressed. On + * success, it returns `num`. + * + * SDL_RWwrite is actually a function wrapper that calls the SDL_RWops's + * `write` method appropriately, to simplify application development. + * + * Prior to SDL 2.0.10, this function was a macro. + * + * \param context a pointer to an SDL_RWops structure + * \param ptr a pointer to a buffer containing data to write + * \param size the size of an object to write, in bytes + * \param num the number of objects to write + * \returns the number of objects written, which will be less than **num** on + * error; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.10. + * + * \sa SDL_RWclose + * \sa SDL_RWFromConstMem + * \sa SDL_RWFromFile + * \sa SDL_RWFromFP + * \sa SDL_RWFromMem + * \sa SDL_RWread + * \sa SDL_RWseek */ extern DECLSPEC size_t SDLCALL SDL_RWwrite(SDL_RWops *context, - const void *ptr, size_t size, size_t num); + const void *ptr, size_t size, + size_t num); /** - * Close and free an allocated SDL_RWops structure. + * Close and free an allocated SDL_RWops structure. * - * \return 0 if successful or -1 on write error when flushing data. + * SDL_RWclose() closes and cleans up the SDL_RWops stream. It releases any + * resources used by the stream and frees the SDL_RWops itself with + * SDL_FreeRW(). This returns 0 on success, or -1 if the stream failed to + * flush to its output (e.g. to disk). + * + * Note that if this fails to flush the stream to disk, this function reports + * an error, but the SDL_RWops is still invalid once this function returns. + * + * Prior to SDL 2.0.10, this function was a macro. + * + * \param context SDL_RWops structure to close + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.10. + * + * \sa SDL_RWFromConstMem + * \sa SDL_RWFromFile + * \sa SDL_RWFromFP + * \sa SDL_RWFromMem + * \sa SDL_RWread + * \sa SDL_RWseek + * \sa SDL_RWwrite */ extern DECLSPEC int SDLCALL SDL_RWclose(SDL_RWops *context); /** - * Load all the data from an SDL data stream. + * Load all the data from an SDL data stream. * - * The data is allocated with a zero byte at the end (null terminated) + * The data is allocated with a zero byte at the end (null terminated) for + * convenience. This extra byte is not included in the value reported via + * `datasize`. * - * If \c datasize is not NULL, it is filled with the size of the data read. + * The data should be freed with SDL_free(). * - * If \c freesrc is non-zero, the stream will be closed after being read. + * \param src the SDL_RWops to read all available data from + * \param datasize if not NULL, will store the number of bytes read + * \param freesrc if non-zero, calls SDL_RWclose() on `src` before returning + * \returns the data, or NULL if there was an error. * - * The data should be freed with SDL_free(). - * - * \return the data, or NULL if there was an error. + * \since This function is available since SDL 2.0.6. */ -extern DECLSPEC void *SDLCALL SDL_LoadFile_RW(SDL_RWops * src, size_t *datasize, - int freesrc); +extern DECLSPEC void *SDLCALL SDL_LoadFile_RW(SDL_RWops *src, + size_t *datasize, + int freesrc); /** - * Load an entire file. + * Load all the data from a file path. * - * The data is allocated with a zero byte at the end (null terminated) + * The data is allocated with a zero byte at the end (null terminated) for + * convenience. This extra byte is not included in the value reported via + * `datasize`. * - * If \c datasize is not NULL, it is filled with the size of the data read. + * The data should be freed with SDL_free(). * - * If \c freesrc is non-zero, the stream will be closed after being read. + * Prior to SDL 2.0.10, this function was a macro wrapping around + * SDL_LoadFile_RW. * - * The data should be freed with SDL_free(). + * \param file the path to read all available data from + * \param datasize if not NULL, will store the number of bytes read + * \returns the data, or NULL if there was an error. * - * \return the data, or NULL if there was an error. + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC void *SDLCALL SDL_LoadFile(const char *file, size_t *datasize); @@ -256,12 +606,114 @@ extern DECLSPEC void *SDLCALL SDL_LoadFile(const char *file, size_t *datasize); * Read an item of the specified endianness and return in native format. */ /* @{ */ + +/** + * Use this function to read a byte from an SDL_RWops. + * + * \param src the SDL_RWops to read from + * \returns the read byte on success or 0 on failure; call SDL_GetError() for + * more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_WriteU8 + */ extern DECLSPEC Uint8 SDLCALL SDL_ReadU8(SDL_RWops * src); + +/** + * Use this function to read 16 bits of little-endian data from an SDL_RWops + * and return in native format. + * + * SDL byteswaps the data only if necessary, so the data returned will be in + * the native byte order. + * + * \param src the stream from which to read data + * \returns 16 bits of data in the native byte order of the platform. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ReadBE16 + */ extern DECLSPEC Uint16 SDLCALL SDL_ReadLE16(SDL_RWops * src); + +/** + * Use this function to read 16 bits of big-endian data from an SDL_RWops and + * return in native format. + * + * SDL byteswaps the data only if necessary, so the data returned will be in + * the native byte order. + * + * \param src the stream from which to read data + * \returns 16 bits of data in the native byte order of the platform. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ReadLE16 + */ extern DECLSPEC Uint16 SDLCALL SDL_ReadBE16(SDL_RWops * src); + +/** + * Use this function to read 32 bits of little-endian data from an SDL_RWops + * and return in native format. + * + * SDL byteswaps the data only if necessary, so the data returned will be in + * the native byte order. + * + * \param src the stream from which to read data + * \returns 32 bits of data in the native byte order of the platform. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ReadBE32 + */ extern DECLSPEC Uint32 SDLCALL SDL_ReadLE32(SDL_RWops * src); + +/** + * Use this function to read 32 bits of big-endian data from an SDL_RWops and + * return in native format. + * + * SDL byteswaps the data only if necessary, so the data returned will be in + * the native byte order. + * + * \param src the stream from which to read data + * \returns 32 bits of data in the native byte order of the platform. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ReadLE32 + */ extern DECLSPEC Uint32 SDLCALL SDL_ReadBE32(SDL_RWops * src); + +/** + * Use this function to read 64 bits of little-endian data from an SDL_RWops + * and return in native format. + * + * SDL byteswaps the data only if necessary, so the data returned will be in + * the native byte order. + * + * \param src the stream from which to read data + * \returns 64 bits of data in the native byte order of the platform. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ReadBE64 + */ extern DECLSPEC Uint64 SDLCALL SDL_ReadLE64(SDL_RWops * src); + +/** + * Use this function to read 64 bits of big-endian data from an SDL_RWops and + * return in native format. + * + * SDL byteswaps the data only if necessary, so the data returned will be in + * the native byte order. + * + * \param src the stream from which to read data + * \returns 64 bits of data in the native byte order of the platform. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ReadLE64 + */ extern DECLSPEC Uint64 SDLCALL SDL_ReadBE64(SDL_RWops * src); /* @} *//* Read endian functions */ @@ -271,12 +723,124 @@ extern DECLSPEC Uint64 SDLCALL SDL_ReadBE64(SDL_RWops * src); * Write an item of native format to the specified endianness. */ /* @{ */ + +/** + * Use this function to write a byte to an SDL_RWops. + * + * \param dst the SDL_RWops to write to + * \param value the byte value to write + * \returns 1 on success or 0 on failure; call SDL_GetError() for more + * information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ReadU8 + */ extern DECLSPEC size_t SDLCALL SDL_WriteU8(SDL_RWops * dst, Uint8 value); + +/** + * Use this function to write 16 bits in native format to a SDL_RWops as + * little-endian data. + * + * SDL byteswaps the data only if necessary, so the application always + * specifies native format, and the data written will be in little-endian + * format. + * + * \param dst the stream to which data will be written + * \param value the data to be written, in native format + * \returns 1 on successful write, 0 on error. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_WriteBE16 + */ extern DECLSPEC size_t SDLCALL SDL_WriteLE16(SDL_RWops * dst, Uint16 value); + +/** + * Use this function to write 16 bits in native format to a SDL_RWops as + * big-endian data. + * + * SDL byteswaps the data only if necessary, so the application always + * specifies native format, and the data written will be in big-endian format. + * + * \param dst the stream to which data will be written + * \param value the data to be written, in native format + * \returns 1 on successful write, 0 on error. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_WriteLE16 + */ extern DECLSPEC size_t SDLCALL SDL_WriteBE16(SDL_RWops * dst, Uint16 value); + +/** + * Use this function to write 32 bits in native format to a SDL_RWops as + * little-endian data. + * + * SDL byteswaps the data only if necessary, so the application always + * specifies native format, and the data written will be in little-endian + * format. + * + * \param dst the stream to which data will be written + * \param value the data to be written, in native format + * \returns 1 on successful write, 0 on error. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_WriteBE32 + */ extern DECLSPEC size_t SDLCALL SDL_WriteLE32(SDL_RWops * dst, Uint32 value); + +/** + * Use this function to write 32 bits in native format to a SDL_RWops as + * big-endian data. + * + * SDL byteswaps the data only if necessary, so the application always + * specifies native format, and the data written will be in big-endian format. + * + * \param dst the stream to which data will be written + * \param value the data to be written, in native format + * \returns 1 on successful write, 0 on error. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_WriteLE32 + */ extern DECLSPEC size_t SDLCALL SDL_WriteBE32(SDL_RWops * dst, Uint32 value); + +/** + * Use this function to write 64 bits in native format to a SDL_RWops as + * little-endian data. + * + * SDL byteswaps the data only if necessary, so the application always + * specifies native format, and the data written will be in little-endian + * format. + * + * \param dst the stream to which data will be written + * \param value the data to be written, in native format + * \returns 1 on successful write, 0 on error. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_WriteBE64 + */ extern DECLSPEC size_t SDLCALL SDL_WriteLE64(SDL_RWops * dst, Uint64 value); + +/** + * Use this function to write 64 bits in native format to a SDL_RWops as + * big-endian data. + * + * SDL byteswaps the data only if necessary, so the application always + * specifies native format, and the data written will be in big-endian format. + * + * \param dst the stream to which data will be written + * \param value the data to be written, in native format + * \returns 1 on successful write, 0 on error. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_WriteLE64 + */ extern DECLSPEC size_t SDLCALL SDL_WriteBE64(SDL_RWops * dst, Uint64 value); /* @} *//* Write endian functions */ diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_scancode.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_scancode.h index a50305f55..5b2c67c8f 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_scancode.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_scancode.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_sensor.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_sensor.h index 966adbf21..a2f30e0f8 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_sensor.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_sensor.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -78,14 +78,16 @@ typedef enum * Accelerometer sensor * * The accelerometer returns the current acceleration in SI meters per - * second squared. This includes gravity, so a device at rest will have - * an acceleration of SDL_STANDARD_GRAVITY straight down. + * second squared. This measurement includes the force of gravity, so + * a device at rest will have an value of SDL_STANDARD_GRAVITY away + * from the center of the earth. * * values[0]: Acceleration on the x axis * values[1]: Acceleration on the y axis * values[2]: Acceleration on the z axis * - * For phones held in portrait mode, the axes are defined as follows: + * For phones held in portrait mode and game controllers held in front of you, + * the axes are defined as follows: * -X ... +X : left ... right * -Y ... +Y : bottom ... top * -Z ... +Z : farther ... closer @@ -105,16 +107,17 @@ typedef enum * see positive rotation on that axis when it appeared to be rotating * counter-clockwise. * - * values[0]: Angular speed around the x axis - * values[1]: Angular speed around the y axis - * values[2]: Angular speed around the z axis + * values[0]: Angular speed around the x axis (pitch) + * values[1]: Angular speed around the y axis (yaw) + * values[2]: Angular speed around the z axis (roll) * - * For phones held in portrait mode, the axes are defined as follows: + * For phones held in portrait mode and game controllers held in front of you, + * the axes are defined as follows: * -X ... +X : left ... right * -Y ... +Y : bottom ... top * -Z ... +Z : farther ... closer * - * The axis data is not changed when the phone is rotated. + * The axis data is not changed when the phone or controller is rotated. * * \sa SDL_GetDisplayOrientation() */ @@ -122,118 +125,165 @@ typedef enum /* Function prototypes */ /** - * \brief Count the number of sensors attached to the system right now + * Locking for multi-threaded access to the sensor API + * + * If you are using the sensor API or handling events from multiple threads + * you should use these locking functions to protect access to the sensors. + * + * In particular, you are guaranteed that the sensor list won't change, so the + * API functions that take a sensor index will be valid, and sensor events + * will not be delivered. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC void SDLCALL SDL_LockSensors(void); +extern DECLSPEC void SDLCALL SDL_UnlockSensors(void); + +/** + * Count the number of sensors attached to the system right now. + * + * \returns the number of sensors detected. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC int SDLCALL SDL_NumSensors(void); /** - * \brief Get the implementation dependent name of a sensor. + * Get the implementation dependent name of a sensor. * - * This can be called before any sensors are opened. - * - * \return The sensor name, or NULL if device_index is out of range. + * \param device_index The sensor to obtain name from + * \returns the sensor name, or NULL if `device_index` is out of range. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC const char *SDLCALL SDL_SensorGetDeviceName(int device_index); /** - * \brief Get the type of a sensor. + * Get the type of a sensor. * - * This can be called before any sensors are opened. + * \param device_index The sensor to get the type from + * \returns the SDL_SensorType, or `SDL_SENSOR_INVALID` if `device_index` is + * out of range. * - * \return The sensor type, or SDL_SENSOR_INVALID if device_index is out of range. + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC SDL_SensorType SDLCALL SDL_SensorGetDeviceType(int device_index); /** - * \brief Get the platform dependent type of a sensor. + * Get the platform dependent type of a sensor. * - * This can be called before any sensors are opened. + * \param device_index The sensor to check + * \returns the sensor platform dependent type, or -1 if `device_index` is out + * of range. * - * \return The sensor platform dependent type, or -1 if device_index is out of range. + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC int SDLCALL SDL_SensorGetDeviceNonPortableType(int device_index); /** - * \brief Get the instance ID of a sensor. + * Get the instance ID of a sensor. * - * This can be called before any sensors are opened. + * \param device_index The sensor to get instance id from + * \returns the sensor instance ID, or -1 if `device_index` is out of range. * - * \return The sensor instance ID, or -1 if device_index is out of range. + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC SDL_SensorID SDLCALL SDL_SensorGetDeviceInstanceID(int device_index); /** - * \brief Open a sensor for use. + * Open a sensor for use. * - * The index passed as an argument refers to the N'th sensor on the system. + * \param device_index The sensor to open + * \returns an SDL_Sensor sensor object, or NULL if an error occurred. * - * \return A sensor identifier, or NULL if an error occurred. + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC SDL_Sensor *SDLCALL SDL_SensorOpen(int device_index); /** * Return the SDL_Sensor associated with an instance id. + * + * \param instance_id The sensor from instance id + * \returns an SDL_Sensor object. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC SDL_Sensor *SDLCALL SDL_SensorFromInstanceID(SDL_SensorID instance_id); /** - * \brief Get the implementation dependent name of a sensor. + * Get the implementation dependent name of a sensor * - * \return The sensor name, or NULL if the sensor is NULL. + * \param sensor The SDL_Sensor object + * \returns the sensor name, or NULL if `sensor` is NULL. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC const char *SDLCALL SDL_SensorGetName(SDL_Sensor *sensor); /** - * \brief Get the type of a sensor. + * Get the type of a sensor. * - * This can be called before any sensors are opened. + * \param sensor The SDL_Sensor object to inspect + * \returns the SDL_SensorType type, or `SDL_SENSOR_INVALID` if `sensor` is + * NULL. * - * \return The sensor type, or SDL_SENSOR_INVALID if the sensor is NULL. + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC SDL_SensorType SDLCALL SDL_SensorGetType(SDL_Sensor *sensor); /** - * \brief Get the platform dependent type of a sensor. + * Get the platform dependent type of a sensor. * - * This can be called before any sensors are opened. + * \param sensor The SDL_Sensor object to inspect + * \returns the sensor platform dependent type, or -1 if `sensor` is NULL. * - * \return The sensor platform dependent type, or -1 if the sensor is NULL. + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC int SDLCALL SDL_SensorGetNonPortableType(SDL_Sensor *sensor); /** - * \brief Get the instance ID of a sensor. + * Get the instance ID of a sensor. * - * This can be called before any sensors are opened. + * \param sensor The SDL_Sensor object to inspect + * \returns the sensor instance ID, or -1 if `sensor` is NULL. * - * \return The sensor instance ID, or -1 if the sensor is NULL. + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC SDL_SensorID SDLCALL SDL_SensorGetInstanceID(SDL_Sensor *sensor); /** - * Get the current state of an opened sensor. + * Get the current state of an opened sensor. * - * The number of values and interpretation of the data is sensor dependent. + * The number of values and interpretation of the data is sensor dependent. * - * \param sensor The sensor to query - * \param data A pointer filled with the current sensor state - * \param num_values The number of values to write to data + * \param sensor The SDL_Sensor object to query + * \param data A pointer filled with the current sensor state + * \param num_values The number of values to write to data + * \returns 0 or -1 if an error occurred. * - * \return 0 or -1 if an error occurred. + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC int SDLCALL SDL_SensorGetData(SDL_Sensor * sensor, float *data, int num_values); /** - * Close a sensor previously opened with SDL_SensorOpen() + * Close a sensor previously opened with SDL_SensorOpen(). + * + * \param sensor The SDL_Sensor object to close + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC void SDLCALL SDL_SensorClose(SDL_Sensor * sensor); /** - * Update the current state of the open sensors. + * Update the current state of the open sensors. * - * This is called automatically by the event loop if sensor events are enabled. + * This is called automatically by the event loop if sensor events are + * enabled. * - * This needs to be called from the thread that initialized the sensor subsystem. + * This needs to be called from the thread that initialized the sensor + * subsystem. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC void SDLCALL SDL_SensorUpdate(void); diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_shape.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_shape.h index 2ab43fcdc..1bca9270e 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_shape.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_shape.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -44,33 +44,38 @@ extern "C" { #define SDL_WINDOW_LACKS_SHAPE -3 /** - * \brief Create a window that can be shaped with the specified position, dimensions, and flags. + * Create a window that can be shaped with the specified position, dimensions, + * and flags. * - * \param title The title of the window, in UTF-8 encoding. - * \param x The x position of the window, ::SDL_WINDOWPOS_CENTERED, or - * ::SDL_WINDOWPOS_UNDEFINED. - * \param y The y position of the window, ::SDL_WINDOWPOS_CENTERED, or - * ::SDL_WINDOWPOS_UNDEFINED. - * \param w The width of the window. - * \param h The height of the window. - * \param flags The flags for the window, a mask of SDL_WINDOW_BORDERLESS with any of the following: - * ::SDL_WINDOW_OPENGL, ::SDL_WINDOW_INPUT_GRABBED, - * ::SDL_WINDOW_HIDDEN, ::SDL_WINDOW_RESIZABLE, - * ::SDL_WINDOW_MAXIMIZED, ::SDL_WINDOW_MINIMIZED, - * ::SDL_WINDOW_BORDERLESS is always set, and ::SDL_WINDOW_FULLSCREEN is always unset. + * \param title The title of the window, in UTF-8 encoding. + * \param x The x position of the window, ::SDL_WINDOWPOS_CENTERED, or + * ::SDL_WINDOWPOS_UNDEFINED. + * \param y The y position of the window, ::SDL_WINDOWPOS_CENTERED, or + * ::SDL_WINDOWPOS_UNDEFINED. + * \param w The width of the window. + * \param h The height of the window. + * \param flags The flags for the window, a mask of SDL_WINDOW_BORDERLESS with + * any of the following: ::SDL_WINDOW_OPENGL, + * ::SDL_WINDOW_INPUT_GRABBED, ::SDL_WINDOW_HIDDEN, + * ::SDL_WINDOW_RESIZABLE, ::SDL_WINDOW_MAXIMIZED, + * ::SDL_WINDOW_MINIMIZED, ::SDL_WINDOW_BORDERLESS is always set, + * and ::SDL_WINDOW_FULLSCREEN is always unset. + * \return the window created, or NULL if window creation failed. * - * \return The window created, or NULL if window creation failed. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_DestroyWindow() + * \sa SDL_DestroyWindow */ extern DECLSPEC SDL_Window * SDLCALL SDL_CreateShapedWindow(const char *title,unsigned int x,unsigned int y,unsigned int w,unsigned int h,Uint32 flags); /** - * \brief Return whether the given window is a shaped window. + * Return whether the given window is a shaped window. * * \param window The window to query for being shaped. + * \return SDL_TRUE if the window is a window that can be shaped, SDL_FALSE if + * the window is unshaped or NULL. * - * \return SDL_TRUE if the window is a window that can be shaped, SDL_FALSE if the window is unshaped or NULL. + * \since This function is available since SDL 2.0.0. * * \sa SDL_CreateShapedWindow */ @@ -106,29 +111,35 @@ typedef struct SDL_WindowShapeMode { } SDL_WindowShapeMode; /** - * \brief Set the shape and parameters of a shaped window. + * Set the shape and parameters of a shaped window. * * \param window The shaped window whose parameters should be set. * \param shape A surface encoding the desired shape for the window. * \param shape_mode The parameters to set for the shaped window. + * \return 0 on success, SDL_INVALID_SHAPE_ARGUMENT on an invalid shape + * argument, or SDL_NONSHAPEABLE_WINDOW if the SDL_Window given does + * not reference a valid shaped window. * - * \return 0 on success, SDL_INVALID_SHAPE_ARGUMENT on an invalid shape argument, or SDL_NONSHAPEABLE_WINDOW - * if the SDL_Window given does not reference a valid shaped window. + * \since This function is available since SDL 2.0.0. * * \sa SDL_WindowShapeMode - * \sa SDL_GetShapedWindowMode. + * \sa SDL_GetShapedWindowMode */ extern DECLSPEC int SDLCALL SDL_SetWindowShape(SDL_Window *window,SDL_Surface *shape,SDL_WindowShapeMode *shape_mode); /** - * \brief Get the shape parameters of a shaped window. + * Get the shape parameters of a shaped window. * * \param window The shaped window whose parameters should be retrieved. - * \param shape_mode An empty shape-mode structure to fill, or NULL to check whether the window has a shape. + * \param shape_mode An empty shape-mode structure to fill, or NULL to check + * whether the window has a shape. + * \return 0 if the window has a shape and, provided shape_mode was not NULL, + * shape_mode has been filled with the mode data, + * SDL_NONSHAPEABLE_WINDOW if the SDL_Window given is not a shaped + * window, or SDL_WINDOW_LACKS_SHAPE if the SDL_Window given is a + * shapeable window currently lacking a shape. * - * \return 0 if the window has a shape and, provided shape_mode was not NULL, shape_mode has been filled with the mode - * data, SDL_NONSHAPEABLE_WINDOW if the SDL_Window given is not a shaped window, or SDL_WINDOW_LACKS_SHAPE if - * the SDL_Window given is a shapeable window currently lacking a shape. + * \since This function is available since SDL 2.0.0. * * \sa SDL_WindowShapeMode * \sa SDL_SetWindowShape diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_stdinc.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_stdinc.h index 28bb7b961..c0d194c4a 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_stdinc.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_stdinc.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -30,6 +30,12 @@ #include "SDL_config.h" +#ifdef __APPLE__ +#ifndef _DARWIN_C_SOURCE +#define _DARWIN_C_SOURCE 1 /* for memset_pattern4() */ +#endif +#endif + #ifdef HAVE_SYS_TYPES_H #include #endif @@ -109,6 +115,17 @@ char *alloca(); # endif #endif +/** + * Check if the compiler supports a given builtin. + * Supported by virtually all clang versions and recent gcc. Use this + * instead of checking the clang version if possible. + */ +#ifdef __has_builtin +#define _SDL_HAS_BUILTIN(x) __has_builtin(x) +#else +#define _SDL_HAS_BUILTIN(x) 0 +#endif + /** * The number of elements in an array. */ @@ -217,7 +234,7 @@ typedef uint64_t Uint64; /* @} *//* Basic data types */ -/* Make sure we have macros for printing 64 bit values. +/* Make sure we have macros for printing width-based integers. * should define these but this is not true all platforms. * (for example win32) */ #ifndef SDL_PRIs64 @@ -264,6 +281,34 @@ typedef uint64_t Uint64; #define SDL_PRIX64 "llX" #endif #endif +#ifndef SDL_PRIs32 +#ifdef PRId32 +#define SDL_PRIs32 PRId32 +#else +#define SDL_PRIs32 "d" +#endif +#endif +#ifndef SDL_PRIu32 +#ifdef PRIu32 +#define SDL_PRIu32 PRIu32 +#else +#define SDL_PRIu32 "u" +#endif +#endif +#ifndef SDL_PRIx32 +#ifdef PRIx32 +#define SDL_PRIx32 PRIx32 +#else +#define SDL_PRIx32 "x" +#endif +#endif +#ifndef SDL_PRIX32 +#ifdef PRIX32 +#define SDL_PRIX32 PRIX32 +#else +#define SDL_PRIX32 "X" +#endif +#endif /* Annotations to help code analysis tools */ #ifdef SDL_DISABLE_ANALYZE_MACROS @@ -332,7 +377,7 @@ SDL_COMPILE_TIME_ASSERT(sint64, sizeof(Sint64) == 8); /** \cond */ #ifndef DOXYGEN_SHOULD_IGNORE_THIS -#if !defined(__ANDROID__) +#if !defined(__ANDROID__) && !defined(__VITA__) /* TODO: include/SDL_stdinc.h:174: error: size of array 'SDL_dummy_enum' is negative */ typedef enum { @@ -369,7 +414,9 @@ typedef void *(SDLCALL *SDL_realloc_func)(void *mem, size_t size); typedef void (SDLCALL *SDL_free_func)(void *mem); /** - * \brief Get the current set of SDL memory functions + * Get the current set of SDL memory functions + * + * \since This function is available since SDL 2.0.7. */ extern DECLSPEC void SDLCALL SDL_GetMemoryFunctions(SDL_malloc_func *malloc_func, SDL_calloc_func *calloc_func, @@ -377,12 +424,9 @@ extern DECLSPEC void SDLCALL SDL_GetMemoryFunctions(SDL_malloc_func *malloc_func SDL_free_func *free_func); /** - * \brief Replace SDL's memory allocation functions with a custom set + * Replace SDL's memory allocation functions with a custom set * - * \note If you are replacing SDL's memory functions, you should call - * SDL_GetNumAllocations() and be very careful if it returns non-zero. - * That means that your free function will be called with memory - * allocated by the previous memory allocation functions. + * \since This function is available since SDL 2.0.7. */ extern DECLSPEC int SDLCALL SDL_SetMemoryFunctions(SDL_malloc_func malloc_func, SDL_calloc_func calloc_func, @@ -390,7 +434,9 @@ extern DECLSPEC int SDLCALL SDL_SetMemoryFunctions(SDL_malloc_func malloc_func, SDL_free_func free_func); /** - * \brief Get the number of outstanding (unfreed) allocations + * Get the number of outstanding (unfreed) allocations + * + * \since This function is available since SDL 2.0.7. */ extern DECLSPEC int SDLCALL SDL_GetNumAllocations(void); @@ -401,25 +447,40 @@ extern DECLSPEC void SDLCALL SDL_qsort(void *base, size_t nmemb, size_t size, in extern DECLSPEC int SDLCALL SDL_abs(int x); -/* !!! FIXME: these have side effects. You probably shouldn't use them. */ -/* !!! FIXME: Maybe we do forceinline functions of SDL_mini, SDL_minf, etc? */ +/* NOTE: these double-evaluate their arguments, so you should never have side effects in the parameters */ #define SDL_min(x, y) (((x) < (y)) ? (x) : (y)) #define SDL_max(x, y) (((x) > (y)) ? (x) : (y)) +#define SDL_clamp(x, a, b) (((x) < (a)) ? (a) : (((x) > (b)) ? (b) : (x))) +extern DECLSPEC int SDLCALL SDL_isalpha(int x); +extern DECLSPEC int SDLCALL SDL_isalnum(int x); +extern DECLSPEC int SDLCALL SDL_isblank(int x); +extern DECLSPEC int SDLCALL SDL_iscntrl(int x); extern DECLSPEC int SDLCALL SDL_isdigit(int x); +extern DECLSPEC int SDLCALL SDL_isxdigit(int x); +extern DECLSPEC int SDLCALL SDL_ispunct(int x); extern DECLSPEC int SDLCALL SDL_isspace(int x); +extern DECLSPEC int SDLCALL SDL_isupper(int x); +extern DECLSPEC int SDLCALL SDL_islower(int x); +extern DECLSPEC int SDLCALL SDL_isprint(int x); +extern DECLSPEC int SDLCALL SDL_isgraph(int x); extern DECLSPEC int SDLCALL SDL_toupper(int x); extern DECLSPEC int SDLCALL SDL_tolower(int x); +extern DECLSPEC Uint32 SDLCALL SDL_crc32(Uint32 crc, const void *data, size_t len); + extern DECLSPEC void *SDLCALL SDL_memset(SDL_OUT_BYTECAP(len) void *dst, int c, size_t len); #define SDL_zero(x) SDL_memset(&(x), 0, sizeof((x))) #define SDL_zerop(x) SDL_memset((x), 0, sizeof(*(x))) +#define SDL_zeroa(x) SDL_memset((x), 0, sizeof((x))) /* Note that memset() is a byte assignment and this is a 32-bit assignment, so they're not directly equivalent. */ SDL_FORCE_INLINE void SDL_memset4(void *dst, Uint32 val, size_t dwords) { -#if defined(__GNUC__) && defined(i386) +#ifdef __APPLE__ + memset_pattern4(dst, &val, dwords * 4); +#elif defined(__GNUC__) && defined(__i386__) int u0, u1, u2; __asm__ __volatile__ ( "cld \n\t" @@ -432,14 +493,14 @@ SDL_FORCE_INLINE void SDL_memset4(void *dst, Uint32 val, size_t dwords) size_t _n = (dwords + 3) / 4; Uint32 *_p = SDL_static_cast(Uint32 *, dst); Uint32 _val = (val); - if (dwords == 0) + if (dwords == 0) { return; - switch (dwords % 4) - { - case 0: do { *_p++ = _val; /* fallthrough */ - case 3: *_p++ = _val; /* fallthrough */ - case 2: *_p++ = _val; /* fallthrough */ - case 1: *_p++ = _val; /* fallthrough */ + } + switch (dwords % 4) { + case 0: do { *_p++ = _val; SDL_FALLTHROUGH; + case 3: *_p++ = _val; SDL_FALLTHROUGH; + case 2: *_p++ = _val; SDL_FALLTHROUGH; + case 1: *_p++ = _val; } while ( --_n ); } #endif @@ -450,11 +511,16 @@ extern DECLSPEC void *SDLCALL SDL_memcpy(SDL_OUT_BYTECAP(len) void *dst, SDL_IN_ extern DECLSPEC void *SDLCALL SDL_memmove(SDL_OUT_BYTECAP(len) void *dst, SDL_IN_BYTECAP(len) const void *src, size_t len); extern DECLSPEC int SDLCALL SDL_memcmp(const void *s1, const void *s2, size_t len); -extern DECLSPEC wchar_t *SDLCALL SDL_wcsdup(const wchar_t *wstr); extern DECLSPEC size_t SDLCALL SDL_wcslen(const wchar_t *wstr); extern DECLSPEC size_t SDLCALL SDL_wcslcpy(SDL_OUT_Z_CAP(maxlen) wchar_t *dst, const wchar_t *src, size_t maxlen); extern DECLSPEC size_t SDLCALL SDL_wcslcat(SDL_INOUT_Z_CAP(maxlen) wchar_t *dst, const wchar_t *src, size_t maxlen); +extern DECLSPEC wchar_t *SDLCALL SDL_wcsdup(const wchar_t *wstr); +extern DECLSPEC wchar_t *SDLCALL SDL_wcsstr(const wchar_t *haystack, const wchar_t *needle); + extern DECLSPEC int SDLCALL SDL_wcscmp(const wchar_t *str1, const wchar_t *str2); +extern DECLSPEC int SDLCALL SDL_wcsncmp(const wchar_t *str1, const wchar_t *str2, size_t maxlen); +extern DECLSPEC int SDLCALL SDL_wcscasecmp(const wchar_t *str1, const wchar_t *str2); +extern DECLSPEC int SDLCALL SDL_wcsncasecmp(const wchar_t *str1, const wchar_t *str2, size_t len); extern DECLSPEC size_t SDLCALL SDL_strlen(const char *str); extern DECLSPEC size_t SDLCALL SDL_strlcpy(SDL_OUT_Z_CAP(maxlen) char *dst, const char *src, size_t maxlen); @@ -467,6 +533,7 @@ extern DECLSPEC char *SDLCALL SDL_strlwr(char *str); extern DECLSPEC char *SDLCALL SDL_strchr(const char *str, int c); extern DECLSPEC char *SDLCALL SDL_strrchr(const char *str, int c); extern DECLSPEC char *SDLCALL SDL_strstr(const char *haystack, const char *needle); +extern DECLSPEC char *SDLCALL SDL_strtokr(char *s1, const char *s2, char **saveptr); extern DECLSPEC size_t SDLCALL SDL_utf8strlen(const char *str); extern DECLSPEC char *SDLCALL SDL_itoa(int value, char *str, int radix); @@ -493,6 +560,8 @@ extern DECLSPEC int SDLCALL SDL_sscanf(const char *text, SDL_SCANF_FORMAT_STRING extern DECLSPEC int SDLCALL SDL_vsscanf(const char *text, const char *fmt, va_list ap); extern DECLSPEC int SDLCALL SDL_snprintf(SDL_OUT_Z_CAP(maxlen) char *text, size_t maxlen, SDL_PRINTF_FORMAT_STRING const char *fmt, ... ) SDL_PRINTF_VARARG_FUNC(3); extern DECLSPEC int SDLCALL SDL_vsnprintf(SDL_OUT_Z_CAP(maxlen) char *text, size_t maxlen, const char *fmt, va_list ap); +extern DECLSPEC int SDLCALL SDL_asprintf(char **strp, SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(2); +extern DECLSPEC int SDLCALL SDL_vasprintf(char **strp, const char *fmt, va_list ap); #ifndef HAVE_M_PI #ifndef M_PI @@ -500,14 +569,28 @@ extern DECLSPEC int SDLCALL SDL_vsnprintf(SDL_OUT_Z_CAP(maxlen) char *text, size #endif #endif +/** + * Use this function to compute arc cosine of `x`. + * + * The definition of `y = acos(x)` is `x = cos(y)`. + * + * Domain: `-1 <= x <= 1` + * + * Range: `0 <= y <= Pi` + * + * \param x floating point value, in radians. + * \returns arc cosine of `x`. + * + * \since This function is available since SDL 2.0.2. + */ extern DECLSPEC double SDLCALL SDL_acos(double x); extern DECLSPEC float SDLCALL SDL_acosf(float x); extern DECLSPEC double SDLCALL SDL_asin(double x); extern DECLSPEC float SDLCALL SDL_asinf(float x); extern DECLSPEC double SDLCALL SDL_atan(double x); extern DECLSPEC float SDLCALL SDL_atanf(float x); -extern DECLSPEC double SDLCALL SDL_atan2(double x, double y); -extern DECLSPEC float SDLCALL SDL_atan2f(float x, float y); +extern DECLSPEC double SDLCALL SDL_atan2(double y, double x); +extern DECLSPEC float SDLCALL SDL_atan2f(float y, float x); extern DECLSPEC double SDLCALL SDL_ceil(double x); extern DECLSPEC float SDLCALL SDL_ceilf(float x); extern DECLSPEC double SDLCALL SDL_copysign(double x, double y); @@ -520,6 +603,8 @@ extern DECLSPEC double SDLCALL SDL_fabs(double x); extern DECLSPEC float SDLCALL SDL_fabsf(float x); extern DECLSPEC double SDLCALL SDL_floor(double x); extern DECLSPEC float SDLCALL SDL_floorf(float x); +extern DECLSPEC double SDLCALL SDL_trunc(double x); +extern DECLSPEC float SDLCALL SDL_truncf(float x); extern DECLSPEC double SDLCALL SDL_fmod(double x, double y); extern DECLSPEC float SDLCALL SDL_fmodf(float x, float y); extern DECLSPEC double SDLCALL SDL_log(double x); @@ -528,6 +613,10 @@ extern DECLSPEC double SDLCALL SDL_log10(double x); extern DECLSPEC float SDLCALL SDL_log10f(float x); extern DECLSPEC double SDLCALL SDL_pow(double x, double y); extern DECLSPEC float SDLCALL SDL_powf(float x, float y); +extern DECLSPEC double SDLCALL SDL_round(double x); +extern DECLSPEC float SDLCALL SDL_roundf(float x); +extern DECLSPEC long SDLCALL SDL_lround(double x); +extern DECLSPEC long SDLCALL SDL_lroundf(float x); extern DECLSPEC double SDLCALL SDL_scalbn(double x, int n); extern DECLSPEC float SDLCALL SDL_scalbnf(float x, int n); extern DECLSPEC double SDLCALL SDL_sin(double x); @@ -551,9 +640,12 @@ extern DECLSPEC int SDLCALL SDL_iconv_close(SDL_iconv_t cd); extern DECLSPEC size_t SDLCALL SDL_iconv(SDL_iconv_t cd, const char **inbuf, size_t * inbytesleft, char **outbuf, size_t * outbytesleft); + /** - * This function converts a string between encodings in one pass, returning a - * string that must be freed with SDL_free() or NULL on error. + * This function converts a string between encodings in one pass, returning a + * string that must be freed with SDL_free() or NULL on error. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC char *SDLCALL SDL_iconv_string(const char *tocode, const char *fromcode, @@ -562,10 +654,22 @@ extern DECLSPEC char *SDLCALL SDL_iconv_string(const char *tocode, #define SDL_iconv_utf8_locale(S) SDL_iconv_string("", "UTF-8", S, SDL_strlen(S)+1) #define SDL_iconv_utf8_ucs2(S) (Uint16 *)SDL_iconv_string("UCS-2-INTERNAL", "UTF-8", S, SDL_strlen(S)+1) #define SDL_iconv_utf8_ucs4(S) (Uint32 *)SDL_iconv_string("UCS-4-INTERNAL", "UTF-8", S, SDL_strlen(S)+1) +#define SDL_iconv_wchar_utf8(S) SDL_iconv_string("UTF-8", "WCHAR_T", (char *)S, (SDL_wcslen(S)+1)*sizeof(wchar_t)) /* force builds using Clang's static analysis tools to use literal C runtime here, since there are possibly tests that are ineffective otherwise. */ #if defined(__clang_analyzer__) && !defined(SDL_DISABLE_ANALYZE_MACROS) + +/* The analyzer knows about strlcpy even when the system doesn't provide it */ +#ifndef HAVE_STRLCPY +size_t strlcpy(char* dst, const char* src, size_t size); +#endif + +/* The analyzer knows about strlcat even when the system doesn't provide it */ +#ifndef HAVE_STRLCAT +size_t strlcat(char* dst, const char* src, size_t size); +#endif + #define SDL_malloc malloc #define SDL_calloc calloc #define SDL_realloc realloc @@ -574,15 +678,23 @@ extern DECLSPEC char *SDLCALL SDL_iconv_string(const char *tocode, #define SDL_memcpy memcpy #define SDL_memmove memmove #define SDL_memcmp memcmp -#define SDL_strlen strlen #define SDL_strlcpy strlcpy #define SDL_strlcat strlcat +#define SDL_strlen strlen +#define SDL_wcslen wcslen +#define SDL_wcslcpy wcslcpy +#define SDL_wcslcat wcslcat #define SDL_strdup strdup +#define SDL_wcsdup wcsdup #define SDL_strchr strchr #define SDL_strrchr strrchr #define SDL_strstr strstr +#define SDL_wcsstr wcsstr +#define SDL_strtokr strtok_r #define SDL_strcmp strcmp +#define SDL_wcscmp wcscmp #define SDL_strncmp strncmp +#define SDL_wcsncmp wcsncmp #define SDL_strcasecmp strcasecmp #define SDL_strncasecmp strncasecmp #define SDL_sscanf sscanf diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_surface.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_surface.h index 51a128300..441237617 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_surface.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_surface.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -80,7 +80,9 @@ typedef struct SDL_Surface /** information needed for surfaces requiring locks */ int locked; /**< Read-only */ - void *lock_data; /**< Read-only */ + + /** list of BlitMap that hold a reference to this surface */ + void *list_blitmap; /**< Private */ /** clipping information */ SDL_Rect clip_rect; /**< Read-only */ @@ -110,31 +112,108 @@ typedef enum } SDL_YUV_CONVERSION_MODE; /** - * Allocate and free an RGB surface. + * Allocate a new RGB surface. * - * If the depth is 4 or 8 bits, an empty palette is allocated for the surface. - * If the depth is greater than 8 bits, the pixel format is set using the - * flags '[RGB]mask'. + * If `depth` is 4 or 8 bits, an empty palette is allocated for the surface. + * If `depth` is greater than 8 bits, the pixel format is set using the + * [RGBA]mask parameters. * - * If the function runs out of memory, it will return NULL. + * The [RGBA]mask parameters are the bitmasks used to extract that color from + * a pixel. For instance, `Rmask` being 0xFF000000 means the red data is + * stored in the most significant byte. Using zeros for the RGB masks sets a + * default value, based on the depth. For example: * - * \param flags The \c flags are obsolete and should be set to 0. - * \param width The width in pixels of the surface to create. - * \param height The height in pixels of the surface to create. - * \param depth The depth in bits of the surface to create. - * \param Rmask The red mask of the surface to create. - * \param Gmask The green mask of the surface to create. - * \param Bmask The blue mask of the surface to create. - * \param Amask The alpha mask of the surface to create. + * ```c++ + * SDL_CreateRGBSurface(0,w,h,32,0,0,0,0); + * ``` + * + * However, using zero for the Amask results in an Amask of 0. + * + * By default surfaces with an alpha mask are set up for blending as with: + * + * ```c++ + * SDL_SetSurfaceBlendMode(surface, SDL_BLENDMODE_BLEND) + * ``` + * + * You can change this by calling SDL_SetSurfaceBlendMode() and selecting a + * different `blendMode`. + * + * \param flags the flags are unused and should be set to 0 + * \param width the width of the surface + * \param height the height of the surface + * \param depth the depth of the surface in bits + * \param Rmask the red mask for the pixels + * \param Gmask the green mask for the pixels + * \param Bmask the blue mask for the pixels + * \param Amask the alpha mask for the pixels + * \returns the new SDL_Surface structure that is created or NULL if it fails; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateRGBSurfaceFrom + * \sa SDL_CreateRGBSurfaceWithFormat + * \sa SDL_FreeSurface */ extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurface (Uint32 flags, int width, int height, int depth, Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask); + /* !!! FIXME for 2.1: why does this ask for depth? Format provides that. */ + +/** + * Allocate a new RGB surface with a specific pixel format. + * + * This function operates mostly like SDL_CreateRGBSurface(), except instead + * of providing pixel color masks, you provide it with a predefined format + * from SDL_PixelFormatEnum. + * + * \param flags the flags are unused and should be set to 0 + * \param width the width of the surface + * \param height the height of the surface + * \param depth the depth of the surface in bits + * \param format the SDL_PixelFormatEnum for the new surface's pixel format. + * \returns the new SDL_Surface structure that is created or NULL if it fails; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.5. + * + * \sa SDL_CreateRGBSurface + * \sa SDL_CreateRGBSurfaceFrom + * \sa SDL_FreeSurface + */ extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurfaceWithFormat (Uint32 flags, int width, int height, int depth, Uint32 format); +/** + * Allocate a new RGB surface with existing pixel data. + * + * This function operates mostly like SDL_CreateRGBSurface(), except it does + * not allocate memory for the pixel data, instead the caller provides an + * existing buffer of data for the surface to use. + * + * No copy is made of the pixel data. Pixel data is not managed automatically; + * you must free the surface before you free the pixel data. + * + * \param pixels a pointer to existing pixel data + * \param width the width of the surface + * \param height the height of the surface + * \param depth the depth of the surface in bits + * \param pitch the pitch of the surface in bytes + * \param Rmask the red mask for the pixels + * \param Gmask the green mask for the pixels + * \param Bmask the blue mask for the pixels + * \param Amask the alpha mask for the pixels + * \returns the new SDL_Surface structure that is created or NULL if it fails; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateRGBSurface + * \sa SDL_CreateRGBSurfaceWithFormat + * \sa SDL_FreeSurface + */ extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurfaceFrom(void *pixels, int width, int height, @@ -144,74 +223,154 @@ extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurfaceFrom(void *pixels, Uint32 Gmask, Uint32 Bmask, Uint32 Amask); + +/* !!! FIXME for 2.1: why does this ask for depth? Format provides that. */ + +/** + * Allocate a new RGB surface with with a specific pixel format and existing + * pixel data. + * + * This function operates mostly like SDL_CreateRGBSurfaceFrom(), except + * instead of providing pixel color masks, you provide it with a predefined + * format from SDL_PixelFormatEnum. + * + * No copy is made of the pixel data. Pixel data is not managed automatically; + * you must free the surface before you free the pixel data. + * + * \param pixels a pointer to existing pixel data + * \param width the width of the surface + * \param height the height of the surface + * \param depth the depth of the surface in bits + * \param pitch the pitch of the surface in bytes + * \param format the SDL_PixelFormatEnum for the new surface's pixel format. + * \returns the new SDL_Surface structure that is created or NULL if it fails; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.5. + * + * \sa SDL_CreateRGBSurfaceFrom + * \sa SDL_CreateRGBSurfaceWithFormat + * \sa SDL_FreeSurface + */ extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurfaceWithFormatFrom (void *pixels, int width, int height, int depth, int pitch, Uint32 format); + +/** + * Free an RGB surface. + * + * It is safe to pass NULL to this function. + * + * \param surface the SDL_Surface to free. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateRGBSurface + * \sa SDL_CreateRGBSurfaceFrom + * \sa SDL_LoadBMP + * \sa SDL_LoadBMP_RW + */ extern DECLSPEC void SDLCALL SDL_FreeSurface(SDL_Surface * surface); /** - * \brief Set the palette used by a surface. + * Set the palette used by a surface. * - * \return 0, or -1 if the surface format doesn't use a palette. + * A single palette can be shared with many surfaces. * - * \note A single palette can be shared with many surfaces. + * \param surface the SDL_Surface structure to update + * \param palette the SDL_Palette structure to use + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC int SDLCALL SDL_SetSurfacePalette(SDL_Surface * surface, SDL_Palette * palette); /** - * \brief Sets up a surface for directly accessing the pixels. + * Set up a surface for directly accessing the pixels. * - * Between calls to SDL_LockSurface() / SDL_UnlockSurface(), you can write - * to and read from \c surface->pixels, using the pixel format stored in - * \c surface->format. Once you are done accessing the surface, you should - * use SDL_UnlockSurface() to release it. + * Between calls to SDL_LockSurface() / SDL_UnlockSurface(), you can write to + * and read from `surface->pixels`, using the pixel format stored in + * `surface->format`. Once you are done accessing the surface, you should use + * SDL_UnlockSurface() to release it. * - * Not all surfaces require locking. If SDL_MUSTLOCK(surface) evaluates - * to 0, then you can read and write to the surface at any time, and the - * pixel format of the surface will not change. + * Not all surfaces require locking. If `SDL_MUSTLOCK(surface)` evaluates to + * 0, then you can read and write to the surface at any time, and the pixel + * format of the surface will not change. * - * No operating system or library calls should be made between lock/unlock - * pairs, as critical system locks may be held during this time. + * \param surface the SDL_Surface structure to be locked + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * SDL_LockSurface() returns 0, or -1 if the surface couldn't be locked. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_UnlockSurface() + * \sa SDL_MUSTLOCK + * \sa SDL_UnlockSurface */ extern DECLSPEC int SDLCALL SDL_LockSurface(SDL_Surface * surface); -/** \sa SDL_LockSurface() */ + +/** + * Release a surface after directly accessing the pixels. + * + * \param surface the SDL_Surface structure to be unlocked + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LockSurface + */ extern DECLSPEC void SDLCALL SDL_UnlockSurface(SDL_Surface * surface); /** - * Load a surface from a seekable SDL data stream (memory or file). + * Load a BMP image from a seekable SDL data stream. * - * If \c freesrc is non-zero, the stream will be closed after being read. + * The new surface should be freed with SDL_FreeSurface(). Not doing so will + * result in a memory leak. * - * The new surface should be freed with SDL_FreeSurface(). + * src is an open SDL_RWops buffer, typically loaded with SDL_RWFromFile. + * Alternitavely, you might also use the macro SDL_LoadBMP to load a bitmap + * from a file, convert it to an SDL_Surface and then close the file. * - * \return the new surface, or NULL if there was an error. + * \param src the data stream for the surface + * \param freesrc non-zero to close the stream after being read + * \returns a pointer to a new SDL_Surface structure or NULL if there was an + * error; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_FreeSurface + * \sa SDL_RWFromFile + * \sa SDL_LoadBMP + * \sa SDL_SaveBMP_RW */ extern DECLSPEC SDL_Surface *SDLCALL SDL_LoadBMP_RW(SDL_RWops * src, int freesrc); /** - * Load a surface from a file. + * Load a surface from a file. * - * Convenience macro. + * Convenience macro. */ #define SDL_LoadBMP(file) SDL_LoadBMP_RW(SDL_RWFromFile(file, "rb"), 1) /** - * Save a surface to a seekable SDL data stream (memory or file). + * Save a surface to a seekable SDL data stream in BMP format. * - * Surfaces with a 24-bit, 32-bit and paletted 8-bit format get saved in the - * BMP directly. Other RGB formats with 8-bit or higher get converted to a - * 24-bit surface or, if they have an alpha mask or a colorkey, to a 32-bit - * surface before they are saved. YUV and paletted 1-bit and 4-bit formats are - * not supported. + * Surfaces with a 24-bit, 32-bit and paletted 8-bit format get saved in the + * BMP directly. Other RGB formats with 8-bit or higher get converted to a + * 24-bit surface or, if they have an alpha mask or a colorkey, to a 32-bit + * surface before they are saved. YUV and paletted 1-bit and 4-bit formats are + * not supported. * - * If \c freedst is non-zero, the stream will be closed after being written. + * \param surface the SDL_Surface structure containing the image to be saved + * \param dst a data stream to save to + * \param freedst non-zero to close the stream after being written + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 if successful or -1 if there was an error. + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LoadBMP_RW + * \sa SDL_SaveBMP */ extern DECLSPEC int SDLCALL SDL_SaveBMP_RW (SDL_Surface * surface, SDL_RWops * dst, int freedst); @@ -225,183 +384,335 @@ extern DECLSPEC int SDLCALL SDL_SaveBMP_RW SDL_SaveBMP_RW(surface, SDL_RWFromFile(file, "wb"), 1) /** - * \brief Sets the RLE acceleration hint for a surface. + * Set the RLE acceleration hint for a surface. * - * \return 0 on success, or -1 if the surface is not valid + * If RLE is enabled, color key and alpha blending blits are much faster, but + * the surface must be locked before directly accessing the pixels. * - * \note If RLE is enabled, colorkey and alpha blending blits are much faster, - * but the surface must be locked before directly accessing the pixels. + * \param surface the SDL_Surface structure to optimize + * \param flag 0 to disable, non-zero to enable RLE acceleration + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_BlitSurface + * \sa SDL_LockSurface + * \sa SDL_UnlockSurface */ extern DECLSPEC int SDLCALL SDL_SetSurfaceRLE(SDL_Surface * surface, int flag); /** - * \brief Sets the color key (transparent pixel) in a blittable surface. + * Returns whether the surface is RLE enabled * - * \param surface The surface to update - * \param flag Non-zero to enable colorkey and 0 to disable colorkey - * \param key The transparent pixel in the native surface format + * It is safe to pass a NULL `surface` here; it will return SDL_FALSE. * - * \return 0 on success, or -1 if the surface is not valid + * \param surface the SDL_Surface structure to query + * \returns SDL_TRUE if the surface is RLE enabled, SDL_FALSE otherwise. * - * You can pass SDL_RLEACCEL to enable RLE accelerated blits. + * \since This function is available since SDL 2.0.14. + * + * \sa SDL_SetSurfaceRLE + */ +extern DECLSPEC SDL_bool SDLCALL SDL_HasSurfaceRLE(SDL_Surface * surface); + +/** + * Set the color key (transparent pixel) in a surface. + * + * The color key defines a pixel value that will be treated as transparent in + * a blit. For example, one can use this to specify that cyan pixels should be + * considered transparent, and therefore not rendered. + * + * It is a pixel of the format used by the surface, as generated by + * SDL_MapRGB(). + * + * RLE acceleration can substantially speed up blitting of images with large + * horizontal runs of transparent pixels. See SDL_SetSurfaceRLE() for details. + * + * \param surface the SDL_Surface structure to update + * \param flag SDL_TRUE to enable color key, SDL_FALSE to disable color key + * \param key the transparent pixel + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_BlitSurface + * \sa SDL_GetColorKey */ extern DECLSPEC int SDLCALL SDL_SetColorKey(SDL_Surface * surface, int flag, Uint32 key); /** - * \brief Returns whether the surface has a color key + * Returns whether the surface has a color key * - * \return SDL_TRUE if the surface has a color key, or SDL_FALSE if the surface is NULL or has no color key + * It is safe to pass a NULL `surface` here; it will return SDL_FALSE. + * + * \param surface the SDL_Surface structure to query + * \return SDL_TRUE if the surface has a color key, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.9. + * + * \sa SDL_SetColorKey + * \sa SDL_GetColorKey */ extern DECLSPEC SDL_bool SDLCALL SDL_HasColorKey(SDL_Surface * surface); /** - * \brief Gets the color key (transparent pixel) in a blittable surface. + * Get the color key (transparent pixel) for a surface. * - * \param surface The surface to update - * \param key A pointer filled in with the transparent pixel in the native - * surface format + * The color key is a pixel of the format used by the surface, as generated by + * SDL_MapRGB(). * - * \return 0 on success, or -1 if the surface is not valid or colorkey is not - * enabled. + * If the surface doesn't have color key enabled this function returns -1. + * + * \param surface the SDL_Surface structure to query + * \param key a pointer filled in with the transparent pixel + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_BlitSurface + * \sa SDL_SetColorKey */ extern DECLSPEC int SDLCALL SDL_GetColorKey(SDL_Surface * surface, Uint32 * key); /** - * \brief Set an additional color value used in blit operations. + * Set an additional color value multiplied into blit operations. * - * \param surface The surface to update. - * \param r The red color value multiplied into blit operations. - * \param g The green color value multiplied into blit operations. - * \param b The blue color value multiplied into blit operations. + * When this surface is blitted, during the blit operation each source color + * channel is modulated by the appropriate color value according to the + * following formula: * - * \return 0 on success, or -1 if the surface is not valid. + * `srcC = srcC * (color / 255)` * - * \sa SDL_GetSurfaceColorMod() + * \param surface the SDL_Surface structure to update + * \param r the red color value multiplied into blit operations + * \param g the green color value multiplied into blit operations + * \param b the blue color value multiplied into blit operations + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetSurfaceColorMod + * \sa SDL_SetSurfaceAlphaMod */ extern DECLSPEC int SDLCALL SDL_SetSurfaceColorMod(SDL_Surface * surface, Uint8 r, Uint8 g, Uint8 b); /** - * \brief Get the additional color value used in blit operations. + * Get the additional color value multiplied into blit operations. * - * \param surface The surface to query. - * \param r A pointer filled in with the current red color value. - * \param g A pointer filled in with the current green color value. - * \param b A pointer filled in with the current blue color value. + * \param surface the SDL_Surface structure to query + * \param r a pointer filled in with the current red color value + * \param g a pointer filled in with the current green color value + * \param b a pointer filled in with the current blue color value + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 if the surface is not valid. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_SetSurfaceColorMod() + * \sa SDL_GetSurfaceAlphaMod + * \sa SDL_SetSurfaceColorMod */ extern DECLSPEC int SDLCALL SDL_GetSurfaceColorMod(SDL_Surface * surface, Uint8 * r, Uint8 * g, Uint8 * b); /** - * \brief Set an additional alpha value used in blit operations. + * Set an additional alpha value used in blit operations. * - * \param surface The surface to update. - * \param alpha The alpha value multiplied into blit operations. + * When this surface is blitted, during the blit operation the source alpha + * value is modulated by this alpha value according to the following formula: * - * \return 0 on success, or -1 if the surface is not valid. + * `srcA = srcA * (alpha / 255)` * - * \sa SDL_GetSurfaceAlphaMod() + * \param surface the SDL_Surface structure to update + * \param alpha the alpha value multiplied into blit operations + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetSurfaceAlphaMod + * \sa SDL_SetSurfaceColorMod */ extern DECLSPEC int SDLCALL SDL_SetSurfaceAlphaMod(SDL_Surface * surface, Uint8 alpha); /** - * \brief Get the additional alpha value used in blit operations. + * Get the additional alpha value used in blit operations. * - * \param surface The surface to query. - * \param alpha A pointer filled in with the current alpha value. + * \param surface the SDL_Surface structure to query + * \param alpha a pointer filled in with the current alpha value + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 if the surface is not valid. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_SetSurfaceAlphaMod() + * \sa SDL_GetSurfaceColorMod + * \sa SDL_SetSurfaceAlphaMod */ extern DECLSPEC int SDLCALL SDL_GetSurfaceAlphaMod(SDL_Surface * surface, Uint8 * alpha); /** - * \brief Set the blend mode used for blit operations. + * Set the blend mode used for blit operations. * - * \param surface The surface to update. - * \param blendMode ::SDL_BlendMode to use for blit blending. + * To copy a surface to another surface (or texture) without blending with the + * existing data, the blendmode of the SOURCE surface should be set to + * `SDL_BLENDMODE_NONE`. * - * \return 0 on success, or -1 if the parameters are not valid. + * \param surface the SDL_Surface structure to update + * \param blendMode the SDL_BlendMode to use for blit blending + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_GetSurfaceBlendMode() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetSurfaceBlendMode */ extern DECLSPEC int SDLCALL SDL_SetSurfaceBlendMode(SDL_Surface * surface, SDL_BlendMode blendMode); /** - * \brief Get the blend mode used for blit operations. + * Get the blend mode used for blit operations. * - * \param surface The surface to query. - * \param blendMode A pointer filled in with the current blend mode. + * \param surface the SDL_Surface structure to query + * \param blendMode a pointer filled in with the current SDL_BlendMode + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 if the surface is not valid. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_SetSurfaceBlendMode() + * \sa SDL_SetSurfaceBlendMode */ extern DECLSPEC int SDLCALL SDL_GetSurfaceBlendMode(SDL_Surface * surface, SDL_BlendMode *blendMode); /** - * Sets the clipping rectangle for the destination surface in a blit. + * Set the clipping rectangle for a surface. * - * If the clip rectangle is NULL, clipping will be disabled. + * When `surface` is the destination of a blit, only the area within the clip + * rectangle is drawn into. * - * If the clip rectangle doesn't intersect the surface, the function will - * return SDL_FALSE and blits will be completely clipped. Otherwise the - * function returns SDL_TRUE and blits to the surface will be clipped to - * the intersection of the surface area and the clipping rectangle. + * Note that blits are automatically clipped to the edges of the source and + * destination surfaces. * - * Note that blits are automatically clipped to the edges of the source - * and destination surfaces. + * \param surface the SDL_Surface structure to be clipped + * \param rect the SDL_Rect structure representing the clipping rectangle, or + * NULL to disable clipping + * \returns SDL_TRUE if the rectangle intersects the surface, otherwise + * SDL_FALSE and blits will be completely clipped. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_BlitSurface + * \sa SDL_GetClipRect */ extern DECLSPEC SDL_bool SDLCALL SDL_SetClipRect(SDL_Surface * surface, const SDL_Rect * rect); /** - * Gets the clipping rectangle for the destination surface in a blit. + * Get the clipping rectangle for a surface. * - * \c rect must be a pointer to a valid rectangle which will be filled - * with the correct values. + * When `surface` is the destination of a blit, only the area within the clip + * rectangle is drawn into. + * + * \param surface the SDL_Surface structure representing the surface to be + * clipped + * \param rect an SDL_Rect structure filled in with the clipping rectangle for + * the surface + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_BlitSurface + * \sa SDL_SetClipRect */ extern DECLSPEC void SDLCALL SDL_GetClipRect(SDL_Surface * surface, SDL_Rect * rect); /* - * Creates a new surface identical to the existing surface + * Creates a new surface identical to the existing surface. + * + * The returned surface should be freed with SDL_FreeSurface(). + * + * \param surface the surface to duplicate. + * \returns a copy of the surface, or NULL on failure; call SDL_GetError() for + * more information. */ extern DECLSPEC SDL_Surface *SDLCALL SDL_DuplicateSurface(SDL_Surface * surface); /** - * Creates a new surface of the specified format, and then copies and maps - * the given surface to it so the blit of the converted surface will be as - * fast as possible. If this function fails, it returns NULL. + * Copy an existing surface to a new surface of the specified format. * - * The \c flags parameter is passed to SDL_CreateRGBSurface() and has those - * semantics. You can also pass ::SDL_RLEACCEL in the flags parameter and - * SDL will try to RLE accelerate colorkey and alpha blits in the resulting - * surface. + * This function is used to optimize images for faster *repeat* blitting. This + * is accomplished by converting the original and storing the result as a new + * surface. The new, optimized surface can then be used as the source for + * future blits, making them faster. + * + * \param src the existing SDL_Surface structure to convert + * \param fmt the SDL_PixelFormat structure that the new surface is optimized + * for + * \param flags the flags are unused and should be set to 0; this is a + * leftover from SDL 1.2's API + * \returns the new SDL_Surface structure that is created or NULL if it fails; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AllocFormat + * \sa SDL_ConvertSurfaceFormat + * \sa SDL_CreateRGBSurface */ extern DECLSPEC SDL_Surface *SDLCALL SDL_ConvertSurface (SDL_Surface * src, const SDL_PixelFormat * fmt, Uint32 flags); + +/** + * Copy an existing surface to a new surface of the specified format enum. + * + * This function operates just like SDL_ConvertSurface(), but accepts an + * SDL_PixelFormatEnum value instead of an SDL_PixelFormat structure. As such, + * it might be easier to call but it doesn't have access to palette + * information for the destination surface, in case that would be important. + * + * \param src the existing SDL_Surface structure to convert + * \param pixel_format the SDL_PixelFormatEnum that the new surface is + * optimized for + * \param flags the flags are unused and should be set to 0; this is a + * leftover from SDL 1.2's API + * \returns the new SDL_Surface structure that is created or NULL if it fails; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AllocFormat + * \sa SDL_ConvertSurface + * \sa SDL_CreateRGBSurface + */ extern DECLSPEC SDL_Surface *SDLCALL SDL_ConvertSurfaceFormat (SDL_Surface * src, Uint32 pixel_format, Uint32 flags); /** - * \brief Copy a block of pixels of one format to another format + * Copy a block of pixels of one format to another format. * - * \return 0 on success, or -1 if there was an error + * \param width the width of the block to copy, in pixels + * \param height the height of the block to copy, in pixels + * \param src_format an SDL_PixelFormatEnum value of the `src` pixels format + * \param src a pointer to the source pixels + * \param src_pitch the pitch of the source pixels, in bytes + * \param dst_format an SDL_PixelFormatEnum value of the `dst` pixels format + * \param dst a pointer to be filled in with new pixel data + * \param dst_pitch the pitch of the destination pixels, in bytes + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC int SDLCALL SDL_ConvertPixels(int width, int height, Uint32 src_format, @@ -410,20 +721,84 @@ extern DECLSPEC int SDLCALL SDL_ConvertPixels(int width, int height, void * dst, int dst_pitch); /** - * Performs a fast fill of the given rectangle with \c color. + * Premultiply the alpha on a block of pixels. * - * If \c rect is NULL, the whole surface will be filled with \c color. + * This is safe to use with src == dst, but not for other overlapping areas. * - * The color should be a pixel of the format used by the surface, and - * can be generated by the SDL_MapRGB() function. + * This function is currently only implemented for SDL_PIXELFORMAT_ARGB8888. * - * \return 0 on success, or -1 on error. + * \param width the width of the block to convert, in pixels + * \param height the height of the block to convert, in pixels + * \param src_format an SDL_PixelFormatEnum value of the `src` pixels format + * \param src a pointer to the source pixels + * \param src_pitch the pitch of the source pixels, in bytes + * \param dst_format an SDL_PixelFormatEnum value of the `dst` pixels format + * \param dst a pointer to be filled in with premultiplied pixel data + * \param dst_pitch the pitch of the destination pixels, in bytes + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_PremultiplyAlpha(int width, int height, + Uint32 src_format, + const void * src, int src_pitch, + Uint32 dst_format, + void * dst, int dst_pitch); + +/** + * Perform a fast fill of a rectangle with a specific color. + * + * `color` should be a pixel of the format used by the surface, and can be + * generated by SDL_MapRGB() or SDL_MapRGBA(). If the color value contains an + * alpha component then the destination is simply filled with that alpha + * information, no blending takes place. + * + * If there is a clip rectangle set on the destination (set via + * SDL_SetClipRect()), then this function will fill based on the intersection + * of the clip rectangle and `rect`. + * + * \param dst the SDL_Surface structure that is the drawing target + * \param rect the SDL_Rect structure representing the rectangle to fill, or + * NULL to fill the entire surface + * \param color the color to fill with + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_FillRects */ extern DECLSPEC int SDLCALL SDL_FillRect (SDL_Surface * dst, const SDL_Rect * rect, Uint32 color); + +/** + * Perform a fast fill of a set of rectangles with a specific color. + * + * `color` should be a pixel of the format used by the surface, and can be + * generated by SDL_MapRGB() or SDL_MapRGBA(). If the color value contains an + * alpha component then the destination is simply filled with that alpha + * information, no blending takes place. + * + * If there is a clip rectangle set on the destination (set via + * SDL_SetClipRect()), then this function will fill based on the intersection + * of the clip rectangle and `rect`. + * + * \param dst the SDL_Surface structure that is the drawing target + * \param rects an array of SDL_Rects representing the rectangles to fill. + * \param count the number of rectangles in the array + * \param color the color to fill with + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_FillRect + */ extern DECLSPEC int SDLCALL SDL_FillRects (SDL_Surface * dst, const SDL_Rect * rects, int count, Uint32 color); +/* !!! FIXME: merge this documentation with the wiki */ /** * Performs a fast blit from the source surface to the destination surface. * @@ -432,7 +807,7 @@ extern DECLSPEC int SDLCALL SDL_FillRects * surface (\c src or \c dst) is copied. The final blit rectangles are saved * in \c srcrect and \c dstrect after all clipping is performed. * - * \return If the blit is successful, it returns 0, otherwise it returns -1. + * \returns 0 if the blit is successful, otherwise it returns -1. * * The blit function should not be called on a locked surface. * @@ -484,62 +859,128 @@ extern DECLSPEC int SDLCALL SDL_FillRects #define SDL_BlitSurface SDL_UpperBlit /** - * This is the public blit function, SDL_BlitSurface(), and it performs - * rectangle validation and clipping before passing it to SDL_LowerBlit() + * Perform a fast blit from the source surface to the destination surface. + * + * SDL_UpperBlit() has been replaced by SDL_BlitSurface(), which is merely a + * macro for this function with a less confusing name. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_BlitSurface */ extern DECLSPEC int SDLCALL SDL_UpperBlit (SDL_Surface * src, const SDL_Rect * srcrect, SDL_Surface * dst, SDL_Rect * dstrect); /** - * This is a semi-private blit function and it performs low-level surface - * blitting only. + * Perform low-level surface blitting only. + * + * This is a semi-private blit function and it performs low-level surface + * blitting, assuming the input rectangles have already been clipped. + * + * Unless you know what you're doing, you should be using SDL_BlitSurface() + * instead. + * + * \param src the SDL_Surface structure to be copied from + * \param srcrect the SDL_Rect structure representing the rectangle to be + * copied, or NULL to copy the entire surface + * \param dst the SDL_Surface structure that is the blit target + * \param dstrect the SDL_Rect structure representing the rectangle that is + * copied into + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_BlitSurface */ extern DECLSPEC int SDLCALL SDL_LowerBlit (SDL_Surface * src, SDL_Rect * srcrect, SDL_Surface * dst, SDL_Rect * dstrect); + /** - * \brief Perform a fast, low quality, stretch blit between two surfaces of the - * same pixel format. + * Perform a fast, low quality, stretch blit between two surfaces of the same + * format. * - * \note This function uses a static buffer, and is not thread-safe. + * Please use SDL_BlitScaled() instead. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC int SDLCALL SDL_SoftStretch(SDL_Surface * src, const SDL_Rect * srcrect, SDL_Surface * dst, const SDL_Rect * dstrect); +/** + * Perform bilinear scaling between two surfaces of the same format, 32BPP. + * + * \since This function is available since SDL 2.0.16. + */ +extern DECLSPEC int SDLCALL SDL_SoftStretchLinear(SDL_Surface * src, + const SDL_Rect * srcrect, + SDL_Surface * dst, + const SDL_Rect * dstrect); + + #define SDL_BlitScaled SDL_UpperBlitScaled /** - * This is the public scaled blit function, SDL_BlitScaled(), and it performs - * rectangle validation and clipping before passing it to SDL_LowerBlitScaled() + * Perform a scaled surface copy to a destination surface. + * + * SDL_UpperBlitScaled() has been replaced by SDL_BlitScaled(), which is + * merely a macro for this function with a less confusing name. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_BlitScaled */ extern DECLSPEC int SDLCALL SDL_UpperBlitScaled (SDL_Surface * src, const SDL_Rect * srcrect, SDL_Surface * dst, SDL_Rect * dstrect); /** - * This is a semi-private blit function and it performs low-level surface - * scaled blitting only. + * Perform low-level surface scaled blitting only. + * + * This is a semi-private function and it performs low-level surface blitting, + * assuming the input rectangles have already been clipped. + * + * \param src the SDL_Surface structure to be copied from + * \param srcrect the SDL_Rect structure representing the rectangle to be + * copied + * \param dst the SDL_Surface structure that is the blit target + * \param dstrect the SDL_Rect structure representing the rectangle that is + * copied into + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_BlitScaled */ extern DECLSPEC int SDLCALL SDL_LowerBlitScaled (SDL_Surface * src, SDL_Rect * srcrect, SDL_Surface * dst, SDL_Rect * dstrect); /** - * \brief Set the YUV conversion mode + * Set the YUV conversion mode + * + * \since This function is available since SDL 2.0.8. */ extern DECLSPEC void SDLCALL SDL_SetYUVConversionMode(SDL_YUV_CONVERSION_MODE mode); /** - * \brief Get the YUV conversion mode + * Get the YUV conversion mode + * + * \since This function is available since SDL 2.0.8. */ extern DECLSPEC SDL_YUV_CONVERSION_MODE SDLCALL SDL_GetYUVConversionMode(void); /** - * \brief Get the YUV conversion mode, returning the correct mode for the resolution when the current conversion mode is SDL_YUV_CONVERSION_AUTOMATIC + * Get the YUV conversion mode, returning the correct mode for the resolution + * when the current conversion mode is SDL_YUV_CONVERSION_AUTOMATIC + * + * \since This function is available since SDL 2.0.8. */ extern DECLSPEC SDL_YUV_CONVERSION_MODE SDLCALL SDL_GetYUVConversionModeForResolution(int width, int height); diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_system.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_system.h index 3b0840769..e2fa7b5fe 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_system.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_system.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -43,33 +43,82 @@ extern "C" { /* Platform specific functions for Windows */ #ifdef __WIN32__ -/** - \brief Set a function that is called for every windows message, before TranslateMessage() -*/ typedef void (SDLCALL * SDL_WindowsMessageHook)(void *userdata, void *hWnd, unsigned int message, Uint64 wParam, Sint64 lParam); + +/** + * Set a callback for every Windows message, run before TranslateMessage(). + * + * \param callback The SDL_WindowsMessageHook function to call. + * \param userdata a pointer to pass to every iteration of `callback` + * + * \since This function is available since SDL 2.0.4. + */ extern DECLSPEC void SDLCALL SDL_SetWindowsMessageHook(SDL_WindowsMessageHook callback, void *userdata); /** - \brief Returns the D3D9 adapter index that matches the specified display index. - - This adapter index can be passed to IDirect3D9::CreateDevice and controls - on which monitor a full screen application will appear. -*/ + * Get the D3D9 adapter index that matches the specified display index. + * + * The returned adapter index can be passed to `IDirect3D9::CreateDevice` and + * controls on which monitor a full screen application will appear. + * + * \param displayIndex the display index for which to get the D3D9 adapter + * index + * \returns the D3D9 adapter index on success or a negative error code on + * failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.1. + */ extern DECLSPEC int SDLCALL SDL_Direct3D9GetAdapterIndex( int displayIndex ); typedef struct IDirect3DDevice9 IDirect3DDevice9; -/** - \brief Returns the D3D device associated with a renderer, or NULL if it's not a D3D renderer. - Once you are done using the device, you should release it to avoid a resource leak. +/** + * Get the D3D9 device associated with a renderer. + * + * Once you are done using the device, you should release it to avoid a + * resource leak. + * + * \param renderer the renderer from which to get the associated D3D device + * \returns the D3D9 device associated with given renderer or NULL if it is + * not a D3D9 renderer; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.1. */ extern DECLSPEC IDirect3DDevice9* SDLCALL SDL_RenderGetD3D9Device(SDL_Renderer * renderer); -/** - \brief Returns the DXGI Adapter and Output indices for the specified display index. +typedef struct ID3D11Device ID3D11Device; - These can be passed to EnumAdapters and EnumOutputs respectively to get the objects - required to create a DX10 or DX11 device and swap chain. +/** + * Get the D3D11 device associated with a renderer. + * + * Once you are done using the device, you should release it to avoid a + * resource leak. + * + * \param renderer the renderer from which to get the associated D3D11 device + * \returns the D3D11 device associated with given renderer or NULL if it is + * not a D3D11 renderer; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.16. + */ +extern DECLSPEC ID3D11Device* SDLCALL SDL_RenderGetD3D11Device(SDL_Renderer * renderer); + +/** + * Get the DXGI Adapter and Output indices for the specified display index. + * + * The DXGI Adapter and Output indices can be passed to `EnumAdapters` and + * `EnumOutputs` respectively to get the objects required to create a DX10 or + * DX11 device and swap chain. + * + * Before SDL 2.0.4 this function did not return a value. Since SDL 2.0.4 it + * returns an SDL_bool. + * + * \param displayIndex the display index for which to get both indices + * \param adapterIndex a pointer to be filled in with the adapter index + * \param outputIndex a pointer to be filled in with the output index + * \returns SDL_TRUE on success or SDL_FALSE on failure; call SDL_GetError() + * for more information. + * + * \since This function is available since SDL 2.0.2. */ extern DECLSPEC SDL_bool SDLCALL SDL_DXGIGetOutputInfo( int displayIndex, int *adapterIndex, int *outputIndex ); @@ -80,63 +129,202 @@ extern DECLSPEC SDL_bool SDLCALL SDL_DXGIGetOutputInfo( int displayIndex, int *a #ifdef __LINUX__ /** - \brief Sets the UNIX nice value for a thread, using setpriority() if possible, and RealtimeKit if available. - - \return 0 on success, or -1 on error. + * Sets the UNIX nice value for a thread. + * + * This uses setpriority() if possible, and RealtimeKit if available. + * + * \param threadID the Unix thread ID to change priority of. + * \param priority The new, Unix-specific, priority value. + * \returns 0 on success, or -1 on error. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC int SDLCALL SDL_LinuxSetThreadPriority(Sint64 threadID, int priority); + +/** + * Sets the priority (not nice level) and scheduling policy for a thread. + * + * This uses setpriority() if possible, and RealtimeKit if available. + * + * \param threadID The Unix thread ID to change priority of. + * \param sdlPriority The new SDL_ThreadPriority value. + * \param schedPolicy The new scheduling policy (SCHED_FIFO, SCHED_RR, + * SCHED_OTHER, etc...) + * \returns 0 on success, or -1 on error. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_LinuxSetThreadPriorityAndPolicy(Sint64 threadID, int sdlPriority, int schedPolicy); #endif /* __LINUX__ */ /* Platform specific functions for iOS */ -#if defined(__IPHONEOS__) && __IPHONEOS__ +#ifdef __IPHONEOS__ #define SDL_iOSSetAnimationCallback(window, interval, callback, callbackParam) SDL_iPhoneSetAnimationCallback(window, interval, callback, callbackParam) + +/** + * Use this function to set the animation callback on Apple iOS. + * + * The function prototype for `callback` is: + * + * ```c + * void callback(void* callbackParam); + * ``` + * + * Where its parameter, `callbackParam`, is what was passed as `callbackParam` + * to SDL_iPhoneSetAnimationCallback(). + * + * This function is only available on Apple iOS. + * + * For more information see: + * [README-ios.md](https://hg.libsdl.org/SDL/file/default/docs/README-ios.md) + * + * This functions is also accessible using the macro + * SDL_iOSSetAnimationCallback() since SDL 2.0.4. + * + * \param window the window for which the animation callback should be set + * \param interval the number of frames after which **callback** will be + * called + * \param callback the function to call for every frame. + * \param callbackParam a pointer that is passed to `callback`. + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_iPhoneSetEventPump + */ extern DECLSPEC int SDLCALL SDL_iPhoneSetAnimationCallback(SDL_Window * window, int interval, void (*callback)(void*), void *callbackParam); #define SDL_iOSSetEventPump(enabled) SDL_iPhoneSetEventPump(enabled) + +/** + * Use this function to enable or disable the SDL event pump on Apple iOS. + * + * This function is only available on Apple iOS. + * + * This functions is also accessible using the macro SDL_iOSSetEventPump() + * since SDL 2.0.4. + * + * \param enabled SDL_TRUE to enable the event pump, SDL_FALSE to disable it + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_iPhoneSetAnimationCallback + */ extern DECLSPEC void SDLCALL SDL_iPhoneSetEventPump(SDL_bool enabled); #endif /* __IPHONEOS__ */ /* Platform specific functions for Android */ -#if defined(__ANDROID__) && __ANDROID__ +#ifdef __ANDROID__ /** - \brief Get the JNI environment for the current thread - - This returns JNIEnv*, but the prototype is void* so we don't need jni.h + * Get the Android Java Native Interface Environment of the current thread. + * + * This is the JNIEnv one needs to access the Java virtual machine from native + * code, and is needed for many Android APIs to be usable from C. + * + * The prototype of the function in SDL's code actually declare a void* return + * type, even if the implementation returns a pointer to a JNIEnv. The + * rationale being that the SDL headers can avoid including jni.h. + * + * \returns a pointer to Java native interface object (JNIEnv) to which the + * current thread is attached, or 0 on error. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AndroidGetActivity */ extern DECLSPEC void * SDLCALL SDL_AndroidGetJNIEnv(void); /** - \brief Get the SDL Activity object for the application - - This returns jobject, but the prototype is void* so we don't need jni.h - The jobject returned by SDL_AndroidGetActivity is a local reference. - It is the caller's responsibility to properly release it - (using env->Push/PopLocalFrame or manually with env->DeleteLocalRef) + * Retrieve the Java instance of the Android activity class. + * + * The prototype of the function in SDL's code actually declares a void* + * return type, even if the implementation returns a jobject. The rationale + * being that the SDL headers can avoid including jni.h. + * + * The jobject returned by the function is a local reference and must be + * released by the caller. See the PushLocalFrame() and PopLocalFrame() or + * DeleteLocalRef() functions of the Java native interface: + * + * https://docs.oracle.com/javase/1.5.0/docs/guide/jni/spec/functions.html + * + * \returns the jobject representing the instance of the Activity class of the + * Android application, or NULL on error. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AndroidGetJNIEnv */ extern DECLSPEC void * SDLCALL SDL_AndroidGetActivity(void); /** - \brief Return true if the application is running on Android TV + * Query Android API level of the current device. + * + * - API level 31: Android 12 + * - API level 30: Android 11 + * - API level 29: Android 10 + * - API level 28: Android 9 + * - API level 27: Android 8.1 + * - API level 26: Android 8.0 + * - API level 25: Android 7.1 + * - API level 24: Android 7.0 + * - API level 23: Android 6.0 + * - API level 22: Android 5.1 + * - API level 21: Android 5.0 + * - API level 20: Android 4.4W + * - API level 19: Android 4.4 + * - API level 18: Android 4.3 + * - API level 17: Android 4.2 + * - API level 16: Android 4.1 + * - API level 15: Android 4.0.3 + * - API level 14: Android 4.0 + * - API level 13: Android 3.2 + * - API level 12: Android 3.1 + * - API level 11: Android 3.0 + * - API level 10: Android 2.3.3 + * + * \returns the Android API level. + * + * \since This function is available since SDL 2.0.12. + */ +extern DECLSPEC int SDLCALL SDL_GetAndroidSDKVersion(void); + +/** + * Query if the application is running on Android TV. + * + * \returns SDL_TRUE if this is Android TV, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.8. */ extern DECLSPEC SDL_bool SDLCALL SDL_IsAndroidTV(void); /** - \brief Return true if the application is running on a Chromebook + * Query if the application is running on a Chromebook. + * + * \returns SDL_TRUE if this is a Chromebook, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC SDL_bool SDLCALL SDL_IsChromebook(void); /** - \brief Return true is the application is running on a Samsung DeX docking station + * Query if the application is running on a Samsung DeX docking station. + * + * \returns SDL_TRUE if this is a DeX docking station, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC SDL_bool SDLCALL SDL_IsDeXMode(void); /** - \brief Trigger the Android system back button behavior. + * Trigger the Android system back button behavior. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC void SDLCALL SDL_AndroidBackButton(void); @@ -148,34 +336,99 @@ extern DECLSPEC void SDLCALL SDL_AndroidBackButton(void); #define SDL_ANDROID_EXTERNAL_STORAGE_WRITE 0x02 /** - \brief Get the path used for internal storage for this application. - - This path is unique to your application and cannot be written to - by other applications. + * Get the path used for internal storage for this application. + * + * This path is unique to your application and cannot be written to by other + * applications. + * + * Your internal storage path is typically: + * `/data/data/your.app.package/files`. + * + * \returns the path used for internal storage or NULL on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AndroidGetExternalStorageState */ extern DECLSPEC const char * SDLCALL SDL_AndroidGetInternalStoragePath(void); /** - \brief Get the current state of external storage, a bitmask of these values: - SDL_ANDROID_EXTERNAL_STORAGE_READ - SDL_ANDROID_EXTERNAL_STORAGE_WRITE - - If external storage is currently unavailable, this will return 0. -*/ + * Get the current state of external storage. + * + * The current state of external storage, a bitmask of these values: + * `SDL_ANDROID_EXTERNAL_STORAGE_READ`, `SDL_ANDROID_EXTERNAL_STORAGE_WRITE`. + * + * If external storage is currently unavailable, this will return 0. + * + * \returns the current state of external storage on success or 0 on failure; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AndroidGetExternalStoragePath + */ extern DECLSPEC int SDLCALL SDL_AndroidGetExternalStorageState(void); /** - \brief Get the path used for external storage for this application. - - This path is unique to your application, but is public and can be - written to by other applications. + * Get the path used for external storage for this application. + * + * This path is unique to your application, but is public and can be written + * to by other applications. + * + * Your external storage path is typically: + * `/storage/sdcard0/Android/data/your.app.package/files`. + * + * \returns the path used for external storage for this application on success + * or NULL on failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AndroidGetExternalStorageState */ extern DECLSPEC const char * SDLCALL SDL_AndroidGetExternalStoragePath(void); +/** + * Request permissions at runtime. + * + * This blocks the calling thread until the permission is granted or denied. + * + * \param permission The permission to request. + * \returns SDL_TRUE if the permission was granted, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC SDL_bool SDLCALL SDL_AndroidRequestPermission(const char *permission); + +/** + * Shows an Android toast notification. + * + * Toasts are a sort of lightweight notification that are unique to Android. + * + * https://developer.android.com/guide/topics/ui/notifiers/toasts + * + * Shows toast in UI thread. + * + * For the `gravity` parameter, choose a value from here, or -1 if you don't + * have a preference: + * + * https://developer.android.com/reference/android/view/Gravity + * + * \param message text message to be shown + * \param duration 0=short, 1=long + * \param gravity where the notification should appear on the screen. + * \param xoffset set this parameter only when gravity >=0 + * \param yoffset set this parameter only when gravity >=0 + * \returns 0 if success, -1 if any error occurs. + * + * \since This function is available since SDL 2.0.16. + */ +extern DECLSPEC int SDLCALL SDL_AndroidShowToast(const char* message, int duration, int gravity, int xoffset, int yoffset); + #endif /* __ANDROID__ */ /* Platform specific functions for WinRT */ -#if defined(__WINRT__) && __WINRT__ +#ifdef __WINRT__ /** * \brief WinRT / Windows Phone path types @@ -221,53 +474,84 @@ typedef enum /** - * \brief Retrieves a WinRT defined path on the local file system + * Retrieve a WinRT defined path on the local file system. * - * \note Documentation on most app-specific path types on WinRT - * can be found on MSDN, at the URL: - * http://msdn.microsoft.com/en-us/library/windows/apps/hh464917.aspx + * Not all paths are available on all versions of Windows. This is especially + * true on Windows Phone. Check the documentation for the given SDL_WinRT_Path + * for more information on which path types are supported where. * - * \param pathType The type of path to retrieve. - * \return A UCS-2 string (16-bit, wide-char) containing the path, or NULL - * if the path is not available for any reason. Not all paths are - * available on all versions of Windows. This is especially true on - * Windows Phone. Check the documentation for the given - * SDL_WinRT_Path for more information on which path types are - * supported where. + * Documentation on most app-specific path types on WinRT can be found on + * MSDN, at the URL: + * + * https://msdn.microsoft.com/en-us/library/windows/apps/hh464917.aspx + * + * \param pathType the type of path to retrieve, one of SDL_WinRT_Path + * \returns a UCS-2 string (16-bit, wide-char) containing the path, or NULL if + * the path is not available for any reason; call SDL_GetError() for + * more information. + * + * \since This function is available since SDL 2.0.3. + * + * \sa SDL_WinRTGetFSPathUTF8 */ extern DECLSPEC const wchar_t * SDLCALL SDL_WinRTGetFSPathUNICODE(SDL_WinRT_Path pathType); /** - * \brief Retrieves a WinRT defined path on the local file system + * Retrieve a WinRT defined path on the local file system. * - * \note Documentation on most app-specific path types on WinRT - * can be found on MSDN, at the URL: - * http://msdn.microsoft.com/en-us/library/windows/apps/hh464917.aspx + * Not all paths are available on all versions of Windows. This is especially + * true on Windows Phone. Check the documentation for the given SDL_WinRT_Path + * for more information on which path types are supported where. * - * \param pathType The type of path to retrieve. - * \return A UTF-8 string (8-bit, multi-byte) containing the path, or NULL - * if the path is not available for any reason. Not all paths are - * available on all versions of Windows. This is especially true on - * Windows Phone. Check the documentation for the given - * SDL_WinRT_Path for more information on which path types are - * supported where. + * Documentation on most app-specific path types on WinRT can be found on + * MSDN, at the URL: + * + * https://msdn.microsoft.com/en-us/library/windows/apps/hh464917.aspx + * + * \param pathType the type of path to retrieve, one of SDL_WinRT_Path + * \returns a UTF-8 string (8-bit, multi-byte) containing the path, or NULL if + * the path is not available for any reason; call SDL_GetError() for + * more information. + * + * \since This function is available since SDL 2.0.3. + * + * \sa SDL_WinRTGetFSPathUNICODE */ extern DECLSPEC const char * SDLCALL SDL_WinRTGetFSPathUTF8(SDL_WinRT_Path pathType); /** - * \brief Detects the device family of WinRT plattform on runtime + * Detects the device family of WinRT plattform at runtime. * - * \return Device family + * \returns a value from the SDL_WinRT_DeviceFamily enum. + * + * \since This function is available since SDL 2.0.8. */ extern DECLSPEC SDL_WinRT_DeviceFamily SDLCALL SDL_WinRTGetDeviceFamily(); #endif /* __WINRT__ */ /** - \brief Return true if the current device is a tablet. + * Query if the current device is a tablet. + * + * If SDL can't determine this, it will return SDL_FALSE. + * + * \returns SDL_TRUE if the device is a tablet, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC SDL_bool SDLCALL SDL_IsTablet(void); +/* Functions used by iOS application delegates to notify SDL about state changes */ +extern DECLSPEC void SDLCALL SDL_OnApplicationWillTerminate(void); +extern DECLSPEC void SDLCALL SDL_OnApplicationDidReceiveMemoryWarning(void); +extern DECLSPEC void SDLCALL SDL_OnApplicationWillResignActive(void); +extern DECLSPEC void SDLCALL SDL_OnApplicationDidEnterBackground(void); +extern DECLSPEC void SDLCALL SDL_OnApplicationWillEnterForeground(void); +extern DECLSPEC void SDLCALL SDL_OnApplicationDidBecomeActive(void); +#ifdef __IPHONEOS__ +extern DECLSPEC void SDLCALL SDL_OnApplicationDidChangeStatusBarOrientation(void); +#endif + /* Ends C function definitions when using C++ */ #ifdef __cplusplus } diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_syswm.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_syswm.h index 7aa8c6869..f7cd670cd 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_syswm.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_syswm.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -49,6 +49,9 @@ struct SDL_SysWMinfo; #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif +#ifndef NOMINMAX /* don't define min() and max(). */ +#define NOMINMAX +#endif #include #endif @@ -95,6 +98,10 @@ typedef struct _UIViewController UIViewController; typedef Uint32 GLuint; #endif +#if defined(SDL_VIDEO_VULKAN) || defined(SDL_VIDEO_METAL) +#define SDL_METALVIEW_TAG 255 +#endif + #if defined(SDL_VIDEO_DRIVER_ANDROID) typedef struct ANativeWindow ANativeWindow; typedef void *EGLSurface; @@ -103,8 +110,17 @@ typedef void *EGLSurface; #if defined(SDL_VIDEO_DRIVER_VIVANTE) #include "SDL_egl.h" #endif + +#if defined(SDL_VIDEO_DRIVER_OS2) +#define INCL_WIN +#include +#endif #endif /* SDL_PROTOTYPES_ONLY */ +#if defined(SDL_VIDEO_DRIVER_KMSDRM) +struct gbm_device; +#endif + #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ @@ -129,7 +145,10 @@ typedef enum SDL_SYSWM_WINRT, SDL_SYSWM_ANDROID, SDL_SYSWM_VIVANTE, - SDL_SYSWM_OS2 + SDL_SYSWM_OS2, + SDL_SYSWM_HAIKU, + SDL_SYSWM_KMSDRM, + SDL_SYSWM_RISCOS } SDL_SYSWM_TYPE; /** @@ -182,6 +201,16 @@ struct SDL_SysWMmsg int dummy; /* No Vivante window events yet */ } vivante; +#endif +#if defined(SDL_VIDEO_DRIVER_OS2) + struct + { + BOOL fFrame; /**< TRUE if hwnd is a frame window */ + HWND hwnd; /**< The window receiving the message */ + ULONG msg; /**< The message identifier */ + MPARAM mp1; /**< The first first message parameter */ + MPARAM mp2; /**< The second first message parameter */ + } os2; #endif /* Can't have an empty union */ int dummy; @@ -232,8 +261,12 @@ struct SDL_SysWMinfo #if defined(SDL_VIDEO_DRIVER_COCOA) struct { -#if defined(__OBJC__) && defined(__has_feature) && __has_feature(objc_arc) +#if defined(__OBJC__) && defined(__has_feature) + #if __has_feature(objc_arc) NSWindow __unsafe_unretained *window; /**< The Cocoa window */ + #else + NSWindow *window; /**< The Cocoa window */ + #endif #else NSWindow *window; /**< The Cocoa window */ #endif @@ -242,8 +275,12 @@ struct SDL_SysWMinfo #if defined(SDL_VIDEO_DRIVER_UIKIT) struct { -#if defined(__OBJC__) && defined(__has_feature) && __has_feature(objc_arc) +#if defined(__OBJC__) && defined(__has_feature) + #if __has_feature(objc_arc) UIWindow __unsafe_unretained *window; /**< The UIKit window */ + #else + UIWindow *window; /**< The UIKit window */ + #endif #else UIWindow *window; /**< The UIKit window */ #endif @@ -255,9 +292,12 @@ struct SDL_SysWMinfo #if defined(SDL_VIDEO_DRIVER_WAYLAND) struct { - struct wl_display *display; /**< Wayland display */ - struct wl_surface *surface; /**< Wayland surface */ - struct wl_shell_surface *shell_surface; /**< Wayland shell_surface (window manager handle) */ + struct wl_display *display; /**< Wayland display */ + struct wl_surface *surface; /**< Wayland surface */ + void *shell_surface; /**< DEPRECATED Wayland shell_surface (window manager handle) */ + struct wl_egl_window *egl_window; /**< Wayland EGL window (native window) */ + struct xdg_surface *xdg_surface; /**< Wayland xdg surface (window manager handle) */ + struct xdg_toplevel *xdg_toplevel; /**< Wayland xdg toplevel role */ } wl; #endif #if defined(SDL_VIDEO_DRIVER_MIR) /* no longer available, left for API/ABI compatibility. Remove in 2.1! */ @@ -276,6 +316,14 @@ struct SDL_SysWMinfo } android; #endif +#if defined(SDL_VIDEO_DRIVER_OS2) + struct + { + HWND hwnd; /**< The window handle */ + HWND hwndFrame; /**< The frame window handle */ + } os2; +#endif + #if defined(SDL_VIDEO_DRIVER_VIVANTE) struct { @@ -284,6 +332,15 @@ struct SDL_SysWMinfo } vivante; #endif +#if defined(SDL_VIDEO_DRIVER_KMSDRM) + struct + { + int dev_index; /**< Device index (ex: the X in /dev/dri/cardX) */ + int drm_fd; /**< DRM FD (unavailable on Vulkan windows) */ + struct gbm_device *gbm_dev; /**< GBM device (unavailable on Vulkan windows) */ + } kmsdrm; +#endif + /* Make sure this union is always 64 bytes (8 64-bit pointers). */ /* Be careful not to overflow this if you add a new target! */ Uint8 dummy[64]; @@ -294,23 +351,23 @@ struct SDL_SysWMinfo typedef struct SDL_SysWMinfo SDL_SysWMinfo; -/* Function prototypes */ + /** - * \brief This function allows access to driver-dependent window information. + * Get driver-specific information about a window. * - * \param window The window about which information is being requested - * \param info This structure must be initialized with the SDL version, and is - * then filled in with information about the given window. + * You must include SDL_syswm.h for the declaration of SDL_SysWMinfo. * - * \return SDL_TRUE if the function is implemented and the version member of - * the \c info struct is valid, SDL_FALSE otherwise. + * The caller must initialize the `info` structure's version by using + * `SDL_VERSION(&info.version)`, and then this function will fill in the rest + * of the structure with information about the given window. * - * You typically use this function like this: - * \code - * SDL_SysWMinfo info; - * SDL_VERSION(&info.version); - * if ( SDL_GetWindowWMInfo(window, &info) ) { ... } - * \endcode + * \param window the window about which information is being requested + * \param info an SDL_SysWMinfo structure filled in with window information + * \returns SDL_TRUE if the function is implemented and the `version` member + * of the `info` struct is valid, or SDL_FALSE if the information + * could not be retrieved; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC SDL_bool SDLCALL SDL_GetWindowWMInfo(SDL_Window * window, SDL_SysWMinfo * info); diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test.h index 17a33dc2c..8cc9d616a 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_assert.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_assert.h index b3ebb62fb..734230529 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_assert.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_assert.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -66,7 +66,7 @@ void SDLTest_Assert(int assertCondition, SDL_PRINTF_FORMAT_STRING const char *as * \param assertCondition Evaluated condition or variable to assert; fail (==0) or pass (!=0). * \param assertDescription Message to log with the assert describing it. * - * \returns Returns the assertCondition so it can be used to externally to break execution flow if desired. + * \returns the assertCondition so it can be used to externally to break execution flow if desired. */ int SDLTest_AssertCheck(int assertCondition, SDL_PRINTF_FORMAT_STRING const char *assertDescription, ...) SDL_PRINTF_VARARG_FUNC(2); diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_common.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_common.h index c34d0d103..0f5096789 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_common.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_common.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -37,6 +37,9 @@ #if defined(__PSP__) #define DEFAULT_WINDOW_WIDTH 480 #define DEFAULT_WINDOW_HEIGHT 272 +#elif defined(__VITA__) +#define DEFAULT_WINDOW_WIDTH 960 +#define DEFAULT_WINDOW_HEIGHT 544 #else #define DEFAULT_WINDOW_WIDTH 640 #define DEFAULT_WINDOW_HEIGHT 480 @@ -61,6 +64,7 @@ typedef struct const char *window_title; const char *window_icon; Uint32 window_flags; + SDL_bool flash_on_focus_loss; int window_x; int window_y; int window_w; @@ -110,6 +114,10 @@ typedef struct int gl_minor_version; int gl_debug; int gl_profile_mask; + + /* Additional fields added in 2.0.18 */ + SDL_Rect confine; + } SDLTest_CommonState; #include "begin_code.h" @@ -126,7 +134,7 @@ extern "C" { * \param argv Array of command line parameters * \param flags Flags indicating which subsystem to initialize (i.e. SDL_INIT_VIDEO | SDL_INIT_AUDIO) * - * \returns Returns a newly allocated common state object. + * \returns a newly allocated common state object. */ SDLTest_CommonState *SDLTest_CommonCreateState(char **argv, Uint32 flags); @@ -136,7 +144,7 @@ SDLTest_CommonState *SDLTest_CommonCreateState(char **argv, Uint32 flags); * \param state The common state describing the test window to create. * \param index The index of the argument to process in argv[]. * - * \returns The number of arguments processed (i.e. 1 for --fullscreen, 2 for --video [videodriver], or -1 on error. + * \returns the number of arguments processed (i.e. 1 for --fullscreen, 2 for --video [videodriver], or -1 on error. */ int SDLTest_CommonArg(SDLTest_CommonState * state, int index); @@ -155,12 +163,25 @@ int SDLTest_CommonArg(SDLTest_CommonState * state, int index); */ void SDLTest_CommonLogUsage(SDLTest_CommonState * state, const char *argv0, const char **options); +/** + * \brief Returns common usage information + * + * You should (probably) be using SDLTest_CommonLogUsage() instead, but this + * function remains for binary compatibility. Strings returned from this + * function are valid until SDLTest_CommonQuit() is called, in which case + * those strings' memory is freed and can no longer be used. + * + * \param state The common state describing the test window to create. + * \returns a string with usage information + */ +const char *SDLTest_CommonUsage(SDLTest_CommonState * state); + /** * \brief Open test window. * * \param state The common state describing the test window to create. * - * \returns True if initialization succeeded, false otherwise + * \returns SDL_TRUE if initialization succeeded, false otherwise */ SDL_bool SDLTest_CommonInit(SDLTest_CommonState * state); @@ -171,7 +192,7 @@ SDL_bool SDLTest_CommonInit(SDLTest_CommonState * state); * \param argc argc, as supplied to SDL_main * \param argv argv, as supplied to SDL_main * - * \returns False if app should quit, true otherwise. + * \returns SDL_FALSE if app should quit, true otherwise. */ SDL_bool SDLTest_CommonDefaultArgs(SDLTest_CommonState * state, const int argc, char **argv); @@ -193,6 +214,15 @@ void SDLTest_CommonEvent(SDLTest_CommonState * state, SDL_Event * event, int *do */ void SDLTest_CommonQuit(SDLTest_CommonState * state); +/** + * \brief Draws various window information (position, size, etc.) to the renderer. + * + * \param renderer The renderer to draw to. + * \param window The window whose information should be displayed. + * \param usedHeight Returns the height used, so the caller can draw more below. + * + */ +void SDLTest_CommonDrawWindowInfo(SDL_Renderer * renderer, SDL_Window * window, int * usedHeight); /* Ends C function definitions when using C++ */ #ifdef __cplusplus diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_compare.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_compare.h index 1f751c8b9..8a7a07008 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_compare.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_compare.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_crc32.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_crc32.h index e615d8929..049da7406 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_crc32.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_crc32.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_font.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_font.h index 8fa078440..c5cbbbbd3 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_font.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_font.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -48,7 +48,7 @@ extern "C" { * \param y The Y coordinate of the upper left corner of the character. * \param c The character to draw. * - * \returns Returns 0 on success, -1 on failure. + * \returns 0 on success, -1 on failure. */ int SDLTest_DrawCharacter(SDL_Renderer *renderer, int x, int y, char c); @@ -60,7 +60,7 @@ int SDLTest_DrawCharacter(SDL_Renderer *renderer, int x, int y, char c); * \param y The Y coordinate of the upper left corner of the string. * \param s The string to draw. * - * \returns Returns 0 on success, -1 on failure. + * \returns 0 on success, -1 on failure. */ int SDLTest_DrawString(SDL_Renderer *renderer, int x, int y, const char *s); diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_fuzzer.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_fuzzer.h index 7259685a9..bbe8eb874 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_fuzzer.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_fuzzer.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -66,14 +66,14 @@ void SDLTest_FuzzerInit(Uint64 execKey); /** * Returns a random Uint8 * - * \returns Generated integer + * \returns a generated integer */ Uint8 SDLTest_RandomUint8(void); /** * Returns a random Sint8 * - * \returns Generated signed integer + * \returns a generated signed integer */ Sint8 SDLTest_RandomSint8(void); @@ -81,14 +81,14 @@ Sint8 SDLTest_RandomSint8(void); /** * Returns a random Uint16 * - * \returns Generated integer + * \returns a generated integer */ Uint16 SDLTest_RandomUint16(void); /** * Returns a random Sint16 * - * \returns Generated signed integer + * \returns a generated signed integer */ Sint16 SDLTest_RandomSint16(void); @@ -96,7 +96,7 @@ Sint16 SDLTest_RandomSint16(void); /** * Returns a random integer * - * \returns Generated integer + * \returns a generated integer */ Sint32 SDLTest_RandomSint32(void); @@ -104,14 +104,14 @@ Sint32 SDLTest_RandomSint32(void); /** * Returns a random positive integer * - * \returns Generated integer + * \returns a generated integer */ Uint32 SDLTest_RandomUint32(void); /** * Returns random Uint64. * - * \returns Generated integer + * \returns a generated integer */ Uint64 SDLTest_RandomUint64(void); @@ -119,28 +119,28 @@ Uint64 SDLTest_RandomUint64(void); /** * Returns random Sint64. * - * \returns Generated signed integer + * \returns a generated signed integer */ Sint64 SDLTest_RandomSint64(void); /** - * \returns random float in range [0.0 - 1.0[ + * \returns a random float in range [0.0 - 1.0] */ float SDLTest_RandomUnitFloat(void); /** - * \returns random double in range [0.0 - 1.0[ + * \returns a random double in range [0.0 - 1.0] */ double SDLTest_RandomUnitDouble(void); /** - * \returns random float. + * \returns a random float. * */ float SDLTest_RandomFloat(void); /** - * \returns random double. + * \returns a random double. * */ double SDLTest_RandomDouble(void); @@ -162,7 +162,7 @@ double SDLTest_RandomDouble(void); * \param boundary2 Upper boundary limit * \param validDomain Should the generated boundary be valid (=within the bounds) or not? * - * \returns Random boundary value for the given range and domain or 0 with error set + * \returns a random boundary value for the given range and domain or 0 with error set */ Uint8 SDLTest_RandomUint8BoundaryValue(Uint8 boundary1, Uint8 boundary2, SDL_bool validDomain); @@ -183,7 +183,7 @@ Uint8 SDLTest_RandomUint8BoundaryValue(Uint8 boundary1, Uint8 boundary2, SDL_boo * \param boundary2 Upper boundary limit * \param validDomain Should the generated boundary be valid (=within the bounds) or not? * - * \returns Random boundary value for the given range and domain or 0 with error set + * \returns a random boundary value for the given range and domain or 0 with error set */ Uint16 SDLTest_RandomUint16BoundaryValue(Uint16 boundary1, Uint16 boundary2, SDL_bool validDomain); @@ -204,7 +204,7 @@ Uint16 SDLTest_RandomUint16BoundaryValue(Uint16 boundary1, Uint16 boundary2, SDL * \param boundary2 Upper boundary limit * \param validDomain Should the generated boundary be valid (=within the bounds) or not? * - * \returns Random boundary value for the given range and domain or 0 with error set + * \returns a random boundary value for the given range and domain or 0 with error set */ Uint32 SDLTest_RandomUint32BoundaryValue(Uint32 boundary1, Uint32 boundary2, SDL_bool validDomain); @@ -225,7 +225,7 @@ Uint32 SDLTest_RandomUint32BoundaryValue(Uint32 boundary1, Uint32 boundary2, SDL * \param boundary2 Upper boundary limit * \param validDomain Should the generated boundary be valid (=within the bounds) or not? * - * \returns Random boundary value for the given range and domain or 0 with error set + * \returns a random boundary value for the given range and domain or 0 with error set */ Uint64 SDLTest_RandomUint64BoundaryValue(Uint64 boundary1, Uint64 boundary2, SDL_bool validDomain); @@ -246,7 +246,7 @@ Uint64 SDLTest_RandomUint64BoundaryValue(Uint64 boundary1, Uint64 boundary2, SDL * \param boundary2 Upper boundary limit * \param validDomain Should the generated boundary be valid (=within the bounds) or not? * - * \returns Random boundary value for the given range and domain or SINT8_MIN with error set + * \returns a random boundary value for the given range and domain or SINT8_MIN with error set */ Sint8 SDLTest_RandomSint8BoundaryValue(Sint8 boundary1, Sint8 boundary2, SDL_bool validDomain); @@ -268,7 +268,7 @@ Sint8 SDLTest_RandomSint8BoundaryValue(Sint8 boundary1, Sint8 boundary2, SDL_boo * \param boundary2 Upper boundary limit * \param validDomain Should the generated boundary be valid (=within the bounds) or not? * - * \returns Random boundary value for the given range and domain or SINT16_MIN with error set + * \returns a random boundary value for the given range and domain or SINT16_MIN with error set */ Sint16 SDLTest_RandomSint16BoundaryValue(Sint16 boundary1, Sint16 boundary2, SDL_bool validDomain); @@ -289,7 +289,7 @@ Sint16 SDLTest_RandomSint16BoundaryValue(Sint16 boundary1, Sint16 boundary2, SDL * \param boundary2 Upper boundary limit * \param validDomain Should the generated boundary be valid (=within the bounds) or not? * - * \returns Random boundary value for the given range and domain or SINT32_MIN with error set + * \returns a random boundary value for the given range and domain or SINT32_MIN with error set */ Sint32 SDLTest_RandomSint32BoundaryValue(Sint32 boundary1, Sint32 boundary2, SDL_bool validDomain); @@ -310,7 +310,7 @@ Sint32 SDLTest_RandomSint32BoundaryValue(Sint32 boundary1, Sint32 boundary2, SDL * \param boundary2 Upper boundary limit * \param validDomain Should the generated boundary be valid (=within the bounds) or not? * - * \returns Random boundary value for the given range and domain or SINT64_MIN with error set + * \returns a random boundary value for the given range and domain or SINT64_MIN with error set */ Sint64 SDLTest_RandomSint64BoundaryValue(Sint64 boundary1, Sint64 boundary2, SDL_bool validDomain); @@ -324,7 +324,7 @@ Sint64 SDLTest_RandomSint64BoundaryValue(Sint64 boundary1, Sint64 boundary2, SDL * \param min Minimum inclusive value of returned random number * \param max Maximum inclusive value of returned random number * - * \returns Generated random integer in range + * \returns a generated random integer in range */ Sint32 SDLTest_RandomIntegerInRange(Sint32 min, Sint32 max); @@ -336,7 +336,7 @@ Sint32 SDLTest_RandomIntegerInRange(Sint32 min, Sint32 max); * * Note: Returned string needs to be deallocated. * - * \returns Newly allocated random string; or NULL if length was invalid or string could not be allocated. + * \returns a newly allocated random string; or NULL if length was invalid or string could not be allocated. */ char * SDLTest_RandomAsciiString(void); @@ -350,7 +350,7 @@ char * SDLTest_RandomAsciiString(void); * * \param maxLength The maximum length of the generated string. * - * \returns Newly allocated random string; or NULL if maxLength was invalid or string could not be allocated. + * \returns a newly allocated random string; or NULL if maxLength was invalid or string could not be allocated. */ char * SDLTest_RandomAsciiStringWithMaximumLength(int maxLength); @@ -364,12 +364,14 @@ char * SDLTest_RandomAsciiStringWithMaximumLength(int maxLength); * * \param size The length of the generated string * - * \returns Newly allocated random string; or NULL if size was invalid or string could not be allocated. + * \returns a newly allocated random string; or NULL if size was invalid or string could not be allocated. */ char * SDLTest_RandomAsciiStringOfSize(int size); /** - * Returns the invocation count for the fuzzer since last ...FuzzerInit. + * Get the invocation count for the fuzzer since last ...FuzzerInit. + * + * \returns the invocation count. */ int SDLTest_GetFuzzerInvocationCount(void); diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_harness.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_harness.h index f5ae92ceb..1fd4236be 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_harness.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_harness.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -76,9 +76,9 @@ typedef struct SDLTest_TestCaseReference { /* !< Func2Stress */ SDLTest_TestCaseFp testCase; /* !< Short name (or function name) "Func2Stress" */ - char *name; + const char *name; /* !< Long name or full description "This test pushes func2() to the limit." */ - char *description; + const char *description; /* !< Set to TEST_ENABLED or TEST_DISABLED (test won't be run) */ int enabled; } SDLTest_TestCaseReference; @@ -88,7 +88,7 @@ typedef struct SDLTest_TestCaseReference { */ typedef struct SDLTest_TestSuiteReference { /* !< "PlatformSuite" */ - char *name; + const char *name; /* !< The function that is run before each test. NULL skips. */ SDLTest_TestCaseSetUpFp testSetUp; /* !< The test cases that are run as part of the suite. Last item should be NULL. */ @@ -105,7 +105,7 @@ typedef struct SDLTest_TestSuiteReference { * * \param length The length of the seed string to generate * - * \returns The generated seed string + * \returns the generated seed string */ char *SDLTest_GenerateRunSeed(const int length); @@ -118,7 +118,7 @@ char *SDLTest_GenerateRunSeed(const int length); * \param filter Filter specification. NULL disables. Case sensitive. * \param testIterations Number of iterations to run each test case. * - * \returns Test run result; 0 when all tests passed, 1 if any tests failed. + * \returns the test run result: 0 when all tests passed, 1 if any tests failed. */ int SDLTest_RunSuites(SDLTest_TestSuiteReference *testSuites[], const char *userRunSeed, Uint64 userExecKey, const char *filter, int testIterations); diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_images.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_images.h index b8934812f..e2bfc3600 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_images.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_images.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_log.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_log.h index 01d0fedac..e3d39ad27 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_log.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_log.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_md5.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_md5.h index 2bfd7dff9..17b1d2be7 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_md5.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_md5.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_memory.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_memory.h index 5d4d39ea5..cc2edc1b9 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_memory.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_memory.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_random.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_random.h index 71e9c70b6..b1d6060cb 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_random.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_test_random.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -98,7 +98,7 @@ extern "C" { * * \param rndContext pointer to context structure * - * \returns A random number (32bit unsigned integer) + * \returns a random number (32bit unsigned integer) * */ unsigned int SDLTest_Random(SDLTest_RandomContext *rndContext); diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_thread.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_thread.h index f78b1145d..35e680ddf 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_thread.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_thread.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -35,6 +35,17 @@ #include "SDL_atomic.h" #include "SDL_mutex.h" +#if defined(__WIN32__) +#include /* _beginthreadex() and _endthreadex() */ +#endif +#if defined(__OS2__) /* for _beginthread() and _endthread() */ +#ifndef __EMX__ +#include +#else +#include +#endif +#endif + #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ #ifdef __cplusplus @@ -54,6 +65,11 @@ typedef unsigned int SDL_TLSID; /** * The SDL thread priority. * + * SDL will make system changes as necessary in order to apply the thread priority. + * Code which attempts to control thread state related to priority should be aware + * that calling SDL_SetThreadPriority may alter such state. + * SDL_HINT_THREAD_PRIORITY_POLICY can be used to control aspects of this behavior. + * * \note On many systems you require special privileges to set high or time critical priority. */ typedef enum { @@ -64,12 +80,15 @@ typedef enum { } SDL_ThreadPriority; /** - * The function passed to SDL_CreateThread(). - * It is passed a void* user context parameter and returns an int. + * The function passed to SDL_CreateThread(). + * + * \param data what was passed as `data` to SDL_CreateThread() + * \returns a value that can be reported through SDL_WaitThread(). */ typedef int (SDLCALL * SDL_ThreadFunction) (void *data); -#if defined(__WIN32__) && !defined(HAVE_LIBC) + +#if defined(__WIN32__) /** * \file SDL_thread.h * @@ -91,16 +110,19 @@ typedef int (SDLCALL * SDL_ThreadFunction) (void *data); * library! */ #define SDL_PASSED_BEGINTHREAD_ENDTHREAD -#include /* _beginthreadex() and _endthreadex() */ -typedef uintptr_t(__cdecl * pfnSDL_CurrentBeginThread) +typedef uintptr_t (__cdecl * pfnSDL_CurrentBeginThread) (void *, unsigned, unsigned (__stdcall *func)(void *), void * /*arg*/, unsigned, unsigned * /* threadID */); typedef void (__cdecl * pfnSDL_CurrentEndThread) (unsigned code); -/** - * Create a thread. - */ +#ifndef SDL_beginthread +#define SDL_beginthread _beginthreadex +#endif +#ifndef SDL_endthread +#define SDL_endthread _endthreadex +#endif + extern DECLSPEC SDL_Thread *SDLCALL SDL_CreateThread(SDL_ThreadFunction fn, const char *name, void *data, pfnSDL_CurrentBeginThread pfnBeginThread, @@ -113,17 +135,14 @@ SDL_CreateThreadWithStackSize(int (SDLCALL * fn) (void *), pfnSDL_CurrentEndThread pfnEndThread); -/** - * Create a thread. - */ #if defined(SDL_CreateThread) && SDL_DYNAMIC_API #undef SDL_CreateThread -#define SDL_CreateThread(fn, name, data) SDL_CreateThread_REAL(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthreadex, (pfnSDL_CurrentEndThread)_endthreadex) +#define SDL_CreateThread(fn, name, data) SDL_CreateThread_REAL(fn, name, data, (pfnSDL_CurrentBeginThread)SDL_beginthread, (pfnSDL_CurrentEndThread)SDL_endthread) #undef SDL_CreateThreadWithStackSize -#define SDL_CreateThreadWithStackSize(fn, name, stacksize, data) SDL_CreateThreadWithStackSize_REAL(fn, name, stacksize, data, (pfnSDL_CurrentBeginThread)_beginthreadex, (pfnSDL_CurrentEndThread)_endthreadex) +#define SDL_CreateThreadWithStackSize(fn, name, stacksize, data) SDL_CreateThreadWithStackSize_REAL(fn, name, stacksize, data, (pfnSDL_CurrentBeginThread)SDL_beginthread, (pfnSDL_CurrentEndThread)SDL_endthread) #else -#define SDL_CreateThread(fn, name, data) SDL_CreateThread(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthreadex, (pfnSDL_CurrentEndThread)_endthreadex) -#define SDL_CreateThreadWithStackSize(fn, name, stacksize, data) SDL_CreateThreadWithStackSize(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthreadex, (pfnSDL_CurrentEndThread)_endthreadex) +#define SDL_CreateThread(fn, name, data) SDL_CreateThread(fn, name, data, (pfnSDL_CurrentBeginThread)SDL_beginthread, (pfnSDL_CurrentEndThread)SDL_endthread) +#define SDL_CreateThreadWithStackSize(fn, name, stacksize, data) SDL_CreateThreadWithStackSize(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthreadex, (pfnSDL_CurrentEndThread)SDL_endthread) #endif #elif defined(__OS2__) @@ -132,13 +151,17 @@ SDL_CreateThreadWithStackSize(int (SDLCALL * fn) (void *), * into a dll with Watcom's runtime statically linked. */ #define SDL_PASSED_BEGINTHREAD_ENDTHREAD -#ifndef __EMX__ -#include -#else -#include -#endif + typedef int (*pfnSDL_CurrentBeginThread)(void (*func)(void *), void *, unsigned, void * /*arg*/); typedef void (*pfnSDL_CurrentEndThread)(void); + +#ifndef SDL_beginthread +#define SDL_beginthread _beginthread +#endif +#ifndef SDL_endthread +#define SDL_endthread _endthread +#endif + extern DECLSPEC SDL_Thread *SDLCALL SDL_CreateThread(SDL_ThreadFunction fn, const char *name, void *data, pfnSDL_CurrentBeginThread pfnBeginThread, @@ -147,52 +170,85 @@ extern DECLSPEC SDL_Thread *SDLCALL SDL_CreateThreadWithStackSize(SDL_ThreadFunction fn, const char *name, const size_t stacksize, void *data, pfnSDL_CurrentBeginThread pfnBeginThread, pfnSDL_CurrentEndThread pfnEndThread); + #if defined(SDL_CreateThread) && SDL_DYNAMIC_API #undef SDL_CreateThread -#define SDL_CreateThread(fn, name, data) SDL_CreateThread_REAL(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthread, (pfnSDL_CurrentEndThread)_endthread) +#define SDL_CreateThread(fn, name, data) SDL_CreateThread_REAL(fn, name, data, (pfnSDL_CurrentBeginThread)SDL_beginthread, (pfnSDL_CurrentEndThread)SDL_endthread) #undef SDL_CreateThreadWithStackSize -#define SDL_CreateThreadWithStackSize(fn, name, stacksize, data) SDL_CreateThreadWithStackSize_REAL(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthread, (pfnSDL_CurrentEndThread)_endthread) +#define SDL_CreateThreadWithStackSize(fn, name, stacksize, data) SDL_CreateThreadWithStackSize_REAL(fn, name, data, (pfnSDL_CurrentBeginThread)SDL_beginthread, (pfnSDL_CurrentEndThread)SDL_endthread) #else -#define SDL_CreateThread(fn, name, data) SDL_CreateThread(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthread, (pfnSDL_CurrentEndThread)_endthread) -#define SDL_CreateThreadWithStackSize(fn, name, stacksize, data) SDL_CreateThreadWithStackSize(fn, name, stacksize, data, (pfnSDL_CurrentBeginThread)_beginthread, (pfnSDL_CurrentEndThread)_endthread) +#define SDL_CreateThread(fn, name, data) SDL_CreateThread(fn, name, data, (pfnSDL_CurrentBeginThread)SDL_beginthread, (pfnSDL_CurrentEndThread)SDL_endthread) +#define SDL_CreateThreadWithStackSize(fn, name, stacksize, data) SDL_CreateThreadWithStackSize(fn, name, stacksize, data, (pfnSDL_CurrentBeginThread)SDL_beginthread, (pfnSDL_CurrentEndThread)SDL_endthread) #endif #else /** - * Create a thread with a default stack size. + * Create a new thread with a default stack size. * - * This is equivalent to calling: - * SDL_CreateThreadWithStackSize(fn, name, 0, data); + * This is equivalent to calling: + * + * ```c + * SDL_CreateThreadWithStackSize(fn, name, 0, data); + * ``` + * + * \param fn the SDL_ThreadFunction function to call in the new thread + * \param name the name of the thread + * \param data a pointer that is passed to `fn` + * \returns an opaque pointer to the new thread object on success, NULL if the + * new thread could not be created; call SDL_GetError() for more + * information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateThreadWithStackSize + * \sa SDL_WaitThread */ extern DECLSPEC SDL_Thread *SDLCALL SDL_CreateThread(SDL_ThreadFunction fn, const char *name, void *data); /** - * Create a thread. + * Create a new thread with a specific stack size. * - * Thread naming is a little complicated: Most systems have very small - * limits for the string length (Haiku has 32 bytes, Linux currently has 16, - * Visual C++ 6.0 has nine!), and possibly other arbitrary rules. You'll - * have to see what happens with your system's debugger. The name should be - * UTF-8 (but using the naming limits of C identifiers is a better bet). - * There are no requirements for thread naming conventions, so long as the - * string is null-terminated UTF-8, but these guidelines are helpful in - * choosing a name: + * SDL makes an attempt to report `name` to the system, so that debuggers can + * display it. Not all platforms support this. * - * http://stackoverflow.com/questions/149932/naming-conventions-for-threads + * Thread naming is a little complicated: Most systems have very small limits + * for the string length (Haiku has 32 bytes, Linux currently has 16, Visual + * C++ 6.0 has _nine_!), and possibly other arbitrary rules. You'll have to + * see what happens with your system's debugger. The name should be UTF-8 (but + * using the naming limits of C identifiers is a better bet). There are no + * requirements for thread naming conventions, so long as the string is + * null-terminated UTF-8, but these guidelines are helpful in choosing a name: * - * If a system imposes requirements, SDL will try to munge the string for - * it (truncate, etc), but the original string contents will be available - * from SDL_GetThreadName(). + * https://stackoverflow.com/questions/149932/naming-conventions-for-threads * - * The size (in bytes) of the new stack can be specified. Zero means "use - * the system default" which might be wildly different between platforms - * (x86 Linux generally defaults to eight megabytes, an embedded device - * might be a few kilobytes instead). + * If a system imposes requirements, SDL will try to munge the string for it + * (truncate, etc), but the original string contents will be available from + * SDL_GetThreadName(). * - * In SDL 2.1, stacksize will be folded into the original SDL_CreateThread - * function. + * The size (in bytes) of the new stack can be specified. Zero means "use the + * system default" which might be wildly different between platforms. x86 + * Linux generally defaults to eight megabytes, an embedded device might be a + * few kilobytes instead. You generally need to specify a stack that is a + * multiple of the system's page size (in many cases, this is 4 kilobytes, but + * check your system documentation). + * + * In SDL 2.1, stack size will be folded into the original SDL_CreateThread + * function, but for backwards compatibility, this is currently a separate + * function. + * + * \param fn the SDL_ThreadFunction function to call in the new thread + * \param name the name of the thread + * \param stacksize the size, in bytes, to allocate for the new thread stack. + * \param data a pointer that is passed to `fn` + * \returns an opaque pointer to the new thread object on success, NULL if the + * new thread could not be created; call SDL_GetError() for more + * information. + * + * \since This function is available since SDL 2.0.9. + * + * \sa SDL_WaitThread */ extern DECLSPEC SDL_Thread *SDLCALL SDL_CreateThreadWithStackSize(SDL_ThreadFunction fn, const char *name, const size_t stacksize, void *data); @@ -200,137 +256,202 @@ SDL_CreateThreadWithStackSize(SDL_ThreadFunction fn, const char *name, const siz #endif /** - * Get the thread name, as it was specified in SDL_CreateThread(). - * This function returns a pointer to a UTF-8 string that names the - * specified thread, or NULL if it doesn't have a name. This is internal - * memory, not to be free()'d by the caller, and remains valid until the - * specified thread is cleaned up by SDL_WaitThread(). + * Get the thread name as it was specified in SDL_CreateThread(). + * + * This is internal memory, not to be freed by the caller, and remains valid + * until the specified thread is cleaned up by SDL_WaitThread(). + * + * \param thread the thread to query + * \returns a pointer to a UTF-8 string that names the specified thread, or + * NULL if it doesn't have a name. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateThread */ extern DECLSPEC const char *SDLCALL SDL_GetThreadName(SDL_Thread *thread); /** - * Get the thread identifier for the current thread. + * Get the thread identifier for the current thread. + * + * This thread identifier is as reported by the underlying operating system. + * If SDL is running on a platform that does not support threads the return + * value will always be zero. + * + * This function also returns a valid thread ID when called from the main + * thread. + * + * \returns the ID of the current thread. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetThreadID */ extern DECLSPEC SDL_threadID SDLCALL SDL_ThreadID(void); /** - * Get the thread identifier for the specified thread. + * Get the thread identifier for the specified thread. * - * Equivalent to SDL_ThreadID() if the specified thread is NULL. + * This thread identifier is as reported by the underlying operating system. + * If SDL is running on a platform that does not support threads the return + * value will always be zero. + * + * \param thread the thread to query + * \returns the ID of the specified thread, or the ID of the current thread if + * `thread` is NULL. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ThreadID */ extern DECLSPEC SDL_threadID SDLCALL SDL_GetThreadID(SDL_Thread * thread); /** - * Set the priority for the current thread + * Set the priority for the current thread. + * + * Note that some platforms will not let you alter the priority (or at least, + * promote the thread to a higher priority) at all, and some require you to be + * an administrator account. Be prepared for this to fail. + * + * \param priority the SDL_ThreadPriority to set + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC int SDLCALL SDL_SetThreadPriority(SDL_ThreadPriority priority); /** - * Wait for a thread to finish. Threads that haven't been detached will - * remain (as a "zombie") until this function cleans them up. Not doing so - * is a resource leak. + * Wait for a thread to finish. * - * Once a thread has been cleaned up through this function, the SDL_Thread - * that references it becomes invalid and should not be referenced again. - * As such, only one thread may call SDL_WaitThread() on another. + * Threads that haven't been detached will remain (as a "zombie") until this + * function cleans them up. Not doing so is a resource leak. * - * The return code for the thread function is placed in the area - * pointed to by \c status, if \c status is not NULL. + * Once a thread has been cleaned up through this function, the SDL_Thread + * that references it becomes invalid and should not be referenced again. As + * such, only one thread may call SDL_WaitThread() on another. * - * You may not wait on a thread that has been used in a call to - * SDL_DetachThread(). Use either that function or this one, but not - * both, or behavior is undefined. + * The return code for the thread function is placed in the area pointed to by + * `status`, if `status` is not NULL. * - * It is safe to pass NULL to this function; it is a no-op. + * You may not wait on a thread that has been used in a call to + * SDL_DetachThread(). Use either that function or this one, but not both, or + * behavior is undefined. + * + * It is safe to pass a NULL thread to this function; it is a no-op. + * + * Note that the thread pointer is freed by this function and is not valid + * afterward. + * + * \param thread the SDL_Thread pointer that was returned from the + * SDL_CreateThread() call that started this thread + * \param status pointer to an integer that will receive the value returned + * from the thread function by its 'return', or NULL to not + * receive such value back. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateThread + * \sa SDL_DetachThread */ extern DECLSPEC void SDLCALL SDL_WaitThread(SDL_Thread * thread, int *status); /** - * A thread may be "detached" to signify that it should not remain until - * another thread has called SDL_WaitThread() on it. Detaching a thread - * is useful for long-running threads that nothing needs to synchronize - * with or further manage. When a detached thread is done, it simply - * goes away. + * Let a thread clean up on exit without intervention. * - * There is no way to recover the return code of a detached thread. If you - * need this, don't detach the thread and instead use SDL_WaitThread(). + * A thread may be "detached" to signify that it should not remain until + * another thread has called SDL_WaitThread() on it. Detaching a thread is + * useful for long-running threads that nothing needs to synchronize with or + * further manage. When a detached thread is done, it simply goes away. * - * Once a thread is detached, you should usually assume the SDL_Thread isn't - * safe to reference again, as it will become invalid immediately upon - * the detached thread's exit, instead of remaining until someone has called - * SDL_WaitThread() to finally clean it up. As such, don't detach the same - * thread more than once. + * There is no way to recover the return code of a detached thread. If you + * need this, don't detach the thread and instead use SDL_WaitThread(). * - * If a thread has already exited when passed to SDL_DetachThread(), it will - * stop waiting for a call to SDL_WaitThread() and clean up immediately. - * It is not safe to detach a thread that might be used with SDL_WaitThread(). + * Once a thread is detached, you should usually assume the SDL_Thread isn't + * safe to reference again, as it will become invalid immediately upon the + * detached thread's exit, instead of remaining until someone has called + * SDL_WaitThread() to finally clean it up. As such, don't detach the same + * thread more than once. * - * You may not call SDL_WaitThread() on a thread that has been detached. - * Use either that function or this one, but not both, or behavior is - * undefined. + * If a thread has already exited when passed to SDL_DetachThread(), it will + * stop waiting for a call to SDL_WaitThread() and clean up immediately. It is + * not safe to detach a thread that might be used with SDL_WaitThread(). * - * It is safe to pass NULL to this function; it is a no-op. + * You may not call SDL_WaitThread() on a thread that has been detached. Use + * either that function or this one, but not both, or behavior is undefined. + * + * It is safe to pass NULL to this function; it is a no-op. + * + * \param thread the SDL_Thread pointer that was returned from the + * SDL_CreateThread() call that started this thread + * + * \since This function is available since SDL 2.0.2. + * + * \sa SDL_CreateThread + * \sa SDL_WaitThread */ extern DECLSPEC void SDLCALL SDL_DetachThread(SDL_Thread * thread); /** - * \brief Create an identifier that is globally visible to all threads but refers to data that is thread-specific. + * Create a piece of thread-local storage. * - * \return The newly created thread local storage identifier, or 0 on error + * This creates an identifier that is globally visible to all threads but + * refers to data that is thread-specific. * - * \code - * static SDL_SpinLock tls_lock; - * static SDL_TLSID thread_local_storage; - * - * void SetMyThreadData(void *value) - * { - * if (!thread_local_storage) { - * SDL_AtomicLock(&tls_lock); - * if (!thread_local_storage) { - * thread_local_storage = SDL_TLSCreate(); - * } - * SDL_AtomicUnlock(&tls_lock); - * } - * SDL_TLSSet(thread_local_storage, value, 0); - * } - * - * void *GetMyThreadData(void) - * { - * return SDL_TLSGet(thread_local_storage); - * } - * \endcode + * \returns the newly created thread local storage identifier or 0 on error. * - * \sa SDL_TLSGet() - * \sa SDL_TLSSet() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_TLSGet + * \sa SDL_TLSSet */ extern DECLSPEC SDL_TLSID SDLCALL SDL_TLSCreate(void); /** - * \brief Get the value associated with a thread local storage ID for the current thread. + * Get the current thread's value associated with a thread local storage ID. * - * \param id The thread local storage ID + * \param id the thread local storage ID + * \returns the value associated with the ID for the current thread or NULL if + * no value has been set; call SDL_GetError() for more information. * - * \return The value associated with the ID for the current thread, or NULL if no value has been set. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_TLSCreate() - * \sa SDL_TLSSet() + * \sa SDL_TLSCreate + * \sa SDL_TLSSet */ extern DECLSPEC void * SDLCALL SDL_TLSGet(SDL_TLSID id); /** - * \brief Set the value associated with a thread local storage ID for the current thread. + * Set the current thread's value associated with a thread local storage ID. * - * \param id The thread local storage ID - * \param value The value to associate with the ID for the current thread - * \param destructor A function called when the thread exits, to free the value. + * The function prototype for `destructor` is: * - * \return 0 on success, -1 on error + * ```c + * void destructor(void *value) + * ``` * - * \sa SDL_TLSCreate() - * \sa SDL_TLSGet() + * where its parameter `value` is what was passed as `value` to SDL_TLSSet(). + * + * \param id the thread local storage ID + * \param value the value to associate with the ID for the current thread + * \param destructor a function called when the thread exits, to free the + * value + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_TLSCreate + * \sa SDL_TLSGet */ extern DECLSPEC int SDLCALL SDL_TLSSet(SDL_TLSID id, const void *value, void (SDLCALL *destructor)(void*)); +/** + * Cleanup all TLS data for this thread. + * + * \since This function is available since SDL 2.0.16. + */ +extern DECLSPEC void SDLCALL SDL_TLSCleanup(void); /* Ends C function definitions when using C++ */ #ifdef __cplusplus diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_timer.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_timer.h index 2a47b043a..62f81d42d 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_timer.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_timer.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -38,45 +38,121 @@ extern "C" { #endif /** - * \brief Get the number of milliseconds since the SDL library initialization. + * Get the number of milliseconds since SDL library initialization. * - * \note This value wraps if the program runs for more than ~49 days. + * This value wraps if the program runs for more than ~49 days. + * + * This function is not recommended as of SDL 2.0.18; use SDL_GetTicks64() + * instead, where the value doesn't wrap every ~49 days. There are places in + * SDL where we provide a 32-bit timestamp that can not change without + * breaking binary compatibility, though, so this function isn't officially + * deprecated. + * + * \returns an unsigned 32-bit value representing the number of milliseconds + * since the SDL library initialized. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_TICKS_PASSED */ extern DECLSPEC Uint32 SDLCALL SDL_GetTicks(void); /** - * \brief Compare SDL ticks values, and return true if A has passed B + * Get the number of milliseconds since SDL library initialization. * - * e.g. if you want to wait 100 ms, you could do this: - * Uint32 timeout = SDL_GetTicks() + 100; - * while (!SDL_TICKS_PASSED(SDL_GetTicks(), timeout)) { - * ... do work until timeout has elapsed - * } + * Note that you should not use the SDL_TICKS_PASSED macro with values + * returned by this function, as that macro does clever math to compensate for + * the 32-bit overflow every ~49 days that SDL_GetTicks() suffers from. 64-bit + * values from this function can be safely compared directly. + * + * For example, if you want to wait 100 ms, you could do this: + * + * ```c + * const Uint64 timeout = SDL_GetTicks64() + 100; + * while (SDL_GetTicks64() < timeout) { + * // ... do work until timeout has elapsed + * } + * ``` + * + * \returns an unsigned 64-bit value representing the number of milliseconds + * since the SDL library initialized. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC Uint64 SDLCALL SDL_GetTicks64(void); + +/** + * Compare 32-bit SDL ticks values, and return true if `A` has passed `B`. + * + * This should be used with results from SDL_GetTicks(), as this macro + * attempts to deal with the 32-bit counter wrapping back to zero every ~49 + * days, but should _not_ be used with SDL_GetTicks64(), which does not have + * that problem. + * + * For example, with SDL_GetTicks(), if you want to wait 100 ms, you could + * do this: + * + * ```c + * const Uint32 timeout = SDL_GetTicks() + 100; + * while (!SDL_TICKS_PASSED(SDL_GetTicks(), timeout)) { + * // ... do work until timeout has elapsed + * } + * ``` + * + * Note that this does not handle tick differences greater + * than 2^31 so take care when using the above kind of code + * with large timeout delays (tens of days). */ #define SDL_TICKS_PASSED(A, B) ((Sint32)((B) - (A)) <= 0) /** - * \brief Get the current value of the high resolution counter + * Get the current value of the high resolution counter. + * + * This function is typically used for profiling. + * + * The counter values are only meaningful relative to each other. Differences + * between values can be converted to times by using + * SDL_GetPerformanceFrequency(). + * + * \returns the current counter value. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetPerformanceFrequency */ extern DECLSPEC Uint64 SDLCALL SDL_GetPerformanceCounter(void); /** - * \brief Get the count per second of the high resolution counter + * Get the count per second of the high resolution counter. + * + * \returns a platform-specific count per second. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetPerformanceCounter */ extern DECLSPEC Uint64 SDLCALL SDL_GetPerformanceFrequency(void); /** - * \brief Wait a specified number of milliseconds before returning. + * Wait a specified number of milliseconds before returning. + * + * This function waits a specified number of milliseconds before returning. It + * waits at least the specified time, but possibly longer due to OS + * scheduling. + * + * \param ms the number of milliseconds to delay + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC void SDLCALL SDL_Delay(Uint32 ms); /** - * Function prototype for the timer callback function. + * Function prototype for the timer callback function. * - * The callback function is passed the current timer interval and returns - * the next timer interval. If the returned value is the same as the one - * passed in, the periodic alarm continues, otherwise a new alarm is - * scheduled. If the callback returns 0, the periodic alarm is cancelled. + * The callback function is passed the current timer interval and returns + * the next timer interval. If the returned value is the same as the one + * passed in, the periodic alarm continues, otherwise a new alarm is + * scheduled. If the callback returns 0, the periodic alarm is cancelled. */ typedef Uint32 (SDLCALL * SDL_TimerCallback) (Uint32 interval, void *param); @@ -86,20 +162,51 @@ typedef Uint32 (SDLCALL * SDL_TimerCallback) (Uint32 interval, void *param); typedef int SDL_TimerID; /** - * \brief Add a new timer to the pool of timers already running. + * Call a callback function at a future time. * - * \return A timer ID, or 0 when an error occurs. + * If you use this function, you must pass `SDL_INIT_TIMER` to SDL_Init(). + * + * The callback function is passed the current timer interval and the user + * supplied parameter from the SDL_AddTimer() call and should return the next + * timer interval. If the value returned from the callback is 0, the timer is + * canceled. + * + * The callback is run on a separate thread. + * + * Timers take into account the amount of time it took to execute the + * callback. For example, if the callback took 250 ms to execute and returned + * 1000 (ms), the timer would only wait another 750 ms before its next + * iteration. + * + * Timing may be inexact due to OS scheduling. Be sure to note the current + * time with SDL_GetTicks() or SDL_GetPerformanceCounter() in case your + * callback needs to adjust for variances. + * + * \param interval the timer delay, in milliseconds, passed to `callback` + * \param callback the SDL_TimerCallback function to call when the specified + * `interval` elapses + * \param param a pointer that is passed to `callback` + * \returns a timer ID or 0 if an error occurs; call SDL_GetError() for more + * information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RemoveTimer */ extern DECLSPEC SDL_TimerID SDLCALL SDL_AddTimer(Uint32 interval, SDL_TimerCallback callback, void *param); /** - * \brief Remove a timer knowing its ID. + * Remove a timer created with SDL_AddTimer(). * - * \return A boolean value indicating success or failure. + * \param id the ID of the timer to remove + * \returns SDL_TRUE if the timer is removed or SDL_FALSE if the timer wasn't + * found. * - * \warning It is not safe to remove a timer multiple times. + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AddTimer */ extern DECLSPEC SDL_bool SDLCALL SDL_RemoveTimer(SDL_TimerID id); diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_touch.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_touch.h index 99dbcb8c3..9b00716b2 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_touch.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_touch.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -64,30 +64,70 @@ typedef struct SDL_Finger #define SDL_MOUSE_TOUCHID ((Sint64)-1) -/* Function prototypes */ - /** - * \brief Get the number of registered touch devices. + * Get the number of registered touch devices. + * + * On some platforms SDL first sees the touch device if it was actually used. + * Therefore SDL_GetNumTouchDevices() may return 0 although devices are + * available. After using all devices at least once the number will be + * correct. + * + * This was fixed for Android in SDL 2.0.1. + * + * \returns the number of registered touch devices. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetTouchDevice */ extern DECLSPEC int SDLCALL SDL_GetNumTouchDevices(void); /** - * \brief Get the touch ID with the given index, or 0 if the index is invalid. + * Get the touch ID with the given index. + * + * \param index the touch device index + * \returns the touch ID with the given index on success or 0 if the index is + * invalid; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetNumTouchDevices */ extern DECLSPEC SDL_TouchID SDLCALL SDL_GetTouchDevice(int index); /** - * \brief Get the type of the given touch device. + * Get the type of the given touch device. + * + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC SDL_TouchDeviceType SDLCALL SDL_GetTouchDeviceType(SDL_TouchID touchID); /** - * \brief Get the number of active fingers for a given touch device. + * Get the number of active fingers for a given touch device. + * + * \param touchID the ID of a touch device + * \returns the number of active fingers for a given touch device on success + * or 0 on failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetTouchFinger */ extern DECLSPEC int SDLCALL SDL_GetNumTouchFingers(SDL_TouchID touchID); /** - * \brief Get the finger object of the given touch, with the given index. + * Get the finger object for specified touch device ID and finger index. + * + * The returned resource is owned by SDL and should not be deallocated. + * + * \param touchID the ID of the requested touch device + * \param index the index of the requested finger + * \returns a pointer to the SDL_Finger object or NULL if no object at the + * given ID and index could be found. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RecordGesture */ extern DECLSPEC SDL_Finger * SDLCALL SDL_GetTouchFinger(SDL_TouchID touchID, int index); diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_types.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_types.h index 9c3e9896f..355fb501a 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_types.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_types.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_version.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_version.h index 6c7499d32..2716eba7b 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_version.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_version.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -37,16 +37,16 @@ extern "C" { #endif /** - * \brief Information the version of SDL in use. + * Information about the version of SDL in use. * - * Represents the library's version as three levels: major revision - * (increments with massive changes, additions, and enhancements), - * minor revision (increments with backwards-compatible changes to the - * major revision), and patchlevel (increments with fixes to the minor - * revision). + * Represents the library's version as three levels: major revision + * (increments with massive changes, additions, and enhancements), + * minor revision (increments with backwards-compatible changes to the + * major revision), and patchlevel (increments with fixes to the minor + * revision). * - * \sa SDL_VERSION - * \sa SDL_GetVersion + * \sa SDL_VERSION + * \sa SDL_GetVersion */ typedef struct SDL_version { @@ -59,22 +59,22 @@ typedef struct SDL_version */ #define SDL_MAJOR_VERSION 2 #define SDL_MINOR_VERSION 0 -#define SDL_PATCHLEVEL 10 +#define SDL_PATCHLEVEL 20 /** - * \brief Macro to determine SDL version program was compiled against. + * Macro to determine SDL version program was compiled against. * - * This macro fills in a SDL_version structure with the version of the - * library you compiled against. This is determined by what header the - * compiler uses. Note that if you dynamically linked the library, you might - * have a slightly newer or older version at runtime. That version can be - * determined with SDL_GetVersion(), which, unlike SDL_VERSION(), - * is not a macro. + * This macro fills in a SDL_version structure with the version of the + * library you compiled against. This is determined by what header the + * compiler uses. Note that if you dynamically linked the library, you might + * have a slightly newer or older version at runtime. That version can be + * determined with SDL_GetVersion(), which, unlike SDL_VERSION(), + * is not a macro. * - * \param x A pointer to a SDL_version struct to initialize. + * \param x A pointer to a SDL_version struct to initialize. * - * \sa SDL_version - * \sa SDL_GetVersion + * \sa SDL_version + * \sa SDL_GetVersion */ #define SDL_VERSION(x) \ { \ @@ -107,48 +107,74 @@ typedef struct SDL_version (SDL_COMPILEDVERSION >= SDL_VERSIONNUM(X, Y, Z)) /** - * \brief Get the version of SDL that is linked against your program. + * Get the version of SDL that is linked against your program. * - * If you are linking to SDL dynamically, then it is possible that the - * current version will be different than the version you compiled against. - * This function returns the current version, while SDL_VERSION() is a - * macro that tells you what version you compiled with. + * If you are linking to SDL dynamically, then it is possible that the current + * version will be different than the version you compiled against. This + * function returns the current version, while SDL_VERSION() is a macro that + * tells you what version you compiled with. * - * \code - * SDL_version compiled; - * SDL_version linked; + * This function may be called safely at any time, even before SDL_Init(). * - * SDL_VERSION(&compiled); - * SDL_GetVersion(&linked); - * printf("We compiled against SDL version %d.%d.%d ...\n", - * compiled.major, compiled.minor, compiled.patch); - * printf("But we linked against SDL version %d.%d.%d.\n", - * linked.major, linked.minor, linked.patch); - * \endcode + * \param ver the SDL_version structure that contains the version information * - * This function may be called safely at any time, even before SDL_Init(). + * \since This function is available since SDL 2.0.0. * - * \sa SDL_VERSION + * \sa SDL_GetRevision */ extern DECLSPEC void SDLCALL SDL_GetVersion(SDL_version * ver); /** - * \brief Get the code revision of SDL that is linked against your program. + * Get the code revision of SDL that is linked against your program. * - * Returns an arbitrary string (a hash value) uniquely identifying the - * exact revision of the SDL library in use, and is only useful in comparing - * against other revisions. It is NOT an incrementing number. + * This value is the revision of the code you are linked with and may be + * different from the code you are compiling with, which is found in the + * constant SDL_REVISION. + * + * The revision is arbitrary string (a hash value) uniquely identifying the + * exact revision of the SDL library in use, and is only useful in comparing + * against other revisions. It is NOT an incrementing number. + * + * If SDL wasn't built from a git repository with the appropriate tools, this + * will return an empty string. + * + * Prior to SDL 2.0.16, before development moved to GitHub, this returned a + * hash for a Mercurial repository. + * + * You shouldn't use this function for anything but logging it for debugging + * purposes. The string is not intended to be reliable in any way. + * + * \returns an arbitrary string, uniquely identifying the exact revision of + * the SDL library in use. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetVersion */ extern DECLSPEC const char *SDLCALL SDL_GetRevision(void); /** - * \brief Get the revision number of SDL that is linked against your program. + * Obsolete function, do not use. * - * Returns a number uniquely identifying the exact revision of the SDL - * library in use. It is an incrementing number based on commits to - * hg.libsdl.org. + * When SDL was hosted in a Mercurial repository, and was built carefully, + * this would return the revision number that the build was created from. This + * number was not reliable for several reasons, but more importantly, SDL is + * now hosted in a git repository, which does not offer numbers at all, only + * hashes. This function only ever returns zero now. Don't use it. + * + * Before SDL 2.0.16, this might have returned an unreliable, but non-zero + * number. + * + * \deprecated Use SDL_GetRevision() instead; if SDL was carefully built, it + * will return a git hash. + * + * \returns zero, always, in modern SDL releases. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetRevision */ -extern DECLSPEC int SDLCALL SDL_GetRevisionNumber(void); +extern SDL_DEPRECATED DECLSPEC int SDLCALL SDL_GetRevisionNumber(void); /* Ends C function definitions when using C++ */ diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_video.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_video.h index 352afd436..e43cb27ec 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_video.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_video.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -65,9 +65,12 @@ typedef struct * \sa SDL_CreateWindow() * \sa SDL_CreateWindowFrom() * \sa SDL_DestroyWindow() + * \sa SDL_FlashWindow() * \sa SDL_GetWindowData() * \sa SDL_GetWindowFlags() * \sa SDL_GetWindowGrab() + * \sa SDL_GetWindowKeyboardGrab() + * \sa SDL_GetWindowMouseGrab() * \sa SDL_GetWindowPosition() * \sa SDL_GetWindowSize() * \sa SDL_GetWindowTitle() @@ -79,6 +82,8 @@ typedef struct * \sa SDL_SetWindowData() * \sa SDL_SetWindowFullscreen() * \sa SDL_SetWindowGrab() + * \sa SDL_SetWindowKeyboardGrab() + * \sa SDL_SetWindowMouseGrab() * \sa SDL_SetWindowIcon() * \sa SDL_SetWindowPosition() * \sa SDL_SetWindowSize() @@ -96,7 +101,6 @@ typedef struct SDL_Window SDL_Window; */ typedef enum { - /* !!! FIXME: change this to name = (1<= 1 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetVideoDriver */ extern DECLSPEC int SDLCALL SDL_GetNumVideoDrivers(void); /** - * \brief Get the name of a built in video driver. + * Get the name of a built in video driver. * - * \note The video drivers are presented in the order in which they are - * normally checked during initialization. + * The video drivers are presented in the order in which they are normally + * checked during initialization. * - * \sa SDL_GetNumVideoDrivers() + * \param index the index of a video driver + * \returns the name of the video driver with the given **index**. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetNumVideoDrivers */ extern DECLSPEC const char *SDLCALL SDL_GetVideoDriver(int index); /** - * \brief Initialize the video subsystem, optionally specifying a video driver. + * Initialize the video subsystem, optionally specifying a video driver. * - * \param driver_name Initialize a specific driver by name, or NULL for the - * default video driver. + * This function initializes the video subsystem, setting up a connection to + * the window manager, etc, and determines the available display modes and + * pixel formats, but does not initialize a window or graphics mode. * - * \return 0 on success, -1 on error + * If you use this function and you haven't used the SDL_INIT_VIDEO flag with + * either SDL_Init() or SDL_InitSubSystem(), you should call SDL_VideoQuit() + * before calling SDL_Quit(). * - * This function initializes the video subsystem; setting up a connection - * to the window manager, etc, and determines the available display modes - * and pixel formats, but does not initialize a window or graphics mode. + * It is safe to call this function multiple times. SDL_VideoInit() will call + * SDL_VideoQuit() itself if the video subsystem has already been initialized. * - * \sa SDL_VideoQuit() + * You can use SDL_GetNumVideoDrivers() and SDL_GetVideoDriver() to find a + * specific `driver_name`. + * + * \param driver_name the name of a video driver to initialize, or NULL for + * the default driver + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetNumVideoDrivers + * \sa SDL_GetVideoDriver + * \sa SDL_InitSubSystem + * \sa SDL_VideoQuit */ extern DECLSPEC int SDLCALL SDL_VideoInit(const char *driver_name); /** - * \brief Shuts down the video subsystem. + * Shut down the video subsystem, if initialized with SDL_VideoInit(). * - * This function closes all windows, and restores the original video mode. + * This function closes all windows, and restores the original video mode. * - * \sa SDL_VideoInit() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_VideoInit */ extern DECLSPEC void SDLCALL SDL_VideoQuit(void); /** - * \brief Returns the name of the currently initialized video driver. + * Get the name of the currently initialized video driver. * - * \return The name of the current video driver or NULL if no driver - * has been initialized + * \returns the name of the current video driver or NULL if no driver has been + * initialized. * - * \sa SDL_GetNumVideoDrivers() - * \sa SDL_GetVideoDriver() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetNumVideoDrivers + * \sa SDL_GetVideoDriver */ extern DECLSPEC const char *SDLCALL SDL_GetCurrentVideoDriver(void); /** - * \brief Returns the number of available video displays. + * Get the number of available video displays. * - * \sa SDL_GetDisplayBounds() + * \returns a number >= 1 or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetDisplayBounds */ extern DECLSPEC int SDLCALL SDL_GetNumVideoDisplays(void); /** - * \brief Get the name of a display in UTF-8 encoding + * Get the name of a display in UTF-8 encoding. * - * \return The name of a display, or NULL for an invalid display index. + * \param displayIndex the index of display from which the name should be + * queried + * \returns the name of a display or NULL for an invalid display index or + * failure; call SDL_GetError() for more information. * - * \sa SDL_GetNumVideoDisplays() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetNumVideoDisplays */ extern DECLSPEC const char * SDLCALL SDL_GetDisplayName(int displayIndex); /** - * \brief Get the desktop area represented by a display, with the primary - * display located at 0,0 + * Get the desktop area represented by a display. * - * \return 0 on success, or -1 if the index is out of range. + * The primary display (`displayIndex` zero) is always located at 0,0. * - * \sa SDL_GetNumVideoDisplays() + * \param displayIndex the index of the display to query + * \param rect the SDL_Rect structure filled in with the display bounds + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetNumVideoDisplays */ extern DECLSPEC int SDLCALL SDL_GetDisplayBounds(int displayIndex, SDL_Rect * rect); /** - * \brief Get the usable desktop area represented by a display, with the - * primary display located at 0,0 + * Get the usable desktop area represented by a display. * - * This is the same area as SDL_GetDisplayBounds() reports, but with portions - * reserved by the system removed. For example, on Mac OS X, this subtracts - * the area occupied by the menu bar and dock. + * The primary display (`displayIndex` zero) is always located at 0,0. * - * Setting a window to be fullscreen generally bypasses these unusable areas, - * so these are good guidelines for the maximum space available to a - * non-fullscreen window. + * This is the same area as SDL_GetDisplayBounds() reports, but with portions + * reserved by the system removed. For example, on Apple's macOS, this + * subtracts the area occupied by the menu bar and dock. * - * \return 0 on success, or -1 if the index is out of range. + * Setting a window to be fullscreen generally bypasses these unusable areas, + * so these are good guidelines for the maximum space available to a + * non-fullscreen window. * - * \sa SDL_GetDisplayBounds() - * \sa SDL_GetNumVideoDisplays() + * The parameter `rect` is ignored if it is NULL. + * + * This function also returns -1 if the parameter `displayIndex` is out of + * range. + * + * \param displayIndex the index of the display to query the usable bounds + * from + * \param rect the SDL_Rect structure filled in with the display bounds + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.5. + * + * \sa SDL_GetDisplayBounds + * \sa SDL_GetNumVideoDisplays */ extern DECLSPEC int SDLCALL SDL_GetDisplayUsableBounds(int displayIndex, SDL_Rect * rect); /** - * \brief Get the dots/pixels-per-inch for a display + * Get the dots/pixels-per-inch for a display. * - * \note Diagonal, horizontal and vertical DPI can all be optionally - * returned if the parameter is non-NULL. + * Diagonal, horizontal and vertical DPI can all be optionally returned if the + * appropriate parameter is non-NULL. * - * \return 0 on success, or -1 if no DPI information is available or the index is out of range. + * A failure of this function usually means that either no DPI information is + * available or the `displayIndex` is out of range. * - * \sa SDL_GetNumVideoDisplays() + * \param displayIndex the index of the display from which DPI information + * should be queried + * \param ddpi a pointer filled in with the diagonal DPI of the display; may + * be NULL + * \param hdpi a pointer filled in with the horizontal DPI of the display; may + * be NULL + * \param vdpi a pointer filled in with the vertical DPI of the display; may + * be NULL + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.4. + * + * \sa SDL_GetNumVideoDisplays */ extern DECLSPEC int SDLCALL SDL_GetDisplayDPI(int displayIndex, float * ddpi, float * hdpi, float * vdpi); /** - * \brief Get the orientation of a display + * Get the orientation of a display. * - * \return The orientation of the display, or SDL_ORIENTATION_UNKNOWN if it isn't available. + * \param displayIndex the index of the display to query + * \returns The SDL_DisplayOrientation enum value of the display, or + * `SDL_ORIENTATION_UNKNOWN` if it isn't available. * - * \sa SDL_GetNumVideoDisplays() + * \since This function is available since SDL 2.0.9. + * + * \sa SDL_GetNumVideoDisplays */ extern DECLSPEC SDL_DisplayOrientation SDLCALL SDL_GetDisplayOrientation(int displayIndex); /** - * \brief Returns the number of available display modes. + * Get the number of available display modes. * - * \sa SDL_GetDisplayMode() + * The `displayIndex` needs to be in the range from 0 to + * SDL_GetNumVideoDisplays() - 1. + * + * \param displayIndex the index of the display to query + * \returns a number >= 1 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetDisplayMode + * \sa SDL_GetNumVideoDisplays */ extern DECLSPEC int SDLCALL SDL_GetNumDisplayModes(int displayIndex); /** - * \brief Fill in information about a specific display mode. + * Get information about a specific display mode. * - * \note The display modes are sorted in this priority: - * \li bits per pixel -> more colors to fewer colors - * \li width -> largest to smallest - * \li height -> largest to smallest - * \li refresh rate -> highest to lowest + * The display modes are sorted in this priority: * - * \sa SDL_GetNumDisplayModes() + * - width -> largest to smallest + * - height -> largest to smallest + * - bits per pixel -> more colors to fewer colors + * - packed pixel layout -> largest to smallest + * - refresh rate -> highest to lowest + * + * \param displayIndex the index of the display to query + * \param modeIndex the index of the display mode to query + * \param mode an SDL_DisplayMode structure filled in with the mode at + * `modeIndex` + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetNumDisplayModes */ extern DECLSPEC int SDLCALL SDL_GetDisplayMode(int displayIndex, int modeIndex, SDL_DisplayMode * mode); /** - * \brief Fill in information about the desktop display mode. + * Get information about the desktop's display mode. + * + * There's a difference between this function and SDL_GetCurrentDisplayMode() + * when SDL runs fullscreen and has changed the resolution. In that case this + * function will return the previous native display mode, and not the current + * display mode. + * + * \param displayIndex the index of the display to query + * \param mode an SDL_DisplayMode structure filled in with the current display + * mode + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetCurrentDisplayMode + * \sa SDL_GetDisplayMode + * \sa SDL_SetWindowDisplayMode */ extern DECLSPEC int SDLCALL SDL_GetDesktopDisplayMode(int displayIndex, SDL_DisplayMode * mode); /** - * \brief Fill in information about the current display mode. + * Get information about the current display mode. + * + * There's a difference between this function and SDL_GetDesktopDisplayMode() + * when SDL runs fullscreen and has changed the resolution. In that case this + * function will return the current display mode, and not the previous native + * display mode. + * + * \param displayIndex the index of the display to query + * \param mode an SDL_DisplayMode structure filled in with the current display + * mode + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetDesktopDisplayMode + * \sa SDL_GetDisplayMode + * \sa SDL_GetNumVideoDisplays + * \sa SDL_SetWindowDisplayMode */ extern DECLSPEC int SDLCALL SDL_GetCurrentDisplayMode(int displayIndex, SDL_DisplayMode * mode); /** - * \brief Get the closest match to the requested display mode. + * Get the closest match to the requested display mode. * - * \param displayIndex The index of display from which mode should be queried. - * \param mode The desired display mode - * \param closest A pointer to a display mode to be filled in with the closest - * match of the available display modes. + * The available display modes are scanned and `closest` is filled in with the + * closest mode matching the requested mode and returned. The mode format and + * refresh rate default to the desktop mode if they are set to 0. The modes + * are scanned with size being first priority, format being second priority, + * and finally checking the refresh rate. If all the available modes are too + * small, then NULL is returned. * - * \return The passed in value \c closest, or NULL if no matching video mode - * was available. + * \param displayIndex the index of the display to query + * \param mode an SDL_DisplayMode structure containing the desired display + * mode + * \param closest an SDL_DisplayMode structure filled in with the closest + * match of the available display modes + * \returns the passed in value `closest` or NULL if no matching video mode + * was available; call SDL_GetError() for more information. * - * The available display modes are scanned, and \c closest is filled in with the - * closest mode matching the requested mode and returned. The mode format and - * refresh_rate default to the desktop mode if they are 0. The modes are - * scanned with size being first priority, format being second priority, and - * finally checking the refresh_rate. If all the available modes are too - * small, then NULL is returned. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_GetNumDisplayModes() - * \sa SDL_GetDisplayMode() + * \sa SDL_GetDisplayMode + * \sa SDL_GetNumDisplayModes */ extern DECLSPEC SDL_DisplayMode * SDLCALL SDL_GetClosestDisplayMode(int displayIndex, const SDL_DisplayMode * mode, SDL_DisplayMode * closest); /** - * \brief Get the display index associated with a window. + * Get the index of the display associated with a window. * - * \return the display index of the display containing the center of the - * window, or -1 on error. + * \param window the window to query + * \returns the index of the display containing the center of the window on + * success or a negative error code on failure; call SDL_GetError() + * for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetDisplayBounds + * \sa SDL_GetNumVideoDisplays */ extern DECLSPEC int SDLCALL SDL_GetWindowDisplayIndex(SDL_Window * window); /** - * \brief Set the display mode used when a fullscreen window is visible. + * Set the display mode to use when a window is visible at fullscreen. * - * By default the window's dimensions and the desktop format and refresh rate - * are used. + * This only affects the display mode used when the window is fullscreen. To + * change the window size when the window is not fullscreen, use + * SDL_SetWindowSize(). * - * \param window The window for which the display mode should be set. - * \param mode The mode to use, or NULL for the default mode. + * \param window the window to affect + * \param mode the SDL_DisplayMode structure representing the mode to use, or + * NULL to use the window's dimensions and the desktop's format + * and refresh rate + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 if setting the display mode failed. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_GetWindowDisplayMode() - * \sa SDL_SetWindowFullscreen() + * \sa SDL_GetWindowDisplayMode + * \sa SDL_SetWindowFullscreen */ extern DECLSPEC int SDLCALL SDL_SetWindowDisplayMode(SDL_Window * window, - const SDL_DisplayMode - * mode); + const SDL_DisplayMode * mode); /** - * \brief Fill in information about the display mode used when a fullscreen - * window is visible. + * Query the display mode to use when a window is visible at fullscreen. * - * \sa SDL_SetWindowDisplayMode() - * \sa SDL_SetWindowFullscreen() + * \param window the window to query + * \param mode an SDL_DisplayMode structure filled in with the fullscreen + * display mode + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetWindowDisplayMode + * \sa SDL_SetWindowFullscreen */ extern DECLSPEC int SDLCALL SDL_GetWindowDisplayMode(SDL_Window * window, SDL_DisplayMode * mode); /** - * \brief Get the pixel format associated with the window. + * Get the raw ICC profile data for the screen the window is currently on. + * + * Data returned should be freed with SDL_free. + * + * \param window the window to query + * \param size the size of the ICC profile + * \returns the raw ICC profile data on success or NULL on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC void* SDLCALL SDL_GetWindowICCProfile(SDL_Window * window, size_t* size); + +/** + * Get the pixel format associated with the window. + * + * \param window the window to query + * \returns the pixel format of the window on success or + * SDL_PIXELFORMAT_UNKNOWN on failure; call SDL_GetError() for more + * information. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC Uint32 SDLCALL SDL_GetWindowPixelFormat(SDL_Window * window); /** - * \brief Create a window with the specified position, dimensions, and flags. + * Create a window with the specified position, dimensions, and flags. * - * \param title The title of the window, in UTF-8 encoding. - * \param x The x position of the window, ::SDL_WINDOWPOS_CENTERED, or - * ::SDL_WINDOWPOS_UNDEFINED. - * \param y The y position of the window, ::SDL_WINDOWPOS_CENTERED, or - * ::SDL_WINDOWPOS_UNDEFINED. - * \param w The width of the window, in screen coordinates. - * \param h The height of the window, in screen coordinates. - * \param flags The flags for the window, a mask of any of the following: - * ::SDL_WINDOW_FULLSCREEN, ::SDL_WINDOW_OPENGL, - * ::SDL_WINDOW_HIDDEN, ::SDL_WINDOW_BORDERLESS, - * ::SDL_WINDOW_RESIZABLE, ::SDL_WINDOW_MAXIMIZED, - * ::SDL_WINDOW_MINIMIZED, ::SDL_WINDOW_INPUT_GRABBED, - * ::SDL_WINDOW_ALLOW_HIGHDPI, ::SDL_WINDOW_VULKAN. + * `flags` may be any of the following OR'd together: * - * \return The created window, or NULL if window creation failed. + * - `SDL_WINDOW_FULLSCREEN`: fullscreen window + * - `SDL_WINDOW_FULLSCREEN_DESKTOP`: fullscreen window at desktop resolution + * - `SDL_WINDOW_OPENGL`: window usable with an OpenGL context + * - `SDL_WINDOW_VULKAN`: window usable with a Vulkan instance + * - `SDL_WINDOW_METAL`: window usable with a Metal instance + * - `SDL_WINDOW_HIDDEN`: window is not visible + * - `SDL_WINDOW_BORDERLESS`: no window decoration + * - `SDL_WINDOW_RESIZABLE`: window can be resized + * - `SDL_WINDOW_MINIMIZED`: window is minimized + * - `SDL_WINDOW_MAXIMIZED`: window is maximized + * - `SDL_WINDOW_INPUT_GRABBED`: window has grabbed input focus + * - `SDL_WINDOW_ALLOW_HIGHDPI`: window should be created in high-DPI mode if + * supported (>= SDL 2.0.1) * - * If the window is created with the SDL_WINDOW_ALLOW_HIGHDPI flag, its size - * in pixels may differ from its size in screen coordinates on platforms with - * high-DPI support (e.g. iOS and Mac OS X). Use SDL_GetWindowSize() to query - * the client area's size in screen coordinates, and SDL_GL_GetDrawableSize(), - * SDL_Vulkan_GetDrawableSize(), or SDL_GetRendererOutputSize() to query the - * drawable size in pixels. + * `SDL_WINDOW_SHOWN` is ignored by SDL_CreateWindow(). The SDL_Window is + * implicitly shown if SDL_WINDOW_HIDDEN is not set. `SDL_WINDOW_SHOWN` may be + * queried later using SDL_GetWindowFlags(). * - * If the window is created with any of the SDL_WINDOW_OPENGL or - * SDL_WINDOW_VULKAN flags, then the corresponding LoadLibrary function - * (SDL_GL_LoadLibrary or SDL_Vulkan_LoadLibrary) is called and the - * corresponding UnloadLibrary function is called by SDL_DestroyWindow(). + * On Apple's macOS, you **must** set the NSHighResolutionCapable Info.plist + * property to YES, otherwise you will not receive a High-DPI OpenGL canvas. * - * If SDL_WINDOW_VULKAN is specified and there isn't a working Vulkan driver, - * SDL_CreateWindow() will fail because SDL_Vulkan_LoadLibrary() will fail. + * If the window is created with the `SDL_WINDOW_ALLOW_HIGHDPI` flag, its size + * in pixels may differ from its size in screen coordinates on platforms with + * high-DPI support (e.g. iOS and macOS). Use SDL_GetWindowSize() to query the + * client area's size in screen coordinates, and SDL_GL_GetDrawableSize() or + * SDL_GetRendererOutputSize() to query the drawable size in pixels. * - * \note On non-Apple devices, SDL requires you to either not link to the - * Vulkan loader or link to a dynamic library version. This limitation - * may be removed in a future version of SDL. + * If the window is set fullscreen, the width and height parameters `w` and + * `h` will not be used. However, invalid size parameters (e.g. too large) may + * still fail. Window size is actually limited to 16384 x 16384 for all + * platforms at window creation. * - * \sa SDL_DestroyWindow() - * \sa SDL_GL_LoadLibrary() - * \sa SDL_Vulkan_LoadLibrary() + * If the window is created with any of the SDL_WINDOW_OPENGL or + * SDL_WINDOW_VULKAN flags, then the corresponding LoadLibrary function + * (SDL_GL_LoadLibrary or SDL_Vulkan_LoadLibrary) is called and the + * corresponding UnloadLibrary function is called by SDL_DestroyWindow(). + * + * If SDL_WINDOW_VULKAN is specified and there isn't a working Vulkan driver, + * SDL_CreateWindow() will fail because SDL_Vulkan_LoadLibrary() will fail. + * + * If SDL_WINDOW_METAL is specified on an OS that does not support Metal, + * SDL_CreateWindow() will fail. + * + * On non-Apple devices, SDL requires you to either not link to the Vulkan + * loader or link to a dynamic library version. This limitation may be removed + * in a future version of SDL. + * + * \param title the title of the window, in UTF-8 encoding + * \param x the x position of the window, `SDL_WINDOWPOS_CENTERED`, or + * `SDL_WINDOWPOS_UNDEFINED` + * \param y the y position of the window, `SDL_WINDOWPOS_CENTERED`, or + * `SDL_WINDOWPOS_UNDEFINED` + * \param w the width of the window, in screen coordinates + * \param h the height of the window, in screen coordinates + * \param flags 0, or one or more SDL_WindowFlags OR'd together + * \returns the window that was created or NULL on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateWindowFrom + * \sa SDL_DestroyWindow */ extern DECLSPEC SDL_Window * SDLCALL SDL_CreateWindow(const char *title, int x, int y, int w, int h, Uint32 flags); /** - * \brief Create an SDL window from an existing native window. + * Create an SDL window from an existing native window. * - * \param data A pointer to driver-dependent window creation data + * In some cases (e.g. OpenGL) and on some platforms (e.g. Microsoft Windows) + * the hint `SDL_HINT_VIDEO_WINDOW_SHARE_PIXEL_FORMAT` needs to be configured + * before using SDL_CreateWindowFrom(). * - * \return The created window, or NULL if window creation failed. + * \param data a pointer to driver-dependent window creation data, typically + * your native window cast to a void* + * \returns the window that was created or NULL on failure; call + * SDL_GetError() for more information. * - * \sa SDL_DestroyWindow() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateWindow + * \sa SDL_DestroyWindow */ extern DECLSPEC SDL_Window * SDLCALL SDL_CreateWindowFrom(const void *data); /** - * \brief Get the numeric ID of a window, for logging purposes. + * Get the numeric ID of a window. + * + * The numeric ID is what SDL_WindowEvent references, and is necessary to map + * these events to specific SDL_Window objects. + * + * \param window the window to query + * \returns the ID of the window on success or 0 on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowFromID */ extern DECLSPEC Uint32 SDLCALL SDL_GetWindowID(SDL_Window * window); /** - * \brief Get a window from a stored ID, or NULL if it doesn't exist. + * Get a window from a stored ID. + * + * The numeric ID is what SDL_WindowEvent references, and is necessary to map + * these events to specific SDL_Window objects. + * + * \param id the ID of the window + * \returns the window associated with `id` or NULL if it doesn't exist; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowID */ extern DECLSPEC SDL_Window * SDLCALL SDL_GetWindowFromID(Uint32 id); /** - * \brief Get the window flags. + * Get the window flags. + * + * \param window the window to query + * \returns a mask of the SDL_WindowFlags associated with `window` + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateWindow + * \sa SDL_HideWindow + * \sa SDL_MaximizeWindow + * \sa SDL_MinimizeWindow + * \sa SDL_SetWindowFullscreen + * \sa SDL_SetWindowGrab + * \sa SDL_ShowWindow */ extern DECLSPEC Uint32 SDLCALL SDL_GetWindowFlags(SDL_Window * window); /** - * \brief Set the title of a window, in UTF-8 format. + * Set the title of a window. * - * \sa SDL_GetWindowTitle() + * This string is expected to be in UTF-8 encoding. + * + * \param window the window to change + * \param title the desired window title in UTF-8 format + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowTitle */ extern DECLSPEC void SDLCALL SDL_SetWindowTitle(SDL_Window * window, const char *title); /** - * \brief Get the title of a window, in UTF-8 format. + * Get the title of a window. * - * \sa SDL_SetWindowTitle() + * \param window the window to query + * \returns the title of the window in UTF-8 format or "" if there is no + * title. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetWindowTitle */ extern DECLSPEC const char *SDLCALL SDL_GetWindowTitle(SDL_Window * window); /** - * \brief Set the icon for a window. + * Set the icon for a window. * - * \param window The window for which the icon should be set. - * \param icon The icon for the window. + * \param window the window to change + * \param icon an SDL_Surface structure containing the icon for the window + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC void SDLCALL SDL_SetWindowIcon(SDL_Window * window, SDL_Surface * icon); /** - * \brief Associate an arbitrary named pointer with a window. + * Associate an arbitrary named pointer with a window. * - * \param window The window to associate with the pointer. - * \param name The name of the pointer. - * \param userdata The associated pointer. + * `name` is case-sensitive. * - * \return The previous value associated with 'name' + * \param window the window to associate with the pointer + * \param name the name of the pointer + * \param userdata the associated pointer + * \returns the previous value associated with `name`. * - * \note The name is case-sensitive. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_GetWindowData() + * \sa SDL_GetWindowData */ extern DECLSPEC void* SDLCALL SDL_SetWindowData(SDL_Window * window, const char *name, void *userdata); /** - * \brief Retrieve the data pointer associated with a window. + * Retrieve the data pointer associated with a window. * - * \param window The window to query. - * \param name The name of the pointer. + * \param window the window to query + * \param name the name of the pointer + * \returns the value associated with `name`. * - * \return The value associated with 'name' + * \since This function is available since SDL 2.0.0. * - * \sa SDL_SetWindowData() + * \sa SDL_SetWindowData */ extern DECLSPEC void *SDLCALL SDL_GetWindowData(SDL_Window * window, const char *name); /** - * \brief Set the position of a window. + * Set the position of a window. * - * \param window The window to reposition. - * \param x The x coordinate of the window in screen coordinates, or - * ::SDL_WINDOWPOS_CENTERED or ::SDL_WINDOWPOS_UNDEFINED. - * \param y The y coordinate of the window in screen coordinates, or - * ::SDL_WINDOWPOS_CENTERED or ::SDL_WINDOWPOS_UNDEFINED. + * The window coordinate origin is the upper left of the display. * - * \note The window coordinate origin is the upper left of the display. + * \param window the window to reposition + * \param x the x coordinate of the window in screen coordinates, or + * `SDL_WINDOWPOS_CENTERED` or `SDL_WINDOWPOS_UNDEFINED` + * \param y the y coordinate of the window in screen coordinates, or + * `SDL_WINDOWPOS_CENTERED` or `SDL_WINDOWPOS_UNDEFINED` * - * \sa SDL_GetWindowPosition() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowPosition */ extern DECLSPEC void SDLCALL SDL_SetWindowPosition(SDL_Window * window, int x, int y); /** - * \brief Get the position of a window. + * Get the position of a window. * - * \param window The window to query. - * \param x Pointer to variable for storing the x position, in screen - * coordinates. May be NULL. - * \param y Pointer to variable for storing the y position, in screen - * coordinates. May be NULL. + * If you do not need the value for one of the positions a NULL may be passed + * in the `x` or `y` parameter. * - * \sa SDL_SetWindowPosition() + * \param window the window to query + * \param x a pointer filled in with the x position of the window, in screen + * coordinates, may be NULL + * \param y a pointer filled in with the y position of the window, in screen + * coordinates, may be NULL + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetWindowPosition */ extern DECLSPEC void SDLCALL SDL_GetWindowPosition(SDL_Window * window, int *x, int *y); /** - * \brief Set the size of a window's client area. + * Set the size of a window's client area. * - * \param window The window to resize. - * \param w The width of the window, in screen coordinates. Must be >0. - * \param h The height of the window, in screen coordinates. Must be >0. + * The window size in screen coordinates may differ from the size in pixels, + * if the window was created with `SDL_WINDOW_ALLOW_HIGHDPI` on a platform + * with high-dpi support (e.g. iOS or macOS). Use SDL_GL_GetDrawableSize() or + * SDL_GetRendererOutputSize() to get the real client area size in pixels. * - * \note Fullscreen windows automatically match the size of the display mode, - * and you should use SDL_SetWindowDisplayMode() to change their size. + * Fullscreen windows automatically match the size of the display mode, and + * you should use SDL_SetWindowDisplayMode() to change their size. * - * The window size in screen coordinates may differ from the size in pixels, if - * the window was created with SDL_WINDOW_ALLOW_HIGHDPI on a platform with - * high-dpi support (e.g. iOS or OS X). Use SDL_GL_GetDrawableSize() or - * SDL_GetRendererOutputSize() to get the real client area size in pixels. + * \param window the window to change + * \param w the width of the window in pixels, in screen coordinates, must be + * > 0 + * \param h the height of the window in pixels, in screen coordinates, must be + * > 0 * - * \sa SDL_GetWindowSize() - * \sa SDL_SetWindowDisplayMode() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowSize + * \sa SDL_SetWindowDisplayMode */ extern DECLSPEC void SDLCALL SDL_SetWindowSize(SDL_Window * window, int w, int h); /** - * \brief Get the size of a window's client area. + * Get the size of a window's client area. * - * \param window The window to query. - * \param w Pointer to variable for storing the width, in screen - * coordinates. May be NULL. - * \param h Pointer to variable for storing the height, in screen - * coordinates. May be NULL. + * NULL can safely be passed as the `w` or `h` parameter if the width or + * height value is not desired. * - * The window size in screen coordinates may differ from the size in pixels, if - * the window was created with SDL_WINDOW_ALLOW_HIGHDPI on a platform with - * high-dpi support (e.g. iOS or OS X). Use SDL_GL_GetDrawableSize() or - * SDL_GetRendererOutputSize() to get the real client area size in pixels. + * The window size in screen coordinates may differ from the size in pixels, + * if the window was created with `SDL_WINDOW_ALLOW_HIGHDPI` on a platform + * with high-dpi support (e.g. iOS or macOS). Use SDL_GL_GetDrawableSize(), + * SDL_Vulkan_GetDrawableSize(), or SDL_GetRendererOutputSize() to get the + * real client area size in pixels. * - * \sa SDL_SetWindowSize() + * \param window the window to query the width and height from + * \param w a pointer filled in with the width of the window, in screen + * coordinates, may be NULL + * \param h a pointer filled in with the height of the window, in screen + * coordinates, may be NULL + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_GetDrawableSize + * \sa SDL_Vulkan_GetDrawableSize + * \sa SDL_SetWindowSize */ extern DECLSPEC void SDLCALL SDL_GetWindowSize(SDL_Window * window, int *w, int *h); /** - * \brief Get the size of a window's borders (decorations) around the client area. + * Get the size of a window's borders (decorations) around the client area. * - * \param window The window to query. - * \param top Pointer to variable for storing the size of the top border. NULL is permitted. - * \param left Pointer to variable for storing the size of the left border. NULL is permitted. - * \param bottom Pointer to variable for storing the size of the bottom border. NULL is permitted. - * \param right Pointer to variable for storing the size of the right border. NULL is permitted. + * Note: If this function fails (returns -1), the size values will be + * initialized to 0, 0, 0, 0 (if a non-NULL pointer is provided), as if the + * window in question was borderless. * - * \return 0 on success, or -1 if getting this information is not supported. + * Note: This function may fail on systems where the window has not yet been + * decorated by the display server (for example, immediately after calling + * SDL_CreateWindow). It is recommended that you wait at least until the + * window has been presented and composited, so that the window system has a + * chance to decorate the window and provide the border dimensions to SDL. * - * \note if this function fails (returns -1), the size values will be - * initialized to 0, 0, 0, 0 (if a non-NULL pointer is provided), as - * if the window in question was borderless. + * This function also returns -1 if getting the information is not supported. + * + * \param window the window to query the size values of the border + * (decorations) from + * \param top pointer to variable for storing the size of the top border; NULL + * is permitted + * \param left pointer to variable for storing the size of the left border; + * NULL is permitted + * \param bottom pointer to variable for storing the size of the bottom + * border; NULL is permitted + * \param right pointer to variable for storing the size of the right border; + * NULL is permitted + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.5. + * + * \sa SDL_GetWindowSize */ extern DECLSPEC int SDLCALL SDL_GetWindowBordersSize(SDL_Window * window, int *top, int *left, int *bottom, int *right); /** - * \brief Set the minimum size of a window's client area. + * Set the minimum size of a window's client area. * - * \param window The window to set a new minimum size. - * \param min_w The minimum width of the window, must be >0 - * \param min_h The minimum height of the window, must be >0 + * \param window the window to change + * \param min_w the minimum width of the window in pixels + * \param min_h the minimum height of the window in pixels * - * \note You can't change the minimum size of a fullscreen window, it - * automatically matches the size of the display mode. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_GetWindowMinimumSize() - * \sa SDL_SetWindowMaximumSize() + * \sa SDL_GetWindowMinimumSize + * \sa SDL_SetWindowMaximumSize */ extern DECLSPEC void SDLCALL SDL_SetWindowMinimumSize(SDL_Window * window, int min_w, int min_h); /** - * \brief Get the minimum size of a window's client area. + * Get the minimum size of a window's client area. * - * \param window The window to query. - * \param w Pointer to variable for storing the minimum width, may be NULL - * \param h Pointer to variable for storing the minimum height, may be NULL + * \param window the window to query + * \param w a pointer filled in with the minimum width of the window, may be + * NULL + * \param h a pointer filled in with the minimum height of the window, may be + * NULL * - * \sa SDL_GetWindowMaximumSize() - * \sa SDL_SetWindowMinimumSize() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowMaximumSize + * \sa SDL_SetWindowMinimumSize */ extern DECLSPEC void SDLCALL SDL_GetWindowMinimumSize(SDL_Window * window, int *w, int *h); /** - * \brief Set the maximum size of a window's client area. + * Set the maximum size of a window's client area. * - * \param window The window to set a new maximum size. - * \param max_w The maximum width of the window, must be >0 - * \param max_h The maximum height of the window, must be >0 + * \param window the window to change + * \param max_w the maximum width of the window in pixels + * \param max_h the maximum height of the window in pixels * - * \note You can't change the maximum size of a fullscreen window, it - * automatically matches the size of the display mode. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_GetWindowMaximumSize() - * \sa SDL_SetWindowMinimumSize() + * \sa SDL_GetWindowMaximumSize + * \sa SDL_SetWindowMinimumSize */ extern DECLSPEC void SDLCALL SDL_SetWindowMaximumSize(SDL_Window * window, int max_w, int max_h); /** - * \brief Get the maximum size of a window's client area. + * Get the maximum size of a window's client area. * - * \param window The window to query. - * \param w Pointer to variable for storing the maximum width, may be NULL - * \param h Pointer to variable for storing the maximum height, may be NULL + * \param window the window to query + * \param w a pointer filled in with the maximum width of the window, may be + * NULL + * \param h a pointer filled in with the maximum height of the window, may be + * NULL * - * \sa SDL_GetWindowMinimumSize() - * \sa SDL_SetWindowMaximumSize() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowMinimumSize + * \sa SDL_SetWindowMaximumSize */ extern DECLSPEC void SDLCALL SDL_GetWindowMaximumSize(SDL_Window * window, int *w, int *h); /** - * \brief Set the border state of a window. + * Set the border state of a window. * - * This will add or remove the window's SDL_WINDOW_BORDERLESS flag and - * add or remove the border from the actual window. This is a no-op if the - * window's border already matches the requested state. + * This will add or remove the window's `SDL_WINDOW_BORDERLESS` flag and add + * or remove the border from the actual window. This is a no-op if the + * window's border already matches the requested state. * - * \param window The window of which to change the border state. - * \param bordered SDL_FALSE to remove border, SDL_TRUE to add border. + * You can't change the border state of a fullscreen window. * - * \note You can't change the border state of a fullscreen window. + * \param window the window of which to change the border state + * \param bordered SDL_FALSE to remove border, SDL_TRUE to add border * - * \sa SDL_GetWindowFlags() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowFlags */ extern DECLSPEC void SDLCALL SDL_SetWindowBordered(SDL_Window * window, SDL_bool bordered); /** - * \brief Set the user-resizable state of a window. + * Set the user-resizable state of a window. * - * This will add or remove the window's SDL_WINDOW_RESIZABLE flag and - * allow/disallow user resizing of the window. This is a no-op if the - * window's resizable state already matches the requested state. + * This will add or remove the window's `SDL_WINDOW_RESIZABLE` flag and + * allow/disallow user resizing of the window. This is a no-op if the window's + * resizable state already matches the requested state. * - * \param window The window of which to change the resizable state. - * \param resizable SDL_TRUE to allow resizing, SDL_FALSE to disallow. + * You can't change the resizable state of a fullscreen window. * - * \note You can't change the resizable state of a fullscreen window. + * \param window the window of which to change the resizable state + * \param resizable SDL_TRUE to allow resizing, SDL_FALSE to disallow * - * \sa SDL_GetWindowFlags() + * \since This function is available since SDL 2.0.5. + * + * \sa SDL_GetWindowFlags */ extern DECLSPEC void SDLCALL SDL_SetWindowResizable(SDL_Window * window, SDL_bool resizable); /** - * \brief Show a window. + * Set the window to always be above the others. * - * \sa SDL_HideWindow() + * This will add or remove the window's `SDL_WINDOW_ALWAYS_ON_TOP` flag. This + * will bring the window to the front and keep the window above the rest. + * + * \param window The window of which to change the always on top state + * \param on_top SDL_TRUE to set the window always on top, SDL_FALSE to + * disable + * + * \since This function is available since SDL 2.0.16. + * + * \sa SDL_GetWindowFlags + */ +extern DECLSPEC void SDLCALL SDL_SetWindowAlwaysOnTop(SDL_Window * window, + SDL_bool on_top); + +/** + * Show a window. + * + * \param window the window to show + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HideWindow + * \sa SDL_RaiseWindow */ extern DECLSPEC void SDLCALL SDL_ShowWindow(SDL_Window * window); /** - * \brief Hide a window. + * Hide a window. * - * \sa SDL_ShowWindow() + * \param window the window to hide + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ShowWindow */ extern DECLSPEC void SDLCALL SDL_HideWindow(SDL_Window * window); /** - * \brief Raise a window above other windows and set the input focus. + * Raise a window above other windows and set the input focus. + * + * \param window the window to raise + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC void SDLCALL SDL_RaiseWindow(SDL_Window * window); /** - * \brief Make a window as large as possible. + * Make a window as large as possible. * - * \sa SDL_RestoreWindow() + * \param window the window to maximize + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_MinimizeWindow + * \sa SDL_RestoreWindow */ extern DECLSPEC void SDLCALL SDL_MaximizeWindow(SDL_Window * window); /** - * \brief Minimize a window to an iconic representation. + * Minimize a window to an iconic representation. * - * \sa SDL_RestoreWindow() + * \param window the window to minimize + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_MaximizeWindow + * \sa SDL_RestoreWindow */ extern DECLSPEC void SDLCALL SDL_MinimizeWindow(SDL_Window * window); /** - * \brief Restore the size and position of a minimized or maximized window. + * Restore the size and position of a minimized or maximized window. * - * \sa SDL_MaximizeWindow() - * \sa SDL_MinimizeWindow() + * \param window the window to restore + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_MaximizeWindow + * \sa SDL_MinimizeWindow */ extern DECLSPEC void SDLCALL SDL_RestoreWindow(SDL_Window * window); /** - * \brief Set a window's fullscreen state. + * Set a window's fullscreen state. * - * \return 0 on success, or -1 if setting the display mode failed. + * `flags` may be `SDL_WINDOW_FULLSCREEN`, for "real" fullscreen with a + * videomode change; `SDL_WINDOW_FULLSCREEN_DESKTOP` for "fake" fullscreen + * that takes the size of the desktop; and 0 for windowed mode. * - * \sa SDL_SetWindowDisplayMode() - * \sa SDL_GetWindowDisplayMode() + * \param window the window to change + * \param flags `SDL_WINDOW_FULLSCREEN`, `SDL_WINDOW_FULLSCREEN_DESKTOP` or 0 + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowDisplayMode + * \sa SDL_SetWindowDisplayMode */ extern DECLSPEC int SDLCALL SDL_SetWindowFullscreen(SDL_Window * window, Uint32 flags); /** - * \brief Get the SDL surface associated with the window. + * Get the SDL surface associated with the window. * - * \return The window's framebuffer surface, or NULL on error. + * A new surface will be created with the optimal format for the window, if + * necessary. This surface will be freed when the window is destroyed. Do not + * free this surface. * - * A new surface will be created with the optimal format for the window, - * if necessary. This surface will be freed when the window is destroyed. + * This surface will be invalidated if the window is resized. After resizing a + * window this function must be called again to return a valid surface. * - * \note You may not combine this with 3D or the rendering API on this window. + * You may not combine this with 3D or the rendering API on this window. * - * \sa SDL_UpdateWindowSurface() - * \sa SDL_UpdateWindowSurfaceRects() + * This function is affected by `SDL_HINT_FRAMEBUFFER_ACCELERATION`. + * + * \param window the window to query + * \returns the surface associated with the window, or NULL on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_UpdateWindowSurface + * \sa SDL_UpdateWindowSurfaceRects */ extern DECLSPEC SDL_Surface * SDLCALL SDL_GetWindowSurface(SDL_Window * window); /** - * \brief Copy the window surface to the screen. + * Copy the window surface to the screen. * - * \return 0 on success, or -1 on error. + * This is the function you use to reflect any changes to the surface on the + * screen. * - * \sa SDL_GetWindowSurface() - * \sa SDL_UpdateWindowSurfaceRects() + * This function is equivalent to the SDL 1.2 API SDL_Flip(). + * + * \param window the window to update + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowSurface + * \sa SDL_UpdateWindowSurfaceRects */ extern DECLSPEC int SDLCALL SDL_UpdateWindowSurface(SDL_Window * window); /** - * \brief Copy a number of rectangles on the window surface to the screen. + * Copy areas of the window surface to the screen. * - * \return 0 on success, or -1 on error. + * This is the function you use to reflect changes to portions of the surface + * on the screen. * - * \sa SDL_GetWindowSurface() - * \sa SDL_UpdateWindowSurface() + * This function is equivalent to the SDL 1.2 API SDL_UpdateRects(). + * + * \param window the window to update + * \param rects an array of SDL_Rect structures representing areas of the + * surface to copy + * \param numrects the number of rectangles + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowSurface + * \sa SDL_UpdateWindowSurface */ extern DECLSPEC int SDLCALL SDL_UpdateWindowSurfaceRects(SDL_Window * window, const SDL_Rect * rects, int numrects); /** - * \brief Set a window's input grab mode. + * Set a window's input grab mode. * - * \param window The window for which the input grab mode should be set. - * \param grabbed This is SDL_TRUE to grab input, and SDL_FALSE to release input. + * When input is grabbed, the mouse is confined to the window. This function + * will also grab the keyboard if `SDL_HINT_GRAB_KEYBOARD` is set. To grab the + * keyboard without also grabbing the mouse, use SDL_SetWindowKeyboardGrab(). * - * If the caller enables a grab while another window is currently grabbed, - * the other window loses its grab in favor of the caller's window. + * If the caller enables a grab while another window is currently grabbed, the + * other window loses its grab in favor of the caller's window. * - * \sa SDL_GetWindowGrab() + * \param window the window for which the input grab mode should be set + * \param grabbed SDL_TRUE to grab input or SDL_FALSE to release input + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetGrabbedWindow + * \sa SDL_GetWindowGrab */ extern DECLSPEC void SDLCALL SDL_SetWindowGrab(SDL_Window * window, SDL_bool grabbed); /** - * \brief Get a window's input grab mode. + * Set a window's keyboard grab mode. * - * \return This returns SDL_TRUE if input is grabbed, and SDL_FALSE otherwise. + * Keyboard grab enables capture of system keyboard shortcuts like Alt+Tab or + * the Meta/Super key. Note that not all system keyboard shortcuts can be + * captured by applications (one example is Ctrl+Alt+Del on Windows). * - * \sa SDL_SetWindowGrab() + * This is primarily intended for specialized applications such as VNC clients + * or VM frontends. Normal games should not use keyboard grab. + * + * When keyboard grab is enabled, SDL will continue to handle Alt+Tab when the + * window is full-screen to ensure the user is not trapped in your + * application. If you have a custom keyboard shortcut to exit fullscreen + * mode, you may suppress this behavior with + * `SDL_HINT_ALLOW_ALT_TAB_WHILE_GRABBED`. + * + * If the caller enables a grab while another window is currently grabbed, the + * other window loses its grab in favor of the caller's window. + * + * \param window The window for which the keyboard grab mode should be set. + * \param grabbed This is SDL_TRUE to grab keyboard, and SDL_FALSE to release. + * + * \since This function is available since SDL 2.0.16. + * + * \sa SDL_GetWindowKeyboardGrab + * \sa SDL_SetWindowMouseGrab + * \sa SDL_SetWindowGrab + */ +extern DECLSPEC void SDLCALL SDL_SetWindowKeyboardGrab(SDL_Window * window, + SDL_bool grabbed); + +/** + * Set a window's mouse grab mode. + * + * Mouse grab confines the mouse cursor to the window. + * + * \param window The window for which the mouse grab mode should be set. + * + * \since This function is available since SDL 2.0.16. + * + * \sa SDL_GetWindowMouseGrab + * \sa SDL_SetWindowKeyboardGrab + * \sa SDL_SetWindowGrab + */ +extern DECLSPEC void SDLCALL SDL_SetWindowMouseGrab(SDL_Window * window, + SDL_bool grabbed); + +/** + * Get a window's input grab mode. + * + * \param window the window to query + * \returns SDL_TRUE if input is grabbed, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetWindowGrab */ extern DECLSPEC SDL_bool SDLCALL SDL_GetWindowGrab(SDL_Window * window); /** - * \brief Get the window that currently has an input grab enabled. + * Get a window's keyboard grab mode. * - * \return This returns the window if input is grabbed, and NULL otherwise. + * \param window the window to query + * \returns SDL_TRUE if keyboard is grabbed, and SDL_FALSE otherwise. * - * \sa SDL_SetWindowGrab() + * \since This function is available since SDL 2.0.16. + * + * \sa SDL_SetWindowKeyboardGrab + * \sa SDL_GetWindowGrab + */ +extern DECLSPEC SDL_bool SDLCALL SDL_GetWindowKeyboardGrab(SDL_Window * window); + +/** + * Get a window's mouse grab mode. + * + * \param window the window to query + * \returns SDL_TRUE if mouse is grabbed, and SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.16. + * + * \sa SDL_SetWindowKeyboardGrab + * \sa SDL_GetWindowGrab + */ +extern DECLSPEC SDL_bool SDLCALL SDL_GetWindowMouseGrab(SDL_Window * window); + +/** + * Get the window that currently has an input grab enabled. + * + * \returns the window if input is grabbed or NULL otherwise. + * + * \since This function is available since SDL 2.0.4. + * + * \sa SDL_GetWindowGrab + * \sa SDL_SetWindowGrab */ extern DECLSPEC SDL_Window * SDLCALL SDL_GetGrabbedWindow(void); /** - * \brief Set the brightness (gamma correction) for a window. + * Confines the cursor to the specified area of a window. * - * \return 0 on success, or -1 if setting the brightness isn't supported. + * Note that this does NOT grab the cursor, it only defines the area a cursor + * is restricted to when the window has mouse focus. * - * \sa SDL_GetWindowBrightness() - * \sa SDL_SetWindowGammaRamp() + * \param window The window that will be associated with the barrier. + * \param rect A rectangle area in window-relative coordinates. If NULL the + * barrier for the specified window will be destroyed. + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_GetWindowMouseRect + * \sa SDL_SetWindowMouseGrab + */ +extern DECLSPEC int SDLCALL SDL_SetWindowMouseRect(SDL_Window * window, const SDL_Rect * rect); + +/** + * Get the mouse confinement rectangle of a window. + * + * \param window The window to query + * \returns A pointer to the mouse confinement rectangle of a window, or NULL + * if there isn't one. + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_SetWindowMouseRect + */ +extern DECLSPEC const SDL_Rect * SDLCALL SDL_GetWindowMouseRect(SDL_Window * window); + +/** + * Set the brightness (gamma multiplier) for a given window's display. + * + * Despite the name and signature, this method sets the brightness of the + * entire display, not an individual window. A window is considered to be + * owned by the display that contains the window's center pixel. (The index of + * this display can be retrieved using SDL_GetWindowDisplayIndex().) The + * brightness set will not follow the window if it is moved to another + * display. + * + * Many platforms will refuse to set the display brightness in modern times. + * You are better off using a shader to adjust gamma during rendering, or + * something similar. + * + * \param window the window used to select the display whose brightness will + * be changed + * \param brightness the brightness (gamma multiplier) value to set where 0.0 + * is completely dark and 1.0 is normal brightness + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowBrightness + * \sa SDL_SetWindowGammaRamp */ extern DECLSPEC int SDLCALL SDL_SetWindowBrightness(SDL_Window * window, float brightness); /** - * \brief Get the brightness (gamma correction) for a window. + * Get the brightness (gamma multiplier) for a given window's display. * - * \return The last brightness value passed to SDL_SetWindowBrightness() + * Despite the name and signature, this method retrieves the brightness of the + * entire display, not an individual window. A window is considered to be + * owned by the display that contains the window's center pixel. (The index of + * this display can be retrieved using SDL_GetWindowDisplayIndex().) * - * \sa SDL_SetWindowBrightness() + * \param window the window used to select the display whose brightness will + * be queried + * \returns the brightness for the display where 0.0 is completely dark and + * 1.0 is normal brightness. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetWindowBrightness */ extern DECLSPEC float SDLCALL SDL_GetWindowBrightness(SDL_Window * window); /** - * \brief Set the opacity for a window + * Set the opacity for a window. * - * \param window The window which will be made transparent or opaque - * \param opacity Opacity (0.0f - transparent, 1.0f - opaque) This will be - * clamped internally between 0.0f and 1.0f. + * The parameter `opacity` will be clamped internally between 0.0f + * (transparent) and 1.0f (opaque). * - * \return 0 on success, or -1 if setting the opacity isn't supported. + * This function also returns -1 if setting the opacity isn't supported. * - * \sa SDL_GetWindowOpacity() + * \param window the window which will be made transparent or opaque + * \param opacity the opacity value (0.0f - transparent, 1.0f - opaque) + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.5. + * + * \sa SDL_GetWindowOpacity */ extern DECLSPEC int SDLCALL SDL_SetWindowOpacity(SDL_Window * window, float opacity); /** - * \brief Get the opacity of a window. + * Get the opacity of a window. * - * If transparency isn't supported on this platform, opacity will be reported - * as 1.0f without error. + * If transparency isn't supported on this platform, opacity will be reported + * as 1.0f without error. * - * \param window The window in question. - * \param out_opacity Opacity (0.0f - transparent, 1.0f - opaque) + * The parameter `opacity` is ignored if it is NULL. * - * \return 0 on success, or -1 on error (invalid window, etc). + * This function also returns -1 if an invalid window was provided. * - * \sa SDL_SetWindowOpacity() + * \param window the window to get the current opacity value from + * \param out_opacity the float filled in (0.0f - transparent, 1.0f - opaque) + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.5. + * + * \sa SDL_SetWindowOpacity */ extern DECLSPEC int SDLCALL SDL_GetWindowOpacity(SDL_Window * window, float * out_opacity); /** - * \brief Sets the window as a modal for another window (TODO: reconsider this function and/or its name) + * Set the window as a modal for another window. * - * \param modal_window The window that should be modal - * \param parent_window The parent window + * \param modal_window the window that should be set modal + * \param parent_window the parent window for the modal window + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 otherwise. + * \since This function is available since SDL 2.0.5. */ extern DECLSPEC int SDLCALL SDL_SetWindowModalFor(SDL_Window * modal_window, SDL_Window * parent_window); /** - * \brief Explicitly sets input focus to the window. + * Explicitly set input focus to the window. * - * You almost certainly want SDL_RaiseWindow() instead of this function. Use - * this with caution, as you might give focus to a window that's completely - * obscured by other windows. + * You almost certainly want SDL_RaiseWindow() instead of this function. Use + * this with caution, as you might give focus to a window that is completely + * obscured by other windows. * - * \param window The window that should get the input focus + * \param window the window that should get the input focus + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 otherwise. - * \sa SDL_RaiseWindow() + * \since This function is available since SDL 2.0.5. + * + * \sa SDL_RaiseWindow */ extern DECLSPEC int SDLCALL SDL_SetWindowInputFocus(SDL_Window * window); /** - * \brief Set the gamma ramp for a window. + * Set the gamma ramp for the display that owns a given window. * - * \param window The window for which the gamma ramp should be set. - * \param red The translation table for the red channel, or NULL. - * \param green The translation table for the green channel, or NULL. - * \param blue The translation table for the blue channel, or NULL. + * Set the gamma translation table for the red, green, and blue channels of + * the video hardware. Each table is an array of 256 16-bit quantities, + * representing a mapping between the input and output for that channel. The + * input is the index into the array, and the output is the 16-bit gamma value + * at that index, scaled to the output color precision. * - * \return 0 on success, or -1 if gamma ramps are unsupported. + * Despite the name and signature, this method sets the gamma ramp of the + * entire display, not an individual window. A window is considered to be + * owned by the display that contains the window's center pixel. (The index of + * this display can be retrieved using SDL_GetWindowDisplayIndex().) The gamma + * ramp set will not follow the window if it is moved to another display. * - * Set the gamma translation table for the red, green, and blue channels - * of the video hardware. Each table is an array of 256 16-bit quantities, - * representing a mapping between the input and output for that channel. - * The input is the index into the array, and the output is the 16-bit - * gamma value at that index, scaled to the output color precision. + * \param window the window used to select the display whose gamma ramp will + * be changed + * \param red a 256 element array of 16-bit quantities representing the + * translation table for the red channel, or NULL + * \param green a 256 element array of 16-bit quantities representing the + * translation table for the green channel, or NULL + * \param blue a 256 element array of 16-bit quantities representing the + * translation table for the blue channel, or NULL + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_GetWindowGammaRamp() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowGammaRamp */ extern DECLSPEC int SDLCALL SDL_SetWindowGammaRamp(SDL_Window * window, const Uint16 * red, @@ -993,19 +1581,27 @@ extern DECLSPEC int SDLCALL SDL_SetWindowGammaRamp(SDL_Window * window, const Uint16 * blue); /** - * \brief Get the gamma ramp for a window. + * Get the gamma ramp for a given window's display. * - * \param window The window from which the gamma ramp should be queried. - * \param red A pointer to a 256 element array of 16-bit quantities to hold - * the translation table for the red channel, or NULL. - * \param green A pointer to a 256 element array of 16-bit quantities to hold - * the translation table for the green channel, or NULL. - * \param blue A pointer to a 256 element array of 16-bit quantities to hold - * the translation table for the blue channel, or NULL. + * Despite the name and signature, this method retrieves the gamma ramp of the + * entire display, not an individual window. A window is considered to be + * owned by the display that contains the window's center pixel. (The index of + * this display can be retrieved using SDL_GetWindowDisplayIndex().) * - * \return 0 on success, or -1 if gamma ramps are unsupported. + * \param window the window used to select the display whose gamma ramp will + * be queried + * \param red a 256 element array of 16-bit quantities filled in with the + * translation table for the red channel, or NULL + * \param green a 256 element array of 16-bit quantities filled in with the + * translation table for the green channel, or NULL + * \param blue a 256 element array of 16-bit quantities filled in with the + * translation table for the blue channel, or NULL + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_SetWindowGammaRamp() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetWindowGammaRamp */ extern DECLSPEC int SDLCALL SDL_GetWindowGammaRamp(SDL_Window * window, Uint16 * red, @@ -1013,9 +1609,9 @@ extern DECLSPEC int SDLCALL SDL_GetWindowGammaRamp(SDL_Window * window, Uint16 * blue); /** - * \brief Possible return values from the SDL_HitTest callback. + * Possible return values from the SDL_HitTest callback. * - * \sa SDL_HitTest + * \sa SDL_HitTest */ typedef enum { @@ -1032,82 +1628,129 @@ typedef enum } SDL_HitTestResult; /** - * \brief Callback used for hit-testing. + * Callback used for hit-testing. * - * \sa SDL_SetWindowHitTest + * \param win the SDL_Window where hit-testing was set on + * \param area an SDL_Point which should be hit-tested + * \param data what was passed as `callback_data` to SDL_SetWindowHitTest() + * \return an SDL_HitTestResult value. + * + * \sa SDL_SetWindowHitTest */ typedef SDL_HitTestResult (SDLCALL *SDL_HitTest)(SDL_Window *win, const SDL_Point *area, void *data); /** - * \brief Provide a callback that decides if a window region has special properties. + * Provide a callback that decides if a window region has special properties. * - * Normally windows are dragged and resized by decorations provided by the - * system window manager (a title bar, borders, etc), but for some apps, it - * makes sense to drag them from somewhere else inside the window itself; for - * example, one might have a borderless window that wants to be draggable - * from any part, or simulate its own title bar, etc. + * Normally windows are dragged and resized by decorations provided by the + * system window manager (a title bar, borders, etc), but for some apps, it + * makes sense to drag them from somewhere else inside the window itself; for + * example, one might have a borderless window that wants to be draggable from + * any part, or simulate its own title bar, etc. * - * This function lets the app provide a callback that designates pieces of - * a given window as special. This callback is run during event processing - * if we need to tell the OS to treat a region of the window specially; the - * use of this callback is known as "hit testing." + * This function lets the app provide a callback that designates pieces of a + * given window as special. This callback is run during event processing if we + * need to tell the OS to treat a region of the window specially; the use of + * this callback is known as "hit testing." * - * Mouse input may not be delivered to your application if it is within - * a special area; the OS will often apply that input to moving the window or - * resizing the window and not deliver it to the application. + * Mouse input may not be delivered to your application if it is within a + * special area; the OS will often apply that input to moving the window or + * resizing the window and not deliver it to the application. * - * Specifying NULL for a callback disables hit-testing. Hit-testing is - * disabled by default. + * Specifying NULL for a callback disables hit-testing. Hit-testing is + * disabled by default. * - * Platforms that don't support this functionality will return -1 - * unconditionally, even if you're attempting to disable hit-testing. + * Platforms that don't support this functionality will return -1 + * unconditionally, even if you're attempting to disable hit-testing. * - * Your callback may fire at any time, and its firing does not indicate any - * specific behavior (for example, on Windows, this certainly might fire - * when the OS is deciding whether to drag your window, but it fires for lots - * of other reasons, too, some unrelated to anything you probably care about - * _and when the mouse isn't actually at the location it is testing_). - * Since this can fire at any time, you should try to keep your callback - * efficient, devoid of allocations, etc. + * Your callback may fire at any time, and its firing does not indicate any + * specific behavior (for example, on Windows, this certainly might fire when + * the OS is deciding whether to drag your window, but it fires for lots of + * other reasons, too, some unrelated to anything you probably care about _and + * when the mouse isn't actually at the location it is testing_). Since this + * can fire at any time, you should try to keep your callback efficient, + * devoid of allocations, etc. * - * \param window The window to set hit-testing on. - * \param callback The callback to call when doing a hit-test. - * \param callback_data An app-defined void pointer passed to the callback. - * \return 0 on success, -1 on error (including unsupported). + * \param window the window to set hit-testing on + * \param callback the function to call when doing a hit-test + * \param callback_data an app-defined void pointer passed to **callback** + * \returns 0 on success or -1 on error (including unsupported); call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.4. */ extern DECLSPEC int SDLCALL SDL_SetWindowHitTest(SDL_Window * window, SDL_HitTest callback, void *callback_data); /** - * \brief Destroy a window. + * Request a window to demand attention from the user. + * + * \param window the window to be flashed + * \param operation the flash operation + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.16. + */ +extern DECLSPEC int SDLCALL SDL_FlashWindow(SDL_Window * window, SDL_FlashOperation operation); + +/** + * Destroy a window. + * + * If `window` is NULL, this function will return immediately after setting + * the SDL error message to "Invalid window". See SDL_GetError(). + * + * \param window the window to destroy + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateWindow + * \sa SDL_CreateWindowFrom */ extern DECLSPEC void SDLCALL SDL_DestroyWindow(SDL_Window * window); /** - * \brief Returns whether the screensaver is currently enabled (default off). + * Check whether the screensaver is currently enabled. * - * \sa SDL_EnableScreenSaver() - * \sa SDL_DisableScreenSaver() + * The screensaver is disabled by default since SDL 2.0.2. Before SDL 2.0.2 + * the screensaver was enabled by default. + * + * The default can also be changed using `SDL_HINT_VIDEO_ALLOW_SCREENSAVER`. + * + * \returns SDL_TRUE if the screensaver is enabled, SDL_FALSE if it is + * disabled. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_DisableScreenSaver + * \sa SDL_EnableScreenSaver */ extern DECLSPEC SDL_bool SDLCALL SDL_IsScreenSaverEnabled(void); /** - * \brief Allow the screen to be blanked by a screensaver + * Allow the screen to be blanked by a screen saver. * - * \sa SDL_IsScreenSaverEnabled() - * \sa SDL_DisableScreenSaver() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_DisableScreenSaver + * \sa SDL_IsScreenSaverEnabled */ extern DECLSPEC void SDLCALL SDL_EnableScreenSaver(void); /** - * \brief Prevent the screen from being blanked by a screensaver + * Prevent the screen from being blanked by a screen saver. * - * \sa SDL_IsScreenSaverEnabled() - * \sa SDL_EnableScreenSaver() + * If you disable the screensaver, it is automatically re-enabled when SDL + * quits. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_EnableScreenSaver + * \sa SDL_IsScreenSaverEnabled */ extern DECLSPEC void SDLCALL SDL_DisableScreenSaver(void); @@ -1118,147 +1761,316 @@ extern DECLSPEC void SDLCALL SDL_DisableScreenSaver(void); /* @{ */ /** - * \brief Dynamically load an OpenGL library. + * Dynamically load an OpenGL library. * - * \param path The platform dependent OpenGL library name, or NULL to open the - * default OpenGL library. + * This should be done after initializing the video driver, but before + * creating any OpenGL windows. If no OpenGL library is loaded, the default + * library will be loaded upon creation of the first OpenGL window. * - * \return 0 on success, or -1 if the library couldn't be loaded. + * If you do this, you need to retrieve all of the GL functions used in your + * program from the dynamic library using SDL_GL_GetProcAddress(). * - * This should be done after initializing the video driver, but before - * creating any OpenGL windows. If no OpenGL library is loaded, the default - * library will be loaded upon creation of the first OpenGL window. + * \param path the platform dependent OpenGL library name, or NULL to open the + * default OpenGL library + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \note If you do this, you need to retrieve all of the GL functions used in - * your program from the dynamic library using SDL_GL_GetProcAddress(). + * \since This function is available since SDL 2.0.0. * - * \sa SDL_GL_GetProcAddress() - * \sa SDL_GL_UnloadLibrary() + * \sa SDL_GL_GetProcAddress + * \sa SDL_GL_UnloadLibrary */ extern DECLSPEC int SDLCALL SDL_GL_LoadLibrary(const char *path); /** - * \brief Get the address of an OpenGL function. + * Get an OpenGL function by name. + * + * If the GL library is loaded at runtime with SDL_GL_LoadLibrary(), then all + * GL functions must be retrieved this way. Usually this is used to retrieve + * function pointers to OpenGL extensions. + * + * There are some quirks to looking up OpenGL functions that require some + * extra care from the application. If you code carefully, you can handle + * these quirks without any platform-specific code, though: + * + * - On Windows, function pointers are specific to the current GL context; + * this means you need to have created a GL context and made it current + * before calling SDL_GL_GetProcAddress(). If you recreate your context or + * create a second context, you should assume that any existing function + * pointers aren't valid to use with it. This is (currently) a + * Windows-specific limitation, and in practice lots of drivers don't suffer + * this limitation, but it is still the way the wgl API is documented to + * work and you should expect crashes if you don't respect it. Store a copy + * of the function pointers that comes and goes with context lifespan. + * - On X11, function pointers returned by this function are valid for any + * context, and can even be looked up before a context is created at all. + * This means that, for at least some common OpenGL implementations, if you + * look up a function that doesn't exist, you'll get a non-NULL result that + * is _NOT_ safe to call. You must always make sure the function is actually + * available for a given GL context before calling it, by checking for the + * existence of the appropriate extension with SDL_GL_ExtensionSupported(), + * or verifying that the version of OpenGL you're using offers the function + * as core functionality. + * - Some OpenGL drivers, on all platforms, *will* return NULL if a function + * isn't supported, but you can't count on this behavior. Check for + * extensions you use, and if you get a NULL anyway, act as if that + * extension wasn't available. This is probably a bug in the driver, but you + * can code defensively for this scenario anyhow. + * - Just because you're on Linux/Unix, don't assume you'll be using X11. + * Next-gen display servers are waiting to replace it, and may or may not + * make the same promises about function pointers. + * - OpenGL function pointers must be declared `APIENTRY` as in the example + * code. This will ensure the proper calling convention is followed on + * platforms where this matters (Win32) thereby avoiding stack corruption. + * + * \param proc the name of an OpenGL function + * \returns a pointer to the named OpenGL function. The returned pointer + * should be cast to the appropriate function signature. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_ExtensionSupported + * \sa SDL_GL_LoadLibrary + * \sa SDL_GL_UnloadLibrary */ extern DECLSPEC void *SDLCALL SDL_GL_GetProcAddress(const char *proc); /** - * \brief Unload the OpenGL library previously loaded by SDL_GL_LoadLibrary(). + * Unload the OpenGL library previously loaded by SDL_GL_LoadLibrary(). * - * \sa SDL_GL_LoadLibrary() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_LoadLibrary */ extern DECLSPEC void SDLCALL SDL_GL_UnloadLibrary(void); /** - * \brief Return true if an OpenGL extension is supported for the current - * context. + * Check if an OpenGL extension is supported for the current context. + * + * This function operates on the current GL context; you must have created a + * context and it must be current before calling this function. Do not assume + * that all contexts you create will have the same set of extensions + * available, or that recreating an existing context will offer the same + * extensions again. + * + * While it's probably not a massive overhead, this function is not an O(1) + * operation. Check the extensions you care about after creating the GL + * context and save that information somewhere instead of calling the function + * every time you need to know. + * + * \param extension the name of the extension to check + * \returns SDL_TRUE if the extension is supported, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC SDL_bool SDLCALL SDL_GL_ExtensionSupported(const char *extension); /** - * \brief Reset all previously set OpenGL context attributes to their default values + * Reset all previously set OpenGL context attributes to their default values. + * + * \since This function is available since SDL 2.0.2. + * + * \sa SDL_GL_GetAttribute + * \sa SDL_GL_SetAttribute */ extern DECLSPEC void SDLCALL SDL_GL_ResetAttributes(void); /** - * \brief Set an OpenGL window attribute before window creation. + * Set an OpenGL window attribute before window creation. * - * \return 0 on success, or -1 if the attribute could not be set. + * This function sets the OpenGL attribute `attr` to `value`. The requested + * attributes should be set before creating an OpenGL window. You should use + * SDL_GL_GetAttribute() to check the values after creating the OpenGL + * context, since the values obtained can differ from the requested ones. + * + * \param attr an SDL_GLattr enum value specifying the OpenGL attribute to set + * \param value the desired value for the attribute + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_GetAttribute + * \sa SDL_GL_ResetAttributes */ extern DECLSPEC int SDLCALL SDL_GL_SetAttribute(SDL_GLattr attr, int value); /** - * \brief Get the actual value for an attribute from the current context. + * Get the actual value for an attribute from the current context. * - * \return 0 on success, or -1 if the attribute could not be retrieved. - * The integer at \c value will be modified in either case. + * \param attr an SDL_GLattr enum value specifying the OpenGL attribute to get + * \param value a pointer filled in with the current value of `attr` + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_ResetAttributes + * \sa SDL_GL_SetAttribute */ extern DECLSPEC int SDLCALL SDL_GL_GetAttribute(SDL_GLattr attr, int *value); /** - * \brief Create an OpenGL context for use with an OpenGL window, and make it - * current. + * Create an OpenGL context for an OpenGL window, and make it current. * - * \sa SDL_GL_DeleteContext() + * Windows users new to OpenGL should note that, for historical reasons, GL + * functions added after OpenGL version 1.1 are not available by default. + * Those functions must be loaded at run-time, either with an OpenGL + * extension-handling library or with SDL_GL_GetProcAddress() and its related + * functions. + * + * SDL_GLContext is an alias for `void *`. It's opaque to the application. + * + * \param window the window to associate with the context + * \returns the OpenGL context associated with `window` or NULL on error; call + * SDL_GetError() for more details. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_DeleteContext + * \sa SDL_GL_MakeCurrent */ extern DECLSPEC SDL_GLContext SDLCALL SDL_GL_CreateContext(SDL_Window * window); /** - * \brief Set up an OpenGL context for rendering into an OpenGL window. + * Set up an OpenGL context for rendering into an OpenGL window. * - * \note The context must have been created with a compatible window. + * The context must have been created with a compatible window. + * + * \param window the window to associate with the context + * \param context the OpenGL context to associate with the window + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_CreateContext */ extern DECLSPEC int SDLCALL SDL_GL_MakeCurrent(SDL_Window * window, SDL_GLContext context); /** - * \brief Get the currently active OpenGL window. + * Get the currently active OpenGL window. + * + * \returns the currently active OpenGL window on success or NULL on failure; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC SDL_Window* SDLCALL SDL_GL_GetCurrentWindow(void); /** - * \brief Get the currently active OpenGL context. + * Get the currently active OpenGL context. + * + * \returns the currently active OpenGL context or NULL on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_MakeCurrent */ extern DECLSPEC SDL_GLContext SDLCALL SDL_GL_GetCurrentContext(void); /** - * \brief Get the size of a window's underlying drawable in pixels (for use - * with glViewport). + * Get the size of a window's underlying drawable in pixels. * - * \param window Window from which the drawable size should be queried - * \param w Pointer to variable for storing the width in pixels, may be NULL - * \param h Pointer to variable for storing the height in pixels, may be NULL + * This returns info useful for calling glViewport(). * * This may differ from SDL_GetWindowSize() if we're rendering to a high-DPI - * drawable, i.e. the window was created with SDL_WINDOW_ALLOW_HIGHDPI on a - * platform with high-DPI support (Apple calls this "Retina"), and not disabled - * by the SDL_HINT_VIDEO_HIGHDPI_DISABLED hint. + * drawable, i.e. the window was created with `SDL_WINDOW_ALLOW_HIGHDPI` on a + * platform with high-DPI support (Apple calls this "Retina"), and not + * disabled by the `SDL_HINT_VIDEO_HIGHDPI_DISABLED` hint. * - * \sa SDL_GetWindowSize() - * \sa SDL_CreateWindow() + * \param window the window from which the drawable size should be queried + * \param w a pointer to variable for storing the width in pixels, may be NULL + * \param h a pointer to variable for storing the height in pixels, may be + * NULL + * + * \since This function is available since SDL 2.0.1. + * + * \sa SDL_CreateWindow + * \sa SDL_GetWindowSize */ extern DECLSPEC void SDLCALL SDL_GL_GetDrawableSize(SDL_Window * window, int *w, int *h); /** - * \brief Set the swap interval for the current OpenGL context. + * Set the swap interval for the current OpenGL context. * - * \param interval 0 for immediate updates, 1 for updates synchronized with the - * vertical retrace. If the system supports it, you may - * specify -1 to allow late swaps to happen immediately - * instead of waiting for the next retrace. + * Some systems allow specifying -1 for the interval, to enable adaptive + * vsync. Adaptive vsync works the same as vsync, but if you've already missed + * the vertical retrace for a given frame, it swaps buffers immediately, which + * might be less jarring for the user during occasional framerate drops. If an + * application requests adaptive vsync and the system does not support it, + * this function will fail and return -1. In such a case, you should probably + * retry the call with 1 for the interval. * - * \return 0 on success, or -1 if setting the swap interval is not supported. + * Adaptive vsync is implemented for some glX drivers with + * GLX_EXT_swap_control_tear: * - * \sa SDL_GL_GetSwapInterval() + * https://www.opengl.org/registry/specs/EXT/glx_swap_control_tear.txt + * + * and for some Windows drivers with WGL_EXT_swap_control_tear: + * + * https://www.opengl.org/registry/specs/EXT/wgl_swap_control_tear.txt + * + * Read more on the Khronos wiki: + * https://www.khronos.org/opengl/wiki/Swap_Interval#Adaptive_Vsync + * + * \param interval 0 for immediate updates, 1 for updates synchronized with + * the vertical retrace, -1 for adaptive vsync + * \returns 0 on success or -1 if setting the swap interval is not supported; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_GetSwapInterval */ extern DECLSPEC int SDLCALL SDL_GL_SetSwapInterval(int interval); /** - * \brief Get the swap interval for the current OpenGL context. + * Get the swap interval for the current OpenGL context. * - * \return 0 if there is no vertical retrace synchronization, 1 if the buffer + * If the system can't determine the swap interval, or there isn't a valid + * current context, this function will return 0 as a safe default. + * + * \returns 0 if there is no vertical retrace synchronization, 1 if the buffer * swap is synchronized with the vertical retrace, and -1 if late - * swaps happen immediately instead of waiting for the next retrace. - * If the system can't determine the swap interval, or there isn't a - * valid current context, this will return 0 as a safe default. + * swaps happen immediately instead of waiting for the next retrace; + * call SDL_GetError() for more information. * - * \sa SDL_GL_SetSwapInterval() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_SetSwapInterval */ extern DECLSPEC int SDLCALL SDL_GL_GetSwapInterval(void); /** - * \brief Swap the OpenGL buffers for a window, if double-buffering is - * supported. + * Update a window with OpenGL rendering. + * + * This is used with double-buffered OpenGL contexts, which are the default. + * + * On macOS, make sure you bind 0 to the draw framebuffer before swapping the + * window, otherwise nothing will happen. If you aren't using + * glBindFramebuffer(), this is the default and you won't have to do anything + * extra. + * + * \param window the window to change + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC void SDLCALL SDL_GL_SwapWindow(SDL_Window * window); /** - * \brief Delete an OpenGL context. + * Delete an OpenGL context. * - * \sa SDL_GL_CreateContext() + * \param context the OpenGL context to be deleted + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_CreateContext */ extern DECLSPEC void SDLCALL SDL_GL_DeleteContext(SDL_GLContext context); diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_vulkan.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_vulkan.h index d69a436b3..ab86a0b86 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_vulkan.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_vulkan.h @@ -66,203 +66,140 @@ typedef VkSurfaceKHR SDL_vulkanSurface; /* for compatibility with Tizen */ /* @{ */ /** - * \brief Dynamically load a Vulkan loader library. + * Dynamically load the Vulkan loader library. * - * \param [in] path The platform dependent Vulkan loader library name, or - * \c NULL. + * This should be called after initializing the video driver, but before + * creating any Vulkan windows. If no Vulkan loader library is loaded, the + * default library will be loaded upon creation of the first Vulkan window. * - * \return \c 0 on success, or \c -1 if the library couldn't be loaded. + * It is fairly common for Vulkan applications to link with libvulkan instead + * of explicitly loading it at run time. This will work with SDL provided the + * application links to a dynamic library and both it and SDL use the same + * search path. * - * If \a path is NULL SDL will use the value of the environment variable - * \c SDL_VULKAN_LIBRARY, if set, otherwise it loads the default Vulkan - * loader library. + * If you specify a non-NULL `path`, an application should retrieve all of the + * Vulkan functions it uses from the dynamic library using + * SDL_Vulkan_GetVkGetInstanceProcAddr unless you can guarantee `path` points + * to the same vulkan loader library the application linked to. * - * This should be called after initializing the video driver, but before - * creating any Vulkan windows. If no Vulkan loader library is loaded, the - * default library will be loaded upon creation of the first Vulkan window. + * On Apple devices, if `path` is NULL, SDL will attempt to find the + * `vkGetInstanceProcAddr` address within all the Mach-O images of the current + * process. This is because it is fairly common for Vulkan applications to + * link with libvulkan (and historically MoltenVK was provided as a static + * library). If it is not found, on macOS, SDL will attempt to load + * `vulkan.framework/vulkan`, `libvulkan.1.dylib`, + * `MoltenVK.framework/MoltenVK`, and `libMoltenVK.dylib`, in that order. On + * iOS, SDL will attempt to load `libMoltenVK.dylib`. Applications using a + * dynamic framework or .dylib must ensure it is included in its application + * bundle. * - * \note It is fairly common for Vulkan applications to link with \a libvulkan - * instead of explicitly loading it at run time. This will work with - * SDL provided the application links to a dynamic library and both it - * and SDL use the same search path. + * On non-Apple devices, application linking with a static libvulkan is not + * supported. Either do not link to the Vulkan loader or link to a dynamic + * library version. * - * \note If you specify a non-NULL \c path, an application should retrieve all - * of the Vulkan functions it uses from the dynamic library using - * \c SDL_Vulkan_GetVkGetInstanceProcAddr() unless you can guarantee - * \c path points to the same vulkan loader library the application - * linked to. + * \param path The platform dependent Vulkan loader library name or NULL + * \returns 0 on success or -1 if the library couldn't be loaded; call + * SDL_GetError() for more information. * - * \note On Apple devices, if \a path is NULL, SDL will attempt to find - * the vkGetInstanceProcAddr address within all the mach-o images of - * the current process. This is because it is fairly common for Vulkan - * applications to link with libvulkan (and historically MoltenVK was - * provided as a static library). If it is not found then, on macOS, SDL - * will attempt to load \c vulkan.framework/vulkan, \c libvulkan.1.dylib, - * followed by \c libvulkan.dylib, in that order. - * On iOS SDL will attempt to load \c libvulkan.dylib only. Applications - * using a dynamic framework or .dylib must ensure it is included in its - * application bundle. + * \since This function is available since SDL 2.0.6. * - * \note On non-Apple devices, application linking with a static libvulkan is - * not supported. Either do not link to the Vulkan loader or link to a - * dynamic library version. - * - * \note This function will fail if there are no working Vulkan drivers - * installed. - * - * \sa SDL_Vulkan_GetVkGetInstanceProcAddr() - * \sa SDL_Vulkan_UnloadLibrary() + * \sa SDL_Vulkan_GetVkInstanceProcAddr + * \sa SDL_Vulkan_UnloadLibrary */ extern DECLSPEC int SDLCALL SDL_Vulkan_LoadLibrary(const char *path); /** - * \brief Get the address of the \c vkGetInstanceProcAddr function. + * Get the address of the `vkGetInstanceProcAddr` function. * - * \note This should be called after either calling SDL_Vulkan_LoadLibrary - * or creating an SDL_Window with the SDL_WINDOW_VULKAN flag. + * This should be called after either calling SDL_Vulkan_LoadLibrary() or + * creating an SDL_Window with the `SDL_WINDOW_VULKAN` flag. + * + * \returns the function pointer for `vkGetInstanceProcAddr` or NULL on error. + * + * \since This function is available since SDL 2.0.6. */ extern DECLSPEC void *SDLCALL SDL_Vulkan_GetVkGetInstanceProcAddr(void); /** - * \brief Unload the Vulkan loader library previously loaded by - * \c SDL_Vulkan_LoadLibrary(). + * Unload the Vulkan library previously loaded by SDL_Vulkan_LoadLibrary() * - * \sa SDL_Vulkan_LoadLibrary() + * \since This function is available since SDL 2.0.6. + * + * \sa SDL_Vulkan_LoadLibrary */ extern DECLSPEC void SDLCALL SDL_Vulkan_UnloadLibrary(void); /** - * \brief Get the names of the Vulkan instance extensions needed to create - * a surface with \c SDL_Vulkan_CreateSurface(). + * Get the names of the Vulkan instance extensions needed to create a surface + * with SDL_Vulkan_CreateSurface. * - * \param [in] \c NULL or window Window for which the required Vulkan instance - * extensions should be retrieved - * \param [in,out] pCount pointer to an \c unsigned related to the number of - * required Vulkan instance extensions - * \param [out] pNames \c NULL or a pointer to an array to be filled with the - * required Vulkan instance extensions + * If `pNames` is NULL, then the number of required Vulkan instance extensions + * is returned in `pCount`. Otherwise, `pCount` must point to a variable set + * to the number of elements in the `pNames` array, and on return the variable + * is overwritten with the number of names actually written to `pNames`. If + * `pCount` is less than the number of required extensions, at most `pCount` + * structures will be written. If `pCount` is smaller than the number of + * required extensions, SDL_FALSE will be returned instead of SDL_TRUE, to + * indicate that not all the required extensions were returned. * - * \return \c SDL_TRUE on success, \c SDL_FALSE on error. + * The `window` parameter is currently needed to be valid as of SDL 2.0.8, + * however, this parameter will likely be removed in future releases * - * If \a pNames is \c NULL, then the number of required Vulkan instance - * extensions is returned in pCount. Otherwise, \a pCount must point to a - * variable set to the number of elements in the \a pNames array, and on - * return the variable is overwritten with the number of names actually - * written to \a pNames. If \a pCount is less than the number of required - * extensions, at most \a pCount structures will be written. If \a pCount - * is smaller than the number of required extensions, \c SDL_FALSE will be - * returned instead of \c SDL_TRUE, to indicate that not all the required - * extensions were returned. + * \param window A window for which the required Vulkan instance extensions + * should be retrieved (will be deprecated in a future release) + * \param pCount A pointer to an unsigned int corresponding to the number of + * extensions to be returned + * \param pNames NULL or a pointer to an array to be filled with required + * Vulkan instance extensions + * \returns SDL_TRUE on success, SDL_FALSE on error. * - * \note If \c window is not NULL, it will be checked against its creation - * flags to ensure that the Vulkan flag is present. This parameter - * will be removed in a future major release. + * \since This function is available since SDL 2.0.6. * - * \note The returned list of extensions will contain \c VK_KHR_surface - * and zero or more platform specific extensions - * - * \note The extension names queried here must be enabled when calling - * VkCreateInstance, otherwise surface creation will fail. - * - * \note \c window should have been created with the \c SDL_WINDOW_VULKAN flag - * or be \c NULL - * - * \code - * unsigned int count; - * // get count of required extensions - * if(!SDL_Vulkan_GetInstanceExtensions(NULL, &count, NULL)) - * handle_error(); - * - * static const char *const additionalExtensions[] = - * { - * VK_EXT_DEBUG_REPORT_EXTENSION_NAME, // example additional extension - * }; - * size_t additionalExtensionsCount = sizeof(additionalExtensions) / sizeof(additionalExtensions[0]); - * size_t extensionCount = count + additionalExtensionsCount; - * const char **names = malloc(sizeof(const char *) * extensionCount); - * if(!names) - * handle_error(); - * - * // get names of required extensions - * if(!SDL_Vulkan_GetInstanceExtensions(NULL, &count, names)) - * handle_error(); - * - * // copy additional extensions after required extensions - * for(size_t i = 0; i < additionalExtensionsCount; i++) - * names[i + count] = additionalExtensions[i]; - * - * VkInstanceCreateInfo instanceCreateInfo = {}; - * instanceCreateInfo.enabledExtensionCount = extensionCount; - * instanceCreateInfo.ppEnabledExtensionNames = names; - * // fill in rest of instanceCreateInfo - * - * VkInstance instance; - * // create the Vulkan instance - * VkResult result = vkCreateInstance(&instanceCreateInfo, NULL, &instance); - * free(names); - * \endcode - * - * \sa SDL_Vulkan_CreateSurface() + * \sa SDL_Vulkan_CreateSurface */ -extern DECLSPEC SDL_bool SDLCALL SDL_Vulkan_GetInstanceExtensions( - SDL_Window *window, - unsigned int *pCount, - const char **pNames); +extern DECLSPEC SDL_bool SDLCALL SDL_Vulkan_GetInstanceExtensions(SDL_Window *window, + unsigned int *pCount, + const char **pNames); /** - * \brief Create a Vulkan rendering surface for a window. + * Create a Vulkan rendering surface for a window. * - * \param [in] window SDL_Window to which to attach the rendering surface. - * \param [in] instance handle to the Vulkan instance to use. - * \param [out] surface pointer to a VkSurfaceKHR handle to receive the - * handle of the newly created surface. + * The `window` must have been created with the `SDL_WINDOW_VULKAN` flag and + * `instance` must have been created with extensions returned by + * SDL_Vulkan_GetInstanceExtensions() enabled. * - * \return \c SDL_TRUE on success, \c SDL_FALSE on error. + * \param window The window to which to attach the Vulkan surface + * \param instance The Vulkan instance handle + * \param surface A pointer to a VkSurfaceKHR handle to output the newly + * created surface + * \returns SDL_TRUE on success, SDL_FALSE on error. * - * \code - * VkInstance instance; - * SDL_Window *window; + * \since This function is available since SDL 2.0.6. * - * // create instance and window - * - * // create the Vulkan surface - * VkSurfaceKHR surface; - * if(!SDL_Vulkan_CreateSurface(window, instance, &surface)) - * handle_error(); - * \endcode - * - * \note \a window should have been created with the \c SDL_WINDOW_VULKAN flag. - * - * \note \a instance should have been created with the extensions returned - * by \c SDL_Vulkan_CreateSurface() enabled. - * - * \sa SDL_Vulkan_GetInstanceExtensions() + * \sa SDL_Vulkan_GetInstanceExtensions + * \sa SDL_Vulkan_GetDrawableSize */ -extern DECLSPEC SDL_bool SDLCALL SDL_Vulkan_CreateSurface( - SDL_Window *window, - VkInstance instance, - VkSurfaceKHR* surface); +extern DECLSPEC SDL_bool SDLCALL SDL_Vulkan_CreateSurface(SDL_Window *window, + VkInstance instance, + VkSurfaceKHR* surface); /** - * \brief Get the size of a window's underlying drawable in pixels (for use - * with setting viewport, scissor & etc). - * - * \param window SDL_Window from which the drawable size should be queried - * \param w Pointer to variable for storing the width in pixels, - * may be NULL - * \param h Pointer to variable for storing the height in pixels, - * may be NULL + * Get the size of the window's underlying drawable dimensions in pixels. * * This may differ from SDL_GetWindowSize() if we're rendering to a high-DPI - * drawable, i.e. the window was created with SDL_WINDOW_ALLOW_HIGHDPI on a - * platform with high-DPI support (Apple calls this "Retina"), and not disabled - * by the \c SDL_HINT_VIDEO_HIGHDPI_DISABLED hint. + * drawable, i.e. the window was created with `SDL_WINDOW_ALLOW_HIGHDPI` on a + * platform with high-DPI support (Apple calls this "Retina"), and not + * disabled by the `SDL_HINT_VIDEO_HIGHDPI_DISABLED` hint. * - * \note On macOS high-DPI support must be enabled for an application by - * setting NSHighResolutionCapable to true in its Info.plist. + * \param window an SDL_Window for which the size is to be queried + * \param w Pointer to the variable to write the width to or NULL + * \param h Pointer to the variable to write the height to or NULL * - * \sa SDL_GetWindowSize() - * \sa SDL_CreateWindow() + * \since This function is available since SDL 2.0.6. + * + * \sa SDL_GetWindowSize + * \sa SDL_CreateWindow + * \sa SDL_Vulkan_CreateSurface */ extern DECLSPEC void SDLCALL SDL_Vulkan_GetDrawableSize(SDL_Window * window, int *w, int *h); diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/begin_code.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/begin_code.h index 22c997c41..63f064b6f 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/begin_code.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/begin_code.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -51,15 +51,11 @@ /* Some compilers use a special export keyword */ #ifndef DECLSPEC -# if defined(__WIN32__) || defined(__WINRT__) -# ifdef __BORLANDC__ -# ifdef BUILD_SDL -# define DECLSPEC -# else -# define DECLSPEC __declspec(dllimport) -# endif -# else +# if defined(__WIN32__) || defined(__WINRT__) || defined(__CYGWIN__) +# ifdef DLL_EXPORT # define DECLSPEC __declspec(dllexport) +# else +# define DECLSPEC # endif # elif defined(__OS2__) # ifdef BUILD_SDL @@ -168,3 +164,24 @@ #endif #endif /* NULL */ #endif /* ! Mac OS X - breaks precompiled headers */ + +#ifndef SDL_FALLTHROUGH +#if (defined(__cplusplus) && __cplusplus >= 201703L) || \ + (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202000L) +#define SDL_FALLTHROUGH [[fallthrough]] +#else +#if defined(__has_attribute) +#define _HAS_FALLTHROUGH __has_attribute(__fallthrough__) +#else +#define _HAS_FALLTHROUGH 0 +#endif /* __has_attribute */ +#if _HAS_FALLTHROUGH && \ + ((defined(__GNUC__) && __GNUC__ >= 7) || \ + (defined(__clang_major__) && __clang_major__ >= 10)) +#define SDL_FALLTHROUGH __attribute__((__fallthrough__)) +#else +#define SDL_FALLTHROUGH do {} while (0) /* fallthrough */ +#endif /* _HAS_FALLTHROUGH */ +#undef _HAS_FALLTHROUGH +#endif /* C++17 or C2x */ +#endif /* SDL_FALLTHROUGH not defined */ diff --git a/libs/SDL2/i686-w64-mingw32/include/SDL2/close_code.h b/libs/SDL2/i686-w64-mingw32/include/SDL2/close_code.h index 8e4cac3da..dc73432f6 100644 --- a/libs/SDL2/i686-w64-mingw32/include/SDL2/close_code.h +++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/close_code.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/i686-w64-mingw32/lib/cmake/SDL2/sdl2-config-version.cmake b/libs/SDL2/i686-w64-mingw32/lib/cmake/SDL2/sdl2-config-version.cmake new file mode 100644 index 000000000..56af5b766 --- /dev/null +++ b/libs/SDL2/i686-w64-mingw32/lib/cmake/SDL2/sdl2-config-version.cmake @@ -0,0 +1,11 @@ +set(PACKAGE_VERSION "2.0.20") + +if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) + set(PACKAGE_VERSION_COMPATIBLE FALSE) +else() + set(PACKAGE_VERSION_COMPATIBLE TRUE) + if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION) + set(PACKAGE_VERSION_EXACT TRUE) + endif() +endif() + diff --git a/libs/SDL2/i686-w64-mingw32/lib/cmake/SDL2/sdl2-config.cmake b/libs/SDL2/i686-w64-mingw32/lib/cmake/SDL2/sdl2-config.cmake index ee347fcb9..0ec0c34b8 100644 --- a/libs/SDL2/i686-w64-mingw32/lib/cmake/SDL2/sdl2-config.cmake +++ b/libs/SDL2/i686-w64-mingw32/lib/cmake/SDL2/sdl2-config.cmake @@ -3,9 +3,79 @@ set(prefix "/opt/local/i686-w64-mingw32") set(exec_prefix "${prefix}") set(libdir "${exec_prefix}/lib") -set(SDL2_PREFIX "/opt/local/i686-w64-mingw32") -set(SDL2_EXEC_PREFIX "/opt/local/i686-w64-mingw32") -set(SDL2_LIBDIR "${exec_prefix}/lib") -set(SDL2_INCLUDE_DIRS "${prefix}/include/SDL2") +set(includedir "${prefix}/include") +set(SDL2_PREFIX "${prefix}") +set(SDL2_EXEC_PREFIX "${exec_prefix}") +set(SDL2_LIBDIR "${libdir}") +set(SDL2_INCLUDE_DIRS "${includedir}/SDL2") set(SDL2_LIBRARIES "-L${SDL2_LIBDIR} -lmingw32 -lSDL2main -lSDL2 -mwindows") string(STRIP "${SDL2_LIBRARIES}" SDL2_LIBRARIES) + +if(NOT TARGET SDL2::SDL2) + # provide SDL2::SDL2, SDL2::SDL2main and SDL2::SDL2-static targets, like SDL2Config.cmake does, for compatibility + + # Remove -lSDL2 as that is handled by CMake, note the space at the end so it does not replace e.g. -lSDL2main + # This may require "libdir" beeing set (from above) + string(REPLACE "-lSDL2 " "" SDL2_EXTRA_LINK_FLAGS " -lmingw32 -lSDL2main -lSDL2 -mwindows ") + # also get rid of -lSDL2main, if you want to link against that use both SDL2::SDL2main and SDL2::SDL2 (in that order) + # (SDL2Config.cmake has the same behavior) + string(REPLACE "-lSDL2main" "" SDL2_EXTRA_LINK_FLAGS ${SDL2_EXTRA_LINK_FLAGS}) + string(STRIP "${SDL2_EXTRA_LINK_FLAGS}" SDL2_EXTRA_LINK_FLAGS) + string(REPLACE "-lSDL2 " "" SDL2_EXTRA_LINK_FLAGS_STATIC " -Wl,--dynamicbase -Wl,--nxcompat -lm -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion -luuid ") + string(STRIP "${SDL2_EXTRA_LINK_FLAGS_STATIC}" SDL2_EXTRA_LINK_FLAGS_STATIC) + +if(WIN32 AND NOT MSVC) + # MINGW needs very special handling, because the link order must be exactly -lmingw32 -lSDL2main -lSDL2 + # for it to work at all (and -mwindows somewhere); a normal SHARED IMPORTED or STATIC IMPORTED library always puts itself first + # so handle this like a header-only lib and put everything in INTERFACE_LINK_LIBRARIES + + add_library(SDL2::SDL2 INTERFACE IMPORTED) + set_target_properties(SDL2::SDL2 PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}" + INTERFACE_LINK_LIBRARIES "-L${SDL2_LIBDIR} -lSDL2") + + add_library(SDL2::SDL2main INTERFACE IMPORTED) + set_target_properties(SDL2::SDL2main PROPERTIES + INTERFACE_LINK_LIBRARIES "-L${SDL2_LIBDIR} -lmingw32 -lSDL2main -mwindows") + +else() # (not WIN32) or MSVC + + add_library(SDL2::SDL2 SHARED IMPORTED) + set_target_properties(SDL2::SDL2 PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}" + IMPORTED_LINK_INTERFACE_LANGUAGES "C" + IMPORTED_LOCATION "${SDL2_LIBDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}SDL2${CMAKE_SHARED_LIBRARY_SUFFIX}") + + if(MSVC) + # This file is generated when building SDL2 with autotools and MinGW, and MinGW/dlltool + # isn't able to generate .lib files that are usable by recent MSVC versions + # (something about "module unsafe for SAFESEH"; SAFESEH is enabled by default in MSVC). + # The .lib file for SDL2.dll *could* be generated with `gendef SDL2.dll` and then + # `lib.exe /machine:x86 /def:SDL2.def /out:SDL2.lib` (or /machine:amd64) + # but that requires lib.exe from a Visual Studio installation - and that still doesn't + # give you a static SDL2main.lib with SAFESEH support that you'll need (unless you don't use SDL2main) + # Note that when building SDL2 with CMake and MSVC, the result works with both MinGW and MSVC. + + message(FATAL_ERROR, "This build of libSDL2 only supports MinGW, not MSVC (Visual C++), because it lacks .lib files!") + # MSVC needs SDL2.lib set as IMPORTED_IMPLIB to link against (comment out message() call above if you added SDL2.lib yourself) + set_target_properties(SDL2::SDL2 PROPERTIES IMPORTED_IMPLIB "${SDL2_LIBDIR}/SDL2.lib") + else() + # this mustn't be set for MSVC, so do it here in an extra call here + set_target_properties(SDL2::SDL2 PROPERTIES INTERFACE_LINK_LIBRARIES "${SDL2_EXTRA_LINK_FLAGS}") + endif() + + add_library(SDL2::SDL2main STATIC IMPORTED) + set_target_properties(SDL2::SDL2main PROPERTIES + IMPORTED_LINK_INTERFACE_LANGUAGES "C" + IMPORTED_LOCATION "${SDL2_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2main${CMAKE_STATIC_LIBRARY_SUFFIX}") + +endif() # (not WIN32) or MSVC + + add_library(SDL2::SDL2-static STATIC IMPORTED) + set_target_properties(SDL2::SDL2-static PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}" + IMPORTED_LINK_INTERFACE_LANGUAGES "C" + IMPORTED_LOCATION "${SDL2_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2${CMAKE_STATIC_LIBRARY_SUFFIX}" + INTERFACE_LINK_LIBRARIES "${SDL2_EXTRA_LINK_FLAGS_STATIC}") + +endif() # NOT TARGET SDL2::SDL2 diff --git a/libs/SDL2/i686-w64-mingw32/lib/libSDL2.a b/libs/SDL2/i686-w64-mingw32/lib/libSDL2.a index bee8366f9..52beaa172 100644 Binary files a/libs/SDL2/i686-w64-mingw32/lib/libSDL2.a and b/libs/SDL2/i686-w64-mingw32/lib/libSDL2.a differ diff --git a/libs/SDL2/i686-w64-mingw32/lib/libSDL2.dll.a b/libs/SDL2/i686-w64-mingw32/lib/libSDL2.dll.a index c74106707..f42828d71 100755 Binary files a/libs/SDL2/i686-w64-mingw32/lib/libSDL2.dll.a and b/libs/SDL2/i686-w64-mingw32/lib/libSDL2.dll.a differ diff --git a/libs/SDL2/i686-w64-mingw32/lib/libSDL2.la b/libs/SDL2/i686-w64-mingw32/lib/libSDL2.la index c4caaf3b0..4e4a49679 100644 --- a/libs/SDL2/i686-w64-mingw32/lib/libSDL2.la +++ b/libs/SDL2/i686-w64-mingw32/lib/libSDL2.la @@ -1,5 +1,5 @@ # libSDL2.la - a libtool library file -# Generated by libtool (GNU libtool) 2.4.2 +# Generated by libtool (GNU libtool) 2.4.6 # # Please DO NOT delete this file! # It is necessary for linking the library. @@ -13,7 +13,7 @@ library_names='libSDL2.dll.a' # The name of the static archive. old_library='libSDL2.a' -# Linker flags that can not go in dependency_libs. +# Linker flags that cannot go in dependency_libs. inherited_linker_flags='' # Libraries that this one depends upon. @@ -23,9 +23,9 @@ dependency_libs=' -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 - weak_library_names='' # Version information for libSDL2. -current=10 -age=10 -revision=0 +current=18 +age=18 +revision=2 # Is this an already installed library? installed=yes @@ -38,4 +38,4 @@ dlopen='' dlpreopen='' # Directory that this library needs to be installed in: -libdir='/Users/valve/release/SDL/SDL2-2.0.10/i686-w64-mingw32/lib' +libdir='/Users/valve/release/SDL/SDL2-2.0.20/i686-w64-mingw32/lib' diff --git a/libs/SDL2/i686-w64-mingw32/lib/libSDL2_test.a b/libs/SDL2/i686-w64-mingw32/lib/libSDL2_test.a index 997c1d4f5..a32b134fd 100644 Binary files a/libs/SDL2/i686-w64-mingw32/lib/libSDL2_test.a and b/libs/SDL2/i686-w64-mingw32/lib/libSDL2_test.a differ diff --git a/libs/SDL2/i686-w64-mingw32/lib/libSDL2_test.la b/libs/SDL2/i686-w64-mingw32/lib/libSDL2_test.la index 169f37757..778561473 100644 --- a/libs/SDL2/i686-w64-mingw32/lib/libSDL2_test.la +++ b/libs/SDL2/i686-w64-mingw32/lib/libSDL2_test.la @@ -1,5 +1,5 @@ # libSDL2_test.la - a libtool library file -# Generated by libtool (GNU libtool) 2.4.2 +# Generated by libtool (GNU libtool) 2.4.6 # # Please DO NOT delete this file! # It is necessary for linking the library. @@ -13,7 +13,7 @@ library_names='' # The name of the static archive. old_library='libSDL2_test.a' -# Linker flags that can not go in dependency_libs. +# Linker flags that cannot go in dependency_libs. inherited_linker_flags='' # Libraries that this one depends upon. @@ -38,4 +38,4 @@ dlopen='' dlpreopen='' # Directory that this library needs to be installed in: -libdir='/Users/valve/release/SDL/SDL2-2.0.10/i686-w64-mingw32/lib' +libdir='/Users/valve/release/SDL/SDL2-2.0.20/i686-w64-mingw32/lib' diff --git a/libs/SDL2/i686-w64-mingw32/lib/libSDL2main.a b/libs/SDL2/i686-w64-mingw32/lib/libSDL2main.a index aa33741d2..49e9c206e 100644 Binary files a/libs/SDL2/i686-w64-mingw32/lib/libSDL2main.a and b/libs/SDL2/i686-w64-mingw32/lib/libSDL2main.a differ diff --git a/libs/SDL2/i686-w64-mingw32/lib/libSDL2main.la b/libs/SDL2/i686-w64-mingw32/lib/libSDL2main.la index 883237adb..f4b14de2c 100644 --- a/libs/SDL2/i686-w64-mingw32/lib/libSDL2main.la +++ b/libs/SDL2/i686-w64-mingw32/lib/libSDL2main.la @@ -1,5 +1,5 @@ # libSDL2main.la - a libtool library file -# Generated by libtool (GNU libtool) 2.4.2 +# Generated by libtool (GNU libtool) 2.4.6 # # Please DO NOT delete this file! # It is necessary for linking the library. @@ -13,7 +13,7 @@ library_names='' # The name of the static archive. old_library='libSDL2main.a' -# Linker flags that can not go in dependency_libs. +# Linker flags that cannot go in dependency_libs. inherited_linker_flags='' # Libraries that this one depends upon. @@ -38,4 +38,4 @@ dlopen='' dlpreopen='' # Directory that this library needs to be installed in: -libdir='/Users/valve/release/SDL/SDL2-2.0.10/i686-w64-mingw32/lib' +libdir='/Users/valve/release/SDL/SDL2-2.0.20/i686-w64-mingw32/lib' diff --git a/libs/SDL2/i686-w64-mingw32/lib/pkgconfig/sdl2.pc b/libs/SDL2/i686-w64-mingw32/lib/pkgconfig/sdl2.pc index 4e29497c8..a8b15f534 100644 --- a/libs/SDL2/i686-w64-mingw32/lib/pkgconfig/sdl2.pc +++ b/libs/SDL2/i686-w64-mingw32/lib/pkgconfig/sdl2.pc @@ -7,9 +7,9 @@ includedir=${prefix}/include Name: sdl2 Description: Simple DirectMedia Layer is a cross-platform multimedia library designed to provide low level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL, and 2D video framebuffer. -Version: 2.0.10 +Version: 2.0.20 Requires: Conflicts: -Libs: -L${libdir} -lmingw32 -lSDL2main -lSDL2 -mwindows -Libs.private: -lmingw32 -lSDL2main -lSDL2 -mwindows -Wl,--no-undefined -Wl,--dynamicbase -Wl,--nxcompat -lm -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion -luuid -static-libgcc +Libs: -L${libdir} -lmingw32 -lSDL2main -lSDL2 -mwindows +Libs.private: -Wl,--dynamicbase -Wl,--nxcompat -lm -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion -luuid Cflags: -I${includedir}/SDL2 -Dmain=SDL_main diff --git a/libs/SDL2/i686-w64-mingw32/share/aclocal/sdl2.m4 b/libs/SDL2/i686-w64-mingw32/share/aclocal/sdl2.m4 index 0a73bc7d4..710c2516e 100644 --- a/libs/SDL2/i686-w64-mingw32/share/aclocal/sdl2.m4 +++ b/libs/SDL2/i686-w64-mingw32/share/aclocal/sdl2.m4 @@ -7,14 +7,16 @@ # # Changelog: # * also look for SDL2.framework under Mac OS X +# * removed HP/UX 9 support. +# * updated for newer autoconf. -# serial 1 +# serial 2 dnl AM_PATH_SDL2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS dnl AC_DEFUN([AM_PATH_SDL2], -[dnl +[dnl dnl Get the cflags and libraries from the sdl2-config script dnl AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)], @@ -109,41 +111,19 @@ dnl Now check if the installed SDL is sufficiently new. (Also sanity dnl checks the results of sdl2-config to some extent dnl rm -f conf.sdltest - AC_TRY_RUN([ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include #include -#include #include "SDL.h" -char* -my_strdup (char *str) -{ - char *new_str; - - if (str) - { - new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); - strcpy (new_str, str); - } - else - new_str = NULL; - - return new_str; -} - int main (int argc, char *argv[]) { int major, minor, micro; - char *tmp_version; + FILE *fp = fopen("conf.sdltest", "w"); - /* This hangs on some systems (?) - system ("touch conf.sdltest"); - */ - { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); } + if (fp) fclose(fp); - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = my_strdup("$min_sdl_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + if (sscanf("$min_sdl_version", "%d.%d.%d", &major, &minor, µ) != 3) { printf("%s, bad version string\n", "$min_sdl_version"); exit(1); } @@ -166,7 +146,7 @@ int main (int argc, char *argv[]) } } -],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) +]])], [], [no_sdl=yes], [echo $ac_n "cross compiling; assumed OK... $ac_c"]) CFLAGS="$ac_save_CFLAGS" CXXFLAGS="$ac_save_CXXFLAGS" LIBS="$ac_save_LIBS" @@ -197,7 +177,7 @@ int main (int argc, char *argv[]) CFLAGS="$CFLAGS $SDL_CFLAGS" CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" LIBS="$LIBS $SDL_LIBS" - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include #include "SDL.h" @@ -205,7 +185,7 @@ int main(int argc, char *argv[]) { return 0; } #undef main #define main K_and_R_C_main -], [ return 0; ], +]], [[ return 0; ]])], [ echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding SDL or finding the wrong" echo "*** version of SDL. If it is not finding SDL, you'll need to set your" diff --git a/libs/SDL2/include/SDL.h b/libs/SDL2/include/SDL.h index 88dce0c03..7cdd3243d 100644 --- a/libs/SDL2/include/SDL.h +++ b/libs/SDL2/include/SDL.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -42,11 +42,13 @@ #include "SDL_filesystem.h" #include "SDL_gamecontroller.h" #include "SDL_haptic.h" +#include "SDL_hidapi.h" #include "SDL_hints.h" #include "SDL_joystick.h" #include "SDL_loadso.h" #include "SDL_log.h" #include "SDL_messagebox.h" +#include "SDL_metal.h" #include "SDL_mutex.h" #include "SDL_power.h" #include "SDL_render.h" @@ -58,6 +60,8 @@ #include "SDL_timer.h" #include "SDL_version.h" #include "SDL_video.h" +#include "SDL_locale.h" +#include "SDL_misc.h" #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ @@ -90,37 +94,130 @@ extern "C" { /* @} */ /** - * This function initializes the subsystems specified by \c flags + * Initialize the SDL library. + * + * SDL_Init() simply forwards to calling SDL_InitSubSystem(). Therefore, the + * two may be used interchangeably. Though for readability of your code + * SDL_InitSubSystem() might be preferred. + * + * The file I/O (for example: SDL_RWFromFile) and threading (SDL_CreateThread) + * subsystems are initialized by default. Message boxes + * (SDL_ShowSimpleMessageBox) also attempt to work without initializing the + * video subsystem, in hopes of being useful in showing an error dialog when + * SDL_Init fails. You must specifically initialize other subsystems if you + * use them in your application. + * + * Logging (such as SDL_Log) works without initialization, too. + * + * `flags` may be any of the following OR'd together: + * + * - `SDL_INIT_TIMER`: timer subsystem + * - `SDL_INIT_AUDIO`: audio subsystem + * - `SDL_INIT_VIDEO`: video subsystem; automatically initializes the events + * subsystem + * - `SDL_INIT_JOYSTICK`: joystick subsystem; automatically initializes the + * events subsystem + * - `SDL_INIT_HAPTIC`: haptic (force feedback) subsystem + * - `SDL_INIT_GAMECONTROLLER`: controller subsystem; automatically + * initializes the joystick subsystem + * - `SDL_INIT_EVENTS`: events subsystem + * - `SDL_INIT_EVERYTHING`: all of the above subsystems + * - `SDL_INIT_NOPARACHUTE`: compatibility; this flag is ignored + * + * Subsystem initialization is ref-counted, you must call SDL_QuitSubSystem() + * for each SDL_InitSubSystem() to correctly shutdown a subsystem manually (or + * call SDL_Quit() to force shutdown). If a subsystem is already loaded then + * this call will increase the ref-count and return. + * + * \param flags subsystem initialization flags + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_InitSubSystem + * \sa SDL_Quit + * \sa SDL_SetMainReady + * \sa SDL_WasInit */ extern DECLSPEC int SDLCALL SDL_Init(Uint32 flags); /** - * This function initializes specific SDL subsystems + * Compatibility function to initialize the SDL library. * - * Subsystem initialization is ref-counted, you must call - * SDL_QuitSubSystem() for each SDL_InitSubSystem() to correctly - * shutdown a subsystem manually (or call SDL_Quit() to force shutdown). - * If a subsystem is already loaded then this call will - * increase the ref-count and return. + * In SDL2, this function and SDL_Init() are interchangeable. + * + * \param flags any of the flags used by SDL_Init(); see SDL_Init for details. + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Init + * \sa SDL_Quit + * \sa SDL_QuitSubSystem */ extern DECLSPEC int SDLCALL SDL_InitSubSystem(Uint32 flags); /** - * This function cleans up specific SDL subsystems + * Shut down specific SDL subsystems. + * + * If you start a subsystem using a call to that subsystem's init function + * (for example SDL_VideoInit()) instead of SDL_Init() or SDL_InitSubSystem(), + * SDL_QuitSubSystem() and SDL_WasInit() will not work. You will need to use + * that subsystem's quit function (SDL_VideoQuit()) directly instead. But + * generally, you should not be using those functions directly anyhow; use + * SDL_Init() instead. + * + * You still need to call SDL_Quit() even if you close all open subsystems + * with SDL_QuitSubSystem(). + * + * \param flags any of the flags used by SDL_Init(); see SDL_Init for details. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_InitSubSystem + * \sa SDL_Quit */ extern DECLSPEC void SDLCALL SDL_QuitSubSystem(Uint32 flags); /** - * This function returns a mask of the specified subsystems which have - * previously been initialized. + * Get a mask of the specified subsystems which are currently initialized. * - * If \c flags is 0, it returns a mask of all initialized subsystems. + * \param flags any of the flags used by SDL_Init(); see SDL_Init for details. + * \returns a mask of all initialized subsystems if `flags` is 0, otherwise it + * returns the initialization status of the specified subsystems. + * + * The return value does not include SDL_INIT_NOPARACHUTE. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Init + * \sa SDL_InitSubSystem */ extern DECLSPEC Uint32 SDLCALL SDL_WasInit(Uint32 flags); /** - * This function cleans up all initialized subsystems. You should - * call it upon all exit conditions. + * Clean up all initialized subsystems. + * + * You should call this function even if you have already shutdown each + * initialized subsystem with SDL_QuitSubSystem(). It is safe to call this + * function even in the case of errors in initialization. + * + * If you start a subsystem using a call to that subsystem's init function + * (for example SDL_VideoInit()) instead of SDL_Init() or SDL_InitSubSystem(), + * then you must use that subsystem's quit function (SDL_VideoQuit()) to shut + * it down before calling SDL_Quit(). But generally, you should not be using + * those functions directly anyhow; use SDL_Init() instead. + * + * You can use this function with atexit() to ensure that it is run when your + * application is shutdown, but it is not wise to do this from a library or + * other dynamically loaded code. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Init + * \sa SDL_QuitSubSystem */ extern DECLSPEC void SDLCALL SDL_Quit(void); diff --git a/libs/SDL2/include/SDL_assert.h b/libs/SDL2/include/SDL_assert.h index 8baecb63e..defadf137 100644 --- a/libs/SDL2/include/SDL_assert.h +++ b/libs/SDL2/include/SDL_assert.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -53,6 +53,10 @@ assert can have unique static variables associated with it. #define SDL_TriggerBreakpoint() __debugbreak() #elif ( (!defined(__NACL__)) && ((defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__))) ) #define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "int $3\n\t" ) +#elif ( defined(__APPLE__) && (defined(__arm64__) || defined(__aarch64__)) ) /* this might work on other ARM targets, but this is a known quantity... */ + #define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "brk #22\n\t" ) +#elif defined(__APPLE__) && defined(__arm__) + #define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "bkpt #22\n\t" ) #elif defined(__386__) && defined(__WATCOMC__) #define SDL_TriggerBreakpoint() { _asm { int 0x03 } } #elif defined(HAVE_SIGNAL_H) && !defined(__WATCOMC__) @@ -185,92 +189,121 @@ extern DECLSPEC SDL_AssertState SDLCALL SDL_ReportAssertion(SDL_AssertData *, #define SDL_assert_always(condition) SDL_enabled_assert(condition) +/** + * A callback that fires when an SDL assertion fails. + * + * \param data a pointer to the SDL_AssertData structure corresponding to the + * current assertion + * \param userdata what was passed as `userdata` to SDL_SetAssertionHandler() + * \returns an SDL_AssertState value indicating how to handle the failure. + */ typedef SDL_AssertState (SDLCALL *SDL_AssertionHandler)( const SDL_AssertData* data, void* userdata); /** - * \brief Set an application-defined assertion handler. + * Set an application-defined assertion handler. * - * This allows an app to show its own assertion UI and/or force the - * response to an assertion failure. If the app doesn't provide this, SDL - * will try to do the right thing, popping up a system-specific GUI dialog, - * and probably minimizing any fullscreen windows. + * This function allows an application to show its own assertion UI and/or + * force the response to an assertion failure. If the application doesn't + * provide this, SDL will try to do the right thing, popping up a + * system-specific GUI dialog, and probably minimizing any fullscreen windows. * - * This callback may fire from any thread, but it runs wrapped in a mutex, so - * it will only fire from one thread at a time. + * This callback may fire from any thread, but it runs wrapped in a mutex, so + * it will only fire from one thread at a time. * - * Setting the callback to NULL restores SDL's original internal handler. + * This callback is NOT reset to SDL's internal handler upon SDL_Quit()! * - * This callback is NOT reset to SDL's internal handler upon SDL_Quit()! + * \param handler the SDL_AssertionHandler function to call when an assertion + * fails or NULL for the default handler + * \param userdata a pointer that is passed to `handler` * - * Return SDL_AssertState value of how to handle the assertion failure. + * \since This function is available since SDL 2.0.0. * - * \param handler Callback function, called when an assertion fails. - * \param userdata A pointer passed to the callback as-is. + * \sa SDL_GetAssertionHandler */ extern DECLSPEC void SDLCALL SDL_SetAssertionHandler( SDL_AssertionHandler handler, void *userdata); /** - * \brief Get the default assertion handler. + * Get the default assertion handler. * - * This returns the function pointer that is called by default when an - * assertion is triggered. This is an internal function provided by SDL, - * that is used for assertions when SDL_SetAssertionHandler() hasn't been - * used to provide a different function. + * This returns the function pointer that is called by default when an + * assertion is triggered. This is an internal function provided by SDL, that + * is used for assertions when SDL_SetAssertionHandler() hasn't been used to + * provide a different function. * - * \return The default SDL_AssertionHandler that is called when an assert triggers. + * \returns the default SDL_AssertionHandler that is called when an assert + * triggers. + * + * \since This function is available since SDL 2.0.2. + * + * \sa SDL_GetAssertionHandler */ extern DECLSPEC SDL_AssertionHandler SDLCALL SDL_GetDefaultAssertionHandler(void); /** - * \brief Get the current assertion handler. + * Get the current assertion handler. * - * This returns the function pointer that is called when an assertion is - * triggered. This is either the value last passed to - * SDL_SetAssertionHandler(), or if no application-specified function is - * set, is equivalent to calling SDL_GetDefaultAssertionHandler(). + * This returns the function pointer that is called when an assertion is + * triggered. This is either the value last passed to + * SDL_SetAssertionHandler(), or if no application-specified function is set, + * is equivalent to calling SDL_GetDefaultAssertionHandler(). * - * \param puserdata Pointer to a void*, which will store the "userdata" - * pointer that was passed to SDL_SetAssertionHandler(). - * This value will always be NULL for the default handler. - * If you don't care about this data, it is safe to pass - * a NULL pointer to this function to ignore it. - * \return The SDL_AssertionHandler that is called when an assert triggers. + * The parameter `puserdata` is a pointer to a void*, which will store the + * "userdata" pointer that was passed to SDL_SetAssertionHandler(). This value + * will always be NULL for the default handler. If you don't care about this + * data, it is safe to pass a NULL pointer to this function to ignore it. + * + * \param puserdata pointer which is filled with the "userdata" pointer that + * was passed to SDL_SetAssertionHandler() + * \returns the SDL_AssertionHandler that is called when an assert triggers. + * + * \since This function is available since SDL 2.0.2. + * + * \sa SDL_SetAssertionHandler */ extern DECLSPEC SDL_AssertionHandler SDLCALL SDL_GetAssertionHandler(void **puserdata); /** - * \brief Get a list of all assertion failures. + * Get a list of all assertion failures. * - * Get all assertions triggered since last call to SDL_ResetAssertionReport(), - * or the start of the program. + * This function gets all assertions triggered since the last call to + * SDL_ResetAssertionReport(), or the start of the program. * - * The proper way to examine this data looks something like this: + * The proper way to examine this data looks something like this: * - * - * const SDL_AssertData *item = SDL_GetAssertionReport(); - * while (item) { - * printf("'%s', %s (%s:%d), triggered %u times, always ignore: %s.\\n", - * item->condition, item->function, item->filename, - * item->linenum, item->trigger_count, - * item->always_ignore ? "yes" : "no"); - * item = item->next; - * } - * + * ```c + * const SDL_AssertData *item = SDL_GetAssertionReport(); + * while (item) { + * printf("'%s', %s (%s:%d), triggered %u times, always ignore: %s.\\n", + * item->condition, item->function, item->filename, + * item->linenum, item->trigger_count, + * item->always_ignore ? "yes" : "no"); + * item = item->next; + * } + * ``` * - * \return List of all assertions. - * \sa SDL_ResetAssertionReport + * \returns a list of all failed assertions or NULL if the list is empty. This + * memory should not be modified or freed by the application. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ResetAssertionReport */ extern DECLSPEC const SDL_AssertData * SDLCALL SDL_GetAssertionReport(void); /** - * \brief Reset the list of all assertion failures. + * Clear the list of all assertion failures. * - * Reset list of all assertions triggered. + * This function will clear the list of all assertions triggered up to that + * point. Immediately following this call, SDL_GetAssertionReport will return + * no items. In addition, any previously-triggered assertions will be reset to + * a trigger_count of zero, and their always_ignore state will be false. * - * \sa SDL_GetAssertionReport + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetAssertionReport */ extern DECLSPEC void SDLCALL SDL_ResetAssertionReport(void); diff --git a/libs/SDL2/include/SDL_atomic.h b/libs/SDL2/include/SDL_atomic.h index deee35f91..b29ceeac2 100644 --- a/libs/SDL2/include/SDL_atomic.h +++ b/libs/SDL2/include/SDL_atomic.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -89,25 +89,51 @@ extern "C" { typedef int SDL_SpinLock; /** - * \brief Try to lock a spin lock by setting it to a non-zero value. + * Try to lock a spin lock by setting it to a non-zero value. * - * \param lock Points to the lock. + * ***Please note that spinlocks are dangerous if you don't know what you're + * doing. Please be careful using any sort of spinlock!*** * - * \return SDL_TRUE if the lock succeeded, SDL_FALSE if the lock is already held. + * \param lock a pointer to a lock variable + * \returns SDL_TRUE if the lock succeeded, SDL_FALSE if the lock is already + * held. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AtomicLock + * \sa SDL_AtomicUnlock */ extern DECLSPEC SDL_bool SDLCALL SDL_AtomicTryLock(SDL_SpinLock *lock); /** - * \brief Lock a spin lock by setting it to a non-zero value. + * Lock a spin lock by setting it to a non-zero value. * - * \param lock Points to the lock. + * ***Please note that spinlocks are dangerous if you don't know what you're + * doing. Please be careful using any sort of spinlock!*** + * + * \param lock a pointer to a lock variable + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AtomicTryLock + * \sa SDL_AtomicUnlock */ extern DECLSPEC void SDLCALL SDL_AtomicLock(SDL_SpinLock *lock); /** - * \brief Unlock a spin lock by setting it to 0. Always returns immediately + * Unlock a spin lock by setting it to 0. * - * \param lock Points to the lock. + * Always returns immediately. + * + * ***Please note that spinlocks are dangerous if you don't know what you're + * doing. Please be careful using any sort of spinlock!*** + * + * \param lock a pointer to a lock variable + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AtomicLock + * \sa SDL_AtomicTryLock */ extern DECLSPEC void SDLCALL SDL_AtomicUnlock(SDL_SpinLock *lock); @@ -126,7 +152,7 @@ void _ReadWriteBarrier(void); /* This is correct for all CPUs when using GCC or Solaris Studio 12.1+. */ #define SDL_CompilerBarrier() __asm__ __volatile__ ("" : : : "memory") #elif defined(__WATCOMC__) -extern _inline void SDL_CompilerBarrier (void); +extern __inline void SDL_CompilerBarrier(void); #pragma aux SDL_CompilerBarrier = "" parm [] modify exact []; #else #define SDL_CompilerBarrier() \ @@ -137,20 +163,22 @@ extern _inline void SDL_CompilerBarrier (void); * Memory barriers are designed to prevent reads and writes from being * reordered by the compiler and being seen out of order on multi-core CPUs. * - * A typical pattern would be for thread A to write some data and a flag, - * and for thread B to read the flag and get the data. In this case you - * would insert a release barrier between writing the data and the flag, + * A typical pattern would be for thread A to write some data and a flag, and + * for thread B to read the flag and get the data. In this case you would + * insert a release barrier between writing the data and the flag, * guaranteeing that the data write completes no later than the flag is - * written, and you would insert an acquire barrier between reading the - * flag and reading the data, to ensure that all the reads associated - * with the flag have completed. + * written, and you would insert an acquire barrier between reading the flag + * and reading the data, to ensure that all the reads associated with the flag + * have completed. * - * In this pattern you should always see a release barrier paired with - * an acquire barrier and you should gate the data reads/writes with a - * single flag variable. + * In this pattern you should always see a release barrier paired with an + * acquire barrier and you should gate the data reads/writes with a single + * flag variable. * * For more information on these semantics, take a look at the blog post: * http://preshing.com/20120913/acquire-and-release-semantics + * + * \since This function is available since SDL 2.0.6. */ extern DECLSPEC void SDLCALL SDL_MemoryBarrierReleaseFunction(void); extern DECLSPEC void SDLCALL SDL_MemoryBarrierAcquireFunction(void); @@ -216,32 +244,73 @@ typedef void (*SDL_KernelMemoryBarrierFunc)(); typedef struct { int value; } SDL_atomic_t; /** - * \brief Set an atomic variable to a new value if it is currently an old value. + * Set an atomic variable to a new value if it is currently an old value. * - * \return SDL_TRUE if the atomic variable was set, SDL_FALSE otherwise. + * ***Note: If you don't know what this function is for, you shouldn't use + * it!*** * - * \note If you don't know what this function is for, you shouldn't use it! -*/ + * \param a a pointer to an SDL_atomic_t variable to be modified + * \param oldval the old value + * \param newval the new value + * \returns SDL_TRUE if the atomic variable was set, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AtomicCASPtr + * \sa SDL_AtomicGet + * \sa SDL_AtomicSet + */ extern DECLSPEC SDL_bool SDLCALL SDL_AtomicCAS(SDL_atomic_t *a, int oldval, int newval); /** - * \brief Set an atomic variable to a value. + * Set an atomic variable to a value. * - * \return The previous value of the atomic variable. + * This function also acts as a full memory barrier. + * + * ***Note: If you don't know what this function is for, you shouldn't use + * it!*** + * + * \param a a pointer to an SDL_atomic_t variable to be modified + * \param v the desired value + * \returns the previous value of the atomic variable. + * + * \since This function is available since SDL 2.0.2. + * + * \sa SDL_AtomicGet */ extern DECLSPEC int SDLCALL SDL_AtomicSet(SDL_atomic_t *a, int v); /** - * \brief Get the value of an atomic variable + * Get the value of an atomic variable. + * + * ***Note: If you don't know what this function is for, you shouldn't use + * it!*** + * + * \param a a pointer to an SDL_atomic_t variable + * \returns the current value of an atomic variable. + * + * \since This function is available since SDL 2.0.2. + * + * \sa SDL_AtomicSet */ extern DECLSPEC int SDLCALL SDL_AtomicGet(SDL_atomic_t *a); /** - * \brief Add to an atomic variable. + * Add to an atomic variable. * - * \return The previous value of the atomic variable. + * This function also acts as a full memory barrier. * - * \note This same style can be used for any number operation + * ***Note: If you don't know what this function is for, you shouldn't use + * it!*** + * + * \param a a pointer to an SDL_atomic_t variable to be modified + * \param v the desired value to add + * \returns the previous value of the atomic variable. + * + * \since This function is available since SDL 2.0.2. + * + * \sa SDL_AtomicDecRef + * \sa SDL_AtomicIncRef */ extern DECLSPEC int SDLCALL SDL_AtomicAdd(SDL_atomic_t *a, int v); @@ -263,23 +332,54 @@ extern DECLSPEC int SDLCALL SDL_AtomicAdd(SDL_atomic_t *a, int v); #endif /** - * \brief Set a pointer to a new value if it is currently an old value. + * Set a pointer to a new value if it is currently an old value. * - * \return SDL_TRUE if the pointer was set, SDL_FALSE otherwise. + * ***Note: If you don't know what this function is for, you shouldn't use + * it!*** * - * \note If you don't know what this function is for, you shouldn't use it! -*/ + * \param a a pointer to a pointer + * \param oldval the old pointer value + * \param newval the new pointer value + * \returns SDL_TRUE if the pointer was set, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AtomicCAS + * \sa SDL_AtomicGetPtr + * \sa SDL_AtomicSetPtr + */ extern DECLSPEC SDL_bool SDLCALL SDL_AtomicCASPtr(void **a, void *oldval, void *newval); /** - * \brief Set a pointer to a value atomically. + * Set a pointer to a value atomically. * - * \return The previous value of the pointer. + * ***Note: If you don't know what this function is for, you shouldn't use + * it!*** + * + * \param a a pointer to a pointer + * \param v the desired pointer value + * \returns the previous value of the pointer. + * + * \since This function is available since SDL 2.0.2. + * + * \sa SDL_AtomicCASPtr + * \sa SDL_AtomicGetPtr */ extern DECLSPEC void* SDLCALL SDL_AtomicSetPtr(void **a, void* v); /** - * \brief Get the value of a pointer atomically. + * Get the value of a pointer atomically. + * + * ***Note: If you don't know what this function is for, you shouldn't use + * it!*** + * + * \param a a pointer to a pointer + * \returns the current value of a pointer. + * + * \since This function is available since SDL 2.0.2. + * + * \sa SDL_AtomicCASPtr + * \sa SDL_AtomicSetPtr */ extern DECLSPEC void* SDLCALL SDL_AtomicGetPtr(void **a); diff --git a/libs/SDL2/include/SDL_audio.h b/libs/SDL2/include/SDL_audio.h index 305c01a9d..181f66c57 100644 --- a/libs/SDL2/include/SDL_audio.h +++ b/libs/SDL2/include/SDL_audio.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -19,6 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ +/* !!! FIXME: several functions in here need Doxygen comments. */ + /** * \file SDL_audio.h * @@ -212,9 +214,12 @@ typedef void (SDLCALL * SDL_AudioFilter) (struct SDL_AudioCVT * cvt, * set both its (buf) field to a pointer that is aligned to 16 bytes, and its * (len) field to something that's a multiple of 16, if possible. */ -#ifdef __GNUC__ +#if defined(__GNUC__) && !defined(__CHERI_PURE_CAPABILITY__) /* This structure is 84 bytes on 32-bit architectures, make sure GCC doesn't pad it out to 88 bytes to guarantee ABI compatibility between compilers. + This is not a concern on CHERI architectures, where pointers must be stored + at aligned locations otherwise they will become invalid, and thus structs + containing pointers cannot be packed without giving a warning or error. vvv The next time we rev the ABI, make sure to size the ints and add padding. */ @@ -248,7 +253,48 @@ typedef struct SDL_AudioCVT * order that they are normally initialized by default. */ /* @{ */ + +/** + * Use this function to get the number of built-in audio drivers. + * + * This function returns a hardcoded number. This never returns a negative + * value; if there are no drivers compiled into this build of SDL, this + * function returns zero. The presence of a driver in this list does not mean + * it will function, it just means SDL is capable of interacting with that + * interface. For example, a build of SDL might have esound support, but if + * there's no esound server available, SDL's esound driver would fail if used. + * + * By default, SDL tries all drivers, in its preferred order, until one is + * found to be usable. + * + * \returns the number of built-in audio drivers. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetAudioDriver + */ extern DECLSPEC int SDLCALL SDL_GetNumAudioDrivers(void); + +/** + * Use this function to get the name of a built in audio driver. + * + * The list of audio drivers is given in the order that they are normally + * initialized by default; the drivers that seem more reasonable to choose + * first (as far as the SDL developers believe) are earlier in the list. + * + * The names of drivers are all simple, low-ASCII identifiers, like "alsa", + * "coreaudio" or "xaudio2". These never have Unicode characters, and are not + * meant to be proper names. + * + * \param index the index of the audio driver; the value ranges from 0 to + * SDL_GetNumAudioDrivers() - 1 + * \returns the name of the audio driver at the requested index, or NULL if an + * invalid index was specified. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetNumAudioDrivers + */ extern DECLSPEC const char *SDLCALL SDL_GetAudioDriver(int index); /* @} */ @@ -260,60 +306,103 @@ extern DECLSPEC const char *SDLCALL SDL_GetAudioDriver(int index); * use. You should normally use SDL_Init() or SDL_InitSubSystem(). */ /* @{ */ + +/** + * Use this function to initialize a particular audio driver. + * + * This function is used internally, and should not be used unless you have a + * specific need to designate the audio driver you want to use. You should + * normally use SDL_Init() or SDL_InitSubSystem(). + * + * \param driver_name the name of the desired audio driver + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AudioQuit + */ extern DECLSPEC int SDLCALL SDL_AudioInit(const char *driver_name); + +/** + * Use this function to shut down audio if you initialized it with + * SDL_AudioInit(). + * + * This function is used internally, and should not be used unless you have a + * specific need to specify the audio driver you want to use. You should + * normally use SDL_Quit() or SDL_QuitSubSystem(). + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AudioInit + */ extern DECLSPEC void SDLCALL SDL_AudioQuit(void); /* @} */ /** - * This function returns the name of the current audio driver, or NULL - * if no driver has been initialized. + * Get the name of the current audio driver. + * + * The returned string points to internal static memory and thus never becomes + * invalid, even if you quit the audio subsystem and initialize a new driver + * (although such a case would return a different static string from another + * call to this function, of course). As such, you should not modify or free + * the returned string. + * + * \returns the name of the current audio driver or NULL if no driver has been + * initialized. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AudioInit */ extern DECLSPEC const char *SDLCALL SDL_GetCurrentAudioDriver(void); /** - * This function opens the audio device with the desired parameters, and - * returns 0 if successful, placing the actual hardware parameters in the - * structure pointed to by \c obtained. If \c obtained is NULL, the audio - * data passed to the callback function will be guaranteed to be in the - * requested format, and will be automatically converted to the hardware - * audio format if necessary. This function returns -1 if it failed - * to open the audio device, or couldn't set up the audio thread. + * This function is a legacy means of opening the audio device. * - * When filling in the desired audio spec structure, - * - \c desired->freq should be the desired audio frequency in samples-per- - * second. - * - \c desired->format should be the desired audio format. - * - \c desired->samples is the desired size of the audio buffer, in - * samples. This number should be a power of two, and may be adjusted by - * the audio driver to a value more suitable for the hardware. Good values - * seem to range between 512 and 8096 inclusive, depending on the - * application and CPU speed. Smaller values yield faster response time, - * but can lead to underflow if the application is doing heavy processing - * and cannot fill the audio buffer in time. A stereo sample consists of - * both right and left channels in LR ordering. - * Note that the number of samples is directly related to time by the - * following formula: \code ms = (samples*1000)/freq \endcode - * - \c desired->size is the size in bytes of the audio buffer, and is - * calculated by SDL_OpenAudio(). - * - \c desired->silence is the value used to set the buffer to silence, - * and is calculated by SDL_OpenAudio(). - * - \c desired->callback should be set to a function that will be called - * when the audio device is ready for more data. It is passed a pointer - * to the audio buffer, and the length in bytes of the audio buffer. - * This function usually runs in a separate thread, and so you should - * protect data structures that it accesses by calling SDL_LockAudio() - * and SDL_UnlockAudio() in your code. Alternately, you may pass a NULL - * pointer here, and call SDL_QueueAudio() with some frequency, to queue - * more audio samples to be played (or for capture devices, call - * SDL_DequeueAudio() with some frequency, to obtain audio samples). - * - \c desired->userdata is passed as the first parameter to your callback - * function. If you passed a NULL callback, this value is ignored. + * This function remains for compatibility with SDL 1.2, but also because it's + * slightly easier to use than the new functions in SDL 2.0. The new, more + * powerful, and preferred way to do this is SDL_OpenAudioDevice(). * - * The audio device starts out playing silence when it's opened, and should - * be enabled for playing by calling \c SDL_PauseAudio(0) when you are ready - * for your audio callback function to be called. Since the audio driver - * may modify the requested size of the audio buffer, you should allocate - * any local mixing buffers after you open the audio device. + * This function is roughly equivalent to: + * + * ```c + * SDL_OpenAudioDevice(NULL, 0, desired, obtained, SDL_AUDIO_ALLOW_ANY_CHANGE); + * ``` + * + * With two notable exceptions: + * + * - If `obtained` is NULL, we use `desired` (and allow no changes), which + * means desired will be modified to have the correct values for silence, + * etc, and SDL will convert any differences between your app's specific + * request and the hardware behind the scenes. + * - The return value is always success or failure, and not a device ID, which + * means you can only have one device open at a time with this function. + * + * \param desired an SDL_AudioSpec structure representing the desired output + * format. Please refer to the SDL_OpenAudioDevice + * documentation for details on how to prepare this structure. + * \param obtained an SDL_AudioSpec structure filled in with the actual + * parameters, or NULL. + * \returns 0 if successful, placing the actual hardware parameters in the + * structure pointed to by `obtained`. + * + * If `obtained` is NULL, the audio data passed to the callback + * function will be guaranteed to be in the requested format, and + * will be automatically converted to the actual hardware audio + * format if necessary. If `obtained` is NULL, `desired` will have + * fields modified. + * + * This function returns a negative error code on failure to open the + * audio device or failure to set up the audio thread; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CloseAudio + * \sa SDL_LockAudio + * \sa SDL_PauseAudio + * \sa SDL_UnlockAudio */ extern DECLSPEC int SDLCALL SDL_OpenAudio(SDL_AudioSpec * desired, SDL_AudioSpec * obtained); @@ -330,59 +419,223 @@ extern DECLSPEC int SDLCALL SDL_OpenAudio(SDL_AudioSpec * desired, typedef Uint32 SDL_AudioDeviceID; /** - * Get the number of available devices exposed by the current driver. - * Only valid after a successfully initializing the audio subsystem. - * Returns -1 if an explicit list of devices can't be determined; this is - * not an error. For example, if SDL is set up to talk to a remote audio - * server, it can't list every one available on the Internet, but it will - * still allow a specific host to be specified to SDL_OpenAudioDevice(). + * Get the number of built-in audio devices. * - * In many common cases, when this function returns a value <= 0, it can still - * successfully open the default device (NULL for first argument of - * SDL_OpenAudioDevice()). + * This function is only valid after successfully initializing the audio + * subsystem. + * + * Note that audio capture support is not implemented as of SDL 2.0.4, so the + * `iscapture` parameter is for future expansion and should always be zero for + * now. + * + * This function will return -1 if an explicit list of devices can't be + * determined. Returning -1 is not an error. For example, if SDL is set up to + * talk to a remote audio server, it can't list every one available on the + * Internet, but it will still allow a specific host to be specified in + * SDL_OpenAudioDevice(). + * + * In many common cases, when this function returns a value <= 0, it can still + * successfully open the default device (NULL for first argument of + * SDL_OpenAudioDevice()). + * + * This function may trigger a complete redetect of available hardware. It + * should not be called for each iteration of a loop, but rather once at the + * start of a loop: + * + * ```c + * // Don't do this: + * for (int i = 0; i < SDL_GetNumAudioDevices(0); i++) + * + * // do this instead: + * const int count = SDL_GetNumAudioDevices(0); + * for (int i = 0; i < count; ++i) { do_something_here(); } + * ``` + * + * \param iscapture zero to request playback devices, non-zero to request + * recording devices + * \returns the number of available devices exposed by the current driver or + * -1 if an explicit list of devices can't be determined. A return + * value of -1 does not necessarily mean an error condition. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetAudioDeviceName + * \sa SDL_OpenAudioDevice */ extern DECLSPEC int SDLCALL SDL_GetNumAudioDevices(int iscapture); /** - * Get the human-readable name of a specific audio device. - * Must be a value between 0 and (number of audio devices-1). - * Only valid after a successfully initializing the audio subsystem. - * The values returned by this function reflect the latest call to - * SDL_GetNumAudioDevices(); recall that function to redetect available - * hardware. + * Get the human-readable name of a specific audio device. * - * The string returned by this function is UTF-8 encoded, read-only, and - * managed internally. You are not to free it. If you need to keep the - * string for any length of time, you should make your own copy of it, as it - * will be invalid next time any of several other SDL functions is called. + * This function is only valid after successfully initializing the audio + * subsystem. The values returned by this function reflect the latest call to + * SDL_GetNumAudioDevices(); re-call that function to redetect available + * hardware. + * + * The string returned by this function is UTF-8 encoded, read-only, and + * managed internally. You are not to free it. If you need to keep the string + * for any length of time, you should make your own copy of it, as it will be + * invalid next time any of several other SDL functions are called. + * + * \param index the index of the audio device; valid values range from 0 to + * SDL_GetNumAudioDevices() - 1 + * \param iscapture non-zero to query the list of recording devices, zero to + * query the list of output devices. + * \returns the name of the audio device at the requested index, or NULL on + * error. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetNumAudioDevices */ extern DECLSPEC const char *SDLCALL SDL_GetAudioDeviceName(int index, int iscapture); +/** + * Get the preferred audio format of a specific audio device. + * + * This function is only valid after a successfully initializing the audio + * subsystem. The values returned by this function reflect the latest call to + * SDL_GetNumAudioDevices(); re-call that function to redetect available + * hardware. + * + * `spec` will be filled with the sample rate, sample format, and channel + * count. All other values in the structure are filled with 0. When the + * supported struct members are 0, SDL was unable to get the property from the + * backend. + * + * \param index the index of the audio device; valid values range from 0 to + * SDL_GetNumAudioDevices() - 1 + * \param iscapture non-zero to query the list of recording devices, zero to + * query the list of output devices. + * \param spec The SDL_AudioSpec to be initialized by this function. + * \returns 0 on success, nonzero on error + * + * \since This function is available since SDL 2.0.16. + * + * \sa SDL_GetNumAudioDevices + */ +extern DECLSPEC int SDLCALL SDL_GetAudioDeviceSpec(int index, + int iscapture, + SDL_AudioSpec *spec); + /** - * Open a specific audio device. Passing in a device name of NULL requests - * the most reasonable default (and is equivalent to calling SDL_OpenAudio()). + * Open a specific audio device. * - * The device name is a UTF-8 string reported by SDL_GetAudioDeviceName(), but - * some drivers allow arbitrary and driver-specific strings, such as a - * hostname/IP address for a remote audio server, or a filename in the - * diskaudio driver. + * SDL_OpenAudio(), unlike this function, always acts on device ID 1. As such, + * this function will never return a 1 so as not to conflict with the legacy + * function. * - * \return 0 on error, a valid device ID that is >= 2 on success. + * Please note that SDL 2.0 before 2.0.5 did not support recording; as such, + * this function would fail if `iscapture` was not zero. Starting with SDL + * 2.0.5, recording is implemented and this value can be non-zero. * - * SDL_OpenAudio(), unlike this function, always acts on device ID 1. + * Passing in a `device` name of NULL requests the most reasonable default + * (and is equivalent to what SDL_OpenAudio() does to choose a device). The + * `device` name is a UTF-8 string reported by SDL_GetAudioDeviceName(), but + * some drivers allow arbitrary and driver-specific strings, such as a + * hostname/IP address for a remote audio server, or a filename in the + * diskaudio driver. + * + * An opened audio device starts out paused, and should be enabled for playing + * by calling SDL_PauseAudioDevice(devid, 0) when you are ready for your audio + * callback function to be called. Since the audio driver may modify the + * requested size of the audio buffer, you should allocate any local mixing + * buffers after you open the audio device. + * + * The audio callback runs in a separate thread in most cases; you can prevent + * race conditions between your callback and other threads without fully + * pausing playback with SDL_LockAudioDevice(). For more information about the + * callback, see SDL_AudioSpec. + * + * Managing the audio spec via 'desired' and 'obtained': + * + * When filling in the desired audio spec structure: + * + * - `desired->freq` should be the frequency in sample-frames-per-second (Hz). + * - `desired->format` should be the audio format (`AUDIO_S16SYS`, etc). + * - `desired->samples` is the desired size of the audio buffer, in _sample + * frames_ (with stereo output, two samples--left and right--would make a + * single sample frame). This number should be a power of two, and may be + * adjusted by the audio driver to a value more suitable for the hardware. + * Good values seem to range between 512 and 8096 inclusive, depending on + * the application and CPU speed. Smaller values reduce latency, but can + * lead to underflow if the application is doing heavy processing and cannot + * fill the audio buffer in time. Note that the number of sample frames is + * directly related to time by the following formula: `ms = + * (sampleframes*1000)/freq` + * - `desired->size` is the size in _bytes_ of the audio buffer, and is + * calculated by SDL_OpenAudioDevice(). You don't initialize this. + * - `desired->silence` is the value used to set the buffer to silence, and is + * calculated by SDL_OpenAudioDevice(). You don't initialize this. + * - `desired->callback` should be set to a function that will be called when + * the audio device is ready for more data. It is passed a pointer to the + * audio buffer, and the length in bytes of the audio buffer. This function + * usually runs in a separate thread, and so you should protect data + * structures that it accesses by calling SDL_LockAudioDevice() and + * SDL_UnlockAudioDevice() in your code. Alternately, you may pass a NULL + * pointer here, and call SDL_QueueAudio() with some frequency, to queue + * more audio samples to be played (or for capture devices, call + * SDL_DequeueAudio() with some frequency, to obtain audio samples). + * - `desired->userdata` is passed as the first parameter to your callback + * function. If you passed a NULL callback, this value is ignored. + * + * `allowed_changes` can have the following flags OR'd together: + * + * - `SDL_AUDIO_ALLOW_FREQUENCY_CHANGE` + * - `SDL_AUDIO_ALLOW_FORMAT_CHANGE` + * - `SDL_AUDIO_ALLOW_CHANNELS_CHANGE` + * - `SDL_AUDIO_ALLOW_ANY_CHANGE` + * + * These flags specify how SDL should behave when a device cannot offer a + * specific feature. If the application requests a feature that the hardware + * doesn't offer, SDL will always try to get the closest equivalent. + * + * For example, if you ask for float32 audio format, but the sound card only + * supports int16, SDL will set the hardware to int16. If you had set + * SDL_AUDIO_ALLOW_FORMAT_CHANGE, SDL will change the format in the `obtained` + * structure. If that flag was *not* set, SDL will prepare to convert your + * callback's float32 audio to int16 before feeding it to the hardware and + * will keep the originally requested format in the `obtained` structure. + * + * The resulting audio specs, varying depending on hardware and on what + * changes were allowed, will then be written back to `obtained`. + * + * If your application can only handle one specific data format, pass a zero + * for `allowed_changes` and let SDL transparently handle any differences. + * + * \param device a UTF-8 string reported by SDL_GetAudioDeviceName() or a + * driver-specific name as appropriate. NULL requests the most + * reasonable default device. + * \param iscapture non-zero to specify a device should be opened for + * recording, not playback + * \param desired an SDL_AudioSpec structure representing the desired output + * format; see SDL_OpenAudio() for more information + * \param obtained an SDL_AudioSpec structure filled in with the actual output + * format; see SDL_OpenAudio() for more information + * \param allowed_changes 0, or one or more flags OR'd together + * \returns a valid device ID that is > 0 on success or 0 on failure; call + * SDL_GetError() for more information. + * + * For compatibility with SDL 1.2, this will never return 1, since + * SDL reserves that ID for the legacy SDL_OpenAudio() function. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CloseAudioDevice + * \sa SDL_GetAudioDeviceName + * \sa SDL_LockAudioDevice + * \sa SDL_OpenAudio + * \sa SDL_PauseAudioDevice + * \sa SDL_UnlockAudioDevice */ -extern DECLSPEC SDL_AudioDeviceID SDLCALL SDL_OpenAudioDevice(const char - *device, - int iscapture, - const - SDL_AudioSpec * - desired, - SDL_AudioSpec * - obtained, - int - allowed_changes); +extern DECLSPEC SDL_AudioDeviceID SDLCALL SDL_OpenAudioDevice( + const char *device, + int iscapture, + const SDL_AudioSpec *desired, + SDL_AudioSpec *obtained, + int allowed_changes); @@ -398,10 +651,39 @@ typedef enum SDL_AUDIO_PLAYING, SDL_AUDIO_PAUSED } SDL_AudioStatus; + +/** + * This function is a legacy means of querying the audio device. + * + * New programs might want to use SDL_GetAudioDeviceStatus() instead. This + * function is equivalent to calling... + * + * ```c + * SDL_GetAudioDeviceStatus(1); + * ``` + * + * ...and is only useful if you used the legacy SDL_OpenAudio() function. + * + * \returns the SDL_AudioStatus of the audio device opened by SDL_OpenAudio(). + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetAudioDeviceStatus + */ extern DECLSPEC SDL_AudioStatus SDLCALL SDL_GetAudioStatus(void); -extern DECLSPEC SDL_AudioStatus SDLCALL -SDL_GetAudioDeviceStatus(SDL_AudioDeviceID dev); +/** + * Use this function to get the current audio state of an audio device. + * + * \param dev the ID of an audio device previously opened with + * SDL_OpenAudioDevice() + * \returns the SDL_AudioStatus of the specified audio device. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_PauseAudioDevice + */ +extern DECLSPEC SDL_AudioStatus SDLCALL SDL_GetAudioDeviceStatus(SDL_AudioDeviceID dev); /* @} *//* Audio State */ /** @@ -414,62 +696,140 @@ SDL_GetAudioDeviceStatus(SDL_AudioDeviceID dev); * Silence will be written to the audio device during the pause. */ /* @{ */ + +/** + * This function is a legacy means of pausing the audio device. + * + * New programs might want to use SDL_PauseAudioDevice() instead. This + * function is equivalent to calling... + * + * ```c + * SDL_PauseAudioDevice(1, pause_on); + * ``` + * + * ...and is only useful if you used the legacy SDL_OpenAudio() function. + * + * \param pause_on non-zero to pause, 0 to unpause + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetAudioStatus + * \sa SDL_PauseAudioDevice + */ extern DECLSPEC void SDLCALL SDL_PauseAudio(int pause_on); + +/** + * Use this function to pause and unpause audio playback on a specified + * device. + * + * This function pauses and unpauses the audio callback processing for a given + * device. Newly-opened audio devices start in the paused state, so you must + * call this function with **pause_on**=0 after opening the specified audio + * device to start playing sound. This allows you to safely initialize data + * for your callback function after opening the audio device. Silence will be + * written to the audio device while paused, and the audio callback is + * guaranteed to not be called. Pausing one device does not prevent other + * unpaused devices from running their callbacks. + * + * Pausing state does not stack; even if you pause a device several times, a + * single unpause will start the device playing again, and vice versa. This is + * different from how SDL_LockAudioDevice() works. + * + * If you just need to protect a few variables from race conditions vs your + * callback, you shouldn't pause the audio device, as it will lead to dropouts + * in the audio playback. Instead, you should use SDL_LockAudioDevice(). + * + * \param dev a device opened by SDL_OpenAudioDevice() + * \param pause_on non-zero to pause, 0 to unpause + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LockAudioDevice + */ extern DECLSPEC void SDLCALL SDL_PauseAudioDevice(SDL_AudioDeviceID dev, int pause_on); /* @} *//* Pause audio functions */ /** - * \brief Load the audio data of a WAVE file into memory + * Load the audio data of a WAVE file into memory. * - * Loading a WAVE file requires \c src, \c spec, \c audio_buf and \c audio_len - * to be valid pointers. The entire data portion of the file is then loaded - * into memory and decoded if necessary. + * Loading a WAVE file requires `src`, `spec`, `audio_buf` and `audio_len` to + * be valid pointers. The entire data portion of the file is then loaded into + * memory and decoded if necessary. * - * If \c freesrc is non-zero, the data source gets automatically closed and - * freed before the function returns. + * If `freesrc` is non-zero, the data source gets automatically closed and + * freed before the function returns. * - * Supported are RIFF WAVE files with the formats PCM (8, 16, 24, and 32 bits), - * IEEE Float (32 bits), Microsoft ADPCM and IMA ADPCM (4 bits), and A-law and - * µ-law (8 bits). Other formats are currently unsupported and cause an error. + * Supported formats are RIFF WAVE files with the formats PCM (8, 16, 24, and + * 32 bits), IEEE Float (32 bits), Microsoft ADPCM and IMA ADPCM (4 bits), and + * A-law and mu-law (8 bits). Other formats are currently unsupported and + * cause an error. * - * If this function succeeds, the pointer returned by it is equal to \c spec - * and the pointer to the audio data allocated by the function is written to - * \c audio_buf and its length in bytes to \c audio_len. The \ref SDL_AudioSpec - * members \c freq, \c channels, and \c format are set to the values of the - * audio data in the buffer. The \c samples member is set to a sane default and - * all others are set to zero. + * If this function succeeds, the pointer returned by it is equal to `spec` + * and the pointer to the audio data allocated by the function is written to + * `audio_buf` and its length in bytes to `audio_len`. The SDL_AudioSpec + * members `freq`, `channels`, and `format` are set to the values of the audio + * data in the buffer. The `samples` member is set to a sane default and all + * others are set to zero. * - * It's necessary to use SDL_FreeWAV() to free the audio data returned in - * \c audio_buf when it is no longer used. + * It's necessary to use SDL_FreeWAV() to free the audio data returned in + * `audio_buf` when it is no longer used. * - * Because of the underspecification of the Waveform format, there are many - * problematic files in the wild that cause issues with strict decoders. To - * provide compatibility with these files, this decoder is lenient in regards - * to the truncation of the file, the fact chunk, and the size of the RIFF - * chunk. The hints SDL_HINT_WAVE_RIFF_CHUNK_SIZE, SDL_HINT_WAVE_TRUNCATION, - * and SDL_HINT_WAVE_FACT_CHUNK can be used to tune the behavior of the - * loading process. + * Because of the underspecification of the .WAV format, there are many + * problematic files in the wild that cause issues with strict decoders. To + * provide compatibility with these files, this decoder is lenient in regards + * to the truncation of the file, the fact chunk, and the size of the RIFF + * chunk. The hints `SDL_HINT_WAVE_RIFF_CHUNK_SIZE`, + * `SDL_HINT_WAVE_TRUNCATION`, and `SDL_HINT_WAVE_FACT_CHUNK` can be used to + * tune the behavior of the loading process. * - * Any file that is invalid (due to truncation, corruption, or wrong values in - * the headers), too big, or unsupported causes an error. Additionally, any - * critical I/O error from the data source will terminate the loading process - * with an error. The function returns NULL on error and in all cases (with the - * exception of \c src being NULL), an appropriate error message will be set. + * Any file that is invalid (due to truncation, corruption, or wrong values in + * the headers), too big, or unsupported causes an error. Additionally, any + * critical I/O error from the data source will terminate the loading process + * with an error. The function returns NULL on error and in all cases (with + * the exception of `src` being NULL), an appropriate error message will be + * set. * - * It is required that the data source supports seeking. + * It is required that the data source supports seeking. * - * Example: - * \code - * SDL_LoadWAV_RW(SDL_RWFromFile("sample.wav", "rb"), 1, ...); - * \endcode + * Example: * - * \param src The data source with the WAVE data - * \param freesrc A integer value that makes the function close the data source if non-zero - * \param spec A pointer filled with the audio format of the audio data - * \param audio_buf A pointer filled with the audio data allocated by the function - * \param audio_len A pointer filled with the length of the audio data buffer in bytes - * \return NULL on error, or non-NULL on success. + * ```c + * SDL_LoadWAV_RW(SDL_RWFromFile("sample.wav", "rb"), 1, &spec, &buf, &len); + * ``` + * + * Note that the SDL_LoadWAV macro does this same thing for you, but in a less + * messy way: + * + * ```c + * SDL_LoadWAV("sample.wav", &spec, &buf, &len); + * ``` + * + * \param src The data source for the WAVE data + * \param freesrc If non-zero, SDL will _always_ free the data source + * \param spec An SDL_AudioSpec that will be filled in with the wave file's + * format details + * \param audio_buf A pointer filled with the audio data, allocated by the + * function. + * \param audio_len A pointer filled with the length of the audio data buffer + * in bytes + * \returns This function, if successfully called, returns `spec`, which will + * be filled with the audio data format of the wave source data. + * `audio_buf` will be filled with a pointer to an allocated buffer + * containing the audio data, and `audio_len` is filled with the + * length of that audio buffer in bytes. + * + * This function returns NULL if the .WAV file cannot be opened, uses + * an unknown data format, or is corrupt; call SDL_GetError() for + * more information. + * + * When the application is done with the data returned in + * `audio_buf`, it should call SDL_FreeWAV() to dispose of it. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_FreeWAV + * \sa SDL_LoadWAV */ extern DECLSPEC SDL_AudioSpec *SDLCALL SDL_LoadWAV_RW(SDL_RWops * src, int freesrc, @@ -485,18 +845,53 @@ extern DECLSPEC SDL_AudioSpec *SDLCALL SDL_LoadWAV_RW(SDL_RWops * src, SDL_LoadWAV_RW(SDL_RWFromFile(file, "rb"),1, spec,audio_buf,audio_len) /** - * This function frees data previously allocated with SDL_LoadWAV_RW() + * Free data previously allocated with SDL_LoadWAV() or SDL_LoadWAV_RW(). + * + * After a WAVE file has been opened with SDL_LoadWAV() or SDL_LoadWAV_RW() + * its data can eventually be freed with SDL_FreeWAV(). It is safe to call + * this function with a NULL pointer. + * + * \param audio_buf a pointer to the buffer created by SDL_LoadWAV() or + * SDL_LoadWAV_RW() + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LoadWAV + * \sa SDL_LoadWAV_RW */ extern DECLSPEC void SDLCALL SDL_FreeWAV(Uint8 * audio_buf); /** - * This function takes a source format and rate and a destination format - * and rate, and initializes the \c cvt structure with information needed - * by SDL_ConvertAudio() to convert a buffer of audio data from one format - * to the other. An unsupported format causes an error and -1 will be returned. + * Initialize an SDL_AudioCVT structure for conversion. * - * \return 0 if no conversion is needed, 1 if the audio filter is set up, - * or -1 on error. + * Before an SDL_AudioCVT structure can be used to convert audio data it must + * be initialized with source and destination information. + * + * This function will zero out every field of the SDL_AudioCVT, so it must be + * called before the application fills in the final buffer information. + * + * Once this function has returned successfully, and reported that a + * conversion is necessary, the application fills in the rest of the fields in + * SDL_AudioCVT, now that it knows how large a buffer it needs to allocate, + * and then can call SDL_ConvertAudio() to complete the conversion. + * + * \param cvt an SDL_AudioCVT structure filled in with audio conversion + * information + * \param src_format the source format of the audio data; for more info see + * SDL_AudioFormat + * \param src_channels the number of channels in the source + * \param src_rate the frequency (sample-frames-per-second) of the source + * \param dst_format the destination format of the audio data; for more info + * see SDL_AudioFormat + * \param dst_channels the number of channels in the destination + * \param dst_rate the frequency (sample-frames-per-second) of the destination + * \returns 1 if the audio filter is prepared, 0 if no conversion is needed, + * or a negative error code on failure; call SDL_GetError() for more + * information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ConvertAudio */ extern DECLSPEC int SDLCALL SDL_BuildAudioCVT(SDL_AudioCVT * cvt, SDL_AudioFormat src_format, @@ -507,16 +902,42 @@ extern DECLSPEC int SDLCALL SDL_BuildAudioCVT(SDL_AudioCVT * cvt, int dst_rate); /** - * Once you have initialized the \c cvt structure using SDL_BuildAudioCVT(), - * created an audio buffer \c cvt->buf, and filled it with \c cvt->len bytes of - * audio data in the source format, this function will convert it in-place - * to the desired format. + * Convert audio data to a desired audio format. * - * The data conversion may expand the size of the audio data, so the buffer - * \c cvt->buf should be allocated after the \c cvt structure is initialized by - * SDL_BuildAudioCVT(), and should be \c cvt->len*cvt->len_mult bytes long. + * This function does the actual audio data conversion, after the application + * has called SDL_BuildAudioCVT() to prepare the conversion information and + * then filled in the buffer details. * - * \return 0 on success or -1 if \c cvt->buf is NULL. + * Once the application has initialized the `cvt` structure using + * SDL_BuildAudioCVT(), allocated an audio buffer and filled it with audio + * data in the source format, this function will convert the buffer, in-place, + * to the desired format. + * + * The data conversion may go through several passes; any given pass may + * possibly temporarily increase the size of the data. For example, SDL might + * expand 16-bit data to 32 bits before resampling to a lower frequency, + * shrinking the data size after having grown it briefly. Since the supplied + * buffer will be both the source and destination, converting as necessary + * in-place, the application must allocate a buffer that will fully contain + * the data during its largest conversion pass. After SDL_BuildAudioCVT() + * returns, the application should set the `cvt->len` field to the size, in + * bytes, of the source data, and allocate a buffer that is `cvt->len * + * cvt->len_mult` bytes long for the `buf` field. + * + * The source data should be copied into this buffer before the call to + * SDL_ConvertAudio(). Upon successful return, this buffer will contain the + * converted audio, and `cvt->len_cvt` will be the size of the converted data, + * in bytes. Any bytes in the buffer past `cvt->len_cvt` are undefined once + * this function returns. + * + * \param cvt an SDL_AudioCVT structure that was previously set up by + * SDL_BuildAudioCVT(). + * \returns 0 if the conversion was completed successfully or a negative error + * code on failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_BuildAudioCVT */ extern DECLSPEC int SDLCALL SDL_ConvertAudio(SDL_AudioCVT * cvt); @@ -532,22 +953,24 @@ struct _SDL_AudioStream; typedef struct _SDL_AudioStream SDL_AudioStream; /** - * Create a new audio stream + * Create a new audio stream. * - * \param src_format The format of the source audio - * \param src_channels The number of channels of the source audio - * \param src_rate The sampling rate of the source audio - * \param dst_format The format of the desired audio output - * \param dst_channels The number of channels of the desired audio output - * \param dst_rate The sampling rate of the desired audio output - * \return 0 on success, or -1 on error. + * \param src_format The format of the source audio + * \param src_channels The number of channels of the source audio + * \param src_rate The sampling rate of the source audio + * \param dst_format The format of the desired audio output + * \param dst_channels The number of channels of the desired audio output + * \param dst_rate The sampling rate of the desired audio output + * \returns 0 on success, or -1 on error. * - * \sa SDL_AudioStreamPut - * \sa SDL_AudioStreamGet - * \sa SDL_AudioStreamAvailable - * \sa SDL_AudioStreamFlush - * \sa SDL_AudioStreamClear - * \sa SDL_FreeAudioStream + * \since This function is available since SDL 2.0.7. + * + * \sa SDL_AudioStreamPut + * \sa SDL_AudioStreamGet + * \sa SDL_AudioStreamAvailable + * \sa SDL_AudioStreamFlush + * \sa SDL_AudioStreamClear + * \sa SDL_FreeAudioStream */ extern DECLSPEC SDL_AudioStream * SDLCALL SDL_NewAudioStream(const SDL_AudioFormat src_format, const Uint8 src_channels, @@ -557,110 +980,164 @@ extern DECLSPEC SDL_AudioStream * SDLCALL SDL_NewAudioStream(const SDL_AudioForm const int dst_rate); /** - * Add data to be converted/resampled to the stream + * Add data to be converted/resampled to the stream. * - * \param stream The stream the audio data is being added to - * \param buf A pointer to the audio data to add - * \param len The number of bytes to write to the stream - * \return 0 on success, or -1 on error. + * \param stream The stream the audio data is being added to + * \param buf A pointer to the audio data to add + * \param len The number of bytes to write to the stream + * \returns 0 on success, or -1 on error. * - * \sa SDL_NewAudioStream - * \sa SDL_AudioStreamGet - * \sa SDL_AudioStreamAvailable - * \sa SDL_AudioStreamFlush - * \sa SDL_AudioStreamClear - * \sa SDL_FreeAudioStream + * \since This function is available since SDL 2.0.7. + * + * \sa SDL_NewAudioStream + * \sa SDL_AudioStreamGet + * \sa SDL_AudioStreamAvailable + * \sa SDL_AudioStreamFlush + * \sa SDL_AudioStreamClear + * \sa SDL_FreeAudioStream */ extern DECLSPEC int SDLCALL SDL_AudioStreamPut(SDL_AudioStream *stream, const void *buf, int len); /** - * Get converted/resampled data from the stream + * Get converted/resampled data from the stream * - * \param stream The stream the audio is being requested from - * \param buf A buffer to fill with audio data - * \param len The maximum number of bytes to fill - * \return The number of bytes read from the stream, or -1 on error + * \param stream The stream the audio is being requested from + * \param buf A buffer to fill with audio data + * \param len The maximum number of bytes to fill + * \returns the number of bytes read from the stream, or -1 on error * - * \sa SDL_NewAudioStream - * \sa SDL_AudioStreamPut - * \sa SDL_AudioStreamAvailable - * \sa SDL_AudioStreamFlush - * \sa SDL_AudioStreamClear - * \sa SDL_FreeAudioStream + * \since This function is available since SDL 2.0.7. + * + * \sa SDL_NewAudioStream + * \sa SDL_AudioStreamPut + * \sa SDL_AudioStreamAvailable + * \sa SDL_AudioStreamFlush + * \sa SDL_AudioStreamClear + * \sa SDL_FreeAudioStream */ extern DECLSPEC int SDLCALL SDL_AudioStreamGet(SDL_AudioStream *stream, void *buf, int len); /** - * Get the number of converted/resampled bytes available. The stream may be - * buffering data behind the scenes until it has enough to resample - * correctly, so this number might be lower than what you expect, or even - * be zero. Add more data or flush the stream if you need the data now. + * Get the number of converted/resampled bytes available. * - * \sa SDL_NewAudioStream - * \sa SDL_AudioStreamPut - * \sa SDL_AudioStreamGet - * \sa SDL_AudioStreamFlush - * \sa SDL_AudioStreamClear - * \sa SDL_FreeAudioStream + * The stream may be buffering data behind the scenes until it has enough to + * resample correctly, so this number might be lower than what you expect, or + * even be zero. Add more data or flush the stream if you need the data now. + * + * \since This function is available since SDL 2.0.7. + * + * \sa SDL_NewAudioStream + * \sa SDL_AudioStreamPut + * \sa SDL_AudioStreamGet + * \sa SDL_AudioStreamFlush + * \sa SDL_AudioStreamClear + * \sa SDL_FreeAudioStream */ extern DECLSPEC int SDLCALL SDL_AudioStreamAvailable(SDL_AudioStream *stream); /** * Tell the stream that you're done sending data, and anything being buffered - * should be converted/resampled and made available immediately. + * should be converted/resampled and made available immediately. * - * It is legal to add more data to a stream after flushing, but there will - * be audio gaps in the output. Generally this is intended to signal the - * end of input, so the complete output becomes available. + * It is legal to add more data to a stream after flushing, but there will be + * audio gaps in the output. Generally this is intended to signal the end of + * input, so the complete output becomes available. * - * \sa SDL_NewAudioStream - * \sa SDL_AudioStreamPut - * \sa SDL_AudioStreamGet - * \sa SDL_AudioStreamAvailable - * \sa SDL_AudioStreamClear - * \sa SDL_FreeAudioStream + * \since This function is available since SDL 2.0.7. + * + * \sa SDL_NewAudioStream + * \sa SDL_AudioStreamPut + * \sa SDL_AudioStreamGet + * \sa SDL_AudioStreamAvailable + * \sa SDL_AudioStreamClear + * \sa SDL_FreeAudioStream */ extern DECLSPEC int SDLCALL SDL_AudioStreamFlush(SDL_AudioStream *stream); /** - * Clear any pending data in the stream without converting it + * Clear any pending data in the stream without converting it * - * \sa SDL_NewAudioStream - * \sa SDL_AudioStreamPut - * \sa SDL_AudioStreamGet - * \sa SDL_AudioStreamAvailable - * \sa SDL_AudioStreamFlush - * \sa SDL_FreeAudioStream + * \since This function is available since SDL 2.0.7. + * + * \sa SDL_NewAudioStream + * \sa SDL_AudioStreamPut + * \sa SDL_AudioStreamGet + * \sa SDL_AudioStreamAvailable + * \sa SDL_AudioStreamFlush + * \sa SDL_FreeAudioStream */ extern DECLSPEC void SDLCALL SDL_AudioStreamClear(SDL_AudioStream *stream); /** * Free an audio stream * - * \sa SDL_NewAudioStream - * \sa SDL_AudioStreamPut - * \sa SDL_AudioStreamGet - * \sa SDL_AudioStreamAvailable - * \sa SDL_AudioStreamFlush - * \sa SDL_AudioStreamClear + * \since This function is available since SDL 2.0.7. + * + * \sa SDL_NewAudioStream + * \sa SDL_AudioStreamPut + * \sa SDL_AudioStreamGet + * \sa SDL_AudioStreamAvailable + * \sa SDL_AudioStreamFlush + * \sa SDL_AudioStreamClear */ extern DECLSPEC void SDLCALL SDL_FreeAudioStream(SDL_AudioStream *stream); #define SDL_MIX_MAXVOLUME 128 + /** - * This takes two audio buffers of the playing audio format and mixes - * them, performing addition, volume adjustment, and overflow clipping. - * The volume ranges from 0 - 128, and should be set to ::SDL_MIX_MAXVOLUME - * for full audio volume. Note this does not change hardware volume. - * This is provided for convenience -- you can mix your own audio data. + * This function is a legacy means of mixing audio. + * + * This function is equivalent to calling... + * + * ```c + * SDL_MixAudioFormat(dst, src, format, len, volume); + * ``` + * + * ...where `format` is the obtained format of the audio device from the + * legacy SDL_OpenAudio() function. + * + * \param dst the destination for the mixed audio + * \param src the source audio buffer to be mixed + * \param len the length of the audio buffer in bytes + * \param volume ranges from 0 - 128, and should be set to SDL_MIX_MAXVOLUME + * for full audio volume + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_MixAudioFormat */ extern DECLSPEC void SDLCALL SDL_MixAudio(Uint8 * dst, const Uint8 * src, Uint32 len, int volume); /** - * This works like SDL_MixAudio(), but you specify the audio format instead of - * using the format of audio device 1. Thus it can be used when no audio - * device is open at all. + * Mix audio data in a specified format. + * + * This takes an audio buffer `src` of `len` bytes of `format` data and mixes + * it into `dst`, performing addition, volume adjustment, and overflow + * clipping. The buffer pointed to by `dst` must also be `len` bytes of + * `format` data. + * + * This is provided for convenience -- you can mix your own audio data. + * + * Do not use this function for mixing together more than two streams of + * sample data. The output from repeated application of this function may be + * distorted by clipping, because there is no accumulator with greater range + * than the input (not to mention this being an inefficient way of doing it). + * + * It is a common misconception that this function is required to write audio + * data to an output stream in an audio callback. While you can do that, + * SDL_MixAudioFormat() is really only needed when you're mixing a single + * audio stream with a volume adjustment. + * + * \param dst the destination for the mixed audio + * \param src the source audio buffer to be mixed + * \param format the SDL_AudioFormat structure representing the desired audio + * format + * \param len the length of the audio buffer in bytes + * \param volume ranges from 0 - 128, and should be set to SDL_MIX_MAXVOLUME + * for full audio volume + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC void SDLCALL SDL_MixAudioFormat(Uint8 * dst, const Uint8 * src, @@ -668,161 +1145,166 @@ extern DECLSPEC void SDLCALL SDL_MixAudioFormat(Uint8 * dst, Uint32 len, int volume); /** - * Queue more audio on non-callback devices. + * Queue more audio on non-callback devices. * - * (If you are looking to retrieve queued audio from a non-callback capture - * device, you want SDL_DequeueAudio() instead. This will return -1 to - * signify an error if you use it with capture devices.) + * If you are looking to retrieve queued audio from a non-callback capture + * device, you want SDL_DequeueAudio() instead. SDL_QueueAudio() will return + * -1 to signify an error if you use it with capture devices. * - * SDL offers two ways to feed audio to the device: you can either supply a - * callback that SDL triggers with some frequency to obtain more audio - * (pull method), or you can supply no callback, and then SDL will expect - * you to supply data at regular intervals (push method) with this function. + * SDL offers two ways to feed audio to the device: you can either supply a + * callback that SDL triggers with some frequency to obtain more audio (pull + * method), or you can supply no callback, and then SDL will expect you to + * supply data at regular intervals (push method) with this function. * - * There are no limits on the amount of data you can queue, short of - * exhaustion of address space. Queued data will drain to the device as - * necessary without further intervention from you. If the device needs - * audio but there is not enough queued, it will play silence to make up - * the difference. This means you will have skips in your audio playback - * if you aren't routinely queueing sufficient data. + * There are no limits on the amount of data you can queue, short of + * exhaustion of address space. Queued data will drain to the device as + * necessary without further intervention from you. If the device needs audio + * but there is not enough queued, it will play silence to make up the + * difference. This means you will have skips in your audio playback if you + * aren't routinely queueing sufficient data. * - * This function copies the supplied data, so you are safe to free it when - * the function returns. This function is thread-safe, but queueing to the - * same device from two threads at once does not promise which buffer will - * be queued first. + * This function copies the supplied data, so you are safe to free it when the + * function returns. This function is thread-safe, but queueing to the same + * device from two threads at once does not promise which buffer will be + * queued first. * - * You may not queue audio on a device that is using an application-supplied - * callback; doing so returns an error. You have to use the audio callback - * or queue audio with this function, but not both. + * You may not queue audio on a device that is using an application-supplied + * callback; doing so returns an error. You have to use the audio callback or + * queue audio with this function, but not both. * - * You should not call SDL_LockAudio() on the device before queueing; SDL - * handles locking internally for this function. + * You should not call SDL_LockAudio() on the device before queueing; SDL + * handles locking internally for this function. * - * \param dev The device ID to which we will queue audio. - * \param data The data to queue to the device for later playback. - * \param len The number of bytes (not samples!) to which (data) points. - * \return 0 on success, or -1 on error. + * Note that SDL2 does not support planar audio. You will need to resample + * from planar audio formats into a non-planar one (see SDL_AudioFormat) + * before queuing audio. * - * \sa SDL_GetQueuedAudioSize - * \sa SDL_ClearQueuedAudio + * \param dev the device ID to which we will queue audio + * \param data the data to queue to the device for later playback + * \param len the number of bytes (not samples!) to which `data` points + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.4. + * + * \sa SDL_ClearQueuedAudio + * \sa SDL_GetQueuedAudioSize */ extern DECLSPEC int SDLCALL SDL_QueueAudio(SDL_AudioDeviceID dev, const void *data, Uint32 len); /** - * Dequeue more audio on non-callback devices. + * Dequeue more audio on non-callback devices. * - * (If you are looking to queue audio for output on a non-callback playback - * device, you want SDL_QueueAudio() instead. This will always return 0 - * if you use it with playback devices.) + * If you are looking to queue audio for output on a non-callback playback + * device, you want SDL_QueueAudio() instead. SDL_DequeueAudio() will always + * return 0 if you use it with playback devices. * - * SDL offers two ways to retrieve audio from a capture device: you can - * either supply a callback that SDL triggers with some frequency as the - * device records more audio data, (push method), or you can supply no - * callback, and then SDL will expect you to retrieve data at regular - * intervals (pull method) with this function. + * SDL offers two ways to retrieve audio from a capture device: you can either + * supply a callback that SDL triggers with some frequency as the device + * records more audio data, (push method), or you can supply no callback, and + * then SDL will expect you to retrieve data at regular intervals (pull + * method) with this function. * - * There are no limits on the amount of data you can queue, short of - * exhaustion of address space. Data from the device will keep queuing as - * necessary without further intervention from you. This means you will - * eventually run out of memory if you aren't routinely dequeueing data. + * There are no limits on the amount of data you can queue, short of + * exhaustion of address space. Data from the device will keep queuing as + * necessary without further intervention from you. This means you will + * eventually run out of memory if you aren't routinely dequeueing data. * - * Capture devices will not queue data when paused; if you are expecting - * to not need captured audio for some length of time, use - * SDL_PauseAudioDevice() to stop the capture device from queueing more - * data. This can be useful during, say, level loading times. When - * unpaused, capture devices will start queueing data from that point, - * having flushed any capturable data available while paused. + * Capture devices will not queue data when paused; if you are expecting to + * not need captured audio for some length of time, use SDL_PauseAudioDevice() + * to stop the capture device from queueing more data. This can be useful + * during, say, level loading times. When unpaused, capture devices will start + * queueing data from that point, having flushed any capturable data available + * while paused. * - * This function is thread-safe, but dequeueing from the same device from - * two threads at once does not promise which thread will dequeued data - * first. + * This function is thread-safe, but dequeueing from the same device from two + * threads at once does not promise which thread will dequeue data first. * - * You may not dequeue audio from a device that is using an - * application-supplied callback; doing so returns an error. You have to use - * the audio callback, or dequeue audio with this function, but not both. + * You may not dequeue audio from a device that is using an + * application-supplied callback; doing so returns an error. You have to use + * the audio callback, or dequeue audio with this function, but not both. * - * You should not call SDL_LockAudio() on the device before queueing; SDL - * handles locking internally for this function. + * You should not call SDL_LockAudio() on the device before dequeueing; SDL + * handles locking internally for this function. * - * \param dev The device ID from which we will dequeue audio. - * \param data A pointer into where audio data should be copied. - * \param len The number of bytes (not samples!) to which (data) points. - * \return number of bytes dequeued, which could be less than requested. + * \param dev the device ID from which we will dequeue audio + * \param data a pointer into where audio data should be copied + * \param len the number of bytes (not samples!) to which (data) points + * \returns the number of bytes dequeued, which could be less than requested; + * call SDL_GetError() for more information. * - * \sa SDL_GetQueuedAudioSize - * \sa SDL_ClearQueuedAudio + * \since This function is available since SDL 2.0.5. + * + * \sa SDL_ClearQueuedAudio + * \sa SDL_GetQueuedAudioSize */ extern DECLSPEC Uint32 SDLCALL SDL_DequeueAudio(SDL_AudioDeviceID dev, void *data, Uint32 len); /** - * Get the number of bytes of still-queued audio. + * Get the number of bytes of still-queued audio. * - * For playback device: + * For playback devices: this is the number of bytes that have been queued for + * playback with SDL_QueueAudio(), but have not yet been sent to the hardware. * - * This is the number of bytes that have been queued for playback with - * SDL_QueueAudio(), but have not yet been sent to the hardware. This - * number may shrink at any time, so this only informs of pending data. + * Once we've sent it to the hardware, this function can not decide the exact + * byte boundary of what has been played. It's possible that we just gave the + * hardware several kilobytes right before you called this function, but it + * hasn't played any of it yet, or maybe half of it, etc. * - * Once we've sent it to the hardware, this function can not decide the - * exact byte boundary of what has been played. It's possible that we just - * gave the hardware several kilobytes right before you called this - * function, but it hasn't played any of it yet, or maybe half of it, etc. + * For capture devices, this is the number of bytes that have been captured by + * the device and are waiting for you to dequeue. This number may grow at any + * time, so this only informs of the lower-bound of available data. * - * For capture devices: + * You may not queue or dequeue audio on a device that is using an + * application-supplied callback; calling this function on such a device + * always returns 0. You have to use the audio callback or queue audio, but + * not both. * - * This is the number of bytes that have been captured by the device and - * are waiting for you to dequeue. This number may grow at any time, so - * this only informs of the lower-bound of available data. + * You should not call SDL_LockAudio() on the device before querying; SDL + * handles locking internally for this function. * - * You may not queue audio on a device that is using an application-supplied - * callback; calling this function on such a device always returns 0. - * You have to queue audio with SDL_QueueAudio()/SDL_DequeueAudio(), or use - * the audio callback, but not both. + * \param dev the device ID of which we will query queued audio size + * \returns the number of bytes (not samples!) of queued audio. * - * You should not call SDL_LockAudio() on the device before querying; SDL - * handles locking internally for this function. + * \since This function is available since SDL 2.0.4. * - * \param dev The device ID of which we will query queued audio size. - * \return Number of bytes (not samples!) of queued audio. - * - * \sa SDL_QueueAudio - * \sa SDL_ClearQueuedAudio + * \sa SDL_ClearQueuedAudio + * \sa SDL_QueueAudio + * \sa SDL_DequeueAudio */ extern DECLSPEC Uint32 SDLCALL SDL_GetQueuedAudioSize(SDL_AudioDeviceID dev); /** - * Drop any queued audio data. For playback devices, this is any queued data - * still waiting to be submitted to the hardware. For capture devices, this - * is any data that was queued by the device that hasn't yet been dequeued by - * the application. + * Drop any queued audio data waiting to be sent to the hardware. * - * Immediately after this call, SDL_GetQueuedAudioSize() will return 0. For - * playback devices, the hardware will start playing silence if more audio - * isn't queued. Unpaused capture devices will start filling the queue again - * as soon as they have more data available (which, depending on the state - * of the hardware and the thread, could be before this function call - * returns!). + * Immediately after this call, SDL_GetQueuedAudioSize() will return 0. For + * output devices, the hardware will start playing silence if more audio isn't + * queued. For capture devices, the hardware will start filling the empty + * queue with new data if the capture device isn't paused. * - * This will not prevent playback of queued audio that's already been sent - * to the hardware, as we can not undo that, so expect there to be some - * fraction of a second of audio that might still be heard. This can be - * useful if you want to, say, drop any pending music during a level change - * in your game. + * This will not prevent playback of queued audio that's already been sent to + * the hardware, as we can not undo that, so expect there to be some fraction + * of a second of audio that might still be heard. This can be useful if you + * want to, say, drop any pending music or any unprocessed microphone input + * during a level change in your game. * - * You may not queue audio on a device that is using an application-supplied - * callback; calling this function on such a device is always a no-op. - * You have to queue audio with SDL_QueueAudio()/SDL_DequeueAudio(), or use - * the audio callback, but not both. + * You may not queue or dequeue audio on a device that is using an + * application-supplied callback; calling this function on such a device + * always returns 0. You have to use the audio callback or queue audio, but + * not both. * - * You should not call SDL_LockAudio() on the device before clearing the - * queue; SDL handles locking internally for this function. + * You should not call SDL_LockAudio() on the device before clearing the + * queue; SDL handles locking internally for this function. * - * This function always succeeds and thus returns void. + * This function always succeeds and thus returns void. * - * \param dev The device ID of which to clear the audio queue. + * \param dev the device ID of which to clear the audio queue * - * \sa SDL_QueueAudio - * \sa SDL_GetQueuedAudioSize + * \since This function is available since SDL 2.0.4. + * + * \sa SDL_GetQueuedAudioSize + * \sa SDL_QueueAudio + * \sa SDL_DequeueAudio */ extern DECLSPEC void SDLCALL SDL_ClearQueuedAudio(SDL_AudioDeviceID dev); @@ -836,16 +1318,139 @@ extern DECLSPEC void SDLCALL SDL_ClearQueuedAudio(SDL_AudioDeviceID dev); * function or you will cause deadlock. */ /* @{ */ + +/** + * This function is a legacy means of locking the audio device. + * + * New programs might want to use SDL_LockAudioDevice() instead. This function + * is equivalent to calling... + * + * ```c + * SDL_LockAudioDevice(1); + * ``` + * + * ...and is only useful if you used the legacy SDL_OpenAudio() function. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LockAudioDevice + * \sa SDL_UnlockAudio + * \sa SDL_UnlockAudioDevice + */ extern DECLSPEC void SDLCALL SDL_LockAudio(void); + +/** + * Use this function to lock out the audio callback function for a specified + * device. + * + * The lock manipulated by these functions protects the audio callback + * function specified in SDL_OpenAudioDevice(). During a + * SDL_LockAudioDevice()/SDL_UnlockAudioDevice() pair, you can be guaranteed + * that the callback function for that device is not running, even if the + * device is not paused. While a device is locked, any other unpaused, + * unlocked devices may still run their callbacks. + * + * Calling this function from inside your audio callback is unnecessary. SDL + * obtains this lock before calling your function, and releases it when the + * function returns. + * + * You should not hold the lock longer than absolutely necessary. If you hold + * it too long, you'll experience dropouts in your audio playback. Ideally, + * your application locks the device, sets a few variables and unlocks again. + * Do not do heavy work while holding the lock for a device. + * + * It is safe to lock the audio device multiple times, as long as you unlock + * it an equivalent number of times. The callback will not run until the + * device has been unlocked completely in this way. If your application fails + * to unlock the device appropriately, your callback will never run, you might + * hear repeating bursts of audio, and SDL_CloseAudioDevice() will probably + * deadlock. + * + * Internally, the audio device lock is a mutex; if you lock from two threads + * at once, not only will you block the audio callback, you'll block the other + * thread. + * + * \param dev the ID of the device to be locked + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_UnlockAudioDevice + */ extern DECLSPEC void SDLCALL SDL_LockAudioDevice(SDL_AudioDeviceID dev); + +/** + * This function is a legacy means of unlocking the audio device. + * + * New programs might want to use SDL_UnlockAudioDevice() instead. This + * function is equivalent to calling... + * + * ```c + * SDL_UnlockAudioDevice(1); + * ``` + * + * ...and is only useful if you used the legacy SDL_OpenAudio() function. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LockAudio + * \sa SDL_UnlockAudioDevice + */ extern DECLSPEC void SDLCALL SDL_UnlockAudio(void); + +/** + * Use this function to unlock the audio callback function for a specified + * device. + * + * This function should be paired with a previous SDL_LockAudioDevice() call. + * + * \param dev the ID of the device to be unlocked + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LockAudioDevice + */ extern DECLSPEC void SDLCALL SDL_UnlockAudioDevice(SDL_AudioDeviceID dev); /* @} *//* Audio lock functions */ /** - * This function shuts down audio processing and closes the audio device. + * This function is a legacy means of closing the audio device. + * + * This function is equivalent to calling... + * + * ```c + * SDL_CloseAudioDevice(1); + * ``` + * + * ...and is only useful if you used the legacy SDL_OpenAudio() function. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_OpenAudio */ extern DECLSPEC void SDLCALL SDL_CloseAudio(void); + +/** + * Use this function to shut down audio processing and close the audio device. + * + * The application should close open audio devices once they are no longer + * needed. Calling this function will wait until the device's audio callback + * is not running, release the audio hardware and then clean up internal + * state. No further audio will play from this device once this function + * returns. + * + * This function may block briefly while pending audio data is played by the + * hardware, so that applications don't drop the last buffer of data they + * supplied. + * + * The device ID is invalid as soon as the device is closed, and is eligible + * for reuse in a new SDL_OpenAudioDevice() call immediately. + * + * \param dev an audio device previously opened with SDL_OpenAudioDevice() + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_OpenAudioDevice + */ extern DECLSPEC void SDLCALL SDL_CloseAudioDevice(SDL_AudioDeviceID dev); /* Ends C function definitions when using C++ */ diff --git a/libs/SDL2/include/SDL_bits.h b/libs/SDL2/include/SDL_bits.h index b116cc8d0..22cb85314 100644 --- a/libs/SDL2/include/SDL_bits.h +++ b/libs/SDL2/include/SDL_bits.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -45,13 +45,12 @@ extern "C" { * with 0. This operation can also be stated as "count leading zeroes" and * "log base 2". * - * \return Index of the most significant bit, or -1 if the value is 0. + * \return the index of the most significant bit, or -1 if the value is 0. */ #if defined(__WATCOMC__) && defined(__386__) -extern _inline int _SDL_clz_watcom (Uint32); -#pragma aux _SDL_clz_watcom = \ +extern __inline int _SDL_bsr_watcom(Uint32); +#pragma aux _SDL_bsr_watcom = \ "bsr eax, eax" \ - "xor eax, 31" \ parm [eax] nomemory \ value [eax] \ modify exact [eax] nomemory; @@ -72,7 +71,13 @@ SDL_MostSignificantBitIndex32(Uint32 x) if (x == 0) { return -1; } - return 31 - _SDL_clz_watcom(x); + return _SDL_bsr_watcom(x); +#elif defined(_MSC_VER) + unsigned long index; + if (_BitScanReverse(&index, x)) { + return index; + } + return -1; #else /* Based off of Bit Twiddling Hacks by Sean Eron Anderson * , released in the public domain. diff --git a/libs/SDL2/include/SDL_blendmode.h b/libs/SDL2/include/SDL_blendmode.h index 6f0a22b99..b6d140dbb 100644 --- a/libs/SDL2/include/SDL_blendmode.h +++ b/libs/SDL2/include/SDL_blendmode.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -50,6 +50,9 @@ typedef enum SDL_BLENDMODE_MOD = 0x00000004, /**< color modulate dstRGB = srcRGB * dstRGB dstA = dstA */ + SDL_BLENDMODE_MUL = 0x00000008, /**< color multiply + dstRGB = (srcRGB * dstRGB) + (dstRGB * (1-srcA)) + dstA = (srcA * dstA) + (dstA * (1-srcA)) */ SDL_BLENDMODE_INVALID = 0x7FFFFFFF /* Additional custom blend modes can be returned by SDL_ComposeCustomBlendMode() */ @@ -88,19 +91,96 @@ typedef enum } SDL_BlendFactor; /** - * \brief Create a custom blend mode, which may or may not be supported by a given renderer + * Compose a custom blend mode for renderers. * - * \param srcColorFactor source color factor - * \param dstColorFactor destination color factor - * \param colorOperation color operation - * \param srcAlphaFactor source alpha factor - * \param dstAlphaFactor destination alpha factor - * \param alphaOperation alpha operation + * The functions SDL_SetRenderDrawBlendMode and SDL_SetTextureBlendMode accept + * the SDL_BlendMode returned by this function if the renderer supports it. * - * The result of the blend mode operation will be: - * dstRGB = dstRGB * dstColorFactor colorOperation srcRGB * srcColorFactor - * and - * dstA = dstA * dstAlphaFactor alphaOperation srcA * srcAlphaFactor + * A blend mode controls how the pixels from a drawing operation (source) get + * combined with the pixels from the render target (destination). First, the + * components of the source and destination pixels get multiplied with their + * blend factors. Then, the blend operation takes the two products and + * calculates the result that will get stored in the render target. + * + * Expressed in pseudocode, it would look like this: + * + * ```c + * dstRGB = colorOperation(srcRGB * srcColorFactor, dstRGB * dstColorFactor); + * dstA = alphaOperation(srcA * srcAlphaFactor, dstA * dstAlphaFactor); + * ``` + * + * Where the functions `colorOperation(src, dst)` and `alphaOperation(src, + * dst)` can return one of the following: + * + * - `src + dst` + * - `src - dst` + * - `dst - src` + * - `min(src, dst)` + * - `max(src, dst)` + * + * The red, green, and blue components are always multiplied with the first, + * second, and third components of the SDL_BlendFactor, respectively. The + * fourth component is not used. + * + * The alpha component is always multiplied with the fourth component of the + * SDL_BlendFactor. The other components are not used in the alpha + * calculation. + * + * Support for these blend modes varies for each renderer. To check if a + * specific SDL_BlendMode is supported, create a renderer and pass it to + * either SDL_SetRenderDrawBlendMode or SDL_SetTextureBlendMode. They will + * return with an error if the blend mode is not supported. + * + * This list describes the support of custom blend modes for each renderer in + * SDL 2.0.6. All renderers support the four blend modes listed in the + * SDL_BlendMode enumeration. + * + * - **direct3d**: Supports `SDL_BLENDOPERATION_ADD` with all factors. + * - **direct3d11**: Supports all operations with all factors. However, some + * factors produce unexpected results with `SDL_BLENDOPERATION_MINIMUM` and + * `SDL_BLENDOPERATION_MAXIMUM`. + * - **opengl**: Supports the `SDL_BLENDOPERATION_ADD` operation with all + * factors. OpenGL versions 1.1, 1.2, and 1.3 do not work correctly with SDL + * 2.0.6. + * - **opengles**: Supports the `SDL_BLENDOPERATION_ADD` operation with all + * factors. Color and alpha factors need to be the same. OpenGL ES 1 + * implementation specific: May also support `SDL_BLENDOPERATION_SUBTRACT` + * and `SDL_BLENDOPERATION_REV_SUBTRACT`. May support color and alpha + * operations being different from each other. May support color and alpha + * factors being different from each other. + * - **opengles2**: Supports the `SDL_BLENDOPERATION_ADD`, + * `SDL_BLENDOPERATION_SUBTRACT`, `SDL_BLENDOPERATION_REV_SUBTRACT` + * operations with all factors. + * - **psp**: No custom blend mode support. + * - **software**: No custom blend mode support. + * + * Some renderers do not provide an alpha component for the default render + * target. The `SDL_BLENDFACTOR_DST_ALPHA` and + * `SDL_BLENDFACTOR_ONE_MINUS_DST_ALPHA` factors do not have an effect in this + * case. + * + * \param srcColorFactor the SDL_BlendFactor applied to the red, green, and + * blue components of the source pixels + * \param dstColorFactor the SDL_BlendFactor applied to the red, green, and + * blue components of the destination pixels + * \param colorOperation the SDL_BlendOperation used to combine the red, + * green, and blue components of the source and + * destination pixels + * \param srcAlphaFactor the SDL_BlendFactor applied to the alpha component of + * the source pixels + * \param dstAlphaFactor the SDL_BlendFactor applied to the alpha component of + * the destination pixels + * \param alphaOperation the SDL_BlendOperation used to combine the alpha + * component of the source and destination pixels + * \returns an SDL_BlendMode that represents the chosen factors and + * operations. + * + * \since This function is available since SDL 2.0.6. + * + * \sa SDL_SetRenderDrawBlendMode + * \sa SDL_GetRenderDrawBlendMode + * \sa SDL_SetTextureBlendMode + * \sa SDL_GetTextureBlendMode */ extern DECLSPEC SDL_BlendMode SDLCALL SDL_ComposeCustomBlendMode(SDL_BlendFactor srcColorFactor, SDL_BlendFactor dstColorFactor, diff --git a/libs/SDL2/include/SDL_clipboard.h b/libs/SDL2/include/SDL_clipboard.h index c4f8766ce..935136305 100644 --- a/libs/SDL2/include/SDL_clipboard.h +++ b/libs/SDL2/include/SDL_clipboard.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -39,23 +39,46 @@ extern "C" { /* Function prototypes */ /** - * \brief Put UTF-8 text into the clipboard + * Put UTF-8 text into the clipboard. * - * \sa SDL_GetClipboardText() + * \param text the text to store in the clipboard + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetClipboardText + * \sa SDL_HasClipboardText */ extern DECLSPEC int SDLCALL SDL_SetClipboardText(const char *text); /** - * \brief Get UTF-8 text from the clipboard, which must be freed with SDL_free() + * Get UTF-8 text from the clipboard, which must be freed with SDL_free(). * - * \sa SDL_SetClipboardText() + * This functions returns empty string if there was not enough memory left for + * a copy of the clipboard's content. + * + * \returns the clipboard text on success or an empty string on failure; call + * SDL_GetError() for more information. Caller must call SDL_free() + * on the returned pointer when done with it (even if there was an + * error). + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HasClipboardText + * \sa SDL_SetClipboardText */ extern DECLSPEC char * SDLCALL SDL_GetClipboardText(void); /** - * \brief Returns a flag indicating whether the clipboard exists and contains a text string that is non-empty + * Query whether the clipboard exists and contains a non-empty text string. * - * \sa SDL_GetClipboardText() + * \returns SDL_TRUE if the clipboard has text, or SDL_FALSE if it does not. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetClipboardText + * \sa SDL_SetClipboardText */ extern DECLSPEC SDL_bool SDLCALL SDL_HasClipboardText(void); diff --git a/libs/SDL2/include/SDL_config.h b/libs/SDL2/include/SDL_config.h index 395ad7c26..c9ed1cfea 100644 --- a/libs/SDL2/include/SDL_config.h +++ b/libs/SDL2/include/SDL_config.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -25,10 +25,23 @@ #include "SDL_platform.h" +/* winsdkver.h defines _WIN32_MAXVER for SDK version detection. It is present since at least the Windows 7 SDK, + * but out of caution we'll only use it if the compiler supports __has_include() to confirm its presence. + * If your compiler doesn't support __has_include() but you have winsdkver.h, define HAVE_WINSDKVER_H. */ +#if !defined(HAVE_WINSDKVER_H) && defined(__has_include) +#if __has_include() +#define HAVE_WINSDKVER_H 1 +#endif +#endif + +#ifdef HAVE_WINSDKVER_H +#include +#endif + /* This is a set of defines to configure the SDL features */ #if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H) -#if defined(__GNUC__) || defined(__DMC__) || defined(__WATCOMC__) +#if defined(__GNUC__) || defined(__DMC__) || defined(__WATCOMC__) || defined(__clang__) || defined(__BORLANDC__) || defined(__CODEGEARC__) #define HAVE_STDINT_H 1 #elif defined(_MSC_VER) typedef signed __int8 int8_t; @@ -82,9 +95,23 @@ typedef unsigned int uintptr_t; #define HAVE_DSOUND_H 1 #define HAVE_DXGI_H 1 #define HAVE_XINPUT_H 1 +#if defined(_WIN32_MAXVER) && _WIN32_MAXVER >= 0x0A00 /* Windows 10 SDK */ +#define HAVE_WINDOWS_GAMING_INPUT_H 1 +#endif +#if defined(_WIN32_MAXVER) && _WIN32_MAXVER >= 0x0602 /* Windows 8 SDK */ +#define HAVE_D3D11_H 1 +#endif #define HAVE_MMDEVICEAPI_H 1 #define HAVE_AUDIOCLIENT_H 1 -#define HAVE_ENDPOINTVOLUME_H 1 +#define HAVE_TPCSHRD_H 1 +#define HAVE_SENSORSAPI_H 1 +#if (defined(_M_IX86) || defined(_M_X64) || defined(_M_AMD64)) && (defined(_MSC_VER) && _MSC_VER >= 1600) +#define HAVE_IMMINTRIN_H 1 +#elif defined(__has_include) && (defined(__i386__) || defined(__x86_64)) +# if __has_include() +# define HAVE_IMMINTRIN_H 1 +# endif +#endif /* This is disabled by default to avoid C runtime dependencies and manifest requirements */ #ifdef HAVE_LIBC @@ -118,6 +145,7 @@ typedef unsigned int uintptr_t; #define HAVE_STRCHR 1 #define HAVE_STRRCHR 1 #define HAVE_STRSTR 1 +/* #undef HAVE_STRTOK_R */ /* These functions have security warnings, so we won't use them */ /* #undef HAVE__LTOA */ /* #undef HAVE__ULTOA */ @@ -130,6 +158,9 @@ typedef unsigned int uintptr_t; #define HAVE_STRNCMP 1 #define HAVE__STRICMP 1 #define HAVE__STRNICMP 1 +#define HAVE__WCSICMP 1 +#define HAVE__WCSNICMP 1 +#define HAVE__WCSDUP 1 #define HAVE_ACOS 1 #define HAVE_ACOSF 1 #define HAVE_ASIN 1 @@ -139,7 +170,7 @@ typedef unsigned int uintptr_t; #define HAVE_ATAN2 1 #define HAVE_ATAN2F 1 #define HAVE_CEILF 1 -#define HAVE__COPYSIGN 1 +#define HAVE__COPYSIGN 1 #define HAVE_COS 1 #define HAVE_COSF 1 #define HAVE_EXP 1 @@ -166,9 +197,16 @@ typedef unsigned int uintptr_t; /* These functions were added with the VC++ 2013 C runtime library */ #if _MSC_VER >= 1800 #define HAVE_STRTOLL 1 +#define HAVE_STRTOULL 1 #define HAVE_VSSCANF 1 +#define HAVE_LROUND 1 +#define HAVE_LROUNDF 1 +#define HAVE_ROUND 1 +#define HAVE_ROUNDF 1 #define HAVE_SCALBN 1 -#define HAVE_SCALBNF 1 +#define HAVE_SCALBNF 1 +#define HAVE_TRUNC 1 +#define HAVE_TRUNCF 1 #endif /* This function is available with at least the VC++ 2008 C runtime library */ #if _MSC_VER >= 1400 @@ -192,18 +230,26 @@ typedef unsigned int uintptr_t; /* Enable various input drivers */ #define SDL_JOYSTICK_DINPUT 1 -#define SDL_JOYSTICK_XINPUT 1 #define SDL_JOYSTICK_HIDAPI 1 +#ifndef __WINRT__ +#define SDL_JOYSTICK_RAWINPUT 1 +#endif +#define SDL_JOYSTICK_VIRTUAL 1 +#ifdef HAVE_WINDOWS_GAMING_INPUT_H +#define SDL_JOYSTICK_WGI 1 +#endif +#define SDL_JOYSTICK_XINPUT 1 #define SDL_HAPTIC_DINPUT 1 #define SDL_HAPTIC_XINPUT 1 -/* Enable the dummy sensor driver */ -#define SDL_SENSOR_DUMMY 1 +/* Enable the sensor driver */ +#define SDL_SENSOR_WINDOWS 1 /* Enable various shared object loading systems */ #define SDL_LOADSO_WINDOWS 1 /* Enable various threading systems */ +#define SDL_THREAD_GENERIC_COND_SUFFIX 1 #define SDL_THREAD_WINDOWS 1 /* Enable various timer systems */ @@ -216,8 +262,8 @@ typedef unsigned int uintptr_t; #ifndef SDL_VIDEO_RENDER_D3D #define SDL_VIDEO_RENDER_D3D 1 #endif -#ifndef SDL_VIDEO_RENDER_D3D11 -#define SDL_VIDEO_RENDER_D3D11 0 +#if !defined(SDL_VIDEO_RENDER_D3D11) && defined(HAVE_D3D11_H) +#define SDL_VIDEO_RENDER_D3D11 1 #endif /* Enable OpenGL support */ @@ -255,3 +301,5 @@ typedef unsigned int uintptr_t; #endif #endif /* SDL_config_windows_h_ */ + +/* vi: set ts=4 sw=4 expandtab: */ diff --git a/libs/SDL2/include/SDL_cpuinfo.h b/libs/SDL2/include/SDL_cpuinfo.h index 296df01aa..1fc40991d 100644 --- a/libs/SDL2/include/SDL_cpuinfo.h +++ b/libs/SDL2/include/SDL_cpuinfo.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -34,11 +34,20 @@ /* Visual Studio 2005 has a bug where intrin.h conflicts with winnt.h */ #if defined(_MSC_VER) && (_MSC_VER >= 1500) && (defined(_M_IX86) || defined(_M_X64)) #ifdef __clang__ -/* Many of the intrinsics SDL uses are not implemented by clang with Visual Studio */ -#undef __MMX__ -#undef __SSE__ -#undef __SSE2__ -#else +/* As of Clang 11, '_m_prefetchw' is conflicting with the winnt.h's version, + so we define the needed '_m_prefetch' here as a pseudo-header, until the issue is fixed. */ + +#ifndef __PRFCHWINTRIN_H +#define __PRFCHWINTRIN_H + +static __inline__ void __attribute__((__always_inline__, __nodebug__)) +_m_prefetch(void *__P) +{ + __builtin_prefetch (__P, 0, 3 /* _MM_HINT_T0 */); +} + +#endif /* __PRFCHWINTRIN_H */ +#endif /* __clang__ */ #include #ifndef _WIN64 #ifndef __MMX__ @@ -54,9 +63,14 @@ #ifndef __SSE2__ #define __SSE2__ #endif -#endif /* __clang__ */ +#ifndef __SSE3__ +#define __SSE3__ +#endif #elif defined(__MINGW64_VERSION_MAJOR) #include +#if !defined(SDL_DISABLE_ARM_NEON_H) && defined(__ARM_NEON) +# include +#endif #else /* altivec.h redefining bool causes a number of problems, see bugs 3993 and 4392, so you need to explicitly define SDL_ENABLE_ALTIVEC_H to have it included. */ #if defined(HAVE_ALTIVEC_H) && defined(__ALTIVEC__) && !defined(__APPLE_ALTIVEC__) && defined(SDL_ENABLE_ALTIVEC_H) @@ -73,12 +87,14 @@ # define __ARM_NEON 1 /* Set __ARM_NEON so that it can be used elsewhere, at compile time */ # endif # if defined (_M_ARM64) -# include -# include +# include +# include # define __ARM_NEON 1 /* Set __ARM_NEON so that it can be used elsewhere, at compile time */ # endif # endif #endif +#endif /* compiler version */ + #if defined(__3dNOW__) && !defined(SDL_DISABLE_MM3DNOW_H) #include #endif @@ -98,7 +114,6 @@ #include #endif #endif /* HAVE_IMMINTRIN_H */ -#endif /* compiler version */ #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ @@ -114,151 +129,425 @@ extern "C" { #define SDL_CACHELINE_SIZE 128 /** - * This function returns the number of CPU cores available. + * Get the number of CPU cores available. + * + * \returns the total number of logical CPU cores. On CPUs that include + * technologies such as hyperthreading, the number of logical cores + * may be more than the number of physical cores. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC int SDLCALL SDL_GetCPUCount(void); /** - * This function returns the L1 cache line size of the CPU + * Determine the L1 cache line size of the CPU. * - * This is useful for determining multi-threaded structure padding - * or SIMD prefetch sizes. + * This is useful for determining multi-threaded structure padding or SIMD + * prefetch sizes. + * + * \returns the L1 cache line size of the CPU, in bytes. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC int SDLCALL SDL_GetCPUCacheLineSize(void); /** - * This function returns true if the CPU has the RDTSC instruction. + * Determine whether the CPU has the RDTSC instruction. + * + * This always returns false on CPUs that aren't using Intel instruction sets. + * + * \returns SDL_TRUE if the CPU has the RDTSC instruction or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Has3DNow + * \sa SDL_HasAltiVec + * \sa SDL_HasAVX + * \sa SDL_HasAVX2 + * \sa SDL_HasMMX + * \sa SDL_HasSSE + * \sa SDL_HasSSE2 + * \sa SDL_HasSSE3 + * \sa SDL_HasSSE41 + * \sa SDL_HasSSE42 */ extern DECLSPEC SDL_bool SDLCALL SDL_HasRDTSC(void); /** - * This function returns true if the CPU has AltiVec features. + * Determine whether the CPU has AltiVec features. + * + * This always returns false on CPUs that aren't using PowerPC instruction + * sets. + * + * \returns SDL_TRUE if the CPU has AltiVec features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Has3DNow + * \sa SDL_HasAVX + * \sa SDL_HasAVX2 + * \sa SDL_HasMMX + * \sa SDL_HasRDTSC + * \sa SDL_HasSSE + * \sa SDL_HasSSE2 + * \sa SDL_HasSSE3 + * \sa SDL_HasSSE41 + * \sa SDL_HasSSE42 */ extern DECLSPEC SDL_bool SDLCALL SDL_HasAltiVec(void); /** - * This function returns true if the CPU has MMX features. + * Determine whether the CPU has MMX features. + * + * This always returns false on CPUs that aren't using Intel instruction sets. + * + * \returns SDL_TRUE if the CPU has MMX features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Has3DNow + * \sa SDL_HasAltiVec + * \sa SDL_HasAVX + * \sa SDL_HasAVX2 + * \sa SDL_HasRDTSC + * \sa SDL_HasSSE + * \sa SDL_HasSSE2 + * \sa SDL_HasSSE3 + * \sa SDL_HasSSE41 + * \sa SDL_HasSSE42 */ extern DECLSPEC SDL_bool SDLCALL SDL_HasMMX(void); /** - * This function returns true if the CPU has 3DNow! features. + * Determine whether the CPU has 3DNow! features. + * + * This always returns false on CPUs that aren't using AMD instruction sets. + * + * \returns SDL_TRUE if the CPU has 3DNow! features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HasAltiVec + * \sa SDL_HasAVX + * \sa SDL_HasAVX2 + * \sa SDL_HasMMX + * \sa SDL_HasRDTSC + * \sa SDL_HasSSE + * \sa SDL_HasSSE2 + * \sa SDL_HasSSE3 + * \sa SDL_HasSSE41 + * \sa SDL_HasSSE42 */ extern DECLSPEC SDL_bool SDLCALL SDL_Has3DNow(void); /** - * This function returns true if the CPU has SSE features. + * Determine whether the CPU has SSE features. + * + * This always returns false on CPUs that aren't using Intel instruction sets. + * + * \returns SDL_TRUE if the CPU has SSE features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Has3DNow + * \sa SDL_HasAltiVec + * \sa SDL_HasAVX + * \sa SDL_HasAVX2 + * \sa SDL_HasMMX + * \sa SDL_HasRDTSC + * \sa SDL_HasSSE2 + * \sa SDL_HasSSE3 + * \sa SDL_HasSSE41 + * \sa SDL_HasSSE42 */ extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE(void); /** - * This function returns true if the CPU has SSE2 features. + * Determine whether the CPU has SSE2 features. + * + * This always returns false on CPUs that aren't using Intel instruction sets. + * + * \returns SDL_TRUE if the CPU has SSE2 features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Has3DNow + * \sa SDL_HasAltiVec + * \sa SDL_HasAVX + * \sa SDL_HasAVX2 + * \sa SDL_HasMMX + * \sa SDL_HasRDTSC + * \sa SDL_HasSSE + * \sa SDL_HasSSE3 + * \sa SDL_HasSSE41 + * \sa SDL_HasSSE42 */ extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE2(void); /** - * This function returns true if the CPU has SSE3 features. + * Determine whether the CPU has SSE3 features. + * + * This always returns false on CPUs that aren't using Intel instruction sets. + * + * \returns SDL_TRUE if the CPU has SSE3 features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Has3DNow + * \sa SDL_HasAltiVec + * \sa SDL_HasAVX + * \sa SDL_HasAVX2 + * \sa SDL_HasMMX + * \sa SDL_HasRDTSC + * \sa SDL_HasSSE + * \sa SDL_HasSSE2 + * \sa SDL_HasSSE41 + * \sa SDL_HasSSE42 */ extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE3(void); /** - * This function returns true if the CPU has SSE4.1 features. + * Determine whether the CPU has SSE4.1 features. + * + * This always returns false on CPUs that aren't using Intel instruction sets. + * + * \returns SDL_TRUE if the CPU has SSE4.1 features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Has3DNow + * \sa SDL_HasAltiVec + * \sa SDL_HasAVX + * \sa SDL_HasAVX2 + * \sa SDL_HasMMX + * \sa SDL_HasRDTSC + * \sa SDL_HasSSE + * \sa SDL_HasSSE2 + * \sa SDL_HasSSE3 + * \sa SDL_HasSSE42 */ extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE41(void); /** - * This function returns true if the CPU has SSE4.2 features. + * Determine whether the CPU has SSE4.2 features. + * + * This always returns false on CPUs that aren't using Intel instruction sets. + * + * \returns SDL_TRUE if the CPU has SSE4.2 features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Has3DNow + * \sa SDL_HasAltiVec + * \sa SDL_HasAVX + * \sa SDL_HasAVX2 + * \sa SDL_HasMMX + * \sa SDL_HasRDTSC + * \sa SDL_HasSSE + * \sa SDL_HasSSE2 + * \sa SDL_HasSSE3 + * \sa SDL_HasSSE41 */ extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE42(void); /** - * This function returns true if the CPU has AVX features. + * Determine whether the CPU has AVX features. + * + * This always returns false on CPUs that aren't using Intel instruction sets. + * + * \returns SDL_TRUE if the CPU has AVX features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.2. + * + * \sa SDL_Has3DNow + * \sa SDL_HasAltiVec + * \sa SDL_HasAVX2 + * \sa SDL_HasMMX + * \sa SDL_HasRDTSC + * \sa SDL_HasSSE + * \sa SDL_HasSSE2 + * \sa SDL_HasSSE3 + * \sa SDL_HasSSE41 + * \sa SDL_HasSSE42 */ extern DECLSPEC SDL_bool SDLCALL SDL_HasAVX(void); /** - * This function returns true if the CPU has AVX2 features. + * Determine whether the CPU has AVX2 features. + * + * This always returns false on CPUs that aren't using Intel instruction sets. + * + * \returns SDL_TRUE if the CPU has AVX2 features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.4. + * + * \sa SDL_Has3DNow + * \sa SDL_HasAltiVec + * \sa SDL_HasAVX + * \sa SDL_HasMMX + * \sa SDL_HasRDTSC + * \sa SDL_HasSSE + * \sa SDL_HasSSE2 + * \sa SDL_HasSSE3 + * \sa SDL_HasSSE41 + * \sa SDL_HasSSE42 */ extern DECLSPEC SDL_bool SDLCALL SDL_HasAVX2(void); /** - * This function returns true if the CPU has AVX-512F (foundation) features. + * Determine whether the CPU has AVX-512F (foundation) features. + * + * This always returns false on CPUs that aren't using Intel instruction sets. + * + * \returns SDL_TRUE if the CPU has AVX-512F features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.9. + * + * \sa SDL_HasAVX */ extern DECLSPEC SDL_bool SDLCALL SDL_HasAVX512F(void); /** - * This function returns true if the CPU has NEON (ARM SIMD) features. + * Determine whether the CPU has ARM SIMD (ARMv6) features. + * + * This is different from ARM NEON, which is a different instruction set. + * + * This always returns false on CPUs that aren't using ARM instruction sets. + * + * \returns SDL_TRUE if the CPU has ARM SIMD features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.12. + * + * \sa SDL_HasNEON + */ +extern DECLSPEC SDL_bool SDLCALL SDL_HasARMSIMD(void); + +/** + * Determine whether the CPU has NEON (ARM SIMD) features. + * + * This always returns false on CPUs that aren't using ARM instruction sets. + * + * \returns SDL_TRUE if the CPU has ARM NEON features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.6. */ extern DECLSPEC SDL_bool SDLCALL SDL_HasNEON(void); /** - * This function returns the amount of RAM configured in the system, in MB. + * Get the amount of RAM configured in the system. + * + * \returns the amount of RAM configured in the system in MB. + * + * \since This function is available since SDL 2.0.1. */ extern DECLSPEC int SDLCALL SDL_GetSystemRAM(void); /** - * \brief Report the alignment this system needs for SIMD allocations. + * Report the alignment this system needs for SIMD allocations. * * This will return the minimum number of bytes to which a pointer must be - * aligned to be compatible with SIMD instructions on the current machine. - * For example, if the machine supports SSE only, it will return 16, but if - * it supports AVX-512F, it'll return 64 (etc). This only reports values for - * instruction sets SDL knows about, so if your SDL build doesn't have - * SDL_HasAVX512F(), then it might return 16 for the SSE support it sees and - * not 64 for the AVX-512 instructions that exist but SDL doesn't know about. - * Plan accordingly. + * aligned to be compatible with SIMD instructions on the current machine. For + * example, if the machine supports SSE only, it will return 16, but if it + * supports AVX-512F, it'll return 64 (etc). This only reports values for + * instruction sets SDL knows about, so if your SDL build doesn't have + * SDL_HasAVX512F(), then it might return 16 for the SSE support it sees and + * not 64 for the AVX-512 instructions that exist but SDL doesn't know about. + * Plan accordingly. + * + * \returns the alignment in bytes needed for available, known SIMD + * instructions. + * + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC size_t SDLCALL SDL_SIMDGetAlignment(void); /** - * \brief Allocate memory in a SIMD-friendly way. + * Allocate memory in a SIMD-friendly way. * * This will allocate a block of memory that is suitable for use with SIMD - * instructions. Specifically, it will be properly aligned and padded for - * the system's supported vector instructions. + * instructions. Specifically, it will be properly aligned and padded for the + * system's supported vector instructions. * - * The memory returned will be padded such that it is safe to read or write - * an incomplete vector at the end of the memory block. This can be useful - * so you don't have to drop back to a scalar fallback at the end of your - * SIMD processing loop to deal with the final elements without overflowing - * the allocated buffer. + * The memory returned will be padded such that it is safe to read or write an + * incomplete vector at the end of the memory block. This can be useful so you + * don't have to drop back to a scalar fallback at the end of your SIMD + * processing loop to deal with the final elements without overflowing the + * allocated buffer. * - * You must free this memory with SDL_FreeSIMD(), not free() or SDL_free() - * or delete[], etc. + * You must free this memory with SDL_FreeSIMD(), not free() or SDL_free() or + * delete[], etc. * - * Note that SDL will only deal with SIMD instruction sets it is aware of; - * for example, SDL 2.0.8 knows that SSE wants 16-byte vectors - * (SDL_HasSSE()), and AVX2 wants 32 bytes (SDL_HasAVX2()), but doesn't - * know that AVX-512 wants 64. To be clear: if you can't decide to use an - * instruction set with an SDL_Has*() function, don't use that instruction - * set with memory allocated through here. + * Note that SDL will only deal with SIMD instruction sets it is aware of; for + * example, SDL 2.0.8 knows that SSE wants 16-byte vectors (SDL_HasSSE()), and + * AVX2 wants 32 bytes (SDL_HasAVX2()), but doesn't know that AVX-512 wants + * 64. To be clear: if you can't decide to use an instruction set with an + * SDL_Has*() function, don't use that instruction set with memory allocated + * through here. * * SDL_AllocSIMD(0) will return a non-NULL pointer, assuming the system isn't - * out of memory. + * out of memory, but you are not allowed to dereference it (because you only + * own zero bytes of that buffer). * - * \param len The length, in bytes, of the block to allocated. The actual - * allocated block might be larger due to padding, etc. - * \return Pointer to newly-allocated block, NULL if out of memory. + * \param len The length, in bytes, of the block to allocate. The actual + * allocated block might be larger due to padding, etc. + * \returns a pointer to the newly-allocated block, NULL if out of memory. + * + * \since This function is available since SDL 2.0.10. * * \sa SDL_SIMDAlignment + * \sa SDL_SIMDRealloc * \sa SDL_SIMDFree */ extern DECLSPEC void * SDLCALL SDL_SIMDAlloc(const size_t len); /** - * \brief Deallocate memory obtained from SDL_SIMDAlloc + * Reallocate memory obtained from SDL_SIMDAlloc * * It is not valid to use this function on a pointer from anything but - * SDL_SIMDAlloc(). It can't be used on pointers from malloc, realloc, - * SDL_malloc, memalign, new[], etc. + * SDL_SIMDAlloc(). It can't be used on pointers from malloc, realloc, + * SDL_malloc, memalign, new[], etc. + * + * \param mem The pointer obtained from SDL_SIMDAlloc. This function also + * accepts NULL, at which point this function is the same as + * calling SDL_SIMDAlloc with a NULL pointer. + * \param len The length, in bytes, of the block to allocated. The actual + * allocated block might be larger due to padding, etc. Passing 0 + * will return a non-NULL pointer, assuming the system isn't out of + * memory. + * \returns a pointer to the newly-reallocated block, NULL if out of memory. + * + * \since This function is available since SDL 2.0.14. + * + * \sa SDL_SIMDAlignment + * \sa SDL_SIMDAlloc + * \sa SDL_SIMDFree + */ +extern DECLSPEC void * SDLCALL SDL_SIMDRealloc(void *mem, const size_t len); + +/** + * Deallocate memory obtained from SDL_SIMDAlloc + * + * It is not valid to use this function on a pointer from anything but + * SDL_SIMDAlloc() or SDL_SIMDRealloc(). It can't be used on pointers from + * malloc, realloc, SDL_malloc, memalign, new[], etc. * * However, SDL_SIMDFree(NULL) is a legal no-op. * + * The memory pointed to by `ptr` is no longer valid for access upon return, + * and may be returned to the system or reused by a future allocation. The + * pointer passed to this function is no longer safe to dereference once this + * function returns, and should be discarded. + * + * \param ptr The pointer, returned from SDL_SIMDAlloc or SDL_SIMDRealloc, to + * deallocate. NULL is a legal no-op. + * + * \since This function is available since SDL 2.0.10. + * * \sa SDL_SIMDAlloc + * \sa SDL_SIMDRealloc */ extern DECLSPEC void SDLCALL SDL_SIMDFree(void *ptr); -/* vi: set ts=4 sw=4 expandtab: */ /* Ends C function definitions when using C++ */ #ifdef __cplusplus } diff --git a/libs/SDL2/include/SDL_egl.h b/libs/SDL2/include/SDL_egl.h index f50fa5c9b..f90e27b26 100644 --- a/libs/SDL2/include/SDL_egl.h +++ b/libs/SDL2/include/SDL_egl.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -24,7 +24,11 @@ * * This is a simple file to encapsulate the EGL API headers. */ -#if !defined(_MSC_VER) && !defined(__ANDROID__) +#if !defined(_MSC_VER) && !defined(__ANDROID__) && !defined(SDL_USE_BUILTIN_OPENGL_DEFINITIONS) + +#if defined(__vita__) || defined(__psp2__) +#include +#endif #include #include @@ -37,7 +41,7 @@ #define __khrplatform_h_ /* -** Copyright (c) 2008-2009 The Khronos Group Inc. +** Copyright (c) 2008-2018 The Khronos Group Inc. ** ** Permission is hereby granted, free of charge, to any person obtaining a ** copy of this software and/or associated documentation files (the @@ -60,104 +64,112 @@ */ /* Khronos platform-specific types and definitions. -* -* $Revision: 23298 $ on $Date: 2013-09-30 17:07:13 -0700 (Mon, 30 Sep 2013) $ -* -* Adopters may modify this file to suit their platform. Adopters are -* encouraged to submit platform specific modifications to the Khronos -* group so that they can be included in future versions of this file. -* Please submit changes by sending them to the public Khronos Bugzilla -* (http://khronos.org/bugzilla) by filing a bug against product -* "Khronos (general)" component "Registry". -* -* A predefined template which fills in some of the bug fields can be -* reached using http://tinyurl.com/khrplatform-h-bugreport, but you -* must create a Bugzilla login first. -* -* -* See the Implementer's Guidelines for information about where this file -* should be located on your system and for more details of its use: -* http://www.khronos.org/registry/implementers_guide.pdf -* -* This file should be included as -* #include -* by Khronos client API header files that use its types and defines. -* -* The types in khrplatform.h should only be used to define API-specific types. -* -* Types defined in khrplatform.h: -* khronos_int8_t signed 8 bit -* khronos_uint8_t unsigned 8 bit -* khronos_int16_t signed 16 bit -* khronos_uint16_t unsigned 16 bit -* khronos_int32_t signed 32 bit -* khronos_uint32_t unsigned 32 bit -* khronos_int64_t signed 64 bit -* khronos_uint64_t unsigned 64 bit -* khronos_intptr_t signed same number of bits as a pointer -* khronos_uintptr_t unsigned same number of bits as a pointer -* khronos_ssize_t signed size -* khronos_usize_t unsigned size -* khronos_float_t signed 32 bit floating point -* khronos_time_ns_t unsigned 64 bit time in nanoseconds -* khronos_utime_nanoseconds_t unsigned time interval or absolute time in -* nanoseconds -* khronos_stime_nanoseconds_t signed time interval in nanoseconds -* khronos_boolean_enum_t enumerated boolean type. This should -* only be used as a base type when a client API's boolean type is -* an enum. Client APIs which use an integer or other type for -* booleans cannot use this as the base type for their boolean. -* -* Tokens defined in khrplatform.h: -* -* KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values. -* -* KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0. -* KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0. -* -* Calling convention macros defined in this file: -* KHRONOS_APICALL -* KHRONOS_APIENTRY -* KHRONOS_APIATTRIBUTES -* -* These may be used in function prototypes as: -* -* KHRONOS_APICALL void KHRONOS_APIENTRY funcname( -* int arg1, -* int arg2) KHRONOS_APIATTRIBUTES; -*/ + * + * The master copy of khrplatform.h is maintained in the Khronos EGL + * Registry repository at https://github.com/KhronosGroup/EGL-Registry + * The last semantic modification to khrplatform.h was at commit ID: + * 67a3e0864c2d75ea5287b9f3d2eb74a745936692 + * + * Adopters may modify this file to suit their platform. Adopters are + * encouraged to submit platform specific modifications to the Khronos + * group so that they can be included in future versions of this file. + * Please submit changes by filing pull requests or issues on + * the EGL Registry repository linked above. + * + * + * See the Implementer's Guidelines for information about where this file + * should be located on your system and for more details of its use: + * http://www.khronos.org/registry/implementers_guide.pdf + * + * This file should be included as + * #include + * by Khronos client API header files that use its types and defines. + * + * The types in khrplatform.h should only be used to define API-specific types. + * + * Types defined in khrplatform.h: + * khronos_int8_t signed 8 bit + * khronos_uint8_t unsigned 8 bit + * khronos_int16_t signed 16 bit + * khronos_uint16_t unsigned 16 bit + * khronos_int32_t signed 32 bit + * khronos_uint32_t unsigned 32 bit + * khronos_int64_t signed 64 bit + * khronos_uint64_t unsigned 64 bit + * khronos_intptr_t signed same number of bits as a pointer + * khronos_uintptr_t unsigned same number of bits as a pointer + * khronos_ssize_t signed size + * khronos_usize_t unsigned size + * khronos_float_t signed 32 bit floating point + * khronos_time_ns_t unsigned 64 bit time in nanoseconds + * khronos_utime_nanoseconds_t unsigned time interval or absolute time in + * nanoseconds + * khronos_stime_nanoseconds_t signed time interval in nanoseconds + * khronos_boolean_enum_t enumerated boolean type. This should + * only be used as a base type when a client API's boolean type is + * an enum. Client APIs which use an integer or other type for + * booleans cannot use this as the base type for their boolean. + * + * Tokens defined in khrplatform.h: + * + * KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values. + * + * KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0. + * KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0. + * + * Calling convention macros defined in this file: + * KHRONOS_APICALL + * KHRONOS_APIENTRY + * KHRONOS_APIATTRIBUTES + * + * These may be used in function prototypes as: + * + * KHRONOS_APICALL void KHRONOS_APIENTRY funcname( + * int arg1, + * int arg2) KHRONOS_APIATTRIBUTES; + */ + +#if defined(__SCITECH_SNAP__) && !defined(KHRONOS_STATIC) +# define KHRONOS_STATIC 1 +#endif /*------------------------------------------------------------------------- -* Definition of KHRONOS_APICALL -*------------------------------------------------------------------------- -* This precedes the return type of the function in the function prototype. -*/ -#if defined(_WIN32) && !defined(__SCITECH_SNAP__) && !defined(SDL_VIDEO_STATIC_ANGLE) + * Definition of KHRONOS_APICALL + *------------------------------------------------------------------------- + * This precedes the return type of the function in the function prototype. + */ +#if defined(KHRONOS_STATIC) + /* If the preprocessor constant KHRONOS_STATIC is defined, make the + * header compatible with static linking. */ +# define KHRONOS_APICALL +#elif defined(_WIN32) # define KHRONOS_APICALL __declspec(dllimport) #elif defined (__SYMBIAN32__) # define KHRONOS_APICALL IMPORT_C +#elif defined(__ANDROID__) +# define KHRONOS_APICALL __attribute__((visibility("default"))) #else # define KHRONOS_APICALL #endif /*------------------------------------------------------------------------- -* Definition of KHRONOS_APIENTRY -*------------------------------------------------------------------------- -* This follows the return type of the function and precedes the function -* name in the function prototype. -*/ + * Definition of KHRONOS_APIENTRY + *------------------------------------------------------------------------- + * This follows the return type of the function and precedes the function + * name in the function prototype. + */ #if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__) -/* Win32 but not WinCE */ + /* Win32 but not WinCE */ # define KHRONOS_APIENTRY __stdcall #else # define KHRONOS_APIENTRY #endif /*------------------------------------------------------------------------- -* Definition of KHRONOS_APIATTRIBUTES -*------------------------------------------------------------------------- -* This follows the closing parenthesis of the function prototype arguments. -*/ + * Definition of KHRONOS_APIATTRIBUTES + *------------------------------------------------------------------------- + * This follows the closing parenthesis of the function prototype arguments. + */ #if defined (__ARMCC_2__) #define KHRONOS_APIATTRIBUTES __softfp #else @@ -165,14 +177,14 @@ #endif /*------------------------------------------------------------------------- -* basic type definitions -*-----------------------------------------------------------------------*/ + * basic type definitions + *-----------------------------------------------------------------------*/ #if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC__) || defined(__SCO__) || defined(__USLC__) /* -* Using -*/ + * Using + */ #include typedef int32_t khronos_int32_t; typedef uint32_t khronos_uint32_t; @@ -184,8 +196,8 @@ typedef uint64_t khronos_uint64_t; #elif defined(__VMS ) || defined(__sgi) /* -* Using -*/ + * Using + */ #include typedef int32_t khronos_int32_t; typedef uint32_t khronos_uint32_t; @@ -197,8 +209,8 @@ typedef uint64_t khronos_uint64_t; #elif defined(_WIN32) && !defined(__SCITECH_SNAP__) /* -* Win32 -*/ + * Win32 + */ typedef __int32 khronos_int32_t; typedef unsigned __int32 khronos_uint32_t; typedef __int64 khronos_int64_t; @@ -209,8 +221,8 @@ typedef unsigned __int64 khronos_uint64_t; #elif defined(__sun__) || defined(__digital__) /* -* Sun or Digital -*/ + * Sun or Digital + */ typedef int khronos_int32_t; typedef unsigned int khronos_uint32_t; #if defined(__arch64__) || defined(_LP64) @@ -226,8 +238,8 @@ typedef unsigned long long int khronos_uint64_t; #elif 0 /* -* Hypothetical platform with no float or int64 support -*/ + * Hypothetical platform with no float or int64 support + */ typedef int khronos_int32_t; typedef unsigned int khronos_uint32_t; #define KHRONOS_SUPPORT_INT64 0 @@ -236,8 +248,8 @@ typedef unsigned int khronos_uint32_t; #else /* -* Generic fallback -*/ + * Generic fallback + */ #include typedef int32_t khronos_int32_t; typedef uint32_t khronos_uint32_t; @@ -250,18 +262,18 @@ typedef uint64_t khronos_uint64_t; /* -* Types that are (so far) the same on all platforms -*/ + * Types that are (so far) the same on all platforms + */ typedef signed char khronos_int8_t; typedef unsigned char khronos_uint8_t; typedef signed short int khronos_int16_t; typedef unsigned short int khronos_uint16_t; /* -* Types that differ between LLP64 and LP64 architectures - in LLP64, -* pointers are 64 bits, but 'long' is still 32 bits. Win64 appears -* to be the only LLP64 architecture in current use. -*/ + * Types that differ between LLP64 and LP64 architectures - in LLP64, + * pointers are 64 bits, but 'long' is still 32 bits. Win64 appears + * to be the only LLP64 architecture in current use. + */ #ifdef _WIN64 typedef signed long long int khronos_intptr_t; typedef unsigned long long int khronos_uintptr_t; @@ -276,41 +288,41 @@ typedef unsigned long int khronos_usize_t; #if KHRONOS_SUPPORT_FLOAT /* -* Float type -*/ + * Float type + */ typedef float khronos_float_t; #endif #if KHRONOS_SUPPORT_INT64 /* Time types -* -* These types can be used to represent a time interval in nanoseconds or -* an absolute Unadjusted System Time. Unadjusted System Time is the number -* of nanoseconds since some arbitrary system event (e.g. since the last -* time the system booted). The Unadjusted System Time is an unsigned -* 64 bit value that wraps back to 0 every 584 years. Time intervals -* may be either signed or unsigned. -*/ + * + * These types can be used to represent a time interval in nanoseconds or + * an absolute Unadjusted System Time. Unadjusted System Time is the number + * of nanoseconds since some arbitrary system event (e.g. since the last + * time the system booted). The Unadjusted System Time is an unsigned + * 64 bit value that wraps back to 0 every 584 years. Time intervals + * may be either signed or unsigned. + */ typedef khronos_uint64_t khronos_utime_nanoseconds_t; typedef khronos_int64_t khronos_stime_nanoseconds_t; #endif /* -* Dummy value used to pad enum types to 32 bits. -*/ + * Dummy value used to pad enum types to 32 bits. + */ #ifndef KHRONOS_MAX_ENUM #define KHRONOS_MAX_ENUM 0x7FFFFFFF #endif /* -* Enumerated boolean type -* -* Values other than zero should be considered to be true. Therefore -* comparisons should not be made against KHRONOS_TRUE. -*/ + * Enumerated boolean type + * + * Values other than zero should be considered to be true. Therefore + * comparisons should not be made against KHRONOS_TRUE. + */ typedef enum { KHRONOS_FALSE = 0, - KHRONOS_TRUE = 1, + KHRONOS_TRUE = 1, KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM } khronos_boolean_enum_t; @@ -321,49 +333,30 @@ typedef enum { #define __eglplatform_h_ /* -** Copyright (c) 2007-2009 The Khronos Group Inc. -** -** Permission is hereby granted, free of charge, to any person obtaining a -** copy of this software and/or associated documentation files (the -** "Materials"), to deal in the Materials without restriction, including -** without limitation the rights to use, copy, modify, merge, publish, -** distribute, sublicense, and/or sell copies of the Materials, and to -** permit persons to whom the Materials are furnished to do so, subject to -** the following conditions: -** -** The above copyright notice and this permission notice shall be included -** in all copies or substantial portions of the Materials. -** -** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. +** Copyright 2007-2020 The Khronos Group Inc. +** SPDX-License-Identifier: Apache-2.0 */ /* Platform-specific types and definitions for egl.h -* $Revision: 12306 $ on $Date: 2010-08-25 09:51:28 -0700 (Wed, 25 Aug 2010) $ -* -* Adopters may modify khrplatform.h and this file to suit their platform. -* You are encouraged to submit all modifications to the Khronos group so that -* they can be included in future versions of this file. Please submit changes -* by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla) -* by filing a bug against product "EGL" component "Registry". -*/ + * + * Adopters may modify khrplatform.h and this file to suit their platform. + * You are encouraged to submit all modifications to the Khronos group so that + * they can be included in future versions of this file. Please submit changes + * by filing an issue or pull request on the public Khronos EGL Registry, at + * https://www.github.com/KhronosGroup/EGL-Registry/ + */ /*#include */ /* Macros used in EGL function prototype declarations. -* -* EGL functions should be prototyped as: -* -* EGLAPI return-type EGLAPIENTRY eglFunction(arguments); -* typedef return-type (EXPAPIENTRYP PFNEGLFUNCTIONPROC) (arguments); -* -* KHRONOS_APICALL and KHRONOS_APIENTRY are defined in KHR/khrplatform.h -*/ + * + * EGL functions should be prototyped as: + * + * EGLAPI return-type EGLAPIENTRY eglFunction(arguments); + * typedef return-type (EXPAPIENTRYP PFNEGLFUNCTIONPROC) (arguments); + * + * KHRONOS_APICALL and KHRONOS_APIENTRY are defined in KHR/khrplatform.h + */ #ifndef EGLAPI #define EGLAPI KHRONOS_APICALL @@ -375,39 +368,44 @@ typedef enum { #define EGLAPIENTRYP EGLAPIENTRY* /* The types NativeDisplayType, NativeWindowType, and NativePixmapType -* are aliases of window-system-dependent types, such as X Display * or -* Windows Device Context. They must be defined in platform-specific -* code below. The EGL-prefixed versions of Native*Type are the same -* types, renamed in EGL 1.3 so all types in the API start with "EGL". -* -* Khronos STRONGLY RECOMMENDS that you use the default definitions -* provided below, since these changes affect both binary and source -* portability of applications using EGL running on different EGL -* implementations. -*/ + * are aliases of window-system-dependent types, such as X Display * or + * Windows Device Context. They must be defined in platform-specific + * code below. The EGL-prefixed versions of Native*Type are the same + * types, renamed in EGL 1.3 so all types in the API start with "EGL". + * + * Khronos STRONGLY RECOMMENDS that you use the default definitions + * provided below, since these changes affect both binary and source + * portability of applications using EGL running on different EGL + * implementations. + */ -#if defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */ +#if defined(EGL_NO_PLATFORM_SPECIFIC_TYPES) + +typedef void *EGLNativeDisplayType; +typedef void *EGLNativePixmapType; +typedef void *EGLNativeWindowType; + +#elif defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */ #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN 1 #endif #include -#if __WINRT__ -#include -typedef IUnknown * EGLNativeWindowType; -typedef IUnknown * EGLNativePixmapType; -typedef IUnknown * EGLNativeDisplayType; -#else typedef HDC EGLNativeDisplayType; typedef HBITMAP EGLNativePixmapType; typedef HWND EGLNativeWindowType; -#endif + +#elif defined(__EMSCRIPTEN__) + +typedef int EGLNativeDisplayType; +typedef int EGLNativePixmapType; +typedef int EGLNativeWindowType; #elif defined(__WINSCW__) || defined(__SYMBIAN32__) /* Symbian */ typedef int EGLNativeDisplayType; -typedef void *EGLNativeWindowType; typedef void *EGLNativePixmapType; +typedef void *EGLNativeWindowType; #elif defined(WL_EGL_PLATFORM) @@ -421,31 +419,22 @@ typedef struct gbm_device *EGLNativeDisplayType; typedef struct gbm_bo *EGLNativePixmapType; typedef void *EGLNativeWindowType; -#elif defined(__ANDROID__) /* Android */ +#elif defined(__ANDROID__) || defined(ANDROID) struct ANativeWindow; struct egl_native_pixmap_t; -typedef struct ANativeWindow *EGLNativeWindowType; -typedef struct egl_native_pixmap_t *EGLNativePixmapType; -typedef void *EGLNativeDisplayType; +typedef void* EGLNativeDisplayType; +typedef struct egl_native_pixmap_t* EGLNativePixmapType; +typedef struct ANativeWindow* EGLNativeWindowType; -#elif defined(MIR_EGL_PLATFORM) +#elif defined(USE_OZONE) -#include -typedef MirEGLNativeDisplayType EGLNativeDisplayType; -typedef void *EGLNativePixmapType; -typedef MirEGLNativeWindowType EGLNativeWindowType; +typedef intptr_t EGLNativeDisplayType; +typedef intptr_t EGLNativePixmapType; +typedef intptr_t EGLNativeWindowType; -#elif defined(__unix__) - -#ifdef MESA_EGL_NO_X11_HEADERS - -typedef void *EGLNativeDisplayType; -typedef khronos_uintptr_t EGLNativePixmapType; -typedef khronos_uintptr_t EGLNativeWindowType; - -#else +#elif defined(USE_X11) /* X11 (tentative) */ #include @@ -455,7 +444,31 @@ typedef Display *EGLNativeDisplayType; typedef Pixmap EGLNativePixmapType; typedef Window EGLNativeWindowType; -#endif /* MESA_EGL_NO_X11_HEADERS */ +#elif defined(__unix__) + +typedef void *EGLNativeDisplayType; +typedef khronos_uintptr_t EGLNativePixmapType; +typedef khronos_uintptr_t EGLNativeWindowType; + +#elif defined(__APPLE__) + +typedef int EGLNativeDisplayType; +typedef void *EGLNativePixmapType; +typedef void *EGLNativeWindowType; + +#elif defined(__HAIKU__) + +#include + +typedef void *EGLNativeDisplayType; +typedef khronos_uintptr_t EGLNativePixmapType; +typedef khronos_uintptr_t EGLNativeWindowType; + +#elif defined(__Fuchsia__) + +typedef void *EGLNativeDisplayType; +typedef khronos_uintptr_t EGLNativePixmapType; +typedef khronos_uintptr_t EGLNativeWindowType; #else #error "Platform not recognized" @@ -468,16 +481,25 @@ typedef EGLNativeWindowType NativeWindowType; /* Define EGLint. This must be a signed integral type large enough to contain -* all legal attribute names and values passed into and out of EGL, whether -* their type is boolean, bitmask, enumerant (symbolic constant), integer, -* handle, or other. While in general a 32-bit integer will suffice, if -* handles are 64 bit types, then EGLint should be defined as a signed 64-bit -* integer type. -*/ + * all legal attribute names and values passed into and out of EGL, whether + * their type is boolean, bitmask, enumerant (symbolic constant), integer, + * handle, or other. While in general a 32-bit integer will suffice, if + * handles are 64 bit types, then EGLint should be defined as a signed 64-bit + * integer type. + */ typedef khronos_int32_t EGLint; + +/* C++ / C typecast macros for special EGL handle values */ +#if defined(__cplusplus) +#define EGL_CAST(type, value) (static_cast(value)) +#else +#define EGL_CAST(type, value) ((type) (value)) +#endif + #endif /* __eglplatform_h */ + #ifndef __egl_h_ #define __egl_h_ 1 @@ -486,39 +508,24 @@ extern "C" { #endif /* -** Copyright (c) 2013-2015 The Khronos Group Inc. +** Copyright 2013-2020 The Khronos Group Inc. +** SPDX-License-Identifier: Apache-2.0 ** -** Permission is hereby granted, free of charge, to any person obtaining a -** copy of this software and/or associated documentation files (the -** "Materials"), to deal in the Materials without restriction, including -** without limitation the rights to use, copy, modify, merge, publish, -** distribute, sublicense, and/or sell copies of the Materials, and to -** permit persons to whom the Materials are furnished to do so, subject to -** the following conditions: -** -** The above copyright notice and this permission notice shall be included -** in all copies or substantial portions of the Materials. -** -** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ -/* -** This header is generated from the Khronos OpenGL / OpenGL ES XML -** API Registry. The current version of the Registry, generator scripts +** This header is generated from the Khronos EGL XML API Registry. +** The current version of the Registry, generator scripts ** used to make the header, and the header can be found at -** http://www.opengl.org/registry/ +** http://www.khronos.org/registry/egl ** -** Khronos $Revision: 31566 $ on $Date: 2015-06-23 08:48:48 -0700 (Tue, 23 Jun 2015) $ +** Khronos $Git commit SHA1: b35e89ca9a $ on $Git commit date: 2021-09-01 09:34:00 +0530 $ */ /*#include */ -/* Generated on date 20150623 */ +#ifndef EGL_EGL_PROTOTYPES +#define EGL_EGL_PROTOTYPES 1 +#endif + +/* Generated on date 20210901 */ /* Generated C header for: * API: egl @@ -533,6 +540,8 @@ extern "C" { #define EGL_VERSION_1_0 1 typedef unsigned int EGLBoolean; typedef void *EGLDisplay; +/*#include */ +/*#include */ typedef void *EGLConfig; typedef void *EGLSurface; typedef void *EGLContext; @@ -556,7 +565,7 @@ typedef void (*__eglMustCastToProperFunctionPointerType)(void); #define EGL_CONFIG_ID 0x3028 #define EGL_CORE_NATIVE_ENGINE 0x305B #define EGL_DEPTH_SIZE 0x3025 -#define EGL_DONT_CARE ((EGLint)-1) +#define EGL_DONT_CARE EGL_CAST(EGLint,-1) #define EGL_DRAW 0x3059 #define EGL_EXTENSIONS 0x3055 #define EGL_FALSE 0 @@ -573,9 +582,9 @@ typedef void (*__eglMustCastToProperFunctionPointerType)(void); #define EGL_NONE 0x3038 #define EGL_NON_CONFORMANT_CONFIG 0x3051 #define EGL_NOT_INITIALIZED 0x3001 -#define EGL_NO_CONTEXT ((EGLContext)0) -#define EGL_NO_DISPLAY ((EGLDisplay)0) -#define EGL_NO_SURFACE ((EGLSurface)0) +#define EGL_NO_CONTEXT EGL_CAST(EGLContext,0) +#define EGL_NO_DISPLAY EGL_CAST(EGLDisplay,0) +#define EGL_NO_SURFACE EGL_CAST(EGLSurface,0) #define EGL_PBUFFER_BIT 0x0001 #define EGL_PIXMAP_BIT 0x0002 #define EGL_READ 0x305A @@ -596,6 +605,31 @@ typedef void (*__eglMustCastToProperFunctionPointerType)(void); #define EGL_VERSION 0x3054 #define EGL_WIDTH 0x3057 #define EGL_WINDOW_BIT 0x0004 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLCHOOSECONFIGPROC) (EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLCOPYBUFFERSPROC) (EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target); +typedef EGLContext (EGLAPIENTRYP PFNEGLCREATECONTEXTPROC) (EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list); +typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPBUFFERSURFACEPROC) (EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list); +typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPIXMAPSURFACEPROC) (EGLDisplay dpy, EGLConfig config, EGLNativePixmapType pixmap, const EGLint *attrib_list); +typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEWINDOWSURFACEPROC) (EGLDisplay dpy, EGLConfig config, EGLNativeWindowType win, const EGLint *attrib_list); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYCONTEXTPROC) (EGLDisplay dpy, EGLContext ctx); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYSURFACEPROC) (EGLDisplay dpy, EGLSurface surface); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETCONFIGATTRIBPROC) (EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint *value); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETCONFIGSPROC) (EGLDisplay dpy, EGLConfig *configs, EGLint config_size, EGLint *num_config); +typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETCURRENTDISPLAYPROC) (void); +typedef EGLSurface (EGLAPIENTRYP PFNEGLGETCURRENTSURFACEPROC) (EGLint readdraw); +typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETDISPLAYPROC) (EGLNativeDisplayType display_id); +typedef EGLint (EGLAPIENTRYP PFNEGLGETERRORPROC) (void); +typedef __eglMustCastToProperFunctionPointerType (EGLAPIENTRYP PFNEGLGETPROCADDRESSPROC) (const char *procname); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLINITIALIZEPROC) (EGLDisplay dpy, EGLint *major, EGLint *minor); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLMAKECURRENTPROC) (EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYCONTEXTPROC) (EGLDisplay dpy, EGLContext ctx, EGLint attribute, EGLint *value); +typedef const char *(EGLAPIENTRYP PFNEGLQUERYSTRINGPROC) (EGLDisplay dpy, EGLint name); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSURFACEPROC) (EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint *value); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSPROC) (EGLDisplay dpy, EGLSurface surface); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLTERMINATEPROC) (EGLDisplay dpy); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLWAITGLPROC) (void); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLWAITNATIVEPROC) (EGLint engine); +#if EGL_EGL_PROTOTYPES EGLAPI EGLBoolean EGLAPIENTRY eglChooseConfig (EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config); EGLAPI EGLBoolean EGLAPIENTRY eglCopyBuffers (EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target); EGLAPI EGLContext EGLAPIENTRY eglCreateContext (EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list); @@ -620,6 +654,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffers (EGLDisplay dpy, EGLSurface surface EGLAPI EGLBoolean EGLAPIENTRY eglTerminate (EGLDisplay dpy); EGLAPI EGLBoolean EGLAPIENTRY eglWaitGL (void); EGLAPI EGLBoolean EGLAPIENTRY eglWaitNative (EGLint engine); +#endif #endif /* EGL_VERSION_1_0 */ #ifndef EGL_VERSION_1_1 @@ -638,10 +673,16 @@ EGLAPI EGLBoolean EGLAPIENTRY eglWaitNative (EGLint engine); #define EGL_TEXTURE_RGB 0x305D #define EGL_TEXTURE_RGBA 0x305E #define EGL_TEXTURE_TARGET 0x3081 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLBINDTEXIMAGEPROC) (EGLDisplay dpy, EGLSurface surface, EGLint buffer); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLRELEASETEXIMAGEPROC) (EGLDisplay dpy, EGLSurface surface, EGLint buffer); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSURFACEATTRIBPROC) (EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPINTERVALPROC) (EGLDisplay dpy, EGLint interval); +#if EGL_EGL_PROTOTYPES EGLAPI EGLBoolean EGLAPIENTRY eglBindTexImage (EGLDisplay dpy, EGLSurface surface, EGLint buffer); EGLAPI EGLBoolean EGLAPIENTRY eglReleaseTexImage (EGLDisplay dpy, EGLSurface surface, EGLint buffer); EGLAPI EGLBoolean EGLAPIENTRY eglSurfaceAttrib (EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value); EGLAPI EGLBoolean EGLAPIENTRY eglSwapInterval (EGLDisplay dpy, EGLint interval); +#endif #endif /* EGL_VERSION_1_1 */ #ifndef EGL_VERSION_1_2 @@ -675,13 +716,20 @@ typedef void *EGLClientBuffer; #define EGL_RGB_BUFFER 0x308E #define EGL_SINGLE_BUFFER 0x3085 #define EGL_SWAP_BEHAVIOR 0x3093 -#define EGL_UNKNOWN ((EGLint)-1) +#define EGL_UNKNOWN EGL_CAST(EGLint,-1) #define EGL_VERTICAL_RESOLUTION 0x3091 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLBINDAPIPROC) (EGLenum api); +typedef EGLenum (EGLAPIENTRYP PFNEGLQUERYAPIPROC) (void); +typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPBUFFERFROMCLIENTBUFFERPROC) (EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer, EGLConfig config, const EGLint *attrib_list); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLRELEASETHREADPROC) (void); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLWAITCLIENTPROC) (void); +#if EGL_EGL_PROTOTYPES EGLAPI EGLBoolean EGLAPIENTRY eglBindAPI (EGLenum api); EGLAPI EGLenum EGLAPIENTRY eglQueryAPI (void); EGLAPI EGLSurface EGLAPIENTRY eglCreatePbufferFromClientBuffer (EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer, EGLConfig config, const EGLint *attrib_list); EGLAPI EGLBoolean EGLAPIENTRY eglReleaseThread (void); EGLAPI EGLBoolean EGLAPIENTRY eglWaitClient (void); +#endif #endif /* EGL_VERSION_1_2 */ #ifndef EGL_VERSION_1_3 @@ -702,7 +750,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglWaitClient (void); #ifndef EGL_VERSION_1_4 #define EGL_VERSION_1_4 1 -#define EGL_DEFAULT_DISPLAY ((EGLNativeDisplayType)0) +#define EGL_DEFAULT_DISPLAY EGL_CAST(EGLNativeDisplayType,0) #define EGL_MULTISAMPLE_RESOLVE_BOX_BIT 0x0200 #define EGL_MULTISAMPLE_RESOLVE 0x3099 #define EGL_MULTISAMPLE_RESOLVE_DEFAULT 0x309A @@ -710,7 +758,10 @@ EGLAPI EGLBoolean EGLAPIENTRY eglWaitClient (void); #define EGL_OPENGL_API 0x30A2 #define EGL_OPENGL_BIT 0x0008 #define EGL_SWAP_BEHAVIOR_PRESERVED_BIT 0x0400 +typedef EGLContext (EGLAPIENTRYP PFNEGLGETCURRENTCONTEXTPROC) (void); +#if EGL_EGL_PROTOTYPES EGLAPI EGLContext EGLAPIENTRY eglGetCurrentContext (void); +#endif #endif /* EGL_VERSION_1_4 */ #ifndef EGL_VERSION_1_5 @@ -744,7 +795,7 @@ typedef void *EGLImage; #define EGL_FOREVER 0xFFFFFFFFFFFFFFFFull #define EGL_TIMEOUT_EXPIRED 0x30F5 #define EGL_CONDITION_SATISFIED 0x30F6 -#define EGL_NO_SYNC ((EGLSync)0) +#define EGL_NO_SYNC EGL_CAST(EGLSync,0) #define EGL_SYNC_FENCE 0x30F9 #define EGL_GL_COLORSPACE 0x309D #define EGL_GL_COLORSPACE_SRGB 0x3089 @@ -761,7 +812,18 @@ typedef void *EGLImage; #define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x30B7 #define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x30B8 #define EGL_IMAGE_PRESERVED 0x30D2 -#define EGL_NO_IMAGE ((EGLImage)0) +#define EGL_NO_IMAGE EGL_CAST(EGLImage,0) +typedef EGLSync (EGLAPIENTRYP PFNEGLCREATESYNCPROC) (EGLDisplay dpy, EGLenum type, const EGLAttrib *attrib_list); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYSYNCPROC) (EGLDisplay dpy, EGLSync sync); +typedef EGLint (EGLAPIENTRYP PFNEGLCLIENTWAITSYNCPROC) (EGLDisplay dpy, EGLSync sync, EGLint flags, EGLTime timeout); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBPROC) (EGLDisplay dpy, EGLSync sync, EGLint attribute, EGLAttrib *value); +typedef EGLImage (EGLAPIENTRYP PFNEGLCREATEIMAGEPROC) (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLAttrib *attrib_list); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYIMAGEPROC) (EGLDisplay dpy, EGLImage image); +typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETPLATFORMDISPLAYPROC) (EGLenum platform, void *native_display, const EGLAttrib *attrib_list); +typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPLATFORMWINDOWSURFACEPROC) (EGLDisplay dpy, EGLConfig config, void *native_window, const EGLAttrib *attrib_list); +typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPLATFORMPIXMAPSURFACEPROC) (EGLDisplay dpy, EGLConfig config, void *native_pixmap, const EGLAttrib *attrib_list); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLWAITSYNCPROC) (EGLDisplay dpy, EGLSync sync, EGLint flags); +#if EGL_EGL_PROTOTYPES EGLAPI EGLSync EGLAPIENTRY eglCreateSync (EGLDisplay dpy, EGLenum type, const EGLAttrib *attrib_list); EGLAPI EGLBoolean EGLAPIENTRY eglDestroySync (EGLDisplay dpy, EGLSync sync); EGLAPI EGLint EGLAPIENTRY eglClientWaitSync (EGLDisplay dpy, EGLSync sync, EGLint flags, EGLTime timeout); @@ -772,6 +834,7 @@ EGLAPI EGLDisplay EGLAPIENTRY eglGetPlatformDisplay (EGLenum platform, void *nat EGLAPI EGLSurface EGLAPIENTRY eglCreatePlatformWindowSurface (EGLDisplay dpy, EGLConfig config, void *native_window, const EGLAttrib *attrib_list); EGLAPI EGLSurface EGLAPIENTRY eglCreatePlatformPixmapSurface (EGLDisplay dpy, EGLConfig config, void *native_pixmap, const EGLAttrib *attrib_list); EGLAPI EGLBoolean EGLAPIENTRY eglWaitSync (EGLDisplay dpy, EGLSync sync, EGLint flags); +#endif #endif /* EGL_VERSION_1_5 */ #ifdef __cplusplus @@ -781,7 +844,6 @@ EGLAPI EGLBoolean EGLAPIENTRY eglWaitSync (EGLDisplay dpy, EGLSync sync, EGLint #endif /* __egl_h_ */ - #ifndef __eglext_h_ #define __eglext_h_ 1 @@ -790,39 +852,20 @@ extern "C" { #endif /* -** Copyright (c) 2013-2015 The Khronos Group Inc. +** Copyright 2013-2020 The Khronos Group Inc. +** SPDX-License-Identifier: Apache-2.0 ** -** Permission is hereby granted, free of charge, to any person obtaining a -** copy of this software and/or associated documentation files (the -** "Materials"), to deal in the Materials without restriction, including -** without limitation the rights to use, copy, modify, merge, publish, -** distribute, sublicense, and/or sell copies of the Materials, and to -** permit persons to whom the Materials are furnished to do so, subject to -** the following conditions: -** -** The above copyright notice and this permission notice shall be included -** in all copies or substantial portions of the Materials. -** -** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ -/* -** This header is generated from the Khronos OpenGL / OpenGL ES XML -** API Registry. The current version of the Registry, generator scripts +** This header is generated from the Khronos EGL XML API Registry. +** The current version of the Registry, generator scripts ** used to make the header, and the header can be found at -** http://www.opengl.org/registry/ +** http://www.khronos.org/registry/egl ** -** Khronos $Revision: 31566 $ on $Date: 2015-06-23 08:48:48 -0700 (Tue, 23 Jun 2015) $ +** Khronos $Git commit SHA1: b35e89ca9a $ on $Git commit date: 2021-09-01 09:34:00 +0530 $ */ /*#include */ -#define EGL_EGLEXT_VERSION 20150623 +#define EGL_EGLEXT_VERSION 20210901 /* Generated C header for: * API: egl @@ -861,6 +904,13 @@ EGLAPI EGLSyncKHR EGLAPIENTRY eglCreateSync64KHR (EGLDisplay dpy, EGLenum type, #define EGL_VG_ALPHA_FORMAT_PRE_BIT_KHR 0x0040 #endif /* EGL_KHR_config_attribs */ +#ifndef EGL_KHR_context_flush_control +#define EGL_KHR_context_flush_control 1 +#define EGL_CONTEXT_RELEASE_BEHAVIOR_NONE_KHR 0 +#define EGL_CONTEXT_RELEASE_BEHAVIOR_KHR 0x2097 +#define EGL_CONTEXT_RELEASE_BEHAVIOR_FLUSH_KHR 0x2098 +#endif /* EGL_KHR_context_flush_control */ + #ifndef EGL_KHR_create_context #define EGL_KHR_create_context 1 #define EGL_CONTEXT_MAJOR_VERSION_KHR 0x3098 @@ -883,6 +933,42 @@ EGLAPI EGLSyncKHR EGLAPIENTRY eglCreateSync64KHR (EGLDisplay dpy, EGLenum type, #define EGL_CONTEXT_OPENGL_NO_ERROR_KHR 0x31B3 #endif /* EGL_KHR_create_context_no_error */ +#ifndef EGL_KHR_debug +#define EGL_KHR_debug 1 +typedef void *EGLLabelKHR; +typedef void *EGLObjectKHR; +typedef void (EGLAPIENTRY *EGLDEBUGPROCKHR)(EGLenum error,const char *command,EGLint messageType,EGLLabelKHR threadLabel,EGLLabelKHR objectLabel,const char* message); +#define EGL_OBJECT_THREAD_KHR 0x33B0 +#define EGL_OBJECT_DISPLAY_KHR 0x33B1 +#define EGL_OBJECT_CONTEXT_KHR 0x33B2 +#define EGL_OBJECT_SURFACE_KHR 0x33B3 +#define EGL_OBJECT_IMAGE_KHR 0x33B4 +#define EGL_OBJECT_SYNC_KHR 0x33B5 +#define EGL_OBJECT_STREAM_KHR 0x33B6 +#define EGL_DEBUG_MSG_CRITICAL_KHR 0x33B9 +#define EGL_DEBUG_MSG_ERROR_KHR 0x33BA +#define EGL_DEBUG_MSG_WARN_KHR 0x33BB +#define EGL_DEBUG_MSG_INFO_KHR 0x33BC +#define EGL_DEBUG_CALLBACK_KHR 0x33B8 +typedef EGLint (EGLAPIENTRYP PFNEGLDEBUGMESSAGECONTROLKHRPROC) (EGLDEBUGPROCKHR callback, const EGLAttrib *attrib_list); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYDEBUGKHRPROC) (EGLint attribute, EGLAttrib *value); +typedef EGLint (EGLAPIENTRYP PFNEGLLABELOBJECTKHRPROC) (EGLDisplay display, EGLenum objectType, EGLObjectKHR object, EGLLabelKHR label); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLint EGLAPIENTRY eglDebugMessageControlKHR (EGLDEBUGPROCKHR callback, const EGLAttrib *attrib_list); +EGLAPI EGLBoolean EGLAPIENTRY eglQueryDebugKHR (EGLint attribute, EGLAttrib *value); +EGLAPI EGLint EGLAPIENTRY eglLabelObjectKHR (EGLDisplay display, EGLenum objectType, EGLObjectKHR object, EGLLabelKHR label); +#endif +#endif /* EGL_KHR_debug */ + +#ifndef EGL_KHR_display_reference +#define EGL_KHR_display_reference 1 +#define EGL_TRACK_REFERENCES_KHR 0x3352 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYDISPLAYATTRIBKHRPROC) (EGLDisplay dpy, EGLint name, EGLAttrib *value); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglQueryDisplayAttribKHR (EGLDisplay dpy, EGLint name, EGLAttrib *value); +#endif +#endif /* EGL_KHR_display_reference */ + #ifndef EGL_KHR_fence_sync #define EGL_KHR_fence_sync 1 typedef khronos_utime_nanoseconds_t EGLTimeKHR; @@ -945,7 +1031,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglGetSyncAttribKHR (EGLDisplay dpy, EGLSyncKHR sy #define EGL_KHR_image 1 typedef void *EGLImageKHR; #define EGL_NATIVE_PIXMAP_KHR 0x30B0 -#define EGL_NO_IMAGE_KHR ((EGLImageKHR)0) +#define EGL_NO_IMAGE_KHR EGL_CAST(EGLImageKHR,0) typedef EGLImageKHR (EGLAPIENTRYP PFNEGLCREATEIMAGEKHRPROC) (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list); typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYIMAGEKHRPROC) (EGLDisplay dpy, EGLImageKHR image); #ifdef EGL_EGLEXT_PROTOTYPES @@ -1007,6 +1093,16 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQuerySurface64KHR (EGLDisplay dpy, EGLSurface s #endif #endif /* EGL_KHR_lock_surface3 */ +#ifndef EGL_KHR_mutable_render_buffer +#define EGL_KHR_mutable_render_buffer 1 +#define EGL_MUTABLE_RENDER_BUFFER_BIT_KHR 0x1000 +#endif /* EGL_KHR_mutable_render_buffer */ + +#ifndef EGL_KHR_no_config_context +#define EGL_KHR_no_config_context 1 +#define EGL_NO_CONFIG_KHR EGL_CAST(EGLConfig,0) +#endif /* EGL_KHR_no_config_context */ + #ifndef EGL_KHR_partial_update #define EGL_KHR_partial_update 1 #define EGL_BUFFER_AGE_KHR 0x313D @@ -1049,7 +1145,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSetDamageRegionKHR (EGLDisplay dpy, EGLSurface #define EGL_SYNC_REUSABLE_KHR 0x30FA #define EGL_SYNC_FLUSH_COMMANDS_BIT_KHR 0x0001 #define EGL_FOREVER_KHR 0xFFFFFFFFFFFFFFFFull -#define EGL_NO_SYNC_KHR ((EGLSyncKHR)0) +#define EGL_NO_SYNC_KHR EGL_CAST(EGLSyncKHR,0) typedef EGLBoolean (EGLAPIENTRYP PFNEGLSIGNALSYNCKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLenum mode); #ifdef EGL_EGLEXT_PROTOTYPES EGLAPI EGLBoolean EGLAPIENTRY eglSignalSyncKHR (EGLDisplay dpy, EGLSyncKHR sync, EGLenum mode); @@ -1062,7 +1158,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSignalSyncKHR (EGLDisplay dpy, EGLSyncKHR sync, typedef void *EGLStreamKHR; typedef khronos_uint64_t EGLuint64KHR; #ifdef KHRONOS_SUPPORT_INT64 -#define EGL_NO_STREAM_KHR ((EGLStreamKHR)0) +#define EGL_NO_STREAM_KHR EGL_CAST(EGLStreamKHR,0) #define EGL_CONSUMER_LATENCY_USEC_KHR 0x3210 #define EGL_PRODUCER_FRAME_KHR 0x3212 #define EGL_CONSUMER_FRAME_KHR 0x3213 @@ -1090,6 +1186,24 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQueryStreamu64KHR (EGLDisplay dpy, EGLStreamKHR #endif /* KHRONOS_SUPPORT_INT64 */ #endif /* EGL_KHR_stream */ +#ifndef EGL_KHR_stream_attrib +#define EGL_KHR_stream_attrib 1 +#ifdef KHRONOS_SUPPORT_INT64 +typedef EGLStreamKHR (EGLAPIENTRYP PFNEGLCREATESTREAMATTRIBKHRPROC) (EGLDisplay dpy, const EGLAttrib *attrib_list); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSETSTREAMATTRIBKHRPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLAttrib value); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSTREAMATTRIBKHRPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLAttrib *value); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMCONSUMERACQUIREATTRIBKHRPROC) (EGLDisplay dpy, EGLStreamKHR stream, const EGLAttrib *attrib_list); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMCONSUMERRELEASEATTRIBKHRPROC) (EGLDisplay dpy, EGLStreamKHR stream, const EGLAttrib *attrib_list); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLStreamKHR EGLAPIENTRY eglCreateStreamAttribKHR (EGLDisplay dpy, const EGLAttrib *attrib_list); +EGLAPI EGLBoolean EGLAPIENTRY eglSetStreamAttribKHR (EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLAttrib value); +EGLAPI EGLBoolean EGLAPIENTRY eglQueryStreamAttribKHR (EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLAttrib *value); +EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerAcquireAttribKHR (EGLDisplay dpy, EGLStreamKHR stream, const EGLAttrib *attrib_list); +EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerReleaseAttribKHR (EGLDisplay dpy, EGLStreamKHR stream, const EGLAttrib *attrib_list); +#endif +#endif /* KHRONOS_SUPPORT_INT64 */ +#endif /* EGL_KHR_stream_attrib */ + #ifndef EGL_KHR_stream_consumer_gltexture #define EGL_KHR_stream_consumer_gltexture 1 #ifdef EGL_KHR_stream @@ -1109,7 +1223,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerReleaseKHR (EGLDisplay dpy, EGLSt #define EGL_KHR_stream_cross_process_fd 1 typedef int EGLNativeFileDescriptorKHR; #ifdef EGL_KHR_stream -#define EGL_NO_FILE_DESCRIPTOR_KHR ((EGLNativeFileDescriptorKHR)(-1)) +#define EGL_NO_FILE_DESCRIPTOR_KHR EGL_CAST(EGLNativeFileDescriptorKHR,-1) typedef EGLNativeFileDescriptorKHR (EGLAPIENTRYP PFNEGLGETSTREAMFILEDESCRIPTORKHRPROC) (EGLDisplay dpy, EGLStreamKHR stream); typedef EGLStreamKHR (EGLAPIENTRYP PFNEGLCREATESTREAMFROMFILEDESCRIPTORKHRPROC) (EGLDisplay dpy, EGLNativeFileDescriptorKHR file_descriptor); #ifdef EGL_EGLEXT_PROTOTYPES @@ -1156,9 +1270,9 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreateStreamProducerSurfaceKHR (EGLDisplay dpy, #ifndef EGL_KHR_swap_buffers_with_damage #define EGL_KHR_swap_buffers_with_damage 1 -typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSWITHDAMAGEKHRPROC) (EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSWITHDAMAGEKHRPROC) (EGLDisplay dpy, EGLSurface surface, const EGLint *rects, EGLint n_rects); #ifdef EGL_EGLEXT_PROTOTYPES -EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffersWithDamageKHR (EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects); +EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffersWithDamageKHR (EGLDisplay dpy, EGLSurface surface, const EGLint *rects, EGLint n_rects); #endif #endif /* EGL_KHR_swap_buffers_with_damage */ @@ -1175,6 +1289,10 @@ EGLAPI EGLint EGLAPIENTRY eglWaitSyncKHR (EGLDisplay dpy, EGLSyncKHR sync, EGLin #endif #endif /* EGL_KHR_wait_sync */ +#ifndef EGL_ANDROID_GLES_layers +#define EGL_ANDROID_GLES_layers 1 +#endif /* EGL_ANDROID_GLES_layers */ + #ifndef EGL_ANDROID_blob_cache #define EGL_ANDROID_blob_cache 1 typedef khronos_ssize_t EGLsizeiANDROID; @@ -1186,11 +1304,69 @@ EGLAPI void EGLAPIENTRY eglSetBlobCacheFuncsANDROID (EGLDisplay dpy, EGLSetBlobF #endif #endif /* EGL_ANDROID_blob_cache */ +#ifndef EGL_ANDROID_create_native_client_buffer +#define EGL_ANDROID_create_native_client_buffer 1 +#define EGL_NATIVE_BUFFER_USAGE_ANDROID 0x3143 +#define EGL_NATIVE_BUFFER_USAGE_PROTECTED_BIT_ANDROID 0x00000001 +#define EGL_NATIVE_BUFFER_USAGE_RENDERBUFFER_BIT_ANDROID 0x00000002 +#define EGL_NATIVE_BUFFER_USAGE_TEXTURE_BIT_ANDROID 0x00000004 +typedef EGLClientBuffer (EGLAPIENTRYP PFNEGLCREATENATIVECLIENTBUFFERANDROIDPROC) (const EGLint *attrib_list); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLClientBuffer EGLAPIENTRY eglCreateNativeClientBufferANDROID (const EGLint *attrib_list); +#endif +#endif /* EGL_ANDROID_create_native_client_buffer */ + #ifndef EGL_ANDROID_framebuffer_target #define EGL_ANDROID_framebuffer_target 1 #define EGL_FRAMEBUFFER_TARGET_ANDROID 0x3147 #endif /* EGL_ANDROID_framebuffer_target */ +#ifndef EGL_ANDROID_front_buffer_auto_refresh +#define EGL_ANDROID_front_buffer_auto_refresh 1 +#define EGL_FRONT_BUFFER_AUTO_REFRESH_ANDROID 0x314C +#endif /* EGL_ANDROID_front_buffer_auto_refresh */ + +#ifndef EGL_ANDROID_get_frame_timestamps +#define EGL_ANDROID_get_frame_timestamps 1 +typedef khronos_stime_nanoseconds_t EGLnsecsANDROID; +#define EGL_TIMESTAMP_PENDING_ANDROID EGL_CAST(EGLnsecsANDROID,-2) +#define EGL_TIMESTAMP_INVALID_ANDROID EGL_CAST(EGLnsecsANDROID,-1) +#define EGL_TIMESTAMPS_ANDROID 0x3430 +#define EGL_COMPOSITE_DEADLINE_ANDROID 0x3431 +#define EGL_COMPOSITE_INTERVAL_ANDROID 0x3432 +#define EGL_COMPOSITE_TO_PRESENT_LATENCY_ANDROID 0x3433 +#define EGL_REQUESTED_PRESENT_TIME_ANDROID 0x3434 +#define EGL_RENDERING_COMPLETE_TIME_ANDROID 0x3435 +#define EGL_COMPOSITION_LATCH_TIME_ANDROID 0x3436 +#define EGL_FIRST_COMPOSITION_START_TIME_ANDROID 0x3437 +#define EGL_LAST_COMPOSITION_START_TIME_ANDROID 0x3438 +#define EGL_FIRST_COMPOSITION_GPU_FINISHED_TIME_ANDROID 0x3439 +#define EGL_DISPLAY_PRESENT_TIME_ANDROID 0x343A +#define EGL_DEQUEUE_READY_TIME_ANDROID 0x343B +#define EGL_READS_DONE_TIME_ANDROID 0x343C +typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETCOMPOSITORTIMINGSUPPORTEDANDROIDPROC) (EGLDisplay dpy, EGLSurface surface, EGLint name); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETCOMPOSITORTIMINGANDROIDPROC) (EGLDisplay dpy, EGLSurface surface, EGLint numTimestamps, const EGLint *names, EGLnsecsANDROID *values); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETNEXTFRAMEIDANDROIDPROC) (EGLDisplay dpy, EGLSurface surface, EGLuint64KHR *frameId); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETFRAMETIMESTAMPSUPPORTEDANDROIDPROC) (EGLDisplay dpy, EGLSurface surface, EGLint timestamp); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETFRAMETIMESTAMPSANDROIDPROC) (EGLDisplay dpy, EGLSurface surface, EGLuint64KHR frameId, EGLint numTimestamps, const EGLint *timestamps, EGLnsecsANDROID *values); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglGetCompositorTimingSupportedANDROID (EGLDisplay dpy, EGLSurface surface, EGLint name); +EGLAPI EGLBoolean EGLAPIENTRY eglGetCompositorTimingANDROID (EGLDisplay dpy, EGLSurface surface, EGLint numTimestamps, const EGLint *names, EGLnsecsANDROID *values); +EGLAPI EGLBoolean EGLAPIENTRY eglGetNextFrameIdANDROID (EGLDisplay dpy, EGLSurface surface, EGLuint64KHR *frameId); +EGLAPI EGLBoolean EGLAPIENTRY eglGetFrameTimestampSupportedANDROID (EGLDisplay dpy, EGLSurface surface, EGLint timestamp); +EGLAPI EGLBoolean EGLAPIENTRY eglGetFrameTimestampsANDROID (EGLDisplay dpy, EGLSurface surface, EGLuint64KHR frameId, EGLint numTimestamps, const EGLint *timestamps, EGLnsecsANDROID *values); +#endif +#endif /* EGL_ANDROID_get_frame_timestamps */ + +#ifndef EGL_ANDROID_get_native_client_buffer +#define EGL_ANDROID_get_native_client_buffer 1 +struct AHardwareBuffer; +typedef EGLClientBuffer (EGLAPIENTRYP PFNEGLGETNATIVECLIENTBUFFERANDROIDPROC) (const struct AHardwareBuffer *buffer); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLClientBuffer EGLAPIENTRY eglGetNativeClientBufferANDROID (const struct AHardwareBuffer *buffer); +#endif +#endif /* EGL_ANDROID_get_native_client_buffer */ + #ifndef EGL_ANDROID_image_native_buffer #define EGL_ANDROID_image_native_buffer 1 #define EGL_NATIVE_BUFFER_ANDROID 0x3140 @@ -1208,6 +1384,14 @@ EGLAPI EGLint EGLAPIENTRY eglDupNativeFenceFDANDROID (EGLDisplay dpy, EGLSyncKHR #endif #endif /* EGL_ANDROID_native_fence_sync */ +#ifndef EGL_ANDROID_presentation_time +#define EGL_ANDROID_presentation_time 1 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLPRESENTATIONTIMEANDROIDPROC) (EGLDisplay dpy, EGLSurface surface, EGLnsecsANDROID time); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglPresentationTimeANDROID (EGLDisplay dpy, EGLSurface surface, EGLnsecsANDROID time); +#endif +#endif /* EGL_ANDROID_presentation_time */ + #ifndef EGL_ANDROID_recordable #define EGL_ANDROID_recordable 1 #define EGL_RECORDABLE_ANDROID 0x3142 @@ -1236,16 +1420,40 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQuerySurfacePointerANGLE (EGLDisplay dpy, EGLSu #define EGL_ANGLE_surface_d3d_texture_2d_share_handle 1 #endif /* EGL_ANGLE_surface_d3d_texture_2d_share_handle */ +#ifndef EGL_ANGLE_sync_control_rate +#define EGL_ANGLE_sync_control_rate 1 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETMSCRATEANGLEPROC) (EGLDisplay dpy, EGLSurface surface, EGLint *numerator, EGLint *denominator); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglGetMscRateANGLE (EGLDisplay dpy, EGLSurface surface, EGLint *numerator, EGLint *denominator); +#endif +#endif /* EGL_ANGLE_sync_control_rate */ + #ifndef EGL_ANGLE_window_fixed_size #define EGL_ANGLE_window_fixed_size 1 #define EGL_FIXED_SIZE_ANGLE 0x3201 #endif /* EGL_ANGLE_window_fixed_size */ +#ifndef EGL_ARM_image_format +#define EGL_ARM_image_format 1 +#define EGL_COLOR_COMPONENT_TYPE_UNSIGNED_INTEGER_ARM 0x3287 +#define EGL_COLOR_COMPONENT_TYPE_INTEGER_ARM 0x3288 +#endif /* EGL_ARM_image_format */ + +#ifndef EGL_ARM_implicit_external_sync +#define EGL_ARM_implicit_external_sync 1 +#define EGL_SYNC_PRIOR_COMMANDS_IMPLICIT_EXTERNAL_ARM 0x328A +#endif /* EGL_ARM_implicit_external_sync */ + #ifndef EGL_ARM_pixmap_multisample_discard #define EGL_ARM_pixmap_multisample_discard 1 #define EGL_DISCARD_SAMPLES_ARM 0x3286 #endif /* EGL_ARM_pixmap_multisample_discard */ +#ifndef EGL_EXT_bind_to_front +#define EGL_EXT_bind_to_front 1 +#define EGL_FRONT_BUFFER_EXT 0x3464 +#endif /* EGL_EXT_bind_to_front */ + #ifndef EGL_EXT_buffer_age #define EGL_EXT_buffer_age 1 #define EGL_BUFFER_AGE_EXT 0x313D @@ -1255,6 +1463,45 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQuerySurfacePointerANGLE (EGLDisplay dpy, EGLSu #define EGL_EXT_client_extensions 1 #endif /* EGL_EXT_client_extensions */ +#ifndef EGL_EXT_client_sync +#define EGL_EXT_client_sync 1 +#define EGL_SYNC_CLIENT_EXT 0x3364 +#define EGL_SYNC_CLIENT_SIGNAL_EXT 0x3365 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLCLIENTSIGNALSYNCEXTPROC) (EGLDisplay dpy, EGLSync sync, const EGLAttrib *attrib_list); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglClientSignalSyncEXT (EGLDisplay dpy, EGLSync sync, const EGLAttrib *attrib_list); +#endif +#endif /* EGL_EXT_client_sync */ + +#ifndef EGL_EXT_compositor +#define EGL_EXT_compositor 1 +#define EGL_PRIMARY_COMPOSITOR_CONTEXT_EXT 0x3460 +#define EGL_EXTERNAL_REF_ID_EXT 0x3461 +#define EGL_COMPOSITOR_DROP_NEWEST_FRAME_EXT 0x3462 +#define EGL_COMPOSITOR_KEEP_NEWEST_FRAME_EXT 0x3463 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLCOMPOSITORSETCONTEXTLISTEXTPROC) (const EGLint *external_ref_ids, EGLint num_entries); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLCOMPOSITORSETCONTEXTATTRIBUTESEXTPROC) (EGLint external_ref_id, const EGLint *context_attributes, EGLint num_entries); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLCOMPOSITORSETWINDOWLISTEXTPROC) (EGLint external_ref_id, const EGLint *external_win_ids, EGLint num_entries); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLCOMPOSITORSETWINDOWATTRIBUTESEXTPROC) (EGLint external_win_id, const EGLint *window_attributes, EGLint num_entries); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLCOMPOSITORBINDTEXWINDOWEXTPROC) (EGLint external_win_id); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLCOMPOSITORSETSIZEEXTPROC) (EGLint external_win_id, EGLint width, EGLint height); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLCOMPOSITORSWAPPOLICYEXTPROC) (EGLint external_win_id, EGLint policy); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglCompositorSetContextListEXT (const EGLint *external_ref_ids, EGLint num_entries); +EGLAPI EGLBoolean EGLAPIENTRY eglCompositorSetContextAttributesEXT (EGLint external_ref_id, const EGLint *context_attributes, EGLint num_entries); +EGLAPI EGLBoolean EGLAPIENTRY eglCompositorSetWindowListEXT (EGLint external_ref_id, const EGLint *external_win_ids, EGLint num_entries); +EGLAPI EGLBoolean EGLAPIENTRY eglCompositorSetWindowAttributesEXT (EGLint external_win_id, const EGLint *window_attributes, EGLint num_entries); +EGLAPI EGLBoolean EGLAPIENTRY eglCompositorBindTexWindowEXT (EGLint external_win_id); +EGLAPI EGLBoolean EGLAPIENTRY eglCompositorSetSizeEXT (EGLint external_win_id, EGLint width, EGLint height); +EGLAPI EGLBoolean EGLAPIENTRY eglCompositorSwapPolicyEXT (EGLint external_win_id, EGLint policy); +#endif +#endif /* EGL_EXT_compositor */ + +#ifndef EGL_EXT_config_select_group +#define EGL_EXT_config_select_group 1 +#define EGL_CONFIG_SELECT_GROUP_EXT 0x34C0 +#endif /* EGL_EXT_config_select_group */ + #ifndef EGL_EXT_create_context_robustness #define EGL_EXT_create_context_robustness 1 #define EGL_CONTEXT_OPENGL_ROBUST_ACCESS_EXT 0x30BF @@ -1266,7 +1513,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQuerySurfacePointerANGLE (EGLDisplay dpy, EGLSu #ifndef EGL_EXT_device_base #define EGL_EXT_device_base 1 typedef void *EGLDeviceEXT; -#define EGL_NO_DEVICE_EXT ((EGLDeviceEXT)(0)) +#define EGL_NO_DEVICE_EXT EGL_CAST(EGLDeviceEXT,0) #define EGL_BAD_DEVICE_EXT 0x322B #define EGL_DEVICE_EXT 0x322C typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYDEVICEATTRIBEXTPROC) (EGLDeviceEXT device, EGLint attribute, EGLAttrib *value); @@ -1284,8 +1531,14 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQueryDisplayAttribEXT (EGLDisplay dpy, EGLint a #ifndef EGL_EXT_device_drm #define EGL_EXT_device_drm 1 #define EGL_DRM_DEVICE_FILE_EXT 0x3233 +#define EGL_DRM_MASTER_FD_EXT 0x333C #endif /* EGL_EXT_device_drm */ +#ifndef EGL_EXT_device_drm_render_node +#define EGL_EXT_device_drm_render_node 1 +#define EGL_DRM_RENDER_NODE_FILE_EXT 0x3377 +#endif /* EGL_EXT_device_drm_render_node */ + #ifndef EGL_EXT_device_enumeration #define EGL_EXT_device_enumeration 1 #endif /* EGL_EXT_device_enumeration */ @@ -1293,12 +1546,64 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQueryDisplayAttribEXT (EGLDisplay dpy, EGLint a #ifndef EGL_EXT_device_openwf #define EGL_EXT_device_openwf 1 #define EGL_OPENWF_DEVICE_ID_EXT 0x3237 +#define EGL_OPENWF_DEVICE_EXT 0x333D #endif /* EGL_EXT_device_openwf */ +#ifndef EGL_EXT_device_persistent_id +#define EGL_EXT_device_persistent_id 1 +#define EGL_DEVICE_UUID_EXT 0x335C +#define EGL_DRIVER_UUID_EXT 0x335D +#define EGL_DRIVER_NAME_EXT 0x335E +typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYDEVICEBINARYEXTPROC) (EGLDeviceEXT device, EGLint name, EGLint max_size, void *value, EGLint *size); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglQueryDeviceBinaryEXT (EGLDeviceEXT device, EGLint name, EGLint max_size, void *value, EGLint *size); +#endif +#endif /* EGL_EXT_device_persistent_id */ + #ifndef EGL_EXT_device_query #define EGL_EXT_device_query 1 #endif /* EGL_EXT_device_query */ +#ifndef EGL_EXT_device_query_name +#define EGL_EXT_device_query_name 1 +#define EGL_RENDERER_EXT 0x335F +#endif /* EGL_EXT_device_query_name */ + +#ifndef EGL_EXT_gl_colorspace_bt2020_linear +#define EGL_EXT_gl_colorspace_bt2020_linear 1 +#define EGL_GL_COLORSPACE_BT2020_LINEAR_EXT 0x333F +#endif /* EGL_EXT_gl_colorspace_bt2020_linear */ + +#ifndef EGL_EXT_gl_colorspace_bt2020_pq +#define EGL_EXT_gl_colorspace_bt2020_pq 1 +#define EGL_GL_COLORSPACE_BT2020_PQ_EXT 0x3340 +#endif /* EGL_EXT_gl_colorspace_bt2020_pq */ + +#ifndef EGL_EXT_gl_colorspace_display_p3 +#define EGL_EXT_gl_colorspace_display_p3 1 +#define EGL_GL_COLORSPACE_DISPLAY_P3_EXT 0x3363 +#endif /* EGL_EXT_gl_colorspace_display_p3 */ + +#ifndef EGL_EXT_gl_colorspace_display_p3_linear +#define EGL_EXT_gl_colorspace_display_p3_linear 1 +#define EGL_GL_COLORSPACE_DISPLAY_P3_LINEAR_EXT 0x3362 +#endif /* EGL_EXT_gl_colorspace_display_p3_linear */ + +#ifndef EGL_EXT_gl_colorspace_display_p3_passthrough +#define EGL_EXT_gl_colorspace_display_p3_passthrough 1 +#define EGL_GL_COLORSPACE_DISPLAY_P3_PASSTHROUGH_EXT 0x3490 +#endif /* EGL_EXT_gl_colorspace_display_p3_passthrough */ + +#ifndef EGL_EXT_gl_colorspace_scrgb +#define EGL_EXT_gl_colorspace_scrgb 1 +#define EGL_GL_COLORSPACE_SCRGB_EXT 0x3351 +#endif /* EGL_EXT_gl_colorspace_scrgb */ + +#ifndef EGL_EXT_gl_colorspace_scrgb_linear +#define EGL_EXT_gl_colorspace_scrgb_linear 1 +#define EGL_GL_COLORSPACE_SCRGB_LINEAR_EXT 0x3350 +#endif /* EGL_EXT_gl_colorspace_scrgb_linear */ + #ifndef EGL_EXT_image_dma_buf_import #define EGL_EXT_image_dma_buf_import 1 #define EGL_LINUX_DMA_BUF_EXT 0x3270 @@ -1325,6 +1630,39 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQueryDisplayAttribEXT (EGLDisplay dpy, EGLint a #define EGL_YUV_CHROMA_SITING_0_5_EXT 0x3285 #endif /* EGL_EXT_image_dma_buf_import */ +#ifndef EGL_EXT_image_dma_buf_import_modifiers +#define EGL_EXT_image_dma_buf_import_modifiers 1 +#define EGL_DMA_BUF_PLANE3_FD_EXT 0x3440 +#define EGL_DMA_BUF_PLANE3_OFFSET_EXT 0x3441 +#define EGL_DMA_BUF_PLANE3_PITCH_EXT 0x3442 +#define EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT 0x3443 +#define EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT 0x3444 +#define EGL_DMA_BUF_PLANE1_MODIFIER_LO_EXT 0x3445 +#define EGL_DMA_BUF_PLANE1_MODIFIER_HI_EXT 0x3446 +#define EGL_DMA_BUF_PLANE2_MODIFIER_LO_EXT 0x3447 +#define EGL_DMA_BUF_PLANE2_MODIFIER_HI_EXT 0x3448 +#define EGL_DMA_BUF_PLANE3_MODIFIER_LO_EXT 0x3449 +#define EGL_DMA_BUF_PLANE3_MODIFIER_HI_EXT 0x344A +typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYDMABUFFORMATSEXTPROC) (EGLDisplay dpy, EGLint max_formats, EGLint *formats, EGLint *num_formats); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYDMABUFMODIFIERSEXTPROC) (EGLDisplay dpy, EGLint format, EGLint max_modifiers, EGLuint64KHR *modifiers, EGLBoolean *external_only, EGLint *num_modifiers); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglQueryDmaBufFormatsEXT (EGLDisplay dpy, EGLint max_formats, EGLint *formats, EGLint *num_formats); +EGLAPI EGLBoolean EGLAPIENTRY eglQueryDmaBufModifiersEXT (EGLDisplay dpy, EGLint format, EGLint max_modifiers, EGLuint64KHR *modifiers, EGLBoolean *external_only, EGLint *num_modifiers); +#endif +#endif /* EGL_EXT_image_dma_buf_import_modifiers */ + +#ifndef EGL_EXT_image_gl_colorspace +#define EGL_EXT_image_gl_colorspace 1 +#define EGL_GL_COLORSPACE_DEFAULT_EXT 0x314D +#endif /* EGL_EXT_image_gl_colorspace */ + +#ifndef EGL_EXT_image_implicit_sync_control +#define EGL_EXT_image_implicit_sync_control 1 +#define EGL_IMPORT_SYNC_TYPE_EXT 0x3470 +#define EGL_IMPORT_IMPLICIT_SYNC_EXT 0x3471 +#define EGL_IMPORT_EXPLICIT_SYNC_EXT 0x3472 +#endif /* EGL_EXT_image_implicit_sync_control */ + #ifndef EGL_EXT_multiview_window #define EGL_EXT_multiview_window 1 #define EGL_MULTIVIEW_VIEW_COUNT_EXT 0x3134 @@ -1334,8 +1672,8 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQueryDisplayAttribEXT (EGLDisplay dpy, EGLint a #define EGL_EXT_output_base 1 typedef void *EGLOutputLayerEXT; typedef void *EGLOutputPortEXT; -#define EGL_NO_OUTPUT_LAYER_EXT ((EGLOutputLayerEXT)0) -#define EGL_NO_OUTPUT_PORT_EXT ((EGLOutputPortEXT)0) +#define EGL_NO_OUTPUT_LAYER_EXT EGL_CAST(EGLOutputLayerEXT,0) +#define EGL_NO_OUTPUT_PORT_EXT EGL_CAST(EGLOutputPortEXT,0) #define EGL_BAD_OUTPUT_LAYER_EXT 0x322D #define EGL_BAD_OUTPUT_PORT_EXT 0x322E #define EGL_SWAP_INTERVAL_EXT 0x322F @@ -1372,6 +1710,13 @@ EGLAPI const char *EGLAPIENTRY eglQueryOutputPortStringEXT (EGLDisplay dpy, EGLO #define EGL_OPENWF_PORT_ID_EXT 0x3239 #endif /* EGL_EXT_output_openwf */ +#ifndef EGL_EXT_pixel_format_float +#define EGL_EXT_pixel_format_float 1 +#define EGL_COLOR_COMPONENT_TYPE_EXT 0x3339 +#define EGL_COLOR_COMPONENT_TYPE_FIXED_EXT 0x333A +#define EGL_COLOR_COMPONENT_TYPE_FLOAT_EXT 0x333B +#endif /* EGL_EXT_pixel_format_float */ + #ifndef EGL_EXT_platform_base #define EGL_EXT_platform_base 1 typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETPLATFORMDISPLAYEXTPROC) (EGLenum platform, void *native_display, const EGLint *attrib_list); @@ -1400,9 +1745,24 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreatePlatformPixmapSurfaceEXT (EGLDisplay dpy, #define EGL_PLATFORM_X11_SCREEN_EXT 0x31D6 #endif /* EGL_EXT_platform_x11 */ +#ifndef EGL_EXT_platform_xcb +#define EGL_EXT_platform_xcb 1 +#define EGL_PLATFORM_XCB_EXT 0x31DC +#define EGL_PLATFORM_XCB_SCREEN_EXT 0x31DE +#endif /* EGL_EXT_platform_xcb */ + +#ifndef EGL_EXT_present_opaque +#define EGL_EXT_present_opaque 1 +#define EGL_PRESENT_OPAQUE_EXT 0x31DF +#endif /* EGL_EXT_present_opaque */ + +#ifndef EGL_EXT_protected_content +#define EGL_EXT_protected_content 1 +#define EGL_PROTECTED_CONTENT_EXT 0x32C0 +#endif /* EGL_EXT_protected_content */ + #ifndef EGL_EXT_protected_surface #define EGL_EXT_protected_surface 1 -#define EGL_PROTECTED_CONTENT_EXT 0x32C0 #endif /* EGL_EXT_protected_surface */ #ifndef EGL_EXT_stream_consumer_egloutput @@ -1413,14 +1773,43 @@ EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerOutputEXT (EGLDisplay dpy, EGLStr #endif #endif /* EGL_EXT_stream_consumer_egloutput */ +#ifndef EGL_EXT_surface_CTA861_3_metadata +#define EGL_EXT_surface_CTA861_3_metadata 1 +#define EGL_CTA861_3_MAX_CONTENT_LIGHT_LEVEL_EXT 0x3360 +#define EGL_CTA861_3_MAX_FRAME_AVERAGE_LEVEL_EXT 0x3361 +#endif /* EGL_EXT_surface_CTA861_3_metadata */ + +#ifndef EGL_EXT_surface_SMPTE2086_metadata +#define EGL_EXT_surface_SMPTE2086_metadata 1 +#define EGL_SMPTE2086_DISPLAY_PRIMARY_RX_EXT 0x3341 +#define EGL_SMPTE2086_DISPLAY_PRIMARY_RY_EXT 0x3342 +#define EGL_SMPTE2086_DISPLAY_PRIMARY_GX_EXT 0x3343 +#define EGL_SMPTE2086_DISPLAY_PRIMARY_GY_EXT 0x3344 +#define EGL_SMPTE2086_DISPLAY_PRIMARY_BX_EXT 0x3345 +#define EGL_SMPTE2086_DISPLAY_PRIMARY_BY_EXT 0x3346 +#define EGL_SMPTE2086_WHITE_POINT_X_EXT 0x3347 +#define EGL_SMPTE2086_WHITE_POINT_Y_EXT 0x3348 +#define EGL_SMPTE2086_MAX_LUMINANCE_EXT 0x3349 +#define EGL_SMPTE2086_MIN_LUMINANCE_EXT 0x334A +#define EGL_METADATA_SCALING_EXT 50000 +#endif /* EGL_EXT_surface_SMPTE2086_metadata */ + #ifndef EGL_EXT_swap_buffers_with_damage #define EGL_EXT_swap_buffers_with_damage 1 -typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSWITHDAMAGEEXTPROC) (EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSWITHDAMAGEEXTPROC) (EGLDisplay dpy, EGLSurface surface, const EGLint *rects, EGLint n_rects); #ifdef EGL_EGLEXT_PROTOTYPES -EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffersWithDamageEXT (EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects); +EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffersWithDamageEXT (EGLDisplay dpy, EGLSurface surface, const EGLint *rects, EGLint n_rects); #endif #endif /* EGL_EXT_swap_buffers_with_damage */ +#ifndef EGL_EXT_sync_reuse +#define EGL_EXT_sync_reuse 1 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLUNSIGNALSYNCEXTPROC) (EGLDisplay dpy, EGLSync sync, const EGLAttrib *attrib_list); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglUnsignalSyncEXT (EGLDisplay dpy, EGLSync sync, const EGLAttrib *attrib_list); +#endif +#endif /* EGL_EXT_sync_reuse */ + #ifndef EGL_EXT_yuv_surface #define EGL_EXT_yuv_surface 1 #define EGL_YUV_ORDER_EXT 0x3301 @@ -1481,6 +1870,12 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreatePixmapSurfaceHI (EGLDisplay dpy, EGLConfi #define EGL_CONTEXT_PRIORITY_LOW_IMG 0x3103 #endif /* EGL_IMG_context_priority */ +#ifndef EGL_IMG_image_plane_attribs +#define EGL_IMG_image_plane_attribs 1 +#define EGL_NATIVE_BUFFER_MULTIPLANE_SEPARATE_IMG 0x3105 +#define EGL_NATIVE_BUFFER_PLANE_OFFSET_IMG 0x3106 +#endif /* EGL_IMG_image_plane_attribs */ + #ifndef EGL_MESA_drm_image #define EGL_MESA_drm_image 1 #define EGL_DRM_BUFFER_FORMAT_MESA 0x31D0 @@ -1490,6 +1885,7 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreatePixmapSurfaceHI (EGLDisplay dpy, EGLConfi #define EGL_DRM_BUFFER_STRIDE_MESA 0x31D4 #define EGL_DRM_BUFFER_USE_SCANOUT_MESA 0x00000001 #define EGL_DRM_BUFFER_USE_SHARE_MESA 0x00000002 +#define EGL_DRM_BUFFER_USE_CURSOR_MESA 0x00000004 typedef EGLImageKHR (EGLAPIENTRYP PFNEGLCREATEDRMIMAGEMESAPROC) (EGLDisplay dpy, const EGLint *attrib_list); typedef EGLBoolean (EGLAPIENTRYP PFNEGLEXPORTDRMIMAGEMESAPROC) (EGLDisplay dpy, EGLImageKHR image, EGLint *name, EGLint *handle, EGLint *stride); #ifdef EGL_EGLEXT_PROTOTYPES @@ -1513,6 +1909,21 @@ EGLAPI EGLBoolean EGLAPIENTRY eglExportDMABUFImageMESA (EGLDisplay dpy, EGLImage #define EGL_PLATFORM_GBM_MESA 0x31D7 #endif /* EGL_MESA_platform_gbm */ +#ifndef EGL_MESA_platform_surfaceless +#define EGL_MESA_platform_surfaceless 1 +#define EGL_PLATFORM_SURFACELESS_MESA 0x31DD +#endif /* EGL_MESA_platform_surfaceless */ + +#ifndef EGL_MESA_query_driver +#define EGL_MESA_query_driver 1 +typedef char *(EGLAPIENTRYP PFNEGLGETDISPLAYDRIVERCONFIGPROC) (EGLDisplay dpy); +typedef const char *(EGLAPIENTRYP PFNEGLGETDISPLAYDRIVERNAMEPROC) (EGLDisplay dpy); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI char *EGLAPIENTRY eglGetDisplayDriverConfig (EGLDisplay dpy); +EGLAPI const char *EGLAPIENTRY eglGetDisplayDriverName (EGLDisplay dpy); +#endif +#endif /* EGL_MESA_query_driver */ + #ifndef EGL_NOK_swap_region #define EGL_NOK_swap_region 1 typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSREGIONNOKPROC) (EGLDisplay dpy, EGLSurface surface, EGLint numRects, const EGLint *rects); @@ -1539,6 +1950,11 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffersRegion2NOK (EGLDisplay dpy, EGLSurfa #define EGL_AUTO_STEREO_NV 0x3136 #endif /* EGL_NV_3dvision_surface */ +#ifndef EGL_NV_context_priority_realtime +#define EGL_NV_context_priority_realtime 1 +#define EGL_CONTEXT_PRIORITY_REALTIME_NV 0x3357 +#endif /* EGL_NV_context_priority_realtime */ + #ifndef EGL_NV_coverage_sample #define EGL_NV_coverage_sample 1 #define EGL_COVERAGE_BUFFERS_NV 0x30E0 @@ -1596,6 +2012,181 @@ EGLAPI EGLBoolean EGLAPIENTRY eglPostSubBufferNV (EGLDisplay dpy, EGLSurface sur #endif #endif /* EGL_NV_post_sub_buffer */ +#ifndef EGL_NV_quadruple_buffer +#define EGL_NV_quadruple_buffer 1 +#define EGL_QUADRUPLE_BUFFER_NV 0x3231 +#endif /* EGL_NV_quadruple_buffer */ + +#ifndef EGL_NV_robustness_video_memory_purge +#define EGL_NV_robustness_video_memory_purge 1 +#define EGL_GENERATE_RESET_ON_VIDEO_MEMORY_PURGE_NV 0x334C +#endif /* EGL_NV_robustness_video_memory_purge */ + +#ifndef EGL_NV_stream_consumer_eglimage +#define EGL_NV_stream_consumer_eglimage 1 +#define EGL_STREAM_CONSUMER_IMAGE_NV 0x3373 +#define EGL_STREAM_IMAGE_ADD_NV 0x3374 +#define EGL_STREAM_IMAGE_REMOVE_NV 0x3375 +#define EGL_STREAM_IMAGE_AVAILABLE_NV 0x3376 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMIMAGECONSUMERCONNECTNVPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLint num_modifiers, EGLuint64KHR *modifiers, EGLAttrib *attrib_list); +typedef EGLint (EGLAPIENTRYP PFNEGLQUERYSTREAMCONSUMEREVENTNVPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLTime timeout, EGLenum *event, EGLAttrib *aux); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMACQUIREIMAGENVPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLImage *pImage, EGLSync sync); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMRELEASEIMAGENVPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLImage image, EGLSync sync); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglStreamImageConsumerConnectNV (EGLDisplay dpy, EGLStreamKHR stream, EGLint num_modifiers, EGLuint64KHR *modifiers, EGLAttrib *attrib_list); +EGLAPI EGLint EGLAPIENTRY eglQueryStreamConsumerEventNV (EGLDisplay dpy, EGLStreamKHR stream, EGLTime timeout, EGLenum *event, EGLAttrib *aux); +EGLAPI EGLBoolean EGLAPIENTRY eglStreamAcquireImageNV (EGLDisplay dpy, EGLStreamKHR stream, EGLImage *pImage, EGLSync sync); +EGLAPI EGLBoolean EGLAPIENTRY eglStreamReleaseImageNV (EGLDisplay dpy, EGLStreamKHR stream, EGLImage image, EGLSync sync); +#endif +#endif /* EGL_NV_stream_consumer_eglimage */ + +#ifndef EGL_NV_stream_consumer_gltexture_yuv +#define EGL_NV_stream_consumer_gltexture_yuv 1 +#define EGL_YUV_PLANE0_TEXTURE_UNIT_NV 0x332C +#define EGL_YUV_PLANE1_TEXTURE_UNIT_NV 0x332D +#define EGL_YUV_PLANE2_TEXTURE_UNIT_NV 0x332E +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMCONSUMERGLTEXTUREEXTERNALATTRIBSNVPROC) (EGLDisplay dpy, EGLStreamKHR stream, const EGLAttrib *attrib_list); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerGLTextureExternalAttribsNV (EGLDisplay dpy, EGLStreamKHR stream, const EGLAttrib *attrib_list); +#endif +#endif /* EGL_NV_stream_consumer_gltexture_yuv */ + +#ifndef EGL_NV_stream_cross_display +#define EGL_NV_stream_cross_display 1 +#define EGL_STREAM_CROSS_DISPLAY_NV 0x334E +#endif /* EGL_NV_stream_cross_display */ + +#ifndef EGL_NV_stream_cross_object +#define EGL_NV_stream_cross_object 1 +#define EGL_STREAM_CROSS_OBJECT_NV 0x334D +#endif /* EGL_NV_stream_cross_object */ + +#ifndef EGL_NV_stream_cross_partition +#define EGL_NV_stream_cross_partition 1 +#define EGL_STREAM_CROSS_PARTITION_NV 0x323F +#endif /* EGL_NV_stream_cross_partition */ + +#ifndef EGL_NV_stream_cross_process +#define EGL_NV_stream_cross_process 1 +#define EGL_STREAM_CROSS_PROCESS_NV 0x3245 +#endif /* EGL_NV_stream_cross_process */ + +#ifndef EGL_NV_stream_cross_system +#define EGL_NV_stream_cross_system 1 +#define EGL_STREAM_CROSS_SYSTEM_NV 0x334F +#endif /* EGL_NV_stream_cross_system */ + +#ifndef EGL_NV_stream_dma +#define EGL_NV_stream_dma 1 +#define EGL_STREAM_DMA_NV 0x3371 +#define EGL_STREAM_DMA_SERVER_NV 0x3372 +#endif /* EGL_NV_stream_dma */ + +#ifndef EGL_NV_stream_fifo_next +#define EGL_NV_stream_fifo_next 1 +#define EGL_PENDING_FRAME_NV 0x3329 +#define EGL_STREAM_TIME_PENDING_NV 0x332A +#endif /* EGL_NV_stream_fifo_next */ + +#ifndef EGL_NV_stream_fifo_synchronous +#define EGL_NV_stream_fifo_synchronous 1 +#define EGL_STREAM_FIFO_SYNCHRONOUS_NV 0x3336 +#endif /* EGL_NV_stream_fifo_synchronous */ + +#ifndef EGL_NV_stream_flush +#define EGL_NV_stream_flush 1 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMFLUSHNVPROC) (EGLDisplay dpy, EGLStreamKHR stream); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglStreamFlushNV (EGLDisplay dpy, EGLStreamKHR stream); +#endif +#endif /* EGL_NV_stream_flush */ + +#ifndef EGL_NV_stream_frame_limits +#define EGL_NV_stream_frame_limits 1 +#define EGL_PRODUCER_MAX_FRAME_HINT_NV 0x3337 +#define EGL_CONSUMER_MAX_FRAME_HINT_NV 0x3338 +#endif /* EGL_NV_stream_frame_limits */ + +#ifndef EGL_NV_stream_metadata +#define EGL_NV_stream_metadata 1 +#define EGL_MAX_STREAM_METADATA_BLOCKS_NV 0x3250 +#define EGL_MAX_STREAM_METADATA_BLOCK_SIZE_NV 0x3251 +#define EGL_MAX_STREAM_METADATA_TOTAL_SIZE_NV 0x3252 +#define EGL_PRODUCER_METADATA_NV 0x3253 +#define EGL_CONSUMER_METADATA_NV 0x3254 +#define EGL_PENDING_METADATA_NV 0x3328 +#define EGL_METADATA0_SIZE_NV 0x3255 +#define EGL_METADATA1_SIZE_NV 0x3256 +#define EGL_METADATA2_SIZE_NV 0x3257 +#define EGL_METADATA3_SIZE_NV 0x3258 +#define EGL_METADATA0_TYPE_NV 0x3259 +#define EGL_METADATA1_TYPE_NV 0x325A +#define EGL_METADATA2_TYPE_NV 0x325B +#define EGL_METADATA3_TYPE_NV 0x325C +typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYDISPLAYATTRIBNVPROC) (EGLDisplay dpy, EGLint attribute, EGLAttrib *value); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSETSTREAMMETADATANVPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLint n, EGLint offset, EGLint size, const void *data); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSTREAMMETADATANVPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLenum name, EGLint n, EGLint offset, EGLint size, void *data); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglQueryDisplayAttribNV (EGLDisplay dpy, EGLint attribute, EGLAttrib *value); +EGLAPI EGLBoolean EGLAPIENTRY eglSetStreamMetadataNV (EGLDisplay dpy, EGLStreamKHR stream, EGLint n, EGLint offset, EGLint size, const void *data); +EGLAPI EGLBoolean EGLAPIENTRY eglQueryStreamMetadataNV (EGLDisplay dpy, EGLStreamKHR stream, EGLenum name, EGLint n, EGLint offset, EGLint size, void *data); +#endif +#endif /* EGL_NV_stream_metadata */ + +#ifndef EGL_NV_stream_origin +#define EGL_NV_stream_origin 1 +#define EGL_STREAM_FRAME_ORIGIN_X_NV 0x3366 +#define EGL_STREAM_FRAME_ORIGIN_Y_NV 0x3367 +#define EGL_STREAM_FRAME_MAJOR_AXIS_NV 0x3368 +#define EGL_CONSUMER_AUTO_ORIENTATION_NV 0x3369 +#define EGL_PRODUCER_AUTO_ORIENTATION_NV 0x336A +#define EGL_LEFT_NV 0x336B +#define EGL_RIGHT_NV 0x336C +#define EGL_TOP_NV 0x336D +#define EGL_BOTTOM_NV 0x336E +#define EGL_X_AXIS_NV 0x336F +#define EGL_Y_AXIS_NV 0x3370 +#endif /* EGL_NV_stream_origin */ + +#ifndef EGL_NV_stream_remote +#define EGL_NV_stream_remote 1 +#define EGL_STREAM_STATE_INITIALIZING_NV 0x3240 +#define EGL_STREAM_TYPE_NV 0x3241 +#define EGL_STREAM_PROTOCOL_NV 0x3242 +#define EGL_STREAM_ENDPOINT_NV 0x3243 +#define EGL_STREAM_LOCAL_NV 0x3244 +#define EGL_STREAM_PRODUCER_NV 0x3247 +#define EGL_STREAM_CONSUMER_NV 0x3248 +#define EGL_STREAM_PROTOCOL_FD_NV 0x3246 +#endif /* EGL_NV_stream_remote */ + +#ifndef EGL_NV_stream_reset +#define EGL_NV_stream_reset 1 +#define EGL_SUPPORT_RESET_NV 0x3334 +#define EGL_SUPPORT_REUSE_NV 0x3335 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLRESETSTREAMNVPROC) (EGLDisplay dpy, EGLStreamKHR stream); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglResetStreamNV (EGLDisplay dpy, EGLStreamKHR stream); +#endif +#endif /* EGL_NV_stream_reset */ + +#ifndef EGL_NV_stream_socket +#define EGL_NV_stream_socket 1 +#define EGL_STREAM_PROTOCOL_SOCKET_NV 0x324B +#define EGL_SOCKET_HANDLE_NV 0x324C +#define EGL_SOCKET_TYPE_NV 0x324D +#endif /* EGL_NV_stream_socket */ + +#ifndef EGL_NV_stream_socket_inet +#define EGL_NV_stream_socket_inet 1 +#define EGL_SOCKET_TYPE_INET_NV 0x324F +#endif /* EGL_NV_stream_socket_inet */ + +#ifndef EGL_NV_stream_socket_unix +#define EGL_NV_stream_socket_unix 1 +#define EGL_SOCKET_TYPE_UNIX_NV 0x324E +#endif /* EGL_NV_stream_socket_unix */ + #ifndef EGL_NV_stream_sync #define EGL_NV_stream_sync 1 #define EGL_SYNC_NEW_FRAME_NV 0x321F @@ -1622,7 +2213,7 @@ typedef khronos_utime_nanoseconds_t EGLTimeNV; #define EGL_SYNC_TYPE_NV 0x30ED #define EGL_SYNC_CONDITION_NV 0x30EE #define EGL_SYNC_FENCE_NV 0x30EF -#define EGL_NO_SYNC_NV ((EGLSyncNV)0) +#define EGL_NO_SYNC_NV EGL_CAST(EGLSyncNV,0) typedef EGLSyncNV (EGLAPIENTRYP PFNEGLCREATEFENCESYNCNVPROC) (EGLDisplay dpy, EGLenum condition, const EGLint *attrib_list); typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYSYNCNVPROC) (EGLSyncNV sync); typedef EGLBoolean (EGLAPIENTRYP PFNEGLFENCENVPROC) (EGLSyncNV sync); @@ -1653,6 +2244,11 @@ EGLAPI EGLuint64NV EGLAPIENTRY eglGetSystemTimeNV (void); #endif /* KHRONOS_SUPPORT_INT64 */ #endif /* EGL_NV_system_time */ +#ifndef EGL_NV_triple_buffer +#define EGL_NV_triple_buffer 1 +#define EGL_TRIPLE_BUFFER_NV 0x3230 +#endif /* EGL_NV_triple_buffer */ + #ifndef EGL_TIZEN_image_native_buffer #define EGL_TIZEN_image_native_buffer 1 #define EGL_NATIVE_BUFFER_TIZEN 0x32A0 @@ -1663,11 +2259,44 @@ EGLAPI EGLuint64NV EGLAPIENTRY eglGetSystemTimeNV (void); #define EGL_NATIVE_SURFACE_TIZEN 0x32A1 #endif /* EGL_TIZEN_image_native_surface */ +#ifndef EGL_WL_bind_wayland_display +#define EGL_WL_bind_wayland_display 1 +#define PFNEGLBINDWAYLANDDISPLAYWL PFNEGLBINDWAYLANDDISPLAYWLPROC +#define PFNEGLUNBINDWAYLANDDISPLAYWL PFNEGLUNBINDWAYLANDDISPLAYWLPROC +#define PFNEGLQUERYWAYLANDBUFFERWL PFNEGLQUERYWAYLANDBUFFERWLPROC +struct wl_display; +struct wl_resource; +#define EGL_WAYLAND_BUFFER_WL 0x31D5 +#define EGL_WAYLAND_PLANE_WL 0x31D6 +#define EGL_TEXTURE_Y_U_V_WL 0x31D7 +#define EGL_TEXTURE_Y_UV_WL 0x31D8 +#define EGL_TEXTURE_Y_XUXV_WL 0x31D9 +#define EGL_TEXTURE_EXTERNAL_WL 0x31DA +#define EGL_WAYLAND_Y_INVERTED_WL 0x31DB +typedef EGLBoolean (EGLAPIENTRYP PFNEGLBINDWAYLANDDISPLAYWLPROC) (EGLDisplay dpy, struct wl_display *display); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLUNBINDWAYLANDDISPLAYWLPROC) (EGLDisplay dpy, struct wl_display *display); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYWAYLANDBUFFERWLPROC) (EGLDisplay dpy, struct wl_resource *buffer, EGLint attribute, EGLint *value); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglBindWaylandDisplayWL (EGLDisplay dpy, struct wl_display *display); +EGLAPI EGLBoolean EGLAPIENTRY eglUnbindWaylandDisplayWL (EGLDisplay dpy, struct wl_display *display); +EGLAPI EGLBoolean EGLAPIENTRY eglQueryWaylandBufferWL (EGLDisplay dpy, struct wl_resource *buffer, EGLint attribute, EGLint *value); +#endif +#endif /* EGL_WL_bind_wayland_display */ + +#ifndef EGL_WL_create_wayland_buffer_from_image +#define EGL_WL_create_wayland_buffer_from_image 1 +#define PFNEGLCREATEWAYLANDBUFFERFROMIMAGEWL PFNEGLCREATEWAYLANDBUFFERFROMIMAGEWLPROC +struct wl_buffer; +typedef struct wl_buffer *(EGLAPIENTRYP PFNEGLCREATEWAYLANDBUFFERFROMIMAGEWLPROC) (EGLDisplay dpy, EGLImageKHR image); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI struct wl_buffer *EGLAPIENTRY eglCreateWaylandBufferFromImageWL (EGLDisplay dpy, EGLImageKHR image); +#endif +#endif /* EGL_WL_create_wayland_buffer_from_image */ + #ifdef __cplusplus } #endif #endif /* __eglext_h_ */ - #endif /* _MSC_VER */ diff --git a/libs/SDL2/include/SDL_endian.h b/libs/SDL2/include/SDL_endian.h index 54d5d486d..46c296253 100644 --- a/libs/SDL2/include/SDL_endian.h +++ b/libs/SDL2/include/SDL_endian.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -30,6 +30,23 @@ #include "SDL_stdinc.h" +#if defined(_MSC_VER) && (_MSC_VER >= 1400) +/* As of Clang 11, '_m_prefetchw' is conflicting with the winnt.h's version, + so we define the needed '_m_prefetch' here as a pseudo-header, until the issue is fixed. */ +#ifdef __clang__ +#ifndef __PRFCHWINTRIN_H +#define __PRFCHWINTRIN_H +static __inline__ void __attribute__((__always_inline__, __nodebug__)) +_m_prefetch(void *__P) +{ + __builtin_prefetch (__P, 0, 3 /* _MM_HINT_T0 */); +} +#endif /* __PRFCHWINTRIN_H */ +#endif /* __clang__ */ + +#include +#endif + /** * \name The two types of endianness */ @@ -42,10 +59,16 @@ #ifdef __linux__ #include #define SDL_BYTEORDER __BYTE_ORDER -#else /* __linux__ */ +#elif defined(__OpenBSD__) +#include +#define SDL_BYTEORDER BYTE_ORDER +#elif defined(__FreeBSD__) || defined(__NetBSD__) +#include +#define SDL_BYTEORDER BYTE_ORDER +#else #if defined(__hppa__) || \ defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || \ - (defined(__MIPS__) && defined(__MISPEB__)) || \ + (defined(__MIPS__) && defined(__MIPSEB__)) || \ defined(__ppc__) || defined(__POWERPC__) || defined(_M_PPC) || \ defined(__sparc__) #define SDL_BYTEORDER SDL_BIG_ENDIAN @@ -65,22 +88,45 @@ extern "C" { /** * \file SDL_endian.h */ -#if defined(__GNUC__) && defined(__i386__) && \ - !(__GNUC__ == 2 && __GNUC_MINOR__ == 95 /* broken gcc version */) + +/* various modern compilers may have builtin swap */ +#if defined(__GNUC__) || defined(__clang__) +# define HAS_BUILTIN_BSWAP16 (_SDL_HAS_BUILTIN(__builtin_bswap16)) || \ + (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)) +# define HAS_BUILTIN_BSWAP32 (_SDL_HAS_BUILTIN(__builtin_bswap32)) || \ + (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) +# define HAS_BUILTIN_BSWAP64 (_SDL_HAS_BUILTIN(__builtin_bswap64)) || \ + (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) + + /* this one is broken */ +# define HAS_BROKEN_BSWAP (__GNUC__ == 2 && __GNUC_MINOR__ <= 95) +#else +# define HAS_BUILTIN_BSWAP16 0 +# define HAS_BUILTIN_BSWAP32 0 +# define HAS_BUILTIN_BSWAP64 0 +# define HAS_BROKEN_BSWAP 0 +#endif + +#if HAS_BUILTIN_BSWAP16 +#define SDL_Swap16(x) __builtin_bswap16(x) +#elif defined(_MSC_VER) && (_MSC_VER >= 1400) +#pragma intrinsic(_byteswap_ushort) +#define SDL_Swap16(x) _byteswap_ushort(x) +#elif defined(__i386__) && !HAS_BROKEN_BSWAP SDL_FORCE_INLINE Uint16 SDL_Swap16(Uint16 x) { __asm__("xchgb %b0,%h0": "=q"(x):"0"(x)); return x; } -#elif defined(__GNUC__) && defined(__x86_64__) +#elif defined(__x86_64__) SDL_FORCE_INLINE Uint16 SDL_Swap16(Uint16 x) { __asm__("xchgb %b0,%h0": "=Q"(x):"0"(x)); return x; } -#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__)) +#elif (defined(__powerpc__) || defined(__ppc__)) SDL_FORCE_INLINE Uint16 SDL_Swap16(Uint16 x) { @@ -89,7 +135,7 @@ SDL_Swap16(Uint16 x) __asm__("rlwimi %0,%2,8,16,23": "=&r"(result):"0"(x >> 8), "r"(x)); return (Uint16)result; } -#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__) +#elif (defined(__m68k__) && !defined(__mcoldfire__)) SDL_FORCE_INLINE Uint16 SDL_Swap16(Uint16 x) { @@ -97,7 +143,7 @@ SDL_Swap16(Uint16 x) return x; } #elif defined(__WATCOMC__) && defined(__386__) -extern _inline Uint16 SDL_Swap16(Uint16); +extern __inline Uint16 SDL_Swap16(Uint16); #pragma aux SDL_Swap16 = \ "xchg al, ah" \ parm [ax] \ @@ -110,32 +156,37 @@ SDL_Swap16(Uint16 x) } #endif -#if defined(__GNUC__) && defined(__i386__) +#if HAS_BUILTIN_BSWAP32 +#define SDL_Swap32(x) __builtin_bswap32(x) +#elif defined(_MSC_VER) && (_MSC_VER >= 1400) +#pragma intrinsic(_byteswap_ulong) +#define SDL_Swap32(x) _byteswap_ulong(x) +#elif defined(__i386__) && !HAS_BROKEN_BSWAP SDL_FORCE_INLINE Uint32 SDL_Swap32(Uint32 x) { __asm__("bswap %0": "=r"(x):"0"(x)); return x; } -#elif defined(__GNUC__) && defined(__x86_64__) +#elif defined(__x86_64__) SDL_FORCE_INLINE Uint32 SDL_Swap32(Uint32 x) { __asm__("bswapl %0": "=r"(x):"0"(x)); return x; } -#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__)) +#elif (defined(__powerpc__) || defined(__ppc__)) SDL_FORCE_INLINE Uint32 SDL_Swap32(Uint32 x) { Uint32 result; - __asm__("rlwimi %0,%2,24,16,23": "=&r"(result):"0"(x >> 24), "r"(x)); - __asm__("rlwimi %0,%2,8,8,15": "=&r"(result):"0"(result), "r"(x)); - __asm__("rlwimi %0,%2,24,0,7": "=&r"(result):"0"(result), "r"(x)); + __asm__("rlwimi %0,%2,24,16,23": "=&r"(result): "0" (x>>24), "r"(x)); + __asm__("rlwimi %0,%2,8,8,15" : "=&r"(result): "0" (result), "r"(x)); + __asm__("rlwimi %0,%2,24,0,7" : "=&r"(result): "0" (result), "r"(x)); return result; } -#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__) +#elif (defined(__m68k__) && !defined(__mcoldfire__)) SDL_FORCE_INLINE Uint32 SDL_Swap32(Uint32 x) { @@ -143,20 +194,11 @@ SDL_Swap32(Uint32 x) return x; } #elif defined(__WATCOMC__) && defined(__386__) -extern _inline Uint32 SDL_Swap32(Uint32); -#ifndef __SW_3 /* 486+ */ +extern __inline Uint32 SDL_Swap32(Uint32); #pragma aux SDL_Swap32 = \ "bswap eax" \ parm [eax] \ modify [eax]; -#else /* 386-only */ -#pragma aux SDL_Swap32 = \ - "xchg al, ah" \ - "ror eax, 16" \ - "xchg al, ah" \ - parm [eax] \ - modify [eax]; -#endif #else SDL_FORCE_INLINE Uint32 SDL_Swap32(Uint32 x) @@ -166,31 +208,42 @@ SDL_Swap32(Uint32 x) } #endif -#if defined(__GNUC__) && defined(__i386__) +#if HAS_BUILTIN_BSWAP64 +#define SDL_Swap64(x) __builtin_bswap64(x) +#elif defined(_MSC_VER) && (_MSC_VER >= 1400) +#pragma intrinsic(_byteswap_uint64) +#define SDL_Swap64(x) _byteswap_uint64(x) +#elif defined(__i386__) && !HAS_BROKEN_BSWAP SDL_FORCE_INLINE Uint64 SDL_Swap64(Uint64 x) { - union - { - struct - { + union { + struct { Uint32 a, b; } s; Uint64 u; } v; v.u = x; - __asm__("bswapl %0 ; bswapl %1 ; xchgl %0,%1": "=r"(v.s.a), "=r"(v.s.b):"0"(v.s.a), - "1"(v.s. - b)); + __asm__("bswapl %0 ; bswapl %1 ; xchgl %0,%1" + : "=r"(v.s.a), "=r"(v.s.b) + : "0" (v.s.a), "1"(v.s.b)); return v.u; } -#elif defined(__GNUC__) && defined(__x86_64__) +#elif defined(__x86_64__) SDL_FORCE_INLINE Uint64 SDL_Swap64(Uint64 x) { __asm__("bswapq %0": "=r"(x):"0"(x)); return x; } +#elif defined(__WATCOMC__) && defined(__386__) +extern __inline Uint64 SDL_Swap64(Uint64); +#pragma aux SDL_Swap64 = \ + "bswap eax" \ + "bswap edx" \ + "xchg eax,edx" \ + parm [eax edx] \ + modify [eax edx]; #else SDL_FORCE_INLINE Uint64 SDL_Swap64(Uint64 x) @@ -212,8 +265,7 @@ SDL_Swap64(Uint64 x) SDL_FORCE_INLINE float SDL_SwapFloat(float x) { - union - { + union { float f; Uint32 ui32; } swapper; @@ -222,6 +274,11 @@ SDL_SwapFloat(float x) return swapper.f; } +/* remove extra macros */ +#undef HAS_BROKEN_BSWAP +#undef HAS_BUILTIN_BSWAP16 +#undef HAS_BUILTIN_BSWAP32 +#undef HAS_BUILTIN_BSWAP64 /** * \name Swap to native @@ -229,22 +286,22 @@ SDL_SwapFloat(float x) */ /* @{ */ #if SDL_BYTEORDER == SDL_LIL_ENDIAN -#define SDL_SwapLE16(X) (X) -#define SDL_SwapLE32(X) (X) -#define SDL_SwapLE64(X) (X) +#define SDL_SwapLE16(X) (X) +#define SDL_SwapLE32(X) (X) +#define SDL_SwapLE64(X) (X) #define SDL_SwapFloatLE(X) (X) -#define SDL_SwapBE16(X) SDL_Swap16(X) -#define SDL_SwapBE32(X) SDL_Swap32(X) -#define SDL_SwapBE64(X) SDL_Swap64(X) +#define SDL_SwapBE16(X) SDL_Swap16(X) +#define SDL_SwapBE32(X) SDL_Swap32(X) +#define SDL_SwapBE64(X) SDL_Swap64(X) #define SDL_SwapFloatBE(X) SDL_SwapFloat(X) #else -#define SDL_SwapLE16(X) SDL_Swap16(X) -#define SDL_SwapLE32(X) SDL_Swap32(X) -#define SDL_SwapLE64(X) SDL_Swap64(X) +#define SDL_SwapLE16(X) SDL_Swap16(X) +#define SDL_SwapLE32(X) SDL_Swap32(X) +#define SDL_SwapLE64(X) SDL_Swap64(X) #define SDL_SwapFloatLE(X) SDL_SwapFloat(X) -#define SDL_SwapBE16(X) (X) -#define SDL_SwapBE32(X) (X) -#define SDL_SwapBE64(X) (X) +#define SDL_SwapBE16(X) (X) +#define SDL_SwapBE32(X) (X) +#define SDL_SwapBE64(X) (X) #define SDL_SwapFloatBE(X) (X) #endif /* @} *//* Swap to native */ diff --git a/libs/SDL2/include/SDL_error.h b/libs/SDL2/include/SDL_error.h index 24416e693..5c961e428 100644 --- a/libs/SDL2/include/SDL_error.h +++ b/libs/SDL2/include/SDL_error.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -37,9 +37,96 @@ extern "C" { #endif /* Public functions */ -/* SDL_SetError() unconditionally returns -1. */ + + +/** + * Set the SDL error message for the current thread. + * + * Calling this function will replace any previous error message that was set. + * + * This function always returns -1, since SDL frequently uses -1 to signify an + * failing result, leading to this idiom: + * + * ```c + * if (error_code) { + * return SDL_SetError("This operation has failed: %d", error_code); + * } + * ``` + * + * \param fmt a printf()-style message format string + * \param ... additional parameters matching % tokens in the `fmt` string, if + * any + * \returns always -1. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ClearError + * \sa SDL_GetError + */ extern DECLSPEC int SDLCALL SDL_SetError(SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(1); + +/** + * Retrieve a message about the last error that occurred on the current + * thread. + * + * It is possible for multiple errors to occur before calling SDL_GetError(). + * Only the last error is returned. + * + * The message is only applicable when an SDL function has signaled an error. + * You must check the return values of SDL function calls to determine when to + * appropriately call SDL_GetError(). You should *not* use the results of + * SDL_GetError() to decide if an error has occurred! Sometimes SDL will set + * an error string even when reporting success. + * + * SDL will *not* clear the error string for successful API calls. You *must* + * check return values for failure cases before you can assume the error + * string applies. + * + * Error strings are set per-thread, so an error set in a different thread + * will not interfere with the current thread's operation. + * + * The returned string is internally allocated and must not be freed by the + * application. + * + * \returns a message with information about the specific error that occurred, + * or an empty string if there hasn't been an error message set since + * the last call to SDL_ClearError(). The message is only applicable + * when an SDL function has signaled an error. You must check the + * return values of SDL function calls to determine when to + * appropriately call SDL_GetError(). + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ClearError + * \sa SDL_SetError + */ extern DECLSPEC const char *SDLCALL SDL_GetError(void); + +/** + * Get the last error message that was set for the current thread. + * + * This allows the caller to copy the error string into a provided buffer, but + * otherwise operates exactly the same as SDL_GetError(). + * + * \param errstr A buffer to fill with the last error message that was set for + * the current thread + * \param maxlen The size of the buffer pointed to by the errstr parameter + * \returns the pointer passed in as the `errstr` parameter. + * + * \since This function is available since SDL 2.0.14. + * + * \sa SDL_GetError + */ +extern DECLSPEC char * SDLCALL SDL_GetErrorMsg(char *errstr, int maxlen); + +/** + * Clear any previous error message for this thread. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetError + * \sa SDL_SetError + */ extern DECLSPEC void SDLCALL SDL_ClearError(void); /** diff --git a/libs/SDL2/include/SDL_events.h b/libs/SDL2/include/SDL_events.h index 282b9fb76..3722a6311 100644 --- a/libs/SDL2/include/SDL_events.h +++ b/libs/SDL2/include/SDL_events.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -50,7 +50,7 @@ extern "C" { #define SDL_PRESSED 1 /** - * \brief The types of events that can be delivered. + * The types of events that can be delivered. */ typedef enum { @@ -85,6 +85,8 @@ typedef enum Called on Android in onResume() */ + SDL_LOCALECHANGED, /**< The user's locale preferences have changed. */ + /* Display events */ SDL_DISPLAYEVENT = 0x150, /**< Display state change */ @@ -123,6 +125,10 @@ typedef enum SDL_CONTROLLERDEVICEADDED, /**< A new Game controller has been inserted into the system */ SDL_CONTROLLERDEVICEREMOVED, /**< An opened Game controller has been removed */ SDL_CONTROLLERDEVICEREMAPPED, /**< The controller mapping was updated */ + SDL_CONTROLLERTOUCHPADDOWN, /**< Game controller touchpad was touched */ + SDL_CONTROLLERTOUCHPADMOTION, /**< Game controller touchpad finger was moved */ + SDL_CONTROLLERTOUCHPADUP, /**< Game controller touchpad finger was lifted */ + SDL_CONTROLLERSENSORUPDATE, /**< Game controller sensor was updated */ /* Touch events */ SDL_FINGERDOWN = 0x700, @@ -154,6 +160,9 @@ typedef enum SDL_RENDER_TARGETS_RESET = 0x2000, /**< The render targets have been reset and their contents need to be updated */ SDL_RENDER_DEVICE_RESET, /**< The device has been reset and all textures need to be recreated */ + /* Internal events */ + SDL_POLLSENTINEL = 0x7F00, /**< Signals the end of an event poll cycle */ + /** Events ::SDL_USEREVENT through ::SDL_LASTEVENT are for your use, * and should be allocated with SDL_RegisterEvents() */ @@ -292,6 +301,8 @@ typedef struct SDL_MouseWheelEvent Sint32 x; /**< The amount scrolled horizontally, positive to the right and negative to the left */ Sint32 y; /**< The amount scrolled vertically, positive away from the user and negative toward the user */ Uint32 direction; /**< Set to one of the SDL_MOUSEWHEEL_* defines. When FLIPPED the values in X and Y will be opposite. Multiply by -1 to change them back */ + float preciseX; /**< The amount scrolled horizontally, positive to the right and negative to the left, with float precision (added in 2.0.18) */ + float preciseY; /**< The amount scrolled vertically, positive away from the user and negative toward the user, with float precision (added in 2.0.18) */ } SDL_MouseWheelEvent; /** @@ -413,6 +424,33 @@ typedef struct SDL_ControllerDeviceEvent Sint32 which; /**< The joystick device index for the ADDED event, instance id for the REMOVED or REMAPPED event */ } SDL_ControllerDeviceEvent; +/** + * \brief Game controller touchpad event structure (event.ctouchpad.*) + */ +typedef struct SDL_ControllerTouchpadEvent +{ + Uint32 type; /**< ::SDL_CONTROLLERTOUCHPADDOWN or ::SDL_CONTROLLERTOUCHPADMOTION or ::SDL_CONTROLLERTOUCHPADUP */ + Uint32 timestamp; /**< In milliseconds, populated using SDL_GetTicks() */ + SDL_JoystickID which; /**< The joystick instance id */ + Sint32 touchpad; /**< The index of the touchpad */ + Sint32 finger; /**< The index of the finger on the touchpad */ + float x; /**< Normalized in the range 0...1 with 0 being on the left */ + float y; /**< Normalized in the range 0...1 with 0 being at the top */ + float pressure; /**< Normalized in the range 0...1 */ +} SDL_ControllerTouchpadEvent; + +/** + * \brief Game controller sensor event structure (event.csensor.*) + */ +typedef struct SDL_ControllerSensorEvent +{ + Uint32 type; /**< ::SDL_CONTROLLERSENSORUPDATE */ + Uint32 timestamp; /**< In milliseconds, populated using SDL_GetTicks() */ + SDL_JoystickID which; /**< The joystick instance id */ + Sint32 sensor; /**< The type of the sensor, one of the values of ::SDL_SensorType */ + float data[3]; /**< Up to 3 values from the sensor, as defined in SDL_sensor.h */ +} SDL_ControllerSensorEvent; + /** * \brief Audio device event structure (event.adevice.*) */ @@ -442,6 +480,7 @@ typedef struct SDL_TouchFingerEvent float dx; /**< Normalized in the range -1...1 */ float dy; /**< Normalized in the range -1...1 */ float pressure; /**< Normalized in the range 0...1 */ + Uint32 windowID; /**< The window underneath the finger, if any */ } SDL_TouchFingerEvent; @@ -556,56 +595,79 @@ typedef struct SDL_SysWMEvent */ typedef union SDL_Event { - Uint32 type; /**< Event type, shared with all events */ - SDL_CommonEvent common; /**< Common event data */ - SDL_DisplayEvent display; /**< Window event data */ - SDL_WindowEvent window; /**< Window event data */ - SDL_KeyboardEvent key; /**< Keyboard event data */ - SDL_TextEditingEvent edit; /**< Text editing event data */ - SDL_TextInputEvent text; /**< Text input event data */ - SDL_MouseMotionEvent motion; /**< Mouse motion event data */ - SDL_MouseButtonEvent button; /**< Mouse button event data */ - SDL_MouseWheelEvent wheel; /**< Mouse wheel event data */ - SDL_JoyAxisEvent jaxis; /**< Joystick axis event data */ - SDL_JoyBallEvent jball; /**< Joystick ball event data */ - SDL_JoyHatEvent jhat; /**< Joystick hat event data */ - SDL_JoyButtonEvent jbutton; /**< Joystick button event data */ - SDL_JoyDeviceEvent jdevice; /**< Joystick device change event data */ - SDL_ControllerAxisEvent caxis; /**< Game Controller axis event data */ - SDL_ControllerButtonEvent cbutton; /**< Game Controller button event data */ - SDL_ControllerDeviceEvent cdevice; /**< Game Controller device event data */ - SDL_AudioDeviceEvent adevice; /**< Audio device event data */ - SDL_SensorEvent sensor; /**< Sensor event data */ - SDL_QuitEvent quit; /**< Quit request event data */ - SDL_UserEvent user; /**< Custom event data */ - SDL_SysWMEvent syswm; /**< System dependent window event data */ - SDL_TouchFingerEvent tfinger; /**< Touch finger event data */ - SDL_MultiGestureEvent mgesture; /**< Gesture event data */ - SDL_DollarGestureEvent dgesture; /**< Gesture event data */ - SDL_DropEvent drop; /**< Drag and drop event data */ + Uint32 type; /**< Event type, shared with all events */ + SDL_CommonEvent common; /**< Common event data */ + SDL_DisplayEvent display; /**< Display event data */ + SDL_WindowEvent window; /**< Window event data */ + SDL_KeyboardEvent key; /**< Keyboard event data */ + SDL_TextEditingEvent edit; /**< Text editing event data */ + SDL_TextInputEvent text; /**< Text input event data */ + SDL_MouseMotionEvent motion; /**< Mouse motion event data */ + SDL_MouseButtonEvent button; /**< Mouse button event data */ + SDL_MouseWheelEvent wheel; /**< Mouse wheel event data */ + SDL_JoyAxisEvent jaxis; /**< Joystick axis event data */ + SDL_JoyBallEvent jball; /**< Joystick ball event data */ + SDL_JoyHatEvent jhat; /**< Joystick hat event data */ + SDL_JoyButtonEvent jbutton; /**< Joystick button event data */ + SDL_JoyDeviceEvent jdevice; /**< Joystick device change event data */ + SDL_ControllerAxisEvent caxis; /**< Game Controller axis event data */ + SDL_ControllerButtonEvent cbutton; /**< Game Controller button event data */ + SDL_ControllerDeviceEvent cdevice; /**< Game Controller device event data */ + SDL_ControllerTouchpadEvent ctouchpad; /**< Game Controller touchpad event data */ + SDL_ControllerSensorEvent csensor; /**< Game Controller sensor event data */ + SDL_AudioDeviceEvent adevice; /**< Audio device event data */ + SDL_SensorEvent sensor; /**< Sensor event data */ + SDL_QuitEvent quit; /**< Quit request event data */ + SDL_UserEvent user; /**< Custom event data */ + SDL_SysWMEvent syswm; /**< System dependent window event data */ + SDL_TouchFingerEvent tfinger; /**< Touch finger event data */ + SDL_MultiGestureEvent mgesture; /**< Gesture event data */ + SDL_DollarGestureEvent dgesture; /**< Gesture event data */ + SDL_DropEvent drop; /**< Drag and drop event data */ - /* This is necessary for ABI compatibility between Visual C++ and GCC - Visual C++ will respect the push pack pragma and use 52 bytes for - this structure, and GCC will use the alignment of the largest datatype - within the union, which is 8 bytes. + /* This is necessary for ABI compatibility between Visual C++ and GCC. + Visual C++ will respect the push pack pragma and use 52 bytes (size of + SDL_TextEditingEvent, the largest structure for 32-bit and 64-bit + architectures) for this union, and GCC will use the alignment of the + largest datatype within the union, which is 8 bytes on 64-bit + architectures. So... we'll add padding to force the size to be 56 bytes for both. + + On architectures where pointers are 16 bytes, this needs rounding up to + the next multiple of 16, 64, and on architectures where pointers are + even larger the size of SDL_UserEvent will dominate as being 3 pointers. */ - Uint8 padding[56]; + Uint8 padding[sizeof(void *) <= 8 ? 56 : sizeof(void *) == 16 ? 64 : 3 * sizeof(void *)]; } SDL_Event; /* Make sure we haven't broken binary compatibility */ -SDL_COMPILE_TIME_ASSERT(SDL_Event, sizeof(SDL_Event) == 56); +SDL_COMPILE_TIME_ASSERT(SDL_Event, sizeof(SDL_Event) == sizeof(((SDL_Event *)NULL)->padding)); /* Function prototypes */ /** - * Pumps the event loop, gathering events from the input devices. + * Pump the event loop, gathering events from the input devices. * - * This function updates the event queue and internal input device state. + * This function updates the event queue and internal input device state. * - * This should only be run in the thread that sets the video mode. + * **WARNING**: This should only be run in the thread that initialized the + * video subsystem, and for extra safety, you should consider only doing those + * things on the main thread in any case. + * + * SDL_PumpEvents() gathers all the pending input information from devices and + * places it in the event queue. Without calls to SDL_PumpEvents() no events + * would ever be placed on the queue. Often the need for calls to + * SDL_PumpEvents() is hidden from the user since SDL_PollEvent() and + * SDL_WaitEvent() implicitly call SDL_PumpEvents(). However, if you are not + * polling or waiting for events (e.g. you are filtering them), then you must + * call SDL_PumpEvents() to force an event queue update. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_PollEvent + * \sa SDL_WaitEvent */ extern DECLSPEC void SDLCALL SDL_PumpEvents(void); @@ -618,22 +680,42 @@ typedef enum } SDL_eventaction; /** - * Checks the event queue for messages and optionally returns them. + * Check the event queue for messages and optionally return them. * - * If \c action is ::SDL_ADDEVENT, up to \c numevents events will be added to - * the back of the event queue. + * `action` may be any of the following: * - * If \c action is ::SDL_PEEKEVENT, up to \c numevents events at the front - * of the event queue, within the specified minimum and maximum type, - * will be returned and will not be removed from the queue. + * - `SDL_ADDEVENT`: up to `numevents` events will be added to the back of the + * event queue. + * - `SDL_PEEKEVENT`: `numevents` events at the front of the event queue, + * within the specified minimum and maximum type, will be returned to the + * caller and will _not_ be removed from the queue. + * - `SDL_GETEVENT`: up to `numevents` events at the front of the event queue, + * within the specified minimum and maximum type, will be returned to the + * caller and will be removed from the queue. * - * If \c action is ::SDL_GETEVENT, up to \c numevents events at the front - * of the event queue, within the specified minimum and maximum type, - * will be returned and will be removed from the queue. + * You may have to call SDL_PumpEvents() before calling this function. + * Otherwise, the events may not be ready to be filtered when you call + * SDL_PeepEvents(). * - * \return The number of events actually stored, or -1 if there was an error. + * This function is thread-safe. * - * This function is thread-safe. + * \param events destination buffer for the retrieved events + * \param numevents if action is SDL_ADDEVENT, the number of events to add + * back to the event queue; if action is SDL_PEEKEVENT or + * SDL_GETEVENT, the maximum number of events to retrieve + * \param action action to take; see [[#action|Remarks]] for details + * \param minType minimum value of the event type to be considered; + * SDL_FIRSTEVENT is a safe choice + * \param maxType maximum value of the event type to be considered; + * SDL_LASTEVENT is a safe choice + * \returns the number of events actually stored or a negative error code on + * failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_PollEvent + * \sa SDL_PumpEvents + * \sa SDL_PushEvent */ extern DECLSPEC int SDLCALL SDL_PeepEvents(SDL_Event * events, int numevents, SDL_eventaction action, @@ -641,113 +723,354 @@ extern DECLSPEC int SDLCALL SDL_PeepEvents(SDL_Event * events, int numevents, /* @} */ /** - * Checks to see if certain event types are in the event queue. + * Check for the existence of a certain event type in the event queue. + * + * If you need to check for a range of event types, use SDL_HasEvents() + * instead. + * + * \param type the type of event to be queried; see SDL_EventType for details + * \returns SDL_TRUE if events matching `type` are present, or SDL_FALSE if + * events matching `type` are not present. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HasEvents */ extern DECLSPEC SDL_bool SDLCALL SDL_HasEvent(Uint32 type); + + +/** + * Check for the existence of certain event types in the event queue. + * + * If you need to check for a single event type, use SDL_HasEvent() instead. + * + * \param minType the low end of event type to be queried, inclusive; see + * SDL_EventType for details + * \param maxType the high end of event type to be queried, inclusive; see + * SDL_EventType for details + * \returns SDL_TRUE if events with type >= `minType` and <= `maxType` are + * present, or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HasEvents + */ extern DECLSPEC SDL_bool SDLCALL SDL_HasEvents(Uint32 minType, Uint32 maxType); /** - * This function clears events from the event queue - * This function only affects currently queued events. If you want to make - * sure that all pending OS events are flushed, you can call SDL_PumpEvents() - * on the main thread immediately before the flush call. + * Clear events of a specific type from the event queue. + * + * This will unconditionally remove any events from the queue that match + * `type`. If you need to remove a range of event types, use SDL_FlushEvents() + * instead. + * + * It's also normal to just ignore events you don't care about in your event + * loop without calling this function. + * + * This function only affects currently queued events. If you want to make + * sure that all pending OS events are flushed, you can call SDL_PumpEvents() + * on the main thread immediately before the flush call. + * + * \param type the type of event to be cleared; see SDL_EventType for details + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_FlushEvents */ extern DECLSPEC void SDLCALL SDL_FlushEvent(Uint32 type); + +/** + * Clear events of a range of types from the event queue. + * + * This will unconditionally remove any events from the queue that are in the + * range of `minType` to `maxType`, inclusive. If you need to remove a single + * event type, use SDL_FlushEvent() instead. + * + * It's also normal to just ignore events you don't care about in your event + * loop without calling this function. + * + * This function only affects currently queued events. If you want to make + * sure that all pending OS events are flushed, you can call SDL_PumpEvents() + * on the main thread immediately before the flush call. + * + * \param minType the low end of event type to be cleared, inclusive; see + * SDL_EventType for details + * \param maxType the high end of event type to be cleared, inclusive; see + * SDL_EventType for details + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_FlushEvent + */ extern DECLSPEC void SDLCALL SDL_FlushEvents(Uint32 minType, Uint32 maxType); /** - * \brief Polls for currently pending events. + * Poll for currently pending events. * - * \return 1 if there are any pending events, or 0 if there are none available. + * If `event` is not NULL, the next event is removed from the queue and stored + * in the SDL_Event structure pointed to by `event`. The 1 returned refers to + * this event, immediately stored in the SDL Event structure -- not an event + * to follow. * - * \param event If not NULL, the next event is removed from the queue and - * stored in that area. + * If `event` is NULL, it simply returns 1 if there is an event in the queue, + * but will not remove it from the queue. + * + * As this function may implicitly call SDL_PumpEvents(), you can only call + * this function in the thread that set the video mode. + * + * SDL_PollEvent() is the favored way of receiving system events since it can + * be done from the main loop and does not suspend the main loop while waiting + * on an event to be posted. + * + * The common practice is to fully process the event queue once every frame, + * usually as a first step before updating the game's state: + * + * ```c + * while (game_is_still_running) { + * SDL_Event event; + * while (SDL_PollEvent(&event)) { // poll until all events are handled! + * // decide what to do with this event. + * } + * + * // update game state, draw the current frame + * } + * ``` + * + * \param event the SDL_Event structure to be filled with the next event from + * the queue, or NULL + * \returns 1 if there is a pending event or 0 if there are none available. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetEventFilter + * \sa SDL_PeepEvents + * \sa SDL_PushEvent + * \sa SDL_SetEventFilter + * \sa SDL_WaitEvent + * \sa SDL_WaitEventTimeout */ extern DECLSPEC int SDLCALL SDL_PollEvent(SDL_Event * event); /** - * \brief Waits indefinitely for the next available event. + * Wait indefinitely for the next available event. * - * \return 1, or 0 if there was an error while waiting for events. + * If `event` is not NULL, the next event is removed from the queue and stored + * in the SDL_Event structure pointed to by `event`. * - * \param event If not NULL, the next event is removed from the queue and - * stored in that area. + * As this function may implicitly call SDL_PumpEvents(), you can only call + * this function in the thread that initialized the video subsystem. + * + * \param event the SDL_Event structure to be filled in with the next event + * from the queue, or NULL + * \returns 1 on success or 0 if there was an error while waiting for events; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_PollEvent + * \sa SDL_PumpEvents + * \sa SDL_WaitEventTimeout */ extern DECLSPEC int SDLCALL SDL_WaitEvent(SDL_Event * event); /** - * \brief Waits until the specified timeout (in milliseconds) for the next - * available event. + * Wait until the specified timeout (in milliseconds) for the next available + * event. * - * \return 1, or 0 if there was an error while waiting for events. + * If `event` is not NULL, the next event is removed from the queue and stored + * in the SDL_Event structure pointed to by `event`. * - * \param event If not NULL, the next event is removed from the queue and - * stored in that area. - * \param timeout The timeout (in milliseconds) to wait for next event. + * As this function may implicitly call SDL_PumpEvents(), you can only call + * this function in the thread that initialized the video subsystem. + * + * \param event the SDL_Event structure to be filled in with the next event + * from the queue, or NULL + * \param timeout the maximum number of milliseconds to wait for the next + * available event + * \returns 1 on success or 0 if there was an error while waiting for events; + * call SDL_GetError() for more information. This also returns 0 if + * the timeout elapsed without an event arriving. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_PollEvent + * \sa SDL_PumpEvents + * \sa SDL_WaitEvent */ extern DECLSPEC int SDLCALL SDL_WaitEventTimeout(SDL_Event * event, int timeout); /** - * \brief Add an event to the event queue. + * Add an event to the event queue. * - * \return 1 on success, 0 if the event was filtered, or -1 if the event queue - * was full or there was some other error. + * The event queue can actually be used as a two way communication channel. + * Not only can events be read from the queue, but the user can also push + * their own events onto it. `event` is a pointer to the event structure you + * wish to push onto the queue. The event is copied into the queue, and the + * caller may dispose of the memory pointed to after SDL_PushEvent() returns. + * + * Note: Pushing device input events onto the queue doesn't modify the state + * of the device within SDL. + * + * This function is thread-safe, and can be called from other threads safely. + * + * Note: Events pushed onto the queue with SDL_PushEvent() get passed through + * the event filter but events added with SDL_PeepEvents() do not. + * + * For pushing application-specific events, please use SDL_RegisterEvents() to + * get an event type that does not conflict with other code that also wants + * its own custom event types. + * + * \param event the SDL_Event to be added to the queue + * \returns 1 on success, 0 if the event was filtered, or a negative error + * code on failure; call SDL_GetError() for more information. A + * common reason for error is the event queue being full. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_PeepEvents + * \sa SDL_PollEvent + * \sa SDL_RegisterEvents */ extern DECLSPEC int SDLCALL SDL_PushEvent(SDL_Event * event); +/** + * A function pointer used for callbacks that watch the event queue. + * + * \param userdata what was passed as `userdata` to SDL_SetEventFilter() + * or SDL_AddEventWatch, etc + * \param event the event that triggered the callback + * \returns 1 to permit event to be added to the queue, and 0 to disallow + * it. When used with SDL_AddEventWatch, the return value is ignored. + * + * \sa SDL_SetEventFilter + * \sa SDL_AddEventWatch + */ typedef int (SDLCALL * SDL_EventFilter) (void *userdata, SDL_Event * event); /** - * Sets up a filter to process all events before they change internal state and - * are posted to the internal event queue. + * Set up a filter to process all events before they change internal state and + * are posted to the internal event queue. * - * The filter is prototyped as: - * \code - * int SDL_EventFilter(void *userdata, SDL_Event * event); - * \endcode + * If the filter function returns 1 when called, then the event will be added + * to the internal queue. If it returns 0, then the event will be dropped from + * the queue, but the internal state will still be updated. This allows + * selective filtering of dynamically arriving events. * - * If the filter returns 1, then the event will be added to the internal queue. - * If it returns 0, then the event will be dropped from the queue, but the - * internal state will still be updated. This allows selective filtering of - * dynamically arriving events. + * **WARNING**: Be very careful of what you do in the event filter function, + * as it may run in a different thread! * - * \warning Be very careful of what you do in the event filter function, as - * it may run in a different thread! + * On platforms that support it, if the quit event is generated by an + * interrupt signal (e.g. pressing Ctrl-C), it will be delivered to the + * application at the next event poll. * - * There is one caveat when dealing with the ::SDL_QuitEvent event type. The - * event filter is only called when the window manager desires to close the - * application window. If the event filter returns 1, then the window will - * be closed, otherwise the window will remain open if possible. + * There is one caveat when dealing with the ::SDL_QuitEvent event type. The + * event filter is only called when the window manager desires to close the + * application window. If the event filter returns 1, then the window will be + * closed, otherwise the window will remain open if possible. * - * If the quit event is generated by an interrupt signal, it will bypass the - * internal queue and be delivered to the application at the next event poll. + * Note: Disabled events never make it to the event filter function; see + * SDL_EventState(). + * + * Note: If you just want to inspect events without filtering, you should use + * SDL_AddEventWatch() instead. + * + * Note: Events pushed onto the queue with SDL_PushEvent() get passed through + * the event filter, but events pushed onto the queue with SDL_PeepEvents() do + * not. + * + * \param filter An SDL_EventFilter function to call when an event happens + * \param userdata a pointer that is passed to `filter` + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AddEventWatch + * \sa SDL_EventState + * \sa SDL_GetEventFilter + * \sa SDL_PeepEvents + * \sa SDL_PushEvent */ extern DECLSPEC void SDLCALL SDL_SetEventFilter(SDL_EventFilter filter, void *userdata); /** - * Return the current event filter - can be used to "chain" filters. - * If there is no event filter set, this function returns SDL_FALSE. + * Query the current event filter. + * + * This function can be used to "chain" filters, by saving the existing filter + * before replacing it with a function that will call that saved filter. + * + * \param filter the current callback function will be stored here + * \param userdata the pointer that is passed to the current event filter will + * be stored here + * \returns SDL_TRUE on success or SDL_FALSE if there is no event filter set. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetEventFilter */ extern DECLSPEC SDL_bool SDLCALL SDL_GetEventFilter(SDL_EventFilter * filter, void **userdata); /** - * Add a function which is called when an event is added to the queue. + * Add a callback to be triggered when an event is added to the event queue. + * + * `filter` will be called when an event happens, and its return value is + * ignored. + * + * **WARNING**: Be very careful of what you do in the event filter function, + * as it may run in a different thread! + * + * If the quit event is generated by a signal (e.g. SIGINT), it will bypass + * the internal queue and be delivered to the watch callback immediately, and + * arrive at the next event poll. + * + * Note: the callback is called for events posted by the user through + * SDL_PushEvent(), but not for disabled events, nor for events by a filter + * callback set with SDL_SetEventFilter(), nor for events posted by the user + * through SDL_PeepEvents(). + * + * \param filter an SDL_EventFilter function to call when an event happens. + * \param userdata a pointer that is passed to `filter` + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_DelEventWatch + * \sa SDL_SetEventFilter */ extern DECLSPEC void SDLCALL SDL_AddEventWatch(SDL_EventFilter filter, void *userdata); /** - * Remove an event watch function added with SDL_AddEventWatch() + * Remove an event watch callback added with SDL_AddEventWatch(). + * + * This function takes the same input as SDL_AddEventWatch() to identify and + * delete the corresponding callback. + * + * \param filter the function originally passed to SDL_AddEventWatch() + * \param userdata the pointer originally passed to SDL_AddEventWatch() + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AddEventWatch */ extern DECLSPEC void SDLCALL SDL_DelEventWatch(SDL_EventFilter filter, void *userdata); /** - * Run the filter function on the current event queue, removing any - * events for which the filter returns 0. + * Run a specific filter function on the current event queue, removing any + * events for which the filter returns 0. + * + * See SDL_SetEventFilter() for more information. Unlike SDL_SetEventFilter(), + * this function does not change the filter permanently, it only uses the + * supplied filter until this function returns. + * + * \param filter the SDL_EventFilter function to call when an event happens + * \param userdata a pointer that is passed to `filter` + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetEventFilter + * \sa SDL_SetEventFilter */ extern DECLSPEC void SDLCALL SDL_FilterEvents(SDL_EventFilter filter, void *userdata); @@ -759,24 +1082,45 @@ extern DECLSPEC void SDLCALL SDL_FilterEvents(SDL_EventFilter filter, #define SDL_ENABLE 1 /** - * This function allows you to set the state of processing certain events. - * - If \c state is set to ::SDL_IGNORE, that event will be automatically - * dropped from the event queue and will not be filtered. - * - If \c state is set to ::SDL_ENABLE, that event will be processed - * normally. - * - If \c state is set to ::SDL_QUERY, SDL_EventState() will return the - * current processing state of the specified event. + * Set the state of processing events by type. + * + * `state` may be any of the following: + * + * - `SDL_QUERY`: returns the current processing state of the specified event + * - `SDL_IGNORE` (aka `SDL_DISABLE`): the event will automatically be dropped + * from the event queue and will not be filtered + * - `SDL_ENABLE`: the event will be processed normally + * + * \param type the type of event; see SDL_EventType for details + * \param state how to process the event + * \returns `SDL_DISABLE` or `SDL_ENABLE`, representing the processing state + * of the event before this function makes any changes to it. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetEventState */ extern DECLSPEC Uint8 SDLCALL SDL_EventState(Uint32 type, int state); /* @} */ #define SDL_GetEventState(type) SDL_EventState(type, SDL_QUERY) /** - * This function allocates a set of user-defined events, and returns - * the beginning event number for that set of events. + * Allocate a set of user-defined events, and return the beginning event + * number for that set of events. * - * If there aren't enough user-defined events left, this function - * returns (Uint32)-1 + * Calling this function with `numevents` <= 0 is an error and will return + * (Uint32)-1. + * + * Note, (Uint32)-1 means the maximum unsigned 32-bit integer value (or + * 0xFFFFFFFF), but is clearer to write. + * + * \param numevents the number of events to be allocated + * \returns the beginning event number, or (Uint32)-1 if there are not enough + * user-defined events left. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_PushEvent */ extern DECLSPEC Uint32 SDLCALL SDL_RegisterEvents(int numevents); diff --git a/libs/SDL2/include/SDL_filesystem.h b/libs/SDL2/include/SDL_filesystem.h index 6d97e5896..16f02e287 100644 --- a/libs/SDL2/include/SDL_filesystem.h +++ b/libs/SDL2/include/SDL_filesystem.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -38,88 +38,97 @@ extern "C" { #endif /** - * \brief Get the path where the application resides. + * Get the directory where the application was run from. * - * Get the "base path". This is the directory where the application was run - * from, which is probably the installation directory, and may or may not - * be the process's current working directory. + * This is not necessarily a fast call, so you should call this once near + * startup and save the string if you need it. * - * This returns an absolute path in UTF-8 encoding, and is guaranteed to - * end with a path separator ('\\' on Windows, '/' most other places). + * **Mac OS X and iOS Specific Functionality**: If the application is in a + * ".app" bundle, this function returns the Resource directory (e.g. + * MyApp.app/Contents/Resources/). This behaviour can be overridden by adding + * a property to the Info.plist file. Adding a string key with the name + * SDL_FILESYSTEM_BASE_DIR_TYPE with a supported value will change the + * behaviour. * - * The pointer returned by this function is owned by you. Please call - * SDL_free() on the pointer when you are done with it, or it will be a - * memory leak. This is not necessarily a fast call, though, so you should - * call this once near startup and save the string if you need it. + * Supported values for the SDL_FILESYSTEM_BASE_DIR_TYPE property (Given an + * application in /Applications/SDLApp/MyApp.app): * - * Some platforms can't determine the application's path, and on other - * platforms, this might be meaningless. In such cases, this function will - * return NULL. + * - `resource`: bundle resource directory (the default). For example: + * `/Applications/SDLApp/MyApp.app/Contents/Resources` + * - `bundle`: the Bundle directory. For example: + * `/Applications/SDLApp/MyApp.app/` + * - `parent`: the containing directory of the bundle. For example: + * `/Applications/SDLApp/` * - * \return String of base dir in UTF-8 encoding, or NULL on error. + * The returned path is guaranteed to end with a path separator ('\' on + * Windows, '/' on most other platforms). + * + * The pointer returned is owned by the caller. Please call SDL_free() on the + * pointer when done with it. + * + * \returns an absolute path in UTF-8 encoding to the application data + * directory. NULL will be returned on error or when the platform + * doesn't implement this functionality, call SDL_GetError() for more + * information. + * + * \since This function is available since SDL 2.0.1. * * \sa SDL_GetPrefPath */ extern DECLSPEC char *SDLCALL SDL_GetBasePath(void); /** - * \brief Get the user-and-app-specific path where files can be written. + * Get the user-and-app-specific path where files can be written. * * Get the "pref dir". This is meant to be where users can write personal - * files (preferences and save games, etc) that are specific to your - * application. This directory is unique per user, per application. + * files (preferences and save games, etc) that are specific to your + * application. This directory is unique per user, per application. * - * This function will decide the appropriate location in the native filesystem, - * create the directory if necessary, and return a string of the absolute - * path to the directory in UTF-8 encoding. + * This function will decide the appropriate location in the native + * filesystem, create the directory if necessary, and return a string of the + * absolute path to the directory in UTF-8 encoding. * * On Windows, the string might look like: - * "C:\\Users\\bob\\AppData\\Roaming\\My Company\\My Program Name\\" * - * On Linux, the string might look like: - * "/home/bob/.local/share/My Program Name/" + * `C:\\Users\\bob\\AppData\\Roaming\\My Company\\My Program Name\\` + * + * On Linux, the string might look like" + * + * `/home/bob/.local/share/My Program Name/` * * On Mac OS X, the string might look like: - * "/Users/bob/Library/Application Support/My Program Name/" * - * (etc.) + * `/Users/bob/Library/Application Support/My Program Name/` * - * You specify the name of your organization (if it's not a real organization, - * your name or an Internet domain you own might do) and the name of your - * application. These should be untranslated proper names. + * You should assume the path returned by this function is the only safe place + * to write files (and that SDL_GetBasePath(), while it might be writable, or + * even the parent of the returned path, isn't where you should be writing + * things). * - * Both the org and app strings may become part of a directory name, so - * please follow these rules: + * Both the org and app strings may become part of a directory name, so please + * follow these rules: * - * - Try to use the same org string (including case-sensitivity) for - * all your applications that use this function. - * - Always use a unique app string for each one, and make sure it never - * changes for an app once you've decided on it. - * - Unicode characters are legal, as long as it's UTF-8 encoded, but... - * - ...only use letters, numbers, and spaces. Avoid punctuation like - * "Game Name 2: Bad Guy's Revenge!" ... "Game Name 2" is sufficient. + * - Try to use the same org string (_including case-sensitivity_) for all + * your applications that use this function. + * - Always use a unique app string for each one, and make sure it never + * changes for an app once you've decided on it. + * - Unicode characters are legal, as long as it's UTF-8 encoded, but... + * - ...only use letters, numbers, and spaces. Avoid punctuation like "Game + * Name 2: Bad Guy's Revenge!" ... "Game Name 2" is sufficient. * - * This returns an absolute path in UTF-8 encoding, and is guaranteed to - * end with a path separator ('\\' on Windows, '/' most other places). + * The returned path is guaranteed to end with a path separator ('\' on + * Windows, '/' on most other platforms). * - * The pointer returned by this function is owned by you. Please call - * SDL_free() on the pointer when you are done with it, or it will be a - * memory leak. This is not necessarily a fast call, though, so you should - * call this once near startup and save the string if you need it. + * The pointer returned is owned by the caller. Please call SDL_free() on the + * pointer when done with it. * - * You should assume the path returned by this function is the only safe - * place to write files (and that SDL_GetBasePath(), while it might be - * writable, or even the parent of the returned path, aren't where you - * should be writing things). + * \param org the name of your organization + * \param app the name of your application + * \returns a UTF-8 string of the user directory in platform-dependent + * notation. NULL if there's a problem (creating directory failed, + * etc.). * - * Some platforms can't determine the pref path, and on other - * platforms, this might be meaningless. In such cases, this function will - * return NULL. - * - * \param org The name of your organization. - * \param app The name of your application. - * \return UTF-8 string of user dir in platform-dependent notation. NULL - * if there's a problem (creating directory failed, etc). + * \since This function is available since SDL 2.0.1. * * \sa SDL_GetBasePath */ diff --git a/libs/SDL2/include/SDL_gamecontroller.h b/libs/SDL2/include/SDL_gamecontroller.h index ebde38715..bdd9b8993 100644 --- a/libs/SDL2/include/SDL_gamecontroller.h +++ b/libs/SDL2/include/SDL_gamecontroller.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -31,6 +31,7 @@ #include "SDL_stdinc.h" #include "SDL_error.h" #include "SDL_rwops.h" +#include "SDL_sensor.h" #include "SDL_joystick.h" #include "begin_code.h" @@ -57,6 +58,19 @@ extern "C" { struct _SDL_GameController; typedef struct _SDL_GameController SDL_GameController; +typedef enum +{ + SDL_CONTROLLER_TYPE_UNKNOWN = 0, + SDL_CONTROLLER_TYPE_XBOX360, + SDL_CONTROLLER_TYPE_XBOXONE, + SDL_CONTROLLER_TYPE_PS3, + SDL_CONTROLLER_TYPE_PS4, + SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_PRO, + SDL_CONTROLLER_TYPE_VIRTUAL, + SDL_CONTROLLER_TYPE_PS5, + SDL_CONTROLLER_TYPE_AMAZON_LUNA, + SDL_CONTROLLER_TYPE_GOOGLE_STADIA +} SDL_GameControllerType; typedef enum { @@ -87,6 +101,8 @@ typedef struct SDL_GameControllerButtonBind /** * To count the number of game controllers in the system for the following: + * + * ```c * int nJoysticks = SDL_NumJoysticks(); * int nGameControllers = 0; * for (int i = 0; i < nJoysticks; i++) { @@ -94,6 +110,7 @@ typedef struct SDL_GameControllerButtonBind * nGameControllers++; * } * } + * ``` * * Using the SDL_HINT_GAMECONTROLLERCONFIG hint or the SDL_GameControllerAddMapping() you can add support for controllers SDL is unaware of or cause an existing controller to have a different binding. The format is: * guid,name,mappings @@ -107,17 +124,39 @@ typedef struct SDL_GameControllerButtonBind * Buttons can be used as a controller axis and vice versa. * * This string shows an example of a valid mapping for a controller - * "03000000341a00003608000000000000,PS3 Controller,a:b1,b:b2,y:b3,x:b0,start:b9,guide:b12,back:b8,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftshoulder:b4,rightshoulder:b5,leftstick:b10,rightstick:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7", * + * ```c + * "03000000341a00003608000000000000,PS3 Controller,a:b1,b:b2,y:b3,x:b0,start:b9,guide:b12,back:b8,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftshoulder:b4,rightshoulder:b5,leftstick:b10,rightstick:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7", + * ``` */ /** - * Load a set of mappings from a seekable SDL data stream (memory or file), filtered by the current SDL_GetPlatform() - * A community sourced database of controllers is available at https://raw.github.com/gabomdq/SDL_GameControllerDB/master/gamecontrollerdb.txt + * Load a set of Game Controller mappings from a seekable SDL data stream. * - * If \c freerw is non-zero, the stream will be closed after being read. - * - * \return number of mappings added, -1 on error + * You can call this function several times, if needed, to load different + * database files. + * + * If a new mapping is loaded for an already known controller GUID, the later + * version will overwrite the one currently loaded. + * + * Mappings not belonging to the current platform or with no platform field + * specified will be ignored (i.e. mappings for Linux will be ignored in + * Windows, etc). + * + * This function will load the text database entirely in memory before + * processing it, so take this into consideration if you are in a memory + * constrained environment. + * + * \param rw the data stream for the mappings to be added + * \param freerw non-zero to close the stream after being read + * \returns the number of mappings added or -1 on error; call SDL_GetError() + * for more information. + * + * \since This function is available since SDL 2.0.2. + * + * \sa SDL_GameControllerAddMapping + * \sa SDL_GameControllerAddMappingsFromFile + * \sa SDL_GameControllerMappingForGUID */ extern DECLSPEC int SDLCALL SDL_GameControllerAddMappingsFromRW(SDL_RWops * rw, int freerw); @@ -129,133 +168,372 @@ extern DECLSPEC int SDLCALL SDL_GameControllerAddMappingsFromRW(SDL_RWops * rw, #define SDL_GameControllerAddMappingsFromFile(file) SDL_GameControllerAddMappingsFromRW(SDL_RWFromFile(file, "rb"), 1) /** - * Add or update an existing mapping configuration + * Add support for controllers that SDL is unaware of or to cause an existing + * controller to have a different binding. * - * \return 1 if mapping is added, 0 if updated, -1 on error + * The mapping string has the format "GUID,name,mapping", where GUID is the + * string value from SDL_JoystickGetGUIDString(), name is the human readable + * string for the device and mappings are controller mappings to joystick + * ones. Under Windows there is a reserved GUID of "xinput" that covers all + * XInput devices. The mapping format for joystick is: {| |bX |a joystick + * button, index X |- |hX.Y |hat X with value Y |- |aX |axis X of the joystick + * |} Buttons can be used as a controller axes and vice versa. + * + * This string shows an example of a valid mapping for a controller: + * + * ```c + * "341a3608000000000000504944564944,Afterglow PS3 Controller,a:b1,b:b2,y:b3,x:b0,start:b9,guide:b12,back:b8,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftshoulder:b4,rightshoulder:b5,leftstick:b10,rightstick:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7" + * ``` + * + * \param mappingString the mapping string + * \returns 1 if a new mapping is added, 0 if an existing mapping is updated, + * -1 on error; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerMapping + * \sa SDL_GameControllerMappingForGUID */ extern DECLSPEC int SDLCALL SDL_GameControllerAddMapping(const char* mappingString); /** - * Get the number of mappings installed + * Get the number of mappings installed. * - * \return the number of mappings + * \returns the number of mappings. + * + * \since This function is available since SDL 2.0.6. */ extern DECLSPEC int SDLCALL SDL_GameControllerNumMappings(void); /** - * Get the mapping at a particular index. + * Get the mapping at a particular index. * - * \return the mapping string. Must be freed with SDL_free(). Returns NULL if the index is out of range. + * \returns the mapping string. Must be freed with SDL_free(). Returns NULL if + * the index is out of range. + * + * \since This function is available since SDL 2.0.6. */ extern DECLSPEC char * SDLCALL SDL_GameControllerMappingForIndex(int mapping_index); /** - * Get a mapping string for a GUID + * Get the game controller mapping string for a given GUID. * - * \return the mapping string. Must be freed with SDL_free(). Returns NULL if no mapping is available + * The returned string must be freed with SDL_free(). + * + * \param guid a structure containing the GUID for which a mapping is desired + * \returns a mapping string or NULL on error; call SDL_GetError() for more + * information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickGetDeviceGUID + * \sa SDL_JoystickGetGUID */ extern DECLSPEC char * SDLCALL SDL_GameControllerMappingForGUID(SDL_JoystickGUID guid); /** - * Get a mapping string for an open GameController + * Get the current mapping of a Game Controller. * - * \return the mapping string. Must be freed with SDL_free(). Returns NULL if no mapping is available + * The returned string must be freed with SDL_free(). + * + * Details about mappings are discussed with SDL_GameControllerAddMapping(). + * + * \param gamecontroller the game controller you want to get the current + * mapping for + * \returns a string that has the controller's mapping or NULL if no mapping + * is available; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerAddMapping + * \sa SDL_GameControllerMappingForGUID */ -extern DECLSPEC char * SDLCALL SDL_GameControllerMapping(SDL_GameController * gamecontroller); +extern DECLSPEC char * SDLCALL SDL_GameControllerMapping(SDL_GameController *gamecontroller); /** - * Is the joystick on this index supported by the game controller interface? + * Check if the given joystick is supported by the game controller interface. + * + * `joystick_index` is the same as the `device_index` passed to + * SDL_JoystickOpen(). + * + * \param joystick_index the device_index of a device, up to + * SDL_NumJoysticks() + * \returns SDL_TRUE if the given joystick is supported by the game controller + * interface, SDL_FALSE if it isn't or it's an invalid index. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerNameForIndex + * \sa SDL_GameControllerOpen */ extern DECLSPEC SDL_bool SDLCALL SDL_IsGameController(int joystick_index); /** - * Get the implementation dependent name of a game controller. - * This can be called before any controllers are opened. - * If no name can be found, this function returns NULL. + * Get the implementation dependent name for the game controller. + * + * This function can be called before any controllers are opened. + * + * `joystick_index` is the same as the `device_index` passed to + * SDL_JoystickOpen(). + * + * \param joystick_index the device_index of a device, from zero to + * SDL_NumJoysticks()-1 + * \returns the implementation-dependent name for the game controller, or NULL + * if there is no name or the index is invalid. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerName + * \sa SDL_GameControllerOpen + * \sa SDL_IsGameController */ extern DECLSPEC const char *SDLCALL SDL_GameControllerNameForIndex(int joystick_index); /** - * Get the mapping of a game controller. - * This can be called before any controllers are opened. + * Get the type of a game controller. * - * \return the mapping string. Must be freed with SDL_free(). Returns NULL if no mapping is available + * This can be called before any controllers are opened. + * + * \param joystick_index the device_index of a device, from zero to + * SDL_NumJoysticks()-1 + * \returns the controller type. + * + * \since This function is available since SDL 2.0.12. + */ +extern DECLSPEC SDL_GameControllerType SDLCALL SDL_GameControllerTypeForIndex(int joystick_index); + +/** + * Get the mapping of a game controller. + * + * This can be called before any controllers are opened. + * + * \param joystick_index the device_index of a device, from zero to + * SDL_NumJoysticks()-1 + * \returns the mapping string. Must be freed with SDL_free(). Returns NULL if + * no mapping is available. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC char *SDLCALL SDL_GameControllerMappingForDeviceIndex(int joystick_index); /** - * Open a game controller for use. - * The index passed as an argument refers to the N'th game controller on the system. - * This index is not the value which will identify this controller in future - * controller events. The joystick's instance id (::SDL_JoystickID) will be - * used there instead. + * Open a game controller for use. * - * \return A controller identifier, or NULL if an error occurred. + * `joystick_index` is the same as the `device_index` passed to + * SDL_JoystickOpen(). + * + * The index passed as an argument refers to the N'th game controller on the + * system. This index is not the value which will identify this controller in + * future controller events. The joystick's instance id (SDL_JoystickID) will + * be used there instead. + * + * \param joystick_index the device_index of a device, up to + * SDL_NumJoysticks() + * \returns a gamecontroller identifier or NULL if an error occurred; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerClose + * \sa SDL_GameControllerNameForIndex + * \sa SDL_IsGameController */ extern DECLSPEC SDL_GameController *SDLCALL SDL_GameControllerOpen(int joystick_index); /** - * Return the SDL_GameController associated with an instance id. + * Get the SDL_GameController associated with an instance id. + * + * \param joyid the instance id to get the SDL_GameController for + * \returns an SDL_GameController on success or NULL on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.4. */ extern DECLSPEC SDL_GameController *SDLCALL SDL_GameControllerFromInstanceID(SDL_JoystickID joyid); /** - * Return the name for this currently opened controller + * Get the SDL_GameController associated with a player index. + * + * Please note that the player index is _not_ the device index, nor is it the + * instance id! + * + * \param player_index the player index, which is not the device index or the + * instance id! + * \returns the SDL_GameController associated with a player index. + * + * \since This function is available since SDL 2.0.12. + * + * \sa SDL_GameControllerGetPlayerIndex + * \sa SDL_GameControllerSetPlayerIndex + */ +extern DECLSPEC SDL_GameController *SDLCALL SDL_GameControllerFromPlayerIndex(int player_index); + +/** + * Get the implementation-dependent name for an opened game controller. + * + * This is the same name as returned by SDL_GameControllerNameForIndex(), but + * it takes a controller identifier instead of the (unstable) device index. + * + * \param gamecontroller a game controller identifier previously returned by + * SDL_GameControllerOpen() + * \returns the implementation dependent name for the game controller, or NULL + * if there is no name or the identifier passed is invalid. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerNameForIndex + * \sa SDL_GameControllerOpen */ extern DECLSPEC const char *SDLCALL SDL_GameControllerName(SDL_GameController *gamecontroller); /** - * Get the player index of an opened game controller, or -1 if it's not available + * Get the type of this currently opened controller * - * For XInput controllers this returns the XInput user index. + * This is the same name as returned by SDL_GameControllerTypeForIndex(), but + * it takes a controller identifier instead of the (unstable) device index. + * + * \param gamecontroller the game controller object to query. + * \returns the controller type. + * + * \since This function is available since SDL 2.0.12. + */ +extern DECLSPEC SDL_GameControllerType SDLCALL SDL_GameControllerGetType(SDL_GameController *gamecontroller); + +/** + * Get the player index of an opened game controller. + * + * For XInput controllers this returns the XInput user index. + * + * \param gamecontroller the game controller object to query. + * \returns the player index for controller, or -1 if it's not available. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC int SDLCALL SDL_GameControllerGetPlayerIndex(SDL_GameController *gamecontroller); /** - * Get the USB vendor ID of an opened controller, if available. - * If the vendor ID isn't available this function returns 0. + * Set the player index of an opened game controller. + * + * \param gamecontroller the game controller object to adjust. + * \param player_index Player index to assign to this controller. + * + * \since This function is available since SDL 2.0.12. */ -extern DECLSPEC Uint16 SDLCALL SDL_GameControllerGetVendor(SDL_GameController * gamecontroller); +extern DECLSPEC void SDLCALL SDL_GameControllerSetPlayerIndex(SDL_GameController *gamecontroller, int player_index); /** - * Get the USB product ID of an opened controller, if available. - * If the product ID isn't available this function returns 0. + * Get the USB vendor ID of an opened controller, if available. + * + * If the vendor ID isn't available this function returns 0. + * + * \param gamecontroller the game controller object to query. + * \return the USB vendor ID, or zero if unavailable. + * + * \since This function is available since SDL 2.0.6. */ -extern DECLSPEC Uint16 SDLCALL SDL_GameControllerGetProduct(SDL_GameController * gamecontroller); +extern DECLSPEC Uint16 SDLCALL SDL_GameControllerGetVendor(SDL_GameController *gamecontroller); /** - * Get the product version of an opened controller, if available. - * If the product version isn't available this function returns 0. + * Get the USB product ID of an opened controller, if available. + * + * If the product ID isn't available this function returns 0. + * + * \param gamecontroller the game controller object to query. + * \return the USB product ID, or zero if unavailable. + * + * \since This function is available since SDL 2.0.6. */ -extern DECLSPEC Uint16 SDLCALL SDL_GameControllerGetProductVersion(SDL_GameController * gamecontroller); +extern DECLSPEC Uint16 SDLCALL SDL_GameControllerGetProduct(SDL_GameController *gamecontroller); /** - * Returns SDL_TRUE if the controller has been opened and currently connected, - * or SDL_FALSE if it has not. + * Get the product version of an opened controller, if available. + * + * If the product version isn't available this function returns 0. + * + * \param gamecontroller the game controller object to query. + * \return the USB product version, or zero if unavailable. + * + * \since This function is available since SDL 2.0.6. + */ +extern DECLSPEC Uint16 SDLCALL SDL_GameControllerGetProductVersion(SDL_GameController *gamecontroller); + +/** + * Get the serial number of an opened controller, if available. + * + * Returns the serial number of the controller, or NULL if it is not + * available. + * + * \param gamecontroller the game controller object to query. + * \return the serial number, or NULL if unavailable. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC const char * SDLCALL SDL_GameControllerGetSerial(SDL_GameController *gamecontroller); + +/** + * Check if a controller has been opened and is currently connected. + * + * \param gamecontroller a game controller identifier previously returned by + * SDL_GameControllerOpen() + * \returns SDL_TRUE if the controller has been opened and is currently + * connected, or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerClose + * \sa SDL_GameControllerOpen */ extern DECLSPEC SDL_bool SDLCALL SDL_GameControllerGetAttached(SDL_GameController *gamecontroller); /** - * Get the underlying joystick object used by a controller + * Get the Joystick ID from a Game Controller. + * + * This function will give you a SDL_Joystick object, which allows you to use + * the SDL_Joystick functions with a SDL_GameController object. This would be + * useful for getting a joystick's position at any given time, even if it + * hasn't moved (moving it would produce an event, which would have the axis' + * value). + * + * The pointer returned is owned by the SDL_GameController. You should not + * call SDL_JoystickClose() on it, for example, since doing so will likely + * cause SDL to crash. + * + * \param gamecontroller the game controller object that you want to get a + * joystick from + * \returns a SDL_Joystick object; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC SDL_Joystick *SDLCALL SDL_GameControllerGetJoystick(SDL_GameController *gamecontroller); /** - * Enable/disable controller event polling. + * Query or change current state of Game Controller events. * - * If controller events are disabled, you must call SDL_GameControllerUpdate() - * yourself and check the state of the controller when you want controller - * information. + * If controller events are disabled, you must call SDL_GameControllerUpdate() + * yourself and check the state of the controller when you want controller + * information. * - * The state can be one of ::SDL_QUERY, ::SDL_ENABLE or ::SDL_IGNORE. + * Any number can be passed to SDL_GameControllerEventState(), but only -1, 0, + * and 1 will have any effect. Other numbers will just be returned. + * + * \param state can be one of `SDL_QUERY`, `SDL_IGNORE`, or `SDL_ENABLE` + * \returns the same value passed to the function, with exception to -1 + * (SDL_QUERY), which will return the current state. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickEventState */ extern DECLSPEC int SDLCALL SDL_GameControllerEventState(int state); /** - * Update the current state of the open game controllers. + * Manually pump game controller updates if not using the loop. * - * This is called automatically by the event loop if any game controller - * events are enabled. + * This function is called automatically by the event loop if events are + * enabled. Under such circumstances, it will not be necessary to call this + * function. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC void SDLCALL SDL_GameControllerUpdate(void); @@ -282,33 +560,94 @@ typedef enum } SDL_GameControllerAxis; /** - * turn this string into a axis mapping + * Convert a string into SDL_GameControllerAxis enum. + * + * This function is called internally to translate SDL_GameController mapping + * strings for the underlying joystick device into the consistent + * SDL_GameController mapping. You do not normally need to call this function + * unless you are parsing SDL_GameController mappings in your own code. + * + * Note specially that "righttrigger" and "lefttrigger" map to + * `SDL_CONTROLLER_AXIS_TRIGGERRIGHT` and `SDL_CONTROLLER_AXIS_TRIGGERLEFT`, + * respectively. + * + * \param str string representing a SDL_GameController axis + * \returns the SDL_GameControllerAxis enum corresponding to the input string, + * or `SDL_CONTROLLER_AXIS_INVALID` if no match was found. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerGetStringForAxis */ -extern DECLSPEC SDL_GameControllerAxis SDLCALL SDL_GameControllerGetAxisFromString(const char *pchString); +extern DECLSPEC SDL_GameControllerAxis SDLCALL SDL_GameControllerGetAxisFromString(const char *str); /** - * turn this axis enum into a string mapping + * Convert from an SDL_GameControllerAxis enum to a string. + * + * The caller should not SDL_free() the returned string. + * + * \param axis an enum value for a given SDL_GameControllerAxis + * \returns a string for the given axis, or NULL if an invalid axis is + * specified. The string returned is of the format used by + * SDL_GameController mapping strings. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerGetAxisFromString */ extern DECLSPEC const char* SDLCALL SDL_GameControllerGetStringForAxis(SDL_GameControllerAxis axis); /** - * Get the SDL joystick layer binding for this controller button mapping + * Get the SDL joystick layer binding for a controller axis mapping. + * + * \param gamecontroller a game controller + * \param axis an axis enum value (one of the SDL_GameControllerAxis values) + * \returns a SDL_GameControllerButtonBind describing the bind. On failure + * (like the given Controller axis doesn't exist on the device), its + * `.bindType` will be `SDL_CONTROLLER_BINDTYPE_NONE`. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerGetBindForButton */ extern DECLSPEC SDL_GameControllerButtonBind SDLCALL SDL_GameControllerGetBindForAxis(SDL_GameController *gamecontroller, SDL_GameControllerAxis axis); /** - * Get the current state of an axis control on a game controller. + * Query whether a game controller has a given axis. * - * The state is a value ranging from -32768 to 32767 (except for the triggers, - * which range from 0 to 32767). + * This merely reports whether the controller's mapping defined this axis, as + * that is all the information SDL has about the physical device. * - * The axis indices start at index 0. + * \param gamecontroller a game controller + * \param axis an axis enum value (an SDL_GameControllerAxis value) + * \returns SDL_TRUE if the controller has this axis, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC SDL_bool SDLCALL +SDL_GameControllerHasAxis(SDL_GameController *gamecontroller, SDL_GameControllerAxis axis); + +/** + * Get the current state of an axis control on a game controller. + * + * The axis indices start at index 0. + * + * The state is a value ranging from -32768 to 32767. Triggers, however, range + * from 0 to 32767 (they never return a negative value). + * + * \param gamecontroller a game controller + * \param axis an axis index (one of the SDL_GameControllerAxis values) + * \returns axis state (including 0) on success or 0 (also) on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerGetButton */ extern DECLSPEC Sint16 SDLCALL -SDL_GameControllerGetAxis(SDL_GameController *gamecontroller, - SDL_GameControllerAxis axis); +SDL_GameControllerGetAxis(SDL_GameController *gamecontroller, SDL_GameControllerAxis axis); /** * The list of buttons available from a controller @@ -331,53 +670,325 @@ typedef enum SDL_CONTROLLER_BUTTON_DPAD_DOWN, SDL_CONTROLLER_BUTTON_DPAD_LEFT, SDL_CONTROLLER_BUTTON_DPAD_RIGHT, + SDL_CONTROLLER_BUTTON_MISC1, /* Xbox Series X share button, PS5 microphone button, Nintendo Switch Pro capture button, Amazon Luna microphone button */ + SDL_CONTROLLER_BUTTON_PADDLE1, /* Xbox Elite paddle P1 */ + SDL_CONTROLLER_BUTTON_PADDLE2, /* Xbox Elite paddle P3 */ + SDL_CONTROLLER_BUTTON_PADDLE3, /* Xbox Elite paddle P2 */ + SDL_CONTROLLER_BUTTON_PADDLE4, /* Xbox Elite paddle P4 */ + SDL_CONTROLLER_BUTTON_TOUCHPAD, /* PS4/PS5 touchpad button */ SDL_CONTROLLER_BUTTON_MAX } SDL_GameControllerButton; /** - * turn this string into a button mapping + * Convert a string into an SDL_GameControllerButton enum. + * + * This function is called internally to translate SDL_GameController mapping + * strings for the underlying joystick device into the consistent + * SDL_GameController mapping. You do not normally need to call this function + * unless you are parsing SDL_GameController mappings in your own code. + * + * \param str string representing a SDL_GameController axis + * \returns the SDL_GameControllerButton enum corresponding to the input + * string, or `SDL_CONTROLLER_AXIS_INVALID` if no match was found. + * + * \since This function is available since SDL 2.0.0. */ -extern DECLSPEC SDL_GameControllerButton SDLCALL SDL_GameControllerGetButtonFromString(const char *pchString); +extern DECLSPEC SDL_GameControllerButton SDLCALL SDL_GameControllerGetButtonFromString(const char *str); /** - * turn this button enum into a string mapping + * Convert from an SDL_GameControllerButton enum to a string. + * + * The caller should not SDL_free() the returned string. + * + * \param button an enum value for a given SDL_GameControllerButton + * \returns a string for the given button, or NULL if an invalid axis is + * specified. The string returned is of the format used by + * SDL_GameController mapping strings. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerGetButtonFromString */ extern DECLSPEC const char* SDLCALL SDL_GameControllerGetStringForButton(SDL_GameControllerButton button); /** - * Get the SDL joystick layer binding for this controller button mapping + * Get the SDL joystick layer binding for a controller button mapping. + * + * \param gamecontroller a game controller + * \param button an button enum value (an SDL_GameControllerButton value) + * \returns a SDL_GameControllerButtonBind describing the bind. On failure + * (like the given Controller button doesn't exist on the device), + * its `.bindType` will be `SDL_CONTROLLER_BINDTYPE_NONE`. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerGetBindForAxis */ extern DECLSPEC SDL_GameControllerButtonBind SDLCALL SDL_GameControllerGetBindForButton(SDL_GameController *gamecontroller, SDL_GameControllerButton button); +/** + * Query whether a game controller has a given button. + * + * This merely reports whether the controller's mapping defined this button, + * as that is all the information SDL has about the physical device. + * + * \param gamecontroller a game controller + * \param button a button enum value (an SDL_GameControllerButton value) + * \returns SDL_TRUE if the controller has this button, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC SDL_bool SDLCALL SDL_GameControllerHasButton(SDL_GameController *gamecontroller, + SDL_GameControllerButton button); /** - * Get the current state of a button on a game controller. + * Get the current state of a button on a game controller. * - * The button indices start at index 0. + * \param gamecontroller a game controller + * \param button a button index (one of the SDL_GameControllerButton values) + * \returns 1 for pressed state or 0 for not pressed state or error; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerGetAxis */ extern DECLSPEC Uint8 SDLCALL SDL_GameControllerGetButton(SDL_GameController *gamecontroller, SDL_GameControllerButton button); /** - * Trigger a rumble effect - * Each call to this function cancels any previous rumble effect, and calling it with 0 intensity stops any rumbling. + * Get the number of touchpads on a game controller. * - * \param gamecontroller The controller to vibrate - * \param low_frequency_rumble The intensity of the low frequency (left) rumble motor, from 0 to 0xFFFF - * \param high_frequency_rumble The intensity of the high frequency (right) rumble motor, from 0 to 0xFFFF - * \param duration_ms The duration of the rumble effect, in milliseconds + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC int SDLCALL SDL_GameControllerGetNumTouchpads(SDL_GameController *gamecontroller); + +/** + * Get the number of supported simultaneous fingers on a touchpad on a game + * controller. * - * \return 0, or -1 if rumble isn't supported on this joystick + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC int SDLCALL SDL_GameControllerGetNumTouchpadFingers(SDL_GameController *gamecontroller, int touchpad); + +/** + * Get the current state of a finger on a touchpad on a game controller. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC int SDLCALL SDL_GameControllerGetTouchpadFinger(SDL_GameController *gamecontroller, int touchpad, int finger, Uint8 *state, float *x, float *y, float *pressure); + +/** + * Return whether a game controller has a particular sensor. + * + * \param gamecontroller The controller to query + * \param type The type of sensor to query + * \returns SDL_TRUE if the sensor exists, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC SDL_bool SDLCALL SDL_GameControllerHasSensor(SDL_GameController *gamecontroller, SDL_SensorType type); + +/** + * Set whether data reporting for a game controller sensor is enabled. + * + * \param gamecontroller The controller to update + * \param type The type of sensor to enable/disable + * \param enabled Whether data reporting should be enabled + * \returns 0 or -1 if an error occurred. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC int SDLCALL SDL_GameControllerSetSensorEnabled(SDL_GameController *gamecontroller, SDL_SensorType type, SDL_bool enabled); + +/** + * Query whether sensor data reporting is enabled for a game controller. + * + * \param gamecontroller The controller to query + * \param type The type of sensor to query + * \returns SDL_TRUE if the sensor is enabled, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC SDL_bool SDLCALL SDL_GameControllerIsSensorEnabled(SDL_GameController *gamecontroller, SDL_SensorType type); + +/** + * Get the data rate (number of events per second) of a game controller + * sensor. + * + * \param gamecontroller The controller to query + * \param type The type of sensor to query + * \return the data rate, or 0.0f if the data rate is not available. + * + * \since This function is available since SDL 2.0.16. + */ +extern DECLSPEC float SDLCALL SDL_GameControllerGetSensorDataRate(SDL_GameController *gamecontroller, SDL_SensorType type); + +/** + * Get the current state of a game controller sensor. + * + * The number of values and interpretation of the data is sensor dependent. + * See SDL_sensor.h for the details for each type of sensor. + * + * \param gamecontroller The controller to query + * \param type The type of sensor to query + * \param data A pointer filled with the current sensor state + * \param num_values The number of values to write to data + * \return 0 or -1 if an error occurred. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC int SDLCALL SDL_GameControllerGetSensorData(SDL_GameController *gamecontroller, SDL_SensorType type, float *data, int num_values); + +/** + * Start a rumble effect on a game controller. + * + * Each call to this function cancels any previous rumble effect, and calling + * it with 0 intensity stops any rumbling. + * + * \param gamecontroller The controller to vibrate + * \param low_frequency_rumble The intensity of the low frequency (left) + * rumble motor, from 0 to 0xFFFF + * \param high_frequency_rumble The intensity of the high frequency (right) + * rumble motor, from 0 to 0xFFFF + * \param duration_ms The duration of the rumble effect, in milliseconds + * \returns 0, or -1 if rumble isn't supported on this controller + * + * \since This function is available since SDL 2.0.9. + * + * \sa SDL_GameControllerHasRumble */ extern DECLSPEC int SDLCALL SDL_GameControllerRumble(SDL_GameController *gamecontroller, Uint16 low_frequency_rumble, Uint16 high_frequency_rumble, Uint32 duration_ms); /** - * Close a controller previously opened with SDL_GameControllerOpen(). + * Start a rumble effect in the game controller's triggers. + * + * Each call to this function cancels any previous trigger rumble effect, and + * calling it with 0 intensity stops any rumbling. + * + * Note that this is rumbling of the _triggers_ and not the game controller as + * a whole. The first controller to offer this feature was the PlayStation 5's + * DualShock 5. + * + * \param gamecontroller The controller to vibrate + * \param left_rumble The intensity of the left trigger rumble motor, from 0 + * to 0xFFFF + * \param right_rumble The intensity of the right trigger rumble motor, from 0 + * to 0xFFFF + * \param duration_ms The duration of the rumble effect, in milliseconds + * \returns 0, or -1 if trigger rumble isn't supported on this controller + * + * \since This function is available since SDL 2.0.14. + * + * \sa SDL_GameControllerHasRumbleTriggers + */ +extern DECLSPEC int SDLCALL SDL_GameControllerRumbleTriggers(SDL_GameController *gamecontroller, Uint16 left_rumble, Uint16 right_rumble, Uint32 duration_ms); + +/** + * Query whether a game controller has an LED. + * + * \param gamecontroller The controller to query + * \returns SDL_TRUE, or SDL_FALSE if this controller does not have a + * modifiable LED + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC SDL_bool SDLCALL SDL_GameControllerHasLED(SDL_GameController *gamecontroller); + +/** + * Query whether a game controller has rumble support. + * + * \param gamecontroller The controller to query + * \returns SDL_TRUE, or SDL_FALSE if this controller does not have rumble + * support + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_GameControllerRumble + */ +extern DECLSPEC SDL_bool SDLCALL SDL_GameControllerHasRumble(SDL_GameController *gamecontroller); + +/** + * Query whether a game controller has rumble support on triggers. + * + * \param gamecontroller The controller to query + * \returns SDL_TRUE, or SDL_FALSE if this controller does not have trigger + * rumble support + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_GameControllerRumbleTriggers + */ +extern DECLSPEC SDL_bool SDLCALL SDL_GameControllerHasRumbleTriggers(SDL_GameController *gamecontroller); + +/** + * Update a game controller's LED color. + * + * \param gamecontroller The controller to update + * \param red The intensity of the red LED + * \param green The intensity of the green LED + * \param blue The intensity of the blue LED + * \returns 0, or -1 if this controller does not have a modifiable LED + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC int SDLCALL SDL_GameControllerSetLED(SDL_GameController *gamecontroller, Uint8 red, Uint8 green, Uint8 blue); + +/** + * Send a controller specific effect packet + * + * \param gamecontroller The controller to affect + * \param data The data to send to the controller + * \param size The size of the data to send to the controller + * \returns 0, or -1 if this controller or driver doesn't support effect + * packets + * + * \since This function is available since SDL 2.0.16. + */ +extern DECLSPEC int SDLCALL SDL_GameControllerSendEffect(SDL_GameController *gamecontroller, const void *data, int size); + +/** + * Close a game controller previously opened with SDL_GameControllerOpen(). + * + * \param gamecontroller a game controller identifier previously returned by + * SDL_GameControllerOpen() + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerOpen */ extern DECLSPEC void SDLCALL SDL_GameControllerClose(SDL_GameController *gamecontroller); +/** + * Return the sfSymbolsName for a given button on a game controller on Apple + * platforms. + * + * \param gamecontroller the controller to query + * \param button a button on the game controller + * \returns the sfSymbolsName or NULL if the name can't be found + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_GameControllerGetAppleSFSymbolsNameForAxis + */ +extern DECLSPEC const char* SDLCALL SDL_GameControllerGetAppleSFSymbolsNameForButton(SDL_GameController *gamecontroller, SDL_GameControllerButton button); + +/** + * Return the sfSymbolsName for a given axis on a game controller on Apple + * platforms. + * + * \param gamecontroller the controller to query + * \param axis an axis on the game controller + * \returns the sfSymbolsName or NULL if the name can't be found + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_GameControllerGetAppleSFSymbolsNameForButton + */ +extern DECLSPEC const char* SDLCALL SDL_GameControllerGetAppleSFSymbolsNameForAxis(SDL_GameController *gamecontroller, SDL_GameControllerAxis axis); + /* Ends C function definitions when using C++ */ #ifdef __cplusplus diff --git a/libs/SDL2/include/SDL_gesture.h b/libs/SDL2/include/SDL_gesture.h index 9d25e9c1d..e2caea2a9 100644 --- a/libs/SDL2/include/SDL_gesture.h +++ b/libs/SDL2/include/SDL_gesture.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -46,36 +46,66 @@ typedef Sint64 SDL_GestureID; /* Function prototypes */ /** - * \brief Begin Recording a gesture on the specified touch, or all touches (-1) + * Begin recording a gesture on a specified touch device or all touch devices. * + * If the parameter `touchId` is -1 (i.e., all devices), this function will + * always return 1, regardless of whether there actually are any devices. * + * \param touchId the touch device id, or -1 for all touch devices + * \returns 1 on success or 0 if the specified device could not be found. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetTouchDevice */ extern DECLSPEC int SDLCALL SDL_RecordGesture(SDL_TouchID touchId); /** - * \brief Save all currently loaded Dollar Gesture templates + * Save all currently loaded Dollar Gesture templates. * + * \param dst a SDL_RWops to save to + * \returns the number of saved templates on success or 0 on failure; call + * SDL_GetError() for more information. * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LoadDollarTemplates + * \sa SDL_SaveDollarTemplate */ extern DECLSPEC int SDLCALL SDL_SaveAllDollarTemplates(SDL_RWops *dst); /** - * \brief Save a currently loaded Dollar Gesture template + * Save a currently loaded Dollar Gesture template. * + * \param gestureId a gesture id + * \param dst a SDL_RWops to save to + * \returns 1 on success or 0 on failure; call SDL_GetError() for more + * information. * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LoadDollarTemplates + * \sa SDL_SaveAllDollarTemplates */ extern DECLSPEC int SDLCALL SDL_SaveDollarTemplate(SDL_GestureID gestureId,SDL_RWops *dst); /** - * \brief Load Dollar Gesture templates from a file + * Load Dollar Gesture templates from a file. * + * \param touchId a touch id + * \param src a SDL_RWops to load from + * \returns the number of loaded templates on success or a negative error code + * (or 0) on failure; call SDL_GetError() for more information. * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SaveAllDollarTemplates + * \sa SDL_SaveDollarTemplate */ extern DECLSPEC int SDLCALL SDL_LoadDollarTemplates(SDL_TouchID touchId, SDL_RWops *src); - /* Ends C function definitions when using C++ */ #ifdef __cplusplus } diff --git a/libs/SDL2/include/SDL_haptic.h b/libs/SDL2/include/SDL_haptic.h index 075627685..f240ae927 100644 --- a/libs/SDL2/include/SDL_haptic.h +++ b/libs/SDL2/include/SDL_haptic.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -76,7 +76,7 @@ * } * * // Create the effect - * memset( &effect, 0, sizeof(SDL_HapticEffect) ); // 0 is safe default + * SDL_memset( &effect, 0, sizeof(SDL_HapticEffect) ); // 0 is safe default * effect.type = SDL_HAPTIC_SINE; * effect.periodic.direction.type = SDL_HAPTIC_POLAR; // Polar coordinates * effect.periodic.direction.dir[0] = 18000; // Force comes from south @@ -336,6 +336,14 @@ typedef struct _SDL_Haptic SDL_Haptic; */ #define SDL_HAPTIC_SPHERICAL 2 +/** + * \brief Use this value to play an effect on the steering wheel axis. This + * provides better compatibility across platforms and devices as SDL will guess + * the correct axis. + * \sa SDL_HapticDirection + */ +#define SDL_HAPTIC_STEERING_AXIS 3 + /* @} *//* Direction encodings */ /* @} *//* Haptic features */ @@ -444,6 +452,7 @@ typedef struct _SDL_Haptic SDL_Haptic; * \sa SDL_HAPTIC_POLAR * \sa SDL_HAPTIC_CARTESIAN * \sa SDL_HAPTIC_SPHERICAL + * \sa SDL_HAPTIC_STEERING_AXIS * \sa SDL_HapticEffect * \sa SDL_HapticNumAxes */ @@ -811,419 +820,513 @@ typedef union SDL_HapticEffect /* Function prototypes */ + /** - * \brief Count the number of haptic devices attached to the system. + * Count the number of haptic devices attached to the system. * - * \return Number of haptic devices detected on the system. + * \returns the number of haptic devices detected on the system or a negative + * error code on failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticName */ extern DECLSPEC int SDLCALL SDL_NumHaptics(void); /** - * \brief Get the implementation dependent name of a haptic device. + * Get the implementation dependent name of a haptic device. * - * This can be called before any joysticks are opened. - * If no name can be found, this function returns NULL. + * This can be called before any joysticks are opened. If no name can be + * found, this function returns NULL. * - * \param device_index Index of the device to get its name. - * \return Name of the device or NULL on error. + * \param device_index index of the device to query. + * \returns the name of the device or NULL on failure; call SDL_GetError() for + * more information. * - * \sa SDL_NumHaptics + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_NumHaptics */ extern DECLSPEC const char *SDLCALL SDL_HapticName(int device_index); /** - * \brief Opens a haptic device for use. + * Open a haptic device for use. * - * The index passed as an argument refers to the N'th haptic device on this - * system. + * The index passed as an argument refers to the N'th haptic device on this + * system. * - * When opening a haptic device, its gain will be set to maximum and - * autocenter will be disabled. To modify these values use - * SDL_HapticSetGain() and SDL_HapticSetAutocenter(). + * When opening a haptic device, its gain will be set to maximum and + * autocenter will be disabled. To modify these values use SDL_HapticSetGain() + * and SDL_HapticSetAutocenter(). * - * \param device_index Index of the device to open. - * \return Device identifier or NULL on error. + * \param device_index index of the device to open + * \returns the device identifier or NULL on failure; call SDL_GetError() for + * more information. * - * \sa SDL_HapticIndex - * \sa SDL_HapticOpenFromMouse - * \sa SDL_HapticOpenFromJoystick - * \sa SDL_HapticClose - * \sa SDL_HapticSetGain - * \sa SDL_HapticSetAutocenter - * \sa SDL_HapticPause - * \sa SDL_HapticStopAll + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticClose + * \sa SDL_HapticIndex + * \sa SDL_HapticOpenFromJoystick + * \sa SDL_HapticOpenFromMouse + * \sa SDL_HapticPause + * \sa SDL_HapticSetAutocenter + * \sa SDL_HapticSetGain + * \sa SDL_HapticStopAll */ extern DECLSPEC SDL_Haptic *SDLCALL SDL_HapticOpen(int device_index); /** - * \brief Checks if the haptic device at index has been opened. + * Check if the haptic device at the designated index has been opened. * - * \param device_index Index to check to see if it has been opened. - * \return 1 if it has been opened or 0 if it hasn't. + * \param device_index the index of the device to query + * \returns 1 if it has been opened, 0 if it hasn't or on failure; call + * SDL_GetError() for more information. * - * \sa SDL_HapticOpen - * \sa SDL_HapticIndex + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticIndex + * \sa SDL_HapticOpen */ extern DECLSPEC int SDLCALL SDL_HapticOpened(int device_index); /** - * \brief Gets the index of a haptic device. + * Get the index of a haptic device. * - * \param haptic Haptic device to get the index of. - * \return The index of the haptic device or -1 on error. + * \param haptic the SDL_Haptic device to query + * \returns the index of the specified haptic device or a negative error code + * on failure; call SDL_GetError() for more information. * - * \sa SDL_HapticOpen - * \sa SDL_HapticOpened + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticOpen + * \sa SDL_HapticOpened */ extern DECLSPEC int SDLCALL SDL_HapticIndex(SDL_Haptic * haptic); /** - * \brief Gets whether or not the current mouse has haptic capabilities. + * Query whether or not the current mouse has haptic capabilities. * - * \return SDL_TRUE if the mouse is haptic, SDL_FALSE if it isn't. + * \returns SDL_TRUE if the mouse is haptic or SDL_FALSE if it isn't. * - * \sa SDL_HapticOpenFromMouse + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticOpenFromMouse */ extern DECLSPEC int SDLCALL SDL_MouseIsHaptic(void); /** - * \brief Tries to open a haptic device from the current mouse. + * Try to open a haptic device from the current mouse. * - * \return The haptic device identifier or NULL on error. + * \returns the haptic device identifier or NULL on failure; call + * SDL_GetError() for more information. * - * \sa SDL_MouseIsHaptic - * \sa SDL_HapticOpen + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticOpen + * \sa SDL_MouseIsHaptic */ extern DECLSPEC SDL_Haptic *SDLCALL SDL_HapticOpenFromMouse(void); /** - * \brief Checks to see if a joystick has haptic features. + * Query if a joystick has haptic features. * - * \param joystick Joystick to test for haptic capabilities. - * \return SDL_TRUE if the joystick is haptic, SDL_FALSE if it isn't - * or -1 if an error occurred. + * \param joystick the SDL_Joystick to test for haptic capabilities + * \returns SDL_TRUE if the joystick is haptic, SDL_FALSE if it isn't, or a + * negative error code on failure; call SDL_GetError() for more + * information. * - * \sa SDL_HapticOpenFromJoystick + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticOpenFromJoystick */ extern DECLSPEC int SDLCALL SDL_JoystickIsHaptic(SDL_Joystick * joystick); /** - * \brief Opens a haptic device for use from a joystick device. + * Open a haptic device for use from a joystick device. * - * You must still close the haptic device separately. It will not be closed - * with the joystick. + * You must still close the haptic device separately. It will not be closed + * with the joystick. * - * When opening from a joystick you should first close the haptic device before - * closing the joystick device. If not, on some implementations the haptic - * device will also get unallocated and you'll be unable to use force feedback - * on that device. + * When opened from a joystick you should first close the haptic device before + * closing the joystick device. If not, on some implementations the haptic + * device will also get unallocated and you'll be unable to use force feedback + * on that device. * - * \param joystick Joystick to create a haptic device from. - * \return A valid haptic device identifier on success or NULL on error. + * \param joystick the SDL_Joystick to create a haptic device from + * \returns a valid haptic device identifier on success or NULL on failure; + * call SDL_GetError() for more information. * - * \sa SDL_HapticOpen - * \sa SDL_HapticClose + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticClose + * \sa SDL_HapticOpen + * \sa SDL_JoystickIsHaptic */ extern DECLSPEC SDL_Haptic *SDLCALL SDL_HapticOpenFromJoystick(SDL_Joystick * joystick); /** - * \brief Closes a haptic device previously opened with SDL_HapticOpen(). + * Close a haptic device previously opened with SDL_HapticOpen(). * - * \param haptic Haptic device to close. + * \param haptic the SDL_Haptic device to close + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticOpen */ extern DECLSPEC void SDLCALL SDL_HapticClose(SDL_Haptic * haptic); /** - * \brief Returns the number of effects a haptic device can store. + * Get the number of effects a haptic device can store. * - * On some platforms this isn't fully supported, and therefore is an - * approximation. Always check to see if your created effect was actually - * created and do not rely solely on SDL_HapticNumEffects(). + * On some platforms this isn't fully supported, and therefore is an + * approximation. Always check to see if your created effect was actually + * created and do not rely solely on SDL_HapticNumEffects(). * - * \param haptic The haptic device to query effect max. - * \return The number of effects the haptic device can store or - * -1 on error. + * \param haptic the SDL_Haptic device to query + * \returns the number of effects the haptic device can store or a negative + * error code on failure; call SDL_GetError() for more information. * - * \sa SDL_HapticNumEffectsPlaying - * \sa SDL_HapticQuery + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticNumEffectsPlaying + * \sa SDL_HapticQuery */ extern DECLSPEC int SDLCALL SDL_HapticNumEffects(SDL_Haptic * haptic); /** - * \brief Returns the number of effects a haptic device can play at the same - * time. + * Get the number of effects a haptic device can play at the same time. * - * This is not supported on all platforms, but will always return a value. - * Added here for the sake of completeness. + * This is not supported on all platforms, but will always return a value. * - * \param haptic The haptic device to query maximum playing effects. - * \return The number of effects the haptic device can play at the same time - * or -1 on error. + * \param haptic the SDL_Haptic device to query maximum playing effects + * \returns the number of effects the haptic device can play at the same time + * or a negative error code on failure; call SDL_GetError() for more + * information. * - * \sa SDL_HapticNumEffects - * \sa SDL_HapticQuery + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticNumEffects + * \sa SDL_HapticQuery */ extern DECLSPEC int SDLCALL SDL_HapticNumEffectsPlaying(SDL_Haptic * haptic); /** - * \brief Gets the haptic device's supported features in bitwise manner. + * Get the haptic device's supported features in bitwise manner. * - * Example: - * \code - * if (SDL_HapticQuery(haptic) & SDL_HAPTIC_CONSTANT) { - * printf("We have constant haptic effect!\n"); - * } - * \endcode + * \param haptic the SDL_Haptic device to query + * \returns a list of supported haptic features in bitwise manner (OR'd), or 0 + * on failure; call SDL_GetError() for more information. * - * \param haptic The haptic device to query. - * \return Haptic features in bitwise manner (OR'd). + * \since This function is available since SDL 2.0.0. * - * \sa SDL_HapticNumEffects - * \sa SDL_HapticEffectSupported + * \sa SDL_HapticEffectSupported + * \sa SDL_HapticNumEffects */ extern DECLSPEC unsigned int SDLCALL SDL_HapticQuery(SDL_Haptic * haptic); /** - * \brief Gets the number of haptic axes the device has. + * Get the number of haptic axes the device has. * - * \sa SDL_HapticDirection + * The number of haptic axes might be useful if working with the + * SDL_HapticDirection effect. + * + * \param haptic the SDL_Haptic device to query + * \returns the number of axes on success or a negative error code on failure; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC int SDLCALL SDL_HapticNumAxes(SDL_Haptic * haptic); /** - * \brief Checks to see if effect is supported by haptic. + * Check to see if an effect is supported by a haptic device. * - * \param haptic Haptic device to check on. - * \param effect Effect to check to see if it is supported. - * \return SDL_TRUE if effect is supported, SDL_FALSE if it isn't or -1 on error. + * \param haptic the SDL_Haptic device to query + * \param effect the desired effect to query + * \returns SDL_TRUE if effect is supported, SDL_FALSE if it isn't, or a + * negative error code on failure; call SDL_GetError() for more + * information. * - * \sa SDL_HapticQuery - * \sa SDL_HapticNewEffect + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticNewEffect + * \sa SDL_HapticQuery */ extern DECLSPEC int SDLCALL SDL_HapticEffectSupported(SDL_Haptic * haptic, SDL_HapticEffect * effect); /** - * \brief Creates a new haptic effect on the device. + * Create a new haptic effect on a specified device. * - * \param haptic Haptic device to create the effect on. - * \param effect Properties of the effect to create. - * \return The identifier of the effect on success or -1 on error. + * \param haptic an SDL_Haptic device to create the effect on + * \param effect an SDL_HapticEffect structure containing the properties of + * the effect to create + * \returns the ID of the effect on success or a negative error code on + * failure; call SDL_GetError() for more information. * - * \sa SDL_HapticUpdateEffect - * \sa SDL_HapticRunEffect - * \sa SDL_HapticDestroyEffect + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticDestroyEffect + * \sa SDL_HapticRunEffect + * \sa SDL_HapticUpdateEffect */ extern DECLSPEC int SDLCALL SDL_HapticNewEffect(SDL_Haptic * haptic, SDL_HapticEffect * effect); /** - * \brief Updates the properties of an effect. + * Update the properties of an effect. * - * Can be used dynamically, although behavior when dynamically changing - * direction may be strange. Specifically the effect may reupload itself - * and start playing from the start. You cannot change the type either when - * running SDL_HapticUpdateEffect(). + * Can be used dynamically, although behavior when dynamically changing + * direction may be strange. Specifically the effect may re-upload itself and + * start playing from the start. You also cannot change the type either when + * running SDL_HapticUpdateEffect(). * - * \param haptic Haptic device that has the effect. - * \param effect Identifier of the effect to update. - * \param data New effect properties to use. - * \return 0 on success or -1 on error. + * \param haptic the SDL_Haptic device that has the effect + * \param effect the identifier of the effect to update + * \param data an SDL_HapticEffect structure containing the new effect + * properties to use + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_HapticNewEffect - * \sa SDL_HapticRunEffect - * \sa SDL_HapticDestroyEffect + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticDestroyEffect + * \sa SDL_HapticNewEffect + * \sa SDL_HapticRunEffect */ extern DECLSPEC int SDLCALL SDL_HapticUpdateEffect(SDL_Haptic * haptic, int effect, SDL_HapticEffect * data); /** - * \brief Runs the haptic effect on its associated haptic device. + * Run the haptic effect on its associated haptic device. * - * If iterations are ::SDL_HAPTIC_INFINITY, it'll run the effect over and over - * repeating the envelope (attack and fade) every time. If you only want the - * effect to last forever, set ::SDL_HAPTIC_INFINITY in the effect's length - * parameter. + * To repeat the effect over and over indefinitely, set `iterations` to + * `SDL_HAPTIC_INFINITY`. (Repeats the envelope - attack and fade.) To make + * one instance of the effect last indefinitely (so the effect does not fade), + * set the effect's `length` in its structure/union to `SDL_HAPTIC_INFINITY` + * instead. * - * \param haptic Haptic device to run the effect on. - * \param effect Identifier of the haptic effect to run. - * \param iterations Number of iterations to run the effect. Use - * ::SDL_HAPTIC_INFINITY for infinity. - * \return 0 on success or -1 on error. + * \param haptic the SDL_Haptic device to run the effect on + * \param effect the ID of the haptic effect to run + * \param iterations the number of iterations to run the effect; use + * `SDL_HAPTIC_INFINITY` to repeat forever + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_HapticStopEffect - * \sa SDL_HapticDestroyEffect - * \sa SDL_HapticGetEffectStatus + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticDestroyEffect + * \sa SDL_HapticGetEffectStatus + * \sa SDL_HapticStopEffect */ extern DECLSPEC int SDLCALL SDL_HapticRunEffect(SDL_Haptic * haptic, int effect, Uint32 iterations); /** - * \brief Stops the haptic effect on its associated haptic device. + * Stop the haptic effect on its associated haptic device. * - * \param haptic Haptic device to stop the effect on. - * \param effect Identifier of the effect to stop. - * \return 0 on success or -1 on error. + * * * - * \sa SDL_HapticRunEffect - * \sa SDL_HapticDestroyEffect + * \param haptic the SDL_Haptic device to stop the effect on + * \param effect the ID of the haptic effect to stop + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticDestroyEffect + * \sa SDL_HapticRunEffect */ extern DECLSPEC int SDLCALL SDL_HapticStopEffect(SDL_Haptic * haptic, int effect); /** - * \brief Destroys a haptic effect on the device. + * Destroy a haptic effect on the device. * - * This will stop the effect if it's running. Effects are automatically - * destroyed when the device is closed. + * This will stop the effect if it's running. Effects are automatically + * destroyed when the device is closed. * - * \param haptic Device to destroy the effect on. - * \param effect Identifier of the effect to destroy. + * \param haptic the SDL_Haptic device to destroy the effect on + * \param effect the ID of the haptic effect to destroy * - * \sa SDL_HapticNewEffect + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticNewEffect */ extern DECLSPEC void SDLCALL SDL_HapticDestroyEffect(SDL_Haptic * haptic, int effect); /** - * \brief Gets the status of the current effect on the haptic device. + * Get the status of the current effect on the specified haptic device. * - * Device must support the ::SDL_HAPTIC_STATUS feature. + * Device must support the SDL_HAPTIC_STATUS feature. * - * \param haptic Haptic device to query the effect status on. - * \param effect Identifier of the effect to query its status. - * \return 0 if it isn't playing, 1 if it is playing or -1 on error. + * \param haptic the SDL_Haptic device to query for the effect status on + * \param effect the ID of the haptic effect to query its status + * \returns 0 if it isn't playing, 1 if it is playing, or a negative error + * code on failure; call SDL_GetError() for more information. * - * \sa SDL_HapticRunEffect - * \sa SDL_HapticStopEffect + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticRunEffect + * \sa SDL_HapticStopEffect */ extern DECLSPEC int SDLCALL SDL_HapticGetEffectStatus(SDL_Haptic * haptic, int effect); /** - * \brief Sets the global gain of the device. + * Set the global gain of the specified haptic device. * - * Device must support the ::SDL_HAPTIC_GAIN feature. + * Device must support the SDL_HAPTIC_GAIN feature. * - * The user may specify the maximum gain by setting the environment variable - * SDL_HAPTIC_GAIN_MAX which should be between 0 and 100. All calls to - * SDL_HapticSetGain() will scale linearly using SDL_HAPTIC_GAIN_MAX as the - * maximum. + * The user may specify the maximum gain by setting the environment variable + * `SDL_HAPTIC_GAIN_MAX` which should be between 0 and 100. All calls to + * SDL_HapticSetGain() will scale linearly using `SDL_HAPTIC_GAIN_MAX` as the + * maximum. * - * \param haptic Haptic device to set the gain on. - * \param gain Value to set the gain to, should be between 0 and 100. - * \return 0 on success or -1 on error. + * \param haptic the SDL_Haptic device to set the gain on + * \param gain value to set the gain to, should be between 0 and 100 (0 - 100) + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_HapticQuery + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticQuery */ extern DECLSPEC int SDLCALL SDL_HapticSetGain(SDL_Haptic * haptic, int gain); /** - * \brief Sets the global autocenter of the device. + * Set the global autocenter of the device. * - * Autocenter should be between 0 and 100. Setting it to 0 will disable - * autocentering. + * Autocenter should be between 0 and 100. Setting it to 0 will disable + * autocentering. * - * Device must support the ::SDL_HAPTIC_AUTOCENTER feature. + * Device must support the SDL_HAPTIC_AUTOCENTER feature. * - * \param haptic Haptic device to set autocentering on. - * \param autocenter Value to set autocenter to, 0 disables autocentering. - * \return 0 on success or -1 on error. + * \param haptic the SDL_Haptic device to set autocentering on + * \param autocenter value to set autocenter to (0-100) + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_HapticQuery + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticQuery */ extern DECLSPEC int SDLCALL SDL_HapticSetAutocenter(SDL_Haptic * haptic, int autocenter); /** - * \brief Pauses a haptic device. + * Pause a haptic device. * - * Device must support the ::SDL_HAPTIC_PAUSE feature. Call - * SDL_HapticUnpause() to resume playback. + * Device must support the `SDL_HAPTIC_PAUSE` feature. Call + * SDL_HapticUnpause() to resume playback. * - * Do not modify the effects nor add new ones while the device is paused. - * That can cause all sorts of weird errors. + * Do not modify the effects nor add new ones while the device is paused. That + * can cause all sorts of weird errors. * - * \param haptic Haptic device to pause. - * \return 0 on success or -1 on error. + * \param haptic the SDL_Haptic device to pause + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_HapticUnpause + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticUnpause */ extern DECLSPEC int SDLCALL SDL_HapticPause(SDL_Haptic * haptic); /** - * \brief Unpauses a haptic device. + * Unpause a haptic device. * - * Call to unpause after SDL_HapticPause(). + * Call to unpause after SDL_HapticPause(). * - * \param haptic Haptic device to unpause. - * \return 0 on success or -1 on error. + * \param haptic the SDL_Haptic device to unpause + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_HapticPause + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticPause */ extern DECLSPEC int SDLCALL SDL_HapticUnpause(SDL_Haptic * haptic); /** - * \brief Stops all the currently playing effects on a haptic device. + * Stop all the currently playing effects on a haptic device. * - * \param haptic Haptic device to stop. - * \return 0 on success or -1 on error. + * \param haptic the SDL_Haptic device to stop + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC int SDLCALL SDL_HapticStopAll(SDL_Haptic * haptic); /** - * \brief Checks to see if rumble is supported on a haptic device. + * Check whether rumble is supported on a haptic device. * - * \param haptic Haptic device to check to see if it supports rumble. - * \return SDL_TRUE if effect is supported, SDL_FALSE if it isn't or -1 on error. + * \param haptic haptic device to check for rumble support + * \returns SDL_TRUE if effect is supported, SDL_FALSE if it isn't, or a + * negative error code on failure; call SDL_GetError() for more + * information. * - * \sa SDL_HapticRumbleInit - * \sa SDL_HapticRumblePlay - * \sa SDL_HapticRumbleStop + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticRumbleInit + * \sa SDL_HapticRumblePlay + * \sa SDL_HapticRumbleStop */ extern DECLSPEC int SDLCALL SDL_HapticRumbleSupported(SDL_Haptic * haptic); /** - * \brief Initializes the haptic device for simple rumble playback. + * Initialize a haptic device for simple rumble playback. * - * \param haptic Haptic device to initialize for simple rumble playback. - * \return 0 on success or -1 on error. + * \param haptic the haptic device to initialize for simple rumble playback + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_HapticOpen - * \sa SDL_HapticRumbleSupported - * \sa SDL_HapticRumblePlay - * \sa SDL_HapticRumbleStop + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticOpen + * \sa SDL_HapticRumblePlay + * \sa SDL_HapticRumbleStop + * \sa SDL_HapticRumbleSupported */ extern DECLSPEC int SDLCALL SDL_HapticRumbleInit(SDL_Haptic * haptic); /** - * \brief Runs simple rumble on a haptic device + * Run a simple rumble effect on a haptic device. * - * \param haptic Haptic device to play rumble effect on. - * \param strength Strength of the rumble to play as a 0-1 float value. - * \param length Length of the rumble to play in milliseconds. - * \return 0 on success or -1 on error. + * \param haptic the haptic device to play the rumble effect on + * \param strength strength of the rumble to play as a 0-1 float value + * \param length length of the rumble to play in milliseconds + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_HapticRumbleSupported - * \sa SDL_HapticRumbleInit - * \sa SDL_HapticRumbleStop + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticRumbleInit + * \sa SDL_HapticRumbleStop + * \sa SDL_HapticRumbleSupported */ extern DECLSPEC int SDLCALL SDL_HapticRumblePlay(SDL_Haptic * haptic, float strength, Uint32 length ); /** - * \brief Stops the simple rumble on a haptic device. + * Stop the simple rumble on a haptic device. * - * \param haptic Haptic to stop the rumble on. - * \return 0 on success or -1 on error. + * \param haptic the haptic device to stop the rumble effect on + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_HapticRumbleSupported - * \sa SDL_HapticRumbleInit - * \sa SDL_HapticRumblePlay + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticRumbleInit + * \sa SDL_HapticRumblePlay + * \sa SDL_HapticRumbleSupported */ extern DECLSPEC int SDLCALL SDL_HapticRumbleStop(SDL_Haptic * haptic); diff --git a/libs/SDL2/include/SDL_hidapi.h b/libs/SDL2/include/SDL_hidapi.h new file mode 100644 index 000000000..354af5c52 --- /dev/null +++ b/libs/SDL2/include/SDL_hidapi.h @@ -0,0 +1,451 @@ +/* + Simple DirectMedia Layer + Copyright (C) 1997-2022 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ + +/** + * \file SDL_hidapi.h + * + * Header file for SDL HIDAPI functions. + * + * This is an adaptation of the original HIDAPI interface by Alan Ott, + * and includes source code licensed under the following BSD license: + * + Copyright (c) 2010, Alan Ott, Signal 11 Software + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of Signal 11 Software nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + * + * If you would like a version of SDL without this code, you can build SDL + * with SDL_HIDAPI_DISABLED defined to 1. You might want to do this for example + * on iOS or tvOS to avoid a dependency on the CoreBluetooth framework. + */ + +#ifndef SDL_hidapi_h_ +#define SDL_hidapi_h_ + +#include "SDL_stdinc.h" + +#include "begin_code.h" +/* Set up for C function definitions, even when using C++ */ +#ifdef __cplusplus +extern "C" { +#endif + +/** + * \brief A handle representing an open HID device + */ +struct SDL_hid_device_; +typedef struct SDL_hid_device_ SDL_hid_device; /**< opaque hidapi structure */ + +/** hidapi info structure */ +/** + * \brief Information about a connected HID device + */ +typedef struct SDL_hid_device_info +{ + /** Platform-specific device path */ + char *path; + /** Device Vendor ID */ + unsigned short vendor_id; + /** Device Product ID */ + unsigned short product_id; + /** Serial Number */ + wchar_t *serial_number; + /** Device Release Number in binary-coded decimal, + also known as Device Version Number */ + unsigned short release_number; + /** Manufacturer String */ + wchar_t *manufacturer_string; + /** Product string */ + wchar_t *product_string; + /** Usage Page for this Device/Interface + (Windows/Mac only). */ + unsigned short usage_page; + /** Usage for this Device/Interface + (Windows/Mac only).*/ + unsigned short usage; + /** The USB interface which this logical device + represents. + + * Valid on both Linux implementations in all cases. + * Valid on the Windows implementation only if the device + contains more than one interface. */ + int interface_number; + + /** Additional information about the USB interface. + Valid on libusb and Android implementations. */ + int interface_class; + int interface_subclass; + int interface_protocol; + + /** Pointer to the next device */ + struct SDL_hid_device_info *next; +} SDL_hid_device_info; + + +/** + * Initialize the HIDAPI library. + * + * This function initializes the HIDAPI library. Calling it is not strictly + * necessary, as it will be called automatically by SDL_hid_enumerate() and + * any of the SDL_hid_open_*() functions if it is needed. This function should + * be called at the beginning of execution however, if there is a chance of + * HIDAPI handles being opened by different threads simultaneously. + * + * Each call to this function should have a matching call to SDL_hid_exit() + * + * \returns 0 on success and -1 on error. + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_hid_exit + */ +extern DECLSPEC int SDLCALL SDL_hid_init(void); + +/** + * Finalize the HIDAPI library. + * + * This function frees all of the static data associated with HIDAPI. It + * should be called at the end of execution to avoid memory leaks. + * + * \returns 0 on success and -1 on error. + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_hid_init + */ +extern DECLSPEC int SDLCALL SDL_hid_exit(void); + +/** + * Check to see if devices may have been added or removed. + * + * Enumerating the HID devices is an expensive operation, so you can call this + * to see if there have been any system device changes since the last call to + * this function. A change in the counter returned doesn't necessarily mean + * that anything has changed, but you can call SDL_hid_enumerate() to get an + * updated device list. + * + * Calling this function for the first time may cause a thread or other system + * resource to be allocated to track device change notifications. + * + * \returns a change counter that is incremented with each potential device + * change, or 0 if device change detection isn't available. + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_hid_enumerate + */ +extern DECLSPEC Uint32 SDLCALL SDL_hid_device_change_count(void); + +/** + * Enumerate the HID Devices. + * + * This function returns a linked list of all the HID devices attached to the + * system which match vendor_id and product_id. If `vendor_id` is set to 0 + * then any vendor matches. If `product_id` is set to 0 then any product + * matches. If `vendor_id` and `product_id` are both set to 0, then all HID + * devices will be returned. + * + * \param vendor_id The Vendor ID (VID) of the types of device to open. + * \param product_id The Product ID (PID) of the types of device to open. + * \returns a pointer to a linked list of type SDL_hid_device_info, containing + * information about the HID devices attached to the system, or NULL + * in the case of failure. Free this linked list by calling + * SDL_hid_free_enumeration(). + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_hid_device_change_count + */ +extern DECLSPEC SDL_hid_device_info * SDLCALL SDL_hid_enumerate(unsigned short vendor_id, unsigned short product_id); + +/** + * Free an enumeration Linked List + * + * This function frees a linked list created by SDL_hid_enumerate(). + * + * \param devs Pointer to a list of struct_device returned from + * SDL_hid_enumerate(). + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC void SDLCALL SDL_hid_free_enumeration(SDL_hid_device_info *devs); + +/** + * Open a HID device using a Vendor ID (VID), Product ID (PID) and optionally + * a serial number. + * + * If `serial_number` is NULL, the first device with the specified VID and PID + * is opened. + * + * \param vendor_id The Vendor ID (VID) of the device to open. + * \param product_id The Product ID (PID) of the device to open. + * \param serial_number The Serial Number of the device to open (Optionally + * NULL). + * \returns a pointer to a SDL_hid_device object on success or NULL on + * failure. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC SDL_hid_device * SDLCALL SDL_hid_open(unsigned short vendor_id, unsigned short product_id, const wchar_t *serial_number); + +/** + * Open a HID device by its path name. + * + * The path name be determined by calling SDL_hid_enumerate(), or a + * platform-specific path name can be used (eg: /dev/hidraw0 on Linux). + * + * \param path The path name of the device to open + * \returns a pointer to a SDL_hid_device object on success or NULL on + * failure. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC SDL_hid_device * SDLCALL SDL_hid_open_path(const char *path, int bExclusive /* = false */); + +/** + * Write an Output report to a HID device. + * + * The first byte of `data` must contain the Report ID. For devices which only + * support a single report, this must be set to 0x0. The remaining bytes + * contain the report data. Since the Report ID is mandatory, calls to + * SDL_hid_write() will always contain one more byte than the report contains. + * For example, if a hid report is 16 bytes long, 17 bytes must be passed to + * SDL_hid_write(), the Report ID (or 0x0, for devices with a single report), + * followed by the report data (16 bytes). In this example, the length passed + * in would be 17. + * + * SDL_hid_write() will send the data on the first OUT endpoint, if one + * exists. If it does not, it will send the data through the Control Endpoint + * (Endpoint 0). + * + * \param dev A device handle returned from SDL_hid_open(). + * \param data The data to send, including the report number as the first + * byte. + * \param length The length in bytes of the data to send. + * \returns the actual number of bytes written and -1 on error. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_hid_write(SDL_hid_device *dev, const unsigned char *data, size_t length); + +/** + * Read an Input report from a HID device with timeout. + * + * Input reports are returned to the host through the INTERRUPT IN endpoint. + * The first byte will contain the Report number if the device uses numbered + * reports. + * + * \param dev A device handle returned from SDL_hid_open(). + * \param data A buffer to put the read data into. + * \param length The number of bytes to read. For devices with multiple + * reports, make sure to read an extra byte for the report + * number. + * \param milliseconds timeout in milliseconds or -1 for blocking wait. + * \returns the actual number of bytes read and -1 on error. If no packet was + * available to be read within the timeout period, this function + * returns 0. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_hid_read_timeout(SDL_hid_device *dev, unsigned char *data, size_t length, int milliseconds); + +/** + * Read an Input report from a HID device. + * + * Input reports are returned to the host through the INTERRUPT IN endpoint. + * The first byte will contain the Report number if the device uses numbered + * reports. + * + * \param dev A device handle returned from SDL_hid_open(). + * \param data A buffer to put the read data into. + * \param length The number of bytes to read. For devices with multiple + * reports, make sure to read an extra byte for the report + * number. + * \returns the actual number of bytes read and -1 on error. If no packet was + * available to be read and the handle is in non-blocking mode, this + * function returns 0. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_hid_read(SDL_hid_device *dev, unsigned char *data, size_t length); + +/** + * Set the device handle to be non-blocking. + * + * In non-blocking mode calls to SDL_hid_read() will return immediately with a + * value of 0 if there is no data to be read. In blocking mode, SDL_hid_read() + * will wait (block) until there is data to read before returning. + * + * Nonblocking can be turned on and off at any time. + * + * \param dev A device handle returned from SDL_hid_open(). + * \param nonblock enable or not the nonblocking reads - 1 to enable + * nonblocking - 0 to disable nonblocking. + * \returns 0 on success and -1 on error. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_hid_set_nonblocking(SDL_hid_device *dev, int nonblock); + +/** + * Send a Feature report to the device. + * + * Feature reports are sent over the Control endpoint as a Set_Report + * transfer. The first byte of `data` must contain the Report ID. For devices + * which only support a single report, this must be set to 0x0. The remaining + * bytes contain the report data. Since the Report ID is mandatory, calls to + * SDL_hid_send_feature_report() will always contain one more byte than the + * report contains. For example, if a hid report is 16 bytes long, 17 bytes + * must be passed to SDL_hid_send_feature_report(): the Report ID (or 0x0, for + * devices which do not use numbered reports), followed by the report data (16 + * bytes). In this example, the length passed in would be 17. + * + * \param dev A device handle returned from SDL_hid_open(). + * \param data The data to send, including the report number as the first + * byte. + * \param length The length in bytes of the data to send, including the report + * number. + * \returns the actual number of bytes written and -1 on error. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_hid_send_feature_report(SDL_hid_device *dev, const unsigned char *data, size_t length); + +/** + * Get a feature report from a HID device. + * + * Set the first byte of `data` to the Report ID of the report to be read. + * Make sure to allow space for this extra byte in `data`. Upon return, the + * first byte will still contain the Report ID, and the report data will start + * in data[1]. + * + * \param dev A device handle returned from SDL_hid_open(). + * \param data A buffer to put the read data into, including the Report ID. + * Set the first byte of `data` to the Report ID of the report to + * be read, or set it to zero if your device does not use numbered + * reports. + * \param length The number of bytes to read, including an extra byte for the + * report ID. The buffer can be longer than the actual report. + * \returns the number of bytes read plus one for the report ID (which is + * still in the first byte), or -1 on error. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_hid_get_feature_report(SDL_hid_device *dev, unsigned char *data, size_t length); + +/** + * Close a HID device. + * + * \param dev A device handle returned from SDL_hid_open(). + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC void SDLCALL SDL_hid_close(SDL_hid_device *dev); + +/** + * Get The Manufacturer String from a HID device. + * + * \param dev A device handle returned from SDL_hid_open(). + * \param string A wide string buffer to put the data into. + * \param maxlen The length of the buffer in multiples of wchar_t. + * \returns 0 on success and -1 on error. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_hid_get_manufacturer_string(SDL_hid_device *dev, wchar_t *string, size_t maxlen); + +/** + * Get The Product String from a HID device. + * + * \param dev A device handle returned from SDL_hid_open(). + * \param string A wide string buffer to put the data into. + * \param maxlen The length of the buffer in multiples of wchar_t. + * \returns 0 on success and -1 on error. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_hid_get_product_string(SDL_hid_device *dev, wchar_t *string, size_t maxlen); + +/** + * Get The Serial Number String from a HID device. + * + * \param dev A device handle returned from SDL_hid_open(). + * \param string A wide string buffer to put the data into. + * \param maxlen The length of the buffer in multiples of wchar_t. + * \returns 0 on success and -1 on error. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_hid_get_serial_number_string(SDL_hid_device *dev, wchar_t *string, size_t maxlen); + +/** + * Get a string from a HID device, based on its string index. + * + * \param dev A device handle returned from SDL_hid_open(). + * \param string_index The index of the string to get. + * \param string A wide string buffer to put the data into. + * \param maxlen The length of the buffer in multiples of wchar_t. + * \returns 0 on success and -1 on error. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_hid_get_indexed_string(SDL_hid_device *dev, int string_index, wchar_t *string, size_t maxlen); + +/** + * Start or stop a BLE scan on iOS and tvOS to pair Steam Controllers + * + * \param active SDL_TRUE to start the scan, SDL_FALSE to stop the scan + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC void SDLCALL SDL_hid_ble_scan(SDL_bool active); + +/* Ends C function definitions when using C++ */ +#ifdef __cplusplus +} +#endif +#include "close_code.h" + +#endif /* SDL_hidapi_h_ */ + +/* vi: set sts=4 ts=4 sw=4 expandtab: */ diff --git a/libs/SDL2/include/SDL_hints.h b/libs/SDL2/include/SDL_hints.h index 8fa0dd660..1185f4222 100644 --- a/libs/SDL2/include/SDL_hints.h +++ b/libs/SDL2/include/SDL_hints.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -48,316 +48,122 @@ extern "C" { #endif /** - * \brief A variable controlling how 3D acceleration is used to accelerate the SDL screen surface. - * - * SDL can try to accelerate the SDL screen surface by using streaming - * textures with a 3D rendering engine. This variable controls whether and - * how this is done. + * \brief A variable controlling whether the Android / iOS built-in + * accelerometer should be listed as a joystick device. * * This variable can be set to the following values: - * "0" - Disable 3D acceleration - * "1" - Enable 3D acceleration, using the default renderer. - * "X" - Enable 3D acceleration, using X where X is one of the valid rendering drivers. (e.g. "direct3d", "opengl", etc.) - * - * By default SDL tries to make a best guess for each platform whether - * to use acceleration or not. + * "0" - The accelerometer is not listed as a joystick + * "1" - The accelerometer is available as a 3 axis joystick (the default). */ -#define SDL_HINT_FRAMEBUFFER_ACCELERATION "SDL_FRAMEBUFFER_ACCELERATION" +#define SDL_HINT_ACCELEROMETER_AS_JOYSTICK "SDL_ACCELEROMETER_AS_JOYSTICK" /** - * \brief A variable specifying which render driver to use. + * \brief Specify the behavior of Alt+Tab while the keyboard is grabbed. * - * If the application doesn't pick a specific renderer to use, this variable - * specifies the name of the preferred renderer. If the preferred renderer - * can't be initialized, the normal default renderer is used. + * By default, SDL emulates Alt+Tab functionality while the keyboard is grabbed + * and your window is full-screen. This prevents the user from getting stuck in + * your application if you've enabled keyboard grab. * - * This variable is case insensitive and can be set to the following values: - * "direct3d" - * "opengl" - * "opengles2" - * "opengles" - * "metal" - * "software" - * - * The default varies by platform, but it's the first one in the list that - * is available on the current platform. - */ -#define SDL_HINT_RENDER_DRIVER "SDL_RENDER_DRIVER" + * The variable can be set to the following values: + * "0" - SDL will not handle Alt+Tab. Your application is responsible + for handling Alt+Tab while the keyboard is grabbed. + * "1" - SDL will minimize your window when Alt+Tab is pressed (default) +*/ +#define SDL_HINT_ALLOW_ALT_TAB_WHILE_GRABBED "SDL_ALLOW_ALT_TAB_WHILE_GRABBED" /** - * \brief A variable controlling whether the OpenGL render driver uses shaders if they are available. + * \brief If set to "0" then never set the top most bit on a SDL Window, even if the video mode expects it. + * This is a debugging aid for developers and not expected to be used by end users. The default is "1" * * This variable can be set to the following values: - * "0" - Disable shaders - * "1" - Enable shaders - * - * By default shaders are used if OpenGL supports them. + * "0" - don't allow topmost + * "1" - allow topmost */ -#define SDL_HINT_RENDER_OPENGL_SHADERS "SDL_RENDER_OPENGL_SHADERS" +#define SDL_HINT_ALLOW_TOPMOST "SDL_ALLOW_TOPMOST" /** - * \brief A variable controlling whether the Direct3D device is initialized for thread-safe operations. + * \brief Android APK expansion main file version. Should be a string number like "1", "2" etc. * - * This variable can be set to the following values: - * "0" - Thread-safety is not enabled (faster) - * "1" - Thread-safety is enabled + * Must be set together with SDL_HINT_ANDROID_APK_EXPANSION_PATCH_FILE_VERSION. * - * By default the Direct3D device is created with thread-safety disabled. + * If both hints were set then SDL_RWFromFile() will look into expansion files + * after a given relative path was not found in the internal storage and assets. + * + * By default this hint is not set and the APK expansion files are not searched. */ -#define SDL_HINT_RENDER_DIRECT3D_THREADSAFE "SDL_RENDER_DIRECT3D_THREADSAFE" +#define SDL_HINT_ANDROID_APK_EXPANSION_MAIN_FILE_VERSION "SDL_ANDROID_APK_EXPANSION_MAIN_FILE_VERSION" + +/** + * \brief Android APK expansion patch file version. Should be a string number like "1", "2" etc. + * + * Must be set together with SDL_HINT_ANDROID_APK_EXPANSION_MAIN_FILE_VERSION. + * + * If both hints were set then SDL_RWFromFile() will look into expansion files + * after a given relative path was not found in the internal storage and assets. + * + * By default this hint is not set and the APK expansion files are not searched. + */ +#define SDL_HINT_ANDROID_APK_EXPANSION_PATCH_FILE_VERSION "SDL_ANDROID_APK_EXPANSION_PATCH_FILE_VERSION" /** - * \brief A variable controlling whether to enable Direct3D 11+'s Debug Layer. + * \brief A variable to control whether the event loop will block itself when the app is paused. * - * This variable does not have any effect on the Direct3D 9 based renderer. + * The variable can be set to the following values: + * "0" - Non blocking. + * "1" - Blocking. (default) * - * This variable can be set to the following values: - * "0" - Disable Debug Layer use - * "1" - Enable Debug Layer use - * - * By default, SDL does not use Direct3D Debug Layer. + * The value should be set before SDL is initialized. */ -#define SDL_HINT_RENDER_DIRECT3D11_DEBUG "SDL_RENDER_DIRECT3D11_DEBUG" +#define SDL_HINT_ANDROID_BLOCK_ON_PAUSE "SDL_ANDROID_BLOCK_ON_PAUSE" /** - * \brief A variable controlling the scaling policy for SDL_RenderSetLogicalSize. + * \brief A variable to control whether SDL will pause audio in background + * (Requires SDL_ANDROID_BLOCK_ON_PAUSE as "Non blocking") * - * This variable can be set to the following values: - * "0" or "letterbox" - Uses letterbox/sidebars to fit the entire rendering on screen - * "1" or "overscan" - Will zoom the rendering so it fills the entire screen, allowing edges to be drawn offscreen + * The variable can be set to the following values: + * "0" - Non paused. + * "1" - Paused. (default) * - * By default letterbox is used + * The value should be set before SDL is initialized. */ -#define SDL_HINT_RENDER_LOGICAL_SIZE_MODE "SDL_RENDER_LOGICAL_SIZE_MODE" +#define SDL_HINT_ANDROID_BLOCK_ON_PAUSE_PAUSEAUDIO "SDL_ANDROID_BLOCK_ON_PAUSE_PAUSEAUDIO" /** - * \brief A variable controlling the scaling quality + * \brief A variable to control whether we trap the Android back button to handle it manually. + * This is necessary for the right mouse button to work on some Android devices, or + * to be able to trap the back button for use in your code reliably. If set to true, + * the back button will show up as an SDL_KEYDOWN / SDL_KEYUP pair with a keycode of + * SDL_SCANCODE_AC_BACK. * - * This variable can be set to the following values: - * "0" or "nearest" - Nearest pixel sampling - * "1" or "linear" - Linear filtering (supported by OpenGL and Direct3D) - * "2" or "best" - Currently this is the same as "linear" + * The variable can be set to the following values: + * "0" - Back button will be handled as usual for system. (default) + * "1" - Back button will be trapped, allowing you to handle the key press + * manually. (This will also let right mouse click work on systems + * where the right mouse button functions as back.) * - * By default nearest pixel sampling is used + * The value of this hint is used at runtime, so it can be changed at any time. */ -#define SDL_HINT_RENDER_SCALE_QUALITY "SDL_RENDER_SCALE_QUALITY" +#define SDL_HINT_ANDROID_TRAP_BACK_BUTTON "SDL_ANDROID_TRAP_BACK_BUTTON" /** - * \brief A variable controlling whether updates to the SDL screen surface should be synchronized with the vertical refresh, to avoid tearing. - * - * This variable can be set to the following values: - * "0" - Disable vsync - * "1" - Enable vsync - * - * By default SDL does not sync screen surface updates with vertical refresh. - */ -#define SDL_HINT_RENDER_VSYNC "SDL_RENDER_VSYNC" - -/** - * \brief A variable controlling whether the screensaver is enabled. - * - * This variable can be set to the following values: - * "0" - Disable screensaver - * "1" - Enable screensaver - * - * By default SDL will disable the screensaver. - */ -#define SDL_HINT_VIDEO_ALLOW_SCREENSAVER "SDL_VIDEO_ALLOW_SCREENSAVER" - -/** - * \brief A variable controlling whether the X11 VidMode extension should be used. - * - * This variable can be set to the following values: - * "0" - Disable XVidMode - * "1" - Enable XVidMode - * - * By default SDL will use XVidMode if it is available. - */ -#define SDL_HINT_VIDEO_X11_XVIDMODE "SDL_VIDEO_X11_XVIDMODE" - -/** - * \brief A variable controlling whether the X11 Xinerama extension should be used. - * - * This variable can be set to the following values: - * "0" - Disable Xinerama - * "1" - Enable Xinerama - * - * By default SDL will use Xinerama if it is available. - */ -#define SDL_HINT_VIDEO_X11_XINERAMA "SDL_VIDEO_X11_XINERAMA" - -/** - * \brief A variable controlling whether the X11 XRandR extension should be used. - * - * This variable can be set to the following values: - * "0" - Disable XRandR - * "1" - Enable XRandR - * - * By default SDL will not use XRandR because of window manager issues. - */ -#define SDL_HINT_VIDEO_X11_XRANDR "SDL_VIDEO_X11_XRANDR" - -/** - * \brief A variable controlling whether the X11 _NET_WM_PING protocol should be supported. - * - * This variable can be set to the following values: - * "0" - Disable _NET_WM_PING - * "1" - Enable _NET_WM_PING - * - * By default SDL will use _NET_WM_PING, but for applications that know they - * will not always be able to respond to ping requests in a timely manner they can - * turn it off to avoid the window manager thinking the app is hung. - * The hint is checked in CreateWindow. - */ -#define SDL_HINT_VIDEO_X11_NET_WM_PING "SDL_VIDEO_X11_NET_WM_PING" - -/** - * \brief A variable controlling whether the X11 _NET_WM_BYPASS_COMPOSITOR hint should be used. - * - * This variable can be set to the following values: - * "0" - Disable _NET_WM_BYPASS_COMPOSITOR - * "1" - Enable _NET_WM_BYPASS_COMPOSITOR - * - * By default SDL will use _NET_WM_BYPASS_COMPOSITOR + * \brief Specify an application name. * + * This hint lets you specify the application name sent to the OS when + * required. For example, this will often appear in volume control applets for + * audio streams, and in lists of applications which are inhibiting the + * screensaver. You should use a string that describes your program ("My Game + * 2: The Revenge") + * + * Setting this to "" or leaving it unset will have SDL use a reasonable + * default: probably the application's name or "SDL Application" if SDL + * doesn't have any better information. + * + * Note that, for audio streams, this can be overridden with + * SDL_HINT_AUDIO_DEVICE_APP_NAME. + * + * On targets where this is not supported, this hint does nothing. */ -#define SDL_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR "SDL_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR" - -/** - * \brief A variable controlling whether the window frame and title bar are interactive when the cursor is hidden - * - * This variable can be set to the following values: - * "0" - The window frame is not interactive when the cursor is hidden (no move, resize, etc) - * "1" - The window frame is interactive when the cursor is hidden - * - * By default SDL will allow interaction with the window frame when the cursor is hidden - */ -#define SDL_HINT_WINDOW_FRAME_USABLE_WHILE_CURSOR_HIDDEN "SDL_WINDOW_FRAME_USABLE_WHILE_CURSOR_HIDDEN" - -/** - * \brief A variable to specify custom icon resource id from RC file on Windows platform - */ -#define SDL_HINT_WINDOWS_INTRESOURCE_ICON "SDL_WINDOWS_INTRESOURCE_ICON" -#define SDL_HINT_WINDOWS_INTRESOURCE_ICON_SMALL "SDL_WINDOWS_INTRESOURCE_ICON_SMALL" - -/** - * \brief A variable controlling whether the windows message loop is processed by SDL - * - * This variable can be set to the following values: - * "0" - The window message loop is not run - * "1" - The window message loop is processed in SDL_PumpEvents() - * - * By default SDL will process the windows message loop - */ -#define SDL_HINT_WINDOWS_ENABLE_MESSAGELOOP "SDL_WINDOWS_ENABLE_MESSAGELOOP" - -/** - * \brief A variable controlling whether grabbing input grabs the keyboard - * - * This variable can be set to the following values: - * "0" - Grab will affect only the mouse - * "1" - Grab will affect mouse and keyboard - * - * By default SDL will not grab the keyboard so system shortcuts still work. - */ -#define SDL_HINT_GRAB_KEYBOARD "SDL_GRAB_KEYBOARD" - -/** - * \brief A variable setting the double click time, in milliseconds. - */ -#define SDL_HINT_MOUSE_DOUBLE_CLICK_TIME "SDL_MOUSE_DOUBLE_CLICK_TIME" - -/** - * \brief A variable setting the double click radius, in pixels. - */ -#define SDL_HINT_MOUSE_DOUBLE_CLICK_RADIUS "SDL_MOUSE_DOUBLE_CLICK_RADIUS" - -/** - * \brief A variable setting the speed scale for mouse motion, in floating point, when the mouse is not in relative mode - */ -#define SDL_HINT_MOUSE_NORMAL_SPEED_SCALE "SDL_MOUSE_NORMAL_SPEED_SCALE" - -/** - * \brief A variable setting the scale for mouse motion, in floating point, when the mouse is in relative mode - */ -#define SDL_HINT_MOUSE_RELATIVE_SPEED_SCALE "SDL_MOUSE_RELATIVE_SPEED_SCALE" - -/** - * \brief A variable controlling whether relative mouse mode is implemented using mouse warping - * - * This variable can be set to the following values: - * "0" - Relative mouse mode uses raw input - * "1" - Relative mouse mode uses mouse warping - * - * By default SDL will use raw input for relative mouse mode - */ -#define SDL_HINT_MOUSE_RELATIVE_MODE_WARP "SDL_MOUSE_RELATIVE_MODE_WARP" - -/** - * \brief Allow mouse click events when clicking to focus an SDL window - * - * This variable can be set to the following values: - * "0" - Ignore mouse clicks that activate a window - * "1" - Generate events for mouse clicks that activate a window - * - * By default SDL will ignore mouse clicks that activate a window - */ -#define SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH "SDL_MOUSE_FOCUS_CLICKTHROUGH" - -/** - * \brief A variable controlling whether touch events should generate synthetic mouse events - * - * This variable can be set to the following values: - * "0" - Touch events will not generate mouse events - * "1" - Touch events will generate mouse events - * - * By default SDL will generate mouse events for touch events - */ -#define SDL_HINT_TOUCH_MOUSE_EVENTS "SDL_TOUCH_MOUSE_EVENTS" - -/** - * \brief A variable controlling whether mouse events should generate synthetic touch events - * - * This variable can be set to the following values: - * "0" - Mouse events will not generate touch events (default for desktop platforms) - * "1" - Mouse events will generate touch events (default for mobile platforms, such as Android and iOS) - */ - -#define SDL_HINT_MOUSE_TOUCH_EVENTS "SDL_MOUSE_TOUCH_EVENTS" - -/** - * \brief Minimize your SDL_Window if it loses key focus when in fullscreen mode. Defaults to true. - * - */ -#define SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS "SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS" - -/** - * \brief A variable controlling whether the idle timer is disabled on iOS. - * - * When an iOS app does not receive touches for some time, the screen is - * dimmed automatically. For games where the accelerometer is the only input - * this is problematic. This functionality can be disabled by setting this - * hint. - * - * As of SDL 2.0.4, SDL_EnableScreenSaver() and SDL_DisableScreenSaver() - * accomplish the same thing on iOS. They should be preferred over this hint. - * - * This variable can be set to the following values: - * "0" - Enable idle timer - * "1" - Disable idle timer - */ -#define SDL_HINT_IDLE_TIMER_DISABLED "SDL_IOS_IDLE_TIMER_DISABLED" - -/** - * \brief A variable controlling which orientations are allowed on iOS/Android. - * - * In some circumstances it is necessary to be able to explicitly control - * which UI orientations are allowed. - * - * This variable is a space delimited list of the following values: - * "LandscapeLeft", "LandscapeRight", "Portrait" "PortraitUpsideDown" - */ -#define SDL_HINT_ORIENTATIONS "SDL_IOS_ORIENTATIONS" +#define SDL_HINT_APP_NAME "SDL_APP_NAME" /** * \brief A variable controlling whether controllers used with the Apple TV @@ -388,53 +194,240 @@ extern "C" { #define SDL_HINT_APPLE_TV_REMOTE_ALLOW_ROTATION "SDL_APPLE_TV_REMOTE_ALLOW_ROTATION" /** - * \brief A variable controlling whether the home indicator bar on iPhone X - * should be hidden. + * \brief A variable controlling the audio category on iOS and Mac OS X * * This variable can be set to the following values: - * "0" - The indicator bar is not hidden (default for windowed applications) - * "1" - The indicator bar is hidden and is shown when the screen is touched (useful for movie playback applications) - * "2" - The indicator bar is dim and the first swipe makes it visible and the second swipe performs the "home" action (default for fullscreen applications) + * + * "ambient" - Use the AVAudioSessionCategoryAmbient audio category, will be muted by the phone mute switch (default) + * "playback" - Use the AVAudioSessionCategoryPlayback category + * + * For more information, see Apple's documentation: + * https://developer.apple.com/library/content/documentation/Audio/Conceptual/AudioSessionProgrammingGuide/AudioSessionCategoriesandModes/AudioSessionCategoriesandModes.html */ -#define SDL_HINT_IOS_HIDE_HOME_INDICATOR "SDL_IOS_HIDE_HOME_INDICATOR" +#define SDL_HINT_AUDIO_CATEGORY "SDL_AUDIO_CATEGORY" /** - * \brief A variable controlling whether the Android / iOS built-in - * accelerometer should be listed as a joystick device. + * \brief Specify an application name for an audio device. + * + * Some audio backends (such as PulseAudio) allow you to describe your audio + * stream. Among other things, this description might show up in a system + * control panel that lets the user adjust the volume on specific audio + * streams instead of using one giant master volume slider. + * + * This hints lets you transmit that information to the OS. The contents of + * this hint are used while opening an audio device. You should use a string + * that describes your program ("My Game 2: The Revenge") + * + * Setting this to "" or leaving it unset will have SDL use a reasonable + * default: this will be the name set with SDL_HINT_APP_NAME, if that hint is + * set. Otherwise, it'll probably the application's name or "SDL Application" + * if SDL doesn't have any better information. + * + * On targets where this is not supported, this hint does nothing. + */ +#define SDL_HINT_AUDIO_DEVICE_APP_NAME "SDL_AUDIO_DEVICE_APP_NAME" + +/** + * \brief Specify an application name for an audio device. + * + * Some audio backends (such as PulseAudio) allow you to describe your audio + * stream. Among other things, this description might show up in a system + * control panel that lets the user adjust the volume on specific audio + * streams instead of using one giant master volume slider. + * + * This hints lets you transmit that information to the OS. The contents of + * this hint are used while opening an audio device. You should use a string + * that describes your what your program is playing ("audio stream" is + * probably sufficient in many cases, but this could be useful for something + * like "team chat" if you have a headset playing VoIP audio separately). + * + * Setting this to "" or leaving it unset will have SDL use a reasonable + * default: "audio stream" or something similar. + * + * On targets where this is not supported, this hint does nothing. + */ +#define SDL_HINT_AUDIO_DEVICE_STREAM_NAME "SDL_AUDIO_DEVICE_STREAM_NAME" + +/** + * \brief Specify an application role for an audio device. + * + * Some audio backends (such as Pipewire) allow you to describe the role of + * your audio stream. Among other things, this description might show up in + * a system control panel or software for displaying and manipulating media + * playback/capture graphs. + * + * This hints lets you transmit that information to the OS. The contents of + * this hint are used while opening an audio device. You should use a string + * that describes your what your program is playing (Game, Music, Movie, + * etc...). + * + * Setting this to "" or leaving it unset will have SDL use a reasonable + * default: "Game" or something similar. + * + * On targets where this is not supported, this hint does nothing. + */ +#define SDL_HINT_AUDIO_DEVICE_STREAM_ROLE "SDL_AUDIO_DEVICE_STREAM_ROLE" + +/** + * \brief A variable controlling speed/quality tradeoff of audio resampling. + * + * If available, SDL can use libsamplerate ( http://www.mega-nerd.com/SRC/ ) + * to handle audio resampling. There are different resampling modes available + * that produce different levels of quality, using more CPU. + * + * If this hint isn't specified to a valid setting, or libsamplerate isn't + * available, SDL will use the default, internal resampling algorithm. + * + * Note that this is currently only applicable to resampling audio that is + * being written to a device for playback or audio being read from a device + * for capture. SDL_AudioCVT always uses the default resampler (although this + * might change for SDL 2.1). + * + * This hint is currently only checked at audio subsystem initialization. * * This variable can be set to the following values: - * "0" - The accelerometer is not listed as a joystick - * "1" - The accelerometer is available as a 3 axis joystick (the default). + * + * "0" or "default" - Use SDL's internal resampling (Default when not set - low quality, fast) + * "1" or "fast" - Use fast, slightly higher quality resampling, if available + * "2" or "medium" - Use medium quality resampling, if available + * "3" or "best" - Use high quality resampling, if available */ -#define SDL_HINT_ACCELEROMETER_AS_JOYSTICK "SDL_ACCELEROMETER_AS_JOYSTICK" +#define SDL_HINT_AUDIO_RESAMPLING_MODE "SDL_AUDIO_RESAMPLING_MODE" /** - * \brief A variable controlling whether the Android / tvOS remotes - * should be listed as joystick devices, instead of sending keyboard events. + * \brief A variable controlling whether SDL updates joystick state when getting input events * * This variable can be set to the following values: - * "0" - Remotes send enter/escape/arrow key events - * "1" - Remotes are available as 2 axis, 2 button joysticks (the default). + * + * "0" - You'll call SDL_JoystickUpdate() manually + * "1" - SDL will automatically call SDL_JoystickUpdate() (default) + * + * This hint can be toggled on and off at runtime. */ -#define SDL_HINT_TV_REMOTE_AS_JOYSTICK "SDL_TV_REMOTE_AS_JOYSTICK" +#define SDL_HINT_AUTO_UPDATE_JOYSTICKS "SDL_AUTO_UPDATE_JOYSTICKS" /** - * \brief A variable that lets you disable the detection and use of Xinput gamepad devices + * \brief A variable controlling whether SDL updates sensor state when getting input events + * + * This variable can be set to the following values: + * + * "0" - You'll call SDL_SensorUpdate() manually + * "1" - SDL will automatically call SDL_SensorUpdate() (default) + * + * This hint can be toggled on and off at runtime. + */ +#define SDL_HINT_AUTO_UPDATE_SENSORS "SDL_AUTO_UPDATE_SENSORS" + +/** + * \brief Prevent SDL from using version 4 of the bitmap header when saving BMPs. + * + * The bitmap header version 4 is required for proper alpha channel support and + * SDL will use it when required. Should this not be desired, this hint can + * force the use of the 40 byte header version which is supported everywhere. + * + * The variable can be set to the following values: + * "0" - Surfaces with a colorkey or an alpha channel are saved to a + * 32-bit BMP file with an alpha mask. SDL will use the bitmap + * header version 4 and set the alpha mask accordingly. + * "1" - Surfaces with a colorkey or an alpha channel are saved to a + * 32-bit BMP file without an alpha mask. The alpha channel data + * will be in the file, but applications are going to ignore it. + * + * The default value is "0". + */ +#define SDL_HINT_BMP_SAVE_LEGACY_FORMAT "SDL_BMP_SAVE_LEGACY_FORMAT" + +/** + * \brief Override for SDL_GetDisplayUsableBounds() + * + * If set, this hint will override the expected results for + * SDL_GetDisplayUsableBounds() for display index 0. Generally you don't want + * to do this, but this allows an embedded system to request that some of the + * screen be reserved for other uses when paired with a well-behaved + * application. + * + * The contents of this hint must be 4 comma-separated integers, the first + * is the bounds x, then y, width and height, in that order. + */ +#define SDL_HINT_DISPLAY_USABLE_BOUNDS "SDL_DISPLAY_USABLE_BOUNDS" + +/** + * \brief Disable giving back control to the browser automatically + * when running with asyncify + * + * With -s ASYNCIFY, SDL2 calls emscripten_sleep during operations + * such as refreshing the screen or polling events. + * + * This hint only applies to the emscripten platform + * + * The variable can be set to the following values: + * "0" - Disable emscripten_sleep calls (if you give back browser control manually or use asyncify for other purposes) + * "1" - Enable emscripten_sleep calls (the default) + */ +#define SDL_HINT_EMSCRIPTEN_ASYNCIFY "SDL_EMSCRIPTEN_ASYNCIFY" + +/** + * \brief override the binding element for keyboard inputs for Emscripten builds + * + * This hint only applies to the emscripten platform + * + * The variable can be one of + * "#window" - The javascript window object (this is the default) + * "#document" - The javascript document object + * "#screen" - the javascript window.screen object + * "#canvas" - the WebGL canvas element + * any other string without a leading # sign applies to the element on the page with that ID. + */ +#define SDL_HINT_EMSCRIPTEN_KEYBOARD_ELEMENT "SDL_EMSCRIPTEN_KEYBOARD_ELEMENT" + +/** + * \brief A variable that controls whether Steam Controllers should be exposed using the SDL joystick and game controller APIs * * The variable can be set to the following values: - * "0" - Disable XInput detection (only uses direct input) - * "1" - Enable XInput detection (the default) + * "0" - Do not scan for Steam Controllers + * "1" - Scan for Steam Controllers (the default) + * + * The default value is "1". This hint must be set before initializing the joystick subsystem. */ -#define SDL_HINT_XINPUT_ENABLED "SDL_XINPUT_ENABLED" +#define SDL_HINT_ENABLE_STEAM_CONTROLLERS "SDL_ENABLE_STEAM_CONTROLLERS" /** - * \brief A variable that causes SDL to use the old axis and button mapping for XInput devices. + * \brief A variable controlling whether SDL logs all events pushed onto its internal queue. * - * This hint is for backwards compatibility only and will be removed in SDL 2.1 + * This variable can be set to the following values: * - * The default value is "0". This hint must be set before SDL_Init() + * "0" - Don't log any events (default) + * "1" - Log all events except mouse and finger motion, which are pretty spammy. + * "2" - Log all events. + * + * This is generally meant to be used to debug SDL itself, but can be useful + * for application developers that need better visibility into what is going + * on in the event queue. Logged events are sent through SDL_Log(), which + * means by default they appear on stdout on most platforms or maybe + * OutputDebugString() on Windows, and can be funneled by the app with + * SDL_LogSetOutputFunction(), etc. + * + * This hint can be toggled on and off at runtime, if you only need to log + * events for a small subset of program execution. */ -#define SDL_HINT_XINPUT_USE_OLD_JOYSTICK_MAPPING "SDL_XINPUT_USE_OLD_JOYSTICK_MAPPING" +#define SDL_HINT_EVENT_LOGGING "SDL_EVENT_LOGGING" + +/** + * \brief A variable controlling how 3D acceleration is used to accelerate the SDL screen surface. + * + * SDL can try to accelerate the SDL screen surface by using streaming + * textures with a 3D rendering engine. This variable controls whether and + * how this is done. + * + * This variable can be set to the following values: + * "0" - Disable 3D acceleration + * "1" - Enable 3D acceleration, using the default renderer. + * "X" - Enable 3D acceleration, using X where X is one of the valid rendering drivers. (e.g. "direct3d", "opengl", etc.) + * + * By default SDL tries to make a best guess for each platform whether + * to use acceleration or not. + */ +#define SDL_HINT_FRAMEBUFFER_ACCELERATION "SDL_FRAMEBUFFER_ACCELERATION" /** * \brief A variable that lets you manually hint extra gamecontroller db entries. @@ -456,6 +449,25 @@ extern "C" { */ #define SDL_HINT_GAMECONTROLLERCONFIG_FILE "SDL_GAMECONTROLLERCONFIG_FILE" +/** + * \brief A variable that overrides the automatic controller type detection + * + * The variable should be comma separated entries, in the form: VID/PID=type + * + * The VID and PID should be hexadecimal with exactly 4 digits, e.g. 0x00fd + * + * The type should be one of: + * Xbox360 + * XboxOne + * PS3 + * PS4 + * PS5 + * SwitchPro + * + * This hint affects what driver is used, and must be set before calling SDL_Init(SDL_INIT_GAMECONTROLLER) + */ +#define SDL_HINT_GAMECONTROLLERTYPE "SDL_GAMECONTROLLERTYPE" + /** * \brief A variable containing a list of devices to skip when scanning for game controllers. * @@ -482,6 +494,89 @@ extern "C" { */ #define SDL_HINT_GAMECONTROLLER_IGNORE_DEVICES_EXCEPT "SDL_GAMECONTROLLER_IGNORE_DEVICES_EXCEPT" +/** + * \brief If set, game controller face buttons report their values according to their labels instead of their positional layout. + * + * For example, on Nintendo Switch controllers, normally you'd get: + * + * (Y) + * (X) (B) + * (A) + * + * but if this hint is set, you'll get: + * + * (X) + * (Y) (A) + * (B) + * + * The variable can be set to the following values: + * "0" - Report the face buttons by position, as though they were on an Xbox controller. + * "1" - Report the face buttons by label instead of position + * + * The default value is "1". This hint may be set at any time. + */ +#define SDL_HINT_GAMECONTROLLER_USE_BUTTON_LABELS "SDL_GAMECONTROLLER_USE_BUTTON_LABELS" + +/** + * \brief A variable controlling whether grabbing input grabs the keyboard + * + * This variable can be set to the following values: + * "0" - Grab will affect only the mouse + * "1" - Grab will affect mouse and keyboard + * + * By default SDL will not grab the keyboard so system shortcuts still work. + */ +#define SDL_HINT_GRAB_KEYBOARD "SDL_GRAB_KEYBOARD" + +/** + * \brief A variable controlling whether the idle timer is disabled on iOS. + * + * When an iOS app does not receive touches for some time, the screen is + * dimmed automatically. For games where the accelerometer is the only input + * this is problematic. This functionality can be disabled by setting this + * hint. + * + * As of SDL 2.0.4, SDL_EnableScreenSaver() and SDL_DisableScreenSaver() + * accomplish the same thing on iOS. They should be preferred over this hint. + * + * This variable can be set to the following values: + * "0" - Enable idle timer + * "1" - Disable idle timer + */ +#define SDL_HINT_IDLE_TIMER_DISABLED "SDL_IOS_IDLE_TIMER_DISABLED" + +/** + * \brief A variable to control whether certain IMEs should handle text editing internally instead of sending SDL_TEXTEDITING events. + * + * The variable can be set to the following values: + * "0" - SDL_TEXTEDITING events are sent, and it is the application's + * responsibility to render the text from these events and + * differentiate it somehow from committed text. (default) + * "1" - If supported by the IME then SDL_TEXTEDITING events are not sent, + * and text that is being composed will be rendered in its own UI. + */ +#define SDL_HINT_IME_INTERNAL_EDITING "SDL_IME_INTERNAL_EDITING" + +/** + * \brief A variable to control whether certain IMEs should show native UI components (such as the Candidate List) instead of suppressing them. + * + * The variable can be set to the following values: + * "0" - Native UI components are not display. (default) + * "1" - Native UI components are displayed. + */ +#define SDL_HINT_IME_SHOW_UI "SDL_IME_SHOW_UI" + +/** + * \brief A variable controlling whether the home indicator bar on iPhone X + * should be hidden. + * + * This variable can be set to the following values: + * "0" - The indicator bar is not hidden (default for windowed applications) + * "1" - The indicator bar is hidden and is shown when the screen is touched (useful for movie playback applications) + * "2" - The indicator bar is dim and the first swipe makes it visible and the second swipe performs the "home" action (default for fullscreen applications) + */ +#define SDL_HINT_IOS_HIDE_HOME_INDICATOR "SDL_IOS_HIDE_HOME_INDICATOR" + /** * \brief A variable that lets you enable joystick (and gamecontroller) events even when your app is in the background. * @@ -506,6 +601,39 @@ extern "C" { */ #define SDL_HINT_JOYSTICK_HIDAPI "SDL_JOYSTICK_HIDAPI" +/** + * \brief A variable controlling whether the HIDAPI driver for Nintendo GameCube controllers should be used. + * + * This variable can be set to the following values: + * "0" - HIDAPI driver is not used + * "1" - HIDAPI driver is used + * + * The default is the value of SDL_HINT_JOYSTICK_HIDAPI + */ +#define SDL_HINT_JOYSTICK_HIDAPI_GAMECUBE "SDL_JOYSTICK_HIDAPI_GAMECUBE" + + /** + * \brief A variable controlling whether Switch Joy-Cons should be treated the same as Switch Pro Controllers when using the HIDAPI driver. + * + * This variable can be set to the following values: + * "0" - basic Joy-Con support with no analog input (the default) + * "1" - Joy-Cons treated as half full Pro Controllers with analog inputs and sensors + * + * This does not combine Joy-Cons into a single controller. That's up to the user. + */ +#define SDL_HINT_JOYSTICK_HIDAPI_JOY_CONS "SDL_JOYSTICK_HIDAPI_JOY_CONS" + + /** + * \brief A variable controlling whether the HIDAPI driver for Amazon Luna controllers connected via Bluetooth should be used. + * + * This variable can be set to the following values: + * "0" - HIDAPI driver is not used + * "1" - HIDAPI driver is used + * + * The default is the value of SDL_HINT_JOYSTICK_HIDAPI + */ +#define SDL_HINT_JOYSTICK_HIDAPI_LUNA "SDL_JOYSTICK_HIDAPI_LUNA" + /** * \brief A variable controlling whether the HIDAPI driver for PS4 controllers should be used. * @@ -529,11 +657,16 @@ extern "C" { * * Once extended reports are enabled, they can not be disabled without * power cycling the controller. + * + * For compatibility with applications written for versions of SDL prior + * to the introduction of PS5 controller support, this value will also + * control the state of extended reports on PS5 controllers when the + * SDL_HINT_JOYSTICK_HIDAPI_PS5_RUMBLE hint is not explicitly set. */ #define SDL_HINT_JOYSTICK_HIDAPI_PS4_RUMBLE "SDL_JOYSTICK_HIDAPI_PS4_RUMBLE" /** - * \brief A variable controlling whether the HIDAPI driver for Steam Controllers should be used. + * \brief A variable controlling whether the HIDAPI driver for PS5 controllers should be used. * * This variable can be set to the following values: * "0" - HIDAPI driver is not used @@ -541,6 +674,57 @@ extern "C" { * * The default is the value of SDL_HINT_JOYSTICK_HIDAPI */ +#define SDL_HINT_JOYSTICK_HIDAPI_PS5 "SDL_JOYSTICK_HIDAPI_PS5" + +/** + * \brief A variable controlling whether the player LEDs should be lit to indicate which player is associated with a PS5 controller. + * + * This variable can be set to the following values: + * "0" - player LEDs are not enabled + * "1" - player LEDs are enabled (the default) + */ +#define SDL_HINT_JOYSTICK_HIDAPI_PS5_PLAYER_LED "SDL_JOYSTICK_HIDAPI_PS5_PLAYER_LED" + +/** + * \brief A variable controlling whether extended input reports should be used for PS5 controllers when using the HIDAPI driver. + * + * This variable can be set to the following values: + * "0" - extended reports are not enabled (the default) + * "1" - extended reports + * + * Extended input reports allow rumble on Bluetooth PS5 controllers, but + * break DirectInput handling for applications that don't use SDL. + * + * Once extended reports are enabled, they can not be disabled without + * power cycling the controller. + * + * For compatibility with applications written for versions of SDL prior + * to the introduction of PS5 controller support, this value defaults to + * the value of SDL_HINT_JOYSTICK_HIDAPI_PS4_RUMBLE. + */ +#define SDL_HINT_JOYSTICK_HIDAPI_PS5_RUMBLE "SDL_JOYSTICK_HIDAPI_PS5_RUMBLE" + +/** + * \brief A variable controlling whether the HIDAPI driver for Google Stadia controllers should be used. + * + * This variable can be set to the following values: + * "0" - HIDAPI driver is not used + * "1" - HIDAPI driver is used + * + * The default is the value of SDL_HINT_JOYSTICK_HIDAPI + */ +#define SDL_HINT_JOYSTICK_HIDAPI_STADIA "SDL_JOYSTICK_HIDAPI_STADIA" + +/** + * \brief A variable controlling whether the HIDAPI driver for Steam Controllers should be used. + * + * This variable can be set to the following values: + * "0" - HIDAPI driver is not used + * "1" - HIDAPI driver is used for Steam Controllers, which requires Bluetooth access + * and may prompt the user for permission on iOS and Android. + * + * The default is "0" + */ #define SDL_HINT_JOYSTICK_HIDAPI_STEAM "SDL_JOYSTICK_HIDAPI_STEAM" /** @@ -554,6 +738,17 @@ extern "C" { */ #define SDL_HINT_JOYSTICK_HIDAPI_SWITCH "SDL_JOYSTICK_HIDAPI_SWITCH" +/** + * \brief A variable controlling whether the Home button LED should be turned on when a Nintendo Switch controller is opened + * + * This variable can be set to the following values: + * "0" - home button LED is turned off + * "1" - home button LED is turned on + * + * By default the Home button LED state is not changed. + */ +#define SDL_HINT_JOYSTICK_HIDAPI_SWITCH_HOME_LED "SDL_JOYSTICK_HIDAPI_SWITCH_HOME_LED" + /** * \brief A variable controlling whether the HIDAPI driver for XBox controllers should be used. * @@ -561,48 +756,256 @@ extern "C" { * "0" - HIDAPI driver is not used * "1" - HIDAPI driver is used * - * The default is the value of SDL_HINT_JOYSTICK_HIDAPI + * The default is "0" on Windows, otherwise the value of SDL_HINT_JOYSTICK_HIDAPI */ #define SDL_HINT_JOYSTICK_HIDAPI_XBOX "SDL_JOYSTICK_HIDAPI_XBOX" + /** + * \brief A variable controlling whether the RAWINPUT joystick drivers should be used for better handling XInput-capable devices. + * + * This variable can be set to the following values: + * "0" - RAWINPUT drivers are not used + * "1" - RAWINPUT drivers are used (the default) + * + */ +#define SDL_HINT_JOYSTICK_RAWINPUT "SDL_JOYSTICK_RAWINPUT" + + /** + * \brief A variable controlling whether the RAWINPUT driver should pull correlated data from XInput. + * + * This variable can be set to the following values: + * "0" - RAWINPUT driver will only use data from raw input APIs + * "1" - RAWINPUT driver will also pull data from XInput, providing + * better trigger axes, guide button presses, and rumble support + * for Xbox controllers + * + * The default is "1". This hint applies to any joysticks opened after setting the hint. + */ +#define SDL_HINT_JOYSTICK_RAWINPUT_CORRELATE_XINPUT "SDL_JOYSTICK_RAWINPUT_CORRELATE_XINPUT" + + /** + * \brief A variable controlling whether a separate thread should be used + * for handling joystick detection and raw input messages on Windows + * + * This variable can be set to the following values: + * "0" - A separate thread is not used (the default) + * "1" - A separate thread is used for handling raw input messages + * + */ +#define SDL_HINT_JOYSTICK_THREAD "SDL_JOYSTICK_THREAD" + /** - * \brief A variable that controls whether Steam Controllers should be exposed using the SDL joystick and game controller APIs + * \brief Determines whether SDL enforces that DRM master is required in order + * to initialize the KMSDRM video backend. * - * The variable can be set to the following values: - * "0" - Do not scan for Steam Controllers - * "1" - Scan for Steam Controllers (the default) + * The DRM subsystem has a concept of a "DRM master" which is a DRM client that + * has the ability to set planes, set cursor, etc. When SDL is DRM master, it + * can draw to the screen using the SDL rendering APIs. Without DRM master, SDL + * is still able to process input and query attributes of attached displays, + * but it cannot change display state or draw to the screen directly. * - * The default value is "1". This hint must be set before initializing the joystick subsystem. + * In some cases, it can be useful to have the KMSDRM backend even if it cannot + * be used for rendering. An app may want to use SDL for input processing while + * using another rendering API (such as an MMAL overlay on Raspberry Pi) or + * using its own code to render to DRM overlays that SDL doesn't support. + * + * This hint must be set before initializing the video subsystem. + * + * This variable can be set to the following values: + * "0" - SDL will allow usage of the KMSDRM backend without DRM master + * "1" - SDL Will require DRM master to use the KMSDRM backend (default) */ -#define SDL_HINT_ENABLE_STEAM_CONTROLLERS "SDL_ENABLE_STEAM_CONTROLLERS" +#define SDL_HINT_KMSDRM_REQUIRE_DRM_MASTER "SDL_KMSDRM_REQUIRE_DRM_MASTER" + /** + * \brief A comma separated list of devices to open as joysticks + * + * This variable is currently only used by the Linux joystick driver. + */ +#define SDL_HINT_JOYSTICK_DEVICE "SDL_JOYSTICK_DEVICE" + + /** + * \brief A variable controlling whether to use the classic /dev/input/js* joystick interface or the newer /dev/input/event* joystick interface on Linux + * + * This variable can be set to the following values: + * "0" - Use /dev/input/event* + * "1" - Use /dev/input/js* + * + * By default the /dev/input/event* interfaces are used + */ +#define SDL_HINT_LINUX_JOYSTICK_CLASSIC "SDL_LINUX_JOYSTICK_CLASSIC" + + /** + * \brief A variable controlling whether joysticks on Linux adhere to their HID-defined deadzones or return unfiltered values. + * + * This variable can be set to the following values: + * "0" - Return unfiltered joystick axis values (the default) + * "1" - Return axis values with deadzones taken into account + */ +#define SDL_HINT_LINUX_JOYSTICK_DEADZONES "SDL_LINUX_JOYSTICK_DEADZONES" /** - * \brief If set to "0" then never set the top most bit on a SDL Window, even if the video mode expects it. - * This is a debugging aid for developers and not expected to be used by end users. The default is "1" +* \brief When set don't force the SDL app to become a foreground process +* +* This hint only applies to Mac OS X. +* +*/ +#define SDL_HINT_MAC_BACKGROUND_APP "SDL_MAC_BACKGROUND_APP" + +/** + * \brief A variable that determines whether ctrl+click should generate a right-click event on Mac + * + * If present, holding ctrl while left clicking will generate a right click + * event when on Mac. + */ +#define SDL_HINT_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK "SDL_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK" + +/** + * \brief A variable setting the double click radius, in pixels. + */ +#define SDL_HINT_MOUSE_DOUBLE_CLICK_RADIUS "SDL_MOUSE_DOUBLE_CLICK_RADIUS" + +/** + * \brief A variable setting the double click time, in milliseconds. + */ +#define SDL_HINT_MOUSE_DOUBLE_CLICK_TIME "SDL_MOUSE_DOUBLE_CLICK_TIME" + +/** + * \brief Allow mouse click events when clicking to focus an SDL window * * This variable can be set to the following values: - * "0" - don't allow topmost - * "1" - allow topmost + * "0" - Ignore mouse clicks that activate a window + * "1" - Generate events for mouse clicks that activate a window + * + * By default SDL will ignore mouse clicks that activate a window */ -#define SDL_HINT_ALLOW_TOPMOST "SDL_ALLOW_TOPMOST" +#define SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH "SDL_MOUSE_FOCUS_CLICKTHROUGH" /** - * \brief A variable that controls the timer resolution, in milliseconds. - * - * The higher resolution the timer, the more frequently the CPU services - * timer interrupts, and the more precise delays are, but this takes up - * power and CPU time. This hint is only used on Windows 7 and earlier. - * - * See this blog post for more information: - * http://randomascii.wordpress.com/2013/07/08/windows-timer-resolution-megawatts-wasted/ - * - * If this variable is set to "0", the system timer resolution is not set. - * - * The default value is "1". This hint may be set at any time. + * \brief A variable setting the speed scale for mouse motion, in floating point, when the mouse is not in relative mode */ -#define SDL_HINT_TIMER_RESOLUTION "SDL_TIMER_RESOLUTION" +#define SDL_HINT_MOUSE_NORMAL_SPEED_SCALE "SDL_MOUSE_NORMAL_SPEED_SCALE" +/** + * \brief A variable controlling whether relative mouse mode is implemented using mouse warping + * + * This variable can be set to the following values: + * "0" - Relative mouse mode uses raw input + * "1" - Relative mouse mode uses mouse warping + * + * By default SDL will use raw input for relative mouse mode + */ +#define SDL_HINT_MOUSE_RELATIVE_MODE_WARP "SDL_MOUSE_RELATIVE_MODE_WARP" + +/** + * \brief A variable controlling whether relative mouse motion is affected by renderer scaling + * + * This variable can be set to the following values: + * "0" - Relative motion is unaffected by DPI or renderer's logical size + * "1" - Relative motion is scaled according to DPI scaling and logical size + * + * By default relative mouse deltas are affected by DPI and renderer scaling + */ +#define SDL_HINT_MOUSE_RELATIVE_SCALING "SDL_MOUSE_RELATIVE_SCALING" + +/** + * \brief A variable setting the scale for mouse motion, in floating point, when the mouse is in relative mode + */ +#define SDL_HINT_MOUSE_RELATIVE_SPEED_SCALE "SDL_MOUSE_RELATIVE_SPEED_SCALE" + +/** + * \brief A variable controlling whether mouse events should generate synthetic touch events + * + * This variable can be set to the following values: + * "0" - Mouse events will not generate touch events (default for desktop platforms) + * "1" - Mouse events will generate touch events (default for mobile platforms, such as Android and iOS) + */ +#define SDL_HINT_MOUSE_TOUCH_EVENTS "SDL_MOUSE_TOUCH_EVENTS" + +/** + * \brief Tell SDL not to catch the SIGINT or SIGTERM signals. + * + * This hint only applies to Unix-like platforms, and should set before + * any calls to SDL_Init() + * + * The variable can be set to the following values: + * "0" - SDL will install a SIGINT and SIGTERM handler, and when it + * catches a signal, convert it into an SDL_QUIT event. + * "1" - SDL will not install a signal handler at all. + */ +#define SDL_HINT_NO_SIGNAL_HANDLERS "SDL_NO_SIGNAL_HANDLERS" + +/** + * \brief A variable controlling what driver to use for OpenGL ES contexts. + * + * On some platforms, currently Windows and X11, OpenGL drivers may support + * creating contexts with an OpenGL ES profile. By default SDL uses these + * profiles, when available, otherwise it attempts to load an OpenGL ES + * library, e.g. that provided by the ANGLE project. This variable controls + * whether SDL follows this default behaviour or will always load an + * OpenGL ES library. + * + * Circumstances where this is useful include + * - Testing an app with a particular OpenGL ES implementation, e.g ANGLE, + * or emulator, e.g. those from ARM, Imagination or Qualcomm. + * - Resolving OpenGL ES function addresses at link time by linking with + * the OpenGL ES library instead of querying them at run time with + * SDL_GL_GetProcAddress(). + * + * Caution: for an application to work with the default behaviour across + * different OpenGL drivers it must query the OpenGL ES function + * addresses at run time using SDL_GL_GetProcAddress(). + * + * This variable is ignored on most platforms because OpenGL ES is native + * or not supported. + * + * This variable can be set to the following values: + * "0" - Use ES profile of OpenGL, if available. (Default when not set.) + * "1" - Load OpenGL ES library using the default library names. + * + */ +#define SDL_HINT_OPENGL_ES_DRIVER "SDL_OPENGL_ES_DRIVER" + +/** + * \brief A variable controlling which orientations are allowed on iOS/Android. + * + * In some circumstances it is necessary to be able to explicitly control + * which UI orientations are allowed. + * + * This variable is a space delimited list of the following values: + * "LandscapeLeft", "LandscapeRight", "Portrait" "PortraitUpsideDown" + */ +#define SDL_HINT_ORIENTATIONS "SDL_IOS_ORIENTATIONS" + +/** + * \brief A variable controlling the use of a sentinel event when polling the event queue + * + * This variable can be set to the following values: + * "0" - Disable poll sentinels + * "1" - Enable poll sentinels + * + * When polling for events, SDL_PumpEvents is used to gather new events from devices. + * If a device keeps producing new events between calls to SDL_PumpEvents, a poll loop will + * become stuck until the new events stop. + * This is most noticable when moving a high frequency mouse. + * + * By default, poll sentinels are enabled. + */ +#define SDL_HINT_POLL_SENTINEL "SDL_POLL_SENTINEL" + +/** + * \brief Override for SDL_GetPreferredLocales() + * + * If set, this will be favored over anything the OS might report for the + * user's preferred locales. Changing this hint at runtime will not generate + * a SDL_LOCALECHANGED event (but if you can change the hint, you can push + * your own event, if you want). + * + * The format of this hint is a comma-separated list of language and locale, + * combined with an underscore, as is a common format: "en_GB". Locale is + * optional: "en". So you might have a list like this: "en_GB,jp,es_PT" + */ +#define SDL_HINT_PREFERRED_LOCALES "SDL_PREFERRED_LOCALES" /** * \brief A variable describing the content orientation on QtWayland-based platforms. @@ -632,6 +1035,208 @@ extern "C" { */ #define SDL_HINT_QTWAYLAND_WINDOW_FLAGS "SDL_QTWAYLAND_WINDOW_FLAGS" +/** + * \brief A variable controlling whether the 2D render API is compatible or efficient. + * + * This variable can be set to the following values: + * + * "0" - Don't use batching to make rendering more efficient. + * "1" - Use batching, but might cause problems if app makes its own direct OpenGL calls. + * + * Up to SDL 2.0.9, the render API would draw immediately when requested. Now + * it batches up draw requests and sends them all to the GPU only when forced + * to (during SDL_RenderPresent, when changing render targets, by updating a + * texture that the batch needs, etc). This is significantly more efficient, + * but it can cause problems for apps that expect to render on top of the + * render API's output. As such, SDL will disable batching if a specific + * render backend is requested (since this might indicate that the app is + * planning to use the underlying graphics API directly). This hint can + * be used to explicitly request batching in this instance. It is a contract + * that you will either never use the underlying graphics API directly, or + * if you do, you will call SDL_RenderFlush() before you do so any current + * batch goes to the GPU before your work begins. Not following this contract + * will result in undefined behavior. + */ +#define SDL_HINT_RENDER_BATCHING "SDL_RENDER_BATCHING" + +/** + * \brief A variable controlling how the 2D render API renders lines + * + * This variable can be set to the following values: + * "0" - Use the default line drawing method (Bresenham's line algorithm as of SDL 2.0.20) + * "1" - Use the driver point API using Bresenham's line algorithm (correct, draws many points) + * "2" - Use the driver line API (occasionally misses line endpoints based on hardware driver quirks, was the default before 2.0.20) + * "3" - Use the driver geometry API (correct, draws thicker diagonal lines) + * + * This variable should be set when the renderer is created. + */ +#define SDL_HINT_RENDER_LINE_METHOD "SDL_RENDER_LINE_METHOD" + +/** + * \brief A variable controlling whether to enable Direct3D 11+'s Debug Layer. + * + * This variable does not have any effect on the Direct3D 9 based renderer. + * + * This variable can be set to the following values: + * "0" - Disable Debug Layer use + * "1" - Enable Debug Layer use + * + * By default, SDL does not use Direct3D Debug Layer. + */ +#define SDL_HINT_RENDER_DIRECT3D11_DEBUG "SDL_RENDER_DIRECT3D11_DEBUG" + +/** + * \brief A variable controlling whether the Direct3D device is initialized for thread-safe operations. + * + * This variable can be set to the following values: + * "0" - Thread-safety is not enabled (faster) + * "1" - Thread-safety is enabled + * + * By default the Direct3D device is created with thread-safety disabled. + */ +#define SDL_HINT_RENDER_DIRECT3D_THREADSAFE "SDL_RENDER_DIRECT3D_THREADSAFE" + +/** + * \brief A variable specifying which render driver to use. + * + * If the application doesn't pick a specific renderer to use, this variable + * specifies the name of the preferred renderer. If the preferred renderer + * can't be initialized, the normal default renderer is used. + * + * This variable is case insensitive and can be set to the following values: + * "direct3d" + * "opengl" + * "opengles2" + * "opengles" + * "metal" + * "software" + * + * The default varies by platform, but it's the first one in the list that + * is available on the current platform. + */ +#define SDL_HINT_RENDER_DRIVER "SDL_RENDER_DRIVER" + +/** + * \brief A variable controlling the scaling policy for SDL_RenderSetLogicalSize. + * + * This variable can be set to the following values: + * "0" or "letterbox" - Uses letterbox/sidebars to fit the entire rendering on screen + * "1" or "overscan" - Will zoom the rendering so it fills the entire screen, allowing edges to be drawn offscreen + * + * By default letterbox is used + */ +#define SDL_HINT_RENDER_LOGICAL_SIZE_MODE "SDL_RENDER_LOGICAL_SIZE_MODE" + +/** + * \brief A variable controlling whether the OpenGL render driver uses shaders if they are available. + * + * This variable can be set to the following values: + * "0" - Disable shaders + * "1" - Enable shaders + * + * By default shaders are used if OpenGL supports them. + */ +#define SDL_HINT_RENDER_OPENGL_SHADERS "SDL_RENDER_OPENGL_SHADERS" + +/** + * \brief A variable controlling the scaling quality + * + * This variable can be set to the following values: + * "0" or "nearest" - Nearest pixel sampling + * "1" or "linear" - Linear filtering (supported by OpenGL and Direct3D) + * "2" or "best" - Currently this is the same as "linear" + * + * By default nearest pixel sampling is used + */ +#define SDL_HINT_RENDER_SCALE_QUALITY "SDL_RENDER_SCALE_QUALITY" + +/** + * \brief A variable controlling whether updates to the SDL screen surface should be synchronized with the vertical refresh, to avoid tearing. + * + * This variable can be set to the following values: + * "0" - Disable vsync + * "1" - Enable vsync + * + * By default SDL does not sync screen surface updates with vertical refresh. + */ +#define SDL_HINT_RENDER_VSYNC "SDL_RENDER_VSYNC" + + /** + * \brief A variable to control whether the return key on the soft keyboard + * should hide the soft keyboard on Android and iOS. + * + * The variable can be set to the following values: + * "0" - The return key will be handled as a key event. This is the behaviour of SDL <= 2.0.3. (default) + * "1" - The return key will hide the keyboard. + * + * The value of this hint is used at runtime, so it can be changed at any time. + */ +#define SDL_HINT_RETURN_KEY_HIDES_IME "SDL_RETURN_KEY_HIDES_IME" + +/** + * \brief Tell SDL which Dispmanx layer to use on a Raspberry PI + * + * Also known as Z-order. The variable can take a negative or positive value. + * The default is 10000. + */ +#define SDL_HINT_RPI_VIDEO_LAYER "SDL_RPI_VIDEO_LAYER" + +/** + * \brief Specify an "activity name" for screensaver inhibition. + * + * Some platforms, notably Linux desktops, list the applications which are + * inhibiting the screensaver or other power-saving features. + * + * This hint lets you specify the "activity name" sent to the OS when + * SDL_DisableScreenSaver() is used (or the screensaver is automatically + * disabled). The contents of this hint are used when the screensaver is + * disabled. You should use a string that describes what your program is doing + * (and, therefore, why the screensaver is disabled). For example, "Playing a + * game" or "Watching a video". + * + * Setting this to "" or leaving it unset will have SDL use a reasonable + * default: "Playing a game" or something similar. + * + * On targets where this is not supported, this hint does nothing. + */ +#define SDL_HINT_SCREENSAVER_INHIBIT_ACTIVITY_NAME "SDL_SCREENSAVER_INHIBIT_ACTIVITY_NAME" + +/** + * \brief Specifies whether SDL_THREAD_PRIORITY_TIME_CRITICAL should be treated as realtime. + * + * On some platforms, like Linux, a realtime priority thread may be subject to restrictions + * that require special handling by the application. This hint exists to let SDL know that + * the app is prepared to handle said restrictions. + * + * On Linux, SDL will apply the following configuration to any thread that becomes realtime: + * * The SCHED_RESET_ON_FORK bit will be set on the scheduling policy, + * * An RLIMIT_RTTIME budget will be configured to the rtkit specified limit. + * * Exceeding this limit will result in the kernel sending SIGKILL to the app, + * * Refer to the man pages for more information. + * + * This variable can be set to the following values: + * "0" - default platform specific behaviour + * "1" - Force SDL_THREAD_PRIORITY_TIME_CRITICAL to a realtime scheduling policy + */ +#define SDL_HINT_THREAD_FORCE_REALTIME_TIME_CRITICAL "SDL_THREAD_FORCE_REALTIME_TIME_CRITICAL" + +/** +* \brief A string specifying additional information to use with SDL_SetThreadPriority. +* +* By default SDL_SetThreadPriority will make appropriate system changes in order to +* apply a thread priority. For example on systems using pthreads the scheduler policy +* is changed automatically to a policy that works well with a given priority. +* Code which has specific requirements can override SDL's default behavior with this hint. +* +* pthread hint values are "current", "other", "fifo" and "rr". +* Currently no other platform hint values are defined but may be in the future. +* +* \note On Linux, the kernel may send SIGKILL to realtime tasks which exceed the distro +* configured execution budget for rtkit. This budget can be queried through RLIMIT_RTTIME +* after calling SDL_SetThreadPriority(). +*/ +#define SDL_HINT_THREAD_PRIORITY_POLICY "SDL_THREAD_PRIORITY_POLICY" + /** * \brief A string specifying SDL's threads stack size in bytes or "0" for the backend's default size * @@ -646,34 +1251,141 @@ extern "C" { */ #define SDL_HINT_THREAD_STACK_SIZE "SDL_THREAD_STACK_SIZE" +/** + * \brief A variable that controls the timer resolution, in milliseconds. + * + * The higher resolution the timer, the more frequently the CPU services + * timer interrupts, and the more precise delays are, but this takes up + * power and CPU time. This hint is only used on Windows. + * + * See this blog post for more information: + * http://randomascii.wordpress.com/2013/07/08/windows-timer-resolution-megawatts-wasted/ + * + * If this variable is set to "0", the system timer resolution is not set. + * + * The default value is "1". This hint may be set at any time. + */ +#define SDL_HINT_TIMER_RESOLUTION "SDL_TIMER_RESOLUTION" + +/** + * \brief A variable controlling whether touch events should generate synthetic mouse events + * + * This variable can be set to the following values: + * "0" - Touch events will not generate mouse events + * "1" - Touch events will generate mouse events + * + * By default SDL will generate mouse events for touch events + */ +#define SDL_HINT_TOUCH_MOUSE_EVENTS "SDL_TOUCH_MOUSE_EVENTS" + +/** + * \brief A variable controlling whether the Android / tvOS remotes + * should be listed as joystick devices, instead of sending keyboard events. + * + * This variable can be set to the following values: + * "0" - Remotes send enter/escape/arrow key events + * "1" - Remotes are available as 2 axis, 2 button joysticks (the default). + */ +#define SDL_HINT_TV_REMOTE_AS_JOYSTICK "SDL_TV_REMOTE_AS_JOYSTICK" + +/** + * \brief A variable controlling whether the screensaver is enabled. + * + * This variable can be set to the following values: + * "0" - Disable screensaver + * "1" - Enable screensaver + * + * By default SDL will disable the screensaver. + */ +#define SDL_HINT_VIDEO_ALLOW_SCREENSAVER "SDL_VIDEO_ALLOW_SCREENSAVER" + +/** + * \brief Tell the video driver that we only want a double buffer. + * + * By default, most lowlevel 2D APIs will use a triple buffer scheme that + * wastes no CPU time on waiting for vsync after issuing a flip, but + * introduces a frame of latency. On the other hand, using a double buffer + * scheme instead is recommended for cases where low latency is an important + * factor because we save a whole frame of latency. + * We do so by waiting for vsync immediately after issuing a flip, usually just + * after eglSwapBuffers call in the backend's *_SwapWindow function. + * + * Since it's driver-specific, it's only supported where possible and + * implemented. Currently supported the following drivers: + * + * - KMSDRM (kmsdrm) + * - Raspberry Pi (raspberrypi) + */ +#define SDL_HINT_VIDEO_DOUBLE_BUFFER "SDL_VIDEO_DOUBLE_BUFFER" + +/** + * \brief A variable controlling whether the EGL window is allowed to be + * composited as transparent, rather than opaque. + * + * Most window systems will always render windows opaque, even if the surface + * format has an alpha channel. This is not always true, however, so by default + * SDL will try to enforce opaque composition. To override this behavior, you + * can set this hint to "1". + */ +#define SDL_HINT_VIDEO_EGL_ALLOW_TRANSPARENCY "SDL_VIDEO_EGL_ALLOW_TRANSPARENCY" + +/** + * \brief A variable controlling whether the graphics context is externally managed. + * + * This variable can be set to the following values: + * "0" - SDL will manage graphics contexts that are attached to windows. + * "1" - Disable graphics context management on windows. + * + * By default SDL will manage OpenGL contexts in certain situations. For example, on Android the + * context will be automatically saved and restored when pausing the application. Additionally, some + * platforms will assume usage of OpenGL if Vulkan isn't used. Setting this to "1" will prevent this + * behavior, which is desireable when the application manages the graphics context, such as + * an externally managed OpenGL context or attaching a Vulkan surface to the window. + */ +#define SDL_HINT_VIDEO_EXTERNAL_CONTEXT "SDL_VIDEO_EXTERNAL_CONTEXT" + /** * \brief If set to 1, then do not allow high-DPI windows. ("Retina" on Mac and iOS) */ #define SDL_HINT_VIDEO_HIGHDPI_DISABLED "SDL_VIDEO_HIGHDPI_DISABLED" /** - * \brief A variable that determines whether ctrl+click should generate a right-click event on Mac + * \brief A variable that dictates policy for fullscreen Spaces on Mac OS X. * - * If present, holding ctrl while left clicking will generate a right click - * event when on Mac. + * This hint only applies to Mac OS X. + * + * The variable can be set to the following values: + * "0" - Disable Spaces support (FULLSCREEN_DESKTOP won't use them and + * SDL_WINDOW_RESIZABLE windows won't offer the "fullscreen" + * button on their titlebars). + * "1" - Enable Spaces support (FULLSCREEN_DESKTOP will use them and + * SDL_WINDOW_RESIZABLE windows will offer the "fullscreen" + * button on their titlebars). + * + * The default value is "1". Spaces are disabled regardless of this hint if + * the OS isn't at least Mac OS X Lion (10.7). This hint must be set before + * any windows are created. */ -#define SDL_HINT_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK "SDL_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK" +#define SDL_HINT_VIDEO_MAC_FULLSCREEN_SPACES "SDL_VIDEO_MAC_FULLSCREEN_SPACES" /** -* \brief A variable specifying which shader compiler to preload when using the Chrome ANGLE binaries -* -* SDL has EGL and OpenGL ES2 support on Windows via the ANGLE project. It -* can use two different sets of binaries, those compiled by the user from source -* or those provided by the Chrome browser. In the later case, these binaries require -* that SDL loads a DLL providing the shader compiler. -* -* This variable can be set to the following values: -* "d3dcompiler_46.dll" - default, best for Vista or later. -* "d3dcompiler_43.dll" - for XP support. -* "none" - do not load any library, useful if you compiled ANGLE from source and included the compiler in your binaries. -* -*/ -#define SDL_HINT_VIDEO_WIN_D3DCOMPILER "SDL_VIDEO_WIN_D3DCOMPILER" + * \brief Minimize your SDL_Window if it loses key focus when in fullscreen mode. Defaults to false. + * \warning Before SDL 2.0.14, this defaulted to true! In 2.0.14, we're + * seeing if "true" causes more problems than it solves in modern times. + * + */ +#define SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS "SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS" + +/** + * \brief A variable controlling whether the libdecor Wayland backend is allowed to be used. + * + * This variable can be set to the following values: + * "0" - libdecor use is disabled. + * "1" - libdecor use is enabled (default). + * + * libdecor is used over xdg-shell when xdg-decoration protocol is unavailable. + */ +#define SDL_HINT_VIDEO_WAYLAND_ALLOW_LIBDECOR "SDL_VIDEO_WAYLAND_ALLOW_LIBDECOR" /** * \brief A variable that is the address of another SDL_Window* (as a hex string formatted with "%p"). @@ -695,51 +1407,274 @@ extern "C" { #define SDL_HINT_VIDEO_WINDOW_SHARE_PIXEL_FORMAT "SDL_VIDEO_WINDOW_SHARE_PIXEL_FORMAT" /** - * \brief A URL to a WinRT app's privacy policy - * - * All network-enabled WinRT apps must make a privacy policy available to its - * users. On Windows 8, 8.1, and RT, Microsoft mandates that this policy be - * be available in the Windows Settings charm, as accessed from within the app. - * SDL provides code to add a URL-based link there, which can point to the app's - * privacy policy. - * - * To setup a URL to an app's privacy policy, set SDL_HINT_WINRT_PRIVACY_POLICY_URL - * before calling any SDL_Init() functions. The contents of the hint should - * be a valid URL. For example, "http://www.example.com". - * - * The default value is "", which will prevent SDL from adding a privacy policy - * link to the Settings charm. This hint should only be set during app init. - * - * The label text of an app's "Privacy Policy" link may be customized via another - * hint, SDL_HINT_WINRT_PRIVACY_POLICY_LABEL. - * - * Please note that on Windows Phone, Microsoft does not provide standard UI - * for displaying a privacy policy link, and as such, SDL_HINT_WINRT_PRIVACY_POLICY_URL - * will not get used on that platform. Network-enabled phone apps should display - * their privacy policy through some other, in-app means. - */ -#define SDL_HINT_WINRT_PRIVACY_POLICY_URL "SDL_WINRT_PRIVACY_POLICY_URL" +* \brief A variable specifying which shader compiler to preload when using the Chrome ANGLE binaries +* +* SDL has EGL and OpenGL ES2 support on Windows via the ANGLE project. It +* can use two different sets of binaries, those compiled by the user from source +* or those provided by the Chrome browser. In the later case, these binaries require +* that SDL loads a DLL providing the shader compiler. +* +* This variable can be set to the following values: +* "d3dcompiler_46.dll" - default, best for Vista or later. +* "d3dcompiler_43.dll" - for XP support. +* "none" - do not load any library, useful if you compiled ANGLE from source and included the compiler in your binaries. +* +*/ +#define SDL_HINT_VIDEO_WIN_D3DCOMPILER "SDL_VIDEO_WIN_D3DCOMPILER" -/** \brief Label text for a WinRT app's privacy policy link +/** + * \brief A variable controlling whether X11 should use GLX or EGL by default * - * Network-enabled WinRT apps must include a privacy policy. On Windows 8, 8.1, and RT, - * Microsoft mandates that this policy be available via the Windows Settings charm. - * SDL provides code to add a link there, with its label text being set via the - * optional hint, SDL_HINT_WINRT_PRIVACY_POLICY_LABEL. + * This variable can be set to the following values: + * "0" - Use GLX + * "1" - Use EGL * - * Please note that a privacy policy's contents are not set via this hint. A separate - * hint, SDL_HINT_WINRT_PRIVACY_POLICY_URL, is used to link to the actual text of the - * policy. - * - * The contents of this hint should be encoded as a UTF8 string. - * - * The default value is "Privacy Policy". This hint should only be set during app - * initialization, preferably before any calls to SDL_Init(). - * - * For additional information on linking to a privacy policy, see the documentation for - * SDL_HINT_WINRT_PRIVACY_POLICY_URL. + * By default SDL will use GLX when both are present. */ -#define SDL_HINT_WINRT_PRIVACY_POLICY_LABEL "SDL_WINRT_PRIVACY_POLICY_LABEL" +#define SDL_HINT_VIDEO_X11_FORCE_EGL "SDL_VIDEO_X11_FORCE_EGL" + +/** + * \brief A variable controlling whether the X11 _NET_WM_BYPASS_COMPOSITOR hint should be used. + * + * This variable can be set to the following values: + * "0" - Disable _NET_WM_BYPASS_COMPOSITOR + * "1" - Enable _NET_WM_BYPASS_COMPOSITOR + * + * By default SDL will use _NET_WM_BYPASS_COMPOSITOR + * + */ +#define SDL_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR "SDL_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR" + +/** + * \brief A variable controlling whether the X11 _NET_WM_PING protocol should be supported. + * + * This variable can be set to the following values: + * "0" - Disable _NET_WM_PING + * "1" - Enable _NET_WM_PING + * + * By default SDL will use _NET_WM_PING, but for applications that know they + * will not always be able to respond to ping requests in a timely manner they can + * turn it off to avoid the window manager thinking the app is hung. + * The hint is checked in CreateWindow. + */ +#define SDL_HINT_VIDEO_X11_NET_WM_PING "SDL_VIDEO_X11_NET_WM_PING" + +/** + * \brief A variable forcing the visual ID chosen for new X11 windows + * + */ +#define SDL_HINT_VIDEO_X11_WINDOW_VISUALID "SDL_VIDEO_X11_WINDOW_VISUALID" + +/** + * \brief A variable controlling whether the X11 Xinerama extension should be used. + * + * This variable can be set to the following values: + * "0" - Disable Xinerama + * "1" - Enable Xinerama + * + * By default SDL will use Xinerama if it is available. + */ +#define SDL_HINT_VIDEO_X11_XINERAMA "SDL_VIDEO_X11_XINERAMA" + +/** + * \brief A variable controlling whether the X11 XRandR extension should be used. + * + * This variable can be set to the following values: + * "0" - Disable XRandR + * "1" - Enable XRandR + * + * By default SDL will not use XRandR because of window manager issues. + */ +#define SDL_HINT_VIDEO_X11_XRANDR "SDL_VIDEO_X11_XRANDR" + +/** + * \brief A variable controlling whether the X11 VidMode extension should be used. + * + * This variable can be set to the following values: + * "0" - Disable XVidMode + * "1" - Enable XVidMode + * + * By default SDL will use XVidMode if it is available. + */ +#define SDL_HINT_VIDEO_X11_XVIDMODE "SDL_VIDEO_X11_XVIDMODE" + +/** + * \brief Controls how the fact chunk affects the loading of a WAVE file. + * + * The fact chunk stores information about the number of samples of a WAVE + * file. The Standards Update from Microsoft notes that this value can be used + * to 'determine the length of the data in seconds'. This is especially useful + * for compressed formats (for which this is a mandatory chunk) if they produce + * multiple sample frames per block and truncating the block is not allowed. + * The fact chunk can exactly specify how many sample frames there should be + * in this case. + * + * Unfortunately, most application seem to ignore the fact chunk and so SDL + * ignores it by default as well. + * + * This variable can be set to the following values: + * + * "truncate" - Use the number of samples to truncate the wave data if + * the fact chunk is present and valid + * "strict" - Like "truncate", but raise an error if the fact chunk + * is invalid, not present for non-PCM formats, or if the + * data chunk doesn't have that many samples + * "ignorezero" - Like "truncate", but ignore fact chunk if the number of + * samples is zero + * "ignore" - Ignore fact chunk entirely (default) + */ +#define SDL_HINT_WAVE_FACT_CHUNK "SDL_WAVE_FACT_CHUNK" + +/** + * \brief Controls how the size of the RIFF chunk affects the loading of a WAVE file. + * + * The size of the RIFF chunk (which includes all the sub-chunks of the WAVE + * file) is not always reliable. In case the size is wrong, it's possible to + * just ignore it and step through the chunks until a fixed limit is reached. + * + * Note that files that have trailing data unrelated to the WAVE file or + * corrupt files may slow down the loading process without a reliable boundary. + * By default, SDL stops after 10000 chunks to prevent wasting time. Use the + * environment variable SDL_WAVE_CHUNK_LIMIT to adjust this value. + * + * This variable can be set to the following values: + * + * "force" - Always use the RIFF chunk size as a boundary for the chunk search + * "ignorezero" - Like "force", but a zero size searches up to 4 GiB (default) + * "ignore" - Ignore the RIFF chunk size and always search up to 4 GiB + * "maximum" - Search for chunks until the end of file (not recommended) + */ +#define SDL_HINT_WAVE_RIFF_CHUNK_SIZE "SDL_WAVE_RIFF_CHUNK_SIZE" + +/** + * \brief Controls how a truncated WAVE file is handled. + * + * A WAVE file is considered truncated if any of the chunks are incomplete or + * the data chunk size is not a multiple of the block size. By default, SDL + * decodes until the first incomplete block, as most applications seem to do. + * + * This variable can be set to the following values: + * + * "verystrict" - Raise an error if the file is truncated + * "strict" - Like "verystrict", but the size of the RIFF chunk is ignored + * "dropframe" - Decode until the first incomplete sample frame + * "dropblock" - Decode until the first incomplete block (default) + */ +#define SDL_HINT_WAVE_TRUNCATION "SDL_WAVE_TRUNCATION" + +/** + * \brief Tell SDL not to name threads on Windows with the 0x406D1388 Exception. + * The 0x406D1388 Exception is a trick used to inform Visual Studio of a + * thread's name, but it tends to cause problems with other debuggers, + * and the .NET runtime. Note that SDL 2.0.6 and later will still use + * the (safer) SetThreadDescription API, introduced in the Windows 10 + * Creators Update, if available. + * + * The variable can be set to the following values: + * "0" - SDL will raise the 0x406D1388 Exception to name threads. + * This is the default behavior of SDL <= 2.0.4. + * "1" - SDL will not raise this exception, and threads will be unnamed. (default) + * This is necessary with .NET languages or debuggers that aren't Visual Studio. + */ +#define SDL_HINT_WINDOWS_DISABLE_THREAD_NAMING "SDL_WINDOWS_DISABLE_THREAD_NAMING" + +/** + * \brief A variable controlling whether the windows message loop is processed by SDL + * + * This variable can be set to the following values: + * "0" - The window message loop is not run + * "1" - The window message loop is processed in SDL_PumpEvents() + * + * By default SDL will process the windows message loop + */ +#define SDL_HINT_WINDOWS_ENABLE_MESSAGELOOP "SDL_WINDOWS_ENABLE_MESSAGELOOP" + +/** + * \brief Force SDL to use Critical Sections for mutexes on Windows. + * On Windows 7 and newer, Slim Reader/Writer Locks are available. + * They offer better performance, allocate no kernel ressources and + * use less memory. SDL will fall back to Critical Sections on older + * OS versions or if forced to by this hint. + * + * This variable can be set to the following values: + * "0" - Use SRW Locks when available. If not, fall back to Critical Sections. (default) + * "1" - Force the use of Critical Sections in all cases. + * + */ +#define SDL_HINT_WINDOWS_FORCE_MUTEX_CRITICAL_SECTIONS "SDL_WINDOWS_FORCE_MUTEX_CRITICAL_SECTIONS" + +/** + * \brief Force SDL to use Kernel Semaphores on Windows. + * Kernel Semaphores are inter-process and require a context + * switch on every interaction. On Windows 8 and newer, the + * WaitOnAddress API is available. Using that and atomics to + * implement semaphores increases performance. + * SDL will fall back to Kernel Objects on older OS versions + * or if forced to by this hint. + * + * This variable can be set to the following values: + * "0" - Use Atomics and WaitOnAddress API when available. If not, fall back to Kernel Objects. (default) + * "1" - Force the use of Kernel Objects in all cases. + * + */ +#define SDL_HINT_WINDOWS_FORCE_SEMAPHORE_KERNEL "SDL_WINDOWS_FORCE_SEMAPHORE_KERNEL" + +/** + * \brief A variable to specify custom icon resource id from RC file on Windows platform + */ +#define SDL_HINT_WINDOWS_INTRESOURCE_ICON "SDL_WINDOWS_INTRESOURCE_ICON" +#define SDL_HINT_WINDOWS_INTRESOURCE_ICON_SMALL "SDL_WINDOWS_INTRESOURCE_ICON_SMALL" + +/** + * \brief Tell SDL not to generate window-close events for Alt+F4 on Windows. + * + * The variable can be set to the following values: + * "0" - SDL will generate a window-close event when it sees Alt+F4. + * "1" - SDL will only do normal key handling for Alt+F4. + */ +#define SDL_HINT_WINDOWS_NO_CLOSE_ON_ALT_F4 "SDL_WINDOWS_NO_CLOSE_ON_ALT_F4" + +/** + * \brief Use the D3D9Ex API introduced in Windows Vista, instead of normal D3D9. + * Direct3D 9Ex contains changes to state management that can eliminate device + * loss errors during scenarios like Alt+Tab or UAC prompts. D3D9Ex may require + * some changes to your application to cope with the new behavior, so this + * is disabled by default. + * + * This hint must be set before initializing the video subsystem. + * + * For more information on Direct3D 9Ex, see: + * - https://docs.microsoft.com/en-us/windows/win32/direct3darticles/graphics-apis-in-windows-vista#direct3d-9ex + * - https://docs.microsoft.com/en-us/windows/win32/direct3darticles/direct3d-9ex-improvements + * + * This variable can be set to the following values: + * "0" - Use the original Direct3D 9 API (default) + * "1" - Use the Direct3D 9Ex API on Vista and later (and fall back if D3D9Ex is unavailable) + * + */ +#define SDL_HINT_WINDOWS_USE_D3D9EX "SDL_WINDOWS_USE_D3D9EX" + +/** + * \brief A variable controlling whether the window frame and title bar are interactive when the cursor is hidden + * + * This variable can be set to the following values: + * "0" - The window frame is not interactive when the cursor is hidden (no move, resize, etc) + * "1" - The window frame is interactive when the cursor is hidden + * + * By default SDL will allow interaction with the window frame when the cursor is hidden + */ +#define SDL_HINT_WINDOW_FRAME_USABLE_WHILE_CURSOR_HIDDEN "SDL_WINDOW_FRAME_USABLE_WHILE_CURSOR_HIDDEN" + +/** +* \brief A variable controlling whether the window is activated when the SDL_ShowWindow function is called +* +* This variable can be set to the following values: +* "0" - The window is activated when the SDL_ShowWindow function is called +* "1" - The window is not activated when the SDL_ShowWindow function is called +* +* By default SDL will activate the window when the SDL_ShowWindow function is called +*/ +#define SDL_HINT_WINDOW_NO_ACTIVATION_WHEN_SHOWN "SDL_WINDOW_NO_ACTIVATION_WHEN_SHOWN" /** \brief Allows back-button-press events on Windows Phone to be marked as handled * @@ -793,386 +1728,102 @@ extern "C" { */ #define SDL_HINT_WINRT_HANDLE_BACK_BUTTON "SDL_WINRT_HANDLE_BACK_BUTTON" -/** - * \brief A variable that dictates policy for fullscreen Spaces on Mac OS X. +/** \brief Label text for a WinRT app's privacy policy link * - * This hint only applies to Mac OS X. + * Network-enabled WinRT apps must include a privacy policy. On Windows 8, 8.1, and RT, + * Microsoft mandates that this policy be available via the Windows Settings charm. + * SDL provides code to add a link there, with its label text being set via the + * optional hint, SDL_HINT_WINRT_PRIVACY_POLICY_LABEL. + * + * Please note that a privacy policy's contents are not set via this hint. A separate + * hint, SDL_HINT_WINRT_PRIVACY_POLICY_URL, is used to link to the actual text of the + * policy. + * + * The contents of this hint should be encoded as a UTF8 string. + * + * The default value is "Privacy Policy". This hint should only be set during app + * initialization, preferably before any calls to SDL_Init(). + * + * For additional information on linking to a privacy policy, see the documentation for + * SDL_HINT_WINRT_PRIVACY_POLICY_URL. + */ +#define SDL_HINT_WINRT_PRIVACY_POLICY_LABEL "SDL_WINRT_PRIVACY_POLICY_LABEL" + +/** + * \brief A URL to a WinRT app's privacy policy + * + * All network-enabled WinRT apps must make a privacy policy available to its + * users. On Windows 8, 8.1, and RT, Microsoft mandates that this policy be + * be available in the Windows Settings charm, as accessed from within the app. + * SDL provides code to add a URL-based link there, which can point to the app's + * privacy policy. + * + * To setup a URL to an app's privacy policy, set SDL_HINT_WINRT_PRIVACY_POLICY_URL + * before calling any SDL_Init() functions. The contents of the hint should + * be a valid URL. For example, "http://www.example.com". + * + * The default value is "", which will prevent SDL from adding a privacy policy + * link to the Settings charm. This hint should only be set during app init. + * + * The label text of an app's "Privacy Policy" link may be customized via another + * hint, SDL_HINT_WINRT_PRIVACY_POLICY_LABEL. + * + * Please note that on Windows Phone, Microsoft does not provide standard UI + * for displaying a privacy policy link, and as such, SDL_HINT_WINRT_PRIVACY_POLICY_URL + * will not get used on that platform. Network-enabled phone apps should display + * their privacy policy through some other, in-app means. + */ +#define SDL_HINT_WINRT_PRIVACY_POLICY_URL "SDL_WINRT_PRIVACY_POLICY_URL" + +/** + * \brief Mark X11 windows as override-redirect. + * + * If set, this _might_ increase framerate at the expense of the desktop + * not working as expected. Override-redirect windows aren't noticed by the + * window manager at all. + * + * You should probably only use this for fullscreen windows, and you probably + * shouldn't even use it for that. But it's here if you want to try! + */ +#define SDL_HINT_X11_FORCE_OVERRIDE_REDIRECT "SDL_X11_FORCE_OVERRIDE_REDIRECT" + +/** + * \brief A variable that lets you disable the detection and use of Xinput gamepad devices * * The variable can be set to the following values: - * "0" - Disable Spaces support (FULLSCREEN_DESKTOP won't use them and - * SDL_WINDOW_RESIZABLE windows won't offer the "fullscreen" - * button on their titlebars). - * "1" - Enable Spaces support (FULLSCREEN_DESKTOP will use them and - * SDL_WINDOW_RESIZABLE windows will offer the "fullscreen" - * button on their titlebars). - * - * The default value is "1". Spaces are disabled regardless of this hint if - * the OS isn't at least Mac OS X Lion (10.7). This hint must be set before - * any windows are created. + * "0" - Disable XInput detection (only uses direct input) + * "1" - Enable XInput detection (the default) */ -#define SDL_HINT_VIDEO_MAC_FULLSCREEN_SPACES "SDL_VIDEO_MAC_FULLSCREEN_SPACES" +#define SDL_HINT_XINPUT_ENABLED "SDL_XINPUT_ENABLED" /** -* \brief When set don't force the SDL app to become a foreground process -* -* This hint only applies to Mac OS X. -* -*/ -#define SDL_HINT_MAC_BACKGROUND_APP "SDL_MAC_BACKGROUND_APP" + * \brief A variable that causes SDL to use the old axis and button mapping for XInput devices. + * + * This hint is for backwards compatibility only and will be removed in SDL 2.1 + * + * The default value is "0". This hint must be set before SDL_Init() + */ +#define SDL_HINT_XINPUT_USE_OLD_JOYSTICK_MAPPING "SDL_XINPUT_USE_OLD_JOYSTICK_MAPPING" /** - * \brief Android APK expansion main file version. Should be a string number like "1", "2" etc. + * \brief A variable that causes SDL to not ignore audio "monitors" * - * Must be set together with SDL_HINT_ANDROID_APK_EXPANSION_PATCH_FILE_VERSION. + * This is currently only used for PulseAudio and ignored elsewhere. * - * If both hints were set then SDL_RWFromFile() will look into expansion files - * after a given relative path was not found in the internal storage and assets. + * By default, SDL ignores audio devices that aren't associated with physical + * hardware. Changing this hint to "1" will expose anything SDL sees that + * appears to be an audio source or sink. This will add "devices" to the list + * that the user probably doesn't want or need, but it can be useful in + * scenarios where you want to hook up SDL to some sort of virtual device, + * etc. * - * By default this hint is not set and the APK expansion files are not searched. + * The default value is "0". This hint must be set before SDL_Init(). + * + * This hint is available since SDL 2.0.16. Before then, virtual devices are + * always ignored. */ -#define SDL_HINT_ANDROID_APK_EXPANSION_MAIN_FILE_VERSION "SDL_ANDROID_APK_EXPANSION_MAIN_FILE_VERSION" - -/** - * \brief Android APK expansion patch file version. Should be a string number like "1", "2" etc. - * - * Must be set together with SDL_HINT_ANDROID_APK_EXPANSION_MAIN_FILE_VERSION. - * - * If both hints were set then SDL_RWFromFile() will look into expansion files - * after a given relative path was not found in the internal storage and assets. - * - * By default this hint is not set and the APK expansion files are not searched. - */ -#define SDL_HINT_ANDROID_APK_EXPANSION_PATCH_FILE_VERSION "SDL_ANDROID_APK_EXPANSION_PATCH_FILE_VERSION" +#define SDL_HINT_AUDIO_INCLUDE_MONITORS "SDL_AUDIO_INCLUDE_MONITORS" -/** - * \brief A variable to control whether certain IMEs should handle text editing internally instead of sending SDL_TEXTEDITING events. - * - * The variable can be set to the following values: - * "0" - SDL_TEXTEDITING events are sent, and it is the application's - * responsibility to render the text from these events and - * differentiate it somehow from committed text. (default) - * "1" - If supported by the IME then SDL_TEXTEDITING events are not sent, - * and text that is being composed will be rendered in its own UI. - */ -#define SDL_HINT_IME_INTERNAL_EDITING "SDL_IME_INTERNAL_EDITING" - -/** - * \brief A variable to control whether we trap the Android back button to handle it manually. - * This is necessary for the right mouse button to work on some Android devices, or - * to be able to trap the back button for use in your code reliably. If set to true, - * the back button will show up as an SDL_KEYDOWN / SDL_KEYUP pair with a keycode of - * SDL_SCANCODE_AC_BACK. - * - * The variable can be set to the following values: - * "0" - Back button will be handled as usual for system. (default) - * "1" - Back button will be trapped, allowing you to handle the key press - * manually. (This will also let right mouse click work on systems - * where the right mouse button functions as back.) - * - * The value of this hint is used at runtime, so it can be changed at any time. - */ -#define SDL_HINT_ANDROID_TRAP_BACK_BUTTON "SDL_ANDROID_TRAP_BACK_BUTTON" - -/** - * \brief A variable to control whether the event loop will block itself when the app is paused. - * - * The variable can be set to the following values: - * "0" - Non blocking. - * "1" - Blocking. (default) - * - * The value should be set before SDL is initialized. - */ -#define SDL_HINT_ANDROID_BLOCK_ON_PAUSE "SDL_ANDROID_BLOCK_ON_PAUSE" - - /** - * \brief A variable to control whether the return key on the soft keyboard - * should hide the soft keyboard on Android and iOS. - * - * The variable can be set to the following values: - * "0" - The return key will be handled as a key event. This is the behaviour of SDL <= 2.0.3. (default) - * "1" - The return key will hide the keyboard. - * - * The value of this hint is used at runtime, so it can be changed at any time. - */ -#define SDL_HINT_RETURN_KEY_HIDES_IME "SDL_RETURN_KEY_HIDES_IME" - -/** - * \brief override the binding element for keyboard inputs for Emscripten builds - * - * This hint only applies to the emscripten platform - * - * The variable can be one of - * "#window" - The javascript window object (this is the default) - * "#document" - The javascript document object - * "#screen" - the javascript window.screen object - * "#canvas" - the WebGL canvas element - * any other string without a leading # sign applies to the element on the page with that ID. - */ -#define SDL_HINT_EMSCRIPTEN_KEYBOARD_ELEMENT "SDL_EMSCRIPTEN_KEYBOARD_ELEMENT" - -/** - * \brief Tell SDL not to catch the SIGINT or SIGTERM signals. - * - * This hint only applies to Unix-like platforms. - * - * The variable can be set to the following values: - * "0" - SDL will install a SIGINT and SIGTERM handler, and when it - * catches a signal, convert it into an SDL_QUIT event. - * "1" - SDL will not install a signal handler at all. - */ -#define SDL_HINT_NO_SIGNAL_HANDLERS "SDL_NO_SIGNAL_HANDLERS" - -/** - * \brief Tell SDL not to generate window-close events for Alt+F4 on Windows. - * - * The variable can be set to the following values: - * "0" - SDL will generate a window-close event when it sees Alt+F4. - * "1" - SDL will only do normal key handling for Alt+F4. - */ -#define SDL_HINT_WINDOWS_NO_CLOSE_ON_ALT_F4 "SDL_WINDOWS_NO_CLOSE_ON_ALT_F4" - -/** - * \brief Prevent SDL from using version 4 of the bitmap header when saving BMPs. - * - * The bitmap header version 4 is required for proper alpha channel support and - * SDL will use it when required. Should this not be desired, this hint can - * force the use of the 40 byte header version which is supported everywhere. - * - * The variable can be set to the following values: - * "0" - Surfaces with a colorkey or an alpha channel are saved to a - * 32-bit BMP file with an alpha mask. SDL will use the bitmap - * header version 4 and set the alpha mask accordingly. - * "1" - Surfaces with a colorkey or an alpha channel are saved to a - * 32-bit BMP file without an alpha mask. The alpha channel data - * will be in the file, but applications are going to ignore it. - * - * The default value is "0". - */ -#define SDL_HINT_BMP_SAVE_LEGACY_FORMAT "SDL_BMP_SAVE_LEGACY_FORMAT" - -/** - * \brief Tell SDL not to name threads on Windows with the 0x406D1388 Exception. - * The 0x406D1388 Exception is a trick used to inform Visual Studio of a - * thread's name, but it tends to cause problems with other debuggers, - * and the .NET runtime. Note that SDL 2.0.6 and later will still use - * the (safer) SetThreadDescription API, introduced in the Windows 10 - * Creators Update, if available. - * - * The variable can be set to the following values: - * "0" - SDL will raise the 0x406D1388 Exception to name threads. - * This is the default behavior of SDL <= 2.0.4. - * "1" - SDL will not raise this exception, and threads will be unnamed. (default) - * This is necessary with .NET languages or debuggers that aren't Visual Studio. - */ -#define SDL_HINT_WINDOWS_DISABLE_THREAD_NAMING "SDL_WINDOWS_DISABLE_THREAD_NAMING" - -/** - * \brief Tell SDL which Dispmanx layer to use on a Raspberry PI - * - * Also known as Z-order. The variable can take a negative or positive value. - * The default is 10000. - */ -#define SDL_HINT_RPI_VIDEO_LAYER "SDL_RPI_VIDEO_LAYER" - -/** - * \brief Tell the video driver that we only want a double buffer. - * - * By default, most lowlevel 2D APIs will use a triple buffer scheme that - * wastes no CPU time on waiting for vsync after issuing a flip, but - * introduces a frame of latency. On the other hand, using a double buffer - * scheme instead is recommended for cases where low latency is an important - * factor because we save a whole frame of latency. - * We do so by waiting for vsync immediately after issuing a flip, usually just - * after eglSwapBuffers call in the backend's *_SwapWindow function. - * - * Since it's driver-specific, it's only supported where possible and - * implemented. Currently supported the following drivers: - * - KMSDRM (kmsdrm) - * - Raspberry Pi (raspberrypi) - */ -#define SDL_HINT_VIDEO_DOUBLE_BUFFER "SDL_VIDEO_DOUBLE_BUFFER" - -/** - * \brief A variable controlling what driver to use for OpenGL ES contexts. - * - * On some platforms, currently Windows and X11, OpenGL drivers may support - * creating contexts with an OpenGL ES profile. By default SDL uses these - * profiles, when available, otherwise it attempts to load an OpenGL ES - * library, e.g. that provided by the ANGLE project. This variable controls - * whether SDL follows this default behaviour or will always load an - * OpenGL ES library. - * - * Circumstances where this is useful include - * - Testing an app with a particular OpenGL ES implementation, e.g ANGLE, - * or emulator, e.g. those from ARM, Imagination or Qualcomm. - * - Resolving OpenGL ES function addresses at link time by linking with - * the OpenGL ES library instead of querying them at run time with - * SDL_GL_GetProcAddress(). - * - * Caution: for an application to work with the default behaviour across - * different OpenGL drivers it must query the OpenGL ES function - * addresses at run time using SDL_GL_GetProcAddress(). - * - * This variable is ignored on most platforms because OpenGL ES is native - * or not supported. - * - * This variable can be set to the following values: - * "0" - Use ES profile of OpenGL, if available. (Default when not set.) - * "1" - Load OpenGL ES library using the default library names. - * - */ -#define SDL_HINT_OPENGL_ES_DRIVER "SDL_OPENGL_ES_DRIVER" - -/** - * \brief A variable controlling speed/quality tradeoff of audio resampling. - * - * If available, SDL can use libsamplerate ( http://www.mega-nerd.com/SRC/ ) - * to handle audio resampling. There are different resampling modes available - * that produce different levels of quality, using more CPU. - * - * If this hint isn't specified to a valid setting, or libsamplerate isn't - * available, SDL will use the default, internal resampling algorithm. - * - * Note that this is currently only applicable to resampling audio that is - * being written to a device for playback or audio being read from a device - * for capture. SDL_AudioCVT always uses the default resampler (although this - * might change for SDL 2.1). - * - * This hint is currently only checked at audio subsystem initialization. - * - * This variable can be set to the following values: - * - * "0" or "default" - Use SDL's internal resampling (Default when not set - low quality, fast) - * "1" or "fast" - Use fast, slightly higher quality resampling, if available - * "2" or "medium" - Use medium quality resampling, if available - * "3" or "best" - Use high quality resampling, if available - */ -#define SDL_HINT_AUDIO_RESAMPLING_MODE "SDL_AUDIO_RESAMPLING_MODE" - -/** - * \brief A variable controlling the audio category on iOS and Mac OS X - * - * This variable can be set to the following values: - * - * "ambient" - Use the AVAudioSessionCategoryAmbient audio category, will be muted by the phone mute switch (default) - * "playback" - Use the AVAudioSessionCategoryPlayback category - * - * For more information, see Apple's documentation: - * https://developer.apple.com/library/content/documentation/Audio/Conceptual/AudioSessionProgrammingGuide/AudioSessionCategoriesandModes/AudioSessionCategoriesandModes.html - */ -#define SDL_HINT_AUDIO_CATEGORY "SDL_AUDIO_CATEGORY" - -/** - * \brief A variable controlling whether the 2D render API is compatible or efficient. - * - * This variable can be set to the following values: - * - * "0" - Don't use batching to make rendering more efficient. - * "1" - Use batching, but might cause problems if app makes its own direct OpenGL calls. - * - * Up to SDL 2.0.9, the render API would draw immediately when requested. Now - * it batches up draw requests and sends them all to the GPU only when forced - * to (during SDL_RenderPresent, when changing render targets, by updating a - * texture that the batch needs, etc). This is significantly more efficient, - * but it can cause problems for apps that expect to render on top of the - * render API's output. As such, SDL will disable batching if a specific - * render backend is requested (since this might indicate that the app is - * planning to use the underlying graphics API directly). This hint can - * be used to explicitly request batching in this instance. It is a contract - * that you will either never use the underlying graphics API directly, or - * if you do, you will call SDL_RenderFlush() before you do so any current - * batch goes to the GPU before your work begins. Not following this contract - * will result in undefined behavior. - */ -#define SDL_HINT_RENDER_BATCHING "SDL_RENDER_BATCHING" - - -/** - * \brief A variable controlling whether SDL logs all events pushed onto its internal queue. - * - * This variable can be set to the following values: - * - * "0" - Don't log any events (default) - * "1" - Log all events except mouse and finger motion, which are pretty spammy. - * "2" - Log all events. - * - * This is generally meant to be used to debug SDL itself, but can be useful - * for application developers that need better visibility into what is going - * on in the event queue. Logged events are sent through SDL_Log(), which - * means by default they appear on stdout on most platforms or maybe - * OutputDebugString() on Windows, and can be funneled by the app with - * SDL_LogSetOutputFunction(), etc. - * - * This hint can be toggled on and off at runtime, if you only need to log - * events for a small subset of program execution. - */ -#define SDL_HINT_EVENT_LOGGING "SDL_EVENT_LOGGING" - - - -/** - * \brief Controls how the size of the RIFF chunk affects the loading of a WAVE file. - * - * The size of the RIFF chunk (which includes all the sub-chunks of the WAVE - * file) is not always reliable. In case the size is wrong, it's possible to - * just ignore it and step through the chunks until a fixed limit is reached. - * - * Note that files that have trailing data unrelated to the WAVE file or - * corrupt files may slow down the loading process without a reliable boundary. - * By default, SDL stops after 10000 chunks to prevent wasting time. Use the - * environment variable SDL_WAVE_CHUNK_LIMIT to adjust this value. - * - * This variable can be set to the following values: - * - * "force" - Always use the RIFF chunk size as a boundary for the chunk search - * "ignorezero" - Like "force", but a zero size searches up to 4 GiB (default) - * "ignore" - Ignore the RIFF chunk size and always search up to 4 GiB - * "maximum" - Search for chunks until the end of file (not recommended) - */ -#define SDL_HINT_WAVE_RIFF_CHUNK_SIZE "SDL_WAVE_RIFF_CHUNK_SIZE" - -/** - * \brief Controls how a truncated WAVE file is handled. - * - * A WAVE file is considered truncated if any of the chunks are incomplete or - * the data chunk size is not a multiple of the block size. By default, SDL - * decodes until the first incomplete block, as most applications seem to do. - * - * This variable can be set to the following values: - * - * "verystrict" - Raise an error if the file is truncated - * "strict" - Like "verystrict", but the size of the RIFF chunk is ignored - * "dropframe" - Decode until the first incomplete sample frame - * "dropblock" - Decode until the first incomplete block (default) - */ -#define SDL_HINT_WAVE_TRUNCATION "SDL_WAVE_TRUNCATION" - -/** - * \brief Controls how the fact chunk affects the loading of a WAVE file. - * - * The fact chunk stores information about the number of samples of a WAVE - * file. The Standards Update from Microsoft notes that this value can be used - * to 'determine the length of the data in seconds'. This is especially useful - * for compressed formats (for which this is a mandatory chunk) if they produce - * multiple sample frames per block and truncating the block is not allowed. - * The fact chunk can exactly specify how many sample frames there should be - * in this case. - * - * Unfortunately, most application seem to ignore the fact chunk and so SDL - * ignores it by default as well. - * - * This variable can be set to the following values: - * - * "truncate" - Use the number of samples to truncate the wave data if - * the fact chunk is present and valid - * "strict" - Like "truncate", but raise an error if the fact chunk - * is invalid, not present for non-PCM formats, or if the - * data chunk doesn't have that many samples - * "ignorezero" - Like "truncate", but ignore fact chunk if the number of - * samples is zero - * "ignore" - Ignore fact chunk entirely (default) - */ -#define SDL_HINT_WAVE_FACT_CHUNK "SDL_WAVE_FACT_CHUNK" /** * \brief An enumeration of hint priorities @@ -1186,71 +1837,121 @@ typedef enum /** - * \brief Set a hint with a specific priority + * Set a hint with a specific priority. * - * The priority controls the behavior when setting a hint that already - * has a value. Hints will replace existing hints of their priority and - * lower. Environment variables are considered to have override priority. + * The priority controls the behavior when setting a hint that already has a + * value. Hints will replace existing hints of their priority and lower. + * Environment variables are considered to have override priority. * - * \return SDL_TRUE if the hint was set, SDL_FALSE otherwise + * \param name the hint to set + * \param value the value of the hint variable + * \param priority the SDL_HintPriority level for the hint + * \returns SDL_TRUE if the hint was set, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetHint + * \sa SDL_SetHint */ extern DECLSPEC SDL_bool SDLCALL SDL_SetHintWithPriority(const char *name, const char *value, SDL_HintPriority priority); /** - * \brief Set a hint with normal priority + * Set a hint with normal priority. * - * \return SDL_TRUE if the hint was set, SDL_FALSE otherwise + * Hints will not be set if there is an existing override hint or environment + * variable that takes precedence. You can use SDL_SetHintWithPriority() to + * set the hint with override priority instead. + * + * \param name the hint to set + * \param value the value of the hint variable + * \returns SDL_TRUE if the hint was set, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetHint + * \sa SDL_SetHintWithPriority */ extern DECLSPEC SDL_bool SDLCALL SDL_SetHint(const char *name, const char *value); /** - * \brief Get a hint + * Get the value of a hint. * - * \return The string value of a hint variable. + * \param name the hint to query + * \returns the string value of a hint or NULL if the hint isn't set. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetHint + * \sa SDL_SetHintWithPriority */ extern DECLSPEC const char * SDLCALL SDL_GetHint(const char *name); /** - * \brief Get a hint + * Get the boolean value of a hint variable. * - * \return The boolean value of a hint variable. + * \param name the name of the hint to get the boolean value from + * \param default_value the value to return if the hint does not exist + * \returns the boolean value of a hint or the provided default value if the + * hint does not exist. + * + * \since This function is available since SDL 2.0.5. + * + * \sa SDL_GetHint + * \sa SDL_SetHint */ extern DECLSPEC SDL_bool SDLCALL SDL_GetHintBoolean(const char *name, SDL_bool default_value); /** - * \brief type definition of the hint callback function. + * Type definition of the hint callback function. + * + * \param userdata what was passed as `userdata` to SDL_AddHintCallback() + * \param name what was passed as `name` to SDL_AddHintCallback() + * \param oldValue the previous hint value + * \param newValue the new value hint is to be set to */ typedef void (SDLCALL *SDL_HintCallback)(void *userdata, const char *name, const char *oldValue, const char *newValue); /** - * \brief Add a function to watch a particular hint + * Add a function to watch a particular hint. * - * \param name The hint to watch - * \param callback The function to call when the hint value changes - * \param userdata A pointer to pass to the callback function + * \param name the hint to watch + * \param callback An SDL_HintCallback function that will be called when the + * hint value changes + * \param userdata a pointer to pass to the callback function + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_DelHintCallback */ extern DECLSPEC void SDLCALL SDL_AddHintCallback(const char *name, SDL_HintCallback callback, void *userdata); /** - * \brief Remove a function watching a particular hint + * Remove a function watching a particular hint. * - * \param name The hint being watched - * \param callback The function being called when the hint value changes - * \param userdata A pointer being passed to the callback function + * \param name the hint being watched + * \param callback An SDL_HintCallback function that will be called when the + * hint value changes + * \param userdata a pointer being passed to the callback function + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AddHintCallback */ extern DECLSPEC void SDLCALL SDL_DelHintCallback(const char *name, SDL_HintCallback callback, void *userdata); /** - * \brief Clear all hints + * Clear all hints. * - * This function is called during SDL_Quit() to free stored hints. + * This function is automatically called during SDL_Quit(). + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC void SDLCALL SDL_ClearHints(void); diff --git a/libs/SDL2/include/SDL_joystick.h b/libs/SDL2/include/SDL_joystick.h index 3a4c5d177..e80c0057f 100644 --- a/libs/SDL2/include/SDL_joystick.h +++ b/libs/SDL2/include/SDL_joystick.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -30,10 +30,12 @@ * The term "instance_id" is the current instantiation of a joystick device in the system, if the joystick is removed and then re-inserted * then it will get a new instance_id, instance_id's are monotonically increasing identifiers of a joystick plugged in. * + * The term "player_index" is the number assigned to a player on a specific + * controller. For XInput controllers this returns the XInput user index. + * Many joysticks will not be able to supply this information. + * * The term JoystickGUID is a stable 128-bit identifier for a joystick device that does not change over time, it identifies class of * the device (a X360 wired controller for example). This identifier is platform dependent. - * - * */ #ifndef SDL_joystick_h_ @@ -105,6 +107,12 @@ typedef enum SDL_JOYSTICK_POWER_MAX } SDL_JoystickPowerLevel; +/* Set max recognized G-force from accelerometer + See src/joystick/uikit/SDL_sysjoystick.m for notes on why this is needed + */ +#define SDL_IPHONE_MAX_GFORCE 5.0 + + /* Function prototypes */ /** @@ -116,210 +124,605 @@ typedef enum * In particular, you are guaranteed that the joystick list won't change, so * the API functions that take a joystick index will be valid, and joystick * and game controller events will not be delivered. + * + * \since This function is available since SDL 2.0.7. */ extern DECLSPEC void SDLCALL SDL_LockJoysticks(void); + + +/** + * Unlocking for multi-threaded access to the joystick API + * + * If you are using the joystick API or handling events from multiple threads + * you should use these locking functions to protect access to the joysticks. + * + * In particular, you are guaranteed that the joystick list won't change, so + * the API functions that take a joystick index will be valid, and joystick + * and game controller events will not be delivered. + * + * \since This function is available since SDL 2.0.7. + */ extern DECLSPEC void SDLCALL SDL_UnlockJoysticks(void); /** - * Count the number of joysticks attached to the system right now + * Count the number of joysticks attached to the system. + * + * \returns the number of attached joysticks on success or a negative error + * code on failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickName + * \sa SDL_JoystickOpen */ extern DECLSPEC int SDLCALL SDL_NumJoysticks(void); /** - * Get the implementation dependent name of a joystick. - * This can be called before any joysticks are opened. - * If no name can be found, this function returns NULL. + * Get the implementation dependent name of a joystick. + * + * This can be called before any joysticks are opened. + * + * \param device_index the index of the joystick to query (the N'th joystick + * on the system) + * \returns the name of the selected joystick. If no name can be found, this + * function returns NULL; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickName + * \sa SDL_JoystickOpen */ extern DECLSPEC const char *SDLCALL SDL_JoystickNameForIndex(int device_index); /** - * Get the player index of a joystick, or -1 if it's not available - * This can be called before any joysticks are opened. + * Get the player index of a joystick, or -1 if it's not available This can be + * called before any joysticks are opened. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC int SDLCALL SDL_JoystickGetDevicePlayerIndex(int device_index); /** - * Return the GUID for the joystick at this index - * This can be called before any joysticks are opened. + * Get the implementation-dependent GUID for the joystick at a given device + * index. + * + * This function can be called before any joysticks are opened. + * + * \param device_index the index of the joystick to query (the N'th joystick + * on the system + * \returns the GUID of the selected joystick. If called on an invalid index, + * this function returns a zero GUID + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickGetGUID + * \sa SDL_JoystickGetGUIDString */ extern DECLSPEC SDL_JoystickGUID SDLCALL SDL_JoystickGetDeviceGUID(int device_index); /** - * Get the USB vendor ID of a joystick, if available. - * This can be called before any joysticks are opened. - * If the vendor ID isn't available this function returns 0. + * Get the USB vendor ID of a joystick, if available. + * + * This can be called before any joysticks are opened. If the vendor ID isn't + * available this function returns 0. + * + * \param device_index the index of the joystick to query (the N'th joystick + * on the system + * \returns the USB vendor ID of the selected joystick. If called on an + * invalid index, this function returns zero + * + * \since This function is available since SDL 2.0.6. */ extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetDeviceVendor(int device_index); /** - * Get the USB product ID of a joystick, if available. - * This can be called before any joysticks are opened. - * If the product ID isn't available this function returns 0. + * Get the USB product ID of a joystick, if available. + * + * This can be called before any joysticks are opened. If the product ID isn't + * available this function returns 0. + * + * \param device_index the index of the joystick to query (the N'th joystick + * on the system + * \returns the USB product ID of the selected joystick. If called on an + * invalid index, this function returns zero + * + * \since This function is available since SDL 2.0.6. */ extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetDeviceProduct(int device_index); /** - * Get the product version of a joystick, if available. - * This can be called before any joysticks are opened. - * If the product version isn't available this function returns 0. + * Get the product version of a joystick, if available. + * + * This can be called before any joysticks are opened. If the product version + * isn't available this function returns 0. + * + * \param device_index the index of the joystick to query (the N'th joystick + * on the system + * \returns the product version of the selected joystick. If called on an + * invalid index, this function returns zero + * + * \since This function is available since SDL 2.0.6. */ extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetDeviceProductVersion(int device_index); /** - * Get the type of a joystick, if available. - * This can be called before any joysticks are opened. + * Get the type of a joystick, if available. + * + * This can be called before any joysticks are opened. + * + * \param device_index the index of the joystick to query (the N'th joystick + * on the system + * \returns the SDL_JoystickType of the selected joystick. If called on an + * invalid index, this function returns `SDL_JOYSTICK_TYPE_UNKNOWN` + * + * \since This function is available since SDL 2.0.6. */ extern DECLSPEC SDL_JoystickType SDLCALL SDL_JoystickGetDeviceType(int device_index); /** - * Get the instance ID of a joystick. - * This can be called before any joysticks are opened. - * If the index is out of range, this function will return -1. + * Get the instance ID of a joystick. + * + * This can be called before any joysticks are opened. If the index is out of + * range, this function will return -1. + * + * \param device_index the index of the joystick to query (the N'th joystick + * on the system + * \returns the instance id of the selected joystick. If called on an invalid + * index, this function returns zero + * + * \since This function is available since SDL 2.0.6. */ extern DECLSPEC SDL_JoystickID SDLCALL SDL_JoystickGetDeviceInstanceID(int device_index); /** - * Open a joystick for use. - * The index passed as an argument refers to the N'th joystick on the system. - * This index is not the value which will identify this joystick in future - * joystick events. The joystick's instance id (::SDL_JoystickID) will be used - * there instead. + * Open a joystick for use. * - * \return A joystick identifier, or NULL if an error occurred. + * The `device_index` argument refers to the N'th joystick presently + * recognized by SDL on the system. It is **NOT** the same as the instance ID + * used to identify the joystick in future events. See + * SDL_JoystickInstanceID() for more details about instance IDs. + * + * The joystick subsystem must be initialized before a joystick can be opened + * for use. + * + * \param device_index the index of the joystick to query + * \returns a joystick identifier or NULL if an error occurred; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickClose + * \sa SDL_JoystickInstanceID */ extern DECLSPEC SDL_Joystick *SDLCALL SDL_JoystickOpen(int device_index); /** - * Return the SDL_Joystick associated with an instance id. - */ -extern DECLSPEC SDL_Joystick *SDLCALL SDL_JoystickFromInstanceID(SDL_JoystickID joyid); - -/** - * Return the name for this currently opened joystick. - * If no name can be found, this function returns NULL. - */ -extern DECLSPEC const char *SDLCALL SDL_JoystickName(SDL_Joystick * joystick); - -/** - * Get the player index of an opened joystick, or -1 if it's not available + * Get the SDL_Joystick associated with an instance id. * - * For XInput controllers this returns the XInput user index. + * \param instance_id the instance id to get the SDL_Joystick for + * \returns an SDL_Joystick on success or NULL on failure; call SDL_GetError() + * for more information. + * + * \since This function is available since SDL 2.0.4. */ -extern DECLSPEC int SDLCALL SDL_JoystickGetPlayerIndex(SDL_Joystick * joystick); +extern DECLSPEC SDL_Joystick *SDLCALL SDL_JoystickFromInstanceID(SDL_JoystickID instance_id); /** - * Return the GUID for this opened joystick + * Get the SDL_Joystick associated with a player index. + * + * \param player_index the player index to get the SDL_Joystick for + * \returns an SDL_Joystick on success or NULL on failure; call SDL_GetError() + * for more information. + * + * \since This function is available since SDL 2.0.12. */ -extern DECLSPEC SDL_JoystickGUID SDLCALL SDL_JoystickGetGUID(SDL_Joystick * joystick); +extern DECLSPEC SDL_Joystick *SDLCALL SDL_JoystickFromPlayerIndex(int player_index); /** - * Get the USB vendor ID of an opened joystick, if available. - * If the vendor ID isn't available this function returns 0. + * Attach a new virtual joystick. + * + * \returns the joystick's device index, or -1 if an error occurred. + * + * \since This function is available since SDL 2.0.14. */ -extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetVendor(SDL_Joystick * joystick); +extern DECLSPEC int SDLCALL SDL_JoystickAttachVirtual(SDL_JoystickType type, + int naxes, + int nbuttons, + int nhats); /** - * Get the USB product ID of an opened joystick, if available. - * If the product ID isn't available this function returns 0. + * Detach a virtual joystick. + * + * \param device_index a value previously returned from + * SDL_JoystickAttachVirtual() + * \returns 0 on success, or -1 if an error occurred. + * + * \since This function is available since SDL 2.0.14. */ -extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetProduct(SDL_Joystick * joystick); +extern DECLSPEC int SDLCALL SDL_JoystickDetachVirtual(int device_index); /** - * Get the product version of an opened joystick, if available. - * If the product version isn't available this function returns 0. + * Query whether or not the joystick at a given device index is virtual. + * + * \param device_index a joystick device index. + * \returns SDL_TRUE if the joystick is virtual, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.14. */ -extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetProductVersion(SDL_Joystick * joystick); +extern DECLSPEC SDL_bool SDLCALL SDL_JoystickIsVirtual(int device_index); /** - * Get the type of an opened joystick. + * Set values on an opened, virtual-joystick's axis. + * + * Please note that values set here will not be applied until the next call to + * SDL_JoystickUpdate, which can either be called directly, or can be called + * indirectly through various other SDL APIs, including, but not limited to + * the following: SDL_PollEvent, SDL_PumpEvents, SDL_WaitEventTimeout, + * SDL_WaitEvent. + * + * \param joystick the virtual joystick on which to set state. + * \param axis the specific axis on the virtual joystick to set. + * \param value the new value for the specified axis. + * \returns 0 on success, -1 on error. + * + * \since This function is available since SDL 2.0.14. */ -extern DECLSPEC SDL_JoystickType SDLCALL SDL_JoystickGetType(SDL_Joystick * joystick); +extern DECLSPEC int SDLCALL SDL_JoystickSetVirtualAxis(SDL_Joystick *joystick, int axis, Sint16 value); /** - * Return a string representation for this guid. pszGUID must point to at least 33 bytes - * (32 for the string plus a NULL terminator). + * Set values on an opened, virtual-joystick's button. + * + * Please note that values set here will not be applied until the next call to + * SDL_JoystickUpdate, which can either be called directly, or can be called + * indirectly through various other SDL APIs, including, but not limited to + * the following: SDL_PollEvent, SDL_PumpEvents, SDL_WaitEventTimeout, + * SDL_WaitEvent. + * + * \param joystick the virtual joystick on which to set state. + * \param button the specific button on the virtual joystick to set. + * \param value the new value for the specified button. + * \returns 0 on success, -1 on error. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC int SDLCALL SDL_JoystickSetVirtualButton(SDL_Joystick *joystick, int button, Uint8 value); + +/** + * Set values on an opened, virtual-joystick's hat. + * + * Please note that values set here will not be applied until the next call to + * SDL_JoystickUpdate, which can either be called directly, or can be called + * indirectly through various other SDL APIs, including, but not limited to + * the following: SDL_PollEvent, SDL_PumpEvents, SDL_WaitEventTimeout, + * SDL_WaitEvent. + * + * \param joystick the virtual joystick on which to set state. + * \param hat the specific hat on the virtual joystick to set. + * \param value the new value for the specified hat. + * \returns 0 on success, -1 on error. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC int SDLCALL SDL_JoystickSetVirtualHat(SDL_Joystick *joystick, int hat, Uint8 value); + +/** + * Get the implementation dependent name of a joystick. + * + * \param joystick the SDL_Joystick obtained from SDL_JoystickOpen() + * \returns the name of the selected joystick. If no name can be found, this + * function returns NULL; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickNameForIndex + * \sa SDL_JoystickOpen + */ +extern DECLSPEC const char *SDLCALL SDL_JoystickName(SDL_Joystick *joystick); + +/** + * Get the player index of an opened joystick. + * + * For XInput controllers this returns the XInput user index. Many joysticks + * will not be able to supply this information. + * + * \param joystick the SDL_Joystick obtained from SDL_JoystickOpen() + * \returns the player index, or -1 if it's not available. + * + * \since This function is available since SDL 2.0.9. + */ +extern DECLSPEC int SDLCALL SDL_JoystickGetPlayerIndex(SDL_Joystick *joystick); + +/** + * Set the player index of an opened joystick. + * + * \param joystick the SDL_Joystick obtained from SDL_JoystickOpen() + * \param player_index the player index to set. + * + * \since This function is available since SDL 2.0.12. + */ +extern DECLSPEC void SDLCALL SDL_JoystickSetPlayerIndex(SDL_Joystick *joystick, int player_index); + +/** + * Get the implementation-dependent GUID for the joystick. + * + * This function requires an open joystick. + * + * \param joystick the SDL_Joystick obtained from SDL_JoystickOpen() + * \returns the GUID of the given joystick. If called on an invalid index, + * this function returns a zero GUID; call SDL_GetError() for more + * information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickGetDeviceGUID + * \sa SDL_JoystickGetGUIDString + */ +extern DECLSPEC SDL_JoystickGUID SDLCALL SDL_JoystickGetGUID(SDL_Joystick *joystick); + +/** + * Get the USB vendor ID of an opened joystick, if available. + * + * If the vendor ID isn't available this function returns 0. + * + * \param joystick the SDL_Joystick obtained from SDL_JoystickOpen() + * \returns the USB vendor ID of the selected joystick, or 0 if unavailable. + * + * \since This function is available since SDL 2.0.6. + */ +extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetVendor(SDL_Joystick *joystick); + +/** + * Get the USB product ID of an opened joystick, if available. + * + * If the product ID isn't available this function returns 0. + * + * \param joystick the SDL_Joystick obtained from SDL_JoystickOpen() + * \returns the USB product ID of the selected joystick, or 0 if unavailable. + * + * \since This function is available since SDL 2.0.6. + */ +extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetProduct(SDL_Joystick *joystick); + +/** + * Get the product version of an opened joystick, if available. + * + * If the product version isn't available this function returns 0. + * + * \param joystick the SDL_Joystick obtained from SDL_JoystickOpen() + * \returns the product version of the selected joystick, or 0 if unavailable. + * + * \since This function is available since SDL 2.0.6. + */ +extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetProductVersion(SDL_Joystick *joystick); + +/** + * Get the serial number of an opened joystick, if available. + * + * Returns the serial number of the joystick, or NULL if it is not available. + * + * \param joystick the SDL_Joystick obtained from SDL_JoystickOpen() + * \returns the serial number of the selected joystick, or NULL if + * unavailable. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC const char * SDLCALL SDL_JoystickGetSerial(SDL_Joystick *joystick); + +/** + * Get the type of an opened joystick. + * + * \param joystick the SDL_Joystick obtained from SDL_JoystickOpen() + * \returns the SDL_JoystickType of the selected joystick. + * + * \since This function is available since SDL 2.0.6. + */ +extern DECLSPEC SDL_JoystickType SDLCALL SDL_JoystickGetType(SDL_Joystick *joystick); + +/** + * Get an ASCII string representation for a given SDL_JoystickGUID. + * + * You should supply at least 33 bytes for pszGUID. + * + * \param guid the SDL_JoystickGUID you wish to convert to string + * \param pszGUID buffer in which to write the ASCII string + * \param cbGUID the size of pszGUID + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickGetDeviceGUID + * \sa SDL_JoystickGetGUID + * \sa SDL_JoystickGetGUIDFromString */ extern DECLSPEC void SDLCALL SDL_JoystickGetGUIDString(SDL_JoystickGUID guid, char *pszGUID, int cbGUID); /** - * Convert a string into a joystick guid + * Convert a GUID string into a SDL_JoystickGUID structure. + * + * Performs no error checking. If this function is given a string containing + * an invalid GUID, the function will silently succeed, but the GUID generated + * will not be useful. + * + * \param pchGUID string containing an ASCII representation of a GUID + * \returns a SDL_JoystickGUID structure. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickGetGUIDString */ extern DECLSPEC SDL_JoystickGUID SDLCALL SDL_JoystickGetGUIDFromString(const char *pchGUID); /** - * Returns SDL_TRUE if the joystick has been opened and currently connected, or SDL_FALSE if it has not. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_JoystickGetAttached(SDL_Joystick * joystick); - -/** - * Get the instance ID of an opened joystick or -1 if the joystick is invalid. - */ -extern DECLSPEC SDL_JoystickID SDLCALL SDL_JoystickInstanceID(SDL_Joystick * joystick); - -/** - * Get the number of general axis controls on a joystick. - */ -extern DECLSPEC int SDLCALL SDL_JoystickNumAxes(SDL_Joystick * joystick); - -/** - * Get the number of trackballs on a joystick. + * Get the status of a specified joystick. * - * Joystick trackballs have only relative motion events associated - * with them and their state cannot be polled. - */ -extern DECLSPEC int SDLCALL SDL_JoystickNumBalls(SDL_Joystick * joystick); - -/** - * Get the number of POV hats on a joystick. - */ -extern DECLSPEC int SDLCALL SDL_JoystickNumHats(SDL_Joystick * joystick); - -/** - * Get the number of buttons on a joystick. - */ -extern DECLSPEC int SDLCALL SDL_JoystickNumButtons(SDL_Joystick * joystick); - -/** - * Update the current state of the open joysticks. + * \param joystick the joystick to query + * \returns SDL_TRUE if the joystick has been opened, SDL_FALSE if it has not; + * call SDL_GetError() for more information. * - * This is called automatically by the event loop if any joystick - * events are enabled. + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickClose + * \sa SDL_JoystickOpen + */ +extern DECLSPEC SDL_bool SDLCALL SDL_JoystickGetAttached(SDL_Joystick *joystick); + +/** + * Get the instance ID of an opened joystick. + * + * \param joystick an SDL_Joystick structure containing joystick information + * \returns the instance ID of the specified joystick on success or a negative + * error code on failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickOpen + */ +extern DECLSPEC SDL_JoystickID SDLCALL SDL_JoystickInstanceID(SDL_Joystick *joystick); + +/** + * Get the number of general axis controls on a joystick. + * + * Often, the directional pad on a game controller will either look like 4 + * separate buttons or a POV hat, and not axes, but all of this is up to the + * device and platform. + * + * \param joystick an SDL_Joystick structure containing joystick information + * \returns the number of axis controls/number of axes on success or a + * negative error code on failure; call SDL_GetError() for more + * information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickGetAxis + * \sa SDL_JoystickOpen + */ +extern DECLSPEC int SDLCALL SDL_JoystickNumAxes(SDL_Joystick *joystick); + +/** + * Get the number of trackballs on a joystick. + * + * Joystick trackballs have only relative motion events associated with them + * and their state cannot be polled. + * + * Most joysticks do not have trackballs. + * + * \param joystick an SDL_Joystick structure containing joystick information + * \returns the number of trackballs on success or a negative error code on + * failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickGetBall + */ +extern DECLSPEC int SDLCALL SDL_JoystickNumBalls(SDL_Joystick *joystick); + +/** + * Get the number of POV hats on a joystick. + * + * \param joystick an SDL_Joystick structure containing joystick information + * \returns the number of POV hats on success or a negative error code on + * failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickGetHat + * \sa SDL_JoystickOpen + */ +extern DECLSPEC int SDLCALL SDL_JoystickNumHats(SDL_Joystick *joystick); + +/** + * Get the number of buttons on a joystick. + * + * \param joystick an SDL_Joystick structure containing joystick information + * \returns the number of buttons on success or a negative error code on + * failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickGetButton + * \sa SDL_JoystickOpen + */ +extern DECLSPEC int SDLCALL SDL_JoystickNumButtons(SDL_Joystick *joystick); + +/** + * Update the current state of the open joysticks. + * + * This is called automatically by the event loop if any joystick events are + * enabled. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickEventState */ extern DECLSPEC void SDLCALL SDL_JoystickUpdate(void); /** - * Enable/disable joystick event polling. + * Enable/disable joystick event polling. * - * If joystick events are disabled, you must call SDL_JoystickUpdate() - * yourself and check the state of the joystick when you want joystick - * information. + * If joystick events are disabled, you must call SDL_JoystickUpdate() + * yourself and manually check the state of the joystick when you want + * joystick information. * - * The state can be one of ::SDL_QUERY, ::SDL_ENABLE or ::SDL_IGNORE. + * It is recommended that you leave joystick event handling enabled. + * + * **WARNING**: Calling this function may delete all events currently in SDL's + * event queue. + * + * \param state can be one of `SDL_QUERY`, `SDL_IGNORE`, or `SDL_ENABLE` + * \returns 1 if enabled, 0 if disabled, or a negative error code on failure; + * call SDL_GetError() for more information. + * + * If `state` is `SDL_QUERY` then the current state is returned, + * otherwise the new processing state is returned. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerEventState */ extern DECLSPEC int SDLCALL SDL_JoystickEventState(int state); #define SDL_JOYSTICK_AXIS_MAX 32767 #define SDL_JOYSTICK_AXIS_MIN -32768 + /** - * Get the current state of an axis control on a joystick. + * Get the current state of an axis control on a joystick. * - * The state is a value ranging from -32768 to 32767. + * SDL makes no promises about what part of the joystick any given axis refers + * to. Your game should have some sort of configuration UI to let users + * specify what each axis should be bound to. Alternately, SDL's higher-level + * Game Controller API makes a great effort to apply order to this lower-level + * interface, so you know that a specific axis is the "left thumb stick," etc. * - * The axis indices start at index 0. + * The value returned by SDL_JoystickGetAxis() is a signed integer (-32768 to + * 32767) representing the current position of the axis. It may be necessary + * to impose certain tolerances on these values to account for jitter. + * + * \param joystick an SDL_Joystick structure containing joystick information + * \param axis the axis to query; the axis indices start at index 0 + * \returns a 16-bit signed integer representing the current position of the + * axis or 0 on failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickNumAxes */ -extern DECLSPEC Sint16 SDLCALL SDL_JoystickGetAxis(SDL_Joystick * joystick, +extern DECLSPEC Sint16 SDLCALL SDL_JoystickGetAxis(SDL_Joystick *joystick, int axis); /** - * Get the initial state of an axis control on a joystick. + * Get the initial state of an axis control on a joystick. * - * The state is a value ranging from -32768 to 32767. + * The state is a value ranging from -32768 to 32767. * - * The axis indices start at index 0. + * The axis indices start at index 0. * - * \return SDL_TRUE if this axis has any initial value, or SDL_FALSE if not. + * \param joystick an SDL_Joystick structure containing joystick information + * \param axis the axis to query; the axis indices start at index 0 + * \param state Upon return, the initial value is supplied here. + * \return SDL_TRUE if this axis has any initial value, or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.6. */ -extern DECLSPEC SDL_bool SDLCALL SDL_JoystickGetAxisInitialState(SDL_Joystick * joystick, +extern DECLSPEC SDL_bool SDLCALL SDL_JoystickGetAxisInitialState(SDL_Joystick *joystick, int axis, Sint16 *state); /** @@ -338,64 +741,199 @@ extern DECLSPEC SDL_bool SDLCALL SDL_JoystickGetAxisInitialState(SDL_Joystick * /* @} */ /** - * Get the current state of a POV hat on a joystick. + * Get the current state of a POV hat on a joystick. * - * The hat indices start at index 0. + * The returned value will be one of the following positions: * - * \return The return value is one of the following positions: - * - ::SDL_HAT_CENTERED - * - ::SDL_HAT_UP - * - ::SDL_HAT_RIGHT - * - ::SDL_HAT_DOWN - * - ::SDL_HAT_LEFT - * - ::SDL_HAT_RIGHTUP - * - ::SDL_HAT_RIGHTDOWN - * - ::SDL_HAT_LEFTUP - * - ::SDL_HAT_LEFTDOWN + * - `SDL_HAT_CENTERED` + * - `SDL_HAT_UP` + * - `SDL_HAT_RIGHT` + * - `SDL_HAT_DOWN` + * - `SDL_HAT_LEFT` + * - `SDL_HAT_RIGHTUP` + * - `SDL_HAT_RIGHTDOWN` + * - `SDL_HAT_LEFTUP` + * - `SDL_HAT_LEFTDOWN` + * + * \param joystick an SDL_Joystick structure containing joystick information + * \param hat the hat index to get the state from; indices start at index 0 + * \returns the current hat position. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickNumHats */ -extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetHat(SDL_Joystick * joystick, +extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetHat(SDL_Joystick *joystick, int hat); /** - * Get the ball axis change since the last poll. + * Get the ball axis change since the last poll. * - * \return 0, or -1 if you passed it invalid parameters. + * Trackballs can only return relative motion since the last call to + * SDL_JoystickGetBall(), these motion deltas are placed into `dx` and `dy`. * - * The ball indices start at index 0. + * Most joysticks do not have trackballs. + * + * \param joystick the SDL_Joystick to query + * \param ball the ball index to query; ball indices start at index 0 + * \param dx stores the difference in the x axis position since the last poll + * \param dy stores the difference in the y axis position since the last poll + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickNumBalls */ -extern DECLSPEC int SDLCALL SDL_JoystickGetBall(SDL_Joystick * joystick, +extern DECLSPEC int SDLCALL SDL_JoystickGetBall(SDL_Joystick *joystick, int ball, int *dx, int *dy); /** - * Get the current state of a button on a joystick. + * Get the current state of a button on a joystick. * - * The button indices start at index 0. + * \param joystick an SDL_Joystick structure containing joystick information + * \param button the button index to get the state from; indices start at + * index 0 + * \returns 1 if the specified button is pressed, 0 otherwise. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickNumButtons */ -extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetButton(SDL_Joystick * joystick, +extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetButton(SDL_Joystick *joystick, int button); /** - * Trigger a rumble effect - * Each call to this function cancels any previous rumble effect, and calling it with 0 intensity stops any rumbling. + * Start a rumble effect. * - * \param joystick The joystick to vibrate - * \param low_frequency_rumble The intensity of the low frequency (left) rumble motor, from 0 to 0xFFFF - * \param high_frequency_rumble The intensity of the high frequency (right) rumble motor, from 0 to 0xFFFF - * \param duration_ms The duration of the rumble effect, in milliseconds + * Each call to this function cancels any previous rumble effect, and calling + * it with 0 intensity stops any rumbling. * - * \return 0, or -1 if rumble isn't supported on this joystick + * \param joystick The joystick to vibrate + * \param low_frequency_rumble The intensity of the low frequency (left) + * rumble motor, from 0 to 0xFFFF + * \param high_frequency_rumble The intensity of the high frequency (right) + * rumble motor, from 0 to 0xFFFF + * \param duration_ms The duration of the rumble effect, in milliseconds + * \returns 0, or -1 if rumble isn't supported on this joystick + * + * \since This function is available since SDL 2.0.9. + * + * \sa SDL_JoystickHasRumble */ -extern DECLSPEC int SDLCALL SDL_JoystickRumble(SDL_Joystick * joystick, Uint16 low_frequency_rumble, Uint16 high_frequency_rumble, Uint32 duration_ms); +extern DECLSPEC int SDLCALL SDL_JoystickRumble(SDL_Joystick *joystick, Uint16 low_frequency_rumble, Uint16 high_frequency_rumble, Uint32 duration_ms); /** - * Close a joystick previously opened with SDL_JoystickOpen(). + * Start a rumble effect in the joystick's triggers + * + * Each call to this function cancels any previous trigger rumble effect, and + * calling it with 0 intensity stops any rumbling. + * + * Note that this function is for _trigger_ rumble; the first joystick to + * support this was the PlayStation 5's DualShock 5 controller. If you want + * the (more common) whole-controller rumble, use SDL_JoystickRumble() + * instead. + * + * \param joystick The joystick to vibrate + * \param left_rumble The intensity of the left trigger rumble motor, from 0 + * to 0xFFFF + * \param right_rumble The intensity of the right trigger rumble motor, from 0 + * to 0xFFFF + * \param duration_ms The duration of the rumble effect, in milliseconds + * \returns 0, or -1 if trigger rumble isn't supported on this joystick + * + * \since This function is available since SDL 2.0.14. + * + * \sa SDL_JoystickHasRumbleTriggers */ -extern DECLSPEC void SDLCALL SDL_JoystickClose(SDL_Joystick * joystick); +extern DECLSPEC int SDLCALL SDL_JoystickRumbleTriggers(SDL_Joystick *joystick, Uint16 left_rumble, Uint16 right_rumble, Uint32 duration_ms); /** - * Return the battery level of this joystick + * Query whether a joystick has an LED. + * + * An example of a joystick LED is the light on the back of a PlayStation 4's + * DualShock 4 controller. + * + * \param joystick The joystick to query + * \return SDL_TRUE if the joystick has a modifiable LED, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.14. */ -extern DECLSPEC SDL_JoystickPowerLevel SDLCALL SDL_JoystickCurrentPowerLevel(SDL_Joystick * joystick); +extern DECLSPEC SDL_bool SDLCALL SDL_JoystickHasLED(SDL_Joystick *joystick); + +/** + * Query whether a joystick has rumble support. + * + * \param joystick The joystick to query + * \return SDL_TRUE if the joystick has rumble, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_JoystickRumble + */ +extern DECLSPEC SDL_bool SDLCALL SDL_JoystickHasRumble(SDL_Joystick *joystick); + +/** + * Query whether a joystick has rumble support on triggers. + * + * \param joystick The joystick to query + * \return SDL_TRUE if the joystick has trigger rumble, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_JoystickRumbleTriggers + */ +extern DECLSPEC SDL_bool SDLCALL SDL_JoystickHasRumbleTriggers(SDL_Joystick *joystick); + +/** + * Update a joystick's LED color. + * + * An example of a joystick LED is the light on the back of a PlayStation 4's + * DualShock 4 controller. + * + * \param joystick The joystick to update + * \param red The intensity of the red LED + * \param green The intensity of the green LED + * \param blue The intensity of the blue LED + * \returns 0 on success, -1 if this joystick does not have a modifiable LED + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC int SDLCALL SDL_JoystickSetLED(SDL_Joystick *joystick, Uint8 red, Uint8 green, Uint8 blue); + +/** + * Send a joystick specific effect packet + * + * \param joystick The joystick to affect + * \param data The data to send to the joystick + * \param size The size of the data to send to the joystick + * \returns 0, or -1 if this joystick or driver doesn't support effect packets + * + * \since This function is available since SDL 2.0.16. + */ +extern DECLSPEC int SDLCALL SDL_JoystickSendEffect(SDL_Joystick *joystick, const void *data, int size); + +/** + * Close a joystick previously opened with SDL_JoystickOpen(). + * + * \param joystick The joystick device to close + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickOpen + */ +extern DECLSPEC void SDLCALL SDL_JoystickClose(SDL_Joystick *joystick); + +/** + * Get the battery level of a joystick as SDL_JoystickPowerLevel. + * + * \param joystick the SDL_Joystick to query + * \returns the current battery level as SDL_JoystickPowerLevel on success or + * `SDL_JOYSTICK_POWER_UNKNOWN` if it is unknown + * + * \since This function is available since SDL 2.0.4. + */ +extern DECLSPEC SDL_JoystickPowerLevel SDLCALL SDL_JoystickCurrentPowerLevel(SDL_Joystick *joystick); /* Ends C function definitions when using C++ */ #ifdef __cplusplus diff --git a/libs/SDL2/include/SDL_keyboard.h b/libs/SDL2/include/SDL_keyboard.h index 4b2a055d8..a53dde68e 100644 --- a/libs/SDL2/include/SDL_keyboard.h +++ b/libs/SDL2/include/SDL_keyboard.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -55,154 +55,253 @@ typedef struct SDL_Keysym /* Function prototypes */ /** - * \brief Get the window which currently has keyboard focus. + * Query the window which currently has keyboard focus. + * + * \returns the window with keyboard focus. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC SDL_Window * SDLCALL SDL_GetKeyboardFocus(void); /** - * \brief Get a snapshot of the current state of the keyboard. + * Get a snapshot of the current state of the keyboard. * - * \param numkeys if non-NULL, receives the length of the returned array. + * The pointer returned is a pointer to an internal SDL array. It will be + * valid for the whole lifetime of the application and should not be freed by + * the caller. * - * \return An array of key states. Indexes into this array are obtained by using ::SDL_Scancode values. + * A array element with a value of 1 means that the key is pressed and a value + * of 0 means that it is not. Indexes into this array are obtained by using + * SDL_Scancode values. * - * \b Example: - * \code - * const Uint8 *state = SDL_GetKeyboardState(NULL); - * if ( state[SDL_SCANCODE_RETURN] ) { - * printf(" is pressed.\n"); - * } - * \endcode + * Use SDL_PumpEvents() to update the state array. + * + * This function gives you the current state after all events have been + * processed, so if a key or button has been pressed and released before you + * process events, then the pressed state will never show up in the + * SDL_GetKeyboardState() calls. + * + * Note: This function doesn't take into account whether shift has been + * pressed or not. + * + * \param numkeys if non-NULL, receives the length of the returned array + * \returns a pointer to an array of key states. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_PumpEvents */ extern DECLSPEC const Uint8 *SDLCALL SDL_GetKeyboardState(int *numkeys); /** - * \brief Get the current key modifier state for the keyboard. + * Get the current key modifier state for the keyboard. + * + * \returns an OR'd combination of the modifier keys for the keyboard. See + * SDL_Keymod for details. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetKeyboardState + * \sa SDL_SetModState */ extern DECLSPEC SDL_Keymod SDLCALL SDL_GetModState(void); /** - * \brief Set the current key modifier state for the keyboard. + * Set the current key modifier state for the keyboard. * - * \note This does not change the keyboard state, only the key modifier flags. + * The inverse of SDL_GetModState(), SDL_SetModState() allows you to impose + * modifier key states on your application. Simply pass your desired modifier + * states into `modstate`. This value may be a bitwise, OR'd combination of + * SDL_Keymod values. + * + * This does not change the keyboard state, only the key modifier flags that + * SDL reports. + * + * \param modstate the desired SDL_Keymod for the keyboard + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetModState */ extern DECLSPEC void SDLCALL SDL_SetModState(SDL_Keymod modstate); /** - * \brief Get the key code corresponding to the given scancode according - * to the current keyboard layout. + * Get the key code corresponding to the given scancode according to the + * current keyboard layout. * - * See ::SDL_Keycode for details. + * See SDL_Keycode for details. * - * \sa SDL_GetKeyName() + * \param scancode the desired SDL_Scancode to query + * \returns the SDL_Keycode that corresponds to the given SDL_Scancode. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetKeyName + * \sa SDL_GetScancodeFromKey */ extern DECLSPEC SDL_Keycode SDLCALL SDL_GetKeyFromScancode(SDL_Scancode scancode); /** - * \brief Get the scancode corresponding to the given key code according to the - * current keyboard layout. + * Get the scancode corresponding to the given key code according to the + * current keyboard layout. * - * See ::SDL_Scancode for details. + * See SDL_Scancode for details. * - * \sa SDL_GetScancodeName() + * \param key the desired SDL_Keycode to query + * \returns the SDL_Scancode that corresponds to the given SDL_Keycode. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetKeyFromScancode + * \sa SDL_GetScancodeName */ extern DECLSPEC SDL_Scancode SDLCALL SDL_GetScancodeFromKey(SDL_Keycode key); /** - * \brief Get a human-readable name for a scancode. + * Get a human-readable name for a scancode. * - * \return A pointer to the name for the scancode. - * If the scancode doesn't have a name, this function returns - * an empty string (""). + * See SDL_Scancode for details. * - * \sa SDL_Scancode + * **Warning**: The returned name is by design not stable across platforms, + * e.g. the name for `SDL_SCANCODE_LGUI` is "Left GUI" under Linux but "Left + * Windows" under Microsoft Windows, and some scancodes like + * `SDL_SCANCODE_NONUSBACKSLASH` don't have any name at all. There are even + * scancodes that share names, e.g. `SDL_SCANCODE_RETURN` and + * `SDL_SCANCODE_RETURN2` (both called "Return"). This function is therefore + * unsuitable for creating a stable cross-platform two-way mapping between + * strings and scancodes. + * + * \param scancode the desired SDL_Scancode to query + * \returns a pointer to the name for the scancode. If the scancode doesn't + * have a name this function returns an empty string (""). + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetScancodeFromKey + * \sa SDL_GetScancodeFromName */ extern DECLSPEC const char *SDLCALL SDL_GetScancodeName(SDL_Scancode scancode); /** - * \brief Get a scancode from a human-readable name + * Get a scancode from a human-readable name. * - * \return scancode, or SDL_SCANCODE_UNKNOWN if the name wasn't recognized + * \param name the human-readable scancode name + * \returns the SDL_Scancode, or `SDL_SCANCODE_UNKNOWN` if the name wasn't + * recognized; call SDL_GetError() for more information. * - * \sa SDL_Scancode + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetKeyFromName + * \sa SDL_GetScancodeFromKey + * \sa SDL_GetScancodeName */ extern DECLSPEC SDL_Scancode SDLCALL SDL_GetScancodeFromName(const char *name); /** - * \brief Get a human-readable name for a key. + * Get a human-readable name for a key. * - * \return A pointer to a UTF-8 string that stays valid at least until the next - * call to this function. If you need it around any longer, you must - * copy it. If the key doesn't have a name, this function returns an - * empty string (""). + * See SDL_Scancode and SDL_Keycode for details. * - * \sa SDL_Keycode + * \param key the desired SDL_Keycode to query + * \returns a pointer to a UTF-8 string that stays valid at least until the + * next call to this function. If you need it around any longer, you + * must copy it. If the key doesn't have a name, this function + * returns an empty string (""). + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetKeyFromName + * \sa SDL_GetKeyFromScancode + * \sa SDL_GetScancodeFromKey */ extern DECLSPEC const char *SDLCALL SDL_GetKeyName(SDL_Keycode key); /** - * \brief Get a key code from a human-readable name + * Get a key code from a human-readable name. * - * \return key code, or SDLK_UNKNOWN if the name wasn't recognized + * \param name the human-readable key name + * \returns key code, or `SDLK_UNKNOWN` if the name wasn't recognized; call + * SDL_GetError() for more information. * - * \sa SDL_Keycode + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetKeyFromScancode + * \sa SDL_GetKeyName + * \sa SDL_GetScancodeFromName */ extern DECLSPEC SDL_Keycode SDLCALL SDL_GetKeyFromName(const char *name); /** - * \brief Start accepting Unicode text input events. - * This function will show the on-screen keyboard if supported. + * Start accepting Unicode text input events. * - * \sa SDL_StopTextInput() - * \sa SDL_SetTextInputRect() - * \sa SDL_HasScreenKeyboardSupport() + * This function will start accepting Unicode text input events in the focused + * SDL window, and start emitting SDL_TextInputEvent (SDL_TEXTINPUT) and + * SDL_TextEditingEvent (SDL_TEXTEDITING) events. Please use this function in + * pair with SDL_StopTextInput(). + * + * On some platforms using this function activates the screen keyboard. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetTextInputRect + * \sa SDL_StopTextInput */ extern DECLSPEC void SDLCALL SDL_StartTextInput(void); /** - * \brief Return whether or not Unicode text input events are enabled. + * Check whether or not Unicode text input events are enabled. * - * \sa SDL_StartTextInput() - * \sa SDL_StopTextInput() + * \returns SDL_TRUE if text input events are enabled else SDL_FALSE. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_StartTextInput */ extern DECLSPEC SDL_bool SDLCALL SDL_IsTextInputActive(void); /** - * \brief Stop receiving any text input events. - * This function will hide the on-screen keyboard if supported. + * Stop receiving any text input events. * - * \sa SDL_StartTextInput() - * \sa SDL_HasScreenKeyboardSupport() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_StartTextInput */ extern DECLSPEC void SDLCALL SDL_StopTextInput(void); /** - * \brief Set the rectangle used to type Unicode text inputs. - * This is used as a hint for IME and on-screen keyboard placement. + * Set the rectangle used to type Unicode text inputs. * - * \sa SDL_StartTextInput() + * \param rect the SDL_Rect structure representing the rectangle to receive + * text (ignored if NULL) + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_StartTextInput */ extern DECLSPEC void SDLCALL SDL_SetTextInputRect(SDL_Rect *rect); /** - * \brief Returns whether the platform has some screen keyboard support. + * Check whether the platform has screen keyboard support. * - * \return SDL_TRUE if some keyboard support is available else SDL_FALSE. + * \returns SDL_TRUE if the platform has some screen keyboard support or + * SDL_FALSE if not. * - * \note Not all screen keyboard functions are supported on all platforms. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_IsScreenKeyboardShown() + * \sa SDL_StartTextInput + * \sa SDL_IsScreenKeyboardShown */ extern DECLSPEC SDL_bool SDLCALL SDL_HasScreenKeyboardSupport(void); /** - * \brief Returns whether the screen keyboard is shown for given window. + * Check whether the screen keyboard is shown for given window. * - * \param window The window for which screen keyboard should be queried. + * \param window the window for which screen keyboard should be queried + * \returns SDL_TRUE if screen keyboard is shown or SDL_FALSE if not. * - * \return SDL_TRUE if screen keyboard is shown else SDL_FALSE. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_HasScreenKeyboardSupport() + * \sa SDL_HasScreenKeyboardSupport */ extern DECLSPEC SDL_bool SDLCALL SDL_IsScreenKeyboardShown(SDL_Window *window); diff --git a/libs/SDL2/include/SDL_keycode.h b/libs/SDL2/include/SDL_keycode.h index 3bceb418a..35602541a 100644 --- a/libs/SDL2/include/SDL_keycode.h +++ b/libs/SDL2/include/SDL_keycode.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -47,12 +47,12 @@ typedef Sint32 SDL_Keycode; #define SDLK_SCANCODE_MASK (1<<30) #define SDL_SCANCODE_TO_KEYCODE(X) (X | SDLK_SCANCODE_MASK) -enum +typedef enum { SDLK_UNKNOWN = 0, SDLK_RETURN = '\r', - SDLK_ESCAPE = '\033', + SDLK_ESCAPE = '\x1B', SDLK_BACKSPACE = '\b', SDLK_TAB = '\t', SDLK_SPACE = ' ', @@ -88,9 +88,11 @@ enum SDLK_GREATER = '>', SDLK_QUESTION = '?', SDLK_AT = '@', + /* Skip uppercase letters */ + SDLK_LEFTBRACKET = '[', SDLK_BACKSLASH = '\\', SDLK_RIGHTBRACKET = ']', @@ -145,7 +147,7 @@ enum SDLK_INSERT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_INSERT), SDLK_HOME = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_HOME), SDLK_PAGEUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAGEUP), - SDLK_DELETE = '\177', + SDLK_DELETE = '\x7F', SDLK_END = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_END), SDLK_PAGEDOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAGEDOWN), SDLK_RIGHT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RIGHT), @@ -317,7 +319,7 @@ enum SDLK_AUDIOREWIND = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOREWIND), SDLK_AUDIOFASTFORWARD = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOFASTFORWARD) -}; +} SDL_KeyCode; /** * \brief Enumeration of valid key mods (possibly OR'd together). @@ -336,13 +338,15 @@ typedef enum KMOD_NUM = 0x1000, KMOD_CAPS = 0x2000, KMOD_MODE = 0x4000, - KMOD_RESERVED = 0x8000 -} SDL_Keymod; + KMOD_SCROLL = 0x8000, -#define KMOD_CTRL (KMOD_LCTRL|KMOD_RCTRL) -#define KMOD_SHIFT (KMOD_LSHIFT|KMOD_RSHIFT) -#define KMOD_ALT (KMOD_LALT|KMOD_RALT) -#define KMOD_GUI (KMOD_LGUI|KMOD_RGUI) + KMOD_CTRL = KMOD_LCTRL | KMOD_RCTRL, + KMOD_SHIFT = KMOD_LSHIFT | KMOD_RSHIFT, + KMOD_ALT = KMOD_LALT | KMOD_RALT, + KMOD_GUI = KMOD_LGUI | KMOD_RGUI, + + KMOD_RESERVED = KMOD_SCROLL /* This is for source-level compatibility with SDL 2.0.0. */ +} SDL_Keymod; #endif /* SDL_keycode_h_ */ diff --git a/libs/SDL2/include/SDL_loadso.h b/libs/SDL2/include/SDL_loadso.h index 793ba5358..61857c813 100644 --- a/libs/SDL2/include/SDL_loadso.h +++ b/libs/SDL2/include/SDL_loadso.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -51,22 +51,56 @@ extern "C" { #endif /** - * This function dynamically loads a shared object and returns a pointer - * to the object handle (or NULL if there was an error). - * The 'sofile' parameter is a system dependent name of the object file. + * Dynamically load a shared object. + * + * \param sofile a system-dependent name of the object file + * \returns an opaque pointer to the object handle or NULL if there was an + * error; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LoadFunction + * \sa SDL_UnloadObject */ extern DECLSPEC void *SDLCALL SDL_LoadObject(const char *sofile); /** - * Given an object handle, this function looks up the address of the - * named function in the shared object and returns it. This address - * is no longer valid after calling SDL_UnloadObject(). + * Look up the address of the named function in a shared object. + * + * This function pointer is no longer valid after calling SDL_UnloadObject(). + * + * This function can only look up C function names. Other languages may have + * name mangling and intrinsic language support that varies from compiler to + * compiler. + * + * Make sure you declare your function pointers with the same calling + * convention as the actual library function. Your code will crash + * mysteriously if you do not do this. + * + * If the requested function doesn't exist, NULL is returned. + * + * \param handle a valid shared object handle returned by SDL_LoadObject() + * \param name the name of the function to look up + * \returns a pointer to the function or NULL if there was an error; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LoadObject + * \sa SDL_UnloadObject */ extern DECLSPEC void *SDLCALL SDL_LoadFunction(void *handle, const char *name); /** - * Unload a shared object from memory. + * Unload a shared object from memory. + * + * \param handle a valid shared object handle returned by SDL_LoadObject() + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LoadFunction + * \sa SDL_LoadObject */ extern DECLSPEC void SDLCALL SDL_UnloadObject(void *handle); diff --git a/libs/SDL2/include/SDL_locale.h b/libs/SDL2/include/SDL_locale.h new file mode 100644 index 000000000..751577994 --- /dev/null +++ b/libs/SDL2/include/SDL_locale.h @@ -0,0 +1,103 @@ +/* + Simple DirectMedia Layer + Copyright (C) 1997-2022 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ + +/** + * \file SDL_locale.h + * + * Include file for SDL locale services + */ + +#ifndef _SDL_locale_h +#define _SDL_locale_h + +#include "SDL_stdinc.h" +#include "SDL_error.h" + +#include "begin_code.h" +/* Set up for C function definitions, even when using C++ */ +#ifdef __cplusplus +/* *INDENT-OFF* */ +extern "C" { +/* *INDENT-ON* */ +#endif + + +typedef struct SDL_Locale +{ + const char *language; /**< A language name, like "en" for English. */ + const char *country; /**< A country, like "US" for America. Can be NULL. */ +} SDL_Locale; + +/** + * Report the user's preferred locale. + * + * This returns an array of SDL_Locale structs, the final item zeroed out. + * When the caller is done with this array, it should call SDL_free() on the + * returned value; all the memory involved is allocated in a single block, so + * a single SDL_free() will suffice. + * + * Returned language strings are in the format xx, where 'xx' is an ISO-639 + * language specifier (such as "en" for English, "de" for German, etc). + * Country strings are in the format YY, where "YY" is an ISO-3166 country + * code (such as "US" for the United States, "CA" for Canada, etc). Country + * might be NULL if there's no specific guidance on them (so you might get { + * "en", "US" } for American English, but { "en", NULL } means "English + * language, generically"). Language strings are never NULL, except to + * terminate the array. + * + * Please note that not all of these strings are 2 characters; some are three + * or more. + * + * The returned list of locales are in the order of the user's preference. For + * example, a German citizen that is fluent in US English and knows enough + * Japanese to navigate around Tokyo might have a list like: { "de", "en_US", + * "jp", NULL }. Someone from England might prefer British English (where + * "color" is spelled "colour", etc), but will settle for anything like it: { + * "en_GB", "en", NULL }. + * + * This function returns NULL on error, including when the platform does not + * supply this information at all. + * + * This might be a "slow" call that has to query the operating system. It's + * best to ask for this once and save the results. However, this list can + * change, usually because the user has changed a system preference outside of + * your program; SDL will send an SDL_LOCALECHANGED event in this case, if + * possible, and you can call this function again to get an updated copy of + * preferred locales. + * + * \return array of locales, terminated with a locale with a NULL language + * field. Will return NULL on error. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC SDL_Locale * SDLCALL SDL_GetPreferredLocales(void); + +/* Ends C function definitions when using C++ */ +#ifdef __cplusplus +/* *INDENT-OFF* */ +} +/* *INDENT-ON* */ +#endif +#include "close_code.h" + +#endif /* _SDL_locale_h */ + +/* vi: set ts=4 sw=4 expandtab: */ diff --git a/libs/SDL2/include/SDL_log.h b/libs/SDL2/include/SDL_log.h index 40f768d57..dbbcb1e6f 100644 --- a/libs/SDL2/include/SDL_log.h +++ b/libs/SDL2/include/SDL_log.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -61,7 +61,7 @@ extern "C" { * at the VERBOSE level and all other categories are enabled at the * CRITICAL level. */ -enum +typedef enum { SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_CATEGORY_ERROR, @@ -94,7 +94,7 @@ enum }; */ SDL_LOG_CATEGORY_CUSTOM -}; +} SDL_LogCategory; /** * \brief The predefined log priorities @@ -112,90 +112,283 @@ typedef enum /** - * \brief Set the priority of all log categories + * Set the priority of all log categories. + * + * \param priority the SDL_LogPriority to assign + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LogSetPriority */ extern DECLSPEC void SDLCALL SDL_LogSetAllPriority(SDL_LogPriority priority); /** - * \brief Set the priority of a particular log category + * Set the priority of a particular log category. + * + * \param category the category to assign a priority to + * \param priority the SDL_LogPriority to assign + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LogGetPriority + * \sa SDL_LogSetAllPriority */ extern DECLSPEC void SDLCALL SDL_LogSetPriority(int category, SDL_LogPriority priority); /** - * \brief Get the priority of a particular log category + * Get the priority of a particular log category. + * + * \param category the category to query + * \returns the SDL_LogPriority for the requested category + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LogSetPriority */ extern DECLSPEC SDL_LogPriority SDLCALL SDL_LogGetPriority(int category); /** - * \brief Reset all priorities to default. + * Reset all priorities to default. * - * \note This is called in SDL_Quit(). + * This is called by SDL_Quit(). + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LogSetAllPriority + * \sa SDL_LogSetPriority */ extern DECLSPEC void SDLCALL SDL_LogResetPriorities(void); /** - * \brief Log a message with SDL_LOG_CATEGORY_APPLICATION and SDL_LOG_PRIORITY_INFO + * Log a message with SDL_LOG_CATEGORY_APPLICATION and SDL_LOG_PRIORITY_INFO. + * + * = * \param fmt a printf() style message format string + * + * \param ... additional parameters matching % tokens in the `fmt` string, if + * any + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LogCritical + * \sa SDL_LogDebug + * \sa SDL_LogError + * \sa SDL_LogInfo + * \sa SDL_LogMessage + * \sa SDL_LogMessageV + * \sa SDL_LogVerbose + * \sa SDL_LogWarn */ extern DECLSPEC void SDLCALL SDL_Log(SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(1); /** - * \brief Log a message with SDL_LOG_PRIORITY_VERBOSE + * Log a message with SDL_LOG_PRIORITY_VERBOSE. + * + * \param category the category of the message + * \param fmt a printf() style message format string + * \param ... additional parameters matching % tokens in the **fmt** string, + * if any + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Log + * \sa SDL_LogCritical + * \sa SDL_LogDebug + * \sa SDL_LogError + * \sa SDL_LogInfo + * \sa SDL_LogMessage + * \sa SDL_LogMessageV + * \sa SDL_LogWarn */ extern DECLSPEC void SDLCALL SDL_LogVerbose(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(2); /** - * \brief Log a message with SDL_LOG_PRIORITY_DEBUG + * Log a message with SDL_LOG_PRIORITY_DEBUG. + * + * \param category the category of the message + * \param fmt a printf() style message format string + * \param ... additional parameters matching % tokens in the **fmt** string, + * if any + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Log + * \sa SDL_LogCritical + * \sa SDL_LogError + * \sa SDL_LogInfo + * \sa SDL_LogMessage + * \sa SDL_LogMessageV + * \sa SDL_LogVerbose + * \sa SDL_LogWarn */ extern DECLSPEC void SDLCALL SDL_LogDebug(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(2); /** - * \brief Log a message with SDL_LOG_PRIORITY_INFO + * Log a message with SDL_LOG_PRIORITY_INFO. + * + * \param category the category of the message + * \param fmt a printf() style message format string + * \param ... additional parameters matching % tokens in the **fmt** string, + * if any + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Log + * \sa SDL_LogCritical + * \sa SDL_LogDebug + * \sa SDL_LogError + * \sa SDL_LogMessage + * \sa SDL_LogMessageV + * \sa SDL_LogVerbose + * \sa SDL_LogWarn */ extern DECLSPEC void SDLCALL SDL_LogInfo(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(2); /** - * \brief Log a message with SDL_LOG_PRIORITY_WARN + * Log a message with SDL_LOG_PRIORITY_WARN. + * + * \param category the category of the message + * \param fmt a printf() style message format string + * \param ... additional parameters matching % tokens in the **fmt** string, + * if any + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Log + * \sa SDL_LogCritical + * \sa SDL_LogDebug + * \sa SDL_LogError + * \sa SDL_LogInfo + * \sa SDL_LogMessage + * \sa SDL_LogMessageV + * \sa SDL_LogVerbose */ extern DECLSPEC void SDLCALL SDL_LogWarn(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(2); /** - * \brief Log a message with SDL_LOG_PRIORITY_ERROR + * Log a message with SDL_LOG_PRIORITY_ERROR. + * + * \param category the category of the message + * \param fmt a printf() style message format string + * \param ... additional parameters matching % tokens in the **fmt** string, + * if any + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Log + * \sa SDL_LogCritical + * \sa SDL_LogDebug + * \sa SDL_LogInfo + * \sa SDL_LogMessage + * \sa SDL_LogMessageV + * \sa SDL_LogVerbose + * \sa SDL_LogWarn */ extern DECLSPEC void SDLCALL SDL_LogError(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(2); /** - * \brief Log a message with SDL_LOG_PRIORITY_CRITICAL + * Log a message with SDL_LOG_PRIORITY_CRITICAL. + * + * \param category the category of the message + * \param fmt a printf() style message format string + * \param ... additional parameters matching % tokens in the **fmt** string, + * if any + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Log + * \sa SDL_LogDebug + * \sa SDL_LogError + * \sa SDL_LogInfo + * \sa SDL_LogMessage + * \sa SDL_LogMessageV + * \sa SDL_LogVerbose + * \sa SDL_LogWarn */ extern DECLSPEC void SDLCALL SDL_LogCritical(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(2); /** - * \brief Log a message with the specified category and priority. + * Log a message with the specified category and priority. + * + * \param category the category of the message + * \param priority the priority of the message + * \param fmt a printf() style message format string + * \param ... additional parameters matching % tokens in the **fmt** string, + * if any + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Log + * \sa SDL_LogCritical + * \sa SDL_LogDebug + * \sa SDL_LogError + * \sa SDL_LogInfo + * \sa SDL_LogMessageV + * \sa SDL_LogVerbose + * \sa SDL_LogWarn */ extern DECLSPEC void SDLCALL SDL_LogMessage(int category, SDL_LogPriority priority, SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(3); /** - * \brief Log a message with the specified category and priority. + * Log a message with the specified category and priority. + * + * \param category the category of the message + * \param priority the priority of the message + * \param fmt a printf() style message format string + * \param ap a variable argument list + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Log + * \sa SDL_LogCritical + * \sa SDL_LogDebug + * \sa SDL_LogError + * \sa SDL_LogInfo + * \sa SDL_LogMessage + * \sa SDL_LogVerbose + * \sa SDL_LogWarn */ extern DECLSPEC void SDLCALL SDL_LogMessageV(int category, SDL_LogPriority priority, const char *fmt, va_list ap); /** - * \brief The prototype for the log output function + * The prototype for the log output callback function. + * + * This function is called by SDL when there is new text to be logged. + * + * \param userdata what was passed as `userdata` to SDL_LogSetOutputFunction() + * \param category the category of the message + * \param priority the priority of the message + * \param message the message being output */ typedef void (SDLCALL *SDL_LogOutputFunction)(void *userdata, int category, SDL_LogPriority priority, const char *message); /** - * \brief Get the current log output function. + * Get the current log output function. + * + * \param callback an SDL_LogOutputFunction filled in with the current log + * callback + * \param userdata a pointer filled in with the pointer that is passed to + * `callback` + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LogSetOutputFunction */ extern DECLSPEC void SDLCALL SDL_LogGetOutputFunction(SDL_LogOutputFunction *callback, void **userdata); /** - * \brief This function allows you to replace the default log output - * function with one of your own. + * Replace the default log output function with one of your own. + * + * \param callback an SDL_LogOutputFunction to call instead of the default + * \param userdata a pointer that is passed to `callback` + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LogGetOutputFunction */ extern DECLSPEC void SDLCALL SDL_LogSetOutputFunction(SDL_LogOutputFunction callback, void *userdata); diff --git a/libs/SDL2/include/SDL_main.h b/libs/SDL2/include/SDL_main.h index 623f2d005..b3fec15fe 100644 --- a/libs/SDL2/include/SDL_main.h +++ b/libs/SDL2/include/SDL_main.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -83,6 +83,15 @@ */ #define SDL_MAIN_NEEDED +#elif defined(__PSP__) +/* On PSP SDL provides a main function that sets the module info, + activates the GPU and starts the thread required to be able to exit + the software. + + If you provide this yourself, you may define SDL_MAIN_HANDLED + */ +#define SDL_MAIN_AVAILABLE + #endif #endif /* SDL_MAIN_HANDLED */ @@ -122,20 +131,62 @@ extern SDLMAIN_DECLSPEC int SDL_main(int argc, char *argv[]); /** - * This is called by the real SDL main function to let the rest of the - * library know that initialization was done properly. + * Circumvent failure of SDL_Init() when not using SDL_main() as an entry + * point. * - * Calling this yourself without knowing what you're doing can cause - * crashes and hard to diagnose problems with your application. + * This function is defined in SDL_main.h, along with the preprocessor rule to + * redefine main() as SDL_main(). Thus to ensure that your main() function + * will not be changed it is necessary to define SDL_MAIN_HANDLED before + * including SDL.h. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Init */ extern DECLSPEC void SDLCALL SDL_SetMainReady(void); #ifdef __WIN32__ /** - * This can be called to set the application class at startup + * Register a win32 window class for SDL's use. + * + * This can be called to set the application window class at startup. It is + * safe to call this multiple times, as long as every call is eventually + * paired with a call to SDL_UnregisterApp, but a second registration attempt + * while a previous registration is still active will be ignored, other than + * to increment a counter. + * + * Most applications do not need to, and should not, call this directly; SDL + * will call it when initializing the video subsystem. + * + * \param name the window class name, in UTF-8 encoding. If NULL, SDL + * currently uses "SDL_app" but this isn't guaranteed. + * \param style the value to use in WNDCLASSEX::style. If `name` is NULL, SDL + * currently uses `(CS_BYTEALIGNCLIENT | CS_OWNDC)` regardless of + * what is specified here. + * \param hInst the HINSTANCE to use in WNDCLASSEX::hInstance. If zero, SDL + * will use `GetModuleHandle(NULL)` instead. + * \returns 0 on success, -1 on error. SDL_GetError() may have details. + * + * \since This function is available since SDL 2.0.2. + */ +extern DECLSPEC int SDLCALL SDL_RegisterApp(const char *name, Uint32 style, void *hInst); + +/** + * Deregister the win32 window class from an SDL_RegisterApp call. + * + * This can be called to undo the effects of SDL_RegisterApp. + * + * Most applications do not need to, and should not, call this directly; SDL + * will call it when deinitializing the video subsystem. + * + * It is safe to call this multiple times, as long as every call is eventually + * paired with a prior call to SDL_RegisterApp. The window class will only be + * deregistered when the registration counter in SDL_RegisterApp decrements to + * zero through calls to this function. + * + * \since This function is available since SDL 2.0.2. */ -extern DECLSPEC int SDLCALL SDL_RegisterApp(char *name, Uint32 style, void *hInst); extern DECLSPEC void SDLCALL SDL_UnregisterApp(void); #endif /* __WIN32__ */ @@ -144,12 +195,14 @@ extern DECLSPEC void SDLCALL SDL_UnregisterApp(void); #ifdef __WINRT__ /** - * \brief Initializes and launches an SDL/WinRT application. + * Initialize and launch an SDL/WinRT application. * - * \param mainFunction The SDL app's C-style main(). - * \param reserved Reserved for future use; should be NULL - * \return 0 on success, -1 on failure. On failure, use SDL_GetError to retrieve more - * information on the failure. + * \param mainFunction the SDL app's C-style main(), an SDL_main_func + * \param reserved reserved for future use; should be NULL + * \returns 0 on success or -1 on failure; call SDL_GetError() to retrieve + * more information on the failure. + * + * \since This function is available since SDL 2.0.3. */ extern DECLSPEC int SDLCALL SDL_WinRTRunApp(SDL_main_func mainFunction, void * reserved); @@ -158,12 +211,14 @@ extern DECLSPEC int SDLCALL SDL_WinRTRunApp(SDL_main_func mainFunction, void * r #if defined(__IPHONEOS__) /** - * \brief Initializes and launches an SDL application. + * Initializes and launches an SDL application. * - * \param argc The argc parameter from the application's main() function - * \param argv The argv parameter from the application's main() function - * \param mainFunction The SDL app's C-style main(). - * \return the return value from mainFunction + * \param argc The argc parameter from the application's main() function + * \param argv The argv parameter from the application's main() function + * \param mainFunction The SDL app's C-style main(), an SDL_main_func + * \return the return value from mainFunction + * + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC int SDLCALL SDL_UIKitRunApp(int argc, char *argv[], SDL_main_func mainFunction); diff --git a/libs/SDL2/include/SDL_messagebox.h b/libs/SDL2/include/SDL_messagebox.h index e34b55477..d763534d2 100644 --- a/libs/SDL2/include/SDL_messagebox.h +++ b/libs/SDL2/include/SDL_messagebox.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -32,17 +32,19 @@ extern "C" { #endif /** - * \brief SDL_MessageBox flags. If supported will display warning icon, etc. + * SDL_MessageBox flags. If supported will display warning icon, etc. */ typedef enum { - SDL_MESSAGEBOX_ERROR = 0x00000010, /**< error dialog */ - SDL_MESSAGEBOX_WARNING = 0x00000020, /**< warning dialog */ - SDL_MESSAGEBOX_INFORMATION = 0x00000040 /**< informational dialog */ + SDL_MESSAGEBOX_ERROR = 0x00000010, /**< error dialog */ + SDL_MESSAGEBOX_WARNING = 0x00000020, /**< warning dialog */ + SDL_MESSAGEBOX_INFORMATION = 0x00000040, /**< informational dialog */ + SDL_MESSAGEBOX_BUTTONS_LEFT_TO_RIGHT = 0x00000080, /**< buttons placed left to right */ + SDL_MESSAGEBOX_BUTTONS_RIGHT_TO_LEFT = 0x00000100 /**< buttons placed right to left */ } SDL_MessageBoxFlags; /** - * \brief Flags for SDL_MessageBoxButtonData. + * Flags for SDL_MessageBoxButtonData. */ typedef enum { @@ -51,7 +53,7 @@ typedef enum } SDL_MessageBoxButtonFlags; /** - * \brief Individual button data. + * Individual button data. */ typedef struct { @@ -61,7 +63,7 @@ typedef struct } SDL_MessageBoxButtonData; /** - * \brief RGB value used in a message box color scheme + * RGB value used in a message box color scheme */ typedef struct { @@ -79,7 +81,7 @@ typedef enum } SDL_MessageBoxColorType; /** - * \brief A set of colors to use for message box dialogs + * A set of colors to use for message box dialogs */ typedef struct { @@ -87,7 +89,7 @@ typedef struct } SDL_MessageBoxColorScheme; /** - * \brief MessageBox structure containing title, text, window, etc. + * MessageBox structure containing title, text, window, etc. */ typedef struct { @@ -103,32 +105,79 @@ typedef struct } SDL_MessageBoxData; /** - * \brief Create a modal message box. + * Create a modal message box. * - * \param messageboxdata The SDL_MessageBoxData structure with title, text, etc. - * \param buttonid The pointer to which user id of hit button should be copied. + * If your needs aren't complex, it might be easier to use + * SDL_ShowSimpleMessageBox. * - * \return -1 on error, otherwise 0 and buttonid contains user id of button - * hit or -1 if dialog was closed. + * This function should be called on the thread that created the parent + * window, or on the main thread if the messagebox has no parent. It will + * block execution of that thread until the user clicks a button or closes the + * messagebox. * - * \note This function should be called on the thread that created the parent - * window, or on the main thread if the messagebox has no parent. It will - * block execution of that thread until the user clicks a button or - * closes the messagebox. + * This function may be called at any time, even before SDL_Init(). This makes + * it useful for reporting errors like a failure to create a renderer or + * OpenGL context. + * + * On X11, SDL rolls its own dialog box with X11 primitives instead of a + * formal toolkit like GTK+ or Qt. + * + * Note that if SDL_Init() would fail because there isn't any available video + * target, this function is likely to fail for the same reasons. If this is a + * concern, check the return value from this function and fall back to writing + * to stderr if you can. + * + * \param messageboxdata the SDL_MessageBoxData structure with title, text and + * other options + * \param buttonid the pointer to which user id of hit button should be copied + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ShowSimpleMessageBox */ extern DECLSPEC int SDLCALL SDL_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid); /** - * \brief Create a simple modal message box + * Display a simple modal message box. * - * \param flags ::SDL_MessageBoxFlags - * \param title UTF-8 title text - * \param message UTF-8 message text - * \param window The parent window, or NULL for no parent + * If your needs aren't complex, this function is preferred over + * SDL_ShowMessageBox. * - * \return 0 on success, -1 on error + * `flags` may be any of the following: * - * \sa SDL_ShowMessageBox + * - `SDL_MESSAGEBOX_ERROR`: error dialog + * - `SDL_MESSAGEBOX_WARNING`: warning dialog + * - `SDL_MESSAGEBOX_INFORMATION`: informational dialog + * + * This function should be called on the thread that created the parent + * window, or on the main thread if the messagebox has no parent. It will + * block execution of that thread until the user clicks a button or closes the + * messagebox. + * + * This function may be called at any time, even before SDL_Init(). This makes + * it useful for reporting errors like a failure to create a renderer or + * OpenGL context. + * + * On X11, SDL rolls its own dialog box with X11 primitives instead of a + * formal toolkit like GTK+ or Qt. + * + * Note that if SDL_Init() would fail because there isn't any available video + * target, this function is likely to fail for the same reasons. If this is a + * concern, check the return value from this function and fall back to writing + * to stderr if you can. + * + * \param flags an SDL_MessageBoxFlags value + * \param title UTF-8 title text + * \param message UTF-8 message text + * \param window the parent window, or NULL for no parent + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ShowMessageBox */ extern DECLSPEC int SDLCALL SDL_ShowSimpleMessageBox(Uint32 flags, const char *title, const char *message, SDL_Window *window); diff --git a/libs/SDL2/include/SDL_metal.h b/libs/SDL2/include/SDL_metal.h new file mode 100644 index 000000000..9ecaa8151 --- /dev/null +++ b/libs/SDL2/include/SDL_metal.h @@ -0,0 +1,112 @@ +/* + Simple DirectMedia Layer + Copyright (C) 1997-2022 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ + +/** + * \file SDL_metal.h + * + * Header file for functions to creating Metal layers and views on SDL windows. + */ + +#ifndef SDL_metal_h_ +#define SDL_metal_h_ + +#include "SDL_video.h" + +#include "begin_code.h" +/* Set up for C function definitions, even when using C++ */ +#ifdef __cplusplus +extern "C" { +#endif + +/** + * \brief A handle to a CAMetalLayer-backed NSView (macOS) or UIView (iOS/tvOS). + * + * \note This can be cast directly to an NSView or UIView. + */ +typedef void *SDL_MetalView; + +/** + * \name Metal support functions + */ +/* @{ */ + +/** + * Create a CAMetalLayer-backed NSView/UIView and attach it to the specified + * window. + * + * On macOS, this does *not* associate a MTLDevice with the CAMetalLayer on + * its own. It is up to user code to do that. + * + * The returned handle can be casted directly to a NSView or UIView. To access + * the backing CAMetalLayer, call SDL_Metal_GetLayer(). + * + * \since This function is available since SDL 2.0.12. + * + * \sa SDL_Metal_DestroyView + * \sa SDL_Metal_GetLayer + */ +extern DECLSPEC SDL_MetalView SDLCALL SDL_Metal_CreateView(SDL_Window * window); + +/** + * Destroy an existing SDL_MetalView object. + * + * This should be called before SDL_DestroyWindow, if SDL_Metal_CreateView was + * called after SDL_CreateWindow. + * + * \since This function is available since SDL 2.0.12. + * + * \sa SDL_Metal_CreateView + */ +extern DECLSPEC void SDLCALL SDL_Metal_DestroyView(SDL_MetalView view); + +/** + * Get a pointer to the backing CAMetalLayer for the given view. + * + * \since This function is available since SDL 2.0.14. + * + * \sa SDL_MetalCreateView + */ +extern DECLSPEC void *SDLCALL SDL_Metal_GetLayer(SDL_MetalView view); + +/** + * Get the size of a window's underlying drawable in pixels (for use with + * setting viewport, scissor & etc). + * + * \param window SDL_Window from which the drawable size should be queried + * \param w Pointer to variable for storing the width in pixels, may be NULL + * + * \since This function is available since SDL 2.0.14. + * + * \sa SDL_GetWindowSize + * \sa SDL_CreateWindow + */ +extern DECLSPEC void SDLCALL SDL_Metal_GetDrawableSize(SDL_Window* window, int *w, + int *h); + +/* @} *//* Metal support functions */ + +/* Ends C function definitions when using C++ */ +#ifdef __cplusplus +} +#endif +#include "close_code.h" + +#endif /* SDL_metal_h_ */ diff --git a/libs/SDL2/include/SDL_misc.h b/libs/SDL2/include/SDL_misc.h new file mode 100644 index 000000000..261b6b871 --- /dev/null +++ b/libs/SDL2/include/SDL_misc.h @@ -0,0 +1,79 @@ +/* + Simple DirectMedia Layer + Copyright (C) 1997-2022 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ + +/** + * \file SDL_misc.h + * + * \brief Include file for SDL API functions that don't fit elsewhere. + */ + +#ifndef SDL_misc_h_ +#define SDL_misc_h_ + +#include "SDL_stdinc.h" + +#include "begin_code.h" + +/* Set up for C function definitions, even when using C++ */ +#ifdef __cplusplus +extern "C" { +#endif + +/** + * Open a URL/URI in the browser or other appropriate external application. + * + * Open a URL in a separate, system-provided application. How this works will + * vary wildly depending on the platform. This will likely launch what makes + * sense to handle a specific URL's protocol (a web browser for `http://`, + * etc), but it might also be able to launch file managers for directories and + * other things. + * + * What happens when you open a URL varies wildly as well: your game window + * may lose focus (and may or may not lose focus if your game was fullscreen + * or grabbing input at the time). On mobile devices, your app will likely + * move to the background or your process might be paused. Any given platform + * may or may not handle a given URL. + * + * If this is unimplemented (or simply unavailable) for a platform, this will + * fail with an error. A successful result does not mean the URL loaded, just + * that we launched _something_ to handle it (or at least believe we did). + * + * All this to say: this function can be useful, but you should definitely + * test it on every platform you target. + * + * \param url A valid URL/URI to open. Use `file:///full/path/to/file` for + * local files, if supported. + * \returns 0 on success, or -1 on error; call SDL_GetError() for more + * information. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC int SDLCALL SDL_OpenURL(const char *url); + +/* Ends C function definitions when using C++ */ +#ifdef __cplusplus +} +#endif +#include "close_code.h" + +#endif /* SDL_misc_h_ */ + +/* vi: set ts=4 sw=4 expandtab: */ diff --git a/libs/SDL2/include/SDL_mouse.h b/libs/SDL2/include/SDL_mouse.h index 277559d23..1d4a2db0d 100644 --- a/libs/SDL2/include/SDL_mouse.h +++ b/libs/SDL2/include/SDL_mouse.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -72,150 +72,240 @@ typedef enum /* Function prototypes */ /** - * \brief Get the window which currently has mouse focus. + * Get the window which currently has mouse focus. + * + * \returns the window with mouse focus. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC SDL_Window * SDLCALL SDL_GetMouseFocus(void); /** - * \brief Retrieve the current state of the mouse. + * Retrieve the current state of the mouse. * - * The current button state is returned as a button bitmask, which can - * be tested using the SDL_BUTTON(X) macros, and x and y are set to the - * mouse cursor position relative to the focus window for the currently - * selected mouse. You can pass NULL for either x or y. + * The current button state is returned as a button bitmask, which can be + * tested using the `SDL_BUTTON(X)` macros (where `X` is generally 1 for the + * left, 2 for middle, 3 for the right button), and `x` and `y` are set to the + * mouse cursor position relative to the focus window. You can pass NULL for + * either `x` or `y`. + * + * \param x the x coordinate of the mouse cursor position relative to the + * focus window + * \param y the y coordinate of the mouse cursor position relative to the + * focus window + * \returns a 32-bit button bitmask of the current button state. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetGlobalMouseState + * \sa SDL_GetRelativeMouseState + * \sa SDL_PumpEvents */ extern DECLSPEC Uint32 SDLCALL SDL_GetMouseState(int *x, int *y); /** - * \brief Get the current state of the mouse, in relation to the desktop + * Get the current state of the mouse in relation to the desktop. * - * This works just like SDL_GetMouseState(), but the coordinates will be - * reported relative to the top-left of the desktop. This can be useful if - * you need to track the mouse outside of a specific window and - * SDL_CaptureMouse() doesn't fit your needs. For example, it could be - * useful if you need to track the mouse while dragging a window, where - * coordinates relative to a window might not be in sync at all times. + * This works similarly to SDL_GetMouseState(), but the coordinates will be + * reported relative to the top-left of the desktop. This can be useful if you + * need to track the mouse outside of a specific window and SDL_CaptureMouse() + * doesn't fit your needs. For example, it could be useful if you need to + * track the mouse while dragging a window, where coordinates relative to a + * window might not be in sync at all times. * - * \note SDL_GetMouseState() returns the mouse position as SDL understands - * it from the last pump of the event queue. This function, however, - * queries the OS for the current mouse position, and as such, might - * be a slightly less efficient function. Unless you know what you're - * doing and have a good reason to use this function, you probably want - * SDL_GetMouseState() instead. + * Note: SDL_GetMouseState() returns the mouse position as SDL understands it + * from the last pump of the event queue. This function, however, queries the + * OS for the current mouse position, and as such, might be a slightly less + * efficient function. Unless you know what you're doing and have a good + * reason to use this function, you probably want SDL_GetMouseState() instead. * - * \param x Returns the current X coord, relative to the desktop. Can be NULL. - * \param y Returns the current Y coord, relative to the desktop. Can be NULL. - * \return The current button state as a bitmask, which can be tested using the SDL_BUTTON(X) macros. + * \param x filled in with the current X coord relative to the desktop; can be + * NULL + * \param y filled in with the current Y coord relative to the desktop; can be + * NULL + * \returns the current button state as a bitmask which can be tested using + * the SDL_BUTTON(X) macros. * - * \sa SDL_GetMouseState + * \since This function is available since SDL 2.0.4. + * + * \sa SDL_CaptureMouse */ extern DECLSPEC Uint32 SDLCALL SDL_GetGlobalMouseState(int *x, int *y); /** - * \brief Retrieve the relative state of the mouse. + * Retrieve the relative state of the mouse. * - * The current button state is returned as a button bitmask, which can - * be tested using the SDL_BUTTON(X) macros, and x and y are set to the - * mouse deltas since the last call to SDL_GetRelativeMouseState(). + * The current button state is returned as a button bitmask, which can be + * tested using the `SDL_BUTTON(X)` macros (where `X` is generally 1 for the + * left, 2 for middle, 3 for the right button), and `x` and `y` are set to the + * mouse deltas since the last call to SDL_GetRelativeMouseState() or since + * event initialization. You can pass NULL for either `x` or `y`. + * + * \param x a pointer filled with the last recorded x coordinate of the mouse + * \param y a pointer filled with the last recorded y coordinate of the mouse + * \returns a 32-bit button bitmask of the relative button state. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetMouseState */ extern DECLSPEC Uint32 SDLCALL SDL_GetRelativeMouseState(int *x, int *y); /** - * \brief Moves the mouse to the given position within the window. + * Move the mouse cursor to the given position within the window. * - * \param window The window to move the mouse into, or NULL for the current mouse focus - * \param x The x coordinate within the window - * \param y The y coordinate within the window + * This function generates a mouse motion event. * - * \note This function generates a mouse motion event + * Note that this function will appear to succeed, but not actually move the + * mouse when used over Microsoft Remote Desktop. + * + * \param window the window to move the mouse into, or NULL for the current + * mouse focus + * \param x the x coordinate within the window + * \param y the y coordinate within the window + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_WarpMouseGlobal */ extern DECLSPEC void SDLCALL SDL_WarpMouseInWindow(SDL_Window * window, int x, int y); /** - * \brief Moves the mouse to the given position in global screen space. + * Move the mouse to the given position in global screen space. * - * \param x The x coordinate - * \param y The y coordinate - * \return 0 on success, -1 on error (usually: unsupported by a platform). + * This function generates a mouse motion event. * - * \note This function generates a mouse motion event + * A failure of this function usually means that it is unsupported by a + * platform. + * + * Note that this function will appear to succeed, but not actually move the + * mouse when used over Microsoft Remote Desktop. + * + * \param x the x coordinate + * \param y the y coordinate + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.4. + * + * \sa SDL_WarpMouseInWindow */ extern DECLSPEC int SDLCALL SDL_WarpMouseGlobal(int x, int y); /** - * \brief Set relative mouse mode. + * Set relative mouse mode. * - * \param enabled Whether or not to enable relative mode + * While the mouse is in relative mode, the cursor is hidden, and the driver + * will try to report continuous motion in the current window. Only relative + * motion events will be delivered, the mouse position will not change. * - * \return 0 on success, or -1 if relative mode is not supported. + * Note that this function will not be able to provide continuous relative + * motion when used over Microsoft Remote Desktop, instead motion is limited + * to the bounds of the screen. * - * While the mouse is in relative mode, the cursor is hidden, and the - * driver will try to report continuous motion in the current window. - * Only relative motion events will be delivered, the mouse position - * will not change. + * This function will flush any pending mouse motion. * - * \note This function will flush any pending mouse motion. + * \param enabled SDL_TRUE to enable relative mode, SDL_FALSE to disable. + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_GetRelativeMouseMode() + * If relative mode is not supported, this returns -1. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetRelativeMouseMode */ extern DECLSPEC int SDLCALL SDL_SetRelativeMouseMode(SDL_bool enabled); /** - * \brief Capture the mouse, to track input outside an SDL window. + * Capture the mouse and to track input outside an SDL window. * - * \param enabled Whether or not to enable capturing + * Capturing enables your app to obtain mouse events globally, instead of just + * within your window. Not all video targets support this function. When + * capturing is enabled, the current window will get all mouse events, but + * unlike relative mode, no change is made to the cursor and it is not + * restrained to your window. * - * Capturing enables your app to obtain mouse events globally, instead of - * just within your window. Not all video targets support this function. - * When capturing is enabled, the current window will get all mouse events, - * but unlike relative mode, no change is made to the cursor and it is - * not restrained to your window. + * This function may also deny mouse input to other windows--both those in + * your application and others on the system--so you should use this function + * sparingly, and in small bursts. For example, you might want to track the + * mouse while the user is dragging something, until the user releases a mouse + * button. It is not recommended that you capture the mouse for long periods + * of time, such as the entire time your app is running. For that, you should + * probably use SDL_SetRelativeMouseMode() or SDL_SetWindowGrab(), depending + * on your goals. * - * This function may also deny mouse input to other windows--both those in - * your application and others on the system--so you should use this - * function sparingly, and in small bursts. For example, you might want to - * track the mouse while the user is dragging something, until the user - * releases a mouse button. It is not recommended that you capture the mouse - * for long periods of time, such as the entire time your app is running. + * While captured, mouse events still report coordinates relative to the + * current (foreground) window, but those coordinates may be outside the + * bounds of the window (including negative values). Capturing is only allowed + * for the foreground window. If the window loses focus while capturing, the + * capture will be disabled automatically. * - * While captured, mouse events still report coordinates relative to the - * current (foreground) window, but those coordinates may be outside the - * bounds of the window (including negative values). Capturing is only - * allowed for the foreground window. If the window loses focus while - * capturing, the capture will be disabled automatically. + * While capturing is enabled, the current window will have the + * `SDL_WINDOW_MOUSE_CAPTURE` flag set. * - * While capturing is enabled, the current window will have the - * SDL_WINDOW_MOUSE_CAPTURE flag set. + * \param enabled SDL_TRUE to enable capturing, SDL_FALSE to disable. + * \returns 0 on success or -1 if not supported; call SDL_GetError() for more + * information. * - * \return 0 on success, or -1 if not supported. + * \since This function is available since SDL 2.0.4. + * + * \sa SDL_GetGlobalMouseState */ extern DECLSPEC int SDLCALL SDL_CaptureMouse(SDL_bool enabled); /** - * \brief Query whether relative mouse mode is enabled. + * Query whether relative mouse mode is enabled. * - * \sa SDL_SetRelativeMouseMode() + * \returns SDL_TRUE if relative mode is enabled or SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetRelativeMouseMode */ extern DECLSPEC SDL_bool SDLCALL SDL_GetRelativeMouseMode(void); /** - * \brief Create a cursor, using the specified bitmap data and - * mask (in MSB format). + * Create a cursor using the specified bitmap data and mask (in MSB format). * - * The cursor width must be a multiple of 8 bits. + * `mask` has to be in MSB (Most Significant Bit) format. * - * The cursor is created in black and white according to the following: - * - * - * - * - * - * - *
data mask resulting pixel on screen
0 1 White
1 1 Black
0 0 Transparent
1 0 Inverted color if possible, black - * if not.
+ * The cursor width (`w`) must be a multiple of 8 bits. * - * \sa SDL_FreeCursor() + * The cursor is created in black and white according to the following: + * + * - data=0, mask=1: white + * - data=1, mask=1: black + * - data=0, mask=0: transparent + * - data=1, mask=0: inverted color if possible, black if not. + * + * Cursors created with this function must be freed with SDL_FreeCursor(). + * + * If you want to have a color cursor, or create your cursor from an + * SDL_Surface, you should use SDL_CreateColorCursor(). Alternately, you can + * hide the cursor and draw your own as part of your game's rendering, but it + * will be bound to the framerate. + * + * Also, since SDL 2.0.0, SDL_CreateSystemCursor() is available, which + * provides twelve readily available system cursors to pick from. + * + * \param data the color value for each pixel of the cursor + * \param mask the mask value for each pixel of the cursor + * \param w the width of the cursor + * \param h the height of the cursor + * \param hot_x the X-axis location of the upper left corner of the cursor + * relative to the actual mouse position + * \param hot_y the Y-axis location of the upper left corner of the cursor + * relative to the actual mouse position + * \returns a new cursor with the specified parameters on success or NULL on + * failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_FreeCursor + * \sa SDL_SetCursor + * \sa SDL_ShowCursor */ extern DECLSPEC SDL_Cursor *SDLCALL SDL_CreateCursor(const Uint8 * data, const Uint8 * mask, @@ -223,60 +313,123 @@ extern DECLSPEC SDL_Cursor *SDLCALL SDL_CreateCursor(const Uint8 * data, int hot_y); /** - * \brief Create a color cursor. + * Create a color cursor. * - * \sa SDL_FreeCursor() + * \param surface an SDL_Surface structure representing the cursor image + * \param hot_x the x position of the cursor hot spot + * \param hot_y the y position of the cursor hot spot + * \returns the new cursor on success or NULL on failure; call SDL_GetError() + * for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateCursor + * \sa SDL_FreeCursor */ extern DECLSPEC SDL_Cursor *SDLCALL SDL_CreateColorCursor(SDL_Surface *surface, int hot_x, int hot_y); /** - * \brief Create a system cursor. + * Create a system cursor. * - * \sa SDL_FreeCursor() + * \param id an SDL_SystemCursor enum value + * \returns a cursor on success or NULL on failure; call SDL_GetError() for + * more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_FreeCursor */ extern DECLSPEC SDL_Cursor *SDLCALL SDL_CreateSystemCursor(SDL_SystemCursor id); /** - * \brief Set the active cursor. + * Set the active cursor. + * + * This function sets the currently active cursor to the specified one. If the + * cursor is currently visible, the change will be immediately represented on + * the display. SDL_SetCursor(NULL) can be used to force cursor redraw, if + * this is desired for any reason. + * + * \param cursor a cursor to make active + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateCursor + * \sa SDL_GetCursor + * \sa SDL_ShowCursor */ extern DECLSPEC void SDLCALL SDL_SetCursor(SDL_Cursor * cursor); /** - * \brief Return the active cursor. + * Get the active cursor. + * + * This function returns a pointer to the current cursor which is owned by the + * library. It is not necessary to free the cursor with SDL_FreeCursor(). + * + * \returns the active cursor or NULL if there is no mouse. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetCursor */ extern DECLSPEC SDL_Cursor *SDLCALL SDL_GetCursor(void); /** - * \brief Return the default cursor. + * Get the default cursor. + * + * \returns the default cursor on success or NULL on failure. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateSystemCursor */ extern DECLSPEC SDL_Cursor *SDLCALL SDL_GetDefaultCursor(void); /** - * \brief Frees a cursor created with SDL_CreateCursor() or similar functions. + * Free a previously-created cursor. * - * \sa SDL_CreateCursor() - * \sa SDL_CreateColorCursor() - * \sa SDL_CreateSystemCursor() + * Use this function to free cursor resources created with SDL_CreateCursor(), + * SDL_CreateColorCursor() or SDL_CreateSystemCursor(). + * + * \param cursor the cursor to free + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateColorCursor + * \sa SDL_CreateCursor + * \sa SDL_CreateSystemCursor */ extern DECLSPEC void SDLCALL SDL_FreeCursor(SDL_Cursor * cursor); /** - * \brief Toggle whether or not the cursor is shown. + * Toggle whether or not the cursor is shown. * - * \param toggle 1 to show the cursor, 0 to hide it, -1 to query the current - * state. + * The cursor starts off displayed but can be turned off. Passing `SDL_ENABLE` + * displays the cursor and passing `SDL_DISABLE` hides it. * - * \return 1 if the cursor is shown, or 0 if the cursor is hidden. + * The current state of the mouse cursor can be queried by passing + * `SDL_QUERY`; either `SDL_DISABLE` or `SDL_ENABLE` will be returned. + * + * \param toggle `SDL_ENABLE` to show the cursor, `SDL_DISABLE` to hide it, + * `SDL_QUERY` to query the current state without changing it. + * \returns `SDL_ENABLE` if the cursor is shown, or `SDL_DISABLE` if the + * cursor is hidden, or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateCursor + * \sa SDL_SetCursor */ extern DECLSPEC int SDLCALL SDL_ShowCursor(int toggle); /** - * Used as a mask when testing buttons in buttonstate. - * - Button 1: Left mouse button - * - Button 2: Middle mouse button - * - Button 3: Right mouse button + * Used as a mask when testing buttons in buttonstate. + * + * - Button 1: Left mouse button + * - Button 2: Middle mouse button + * - Button 3: Right mouse button */ #define SDL_BUTTON(X) (1 << ((X)-1)) #define SDL_BUTTON_LEFT 1 @@ -290,7 +443,6 @@ extern DECLSPEC int SDLCALL SDL_ShowCursor(int toggle); #define SDL_BUTTON_X1MASK SDL_BUTTON(SDL_BUTTON_X1) #define SDL_BUTTON_X2MASK SDL_BUTTON(SDL_BUTTON_X2) - /* Ends C function definitions when using C++ */ #ifdef __cplusplus } diff --git a/libs/SDL2/include/SDL_mutex.h b/libs/SDL2/include/SDL_mutex.h index 970e78713..173468f6a 100644 --- a/libs/SDL2/include/SDL_mutex.h +++ b/libs/SDL2/include/SDL_mutex.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -59,38 +59,105 @@ struct SDL_mutex; typedef struct SDL_mutex SDL_mutex; /** - * Create a mutex, initialized unlocked. + * Create a new mutex. + * + * All newly-created mutexes begin in the _unlocked_ state. + * + * Calls to SDL_LockMutex() will not return while the mutex is locked by + * another thread. See SDL_TryLockMutex() to attempt to lock without blocking. + * + * SDL mutexes are reentrant. + * + * \returns the initialized and unlocked mutex or NULL on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_DestroyMutex + * \sa SDL_LockMutex + * \sa SDL_TryLockMutex + * \sa SDL_UnlockMutex */ extern DECLSPEC SDL_mutex *SDLCALL SDL_CreateMutex(void); /** - * Lock the mutex. + * Lock the mutex. * - * \return 0, or -1 on error. + * This will block until the mutex is available, which is to say it is in the + * unlocked state and the OS has chosen the caller as the next thread to lock + * it. Of all threads waiting to lock the mutex, only one may do so at a time. + * + * It is legal for the owning thread to lock an already-locked mutex. It must + * unlock it the same number of times before it is actually made available for + * other threads in the system (this is known as a "recursive mutex"). + * + * \param mutex the mutex to lock + * \return 0, or -1 on error. + * + * \since This function is available since SDL 2.0.0. */ -#define SDL_mutexP(m) SDL_LockMutex(m) extern DECLSPEC int SDLCALL SDL_LockMutex(SDL_mutex * mutex); +#define SDL_mutexP(m) SDL_LockMutex(m) /** - * Try to lock the mutex + * Try to lock a mutex without blocking. * - * \return 0, SDL_MUTEX_TIMEDOUT, or -1 on error + * This works just like SDL_LockMutex(), but if the mutex is not available, + * this function returns `SDL_MUTEX_TIMEOUT` immediately. + * + * This technique is useful if you need exclusive access to a resource but + * don't want to wait for it, and will return to it to try again later. + * + * \param mutex the mutex to try to lock + * \returns 0, `SDL_MUTEX_TIMEDOUT`, or -1 on error; call SDL_GetError() for + * more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateMutex + * \sa SDL_DestroyMutex + * \sa SDL_LockMutex + * \sa SDL_UnlockMutex */ extern DECLSPEC int SDLCALL SDL_TryLockMutex(SDL_mutex * mutex); /** - * Unlock the mutex. + * Unlock the mutex. * - * \return 0, or -1 on error. + * It is legal for the owning thread to lock an already-locked mutex. It must + * unlock it the same number of times before it is actually made available for + * other threads in the system (this is known as a "recursive mutex"). * - * \warning It is an error to unlock a mutex that has not been locked by - * the current thread, and doing so results in undefined behavior. + * It is an error to unlock a mutex that has not been locked by the current + * thread, and doing so results in undefined behavior. + * + * It is also an error to unlock a mutex that isn't locked at all. + * + * \param mutex the mutex to unlock. + * \returns 0, or -1 on error. + * + * \since This function is available since SDL 2.0.0. */ -#define SDL_mutexV(m) SDL_UnlockMutex(m) extern DECLSPEC int SDLCALL SDL_UnlockMutex(SDL_mutex * mutex); +#define SDL_mutexV(m) SDL_UnlockMutex(m) /** - * Destroy a mutex. + * Destroy a mutex created with SDL_CreateMutex(). + * + * This function must be called on any mutex that is no longer needed. Failure + * to destroy a mutex will result in a system memory or resource leak. While + * it is safe to destroy a mutex that is _unlocked_, it is not safe to attempt + * to destroy a locked mutex, and may result in undefined behavior depending + * on the platform. + * + * \param mutex the mutex to destroy + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateMutex + * \sa SDL_LockMutex + * \sa SDL_TryLockMutex + * \sa SDL_UnlockMutex */ extern DECLSPEC void SDLCALL SDL_DestroyMutex(SDL_mutex * mutex); @@ -107,50 +174,151 @@ struct SDL_semaphore; typedef struct SDL_semaphore SDL_sem; /** - * Create a semaphore, initialized with value, returns NULL on failure. + * Create a semaphore. + * + * This function creates a new semaphore and initializes it with the value + * `initial_value`. Each wait operation on the semaphore will atomically + * decrement the semaphore value and potentially block if the semaphore value + * is 0. Each post operation will atomically increment the semaphore value and + * wake waiting threads and allow them to retry the wait operation. + * + * \param initial_value the starting value of the semaphore + * \returns a new semaphore or NULL on failure; call SDL_GetError() for more + * information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_DestroySemaphore + * \sa SDL_SemPost + * \sa SDL_SemTryWait + * \sa SDL_SemValue + * \sa SDL_SemWait + * \sa SDL_SemWaitTimeout */ extern DECLSPEC SDL_sem *SDLCALL SDL_CreateSemaphore(Uint32 initial_value); /** - * Destroy a semaphore. + * Destroy a semaphore. + * + * It is not safe to destroy a semaphore if there are threads currently + * waiting on it. + * + * \param sem the semaphore to destroy + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateSemaphore + * \sa SDL_SemPost + * \sa SDL_SemTryWait + * \sa SDL_SemValue + * \sa SDL_SemWait + * \sa SDL_SemWaitTimeout */ extern DECLSPEC void SDLCALL SDL_DestroySemaphore(SDL_sem * sem); /** - * This function suspends the calling thread until the semaphore pointed - * to by \c sem has a positive count. It then atomically decreases the - * semaphore count. + * Wait until a semaphore has a positive value and then decrements it. + * + * This function suspends the calling thread until either the semaphore + * pointed to by `sem` has a positive value or the call is interrupted by a + * signal or error. If the call is successful it will atomically decrement the + * semaphore value. + * + * This function is the equivalent of calling SDL_SemWaitTimeout() with a time + * length of `SDL_MUTEX_MAXWAIT`. + * + * \param sem the semaphore wait on + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateSemaphore + * \sa SDL_DestroySemaphore + * \sa SDL_SemPost + * \sa SDL_SemTryWait + * \sa SDL_SemValue + * \sa SDL_SemWait + * \sa SDL_SemWaitTimeout */ extern DECLSPEC int SDLCALL SDL_SemWait(SDL_sem * sem); /** - * Non-blocking variant of SDL_SemWait(). + * See if a semaphore has a positive value and decrement it if it does. * - * \return 0 if the wait succeeds, ::SDL_MUTEX_TIMEDOUT if the wait would - * block, and -1 on error. + * This function checks to see if the semaphore pointed to by `sem` has a + * positive value and atomically decrements the semaphore value if it does. If + * the semaphore doesn't have a positive value, the function immediately + * returns SDL_MUTEX_TIMEDOUT. + * + * \param sem the semaphore to wait on + * \returns 0 if the wait succeeds, `SDL_MUTEX_TIMEDOUT` if the wait would + * block, or a negative error code on failure; call SDL_GetError() + * for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateSemaphore + * \sa SDL_DestroySemaphore + * \sa SDL_SemPost + * \sa SDL_SemValue + * \sa SDL_SemWait + * \sa SDL_SemWaitTimeout */ extern DECLSPEC int SDLCALL SDL_SemTryWait(SDL_sem * sem); /** - * Variant of SDL_SemWait() with a timeout in milliseconds. + * Wait until a semaphore has a positive value and then decrements it. * - * \return 0 if the wait succeeds, ::SDL_MUTEX_TIMEDOUT if the wait does not - * succeed in the allotted time, and -1 on error. + * This function suspends the calling thread until either the semaphore + * pointed to by `sem` has a positive value, the call is interrupted by a + * signal or error, or the specified time has elapsed. If the call is + * successful it will atomically decrement the semaphore value. * - * \warning On some platforms this function is implemented by looping with a - * delay of 1 ms, and so should be avoided if possible. + * \param sem the semaphore to wait on + * \param ms the length of the timeout, in milliseconds + * \returns 0 if the wait succeeds, `SDL_MUTEX_TIMEDOUT` if the wait does not + * succeed in the allotted time, or a negative error code on failure; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateSemaphore + * \sa SDL_DestroySemaphore + * \sa SDL_SemPost + * \sa SDL_SemTryWait + * \sa SDL_SemValue + * \sa SDL_SemWait */ extern DECLSPEC int SDLCALL SDL_SemWaitTimeout(SDL_sem * sem, Uint32 ms); /** - * Atomically increases the semaphore's count (not blocking). + * Atomically increment a semaphore's value and wake waiting threads. * - * \return 0, or -1 on error. + * \param sem the semaphore to increment + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateSemaphore + * \sa SDL_DestroySemaphore + * \sa SDL_SemTryWait + * \sa SDL_SemValue + * \sa SDL_SemWait + * \sa SDL_SemWaitTimeout */ extern DECLSPEC int SDLCALL SDL_SemPost(SDL_sem * sem); /** - * Returns the current count of the semaphore. + * Get the current value of a semaphore. + * + * \param sem the semaphore to query + * \returns the current value of the semaphore. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateSemaphore */ extern DECLSPEC Uint32 SDLCALL SDL_SemValue(SDL_sem * sem); @@ -167,72 +335,124 @@ struct SDL_cond; typedef struct SDL_cond SDL_cond; /** - * Create a condition variable. + * Create a condition variable. * - * Typical use of condition variables: + * \returns a new condition variable or NULL on failure; call SDL_GetError() + * for more information. * - * Thread A: - * SDL_LockMutex(lock); - * while ( ! condition ) { - * SDL_CondWait(cond, lock); - * } - * SDL_UnlockMutex(lock); + * \since This function is available since SDL 2.0.0. * - * Thread B: - * SDL_LockMutex(lock); - * ... - * condition = true; - * ... - * SDL_CondSignal(cond); - * SDL_UnlockMutex(lock); - * - * There is some discussion whether to signal the condition variable - * with the mutex locked or not. There is some potential performance - * benefit to unlocking first on some platforms, but there are some - * potential race conditions depending on how your code is structured. - * - * In general it's safer to signal the condition variable while the - * mutex is locked. + * \sa SDL_CondBroadcast + * \sa SDL_CondSignal + * \sa SDL_CondWait + * \sa SDL_CondWaitTimeout + * \sa SDL_DestroyCond */ extern DECLSPEC SDL_cond *SDLCALL SDL_CreateCond(void); /** - * Destroy a condition variable. + * Destroy a condition variable. + * + * \param cond the condition variable to destroy + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CondBroadcast + * \sa SDL_CondSignal + * \sa SDL_CondWait + * \sa SDL_CondWaitTimeout + * \sa SDL_CreateCond */ extern DECLSPEC void SDLCALL SDL_DestroyCond(SDL_cond * cond); /** - * Restart one of the threads that are waiting on the condition variable. + * Restart one of the threads that are waiting on the condition variable. * - * \return 0 or -1 on error. + * \param cond the condition variable to signal + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CondBroadcast + * \sa SDL_CondWait + * \sa SDL_CondWaitTimeout + * \sa SDL_CreateCond + * \sa SDL_DestroyCond */ extern DECLSPEC int SDLCALL SDL_CondSignal(SDL_cond * cond); /** - * Restart all threads that are waiting on the condition variable. + * Restart all threads that are waiting on the condition variable. * - * \return 0 or -1 on error. + * \param cond the condition variable to signal + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CondSignal + * \sa SDL_CondWait + * \sa SDL_CondWaitTimeout + * \sa SDL_CreateCond + * \sa SDL_DestroyCond */ extern DECLSPEC int SDLCALL SDL_CondBroadcast(SDL_cond * cond); /** - * Wait on the condition variable, unlocking the provided mutex. + * Wait until a condition variable is signaled. * - * \warning The mutex must be locked before entering this function! + * This function unlocks the specified `mutex` and waits for another thread to + * call SDL_CondSignal() or SDL_CondBroadcast() on the condition variable + * `cond`. Once the condition variable is signaled, the mutex is re-locked and + * the function returns. * - * The mutex is re-locked once the condition variable is signaled. + * The mutex must be locked before calling this function. * - * \return 0 when it is signaled, or -1 on error. + * This function is the equivalent of calling SDL_CondWaitTimeout() with a + * time length of `SDL_MUTEX_MAXWAIT`. + * + * \param cond the condition variable to wait on + * \param mutex the mutex used to coordinate thread access + * \returns 0 when it is signaled or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CondBroadcast + * \sa SDL_CondSignal + * \sa SDL_CondWaitTimeout + * \sa SDL_CreateCond + * \sa SDL_DestroyCond */ extern DECLSPEC int SDLCALL SDL_CondWait(SDL_cond * cond, SDL_mutex * mutex); /** - * Waits for at most \c ms milliseconds, and returns 0 if the condition - * variable is signaled, ::SDL_MUTEX_TIMEDOUT if the condition is not - * signaled in the allotted time, and -1 on error. + * Wait until a condition variable is signaled or a certain time has passed. * - * \warning On some platforms this function is implemented by looping with a - * delay of 1 ms, and so should be avoided if possible. + * This function unlocks the specified `mutex` and waits for another thread to + * call SDL_CondSignal() or SDL_CondBroadcast() on the condition variable + * `cond`, or for the specified time to elapse. Once the condition variable is + * signaled or the time elapsed, the mutex is re-locked and the function + * returns. + * + * The mutex must be locked before calling this function. + * + * \param cond the condition variable to wait on + * \param mutex the mutex used to coordinate thread access + * \param ms the maximum time to wait, in milliseconds, or `SDL_MUTEX_MAXWAIT` + * to wait indefinitely + * \returns 0 if the condition variable is signaled, `SDL_MUTEX_TIMEDOUT` if + * the condition is not signaled in the allotted time, or a negative + * error code on failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CondBroadcast + * \sa SDL_CondSignal + * \sa SDL_CondWait + * \sa SDL_CreateCond + * \sa SDL_DestroyCond */ extern DECLSPEC int SDLCALL SDL_CondWaitTimeout(SDL_cond * cond, SDL_mutex * mutex, Uint32 ms); diff --git a/libs/SDL2/include/SDL_name.h b/libs/SDL2/include/SDL_name.h index 690a8199b..6ff35b46e 100644 --- a/libs/SDL2/include/SDL_name.h +++ b/libs/SDL2/include/SDL_name.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/include/SDL_opengl.h b/libs/SDL2/include/SDL_opengl.h index 6685be73e..9aed5035a 100644 --- a/libs/SDL2/include/SDL_opengl.h +++ b/libs/SDL2/include/SDL_opengl.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/include/SDL_opengl_glext.h b/libs/SDL2/include/SDL_opengl_glext.h index cd3869fe7..6a402b15a 100644 --- a/libs/SDL2/include/SDL_opengl_glext.h +++ b/libs/SDL2/include/SDL_opengl_glext.h @@ -40,6 +40,9 @@ extern "C" { #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN 1 #endif +#ifndef NOMINMAX /* don't define min() and max(). */ +#define NOMINMAX +#endif #include #endif diff --git a/libs/SDL2/include/SDL_opengles.h b/libs/SDL2/include/SDL_opengles.h index 1e0660c3d..8511b9607 100644 --- a/libs/SDL2/include/SDL_opengles.h +++ b/libs/SDL2/include/SDL_opengles.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/include/SDL_opengles2.h b/libs/SDL2/include/SDL_opengles2.h index df29d3840..172fcb3f4 100644 --- a/libs/SDL2/include/SDL_opengles2.h +++ b/libs/SDL2/include/SDL_opengles2.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -26,7 +26,7 @@ */ #include "SDL_config.h" -#ifndef _MSC_VER +#if !defined(_MSC_VER) && !defined(SDL_USE_BUILTIN_OPENGL_DEFINITIONS) #ifdef __IPHONEOS__ #include diff --git a/libs/SDL2/include/SDL_pixels.h b/libs/SDL2/include/SDL_pixels.h index dcb7a980d..5d2c0c898 100644 --- a/libs/SDL2/include/SDL_pixels.h +++ b/libs/SDL2/include/SDL_pixels.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -48,7 +48,7 @@ extern "C" { /* @} */ /** Pixel type. */ -enum +typedef enum { SDL_PIXELTYPE_UNKNOWN, SDL_PIXELTYPE_INDEX1, @@ -62,18 +62,18 @@ enum SDL_PIXELTYPE_ARRAYU32, SDL_PIXELTYPE_ARRAYF16, SDL_PIXELTYPE_ARRAYF32 -}; +} SDL_PixelType; /** Bitmap pixel order, high bit -> low bit. */ -enum +typedef enum { SDL_BITMAPORDER_NONE, SDL_BITMAPORDER_4321, SDL_BITMAPORDER_1234 -}; +} SDL_BitmapOrder; /** Packed component order, high bit -> low bit. */ -enum +typedef enum { SDL_PACKEDORDER_NONE, SDL_PACKEDORDER_XRGB, @@ -84,12 +84,12 @@ enum SDL_PACKEDORDER_BGRX, SDL_PACKEDORDER_ABGR, SDL_PACKEDORDER_BGRA -}; +} SDL_PackedOrder; /** Array component order, low byte -> high byte. */ /* !!! FIXME: in 2.1, make these not overlap differently with !!! FIXME: SDL_PACKEDORDER_*, so we can simplify SDL_ISPIXELFORMAT_ALPHA */ -enum +typedef enum { SDL_ARRAYORDER_NONE, SDL_ARRAYORDER_RGB, @@ -98,10 +98,10 @@ enum SDL_ARRAYORDER_BGR, SDL_ARRAYORDER_BGRA, SDL_ARRAYORDER_ABGR -}; +} SDL_ArrayOrder; /** Packed component layout. */ -enum +typedef enum { SDL_PACKEDLAYOUT_NONE, SDL_PACKEDLAYOUT_332, @@ -112,7 +112,7 @@ enum SDL_PACKEDLAYOUT_8888, SDL_PACKEDLAYOUT_2101010, SDL_PACKEDLAYOUT_1010102 -}; +} SDL_PackedLayout; #define SDL_DEFINE_PIXELFOURCC(A, B, C, D) SDL_FOURCC(A, B, C, D) @@ -188,15 +188,22 @@ typedef enum SDL_PIXELFORMAT_RGB332 = SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED8, SDL_PACKEDORDER_XRGB, SDL_PACKEDLAYOUT_332, 8, 1), - SDL_PIXELFORMAT_RGB444 = + SDL_PIXELFORMAT_XRGB4444 = SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XRGB, SDL_PACKEDLAYOUT_4444, 12, 2), - SDL_PIXELFORMAT_RGB555 = + SDL_PIXELFORMAT_RGB444 = SDL_PIXELFORMAT_XRGB4444, + SDL_PIXELFORMAT_XBGR4444 = + SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XBGR, + SDL_PACKEDLAYOUT_4444, 12, 2), + SDL_PIXELFORMAT_BGR444 = SDL_PIXELFORMAT_XBGR4444, + SDL_PIXELFORMAT_XRGB1555 = SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XRGB, SDL_PACKEDLAYOUT_1555, 15, 2), - SDL_PIXELFORMAT_BGR555 = + SDL_PIXELFORMAT_RGB555 = SDL_PIXELFORMAT_XRGB1555, + SDL_PIXELFORMAT_XBGR1555 = SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XBGR, SDL_PACKEDLAYOUT_1555, 15, 2), + SDL_PIXELFORMAT_BGR555 = SDL_PIXELFORMAT_XBGR1555, SDL_PIXELFORMAT_ARGB4444 = SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_ARGB, SDL_PACKEDLAYOUT_4444, 16, 2), @@ -233,15 +240,17 @@ typedef enum SDL_PIXELFORMAT_BGR24 = SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_ARRAYU8, SDL_ARRAYORDER_BGR, 0, 24, 3), - SDL_PIXELFORMAT_RGB888 = + SDL_PIXELFORMAT_XRGB8888 = SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_XRGB, SDL_PACKEDLAYOUT_8888, 24, 4), + SDL_PIXELFORMAT_RGB888 = SDL_PIXELFORMAT_XRGB8888, SDL_PIXELFORMAT_RGBX8888 = SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_RGBX, SDL_PACKEDLAYOUT_8888, 24, 4), - SDL_PIXELFORMAT_BGR888 = + SDL_PIXELFORMAT_XBGR8888 = SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_XBGR, SDL_PACKEDLAYOUT_8888, 24, 4), + SDL_PIXELFORMAT_BGR888 = SDL_PIXELFORMAT_XBGR8888, SDL_PIXELFORMAT_BGRX8888 = SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_BGRX, SDL_PACKEDLAYOUT_8888, 24, 4), @@ -292,6 +301,11 @@ typedef enum SDL_DEFINE_PIXELFOURCC('O', 'E', 'S', ' ') } SDL_PixelFormatEnum; +/** + * The bits of this structure can be directly reinterpreted as an integer-packed + * color which uses the SDL_PIXELFORMAT_RGBA32 format (SDL_PIXELFORMAT_ABGR8888 + * on little-endian systems and SDL_PIXELFORMAT_RGBA8888 on big-endian systems). + */ typedef struct SDL_Color { Uint8 r; @@ -336,16 +350,31 @@ typedef struct SDL_PixelFormat } SDL_PixelFormat; /** - * \brief Get the human readable name of a pixel format + * Get the human readable name of a pixel format. + * + * \param format the pixel format to query + * \returns the human readable name of the specified pixel format or + * `SDL_PIXELFORMAT_UNKNOWN` if the format isn't recognized. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC const char* SDLCALL SDL_GetPixelFormatName(Uint32 format); /** - * \brief Convert one of the enumerated pixel formats to a bpp and RGBA masks. + * Convert one of the enumerated pixel formats to a bpp value and RGBA masks. * - * \return SDL_TRUE, or SDL_FALSE if the conversion wasn't possible. + * \param format one of the SDL_PixelFormatEnum values + * \param bpp a bits per pixel value; usually 15, 16, or 32 + * \param Rmask a pointer filled in with the red mask for the format + * \param Gmask a pointer filled in with the green mask for the format + * \param Bmask a pointer filled in with the blue mask for the format + * \param Amask a pointer filled in with the alpha mask for the format + * \returns SDL_TRUE on success or SDL_FALSE if the conversion wasn't + * possible; call SDL_GetError() for more information. * - * \sa SDL_MasksToPixelFormatEnum() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_MasksToPixelFormatEnum */ extern DECLSPEC SDL_bool SDLCALL SDL_PixelFormatEnumToMasks(Uint32 format, int *bpp, @@ -355,12 +384,21 @@ extern DECLSPEC SDL_bool SDLCALL SDL_PixelFormatEnumToMasks(Uint32 format, Uint32 * Amask); /** - * \brief Convert a bpp and RGBA masks to an enumerated pixel format. + * Convert a bpp value and RGBA masks to an enumerated pixel format. * - * \return The pixel format, or ::SDL_PIXELFORMAT_UNKNOWN if the conversion - * wasn't possible. + * This will return `SDL_PIXELFORMAT_UNKNOWN` if the conversion wasn't + * possible. * - * \sa SDL_PixelFormatEnumToMasks() + * \param bpp a bits per pixel value; usually 15, 16, or 32 + * \param Rmask the red mask for the format + * \param Gmask the green mask for the format + * \param Bmask the blue mask for the format + * \param Amask the alpha mask for the format + * \returns one of the SDL_PixelFormatEnum values + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_PixelFormatEnumToMasks */ extern DECLSPEC Uint32 SDLCALL SDL_MasksToPixelFormatEnum(int bpp, Uint32 Rmask, @@ -369,84 +407,213 @@ extern DECLSPEC Uint32 SDLCALL SDL_MasksToPixelFormatEnum(int bpp, Uint32 Amask); /** - * \brief Create an SDL_PixelFormat structure from a pixel format enum. + * Create an SDL_PixelFormat structure corresponding to a pixel format. + * + * Returned structure may come from a shared global cache (i.e. not newly + * allocated), and hence should not be modified, especially the palette. Weird + * errors such as `Blit combination not supported` may occur. + * + * \param pixel_format one of the SDL_PixelFormatEnum values + * \returns the new SDL_PixelFormat structure or NULL on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_FreeFormat */ extern DECLSPEC SDL_PixelFormat * SDLCALL SDL_AllocFormat(Uint32 pixel_format); /** - * \brief Free an SDL_PixelFormat structure. + * Free an SDL_PixelFormat structure allocated by SDL_AllocFormat(). + * + * \param format the SDL_PixelFormat structure to free + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AllocFormat */ extern DECLSPEC void SDLCALL SDL_FreeFormat(SDL_PixelFormat *format); /** - * \brief Create a palette structure with the specified number of color - * entries. + * Create a palette structure with the specified number of color entries. * - * \return A new palette, or NULL if there wasn't enough memory. + * The palette entries are initialized to white. * - * \note The palette entries are initialized to white. + * \param ncolors represents the number of color entries in the color palette + * \returns a new SDL_Palette structure on success or NULL on failure (e.g. if + * there wasn't enough memory); call SDL_GetError() for more + * information. * - * \sa SDL_FreePalette() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_FreePalette */ extern DECLSPEC SDL_Palette *SDLCALL SDL_AllocPalette(int ncolors); /** - * \brief Set the palette for a pixel format structure. + * Set the palette for a pixel format structure. + * + * \param format the SDL_PixelFormat structure that will use the palette + * \param palette the SDL_Palette structure that will be used + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AllocPalette + * \sa SDL_FreePalette */ extern DECLSPEC int SDLCALL SDL_SetPixelFormatPalette(SDL_PixelFormat * format, SDL_Palette *palette); /** - * \brief Set a range of colors in a palette. + * Set a range of colors in a palette. * - * \param palette The palette to modify. - * \param colors An array of colors to copy into the palette. - * \param firstcolor The index of the first palette entry to modify. - * \param ncolors The number of entries to modify. + * \param palette the SDL_Palette structure to modify + * \param colors an array of SDL_Color structures to copy into the palette + * \param firstcolor the index of the first palette entry to modify + * \param ncolors the number of entries to modify + * \returns 0 on success or a negative error code if not all of the colors + * could be set; call SDL_GetError() for more information. * - * \return 0 on success, or -1 if not all of the colors could be set. + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AllocPalette + * \sa SDL_CreateRGBSurface */ extern DECLSPEC int SDLCALL SDL_SetPaletteColors(SDL_Palette * palette, const SDL_Color * colors, int firstcolor, int ncolors); /** - * \brief Free a palette created with SDL_AllocPalette(). + * Free a palette created with SDL_AllocPalette(). * - * \sa SDL_AllocPalette() + * \param palette the SDL_Palette structure to be freed + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AllocPalette */ extern DECLSPEC void SDLCALL SDL_FreePalette(SDL_Palette * palette); /** - * \brief Maps an RGB triple to an opaque pixel value for a given pixel format. + * Map an RGB triple to an opaque pixel value for a given pixel format. * - * \sa SDL_MapRGBA + * This function maps the RGB color value to the specified pixel format and + * returns the pixel value best approximating the given RGB color value for + * the given pixel format. + * + * If the format has a palette (8-bit) the index of the closest matching color + * in the palette will be returned. + * + * If the specified pixel format has an alpha component it will be returned as + * all 1 bits (fully opaque). + * + * If the pixel format bpp (color depth) is less than 32-bpp then the unused + * upper bits of the return value can safely be ignored (e.g., with a 16-bpp + * format the return value can be assigned to a Uint16, and similarly a Uint8 + * for an 8-bpp format). + * + * \param format an SDL_PixelFormat structure describing the pixel format + * \param r the red component of the pixel in the range 0-255 + * \param g the green component of the pixel in the range 0-255 + * \param b the blue component of the pixel in the range 0-255 + * \returns a pixel value + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetRGB + * \sa SDL_GetRGBA + * \sa SDL_MapRGBA */ extern DECLSPEC Uint32 SDLCALL SDL_MapRGB(const SDL_PixelFormat * format, Uint8 r, Uint8 g, Uint8 b); /** - * \brief Maps an RGBA quadruple to a pixel value for a given pixel format. + * Map an RGBA quadruple to a pixel value for a given pixel format. * - * \sa SDL_MapRGB + * This function maps the RGBA color value to the specified pixel format and + * returns the pixel value best approximating the given RGBA color value for + * the given pixel format. + * + * If the specified pixel format has no alpha component the alpha value will + * be ignored (as it will be in formats with a palette). + * + * If the format has a palette (8-bit) the index of the closest matching color + * in the palette will be returned. + * + * If the pixel format bpp (color depth) is less than 32-bpp then the unused + * upper bits of the return value can safely be ignored (e.g., with a 16-bpp + * format the return value can be assigned to a Uint16, and similarly a Uint8 + * for an 8-bpp format). + * + * \param format an SDL_PixelFormat structure describing the format of the + * pixel + * \param r the red component of the pixel in the range 0-255 + * \param g the green component of the pixel in the range 0-255 + * \param b the blue component of the pixel in the range 0-255 + * \param a the alpha component of the pixel in the range 0-255 + * \returns a pixel value + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetRGB + * \sa SDL_GetRGBA + * \sa SDL_MapRGB */ extern DECLSPEC Uint32 SDLCALL SDL_MapRGBA(const SDL_PixelFormat * format, Uint8 r, Uint8 g, Uint8 b, Uint8 a); /** - * \brief Get the RGB components from a pixel of the specified format. + * Get RGB values from a pixel in the specified format. * - * \sa SDL_GetRGBA + * This function uses the entire 8-bit [0..255] range when converting color + * components from pixel formats with less than 8-bits per RGB component + * (e.g., a completely white pixel in 16-bit RGB565 format would return [0xff, + * 0xff, 0xff] not [0xf8, 0xfc, 0xf8]). + * + * \param pixel a pixel value + * \param format an SDL_PixelFormat structure describing the format of the + * pixel + * \param r a pointer filled in with the red component + * \param g a pointer filled in with the green component + * \param b a pointer filled in with the blue component + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetRGBA + * \sa SDL_MapRGB + * \sa SDL_MapRGBA */ extern DECLSPEC void SDLCALL SDL_GetRGB(Uint32 pixel, const SDL_PixelFormat * format, Uint8 * r, Uint8 * g, Uint8 * b); /** - * \brief Get the RGBA components from a pixel of the specified format. + * Get RGBA values from a pixel in the specified format. * - * \sa SDL_GetRGB + * This function uses the entire 8-bit [0..255] range when converting color + * components from pixel formats with less than 8-bits per RGB component + * (e.g., a completely white pixel in 16-bit RGB565 format would return [0xff, + * 0xff, 0xff] not [0xf8, 0xfc, 0xf8]). + * + * If the surface has no alpha component, the alpha will be returned as 0xff + * (100% opaque). + * + * \param pixel a pixel value + * \param format an SDL_PixelFormat structure describing the format of the + * pixel + * \param r a pointer filled in with the red component + * \param g a pointer filled in with the green component + * \param b a pointer filled in with the blue component + * \param a a pointer filled in with the alpha component + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetRGB + * \sa SDL_MapRGB + * \sa SDL_MapRGBA */ extern DECLSPEC void SDLCALL SDL_GetRGBA(Uint32 pixel, const SDL_PixelFormat * format, @@ -454,7 +621,14 @@ extern DECLSPEC void SDLCALL SDL_GetRGBA(Uint32 pixel, Uint8 * a); /** - * \brief Calculate a 256 entry gamma ramp for a gamma value. + * Calculate a 256 entry gamma ramp for a gamma value. + * + * \param gamma a gamma value where 0.0 is black and 1.0 is identity + * \param ramp an array of 256 values filled in with the gamma ramp + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetWindowGammaRamp */ extern DECLSPEC void SDLCALL SDL_CalculateGammaRamp(float gamma, Uint16 * ramp); diff --git a/libs/SDL2/include/SDL_platform.h b/libs/SDL2/include/SDL_platform.h index c2cbc6b4e..79b8b6f45 100644 --- a/libs/SDL2/include/SDL_platform.h +++ b/libs/SDL2/include/SDL_platform.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -70,6 +70,27 @@ /* lets us know what version of Mac OS X we're compiling on */ #include "AvailabilityMacros.h" #include "TargetConditionals.h" + +/* Fix building with older SDKs that don't define these + See this for more information: + https://stackoverflow.com/questions/12132933/preprocessor-macro-for-os-x-targets +*/ +#ifndef TARGET_OS_MACCATALYST +#define TARGET_OS_MACCATALYST 0 +#endif +#ifndef TARGET_OS_IOS +#define TARGET_OS_IOS 0 +#endif +#ifndef TARGET_OS_IPHONE +#define TARGET_OS_IPHONE 0 +#endif +#ifndef TARGET_OS_TV +#define TARGET_OS_TV 0 +#endif +#ifndef TARGET_OS_SIMULATOR +#define TARGET_OS_SIMULATOR 0 +#endif + #if TARGET_OS_TV #undef __TVOS__ #define __TVOS__ 1 @@ -175,6 +196,9 @@ #define __SDL_NOGETPROCADDR__ #endif +#if defined(__vita__) +#define __VITA__ 1 +#endif #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ @@ -183,7 +207,20 @@ extern "C" { #endif /** - * \brief Gets the name of the platform. + * Get the name of the platform. + * + * Here are the names returned for some (but not all) supported platforms: + * + * - "Windows" + * - "Mac OS X" + * - "Linux" + * - "iOS" + * - "Android" + * + * \returns the name of the platform. If the correct platform name is not + * available, returns a string beginning with the text "Unknown". + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC const char * SDLCALL SDL_GetPlatform (void); diff --git a/libs/SDL2/include/SDL_power.h b/libs/SDL2/include/SDL_power.h index 4831cb77e..ecb3f4b02 100644 --- a/libs/SDL2/include/SDL_power.h +++ b/libs/SDL2/include/SDL_power.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -37,7 +37,7 @@ extern "C" { #endif /** - * \brief The basic state for the system's power supply. + * The basic state for the system's power supply. */ typedef enum { @@ -50,17 +50,30 @@ typedef enum /** - * \brief Get the current power supply details. + * Get the current power supply details. * - * \param secs Seconds of battery life left. You can pass a NULL here if - * you don't care. Will return -1 if we can't determine a - * value, or we're not running on a battery. + * You should never take a battery status as absolute truth. Batteries + * (especially failing batteries) are delicate hardware, and the values + * reported here are best estimates based on what that hardware reports. It's + * not uncommon for older batteries to lose stored power much faster than it + * reports, or completely drain when reporting it has 20 percent left, etc. * - * \param pct Percentage of battery life left, between 0 and 100. You can - * pass a NULL here if you don't care. Will return -1 if we - * can't determine a value, or we're not running on a battery. + * Battery status can change at any time; if you are concerned with power + * state, you should call this function frequently, and perhaps ignore changes + * until they seem to be stable for a few seconds. * - * \return The state of the battery (if any). + * It's possible a platform can only report battery percentage or time left + * but not both. + * + * \param secs seconds of battery life left, you can pass a NULL here if you + * don't care, will return -1 if we can't determine a value, or + * we're not running on a battery + * \param pct percentage of battery life left, between 0 and 100, you can pass + * a NULL here if you don't care, will return -1 if we can't + * determine a value, or we're not running on a battery + * \returns an SDL_PowerState enum representing the current battery state. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC SDL_PowerState SDLCALL SDL_GetPowerInfo(int *secs, int *pct); diff --git a/libs/SDL2/include/SDL_quit.h b/libs/SDL2/include/SDL_quit.h index c979983cb..4090f7f19 100644 --- a/libs/SDL2/include/SDL_quit.h +++ b/libs/SDL2/include/SDL_quit.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/include/SDL_rect.h b/libs/SDL2/include/SDL_rect.h index 71a411517..6616ba6a2 100644 --- a/libs/SDL2/include/SDL_rect.h +++ b/libs/SDL2/include/SDL_rect.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -40,10 +40,10 @@ extern "C" { #endif /** - * \brief The structure that defines a point (integer) + * The structure that defines a point (integer) * - * \sa SDL_EnclosePoints - * \sa SDL_PointInRect + * \sa SDL_EnclosePoints + * \sa SDL_PointInRect */ typedef struct SDL_Point { @@ -52,10 +52,10 @@ typedef struct SDL_Point } SDL_Point; /** - * \brief The structure that defines a point (floating point) + * The structure that defines a point (floating point) * - * \sa SDL_EnclosePoints - * \sa SDL_PointInRect + * \sa SDL_EnclosePoints + * \sa SDL_PointInRect */ typedef struct SDL_FPoint { @@ -65,14 +65,14 @@ typedef struct SDL_FPoint /** - * \brief A rectangle, with the origin at the upper left (integer). + * A rectangle, with the origin at the upper left (integer). * - * \sa SDL_RectEmpty - * \sa SDL_RectEquals - * \sa SDL_HasIntersection - * \sa SDL_IntersectRect - * \sa SDL_UnionRect - * \sa SDL_EnclosePoints + * \sa SDL_RectEmpty + * \sa SDL_RectEquals + * \sa SDL_HasIntersection + * \sa SDL_IntersectRect + * \sa SDL_UnionRect + * \sa SDL_EnclosePoints */ typedef struct SDL_Rect { @@ -82,7 +82,7 @@ typedef struct SDL_Rect /** - * \brief A rectangle, with the origin at the upper left (floating point). + * A rectangle, with the origin at the upper left (floating point). */ typedef struct SDL_FRect { @@ -94,7 +94,7 @@ typedef struct SDL_FRect /** - * \brief Returns true if point resides inside a rectangle. + * Returns true if point resides inside a rectangle. */ SDL_FORCE_INLINE SDL_bool SDL_PointInRect(const SDL_Point *p, const SDL_Rect *r) { @@ -103,7 +103,7 @@ SDL_FORCE_INLINE SDL_bool SDL_PointInRect(const SDL_Point *p, const SDL_Rect *r) } /** - * \brief Returns true if the rectangle has no area. + * Returns true if the rectangle has no area. */ SDL_FORCE_INLINE SDL_bool SDL_RectEmpty(const SDL_Rect *r) { @@ -111,7 +111,7 @@ SDL_FORCE_INLINE SDL_bool SDL_RectEmpty(const SDL_Rect *r) } /** - * \brief Returns true if the two rectangles are equal. + * Returns true if the two rectangles are equal. */ SDL_FORCE_INLINE SDL_bool SDL_RectEquals(const SDL_Rect *a, const SDL_Rect *b) { @@ -120,33 +120,70 @@ SDL_FORCE_INLINE SDL_bool SDL_RectEquals(const SDL_Rect *a, const SDL_Rect *b) } /** - * \brief Determine whether two rectangles intersect. + * Determine whether two rectangles intersect. * - * \return SDL_TRUE if there is an intersection, SDL_FALSE otherwise. + * If either pointer is NULL the function will return SDL_FALSE. + * + * \param A an SDL_Rect structure representing the first rectangle + * \param B an SDL_Rect structure representing the second rectangle + * \returns SDL_TRUE if there is an intersection, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_IntersectRect */ extern DECLSPEC SDL_bool SDLCALL SDL_HasIntersection(const SDL_Rect * A, const SDL_Rect * B); /** - * \brief Calculate the intersection of two rectangles. + * Calculate the intersection of two rectangles. * - * \return SDL_TRUE if there is an intersection, SDL_FALSE otherwise. + * If `result` is NULL then this function will return SDL_FALSE. + * + * \param A an SDL_Rect structure representing the first rectangle + * \param B an SDL_Rect structure representing the second rectangle + * \param result an SDL_Rect structure filled in with the intersection of + * rectangles `A` and `B` + * \returns SDL_TRUE if there is an intersection, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HasIntersection */ extern DECLSPEC SDL_bool SDLCALL SDL_IntersectRect(const SDL_Rect * A, const SDL_Rect * B, SDL_Rect * result); /** - * \brief Calculate the union of two rectangles. + * Calculate the union of two rectangles. + * + * \param A an SDL_Rect structure representing the first rectangle + * \param B an SDL_Rect structure representing the second rectangle + * \param result an SDL_Rect structure filled in with the union of rectangles + * `A` and `B` + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC void SDLCALL SDL_UnionRect(const SDL_Rect * A, const SDL_Rect * B, SDL_Rect * result); /** - * \brief Calculate a minimal rectangle enclosing a set of points + * Calculate a minimal rectangle enclosing a set of points. * - * \return SDL_TRUE if any points were within the clipping rect + * If `clip` is not NULL then only points inside of the clipping rectangle are + * considered. + * + * \param points an array of SDL_Point structures representing points to be + * enclosed + * \param count the number of structures in the `points` array + * \param clip an SDL_Rect used for clipping or NULL to enclose all points + * \param result an SDL_Rect structure filled in with the minimal enclosing + * rectangle + * \returns SDL_TRUE if any points were enclosed or SDL_FALSE if all the + * points were outside of the clipping rectangle. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC SDL_bool SDLCALL SDL_EnclosePoints(const SDL_Point * points, int count, @@ -154,9 +191,22 @@ extern DECLSPEC SDL_bool SDLCALL SDL_EnclosePoints(const SDL_Point * points, SDL_Rect * result); /** - * \brief Calculate the intersection of a rectangle and line segment. + * Calculate the intersection of a rectangle and line segment. * - * \return SDL_TRUE if there is an intersection, SDL_FALSE otherwise. + * This function is used to clip a line segment to a rectangle. A line segment + * contained entirely within the rectangle or that does not intersect will + * remain unchanged. A line segment that crosses the rectangle at either or + * both ends will be clipped to the boundary of the rectangle and the new + * coordinates saved in `X1`, `Y1`, `X2`, and/or `Y2` as necessary. + * + * \param rect an SDL_Rect structure representing the rectangle to intersect + * \param X1 a pointer to the starting X-coordinate of the line + * \param Y1 a pointer to the starting Y-coordinate of the line + * \param X2 a pointer to the ending X-coordinate of the line + * \param Y2 a pointer to the ending Y-coordinate of the line + * \returns SDL_TRUE if there is an intersection, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC SDL_bool SDLCALL SDL_IntersectRectAndLine(const SDL_Rect * rect, int *X1, diff --git a/libs/SDL2/include/SDL_render.h b/libs/SDL2/include/SDL_render.h index 096b4a577..a7e4908a6 100644 --- a/libs/SDL2/include/SDL_render.h +++ b/libs/SDL2/include/SDL_render.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -59,7 +59,7 @@ extern "C" { #endif /** - * \brief Flags used when creating a rendering context + * Flags used when creating a rendering context */ typedef enum { @@ -73,7 +73,7 @@ typedef enum } SDL_RendererFlags; /** - * \brief Information on the capabilities of a render driver or context. + * Information on the capabilities of a render driver or context. */ typedef struct SDL_RendererInfo { @@ -86,7 +86,27 @@ typedef struct SDL_RendererInfo } SDL_RendererInfo; /** - * \brief The access pattern allowed for a texture. + * Vertex structure + */ +typedef struct SDL_Vertex +{ + SDL_FPoint position; /**< Vertex position, in SDL_Renderer coordinates */ + SDL_Color color; /**< Vertex color */ + SDL_FPoint tex_coord; /**< Normalized texture coordinates, if needed */ +} SDL_Vertex; + +/** + * The scaling mode for a texture. + */ +typedef enum +{ + SDL_ScaleModeNearest, /**< nearest pixel sampling */ + SDL_ScaleModeLinear, /**< linear filtering */ + SDL_ScaleModeBest /**< anisotropic filtering */ +} SDL_ScaleMode; + +/** + * The access pattern allowed for a texture. */ typedef enum { @@ -96,7 +116,7 @@ typedef enum } SDL_TextureAccess; /** - * \brief The texture channel modulation used in SDL_RenderCopy(). + * The texture channel modulation used in SDL_RenderCopy(). */ typedef enum { @@ -106,7 +126,7 @@ typedef enum } SDL_TextureModulate; /** - * \brief Flip constants for SDL_RenderCopyEx + * Flip constants for SDL_RenderCopyEx */ typedef enum { @@ -116,58 +136,71 @@ typedef enum } SDL_RendererFlip; /** - * \brief A structure representing rendering state + * A structure representing rendering state */ struct SDL_Renderer; typedef struct SDL_Renderer SDL_Renderer; /** - * \brief An efficient driver-specific representation of pixel data + * An efficient driver-specific representation of pixel data */ struct SDL_Texture; typedef struct SDL_Texture SDL_Texture; - /* Function prototypes */ /** - * \brief Get the number of 2D rendering drivers available for the current - * display. + * Get the number of 2D rendering drivers available for the current display. * - * A render driver is a set of code that handles rendering and texture - * management on a particular display. Normally there is only one, but - * some drivers may have several available with different capabilities. + * A render driver is a set of code that handles rendering and texture + * management on a particular display. Normally there is only one, but some + * drivers may have several available with different capabilities. * - * \sa SDL_GetRenderDriverInfo() - * \sa SDL_CreateRenderer() + * There may be none if SDL was compiled without render support. + * + * \returns a number >= 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateRenderer + * \sa SDL_GetRenderDriverInfo */ extern DECLSPEC int SDLCALL SDL_GetNumRenderDrivers(void); /** - * \brief Get information about a specific 2D rendering driver for the current - * display. + * Get info about a specific 2D rendering driver for the current display. * - * \param index The index of the driver to query information about. - * \param info A pointer to an SDL_RendererInfo struct to be filled with - * information on the rendering driver. + * \param index the index of the driver to query information about + * \param info an SDL_RendererInfo structure to be filled with information on + * the rendering driver + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, -1 if the index was out of range. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_CreateRenderer() + * \sa SDL_CreateRenderer + * \sa SDL_GetNumRenderDrivers */ extern DECLSPEC int SDLCALL SDL_GetRenderDriverInfo(int index, SDL_RendererInfo * info); /** - * \brief Create a window and default renderer + * Create a window and default renderer. * - * \param width The width of the window - * \param height The height of the window - * \param window_flags The flags used to create the window - * \param window A pointer filled with the window, or NULL on error - * \param renderer A pointer filled with the renderer, or NULL on error + * \param width the width of the window + * \param height the height of the window + * \param window_flags the flags used to create the window (see + * SDL_CreateWindow()) + * \param window a pointer filled with the window, or NULL on error + * \param renderer a pointer filled with the renderer, or NULL on error + * \returns 0 on success, or -1 on error; call SDL_GetError() for more + * information. * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateRenderer + * \sa SDL_CreateWindow */ extern DECLSPEC int SDLCALL SDL_CreateWindowAndRenderer( int width, int height, Uint32 window_flags, @@ -175,69 +208,116 @@ extern DECLSPEC int SDLCALL SDL_CreateWindowAndRenderer( /** - * \brief Create a 2D rendering context for a window. + * Create a 2D rendering context for a window. * - * \param window The window where rendering is displayed. - * \param index The index of the rendering driver to initialize, or -1 to - * initialize the first one supporting the requested flags. - * \param flags ::SDL_RendererFlags. + * \param window the window where rendering is displayed + * \param index the index of the rendering driver to initialize, or -1 to + * initialize the first one supporting the requested flags + * \param flags 0, or one or more SDL_RendererFlags OR'd together + * \returns a valid rendering context or NULL if there was an error; call + * SDL_GetError() for more information. * - * \return A valid rendering context or NULL if there was an error. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_CreateSoftwareRenderer() - * \sa SDL_GetRendererInfo() - * \sa SDL_DestroyRenderer() + * \sa SDL_CreateSoftwareRenderer + * \sa SDL_DestroyRenderer + * \sa SDL_GetNumRenderDrivers + * \sa SDL_GetRendererInfo */ extern DECLSPEC SDL_Renderer * SDLCALL SDL_CreateRenderer(SDL_Window * window, int index, Uint32 flags); /** - * \brief Create a 2D software rendering context for a surface. + * Create a 2D software rendering context for a surface. * - * \param surface The surface where rendering is done. + * Two other API which can be used to create SDL_Renderer: + * SDL_CreateRenderer() and SDL_CreateWindowAndRenderer(). These can _also_ + * create a software renderer, but they are intended to be used with an + * SDL_Window as the final destination and not an SDL_Surface. * - * \return A valid rendering context or NULL if there was an error. + * \param surface the SDL_Surface structure representing the surface where + * rendering is done + * \returns a valid rendering context or NULL if there was an error; call + * SDL_GetError() for more information. * - * \sa SDL_CreateRenderer() - * \sa SDL_DestroyRenderer() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateRenderer + * \sa SDL_CreateWindowRenderer + * \sa SDL_DestroyRenderer */ extern DECLSPEC SDL_Renderer * SDLCALL SDL_CreateSoftwareRenderer(SDL_Surface * surface); /** - * \brief Get the renderer associated with a window. + * Get the renderer associated with a window. + * + * \param window the window to query + * \returns the rendering context on success or NULL on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateRenderer */ extern DECLSPEC SDL_Renderer * SDLCALL SDL_GetRenderer(SDL_Window * window); /** - * \brief Get information about a rendering context. + * Get information about a rendering context. + * + * \param renderer the rendering context + * \param info an SDL_RendererInfo structure filled with information about the + * current renderer + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateRenderer */ extern DECLSPEC int SDLCALL SDL_GetRendererInfo(SDL_Renderer * renderer, SDL_RendererInfo * info); /** - * \brief Get the output size in pixels of a rendering context. + * Get the output size in pixels of a rendering context. + * + * Due to high-dpi displays, you might end up with a rendering context that + * has more pixels than the window that contains it, so use this instead of + * SDL_GetWindowSize() to decide how much drawing area you have. + * + * \param renderer the rendering context + * \param w an int filled with the width + * \param h an int filled with the height + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetRenderer */ extern DECLSPEC int SDLCALL SDL_GetRendererOutputSize(SDL_Renderer * renderer, int *w, int *h); /** - * \brief Create a texture for a rendering context. + * Create a texture for a rendering context. * - * \param renderer The renderer. - * \param format The format of the texture. - * \param access One of the enumerated values in ::SDL_TextureAccess. - * \param w The width of the texture in pixels. - * \param h The height of the texture in pixels. + * You can set the texture scaling method by setting + * `SDL_HINT_RENDER_SCALE_QUALITY` before creating the texture. * - * \return The created texture is returned, or NULL if no rendering context was - * active, the format was unsupported, or the width or height were out - * of range. + * \param renderer the rendering context + * \param format one of the enumerated values in SDL_PixelFormatEnum + * \param access one of the enumerated values in SDL_TextureAccess + * \param w the width of the texture in pixels + * \param h the height of the texture in pixels + * \returns a pointer to the created texture or NULL if no rendering context + * was active, the format was unsupported, or the width or height + * were out of range; call SDL_GetError() for more information. * - * \note The contents of the texture are not defined at creation. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_QueryTexture() - * \sa SDL_UpdateTexture() - * \sa SDL_DestroyTexture() + * \sa SDL_CreateTextureFromSurface + * \sa SDL_DestroyTexture + * \sa SDL_QueryTexture + * \sa SDL_UpdateTexture */ extern DECLSPEC SDL_Texture * SDLCALL SDL_CreateTexture(SDL_Renderer * renderer, Uint32 format, @@ -245,165 +325,290 @@ extern DECLSPEC SDL_Texture * SDLCALL SDL_CreateTexture(SDL_Renderer * renderer, int h); /** - * \brief Create a texture from an existing surface. + * Create a texture from an existing surface. * - * \param renderer The renderer. - * \param surface The surface containing pixel data used to fill the texture. + * The surface is not modified or freed by this function. * - * \return The created texture is returned, or NULL on error. + * The SDL_TextureAccess hint for the created texture is + * `SDL_TEXTUREACCESS_STATIC`. * - * \note The surface is not modified or freed by this function. + * The pixel format of the created texture may be different from the pixel + * format of the surface. Use SDL_QueryTexture() to query the pixel format of + * the texture. * - * \sa SDL_QueryTexture() - * \sa SDL_DestroyTexture() + * \param renderer the rendering context + * \param surface the SDL_Surface structure containing pixel data used to fill + * the texture + * \returns the created texture or NULL on failure; call SDL_GetError() for + * more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateTexture + * \sa SDL_DestroyTexture + * \sa SDL_QueryTexture */ extern DECLSPEC SDL_Texture * SDLCALL SDL_CreateTextureFromSurface(SDL_Renderer * renderer, SDL_Surface * surface); /** - * \brief Query the attributes of a texture + * Query the attributes of a texture. * - * \param texture A texture to be queried. - * \param format A pointer filled in with the raw format of the texture. The - * actual format may differ, but pixel transfers will use this - * format. - * \param access A pointer filled in with the actual access to the texture. - * \param w A pointer filled in with the width of the texture in pixels. - * \param h A pointer filled in with the height of the texture in pixels. + * \param texture the texture to query + * \param format a pointer filled in with the raw format of the texture; the + * actual format may differ, but pixel transfers will use this + * format (one of the SDL_PixelFormatEnum values) + * \param access a pointer filled in with the actual access to the texture + * (one of the SDL_TextureAccess values) + * \param w a pointer filled in with the width of the texture in pixels + * \param h a pointer filled in with the height of the texture in pixels + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 if the texture is not valid. + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateTexture */ extern DECLSPEC int SDLCALL SDL_QueryTexture(SDL_Texture * texture, Uint32 * format, int *access, int *w, int *h); /** - * \brief Set an additional color value used in render copy operations. + * Set an additional color value multiplied into render copy operations. * - * \param texture The texture to update. - * \param r The red color value multiplied into copy operations. - * \param g The green color value multiplied into copy operations. - * \param b The blue color value multiplied into copy operations. + * When this texture is rendered, during the copy operation each source color + * channel is modulated by the appropriate color value according to the + * following formula: * - * \return 0 on success, or -1 if the texture is not valid or color modulation - * is not supported. + * `srcC = srcC * (color / 255)` * - * \sa SDL_GetTextureColorMod() + * Color modulation is not always supported by the renderer; it will return -1 + * if color modulation is not supported. + * + * \param texture the texture to update + * \param r the red color value multiplied into copy operations + * \param g the green color value multiplied into copy operations + * \param b the blue color value multiplied into copy operations + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetTextureColorMod + * \sa SDL_SetTextureAlphaMod */ extern DECLSPEC int SDLCALL SDL_SetTextureColorMod(SDL_Texture * texture, Uint8 r, Uint8 g, Uint8 b); /** - * \brief Get the additional color value used in render copy operations. + * Get the additional color value multiplied into render copy operations. * - * \param texture The texture to query. - * \param r A pointer filled in with the current red color value. - * \param g A pointer filled in with the current green color value. - * \param b A pointer filled in with the current blue color value. + * \param texture the texture to query + * \param r a pointer filled in with the current red color value + * \param g a pointer filled in with the current green color value + * \param b a pointer filled in with the current blue color value + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 if the texture is not valid. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_SetTextureColorMod() + * \sa SDL_GetTextureAlphaMod + * \sa SDL_SetTextureColorMod */ extern DECLSPEC int SDLCALL SDL_GetTextureColorMod(SDL_Texture * texture, Uint8 * r, Uint8 * g, Uint8 * b); /** - * \brief Set an additional alpha value used in render copy operations. + * Set an additional alpha value multiplied into render copy operations. * - * \param texture The texture to update. - * \param alpha The alpha value multiplied into copy operations. + * When this texture is rendered, during the copy operation the source alpha + * value is modulated by this alpha value according to the following formula: * - * \return 0 on success, or -1 if the texture is not valid or alpha modulation - * is not supported. + * `srcA = srcA * (alpha / 255)` * - * \sa SDL_GetTextureAlphaMod() + * Alpha modulation is not always supported by the renderer; it will return -1 + * if alpha modulation is not supported. + * + * \param texture the texture to update + * \param alpha the source alpha value multiplied into copy operations + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetTextureAlphaMod + * \sa SDL_SetTextureColorMod */ extern DECLSPEC int SDLCALL SDL_SetTextureAlphaMod(SDL_Texture * texture, Uint8 alpha); /** - * \brief Get the additional alpha value used in render copy operations. + * Get the additional alpha value multiplied into render copy operations. * - * \param texture The texture to query. - * \param alpha A pointer filled in with the current alpha value. + * \param texture the texture to query + * \param alpha a pointer filled in with the current alpha value + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 if the texture is not valid. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_SetTextureAlphaMod() + * \sa SDL_GetTextureColorMod + * \sa SDL_SetTextureAlphaMod */ extern DECLSPEC int SDLCALL SDL_GetTextureAlphaMod(SDL_Texture * texture, Uint8 * alpha); /** - * \brief Set the blend mode used for texture copy operations. + * Set the blend mode for a texture, used by SDL_RenderCopy(). * - * \param texture The texture to update. - * \param blendMode ::SDL_BlendMode to use for texture blending. + * If the blend mode is not supported, the closest supported mode is chosen + * and this function returns -1. * - * \return 0 on success, or -1 if the texture is not valid or the blend mode is - * not supported. + * \param texture the texture to update + * \param blendMode the SDL_BlendMode to use for texture blending + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \note If the blend mode is not supported, the closest supported mode is - * chosen. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_GetTextureBlendMode() + * \sa SDL_GetTextureBlendMode + * \sa SDL_RenderCopy */ extern DECLSPEC int SDLCALL SDL_SetTextureBlendMode(SDL_Texture * texture, SDL_BlendMode blendMode); /** - * \brief Get the blend mode used for texture copy operations. + * Get the blend mode used for texture copy operations. * - * \param texture The texture to query. - * \param blendMode A pointer filled in with the current blend mode. + * \param texture the texture to query + * \param blendMode a pointer filled in with the current SDL_BlendMode + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 if the texture is not valid. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_SetTextureBlendMode() + * \sa SDL_SetTextureBlendMode */ extern DECLSPEC int SDLCALL SDL_GetTextureBlendMode(SDL_Texture * texture, SDL_BlendMode *blendMode); /** - * \brief Update the given texture rectangle with new pixel data. + * Set the scale mode used for texture scale operations. * - * \param texture The texture to update - * \param rect A pointer to the rectangle of pixels to update, or NULL to - * update the entire texture. - * \param pixels The raw pixel data in the format of the texture. - * \param pitch The number of bytes in a row of pixel data, including padding between lines. + * If the scale mode is not supported, the closest supported mode is chosen. * - * The pixel data must be in the format of the texture. The pixel format can be - * queried with SDL_QueryTexture. + * \param texture The texture to update. + * \param scaleMode the SDL_ScaleMode to use for texture scaling. + * \returns 0 on success, or -1 if the texture is not valid. * - * \return 0 on success, or -1 if the texture is not valid. + * \since This function is available since SDL 2.0.12. * - * \note This is a fairly slow function. + * \sa SDL_GetTextureScaleMode + */ +extern DECLSPEC int SDLCALL SDL_SetTextureScaleMode(SDL_Texture * texture, + SDL_ScaleMode scaleMode); + +/** + * Get the scale mode used for texture scale operations. + * + * \param texture the texture to query. + * \param scaleMode a pointer filled in with the current scale mode. + * \return 0 on success, or -1 if the texture is not valid. + * + * \since This function is available since SDL 2.0.12. + * + * \sa SDL_SetTextureScaleMode + */ +extern DECLSPEC int SDLCALL SDL_GetTextureScaleMode(SDL_Texture * texture, + SDL_ScaleMode *scaleMode); + +/** + * Associate a user-specified pointer with a texture. + * + * \param texture the texture to update. + * \param userdata the pointer to associate with the texture. + * \returns 0 on success, or -1 if the texture is not valid. + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_GetTextureUserData + */ +extern DECLSPEC int SDLCALL SDL_SetTextureUserData(SDL_Texture * texture, + void *userdata); + +/** + * Get the user-specified pointer associated with a texture + * + * \param texture the texture to query. + * \return the pointer associated with the texture, or NULL if the texture is + * not valid. + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_SetTextureUserData + */ +extern DECLSPEC void * SDLCALL SDL_GetTextureUserData(SDL_Texture * texture); + +/** + * Update the given texture rectangle with new pixel data. + * + * The pixel data must be in the pixel format of the texture. Use + * SDL_QueryTexture() to query the pixel format of the texture. + * + * This is a fairly slow function, intended for use with static textures that + * do not change often. + * + * If the texture is intended to be updated often, it is preferred to create + * the texture as streaming and use the locking functions referenced below. + * While this function will work with streaming textures, for optimization + * reasons you may not get the pixels back if you lock the texture afterward. + * + * \param texture the texture to update + * \param rect an SDL_Rect structure representing the area to update, or NULL + * to update the entire texture + * \param pixels the raw pixel data in the format of the texture + * \param pitch the number of bytes in a row of pixel data, including padding + * between lines + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateTexture + * \sa SDL_LockTexture + * \sa SDL_UnlockTexture */ extern DECLSPEC int SDLCALL SDL_UpdateTexture(SDL_Texture * texture, const SDL_Rect * rect, const void *pixels, int pitch); /** - * \brief Update a rectangle within a planar YV12 or IYUV texture with new pixel data. + * Update a rectangle within a planar YV12 or IYUV texture with new pixel + * data. * - * \param texture The texture to update - * \param rect A pointer to the rectangle of pixels to update, or NULL to - * update the entire texture. - * \param Yplane The raw pixel data for the Y plane. - * \param Ypitch The number of bytes between rows of pixel data for the Y plane. - * \param Uplane The raw pixel data for the U plane. - * \param Upitch The number of bytes between rows of pixel data for the U plane. - * \param Vplane The raw pixel data for the V plane. - * \param Vpitch The number of bytes between rows of pixel data for the V plane. + * You can use SDL_UpdateTexture() as long as your pixel data is a contiguous + * block of Y and U/V planes in the proper order, but this function is + * available if your pixel data is not contiguous. * - * \return 0 on success, or -1 if the texture is not valid. + * \param texture the texture to update + * \param rect a pointer to the rectangle of pixels to update, or NULL to + * update the entire texture + * \param Yplane the raw pixel data for the Y plane + * \param Ypitch the number of bytes between rows of pixel data for the Y + * plane + * \param Uplane the raw pixel data for the U plane + * \param Upitch the number of bytes between rows of pixel data for the U + * plane + * \param Vplane the raw pixel data for the V plane + * \param Vpitch the number of bytes between rows of pixel data for the V + * plane + * \returns 0 on success or -1 if the texture is not valid; call + * SDL_GetError() for more information. * - * \note You can use SDL_UpdateTexture() as long as your pixel data is - * a contiguous block of Y and U/V planes in the proper order, but - * this function is available if your pixel data is not contiguous. + * \since This function is available since SDL 2.0.1. + * + * \sa SDL_UpdateTexture */ extern DECLSPEC int SDLCALL SDL_UpdateYUVTexture(SDL_Texture * texture, const SDL_Rect * rect, @@ -412,400 +617,771 @@ extern DECLSPEC int SDLCALL SDL_UpdateYUVTexture(SDL_Texture * texture, const Uint8 *Vplane, int Vpitch); /** - * \brief Lock a portion of the texture for write-only pixel access. + * Update a rectangle within a planar NV12 or NV21 texture with new pixels. * - * \param texture The texture to lock for access, which was created with - * ::SDL_TEXTUREACCESS_STREAMING. - * \param rect A pointer to the rectangle to lock for access. If the rect - * is NULL, the entire texture will be locked. - * \param pixels This is filled in with a pointer to the locked pixels, - * appropriately offset by the locked area. - * \param pitch This is filled in with the pitch of the locked pixels. + * You can use SDL_UpdateTexture() as long as your pixel data is a contiguous + * block of NV12/21 planes in the proper order, but this function is available + * if your pixel data is not contiguous. * - * \return 0 on success, or -1 if the texture is not valid or was not created with ::SDL_TEXTUREACCESS_STREAMING. + * \param texture the texture to update + * \param rect a pointer to the rectangle of pixels to update, or NULL to + * update the entire texture. + * \param Yplane the raw pixel data for the Y plane. + * \param Ypitch the number of bytes between rows of pixel data for the Y + * plane. + * \param UVplane the raw pixel data for the UV plane. + * \param UVpitch the number of bytes between rows of pixel data for the UV + * plane. + * \return 0 on success, or -1 if the texture is not valid. * - * \sa SDL_UnlockTexture() + * \since This function is available since SDL 2.0.16. + */ +extern DECLSPEC int SDLCALL SDL_UpdateNVTexture(SDL_Texture * texture, + const SDL_Rect * rect, + const Uint8 *Yplane, int Ypitch, + const Uint8 *UVplane, int UVpitch); + +/** + * Lock a portion of the texture for **write-only** pixel access. + * + * As an optimization, the pixels made available for editing don't necessarily + * contain the old texture data. This is a write-only operation, and if you + * need to keep a copy of the texture data you should do that at the + * application level. + * + * You must use SDL_UnlockTexture() to unlock the pixels and apply any + * changes. + * + * \param texture the texture to lock for access, which was created with + * `SDL_TEXTUREACCESS_STREAMING` + * \param rect an SDL_Rect structure representing the area to lock for access; + * NULL to lock the entire texture + * \param pixels this is filled in with a pointer to the locked pixels, + * appropriately offset by the locked area + * \param pitch this is filled in with the pitch of the locked pixels; the + * pitch is the length of one row in bytes + * \returns 0 on success or a negative error code if the texture is not valid + * or was not created with `SDL_TEXTUREACCESS_STREAMING`; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_UnlockTexture */ extern DECLSPEC int SDLCALL SDL_LockTexture(SDL_Texture * texture, const SDL_Rect * rect, void **pixels, int *pitch); /** - * \brief Unlock a texture, uploading the changes to video memory, if needed. + * Lock a portion of the texture for **write-only** pixel access, and expose + * it as a SDL surface. * - * \sa SDL_LockTexture() + * Besides providing an SDL_Surface instead of raw pixel data, this function + * operates like SDL_LockTexture. + * + * As an optimization, the pixels made available for editing don't necessarily + * contain the old texture data. This is a write-only operation, and if you + * need to keep a copy of the texture data you should do that at the + * application level. + * + * You must use SDL_UnlockTexture() to unlock the pixels and apply any + * changes. + * + * The returned surface is freed internally after calling SDL_UnlockTexture() + * or SDL_DestroyTexture(). The caller should not free it. + * + * \param texture the texture to lock for access, which was created with + * `SDL_TEXTUREACCESS_STREAMING` + * \param rect a pointer to the rectangle to lock for access. If the rect is + * NULL, the entire texture will be locked + * \param surface this is filled in with an SDL surface representing the + * locked area + * \returns 0 on success, or -1 if the texture is not valid or was not created + * with `SDL_TEXTUREACCESS_STREAMING` + * + * \since This function is available since SDL 2.0.12. + * + * \sa SDL_LockTexture + * \sa SDL_UnlockTexture + */ +extern DECLSPEC int SDLCALL SDL_LockTextureToSurface(SDL_Texture *texture, + const SDL_Rect *rect, + SDL_Surface **surface); + +/** + * Unlock a texture, uploading the changes to video memory, if needed. + * + * **Warning**: Please note that SDL_LockTexture() is intended to be + * write-only; it will not guarantee the previous contents of the texture will + * be provided. You must fully initialize any area of a texture that you lock + * before unlocking it, as the pixels might otherwise be uninitialized memory. + * + * Which is to say: locking and immediately unlocking a texture can result in + * corrupted textures, depending on the renderer in use. + * + * \param texture a texture locked by SDL_LockTexture() + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LockTexture */ extern DECLSPEC void SDLCALL SDL_UnlockTexture(SDL_Texture * texture); /** - * \brief Determines whether a window supports the use of render targets + * Determine whether a renderer supports the use of render targets. * - * \param renderer The renderer that will be checked + * \param renderer the renderer that will be checked + * \returns SDL_TRUE if supported or SDL_FALSE if not. * - * \return SDL_TRUE if supported, SDL_FALSE if not. + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetRenderTarget */ extern DECLSPEC SDL_bool SDLCALL SDL_RenderTargetSupported(SDL_Renderer *renderer); /** - * \brief Set a texture as the current rendering target. + * Set a texture as the current rendering target. * - * \param renderer The renderer. - * \param texture The targeted texture, which must be created with the SDL_TEXTUREACCESS_TARGET flag, or NULL for the default render target + * Before using this function, you should check the + * `SDL_RENDERER_TARGETTEXTURE` bit in the flags of SDL_RendererInfo to see if + * render targets are supported. * - * \return 0 on success, or -1 on error + * The default render target is the window for which the renderer was created. + * To stop rendering to a texture and render to the window again, call this + * function with a NULL `texture`. * - * \sa SDL_GetRenderTarget() + * \param renderer the rendering context + * \param texture the targeted texture, which must be created with the + * `SDL_TEXTUREACCESS_TARGET` flag, or NULL to render to the + * window instead of a texture. + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetRenderTarget */ extern DECLSPEC int SDLCALL SDL_SetRenderTarget(SDL_Renderer *renderer, SDL_Texture *texture); /** - * \brief Get the current render target or NULL for the default render target. + * Get the current render target. * - * \return The current render target + * The default render target is the window for which the renderer was created, + * and is reported a NULL here. * - * \sa SDL_SetRenderTarget() + * \param renderer the rendering context + * \returns the current render target or NULL for the default render target. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetRenderTarget */ extern DECLSPEC SDL_Texture * SDLCALL SDL_GetRenderTarget(SDL_Renderer *renderer); /** - * \brief Set device independent resolution for rendering + * Set a device independent resolution for rendering. * - * \param renderer The renderer for which resolution should be set. - * \param w The width of the logical resolution - * \param h The height of the logical resolution + * This function uses the viewport and scaling functionality to allow a fixed + * logical resolution for rendering, regardless of the actual output + * resolution. If the actual output resolution doesn't have the same aspect + * ratio the output rendering will be centered within the output display. * - * This function uses the viewport and scaling functionality to allow a fixed logical - * resolution for rendering, regardless of the actual output resolution. If the actual - * output resolution doesn't have the same aspect ratio the output rendering will be - * centered within the output display. + * If the output display is a window, mouse and touch events in the window + * will be filtered and scaled so they seem to arrive within the logical + * resolution. The SDL_HINT_MOUSE_RELATIVE_SCALING hint controls whether + * relative motion events are also scaled. * - * If the output display is a window, mouse events in the window will be filtered - * and scaled so they seem to arrive within the logical resolution. + * If this function results in scaling or subpixel drawing by the rendering + * backend, it will be handled using the appropriate quality hints. * - * \note If this function results in scaling or subpixel drawing by the - * rendering backend, it will be handled using the appropriate - * quality hints. + * \param renderer the renderer for which resolution should be set + * \param w the width of the logical resolution + * \param h the height of the logical resolution + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_RenderGetLogicalSize() - * \sa SDL_RenderSetScale() - * \sa SDL_RenderSetViewport() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderGetLogicalSize */ extern DECLSPEC int SDLCALL SDL_RenderSetLogicalSize(SDL_Renderer * renderer, int w, int h); /** - * \brief Get device independent resolution for rendering + * Get device independent resolution for rendering. * - * \param renderer The renderer from which resolution should be queried. - * \param w A pointer filled with the width of the logical resolution - * \param h A pointer filled with the height of the logical resolution + * This may return 0 for `w` and `h` if the SDL_Renderer has never had its + * logical size set by SDL_RenderSetLogicalSize() and never had a render + * target set. * - * \sa SDL_RenderSetLogicalSize() + * \param renderer a rendering context + * \param w an int to be filled with the width + * \param h an int to be filled with the height + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderSetLogicalSize */ extern DECLSPEC void SDLCALL SDL_RenderGetLogicalSize(SDL_Renderer * renderer, int *w, int *h); /** - * \brief Set whether to force integer scales for resolution-independent rendering + * Set whether to force integer scales for resolution-independent rendering. * - * \param renderer The renderer for which integer scaling should be set. - * \param enable Enable or disable integer scaling + * This function restricts the logical viewport to integer values - that is, + * when a resolution is between two multiples of a logical size, the viewport + * size is rounded down to the lower multiple. * - * This function restricts the logical viewport to integer values - that is, when - * a resolution is between two multiples of a logical size, the viewport size is - * rounded down to the lower multiple. + * \param renderer the renderer for which integer scaling should be set + * \param enable enable or disable the integer scaling for rendering + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_RenderSetLogicalSize() + * \since This function is available since SDL 2.0.5. + * + * \sa SDL_RenderGetIntegerScale + * \sa SDL_RenderSetLogicalSize */ extern DECLSPEC int SDLCALL SDL_RenderSetIntegerScale(SDL_Renderer * renderer, SDL_bool enable); /** - * \brief Get whether integer scales are forced for resolution-independent rendering + * Get whether integer scales are forced for resolution-independent rendering. * - * \param renderer The renderer from which integer scaling should be queried. + * \param renderer the renderer from which integer scaling should be queried + * \returns SDL_TRUE if integer scales are forced or SDL_FALSE if not and on + * failure; call SDL_GetError() for more information. * - * \sa SDL_RenderSetIntegerScale() + * \since This function is available since SDL 2.0.5. + * + * \sa SDL_RenderSetIntegerScale */ extern DECLSPEC SDL_bool SDLCALL SDL_RenderGetIntegerScale(SDL_Renderer * renderer); /** - * \brief Set the drawing area for rendering on the current target. + * Set the drawing area for rendering on the current target. * - * \param renderer The renderer for which the drawing area should be set. - * \param rect The rectangle representing the drawing area, or NULL to set the viewport to the entire target. + * When the window is resized, the viewport is reset to fill the entire new + * window size. * - * The x,y of the viewport rect represents the origin for rendering. + * \param renderer the rendering context + * \param rect the SDL_Rect structure representing the drawing area, or NULL + * to set the viewport to the entire target + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.0. * - * \note If the window associated with the renderer is resized, the viewport is automatically reset. - * - * \sa SDL_RenderGetViewport() - * \sa SDL_RenderSetLogicalSize() + * \sa SDL_RenderGetViewport */ extern DECLSPEC int SDLCALL SDL_RenderSetViewport(SDL_Renderer * renderer, const SDL_Rect * rect); /** - * \brief Get the drawing area for the current target. + * Get the drawing area for the current target. * - * \sa SDL_RenderSetViewport() + * \param renderer the rendering context + * \param rect an SDL_Rect structure filled in with the current drawing area + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderSetViewport */ extern DECLSPEC void SDLCALL SDL_RenderGetViewport(SDL_Renderer * renderer, SDL_Rect * rect); /** - * \brief Set the clip rectangle for the current target. + * Set the clip rectangle for rendering on the specified target. * - * \param renderer The renderer for which clip rectangle should be set. - * \param rect A pointer to the rectangle to set as the clip rectangle, or - * NULL to disable clipping. + * \param renderer the rendering context for which clip rectangle should be + * set + * \param rect an SDL_Rect structure representing the clip area, relative to + * the viewport, or NULL to disable clipping + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.0. * - * \sa SDL_RenderGetClipRect() + * \sa SDL_RenderGetClipRect + * \sa SDL_RenderIsClipEnabled */ extern DECLSPEC int SDLCALL SDL_RenderSetClipRect(SDL_Renderer * renderer, const SDL_Rect * rect); /** - * \brief Get the clip rectangle for the current target. + * Get the clip rectangle for the current target. * - * \param renderer The renderer from which clip rectangle should be queried. - * \param rect A pointer filled in with the current clip rectangle, or - * an empty rectangle if clipping is disabled. + * \param renderer the rendering context from which clip rectangle should be + * queried + * \param rect an SDL_Rect structure filled in with the current clipping area + * or an empty rectangle if clipping is disabled * - * \sa SDL_RenderSetClipRect() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderIsClipEnabled + * \sa SDL_RenderSetClipRect */ extern DECLSPEC void SDLCALL SDL_RenderGetClipRect(SDL_Renderer * renderer, SDL_Rect * rect); /** - * \brief Get whether clipping is enabled on the given renderer. + * Get whether clipping is enabled on the given renderer. * - * \param renderer The renderer from which clip state should be queried. + * \param renderer the renderer from which clip state should be queried + * \returns SDL_TRUE if clipping is enabled or SDL_FALSE if not; call + * SDL_GetError() for more information. * - * \sa SDL_RenderGetClipRect() + * \since This function is available since SDL 2.0.4. + * + * \sa SDL_RenderGetClipRect + * \sa SDL_RenderSetClipRect */ extern DECLSPEC SDL_bool SDLCALL SDL_RenderIsClipEnabled(SDL_Renderer * renderer); /** - * \brief Set the drawing scale for rendering on the current target. + * Set the drawing scale for rendering on the current target. * - * \param renderer The renderer for which the drawing scale should be set. - * \param scaleX The horizontal scaling factor - * \param scaleY The vertical scaling factor + * The drawing coordinates are scaled by the x/y scaling factors before they + * are used by the renderer. This allows resolution independent drawing with a + * single coordinate system. * - * The drawing coordinates are scaled by the x/y scaling factors - * before they are used by the renderer. This allows resolution - * independent drawing with a single coordinate system. + * If this results in scaling or subpixel drawing by the rendering backend, it + * will be handled using the appropriate quality hints. For best results use + * integer scaling factors. * - * \note If this results in scaling or subpixel drawing by the - * rendering backend, it will be handled using the appropriate - * quality hints. For best results use integer scaling factors. + * \param renderer a rendering context + * \param scaleX the horizontal scaling factor + * \param scaleY the vertical scaling factor + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_RenderGetScale() - * \sa SDL_RenderSetLogicalSize() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderGetScale + * \sa SDL_RenderSetLogicalSize */ extern DECLSPEC int SDLCALL SDL_RenderSetScale(SDL_Renderer * renderer, float scaleX, float scaleY); /** - * \brief Get the drawing scale for the current target. + * Get the drawing scale for the current target. * - * \param renderer The renderer from which drawing scale should be queried. - * \param scaleX A pointer filled in with the horizontal scaling factor - * \param scaleY A pointer filled in with the vertical scaling factor + * \param renderer the renderer from which drawing scale should be queried + * \param scaleX a pointer filled in with the horizontal scaling factor + * \param scaleY a pointer filled in with the vertical scaling factor * - * \sa SDL_RenderSetScale() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderSetScale */ extern DECLSPEC void SDLCALL SDL_RenderGetScale(SDL_Renderer * renderer, float *scaleX, float *scaleY); /** - * \brief Set the color used for drawing operations (Rect, Line and Clear). + * Get logical coordinates of point in renderer when given real coordinates of + * point in window. * - * \param renderer The renderer for which drawing color should be set. - * \param r The red value used to draw on the rendering target. - * \param g The green value used to draw on the rendering target. - * \param b The blue value used to draw on the rendering target. - * \param a The alpha value used to draw on the rendering target, usually - * ::SDL_ALPHA_OPAQUE (255). + * Logical coordinates will differ from real coordinates when render is scaled + * and logical renderer size set * - * \return 0 on success, or -1 on error + * \param renderer the renderer from which the logical coordinates should be + * calcualted + * \param windowX the real X coordinate in the window + * \param windowY the real Y coordinate in the window + * \param logicalX the pointer filled with the logical x coordinate + * \param logicalY the pointer filled with the logical y coordinate + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_RenderGetScale + * \sa SDL_RenderSetScale + * \sa SDL_RenderGetLogicalSize + * \sa SDL_RenderSetLogicalSize + */ +extern DECLSPEC void SDLCALL SDL_RenderWindowToLogical(SDL_Renderer * renderer, + int windowX, int windowY, + float *logicalX, float *logicalY); + + /** + * Get real coordinates of point in window when given logical coordinates of point in renderer. + * Logical coordinates will differ from real coordinates when render is scaled and logical renderer size set + * + * \param renderer the renderer from which the window coordinates should be calculated + * \param logicalX the logical x coordinate + * \param logicalY the logical y coordinate + * \param windowX the pointer filled with the real X coordinate in the window + * \param windowY the pointer filled with the real Y coordinate in the window + + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_RenderGetScale + * \sa SDL_RenderSetScale + * \sa SDL_RenderGetLogicalSize + * \sa SDL_RenderSetLogicalSize + */ +extern DECLSPEC void SDLCALL SDL_RenderLogicalToWindow(SDL_Renderer * renderer, + float logicalX, float logicalY, + int *windowX, int *windowY); + +/** + * Set the color used for drawing operations (Rect, Line and Clear). + * + * Set the color for drawing or filling rectangles, lines, and points, and for + * SDL_RenderClear(). + * + * \param renderer the rendering context + * \param r the red value used to draw on the rendering target + * \param g the green value used to draw on the rendering target + * \param b the blue value used to draw on the rendering target + * \param a the alpha value used to draw on the rendering target; usually + * `SDL_ALPHA_OPAQUE` (255). Use SDL_SetRenderDrawBlendMode to + * specify how the alpha channel is used + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetRenderDrawColor + * \sa SDL_RenderClear + * \sa SDL_RenderDrawLine + * \sa SDL_RenderDrawLines + * \sa SDL_RenderDrawPoint + * \sa SDL_RenderDrawPoints + * \sa SDL_RenderDrawRect + * \sa SDL_RenderDrawRects + * \sa SDL_RenderFillRect + * \sa SDL_RenderFillRects */ extern DECLSPEC int SDLCALL SDL_SetRenderDrawColor(SDL_Renderer * renderer, Uint8 r, Uint8 g, Uint8 b, Uint8 a); /** - * \brief Get the color used for drawing operations (Rect, Line and Clear). + * Get the color used for drawing operations (Rect, Line and Clear). * - * \param renderer The renderer from which drawing color should be queried. - * \param r A pointer to the red value used to draw on the rendering target. - * \param g A pointer to the green value used to draw on the rendering target. - * \param b A pointer to the blue value used to draw on the rendering target. - * \param a A pointer to the alpha value used to draw on the rendering target, - * usually ::SDL_ALPHA_OPAQUE (255). + * \param renderer the rendering context + * \param r a pointer filled in with the red value used to draw on the + * rendering target + * \param g a pointer filled in with the green value used to draw on the + * rendering target + * \param b a pointer filled in with the blue value used to draw on the + * rendering target + * \param a a pointer filled in with the alpha value used to draw on the + * rendering target; usually `SDL_ALPHA_OPAQUE` (255) + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetRenderDrawColor */ extern DECLSPEC int SDLCALL SDL_GetRenderDrawColor(SDL_Renderer * renderer, Uint8 * r, Uint8 * g, Uint8 * b, Uint8 * a); /** - * \brief Set the blend mode used for drawing operations (Fill and Line). + * Set the blend mode used for drawing operations (Fill and Line). * - * \param renderer The renderer for which blend mode should be set. - * \param blendMode ::SDL_BlendMode to use for blending. + * If the blend mode is not supported, the closest supported mode is chosen. * - * \return 0 on success, or -1 on error + * \param renderer the rendering context + * \param blendMode the SDL_BlendMode to use for blending + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \note If the blend mode is not supported, the closest supported mode is - * chosen. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_GetRenderDrawBlendMode() + * \sa SDL_GetRenderDrawBlendMode + * \sa SDL_RenderDrawLine + * \sa SDL_RenderDrawLines + * \sa SDL_RenderDrawPoint + * \sa SDL_RenderDrawPoints + * \sa SDL_RenderDrawRect + * \sa SDL_RenderDrawRects + * \sa SDL_RenderFillRect + * \sa SDL_RenderFillRects */ extern DECLSPEC int SDLCALL SDL_SetRenderDrawBlendMode(SDL_Renderer * renderer, SDL_BlendMode blendMode); /** - * \brief Get the blend mode used for drawing operations. + * Get the blend mode used for drawing operations. * - * \param renderer The renderer from which blend mode should be queried. - * \param blendMode A pointer filled in with the current blend mode. + * \param renderer the rendering context + * \param blendMode a pointer filled in with the current SDL_BlendMode + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.0. * - * \sa SDL_SetRenderDrawBlendMode() + * \sa SDL_SetRenderDrawBlendMode */ extern DECLSPEC int SDLCALL SDL_GetRenderDrawBlendMode(SDL_Renderer * renderer, SDL_BlendMode *blendMode); /** - * \brief Clear the current rendering target with the drawing color + * Clear the current rendering target with the drawing color. * - * This function clears the entire rendering target, ignoring the viewport and - * the clip rectangle. + * This function clears the entire rendering target, ignoring the viewport and + * the clip rectangle. * - * \return 0 on success, or -1 on error + * \param renderer the rendering context + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetRenderDrawColor */ extern DECLSPEC int SDLCALL SDL_RenderClear(SDL_Renderer * renderer); /** - * \brief Draw a point on the current rendering target. + * Draw a point on the current rendering target. * - * \param renderer The renderer which should draw a point. - * \param x The x coordinate of the point. - * \param y The y coordinate of the point. + * SDL_RenderDrawPoint() draws a single point. If you want to draw multiple, + * use SDL_RenderDrawPoints() instead. * - * \return 0 on success, or -1 on error + * \param renderer the rendering context + * \param x the x coordinate of the point + * \param y the y coordinate of the point + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderDrawLine + * \sa SDL_RenderDrawLines + * \sa SDL_RenderDrawPoints + * \sa SDL_RenderDrawRect + * \sa SDL_RenderDrawRects + * \sa SDL_RenderFillRect + * \sa SDL_RenderFillRects + * \sa SDL_RenderPresent + * \sa SDL_SetRenderDrawBlendMode + * \sa SDL_SetRenderDrawColor */ extern DECLSPEC int SDLCALL SDL_RenderDrawPoint(SDL_Renderer * renderer, int x, int y); /** - * \brief Draw multiple points on the current rendering target. + * Draw multiple points on the current rendering target. * - * \param renderer The renderer which should draw multiple points. - * \param points The points to draw - * \param count The number of points to draw + * \param renderer the rendering context + * \param points an array of SDL_Point structures that represent the points to + * draw + * \param count the number of points to draw + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderDrawLine + * \sa SDL_RenderDrawLines + * \sa SDL_RenderDrawPoint + * \sa SDL_RenderDrawRect + * \sa SDL_RenderDrawRects + * \sa SDL_RenderFillRect + * \sa SDL_RenderFillRects + * \sa SDL_RenderPresent + * \sa SDL_SetRenderDrawBlendMode + * \sa SDL_SetRenderDrawColor */ extern DECLSPEC int SDLCALL SDL_RenderDrawPoints(SDL_Renderer * renderer, const SDL_Point * points, int count); /** - * \brief Draw a line on the current rendering target. + * Draw a line on the current rendering target. * - * \param renderer The renderer which should draw a line. - * \param x1 The x coordinate of the start point. - * \param y1 The y coordinate of the start point. - * \param x2 The x coordinate of the end point. - * \param y2 The y coordinate of the end point. + * SDL_RenderDrawLine() draws the line to include both end points. If you want + * to draw multiple, connecting lines use SDL_RenderDrawLines() instead. * - * \return 0 on success, or -1 on error + * \param renderer the rendering context + * \param x1 the x coordinate of the start point + * \param y1 the y coordinate of the start point + * \param x2 the x coordinate of the end point + * \param y2 the y coordinate of the end point + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderDrawLines + * \sa SDL_RenderDrawPoint + * \sa SDL_RenderDrawPoints + * \sa SDL_RenderDrawRect + * \sa SDL_RenderDrawRects + * \sa SDL_RenderFillRect + * \sa SDL_RenderFillRects + * \sa SDL_RenderPresent + * \sa SDL_SetRenderDrawBlendMode + * \sa SDL_SetRenderDrawColor */ extern DECLSPEC int SDLCALL SDL_RenderDrawLine(SDL_Renderer * renderer, int x1, int y1, int x2, int y2); /** - * \brief Draw a series of connected lines on the current rendering target. + * Draw a series of connected lines on the current rendering target. * - * \param renderer The renderer which should draw multiple lines. - * \param points The points along the lines - * \param count The number of points, drawing count-1 lines + * \param renderer the rendering context + * \param points an array of SDL_Point structures representing points along + * the lines + * \param count the number of points, drawing count-1 lines + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderDrawLine + * \sa SDL_RenderDrawPoint + * \sa SDL_RenderDrawPoints + * \sa SDL_RenderDrawRect + * \sa SDL_RenderDrawRects + * \sa SDL_RenderFillRect + * \sa SDL_RenderFillRects + * \sa SDL_RenderPresent + * \sa SDL_SetRenderDrawBlendMode + * \sa SDL_SetRenderDrawColor */ extern DECLSPEC int SDLCALL SDL_RenderDrawLines(SDL_Renderer * renderer, const SDL_Point * points, int count); /** - * \brief Draw a rectangle on the current rendering target. + * Draw a rectangle on the current rendering target. * - * \param renderer The renderer which should draw a rectangle. - * \param rect A pointer to the destination rectangle, or NULL to outline the entire rendering target. + * \param renderer the rendering context + * \param rect an SDL_Rect structure representing the rectangle to draw, or + * NULL to outline the entire rendering target + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderDrawLine + * \sa SDL_RenderDrawLines + * \sa SDL_RenderDrawPoint + * \sa SDL_RenderDrawPoints + * \sa SDL_RenderDrawRects + * \sa SDL_RenderFillRect + * \sa SDL_RenderFillRects + * \sa SDL_RenderPresent + * \sa SDL_SetRenderDrawBlendMode + * \sa SDL_SetRenderDrawColor */ extern DECLSPEC int SDLCALL SDL_RenderDrawRect(SDL_Renderer * renderer, const SDL_Rect * rect); /** - * \brief Draw some number of rectangles on the current rendering target. + * Draw some number of rectangles on the current rendering target. * - * \param renderer The renderer which should draw multiple rectangles. - * \param rects A pointer to an array of destination rectangles. - * \param count The number of rectangles. + * \param renderer the rendering context + * \param rects an array of SDL_Rect structures representing the rectangles to + * be drawn + * \param count the number of rectangles + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderDrawLine + * \sa SDL_RenderDrawLines + * \sa SDL_RenderDrawPoint + * \sa SDL_RenderDrawPoints + * \sa SDL_RenderDrawRect + * \sa SDL_RenderFillRect + * \sa SDL_RenderFillRects + * \sa SDL_RenderPresent + * \sa SDL_SetRenderDrawBlendMode + * \sa SDL_SetRenderDrawColor */ extern DECLSPEC int SDLCALL SDL_RenderDrawRects(SDL_Renderer * renderer, const SDL_Rect * rects, int count); /** - * \brief Fill a rectangle on the current rendering target with the drawing color. + * Fill a rectangle on the current rendering target with the drawing color. * - * \param renderer The renderer which should fill a rectangle. - * \param rect A pointer to the destination rectangle, or NULL for the entire - * rendering target. + * The current drawing color is set by SDL_SetRenderDrawColor(), and the + * color's alpha value is ignored unless blending is enabled with the + * appropriate call to SDL_SetRenderDrawBlendMode(). * - * \return 0 on success, or -1 on error + * \param renderer the rendering context + * \param rect the SDL_Rect structure representing the rectangle to fill, or + * NULL for the entire rendering target + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderDrawLine + * \sa SDL_RenderDrawLines + * \sa SDL_RenderDrawPoint + * \sa SDL_RenderDrawPoints + * \sa SDL_RenderDrawRect + * \sa SDL_RenderDrawRects + * \sa SDL_RenderFillRects + * \sa SDL_RenderPresent + * \sa SDL_SetRenderDrawBlendMode + * \sa SDL_SetRenderDrawColor */ extern DECLSPEC int SDLCALL SDL_RenderFillRect(SDL_Renderer * renderer, const SDL_Rect * rect); /** - * \brief Fill some number of rectangles on the current rendering target with the drawing color. + * Fill some number of rectangles on the current rendering target with the + * drawing color. * - * \param renderer The renderer which should fill multiple rectangles. - * \param rects A pointer to an array of destination rectangles. - * \param count The number of rectangles. + * \param renderer the rendering context + * \param rects an array of SDL_Rect structures representing the rectangles to + * be filled + * \param count the number of rectangles + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderDrawLine + * \sa SDL_RenderDrawLines + * \sa SDL_RenderDrawPoint + * \sa SDL_RenderDrawPoints + * \sa SDL_RenderDrawRect + * \sa SDL_RenderDrawRects + * \sa SDL_RenderFillRect + * \sa SDL_RenderPresent */ extern DECLSPEC int SDLCALL SDL_RenderFillRects(SDL_Renderer * renderer, const SDL_Rect * rects, int count); /** - * \brief Copy a portion of the texture to the current rendering target. + * Copy a portion of the texture to the current rendering target. * - * \param renderer The renderer which should copy parts of a texture. - * \param texture The source texture. - * \param srcrect A pointer to the source rectangle, or NULL for the entire - * texture. - * \param dstrect A pointer to the destination rectangle, or NULL for the - * entire rendering target. + * The texture is blended with the destination based on its blend mode set + * with SDL_SetTextureBlendMode(). * - * \return 0 on success, or -1 on error + * The texture color is affected based on its color modulation set by + * SDL_SetTextureColorMod(). + * + * The texture alpha is affected based on its alpha modulation set by + * SDL_SetTextureAlphaMod(). + * + * \param renderer the rendering context + * \param texture the source texture + * \param srcrect the source SDL_Rect structure or NULL for the entire texture + * \param dstrect the destination SDL_Rect structure or NULL for the entire + * rendering target; the texture will be stretched to fill the + * given rectangle + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderCopyEx + * \sa SDL_SetTextureAlphaMod + * \sa SDL_SetTextureBlendMode + * \sa SDL_SetTextureColorMod */ extern DECLSPEC int SDLCALL SDL_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture, @@ -813,19 +1389,43 @@ extern DECLSPEC int SDLCALL SDL_RenderCopy(SDL_Renderer * renderer, const SDL_Rect * dstrect); /** - * \brief Copy a portion of the source texture to the current rendering target, rotating it by angle around the given center + * Copy a portion of the texture to the current rendering, with optional + * rotation and flipping. * - * \param renderer The renderer which should copy parts of a texture. - * \param texture The source texture. - * \param srcrect A pointer to the source rectangle, or NULL for the entire - * texture. - * \param dstrect A pointer to the destination rectangle, or NULL for the - * entire rendering target. - * \param angle An angle in degrees that indicates the rotation that will be applied to dstrect, rotating it in a clockwise direction - * \param center A pointer to a point indicating the point around which dstrect will be rotated (if NULL, rotation will be done around dstrect.w/2, dstrect.h/2). - * \param flip An SDL_RendererFlip value stating which flipping actions should be performed on the texture + * Copy a portion of the texture to the current rendering target, optionally + * rotating it by angle around the given center and also flipping it + * top-bottom and/or left-right. * - * \return 0 on success, or -1 on error + * The texture is blended with the destination based on its blend mode set + * with SDL_SetTextureBlendMode(). + * + * The texture color is affected based on its color modulation set by + * SDL_SetTextureColorMod(). + * + * The texture alpha is affected based on its alpha modulation set by + * SDL_SetTextureAlphaMod(). + * + * \param renderer the rendering context + * \param texture the source texture + * \param srcrect the source SDL_Rect structure or NULL for the entire texture + * \param dstrect the destination SDL_Rect structure or NULL for the entire + * rendering target + * \param angle an angle in degrees that indicates the rotation that will be + * applied to dstrect, rotating it in a clockwise direction + * \param center a pointer to a point indicating the point around which + * dstrect will be rotated (if NULL, rotation will be done + * around `dstrect.w / 2`, `dstrect.h / 2`) + * \param flip a SDL_RendererFlip value stating which flipping actions should + * be performed on the texture + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderCopy + * \sa SDL_SetTextureAlphaMod + * \sa SDL_SetTextureBlendMode + * \sa SDL_SetTextureColorMod */ extern DECLSPEC int SDLCALL SDL_RenderCopyEx(SDL_Renderer * renderer, SDL_Texture * texture, @@ -837,117 +1437,132 @@ extern DECLSPEC int SDLCALL SDL_RenderCopyEx(SDL_Renderer * renderer, /** - * \brief Draw a point on the current rendering target. + * Draw a point on the current rendering target at subpixel precision. * - * \param renderer The renderer which should draw a point. - * \param x The x coordinate of the point. - * \param y The y coordinate of the point. + * \param renderer The renderer which should draw a point. + * \param x The x coordinate of the point. + * \param y The y coordinate of the point. + * \return 0 on success, or -1 on error * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC int SDLCALL SDL_RenderDrawPointF(SDL_Renderer * renderer, float x, float y); /** - * \brief Draw multiple points on the current rendering target. + * Draw multiple points on the current rendering target at subpixel precision. * - * \param renderer The renderer which should draw multiple points. - * \param points The points to draw - * \param count The number of points to draw + * \param renderer The renderer which should draw multiple points. + * \param points The points to draw + * \param count The number of points to draw + * \return 0 on success, or -1 on error * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC int SDLCALL SDL_RenderDrawPointsF(SDL_Renderer * renderer, const SDL_FPoint * points, int count); /** - * \brief Draw a line on the current rendering target. + * Draw a line on the current rendering target at subpixel precision. * - * \param renderer The renderer which should draw a line. - * \param x1 The x coordinate of the start point. - * \param y1 The y coordinate of the start point. - * \param x2 The x coordinate of the end point. - * \param y2 The y coordinate of the end point. + * \param renderer The renderer which should draw a line. + * \param x1 The x coordinate of the start point. + * \param y1 The y coordinate of the start point. + * \param x2 The x coordinate of the end point. + * \param y2 The y coordinate of the end point. + * \return 0 on success, or -1 on error * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC int SDLCALL SDL_RenderDrawLineF(SDL_Renderer * renderer, float x1, float y1, float x2, float y2); /** - * \brief Draw a series of connected lines on the current rendering target. + * Draw a series of connected lines on the current rendering target at + * subpixel precision. * - * \param renderer The renderer which should draw multiple lines. - * \param points The points along the lines - * \param count The number of points, drawing count-1 lines + * \param renderer The renderer which should draw multiple lines. + * \param points The points along the lines + * \param count The number of points, drawing count-1 lines + * \return 0 on success, or -1 on error * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC int SDLCALL SDL_RenderDrawLinesF(SDL_Renderer * renderer, - const SDL_FPoint * points, - int count); + const SDL_FPoint * points, + int count); /** - * \brief Draw a rectangle on the current rendering target. + * Draw a rectangle on the current rendering target at subpixel precision. * - * \param renderer The renderer which should draw a rectangle. - * \param rect A pointer to the destination rectangle, or NULL to outline the entire rendering target. + * \param renderer The renderer which should draw a rectangle. + * \param rect A pointer to the destination rectangle, or NULL to outline the + * entire rendering target. + * \return 0 on success, or -1 on error * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC int SDLCALL SDL_RenderDrawRectF(SDL_Renderer * renderer, - const SDL_FRect * rect); + const SDL_FRect * rect); /** - * \brief Draw some number of rectangles on the current rendering target. + * Draw some number of rectangles on the current rendering target at subpixel + * precision. * - * \param renderer The renderer which should draw multiple rectangles. - * \param rects A pointer to an array of destination rectangles. - * \param count The number of rectangles. + * \param renderer The renderer which should draw multiple rectangles. + * \param rects A pointer to an array of destination rectangles. + * \param count The number of rectangles. + * \return 0 on success, or -1 on error * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC int SDLCALL SDL_RenderDrawRectsF(SDL_Renderer * renderer, const SDL_FRect * rects, int count); /** - * \brief Fill a rectangle on the current rendering target with the drawing color. + * Fill a rectangle on the current rendering target with the drawing color at + * subpixel precision. * - * \param renderer The renderer which should fill a rectangle. - * \param rect A pointer to the destination rectangle, or NULL for the entire - * rendering target. + * \param renderer The renderer which should fill a rectangle. + * \param rect A pointer to the destination rectangle, or NULL for the entire + * rendering target. + * \return 0 on success, or -1 on error * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC int SDLCALL SDL_RenderFillRectF(SDL_Renderer * renderer, const SDL_FRect * rect); /** - * \brief Fill some number of rectangles on the current rendering target with the drawing color. + * Fill some number of rectangles on the current rendering target with the + * drawing color at subpixel precision. * - * \param renderer The renderer which should fill multiple rectangles. - * \param rects A pointer to an array of destination rectangles. - * \param count The number of rectangles. + * \param renderer The renderer which should fill multiple rectangles. + * \param rects A pointer to an array of destination rectangles. + * \param count The number of rectangles. + * \return 0 on success, or -1 on error * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC int SDLCALL SDL_RenderFillRectsF(SDL_Renderer * renderer, const SDL_FRect * rects, int count); /** - * \brief Copy a portion of the texture to the current rendering target. + * Copy a portion of the texture to the current rendering target at subpixel + * precision. * - * \param renderer The renderer which should copy parts of a texture. - * \param texture The source texture. - * \param srcrect A pointer to the source rectangle, or NULL for the entire - * texture. - * \param dstrect A pointer to the destination rectangle, or NULL for the - * entire rendering target. + * \param renderer The renderer which should copy parts of a texture. + * \param texture The source texture. + * \param srcrect A pointer to the source rectangle, or NULL for the entire + * texture. + * \param dstrect A pointer to the destination rectangle, or NULL for the + * entire rendering target. + * \return 0 on success, or -1 on error * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC int SDLCALL SDL_RenderCopyF(SDL_Renderer * renderer, SDL_Texture * texture, @@ -955,19 +1570,25 @@ extern DECLSPEC int SDLCALL SDL_RenderCopyF(SDL_Renderer * renderer, const SDL_FRect * dstrect); /** - * \brief Copy a portion of the source texture to the current rendering target, rotating it by angle around the given center + * Copy a portion of the source texture to the current rendering target, with + * rotation and flipping, at subpixel precision. * - * \param renderer The renderer which should copy parts of a texture. - * \param texture The source texture. - * \param srcrect A pointer to the source rectangle, or NULL for the entire - * texture. - * \param dstrect A pointer to the destination rectangle, or NULL for the - * entire rendering target. - * \param angle An angle in degrees that indicates the rotation that will be applied to dstrect, rotating it in a clockwise direction - * \param center A pointer to a point indicating the point around which dstrect will be rotated (if NULL, rotation will be done around dstrect.w/2, dstrect.h/2). - * \param flip An SDL_RendererFlip value stating which flipping actions should be performed on the texture + * \param renderer The renderer which should copy parts of a texture. + * \param texture The source texture. + * \param srcrect A pointer to the source rectangle, or NULL for the entire + * texture. + * \param dstrect A pointer to the destination rectangle, or NULL for the + * entire rendering target. + * \param angle An angle in degrees that indicates the rotation that will be + * applied to dstrect, rotating it in a clockwise direction + * \param center A pointer to a point indicating the point around which + * dstrect will be rotated (if NULL, rotation will be done + * around dstrect.w/2, dstrect.h/2). + * \param flip An SDL_RendererFlip value stating which flipping actions should + * be performed on the texture + * \return 0 on success, or -1 on error * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC int SDLCALL SDL_RenderCopyExF(SDL_Renderer * renderer, SDL_Texture * texture, @@ -978,19 +1599,85 @@ extern DECLSPEC int SDLCALL SDL_RenderCopyExF(SDL_Renderer * renderer, const SDL_RendererFlip flip); /** - * \brief Read pixels from the current rendering target. + * Render a list of triangles, optionally using a texture and indices into the + * vertex array Color and alpha modulation is done per vertex + * (SDL_SetTextureColorMod and SDL_SetTextureAlphaMod are ignored). * - * \param renderer The renderer from which pixels should be read. - * \param rect A pointer to the rectangle to read, or NULL for the entire - * render target. - * \param format The desired format of the pixel data, or 0 to use the format - * of the rendering target - * \param pixels A pointer to be filled in with the pixel data - * \param pitch The pitch of the pixels parameter. + * \param texture (optional) The SDL texture to use. + * \param vertices Vertices. + * \param num_vertices Number of vertices. + * \param indices (optional) An array of integer indices into the 'vertices' + * array, if NULL all vertices will be rendered in sequential + * order. + * \param num_indices Number of indices. + * \return 0 on success, or -1 if the operation is not supported * - * \return 0 on success, or -1 if pixel reading is not supported. + * \since This function is available since SDL 2.0.18. * - * \warning This is a very slow operation, and should not be used frequently. + * \sa SDL_RenderGeometryRaw + * \sa SDL_Vertex + */ +extern DECLSPEC int SDLCALL SDL_RenderGeometry(SDL_Renderer *renderer, + SDL_Texture *texture, + const SDL_Vertex *vertices, int num_vertices, + const int *indices, int num_indices); + +/** + * Render a list of triangles, optionally using a texture and indices into the + * vertex arrays Color and alpha modulation is done per vertex + * (SDL_SetTextureColorMod and SDL_SetTextureAlphaMod are ignored). + * + * \param texture (optional) The SDL texture to use. + * \param xy Vertex positions + * \param xy_stride Byte size to move from one element to the next element + * \param color Vertex colors (as SDL_Color) + * \param color_stride Byte size to move from one element to the next element + * \param uv Vertex normalized texture coordinates + * \param uv_stride Byte size to move from one element to the next element + * \param num_vertices Number of vertices. + * \param indices (optional) An array of indices into the 'vertices' arrays, + * if NULL all vertices will be rendered in sequential order. + * \param num_indices Number of indices. + * \param size_indices Index size: 1 (byte), 2 (short), 4 (int) + * \return 0 on success, or -1 if the operation is not supported + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_RenderGeometry + * \sa SDL_Vertex + */ +extern DECLSPEC int SDLCALL SDL_RenderGeometryRaw(SDL_Renderer *renderer, + SDL_Texture *texture, + const float *xy, int xy_stride, + const SDL_Color *color, int color_stride, + const float *uv, int uv_stride, + int num_vertices, + const void *indices, int num_indices, int size_indices); + +/** + * Read pixels from the current rendering target to an array of pixels. + * + * **WARNING**: This is a very slow operation, and should not be used + * frequently. + * + * `pitch` specifies the number of bytes between rows in the destination + * `pixels` data. This allows you to write to a subrectangle or have padded + * rows in the destination. Generally, `pitch` should equal the number of + * pixels per row in the `pixels` data times the number of bytes per pixel, + * but it might contain additional padding (for example, 24bit RGB Windows + * Bitmap data pads all rows to multiples of 4 bytes). + * + * \param renderer the rendering context + * \param rect an SDL_Rect structure representing the area to read, or NULL + * for the entire render target + * \param format an SDL_PixelFormatEnum value of the desired format of the + * pixel data, or 0 to use the format of the rendering target + * \param pixels a pointer to the pixel data to copy into + * \param pitch the pitch of the `pixels` parameter + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC int SDLCALL SDL_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect, @@ -998,95 +1685,200 @@ extern DECLSPEC int SDLCALL SDL_RenderReadPixels(SDL_Renderer * renderer, void *pixels, int pitch); /** - * \brief Update the screen with rendering performed. + * Update the screen with any rendering performed since the previous call. + * + * SDL's rendering functions operate on a backbuffer; that is, calling a + * rendering function such as SDL_RenderDrawLine() does not directly put a + * line on the screen, but rather updates the backbuffer. As such, you compose + * your entire scene and *present* the composed backbuffer to the screen as a + * complete picture. + * + * Therefore, when using SDL's rendering API, one does all drawing intended + * for the frame, and then calls this function once per frame to present the + * final drawing to the user. + * + * The backbuffer should be considered invalidated after each present; do not + * assume that previous contents will exist between frames. You are strongly + * encouraged to call SDL_RenderClear() to initialize the backbuffer before + * starting each new frame's drawing, even if you plan to overwrite every + * pixel. + * + * \param renderer the rendering context + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderClear + * \sa SDL_RenderDrawLine + * \sa SDL_RenderDrawLines + * \sa SDL_RenderDrawPoint + * \sa SDL_RenderDrawPoints + * \sa SDL_RenderDrawRect + * \sa SDL_RenderDrawRects + * \sa SDL_RenderFillRect + * \sa SDL_RenderFillRects + * \sa SDL_SetRenderDrawBlendMode + * \sa SDL_SetRenderDrawColor */ extern DECLSPEC void SDLCALL SDL_RenderPresent(SDL_Renderer * renderer); /** - * \brief Destroy the specified texture. + * Destroy the specified texture. * - * \sa SDL_CreateTexture() - * \sa SDL_CreateTextureFromSurface() + * Passing NULL or an otherwise invalid texture will set the SDL error message + * to "Invalid texture". + * + * \param texture the texture to destroy + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateTexture + * \sa SDL_CreateTextureFromSurface */ extern DECLSPEC void SDLCALL SDL_DestroyTexture(SDL_Texture * texture); /** - * \brief Destroy the rendering context for a window and free associated - * textures. + * Destroy the rendering context for a window and free associated textures. * - * \sa SDL_CreateRenderer() + * \param renderer the rendering context + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateRenderer */ extern DECLSPEC void SDLCALL SDL_DestroyRenderer(SDL_Renderer * renderer); /** - * \brief Force the rendering context to flush any pending commands to the - * underlying rendering API. + * Force the rendering context to flush any pending commands to the underlying + * rendering API. * - * You do not need to (and in fact, shouldn't) call this function unless - * you are planning to call into OpenGL/Direct3D/Metal/whatever directly - * in addition to using an SDL_Renderer. + * You do not need to (and in fact, shouldn't) call this function unless you + * are planning to call into OpenGL/Direct3D/Metal/whatever directly in + * addition to using an SDL_Renderer. * - * This is for a very-specific case: if you are using SDL's render API, - * you asked for a specific renderer backend (OpenGL, Direct3D, etc), - * you set SDL_HINT_RENDER_BATCHING to "1", and you plan to make - * OpenGL/D3D/whatever calls in addition to SDL render API calls. If all of - * this applies, you should call SDL_RenderFlush() between calls to SDL's - * render API and the low-level API you're using in cooperation. + * This is for a very-specific case: if you are using SDL's render API, you + * asked for a specific renderer backend (OpenGL, Direct3D, etc), you set + * SDL_HINT_RENDER_BATCHING to "1", and you plan to make OpenGL/D3D/whatever + * calls in addition to SDL render API calls. If all of this applies, you + * should call SDL_RenderFlush() between calls to SDL's render API and the + * low-level API you're using in cooperation. * - * In all other cases, you can ignore this function. This is only here to - * get maximum performance out of a specific situation. In all other cases, - * SDL will do the right thing, perhaps at a performance loss. + * In all other cases, you can ignore this function. This is only here to get + * maximum performance out of a specific situation. In all other cases, SDL + * will do the right thing, perhaps at a performance loss. * - * This function is first available in SDL 2.0.10, and is not needed in - * 2.0.9 and earlier, as earlier versions did not queue rendering commands - * at all, instead flushing them to the OS immediately. + * This function is first available in SDL 2.0.10, and is not needed in 2.0.9 + * and earlier, as earlier versions did not queue rendering commands at all, + * instead flushing them to the OS immediately. + * + * \param renderer the rendering context + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC int SDLCALL SDL_RenderFlush(SDL_Renderer * renderer); /** - * \brief Bind the texture to the current OpenGL/ES/ES2 context for use with - * OpenGL instructions. + * Bind an OpenGL/ES/ES2 texture to the current context. * - * \param texture The SDL texture to bind - * \param texw A pointer to a float that will be filled with the texture width - * \param texh A pointer to a float that will be filled with the texture height + * This is for use with OpenGL instructions when rendering OpenGL primitives + * directly. * - * \return 0 on success, or -1 if the operation is not supported + * If not NULL, `texw` and `texh` will be filled with the width and height + * values suitable for the provided texture. In most cases, both will be 1.0, + * however, on systems that support the GL_ARB_texture_rectangle extension, + * these values will actually be the pixel width and height used to create the + * texture, so this factor needs to be taken into account when providing + * texture coordinates to OpenGL. + * + * You need a renderer to create an SDL_Texture, therefore you can only use + * this function with an implicit OpenGL context from SDL_CreateRenderer(), + * not with your own OpenGL context. If you need control over your OpenGL + * context, you need to write your own texture-loading methods. + * + * Also note that SDL may upload RGB textures as BGR (or vice-versa), and + * re-order the color channels in the shaders phase, so the uploaded texture + * may have swapped color channels. + * + * \param texture the texture to bind to the current OpenGL/ES/ES2 context + * \param texw a pointer to a float value which will be filled with the + * texture width or NULL if you don't need that value + * \param texh a pointer to a float value which will be filled with the + * texture height or NULL if you don't need that value + * \returns 0 on success, or -1 if the operation is not supported; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_MakeCurrent + * \sa SDL_GL_UnbindTexture */ extern DECLSPEC int SDLCALL SDL_GL_BindTexture(SDL_Texture *texture, float *texw, float *texh); /** - * \brief Unbind a texture from the current OpenGL/ES/ES2 context. + * Unbind an OpenGL/ES/ES2 texture from the current context. * - * \param texture The SDL texture to unbind + * See SDL_GL_BindTexture() for examples on how to use these functions * - * \return 0 on success, or -1 if the operation is not supported + * \param texture the texture to unbind from the current OpenGL/ES/ES2 context + * \returns 0 on success, or -1 if the operation is not supported + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_BindTexture + * \sa SDL_GL_MakeCurrent */ extern DECLSPEC int SDLCALL SDL_GL_UnbindTexture(SDL_Texture *texture); /** - * \brief Get the CAMetalLayer associated with the given Metal renderer + * Get the CAMetalLayer associated with the given Metal renderer. * - * \param renderer The renderer to query + * This function returns `void *`, so SDL doesn't have to include Metal's + * headers, but it can be safely cast to a `CAMetalLayer *`. * - * \return CAMetalLayer* on success, or NULL if the renderer isn't a Metal renderer + * \param renderer The renderer to query + * \returns a `CAMetalLayer *` on success, or NULL if the renderer isn't a + * Metal renderer * - * \sa SDL_RenderGetMetalCommandEncoder() + * \since This function is available since SDL 2.0.8. + * + * \sa SDL_RenderGetMetalCommandEncoder */ extern DECLSPEC void *SDLCALL SDL_RenderGetMetalLayer(SDL_Renderer * renderer); /** - * \brief Get the Metal command encoder for the current frame + * Get the Metal command encoder for the current frame * - * \param renderer The renderer to query + * This function returns `void *`, so SDL doesn't have to include Metal's + * headers, but it can be safely cast to an `id`. * - * \return id on success, or NULL if the renderer isn't a Metal renderer + * Note that as of SDL 2.0.18, this will return NULL if Metal refuses to give + * SDL a drawable to render to, which might happen if the window is + * hidden/minimized/offscreen. This doesn't apply to command encoders for + * render targets, just the window's backbacker. Check your return values! * - * \sa SDL_RenderGetMetalLayer() + * \param renderer The renderer to query + * \returns an `id` on success, or NULL if the + * renderer isn't a Metal renderer or there was an error. + * + * \since This function is available since SDL 2.0.8. + * + * \sa SDL_RenderGetMetalLayer */ extern DECLSPEC void *SDLCALL SDL_RenderGetMetalCommandEncoder(SDL_Renderer * renderer); +/** + * Toggle VSync of the given renderer. + * + * \param renderer The renderer to toggle + * \param vsync 1 for on, 0 for off. All other values are reserved + * \returns a 0 int on success, or non-zero on failure + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_RenderSetVSync(SDL_Renderer* renderer, int vsync); + /* Ends C function definitions when using C++ */ #ifdef __cplusplus } diff --git a/libs/SDL2/include/SDL_revision.h b/libs/SDL2/include/SDL_revision.h index 3b3fc85ea..3253d6df0 100644 --- a/libs/SDL2/include/SDL_revision.h +++ b/libs/SDL2/include/SDL_revision.h @@ -1,2 +1,2 @@ -#define SDL_REVISION "hg-12952:bc90ce38f1e2" -#define SDL_REVISION_NUMBER 12952 +#define SDL_REVISION "https://github.com/libsdl-org/SDL.git@b424665e0899769b200231ba943353a5fee1b6b6" +#define SDL_REVISION_NUMBER 0 diff --git a/libs/SDL2/include/SDL_rwops.h b/libs/SDL2/include/SDL_rwops.h index f66119fb0..71e5c8db8 100644 --- a/libs/SDL2/include/SDL_rwops.h +++ b/libs/SDL2/include/SDL_rwops.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -45,6 +45,9 @@ extern "C" { #define SDL_RWOPS_JNIFILE 3U /**< Android asset */ #define SDL_RWOPS_MEMORY 4U /**< Memory stream */ #define SDL_RWOPS_MEMORY_RO 5U /**< Read-Only memory stream */ +#if defined(__VITA__) +#define SDL_RWOPS_VITAFILE 6U /**< Vita file */ +#endif /** * This is the read/write operation structure -- very basic. @@ -96,15 +99,7 @@ typedef struct SDL_RWops #if defined(__ANDROID__) struct { - void *fileNameRef; - void *inputStreamRef; - void *readableByteChannelRef; - void *readMethod; - void *assetFileDescriptorRef; - long position; - long size; - long offset; - int fd; + void *asset; } androidio; #elif defined(__WIN32__) struct @@ -118,6 +113,17 @@ typedef struct SDL_RWops size_t left; } buffer; } windowsio; +#elif defined(__VITA__) + struct + { + int h; + struct + { + void *data; + size_t size; + size_t left; + } buffer; + } vitaio; #endif #ifdef HAVE_STDIO_H @@ -150,25 +156,228 @@ typedef struct SDL_RWops */ /* @{ */ +/** + * Use this function to create a new SDL_RWops structure for reading from + * and/or writing to a named file. + * + * The `mode` string is treated roughly the same as in a call to the C + * library's fopen(), even if SDL doesn't happen to use fopen() behind the + * scenes. + * + * Available `mode` strings: + * + * - "r": Open a file for reading. The file must exist. + * - "w": Create an empty file for writing. If a file with the same name + * already exists its content is erased and the file is treated as a new + * empty file. + * - "a": Append to a file. Writing operations append data at the end of the + * file. The file is created if it does not exist. + * - "r+": Open a file for update both reading and writing. The file must + * exist. + * - "w+": Create an empty file for both reading and writing. If a file with + * the same name already exists its content is erased and the file is + * treated as a new empty file. + * - "a+": Open a file for reading and appending. All writing operations are + * performed at the end of the file, protecting the previous content to be + * overwritten. You can reposition (fseek, rewind) the internal pointer to + * anywhere in the file for reading, but writing operations will move it + * back to the end of file. The file is created if it does not exist. + * + * **NOTE**: In order to open a file as a binary file, a "b" character has to + * be included in the `mode` string. This additional "b" character can either + * be appended at the end of the string (thus making the following compound + * modes: "rb", "wb", "ab", "r+b", "w+b", "a+b") or be inserted between the + * letter and the "+" sign for the mixed modes ("rb+", "wb+", "ab+"). + * Additional characters may follow the sequence, although they should have no + * effect. For example, "t" is sometimes appended to make explicit the file is + * a text file. + * + * This function supports Unicode filenames, but they must be encoded in UTF-8 + * format, regardless of the underlying operating system. + * + * As a fallback, SDL_RWFromFile() will transparently open a matching filename + * in an Android app's `assets`. + * + * Closing the SDL_RWops will close the file handle SDL is holding internally. + * + * \param file a UTF-8 string representing the filename to open + * \param mode an ASCII string representing the mode to be used for opening + * the file. + * \returns a pointer to the SDL_RWops structure that is created, or NULL on + * failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RWclose + * \sa SDL_RWFromConstMem + * \sa SDL_RWFromFP + * \sa SDL_RWFromMem + * \sa SDL_RWread + * \sa SDL_RWseek + * \sa SDL_RWtell + * \sa SDL_RWwrite + */ extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromFile(const char *file, const char *mode); #ifdef HAVE_STDIO_H -extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromFP(FILE * fp, - SDL_bool autoclose); + +extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromFP(FILE * fp, SDL_bool autoclose); + #else + +/** + * Use this function to create an SDL_RWops structure from a standard I/O file + * pointer (stdio.h's `FILE*`). + * + * This function is not available on Windows, since files opened in an + * application on that platform cannot be used by a dynamically linked + * library. + * + * On some platforms, the first parameter is a `void*`, on others, it's a + * `FILE*`, depending on what system headers are available to SDL. It is + * always intended to be the `FILE*` type from the C runtime's stdio.h. + * + * \param fp the `FILE*` that feeds the SDL_RWops stream + * \param autoclose SDL_TRUE to close the `FILE*` when closing the SDL_RWops, + * SDL_FALSE to leave the `FILE*` open when the RWops is + * closed + * \returns a pointer to the SDL_RWops structure that is created, or NULL on + * failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RWclose + * \sa SDL_RWFromConstMem + * \sa SDL_RWFromFile + * \sa SDL_RWFromMem + * \sa SDL_RWread + * \sa SDL_RWseek + * \sa SDL_RWtell + * \sa SDL_RWwrite + */ extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromFP(void * fp, SDL_bool autoclose); #endif +/** + * Use this function to prepare a read-write memory buffer for use with + * SDL_RWops. + * + * This function sets up an SDL_RWops struct based on a memory area of a + * certain size, for both read and write access. + * + * This memory buffer is not copied by the RWops; the pointer you provide must + * remain valid until you close the stream. Closing the stream will not free + * the original buffer. + * + * If you need to make sure the RWops never writes to the memory buffer, you + * should use SDL_RWFromConstMem() with a read-only buffer of memory instead. + * + * \param mem a pointer to a buffer to feed an SDL_RWops stream + * \param size the buffer size, in bytes + * \returns a pointer to a new SDL_RWops structure, or NULL if it fails; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RWclose + * \sa SDL_RWFromConstMem + * \sa SDL_RWFromFile + * \sa SDL_RWFromFP + * \sa SDL_RWFromMem + * \sa SDL_RWread + * \sa SDL_RWseek + * \sa SDL_RWtell + * \sa SDL_RWwrite + */ extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromMem(void *mem, int size); + +/** + * Use this function to prepare a read-only memory buffer for use with RWops. + * + * This function sets up an SDL_RWops struct based on a memory area of a + * certain size. It assumes the memory area is not writable. + * + * Attempting to write to this RWops stream will report an error without + * writing to the memory buffer. + * + * This memory buffer is not copied by the RWops; the pointer you provide must + * remain valid until you close the stream. Closing the stream will not free + * the original buffer. + * + * If you need to write to a memory buffer, you should use SDL_RWFromMem() + * with a writable buffer of memory instead. + * + * \param mem a pointer to a read-only buffer to feed an SDL_RWops stream + * \param size the buffer size, in bytes + * \returns a pointer to a new SDL_RWops structure, or NULL if it fails; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RWclose + * \sa SDL_RWFromConstMem + * \sa SDL_RWFromFile + * \sa SDL_RWFromFP + * \sa SDL_RWFromMem + * \sa SDL_RWread + * \sa SDL_RWseek + * \sa SDL_RWtell + */ extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromConstMem(const void *mem, int size); /* @} *//* RWFrom functions */ +/** + * Use this function to allocate an empty, unpopulated SDL_RWops structure. + * + * Applications do not need to use this function unless they are providing + * their own SDL_RWops implementation. If you just need a SDL_RWops to + * read/write a common data source, you should use the built-in + * implementations in SDL, like SDL_RWFromFile() or SDL_RWFromMem(), etc. + * + * You must free the returned pointer with SDL_FreeRW(). Depending on your + * operating system and compiler, there may be a difference between the + * malloc() and free() your program uses and the versions SDL calls + * internally. Trying to mix the two can cause crashing such as segmentation + * faults. Since all SDL_RWops must free themselves when their **close** + * method is called, all SDL_RWops must be allocated through this function, so + * they can all be freed correctly with SDL_FreeRW(). + * + * \returns a pointer to the allocated memory on success, or NULL on failure; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_FreeRW + */ extern DECLSPEC SDL_RWops *SDLCALL SDL_AllocRW(void); + +/** + * Use this function to free an SDL_RWops structure allocated by + * SDL_AllocRW(). + * + * Applications do not need to use this function unless they are providing + * their own SDL_RWops implementation. If you just need a SDL_RWops to + * read/write a common data source, you should use the built-in + * implementations in SDL, like SDL_RWFromFile() or SDL_RWFromMem(), etc, and + * call the **close** method on those SDL_RWops pointers when you are done + * with them. + * + * Only use SDL_FreeRW() on pointers returned by SDL_AllocRW(). The pointer is + * invalid as soon as this function returns. Any extra memory allocated during + * creation of the SDL_RWops is not freed by SDL_FreeRW(); the programmer must + * be responsible for managing that memory in their **close** method. + * + * \param area the SDL_RWops structure to be freed + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AllocRW + */ extern DECLSPEC void SDLCALL SDL_FreeRW(SDL_RWops * area); #define RW_SEEK_SET 0 /**< Seek from the beginning of data */ @@ -176,77 +385,218 @@ extern DECLSPEC void SDLCALL SDL_FreeRW(SDL_RWops * area); #define RW_SEEK_END 2 /**< Seek relative to the end of data */ /** - * Return the size of the file in this rwops, or -1 if unknown + * Use this function to get the size of the data stream in an SDL_RWops. + * + * Prior to SDL 2.0.10, this function was a macro. + * + * \param context the SDL_RWops to get the size of the data stream from + * \returns the size of the data stream in the SDL_RWops on success, -1 if + * unknown or a negative error code on failure; call SDL_GetError() + * for more information. + * + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC Sint64 SDLCALL SDL_RWsize(SDL_RWops *context); /** - * Seek to \c offset relative to \c whence, one of stdio's whence values: - * RW_SEEK_SET, RW_SEEK_CUR, RW_SEEK_END + * Seek within an SDL_RWops data stream. * - * \return the final offset in the data stream, or -1 on error. + * This function seeks to byte `offset`, relative to `whence`. + * + * `whence` may be any of the following values: + * + * - `RW_SEEK_SET`: seek from the beginning of data + * - `RW_SEEK_CUR`: seek relative to current read point + * - `RW_SEEK_END`: seek relative to the end of data + * + * If this stream can not seek, it will return -1. + * + * SDL_RWseek() is actually a wrapper function that calls the SDL_RWops's + * `seek` method appropriately, to simplify application development. + * + * Prior to SDL 2.0.10, this function was a macro. + * + * \param context a pointer to an SDL_RWops structure + * \param offset an offset in bytes, relative to **whence** location; can be + * negative + * \param whence any of `RW_SEEK_SET`, `RW_SEEK_CUR`, `RW_SEEK_END` + * \returns the final offset in the data stream after the seek or -1 on error. + * + * \since This function is available since SDL 2.0.10. + * + * \sa SDL_RWclose + * \sa SDL_RWFromConstMem + * \sa SDL_RWFromFile + * \sa SDL_RWFromFP + * \sa SDL_RWFromMem + * \sa SDL_RWread + * \sa SDL_RWtell + * \sa SDL_RWwrite */ extern DECLSPEC Sint64 SDLCALL SDL_RWseek(SDL_RWops *context, Sint64 offset, int whence); /** - * Return the current offset in the data stream, or -1 on error. + * Determine the current read/write offset in an SDL_RWops data stream. + * + * SDL_RWtell is actually a wrapper function that calls the SDL_RWops's `seek` + * method, with an offset of 0 bytes from `RW_SEEK_CUR`, to simplify + * application development. + * + * Prior to SDL 2.0.10, this function was a macro. + * + * \param context a SDL_RWops data stream object from which to get the current + * offset + * \returns the current offset in the stream, or -1 if the information can not + * be determined. + * + * \since This function is available since SDL 2.0.10. + * + * \sa SDL_RWclose + * \sa SDL_RWFromConstMem + * \sa SDL_RWFromFile + * \sa SDL_RWFromFP + * \sa SDL_RWFromMem + * \sa SDL_RWread + * \sa SDL_RWseek + * \sa SDL_RWwrite */ extern DECLSPEC Sint64 SDLCALL SDL_RWtell(SDL_RWops *context); /** - * Read up to \c maxnum objects each of size \c size from the data - * stream to the area pointed at by \c ptr. + * Read from a data source. * - * \return the number of objects read, or 0 at error or end of file. + * This function reads up to `maxnum` objects each of size `size` from the + * data source to the area pointed at by `ptr`. This function may read less + * objects than requested. It will return zero when there has been an error or + * the data stream is completely read. + * + * SDL_RWread() is actually a function wrapper that calls the SDL_RWops's + * `read` method appropriately, to simplify application development. + * + * Prior to SDL 2.0.10, this function was a macro. + * + * \param context a pointer to an SDL_RWops structure + * \param ptr a pointer to a buffer to read data into + * \param size the size of each object to read, in bytes + * \param maxnum the maximum number of objects to be read + * \returns the number of objects read, or 0 at error or end of file; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.10. + * + * \sa SDL_RWclose + * \sa SDL_RWFromConstMem + * \sa SDL_RWFromFile + * \sa SDL_RWFromFP + * \sa SDL_RWFromMem + * \sa SDL_RWseek + * \sa SDL_RWwrite */ extern DECLSPEC size_t SDLCALL SDL_RWread(SDL_RWops *context, - void *ptr, size_t size, size_t maxnum); + void *ptr, size_t size, + size_t maxnum); /** - * Write exactly \c num objects each of size \c size from the area - * pointed at by \c ptr to data stream. + * Write to an SDL_RWops data stream. * - * \return the number of objects written, or 0 at error or end of file. + * This function writes exactly `num` objects each of size `size` from the + * area pointed at by `ptr` to the stream. If this fails for any reason, it'll + * return less than `num` to demonstrate how far the write progressed. On + * success, it returns `num`. + * + * SDL_RWwrite is actually a function wrapper that calls the SDL_RWops's + * `write` method appropriately, to simplify application development. + * + * Prior to SDL 2.0.10, this function was a macro. + * + * \param context a pointer to an SDL_RWops structure + * \param ptr a pointer to a buffer containing data to write + * \param size the size of an object to write, in bytes + * \param num the number of objects to write + * \returns the number of objects written, which will be less than **num** on + * error; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.10. + * + * \sa SDL_RWclose + * \sa SDL_RWFromConstMem + * \sa SDL_RWFromFile + * \sa SDL_RWFromFP + * \sa SDL_RWFromMem + * \sa SDL_RWread + * \sa SDL_RWseek */ extern DECLSPEC size_t SDLCALL SDL_RWwrite(SDL_RWops *context, - const void *ptr, size_t size, size_t num); + const void *ptr, size_t size, + size_t num); /** - * Close and free an allocated SDL_RWops structure. + * Close and free an allocated SDL_RWops structure. * - * \return 0 if successful or -1 on write error when flushing data. + * SDL_RWclose() closes and cleans up the SDL_RWops stream. It releases any + * resources used by the stream and frees the SDL_RWops itself with + * SDL_FreeRW(). This returns 0 on success, or -1 if the stream failed to + * flush to its output (e.g. to disk). + * + * Note that if this fails to flush the stream to disk, this function reports + * an error, but the SDL_RWops is still invalid once this function returns. + * + * Prior to SDL 2.0.10, this function was a macro. + * + * \param context SDL_RWops structure to close + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.10. + * + * \sa SDL_RWFromConstMem + * \sa SDL_RWFromFile + * \sa SDL_RWFromFP + * \sa SDL_RWFromMem + * \sa SDL_RWread + * \sa SDL_RWseek + * \sa SDL_RWwrite */ extern DECLSPEC int SDLCALL SDL_RWclose(SDL_RWops *context); /** - * Load all the data from an SDL data stream. + * Load all the data from an SDL data stream. * - * The data is allocated with a zero byte at the end (null terminated) + * The data is allocated with a zero byte at the end (null terminated) for + * convenience. This extra byte is not included in the value reported via + * `datasize`. * - * If \c datasize is not NULL, it is filled with the size of the data read. + * The data should be freed with SDL_free(). * - * If \c freesrc is non-zero, the stream will be closed after being read. + * \param src the SDL_RWops to read all available data from + * \param datasize if not NULL, will store the number of bytes read + * \param freesrc if non-zero, calls SDL_RWclose() on `src` before returning + * \returns the data, or NULL if there was an error. * - * The data should be freed with SDL_free(). - * - * \return the data, or NULL if there was an error. + * \since This function is available since SDL 2.0.6. */ -extern DECLSPEC void *SDLCALL SDL_LoadFile_RW(SDL_RWops * src, size_t *datasize, - int freesrc); +extern DECLSPEC void *SDLCALL SDL_LoadFile_RW(SDL_RWops *src, + size_t *datasize, + int freesrc); /** - * Load an entire file. + * Load all the data from a file path. * - * The data is allocated with a zero byte at the end (null terminated) + * The data is allocated with a zero byte at the end (null terminated) for + * convenience. This extra byte is not included in the value reported via + * `datasize`. * - * If \c datasize is not NULL, it is filled with the size of the data read. + * The data should be freed with SDL_free(). * - * If \c freesrc is non-zero, the stream will be closed after being read. + * Prior to SDL 2.0.10, this function was a macro wrapping around + * SDL_LoadFile_RW. * - * The data should be freed with SDL_free(). + * \param file the path to read all available data from + * \param datasize if not NULL, will store the number of bytes read + * \returns the data, or NULL if there was an error. * - * \return the data, or NULL if there was an error. + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC void *SDLCALL SDL_LoadFile(const char *file, size_t *datasize); @@ -256,12 +606,114 @@ extern DECLSPEC void *SDLCALL SDL_LoadFile(const char *file, size_t *datasize); * Read an item of the specified endianness and return in native format. */ /* @{ */ + +/** + * Use this function to read a byte from an SDL_RWops. + * + * \param src the SDL_RWops to read from + * \returns the read byte on success or 0 on failure; call SDL_GetError() for + * more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_WriteU8 + */ extern DECLSPEC Uint8 SDLCALL SDL_ReadU8(SDL_RWops * src); + +/** + * Use this function to read 16 bits of little-endian data from an SDL_RWops + * and return in native format. + * + * SDL byteswaps the data only if necessary, so the data returned will be in + * the native byte order. + * + * \param src the stream from which to read data + * \returns 16 bits of data in the native byte order of the platform. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ReadBE16 + */ extern DECLSPEC Uint16 SDLCALL SDL_ReadLE16(SDL_RWops * src); + +/** + * Use this function to read 16 bits of big-endian data from an SDL_RWops and + * return in native format. + * + * SDL byteswaps the data only if necessary, so the data returned will be in + * the native byte order. + * + * \param src the stream from which to read data + * \returns 16 bits of data in the native byte order of the platform. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ReadLE16 + */ extern DECLSPEC Uint16 SDLCALL SDL_ReadBE16(SDL_RWops * src); + +/** + * Use this function to read 32 bits of little-endian data from an SDL_RWops + * and return in native format. + * + * SDL byteswaps the data only if necessary, so the data returned will be in + * the native byte order. + * + * \param src the stream from which to read data + * \returns 32 bits of data in the native byte order of the platform. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ReadBE32 + */ extern DECLSPEC Uint32 SDLCALL SDL_ReadLE32(SDL_RWops * src); + +/** + * Use this function to read 32 bits of big-endian data from an SDL_RWops and + * return in native format. + * + * SDL byteswaps the data only if necessary, so the data returned will be in + * the native byte order. + * + * \param src the stream from which to read data + * \returns 32 bits of data in the native byte order of the platform. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ReadLE32 + */ extern DECLSPEC Uint32 SDLCALL SDL_ReadBE32(SDL_RWops * src); + +/** + * Use this function to read 64 bits of little-endian data from an SDL_RWops + * and return in native format. + * + * SDL byteswaps the data only if necessary, so the data returned will be in + * the native byte order. + * + * \param src the stream from which to read data + * \returns 64 bits of data in the native byte order of the platform. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ReadBE64 + */ extern DECLSPEC Uint64 SDLCALL SDL_ReadLE64(SDL_RWops * src); + +/** + * Use this function to read 64 bits of big-endian data from an SDL_RWops and + * return in native format. + * + * SDL byteswaps the data only if necessary, so the data returned will be in + * the native byte order. + * + * \param src the stream from which to read data + * \returns 64 bits of data in the native byte order of the platform. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ReadLE64 + */ extern DECLSPEC Uint64 SDLCALL SDL_ReadBE64(SDL_RWops * src); /* @} *//* Read endian functions */ @@ -271,12 +723,124 @@ extern DECLSPEC Uint64 SDLCALL SDL_ReadBE64(SDL_RWops * src); * Write an item of native format to the specified endianness. */ /* @{ */ + +/** + * Use this function to write a byte to an SDL_RWops. + * + * \param dst the SDL_RWops to write to + * \param value the byte value to write + * \returns 1 on success or 0 on failure; call SDL_GetError() for more + * information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ReadU8 + */ extern DECLSPEC size_t SDLCALL SDL_WriteU8(SDL_RWops * dst, Uint8 value); + +/** + * Use this function to write 16 bits in native format to a SDL_RWops as + * little-endian data. + * + * SDL byteswaps the data only if necessary, so the application always + * specifies native format, and the data written will be in little-endian + * format. + * + * \param dst the stream to which data will be written + * \param value the data to be written, in native format + * \returns 1 on successful write, 0 on error. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_WriteBE16 + */ extern DECLSPEC size_t SDLCALL SDL_WriteLE16(SDL_RWops * dst, Uint16 value); + +/** + * Use this function to write 16 bits in native format to a SDL_RWops as + * big-endian data. + * + * SDL byteswaps the data only if necessary, so the application always + * specifies native format, and the data written will be in big-endian format. + * + * \param dst the stream to which data will be written + * \param value the data to be written, in native format + * \returns 1 on successful write, 0 on error. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_WriteLE16 + */ extern DECLSPEC size_t SDLCALL SDL_WriteBE16(SDL_RWops * dst, Uint16 value); + +/** + * Use this function to write 32 bits in native format to a SDL_RWops as + * little-endian data. + * + * SDL byteswaps the data only if necessary, so the application always + * specifies native format, and the data written will be in little-endian + * format. + * + * \param dst the stream to which data will be written + * \param value the data to be written, in native format + * \returns 1 on successful write, 0 on error. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_WriteBE32 + */ extern DECLSPEC size_t SDLCALL SDL_WriteLE32(SDL_RWops * dst, Uint32 value); + +/** + * Use this function to write 32 bits in native format to a SDL_RWops as + * big-endian data. + * + * SDL byteswaps the data only if necessary, so the application always + * specifies native format, and the data written will be in big-endian format. + * + * \param dst the stream to which data will be written + * \param value the data to be written, in native format + * \returns 1 on successful write, 0 on error. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_WriteLE32 + */ extern DECLSPEC size_t SDLCALL SDL_WriteBE32(SDL_RWops * dst, Uint32 value); + +/** + * Use this function to write 64 bits in native format to a SDL_RWops as + * little-endian data. + * + * SDL byteswaps the data only if necessary, so the application always + * specifies native format, and the data written will be in little-endian + * format. + * + * \param dst the stream to which data will be written + * \param value the data to be written, in native format + * \returns 1 on successful write, 0 on error. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_WriteBE64 + */ extern DECLSPEC size_t SDLCALL SDL_WriteLE64(SDL_RWops * dst, Uint64 value); + +/** + * Use this function to write 64 bits in native format to a SDL_RWops as + * big-endian data. + * + * SDL byteswaps the data only if necessary, so the application always + * specifies native format, and the data written will be in big-endian format. + * + * \param dst the stream to which data will be written + * \param value the data to be written, in native format + * \returns 1 on successful write, 0 on error. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_WriteLE64 + */ extern DECLSPEC size_t SDLCALL SDL_WriteBE64(SDL_RWops * dst, Uint64 value); /* @} *//* Write endian functions */ diff --git a/libs/SDL2/include/SDL_scancode.h b/libs/SDL2/include/SDL_scancode.h index a50305f55..5b2c67c8f 100644 --- a/libs/SDL2/include/SDL_scancode.h +++ b/libs/SDL2/include/SDL_scancode.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/include/SDL_sensor.h b/libs/SDL2/include/SDL_sensor.h index 966adbf21..a2f30e0f8 100644 --- a/libs/SDL2/include/SDL_sensor.h +++ b/libs/SDL2/include/SDL_sensor.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -78,14 +78,16 @@ typedef enum * Accelerometer sensor * * The accelerometer returns the current acceleration in SI meters per - * second squared. This includes gravity, so a device at rest will have - * an acceleration of SDL_STANDARD_GRAVITY straight down. + * second squared. This measurement includes the force of gravity, so + * a device at rest will have an value of SDL_STANDARD_GRAVITY away + * from the center of the earth. * * values[0]: Acceleration on the x axis * values[1]: Acceleration on the y axis * values[2]: Acceleration on the z axis * - * For phones held in portrait mode, the axes are defined as follows: + * For phones held in portrait mode and game controllers held in front of you, + * the axes are defined as follows: * -X ... +X : left ... right * -Y ... +Y : bottom ... top * -Z ... +Z : farther ... closer @@ -105,16 +107,17 @@ typedef enum * see positive rotation on that axis when it appeared to be rotating * counter-clockwise. * - * values[0]: Angular speed around the x axis - * values[1]: Angular speed around the y axis - * values[2]: Angular speed around the z axis + * values[0]: Angular speed around the x axis (pitch) + * values[1]: Angular speed around the y axis (yaw) + * values[2]: Angular speed around the z axis (roll) * - * For phones held in portrait mode, the axes are defined as follows: + * For phones held in portrait mode and game controllers held in front of you, + * the axes are defined as follows: * -X ... +X : left ... right * -Y ... +Y : bottom ... top * -Z ... +Z : farther ... closer * - * The axis data is not changed when the phone is rotated. + * The axis data is not changed when the phone or controller is rotated. * * \sa SDL_GetDisplayOrientation() */ @@ -122,118 +125,165 @@ typedef enum /* Function prototypes */ /** - * \brief Count the number of sensors attached to the system right now + * Locking for multi-threaded access to the sensor API + * + * If you are using the sensor API or handling events from multiple threads + * you should use these locking functions to protect access to the sensors. + * + * In particular, you are guaranteed that the sensor list won't change, so the + * API functions that take a sensor index will be valid, and sensor events + * will not be delivered. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC void SDLCALL SDL_LockSensors(void); +extern DECLSPEC void SDLCALL SDL_UnlockSensors(void); + +/** + * Count the number of sensors attached to the system right now. + * + * \returns the number of sensors detected. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC int SDLCALL SDL_NumSensors(void); /** - * \brief Get the implementation dependent name of a sensor. + * Get the implementation dependent name of a sensor. * - * This can be called before any sensors are opened. - * - * \return The sensor name, or NULL if device_index is out of range. + * \param device_index The sensor to obtain name from + * \returns the sensor name, or NULL if `device_index` is out of range. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC const char *SDLCALL SDL_SensorGetDeviceName(int device_index); /** - * \brief Get the type of a sensor. + * Get the type of a sensor. * - * This can be called before any sensors are opened. + * \param device_index The sensor to get the type from + * \returns the SDL_SensorType, or `SDL_SENSOR_INVALID` if `device_index` is + * out of range. * - * \return The sensor type, or SDL_SENSOR_INVALID if device_index is out of range. + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC SDL_SensorType SDLCALL SDL_SensorGetDeviceType(int device_index); /** - * \brief Get the platform dependent type of a sensor. + * Get the platform dependent type of a sensor. * - * This can be called before any sensors are opened. + * \param device_index The sensor to check + * \returns the sensor platform dependent type, or -1 if `device_index` is out + * of range. * - * \return The sensor platform dependent type, or -1 if device_index is out of range. + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC int SDLCALL SDL_SensorGetDeviceNonPortableType(int device_index); /** - * \brief Get the instance ID of a sensor. + * Get the instance ID of a sensor. * - * This can be called before any sensors are opened. + * \param device_index The sensor to get instance id from + * \returns the sensor instance ID, or -1 if `device_index` is out of range. * - * \return The sensor instance ID, or -1 if device_index is out of range. + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC SDL_SensorID SDLCALL SDL_SensorGetDeviceInstanceID(int device_index); /** - * \brief Open a sensor for use. + * Open a sensor for use. * - * The index passed as an argument refers to the N'th sensor on the system. + * \param device_index The sensor to open + * \returns an SDL_Sensor sensor object, or NULL if an error occurred. * - * \return A sensor identifier, or NULL if an error occurred. + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC SDL_Sensor *SDLCALL SDL_SensorOpen(int device_index); /** * Return the SDL_Sensor associated with an instance id. + * + * \param instance_id The sensor from instance id + * \returns an SDL_Sensor object. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC SDL_Sensor *SDLCALL SDL_SensorFromInstanceID(SDL_SensorID instance_id); /** - * \brief Get the implementation dependent name of a sensor. + * Get the implementation dependent name of a sensor * - * \return The sensor name, or NULL if the sensor is NULL. + * \param sensor The SDL_Sensor object + * \returns the sensor name, or NULL if `sensor` is NULL. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC const char *SDLCALL SDL_SensorGetName(SDL_Sensor *sensor); /** - * \brief Get the type of a sensor. + * Get the type of a sensor. * - * This can be called before any sensors are opened. + * \param sensor The SDL_Sensor object to inspect + * \returns the SDL_SensorType type, or `SDL_SENSOR_INVALID` if `sensor` is + * NULL. * - * \return The sensor type, or SDL_SENSOR_INVALID if the sensor is NULL. + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC SDL_SensorType SDLCALL SDL_SensorGetType(SDL_Sensor *sensor); /** - * \brief Get the platform dependent type of a sensor. + * Get the platform dependent type of a sensor. * - * This can be called before any sensors are opened. + * \param sensor The SDL_Sensor object to inspect + * \returns the sensor platform dependent type, or -1 if `sensor` is NULL. * - * \return The sensor platform dependent type, or -1 if the sensor is NULL. + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC int SDLCALL SDL_SensorGetNonPortableType(SDL_Sensor *sensor); /** - * \brief Get the instance ID of a sensor. + * Get the instance ID of a sensor. * - * This can be called before any sensors are opened. + * \param sensor The SDL_Sensor object to inspect + * \returns the sensor instance ID, or -1 if `sensor` is NULL. * - * \return The sensor instance ID, or -1 if the sensor is NULL. + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC SDL_SensorID SDLCALL SDL_SensorGetInstanceID(SDL_Sensor *sensor); /** - * Get the current state of an opened sensor. + * Get the current state of an opened sensor. * - * The number of values and interpretation of the data is sensor dependent. + * The number of values and interpretation of the data is sensor dependent. * - * \param sensor The sensor to query - * \param data A pointer filled with the current sensor state - * \param num_values The number of values to write to data + * \param sensor The SDL_Sensor object to query + * \param data A pointer filled with the current sensor state + * \param num_values The number of values to write to data + * \returns 0 or -1 if an error occurred. * - * \return 0 or -1 if an error occurred. + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC int SDLCALL SDL_SensorGetData(SDL_Sensor * sensor, float *data, int num_values); /** - * Close a sensor previously opened with SDL_SensorOpen() + * Close a sensor previously opened with SDL_SensorOpen(). + * + * \param sensor The SDL_Sensor object to close + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC void SDLCALL SDL_SensorClose(SDL_Sensor * sensor); /** - * Update the current state of the open sensors. + * Update the current state of the open sensors. * - * This is called automatically by the event loop if sensor events are enabled. + * This is called automatically by the event loop if sensor events are + * enabled. * - * This needs to be called from the thread that initialized the sensor subsystem. + * This needs to be called from the thread that initialized the sensor + * subsystem. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC void SDLCALL SDL_SensorUpdate(void); diff --git a/libs/SDL2/include/SDL_shape.h b/libs/SDL2/include/SDL_shape.h index 2ab43fcdc..1bca9270e 100644 --- a/libs/SDL2/include/SDL_shape.h +++ b/libs/SDL2/include/SDL_shape.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -44,33 +44,38 @@ extern "C" { #define SDL_WINDOW_LACKS_SHAPE -3 /** - * \brief Create a window that can be shaped with the specified position, dimensions, and flags. + * Create a window that can be shaped with the specified position, dimensions, + * and flags. * - * \param title The title of the window, in UTF-8 encoding. - * \param x The x position of the window, ::SDL_WINDOWPOS_CENTERED, or - * ::SDL_WINDOWPOS_UNDEFINED. - * \param y The y position of the window, ::SDL_WINDOWPOS_CENTERED, or - * ::SDL_WINDOWPOS_UNDEFINED. - * \param w The width of the window. - * \param h The height of the window. - * \param flags The flags for the window, a mask of SDL_WINDOW_BORDERLESS with any of the following: - * ::SDL_WINDOW_OPENGL, ::SDL_WINDOW_INPUT_GRABBED, - * ::SDL_WINDOW_HIDDEN, ::SDL_WINDOW_RESIZABLE, - * ::SDL_WINDOW_MAXIMIZED, ::SDL_WINDOW_MINIMIZED, - * ::SDL_WINDOW_BORDERLESS is always set, and ::SDL_WINDOW_FULLSCREEN is always unset. + * \param title The title of the window, in UTF-8 encoding. + * \param x The x position of the window, ::SDL_WINDOWPOS_CENTERED, or + * ::SDL_WINDOWPOS_UNDEFINED. + * \param y The y position of the window, ::SDL_WINDOWPOS_CENTERED, or + * ::SDL_WINDOWPOS_UNDEFINED. + * \param w The width of the window. + * \param h The height of the window. + * \param flags The flags for the window, a mask of SDL_WINDOW_BORDERLESS with + * any of the following: ::SDL_WINDOW_OPENGL, + * ::SDL_WINDOW_INPUT_GRABBED, ::SDL_WINDOW_HIDDEN, + * ::SDL_WINDOW_RESIZABLE, ::SDL_WINDOW_MAXIMIZED, + * ::SDL_WINDOW_MINIMIZED, ::SDL_WINDOW_BORDERLESS is always set, + * and ::SDL_WINDOW_FULLSCREEN is always unset. + * \return the window created, or NULL if window creation failed. * - * \return The window created, or NULL if window creation failed. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_DestroyWindow() + * \sa SDL_DestroyWindow */ extern DECLSPEC SDL_Window * SDLCALL SDL_CreateShapedWindow(const char *title,unsigned int x,unsigned int y,unsigned int w,unsigned int h,Uint32 flags); /** - * \brief Return whether the given window is a shaped window. + * Return whether the given window is a shaped window. * * \param window The window to query for being shaped. + * \return SDL_TRUE if the window is a window that can be shaped, SDL_FALSE if + * the window is unshaped or NULL. * - * \return SDL_TRUE if the window is a window that can be shaped, SDL_FALSE if the window is unshaped or NULL. + * \since This function is available since SDL 2.0.0. * * \sa SDL_CreateShapedWindow */ @@ -106,29 +111,35 @@ typedef struct SDL_WindowShapeMode { } SDL_WindowShapeMode; /** - * \brief Set the shape and parameters of a shaped window. + * Set the shape and parameters of a shaped window. * * \param window The shaped window whose parameters should be set. * \param shape A surface encoding the desired shape for the window. * \param shape_mode The parameters to set for the shaped window. + * \return 0 on success, SDL_INVALID_SHAPE_ARGUMENT on an invalid shape + * argument, or SDL_NONSHAPEABLE_WINDOW if the SDL_Window given does + * not reference a valid shaped window. * - * \return 0 on success, SDL_INVALID_SHAPE_ARGUMENT on an invalid shape argument, or SDL_NONSHAPEABLE_WINDOW - * if the SDL_Window given does not reference a valid shaped window. + * \since This function is available since SDL 2.0.0. * * \sa SDL_WindowShapeMode - * \sa SDL_GetShapedWindowMode. + * \sa SDL_GetShapedWindowMode */ extern DECLSPEC int SDLCALL SDL_SetWindowShape(SDL_Window *window,SDL_Surface *shape,SDL_WindowShapeMode *shape_mode); /** - * \brief Get the shape parameters of a shaped window. + * Get the shape parameters of a shaped window. * * \param window The shaped window whose parameters should be retrieved. - * \param shape_mode An empty shape-mode structure to fill, or NULL to check whether the window has a shape. + * \param shape_mode An empty shape-mode structure to fill, or NULL to check + * whether the window has a shape. + * \return 0 if the window has a shape and, provided shape_mode was not NULL, + * shape_mode has been filled with the mode data, + * SDL_NONSHAPEABLE_WINDOW if the SDL_Window given is not a shaped + * window, or SDL_WINDOW_LACKS_SHAPE if the SDL_Window given is a + * shapeable window currently lacking a shape. * - * \return 0 if the window has a shape and, provided shape_mode was not NULL, shape_mode has been filled with the mode - * data, SDL_NONSHAPEABLE_WINDOW if the SDL_Window given is not a shaped window, or SDL_WINDOW_LACKS_SHAPE if - * the SDL_Window given is a shapeable window currently lacking a shape. + * \since This function is available since SDL 2.0.0. * * \sa SDL_WindowShapeMode * \sa SDL_SetWindowShape diff --git a/libs/SDL2/include/SDL_stdinc.h b/libs/SDL2/include/SDL_stdinc.h index 28bb7b961..c0d194c4a 100644 --- a/libs/SDL2/include/SDL_stdinc.h +++ b/libs/SDL2/include/SDL_stdinc.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -30,6 +30,12 @@ #include "SDL_config.h" +#ifdef __APPLE__ +#ifndef _DARWIN_C_SOURCE +#define _DARWIN_C_SOURCE 1 /* for memset_pattern4() */ +#endif +#endif + #ifdef HAVE_SYS_TYPES_H #include #endif @@ -109,6 +115,17 @@ char *alloca(); # endif #endif +/** + * Check if the compiler supports a given builtin. + * Supported by virtually all clang versions and recent gcc. Use this + * instead of checking the clang version if possible. + */ +#ifdef __has_builtin +#define _SDL_HAS_BUILTIN(x) __has_builtin(x) +#else +#define _SDL_HAS_BUILTIN(x) 0 +#endif + /** * The number of elements in an array. */ @@ -217,7 +234,7 @@ typedef uint64_t Uint64; /* @} *//* Basic data types */ -/* Make sure we have macros for printing 64 bit values. +/* Make sure we have macros for printing width-based integers. * should define these but this is not true all platforms. * (for example win32) */ #ifndef SDL_PRIs64 @@ -264,6 +281,34 @@ typedef uint64_t Uint64; #define SDL_PRIX64 "llX" #endif #endif +#ifndef SDL_PRIs32 +#ifdef PRId32 +#define SDL_PRIs32 PRId32 +#else +#define SDL_PRIs32 "d" +#endif +#endif +#ifndef SDL_PRIu32 +#ifdef PRIu32 +#define SDL_PRIu32 PRIu32 +#else +#define SDL_PRIu32 "u" +#endif +#endif +#ifndef SDL_PRIx32 +#ifdef PRIx32 +#define SDL_PRIx32 PRIx32 +#else +#define SDL_PRIx32 "x" +#endif +#endif +#ifndef SDL_PRIX32 +#ifdef PRIX32 +#define SDL_PRIX32 PRIX32 +#else +#define SDL_PRIX32 "X" +#endif +#endif /* Annotations to help code analysis tools */ #ifdef SDL_DISABLE_ANALYZE_MACROS @@ -332,7 +377,7 @@ SDL_COMPILE_TIME_ASSERT(sint64, sizeof(Sint64) == 8); /** \cond */ #ifndef DOXYGEN_SHOULD_IGNORE_THIS -#if !defined(__ANDROID__) +#if !defined(__ANDROID__) && !defined(__VITA__) /* TODO: include/SDL_stdinc.h:174: error: size of array 'SDL_dummy_enum' is negative */ typedef enum { @@ -369,7 +414,9 @@ typedef void *(SDLCALL *SDL_realloc_func)(void *mem, size_t size); typedef void (SDLCALL *SDL_free_func)(void *mem); /** - * \brief Get the current set of SDL memory functions + * Get the current set of SDL memory functions + * + * \since This function is available since SDL 2.0.7. */ extern DECLSPEC void SDLCALL SDL_GetMemoryFunctions(SDL_malloc_func *malloc_func, SDL_calloc_func *calloc_func, @@ -377,12 +424,9 @@ extern DECLSPEC void SDLCALL SDL_GetMemoryFunctions(SDL_malloc_func *malloc_func SDL_free_func *free_func); /** - * \brief Replace SDL's memory allocation functions with a custom set + * Replace SDL's memory allocation functions with a custom set * - * \note If you are replacing SDL's memory functions, you should call - * SDL_GetNumAllocations() and be very careful if it returns non-zero. - * That means that your free function will be called with memory - * allocated by the previous memory allocation functions. + * \since This function is available since SDL 2.0.7. */ extern DECLSPEC int SDLCALL SDL_SetMemoryFunctions(SDL_malloc_func malloc_func, SDL_calloc_func calloc_func, @@ -390,7 +434,9 @@ extern DECLSPEC int SDLCALL SDL_SetMemoryFunctions(SDL_malloc_func malloc_func, SDL_free_func free_func); /** - * \brief Get the number of outstanding (unfreed) allocations + * Get the number of outstanding (unfreed) allocations + * + * \since This function is available since SDL 2.0.7. */ extern DECLSPEC int SDLCALL SDL_GetNumAllocations(void); @@ -401,25 +447,40 @@ extern DECLSPEC void SDLCALL SDL_qsort(void *base, size_t nmemb, size_t size, in extern DECLSPEC int SDLCALL SDL_abs(int x); -/* !!! FIXME: these have side effects. You probably shouldn't use them. */ -/* !!! FIXME: Maybe we do forceinline functions of SDL_mini, SDL_minf, etc? */ +/* NOTE: these double-evaluate their arguments, so you should never have side effects in the parameters */ #define SDL_min(x, y) (((x) < (y)) ? (x) : (y)) #define SDL_max(x, y) (((x) > (y)) ? (x) : (y)) +#define SDL_clamp(x, a, b) (((x) < (a)) ? (a) : (((x) > (b)) ? (b) : (x))) +extern DECLSPEC int SDLCALL SDL_isalpha(int x); +extern DECLSPEC int SDLCALL SDL_isalnum(int x); +extern DECLSPEC int SDLCALL SDL_isblank(int x); +extern DECLSPEC int SDLCALL SDL_iscntrl(int x); extern DECLSPEC int SDLCALL SDL_isdigit(int x); +extern DECLSPEC int SDLCALL SDL_isxdigit(int x); +extern DECLSPEC int SDLCALL SDL_ispunct(int x); extern DECLSPEC int SDLCALL SDL_isspace(int x); +extern DECLSPEC int SDLCALL SDL_isupper(int x); +extern DECLSPEC int SDLCALL SDL_islower(int x); +extern DECLSPEC int SDLCALL SDL_isprint(int x); +extern DECLSPEC int SDLCALL SDL_isgraph(int x); extern DECLSPEC int SDLCALL SDL_toupper(int x); extern DECLSPEC int SDLCALL SDL_tolower(int x); +extern DECLSPEC Uint32 SDLCALL SDL_crc32(Uint32 crc, const void *data, size_t len); + extern DECLSPEC void *SDLCALL SDL_memset(SDL_OUT_BYTECAP(len) void *dst, int c, size_t len); #define SDL_zero(x) SDL_memset(&(x), 0, sizeof((x))) #define SDL_zerop(x) SDL_memset((x), 0, sizeof(*(x))) +#define SDL_zeroa(x) SDL_memset((x), 0, sizeof((x))) /* Note that memset() is a byte assignment and this is a 32-bit assignment, so they're not directly equivalent. */ SDL_FORCE_INLINE void SDL_memset4(void *dst, Uint32 val, size_t dwords) { -#if defined(__GNUC__) && defined(i386) +#ifdef __APPLE__ + memset_pattern4(dst, &val, dwords * 4); +#elif defined(__GNUC__) && defined(__i386__) int u0, u1, u2; __asm__ __volatile__ ( "cld \n\t" @@ -432,14 +493,14 @@ SDL_FORCE_INLINE void SDL_memset4(void *dst, Uint32 val, size_t dwords) size_t _n = (dwords + 3) / 4; Uint32 *_p = SDL_static_cast(Uint32 *, dst); Uint32 _val = (val); - if (dwords == 0) + if (dwords == 0) { return; - switch (dwords % 4) - { - case 0: do { *_p++ = _val; /* fallthrough */ - case 3: *_p++ = _val; /* fallthrough */ - case 2: *_p++ = _val; /* fallthrough */ - case 1: *_p++ = _val; /* fallthrough */ + } + switch (dwords % 4) { + case 0: do { *_p++ = _val; SDL_FALLTHROUGH; + case 3: *_p++ = _val; SDL_FALLTHROUGH; + case 2: *_p++ = _val; SDL_FALLTHROUGH; + case 1: *_p++ = _val; } while ( --_n ); } #endif @@ -450,11 +511,16 @@ extern DECLSPEC void *SDLCALL SDL_memcpy(SDL_OUT_BYTECAP(len) void *dst, SDL_IN_ extern DECLSPEC void *SDLCALL SDL_memmove(SDL_OUT_BYTECAP(len) void *dst, SDL_IN_BYTECAP(len) const void *src, size_t len); extern DECLSPEC int SDLCALL SDL_memcmp(const void *s1, const void *s2, size_t len); -extern DECLSPEC wchar_t *SDLCALL SDL_wcsdup(const wchar_t *wstr); extern DECLSPEC size_t SDLCALL SDL_wcslen(const wchar_t *wstr); extern DECLSPEC size_t SDLCALL SDL_wcslcpy(SDL_OUT_Z_CAP(maxlen) wchar_t *dst, const wchar_t *src, size_t maxlen); extern DECLSPEC size_t SDLCALL SDL_wcslcat(SDL_INOUT_Z_CAP(maxlen) wchar_t *dst, const wchar_t *src, size_t maxlen); +extern DECLSPEC wchar_t *SDLCALL SDL_wcsdup(const wchar_t *wstr); +extern DECLSPEC wchar_t *SDLCALL SDL_wcsstr(const wchar_t *haystack, const wchar_t *needle); + extern DECLSPEC int SDLCALL SDL_wcscmp(const wchar_t *str1, const wchar_t *str2); +extern DECLSPEC int SDLCALL SDL_wcsncmp(const wchar_t *str1, const wchar_t *str2, size_t maxlen); +extern DECLSPEC int SDLCALL SDL_wcscasecmp(const wchar_t *str1, const wchar_t *str2); +extern DECLSPEC int SDLCALL SDL_wcsncasecmp(const wchar_t *str1, const wchar_t *str2, size_t len); extern DECLSPEC size_t SDLCALL SDL_strlen(const char *str); extern DECLSPEC size_t SDLCALL SDL_strlcpy(SDL_OUT_Z_CAP(maxlen) char *dst, const char *src, size_t maxlen); @@ -467,6 +533,7 @@ extern DECLSPEC char *SDLCALL SDL_strlwr(char *str); extern DECLSPEC char *SDLCALL SDL_strchr(const char *str, int c); extern DECLSPEC char *SDLCALL SDL_strrchr(const char *str, int c); extern DECLSPEC char *SDLCALL SDL_strstr(const char *haystack, const char *needle); +extern DECLSPEC char *SDLCALL SDL_strtokr(char *s1, const char *s2, char **saveptr); extern DECLSPEC size_t SDLCALL SDL_utf8strlen(const char *str); extern DECLSPEC char *SDLCALL SDL_itoa(int value, char *str, int radix); @@ -493,6 +560,8 @@ extern DECLSPEC int SDLCALL SDL_sscanf(const char *text, SDL_SCANF_FORMAT_STRING extern DECLSPEC int SDLCALL SDL_vsscanf(const char *text, const char *fmt, va_list ap); extern DECLSPEC int SDLCALL SDL_snprintf(SDL_OUT_Z_CAP(maxlen) char *text, size_t maxlen, SDL_PRINTF_FORMAT_STRING const char *fmt, ... ) SDL_PRINTF_VARARG_FUNC(3); extern DECLSPEC int SDLCALL SDL_vsnprintf(SDL_OUT_Z_CAP(maxlen) char *text, size_t maxlen, const char *fmt, va_list ap); +extern DECLSPEC int SDLCALL SDL_asprintf(char **strp, SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(2); +extern DECLSPEC int SDLCALL SDL_vasprintf(char **strp, const char *fmt, va_list ap); #ifndef HAVE_M_PI #ifndef M_PI @@ -500,14 +569,28 @@ extern DECLSPEC int SDLCALL SDL_vsnprintf(SDL_OUT_Z_CAP(maxlen) char *text, size #endif #endif +/** + * Use this function to compute arc cosine of `x`. + * + * The definition of `y = acos(x)` is `x = cos(y)`. + * + * Domain: `-1 <= x <= 1` + * + * Range: `0 <= y <= Pi` + * + * \param x floating point value, in radians. + * \returns arc cosine of `x`. + * + * \since This function is available since SDL 2.0.2. + */ extern DECLSPEC double SDLCALL SDL_acos(double x); extern DECLSPEC float SDLCALL SDL_acosf(float x); extern DECLSPEC double SDLCALL SDL_asin(double x); extern DECLSPEC float SDLCALL SDL_asinf(float x); extern DECLSPEC double SDLCALL SDL_atan(double x); extern DECLSPEC float SDLCALL SDL_atanf(float x); -extern DECLSPEC double SDLCALL SDL_atan2(double x, double y); -extern DECLSPEC float SDLCALL SDL_atan2f(float x, float y); +extern DECLSPEC double SDLCALL SDL_atan2(double y, double x); +extern DECLSPEC float SDLCALL SDL_atan2f(float y, float x); extern DECLSPEC double SDLCALL SDL_ceil(double x); extern DECLSPEC float SDLCALL SDL_ceilf(float x); extern DECLSPEC double SDLCALL SDL_copysign(double x, double y); @@ -520,6 +603,8 @@ extern DECLSPEC double SDLCALL SDL_fabs(double x); extern DECLSPEC float SDLCALL SDL_fabsf(float x); extern DECLSPEC double SDLCALL SDL_floor(double x); extern DECLSPEC float SDLCALL SDL_floorf(float x); +extern DECLSPEC double SDLCALL SDL_trunc(double x); +extern DECLSPEC float SDLCALL SDL_truncf(float x); extern DECLSPEC double SDLCALL SDL_fmod(double x, double y); extern DECLSPEC float SDLCALL SDL_fmodf(float x, float y); extern DECLSPEC double SDLCALL SDL_log(double x); @@ -528,6 +613,10 @@ extern DECLSPEC double SDLCALL SDL_log10(double x); extern DECLSPEC float SDLCALL SDL_log10f(float x); extern DECLSPEC double SDLCALL SDL_pow(double x, double y); extern DECLSPEC float SDLCALL SDL_powf(float x, float y); +extern DECLSPEC double SDLCALL SDL_round(double x); +extern DECLSPEC float SDLCALL SDL_roundf(float x); +extern DECLSPEC long SDLCALL SDL_lround(double x); +extern DECLSPEC long SDLCALL SDL_lroundf(float x); extern DECLSPEC double SDLCALL SDL_scalbn(double x, int n); extern DECLSPEC float SDLCALL SDL_scalbnf(float x, int n); extern DECLSPEC double SDLCALL SDL_sin(double x); @@ -551,9 +640,12 @@ extern DECLSPEC int SDLCALL SDL_iconv_close(SDL_iconv_t cd); extern DECLSPEC size_t SDLCALL SDL_iconv(SDL_iconv_t cd, const char **inbuf, size_t * inbytesleft, char **outbuf, size_t * outbytesleft); + /** - * This function converts a string between encodings in one pass, returning a - * string that must be freed with SDL_free() or NULL on error. + * This function converts a string between encodings in one pass, returning a + * string that must be freed with SDL_free() or NULL on error. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC char *SDLCALL SDL_iconv_string(const char *tocode, const char *fromcode, @@ -562,10 +654,22 @@ extern DECLSPEC char *SDLCALL SDL_iconv_string(const char *tocode, #define SDL_iconv_utf8_locale(S) SDL_iconv_string("", "UTF-8", S, SDL_strlen(S)+1) #define SDL_iconv_utf8_ucs2(S) (Uint16 *)SDL_iconv_string("UCS-2-INTERNAL", "UTF-8", S, SDL_strlen(S)+1) #define SDL_iconv_utf8_ucs4(S) (Uint32 *)SDL_iconv_string("UCS-4-INTERNAL", "UTF-8", S, SDL_strlen(S)+1) +#define SDL_iconv_wchar_utf8(S) SDL_iconv_string("UTF-8", "WCHAR_T", (char *)S, (SDL_wcslen(S)+1)*sizeof(wchar_t)) /* force builds using Clang's static analysis tools to use literal C runtime here, since there are possibly tests that are ineffective otherwise. */ #if defined(__clang_analyzer__) && !defined(SDL_DISABLE_ANALYZE_MACROS) + +/* The analyzer knows about strlcpy even when the system doesn't provide it */ +#ifndef HAVE_STRLCPY +size_t strlcpy(char* dst, const char* src, size_t size); +#endif + +/* The analyzer knows about strlcat even when the system doesn't provide it */ +#ifndef HAVE_STRLCAT +size_t strlcat(char* dst, const char* src, size_t size); +#endif + #define SDL_malloc malloc #define SDL_calloc calloc #define SDL_realloc realloc @@ -574,15 +678,23 @@ extern DECLSPEC char *SDLCALL SDL_iconv_string(const char *tocode, #define SDL_memcpy memcpy #define SDL_memmove memmove #define SDL_memcmp memcmp -#define SDL_strlen strlen #define SDL_strlcpy strlcpy #define SDL_strlcat strlcat +#define SDL_strlen strlen +#define SDL_wcslen wcslen +#define SDL_wcslcpy wcslcpy +#define SDL_wcslcat wcslcat #define SDL_strdup strdup +#define SDL_wcsdup wcsdup #define SDL_strchr strchr #define SDL_strrchr strrchr #define SDL_strstr strstr +#define SDL_wcsstr wcsstr +#define SDL_strtokr strtok_r #define SDL_strcmp strcmp +#define SDL_wcscmp wcscmp #define SDL_strncmp strncmp +#define SDL_wcsncmp wcsncmp #define SDL_strcasecmp strcasecmp #define SDL_strncasecmp strncasecmp #define SDL_sscanf sscanf diff --git a/libs/SDL2/include/SDL_surface.h b/libs/SDL2/include/SDL_surface.h index 51a128300..441237617 100644 --- a/libs/SDL2/include/SDL_surface.h +++ b/libs/SDL2/include/SDL_surface.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -80,7 +80,9 @@ typedef struct SDL_Surface /** information needed for surfaces requiring locks */ int locked; /**< Read-only */ - void *lock_data; /**< Read-only */ + + /** list of BlitMap that hold a reference to this surface */ + void *list_blitmap; /**< Private */ /** clipping information */ SDL_Rect clip_rect; /**< Read-only */ @@ -110,31 +112,108 @@ typedef enum } SDL_YUV_CONVERSION_MODE; /** - * Allocate and free an RGB surface. + * Allocate a new RGB surface. * - * If the depth is 4 or 8 bits, an empty palette is allocated for the surface. - * If the depth is greater than 8 bits, the pixel format is set using the - * flags '[RGB]mask'. + * If `depth` is 4 or 8 bits, an empty palette is allocated for the surface. + * If `depth` is greater than 8 bits, the pixel format is set using the + * [RGBA]mask parameters. * - * If the function runs out of memory, it will return NULL. + * The [RGBA]mask parameters are the bitmasks used to extract that color from + * a pixel. For instance, `Rmask` being 0xFF000000 means the red data is + * stored in the most significant byte. Using zeros for the RGB masks sets a + * default value, based on the depth. For example: * - * \param flags The \c flags are obsolete and should be set to 0. - * \param width The width in pixels of the surface to create. - * \param height The height in pixels of the surface to create. - * \param depth The depth in bits of the surface to create. - * \param Rmask The red mask of the surface to create. - * \param Gmask The green mask of the surface to create. - * \param Bmask The blue mask of the surface to create. - * \param Amask The alpha mask of the surface to create. + * ```c++ + * SDL_CreateRGBSurface(0,w,h,32,0,0,0,0); + * ``` + * + * However, using zero for the Amask results in an Amask of 0. + * + * By default surfaces with an alpha mask are set up for blending as with: + * + * ```c++ + * SDL_SetSurfaceBlendMode(surface, SDL_BLENDMODE_BLEND) + * ``` + * + * You can change this by calling SDL_SetSurfaceBlendMode() and selecting a + * different `blendMode`. + * + * \param flags the flags are unused and should be set to 0 + * \param width the width of the surface + * \param height the height of the surface + * \param depth the depth of the surface in bits + * \param Rmask the red mask for the pixels + * \param Gmask the green mask for the pixels + * \param Bmask the blue mask for the pixels + * \param Amask the alpha mask for the pixels + * \returns the new SDL_Surface structure that is created or NULL if it fails; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateRGBSurfaceFrom + * \sa SDL_CreateRGBSurfaceWithFormat + * \sa SDL_FreeSurface */ extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurface (Uint32 flags, int width, int height, int depth, Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask); + /* !!! FIXME for 2.1: why does this ask for depth? Format provides that. */ + +/** + * Allocate a new RGB surface with a specific pixel format. + * + * This function operates mostly like SDL_CreateRGBSurface(), except instead + * of providing pixel color masks, you provide it with a predefined format + * from SDL_PixelFormatEnum. + * + * \param flags the flags are unused and should be set to 0 + * \param width the width of the surface + * \param height the height of the surface + * \param depth the depth of the surface in bits + * \param format the SDL_PixelFormatEnum for the new surface's pixel format. + * \returns the new SDL_Surface structure that is created or NULL if it fails; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.5. + * + * \sa SDL_CreateRGBSurface + * \sa SDL_CreateRGBSurfaceFrom + * \sa SDL_FreeSurface + */ extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurfaceWithFormat (Uint32 flags, int width, int height, int depth, Uint32 format); +/** + * Allocate a new RGB surface with existing pixel data. + * + * This function operates mostly like SDL_CreateRGBSurface(), except it does + * not allocate memory for the pixel data, instead the caller provides an + * existing buffer of data for the surface to use. + * + * No copy is made of the pixel data. Pixel data is not managed automatically; + * you must free the surface before you free the pixel data. + * + * \param pixels a pointer to existing pixel data + * \param width the width of the surface + * \param height the height of the surface + * \param depth the depth of the surface in bits + * \param pitch the pitch of the surface in bytes + * \param Rmask the red mask for the pixels + * \param Gmask the green mask for the pixels + * \param Bmask the blue mask for the pixels + * \param Amask the alpha mask for the pixels + * \returns the new SDL_Surface structure that is created or NULL if it fails; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateRGBSurface + * \sa SDL_CreateRGBSurfaceWithFormat + * \sa SDL_FreeSurface + */ extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurfaceFrom(void *pixels, int width, int height, @@ -144,74 +223,154 @@ extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurfaceFrom(void *pixels, Uint32 Gmask, Uint32 Bmask, Uint32 Amask); + +/* !!! FIXME for 2.1: why does this ask for depth? Format provides that. */ + +/** + * Allocate a new RGB surface with with a specific pixel format and existing + * pixel data. + * + * This function operates mostly like SDL_CreateRGBSurfaceFrom(), except + * instead of providing pixel color masks, you provide it with a predefined + * format from SDL_PixelFormatEnum. + * + * No copy is made of the pixel data. Pixel data is not managed automatically; + * you must free the surface before you free the pixel data. + * + * \param pixels a pointer to existing pixel data + * \param width the width of the surface + * \param height the height of the surface + * \param depth the depth of the surface in bits + * \param pitch the pitch of the surface in bytes + * \param format the SDL_PixelFormatEnum for the new surface's pixel format. + * \returns the new SDL_Surface structure that is created or NULL if it fails; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.5. + * + * \sa SDL_CreateRGBSurfaceFrom + * \sa SDL_CreateRGBSurfaceWithFormat + * \sa SDL_FreeSurface + */ extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurfaceWithFormatFrom (void *pixels, int width, int height, int depth, int pitch, Uint32 format); + +/** + * Free an RGB surface. + * + * It is safe to pass NULL to this function. + * + * \param surface the SDL_Surface to free. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateRGBSurface + * \sa SDL_CreateRGBSurfaceFrom + * \sa SDL_LoadBMP + * \sa SDL_LoadBMP_RW + */ extern DECLSPEC void SDLCALL SDL_FreeSurface(SDL_Surface * surface); /** - * \brief Set the palette used by a surface. + * Set the palette used by a surface. * - * \return 0, or -1 if the surface format doesn't use a palette. + * A single palette can be shared with many surfaces. * - * \note A single palette can be shared with many surfaces. + * \param surface the SDL_Surface structure to update + * \param palette the SDL_Palette structure to use + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC int SDLCALL SDL_SetSurfacePalette(SDL_Surface * surface, SDL_Palette * palette); /** - * \brief Sets up a surface for directly accessing the pixels. + * Set up a surface for directly accessing the pixels. * - * Between calls to SDL_LockSurface() / SDL_UnlockSurface(), you can write - * to and read from \c surface->pixels, using the pixel format stored in - * \c surface->format. Once you are done accessing the surface, you should - * use SDL_UnlockSurface() to release it. + * Between calls to SDL_LockSurface() / SDL_UnlockSurface(), you can write to + * and read from `surface->pixels`, using the pixel format stored in + * `surface->format`. Once you are done accessing the surface, you should use + * SDL_UnlockSurface() to release it. * - * Not all surfaces require locking. If SDL_MUSTLOCK(surface) evaluates - * to 0, then you can read and write to the surface at any time, and the - * pixel format of the surface will not change. + * Not all surfaces require locking. If `SDL_MUSTLOCK(surface)` evaluates to + * 0, then you can read and write to the surface at any time, and the pixel + * format of the surface will not change. * - * No operating system or library calls should be made between lock/unlock - * pairs, as critical system locks may be held during this time. + * \param surface the SDL_Surface structure to be locked + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * SDL_LockSurface() returns 0, or -1 if the surface couldn't be locked. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_UnlockSurface() + * \sa SDL_MUSTLOCK + * \sa SDL_UnlockSurface */ extern DECLSPEC int SDLCALL SDL_LockSurface(SDL_Surface * surface); -/** \sa SDL_LockSurface() */ + +/** + * Release a surface after directly accessing the pixels. + * + * \param surface the SDL_Surface structure to be unlocked + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LockSurface + */ extern DECLSPEC void SDLCALL SDL_UnlockSurface(SDL_Surface * surface); /** - * Load a surface from a seekable SDL data stream (memory or file). + * Load a BMP image from a seekable SDL data stream. * - * If \c freesrc is non-zero, the stream will be closed after being read. + * The new surface should be freed with SDL_FreeSurface(). Not doing so will + * result in a memory leak. * - * The new surface should be freed with SDL_FreeSurface(). + * src is an open SDL_RWops buffer, typically loaded with SDL_RWFromFile. + * Alternitavely, you might also use the macro SDL_LoadBMP to load a bitmap + * from a file, convert it to an SDL_Surface and then close the file. * - * \return the new surface, or NULL if there was an error. + * \param src the data stream for the surface + * \param freesrc non-zero to close the stream after being read + * \returns a pointer to a new SDL_Surface structure or NULL if there was an + * error; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_FreeSurface + * \sa SDL_RWFromFile + * \sa SDL_LoadBMP + * \sa SDL_SaveBMP_RW */ extern DECLSPEC SDL_Surface *SDLCALL SDL_LoadBMP_RW(SDL_RWops * src, int freesrc); /** - * Load a surface from a file. + * Load a surface from a file. * - * Convenience macro. + * Convenience macro. */ #define SDL_LoadBMP(file) SDL_LoadBMP_RW(SDL_RWFromFile(file, "rb"), 1) /** - * Save a surface to a seekable SDL data stream (memory or file). + * Save a surface to a seekable SDL data stream in BMP format. * - * Surfaces with a 24-bit, 32-bit and paletted 8-bit format get saved in the - * BMP directly. Other RGB formats with 8-bit or higher get converted to a - * 24-bit surface or, if they have an alpha mask or a colorkey, to a 32-bit - * surface before they are saved. YUV and paletted 1-bit and 4-bit formats are - * not supported. + * Surfaces with a 24-bit, 32-bit and paletted 8-bit format get saved in the + * BMP directly. Other RGB formats with 8-bit or higher get converted to a + * 24-bit surface or, if they have an alpha mask or a colorkey, to a 32-bit + * surface before they are saved. YUV and paletted 1-bit and 4-bit formats are + * not supported. * - * If \c freedst is non-zero, the stream will be closed after being written. + * \param surface the SDL_Surface structure containing the image to be saved + * \param dst a data stream to save to + * \param freedst non-zero to close the stream after being written + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 if successful or -1 if there was an error. + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LoadBMP_RW + * \sa SDL_SaveBMP */ extern DECLSPEC int SDLCALL SDL_SaveBMP_RW (SDL_Surface * surface, SDL_RWops * dst, int freedst); @@ -225,183 +384,335 @@ extern DECLSPEC int SDLCALL SDL_SaveBMP_RW SDL_SaveBMP_RW(surface, SDL_RWFromFile(file, "wb"), 1) /** - * \brief Sets the RLE acceleration hint for a surface. + * Set the RLE acceleration hint for a surface. * - * \return 0 on success, or -1 if the surface is not valid + * If RLE is enabled, color key and alpha blending blits are much faster, but + * the surface must be locked before directly accessing the pixels. * - * \note If RLE is enabled, colorkey and alpha blending blits are much faster, - * but the surface must be locked before directly accessing the pixels. + * \param surface the SDL_Surface structure to optimize + * \param flag 0 to disable, non-zero to enable RLE acceleration + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_BlitSurface + * \sa SDL_LockSurface + * \sa SDL_UnlockSurface */ extern DECLSPEC int SDLCALL SDL_SetSurfaceRLE(SDL_Surface * surface, int flag); /** - * \brief Sets the color key (transparent pixel) in a blittable surface. + * Returns whether the surface is RLE enabled * - * \param surface The surface to update - * \param flag Non-zero to enable colorkey and 0 to disable colorkey - * \param key The transparent pixel in the native surface format + * It is safe to pass a NULL `surface` here; it will return SDL_FALSE. * - * \return 0 on success, or -1 if the surface is not valid + * \param surface the SDL_Surface structure to query + * \returns SDL_TRUE if the surface is RLE enabled, SDL_FALSE otherwise. * - * You can pass SDL_RLEACCEL to enable RLE accelerated blits. + * \since This function is available since SDL 2.0.14. + * + * \sa SDL_SetSurfaceRLE + */ +extern DECLSPEC SDL_bool SDLCALL SDL_HasSurfaceRLE(SDL_Surface * surface); + +/** + * Set the color key (transparent pixel) in a surface. + * + * The color key defines a pixel value that will be treated as transparent in + * a blit. For example, one can use this to specify that cyan pixels should be + * considered transparent, and therefore not rendered. + * + * It is a pixel of the format used by the surface, as generated by + * SDL_MapRGB(). + * + * RLE acceleration can substantially speed up blitting of images with large + * horizontal runs of transparent pixels. See SDL_SetSurfaceRLE() for details. + * + * \param surface the SDL_Surface structure to update + * \param flag SDL_TRUE to enable color key, SDL_FALSE to disable color key + * \param key the transparent pixel + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_BlitSurface + * \sa SDL_GetColorKey */ extern DECLSPEC int SDLCALL SDL_SetColorKey(SDL_Surface * surface, int flag, Uint32 key); /** - * \brief Returns whether the surface has a color key + * Returns whether the surface has a color key * - * \return SDL_TRUE if the surface has a color key, or SDL_FALSE if the surface is NULL or has no color key + * It is safe to pass a NULL `surface` here; it will return SDL_FALSE. + * + * \param surface the SDL_Surface structure to query + * \return SDL_TRUE if the surface has a color key, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.9. + * + * \sa SDL_SetColorKey + * \sa SDL_GetColorKey */ extern DECLSPEC SDL_bool SDLCALL SDL_HasColorKey(SDL_Surface * surface); /** - * \brief Gets the color key (transparent pixel) in a blittable surface. + * Get the color key (transparent pixel) for a surface. * - * \param surface The surface to update - * \param key A pointer filled in with the transparent pixel in the native - * surface format + * The color key is a pixel of the format used by the surface, as generated by + * SDL_MapRGB(). * - * \return 0 on success, or -1 if the surface is not valid or colorkey is not - * enabled. + * If the surface doesn't have color key enabled this function returns -1. + * + * \param surface the SDL_Surface structure to query + * \param key a pointer filled in with the transparent pixel + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_BlitSurface + * \sa SDL_SetColorKey */ extern DECLSPEC int SDLCALL SDL_GetColorKey(SDL_Surface * surface, Uint32 * key); /** - * \brief Set an additional color value used in blit operations. + * Set an additional color value multiplied into blit operations. * - * \param surface The surface to update. - * \param r The red color value multiplied into blit operations. - * \param g The green color value multiplied into blit operations. - * \param b The blue color value multiplied into blit operations. + * When this surface is blitted, during the blit operation each source color + * channel is modulated by the appropriate color value according to the + * following formula: * - * \return 0 on success, or -1 if the surface is not valid. + * `srcC = srcC * (color / 255)` * - * \sa SDL_GetSurfaceColorMod() + * \param surface the SDL_Surface structure to update + * \param r the red color value multiplied into blit operations + * \param g the green color value multiplied into blit operations + * \param b the blue color value multiplied into blit operations + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetSurfaceColorMod + * \sa SDL_SetSurfaceAlphaMod */ extern DECLSPEC int SDLCALL SDL_SetSurfaceColorMod(SDL_Surface * surface, Uint8 r, Uint8 g, Uint8 b); /** - * \brief Get the additional color value used in blit operations. + * Get the additional color value multiplied into blit operations. * - * \param surface The surface to query. - * \param r A pointer filled in with the current red color value. - * \param g A pointer filled in with the current green color value. - * \param b A pointer filled in with the current blue color value. + * \param surface the SDL_Surface structure to query + * \param r a pointer filled in with the current red color value + * \param g a pointer filled in with the current green color value + * \param b a pointer filled in with the current blue color value + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 if the surface is not valid. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_SetSurfaceColorMod() + * \sa SDL_GetSurfaceAlphaMod + * \sa SDL_SetSurfaceColorMod */ extern DECLSPEC int SDLCALL SDL_GetSurfaceColorMod(SDL_Surface * surface, Uint8 * r, Uint8 * g, Uint8 * b); /** - * \brief Set an additional alpha value used in blit operations. + * Set an additional alpha value used in blit operations. * - * \param surface The surface to update. - * \param alpha The alpha value multiplied into blit operations. + * When this surface is blitted, during the blit operation the source alpha + * value is modulated by this alpha value according to the following formula: * - * \return 0 on success, or -1 if the surface is not valid. + * `srcA = srcA * (alpha / 255)` * - * \sa SDL_GetSurfaceAlphaMod() + * \param surface the SDL_Surface structure to update + * \param alpha the alpha value multiplied into blit operations + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetSurfaceAlphaMod + * \sa SDL_SetSurfaceColorMod */ extern DECLSPEC int SDLCALL SDL_SetSurfaceAlphaMod(SDL_Surface * surface, Uint8 alpha); /** - * \brief Get the additional alpha value used in blit operations. + * Get the additional alpha value used in blit operations. * - * \param surface The surface to query. - * \param alpha A pointer filled in with the current alpha value. + * \param surface the SDL_Surface structure to query + * \param alpha a pointer filled in with the current alpha value + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 if the surface is not valid. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_SetSurfaceAlphaMod() + * \sa SDL_GetSurfaceColorMod + * \sa SDL_SetSurfaceAlphaMod */ extern DECLSPEC int SDLCALL SDL_GetSurfaceAlphaMod(SDL_Surface * surface, Uint8 * alpha); /** - * \brief Set the blend mode used for blit operations. + * Set the blend mode used for blit operations. * - * \param surface The surface to update. - * \param blendMode ::SDL_BlendMode to use for blit blending. + * To copy a surface to another surface (or texture) without blending with the + * existing data, the blendmode of the SOURCE surface should be set to + * `SDL_BLENDMODE_NONE`. * - * \return 0 on success, or -1 if the parameters are not valid. + * \param surface the SDL_Surface structure to update + * \param blendMode the SDL_BlendMode to use for blit blending + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_GetSurfaceBlendMode() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetSurfaceBlendMode */ extern DECLSPEC int SDLCALL SDL_SetSurfaceBlendMode(SDL_Surface * surface, SDL_BlendMode blendMode); /** - * \brief Get the blend mode used for blit operations. + * Get the blend mode used for blit operations. * - * \param surface The surface to query. - * \param blendMode A pointer filled in with the current blend mode. + * \param surface the SDL_Surface structure to query + * \param blendMode a pointer filled in with the current SDL_BlendMode + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 if the surface is not valid. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_SetSurfaceBlendMode() + * \sa SDL_SetSurfaceBlendMode */ extern DECLSPEC int SDLCALL SDL_GetSurfaceBlendMode(SDL_Surface * surface, SDL_BlendMode *blendMode); /** - * Sets the clipping rectangle for the destination surface in a blit. + * Set the clipping rectangle for a surface. * - * If the clip rectangle is NULL, clipping will be disabled. + * When `surface` is the destination of a blit, only the area within the clip + * rectangle is drawn into. * - * If the clip rectangle doesn't intersect the surface, the function will - * return SDL_FALSE and blits will be completely clipped. Otherwise the - * function returns SDL_TRUE and blits to the surface will be clipped to - * the intersection of the surface area and the clipping rectangle. + * Note that blits are automatically clipped to the edges of the source and + * destination surfaces. * - * Note that blits are automatically clipped to the edges of the source - * and destination surfaces. + * \param surface the SDL_Surface structure to be clipped + * \param rect the SDL_Rect structure representing the clipping rectangle, or + * NULL to disable clipping + * \returns SDL_TRUE if the rectangle intersects the surface, otherwise + * SDL_FALSE and blits will be completely clipped. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_BlitSurface + * \sa SDL_GetClipRect */ extern DECLSPEC SDL_bool SDLCALL SDL_SetClipRect(SDL_Surface * surface, const SDL_Rect * rect); /** - * Gets the clipping rectangle for the destination surface in a blit. + * Get the clipping rectangle for a surface. * - * \c rect must be a pointer to a valid rectangle which will be filled - * with the correct values. + * When `surface` is the destination of a blit, only the area within the clip + * rectangle is drawn into. + * + * \param surface the SDL_Surface structure representing the surface to be + * clipped + * \param rect an SDL_Rect structure filled in with the clipping rectangle for + * the surface + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_BlitSurface + * \sa SDL_SetClipRect */ extern DECLSPEC void SDLCALL SDL_GetClipRect(SDL_Surface * surface, SDL_Rect * rect); /* - * Creates a new surface identical to the existing surface + * Creates a new surface identical to the existing surface. + * + * The returned surface should be freed with SDL_FreeSurface(). + * + * \param surface the surface to duplicate. + * \returns a copy of the surface, or NULL on failure; call SDL_GetError() for + * more information. */ extern DECLSPEC SDL_Surface *SDLCALL SDL_DuplicateSurface(SDL_Surface * surface); /** - * Creates a new surface of the specified format, and then copies and maps - * the given surface to it so the blit of the converted surface will be as - * fast as possible. If this function fails, it returns NULL. + * Copy an existing surface to a new surface of the specified format. * - * The \c flags parameter is passed to SDL_CreateRGBSurface() and has those - * semantics. You can also pass ::SDL_RLEACCEL in the flags parameter and - * SDL will try to RLE accelerate colorkey and alpha blits in the resulting - * surface. + * This function is used to optimize images for faster *repeat* blitting. This + * is accomplished by converting the original and storing the result as a new + * surface. The new, optimized surface can then be used as the source for + * future blits, making them faster. + * + * \param src the existing SDL_Surface structure to convert + * \param fmt the SDL_PixelFormat structure that the new surface is optimized + * for + * \param flags the flags are unused and should be set to 0; this is a + * leftover from SDL 1.2's API + * \returns the new SDL_Surface structure that is created or NULL if it fails; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AllocFormat + * \sa SDL_ConvertSurfaceFormat + * \sa SDL_CreateRGBSurface */ extern DECLSPEC SDL_Surface *SDLCALL SDL_ConvertSurface (SDL_Surface * src, const SDL_PixelFormat * fmt, Uint32 flags); + +/** + * Copy an existing surface to a new surface of the specified format enum. + * + * This function operates just like SDL_ConvertSurface(), but accepts an + * SDL_PixelFormatEnum value instead of an SDL_PixelFormat structure. As such, + * it might be easier to call but it doesn't have access to palette + * information for the destination surface, in case that would be important. + * + * \param src the existing SDL_Surface structure to convert + * \param pixel_format the SDL_PixelFormatEnum that the new surface is + * optimized for + * \param flags the flags are unused and should be set to 0; this is a + * leftover from SDL 1.2's API + * \returns the new SDL_Surface structure that is created or NULL if it fails; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AllocFormat + * \sa SDL_ConvertSurface + * \sa SDL_CreateRGBSurface + */ extern DECLSPEC SDL_Surface *SDLCALL SDL_ConvertSurfaceFormat (SDL_Surface * src, Uint32 pixel_format, Uint32 flags); /** - * \brief Copy a block of pixels of one format to another format + * Copy a block of pixels of one format to another format. * - * \return 0 on success, or -1 if there was an error + * \param width the width of the block to copy, in pixels + * \param height the height of the block to copy, in pixels + * \param src_format an SDL_PixelFormatEnum value of the `src` pixels format + * \param src a pointer to the source pixels + * \param src_pitch the pitch of the source pixels, in bytes + * \param dst_format an SDL_PixelFormatEnum value of the `dst` pixels format + * \param dst a pointer to be filled in with new pixel data + * \param dst_pitch the pitch of the destination pixels, in bytes + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC int SDLCALL SDL_ConvertPixels(int width, int height, Uint32 src_format, @@ -410,20 +721,84 @@ extern DECLSPEC int SDLCALL SDL_ConvertPixels(int width, int height, void * dst, int dst_pitch); /** - * Performs a fast fill of the given rectangle with \c color. + * Premultiply the alpha on a block of pixels. * - * If \c rect is NULL, the whole surface will be filled with \c color. + * This is safe to use with src == dst, but not for other overlapping areas. * - * The color should be a pixel of the format used by the surface, and - * can be generated by the SDL_MapRGB() function. + * This function is currently only implemented for SDL_PIXELFORMAT_ARGB8888. * - * \return 0 on success, or -1 on error. + * \param width the width of the block to convert, in pixels + * \param height the height of the block to convert, in pixels + * \param src_format an SDL_PixelFormatEnum value of the `src` pixels format + * \param src a pointer to the source pixels + * \param src_pitch the pitch of the source pixels, in bytes + * \param dst_format an SDL_PixelFormatEnum value of the `dst` pixels format + * \param dst a pointer to be filled in with premultiplied pixel data + * \param dst_pitch the pitch of the destination pixels, in bytes + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_PremultiplyAlpha(int width, int height, + Uint32 src_format, + const void * src, int src_pitch, + Uint32 dst_format, + void * dst, int dst_pitch); + +/** + * Perform a fast fill of a rectangle with a specific color. + * + * `color` should be a pixel of the format used by the surface, and can be + * generated by SDL_MapRGB() or SDL_MapRGBA(). If the color value contains an + * alpha component then the destination is simply filled with that alpha + * information, no blending takes place. + * + * If there is a clip rectangle set on the destination (set via + * SDL_SetClipRect()), then this function will fill based on the intersection + * of the clip rectangle and `rect`. + * + * \param dst the SDL_Surface structure that is the drawing target + * \param rect the SDL_Rect structure representing the rectangle to fill, or + * NULL to fill the entire surface + * \param color the color to fill with + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_FillRects */ extern DECLSPEC int SDLCALL SDL_FillRect (SDL_Surface * dst, const SDL_Rect * rect, Uint32 color); + +/** + * Perform a fast fill of a set of rectangles with a specific color. + * + * `color` should be a pixel of the format used by the surface, and can be + * generated by SDL_MapRGB() or SDL_MapRGBA(). If the color value contains an + * alpha component then the destination is simply filled with that alpha + * information, no blending takes place. + * + * If there is a clip rectangle set on the destination (set via + * SDL_SetClipRect()), then this function will fill based on the intersection + * of the clip rectangle and `rect`. + * + * \param dst the SDL_Surface structure that is the drawing target + * \param rects an array of SDL_Rects representing the rectangles to fill. + * \param count the number of rectangles in the array + * \param color the color to fill with + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_FillRect + */ extern DECLSPEC int SDLCALL SDL_FillRects (SDL_Surface * dst, const SDL_Rect * rects, int count, Uint32 color); +/* !!! FIXME: merge this documentation with the wiki */ /** * Performs a fast blit from the source surface to the destination surface. * @@ -432,7 +807,7 @@ extern DECLSPEC int SDLCALL SDL_FillRects * surface (\c src or \c dst) is copied. The final blit rectangles are saved * in \c srcrect and \c dstrect after all clipping is performed. * - * \return If the blit is successful, it returns 0, otherwise it returns -1. + * \returns 0 if the blit is successful, otherwise it returns -1. * * The blit function should not be called on a locked surface. * @@ -484,62 +859,128 @@ extern DECLSPEC int SDLCALL SDL_FillRects #define SDL_BlitSurface SDL_UpperBlit /** - * This is the public blit function, SDL_BlitSurface(), and it performs - * rectangle validation and clipping before passing it to SDL_LowerBlit() + * Perform a fast blit from the source surface to the destination surface. + * + * SDL_UpperBlit() has been replaced by SDL_BlitSurface(), which is merely a + * macro for this function with a less confusing name. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_BlitSurface */ extern DECLSPEC int SDLCALL SDL_UpperBlit (SDL_Surface * src, const SDL_Rect * srcrect, SDL_Surface * dst, SDL_Rect * dstrect); /** - * This is a semi-private blit function and it performs low-level surface - * blitting only. + * Perform low-level surface blitting only. + * + * This is a semi-private blit function and it performs low-level surface + * blitting, assuming the input rectangles have already been clipped. + * + * Unless you know what you're doing, you should be using SDL_BlitSurface() + * instead. + * + * \param src the SDL_Surface structure to be copied from + * \param srcrect the SDL_Rect structure representing the rectangle to be + * copied, or NULL to copy the entire surface + * \param dst the SDL_Surface structure that is the blit target + * \param dstrect the SDL_Rect structure representing the rectangle that is + * copied into + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_BlitSurface */ extern DECLSPEC int SDLCALL SDL_LowerBlit (SDL_Surface * src, SDL_Rect * srcrect, SDL_Surface * dst, SDL_Rect * dstrect); + /** - * \brief Perform a fast, low quality, stretch blit between two surfaces of the - * same pixel format. + * Perform a fast, low quality, stretch blit between two surfaces of the same + * format. * - * \note This function uses a static buffer, and is not thread-safe. + * Please use SDL_BlitScaled() instead. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC int SDLCALL SDL_SoftStretch(SDL_Surface * src, const SDL_Rect * srcrect, SDL_Surface * dst, const SDL_Rect * dstrect); +/** + * Perform bilinear scaling between two surfaces of the same format, 32BPP. + * + * \since This function is available since SDL 2.0.16. + */ +extern DECLSPEC int SDLCALL SDL_SoftStretchLinear(SDL_Surface * src, + const SDL_Rect * srcrect, + SDL_Surface * dst, + const SDL_Rect * dstrect); + + #define SDL_BlitScaled SDL_UpperBlitScaled /** - * This is the public scaled blit function, SDL_BlitScaled(), and it performs - * rectangle validation and clipping before passing it to SDL_LowerBlitScaled() + * Perform a scaled surface copy to a destination surface. + * + * SDL_UpperBlitScaled() has been replaced by SDL_BlitScaled(), which is + * merely a macro for this function with a less confusing name. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_BlitScaled */ extern DECLSPEC int SDLCALL SDL_UpperBlitScaled (SDL_Surface * src, const SDL_Rect * srcrect, SDL_Surface * dst, SDL_Rect * dstrect); /** - * This is a semi-private blit function and it performs low-level surface - * scaled blitting only. + * Perform low-level surface scaled blitting only. + * + * This is a semi-private function and it performs low-level surface blitting, + * assuming the input rectangles have already been clipped. + * + * \param src the SDL_Surface structure to be copied from + * \param srcrect the SDL_Rect structure representing the rectangle to be + * copied + * \param dst the SDL_Surface structure that is the blit target + * \param dstrect the SDL_Rect structure representing the rectangle that is + * copied into + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_BlitScaled */ extern DECLSPEC int SDLCALL SDL_LowerBlitScaled (SDL_Surface * src, SDL_Rect * srcrect, SDL_Surface * dst, SDL_Rect * dstrect); /** - * \brief Set the YUV conversion mode + * Set the YUV conversion mode + * + * \since This function is available since SDL 2.0.8. */ extern DECLSPEC void SDLCALL SDL_SetYUVConversionMode(SDL_YUV_CONVERSION_MODE mode); /** - * \brief Get the YUV conversion mode + * Get the YUV conversion mode + * + * \since This function is available since SDL 2.0.8. */ extern DECLSPEC SDL_YUV_CONVERSION_MODE SDLCALL SDL_GetYUVConversionMode(void); /** - * \brief Get the YUV conversion mode, returning the correct mode for the resolution when the current conversion mode is SDL_YUV_CONVERSION_AUTOMATIC + * Get the YUV conversion mode, returning the correct mode for the resolution + * when the current conversion mode is SDL_YUV_CONVERSION_AUTOMATIC + * + * \since This function is available since SDL 2.0.8. */ extern DECLSPEC SDL_YUV_CONVERSION_MODE SDLCALL SDL_GetYUVConversionModeForResolution(int width, int height); diff --git a/libs/SDL2/include/SDL_system.h b/libs/SDL2/include/SDL_system.h index 3b0840769..e2fa7b5fe 100644 --- a/libs/SDL2/include/SDL_system.h +++ b/libs/SDL2/include/SDL_system.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -43,33 +43,82 @@ extern "C" { /* Platform specific functions for Windows */ #ifdef __WIN32__ -/** - \brief Set a function that is called for every windows message, before TranslateMessage() -*/ typedef void (SDLCALL * SDL_WindowsMessageHook)(void *userdata, void *hWnd, unsigned int message, Uint64 wParam, Sint64 lParam); + +/** + * Set a callback for every Windows message, run before TranslateMessage(). + * + * \param callback The SDL_WindowsMessageHook function to call. + * \param userdata a pointer to pass to every iteration of `callback` + * + * \since This function is available since SDL 2.0.4. + */ extern DECLSPEC void SDLCALL SDL_SetWindowsMessageHook(SDL_WindowsMessageHook callback, void *userdata); /** - \brief Returns the D3D9 adapter index that matches the specified display index. - - This adapter index can be passed to IDirect3D9::CreateDevice and controls - on which monitor a full screen application will appear. -*/ + * Get the D3D9 adapter index that matches the specified display index. + * + * The returned adapter index can be passed to `IDirect3D9::CreateDevice` and + * controls on which monitor a full screen application will appear. + * + * \param displayIndex the display index for which to get the D3D9 adapter + * index + * \returns the D3D9 adapter index on success or a negative error code on + * failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.1. + */ extern DECLSPEC int SDLCALL SDL_Direct3D9GetAdapterIndex( int displayIndex ); typedef struct IDirect3DDevice9 IDirect3DDevice9; -/** - \brief Returns the D3D device associated with a renderer, or NULL if it's not a D3D renderer. - Once you are done using the device, you should release it to avoid a resource leak. +/** + * Get the D3D9 device associated with a renderer. + * + * Once you are done using the device, you should release it to avoid a + * resource leak. + * + * \param renderer the renderer from which to get the associated D3D device + * \returns the D3D9 device associated with given renderer or NULL if it is + * not a D3D9 renderer; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.1. */ extern DECLSPEC IDirect3DDevice9* SDLCALL SDL_RenderGetD3D9Device(SDL_Renderer * renderer); -/** - \brief Returns the DXGI Adapter and Output indices for the specified display index. +typedef struct ID3D11Device ID3D11Device; - These can be passed to EnumAdapters and EnumOutputs respectively to get the objects - required to create a DX10 or DX11 device and swap chain. +/** + * Get the D3D11 device associated with a renderer. + * + * Once you are done using the device, you should release it to avoid a + * resource leak. + * + * \param renderer the renderer from which to get the associated D3D11 device + * \returns the D3D11 device associated with given renderer or NULL if it is + * not a D3D11 renderer; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.16. + */ +extern DECLSPEC ID3D11Device* SDLCALL SDL_RenderGetD3D11Device(SDL_Renderer * renderer); + +/** + * Get the DXGI Adapter and Output indices for the specified display index. + * + * The DXGI Adapter and Output indices can be passed to `EnumAdapters` and + * `EnumOutputs` respectively to get the objects required to create a DX10 or + * DX11 device and swap chain. + * + * Before SDL 2.0.4 this function did not return a value. Since SDL 2.0.4 it + * returns an SDL_bool. + * + * \param displayIndex the display index for which to get both indices + * \param adapterIndex a pointer to be filled in with the adapter index + * \param outputIndex a pointer to be filled in with the output index + * \returns SDL_TRUE on success or SDL_FALSE on failure; call SDL_GetError() + * for more information. + * + * \since This function is available since SDL 2.0.2. */ extern DECLSPEC SDL_bool SDLCALL SDL_DXGIGetOutputInfo( int displayIndex, int *adapterIndex, int *outputIndex ); @@ -80,63 +129,202 @@ extern DECLSPEC SDL_bool SDLCALL SDL_DXGIGetOutputInfo( int displayIndex, int *a #ifdef __LINUX__ /** - \brief Sets the UNIX nice value for a thread, using setpriority() if possible, and RealtimeKit if available. - - \return 0 on success, or -1 on error. + * Sets the UNIX nice value for a thread. + * + * This uses setpriority() if possible, and RealtimeKit if available. + * + * \param threadID the Unix thread ID to change priority of. + * \param priority The new, Unix-specific, priority value. + * \returns 0 on success, or -1 on error. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC int SDLCALL SDL_LinuxSetThreadPriority(Sint64 threadID, int priority); + +/** + * Sets the priority (not nice level) and scheduling policy for a thread. + * + * This uses setpriority() if possible, and RealtimeKit if available. + * + * \param threadID The Unix thread ID to change priority of. + * \param sdlPriority The new SDL_ThreadPriority value. + * \param schedPolicy The new scheduling policy (SCHED_FIFO, SCHED_RR, + * SCHED_OTHER, etc...) + * \returns 0 on success, or -1 on error. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_LinuxSetThreadPriorityAndPolicy(Sint64 threadID, int sdlPriority, int schedPolicy); #endif /* __LINUX__ */ /* Platform specific functions for iOS */ -#if defined(__IPHONEOS__) && __IPHONEOS__ +#ifdef __IPHONEOS__ #define SDL_iOSSetAnimationCallback(window, interval, callback, callbackParam) SDL_iPhoneSetAnimationCallback(window, interval, callback, callbackParam) + +/** + * Use this function to set the animation callback on Apple iOS. + * + * The function prototype for `callback` is: + * + * ```c + * void callback(void* callbackParam); + * ``` + * + * Where its parameter, `callbackParam`, is what was passed as `callbackParam` + * to SDL_iPhoneSetAnimationCallback(). + * + * This function is only available on Apple iOS. + * + * For more information see: + * [README-ios.md](https://hg.libsdl.org/SDL/file/default/docs/README-ios.md) + * + * This functions is also accessible using the macro + * SDL_iOSSetAnimationCallback() since SDL 2.0.4. + * + * \param window the window for which the animation callback should be set + * \param interval the number of frames after which **callback** will be + * called + * \param callback the function to call for every frame. + * \param callbackParam a pointer that is passed to `callback`. + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_iPhoneSetEventPump + */ extern DECLSPEC int SDLCALL SDL_iPhoneSetAnimationCallback(SDL_Window * window, int interval, void (*callback)(void*), void *callbackParam); #define SDL_iOSSetEventPump(enabled) SDL_iPhoneSetEventPump(enabled) + +/** + * Use this function to enable or disable the SDL event pump on Apple iOS. + * + * This function is only available on Apple iOS. + * + * This functions is also accessible using the macro SDL_iOSSetEventPump() + * since SDL 2.0.4. + * + * \param enabled SDL_TRUE to enable the event pump, SDL_FALSE to disable it + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_iPhoneSetAnimationCallback + */ extern DECLSPEC void SDLCALL SDL_iPhoneSetEventPump(SDL_bool enabled); #endif /* __IPHONEOS__ */ /* Platform specific functions for Android */ -#if defined(__ANDROID__) && __ANDROID__ +#ifdef __ANDROID__ /** - \brief Get the JNI environment for the current thread - - This returns JNIEnv*, but the prototype is void* so we don't need jni.h + * Get the Android Java Native Interface Environment of the current thread. + * + * This is the JNIEnv one needs to access the Java virtual machine from native + * code, and is needed for many Android APIs to be usable from C. + * + * The prototype of the function in SDL's code actually declare a void* return + * type, even if the implementation returns a pointer to a JNIEnv. The + * rationale being that the SDL headers can avoid including jni.h. + * + * \returns a pointer to Java native interface object (JNIEnv) to which the + * current thread is attached, or 0 on error. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AndroidGetActivity */ extern DECLSPEC void * SDLCALL SDL_AndroidGetJNIEnv(void); /** - \brief Get the SDL Activity object for the application - - This returns jobject, but the prototype is void* so we don't need jni.h - The jobject returned by SDL_AndroidGetActivity is a local reference. - It is the caller's responsibility to properly release it - (using env->Push/PopLocalFrame or manually with env->DeleteLocalRef) + * Retrieve the Java instance of the Android activity class. + * + * The prototype of the function in SDL's code actually declares a void* + * return type, even if the implementation returns a jobject. The rationale + * being that the SDL headers can avoid including jni.h. + * + * The jobject returned by the function is a local reference and must be + * released by the caller. See the PushLocalFrame() and PopLocalFrame() or + * DeleteLocalRef() functions of the Java native interface: + * + * https://docs.oracle.com/javase/1.5.0/docs/guide/jni/spec/functions.html + * + * \returns the jobject representing the instance of the Activity class of the + * Android application, or NULL on error. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AndroidGetJNIEnv */ extern DECLSPEC void * SDLCALL SDL_AndroidGetActivity(void); /** - \brief Return true if the application is running on Android TV + * Query Android API level of the current device. + * + * - API level 31: Android 12 + * - API level 30: Android 11 + * - API level 29: Android 10 + * - API level 28: Android 9 + * - API level 27: Android 8.1 + * - API level 26: Android 8.0 + * - API level 25: Android 7.1 + * - API level 24: Android 7.0 + * - API level 23: Android 6.0 + * - API level 22: Android 5.1 + * - API level 21: Android 5.0 + * - API level 20: Android 4.4W + * - API level 19: Android 4.4 + * - API level 18: Android 4.3 + * - API level 17: Android 4.2 + * - API level 16: Android 4.1 + * - API level 15: Android 4.0.3 + * - API level 14: Android 4.0 + * - API level 13: Android 3.2 + * - API level 12: Android 3.1 + * - API level 11: Android 3.0 + * - API level 10: Android 2.3.3 + * + * \returns the Android API level. + * + * \since This function is available since SDL 2.0.12. + */ +extern DECLSPEC int SDLCALL SDL_GetAndroidSDKVersion(void); + +/** + * Query if the application is running on Android TV. + * + * \returns SDL_TRUE if this is Android TV, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.8. */ extern DECLSPEC SDL_bool SDLCALL SDL_IsAndroidTV(void); /** - \brief Return true if the application is running on a Chromebook + * Query if the application is running on a Chromebook. + * + * \returns SDL_TRUE if this is a Chromebook, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC SDL_bool SDLCALL SDL_IsChromebook(void); /** - \brief Return true is the application is running on a Samsung DeX docking station + * Query if the application is running on a Samsung DeX docking station. + * + * \returns SDL_TRUE if this is a DeX docking station, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC SDL_bool SDLCALL SDL_IsDeXMode(void); /** - \brief Trigger the Android system back button behavior. + * Trigger the Android system back button behavior. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC void SDLCALL SDL_AndroidBackButton(void); @@ -148,34 +336,99 @@ extern DECLSPEC void SDLCALL SDL_AndroidBackButton(void); #define SDL_ANDROID_EXTERNAL_STORAGE_WRITE 0x02 /** - \brief Get the path used for internal storage for this application. - - This path is unique to your application and cannot be written to - by other applications. + * Get the path used for internal storage for this application. + * + * This path is unique to your application and cannot be written to by other + * applications. + * + * Your internal storage path is typically: + * `/data/data/your.app.package/files`. + * + * \returns the path used for internal storage or NULL on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AndroidGetExternalStorageState */ extern DECLSPEC const char * SDLCALL SDL_AndroidGetInternalStoragePath(void); /** - \brief Get the current state of external storage, a bitmask of these values: - SDL_ANDROID_EXTERNAL_STORAGE_READ - SDL_ANDROID_EXTERNAL_STORAGE_WRITE - - If external storage is currently unavailable, this will return 0. -*/ + * Get the current state of external storage. + * + * The current state of external storage, a bitmask of these values: + * `SDL_ANDROID_EXTERNAL_STORAGE_READ`, `SDL_ANDROID_EXTERNAL_STORAGE_WRITE`. + * + * If external storage is currently unavailable, this will return 0. + * + * \returns the current state of external storage on success or 0 on failure; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AndroidGetExternalStoragePath + */ extern DECLSPEC int SDLCALL SDL_AndroidGetExternalStorageState(void); /** - \brief Get the path used for external storage for this application. - - This path is unique to your application, but is public and can be - written to by other applications. + * Get the path used for external storage for this application. + * + * This path is unique to your application, but is public and can be written + * to by other applications. + * + * Your external storage path is typically: + * `/storage/sdcard0/Android/data/your.app.package/files`. + * + * \returns the path used for external storage for this application on success + * or NULL on failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AndroidGetExternalStorageState */ extern DECLSPEC const char * SDLCALL SDL_AndroidGetExternalStoragePath(void); +/** + * Request permissions at runtime. + * + * This blocks the calling thread until the permission is granted or denied. + * + * \param permission The permission to request. + * \returns SDL_TRUE if the permission was granted, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC SDL_bool SDLCALL SDL_AndroidRequestPermission(const char *permission); + +/** + * Shows an Android toast notification. + * + * Toasts are a sort of lightweight notification that are unique to Android. + * + * https://developer.android.com/guide/topics/ui/notifiers/toasts + * + * Shows toast in UI thread. + * + * For the `gravity` parameter, choose a value from here, or -1 if you don't + * have a preference: + * + * https://developer.android.com/reference/android/view/Gravity + * + * \param message text message to be shown + * \param duration 0=short, 1=long + * \param gravity where the notification should appear on the screen. + * \param xoffset set this parameter only when gravity >=0 + * \param yoffset set this parameter only when gravity >=0 + * \returns 0 if success, -1 if any error occurs. + * + * \since This function is available since SDL 2.0.16. + */ +extern DECLSPEC int SDLCALL SDL_AndroidShowToast(const char* message, int duration, int gravity, int xoffset, int yoffset); + #endif /* __ANDROID__ */ /* Platform specific functions for WinRT */ -#if defined(__WINRT__) && __WINRT__ +#ifdef __WINRT__ /** * \brief WinRT / Windows Phone path types @@ -221,53 +474,84 @@ typedef enum /** - * \brief Retrieves a WinRT defined path on the local file system + * Retrieve a WinRT defined path on the local file system. * - * \note Documentation on most app-specific path types on WinRT - * can be found on MSDN, at the URL: - * http://msdn.microsoft.com/en-us/library/windows/apps/hh464917.aspx + * Not all paths are available on all versions of Windows. This is especially + * true on Windows Phone. Check the documentation for the given SDL_WinRT_Path + * for more information on which path types are supported where. * - * \param pathType The type of path to retrieve. - * \return A UCS-2 string (16-bit, wide-char) containing the path, or NULL - * if the path is not available for any reason. Not all paths are - * available on all versions of Windows. This is especially true on - * Windows Phone. Check the documentation for the given - * SDL_WinRT_Path for more information on which path types are - * supported where. + * Documentation on most app-specific path types on WinRT can be found on + * MSDN, at the URL: + * + * https://msdn.microsoft.com/en-us/library/windows/apps/hh464917.aspx + * + * \param pathType the type of path to retrieve, one of SDL_WinRT_Path + * \returns a UCS-2 string (16-bit, wide-char) containing the path, or NULL if + * the path is not available for any reason; call SDL_GetError() for + * more information. + * + * \since This function is available since SDL 2.0.3. + * + * \sa SDL_WinRTGetFSPathUTF8 */ extern DECLSPEC const wchar_t * SDLCALL SDL_WinRTGetFSPathUNICODE(SDL_WinRT_Path pathType); /** - * \brief Retrieves a WinRT defined path on the local file system + * Retrieve a WinRT defined path on the local file system. * - * \note Documentation on most app-specific path types on WinRT - * can be found on MSDN, at the URL: - * http://msdn.microsoft.com/en-us/library/windows/apps/hh464917.aspx + * Not all paths are available on all versions of Windows. This is especially + * true on Windows Phone. Check the documentation for the given SDL_WinRT_Path + * for more information on which path types are supported where. * - * \param pathType The type of path to retrieve. - * \return A UTF-8 string (8-bit, multi-byte) containing the path, or NULL - * if the path is not available for any reason. Not all paths are - * available on all versions of Windows. This is especially true on - * Windows Phone. Check the documentation for the given - * SDL_WinRT_Path for more information on which path types are - * supported where. + * Documentation on most app-specific path types on WinRT can be found on + * MSDN, at the URL: + * + * https://msdn.microsoft.com/en-us/library/windows/apps/hh464917.aspx + * + * \param pathType the type of path to retrieve, one of SDL_WinRT_Path + * \returns a UTF-8 string (8-bit, multi-byte) containing the path, or NULL if + * the path is not available for any reason; call SDL_GetError() for + * more information. + * + * \since This function is available since SDL 2.0.3. + * + * \sa SDL_WinRTGetFSPathUNICODE */ extern DECLSPEC const char * SDLCALL SDL_WinRTGetFSPathUTF8(SDL_WinRT_Path pathType); /** - * \brief Detects the device family of WinRT plattform on runtime + * Detects the device family of WinRT plattform at runtime. * - * \return Device family + * \returns a value from the SDL_WinRT_DeviceFamily enum. + * + * \since This function is available since SDL 2.0.8. */ extern DECLSPEC SDL_WinRT_DeviceFamily SDLCALL SDL_WinRTGetDeviceFamily(); #endif /* __WINRT__ */ /** - \brief Return true if the current device is a tablet. + * Query if the current device is a tablet. + * + * If SDL can't determine this, it will return SDL_FALSE. + * + * \returns SDL_TRUE if the device is a tablet, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC SDL_bool SDLCALL SDL_IsTablet(void); +/* Functions used by iOS application delegates to notify SDL about state changes */ +extern DECLSPEC void SDLCALL SDL_OnApplicationWillTerminate(void); +extern DECLSPEC void SDLCALL SDL_OnApplicationDidReceiveMemoryWarning(void); +extern DECLSPEC void SDLCALL SDL_OnApplicationWillResignActive(void); +extern DECLSPEC void SDLCALL SDL_OnApplicationDidEnterBackground(void); +extern DECLSPEC void SDLCALL SDL_OnApplicationWillEnterForeground(void); +extern DECLSPEC void SDLCALL SDL_OnApplicationDidBecomeActive(void); +#ifdef __IPHONEOS__ +extern DECLSPEC void SDLCALL SDL_OnApplicationDidChangeStatusBarOrientation(void); +#endif + /* Ends C function definitions when using C++ */ #ifdef __cplusplus } diff --git a/libs/SDL2/include/SDL_syswm.h b/libs/SDL2/include/SDL_syswm.h index 7aa8c6869..f7cd670cd 100644 --- a/libs/SDL2/include/SDL_syswm.h +++ b/libs/SDL2/include/SDL_syswm.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -49,6 +49,9 @@ struct SDL_SysWMinfo; #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif +#ifndef NOMINMAX /* don't define min() and max(). */ +#define NOMINMAX +#endif #include #endif @@ -95,6 +98,10 @@ typedef struct _UIViewController UIViewController; typedef Uint32 GLuint; #endif +#if defined(SDL_VIDEO_VULKAN) || defined(SDL_VIDEO_METAL) +#define SDL_METALVIEW_TAG 255 +#endif + #if defined(SDL_VIDEO_DRIVER_ANDROID) typedef struct ANativeWindow ANativeWindow; typedef void *EGLSurface; @@ -103,8 +110,17 @@ typedef void *EGLSurface; #if defined(SDL_VIDEO_DRIVER_VIVANTE) #include "SDL_egl.h" #endif + +#if defined(SDL_VIDEO_DRIVER_OS2) +#define INCL_WIN +#include +#endif #endif /* SDL_PROTOTYPES_ONLY */ +#if defined(SDL_VIDEO_DRIVER_KMSDRM) +struct gbm_device; +#endif + #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ @@ -129,7 +145,10 @@ typedef enum SDL_SYSWM_WINRT, SDL_SYSWM_ANDROID, SDL_SYSWM_VIVANTE, - SDL_SYSWM_OS2 + SDL_SYSWM_OS2, + SDL_SYSWM_HAIKU, + SDL_SYSWM_KMSDRM, + SDL_SYSWM_RISCOS } SDL_SYSWM_TYPE; /** @@ -182,6 +201,16 @@ struct SDL_SysWMmsg int dummy; /* No Vivante window events yet */ } vivante; +#endif +#if defined(SDL_VIDEO_DRIVER_OS2) + struct + { + BOOL fFrame; /**< TRUE if hwnd is a frame window */ + HWND hwnd; /**< The window receiving the message */ + ULONG msg; /**< The message identifier */ + MPARAM mp1; /**< The first first message parameter */ + MPARAM mp2; /**< The second first message parameter */ + } os2; #endif /* Can't have an empty union */ int dummy; @@ -232,8 +261,12 @@ struct SDL_SysWMinfo #if defined(SDL_VIDEO_DRIVER_COCOA) struct { -#if defined(__OBJC__) && defined(__has_feature) && __has_feature(objc_arc) +#if defined(__OBJC__) && defined(__has_feature) + #if __has_feature(objc_arc) NSWindow __unsafe_unretained *window; /**< The Cocoa window */ + #else + NSWindow *window; /**< The Cocoa window */ + #endif #else NSWindow *window; /**< The Cocoa window */ #endif @@ -242,8 +275,12 @@ struct SDL_SysWMinfo #if defined(SDL_VIDEO_DRIVER_UIKIT) struct { -#if defined(__OBJC__) && defined(__has_feature) && __has_feature(objc_arc) +#if defined(__OBJC__) && defined(__has_feature) + #if __has_feature(objc_arc) UIWindow __unsafe_unretained *window; /**< The UIKit window */ + #else + UIWindow *window; /**< The UIKit window */ + #endif #else UIWindow *window; /**< The UIKit window */ #endif @@ -255,9 +292,12 @@ struct SDL_SysWMinfo #if defined(SDL_VIDEO_DRIVER_WAYLAND) struct { - struct wl_display *display; /**< Wayland display */ - struct wl_surface *surface; /**< Wayland surface */ - struct wl_shell_surface *shell_surface; /**< Wayland shell_surface (window manager handle) */ + struct wl_display *display; /**< Wayland display */ + struct wl_surface *surface; /**< Wayland surface */ + void *shell_surface; /**< DEPRECATED Wayland shell_surface (window manager handle) */ + struct wl_egl_window *egl_window; /**< Wayland EGL window (native window) */ + struct xdg_surface *xdg_surface; /**< Wayland xdg surface (window manager handle) */ + struct xdg_toplevel *xdg_toplevel; /**< Wayland xdg toplevel role */ } wl; #endif #if defined(SDL_VIDEO_DRIVER_MIR) /* no longer available, left for API/ABI compatibility. Remove in 2.1! */ @@ -276,6 +316,14 @@ struct SDL_SysWMinfo } android; #endif +#if defined(SDL_VIDEO_DRIVER_OS2) + struct + { + HWND hwnd; /**< The window handle */ + HWND hwndFrame; /**< The frame window handle */ + } os2; +#endif + #if defined(SDL_VIDEO_DRIVER_VIVANTE) struct { @@ -284,6 +332,15 @@ struct SDL_SysWMinfo } vivante; #endif +#if defined(SDL_VIDEO_DRIVER_KMSDRM) + struct + { + int dev_index; /**< Device index (ex: the X in /dev/dri/cardX) */ + int drm_fd; /**< DRM FD (unavailable on Vulkan windows) */ + struct gbm_device *gbm_dev; /**< GBM device (unavailable on Vulkan windows) */ + } kmsdrm; +#endif + /* Make sure this union is always 64 bytes (8 64-bit pointers). */ /* Be careful not to overflow this if you add a new target! */ Uint8 dummy[64]; @@ -294,23 +351,23 @@ struct SDL_SysWMinfo typedef struct SDL_SysWMinfo SDL_SysWMinfo; -/* Function prototypes */ + /** - * \brief This function allows access to driver-dependent window information. + * Get driver-specific information about a window. * - * \param window The window about which information is being requested - * \param info This structure must be initialized with the SDL version, and is - * then filled in with information about the given window. + * You must include SDL_syswm.h for the declaration of SDL_SysWMinfo. * - * \return SDL_TRUE if the function is implemented and the version member of - * the \c info struct is valid, SDL_FALSE otherwise. + * The caller must initialize the `info` structure's version by using + * `SDL_VERSION(&info.version)`, and then this function will fill in the rest + * of the structure with information about the given window. * - * You typically use this function like this: - * \code - * SDL_SysWMinfo info; - * SDL_VERSION(&info.version); - * if ( SDL_GetWindowWMInfo(window, &info) ) { ... } - * \endcode + * \param window the window about which information is being requested + * \param info an SDL_SysWMinfo structure filled in with window information + * \returns SDL_TRUE if the function is implemented and the `version` member + * of the `info` struct is valid, or SDL_FALSE if the information + * could not be retrieved; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC SDL_bool SDLCALL SDL_GetWindowWMInfo(SDL_Window * window, SDL_SysWMinfo * info); diff --git a/libs/SDL2/include/SDL_test.h b/libs/SDL2/include/SDL_test.h index 17a33dc2c..8cc9d616a 100644 --- a/libs/SDL2/include/SDL_test.h +++ b/libs/SDL2/include/SDL_test.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/include/SDL_test_assert.h b/libs/SDL2/include/SDL_test_assert.h index b3ebb62fb..734230529 100644 --- a/libs/SDL2/include/SDL_test_assert.h +++ b/libs/SDL2/include/SDL_test_assert.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -66,7 +66,7 @@ void SDLTest_Assert(int assertCondition, SDL_PRINTF_FORMAT_STRING const char *as * \param assertCondition Evaluated condition or variable to assert; fail (==0) or pass (!=0). * \param assertDescription Message to log with the assert describing it. * - * \returns Returns the assertCondition so it can be used to externally to break execution flow if desired. + * \returns the assertCondition so it can be used to externally to break execution flow if desired. */ int SDLTest_AssertCheck(int assertCondition, SDL_PRINTF_FORMAT_STRING const char *assertDescription, ...) SDL_PRINTF_VARARG_FUNC(2); diff --git a/libs/SDL2/include/SDL_test_common.h b/libs/SDL2/include/SDL_test_common.h index c34d0d103..0f5096789 100644 --- a/libs/SDL2/include/SDL_test_common.h +++ b/libs/SDL2/include/SDL_test_common.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -37,6 +37,9 @@ #if defined(__PSP__) #define DEFAULT_WINDOW_WIDTH 480 #define DEFAULT_WINDOW_HEIGHT 272 +#elif defined(__VITA__) +#define DEFAULT_WINDOW_WIDTH 960 +#define DEFAULT_WINDOW_HEIGHT 544 #else #define DEFAULT_WINDOW_WIDTH 640 #define DEFAULT_WINDOW_HEIGHT 480 @@ -61,6 +64,7 @@ typedef struct const char *window_title; const char *window_icon; Uint32 window_flags; + SDL_bool flash_on_focus_loss; int window_x; int window_y; int window_w; @@ -110,6 +114,10 @@ typedef struct int gl_minor_version; int gl_debug; int gl_profile_mask; + + /* Additional fields added in 2.0.18 */ + SDL_Rect confine; + } SDLTest_CommonState; #include "begin_code.h" @@ -126,7 +134,7 @@ extern "C" { * \param argv Array of command line parameters * \param flags Flags indicating which subsystem to initialize (i.e. SDL_INIT_VIDEO | SDL_INIT_AUDIO) * - * \returns Returns a newly allocated common state object. + * \returns a newly allocated common state object. */ SDLTest_CommonState *SDLTest_CommonCreateState(char **argv, Uint32 flags); @@ -136,7 +144,7 @@ SDLTest_CommonState *SDLTest_CommonCreateState(char **argv, Uint32 flags); * \param state The common state describing the test window to create. * \param index The index of the argument to process in argv[]. * - * \returns The number of arguments processed (i.e. 1 for --fullscreen, 2 for --video [videodriver], or -1 on error. + * \returns the number of arguments processed (i.e. 1 for --fullscreen, 2 for --video [videodriver], or -1 on error. */ int SDLTest_CommonArg(SDLTest_CommonState * state, int index); @@ -155,12 +163,25 @@ int SDLTest_CommonArg(SDLTest_CommonState * state, int index); */ void SDLTest_CommonLogUsage(SDLTest_CommonState * state, const char *argv0, const char **options); +/** + * \brief Returns common usage information + * + * You should (probably) be using SDLTest_CommonLogUsage() instead, but this + * function remains for binary compatibility. Strings returned from this + * function are valid until SDLTest_CommonQuit() is called, in which case + * those strings' memory is freed and can no longer be used. + * + * \param state The common state describing the test window to create. + * \returns a string with usage information + */ +const char *SDLTest_CommonUsage(SDLTest_CommonState * state); + /** * \brief Open test window. * * \param state The common state describing the test window to create. * - * \returns True if initialization succeeded, false otherwise + * \returns SDL_TRUE if initialization succeeded, false otherwise */ SDL_bool SDLTest_CommonInit(SDLTest_CommonState * state); @@ -171,7 +192,7 @@ SDL_bool SDLTest_CommonInit(SDLTest_CommonState * state); * \param argc argc, as supplied to SDL_main * \param argv argv, as supplied to SDL_main * - * \returns False if app should quit, true otherwise. + * \returns SDL_FALSE if app should quit, true otherwise. */ SDL_bool SDLTest_CommonDefaultArgs(SDLTest_CommonState * state, const int argc, char **argv); @@ -193,6 +214,15 @@ void SDLTest_CommonEvent(SDLTest_CommonState * state, SDL_Event * event, int *do */ void SDLTest_CommonQuit(SDLTest_CommonState * state); +/** + * \brief Draws various window information (position, size, etc.) to the renderer. + * + * \param renderer The renderer to draw to. + * \param window The window whose information should be displayed. + * \param usedHeight Returns the height used, so the caller can draw more below. + * + */ +void SDLTest_CommonDrawWindowInfo(SDL_Renderer * renderer, SDL_Window * window, int * usedHeight); /* Ends C function definitions when using C++ */ #ifdef __cplusplus diff --git a/libs/SDL2/include/SDL_test_compare.h b/libs/SDL2/include/SDL_test_compare.h index 1f751c8b9..8a7a07008 100644 --- a/libs/SDL2/include/SDL_test_compare.h +++ b/libs/SDL2/include/SDL_test_compare.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/include/SDL_test_crc32.h b/libs/SDL2/include/SDL_test_crc32.h index e615d8929..049da7406 100644 --- a/libs/SDL2/include/SDL_test_crc32.h +++ b/libs/SDL2/include/SDL_test_crc32.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/include/SDL_test_font.h b/libs/SDL2/include/SDL_test_font.h index 8fa078440..c5cbbbbd3 100644 --- a/libs/SDL2/include/SDL_test_font.h +++ b/libs/SDL2/include/SDL_test_font.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -48,7 +48,7 @@ extern "C" { * \param y The Y coordinate of the upper left corner of the character. * \param c The character to draw. * - * \returns Returns 0 on success, -1 on failure. + * \returns 0 on success, -1 on failure. */ int SDLTest_DrawCharacter(SDL_Renderer *renderer, int x, int y, char c); @@ -60,7 +60,7 @@ int SDLTest_DrawCharacter(SDL_Renderer *renderer, int x, int y, char c); * \param y The Y coordinate of the upper left corner of the string. * \param s The string to draw. * - * \returns Returns 0 on success, -1 on failure. + * \returns 0 on success, -1 on failure. */ int SDLTest_DrawString(SDL_Renderer *renderer, int x, int y, const char *s); diff --git a/libs/SDL2/include/SDL_test_fuzzer.h b/libs/SDL2/include/SDL_test_fuzzer.h index 7259685a9..bbe8eb874 100644 --- a/libs/SDL2/include/SDL_test_fuzzer.h +++ b/libs/SDL2/include/SDL_test_fuzzer.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -66,14 +66,14 @@ void SDLTest_FuzzerInit(Uint64 execKey); /** * Returns a random Uint8 * - * \returns Generated integer + * \returns a generated integer */ Uint8 SDLTest_RandomUint8(void); /** * Returns a random Sint8 * - * \returns Generated signed integer + * \returns a generated signed integer */ Sint8 SDLTest_RandomSint8(void); @@ -81,14 +81,14 @@ Sint8 SDLTest_RandomSint8(void); /** * Returns a random Uint16 * - * \returns Generated integer + * \returns a generated integer */ Uint16 SDLTest_RandomUint16(void); /** * Returns a random Sint16 * - * \returns Generated signed integer + * \returns a generated signed integer */ Sint16 SDLTest_RandomSint16(void); @@ -96,7 +96,7 @@ Sint16 SDLTest_RandomSint16(void); /** * Returns a random integer * - * \returns Generated integer + * \returns a generated integer */ Sint32 SDLTest_RandomSint32(void); @@ -104,14 +104,14 @@ Sint32 SDLTest_RandomSint32(void); /** * Returns a random positive integer * - * \returns Generated integer + * \returns a generated integer */ Uint32 SDLTest_RandomUint32(void); /** * Returns random Uint64. * - * \returns Generated integer + * \returns a generated integer */ Uint64 SDLTest_RandomUint64(void); @@ -119,28 +119,28 @@ Uint64 SDLTest_RandomUint64(void); /** * Returns random Sint64. * - * \returns Generated signed integer + * \returns a generated signed integer */ Sint64 SDLTest_RandomSint64(void); /** - * \returns random float in range [0.0 - 1.0[ + * \returns a random float in range [0.0 - 1.0] */ float SDLTest_RandomUnitFloat(void); /** - * \returns random double in range [0.0 - 1.0[ + * \returns a random double in range [0.0 - 1.0] */ double SDLTest_RandomUnitDouble(void); /** - * \returns random float. + * \returns a random float. * */ float SDLTest_RandomFloat(void); /** - * \returns random double. + * \returns a random double. * */ double SDLTest_RandomDouble(void); @@ -162,7 +162,7 @@ double SDLTest_RandomDouble(void); * \param boundary2 Upper boundary limit * \param validDomain Should the generated boundary be valid (=within the bounds) or not? * - * \returns Random boundary value for the given range and domain or 0 with error set + * \returns a random boundary value for the given range and domain or 0 with error set */ Uint8 SDLTest_RandomUint8BoundaryValue(Uint8 boundary1, Uint8 boundary2, SDL_bool validDomain); @@ -183,7 +183,7 @@ Uint8 SDLTest_RandomUint8BoundaryValue(Uint8 boundary1, Uint8 boundary2, SDL_boo * \param boundary2 Upper boundary limit * \param validDomain Should the generated boundary be valid (=within the bounds) or not? * - * \returns Random boundary value for the given range and domain or 0 with error set + * \returns a random boundary value for the given range and domain or 0 with error set */ Uint16 SDLTest_RandomUint16BoundaryValue(Uint16 boundary1, Uint16 boundary2, SDL_bool validDomain); @@ -204,7 +204,7 @@ Uint16 SDLTest_RandomUint16BoundaryValue(Uint16 boundary1, Uint16 boundary2, SDL * \param boundary2 Upper boundary limit * \param validDomain Should the generated boundary be valid (=within the bounds) or not? * - * \returns Random boundary value for the given range and domain or 0 with error set + * \returns a random boundary value for the given range and domain or 0 with error set */ Uint32 SDLTest_RandomUint32BoundaryValue(Uint32 boundary1, Uint32 boundary2, SDL_bool validDomain); @@ -225,7 +225,7 @@ Uint32 SDLTest_RandomUint32BoundaryValue(Uint32 boundary1, Uint32 boundary2, SDL * \param boundary2 Upper boundary limit * \param validDomain Should the generated boundary be valid (=within the bounds) or not? * - * \returns Random boundary value for the given range and domain or 0 with error set + * \returns a random boundary value for the given range and domain or 0 with error set */ Uint64 SDLTest_RandomUint64BoundaryValue(Uint64 boundary1, Uint64 boundary2, SDL_bool validDomain); @@ -246,7 +246,7 @@ Uint64 SDLTest_RandomUint64BoundaryValue(Uint64 boundary1, Uint64 boundary2, SDL * \param boundary2 Upper boundary limit * \param validDomain Should the generated boundary be valid (=within the bounds) or not? * - * \returns Random boundary value for the given range and domain or SINT8_MIN with error set + * \returns a random boundary value for the given range and domain or SINT8_MIN with error set */ Sint8 SDLTest_RandomSint8BoundaryValue(Sint8 boundary1, Sint8 boundary2, SDL_bool validDomain); @@ -268,7 +268,7 @@ Sint8 SDLTest_RandomSint8BoundaryValue(Sint8 boundary1, Sint8 boundary2, SDL_boo * \param boundary2 Upper boundary limit * \param validDomain Should the generated boundary be valid (=within the bounds) or not? * - * \returns Random boundary value for the given range and domain or SINT16_MIN with error set + * \returns a random boundary value for the given range and domain or SINT16_MIN with error set */ Sint16 SDLTest_RandomSint16BoundaryValue(Sint16 boundary1, Sint16 boundary2, SDL_bool validDomain); @@ -289,7 +289,7 @@ Sint16 SDLTest_RandomSint16BoundaryValue(Sint16 boundary1, Sint16 boundary2, SDL * \param boundary2 Upper boundary limit * \param validDomain Should the generated boundary be valid (=within the bounds) or not? * - * \returns Random boundary value for the given range and domain or SINT32_MIN with error set + * \returns a random boundary value for the given range and domain or SINT32_MIN with error set */ Sint32 SDLTest_RandomSint32BoundaryValue(Sint32 boundary1, Sint32 boundary2, SDL_bool validDomain); @@ -310,7 +310,7 @@ Sint32 SDLTest_RandomSint32BoundaryValue(Sint32 boundary1, Sint32 boundary2, SDL * \param boundary2 Upper boundary limit * \param validDomain Should the generated boundary be valid (=within the bounds) or not? * - * \returns Random boundary value for the given range and domain or SINT64_MIN with error set + * \returns a random boundary value for the given range and domain or SINT64_MIN with error set */ Sint64 SDLTest_RandomSint64BoundaryValue(Sint64 boundary1, Sint64 boundary2, SDL_bool validDomain); @@ -324,7 +324,7 @@ Sint64 SDLTest_RandomSint64BoundaryValue(Sint64 boundary1, Sint64 boundary2, SDL * \param min Minimum inclusive value of returned random number * \param max Maximum inclusive value of returned random number * - * \returns Generated random integer in range + * \returns a generated random integer in range */ Sint32 SDLTest_RandomIntegerInRange(Sint32 min, Sint32 max); @@ -336,7 +336,7 @@ Sint32 SDLTest_RandomIntegerInRange(Sint32 min, Sint32 max); * * Note: Returned string needs to be deallocated. * - * \returns Newly allocated random string; or NULL if length was invalid or string could not be allocated. + * \returns a newly allocated random string; or NULL if length was invalid or string could not be allocated. */ char * SDLTest_RandomAsciiString(void); @@ -350,7 +350,7 @@ char * SDLTest_RandomAsciiString(void); * * \param maxLength The maximum length of the generated string. * - * \returns Newly allocated random string; or NULL if maxLength was invalid or string could not be allocated. + * \returns a newly allocated random string; or NULL if maxLength was invalid or string could not be allocated. */ char * SDLTest_RandomAsciiStringWithMaximumLength(int maxLength); @@ -364,12 +364,14 @@ char * SDLTest_RandomAsciiStringWithMaximumLength(int maxLength); * * \param size The length of the generated string * - * \returns Newly allocated random string; or NULL if size was invalid or string could not be allocated. + * \returns a newly allocated random string; or NULL if size was invalid or string could not be allocated. */ char * SDLTest_RandomAsciiStringOfSize(int size); /** - * Returns the invocation count for the fuzzer since last ...FuzzerInit. + * Get the invocation count for the fuzzer since last ...FuzzerInit. + * + * \returns the invocation count. */ int SDLTest_GetFuzzerInvocationCount(void); diff --git a/libs/SDL2/include/SDL_test_harness.h b/libs/SDL2/include/SDL_test_harness.h index f5ae92ceb..1fd4236be 100644 --- a/libs/SDL2/include/SDL_test_harness.h +++ b/libs/SDL2/include/SDL_test_harness.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -76,9 +76,9 @@ typedef struct SDLTest_TestCaseReference { /* !< Func2Stress */ SDLTest_TestCaseFp testCase; /* !< Short name (or function name) "Func2Stress" */ - char *name; + const char *name; /* !< Long name or full description "This test pushes func2() to the limit." */ - char *description; + const char *description; /* !< Set to TEST_ENABLED or TEST_DISABLED (test won't be run) */ int enabled; } SDLTest_TestCaseReference; @@ -88,7 +88,7 @@ typedef struct SDLTest_TestCaseReference { */ typedef struct SDLTest_TestSuiteReference { /* !< "PlatformSuite" */ - char *name; + const char *name; /* !< The function that is run before each test. NULL skips. */ SDLTest_TestCaseSetUpFp testSetUp; /* !< The test cases that are run as part of the suite. Last item should be NULL. */ @@ -105,7 +105,7 @@ typedef struct SDLTest_TestSuiteReference { * * \param length The length of the seed string to generate * - * \returns The generated seed string + * \returns the generated seed string */ char *SDLTest_GenerateRunSeed(const int length); @@ -118,7 +118,7 @@ char *SDLTest_GenerateRunSeed(const int length); * \param filter Filter specification. NULL disables. Case sensitive. * \param testIterations Number of iterations to run each test case. * - * \returns Test run result; 0 when all tests passed, 1 if any tests failed. + * \returns the test run result: 0 when all tests passed, 1 if any tests failed. */ int SDLTest_RunSuites(SDLTest_TestSuiteReference *testSuites[], const char *userRunSeed, Uint64 userExecKey, const char *filter, int testIterations); diff --git a/libs/SDL2/include/SDL_test_images.h b/libs/SDL2/include/SDL_test_images.h index b8934812f..e2bfc3600 100644 --- a/libs/SDL2/include/SDL_test_images.h +++ b/libs/SDL2/include/SDL_test_images.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/include/SDL_test_log.h b/libs/SDL2/include/SDL_test_log.h index 01d0fedac..e3d39ad27 100644 --- a/libs/SDL2/include/SDL_test_log.h +++ b/libs/SDL2/include/SDL_test_log.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/include/SDL_test_md5.h b/libs/SDL2/include/SDL_test_md5.h index 2bfd7dff9..17b1d2be7 100644 --- a/libs/SDL2/include/SDL_test_md5.h +++ b/libs/SDL2/include/SDL_test_md5.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/include/SDL_test_memory.h b/libs/SDL2/include/SDL_test_memory.h index 5d4d39ea5..cc2edc1b9 100644 --- a/libs/SDL2/include/SDL_test_memory.h +++ b/libs/SDL2/include/SDL_test_memory.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/include/SDL_test_random.h b/libs/SDL2/include/SDL_test_random.h index 71e9c70b6..b1d6060cb 100644 --- a/libs/SDL2/include/SDL_test_random.h +++ b/libs/SDL2/include/SDL_test_random.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -98,7 +98,7 @@ extern "C" { * * \param rndContext pointer to context structure * - * \returns A random number (32bit unsigned integer) + * \returns a random number (32bit unsigned integer) * */ unsigned int SDLTest_Random(SDLTest_RandomContext *rndContext); diff --git a/libs/SDL2/include/SDL_thread.h b/libs/SDL2/include/SDL_thread.h index f78b1145d..35e680ddf 100644 --- a/libs/SDL2/include/SDL_thread.h +++ b/libs/SDL2/include/SDL_thread.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -35,6 +35,17 @@ #include "SDL_atomic.h" #include "SDL_mutex.h" +#if defined(__WIN32__) +#include /* _beginthreadex() and _endthreadex() */ +#endif +#if defined(__OS2__) /* for _beginthread() and _endthread() */ +#ifndef __EMX__ +#include +#else +#include +#endif +#endif + #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ #ifdef __cplusplus @@ -54,6 +65,11 @@ typedef unsigned int SDL_TLSID; /** * The SDL thread priority. * + * SDL will make system changes as necessary in order to apply the thread priority. + * Code which attempts to control thread state related to priority should be aware + * that calling SDL_SetThreadPriority may alter such state. + * SDL_HINT_THREAD_PRIORITY_POLICY can be used to control aspects of this behavior. + * * \note On many systems you require special privileges to set high or time critical priority. */ typedef enum { @@ -64,12 +80,15 @@ typedef enum { } SDL_ThreadPriority; /** - * The function passed to SDL_CreateThread(). - * It is passed a void* user context parameter and returns an int. + * The function passed to SDL_CreateThread(). + * + * \param data what was passed as `data` to SDL_CreateThread() + * \returns a value that can be reported through SDL_WaitThread(). */ typedef int (SDLCALL * SDL_ThreadFunction) (void *data); -#if defined(__WIN32__) && !defined(HAVE_LIBC) + +#if defined(__WIN32__) /** * \file SDL_thread.h * @@ -91,16 +110,19 @@ typedef int (SDLCALL * SDL_ThreadFunction) (void *data); * library! */ #define SDL_PASSED_BEGINTHREAD_ENDTHREAD -#include /* _beginthreadex() and _endthreadex() */ -typedef uintptr_t(__cdecl * pfnSDL_CurrentBeginThread) +typedef uintptr_t (__cdecl * pfnSDL_CurrentBeginThread) (void *, unsigned, unsigned (__stdcall *func)(void *), void * /*arg*/, unsigned, unsigned * /* threadID */); typedef void (__cdecl * pfnSDL_CurrentEndThread) (unsigned code); -/** - * Create a thread. - */ +#ifndef SDL_beginthread +#define SDL_beginthread _beginthreadex +#endif +#ifndef SDL_endthread +#define SDL_endthread _endthreadex +#endif + extern DECLSPEC SDL_Thread *SDLCALL SDL_CreateThread(SDL_ThreadFunction fn, const char *name, void *data, pfnSDL_CurrentBeginThread pfnBeginThread, @@ -113,17 +135,14 @@ SDL_CreateThreadWithStackSize(int (SDLCALL * fn) (void *), pfnSDL_CurrentEndThread pfnEndThread); -/** - * Create a thread. - */ #if defined(SDL_CreateThread) && SDL_DYNAMIC_API #undef SDL_CreateThread -#define SDL_CreateThread(fn, name, data) SDL_CreateThread_REAL(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthreadex, (pfnSDL_CurrentEndThread)_endthreadex) +#define SDL_CreateThread(fn, name, data) SDL_CreateThread_REAL(fn, name, data, (pfnSDL_CurrentBeginThread)SDL_beginthread, (pfnSDL_CurrentEndThread)SDL_endthread) #undef SDL_CreateThreadWithStackSize -#define SDL_CreateThreadWithStackSize(fn, name, stacksize, data) SDL_CreateThreadWithStackSize_REAL(fn, name, stacksize, data, (pfnSDL_CurrentBeginThread)_beginthreadex, (pfnSDL_CurrentEndThread)_endthreadex) +#define SDL_CreateThreadWithStackSize(fn, name, stacksize, data) SDL_CreateThreadWithStackSize_REAL(fn, name, stacksize, data, (pfnSDL_CurrentBeginThread)SDL_beginthread, (pfnSDL_CurrentEndThread)SDL_endthread) #else -#define SDL_CreateThread(fn, name, data) SDL_CreateThread(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthreadex, (pfnSDL_CurrentEndThread)_endthreadex) -#define SDL_CreateThreadWithStackSize(fn, name, stacksize, data) SDL_CreateThreadWithStackSize(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthreadex, (pfnSDL_CurrentEndThread)_endthreadex) +#define SDL_CreateThread(fn, name, data) SDL_CreateThread(fn, name, data, (pfnSDL_CurrentBeginThread)SDL_beginthread, (pfnSDL_CurrentEndThread)SDL_endthread) +#define SDL_CreateThreadWithStackSize(fn, name, stacksize, data) SDL_CreateThreadWithStackSize(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthreadex, (pfnSDL_CurrentEndThread)SDL_endthread) #endif #elif defined(__OS2__) @@ -132,13 +151,17 @@ SDL_CreateThreadWithStackSize(int (SDLCALL * fn) (void *), * into a dll with Watcom's runtime statically linked. */ #define SDL_PASSED_BEGINTHREAD_ENDTHREAD -#ifndef __EMX__ -#include -#else -#include -#endif + typedef int (*pfnSDL_CurrentBeginThread)(void (*func)(void *), void *, unsigned, void * /*arg*/); typedef void (*pfnSDL_CurrentEndThread)(void); + +#ifndef SDL_beginthread +#define SDL_beginthread _beginthread +#endif +#ifndef SDL_endthread +#define SDL_endthread _endthread +#endif + extern DECLSPEC SDL_Thread *SDLCALL SDL_CreateThread(SDL_ThreadFunction fn, const char *name, void *data, pfnSDL_CurrentBeginThread pfnBeginThread, @@ -147,52 +170,85 @@ extern DECLSPEC SDL_Thread *SDLCALL SDL_CreateThreadWithStackSize(SDL_ThreadFunction fn, const char *name, const size_t stacksize, void *data, pfnSDL_CurrentBeginThread pfnBeginThread, pfnSDL_CurrentEndThread pfnEndThread); + #if defined(SDL_CreateThread) && SDL_DYNAMIC_API #undef SDL_CreateThread -#define SDL_CreateThread(fn, name, data) SDL_CreateThread_REAL(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthread, (pfnSDL_CurrentEndThread)_endthread) +#define SDL_CreateThread(fn, name, data) SDL_CreateThread_REAL(fn, name, data, (pfnSDL_CurrentBeginThread)SDL_beginthread, (pfnSDL_CurrentEndThread)SDL_endthread) #undef SDL_CreateThreadWithStackSize -#define SDL_CreateThreadWithStackSize(fn, name, stacksize, data) SDL_CreateThreadWithStackSize_REAL(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthread, (pfnSDL_CurrentEndThread)_endthread) +#define SDL_CreateThreadWithStackSize(fn, name, stacksize, data) SDL_CreateThreadWithStackSize_REAL(fn, name, data, (pfnSDL_CurrentBeginThread)SDL_beginthread, (pfnSDL_CurrentEndThread)SDL_endthread) #else -#define SDL_CreateThread(fn, name, data) SDL_CreateThread(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthread, (pfnSDL_CurrentEndThread)_endthread) -#define SDL_CreateThreadWithStackSize(fn, name, stacksize, data) SDL_CreateThreadWithStackSize(fn, name, stacksize, data, (pfnSDL_CurrentBeginThread)_beginthread, (pfnSDL_CurrentEndThread)_endthread) +#define SDL_CreateThread(fn, name, data) SDL_CreateThread(fn, name, data, (pfnSDL_CurrentBeginThread)SDL_beginthread, (pfnSDL_CurrentEndThread)SDL_endthread) +#define SDL_CreateThreadWithStackSize(fn, name, stacksize, data) SDL_CreateThreadWithStackSize(fn, name, stacksize, data, (pfnSDL_CurrentBeginThread)SDL_beginthread, (pfnSDL_CurrentEndThread)SDL_endthread) #endif #else /** - * Create a thread with a default stack size. + * Create a new thread with a default stack size. * - * This is equivalent to calling: - * SDL_CreateThreadWithStackSize(fn, name, 0, data); + * This is equivalent to calling: + * + * ```c + * SDL_CreateThreadWithStackSize(fn, name, 0, data); + * ``` + * + * \param fn the SDL_ThreadFunction function to call in the new thread + * \param name the name of the thread + * \param data a pointer that is passed to `fn` + * \returns an opaque pointer to the new thread object on success, NULL if the + * new thread could not be created; call SDL_GetError() for more + * information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateThreadWithStackSize + * \sa SDL_WaitThread */ extern DECLSPEC SDL_Thread *SDLCALL SDL_CreateThread(SDL_ThreadFunction fn, const char *name, void *data); /** - * Create a thread. + * Create a new thread with a specific stack size. * - * Thread naming is a little complicated: Most systems have very small - * limits for the string length (Haiku has 32 bytes, Linux currently has 16, - * Visual C++ 6.0 has nine!), and possibly other arbitrary rules. You'll - * have to see what happens with your system's debugger. The name should be - * UTF-8 (but using the naming limits of C identifiers is a better bet). - * There are no requirements for thread naming conventions, so long as the - * string is null-terminated UTF-8, but these guidelines are helpful in - * choosing a name: + * SDL makes an attempt to report `name` to the system, so that debuggers can + * display it. Not all platforms support this. * - * http://stackoverflow.com/questions/149932/naming-conventions-for-threads + * Thread naming is a little complicated: Most systems have very small limits + * for the string length (Haiku has 32 bytes, Linux currently has 16, Visual + * C++ 6.0 has _nine_!), and possibly other arbitrary rules. You'll have to + * see what happens with your system's debugger. The name should be UTF-8 (but + * using the naming limits of C identifiers is a better bet). There are no + * requirements for thread naming conventions, so long as the string is + * null-terminated UTF-8, but these guidelines are helpful in choosing a name: * - * If a system imposes requirements, SDL will try to munge the string for - * it (truncate, etc), but the original string contents will be available - * from SDL_GetThreadName(). + * https://stackoverflow.com/questions/149932/naming-conventions-for-threads * - * The size (in bytes) of the new stack can be specified. Zero means "use - * the system default" which might be wildly different between platforms - * (x86 Linux generally defaults to eight megabytes, an embedded device - * might be a few kilobytes instead). + * If a system imposes requirements, SDL will try to munge the string for it + * (truncate, etc), but the original string contents will be available from + * SDL_GetThreadName(). * - * In SDL 2.1, stacksize will be folded into the original SDL_CreateThread - * function. + * The size (in bytes) of the new stack can be specified. Zero means "use the + * system default" which might be wildly different between platforms. x86 + * Linux generally defaults to eight megabytes, an embedded device might be a + * few kilobytes instead. You generally need to specify a stack that is a + * multiple of the system's page size (in many cases, this is 4 kilobytes, but + * check your system documentation). + * + * In SDL 2.1, stack size will be folded into the original SDL_CreateThread + * function, but for backwards compatibility, this is currently a separate + * function. + * + * \param fn the SDL_ThreadFunction function to call in the new thread + * \param name the name of the thread + * \param stacksize the size, in bytes, to allocate for the new thread stack. + * \param data a pointer that is passed to `fn` + * \returns an opaque pointer to the new thread object on success, NULL if the + * new thread could not be created; call SDL_GetError() for more + * information. + * + * \since This function is available since SDL 2.0.9. + * + * \sa SDL_WaitThread */ extern DECLSPEC SDL_Thread *SDLCALL SDL_CreateThreadWithStackSize(SDL_ThreadFunction fn, const char *name, const size_t stacksize, void *data); @@ -200,137 +256,202 @@ SDL_CreateThreadWithStackSize(SDL_ThreadFunction fn, const char *name, const siz #endif /** - * Get the thread name, as it was specified in SDL_CreateThread(). - * This function returns a pointer to a UTF-8 string that names the - * specified thread, or NULL if it doesn't have a name. This is internal - * memory, not to be free()'d by the caller, and remains valid until the - * specified thread is cleaned up by SDL_WaitThread(). + * Get the thread name as it was specified in SDL_CreateThread(). + * + * This is internal memory, not to be freed by the caller, and remains valid + * until the specified thread is cleaned up by SDL_WaitThread(). + * + * \param thread the thread to query + * \returns a pointer to a UTF-8 string that names the specified thread, or + * NULL if it doesn't have a name. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateThread */ extern DECLSPEC const char *SDLCALL SDL_GetThreadName(SDL_Thread *thread); /** - * Get the thread identifier for the current thread. + * Get the thread identifier for the current thread. + * + * This thread identifier is as reported by the underlying operating system. + * If SDL is running on a platform that does not support threads the return + * value will always be zero. + * + * This function also returns a valid thread ID when called from the main + * thread. + * + * \returns the ID of the current thread. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetThreadID */ extern DECLSPEC SDL_threadID SDLCALL SDL_ThreadID(void); /** - * Get the thread identifier for the specified thread. + * Get the thread identifier for the specified thread. * - * Equivalent to SDL_ThreadID() if the specified thread is NULL. + * This thread identifier is as reported by the underlying operating system. + * If SDL is running on a platform that does not support threads the return + * value will always be zero. + * + * \param thread the thread to query + * \returns the ID of the specified thread, or the ID of the current thread if + * `thread` is NULL. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ThreadID */ extern DECLSPEC SDL_threadID SDLCALL SDL_GetThreadID(SDL_Thread * thread); /** - * Set the priority for the current thread + * Set the priority for the current thread. + * + * Note that some platforms will not let you alter the priority (or at least, + * promote the thread to a higher priority) at all, and some require you to be + * an administrator account. Be prepared for this to fail. + * + * \param priority the SDL_ThreadPriority to set + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC int SDLCALL SDL_SetThreadPriority(SDL_ThreadPriority priority); /** - * Wait for a thread to finish. Threads that haven't been detached will - * remain (as a "zombie") until this function cleans them up. Not doing so - * is a resource leak. + * Wait for a thread to finish. * - * Once a thread has been cleaned up through this function, the SDL_Thread - * that references it becomes invalid and should not be referenced again. - * As such, only one thread may call SDL_WaitThread() on another. + * Threads that haven't been detached will remain (as a "zombie") until this + * function cleans them up. Not doing so is a resource leak. * - * The return code for the thread function is placed in the area - * pointed to by \c status, if \c status is not NULL. + * Once a thread has been cleaned up through this function, the SDL_Thread + * that references it becomes invalid and should not be referenced again. As + * such, only one thread may call SDL_WaitThread() on another. * - * You may not wait on a thread that has been used in a call to - * SDL_DetachThread(). Use either that function or this one, but not - * both, or behavior is undefined. + * The return code for the thread function is placed in the area pointed to by + * `status`, if `status` is not NULL. * - * It is safe to pass NULL to this function; it is a no-op. + * You may not wait on a thread that has been used in a call to + * SDL_DetachThread(). Use either that function or this one, but not both, or + * behavior is undefined. + * + * It is safe to pass a NULL thread to this function; it is a no-op. + * + * Note that the thread pointer is freed by this function and is not valid + * afterward. + * + * \param thread the SDL_Thread pointer that was returned from the + * SDL_CreateThread() call that started this thread + * \param status pointer to an integer that will receive the value returned + * from the thread function by its 'return', or NULL to not + * receive such value back. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateThread + * \sa SDL_DetachThread */ extern DECLSPEC void SDLCALL SDL_WaitThread(SDL_Thread * thread, int *status); /** - * A thread may be "detached" to signify that it should not remain until - * another thread has called SDL_WaitThread() on it. Detaching a thread - * is useful for long-running threads that nothing needs to synchronize - * with or further manage. When a detached thread is done, it simply - * goes away. + * Let a thread clean up on exit without intervention. * - * There is no way to recover the return code of a detached thread. If you - * need this, don't detach the thread and instead use SDL_WaitThread(). + * A thread may be "detached" to signify that it should not remain until + * another thread has called SDL_WaitThread() on it. Detaching a thread is + * useful for long-running threads that nothing needs to synchronize with or + * further manage. When a detached thread is done, it simply goes away. * - * Once a thread is detached, you should usually assume the SDL_Thread isn't - * safe to reference again, as it will become invalid immediately upon - * the detached thread's exit, instead of remaining until someone has called - * SDL_WaitThread() to finally clean it up. As such, don't detach the same - * thread more than once. + * There is no way to recover the return code of a detached thread. If you + * need this, don't detach the thread and instead use SDL_WaitThread(). * - * If a thread has already exited when passed to SDL_DetachThread(), it will - * stop waiting for a call to SDL_WaitThread() and clean up immediately. - * It is not safe to detach a thread that might be used with SDL_WaitThread(). + * Once a thread is detached, you should usually assume the SDL_Thread isn't + * safe to reference again, as it will become invalid immediately upon the + * detached thread's exit, instead of remaining until someone has called + * SDL_WaitThread() to finally clean it up. As such, don't detach the same + * thread more than once. * - * You may not call SDL_WaitThread() on a thread that has been detached. - * Use either that function or this one, but not both, or behavior is - * undefined. + * If a thread has already exited when passed to SDL_DetachThread(), it will + * stop waiting for a call to SDL_WaitThread() and clean up immediately. It is + * not safe to detach a thread that might be used with SDL_WaitThread(). * - * It is safe to pass NULL to this function; it is a no-op. + * You may not call SDL_WaitThread() on a thread that has been detached. Use + * either that function or this one, but not both, or behavior is undefined. + * + * It is safe to pass NULL to this function; it is a no-op. + * + * \param thread the SDL_Thread pointer that was returned from the + * SDL_CreateThread() call that started this thread + * + * \since This function is available since SDL 2.0.2. + * + * \sa SDL_CreateThread + * \sa SDL_WaitThread */ extern DECLSPEC void SDLCALL SDL_DetachThread(SDL_Thread * thread); /** - * \brief Create an identifier that is globally visible to all threads but refers to data that is thread-specific. + * Create a piece of thread-local storage. * - * \return The newly created thread local storage identifier, or 0 on error + * This creates an identifier that is globally visible to all threads but + * refers to data that is thread-specific. * - * \code - * static SDL_SpinLock tls_lock; - * static SDL_TLSID thread_local_storage; - * - * void SetMyThreadData(void *value) - * { - * if (!thread_local_storage) { - * SDL_AtomicLock(&tls_lock); - * if (!thread_local_storage) { - * thread_local_storage = SDL_TLSCreate(); - * } - * SDL_AtomicUnlock(&tls_lock); - * } - * SDL_TLSSet(thread_local_storage, value, 0); - * } - * - * void *GetMyThreadData(void) - * { - * return SDL_TLSGet(thread_local_storage); - * } - * \endcode + * \returns the newly created thread local storage identifier or 0 on error. * - * \sa SDL_TLSGet() - * \sa SDL_TLSSet() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_TLSGet + * \sa SDL_TLSSet */ extern DECLSPEC SDL_TLSID SDLCALL SDL_TLSCreate(void); /** - * \brief Get the value associated with a thread local storage ID for the current thread. + * Get the current thread's value associated with a thread local storage ID. * - * \param id The thread local storage ID + * \param id the thread local storage ID + * \returns the value associated with the ID for the current thread or NULL if + * no value has been set; call SDL_GetError() for more information. * - * \return The value associated with the ID for the current thread, or NULL if no value has been set. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_TLSCreate() - * \sa SDL_TLSSet() + * \sa SDL_TLSCreate + * \sa SDL_TLSSet */ extern DECLSPEC void * SDLCALL SDL_TLSGet(SDL_TLSID id); /** - * \brief Set the value associated with a thread local storage ID for the current thread. + * Set the current thread's value associated with a thread local storage ID. * - * \param id The thread local storage ID - * \param value The value to associate with the ID for the current thread - * \param destructor A function called when the thread exits, to free the value. + * The function prototype for `destructor` is: * - * \return 0 on success, -1 on error + * ```c + * void destructor(void *value) + * ``` * - * \sa SDL_TLSCreate() - * \sa SDL_TLSGet() + * where its parameter `value` is what was passed as `value` to SDL_TLSSet(). + * + * \param id the thread local storage ID + * \param value the value to associate with the ID for the current thread + * \param destructor a function called when the thread exits, to free the + * value + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_TLSCreate + * \sa SDL_TLSGet */ extern DECLSPEC int SDLCALL SDL_TLSSet(SDL_TLSID id, const void *value, void (SDLCALL *destructor)(void*)); +/** + * Cleanup all TLS data for this thread. + * + * \since This function is available since SDL 2.0.16. + */ +extern DECLSPEC void SDLCALL SDL_TLSCleanup(void); /* Ends C function definitions when using C++ */ #ifdef __cplusplus diff --git a/libs/SDL2/include/SDL_timer.h b/libs/SDL2/include/SDL_timer.h index 2a47b043a..62f81d42d 100644 --- a/libs/SDL2/include/SDL_timer.h +++ b/libs/SDL2/include/SDL_timer.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -38,45 +38,121 @@ extern "C" { #endif /** - * \brief Get the number of milliseconds since the SDL library initialization. + * Get the number of milliseconds since SDL library initialization. * - * \note This value wraps if the program runs for more than ~49 days. + * This value wraps if the program runs for more than ~49 days. + * + * This function is not recommended as of SDL 2.0.18; use SDL_GetTicks64() + * instead, where the value doesn't wrap every ~49 days. There are places in + * SDL where we provide a 32-bit timestamp that can not change without + * breaking binary compatibility, though, so this function isn't officially + * deprecated. + * + * \returns an unsigned 32-bit value representing the number of milliseconds + * since the SDL library initialized. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_TICKS_PASSED */ extern DECLSPEC Uint32 SDLCALL SDL_GetTicks(void); /** - * \brief Compare SDL ticks values, and return true if A has passed B + * Get the number of milliseconds since SDL library initialization. * - * e.g. if you want to wait 100 ms, you could do this: - * Uint32 timeout = SDL_GetTicks() + 100; - * while (!SDL_TICKS_PASSED(SDL_GetTicks(), timeout)) { - * ... do work until timeout has elapsed - * } + * Note that you should not use the SDL_TICKS_PASSED macro with values + * returned by this function, as that macro does clever math to compensate for + * the 32-bit overflow every ~49 days that SDL_GetTicks() suffers from. 64-bit + * values from this function can be safely compared directly. + * + * For example, if you want to wait 100 ms, you could do this: + * + * ```c + * const Uint64 timeout = SDL_GetTicks64() + 100; + * while (SDL_GetTicks64() < timeout) { + * // ... do work until timeout has elapsed + * } + * ``` + * + * \returns an unsigned 64-bit value representing the number of milliseconds + * since the SDL library initialized. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC Uint64 SDLCALL SDL_GetTicks64(void); + +/** + * Compare 32-bit SDL ticks values, and return true if `A` has passed `B`. + * + * This should be used with results from SDL_GetTicks(), as this macro + * attempts to deal with the 32-bit counter wrapping back to zero every ~49 + * days, but should _not_ be used with SDL_GetTicks64(), which does not have + * that problem. + * + * For example, with SDL_GetTicks(), if you want to wait 100 ms, you could + * do this: + * + * ```c + * const Uint32 timeout = SDL_GetTicks() + 100; + * while (!SDL_TICKS_PASSED(SDL_GetTicks(), timeout)) { + * // ... do work until timeout has elapsed + * } + * ``` + * + * Note that this does not handle tick differences greater + * than 2^31 so take care when using the above kind of code + * with large timeout delays (tens of days). */ #define SDL_TICKS_PASSED(A, B) ((Sint32)((B) - (A)) <= 0) /** - * \brief Get the current value of the high resolution counter + * Get the current value of the high resolution counter. + * + * This function is typically used for profiling. + * + * The counter values are only meaningful relative to each other. Differences + * between values can be converted to times by using + * SDL_GetPerformanceFrequency(). + * + * \returns the current counter value. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetPerformanceFrequency */ extern DECLSPEC Uint64 SDLCALL SDL_GetPerformanceCounter(void); /** - * \brief Get the count per second of the high resolution counter + * Get the count per second of the high resolution counter. + * + * \returns a platform-specific count per second. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetPerformanceCounter */ extern DECLSPEC Uint64 SDLCALL SDL_GetPerformanceFrequency(void); /** - * \brief Wait a specified number of milliseconds before returning. + * Wait a specified number of milliseconds before returning. + * + * This function waits a specified number of milliseconds before returning. It + * waits at least the specified time, but possibly longer due to OS + * scheduling. + * + * \param ms the number of milliseconds to delay + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC void SDLCALL SDL_Delay(Uint32 ms); /** - * Function prototype for the timer callback function. + * Function prototype for the timer callback function. * - * The callback function is passed the current timer interval and returns - * the next timer interval. If the returned value is the same as the one - * passed in, the periodic alarm continues, otherwise a new alarm is - * scheduled. If the callback returns 0, the periodic alarm is cancelled. + * The callback function is passed the current timer interval and returns + * the next timer interval. If the returned value is the same as the one + * passed in, the periodic alarm continues, otherwise a new alarm is + * scheduled. If the callback returns 0, the periodic alarm is cancelled. */ typedef Uint32 (SDLCALL * SDL_TimerCallback) (Uint32 interval, void *param); @@ -86,20 +162,51 @@ typedef Uint32 (SDLCALL * SDL_TimerCallback) (Uint32 interval, void *param); typedef int SDL_TimerID; /** - * \brief Add a new timer to the pool of timers already running. + * Call a callback function at a future time. * - * \return A timer ID, or 0 when an error occurs. + * If you use this function, you must pass `SDL_INIT_TIMER` to SDL_Init(). + * + * The callback function is passed the current timer interval and the user + * supplied parameter from the SDL_AddTimer() call and should return the next + * timer interval. If the value returned from the callback is 0, the timer is + * canceled. + * + * The callback is run on a separate thread. + * + * Timers take into account the amount of time it took to execute the + * callback. For example, if the callback took 250 ms to execute and returned + * 1000 (ms), the timer would only wait another 750 ms before its next + * iteration. + * + * Timing may be inexact due to OS scheduling. Be sure to note the current + * time with SDL_GetTicks() or SDL_GetPerformanceCounter() in case your + * callback needs to adjust for variances. + * + * \param interval the timer delay, in milliseconds, passed to `callback` + * \param callback the SDL_TimerCallback function to call when the specified + * `interval` elapses + * \param param a pointer that is passed to `callback` + * \returns a timer ID or 0 if an error occurs; call SDL_GetError() for more + * information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RemoveTimer */ extern DECLSPEC SDL_TimerID SDLCALL SDL_AddTimer(Uint32 interval, SDL_TimerCallback callback, void *param); /** - * \brief Remove a timer knowing its ID. + * Remove a timer created with SDL_AddTimer(). * - * \return A boolean value indicating success or failure. + * \param id the ID of the timer to remove + * \returns SDL_TRUE if the timer is removed or SDL_FALSE if the timer wasn't + * found. * - * \warning It is not safe to remove a timer multiple times. + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AddTimer */ extern DECLSPEC SDL_bool SDLCALL SDL_RemoveTimer(SDL_TimerID id); diff --git a/libs/SDL2/include/SDL_touch.h b/libs/SDL2/include/SDL_touch.h index 99dbcb8c3..9b00716b2 100644 --- a/libs/SDL2/include/SDL_touch.h +++ b/libs/SDL2/include/SDL_touch.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -64,30 +64,70 @@ typedef struct SDL_Finger #define SDL_MOUSE_TOUCHID ((Sint64)-1) -/* Function prototypes */ - /** - * \brief Get the number of registered touch devices. + * Get the number of registered touch devices. + * + * On some platforms SDL first sees the touch device if it was actually used. + * Therefore SDL_GetNumTouchDevices() may return 0 although devices are + * available. After using all devices at least once the number will be + * correct. + * + * This was fixed for Android in SDL 2.0.1. + * + * \returns the number of registered touch devices. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetTouchDevice */ extern DECLSPEC int SDLCALL SDL_GetNumTouchDevices(void); /** - * \brief Get the touch ID with the given index, or 0 if the index is invalid. + * Get the touch ID with the given index. + * + * \param index the touch device index + * \returns the touch ID with the given index on success or 0 if the index is + * invalid; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetNumTouchDevices */ extern DECLSPEC SDL_TouchID SDLCALL SDL_GetTouchDevice(int index); /** - * \brief Get the type of the given touch device. + * Get the type of the given touch device. + * + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC SDL_TouchDeviceType SDLCALL SDL_GetTouchDeviceType(SDL_TouchID touchID); /** - * \brief Get the number of active fingers for a given touch device. + * Get the number of active fingers for a given touch device. + * + * \param touchID the ID of a touch device + * \returns the number of active fingers for a given touch device on success + * or 0 on failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetTouchFinger */ extern DECLSPEC int SDLCALL SDL_GetNumTouchFingers(SDL_TouchID touchID); /** - * \brief Get the finger object of the given touch, with the given index. + * Get the finger object for specified touch device ID and finger index. + * + * The returned resource is owned by SDL and should not be deallocated. + * + * \param touchID the ID of the requested touch device + * \param index the index of the requested finger + * \returns a pointer to the SDL_Finger object or NULL if no object at the + * given ID and index could be found. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RecordGesture */ extern DECLSPEC SDL_Finger * SDLCALL SDL_GetTouchFinger(SDL_TouchID touchID, int index); diff --git a/libs/SDL2/include/SDL_types.h b/libs/SDL2/include/SDL_types.h index 9c3e9896f..355fb501a 100644 --- a/libs/SDL2/include/SDL_types.h +++ b/libs/SDL2/include/SDL_types.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/include/SDL_version.h b/libs/SDL2/include/SDL_version.h index 6c7499d32..2716eba7b 100644 --- a/libs/SDL2/include/SDL_version.h +++ b/libs/SDL2/include/SDL_version.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -37,16 +37,16 @@ extern "C" { #endif /** - * \brief Information the version of SDL in use. + * Information about the version of SDL in use. * - * Represents the library's version as three levels: major revision - * (increments with massive changes, additions, and enhancements), - * minor revision (increments with backwards-compatible changes to the - * major revision), and patchlevel (increments with fixes to the minor - * revision). + * Represents the library's version as three levels: major revision + * (increments with massive changes, additions, and enhancements), + * minor revision (increments with backwards-compatible changes to the + * major revision), and patchlevel (increments with fixes to the minor + * revision). * - * \sa SDL_VERSION - * \sa SDL_GetVersion + * \sa SDL_VERSION + * \sa SDL_GetVersion */ typedef struct SDL_version { @@ -59,22 +59,22 @@ typedef struct SDL_version */ #define SDL_MAJOR_VERSION 2 #define SDL_MINOR_VERSION 0 -#define SDL_PATCHLEVEL 10 +#define SDL_PATCHLEVEL 20 /** - * \brief Macro to determine SDL version program was compiled against. + * Macro to determine SDL version program was compiled against. * - * This macro fills in a SDL_version structure with the version of the - * library you compiled against. This is determined by what header the - * compiler uses. Note that if you dynamically linked the library, you might - * have a slightly newer or older version at runtime. That version can be - * determined with SDL_GetVersion(), which, unlike SDL_VERSION(), - * is not a macro. + * This macro fills in a SDL_version structure with the version of the + * library you compiled against. This is determined by what header the + * compiler uses. Note that if you dynamically linked the library, you might + * have a slightly newer or older version at runtime. That version can be + * determined with SDL_GetVersion(), which, unlike SDL_VERSION(), + * is not a macro. * - * \param x A pointer to a SDL_version struct to initialize. + * \param x A pointer to a SDL_version struct to initialize. * - * \sa SDL_version - * \sa SDL_GetVersion + * \sa SDL_version + * \sa SDL_GetVersion */ #define SDL_VERSION(x) \ { \ @@ -107,48 +107,74 @@ typedef struct SDL_version (SDL_COMPILEDVERSION >= SDL_VERSIONNUM(X, Y, Z)) /** - * \brief Get the version of SDL that is linked against your program. + * Get the version of SDL that is linked against your program. * - * If you are linking to SDL dynamically, then it is possible that the - * current version will be different than the version you compiled against. - * This function returns the current version, while SDL_VERSION() is a - * macro that tells you what version you compiled with. + * If you are linking to SDL dynamically, then it is possible that the current + * version will be different than the version you compiled against. This + * function returns the current version, while SDL_VERSION() is a macro that + * tells you what version you compiled with. * - * \code - * SDL_version compiled; - * SDL_version linked; + * This function may be called safely at any time, even before SDL_Init(). * - * SDL_VERSION(&compiled); - * SDL_GetVersion(&linked); - * printf("We compiled against SDL version %d.%d.%d ...\n", - * compiled.major, compiled.minor, compiled.patch); - * printf("But we linked against SDL version %d.%d.%d.\n", - * linked.major, linked.minor, linked.patch); - * \endcode + * \param ver the SDL_version structure that contains the version information * - * This function may be called safely at any time, even before SDL_Init(). + * \since This function is available since SDL 2.0.0. * - * \sa SDL_VERSION + * \sa SDL_GetRevision */ extern DECLSPEC void SDLCALL SDL_GetVersion(SDL_version * ver); /** - * \brief Get the code revision of SDL that is linked against your program. + * Get the code revision of SDL that is linked against your program. * - * Returns an arbitrary string (a hash value) uniquely identifying the - * exact revision of the SDL library in use, and is only useful in comparing - * against other revisions. It is NOT an incrementing number. + * This value is the revision of the code you are linked with and may be + * different from the code you are compiling with, which is found in the + * constant SDL_REVISION. + * + * The revision is arbitrary string (a hash value) uniquely identifying the + * exact revision of the SDL library in use, and is only useful in comparing + * against other revisions. It is NOT an incrementing number. + * + * If SDL wasn't built from a git repository with the appropriate tools, this + * will return an empty string. + * + * Prior to SDL 2.0.16, before development moved to GitHub, this returned a + * hash for a Mercurial repository. + * + * You shouldn't use this function for anything but logging it for debugging + * purposes. The string is not intended to be reliable in any way. + * + * \returns an arbitrary string, uniquely identifying the exact revision of + * the SDL library in use. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetVersion */ extern DECLSPEC const char *SDLCALL SDL_GetRevision(void); /** - * \brief Get the revision number of SDL that is linked against your program. + * Obsolete function, do not use. * - * Returns a number uniquely identifying the exact revision of the SDL - * library in use. It is an incrementing number based on commits to - * hg.libsdl.org. + * When SDL was hosted in a Mercurial repository, and was built carefully, + * this would return the revision number that the build was created from. This + * number was not reliable for several reasons, but more importantly, SDL is + * now hosted in a git repository, which does not offer numbers at all, only + * hashes. This function only ever returns zero now. Don't use it. + * + * Before SDL 2.0.16, this might have returned an unreliable, but non-zero + * number. + * + * \deprecated Use SDL_GetRevision() instead; if SDL was carefully built, it + * will return a git hash. + * + * \returns zero, always, in modern SDL releases. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetRevision */ -extern DECLSPEC int SDLCALL SDL_GetRevisionNumber(void); +extern SDL_DEPRECATED DECLSPEC int SDLCALL SDL_GetRevisionNumber(void); /* Ends C function definitions when using C++ */ diff --git a/libs/SDL2/include/SDL_video.h b/libs/SDL2/include/SDL_video.h index 352afd436..e43cb27ec 100644 --- a/libs/SDL2/include/SDL_video.h +++ b/libs/SDL2/include/SDL_video.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -65,9 +65,12 @@ typedef struct * \sa SDL_CreateWindow() * \sa SDL_CreateWindowFrom() * \sa SDL_DestroyWindow() + * \sa SDL_FlashWindow() * \sa SDL_GetWindowData() * \sa SDL_GetWindowFlags() * \sa SDL_GetWindowGrab() + * \sa SDL_GetWindowKeyboardGrab() + * \sa SDL_GetWindowMouseGrab() * \sa SDL_GetWindowPosition() * \sa SDL_GetWindowSize() * \sa SDL_GetWindowTitle() @@ -79,6 +82,8 @@ typedef struct * \sa SDL_SetWindowData() * \sa SDL_SetWindowFullscreen() * \sa SDL_SetWindowGrab() + * \sa SDL_SetWindowKeyboardGrab() + * \sa SDL_SetWindowMouseGrab() * \sa SDL_SetWindowIcon() * \sa SDL_SetWindowPosition() * \sa SDL_SetWindowSize() @@ -96,7 +101,6 @@ typedef struct SDL_Window SDL_Window; */ typedef enum { - /* !!! FIXME: change this to name = (1<= 1 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetVideoDriver */ extern DECLSPEC int SDLCALL SDL_GetNumVideoDrivers(void); /** - * \brief Get the name of a built in video driver. + * Get the name of a built in video driver. * - * \note The video drivers are presented in the order in which they are - * normally checked during initialization. + * The video drivers are presented in the order in which they are normally + * checked during initialization. * - * \sa SDL_GetNumVideoDrivers() + * \param index the index of a video driver + * \returns the name of the video driver with the given **index**. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetNumVideoDrivers */ extern DECLSPEC const char *SDLCALL SDL_GetVideoDriver(int index); /** - * \brief Initialize the video subsystem, optionally specifying a video driver. + * Initialize the video subsystem, optionally specifying a video driver. * - * \param driver_name Initialize a specific driver by name, or NULL for the - * default video driver. + * This function initializes the video subsystem, setting up a connection to + * the window manager, etc, and determines the available display modes and + * pixel formats, but does not initialize a window or graphics mode. * - * \return 0 on success, -1 on error + * If you use this function and you haven't used the SDL_INIT_VIDEO flag with + * either SDL_Init() or SDL_InitSubSystem(), you should call SDL_VideoQuit() + * before calling SDL_Quit(). * - * This function initializes the video subsystem; setting up a connection - * to the window manager, etc, and determines the available display modes - * and pixel formats, but does not initialize a window or graphics mode. + * It is safe to call this function multiple times. SDL_VideoInit() will call + * SDL_VideoQuit() itself if the video subsystem has already been initialized. * - * \sa SDL_VideoQuit() + * You can use SDL_GetNumVideoDrivers() and SDL_GetVideoDriver() to find a + * specific `driver_name`. + * + * \param driver_name the name of a video driver to initialize, or NULL for + * the default driver + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetNumVideoDrivers + * \sa SDL_GetVideoDriver + * \sa SDL_InitSubSystem + * \sa SDL_VideoQuit */ extern DECLSPEC int SDLCALL SDL_VideoInit(const char *driver_name); /** - * \brief Shuts down the video subsystem. + * Shut down the video subsystem, if initialized with SDL_VideoInit(). * - * This function closes all windows, and restores the original video mode. + * This function closes all windows, and restores the original video mode. * - * \sa SDL_VideoInit() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_VideoInit */ extern DECLSPEC void SDLCALL SDL_VideoQuit(void); /** - * \brief Returns the name of the currently initialized video driver. + * Get the name of the currently initialized video driver. * - * \return The name of the current video driver or NULL if no driver - * has been initialized + * \returns the name of the current video driver or NULL if no driver has been + * initialized. * - * \sa SDL_GetNumVideoDrivers() - * \sa SDL_GetVideoDriver() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetNumVideoDrivers + * \sa SDL_GetVideoDriver */ extern DECLSPEC const char *SDLCALL SDL_GetCurrentVideoDriver(void); /** - * \brief Returns the number of available video displays. + * Get the number of available video displays. * - * \sa SDL_GetDisplayBounds() + * \returns a number >= 1 or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetDisplayBounds */ extern DECLSPEC int SDLCALL SDL_GetNumVideoDisplays(void); /** - * \brief Get the name of a display in UTF-8 encoding + * Get the name of a display in UTF-8 encoding. * - * \return The name of a display, or NULL for an invalid display index. + * \param displayIndex the index of display from which the name should be + * queried + * \returns the name of a display or NULL for an invalid display index or + * failure; call SDL_GetError() for more information. * - * \sa SDL_GetNumVideoDisplays() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetNumVideoDisplays */ extern DECLSPEC const char * SDLCALL SDL_GetDisplayName(int displayIndex); /** - * \brief Get the desktop area represented by a display, with the primary - * display located at 0,0 + * Get the desktop area represented by a display. * - * \return 0 on success, or -1 if the index is out of range. + * The primary display (`displayIndex` zero) is always located at 0,0. * - * \sa SDL_GetNumVideoDisplays() + * \param displayIndex the index of the display to query + * \param rect the SDL_Rect structure filled in with the display bounds + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetNumVideoDisplays */ extern DECLSPEC int SDLCALL SDL_GetDisplayBounds(int displayIndex, SDL_Rect * rect); /** - * \brief Get the usable desktop area represented by a display, with the - * primary display located at 0,0 + * Get the usable desktop area represented by a display. * - * This is the same area as SDL_GetDisplayBounds() reports, but with portions - * reserved by the system removed. For example, on Mac OS X, this subtracts - * the area occupied by the menu bar and dock. + * The primary display (`displayIndex` zero) is always located at 0,0. * - * Setting a window to be fullscreen generally bypasses these unusable areas, - * so these are good guidelines for the maximum space available to a - * non-fullscreen window. + * This is the same area as SDL_GetDisplayBounds() reports, but with portions + * reserved by the system removed. For example, on Apple's macOS, this + * subtracts the area occupied by the menu bar and dock. * - * \return 0 on success, or -1 if the index is out of range. + * Setting a window to be fullscreen generally bypasses these unusable areas, + * so these are good guidelines for the maximum space available to a + * non-fullscreen window. * - * \sa SDL_GetDisplayBounds() - * \sa SDL_GetNumVideoDisplays() + * The parameter `rect` is ignored if it is NULL. + * + * This function also returns -1 if the parameter `displayIndex` is out of + * range. + * + * \param displayIndex the index of the display to query the usable bounds + * from + * \param rect the SDL_Rect structure filled in with the display bounds + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.5. + * + * \sa SDL_GetDisplayBounds + * \sa SDL_GetNumVideoDisplays */ extern DECLSPEC int SDLCALL SDL_GetDisplayUsableBounds(int displayIndex, SDL_Rect * rect); /** - * \brief Get the dots/pixels-per-inch for a display + * Get the dots/pixels-per-inch for a display. * - * \note Diagonal, horizontal and vertical DPI can all be optionally - * returned if the parameter is non-NULL. + * Diagonal, horizontal and vertical DPI can all be optionally returned if the + * appropriate parameter is non-NULL. * - * \return 0 on success, or -1 if no DPI information is available or the index is out of range. + * A failure of this function usually means that either no DPI information is + * available or the `displayIndex` is out of range. * - * \sa SDL_GetNumVideoDisplays() + * \param displayIndex the index of the display from which DPI information + * should be queried + * \param ddpi a pointer filled in with the diagonal DPI of the display; may + * be NULL + * \param hdpi a pointer filled in with the horizontal DPI of the display; may + * be NULL + * \param vdpi a pointer filled in with the vertical DPI of the display; may + * be NULL + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.4. + * + * \sa SDL_GetNumVideoDisplays */ extern DECLSPEC int SDLCALL SDL_GetDisplayDPI(int displayIndex, float * ddpi, float * hdpi, float * vdpi); /** - * \brief Get the orientation of a display + * Get the orientation of a display. * - * \return The orientation of the display, or SDL_ORIENTATION_UNKNOWN if it isn't available. + * \param displayIndex the index of the display to query + * \returns The SDL_DisplayOrientation enum value of the display, or + * `SDL_ORIENTATION_UNKNOWN` if it isn't available. * - * \sa SDL_GetNumVideoDisplays() + * \since This function is available since SDL 2.0.9. + * + * \sa SDL_GetNumVideoDisplays */ extern DECLSPEC SDL_DisplayOrientation SDLCALL SDL_GetDisplayOrientation(int displayIndex); /** - * \brief Returns the number of available display modes. + * Get the number of available display modes. * - * \sa SDL_GetDisplayMode() + * The `displayIndex` needs to be in the range from 0 to + * SDL_GetNumVideoDisplays() - 1. + * + * \param displayIndex the index of the display to query + * \returns a number >= 1 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetDisplayMode + * \sa SDL_GetNumVideoDisplays */ extern DECLSPEC int SDLCALL SDL_GetNumDisplayModes(int displayIndex); /** - * \brief Fill in information about a specific display mode. + * Get information about a specific display mode. * - * \note The display modes are sorted in this priority: - * \li bits per pixel -> more colors to fewer colors - * \li width -> largest to smallest - * \li height -> largest to smallest - * \li refresh rate -> highest to lowest + * The display modes are sorted in this priority: * - * \sa SDL_GetNumDisplayModes() + * - width -> largest to smallest + * - height -> largest to smallest + * - bits per pixel -> more colors to fewer colors + * - packed pixel layout -> largest to smallest + * - refresh rate -> highest to lowest + * + * \param displayIndex the index of the display to query + * \param modeIndex the index of the display mode to query + * \param mode an SDL_DisplayMode structure filled in with the mode at + * `modeIndex` + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetNumDisplayModes */ extern DECLSPEC int SDLCALL SDL_GetDisplayMode(int displayIndex, int modeIndex, SDL_DisplayMode * mode); /** - * \brief Fill in information about the desktop display mode. + * Get information about the desktop's display mode. + * + * There's a difference between this function and SDL_GetCurrentDisplayMode() + * when SDL runs fullscreen and has changed the resolution. In that case this + * function will return the previous native display mode, and not the current + * display mode. + * + * \param displayIndex the index of the display to query + * \param mode an SDL_DisplayMode structure filled in with the current display + * mode + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetCurrentDisplayMode + * \sa SDL_GetDisplayMode + * \sa SDL_SetWindowDisplayMode */ extern DECLSPEC int SDLCALL SDL_GetDesktopDisplayMode(int displayIndex, SDL_DisplayMode * mode); /** - * \brief Fill in information about the current display mode. + * Get information about the current display mode. + * + * There's a difference between this function and SDL_GetDesktopDisplayMode() + * when SDL runs fullscreen and has changed the resolution. In that case this + * function will return the current display mode, and not the previous native + * display mode. + * + * \param displayIndex the index of the display to query + * \param mode an SDL_DisplayMode structure filled in with the current display + * mode + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetDesktopDisplayMode + * \sa SDL_GetDisplayMode + * \sa SDL_GetNumVideoDisplays + * \sa SDL_SetWindowDisplayMode */ extern DECLSPEC int SDLCALL SDL_GetCurrentDisplayMode(int displayIndex, SDL_DisplayMode * mode); /** - * \brief Get the closest match to the requested display mode. + * Get the closest match to the requested display mode. * - * \param displayIndex The index of display from which mode should be queried. - * \param mode The desired display mode - * \param closest A pointer to a display mode to be filled in with the closest - * match of the available display modes. + * The available display modes are scanned and `closest` is filled in with the + * closest mode matching the requested mode and returned. The mode format and + * refresh rate default to the desktop mode if they are set to 0. The modes + * are scanned with size being first priority, format being second priority, + * and finally checking the refresh rate. If all the available modes are too + * small, then NULL is returned. * - * \return The passed in value \c closest, or NULL if no matching video mode - * was available. + * \param displayIndex the index of the display to query + * \param mode an SDL_DisplayMode structure containing the desired display + * mode + * \param closest an SDL_DisplayMode structure filled in with the closest + * match of the available display modes + * \returns the passed in value `closest` or NULL if no matching video mode + * was available; call SDL_GetError() for more information. * - * The available display modes are scanned, and \c closest is filled in with the - * closest mode matching the requested mode and returned. The mode format and - * refresh_rate default to the desktop mode if they are 0. The modes are - * scanned with size being first priority, format being second priority, and - * finally checking the refresh_rate. If all the available modes are too - * small, then NULL is returned. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_GetNumDisplayModes() - * \sa SDL_GetDisplayMode() + * \sa SDL_GetDisplayMode + * \sa SDL_GetNumDisplayModes */ extern DECLSPEC SDL_DisplayMode * SDLCALL SDL_GetClosestDisplayMode(int displayIndex, const SDL_DisplayMode * mode, SDL_DisplayMode * closest); /** - * \brief Get the display index associated with a window. + * Get the index of the display associated with a window. * - * \return the display index of the display containing the center of the - * window, or -1 on error. + * \param window the window to query + * \returns the index of the display containing the center of the window on + * success or a negative error code on failure; call SDL_GetError() + * for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetDisplayBounds + * \sa SDL_GetNumVideoDisplays */ extern DECLSPEC int SDLCALL SDL_GetWindowDisplayIndex(SDL_Window * window); /** - * \brief Set the display mode used when a fullscreen window is visible. + * Set the display mode to use when a window is visible at fullscreen. * - * By default the window's dimensions and the desktop format and refresh rate - * are used. + * This only affects the display mode used when the window is fullscreen. To + * change the window size when the window is not fullscreen, use + * SDL_SetWindowSize(). * - * \param window The window for which the display mode should be set. - * \param mode The mode to use, or NULL for the default mode. + * \param window the window to affect + * \param mode the SDL_DisplayMode structure representing the mode to use, or + * NULL to use the window's dimensions and the desktop's format + * and refresh rate + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 if setting the display mode failed. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_GetWindowDisplayMode() - * \sa SDL_SetWindowFullscreen() + * \sa SDL_GetWindowDisplayMode + * \sa SDL_SetWindowFullscreen */ extern DECLSPEC int SDLCALL SDL_SetWindowDisplayMode(SDL_Window * window, - const SDL_DisplayMode - * mode); + const SDL_DisplayMode * mode); /** - * \brief Fill in information about the display mode used when a fullscreen - * window is visible. + * Query the display mode to use when a window is visible at fullscreen. * - * \sa SDL_SetWindowDisplayMode() - * \sa SDL_SetWindowFullscreen() + * \param window the window to query + * \param mode an SDL_DisplayMode structure filled in with the fullscreen + * display mode + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetWindowDisplayMode + * \sa SDL_SetWindowFullscreen */ extern DECLSPEC int SDLCALL SDL_GetWindowDisplayMode(SDL_Window * window, SDL_DisplayMode * mode); /** - * \brief Get the pixel format associated with the window. + * Get the raw ICC profile data for the screen the window is currently on. + * + * Data returned should be freed with SDL_free. + * + * \param window the window to query + * \param size the size of the ICC profile + * \returns the raw ICC profile data on success or NULL on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC void* SDLCALL SDL_GetWindowICCProfile(SDL_Window * window, size_t* size); + +/** + * Get the pixel format associated with the window. + * + * \param window the window to query + * \returns the pixel format of the window on success or + * SDL_PIXELFORMAT_UNKNOWN on failure; call SDL_GetError() for more + * information. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC Uint32 SDLCALL SDL_GetWindowPixelFormat(SDL_Window * window); /** - * \brief Create a window with the specified position, dimensions, and flags. + * Create a window with the specified position, dimensions, and flags. * - * \param title The title of the window, in UTF-8 encoding. - * \param x The x position of the window, ::SDL_WINDOWPOS_CENTERED, or - * ::SDL_WINDOWPOS_UNDEFINED. - * \param y The y position of the window, ::SDL_WINDOWPOS_CENTERED, or - * ::SDL_WINDOWPOS_UNDEFINED. - * \param w The width of the window, in screen coordinates. - * \param h The height of the window, in screen coordinates. - * \param flags The flags for the window, a mask of any of the following: - * ::SDL_WINDOW_FULLSCREEN, ::SDL_WINDOW_OPENGL, - * ::SDL_WINDOW_HIDDEN, ::SDL_WINDOW_BORDERLESS, - * ::SDL_WINDOW_RESIZABLE, ::SDL_WINDOW_MAXIMIZED, - * ::SDL_WINDOW_MINIMIZED, ::SDL_WINDOW_INPUT_GRABBED, - * ::SDL_WINDOW_ALLOW_HIGHDPI, ::SDL_WINDOW_VULKAN. + * `flags` may be any of the following OR'd together: * - * \return The created window, or NULL if window creation failed. + * - `SDL_WINDOW_FULLSCREEN`: fullscreen window + * - `SDL_WINDOW_FULLSCREEN_DESKTOP`: fullscreen window at desktop resolution + * - `SDL_WINDOW_OPENGL`: window usable with an OpenGL context + * - `SDL_WINDOW_VULKAN`: window usable with a Vulkan instance + * - `SDL_WINDOW_METAL`: window usable with a Metal instance + * - `SDL_WINDOW_HIDDEN`: window is not visible + * - `SDL_WINDOW_BORDERLESS`: no window decoration + * - `SDL_WINDOW_RESIZABLE`: window can be resized + * - `SDL_WINDOW_MINIMIZED`: window is minimized + * - `SDL_WINDOW_MAXIMIZED`: window is maximized + * - `SDL_WINDOW_INPUT_GRABBED`: window has grabbed input focus + * - `SDL_WINDOW_ALLOW_HIGHDPI`: window should be created in high-DPI mode if + * supported (>= SDL 2.0.1) * - * If the window is created with the SDL_WINDOW_ALLOW_HIGHDPI flag, its size - * in pixels may differ from its size in screen coordinates on platforms with - * high-DPI support (e.g. iOS and Mac OS X). Use SDL_GetWindowSize() to query - * the client area's size in screen coordinates, and SDL_GL_GetDrawableSize(), - * SDL_Vulkan_GetDrawableSize(), or SDL_GetRendererOutputSize() to query the - * drawable size in pixels. + * `SDL_WINDOW_SHOWN` is ignored by SDL_CreateWindow(). The SDL_Window is + * implicitly shown if SDL_WINDOW_HIDDEN is not set. `SDL_WINDOW_SHOWN` may be + * queried later using SDL_GetWindowFlags(). * - * If the window is created with any of the SDL_WINDOW_OPENGL or - * SDL_WINDOW_VULKAN flags, then the corresponding LoadLibrary function - * (SDL_GL_LoadLibrary or SDL_Vulkan_LoadLibrary) is called and the - * corresponding UnloadLibrary function is called by SDL_DestroyWindow(). + * On Apple's macOS, you **must** set the NSHighResolutionCapable Info.plist + * property to YES, otherwise you will not receive a High-DPI OpenGL canvas. * - * If SDL_WINDOW_VULKAN is specified and there isn't a working Vulkan driver, - * SDL_CreateWindow() will fail because SDL_Vulkan_LoadLibrary() will fail. + * If the window is created with the `SDL_WINDOW_ALLOW_HIGHDPI` flag, its size + * in pixels may differ from its size in screen coordinates on platforms with + * high-DPI support (e.g. iOS and macOS). Use SDL_GetWindowSize() to query the + * client area's size in screen coordinates, and SDL_GL_GetDrawableSize() or + * SDL_GetRendererOutputSize() to query the drawable size in pixels. * - * \note On non-Apple devices, SDL requires you to either not link to the - * Vulkan loader or link to a dynamic library version. This limitation - * may be removed in a future version of SDL. + * If the window is set fullscreen, the width and height parameters `w` and + * `h` will not be used. However, invalid size parameters (e.g. too large) may + * still fail. Window size is actually limited to 16384 x 16384 for all + * platforms at window creation. * - * \sa SDL_DestroyWindow() - * \sa SDL_GL_LoadLibrary() - * \sa SDL_Vulkan_LoadLibrary() + * If the window is created with any of the SDL_WINDOW_OPENGL or + * SDL_WINDOW_VULKAN flags, then the corresponding LoadLibrary function + * (SDL_GL_LoadLibrary or SDL_Vulkan_LoadLibrary) is called and the + * corresponding UnloadLibrary function is called by SDL_DestroyWindow(). + * + * If SDL_WINDOW_VULKAN is specified and there isn't a working Vulkan driver, + * SDL_CreateWindow() will fail because SDL_Vulkan_LoadLibrary() will fail. + * + * If SDL_WINDOW_METAL is specified on an OS that does not support Metal, + * SDL_CreateWindow() will fail. + * + * On non-Apple devices, SDL requires you to either not link to the Vulkan + * loader or link to a dynamic library version. This limitation may be removed + * in a future version of SDL. + * + * \param title the title of the window, in UTF-8 encoding + * \param x the x position of the window, `SDL_WINDOWPOS_CENTERED`, or + * `SDL_WINDOWPOS_UNDEFINED` + * \param y the y position of the window, `SDL_WINDOWPOS_CENTERED`, or + * `SDL_WINDOWPOS_UNDEFINED` + * \param w the width of the window, in screen coordinates + * \param h the height of the window, in screen coordinates + * \param flags 0, or one or more SDL_WindowFlags OR'd together + * \returns the window that was created or NULL on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateWindowFrom + * \sa SDL_DestroyWindow */ extern DECLSPEC SDL_Window * SDLCALL SDL_CreateWindow(const char *title, int x, int y, int w, int h, Uint32 flags); /** - * \brief Create an SDL window from an existing native window. + * Create an SDL window from an existing native window. * - * \param data A pointer to driver-dependent window creation data + * In some cases (e.g. OpenGL) and on some platforms (e.g. Microsoft Windows) + * the hint `SDL_HINT_VIDEO_WINDOW_SHARE_PIXEL_FORMAT` needs to be configured + * before using SDL_CreateWindowFrom(). * - * \return The created window, or NULL if window creation failed. + * \param data a pointer to driver-dependent window creation data, typically + * your native window cast to a void* + * \returns the window that was created or NULL on failure; call + * SDL_GetError() for more information. * - * \sa SDL_DestroyWindow() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateWindow + * \sa SDL_DestroyWindow */ extern DECLSPEC SDL_Window * SDLCALL SDL_CreateWindowFrom(const void *data); /** - * \brief Get the numeric ID of a window, for logging purposes. + * Get the numeric ID of a window. + * + * The numeric ID is what SDL_WindowEvent references, and is necessary to map + * these events to specific SDL_Window objects. + * + * \param window the window to query + * \returns the ID of the window on success or 0 on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowFromID */ extern DECLSPEC Uint32 SDLCALL SDL_GetWindowID(SDL_Window * window); /** - * \brief Get a window from a stored ID, or NULL if it doesn't exist. + * Get a window from a stored ID. + * + * The numeric ID is what SDL_WindowEvent references, and is necessary to map + * these events to specific SDL_Window objects. + * + * \param id the ID of the window + * \returns the window associated with `id` or NULL if it doesn't exist; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowID */ extern DECLSPEC SDL_Window * SDLCALL SDL_GetWindowFromID(Uint32 id); /** - * \brief Get the window flags. + * Get the window flags. + * + * \param window the window to query + * \returns a mask of the SDL_WindowFlags associated with `window` + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateWindow + * \sa SDL_HideWindow + * \sa SDL_MaximizeWindow + * \sa SDL_MinimizeWindow + * \sa SDL_SetWindowFullscreen + * \sa SDL_SetWindowGrab + * \sa SDL_ShowWindow */ extern DECLSPEC Uint32 SDLCALL SDL_GetWindowFlags(SDL_Window * window); /** - * \brief Set the title of a window, in UTF-8 format. + * Set the title of a window. * - * \sa SDL_GetWindowTitle() + * This string is expected to be in UTF-8 encoding. + * + * \param window the window to change + * \param title the desired window title in UTF-8 format + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowTitle */ extern DECLSPEC void SDLCALL SDL_SetWindowTitle(SDL_Window * window, const char *title); /** - * \brief Get the title of a window, in UTF-8 format. + * Get the title of a window. * - * \sa SDL_SetWindowTitle() + * \param window the window to query + * \returns the title of the window in UTF-8 format or "" if there is no + * title. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetWindowTitle */ extern DECLSPEC const char *SDLCALL SDL_GetWindowTitle(SDL_Window * window); /** - * \brief Set the icon for a window. + * Set the icon for a window. * - * \param window The window for which the icon should be set. - * \param icon The icon for the window. + * \param window the window to change + * \param icon an SDL_Surface structure containing the icon for the window + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC void SDLCALL SDL_SetWindowIcon(SDL_Window * window, SDL_Surface * icon); /** - * \brief Associate an arbitrary named pointer with a window. + * Associate an arbitrary named pointer with a window. * - * \param window The window to associate with the pointer. - * \param name The name of the pointer. - * \param userdata The associated pointer. + * `name` is case-sensitive. * - * \return The previous value associated with 'name' + * \param window the window to associate with the pointer + * \param name the name of the pointer + * \param userdata the associated pointer + * \returns the previous value associated with `name`. * - * \note The name is case-sensitive. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_GetWindowData() + * \sa SDL_GetWindowData */ extern DECLSPEC void* SDLCALL SDL_SetWindowData(SDL_Window * window, const char *name, void *userdata); /** - * \brief Retrieve the data pointer associated with a window. + * Retrieve the data pointer associated with a window. * - * \param window The window to query. - * \param name The name of the pointer. + * \param window the window to query + * \param name the name of the pointer + * \returns the value associated with `name`. * - * \return The value associated with 'name' + * \since This function is available since SDL 2.0.0. * - * \sa SDL_SetWindowData() + * \sa SDL_SetWindowData */ extern DECLSPEC void *SDLCALL SDL_GetWindowData(SDL_Window * window, const char *name); /** - * \brief Set the position of a window. + * Set the position of a window. * - * \param window The window to reposition. - * \param x The x coordinate of the window in screen coordinates, or - * ::SDL_WINDOWPOS_CENTERED or ::SDL_WINDOWPOS_UNDEFINED. - * \param y The y coordinate of the window in screen coordinates, or - * ::SDL_WINDOWPOS_CENTERED or ::SDL_WINDOWPOS_UNDEFINED. + * The window coordinate origin is the upper left of the display. * - * \note The window coordinate origin is the upper left of the display. + * \param window the window to reposition + * \param x the x coordinate of the window in screen coordinates, or + * `SDL_WINDOWPOS_CENTERED` or `SDL_WINDOWPOS_UNDEFINED` + * \param y the y coordinate of the window in screen coordinates, or + * `SDL_WINDOWPOS_CENTERED` or `SDL_WINDOWPOS_UNDEFINED` * - * \sa SDL_GetWindowPosition() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowPosition */ extern DECLSPEC void SDLCALL SDL_SetWindowPosition(SDL_Window * window, int x, int y); /** - * \brief Get the position of a window. + * Get the position of a window. * - * \param window The window to query. - * \param x Pointer to variable for storing the x position, in screen - * coordinates. May be NULL. - * \param y Pointer to variable for storing the y position, in screen - * coordinates. May be NULL. + * If you do not need the value for one of the positions a NULL may be passed + * in the `x` or `y` parameter. * - * \sa SDL_SetWindowPosition() + * \param window the window to query + * \param x a pointer filled in with the x position of the window, in screen + * coordinates, may be NULL + * \param y a pointer filled in with the y position of the window, in screen + * coordinates, may be NULL + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetWindowPosition */ extern DECLSPEC void SDLCALL SDL_GetWindowPosition(SDL_Window * window, int *x, int *y); /** - * \brief Set the size of a window's client area. + * Set the size of a window's client area. * - * \param window The window to resize. - * \param w The width of the window, in screen coordinates. Must be >0. - * \param h The height of the window, in screen coordinates. Must be >0. + * The window size in screen coordinates may differ from the size in pixels, + * if the window was created with `SDL_WINDOW_ALLOW_HIGHDPI` on a platform + * with high-dpi support (e.g. iOS or macOS). Use SDL_GL_GetDrawableSize() or + * SDL_GetRendererOutputSize() to get the real client area size in pixels. * - * \note Fullscreen windows automatically match the size of the display mode, - * and you should use SDL_SetWindowDisplayMode() to change their size. + * Fullscreen windows automatically match the size of the display mode, and + * you should use SDL_SetWindowDisplayMode() to change their size. * - * The window size in screen coordinates may differ from the size in pixels, if - * the window was created with SDL_WINDOW_ALLOW_HIGHDPI on a platform with - * high-dpi support (e.g. iOS or OS X). Use SDL_GL_GetDrawableSize() or - * SDL_GetRendererOutputSize() to get the real client area size in pixels. + * \param window the window to change + * \param w the width of the window in pixels, in screen coordinates, must be + * > 0 + * \param h the height of the window in pixels, in screen coordinates, must be + * > 0 * - * \sa SDL_GetWindowSize() - * \sa SDL_SetWindowDisplayMode() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowSize + * \sa SDL_SetWindowDisplayMode */ extern DECLSPEC void SDLCALL SDL_SetWindowSize(SDL_Window * window, int w, int h); /** - * \brief Get the size of a window's client area. + * Get the size of a window's client area. * - * \param window The window to query. - * \param w Pointer to variable for storing the width, in screen - * coordinates. May be NULL. - * \param h Pointer to variable for storing the height, in screen - * coordinates. May be NULL. + * NULL can safely be passed as the `w` or `h` parameter if the width or + * height value is not desired. * - * The window size in screen coordinates may differ from the size in pixels, if - * the window was created with SDL_WINDOW_ALLOW_HIGHDPI on a platform with - * high-dpi support (e.g. iOS or OS X). Use SDL_GL_GetDrawableSize() or - * SDL_GetRendererOutputSize() to get the real client area size in pixels. + * The window size in screen coordinates may differ from the size in pixels, + * if the window was created with `SDL_WINDOW_ALLOW_HIGHDPI` on a platform + * with high-dpi support (e.g. iOS or macOS). Use SDL_GL_GetDrawableSize(), + * SDL_Vulkan_GetDrawableSize(), or SDL_GetRendererOutputSize() to get the + * real client area size in pixels. * - * \sa SDL_SetWindowSize() + * \param window the window to query the width and height from + * \param w a pointer filled in with the width of the window, in screen + * coordinates, may be NULL + * \param h a pointer filled in with the height of the window, in screen + * coordinates, may be NULL + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_GetDrawableSize + * \sa SDL_Vulkan_GetDrawableSize + * \sa SDL_SetWindowSize */ extern DECLSPEC void SDLCALL SDL_GetWindowSize(SDL_Window * window, int *w, int *h); /** - * \brief Get the size of a window's borders (decorations) around the client area. + * Get the size of a window's borders (decorations) around the client area. * - * \param window The window to query. - * \param top Pointer to variable for storing the size of the top border. NULL is permitted. - * \param left Pointer to variable for storing the size of the left border. NULL is permitted. - * \param bottom Pointer to variable for storing the size of the bottom border. NULL is permitted. - * \param right Pointer to variable for storing the size of the right border. NULL is permitted. + * Note: If this function fails (returns -1), the size values will be + * initialized to 0, 0, 0, 0 (if a non-NULL pointer is provided), as if the + * window in question was borderless. * - * \return 0 on success, or -1 if getting this information is not supported. + * Note: This function may fail on systems where the window has not yet been + * decorated by the display server (for example, immediately after calling + * SDL_CreateWindow). It is recommended that you wait at least until the + * window has been presented and composited, so that the window system has a + * chance to decorate the window and provide the border dimensions to SDL. * - * \note if this function fails (returns -1), the size values will be - * initialized to 0, 0, 0, 0 (if a non-NULL pointer is provided), as - * if the window in question was borderless. + * This function also returns -1 if getting the information is not supported. + * + * \param window the window to query the size values of the border + * (decorations) from + * \param top pointer to variable for storing the size of the top border; NULL + * is permitted + * \param left pointer to variable for storing the size of the left border; + * NULL is permitted + * \param bottom pointer to variable for storing the size of the bottom + * border; NULL is permitted + * \param right pointer to variable for storing the size of the right border; + * NULL is permitted + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.5. + * + * \sa SDL_GetWindowSize */ extern DECLSPEC int SDLCALL SDL_GetWindowBordersSize(SDL_Window * window, int *top, int *left, int *bottom, int *right); /** - * \brief Set the minimum size of a window's client area. + * Set the minimum size of a window's client area. * - * \param window The window to set a new minimum size. - * \param min_w The minimum width of the window, must be >0 - * \param min_h The minimum height of the window, must be >0 + * \param window the window to change + * \param min_w the minimum width of the window in pixels + * \param min_h the minimum height of the window in pixels * - * \note You can't change the minimum size of a fullscreen window, it - * automatically matches the size of the display mode. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_GetWindowMinimumSize() - * \sa SDL_SetWindowMaximumSize() + * \sa SDL_GetWindowMinimumSize + * \sa SDL_SetWindowMaximumSize */ extern DECLSPEC void SDLCALL SDL_SetWindowMinimumSize(SDL_Window * window, int min_w, int min_h); /** - * \brief Get the minimum size of a window's client area. + * Get the minimum size of a window's client area. * - * \param window The window to query. - * \param w Pointer to variable for storing the minimum width, may be NULL - * \param h Pointer to variable for storing the minimum height, may be NULL + * \param window the window to query + * \param w a pointer filled in with the minimum width of the window, may be + * NULL + * \param h a pointer filled in with the minimum height of the window, may be + * NULL * - * \sa SDL_GetWindowMaximumSize() - * \sa SDL_SetWindowMinimumSize() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowMaximumSize + * \sa SDL_SetWindowMinimumSize */ extern DECLSPEC void SDLCALL SDL_GetWindowMinimumSize(SDL_Window * window, int *w, int *h); /** - * \brief Set the maximum size of a window's client area. + * Set the maximum size of a window's client area. * - * \param window The window to set a new maximum size. - * \param max_w The maximum width of the window, must be >0 - * \param max_h The maximum height of the window, must be >0 + * \param window the window to change + * \param max_w the maximum width of the window in pixels + * \param max_h the maximum height of the window in pixels * - * \note You can't change the maximum size of a fullscreen window, it - * automatically matches the size of the display mode. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_GetWindowMaximumSize() - * \sa SDL_SetWindowMinimumSize() + * \sa SDL_GetWindowMaximumSize + * \sa SDL_SetWindowMinimumSize */ extern DECLSPEC void SDLCALL SDL_SetWindowMaximumSize(SDL_Window * window, int max_w, int max_h); /** - * \brief Get the maximum size of a window's client area. + * Get the maximum size of a window's client area. * - * \param window The window to query. - * \param w Pointer to variable for storing the maximum width, may be NULL - * \param h Pointer to variable for storing the maximum height, may be NULL + * \param window the window to query + * \param w a pointer filled in with the maximum width of the window, may be + * NULL + * \param h a pointer filled in with the maximum height of the window, may be + * NULL * - * \sa SDL_GetWindowMinimumSize() - * \sa SDL_SetWindowMaximumSize() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowMinimumSize + * \sa SDL_SetWindowMaximumSize */ extern DECLSPEC void SDLCALL SDL_GetWindowMaximumSize(SDL_Window * window, int *w, int *h); /** - * \brief Set the border state of a window. + * Set the border state of a window. * - * This will add or remove the window's SDL_WINDOW_BORDERLESS flag and - * add or remove the border from the actual window. This is a no-op if the - * window's border already matches the requested state. + * This will add or remove the window's `SDL_WINDOW_BORDERLESS` flag and add + * or remove the border from the actual window. This is a no-op if the + * window's border already matches the requested state. * - * \param window The window of which to change the border state. - * \param bordered SDL_FALSE to remove border, SDL_TRUE to add border. + * You can't change the border state of a fullscreen window. * - * \note You can't change the border state of a fullscreen window. + * \param window the window of which to change the border state + * \param bordered SDL_FALSE to remove border, SDL_TRUE to add border * - * \sa SDL_GetWindowFlags() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowFlags */ extern DECLSPEC void SDLCALL SDL_SetWindowBordered(SDL_Window * window, SDL_bool bordered); /** - * \brief Set the user-resizable state of a window. + * Set the user-resizable state of a window. * - * This will add or remove the window's SDL_WINDOW_RESIZABLE flag and - * allow/disallow user resizing of the window. This is a no-op if the - * window's resizable state already matches the requested state. + * This will add or remove the window's `SDL_WINDOW_RESIZABLE` flag and + * allow/disallow user resizing of the window. This is a no-op if the window's + * resizable state already matches the requested state. * - * \param window The window of which to change the resizable state. - * \param resizable SDL_TRUE to allow resizing, SDL_FALSE to disallow. + * You can't change the resizable state of a fullscreen window. * - * \note You can't change the resizable state of a fullscreen window. + * \param window the window of which to change the resizable state + * \param resizable SDL_TRUE to allow resizing, SDL_FALSE to disallow * - * \sa SDL_GetWindowFlags() + * \since This function is available since SDL 2.0.5. + * + * \sa SDL_GetWindowFlags */ extern DECLSPEC void SDLCALL SDL_SetWindowResizable(SDL_Window * window, SDL_bool resizable); /** - * \brief Show a window. + * Set the window to always be above the others. * - * \sa SDL_HideWindow() + * This will add or remove the window's `SDL_WINDOW_ALWAYS_ON_TOP` flag. This + * will bring the window to the front and keep the window above the rest. + * + * \param window The window of which to change the always on top state + * \param on_top SDL_TRUE to set the window always on top, SDL_FALSE to + * disable + * + * \since This function is available since SDL 2.0.16. + * + * \sa SDL_GetWindowFlags + */ +extern DECLSPEC void SDLCALL SDL_SetWindowAlwaysOnTop(SDL_Window * window, + SDL_bool on_top); + +/** + * Show a window. + * + * \param window the window to show + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HideWindow + * \sa SDL_RaiseWindow */ extern DECLSPEC void SDLCALL SDL_ShowWindow(SDL_Window * window); /** - * \brief Hide a window. + * Hide a window. * - * \sa SDL_ShowWindow() + * \param window the window to hide + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ShowWindow */ extern DECLSPEC void SDLCALL SDL_HideWindow(SDL_Window * window); /** - * \brief Raise a window above other windows and set the input focus. + * Raise a window above other windows and set the input focus. + * + * \param window the window to raise + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC void SDLCALL SDL_RaiseWindow(SDL_Window * window); /** - * \brief Make a window as large as possible. + * Make a window as large as possible. * - * \sa SDL_RestoreWindow() + * \param window the window to maximize + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_MinimizeWindow + * \sa SDL_RestoreWindow */ extern DECLSPEC void SDLCALL SDL_MaximizeWindow(SDL_Window * window); /** - * \brief Minimize a window to an iconic representation. + * Minimize a window to an iconic representation. * - * \sa SDL_RestoreWindow() + * \param window the window to minimize + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_MaximizeWindow + * \sa SDL_RestoreWindow */ extern DECLSPEC void SDLCALL SDL_MinimizeWindow(SDL_Window * window); /** - * \brief Restore the size and position of a minimized or maximized window. + * Restore the size and position of a minimized or maximized window. * - * \sa SDL_MaximizeWindow() - * \sa SDL_MinimizeWindow() + * \param window the window to restore + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_MaximizeWindow + * \sa SDL_MinimizeWindow */ extern DECLSPEC void SDLCALL SDL_RestoreWindow(SDL_Window * window); /** - * \brief Set a window's fullscreen state. + * Set a window's fullscreen state. * - * \return 0 on success, or -1 if setting the display mode failed. + * `flags` may be `SDL_WINDOW_FULLSCREEN`, for "real" fullscreen with a + * videomode change; `SDL_WINDOW_FULLSCREEN_DESKTOP` for "fake" fullscreen + * that takes the size of the desktop; and 0 for windowed mode. * - * \sa SDL_SetWindowDisplayMode() - * \sa SDL_GetWindowDisplayMode() + * \param window the window to change + * \param flags `SDL_WINDOW_FULLSCREEN`, `SDL_WINDOW_FULLSCREEN_DESKTOP` or 0 + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowDisplayMode + * \sa SDL_SetWindowDisplayMode */ extern DECLSPEC int SDLCALL SDL_SetWindowFullscreen(SDL_Window * window, Uint32 flags); /** - * \brief Get the SDL surface associated with the window. + * Get the SDL surface associated with the window. * - * \return The window's framebuffer surface, or NULL on error. + * A new surface will be created with the optimal format for the window, if + * necessary. This surface will be freed when the window is destroyed. Do not + * free this surface. * - * A new surface will be created with the optimal format for the window, - * if necessary. This surface will be freed when the window is destroyed. + * This surface will be invalidated if the window is resized. After resizing a + * window this function must be called again to return a valid surface. * - * \note You may not combine this with 3D or the rendering API on this window. + * You may not combine this with 3D or the rendering API on this window. * - * \sa SDL_UpdateWindowSurface() - * \sa SDL_UpdateWindowSurfaceRects() + * This function is affected by `SDL_HINT_FRAMEBUFFER_ACCELERATION`. + * + * \param window the window to query + * \returns the surface associated with the window, or NULL on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_UpdateWindowSurface + * \sa SDL_UpdateWindowSurfaceRects */ extern DECLSPEC SDL_Surface * SDLCALL SDL_GetWindowSurface(SDL_Window * window); /** - * \brief Copy the window surface to the screen. + * Copy the window surface to the screen. * - * \return 0 on success, or -1 on error. + * This is the function you use to reflect any changes to the surface on the + * screen. * - * \sa SDL_GetWindowSurface() - * \sa SDL_UpdateWindowSurfaceRects() + * This function is equivalent to the SDL 1.2 API SDL_Flip(). + * + * \param window the window to update + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowSurface + * \sa SDL_UpdateWindowSurfaceRects */ extern DECLSPEC int SDLCALL SDL_UpdateWindowSurface(SDL_Window * window); /** - * \brief Copy a number of rectangles on the window surface to the screen. + * Copy areas of the window surface to the screen. * - * \return 0 on success, or -1 on error. + * This is the function you use to reflect changes to portions of the surface + * on the screen. * - * \sa SDL_GetWindowSurface() - * \sa SDL_UpdateWindowSurface() + * This function is equivalent to the SDL 1.2 API SDL_UpdateRects(). + * + * \param window the window to update + * \param rects an array of SDL_Rect structures representing areas of the + * surface to copy + * \param numrects the number of rectangles + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowSurface + * \sa SDL_UpdateWindowSurface */ extern DECLSPEC int SDLCALL SDL_UpdateWindowSurfaceRects(SDL_Window * window, const SDL_Rect * rects, int numrects); /** - * \brief Set a window's input grab mode. + * Set a window's input grab mode. * - * \param window The window for which the input grab mode should be set. - * \param grabbed This is SDL_TRUE to grab input, and SDL_FALSE to release input. + * When input is grabbed, the mouse is confined to the window. This function + * will also grab the keyboard if `SDL_HINT_GRAB_KEYBOARD` is set. To grab the + * keyboard without also grabbing the mouse, use SDL_SetWindowKeyboardGrab(). * - * If the caller enables a grab while another window is currently grabbed, - * the other window loses its grab in favor of the caller's window. + * If the caller enables a grab while another window is currently grabbed, the + * other window loses its grab in favor of the caller's window. * - * \sa SDL_GetWindowGrab() + * \param window the window for which the input grab mode should be set + * \param grabbed SDL_TRUE to grab input or SDL_FALSE to release input + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetGrabbedWindow + * \sa SDL_GetWindowGrab */ extern DECLSPEC void SDLCALL SDL_SetWindowGrab(SDL_Window * window, SDL_bool grabbed); /** - * \brief Get a window's input grab mode. + * Set a window's keyboard grab mode. * - * \return This returns SDL_TRUE if input is grabbed, and SDL_FALSE otherwise. + * Keyboard grab enables capture of system keyboard shortcuts like Alt+Tab or + * the Meta/Super key. Note that not all system keyboard shortcuts can be + * captured by applications (one example is Ctrl+Alt+Del on Windows). * - * \sa SDL_SetWindowGrab() + * This is primarily intended for specialized applications such as VNC clients + * or VM frontends. Normal games should not use keyboard grab. + * + * When keyboard grab is enabled, SDL will continue to handle Alt+Tab when the + * window is full-screen to ensure the user is not trapped in your + * application. If you have a custom keyboard shortcut to exit fullscreen + * mode, you may suppress this behavior with + * `SDL_HINT_ALLOW_ALT_TAB_WHILE_GRABBED`. + * + * If the caller enables a grab while another window is currently grabbed, the + * other window loses its grab in favor of the caller's window. + * + * \param window The window for which the keyboard grab mode should be set. + * \param grabbed This is SDL_TRUE to grab keyboard, and SDL_FALSE to release. + * + * \since This function is available since SDL 2.0.16. + * + * \sa SDL_GetWindowKeyboardGrab + * \sa SDL_SetWindowMouseGrab + * \sa SDL_SetWindowGrab + */ +extern DECLSPEC void SDLCALL SDL_SetWindowKeyboardGrab(SDL_Window * window, + SDL_bool grabbed); + +/** + * Set a window's mouse grab mode. + * + * Mouse grab confines the mouse cursor to the window. + * + * \param window The window for which the mouse grab mode should be set. + * + * \since This function is available since SDL 2.0.16. + * + * \sa SDL_GetWindowMouseGrab + * \sa SDL_SetWindowKeyboardGrab + * \sa SDL_SetWindowGrab + */ +extern DECLSPEC void SDLCALL SDL_SetWindowMouseGrab(SDL_Window * window, + SDL_bool grabbed); + +/** + * Get a window's input grab mode. + * + * \param window the window to query + * \returns SDL_TRUE if input is grabbed, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetWindowGrab */ extern DECLSPEC SDL_bool SDLCALL SDL_GetWindowGrab(SDL_Window * window); /** - * \brief Get the window that currently has an input grab enabled. + * Get a window's keyboard grab mode. * - * \return This returns the window if input is grabbed, and NULL otherwise. + * \param window the window to query + * \returns SDL_TRUE if keyboard is grabbed, and SDL_FALSE otherwise. * - * \sa SDL_SetWindowGrab() + * \since This function is available since SDL 2.0.16. + * + * \sa SDL_SetWindowKeyboardGrab + * \sa SDL_GetWindowGrab + */ +extern DECLSPEC SDL_bool SDLCALL SDL_GetWindowKeyboardGrab(SDL_Window * window); + +/** + * Get a window's mouse grab mode. + * + * \param window the window to query + * \returns SDL_TRUE if mouse is grabbed, and SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.16. + * + * \sa SDL_SetWindowKeyboardGrab + * \sa SDL_GetWindowGrab + */ +extern DECLSPEC SDL_bool SDLCALL SDL_GetWindowMouseGrab(SDL_Window * window); + +/** + * Get the window that currently has an input grab enabled. + * + * \returns the window if input is grabbed or NULL otherwise. + * + * \since This function is available since SDL 2.0.4. + * + * \sa SDL_GetWindowGrab + * \sa SDL_SetWindowGrab */ extern DECLSPEC SDL_Window * SDLCALL SDL_GetGrabbedWindow(void); /** - * \brief Set the brightness (gamma correction) for a window. + * Confines the cursor to the specified area of a window. * - * \return 0 on success, or -1 if setting the brightness isn't supported. + * Note that this does NOT grab the cursor, it only defines the area a cursor + * is restricted to when the window has mouse focus. * - * \sa SDL_GetWindowBrightness() - * \sa SDL_SetWindowGammaRamp() + * \param window The window that will be associated with the barrier. + * \param rect A rectangle area in window-relative coordinates. If NULL the + * barrier for the specified window will be destroyed. + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_GetWindowMouseRect + * \sa SDL_SetWindowMouseGrab + */ +extern DECLSPEC int SDLCALL SDL_SetWindowMouseRect(SDL_Window * window, const SDL_Rect * rect); + +/** + * Get the mouse confinement rectangle of a window. + * + * \param window The window to query + * \returns A pointer to the mouse confinement rectangle of a window, or NULL + * if there isn't one. + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_SetWindowMouseRect + */ +extern DECLSPEC const SDL_Rect * SDLCALL SDL_GetWindowMouseRect(SDL_Window * window); + +/** + * Set the brightness (gamma multiplier) for a given window's display. + * + * Despite the name and signature, this method sets the brightness of the + * entire display, not an individual window. A window is considered to be + * owned by the display that contains the window's center pixel. (The index of + * this display can be retrieved using SDL_GetWindowDisplayIndex().) The + * brightness set will not follow the window if it is moved to another + * display. + * + * Many platforms will refuse to set the display brightness in modern times. + * You are better off using a shader to adjust gamma during rendering, or + * something similar. + * + * \param window the window used to select the display whose brightness will + * be changed + * \param brightness the brightness (gamma multiplier) value to set where 0.0 + * is completely dark and 1.0 is normal brightness + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowBrightness + * \sa SDL_SetWindowGammaRamp */ extern DECLSPEC int SDLCALL SDL_SetWindowBrightness(SDL_Window * window, float brightness); /** - * \brief Get the brightness (gamma correction) for a window. + * Get the brightness (gamma multiplier) for a given window's display. * - * \return The last brightness value passed to SDL_SetWindowBrightness() + * Despite the name and signature, this method retrieves the brightness of the + * entire display, not an individual window. A window is considered to be + * owned by the display that contains the window's center pixel. (The index of + * this display can be retrieved using SDL_GetWindowDisplayIndex().) * - * \sa SDL_SetWindowBrightness() + * \param window the window used to select the display whose brightness will + * be queried + * \returns the brightness for the display where 0.0 is completely dark and + * 1.0 is normal brightness. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetWindowBrightness */ extern DECLSPEC float SDLCALL SDL_GetWindowBrightness(SDL_Window * window); /** - * \brief Set the opacity for a window + * Set the opacity for a window. * - * \param window The window which will be made transparent or opaque - * \param opacity Opacity (0.0f - transparent, 1.0f - opaque) This will be - * clamped internally between 0.0f and 1.0f. + * The parameter `opacity` will be clamped internally between 0.0f + * (transparent) and 1.0f (opaque). * - * \return 0 on success, or -1 if setting the opacity isn't supported. + * This function also returns -1 if setting the opacity isn't supported. * - * \sa SDL_GetWindowOpacity() + * \param window the window which will be made transparent or opaque + * \param opacity the opacity value (0.0f - transparent, 1.0f - opaque) + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.5. + * + * \sa SDL_GetWindowOpacity */ extern DECLSPEC int SDLCALL SDL_SetWindowOpacity(SDL_Window * window, float opacity); /** - * \brief Get the opacity of a window. + * Get the opacity of a window. * - * If transparency isn't supported on this platform, opacity will be reported - * as 1.0f without error. + * If transparency isn't supported on this platform, opacity will be reported + * as 1.0f without error. * - * \param window The window in question. - * \param out_opacity Opacity (0.0f - transparent, 1.0f - opaque) + * The parameter `opacity` is ignored if it is NULL. * - * \return 0 on success, or -1 on error (invalid window, etc). + * This function also returns -1 if an invalid window was provided. * - * \sa SDL_SetWindowOpacity() + * \param window the window to get the current opacity value from + * \param out_opacity the float filled in (0.0f - transparent, 1.0f - opaque) + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.5. + * + * \sa SDL_SetWindowOpacity */ extern DECLSPEC int SDLCALL SDL_GetWindowOpacity(SDL_Window * window, float * out_opacity); /** - * \brief Sets the window as a modal for another window (TODO: reconsider this function and/or its name) + * Set the window as a modal for another window. * - * \param modal_window The window that should be modal - * \param parent_window The parent window + * \param modal_window the window that should be set modal + * \param parent_window the parent window for the modal window + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 otherwise. + * \since This function is available since SDL 2.0.5. */ extern DECLSPEC int SDLCALL SDL_SetWindowModalFor(SDL_Window * modal_window, SDL_Window * parent_window); /** - * \brief Explicitly sets input focus to the window. + * Explicitly set input focus to the window. * - * You almost certainly want SDL_RaiseWindow() instead of this function. Use - * this with caution, as you might give focus to a window that's completely - * obscured by other windows. + * You almost certainly want SDL_RaiseWindow() instead of this function. Use + * this with caution, as you might give focus to a window that is completely + * obscured by other windows. * - * \param window The window that should get the input focus + * \param window the window that should get the input focus + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 otherwise. - * \sa SDL_RaiseWindow() + * \since This function is available since SDL 2.0.5. + * + * \sa SDL_RaiseWindow */ extern DECLSPEC int SDLCALL SDL_SetWindowInputFocus(SDL_Window * window); /** - * \brief Set the gamma ramp for a window. + * Set the gamma ramp for the display that owns a given window. * - * \param window The window for which the gamma ramp should be set. - * \param red The translation table for the red channel, or NULL. - * \param green The translation table for the green channel, or NULL. - * \param blue The translation table for the blue channel, or NULL. + * Set the gamma translation table for the red, green, and blue channels of + * the video hardware. Each table is an array of 256 16-bit quantities, + * representing a mapping between the input and output for that channel. The + * input is the index into the array, and the output is the 16-bit gamma value + * at that index, scaled to the output color precision. * - * \return 0 on success, or -1 if gamma ramps are unsupported. + * Despite the name and signature, this method sets the gamma ramp of the + * entire display, not an individual window. A window is considered to be + * owned by the display that contains the window's center pixel. (The index of + * this display can be retrieved using SDL_GetWindowDisplayIndex().) The gamma + * ramp set will not follow the window if it is moved to another display. * - * Set the gamma translation table for the red, green, and blue channels - * of the video hardware. Each table is an array of 256 16-bit quantities, - * representing a mapping between the input and output for that channel. - * The input is the index into the array, and the output is the 16-bit - * gamma value at that index, scaled to the output color precision. + * \param window the window used to select the display whose gamma ramp will + * be changed + * \param red a 256 element array of 16-bit quantities representing the + * translation table for the red channel, or NULL + * \param green a 256 element array of 16-bit quantities representing the + * translation table for the green channel, or NULL + * \param blue a 256 element array of 16-bit quantities representing the + * translation table for the blue channel, or NULL + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_GetWindowGammaRamp() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowGammaRamp */ extern DECLSPEC int SDLCALL SDL_SetWindowGammaRamp(SDL_Window * window, const Uint16 * red, @@ -993,19 +1581,27 @@ extern DECLSPEC int SDLCALL SDL_SetWindowGammaRamp(SDL_Window * window, const Uint16 * blue); /** - * \brief Get the gamma ramp for a window. + * Get the gamma ramp for a given window's display. * - * \param window The window from which the gamma ramp should be queried. - * \param red A pointer to a 256 element array of 16-bit quantities to hold - * the translation table for the red channel, or NULL. - * \param green A pointer to a 256 element array of 16-bit quantities to hold - * the translation table for the green channel, or NULL. - * \param blue A pointer to a 256 element array of 16-bit quantities to hold - * the translation table for the blue channel, or NULL. + * Despite the name and signature, this method retrieves the gamma ramp of the + * entire display, not an individual window. A window is considered to be + * owned by the display that contains the window's center pixel. (The index of + * this display can be retrieved using SDL_GetWindowDisplayIndex().) * - * \return 0 on success, or -1 if gamma ramps are unsupported. + * \param window the window used to select the display whose gamma ramp will + * be queried + * \param red a 256 element array of 16-bit quantities filled in with the + * translation table for the red channel, or NULL + * \param green a 256 element array of 16-bit quantities filled in with the + * translation table for the green channel, or NULL + * \param blue a 256 element array of 16-bit quantities filled in with the + * translation table for the blue channel, or NULL + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_SetWindowGammaRamp() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetWindowGammaRamp */ extern DECLSPEC int SDLCALL SDL_GetWindowGammaRamp(SDL_Window * window, Uint16 * red, @@ -1013,9 +1609,9 @@ extern DECLSPEC int SDLCALL SDL_GetWindowGammaRamp(SDL_Window * window, Uint16 * blue); /** - * \brief Possible return values from the SDL_HitTest callback. + * Possible return values from the SDL_HitTest callback. * - * \sa SDL_HitTest + * \sa SDL_HitTest */ typedef enum { @@ -1032,82 +1628,129 @@ typedef enum } SDL_HitTestResult; /** - * \brief Callback used for hit-testing. + * Callback used for hit-testing. * - * \sa SDL_SetWindowHitTest + * \param win the SDL_Window where hit-testing was set on + * \param area an SDL_Point which should be hit-tested + * \param data what was passed as `callback_data` to SDL_SetWindowHitTest() + * \return an SDL_HitTestResult value. + * + * \sa SDL_SetWindowHitTest */ typedef SDL_HitTestResult (SDLCALL *SDL_HitTest)(SDL_Window *win, const SDL_Point *area, void *data); /** - * \brief Provide a callback that decides if a window region has special properties. + * Provide a callback that decides if a window region has special properties. * - * Normally windows are dragged and resized by decorations provided by the - * system window manager (a title bar, borders, etc), but for some apps, it - * makes sense to drag them from somewhere else inside the window itself; for - * example, one might have a borderless window that wants to be draggable - * from any part, or simulate its own title bar, etc. + * Normally windows are dragged and resized by decorations provided by the + * system window manager (a title bar, borders, etc), but for some apps, it + * makes sense to drag them from somewhere else inside the window itself; for + * example, one might have a borderless window that wants to be draggable from + * any part, or simulate its own title bar, etc. * - * This function lets the app provide a callback that designates pieces of - * a given window as special. This callback is run during event processing - * if we need to tell the OS to treat a region of the window specially; the - * use of this callback is known as "hit testing." + * This function lets the app provide a callback that designates pieces of a + * given window as special. This callback is run during event processing if we + * need to tell the OS to treat a region of the window specially; the use of + * this callback is known as "hit testing." * - * Mouse input may not be delivered to your application if it is within - * a special area; the OS will often apply that input to moving the window or - * resizing the window and not deliver it to the application. + * Mouse input may not be delivered to your application if it is within a + * special area; the OS will often apply that input to moving the window or + * resizing the window and not deliver it to the application. * - * Specifying NULL for a callback disables hit-testing. Hit-testing is - * disabled by default. + * Specifying NULL for a callback disables hit-testing. Hit-testing is + * disabled by default. * - * Platforms that don't support this functionality will return -1 - * unconditionally, even if you're attempting to disable hit-testing. + * Platforms that don't support this functionality will return -1 + * unconditionally, even if you're attempting to disable hit-testing. * - * Your callback may fire at any time, and its firing does not indicate any - * specific behavior (for example, on Windows, this certainly might fire - * when the OS is deciding whether to drag your window, but it fires for lots - * of other reasons, too, some unrelated to anything you probably care about - * _and when the mouse isn't actually at the location it is testing_). - * Since this can fire at any time, you should try to keep your callback - * efficient, devoid of allocations, etc. + * Your callback may fire at any time, and its firing does not indicate any + * specific behavior (for example, on Windows, this certainly might fire when + * the OS is deciding whether to drag your window, but it fires for lots of + * other reasons, too, some unrelated to anything you probably care about _and + * when the mouse isn't actually at the location it is testing_). Since this + * can fire at any time, you should try to keep your callback efficient, + * devoid of allocations, etc. * - * \param window The window to set hit-testing on. - * \param callback The callback to call when doing a hit-test. - * \param callback_data An app-defined void pointer passed to the callback. - * \return 0 on success, -1 on error (including unsupported). + * \param window the window to set hit-testing on + * \param callback the function to call when doing a hit-test + * \param callback_data an app-defined void pointer passed to **callback** + * \returns 0 on success or -1 on error (including unsupported); call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.4. */ extern DECLSPEC int SDLCALL SDL_SetWindowHitTest(SDL_Window * window, SDL_HitTest callback, void *callback_data); /** - * \brief Destroy a window. + * Request a window to demand attention from the user. + * + * \param window the window to be flashed + * \param operation the flash operation + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.16. + */ +extern DECLSPEC int SDLCALL SDL_FlashWindow(SDL_Window * window, SDL_FlashOperation operation); + +/** + * Destroy a window. + * + * If `window` is NULL, this function will return immediately after setting + * the SDL error message to "Invalid window". See SDL_GetError(). + * + * \param window the window to destroy + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateWindow + * \sa SDL_CreateWindowFrom */ extern DECLSPEC void SDLCALL SDL_DestroyWindow(SDL_Window * window); /** - * \brief Returns whether the screensaver is currently enabled (default off). + * Check whether the screensaver is currently enabled. * - * \sa SDL_EnableScreenSaver() - * \sa SDL_DisableScreenSaver() + * The screensaver is disabled by default since SDL 2.0.2. Before SDL 2.0.2 + * the screensaver was enabled by default. + * + * The default can also be changed using `SDL_HINT_VIDEO_ALLOW_SCREENSAVER`. + * + * \returns SDL_TRUE if the screensaver is enabled, SDL_FALSE if it is + * disabled. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_DisableScreenSaver + * \sa SDL_EnableScreenSaver */ extern DECLSPEC SDL_bool SDLCALL SDL_IsScreenSaverEnabled(void); /** - * \brief Allow the screen to be blanked by a screensaver + * Allow the screen to be blanked by a screen saver. * - * \sa SDL_IsScreenSaverEnabled() - * \sa SDL_DisableScreenSaver() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_DisableScreenSaver + * \sa SDL_IsScreenSaverEnabled */ extern DECLSPEC void SDLCALL SDL_EnableScreenSaver(void); /** - * \brief Prevent the screen from being blanked by a screensaver + * Prevent the screen from being blanked by a screen saver. * - * \sa SDL_IsScreenSaverEnabled() - * \sa SDL_EnableScreenSaver() + * If you disable the screensaver, it is automatically re-enabled when SDL + * quits. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_EnableScreenSaver + * \sa SDL_IsScreenSaverEnabled */ extern DECLSPEC void SDLCALL SDL_DisableScreenSaver(void); @@ -1118,147 +1761,316 @@ extern DECLSPEC void SDLCALL SDL_DisableScreenSaver(void); /* @{ */ /** - * \brief Dynamically load an OpenGL library. + * Dynamically load an OpenGL library. * - * \param path The platform dependent OpenGL library name, or NULL to open the - * default OpenGL library. + * This should be done after initializing the video driver, but before + * creating any OpenGL windows. If no OpenGL library is loaded, the default + * library will be loaded upon creation of the first OpenGL window. * - * \return 0 on success, or -1 if the library couldn't be loaded. + * If you do this, you need to retrieve all of the GL functions used in your + * program from the dynamic library using SDL_GL_GetProcAddress(). * - * This should be done after initializing the video driver, but before - * creating any OpenGL windows. If no OpenGL library is loaded, the default - * library will be loaded upon creation of the first OpenGL window. + * \param path the platform dependent OpenGL library name, or NULL to open the + * default OpenGL library + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \note If you do this, you need to retrieve all of the GL functions used in - * your program from the dynamic library using SDL_GL_GetProcAddress(). + * \since This function is available since SDL 2.0.0. * - * \sa SDL_GL_GetProcAddress() - * \sa SDL_GL_UnloadLibrary() + * \sa SDL_GL_GetProcAddress + * \sa SDL_GL_UnloadLibrary */ extern DECLSPEC int SDLCALL SDL_GL_LoadLibrary(const char *path); /** - * \brief Get the address of an OpenGL function. + * Get an OpenGL function by name. + * + * If the GL library is loaded at runtime with SDL_GL_LoadLibrary(), then all + * GL functions must be retrieved this way. Usually this is used to retrieve + * function pointers to OpenGL extensions. + * + * There are some quirks to looking up OpenGL functions that require some + * extra care from the application. If you code carefully, you can handle + * these quirks without any platform-specific code, though: + * + * - On Windows, function pointers are specific to the current GL context; + * this means you need to have created a GL context and made it current + * before calling SDL_GL_GetProcAddress(). If you recreate your context or + * create a second context, you should assume that any existing function + * pointers aren't valid to use with it. This is (currently) a + * Windows-specific limitation, and in practice lots of drivers don't suffer + * this limitation, but it is still the way the wgl API is documented to + * work and you should expect crashes if you don't respect it. Store a copy + * of the function pointers that comes and goes with context lifespan. + * - On X11, function pointers returned by this function are valid for any + * context, and can even be looked up before a context is created at all. + * This means that, for at least some common OpenGL implementations, if you + * look up a function that doesn't exist, you'll get a non-NULL result that + * is _NOT_ safe to call. You must always make sure the function is actually + * available for a given GL context before calling it, by checking for the + * existence of the appropriate extension with SDL_GL_ExtensionSupported(), + * or verifying that the version of OpenGL you're using offers the function + * as core functionality. + * - Some OpenGL drivers, on all platforms, *will* return NULL if a function + * isn't supported, but you can't count on this behavior. Check for + * extensions you use, and if you get a NULL anyway, act as if that + * extension wasn't available. This is probably a bug in the driver, but you + * can code defensively for this scenario anyhow. + * - Just because you're on Linux/Unix, don't assume you'll be using X11. + * Next-gen display servers are waiting to replace it, and may or may not + * make the same promises about function pointers. + * - OpenGL function pointers must be declared `APIENTRY` as in the example + * code. This will ensure the proper calling convention is followed on + * platforms where this matters (Win32) thereby avoiding stack corruption. + * + * \param proc the name of an OpenGL function + * \returns a pointer to the named OpenGL function. The returned pointer + * should be cast to the appropriate function signature. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_ExtensionSupported + * \sa SDL_GL_LoadLibrary + * \sa SDL_GL_UnloadLibrary */ extern DECLSPEC void *SDLCALL SDL_GL_GetProcAddress(const char *proc); /** - * \brief Unload the OpenGL library previously loaded by SDL_GL_LoadLibrary(). + * Unload the OpenGL library previously loaded by SDL_GL_LoadLibrary(). * - * \sa SDL_GL_LoadLibrary() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_LoadLibrary */ extern DECLSPEC void SDLCALL SDL_GL_UnloadLibrary(void); /** - * \brief Return true if an OpenGL extension is supported for the current - * context. + * Check if an OpenGL extension is supported for the current context. + * + * This function operates on the current GL context; you must have created a + * context and it must be current before calling this function. Do not assume + * that all contexts you create will have the same set of extensions + * available, or that recreating an existing context will offer the same + * extensions again. + * + * While it's probably not a massive overhead, this function is not an O(1) + * operation. Check the extensions you care about after creating the GL + * context and save that information somewhere instead of calling the function + * every time you need to know. + * + * \param extension the name of the extension to check + * \returns SDL_TRUE if the extension is supported, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC SDL_bool SDLCALL SDL_GL_ExtensionSupported(const char *extension); /** - * \brief Reset all previously set OpenGL context attributes to their default values + * Reset all previously set OpenGL context attributes to their default values. + * + * \since This function is available since SDL 2.0.2. + * + * \sa SDL_GL_GetAttribute + * \sa SDL_GL_SetAttribute */ extern DECLSPEC void SDLCALL SDL_GL_ResetAttributes(void); /** - * \brief Set an OpenGL window attribute before window creation. + * Set an OpenGL window attribute before window creation. * - * \return 0 on success, or -1 if the attribute could not be set. + * This function sets the OpenGL attribute `attr` to `value`. The requested + * attributes should be set before creating an OpenGL window. You should use + * SDL_GL_GetAttribute() to check the values after creating the OpenGL + * context, since the values obtained can differ from the requested ones. + * + * \param attr an SDL_GLattr enum value specifying the OpenGL attribute to set + * \param value the desired value for the attribute + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_GetAttribute + * \sa SDL_GL_ResetAttributes */ extern DECLSPEC int SDLCALL SDL_GL_SetAttribute(SDL_GLattr attr, int value); /** - * \brief Get the actual value for an attribute from the current context. + * Get the actual value for an attribute from the current context. * - * \return 0 on success, or -1 if the attribute could not be retrieved. - * The integer at \c value will be modified in either case. + * \param attr an SDL_GLattr enum value specifying the OpenGL attribute to get + * \param value a pointer filled in with the current value of `attr` + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_ResetAttributes + * \sa SDL_GL_SetAttribute */ extern DECLSPEC int SDLCALL SDL_GL_GetAttribute(SDL_GLattr attr, int *value); /** - * \brief Create an OpenGL context for use with an OpenGL window, and make it - * current. + * Create an OpenGL context for an OpenGL window, and make it current. * - * \sa SDL_GL_DeleteContext() + * Windows users new to OpenGL should note that, for historical reasons, GL + * functions added after OpenGL version 1.1 are not available by default. + * Those functions must be loaded at run-time, either with an OpenGL + * extension-handling library or with SDL_GL_GetProcAddress() and its related + * functions. + * + * SDL_GLContext is an alias for `void *`. It's opaque to the application. + * + * \param window the window to associate with the context + * \returns the OpenGL context associated with `window` or NULL on error; call + * SDL_GetError() for more details. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_DeleteContext + * \sa SDL_GL_MakeCurrent */ extern DECLSPEC SDL_GLContext SDLCALL SDL_GL_CreateContext(SDL_Window * window); /** - * \brief Set up an OpenGL context for rendering into an OpenGL window. + * Set up an OpenGL context for rendering into an OpenGL window. * - * \note The context must have been created with a compatible window. + * The context must have been created with a compatible window. + * + * \param window the window to associate with the context + * \param context the OpenGL context to associate with the window + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_CreateContext */ extern DECLSPEC int SDLCALL SDL_GL_MakeCurrent(SDL_Window * window, SDL_GLContext context); /** - * \brief Get the currently active OpenGL window. + * Get the currently active OpenGL window. + * + * \returns the currently active OpenGL window on success or NULL on failure; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC SDL_Window* SDLCALL SDL_GL_GetCurrentWindow(void); /** - * \brief Get the currently active OpenGL context. + * Get the currently active OpenGL context. + * + * \returns the currently active OpenGL context or NULL on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_MakeCurrent */ extern DECLSPEC SDL_GLContext SDLCALL SDL_GL_GetCurrentContext(void); /** - * \brief Get the size of a window's underlying drawable in pixels (for use - * with glViewport). + * Get the size of a window's underlying drawable in pixels. * - * \param window Window from which the drawable size should be queried - * \param w Pointer to variable for storing the width in pixels, may be NULL - * \param h Pointer to variable for storing the height in pixels, may be NULL + * This returns info useful for calling glViewport(). * * This may differ from SDL_GetWindowSize() if we're rendering to a high-DPI - * drawable, i.e. the window was created with SDL_WINDOW_ALLOW_HIGHDPI on a - * platform with high-DPI support (Apple calls this "Retina"), and not disabled - * by the SDL_HINT_VIDEO_HIGHDPI_DISABLED hint. + * drawable, i.e. the window was created with `SDL_WINDOW_ALLOW_HIGHDPI` on a + * platform with high-DPI support (Apple calls this "Retina"), and not + * disabled by the `SDL_HINT_VIDEO_HIGHDPI_DISABLED` hint. * - * \sa SDL_GetWindowSize() - * \sa SDL_CreateWindow() + * \param window the window from which the drawable size should be queried + * \param w a pointer to variable for storing the width in pixels, may be NULL + * \param h a pointer to variable for storing the height in pixels, may be + * NULL + * + * \since This function is available since SDL 2.0.1. + * + * \sa SDL_CreateWindow + * \sa SDL_GetWindowSize */ extern DECLSPEC void SDLCALL SDL_GL_GetDrawableSize(SDL_Window * window, int *w, int *h); /** - * \brief Set the swap interval for the current OpenGL context. + * Set the swap interval for the current OpenGL context. * - * \param interval 0 for immediate updates, 1 for updates synchronized with the - * vertical retrace. If the system supports it, you may - * specify -1 to allow late swaps to happen immediately - * instead of waiting for the next retrace. + * Some systems allow specifying -1 for the interval, to enable adaptive + * vsync. Adaptive vsync works the same as vsync, but if you've already missed + * the vertical retrace for a given frame, it swaps buffers immediately, which + * might be less jarring for the user during occasional framerate drops. If an + * application requests adaptive vsync and the system does not support it, + * this function will fail and return -1. In such a case, you should probably + * retry the call with 1 for the interval. * - * \return 0 on success, or -1 if setting the swap interval is not supported. + * Adaptive vsync is implemented for some glX drivers with + * GLX_EXT_swap_control_tear: * - * \sa SDL_GL_GetSwapInterval() + * https://www.opengl.org/registry/specs/EXT/glx_swap_control_tear.txt + * + * and for some Windows drivers with WGL_EXT_swap_control_tear: + * + * https://www.opengl.org/registry/specs/EXT/wgl_swap_control_tear.txt + * + * Read more on the Khronos wiki: + * https://www.khronos.org/opengl/wiki/Swap_Interval#Adaptive_Vsync + * + * \param interval 0 for immediate updates, 1 for updates synchronized with + * the vertical retrace, -1 for adaptive vsync + * \returns 0 on success or -1 if setting the swap interval is not supported; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_GetSwapInterval */ extern DECLSPEC int SDLCALL SDL_GL_SetSwapInterval(int interval); /** - * \brief Get the swap interval for the current OpenGL context. + * Get the swap interval for the current OpenGL context. * - * \return 0 if there is no vertical retrace synchronization, 1 if the buffer + * If the system can't determine the swap interval, or there isn't a valid + * current context, this function will return 0 as a safe default. + * + * \returns 0 if there is no vertical retrace synchronization, 1 if the buffer * swap is synchronized with the vertical retrace, and -1 if late - * swaps happen immediately instead of waiting for the next retrace. - * If the system can't determine the swap interval, or there isn't a - * valid current context, this will return 0 as a safe default. + * swaps happen immediately instead of waiting for the next retrace; + * call SDL_GetError() for more information. * - * \sa SDL_GL_SetSwapInterval() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_SetSwapInterval */ extern DECLSPEC int SDLCALL SDL_GL_GetSwapInterval(void); /** - * \brief Swap the OpenGL buffers for a window, if double-buffering is - * supported. + * Update a window with OpenGL rendering. + * + * This is used with double-buffered OpenGL contexts, which are the default. + * + * On macOS, make sure you bind 0 to the draw framebuffer before swapping the + * window, otherwise nothing will happen. If you aren't using + * glBindFramebuffer(), this is the default and you won't have to do anything + * extra. + * + * \param window the window to change + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC void SDLCALL SDL_GL_SwapWindow(SDL_Window * window); /** - * \brief Delete an OpenGL context. + * Delete an OpenGL context. * - * \sa SDL_GL_CreateContext() + * \param context the OpenGL context to be deleted + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_CreateContext */ extern DECLSPEC void SDLCALL SDL_GL_DeleteContext(SDL_GLContext context); diff --git a/libs/SDL2/include/SDL_vulkan.h b/libs/SDL2/include/SDL_vulkan.h index d69a436b3..ab86a0b86 100644 --- a/libs/SDL2/include/SDL_vulkan.h +++ b/libs/SDL2/include/SDL_vulkan.h @@ -66,203 +66,140 @@ typedef VkSurfaceKHR SDL_vulkanSurface; /* for compatibility with Tizen */ /* @{ */ /** - * \brief Dynamically load a Vulkan loader library. + * Dynamically load the Vulkan loader library. * - * \param [in] path The platform dependent Vulkan loader library name, or - * \c NULL. + * This should be called after initializing the video driver, but before + * creating any Vulkan windows. If no Vulkan loader library is loaded, the + * default library will be loaded upon creation of the first Vulkan window. * - * \return \c 0 on success, or \c -1 if the library couldn't be loaded. + * It is fairly common for Vulkan applications to link with libvulkan instead + * of explicitly loading it at run time. This will work with SDL provided the + * application links to a dynamic library and both it and SDL use the same + * search path. * - * If \a path is NULL SDL will use the value of the environment variable - * \c SDL_VULKAN_LIBRARY, if set, otherwise it loads the default Vulkan - * loader library. + * If you specify a non-NULL `path`, an application should retrieve all of the + * Vulkan functions it uses from the dynamic library using + * SDL_Vulkan_GetVkGetInstanceProcAddr unless you can guarantee `path` points + * to the same vulkan loader library the application linked to. * - * This should be called after initializing the video driver, but before - * creating any Vulkan windows. If no Vulkan loader library is loaded, the - * default library will be loaded upon creation of the first Vulkan window. + * On Apple devices, if `path` is NULL, SDL will attempt to find the + * `vkGetInstanceProcAddr` address within all the Mach-O images of the current + * process. This is because it is fairly common for Vulkan applications to + * link with libvulkan (and historically MoltenVK was provided as a static + * library). If it is not found, on macOS, SDL will attempt to load + * `vulkan.framework/vulkan`, `libvulkan.1.dylib`, + * `MoltenVK.framework/MoltenVK`, and `libMoltenVK.dylib`, in that order. On + * iOS, SDL will attempt to load `libMoltenVK.dylib`. Applications using a + * dynamic framework or .dylib must ensure it is included in its application + * bundle. * - * \note It is fairly common for Vulkan applications to link with \a libvulkan - * instead of explicitly loading it at run time. This will work with - * SDL provided the application links to a dynamic library and both it - * and SDL use the same search path. + * On non-Apple devices, application linking with a static libvulkan is not + * supported. Either do not link to the Vulkan loader or link to a dynamic + * library version. * - * \note If you specify a non-NULL \c path, an application should retrieve all - * of the Vulkan functions it uses from the dynamic library using - * \c SDL_Vulkan_GetVkGetInstanceProcAddr() unless you can guarantee - * \c path points to the same vulkan loader library the application - * linked to. + * \param path The platform dependent Vulkan loader library name or NULL + * \returns 0 on success or -1 if the library couldn't be loaded; call + * SDL_GetError() for more information. * - * \note On Apple devices, if \a path is NULL, SDL will attempt to find - * the vkGetInstanceProcAddr address within all the mach-o images of - * the current process. This is because it is fairly common for Vulkan - * applications to link with libvulkan (and historically MoltenVK was - * provided as a static library). If it is not found then, on macOS, SDL - * will attempt to load \c vulkan.framework/vulkan, \c libvulkan.1.dylib, - * followed by \c libvulkan.dylib, in that order. - * On iOS SDL will attempt to load \c libvulkan.dylib only. Applications - * using a dynamic framework or .dylib must ensure it is included in its - * application bundle. + * \since This function is available since SDL 2.0.6. * - * \note On non-Apple devices, application linking with a static libvulkan is - * not supported. Either do not link to the Vulkan loader or link to a - * dynamic library version. - * - * \note This function will fail if there are no working Vulkan drivers - * installed. - * - * \sa SDL_Vulkan_GetVkGetInstanceProcAddr() - * \sa SDL_Vulkan_UnloadLibrary() + * \sa SDL_Vulkan_GetVkInstanceProcAddr + * \sa SDL_Vulkan_UnloadLibrary */ extern DECLSPEC int SDLCALL SDL_Vulkan_LoadLibrary(const char *path); /** - * \brief Get the address of the \c vkGetInstanceProcAddr function. + * Get the address of the `vkGetInstanceProcAddr` function. * - * \note This should be called after either calling SDL_Vulkan_LoadLibrary - * or creating an SDL_Window with the SDL_WINDOW_VULKAN flag. + * This should be called after either calling SDL_Vulkan_LoadLibrary() or + * creating an SDL_Window with the `SDL_WINDOW_VULKAN` flag. + * + * \returns the function pointer for `vkGetInstanceProcAddr` or NULL on error. + * + * \since This function is available since SDL 2.0.6. */ extern DECLSPEC void *SDLCALL SDL_Vulkan_GetVkGetInstanceProcAddr(void); /** - * \brief Unload the Vulkan loader library previously loaded by - * \c SDL_Vulkan_LoadLibrary(). + * Unload the Vulkan library previously loaded by SDL_Vulkan_LoadLibrary() * - * \sa SDL_Vulkan_LoadLibrary() + * \since This function is available since SDL 2.0.6. + * + * \sa SDL_Vulkan_LoadLibrary */ extern DECLSPEC void SDLCALL SDL_Vulkan_UnloadLibrary(void); /** - * \brief Get the names of the Vulkan instance extensions needed to create - * a surface with \c SDL_Vulkan_CreateSurface(). + * Get the names of the Vulkan instance extensions needed to create a surface + * with SDL_Vulkan_CreateSurface. * - * \param [in] \c NULL or window Window for which the required Vulkan instance - * extensions should be retrieved - * \param [in,out] pCount pointer to an \c unsigned related to the number of - * required Vulkan instance extensions - * \param [out] pNames \c NULL or a pointer to an array to be filled with the - * required Vulkan instance extensions + * If `pNames` is NULL, then the number of required Vulkan instance extensions + * is returned in `pCount`. Otherwise, `pCount` must point to a variable set + * to the number of elements in the `pNames` array, and on return the variable + * is overwritten with the number of names actually written to `pNames`. If + * `pCount` is less than the number of required extensions, at most `pCount` + * structures will be written. If `pCount` is smaller than the number of + * required extensions, SDL_FALSE will be returned instead of SDL_TRUE, to + * indicate that not all the required extensions were returned. * - * \return \c SDL_TRUE on success, \c SDL_FALSE on error. + * The `window` parameter is currently needed to be valid as of SDL 2.0.8, + * however, this parameter will likely be removed in future releases * - * If \a pNames is \c NULL, then the number of required Vulkan instance - * extensions is returned in pCount. Otherwise, \a pCount must point to a - * variable set to the number of elements in the \a pNames array, and on - * return the variable is overwritten with the number of names actually - * written to \a pNames. If \a pCount is less than the number of required - * extensions, at most \a pCount structures will be written. If \a pCount - * is smaller than the number of required extensions, \c SDL_FALSE will be - * returned instead of \c SDL_TRUE, to indicate that not all the required - * extensions were returned. + * \param window A window for which the required Vulkan instance extensions + * should be retrieved (will be deprecated in a future release) + * \param pCount A pointer to an unsigned int corresponding to the number of + * extensions to be returned + * \param pNames NULL or a pointer to an array to be filled with required + * Vulkan instance extensions + * \returns SDL_TRUE on success, SDL_FALSE on error. * - * \note If \c window is not NULL, it will be checked against its creation - * flags to ensure that the Vulkan flag is present. This parameter - * will be removed in a future major release. + * \since This function is available since SDL 2.0.6. * - * \note The returned list of extensions will contain \c VK_KHR_surface - * and zero or more platform specific extensions - * - * \note The extension names queried here must be enabled when calling - * VkCreateInstance, otherwise surface creation will fail. - * - * \note \c window should have been created with the \c SDL_WINDOW_VULKAN flag - * or be \c NULL - * - * \code - * unsigned int count; - * // get count of required extensions - * if(!SDL_Vulkan_GetInstanceExtensions(NULL, &count, NULL)) - * handle_error(); - * - * static const char *const additionalExtensions[] = - * { - * VK_EXT_DEBUG_REPORT_EXTENSION_NAME, // example additional extension - * }; - * size_t additionalExtensionsCount = sizeof(additionalExtensions) / sizeof(additionalExtensions[0]); - * size_t extensionCount = count + additionalExtensionsCount; - * const char **names = malloc(sizeof(const char *) * extensionCount); - * if(!names) - * handle_error(); - * - * // get names of required extensions - * if(!SDL_Vulkan_GetInstanceExtensions(NULL, &count, names)) - * handle_error(); - * - * // copy additional extensions after required extensions - * for(size_t i = 0; i < additionalExtensionsCount; i++) - * names[i + count] = additionalExtensions[i]; - * - * VkInstanceCreateInfo instanceCreateInfo = {}; - * instanceCreateInfo.enabledExtensionCount = extensionCount; - * instanceCreateInfo.ppEnabledExtensionNames = names; - * // fill in rest of instanceCreateInfo - * - * VkInstance instance; - * // create the Vulkan instance - * VkResult result = vkCreateInstance(&instanceCreateInfo, NULL, &instance); - * free(names); - * \endcode - * - * \sa SDL_Vulkan_CreateSurface() + * \sa SDL_Vulkan_CreateSurface */ -extern DECLSPEC SDL_bool SDLCALL SDL_Vulkan_GetInstanceExtensions( - SDL_Window *window, - unsigned int *pCount, - const char **pNames); +extern DECLSPEC SDL_bool SDLCALL SDL_Vulkan_GetInstanceExtensions(SDL_Window *window, + unsigned int *pCount, + const char **pNames); /** - * \brief Create a Vulkan rendering surface for a window. + * Create a Vulkan rendering surface for a window. * - * \param [in] window SDL_Window to which to attach the rendering surface. - * \param [in] instance handle to the Vulkan instance to use. - * \param [out] surface pointer to a VkSurfaceKHR handle to receive the - * handle of the newly created surface. + * The `window` must have been created with the `SDL_WINDOW_VULKAN` flag and + * `instance` must have been created with extensions returned by + * SDL_Vulkan_GetInstanceExtensions() enabled. * - * \return \c SDL_TRUE on success, \c SDL_FALSE on error. + * \param window The window to which to attach the Vulkan surface + * \param instance The Vulkan instance handle + * \param surface A pointer to a VkSurfaceKHR handle to output the newly + * created surface + * \returns SDL_TRUE on success, SDL_FALSE on error. * - * \code - * VkInstance instance; - * SDL_Window *window; + * \since This function is available since SDL 2.0.6. * - * // create instance and window - * - * // create the Vulkan surface - * VkSurfaceKHR surface; - * if(!SDL_Vulkan_CreateSurface(window, instance, &surface)) - * handle_error(); - * \endcode - * - * \note \a window should have been created with the \c SDL_WINDOW_VULKAN flag. - * - * \note \a instance should have been created with the extensions returned - * by \c SDL_Vulkan_CreateSurface() enabled. - * - * \sa SDL_Vulkan_GetInstanceExtensions() + * \sa SDL_Vulkan_GetInstanceExtensions + * \sa SDL_Vulkan_GetDrawableSize */ -extern DECLSPEC SDL_bool SDLCALL SDL_Vulkan_CreateSurface( - SDL_Window *window, - VkInstance instance, - VkSurfaceKHR* surface); +extern DECLSPEC SDL_bool SDLCALL SDL_Vulkan_CreateSurface(SDL_Window *window, + VkInstance instance, + VkSurfaceKHR* surface); /** - * \brief Get the size of a window's underlying drawable in pixels (for use - * with setting viewport, scissor & etc). - * - * \param window SDL_Window from which the drawable size should be queried - * \param w Pointer to variable for storing the width in pixels, - * may be NULL - * \param h Pointer to variable for storing the height in pixels, - * may be NULL + * Get the size of the window's underlying drawable dimensions in pixels. * * This may differ from SDL_GetWindowSize() if we're rendering to a high-DPI - * drawable, i.e. the window was created with SDL_WINDOW_ALLOW_HIGHDPI on a - * platform with high-DPI support (Apple calls this "Retina"), and not disabled - * by the \c SDL_HINT_VIDEO_HIGHDPI_DISABLED hint. + * drawable, i.e. the window was created with `SDL_WINDOW_ALLOW_HIGHDPI` on a + * platform with high-DPI support (Apple calls this "Retina"), and not + * disabled by the `SDL_HINT_VIDEO_HIGHDPI_DISABLED` hint. * - * \note On macOS high-DPI support must be enabled for an application by - * setting NSHighResolutionCapable to true in its Info.plist. + * \param window an SDL_Window for which the size is to be queried + * \param w Pointer to the variable to write the width to or NULL + * \param h Pointer to the variable to write the height to or NULL * - * \sa SDL_GetWindowSize() - * \sa SDL_CreateWindow() + * \since This function is available since SDL 2.0.6. + * + * \sa SDL_GetWindowSize + * \sa SDL_CreateWindow + * \sa SDL_Vulkan_CreateSurface */ extern DECLSPEC void SDLCALL SDL_Vulkan_GetDrawableSize(SDL_Window * window, int *w, int *h); diff --git a/libs/SDL2/include/begin_code.h b/libs/SDL2/include/begin_code.h index 22c997c41..63f064b6f 100644 --- a/libs/SDL2/include/begin_code.h +++ b/libs/SDL2/include/begin_code.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -51,15 +51,11 @@ /* Some compilers use a special export keyword */ #ifndef DECLSPEC -# if defined(__WIN32__) || defined(__WINRT__) -# ifdef __BORLANDC__ -# ifdef BUILD_SDL -# define DECLSPEC -# else -# define DECLSPEC __declspec(dllimport) -# endif -# else +# if defined(__WIN32__) || defined(__WINRT__) || defined(__CYGWIN__) +# ifdef DLL_EXPORT # define DECLSPEC __declspec(dllexport) +# else +# define DECLSPEC # endif # elif defined(__OS2__) # ifdef BUILD_SDL @@ -168,3 +164,24 @@ #endif #endif /* NULL */ #endif /* ! Mac OS X - breaks precompiled headers */ + +#ifndef SDL_FALLTHROUGH +#if (defined(__cplusplus) && __cplusplus >= 201703L) || \ + (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202000L) +#define SDL_FALLTHROUGH [[fallthrough]] +#else +#if defined(__has_attribute) +#define _HAS_FALLTHROUGH __has_attribute(__fallthrough__) +#else +#define _HAS_FALLTHROUGH 0 +#endif /* __has_attribute */ +#if _HAS_FALLTHROUGH && \ + ((defined(__GNUC__) && __GNUC__ >= 7) || \ + (defined(__clang_major__) && __clang_major__ >= 10)) +#define SDL_FALLTHROUGH __attribute__((__fallthrough__)) +#else +#define SDL_FALLTHROUGH do {} while (0) /* fallthrough */ +#endif /* _HAS_FALLTHROUGH */ +#undef _HAS_FALLTHROUGH +#endif /* C++17 or C2x */ +#endif /* SDL_FALLTHROUGH not defined */ diff --git a/libs/SDL2/include/close_code.h b/libs/SDL2/include/close_code.h index 8e4cac3da..dc73432f6 100644 --- a/libs/SDL2/include/close_code.h +++ b/libs/SDL2/include/close_code.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/lib/ARM/SDL2.dll b/libs/SDL2/lib/ARM/SDL2.dll deleted file mode 100644 index 3eec027ef..000000000 Binary files a/libs/SDL2/lib/ARM/SDL2.dll and /dev/null differ diff --git a/libs/SDL2/lib/ARM/SDL2.lib b/libs/SDL2/lib/ARM/SDL2.lib deleted file mode 100644 index b027b8956..000000000 Binary files a/libs/SDL2/lib/ARM/SDL2.lib and /dev/null differ diff --git a/libs/SDL2/lib/ARM64/SDL2.dll b/libs/SDL2/lib/ARM64/SDL2.dll deleted file mode 100644 index 9e2d2c785..000000000 Binary files a/libs/SDL2/lib/ARM64/SDL2.dll and /dev/null differ diff --git a/libs/SDL2/lib/ARM64/SDL2.lib b/libs/SDL2/lib/ARM64/SDL2.lib deleted file mode 100644 index 3e8cf8d46..000000000 Binary files a/libs/SDL2/lib/ARM64/SDL2.lib and /dev/null differ diff --git a/libs/SDL2/lib/x64/SDL2.dll b/libs/SDL2/lib/x64/SDL2.dll index 0edb386ee..2a4ba89d8 100644 Binary files a/libs/SDL2/lib/x64/SDL2.dll and b/libs/SDL2/lib/x64/SDL2.dll differ diff --git a/libs/SDL2/lib/x64/SDL2.lib b/libs/SDL2/lib/x64/SDL2.lib index 89f7d37fc..539324dc2 100644 Binary files a/libs/SDL2/lib/x64/SDL2.lib and b/libs/SDL2/lib/x64/SDL2.lib differ diff --git a/libs/SDL2/lib/x64/SDL2main.lib b/libs/SDL2/lib/x64/SDL2main.lib index 4d07170c4..0d4b671c3 100644 Binary files a/libs/SDL2/lib/x64/SDL2main.lib and b/libs/SDL2/lib/x64/SDL2main.lib differ diff --git a/libs/SDL2/lib/x64/SDL2test.lib b/libs/SDL2/lib/x64/SDL2test.lib index f3ad021f7..4c2fdd808 100644 Binary files a/libs/SDL2/lib/x64/SDL2test.lib and b/libs/SDL2/lib/x64/SDL2test.lib differ diff --git a/libs/SDL2/lib/x86/SDL2.dll b/libs/SDL2/lib/x86/SDL2.dll index 3673be1ab..343dd68c6 100644 Binary files a/libs/SDL2/lib/x86/SDL2.dll and b/libs/SDL2/lib/x86/SDL2.dll differ diff --git a/libs/SDL2/lib/x86/SDL2.lib b/libs/SDL2/lib/x86/SDL2.lib index da3b4432b..3bdbc5e79 100644 Binary files a/libs/SDL2/lib/x86/SDL2.lib and b/libs/SDL2/lib/x86/SDL2.lib differ diff --git a/libs/SDL2/lib/x86/SDL2main.lib b/libs/SDL2/lib/x86/SDL2main.lib index 27b48de2a..e0a02e329 100644 Binary files a/libs/SDL2/lib/x86/SDL2main.lib and b/libs/SDL2/lib/x86/SDL2main.lib differ diff --git a/libs/SDL2/lib/x86/SDL2test.lib b/libs/SDL2/lib/x86/SDL2test.lib index 1f195015b..a0b45707f 100644 Binary files a/libs/SDL2/lib/x86/SDL2test.lib and b/libs/SDL2/lib/x86/SDL2test.lib differ diff --git a/libs/SDL2/test/CMakeLists.txt b/libs/SDL2/test/CMakeLists.txt index 3c25c5c7c..665d2d721 100644 --- a/libs/SDL2/test/CMakeLists.txt +++ b/libs/SDL2/test/CMakeLists.txt @@ -1,21 +1,56 @@ -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 3.0.0) project(SDL2 C) # Global settings for all of the test targets # FIXME: is this wrong? remove_definitions(-DUSING_GENERATED_CONFIG_H) -link_libraries(SDL2_test SDL2-static) -# FIXME: Parent directory CMakeLists.txt only sets these for mingw/cygwin, -# but we need them for VS as well. +if(PSP) + link_libraries( + SDL2main + SDL2_test + SDL2-static + GL + pspvram + pspvfpu + pspdisplay + pspgu + pspge + pspaudio + pspctrl + psphprm + psppower + ) +else() + link_libraries(SDL2_test SDL2-static) +endif() + if(WINDOWS) + # mingw32 must come before SDL2main to link successfully + if(MINGW OR CYGWIN) + link_libraries(mingw32) + endif() + + # FIXME: Parent directory CMakeLists.txt only sets these for mingw/cygwin, + # but we need them for VS as well. link_libraries(SDL2main) add_definitions(-Dmain=SDL_main) endif() +# CMake incorrectly detects opengl32.lib being present on MSVC ARM64 +if(NOT MSVC OR NOT CMAKE_GENERATOR_PLATFORM STREQUAL "ARM64") + find_package(OpenGL) +endif() + +if (OPENGL_FOUND) +add_definitions(-DHAVE_OPENGL) +endif() + add_executable(checkkeys checkkeys.c) +add_executable(checkkeysthreads checkkeysthreads.c) add_executable(loopwave loopwave.c) add_executable(loopwavequeue loopwavequeue.c) +add_executable(testsurround testsurround.c) add_executable(testresample testresample.c) add_executable(testaudioinfo testaudioinfo.c) @@ -35,6 +70,7 @@ add_executable(testdropfile testdropfile.c) add_executable(testerror testerror.c) add_executable(testfile testfile.c) add_executable(testgamecontroller testgamecontroller.c) +add_executable(testgeometry testgeometry.c) add_executable(testgesture testgesture.c) add_executable(testgl2 testgl2.c) add_executable(testgles testgles.c) @@ -49,6 +85,7 @@ add_executable(testjoystick testjoystick.c) add_executable(testkeys testkeys.c) add_executable(testloadso testloadso.c) add_executable(testlock testlock.c) +add_executable(testmouse testmouse.c) if(APPLE) add_executable(testnative testnative.c @@ -86,37 +123,179 @@ add_executable(testbounds testbounds.c) add_executable(testcustomcursor testcustomcursor.c) add_executable(controllermap controllermap.c) add_executable(testvulkan testvulkan.c) +add_executable(testoffscreen testoffscreen.c) -# HACK: Dummy target to cause the resource files to be copied to the build directory. -# Need to make it an executable so we can use the TARGET_FILE_DIR generator expression. -# This is needed so they get copied to the correct Debug/Release subdirectory in Xcode. -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/resources_dummy.c "int main(int argc, const char **argv){ return 1; }\n") -add_executable(SDL2_test_resoureces ${CMAKE_CURRENT_BINARY_DIR}/resources_dummy.c) - -file(GLOB RESOURCE_FILES *.bmp *.wav) -foreach(RESOURCE_FILE ${RESOURCE_FILES}) - add_custom_command(TARGET SDL2_test_resoureces POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${RESOURCE_FILE} $) -endforeach(RESOURCE_FILE) +if(OPENGL_FOUND) +add_dependencies(testshader OpenGL::GL) +add_dependencies(testgl2 OpenGL::GL) +target_link_libraries(testshader OpenGL::GL) +target_link_libraries(testgl2 OpenGL::GL) +endif() +file(GLOB RESOURCE_FILES *.bmp *.wav *.hex moose.dat utf8.txt) file(COPY ${RESOURCE_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) +if(PSP) + set(NEEDS_RESOURCES + testscale + testrendercopyex + controllermap + testyuv + testgamecontroller + testshape + testshader + testspriteminimal + testautomation + testrendertarget + testsprite2 + loopwave + loopwavequeue + testresample + testaudiohotplug + testmultiaudio + testiconv + testoverlay2 + teststreaming + testviewport + ) +else() + set(NEEDS_RESOURCES + testscale + testrendercopyex + controllermap + testyuv + testgamecontroller + testshape + testshader + testspriteminimal + testautomation + testcustomcursor + testrendertarget + testsprite2 + loopwave + loopwavequeue + testresample + testaudiohotplug + testmultiaudio + testime + testnative + testiconv + testoverlay2 + teststreaming + testviewport + ) +endif() -# TODO: Might be easier to make all targets depend on the resources...? -add_dependencies(testscale SDL2_test_resoureces) -add_dependencies(testrendercopyex SDL2_test_resoureces) -add_dependencies(controllermap SDL2_test_resoureces) -add_dependencies(testyuv SDL2_test_resoureces) -add_dependencies(testgamecontroller SDL2_test_resoureces) -add_dependencies(testshape SDL2_test_resoureces) -add_dependencies(testshader SDL2_test_resoureces) -add_dependencies(testnative SDL2_test_resoureces) -add_dependencies(testspriteminimal SDL2_test_resoureces) -add_dependencies(testautomation SDL2_test_resoureces) -add_dependencies(testcustomcursor SDL2_test_resoureces) -add_dependencies(testrendertarget SDL2_test_resoureces) -add_dependencies(testsprite2 SDL2_test_resoureces) +if(PSP) + # Build EBOOT files if building for PSP + set(BUILD_EBOOT + ${NEEDS_RESOURCES} + testbounds + testgl2 + testsem + testdisplayinfo + teststreaming + testgeometry + testfile + testdraw2 + testviewport + testhittesting + testoverlay2 + testver + testdrawchessboard + testsurround + testintersections + testmessage + testaudiocapture + testerror + testatomic + testjoystick + testiconv + testfilesystem + testplatform + testthread + testloadso + testqsort + testaudioinfo + testlock + testtimer + testpower + testwm2 + torturethread + ) + foreach(APP IN LISTS BUILD_EBOOT) + create_pbp_file( + TARGET ${APP} + TITLE SDL-${APP} + ICON_PATH NULL + BACKGROUND_PATH NULL + PREVIEW_PATH NULL + ) + add_custom_command( + TARGET ${APP} POST_BUILD + COMMAND ${CMAKE_COMMAND} -E make_directory + $/sdl-${APP} + ) + add_custom_command( + TARGET ${APP} POST_BUILD + COMMAND ${CMAKE_COMMAND} -E rename + $/EBOOT.PBP + $/sdl-${APP}/EBOOT.PBP + ) + if(${BUILD_PRX}) + add_custom_command( + TARGET ${APP} POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy + $/${APP} + $/sdl-${APP}/${APP} + ) + add_custom_command( + TARGET ${APP} POST_BUILD + COMMAND ${CMAKE_COMMAND} -E rename + $/${APP}.prx + $/sdl-${APP}/${APP}.prx + ) + endif() + add_custom_command( + TARGET ${APP} POST_BUILD + COMMAND ${CMAKE_COMMAND} -E remove + $/PARAM.SFO + ) + endforeach() +endif() -add_dependencies(loopwave SDL2_test_resoureces) -add_dependencies(loopwavequeue SDL2_test_resoureces) -add_dependencies(testresample SDL2_test_resoureces) -add_dependencies(testaudiohotplug SDL2_test_resoureces) -add_dependencies(testmultiaudio SDL2_test_resoureces) +foreach(APP IN LISTS NEEDS_RESOURCES) + foreach(RESOURCE_FILE ${RESOURCE_FILES}) + if(PSP) + add_custom_command(TARGET ${APP} POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${RESOURCE_FILE} $/sdl-${APP}) + else() + add_custom_command(TARGET ${APP} POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${RESOURCE_FILE} $) + endif() + endforeach(RESOURCE_FILE) + if(APPLE) + # Make sure resource files get installed into macOS/iOS .app bundles. + target_sources(${APP} PRIVATE "${RESOURCE_FILES}") + set_target_properties(${APP} PROPERTIES RESOURCE "${RESOURCE_FILES}") + endif() +endforeach() + +# Set Apple App ID / Bundle ID. This is needed to launch apps on some Apple +# platforms (iOS, for example). +if(APPLE) + if(${CMAKE_VERSION} VERSION_LESS "3.7.0") + # CMake's 'BUILDSYSTEM_TARGETS' property is only available in + # CMake 3.7 and above. + message(WARNING "Unable to set Bundle ID for Apple .app builds due to old CMake (pre 3.7).") + else() + get_property(TARGETS DIRECTORY ${CMAKE_CURRENT_LIST_DIR} PROPERTY BUILDSYSTEM_TARGETS) + foreach(CURRENT_TARGET IN LISTS TARGETS) + get_property(TARGET_TYPE TARGET ${CURRENT_TARGET} PROPERTY TYPE) + if(TARGET_TYPE STREQUAL "EXECUTABLE") + set_target_properties("${CURRENT_TARGET}" PROPERTIES + MACOSX_BUNDLE_GUI_IDENTIFIER "org.libsdl.${CURRENT_TARGET}" + MACOSX_BUNDLE_BUNDLE_VERSION "${SDL_VERSION}" + MACOSX_BUNDLE_SHORT_VERSION_STRING "${SDL_VERSION}" + ) + endif() + endforeach() + endif() +endif() diff --git a/libs/SDL2/test/Makefile.in b/libs/SDL2/test/Makefile.in index 9a62156ec..d29dc6ecf 100644 --- a/libs/SDL2/test/Makefile.in +++ b/libs/SDL2/test/Makefile.in @@ -9,6 +9,7 @@ LIBS = @LIBS@ TARGETS = \ checkkeys$(EXE) \ + checkkeysthreads$(EXE) \ controllermap$(EXE) \ loopwave$(EXE) \ loopwavequeue$(EXE) \ @@ -24,9 +25,11 @@ TARGETS = \ testdrawchessboard$(EXE) \ testdropfile$(EXE) \ testerror$(EXE) \ + testevdev$(EXE) \ testfile$(EXE) \ testfilesystem$(EXE) \ testgamecontroller$(EXE) \ + testgeometry$(EXE) \ testgesture$(EXE) \ testhaptic$(EXE) \ testhittesting$(EXE) \ @@ -37,8 +40,10 @@ TARGETS = \ testjoystick$(EXE) \ testkeys$(EXE) \ testloadso$(EXE) \ + testlocale$(EXE) \ testlock$(EXE) \ testmessage$(EXE) \ + testmouse$(EXE) \ testmultiaudio$(EXE) \ testnative$(EXE) \ testoverlay2$(EXE) \ @@ -57,8 +62,10 @@ TARGETS = \ testsprite2$(EXE) \ testspriteminimal$(EXE) \ teststreaming$(EXE) \ + testsurround$(EXE) \ testthread$(EXE) \ testtimer$(EXE) \ + testurl$(EXE) \ testver$(EXE) \ testviewport$(EXE) \ testvulkan$(EXE) \ @@ -66,7 +73,7 @@ TARGETS = \ testyuv$(EXE) \ torturethread$(EXE) \ - + @OPENGL_TARGETS@ += testgl2$(EXE) testshader$(EXE) @OPENGLES1_TARGETS@ += testgles$(EXE) @OPENGLES2_TARGETS@ += testgles2$(EXE) @@ -80,12 +87,18 @@ Makefile: $(srcdir)/Makefile.in checkkeys$(EXE): $(srcdir)/checkkeys.c $(CC) -o $@ $^ $(CFLAGS) $(LIBS) +checkkeysthreads$(EXE): $(srcdir)/checkkeysthreads.c + $(CC) -o $@ $^ $(CFLAGS) $(LIBS) + loopwave$(EXE): $(srcdir)/loopwave.c $(CC) -o $@ $^ $(CFLAGS) $(LIBS) loopwavequeue$(EXE): $(srcdir)/loopwavequeue.c $(CC) -o $@ $^ $(CFLAGS) $(LIBS) +testsurround$(EXE): $(srcdir)/testsurround.c + $(CC) -o $@ $^ $(CFLAGS) $(LIBS) + testresample$(EXE): $(srcdir)/testresample.c $(CC) -o $@ $^ $(CFLAGS) $(LIBS) @@ -146,12 +159,18 @@ testdropfile$(EXE): $(srcdir)/testdropfile.c testerror$(EXE): $(srcdir)/testerror.c $(CC) -o $@ $^ $(CFLAGS) $(LIBS) +testevdev$(EXE): $(srcdir)/testevdev.c + $(CC) -o $@ $^ $(CFLAGS) $(LIBS) + testfile$(EXE): $(srcdir)/testfile.c $(CC) -o $@ $^ $(CFLAGS) $(LIBS) testgamecontroller$(EXE): $(srcdir)/testgamecontroller.c $(CC) -o $@ $^ $(CFLAGS) $(LIBS) - + +testgeometry$(EXE): $(srcdir)/testgeometry.c + $(CC) -o $@ $^ $(CFLAGS) $(LIBS) + testgesture$(EXE): $(srcdir)/testgesture.c $(CC) -o $@ $^ $(CFLAGS) $(LIBS) @MATHLIB@ @@ -164,6 +183,9 @@ testgles$(EXE): $(srcdir)/testgles.c testgles2$(EXE): $(srcdir)/testgles2.c $(CC) -o $@ $^ $(CFLAGS) $(LIBS) @MATHLIB@ +testgles2_sdf$(EXE): $(srcdir)/testgles2_sdf.c + $(CC) -o $@ $^ $(CFLAGS) $(LIBS) @MATHLIB@ + testhaptic$(EXE): $(srcdir)/testhaptic.c $(CC) -o $@ $^ $(CFLAGS) $(LIBS) @@ -213,14 +235,22 @@ testnative$(EXE): $(srcdir)/testnative.c \ $(CC) -o $@ $^ $(CFLAGS) $(LIBS) @XLIB@ endif +ifeq (@ISOS2@,true) +testnative$(EXE): $(srcdir)/testnative.c \ + $(srcdir)/testnativeos2.c + $(CC) -o $@ $^ $(CFLAGS) $(LIBS) +endif + #there's probably a better way of doing this ifeq (@ISMACOSX@,false) ifeq (@ISWINDOWS@,false) ifeq (@ISUNIX@,false) +ifeq (@ISOS2@,false) testnative$(EXE): ; endif endif endif +endif testoverlay2$(EXE): $(srcdir)/testoverlay2.c $(srcdir)/testyuv_cvt.c $(CC) -o $@ $^ $(CFLAGS) $(LIBS) @@ -264,6 +294,9 @@ teststreaming$(EXE): $(srcdir)/teststreaming.c testtimer$(EXE): $(srcdir)/testtimer.c $(CC) -o $@ $^ $(CFLAGS) $(LIBS) +testurl$(EXE): $(srcdir)/testurl.c + $(CC) -o $@ $^ $(CFLAGS) $(LIBS) + testver$(EXE): $(srcdir)/testver.c $(CC) -o $@ $^ $(CFLAGS) $(LIBS) @@ -303,6 +336,12 @@ controllermap$(EXE): $(srcdir)/controllermap.c testvulkan$(EXE): $(srcdir)/testvulkan.c $(CC) -o $@ $^ $(CFLAGS) $(LIBS) +testlocale$(EXE): $(srcdir)/testlocale.c + $(CC) -o $@ $? $(CFLAGS) $(LIBS) + +testmouse$(EXE): $(srcdir)/testmouse.c + $(CC) -o $@ $^ $(CFLAGS) $(LIBS) + clean: rm -f $(TARGETS) @@ -312,25 +351,25 @@ distclean: clean rm -f config.status config.cache config.log rm -rf $(srcdir)/autom4te* +DATA = \ + axis.bmp \ + button.bmp \ + controllermap.bmp \ + controllermap_back.bmp \ + icon.bmp \ + moose.dat \ + sample.bmp \ + sample.wav \ + testgles2_sdf_img_normal.bmp \ + testgles2_sdf_img_sdf.bmp \ + testyuv.bmp \ + unifont-13.0.06.hex \ + $(NULL) -%.bmp: $(srcdir)/%.bmp +ifneq ($(srcdir), .) +$(DATA) : %: $(srcdir)/% Makefile cp $< $@ +endif -%.wav: $(srcdir)/%.wav - cp $< $@ - -%.dat: $(srcdir)/%.dat - cp $< $@ - -copydatafiles: copybmpfiles copywavfiles copydatfiles +copydatafiles: $(DATA) .PHONY : copydatafiles - -copybmpfiles: $(foreach bmp,$(wildcard $(srcdir)/*.bmp),$(notdir $(bmp))) -.PHONY : copybmpfiles - -copywavfiles: $(foreach wav,$(wildcard $(srcdir)/*.wav),$(notdir $(wav))) -.PHONY : copywavfiles - -copydatfiles: $(foreach dat,$(wildcard $(srcdir)/*.dat),$(notdir $(dat))) -.PHONY : copydatfiles - diff --git a/libs/SDL2/test/Makefile.os2 b/libs/SDL2/test/Makefile.os2 index 59866a056..e238af4be 100644 --- a/libs/SDL2/test/Makefile.os2 +++ b/libs/SDL2/test/Makefile.os2 @@ -1,9 +1,21 @@ -BINPATH = . +# Open Watcom makefile to build SDL2 tests for OS/2 +# wmake -f Makefile.os2 + +INCPATH = -I"$(%WATCOM)/h/os2" -I"$(%WATCOM)/h" -I"../include" + +CFLAGS = $(INCPATH) -bt=os2 -d0 -q -bm -5s -fp5 -fpi87 -sg -oteanbmier -ei +CFLAGS+= -wx -wcd=303 + +LIBPATH = .. +LIBS = SDL2.lib SDL2test.lib + +#CFLAGS+= -DHAVE_SDL_TTF +#TTFLIBS = SDL2ttf.lib TARGETS = testatomic.exe testdisplayinfo.exe testbounds.exe testdraw2.exe & testdrawchessboard.exe testdropfile.exe testerror.exe testfile.exe & - testfilesystem.exe testgamecontroller.exe testgesture.exe & - testhittesting.exe testhotplug.exe testiconv.exe testime.exe & + testfilesystem.exe testgamecontroller.exe testgeometry.exe testgesture.exe & + testhittesting.exe testhotplug.exe testiconv.exe testime.exe testlocale.exe & testintersections.exe testjoystick.exe testkeys.exe testloadso.exe & testlock.exe testmessage.exe testoverlay2.exe testplatform.exe & testpower.exe testsensor.exe testrelative.exe testrendercopyex.exe & @@ -11,21 +23,13 @@ TARGETS = testatomic.exe testdisplayinfo.exe testbounds.exe testdraw2.exe & testshader.exe testshape.exe testsprite2.exe testspriteminimal.exe & teststreaming.exe testthread.exe testtimer.exe testver.exe & testviewport.exe testwm2.exe torturethread.exe checkkeys.exe & + checkkeysthreads.exe testmouse.exe & controllermap.exe testhaptic.exe testqsort.exe testresample.exe & testaudioinfo.exe testaudiocapture.exe loopwave.exe loopwavequeue.exe & - testyuv.exe testgl2.exe testvulkan.exe testautomation.exe - -# SDL2test.lib sources (../src/test) - -CSRCS = SDL_test_assert.c SDL_test_common.c SDL_test_compare.c & - SDL_test_crc32.c SDL_test_font.c SDL_test_fuzzer.c SDL_test_harness.c & - SDL_test_imageBlit.c SDL_test_imageBlitBlend.c SDL_test_imageFace.c & - SDL_test_imagePrimitives.c SDL_test_imagePrimitivesBlend.c & - SDL_test_log.c SDL_test_md5.c SDL_test_random.c SDL_test_memory.c -TESTLIB = SDL2test.lib + testsurround.exe testyuv.exe testgl2.exe testvulkan.exe testnative.exe & + testautomation.exe # testautomation sources - TASRCS = testautomation.c testautomation_audio.c testautomation_clipboard.c & testautomation_events.c testautomation_hints.c & testautomation_keyboard.c testautomation_main.c & @@ -42,50 +46,32 @@ TAOBJS = $(TASRCS:.c=.obj) all: $(TARGETS) -INCPATH = -I$(%WATCOM)/h/os2 -I$(%WATCOM)/h -I../include - -CFLAGS = $(INCPATH) -bt=os2 -d0 -q -bm -5s -fp5 -fpi87 -sg -oteanbmier -ei - -LIBPATH = .. -LIBS = SDL2.lib $(TESTLIB) - -#CFLAGS+= -DHAVE_SDL_TTF -#LIBS_TTF = SDL2ttf.lib - .c: ../src/test -$(TESTLIB): $(COBJS) - wlib -q -b -n $@ $(COBJS) - .obj.exe: - @%make $(TESTLIB) wlink SYS os2v2 libpath $(LIBPATH) lib {$(LIBS)} op q op el file {$<} name $@ .c.obj: - wcc386 $(CFLAGS) -wcd=107 -fo=$^@ $< + wcc386 $(CFLAGS) -fo=$^@ $< # specials testautomation.exe: $(TAOBJS) - @%make $(TESTLIB) + wlink SYS os2v2 libpath $(LIBPATH) lib {$(LIBS)} op q op el file {$<} name $@ + +testnative.exe: testnative.obj testnativeos2.obj wlink SYS os2v2 libpath $(LIBPATH) lib {$(LIBS)} op q op el file {$<} name $@ testoverlay2.exe: testoverlay2.obj testyuv_cvt.obj - @%make $(TESTLIB) wlink SYS os2v2 libpath $(LIBPATH) lib {$(LIBS)} op q op el file {$<} name $@ testyuv.exe: testyuv.obj testyuv_cvt.obj - @%make $(TESTLIB) wlink SYS os2v2 libpath $(LIBPATH) lib {$(LIBS)} op q op el file {$<} name $@ testime.exe: testime.obj - @%make $(TESTLIB) - wlink SYS os2v2 libpath $(LIBPATH) lib {$(LIBS) $(LIBS_TTF)} op q op el file {$<} name $@ + wlink SYS os2v2 libpath $(LIBPATH) lib {$(LIBS) $(TTFLIBS)} op q op el file {$<} name $@ clean: .SYMBOLIC - @echo * Clean tests in $(BINPATH) @if exist *.obj rm *.obj @if exist *.err rm *.err - distclean: .SYMBOLIC clean @if exist *.exe rm *.exe - @if exist $(TESTLIB) rm $(TESTLIB) diff --git a/libs/SDL2/test/README b/libs/SDL2/test/README index f6282be34..b1ee0892e 100644 --- a/libs/SDL2/test/README +++ b/libs/SDL2/test/README @@ -4,6 +4,7 @@ These are test programs for the SDL library: checkkeys Watch the key events to check the keyboard loopwave Audio test -- loop playing a WAV file loopwavequeue Audio test -- loop playing a WAV file with SDL_QueueAudio + testsurround Audio test -- play test tone on each audio channel testaudioinfo Lists audio device capabilities testerror Tests multi-threaded error handling testfile Tests RWops layer @@ -12,7 +13,9 @@ These are test programs for the SDL library: testjoystick List joysticks and watch joystick events testkeys List the available keyboard keys testloadso Tests the loadable library layer + testlocale Test Locale API testlock Hacked up test of multi-threading and locking + testmouse Tests mouse coordinates testmultiaudio Tests using several audio devices testoverlay2 Tests the overlay flickering/scaling during playback. testplatform Tests types, endianness and cpu capabilities diff --git a/libs/SDL2/test/acinclude.m4 b/libs/SDL2/test/acinclude.m4 index ead69e514..0fdf353ea 100644 --- a/libs/SDL2/test/acinclude.m4 +++ b/libs/SDL2/test/acinclude.m4 @@ -5,13 +5,13 @@ # stolen from Manish Singh # Shamelessly stolen from Owen Taylor -# serial 1 +# serial 2 -dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +dnl AM_PATH_SDL2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS dnl AC_DEFUN([AM_PATH_SDL2], -[dnl +[dnl dnl Get the cflags and libraries from the sdl2-config script dnl AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)], @@ -21,7 +21,7 @@ AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program], , enable_sdltest=yes) - min_sdl_version=ifelse([$1], ,0.9.0,$1) + min_sdl_version=ifelse([$1], ,2.0.0,$1) if test "x$sdl_prefix$sdl_exec_prefix" = x ; then PKG_CHECK_MODULES([SDL], [sdl2 >= $min_sdl_version], @@ -31,42 +31,42 @@ AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run sdl_pc=no if test x$sdl_exec_prefix != x ; then sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix" - if test x${SDL_CONFIG+set} != xset ; then - SDL_CONFIG=$sdl_exec_prefix/bin/sdl2-config + if test x${SDL2_CONFIG+set} != xset ; then + SDL2_CONFIG=$sdl_exec_prefix/bin/sdl2-config fi fi if test x$sdl_prefix != x ; then sdl_config_args="$sdl_config_args --prefix=$sdl_prefix" - if test x${SDL_CONFIG+set} != xset ; then - SDL_CONFIG=$sdl_prefix/bin/sdl2-config + if test x${SDL2_CONFIG+set} != xset ; then + SDL2_CONFIG=$sdl_prefix/bin/sdl2-config fi fi fi if test "x$sdl_pc" = xyes ; then no_sdl="" - SDL_CONFIG="pkg-config sdl2" + SDL2_CONFIG="pkg-config sdl2" else as_save_PATH="$PATH" if test "x$prefix" != xNONE && test "$cross_compiling" != yes; then PATH="$prefix/bin:$prefix/usr/bin:$PATH" fi - AC_PATH_PROG(SDL_CONFIG, sdl2-config, no, [$PATH]) + AC_PATH_PROG(SDL2_CONFIG, sdl2-config, no, [$PATH]) PATH="$as_save_PATH" AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) no_sdl="" - if test "$SDL_CONFIG" = "no" ; then + if test "$SDL2_CONFIG" = "no" ; then no_sdl=yes else - SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags` - SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs` + SDL_CFLAGS=`$SDL2_CONFIG $sdl_config_args --cflags` + SDL_LIBS=`$SDL2_CONFIG $sdl_config_args --libs` - sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \ + sdl_major_version=`$SDL2_CONFIG $sdl_config_args --version | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \ + sdl_minor_version=`$SDL2_CONFIG $sdl_config_args --version | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \ + sdl_micro_version=`$SDL2_CONFIG $sdl_config_args --version | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` if test "x$enable_sdltest" = "xyes" ; then ac_save_CFLAGS="$CFLAGS" @@ -80,41 +80,19 @@ dnl Now check if the installed SDL is sufficiently new. (Also sanity dnl checks the results of sdl2-config to some extent dnl rm -f conf.sdltest - AC_TRY_RUN([ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include #include -#include #include "SDL.h" -char* -my_strdup (char *str) -{ - char *new_str; - - if (str) - { - new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); - strcpy (new_str, str); - } - else - new_str = NULL; - - return new_str; -} - int main (int argc, char *argv[]) { int major, minor, micro; - char *tmp_version; + FILE *fp = fopen("conf.sdltest", "w"); - /* This hangs on some systems (?) - system ("touch conf.sdltest"); - */ - { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); } + if (fp) fclose(fp); - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = my_strdup("$min_sdl_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + if (sscanf("$min_sdl_version", "%d.%d.%d", &major, &minor, µ) != 3) { printf("%s, bad version string\n", "$min_sdl_version"); exit(1); } @@ -130,14 +108,14 @@ int main (int argc, char *argv[]) printf("\n*** 'sdl2-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version); printf("*** of SDL required is %d.%d.%d. If sdl2-config is correct, then it is\n", major, minor, micro); printf("*** best to upgrade to the required version.\n"); - printf("*** If sdl2-config was wrong, set the environment variable SDL_CONFIG\n"); + printf("*** If sdl2-config was wrong, set the environment variable SDL2_CONFIG\n"); printf("*** to point to the correct copy of sdl2-config, and remove the file\n"); printf("*** config.cache before re-running configure\n"); return 1; } } -],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) +]])], [], [no_sdl=yes], [echo $ac_n "cross compiling; assumed OK... $ac_c"]) CFLAGS="$ac_save_CFLAGS" CXXFLAGS="$ac_save_CXXFLAGS" LIBS="$ac_save_LIBS" @@ -152,10 +130,10 @@ int main (int argc, char *argv[]) if test "x$no_sdl" = x ; then ifelse([$2], , :, [$2]) else - if test "$SDL_CONFIG" = "no" ; then + if test "$SDL2_CONFIG" = "no" ; then echo "*** The sdl2-config script installed by SDL could not be found" echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the SDL_CONFIG environment variable to the" + echo "*** your path, or set the SDL2_CONFIG environment variable to the" echo "*** full path to sdl2-config." else if test -f conf.sdltest ; then @@ -165,7 +143,7 @@ int main (int argc, char *argv[]) CFLAGS="$CFLAGS $SDL_CFLAGS" CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" LIBS="$LIBS $SDL_LIBS" - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include #include "SDL.h" @@ -173,7 +151,7 @@ int main(int argc, char *argv[]) { return 0; } #undef main #define main K_and_R_C_main -], [ return 0; ], +]], [[ return 0; ]])], [ echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding SDL or finding the wrong" echo "*** version of SDL. If it is not finding SDL, you'll need to set your" @@ -186,7 +164,7 @@ int main(int argc, char *argv[]) [ echo "*** The test program failed to compile or link. See the file config.log for the" echo "*** exact error that occured. This usually means SDL was incorrectly installed" echo "*** or that you have moved SDL since it was installed. In the latter case, you" - echo "*** may want to edit the sdl2-config script: $SDL_CONFIG" ]) + echo "*** may want to edit the sdl2-config script: $SDL2_CONFIG" ]) CFLAGS="$ac_save_CFLAGS" CXXFLAGS="$ac_save_CXXFLAGS" LIBS="$ac_save_LIBS" @@ -228,7 +206,7 @@ int main(int argc, char *argv[]) # ---------------------------------- AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +m4_pattern_allow([^PKG_CONFIG(_PATH|_LIBDIR)?$]) AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) @@ -309,7 +287,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl pkg_failed=no -AC_MSG_CHECKING([for $1]) +AC_MSG_CHECKING([for $2]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) @@ -337,7 +315,7 @@ $$1_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT])dnl +_PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then AC_MSG_RESULT([no]) @@ -348,7 +326,7 @@ path to pkg-config. _PKG_TEXT -To get pkg-config, see .])dnl +To get pkg-config, see .])[]dnl ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS diff --git a/libs/SDL2/test/autogen.sh b/libs/SDL2/test/autogen.sh index 939f34c0f..988d41760 100755 --- a/libs/SDL2/test/autogen.sh +++ b/libs/SDL2/test/autogen.sh @@ -1,12 +1,11 @@ #!/bin/sh -# -# Regenerate configuration files + cp acinclude.m4 aclocal.m4 -found=false -for autoconf in autoconf autoconf259 autoconf-2.59 -do if which $autoconf >/dev/null 2>&1; then $autoconf && found=true; break; fi -done -if test x$found = xfalse; then - echo "Couldn't find autoconf, aborting" - exit 1 + +if test "$AUTOCONF"x = x; then + AUTOCONF=autoconf fi + +$AUTOCONF || exit 1 +rm aclocal.m4 +rm -rf autom4te.cache diff --git a/libs/SDL2/test/checkkeys.c b/libs/SDL2/test/checkkeys.c index 421f8f923..caec4b955 100644 --- a/libs/SDL2/test/checkkeys.c +++ b/libs/SDL2/test/checkkeys.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -86,6 +86,8 @@ print_modifiers(char **text, size_t *maxlen) print_string(text, maxlen, " CAPS"); if (mod & KMOD_MODE) print_string(text, maxlen, " MODE"); + if (mod & KMOD_SCROLL) + print_string(text, maxlen, " SCROLL"); } static void @@ -135,9 +137,10 @@ PrintKey(SDL_Keysym * sym, SDL_bool pressed, SDL_bool repeat) } static void -PrintText(char *eventtype, char *text) +PrintText(const char *eventtype, const char *text) { - char *spot, expanded[1024]; + const char *spot; + char expanded[1024]; expanded[0] = '\0'; for ( spot = text; *spot; ++spot ) @@ -199,6 +202,7 @@ int main(int argc, char *argv[]) { SDL_Window *window; + SDL_Renderer *renderer; /* Enable standard application logging */ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO); @@ -219,6 +223,12 @@ main(int argc, char *argv[]) quit(2); } + /* On wayland, no window will actually show until something has + actually been displayed. + */ + renderer = SDL_CreateRenderer(window, -1, 0); + SDL_RenderPresent(renderer); + #if __IPHONEOS__ /* Creating the context creates the view, which we need to show keyboard */ SDL_GL_CreateContext(window); diff --git a/libs/SDL2/test/checkkeysthreads.c b/libs/SDL2/test/checkkeysthreads.c new file mode 100644 index 000000000..62d522609 --- /dev/null +++ b/libs/SDL2/test/checkkeysthreads.c @@ -0,0 +1,285 @@ +/* + Copyright (C) 1997-2022 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely. +*/ + +/* Simple program: Loop, watching keystrokes + Note that you need to call SDL_PollEvent() or SDL_WaitEvent() to + pump the event loop and catch keystrokes. +*/ + +#include +#include +#include + +#ifdef __EMSCRIPTEN__ +#include +#endif + +#include "SDL.h" + +int done; + +/* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */ +static void +quit(int rc) +{ + SDL_Quit(); + exit(rc); +} + +static void +print_string(char **text, size_t *maxlen, const char *fmt, ...) +{ + int len; + va_list ap; + + va_start(ap, fmt); + len = SDL_vsnprintf(*text, *maxlen, fmt, ap); + if (len > 0) { + *text += len; + if ( ((size_t) len) < *maxlen ) { + *maxlen -= (size_t) len; + } else { + *maxlen = 0; + } + } + va_end(ap); +} + +static void +print_modifiers(char **text, size_t *maxlen) +{ + int mod; + print_string(text, maxlen, " modifiers:"); + mod = SDL_GetModState(); + if (!mod) { + print_string(text, maxlen, " (none)"); + return; + } + if (mod & KMOD_LSHIFT) + print_string(text, maxlen, " LSHIFT"); + if (mod & KMOD_RSHIFT) + print_string(text, maxlen, " RSHIFT"); + if (mod & KMOD_LCTRL) + print_string(text, maxlen, " LCTRL"); + if (mod & KMOD_RCTRL) + print_string(text, maxlen, " RCTRL"); + if (mod & KMOD_LALT) + print_string(text, maxlen, " LALT"); + if (mod & KMOD_RALT) + print_string(text, maxlen, " RALT"); + if (mod & KMOD_LGUI) + print_string(text, maxlen, " LGUI"); + if (mod & KMOD_RGUI) + print_string(text, maxlen, " RGUI"); + if (mod & KMOD_NUM) + print_string(text, maxlen, " NUM"); + if (mod & KMOD_CAPS) + print_string(text, maxlen, " CAPS"); + if (mod & KMOD_MODE) + print_string(text, maxlen, " MODE"); + if (mod & KMOD_SCROLL) + print_string(text, maxlen, " SCROLL"); +} + +static void +PrintModifierState() +{ + char message[512]; + char *spot; + size_t left; + + spot = message; + left = sizeof(message); + + print_modifiers(&spot, &left); + SDL_Log("Initial state:%s\n", message); +} + +static void +PrintKey(SDL_Keysym * sym, SDL_bool pressed, SDL_bool repeat) +{ + char message[512]; + char *spot; + size_t left; + + spot = message; + left = sizeof(message); + + /* Print the keycode, name and state */ + if (sym->sym) { + print_string(&spot, &left, + "Key %s: scancode %d = %s, keycode 0x%08X = %s ", + pressed ? "pressed " : "released", + sym->scancode, + SDL_GetScancodeName(sym->scancode), + sym->sym, SDL_GetKeyName(sym->sym)); + } else { + print_string(&spot, &left, + "Unknown Key (scancode %d = %s) %s ", + sym->scancode, + SDL_GetScancodeName(sym->scancode), + pressed ? "pressed " : "released"); + } + print_modifiers(&spot, &left); + if (repeat) { + print_string(&spot, &left, " (repeat)"); + } + SDL_Log("%s\n", message); + fflush(stderr); +} + +static void +PrintText(const char *eventtype, const char *text) +{ + const char *spot; + char expanded[1024]; + + expanded[0] = '\0'; + for ( spot = text; *spot; ++spot ) + { + size_t length = SDL_strlen(expanded); + SDL_snprintf(expanded + length, sizeof(expanded) - length, "\\x%.2x", (unsigned char)*spot); + } + SDL_Log("%s Text (%s): \"%s%s\"\n", eventtype, expanded, *text == '"' ? "\\" : "", text); +} + +void +loop() +{ + SDL_Event event; + /* Check for events */ + /*SDL_WaitEvent(&event); emscripten does not like waiting*/ + + fprintf(stderr, "starting loop\n"); fflush(stderr); + // while (SDL_PollEvent(&event)) { + while (!done && SDL_WaitEvent(&event)) { + fprintf(stderr, "got event type: %d\n", event.type); fflush(stderr); + switch (event.type) { + case SDL_KEYDOWN: + case SDL_KEYUP: + PrintKey(&event.key.keysym, (event.key.state == SDL_PRESSED) ? SDL_TRUE : SDL_FALSE, (event.key.repeat) ? SDL_TRUE : SDL_FALSE); + break; + case SDL_TEXTEDITING: + PrintText("EDIT", event.text.text); + break; + case SDL_TEXTINPUT: + PrintText("INPUT", event.text.text); + break; + case SDL_MOUSEBUTTONDOWN: + /* Left button quits the app, other buttons toggles text input */ + fprintf(stderr, "mouse button down button: %d (LEFT=%d)\n", event.button.button, SDL_BUTTON_LEFT); fflush(stderr); + if (event.button.button == SDL_BUTTON_LEFT) { + done = 1; + } else { + if (SDL_IsTextInputActive()) { + SDL_Log("Stopping text input\n"); + SDL_StopTextInput(); + } else { + SDL_Log("Starting text input\n"); + SDL_StartTextInput(); + } + } + break; + case SDL_QUIT: + done = 1; + break; + default: + break; + } + fprintf(stderr, "waiting new event\n"); fflush(stderr); + } + fprintf(stderr, "exiting event loop\n"); fflush(stderr); +#ifdef __EMSCRIPTEN__ + if (done) { + emscripten_cancel_main_loop(); + } +#endif +} + +/* Very simple thread - counts 0 to 9 delaying 50ms between increments */ +static int SDLCALL ping_thread(void *ptr) +{ + int cnt; + SDL_Event sdlevent; + SDL_memset(&sdlevent, 0 , sizeof(SDL_Event)); + for (cnt = 0; cnt < 10; ++cnt) { + fprintf(stderr, "sending event (%d/%d) from thread.\n", cnt + 1, 10); fflush(stderr); + sdlevent.type = SDL_KEYDOWN; + sdlevent.key.keysym.sym = SDLK_1; + SDL_PushEvent(&sdlevent); + SDL_Delay(1000 + rand() % 1000); + } + return cnt; +} + +int +main(int argc, char *argv[]) +{ + SDL_Window *window; + SDL_Renderer *renderer; + SDL_Thread *thread; + + /* Enable standard application logging */ + SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO); + + /* Initialize SDL */ + if (SDL_Init(SDL_INIT_VIDEO) < 0) { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't initialize SDL: %s\n", SDL_GetError()); + return (1); + } + + /* Set 640x480 video mode */ + window = SDL_CreateWindow("CheckKeys Test", + SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, + 640, 480, 0); + if (!window) { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create 640x480 window: %s\n", + SDL_GetError()); + quit(2); + } + + /* On wayland, no window will actually show until something has + actually been displayed. + */ + renderer = SDL_CreateRenderer(window, -1, 0); + SDL_RenderPresent(renderer); + +#if __IPHONEOS__ + /* Creating the context creates the view, which we need to show keyboard */ + SDL_GL_CreateContext(window); +#endif + + SDL_StartTextInput(); + + /* Print initial modifier state */ + SDL_PumpEvents(); + PrintModifierState(); + + /* Watch keystrokes */ + done = 0; + + thread = SDL_CreateThread(ping_thread, "PingThread", (void *)NULL); + +#ifdef __EMSCRIPTEN__ + emscripten_set_main_loop(loop, 0, 1); +#else + while (!done) { + loop(); + } +#endif + + SDL_WaitThread(thread, NULL); + SDL_Quit(); + return (0); +} + +/* vi: set ts=4 sw=4 expandtab: */ diff --git a/libs/SDL2/test/configure b/libs/SDL2/test/configure index 909a485ac..60344e3ec 100755 --- a/libs/SDL2/test/configure +++ b/libs/SDL2/test/configure @@ -581,9 +581,11 @@ PACKAGE_STRING= PACKAGE_BUGREPORT= PACKAGE_URL= -ac_unique_file="README" +ac_unique_file="loopwave.c" ac_subst_vars='LTLIBOBJS LIBOBJS +LIBUNWIND_LIBS +LIBUNWIND_CFLAGS SDL_TTF_LIB XLIB GLES2LIB @@ -594,12 +596,13 @@ OPENGLES2_TARGETS OPENGLES1_TARGETS CPP XMKMF -SDL_CONFIG +SDL2_CONFIG SDL_LIBS SDL_CFLAGS PKG_CONFIG_LIBDIR PKG_CONFIG_PATH PKG_CONFIG +ISOS2 ISUNIX ISWINDOWS ISMACOSX @@ -681,7 +684,9 @@ PKG_CONFIG_LIBDIR SDL_CFLAGS SDL_LIBS XMKMF -CPP' +CPP +LIBUNWIND_CFLAGS +LIBUNWIND_LIBS' # Initialize some variables set by options. @@ -1323,6 +1328,10 @@ Some influential environment variables: SDL_LIBS linker flags for SDL, overriding pkg-config XMKMF Path to xmkmf, Makefile generator for X Window System CPP C preprocessor + LIBUNWIND_CFLAGS + C compiler flags for LIBUNWIND, overriding pkg-config + LIBUNWIND_LIBS + linker flags for LIBUNWIND, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1442,48 +1451,6 @@ fi } # ac_fn_c_try_compile -# ac_fn_c_try_run LINENO -# ---------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -# that executables *can* be run. -ac_fn_c_try_run () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then : - ac_retval=0 -else - $as_echo "$as_me: program exited with status $ac_status" >&5 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=$ac_status -fi - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_run - # ac_fn_c_try_link LINENO # ----------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. @@ -1530,6 +1497,48 @@ fi } # ac_fn_c_try_link +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run + # ac_fn_c_try_cpp LINENO # ---------------------- # Try to preprocess conftest.$ac_ext, and return whether this succeeded. @@ -1919,8 +1928,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_aux_dir= -for ac_dir in $srcdir/../build-scripts; do +for ac_dir in ../build-scripts "$srcdir"/../build-scripts; do if test -f "$ac_dir/install-sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" @@ -1936,7 +1946,7 @@ for ac_dir in $srcdir/../build-scripts; do fi done if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in $srcdir/../build-scripts" "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../build-scripts \"$srcdir\"/../build-scripts" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -2020,7 +2030,6 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -2812,7 +2821,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 $as_echo_n "checking for an ANSI C-conforming const... " >&6; } if ${ac_cv_c_const+:} false; then : @@ -2898,9 +2906,10 @@ fi ISUNIX="false" ISWINDOWS="false" ISMACOSX="false" +ISOS2="false" case "$host" in - *-*-cygwin* | *-*-mingw32*) + *-*-cygwin* | *-*-mingw*) ISWINDOWS="true" EXE=".exe" MATHLIB="" @@ -2911,7 +2920,7 @@ case "$host" in MATHLIB="" SYS_GL_LIBS="-lGL" ;; - *-*-darwin* ) + *-*-darwin*) ISMACOSX="true" EXE="" MATHLIB="" @@ -2983,16 +2992,68 @@ fi MATHLIB="" SYS_GL_LIBS="-lGLES_CM" ;; - *-*-emscripten* ) + *-*-emscripten*) EXE=".bc" MATHLIB="" SYS_GL_LIBS="" ;; + *-*-riscos*) + EXE=",e1f" + MATHLIB="" + SYS_GL_LIBS="" + ;; + *-*-os2*) + ISOS2="true" + EXE=".exe" + MATHLIB="" + SYS_GL_LIBS="" + ;; *) ISUNIX="true" EXE="" MATHLIB="-lm" - SYS_GL_LIBS="-lGL" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glBegin in -lOpenGL" >&5 +$as_echo_n "checking for glBegin in -lOpenGL... " >&6; } +if ${ac_cv_lib_OpenGL_glBegin+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lOpenGL $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char glBegin (); +int +main () +{ +return glBegin (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_OpenGL_glBegin=yes +else + ac_cv_lib_OpenGL_glBegin=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_OpenGL_glBegin" >&5 +$as_echo "$ac_cv_lib_OpenGL_glBegin" >&6; } +if test "x$ac_cv_lib_OpenGL_glBegin" = xyes; then : + SYS_GL_LIBS="-lOpenGL" +else + SYS_GL_LIBS="-lGL" +fi + ;; esac @@ -3001,7 +3062,8 @@ esac -SDL_VERSION=2.0.0 + +SDL_VERSION=2.0.18 @@ -3150,8 +3212,8 @@ fi if test "x$sdl_prefix$sdl_exec_prefix" = x ; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL" >&5 -$as_echo_n "checking for SDL... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sdl2 >= $min_sdl_version" >&5 +$as_echo_n "checking for sdl2 >= $min_sdl_version... " >&6; } if test -n "$SDL_CFLAGS"; then pkg_cv_SDL_CFLAGS="$SDL_CFLAGS" @@ -3221,21 +3283,21 @@ fi sdl_pc=no if test x$sdl_exec_prefix != x ; then sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix" - if test x${SDL_CONFIG+set} != xset ; then - SDL_CONFIG=$sdl_exec_prefix/bin/sdl2-config + if test x${SDL2_CONFIG+set} != xset ; then + SDL2_CONFIG=$sdl_exec_prefix/bin/sdl2-config fi fi if test x$sdl_prefix != x ; then sdl_config_args="$sdl_config_args --prefix=$sdl_prefix" - if test x${SDL_CONFIG+set} != xset ; then - SDL_CONFIG=$sdl_prefix/bin/sdl2-config + if test x${SDL2_CONFIG+set} != xset ; then + SDL2_CONFIG=$sdl_prefix/bin/sdl2-config fi fi fi if test "x$sdl_pc" = xyes ; then no_sdl="" - SDL_CONFIG="pkg-config sdl2" + SDL2_CONFIG="pkg-config sdl2" else as_save_PATH="$PATH" if test "x$prefix" != xNONE && test "$cross_compiling" != yes; then @@ -3245,12 +3307,12 @@ fi set dummy sdl2-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_SDL_CONFIG+:} false; then : +if ${ac_cv_path_SDL2_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else - case $SDL_CONFIG in + case $SDL2_CONFIG in [\\/]* | ?:[\\/]*) - ac_cv_path_SDL_CONFIG="$SDL_CONFIG" # Let the user override the test with a path. + ac_cv_path_SDL2_CONFIG="$SDL2_CONFIG" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -3260,7 +3322,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_SDL2_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -3268,14 +3330,14 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_SDL_CONFIG" && ac_cv_path_SDL_CONFIG="no" + test -z "$ac_cv_path_SDL2_CONFIG" && ac_cv_path_SDL2_CONFIG="no" ;; esac fi -SDL_CONFIG=$ac_cv_path_SDL_CONFIG -if test -n "$SDL_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SDL_CONFIG" >&5 -$as_echo "$SDL_CONFIG" >&6; } +SDL2_CONFIG=$ac_cv_path_SDL2_CONFIG +if test -n "$SDL2_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SDL2_CONFIG" >&5 +$as_echo "$SDL2_CONFIG" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -3287,17 +3349,17 @@ fi $as_echo_n "checking for SDL - version >= $min_sdl_version... " >&6; } no_sdl="" - if test "$SDL_CONFIG" = "no" ; then + if test "$SDL2_CONFIG" = "no" ; then no_sdl=yes else - SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags` - SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs` + SDL_CFLAGS=`$SDL2_CONFIG $sdl_config_args --cflags` + SDL_LIBS=`$SDL2_CONFIG $sdl_config_args --libs` - sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \ + sdl_major_version=`$SDL2_CONFIG $sdl_config_args --version | \ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` - sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \ + sdl_minor_version=`$SDL2_CONFIG $sdl_config_args --version | \ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` - sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \ + sdl_micro_version=`$SDL2_CONFIG $sdl_config_args --version | \ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` if test "x$enable_sdltest" = "xyes" ; then ac_save_CFLAGS="$CFLAGS" @@ -3315,38 +3377,16 @@ else #include #include -#include #include "SDL.h" -char* -my_strdup (char *str) -{ - char *new_str; - - if (str) - { - new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); - strcpy (new_str, str); - } - else - new_str = NULL; - - return new_str; -} - int main (int argc, char *argv[]) { int major, minor, micro; - char *tmp_version; + FILE *fp = fopen("conf.sdltest", "w"); - /* This hangs on some systems (?) - system ("touch conf.sdltest"); - */ - { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); } + if (fp) fclose(fp); - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = my_strdup("$min_sdl_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + if (sscanf("$min_sdl_version", "%d.%d.%d", &major, &minor, µ) != 3) { printf("%s, bad version string\n", "$min_sdl_version"); exit(1); } @@ -3362,7 +3402,7 @@ int main (int argc, char *argv[]) printf("\n*** 'sdl2-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version); printf("*** of SDL required is %d.%d.%d. If sdl2-config is correct, then it is\n", major, minor, micro); printf("*** best to upgrade to the required version.\n"); - printf("*** If sdl2-config was wrong, set the environment variable SDL_CONFIG\n"); + printf("*** If sdl2-config was wrong, set the environment variable SDL2_CONFIG\n"); printf("*** to point to the correct copy of sdl2-config, and remove the file\n"); printf("*** config.cache before re-running configure\n"); return 1; @@ -3396,10 +3436,10 @@ $as_echo "no" >&6; } if test "x$no_sdl" = x ; then : else - if test "$SDL_CONFIG" = "no" ; then + if test "$SDL2_CONFIG" = "no" ; then echo "*** The sdl2-config script installed by SDL could not be found" echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the SDL_CONFIG environment variable to the" + echo "*** your path, or set the SDL2_CONFIG environment variable to the" echo "*** full path to sdl2-config." else if test -f conf.sdltest ; then @@ -3442,7 +3482,7 @@ else echo "*** The test program failed to compile or link. See the file config.log for the" echo "*** exact error that occured. This usually means SDL was incorrectly installed" echo "*** or that you have moved SDL since it was installed. In the latter case, you" - echo "*** may want to edit the sdl2-config script: $SDL_CONFIG" + echo "*** may want to edit the sdl2-config script: $SDL2_CONFIG" fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -3621,8 +3661,34 @@ else $as_echo_n "(cached) " >&6 else # One or both of the vars are not set, and there is no cached value. -ac_x_includes=no ac_x_libraries=no -rm -f -r conftest.dir +ac_x_includes=no +ac_x_libraries=no +# Do we need to do anything special at all? +ac_save_LIBS=$LIBS +LIBS="-lX11 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +XrmInitialize () + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + # We can compile and link X programs with no special options. + ac_x_includes= + ac_x_libraries= +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS="$ac_save_LIBS" +# If that didn't work, only try xmkmf and filesystem searches +# for native compilation. +if test x"$ac_x_includes" = xno && test "$cross_compiling" = no; then : + rm -f -r conftest.dir if mkdir conftest.dir; then cd conftest.dir cat >Imakefile <<'_ACEOF' @@ -3661,7 +3727,7 @@ _ACEOF rm -f -r conftest.dir fi -# Standard set of common directories for X headers. + # Standard set of common directories for X headers. # Check X11 before X11Rn because it is often a symlink to the current release. ac_x_header_dirs=' /usr/X11/include @@ -3688,6 +3754,8 @@ ac_x_header_dirs=' /usr/local/include/X11R5 /usr/local/include/X11R4 +/opt/X11/include + /usr/X386/include /usr/x386/include /usr/XFree86/include/X11 @@ -3761,15 +3829,17 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi # $ac_x_libraries = no +fi +# Record the results. case $ac_x_includes,$ac_x_libraries in #( - no,* | *,no | *\'*) + no,* | *,no | *\'*) : # Didn't find X, or a directory has "'" in its name. - ac_cv_have_x="have_x=no";; #( - *) + ac_cv_have_x="have_x=no" ;; #( + *) : # Record where we found X for the cache. ac_cv_have_x="have_x=yes\ ac_x_includes='$ac_x_includes'\ - ac_x_libraries='$ac_x_libraries'" + ac_x_libraries='$ac_x_libraries'" ;; esac fi ;; #( @@ -3820,20 +3890,20 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include "SDL_opengl.h" + #ifndef SDL_VIDEO_OPENGL + #error SDL_VIDEO_OPENGL + #endif int main () { - ; return 0; } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - -have_opengl=yes - + have_opengl=yes fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_opengl" >&5 @@ -3845,25 +3915,21 @@ have_opengles=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #if defined (__IPHONEOS__) - #include - #else - #include - #endif /* __QNXNTO__ */ + #include "SDL_opengles.h" + #ifndef SDL_VIDEO_OPENGL_ES + #error SDL_VIDEO_OPENGL_ES + #endif int main () { - ; return 0; } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - -have_opengles=yes - + have_opengles=yes fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_opengles" >&5 @@ -3875,27 +3941,21 @@ have_opengles2=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #if defined (__IPHONEOS__) - #include - #include - #else - #include - #include + #include "SDL_opengles2.h" + #ifndef SDL_VIDEO_OPENGL_ES2 + #error SDL_VIDEO_OPENGL_ES2 #endif int main () { - ; return 0; } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - -have_opengles2=yes - + have_opengles2=yes fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_opengles2" >&5 @@ -3977,6 +4037,79 @@ if test x$have_SDL_ttf = xyes; then fi + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libunwind" >&5 +$as_echo_n "checking for libunwind... " >&6; } + +if test -n "$LIBUNWIND_CFLAGS"; then + pkg_cv_LIBUNWIND_CFLAGS="$LIBUNWIND_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libunwind\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libunwind") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBUNWIND_CFLAGS=`$PKG_CONFIG --cflags "libunwind" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$LIBUNWIND_LIBS"; then + pkg_cv_LIBUNWIND_LIBS="$LIBUNWIND_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libunwind\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libunwind") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBUNWIND_LIBS=`$PKG_CONFIG --libs "libunwind" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + LIBUNWIND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libunwind" 2>&1` + else + LIBUNWIND_PKG_ERRORS=`$PKG_CONFIG --print-errors "libunwind" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBUNWIND_PKG_ERRORS" >&5 + + have_libunwind=no +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + have_libunwind=no +else + LIBUNWIND_CFLAGS=$pkg_cv_LIBUNWIND_CFLAGS + LIBUNWIND_LIBS=$pkg_cv_LIBUNWIND_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_libunwind=yes +fi +if test x$have_libunwind = xyes ; then + LIBS="$LIBS $LIBUNWIND_LIBS" +fi + ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF diff --git a/libs/SDL2/test/configure.ac b/libs/SDL2/test/configure.ac index 2e237262e..694551c61 100644 --- a/libs/SDL2/test/configure.ac +++ b/libs/SDL2/test/configure.ac @@ -1,16 +1,15 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(README) +AC_INIT +AC_CONFIG_SRCDIR([loopwave.c]) dnl Detect the canonical build and host environments -AC_CONFIG_AUX_DIRS($srcdir/../build-scripts) +AC_CONFIG_AUX_DIR([../build-scripts]) AC_CANONICAL_HOST dnl Check for tools - AC_PROG_CC dnl Check for compiler environment - AC_C_CONST dnl We only care about this for building testnative at the moment, so these @@ -19,10 +18,11 @@ dnl (Haiku, for example, sets none of these.) ISUNIX="false" ISWINDOWS="false" ISMACOSX="false" +ISOS2="false" dnl Figure out which math library to use case "$host" in - *-*-cygwin* | *-*-mingw32*) + *-*-cygwin* | *-*-mingw*) ISWINDOWS="true" EXE=".exe" MATHLIB="" @@ -33,7 +33,7 @@ case "$host" in MATHLIB="" SYS_GL_LIBS="-lGL" ;; - *-*-darwin* ) + *-*-darwin*) ISMACOSX="true" EXE="" MATHLIB="" @@ -42,7 +42,7 @@ case "$host" in *-*-aix*) ISUNIX="true" EXE="" - if test x$ac_cv_prog_gcc = xyes; then + if test x$ac_cv_c_compiler_gnu = xyes; then CFLAGS="-mthreads" fi SYS_GL_LIBS="" @@ -65,18 +65,31 @@ case "$host" in MATHLIB="" SYS_GL_LIBS="-lGLES_CM" ;; - *-*-emscripten* ) + *-*-emscripten*) dnl This should really be .js, but we need to specify extra flags when compiling to js EXE=".bc" MATHLIB="" SYS_GL_LIBS="" ;; + *-*-riscos*) + EXE=",e1f" + MATHLIB="" + SYS_GL_LIBS="" + ;; + *-*-os2*) + ISOS2="true" + EXE=".exe" + MATHLIB="" + SYS_GL_LIBS="" + ;; *) dnl Oh well, call it Unix... ISUNIX="true" EXE="" MATHLIB="-lm" - SYS_GL_LIBS="-lGL" + dnl Use the new libOpenGL if present. + AC_CHECK_LIB(OpenGL, glBegin, + [SYS_GL_LIBS="-lOpenGL"],[SYS_GL_LIBS="-lGL"]) ;; esac AC_SUBST(EXE) @@ -84,9 +97,10 @@ AC_SUBST(MATHLIB) AC_SUBST(ISMACOSX) AC_SUBST(ISWINDOWS) AC_SUBST(ISUNIX) +AC_SUBST(ISOS2) dnl Check for SDL -SDL_VERSION=2.0.0 +SDL_VERSION=2.0.18 AM_PATH_SDL2($SDL_VERSION, :, AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]) @@ -118,44 +132,34 @@ fi dnl Check for OpenGL AC_MSG_CHECKING(for OpenGL support) have_opengl=no -AC_TRY_COMPILE([ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include "SDL_opengl.h" -],[ -],[ -have_opengl=yes -]) + #ifndef SDL_VIDEO_OPENGL + #error SDL_VIDEO_OPENGL + #endif +]],[])], [have_opengl=yes],[]) AC_MSG_RESULT($have_opengl) dnl Check for OpenGL ES AC_MSG_CHECKING(for OpenGL ES support) have_opengles=no -AC_TRY_COMPILE([ - #if defined (__IPHONEOS__) - #include - #else - #include - #endif /* __QNXNTO__ */ -],[ -],[ -have_opengles=yes -]) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include "SDL_opengles.h" + #ifndef SDL_VIDEO_OPENGL_ES + #error SDL_VIDEO_OPENGL_ES + #endif +]],[])] ,[have_opengles=yes],[]) AC_MSG_RESULT($have_opengles) dnl Check for OpenGL ES2 AC_MSG_CHECKING(for OpenGL ES2 support) have_opengles2=no -AC_TRY_COMPILE([ - #if defined (__IPHONEOS__) - #include - #include - #else - #include - #include +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include "SDL_opengles2.h" + #ifndef SDL_VIDEO_OPENGL_ES2 + #error SDL_VIDEO_OPENGL_ES2 #endif -],[ -],[ -have_opengles2=yes -]) +]],[])], [have_opengles2=yes],[]) AC_MSG_RESULT($have_opengles2) GLLIB="" @@ -196,5 +200,16 @@ if test x$have_SDL_ttf = xyes; then fi AC_SUBST(SDL_TTF_LIB) +dnl Really, SDL2_test should be linking against libunwind (if it found +dnl libunwind.h when configured), but SDL2_test is a static library, so +dnl there's no way for it to link against it. We could make SDL2 depend on +dnl it, but we don't want all SDL2 build to suddenly gain an extra dependency, +dnl so just assume that if it's here now, SDL2_test was probably built with it. +PKG_CHECK_MODULES(LIBUNWIND, libunwind, have_libunwind=yes, have_libunwind=no) +if test x$have_libunwind = xyes ; then + LIBS="$LIBS $LIBUNWIND_LIBS" +fi + dnl Finally create all the generated files -AC_OUTPUT([Makefile]) +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT diff --git a/libs/SDL2/test/controllermap.bmp b/libs/SDL2/test/controllermap.bmp index df167f677..ee9629c2b 100644 Binary files a/libs/SDL2/test/controllermap.bmp and b/libs/SDL2/test/controllermap.bmp differ diff --git a/libs/SDL2/test/controllermap.c b/libs/SDL2/test/controllermap.c index b52baebfc..308ddf51a 100644 --- a/libs/SDL2/test/controllermap.c +++ b/libs/SDL2/test/controllermap.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -21,13 +21,11 @@ #ifndef SDL_JOYSTICK_DISABLED -#ifdef __IPHONEOS__ -#define SCREEN_WIDTH 320 -#define SCREEN_HEIGHT 480 -#else +/* Define this for verbose output while mapping controllers */ +#define DEBUG_CONTROLLERMAP + #define SCREEN_WIDTH 512 #define SCREEN_HEIGHT 320 -#endif #define MARKER_BUTTON 1 #define MARKER_AXIS 2 @@ -55,13 +53,13 @@ static struct double angle; int marker; -} s_arrBindingDisplay[BINDING_COUNT] = { +} s_arrBindingDisplay[] = { { 387, 167, 0.0, MARKER_BUTTON }, /* SDL_CONTROLLER_BUTTON_A */ { 431, 132, 0.0, MARKER_BUTTON }, /* SDL_CONTROLLER_BUTTON_B */ { 342, 132, 0.0, MARKER_BUTTON }, /* SDL_CONTROLLER_BUTTON_X */ { 389, 101, 0.0, MARKER_BUTTON }, /* SDL_CONTROLLER_BUTTON_Y */ { 174, 132, 0.0, MARKER_BUTTON }, /* SDL_CONTROLLER_BUTTON_BACK */ - { 233, 132, 0.0, MARKER_BUTTON }, /* SDL_CONTROLLER_BUTTON_GUIDE */ + { 232, 128, 0.0, MARKER_BUTTON }, /* SDL_CONTROLLER_BUTTON_GUIDE */ { 289, 132, 0.0, MARKER_BUTTON }, /* SDL_CONTROLLER_BUTTON_START */ { 75, 154, 0.0, MARKER_BUTTON }, /* SDL_CONTROLLER_BUTTON_LEFTSTICK */ { 305, 230, 0.0, MARKER_BUTTON }, /* SDL_CONTROLLER_BUTTON_RIGHTSTICK */ @@ -71,6 +69,12 @@ static struct { 154, 249, 0.0, MARKER_BUTTON }, /* SDL_CONTROLLER_BUTTON_DPAD_DOWN */ { 116, 217, 0.0, MARKER_BUTTON }, /* SDL_CONTROLLER_BUTTON_DPAD_LEFT */ { 186, 217, 0.0, MARKER_BUTTON }, /* SDL_CONTROLLER_BUTTON_DPAD_RIGHT */ + { 232, 174, 0.0, MARKER_BUTTON }, /* SDL_CONTROLLER_BUTTON_MISC1 */ + { 132, 135, 0.0, MARKER_BUTTON }, /* SDL_CONTROLLER_BUTTON_PADDLE1 */ + { 330, 135, 0.0, MARKER_BUTTON }, /* SDL_CONTROLLER_BUTTON_PADDLE2 */ + { 132, 175, 0.0, MARKER_BUTTON }, /* SDL_CONTROLLER_BUTTON_PADDLE3 */ + { 330, 175, 0.0, MARKER_BUTTON }, /* SDL_CONTROLLER_BUTTON_PADDLE4 */ + { 0, 0, 0.0, MARKER_BUTTON }, /* SDL_CONTROLLER_BUTTON_TOUCHPAD */ { 74, 153, 270.0, MARKER_AXIS }, /* SDL_CONTROLLER_BINDING_AXIS_LEFTX_NEGATIVE */ { 74, 153, 90.0, MARKER_AXIS }, /* SDL_CONTROLLER_BINDING_AXIS_LEFTX_POSITIVE */ { 74, 153, 0.0, MARKER_AXIS }, /* SDL_CONTROLLER_BINDING_AXIS_LEFTY_NEGATIVE */ @@ -82,8 +86,9 @@ static struct { 91, -20, 180.0, MARKER_AXIS }, /* SDL_CONTROLLER_BINDING_AXIS_TRIGGERLEFT */ { 375, -20, 180.0, MARKER_AXIS }, /* SDL_CONTROLLER_BINDING_AXIS_TRIGGERRIGHT */ }; +SDL_COMPILE_TIME_ASSERT(s_arrBindingDisplay, SDL_arraysize(s_arrBindingDisplay) == BINDING_COUNT); -static int s_arrBindingOrder[BINDING_COUNT] = { +static int s_arrBindingOrder[] = { SDL_CONTROLLER_BUTTON_A, SDL_CONTROLLER_BUTTON_B, SDL_CONTROLLER_BUTTON_Y, @@ -109,7 +114,14 @@ static int s_arrBindingOrder[BINDING_COUNT] = { SDL_CONTROLLER_BUTTON_BACK, SDL_CONTROLLER_BUTTON_GUIDE, SDL_CONTROLLER_BUTTON_START, + SDL_CONTROLLER_BUTTON_MISC1, + SDL_CONTROLLER_BUTTON_PADDLE1, + SDL_CONTROLLER_BUTTON_PADDLE2, + SDL_CONTROLLER_BUTTON_PADDLE3, + SDL_CONTROLLER_BUTTON_PADDLE4, + SDL_CONTROLLER_BUTTON_TOUCHPAD, }; +SDL_COMPILE_TIME_ASSERT(s_arrBindingOrder, SDL_arraysize(s_arrBindingOrder) == BINDING_COUNT); typedef struct { @@ -140,6 +152,7 @@ static SDL_GameControllerExtendedBind s_arrBindings[BINDING_COUNT]; typedef struct { SDL_bool m_bMoving; + int m_nLastValue; int m_nStartingValue; int m_nFarthestValue; } AxisState; @@ -151,6 +164,11 @@ static int s_iCurrentBinding; static Uint32 s_unPendingAdvanceTime; static SDL_bool s_bBindingComplete; +static SDL_Window *window; +static SDL_Renderer *screen; +static SDL_bool done = SDL_FALSE; +static SDL_bool bind_touchpad = SDL_FALSE; + SDL_Texture * LoadTexture(SDL_Renderer *renderer, const char *file, SDL_bool transparent) { @@ -211,6 +229,19 @@ SetCurrentBinding(int iBinding) return; } + if (s_arrBindingOrder[iBinding] == -1) + { + SetCurrentBinding(iBinding + 1); + return; + } + + if (s_arrBindingOrder[iBinding] == SDL_CONTROLLER_BUTTON_TOUCHPAD && + !bind_touchpad) + { + SetCurrentBinding(iBinding + 1); + return; + } + s_iCurrentBinding = iBinding; pBinding = &s_arrBindings[s_arrBindingOrder[s_iCurrentBinding]]; @@ -353,35 +384,16 @@ BMergeAxisBindings(int iIndex) static void WatchJoystick(SDL_Joystick * joystick) { - SDL_Window *window = NULL; - SDL_Renderer *screen = NULL; - SDL_Texture *background, *button, *axis, *marker; + SDL_Texture *background_front, *background_back, *button, *axis, *marker; const char *name = NULL; - SDL_bool done = SDL_FALSE; SDL_Event event; SDL_Rect dst; Uint8 alpha=200, alpha_step = -1; Uint32 alpha_ticks = 0; SDL_JoystickID nJoystickID; - int iIndex; - /* Create a window to display joystick axis position */ - window = SDL_CreateWindow("Game Controller Map", SDL_WINDOWPOS_CENTERED, - SDL_WINDOWPOS_CENTERED, SCREEN_WIDTH, - SCREEN_HEIGHT, 0); - if (window == NULL) { - SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create window: %s\n", SDL_GetError()); - return; - } - - screen = SDL_CreateRenderer(window, -1, 0); - if (screen == NULL) { - SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create renderer: %s\n", SDL_GetError()); - SDL_DestroyWindow(window); - return; - } - - background = LoadTexture(screen, "controllermap.bmp", SDL_FALSE); + background_front = LoadTexture(screen, "controllermap.bmp", SDL_FALSE); + background_back = LoadTexture(screen, "controllermap_back.bmp", SDL_FALSE); button = LoadTexture(screen, "button.bmp", SDL_TRUE); axis = LoadTexture(screen, "axis.bmp", SDL_TRUE); SDL_RaiseWindow(window); @@ -410,12 +422,10 @@ WatchJoystick(SDL_Joystick * joystick) s_nNumAxes = SDL_JoystickNumAxes(joystick); s_arrAxisState = (AxisState *)SDL_calloc(s_nNumAxes, sizeof(*s_arrAxisState)); - for (iIndex = 0; iIndex < s_nNumAxes; ++iIndex) { - AxisState *pAxisState = &s_arrAxisState[iIndex]; - Sint16 nInitialValue; - pAxisState->m_bMoving = SDL_JoystickGetAxisInitialState(joystick, iIndex, &nInitialValue); - pAxisState->m_nStartingValue = nInitialValue; - pAxisState->m_nFarthestValue = nInitialValue; + + /* Skip any spurious events at start */ + while (SDL_PollEvent(&event) > 0) { + continue; } /* Loop, getting joystick events! */ @@ -450,7 +460,12 @@ WatchJoystick(SDL_Joystick * joystick) SDL_SetRenderDrawColor(screen, 0xFF, 0xFF, 0xFF, SDL_ALPHA_OPAQUE); SDL_RenderClear(screen); - SDL_RenderCopy(screen, background, NULL, NULL); + if (s_arrBindingOrder[s_iCurrentBinding] >= SDL_CONTROLLER_BUTTON_PADDLE1 && + s_arrBindingOrder[s_iCurrentBinding] <= SDL_CONTROLLER_BUTTON_PADDLE4) { + SDL_RenderCopy(screen, background_back, NULL, NULL); + } else { + SDL_RenderCopy(screen, background_front, NULL, NULL); + } SDL_SetTextureAlphaMod(marker, alpha); SDL_SetTextureColorMod(marker, 10, 255, 21); SDL_RenderCopyEx(screen, marker, NULL, &dst, s_arrBindingDisplay[iElement].angle, NULL, SDL_FLIP_NONE); @@ -465,13 +480,20 @@ WatchJoystick(SDL_Joystick * joystick) break; case SDL_JOYAXISMOTION: if (event.jaxis.which == nJoystickID) { + const int MAX_ALLOWED_JITTER = SDL_JOYSTICK_AXIS_MAX / 80; /* ShanWan PS3 controller needed 96 */ AxisState *pAxisState = &s_arrAxisState[event.jaxis.axis]; int nValue = event.jaxis.value; int nCurrentDistance, nFarthestDistance; if (!pAxisState->m_bMoving) { - pAxisState->m_bMoving = SDL_TRUE; - pAxisState->m_nStartingValue = nValue; - pAxisState->m_nFarthestValue = nValue; + Sint16 nInitialValue; + pAxisState->m_bMoving = SDL_JoystickGetAxisInitialState(joystick, event.jaxis.axis, &nInitialValue); + pAxisState->m_nLastValue = nValue; + pAxisState->m_nStartingValue = nInitialValue; + pAxisState->m_nFarthestValue = nInitialValue; + } else if (SDL_abs(nValue - pAxisState->m_nLastValue) <= MAX_ALLOWED_JITTER) { + break; + } else { + pAxisState->m_nLastValue = nValue; } nCurrentDistance = SDL_abs(nValue - pAxisState->m_nStartingValue); nFarthestDistance = SDL_abs(pAxisState->m_nFarthestValue - pAxisState->m_nStartingValue); @@ -548,7 +570,7 @@ WatchJoystick(SDL_Joystick * joystick) if ((event.key.keysym.sym != SDLK_ESCAPE)) { break; } - /* Fall through to signal quit */ + SDL_FALLTHROUGH; case SDL_QUIT: done = SDL_TRUE; break; @@ -697,7 +719,6 @@ WatchJoystick(SDL_Joystick * joystick) s_arrAxisState = NULL; SDL_DestroyRenderer(screen); - SDL_DestroyWindow(window); } int @@ -707,6 +728,8 @@ main(int argc, char *argv[]) int i; SDL_Joystick *joystick; + SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, "0"); + /* Enable standard application logging */ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO); @@ -716,6 +739,45 @@ main(int argc, char *argv[]) exit(1); } + if (argv[1] && SDL_strcmp(argv[1], "--bind-touchpad") == 0) { + bind_touchpad = SDL_TRUE; + } + + /* Create a window to display joystick axis position */ + window = SDL_CreateWindow("Game Controller Map", SDL_WINDOWPOS_CENTERED, + SDL_WINDOWPOS_CENTERED, SCREEN_WIDTH, + SCREEN_HEIGHT, 0); + if (window == NULL) { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create window: %s\n", SDL_GetError()); + return 2; + } + + screen = SDL_CreateRenderer(window, -1, 0); + if (screen == NULL) { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create renderer: %s\n", SDL_GetError()); + return 2; + } + + while (!done && SDL_NumJoysticks() == 0) { + SDL_Event event; + + while (SDL_PollEvent(&event) > 0) { + switch (event.type) { + case SDL_KEYDOWN: + if ((event.key.keysym.sym != SDLK_ESCAPE)) { + break; + } + SDL_FALLTHROUGH; + case SDL_QUIT: + done = SDL_TRUE; + break; + default: + break; + } + } + SDL_RenderPresent(screen); + } + /* Print information about the joysticks */ SDL_Log("There are %d joysticks attached\n", SDL_NumJoysticks()); for (i = 0; i < SDL_NumJoysticks(); ++i) { @@ -740,28 +802,16 @@ main(int argc, char *argv[]) } } -#ifdef __ANDROID__ - if (SDL_NumJoysticks() > 0) { -#else - if (argv[1]) { -#endif - int device; -#ifdef __ANDROID__ - device = 0; -#else - device = atoi(argv[1]); -#endif - joystick = SDL_JoystickOpen(device); - if (joystick == NULL) { - SDL_Log("Couldn't open joystick %d: %s\n", device, SDL_GetError()); - } else { - WatchJoystick(joystick); - SDL_JoystickClose(joystick); - } - } - else { - SDL_Log("\n\nUsage: ./controllermap number\nFor example: ./controllermap 0\nOr: ./controllermap 0 >> gamecontrollerdb.txt"); + joystick = SDL_JoystickOpen(0); + if (joystick == NULL) { + SDL_Log("Couldn't open joystick 0: %s\n", SDL_GetError()); + } else { + WatchJoystick(joystick); + SDL_JoystickClose(joystick); } + + SDL_DestroyWindow(window); + SDL_QuitSubSystem(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK); return 0; @@ -773,7 +823,7 @@ int main(int argc, char *argv[]) { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL compiled without Joystick support.\n"); - exit(1); + return 1; } #endif diff --git a/libs/SDL2/test/controllermap_back.bmp b/libs/SDL2/test/controllermap_back.bmp new file mode 100644 index 000000000..bfaed6f02 Binary files /dev/null and b/libs/SDL2/test/controllermap_back.bmp differ diff --git a/libs/SDL2/test/loopwave.c b/libs/SDL2/test/loopwave.c index 09fb2a385..14ac4dbaf 100644 --- a/libs/SDL2/test/loopwave.c +++ b/libs/SDL2/test/loopwave.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/test/loopwavequeue.c b/libs/SDL2/test/loopwavequeue.c index e1accb40a..a5d0ea3cc 100644 --- a/libs/SDL2/test/loopwavequeue.c +++ b/libs/SDL2/test/loopwavequeue.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/test/testatomic.c b/libs/SDL2/test/testatomic.c index 0a7d08424..16678db5d 100644 --- a/libs/SDL2/test/testatomic.c +++ b/libs/SDL2/test/testatomic.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -19,13 +19,13 @@ */ static -char * -tf(SDL_bool tf) +const char * +tf(SDL_bool _tf) { - static char *t = "TRUE"; - static char *f = "FALSE"; + static const char *t = "TRUE"; + static const char *f = "FALSE"; - if (tf) + if (_tf) { return t; } @@ -353,7 +353,7 @@ static SDL_bool EnqueueEvent_LockFree(SDL_EventQueue *queue, const SDL_Event *ev } #ifdef TEST_SPINLOCK_FIFO - SDL_AtomicDecRef(&queue->rwcount); + (void) SDL_AtomicDecRef(&queue->rwcount); #endif return status; } @@ -400,7 +400,7 @@ static SDL_bool DequeueEvent_LockFree(SDL_EventQueue *queue, SDL_Event *event) } #ifdef TEST_SPINLOCK_FIFO - SDL_AtomicDecRef(&queue->rwcount); + (void) SDL_AtomicDecRef(&queue->rwcount); #endif return status; } @@ -473,8 +473,6 @@ static SDL_bool DequeueEvent_Mutex(SDL_EventQueue *queue, SDL_Event *event) static SDL_sem *writersDone; static SDL_sem *readersDone; -static SDL_atomic_t writersRunning; -static SDL_atomic_t readersRunning; typedef struct { @@ -525,7 +523,6 @@ static int SDLCALL FIFO_Writer(void* _data) } } } - SDL_AtomicAdd(&writersRunning, -1); SDL_SemPost(writersDone); return 0; } @@ -563,7 +560,6 @@ static int SDLCALL FIFO_Reader(void* _data) } } } - SDL_AtomicAdd(&readersRunning, -1); SDL_SemPost(readersDone); return 0; } @@ -581,7 +577,7 @@ static int SDLCALL FIFO_Watcher(void* _data) SDL_Delay(0); } /* Do queue manipulation here... */ - SDL_AtomicDecRef(&queue->watcher); + (void) SDL_AtomicDecRef(&queue->watcher); SDL_AtomicUnlock(&queue->lock); /* Wait a bit... */ @@ -626,8 +622,7 @@ static void RunFIFOTest(SDL_bool lock_free) /* Start the readers first */ SDL_Log("Starting %d readers\n", NUM_READERS); - SDL_zero(readerData); - SDL_AtomicSet(&readersRunning, NUM_READERS); + SDL_zeroa(readerData); for (i = 0; i < NUM_READERS; ++i) { char name[64]; SDL_snprintf(name, sizeof (name), "FIFOReader%d", i); @@ -638,8 +633,7 @@ static void RunFIFOTest(SDL_bool lock_free) /* Start up the writers */ SDL_Log("Starting %d writers\n", NUM_WRITERS); - SDL_zero(writerData); - SDL_AtomicSet(&writersRunning, NUM_WRITERS); + SDL_zeroa(writerData); for (i = 0; i < NUM_WRITERS; ++i) { char name[64]; SDL_snprintf(name, sizeof (name), "FIFOWriter%d", i); @@ -650,7 +644,7 @@ static void RunFIFOTest(SDL_bool lock_free) } /* Wait for the writers */ - while (SDL_AtomicGet(&writersRunning) > 0) { + for (i = 0; i < NUM_WRITERS; ++i) { SDL_SemWait(writersDone); } @@ -658,7 +652,7 @@ static void RunFIFOTest(SDL_bool lock_free) SDL_AtomicSet(&queue.active, 0); /* Wait for the readers */ - while (SDL_AtomicGet(&readersRunning) > 0) { + for (i = 0; i < NUM_READERS; ++i) { SDL_SemWait(readersDone); } diff --git a/libs/SDL2/test/testaudiocapture.c b/libs/SDL2/test/testaudiocapture.c index 1a94b0af2..03d373273 100644 --- a/libs/SDL2/test/testaudiocapture.c +++ b/libs/SDL2/test/testaudiocapture.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/test/testaudiohotplug.c b/libs/SDL2/test/testaudiohotplug.c index 998d319f1..536cc4c3b 100644 --- a/libs/SDL2/test/testaudiohotplug.c +++ b/libs/SDL2/test/testaudiohotplug.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/test/testaudioinfo.c b/libs/SDL2/test/testaudioinfo.c index 3ee1bfb65..d22aed270 100644 --- a/libs/SDL2/test/testaudioinfo.c +++ b/libs/SDL2/test/testaudioinfo.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/test/testautomation.c b/libs/SDL2/test/testautomation.c index 1a0ecbd12..0dc37f4a0 100644 --- a/libs/SDL2/test/testautomation.c +++ b/libs/SDL2/test/testautomation.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -62,7 +62,7 @@ main(int argc, char *argv[]) } else if (SDL_strcasecmp(argv[i], "--execKey") == 0) { if (argv[i + 1]) { - SDL_sscanf(argv[i + 1], "%"SDL_PRIu64, (long long unsigned int *)&userExecKey); + SDL_sscanf(argv[i + 1], "%"SDL_PRIu64, &userExecKey); consumed = 2; } } diff --git a/libs/SDL2/test/testautomation_audio.c b/libs/SDL2/test/testautomation_audio.c index be0f15e3d..96c174f5c 100644 --- a/libs/SDL2/test/testautomation_audio.c +++ b/libs/SDL2/test/testautomation_audio.c @@ -498,7 +498,7 @@ const int _numAudioFormats = 18; SDL_AudioFormat _audioFormats[] = { AUDIO_S8, AUDIO_U8, AUDIO_S16LSB, AUDIO_S16MSB, AUDIO_S16SYS, AUDIO_S16, AUDIO_U16LSB, AUDIO_U16MSB, AUDIO_U16SYS, AUDIO_U16, AUDIO_S32LSB, AUDIO_S32MSB, AUDIO_S32SYS, AUDIO_S32, AUDIO_F32LSB, AUDIO_F32MSB, AUDIO_F32SYS, AUDIO_F32 }; -char *_audioFormatsVerbose[] = { "AUDIO_S8", "AUDIO_U8", "AUDIO_S16LSB", "AUDIO_S16MSB", "AUDIO_S16SYS", "AUDIO_S16", "AUDIO_U16LSB", +const char *_audioFormatsVerbose[] = { "AUDIO_S8", "AUDIO_U8", "AUDIO_S16LSB", "AUDIO_S16MSB", "AUDIO_S16SYS", "AUDIO_S16", "AUDIO_U16LSB", "AUDIO_U16MSB", "AUDIO_U16SYS", "AUDIO_U16", "AUDIO_S32LSB", "AUDIO_S32MSB", "AUDIO_S32SYS", "AUDIO_S32", "AUDIO_F32LSB", "AUDIO_F32MSB", "AUDIO_F32SYS", "AUDIO_F32" }; const int _numAudioChannels = 4; @@ -697,7 +697,7 @@ int audio_openCloseAndGetAudioStatus() SDL_AudioStatus result; int i; int count; - char *device; + const char *device; SDL_AudioDeviceID id; SDL_AudioSpec desired, obtained; @@ -707,7 +707,7 @@ int audio_openCloseAndGetAudioStatus() if (count > 0) { for (i = 0; i < count; i++) { /* Get device name */ - device = (char *)SDL_GetAudioDeviceName(i, 0); + device = SDL_GetAudioDeviceName(i, 0); SDLTest_AssertPass("SDL_GetAudioDeviceName(%i,0)", i); SDLTest_AssertCheck(device != NULL, "Validate device name is not NULL; got: %s", (device != NULL) ? device : "NULL"); if (device == NULL) return TEST_ABORTED; @@ -721,7 +721,7 @@ int audio_openCloseAndGetAudioStatus() desired.userdata=NULL; /* Open device */ - id = SDL_OpenAudioDevice((const char *)device, 0, &desired, &obtained, SDL_AUDIO_ALLOW_ANY_CHANGE); + id = SDL_OpenAudioDevice(device, 0, &desired, &obtained, SDL_AUDIO_ALLOW_ANY_CHANGE); SDLTest_AssertPass("SDL_OpenAudioDevice('%s',...)", device); SDLTest_AssertCheck(id > 1, "Validate device ID; expected: >=2, got: %i", id); if (id > 1) { @@ -755,7 +755,7 @@ int audio_lockUnlockOpenAudioDevice() { int i; int count; - char *device; + const char *device; SDL_AudioDeviceID id; SDL_AudioSpec desired, obtained; @@ -765,7 +765,7 @@ int audio_lockUnlockOpenAudioDevice() if (count > 0) { for (i = 0; i < count; i++) { /* Get device name */ - device = (char *)SDL_GetAudioDeviceName(i, 0); + device = SDL_GetAudioDeviceName(i, 0); SDLTest_AssertPass("SDL_GetAudioDeviceName(%i,0)", i); SDLTest_AssertCheck(device != NULL, "Validate device name is not NULL; got: %s", (device != NULL) ? device : "NULL"); if (device == NULL) return TEST_ABORTED; @@ -779,7 +779,7 @@ int audio_lockUnlockOpenAudioDevice() desired.userdata=NULL; /* Open device */ - id = SDL_OpenAudioDevice((const char *)device, 0, &desired, &obtained, SDL_AUDIO_ALLOW_ANY_CHANGE); + id = SDL_OpenAudioDevice(device, 0, &desired, &obtained, SDL_AUDIO_ALLOW_ANY_CHANGE); SDLTest_AssertPass("SDL_OpenAudioDevice('%s',...)", device); SDLTest_AssertCheck(id > 1, "Validate device ID; expected: >=2, got: %i", id); if (id > 1) { @@ -917,7 +917,7 @@ int audio_openCloseAudioDeviceConnected() int result = -1; int i; int count; - char *device; + const char *device; SDL_AudioDeviceID id; SDL_AudioSpec desired, obtained; @@ -927,7 +927,7 @@ int audio_openCloseAudioDeviceConnected() if (count > 0) { for (i = 0; i < count; i++) { /* Get device name */ - device = (char *)SDL_GetAudioDeviceName(i, 0); + device = SDL_GetAudioDeviceName(i, 0); SDLTest_AssertPass("SDL_GetAudioDeviceName(%i,0)", i); SDLTest_AssertCheck(device != NULL, "Validate device name is not NULL; got: %s", (device != NULL) ? device : "NULL"); if (device == NULL) return TEST_ABORTED; @@ -941,7 +941,7 @@ int audio_openCloseAudioDeviceConnected() desired.userdata=NULL; /* Open device */ - id = SDL_OpenAudioDevice((const char *)device, 0, &desired, &obtained, SDL_AUDIO_ALLOW_ANY_CHANGE); + id = SDL_OpenAudioDevice(device, 0, &desired, &obtained, SDL_AUDIO_ALLOW_ANY_CHANGE); SDLTest_AssertPass("SDL_OpenAudioDevice('%s',...)", device); SDLTest_AssertCheck(id > 1, "Validate device ID; expected: >1, got: %i", id); if (id > 1) { diff --git a/libs/SDL2/test/testautomation_clipboard.c b/libs/SDL2/test/testautomation_clipboard.c index 417d95746..113c7dc89 100644 --- a/libs/SDL2/test/testautomation_clipboard.c +++ b/libs/SDL2/test/testautomation_clipboard.c @@ -16,13 +16,12 @@ * \brief Check call to SDL_HasClipboardText * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_HasClipboardText + * http://wiki.libsdl.org/SDL_HasClipboardText */ int clipboard_testHasClipboardText(void *arg) { - SDL_bool result; - result = SDL_HasClipboardText(); + SDL_HasClipboardText(); SDLTest_AssertPass("Call to SDL_HasClipboardText succeeded"); return TEST_COMPLETED; @@ -32,7 +31,7 @@ clipboard_testHasClipboardText(void *arg) * \brief Check call to SDL_GetClipboardText * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_GetClipboardText + * http://wiki.libsdl.org/SDL_GetClipboardText */ int clipboard_testGetClipboardText(void *arg) @@ -49,7 +48,7 @@ clipboard_testGetClipboardText(void *arg) /** * \brief Check call to SDL_SetClipboardText * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_SetClipboardText + * http://wiki.libsdl.org/SDL_SetClipboardText */ int clipboard_testSetClipboardText(void *arg) @@ -78,9 +77,9 @@ clipboard_testSetClipboardText(void *arg) /** * \brief End-to-end test of SDL_xyzClipboardText functions * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_HasClipboardText - * http://wiki.libsdl.org/moin.cgi/SDL_GetClipboardText - * http://wiki.libsdl.org/moin.cgi/SDL_SetClipboardText + * http://wiki.libsdl.org/SDL_HasClipboardText + * http://wiki.libsdl.org/SDL_GetClipboardText + * http://wiki.libsdl.org/SDL_SetClipboardText */ int clipboard_testClipboardTextFunctions(void *arg) diff --git a/libs/SDL2/test/testautomation_events.c b/libs/SDL2/test/testautomation_events.c index 09004da52..20f2ea5e4 100644 --- a/libs/SDL2/test/testautomation_events.c +++ b/libs/SDL2/test/testautomation_events.c @@ -42,8 +42,8 @@ int SDLCALL _events_sampleNullEventFilter(void *userdata, SDL_Event *event) /** * @brief Test pumping and peeking events. * - * @sa http://wiki.libsdl.org/moin.cgi/SDL_PumpEvents - * @sa http://wiki.libsdl.org/moin.cgi/SDL_PollEvent + * @sa http://wiki.libsdl.org/SDL_PumpEvents + * @sa http://wiki.libsdl.org/SDL_PollEvent */ int events_pushPumpAndPollUserevent(void *arg) @@ -76,8 +76,8 @@ events_pushPumpAndPollUserevent(void *arg) /** * @brief Adds and deletes an event watch function with NULL userdata * - * @sa http://wiki.libsdl.org/moin.cgi/SDL_AddEventWatch - * @sa http://wiki.libsdl.org/moin.cgi/SDL_DelEventWatch + * @sa http://wiki.libsdl.org/SDL_AddEventWatch + * @sa http://wiki.libsdl.org/SDL_DelEventWatch * */ int @@ -126,8 +126,8 @@ events_addDelEventWatch(void *arg) /** * @brief Adds and deletes an event watch function with userdata * - * @sa http://wiki.libsdl.org/moin.cgi/SDL_AddEventWatch - * @sa http://wiki.libsdl.org/moin.cgi/SDL_DelEventWatch + * @sa http://wiki.libsdl.org/SDL_AddEventWatch + * @sa http://wiki.libsdl.org/SDL_DelEventWatch * */ int diff --git a/libs/SDL2/test/testautomation_hints.c b/libs/SDL2/test/testautomation_hints.c index a6beb88d7..0d1b7b6f5 100644 --- a/libs/SDL2/test/testautomation_hints.c +++ b/libs/SDL2/test/testautomation_hints.c @@ -9,7 +9,7 @@ const int _numHintsEnum = 25; -char* _HintsEnum[] = +const char* _HintsEnum[] = { SDL_HINT_ACCELEROMETER_AS_JOYSTICK, SDL_HINT_FRAMEBUFFER_ACCELERATION, @@ -37,33 +37,33 @@ char* _HintsEnum[] = SDL_HINT_VIDEO_X11_XVIDMODE, SDL_HINT_XINPUT_ENABLED, }; -char* _HintsVerbose[] = +const char* _HintsVerbose[] = { - "SDL_HINT_ACCELEROMETER_AS_JOYSTICK", - "SDL_HINT_FRAMEBUFFER_ACCELERATION", - "SDL_HINT_GAMECONTROLLERCONFIG", - "SDL_HINT_GRAB_KEYBOARD", - "SDL_HINT_IDLE_TIMER_DISABLED", - "SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS", - "SDL_HINT_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK", - "SDL_HINT_MOUSE_RELATIVE_MODE_WARP", - "SDL_HINT_ORIENTATIONS", - "SDL_HINT_RENDER_DIRECT3D_THREADSAFE", - "SDL_HINT_RENDER_DRIVER", - "SDL_HINT_RENDER_OPENGL_SHADERS", - "SDL_HINT_RENDER_SCALE_QUALITY", - "SDL_HINT_RENDER_VSYNC", - "SDL_HINT_TIMER_RESOLUTION", - "SDL_HINT_VIDEO_ALLOW_SCREENSAVER", - "SDL_HINT_VIDEO_HIGHDPI_DISABLED", - "SDL_HINT_VIDEO_MAC_FULLSCREEN_SPACES", - "SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS", - "SDL_HINT_VIDEO_WINDOW_SHARE_PIXEL_FORMAT", - "SDL_HINT_VIDEO_WIN_D3DCOMPILER", - "SDL_HINT_VIDEO_X11_XINERAMA", - "SDL_HINT_VIDEO_X11_XRANDR", - "SDL_HINT_VIDEO_X11_XVIDMODE", - "SDL_HINT_XINPUT_ENABLED" + "SDL_ACCELEROMETER_AS_JOYSTICK", + "SDL_FRAMEBUFFER_ACCELERATION", + "SDL_GAMECONTROLLERCONFIG", + "SDL_GRAB_KEYBOARD", + "SDL_IDLE_TIMER_DISABLED", + "SDL_JOYSTICK_ALLOW_BACKGROUND_EVENTS", + "SDL_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK", + "SDL_MOUSE_RELATIVE_MODE_WARP", + "SDL_ORIENTATIONS", + "SDL_RENDER_DIRECT3D_THREADSAFE", + "SDL_RENDER_DRIVER", + "SDL_RENDER_OPENGL_SHADERS", + "SDL_RENDER_SCALE_QUALITY", + "SDL_RENDER_VSYNC", + "SDL_TIMER_RESOLUTION", + "SDL_VIDEO_ALLOW_SCREENSAVER", + "SDL_VIDEO_HIGHDPI_DISABLED", + "SDL_VIDEO_MAC_FULLSCREEN_SPACES", + "SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS", + "SDL_VIDEO_WINDOW_SHARE_PIXEL_FORMAT", + "SDL_VIDEO_WIN_D3DCOMPILER", + "SDL_VIDEO_X11_XINERAMA", + "SDL_VIDEO_X11_XRANDR", + "SDL_VIDEO_X11_XVIDMODE", + "SDL_XINPUT_ENABLED" }; @@ -75,14 +75,14 @@ char* _HintsVerbose[] = int hints_getHint(void *arg) { - char *result1; - char *result2; + const char *result1; + const char *result2; int i; - + for (i=0; i<_numHintsEnum; i++) { - result1 = (char *)SDL_GetHint((char*)_HintsEnum[i]); + result1 = SDL_GetHint(_HintsEnum[i]); SDLTest_AssertPass("Call to SDL_GetHint(%s) - using define definition", (char*)_HintsEnum[i]); - result2 = (char *)SDL_GetHint((char *)_HintsVerbose[i]); + result2 = SDL_GetHint(_HintsVerbose[i]); SDLTest_AssertPass("Call to SDL_GetHint(%s) - using string definition", (char*)_HintsVerbose[i]); SDLTest_AssertCheck( (result1 == NULL && result2 == NULL) || (SDL_strcmp(result1, result2) == 0), @@ -90,7 +90,7 @@ hints_getHint(void *arg) (result1 == NULL) ? "null" : result1, (result2 == NULL) ? "null" : result2); } - + return TEST_COMPLETED; } @@ -100,48 +100,52 @@ hints_getHint(void *arg) int hints_setHint(void *arg) { - char *originalValue; - char *value; - char *testValue; + const char *originalValue; + const char *value; + const char *testValue; SDL_bool result; int i, j; - /* Create random values to set */ + /* Create random values to set */ value = SDLTest_RandomAsciiStringOfSize(10); - + for (i=0; i<_numHintsEnum; i++) { /* Capture current value */ - originalValue = (char *)SDL_GetHint((char*)_HintsEnum[i]); - SDLTest_AssertPass("Call to SDL_GetHint(%s)", (char*)_HintsEnum[i]); - + originalValue = SDL_GetHint(_HintsEnum[i]); + SDLTest_AssertPass("Call to SDL_GetHint(%s)", _HintsEnum[i]); + + /* Copy the original value, since it will be freed when we set it again */ + originalValue = originalValue ? SDL_strdup(originalValue) : NULL; + /* Set value (twice) */ for (j=1; j<=2; j++) { - result = SDL_SetHint((char*)_HintsEnum[i], value); - SDLTest_AssertPass("Call to SDL_SetHint(%s, %s) (iteration %i)", (char*)_HintsEnum[i], value, j); + result = SDL_SetHint(_HintsEnum[i], value); + SDLTest_AssertPass("Call to SDL_SetHint(%s, %s) (iteration %i)", _HintsEnum[i], value, j); SDLTest_AssertCheck( result == SDL_TRUE || result == SDL_FALSE, "Verify valid result was returned, got: %i", (int)result); - testValue = (char *)SDL_GetHint((char*)_HintsEnum[i]); - SDLTest_AssertPass("Call to SDL_GetHint(%s) - using string definition", (char*)_HintsVerbose[i]); + testValue = SDL_GetHint(_HintsEnum[i]); + SDLTest_AssertPass("Call to SDL_GetHint(%s) - using string definition", _HintsVerbose[i]); SDLTest_AssertCheck( (SDL_strcmp(value, testValue) == 0), "Verify returned value equals set value; got: testValue='%s' value='%s", (testValue == NULL) ? "null" : testValue, value); } - + /* Reset original value */ - result = SDL_SetHint((char*)_HintsEnum[i], originalValue); - SDLTest_AssertPass("Call to SDL_SetHint(%s, originalValue)", (char*)_HintsEnum[i]); + result = SDL_SetHint(_HintsEnum[i], originalValue); + SDLTest_AssertPass("Call to SDL_SetHint(%s, originalValue)", _HintsEnum[i]); SDLTest_AssertCheck( result == SDL_TRUE || result == SDL_FALSE, "Verify valid result was returned, got: %i", (int)result); + SDL_free((void *)originalValue); } - - SDL_free(value); - + + SDL_free((void *)value); + return TEST_COMPLETED; } diff --git a/libs/SDL2/test/testautomation_keyboard.c b/libs/SDL2/test/testautomation_keyboard.c index 6f25bb76c..84a763589 100644 --- a/libs/SDL2/test/testautomation_keyboard.c +++ b/libs/SDL2/test/testautomation_keyboard.c @@ -16,7 +16,7 @@ /** * @brief Check call to SDL_GetKeyboardState with and without numkeys reference. * - * @sa http://wiki.libsdl.org/moin.cgi/SDL_GetKeyboardState + * @sa http://wiki.libsdl.org/SDL_GetKeyboardState */ int keyboard_getKeyboardState(void *arg) @@ -42,15 +42,13 @@ keyboard_getKeyboardState(void *arg) /** * @brief Check call to SDL_GetKeyboardFocus * - * @sa http://wiki.libsdl.org/moin.cgi/SDL_GetKeyboardFocus + * @sa http://wiki.libsdl.org/SDL_GetKeyboardFocus */ int keyboard_getKeyboardFocus(void *arg) { - SDL_Window* window; - /* Call, but ignore return value */ - window = SDL_GetKeyboardFocus(); + SDL_GetKeyboardFocus(); SDLTest_AssertPass("Call to SDL_GetKeyboardFocus()"); return TEST_COMPLETED; @@ -59,7 +57,7 @@ keyboard_getKeyboardFocus(void *arg) /** * @brief Check call to SDL_GetKeyFromName for known, unknown and invalid name. * - * @sa http://wiki.libsdl.org/moin.cgi/SDL_GetKeyFromName + * @sa http://wiki.libsdl.org/SDL_GetKeyFromName */ int keyboard_getKeyFromName(void *arg) @@ -126,7 +124,7 @@ _checkInvalidScancodeError() /** * @brief Check call to SDL_GetKeyFromScancode * - * @sa http://wiki.libsdl.org/moin.cgi/SDL_GetKeyFromScancode + * @sa http://wiki.libsdl.org/SDL_GetKeyFromScancode */ int keyboard_getKeyFromScancode(void *arg) @@ -165,13 +163,13 @@ keyboard_getKeyFromScancode(void *arg) /** * @brief Check call to SDL_GetKeyName * - * @sa http://wiki.libsdl.org/moin.cgi/SDL_GetKeyName + * @sa http://wiki.libsdl.org/SDL_GetKeyName */ int keyboard_getKeyName(void *arg) { - char *result; - char *expected; + const char *result; + const char *expected; /* Case where key has a 1 character name */ expected = "3"; @@ -221,14 +219,14 @@ keyboard_getKeyName(void *arg) /** * @brief SDL_GetScancodeName negative cases * - * @sa http://wiki.libsdl.org/moin.cgi/SDL_GetScancodeName + * @sa http://wiki.libsdl.org/SDL_GetScancodeName */ int keyboard_getScancodeNameNegative(void *arg) { SDL_Scancode scancode; - char *result; - char *expected = ""; + const char *result; + const char *expected = ""; /* Clear error message */ SDL_ClearError(); @@ -248,14 +246,14 @@ keyboard_getScancodeNameNegative(void *arg) /** * @brief SDL_GetKeyName negative cases * - * @sa http://wiki.libsdl.org/moin.cgi/SDL_GetKeyName + * @sa http://wiki.libsdl.org/SDL_GetKeyName */ int keyboard_getKeyNameNegative(void *arg) { SDL_Keycode keycode; - char *result; - char *expected = ""; + const char *result; + const char *expected = ""; /* Unknown keycode */ keycode = SDLK_UNKNOWN; @@ -285,8 +283,8 @@ keyboard_getKeyNameNegative(void *arg) /** * @brief Check call to SDL_GetModState and SDL_SetModState * - * @sa http://wiki.libsdl.org/moin.cgi/SDL_GetModState - * @sa http://wiki.libsdl.org/moin.cgi/SDL_SetModState + * @sa http://wiki.libsdl.org/SDL_GetModState + * @sa http://wiki.libsdl.org/SDL_SetModState */ int keyboard_getSetModState(void *arg) @@ -307,7 +305,7 @@ keyboard_getSetModState(void *arg) KMOD_NUM | KMOD_CAPS | KMOD_MODE | - KMOD_RESERVED; + KMOD_SCROLL; /* Get state, cache for later reset */ result = SDL_GetModState(); @@ -346,8 +344,8 @@ keyboard_getSetModState(void *arg) /** * @brief Check call to SDL_StartTextInput and SDL_StopTextInput * - * @sa http://wiki.libsdl.org/moin.cgi/SDL_StartTextInput - * @sa http://wiki.libsdl.org/moin.cgi/SDL_StopTextInput + * @sa http://wiki.libsdl.org/SDL_StartTextInput + * @sa http://wiki.libsdl.org/SDL_StopTextInput */ int keyboard_startStopTextInput(void *arg) @@ -393,7 +391,7 @@ void _testSetTextInputRect(SDL_Rect refRect) /** * @brief Check call to SDL_SetTextInputRect * - * @sa http://wiki.libsdl.org/moin.cgi/SDL_SetTextInputRect + * @sa http://wiki.libsdl.org/SDL_SetTextInputRect */ int keyboard_setTextInputRect(void *arg) @@ -473,7 +471,7 @@ keyboard_setTextInputRect(void *arg) /** * @brief Check call to SDL_SetTextInputRect with invalid data * - * @sa http://wiki.libsdl.org/moin.cgi/SDL_SetTextInputRect + * @sa http://wiki.libsdl.org/SDL_SetTextInputRect */ int keyboard_setTextInputRectNegative(void *arg) @@ -511,8 +509,8 @@ keyboard_setTextInputRectNegative(void *arg) /** * @brief Check call to SDL_GetScancodeFromKey * - * @sa http://wiki.libsdl.org/moin.cgi/SDL_GetScancodeFromKey - * @sa http://wiki.libsdl.org/moin.cgi/SDL_Keycode + * @sa http://wiki.libsdl.org/SDL_GetScancodeFromKey + * @sa http://wiki.libsdl.org/SDL_Keycode */ int keyboard_getScancodeFromKey(void *arg) @@ -535,8 +533,8 @@ keyboard_getScancodeFromKey(void *arg) /** * @brief Check call to SDL_GetScancodeFromName * - * @sa http://wiki.libsdl.org/moin.cgi/SDL_GetScancodeFromName - * @sa http://wiki.libsdl.org/moin.cgi/SDL_Keycode + * @sa http://wiki.libsdl.org/SDL_GetScancodeFromName + * @sa http://wiki.libsdl.org/SDL_Keycode */ int keyboard_getScancodeFromName(void *arg) @@ -608,13 +606,13 @@ _checkInvalidNameError() /** * @brief Check call to SDL_GetScancodeFromName with invalid data * - * @sa http://wiki.libsdl.org/moin.cgi/SDL_GetScancodeFromName - * @sa http://wiki.libsdl.org/moin.cgi/SDL_Keycode + * @sa http://wiki.libsdl.org/SDL_GetScancodeFromName + * @sa http://wiki.libsdl.org/SDL_Keycode */ int keyboard_getScancodeFromNameNegative(void *arg) { - char *name; + const char *name; SDL_Scancode scancode; /* Clear error message */ @@ -627,9 +625,9 @@ keyboard_getScancodeFromNameNegative(void *arg) if (name == NULL) { return TEST_ABORTED; } - scancode = SDL_GetScancodeFromName((const char *)name); + scancode = SDL_GetScancodeFromName(name); SDLTest_AssertPass("Call to SDL_GetScancodeFromName('%s')", name); - SDL_free(name); + SDL_free((void *)name); SDLTest_AssertCheck(scancode == SDL_SCANCODE_UNKNOWN, "Validate return value from SDL_GetScancodeFromName, expected: %i, got: %i", SDL_SCANCODE_UNKNOWN, scancode); _checkInvalidNameError(); diff --git a/libs/SDL2/test/testautomation_main.c b/libs/SDL2/test/testautomation_main.c index ae060cdd1..229f2bc55 100644 --- a/libs/SDL2/test/testautomation_main.c +++ b/libs/SDL2/test/testautomation_main.c @@ -13,8 +13,8 @@ /* ! * \brief Tests SDL_Init() and SDL_Quit() of Joystick and Haptic subsystems * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_Init - * http://wiki.libsdl.org/moin.cgi/SDL_Quit + * http://wiki.libsdl.org/SDL_Init + * http://wiki.libsdl.org/SDL_Quit */ static int main_testInitQuitJoystickHaptic (void *arg) { @@ -41,8 +41,8 @@ static int main_testInitQuitJoystickHaptic (void *arg) /* ! * \brief Tests SDL_InitSubSystem() and SDL_QuitSubSystem() * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_Init - * http://wiki.libsdl.org/moin.cgi/SDL_Quit + * http://wiki.libsdl.org/SDL_Init + * http://wiki.libsdl.org/SDL_Quit */ static int main_testInitQuitSubSystem (void *arg) { diff --git a/libs/SDL2/test/testautomation_mouse.c b/libs/SDL2/test/testautomation_mouse.c index ed30f2604..b99afc1ce 100644 --- a/libs/SDL2/test/testautomation_mouse.c +++ b/libs/SDL2/test/testautomation_mouse.c @@ -192,8 +192,8 @@ static SDL_Cursor *_initArrowCursor(const char *image[]) /** * @brief Check call to SDL_CreateCursor and SDL_FreeCursor * - * @sa http://wiki.libsdl.org/moin.cgi/SDL_CreateCursor - * @sa http://wiki.libsdl.org/moin.cgi/SDL_FreeCursor + * @sa http://wiki.libsdl.org/SDL_CreateCursor + * @sa http://wiki.libsdl.org/SDL_FreeCursor */ int mouse_createFreeCursor(void *arg) @@ -218,8 +218,8 @@ mouse_createFreeCursor(void *arg) /** * @brief Check call to SDL_CreateColorCursor and SDL_FreeCursor * - * @sa http://wiki.libsdl.org/moin.cgi/SDL_CreateColorCursor - * @sa http://wiki.libsdl.org/moin.cgi/SDL_FreeCursor + * @sa http://wiki.libsdl.org/SDL_CreateColorCursor + * @sa http://wiki.libsdl.org/SDL_FreeCursor */ int mouse_createFreeColorCursor(void *arg) @@ -275,7 +275,7 @@ void _changeCursorVisibility(int state) /** * @brief Check call to SDL_ShowCursor * - * @sa http://wiki.libsdl.org/moin.cgi/SDL_ShowCursor + * @sa http://wiki.libsdl.org/SDL_ShowCursor */ int mouse_showCursor(void *arg) @@ -305,7 +305,7 @@ mouse_showCursor(void *arg) /** * @brief Check call to SDL_SetCursor * - * @sa http://wiki.libsdl.org/moin.cgi/SDL_SetCursor + * @sa http://wiki.libsdl.org/SDL_SetCursor */ int mouse_setCursor(void *arg) @@ -338,7 +338,7 @@ mouse_setCursor(void *arg) /** * @brief Check call to SDL_GetCursor * - * @sa http://wiki.libsdl.org/moin.cgi/SDL_GetCursor + * @sa http://wiki.libsdl.org/SDL_GetCursor */ int mouse_getCursor(void *arg) @@ -356,8 +356,8 @@ mouse_getCursor(void *arg) /** * @brief Check call to SDL_GetRelativeMouseMode and SDL_SetRelativeMouseMode * - * @sa http://wiki.libsdl.org/moin.cgi/SDL_GetRelativeMouseMode - * @sa http://wiki.libsdl.org/moin.cgi/SDL_SetRelativeMouseMode + * @sa http://wiki.libsdl.org/SDL_GetRelativeMouseMode + * @sa http://wiki.libsdl.org/SDL_SetRelativeMouseMode */ int mouse_getSetRelativeMouseMode(void *arg) @@ -440,7 +440,7 @@ void _destroyMouseSuiteTestWindow(SDL_Window *window) /** * @brief Check call to SDL_WarpMouseInWindow * - * @sa http://wiki.libsdl.org/moin.cgi/SDL_WarpMouseInWindow + * @sa http://wiki.libsdl.org/SDL_WarpMouseInWindow */ int mouse_warpMouseInWindow(void *arg) @@ -502,7 +502,7 @@ mouse_warpMouseInWindow(void *arg) /** * @brief Check call to SDL_GetMouseFocus * - * @sa http://wiki.libsdl.org/moin.cgi/SDL_GetMouseFocus + * @sa http://wiki.libsdl.org/SDL_GetMouseFocus */ int mouse_getMouseFocus(void *arg) @@ -527,6 +527,7 @@ mouse_getMouseFocus(void *arg) SDLTest_AssertPass("SDL_WarpMouseInWindow(...,%i,%i)", x, y); /* Pump events to update focus state */ + SDL_Delay(100); SDL_PumpEvents(); SDLTest_AssertPass("SDL_PumpEvents()"); diff --git a/libs/SDL2/test/testautomation_pixels.c b/libs/SDL2/test/testautomation_pixels.c index 7b88caaa9..0f6870c9a 100644 --- a/libs/SDL2/test/testautomation_pixels.c +++ b/libs/SDL2/test/testautomation_pixels.c @@ -10,7 +10,7 @@ /* Test case functions */ /* Definition of all RGB formats used to test pixel conversions */ -const int _numRGBPixelFormats = 30; +const int _numRGBPixelFormats = 31; Uint32 _RGBPixelFormats[] = { SDL_PIXELFORMAT_INDEX1LSB, @@ -20,6 +20,7 @@ Uint32 _RGBPixelFormats[] = SDL_PIXELFORMAT_INDEX8, SDL_PIXELFORMAT_RGB332, SDL_PIXELFORMAT_RGB444, + SDL_PIXELFORMAT_BGR444, SDL_PIXELFORMAT_RGB555, SDL_PIXELFORMAT_BGR555, SDL_PIXELFORMAT_ARGB4444, @@ -44,7 +45,7 @@ Uint32 _RGBPixelFormats[] = SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_ARGB2101010 }; -char* _RGBPixelFormatsVerbose[] = +const char* _RGBPixelFormatsVerbose[] = { "SDL_PIXELFORMAT_INDEX1LSB", "SDL_PIXELFORMAT_INDEX1MSB", @@ -53,6 +54,7 @@ char* _RGBPixelFormatsVerbose[] = "SDL_PIXELFORMAT_INDEX8", "SDL_PIXELFORMAT_RGB332", "SDL_PIXELFORMAT_RGB444", + "SDL_PIXELFORMAT_BGR444", "SDL_PIXELFORMAT_RGB555", "SDL_PIXELFORMAT_BGR555", "SDL_PIXELFORMAT_ARGB4444", @@ -90,7 +92,7 @@ Uint32 _nonRGBPixelFormats[] = SDL_PIXELFORMAT_NV12, SDL_PIXELFORMAT_NV21 }; -char* _nonRGBPixelFormatsVerbose[] = +const char* _nonRGBPixelFormatsVerbose[] = { "SDL_PIXELFORMAT_YV12", "SDL_PIXELFORMAT_IYUV", @@ -108,7 +110,7 @@ Uint32 _invalidPixelFormats[] = 0xfffffffe, 0xffffffff }; -char* _invalidPixelFormatsVerbose[] = +const char* _invalidPixelFormatsVerbose[] = { "SDL_PIXELFORMAT_UNKNOWN", "SDL_PIXELFORMAT_UNKNOWN" @@ -119,8 +121,8 @@ char* _invalidPixelFormatsVerbose[] = /** * @brief Call to SDL_AllocFormat and SDL_FreeFormat * - * @sa http://wiki.libsdl.org/moin.fcg/SDL_AllocFormat - * @sa http://wiki.libsdl.org/moin.fcg/SDL_FreeFormat + * @sa http://wiki.libsdl.org/SDL_AllocFormat + * @sa http://wiki.libsdl.org/SDL_FreeFormat */ int pixels_allocFreeFormat(void *arg) @@ -226,7 +228,7 @@ pixels_allocFreeFormat(void *arg) /** * @brief Call to SDL_GetPixelFormatName * - * @sa http://wiki.libsdl.org/moin.fcg/SDL_GetPixelFormatName + * @sa http://wiki.libsdl.org/SDL_GetPixelFormatName */ int pixels_getPixelFormatName(void *arg) @@ -235,14 +237,14 @@ pixels_getPixelFormatName(void *arg) const char *error; int i; Uint32 format; - char* result; + const char *result; /* Blank/undefined format */ format = 0; SDLTest_Log("RGB Format: %s (%u)", unknownFormat, format); /* Get name of format */ - result = (char *)SDL_GetPixelFormatName(format); + result = SDL_GetPixelFormatName(format); SDLTest_AssertPass("Call to SDL_GetPixelFormatName()"); SDLTest_AssertCheck(result != NULL, "Verify result is not NULL"); if (result != NULL) { @@ -257,7 +259,7 @@ pixels_getPixelFormatName(void *arg) SDLTest_Log("RGB Format: %s (%u)", _RGBPixelFormatsVerbose[i], format); /* Get name of format */ - result = (char *)SDL_GetPixelFormatName(format); + result = SDL_GetPixelFormatName(format); SDLTest_AssertPass("Call to SDL_GetPixelFormatName()"); SDLTest_AssertCheck(result != NULL, "Verify result is not NULL"); if (result != NULL) { @@ -273,7 +275,7 @@ pixels_getPixelFormatName(void *arg) SDLTest_Log("non-RGB Format: %s (%u)", _nonRGBPixelFormatsVerbose[i], format); /* Get name of format */ - result = (char *)SDL_GetPixelFormatName(format); + result = SDL_GetPixelFormatName(format); SDLTest_AssertPass("Call to SDL_GetPixelFormatName()"); SDLTest_AssertCheck(result != NULL, "Verify result is not NULL"); if (result != NULL) { @@ -290,7 +292,7 @@ pixels_getPixelFormatName(void *arg) SDLTest_AssertPass("Call to SDL_ClearError()"); for (i = 0; i < _numInvalidPixelFormats; i++) { format = _invalidPixelFormats[i]; - result = (char *)SDL_GetPixelFormatName(format); + result = SDL_GetPixelFormatName(format); SDLTest_AssertPass("Call to SDL_GetPixelFormatName(%u)", format); SDLTest_AssertCheck(result != NULL, "Verify result is not NULL"); if (result != NULL) { @@ -310,8 +312,8 @@ pixels_getPixelFormatName(void *arg) /** * @brief Call to SDL_AllocPalette and SDL_FreePalette * - * @sa http://wiki.libsdl.org/moin.fcg/SDL_AllocPalette - * @sa http://wiki.libsdl.org/moin.fcg/SDL_FreePalette + * @sa http://wiki.libsdl.org/SDL_AllocPalette + * @sa http://wiki.libsdl.org/SDL_FreePalette */ int pixels_allocFreePalette(void *arg) @@ -400,7 +402,7 @@ pixels_allocFreePalette(void *arg) /** * @brief Call to SDL_CalculateGammaRamp * - * @sa http://wiki.libsdl.org/moin.fcg/SDL_CalculateGammaRamp + * @sa http://wiki.libsdl.org/SDL_CalculateGammaRamp */ int pixels_calcGammaRamp(void *arg) diff --git a/libs/SDL2/test/testautomation_platform.c b/libs/SDL2/test/testautomation_platform.c index 7cc732a7b..4e28ba166 100644 --- a/libs/SDL2/test/testautomation_platform.c +++ b/libs/SDL2/test/testautomation_platform.c @@ -101,11 +101,11 @@ int platform_testEndianessAndSwap(void *arg) /* ! * \brief Tests SDL_GetXYZ() functions * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_GetPlatform - * http://wiki.libsdl.org/moin.cgi/SDL_GetCPUCount - * http://wiki.libsdl.org/moin.cgi/SDL_GetCPUCacheLineSize - * http://wiki.libsdl.org/moin.cgi/SDL_GetRevision - * http://wiki.libsdl.org/moin.cgi/SDL_GetRevisionNumber + * http://wiki.libsdl.org/SDL_GetPlatform + * http://wiki.libsdl.org/SDL_GetCPUCount + * http://wiki.libsdl.org/SDL_GetCPUCacheLineSize + * http://wiki.libsdl.org/SDL_GetRevision + * http://wiki.libsdl.org/SDL_GetRevisionNumber */ int platform_testGetFunctions (void *arg) { @@ -141,60 +141,55 @@ int platform_testGetFunctions (void *arg) SDLTest_AssertPass("SDL_GetRevision()"); SDLTest_AssertCheck(revision != NULL, "SDL_GetRevision() != NULL"); - ret = SDL_GetRevisionNumber(); - SDLTest_AssertPass("SDL_GetRevisionNumber()"); - return TEST_COMPLETED; } /* ! * \brief Tests SDL_HasXYZ() functions * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_Has3DNow - * http://wiki.libsdl.org/moin.cgi/SDL_HasAltiVec - * http://wiki.libsdl.org/moin.cgi/SDL_HasMMX - * http://wiki.libsdl.org/moin.cgi/SDL_HasRDTSC - * http://wiki.libsdl.org/moin.cgi/SDL_HasSSE - * http://wiki.libsdl.org/moin.cgi/SDL_HasSSE2 - * http://wiki.libsdl.org/moin.cgi/SDL_HasSSE3 - * http://wiki.libsdl.org/moin.cgi/SDL_HasSSE41 - * http://wiki.libsdl.org/moin.cgi/SDL_HasSSE42 - * http://wiki.libsdl.org/moin.cgi/SDL_HasAVX + * http://wiki.libsdl.org/SDL_Has3DNow + * http://wiki.libsdl.org/SDL_HasAltiVec + * http://wiki.libsdl.org/SDL_HasMMX + * http://wiki.libsdl.org/SDL_HasRDTSC + * http://wiki.libsdl.org/SDL_HasSSE + * http://wiki.libsdl.org/SDL_HasSSE2 + * http://wiki.libsdl.org/SDL_HasSSE3 + * http://wiki.libsdl.org/SDL_HasSSE41 + * http://wiki.libsdl.org/SDL_HasSSE42 + * http://wiki.libsdl.org/SDL_HasAVX */ int platform_testHasFunctions (void *arg) { - int ret; - /* TODO: independently determine and compare values as well */ - ret = SDL_HasRDTSC(); + SDL_HasRDTSC(); SDLTest_AssertPass("SDL_HasRDTSC()"); - ret = SDL_HasAltiVec(); + SDL_HasAltiVec(); SDLTest_AssertPass("SDL_HasAltiVec()"); - ret = SDL_HasMMX(); + SDL_HasMMX(); SDLTest_AssertPass("SDL_HasMMX()"); - ret = SDL_Has3DNow(); + SDL_Has3DNow(); SDLTest_AssertPass("SDL_Has3DNow()"); - ret = SDL_HasSSE(); + SDL_HasSSE(); SDLTest_AssertPass("SDL_HasSSE()"); - ret = SDL_HasSSE2(); + SDL_HasSSE2(); SDLTest_AssertPass("SDL_HasSSE2()"); - ret = SDL_HasSSE3(); + SDL_HasSSE3(); SDLTest_AssertPass("SDL_HasSSE3()"); - ret = SDL_HasSSE41(); + SDL_HasSSE41(); SDLTest_AssertPass("SDL_HasSSE41()"); - ret = SDL_HasSSE42(); + SDL_HasSSE42(); SDLTest_AssertPass("SDL_HasSSE42()"); - ret = SDL_HasAVX(); + SDL_HasAVX(); SDLTest_AssertPass("SDL_HasAVX()"); return TEST_COMPLETED; @@ -203,7 +198,7 @@ int platform_testHasFunctions (void *arg) /* ! * \brief Tests SDL_GetVersion * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_GetVersion + * http://wiki.libsdl.org/SDL_GetVersion */ int platform_testGetVersion(void *arg) { @@ -273,9 +268,9 @@ int platform_testDefaultInit(void *arg) /* ! * \brief Tests SDL_Get/Set/ClearError * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_GetError - * http://wiki.libsdl.org/moin.cgi/SDL_SetError - * http://wiki.libsdl.org/moin.cgi/SDL_ClearError + * http://wiki.libsdl.org/SDL_GetError + * http://wiki.libsdl.org/SDL_SetError + * http://wiki.libsdl.org/SDL_ClearError */ int platform_testGetSetClearError(void *arg) { @@ -327,7 +322,7 @@ int platform_testGetSetClearError(void *arg) /* ! * \brief Tests SDL_SetError with empty input * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_SetError + * http://wiki.libsdl.org/SDL_SetError */ int platform_testSetErrorEmptyInput(void *arg) { @@ -365,7 +360,7 @@ int platform_testSetErrorEmptyInput(void *arg) /* ! * \brief Tests SDL_SetError with invalid input * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_SetError + * http://wiki.libsdl.org/SDL_SetError */ int platform_testSetErrorInvalidInput(void *arg) { @@ -389,7 +384,7 @@ int platform_testSetErrorInvalidInput(void *arg) if (lastError != NULL) { len = SDL_strlen(lastError); - SDLTest_AssertCheck(len == 0, + SDLTest_AssertCheck(len == 0 || SDL_strcmp(lastError, "(null)") == 0, "SDL_GetError(): expected message len 0, was len: %i", (int) len); } @@ -409,7 +404,7 @@ int platform_testSetErrorInvalidInput(void *arg) if (lastError != NULL) { len = SDL_strlen(lastError); - SDLTest_AssertCheck(len == 0, + SDLTest_AssertCheck(len == 0 || SDL_strcmp( lastError, "(null)" ) == 0, "SDL_GetError(): expected message len 0, was len: %i", (int) len); } @@ -448,7 +443,7 @@ int platform_testSetErrorInvalidInput(void *arg) /* ! * \brief Tests SDL_GetPowerInfo * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_GetPowerInfo + * http://wiki.libsdl.org/SDL_GetPowerInfo */ int platform_testGetPowerInfo(void *arg) { diff --git a/libs/SDL2/test/testautomation_rect.c b/libs/SDL2/test/testautomation_rect.c index abf19f593..26f03e9bb 100644 --- a/libs/SDL2/test/testautomation_rect.c +++ b/libs/SDL2/test/testautomation_rect.c @@ -43,7 +43,7 @@ void _validateIntersectRectAndLineResults( * \brief Tests SDL_IntersectRectAndLine() clipping cases * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_IntersectRectAndLine + * http://wiki.libsdl.org/SDL_IntersectRectAndLine */ int rect_testIntersectRectAndLine (void *arg) @@ -114,7 +114,7 @@ rect_testIntersectRectAndLine (void *arg) * \brief Tests SDL_IntersectRectAndLine() non-clipping case line inside * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_IntersectRectAndLine + * http://wiki.libsdl.org/SDL_IntersectRectAndLine */ int rect_testIntersectRectAndLineInside (void *arg) @@ -181,7 +181,7 @@ rect_testIntersectRectAndLineInside (void *arg) * \brief Tests SDL_IntersectRectAndLine() non-clipping cases outside * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_IntersectRectAndLine + * http://wiki.libsdl.org/SDL_IntersectRectAndLine */ int rect_testIntersectRectAndLineOutside (void *arg) @@ -236,7 +236,7 @@ rect_testIntersectRectAndLineOutside (void *arg) * \brief Tests SDL_IntersectRectAndLine() with empty rectangle * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_IntersectRectAndLine + * http://wiki.libsdl.org/SDL_IntersectRectAndLine */ int rect_testIntersectRectAndLineEmpty (void *arg) @@ -271,7 +271,7 @@ rect_testIntersectRectAndLineEmpty (void *arg) * \brief Negative tests against SDL_IntersectRectAndLine() with invalid parameters * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_IntersectRectAndLine + * http://wiki.libsdl.org/SDL_IntersectRectAndLine */ int rect_testIntersectRectAndLineParam (void *arg) @@ -412,7 +412,7 @@ void _validateRectEqualsResults( * \brief Tests SDL_IntersectRect() with B fully inside A * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_IntersectRect + * http://wiki.libsdl.org/SDL_IntersectRect */ int rect_testIntersectRectInside (void *arg) { @@ -440,7 +440,7 @@ int rect_testIntersectRectInside (void *arg) * \brief Tests SDL_IntersectRect() with B fully outside A * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_IntersectRect + * http://wiki.libsdl.org/SDL_IntersectRect */ int rect_testIntersectRectOutside (void *arg) { @@ -468,7 +468,7 @@ int rect_testIntersectRectOutside (void *arg) * \brief Tests SDL_IntersectRect() with B partially intersecting A * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_IntersectRect + * http://wiki.libsdl.org/SDL_IntersectRect */ int rect_testIntersectRectPartial (void *arg) { @@ -557,7 +557,7 @@ int rect_testIntersectRectPartial (void *arg) * \brief Tests SDL_IntersectRect() with 1x1 pixel sized rectangles * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_IntersectRect + * http://wiki.libsdl.org/SDL_IntersectRect */ int rect_testIntersectRectPoint (void *arg) { @@ -604,7 +604,7 @@ int rect_testIntersectRectPoint (void *arg) * \brief Tests SDL_IntersectRect() with empty rectangles * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_IntersectRect + * http://wiki.libsdl.org/SDL_IntersectRect */ int rect_testIntersectRectEmpty (void *arg) { @@ -676,7 +676,7 @@ int rect_testIntersectRectEmpty (void *arg) * \brief Negative tests against SDL_IntersectRect() with invalid parameters * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_IntersectRect + * http://wiki.libsdl.org/SDL_IntersectRect */ int rect_testIntersectRectParam(void *arg) { @@ -706,7 +706,7 @@ int rect_testIntersectRectParam(void *arg) * \brief Tests SDL_HasIntersection() with B fully inside A * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_HasIntersection + * http://wiki.libsdl.org/SDL_HasIntersection */ int rect_testHasIntersectionInside (void *arg) { @@ -733,7 +733,7 @@ int rect_testHasIntersectionInside (void *arg) * \brief Tests SDL_HasIntersection() with B fully outside A * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_HasIntersection + * http://wiki.libsdl.org/SDL_HasIntersection */ int rect_testHasIntersectionOutside (void *arg) { @@ -760,7 +760,7 @@ int rect_testHasIntersectionOutside (void *arg) * \brief Tests SDL_HasIntersection() with B partially intersecting A * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_HasIntersection + * http://wiki.libsdl.org/SDL_HasIntersection */ int rect_testHasIntersectionPartial (void *arg) { @@ -827,7 +827,7 @@ int rect_testHasIntersectionPartial (void *arg) * \brief Tests SDL_HasIntersection() with 1x1 pixel sized rectangles * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_HasIntersection + * http://wiki.libsdl.org/SDL_HasIntersection */ int rect_testHasIntersectionPoint (void *arg) { @@ -873,7 +873,7 @@ int rect_testHasIntersectionPoint (void *arg) * \brief Tests SDL_HasIntersection() with empty rectangles * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_HasIntersection + * http://wiki.libsdl.org/SDL_HasIntersection */ int rect_testHasIntersectionEmpty (void *arg) { @@ -931,7 +931,7 @@ int rect_testHasIntersectionEmpty (void *arg) * \brief Negative tests against SDL_HasIntersection() with invalid parameters * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_HasIntersection + * http://wiki.libsdl.org/SDL_HasIntersection */ int rect_testHasIntersectionParam(void *arg) { @@ -954,7 +954,7 @@ int rect_testHasIntersectionParam(void *arg) * \brief Test SDL_EnclosePoints() without clipping * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_EnclosePoints + * http://wiki.libsdl.org/SDL_EnclosePoints */ int rect_testEnclosePoints(void *arg) { @@ -1024,7 +1024,7 @@ int rect_testEnclosePoints(void *arg) * \brief Test SDL_EnclosePoints() with repeated input points * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_EnclosePoints + * http://wiki.libsdl.org/SDL_EnclosePoints */ int rect_testEnclosePointsRepeatedInput(void *arg) { @@ -1100,7 +1100,7 @@ int rect_testEnclosePointsRepeatedInput(void *arg) * \brief Test SDL_EnclosePoints() with clipping * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_EnclosePoints + * http://wiki.libsdl.org/SDL_EnclosePoints */ int rect_testEnclosePointsWithClipping(void *arg) { @@ -1199,7 +1199,7 @@ int rect_testEnclosePointsWithClipping(void *arg) * \brief Negative tests against SDL_EnclosePoints() with invalid parameters * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_EnclosePoints + * http://wiki.libsdl.org/SDL_EnclosePoints */ int rect_testEnclosePointsParam(void *arg) { @@ -1227,7 +1227,7 @@ int rect_testEnclosePointsParam(void *arg) * \brief Tests SDL_UnionRect() where rect B is outside rect A * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_UnionRect + * http://wiki.libsdl.org/SDL_UnionRect */ int rect_testUnionRectOutside(void *arg) { @@ -1298,7 +1298,7 @@ int rect_testUnionRectOutside(void *arg) * \brief Tests SDL_UnionRect() where rect A or rect B are empty * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_UnionRect + * http://wiki.libsdl.org/SDL_UnionRect */ int rect_testUnionRectEmpty(void *arg) { @@ -1363,7 +1363,7 @@ int rect_testUnionRectEmpty(void *arg) * \brief Tests SDL_UnionRect() where rect B is inside rect A * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_UnionRect + * http://wiki.libsdl.org/SDL_UnionRect */ int rect_testUnionRectInside(void *arg) { @@ -1427,7 +1427,7 @@ int rect_testUnionRectInside(void *arg) * \brief Negative tests against SDL_UnionRect() with invalid parameters * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_UnionRect + * http://wiki.libsdl.org/SDL_UnionRect */ int rect_testUnionRectParam(void *arg) { @@ -1455,7 +1455,7 @@ int rect_testUnionRectParam(void *arg) * \brief Tests SDL_RectEmpty() with various inputs * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_RectEmpty + * http://wiki.libsdl.org/SDL_RectEmpty */ int rect_testRectEmpty(void *arg) { @@ -1498,7 +1498,7 @@ int rect_testRectEmpty(void *arg) * \brief Negative tests against SDL_RectEmpty() with invalid parameters * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_RectEmpty + * http://wiki.libsdl.org/SDL_RectEmpty */ int rect_testRectEmptyParam(void *arg) { @@ -1515,7 +1515,7 @@ int rect_testRectEmptyParam(void *arg) * \brief Tests SDL_RectEquals() with various inputs * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_RectEquals + * http://wiki.libsdl.org/SDL_RectEquals */ int rect_testRectEquals(void *arg) { @@ -1545,7 +1545,7 @@ int rect_testRectEquals(void *arg) * \brief Negative tests against SDL_RectEquals() with invalid parameters * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_RectEquals + * http://wiki.libsdl.org/SDL_RectEquals */ int rect_testRectEqualsParam(void *arg) { @@ -1678,7 +1678,7 @@ static const SDLTest_TestCaseReference rectTest29 = * \brief Sequence of Rect test cases; functions that handle simple rectangles including overlaps and merges. * * \sa - * http://wiki.libsdl.org/moin.cgi/CategoryRect + * http://wiki.libsdl.org/CategoryRect */ static const SDLTest_TestCaseReference *rectTests[] = { &rectTest1, &rectTest2, &rectTest3, &rectTest4, &rectTest5, &rectTest6, &rectTest7, &rectTest8, &rectTest9, &rectTest10, &rectTest11, &rectTest12, &rectTest13, &rectTest14, diff --git a/libs/SDL2/test/testautomation_render.c b/libs/SDL2/test/testautomation_render.c index 5a1bc9b8c..42fc54dee 100644 --- a/libs/SDL2/test/testautomation_render.c +++ b/libs/SDL2/test/testautomation_render.c @@ -83,7 +83,7 @@ void CleanupDestroyRenderer(void *arg) * @brief Tests call to SDL_GetNumRenderDrivers * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_GetNumRenderDrivers + * http://wiki.libsdl.org/SDL_GetNumRenderDrivers */ int render_testGetNumRenderDrivers(void *arg) @@ -99,9 +99,9 @@ render_testGetNumRenderDrivers(void *arg) * @brief Tests the SDL primitives for rendering. * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_SetRenderDrawColor - * http://wiki.libsdl.org/moin.cgi/SDL_RenderFillRect - * http://wiki.libsdl.org/moin.cgi/SDL_RenderDrawLine + * http://wiki.libsdl.org/SDL_SetRenderDrawColor + * http://wiki.libsdl.org/SDL_RenderFillRect + * http://wiki.libsdl.org/SDL_RenderDrawLine * */ int render_testPrimitives (void *arg) @@ -206,9 +206,9 @@ int render_testPrimitives (void *arg) * @brief Tests the SDL primitives with alpha for rendering. * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_SetRenderDrawColor - * http://wiki.libsdl.org/moin.cgi/SDL_SetRenderDrawBlendMode - * http://wiki.libsdl.org/moin.cgi/SDL_RenderFillRect + * http://wiki.libsdl.org/SDL_SetRenderDrawColor + * http://wiki.libsdl.org/SDL_SetRenderDrawBlendMode + * http://wiki.libsdl.org/SDL_RenderFillRect */ int render_testPrimitivesBlend (void *arg) { @@ -355,8 +355,8 @@ int render_testPrimitivesBlend (void *arg) * @brief Tests some blitting routines. * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_RenderCopy - * http://wiki.libsdl.org/moin.cgi/SDL_DestroyTexture + * http://wiki.libsdl.org/SDL_RenderCopy + * http://wiki.libsdl.org/SDL_DestroyTexture */ int render_testBlit(void *arg) @@ -424,9 +424,9 @@ render_testBlit(void *arg) * @brief Blits doing color tests. * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_SetTextureColorMod - * http://wiki.libsdl.org/moin.cgi/SDL_RenderCopy - * http://wiki.libsdl.org/moin.cgi/SDL_DestroyTexture + * http://wiki.libsdl.org/SDL_SetTextureColorMod + * http://wiki.libsdl.org/SDL_RenderCopy + * http://wiki.libsdl.org/SDL_DestroyTexture */ int render_testBlitColor (void *arg) @@ -498,9 +498,9 @@ render_testBlitColor (void *arg) * @brief Tests blitting with alpha. * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_SetTextureAlphaMod - * http://wiki.libsdl.org/moin.cgi/SDL_RenderCopy - * http://wiki.libsdl.org/moin.cgi/SDL_DestroyTexture + * http://wiki.libsdl.org/SDL_SetTextureAlphaMod + * http://wiki.libsdl.org/SDL_RenderCopy + * http://wiki.libsdl.org/SDL_DestroyTexture */ int render_testBlitAlpha (void *arg) @@ -576,8 +576,8 @@ render_testBlitAlpha (void *arg) * @brief Tests a blend mode. * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_SetTextureBlendMode - * http://wiki.libsdl.org/moin.cgi/SDL_RenderCopy + * http://wiki.libsdl.org/SDL_SetTextureBlendMode + * http://wiki.libsdl.org/SDL_RenderCopy */ static void _testBlitBlendMode( SDL_Texture * tface, int mode ) @@ -626,10 +626,10 @@ _testBlitBlendMode( SDL_Texture * tface, int mode ) * @brief Tests some more blitting routines. * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_SetTextureColorMod - * http://wiki.libsdl.org/moin.cgi/SDL_SetTextureAlphaMod - * http://wiki.libsdl.org/moin.cgi/SDL_SetTextureBlendMode - * http://wiki.libsdl.org/moin.cgi/SDL_DestroyTexture + * http://wiki.libsdl.org/SDL_SetTextureColorMod + * http://wiki.libsdl.org/SDL_SetTextureAlphaMod + * http://wiki.libsdl.org/SDL_SetTextureBlendMode + * http://wiki.libsdl.org/SDL_DestroyTexture */ int render_testBlitBlend (void *arg) @@ -779,8 +779,8 @@ _isSupported( int code ) * @brief Test to see if we can vary the draw color. Helper function. * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_SetRenderDrawColor - * http://wiki.libsdl.org/moin.cgi/SDL_GetRenderDrawColor + * http://wiki.libsdl.org/SDL_SetRenderDrawColor + * http://wiki.libsdl.org/SDL_GetRenderDrawColor */ static int _hasDrawColor (void) @@ -817,8 +817,8 @@ _hasDrawColor (void) * @brief Test to see if we can vary the blend mode. Helper function. * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_SetRenderDrawBlendMode - * http://wiki.libsdl.org/moin.cgi/SDL_GetRenderDrawBlendMode + * http://wiki.libsdl.org/SDL_SetRenderDrawBlendMode + * http://wiki.libsdl.org/SDL_GetRenderDrawBlendMode */ static int _hasBlendModes (void) @@ -874,7 +874,7 @@ _hasBlendModes (void) * @brief Loads the test image 'Face' as texture. Helper function. * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_CreateTextureFromSurface + * http://wiki.libsdl.org/SDL_CreateTextureFromSurface */ static SDL_Texture * _loadTestFace(void) @@ -902,9 +902,9 @@ _loadTestFace(void) * @brief Test to see if can set texture color mode. Helper function. * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_SetTextureColorMod - * http://wiki.libsdl.org/moin.cgi/SDL_GetTextureColorMod - * http://wiki.libsdl.org/moin.cgi/SDL_DestroyTexture + * http://wiki.libsdl.org/SDL_SetTextureColorMod + * http://wiki.libsdl.org/SDL_GetTextureColorMod + * http://wiki.libsdl.org/SDL_DestroyTexture */ static int _hasTexColor (void) @@ -942,9 +942,9 @@ _hasTexColor (void) * @brief Test to see if we can vary the alpha of the texture. Helper function. * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_SetTextureAlphaMod - * http://wiki.libsdl.org/moin.cgi/SDL_GetTextureAlphaMod - * http://wiki.libsdl.org/moin.cgi/SDL_DestroyTexture + * http://wiki.libsdl.org/SDL_SetTextureAlphaMod + * http://wiki.libsdl.org/SDL_GetTextureAlphaMod + * http://wiki.libsdl.org/SDL_DestroyTexture */ static int _hasTexAlpha(void) @@ -984,9 +984,9 @@ _hasTexAlpha(void) * @param s Image to compare against. * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_RenderReadPixels - * http://wiki.libsdl.org/moin.cgi/SDL_CreateRGBSurfaceFrom - * http://wiki.libsdl.org/moin.cgi/SDL_FreeSurface + * http://wiki.libsdl.org/SDL_RenderReadPixels + * http://wiki.libsdl.org/SDL_CreateRGBSurfaceFrom + * http://wiki.libsdl.org/SDL_FreeSurface */ static void _compare(SDL_Surface *referenceSurface, int allowable_error) @@ -1027,10 +1027,10 @@ _compare(SDL_Surface *referenceSurface, int allowable_error) * @brief Clears the screen. Helper function. * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_SetRenderDrawColor - * http://wiki.libsdl.org/moin.cgi/SDL_RenderClear - * http://wiki.libsdl.org/moin.cgi/SDL_RenderPresent - * http://wiki.libsdl.org/moin.cgi/SDL_SetRenderDrawBlendMode + * http://wiki.libsdl.org/SDL_SetRenderDrawColor + * http://wiki.libsdl.org/SDL_RenderClear + * http://wiki.libsdl.org/SDL_RenderPresent + * http://wiki.libsdl.org/SDL_SetRenderDrawBlendMode */ static int _clearScreen(void) diff --git a/libs/SDL2/test/testautomation_rwops.c b/libs/SDL2/test/testautomation_rwops.c index 9a1a29a72..a7d3c3272 100644 --- a/libs/SDL2/test/testautomation_rwops.c +++ b/libs/SDL2/test/testautomation_rwops.c @@ -88,8 +88,8 @@ RWopsTearDown(void *arg) * @brief Makes sure parameters work properly. Local helper function. * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_RWseek - * http://wiki.libsdl.org/moin.cgi/SDL_RWread + * http://wiki.libsdl.org/SDL_RWseek + * http://wiki.libsdl.org/SDL_RWread */ void _testGenericRWopsValidations(SDL_RWops *rw, int write) @@ -100,7 +100,7 @@ _testGenericRWopsValidations(SDL_RWops *rw, int write) int seekPos = SDLTest_RandomIntegerInRange(4, 8); /* Clear buffer */ - SDL_zero(buf); + SDL_zeroa(buf); /* Set to start. */ i = SDL_RWseek(rw, 0, RW_SEEK_SET ); @@ -168,7 +168,7 @@ _testGenericRWopsValidations(SDL_RWops *rw, int write) /* ! * Negative test for SDL_RWFromFile parameters * - * \sa http://wiki.libsdl.org/moin.cgi/SDL_RWFromFile + * \sa http://wiki.libsdl.org/SDL_RWFromFile * */ int @@ -215,8 +215,8 @@ rwops_testParamNegative (void) /** * @brief Tests opening from memory. * - * \sa http://wiki.libsdl.org/moin.cgi/SDL_RWFromMem - * \sa http://wiki.libsdl.org/moin.cgi/SDL_RWClose + * \sa http://wiki.libsdl.org/SDL_RWFromMem + * \sa http://wiki.libsdl.org/SDL_RWClose */ int rwops_testMem (void) @@ -226,7 +226,7 @@ rwops_testMem (void) int result; /* Clear buffer */ - SDL_zero(mem); + SDL_zeroa(mem); /* Open */ rw = SDL_RWFromMem(mem, sizeof(RWopsHelloWorldTestString)-1); @@ -255,8 +255,8 @@ rwops_testMem (void) * @brief Tests opening from memory. * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_RWFromConstMem - * http://wiki.libsdl.org/moin.cgi/SDL_RWClose + * http://wiki.libsdl.org/SDL_RWFromConstMem + * http://wiki.libsdl.org/SDL_RWClose */ int rwops_testConstMem (void) @@ -291,8 +291,8 @@ rwops_testConstMem (void) * @brief Tests reading from file. * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_RWFromFile - * http://wiki.libsdl.org/moin.cgi/SDL_RWClose + * http://wiki.libsdl.org/SDL_RWFromFile + * http://wiki.libsdl.org/SDL_RWClose */ int rwops_testFileRead(void) @@ -338,8 +338,8 @@ rwops_testFileRead(void) * @brief Tests writing from file. * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_RWFromFile - * http://wiki.libsdl.org/moin.cgi/SDL_RWClose + * http://wiki.libsdl.org/SDL_RWFromFile + * http://wiki.libsdl.org/SDL_RWClose */ int rwops_testFileWrite(void) @@ -386,8 +386,8 @@ rwops_testFileWrite(void) * @brief Tests reading from file handle * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_RWFromFP - * http://wiki.libsdl.org/moin.cgi/SDL_RWClose + * http://wiki.libsdl.org/SDL_RWFromFP + * http://wiki.libsdl.org/SDL_RWClose * */ int @@ -436,8 +436,8 @@ rwops_testFPRead(void) * @brief Tests writing to file handle * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_RWFromFP - * http://wiki.libsdl.org/moin.cgi/SDL_RWClose + * http://wiki.libsdl.org/SDL_RWFromFP + * http://wiki.libsdl.org/SDL_RWClose * */ int @@ -484,8 +484,8 @@ rwops_testFPWrite(void) /** * @brief Tests alloc and free RW context. * - * \sa http://wiki.libsdl.org/moin.cgi/SDL_AllocRW - * \sa http://wiki.libsdl.org/moin.cgi/SDL_FreeRW + * \sa http://wiki.libsdl.org/SDL_AllocRW + * \sa http://wiki.libsdl.org/SDL_FreeRW */ int rwops_testAllocFree (void) @@ -511,8 +511,8 @@ rwops_testAllocFree (void) /** * @brief Compare memory and file reads * - * \sa http://wiki.libsdl.org/moin.cgi/SDL_RWFromMem - * \sa http://wiki.libsdl.org/moin.cgi/SDL_RWFromFile + * \sa http://wiki.libsdl.org/SDL_RWFromMem + * \sa http://wiki.libsdl.org/SDL_RWFromFile */ int rwops_testCompareRWFromMemWithRWFromFile(void) @@ -578,10 +578,10 @@ rwops_testCompareRWFromMemWithRWFromFile(void) * @brief Tests writing and reading from file using endian aware functions. * * \sa - * http://wiki.libsdl.org/moin.cgi/SDL_RWFromFile - * http://wiki.libsdl.org/moin.cgi/SDL_RWClose - * http://wiki.libsdl.org/moin.cgi/SDL_ReadBE16 - * http://wiki.libsdl.org/moin.cgi/SDL_WriteBE16 + * http://wiki.libsdl.org/SDL_RWFromFile + * http://wiki.libsdl.org/SDL_RWClose + * http://wiki.libsdl.org/SDL_ReadBE16 + * http://wiki.libsdl.org/SDL_WriteBE16 */ int rwops_testFileWriteReadEndian(void) diff --git a/libs/SDL2/test/testautomation_sdltest.c b/libs/SDL2/test/testautomation_sdltest.c index 979756adc..809664dc3 100644 --- a/libs/SDL2/test/testautomation_sdltest.c +++ b/libs/SDL2/test/testautomation_sdltest.c @@ -89,7 +89,6 @@ int sdltest_randomNumber(void *arg) { Sint64 result; - Uint64 uresult; double dresult; Uint64 umax; Sint64 min, max; @@ -127,7 +126,7 @@ sdltest_randomNumber(void *arg) SDLTest_AssertPass("Call to SDLTest_RandomSint32"); SDLTest_AssertCheck(result >= min && result <= max, "Verify result value, expected: [%"SDL_PRIs64",%"SDL_PRIs64"], got: %"SDL_PRIs64, min, max, result); - uresult = SDLTest_RandomUint64(); + SDLTest_RandomUint64(); SDLTest_AssertPass("Call to SDLTest_RandomUint64"); result = SDLTest_RandomSint64(); @@ -1132,7 +1131,7 @@ sdltest_randomAsciiString(void *arg) SDLTest_AssertCheck(len >= 1 && len <= 255, "Validate that result length; expected: len=[1,255], got: %d", (int) len); nonAsciiCharacters = 0; for (i=0; i= 1 && len <= targetLen, "Validate that result length; expected: len=[1,%d], got: %d", (int) targetLen, (int) len); nonAsciiCharacters = 0; for (i=0; i F */ - _setAndCheckWindowGrabState(window, SDL_FALSE); + _setAndCheckWindowMouseGrabState(window, SDL_FALSE); + _setAndCheckWindowKeyboardGrabState(window, SDL_FALSE); + SDLTest_AssertCheck(SDL_GetGrabbedWindow() == NULL, + "Expected NULL grabbed window"); /* F --> T */ - _setAndCheckWindowGrabState(window, SDL_TRUE); + _setAndCheckWindowMouseGrabState(window, SDL_TRUE); + _setAndCheckWindowKeyboardGrabState(window, SDL_TRUE); + SDLTest_AssertCheck(SDL_GetWindowGrab(window), + "SDL_GetWindowGrab() should return SDL_TRUE"); /* T --> T */ - _setAndCheckWindowGrabState(window, SDL_TRUE); + _setAndCheckWindowKeyboardGrabState(window, SDL_TRUE); + _setAndCheckWindowMouseGrabState(window, SDL_TRUE); + SDLTest_AssertCheck(SDL_GetWindowGrab(window), + "SDL_GetWindowGrab() should return SDL_TRUE"); - /* T --> F */ - _setAndCheckWindowGrabState(window, SDL_FALSE); + /* M: T --> F */ + /* K: T --> T */ + _setAndCheckWindowKeyboardGrabState(window, SDL_TRUE); + _setAndCheckWindowMouseGrabState(window, SDL_FALSE); + SDLTest_AssertCheck(SDL_GetWindowGrab(window), + "SDL_GetWindowGrab() should return SDL_TRUE"); + + /* M: F --> T */ + /* K: T --> F */ + _setAndCheckWindowMouseGrabState(window, SDL_TRUE); + _setAndCheckWindowKeyboardGrabState(window, SDL_FALSE); + SDLTest_AssertCheck(SDL_GetWindowGrab(window), + "SDL_GetWindowGrab() should return SDL_TRUE"); + + /* M: T --> F */ + /* K: F --> F */ + _setAndCheckWindowMouseGrabState(window, SDL_FALSE); + _setAndCheckWindowKeyboardGrabState(window, SDL_FALSE); + SDLTest_AssertCheck(!SDL_GetWindowGrab(window), + "SDL_GetWindowGrab() should return SDL_FALSE"); + SDLTest_AssertCheck(SDL_GetGrabbedWindow() == NULL, + "Expected NULL grabbed window"); + + /* Using the older SDL_SetWindowGrab API should only grab mouse by default */ + SDL_SetWindowGrab(window, SDL_TRUE); + SDLTest_AssertPass("Call to SDL_SetWindowGrab(SDL_TRUE)"); + SDLTest_AssertCheck(SDL_GetWindowGrab(window), + "SDL_GetWindowGrab() should return SDL_TRUE"); + SDLTest_AssertCheck(SDL_GetWindowMouseGrab(window), + "SDL_GetWindowMouseGrab() should return SDL_TRUE"); + SDLTest_AssertCheck(!SDL_GetWindowKeyboardGrab(window), + "SDL_GetWindowKeyboardGrab() should return SDL_FALSE"); + SDL_SetWindowGrab(window, SDL_FALSE); + SDLTest_AssertCheck(!SDL_GetWindowGrab(window), + "SDL_GetWindowGrab() should return SDL_FALSE"); + SDLTest_AssertCheck(!SDL_GetWindowMouseGrab(window), + "SDL_GetWindowMouseGrab() should return SDL_FALSE"); + SDLTest_AssertCheck(!SDL_GetWindowKeyboardGrab(window), + "SDL_GetWindowKeyboardGrab() should return SDL_FALSE"); + + /* Now test with SDL_HINT_GRAB_KEYBOARD set. We should get keyboard grab now. */ + SDL_SetHint(SDL_HINT_GRAB_KEYBOARD, "1"); + SDL_SetWindowGrab(window, SDL_TRUE); + SDLTest_AssertPass("Call to SDL_SetWindowGrab(SDL_TRUE)"); + SDLTest_AssertCheck(SDL_GetWindowGrab(window), + "SDL_GetWindowGrab() should return SDL_TRUE"); + SDLTest_AssertCheck(SDL_GetWindowMouseGrab(window), + "SDL_GetWindowMouseGrab() should return SDL_TRUE"); + SDLTest_AssertCheck(SDL_GetWindowKeyboardGrab(window), + "SDL_GetWindowKeyboardGrab() should return SDL_TRUE"); + SDL_SetWindowGrab(window, SDL_FALSE); + SDLTest_AssertCheck(!SDL_GetWindowGrab(window), + "SDL_GetWindowGrab() should return SDL_FALSE"); + SDLTest_AssertCheck(!SDL_GetWindowMouseGrab(window), + "SDL_GetWindowMouseGrab() should return SDL_FALSE"); + SDLTest_AssertCheck(!SDL_GetWindowKeyboardGrab(window), + "SDL_GetWindowKeyboardGrab() should return SDL_FALSE"); /* Negative tests */ - dummyState = SDL_GetWindowGrab(NULL); + SDL_GetWindowGrab(NULL); SDLTest_AssertPass("Call to SDL_GetWindowGrab(window=NULL)"); _checkInvalidWindowError(); + SDL_GetWindowKeyboardGrab(NULL); + SDLTest_AssertPass("Call to SDL_GetWindowKeyboardGrab(window=NULL)"); + _checkInvalidWindowError(); + SDL_SetWindowGrab(NULL, SDL_FALSE); SDLTest_AssertPass("Call to SDL_SetWindowGrab(window=NULL,SDL_FALSE)"); _checkInvalidWindowError(); - SDL_SetWindowGrab(NULL, SDL_TRUE); - SDLTest_AssertPass("Call to SDL_SetWindowGrab(window=NULL,SDL_FALSE)"); + SDL_SetWindowKeyboardGrab(NULL, SDL_FALSE); + SDLTest_AssertPass("Call to SDL_SetWindowKeyboardGrab(window=NULL,SDL_FALSE)"); _checkInvalidWindowError(); - /* State should still be F */ - desiredState = SDL_FALSE; - currentState = SDL_GetWindowGrab(window); - SDLTest_AssertPass("Call to SDL_GetWindowGrab()"); - SDLTest_AssertCheck( - currentState == desiredState, - "Validate returned state; expected: %s, got: %s", - (desiredState == SDL_FALSE) ? "SDL_FALSE" : "SDL_TRUE", - (currentState == SDL_FALSE) ? "SDL_FALSE" : "SDL_TRUE"); + SDL_SetWindowGrab(NULL, SDL_TRUE); + SDLTest_AssertPass("Call to SDL_SetWindowGrab(window=NULL,SDL_TRUE)"); + _checkInvalidWindowError(); + + SDL_SetWindowKeyboardGrab(NULL, SDL_TRUE); + SDLTest_AssertPass("Call to SDL_SetWindowKeyboardGrab(window=NULL,SDL_TRUE)"); + _checkInvalidWindowError(); /* Restore state */ - _setAndCheckWindowGrabState(window, originalState); + _setAndCheckWindowMouseGrabState(window, originalMouseState); + _setAndCheckWindowKeyboardGrabState(window, originalKeyboardState); /* Clean up */ _destroyVideoSuiteTestWindow(window); @@ -836,8 +964,8 @@ video_getSetWindowGrab(void *arg) /** * @brief Tests call to SDL_GetWindowID and SDL_GetWindowFromID * - * @sa http://wiki.libsdl.org/moin.fcg/SDL_GetWindowID - * @sa http://wiki.libsdl.org/moin.fcg/SDL_SetWindowFromID + * @sa http://wiki.libsdl.org/SDL_GetWindowID + * @sa http://wiki.libsdl.org/SDL_SetWindowFromID */ int video_getWindowId(void *arg) @@ -892,7 +1020,7 @@ video_getWindowId(void *arg) /** * @brief Tests call to SDL_GetWindowPixelFormat * - * @sa http://wiki.libsdl.org/moin.fcg/SDL_GetWindowPixelFormat + * @sa http://wiki.libsdl.org/SDL_GetWindowPixelFormat */ int video_getWindowPixelFormat(void *arg) @@ -926,8 +1054,8 @@ video_getWindowPixelFormat(void *arg) /** * @brief Tests call to SDL_GetWindowPosition and SDL_SetWindowPosition * - * @sa http://wiki.libsdl.org/moin.fcg/SDL_GetWindowPosition - * @sa http://wiki.libsdl.org/moin.fcg/SDL_SetWindowPosition + * @sa http://wiki.libsdl.org/SDL_GetWindowPosition + * @sa http://wiki.libsdl.org/SDL_SetWindowPosition */ int video_getSetWindowPosition(void *arg) @@ -1069,8 +1197,8 @@ void _checkInvalidParameterError() /** * @brief Tests call to SDL_GetWindowSize and SDL_SetWindowSize * - * @sa http://wiki.libsdl.org/moin.fcg/SDL_GetWindowSize - * @sa http://wiki.libsdl.org/moin.fcg/SDL_SetWindowSize + * @sa http://wiki.libsdl.org/SDL_GetWindowSize + * @sa http://wiki.libsdl.org/SDL_SetWindowSize */ int video_getSetWindowSize(void *arg) @@ -1508,8 +1636,8 @@ video_getSetWindowMaximumSize(void *arg) /** * @brief Tests call to SDL_SetWindowData and SDL_GetWindowData * - * @sa http://wiki.libsdl.org/moin.fcg/SDL_SetWindowData - * @sa http://wiki.libsdl.org/moin.fcg/SDL_GetWindowData + * @sa http://wiki.libsdl.org/SDL_SetWindowData + * @sa http://wiki.libsdl.org/SDL_GetWindowData */ int video_getSetWindowData(void *arg) diff --git a/libs/SDL2/test/testbounds.c b/libs/SDL2/test/testbounds.c index 7b8876c3c..23f981777 100644 --- a/libs/SDL2/test/testbounds.c +++ b/libs/SDL2/test/testbounds.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/test/testcustomcursor.c b/libs/SDL2/test/testcustomcursor.c index b0b7fa79b..2feee81a2 100644 --- a/libs/SDL2/test/testcustomcursor.c +++ b/libs/SDL2/test/testcustomcursor.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -128,7 +128,7 @@ init_system_cursor(const char *image[]) } } } - sscanf(image[4+row], "%d,%d", &hot_x, &hot_y); + SDL_sscanf(image[4+row], "%d,%d", &hot_x, &hot_y); return SDL_CreateCursor(data, mask, 32, 32, hot_x, hot_y); } diff --git a/libs/SDL2/test/testdisplayinfo.c b/libs/SDL2/test/testdisplayinfo.c index 90919baf7..297632c04 100644 --- a/libs/SDL2/test/testdisplayinfo.c +++ b/libs/SDL2/test/testdisplayinfo.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/test/testdraw2.c b/libs/SDL2/test/testdraw2.c index 77a0f11eb..0df5ba3ed 100644 --- a/libs/SDL2/test/testdraw2.c +++ b/libs/SDL2/test/testdraw2.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -32,6 +32,8 @@ static int cycle_direction = 1; static int current_alpha = 255; static int current_color = 255; static SDL_BlendMode blendMode = SDL_BLENDMODE_NONE; +static Uint32 next_fps_check, frames; +static const Uint32 fps_check_delay = 5000; int done; @@ -178,6 +180,7 @@ DrawRects(SDL_Renderer * renderer) void loop() { + Uint32 now; int i; SDL_Event event; @@ -203,13 +206,23 @@ loop() emscripten_cancel_main_loop(); } #endif + frames++; + now = SDL_GetTicks(); + if (SDL_TICKS_PASSED(now, next_fps_check)) { + /* Print out some timing information */ + const Uint32 then = next_fps_check - fps_check_delay; + const double fps = ((double) frames * 1000) / (now - then); + SDL_Log("%2.2f frames per second\n", fps); + next_fps_check = now + fps_check_delay; + frames = 0; + } + } int main(int argc, char *argv[]) { int i; - Uint32 then, now, frames; /* Enable standard application logging */ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO); @@ -256,7 +269,12 @@ main(int argc, char *argv[]) } } if (consumed < 0) { - static const char *options[] = { "[--blend none|blend|add|mod]", "[--cyclecolor]", "[--cyclealpha]", NULL }; + static const char *options[] = { + "[--blend none|blend|add|mod]", + "[--cyclecolor]", + "[--cyclealpha]", + "[num_objects]", + NULL }; SDLTest_CommonLogUsage(state, argv[0], options); return 1; } @@ -278,27 +296,20 @@ main(int argc, char *argv[]) /* Main render loop */ frames = 0; - then = SDL_GetTicks(); + next_fps_check = SDL_GetTicks() + fps_check_delay; done = 0; #ifdef __EMSCRIPTEN__ emscripten_set_main_loop(loop, 0, 1); #else while (!done) { - ++frames; loop(); - } + } #endif SDLTest_CommonQuit(state); - /* Print out some timing information */ - now = SDL_GetTicks(); - if (now > then) { - double fps = ((double) frames * 1000) / (now - then); - SDL_Log("%2.2f frames per second\n", fps); - } return 0; } diff --git a/libs/SDL2/test/testdrawchessboard.c b/libs/SDL2/test/testdrawchessboard.c index 78e89d2a5..f3636f389 100644 --- a/libs/SDL2/test/testdrawchessboard.c +++ b/libs/SDL2/test/testdrawchessboard.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -29,7 +29,7 @@ SDL_Surface *surface; int done; void -DrawChessBoard(SDL_Renderer * renderer) +DrawChessBoard() { int row = 0,column = 0,x = 0; SDL_Rect rect, darea; @@ -90,7 +90,7 @@ loop() } } - DrawChessBoard(renderer); + DrawChessBoard(); /* Got everything on rendering surface, now Update the drawing image on window screen */ diff --git a/libs/SDL2/test/testdropfile.c b/libs/SDL2/test/testdropfile.c index 97ab872a2..95212472a 100644 --- a/libs/SDL2/test/testdropfile.c +++ b/libs/SDL2/test/testdropfile.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/test/testerror.c b/libs/SDL2/test/testerror.c index 1f42a4fe2..e847c2824 100644 --- a/libs/SDL2/test/testerror.c +++ b/libs/SDL2/test/testerror.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/test/testevdev.c b/libs/SDL2/test/testevdev.c new file mode 100644 index 000000000..572c60a05 --- /dev/null +++ b/libs/SDL2/test/testevdev.c @@ -0,0 +1,1031 @@ +/* + Copyright (C) 1997-2022 Sam Lantinga + Copyright (C) 2020 Collabora Ltd. + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely. +*/ + +#include "../src/SDL_internal.h" + +#include +#include + +static int run_test(void); + +#if HAVE_LIBUDEV_H || defined(SDL_JOYSTICK_LINUX) + +#include + +#include "SDL_stdinc.h" +#include "SDL_endian.h" +#include "../src/core/linux/SDL_evdev_capabilities.h" +#include "../src/core/linux/SDL_evdev_capabilities.c" + +static const struct +{ + int code; + const char *name; +} device_classes[] = +{ +#define CLS(x) \ + { SDL_UDEV_DEVICE_ ## x, #x } + CLS(MOUSE), + CLS(KEYBOARD), + CLS(JOYSTICK), + CLS(SOUND), + CLS(TOUCHSCREEN), + CLS(ACCELEROMETER), +#undef CLS + { 0, NULL } +}; + +typedef struct +{ + const char *name; + uint16_t bus_type; + uint16_t vendor_id; + uint16_t product_id; + uint16_t version; + uint8_t ev[(EV_MAX + 1) / 8]; + uint8_t keys[(KEY_MAX + 1) / 8]; + uint8_t abs[(ABS_MAX + 1) / 8]; + uint8_t rel[(REL_MAX + 1) / 8]; + uint8_t ff[(FF_MAX + 1) / 8]; + uint8_t props[INPUT_PROP_MAX / 8]; + int expected; +} GuessTest; + +/* + * Test-cases for guessing a device type from its capabilities. + * + * The bytes in ev, etc. are in little-endian byte order + * Trailing zeroes can be omitted. + * + * The evemu-describe tool is a convenient way to add a test-case for + * a physically available device. + */ +#define ZEROx4 0, 0, 0, 0 +#define ZEROx8 ZEROx4, ZEROx4 +#define FFx4 0xff, 0xff, 0xff, 0xff +#define FFx8 FFx4, FFx4 + +/* Test-cases derived from real devices or from Linux kernel source */ +static const GuessTest guess_tests[] = +{ + { + .name = "Xbox 360 wired USB controller", + .bus_type = 0x0003, + .vendor_id = 0x045e, + .product_id = 0x028e, + .expected = SDL_UDEV_DEVICE_JOYSTICK, + /* SYN, KEY, ABS, FF */ + .ev = { 0x0b, 0x00, 0x20 }, + /* X, Y, Z, RX, RY, RZ, HAT0X, HAT0Y */ + .abs = { 0x3f, 0x00, 0x03 }, + .keys = { + /* 0x00-0xff */ ZEROx8, ZEROx8, ZEROx8, ZEROx8, + /* A, B, X, Y, TL, TR, SELECT, START, MODE, THUMBL, THUMBR */ + /* 0x100 */ ZEROx4, 0x00, 0x00, 0xdb, 0x7c, + }, + }, + { + .name = "X-Box One Elite", + .bus_type = 0x0003, + .vendor_id = 0x045e, + .product_id = 0x02e3, + .expected = SDL_UDEV_DEVICE_JOYSTICK, + /* SYN, KEY, ABS */ + .ev = { 0x0b }, + /* X, Y, Z, RX, RY, RZ, HAT0X, HAT0Y */ + .abs = { 0x3f, 0x00, 0x03 }, + .keys = { + /* 0x00-0xff */ ZEROx8, ZEROx8, ZEROx8, ZEROx8, + /* A, B, X, Y, TL, TR, SELECT, START, MODE, THUMBL, THUMBR */ + /* 0x100 */ ZEROx4, 0x00, 0x00, 0xdb, 0x7c, + }, + }, + { + .name = "X-Box One S via Bluetooth", + .bus_type = 0x0005, + .vendor_id = 0x045e, + .product_id = 0x02e0, + .version = 0x1130, + .expected = SDL_UDEV_DEVICE_JOYSTICK, + /* SYN, KEY, ABS */ + .ev = { 0x0b }, + /* X, Y, Z, RX, RY, RZ, HAT0X, HAT0Y */ + .abs = { 0x3f, 0x00, 0x03 }, + .keys = { + /* 0x00-0xff */ ZEROx8, ZEROx8, ZEROx8, ZEROx8, + /* A, B, X, Y, TL, TR, SELECT, START, MODE, THUMBL, THUMBR */ + /* 0x100 */ ZEROx4, 0x00, 0x00, 0xdb, 0x7c, + }, + }, + { + .name = "X-Box One S wired", + .bus_type = 0x0003, + .vendor_id = 0x045e, + .product_id = 0x02ea, + .version = 0x0301, + .expected = SDL_UDEV_DEVICE_JOYSTICK, + /* SYN, KEY, ABS */ + .ev = { 0x0b }, + /* X, Y, Z, RX, RY, RZ, HAT0X, HAT0Y */ + .abs = { 0x3f, 0x00, 0x03 }, + .keys = { + /* 0x00-0xff */ ZEROx8, ZEROx8, ZEROx8, ZEROx8, + /* A, B, X, Y, TL, TR, SELECT, START, MODE, THUMBL, THUMBR */ + /* 0x100 */ ZEROx4, 0x00, 0x00, 0xdb, 0x7c, + }, + }, + { + .name = "DualShock 4 - gamepad", + .bus_type = 0x0003, + .vendor_id = 0x054c, + .product_id = 0x09cc, + .expected = SDL_UDEV_DEVICE_JOYSTICK, + /* SYN, KEY, ABS, MSC, FF */ + /* Some versions only have 0x0b, SYN, KEY, ABS, like the + * Bluetooth example below */ + .ev = { 0x1b, 0x00, 0x20 }, + /* X, Y, Z, RX, RY, RZ, HAT0X, HAT0Y */ + .abs = { 0x3f, 0x00, 0x03 }, + .keys = { + /* 0x00-0xff */ ZEROx8, ZEROx8, ZEROx8, ZEROx8, + /* A, B, X, Y, TL, TR, TL2, TR2, SELECT, START, MODE, + * THUMBL, THUMBR */ + /* 0x100 */ ZEROx4, 0x00, 0x00, 0xdb, 0x7f, + }, + }, + { + .name = "DualShock 4 - gamepad via Bluetooth", + .bus_type = 0x0005, + .vendor_id = 0x054c, + .product_id = 0x09cc, + .expected = SDL_UDEV_DEVICE_JOYSTICK, + /* SYN, KEY, ABS */ + .ev = { 0x0b }, + /* X, Y, Z, RX, RY, RZ, HAT0X, HAT0Y */ + .abs = { 0x3f, 0x00, 0x03 }, + .keys = { + /* 0x00-0xff */ ZEROx8, ZEROx8, ZEROx8, ZEROx8, + /* A, B, X, Y, TL, TR, TL2, TR2, SELECT, START, MODE, + * THUMBL, THUMBR */ + /* 0x100 */ ZEROx4, 0x00, 0x00, 0xdb, 0x7f, + }, + }, + { + .name = "DualShock 4 - touchpad", + .bus_type = 0x0003, + .vendor_id = 0x054c, + .product_id = 0x09cc, + /* TODO: Should this be MOUSE? That's what it most closely + * resembles */ + .expected = SDL_UDEV_DEVICE_UNKNOWN, + /* SYN, KEY, ABS */ + .ev = { 0x0b }, + /* X, Y, multitouch */ + .abs = { 0x03, 0x00, 0x00, 0x00, 0x00, 0x80, 0x60, 0x02 }, + .keys = { + /* 0x00-0xff */ ZEROx8, ZEROx8, ZEROx8, ZEROx8, + /* Left mouse button */ + /* 0x100 */ 0x00, 0x00, 0x01, 0x00, ZEROx4, + /* BTN_TOOL_FINGER and some multitouch stuff */ + /* 0x140 */ 0x20, 0x24, 0x00, 0x00 + }, + /* POINTER, BUTTONPAD */ + .props = { 0x05 }, + }, + { + .name = "DualShock 4 - accelerometer", + .bus_type = 0x0003, + .vendor_id = 0x054c, + .product_id = 0x09cc, + .expected = SDL_UDEV_DEVICE_ACCELEROMETER, + /* SYN, ABS, MSC */ + .ev = { 0x19 }, + /* X, Y, Z, RX, RY, RZ */ + .abs = { 0x3f }, + /* ACCELEROMETER */ + .props = { 0x40 }, + }, + { + .name = "DualShock 4 via USB dongle", + .bus_type = 0x0003, + .vendor_id = 0x054c, + .product_id = 0x0ba0, + .version = 0x8111, + .expected = SDL_UDEV_DEVICE_JOYSTICK, + /* SYN, ABS, KEY */ + .ev = { 0x0b }, + /* X, Y, Z, RX, RY, RZ, HAT0X, HAT0Y */ + .abs = { 0x3f, 0x00, 0x03 }, + .keys = { + /* 0x00-0xff */ ZEROx8, ZEROx8, ZEROx8, ZEROx8, + /* A, B, X, Y, TL, TR, TL2, TR2, SELECT, START, MODE, + * THUMBL, THUMBR */ + /* 0x100 */ ZEROx4, 0x00, 0x00, 0xdb, 0x7f, + }, + }, + { + .name = "DualShock 3 - gamepad", + .bus_type = 0x0003, + .vendor_id = 0x054c, + .product_id = 0x0268, + .expected = SDL_UDEV_DEVICE_JOYSTICK, + /* SYN, KEY, ABS, MSC, FF */ + .ev = { 0x1b, 0x00, 0x20 }, + /* X, Y, Z, RX, RY, RZ */ + .abs = { 0x3f }, + .keys = { + /* 0x00-0xff */ ZEROx8, ZEROx8, ZEROx8, ZEROx8, + /* A, B, X, Y, TL, TR, TL2, TR2, SELECT, START, MODE, + * THUMBL, THUMBR */ + /* 0x100 */ ZEROx4, 0x00, 0x00, 0xdb, 0x7f, + /* 0x140 */ ZEROx8, + /* 0x180 */ ZEROx8, + /* 0x1c0 */ ZEROx8, + /* Digital dpad */ + /* 0x200 */ ZEROx4, 0x0f, 0x00, 0x00, 0x00, + }, + }, + { + .name = "DualShock 3 - accelerometer", + .bus_type = 0x0003, + .vendor_id = 0x054c, + .product_id = 0x0268, + .expected = SDL_UDEV_DEVICE_ACCELEROMETER, + /* SYN, ABS */ + .ev = { 0x09 }, + /* X, Y, Z */ + .abs = { 0x07 }, + /* ACCELEROMETER */ + .props = { 0x40 }, + }, + { + .name = "Steam Controller - gamepad", + .bus_type = 0x0003, + .vendor_id = 0x28de, + .product_id = 0x1142, + .expected = SDL_UDEV_DEVICE_JOYSTICK, + /* SYN, KEY, ABS */ + .ev = { 0x0b }, + /* X, Y, RX, RY, HAT0X, HAT0Y, HAT2X, HAT2Y */ + .abs = { 0x1b, 0x00, 0x33 }, + .keys = { + /* 0x00-0xff */ ZEROx8, ZEROx8, ZEROx8, ZEROx8, + /* A, B, X, Y, TL, TR, TL2, TR2, SELECT, START, MODE, + * THUMBL, THUMBR, joystick THUMB, joystick THUMB2 */ + /* 0x100 */ ZEROx4, 0x06, 0x00, 0xdb, 0x7f, + /* GEAR_DOWN, GEAR_UP */ + /* 0x140 */ 0x00, 0x00, 0x03, 0x00, ZEROx4, + /* 0x180 */ ZEROx8, + /* 0x1c0 */ ZEROx8, + /* Digital dpad */ + /* 0x200 */ ZEROx4, 0x0f, 0x00, 0x00, 0x00, + }, + }, + { + /* Present to support lizard mode, even if no Steam Controller + * is connected */ + .name = "Steam Controller - dongle", + .bus_type = 0x0003, + .vendor_id = 0x28de, + .product_id = 0x1142, + .expected = (SDL_UDEV_DEVICE_KEYBOARD + | SDL_UDEV_DEVICE_MOUSE), + /* SYN, KEY, REL, MSC, LED, REP */ + .ev = { 0x17, 0x00, 0x12 }, + /* X, Y, mouse wheel, high-res mouse wheel */ + .rel = { 0x03, 0x09 }, + .keys = { + /* 0x00 */ 0xfe, 0xff, 0xff, 0xff, FFx4, + /* 0x40 */ 0xff, 0xff, 0xcf, 0x01, 0xdf, 0xff, 0x80, 0xe0, + /* 0x80 */ ZEROx8, + /* 0xc0 */ ZEROx8, + /* 0x100 */ 0x00, 0x00, 0x1f, 0x00, ZEROx4, + }, + }, + { + .name = "Guitar Hero for PS3", + .bus_type = 0x0003, + .vendor_id = 0x12ba, + .product_id = 0x0100, + .version = 0x0110, + .expected = SDL_UDEV_DEVICE_JOYSTICK, + /* SYN, KEY, ABS */ + .ev = { 0x0b }, + /* X, Y, Z, RZ, HAT0X, HAT0Y */ + .abs = { 0x27, 0x00, 0x03 }, + .keys = { + /* 0x00-0xff */ ZEROx8, ZEROx8, ZEROx8, ZEROx8, + /* ABC, XYZ, TL, TR, TL2, TR2, SELECT, START, MODE */ + /* 0x100 */ ZEROx4, 0x00, 0x00, 0xff, 0x1f, + }, + }, + { + .name = "G27 Racing Wheel, 0003:046d:c29b v0111", + .bus_type = 0x0003, + .vendor_id = 0x046d, + .product_id = 0xc29b, + .version = 0x0111, + .expected = SDL_UDEV_DEVICE_JOYSTICK, + /* SYN, KEY, ABS */ + .ev = { 0x0b }, + /* X, Y, Z, RZ, HAT0X, HAT0Y */ + .abs = { 0x27, 0x00, 0x03 }, + .keys = { + /* 0x00-0xff */ ZEROx8, ZEROx8, ZEROx8, ZEROx8, + /* 16 buttons: TRIGGER, THUMB, THUMB2, TOP, TOP2, PINKIE, BASE, + * BASE2..BASE6, unregistered event codes 0x12c-0x12e, DEAD */ + /* 0x100 */ ZEROx4, 0xff, 0xff, 0x00, 0x00, + /* 0x140 */ ZEROx8, + /* 0x180 */ ZEROx8, + /* 0x1c0 */ ZEROx8, + /* 0x200 */ ZEROx8, + /* 0x240 */ ZEROx8, + /* 0x280 */ ZEROx8, + /* TRIGGER_HAPPY1..TRIGGER_HAPPY7 */ + /* 0x2c0 */ 0x7f, + }, + }, + { + .name = "Logitech Driving Force, 0003:046d:c294 v0100", + .bus_type = 0x0003, + .vendor_id = 0x046d, + .product_id = 0xc294, + .version = 0x0100, + .expected = SDL_UDEV_DEVICE_JOYSTICK, + /* SYN, KEY, ABS */ + .ev = { 0x0b }, + /* X, Y, RZ, HAT0X, HAT0Y */ + .abs = { 0x23, 0x00, 0x03 }, + .keys = { + /* 0x00-0xff */ ZEROx8, ZEROx8, ZEROx8, ZEROx8, + /* 12 buttons: TRIGGER, THUMB, THUMB2, TOP, TOP2, PINKIE, BASE, + * BASE2..BASE6 */ + /* 0x100 */ ZEROx4, 0xff, 0x0f, 0x00, 0x00, + }, + }, + { + .name = "Logitech Dual Action", + .bus_type = 0x0003, + .vendor_id = 0x046d, + .product_id = 0xc216, + .version = 0x0110, + /* Logitech RumblePad 2 USB, 0003:046d:c218 v0110, is the same + * except for having force feedback, which we don't use in our + * heuristic */ + /* Jess Tech GGE909 PC Recoil Pad, 0003:0f30:010b v0110, is the same */ + /* 8BitDo SNES30, 0003:2dc8:ab20 v0110, is the same */ + .expected = SDL_UDEV_DEVICE_JOYSTICK, + /* SYN, KEY, ABS */ + .ev = { 0x0b }, + /* X, Y, Z, RZ, HAT0X, HAT0Y */ + .abs = { 0x27, 0x00, 0x03 }, + .keys = { + /* 0x00-0xff */ ZEROx8, ZEROx8, ZEROx8, ZEROx8, + /* 12 buttons: TRIGGER, THUMB, THUMB2, TOP, TOP2, PINKIE, BASE, + * BASE2..BASE6 */ + /* 0x100 */ ZEROx4, 0xff, 0x0f, 0x00, 0x00, + }, + }, + { + .name = "Saitek ST290 Pro flight stick", + .bus_type = 0x0003, + .vendor_id = 0x06a3, + .product_id = 0x0160, /* 0x0460 seems to be the same */ + .version = 0x0100, + .expected = SDL_UDEV_DEVICE_JOYSTICK, + /* SYN, KEY, ABS, MSC */ + .ev = { 0x1b }, + /* X, Y, Z, RZ, HAT0X, HAT0Y */ + .abs = { 0x27, 0x00, 0x03 }, + .keys = { + /* 0x00-0xff */ ZEROx8, ZEROx8, ZEROx8, ZEROx8, + /* TRIGGER, THUMB, THUMB2, TOP, TOP2, PINKIE */ + /* 0x100 */ ZEROx4, 0x3f, 0x00, 0x00, 0x00, + }, + }, + { + .name = "Saitek X52 Pro Flight Control System", + .bus_type = 0x0003, + .vendor_id = 0x06a3, + .product_id = 0x0762, + .version = 0x0111, + .expected = SDL_UDEV_DEVICE_JOYSTICK, + .ev = { 0x0b }, + /* XYZ, RXYZ, throttle, hat0, MISC, unregistered event code 0x29 */ + .abs = { 0x7f, 0x00, 0x03, 0x00, 0x00, 0x03 }, + .keys = { + /* 0x00-0xff */ ZEROx8, ZEROx8, ZEROx8, ZEROx8, + /* 16 buttons: TRIGGER, THUMB, THUMB2, TOP, TOP2, PINKIE, BASE, + * BASE2..BASE6, unregistered event codes 0x12c-0x12e, DEAD */ + /* 0x100 */ ZEROx4, 0xff, 0xff, 0x00, 0x00, + /* 0x140 */ ZEROx8, + /* 0x180 */ ZEROx8, + /* 0x1c0 */ ZEROx8, + /* 0x200 */ ZEROx8, + /* 0x240 */ ZEROx8, + /* 0x280 */ ZEROx8, + /* TRIGGER_HAPPY1..TRIGGER_HAPPY23 */ + /* 0x2c0 */ 0xff, 0xff, 0x7f, + }, + }, + { + .name = "Logitech Extreme 3D", + .bus_type = 0x0003, + .vendor_id = 0x046d, + .product_id = 0xc215, + .version = 0x0110, + .expected = SDL_UDEV_DEVICE_JOYSTICK, + /* SYN, KEY, ABS, MSC */ + .ev = { 0x0b }, + /* X, Y, RZ, throttle, hat 0 */ + .abs = { 0x63, 0x00, 0x03 }, + .keys = { + /* 0x00-0xff */ ZEROx8, ZEROx8, ZEROx8, ZEROx8, + /* 12 buttons: TRIGGER, THUMB, THUMB2, TOP, TOP2, PINKIE, BASE, + * BASE2..BASE6 */ + /* 0x100 */ ZEROx4, 0xff, 0x0f, 0x00, 0x00, + }, + }, + { + .name = "Hori Real Arcade Pro VX-SA", + .bus_type = 0x0003, + .vendor_id = 0x24c6, + .product_id = 0x5501, + .version = 0x0533, + .expected = SDL_UDEV_DEVICE_JOYSTICK, + /* SYN, KEY, ABS */ + .ev = { 0x0b }, + /* X, Y, Z, RX, RY, RZ, hat 0 */ + .abs = { 0x3f, 0x00, 0x03 }, + .keys = { + /* 0x00-0xff */ ZEROx8, ZEROx8, ZEROx8, ZEROx8, + /* A, B, X, Y, TL, TR, SELECT, START, MODE, THUMBL, THUMBR */ + /* 0x100 */ ZEROx4, 0x00, 0x00, 0xdb, 0x7c, + }, + }, + { + .name = "Switch Pro Controller via Bluetooth", + .bus_type = 0x0005, + .vendor_id = 0x057e, + .product_id = 0x2009, + .version = 0x0001, + .expected = SDL_UDEV_DEVICE_JOYSTICK, + /* SYN, KEY, ABS */ + .ev = { 0x0b }, + /* X, Y, RX, RY, hat 0 */ + .abs = { 0x1b, 0x00, 0x03 }, + .keys = { + /* 0x00-0xff */ ZEROx8, ZEROx8, ZEROx8, ZEROx8, + /* 16 buttons: TRIGGER, THUMB, THUMB2, TOP, TOP2, PINKIE, BASE, + * BASE2..BASE6, unregistered event codes 0x12c-0x12e, DEAD */ + /* 0x100 */ ZEROx4, 0xff, 0xff, 0x00, 0x00, + /* 0x140 */ ZEROx8, + /* 0x180 */ ZEROx8, + /* 0x1c0 */ ZEROx8, + /* 0x200 */ ZEROx8, + /* 0x240 */ ZEROx8, + /* 0x280 */ ZEROx8, + /* TRIGGER_HAPPY1..TRIGGER_HAPPY2 */ + /* 0x2c0 */ 0x03, + }, + }, + { + .name = "Switch Pro Controller via USB", + .bus_type = 0x0003, + .vendor_id = 0x057e, + .product_id = 0x2009, + .version = 0x0111, + .expected = SDL_UDEV_DEVICE_JOYSTICK, + /* SYN, KEY, ABS */ + .ev = { 0x0b }, + /* X, Y, Z, RZ, HAT0X, HAT0Y */ + .abs = { 0x27, 0x00, 0x03 }, + .keys = { + /* 0x00-0xff */ ZEROx8, ZEROx8, ZEROx8, ZEROx8, + }, + }, + { + .name = "Thrustmaster Racing Wheel FFB", + /* Mad Catz FightStick TE S+ PS4, 0003:0738:8384:0111 v0111 + * (aka Street Fighter V Arcade FightStick TES+) + * is functionally the same */ + .bus_type = 0x0003, + .vendor_id = 0x044f, + .product_id = 0xb66d, + .version = 0x0110, + .expected = SDL_UDEV_DEVICE_JOYSTICK, + .ev = { 0x0b }, + /* XYZ, RXYZ, hat 0 */ + .abs = { 0x3f, 0x00, 0x03 }, + .keys = { + /* 0x00-0xff */ ZEROx8, ZEROx8, ZEROx8, ZEROx8, + /* ABC, XYZ, TL, TR, TL2, TR2, SELECT, START, MODE, + * THUMBL */ + /* 0x100 */ ZEROx4, 0x00, 0x00, 0xff, 0x3f, + }, + }, + { + .name = "Thrustmaster T.Flight Hotas X", + .bus_type = 0x0003, + .vendor_id = 0x044f, + .product_id = 0xb108, + .version = 0x0100, + .expected = SDL_UDEV_DEVICE_JOYSTICK, + .ev = { 0x0b }, + /* XYZ, RZ, throttle, hat 0 */ + .abs = { 0x67, 0x00, 0x03 }, + .keys = { + /* 0x00-0xff */ ZEROx8, ZEROx8, ZEROx8, ZEROx8, + /* trigger, thumb, thumb2, top, top2, pinkie, base, + * base2..base6 */ + /* 0x100 */ ZEROx4, 0xff, 0x0f + }, + }, + { + .name = "8BitDo N30 Pro 2", + .bus_type = 0x0003, + .vendor_id = 0x2dc8, + .product_id = 0x9015, + .version = 0x0111, + /* 8BitDo NES30 Pro, 0003:2dc8:9001 v0111, is the same */ + .expected = SDL_UDEV_DEVICE_JOYSTICK, + .ev = { 0x0b }, + /* XYZ, RZ, gas, brake, hat0 */ + .abs = { 0x27, 0x06, 0x03 }, + .keys = { + /* 0x00-0xff */ ZEROx8, ZEROx8, ZEROx8, ZEROx8, + /* ABC, XYZ, TL, TR, TL2, TR2, select, start, mode, thumbl, + * thumbr */ + /* 0x100 */ ZEROx4, 0x00, 0x00, 0xff, 0x7f, + }, + }, + { + .name = "Retro Power SNES-style controller, 0003:0079:0011 v0110", + .bus_type = 0x0003, + .vendor_id = 0x0079, + .product_id = 0x0011, + .version = 0x0110, + .expected = SDL_UDEV_DEVICE_JOYSTICK, + .ev = { 0x0b }, + /* X, Y */ + .abs = { 0x03 }, + .keys = { + /* 0x00-0xff */ ZEROx8, ZEROx8, ZEROx8, ZEROx8, + /* trigger, thumb, thumb2, top, top2, pinkie, base, + * base2..base4 */ + /* 0x100 */ ZEROx4, 0xff, 0x03, 0x00, 0x00, + }, + }, + { + .name = "Wiimote - buttons", + .bus_type = 0x0005, + .vendor_id = 0x057e, + .product_id = 0x0306, + .version = 0x8600, + /* This one is a bit weird because some of the buttons are mapped + * to the arrow, page up and page down keys, so it's a joystick + * with a subset of a keyboard attached. */ + /* TODO: Should this be JOYSTICK, or even JOYSTICK|KEYBOARD? */ + .expected = SDL_UDEV_DEVICE_UNKNOWN, + /* SYN, KEY */ + .ev = { 0x03 }, + .keys = { + /* 0x00 */ ZEROx8, + /* left, right, up down */ + /* 0x40 */ ZEROx4, 0x80, 0x16, 0x00, 0x00, + /* 0x80 */ ZEROx8, + /* 0xc0 */ ZEROx8, + /* BTN_1, BTN_2, BTN_A, BTN_B, BTN_MODE */ + /* 0x100 */ 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x10, + /* 0x140 */ ZEROx8, + /* next, previous */ + /* 0x180 */ 0x00, 0x00, 0x80, 0x10, ZEROx4, + }, + }, + { + .name = "Wiimote - Motion Plus or accelerometer", + .bus_type = 0x0005, + .vendor_id = 0x057e, + .product_id = 0x0306, + .version = 0x8600, + .expected = SDL_UDEV_DEVICE_ACCELEROMETER, + /* SYN, ABS */ + .ev = { 0x09 }, + /* RX, RY, RZ */ + .abs = { 0x38 }, + }, + { + .name = "Wiimote - IR positioning", + .bus_type = 0x0005, + .vendor_id = 0x057e, + .product_id = 0x0306, + .version = 0x8600, + .expected = SDL_UDEV_DEVICE_UNKNOWN, + /* SYN, ABS */ + .ev = { 0x09 }, + /* HAT0 to HAT3 */ + .abs = { 0x00, 0x1f }, + }, + { + .name = "Wiimote - Nunchuck", + .bus_type = 0x0005, + .vendor_id = 0x057e, + .product_id = 0x0306, + .version = 0x8600, + /* TODO: Should this be JOYSTICK? It has one stick and two buttons */ + .expected = SDL_UDEV_DEVICE_UNKNOWN, + /* SYN, KEY, ABS */ + .ev = { 0x0b }, + /* RX, RY, RZ, hat 0 */ + .abs = { 0x38, 0x00, 0x03 }, + .keys = { + /* 0x00-0xff */ ZEROx8, ZEROx8, ZEROx8, ZEROx8, + /* C and Z buttons */ + /* 0x100 */ ZEROx4, 0x00, 0x00, 0x24, 0x00, + }, + }, + { + /* Flags guessed from kernel source code */ + .name = "Wiimote - Classic Controller", + /* TODO: Should this be JOYSTICK, or maybe JOYSTICK|KEYBOARD? + * It's unusual in the same ways as the Wiimote */ + .expected = SDL_UDEV_DEVICE_UNKNOWN, + /* SYN, KEY, ABS */ + .ev = { 0x0b }, + /* Hat 1-3 */ + .abs = { 0x00, 0x1c }, + .keys = { + /* 0x00 */ ZEROx8, + /* left, right, up down */ + /* 0x40 */ ZEROx4, 0x80, 0x16, 0x00, 0x00, + /* 0x80 */ ZEROx8, + /* 0xc0 */ ZEROx8, + /* A, B, X, Y, MODE, TL, TL2, TR, TR2 */ + /* 0x100 */ ZEROx4, 0x00, 0x13, 0xdb, 0x10, + /* 0x140 */ ZEROx8, + /* next, previous */ + /* 0x180 */ 0x00, 0x00, 0x80, 0x10, ZEROx4, + }, + }, + { + /* Flags guessed from kernel source code */ + .name = "Wiimote - Balance Board", + /* TODO: Should this be JOYSTICK? */ + .expected = SDL_UDEV_DEVICE_UNKNOWN, + /* SYN, KEY, ABS */ + .ev = { 0x0b }, + /* Hat 0-1 */ + .abs = { 0x00, 0x0f }, + .keys = { + /* 0x00-0xff */ ZEROx8, ZEROx8, ZEROx8, ZEROx8, + /* A */ + /* 0x100 */ ZEROx4, 0x00, 0x00, 0x01, 0x00, + }, + }, + { + /* Flags guessed from kernel source code */ + .name = "Wiimote - Wii U Pro Controller", + .expected = SDL_UDEV_DEVICE_JOYSTICK, + /* SYN, KEY, ABS */ + .ev = { 0x0b }, + /* X, Y, RX, RY */ + .abs = { 0x1b }, + .keys = { + /* 0x00-0xff */ ZEROx8, ZEROx8, ZEROx8, ZEROx8, + /* A, B, X, Y, TL, TR, TL2, TR2, SELECT, START, MODE, + * THUMBL, THUMBR */ + /* 0x100 */ ZEROx4, 0x00, 0x00, 0xdb, 0x7f, + /* 0x140 */ ZEROx8, + /* 0x180 */ ZEROx8, + /* 0x1c0 */ ZEROx8, + /* Digital dpad */ + /* 0x200 */ ZEROx4, 0x0f, 0x00, 0x00, 0x00, + }, + }, + { + .name = "Synaptics TM3381-002 (Thinkpad X280 trackpad)", + .bus_type = 0x001d, /* BUS_RMI */ + .vendor_id = 0x06cb, + .product_id = 0x0000, + .version = 0x0000, + /* TODO: Should this be MOUSE? That's what it most closely + * resembles */ + .expected = SDL_UDEV_DEVICE_UNKNOWN, + /* SYN, KEY, ABS */ + .ev = { 0x0b }, + /* X, Y, pressure, multitouch */ + .abs = { 0x03, 0x00, 0x00, 0x01, 0x00, 0x80, 0xf3, 0x06 }, + .keys = { + /* 0x00-0xff */ ZEROx8, ZEROx8, ZEROx8, ZEROx8, + /* Left mouse button */ + /* 0x100 */ 0x00, 0x00, 0x01, 0x00, ZEROx4, + /* BTN_TOOL_FINGER and some multitouch gestures */ + /* 0x140 */ 0x20, 0xe5 + }, + /* POINTER, BUTTONPAD */ + .props = { 0x05 }, + }, + { + .name = "TPPS/2 Elan TrackPoint (Thinkpad X280)", + .bus_type = 0x0011, /* BUS_I8042 */ + .vendor_id = 0x0002, + .product_id = 0x000a, + .version = 0x0000, + .expected = SDL_UDEV_DEVICE_MOUSE, + /* SYN, KEY, REL */ + .ev = { 0x07 }, + /* X, Y */ + .rel = { 0x03 }, + .keys = { + /* 0x00-0xff */ ZEROx8, ZEROx8, ZEROx8, ZEROx8, + /* Left, middle, right mouse buttons */ + /* 0x100 */ 0x00, 0x00, 0x07, + }, + /* POINTER, POINTING_STICK */ + .props = { 0x21 }, + }, + { + .name = "Thinkpad ACPI buttons", + .expected = SDL_UDEV_DEVICE_UNKNOWN, + /* SYN, KEY, MSC, SW */ + .ev = { 0x33 }, + .keys = { + /* 0x00 */ ZEROx8, + /* 0x40 */ ZEROx4, 0x00, 0x00, 0x0e, 0x01, + /* 0x80 */ 0x00, 0x50, 0x11, 0x51, 0x00, 0x28, 0x00, 0xc0, + /* 0xc0 */ 0x04, 0x20, 0x10, 0x02, 0x1b, 0x70, 0x01, 0x00, + /* 0x100 */ ZEROx8, + /* 0x140 */ ZEROx4, 0x00, 0x00, 0x50, 0x00, + /* 0x180 */ ZEROx8, + /* 0x1c0 */ 0x00, 0x00, 0x04, 0x18, ZEROx4, + /* 0x200 */ ZEROx8, + /* 0x240 */ 0x40, 0x00, 0x01, 0x00, ZEROx4, + }, + }, + { + .name = "PC speaker", + .bus_type = 0x0010, /* BUS_ISA */ + .vendor_id = 0x001f, + .product_id = 0x0001, + .version = 0x0100, + .expected = SDL_UDEV_DEVICE_UNKNOWN, + /* SYN, SND */ + .ev = { 0x01, 0x00, 0x04 }, + }, + { + .name = "ALSA headphone detection, etc.", + .bus_type = 0x0000, + .vendor_id = 0x0000, + .product_id = 0x0000, + .version = 0x0000, + .expected = SDL_UDEV_DEVICE_UNKNOWN, + /* SYN, SW */ + .ev = { 0x21 }, + }, + { + /* Assumed to be a reasonably typical i8042 (PC AT) keyboard */ + .name = "Thinkpad T520 and X280 keyboards", + .bus_type = 0x0011, /* BUS_I8042 */ + .vendor_id = 0x0001, + .product_id = 0x0001, + .version = 0xab54, + .expected = SDL_UDEV_DEVICE_KEYBOARD, + /* SYN, KEY, MSC, LED, REP */ + .ev = { 0x13, 0x00, 0x12 }, + .keys = { + /* 0x00 */ 0xfe, 0xff, 0xff, 0xff, FFx4, + /* 0x40 */ 0xff, 0xff, 0xef, 0xff, 0xdf, 0xff, 0xff, 0xfe, + /* 0x80 */ 0x01, 0xd0, 0x00, 0xf8, 0x78, 0x30, 0x80, 0x03, + /* 0xc0 */ 0x00, 0x00, 0x00, 0x02, 0x04, 0x00, 0x00, 0x00, + }, + }, + { + .name = "Thinkpad X280 sleep button", + .bus_type = 0x0019, /* BUS_HOST */ + .vendor_id = 0x0000, + .product_id = 0x0003, + .version = 0x0000, + .expected = SDL_UDEV_DEVICE_UNKNOWN, + /* SYN, KEY */ + .ev = { 0x03 }, + .keys = { + /* 0x00 */ ZEROx8, + /* 0x40 */ ZEROx8, + /* KEY_SLEEP */ + /* 0x80 */ 0x00, 0x40, + }, + }, + { + .name = "Thinkpad X280 lid switch", + .bus_type = 0x0019, /* BUS_HOST */ + .vendor_id = 0x0000, + .product_id = 0x0005, + .version = 0x0000, + .expected = SDL_UDEV_DEVICE_UNKNOWN, + /* SYN, SW */ + .ev = { 0x21 }, + }, + { + .name = "Thinkpad X280 power button", + .bus_type = 0x0019, /* BUS_HOST */ + .vendor_id = 0x0000, + .product_id = 0x0001, + .version = 0x0000, + .expected = SDL_UDEV_DEVICE_UNKNOWN, + /* SYN, KEY */ + .ev = { 0x03 }, + .keys = { + /* 0x00 */ ZEROx8, + /* KEY_POWER */ + /* 0x40 */ ZEROx4, 0x00, 0x00, 0x10, 0x00, + }, + }, + { + .name = "Thinkpad X280 video bus", + .bus_type = 0x0019, /* BUS_HOST */ + .vendor_id = 0x0000, + .product_id = 0x0006, + .version = 0x0000, + .expected = SDL_UDEV_DEVICE_UNKNOWN, + /* SYN, KEY */ + .ev = { 0x03 }, + .keys = { + /* 0x00 */ ZEROx8, + /* 0x40 */ ZEROx8, + /* 0x80 */ ZEROx8, + /* brightness control, video mode, display off */ + /* 0xc0 */ ZEROx4, 0x0b, 0x00, 0x3e, 0x00, + }, + }, + { + .name = "Thinkpad X280 extra buttons", + .bus_type = 0x0019, /* BUS_HOST */ + .vendor_id = 0x17aa, + .product_id = 0x5054, + .version = 0x4101, + .expected = SDL_UDEV_DEVICE_UNKNOWN, + /* SYN, KEY */ + .ev = { 0x03 }, + .keys = { + /* 0x00 */ ZEROx8, + /* 0x40 */ ZEROx4, 0x00, 0x00, 0x0e, 0x01, + /* 0x80 */ 0x00, 0x50, 0x11, 0x51, 0x00, 0x28, 0x00, 0xc0, + /* 0xc0 */ 0x04, 0x20, 0x10, 0x02, 0x1b, 0x70, 0x01, 0x00, + /* 0x100 */ ZEROx8, + /* 0x140 */ ZEROx4, 0x00, 0x00, 0x50, 0x00, + /* 0x180 */ ZEROx8, + /* 0x1c0 */ 0x00, 0x00, 0x04, 0x18, ZEROx4, + /* 0x200 */ ZEROx8, + /* 0x240 */ 0x40, 0x00, 0x01, 0x00, ZEROx4, + }, + }, + { + .name = "Thinkpad USB keyboard with Trackpoint - keyboard", + .bus_type = 0x0003, + .vendor_id = 0x17ef, + .product_id = 0x6009, + .expected = SDL_UDEV_DEVICE_KEYBOARD, + /* SYN, KEY, MSC, LED, REP */ + .ev = { 0x13, 0x00, 0x12 }, + .keys = { + /* 0x00 */ 0xfe, 0xff, 0xff, 0xff, FFx4, + /* 0x40 */ 0xff, 0xff, 0xef, 0xff, 0xdf, 0xff, 0xbe, 0xfe, + /* 0x80 */ 0xff, 0x57, 0x40, 0xc1, 0x7a, 0x20, 0x9f, 0xff, + /* 0xc0 */ 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, + }, + }, + { + .name = "Thinkpad USB keyboard with Trackpoint - Trackpoint", + .bus_type = 0x0003, + .vendor_id = 0x17ef, + .product_id = 0x6009, + /* For some reason the special keys like mute and wlan toggle + * show up here instead of, or in addition to, as part of + * the keyboard - so udev reports this as having keys too. + * SDL currently doesn't. */ + .expected = SDL_UDEV_DEVICE_MOUSE, + /* SYN, KEY, REL, MSC, LED */ + .ev = { 0x17, 0x00, 0x02 }, + /* X, Y */ + .rel = { 0x03 }, + .keys = { + /* 0x00 */ ZEROx8, + /* 0x40 */ ZEROx4, 0x00, 0x00, 0x1e, 0x00, + /* 0x80 */ 0x00, 0xcc, 0x11, 0x01, 0x78, 0x40, 0x00, 0xc0, + /* 0xc0 */ 0x00, 0x20, 0x10, 0x00, 0x0b, 0x50, 0x00, 0x00, + /* Mouse buttons: left, right, middle, "task" */ + /* 0x100 */ 0x00, 0x00, 0x87, 0x68, ZEROx4, + /* 0x140 */ ZEROx4, 0x00, 0x00, 0x10, 0x00, + /* 0x180 */ ZEROx4, 0x00, 0x00, 0x40, 0x00, + }, + }, + { + .name = "No information", + .expected = SDL_UDEV_DEVICE_UNKNOWN, + } +}; + +#if ULONG_MAX == 0xFFFFFFFFUL +# define SwapLongLE(X) SDL_SwapLE32(X) +#else + /* assume 64-bit */ +# define SwapLongLE(X) SDL_SwapLE64(X) +#endif + +static int +run_test(void) +{ + int success = 1; + size_t i; + + for (i = 0; i < SDL_arraysize(guess_tests); i++) { + const GuessTest *t = &guess_tests[i]; + size_t j; + int actual; + struct { + unsigned long ev[NBITS(EV_MAX)]; + unsigned long abs[NBITS(ABS_MAX)]; + unsigned long keys[NBITS(KEY_MAX)]; + unsigned long rel[NBITS(REL_MAX)]; + } caps = {}; + + printf("%s...\n", t->name); + + memset(&caps, '\0', sizeof(caps)); + memcpy(caps.ev, t->ev, sizeof(t->ev)); + memcpy(caps.keys, t->keys, sizeof(t->keys)); + memcpy(caps.abs, t->abs, sizeof(t->abs)); + memcpy(caps.rel, t->rel, sizeof(t->rel)); + + for (j = 0; j < SDL_arraysize(caps.ev); j++) { + caps.ev[j] = SwapLongLE(caps.ev[j]); + } + + for (j = 0; j < SDL_arraysize(caps.keys); j++) { + caps.keys[j] = SwapLongLE(caps.keys[j]); + } + + for (j = 0; j < SDL_arraysize(caps.abs); j++) { + caps.abs[j] = SwapLongLE(caps.abs[j]); + } + + for (j = 0; j < SDL_arraysize(caps.rel); j++) { + caps.rel[j] = SwapLongLE(caps.rel[j]); + } + + actual = SDL_EVDEV_GuessDeviceClass(caps.ev, caps.abs, caps.keys, + caps.rel); + + if (actual == t->expected) { + printf("\tOK\n"); + } + else { + printf("\tExpected 0x%08x\n", t->expected); + + for (j = 0; device_classes[j].code != 0; j++) { + if (t->expected & device_classes[j].code) { + printf("\t\t%s\n", device_classes[j].name); + } + } + + printf("\tGot 0x%08x\n", actual); + + for (j = 0; device_classes[j].code != 0; j++) { + if (actual & device_classes[j].code) { + printf("\t\t%s\n", device_classes[j].name); + } + } + + success = 0; + } + } + + return success; +} + +#else /* !(HAVE_LIBUDEV_H || defined(SDL_JOYSTICK_LINUX)) */ + +static int +run_test(void) +{ + printf("SDL compiled without evdev capability check.\n"); + return 0; +} + +#endif + +int +main(int argc, char *argv[]) +{ + return run_test() ? 0 : 1; +} diff --git a/libs/SDL2/test/testfile.c b/libs/SDL2/test/testfile.c index 85ff8091c..25a309201 100644 --- a/libs/SDL2/test/testfile.c +++ b/libs/SDL2/test/testfile.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/test/testfilesystem.c b/libs/SDL2/test/testfilesystem.c index cc26f34d1..9862608d5 100644 --- a/libs/SDL2/test/testfilesystem.c +++ b/libs/SDL2/test/testfilesystem.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -32,28 +32,28 @@ main(int argc, char *argv[]) if(base_path == NULL){ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't find base path: %s\n", SDL_GetError()); - return 1; + } else { + SDL_Log("base path: '%s'\n", base_path); + SDL_free(base_path); } - SDL_Log("base path: '%s'\n", base_path); - SDL_free(base_path); pref_path = SDL_GetPrefPath("libsdl", "testfilesystem"); if(pref_path == NULL){ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't find pref path: %s\n", SDL_GetError()); - return 1; + } else { + SDL_Log("pref path: '%s'\n", pref_path); + SDL_free(pref_path); } - SDL_Log("pref path: '%s'\n", pref_path); - SDL_free(pref_path); pref_path = SDL_GetPrefPath(NULL, "testfilesystem"); if(pref_path == NULL){ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't find pref path without organization: %s\n", SDL_GetError()); - return 1; + } else { + SDL_Log("pref path: '%s'\n", pref_path); + SDL_free(pref_path); } - SDL_Log("pref path: '%s'\n", pref_path); - SDL_free(pref_path); SDL_Quit(); return 0; diff --git a/libs/SDL2/test/testgamecontroller.c b/libs/SDL2/test/testgamecontroller.c index 4d3c93937..077a6abd3 100644 --- a/libs/SDL2/test/testgamecontroller.c +++ b/libs/SDL2/test/testgamecontroller.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -24,47 +24,197 @@ #ifndef SDL_JOYSTICK_DISABLED -#ifdef __IPHONEOS__ -#define SCREEN_WIDTH 480 -#define SCREEN_HEIGHT 320 -#else #define SCREEN_WIDTH 512 #define SCREEN_HEIGHT 320 -#endif /* This is indexed by SDL_GameControllerButton. */ static const struct { int x; int y; } button_positions[] = { - {387, 167}, /* A */ - {431, 132}, /* B */ - {342, 132}, /* X */ - {389, 101}, /* Y */ - {174, 132}, /* BACK */ - {233, 132}, /* GUIDE */ - {289, 132}, /* START */ - {75, 154}, /* LEFTSTICK */ - {305, 230}, /* RIGHTSTICK */ - {77, 40}, /* LEFTSHOULDER */ - {396, 36}, /* RIGHTSHOULDER */ - {154, 188}, /* DPAD_UP */ - {154, 249}, /* DPAD_DOWN */ - {116, 217}, /* DPAD_LEFT */ - {186, 217}, /* DPAD_RIGHT */ + {387, 167}, /* SDL_CONTROLLER_BUTTON_A */ + {431, 132}, /* SDL_CONTROLLER_BUTTON_B */ + {342, 132}, /* SDL_CONTROLLER_BUTTON_X */ + {389, 101}, /* SDL_CONTROLLER_BUTTON_Y */ + {174, 132}, /* SDL_CONTROLLER_BUTTON_BACK */ + {232, 128}, /* SDL_CONTROLLER_BUTTON_GUIDE */ + {289, 132}, /* SDL_CONTROLLER_BUTTON_START */ + {75, 154}, /* SDL_CONTROLLER_BUTTON_LEFTSTICK */ + {305, 230}, /* SDL_CONTROLLER_BUTTON_RIGHTSTICK */ + {77, 40}, /* SDL_CONTROLLER_BUTTON_LEFTSHOULDER */ + {396, 36}, /* SDL_CONTROLLER_BUTTON_RIGHTSHOULDER */ + {154, 188}, /* SDL_CONTROLLER_BUTTON_DPAD_UP */ + {154, 249}, /* SDL_CONTROLLER_BUTTON_DPAD_DOWN */ + {116, 217}, /* SDL_CONTROLLER_BUTTON_DPAD_LEFT */ + {186, 217}, /* SDL_CONTROLLER_BUTTON_DPAD_RIGHT */ + {232, 174}, /* SDL_CONTROLLER_BUTTON_MISC1 */ + {132, 135}, /* SDL_CONTROLLER_BUTTON_PADDLE1 */ + {330, 135}, /* SDL_CONTROLLER_BUTTON_PADDLE2 */ + {132, 175}, /* SDL_CONTROLLER_BUTTON_PADDLE3 */ + {330, 175}, /* SDL_CONTROLLER_BUTTON_PADDLE4 */ }; /* This is indexed by SDL_GameControllerAxis. */ static const struct { int x; int y; double angle; } axis_positions[] = { {74, 153, 270.0}, /* LEFTX */ - {74, 153, 0.0}, /* LEFTY */ + {74, 153, 0.0}, /* LEFTY */ {306, 231, 270.0}, /* RIGHTX */ - {306, 231, 0.0}, /* RIGHTY */ - {91, -20, 0.0}, /* TRIGGERLEFT */ - {375, -20, 0.0}, /* TRIGGERRIGHT */ + {306, 231, 0.0}, /* RIGHTY */ + {91, -20, 0.0}, /* TRIGGERLEFT */ + {375, -20, 0.0}, /* TRIGGERRIGHT */ }; -SDL_Renderer *screen = NULL; -SDL_bool retval = SDL_FALSE; -SDL_bool done = SDL_FALSE; -SDL_Texture *background, *button, *axis; +static SDL_Window *window = NULL; +static SDL_Renderer *screen = NULL; +static SDL_bool retval = SDL_FALSE; +static SDL_bool done = SDL_FALSE; +static SDL_bool set_LED = SDL_FALSE; +static int trigger_effect = 0; +static SDL_Texture *background_front, *background_back, *button, *axis; +static SDL_GameController *gamecontroller; +static SDL_GameController **gamecontrollers; +static int num_controllers = 0; + +static void UpdateWindowTitle() +{ + if (!window) { + return; + } + + if (gamecontroller) { + const char *name = SDL_GameControllerName(gamecontroller); + const char *serial = SDL_GameControllerGetSerial(gamecontroller); + const char *basetitle = "Game Controller Test: "; + const size_t titlelen = SDL_strlen(basetitle) + SDL_strlen(name) + (serial ? 3 + SDL_strlen(serial) : 0) + 1; + char *title = (char *)SDL_malloc(titlelen); + + retval = SDL_FALSE; + done = SDL_FALSE; + + if (title) { + SDL_snprintf(title, titlelen, "%s%s", basetitle, name); + if (serial) { + SDL_strlcat(title, " (", titlelen); + SDL_strlcat(title, serial, titlelen); + SDL_strlcat(title, ")", titlelen); + } + SDL_SetWindowTitle(window, title); + SDL_free(title); + } + } else { + SDL_SetWindowTitle(window, "Waiting for controller..."); + } +} + +static int FindController(SDL_JoystickID controller_id) +{ + int i; + + for (i = 0; i < num_controllers; ++i) { + if (controller_id == SDL_JoystickInstanceID(SDL_GameControllerGetJoystick(gamecontrollers[i]))) { + return i; + } + } + return -1; +} + +static void AddController(int device_index, SDL_bool verbose) +{ + SDL_JoystickID controller_id = SDL_JoystickGetDeviceInstanceID(device_index); + SDL_GameController *controller; + SDL_GameController **controllers; + + controller_id = SDL_JoystickGetDeviceInstanceID(device_index); + if (controller_id < 0) { + SDL_Log("Couldn't get controller ID: %s\n", SDL_GetError()); + return; + } + + if (FindController(controller_id) >= 0) { + /* We already have this controller */ + return; + } + + controller = SDL_GameControllerOpen(device_index); + if (!controller) { + SDL_Log("Couldn't open controller: %s\n", SDL_GetError()); + return; + } + + controllers = (SDL_GameController **)SDL_realloc(gamecontrollers, (num_controllers + 1) * sizeof(*controllers)); + if (!controllers) { + SDL_GameControllerClose(controller); + return; + } + + controllers[num_controllers++] = controller; + gamecontrollers = controllers; + gamecontroller = controller; + trigger_effect = 0; + + if (verbose) { + const char *name = SDL_GameControllerName(gamecontroller); + SDL_Log("Opened game controller %s\n", name); + } + + if (SDL_GameControllerHasSensor(gamecontroller, SDL_SENSOR_ACCEL)) { + if (verbose) { + SDL_Log("Enabling accelerometer at %.2f Hz\n", SDL_GameControllerGetSensorDataRate(gamecontroller, SDL_SENSOR_ACCEL)); + } + SDL_GameControllerSetSensorEnabled(gamecontroller, SDL_SENSOR_ACCEL, SDL_TRUE); + } + + if (SDL_GameControllerHasSensor(gamecontroller, SDL_SENSOR_GYRO)) { + if (verbose) { + SDL_Log("Enabling gyro at %.2f Hz\n", SDL_GameControllerGetSensorDataRate(gamecontroller, SDL_SENSOR_GYRO)); + } + SDL_GameControllerSetSensorEnabled(gamecontroller, SDL_SENSOR_GYRO, SDL_TRUE); + } + + if (SDL_GameControllerHasRumble(gamecontroller)) { + SDL_Log("Rumble supported"); + } + + if (SDL_GameControllerHasRumbleTriggers(gamecontroller)) { + SDL_Log("Trigger rumble supported"); + } + + UpdateWindowTitle(); +} + +static void SetController(SDL_JoystickID controller) +{ + int i = FindController(controller); + + if (i < 0) { + return; + } + + if (gamecontroller != gamecontrollers[i]) { + gamecontroller = gamecontrollers[i]; + UpdateWindowTitle(); + } +} + +static void DelController(SDL_JoystickID controller) +{ + int i = FindController(controller); + + if (i < 0) { + return; + } + + SDL_GameControllerClose(gamecontrollers[i]); + + --num_controllers; + if (i < num_controllers) { + SDL_memcpy(&gamecontrollers[i], &gamecontrollers[i+1], (num_controllers - i) * sizeof(*gamecontrollers)); + } + + if (num_controllers > 0) { + gamecontroller = gamecontrollers[0]; + } else { + gamecontroller = NULL; + } + UpdateWindowTitle(); +} static SDL_Texture * LoadTexture(SDL_Renderer *renderer, const char *file, SDL_bool transparent) @@ -94,37 +244,157 @@ LoadTexture(SDL_Renderer *renderer, const char *file, SDL_bool transparent) return texture; } +static Uint16 ConvertAxisToRumble(Sint16 axisval) +{ + /* Only start rumbling if the axis is past the halfway point */ + const Sint16 half_axis = (Sint16)SDL_ceil(SDL_JOYSTICK_AXIS_MAX / 2.0f); + if (axisval > half_axis) { + return (Uint16)(axisval - half_axis) * 4; + } else { + return 0; + } +} + +/* PS5 trigger effect documentation: + https://controllers.fandom.com/wiki/Sony_DualSense#FFB_Trigger_Modes +*/ +typedef struct +{ + Uint8 ucEnableBits1; /* 0 */ + Uint8 ucEnableBits2; /* 1 */ + Uint8 ucRumbleRight; /* 2 */ + Uint8 ucRumbleLeft; /* 3 */ + Uint8 ucHeadphoneVolume; /* 4 */ + Uint8 ucSpeakerVolume; /* 5 */ + Uint8 ucMicrophoneVolume; /* 6 */ + Uint8 ucAudioEnableBits; /* 7 */ + Uint8 ucMicLightMode; /* 8 */ + Uint8 ucAudioMuteBits; /* 9 */ + Uint8 rgucRightTriggerEffect[11]; /* 10 */ + Uint8 rgucLeftTriggerEffect[11]; /* 21 */ + Uint8 rgucUnknown1[6]; /* 32 */ + Uint8 ucLedFlags; /* 38 */ + Uint8 rgucUnknown2[2]; /* 39 */ + Uint8 ucLedAnim; /* 41 */ + Uint8 ucLedBrightness; /* 42 */ + Uint8 ucPadLights; /* 43 */ + Uint8 ucLedRed; /* 44 */ + Uint8 ucLedGreen; /* 45 */ + Uint8 ucLedBlue; /* 46 */ +} DS5EffectsState_t; + +static void CyclePS5TriggerEffect() +{ + DS5EffectsState_t state; + + Uint8 effects[3][11] = + { + /* Clear trigger effect */ + { 0x05, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + /* Constant resistance across entire trigger pull */ + { 0x01, 0, 110, 0, 0, 0, 0, 0, 0, 0, 0 }, + /* Resistance and vibration when trigger is pulled */ + { 0x06, 15, 63, 128, 0, 0, 0, 0, 0, 0, 0 }, + }; + + trigger_effect = (trigger_effect + 1) % SDL_arraysize(effects); + + SDL_zero(state); + state.ucEnableBits1 |= (0x04 | 0x08); /* Modify right and left trigger effect respectively */ + SDL_memcpy(state.rgucRightTriggerEffect, effects[trigger_effect], sizeof(effects[trigger_effect])); + SDL_memcpy(state.rgucLeftTriggerEffect, effects[trigger_effect], sizeof(effects[trigger_effect])); + SDL_GameControllerSendEffect(gamecontroller, &state, sizeof(state)); +} + void loop(void *arg) { SDL_Event event; int i; - SDL_GameController *gamecontroller = (SDL_GameController *)arg; + SDL_bool showing_front = SDL_TRUE; - /* blank screen, set up for drawing this frame. */ - SDL_SetRenderDrawColor(screen, 0xFF, 0xFF, 0xFF, SDL_ALPHA_OPAQUE); - SDL_RenderClear(screen); - SDL_RenderCopy(screen, background, NULL, NULL); + /* Update to get the current event state */ + SDL_PumpEvents(); - while (SDL_PollEvent(&event)) { + /* Process all currently pending events */ + while (SDL_PeepEvents(&event, 1, SDL_GETEVENT, SDL_FIRSTEVENT, SDL_LASTEVENT) == 1) { switch (event.type) { - case SDL_CONTROLLERAXISMOTION: - SDL_Log("Controller axis %s changed to %d\n", SDL_GameControllerGetStringForAxis((SDL_GameControllerAxis)event.caxis.axis), event.caxis.value); + case SDL_CONTROLLERDEVICEADDED: + SDL_Log("Game controller device %d added.\n", (int) SDL_JoystickGetDeviceInstanceID(event.cdevice.which)); + AddController(event.cdevice.which, SDL_TRUE); break; + + case SDL_CONTROLLERDEVICEREMOVED: + SDL_Log("Game controller device %d removed.\n", (int) event.cdevice.which); + DelController(event.cdevice.which); + break; + + case SDL_CONTROLLERTOUCHPADDOWN: + case SDL_CONTROLLERTOUCHPADMOTION: + case SDL_CONTROLLERTOUCHPADUP: + SDL_Log("Controller %d touchpad %d finger %d %s %.2f, %.2f, %.2f\n", + event.ctouchpad.which, + event.ctouchpad.touchpad, + event.ctouchpad.finger, + (event.type == SDL_CONTROLLERTOUCHPADDOWN ? "pressed at" : + (event.type == SDL_CONTROLLERTOUCHPADUP ? "released at" : + "moved to")), + event.ctouchpad.x, + event.ctouchpad.y, + event.ctouchpad.pressure); + break; + +#define VERBOSE_SENSORS +#ifdef VERBOSE_SENSORS + case SDL_CONTROLLERSENSORUPDATE: + SDL_Log("Controller %d sensor %s: %.2f, %.2f, %.2f\n", + event.csensor.which, + event.csensor.sensor == SDL_SENSOR_ACCEL ? "accelerometer" : + event.csensor.sensor == SDL_SENSOR_GYRO ? "gyro" : "unknown", + event.csensor.data[0], + event.csensor.data[1], + event.csensor.data[2]); + break; +#endif /* VERBOSE_SENSORS */ + +#define VERBOSE_AXES +#ifdef VERBOSE_AXES + case SDL_CONTROLLERAXISMOTION: + if (event.caxis.value <= (-SDL_JOYSTICK_AXIS_MAX / 2) || event.caxis.value >= (SDL_JOYSTICK_AXIS_MAX / 2)) { + SetController(event.caxis.which); + } + SDL_Log("Controller %d axis %s changed to %d\n", event.caxis.which, SDL_GameControllerGetStringForAxis((SDL_GameControllerAxis)event.caxis.axis), event.caxis.value); + break; +#endif /* VERBOSE_AXES */ + case SDL_CONTROLLERBUTTONDOWN: case SDL_CONTROLLERBUTTONUP: - SDL_Log("Controller button %s %s\n", SDL_GameControllerGetStringForButton((SDL_GameControllerButton)event.cbutton.button), event.cbutton.state ? "pressed" : "released"); - /* First button triggers a 0.5 second full strength rumble */ + if (event.type == SDL_CONTROLLERBUTTONDOWN) { + SetController(event.cbutton.which); + } + SDL_Log("Controller %d button %s %s\n", event.cbutton.which, SDL_GameControllerGetStringForButton((SDL_GameControllerButton)event.cbutton.button), event.cbutton.state ? "pressed" : "released"); + + /* Cycle PS5 trigger effects when the microphone button is pressed */ if (event.type == SDL_CONTROLLERBUTTONDOWN && - event.cbutton.button == SDL_CONTROLLER_BUTTON_A) { - SDL_GameControllerRumble(gamecontroller, 0xFFFF, 0xFFFF, 500); + event.cbutton.button == SDL_CONTROLLER_BUTTON_MISC1 && + SDL_GameControllerGetType(gamecontroller) == SDL_CONTROLLER_TYPE_PS5) { + CyclePS5TriggerEffect(); } break; + case SDL_KEYDOWN: + if (event.key.keysym.sym >= SDLK_0 && event.key.keysym.sym <= SDLK_9) { + if (gamecontroller) { + int player_index = (event.key.keysym.sym - SDLK_0); + + SDL_GameControllerSetPlayerIndex(gamecontroller, player_index); + } + break; + } if (event.key.keysym.sym != SDLK_ESCAPE) { break; } - /* Fall through to signal quit */ + SDL_FALLTHROUGH; case SDL_QUIT: done = SDL_TRUE; break; @@ -133,35 +403,113 @@ loop(void *arg) } } - /* Update visual controller state */ - for (i = 0; i < SDL_CONTROLLER_BUTTON_MAX; ++i) { - if (SDL_GameControllerGetButton(gamecontroller, (SDL_GameControllerButton)i) == SDL_PRESSED) { - const SDL_Rect dst = { button_positions[i].x, button_positions[i].y, 50, 50 }; - SDL_RenderCopyEx(screen, button, NULL, &dst, 0, NULL, SDL_FLIP_NONE); + if (gamecontroller) { + /* Show the back of the controller if the paddles are being held */ + for (i = SDL_CONTROLLER_BUTTON_PADDLE1; i <= SDL_CONTROLLER_BUTTON_PADDLE4; ++i) { + if (SDL_GameControllerGetButton(gamecontroller, (SDL_GameControllerButton)i) == SDL_PRESSED) { + showing_front = SDL_FALSE; + break; + } } } - for (i = 0; i < SDL_CONTROLLER_AXIS_MAX; ++i) { - const Sint16 deadzone = 8000; /* !!! FIXME: real deadzone */ - const Sint16 value = SDL_GameControllerGetAxis(gamecontroller, (SDL_GameControllerAxis)(i)); - if (value < -deadzone) { - const SDL_Rect dst = { axis_positions[i].x, axis_positions[i].y, 50, 50 }; - const double angle = axis_positions[i].angle; - SDL_RenderCopyEx(screen, axis, NULL, &dst, angle, NULL, SDL_FLIP_NONE); - } else if (value > deadzone) { - const SDL_Rect dst = { axis_positions[i].x, axis_positions[i].y, 50, 50 }; - const double angle = axis_positions[i].angle + 180.0; - SDL_RenderCopyEx(screen, axis, NULL, &dst, angle, NULL, SDL_FLIP_NONE); + /* blank screen, set up for drawing this frame. */ + SDL_SetRenderDrawColor(screen, 0xFF, 0xFF, 0xFF, SDL_ALPHA_OPAQUE); + SDL_RenderClear(screen); + SDL_RenderCopy(screen, showing_front ? background_front : background_back, NULL, NULL); + + if (gamecontroller) { + /* Update visual controller state */ + for (i = 0; i < SDL_CONTROLLER_BUTTON_TOUCHPAD; ++i) { + if (SDL_GameControllerGetButton(gamecontroller, (SDL_GameControllerButton)i) == SDL_PRESSED) { + SDL_bool on_front = (i < SDL_CONTROLLER_BUTTON_PADDLE1 || i > SDL_CONTROLLER_BUTTON_PADDLE4); + if (on_front == showing_front) { + SDL_Rect dst; + dst.x = button_positions[i].x; + dst.y = button_positions[i].y; + dst.w = 50; + dst.h = 50; + SDL_RenderCopyEx(screen, button, NULL, &dst, 0, NULL, SDL_FLIP_NONE); + } + } + } + + if (showing_front) { + for (i = 0; i < SDL_CONTROLLER_AXIS_MAX; ++i) { + const Sint16 deadzone = 8000; /* !!! FIXME: real deadzone */ + const Sint16 value = SDL_GameControllerGetAxis(gamecontroller, (SDL_GameControllerAxis)(i)); + if (value < -deadzone) { + const double angle = axis_positions[i].angle; + SDL_Rect dst; + dst.x = axis_positions[i].x; + dst.y = axis_positions[i].y; + dst.w = 50; + dst.h = 50; + SDL_RenderCopyEx(screen, axis, NULL, &dst, angle, NULL, SDL_FLIP_NONE); + } else if (value > deadzone) { + const double angle = axis_positions[i].angle + 180.0; + SDL_Rect dst; + dst.x = axis_positions[i].x; + dst.y = axis_positions[i].y; + dst.w = 50; + dst.h = 50; + SDL_RenderCopyEx(screen, axis, NULL, &dst, angle, NULL, SDL_FLIP_NONE); + } + } + } + + /* Update LED based on left thumbstick position */ + { + Sint16 x = SDL_GameControllerGetAxis(gamecontroller, SDL_CONTROLLER_AXIS_LEFTX); + Sint16 y = SDL_GameControllerGetAxis(gamecontroller, SDL_CONTROLLER_AXIS_LEFTY); + + if (!set_LED) { + set_LED = (x < -8000 || x > 8000 || y > 8000); + } + if (set_LED) { + Uint8 r, g, b; + + if (x < 0) { + r = (Uint8)(((int)(~x) * 255) / 32767); + b = 0; + } else { + r = 0; + b = (Uint8)(((int)(x) * 255) / 32767); + } + if (y > 0) { + g = (Uint8)(((int)(y) * 255) / 32767); + } else { + g = 0; + } + + SDL_GameControllerSetLED(gamecontroller, r, g, b); + } + } + + if (trigger_effect == 0) { + /* Update rumble based on trigger state */ + { + Sint16 left = SDL_GameControllerGetAxis(gamecontroller, SDL_CONTROLLER_AXIS_TRIGGERLEFT); + Sint16 right = SDL_GameControllerGetAxis(gamecontroller, SDL_CONTROLLER_AXIS_TRIGGERRIGHT); + Uint16 low_frequency_rumble = ConvertAxisToRumble(left); + Uint16 high_frequency_rumble = ConvertAxisToRumble(right); + SDL_GameControllerRumble(gamecontroller, low_frequency_rumble, high_frequency_rumble, 250); + } + + /* Update trigger rumble based on thumbstick state */ + { + Sint16 left = SDL_GameControllerGetAxis(gamecontroller, SDL_CONTROLLER_AXIS_LEFTY); + Sint16 right = SDL_GameControllerGetAxis(gamecontroller, SDL_CONTROLLER_AXIS_RIGHTY); + Uint16 left_rumble = ConvertAxisToRumble(~left); + Uint16 right_rumble = ConvertAxisToRumble(~right); + + SDL_GameControllerRumbleTriggers(gamecontroller, left_rumble, right_rumble, 250); + } } } SDL_RenderPresent(screen); - if (!SDL_GameControllerGetAttached(gamecontroller)) { - done = SDL_TRUE; - retval = SDL_TRUE; /* keep going, wait for reattach. */ - } - #ifdef __EMSCRIPTEN__ if (done) { emscripten_cancel_main_loop(); @@ -169,92 +517,20 @@ loop(void *arg) #endif } -SDL_bool -WatchGameController(SDL_GameController * gamecontroller) -{ - const char *name = SDL_GameControllerName(gamecontroller); - const char *basetitle = "Game Controller Test: "; - const size_t titlelen = SDL_strlen(basetitle) + SDL_strlen(name) + 1; - char *title = (char *)SDL_malloc(titlelen); - SDL_Window *window = NULL; - - retval = SDL_FALSE; - done = SDL_FALSE; - - if (title) { - SDL_snprintf(title, titlelen, "%s%s", basetitle, name); - } - - /* Create a window to display controller state */ - window = SDL_CreateWindow(title, SDL_WINDOWPOS_CENTERED, - SDL_WINDOWPOS_CENTERED, SCREEN_WIDTH, - SCREEN_HEIGHT, 0); - SDL_free(title); - title = NULL; - if (window == NULL) { - SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create window: %s\n", SDL_GetError()); - return SDL_FALSE; - } - - screen = SDL_CreateRenderer(window, -1, 0); - if (screen == NULL) { - SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create renderer: %s\n", SDL_GetError()); - SDL_DestroyWindow(window); - return SDL_FALSE; - } - - SDL_SetRenderDrawColor(screen, 0x00, 0x00, 0x00, SDL_ALPHA_OPAQUE); - SDL_RenderClear(screen); - SDL_RenderPresent(screen); - SDL_RaiseWindow(window); - - /* scale for platforms that don't give you the window size you asked for. */ - SDL_RenderSetLogicalSize(screen, SCREEN_WIDTH, SCREEN_HEIGHT); - - background = LoadTexture(screen, "controllermap.bmp", SDL_FALSE); - button = LoadTexture(screen, "button.bmp", SDL_TRUE); - axis = LoadTexture(screen, "axis.bmp", SDL_TRUE); - - if (!background || !button || !axis) { - SDL_DestroyRenderer(screen); - SDL_DestroyWindow(window); - return SDL_FALSE; - } - SDL_SetTextureColorMod(button, 10, 255, 21); - SDL_SetTextureColorMod(axis, 10, 255, 21); - - /* !!! FIXME: */ - /*SDL_RenderSetLogicalSize(screen, background->w, background->h);*/ - - /* Print info about the controller we are watching */ - SDL_Log("Watching controller %s\n", name ? name : "Unknown Controller"); - - /* Loop, getting controller events! */ -#ifdef __EMSCRIPTEN__ - emscripten_set_main_loop_arg(loop, gamecontroller, 0, 1); -#else - while (!done) { - loop(gamecontroller); - } -#endif - - SDL_DestroyRenderer(screen); - screen = NULL; - background = NULL; - button = NULL; - axis = NULL; - SDL_DestroyWindow(window); - return retval; -} - int main(int argc, char *argv[]) { int i; - int nController = 0; - int retcode = 0; + int controller_count = 0; + int controller_index = 0; char guid[64]; - SDL_GameController *gamecontroller; + + SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, "0"); + SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_JOY_CONS, "1"); + SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS4_RUMBLE, "1"); + SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS5_RUMBLE, "1"); + SDL_SetHint(SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS, "1"); + SDL_SetHint(SDL_HINT_LINUX_JOYSTICK_DEADZONES, "1"); /* Enable standard application logging */ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO); @@ -264,11 +540,11 @@ main(int argc, char *argv[]) SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't initialize SDL: %s\n", SDL_GetError()); return 1; } - + SDL_GameControllerAddMappingsFromFile("gamecontrollerdb.txt"); /* Print information about the mappings */ - if (!argv[1]) { + if (argv[1] && SDL_strcmp(argv[1], "--mappings") == 0) { SDL_Log("Supported mappings:\n"); for (i = 0; i < SDL_GameControllerNumMappings(); ++i) { char *mapping = SDL_GameControllerMappingForIndex(i); @@ -288,77 +564,121 @@ main(int argc, char *argv[]) SDL_JoystickGetGUIDString(SDL_JoystickGetDeviceGUID(i), guid, sizeof (guid)); - if ( SDL_IsGameController(i) ) - { - nController++; + if (SDL_IsGameController(i)) { + controller_count++; name = SDL_GameControllerNameForIndex(i); - description = "Controller"; + switch (SDL_GameControllerTypeForIndex(i)) { + case SDL_CONTROLLER_TYPE_AMAZON_LUNA: + description = "Amazon Luna Controller"; + break; + case SDL_CONTROLLER_TYPE_GOOGLE_STADIA: + description = "Google Stadia Controller"; + break; + case SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_PRO: + description = "Nintendo Switch Pro Controller"; + break; + case SDL_CONTROLLER_TYPE_PS3: + description = "PS3 Controller"; + break; + case SDL_CONTROLLER_TYPE_PS4: + description = "PS4 Controller"; + break; + case SDL_CONTROLLER_TYPE_PS5: + description = "PS5 Controller"; + break; + case SDL_CONTROLLER_TYPE_XBOX360: + description = "XBox 360 Controller"; + break; + case SDL_CONTROLLER_TYPE_XBOXONE: + description = "XBox One Controller"; + break; + case SDL_CONTROLLER_TYPE_VIRTUAL: + description = "Virtual Game Controller"; + break; + default: + description = "Game Controller"; + break; + } + AddController(i, SDL_FALSE); } else { name = SDL_JoystickNameForIndex(i); description = "Joystick"; } - SDL_Log("%s %d: %s (guid %s, VID 0x%.4x, PID 0x%.4x)\n", + SDL_Log("%s %d: %s (guid %s, VID 0x%.4x, PID 0x%.4x, player index = %d)\n", description, i, name ? name : "Unknown", guid, - SDL_JoystickGetDeviceVendor(i), SDL_JoystickGetDeviceProduct(i)); + SDL_JoystickGetDeviceVendor(i), SDL_JoystickGetDeviceProduct(i), SDL_JoystickGetDevicePlayerIndex(i)); } - SDL_Log("There are %d game controller(s) attached (%d joystick(s))\n", nController, SDL_NumJoysticks()); + SDL_Log("There are %d game controller(s) attached (%d joystick(s))\n", controller_count, SDL_NumJoysticks()); - if (argv[1]) { - SDL_bool reportederror = SDL_FALSE; - SDL_bool keepGoing = SDL_TRUE; - SDL_Event event; - int device = atoi(argv[1]); - if (device >= SDL_NumJoysticks()) { - SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "%i is an invalid joystick index.\n", device); - retcode = 1; - } else { - SDL_JoystickGetGUIDString(SDL_JoystickGetDeviceGUID(device), - guid, sizeof (guid)); - SDL_Log("Attempting to open device %i, guid %s\n", device, guid); - gamecontroller = SDL_GameControllerOpen(device); - - if (gamecontroller != NULL) { - SDL_assert(SDL_GameControllerFromInstanceID(SDL_JoystickInstanceID(SDL_GameControllerGetJoystick(gamecontroller))) == gamecontroller); - } - - while (keepGoing) { - if (gamecontroller == NULL) { - if (!reportederror) { - SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't open gamecontroller %d: %s\n", device, SDL_GetError()); - retcode = 1; - keepGoing = SDL_FALSE; - reportederror = SDL_TRUE; - } - } else { - reportederror = SDL_FALSE; - keepGoing = WatchGameController(gamecontroller); - SDL_GameControllerClose(gamecontroller); - } - - gamecontroller = NULL; - if (keepGoing) { - SDL_Log("Waiting for attach\n"); - } - while (keepGoing) { - SDL_WaitEvent(&event); - if ((event.type == SDL_QUIT) || (event.type == SDL_FINGERDOWN) - || (event.type == SDL_MOUSEBUTTONDOWN)) { - keepGoing = SDL_FALSE; - } else if (event.type == SDL_CONTROLLERDEVICEADDED) { - gamecontroller = SDL_GameControllerOpen(event.cdevice.which); - if (gamecontroller != NULL) { - SDL_assert(SDL_GameControllerFromInstanceID(SDL_JoystickInstanceID(SDL_GameControllerGetJoystick(gamecontroller))) == gamecontroller); - } - break; - } - } - } - } + /* Create a window to display controller state */ + window = SDL_CreateWindow("Game Controller Test", SDL_WINDOWPOS_CENTERED, + SDL_WINDOWPOS_CENTERED, SCREEN_WIDTH, + SCREEN_HEIGHT, 0); + if (window == NULL) { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create window: %s\n", SDL_GetError()); + return 2; } + screen = SDL_CreateRenderer(window, -1, 0); + if (screen == NULL) { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create renderer: %s\n", SDL_GetError()); + SDL_DestroyWindow(window); + return 2; + } + + SDL_SetRenderDrawColor(screen, 0x00, 0x00, 0x00, SDL_ALPHA_OPAQUE); + SDL_RenderClear(screen); + SDL_RenderPresent(screen); + + /* scale for platforms that don't give you the window size you asked for. */ + SDL_RenderSetLogicalSize(screen, SCREEN_WIDTH, SCREEN_HEIGHT); + + background_front = LoadTexture(screen, "controllermap.bmp", SDL_FALSE); + background_back = LoadTexture(screen, "controllermap_back.bmp", SDL_FALSE); + button = LoadTexture(screen, "button.bmp", SDL_TRUE); + axis = LoadTexture(screen, "axis.bmp", SDL_TRUE); + + if (!background_front || !background_back || !button || !axis) { + SDL_DestroyRenderer(screen); + SDL_DestroyWindow(window); + return 2; + } + SDL_SetTextureColorMod(button, 10, 255, 21); + SDL_SetTextureColorMod(axis, 10, 255, 21); + + /* !!! FIXME: */ + /*SDL_RenderSetLogicalSize(screen, background->w, background->h);*/ + + if (argv[1] && *argv[1] != '-') { + controller_index = SDL_atoi(argv[1]); + } + if (controller_index < num_controllers) { + gamecontroller = gamecontrollers[controller_index]; + } else { + gamecontroller = NULL; + } + UpdateWindowTitle(); + + /* Loop, getting controller events! */ +#ifdef __EMSCRIPTEN__ + emscripten_set_main_loop_arg(loop, NULL, 0, 1); +#else + while (!done) { + loop(NULL); + } +#endif + + /* Reset trigger state */ + if (trigger_effect != 0) { + trigger_effect = -1; + CyclePS5TriggerEffect(); + } + + SDL_DestroyRenderer(screen); + SDL_DestroyWindow(window); SDL_QuitSubSystem(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER); - return retcode; + return 0; } #else @@ -367,7 +687,7 @@ int main(int argc, char *argv[]) { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL compiled without Joystick support.\n"); - exit(1); + return 1; } #endif diff --git a/libs/SDL2/test/testgeometry.c b/libs/SDL2/test/testgeometry.c new file mode 100644 index 000000000..3a87e3d2e --- /dev/null +++ b/libs/SDL2/test/testgeometry.c @@ -0,0 +1,303 @@ +/* + Copyright (C) 1997-2022 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely. +*/ + +/* Simple program: draw a RGB triangle, with texture */ + +#include +#include +#include + +#ifdef __EMSCRIPTEN__ +#include +#endif + +#include "SDL_test_common.h" + +static SDLTest_CommonState *state; +static SDL_bool use_texture = SDL_FALSE; +static SDL_Texture **sprites; +static SDL_BlendMode blendMode = SDL_BLENDMODE_NONE; +static double angle = 0.0; +static int sprite_w, sprite_h; + +int done; + +/* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */ +static void +quit(int rc) +{ + SDL_free(sprites); + SDLTest_CommonQuit(state); + exit(rc); +} + +int +LoadSprite(const char *file) +{ + int i; + SDL_Surface *temp; + + /* Load the sprite image */ + temp = SDL_LoadBMP(file); + if (temp == NULL) { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't load %s: %s", file, SDL_GetError()); + return (-1); + } + sprite_w = temp->w; + sprite_h = temp->h; + + /* Set transparent pixel as the pixel at (0,0) */ + if (temp->format->palette) { + SDL_SetColorKey(temp, 1, *(Uint8 *) temp->pixels); + } else { + switch (temp->format->BitsPerPixel) { + case 15: + SDL_SetColorKey(temp, 1, (*(Uint16 *) temp->pixels) & 0x00007FFF); + break; + case 16: + SDL_SetColorKey(temp, 1, *(Uint16 *) temp->pixels); + break; + case 24: + SDL_SetColorKey(temp, 1, (*(Uint32 *) temp->pixels) & 0x00FFFFFF); + break; + case 32: + SDL_SetColorKey(temp, 1, *(Uint32 *) temp->pixels); + break; + } + } + + /* Create textures from the image */ + for (i = 0; i < state->num_windows; ++i) { + SDL_Renderer *renderer = state->renderers[i]; + sprites[i] = SDL_CreateTextureFromSurface(renderer, temp); + if (!sprites[i]) { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create texture: %s\n", SDL_GetError()); + SDL_FreeSurface(temp); + return (-1); + } + if (SDL_SetTextureBlendMode(sprites[i], blendMode) < 0) { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't set blend mode: %s\n", SDL_GetError()); + SDL_FreeSurface(temp); + SDL_DestroyTexture(sprites[i]); + return (-1); + } + } + SDL_FreeSurface(temp); + + /* We're ready to roll. :) */ + return (0); +} + + +void +loop() +{ + int i; + SDL_Event event; + + /* Check for events */ + while (SDL_PollEvent(&event)) { + + if (event.type == SDL_MOUSEMOTION) { + if (event.motion.state) { + int xrel, yrel; + int window_w, window_h; + SDL_Window *window = SDL_GetWindowFromID(event.motion.windowID); + SDL_GetWindowSize(window, &window_w, &window_h); + xrel = event.motion.xrel; + yrel = event.motion.yrel; + if (event.motion.y < window_h / 2) { + angle += xrel; + } else { + angle -= xrel; + } + if (event.motion.x < window_w / 2) { + angle -= yrel; + } else { + angle += yrel; + } + } + } else { + SDLTest_CommonEvent(state, &event, &done); + } + } + + for (i = 0; i < state->num_windows; ++i) { + SDL_Renderer *renderer = state->renderers[i]; + if (state->windows[i] == NULL) + continue; + SDL_SetRenderDrawColor(renderer, 0xA0, 0xA0, 0xA0, 0xFF); + SDL_RenderClear(renderer); + + { + SDL_Rect viewport; + SDL_Vertex verts[3]; + double a; + double d; + int cx, cy; + + /* Query the sizes */ + SDL_RenderGetViewport(renderer, &viewport); + SDL_zeroa(verts); + cx = viewport.x + viewport.w / 2; + cy = viewport.y + viewport.h / 2; + d = (viewport.w + viewport.h) / 5; + + a = (angle * 3.1415) / 180.0; + verts[0].position.x = cx + d * SDL_cos(a); + verts[0].position.y = cy + d * SDL_sin(a); + verts[0].color.r = 0xFF; + verts[0].color.g = 0; + verts[0].color.b = 0; + verts[0].color.a = 0xFF; + + a = ((angle + 120) * 3.1415) / 180.0; + verts[1].position.x = cx + d * SDL_cos(a); + verts[1].position.y = cy + d * SDL_sin(a); + verts[1].color.r = 0; + verts[1].color.g = 0xFF; + verts[1].color.b = 0; + verts[1].color.a = 0xFF; + + a = ((angle + 240) * 3.1415) / 180.0; + verts[2].position.x = cx + d * SDL_cos(a); + verts[2].position.y = cy + d * SDL_sin(a); + verts[2].color.r = 0; + verts[2].color.g = 0; + verts[2].color.b = 0xFF; + verts[2].color.a = 0xFF; + + if (use_texture) { + verts[0].tex_coord.x = 0.5; + verts[0].tex_coord.y = 0.0; + verts[1].tex_coord.x = 1.0; + verts[1].tex_coord.y = 1.0; + verts[2].tex_coord.x = 0.0; + verts[2].tex_coord.y = 1.0; + } + + SDL_RenderGeometry(renderer, sprites[i], verts, 3, NULL, 0); + } + + SDL_RenderPresent(renderer); + } +#ifdef __EMSCRIPTEN__ + if (done) { + emscripten_cancel_main_loop(); + } +#endif +} + +int +main(int argc, char *argv[]) +{ + int i; + const char *icon = "icon.bmp"; + Uint32 then, now, frames; + + /* Enable standard application logging */ + SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO); + + /* Initialize test framework */ + state = SDLTest_CommonCreateState(argv, SDL_INIT_VIDEO); + if (!state) { + return 1; + } + for (i = 1; i < argc;) { + int consumed; + + consumed = SDLTest_CommonArg(state, i); + if (consumed == 0) { + consumed = -1; + if (SDL_strcasecmp(argv[i], "--blend") == 0) { + if (argv[i + 1]) { + if (SDL_strcasecmp(argv[i + 1], "none") == 0) { + blendMode = SDL_BLENDMODE_NONE; + consumed = 2; + } else if (SDL_strcasecmp(argv[i + 1], "blend") == 0) { + blendMode = SDL_BLENDMODE_BLEND; + consumed = 2; + } else if (SDL_strcasecmp(argv[i + 1], "add") == 0) { + blendMode = SDL_BLENDMODE_ADD; + consumed = 2; + } else if (SDL_strcasecmp(argv[i + 1], "mod") == 0) { + blendMode = SDL_BLENDMODE_MOD; + consumed = 2; + } + } + } else if (SDL_strcasecmp(argv[i], "--use-texture") == 0) { + use_texture = SDL_TRUE; + consumed = 1; + } + } + if (consumed < 0) { + static const char *options[] = { "[--blend none|blend|add|mod]", "[--use-texture]", NULL }; + SDLTest_CommonLogUsage(state, argv[0], options); + return 1; + } + i += consumed; + } + if (!SDLTest_CommonInit(state)) { + return 2; + } + + /* Create the windows, initialize the renderers, and load the textures */ + sprites = + (SDL_Texture **) SDL_malloc(state->num_windows * sizeof(*sprites)); + if (!sprites) { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Out of memory!\n"); + quit(2); + } + /* Create the windows and initialize the renderers */ + for (i = 0; i < state->num_windows; ++i) { + SDL_Renderer *renderer = state->renderers[i]; + SDL_SetRenderDrawBlendMode(renderer, blendMode); + SDL_SetRenderDrawColor(renderer, 0xA0, 0xA0, 0xA0, 0xFF); + SDL_RenderClear(renderer); + sprites[i] = NULL; + } + if (use_texture) { + if (LoadSprite(icon) < 0) { + quit(2); + } + } + + + srand((unsigned int)time(NULL)); + + /* Main render loop */ + frames = 0; + then = SDL_GetTicks(); + done = 0; + +#ifdef __EMSCRIPTEN__ + emscripten_set_main_loop(loop, 0, 1); +#else + while (!done) { + ++frames; + loop(); + } +#endif + + /* Print out some timing information */ + now = SDL_GetTicks(); + if (now > then) { + double fps = ((double) frames * 1000) / (now - then); + SDL_Log("%2.2f frames per second\n", fps); + } + + quit(0); + + return 0; +} + +/* vi: set ts=4 sw=4 expandtab: */ diff --git a/libs/SDL2/test/testgesture.c b/libs/SDL2/test/testgesture.c index a41604a6f..b4bce6965 100644 --- a/libs/SDL2/test/testgesture.c +++ b/libs/SDL2/test/testgesture.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -90,6 +90,7 @@ setpix(SDL_Surface *screen, float _x, float _y, unsigned int col) *pixmem32 = colour; } +#if 0 /* unused */ static void drawLine(SDL_Surface *screen, float x0, float y0, float x1, float y1, unsigned int col) { @@ -98,6 +99,7 @@ drawLine(SDL_Surface *screen, float x0, float y0, float x1, float y1, unsigned i setpix(screen, x1 + t * (x0 - x1), y1 + t * (y0 - y1), col); } } +#endif static void drawCircle(SDL_Surface *screen, float x, float y, float r, unsigned int c) @@ -213,7 +215,7 @@ loop(void) #if VERBOSE case SDL_FINGERMOTION: - SDL_Log("Finger: %"SDL_PRIs64",x: %f, y: %f",event.tfinger.fingerId, + SDL_Log("Finger: %"SDL_PRIs64", x: %f, y: %f",event.tfinger.fingerId, event.tfinger.x,event.tfinger.y); break; diff --git a/libs/SDL2/test/testgl2.c b/libs/SDL2/test/testgl2.c index a8bc181a3..6eb439cb1 100644 --- a/libs/SDL2/test/testgl2.c +++ b/libs/SDL2/test/testgl2.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -238,10 +238,10 @@ main(int argc, char *argv[]) consumed = SDLTest_CommonArg(state, i); if (consumed == 0) { if (SDL_strcasecmp(argv[i], "--fsaa") == 0 && i+1 < argc) { - fsaa = atoi(argv[i+1]); + fsaa = SDL_atoi(argv[i+1]); consumed = 2; } else if (SDL_strcasecmp(argv[i], "--accel") == 0 && i+1 < argc) { - accel = atoi(argv[i+1]); + accel = SDL_atoi(argv[i+1]); consumed = 2; } else { consumed = -1; diff --git a/libs/SDL2/test/testgles.c b/libs/SDL2/test/testgles.c index c4ea45f54..cb989f44f 100644 --- a/libs/SDL2/test/testgles.c +++ b/libs/SDL2/test/testgles.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/test/testgles2.c b/libs/SDL2/test/testgles2.c index 641a8975c..b6180aeaa 100644 --- a/libs/SDL2/test/testgles2.c +++ b/libs/SDL2/test/testgles2.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -22,8 +22,10 @@ #if defined(__IPHONEOS__) || defined(__ANDROID__) || defined(__EMSCRIPTEN__) || defined(__NACL__) \ || defined(__WINDOWS__) || defined(__LINUX__) +#ifndef HAVE_OPENGLES2 #define HAVE_OPENGLES2 #endif +#endif #ifdef HAVE_OPENGLES2 diff --git a/libs/SDL2/test/testgles2_sdf.c b/libs/SDL2/test/testgles2_sdf.c new file mode 100644 index 000000000..a7f8016ea --- /dev/null +++ b/libs/SDL2/test/testgles2_sdf.c @@ -0,0 +1,805 @@ +/* + Copyright (C) 1997-2022 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely. +*/ +#include +#include +#include +#include + +#ifdef __EMSCRIPTEN__ +#include +#endif + +#include "SDL_test_common.h" + +#if defined(__IPHONEOS__) || defined(__ANDROID__) || defined(__EMSCRIPTEN__) || defined(__NACL__) \ + || defined(__WINDOWS__) || defined(__LINUX__) +#define HAVE_OPENGLES2 +#endif + +#ifdef HAVE_OPENGLES2 + +#include "SDL_opengles2.h" + +typedef struct GLES2_Context +{ +#define SDL_PROC(ret,func,params) ret (APIENTRY *func) params; +#include "../src/render/opengles2/SDL_gles2funcs.h" +#undef SDL_PROC +} GLES2_Context; + + +static SDL_Surface *g_surf_sdf = NULL; +GLenum g_texture; +GLenum g_texture_type = GL_TEXTURE_2D; +GLfloat g_verts[24]; +typedef enum +{ + GLES2_ATTRIBUTE_POSITION = 0, + GLES2_ATTRIBUTE_TEXCOORD = 1, + GLES2_ATTRIBUTE_ANGLE = 2, + GLES2_ATTRIBUTE_CENTER = 3, +} GLES2_Attribute; + +typedef enum +{ + GLES2_UNIFORM_PROJECTION, + GLES2_UNIFORM_TEXTURE, + GLES2_UNIFORM_COLOR, +} GLES2_Uniform; + + +GLuint g_uniform_locations[16]; + + + +static SDLTest_CommonState *state; +static SDL_GLContext *context = NULL; +static int depth = 16; +static GLES2_Context ctx; + +static int LoadContext(GLES2_Context * data) +{ +#if SDL_VIDEO_DRIVER_UIKIT +#define __SDL_NOGETPROCADDR__ +#elif SDL_VIDEO_DRIVER_ANDROID +#define __SDL_NOGETPROCADDR__ +#elif SDL_VIDEO_DRIVER_PANDORA +#define __SDL_NOGETPROCADDR__ +#endif + +#if defined __SDL_NOGETPROCADDR__ +#define SDL_PROC(ret,func,params) data->func=func; +#else +#define SDL_PROC(ret,func,params) \ + do { \ + data->func = SDL_GL_GetProcAddress(#func); \ + if ( ! data->func ) { \ + return SDL_SetError("Couldn't load GLES2 function %s: %s", #func, SDL_GetError()); \ + } \ + } while ( 0 ); +#endif /* __SDL_NOGETPROCADDR__ */ + +#include "../src/render/opengles2/SDL_gles2funcs.h" +#undef SDL_PROC + return 0; +} + +/* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */ +static void +quit(int rc) +{ + int i; + + if (context != NULL) { + for (i = 0; i < state->num_windows; i++) { + if (context[i]) { + SDL_GL_DeleteContext(context[i]); + } + } + + SDL_free(context); + } + + SDLTest_CommonQuit(state); + exit(rc); +} + +#define GL_CHECK(x) \ + x; \ + { \ + GLenum glError = ctx.glGetError(); \ + if(glError != GL_NO_ERROR) { \ + SDL_Log("glGetError() = %i (0x%.8x) at line %i\n", glError, glError, __LINE__); \ + quit(1); \ + } \ + } + + +/* + * Create shader, load in source, compile, dump debug as necessary. + * + * shader: Pointer to return created shader ID. + * source: Passed-in shader source code. + * shader_type: Passed to GL, e.g. GL_VERTEX_SHADER. + */ +void +process_shader(GLuint *shader, const char * source, GLint shader_type) +{ + GLint status = GL_FALSE; + const char *shaders[1] = { NULL }; + char buffer[1024]; + GLsizei length; + + /* Create shader and load into GL. */ + *shader = GL_CHECK(ctx.glCreateShader(shader_type)); + + shaders[0] = source; + + GL_CHECK(ctx.glShaderSource(*shader, 1, shaders, NULL)); + + /* Clean up shader source. */ + shaders[0] = NULL; + + /* Try compiling the shader. */ + GL_CHECK(ctx.glCompileShader(*shader)); + GL_CHECK(ctx.glGetShaderiv(*shader, GL_COMPILE_STATUS, &status)); + + /* Dump debug info (source and log) if compilation failed. */ + if(status != GL_TRUE) { + ctx.glGetProgramInfoLog(*shader, sizeof(buffer), &length, &buffer[0]); + buffer[length] = '\0'; + SDL_Log("Shader compilation failed: %s", buffer);fflush(stderr); + quit(-1); + } +} + +/* Notes on a_angle: + * It is a vector containing sine and cosine for rotation matrix + * To get correct rotation for most cases when a_angle is disabled cosine + * value is decremented by 1.0 to get proper output with 0.0 which is default value + */ +static const Uint8 GLES2_VertexSrc_Default_[] = " \ + uniform mat4 u_projection; \ + attribute vec2 a_position; \ + attribute vec2 a_texCoord; \ + attribute vec2 a_angle; \ + attribute vec2 a_center; \ + varying vec2 v_texCoord; \ + \ + void main() \ + { \ + float s = a_angle[0]; \ + float c = a_angle[1] + 1.0; \ + mat2 rotationMatrix = mat2(c, -s, s, c); \ + vec2 position = rotationMatrix * (a_position - a_center) + a_center; \ + v_texCoord = a_texCoord; \ + gl_Position = u_projection * vec4(position, 0.0, 1.0);\ + gl_PointSize = 1.0; \ + } \ +"; + +static const Uint8 GLES2_FragmentSrc_TextureABGRSrc_[] = " \ + precision mediump float; \ + uniform sampler2D u_texture; \ + uniform vec4 u_color; \ + varying vec2 v_texCoord; \ + \ + void main() \ + { \ + gl_FragColor = texture2D(u_texture, v_texCoord); \ + gl_FragColor *= u_color; \ + } \ +"; + +/* RGB to ABGR conversion */ +static const Uint8 GLES2_FragmentSrc_TextureABGRSrc_SDF[] = " \ + #extension GL_OES_standard_derivatives : enable\n\ + \ + precision mediump float; \ + uniform sampler2D u_texture; \ + uniform vec4 u_color; \ + varying vec2 v_texCoord; \ + \ + void main() \ + { \ + vec4 abgr = texture2D(u_texture, v_texCoord); \ +\ + float sigDist = abgr.a; \ + \ + float w = fwidth( sigDist );\ + float alpha = clamp(smoothstep(0.5 - w, 0.5 + w, sigDist), 0.0, 1.0); \ +\ + gl_FragColor = vec4(abgr.rgb, abgr.a * alpha); \ + gl_FragColor.rgb *= gl_FragColor.a; \ + gl_FragColor *= u_color; \ + } \ +"; + +/* RGB to ABGR conversion DEBUG */ +static const char *GLES2_FragmentSrc_TextureABGRSrc_SDF_dbg = " \ + #extension GL_OES_standard_derivatives : enable\n\ + \ + precision mediump float; \ + uniform sampler2D u_texture; \ + uniform vec4 u_color; \ + varying vec2 v_texCoord; \ + \ + void main() \ + { \ + vec4 abgr = texture2D(u_texture, v_texCoord); \ +\ + float a = abgr.a; \ + gl_FragColor = vec4(a, a, a, 1.0); \ + } \ +"; + + +static float g_val = 1.0f; +static int g_use_SDF = 1; +static int g_use_SDF_debug = 0; +static float g_angle = 0.0f; +static float matrix_mvp[4][4]; + + + + +typedef struct shader_data +{ + GLuint shader_program, shader_frag, shader_vert; + + GLint attr_position; + GLint attr_color, attr_mvp; + +} shader_data; + +static void +Render(unsigned int width, unsigned int height, shader_data* data) +{ + float *verts = g_verts; + ctx.glViewport(0, 0, 640, 480); + + GL_CHECK(ctx.glClear(GL_COLOR_BUFFER_BIT)); + + GL_CHECK(ctx.glUniformMatrix4fv(g_uniform_locations[GLES2_UNIFORM_PROJECTION], 1, GL_FALSE, (const float *)matrix_mvp)); + GL_CHECK(ctx.glUniform4f(g_uniform_locations[GLES2_UNIFORM_COLOR], 1.0f, 1.0f, 1.0f, 1.0f)); + + GL_CHECK(ctx.glVertexAttribPointer(GLES2_ATTRIBUTE_ANGLE, 2, GL_FLOAT, GL_FALSE, 0, (const GLvoid *) (verts + 16))); + GL_CHECK(ctx.glVertexAttribPointer(GLES2_ATTRIBUTE_TEXCOORD, 2, GL_FLOAT, GL_FALSE, 0, (const GLvoid *) (verts + 8))); + GL_CHECK(ctx.glVertexAttribPointer(GLES2_ATTRIBUTE_POSITION, 2, GL_FLOAT, GL_FALSE, 0, (const GLvoid *) verts)); + + GL_CHECK(ctx.glDrawArrays(GL_TRIANGLE_STRIP, 0, 4)); +} + + +void renderCopy_angle(float degree_angle) +{ + const float radian_angle = (float)(3.141592 * degree_angle) / 180.0; + const GLfloat s = (GLfloat) SDL_sin(radian_angle); + const GLfloat c = (GLfloat) SDL_cos(radian_angle) - 1.0f; + GLfloat *verts = g_verts + 16; + *(verts++) = s; + *(verts++) = c; + *(verts++) = s; + *(verts++) = c; + *(verts++) = s; + *(verts++) = c; + *(verts++) = s; + *(verts++) = c; +} + + +void renderCopy_position(SDL_Rect *srcrect, SDL_Rect *dstrect) +{ + GLfloat minx, miny, maxx, maxy; + GLfloat minu, maxu, minv, maxv; + GLfloat *verts = g_verts; + + minx = dstrect->x; + miny = dstrect->y; + maxx = dstrect->x + dstrect->w; + maxy = dstrect->y + dstrect->h; + + minu = (GLfloat) srcrect->x / g_surf_sdf->w; + maxu = (GLfloat) (srcrect->x + srcrect->w) / g_surf_sdf->w; + minv = (GLfloat) srcrect->y / g_surf_sdf->h; + maxv = (GLfloat) (srcrect->y + srcrect->h) / g_surf_sdf->h; + + *(verts++) = minx; + *(verts++) = miny; + *(verts++) = maxx; + *(verts++) = miny; + *(verts++) = minx; + *(verts++) = maxy; + *(verts++) = maxx; + *(verts++) = maxy; + + *(verts++) = minu; + *(verts++) = minv; + *(verts++) = maxu; + *(verts++) = minv; + *(verts++) = minu; + *(verts++) = maxv; + *(verts++) = maxu; + *(verts++) = maxv; +} + +int done; +Uint32 frames; +shader_data *datas; + +void loop() +{ + SDL_Event event; + int i; + int status; + + /* Check for events */ + ++frames; + while (SDL_PollEvent(&event) && !done) { + switch (event.type) { + case SDL_KEYDOWN: + { + const int sym = event.key.keysym.sym; + + if (sym == SDLK_TAB) { + SDL_Log("Tab"); + + + } + + + if (sym == SDLK_LEFT) g_val -= 0.05; + if (sym == SDLK_RIGHT) g_val += 0.05; + if (sym == SDLK_UP) g_angle -= 1; + if (sym == SDLK_DOWN) g_angle += 1; + + + break; + } + + case SDL_WINDOWEVENT: + switch (event.window.event) { + case SDL_WINDOWEVENT_RESIZED: + for (i = 0; i < state->num_windows; ++i) { + if (event.window.windowID == SDL_GetWindowID(state->windows[i])) { + int w, h; + status = SDL_GL_MakeCurrent(state->windows[i], context[i]); + if (status) { + SDL_Log("SDL_GL_MakeCurrent(): %s\n", SDL_GetError()); + break; + } + /* Change view port to the new window dimensions */ + SDL_GL_GetDrawableSize(state->windows[i], &w, &h); + ctx.glViewport(0, 0, w, h); + state->window_w = event.window.data1; + state->window_h = event.window.data2; + /* Update window content */ + Render(event.window.data1, event.window.data2, &datas[i]); + SDL_GL_SwapWindow(state->windows[i]); + break; + } + } + break; + } + } + SDLTest_CommonEvent(state, &event, &done); + } + + + matrix_mvp[3][0] = -1.0f; + matrix_mvp[3][3] = 1.0f; + + matrix_mvp[0][0] = 2.0f / 640.0; + matrix_mvp[1][1] = -2.0f / 480.0; + matrix_mvp[3][1] = 1.0f; + + if (0) + { + float *f = (float *) matrix_mvp; + SDL_Log("-----------------------------------"); + SDL_Log("[ %f, %f, %f, %f ]", *f++, *f++, *f++, *f++); + SDL_Log("[ %f, %f, %f, %f ]", *f++, *f++, *f++, *f++); + SDL_Log("[ %f, %f, %f, %f ]", *f++, *f++, *f++, *f++); + SDL_Log("[ %f, %f, %f, %f ]", *f++, *f++, *f++, *f++); + SDL_Log("-----------------------------------"); + } + + renderCopy_angle(g_angle); + + { + int w, h; + SDL_Rect rs, rd; + + SDL_GL_GetDrawableSize(state->windows[0], &w, &h); + + rs.x = 0; rs.y = 0; rs.w = g_surf_sdf->w; rs.h = g_surf_sdf->h; + rd.w = g_surf_sdf->w * g_val; rd.h = g_surf_sdf->h * g_val; + rd.x = (w - rd.w) / 2; rd.y = (h - rd.h) / 2; + renderCopy_position(&rs, &rd); + } + + + if (!done) { + for (i = 0; i < state->num_windows; ++i) { + status = SDL_GL_MakeCurrent(state->windows[i], context[i]); + if (status) { + SDL_Log("SDL_GL_MakeCurrent(): %s\n", SDL_GetError()); + + /* Continue for next window */ + continue; + } + Render(state->window_w, state->window_h, &datas[i]); + SDL_GL_SwapWindow(state->windows[i]); + } + } +#ifdef __EMSCRIPTEN__ + else { + emscripten_cancel_main_loop(); + } +#endif +} + +int +main(int argc, char *argv[]) +{ + int fsaa, accel; + int value; + int i; + SDL_DisplayMode mode; + Uint32 then, now; + int status; + shader_data *data; + + /* Initialize parameters */ + fsaa = 0; + accel = 0; + + /* Initialize test framework */ + state = SDLTest_CommonCreateState(argv, SDL_INIT_VIDEO); + if (!state) { + return 1; + } + for (i = 1; i < argc;) { + int consumed; + + consumed = SDLTest_CommonArg(state, i); + if (consumed == 0) { + if (SDL_strcasecmp(argv[i], "--fsaa") == 0) { + ++fsaa; + consumed = 1; + } else if (SDL_strcasecmp(argv[i], "--accel") == 0) { + ++accel; + consumed = 1; + } else if (SDL_strcasecmp(argv[i], "--zdepth") == 0) { + i++; + if (!argv[i]) { + consumed = -1; + } else { + depth = SDL_atoi(argv[i]); + consumed = 1; + } + } else { + consumed = -1; + } + } + if (consumed < 0) { + static const char *options[] = { "[--fsaa]", "[--accel]", "[--zdepth %d]", NULL }; + SDLTest_CommonLogUsage(state, argv[0], options); + quit(1); + } + i += consumed; + } + + /* Set OpenGL parameters */ + state->window_flags |= SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE; + state->gl_red_size = 5; + state->gl_green_size = 5; + state->gl_blue_size = 5; + state->gl_depth_size = depth; + state->gl_major_version = 2; + state->gl_minor_version = 0; + state->gl_profile_mask = SDL_GL_CONTEXT_PROFILE_ES; + + if (fsaa) { + state->gl_multisamplebuffers=1; + state->gl_multisamplesamples=fsaa; + } + if (accel) { + state->gl_accelerated=1; + } + if (!SDLTest_CommonInit(state)) { + quit(2); + return 0; + } + + context = (SDL_GLContext *)SDL_calloc(state->num_windows, sizeof(context)); + if (context == NULL) { + SDL_Log("Out of memory!\n"); + quit(2); + } + + /* Create OpenGL ES contexts */ + for (i = 0; i < state->num_windows; i++) { + context[i] = SDL_GL_CreateContext(state->windows[i]); + if (!context[i]) { + SDL_Log("SDL_GL_CreateContext(): %s\n", SDL_GetError()); + quit(2); + } + } + + /* Important: call this *after* creating the context */ + if (LoadContext(&ctx) < 0) { + SDL_Log("Could not load GLES2 functions\n"); + quit(2); + return 0; + } + + SDL_memset(matrix_mvp, 0, sizeof (matrix_mvp)); + + { + SDL_Surface *tmp; + char *f; + g_use_SDF = 1; + g_use_SDF_debug = 0; + + if (g_use_SDF) { + f = "testgles2_sdf_img_sdf.bmp"; + } else { + f = "testgles2_sdf_img_normal.bmp"; + } + + SDL_Log("SDF is %s", g_use_SDF ? "enabled" : "disabled"); + + /* Load SDF BMP image */ +#if 1 + tmp = SDL_LoadBMP(f); + if (tmp == NULL) { + SDL_Log("missing image file: %s", f); + exit(-1); + } else { + SDL_Log("Load image file: %s", f); + } + +#else + /* Generate SDF image using SDL_ttf */ + + #include "SDL_ttf.h" + char *font_file = "./font/DroidSansFallback.ttf"; + char *str = "Abcde"; + SDL_Color color = { 0, 0,0, 255}; + + TTF_Init(); + TTF_Font *font = TTF_OpenFont(font_file, 72); + + if (font == NULL) { + SDL_Log("Cannot open font %s", font_file); + } + + TTF_SetFontSDF(font, g_use_SDF); + SDL_Surface *tmp = TTF_RenderUTF8_Blended(font, str, color); + + SDL_Log("err: %s", SDL_GetError()); + if (tmp == NULL) { + SDL_Log("can't render text"); + return -1; + } + + SDL_SaveBMP(tmp, f); + + TTF_CloseFont(font); + TTF_Quit(); +#endif + g_surf_sdf = SDL_ConvertSurfaceFormat(tmp, SDL_PIXELFORMAT_ABGR8888, 0); + + SDL_SetSurfaceBlendMode(g_surf_sdf, SDL_BLENDMODE_BLEND); + } + + + if (state->render_flags & SDL_RENDERER_PRESENTVSYNC) { + SDL_GL_SetSwapInterval(1); + } else { + SDL_GL_SetSwapInterval(0); + } + + SDL_GetCurrentDisplayMode(0, &mode); + SDL_Log("Screen bpp: %d\n", SDL_BITSPERPIXEL(mode.format)); + SDL_Log("\n"); + SDL_Log("Vendor : %s\n", ctx.glGetString(GL_VENDOR)); + SDL_Log("Renderer : %s\n", ctx.glGetString(GL_RENDERER)); + SDL_Log("Version : %s\n", ctx.glGetString(GL_VERSION)); + SDL_Log("Extensions : %s\n", ctx.glGetString(GL_EXTENSIONS)); + SDL_Log("\n"); + + status = SDL_GL_GetAttribute(SDL_GL_RED_SIZE, &value); + if (!status) { + SDL_Log("SDL_GL_RED_SIZE: requested %d, got %d\n", 5, value); + } else { + SDL_Log( "Failed to get SDL_GL_RED_SIZE: %s\n", + SDL_GetError()); + } + status = SDL_GL_GetAttribute(SDL_GL_GREEN_SIZE, &value); + if (!status) { + SDL_Log("SDL_GL_GREEN_SIZE: requested %d, got %d\n", 5, value); + } else { + SDL_Log( "Failed to get SDL_GL_GREEN_SIZE: %s\n", + SDL_GetError()); + } + status = SDL_GL_GetAttribute(SDL_GL_BLUE_SIZE, &value); + if (!status) { + SDL_Log("SDL_GL_BLUE_SIZE: requested %d, got %d\n", 5, value); + } else { + SDL_Log( "Failed to get SDL_GL_BLUE_SIZE: %s\n", + SDL_GetError()); + } + status = SDL_GL_GetAttribute(SDL_GL_DEPTH_SIZE, &value); + if (!status) { + SDL_Log("SDL_GL_DEPTH_SIZE: requested %d, got %d\n", depth, value); + } else { + SDL_Log( "Failed to get SDL_GL_DEPTH_SIZE: %s\n", + SDL_GetError()); + } + if (fsaa) { + status = SDL_GL_GetAttribute(SDL_GL_MULTISAMPLEBUFFERS, &value); + if (!status) { + SDL_Log("SDL_GL_MULTISAMPLEBUFFERS: requested 1, got %d\n", value); + } else { + SDL_Log( "Failed to get SDL_GL_MULTISAMPLEBUFFERS: %s\n", + SDL_GetError()); + } + status = SDL_GL_GetAttribute(SDL_GL_MULTISAMPLESAMPLES, &value); + if (!status) { + SDL_Log("SDL_GL_MULTISAMPLESAMPLES: requested %d, got %d\n", fsaa, + value); + } else { + SDL_Log( "Failed to get SDL_GL_MULTISAMPLESAMPLES: %s\n", + SDL_GetError()); + } + } + if (accel) { + status = SDL_GL_GetAttribute(SDL_GL_ACCELERATED_VISUAL, &value); + if (!status) { + SDL_Log("SDL_GL_ACCELERATED_VISUAL: requested 1, got %d\n", value); + } else { + SDL_Log( "Failed to get SDL_GL_ACCELERATED_VISUAL: %s\n", + SDL_GetError()); + } + } + + datas = (shader_data *)SDL_calloc(state->num_windows, sizeof(shader_data)); + + /* Set rendering settings for each context */ + for (i = 0; i < state->num_windows; ++i) { + + int w, h; + status = SDL_GL_MakeCurrent(state->windows[i], context[i]); + if (status) { + SDL_Log("SDL_GL_MakeCurrent(): %s\n", SDL_GetError()); + + /* Continue for next window */ + continue; + } + + { + int format = GL_RGBA; + int type = GL_UNSIGNED_BYTE; + + GL_CHECK(ctx.glGenTextures(1, &g_texture)); + + ctx.glActiveTexture(GL_TEXTURE0); + ctx.glPixelStorei(GL_PACK_ALIGNMENT, 1); + ctx.glPixelStorei(GL_UNPACK_ALIGNMENT, 1); + + ctx.glBindTexture(g_texture_type, g_texture); + + ctx.glTexParameteri(g_texture_type, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + ctx.glTexParameteri(g_texture_type, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + ctx.glTexParameteri(g_texture_type, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + ctx.glTexParameteri(g_texture_type, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + GL_CHECK(ctx.glTexImage2D(g_texture_type, 0, format, g_surf_sdf->w, g_surf_sdf->h, 0, format, type, NULL)); + GL_CHECK(ctx.glTexSubImage2D(g_texture_type, 0, 0 /* xoffset */, 0 /* yoffset */, g_surf_sdf->w, g_surf_sdf->h, format, type, g_surf_sdf->pixels)); + } + + + SDL_GL_GetDrawableSize(state->windows[i], &w, &h); + ctx.glViewport(0, 0, w, h); + + data = &datas[i]; + + /* Shader Initialization */ + process_shader(&data->shader_vert, GLES2_VertexSrc_Default_, GL_VERTEX_SHADER); + + if (g_use_SDF) { + if (g_use_SDF_debug == 0) { + process_shader(&data->shader_frag, GLES2_FragmentSrc_TextureABGRSrc_SDF, GL_FRAGMENT_SHADER); + } else { + process_shader(&data->shader_frag, GLES2_FragmentSrc_TextureABGRSrc_SDF_dbg, GL_FRAGMENT_SHADER); + } + } else { + process_shader(&data->shader_frag, GLES2_FragmentSrc_TextureABGRSrc_, GL_FRAGMENT_SHADER); + } + + /* Create shader_program (ready to attach shaders) */ + data->shader_program = GL_CHECK(ctx.glCreateProgram()); + + /* Attach shaders and link shader_program */ + GL_CHECK(ctx.glAttachShader(data->shader_program, data->shader_vert)); + GL_CHECK(ctx.glAttachShader(data->shader_program, data->shader_frag)); + GL_CHECK(ctx.glLinkProgram(data->shader_program)); + + ctx.glBindAttribLocation(data->shader_program, GLES2_ATTRIBUTE_POSITION, "a_position"); + ctx.glBindAttribLocation(data->shader_program, GLES2_ATTRIBUTE_TEXCOORD, "a_texCoord"); + ctx.glBindAttribLocation(data->shader_program, GLES2_ATTRIBUTE_ANGLE, "a_angle"); + ctx.glBindAttribLocation(data->shader_program, GLES2_ATTRIBUTE_CENTER, "a_center"); + + /* Predetermine locations of uniform variables */ + g_uniform_locations[GLES2_UNIFORM_PROJECTION] = ctx.glGetUniformLocation(data->shader_program, "u_projection"); + g_uniform_locations[GLES2_UNIFORM_TEXTURE] = ctx.glGetUniformLocation(data->shader_program, "u_texture"); + g_uniform_locations[GLES2_UNIFORM_COLOR] = ctx.glGetUniformLocation(data->shader_program, "u_color"); + + GL_CHECK(ctx.glUseProgram(data->shader_program)); + + ctx.glEnableVertexAttribArray((GLenum) GLES2_ATTRIBUTE_ANGLE); + ctx.glDisableVertexAttribArray((GLenum) GLES2_ATTRIBUTE_CENTER); + ctx.glEnableVertexAttribArray(GLES2_ATTRIBUTE_POSITION); + ctx.glEnableVertexAttribArray((GLenum) GLES2_ATTRIBUTE_TEXCOORD); + + + ctx.glUniform1i(g_uniform_locations[GLES2_UNIFORM_TEXTURE], 0); /* always texture unit 0. */ + ctx.glActiveTexture(GL_TEXTURE0); + ctx.glBindTexture(g_texture_type, g_texture); + GL_CHECK(ctx.glClearColor(1, 1, 1, 1)); + + // SDL_BLENDMODE_BLEND + GL_CHECK(ctx.glEnable(GL_BLEND)); + ctx.glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA); + ctx.glBlendEquationSeparate(GL_FUNC_ADD, GL_FUNC_ADD); + + + } + + /* Main render loop */ + frames = 0; + then = SDL_GetTicks(); + done = 0; + +#ifdef __EMSCRIPTEN__ + emscripten_set_main_loop(loop, 0, 1); +#else + while (!done) { + loop(); + } +#endif + + /* Print out some timing information */ + now = SDL_GetTicks(); + if (now > then) { + SDL_Log("%2.2f frames per second\n", + ((double) frames * 1000) / (now - then)); + } +#if !defined(__ANDROID__) && !defined(__NACL__) + quit(0); +#endif + return 0; +} + +#else /* HAVE_OPENGLES2 */ + +int +main(int argc, char *argv[]) +{ + SDL_Log("No OpenGL ES support on this system\n"); + return 1; +} + +#endif /* HAVE_OPENGLES2 */ + +/* vi: set ts=4 sw=4 expandtab: */ diff --git a/libs/SDL2/test/testgles2_sdf_img_normal.bmp b/libs/SDL2/test/testgles2_sdf_img_normal.bmp new file mode 100644 index 000000000..1209e1b1d Binary files /dev/null and b/libs/SDL2/test/testgles2_sdf_img_normal.bmp differ diff --git a/libs/SDL2/test/testgles2_sdf_img_sdf.bmp b/libs/SDL2/test/testgles2_sdf_img_sdf.bmp new file mode 100644 index 000000000..5f983d2d2 Binary files /dev/null and b/libs/SDL2/test/testgles2_sdf_img_sdf.bmp differ diff --git a/libs/SDL2/test/testhaptic.c b/libs/SDL2/test/testhaptic.c index bffe4467d..9b73ce293 100644 --- a/libs/SDL2/test/testhaptic.c +++ b/libs/SDL2/test/testhaptic.c @@ -14,10 +14,6 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND /* * includes */ -#include -#include /* strstr */ -#include /* isdigit */ - #include "SDL.h" #ifndef SDL_HAPTIC_DISABLED @@ -29,7 +25,7 @@ static SDL_Haptic *haptic; * prototypes */ static void abort_execution(void); -static void HapticPrintSupported(SDL_Haptic * haptic); +static void HapticPrintSupported(SDL_Haptic *); /** @@ -55,7 +51,7 @@ main(int argc, char **argv) index = -1; if (argc > 1) { name = argv[1]; - if ((strcmp(name, "--help") == 0) || (strcmp(name, "-h") == 0)) { + if ((SDL_strcmp(name, "--help") == 0) || (SDL_strcmp(name, "-h") == 0)) { SDL_Log("USAGE: %s [device]\n" "If device is a two-digit number it'll use it as an index, otherwise\n" "it'll use it as if it were part of the device's name.\n", @@ -63,9 +59,9 @@ main(int argc, char **argv) return 0; } - i = strlen(name); - if ((i < 3) && isdigit(name[0]) && ((i == 1) || isdigit(name[1]))) { - index = atoi(name); + i = SDL_strlen(name); + if ((i < 3) && SDL_isdigit(name[0]) && ((i == 1) || SDL_isdigit(name[1]))) { + index = SDL_atoi(name); name = NULL; } } @@ -82,7 +78,7 @@ main(int argc, char **argv) /* Try to find matching device */ else { for (i = 0; i < SDL_NumHaptics(); i++) { - if (strstr(SDL_HapticName(i), name) != NULL) + if (SDL_strstr(SDL_HapticName(i), name) != NULL) break; } @@ -110,7 +106,7 @@ main(int argc, char **argv) SDL_ClearError(); /* Create effects. */ - memset(&efx, 0, sizeof(efx)); + SDL_memset(&efx, 0, sizeof(efx)); nefx = 0; supported = SDL_HapticQuery(haptic); @@ -314,13 +310,13 @@ abort_execution(void) * Displays information about the haptic device. */ static void -HapticPrintSupported(SDL_Haptic * haptic) +HapticPrintSupported(SDL_Haptic * ptr) { unsigned int supported; - supported = SDL_HapticQuery(haptic); + supported = SDL_HapticQuery(ptr); SDL_Log(" Supported effects [%d effects, %d playing]:\n", - SDL_HapticNumEffects(haptic), SDL_HapticNumEffectsPlaying(haptic)); + SDL_HapticNumEffects(ptr), SDL_HapticNumEffectsPlaying(ptr)); if (supported & SDL_HAPTIC_CONSTANT) SDL_Log(" constant\n"); if (supported & SDL_HAPTIC_SINE) @@ -363,7 +359,7 @@ int main(int argc, char *argv[]) { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL compiled without Haptic support.\n"); - exit(1); + return 1; } #endif diff --git a/libs/SDL2/test/testhotplug.c b/libs/SDL2/test/testhotplug.c index 4a6a954f7..465fb5680 100644 --- a/libs/SDL2/test/testhotplug.c +++ b/libs/SDL2/test/testhotplug.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/test/testiconv.c b/libs/SDL2/test/testiconv.c index 4729b58fa..bf9ad3b92 100644 --- a/libs/SDL2/test/testiconv.c +++ b/libs/SDL2/test/testiconv.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -42,6 +42,8 @@ main(int argc, char *argv[]) "UCS4", "UCS-4", }; + + const char * fname; char buffer[BUFSIZ]; char *ucs4; char *test[2]; @@ -52,12 +54,10 @@ main(int argc, char *argv[]) /* Enable standard application logging */ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO); - if (!argv[1]) { - argv[1] = "utf8.txt"; - } - file = fopen(argv[1], "rb"); + fname = (argc < 2) ? "utf8.txt" : argv[1]; + file = fopen(fname, "rb"); if (!file) { - SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Unable to open %s\n", argv[1]); + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Unable to open %s\n", fname); return (1); } diff --git a/libs/SDL2/test/testime.c b/libs/SDL2/test/testime.c index 45bcdb559..5541d484f 100644 --- a/libs/SDL2/test/testime.c +++ b/libs/SDL2/test/testime.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -35,7 +35,7 @@ #define DEFAULT_FONT "NoDefaultFont.ttf" #endif #else -#define DEFAULT_FONT "unifont-9.0.02.hex" +#define DEFAULT_FONT "unifont-13.0.06.hex" #endif #define MAX_TEXT_LENGTH 256 @@ -648,12 +648,12 @@ int main(int argc, char *argv[]) } for (argc--, argv++; argc > 0; argc--, argv++) { - if (strcmp(argv[0], "--help") == 0) { + if (SDL_strcmp(argv[0], "--help") == 0) { usage(); return 0; } - else if (strcmp(argv[0], "--font") == 0) + else if (SDL_strcmp(argv[0], "--font") == 0) { argc--; argv++; diff --git a/libs/SDL2/test/testintersections.c b/libs/SDL2/test/testintersections.c index 0c824cb95..ff629f526 100644 --- a/libs/SDL2/test/testintersections.c +++ b/libs/SDL2/test/testintersections.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/test/testjoystick.c b/libs/SDL2/test/testjoystick.c index 16877a152..db9a3a156 100644 --- a/libs/SDL2/test/testjoystick.c +++ b/libs/SDL2/test/testjoystick.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -32,14 +32,74 @@ #define SCREEN_HEIGHT 480 #endif -SDL_Renderer *screen = NULL; -SDL_bool retval = SDL_FALSE; -SDL_bool done = SDL_FALSE; +static SDL_Window *window = NULL; +static SDL_Renderer *screen = NULL; +static SDL_Joystick *joystick = NULL; +static SDL_bool done = SDL_FALSE; + +static void +PrintJoystick(SDL_Joystick *joy) +{ + const char *type; + char guid[64]; + + SDL_assert(SDL_JoystickFromInstanceID(SDL_JoystickInstanceID(joy)) == joy); + SDL_JoystickGetGUIDString(SDL_JoystickGetGUID(joy), guid, sizeof (guid)); + switch (SDL_JoystickGetType(joy)) { + case SDL_JOYSTICK_TYPE_GAMECONTROLLER: + type = "Game Controller"; + break; + case SDL_JOYSTICK_TYPE_WHEEL: + type = "Wheel"; + break; + case SDL_JOYSTICK_TYPE_ARCADE_STICK: + type = "Arcade Stick"; + break; + case SDL_JOYSTICK_TYPE_FLIGHT_STICK: + type = "Flight Stick"; + break; + case SDL_JOYSTICK_TYPE_DANCE_PAD: + type = "Dance Pad"; + break; + case SDL_JOYSTICK_TYPE_GUITAR: + type = "Guitar"; + break; + case SDL_JOYSTICK_TYPE_DRUM_KIT: + type = "Drum Kit"; + break; + case SDL_JOYSTICK_TYPE_ARCADE_PAD: + type = "Arcade Pad"; + break; + case SDL_JOYSTICK_TYPE_THROTTLE: + type = "Throttle"; + break; + default: + type = "Unknown"; + break; + } + SDL_Log("Joystick\n"); + SDL_Log(" name: %s\n", SDL_JoystickName(joy)); + SDL_Log(" type: %s\n", type); + SDL_Log(" LED: %s\n", SDL_JoystickHasLED(joy) ? "yes" : "no"); + SDL_Log(" rumble: %s\n", SDL_JoystickHasRumble(joy) ? "yes" : "no"); + SDL_Log("trigger rumble: %s\n", SDL_JoystickHasRumbleTriggers(joy) ? "yes" : "no"); + SDL_Log(" axes: %d\n", SDL_JoystickNumAxes(joy)); + SDL_Log(" balls: %d\n", SDL_JoystickNumBalls(joy)); + SDL_Log(" hats: %d\n", SDL_JoystickNumHats(joy)); + SDL_Log(" buttons: %d\n", SDL_JoystickNumButtons(joy)); + SDL_Log(" instance id: %d\n", SDL_JoystickInstanceID(joy)); + SDL_Log(" guid: %s\n", guid); + SDL_Log(" VID/PID: 0x%.4x/0x%.4x\n", SDL_JoystickGetVendor(joy), SDL_JoystickGetProduct(joy)); +} static void DrawRect(SDL_Renderer *r, const int x, const int y, const int w, const int h) { - const SDL_Rect area = { x, y, w, h }; + SDL_Rect area; + area.x = x; + area.y = y; + area.w = w; + area.h = h; SDL_RenderFillRect(r, &area); } @@ -48,72 +108,97 @@ loop(void *arg) { SDL_Event event; int i; - SDL_Joystick *joystick = (SDL_Joystick *)arg; - /* blank screen, set up for drawing this frame. */ + /* blank screen, set up for drawing this frame. */ SDL_SetRenderDrawColor(screen, 0x0, 0x0, 0x0, SDL_ALPHA_OPAQUE); - SDL_RenderClear(screen); + SDL_RenderClear(screen); - while (SDL_PollEvent(&event)) { - switch (event.type) { + while (SDL_PollEvent(&event)) { + switch (event.type) { - case SDL_JOYDEVICEREMOVED: - SDL_Log("Joystick device %d removed.\n", (int) event.jdevice.which); - SDL_Log("Our instance ID is %d\n", (int) SDL_JoystickInstanceID(joystick)); - break; - - case SDL_JOYAXISMOTION: - SDL_Log("Joystick %d axis %d value: %d\n", - event.jaxis.which, - event.jaxis.axis, event.jaxis.value); - break; - case SDL_JOYHATMOTION: - SDL_Log("Joystick %d hat %d value:", - event.jhat.which, event.jhat.hat); - if (event.jhat.value == SDL_HAT_CENTERED) - SDL_Log(" centered"); - if (event.jhat.value & SDL_HAT_UP) - SDL_Log(" up"); - if (event.jhat.value & SDL_HAT_RIGHT) - SDL_Log(" right"); - if (event.jhat.value & SDL_HAT_DOWN) - SDL_Log(" down"); - if (event.jhat.value & SDL_HAT_LEFT) - SDL_Log(" left"); - SDL_Log("\n"); - break; - case SDL_JOYBALLMOTION: - SDL_Log("Joystick %d ball %d delta: (%d,%d)\n", - event.jball.which, - event.jball.ball, event.jball.xrel, event.jball.yrel); - break; - case SDL_JOYBUTTONDOWN: - SDL_Log("Joystick %d button %d down\n", - event.jbutton.which, event.jbutton.button); - /* First button triggers a 0.5 second full strength rumble */ - if (event.jbutton.button == 0) { - SDL_JoystickRumble(joystick, 0xFFFF, 0xFFFF, 500); + case SDL_JOYDEVICEADDED: + SDL_Log("Joystick device %d added.\n", (int) event.jdevice.which); + if (!joystick) { + joystick = SDL_JoystickOpen(event.jdevice.which); + if (joystick) { + PrintJoystick(joystick); + } else { + SDL_Log("Couldn't open joystick: %s\n", SDL_GetError()); } - break; - case SDL_JOYBUTTONUP: - SDL_Log("Joystick %d button %d up\n", - event.jbutton.which, event.jbutton.button); - break; - case SDL_KEYDOWN: - if ((event.key.keysym.sym != SDLK_ESCAPE) && - (event.key.keysym.sym != SDLK_AC_BACK)) { - break; - } - /* Fall through to signal quit */ - case SDL_FINGERDOWN: - case SDL_MOUSEBUTTONDOWN: - case SDL_QUIT: - done = SDL_TRUE; - break; - default: + } + break; + + case SDL_JOYDEVICEREMOVED: + SDL_Log("Joystick device %d removed.\n", (int) event.jdevice.which); + if (event.jdevice.which == SDL_JoystickInstanceID(joystick)) { + SDL_JoystickClose(joystick); + joystick = SDL_JoystickOpen(0); + } + break; + + case SDL_JOYAXISMOTION: + SDL_Log("Joystick %d axis %d value: %d\n", + event.jaxis.which, + event.jaxis.axis, event.jaxis.value); + break; + case SDL_JOYHATMOTION: + SDL_Log("Joystick %d hat %d value:", + event.jhat.which, event.jhat.hat); + if (event.jhat.value == SDL_HAT_CENTERED) + SDL_Log(" centered"); + if (event.jhat.value & SDL_HAT_UP) + SDL_Log(" up"); + if (event.jhat.value & SDL_HAT_RIGHT) + SDL_Log(" right"); + if (event.jhat.value & SDL_HAT_DOWN) + SDL_Log(" down"); + if (event.jhat.value & SDL_HAT_LEFT) + SDL_Log(" left"); + SDL_Log("\n"); + break; + case SDL_JOYBALLMOTION: + SDL_Log("Joystick %d ball %d delta: (%d,%d)\n", + event.jball.which, + event.jball.ball, event.jball.xrel, event.jball.yrel); + break; + case SDL_JOYBUTTONDOWN: + SDL_Log("Joystick %d button %d down\n", + event.jbutton.which, event.jbutton.button); + /* First button triggers a 0.5 second full strength rumble */ + if (event.jbutton.button == 0) { + SDL_JoystickRumble(joystick, 0xFFFF, 0xFFFF, 500); + } + break; + case SDL_JOYBUTTONUP: + SDL_Log("Joystick %d button %d up\n", + event.jbutton.which, event.jbutton.button); + break; + case SDL_KEYDOWN: + /* Press the L key to lag for 3 seconds, to see what happens + when SDL doesn't service the event loop quickly. */ + if (event.key.keysym.sym == SDLK_l) { + SDL_Log("Lagging for 3 seconds...\n"); + SDL_Delay(3000); break; } + + if ((event.key.keysym.sym != SDLK_ESCAPE) && + (event.key.keysym.sym != SDLK_AC_BACK)) { + break; + } + SDL_FALLTHROUGH; + case SDL_FINGERDOWN: + case SDL_MOUSEBUTTONDOWN: + case SDL_QUIT: + done = SDL_TRUE; + break; + default: + break; } + } + + if (joystick) { + /* Update visual joystick state */ SDL_SetRenderDrawColor(screen, 0x00, 0xFF, 0x00, SDL_ALPHA_OPAQUE); for (i = 0; i < SDL_JoystickNumButtons(joystick); ++i) { @@ -172,13 +257,9 @@ loop(void *arg) DrawRect(screen, x, y, 8, 8); } + } - SDL_RenderPresent(screen); - - if (SDL_JoystickGetAttached( joystick ) == 0) { - done = SDL_TRUE; - retval = SDL_TRUE; /* keep going, wait for reattach. */ - } + SDL_RenderPresent(screen); #ifdef __EMSCRIPTEN__ if (done) { @@ -187,14 +268,19 @@ loop(void *arg) #endif } -static SDL_bool -WatchJoystick(SDL_Joystick * joystick) +int +main(int argc, char *argv[]) { - SDL_Window *window = NULL; - const char *name = NULL; + SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, "0"); - retval = SDL_FALSE; - done = SDL_FALSE; + /* Enable standard application logging */ + SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO); + + /* Initialize SDL (Note: video is required to start event loop) */ + if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK) < 0) { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't initialize SDL: %s\n", SDL_GetError()); + exit(1); + } /* Create a window to display joystick axis position */ window = SDL_CreateWindow("Joystick Test", SDL_WINDOWPOS_CENTERED, @@ -215,159 +301,19 @@ WatchJoystick(SDL_Joystick * joystick) SDL_SetRenderDrawColor(screen, 0x00, 0x00, 0x00, SDL_ALPHA_OPAQUE); SDL_RenderClear(screen); SDL_RenderPresent(screen); - SDL_RaiseWindow(window); - - /* Print info about the joystick we are watching */ - name = SDL_JoystickName(joystick); - SDL_Log("Watching joystick %d: (%s)\n", SDL_JoystickInstanceID(joystick), - name ? name : "Unknown Joystick"); - SDL_Log("Joystick has %d axes, %d hats, %d balls, and %d buttons\n", - SDL_JoystickNumAxes(joystick), SDL_JoystickNumHats(joystick), - SDL_JoystickNumBalls(joystick), SDL_JoystickNumButtons(joystick)); /* Loop, getting joystick events! */ #ifdef __EMSCRIPTEN__ - emscripten_set_main_loop_arg(loop, joystick, 0, 1); + emscripten_set_main_loop_arg(loop, NULL, 0, 1); #else while (!done) { - loop(joystick); + loop(NULL); } #endif SDL_DestroyRenderer(screen); - screen = NULL; SDL_DestroyWindow(window); - return retval; -} -int -main(int argc, char *argv[]) -{ - const char *name, *type; - int i; - SDL_Joystick *joystick; - - SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, "0"); - - /* Enable standard application logging */ - SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO); - - /* Initialize SDL (Note: video is required to start event loop) */ - if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK) < 0) { - SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't initialize SDL: %s\n", SDL_GetError()); - exit(1); - } - - /* Print information about the joysticks */ - SDL_Log("There are %d joysticks attached\n", SDL_NumJoysticks()); - for (i = 0; i < SDL_NumJoysticks(); ++i) { - name = SDL_JoystickNameForIndex(i); - SDL_Log("Joystick %d: %s\n", i, name ? name : "Unknown Joystick"); - joystick = SDL_JoystickOpen(i); - if (joystick == NULL) { - SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL_JoystickOpen(%d) failed: %s\n", i, - SDL_GetError()); - } else { - char guid[64]; - SDL_assert(SDL_JoystickFromInstanceID(SDL_JoystickInstanceID(joystick)) == joystick); - SDL_JoystickGetGUIDString(SDL_JoystickGetGUID(joystick), - guid, sizeof (guid)); - switch (SDL_JoystickGetType(joystick)) { - case SDL_JOYSTICK_TYPE_GAMECONTROLLER: - type = "Game Controller"; - break; - case SDL_JOYSTICK_TYPE_WHEEL: - type = "Wheel"; - break; - case SDL_JOYSTICK_TYPE_ARCADE_STICK: - type = "Arcade Stick"; - break; - case SDL_JOYSTICK_TYPE_FLIGHT_STICK: - type = "Flight Stick"; - break; - case SDL_JOYSTICK_TYPE_DANCE_PAD: - type = "Dance Pad"; - break; - case SDL_JOYSTICK_TYPE_GUITAR: - type = "Guitar"; - break; - case SDL_JOYSTICK_TYPE_DRUM_KIT: - type = "Drum Kit"; - break; - case SDL_JOYSTICK_TYPE_ARCADE_PAD: - type = "Arcade Pad"; - break; - case SDL_JOYSTICK_TYPE_THROTTLE: - type = "Throttle"; - break; - default: - type = "Unknown"; - break; - } - SDL_Log(" type: %s\n", type); - SDL_Log(" axes: %d\n", SDL_JoystickNumAxes(joystick)); - SDL_Log(" balls: %d\n", SDL_JoystickNumBalls(joystick)); - SDL_Log(" hats: %d\n", SDL_JoystickNumHats(joystick)); - SDL_Log(" buttons: %d\n", SDL_JoystickNumButtons(joystick)); - SDL_Log("instance id: %d\n", SDL_JoystickInstanceID(joystick)); - SDL_Log(" guid: %s\n", guid); - SDL_Log(" VID/PID: 0x%.4x/0x%.4x\n", SDL_JoystickGetVendor(joystick), SDL_JoystickGetProduct(joystick)); - SDL_JoystickClose(joystick); - } - } - -#if defined(__ANDROID__) || defined(__IPHONEOS__) - if (SDL_NumJoysticks() > 0) { -#else - if (argv[1]) { -#endif - SDL_bool reportederror = SDL_FALSE; - SDL_bool keepGoing = SDL_TRUE; - SDL_Event event; - int device; -#if defined(__ANDROID__) || defined(__IPHONEOS__) - device = 0; -#else - device = atoi(argv[1]); -#endif - joystick = SDL_JoystickOpen(device); - if (joystick != NULL) { - SDL_assert(SDL_JoystickFromInstanceID(SDL_JoystickInstanceID(joystick)) == joystick); - } - - while ( keepGoing ) { - if (joystick == NULL) { - if ( !reportederror ) { - SDL_Log("Couldn't open joystick %d: %s\n", device, SDL_GetError()); - keepGoing = SDL_FALSE; - reportederror = SDL_TRUE; - } - } else { - reportederror = SDL_FALSE; - keepGoing = WatchJoystick(joystick); - SDL_JoystickClose(joystick); - } - - joystick = NULL; - if (keepGoing) { - SDL_Log("Waiting for attach\n"); - } - while (keepGoing) { - SDL_WaitEvent(&event); - if ((event.type == SDL_QUIT) || (event.type == SDL_FINGERDOWN) - || (event.type == SDL_MOUSEBUTTONDOWN)) { - keepGoing = SDL_FALSE; - } else if (event.type == SDL_JOYDEVICEADDED) { - device = event.jdevice.which; - joystick = SDL_JoystickOpen(device); - if (joystick != NULL) { - SDL_assert(SDL_JoystickFromInstanceID(SDL_JoystickInstanceID(joystick)) == joystick); - } - break; - } - } - } - } SDL_QuitSubSystem(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK); return 0; @@ -379,7 +325,7 @@ int main(int argc, char *argv[]) { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL compiled without Joystick support.\n"); - exit(1); + return 1; } #endif diff --git a/libs/SDL2/test/testkeys.c b/libs/SDL2/test/testkeys.c index fc770d3e2..7561eb041 100644 --- a/libs/SDL2/test/testkeys.c +++ b/libs/SDL2/test/testkeys.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/test/testloadso.c b/libs/SDL2/test/testloadso.c index e5273815f..830352558 100644 --- a/libs/SDL2/test/testloadso.c +++ b/libs/SDL2/test/testloadso.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -44,7 +44,7 @@ main(int argc, char *argv[]) return 2; } - if (strcmp(argv[1], "--hello") == 0) { + if (SDL_strcmp(argv[1], "--hello") == 0) { hello = 1; libname = argv[2]; symname = "puts"; diff --git a/libs/SDL2/test/testlocale.c b/libs/SDL2/test/testlocale.c new file mode 100644 index 000000000..3a4a6f041 --- /dev/null +++ b/libs/SDL2/test/testlocale.c @@ -0,0 +1,67 @@ +/* + Copyright (C) 1997-2022 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely. +*/ +#include +#include "SDL.h" + +/* !!! FIXME: move this to the test framework */ + +static void log_locales(void) +{ + SDL_Locale *locales = SDL_GetPreferredLocales(); + if (locales == NULL) { + SDL_Log("Couldn't determine locales: %s", SDL_GetError()); + } else { + SDL_Locale *l; + unsigned int total = 0; + SDL_Log("Locales, in order of preference:"); + for (l = locales; l->language; l++) { + const char *c = l->country; + SDL_Log(" - %s%s%s", l->language, c ? "_" : "", c ? c : ""); + total++; + } + SDL_Log("%u locales seen.", total); + SDL_free(locales); + } +} + +int main(int argc, char **argv) +{ + /* Enable standard application logging */ + SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO); + + /* Print locales and languages */ + if (SDL_Init(SDL_INIT_VIDEO) != -1) { + log_locales(); + + if ((argc == 2) && (SDL_strcmp(argv[1], "--listen") == 0)) { + SDL_bool keep_going = SDL_TRUE; + while (keep_going) { + SDL_Event e; + while (SDL_PollEvent(&e)) { + if (e.type == SDL_QUIT) { + keep_going = SDL_FALSE; + } else if (e.type == SDL_LOCALECHANGED) { + SDL_Log("Saw SDL_LOCALECHANGED event!"); + log_locales(); + } + } + SDL_Delay(10); + } + } + + SDL_Quit(); + } + + return 0; +} + +/* vi: set ts=4 sw=4 expandtab: */ diff --git a/libs/SDL2/test/testlock.c b/libs/SDL2/test/testlock.c index b6e2935ac..121059608 100644 --- a/libs/SDL2/test/testlock.c +++ b/libs/SDL2/test/testlock.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/test/testmessage.c b/libs/SDL2/test/testmessage.c index 4ce8a13c8..5dd0155f7 100644 --- a/libs/SDL2/test/testmessage.c +++ b/libs/SDL2/test/testmessage.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -61,9 +61,9 @@ button_messagebox(void *eventNumber) if (success == -1) { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error Presenting MessageBox: %s\n", SDL_GetError()); if (eventNumber) { - SDL_UserEvent event; + SDL_Event event; event.type = (intptr_t)eventNumber; - SDL_PushEvent((SDL_Event*)&event); + SDL_PushEvent(&event); return 1; } else { quit(2); @@ -72,9 +72,9 @@ button_messagebox(void *eventNumber) SDL_Log("Pressed button: %d, %s\n", button, button == -1 ? "[closed]" : button == 1 ? "Cancel" : "OK"); if (eventNumber) { - SDL_UserEvent event; + SDL_Event event; event.type = (intptr_t)eventNumber; - SDL_PushEvent((SDL_Event*)&event); + SDL_PushEvent(&event); } return 0; @@ -106,6 +106,24 @@ main(int argc, char *argv[]) quit(1); } + success = SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, + NULL, + "NULL Title", + NULL); + if (success == -1) { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error Presenting MessageBox: %s\n", SDL_GetError()); + quit(1); + } + + success = SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, + "NULL Message", + NULL, + NULL); + if (success == -1) { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error Presenting MessageBox: %s\n", SDL_GetError()); + quit(1); + } + /* Google says this is Traditional Chinese for "beef with broccoli" */ success = SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "UTF-8 Simple MessageBox", @@ -171,9 +189,15 @@ main(int argc, char *argv[]) SDL_Event event; SDL_Window *window = SDL_CreateWindow("Test", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 640, 480, 0); + /* On wayland, no window will actually show until something has + actually been displayed. + */ + SDL_Renderer *renderer = SDL_CreateRenderer(window, -1, 0); + SDL_RenderPresent(renderer); + success = SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Simple MessageBox", - "This is a simple error MessageBox with a parent window", + "This is a simple error MessageBox with a parent window. Press a key or close the window after dismissing this messagebox.", window); if (success == -1) { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error Presenting MessageBox: %s\n", SDL_GetError()); diff --git a/libs/SDL2/test/testmouse.c b/libs/SDL2/test/testmouse.c new file mode 100644 index 000000000..0c9f7ee10 --- /dev/null +++ b/libs/SDL2/test/testmouse.c @@ -0,0 +1,193 @@ +/* + Copyright (C) 1997-2022 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely. +*/ + +#include "SDL.h" + +#ifdef __EMSCRIPTEN__ +#include +#endif + +#include /* exit() */ + +#ifdef __IPHONEOS__ +#define SCREEN_WIDTH 320 +#define SCREEN_HEIGHT 480 +#else +#define SCREEN_WIDTH 640 +#define SCREEN_HEIGHT 480 +#endif + +static SDL_Window *window; + +typedef struct _Line { + struct _Line *next; + + int x1, y1, x2, y2; + Uint8 r, g, b; +} Line; + +static Line *active = NULL; +static Line *lines = NULL; +static int buttons = 0; + +static SDL_bool done = SDL_FALSE; + +void +DrawLine(SDL_Renderer * renderer, Line * line) +{ + SDL_SetRenderDrawColor(renderer, line->r, line->g, line->b, 255); + SDL_RenderDrawLine(renderer, line->x1, line->y1, line->x2, line->y2); +} + +void +DrawLines(SDL_Renderer * renderer) +{ + Line *next = lines; + while (next != NULL) { + DrawLine(renderer, next); + next = next->next; + } +} + +void +AppendLine(Line *line) +{ + if (lines) { + Line *next = lines; + while (next->next != NULL) { + next = next->next; + } + next->next = line; + } else { + lines = line; + } +} + +void +loop(void *arg) +{ + SDL_Renderer *renderer = (SDL_Renderer *)arg; + SDL_Event event; + + /* Check for events */ + while (SDL_PollEvent(&event)) { + switch (event.type) { + case SDL_MOUSEMOTION: + if (!active) + break; + + active->x2 = event.motion.x; + active->y2 = event.motion.y; + break; + + case SDL_MOUSEBUTTONDOWN: + if (!active) { + active = SDL_calloc(1, sizeof(*active)); + active->x1 = active->x2 = event.button.x; + active->y1 = active->y2 = event.button.y; + } + + switch (event.button.button) { + case SDL_BUTTON_LEFT: active->r = 255; buttons |= SDL_BUTTON_LMASK; break; + case SDL_BUTTON_MIDDLE: active->g = 255; buttons |= SDL_BUTTON_MMASK; break; + case SDL_BUTTON_RIGHT: active->b = 255; buttons |= SDL_BUTTON_RMASK; break; + } + break; + case SDL_MOUSEBUTTONUP: + if (!active) + break; + + switch (event.button.button) { + case SDL_BUTTON_LEFT: buttons &= ~SDL_BUTTON_LMASK; break; + case SDL_BUTTON_MIDDLE: buttons &= ~SDL_BUTTON_MMASK; break; + case SDL_BUTTON_RIGHT: buttons &= ~SDL_BUTTON_RMASK; break; + } + + if (buttons == 0) { + AppendLine(active); + active = NULL; + } + break; + + case SDL_QUIT: + done = SDL_TRUE; + break; + + default: + break; + } + } + + SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255); + SDL_RenderClear(renderer); + + DrawLines(renderer); + if (active) + DrawLine(renderer, active); + + SDL_RenderPresent(renderer); + +#ifdef __EMSCRIPTEN__ + if (done) { + emscripten_cancel_main_loop(); + } +#endif +} + +int +main(int argc, char *argv[]) +{ + SDL_Renderer *renderer; + + /* Enable standard application logging */ + SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO); + + /* Initialize SDL (Note: video is required to start event loop) */ + if (SDL_Init(SDL_INIT_VIDEO) < 0) { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't initialize SDL: %s\n", SDL_GetError()); + exit(1); + } + + /* Create a window to display joystick axis position */ + window = SDL_CreateWindow("Mouse Test", SDL_WINDOWPOS_CENTERED, + SDL_WINDOWPOS_CENTERED, SCREEN_WIDTH, + SCREEN_HEIGHT, 0); + if (window == NULL) { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create window: %s\n", SDL_GetError()); + return SDL_FALSE; + } + + renderer = SDL_CreateRenderer(window, -1, 0); + if (renderer == NULL) { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create renderer: %s\n", SDL_GetError()); + SDL_DestroyWindow(window); + return SDL_FALSE; + } + + /* Main render loop */ +#ifdef __EMSCRIPTEN__ + emscripten_set_main_loop_arg(loop, renderer, 0, 1); +#else + while (!done) { + loop(renderer); + } +#endif + + SDL_DestroyRenderer(renderer); + SDL_DestroyWindow(window); + + SDL_Quit(); + + return 0; +} + +/* vi: set ts=4 sw=4 expandtab: */ diff --git a/libs/SDL2/test/testmultiaudio.c b/libs/SDL2/test/testmultiaudio.c index e702b39e9..51a7ff03c 100644 --- a/libs/SDL2/test/testmultiaudio.c +++ b/libs/SDL2/test/testmultiaudio.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -33,20 +33,20 @@ callback_data cbd[64]; void SDLCALL play_through_once(void *arg, Uint8 * stream, int len) { - callback_data *cbd = (callback_data *) arg; - Uint8 *waveptr = sound + cbd->soundpos; - int waveleft = soundlen - cbd->soundpos; + callback_data *cbdata = (callback_data *) arg; + Uint8 *waveptr = sound + cbdata->soundpos; + int waveleft = soundlen - cbdata->soundpos; int cpy = len; if (cpy > waveleft) cpy = waveleft; SDL_memcpy(stream, waveptr, cpy); len -= cpy; - cbd->soundpos += cpy; + cbdata->soundpos += cpy; if (len > 0) { stream += cpy; SDL_memset(stream, spec.silence, len); - SDL_AtomicSet(&cbd->done, 1); + SDL_AtomicSet(&cbdata->done, 1); } } @@ -180,13 +180,11 @@ main(int argc, char **argv) if (devcount < 1) { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Don't see any specific audio devices!\n"); } else { - if (argv[1] == NULL) { - argv[1] = "sample.wav"; - } + const char *file = (argc < 2) ? "sample.wav" : argv[1]; /* Load the wave file into memory */ - if (SDL_LoadWAV(argv[1], &spec, &sound, &soundlen) == NULL) { - SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't load %s: %s\n", argv[1], + if (SDL_LoadWAV(file, &spec, &sound, &soundlen) == NULL) { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't load %s: %s\n", file, SDL_GetError()); } else { test_multi_audio(devcount); diff --git a/libs/SDL2/test/testnative.c b/libs/SDL2/test/testnative.c index c1facd398..48f6f0ea5 100644 --- a/libs/SDL2/test/testnative.c +++ b/libs/SDL2/test/testnative.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -31,6 +31,9 @@ static NativeWindowFactory *factories[] = { #endif #ifdef TEST_NATIVE_COCOA &CocoaWindowFactory, +#endif +#ifdef TEST_NATIVE_OS2 + &OS2WindowFactory, #endif NULL }; @@ -50,7 +53,7 @@ quit(int rc) } SDL_Texture * -LoadSprite(SDL_Renderer *renderer, char *file) +LoadSprite(SDL_Renderer *renderer, const char *file) { SDL_Surface *temp; SDL_Texture *sprite; diff --git a/libs/SDL2/test/testnative.h b/libs/SDL2/test/testnative.h index 1f9275311..694f46ec8 100644 --- a/libs/SDL2/test/testnative.h +++ b/libs/SDL2/test/testnative.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -44,3 +44,8 @@ extern NativeWindowFactory X11WindowFactory; #define TEST_NATIVE_COCOA extern NativeWindowFactory CocoaWindowFactory; #endif + +#ifdef SDL_VIDEO_DRIVER_OS2 +#define TEST_NATIVE_OS2 +extern NativeWindowFactory OS2WindowFactory; +#endif diff --git a/libs/SDL2/test/testnativeos2.c b/libs/SDL2/test/testnativeos2.c new file mode 100644 index 000000000..6998fa614 --- /dev/null +++ b/libs/SDL2/test/testnativeos2.c @@ -0,0 +1,57 @@ +/* + Copyright (C) 1997-2022 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely. +*/ + +#include "testnative.h" + +#ifdef TEST_NATIVE_OS2 + +#define WIN_CLIENT_CLASS "SDL Test" + +static void *CreateWindowNative(int w, int h); +static void DestroyWindowNative(void *window); + +NativeWindowFactory OS2WindowFactory = { + "DIVE", + CreateWindowNative, + DestroyWindowNative +}; + +static void *CreateWindowNative(int w, int h) +{ + HWND hwnd, hwndFrame; + ULONG ulFrameFlags = FCF_TASKLIST | FCF_DLGBORDER | FCF_TITLEBAR | + FCF_SYSMENU | FCF_SHELLPOSITION | + FCF_SIZEBORDER | FCF_MINBUTTON | FCF_MAXBUTTON; + + WinRegisterClass(0, WIN_CLIENT_CLASS, WinDefWindowProc, + CS_SIZEREDRAW | CS_MOVENOTIFY, + sizeof(ULONG)); /* We should have minimum 4 bytes. */ + + hwndFrame = WinCreateStdWindow(HWND_DESKTOP, 0, &ulFrameFlags, + WIN_CLIENT_CLASS, "SDL Test", 0, 0, 1, &hwnd); + if (hwndFrame == NULLHANDLE) { + return NULL; + } + + WinSetWindowPos(hwndFrame, HWND_TOP, 0, 0, w, h, + SWP_ZORDER | SWP_ACTIVATE | SWP_SIZE | SWP_SHOW); + + return (void *)hwndFrame; /* We may return client or frame window + handle for SDL_CreateWindowFrom(). */ +} + +static void DestroyWindowNative(void *window) +{ + WinDestroyWindow((HWND) window); +} + +#endif /* TEST_NATIVE_OS2 */ diff --git a/libs/SDL2/test/testnativew32.c b/libs/SDL2/test/testnativew32.c index 544c413cd..a9bf2c779 100644 --- a/libs/SDL2/test/testnativew32.c +++ b/libs/SDL2/test/testnativew32.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/test/testnativex11.c b/libs/SDL2/test/testnativex11.c index a8303c714..f6bd0c0e4 100644 --- a/libs/SDL2/test/testnativex11.c +++ b/libs/SDL2/test/testnativex11.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/test/testoffscreen.c b/libs/SDL2/test/testoffscreen.c new file mode 100644 index 000000000..3738e9603 --- /dev/null +++ b/libs/SDL2/test/testoffscreen.c @@ -0,0 +1,170 @@ +/* + Copyright (C) 1997-2022 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely. +*/ + +/* Simple program: picks the offscreen backend and renders each frame to a bmp */ + +#include +#include +#include + +#ifdef __EMSCRIPTEN__ +#include +#endif + +#include "SDL.h" +#include "SDL_stdinc.h" +#include "SDL_opengl.h" + +static SDL_Renderer *renderer = NULL; +static SDL_Window *window = NULL; +static int done = SDL_FALSE; +static int frame_number = 0; +static int width = 640; +static int height = 480; +static int max_frames = 200; + +void +draw() +{ + SDL_Rect Rect; + + SDL_SetRenderDrawColor(renderer, 0x10, 0x9A, 0xCE, 0xFF); + SDL_RenderClear(renderer); + + /* Grow based on the frame just to show a difference per frame of the region */ + Rect.x = 0; + Rect.y = 0; + Rect.w = (frame_number * 2) % width; + Rect.h = (frame_number * 2) % height; + SDL_SetRenderDrawColor(renderer, 0xFF, 0x10, 0x21, 0xFF); + SDL_RenderFillRect(renderer, &Rect); + + SDL_RenderPresent(renderer); +} + +void +save_surface_to_bmp() +{ + SDL_Surface* surface; + Uint32 r_mask, g_mask, b_mask, a_mask; + Uint32 pixel_format; + char file[128]; + int bbp; + + pixel_format = SDL_GetWindowPixelFormat(window); + SDL_PixelFormatEnumToMasks(pixel_format, &bbp, &r_mask, &g_mask, &b_mask, &a_mask); + + surface = SDL_CreateRGBSurface(0, width, height, bbp, r_mask, g_mask, b_mask, a_mask); + SDL_RenderReadPixels(renderer, NULL, pixel_format, (void*)surface->pixels, surface->pitch); + + SDL_snprintf(file, sizeof(file), "SDL_window%d-%8.8d.bmp", + SDL_GetWindowID(window), ++frame_number); + + SDL_SaveBMP(surface, file); + SDL_FreeSurface(surface); +} + +void +loop() +{ + SDL_Event event; + + /* Check for events */ + while (SDL_PollEvent(&event)) { + switch (event.type) { + case SDL_QUIT: + done = SDL_TRUE; + break; + } + } + + draw(); + save_surface_to_bmp(); + +#ifdef __EMSCRIPTEN__ + if (done) { + emscripten_cancel_main_loop(); + } +#endif +} + +int +main(int argc, char *argv[]) +{ + Uint32 then, now, frames; + + /* Enable standard application logging */ + SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO); + + /* Force the offscreen renderer, if it cannot be created then fail out */ + if (SDL_VideoInit("offscreen") < 0) { + SDL_Log("Couldn't initialize the offscreen video driver: %s\n", + SDL_GetError()); + return SDL_FALSE; + } + + /* If OPENGL fails to init it will fallback to using a framebuffer for rendering */ + window = SDL_CreateWindow("Offscreen Test", + SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, + width, height, 0); + + if (!window) { + SDL_Log("Couldn't create window: %s\n", + SDL_GetError()); + return SDL_FALSE; + } + + renderer = SDL_CreateRenderer(window, -1, 0); + + if (!renderer) { + SDL_Log("Couldn't create renderer: %s\n", + SDL_GetError()); + return SDL_FALSE; + } + + SDL_RenderClear(renderer); + + srand((unsigned int)time(NULL)); + + /* Main render loop */ + frames = 0; + then = SDL_GetTicks(); + done = 0; + + SDL_Log("Rendering %i frames offscreen\n", max_frames); + +#ifdef __EMSCRIPTEN__ + emscripten_set_main_loop(loop, 0, 1); +#else + while (!done && frames < max_frames) { + ++frames; + loop(); + + /* Print out some timing information, along with remaining frames */ + if (frames % (max_frames / 10) == 0) { + now = SDL_GetTicks(); + if (now > then) { + double fps = ((double) frames * 1000) / (now - then); + SDL_Log("Frames remaining: %i rendering at %2.2f frames per second\n", max_frames - frames, fps); + } + } + } +#endif + + SDL_DestroyRenderer(renderer); + SDL_DestroyWindow(window); + SDL_Quit(); + + return 0; +} + +/* vi: set ts=4 sw=4 expandtab: */ diff --git a/libs/SDL2/test/testoverlay2.c b/libs/SDL2/test/testoverlay2.c index 6da1f960c..8bb59a9fa 100644 --- a/libs/SDL2/test/testoverlay2.c +++ b/libs/SDL2/test/testoverlay2.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -16,6 +16,8 @@ * * ********************************************************************************/ +#include + #ifdef __EMSCRIPTEN__ #include #endif @@ -142,7 +144,6 @@ SDL_Texture *MooseTexture; SDL_Rect displayrect; int window_w; int window_h; -SDL_Window *window; SDL_Renderer *renderer; int paused = 0; int i; diff --git a/libs/SDL2/test/testplatform.c b/libs/SDL2/test/testplatform.c index 44128111b..107c277b6 100644 --- a/libs/SDL2/test/testplatform.c +++ b/libs/SDL2/test/testplatform.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -381,6 +381,7 @@ TestCPUInfo(SDL_bool verbose) SDL_Log("AVX %s\n", SDL_HasAVX()? "detected" : "not detected"); SDL_Log("AVX2 %s\n", SDL_HasAVX2()? "detected" : "not detected"); SDL_Log("AVX-512F %s\n", SDL_HasAVX512F()? "detected" : "not detected"); + SDL_Log("ARM SIMD %s\n", SDL_HasARMSIMD()? "detected" : "not detected"); SDL_Log("NEON %s\n", SDL_HasNEON()? "detected" : "not detected"); SDL_Log("System RAM %d MB\n", SDL_GetSystemRAM()); } diff --git a/libs/SDL2/test/testpower.c b/libs/SDL2/test/testpower.c index 985607788..27b05ee21 100644 --- a/libs/SDL2/test/testpower.c +++ b/libs/SDL2/test/testpower.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -19,7 +19,7 @@ report_power(void) { int seconds, percent; const SDL_PowerState state = SDL_GetPowerInfo(&seconds, &percent); - char *statestr = NULL; + const char *statestr = NULL; SDL_Log("SDL-reported power info...\n"); switch (state) { @@ -55,7 +55,7 @@ report_power(void) SDL_Log("Time left: unknown\n"); } else { SDL_Log("Time left: %d minutes, %d seconds\n", (int) (seconds / 60), - (int) (seconds % 60)); + (int) (seconds % 60)); } } diff --git a/libs/SDL2/test/testqsort.c b/libs/SDL2/test/testqsort.c index 8286832c3..d28daebd4 100644 --- a/libs/SDL2/test/testqsort.c +++ b/libs/SDL2/test/testqsort.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -54,16 +54,14 @@ main(int argc, char *argv[]) int success; Uint64 seed = 0; if (argv[1][0] == '0' && argv[1][1] == 'x') - success = SDL_sscanf(argv[1] + 2, "%llx", &seed); + success = SDL_sscanf(argv[1] + 2, "%"SDL_PRIx64, &seed); else - success = SDL_sscanf(argv[1], "%llu", &seed); - if (!success) - { + success = SDL_sscanf(argv[1], "%"SDL_PRIu64, &seed); + if (!success) { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Invalid seed. Use a decimal or hexadecimal number.\n"); return 1; } - if (seed <= 0xffffffff) - { + if (seed <= ((Uint64)0xffffffff)) { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Seed must be equal or greater than 0x100000000.\n"); return 1; } diff --git a/libs/SDL2/test/testrelative.c b/libs/SDL2/test/testrelative.c index 3b61be4fa..59a563eea 100644 --- a/libs/SDL2/test/testrelative.c +++ b/libs/SDL2/test/testrelative.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -28,10 +28,10 @@ SDL_Rect rect; SDL_Event event; static void -DrawRects(SDL_Renderer * renderer, SDL_Rect * rect) +DrawRects(SDL_Renderer * renderer) { SDL_SetRenderDrawColor(renderer, 255, 0, 0, 255); - SDL_RenderFillRect(renderer, rect); + SDL_RenderFillRect(renderer, &rect); } static void @@ -63,7 +63,7 @@ loop(){ if (rect.x > viewport.x + viewport.w) rect.x -= viewport.w; if (rect.y > viewport.y + viewport.h) rect.y -= viewport.h; - DrawRects(renderer, &rect); + DrawRects(renderer); SDL_RenderPresent(renderer); } diff --git a/libs/SDL2/test/testrendercopyex.c b/libs/SDL2/test/testrendercopyex.c index fc01b654e..47d3ae96f 100644 --- a/libs/SDL2/test/testrendercopyex.c +++ b/libs/SDL2/test/testrendercopyex.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/test/testrendertarget.c b/libs/SDL2/test/testrendertarget.c index bc50007ff..3fb611270 100644 --- a/libs/SDL2/test/testrendertarget.c +++ b/libs/SDL2/test/testrendertarget.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -46,7 +46,7 @@ quit(int rc) } SDL_Texture * -LoadTexture(SDL_Renderer *renderer, char *file, SDL_bool transparent) +LoadTexture(SDL_Renderer *renderer, const char *file, SDL_bool transparent) { SDL_Surface *temp; SDL_Texture *texture; diff --git a/libs/SDL2/test/testresample.c b/libs/SDL2/test/testresample.c index ded2ae3d3..6f03aabd4 100644 --- a/libs/SDL2/test/testresample.c +++ b/libs/SDL2/test/testresample.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/test/testrumble.c b/libs/SDL2/test/testrumble.c index c8473f56a..07fc89c58 100644 --- a/libs/SDL2/test/testrumble.c +++ b/libs/SDL2/test/testrumble.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -25,10 +25,6 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND /* * includes */ -#include -#include /* strstr */ -#include /* isdigit */ - #include "SDL.h" #ifndef SDL_HAPTIC_DISABLED @@ -56,7 +52,7 @@ main(int argc, char **argv) if (argc > 1) { size_t l; name = argv[1]; - if ((strcmp(name, "--help") == 0) || (strcmp(name, "-h") == 0)) { + if ((SDL_strcmp(name, "--help") == 0) || (SDL_strcmp(name, "-h") == 0)) { SDL_Log("USAGE: %s [device]\n" "If device is a two-digit number it'll use it as an index, otherwise\n" "it'll use it as if it were part of the device's name.\n", @@ -83,7 +79,7 @@ main(int argc, char **argv) /* Try to find matching device */ else { for (i = 0; i < SDL_NumHaptics(); i++) { - if (strstr(SDL_HapticName(i), name) != NULL) + if (SDL_strstr(SDL_HapticName(i), name) != NULL) break; } @@ -147,7 +143,7 @@ int main(int argc, char *argv[]) { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL compiled without Haptic support.\n"); - exit(1); + return 1; } #endif diff --git a/libs/SDL2/test/testscale.c b/libs/SDL2/test/testscale.c index 363927721..1235c811d 100644 --- a/libs/SDL2/test/testscale.c +++ b/libs/SDL2/test/testscale.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -47,7 +47,7 @@ quit(int rc) } SDL_Texture * -LoadTexture(SDL_Renderer *renderer, char *file, SDL_bool transparent) +LoadTexture(SDL_Renderer *renderer, const char *file, SDL_bool transparent) { SDL_Surface *temp; SDL_Texture *texture; diff --git a/libs/SDL2/test/testsem.c b/libs/SDL2/test/testsem.c index 804344020..eaa28642a 100644 --- a/libs/SDL2/test/testsem.c +++ b/libs/SDL2/test/testsem.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -19,27 +19,21 @@ #include "SDL.h" #define NUM_THREADS 10 +/* This value should be smaller than the maximum count of the */ +/* semaphore implementation: */ +#define NUM_OVERHEAD_OPS 10000 +#define NUM_OVERHEAD_OPS_MULT 10 static SDL_sem *sem; -int alive = 1; +int alive; -int SDLCALL -ThreadFunc(void *data) -{ - int threadnum = (int) (uintptr_t) data; - while (alive) { - SDL_SemWait(sem); - SDL_Log("Thread number %d has got the semaphore (value = %d)!\n", - threadnum, SDL_SemValue(sem)); - SDL_Delay(200); - SDL_SemPost(sem); - SDL_Log("Thread number %d has released the semaphore (value = %d)!\n", - threadnum, SDL_SemValue(sem)); - SDL_Delay(1); /* For the scheduler */ - } - SDL_Log("Thread number %d exiting.\n", threadnum); - return 0; -} +typedef struct Thread_State { + SDL_Thread * thread; + int number; + SDL_bool flag; + int loop_count; + int content_count; +} Thread_State; static void killed(int sig) @@ -47,6 +41,60 @@ killed(int sig) alive = 0; } +static int SDLCALL +ThreadFuncRealWorld(void *data) +{ + Thread_State *state = (Thread_State *) data; + while (alive) { + SDL_SemWait(sem); + SDL_Log("Thread number %d has got the semaphore (value = %d)!\n", + state->number, SDL_SemValue(sem)); + SDL_Delay(200); + SDL_SemPost(sem); + SDL_Log("Thread number %d has released the semaphore (value = %d)!\n", + state->number, SDL_SemValue(sem)); + ++state->loop_count; + SDL_Delay(1); /* For the scheduler */ + } + SDL_Log("Thread number %d exiting.\n", state->number); + return 0; +} + +static void +TestRealWorld(int init_sem) { + Thread_State thread_states[NUM_THREADS] = { {0} }; + int i; + int loop_count; + + sem = SDL_CreateSemaphore(init_sem); + + SDL_Log("Running %d threads, semaphore value = %d\n", NUM_THREADS, + init_sem); + alive = 1; + /* Create all the threads */ + for (i = 0; i < NUM_THREADS; ++i) { + char name[64]; + SDL_snprintf(name, sizeof (name), "Thread%u", (unsigned int) i); + thread_states[i].number = i; + thread_states[i].thread = SDL_CreateThread(ThreadFuncRealWorld, name, (void *) &thread_states[i]); + } + + /* Wait 10 seconds */ + SDL_Delay(10 * 1000); + + /* Wait for all threads to finish */ + SDL_Log("Waiting for threads to finish\n"); + alive = 0; + loop_count = 0; + for (i = 0; i < NUM_THREADS; ++i) { + SDL_WaitThread(thread_states[i].thread, NULL); + loop_count += thread_states[i].loop_count; + } + SDL_Log("Finished waiting for threads, ran %d loops in total\n\n", loop_count); + + SDL_DestroySemaphore(sem); +} + static void TestWaitTimeout(void) { @@ -65,21 +113,137 @@ TestWaitTimeout(void) duration = end_ticks - start_ticks; /* Accept a little offset in the effective wait */ - if (duration > 1900 && duration < 2050) - SDL_Log("Wait done.\n"); - else - SDL_Log("Wait took %d milliseconds\n", duration); + SDL_assert(duration > 1900 && duration < 2050); + SDL_Log("Wait took %d milliseconds\n\n", duration); /* Check to make sure the return value indicates timed out */ if (retval != SDL_MUTEX_TIMEDOUT) - SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL_SemWaitTimeout returned: %d; expected: %d\n", retval, SDL_MUTEX_TIMEDOUT); + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL_SemWaitTimeout returned: %d; expected: %d\n\n", retval, SDL_MUTEX_TIMEDOUT); + + SDL_DestroySemaphore(sem); +} + +static void +TestOverheadUncontended(void) +{ + Uint32 start_ticks; + Uint32 end_ticks; + Uint32 duration; + int i, j; + + sem = SDL_CreateSemaphore(0); + SDL_Log("Doing %d uncontended Post/Wait operations on semaphore\n", NUM_OVERHEAD_OPS * NUM_OVERHEAD_OPS_MULT); + + start_ticks = SDL_GetTicks(); + for (i = 0; i < NUM_OVERHEAD_OPS_MULT; i++){ + for (j = 0; j < NUM_OVERHEAD_OPS; j++) { + SDL_SemPost(sem); + } + for (j = 0; j < NUM_OVERHEAD_OPS; j++) { + SDL_SemWait(sem); + } + } + end_ticks = SDL_GetTicks(); + + duration = end_ticks - start_ticks; + SDL_Log("Took %d milliseconds\n\n", duration); + + SDL_DestroySemaphore(sem); +} + +static int SDLCALL +ThreadFuncOverheadContended(void *data) +{ + Thread_State *state = (Thread_State *) data; + + if (state->flag) { + while(alive) { + if (SDL_SemTryWait(sem) == SDL_MUTEX_TIMEDOUT) { + ++state->content_count; + } + ++state->loop_count; + } + } else { + while(alive) { + /* Timeout needed to allow check on alive flag */ + if (SDL_SemWaitTimeout(sem, 50) == SDL_MUTEX_TIMEDOUT) { + ++state->content_count; + } + ++state->loop_count; + } + } + return 0; +} + +static void +TestOverheadContended(SDL_bool try_wait) +{ + Uint32 start_ticks; + Uint32 end_ticks; + Uint32 duration; + Thread_State thread_states[NUM_THREADS] = { {0} }; + char textBuffer[1024]; + int loop_count; + int content_count; + int i, j; + size_t len; + + sem = SDL_CreateSemaphore(0); + SDL_Log("Doing %d contended %s operations on semaphore using %d threads\n", + NUM_OVERHEAD_OPS * NUM_OVERHEAD_OPS_MULT, try_wait ? "Post/TryWait" : "Post/WaitTimeout", NUM_THREADS); + alive = 1; + /* Create multiple threads to starve the semaphore and cause contention */ + for (i = 0; i < NUM_THREADS; ++i) { + char name[64]; + SDL_snprintf(name, sizeof (name), "Thread%u", (unsigned int) i); + thread_states[i].flag = try_wait; + thread_states[i].thread = SDL_CreateThread(ThreadFuncOverheadContended, name, (void *) &thread_states[i]); + } + + start_ticks = SDL_GetTicks(); + for (i = 0; i < NUM_OVERHEAD_OPS_MULT; i++) { + for (j = 0; j < NUM_OVERHEAD_OPS; j++) { + SDL_SemPost(sem); + } + /* Make sure threads consumed everything */ + while (SDL_SemValue(sem)) { } + } + end_ticks = SDL_GetTicks(); + + alive = 0; + loop_count = 0; + content_count = 0; + for (i = 0; i < NUM_THREADS; ++i) { + SDL_WaitThread(thread_states[i].thread, NULL); + loop_count += thread_states[i].loop_count; + content_count += thread_states[i].content_count; + } + SDL_assert_release((loop_count - content_count) == NUM_OVERHEAD_OPS * NUM_OVERHEAD_OPS_MULT); + + duration = end_ticks - start_ticks; + SDL_Log("Took %d milliseconds, threads %s %d out of %d times in total (%.2f%%)\n", + duration, try_wait ? "where contended" : "timed out", content_count, + loop_count, ((float)content_count * 100) / loop_count); + /* Print how many semaphores where consumed per thread */ + SDL_snprintf(textBuffer, sizeof(textBuffer), "{ "); + for (i = 0; i < NUM_THREADS; ++i) { + if (i > 0) { + len = SDL_strlen(textBuffer); + SDL_snprintf(textBuffer + len, sizeof(textBuffer) - len, ", "); + } + len = SDL_strlen(textBuffer); + SDL_snprintf(textBuffer + len, sizeof(textBuffer) - len, "%d", thread_states[i].loop_count - thread_states[i].content_count); + } + len = SDL_strlen(textBuffer); + SDL_snprintf(textBuffer + len, sizeof(textBuffer) - len, " }\n"); + SDL_Log("%s\n", textBuffer); + + SDL_DestroySemaphore(sem); } int main(int argc, char **argv) { - SDL_Thread *threads[NUM_THREADS]; - uintptr_t i; int init_sem; /* Enable standard application logging */ @@ -98,33 +262,19 @@ main(int argc, char **argv) signal(SIGTERM, killed); signal(SIGINT, killed); - init_sem = atoi(argv[1]); - sem = SDL_CreateSemaphore(init_sem); - - SDL_Log("Running %d threads, semaphore value = %d\n", NUM_THREADS, - init_sem); - /* Create all the threads */ - for (i = 0; i < NUM_THREADS; ++i) { - char name[64]; - SDL_snprintf(name, sizeof (name), "Thread%u", (unsigned int) i); - threads[i] = SDL_CreateThread(ThreadFunc, name, (void *) i); + init_sem = SDL_atoi(argv[1]); + if (init_sem > 0) { + TestRealWorld(init_sem); } - /* Wait 10 seconds */ - SDL_Delay(10 * 1000); - - /* Wait for all threads to finish */ - SDL_Log("Waiting for threads to finish\n"); - alive = 0; - for (i = 0; i < NUM_THREADS; ++i) { - SDL_WaitThread(threads[i], NULL); - } - SDL_Log("Finished waiting for threads\n"); - - SDL_DestroySemaphore(sem); - TestWaitTimeout(); + TestOverheadUncontended(); + + TestOverheadContended(SDL_FALSE); + + TestOverheadContended(SDL_TRUE); + SDL_Quit(); return (0); } diff --git a/libs/SDL2/test/testsensor.c b/libs/SDL2/test/testsensor.c index 0896c3067..658a65be8 100644 --- a/libs/SDL2/test/testsensor.c +++ b/libs/SDL2/test/testsensor.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -95,7 +95,11 @@ main(int argc, char **argv) SDL_CreateWindow("Sensor Test", 0, 0, 0, 0, SDL_WINDOW_FULLSCREEN_DESKTOP); while (!done) { - while (SDL_PollEvent(&event) > 0) { + /* Update to get the current event state */ + SDL_PumpEvents(); + + /* Process all currently pending events */ + while (SDL_PeepEvents(&event, 1, SDL_GETEVENT, SDL_FIRSTEVENT, SDL_LASTEVENT) == 1) { switch (event.type) { case SDL_SENSORUPDATE: HandleSensorEvent(&event.sensor); diff --git a/libs/SDL2/test/testshader.c b/libs/SDL2/test/testshader.c index c791cd5b9..2cee7d9b3 100644 --- a/libs/SDL2/test/testshader.c +++ b/libs/SDL2/test/testshader.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/test/testshape.c b/libs/SDL2/test/testshape.c index dab3a8747..1497528a9 100644 --- a/libs/SDL2/test/testshape.c +++ b/libs/SDL2/test/testshape.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/test/testsprite2.c b/libs/SDL2/test/testsprite2.c index 76ac7ebd1..88419ffcf 100644 --- a/libs/SDL2/test/testsprite2.c +++ b/libs/SDL2/test/testsprite2.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -39,6 +39,7 @@ static int sprite_w, sprite_h; static SDL_BlendMode blendMode = SDL_BLENDMODE_BLEND; static Uint32 next_fps_check, frames; static const Uint32 fps_check_delay = 5000; +static int use_rendergeometry = 0; /* Number of iterations to move sprites - used for visual tests. */ /* -1: infinite random moves (default); >=0: enables N deterministic moves */ @@ -175,7 +176,38 @@ MoveSprites(SDL_Renderer * renderer, SDL_Texture * sprite) temp.y = 1; temp.w = sprite_w; temp.h = sprite_h; - SDL_RenderFillRect(renderer, &temp); + if (use_rendergeometry == 0) { + SDL_RenderFillRect(renderer, &temp); + } else { + /* Draw two triangles, filled, uniform */ + SDL_Color color; + SDL_Vertex verts[3]; + SDL_zeroa(verts); + color.r = 0xFF; + color.g = 0xFF; + color.b = 0xFF; + color.a = 0xFF; + + verts[0].position.x = (float)temp.x; + verts[0].position.y = (float)temp.y; + verts[0].color = color; + + verts[1].position.x = (float)temp.x + temp.w; + verts[1].position.y = (float)temp.y; + verts[1].color = color; + + verts[2].position.x = (float)temp.x + temp.w; + verts[2].position.y = (float)temp.y + temp.h; + verts[2].color = color; + + SDL_RenderGeometry(renderer, NULL, verts, 3, NULL, 0); + + verts[1].position.x = (float)temp.x; + verts[1].position.y = (float)temp.y + temp.h; + verts[1].color = color; + + SDL_RenderGeometry(renderer, NULL, verts, 3, NULL, 0); + } SDL_RenderCopy(renderer, sprite, NULL, &temp); temp.x = viewport.w-sprite_w-1; temp.y = 1; @@ -220,7 +252,7 @@ MoveSprites(SDL_Renderer * renderer, SDL_Texture * sprite) } } - + /* Countdown sprite-move iterations and disable color changes at iteration end - used for visual tests. */ if (iterations > 0) { iterations--; @@ -232,11 +264,160 @@ MoveSprites(SDL_Renderer * renderer, SDL_Texture * sprite) } /* Draw sprites */ - for (i = 0; i < num_sprites; ++i) { - position = &positions[i]; + if (use_rendergeometry == 0) { + for (i = 0; i < num_sprites; ++i) { + position = &positions[i]; - /* Blit the sprite onto the screen */ - SDL_RenderCopy(renderer, sprite, NULL, position); + /* Blit the sprite onto the screen */ + SDL_RenderCopy(renderer, sprite, NULL, position); + } + } else if (use_rendergeometry == 1) { + /* + * 0--1 + * | /| + * |/ | + * 3--2 + * + * Draw sprite2 as triangles that can be recombined as rect by software renderer + */ + SDL_Vertex *verts = (SDL_Vertex *) SDL_malloc(num_sprites * sizeof (SDL_Vertex) * 6); + SDL_Vertex *verts2 = verts; + if (verts) { + SDL_Color color; + SDL_GetTextureColorMod(sprite, &color.r, &color.g, &color.b); + SDL_GetTextureAlphaMod(sprite, &color.a); + for (i = 0; i < num_sprites; ++i) { + position = &positions[i]; + /* 0 */ + verts->position.x = (float)position->x; + verts->position.y = (float)position->y; + verts->color = color; + verts->tex_coord.x = 0.0f; + verts->tex_coord.y = 0.0f; + verts++; + /* 1 */ + verts->position.x = (float)position->x + position->w; + verts->position.y = (float)position->y; + verts->color = color; + verts->tex_coord.x = 1.0f; + verts->tex_coord.y = 0.0f; + verts++; + /* 2 */ + verts->position.x = (float)position->x + position->w; + verts->position.y = (float)position->y + position->h; + verts->color = color; + verts->tex_coord.x = 1.0f; + verts->tex_coord.y = 1.0f; + verts++; + /* 0 */ + verts->position.x = (float)position->x; + verts->position.y = (float)position->y; + verts->color = color; + verts->tex_coord.x = 0.0f; + verts->tex_coord.y = 0.0f; + verts++; + /* 2 */ + verts->position.x = (float)position->x + position->w; + verts->position.y = (float)position->y + position->h; + verts->color = color; + verts->tex_coord.x = 1.0f; + verts->tex_coord.y = 1.0f; + verts++; + /* 3 */ + verts->position.x = (float)position->x; + verts->position.y = (float)position->y + position->h; + verts->color = color; + verts->tex_coord.x = 0.0f; + verts->tex_coord.y = 1.0f; + verts++; + } + + /* Blit sprites as triangles onto the screen */ + SDL_RenderGeometry(renderer, sprite, verts2, num_sprites * 6, NULL, 0); + SDL_free(verts2); + } + } else if (use_rendergeometry == 2) { + /* 0-----1 + * |\ A /| + * | \ / | + * |D 2 B| + * | / \ | + * |/ C \| + * 3-----4 + * + * Draw sprite2 as triangles that can *not* be recombined as rect by software renderer + * Use an 'indices' array + */ + SDL_Vertex *verts = (SDL_Vertex *) SDL_malloc(num_sprites * sizeof (SDL_Vertex) * 5); + SDL_Vertex *verts2 = verts; + int *indices = (int *) SDL_malloc(num_sprites * sizeof (int) * 4 * 3); + int *indices2 = indices; + if (verts && indices) { + int pos = 0; + SDL_Color color; + SDL_GetTextureColorMod(sprite, &color.r, &color.g, &color.b); + SDL_GetTextureAlphaMod(sprite, &color.a); + for (i = 0; i < num_sprites; ++i) { + position = &positions[i]; + /* 0 */ + verts->position.x = (float)position->x; + verts->position.y = (float)position->y; + verts->color = color; + verts->tex_coord.x = 0.0f; + verts->tex_coord.y = 0.0f; + verts++; + /* 1 */ + verts->position.x = (float)position->x + position->w; + verts->position.y = (float)position->y; + verts->color = color; + verts->tex_coord.x = 1.0f; + verts->tex_coord.y = 0.0f; + verts++; + /* 2 */ + verts->position.x = (float)position->x + position->w / 2.0f; + verts->position.y = (float)position->y + position->h / 2.0f; + verts->color = color; + verts->tex_coord.x = 0.5f; + verts->tex_coord.y = 0.5f; + verts++; + /* 3 */ + verts->position.x = (float)position->x; + verts->position.y = (float)position->y + position->h; + verts->color = color; + verts->tex_coord.x = 0.0f; + verts->tex_coord.y = 1.0f; + verts++; + /* 4 */ + verts->position.x = (float)position->x + position->w; + verts->position.y = (float)position->y + position->h; + verts->color = color; + verts->tex_coord.x = 1.0f; + verts->tex_coord.y = 1.0f; + verts++; + /* A */ + *indices++ = pos + 0; + *indices++ = pos + 1; + *indices++ = pos + 2; + /* B */ + *indices++ = pos + 1; + *indices++ = pos + 2; + *indices++ = pos + 4; + /* C */ + *indices++ = pos + 3; + *indices++ = pos + 2; + *indices++ = pos + 4; + /* D */ + *indices++ = pos + 3; + *indices++ = pos + 2; + *indices++ = pos + 0; + pos += 5; + } + } + + /* Blit sprites as triangles onto the screen */ + SDL_RenderGeometry(renderer, sprite, verts2, num_sprites * 5, indices2, num_sprites * 4 * 3); + SDL_free(verts2); + SDL_free(indices2); } /* Update the screen! */ @@ -331,6 +512,20 @@ main(int argc, char *argv[]) } else if (SDL_strcasecmp(argv[i], "--cyclealpha") == 0) { cycle_alpha = SDL_TRUE; consumed = 1; + } else if (SDL_strcasecmp(argv[i], "--use-rendergeometry") == 0) { + if (argv[i + 1]) { + if (SDL_strcasecmp(argv[i + 1], "mode1") == 0) { + /* Draw sprite2 as triangles that can be recombined as rect by software renderer */ + use_rendergeometry = 1; + } else if (SDL_strcasecmp(argv[i + 1], "mode2") == 0) { + /* Draw sprite2 as triangles that can *not* be recombined as rect by software renderer + * Use an 'indices' array */ + use_rendergeometry = 2; + } else { + return -1; + } + } + consumed = 2; } else if (SDL_isdigit(*argv[i])) { num_sprites = SDL_atoi(argv[i]); consumed = 1; @@ -340,7 +535,15 @@ main(int argc, char *argv[]) } } if (consumed < 0) { - static const char *options[] = { "[--blend none|blend|add|mod]", "[--cyclecolor]", "[--cyclealpha]", "[--iterations N]", "[num_sprites]", "[icon.bmp]", NULL }; + static const char *options[] = { + "[--blend none|blend|add|mod]", + "[--cyclecolor]", + "[--cyclealpha]", + "[--iterations N]", + "[--use-rendergeometry mode1|mode2]", + "[num_sprites]", + "[icon.bmp]", + NULL }; SDLTest_CommonLogUsage(state, argv[0], options); quit(1); } @@ -374,7 +577,7 @@ main(int argc, char *argv[]) quit(2); } - /* Position sprites and set their velocities using the fuzzer */ + /* Position sprites and set their velocities using the fuzzer */ if (iterations >= 0) { /* Deterministic seed - used for visual tests */ seed = (Uint64)iterations; diff --git a/libs/SDL2/test/testspriteminimal.c b/libs/SDL2/test/testspriteminimal.c index 3eebdf8cf..b9762cab3 100644 --- a/libs/SDL2/test/testspriteminimal.c +++ b/libs/SDL2/test/testspriteminimal.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -38,11 +38,12 @@ int done; static void quit(int rc) { + SDL_Quit(); exit(rc); } int -LoadSprite(char *file, SDL_Renderer *renderer) +LoadSprite(const char *file) { SDL_Surface *temp; @@ -91,7 +92,7 @@ LoadSprite(char *file, SDL_Renderer *renderer) } void -MoveSprites(SDL_Renderer * renderer, SDL_Texture * sprite) +MoveSprites() { int i; int window_w = WINDOW_WIDTH; @@ -135,7 +136,7 @@ void loop() done = 1; } } - MoveSprites(renderer, sprite); + MoveSprites(); #ifdef __EMSCRIPTEN__ if (done) { emscripten_cancel_main_loop(); @@ -157,7 +158,7 @@ main(int argc, char *argv[]) quit(2); } - if (LoadSprite("icon.bmp", renderer) < 0) { + if (LoadSprite("icon.bmp") < 0) { quit(2); } diff --git a/libs/SDL2/test/teststreaming.c b/libs/SDL2/test/teststreaming.c index ade436bf2..72444f80e 100644 --- a/libs/SDL2/test/teststreaming.c +++ b/libs/SDL2/test/teststreaming.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -67,7 +67,7 @@ void quit(int rc) exit(rc); } -void UpdateTexture(SDL_Texture *texture, int frame) +void UpdateTexture(SDL_Texture *texture) { SDL_Color *color; Uint8 *src; @@ -110,7 +110,7 @@ loop() } frame = (frame + 1) % MOOSEFRAMES_COUNT; - UpdateTexture(MooseTexture, frame); + UpdateTexture(MooseTexture); SDL_RenderClear(renderer); SDL_RenderCopy(renderer, MooseTexture, NULL, NULL); diff --git a/libs/SDL2/test/testsurround.c b/libs/SDL2/test/testsurround.c new file mode 100644 index 000000000..168415aca --- /dev/null +++ b/libs/SDL2/test/testsurround.c @@ -0,0 +1,200 @@ +/* + Copyright (C) 1997-2022 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely. +*/ + +/* Program to test surround sound audio channels */ +#include "SDL_config.h" + +#include "SDL.h" + +static int total_channels; +static int active_channel; + +#define SAMPLE_RATE_HZ 48000 +#define CHANNEL_TEST_TIME_SEC 5 +#define MAX_AMPLITUDE SDL_MAX_SINT16 + +#define SINE_FREQ_HZ 500 +#define LFE_SINE_FREQ_HZ 50 + +/* The channel layout is defined in SDL_audio.h */ +const char* +get_channel_name(int channel_index, int channel_count) +{ + switch (channel_index) { + case 0: + return "Front Left"; + case 1: + return "Front Right"; + case 2: + switch (channel_count) { + case 3: + return "Low Frequency Effects"; + case 4: + return "Back Left"; + default: + return "Front Center"; + } + case 3: + switch (channel_count) { + case 4: + return "Back Right"; + case 5: + return "Back Left"; + default: + return "Low Frequency Effects"; + } + case 4: + switch (channel_count) { + case 5: + return "Back Right"; + case 7: + return "Back Center"; + case 6: + case 8: + return "Back Left"; + } + case 5: + switch (channel_count) { + case 7: + return "Back Left"; + case 6: + case 8: + return "Back Right"; + } + case 6: + switch (channel_count) { + case 7: + return "Back Right"; + case 8: + return "Side Left"; + } + case 7: + return "Side Right"; + } + + return NULL; +} + +SDL_bool +is_lfe_channel(int channel_index, int channel_count) +{ + return (channel_count == 3 && channel_index == 2) || (channel_count >= 6 && channel_index == 3); +} + +void SDLCALL +fill_buffer(void* unused, Uint8* stream, int len) +{ + Sint16* buffer = (Sint16*)stream; + int samples = len / sizeof(Sint16); + static int total_samples = 0; + int i; + + SDL_memset(stream, 0, len); + + /* This can happen for a short time when switching devices */ + if (active_channel == total_channels) { + return; + } + + /* Play a sine wave on the active channel only */ + for (i = active_channel; i < samples; i += total_channels) { + float time = (float)total_samples++ / SAMPLE_RATE_HZ; + int sine_freq = is_lfe_channel(active_channel, total_channels) ? LFE_SINE_FREQ_HZ : SINE_FREQ_HZ; + int amplitude; + + /* Gradually ramp up and down to avoid audible pops when switching between channels */ + if (total_samples < SAMPLE_RATE_HZ) { + amplitude = total_samples * MAX_AMPLITUDE / SAMPLE_RATE_HZ; + } else if (total_samples > (CHANNEL_TEST_TIME_SEC - 1) * SAMPLE_RATE_HZ) { + amplitude = (CHANNEL_TEST_TIME_SEC * SAMPLE_RATE_HZ - total_samples) * MAX_AMPLITUDE / SAMPLE_RATE_HZ; + } else { + amplitude = MAX_AMPLITUDE; + } + + buffer[i] = (Sint16)(SDL_sin(6.283185f * sine_freq * time) * amplitude); + + /* Reset our state for next callback if this channel test is finished */ + if (total_samples == CHANNEL_TEST_TIME_SEC * SAMPLE_RATE_HZ) { + total_samples = 0; + active_channel++; + break; + } + } +} + +int +main(int argc, char *argv[]) +{ + int i; + + /* Enable standard application logging */ + SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO); + + if (SDL_Init(SDL_INIT_AUDIO) < 0) { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't initialize SDL: %s\n", SDL_GetError()); + return 1; + } + + /* Show the list of available drivers */ + SDL_Log("Available audio drivers:"); + for (i = 0; i < SDL_GetNumAudioDrivers(); ++i) { + SDL_Log("%i: %s", i, SDL_GetAudioDriver(i)); + } + + SDL_Log("Using audio driver: %s\n", SDL_GetCurrentAudioDriver()); + + for (i = 0; i < SDL_GetNumAudioDevices(0); i++) { + const char *devname = SDL_GetAudioDeviceName(i, 0); + int j; + SDL_AudioSpec spec; + SDL_AudioDeviceID dev; + + if (SDL_GetAudioDeviceSpec(i, 0, &spec) != 0) { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL_GetAudioSpec() failed: %s\n", SDL_GetError()); + continue; + } + + spec.freq = SAMPLE_RATE_HZ; + spec.format = AUDIO_S16SYS; + spec.samples = 4096; + spec.callback = fill_buffer; + + dev = SDL_OpenAudioDevice(devname, 0, &spec, NULL, 0); + if (dev == 0) { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL_OpenAudioDevice() failed: %s\n", SDL_GetError()); + continue; + } + + SDL_Log("Testing audio device: %s (%d channels)\n", devname, spec.channels); + + /* These are used by the fill_buffer callback */ + total_channels = spec.channels; + active_channel = 0; + + SDL_PauseAudioDevice(dev, 0); + + for (j = 0; j < total_channels; j++) { + int sine_freq = is_lfe_channel(j, total_channels) ? LFE_SINE_FREQ_HZ : SINE_FREQ_HZ; + + SDL_Log("Playing %d Hz test tone on channel: %s\n", sine_freq, get_channel_name(j, total_channels)); + + /* fill_buffer() will increment the active channel */ + SDL_Delay(CHANNEL_TEST_TIME_SEC * 1000); + } + + SDL_CloseAudioDevice(dev); + } + + SDL_Quit(); + return 0; +} + diff --git a/libs/SDL2/test/testthread.c b/libs/SDL2/test/testthread.c index 34c5d8821..bf201e8e4 100644 --- a/libs/SDL2/test/testthread.c +++ b/libs/SDL2/test/testthread.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/test/testtimer.c b/libs/SDL2/test/testtimer.c index e3fa93acf..d696097c8 100644 --- a/libs/SDL2/test/testtimer.c +++ b/libs/SDL2/test/testtimer.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -42,6 +42,7 @@ main(int argc, char *argv[]) { int i, desired; SDL_TimerID t1, t2, t3; + Uint64 start64, now64; Uint32 start32, now32; Uint64 start, now; @@ -53,10 +54,25 @@ main(int argc, char *argv[]) return (1); } + /* Verify SDL_GetTicks* acts monotonically increasing, and not erratic. */ + SDL_Log("Sanity-checking GetTicks\n"); + for (i = 0; i < 1000; ++i) { + start64 = SDL_GetTicks64(); + start32 = SDL_GetTicks(); + SDL_Delay(1); + now64 = SDL_GetTicks64() - start64; + now32 = SDL_GetTicks() - start32; + if (now32 > 100 || now64 > 100) { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "testtimer.c: Delta time erratic at iter %d. Delay 1ms = %d ms in ticks, %d ms in ticks64\n", i, (int)now32, (int)now64); + SDL_Quit(); + return 1; + } + } + /* Start the timer */ desired = 0; if (argv[1]) { - desired = atoi(argv[1]); + desired = SDL_atoi(argv[1]); } if (desired == 0) { desired = DEFAULT_RESOLUTION; @@ -107,13 +123,15 @@ main(int argc, char *argv[]) now = SDL_GetPerformanceCounter(); SDL_Log("1 million iterations of ticktock took %f ms\n", (double)((now - start)*1000) / SDL_GetPerformanceFrequency()); - SDL_Log("Performance counter frequency: %"SDL_PRIu64"\n", (unsigned long long) SDL_GetPerformanceFrequency()); + SDL_Log("Performance counter frequency: %"SDL_PRIu64"\n", SDL_GetPerformanceFrequency()); + start64 = SDL_GetTicks64(); start32 = SDL_GetTicks(); start = SDL_GetPerformanceCounter(); SDL_Delay(1000); now = SDL_GetPerformanceCounter(); + now64 = SDL_GetTicks64(); now32 = SDL_GetTicks(); - SDL_Log("Delay 1 second = %d ms in ticks, %f ms according to performance counter\n", (now32-start32), (double)((now - start)*1000) / SDL_GetPerformanceFrequency()); + SDL_Log("Delay 1 second = %d ms in ticks, %d ms in ticks64, %f ms according to performance counter\n", (int) (now32-start32), (int) (now64-start64), (double)((now - start)*1000) / SDL_GetPerformanceFrequency()); SDL_Quit(); return (0); diff --git a/libs/SDL2/test/testurl.c b/libs/SDL2/test/testurl.c new file mode 100644 index 000000000..4b5a4ed29 --- /dev/null +++ b/libs/SDL2/test/testurl.c @@ -0,0 +1,36 @@ +/* + Copyright (C) 1997-2022 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely. +*/ +#include "SDL.h" + +int main(int argc, char **argv) +{ + int i; + if (SDL_Init(SDL_INIT_VIDEO) == -1) { + SDL_Log("SDL_Init failed: %s\n", SDL_GetError()); + return 1; + } + + for (i = 1; i < argc; i++) { + const char *url = argv[i]; + SDL_Log("Opening '%s' ...", url); + if (SDL_OpenURL(url) == 0) { + SDL_Log(" success!"); + } else { + SDL_Log(" failed! %s", SDL_GetError()); + } + } + + SDL_Quit(); + return 0; +} + +/* vi: set ts=4 sw=4 expandtab: */ diff --git a/libs/SDL2/test/testver.c b/libs/SDL2/test/testver.c index 2c39c637c..cbbba7ec6 100644 --- a/libs/SDL2/test/testver.c +++ b/libs/SDL2/test/testver.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -35,13 +35,13 @@ main(int argc, char *argv[]) SDL_Log("Compiled with SDL older than 2.0\n"); #endif SDL_VERSION(&compiled); - SDL_Log("Compiled version: %d.%d.%d.%d (%s)\n", + SDL_Log("Compiled version: %d.%d.%d (%s)\n", compiled.major, compiled.minor, compiled.patch, - SDL_REVISION_NUMBER, SDL_REVISION); + SDL_REVISION); SDL_GetVersion(&linked); - SDL_Log("Linked version: %d.%d.%d.%d (%s)\n", + SDL_Log("Linked version: %d.%d.%d (%s)\n", linked.major, linked.minor, linked.patch, - SDL_GetRevisionNumber(), SDL_GetRevision()); + SDL_GetRevision()); SDL_Quit(); return (0); } diff --git a/libs/SDL2/test/testviewport.c b/libs/SDL2/test/testviewport.c index 2706ab2ff..0e39d852d 100644 --- a/libs/SDL2/test/testviewport.c +++ b/libs/SDL2/test/testviewport.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -25,12 +25,14 @@ static SDLTest_CommonState *state; -SDL_Rect viewport; -int done, j; -SDL_bool use_target = SDL_FALSE; +static SDL_Rect viewport; +static int done, j; +static SDL_bool use_target = SDL_FALSE; #ifdef __EMSCRIPTEN__ -Uint32 wait_start; +static Uint32 wait_start; #endif +static SDL_Texture *sprite; +static int sprite_w, sprite_h; /* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */ static void @@ -40,8 +42,57 @@ quit(int rc) exit(rc); } +int +LoadSprite(const char *file, SDL_Renderer *renderer) +{ + SDL_Surface *temp; + + /* Load the sprite image */ + temp = SDL_LoadBMP(file); + if (temp == NULL) { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't load %s: %s\n", file, SDL_GetError()); + return (-1); + } + sprite_w = temp->w; + sprite_h = temp->h; + + /* Set transparent pixel as the pixel at (0,0) */ + if (temp->format->palette) { + SDL_SetColorKey(temp, SDL_TRUE, *(Uint8 *) temp->pixels); + } else { + switch (temp->format->BitsPerPixel) { + case 15: + SDL_SetColorKey(temp, SDL_TRUE, + (*(Uint16 *) temp->pixels) & 0x00007FFF); + break; + case 16: + SDL_SetColorKey(temp, SDL_TRUE, *(Uint16 *) temp->pixels); + break; + case 24: + SDL_SetColorKey(temp, SDL_TRUE, + (*(Uint32 *) temp->pixels) & 0x00FFFFFF); + break; + case 32: + SDL_SetColorKey(temp, SDL_TRUE, *(Uint32 *) temp->pixels); + break; + } + } + + /* Create textures from the image */ + sprite = SDL_CreateTextureFromSurface(renderer, temp); + if (!sprite) { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create texture: %s\n", SDL_GetError()); + SDL_FreeSurface(temp); + return (-1); + } + SDL_FreeSurface(temp); + + /* We're ready to roll. :) */ + return (0); +} + void -DrawOnViewport(SDL_Renderer * renderer, SDL_Rect viewport) +DrawOnViewport(SDL_Renderer * renderer) { SDL_Rect rect; @@ -53,11 +104,11 @@ DrawOnViewport(SDL_Renderer * renderer, SDL_Rect viewport) SDL_RenderClear(renderer); /* Test inside points */ - SDL_SetRenderDrawColor(renderer, 0xFF, 0xFF, 0xF, 0xFF); - SDL_RenderDrawPoint(renderer, viewport.h/2 + 10, viewport.w/2); - SDL_RenderDrawPoint(renderer, viewport.h/2 - 10, viewport.w/2); - SDL_RenderDrawPoint(renderer, viewport.h/2 , viewport.w/2 - 10); - SDL_RenderDrawPoint(renderer, viewport.h/2 , viewport.w/2 + 10); + SDL_SetRenderDrawColor(renderer, 0xFF, 0xFF, 0x00, 0xFF); + SDL_RenderDrawPoint(renderer, viewport.h/2 + 20, viewport.w/2); + SDL_RenderDrawPoint(renderer, viewport.h/2 - 20, viewport.w/2); + SDL_RenderDrawPoint(renderer, viewport.h/2 , viewport.w/2 - 20); + SDL_RenderDrawPoint(renderer, viewport.h/2 , viewport.w/2 + 20); /* Test horizontal and vertical lines */ SDL_SetRenderDrawColor(renderer, 0x00, 0xFF, 0x00, 0xFF); @@ -68,17 +119,15 @@ DrawOnViewport(SDL_Renderer * renderer, SDL_Rect viewport) /* Test diagonal lines */ SDL_SetRenderDrawColor(renderer, 0x00, 0x00, 0xFF, 0xFF); - SDL_RenderDrawLine(renderer, 0, 0, - viewport.w-1, viewport.h-1); - SDL_RenderDrawLine(renderer, viewport.w-1, 0, - 0, viewport.h-1); + SDL_RenderDrawLine(renderer, 0, 0, viewport.w-1, viewport.h-1); + SDL_RenderDrawLine(renderer, viewport.w-1, 0, 0, viewport.h-1); /* Test outside points */ - SDL_SetRenderDrawColor(renderer, 0xFF, 0xFF, 0xF, 0xFF); + SDL_SetRenderDrawColor(renderer, 0xFF, 0xFF, 0x00, 0xFF); SDL_RenderDrawPoint(renderer, viewport.h/2 + viewport.h, viewport.w/2); SDL_RenderDrawPoint(renderer, viewport.h/2 - viewport.h, viewport.w/2); - SDL_RenderDrawPoint(renderer, viewport.h/2 , viewport.w/2 - viewport.w); - SDL_RenderDrawPoint(renderer, viewport.h/2 , viewport.w/2 + viewport.w); + SDL_RenderDrawPoint(renderer, viewport.h/2, viewport.w/2 - viewport.w); + SDL_RenderDrawPoint(renderer, viewport.h/2, viewport.w/2 + viewport.w); /* Add a box at the top */ rect.w = 8; @@ -86,6 +135,14 @@ DrawOnViewport(SDL_Renderer * renderer, SDL_Rect viewport) rect.x = (viewport.w - rect.w) / 2; rect.y = 0; SDL_RenderFillRect(renderer, &rect); + + /* Add a clip rect and fill it with the sprite */ + SDL_QueryTexture(sprite, NULL, NULL, &rect.w, &rect.h); + rect.x = (viewport.w - rect.w) / 2; + rect.y = (viewport.h - rect.h) / 2; + SDL_RenderSetClipRect(renderer, &rect); + SDL_RenderCopy(renderer, sprite, NULL, &rect); + SDL_RenderSetClipRect(renderer, NULL); } void @@ -117,7 +174,7 @@ loop() continue; /* Draw using viewport */ - DrawOnViewport(state->renderers[i], viewport); + DrawOnViewport(state->renderers[i]); /* Update the screen! */ if (use_target) { @@ -149,6 +206,7 @@ main(int argc, char *argv[]) return 1; } + for (i = 1; i < argc;) { int consumed; @@ -171,6 +229,10 @@ main(int argc, char *argv[]) quit(2); } + if (LoadSprite("icon.bmp", state->renderers[0]) < 0) { + quit(2); + } + if (use_target) { int w, h; diff --git a/libs/SDL2/test/testvulkan.c b/libs/SDL2/test/testvulkan.c index a0c1113a1..3fe047f3f 100644 --- a/libs/SDL2/test/testvulkan.c +++ b/libs/SDL2/test/testvulkan.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -110,71 +110,44 @@ enum { static const char *getVulkanResultString(VkResult result) { - switch((int)result) + switch((int) result) { - case VK_SUCCESS: - return "VK_SUCCESS"; - case VK_NOT_READY: - return "VK_NOT_READY"; - case VK_TIMEOUT: - return "VK_TIMEOUT"; - case VK_EVENT_SET: - return "VK_EVENT_SET"; - case VK_EVENT_RESET: - return "VK_EVENT_RESET"; - case VK_INCOMPLETE: - return "VK_INCOMPLETE"; - case VK_ERROR_OUT_OF_HOST_MEMORY: - return "VK_ERROR_OUT_OF_HOST_MEMORY"; - case VK_ERROR_OUT_OF_DEVICE_MEMORY: - return "VK_ERROR_OUT_OF_DEVICE_MEMORY"; - case VK_ERROR_INITIALIZATION_FAILED: - return "VK_ERROR_INITIALIZATION_FAILED"; - case VK_ERROR_DEVICE_LOST: - return "VK_ERROR_DEVICE_LOST"; - case VK_ERROR_MEMORY_MAP_FAILED: - return "VK_ERROR_MEMORY_MAP_FAILED"; - case VK_ERROR_LAYER_NOT_PRESENT: - return "VK_ERROR_LAYER_NOT_PRESENT"; - case VK_ERROR_EXTENSION_NOT_PRESENT: - return "VK_ERROR_EXTENSION_NOT_PRESENT"; - case VK_ERROR_FEATURE_NOT_PRESENT: - return "VK_ERROR_FEATURE_NOT_PRESENT"; - case VK_ERROR_INCOMPATIBLE_DRIVER: - return "VK_ERROR_INCOMPATIBLE_DRIVER"; - case VK_ERROR_TOO_MANY_OBJECTS: - return "VK_ERROR_TOO_MANY_OBJECTS"; - case VK_ERROR_FORMAT_NOT_SUPPORTED: - return "VK_ERROR_FORMAT_NOT_SUPPORTED"; - case VK_ERROR_FRAGMENTED_POOL: - return "VK_ERROR_FRAGMENTED_POOL"; - case VK_ERROR_SURFACE_LOST_KHR: - return "VK_ERROR_SURFACE_LOST_KHR"; - case VK_ERROR_NATIVE_WINDOW_IN_USE_KHR: - return "VK_ERROR_NATIVE_WINDOW_IN_USE_KHR"; - case VK_SUBOPTIMAL_KHR: - return "VK_SUBOPTIMAL_KHR"; - case VK_ERROR_OUT_OF_DATE_KHR: - return "VK_ERROR_OUT_OF_DATE_KHR"; - case VK_ERROR_INCOMPATIBLE_DISPLAY_KHR: - return "VK_ERROR_INCOMPATIBLE_DISPLAY_KHR"; - case VK_ERROR_VALIDATION_FAILED_EXT: - return "VK_ERROR_VALIDATION_FAILED_EXT"; - case VK_ERROR_OUT_OF_POOL_MEMORY_KHR: - return "VK_ERROR_OUT_OF_POOL_MEMORY_KHR"; - case VK_ERROR_INVALID_SHADER_NV: - return "VK_ERROR_INVALID_SHADER_NV"; - case VK_RESULT_MAX_ENUM: - case VK_RESULT_RANGE_SIZE: - break; + #define RESULT_CASE(x) case x: return #x + RESULT_CASE(VK_SUCCESS); + RESULT_CASE(VK_NOT_READY); + RESULT_CASE(VK_TIMEOUT); + RESULT_CASE(VK_EVENT_SET); + RESULT_CASE(VK_EVENT_RESET); + RESULT_CASE(VK_INCOMPLETE); + RESULT_CASE(VK_ERROR_OUT_OF_HOST_MEMORY); + RESULT_CASE(VK_ERROR_OUT_OF_DEVICE_MEMORY); + RESULT_CASE(VK_ERROR_INITIALIZATION_FAILED); + RESULT_CASE(VK_ERROR_DEVICE_LOST); + RESULT_CASE(VK_ERROR_MEMORY_MAP_FAILED); + RESULT_CASE(VK_ERROR_LAYER_NOT_PRESENT); + RESULT_CASE(VK_ERROR_EXTENSION_NOT_PRESENT); + RESULT_CASE(VK_ERROR_FEATURE_NOT_PRESENT); + RESULT_CASE(VK_ERROR_INCOMPATIBLE_DRIVER); + RESULT_CASE(VK_ERROR_TOO_MANY_OBJECTS); + RESULT_CASE(VK_ERROR_FORMAT_NOT_SUPPORTED); + RESULT_CASE(VK_ERROR_FRAGMENTED_POOL); + RESULT_CASE(VK_ERROR_SURFACE_LOST_KHR); + RESULT_CASE(VK_ERROR_NATIVE_WINDOW_IN_USE_KHR); + RESULT_CASE(VK_SUBOPTIMAL_KHR); + RESULT_CASE(VK_ERROR_OUT_OF_DATE_KHR); + RESULT_CASE(VK_ERROR_INCOMPATIBLE_DISPLAY_KHR); + RESULT_CASE(VK_ERROR_VALIDATION_FAILED_EXT); + RESULT_CASE(VK_ERROR_OUT_OF_POOL_MEMORY_KHR); + RESULT_CASE(VK_ERROR_INVALID_SHADER_NV); + #undef RESULT_CASE + default: break; } - if(result < 0) - return "VK_ERROR_"; - return "VK_"; + return (result < 0) ? "VK_ERROR_" : "VK_"; } typedef struct VulkanContext { + SDL_Window *window; VkInstance instance; VkDevice device; VkSurfaceKHR surface; @@ -203,14 +176,15 @@ typedef struct VulkanContext } VulkanContext; static SDLTest_CommonState *state; -static VulkanContext vulkanContext = {0}; +static VulkanContext *vulkanContexts = NULL; // an array of state->num_windows items +static VulkanContext *vulkanContext = NULL; // for the currently-rendering window -static void shutdownVulkan(void); +static void shutdownVulkan(SDL_bool doDestroySwapchain); /* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */ static void quit(int rc) { - shutdownVulkan(); + shutdownVulkan(SDL_TRUE); SDLTest_CommonQuit(state); exit(rc); } @@ -218,8 +192,7 @@ static void quit(int rc) static void loadGlobalFunctions(void) { vkGetInstanceProcAddr = SDL_Vulkan_GetVkGetInstanceProcAddr(); - if(!vkGetInstanceProcAddr) - { + if (!vkGetInstanceProcAddr) { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL_Vulkan_GetVkGetInstanceProcAddr(): %s\n", SDL_GetError()); @@ -229,8 +202,7 @@ static void loadGlobalFunctions(void) #define VULKAN_DEVICE_FUNCTION(name) #define VULKAN_GLOBAL_FUNCTION(name) \ name = (PFN_##name)vkGetInstanceProcAddr(VK_NULL_HANDLE, #name); \ - if(!name) \ - { \ + if (!name) { \ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, \ "vkGetInstanceProcAddr(VK_NULL_HANDLE, \"" #name "\") failed\n"); \ quit(2); \ @@ -248,28 +220,24 @@ static void createInstance(void) VkInstanceCreateInfo instanceCreateInfo = {0}; const char **extensions = NULL; unsigned extensionCount = 0; - VkResult result; + VkResult result; - - appInfo.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO; + appInfo.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO; appInfo.apiVersion = VK_API_VERSION_1_0; instanceCreateInfo.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; instanceCreateInfo.pApplicationInfo = &appInfo; - if(!SDL_Vulkan_GetInstanceExtensions(NULL, &extensionCount, NULL)) - { + if (!SDL_Vulkan_GetInstanceExtensions(NULL, &extensionCount, NULL)) { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL_Vulkan_GetInstanceExtensions(): %s\n", SDL_GetError()); quit(2); } - extensions = SDL_malloc(sizeof(const char *) * extensionCount); - if(!extensions) - { + extensions = (const char **) SDL_malloc(sizeof(const char *) * extensionCount); + if (!extensions) { SDL_OutOfMemory(); quit(2); } - if(!SDL_Vulkan_GetInstanceExtensions(NULL, &extensionCount, extensions)) - { + if (!SDL_Vulkan_GetInstanceExtensions(NULL, &extensionCount, extensions)) { SDL_free((void*)extensions); SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL_Vulkan_GetInstanceExtensions(): %s\n", @@ -278,11 +246,10 @@ static void createInstance(void) } instanceCreateInfo.enabledExtensionCount = extensionCount; instanceCreateInfo.ppEnabledExtensionNames = extensions; - result = vkCreateInstance(&instanceCreateInfo, NULL, &vulkanContext.instance); + result = vkCreateInstance(&instanceCreateInfo, NULL, &vulkanContext->instance); SDL_free((void*)extensions); - if(result != VK_SUCCESS) - { - vulkanContext.instance = VK_NULL_HANDLE; + if (result != VK_SUCCESS) { + vulkanContext->instance = VK_NULL_HANDLE; SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "vkCreateInstance(): %s\n", getVulkanResultString(result)); @@ -295,9 +262,8 @@ static void loadInstanceFunctions(void) #define VULKAN_DEVICE_FUNCTION(name) #define VULKAN_GLOBAL_FUNCTION(name) #define VULKAN_INSTANCE_FUNCTION(name) \ - name = (PFN_##name)vkGetInstanceProcAddr(vulkanContext.instance, #name); \ - if(!name) \ - { \ + name = (PFN_##name)vkGetInstanceProcAddr(vulkanContext->instance, #name); \ + if (!name) { \ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, \ "vkGetInstanceProcAddr(instance, \"" #name "\") failed\n"); \ quit(2); \ @@ -310,13 +276,11 @@ static void loadInstanceFunctions(void) static void createSurface(void) { - if(!SDL_Vulkan_CreateSurface(state->windows[0], - vulkanContext.instance, - &vulkanContext.surface)) - { - vulkanContext.surface = VK_NULL_HANDLE; - SDL_LogError( - SDL_LOG_CATEGORY_APPLICATION, "SDL_Vulkan_CreateSurface(): %s\n", SDL_GetError()); + if (!SDL_Vulkan_CreateSurface(vulkanContext->window, + vulkanContext->instance, + &vulkanContext->surface)) { + vulkanContext->surface = VK_NULL_HANDLE; + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL_Vulkan_CreateSurface(): %s\n", SDL_GetError()); quit(2); } } @@ -324,94 +288,84 @@ static void createSurface(void) static void findPhysicalDevice(void) { uint32_t physicalDeviceCount = 0; - VkPhysicalDevice *physicalDevices; - VkQueueFamilyProperties *queueFamiliesProperties = NULL; + VkPhysicalDevice *physicalDevices; + VkQueueFamilyProperties *queueFamiliesProperties = NULL; uint32_t queueFamiliesPropertiesAllocatedSize = 0; VkExtensionProperties *deviceExtensions = NULL; uint32_t deviceExtensionsAllocatedSize = 0; - uint32_t physicalDeviceIndex; + uint32_t physicalDeviceIndex; + VkResult result; - VkResult result = - vkEnumeratePhysicalDevices(vulkanContext.instance, &physicalDeviceCount, NULL); - if(result != VK_SUCCESS) - { + result = vkEnumeratePhysicalDevices(vulkanContext->instance, &physicalDeviceCount, NULL); + if (result != VK_SUCCESS) { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "vkEnumeratePhysicalDevices(): %s\n", getVulkanResultString(result)); quit(2); } - if(physicalDeviceCount == 0) - { + if (physicalDeviceCount == 0) { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "vkEnumeratePhysicalDevices(): no physical devices\n"); quit(2); } - physicalDevices = SDL_malloc(sizeof(VkPhysicalDevice) * physicalDeviceCount); - if(!physicalDevices) - { + physicalDevices = (VkPhysicalDevice *) SDL_malloc(sizeof(VkPhysicalDevice) * physicalDeviceCount); + if (!physicalDevices) { SDL_OutOfMemory(); quit(2); } - result = - vkEnumeratePhysicalDevices(vulkanContext.instance, &physicalDeviceCount, physicalDevices); - if(result != VK_SUCCESS) - { + result = vkEnumeratePhysicalDevices(vulkanContext->instance, &physicalDeviceCount, physicalDevices); + if (result != VK_SUCCESS) { SDL_free(physicalDevices); SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "vkEnumeratePhysicalDevices(): %s\n", getVulkanResultString(result)); quit(2); } - vulkanContext.physicalDevice = NULL; - for(physicalDeviceIndex = 0; physicalDeviceIndex < physicalDeviceCount; - physicalDeviceIndex++) - { + vulkanContext->physicalDevice = NULL; + for (physicalDeviceIndex = 0; physicalDeviceIndex < physicalDeviceCount; physicalDeviceIndex++) { uint32_t queueFamiliesCount = 0; - uint32_t queueFamilyIndex; + uint32_t queueFamilyIndex; uint32_t deviceExtensionCount = 0; - SDL_bool hasSwapchainExtension = SDL_FALSE; - uint32_t i; + SDL_bool hasSwapchainExtension = SDL_FALSE; + uint32_t i; - - VkPhysicalDevice physicalDevice = physicalDevices[physicalDeviceIndex]; - vkGetPhysicalDeviceProperties(physicalDevice, &vulkanContext.physicalDeviceProperties); - if(VK_VERSION_MAJOR(vulkanContext.physicalDeviceProperties.apiVersion) < 1) + VkPhysicalDevice physicalDevice = physicalDevices[physicalDeviceIndex]; + vkGetPhysicalDeviceProperties(physicalDevice, &vulkanContext->physicalDeviceProperties); + if(VK_VERSION_MAJOR(vulkanContext->physicalDeviceProperties.apiVersion) < 1) { continue; - vkGetPhysicalDeviceFeatures(physicalDevice, &vulkanContext.physicalDeviceFeatures); + } + vkGetPhysicalDeviceFeatures(physicalDevice, &vulkanContext->physicalDeviceFeatures); vkGetPhysicalDeviceQueueFamilyProperties(physicalDevice, &queueFamiliesCount, NULL); - if(queueFamiliesCount == 0) + if (queueFamiliesCount == 0) { continue; - if(queueFamiliesPropertiesAllocatedSize < queueFamiliesCount) - { + } + if (queueFamiliesPropertiesAllocatedSize < queueFamiliesCount) { SDL_free(queueFamiliesProperties); queueFamiliesPropertiesAllocatedSize = queueFamiliesCount; - queueFamiliesProperties = - SDL_malloc(sizeof(VkQueueFamilyProperties) * queueFamiliesPropertiesAllocatedSize); - if(!queueFamiliesProperties) - { + queueFamiliesProperties = (VkQueueFamilyProperties *) SDL_malloc(sizeof(VkQueueFamilyProperties) * queueFamiliesPropertiesAllocatedSize); + if (!queueFamiliesProperties) { SDL_free(physicalDevices); SDL_free(deviceExtensions); SDL_OutOfMemory(); quit(2); } } - vkGetPhysicalDeviceQueueFamilyProperties( - physicalDevice, &queueFamiliesCount, queueFamiliesProperties); - vulkanContext.graphicsQueueFamilyIndex = queueFamiliesCount; - vulkanContext.presentQueueFamilyIndex = queueFamiliesCount; - for(queueFamilyIndex = 0; queueFamilyIndex < queueFamiliesCount; - queueFamilyIndex++) - { + vkGetPhysicalDeviceQueueFamilyProperties(physicalDevice, &queueFamiliesCount, queueFamiliesProperties); + vulkanContext->graphicsQueueFamilyIndex = queueFamiliesCount; + vulkanContext->presentQueueFamilyIndex = queueFamiliesCount; + for (queueFamilyIndex = 0; queueFamilyIndex < queueFamiliesCount; queueFamilyIndex++) { VkBool32 supported = 0; - if(queueFamiliesProperties[queueFamilyIndex].queueCount == 0) + if (queueFamiliesProperties[queueFamilyIndex].queueCount == 0) { continue; - if(queueFamiliesProperties[queueFamilyIndex].queueFlags & VK_QUEUE_GRAPHICS_BIT) - vulkanContext.graphicsQueueFamilyIndex = queueFamilyIndex; - result = vkGetPhysicalDeviceSurfaceSupportKHR( - physicalDevice, queueFamilyIndex, vulkanContext.surface, &supported); - if(result != VK_SUCCESS) - { + } + + if (queueFamiliesProperties[queueFamilyIndex].queueFlags & VK_QUEUE_GRAPHICS_BIT) { + vulkanContext->graphicsQueueFamilyIndex = queueFamilyIndex; + } + + result = vkGetPhysicalDeviceSurfaceSupportKHR(physicalDevice, queueFamilyIndex, vulkanContext->surface, &supported); + if (result != VK_SUCCESS) { SDL_free(physicalDevices); SDL_free(queueFamiliesProperties); SDL_free(deviceExtensions); @@ -420,20 +374,22 @@ static void findPhysicalDevice(void) getVulkanResultString(result)); quit(2); } - if(supported) - { - vulkanContext.presentQueueFamilyIndex = queueFamilyIndex; - if(queueFamiliesProperties[queueFamilyIndex].queueFlags & VK_QUEUE_GRAPHICS_BIT) + if (supported) { + vulkanContext->presentQueueFamilyIndex = queueFamilyIndex; + if (queueFamiliesProperties[queueFamilyIndex].queueFlags & VK_QUEUE_GRAPHICS_BIT) { break; // use this queue because it can present and do graphics + } } } - if(vulkanContext.graphicsQueueFamilyIndex == queueFamiliesCount) // no good queues found + + if (vulkanContext->graphicsQueueFamilyIndex == queueFamiliesCount) { // no good queues found continue; - if(vulkanContext.presentQueueFamilyIndex == queueFamiliesCount) // no good queues found + } + if (vulkanContext->presentQueueFamilyIndex == queueFamiliesCount) { // no good queues found continue; - result = - vkEnumerateDeviceExtensionProperties(physicalDevice, NULL, &deviceExtensionCount, NULL); - if(result != VK_SUCCESS) + } + result = vkEnumerateDeviceExtensionProperties(physicalDevice, NULL, &deviceExtensionCount, NULL); + if (result != VK_SUCCESS) { SDL_free(physicalDevices); SDL_free(queueFamiliesProperties); @@ -443,26 +399,22 @@ static void findPhysicalDevice(void) getVulkanResultString(result)); quit(2); } - if(deviceExtensionCount == 0) + if (deviceExtensionCount == 0) { continue; - if(deviceExtensionsAllocatedSize < deviceExtensionCount) - { + } + if (deviceExtensionsAllocatedSize < deviceExtensionCount) { SDL_free(deviceExtensions); deviceExtensionsAllocatedSize = deviceExtensionCount; - deviceExtensions = - SDL_malloc(sizeof(VkExtensionProperties) * deviceExtensionsAllocatedSize); - if(!deviceExtensions) - { + deviceExtensions = SDL_malloc(sizeof(VkExtensionProperties) * deviceExtensionsAllocatedSize); + if (!deviceExtensions) { SDL_free(physicalDevices); SDL_free(queueFamiliesProperties); SDL_OutOfMemory(); quit(2); } } - result = vkEnumerateDeviceExtensionProperties( - physicalDevice, NULL, &deviceExtensionCount, deviceExtensions); - if(result != VK_SUCCESS) - { + result = vkEnumerateDeviceExtensionProperties(physicalDevice, NULL, &deviceExtensionCount, deviceExtensions); + if (result != VK_SUCCESS) { SDL_free(physicalDevices); SDL_free(queueFamiliesProperties); SDL_free(deviceExtensions); @@ -471,24 +423,22 @@ static void findPhysicalDevice(void) getVulkanResultString(result)); quit(2); } - for(i = 0; i < deviceExtensionCount; i++) - { - if(0 == SDL_strcmp(deviceExtensions[i].extensionName, VK_KHR_SWAPCHAIN_EXTENSION_NAME)) - { + for (i = 0; i < deviceExtensionCount; i++) { + if(SDL_strcmp(deviceExtensions[i].extensionName, VK_KHR_SWAPCHAIN_EXTENSION_NAME) == 0) { hasSwapchainExtension = SDL_TRUE; break; } } - if(!hasSwapchainExtension) + if (!hasSwapchainExtension) { continue; - vulkanContext.physicalDevice = physicalDevice; + } + vulkanContext->physicalDevice = physicalDevice; break; } SDL_free(physicalDevices); SDL_free(queueFamiliesProperties); SDL_free(deviceExtensions); - if(!vulkanContext.physicalDevice) - { + if (!vulkanContext->physicalDevice) { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Vulkan: no viable physical devices found"); quit(2); } @@ -496,16 +446,16 @@ static void findPhysicalDevice(void) static void createDevice(void) { - VkDeviceQueueCreateInfo deviceQueueCreateInfo[1] = {0}; + VkDeviceQueueCreateInfo deviceQueueCreateInfo[1] = { {0} }; static const float queuePriority[] = {1.0f}; VkDeviceCreateInfo deviceCreateInfo = {0}; static const char *const deviceExtensionNames[] = { VK_KHR_SWAPCHAIN_EXTENSION_NAME, }; - VkResult result; + VkResult result; - deviceQueueCreateInfo->sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO; - deviceQueueCreateInfo->queueFamilyIndex = vulkanContext.graphicsQueueFamilyIndex; + deviceQueueCreateInfo->sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO; + deviceQueueCreateInfo->queueFamilyIndex = vulkanContext->graphicsQueueFamilyIndex; deviceQueueCreateInfo->queueCount = 1; deviceQueueCreateInfo->pQueuePriorities = &queuePriority[0]; @@ -515,13 +465,10 @@ static void createDevice(void) deviceCreateInfo.pEnabledFeatures = NULL; deviceCreateInfo.enabledExtensionCount = SDL_arraysize(deviceExtensionNames); deviceCreateInfo.ppEnabledExtensionNames = deviceExtensionNames; - result = vkCreateDevice( - vulkanContext.physicalDevice, &deviceCreateInfo, NULL, &vulkanContext.device); - if(result != VK_SUCCESS) - { - vulkanContext.device = VK_NULL_HANDLE; - SDL_LogError( - SDL_LOG_CATEGORY_APPLICATION, "vkCreateDevice(): %s\n", getVulkanResultString(result)); + result = vkCreateDevice(vulkanContext->physicalDevice, &deviceCreateInfo, NULL, &vulkanContext->device); + if (result != VK_SUCCESS) { + vulkanContext->device = VK_NULL_HANDLE; + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "vkCreateDevice(): %s\n", getVulkanResultString(result)); quit(2); } } @@ -529,9 +476,8 @@ static void createDevice(void) static void loadDeviceFunctions(void) { #define VULKAN_DEVICE_FUNCTION(name) \ - name = (PFN_##name)vkGetDeviceProcAddr(vulkanContext.device, #name); \ - if(!name) \ - { \ + name = (PFN_##name)vkGetDeviceProcAddr(vulkanContext->device, #name); \ + if (!name) { \ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, \ "vkGetDeviceProcAddr(device, \"" #name "\") failed\n"); \ quit(2); \ @@ -548,28 +494,28 @@ static void loadDeviceFunctions(void) static void getQueues(void) { - vkGetDeviceQueue(vulkanContext.device, - vulkanContext.graphicsQueueFamilyIndex, + vkGetDeviceQueue(vulkanContext->device, + vulkanContext->graphicsQueueFamilyIndex, 0, - &vulkanContext.graphicsQueue); - if(vulkanContext.graphicsQueueFamilyIndex != vulkanContext.presentQueueFamilyIndex) - vkGetDeviceQueue(vulkanContext.device, - vulkanContext.presentQueueFamilyIndex, + &vulkanContext->graphicsQueue); + if (vulkanContext->graphicsQueueFamilyIndex != vulkanContext->presentQueueFamilyIndex) { + vkGetDeviceQueue(vulkanContext->device, + vulkanContext->presentQueueFamilyIndex, 0, - &vulkanContext.presentQueue); - else - vulkanContext.presentQueue = vulkanContext.graphicsQueue; + &vulkanContext->presentQueue); + } else { + vulkanContext->presentQueue = vulkanContext->graphicsQueue; + } } static void createSemaphore(VkSemaphore *semaphore) { - VkResult result; + VkResult result; VkSemaphoreCreateInfo createInfo = {0}; createInfo.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO; - result = vkCreateSemaphore(vulkanContext.device, &createInfo, NULL, semaphore); - if(result != VK_SUCCESS) - { + result = vkCreateSemaphore(vulkanContext->device, &createInfo, NULL, semaphore); + if (result != VK_SUCCESS) { *semaphore = VK_NULL_HANDLE; SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "vkCreateSemaphore(): %s\n", @@ -580,16 +526,14 @@ static void createSemaphore(VkSemaphore *semaphore) static void createSemaphores(void) { - createSemaphore(&vulkanContext.imageAvailableSemaphore); - createSemaphore(&vulkanContext.renderingFinishedSemaphore); + createSemaphore(&vulkanContext->imageAvailableSemaphore); + createSemaphore(&vulkanContext->renderingFinishedSemaphore); } static void getSurfaceCaps(void) { - VkResult result = vkGetPhysicalDeviceSurfaceCapabilitiesKHR( - vulkanContext.physicalDevice, vulkanContext.surface, &vulkanContext.surfaceCapabilities); - if(result != VK_SUCCESS) - { + VkResult result = vkGetPhysicalDeviceSurfaceCapabilitiesKHR(vulkanContext->physicalDevice, vulkanContext->surface, &vulkanContext->surfaceCapabilities); + if (result != VK_SUCCESS) { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "vkGetPhysicalDeviceSurfaceCapabilitiesKHR(): %s\n", getVulkanResultString(result)); @@ -597,8 +541,7 @@ static void getSurfaceCaps(void) } // check surface usage - if(!(vulkanContext.surfaceCapabilities.supportedUsageFlags & VK_IMAGE_USAGE_TRANSFER_DST_BIT)) - { + if (!(vulkanContext->surfaceCapabilities.supportedUsageFlags & VK_IMAGE_USAGE_TRANSFER_DST_BIT)) { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Vulkan surface doesn't support VK_IMAGE_USAGE_TRANSFER_DST_BIT\n"); quit(2); @@ -607,38 +550,33 @@ static void getSurfaceCaps(void) static void getSurfaceFormats(void) { - VkResult result = vkGetPhysicalDeviceSurfaceFormatsKHR(vulkanContext.physicalDevice, - vulkanContext.surface, - &vulkanContext.surfaceFormatsCount, + VkResult result = vkGetPhysicalDeviceSurfaceFormatsKHR(vulkanContext->physicalDevice, + vulkanContext->surface, + &vulkanContext->surfaceFormatsCount, NULL); - if(result != VK_SUCCESS) - { - vulkanContext.surfaceFormatsCount = 0; + if (result != VK_SUCCESS) { + vulkanContext->surfaceFormatsCount = 0; SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "vkGetPhysicalDeviceSurfaceFormatsKHR(): %s\n", getVulkanResultString(result)); quit(2); } - if(vulkanContext.surfaceFormatsCount > vulkanContext.surfaceFormatsAllocatedCount) - { - vulkanContext.surfaceFormatsAllocatedCount = vulkanContext.surfaceFormatsCount; - SDL_free(vulkanContext.surfaceFormats); - vulkanContext.surfaceFormats = - SDL_malloc(sizeof(VkSurfaceFormatKHR) * vulkanContext.surfaceFormatsAllocatedCount); - if(!vulkanContext.surfaceFormats) - { - vulkanContext.surfaceFormatsCount = 0; + if (vulkanContext->surfaceFormatsCount > vulkanContext->surfaceFormatsAllocatedCount) { + vulkanContext->surfaceFormatsAllocatedCount = vulkanContext->surfaceFormatsCount; + SDL_free(vulkanContext->surfaceFormats); + vulkanContext->surfaceFormats = (VkSurfaceFormatKHR *) SDL_malloc(sizeof(VkSurfaceFormatKHR) * vulkanContext->surfaceFormatsAllocatedCount); + if (!vulkanContext->surfaceFormats) { + vulkanContext->surfaceFormatsCount = 0; SDL_OutOfMemory(); quit(2); } } - result = vkGetPhysicalDeviceSurfaceFormatsKHR(vulkanContext.physicalDevice, - vulkanContext.surface, - &vulkanContext.surfaceFormatsCount, - vulkanContext.surfaceFormats); - if(result != VK_SUCCESS) - { - vulkanContext.surfaceFormatsCount = 0; + result = vkGetPhysicalDeviceSurfaceFormatsKHR(vulkanContext->physicalDevice, + vulkanContext->surface, + &vulkanContext->surfaceFormatsCount, + vulkanContext->surfaceFormats); + if (result != VK_SUCCESS) { + vulkanContext->surfaceFormatsCount = 0; SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "vkGetPhysicalDeviceSurfaceFormatsKHR(): %s\n", getVulkanResultString(result)); @@ -648,35 +586,31 @@ static void getSurfaceFormats(void) static void getSwapchainImages(void) { - VkResult result; + VkResult result; - SDL_free(vulkanContext.swapchainImages); - vulkanContext.swapchainImages = NULL; - result = vkGetSwapchainImagesKHR( - vulkanContext.device, vulkanContext.swapchain, &vulkanContext.swapchainImageCount, NULL); - if(result != VK_SUCCESS) - { - vulkanContext.swapchainImageCount = 0; + SDL_free(vulkanContext->swapchainImages); + vulkanContext->swapchainImages = NULL; + result = vkGetSwapchainImagesKHR(vulkanContext->device, vulkanContext->swapchain, &vulkanContext->swapchainImageCount, NULL); + if (result != VK_SUCCESS) { + vulkanContext->swapchainImageCount = 0; SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "vkGetSwapchainImagesKHR(): %s\n", getVulkanResultString(result)); quit(2); } - vulkanContext.swapchainImages = SDL_malloc(sizeof(VkImage) * vulkanContext.swapchainImageCount); - if(!vulkanContext.swapchainImages) - { + vulkanContext->swapchainImages = SDL_malloc(sizeof(VkImage) * vulkanContext->swapchainImageCount); + if (!vulkanContext->swapchainImages) { SDL_OutOfMemory(); quit(2); } - result = vkGetSwapchainImagesKHR(vulkanContext.device, - vulkanContext.swapchain, - &vulkanContext.swapchainImageCount, - vulkanContext.swapchainImages); - if(result != VK_SUCCESS) - { - SDL_free(vulkanContext.swapchainImages); - vulkanContext.swapchainImages = NULL; - vulkanContext.swapchainImageCount = 0; + result = vkGetSwapchainImagesKHR(vulkanContext->device, + vulkanContext->swapchain, + &vulkanContext->swapchainImageCount, + vulkanContext->swapchainImages); + if (result != VK_SUCCESS) { + SDL_free(vulkanContext->swapchainImages); + vulkanContext->swapchainImages = NULL; + vulkanContext->swapchainImageCount = 0; SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "vkGetSwapchainImagesKHR(): %s\n", getVulkanResultString(result)); @@ -686,116 +620,125 @@ static void getSwapchainImages(void) static SDL_bool createSwapchain(void) { - uint32_t i; - int w, h; - VkSwapchainCreateInfoKHR createInfo = {0}; - VkResult result; + uint32_t i; + int w, h; + VkSwapchainCreateInfoKHR createInfo = {0}; + VkResult result; // pick an image count - vulkanContext.swapchainDesiredImageCount = vulkanContext.surfaceCapabilities.minImageCount + 1; - if(vulkanContext.swapchainDesiredImageCount > vulkanContext.surfaceCapabilities.maxImageCount - && vulkanContext.surfaceCapabilities.maxImageCount > 0) - vulkanContext.swapchainDesiredImageCount = vulkanContext.surfaceCapabilities.maxImageCount; + vulkanContext->swapchainDesiredImageCount = vulkanContext->surfaceCapabilities.minImageCount + 1; + if ( (vulkanContext->swapchainDesiredImageCount > vulkanContext->surfaceCapabilities.maxImageCount) && + (vulkanContext->surfaceCapabilities.maxImageCount > 0) ) { + vulkanContext->swapchainDesiredImageCount = vulkanContext->surfaceCapabilities.maxImageCount; + } // pick a format - if(vulkanContext.surfaceFormatsCount == 1 - && vulkanContext.surfaceFormats[0].format == VK_FORMAT_UNDEFINED) - { + if ( (vulkanContext->surfaceFormatsCount == 1) && + (vulkanContext->surfaceFormats[0].format == VK_FORMAT_UNDEFINED) ) { // aren't any preferred formats, so we pick - vulkanContext.surfaceFormat.colorSpace = VK_COLORSPACE_SRGB_NONLINEAR_KHR; - vulkanContext.surfaceFormat.format = VK_FORMAT_R8G8B8A8_UNORM; - } - else - { - vulkanContext.surfaceFormat = vulkanContext.surfaceFormats[0]; - for(i = 0; i < vulkanContext.surfaceFormatsCount; i++) - { - if(vulkanContext.surfaceFormats[i].format == VK_FORMAT_R8G8B8A8_UNORM) - { - vulkanContext.surfaceFormat = vulkanContext.surfaceFormats[i]; + vulkanContext->surfaceFormat.colorSpace = VK_COLORSPACE_SRGB_NONLINEAR_KHR; + vulkanContext->surfaceFormat.format = VK_FORMAT_R8G8B8A8_UNORM; + } else { + vulkanContext->surfaceFormat = vulkanContext->surfaceFormats[0]; + for (i = 0; i < vulkanContext->surfaceFormatsCount; i++) { + if(vulkanContext->surfaceFormats[i].format == VK_FORMAT_R8G8B8A8_UNORM) { + vulkanContext->surfaceFormat = vulkanContext->surfaceFormats[i]; break; } } } // get size - SDL_Vulkan_GetDrawableSize(state->windows[0], &w, &h); - vulkanContext.swapchainSize.width = w; - vulkanContext.swapchainSize.height = h; - if(w == 0 || h == 0) + SDL_Vulkan_GetDrawableSize(vulkanContext->window, &w, &h); + + // Clamp the size to the allowable image extent. + // SDL_Vulkan_GetDrawableSize()'s result it not always in this range (bug #3287) + vulkanContext->swapchainSize.width = SDL_clamp((uint32_t) w, + vulkanContext->surfaceCapabilities.minImageExtent.width, + vulkanContext->surfaceCapabilities.maxImageExtent.width); + + vulkanContext->swapchainSize.height = SDL_clamp((uint32_t) h, + vulkanContext->surfaceCapabilities.minImageExtent.height, + vulkanContext->surfaceCapabilities.maxImageExtent.height); + + if (w == 0 || h == 0) { return SDL_FALSE; + } + + getSurfaceCaps(); createInfo.sType = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR; - createInfo.surface = vulkanContext.surface; - createInfo.minImageCount = vulkanContext.swapchainDesiredImageCount; - createInfo.imageFormat = vulkanContext.surfaceFormat.format; - createInfo.imageColorSpace = vulkanContext.surfaceFormat.colorSpace; - createInfo.imageExtent = vulkanContext.swapchainSize; + createInfo.surface = vulkanContext->surface; + createInfo.minImageCount = vulkanContext->swapchainDesiredImageCount; + createInfo.imageFormat = vulkanContext->surfaceFormat.format; + createInfo.imageColorSpace = vulkanContext->surfaceFormat.colorSpace; + createInfo.imageExtent = vulkanContext->swapchainSize; createInfo.imageArrayLayers = 1; createInfo.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT; createInfo.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; - createInfo.preTransform = vulkanContext.surfaceCapabilities.currentTransform; + createInfo.preTransform = vulkanContext->surfaceCapabilities.currentTransform; createInfo.compositeAlpha = VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR; createInfo.presentMode = VK_PRESENT_MODE_FIFO_KHR; createInfo.clipped = VK_TRUE; - createInfo.oldSwapchain = vulkanContext.swapchain; - result = - vkCreateSwapchainKHR(vulkanContext.device, &createInfo, NULL, &vulkanContext.swapchain); - if(createInfo.oldSwapchain) - vkDestroySwapchainKHR(vulkanContext.device, createInfo.oldSwapchain, NULL); - if(result != VK_SUCCESS) - { - vulkanContext.swapchain = VK_NULL_HANDLE; + createInfo.oldSwapchain = vulkanContext->swapchain; + result = vkCreateSwapchainKHR(vulkanContext->device, &createInfo, NULL, &vulkanContext->swapchain); + + if (createInfo.oldSwapchain) { + vkDestroySwapchainKHR(vulkanContext->device, createInfo.oldSwapchain, NULL); + } + + if(result != VK_SUCCESS) { + vulkanContext->swapchain = VK_NULL_HANDLE; SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "vkCreateSwapchainKHR(): %s\n", getVulkanResultString(result)); quit(2); } + getSwapchainImages(); return SDL_TRUE; } static void destroySwapchain(void) { - if(vulkanContext.swapchain) - vkDestroySwapchainKHR(vulkanContext.device, vulkanContext.swapchain, NULL); - vulkanContext.swapchain = VK_NULL_HANDLE; - SDL_free(vulkanContext.swapchainImages); - vulkanContext.swapchainImages = NULL; + if (vulkanContext->swapchain) { + vkDestroySwapchainKHR(vulkanContext->device, vulkanContext->swapchain, NULL); + vulkanContext->swapchain = VK_NULL_HANDLE; + } + SDL_free(vulkanContext->swapchainImages); + vulkanContext->swapchainImages = NULL; } static void destroyCommandBuffers(void) { - if(vulkanContext.commandBuffers) - vkFreeCommandBuffers(vulkanContext.device, - vulkanContext.commandPool, - vulkanContext.swapchainImageCount, - vulkanContext.commandBuffers); - SDL_free(vulkanContext.commandBuffers); - vulkanContext.commandBuffers = NULL; + if (vulkanContext->commandBuffers) { + vkFreeCommandBuffers(vulkanContext->device, + vulkanContext->commandPool, + vulkanContext->swapchainImageCount, + vulkanContext->commandBuffers); + SDL_free(vulkanContext->commandBuffers); + vulkanContext->commandBuffers = NULL; + } } static void destroyCommandPool(void) { - if(vulkanContext.commandPool) - vkDestroyCommandPool(vulkanContext.device, vulkanContext.commandPool, NULL); - vulkanContext.commandPool = VK_NULL_HANDLE; + if (vulkanContext->commandPool) { + vkDestroyCommandPool(vulkanContext->device, vulkanContext->commandPool, NULL); + } + vulkanContext->commandPool = VK_NULL_HANDLE; } static void createCommandPool(void) { - VkResult result; - + VkResult result; VkCommandPoolCreateInfo createInfo = {0}; createInfo.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO; - createInfo.flags = - VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT | VK_COMMAND_POOL_CREATE_TRANSIENT_BIT; - createInfo.queueFamilyIndex = vulkanContext.graphicsQueueFamilyIndex; - result = - vkCreateCommandPool(vulkanContext.device, &createInfo, NULL, &vulkanContext.commandPool); - if(result != VK_SUCCESS) - { - vulkanContext.commandPool = VK_NULL_HANDLE; + createInfo.flags = VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT | VK_COMMAND_POOL_CREATE_TRANSIENT_BIT; + createInfo.queueFamilyIndex = vulkanContext->graphicsQueueFamilyIndex; + result = vkCreateCommandPool(vulkanContext->device, &createInfo, NULL, &vulkanContext->commandPool); + if (result != VK_SUCCESS) { + vulkanContext->commandPool = VK_NULL_HANDLE; SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "vkCreateCommandPool(): %s\n", getVulkanResultString(result)); @@ -805,21 +748,17 @@ static void createCommandPool(void) static void createCommandBuffers(void) { - VkResult result; - + VkResult result; VkCommandBufferAllocateInfo allocateInfo = {0}; allocateInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO; - allocateInfo.commandPool = vulkanContext.commandPool; + allocateInfo.commandPool = vulkanContext->commandPool; allocateInfo.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY; - allocateInfo.commandBufferCount = vulkanContext.swapchainImageCount; - vulkanContext.commandBuffers = - SDL_malloc(sizeof(VkCommandBuffer) * vulkanContext.swapchainImageCount); - result = - vkAllocateCommandBuffers(vulkanContext.device, &allocateInfo, vulkanContext.commandBuffers); - if(result != VK_SUCCESS) - { - SDL_free(vulkanContext.commandBuffers); - vulkanContext.commandBuffers = NULL; + allocateInfo.commandBufferCount = vulkanContext->swapchainImageCount; + vulkanContext->commandBuffers = (VkCommandBuffer *) SDL_malloc(sizeof(VkCommandBuffer) * vulkanContext->swapchainImageCount); + result = vkAllocateCommandBuffers(vulkanContext->device, &allocateInfo, vulkanContext->commandBuffers); + if(result != VK_SUCCESS) { + SDL_free(vulkanContext->commandBuffers); + vulkanContext->commandBuffers = NULL; SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "vkAllocateCommandBuffers(): %s\n", getVulkanResultString(result)); @@ -829,31 +768,25 @@ static void createCommandBuffers(void) static void createFences(void) { - uint32_t i; + uint32_t i; - vulkanContext.fences = SDL_malloc(sizeof(VkFence) * vulkanContext.swapchainImageCount); - if(!vulkanContext.fences) - { + vulkanContext->fences = SDL_malloc(sizeof(VkFence) * vulkanContext->swapchainImageCount); + if (!vulkanContext->fences) { SDL_OutOfMemory(); quit(2); } - for(i = 0; i < vulkanContext.swapchainImageCount; i++) - { - VkResult result; - + for (i = 0; i < vulkanContext->swapchainImageCount; i++) { + VkResult result; VkFenceCreateInfo createInfo = {0}; createInfo.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO; createInfo.flags = VK_FENCE_CREATE_SIGNALED_BIT; - result = - vkCreateFence(vulkanContext.device, &createInfo, NULL, &vulkanContext.fences[i]); - if(result != VK_SUCCESS) - { - for(; i > 0; i--) - { - vkDestroyFence(vulkanContext.device, vulkanContext.fences[i - 1], NULL); + result = vkCreateFence(vulkanContext->device, &createInfo, NULL, &vulkanContext->fences[i]); + if(result != VK_SUCCESS) { + for(; i > 0; i--) { + vkDestroyFence(vulkanContext->device, vulkanContext->fences[i - 1], NULL); } - SDL_free(vulkanContext.fences); - vulkanContext.fences = NULL; + SDL_free(vulkanContext->fences); + vulkanContext->fences = NULL; SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "vkCreateFence(): %s\n", getVulkanResultString(result)); @@ -864,16 +797,17 @@ static void createFences(void) static void destroyFences(void) { - uint32_t i; + uint32_t i; - if(!vulkanContext.fences) + if (!vulkanContext->fences) { return; - for(i = 0; i < vulkanContext.swapchainImageCount; i++) - { - vkDestroyFence(vulkanContext.device, vulkanContext.fences[i], NULL); } - SDL_free(vulkanContext.fences); - vulkanContext.fences = NULL; + + for (i = 0; i < vulkanContext->swapchainImageCount; i++) { + vkDestroyFence(vulkanContext->device, vulkanContext->fences[i], NULL); + } + SDL_free(vulkanContext->fences); + vulkanContext->fences = NULL; } static void recordPipelineImageBarrier(VkCommandBuffer commandBuffer, @@ -911,14 +845,13 @@ static void recordPipelineImageBarrier(VkCommandBuffer commandBuffer, static void rerecordCommandBuffer(uint32_t frameIndex, const VkClearColorValue *clearColor) { - VkCommandBuffer commandBuffer = vulkanContext.commandBuffers[frameIndex]; - VkImage image = vulkanContext.swapchainImages[frameIndex]; - VkCommandBufferBeginInfo beginInfo = {0}; + VkCommandBuffer commandBuffer = vulkanContext->commandBuffers[frameIndex]; + VkImage image = vulkanContext->swapchainImages[frameIndex]; + VkCommandBufferBeginInfo beginInfo = {0}; VkImageSubresourceRange clearRange = {0}; VkResult result = vkResetCommandBuffer(commandBuffer, 0); - if(result != VK_SUCCESS) - { + if(result != VK_SUCCESS) { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "vkResetCommandBuffer(): %s\n", getVulkanResultString(result)); @@ -927,8 +860,7 @@ static void rerecordCommandBuffer(uint32_t frameIndex, const VkClearColorValue * beginInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO; beginInfo.flags = VK_COMMAND_BUFFER_USAGE_SIMULTANEOUS_USE_BIT; result = vkBeginCommandBuffer(commandBuffer, &beginInfo); - if(result != VK_SUCCESS) - { + if (result != VK_SUCCESS) { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "vkBeginCommandBuffer(): %s\n", getVulkanResultString(result)); @@ -945,8 +877,7 @@ static void rerecordCommandBuffer(uint32_t frameIndex, const VkClearColorValue * clearRange.levelCount = 1; clearRange.baseArrayLayer = 0; clearRange.layerCount = 1; - vkCmdClearColorImage( - commandBuffer, image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, clearColor, 1, &clearRange); + vkCmdClearColorImage(commandBuffer, image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, clearColor, 1, &clearRange); recordPipelineImageBarrier(commandBuffer, VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_MEMORY_READ_BIT, @@ -954,8 +885,7 @@ static void rerecordCommandBuffer(uint32_t frameIndex, const VkClearColorValue * VK_IMAGE_LAYOUT_PRESENT_SRC_KHR, image); result = vkEndCommandBuffer(commandBuffer); - if(result != VK_SUCCESS) - { + if (result != VK_SUCCESS) { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "vkEndCommandBuffer(): %s\n", getVulkanResultString(result)); @@ -965,11 +895,13 @@ static void rerecordCommandBuffer(uint32_t frameIndex, const VkClearColorValue * static void destroySwapchainAndSwapchainSpecificStuff(SDL_bool doDestroySwapchain) { + vkDeviceWaitIdle(vulkanContext->device); destroyFences(); destroyCommandBuffers(); destroyCommandPool(); - if(doDestroySwapchain) + if (doDestroySwapchain) { destroySwapchain(); + } } static SDL_bool createNewSwapchainAndSwapchainSpecificStuff(void) @@ -977,8 +909,9 @@ static SDL_bool createNewSwapchainAndSwapchainSpecificStuff(void) destroySwapchainAndSwapchainSpecificStuff(SDL_FALSE); getSurfaceCaps(); getSurfaceFormats(); - if(!createSwapchain()) + if(!createSwapchain()) { return SDL_FALSE; + } createCommandPool(); createCommandBuffers(); createFences(); @@ -987,36 +920,70 @@ static SDL_bool createNewSwapchainAndSwapchainSpecificStuff(void) static void initVulkan(void) { + int i; + SDL_Vulkan_LoadLibrary(NULL); - SDL_memset(&vulkanContext, 0, sizeof(VulkanContext)); - loadGlobalFunctions(); - createInstance(); - loadInstanceFunctions(); - createSurface(); - findPhysicalDevice(); - createDevice(); - loadDeviceFunctions(); - getQueues(); - createSemaphores(); - createNewSwapchainAndSwapchainSpecificStuff(); + + vulkanContexts = (VulkanContext *) SDL_calloc(state->num_windows, sizeof (VulkanContext)); + if (!vulkanContexts) { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Out of memory!"); + quit(2); + } + + for (i = 0; i < state->num_windows; ++i) { + vulkanContext = &vulkanContexts[i]; + vulkanContext->window = state->windows[i]; + loadGlobalFunctions(); + createInstance(); + loadInstanceFunctions(); + createSurface(); + findPhysicalDevice(); + createDevice(); + loadDeviceFunctions(); + getQueues(); + createSemaphores(); + createNewSwapchainAndSwapchainSpecificStuff(); + } } -static void shutdownVulkan(void) +static void shutdownVulkan(SDL_bool doDestroySwapchain) { - if(vulkanContext.device && vkDeviceWaitIdle) - vkDeviceWaitIdle(vulkanContext.device); - destroySwapchainAndSwapchainSpecificStuff(SDL_TRUE); - if(vulkanContext.imageAvailableSemaphore && vkDestroySemaphore) - vkDestroySemaphore(vulkanContext.device, vulkanContext.imageAvailableSemaphore, NULL); - if(vulkanContext.renderingFinishedSemaphore && vkDestroySemaphore) - vkDestroySemaphore(vulkanContext.device, vulkanContext.renderingFinishedSemaphore, NULL); - if(vulkanContext.device && vkDestroyDevice) - vkDestroyDevice(vulkanContext.device, NULL); - if(vulkanContext.surface && vkDestroySurfaceKHR) - vkDestroySurfaceKHR(vulkanContext.instance, vulkanContext.surface, NULL); - if(vulkanContext.instance && vkDestroyInstance) - vkDestroyInstance(vulkanContext.instance, NULL); - SDL_free(vulkanContext.surfaceFormats); + if (vulkanContexts) { + int i; + for (i = 0; i < state->num_windows; ++i) { + vulkanContext = &vulkanContexts[i]; + if (vulkanContext->device && vkDeviceWaitIdle) { + vkDeviceWaitIdle(vulkanContext->device); + } + + destroySwapchainAndSwapchainSpecificStuff(doDestroySwapchain); + + if (vulkanContext->imageAvailableSemaphore && vkDestroySemaphore) { + vkDestroySemaphore(vulkanContext->device, vulkanContext->imageAvailableSemaphore, NULL); + } + + if (vulkanContext->renderingFinishedSemaphore && vkDestroySemaphore) { + vkDestroySemaphore(vulkanContext->device, vulkanContext->renderingFinishedSemaphore, NULL); + } + + if (vulkanContext->device && vkDestroyDevice) { + vkDestroyDevice(vulkanContext->device, NULL); + } + + if (vulkanContext->surface && vkDestroySurfaceKHR) { + vkDestroySurfaceKHR(vulkanContext->instance, vulkanContext->surface, NULL); + } + + if (vulkanContext->instance && vkDestroyInstance) { + vkDestroyInstance(vulkanContext->instance, NULL); + } + + SDL_free(vulkanContext->surfaceFormats); + } + SDL_free(vulkanContexts); + vulkanContexts = NULL; + } + SDL_Vulkan_UnloadLibrary(); } @@ -1025,47 +992,42 @@ static SDL_bool render(void) uint32_t frameIndex; VkResult result; double currentTime; - VkClearColorValue clearColor = {0}; + VkClearColorValue clearColor = { {0} }; VkPipelineStageFlags waitDestStageMask = VK_PIPELINE_STAGE_TRANSFER_BIT; VkSubmitInfo submitInfo = {0}; VkPresentInfoKHR presentInfo = {0}; int w, h; - if(!vulkanContext.swapchain) - { + if (!vulkanContext->swapchain) { SDL_bool retval = createNewSwapchainAndSwapchainSpecificStuff(); if(!retval) SDL_Delay(100); return retval; } - result = vkAcquireNextImageKHR(vulkanContext.device, - vulkanContext.swapchain, + result = vkAcquireNextImageKHR(vulkanContext->device, + vulkanContext->swapchain, UINT64_MAX, - vulkanContext.imageAvailableSemaphore, + vulkanContext->imageAvailableSemaphore, VK_NULL_HANDLE, &frameIndex); - if(result == VK_ERROR_OUT_OF_DATE_KHR) + if (result == VK_ERROR_OUT_OF_DATE_KHR) { return createNewSwapchainAndSwapchainSpecificStuff(); - if(result != VK_SUBOPTIMAL_KHR && result != VK_SUCCESS) - { + } + + if ((result != VK_SUBOPTIMAL_KHR) && (result != VK_SUCCESS)) { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "vkAcquireNextImageKHR(): %s\n", getVulkanResultString(result)); quit(2); } - result = vkWaitForFences( - vulkanContext.device, 1, &vulkanContext.fences[frameIndex], VK_FALSE, UINT64_MAX); - if(result != VK_SUCCESS) - { - SDL_LogError( - SDL_LOG_CATEGORY_APPLICATION, "vkWaitForFences(): %s\n", getVulkanResultString(result)); + result = vkWaitForFences(vulkanContext->device, 1, &vulkanContext->fences[frameIndex], VK_FALSE, UINT64_MAX); + if (result != VK_SUCCESS) { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "vkWaitForFences(): %s\n", getVulkanResultString(result)); quit(2); } - result = vkResetFences(vulkanContext.device, 1, &vulkanContext.fences[frameIndex]); - if(result != VK_SUCCESS) - { - SDL_LogError( - SDL_LOG_CATEGORY_APPLICATION, "vkResetFences(): %s\n", getVulkanResultString(result)); + result = vkResetFences(vulkanContext->device, 1, &vulkanContext->fences[frameIndex]); + if (result != VK_SUCCESS) { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "vkResetFences(): %s\n", getVulkanResultString(result)); quit(2); } currentTime = (double)SDL_GetPerformanceCounter() / SDL_GetPerformanceFrequency(); @@ -1076,49 +1038,44 @@ static SDL_bool render(void) rerecordCommandBuffer(frameIndex, &clearColor); submitInfo.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; submitInfo.waitSemaphoreCount = 1; - submitInfo.pWaitSemaphores = &vulkanContext.imageAvailableSemaphore; + submitInfo.pWaitSemaphores = &vulkanContext->imageAvailableSemaphore; submitInfo.pWaitDstStageMask = &waitDestStageMask; submitInfo.commandBufferCount = 1; - submitInfo.pCommandBuffers = &vulkanContext.commandBuffers[frameIndex]; + submitInfo.pCommandBuffers = &vulkanContext->commandBuffers[frameIndex]; submitInfo.signalSemaphoreCount = 1; - submitInfo.pSignalSemaphores = &vulkanContext.renderingFinishedSemaphore; - result = vkQueueSubmit( - vulkanContext.graphicsQueue, 1, &submitInfo, vulkanContext.fences[frameIndex]); - if(result != VK_SUCCESS) - { - SDL_LogError( - SDL_LOG_CATEGORY_APPLICATION, "vkQueueSubmit(): %s\n", getVulkanResultString(result)); + submitInfo.pSignalSemaphores = &vulkanContext->renderingFinishedSemaphore; + result = vkQueueSubmit(vulkanContext->graphicsQueue, 1, &submitInfo, vulkanContext->fences[frameIndex]); + + if (result != VK_SUCCESS) { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "vkQueueSubmit(): %s\n", getVulkanResultString(result)); quit(2); } presentInfo.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR; presentInfo.waitSemaphoreCount = 1; - presentInfo.pWaitSemaphores = &vulkanContext.renderingFinishedSemaphore; + presentInfo.pWaitSemaphores = &vulkanContext->renderingFinishedSemaphore; presentInfo.swapchainCount = 1; - presentInfo.pSwapchains = &vulkanContext.swapchain; + presentInfo.pSwapchains = &vulkanContext->swapchain; presentInfo.pImageIndices = &frameIndex; - result = vkQueuePresentKHR(vulkanContext.presentQueue, &presentInfo); - if(result == VK_ERROR_OUT_OF_DATE_KHR || result == VK_SUBOPTIMAL_KHR) - { + result = vkQueuePresentKHR(vulkanContext->presentQueue, &presentInfo); + if ((result == VK_ERROR_OUT_OF_DATE_KHR) || (result == VK_SUBOPTIMAL_KHR)) { return createNewSwapchainAndSwapchainSpecificStuff(); } - if(result != VK_SUCCESS) - { + + if (result != VK_SUCCESS) { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "vkQueuePresentKHR(): %s\n", getVulkanResultString(result)); quit(2); } - SDL_Vulkan_GetDrawableSize(state->windows[0], &w, &h); - if(w != (int)vulkanContext.swapchainSize.width || h != (int)vulkanContext.swapchainSize.height) - { + SDL_Vulkan_GetDrawableSize(vulkanContext->window, &w, &h); + if(w != (int)vulkanContext->swapchainSize.width || h != (int)vulkanContext->swapchainSize.height) { return createNewSwapchainAndSwapchainSpecificStuff(); } return SDL_TRUE; } -int main(int argc, char *argv[]) +int main(int argc, char **argv) { - int fsaa, accel; int done; SDL_DisplayMode mode; SDL_Event event; @@ -1128,20 +1085,14 @@ int main(int argc, char *argv[]) /* Enable standard application logging */ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO); - /* Initialize parameters */ - fsaa = 0; - accel = -1; - /* Initialize test framework */ state = SDLTest_CommonCreateState(argv, SDL_INIT_VIDEO); - if(!state) - { + if(!state) { return 1; } /* Set Vulkan parameters */ state->window_flags |= SDL_WINDOW_VULKAN; - state->num_windows = 1; state->skip_renderer = 1; if (!SDLTest_CommonDefaultArgs(state, argc, argv) || !SDLTest_CommonInit(state)) { @@ -1163,26 +1114,38 @@ int main(int argc, char *argv[]) frames = 0; then = SDL_GetTicks(); done = 0; - while(!done) - { + while (!done) { /* Check for events */ - ++frames; - while(SDL_PollEvent(&event)) - { + frames++; + while(SDL_PollEvent(&event)) { + /* Need to destroy the swapchain before the window created + * by SDL. + */ + if (event.type == SDL_WINDOWEVENT_CLOSE) { + destroySwapchainAndSwapchainSpecificStuff(SDL_TRUE); + } SDLTest_CommonEvent(state, &event, &done); } - if(!done) - render(); + if (!done) { + int i; + for (i = 0; i < state->num_windows; ++i) { + if (state->windows[i]) { + vulkanContext = &vulkanContexts[i]; + render(); + } + } + } } /* Print out some timing information */ now = SDL_GetTicks(); - if(now > then) - { + if (now > then) { SDL_Log("%2.2f frames per second\n", ((double)frames * 1000) / (now - then)); } - quit(0); + + shutdownVulkan(SDL_TRUE); + SDLTest_CommonQuit(state); return 0; } diff --git a/libs/SDL2/test/testwm2.c b/libs/SDL2/test/testwm2.c index 9ec867b04..93bedf47b 100644 --- a/libs/SDL2/test/testwm2.c +++ b/libs/SDL2/test/testwm2.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -18,6 +18,7 @@ #endif #include "SDL_test_common.h" +#include "SDL_test_font.h" static SDLTest_CommonState *state; int done; @@ -38,6 +39,8 @@ static const char *cursorNames[] = { }; int system_cursor = -1; SDL_Cursor *cursor = NULL; +SDL_bool relative_mode = SDL_FALSE; +int highlighted_mode = -1; /* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */ static void @@ -47,6 +50,99 @@ quit(int rc) exit(rc); } +/* Draws the modes menu, and stores the mode index under the mouse in highlighted_mode */ +static void +draw_modes_menu(SDL_Window *window, SDL_Renderer *renderer, SDL_Rect viewport) +{ + SDL_DisplayMode mode; + char text[1024]; + const int lineHeight = 10; + const int display_index = SDL_GetWindowDisplayIndex(window); + const int num_modes = SDL_GetNumDisplayModes(display_index); + int i; + int column_chars = 0; + int text_length; + int x, y; + int table_top; + SDL_Point mouse_pos = { -1, -1 }; + + /* Get mouse position */ + if (SDL_GetMouseFocus() == window) { + int window_x, window_y; + float logical_x, logical_y; + + SDL_GetMouseState(&window_x, &window_y); + SDL_RenderWindowToLogical(renderer, window_x, window_y, &logical_x, &logical_y); + + mouse_pos.x = (int)logical_x; + mouse_pos.y = (int)logical_y; + } + + x = 0; + y = viewport.y; + + y += lineHeight; + + SDL_snprintf(text, sizeof(text), "Click on a mode to set it with SDL_SetWindowDisplayMode"); + SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255); + SDLTest_DrawString(renderer, x, y, text); + y += lineHeight; + + SDL_snprintf(text, sizeof(text), "Press Ctrl+Enter to toggle SDL_WINDOW_FULLSCREEN"); + SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255); + SDLTest_DrawString(renderer, x, y, text); + y += lineHeight; + + table_top = y; + + /* Clear the cached mode under the mouse */ + if (window == SDL_GetMouseFocus()) { + highlighted_mode = -1; + } + + for (i = 0; i < num_modes; ++i) { + SDL_Rect cell_rect; + + if (0 != SDL_GetDisplayMode(display_index, i, &mode)) { + return; + } + + SDL_snprintf(text, sizeof(text), "%d: %dx%d@%dHz", + i, mode.w, mode.h, mode.refresh_rate); + + /* Update column width */ + text_length = (int)SDL_strlen(text); + column_chars = SDL_max(column_chars, text_length); + + /* Check if under mouse */ + cell_rect.x = x; + cell_rect.y = y; + cell_rect.w = text_length * FONT_CHARACTER_SIZE; + cell_rect.h = lineHeight; + + if (SDL_PointInRect(&mouse_pos, &cell_rect)) { + SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255); + + /* Update cached mode under the mouse */ + if (window == SDL_GetMouseFocus()) { + highlighted_mode = i; + } + } else { + SDL_SetRenderDrawColor(renderer, 170, 170, 170, 255); + } + + SDLTest_DrawString(renderer, x, y, text); + y += lineHeight; + + if (y + lineHeight > (viewport.y + viewport.h)) { + /* Advance to next column */ + x += (column_chars + 1) * FONT_CHARACTER_SIZE; + y = table_top; + column_chars = 0; + } + } +} + void loop() { @@ -76,6 +172,17 @@ loop() SDL_GetDisplayName(SDL_GetWindowDisplayIndex(window))); } } + if (event.window.event == SDL_WINDOWEVENT_FOCUS_LOST) { + relative_mode = SDL_GetRelativeMouseMode(); + if (relative_mode) { + SDL_SetRelativeMouseMode(SDL_FALSE); + } + } + if (event.window.event == SDL_WINDOWEVENT_FOCUS_GAINED) { + if (relative_mode) { + SDL_SetRelativeMouseMode(SDL_TRUE); + } + } } if (event.type == SDL_KEYUP) { SDL_bool updateCursor = SDL_FALSE; @@ -100,12 +207,43 @@ loop() SDL_SetCursor(cursor); } } + if (event.type == SDL_MOUSEBUTTONUP) { + SDL_Window* window = SDL_GetMouseFocus(); + if (highlighted_mode != -1 && window != NULL) { + const int display_index = SDL_GetWindowDisplayIndex(window); + SDL_DisplayMode mode; + if (0 != SDL_GetDisplayMode(display_index, highlighted_mode, &mode)) { + SDL_Log("Couldn't get display mode"); + } else { + SDL_SetWindowDisplayMode(window, &mode); + } + } + } } for (i = 0; i < state->num_windows; ++i) { + SDL_Window* window = state->windows[i]; SDL_Renderer *renderer = state->renderers[i]; - SDL_RenderClear(renderer); - SDL_RenderPresent(renderer); + if (window != NULL && renderer != NULL) { + int y = 0; + SDL_Rect viewport, menurect; + + SDL_RenderGetViewport(renderer, &viewport); + + SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255); + SDL_RenderClear(renderer); + + SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255); + SDLTest_CommonDrawWindowInfo(renderer, state->windows[i], &y); + + menurect.x = 0; + menurect.y = y; + menurect.w = viewport.w; + menurect.h = viewport.h - y; + draw_modes_menu(window, renderer, menurect); + + SDL_RenderPresent(renderer); + } } #ifdef __EMSCRIPTEN__ if (done) { diff --git a/libs/SDL2/test/testyuv.c b/libs/SDL2/test/testyuv.c index 1b05f0ab4..9c89c3140 100644 --- a/libs/SDL2/test/testyuv.c +++ b/libs/SDL2/test/testyuv.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/test/testyuv_cvt.c b/libs/SDL2/test/testyuv_cvt.c index 91e5071e5..ed354d8ac 100644 --- a/libs/SDL2/test/testyuv_cvt.c +++ b/libs/SDL2/test/testyuv_cvt.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -31,9 +31,9 @@ static void RGBtoYUV(Uint8 * rgb, int *yuv, SDL_YUV_CONVERSION_MODE mode, int mo // This formula is from Microsoft's documentation: // https://msdn.microsoft.com/en-us/library/windows/desktop/dd206750(v=vs.85).aspx // L = Kr * R + Kb * B + (1 - Kr - Kb) * G - // Y = floor(2^(M-8) * (219*(L-Z)/S + 16) + 0.5); - // U = clip3(0, (2^M)-1, floor(2^(M-8) * (112*(B-L) / ((1-Kb)*S) + 128) + 0.5)); - // V = clip3(0, (2^M)-1, floor(2^(M-8) * (112*(R-L) / ((1-Kr)*S) + 128) + 0.5)); + // Y = SDL_floor(2^(M-8) * (219*(L-Z)/S + 16) + 0.5); + // U = clip3(0, (2^M)-1, SDL_floor(2^(M-8) * (112*(B-L) / ((1-Kb)*S) + 128) + 0.5)); + // V = clip3(0, (2^M)-1, SDL_floor(2^(M-8) * (112*(R-L) / ((1-Kr)*S) + 128) + 0.5)); float S, Z, R, G, B, L, Kr, Kb, Y, U, V; if (mode == SDL_YUV_CONVERSION_BT709) { diff --git a/libs/SDL2/test/testyuv_cvt.h b/libs/SDL2/test/testyuv_cvt.h index 15ac93260..57ddb7648 100644 --- a/libs/SDL2/test/testyuv_cvt.h +++ b/libs/SDL2/test/testyuv_cvt.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/test/torturethread.c b/libs/SDL2/test/torturethread.c index e41280d7a..d76f07755 100644 --- a/libs/SDL2/test/torturethread.c +++ b/libs/SDL2/test/torturethread.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/test/unifont-13.0.06-license.txt b/libs/SDL2/test/unifont-13.0.06-license.txt new file mode 100644 index 000000000..94339e0f4 --- /dev/null +++ b/libs/SDL2/test/unifont-13.0.06-license.txt @@ -0,0 +1,90 @@ +The SIL Open Font License version 1.1 is copied below, and is also +available with a FAQ at http://scripts.sil.org/OFL. + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/libs/SDL2/test/unifont-13.0.06.hex b/libs/SDL2/test/unifont-13.0.06.hex new file mode 100644 index 000000000..320686a0c --- /dev/null +++ b/libs/SDL2/test/unifont-13.0.06.hex @@ -0,0 +1,57086 @@ +0000:AAAA00018000000180004A51EA505A51C99E0001800000018000000180005555 +0001:AAAA00018000000180003993C252325F8A527193800000018000000180005555 +0002:AAAA00018000000180003BA5C124311989247125800000018000000180005555 +0003:AAAA00018000000180007BA5C1247919C1247925800000018000000180005555 +0004:AAAA000180000001800079BFC2487A49C2487989800000018000000180005555 +0005:AAAA00018000000180007A4DC2527B53C2D67A4F800000018000000180005555 +0006:AAAA000180000001800031A5CA287A31CA2849A5800000018000000180005555 +0007:AAAA000180000001800073D1CA1073D1CA1073DF800000018000000180005555 +0008:AAAA00018000000180001E3991401E3191081E71800000018000000180005555 +0009:AAAA000180000001800022F9A2203E21A2202221800000018000000180005555 +000A:AAAA000180000001800020F9A08020F9A0803E81800000018000000180005555 +000B:AAAA000180000001800022F9A220222194200821800000018000000180005555 +000C:AAAA00018000000180003EF9A0803EF9A0802081800000018000000180005555 +000D:AAAA00018000000180001EF1A08820F1A0901E89800000018000000180005555 +000E:AAAA00018000000180001E71A0881C8982883C71800000018000000180005555 +000F:AAAA00018000000180001EF9A0201C2182203CF9800000018000000180005555 +0010:AAAA0001800000018000391DA510251DA51039DD800000018000000180005555 +0011:AAAA00018000000180007189CA184A09CA08719D800000018000000180005555 +0012:AAAA00018000000180007199CA044A09CA10719D800000018000000180005555 +0013:AAAA00018000000180007199CA044A19CA047199800000018000000180005555 +0014:AAAA00018000000180007185CA0C4A15CA1C7185800000018000000180005555 +0015:AAAA00018000000180004993EA546A59DBD44A53800000018000000180005555 +0016:AAAA00018000000180003453C29A311789127113800000018000000180005555 +0017:AAAA00018000000180007BB9C1247939C1247939800000018000000180005555 +0018:AAAA00018000000180003325C4B447ADC4A434A5800000018000000180005555 +0019:AAAA00018000000180003E89A0D83EA9A0883E89800000018000000180005555 +001A:AAAA00018000000180003A5DC252325D8A52719D800000018000000180005555 +001B:AAAA000180000001800079CFC2107991C0507B8F800000018000000180005555 +001C:AAAA00018000000180001E7190801E61901010E1800000018000000180005555 +001D:AAAA00018000000180000E719080166192100EE1800000018000000180005555 +001E:AAAA00018000000180001C7192801C61941012E1800000018000000180005555 +001F:AAAA000180000001800012719280126192100CE1800000018000000180005555 +0020:00000000000000000000000000000000 +0021:00000000080808080808080008080000 +0022:00002222222200000000000000000000 +0023:000000001212127E24247E4848480000 +0024:00000000083E4948380E09493E080000 +0025:00000000314A4A340808162929460000 +0026:000000001C2222141829454246390000 +0027:00000808080800000000000000000000 +0028:00000004080810101010101008080400 +0029:00000020101008080808080810102000 +002A:00000000000008492A1C2A4908000000 +002B:0000000000000808087F080808000000 +002C:00000000000000000000000018080810 +002D:0000000000000000003C000000000000 +002E:00000000000000000000000018180000 +002F:00000000020204080810102040400000 +0030:00000000182442464A52624224180000 +0031:000000000818280808080808083E0000 +0032:000000003C4242020C102040407E0000 +0033:000000003C4242021C020242423C0000 +0034:00000000040C142444447E0404040000 +0035:000000007E4040407C020202423C0000 +0036:000000001C2040407C424242423C0000 +0037:000000007E0202040404080808080000 +0038:000000003C4242423C424242423C0000 +0039:000000003C4242423E02020204380000 +003A:00000000000018180000001818000000 +003B:00000000000018180000001808081000 +003C:00000000000204081020100804020000 +003D:000000000000007E0000007E00000000 +003E:00000000004020100804081020400000 +003F:000000003C4242020408080008080000 +0040:000000001C224A565252524E201E0000 +0041:0000000018242442427E424242420000 +0042:000000007C4242427C424242427C0000 +0043:000000003C42424040404042423C0000 +0044:00000000784442424242424244780000 +0045:000000007E4040407C404040407E0000 +0046:000000007E4040407C40404040400000 +0047:000000003C424240404E4242463A0000 +0048:00000000424242427E42424242420000 +0049:000000003E08080808080808083E0000 +004A:000000001F0404040404044444380000 +004B:00000000424448506060504844420000 +004C:000000004040404040404040407E0000 +004D:00000000424266665A5A424242420000 +004E:0000000042626252524A4A4646420000 +004F:000000003C42424242424242423C0000 +0050:000000007C4242427C40404040400000 +0051:000000003C4242424242425A663C0300 +0052:000000007C4242427C48444442420000 +0053:000000003C424240300C0242423C0000 +0054:000000007F0808080808080808080000 +0055:000000004242424242424242423C0000 +0056:00000000414141222222141408080000 +0057:00000000424242425A5A666642420000 +0058:00000000424224241818242442420000 +0059:00000000414122221408080808080000 +005A:000000007E02020408102040407E0000 +005B:0000000E080808080808080808080E00 +005C:00000000404020101008080402020000 +005D:00000070101010101010101010107000 +005E:00001824420000000000000000000000 +005F:00000000000000000000000000007F00 +0060:00201008000000000000000000000000 +0061:0000000000003C42023E4242463A0000 +0062:0000004040405C6242424242625C0000 +0063:0000000000003C4240404040423C0000 +0064:0000000202023A4642424242463A0000 +0065:0000000000003C42427E4040423C0000 +0066:0000000C1010107C1010101010100000 +0067:0000000000023A44444438203C42423C +0068:0000004040405C624242424242420000 +0069:000000080800180808080808083E0000 +006A:0000000404000C040404040404044830 +006B:00000040404044485060504844420000 +006C:000000180808080808080808083E0000 +006D:00000000000076494949494949490000 +006E:0000000000005C624242424242420000 +006F:0000000000003C4242424242423C0000 +0070:0000000000005C6242424242625C4040 +0071:0000000000003A4642424242463A0202 +0072:0000000000005C624240404040400000 +0073:0000000000003C4240300C02423C0000 +0074:000000001010107C10101010100C0000 +0075:000000000000424242424242463A0000 +0076:00000000000042424224242418180000 +0077:00000000000041494949494949360000 +0078:00000000000042422418182442420000 +0079:0000000000004242424242261A02023C +007A:0000000000007E0204081020407E0000 +007B:0000000C10100808102010080810100C +007C:00000808080808080808080808080808 +007D:00000030080810100804081010080830 +007E:00000031494600000000000000000000 +007F:AAAA000180000001800073D1CA104BD1CA1073DF800000018000000180005555 +0080:AAAA0001800000018000719DCA5273D3C252425D800000018000000180005555 +0081:AAAA0001800000018000499DCA527A5DCA504991800000018000000180005555 +0082:AAAA00018000000180007393CA52739FCA127213800000018000000180005555 +0083:AAAA00018000000180004B93EA525B9FCA524B93800000018000000180005555 +0084:AAAA000180000001800074B9A6A425A5A4A474B9800000018000000180005555 +0085:AAAA00018000000180004BD1EA105BD1CA104BDF800000018000000180005555 +0086:AAAA000180000001800039CDC212319F88527393800000018000000180005555 +0087:AAAA000180000001800079CDC212799FC0527B93800000018000000180005555 +0088:AAAA00018000000180004B9DC9207919C9044939800000018000000180005555 +0089:AAAA000180000001800025DDA4843C85A4842499800000018000000180005555 +008A:AAAA000180000001800045CDC4904489A8841099800000018000000180005555 +008B:AAAA0001800000018000721DCA127213C21243DD800000018000000180005555 +008C:AAAA00018000000180007213CA127213C21243CD800000018000000180005555 +008D:AAAA00018000000180000E2189200E218A200921800000018000000180005555 +008E:AAAA000180000001800039DDC202318D8850739F800000018000000180005555 +008F:AAAA000180000001800039DDC202318D8842739D800000018000000180005555 +0090:AAAA000180000001800071CFCA104A0DCA0271DD800000018000000180005555 +0091:AAAA00018000000180007245CA4C7245C244418F800000018000000180005555 +0092:AAAA0001800000018000725DCA42724DC250419F800000018000000180005555 +0093:AAAA00018000000180003B9DC120311989047139800000018000000180005555 +0094:AAAA000180000001800039D3C212421FC21239D3800000018000000180005555 +0095:AAAA00018000000180002289B6882AA9A2D82289800000018000000180005555 +0096:AAAA00018000000180003B8DC252339F8A127213800000018000000180005555 +0097:AAAA00018000000180007B8DC2527B9FC2127A13800000018000000180005555 +0098:AAAA0001800000018000398FC250324D8A42719D800000018000000180005555 +0099:AAAA0001800000018000339BC42225A394A2639B800000018000000180005555 +009A:AAAA000180000001800039DDC20832098A0871DD800000018000000180005555 +009B:AAAA000180000001800039DDC2084189C0483B9D800000018000000180005555 +009C:AAAA00018000000180000EF990200C2182201C21800000018000000180005555 +009D:AAAA000180000001800031CFCA104991C850338F800000018000000180005555 +009E:AAAA00018000000180001C8992D81CA990881089800000018000000180005555 +009F:AAAA0001800000018000338FCA507B91CA104A0F800000018000000180005555 +00A0:00000000000000000000000000000000 +00A1:00000000080800080808080808080000 +00A2:0000000008083E494848493E08080000 +00A3:000000000E1010107C1010103E610000 +00A4:0000000000423C244242243C42000000 +00A5:00000000412214087F087F0808080000 +00A6:00000000080808080000080808080000 +00A7:000000003C42403C42423C02423C0000 +00A8:24240000000000000000000000000000 +00A9:000000003C4299A5A1A1A599423C0000 +00AA:00001C021E221E003E00000000000000 +00AB:00000000001212242448242412120000 +00AC:000000000000000000007E0202020000 +00AD:AAAA000180003A63C25433C98A48724980000001800003C18000000180005555 +00AE:000000003C42B9A5A5B9A9A5423C0000 +00AF:00007E00000000000000000000000000 +00B0:00000000182424180000000000000000 +00B1:000000000808087F080808007F000000 +00B2:0000003844041820407C000000000000 +00B3:00000038440438044438000000000000 +00B4:00040810000000000000000000000000 +00B5:00000000000042424242424266594080 +00B6:000000003F7A7A7A3A0A0A0A0A0A0A00 +00B7:00000000000000001818000000000000 +00B8:00000000000000000000000000000830 +00B9:0000001030501010107C000000000000 +00BA:00001C2222221C003E00000000000000 +00BB:00000000004848242412242448480000 +00BC:00000000226224282812162A4E420000 +00BD:000000002262242828141A22444E0000 +00BE:00000000621224186812162A4E420000 +00BF:000000001010001010204042423C0000 +00C0:300C000018242442427E424242420000 +00C1:0C30000018242442427E424242420000 +00C2:1824000018242442427E424242420000 +00C3:324C000018242442427E424242420000 +00C4:2424000018242442427E424242420000 +00C5:1824180018242442427E424242420000 +00C6:000000001F2848487F484848484F0000 +00C7:000000003C42424040404042423C0830 +00C8:300C00007E4040407C404040407E0000 +00C9:0C3000007E4040407C404040407E0000 +00CA:182400007E4040407C404040407E0000 +00CB:242400007E4040407C404040407E0000 +00CC:180600003E08080808080808083E0000 +00CD:0C3000003E08080808080808083E0000 +00CE:182400003E08080808080808083E0000 +00CF:242400003E08080808080808083E0000 +00D0:0000000078444242F242424244780000 +00D1:324C000042626252524A4A4646420000 +00D2:300C00003C42424242424242423C0000 +00D3:0C3000003C42424242424242423C0000 +00D4:182400003C42424242424242423C0000 +00D5:324C00003C42424242424242423C0000 +00D6:242400003C42424242424242423C0000 +00D7:00000000000000422418244200000000 +00D8:000000023A44464A4A525262225C4000 +00D9:300C00004242424242424242423C0000 +00DA:0C3000004242424242424242423C0000 +00DB:182400004242424242424242423C0000 +00DC:242400004242424242424242423C0000 +00DD:0C300000414122221408080808080000 +00DE:00000040407844424244784040400000 +00DF:000000003844444858444242524C0000 +00E0:0000300C00003C42023E4242463A0000 +00E1:00000C3000003C42023E4242463A0000 +00E2:0000182400003C42023E4242463A0000 +00E3:0000324C00003C42023E4242463A0000 +00E4:0000242400003C42023E4242463A0000 +00E5:0018241800003C42023E4242463A0000 +00E6:0000000000003E49093F4848493E0000 +00E7:0000000000003C4240404040423C0830 +00E8:0000300C00003C42427E4040423C0000 +00E9:00000C3000003C42427E4040423C0000 +00EA:0000182400003C42427E4040423C0000 +00EB:0000242400003C42427E4040423C0000 +00EC:0000300C0000180808080808083E0000 +00ED:00000C300000180808080808083E0000 +00EE:000018240000180808080808083E0000 +00EF:000024240000180808080808083E0000 +00F0:0000320C1422023E42424242423C0000 +00F1:0000324C00005C624242424242420000 +00F2:0000300C00003C4242424242423C0000 +00F3:00000C3000003C4242424242423C0000 +00F4:0000182400003C4242424242423C0000 +00F5:0000324C00003C4242424242423C0000 +00F6:0000242400003C4242424242423C0000 +00F7:0000000000001800007E000018000000 +00F8:0000000000023C464A4A5252623C4000 +00F9:0000300C0000424242424242463A0000 +00FA:00000C300000424242424242463A0000 +00FB:000018240000424242424242463A0000 +00FC:000024240000424242424242463A0000 +00FD:00000C3000004242424242261A02023C +00FE:0000004040405C6242424242625C4040 +00FF:0000242400004242424242261A02023C +0100:003C000018242442427E424242420000 +0101:0000003C00003C42023E4242463A0000 +0102:42423C0018242442427E424242420000 +0103:0042423C00003C42023E4242463A0000 +0104:0000000018242442427E424242420403 +0105:0000000000003C42023E4242463A0403 +0106:0C3000003C42424040404042423C0000 +0107:00000C3000003C4240404040423C0000 +0108:182400003C42424040404042423C0000 +0109:0000182400003C4240404040423C0000 +010A:101000003C42424040404042423C0000 +010B:0000101000003C4240404040423C0000 +010C:241800003C42424040404042423C0000 +010D:0000241800003C4240404040423C0000 +010E:48300000784442424242424244780000 +010F:2418000202023A4642424242463A0000 +0110:0000000078444242F242424244780000 +0111:000000020F023A4642424242463A0000 +0112:003C00007E4040407C404040407E0000 +0113:0000003C00003C42427E4040423C0000 +0114:42423C007E4040407C404040407E0000 +0115:000042423C003C42427E4040423C0000 +0116:101000007E4040407C404040407E0000 +0117:0000101000003C42427E4040423C0000 +0118:000000007E4040407C404040407E0806 +0119:0000000000003C42427E4040423C100C +011A:241800007E4040407C404040407E0000 +011B:0000241800003C42427E4040423C0000 +011C:182400003C424240404E4242463A0000 +011D:0000182400023A44444438203C42423C +011E:42423C003C424240404E4242463A0000 +011F:0042423C00023A44444438203C42423C +0120:101000003C424240404E4242463A0000 +0121:0000101000023A44444438203C42423C +0122:000000003C424240404E4242463A0830 +0123:00000C1000023A44444438203C42423C +0124:18240000424242427E42424242420000 +0125:3048004040405C624242424242420000 +0126:000000004242FF42427E424242420000 +0127:00000040F0405C624242424242420000 +0128:324C00003E08080808080808083E0000 +0129:0000324C0000180808080808083E0000 +012A:003C00003E08080808080808083E0000 +012B:0000003C0000180808080808083E0000 +012C:42423C003E08080808080808083E0000 +012D:000042423C00180808080808083E0000 +012E:000000003E08080808080808083E0806 +012F:000000080800180808080808083E0806 +0130:080800003E08080808080808083E0000 +0131:000000000000180808080808083E0000 +0132:000000004242424242420202423C0000 +0133:0000222200002222222222221A02221C +0134:0C1200001F0404040404044444380000 +0135:00000C1200000C040404040404044830 +0136:000000004244485060605048444220C0 +0137:000000404040444850605048444220C0 +0138:00000000000042444870704844420000 +0139:186000004040404040404040407E0000 +013A:0C3000180808080808080808083E0000 +013B:000000004040404040404040407E0830 +013C:000000180808080808080808083E0830 +013D:241800004040404040404040407E0000 +013E:241800180808080808080808083E0000 +013F:000000004040404044444040407E0000 +0140:000000301010101014141010107C0000 +0141:000000004040485060C04040407E0000 +0142:0000001808080A0C18280808083E0000 +0143:0C30000042626252524A4A4646420000 +0144:00000C3000005C624242424242420000 +0145:0000000042626252524A4A46464220C0 +0146:0000000000005C6242424242424220C0 +0147:2418000042626252524A4A4646420000 +0148:0000241800005C624242424242420000 +0149:0060202040005C624242424242420000 +014A:000000005C62424242424242424C0000 +014B:0000000000005C62424242424242020C +014C:003C00003C42424242424242423C0000 +014D:0000003C00003C4242424242423C0000 +014E:42423C003C42424242424242423C0000 +014F:000042423C003C4242424242423C0000 +0150:334400003C42424242424242423C0000 +0151:0000334400003C4242424242423C0000 +0152:00000000374848484E48484848370000 +0153:0000000000003649494F484849360000 +0154:0C3000007C4242427C48444442420000 +0155:00000C3000005C624240404040400000 +0156:000000007C4242427C484444424220C0 +0157:0000000000005C6242404040404020C0 +0158:241800007C4242427C48444442420000 +0159:0000241800005C624240404040400000 +015A:0C3000003C424240300C0242423C0000 +015B:00000C3000003C4240300C42423C0000 +015C:182400003C424240300C0242423C0000 +015D:0000182400003C4240300C02423C0000 +015E:000000003C424240300C0242423C0830 +015F:0000000000003C4240300C02423C0830 +0160:241800003C424240300C0242423C0000 +0161:0000241800003C4240300C02423C0000 +0162:000000007F0808080808080808080830 +0163:000000001010107C10101010100C0830 +0164:241800007F0808080808080808080000 +0165:241800001010107C10101010100C0000 +0166:000000007F0808083E08080808080000 +0167:000000001010107C10107C10100C0000 +0168:324C00004242424242424242423C0000 +0169:0000324C0000424242424242463A0000 +016A:003C00004242424242424242423C0000 +016B:0000003C0000424242424242463A0000 +016C:42423C004242424242424242423C0000 +016D:0042423C0000424242424242463A0000 +016E:182418004242424242424242423C0000 +016F:000018241800424242424242463A0000 +0170:334400004242424242424242423C0000 +0171:000033440000424242424242463A0000 +0172:000000004242424242424242423C100C +0173:000000000000424242424242463A0403 +0174:18240000424242425A5A666642420000 +0175:00001824000041494949494949360000 +0176:18240000414122221408080808080000 +0177:0000182400004242424242261A02023C +0178:24240000414122221408080808080000 +0179:0C3000007E02020408102040407E0000 +017A:00000C3000007E0204081020407E0000 +017B:101000007E02020408102040407E0000 +017C:0000101000007E0204081020407E0000 +017D:241800007E02020408102040407E0000 +017E:0000241800007E0204081020407E0000 +017F:0000000C101010301010101010100000 +0180:00000040F0405C6242424242625C0000 +0181:000000007CA2A2223C222222223C0000 +0182:000000007E4040407C424242427C0000 +0183:0000007C40405C6242424242625C0000 +0184:00000000602020203C222222223C0000 +0185:000000000000602020203C22223C0000 +0186:000000003C42420202020242423C0000 +0187:000003043C4444404040404444380000 +0188:0000000003043C444040404044380000 +0189:0000000078444242F242424244780000 +018A:0000000078A4A2222222222224380000 +018B:000000007E0202023E424242423E0000 +018C:0000003E02023A4642424242463A0000 +018D:0000000000003C424242422418040438 +018E:000000007E0202023E020202027E0000 +018F:0000000018244202027E424224180000 +0190:000000003C42424038404042423C0000 +0191:000000001F1010101E10101010106000 +0192:0000000C1010107C1010101010106000 +0193:000000033C444440405C44444C340000 +0194:00000000424242242418182424180000 +0195:00000040404040724A4A4A4A4A440000 +0196:00000000380808080808080808060000 +0197:000000003E0808083E080808083E0000 +0198:00000000464A50506060504844420000 +0199:00000030484044485060504844420000 +019A:000000180808083E08080808083E0000 +019B:00000000242810304818242442420000 +019C:00000000494949494949494949370000 +019D:00000000222232322A2A26262222C000 +019E:0000000000005C624242424242420202 +019F:000000003C4242427E424242423C0000 +01A0:000000023A4444444444444444380000 +01A1:0000000000023A444444444444380000 +01A2:00000000364A4A4A4A4A4A4A4A320202 +01A3:000000000000364A4A4A4A4A4A320202 +01A4:000000003E5151111E10101010100000 +01A5:0000000000035C644444444464584040 +01A6:0000000070203C22223C282422210000 +01A7:000000003C4242020C304042423C0000 +01A8:0000000000003C42020C3040423C0000 +01A9:000000007E40201008081020407E0000 +01AA:00000020505030101010101010100C00 +01AB:000000001010107C10101010100C0418 +01AC:000000003F4848080808080808080000 +01AD:0000000C1010107C10101010100C0000 +01AE:000000007F0808080808080808080600 +01AF:00000101464444444444444444380000 +01B0:0000000001014644444444444C340000 +01B1:00000000422424424242424224180000 +01B2:000000004C4242424242424448300000 +01B3:00000000464544282810101010100000 +01B4:0000000000034444444444241C040438 +01B5:000000007E0204083C102040407E0000 +01B6:0000000000007E04083C1020407E0000 +01B7:000000007E0408101C020202463C0000 +01B8:000000007E20100838404040623C0000 +01B9:0000000000007C20100838404040423C +01BA:0000000000003E04081C02023C40423C +01BB:000000003C424204087E2040407E0000 +01BC:000000007E2020203C020202423C0000 +01BD:0000000000007E20203C0202423C0000 +01BE:0000000010107C101018040444380000 +01BF:0000000000005C624242444850604040 +01C0:00000010101010101010101010100000 +01C1:00000028282828282828282828280000 +01C2:000000101010107C107C101010100000 +01C3:00000000080808080808080008080000 +01C4:05020000675151515252545454670000 +01C5:00000502605057515152525454670000 +01C6:00000512101037515152525454370000 +01C7:00000000474141414141414949760000 +01C8:0000000141404341414141414179020C +01C9:00000061212023212121212121F9020C +01CA:000000004B4949696959594D4D4A0000 +01CB:0000000149486B69695959594949120C +01CC:0000000101005369494949494949120C +01CD:2418000018242442427E424242420000 +01CE:0000241800003C42023E4242463A0000 +01CF:241800003E08080808080808083E0000 +01D0:000024180000180808080808083E0000 +01D1:241800003C42424242424242423C0000 +01D2:0000241800003C4242424242423C0000 +01D3:241800004242424242424242423C0000 +01D4:000024180000424242424242463A0000 +01D5:3C0024004242424242424242423C0000 +01D6:003C00242400424242424242463A0000 +01D7:0C3000240042424242424242423C0000 +01D8:0C3000242400424242424242463A0000 +01D9:241800240042424242424242423C0000 +01DA:241800242400424242424242463A0000 +01DB:300C00240042424242424242423C0000 +01DC:300C00242400424242424242463A0000 +01DD:0000000000003C4202027E42423C0000 +01DE:3C00240018242442427E424242420000 +01DF:003C002424003C42023E4242463A0000 +01E0:3C00180018242442427E424242420000 +01E1:003C001010003C42023E4242463A0000 +01E2:003C00001F2848487F484848484F0000 +01E3:0000003C00003E49093F4848493E0000 +01E4:000000003C424240404E424F423E0000 +01E5:0000000000023A44444438203C4F423C +01E6:241800003C424240404E4242463A0000 +01E7:0000241800023A44444438203C42423C +01E8:24180000424448506060504844420000 +01E9:24180040404044485060504844420000 +01EA:000000003C42424242424242423C100C +01EB:0000000000003C4242424242423C100C +01EC:003C00003C42424242424242423C100C +01ED:0000003C00003C4242424242423C100C +01EE:241800007E0408101C020202463C0000 +01EF:0000241800003E0408101C020202423C +01F0:0000120C00000C040404040404044830 +01F1:00000000675151515252545454670000 +01F2:00000000605057515152525454670000 +01F3:00000010101037515152525454370000 +01F4:0C3000003C424240404E4242463A0000 +01F5:00000C3000023A44444438203C42423C +01F6:000000004848484A7A4A4A4A4A440000 +01F7:000000005C6242424448506040404000 +01F8:00300C0042626252524A4A4646420000 +01F9:000000300C005C624242424242420000 +01FA:0C30182418182424427E424242420000 +01FB:0C3000182418003C42023E42463A0000 +01FC:061800001F2848487F484848484F0000 +01FD:0000061800003E49093F4848493E0000 +01FE:0C3000023A44464A4A525262225C4000 +01FF:00000C3000023C464A4A5252623C4000 +0200:CC22000018242442427E424242420000 +0201:0000CC2200003C42023E4242463A0000 +0202:3C42420018242442427E424242420000 +0203:00003C4242003C42023E4242463A0000 +0204:CC2200007E4040407C404040407E0000 +0205:0000CC2200003C42427E4040423C0000 +0206:3C4242007E4040407C404040407E0000 +0207:00003C4242003C42427E4040423C0000 +0208:CC2200003E08080808080808083E0000 +0209:0000CC220000180808080808083E0000 +020A:3C4242003E08080808080808083E0000 +020B:00003C424200180808080808083E0000 +020C:CC2200003C42424242424242423C0000 +020D:0000CC2200003C4242424242423C0000 +020E:3C4242003C42424242424242423C0000 +020F:00003C4242003C4242424242423C0000 +0210:CC2200007C4242427C48444442420000 +0211:0000CC2200005C624240404040400000 +0212:3C4242007C4242427C48444442420000 +0213:00003C4242005C624240404040400000 +0214:CC2200004242424242424242423C0000 +0215:0000CC220000424242424242463A0000 +0216:3C4242004242424242424242423C0000 +0217:00003C424200424242424242463A0000 +0218:000000003C424240300C0242423C0810 +0219:0000000000003C4240300C02423C0810 +021A:000000007F0808080808080808080204 +021B:000000001010107C10101010100C2040 +021C:000000003C4242020C340202020C3000 +021D:0000000000003C4202020C3202020C30 +021E:00241800424242427E42424242420000 +021F:002418004040405C6242424242420000 +0220:000000005C6242424242424242420202 +0221:0000000202023A4642424242473B0204 +0222:0000000008244242243C4242423C0000 +0223:000000000000122224182422221C0000 +0224:000000007E02020408102040407E0204 +0225:0000000000007E0204081020407E0204 +0226:0000080018242442427E424242420000 +0227:0000000008003C42023E4242463A0000 +0228:000000007E4040407C404040407E0830 +0229:0000000000003C42427E4040423C0830 +022A:3C0024003C42424242424242423C0000 +022B:00003C0024003C4242424242423C0000 +022C:3C00324C003C424242424242423C0000 +022D:003C00324C003C4242424242423C0000 +022E:000008003C42424242424242423C0000 +022F:0000000008003C4242424242423C0000 +0230:3C0008003C42424242424242423C0000 +0231:00003C0008003C4242424242423C0000 +0232:00003E00414122221408080808080000 +0233:000000003C004242424242261A02023C +0234:0000001808080808080808080C0C1020 +0235:0000000000005C624242424243430204 +0236:000000001010107C10101010160E0810 +0237:0000000000000C040404040404044830 +0238:00000010101054BA92929292BA540000 +0239:00000000000054BA92929292BA541010 +023A:000000021A242C4A527E624242C20000 +023B:000000023C464A4850506062427C8000 +023C:0000000002043C4A50506060427C8000 +023D:000000002020202078202020203E0000 +023E:000001027F0C0C080818182828480000 +023F:0000000000003C4240300C02423C0906 +0240:0000000000007E02040810204060100E +0241:000000003C4242020408080808080000 +0242:0000000000003C424202040808080000 +0243:000000003C2222223C227A22223C0000 +0244:000000004444444444FE444444380000 +0245:00000000181818242424244242420000 +0246:000004047E4848507C505060607E4040 +0247:0000000000023C464A7E5060427C8000 +0248:000000001F040404041F044444380000 +0249:0000000404000C04041F040404044830 +024A:0000000038444444444444444C340403 +024B:000000000000344C444444444C340403 +024C:000000003C2222227C28242422220000 +024D:0000000000002C322270202020200000 +024E:000000004141227F1408080808080000 +024F:0000000000002222227F22120E02021C +0250:0000000000005C6242427C40423C0000 +0251:0000000000003A46424242464A320000 +0252:0000000000004C5262424242625C0000 +0253:0000003840405C6242424242625C0000 +0254:0000000000003C4202020202423C0000 +0255:0000000000003C424040404C523C4000 +0256:000000040404344C444444444C340300 +0257:000000030404344C444444444C340000 +0258:0000000000003C42427E0202423C0000 +0259:0000000000003C4202027E42423C0000 +025A:000000000000344D1A28484848300000 +025B:0000000000003C42403C4040423C0000 +025C:0000000000003C42023C0202423C0000 +025D:000000000000344D0A30080848300000 +025E:0000000000003C42425C4242423C0000 +025F:0000000000000C0404041F0404044830 +0260:000000000003344C4444444C34044438 +0261:0000000000003A46424242463A02423C +0262:0000000000003C4240404E42423E0000 +0263:00000000000042424224241818242418 +0264:00000000000042422424181824180000 +0265:0000000000424242424242463A020202 +0266:0000003840405C624242424242420000 +0267:0000003840405C62424242424242020C +0268:0000000808001808083E0808083E0000 +0269:000000000000701010101010100C0000 +026A:0000000000003E0808080808083E0000 +026B:000000180808083A4C080808083E0000 +026C:00000018080838483E080808083E0000 +026D:00000018080808080808080808080600 +026E:0000003010101F1112141611117D0906 +026F:00000000000049494949494949370000 +0270:00000000000049494949494949370101 +0271:00000000000076494949494949410600 +0272:00000000000016191111111111116000 +0273:00000000000058644444444444440300 +0274:000000000000424262524A4642420000 +0275:0000000000003C42427E4242423C0000 +0276:0000000000003748484E484848370000 +0277:0000000000003E414149494949360000 +0278:0000000808083E4949494949493E0808 +0279:000000000000020202020242463A0000 +027A:000000000202020202020242463A0000 +027B:0000000000000404040404444C340300 +027C:0000000000005C624240404040404040 +027D:0000000000005C624240404040403000 +027E:0000000000003C424240404040400000 +027F:0000000000003C424202020202020202 +0280:0000000000007C42427C484442420000 +0281:000000000000424244487C42427C0000 +0282:0000000000003C4240300C02427C4030 +0283:0000000C101010101010101010106000 +0284:0000000C1010101010107C1010106000 +0285:00000000000060101010101010100C00 +0286:000000060808080808080808384E3000 +0287:00000000601010101010107C10100000 +0288:000000001010107C1010101010100E00 +0289:0000000000002222227F2222261A0000 +028A:00000000000042244242424224180000 +028B:000000000000CC424242424448300000 +028C:00000000000018182424244242420000 +028D:00000000000036494949494949410000 +028E:000000003C4040586442424242420000 +028F:00000000000041412214080808080000 +0290:0000000000007C0808101020207C0403 +0291:0000000000007E0204081026497E1000 +0292:0000000000003E0408101C020202423C +0293:0000000000003E0408101C0202324A3C +0294:000000003C4242020408080808080000 +0295:000000003C4242402010101010100000 +0296:000000000808080808040242423C0000 +0297:0000000000003C42404040404040423C +0298:000000003C4242425A5A4242423C0000 +0299:0000000000007C42427C4242427C0000 +029A:0000000000003C42423A4242423C0000 +029B:0000000000003B4440404C44443C0000 +029C:0000000000002222223E222222220000 +029D:0000000404000C0404040404043E4830 +029E:00000000004222120A060A1222020202 +029F:000000000000404040404040407E0000 +02A0:000000000003344C444444444C340404 +02A1:000000003C4242020408083E08080000 +02A2:000000003C4242402010107C10100000 +02A3:0000001010103F5152525454583F0000 +02A4:0000001010103F515254565151310906 +02A5:0000001010103F5152545852553E0400 +02A6:00000000404046F948444241413E0000 +02A7:000000032424247C24242424241C0418 +02A8:00000000404046F94848484A4D3E0400 +02A9:000000003048406E515151515151020C +02AA:000000602020262928242221217E0000 +02AB:0000006020203E2224242828307E0000 +02AC:00000049495536220049495536220000 +02AD:000000007E42424200007E4242420000 +02AE:0000000000006424242424242C140404 +02AF:0000000000006424242424242C140403 +02B0:00000040405864444444000000000000 +02B1:00000038444058644444000000000000 +02B2:00000004000404040424180000000000 +02B3:00000000005864444040000000000000 +02B4:00000000000404444C34000000000000 +02B5:00000000000404444C34030000000000 +02B6:00000044444878444478000000000000 +02B7:00000000004949553622000000000000 +02B8:000000000044444C3404380000000000 +02B9:00000000081020000000000000000000 +02BA:00000000122448000000000000000000 +02BB:00000000081010180000000000000000 +02BC:00000000180808100000000000000000 +02BD:00000000181010080000000000000000 +02BE:00000030080404083000000000000000 +02BF:0000000C102020100C00000000000000 +02C0:0000003C4202021C1010000000000000 +02C1:0000003C424040380808000000000000 +02C2:00000004081020100804000000000000 +02C3:00000020100804081020000000000000 +02C4:00000000081422410000000000000000 +02C5:00000000412214080000000000000000 +02C6:00000000182400000000000000000000 +02C7:00000000241800000000000000000000 +02C8:00000000080808000000000000000000 +02C9:000000003C0000000000000000000000 +02CA:000000000C3000000000000000000000 +02CB:00000000300C00000000000000000000 +02CC:00000000000000000000080808080000 +02CD:000000000000000000000000003C0000 +02CE:00000000000000000000000000300C00 +02CF:000000000000000000000000000C3000 +02D0:00000000000000381000001038000000 +02D1:00000000000000381000000000000000 +02D2:00000000000030080404083000000000 +02D3:0000000000000C102020100C00000000 +02D4:00000000000000101010107C00000000 +02D5:000000000000007C1010101000000000 +02D6:0000000000000010107C101000000000 +02D7:0000000000000000007C000000000000 +02D8:000042423C0000000000000000000000 +02D9:00001818000000000000000000000000 +02DA:00001824180000000000000000000000 +02DB:00000000000000000000000000000806 +02DC:0000324C000000000000000000000000 +02DD:00003344000000000000000000000000 +02DE:000000000000002060A21C0000000000 +02DF:00000000422418244200000000000000 +02E0:00000000004242241824241800000000 +02E1:00000030101010101038000000000000 +02E2:00000000003E403C027C000000000000 +02E3:00000000004224182442000000000000 +02E4:00003C40403808000000000000000000 +02E5:0000007C040404040404040404040000 +02E6:00000004047C04040404040404040000 +02E7:00000004040404047C04040404040000 +02E8:00000004040404040404047C04040000 +02E9:000000040404040404040404047C0000 +02EA:000000000000404040404C7000000000 +02EB:000000000040404C7040404000000000 +02EC:00000000000000000000004428100000 +02ED:00007E007E0000000000000000000000 +02EE:00000000662222440000000000000000 +02EF:00000000000000000000000044281000 +02F0:00000000000000000000000010284400 +02F1:00000000000000000000040810080400 +02F2:00000000000000000000100804081000 +02F3:00000000000000000000000018241800 +02F4:00000000000000300C00000000000000 +02F5:00000000000000CC2200000000000000 +02F6:00000000000000334400000000000000 +02F7:0000000000000000000000000000324C +02F8:00000018180000001818000000000000 +02F9:00000038202020000000000000000000 +02FA:00000038080808000000000000000000 +02FB:00000000000000000000202020380000 +02FC:00000000000000000000080808380000 +02FD:0000000000000000000000000042427E +02FE:0000000000000000000000000040407E +02FF:000000000000000000000010207E2010 +0300:300C0000000000000000000000000000 +0301:0C300000000000000000000000000000 +0302:18240000000000000000000000000000 +0303:00324C00000000000000000000000000 +0304:00007E00000000000000000000000000 +0305:0000FF00000000000000000000000000 +0306:0042423C000000000000000000000000 +0307:00181800000000000000000000000000 +0308:00666600000000000000000000000000 +0309:18240408080000000000000000000000 +030A:18242418000000000000000000000000 +030B:33440000000000000000000000000000 +030C:00422418000000000000000000000000 +030D:00080808000000000000000000000000 +030E:00242424000000000000000000000000 +030F:CC220000000000000000000000000000 +0310:185A423C000000000000000000000000 +0311:003C4242000000000000000000000000 +0312:00081018000000000000000000000000 +0313:00180810000000000000000000000000 +0314:00181008000000000000000000000000 +0315:00030102000000000000000000000000 +0316:00000000000000000000000000100804 +0317:00000000000000000000000000081020 +0318:00000000000000000000000000083808 +0319:00000000000000000000000000101C10 +031A:001E0202000000000000000000000000 +031B:0000040A020408000000000000000000 +031C:00000000000000000000000000182018 +031D:00000000000000000000000000101038 +031E:00000000000000000000000000381010 +031F:00000000000000000000000000107C10 +0320:0000000000000000000000000000003C +0321:0000000000000000000000000202120C +0322:00000000000000000000000008080906 +0323:00000000000000000000000000001818 +0324:00000000000000000000000000006666 +0325:00000000000000000000000000182418 +0326:00000000000000000000000000180810 +0327:00000000000000000000000010180438 +0328:00000000000000000000000000080806 +0329:00000000000000000000000000101010 +032A:00000000000000000000000000007E42 +032B:00000000000000000000000000494936 +032C:00000000000000000000000000422418 +032D:00000000000000000000000000182442 +032E:0000000000000000000000000042423C +032F:000000000000000000000000003C4242 +0330:0000000000000000000000000000324C +0331:0000000000000000000000000000007E +0332:000000000000000000000000000000FF +0333:00000000000000000000000000FF00FF +0334:0000000000000000324C000000000000 +0335:00000000000000003C00000000000000 +0336:0000000000000000FF00000000000000 +0337:00000000000004081020400000000000 +0338:00000202040408081010202040400000 +0339:00000000000000000000000018040418 +033A:0000000000000000000000000000427E +033B:000000000000000000000000003C243C +033C:000000000000000000000000006C9210 +033D:66186600000000000000000000000000 +033E:08101008100000000000000000000000 +033F:FF00FF00000000000000000000000000 +0340:00402010000000000000000000000000 +0341:00020408000000000000000000000000 +0342:00344800000000000000000000000000 +0343:00180810000000000000000000000000 +0344:10105444000000000000000000000000 +0345:0000000000000000000000001010100C +0346:007E4200000000000000000000000000 +0347:000000000000000000000000007E007E +0348:00000000000000000000000000002424 +0349:00000000000000000000000000001808 +034A:083A5C10000000000000000000000000 +034B:04718E20000000000000000000000000 +034C:324C324C000000000000000000000000 +034D:00000000000000000000000000227F22 +034E:00000000000000000000000000081C08 +034F:AAAA000180000001B9C24203C2E2422BB9C40001824000018420000182405555 +0350:08040204080000000000000000000000 +0351:18202018000000000000000000000000 +0352:3C425A18000000000000000000000000 +0353:00000000000000000000000000241824 +0354:00000000000000000000000810201008 +0355:00000000000000000000001008040810 +0356:00000000000000000000008040244A91 +0357:18040418000000000000000000000000 +0358:00030300000000000000000000000000 +0359:00000000000000000000000054387C38 +035A:000000000000000000000000006C926C +035B:08103E04080000000000000000000000 +035C:00000000000000000000000000000000000000000000000000004002300C0FF0 +035D:00004002300C0FF0000000000000000000000000000000000000000000000000 +035E:000000001FF80000000000000000000000000000000000000000000000000000 +035F:0000000000000000000000000000000000000000000000000000000000001FF8 +0360:00001E0221844078000000000000000000000000000000000000000000000000 +0361:00000FF0300C4002000000000000000000000000000000000000000000000000 +0362:000000000000000000000000000000000000000000000008000C7FFE000C0008 +0363:3C44444C340000000000000000000000 +0364:384478403C0000000000000000000000 +0365:10003010380000000000000000000000 +0366:38444444380000000000000000000000 +0367:444444443C0000000000000000000000 +0368:1C2020201C0000000000000000000000 +0369:04043C243C0000000000000000000000 +036A:20203824240000000000000000000000 +036B:0000EC92920000000000000000000000 +036C:00382420200000000000000000000000 +036D:20782020180000000000000000000000 +036E:00444428100000000000000000000000 +036F:44281028440000000000000000000000 +0370:00000000404040407C40404040400000 +0371:0000000000002050501E101010100000 +0372:00000000FE9292921010101010100000 +0373:000000007C5454541010101010100000 +0374:000000000C1810200000000000000000 +0375:00000000000000000000000004081830 +0376:000000004246464A4A52526262420000 +0377:000000000000889898A8A8CACA840000 +0378:00007FFE738E6DF66DC66DF6738E7FFE7FFE61CE7DB67BCE77B677CE7FFE0000 +0379:00007FFE738E6DF66DC66DF6738E7FFE7FFE61CE7DB67BC677F677CE7FFE0000 +037A:00000000000000000000000020202018 +037B:0000000000003C4202020202423C0000 +037C:0000000000003C4240585840423C0000 +037D:0000000000003C42021A1A02423C0000 +037E:00000000000018180000001808081000 +037F:000000001F0404040404044444380000 +0380:00007FFE738E6DF66DC66DF6738E7FFE7FFE73CE6DB673B66DB673CE7FFE0000 +0381:00007FFE738E6DF66DC66DF6738E7FFE7FFE73EE6DCE73EE6DEE73C67FFE0000 +0382:00007FFE738E6DF66DC66DF6738E7FFE7FFE73866DF673866DBE73867FFE0000 +0383:00007FFE738E6DF66DC66DF6738E7FFE7FFE738E6DF673C66DF6738E7FFE0000 +0384:00040810000000000000000000000000 +0385:04085444000000000000000000000000 +0386:1020400018242442427E424242420000 +0387:00000000000000001818000000000000 +0388:102040007E4040407C404040407E0000 +0389:10204000424242427E42424242420000 +038A:102040003E08080808080808083E0000 +038B:00007FFE738E6DF66DC66DF6738E7FFE7FFE738E6DB6738E6DB6738E7FFE0000 +038C:102040003C42424242424242423C0000 +038D:00007FFE738E6DF66DC66DF6738E7FFE7FFE738E6DB673B66DB6738E7FFE0000 +038E:10204000414122221408080808080000 +038F:102040003E4141414141412214147700 +0390:040810444400301010101010100C0000 +0391:0000000018242442427E424242420000 +0392:000000007C4242427C424242427C0000 +0393:000000007E4240404040404040400000 +0394:000000000808141422222241417F0000 +0395:000000007E4040407C404040407E0000 +0396:000000007E02020408102040407E0000 +0397:00000000424242427E42424242420000 +0398:000000003C4242425A5A4242423C0000 +0399:000000003E08080808080808083E0000 +039A:00000000424448506060504844420000 +039B:00000000080814142222224141410000 +039C:00000000424266665A5A424242420000 +039D:0000000042626252524A4A4646420000 +039E:000000007E0000003C000000007E0000 +039F:000000003C42424242424242423C0000 +03A0:000000007F2222222222222222220000 +03A1:000000007C4242427C40404040400000 +03A2:00007FFE738E6DF66DC66DF6738E7FFE7FFE61866DF661866DBE6D867FFE0000 +03A3:000000007E40201008081020407E0000 +03A4:000000007F0808080808080808080000 +03A5:00000000414122221408080808080000 +03A6:000000007F083E494949493E087F0000 +03A7:00000000424224241818242442420000 +03A8:0000000049494949493E080808080000 +03A9:000000003E4141414141221414770000 +03AA:242400003E08080808080808083E0000 +03AB:24240000414122221408080808080000 +03AC:000408100000324A444444444A320000 +03AD:0004081000003E40403C4040403E0000 +03AE:0004081000005C624242424242420202 +03AF:000408100000301010101010100C0000 +03B0:040810444400424242424242423C0000 +03B1:000000000000324A444444444A320000 +03B2:00000000384444447C424242625C4040 +03B3:00000000000031490A04080810100000 +03B4:000000001C20202018244242423C0000 +03B5:0000000000003C42403C4040423C0000 +03B6:0000000020201C0810202020201C021C +03B7:0000000000005C624242424242420202 +03B8:00000000182424427E42422424180000 +03B9:000000000000301010101010100C0000 +03BA:00000000000022242830302824220000 +03BB:00000000202010100818242442420000 +03BC:0000000000004242424266665A424040 +03BD:00000000000042424244444850600000 +03BE:0000000040403C40403C40403C02023C +03BF:0000000000003C4242424242423C0000 +03C0:0000000000007E242424242424240000 +03C1:0000000000003C4242424242625C4040 +03C2:0000000000001E20404040201C02021C +03C3:0000000000003F484444444444380000 +03C4:0000000000007E1010101010100C0000 +03C5:000000000000424242424242423C0000 +03C6:000000000000264949494949493E0808 +03C7:0000000000C121221214182848448483 +03C8:000000000000494949494949493E0808 +03C9:00000000000022414149494949360000 +03CA:000024240000301010101010100C0000 +03CB:000024240000424242424242423C0000 +03CC:0004081000003C4242424242423C0000 +03CD:000408100000424242424242423C0000 +03CE:00040810000022414149494949360000 +03CF:00000000424448506060504844420408 +03D0:000000001C2242447844424244380000 +03D1:000000000C1212120F226222221C0000 +03D2:000000003655141408080808081C0000 +03D3:102040003655141408080808081C0000 +03D4:003636003655141408080808081C0000 +03D5:0000000008083E4949494949493E0808 +03D6:0000000000007F224141494949360000 +03D7:00000000000082442C2C34342241011E +03D8:000000003C42424242424242423C183C +03D9:0000000000003C4242424242423C1818 +03DA:000000003844404040404038081C0000 +03DB:000000000000003E4040201C021C0000 +03DC:000000007E4240407840404040400000 +03DD:000000000000003C2220203820202020 +03DE:0000000060202020203E040408080000 +03DF:000000000000201010223C4408080400 +03E0:000000001C22060A12060A12020C0000 +03E1:00000000000000601018284C14240408 +03E2:0000000044929292929292926E027C80 +03E3:0000000000004492929292926E027C80 +03E4:0000000032424242463A020202020000 +03E5:000000000000122222221E0202020000 +03E6:000000004040405C624141410101621C +03E7:0000000000083C5252220202324C0000 +03E8:000000003C42420204081020423C0000 +03E9:0000000000003C4242040830423C0000 +03EA:00000000C3A5241818242442427E8100 +03EB:000000000000245A18181824427E0000 +03EC:000000023C40405C62424242423C0000 +03ED:0000000000023C405C624242423C0000 +03EE:000000001010FE921010101010101000 +03EF:0000000000001010FE92101010101000 +03F0:00000000000082442C2C343422410000 +03F1:0000000000003C4242427C40403C0200 +03F2:0000000000003C4240404040423C0000 +03F3:0000000404000C040404040404044830 +03F4:000000003C4242427E424242423C0000 +03F5:0000000000001C2040784040201C0000 +03F6:0000000000007008043C040408700000 +03F7:00000000E040784442424242447840E0 +03F8:0000000040405C6242424242625C4040 +03F9:000000003C42424040404042423C0000 +03FA:00000000424266665A5A424242420000 +03FB:0000000000446C6C5454444445424040 +03FC:0000000000003C42424242625C40F840 +03FD:000000003C42420202020242423C0000 +03FE:000000003C42424058584042423C0000 +03FF:000000003C4242021A1A0242423C0000 +0400:00300C007E4040407C404040407E0000 +0401:242400007E4040407C404040407E0000 +0402:000000007E1010101E11111111160000 +0403:0C3000007E4040404040404040400000 +0404:000000001C2240407C404040221C0000 +0405:000000003C424240300C0242423C0000 +0406:000000003E08080808080808083E0000 +0407:242400003E08080808080808083E0000 +0408:000000000E0404040404044444380000 +0409:00000000784848484E494949498E0000 +040A:00000000484848487E494949494E0000 +040B:000000007E1010101E11111111110000 +040C:0C300000464848505060504844420000 +040D:00300C004246464A4A52526262420000 +040E:42423C00414122221414080810300000 +040F:000000004141414141414141417F0808 +0410:0000000018242442427E424242420000 +0411:000000007C4040407C424242427C0000 +0412:000000007C4242427C424242427C0000 +0413:000000007E4040404040404040400000 +0414:000000000E1212122222224242FF8181 +0415:000000007E4040407C404040407E0000 +0416:0000000049492A2A1C1C2A2A49490000 +0417:000000003C4202023C040202423C0000 +0418:000000004246464A4A52526262420000 +0419:002418004246464A4A52526262420000 +041A:00000000464848505060504844420000 +041B:000000001E1212121212122222420000 +041C:00000000424266665A5A424242420000 +041D:00000000424242427E42424242420000 +041E:000000003C42424242424242423C0000 +041F:000000007E4242424242424242420000 +0420:000000007C4242427C40404040400000 +0421:000000003C42424040404042423C0000 +0422:000000007F0808080808080808080000 +0423:00000000414122221414080810300000 +0424:000000083E49494949493E0808080000 +0425:00000000424224241818242442420000 +0426:000000004242424242424242427F0101 +0427:000000004242424242463A0202020000 +0428:000000004949494949494949497F0000 +0429:00000000929292929292929292FF0101 +042A:00000000701010101E111111111E0000 +042B:0000000042424242724A4A4A4A720000 +042C:00000000404040407C424242427C0000 +042D:00000000384402023E02020244380000 +042E:000000004C52525272525252524C0000 +042F:000000003E4242423E12222242420000 +0430:0000000000003C42023E4242463A0000 +0431:0000021C20407C4242424242423C0000 +0432:0000000000007C42427C4242427C0000 +0433:0000000000007E404040404040400000 +0434:0000000000001E1222224242427F4100 +0435:0000000000003C42427E4040423C0000 +0436:00000000000049492A1C1C2A49490000 +0437:0000000000003C42023C0402423C0000 +0438:00000000000046464A4A525262620000 +0439:00002418000046464A4A525262620000 +043A:00000000000046485060504844420000 +043B:0000000000001E121212122222420000 +043C:0000000000004266665A5A4242420000 +043D:0000000000004242427E424242420000 +043E:0000000000003C4242424242423C0000 +043F:0000000000007E424242424242420000 +0440:0000000000005C6242424242625C4040 +0441:0000000000003C4240404040423C0000 +0442:0000000000007F080808080808080000 +0443:00000000000042422424181810102060 +0444:0000000808083E4949494949493E0808 +0445:00000000000042422418182442420000 +0446:000000000000424242424242427F0101 +0447:00000000000042424242463A02020000 +0448:000000000000494949494949497F0000 +0449:00000000000092929292929292FF0101 +044A:0000000000007010101E1111111E0000 +044B:000000000000424242724A4A4A720000 +044C:0000000000004040407C4242427C0000 +044D:0000000000003844023E020244380000 +044E:0000000000004C5252725252524C0000 +044F:0000000000003E4242423E1222420000 +0450:0000300C00003C42427E4040423C0000 +0451:0000242400003C42427E4040423C0000 +0452:00000040F0405C62424242424242020C +0453:00000C3000007E404040404040400000 +0454:0000000000001C22407C4040221C0000 +0455:0000000000003C4240300C02423C0000 +0456:000000080800180808080808083E0000 +0457:000000242400180808080808083E0000 +0458:0000000404000C040404040404044830 +0459:0000000000007848484E4949498E0000 +045A:0000000000004848487E4949494E0000 +045B:00000040F0405C624242424242420000 +045C:00000C30000046485060504844420000 +045D:0000300C000046464A4A525262620000 +045E:0042423C000042422424181810102060 +045F:000000000000222222222222223E0808 +0460:0000000049494949494949495A240000 +0461:0000000000000049494949495A240000 +0462:00000000107C10101E111111111E0000 +0463:0000000020207820203C2222223C0000 +0464:00000000464950507E50505049460000 +0465:0000000000004649507E505049460000 +0466:000000000808141422362A4949490000 +0467:00000000000008141422364949490000 +0468:000000004848545452766A4949490000 +0469:00000000000048545452764949490000 +046A:000000003E222214081C2A4949490000 +046B:0000000000003E2214083E4949490000 +046C:000000005F51514A744E555555550000 +046D:0000000000005F514A744E5555550000 +046E:000024183C4202023C040202023C4040 +046F:0000002418003C42023C0402023C4040 +0470:0000000049494949493E080808080000 +0471:000000000000000049494949493E0808 +0472:000000003C4242427E424242423C0000 +0473:0000000000003C42427E4242423C0000 +0474:00000000434444442828281010100000 +0475:00000000000046484828282810100000 +0476:66110000434444442828281010100000 +0477:00006611000046484828282810100000 +0478:00000000205059595955565454240808 +0479:00000000000029595955565454240808 +047A:000000083E49414141414141493E0800 +047B:0000000000083E4941414141493E0800 +047C:3C431804080036414149494949360000 +047D:0000003C431804080036414949360000 +047E:007F080049494949494949495A240000 +047F:000000007F080049494949495A240000 +0480:000000003C424240404040403C040404 +0481:0000000000003C42424040403C040404 +0482:000000000000120C442A111824000000 +0483:00087840000000000000000000000000 +0484:02050910000000000000000000000000 +0485:00384030000000000000000000000000 +0486:00380418000000000000000000000000 +0487:00304C83000000000000000000000000 +0488:000000000100028010102828000000004008A014000000000000101029280280 +0489:000000000080108409880C30000000000008700E1000000000000CD808881084 +048A:002418004246464A4A52526262430204 +048B:00002418000046464A4A525262630204 +048C:0000000020702020203C2222263C0000 +048D:000000000000002070203C22223C0000 +048E:000000007C424A447A40404040400000 +048F:0000000000005C624242424A645A4040 +0490:000002027E4040404040404040400000 +0491:0000000002027E404040404040400000 +0492:000000001F101010107C101010100000 +0493:0000000000001F1010107C1010100000 +0494:000000007E404040407C424242420C00 +0495:0000000000007E4040407C4242420C00 +0496:0000000049492A2A1C1C2A2A49490101 +0497:00000000000049492A1C1C2A49490101 +0498:000000003C4202023C040202423C0830 +0499:0000000000003C42023C0402423C0830 +049A:00000000464848505060504844420202 +049B:00000000000046485060504844420202 +049C:00000000434454547854545442410000 +049D:00000000000043545478545442410000 +049E:00000000237424282830282422210000 +049F:00000000000023742830282422210000 +04A0:00000000E32424282830282422210000 +04A1:000000000000E3242830282422210000 +04A2:00000000424242427E42424242430101 +04A3:0000000000004242427E424242430101 +04A4:00000000474444447C44444444440000 +04A5:0000000000004744447C444444440000 +04A6:0000000078484848484E494949490106 +04A7:000000000000784848484E4949490106 +04A8:000000204C525252525252522C180600 +04A9:000000000000204C525252522C180600 +04AA:000000003C42424040404042423C0830 +04AB:0000000000003C4242404042423C0830 +04AC:000000007F08080808080808080C0404 +04AD:0000000000007F0808080808080C0404 +04AE:00000000414122221408080808080000 +04AF:00000000000022222214140808080808 +04B0:00000000414122221408083E08080000 +04B1:0000000000002222221414083E080808 +04B2:00000000424224241818242442430101 +04B3:00000000000042422418182442430101 +04B4:00000000FA22222222222222223F0101 +04B5:000000000000FA2222222222223F0101 +04B6:000000004242424242463A0202030101 +04B7:00000000000042424242463A02030101 +04B8:000000004242424252563A1212020000 +04B9:00000000000042424252563A12020000 +04BA:000000004040405C6242424242420000 +04BB:00000000000040405C62424242420000 +04BC:000000004C5252523E101012120C0000 +04BD:0000000000004C52523E1010120C0000 +04BE:000000004C5252523E101012120C0808 +04BF:0000000000004C52523E1010120C0808 +04C0:000000003E08080808080808083E0000 +04C1:41413E0049492A2A1C1C2A2A49490000 +04C2:0022221C000049492A1C1C2A49490000 +04C3:0000000046484850607C42424242020C +04C4:000000000000464850607C424242020C +04C5:000000001E1212121212122222430204 +04C6:0000000000001E121212122222430204 +04C7:00000000424242427E4242424242020C +04C8:0000000000004242427E42424242020C +04C9:00000000424242427E42424242430204 +04CA:0000000000004242427E424242430204 +04CB:000000004242424242463A0202060404 +04CC:00000000000042424242463A02060404 +04CD:00000000424266665A5A424242430204 +04CE:0000000000004266665A5A4242430204 +04CF:000000001C08080808080808081C0000 +04D0:42423C0018242442427E424242420000 +04D1:0042423C00003C42023E4242463A0000 +04D2:2424000018242442427E424242420000 +04D3:0000242400003C42023E4242463A0000 +04D4:000000001F2848487F484848484F0000 +04D5:0000000000003E49093F4848493E0000 +04D6:42423C007E4040407C404040407E0000 +04D7:000042423C003C42427E4040423C0000 +04D8:0000000018244202027E424224180000 +04D9:0000000000003C4202027E42423C0000 +04DA:2424000018244202027E424224180000 +04DB:0000242400003C4202027E42423C0000 +04DC:2424000049492A2A1C1C2A2A49490000 +04DD:00002424000049492A1C1C2A49490000 +04DE:242400003C4202023C040202423C0000 +04DF:0000242400003C42023C0402423C0000 +04E0:000000007E0408101C020202463C0000 +04E1:0000000000003E0408101C020202423C +04E2:003C00004246464A4A52526262420000 +04E3:0000003C000046464A4A525262620000 +04E4:242400004246464A4A52526262420000 +04E5:00002424000046464A4A525262620000 +04E6:242400003C42424242424242423C0000 +04E7:0000242400003C4242424242423C0000 +04E8:000000003C4242427E424242423C0000 +04E9:0000000000003C42427E4242423C0000 +04EA:242400003C4242427E424242423C0000 +04EB:0000242400003C42427E4242423C0000 +04EC:000024003C4202023E020202423C0000 +04ED:0000000024003C42021E0202423C0000 +04EE:003E0000414122221414080810300000 +04EF:0000003C000042422424181810102060 +04F0:24240000414122221414080810300000 +04F1:00002424000042422424181810102060 +04F2:33440000414122221414080810300000 +04F3:00003344000042422424181810102060 +04F4:242400004242424242463A0202020000 +04F5:00002424000042424242463A02020000 +04F6:000000007E4040404040404040602020 +04F7:0000000000007E404040404040602020 +04F8:2424000042424242724A4A4A4A720000 +04F9:000024240000424242724A4A4A720000 +04FA:000000001F101010107C101010180818 +04FB:0000000000001F10107C101010180818 +04FC:00000000424224241818242442420204 +04FD:00000000000042422418182442420204 +04FE:0000000042422424187E242442420000 +04FF:000000000000424224187E2442420000 +0500:0000000202023E4242424242463A0000 +0501:000000020202023A46424242463A0000 +0502:0000000404043C44444545454D360000 +0503:00000004040404344C4444454D360000 +0504:00000000384444041805050505020000 +0505:00000000000038444404180505020000 +0506:00000000384444041804040404030101 +0507:00000000000038444404180404030101 +0508:000000003C2424242425254545820000 +0509:0000000000003C242424244545820000 +050A:00000000444444447C45454545460000 +050B:0000000000004444447C444545460000 +050C:000000003C424240404E424244380000 +050D:0000000000003C4240404E42423C0000 +050E:000000007F08080808090909090E0000 +050F:0000000000007F0808080909090E0000 +0510:000000003C4240403C204040423C0000 +0511:0000000000003C42403C2040423C0000 +0512:000000001E1212121212122222420A0C +0513:0000000000001E121212122222420A0C +0514:0000000071514A4A44444A4A51910000 +0515:00000000000071514A44444A51910000 +0516:00000000E192949890F0888482810000 +0517:00000000000001E294989894E2818080 +0518:000000007F8888887F284848888F0000 +0519:0000000000007E89897F282849460000 +051A:000000003C4242424242425A663C0300 +051B:0000000000003A4642424242463A0202 +051C:00000000424242425A5A666642420000 +051D:00000000000041494949494949360000 +051E:000000004A444A506060504844420000 +051F:00000000000054485460504844420000 +0520:00000000705050505E51519191910502 +0521:0000000000007050505E515191910502 +0522:0000000090909090FE91919191910502 +0523:000000000000909090FE919191910502 +0524:000000007C4444444444444444460202 +0525:0000000000007C444444444444460202 +0526:000000004040405C6242424242430101 +0527:00000000000040405C62424242430101 +0528:00000000111111111F11111111115020 +0529:0000000000001111111F111111115020 +052A:00000000000000000C4614481448145027E02460245044484444FE4282008200 +052B:0000000000000000000000001C461448245027E04450444844447E4242000000 +052C:000000004C4C5454547C2424447E4242 +052D:0000000000004C5454547C2424247E42 +052E:000000001E1212121212122222430101 +052F:0000000000001E121212122222430101 +0530:00007FFE73866DBE6D866DF673867FFE7FFE63CE7DB671B67DB663CE7FFE0000 +0531:00000000444444444444444745380000 +0532:000000003C4242407C42404040400000 +0533:0000000038444444443E050404040000 +0534:00000000384444040406050404040000 +0535:0000000040407C4240404042423C0000 +0536:000000001C222222221C0408107E0200 +0537:000000004040407C42404040407C0200 +0538:000000003C42424040404040407C0200 +0539:000000003844444F5454484040400000 +053A:00000000040404043F44444444380000 +053B:0000000040405C624240404040400000 +053C:000000004040404040404040407E0200 +053D:00000000404040794949494949460000 +053E:000000007E1824424242424224180000 +053F:00000000404042424242423E02020000 +0540:00000000081010081020406018060000 +0541:000000001C222222221C245848360000 +0542:00000000384444040404040404070100 +0543:000000000464182424424242427E0000 +0544:00000000474544444444444444380000 +0545:000000001C2202427C420202221C0000 +0546:00000000403010101010101011110E00 +0547:000000403C20404042424242423C0000 +0548:000000003C4242424242424242420000 +0549:000000001C222222221C040870180600 +054A:000000003E4949494909090101010000 +054B:000000001C2222120A0C0C08107E0200 +054C:00000000384444474544444444440000 +054D:000000004242424242424242423C0000 +054E:00000000040444444444443C04070100 +054F:000000003C424240300C0242423C0000 +0550:000000003C4242404040404040400000 +0551:000000003C4242423C420202423C0000 +0552:00000000404058644444434040400000 +0553:00000000103854545454545438100000 +0554:000000000C1212121C507C1410100000 +0555:000000003C42424242424242423C0000 +0556:00000000384848380E090909493E0000 +0557:00007FFE73866DBE6D866DF673867FFE7FFE61866FF661EE7DDE61DE7FFE0000 +0558:00007FFE73866DBE6D866DF673867FFE7FFE61CE6FB661CE7DB661CE7FFE0000 +0559:10202010000000000000000000000000 +055A:20101020000000000000000000000000 +055B:08183000000000000000000000000000 +055C:0C300000000000000000000000000000 +055D:20100800000000000000000000000000 +055E:38445418000000000000000000000000 +055F:3050403C000000000000000000000000 +0560:00000000000076494949494949490000 +0561:00000000000049494949494949370000 +0562:000000000000001C224242407E404040 +0563:0000000000003844444444443F040404 +0564:00000000000058644444444444470404 +0565:00000000004040407E404242221C0000 +0566:000000000000344C444444443C040407 +0567:0000000040407C404040404040380400 +0568:0000000000005C62424242424242407E +0569:0000000000005864444F545448404040 +056A:000000000404043F4444444444380000 +056B:0000000040405C624242424242424040 +056C:0000000000004040404040404040407C +056D:00000000404040794949494946404040 +056E:000000007008043F4444444444380000 +056F:000000002020222222222222221E0202 +0570:000000004040405C6242424242420000 +0571:000000000810083E42424242423E0000 +0572:00000000000058644444444444440407 +0573:000000000E11107F11111111130D0000 +0574:0000000002050444444444444C340000 +0575:0000000000000C040404040404044830 +0576:000000003C42404242424242463A0000 +0577:000000003844040808101020203F0000 +0578:0000000000005C624242424242420000 +0579:000000001020100808101020203F0000 +057A:00000000000049494949494949370101 +057B:000000003844442414181820203F0000 +057C:00000000000058644444444444470000 +057D:000000000000424242424242463A0000 +057E:0000000004040444444444444C340407 +057F:0000000000004A4D4949494959290000 +0580:0000000000005C624242424242424040 +0581:0000000000003A46424242463A02423C +0582:000000000000180808080808080E0000 +0583:0000000008084A4D4949494959290808 +0584:0000000000000C1212121C103C101018 +0585:0000000000003C4242424242423C0000 +0586:00000000384848380E090909493E0808 +0587:000000004040404444444444443B0000 +0588:0000000000000C040404041E04044830 +0589:00000000000018180000001818000000 +058A:0000000000000000000000623C000000 +058B:00007FFE73866DBE6D866DF673867FFE7FFE738E6DB6738E6DB6738E7FFE0000 +058C:00007FFE73866DBE6D866DF673867FFE7FFE73C66DBE73BE6DBE73C67FFE0000 +058D:0000000000000DC012301248298827B027C81BC8232824901890076000000000 +058E:00000000000007601890249023281BC827C827B02988124812300DC000000000 +058F:00000000384444041F041F0404040000 +0590:00007FFE73866DBE6D866DF673867FFE7FFE73CE6DB671B67DB673CE7FFE0000 +0591:00000000000000000000000000207088 +0592:00180066000000000000000000000000 +0593:0C300C300C3000000000000000000000 +0594:00180018000000000000000000000000 +0595:002C202C000000000000000000000000 +0596:00000000000000000000000000808060 +0597:081C3E1C080000000000000000000000 +0598:0024524A240000000000000000000000 +0599:00C02020000000000000000000000000 +059A:00000000000000000000000000010201 +059B:000000000000000000000000D0D010E0 +059C:000C1010000000000000000000000000 +059D:00030404000000000000000000000000 +059E:00364848000000000000000000000000 +059F:0042A542240000000000000000000000 +05A0:00020502040000000000000000000000 +05A1:00506080000000000000000000000000 +05A2:00000000000000000000000000887020 +05A3:000000000000000000000000002020E0 +05A4:00000000000000000000000000408040 +05A5:000000000000000000000000002020C0 +05A6:000000000000000000000000002424D8 +05A7:00000000000000000000006080601060 +05A8:00C02020000000000000000000000000 +05A9:0040A040200000000000000000000000 +05AA:00000000000000000000000000009060 +05AB:00102010000000000000000000000000 +05AC:0004041C000000000000000000000000 +05AD:00000000000000000000000000040403 +05AE:0048A8A8900000000000000000000000 +05AF:00182424180000000000000000000000 +05B0:00000000000000000000000000180018 +05B1:000000000000000000000000002A0012 +05B2:000000000000000000000000003A0002 +05B3:000000000000000000000000003A1012 +05B4:00000000000000000000000000001818 +05B5:00000000000000000000000000006666 +05B6:00000000000000000000000000660018 +05B7:00000000000000000000000000003C00 +05B8:000000000000000000000000003E0808 +05B9:00003030000000000000000000000000 +05BA:00006060000000000000000000000000 +05BB:00000000000000000000000000200802 +05BC:00000000000000001800000000000000 +05BD:00000000000000000000000000080808 +05BE:0000007E000000000000000000000000 +05BF:0000003C000000000000000000000000 +05C0:00000000000808080808080808080000 +05C1:00000606000000000000000000000000 +05C2:00006060000000000000000000000000 +05C3:000000000000081C080000081C080000 +05C4:18180000000000000000000000000000 +05C5:00000000000000000000000000001818 +05C6:000000000038202020202020203C0000 +05C7:000000000000000000000000003E0808 +05C8:00007FFE73866DBE6D866DF673867FFE7FFE71CE6FB66FCE6FB671CE7FFE0000 +05C9:00007FFE73866DBE6D866DF673867FFE7FFE71CE6FB66FC66FF671CE7FFE0000 +05CA:00007FFE73866DBE6D866DF673867FFE7FFE71866FB66F866FB671B67FFE0000 +05CB:00007FFE73866DBE6D866DF673867FFE7FFE718E6FB66F8E6FB6718E7FFE0000 +05CC:00007FFE73866DBE6D866DF673867FFE7FFE71C66FBE6FBE6FBE71C67FFE0000 +05CD:00007FFE73866DBE6D866DF673867FFE7FFE718E6FB66FB66FB6718E7FFE0000 +05CE:00007FFE73866DBE6D866DF673867FFE7FFE71866FBE6F8E6FBE71867FFE0000 +05CF:00007FFE73866DBE6D866DF673867FFE7FFE71866FBE6F8E6FBE71BE7FFE0000 +05D0:0000000000424222122C484442420000 +05D1:00000000007C040404040404047F0000 +05D2:000000000030080808040C1422420000 +05D3:00000000007E04040404040404040000 +05D4:00000000007E02022222222222220000 +05D5:00000000003808080808080808080000 +05D6:0000000000300C0A0808080808080000 +05D7:00000000007E22222222222222220000 +05D8:0000000000464A4242424242427E0000 +05D9:00000000003808080800000000000000 +05DA:00000000007E02020202020202020202 +05DB:00000000007E020202020202027C0000 +05DC:00000020203E02020202040408300000 +05DD:0000000000FE222222222222223E0000 +05DE:00000000004E31214141414141470000 +05DF:00000000003808080808080808080808 +05E0:00000000001C040404040404043C0000 +05E1:00000000007E42424242424244780000 +05E2:00000000001212121212121212FE0000 +05E3:00000000007E42424272020202020202 +05E4:00000000007E424242720202027E0000 +05E5:00000000002222242830202020202020 +05E6:000000000042422418080402027E0000 +05E7:00000000007E22222424282020202020 +05E8:00000000007E02020202020202020000 +05E9:000000000049494949494949497F0000 +05EA:00000000003E22222222222222620000 +05EB:00007FFE73866DBE6D866DF673867FFE7FFE618E6FB6638E6FB6618E7FFE0000 +05EC:00007FFE73866DBE6D866DF673867FFE7FFE61C66FBE63BE6FBE61C67FFE0000 +05ED:00007FFE73866DBE6D866DF673867FFE7FFE618E6FB663B66FB6618E7FFE0000 +05EE:00007FFE73866DBE6D866DF673867FFE7FFE61866FBE638E6FBE61867FFE0000 +05EF:00000000003808087711111100000000 +05F0:00000000007711111111111111110000 +05F1:00000000007711111101010101010000 +05F2:00000000007711111100000000000000 +05F3:00000204080000000000000000000000 +05F4:00001224480000000000000000000000 +05F5:00007FFE73866DBE6D866DF673867FFE7FFE61866FBE63866FF66F867FFE0000 +05F6:00007FFE73866DBE6D866DF673867FFE7FFE61CE6FBE638E6FB66FCE7FFE0000 +05F7:00007FFE73866DBE6D866DF673867FFE7FFE61866FF663EE6FDE6FDE7FFE0000 +05F8:00007FFE73866DBE6D866DF673867FFE7FFE61CE6FB663CE6FB66FCE7FFE0000 +05F9:00007FFE73866DBE6D866DF673867FFE7FFE61CE6FB663C66FF66FCE7FFE0000 +05FA:00007FFE73866DBE6D866DF673867FFE7FFE61866FB663866FB66FB67FFE0000 +05FB:00007FFE73866DBE6D866DF673867FFE7FFE618E6FB6638E6FB66F8E7FFE0000 +05FC:00007FFE73866DBE6D866DF673867FFE7FFE61C66FBE63BE6FBE6FC67FFE0000 +05FD:00007FFE73866DBE6D866DF673867FFE7FFE618E6FB663B66FB66F8E7FFE0000 +05FE:00007FFE73866DBE6D866DF673867FFE7FFE61866FBE638E6FBE6F867FFE0000 +05FF:00007FFE73866DBE6D866DF673867FFE7FFE61866FBE638E6FBE6FBE7FFE0000 +0600:5555800000018000000180000001800000018004000980083FFD80000001AAAA +0601:55558000000180000001800000018000000180042A0DAA0C35F580000001AAAA +0602:5555800000018000000180000001800000018E000E1987E0000180000001AAAA +0603:555580000001800000018000001980240045814401499EF0000180000001AAAA +0604:55558000000180000001800000018000000180000195827C0201BF000001AAAA +0605:55558000000188041619A1E0000180000001800000018000000180000001AAAA +0606:000000A870A810D0088008800480040002700240014001800180010001000000 +0607:00200040708010A0084008900460040002700240014001800180010001000000 +0608:000000000000000000640E9832B004500410082007C000000000000000000000 +0609:00000004042808101020204450000000 +060A:00000004042808101020214450000000 +060B:000000000600060000C0012000E0002001C01E10000800080000000000000000 +060C:00000000000000081018180000000000 +060D:00000000000000000C18204000000000 +060E:0000000000000000000000000000000000000E00110011060FF8000000000000 +060F:0000000000000600080008000600080013001480188009001600200000000000 +0610:00060939160000000000000000000000 +0611:0000003000400278038004000800000000000000000000000000000000000000 +0612:00001F880208041008E008000000000000000000000000000000000000000000 +0613:0000060809083910166000000000000000000000000000000000000000000000 +0614:0000000000081FC8002800100000000000000000000000000000000000000000 +0615:0000040005C006200FC000000000000000000000000000000000000000000000 +0616:0500050005000D0010000FE00000000000000000000000000000000000000000 +0617:0000008000000080008003000000000000000000000000000000000000000000 +0618:00001800000000000000000000000000 +0619:181C1020000000000000000000000000 +061A:00000000000000000000000000001800 +061B:00000000000000081018001800000000 +061C:AAAA000180000001B2224A37FA2A4A23CBA20001800000018000000180005555 +061D:00007FFE73CE6DBE6D8E6DB673CE7FFE7FFE7B8E73B67BB67BB6718E7FFE0000 +061E:0000000000000000000000000000000000000000000000800000014000000000 +061F:0000003E414020100808000800000000 +0620:000000000000000C5248443810281000 +0621:000000000000001C203C102000000000 +0622:00013E40080808080808080000000000 +0623:18201820080808080808080000000000 +0624:00000C100C10000C12121E0204483000 +0625:0000000008080808080808000C100C10 +0626:00000000182018200046484846423C00 +0627:00000008080808080808080000000000 +0628:000000000000000422423C0000080000 +0629:000000002400101824243C0000000000 +062A:000000001400000422423C0000000000 +062B:000010002800000422423C0000000000 +062C:00000000000000007E1020404840221C +062D:00000000000000007E1020404040221C +062E:00000000001000007E1020404040221C +062F:000000000000080402427C0000000000 +0630:000000002000080402427C0000000000 +0631:00000000000000000402020204483000 +0632:00000000001000000402020204483000 +0633:00000000000000000115155E48483000 +0634:00000008001200000115155E48483000 +0635:000000000000000006194E4848300000 +0636:000000000004000006194E4848300000 +0637:000000202020202C32227C0000000000 +0638:000000202420202C32227C0000000000 +0639:000000000000001824201C204040423C +063A:000000000800001824201C204040423C +063B:00005004081020403C827E0000000000 +063C:00000004081020403C827E0028001000 +063D:0000000010284400044A484442423C00 +063E:0000000000005000044A484442423C00 +063F:0000000000200050044A484442423C00 +0640:00000000000000000000FF0000000000 +0641:0000000800060A0642423C0000000000 +0642:000000002400001C120A264244380000 +0643:000000020A120A2242423C0000000000 +0644:000000020202020202224242443C0000 +0645:00000000000000001C061E2020202020 +0646:00000000001000000422424244380000 +0647:000000000000101824243C0000000000 +0648:000000000000000C12121E0204483000 +0649:0000000000000000044A484442423C00 +064A:0000000000000000044A4844423C0028 +064B:0C300C30000000000000000000000000 +064C:0C0C6428700000000000000000000000 +064D:0000000000000000000008300C300000 +064E:00000C30000000000000000000000000 +064F:0C0E0810200000000000000000000000 +0650:00000000000000000000000000000C30 +0651:00000004145860000000000000000000 +0652:18242418000000000000000000000000 +0653:00013E40000000000000000000000000 +0654:18201820000000000000000000000000 +0655:00000000000000000000000018201820 +0656:0000000000000000000000000000000000000000000000000000004000200020 +0657:04081070300000000000000000000000 +0658:24241800000000000000000000000000 +0659:0000003C000000000000000000000000 +065A:00442810100000000000000000000000 +065B:00101028440000000000000000000000 +065C:00000000000000000000000018180000 +065D:30701008040000000000000000000000 +065E:24081024000000000000000000000000 +065F:00000000000000000000000006082658 +0660:00000000000010381000000000000000 +0661:00000020201010080804040400000000 +0662:00000022241810080804040400000000 +0663:00000049523C20101008080800000000 +0664:00000004081020182040423C00000000 +0665:00000018242442424242241800000000 +0666:000000403C0404020202010100000000 +0667:00000041412222141408080800000000 +0668:00000008080814142222414100000000 +0669:0000001824444C340202010100000000 +066A:00000404484810102424404000000000 +066B:00000000000000000004040438000000 +066C:00000018180810000000000000000000 +066D:000000000008087F1C36220000000000 +066E:000000000000000422423C0000000000 +066F:000000000000001C120A264244380000 +0670:10101000000000000000000000000000 +0671:040A1E20080808080808080000000000 +0672:06082658000808080808080000000000 +0673:00000000080808080808080006082658 +0674:18201820000000000000000000000000 +0675:06080608202020202020200000000000 +0676:000003040304000C12121E0204483000 +0677:000033341324400C12121E0204483000 +0678:00000000030403040046484846423C00 +0679:000020203838000422423C0000000000 +067A:000010001000000422423C0000000000 +067B:000000000000000422423C0008000800 +067C:000000001400000422423C0814080000 +067D:000028001000000422423C0000000000 +067E:000000000000000422423C0014000800 +067F:000028002800000422423C0000000000 +0680:000000000000000422423C0014001400 +0681:00000018201820007E1020404040221C +0682:00000010001000007E1020404040221C +0683:00000000000000007E1020405440221C +0684:00000000000000007E1020484048221C +0685:00000010002400007E1020404040221C +0686:00000000000000007E2040544048221C +0687:00000000000000007E2040544054221C +0688:002020383800080402427C0000000000 +0689:000000000000080402427C0814080000 +068A:000000000000080402427C0008000000 +068B:002020383800080402427C0008000000 +068C:000000280000080402427C0000000000 +068D:000000000000080402427C0028000000 +068E:000010002800080402427C0000000000 +068F:000028001000080402427C0000000000 +0690:000028002800080402427C0000000000 +0691:000008080E0E00000402020204483000 +0692:00000000442810000402020204483000 +0693:000000000000000004020202044C3A04 +0694:00000000000000000402020204483200 +0695:00000000000000000804040408483502 +0696:00000000000000000402021204483200 +0697:00000000001200000402020204483000 +0698:00000008001400000402020204483000 +0699:00000012001200000402020204483000 +069A:000000000400000115155E484A300000 +069B:000000000000000115155E5055200200 +069C:000008001200000115155E5055200200 +069D:000000000000000006194E5055200000 +069E:000000080012000006194E4848300000 +069F:00000024202A202C32227C0000000000 +06A0:000010002400001824201C204040423C +06A1:0000000000060A0642423C0000000000 +06A2:0000000000060A0642423C0008000000 +06A3:0000040000060A0642423C0008000000 +06A4:0008001200060A0642423C0000000000 +06A5:0000000000060A0642423C0024001000 +06A6:000A000A00060A0642423C0000000000 +06A7:000000000400001C120A264244380000 +06A8:000010002400001C120A264244380000 +06A9:00000004081020403C827E0000000000 +06AA:0000000000000018006001800600080007FC40023FFC00000000000000000000 +06AB:000000040C1A24403C827E0000000000 +06AC:000800020A120A2242423C0000000000 +06AD:100028020A120A2242423C0000000000 +06AE:000000020A120A2242423C0014000800 +06AF:00081024481020403C827E0000000000 +06B0:000810244C1A24403C827E0000000000 +06B1:00500618620C30403C827E0000000000 +06B2:00081024481020403C827E0028000000 +06B3:00081024481020403C827E0010001000 +06B4:4000A618620C30403C827E0000000000 +06B5:00110A040002020202224242443C0000 +06B6:000200020202020202224242443C0000 +06B7:040009000202020202224242443C0000 +06B8:00000002020202020222423C00140008 +06B9:00000000000800000422424244380008 +06BA:00000000000000000422424244380000 +06BB:000010101C1C00000422424244380000 +06BC:000000000008000004224242443C0A04 +06BD:00000010002400000422424244380000 +06BE:000000000000102C2A1A244000000000 +06BF:00000000001000007E2040544048221C +06C0:001820182000101824243C0000000000 +06C1:000000000000000000102F4000000000 +06C2:000000001820182000102F4000000000 +06C3:000000000000280000102F4000000000 +06C4:000000000000000C12120E2252247800 +06C5:000000000000000C12121E021C483000 +06C6:000000221408000C12121E0204483000 +06C7:000018180810200C12121E0204483000 +06C8:000000080404000C12121E0204483000 +06C9:000000081422000C12121E0204483000 +06CA:000000001400000C12121E0204483000 +06CB:000008001200000C12121E0204483000 +06CC:0000000000000000044A484442423C00 +06CD:0000000000000000042A68A422221C00 +06CE:0000000044281000044A484442423C00 +06CF:000000000800000C12121E0204483000 +06D0:000000000000000C5248443800100010 +06D1:000000000000000C5248443800280010 +06D2:00000000000000000008141020407F00 +06D3:00000000003040304008141020407F00 +06D4:000000000000000000003C0000000000 +06D5:000000000000101824243C0000000000 +06D6:0208025C0FFC10001FC000000000000000000000000000000000000000000000 +06D7:024802200FE010001FC000000000000000000000000000000000000000000000 +06D8:0000004000A001E0060000000000000000000000000000000000000000000000 +06D9:0880048003000100030000000000000000000000000000000000000000000000 +06DA:1F8004000900042003C000000000000000000000000000000000000000000000 +06DB:4000A000000000000000000000000000 +06DC:0000012809F80900060000000000000000000000000000000000000000000000 +06DD:0000000001C006300BE80C181004100410040C180BE8063001C0000000000000 +06DE:0000008001401FFC1414180C11C432265225322611C4180C14141FFC01400080 +06DF:18242418000000000000000000000000 +06E0:18242424180000000000000000000000 +06E1:7E0C3000000000000000000000000000 +06E2:0180038002000200010000000000000000000000000000000000000000000000 +06E3:000000000000000000000000000000000000000000000000012809F809000600 +06E4:7C000000000000000000000000000000 +06E5:0000000000000000040A0E021C000000 +06E6:00000000000000001020407F00000000 +06E7:001020407F0000000000000000000000 +06E8:000000800420042003E000000000000000000000000000000000000000000000 +06E9:00000080014002A005500AA815542A2A15541554155415D4141417F430067FFF +06EA:0100028004400280010000000000000000000000000000000000000000000000 +06EB:0000000000000000000000000000000000000000000001000280044002800100 +06EC:0000018001800000000000000000000000000000000000000000000000000000 +06ED:0000000000000000000000000000000000000000000000000180010001000080 +06EE:000008142200080402427C0000000000 +06EF:00000000040A11000402020204483000 +06F0:00000000000010381000000000000000 +06F1:00000020201010080804040400000000 +06F2:00000022241810080804040400000000 +06F3:00000049523C20101008080800000000 +06F4:000000182460722C2010101000000000 +06F5:00000000080814142222495563000000 +06F6:000000001C2220201806186000000000 +06F7:00000041412222141408080800000000 +06F8:00000008080814142222414100000000 +06F9:0000001824444C340202010100000000 +06FA:000008001200000115155E484A300000 +06FB:000000000004000006194E484A300000 +06FC:000000000800001824201C204840423C +06FD:0000000000001C203C10200014141414 +06FE:00000000000000001C063E404A4A4A4A +06FF:000000102844102C2A1A244000000000 +0700:000000000000000001000380010008201C700820010003800100000000000000 +0701:0000000000001800180000000000000000000000000000000000000000000000 +0702:0000000000000000000000000000000000001800180000000000000000000000 +0703:0000000000001800180000000000000000001800180000000000000000000000 +0704:0000000000000000000000000000000018001800000000000000000018001800 +0705:0000000000000000000000006600660000000000000000000000000000000000 +0706:0000000000000000000000006000600000000000060006000000000000000000 +0707:0000000000000000000000000600060000000000000060006000000000000000 +0708:0000000060006000000000000600060000000000000000000000000000000000 +0709:0000000000000000000000000000000000000000600060000000000006000600 +070A:0000240024007E00000000000000000018001800000000000000000018001800 +070B:00000000000000007FFE00000000018001800000000000000000000000000000 +070C:00004000200010000800040002000100008000400024001C001C003C00000000 +070D:00000180018019981998018001807FFE7FFE0180018019981998018001800000 +070E:00007FFE73866DF66DEE6DDE73DE7FFE7FFE73866DBE6D8E6DBE73867FFE0000 +070F:AAAA0001B18C3FFDB18C000180000001B32244B7A7AA14A3E4A2000180005555 +0710:0000000000070007000E003C7FF8FFC0C600C300C1C0C0F04070000000000000 +0711:02000C00780050000C0000000000000000000000000000000000000000000000 +0712:000000000000000000000C000FF007F80008600860087FF83FF0000000000000 +0713:00000600070003000180018070C07C600F3003F000F8001C0006000000000000 +0714:00000600070003000180018073C07E600F3003F000F8001C0006000000000000 +0715:0000000000003F003E000E000600060006000600260006000200000000000000 +0716:0000000000003F003E000E000600060006000600060006000200000000000000 +0717:000000000000000000001F783FFC60844082408241026106320C000000000000 +0718:0000000000000000000007800CC0186010201030101019980F98000000000000 +0719:0000000000000C000E000E000600060006000600060006000200000000000000 +071A:00000000000000000000030C030C010601020082408260843FFC1F7800000000 +071B:00000C000E00060003000100018060807FF83FFC004200420042002400180000 +071C:00000C000E00060003000100018060807FF83FFC0042005A005A002400180000 +071D:000000000000000000000000000000000000300018000C000C000C0018003000 +071E:000002000000050000001DC03FE062204224422244126412240C008000000000 +071F:00000000000000001800186018701C9804980788030C00040004000200020001 +0720:000000000E000E0006000300018000C00060303030303FF01FF0000000000000 +0721:00000000000070007E001FF803FC03040304030403FC06F80C00180010000000 +0722:00000000000000000000000000001C003E003F8007C000F00018000400020000 +0723:000000000000000000003C00667843CC4184618431881FF00FE0000000000000 +0724:000000000000000000003C00667843CC4184618431881FF00FE0018001800000 +0725:00000000000000000000000003000300018060C060607FFE3FFE000000000000 +0726:000000000000000001E002300210021801E8600C60047FFE3FFE000000000000 +0727:00000000000000000F001880108030802F00600C400CFFFCFFF8000000000000 +0728:0000000000000000001000380FFC1FFC10000C0003C0003000180038FFF00000 +0729:00000000000000000000000001F003F802080204020413FC17FC0C0000000000 +072A:0200000000003F003E000E000600060006000600060006000200000000000000 +072B:0000000000000000000006600FF00FF007E003C061867FFE3FFE000000000000 +072C:000060007000300008C005E0061006100A081108208C3F8C1F0C000000000000 +072D:000000000020006000C0018003FC03FE0002000260027FFE3FFC000000000000 +072E:00000300018019801F000C000200010060807C403FE007F8001C000600020000 +072F:0000000000003F003E000E000600060006000600460006001200000000000000 +0730:3E00240028003000200000000000000000000000000000000000000000000000 +0731:0000000000000000000000000000000000000000000004000C00140024007C00 +0732:0000000004000000000000000000000000000000000000000000000020000000 +0733:1800240024001800100020000000000000000000000000000000000000000000 +0734:0000000000000000000000000000000000000000040008001800240024001800 +0735:0000080000002000000000000000000000000000000000000000000000000000 +0736:180004000A001200000000000000000000000000000000000000000000000000 +0737:0000000000000000000000000000000000000000000000002400280010000C00 +0738:0000000000000000000000000000000000000000000000000000000000002400 +0739:0000000000000000000000000000000000000000000000000000000008002000 +073A:7C0010007C000000000000000000000000000000000000000000000000000000 +073B:00000000000000000000000000000000000000000000000000003E0008003E00 +073C:0000000000000000000000000000000000000000000000000000000000001000 +073D:0100020005000880124005200210000000000000000000000000000000000000 +073E:0000000000000000000000000000000000001080094004900220014000800100 +073F:0000000000000800000000000000000000000000000000000000000000000000 +0740:0000000000002000000000000000000000000000000000000000000000000000 +0741:0000000000001000000000000000000000000000000000000000000000000000 +0742:0000000000000000000000000000000000000000000000000000000010000000 +0743:0000100000001000000000000000000000000000000000000000000000000000 +0744:0000000000000000000000000000000000000000000000000000100000001000 +0745:0000100000002800000000000000000000000000000000000000000000000000 +0746:0000000000000000000000000000000000000000000000000000280000001000 +0747:0000000008001000200000000000000000000000000000000000000000000000 +0748:0000000000000000000000000000000000000000000000000000200010000800 +0749:012000D000E8017400BA005C002C001200000000000000000000000000000000 +074A:540010007C001000540000000000000000000000000000000000000000000000 +074B:00007FFE73866DF66DEE6DDE73DE7FFE7FFE6D8E6DB6618E7DB67D8E7FFE0000 +074C:00007FFE73866DF66DEE6DDE73DE7FFE7FFE6DC66DBE61BE7DBE7DC67FFE0000 +074D:00001818181818180C300C30042004600660066002C002C003C0018001800000 +074E:00000000000C000600E600FC003000100008000860047FFE3FFE000000000000 +074F:00000180018000C0002C00320012001C0008000860047FFE3FFE000000000000 +0750:000000000000000422423C00002A0000 +0751:000000100028000422423C0000080000 +0752:000000000000000422423C0008001400 +0753:000000000820000422423C0008001400 +0754:000000000010000422423C0000140000 +0755:000000000000000422423C0008142200 +0756:000000442810000422423C0000000000 +0757:00000000000028007E1020404040221C +0758:00000000000000007E1024404A40221C +0759:202028347800080402427C0010001000 +075A:000000000000080402427C0008142200 +075B:00000000000000000402021F04483000 +075C:00000000001400140115155E48483000 +075D:000000000028001824201C204040423C +075E:000000280010001824201C204040423C +075F:000000100010001824201C204040423C +0760:0000000000060A0642423C000A000000 +0761:0000000000060A0642423C0004000A00 +0762:00000004881020403C827E0000000000 +0763:004000A4081020403C827E0000000000 +0764:00000004081020403C827E0008001400 +0765:00000000000800001C061E2020202020 +0766:00000000000000001C061E2028202020 +0767:00000000000020000422424244380014 +0768:20202834780020000422424244380000 +0769:00004428100020000422424244380000 +076A:000000040404041E0424444444380000 +076B:00000000100010000402020204483000 +076C:00000018201820000402020204483000 +076D:00000000040004000115155E48483000 +076E:00000000000000007E10284C4A5C221C +076F:00000000007E10284C4A5C405440221C +0770:00202028347800140115155E48483000 +0771:20202834780010400402020204483000 +0772:00001010141A3C007E1020404040221C +0773:28283020282808080808080000000000 +0774:2A2A3420282808080808080000000000 +0775:00000014141810101046484846423C00 +0776:00000015151A10101046484846423C00 +0777:0000000046484846423C000816101010 +0778:000050506040404C12121E0204483000 +0779:000054546840404C12121E0204483000 +077A:00000000005050604048541020407F00 +077B:00000000005454684048541020407F00 +077C:00000000000000007E10244B4848221C +077D:00000008161010100115155E48483000 +077E:00000000081422000115155E48483000 +077F:000028020A120A2242423C0000000000 +0780:00000000000004081060000000000000 +0781:000000000000121C1020C00000000000 +0782:0000000000002A342040800000000000 +0783:00000000000014081420C00000000000 +0784:00000000000028545438000000000000 +0785:0000000000001024381020C000000000 +0786:00000000000044485060000000000000 +0787:000000000000060A1222C20000000000 +0788:00000000000008141408106000000000 +0789:0000000000001C240810600000000000 +078A:00000000000408040804081060000000 +078B:0000000000000204021C20C000000000 +078C:0000000000000C122C4020C000000000 +078D:00000000000008103C08106000000000 +078E:00000000000000040810087000000000 +078F:0000000000002A342040403800000000 +0790:0000000000000000000000000000000030043FF8400000000000000000000000 +0791:00000000000018601860180600000000 +0792:00000000000028102840403800000000 +0793:00000000000028545438403800000000 +0794:00000000000000161A22C00000000000 +0795:00000000000408040804081260000000 +0796:00000000000004080438403800000000 +0797:0000000102040C122C4020C000000000 +0798:000000000004110C122C4020C0000000 +0799:00000000000004081064000000000000 +079A:00000000001004081060000000000000 +079B:0000000000080204021C20C000000000 +079C:0000000000080014081420C000000000 +079D:0000000000000000000000000080022030043FF8400000000000000000000000 +079E:0000000000000000000000000000000030043FF8400000800000000000000000 +079F:0000000000000000000000000000008030043FF8400000000000000000000000 +07A0:0000000000000C122C4028C000000000 +07A1:000000000004000C122C4020C0000000 +07A2:000000000000060A1222C20800000000 +07A3:00000000000400060A32C20000000000 +07A4:00000000000014000C10087000000000 +07A5:00000000000800081414081060000000 +07A6:00081020000000000000000000000000 +07A7:00122448000000000000000000000000 +07A8:00000000000000000000000000102040 +07A9:00000000000000000000000000122448 +07AA:00300810200000000000000000000000 +07AB:00661122440000000000000000000000 +07AC:00081020180000000000000000000000 +07AD:00224488660000000000000000000000 +07AE:00621428460000000000000000000000 +07AF:1C244840300000000000000000000000 +07B0:00182418000000000000000000000000 +07B1:00000000000010282810204038000000 +07B2:00007FFE73866DF66DEE6DDE73DE7FFE7FFE63866DF663866DBE63867FFE0000 +07B3:00007FFE73866DF66DEE6DDE73DE7FFE7FFE638E6DF663C66DF6638E7FFE0000 +07B4:00007FFE73866DF66DEE6DDE73DE7FFE7FFE63B66DB663866DF663F67FFE0000 +07B5:00007FFE73866DF66DEE6DDE73DE7FFE7FFE63866DBE63866DF663867FFE0000 +07B6:00007FFE73866DF66DEE6DDE73DE7FFE7FFE63CE6DBE638E6DB663CE7FFE0000 +07B7:00007FFE73866DF66DEE6DDE73DE7FFE7FFE63866DF663EE6DDE63DE7FFE0000 +07B8:00007FFE73866DF66DEE6DDE73DE7FFE7FFE63CE6DB663CE6DB663CE7FFE0000 +07B9:00007FFE73866DF66DEE6DDE73DE7FFE7FFE63CE6DB663C66DF663CE7FFE0000 +07BA:00007FFE73866DF66DEE6DDE73DE7FFE7FFE63866DB663866DB663B67FFE0000 +07BB:00007FFE73866DF66DEE6DDE73DE7FFE7FFE638E6DB6638E6DB6638E7FFE0000 +07BC:00007FFE73866DF66DEE6DDE73DE7FFE7FFE63C66DBE63BE6DBE63C67FFE0000 +07BD:00007FFE73866DF66DEE6DDE73DE7FFE7FFE638E6DB663B66DB6638E7FFE0000 +07BE:00007FFE73866DF66DEE6DDE73DE7FFE7FFE63866DBE638E6DBE63867FFE0000 +07BF:00007FFE73866DF66DEE6DDE73DE7FFE7FFE63866DBE638E6DBE63BE7FFE0000 +07C0:00000000182424424242422424180000 +07C1:000000001814121010101010107E0000 +07C2:000000002222223E2020202020200000 +07C3:000000000404040404043C04043C0000 +07C4:0000000004040404043C2020203C0000 +07C5:00000000202020203820202020200000 +07C6:00000000404040407C04040404040000 +07C7:00000000404040404244485060600000 +07C8:00000000404040407E44485060600000 +07C9:00000000384444443810101010100000 +07CA:00000000101010101010101010100000 +07CB:00000000000000001824424224180000 +07CC:00000000824428281010101010100000 +07CD:00000000000000000010282844440000 +07CE:000000000000000044444444447C0000 +07CF:00000000000000007C040404047C0000 +07D0:000000003844444438101010107C0000 +07D1:000000000010202018000000007E0000 +07D2:000000001028281E0A12020202020000 +07D3:000000003C20203C2020202020200000 +07D4:000000003C04043C0404040404040000 +07D5:00000000404040407844444444780000 +07D6:000000003E2020101008080404040000 +07D7:00000000182848080808080808080000 +07D8:00000000000000002C525252527E0000 +07D9:00000000080808083E08080808080000 +07DA:00000000242424247E242424243C0000 +07DB:00000000000000007E424242427E0000 +07DC:00000000000000007C44442828100000 +07DD:00000000040A0A0A0C78484848780000 +07DE:000000000424243C2424040404040000 +07DF:00000000304848483E08080808080000 +07E0:000000007C1010101010101010100000 +07E1:000000000000000010282844447C0000 +07E2:00000000701010384444381010100000 +07E3:000000003E2222020202020202020000 +07E4:0000000020203C242404040404040000 +07E5:000000003C0404043C242424243C0000 +07E6:00000000101010384444381010100000 +07E7:000000007C1010384444381010100000 +07E8:0000000000000000000000001070121C +07E9:00000000000000000000000010741A1C +07EA:000000000000000000000008083E0808 +07EB:00003C00000000000000000000000000 +07EC:122C4000000000000000000000000000 +07ED:00100000000000000000000000000000 +07EE:10284400000000000000000000000000 +07EF:08047E00000000000000000000000000 +07F0:48340200000000000000000000000000 +07F1:10207E00000000000000000000000000 +07F2:00000000000000000000000000000010 +07F3:00002400000000000000000000000000 +07F4:00000000003008081000000000000000 +07F5:00000000001020201800000000000000 +07F6:000000001C2222221E040810203E0000 +07F7:000000001C222A224155412A1C000000 +07F8:000000000000181800000000003C0000 +07F9:0000000000003C000018180018180000 +07FA:00000000000000000000000000FF0000 +07FB:00007FFE73866DF66DEE6DDE73DE7FFE7FFE618E6FB6638E6FB66F8E7FFE0000 +07FC:00007FFE73866DF66DEE6DDE73DE7FFE7FFE61C66FBE63BE6FBE6FC67FFE0000 +07FD:00000000000000000000000000007E42 +07FE:00000000000000002C5252527E107C10 +07FF:0000000040F040407844444444780000 +0800:000000000000000000000008011002A0044008240828103010200C4000000000 +0801:0000000000000000000000000380044008200FE00010001000083FF800000000 +0802:000000000000000000000000003007C00440084000200010002000C000000000 +0803:00000000000000000000000003F8042008100FF0000800080010002000000000 +0804:000000000000000000000000003007C004C00940026004900520004000000000 +0805:000000000000000000000000004007A004900900030004E00010002000000000 +0806:000000000000000000000000038004401C6013901010101010201CC000000000 +0807:000000000000000000000000002007C004C0094032600C900510022000000000 +0808:000000000000000000000200040009F0111008A004A002400140008000000000 +0809:000000000000000000000000000000F003900490049009200920092000000000 +080A:0000000000000000000008080C081FF0001000100010021007900FF000000000 +080B:00000000000000000000008000800080030004000800081018301FF000000000 +080C:00000000000000000000000008881DD81FF82008000808101E103FF000000000 +080D:00000000040004000400080008000FF0001000100010021007900FF000000000 +080E:0000000000000000060009000A0019C00078009008A01F600100020007800000 +080F:00000000000000000000000000001FE008400440028001800080000000000000 +0810:00000000000000000000000000000FF0001000100010021007900FF000000000 +0811:000000000000000000000000000003F014901C90149005201920092000000000 +0812:000000000000000000000000080007E00610091000A000400180020001800000 +0813:00000000000000000000000003C0042008100FF0000800080010002000000000 +0814:00000000000000000000000008881DD81FF82004000000000000000000000000 +0815:00000000000000000000000001000280044008240828103010200C4000000000 +0816:00000010002000280012000C0000000000000000000000000000000000000000 +0817:000000100010001200140016000C000000000000000000000000000000000000 +0818:00000FFC00000000000000000000000000000000000000000000000000000000 +0819:0080004000200040008000000000000000000000000000000000000000000000 +081A:0000071008E00000000000000000000000000000000000000000000000000000 +081B:0000071008E00000000000000000000000000000000000000000000000000000 +081C:0000440044002800280010001000000000000000000000000000000000000000 +081D:0000440028001000000000000000000000000000000000000000000000000000 +081E:0000100010001000100010001000100010000000000000000000000000000000 +081F:0000100010001000100010000000000000000000000000000000000000000000 +0820:0000100010001000000000000000000000000000000000000000000000000000 +0821:00007F8000000000000000000000000000000000000000000000000000000000 +0822:00001F0000000000000000000000000000000000000000000000000000000000 +0823:00000E0000000000000000000000000000000000000000000000000000000000 +0824:0000008000800100010002000200000000000000000000000000000000000000 +0825:0000080008001000100020002000000000000000000000000000000000000000 +0826:0000100010002800280044004400000000000000000000000000000000000000 +0827:0000100028004400000000000000000000000000000000000000000000000000 +0828:0000008001000200010000800000000000000000000000000000000000000000 +0829:000003000C0030000C0003000000000000000000000000000000000000000000 +082A:0000020004000800040002000000000000000000000000000000000000000000 +082B:0000100010002800280044007C00000000000000000000000000000000000000 +082C:000000C00120012000C000000000000000000000000000000000000000000000 +082D:0000018001800000000000000000000000000000000000000000000000000000 +082E:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE61867DBE618E6FBE61867FFE0000 +082F:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE61867DBE618E6FBE61BE7FFE0000 +0830:0000000000000000000000000180018000000000000000000000000000000000 +0831:0000000000000000018001800000000000000000018001800000000000000000 +0832:0000000000000000000000000C600C6000000000000000000000000000000000 +0833:000000000000000000003F183018100008000400020002000400000000000000 +0834:000000000000000000003F183018100008000400021802180400000000000000 +0835:000000000000000000000240000003C004000400030000C00000000000000000 +0836:00000000003000300000008000400040008001000200060007E0000000000000 +0837:00000000000000000000007E006000207F900008000400040008000000000000 +0838:000000000000000000000000000000067FE60000000000000000000000000000 +0839:000000000000000000000006000600007FE00000000600060000000000000000 +083A:0000000000000000000000067FE600000000000000067FE60000000000000000 +083B:0000000000000000000004600460040004000400046004600000000000000000 +083C:0000000000000010002000400080010002000400080010002000000000000000 +083D:0000000000000010002000400080011802180400080011982198000000000000 +083E:0000000000000000000000000180024002400180000000000000000000000000 +083F:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE63867DBE718E7DBE63BE7FFE0000 +0840:0000000000000000000000000000038004400820082004400380000000000000 +0841:0000000000000000000000840104020403F8004000203FFE0000000000000000 +0842:000000000000000000600090016001000080004000303FFC0000000000000000 +0843:00000000000000000000001400240044007C000400043FF80000000000000000 +0844:000000000000000000000000000000000000005400543FF80000000000000000 +0845:0000000000000000000000100008000403FC0000000000000000000000000000 +0846:0000000000000000008000800080008000800080008000800000000000000000 +0847:0000000000000000000000000000000003E00410040803FC0000000000000000 +0848:00000000000000E001200140014000A03FF00000000000000000000000000000 +0849:0000000000000000000000800100020003F00000000000000000000000000000 +084A:0000000000000000004010800900090004E004200440048009000E0000000000 +084B:0000000000000000000400040004000400040004000401F80000000000000000 +084C:0000000000000000000000840104020403FC004400243FC40000000000000000 +084D:00000000000000000000104008200820042004400440048009000E0000000000 +084E:000000000000000000000000000000000018008400443FF80000000000000000 +084F:0000000000000000000000400080010001F8000400043FF80000000000000000 +0850:000000000000000000C01120096008A0042004400440048009000E0000000000 +0851:0000000000000000002A102A083E0820042004400440048009000E0000000000 +0852:0000000000000000000000840104020403FC004400243FF80000000000000000 +0853:0000000000000000000000840104020403FC000400043FF80000000000000000 +0854:000000000000000000000C18122412240D580140014000800080000000000000 +0855:000000000000000000000084007C002400240FC4000000000000000000000000 +0856:000000000000000000000210042008400FF00000000000000000000000000000 +0857:00000000000000000008111020A020A01F9C008400880090012001C000000000 +0858:0000000000000000008001000200020001C002000200020001C0000000000000 +0859:0000000000000000000000000000000000000000000000000000024002400000 +085A:000000000000000000000000000000000000000000000000000003E000000000 +085B:0000000000000000000000000000000000000000000000000000008000800000 +085C:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE61C66FBE61BE7DBE61C67FFE0000 +085D:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE618E6FB661B67DB6618E7FFE0000 +085E:0000000000000180066008100990124812480990081006600180000000000000 +085F:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE61866FBE618E7DBE61BE7FFE0000 +0860:000000000000000003C004200A100610001000E00020201010100FF000000000 +0861:00000000000000001EF029082908100800081F082088407040003FF800240018 +0862:0000000000000000180026002984106A001201AC024021A010100FF000000000 +0863:0000000000000000400020001000080004000200010E00840044003800000000 +0864:000000000000000003C004200A10061000D0012000E0201010100FF000000000 +0865:000000000000000007C0082008100410001000E00020201010100FF000000000 +0866:000000000000000007F01808200803F00400040003F00008080807F000000000 +0867:0000000000000000000001000080004000400040008001000600180000000000 +0868:00000000000000000C00120022002400280030002018212421241EF800000000 +0869:00000000000000002000100008000800080008000830084808480FF800400180 +086A:0000000000000000003004480848105010201050109009080A0807F000000000 +086B:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE738E6FB6638E6DB6738E7FFE0000 +086C:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE73C66FBE63BE6DBE73C67FFE0000 +086D:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE738E6FB663B66DB6738E7FFE0000 +086E:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE73866FBE638E6DBE73867FFE0000 +086F:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE73866FBE638E6DBE73BE7FFE0000 +0870:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE61CE7DB67BB677B677CE7FFE0000 +0871:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE61EE7DCE7BEE77EE77C67FFE0000 +0872:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE61867DF67B8677BE77867FFE0000 +0873:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE618E7DF67BC677F6778E7FFE0000 +0874:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE61B67DB67B8677F677F67FFE0000 +0875:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE61867DBE7B8677F677867FFE0000 +0876:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE61CE7DBE7B8E77B677CE7FFE0000 +0877:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE61867DF67BEE77DE77DE7FFE0000 +0878:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE61CE7DB67BCE77B677CE7FFE0000 +0879:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE61CE7DB67BC677F677CE7FFE0000 +087A:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE61867DB67B8677B677B67FFE0000 +087B:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE618E7DB67B8E77B6778E7FFE0000 +087C:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE61C67DBE7BBE77BE77C67FFE0000 +087D:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE618E7DB67BB677B6778E7FFE0000 +087E:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE61867DBE7B8E77BE77867FFE0000 +087F:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE61867DBE7B8E77BE77BE7FFE0000 +0880:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE73CE6DB673B66DB673CE7FFE0000 +0881:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE73EE6DCE73EE6DEE73C67FFE0000 +0882:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE73866DF673866DBE73867FFE0000 +0883:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE738E6DF673C66DF6738E7FFE0000 +0884:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE73B66DB673866DF673F67FFE0000 +0885:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE73866DBE73866DF673867FFE0000 +0886:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE73CE6DBE738E6DB673CE7FFE0000 +0887:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE73866DF673EE6DDE73DE7FFE0000 +0888:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE73CE6DB673CE6DB673CE7FFE0000 +0889:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE73CE6DB673C66DF673CE7FFE0000 +088A:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE73866DB673866DB673B67FFE0000 +088B:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE738E6DB6738E6DB6738E7FFE0000 +088C:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE73C66DBE73BE6DBE73C67FFE0000 +088D:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE738E6DB673B66DB6738E7FFE0000 +088E:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE73866DBE738E6DBE73867FFE0000 +088F:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE73866DBE738E6DBE73BE7FFE0000 +0890:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE73CE6DB671B67DB673CE7FFE0000 +0891:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE73EE6DCE71EE7DEE73C67FFE0000 +0892:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE73866DF671867DBE73867FFE0000 +0893:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE738E6DF671C67DF6738E7FFE0000 +0894:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE73B66DB671867DF673F67FFE0000 +0895:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE73866DBE71867DF673867FFE0000 +0896:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE73CE6DBE718E7DB673CE7FFE0000 +0897:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE73866DF671EE7DDE73DE7FFE0000 +0898:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE73CE6DB671CE7DB673CE7FFE0000 +0899:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE73CE6DB671C67DF673CE7FFE0000 +089A:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE73866DB671867DB673B67FFE0000 +089B:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE738E6DB6718E7DB6738E7FFE0000 +089C:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE73C66DBE71BE7DBE73C67FFE0000 +089D:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE738E6DB671B67DB6738E7FFE0000 +089E:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE73866DBE718E7DBE73867FFE0000 +089F:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE73866DBE718E7DBE73BE7FFE0000 +08A0:000000000000000422423C0022140800 +08A1:00000C100C10000422423C0010000000 +08A2:00000000000820007E1020404840221C +08A3:000000202228202C32227C0000000000 +08A4:0010002800060A0642423C0010000000 +08A5:000000002400001C120A264244380010 +08A6:00000004041F041F0424444448380000 +08A7:00000000080014001C061E2020202020 +08A8:0000000018201820044A4844423C0028 +08A9:0000000000001000044A4844423C0028 +08AA:00000000000000000402020234483402 +08AB:000000000000000C12120E2204483000 +08AC:000000000000000000000814146E404A +08AD:00000000000000000000080808080800 +08AE:000000000000080402427C0028001000 +08AF:000000000000000006194E4830042008 +08B0:00000810244850403C827E0000000000 +08B1:000000000000000814141E0404040400 +08B2:00001028440010000402020204483000 +08B3:0000000000001824201C20544048423C +08B4:000000020A120A2242423C0000080000 +08B5:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE63866DBE63866DF663867FFE0000 +08B6:000018041C10100422423C0000080000 +08B7:000018041C10100422423C0024000800 +08B8:00000000140000229D413E0000000000 +08B9:00200008044448300402020204483000 +08BA:0020000804444830044A4844423C0028 +08BB:0000000000060A06423C000000000000 +08BC:0000000000060A0642423C0000000000 +08BD:00000000000000000422424244380000 +08BE:000000442810000422423C0014000800 +08BF:004428100014000422423C0000000000 +08C0:221448405068F00422423C0000000000 +08C1:00000000442810007E2040544048221C +08C2:00885024081020403C827E0000000000 +08C3:001000240008001824201C204040423C +08C4:000010002400001C120A264244380000 +08C5:00000010002400007E1020404840221C +08C6:000000000000007E204840544048221C +08C7:4040506AF202020202224242443C0000 +08C8:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE71CE6FB66FCE6FB671CE7FFE0000 +08C9:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE71CE6FB66FC66FF671CE7FFE0000 +08CA:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE71866FB66F866FB671B67FFE0000 +08CB:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE718E6FB66F8E6FB6718E7FFE0000 +08CC:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE71C66FBE6FBE6FBE71C67FFE0000 +08CD:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE718E6FB66FB66FB6718E7FFE0000 +08CE:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE71866FBE6F8E6FBE71867FFE0000 +08CF:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE71866FBE6F8E6FBE71BE7FFE0000 +08D0:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE63CE6DB66DB66DB663CE7FFE0000 +08D1:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE63EE6DCE6DEE6DEE63C67FFE0000 +08D2:00007FFE73CE6DB66DCE6DB673CE7FFE7FFE63866DF66D866DBE63867FFE0000 +08D3:0000000000000000000000040A0E021C +08D4:216B87A7839364000000000000000000 +08D5:0000000006194E502000000000000000 +08D6:00102820182044380000000000000000 +08D7:0024000C0A4638000000000000000000 +08D8:00200008244832040000000000000000 +08D9:00000000000000000000002008244932 +08DA:020A0B2A6D6A010A154A2EB24000000000000000000000000000000000000000 +08DB:A80508054A05A955566901800000000000000000000000000000000000000000 +08DC:0005481514C58B5575E900000000000000000000000000000000000000000000 +08DD:00C0030094004A00010249AAB6D4000000000000000000000000000000000000 +08DE:0010004000100228009811480FB0000000000000000000000000000000000000 +08DF:00400100284042A4056A22265DC2001C00000000000000000000000000000000 +08E0:0020523C000000000000000000000000 +08E1:00020515EE0000000000000000000000 +08E2:08142222414936000000000000000000 +08E3:0000000000000000000000034C304830 +08E4:0004020C100800000000000000000000 +08E5:0C0E4830000000000000000000000000 +08E6:000000000000000000000004020C1008 +08E7:00221166884400000000000000000000 +08E8:1C22225522221C000000000000000000 +08E9:00000000000000000000002211668844 +08EA:00001000000000000000000000000000 +08EB:00000420000000000000000000000000 +08EC:001A241A000000000000000000000000 +08ED:00000000000000000000000000000010 +08EE:00000000000000000000000000001040 +08EF:00000000000000000000000000344834 +08F0:06180018600000000000000000000000 +08F1:66772244880000000000000000000000 +08F2:00000000000000000000000618001860 +08F3:00040A0E021C00000000000000000000 +08F4:00344854245800000000000000000000 +08F5:200C3000000000000000000000000000 +08F6:000000000000000000000000000C3004 +08F7:20402000000000000000000000000000 +08F8:10081000000000000000000000000000 +08F9:00000000000000000000000000102010 +08FA:00000000000000000000000000100810 +08FB:48244800000000000000000000000000 +08FC:24922400000000000000000000000000 +08FD:08240800000000000000000000000000 +08FE:0C2E0810200000000000000000000000 +08FF:001C0202041800000000000000000000 +0900:01C0022004800000000000000000000000000000000000000000000000000000 +0901:0480022001C00000000000000000000000000000000000000000000000000000 +0902:0180018000000000000000000000000000000000000000000000000000000000 +0903:0000000000000000000000000003000300000000000000030003000000000000 +0904:010000FC000201CF02220012001200620412041E0212022201C2000000000000 +0905:00000000000001CF02220012001200620412041E0212022201C2000000000000 +0906:0000000000000E7F1114009400940314209420F4109411140E14000000000000 +0907:0000000000003FFF004003C00400040003C000200010019001E0004000200010 +0908:00E0011000803FFF004003C00400040003C000200010019001E0004000200010 +0909:0000000000001FFF0010000804080430020802080108011000E0000000000000 +090A:0000000000003FFF00400020102010CC08320822042204420384000000000000 +090B:0000000000007FFF00801E9821F806901888009000A000A40098000000000000 +090C:000000000000FFFF002000201C70228821082010102008200018000000000000 +090D:011000E000001FFF021002100210021002100100008000400020002000000000 +090E:040003E000101FFF021002100210021002100100008000400020002000000000 +090F:0000000000001FFF021002100210021002100100008000400020002000000000 +0910:07C0002000101FFF021002100210021002100100008000400020002000000000 +0911:011000E000000E7F1114009400940314209420F4109411140E14000000000000 +0912:080007F800040E7F1114009400940314209420F4109411140E14000000000000 +0913:07F0000800040E7F1114009400940314209420F4109411140E14000000000000 +0914:01F8000400FC0E3F1114009400940314209420F4109411140E14000000000000 +0915:000000000000FFFF008000800EB011C811880E88009000800080000000000000 +0916:000000000000FFFF0810081009D01A301A3011D00810043003D0000000000000 +0917:000000000000FFFF0210021002100A1006100210001000100010000000000000 +0918:000000000000FFFF08080608018802080408041803E800080008000000000000 +0919:000000000000FFFF008003800400041813981040084008400780000000000000 +091A:000000000000FFFF000800080FF8021802680188000800080008000000000000 +091B:000000000000FFFF004006600890085006200830084804480388001000000000 +091C:000000000000FFFF000800080878084804480388000800080008000000000000 +091D:000000000000FFFF010807080808080807F8010801080E080C08020001000000 +091E:000000000000FFFF0008000803C8132810280838082804480388000000000000 +091F:000000000000FFFF0080008003800400080008000808041003E0000000000000 +0920:000000000000FFFF0080008003E00410080808080808041003E0000000000000 +0921:000000000000FFFF002000E00100010004E004100210021001E0000000000000 +0922:000000000000FFFF0080008003800400086008900890045003E0000000000000 +0923:000000000000FFFF049004900490049003100010001000100010000000000000 +0924:000000000000FFFF0010001003F0041008100810081004100210000000000000 +0925:0000000000000C3F120811080908010802080C18082804480388000000000000 +0926:000000000000FFFF0080008003800400080008000830043003E0001000080000 +0927:0000000000000CFF1208140808080C0807080808081807E80008000000000000 +0928:000000000000FFFF0008000803F8060806080008000800080008000000000000 +0929:000000000000FFFF0008000803F80608060800080008000800C800C000000000 +092A:000000000000FFFF081008100810083004500390001000100010000000000000 +092B:000000000000FFFF104010401040107008C80748004800480050000000000000 +092C:000000000000FFFF0010001007D00C300A300950079000100010000000000000 +092D:0000000000000C7F12080E080208020807F80608000800080008000000000000 +092E:000000000000FFFF04100410041004100FF00C10001000100010000000000000 +092F:000000000000FFFF0210021002100C100810083007D000100010000000000000 +0930:000000000000FFFF020002000200060006000100008000400000000000000000 +0931:000000000000FFFF020002000200060006000100008000400600060000000000 +0932:000000000000FFFF000800080638094808880808040803080008000000000000 +0933:000000000000FFFF002000200C70128810881108128812480C30000000000000 +0934:000000000000FFFF002000200C70128810881108128812480C30018001800000 +0935:000000000000FFFF0010001007D0083008300850079000100010000000000000 +0936:000000000000FFFF0610091009100710011001100E100D100090000000000000 +0937:000000000000FFFF0C100A10091008B004500390001000100010000000000000 +0938:000000000000FFFF04100410041004100FF00C10041002100110000000000000 +0939:0000000000003FFF004003C00400040003800440044002000100008000000000 +093A:0080008000000000000000000000000000000000000000000000000000000000 +093B:000000020002000F000200020002000200020002000200020002000000000000 +093C:0000000000000000000000000000000000000000000000000000000001800180 +093D:00000000000003F004000400030000C00020002010200C400380000000000000 +093E:000000000000000F000200020002000200020002000200020002000000000000 +093F:3FC040204000F000400040004000400040004000400040004000000000000000 +0940:03FC04020002000F000200020002000200020002000200020002000000000000 +0941:00000000000000000000000000000000000000000000000000000410021001E0 +0942:000000000000000000000000000000000000000000000000000001E002100410 +0943:0000000000000000000000000000000000000000000000000000007000800070 +0944:0000000000000000000000000000000000000000000000C00100017000800078 +0945:0400022001C00000000000000000000000000000000000000000000000000000 +0946:10000F0000800080000000000000000000000000000000000000000000000000 +0947:1E00010000800000000000000000000000000000000000000000000000000000 +0948:07801F4000C00000000000000000000000000000000000000000000000000000 +0949:001100090006000F000200020002000200020002000200020002000000000000 +094A:010000FC0002000F000200020002000200020002000200020002000000000000 +094B:01F800040002000F000200020002000200020002000200020002000000000000 +094C:007C01FA0006000F000200020002000200020002000200020002000000000000 +094D:0000000000000000000000000000000000000000000000000000006000100008 +094E:000000000000F000800080008000800080008000800080008000000000000000 +094F:027C01FA0006000F000200020002000200020002000200020002000000000000 +0950:0000001800181C42223C01000100060C41124192216C22001C00000000000000 +0951:0180018000800000000000000000000000000000000000000000000000000000 +0952:0000000000000000000000000000000000000000000000000000000007E00000 +0953:0200010000800000000000000000000000000000000000000000000000000000 +0954:0040008001000000000000000000000000000000000000000000000000000000 +0955:0240018003C00000000000000000000000000000000000000000000000000000 +0956:00000000000000000000000000000000000000000000000000000810042003C0 +0957:00000000000000000000000000000000000000000000000000001248099007E0 +0958:000000000000FFFF008000800EB011C811880E8800900C800C80000000000000 +0959:000000000000FFFF0810081009D01A301A3011D00810043003D0000003000300 +095A:000000000000FFFF0210021002100A1006100210001000100190018000000000 +095B:000000000000FFFF000800080878084804480388000800080188018000000000 +095C:000000000000FFFF002000E00100010004E004100210021001E0000000C000C0 +095D:000000000000FFFF0080008003800400086008900890045003E0000001800180 +095E:000000000000FFFF104010401040107008C80748004806480650000000000000 +095F:000000000000FFFF0210021002100C100810083007D000100310030000000000 +0960:0000000000007FFF00801E8C21FC0688189800A0009800A2009C000000000000 +0961:000000000000FFFF002000201C70228821082030104008300044003800000000 +0962:00000000000000000000000000000000000000000000000000000EE011200818 +0963:0000000000000000000000000000000000000000000000080C7012941118080E +0964:0000000000000000008000800080008000800080008000800080000000000000 +0965:0000000000000000024002400240024002400240024002400240000000000000 +0966:000000000000000003C0042008100810081008100810042003C0000000000000 +0967:000000000000000001C002200220014000800100020001000080004000000000 +0968:000000000000000003C00420001000100010032003C001000080004000200000 +0969:000000000000000003C004200020002001C000200020062007C0010000800000 +096A:0000000000000000101008200440028001000280044004400380000000000000 +096B:00000000000000000800080008C008C007800040004000200020001000100000 +096C:000000000000000003C0042004000400038004000400046003E0008001000000 +096D:000000000000000000E001100910093008D004100410022001C0000000000000 +096E:00000000000000000040008001000200040008000810042003C0000000000000 +096F:0000000000000000018002400240038001000080004000200010000000000000 +0970:000000000000000001C00220022001C000000000000000000000000000000000 +0971:0000000000000180018000000000000000000000000000000000000000000000 +0972:00420022001C01CF02220012001200620412041E0212022201C2000000000000 +0973:00000002000201CF02220012001200620412041E0212022201C2000000000000 +0974:000000020002073F088A004A004A018A104A107A084A088A070A000000000000 +0975:0120009C0072070F088A004A004A018A104A107A084A088A070A000000000000 +0976:00000000000001CF02220012001200620412041E0212022201C2000000840078 +0977:00000000000001CF02220012001200620412041E0212022201C20090026401F8 +0978:000000000000FFFF0400040004000FC00C200020002000400080000000000000 +0979:000000000000FFFF000800080878084804480388000818681868030003000000 +097A:000000000000FFFF0210021003100C900850083007D000100010000000000000 +097B:000000000000FFFF0210021002100A1006100210001000100FF0000000000000 +097C:000000000000FFFF000800080878084804480388000800080FF8000000000000 +097D:00000000000003E00410080800080008001000E0008000800080000000000000 +097E:000000000000FFFF002000E00100010004E00410021001E007F8000000000000 +097F:000000000000FFFF0010001007D00C300A300950079000100FF0000000000000 +0980:0000000000000380044008200920062000200020002000200020002400180000 +0981:0080022001C00000000000000000000000000000000000000000000000000000 +0982:0000000000000000000000020005000500020000000400020001000100000000 +0983:0000000000000000000000020005000500020000000200050005000200000000 +0984:00007FFE73CE6DB66DC66DF673CE7FFE7FFE73B66DB673866DF673F67FFE0000 +0985:0000000000003FFF000811881248122810280828082804580388000000000000 +0986:0000000000003FFF000A118A124A122A102A082A082A045A038A000000000000 +0987:020001F000083FFF000003C004200410001000600780030000C0003000000000 +0988:020001F000083FFF00000618092008E0014002400C4000200018000000000000 +0989:020001F000083FFF0040004008580868080804080408021001E0000000000000 +098A:020001F000083FFF004000400A580A680A080908050804F003E0000000000000 +098B:000000000000002F102824281A6801A80E6830380E2801A80068000000000000 +098C:00000000000003000400020001C0002007100890085004500060008000000000 +098D:00007FFE73CE6DB66DC66DF673CE7FFE7FFE738E6DB673B66DB6738E7FFE0000 +098E:00007FFE73CE6DB66DC66DF673CE7FFE7FFE73866DBE738E6DBE73867FFE0000 +098F:00000000000000E001100210121011101010101010D009300610000000000000 +0990:020001F0000800E401140214121811101010101010D009300610000000000000 +0991:00007FFE73CE6DB66DC66DF673CE7FFE7FFE73EE6DCE71EE7DEE73C67FFE0000 +0992:00007FFE73CE6DB66DC66DF673CE7FFE7FFE73866DF671867DBE73867FFE0000 +0993:00000000000000600090040804080430020802080108011000E0000000000000 +0994:000001E00010018802481028102810C808300820042004400380000000000000 +0995:000000000000FFFF00E0015002480C4810480C500240014000C0000000000000 +0996:000000000000088F074800480048018806080F0800C800280018000000000000 +0997:00000000000003CF042808180F08008800880108060800080008000000000000 +0998:000000000000FFFF0408080808080608010806080C0803E80018000000000000 +0999:00000000000004600490029001E01100113008E80808041003E0000000000000 +099A:000000000000FFFF08000C000C000B0008E00810082008C00F00000000000000 +099B:000000000000FFFF08000E0009C00920062000400F80060001C0003000000000 +099C:000000000000FFFF018011401120111808C80850085004500388000000000000 +099D:000000000000FFEF006800A80128062818280628012800B80068000000000000 +099E:0000000000000300048008B008C804880090108810C809B00680000000000000 +099F:020001F00008FFFF040004000400040004300430042004C00700000000000000 +09A0:018002000100FFFF00C000A001100910161010101010082007C0000000000000 +09A1:000000000000FFFF0040004008580868080804080408021001E0000000000000 +09A2:000000000000FFFF040004000400040004300430042004C00700000000000000 +09A3:000000000000000F03C8042808180E0806080008000800080008000000000000 +09A4:000000000000FFFF000008E009100908080804080408021001E0000000000000 +09A5:000000000000078F084808480048018806080F0800C800280018000000000000 +09A6:000000000000FFFF08000800083008D00B100C20002000200010000000000000 +09A7:000000000000020F041804680388060818080608018800680018000000000000 +09A8:000000000000FFFF00080008000803C8042808180E0806080008000000000000 +09A9:00007FFE73CE6DB66DC66DF673CE7FFE7FFE61CE6DB661C66DF66DCE7FFE0000 +09AA:00000000000007CF082818180418026807880008000800080008000000000000 +09AB:000000000000FFFF080004100228012802200C20182007A00060000000000000 +09AC:000000000000FFFF001800680188060818080608018800680018000000000000 +09AD:000000000000FFFF000001800B900A2809C804080408021001E0000000000000 +09AE:000000000000FFFF00080C080208010801080308058802680018000000000000 +09AF:000000000000FFFF080804080208010802080C08038800680018000000000000 +09B0:000000000000FFFF001800680188060818080608018800680318030000000000 +09B1:00007FFE73CE6DB66DC66DF673CE7FFE7FFE63EE6DCE63EE6DEE63C67FFE0000 +09B2:000000000000FFFF000800080638094808880808080806080008000000000000 +09B3:00007FFE73CE6DB66DC66DF673CE7FFE7FFE638E6DF663C66DF6638E7FFE0000 +09B4:00007FFE73CE6DB66DC66DF673CE7FFE7FFE63B66DB663866DF663F67FFE0000 +09B5:00007FFE73CE6DB66DC66DF673CE7FFE7FFE63866DBE63866DF663867FFE0000 +09B6:000000000000F06F0A9805080D880D8800080008000800080008000000000000 +09B7:000000000000FFFF080804080208018802680C18038800680018000000000000 +09B8:000000000000FFFF06080908008800B800480888070800080008000000000000 +09B9:000000000000FFFF000007C00E200610001000600780030000C0003000000000 +09BA:00007FFE73CE6DB66DC66DF673CE7FFE7FFE63866DB663866DB663B67FFE0000 +09BB:00007FFE73CE6DB66DC66DF673CE7FFE7FFE638E6DB6638E6DB6638E7FFE0000 +09BC:0000000000000000000000000000000000000000000000000000018001800000 +09BD:0000000000000C0003C0032003100010001000600780030000C0003000000000 +09BE:000000000000000B000600020002000200020002000200020002000000000000 +09BF:3FF040084000E000400040004000400040004000400040004000000000000000 +09C0:0FFC10020FFA0007000200020002000200020002000200020002000000000000 +09C1:000000000000000000000000000000000000000000000000000800E8011000E8 +09C2:00000000000000000000000000000000000000000000000000000060008C0073 +09C3:0000000000000000000000000000000000000000000000000004000800100008 +09C4:0000000000000000000000000000000100020004000200010004000800100008 +09C5:00007FFE73CE6DB66DC66DF673CE7FFE7FFE71866FBE6F866FF671867FFE0000 +09C6:00007FFE73CE6DB66DC66DF673CE7FFE7FFE71CE6FBE6F8E6FB671CE7FFE0000 +09C7:000000000000F0002000400040008000800080008000E0006000000000000000 +09C8:800060001000F0002000400040008000800080008000E0006000000000000000 +09C9:00007FFE73CE6DB66DC66DF673CE7FFE7FFE71CE6FB66FC66FF671CE7FFE0000 +09CA:00007FFE73CE6DB66DC66DF673CE7FFE7FFE71866FB66F866FB671B67FFE0000 +09CB:000000000000F00B2006400240028002800280028002E0026002000000000000 +09CC:010000FC0002F00B2006400240028002800280028002E0026002000000000000 +09CD:0000000000000000000000000000000000000000000000000000006000100008 +09CE:000000000000000000000380044005800400030000E000100010000000000000 +09CF:00007FFE73CE6DB66DC66DF673CE7FFE7FFE71866FBE6F8E6FBE71BE7FFE0000 +09D0:00007FFE73CE6DB66DC66DF673CE7FFE7FFE63CE6DB66DB66DB663CE7FFE0000 +09D1:00007FFE73CE6DB66DC66DF673CE7FFE7FFE63EE6DCE6DEE6DEE63C67FFE0000 +09D2:00007FFE73CE6DB66DC66DF673CE7FFE7FFE63866DF66D866DBE63867FFE0000 +09D3:00007FFE73CE6DB66DC66DF673CE7FFE7FFE638E6DF66DC66DF6638E7FFE0000 +09D4:00007FFE73CE6DB66DC66DF673CE7FFE7FFE63B66DB66D866DF663F67FFE0000 +09D5:00007FFE73CE6DB66DC66DF673CE7FFE7FFE63866DBE6D866DF663867FFE0000 +09D6:00007FFE73CE6DB66DC66DF673CE7FFE7FFE63CE6DBE6D8E6DB663CE7FFE0000 +09D7:010000FC0002000B000600020002000200020002000200020002000000000000 +09D8:00007FFE73CE6DB66DC66DF673CE7FFE7FFE63CE6DB66DCE6DB663CE7FFE0000 +09D9:00007FFE73CE6DB66DC66DF673CE7FFE7FFE63CE6DB66DC66DF663CE7FFE0000 +09DA:00007FFE73CE6DB66DC66DF673CE7FFE7FFE63866DB66D866DB663B67FFE0000 +09DB:00007FFE73CE6DB66DC66DF673CE7FFE7FFE638E6DB66D8E6DB6638E7FFE0000 +09DC:000000000000FFFF0040004008580868080804080408021001E0000000C000C0 +09DD:000000000000FFFF040004000400040004300430042004C00700006000600000 +09DE:00007FFE73CE6DB66DC66DF673CE7FFE7FFE63866DBE6D8E6DBE63867FFE0000 +09DF:000000000000FFFF080804080208010802080C08038800680318030000000000 +09E0:000000000000002F102824281A6801A806681838062801A80268040002000100 +09E1:00000000000003000400020001C0002007100890085004600090000800680098 +09E2:000000000000000000000000000000000000000000000000000800040034004C +09E3:000000000000000000000000000000060001000300050000000800040034004C +09E4:00007FFE73CE6DB66DC66DF673CE7FFE7FFE61B66FB663866FF661F67FFE0000 +09E5:00007FFE73CE6DB66DC66DF673CE7FFE7FFE61866FBE63866FF661867FFE0000 +09E6:000000000000000003C0042008100810081008100810042003C0000000000000 +09E7:0000000000000000080006000180006000100008000806700780000000000000 +09E8:0000000000000000030000C000200010001000600780030000C0002000100000 +09E9:000000000000000000E01110120812C811C808080808041003E0000000000000 +09EA:000000000000000003C004200420042003C0042008100810042003C000000000 +09EB:00000000000000000300048008400880088008800850042003C0000000000000 +09EC:00000000000000000040004008400858086804080408021001E0000000000000 +09ED:000000000000000007C008200820086007A00020002000200020000000000000 +09EE:00000000000000000800080008100BE00C800880088009000600000000000000 +09EF:000000000000020004000400020001C000200710089008500460000000000000 +09F0:000000000000FFFF00180068018806C818280618018800680018000000000000 +09F1:000000000000FFFF00180068018806081808060801880C680218010000000000 +09F2:0000000000000000000000000600018000400020001000000000000000000000 +09F3:00000000000006000900010003F00100016001500110012000C0000000000000 +09F4:0000000000000000000000000000001000200040018006000000000000000000 +09F5:00000000000000000000000000000000070808900CA001400380000000000000 +09F6:000000000000000800080F080C880090009001100E2008400780000000000000 +09F7:0000000000000000008000800080008000800080008000800080000000000000 +09F8:00000000000008000800081008300850089009100A100C100810001000080000 +09F9:00000000000000000000000001C00220041004100410022001C0000000000000 +09FA:0000000000000000000000080008000809900990042003C00000000000000000 +09FB:0000000000000000000000000180020002000100008000400020000000000000 +09FC:0000000000000000000000000010019001A00820044003800020001000080000 +09FD:0000000000000000000000000180024002400180000000000000000000000000 +09FE:0300008003C00020000000000000000000000000000000000000000000000000 +09FF:00007FFE73CE6DB66DC66DF673CE7FFE7FFE61866FBE638E6FBE6FBE7FFE0000 +0A00:00007FFE73866DB66D866DB673B67FFE7FFE73CE6DB66DB66DB673CE7FFE0000 +0A01:02A0022001C00000000000000000000000000000000000000000000000000000 +0A02:0180018000000000000000000000000000000000000000000000000000000000 +0A03:0000000000000000000000000002000500020000000200050002000000000000 +0A04:00007FFE73866DB66D866DB673B67FFE7FFE73B66DB66D866DF673F67FFE0000 +0A05:0000000000000000C00720041304149C386430C420C400840004000000000000 +0A06:0000000000000000C03F20241024166439A03320232002200020000000000000 +0A07:3C00420042004000FFFF44044404420441FC42004400420441F8000000000000 +0A08:0078008400840004FFFE4044404420441FC42004400420441F84000000000000 +0A09:07C0082010102008FFFF2008200820103FE010100810042003C00000081007E0 +0A0A:07C0082010102008FFFF200820103FE010100810042003C0081007E0081007E0 +0A0B:00007FFE73866DB66D866DB673B67FFE7FFE738E6DB66D8E6DB6738E7FFE0000 +0A0C:00007FFE73866DB66D866DB673B67FFE7FFE73C66DBE6DBE6DBE73C67FFE0000 +0A0D:00007FFE73866DB66D866DB673B67FFE7FFE738E6DB66DB66DB6738E7FFE0000 +0A0E:00007FFE73866DB66D866DB673B67FFE7FFE73866DBE6D8E6DBE73867FFE0000 +0A0F:00C0002000100010FFFF10101010081007F008001000080007F0000000000000 +0A10:00F0000800F4000CC01F20041304149C386430C420C400840004000400000000 +0A11:00007FFE73866DB66D866DB673B67FFE7FFE7BEE73CE7BEE7BEE71C67FFE0000 +0A12:00007FFE73866DB66D866DB673B67FFE7FFE7B8673F67B867BBE71867FFE0000 +0A13:07F0080010002000FFFF2008200820103FE010100810042003C0000000000000 +0A14:020001F000480048C01F20041304149C386430C420C400840004000400000000 +0A15:0000000000000000FFFF001000100F1010A020602060209011100E1000000000 +0A16:0000000000000000F01F101008100FF01010201010300FD00010001000000000 +0A17:0000000000000000FFFF0090009000901F902090209010900910061000000000 +0A18:0000000000000000F11F1110091009101110211011300ED00010000000000000 +0A19:0000000000000000FFFF100010001FC0002003A0044004A00310000000000000 +0A1A:0000000000000000FFFF0020002018201FE008200820042003C0000000000000 +0A1B:0000000000000000FFFF001000101FF020001FF0210821081FF0000000000000 +0A1C:0000000000000000FFFF0010001018101FF00810081008100810000000000000 +0A1D:0000000000000000FFFF0C3002400FE01010260807F001000080004000000000 +0A1E:0000000000000000FFFF201020101FF0200020001FF0040003F0000000000000 +0A1F:0000000000000000FFFF0040004001C0020004000800041003E0000000000000 +0A20:0000000000000000FFFF0100010002800440082010101010082007C000000000 +0A21:0000000000000000FFFF0008000803F0001000101F08208810700FC000000000 +0A22:0000000000000000FFFF0010001018101FF00800080009E00A10042003C00000 +0A23:0000000000000000FFFF010000C000600F5010C020001010082007C000000000 +0A24:0000000000000000FFFF0010001007A007E00030201030100C2003C000000000 +0A25:0000000000000000FFFF101008100FF0101030100C3003D00010001000000000 +0A26:0000000000000000FFFF0020002030203FE0100010000800041003E000000000 +0A27:0000000000000000FFFF08100410041008101010081006700190001000000000 +0A28:0000000000000000FFFF01000100028004400820101010100820000000000000 +0A29:00007FFE73866DB66D866DB673B67FFE7FFE61CE7DB661C66FF661CE7FFE0000 +0A2A:0000000000000000F81F08100410041008101010081006700190001000000000 +0A2B:0000000000000000FFFF001000101FF02000200021E012100C2003C000000000 +0A2C:0000000000000000FFFF0810041007F008101010081006700190001000000000 +0A2D:0000000000000000FFFF0010001003D0043003C800081010082007C000000000 +0A2E:0000000000000000F01F0810081008100FF01810181000100190019000000000 +0A2F:0000000000000000FFFF08100410041008F01090089004900390001000000000 +0A30:0000000000000000FFFF0010001007F00810081008100410021001E000000000 +0A31:00007FFE73866DB66D866DB673B67FFE7FFE63EE7DCE71EE7DEE63C67FFE0000 +0A32:0000000000000000FFFF0820082004400AA01110101008200440000000000000 +0A33:0000000000000000FFFF0820082004400AA0111010100820044C000C00000000 +0A34:00007FFE73866DB66D866DB673B67FFE7FFE63B67DB671867DF663F67FFE0000 +0A35:0000000000000000FFFF001000101FF0200030000FF0040003E0000000000000 +0A36:0000000000000000FFFF0810081008100FF01810181000100190019000000000 +0A37:00007FFE73866DB66D866DB673B67FFE7FFE63867DF671EE7DDE63DE7FFE0000 +0A38:0000000000000000FFFF0810081008100FF01810181000100010001000000000 +0A39:0000000000000000FFFF0010001007100810081008100410021001E000000000 +0A3A:00007FFE73866DB66D866DB673B67FFE7FFE63867DB671867DB663B67FFE0000 +0A3B:00007FFE73866DB66D866DB673B67FFE7FFE638E7DB6718E7DB6638E7FFE0000 +0A3C:0000000000000000000000000000000000000000000000000000000001800180 +0A3D:00007FFE73866DB66D866DB673B67FFE7FFE638E7DB671B67DB6638E7FFE0000 +0A3E:0000000000000000001F00040004000400040004000000000000000000000000 +0A3F:7800840084008400E00080008000800080008000800080008000800080000000 +0A40:0078008400840084001F00040004000400040004000400040004000400040000 +0A41:0000000000000000000000000000000000000000000000000000082007C00000 +0A42:000000000000000000000000000000000000000000000000082007C0082007C0 +0A43:00007FFE73866DB66D866DB673B67FFE7FFE6D8E6DF661C67DF67D8E7FFE0000 +0A44:00007FFE73866DB66D866DB673B67FFE7FFE6DB66DB661867DF67DF67FFE0000 +0A45:00007FFE73866DB66D866DB673B67FFE7FFE6D866DBE61867DF67D867FFE0000 +0A46:00007FFE73866DB66D866DB673B67FFE7FFE6DCE6DBE618E7DB67DCE7FFE0000 +0A47:000000E000100008000000000000000000000000000000000000000000000000 +0A48:01E0001000F80008000000000000000000000000000000000000000000000000 +0A49:00007FFE73866DB66D866DB673B67FFE7FFE6DCE6DB661C67DF67DCE7FFE0000 +0A4A:00007FFE73866DB66D866DB673B67FFE7FFE6D866DB661867DB67DB67FFE0000 +0A4B:020001F000080008000000000000000000000000000000000000000000000000 +0A4C:020001F000480048000000000000000000000000000000000000000000000000 +0A4D:0000000000000000000000000000000000000000000000000000001800040002 +0A4E:00007FFE73866DB66D866DB673B67FFE7FFE6D866DBE618E7DBE7D867FFE0000 +0A4F:00007FFE73866DB66D866DB673B67FFE7FFE6D866DBE618E7DBE7DBE7FFE0000 +0A50:00007FFE73866DB66D866DB673B67FFE7FFE61CE6FB661B67DB661CE7FFE0000 +0A51:0000000000000000000000000000000000000000000000000000080006000180 +0A52:00007FFE73866DB66D866DB673B67FFE7FFE61866FF661867DBE61867FFE0000 +0A53:00007FFE73866DB66D866DB673B67FFE7FFE618E6FF661C67DF6618E7FFE0000 +0A54:00007FFE73866DB66D866DB673B67FFE7FFE61B66FB661867DF661F67FFE0000 +0A55:00007FFE73866DB66D866DB673B67FFE7FFE61866FBE61867DF661867FFE0000 +0A56:00007FFE73866DB66D866DB673B67FFE7FFE61CE6FBE618E7DB661CE7FFE0000 +0A57:00007FFE73866DB66D866DB673B67FFE7FFE61866FF661EE7DDE61DE7FFE0000 +0A58:00007FFE73866DB66D866DB673B67FFE7FFE61CE6FB661CE7DB661CE7FFE0000 +0A59:0000000000000000F81F0810041007F008101010081006700190181018000000 +0A5A:0000000000000000FFFF009000900F9010901090109008900490031018001800 +0A5B:0000000000000000FFFF0010001018101FF00810081008100810099001800000 +0A5C:0000000000000000FFFF00200020002007E0001000101020084007C004200210 +0A5D:00007FFE73866DB66D866DB673B67FFE7FFE618E6FB661B67DB6618E7FFE0000 +0A5E:0000000000000000FFFF001000101FF02000200021E012100C2063C060000000 +0A5F:00007FFE73866DB66D866DB673B67FFE7FFE61866FBE618E7DBE61BE7FFE0000 +0A60:00007FFE73866DB66D866DB673B67FFE7FFE73CE6FB663B66DB673CE7FFE0000 +0A61:00007FFE73866DB66D866DB673B67FFE7FFE73EE6FCE63EE6DEE73C67FFE0000 +0A62:00007FFE73866DB66D866DB673B67FFE7FFE73866FF663866DBE73867FFE0000 +0A63:00007FFE73866DB66D866DB673B67FFE7FFE738E6FF663C66DF6738E7FFE0000 +0A64:00007FFE73866DB66D866DB673B67FFE7FFE73B66FB663866DF673F67FFE0000 +0A65:00007FFE73866DB66D866DB673B67FFE7FFE73866FBE63866DF673867FFE0000 +0A66:0000000000000000078008401020201020102010102008400780000000000000 +0A67:000000000000000007000880084008C007400040004000400040003000000000 +0A68:000000000000000007C000200010001000200FC0004000200010000000000000 +0A69:00000000000000000F800040002000401F800040002030403F80080004000200 +0A6A:0000000000000000044008200820044003800440082008200440038000000000 +0A6B:0000000000000000103C1020082008201020202010200CE00320002000000000 +0A6C:00E00100010000C003F004300800040003F004000800040803F0000000000000 +0A6D:000000000000000003C004200810081006100020004000800300040000000000 +0A6E:00000000000030003FF0100010001000100010000800040003F0000000000000 +0A6F:00600080008030603FF0103010001000100010000800040003F0000000000000 +0A70:03C0042002400000000000000000000000000000000000000000000000000000 +0A71:0420042003C00000000000000000000000000000000000000000000000000000 +0A72:0000000000000000FFFF10101010081007F0080010000810042003C000000000 +0A73:07E0081010082008FFFF2008200820103FE010100810042003C0000000000000 +0A74:00000000180424F8250C1D920B421482280C280228022404120809F000000000 +0A75:0000000000000000000000000000000000000000000000000200020002400180 +0A76:0000000000000000000000000100038007C00380010000000000000000000000 +0A77:00007FFE73866DB66D866DB673B67FFE7FFE61867DF67BEE77DE77DE7FFE0000 +0A78:00007FFE73866DB66D866DB673B67FFE7FFE61CE7DB67BCE77B677CE7FFE0000 +0A79:00007FFE73866DB66D866DB673B67FFE7FFE61CE7DB67BC677F677CE7FFE0000 +0A7A:00007FFE73866DB66D866DB673B67FFE7FFE61867DB67B8677B677B67FFE0000 +0A7B:00007FFE73866DB66D866DB673B67FFE7FFE618E7DB67B8E77B6778E7FFE0000 +0A7C:00007FFE73866DB66D866DB673B67FFE7FFE61C67DBE7BBE77BE77C67FFE0000 +0A7D:00007FFE73866DB66D866DB673B67FFE7FFE618E7DB67BB677B6778E7FFE0000 +0A7E:00007FFE73866DB66D866DB673B67FFE7FFE61867DBE7B8E77BE77867FFE0000 +0A7F:00007FFE73866DB66D866DB673B67FFE7FFE61867DBE7B8E77BE77BE7FFE0000 +0A80:00007FFE73866DB66D866DB673B67FFE7FFE73CE6DB673B66DB673CE7FFE0000 +0A81:02A0022001C00000000000000000000000000000000000000000000000000000 +0A82:0180018000000000000000000000000000000000000000000000000000000000 +0A83:0000000000000000000000000003000300000000000300030000000000000000 +0A84:00007FFE73866DB66D866DB673B67FFE7FFE73B66DB673866DF673F67FFE0000 +0A85:000000000000000078080408048838F810480888070A00040000000000000000 +0A86:0000000000000000F0220822092271E220A211220E2A00110000000000000000 +0A87:000000180020002003A004200420042003200420044003800000000000000000 +0A88:0000003000480048074008400840084006400840088007000000000000000000 +0A89:000003C00420081009C008200820082008C00420022001C00000000000000000 +0A8A:00000F0010802040272020902090209023101090089407080000000000000000 +0A8B:0000000000000000391005280328011803E40502094210840000000000000000 +0A8C:000000000000000000200F7010882084201810200C20001C0000000000000000 +0A8D:004000200018000078080408048838F810480888070A00040000000000000000 +0A8E:00007FFE73866DB66D866DB673B67FFE7FFE73866DBE738E6DBE73867FFE0000 +0A8F:000000600010000878080408048838F810480888070A00040000000000000000 +0A90:00E0001800F8000878080408048838F810480888070A00040000000000000000 +0A91:0010000800060000F0220822092271E220A211220E2A00110000000000000000 +0A92:00007FFE73866DB66D866DB673B67FFE7FFE73866DF671867DBE73867FFE0000 +0A93:0000001800040002F0220822092271E220A211220E2A00110000000000000000 +0A94:00380006003E0002F0220822092271E220A211220E2A00110000000000000000 +0A95:0000000000000000018002000240018001800240084007800000000000000000 +0A96:000000000000000020405040124013C00C400040005000200000000000000000 +0A97:00000000000000000C2012200120012012200C20002800100000000000000000 +0A98:0000000000000000039004100410041003100430045403880000000000000000 +0A99:000000000000000001000100026004600200210011000E000000000000000000 +0A9A:00000000000000003C10021002101C1008300450039400080000000000000000 +0A9B:00000000000000001CC021202120212018A0204020801F000000000000000000 +0A9C:00000000000000000E10112028C0488049403120012000C00000000000000000 +0A9D:00000000000000000C401240014001E012100C10001000600000000000000000 +0A9E:00000000000000000C201220012001E012200C20002800100000000000000000 +0A9F:0000000000000000380004000400180020004000440038000000000000000000 +0AA0:0000000000000000018002000200010007000880088007000000000000000000 +0AA1:000000000000000001000100020004000200210011000E000000000000000000 +0AA2:00000000000000001C0002000C0010C02120212010C00F800000000000000000 +0AA3:00000000000000004C4052404140414052404C40405040202000100008001000 +0AA4:00000000000000000040004003C0044008400840045002200000000000000000 +0AA5:00000000000000000C4012400A40044008C00740005000200000000000000000 +0AA6:0000000000000000038004000400040003000400044003800000000000000000 +0AA7:00000600080008000640084008C0074000400040005000200000000000000000 +0AA8:00000000000000000080008000801F801880008000A000400000000000000000 +0AA9:00007FFE73866DB66D866DB673B67FFE7FFE61CE6DB661C66DF66DCE7FFE0000 +0AAA:000000000000000010402840084008C007400040005000200000000000000000 +0AAB:000000000000000001800200024001800180024018401F800400020001800000 +0AAC:000000000000000008081008208820F811080E08000A00040000000000000000 +0AAD:000000000000000007080888108810F810080808040A00040000000000000000 +0AAE:00000000000000000C200220022003E000200020002800100000000000000000 +0AAF:00000000000000000C20022004200820046003A0002800100000000000000000 +0AB0:00000000000000001E00010001000E000400020001C000000000000000000000 +0AB1:00007FFE73866DB66D866DB673B67FFE7FFE63EE6DCE63EE6DEE63C67FFE0000 +0AB2:00000000000000000C80108020802780208010800CA000400000000000000000 +0AB3:0000000000000000000021802240224022401C40004000500020000000000000 +0AB4:00007FFE73866DB66D866DB673B67FFE7FFE63B66DB663866DF663F67FFE0000 +0AB5:00000000000000000000074008C0084008C00740004000500020000000000000 +0AB6:00000000000000000C20122012200C2004201820082807100000000000000000 +0AB7:00000000000000000C400A40094008C007400040005000200000000000000000 +0AB8:00000000000000003C20022003E01C2008200420032800100000000000000000 +0AB9:000000000000000021002200210020802480232010200FC00000000000000000 +0ABA:00007FFE73866DB66D866DB673B67FFE7FFE63866DB663866DB663B67FFE0000 +0ABB:00007FFE73866DB66D866DB673B67FFE7FFE638E6DB6638E6DB6638E7FFE0000 +0ABC:0000000000000000000000000000000000000000000000000000000001800180 +0ABD:0000000000000000380040004000300008000400440038000000000000000000 +0ABE:0000000000000000000400040004000400040004000500020000000000000000 +0ABF:6000900088008000800080008000800080008000A00040000000000000000000 +0AC0:0018002400240004000400040004000400040004000500020000000000000000 +0AC1:00000000000000000000000000000000000000000000000000000260011000E0 +0AC2:000000000000000000000000000000000000000000000000000001C002200190 +0AC3:000000000000000000000000000000000000000000000000000001C0020001C0 +0AC4:00000000000000000000000000000000000000000000018002000180020001C0 +0AC5:0010000800060000000000000000000000000000000000000000000000000000 +0AC6:00007FFE73866DB66D866DB673B67FFE7FFE71CE6FBE6F8E6FB671CE7FFE0000 +0AC7:0000001800040002000000000000000000000000000000000000000000000000 +0AC8:00380006003E0002000000000000000000000000000000000000000000000000 +0AC9:00200010000C0000000400040004000400040004000500020000000000000000 +0ACA:00007FFE73866DB66D866DB673B67FFE7FFE71866FB66F866FB671B67FFE0000 +0ACB:0030000800040004000400040004000400040004000500020000000000000000 +0ACC:003800040034000C000400040004000400040004000500020000000000000000 +0ACD:000000000000000000000000000000000000000000000000000001C000200010 +0ACE:00007FFE73866DB66D866DB673B67FFE7FFE71866FBE6F8E6FBE71867FFE0000 +0ACF:00007FFE73866DB66D866DB673B67FFE7FFE71866FBE6F8E6FBE71BE7FFE0000 +0AD0:00300030000000843C780200020C0C121832044C438042003C00000000000000 +0AD1:00007FFE73866DB66D866DB673B67FFE7FFE63EE6DCE6DEE6DEE63C67FFE0000 +0AD2:00007FFE73866DB66D866DB673B67FFE7FFE63866DF66D866DBE63867FFE0000 +0AD3:00007FFE73866DB66D866DB673B67FFE7FFE638E6DF66DC66DF6638E7FFE0000 +0AD4:00007FFE73866DB66D866DB673B67FFE7FFE63B66DB66D866DF663F67FFE0000 +0AD5:00007FFE73866DB66D866DB673B67FFE7FFE63866DBE6D866DF663867FFE0000 +0AD6:00007FFE73866DB66D866DB673B67FFE7FFE63CE6DBE6D8E6DB663CE7FFE0000 +0AD7:00007FFE73866DB66D866DB673B67FFE7FFE63866DF66DEE6DDE63DE7FFE0000 +0AD8:00007FFE73866DB66D866DB673B67FFE7FFE63CE6DB66DCE6DB663CE7FFE0000 +0AD9:00007FFE73866DB66D866DB673B67FFE7FFE63CE6DB66DC66DF663CE7FFE0000 +0ADA:00007FFE73866DB66D866DB673B67FFE7FFE63866DB66D866DB663B67FFE0000 +0ADB:00007FFE73866DB66D866DB673B67FFE7FFE638E6DB66D8E6DB6638E7FFE0000 +0ADC:00007FFE73866DB66D866DB673B67FFE7FFE63C66DBE6DBE6DBE63C67FFE0000 +0ADD:00007FFE73866DB66D866DB673B67FFE7FFE638E6DB66DB66DB6638E7FFE0000 +0ADE:00007FFE73866DB66D866DB673B67FFE7FFE63866DBE6D8E6DBE63867FFE0000 +0ADF:00007FFE73866DB66D866DB673B67FFE7FFE63866DBE6D8E6DBE63BE7FFE0000 +0AE0:000000000000000072200A500650023007DC0A101292210C0000000000000000 +0AE1:000000000000000000200F7010882084201810200C20001C00200020001C0000 +0AE2:0000000000000000000000000000000000000000000000000360049004200018 +0AE3:00000000000000000000000000000000000000000000036004900424001A000C +0AE4:00007FFE73866DB66D866DB673B67FFE7FFE61B66FB663866FF661F67FFE0000 +0AE5:00007FFE73866DB66D866DB673B67FFE7FFE61866FBE63866FF661867FFE0000 +0AE6:0000000000000000078008401020201020102010102008400780000000000000 +0AE7:000000000000000007000880084008C007400040004000400040003000000000 +0AE8:000000000000000007C00020001000100C200FC00200010000C0000000000000 +0AE9:000000000000000001C000200010002003C010200810042003C0000000000000 +0AEA:00000000000000001C080210012000C000C0012002200220022001C000000000 +0AEB:000000000000000010402840084008C007400040005000200000000000000000 +0AEC:0000000000000000070008001000080007E004000800040003F0000800080070 +0AED:000000000000000003C0046008900910061020102010202010400F8000000000 +0AEE:0000000000000080010002000400080010001000100008400780000000000000 +0AEF:000000000000000008001040208021002200200010000F800000000000000000 +0AF0:0000000000000000000000000000000018002400240018000000000000000000 +0AF1:00000000000000000C000200010002001C1C0222012232223C1C080004000300 +0AF2:00007FFE73866DB66D866DB673B67FFE7FFE61866FF663866FBE6F867FFE0000 +0AF3:00007FFE73866DB66D866DB673B67FFE7FFE618E6FF663C66FF66F8E7FFE0000 +0AF4:00007FFE73866DB66D866DB673B67FFE7FFE61B66FB663866FF66FF67FFE0000 +0AF5:00007FFE73866DB66D866DB673B67FFE7FFE61866FBE63866FF66F867FFE0000 +0AF6:00007FFE73866DB66D866DB673B67FFE7FFE61CE6FBE638E6FB66FCE7FFE0000 +0AF7:00007FFE73866DB66D866DB673B67FFE7FFE61866FF663EE6FDE6FDE7FFE0000 +0AF8:00007FFE73866DB66D866DB673B67FFE7FFE61CE6FB663CE6FB66FCE7FFE0000 +0AF9:00000000000000001F82284424282430185000900510112004C0000000000000 +0AFA:00C0002000200040000000000000000000000000000000000000000000000000 +0AFB:0888088807700000000000000000000000000000000000000000000000000000 +0AFC:000C013001C00700000000000000000000000000000000000000000000000000 +0AFD:018001800C300C30000000000000000000000000000000000000000000000000 +0AFE:0180024002400180000000000000000000000000000000000000000000000000 +0AFF:0630094809480630000000000000000000000000000000000000000000000000 +0B00:00007FFE738E6DB66D8E6DB6738E7FFE7FFE73CE6DB66DB66DB673CE7FFE0000 +0B01:02A0022001C00000000000000000000000000000000000000000000000000000 +0B02:0002000500020000000000000000000000000000000000000000000000000000 +0B03:0000000000000000000000020005000500020005000500020000000000000000 +0B04:00007FFE738E6DB66D8E6DB6738E7FFE7FFE73B66DB66D866DF673F67FFE0000 +0B05:0000000000000000361049104910221004100810083007D00000000000000000 +0B06:0000000000000000361449144914221404140414023401D40000000000000000 +0B07:00000000000000000F803040402040204A20354015400A200000000000000000 +0B08:0000000000000000038004403E2040204A20354015400A200000000000000000 +0B09:00000000000000000F803040402041205220264022401C200000000000000000 +0B0A:00000000000000000F803040404041405220261022201C100000000000000000 +0B0B:000000000000000007001880208020802C40122012400C200000000000000000 +0B0C:00000000000000000000038004400180020004C0052003C00000000000000000 +0B0D:00007FFE738E6DB66D8E6DB6738E7FFE7FFE738E6DB66DB66DB6738E7FFE0000 +0B0E:00007FFE738E6DB66D8E6DB6738E7FFE7FFE73866DBE6D8E6DBE73867FFE0000 +0B0F:0000000000000000020006000A004200220012000A0006000000000000000000 +0B10:000001E00210001001200320052021E011200920052003200000000000000000 +0B11:00007FFE738E6DB66D8E6DB6738E7FFE7FFE7BEE73CE7BEE7BEE71C67FFE0000 +0B12:00007FFE738E6DB66D8E6DB6738E7FFE7FFE7B8673F67B867BBE71867FFE0000 +0B13:000000000000000004C009200820082008C00420022001C00000000000000000 +0B14:000000F00108000813102490209020F023101090089007100000000000000000 +0B15:00000000000000000FC03020401040104980364016400A400000000000000000 +0B16:000000000000000003900510093008D008100710049003100000000000000000 +0B17:0000000000000000039004500830081008100710049003100000000000000000 +0B18:00000000000000000390045008300A100C10111011300ED00000000000000000 +0B19:00000000000000000F003080407041485230260022001C000000000000000000 +0B1A:000000000000000003C004200810081008100720048003000000000000000000 +0B1B:000000000000000003C0042008100B10048017000A8005000000000000000000 +0B1C:000000000000000003C00420081008000A6004A004A003200000000000000000 +0B1D:000000000000000003A00490091010E016000900098006400000000000000000 +0B1E:00000000000000001360249020101FE01360249020101FE00000000000000000 +0B1F:0000000000000000039004500830081008000700048003000000000000000000 +0B20:0000000000000000000007000880104010401040088007000000000000000000 +0B21:000000000000000003C00C2010101050149009A0088007000000000000000000 +0B22:000000000000000003C00C2010101010141009200A8007000200010000000000 +0B23:0000000000000000039004500A3011101C10021002100C100000000000000000 +0B24:00000000000000000F803040402040205340230023001C000000000000000000 +0B25:00000000000000000610091001100E1010101010083007D00000000000000000 +0B26:00000000000000000F803040402041205300230023001D000000000000000000 +0B27:0000000000000000001004100210031004900410043003D00000000000000000 +0B28:00000000000000000F80104020202020272019400D000D000000000000000000 +0B29:00007FFE738E6DB66D8E6DB6738E7FFE7FFE61CE7DB661C66FF661CE7FFE0000 +0B2A:000000000000000007900850103012100C100810083007D00000000000000000 +0B2B:00000000000000001CB022C841C848B03080208021801E800000000000000000 +0B2C:00000000000000000780184020202E203120110011800E800000000000000000 +0B2D:00000000000000000F803040402045205520234021401E200000000000000000 +0B2E:000000000000000007900850103012100C101010601060100010000000000000 +0B2F:000000000000000007900850103012100C101810683067D00000000000000000 +0B30:000000000000000003C00420081008100810072004A003100000000000000000 +0B31:00007FFE738E6DB66D8E6DB6738E7FFE7FFE63EE7DCE71EE7DEE63C67FFE0000 +0B32:00000000000000001FC02020401040105B1024A024A024900000000000000000 +0B33:00000000000000001FC02020401040105B202480248024800000000000000000 +0B34:00007FFE738E6DB66D8E6DB6738E7FFE7FFE63B67DB671867DF663F67FFE0000 +0B35:00000000000000000780184020202E203120150011800E800000000000000000 +0B36:0000000000000000079008500C30121010100E10091006100000000000000000 +0B37:000000000000000007900C50123013100C900850083007D00000000000000000 +0B38:00000000000000000F9010502030211026101E10019000700000000000000000 +0B39:00000000000000000F803040402041205300230023001D000800060001800000 +0B3A:00007FFE738E6DB66D8E6DB6738E7FFE7FFE63867DB671867DB663B67FFE0000 +0B3B:00007FFE738E6DB66D8E6DB6738E7FFE7FFE638E7DB6718E7DB6638E7FFE0000 +0B3C:0000000000000000000000000000000000000000000000000000000001800180 +0B3D:00000000000000000C003000400030000C003000400030000C00000000000000 +0B3E:0000000000000000000800080008000800080008000800080008000000000000 +0B3F:07F0080808080000000000000000000000000000000000000000000000000000 +0B40:0000000000000000000800180028000800080008000800080008000000000000 +0B41:000000000000000000000000000000000000000000000000002007A008C007B0 +0B42:00000000000000000000000000000000000000000000000003000400044003B0 +0B43:000000000000000000000000000000000000000000000000024004A0042003C0 +0B44:000000000000000000000000000000000000000000000400084006A0082007C0 +0B45:00007FFE738E6DB66D8E6DB6738E7FFE7FFE6D866DBE61867DF67D867FFE0000 +0B46:00007FFE738E6DB66D8E6DB6738E7FFE7FFE6DCE6DBE618E7DB67DCE7FFE0000 +0B47:00000000000000006000800080008000E0009000900090006000000000000000 +0B48:010000F8000400046000800080008000E0009000900090006000000000000000 +0B49:00007FFE738E6DB66D8E6DB6738E7FFE7FFE6DCE6DB661C67DF67DCE7FFE0000 +0B4A:00007FFE738E6DB66D8E6DB6738E7FFE7FFE6D866DB661867DB67DB67FFE0000 +0B4B:00000000000000006008800880088008E0089008900890086008000000000000 +0B4C:00000078008400046008800880088008E0089008900890086008000000000000 +0B4D:0000000000000000000000000000000000000000000000000000008000400020 +0B4E:00007FFE738E6DB66D8E6DB6738E7FFE7FFE6D866DBE618E7DBE7D867FFE0000 +0B4F:00007FFE738E6DB66D8E6DB6738E7FFE7FFE6D866DBE618E7DBE7DBE7FFE0000 +0B50:00007FFE738E6DB66D8E6DB6738E7FFE7FFE61CE6FB661B67DB661CE7FFE0000 +0B51:00007FFE738E6DB66D8E6DB6738E7FFE7FFE61EE6FCE61EE7DEE61C67FFE0000 +0B52:00007FFE738E6DB66D8E6DB6738E7FFE7FFE61866FF661867DBE61867FFE0000 +0B53:00007FFE738E6DB66D8E6DB6738E7FFE7FFE618E6FF661C67DF6618E7FFE0000 +0B54:00007FFE738E6DB66D8E6DB6738E7FFE7FFE61B66FB661867DF661F67FFE0000 +0B55:00000FF000000000000000000000000000000000000000000000000000000000 +0B56:010000F800040004000000000000000000000000000000000000000000000000 +0B57:0000007800840004000800080008000800080008000800080008000000000000 +0B58:00007FFE738E6DB66D8E6DB6738E7FFE7FFE61CE6FB661CE7DB661CE7FFE0000 +0B59:00007FFE738E6DB66D8E6DB6738E7FFE7FFE61CE6FB661C67DF661CE7FFE0000 +0B5A:00007FFE738E6DB66D8E6DB6738E7FFE7FFE61866FB661867DB661B67FFE0000 +0B5B:00007FFE738E6DB66D8E6DB6738E7FFE7FFE618E6FB6618E7DB6618E7FFE0000 +0B5C:000000000000000003C00C2010101050149009A0088007000000030003000000 +0B5D:000000000000000003C00C2010101010141009200A800700020001000C000C00 +0B5E:00007FFE738E6DB66D8E6DB6738E7FFE7FFE61866FBE618E7DBE61867FFE0000 +0B5F:000000000000000007900850103012100C1018306848679C0000000000000000 +0B60:00000000000000000780184020C020202CC0122012C00C200010000000000000 +0B61:00000000000000000000038004400180020004C0052003C00080004000200000 +0B62:00000000000000000000000000000000000000000080014001400098012400F8 +0B63:000000000000000000000000000000000000000000800140015800A4013800D0 +0B64:00007FFE738E6DB66D8E6DB6738E7FFE7FFE73B66FB663866DF673F67FFE0000 +0B65:00007FFE738E6DB66D8E6DB6738E7FFE7FFE73866FBE63866DF673867FFE0000 +0B66:0000000000000000000000000380044010101010101004400380000000000000 +0B67:000000000000000003C004200A100A1009E004000200010000C0002000000000 +0B68:000000000000000003C004200850085007900020004000800300040000000000 +0B69:00000000000000000EE011102110291025101910011001100000000000000000 +0B6A:000000000000000004080210012000C000C0012002200220022001C000000000 +0B6B:000000000000000001C012200A20064001800260045004480380000000000000 +0B6C:000000000000000003C004200310009008900720004000800300040000000000 +0B6D:000000000000000003C0042009100A900A900720004000800300040000000000 +0B6E:0000000000000FE0080008000800080008000800080008000800000000000000 +0B6F:0000000000000000072008A00860080008000800040003000000000000000000 +0B70:0000000000000000001000200C400C8041002200140008000000000000000000 +0B71:000000000000000009E0121010E0081007F00810083007D00000000000000000 +0B72:0000000000000000008000800080008000800080008000800000000000000000 +0B73:0000000000000000088008800880098006800080008000800000000000000000 +0B74:0000000000000000222022202220266019A00020002000200000000000000000 +0B75:0000000000000000002000400080010002000400080010000000000000000000 +0B76:000000000000000000201C402A802B0012000400080010000000000000000000 +0B77:0000000000000000000200040008001036204940498049000000000000000000 +0B78:00007FFE738E6DB66D8E6DB6738E7FFE7FFE61CE7DB67BCE77B677CE7FFE0000 +0B79:00007FFE738E6DB66D8E6DB6738E7FFE7FFE61CE7DB67BC677F677CE7FFE0000 +0B7A:00007FFE738E6DB66D8E6DB6738E7FFE7FFE61867DB67B8677B677B67FFE0000 +0B7B:00007FFE738E6DB66D8E6DB6738E7FFE7FFE618E7DB67B8E77B6778E7FFE0000 +0B7C:00007FFE738E6DB66D8E6DB6738E7FFE7FFE61C67DBE7BBE77BE77C67FFE0000 +0B7D:00007FFE738E6DB66D8E6DB6738E7FFE7FFE618E7DB67BB677B6778E7FFE0000 +0B7E:00007FFE738E6DB66D8E6DB6738E7FFE7FFE61867DBE7B8E77BE77867FFE0000 +0B7F:00007FFE738E6DB66D8E6DB6738E7FFE7FFE61867DBE7B8E77BE77BE7FFE0000 +0B80:00007FFE738E6DB66D8E6DB6738E7FFE7FFE73CE6DB673B66DB673CE7FFE0000 +0B81:00007FFE738E6DB66D8E6DB6738E7FFE7FFE73EE6DCE73EE6DEE73C67FFE0000 +0B82:0100028001000000000000000000000000000000000000000000000000000000 +0B83:0000000000000000018002400240018018182424242418180000000000000000 +0B84:00007FFE738E6DB66D8E6DB6738E7FFE7FFE73B66DB673866DF673F67FFE0000 +0B85:0000000000000000061009100990069000901FF020901F100000000000000000 +0B86:00000000000000001840244026401A4002407FE082507C500150021001E00000 +0B87:000000000F801040232024902490135008401F8022401D800000000000000000 +0B88:00000000000000001FF81080108016B016B01080108010800000000000000000 +0B89:00000000000000003C004A004900310002003C0040003FF00000000000000000 +0B8A:00000000000000007000980099F86AD00950705080007FF80000000000000000 +0B8B:00007FFE738E6DB66D8E6DB6738E7FFE7FFE738E6DB6738E6DB6738E7FFE0000 +0B8C:00007FFE738E6DB66D8E6DB6738E7FFE7FFE73C66DBE73BE6DBE73C67FFE0000 +0B8D:00007FFE738E6DB66D8E6DB6738E7FFE7FFE738E6DB673B66DB6738E7FFE0000 +0B8E:000000000000000007FC081010101C102210221022101C100000000000000000 +0B8F:000000000000000007FC081010101C102210221022101C100020004000800000 +0B90:00000000000000003EE0711049104910311000103FE040004000421042103DE0 +0B91:00007FFE738E6DB66D8E6DB6738E7FFE7FFE73EE6DCE71EE7DEE73C67FFE0000 +0B92:00000000000000001FC020204010401071D04A504A903260020011E010400F80 +0B93:00000000000000001FC020204010401071D04A504A903260020031E048403F80 +0B94:00000000000000003C0042008100817CCDA8B568B928560010008F0082007C00 +0B95:00000000000000000FE00880088008803FE0409040903F200000000000000000 +0B96:00007FFE738E6DB66D8E6DB6738E7FFE7FFE73CE6DBE718E7DB673CE7FFE0000 +0B97:00007FFE738E6DB66D8E6DB6738E7FFE7FFE73866DF671EE7DDE73DE7FFE0000 +0B98:00007FFE738E6DB66D8E6DB6738E7FFE7FFE73CE6DB671CE7DB673CE7FFE0000 +0B99:00000000000000007E1048104F1048904890411042104FF00000000000000000 +0B9A:00000000000000000FE00880088008803FE0408040803F000000000000000000 +0B9B:00007FFE738E6DB66D8E6DB6738E7FFE7FFE738E6DB6718E7DB6738E7FFE0000 +0B9C:00000000000000003EE0711049104910311000103FE0400040E0411042103C60 +0B9D:00007FFE738E6DB66D8E6DB6738E7FFE7FFE738E6DB671B67DB6738E7FFE0000 +0B9E:000000000000000027E0488090809CA0A2D0A290A2909C90801040203FC00000 +0B9F:000000000000000010001000100010001000100010001FF80000000000000000 +0BA0:00007FFE738E6DB66D8E6DB6738E7FFE7FFE61CE6DB661B66DB66DCE7FFE0000 +0BA1:00007FFE738E6DB66D8E6DB6738E7FFE7FFE61EE6DCE61EE6DEE6DC67FFE0000 +0BA2:00007FFE738E6DB66D8E6DB6738E7FFE7FFE61866DF661866DBE6D867FFE0000 +0BA3:00000000000000003BBF44488AA8CAA8AAA8AAA8444800080000000000000000 +0BA4:00000000000000000FE00880088008803FE0409040903F10001000203FC04000 +0BA5:00007FFE738E6DB66D8E6DB6738E7FFE7FFE61866DBE61866DF66D867FFE0000 +0BA6:00007FFE738E6DB66D8E6DB6738E7FFE7FFE61CE6DBE618E6DB66DCE7FFE0000 +0BA7:00007FFE738E6DB66D8E6DB6738E7FFE7FFE61866DF661EE6DDE6DDE7FFE0000 +0BA8:00000000000000000FE0088008800880088008E008900890001000203FC04000 +0BA9:00000000000000001EFC2110429072904A904A90311000100000000000000000 +0BAA:000000000000000010201020102010201020102010201FE00000000000000000 +0BAB:00007FFE738E6DB66D8E6DB6738E7FFE7FFE618E6DB6618E6DB66D8E7FFE0000 +0BAC:00007FFE738E6DB66D8E6DB6738E7FFE7FFE61C66DBE61BE6DBE6DC67FFE0000 +0BAD:00007FFE738E6DB66D8E6DB6738E7FFE7FFE618E6DB661B66DB66D8E7FFE0000 +0BAE:000000000000000021C02220222022202220222022203FC00000000000000000 +0BAF:000000000000000012101210121012101210121016101BF00000000000000000 +0BB0:00000000000000000FF008400840084008400840084008400040008001000200 +0BB1:000000000000000007700888088808880888088808880888001000100FE01000 +0BB2:00000000000000001C2022104110411071104910491030E00000000000000000 +0BB3:00000000000000001CFC23104110411071104910491031100000000000000000 +0BB4:000000000000000021C02220222022202220222022203FC0020023C020801F00 +0BB5:00000000000000001C1023104090409070904890491033F00000000000000000 +0BB6:000000000000000047FC44444444444444444444444438380000000000000000 +0BB7:00000000000000001C10222841284128711049284A4833F00080010000000000 +0BB8:00000000000000001D9022484248424872484A484A4832300000000000000000 +0BB9:0000000000000000386C449282928292E292929294926792000400043FF84000 +0BBA:00007FFE738E6DB66D8E6DB6738E7FFE7FFE63866DB663866DB663B67FFE0000 +0BBB:00007FFE738E6DB66D8E6DB6738E7FFE7FFE638E6DB6638E6DB6638E7FFE0000 +0BBC:00007FFE738E6DB66D8E6DB6738E7FFE7FFE63C66DBE63BE6DBE63C67FFE0000 +0BBD:00007FFE738E6DB66D8E6DB6738E7FFE7FFE638E6DB663B66DB6638E7FFE0000 +0BBE:0000000000000000001F00120012001200120012001200120000000000000000 +0BBF:001C002200220012000200020002000200020002000200020000000000000000 +0BC0:01C0022002C00100008000000000000000000000000000000000000000000000 +0BC1:0000000000000000001E00050002000000000000000000000000000000000000 +0BC2:0000000000060009001D000B0005000100020000000000000000000000000000 +0BC3:00007FFE738E6DB66D8E6DB6738E7FFE7FFE718E6FF66FC66FF6718E7FFE0000 +0BC4:00007FFE738E6DB66D8E6DB6738E7FFE7FFE71B66FB66F866FF671F67FFE0000 +0BC5:00007FFE738E6DB66D8E6DB6738E7FFE7FFE71866FBE6F866FF671867FFE0000 +0BC6:00000000000000003000480084008400E4009400940064000000000000000000 +0BC7:000000000000000030004800B00080008000B000480030000000000000000000 +0BC8:00000000000000003D80424087408540E5409540924060000000000000000000 +0BC9:00007FFE738E6DB66D8E6DB6738E7FFE7FFE71CE6FB66FC66FF671CE7FFE0000 +0BCA:0000000000000000301F481284128412E4129412941264120000000000000000 +0BCB:0000000000000000301F4812B01280128012B012481230120000000000000000 +0BCC:0000000000000000301F482A844A84CAE4AA94AA94AA644A0000000000000000 +0BCD:0300030000000000000000000000000000000000000000000000000000000000 +0BCE:00007FFE738E6DB66D8E6DB6738E7FFE7FFE71866FBE6F8E6FBE71867FFE0000 +0BCF:00007FFE738E6DB66D8E6DB6738E7FFE7FFE71866FBE6F8E6FBE71BE7FFE0000 +0BD0:0000000000000FF0300C400280018001E01D9025942961261AA0279E20041FF8 +0BD1:00007FFE738E6DB66D8E6DB6738E7FFE7FFE63EE6DCE6DEE6DEE63C67FFE0000 +0BD2:00007FFE738E6DB66D8E6DB6738E7FFE7FFE63866DF66D866DBE63867FFE0000 +0BD3:00007FFE738E6DB66D8E6DB6738E7FFE7FFE638E6DF66DC66DF6638E7FFE0000 +0BD4:00007FFE738E6DB66D8E6DB6738E7FFE7FFE63B66DB66D866DF663F67FFE0000 +0BD5:00007FFE738E6DB66D8E6DB6738E7FFE7FFE63866DBE6D866DF663867FFE0000 +0BD6:00007FFE738E6DB66D8E6DB6738E7FFE7FFE63CE6DBE6D8E6DB663CE7FFE0000 +0BD7:0000000000000000001F002A004A00CA00AA00AA00AA004A0000000000000000 +0BD8:00007FFE738E6DB66D8E6DB6738E7FFE7FFE63CE6DB66DCE6DB663CE7FFE0000 +0BD9:00007FFE738E6DB66D8E6DB6738E7FFE7FFE63CE6DB66DC66DF663CE7FFE0000 +0BDA:00007FFE738E6DB66D8E6DB6738E7FFE7FFE63866DB66D866DB663B67FFE0000 +0BDB:00007FFE738E6DB66D8E6DB6738E7FFE7FFE638E6DB66D8E6DB6638E7FFE0000 +0BDC:00007FFE738E6DB66D8E6DB6738E7FFE7FFE63C66DBE6DBE6DBE63C67FFE0000 +0BDD:00007FFE738E6DB66D8E6DB6738E7FFE7FFE638E6DB66DB66DB6638E7FFE0000 +0BDE:00007FFE738E6DB66D8E6DB6738E7FFE7FFE63866DBE6D8E6DBE63867FFE0000 +0BDF:00007FFE738E6DB66D8E6DB6738E7FFE7FFE63866DBE6D8E6DBE63BE7FFE0000 +0BE0:00007FFE738E6DB66D8E6DB6738E7FFE7FFE61CE6FB663B66FB661CE7FFE0000 +0BE1:00007FFE738E6DB66D8E6DB6738E7FFE7FFE61EE6FCE63EE6FEE61C67FFE0000 +0BE2:00007FFE738E6DB66D8E6DB6738E7FFE7FFE61866FF663866FBE61867FFE0000 +0BE3:00007FFE738E6DB66D8E6DB6738E7FFE7FFE618E6FF663C66FF6618E7FFE0000 +0BE4:00007FFE738E6DB66D8E6DB6738E7FFE7FFE61B66FB663866FF661F67FFE0000 +0BE5:00007FFE738E6DB66D8E6DB6738E7FFE7FFE61866FBE63866FF661867FFE0000 +0BE6:0000000000000000018002400420042004200420024001800000000000000000 +0BE7:00000000000000000FE00880088008803FE0409040903F200000000000000000 +0BE8:00000000000000001C0022004100410022003C0040003FF00000000000000000 +0BE9:00000000000000003F802200220022C023202220204023FC0000000000000000 +0BEA:00000000000000000FE40884088408843FFC408040803F000000000000000000 +0BEB:000000000000000013F82220422042204220423842244224400420081FF00000 +0BEC:00000000000000000FE00880088008803FFE40A440A43F240000000000000000 +0BED:000000000000000007FC081010101C102210221022101C100000000000000000 +0BEE:0000000000000E0011101090085006503FF0405020901F100000000000000000 +0BEF:00000000000000000FC009000900091C3FE24132412A3E120000000000000000 +0BF0:000003800040002022202220222022202220222022201DC00000000000000000 +0BF1:00000000000000001BF826202220222022202220222022200000000000000000 +0BF2:00000000000000000FE00880088008803FFC409040903F780054003400040078 +0BF3:00000000000000001C0023004080408070804880490033F00000000000000000 +0BF4:007000C800AE00C021C02220222022202220222022203FC00000000000000000 +0BF5:000000003FFC40029C3AA252A154A155B152A958AA5493D4800440083FF00000 +0BF6:000000000000000010241024102410241024102410241FE4002407FC082007C0 +0BF7:00000000000000000F801200220032604A904BC84AA8324E0000000000000000 +0BF8:00000000000000003E024105808583C5E4A2949594A5633E0008001000000000 +0BF9:0E0011003C8052F04C0047E0484048404840487048484848400820101FE00000 +0BFA:0038004400F2014B01300F8011001100110011C011201120002000401F802000 +0BFB:00007FFE738E6DB66D8E6DB6738E7FFE7FFE618E6FB6638E6FB66F8E7FFE0000 +0BFC:00007FFE738E6DB66D8E6DB6738E7FFE7FFE61C66FBE63BE6FBE6FC67FFE0000 +0BFD:00007FFE738E6DB66D8E6DB6738E7FFE7FFE618E6FB663B66FB66F8E7FFE0000 +0BFE:00007FFE738E6DB66D8E6DB6738E7FFE7FFE61866FBE638E6FBE6F867FFE0000 +0BFF:00007FFE738E6DB66D8E6DB6738E7FFE7FFE61866FBE638E6FBE6FBE7FFE0000 +0C00:000001800990042003C000000000000000000000000000000000000000000000 +0C01:0000000000000000000000010002000400040004000200010000000000000000 +0C02:0000000000000000000000000006000900090006000000000000000000000000 +0C03:0000000000000000000200050005000200000002000500050002000000000000 +0C04:0000018002400180000000000000000000000000000000000000000000000000 +0C05:00000000000000000C60129032482CC82008200810100FE00000000000000000 +0C06:00000000000000000C10122832282CF02010201010200FC00000000000000000 +0C07:00000000000000003B804440444000401E8021001E8000400040004000000000 +0C08:00000000000000004200240018603C9042207FE042903C600000000000000000 +0C09:00000000010001000FE0101020007FF84000406022901DE00000000000000000 +0C0A:00000000050005001F8820444008FFF88014808845403B800000000000000000 +0C0B:000000000000000064909248124822484248824892486DB00000000000000000 +0C0C:00000000000000001B0024802480011002100210022001C00000000000000000 +0C0D:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE738E6DB66DB66DB6738E7FFE0000 +0C0E:0000000000000000002000100008000800080E0813100CE00000000000000000 +0C0F:000000000000020004E008100808000800080E0813100CE00000000000000000 +0C10:00000000000000000EE011101108000800080E0813100CE00000000000000000 +0C11:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE7BEE73CE7BEE7BEE71C67FFE0000 +0C12:00000000000000000C001200120004000800100011100EE00000000000000000 +0C13:00000600090004000C001200120004000800100011100EE00000000000000000 +0C14:00003FE001503E200C001200120004000800100011100EE00000000000000000 +0C15:0000002002400180018002400200018000400020082007C00000000000000000 +0C16:00000000000000003000480034800440042034204C4037800400000000000000 +0C17:0000000000000000088005000200050005000880088008800000000000000000 +0C18:00000000000000000000040049303088004830484C9037600400000000000000 +0C19:00000000000000000C40124013F004000800100011100EE00000000000000000 +0C1A:000000000010002001C001A0001000087808090813900C600000000000000000 +0C1B:000000000010002001C001A0001000087808090813900D600100000000000000 +0C1C:00000000000000000C40132012C004000800100011100EE00000000000000000 +0C1D:00000080210012000C901248124812481248124812E80D500040000000000000 +0C1E:00000000000000001B00248024A000F000801D0022001D000100010000000000 +0C1F:000000001000100018C02420582040104010401022101DE00000000000000000 +0C20:000000000000000010400880070008801040124010400F800000000000000000 +0C21:00000020084004800F001200210040804000406022901DE00000000000000000 +0C22:00000020084004800F001200210040804000406022901FE00200000000000000 +0C23:00000000000000000C601290210820081808203822481C300000000000000000 +0C24:0008011000A000400C6012902C6820082008200810100FE00000000000000000 +0C25:000000000000000010400880070008801240104012400F800200000000000000 +0C26:000000000000000010400880070008801040104012400D800000000000000000 +0C27:000000000000000010400880070008801040104012400F800200000000000000 +0C28:008001001A001C00038000400020001018102410222011C00000000000000000 +0C29:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE61CE7DB661C66FF661CE7FFE0000 +0C2A:004000800900060000E000100008000800080E0813100CE00000000000000000 +0C2B:004000800900060000E000100008000800080E0813100DE00100000000000000 +0C2C:000000000000000030C04820081010082008210812900C600000000000000000 +0C2D:00000004000800D030E04820081010082008210812900C600100000000000000 +0C2E:00400080010006000730008800480048004838484CC833300000000000000000 +0C2F:004000800D0002000130008830484848484848484CC833300000000000000000 +0C30:000000000000000010400880070008801040104010400F800000000000000000 +0C31:00000000000000000C60129032882FC82008200810100FE00000000000000000 +0C32:000000000000000018C02420641058104010402020401F800000000000000000 +0C33:0008001001A001C00040182024102C1010200FC0090006000000000000000000 +0C34:000000000000000018C02520653058D04010421022201DC00000000000000000 +0C35:000000100020004001E001900008000800080E0813100CE00000000000000000 +0C36:00000040008001000780064000200E2011401380048003000000000000000000 +0C37:004000800900060000E000100008000800080E0813100CE00010000800040000 +0C38:004000800500020000E000100008000800080E08131010E00000000000000000 +0C39:040008005000200007F8022801100080008038804C8033000000000000000000 +0C3A:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE63867DB671867DB663B67FFE0000 +0C3B:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE638E7DB6718E7DB6638E7FFE0000 +0C3C:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE63C67DBE71BE7DBE63C67FFE0000 +0C3D:0000000000000000000007000080008003000400040003F80000000000000000 +0C3E:000000000000000000FF00050002000000000000000000000000000000000000 +0C3F:0180024001C00780000000000000000000000000000000000000000000000000 +0C40:04000980064001C0078000000000000000000000000000000000000000000000 +0C41:0000000000000000000000060001000100010001000900060000000000000000 +0C42:000000000000000000FF002500120008000400020012000C0000000000000000 +0C43:0000000000000000000000060001000100010005000B00060000000000000000 +0C44:0000000000000000001F0011000800040002000A0016000C0000000000000000 +0C45:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE6D866DBE61867DF67D867FFE0000 +0C46:0FC00020002000C0000000000000000000000000000000000000000000000000 +0C47:006000800FC0002000C000000000000000000000000000000000000000000000 +0C48:0FC00020002000C000000000000000000000000000000000000004000A000FF0 +0C49:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE6DCE6DB661C67DF67DCE7FFE0000 +0C4A:000037E008900060000000000000000000000000000000000000000000000000 +0C4B:0030004837E04850002000000000000000000000000000000000000000000000 +0C4C:00003FE004903860000000000000000000000000000000000000000000000000 +0C4D:0F0010000C0010000C0000000000000000000000000000000000000000000000 +0C4E:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE6D866DBE618E7DBE7D867FFE0000 +0C4F:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE6D866DBE618E7DBE7DBE7FFE0000 +0C50:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE61CE6FB661B67DB661CE7FFE0000 +0C51:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE61EE6FCE61EE7DEE61C67FFE0000 +0C52:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE61866FF661867DBE61867FFE0000 +0C53:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE618E6FF661C67DF6618E7FFE0000 +0C54:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE61B66FB661867DF661F67FFE0000 +0C55:0060009000480000000000000000000000000000000000000000000000000000 +0C56:000000000000000000000000000000000000000000000000000004000A000FF0 +0C57:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE61866FF661EE7DDE61DE7FFE0000 +0C58:010002807F90002001C001A0001000087808090813900C600000000000000000 +0C59:004000A01FE000000C40132012C004000800100011100EE00000000000000000 +0C5A:00000000000007C00820101010101FF01110111011100EE00000000000000000 +0C5B:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE618E6FB6618E7DB6618E7FFE0000 +0C5C:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE61C66FBE61BE7DBE61C67FFE0000 +0C5D:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE618E6FB661B67DB6618E7FFE0000 +0C5E:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE61866FBE618E7DBE61867FFE0000 +0C5F:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE61866FBE618E7DBE61BE7FFE0000 +0C60:0000000000000000493EA4952492249044908490A4905B600000000000000000 +0C61:00000000000000001B3E24A524A2011002100210022001C00000000000000000 +0C62:00000000000000000000000000000000000000000000000006C0092800280010 +0C63:0000000000000000000000000000000000000000000000001B3824B400A80040 +0C64:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE73B66FB663866DF673F67FFE0000 +0C65:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE73866FBE63866DF673867FFE0000 +0C66:0000000000000000018002400420042004200420024001800000000000000000 +0C67:000000000000000003C004200810081008100810042002400000000000000000 +0C68:0000000000000000000000E0011001480088000800103FE00000000000000000 +0C69:000000000000000001E00210021000E000100210021001E00000000000000000 +0C6A:0000000000000000042008100810042003C00420042003C00000000000000000 +0C6B:00000000000000000004030400C8003000300048008807100000000000000000 +0C6C:00000000000000003800400040003F004000400020001FF80000000000000000 +0C6D:000000000000000001C002200420004003880408041003E00000000000000000 +0C6E:000000000000000010FC2080404040404040404020801F000000000000000000 +0C6F:00000000000000001FF82000400040003F004000400038000000000000000000 +0C70:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE61CE7DB67BB677B677CE7FFE0000 +0C71:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE61EE7DCE7BEE77EE77C67FFE0000 +0C72:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE61867DF67B8677BE77867FFE0000 +0C73:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE618E7DF67BC677F6778E7FFE0000 +0C74:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE61B67DB67B8677F677F67FFE0000 +0C75:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE61867DBE7B8677F677867FFE0000 +0C76:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE61CE7DBE7B8E77B677CE7FFE0000 +0C77:000000000000000001E0021024C82528142812480990042003C0000000000000 +0C78:000000000000000003C0042004200420042003C0002000100060018000000000 +0C79:0000000000000000008000800080008000800080008000800000000000000000 +0C7A:0000000000000000022002200220022001E00020002000200000000000000000 +0C7B:0000000000000000092009200920092006E00020002000200000000000000000 +0C7C:000000000000000000000000000000000000000000001FF80000000000000000 +0C7D:000000000000000007C00020002001C002000400040003F80000000000000000 +0C7E:0000000000000700008003000400030000800300040003F80000000000000000 +0C7F:0000000000000000060009001608100810101010082007C00000000000000000 +0C80:0000000000000000000000000990042003C00000000000000000000000000000 +0C81:0990042003C00000000000000000000000000000000000000000000000000000 +0C82:0000000000000000000000000006000900090006000000000000000000000000 +0C83:0000000000000000000200050005000200000002000500050002000000000000 +0C84:0000000000000000000003F0040808C8492448242444238810100FE000000000 +0C85:00000000000000000C60129032482CE82008200810100FE00000000000000000 +0C86:00000000000000000C30124832282CF02008200810100FE00000000000000000 +0C87:00000000000000003B804440444000401E8021001E8000400040004000000000 +0C88:000000000000000002000200FE603C9042607FE042203C400000000000000000 +0C89:00000000000000004620A910A910C91089108910492030C00000000000000000 +0C8A:0000000000000000461CA922A922C9228926892A492A30C40000000000000000 +0C8B:000000000080008067909088684408440844684494A463180000000000000000 +0C8C:00000000000000001B0024802480008001000110011000E00000000000000000 +0C8D:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE738E6DB673B66DB6738E7FFE0000 +0C8E:00000000000000003E000180004000202010510842883C700000000000000000 +0C8F:000000000000200010000980064000202010510842883C700000000000000000 +0C90:00000000000000001C602290410800082008510842883C700000000000000000 +0C91:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE73EE6DCE71EE7DEE73C67FFE0000 +0C92:000000000000000030004800480010202010410842883C700000000000000000 +0C93:000000001800200030004800480010202010410842883C700000000000000000 +0C94:7FE0021002107C90312048C0480010202010410842883C700000000000000000 +0C95:0000000000C000201FC0020002001FC00880104010400F800000000000000000 +0C96:00000000000000000E2011102088208401040F0412840C780000000000000000 +0C97:000000E0001000103FE004400820082008200820082008200000000000000000 +0C98:0000000007000080FF200010020860289030622027201AC00200000000000000 +0C99:000000000000000033F04C08483011002010410842883C700000000000000000 +0C9A:000000000030000860F09080904020E0404084408A4071800000000000000000 +0C9B:000000000030000860F090809040E040804084408E4075800400000000000000 +0C9C:0000000000000000318048404F80100020404220452038C00000000000000000 +0C9D:00000E0001003E001C902248224822482248224822E81D500040000000000000 +0C9E:00000000000000001B6024902490008000801D0022001D000100010000000000 +0C9F:0000000000000000102018C0242058104010401022101DE00000000000000000 +0CA0:000000000000038000401F80070008801040124010400F800000000000000000 +0CA1:000000000000038000407FC0212040E040104210251018E00000000000000000 +0CA2:000000000000038000407FC0212040E04010421027101AE00200000000000000 +0CA3:000000000000000018E025104208400820884148415030E00000000000000000 +0CA4:0000000001C000200FC00020001010D0112008D0041003E00000000000000000 +0CA5:000000000000038000401F80070008801240104012400F800200000000000000 +0CA6:000000000000038000401F80070008801040104012400D800000000000000000 +0CA7:000000000000038000401F80070008801040104012400F800200000000000000 +0CA8:0000000000E0001007E000400020001018102410222011C00000000000000000 +0CA9:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE61CE6DB661C66DF66DCE7FFE0000 +0CAA:0000000000E000101FE00000202051105008610842883C700000000000000000 +0CAB:0000000000E000101FE00000202051105008610842883D700100000000000000 +0CAC:000000000000000030C04820081010082008210812900C600000000000000000 +0CAD:000000000070000831F04840082010102008210812900D600100000000000000 +0CAE:00000000038000403F8000004090A048A048C4488A4871B00000000000000000 +0CAF:00000000000000C0002033C048908448844884488A4871B00000000000000000 +0CB0:000000000000038000401F80070008801040104010400F800000000000000000 +0CB1:00000000000000000C60129032983FF82008210812900C600000000000000000 +0CB2:000000000000000001003080484070204020402020401F800000000000000000 +0CB3:000000000060001001E03080484070204020402020401F800900060000000000 +0CB4:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE63B66DB663866DF663F67FFE0000 +0CB5:0000000000000030000803F0202050105008610842883C700000000000000000 +0CB6:0000000001C000207FC030804840442024200420044003800000000000000000 +0CB7:0000000000C000200FC00000202051105008612842983C740000000000000000 +0CB8:00000000018000400F800000042000100E101110209020600000000000000000 +0CB9:0000000000E0001007E0008002A005D008880888049003600000000000000000 +0CBA:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE63866DB663866DB663B67FFE0000 +0CBB:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE638E6DB6638E6DB6638E7FFE0000 +0CBC:0000000000000000000000000000000000000000000000000000000002400000 +0CBD:000000000000000003800400080004000300008010800F000000000000000000 +0CBE:000000000000001C000200010001000500090009000600000000000000000000 +0CBF:00180024001C0008003000000000000000000000000000000000000000000000 +0CC0:00180024001C0008003200050005000600040004000400040002000000000000 +0CC1:0000000000000000000000040002000100010001000900060000000000000000 +0CC2:00000000000000000000000600090009000B000B000B00080008003000000000 +0CC3:000000000000000000000000000000000000000C000200010001000D000D0006 +0CC4:00000000000000000000007E0021001500160010000C00020001000D000D0006 +0CC5:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE71866FBE6F866FF671867FFE0000 +0CC6:0018002400040FF8000000000000000000000000000000000000000000000000 +0CC7:0018002400040FF8000200050005000600040004000400040002000000000000 +0CC8:0018002400040FF8000000000000000000040002000400020001000D000D0006 +0CC9:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE71CE6FB66FC66FF671CE7FFE0000 +0CCA:0018002400040FF80000000600090009000B000B000B00080008003000000000 +0CCB:0063009300120FE20001000700090009000B000B000B00080008003000000000 +0CCC:00FC001200E20001000100010001000500090009000600000000000000000000 +0CCD:00000003000400FE000500020000000000000000000000000000000000000000 +0CCE:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE71866FBE6F8E6FBE71867FFE0000 +0CCF:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE71866FBE6F8E6FBE71BE7FFE0000 +0CD0:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE63CE6DB66DB66DB663CE7FFE0000 +0CD1:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE63EE6DCE6DEE6DEE63C67FFE0000 +0CD2:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE63866DF66D866DBE63867FFE0000 +0CD3:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE638E6DF66DC66DF6638E7FFE0000 +0CD4:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE63B66DB66D866DF663F67FFE0000 +0CD5:0000000000000000000200050005000600040004000400040002000000000000 +0CD6:0000000000000000000000000000000000040002000400020001000D000D0006 +0CD7:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE63866DF66DEE6DDE63DE7FFE0000 +0CD8:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE63CE6DB66DCE6DB663CE7FFE0000 +0CD9:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE63CE6DB66DC66DF663CE7FFE0000 +0CDA:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE63866DB66D866DB663B67FFE0000 +0CDB:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE638E6DB66D8E6DB6638E7FFE0000 +0CDC:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE63C66DBE6DBE6DBE63C67FFE0000 +0CDD:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE638E6DB66DB66DB6638E7FFE0000 +0CDE:00000000000000000C60129032982C682008200811100EE00000000000000000 +0CDF:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE63866DBE6D8E6DBE63BE7FFE0000 +0CE0:00000000004000400F80620E9111711111137115999566620000000000000000 +0CE1:00000000000000001B0024802480010001400088009000600000000000000000 +0CE2:00000000000000000000000000000000000000000000000006C0092008200418 +0CE3:0000000000000000000000000000000000000000000000000D80124C1050083C +0CE4:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE61B66FB663866FF661F67FFE0000 +0CE5:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE61866FBE63866FF661867FFE0000 +0CE6:0000000000000000018002400420042004200420024001800000000000000000 +0CE7:000000000000000003C004200810081008100810042002400000000000000000 +0CE8:000000000000000000E00110013000D000100010001007E00000000000000000 +0CE9:00000000000000000F00128012400C400E40114810900F600000000000000000 +0CEA:0000000000000000062009100E10042003C00420042003C00000000000000000 +0CEB:000000000000000000181C24232410F807E0191022101C600000000000000000 +0CEC:000000000000100008003E00490049004600400020001FF80000000000000000 +0CED:0000000000000000018002400140008007000800080007F00000000000000000 +0CEE:00000000000000000610092011201E1010101010082007C00000000000000000 +0CEF:000000000000000007FE0800100010000FC0100010000E000000000000000000 +0CF0:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE61CE6FB663B66FB66FCE7FFE0000 +0CF1:AAAA000180001FF188200441828001018280044188201FF18000000180005555 +0CF2:AAAA000180000001800000019C702289A28822899C7000018000000180005555 +0CF3:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE618E6FF663C66FF66F8E7FFE0000 +0CF4:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE61B66FB663866FF66FF67FFE0000 +0CF5:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE61866FBE63866FF66F867FFE0000 +0CF6:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE61CE6FBE638E6FB66FCE7FFE0000 +0CF7:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE61866FF663EE6FDE6FDE7FFE0000 +0CF8:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE61CE6FB663CE6FB66FCE7FFE0000 +0CF9:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE61CE6FB663C66FF66FCE7FFE0000 +0CFA:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE61866FB663866FB66FB67FFE0000 +0CFB:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE618E6FB6638E6FB66F8E7FFE0000 +0CFC:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE61C66FBE63BE6FBE6FC67FFE0000 +0CFD:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE618E6FB663B66FB66F8E7FFE0000 +0CFE:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE61866FBE638E6FBE6F867FFE0000 +0CFF:00007FFE73C66DBE6DBE6DBE73C67FFE7FFE61866FBE638E6FBE6FBE7FFE0000 +0D00:0180024002400180000000000000000000000000000000000000000000000000 +0D01:000001800990042003C000000000000000000000000000000000000000000000 +0D02:0000000000000000000000000006000900090006000000000000000000000000 +0D03:0000000000000000000200050005000200000002000500050002000000000000 +0D04:0000000000000000010009201110111011101010082007C00000000000000000 +0D05:00000000000000001E3021487C84A284BC9CA2A4A2A41C980000000000000000 +0D06:00000000000000001E32214D7C8DA295BCA5A2A5A2A51C990001003E00000000 +0D07:000000000000000018C025204210421072104A104A10321000103FE040003FE0 +0D08:000000000000000074508AA88AA88AA8CA08AA48AA30420002007C0080007C00 +0D09:00000000000000000F00128012400C4000400F8010001FC00000000000000000 +0D0A:00000000000000001C502AA82AA812A802081C4820303E000000000000000000 +0D0B:00000000000000000C6012901C701010082007C0082007C00000000000000000 +0D0C:00000000000000000C6012902128214839482548254819300000000000000000 +0D0D:00007FFE738E6DB66DB66DB6738E7FFE7FFE738E6DB66DB66DB6738E7FFE0000 +0D0E:0000000000F001087128892889285FE801280128012800C00000000000000000 +0D0F:0000000001E0021072888A888A885F9002880288028801300000000000000000 +0D10:00000000000E00117395AC55AC554AFD08150015001500080000000000000000 +0D11:00007FFE738E6DB66DB66DB6738E7FFE7FFE7BEE73CE7BEE7BEE71C67FFE0000 +0D12:0000000000000000078008401020201020103C2022101C600000000000000000 +0D13:00000000000000000E181124210420842084310428A413180000000000000000 +0D14:00000000000000001C2822544254415441046224511826000000000000000000 +0D15:00000000000000000380044004401FF02448244824481B900000000000000000 +0D16:00000000000000001E0421044084404470444844488431FC0000000000000000 +0D17:000000000000000000000000187020884104410422081C700000000000000000 +0D18:00000000000000000072008A388A448A448A2FFA008200FE0000000000000000 +0D19:000000000000000018E025104208420872704A084A0832700000000000000000 +0D1A:000000000000000000080008000806080908010802083FF80000000000000000 +0D1B:00000000000000000030004800840C84128C029404543FC80000000000000000 +0D1C:00000000000000003EE041107110491030203FF040C83F300000000000000000 +0D1D:00000000000000003C245E22A522A52299228122412400D80000000000000000 +0D1E:000000000000000018C025384254429472944A944A9432600000000000000000 +0D1F:0000000000000000000007C00800080007C00020002007C00000000000000000 +0D20:000000000000000007C008201010101010101010082007C00000000000000000 +0D21:000000000000000000000C4812442244224422441244024801B0000000000000 +0D22:00000000000000000000189024A824A824A824A8049804900360000000000000 +0D23:000000000000000019B0264842484248424872484A4832500000000000000000 +0D24:00000000000000000CF013082284244424242424224411880000000000000000 +0D25:000000000000000040F04108410841084108410841087FF80000000000000000 +0D26:000000000000000007C00820102011C010201020122009C00000000000000000 +0D27:000000000000000009201110210821082108210811100EE00000000000000000 +0D28:00000000000000000EE011102108210821082108111009200000000000000000 +0D29:00000000000000000CE013102108390825082508251019200000000000000000 +0D2A:000000000000000000080008000800083808440844082FF80000000000000000 +0D2B:000000000000000000700088008800883888448844882FF80000000000000000 +0D2C:00000000000000001988264842484248424872484A4832780000000000000000 +0D2D:000000000000000007C00820102011C0120011C010200BC00000000000000000 +0D2E:000000000000000007E0091010881088110812081C081FF80000000000000000 +0D2F:000000000000000011882A44242424242444228413080CF00000000000000000 +0D30:00000000000000000F0010C020A0211021082108209010600000000000000000 +0D31:000000000000000007C008201010101010101010101008200000000000000000 +0D32:00000000000000000C081208210821083F08200820083FF80000000000000000 +0D33:00000000000000000FC01020202038C02420182000200FC010000FF000000000 +0D34:000000000000000010E011101110092007C0010011000E000000000000000000 +0D35:00000000000000001E0821084088408840884088410823F80000000000000000 +0D36:00000000000000000870108821042104211C212412240C180000000000000000 +0D37:0000000000000000031804A804C803883888448844882FF80000000000000000 +0D38:0000000000000000361049088888888888888888889048E00000000000000000 +0D39:000000000000000000E001100208020872088A0889105F200000000000000000 +0D3A:000000000000000010001000100010001000100010001FF80100010000000000 +0D3B:0080008000800080008000000000000000000000000000000000000000000000 +0D3C:000C00120012000C000000000000000000000000000000000000000000000000 +0D3D:0000001000280028004000400040004000400040004002800280010000000000 +0D3E:0000000000000000000600090001000100010001000900060000000000000000 +0D3F:0000000600090009000100010001000100010001000100010000000000000000 +0D40:0006000900070001000100010001000100010001000100010000000000000000 +0D41:00000000000000000000000600090001000200040004000A0004000000000000 +0D42:00000000000000000000000600090001000200040004000A00150011000E0000 +0D43:0000000000000000000100020004000400040002000100010001001F0021001E +0D44:000000000000000000010002000400040004000200010001000100DD012500FE +0D45:00007FFE738E6DB66DB66DB6738E7FFE7FFE6D866DBE61867DF67D867FFE0000 +0D46:00000000000000007000880088008800C800A800A80048001000000000000000 +0D47:000000000000000060009000E00080008000E000900060000000000000000000 +0D48:0000000000000000D800B400B400B40090009000D800D8000000000000000000 +0D49:00007FFE738E6DB66DB66DB6738E7FFE7FFE6DCE6DB661C67DF67DCE7FFE0000 +0D4A:00000000000000007006880988018801C801A801A80948061000000000000000 +0D4B:000000000000000060069009E00180018001E001900960060000000000000000 +0D4C:0000000000000000700A881588158801C802A804A80048001000000000000000 +0D4D:001200210021001E000000000000000000000000000000000000000000000000 +0D4E:0000000000000180018000000000000000000000000000000000000000000000 +0D4F:00000000000000002660499050885C885288528852884C8820101FE000000000 +0D50:00007FFE738E6DB66DB66DB6738E7FFE7FFE61CE6FB661B67DB661CE7FFE0000 +0D51:00007FFE738E6DB66DB66DB6738E7FFE7FFE61EE6FCE61EE7DEE61C67FFE0000 +0D52:00007FFE738E6DB66DB66DB6738E7FFE7FFE61866FF661867DBE61867FFE0000 +0D53:00007FFE738E6DB66DB66DB6738E7FFE7FFE618E6FF661C67DF6618E7FFE0000 +0D54:00000000000010001600090014801280110012C01C301FF80000000000000000 +0D55:00000000001011282AA024A024A024A022A013200CC000000000000000000000 +0D56:000000001800240004E04510491039200FC0110011000E000000000000000000 +0D57:0000000000000000000A00150015000100020004000000000000000000000000 +0D58:0000000000E000100A481248224822482248224812500DA00000000000000000 +0D59:00000000000000001C0022304148414847F04900490026000000000000000000 +0D5A:00000000000000000DF01248222822282228222812480AF80000000000000000 +0D5B:00000000000000007F1042084408440844084408421041E00000000000000000 +0D5C:000000000000004011202AA02AA02AA02AA02AA02AA024401000000000000000 +0D5D:000000000000001004482AA82AA82AA82AA82AA82AA851100000000000000000 +0D5E:0000000000000000180024C042A842A84F10520052004C002000000000000000 +0D5F:00000000000000000300048009404A24AA2AAA2A492404C00000000000000000 +0D60:0000000000000000186024905868400820101FE02010249020101FE000000000 +0D61:000000000000000018C025384254429472944A944A9432640004004800300000 +0D62:0000000000000000000000000000000000000000000000001EF0393825481930 +0D63:000000000000000000000000000000000000000000001EF039382548183800F0 +0D64:00007FFE738E6DB66DB66DB6738E7FFE7FFE73B66FB663866DF673F67FFE0000 +0D65:00007FFE738E6DB66DB66DB6738E7FFE7FFE73866FBE63866DF673867FFE0000 +0D66:00000000000000000000000003C004200420042003C000000000000000000000 +0D67:000000000000000000F00108010801080108010801081FF820001F0000000000 +0D68:00000000000000001E0021004080408040804080410023F80000000000000000 +0D69:00000000000000001B00248044404440444044404440247C0000000000000000 +0D6A:000000000000000006000100010007C009201120112010C00000000000000000 +0D6B:000000000000000007E008101188124812881248124808500780000000000000 +0D6C:00000000000000001B1824A44442444244424442444224420004000800100000 +0D6D:000000000000000003C004200810100810081E0811080E080010002001C00000 +0D6E:00000000000000001E0821084088408840884088410823F80008000800700000 +0D6F:00000000000000000380008000801BE024904490449024600000000000000000 +0D70:00000000000000000000024802440244024402440244024803B002003C000000 +0D71:00000000000000000EE0111021082108210811080010022001C0000000000000 +0D72:00000000000000001B84244A442A44FE4520452044A024400000000000000000 +0D73:00000000000000000000000000000FF810001C0012000C000000000000000000 +0D74:000001C0002000100FD010202050209038902490249018600000000000000000 +0D75:000000E0001000080C6812902128214839482548254819300000000000000000 +0D76:000000000000000000F001480228022872288A488B885FF80000000000000000 +0D77:0000000000000000033004CA048A049C64A894A894A89E904000000000000000 +0D78:000000000000000008BE554955455545554555455549A25F0000000000000000 +0D79:00000000000000001B802440442044FE4520452044A024400000000000000000 +0D7A:00000030004800041B742488449844A864A854A854A824900000000000000000 +0D7B:000000E0001000080C6812902128214821482148114809300000000000000000 +0D7C:000000C00020001007D008201050109010901090089004600000000000000000 +0D7D:000000E0001000081CE823104528494849484948494826300000000000000000 +0D7E:000000E00010000800681090212821482148214812480C300000000000000000 +0D7F:0000038004400020072008A008A03FF848A448A4489837000000000000000000 +0D80:00007FFE738E6DB66DB66DB6738E7FFE7FFE73CE6DB673B66DB673CE7FFE0000 +0D81:09900990042003C0000000000000000000000000000000000000000000000000 +0D82:0000000000000000000000000006000900090006000000000000000000000000 +0D83:0000000000000000000600090009000600000006000900090006000000000000 +0D84:00007FFE738E6DB66DB66DB6738E7FFE7FFE73B66DB673866DF673F67FFE0000 +0D85:0000000000000000031804A800680FF010201020082007E00020002000200020 +0D86:000000000000000018D8256403427F828102810241243F180100010001000100 +0D87:00000000000000000C4012A001BE3FC24084408420841F840084008400840083 +0D88:00000000000000000C4012A001BE3FC44088409E20821F840084008400840083 +0D89:000000000000000007C008201110129011100E60001000E00000000000000000 +0D8A:0800150009200250042007000880104010401040088007000000000000000000 +0D8B:00000000000000000180024000200FE01000101010200FC00000000000000000 +0D8C:0000000000000000062C092A00923F824012404C40803F000000000000000000 +0D8D:0000000000000000618092400A267BE9802184278A4971868001000000000000 +0D8E:00000000000000004200A500149277AD8089889B952D62120000000000000000 +0D8F:00000000000000001C382A5442424E72500A481227E410080FF0000000000000 +0D90:000000000000000071C0AAA08A36BBB5A0A9A0A19F2940463F80000000000000 +0D91:03800480038000800C8002403E2010202020202010400F800000000000000000 +0D92:03B804A403B800A00CA002603E2010202020202010400F800000000000000000 +0D93:001C0024001C00040064701289F18481B301B9018882707C0000000000000000 +0D94:0000000000003FE0401001C861A450244FC4400421081EF00000000000000000 +0D95:00007FC020203FF0401001C861A450244FC4400421081EF00000000000000000 +0D96:0000000000007F0080800E400D6CC16ABE5280428892770C0007000000000000 +0D97:00007FFE738E6DB66DB66DB6738E7FFE7FFE73866DF671EE7DDE73DE7FFE0000 +0D98:00007FFE738E6DB66DB66DB6738E7FFE7FFE73CE6DB671CE7DB673CE7FFE0000 +0D99:00007FFE738E6DB66DB66DB6738E7FFE7FFE73CE6DB671C67DF673CE7FFE0000 +0D9A:0000000000000000600093E08C100FC8102820284448BB900000000000000000 +0D9B:00000000000000001FE020100F081088204820482C901CE00100000000000000 +0D9C:000000000000000000000000278048408E208220444038800000000000000000 +0D9D:00000000000000003080494005407D8010402020272018C00000000000000000 +0D9E:000000003F8040401C201A1002103E104010401022201DC00000000000000000 +0D9F:00000000000000001C382A4442424E725012482227C41F880000000000000000 +0DA0:000000001F0020800C4002203E2010202020202010400F800000000000000000 +0DA1:00000020004000800CB002C83E78104C2032200210040FF80000000000000000 +0DA2:00000008001000200C2002703EA810A82070202010400F800000000000000000 +0DA3:0000000000000070E088900427C2782286428182C992B66C0000000000000000 +0DA4:000000000000000039F056288404987CA680C180C944B638000800100010000C +0DA5:000000000000000038385454848299BEA1E0C240C44C38340004000800080006 +0DA6:00000004000800101D902A3842544C545038601060201FC00000000000000000 +0DA7:00000000000000001F80204000201C202020202010400F800000000000000000 +0DA8:01C0024001C0004000400020001020104010401022201DC00000000000000000 +0DA9:000000001FC020200C1002083E0810082008200811100EE00000000000000000 +0DAA:01C0024001C00040184004207C1020104010401022201DC00000000000000000 +0DAB:0000000000F801001E002600390C355239B24152820CFC000000000000000000 +0DAC:000000001FC0202007100A88108813081408180811100EE00000000000000000 +0DAD:0000000000000000600093E08C100FC8102820284048BF900000000000000000 +0DAE:01C0024001C0004010402020401040104010401020201FC00000000000000000 +0DAF:0000000000000000000000C00120002007E00400043003D00010002000200018 +0DB0:000000000FC01020201000080C0810082008200811100EE00000000000000000 +0DB1:00000000000000E0611092088C040F04108420844124BE180000000000000000 +0DB2:00007FFE738E6DB66DB66DB6738E7FFE7FFE63866DF663866DBE63867FFE0000 +0DB3:00000000000000000380054008200BE00C000C00022001C00040008000800060 +0DB4:000000000000000000000610012803680C1810040C1803E00000000000000000 +0DB5:000000E0012000E000200620011003080C0810040C1803E00000000000000000 +0DB6:00000000000000001FE020100F081088204820482C901C600000000000000000 +0DB7:00000000000000003070488805047DC41044208421081E100000000000000000 +0DB8:0000000000001FE0201001C81A281AA8162813C8081007E00000000000000000 +0DB9:0000000000001FE0201001C81B281BE817E81008099006600000000000000000 +0DBA:000000000000000000000080014001C01040202022201DC00000000000000000 +0DBB:0000010001000200040007000880104010401040088007000000000000000000 +0DBC:00007FFE738E6DB66DB66DB6738E7FFE7FFE63C66DBE63BE6DBE63C67FFE0000 +0DBD:00000000000000000F801040272022482188201010200FC00000000000000000 +0DBE:00007FFE738E6DB66DB66DB6738E7FFE7FFE63866DBE638E6DBE63867FFE0000 +0DBF:00007FFE738E6DB66DB66DB6738E7FFE7FFE63866DBE638E6DBE63BE7FFE0000 +0DC0:00000000000000001FC02020461041100F101010082007C00000000000000000 +0DC1:00000000000000000000000027C048208E10825044A038400000000000000000 +0DC2:0000000000000C4002A00EE0102023502490231010200FC00000000000000000 +0DC3:00000000000000003080494005407D801040202022201DC00000000000000000 +0DC4:00000000000000003070488805041DC41044208421081E100000000000000000 +0DC5:000000000000000006C0092008201FE0180A17F210040FF80000000000000000 +0DC6:0000000000000000000000000EE011102008200810100C600000000000000000 +0DC7:00007FFE738E6DB66DB66DB6738E7FFE7FFE71866FF66FEE6FDE71DE7FFE0000 +0DC8:00007FFE738E6DB66DB66DB6738E7FFE7FFE71CE6FB66FCE6FB671CE7FFE0000 +0DC9:00007FFE738E6DB66DB66DB6738E7FFE7FFE71CE6FB66FC66FF671CE7FFE0000 +0DCA:000E0009000E0008000800080008000000000000000000000000000000000000 +0DCB:00007FFE738E6DB66DB66DB6738E7FFE7FFE718E6FB66F8E6FB6718E7FFE0000 +0DCC:00007FFE738E6DB66DB66DB6738E7FFE7FFE71C66FBE6FBE6FBE71C67FFE0000 +0DCD:00007FFE738E6DB66DB66DB6738E7FFE7FFE718E6FB66FB66FB6718E7FFE0000 +0DCE:00007FFE738E6DB66DB66DB6738E7FFE7FFE71866FBE6F8E6FBE71867FFE0000 +0DCF:0000000000000000000000000006000900010001000900060000000000000000 +0DD0:0000000000000000003E00020004000400040004000400040004000300000000 +0DD1:000000000000000000000000000E000200040002000400040004000300000000 +0DD2:07F0080808080410000000000000000000000000000000000000000000000000 +0DD3:07F0084808480430000000000000000000000000000000000000000000000000 +0DD4:00000000000000000000000000000000000000000000000000000C1010100FF0 +0DD5:00007FFE738E6DB66DB66DB6738E7FFE7FFE63866DBE6D866DF663867FFE0000 +0DD6:00000000000000000000000000000000000000000000000000000C1010D00F30 +0DD7:00007FFE738E6DB66DB66DB6738E7FFE7FFE63866DF66DEE6DDE63DE7FFE0000 +0DD8:0000000000000000000000000006000900010007000900060001000000000000 +0DD9:00000000000000004000A000900090008000E000E000E0000000000000000000 +0DDA:000E0009000E00084008A008900890008000E000E000E0000000000000000000 +0DDB:00000000000000004800B400900090009000FC00FC00FC000000000000000000 +0DDC:00000000000000004000A000900690098001E001E009E0060000000000000000 +0DDD:000E0009000E00084008A008900E90098001E001E009E0060000000000000000 +0DDE:00000000000000004004A008900A900D8001E001E009E0060000000000000000 +0DDF:000000000000000000040008000A000D00010001000900060000000000000000 +0DE0:00007FFE738E6DB66DB66DB6738E7FFE7FFE61CE6FB663B66FB661CE7FFE0000 +0DE1:00007FFE738E6DB66DB66DB6738E7FFE7FFE61EE6FCE63EE6FEE61C67FFE0000 +0DE2:00007FFE738E6DB66DB66DB6738E7FFE7FFE61866FF663866FBE61867FFE0000 +0DE3:00007FFE738E6DB66DB66DB6738E7FFE7FFE618E6FF663C66FF6618E7FFE0000 +0DE4:00007FFE738E6DB66DB66DB6738E7FFE7FFE61B66FB663866FF661F67FFE0000 +0DE5:00007FFE738E6DB66DB66DB6738E7FFE7FFE61866FBE63866FF661867FFE0000 +0DE6:0000000007000880108010800FE00090009001E0008000800080008000800080 +0DE7:00000000000000001FC02020479049504950465020901F100000000000000000 +0DE8:00000000000000001F8C20524F2252A252A24CA221241E280000000000000000 +0DE9:00000000000000003E2C41529C92AA92AA92929244A238AC0000000000000000 +0DEA:0008001008201C702AA83298044018302008200810100FE00000000000000000 +0DEB:0000010003800540064000800300040004100260018000800080007000000000 +0DEC:0000000000000000000000000EE011102C7C228A12920C600000000000000000 +0DED:00000000000000000FE0102012400C4000400080008000840084007800000000 +0DEE:0000004000800100020004C00920121010101010082007C00000000000000000 +0DEF:07E00890086004001F8C20524F2252A252A24CA221241E280000000000000000 +0DF0:00007FFE738E6DB66DB66DB6738E7FFE7FFE61CE6FB663B66FB66FCE7FFE0000 +0DF1:00007FFE738E6DB66DB66DB6738E7FFE7FFE61EE6FCE63EE6FEE6FC67FFE0000 +0DF2:0000000000000000000000000012002D0009001B002D00120000000000000000 +0DF3:000000000000000000040008000A000D00010005000B00060000000000000000 +0DF4:0000000000000000000000000AA04AA4555425485014C0060000000000000000 +0DF5:00007FFE738E6DB66DB66DB6738E7FFE7FFE61866FBE63866FF66F867FFE0000 +0DF6:00007FFE738E6DB66DB66DB6738E7FFE7FFE61CE6FBE638E6FB66FCE7FFE0000 +0DF7:00007FFE738E6DB66DB66DB6738E7FFE7FFE61866FF663EE6FDE6FDE7FFE0000 +0DF8:00007FFE738E6DB66DB66DB6738E7FFE7FFE61CE6FB663CE6FB66FCE7FFE0000 +0DF9:00007FFE738E6DB66DB66DB6738E7FFE7FFE61CE6FB663C66FF66FCE7FFE0000 +0DFA:00007FFE738E6DB66DB66DB6738E7FFE7FFE61866FB663866FB66FB67FFE0000 +0DFB:00007FFE738E6DB66DB66DB6738E7FFE7FFE618E6FB6638E6FB66F8E7FFE0000 +0DFC:00007FFE738E6DB66DB66DB6738E7FFE7FFE61C66FBE63BE6FBE6FC67FFE0000 +0DFD:00007FFE738E6DB66DB66DB6738E7FFE7FFE618E6FB663B66FB66F8E7FFE0000 +0DFE:00007FFE738E6DB66DB66DB6738E7FFE7FFE61866FBE638E6FBE6F867FFE0000 +0DFF:00007FFE738E6DB66DB66DB6738E7FFE7FFE61866FBE638E6FBE6FBE7FFE0000 +0E00:00007FFE73866DBE6D8E6DBE73867FFE7FFE73CE6DB66DB66DB673CE7FFE0000 +0E01:0000000000003C426222222222220000 +0E02:00000000000064642444444444380000 +0E03:000000000000527212222222221C0000 +0E04:0000000000003C42425A7A6242420000 +0E05:000000000000344A425A7A6242420000 +0E06:000000000000527212222222726C0000 +0E07:0000000000000C0C04044424140C0000 +0E08:0000000000003C42021A1A0A0A0C0000 +0E09:0000000000003844046464242E360000 +0E0A:000000000002323412222222221C0000 +0E0B:000000000002527412222222221C0000 +0E0C:0000000000003945254545456F6D0000 +0E0D:000000000000324A2A4A4A4A6E620E00 +0E0E:0000000000003C4262222222667A1600 +0E0F:0000000000003C42622222226A6E1A00 +0E10:0000000000001E201C021A1A06022A16 +0E11:000000000000547A1222222222220000 +0E12:0000000000002955457575556F4D0000 +0E13:000000000000324A2A4A4A4A6F6B0000 +0E14:0000000000003C42425A5A4A72420000 +0E15:000000000000344A425A5A4A72420000 +0E16:0000000000003C426222222232320000 +0E17:000000000000646A3222222222220000 +0E18:0000000000003C407824242424180000 +0E19:0000000000006464244444444E360000 +0E1A:000000000000323212222222221C0000 +0E1B:000000000002023232122222221C0000 +0E1C:00000000000069694949494949360000 +0E1D:00000000000101696949494949360000 +0E1E:00000000000069692949494949360000 +0E1F:00000000000101696929494949360000 +0E20:0000000000003C426222222262620000 +0E21:000000000000626222222222726C0000 +0E22:000000000000626242324242423C0000 +0E23:0000000000003C40780404040C0C0000 +0E24:0000000000003C426222222232320200 +0E25:0000000000003C42021A262232320000 +0E26:0000000000003C426222222262620200 +0E27:0000000000003844040404040C0C0000 +0E28:000000000002023C425A7A6242420000 +0E29:0000000000006262222A2F22221C0000 +0E2A:0000000000033C42021A262232320000 +0E2B:0000000000006666242A322222220000 +0E2C:000000000001016A6929494949360000 +0E2D:0000000000003C4202626242427E0000 +0E2E:0000000000033C7A02626242427E0000 +0E2F:0000000000006C740404040404040000 +0E30:00000000000000343800343800000000 +0E31:000000313E0000000000000000000000 +0E32:00000000000038440404040404040000 +0E33:0000006060001C220202020202020000 +0E34:0000003C420000000000000000000000 +0E35:0000003A460000000000000000000000 +0E36:0000003E460000000000000000000000 +0E37:0000003A4E0000000000000000000000 +0E38:00000000000000000000000000000602 +0E39:00000000000000000000000000001A0E +0E3A:00000000000000000000000000000C0C +0E3B:00007FFE73866DBE6D8E6DBE73867FFE7FFE638E7DB6718E7DB6638E7FFE0000 +0E3C:00007FFE73866DBE6D8E6DBE73867FFE7FFE63C67DBE71BE7DBE63C67FFE0000 +0E3D:00007FFE73866DBE6D8E6DBE73867FFE7FFE638E7DB671B67DB6638E7FFE0000 +0E3E:00007FFE73866DBE6D8E6DBE73867FFE7FFE63867DBE718E7DBE63867FFE0000 +0E3F:00000000087C2A2A2A3C2A2A2A7C0800 +0E40:00000000000010101010101018180000 +0E41:00000000000024242424242436360000 +0E42:0000003E417C04040404040406060000 +0E43:00000038445434040404040406060000 +0E44:0000006C140404040404040406060000 +0E45:00000000000038440404040404040404 +0E46:0000000000006C720202020202020408 +0E47:023C40546C0000000000000000000000 +0E48:04040400000000000000000000000000 +0E49:18091E00000000000000000000000000 +0E4A:28556600000000000000000000000000 +0E4B:040E0400000000000000000000000000 +0E4C:010E0C00000000000000000000000000 +0E4D:00060600000000000000000000000000 +0E4E:030406080C0000000000000000000000 +0E4F:00000000000000003C425A5A423C0000 +0E50:000000000000003C42424242423C0000 +0E51:000000000000003C42425A3A023C0000 +0E52:000000000040404A56525A5A423C0000 +0E53:00000000000000344A4A4A4272720000 +0E54:000000000002023C40404C4C483E0000 +0E55:00000000001A163C40404C4C483E0000 +0E56:000000000000402C12020232323C0000 +0E57:000000000002022A5A4A4A4A6A6C0000 +0E58:000000000000033C40404656526E0000 +0E59:000000000002021A3450484864640000 +0E5A:0000000000006D750505050505050000 +0E5B:0000000000000000000000001800240040004000400242A22552180C00000000 +0E5C:00007FFE73866DBE6D8E6DBE73867FFE7FFE61C66FBE61BE7DBE61C67FFE0000 +0E5D:00007FFE73866DBE6D8E6DBE73867FFE7FFE618E6FB661B67DB6618E7FFE0000 +0E5E:00007FFE73866DBE6D8E6DBE73867FFE7FFE61866FBE618E7DBE61867FFE0000 +0E5F:00007FFE73866DBE6D8E6DBE73867FFE7FFE61866FBE618E7DBE61BE7FFE0000 +0E60:00007FFE73866DBE6D8E6DBE73867FFE7FFE73CE6FB663B66DB673CE7FFE0000 +0E61:00007FFE73866DBE6D8E6DBE73867FFE7FFE73EE6FCE63EE6DEE73C67FFE0000 +0E62:00007FFE73866DBE6D8E6DBE73867FFE7FFE73866FF663866DBE73867FFE0000 +0E63:00007FFE73866DBE6D8E6DBE73867FFE7FFE738E6FF663C66DF6738E7FFE0000 +0E64:00007FFE73866DBE6D8E6DBE73867FFE7FFE73B66FB663866DF673F67FFE0000 +0E65:00007FFE73866DBE6D8E6DBE73867FFE7FFE73866FBE63866DF673867FFE0000 +0E66:00007FFE73866DBE6D8E6DBE73867FFE7FFE73CE6FBE638E6DB673CE7FFE0000 +0E67:00007FFE73866DBE6D8E6DBE73867FFE7FFE73866FF663EE6DDE73DE7FFE0000 +0E68:00007FFE73866DBE6D8E6DBE73867FFE7FFE73CE6FB663CE6DB673CE7FFE0000 +0E69:00007FFE73866DBE6D8E6DBE73867FFE7FFE73CE6FB663C66DF673CE7FFE0000 +0E6A:00007FFE73866DBE6D8E6DBE73867FFE7FFE73866FB663866DB673B67FFE0000 +0E6B:00007FFE73866DBE6D8E6DBE73867FFE7FFE738E6FB6638E6DB6738E7FFE0000 +0E6C:00007FFE73866DBE6D8E6DBE73867FFE7FFE73C66FBE63BE6DBE73C67FFE0000 +0E6D:00007FFE73866DBE6D8E6DBE73867FFE7FFE738E6FB663B66DB6738E7FFE0000 +0E6E:00007FFE73866DBE6D8E6DBE73867FFE7FFE73866FBE638E6DBE73867FFE0000 +0E6F:00007FFE73866DBE6D8E6DBE73867FFE7FFE73866FBE638E6DBE73BE7FFE0000 +0E70:00007FFE73866DBE6D8E6DBE73867FFE7FFE61CE7DB67BB677B677CE7FFE0000 +0E71:00007FFE73866DBE6D8E6DBE73867FFE7FFE61EE7DCE7BEE77EE77C67FFE0000 +0E72:00007FFE73866DBE6D8E6DBE73867FFE7FFE61867DF67B8677BE77867FFE0000 +0E73:00007FFE73866DBE6D8E6DBE73867FFE7FFE618E7DF67BC677F6778E7FFE0000 +0E74:00007FFE73866DBE6D8E6DBE73867FFE7FFE61B67DB67B8677F677F67FFE0000 +0E75:00007FFE73866DBE6D8E6DBE73867FFE7FFE61867DBE7B8677F677867FFE0000 +0E76:00007FFE73866DBE6D8E6DBE73867FFE7FFE61CE7DBE7B8E77B677CE7FFE0000 +0E77:00007FFE73866DBE6D8E6DBE73867FFE7FFE61867DF67BEE77DE77DE7FFE0000 +0E78:00007FFE73866DBE6D8E6DBE73867FFE7FFE61CE7DB67BCE77B677CE7FFE0000 +0E79:00007FFE73866DBE6D8E6DBE73867FFE7FFE61CE7DB67BC677F677CE7FFE0000 +0E7A:00007FFE73866DBE6D8E6DBE73867FFE7FFE61867DB67B8677B677B67FFE0000 +0E7B:00007FFE73866DBE6D8E6DBE73867FFE7FFE618E7DB67B8E77B6778E7FFE0000 +0E7C:00007FFE73866DBE6D8E6DBE73867FFE7FFE61C67DBE7BBE77BE77C67FFE0000 +0E7D:00007FFE73866DBE6D8E6DBE73867FFE7FFE618E7DB67BB677B6778E7FFE0000 +0E7E:00007FFE73866DBE6D8E6DBE73867FFE7FFE61867DBE7B8E77BE77867FFE0000 +0E7F:00007FFE73866DBE6D8E6DBE73867FFE7FFE61867DBE7B8E77BE77BE7FFE0000 +0E80:00007FFE73866DBE6D8E6DBE73867FFE7FFE73CE6DB673B66DB673CE7FFE0000 +0E81:0000000000005C222222222222620000 +0E82:0000000000003C420418204C52220000 +0E83:00007FFE73866DBE6D8E6DBE73867FFE7FFE738E6DF673C66DF6738E7FFE0000 +0E84:0000000000003C424232424242320000 +0E85:00007FFE73866DBE6D8E6DBE73867FFE7FFE73866DBE73866DF673867FFE0000 +0E86:00000000000052AA8A12224A4A340000 +0E87:000000000000182C1404040404040438 +0E88:0000000000003C42021A260202020000 +0E89:0000000000003C4202622222225C0000 +0E8A:0000000000003C42640810204C720202 +0E8B:00007FFE73866DBE6D8E6DBE73867FFE7FFE738E6DB6738E6DB6738E7FFE0000 +0E8C:000000000000344A620418204C720202 +0E8D:000000000000324242324242423C0000 +0E8E:000000000000629292529292925C0000 +0E8F:0000000000003242423242425A240000 +0E90:0000000000003C424242422252220202 +0E91:000000000000A4EAAA2A4A4A4A320000 +0E92:00000000000052AAAA8A8A8A8A540000 +0E93:000000000000344A4A4A4A4A4A2A0000 +0E94:0000000000003C424242424252220000 +0E95:000000000000245A4242424242220000 +0E96:0000000000005C222222222222320202 +0E97:0000000000008C525252525252220000 +0E98:0000000000003E407C0262425A240000 +0E99:000000000000225222222222225C0000 +0E9A:000000000000225222424242423C0000 +0E9B:000002020202225222424242423C0000 +0E9C:000000000001668682828292926C0000 +0E9D:000002020202628282828292926C0000 +0E9E:00000000000042A242828292926C0000 +0E9F:00000202020242A242828292926C0000 +0EA0:0000000000006C925212121212320000 +0EA1:000000000000222222222222225C0000 +0EA2:000002020202324242224242423C0000 +0EA3:0000000000003C42403C0262423C0000 +0EA4:00007FFE73866DBE6D8E6DBE73867FFE7FFE61B66DB661866DF66DF67FFE0000 +0EA5:0000000000003C42020202324A240000 +0EA6:00007FFE73866DBE6D8E6DBE73867FFE7FFE61CE6DBE618E6DB66DCE7FFE0000 +0EA7:0000000000003C4202020242423C0000 +0EA8:00000000000038555E44344444340000 +0EA9:00000000000024542444555E44380000 +0EAA:0000000000003A44467A02324A440000 +0EAB:00000000000096494949494949310000 +0EAC:000000000000324C403C424252340000 +0EAD:0000000000003C4242463A0244380000 +0EAE:000000000000324C403C0262423C0000 +0EAF:00000000000022261A02040408081010 +0EB0:00000000000022523C0022523C000000 +0EB1:000000627C0000000000000000000000 +0EB2:00000000000018241404040404040000 +0EB3:000040A040000C120A02020202020000 +0EB4:00000038440000000000000000000000 +0EB5:0000003C460000000000000000000000 +0EB6:00000038540000000000000000000000 +0EB7:0000003C560000000000000000000000 +0EB8:00000000000000000000000000001808 +0EB9:00000000000000000000000000001A0C +0EBA:00000000000000000000000000000010 +0EBB:0000007C620000000000000000000000 +0EBC:0000000000000000000000000000324C +0EBD:0000000000003A241804040404644438 +0EBE:00007FFE73866DBE6D8E6DBE73867FFE7FFE63866DBE638E6DBE63867FFE0000 +0EBF:00007FFE73866DBE6D8E6DBE73867FFE7FFE63866DBE638E6DBE63BE7FFE0000 +0EC0:0000000000000C101010101018180000 +0EC1:000000000000668888888888CCCC0000 +0EC2:0000304C221804040404040406060000 +0EC3:00003844543404040404040406060000 +0EC4:0000804C340404040404040406060000 +0EC5:00007FFE73866DBE6D8E6DBE73867FFE7FFE71866FBE6F866FF671867FFE0000 +0EC6:0000000000006C525222020202020408 +0EC7:00007FFE73866DBE6D8E6DBE73867FFE7FFE71866FF66FEE6FDE71DE7FFE0000 +0EC8:10101000000000000000000000000000 +0EC9:32143800000000000000000000000000 +0ECA:29560000000000000000000000000000 +0ECB:081C0800000000000000000000000000 +0ECC:021C1800000000000000000000000000 +0ECD:00000814080000000000000000000000 +0ECE:00007FFE73866DBE6D8E6DBE73867FFE7FFE71866FBE6F8E6FBE71867FFE0000 +0ECF:00007FFE73866DBE6D8E6DBE73867FFE7FFE71866FBE6F8E6FBE71BE7FFE0000 +0ED0:0000000000003C4242424242423C0000 +0ED1:0000000000003C42425A3A0204380000 +0ED2:000004040408102040404046423C0000 +0ED3:00001028140A442222222222225C0000 +0ED4:000002020408102040404C4C483E0000 +0ED5:0000020A1408102040404C4C483E0000 +0ED6:00001028140A244242425252522C0000 +0ED7:0000000000005C222222222222620202 +0ED8:0000000000002C52524242260A142C30 +0ED9:000000000000324A4A4A4A4A4A240000 +0EDA:00007FFE73866DBE6D8E6DBE73867FFE7FFE63866DB66D866DB663B67FFE0000 +0EDB:00007FFE73866DBE6D8E6DBE73867FFE7FFE638E6DB66D8E6DB6638E7FFE0000 +0EDC:00000000000099555555555555260000 +0EDD:0000000000009955555555555D2E0000 +0EDE:000000000000B8444444555E44C40000 +0EDF:00000000000064848464959E84780000 +0EE0:00007FFE73866DBE6D8E6DBE73867FFE7FFE61CE6FB663B66FB661CE7FFE0000 +0EE1:00007FFE73866DBE6D8E6DBE73867FFE7FFE61EE6FCE63EE6FEE61C67FFE0000 +0EE2:00007FFE73866DBE6D8E6DBE73867FFE7FFE61866FF663866FBE61867FFE0000 +0EE3:00007FFE73866DBE6D8E6DBE73867FFE7FFE618E6FF663C66FF6618E7FFE0000 +0EE4:00007FFE73866DBE6D8E6DBE73867FFE7FFE61B66FB663866FF661F67FFE0000 +0EE5:00007FFE73866DBE6D8E6DBE73867FFE7FFE61866FBE63866FF661867FFE0000 +0EE6:00007FFE73866DBE6D8E6DBE73867FFE7FFE61CE6FBE638E6FB661CE7FFE0000 +0EE7:00007FFE73866DBE6D8E6DBE73867FFE7FFE61866FF663EE6FDE61DE7FFE0000 +0EE8:00007FFE73866DBE6D8E6DBE73867FFE7FFE61CE6FB663CE6FB661CE7FFE0000 +0EE9:00007FFE73866DBE6D8E6DBE73867FFE7FFE61CE6FB663C66FF661CE7FFE0000 +0EEA:00007FFE73866DBE6D8E6DBE73867FFE7FFE61866FB663866FB661B67FFE0000 +0EEB:00007FFE73866DBE6D8E6DBE73867FFE7FFE618E6FB6638E6FB6618E7FFE0000 +0EEC:00007FFE73866DBE6D8E6DBE73867FFE7FFE61C66FBE63BE6FBE61C67FFE0000 +0EED:00007FFE73866DBE6D8E6DBE73867FFE7FFE618E6FB663B66FB6618E7FFE0000 +0EEE:00007FFE73866DBE6D8E6DBE73867FFE7FFE61866FBE638E6FBE61867FFE0000 +0EEF:00007FFE73866DBE6D8E6DBE73867FFE7FFE61866FBE638E6FBE61BE7FFE0000 +0EF0:00007FFE73866DBE6D8E6DBE73867FFE7FFE61CE6FB663B66FB66FCE7FFE0000 +0EF1:00007FFE73866DBE6D8E6DBE73867FFE7FFE61EE6FCE63EE6FEE6FC67FFE0000 +0EF2:00007FFE73866DBE6D8E6DBE73867FFE7FFE61866FF663866FBE6F867FFE0000 +0EF3:00007FFE73866DBE6D8E6DBE73867FFE7FFE618E6FF663C66FF66F8E7FFE0000 +0EF4:00007FFE73866DBE6D8E6DBE73867FFE7FFE61B66FB663866FF66FF67FFE0000 +0EF5:00007FFE73866DBE6D8E6DBE73867FFE7FFE61866FBE63866FF66F867FFE0000 +0EF6:00007FFE73866DBE6D8E6DBE73867FFE7FFE61CE6FBE638E6FB66FCE7FFE0000 +0EF7:00007FFE73866DBE6D8E6DBE73867FFE7FFE61866FF663EE6FDE6FDE7FFE0000 +0EF8:00007FFE73866DBE6D8E6DBE73867FFE7FFE61CE6FB663CE6FB66FCE7FFE0000 +0EF9:00007FFE73866DBE6D8E6DBE73867FFE7FFE61CE6FB663C66FF66FCE7FFE0000 +0EFA:00007FFE73866DBE6D8E6DBE73867FFE7FFE61866FB663866FB66FB67FFE0000 +0EFB:00007FFE73866DBE6D8E6DBE73867FFE7FFE618E6FB6638E6FB66F8E7FFE0000 +0EFC:00007FFE73866DBE6D8E6DBE73867FFE7FFE61C66FBE63BE6FBE6FC67FFE0000 +0EFD:00007FFE73866DBE6D8E6DBE73867FFE7FFE618E6FB663B66FB66F8E7FFE0000 +0EFE:00007FFE73866DBE6D8E6DBE73867FFE7FFE61866FBE638E6FBE6F867FFE0000 +0EFF:00007FFE73866DBE6D8E6DBE73867FFE7FFE61866FBE638E6FBE6FBE7FFE0000 +0F00:18671C5D4955534B3901000000000000 +0F01:0000005C4854524A3901000000000000 +0F02:1000100018004430BA487C487830840088309C48224802300600610012000C00 +0F03:1000100018004430BA487C487830840088789C00223002480648613012000C00 +0F04:0000000006C1314E310E000000000000 +0F05:000000000C02621C621C000000000000 +0F06:0000000006C1314E310E000C04040404 +0F07:000000000815C4390000000000000000 +0F08:0000324C006C10381010101010100000 +0F09:0000001E2101020E110E110100000000 +0F0A:000F304E5141424E514E5140310F0000 +0F0B:00000018180000000000000000000000 +0F0C:00000018180000000000000000000000 +0F0D:00000018180808080808080808080000 +0F0E:00000036361212121212121212120000 +0F0F:00000018180018080808080808080000 +0F10:00000018001800180808080808080000 +0F11:00000066001800180808080808080000 +0F12:0814493E0077001A2C08080808080800 +0F13:00000000180018A5A518001800000000 +0F14:00000018242418003C00182424180000 +0F15:00FFE781A581FFB18DE3130905030301 +0F16:00027F827F8260027FFE7FFE01827F827F8200027FFE00827FFE40027FFE0002 +0F17:001100890449224A1252129413FC57145814582457C4500837F0180010000000 +0F18:0000000000000000000200010019002500260018019002600240018009000600 +0F19:00000000000000000018080808080800 +0F1A:00000000000018242418000000000000 +0F1B:00000000000022555522000000000000 +0F1C:00000000081414082255552200000000 +0F1D:00000000000000140814000000000000 +0F1E:00000000000000552255000000000000 +0F1F:00000000000000255225000000000000 +0F20:0000000E112121221C00000000000000 +0F21:000000060B1101020408000000000000 +0F22:0000001E2101020E1101000000000000 +0F23:0000001E21020E01021E210000000000 +0F24:00000000122C40417E00000000000000 +0F25:0000002244443C040201000000000000 +0F26:0000004044282711110E000000000000 +0F27:0000000101314A123C00000000000000 +0F28:00000008102070080402010100000000 +0F29:0000001C2224494E4040000000000000 +0F2A:0000000C16220F740810000000000000 +0F2B:0000003C420F741C2202000000000000 +0F2C:0000003C42041F72043C420000000000 +0F2D:00000000122C46497E20400000000000 +0F2E:000000224E553C440201000000000000 +0F2F:00000040452A2719112E400000000000 +0F30:0000000101314F723C00000000000000 +0F31:000000081020720D3442010100000000 +0F32:0000031D2A34694E4040000000000000 +0F33:0000001D22464A543840000000000000 +0F34:00000000181800101C04101C04000000 +0F35:00000000000000000000000010552A1C +0F36:00000000181800666600181800000000 +0F37:00000000000000000000000018242418 +0F38:334A525C000000000000000000000000 +0F39:07040200000000000000000000000000 +0F3A:000000000000008009401490C428389001400080000000000000000000000000 +0F3B:0000000000000200052012502846123805000200000000000000000000000000 +0F3C:00000202040808182020202020204000 +0F3D:000020201008080C0202020202020100 +0F3E:00000000000000000C02020202020201 +0F3F:00000000000000003040404040404080 +0F40:0000003F156505010101000000000000 +0F41:0000003F494D4B414100000000000000 +0F42:0000003F496959090101000000000000 +0F43:0000003F496959091F204E3111010000 +0F44:0000001E204078440201000000000000 +0F45:0000003E08084E31110E000000000000 +0F46:0000003E08083E494936000000000000 +0F47:0000001E203C407C4201000000000000 +0F48:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE6DCE6DB661CE7DB67DCE7FFE0000 +0F49:00000038444E11110101020000000000 +0F4A:0000007F013D43414040000000000000 +0F4B:0000003F213A2C222F30200000000000 +0F4C:0000003C02011F214040400000000000 +0F4D:0000003C02011F205E604E3111010000 +0F4E:0000003F081C12322C20200000000000 +0F4F:0000007F405E61410101000000000000 +0F50:0000003F21170D113D03010000000000 +0F51:0000001E20407C420101010000000000 +0F52:0000001E20407C421F204E3111010000 +0F53:0000003F040E12130D01010000000000 +0F54:0000003321417D430101000000000000 +0F55:0000003323457D430101000000000000 +0F56:0000001F21417D430101000000000000 +0F57:0000001F21417D431F204E3111010000 +0F58:0000007D09314D4B3101000000000000 +0F59:0001013E08084E31110E000000000000 +0F5A:0001013E08083E494936000000000000 +0F5B:0001011E2038407C4201000000000000 +0F5C:0001011E2038407C421F204E31110100 +0F5D:00000031494F09111D13010000000000 +0F5E:0000001C224C52534D21010000000000 +0F5F:0000003F011F013D0301000000000000 +0F60:000000384444481C0201000000000000 +0F61:0000006B494949350301000000000000 +0F62:0000003E081C02010100000000000000 +0F63:0000003945490D030100000000000000 +0F64:0000000F11114F311101010000000000 +0F65:0000003C22223D232220200000000000 +0F66:0000007B112965030100000000000000 +0F67:0000001E204E31110101000000000000 +0F68:0000005D4955534B3101000000000000 +0F69:0000003F156505013925243D22242000 +0F6A:0000007C083844020202000000000000 +0F6B:0000007E545350404040000000000000 +0F6C:0000001F080E11202020000000000000 +0F6D:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE738E6FB663B66DB6738E7FFE0000 +0F6E:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE73866FBE638E6DBE73867FFE0000 +0F6F:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE73866FBE638E6DBE73BE7FFE0000 +0F70:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE61CE7DB67BB677B677CE7FFE0000 +0F71:00000000000000000000182804000000 +0F72:70480400000000000000000000000000 +0F73:7048040000000000003F4242041C2202 +0F74:0000000000000000000000000040241C +0F75:00000000000000003E4242040C42221C +0F76:704804000000000000720A0602000000 +0F77:70480400000000027A063F42041C2200 +0F78:70480400000000000000000022525E02 +0F79:70480400000000325E023F42041C2200 +0F7A:E0180400000000000000000000000000 +0F7B:CC220000000000000000000000000000 +0F7C:CF281000000000000000000000000000 +0F7D:45EE1000000000000000000000000000 +0F7E:10281000000000000000000000000000 +0F7F:00000018242418001824241800000000 +0F80:1C244000000000000000000000000000 +0F81:1C24400000000000003F4242041C2202 +0F82:08080C225D3F00000000000000000000 +0F83:0814493E000000000000000000000000 +0F84:00000000000000000004060203010101 +0F85:0000000000384444081C12120A020201 +0F86:10101024180000000000000000000000 +0F87:10101010101000000000000000000000 +0F88:00003F800A0004000A003F800000000000000000000000000000000000000000 +0F89:00364900000000000000000000000000 +0F8A:0000000000000000EEAAAAAABA000000 +0F8B:000000000000000001023A4A4A2E0000 +0F8C:00493600000000000000000000000000 +0F8D:0000000000000000007F22140814227F +0F8E:00000000000000000000000000364900 +0F8F:00000000000000000000000000493600 +0F90:000000000000003F1525010000000000 +0F91:00000000000000003F494D4B41000000 +0F92:000000000000003F4979090000000000 +0F93:000000000000003F4979011E204E3111 +0F94:00000000000000001E207C4201000000 +0F95:00000000000000003E084E310E000000 +0F96:00000000000000003E083E4936000000 +0F97:00000000000000001E2038407E410000 +0F98:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE73CE6DB671CE7DB673CE7FFE0000 +0F99:000000000000000038440E1101020000 +0F9A:00000000000000007F013D4341400000 +0F9B:00000000000000007E4478447E400000 +0F9C:00000000000000003C021F2140400000 +0F9D:00000000000000003C021F207E510100 +0F9E:0000000000001E081C324C4000000000 +0F9F:00000000000000007F405E6141010000 +0FA0:00000000000000003F110F113F010000 +0FA1:00000000000000001E207C4201010000 +0FA2:00000000000000001E207C421F204E31 +0FA3:0000000000003C081C26190100000000 +0FA4:0000000000000033217D030100000000 +0FA5:0000000000000027497D030100000000 +0FA6:000000000000001F217D030100000000 +0FA7:000000000000001F217D031F204E3111 +0FA8:0000000000000079314D330100000000 +0FA9:00000000003C0A094C32120C00000000 +0FAA:00000000000000003E093E4949360000 +0FAB:00000000001C2239417C420000000000 +0FAC:00000000001C2239417C421E204E3111 +0FAD:00000000000000000000000001030503 +0FAE:00000000000000001C224C534D210100 +0FAF:00000000000000003F011F013F010000 +0FB0:00000000000000003844481C02010000 +0FB1:0000000000000000010101121C090600 +0FB2:00000000000000000101013945030100 +0FB3:00000000000000003945491D03010000 +0FB4:000000000000000007092F1109010100 +0FB5:000000000000000038243D2224202000 +0FB6:00000000000000007B29456301000000 +0FB7:00000000000000001E204E3111010000 +0FB8:00000000000000005D49555331010000 +0FB9:000000000000003F15650539243D2220 +0FBA:000000000000000031494F091D030100 +0FBB:00000000000000006B49493503010000 +0FBC:00000000000000003E081C0201010000 +0FBD:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE638E6DB663B66DB6638E7FFE0000 +0FBE:00000000004122140814224100000000 +0FBF:00000000004922144914224900000000 +0FC0:00000000001C224141221C0000000000 +0FC1:000000000000001C22221C0000000000 +0FC2:000000001C021A242458403800000000 +0FC3:000000001C224955492A1C0000000000 +0FC4:0000006B14081C2222223E417F000000 +0FC5:0D600280010003800C601930145022882108155011100D600380010002800D60 +0FC6:00000000000000000000000000000000000045442AA82AA812900FE015502548 +0FC7:0D600280010003808C6299325454A28AA10A555491128D620380010002800D60 +0FC8:00000D60028001003FF824481290129009200920044004400280028001000000 +0FC9:0000000003800440092014501390282827C8200820081010183007C000000000 +0FCA:000007C008203018200840049E06A126C106C90AC0F2400420083018082007C0 +0FCB:000007C0082030183C0C424C810A911281E281028202424422083218092007C0 +0FCC:000007C00820303821287C2482428182892283028482487C29083818082007C0 +0FCD:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE718E6FB66FB66FB6718E7FFE0000 +0FCE:00000000000000522552000000000000 +0FCF:00000000001408140055225500000000 +0FD0:000000001F00208040440F381080008001000700088000000000000000000000 +0FD1:003C4202041C221C2218240408040200 +0FD2:000000007C38100000007C3810000000 +0FD3:0000000006C1310E0000000000000000 +0FD4:000000000C02621C0000000000000000 +0FD5:0000000041FC410041004100410041007FFC010401040104010401047F040000 +0FD6:000000007F04010401040104010401047FFC4100410041004100410041FC0000 +0FD7:0000000041FC410041004920410041007FFC010401040924010401047F040000 +0FD8:000000007F04010401040924010401047FFC4100410049204100410041FC0000 +0FD9:0000000000004000600040000000100218061002000002100738000000000000 +0FDA:0000000000000002000600020000400860184008000008401CE0000000000000 +0FDB:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE638E6DB66D8E6DB6638E7FFE0000 +0FDC:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE63C66DBE6DBE6DBE63C67FFE0000 +0FDD:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE638E6DB66DB66DB6638E7FFE0000 +0FDE:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE63866DBE6D8E6DBE63867FFE0000 +0FDF:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE63866DBE6D8E6DBE63BE7FFE0000 +0FE0:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE61CE6FB663B66FB661CE7FFE0000 +0FE1:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE61EE6FCE63EE6FEE61C67FFE0000 +0FE2:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE61866FF663866FBE61867FFE0000 +0FE3:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE618E6FF663C66FF6618E7FFE0000 +0FE4:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE61B66FB663866FF661F67FFE0000 +0FE5:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE61866FBE63866FF661867FFE0000 +0FE6:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE61CE6FBE638E6FB661CE7FFE0000 +0FE7:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE61866FF663EE6FDE61DE7FFE0000 +0FE8:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE61CE6FB663CE6FB661CE7FFE0000 +0FE9:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE61CE6FB663C66FF661CE7FFE0000 +0FEA:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE61866FB663866FB661B67FFE0000 +0FEB:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE618E6FB6638E6FB6618E7FFE0000 +0FEC:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE61C66FBE63BE6FBE61C67FFE0000 +0FED:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE618E6FB663B66FB6618E7FFE0000 +0FEE:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE61866FBE638E6FBE61867FFE0000 +0FEF:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE61866FBE638E6FBE61BE7FFE0000 +0FF0:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE61CE6FB663B66FB66FCE7FFE0000 +0FF1:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE61EE6FCE63EE6FEE6FC67FFE0000 +0FF2:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE61866FF663866FBE6F867FFE0000 +0FF3:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE618E6FF663C66FF66F8E7FFE0000 +0FF4:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE61B66FB663866FF66FF67FFE0000 +0FF5:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE61866FBE63866FF66F867FFE0000 +0FF6:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE61CE6FBE638E6FB66FCE7FFE0000 +0FF7:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE61866FF663EE6FDE6FDE7FFE0000 +0FF8:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE61CE6FB663CE6FB66FCE7FFE0000 +0FF9:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE61CE6FB663C66FF66FCE7FFE0000 +0FFA:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE61866FB663866FB66FB67FFE0000 +0FFB:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE618E6FB6638E6FB66F8E7FFE0000 +0FFC:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE61C66FBE63BE6FBE6FC67FFE0000 +0FFD:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE618E6FB663B66FB66F8E7FFE0000 +0FFE:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE61866FBE638E6FBE6F867FFE0000 +0FFF:00007FFE73866DBE6D8E6DBE73BE7FFE7FFE61866FBE638E6FBE6FBE7FFE0000 +1000:00000000000000000000018C02520421042104210242000C0000000000000000 +1001:0000000000000000000000780084000201F2010A008400780000000000000000 +1002:0000000000000000000000780084010201020102008400480000000000000000 +1003:00000000000000000000060C01420221042104210252018C0000000000000000 +1004:0000000000000000000000780084010001000100008400780000000000000000 +1005:0000000000000000000000780084014201420142008400780000000000000000 +1006:00000000000000000000018C02520021002103A10252018C0000000000000000 +1007:0000000000000000000000F001080214020A0200010800F00000000000000000 +1008:0000000000000000000000710089014501450145008900790009000900050002 +1009:0000000000000000000000E00110000800080008011001E001000101010100FE +100A:00000000000000000000018C02420021002100210252038C02000201020101FE +100B:0000000000000000000000780084010001000084007C000400F800800078000E +100C:00000000000000000000007800840100010001000084007C000400C4010400F8 +100D:000000000000000000000078008400020002008400F80080007C000400040006 +100E:0000000000000000000001880044008201020102008400780000000000000000 +100F:0000000000000000000003760489045104510451028A00F80000000000000000 +1010:00000000000000000000018C02520421042104210242018C0000000000000000 +1011:00000000000000000000018C02520421042104210252018C0000000000000000 +1012:0000000000000000000000F00108000800300008010800F00000000000000000 +1013:000000000000000000000078008401020102017A008400780000000000000000 +1014:00000000000000000000001C00200020001C00C2012200FC0020002000000000 +1015:0000000000000000000000480084010201020102008400780000000000000000 +1016:000000000000000000000058009401120112010A008400780000000000000000 +1017:0000000000000000000000000084017A01020102008400780000000000000000 +1018:00000000000000000000018C02520021002100210242018C0000000000000000 +1019:000000000000000000000048008401020102017A008400780000000000000000 +101A:00000000000000000000000C02420421042104210252018C0000000000000000 +101B:0000000000000000000000F00108020403C40224011400F40004000400040007 +101C:00000000000000000000018C02420421042104210212018C0000000000000000 +101D:0000000000000000000000780084010201020102008400780000000000000000 +101E:00000000000000000000018C02420021002100210252018C0000000000000000 +101F:00000000000000000000000C02520421042104210242018C0000000000000000 +1020:0000000000000000000000780084010001000084007C000400F8008000840078 +1021:00000000000000000000019C0262004300850049024A018C0000000000000000 +1022:00000000000000000000018C02520421042102210142060C0000000000000000 +1023:00000000000000000000018C02520421042104210202000001DC022202240107 +1024:000600090008000400020199026504250425042502450005000507E5080507F9 +1025:0000000000000000000000F00108000400040004010801F001000100010400F8 +1026:0070008800A800D80070000000F8010800040004010801F001000100010400F8 +1027:0000000000000000000000780084017801000178008400780000000000000000 +1028:0000000000000000007800840132014A010A0112010C01000102010200840078 +1029:3FFE4001400140004000471C488240414041404148A3471D4001400140013FFE +102A:07C608290828080408000B36288948898889B889D89A6B6808080808080807F0 +102B:0F00108010800080008000800080008000800080008000800000000000000000 +102C:0000000000000000000003E00410000800080008001001E00000000000000000 +102D:0030004800480030000000000000000000000000000000000000000000000000 +102E:0070008800A80088007000000000000000000000000000000000000000000000 +102F:0000000000000000000002000200020002000200020002000200020002000380 +1030:00000000000000000000050005000500050005000500050005000500050005C0 +1031:0000000000000000000000003000400040007000500030000000000000000000 +1032:0100008000400020000000000000000000000000000000000000000000000000 +1033:007000A800D800A8007000000000000000000000000000000000000000000000 +1034:0008001000200040000000000000000000000000000000000000000000000000 +1035:0070008000B800C8007000000000000000000000000000000000000000000000 +1036:0000000200050002000000000000000000000000000000000000000000000000 +1037:0000000000000000000000000000000000000000000000000000001000280010 +1038:0000000000000000000001000280010000000100028001000000000000000000 +1039:0000000000000000000000000000000000000000000000000000002000700020 +103A:000C001200100008000000000000000000000000000000000000000000000000 +103B:0000000000000000000004000400040004000400040084008400840064001C00 +103C:07FC0802080208000800080008000800080008000800080008000800080407F8 +103D:000000000000000000000000000000000000000000000000000800140022001C +103E:0000000000000000000000000000000000000000000000200020002000600000 +103F:000000000000000000000124029200490049004902DA01240000000000000000 +1040:0000000000000000000003600410080808080808041003600000000000000000 +1041:0000000000000000000003C00420001000100010042003C00000000000000000 +1042:0000000000000000000000200020002000200020002000200020002008400780 +1043:0000000000000000000003C00420001000100010042003C00100008000400020 +1044:0000000000000000000003C00420080008000800042003C00080010002000400 +1045:0000000000000000000007C00A200A10041000100010001000100010042003C0 +1046:000001E002100400040004600480048004700410021001E00000000000000000 +1047:0000000000000000000007800840002000200020004000800100020002000180 +1048:0000000000000000000003C004200A1009100910052003000000000000000000 +1049:0000000000000000000001E002100410047004800480046004000400021001E0 +104A:0000000000000000000000800080008000800080008000800000000000000000 +104B:0000000000000000000002400240024002400240024002400000000000000000 +104C:0180024002000100000003C0042000100010042007C0040003E00020042003C0 +104D:000000180024002000100788084810281E28112808A807A800280628080807F0 +104E:00000000000000000000007800840100010001000084007C0004000400040004 +104F:001800240020001000080F6410942F1420142F1410940F140000000000000000 +1050:0000000000000000000000780084010201320102008400480000000000000000 +1051:0000000000000000000000480084010201320102008400780000000000000000 +1052:0000000000000000000000060088010401020102008400780000000000000000 +1053:0000000000000000000001860048008401020102008400780000000000000000 +1054:00000000000000000000007800840142013E0100008400780000000000000000 +1055:00000000000000000000007800840142013E01000092006C0000000000000000 +1056:0000000000000000000000600080004000200020084007800000000000000000 +1057:0000000000000000000000300040002000100010092006C00000000000000000 +1058:0000000000000000000000000000000000000000000000000030005000640038 +1059:000000000000000000000000000000000000000000000000006000A000CA0074 +105A:0000000000000000000000780084010001000084007800200050001000200010 +105B:0000000000000000000000E20112022A02160202011200F200120012000A0004 +105C:00000000000000000000007800840132014A0132008400780000000000000000 +105D:000000000000000000000048008401020102017A0086007A000200C2010200FC +105E:0000000000000000000000000000000000000000000000000010003800540030 +105F:0000000000000000000000000000000000000000000000000010003000440038 +1060:0000000000000000000000000000000000000000000000000010002000400078 +1061:0000000000000000000000780084010201E20112008A007A0002000A000A001A +1062:0000000000000000000003800080008000800080008000800000000000000000 +1063:0000000000000000000003800440002000200020044007800400040004000400 +1064:0000000000000000000007000100010001000100010001C00000000000000000 +1065:0000000000000000000000780084000200020002008400780000000000000000 +1066:0000000000000000000000480084010201020102008400780000001000100030 +1067:0000000000000000000000800080008001800280028001000000000000000000 +1068:0000010002800100000000800080008000800080008003800000000000000000 +1069:0000000000000000000001800240004001800200024001800000000000000000 +106A:0000000000000000000000800080008000800080028001000000000000000000 +106B:0000000000000000000001000280008000800080008000800000000000000000 +106C:0000000000000000000001000100010001000100014000800000000000000000 +106D:0000000000000000000001800240020001800040024001800000000000000000 +106E:0000000000000000000001B60249022902290249015200000000000000000000 +106F:00000000000000000000000C02520421042104210242018C0000000800080018 +1070:00000000000000000000060C01420221042104210252018C0000000800080018 +1071:0000008801540088000000000000000000000000000000000000000000000000 +1072:0030004800400030000000000000000000000000000000000000000000000000 +1073:0020005000880104000000000000000000000000000000000000000000000000 +1074:0000004800480030000000000000000000000000000000000000000000000000 +1075:0000000000000000000000780084010201020082004401880000000000000000 +1076:00000000000000000000013801440082000200FA008400780000000000000000 +1077:0000000000000000000000780084010A010A008A004401800000000000000000 +1078:00000000000000000000018C02520421042104210212018C0000000000000000 +1079:00000000000000000000018C02520621052104A10292018C0000000000000000 +107A:00000000000000000000018C0242042104210421023201AC0020002000200038 +107B:00000000000000000000018C0252042304250429024A018C0000000000000000 +107C:00000000000000000000018C02520020002001FC0252018C0000000000000000 +107D:00000000000000000000060C015202200420042E0252018C0000000000000000 +107E:00000000000000000000060C015202200420042E0252018C0000000800080018 +107F:00000000000000000000006800A4012201220142008400780000000000000000 +1080:00000000000000000000018C02420021002103A10252018C0000000000000000 +1081:000000000000000000000078008401020102012200A4006000200020002000E0 +1082:0000000000000000000000000000000000000000000000000020004000480030 +1083:00000000000000000000070001000100010001000100010001000100010001C0 +1084:0000000000000000000030004800400030004000480030000000000000000000 +1085:0070008800400088007000000000000000000000000000000000000000000000 +1086:0020005000300010002000000000000000000000000000000000000000000000 +1087:0000000000000000000000000000000000000100028001800080010000000000 +1088:0000000000000000000001000280010000000100028001800080010000000000 +1089:0000000000000000000000000000000000000100028001000000000000000000 +108A:0000000000000000000002000540038000000200054003800000000000000000 +108B:0000000000000000000000000000010002800100000000000000000000000000 +108C:0000000000000000000000000000022005500220000000000000000000000000 +108D:000000000000000000000000000000000000000000000000000001FE00000000 +108E:0000000000000000000000780084017A01020102008400780000000000000000 +108F:0000000000000000000001000280010000000100028003000200010000000000 +1090:0000000000000000000003C00420042004200420042003C00000000000000000 +1091:0000000000000000000003000500010001000100014001800000000000000000 +1092:0000000000000000000005C00620002000400080010001000000000000000000 +1093:0000000000000000008000800100010002000380044004400000000000000000 +1094:000000000000000000800080018001800280028004A004C00000000000000000 +1095:0000000000000000000000400040004007E00840084007800000000000000000 +1096:0000000000000000000007800840084007E00040004000400000000000000000 +1097:0000000000000000000007C00040008001000200040007C00000000000000000 +1098:0000000000000000000004200420024003C00420042003C00000000000000000 +1099:0000000000000000000003C00420042003C00240042004200000000000000000 +109A:0000000000000000000001000280010000000000000000000000000000000000 +109B:0000010002800180008001000000000000000000000000000000000000000000 +109C:0000000000000000000003800540020000000380054002000000000000000000 +109D:0000001C00220002000200020000000000000000000000000000000000000000 +109E:00000100028001000000070001000100010001000100010001000100010001C0 +109F:001800240020001000080F041084204420442044104400440044004400440038 +10A0:00000080FE22408080808082463A0000 +10A1:000000006888888898680808080E0200 +10A2:00000000F888880808080808080E0200 +10A3:0000000080FE12103844828244380000 +10A4:000000007C4444040404040404040000 +10A5:00000000F88888080E0A080808080000 +10A6:0000000080E02020202C322222221C00 +10A7:00000000305090909E92909050300000 +10A8:000000407C0404040404040404040000 +10A9:000000004040586444444C3404040000 +10AA:0000000000E0A020202C322222221C00 +10AB:00000080F80808087E8A8A8888700000 +10AC:000000047C4040407C44444444440000 +10AD:00000000708888888888888A8A740000 +10AE:00000080E222222222222222221C0000 +10AF:000000407A122222261A020202020000 +10B0:000000001010141A1292909090600000 +10B1:00000000404040404844444444380000 +10B2:000000007C4242427C404040407E0200 +10B3:00000000708888888888888C8A720000 +10B4:000000007C9292927C10101010100000 +10B5:00000000101010507C14101010100000 +10B6:000000003C4242424242424242420000 +10B7:000000002444444444444C3404040000 +10B8:00000000344444444C34044444380000 +10B9:00000000404040407C44444444440000 +10BA:000000001C22424040404042221C0408 +10BB:00000000080808083E4A4A4848300000 +10BC:000000007C4242427C40407844484040 +10BD:0000000000003844442010080442423C +10BE:0000000044444444447C4040407C0400 +10BF:00000080FE2222141408141422224080 +10C0:00000000F090901010101212120C0000 +10C1:00000000404078444640404040400000 +10C2:00000040784402020202024244380000 +10C3:00000000344444444C34040404040000 +10C4:00000000828282824428101010100000 +10C5:000000001C12121C107C949690600000 +10C6:00007FFE7BCE73B67BB67BB671CE7FFE7FFE71CE6FBE6F8E6FB671CE7FFE0000 +10C7:0000000000001C22220408102042423C +10C8:00007FFE7BCE73B67BB67BB671CE7FFE7FFE71CE6FB66FCE6FB671CE7FFE0000 +10C9:00007FFE7BCE73B67BB67BB671CE7FFE7FFE71CE6FB66FC66FF671CE7FFE0000 +10CA:00007FFE7BCE73B67BB67BB671CE7FFE7FFE71866FB66F866FB671B67FFE0000 +10CB:00007FFE7BCE73B67BB67BB671CE7FFE7FFE718E6FB66F8E6FB6718E7FFE0000 +10CC:00007FFE7BCE73B67BB67BB671CE7FFE7FFE71C66FBE6FBE6FBE71C67FFE0000 +10CD:000000007C04040810102020407C0000 +10CE:00007FFE7BCE73B67BB67BB671CE7FFE7FFE71866FBE6F8E6FBE71867FFE0000 +10CF:00007FFE7BCE73B67BB67BB671CE7FFE7FFE71866FBE6F8E6FBE71BE7FFE0000 +10D0:0000000000000010100C0202423C0000 +10D1:00000000203010103C424242423C0000 +10D2:000000000030484808083C424242423C +10D3:000000000000002C525252524C201C02 +10D4:000000003C424202020202020242423C +10D5:0000000000003C4242021C020242423C +10D6:0000000020505054381C1212120C0000 +10D7:00000000000000344A4A4A4A4A320000 +10D8:000000000000003C4242424242240000 +10D9:0000000000000C0202021C020242423C +10DA:000000000000002A5555554142403E01 +10DB:000000003C424202023E4242423C0000 +10DC:00000000023C4040407C4242423C0000 +10DD:00000000000000285454545444240000 +10DE:0000000020180402021C0242423C0000 +10DF:00000000000000060A5252220222221C +10E0:00000000043840685454545444240000 +10E1:00000000404040485048444444380000 +10E2:000000001824243C66665A424242423C +10E3:000000000000006C121202020222221C +10E4:00000000000000344A4A4A4A3402021C +10E5:00000000040C0404041C240404044438 +10E6:00000000000000285454544448403804 +10E7:0000000000000022424242261A42423C +10E8:0000000028545404041C242424180000 +10E9:00000000384478405C62424242420000 +10EA:0000000000004C4242425C424242423C +10EB:0000000004020202023E4242423C0000 +10EC:0000000028545440407C444428281010 +10ED:00000000081828080819261D04044438 +10EE:00000000404040485078444444380000 +10EF:00000000000000004224181824422040 +10F0:0000100C02120C02120C0242423C0000 +10F1:0000504C42524C42524C4242423C0000 +10F2:0000000000003C4242424224187E0000 +10F3:0000000000003E0204081C020242423C +10F4:0000000008100C0202021C020242423C +10F5:00000000003844443E043E4444380000 +10F6:00000000201010103854543810101008 +10F7:0000000000003C42420408102042423C +10F8:0000000000000044424242645842423C +10F9:00000000003C424242423C101012120C +10FA:0000000000003C4242300C1C22400000 +10FB:00000000000060600006060060600000 +10FC:0000021C20203C22221C000000000000 +10FD:0000000000003C42422010080442423C +10FE:00000000000000C0221C2222221C0000 +10FF:0000000000000000001C2222221C0000 +1100:000000007F800080008000800080010001000200040018006000000000000000 +1101:0000000000007B80088008800880088011001100220044000800000000000000 +1102:000020002000200020003F800000000000000000000000000000000000000000 +1103:00003F802000200020003F800000000000000000000000000000000000000000 +1104:00003B802200220022003B800000000000000000000000000000000000000000 +1105:000000003F8000803F8020003F80000000000000000000000000000000000000 +1106:00003F802080208020803F800000000000000000000000000000000000000000 +1107:0000208020803F8020803F800000000000000000000000000000000000000000 +1108:00002A802A803B802A803B800000000000000000000000000000000000000000 +1109:00000400040004000A0011000000000000000000000000000000000000000000 +110A:00001100110011002A8044400000000000000000000000000000000000000000 +110B:00000E001100110011000E000000000000000000000000000000000000000000 +110C:00003F80010002000D0030800000000000000000000000000000000000000000 +110D:000000003BC00880150022800440000000000000000000000000000000000000 +110E:0E0000003F8002000D0030800000000000000000000000000000000000000000 +110F:00003F8000803F80008000800000000000000000000000000000000000000000 +1110:00003F8020003F8020003F800000000000000000000000000000000000000000 +1111:00007F801200120012007F800000000000000000000000000000000000000000 +1112:00000E0000003F8000001F002080208020801F00000000000000000000000000 +1113:000021FC2004200420043F840000000000000000000000000000000000000000 +1114:000020402040204020403E7C0000000000000000000000000000000000000000 +1115:0000207C2040204020403E7C0000000000000000000000000000000000000000 +1116:000020442044207C20443E7C0000000000000000000000000000000000000000 +1117:00003E7C2004200420043E040000000000000000000000000000000000000000 +1118:000000003E4002403E4020403E7C000000000000000000000000000000000000 +1119:000000003E7C02043E7C20403E7C000000000000000000000000000000000000 +111A:000000003E3002FC3E3020483E30000000000000000000000000000000000000 +111B:000000001FF800081FF810001FF803C00420042003C000000000000000000000 +111C:00003E442244227C22443E7C0000000000000000000000000000000000000000 +111D:00001FFC1004100410041FFC00000000000003E004100410041003E000000000 +111E:0000227C22043E0422043E040000000000000000000000000000000000000000 +111F:0000224022403E4022403E7C0000000000000000000000000000000000000000 +1120:0000227C22403E4022403E7C0000000000000000000000000000000000000000 +1121:0000221022103E1022283E440000000000000000000000000000000000000000 +1122:0000489E4882788249427A220000000000000000000000000000000000000000 +1123:0000488E4888788849487A2E0000000000000000000000000000000000000000 +1124:000049244924793C4AA47C7C0000000000000000000000000000000000000000 +1125:000048884888788849547A220000000000000000000000000000000000000000 +1126:0000493E490479084A947C620000000000000000000000000000000000000000 +1127:0000227C22083E1022283E440000000000000000000000000000000000000000 +1128:00382200227C3E1022283E440000000000000000000000000000000000000000 +1129:0000227C22403E7C22403E7C0000000000000000000000000000000000000000 +112A:0000227C22283E2822283E7C0000000000000000000000000000000000000000 +112B:000008080FF808080FF801C0022001C000000000000000000000000000000000 +112C:000022443E7C22443E7C03C0042003C000000000000000000000000000000000 +112D:0000047C040404040A0411040000000000000000000000000000000000000000 +112E:00000440044004400A40117C0000000000000000000000000000000000000000 +112F:0000047C044004400A40117C0000000000000000000000000000000000000000 +1130:0000047C0404047C0A40117C0000000000000000000000000000000000000000 +1131:0000047C044404440A44117C0000000000000000000000000000000000000000 +1132:000004440444047C0A44117C0000000000000000000000000000000000000000 +1133:0000112E112211E2292245E20000000000000000000000000000000000000000 +1134:0000088808880888155422220000000000000000000000000000000000000000 +1135:00000438044404440A4411380000000000000000000000000000000000000000 +1136:0000047C040804100A2811440000000000000000000000000000000000000000 +1137:00380400047C04100A2811440000000000000000000000000000000000000000 +1138:0000047C0404047C0A0411040000000000000000000000000000000000000000 +1139:0000047C0440047C0A40117C0000000000000000000000000000000000000000 +113A:0000047C042804280A28117C0000000000000000000000000000000000000000 +113B:0000043004FC04300A4811300000000000000000000000000000000000000000 +113C:0000004000400180068018400000000000000000000000000000000000000000 +113D:00000120012002A0045019880000000000000000000000000000000000000000 +113E:0000008000800100068018400000000000000000000000000000000000000000 +113F:00000480048005400A30118C0000000000000000000000000000000000000000 +1140:000002000500088010403FE00000000000000000000000000000000000000000 +1141:00000E7C1104110411040E040000000000000000000000000000000000000000 +1142:00000E3C1120112011200E3C0000000000000000000000000000000000000000 +1143:00000E3E1122112211220E3E0000000000000000000000000000000000000000 +1144:00000E241124113C11240E3C0000000000000000000000000000000000000000 +1145:00000E081108110811140E220000000000000000000000000000000000000000 +1146:0000382044504488450439FC0000000000000000000000000000000000000000 +1147:00000E381144114411440E380000000000000000000000000000000000000000 +1148:00000E7C1108111011280E440000000000000000000000000000000000000000 +1149:00380E00117C111011280E440000000000000000000000000000000000000000 +114A:00000E3C1120113C11200E3C0000000000000000000000000000000000000000 +114B:00000E7C1128112811280E7C0000000000000000000000000000000000000000 +114C:00000E001100110011000E000000000000000000000000000000000000000000 +114D:00003E3804440844144422380000000000000000000000000000000000000000 +114E:00003FE000C003800C4030200000000000000000000000000000000000000000 +114F:000000001FF0012002A00C503188000000000000000000000000000000000000 +1150:00001FF0006001C0062018100000000000000000000000000000000000000000 +1151:000000003FE0084014A02310018C000000000000000000000000000000000000 +1152:1C00007C3E04087C140422040000000000000000000000000000000000000000 +1153:180000303EFC0830144822300000000000000000000000000000000000000000 +1154:078000001FC00180064038200000000000000000000000000000000000000000 +1155:0E0000003F0002000D8030700000000000000000000000000000000000000000 +1156:00003E441444147C14443E7C0000000000000000000000000000000000000000 +1157:00001FF804201FF803C0042003C0000000000000000000000000000000000000 +1158:000018307EFC1C70228822881C70000000000000000000000000000000000000 +1159:1FF0010007C00820082007C00000000000000000000000000000000000000000 +115A:00003E7C024002400240027C0000000000000000000000000000000000000000 +115B:000010101010101010281F440000000000000000000000000000000000000000 +115C:0000107C1008101010281F440000000000000000000000000000000000000000 +115D:0000107011FC107010881E700000000000000000000000000000000000000000 +115E:000000003E7C2004207C20403E7C000000000000000000000000000000000000 +115F:AAAA000180002239A2403E41A2402239800003E1820003818200020180005555 +1160:AAAA000180002279A2103E11A2502221800003E1820003818200020180005555 +1161:0000001000100010001E00100010001000000000000000000000000000000000 +1162:0000001200120012001E00120012001200000000000000000000000000000000 +1163:0000001000100010001E0010001E001000000000000000000000000000000000 +1164:0000001200120012001E0012001E001200000000000000000000000000000000 +1165:0000001000100010007000100010001000000000000000000000000000000000 +1166:0000001200120012007200120012001200000000000000000000000000000000 +1167:0000001000100010007000100070001000000000000000000000000000000000 +1168:0000001200120012007200120072001200000000000000000000000000000000 +1169:000000000000000000000000000000000000008000803FFE0000000000000000 +116A:0000001000100010001E041004103FF000000000000000000000000000000000 +116B:0000001200120012001E041204123FF200000000000000000000000000000000 +116C:00000010001000100010041004103FF000000000000000000000000000000000 +116D:00000000000000000000024002403FFE00000000000000000000000000000000 +116E:00000000000000000000000000003FFE00800080000000000000000000000000 +116F:00000010001000100010001000103F90041004F0041000000000000000000000 +1170:00000012001200120012001200123F92041204F2041200000000000000000000 +1171:00000010001000100010001000103FF004100410041000000000000000000000 +1172:00000000000000000000000000003FFE02200220000000000000000000000000 +1173:00000000000000000000000000003FFE00000000000000000000000000000000 +1174:000000100010001000100010001000100010001000103FF00010001000000000 +1175:0000001000100010001000100010001000000000000000000000000000000000 +1176:00000000000000000000002000200020003800A000A03FF80000000000000000 +1177:0000001000100010001C001000103FFE00800080000000000000000000000000 +1178:000000000000000000080008000E0008000E008800883FFE0000000000000000 +1179:00080008000E0008000E024802483FFE00000000000000000000000000000000 +117A:000000000000000800080008003800080008008800883FFE0000000000000000 +117B:00000000000400040004001C0004000400043FFE008000800000000000000000 +117C:00200020002000E000200020002000203FF00000000000000000000000000000 +117D:000000000000000000080008003800080038008800883FFE0000000000000000 +117E:00080008000800380008003800083FFE00800080000000000000000000000000 +117F:00000000000200020002000200023FFE0082008E000200000000000000000000 +1180:000000000000001200120012007200120012011201123FF20012000000000000 +1181:000000000000001200120012007200120012017201123FF20012000000000000 +1182:000000000000000000000000000000803FFE00803FFE00000000000000000000 +1183:000000000000000000000000008000803FFE00003FFE00800080000000000000 +1184:0000000000100010001E091009103FFE00100000000000000000000000000000 +1185:000000A400A400A404BC04A404FC3FA400000000000000000000000000000000 +1186:00020002000E0002000E048204823FFE00020000000000000000000000000000 +1187:0000000000000000000002203FFE00803FFE0000000000000000000000000000 +1188:00000000000200020002024202423FFE00020000000000000000000000000000 +1189:00000000000000000008000800083FFE02080208000800000000000000000000 +118A:00000000000000000012001200123FFE02120212001200000000000000000000 +118B:000000080008000800081FC80208027802083FFE000000000000000000000000 +118C:0000000A000A000A000A000A000A3FEA020A023A000A003A000A000000000000 +118D:00000000000000000000000000003FFE00803FFE008000000000000000000000 +118E:00000008000800080008000800083FFE02480248000800000000000000000000 +118F:00000001000100010001000100013FFF0221022F000100000000000000000000 +1190:00000000000A000A000A000A000A3FFA048A04BA000A00000000000000000000 +1191:00000000000200020002000200023FFE0242024E0002000E0002000000000000 +1192:00000000000A000A000A000A000A3FFA048A04BA000A003A000A000000000000 +1193:00000000000000000000000000003FFE02203FFE008000000000000000000000 +1194:00000000000100010001000100013FFF02210221000100000000000000000000 +1195:00000000000000000000000000003FFE00003FFE008000000000000000000000 +1196:00000000000000000000000000003FFE00003FFE000000000000000000000000 +1197:00040004000400040004000400040FFC00043FFE008000000000000000000000 +1198:0000004800480048004E00480048004800000000000000000000000000000000 +1199:000000480048004E0048004E0048004800000000000000000000000000000000 +119A:000000000000000400040004000400040004008400843FFE0000000000000000 +119B:00040004000400040004000400043FFE00800080000000000000000000000000 +119C:00000004000400040004000400043FFE00000000000000000000000000000000 +119D:00000020002000200020002000200020000000C0002000100000000000000000 +119E:00000000000000000000000000000000000000C0002000100000000000000000 +119F:000000100010001000700C100210011000000000000000000000000000000000 +11A0:000000000000000000000060001000083FFE0080008000000000000000000000 +11A1:0000001000100010001018100410021000000000000000000000000000000000 +11A2:0000000000000000000018600410020800000000000000000000000000000000 +11A3:000000000000000000000020002000200038002000203FF80000000000000000 +11A4:000000000000000000080008000E0008000E000800083FFE0080008000000000 +11A5:000000000000000000280028002E00E8002800EE002800280028000000000000 +11A6:0000000000100010001E011001103FFE00100000000000000000000000000000 +11A7:0000002400240024003C042404FC3F2400000000000000000000000000000000 +11A8:00000000000000000000000000000000000007F0001000100010001000000000 +11A9:0000000000000000000000000000000000000F78010801080108010800000000 +11AA:0000000000000000000000000000000000000F10011001100128014400000000 +11AB:000000000000000000000000000000000000040004000400040007F000000000 +11AC:00000000000000000000000000000000000008F80820082008500F8800000000 +11AD:000000000000000000000000000000000000083008FC083008480F3000000000 +11AE:00000000000000000000000000000000000007F004000400040007F000000000 +11AF:00000000000000000000000000000000000007F0001007F0040007F000000000 +11B0:0000000000000000000000000000000000000F7801080F0808080F0800000000 +11B1:0000000000000000000000000000000000001EF002901E9010901EF000000000 +11B2:0000000000000000000000000000000000001E9002901EF010901EF000000000 +11B3:0000000000000000000000000000000000001E2002201E2010501E8800000000 +11B4:0000000000000000000000000000000000001EF002801EF010801EF000000000 +11B5:0000000000000000000000000000000000001EF802501E5010501EF800000000 +11B6:0000000000000000000000000000000000001E6003F81E6010901E6000000000 +11B7:00000000000000000000000000000000000007F004100410041007F000000000 +11B8:0000000000000000000000000000000000000410041007F0041007F000000000 +11B9:000000000000000000000000000000000000122012201E2012501E8800000000 +11BA:0000000000000000000000000000000000000040004000C003201C1000000000 +11BB:0000000000000000000000000000000000000120012003A00C50318800000000 +11BC:00000000000000000000000000000000000001C002200220022001C000000000 +11BD:00000000000000000000000000000000000007F0008000800140022000000000 +11BE:00000000000000000000000000000000000001E0000007F8004003A00C180000 +11BF:00000000000000000000000000000000000007F0001007F00010001000000000 +11C0:00000000000000000000000000000000000007F0040007F0040007F000000000 +11C1:0000000000000000000000000000000000000FF00240024002400FF000000000 +11C2:000000000000000000000000000001C0000007F0000001C0022001C000000000 +11C3:0000000000000000000000000000000000007E7C0204027C0240027C00000000 +11C4:00000000000000000000000000000000789E0882088209420A22000000000000 +11C5:00000000000000000000000000000000000021FC2004200420043F8400000000 +11C6:000000000000000000000000000000000000207C2040204020403E7C00000000 +11C7:00000000000000000000000000000000000020202020202020503E8800000000 +11C8:00000000000000000000000000000000000040104028404440827CFE00000000 +11C9:000000000000000000000000000000000000207C2040207C20403E7C00000000 +11CA:0000000000000000000000000000000000003E7C2004200420043E0400000000 +11CB:0000000000000000000000000000000000003E7C2004207C20403E7C00000000 +11CC:0000000000000000000000000000000000007BC408447844404A785100000000 +11CD:0000000000000000000000000000000000003E4002403E4020403E7C00000000 +11CE:0000000000000000000000000000000000003E7C02403E4020403E7C00000000 +11CF:000000000000000000000000000000000000F78C143FF40C8412F78C00000000 +11D0:0000000000000000000000000000000000003E7C02043E7C20403E7C00000000 +11D1:0000000000000000000000000000000000007BDE0A427A4242427BC200000000 +11D2:0000000000000000000000000000000000007BC40A447A44424A7BD100000000 +11D3:0000000000000000000000000000000000007A440A447BC4424A7BD100000000 +11D4:000000000000000000000000000000000000F48C14BFF78C8492F78C00000000 +11D5:0000000000000000000000000000004800783E4802783E3020483E3000000000 +11D6:00000000000000000000000000000000000078880888788841547A2200000000 +11D7:0000000000000000000000000000000000003C2004503C8821043DFC00000000 +11D8:0000000000000000000000000000000000003E7C02043E7C20043E0400000000 +11D9:0000000000000000000000000000000000003E3802FE3E3820443E3800000000 +11DA:0000000000000000000000000000000000003E7C2204220422043E0400000000 +11DB:0000000000000000000000000000000000003E7C2204227C22403E7C00000000 +11DC:0000000000000000000000000000000000003E442244227C22443E7C00000000 +11DD:0000000000000000000000000000000000001F101110111011281F4400000000 +11DE:0000000000000000000000000000000000007C444444444444AA7D1100000000 +11DF:0000000000000000000000000000000000003E102228224422823EFE00000000 +11E0:0000000000000000000000000000000000383E0022FE220822343EC200000000 +11E1:0000000000000000000000000000000000003E3822FE223822443E3800000000 +11E2:00000000000000000000000000000FE008200FE0000003800440038000000000 +11E3:000000000000000000000000000000000000227C22043E7C22403E7C00000000 +11E4:000000000000000000000000000000000000227C22283E2822283E7C00000000 +11E5:000000000000000000000000000000000000223822FE3E3822443E3800000000 +11E6:0000000000000000000000000000041007F0041007F001C0022001C000000000 +11E7:00000000000000000000000000000000000004F8040804080A08110800000000 +11E8:000000000000000000000000000000000000047C044004400A40117C00000000 +11E9:00000000000000000000000000000000000008F8080808F8148022F800000000 +11EA:00000000000000000000000000000000000004440444047C0A44117C00000000 +11EB:00000000000000000000000000000000000001000280044008201FF000000000 +11EC:0000000000000000000000000000000000000E7C1104110411040E0400000000 +11ED:00000000000000000000000000000000000039DC444444444444384400000000 +11EE:0000000000000000000000000000000000001C382244224422441C3800000000 +11EF:0000000000000000000000000000000000001C7C2204227C22041C0400000000 +11F0:0000000000000000000000000000010001000380044004400440038000000000 +11F1:0000000000000000000000000000000000001C202220222022501C8800000000 +11F2:000000000000000000000000000000000000382044504488450439FC00000000 +11F3:0000000000000000000000000000000000003E441444147C14443E7C00000000 +11F4:000000000000000000000000000000000FF002400FF003C0042003C000000000 +11F5:0000000000000000000000000000000000001C407F401C4022401C7C00000000 +11F6:0000000000000000000000000000000000001C7C7F041C7C22401C7C00000000 +11F7:0000000000000000000000000000000000001C7C7F441C4422441C7C00000000 +11F8:0000000000000000000000000000000000001C447F441C7C22441C7C00000000 +11F9:00000000000000000000000000000000000003800FE003800440038000000000 +11FA:0000000000000000000000000000000000003E40024002400240027C00000000 +11FB:0000000000000000000000000000000000003E440244027C0244027C00000000 +11FC:0000000000000000000000000000000000383E0002FE0208023402C200000000 +11FD:0000000000000000000000000000000000003E7C0204027C0204020400000000 +11FE:0000000000000000000000000000000000003E3802FE02380244023800000000 +11FF:00000000000000000000000000000000000020402040204020403E7C00000000 +1200:00000000000001C030C030C030C030C030C030C0318031801F000E0000000000 +1201:00000000000001C030C030C030C030FC30CC30C0318031801F000E0000000000 +1202:0000000006600C600C600C600C6007C003C000C001800300033003F000000000 +1203:0000000006600C600C600C600C6007C003C000C0018003000300030000000000 +1204:0000000006600C600C600C600C6007C003C000C001C00340032003E000000000 +1205:000000000000187018301C300E3006300C300C300C300C6007E003C000000000 +1206:00000000000000F030C830D830E030C030C030C0318031801F000E0000000000 +1207:000000000000003C0C320C360C386C307C306C300C600C6007C0038000000000 +1208:00000000030003000300078007C00CE00C600C600C600C600C600C6000000000 +1209:000000000C000C000C001E001F0033803180318031F831983180318000000000 +120A:000000000C000C000C001E001F0033803180318031803180319831F800000000 +120B:00000000030003000300078007C00CE00C600C600C6000600060006000000000 +120C:000000000C000C000C001E001F00338031803180318031F0319831F000000000 +120D:00000000030003000300078007C00CE00C60186018601E601B601E6000000000 +120E:000000000C000C000C001E001F003380318031F831AC31B83180318000000000 +120F:00000000030003000300078007C00CE00C600C600C6000600060006003FC070E +1210:000000000180018001800180018007E00DB00DB0199819981998199800000000 +1211:00000000060006000600060006001F8036C036C0667E66666660666000000000 +1212:00000000060006000600060006001F8036C036C0666066606666667E00000000 +1213:000000000180018001800180018007E00DB00DB0199800180018001800000000 +1214:00000000060006000600060006001F8036C036C066406678664C667800000000 +1215:000000000600060006000780018007E00DB00DB0199819981998199800000000 +1216:000000000180018001800180018007E00DB00DB0199818001800180000000000 +1217:0000030003000300030003000FC01B601B60333000300030003001FE03870000 +1218:000000000000000000000FFC1FFC112431642344264C3C783C70000000000000 +1219:000000000000000000003FF07FF04490C59E8D129932F1E0F1C0000000000000 +121A:000000001FF83FF86288428845087DF838F80010001000200026003E00000000 +121B:000000000FFC1FFC3144214422843EFC1C7C0008000800100010001000000000 +121C:000000001FF83FF86288428845087DF838F800100010003C0026003C00000000 +121D:000000001FF01FF832882288228822F83E701E00020006000C00180000000000 +121E:000000001FF01FF832882288228822F83E701E00020002000200030000000000 +121F:000000001FF83FF86288428845087DF838F80010001000300020002001F8030C +1220:00000000000000000998199819981998199819B019F00D800780000000000000 +1221:000000000000000026C066C066FC66CC66C066C067C036001E00000000000000 +1222:000000006640666066606660666076E03FE00060006000600066007E00000000 +1223:00000000199019981998199819981DB80FF80018001800180018001800000000 +1224:00000000332033303330333033303B701FF00030003000380064007800000000 +1225:00000000199019981998199819981DB81FF01C00180018001800180000000000 +1226:00000000199819981998199819981DB80FF00380030007000E000C0000000000 +1227:00006640666066606660666076E03FE00060006000600060006003FC070E0000 +1228:00000000018001800180030007000E001C00180018001C600FE007E000000000 +1229:000000000300030007000E001C001800300038001FF00FF00180018000000000 +122A:00000000018001800180030007000E001C00186018701C300FE007C000000000 +122B:0000000003000300030006000E001C003800307830F839981F800F0000000000 +122C:00000000018001800180030007000E001C00180018001CF00F9807F000000000 +122D:00000000000007E00FE018601800180018001800180018601FE00FC000000000 +122E:00000000000007F00F9818F01800180018001800180018601FE00FC000000000 +122F:0000000030301CE00300030006000E001C003800307830F839981F800F000000 +1230:0000000001000100038007C00C600C600C600C600C600C600C600C6000000000 +1231:00000000040004000E001F0031803180318031F8319831803180318000000000 +1232:00000000040004000E001F00318031803180318031803180319831F800000000 +1233:0000000001000100038007C00C600C600C600C600C6000600060006000000000 +1234:000000000200020007000F8018C018C018C018C018E018D018C818F800000000 +1235:0000000000000300018001C003E0063006300630063006300630063000000000 +1236:0000000001000100038007C00C600C600C600C600C600C000C000C0000000000 +1237:0000000001000100038007C00C600C600C600C600C6000600060006001F8030C +1238:0000000030601FC0020007000F8018C018C018C018C018C018C018C000000000 +1239:0000000030601FC0020007000F8018C018C018FC18CC18CC18C018C000000000 +123A:0000000030601FC0020007000F8018C018C018C018C018C018CC18FC00000000 +123B:0000000018300FE00100038007C00C600C600C600C6000600060006000000000 +123C:0000000030601FC0020007000F8018C018C018C018C018F818CC18F800000000 +123D:0000000018600FC0018001C003E0033006300630063006300630063000000000 +123E:0000000018300FE00100038007C00C600C600C600C600C000C000C0000000000 +123F:0000000030601FC0020007000F8018C018C018C018C018C000C000C003F00618 +1240:0000000001800180018003F00D98199819B00FC0018001800180018000000000 +1241:0000000003000300030007E01B30333033601F80030003F00330030000000000 +1242:0000000003000300030007E01B30333033601F8003000300033003F000000000 +1243:0000000001800180018003F00D98199819B00FC00180030006000C0000000000 +1244:0000000003000300030007E01B30333033601F80030003E0033003E000000000 +1245:00000000060006000780018003F00D98199819B00FC001800180018000000000 +1246:0000000001C0026002C0030007E01B30333033601F8003000300030000000000 +1247:0000000001C0026002C0030007E01B30333033601F80030033003F0030000000 +1248:0000000001800180018003F00D98199819B00FC001F801AC01B8018000000000 +1249:00007FFE7B8673F67B867BBE71867FFE7FFE6DCE6DB661C67DF67DCE7FFE0000 +124A:000000000600060006000FC0366C666C66FC3F07060306000600060000000000 +124B:0000000001800180018003F00D98199819B00FC0018001800180018007E00C30 +124C:0000000001800180018003F00D98199819B00FC00180018001F0019807F00C00 +124D:000000000600061806180FFE3666666066C03F00060006000600060000000000 +124E:00007FFE7B8673F67B867BBE71867FFE7FFE6D866DBE618E7DBE7D867FFE0000 +124F:00007FFE7B8673F67B867BBE71867FFE7FFE6D866DBE618E7DBE7DBE7FFE0000 +1250:000000000C3007E00180018003F00D98199819B00FC001800180018000000000 +1251:0000000018600FC00300030007E01B30333033601F80030003F0033000000000 +1252:0000000018600FC00300030007E01B30333033601F800300033003F000000000 +1253:000000000C3007E00180018003F00D98199819B00FC001800300060000000000 +1254:0000000018600FC0030007E01B30333033601F80030003E0033003E000000000 +1255:0000000030C01F8006000780018003F00D98199819B00FC00180018000000000 +1256:000000000C1807F001200160018003F00D98199819B00FC00180018000000000 +1257:00007FFE7B8673F67B867BBE71867FFE7FFE61866FF661EE7DDE61DE7FFE0000 +1258:0000000018600FC0030007E01B30333033601F8003F003580370030000000000 +1259:00007FFE7B8673F67B867BBE71867FFE7FFE61CE6FB661C67DF661CE7FFE0000 +125A:0000000030C01F80060006000FC0366C666C66FC3F0706030600060000000000 +125B:000000000C3007E00180018003F00D98199819B00FC001800180018007E00C30 +125C:000000000C3007E00180018003F00D98199819B00FC0018001F0019807F00C00 +125D:0000000030C01F80061806180FFE3666666066C03F0006000600060000000000 +125E:00007FFE7B8673F67B867BBE71867FFE7FFE61866FBE618E7DBE61867FFE0000 +125F:00007FFE7B8673F67B867BBE71867FFE7FFE61866FBE618E7DBE61BE7FFE0000 +1260:000000000000038007C00C600C600C600C600C600C600C600C600C6000000000 +1261:0000000000000E001F0031803180318031F83198319831803180318000000000 +1262:0000000000000E001F003180318031803180318031803180319831F800000000 +1263:000000000000038007C00C600C600C600C600C60006000600060006000000000 +1264:00000000000007000F8018C018C018C018C018C018C018F818CC18F800000000 +1265:00000000000000E001F00318031803183F183318331803180318031800000000 +1266:000000000000038007C00C600C600C600C600C600C000C000C000C0000000000 +1267:000000000000038007C00C600C600C600C600C60006000600060006001F8030C +1268:0000000030601FC0000007000F8018C018C018C018C018C018C018C000000000 +1269:0000000030601FC0000007000F8018C018C018FC18CC18CC18C018C000000000 +126A:0000000030601FC0000007000F8018C018C018C018C018C018CC18FC00000000 +126B:0000000030601FC0000007000F8018C018C018C018C018C000C000C000000000 +126C:0000000060C03F8000000E001F00318031803180318031F0319831F000000000 +126D:000000000C1807F0000001C003E0063006307E30663066300630063000000000 +126E:0000000030601FC0000007000F8018C018C018C018C018C01800180000000000 +126F:0000000030601FC0000007000F8018C018C018C018C018C000C000C003F00618 +1270:0000000007000300030003003FF07FF863180300030003000300030000000000 +1271:0000000007000300030003003FF07FF86318030003F003300300030000000000 +1272:0000000007000300030003003FF07FF86318030003000300033003F000000000 +1273:0000000007000300030003003FF07FF863180300030007000E001C0000000000 +1274:0000000007000300030003003FF07FF863180300030003E0033003E000000000 +1275:00000000060007000380018001801FF83FFC318C018001800180018000000000 +1276:0000000003E00320016001801FF83FFC318C0180018001800180018000000000 +1277:0000000003800180018001801FF83FFC318C0180018001800180018007E00C30 +1278:0000000018181FF83FFC318C01801FF83FFC318C018001800180018000000000 +1279:0000000018181FF83FFC318C01801FF83FFC318C018001F80198018000000000 +127A:0000000018181FF83FFC318C01801FF83FFC318C01800180019801F800000000 +127B:0000000030303FF07FF8631803003FF07FF86318030007000E001C0000000000 +127C:0000000030303FF07FF8631803003FF07FF86318030003E0033003E000000000 +127D:0000000030C03FC07FE06660070001801FF83FFC318C01800180018000000000 +127E:000000000C301FF81A58024001801FF83FFC318C018001800180018000000000 +127F:0000000018181FF83FFC318C01801FF83FFC318C018001800180018007E00C30 +1280:000000000180018001801F8019E0006000600060006000600060006000000000 +1281:000000000300030003003F0033C000C000C000FC00CC00C000C000C000000000 +1282:000000000300030003003F0033C000C000C000C000C000C000CC00FC00000000 +1283:0000000000C000C000C00FC00CF000300030003000E001800300030000000000 +1284:000000000300030003003F0033C000C000C000C000C000F800CC00F800000000 +1285:0000000000C000C000C003C006F00C300C300030003000300030003000000000 +1286:0000000001F803E406383E003600060007E003E0006000600060006000000000 +1287:0000000001F803E406383E003600060007E003E000600060066007E006000000 +1288:000000000600060006007E006780018001F801AC01B801800180018000000000 +1289:00007FFE7B8673F67B867BBE71867FFE7FFE73CE6DB673C66DF673CE7FFE0000 +128A:000000000600060006007E0067800198019801F8018E01860180018000000000 +128B:000000000180018001801F8019E0006000600060006000600060006001F8030C +128C:000000000300030003003F0033C000C000C000C000C000C000F800CC03F80600 +128D:000000000600060006007E3067B001FC018C0180018001800180018000000000 +128E:00007FFE7B8673F67B867BBE71867FFE7FFE73866DBE738E6DBE73867FFE0000 +128F:00007FFE7B8673F67B867BBE71867FFE7FFE73866DBE738E6DBE73BE7FFE0000 +1290:00000000060006000600078001C0018001800180030003000300030000000000 +1291:00000000060006000600078001C00180018001F0033003000300030000000000 +1292:000000000C000C000C000F00038003000300030006000600066007E000000000 +1293:0000000007C00FE01860300038001F0003800180010003000300030000000000 +1294:00000000060006000600078001C001800180018003C00320036003C000000000 +1295:000000003FC03F803180030007C000C0018003000300060006000C0000000000 +1296:0000000007F00FC81858303038001F0003800180010003000300030000000000 +1297:00000000000007C00FE01860300038001F00038001800100030003000FC01860 +1298:000000000C301FF81188018001E000700060006000C000C000C000C000000000 +1299:0000000018603FF02310030003C000E000C000F8019801800180018000000000 +129A:0000000018603FF02310030003C000E000C000C001800180019801F800000000 +129B:00000C301FF8118807C00FE01860300038001F00038001800300030000000000 +129C:0000000018603FF02310030003C000E000C000C001E0019001B001E000000000 +129D:000030C07FE046201FC03F803180030007C000C0018003000300030000000000 +129E:00000C601FF0111007F00FC81858303038001F00038001800300030000000000 +129F:00000C301FF8118807C00FE01860300038001F0003800180030003000FC01860 +12A0:0000000006000600060007800180038003C006E00E600C600C600C6000000000 +12A1:000000001800180018001E0006000E000F001B8039F831983180318000000000 +12A2:000000001800180018001E0006000E000F001B8039803180319831F800000000 +12A3:000000000600060006000780018003C006E00C600C600C600060006000000000 +12A4:000000001800180018001E0006000E000F001B80398031F0319831F000000000 +12A5:000000000C000C000E0006000300038007C00EE00C600C600C600C6000000000 +12A6:000000000600060006000780018003C006E00C600C600C600C000C0000000000 +12A7:000018C01FC03660060007800180038003C006E00E600C600C600C6000000000 +12A8:000000000000180019C01FE01E30063006300630063006300630063000000000 +12A9:000000000000600067007F8078C018C018C018FC18CC18C018C018C000000000 +12AA:000000000000600067007F8078C018C018C018C018C018C018CC18FC00000000 +12AB:000000000000180019C01FE01E30063006300630063000300030003000000000 +12AC:000000000000600067007F8078C018C018C018C018C018F818CC18F800000000 +12AD:000000000000180019C01BE01E300C300E300630063006300630063000000000 +12AE:000000000000180019C01FE01E30063006300630063006000600060000000000 +12AF:0000000000000C000CE00FF00F18031833183F18331803000300030000000000 +12B0:000000000000600066007F007980198019F819AC19B819801980198000000000 +12B1:00007FFE7B8673F67B867BBE71867FFE7FFE63EE6DCE63EE6DEE63C67FFE0000 +12B2:000000000000600066007F0079801998199819F8198E19861980198000000000 +12B3:000000000000180019C01FE01E30063006300630063000300030003000FC0186 +12B4:000000000000600067007F8078C018C018C018C018C000C000F800CC03F80600 +12B5:000000000000600066307F3079FC198C19801980198019801980198000000000 +12B6:00007FFE7B8673F67B867BBE71867FFE7FFE63CE6DBE638E6DB663CE7FFE0000 +12B7:00007FFE7B8673F67B867BBE71867FFE7FFE63866DF663EE6DDE63DE7FFE0000 +12B8:0000000061803F000C000DC00FE0063006300630063006300630063000000000 +12B9:00000000C3007E0018001B801FC00C600C600C7E0C660C600C600C6000000000 +12BA:00000000C3007E0018001B801FC00C600C600C600C600C600C660C7E00000000 +12BB:0000000061803F000C000DC00FE0063006300630063000300030003000000000 +12BC:0000000061803F000C000DC00FE00630063006300630063E0633063E00000000 +12BD:0000000061803F000C000EE00FF0031803980198019801980198019800000000 +12BE:0000000061803F000C000DC00FE0063006300630063006000600060000000000 +12BF:00007FFE7B8673F67B867BBE71867FFE7FFE63866DBE638E6DBE63BE7FFE0000 +12C0:00000000C3007E0018001B801FC00C600C7E0C6B0C6E0C600C600C6000000000 +12C1:00007FFE7B8673F67B867BBE71867FFE7FFE71EE6FCE6FEE6FEE71C67FFE0000 +12C2:00000000C3007E0018001B001F800CCC0CCC0CFC0CC70CC30CC00CC000000000 +12C3:0000000061803F000C000DC00FE0067006300630063000300030003000FC0186 +12C4:0000000061803F000C000DC00FE006700630063006300030003E003300FE0180 +12C5:00000000C3007E00180C1B8C1FFF0C630C600C600C600C600C600C6000000000 +12C6:00007FFE7B8673F67B867BBE71867FFE7FFE71CE6FBE6F8E6FB671CE7FFE0000 +12C7:00007FFE7B8673F67B867BBE71867FFE7FFE71866FF66FEE6FDE71DE7FFE0000 +12C8:000000000000000000000FF01DB831983198331833303B701FC0000000000000 +12C9:000000000000000000003FC076E0C660C660CC60CCE0EDC67FFC000C00000000 +12CA:000000000FF01DB83198319833183BB01FE0030003000700066007E000000000 +12CB:000000000FF01DB83198319833183BB01FE00300030003000300070000000000 +12CC:000000000FF01DB83198319833183BB01FE0030003000780066007C000000000 +12CD:000000000000000000003FC076E0C660C67ECC66CCC2EDC07F00000000000000 +12CE:000000000FF01DB83198319833183BB01FE0030006000C001800180000000000 +12CF:0000000003FC076E6C667C666CC60EEC07F800C0018003000600060000000000 +12D0:00000000000001E006300C300C300C300C300C300C300C3007F0060000000000 +12D1:000000000000078018C030C030C030C030C030FC30CC30C01FC0180000000000 +12D2:0000000000001F0031806180618061803FC000C000C00180019801F800000000 +12D3:00000000000007C00C601860186018600FF00030003000300060006000000000 +12D4:0000000000001F0031806180618061803FC000C000C001F0019801F000000000 +12D5:000001800180018007E00E300C300C300C300C300C300C3007F0060000000000 +12D6:0000000003C006600C300C300C300E7007E003C007000C000C000C0000000000 +12D7:00007FFE7B8673F67B867BBE71867FFE7FFE63866DF66DEE6DDE63DE7FFE0000 +12D8:000000000C600C600C600C600C600FE00FE00C600C600C600C600C6000000000 +12D9:00000000318031803180318031803F803F8031F8319831983180318000000000 +12DA:00000000318031803180318031803F803F80318031803180319831F800000000 +12DB:000000000C600C600C600C600FE00FE00C600C600C6000600060006000000000 +12DC:0000000018C018C018C018C018C01FC01FC018C018C018F818CC18F800000000 +12DD:000000001C30363036300630063007F007F00630063006300630063000000000 +12DE:000000000C600C600C600C600FE00FE00C600C600C600C000C000C0000000000 +12DF:000000000C600C600C600C600FE00FE00C600C600C6000600060006001F8030C +12E0:000000001C38366C366C0660066007E007E00660066006600660066000000000 +12E1:0000000038706CD86CD80CC00CC00FC00FC00CFC0CCC0CCC0CC00CC000000000 +12E2:0000000038706CD86CD80CC00CC00FC00FC00CC00CC00CC00CCC0CFC00000000 +12E3:000000001C38366C366C066007E007E006600660066000600060006000000000 +12E4:0000000038706CD86CD80CC00CC00FC00FC00CC00CC00CF80CCC0CF800000000 +12E5:000061803F000C001C38366C366C066007E007E0066006600660066000000000 +12E6:000000001C38366C366C066007E007E006600660066006000600060000000000 +12E7:000000001C38366C366C066007E007E006600660066000600060006001F8030C +12E8:00000000038006C00C600C600C600C600EC00780030003000300030000000000 +12E9:00000000038006C00C600C600C600C600EC00780030003F00330030000000000 +12EA:0000000007000D8018C018C018C018C01D800F00066007F80618060000000000 +12EB:0000000001C00360063006300630066007C0038001C0006001C0038000000000 +12EC:0000000007000D8018C018C018C018C01D800F0006F0079806F0060000000000 +12ED:00000000000007800CC018C018C018C00D800F30073003E03E00700060000000 +12EE:000000000E001B00318031F8319831803B001E000C000C000C000C0000000000 +12EF:00000000038006C00C600C7E0C660C606EC07F80630003000300030000000000 +12F0:00000000038007C00C400C400CC00F8006000300030001801FF8181800000000 +12F1:0000000007000F80188019801F000C0006001FC030C030FC018C018000000000 +12F2:0000000007000F80188019801F000C0006001FC030C030C0019801F800000000 +12F3:0000000001C003E00620066007C0030001800FF00C300C300030003000000000 +12F4:0000000007000F801880188019801F000C000600060003F03F9830F000000000 +12F5:0000000007000F8018F8189819801F000C000600060003003FF0303000000000 +12F6:0000000001C003E00620066007C0038007F00C30180018001800180000000000 +12F7:0000000001C003E00620066007C0030001800FF00C300C300030003000FC0186 +12F8:0000000001000100038007C00C400CC00F800600030001800FF00C3000000000 +12F9:000000000200020007000F80188019801F000C001FC030FC318C018000000000 +12FA:000000000200020007000F80188019801F000C001FC030C0319801F800000000 +12FB:0000000001000100038007C00C400CC00F8006001FE018600060006000000000 +12FC:00000000040004000E001F00310033003E0018000C0006F03F9830F000000000 +12FD:000000000200020007000F8018F819981F000C00060003001FE0186000000000 +12FE:0000000001000100038007C00C400CC00F8007F00C3018001800180000000000 +12FF:0080008001C003E00620066007C0030001800FF00C300C300030003000FC0186 +1300:000030301FE0030007800CC00C400CC007800600070003001FE0186000000000 +1301:000060603FC006000F00198019800F0006001FC030C030FC018C018000000000 +1302:000060603FC006000F00198019800F0006001FC030C030C0019801F800000000 +1303:000030301FE0030007800CC00CC0078003001FE0186018600060006000000000 +1304:000060603FC006000F001980188019800F000C000E0007F03F9830F000000000 +1305:000030301FE0030007800CC00C7C0CCC07800600070003001FE0186000000000 +1306:000030301FE0030007800CC00CC0078007F00C30180018001800180000000000 +1307:000030301FE0030007800CC00CC0078003001FE0186018600060006003FC070E +1308:0000000000000F8018C018C000C000C000C00180018001800180018000000000 +1309:0000000000001F003180318001800180018003F8031803000300030000000000 +130A:0000000000000F8018C018C000C000C000C0018001800180019801F800000000 +130B:00000000000007800FE00C6000600060006000C001C007800E000C0000000000 +130C:0000000000000F8018C018C000C000C000C00180018001F0019801F000000000 +130D:0000000000000FE019B00F300030003000600060006000600060006000000000 +130E:0000000001000100010007C00C600C600060004000C000C000C000C000000000 +130F:0000000001000100010007C00C600C600060004000C000C00CC00FC00C000000 +1310:0000000000001F00318031800180018001F803AC033803000300030000000000 +1311:00007FFE7B8E73F67BC67BF6718E7FFE7FFE7BEE73CE7BEE7BEE71C67FFE0000 +1312:0000000000001F0031803180018001B001B003F0031C030C0300030000000000 +1313:00000000000007800CC00CC000C007E006600060006000600060006000000000 +1314:0000000000000F8018C018C000C000C000C001800180018001F0019807F00C00 +1315:0000000000001F0031B031B001FC018C01800380030003000300030000000000 +1316:00007FFE7B8E73F67BC67BF6718E7FFE7FFE7BCE73BE7B8E7BB671CE7FFE0000 +1317:00007FFE7B8E73F67BC67BF6718E7FFE7FFE7B8673F67BEE7BDE71DE7FFE0000 +1318:000000000C3007E0000007C00C600C600060004000C000C000C000C000000000 +1319:0000000030C01F8000001F00318031800180018003F803180300030000000000 +131A:0000000018600FC000000F8018C018C000C0008001800180019801F800000000 +131B:000000000C3007E0000003C007F004300030003000E003C007000E0000000000 +131C:0000000018600FC000000F8018C018C000C00080018001F0019801F000000000 +131D:0000000018600FC000000FE019B00F3000300020006000600060006000000000 +131E:000000000C6007C0010007C00C600C600060004000C000C000C000C000000000 +131F:0000000018600FC002000F8018C018C000C000800180018001800FF00C300000 +1320:000000000000000007C00D600D60193019301930193019301930193000000000 +1321:00000000000000001F003580358064C064C064FC64CC64C064C064C000000000 +1322:00000000000000001F003580358064C064C064C064C064C064CC64FC00000000 +1323:00000000000007C00D600D601930193019301930003000300030003000000000 +1324:0000000000001F003580358064C064C064C064C064C064F864CC64F800000000 +1325:0000000000000FE01FF013303318339831980180018001800180018000000000 +1326:00000000000007C00D600D601930193019301930180018001800180000000000 +1327:00000000000007C00D600D601930193019301930003000300030003000FC0186 +1328:00000000000000001F803FC06260C230C230C230F338DAB6CAB2FBBE00000000 +1329:00000000000000001F803FC06260C230C23FC233F338DAB4CAB2FBBE00000000 +132A:00000000000000001F803FC06260C230C230C230F330DAB0CAB3FBBF00000000 +132B:000000000FE01FF0311861187198695865587DD8001800340032003E00000000 +132C:00000000000000001F803FC06260C23FC239C237F330DABCCAB2FBBE00000000 +132D:0000000000001FC07FE0C630E6389724F33C030003800340032003E000000000 +132E:000000000FE01FF01A183218231862946252639C7000680064007C0000000000 +132F:0000000000000FE01FF0311861187198695865587DD800180030003000FC0186 +1330:0000000001800180018003C00660066003C007E00E700C300C300C3000000000 +1331:000000000600060006000F00198019800F001F8039C030FC30CC30C000000000 +1332:000000000600060006000F00198019800F001F8039C030C030CC30FC00000000 +1333:0000000001800180018003C0066003C007E00E700C700C300030003000000000 +1334:000000000600060006000F00198019800F001F8039C030F830CC30F800000000 +1335:000000000600060006000F0019F819980F001F8039C030C030C030C000000000 +1336:0000000001800180018003C0066003C007E00E700C300C300C000C0000000000 +1337:0000000003000300030007800CC007800FC01CC018E018600060006001F8030C +1338:0000000000000000018003C00660066003C007E00E700C300C300C3000000000 +1339:000000000000000006000F00198019800F001F8039C030FC30CC30C000000000 +133A:000000000000000006000F00198019800F001F8039C030C030CC30FC00000000 +133B:000000000000030007800CC00CC007800FC01CC018E018600060006000000000 +133C:000000000000000006000F00198019800F001F8039C030F030D830F000000000 +133D:000000000000000006000F0019F819980F001F8039C030C030C030C000000000 +133E:000000000000030007800CC00CC007800FC01CE0186018601800180000000000 +133F:000000000000030007800CC00CC007800FC01CC018E018600060006001F8030C +1340:00000000000001E006300C300C300C300FF00C300C300C3007F0060000000000 +1341:000000000000078018C030C030C030C03FC030FC30CC30C01FC0180000000000 +1342:000000007E00C300C300FF00C300C3007F00030003000300033003F000000000 +1343:00007EC3C3FFC3C37F03030303030000 +1344:000000007E00C300C300FF00C300C3007F000300030003E0033003E000000000 +1345:000001800180018007E00E300C300C300FF00C300C300C3007F0060000000000 +1346:0000000003C006600C300FF00C300E7007E003C007000C000C000C0000000000 +1347:0000000001E0033036183FF83618073803F001E0038006000600060000000000 +1348:00000000000000C0004000C00180030006000F00198018880FF803E800000000 +1349:000000000000000000800180030006000C001F00191019F01FC0030006000600 +134A:000000000000018000800180030006000C001E30331031301FE00F8000000000 +134B:000000000000000002000300060004000C001C00360033201FF0031003000300 +134C:00000000018000800180030006000C001E00330031301FE807C8007000000000 +134D:00000000000000000F8019C010C0300030003E0033C037401B00030003000300 +134E:00000000000007E00F9018F03000300030003C003A0031301B600FE000000000 +134F:00000000000002000300060004000C001C00360033201FF0031003000FC01860 +1350:000000000C300FF01FF819980180018001800180018001800180018000000000 +1351:000000000C300FF01FF8199801800180018001F8019801800180018000000000 +1352:000000000C300FF01FF81998018001800180018001800180019801F800000000 +1353:000000000C300FF01FF819980180018001800180030006000C00080000000000 +1354:000000000C300FF01FF819980180018001800180018001F0019801F000000000 +1355:000000000C300FF01FF81998018001E000600060006000600060006000000000 +1356:000000000C300FF01FF819980180018003000300060006000600060000000000 +1357:000000000C300FF01FF81998018001800180018001800180018001800FF01C38 +1358:000018180FF0018001800180030007000E001C00186018701C300FE007C00000 +1359:1C1C07F001C00FFC1FFC3144214422843EFC1C7C000800080010001000100000 +135A:000018180FF0018000800180030006000C001E30331031301FE00F8000000000 +135B:00007FFE7B8E73F67BC67BF6718E7FFE7FFE618E6FB6618E7DB6618E7FFE0000 +135C:00007FFE7B8E73F67BC67BF6718E7FFE7FFE61C66FBE61BE7DBE61C67FFE0000 +135D:1998199800000000000000000000000000000000000000000000000000000000 +135E:0180018000000000000000000000000000000000000000000000000000000000 +135F:0C300C3000000000000000000000000000000000000000000000000000000000 +1360:0000000000000180099004200240199819980240042009900180000000000000 +1361:00000000000303000003030000000000 +1362:0000000000000000000006600660000000000660066000000000000000000000 +1363:000000000000000007E000000180018000000180018000000000000000000000 +1364:000000000000000007E0000001800180000001800180000007E0000000000000 +1365:00000000000000000600060000001F8000000600060000000000000000000000 +1366:000000000000000006000600000003C000000600060000000000000000000000 +1367:0000000000000180018000000000018001800000000001800180000000000000 +1368:000000000000018001800C300C30018001800C300C3001800180000000000000 +1369:0000000018300FE0000001800180030007C00C600C6007C000000FE018300000 +136A:000000000C1807F0000001C00360066007C0060007C0036001C007F00C180000 +136B:0000000000000C3007E0000007E006600600060006000600000007E00C300000 +136C:0000000000000C3007E0000003C0066006600660066003C0000007E00C300000 +136D:0000000018300FE000000300030007E00E600C000C6007E000000FE018300000 +136E:000018300FE0000007800FC00CC000C0018001C0036003C000000FE018300000 +136F:000018300FE0000007800FC00CC000C001800100032003E000000FE018300000 +1370:0000000018180FF000000FF00DB00180018001800FF00C3000000FF018180000 +1371:000000000C3007E0000000000660066007E0066006400380000007E00C300000 +1372:0000000000000C3007E00000018001800180018001800180000007E00C300000 +1373:00000000000018180FF0000007E005A0018003C00660066000000FF018180000 +1374:00000000000018180FF0000005E00DB00DB00DB00DB0073000000FF018180000 +1375:0000000018180FF000000DB00DB00DB007F000300030003000000FF018180000 +1376:000000000C3007E0000003E0066003E0006000C000C000C0000007E00C300000 +1377:0000000018180FF000000FF00DB0018001C000C00FF00C3000000FF018180000 +1378:0000000000000C3007E0000003E006B006E00600066003E0000007E00C300000 +1379:00000000000030181FF000001FF016D006C006C006C006C000001FF030180000 +137A:000018300FE0000007C006C0018001C000C001800180018000000FE018300000 +137B:000000000C3007E0000003C0066007C00600030003000300000007E00C300000 +137C:00000000300C1FF800001E7833CC3EF830C018601860186000001FF8300C0000 +137D:00007FFE7B8E73F67BC67BF6718E7FFE7FFE618E7DB67BB677B6778E7FFE0000 +137E:00007FFE7B8E73F67BC67BF6718E7FFE7FFE61867DBE7B8E77BE77867FFE0000 +137F:00007FFE7B8E73F67BC67BF6718E7FFE7FFE61867DBE7B8E77BE77BE7FFE0000 +1380:000000000000000000003FF07FF04490C59F8D159937F1E0F1C0000000000000 +1381:000000003FE07FE0C52C853C8A2FFBE371E0004000400080009800F800000000 +1382:000000001FF83FF86288428845087DF838F800100010003C002403FC03000000 +1383:000000003FE07FE0C53E852A8A2EFBE071E01000100030002000200000000000 +1384:00000000000000000E001F003180318031F831A831B831803180318000000000 +1385:00000000000000000E001F0031B031B031FC318C318031803180318000000000 +1386:00000000000000000E001F003180318031803180318031E031A031E006000600 +1387:0000000000000000038007C00C600C607C7E6C6A0C6E0C600C600C6000000000 +1388:00000000000000C0004000FC0194031C06000F0019B018F00F30000000000000 +1389:000000000000018000B001F0033C060C0C001E00336031E01E60000000000000 +138A:00000000000003000100030006000C001E0011F813A80F3806000C0008000C00 +138B:00000000000000000F8019C010C0300037F03350337033001FE0036003000300 +138C:000000000C300FF01FF819980180018001F801AC01B801800180018000000000 +138D:0000000018601FE03FF0333003000300036003E0031803180300030000000000 +138E:000000000C300FF01FF819980180018001800180018001F001980FF00C000C00 +138F:0000000018601FE03FF033300300030001F801AC01B801800180018000000000 +1390:00000000000000000000000018180000 +1391:000000000000000000000024243C0000 +1392:00001818000000181800000018180000 +1393:00000000000000181800000018180000 +1394:00000000000000000000003C24240000 +1395:00000000000000000000000000000000001800180018003807F0780000000000 +1396:00000000000000000606060E1C600000 +1397:00000000000000000000000000000000000000000000000000007FFE00000000 +1398:00000000000000000000000000000000000000000000480048007FFE00000000 +1399:0000000000606060667E666060600000 +139A:00007FFE7B8E73F67BC67BF6718E7FFE7FFE73866DB671867DB673B67FFE0000 +139B:00007FFE7B8E73F67BC67BF6718E7FFE7FFE738E6DB6718E7DB6738E7FFE0000 +139C:00007FFE7B8E73F67BC67BF6718E7FFE7FFE73C66DBE71BE7DBE73C67FFE0000 +139D:00007FFE7B8E73F67BC67BF6718E7FFE7FFE738E6DB671B67DB6738E7FFE0000 +139E:00007FFE7B8E73F67BC67BF6718E7FFE7FFE73866DBE718E7DBE73867FFE0000 +139F:00007FFE7B8E73F67BC67BF6718E7FFE7FFE73866DBE718E7DBE73BE7FFE0000 +13A0:00000000784442424242424244780000 +13A1:00000000784442424478504844430000 +13A2:000000007F0808080808080808080000 +13A3:000000001C0814122151515155260000 +13A4:000000003048484B494E484848300000 +13A5:00000000080800080808080808080000 +13A6:000000003C424240207F0442423C0000 +13A7:000000001C02225252526242423C0000 +13A8:0000000040404C547640404040400000 +13A9:000000004242424242261A02023C0000 +13AA:0000000018242442427E424242420000 +13AB:00000000040404040404044444380000 +13AC:000000007E4040407C404040407E0000 +13AD:0000000008080848A8BB490A0A0C0000 +13AE:000000003C420202427C404040400000 +13AF:000000001C222222223E2222AACC0000 +13B0:00000000202020203E20202020200000 +13B1:000000007E4240404040404040400000 +13B2:00000000304848484830B7B2B4480000 +13B3:00000000424242425A5A666642420000 +13B4:00000000060909083844444444380000 +13B5:000000003C4242524C40404040400000 +13B6:000000001E204040484C4A4244380000 +13B7:00000000424266665A5A424242420000 +13B8:000000003844020202721E0202020000 +13B9:00000000180A15203C525212120C0000 +13BA:00000000324A4A4A4E4A4A4A4A320000 +13BB:00000000424242427E42424242420000 +13BC:000000003810384402020242423C0000 +13BD:000000004742424242261A02E2443800 +13BE:000000003C424242427E4242423C0000 +13BF:000000004040F0404040404E443C0418 +13C0:0000000078848480809E848484780000 +13C1:000000000C121212122222A2A2420000 +13C2:00000000404040405C62424242420000 +13C3:000000007E02020408102040407E0000 +13C4:000000003844E404E4443C0404040000 +13C5:00000000304848484A4D494848300000 +13C6:00000000FE1010101010101010FE0000 +13C7:000000000C1202424A4A4A4A4A340000 +13C8:00000000661919292A48484848300000 +13C9:00000000F1A122222224242428100000 +13CA:000000001C2222029AA2A2A2A25C0000 +13CB:000000003C4240403C404442423C0000 +13CC:0000000042424242427E4242423C0000 +13CD:000000001C22222202021AD2B26C0000 +13CE:00000000040C142444447E0404040000 +13CF:0000000040404040407C4242427C0000 +13D0:00000000080808080B5D680808080000 +13D1:00000000649AE2448098848484780000 +13D2:00000000784442424458484442420000 +13D3:000000002020202020202022221C0000 +13D4:00000000AAAAAA92B2B2CACA86820000 +13D5:000000003C424740201F0442423C0000 +13D6:00000000F090101010101211110E0000 +13D7:000000000202020202060A1222420000 +13D8:000000007E02020202060A1222420000 +13D9:00000000828282444444282810100000 +13DA:000000003C424240300C0242423C0000 +13DB:00000000364942605048484848300000 +13DC:00000000182424182422555555220000 +13DD:000000001C22424040404040407E0000 +13DE:000000004040404040404040407E0000 +13DF:000000003C42424040404042423C0000 +13E0:000000000444A4A47E24242424180000 +13E1:000000006699999A2844444444380000 +13E2:000000007C4242427C40404040400000 +13E3:000000003C42474040424242423C0000 +13E4:00000000F19112121414141818100000 +13E5:00000040404040434D74444444440000 +13E6:00000000424448506060504844420000 +13E7:00000000020202021E224242221C0000 +13E8:0000000030484A454040454A48300000 +13E9:000000003844444440404E44443B0000 +13EA:00000000225555535131199995620000 +13EB:000000003C424272525E4242423C0000 +13EC:000000003249494971414141221C0000 +13ED:000000000C1212120A06024244380000 +13EE:000000003C424040407C4242423C0000 +13EF:000000001E210101015D494949360000 +13F0:000000001C2222223C222262322C4000 +13F1:000000000E040E1111212129A9660000 +13F2:000000003C424240405C624242420000 +13F3:0000000030484A4540404E44443C0000 +13F4:000000007C4242427C424242427C0000 +13F5:000000000810102020404E4444380000 +13F6:00007FFE7B8E73F67BC67BF6718E7FFE7FFE61CE6FBE638E6FB66FCE7FFE0000 +13F7:00007FFE7B8E73F67BC67BF6718E7FFE7FFE61866FF663EE6FDE6FDE7FFE0000 +13F8:0000000000001C22223C2262322C4000 +13F9:0000000000000E040E111121A9660000 +13FA:0000000000003C4240405C6242420000 +13FB:000000000000304A4540404E443C0000 +13FC:0000000000007C42427C4242427C0000 +13FD:000000000000102020404E4444380000 +13FE:00007FFE7B8E73F67BC67BF6718E7FFE7FFE61866FBE638E6FBE6F867FFE0000 +13FF:00007FFE7B8E73F67BC67BF6718E7FFE7FFE61866FBE638E6FBE6FBE7FFE0000 +1400:000000000000007E0000007E00000000 +1401:0000000000000000000000007FFE400220041008081004200240018000000000 +1402:00000180024002400180000001800240042008101008200440027FFE00000000 +1403:00000000000000000000000001800240042008101008200440027FFE00000000 +1404:00000000000001800180000001800240042008101008200440027FFE00000000 +1405:0000000000000C000A00090008800840082008200840088009000A000C000000 +1406:0C000C0000000C000A00090008800840082008200840088009000A000C000000 +1407:0CC00CC000000C000A00090008800840082008200840088009000A000C000000 +1408:0000000000000C000A00090008800A400A200A200A40088009000A000C000000 +1409:0000000000000C000A000900088008400B200B200840088009000A000C000000 +140A:000000000000006000A00120022004200820082004200220012000A000600000 +140B:006000600000006000A00120022004200820082004200220012000A000600000 +140C:0000000000000000000000007FFE400220041008081064206240018000000000 +140D:0000000000000000000000007FFE400220041008081004260246018000000000 +140E:00000000000000000000000001806240642008101008200440027FFE00000000 +140F:00000000000000000000000001800246042608101008200440027FFE00000000 +1410:00000000000001800180000001806240642008101008200440027FFE00000000 +1411:00000000000001800180000001800246042608101008200440027FFE00000000 +1412:0000000000000C000A00090008800840682068200840088009000A000C000000 +1413:0000000000000C000A00090008800840082C082C0840088009000A000C000000 +1414:0C000C0000000C000A00090008800840682068200840088009000A000C000000 +1415:0C000C0000000C000A00090008800840082C082C0840088009000A000C000000 +1416:0000018001800C000A30093008800840082008200840088009000A000C000000 +1417:000000000000006000A00120022004206820682004200220012000A000600000 +1418:000000000000006000A0012002200420082C082C04200220012000A000600000 +1419:006000600000006000A00120022004206820682004200220012000A000600000 +141A:006000600000006000A0012002200420082C082C04200220012000A000600000 +141B:000003000300006018A01920022004200820082004200220012000A000600000 +141C:000000000000000011101110111011100EE00000000000000000000000000000 +141D:0000003000480048003006000900090006000000000000000000000000000000 +141E:00000010102828447C00000000000000 +141F:00000000040810204000000000000000 +1420:00000000402010080400000000000000 +1421:00000000444444443800000000000000 +1422:00000000384444444400000000000000 +1423:00000000780404047800000000000000 +1424:00000000384444443800000000000000 +1425:00000000091224489000000000000000 +1426:00000000242424240000000000000000 +1427:00000000000000001818000000000000 +1428:0000000000007C000000000000000000 +1429:0000000010107C101000000000000000 +142A:000000007C1010101000000000000000 +142B:0000000000000000000800080004FFF480124022204010800900060000000000 +142C:00000000000000000010001000080308048408441020201040087FF800000000 +142D:0000000000001820142012101110108810481040108011001200140018000000 +142E:00000000000001A002A004900890108820882080108008800480028001800000 +142F:0000000000000000000000000000400220041008081004200240018000000000 +1430:0000018002400240018000000180024004200810100820044002000000000000 +1431:0000000000000000000000000180024004200810100820044002000000000000 +1432:0000000000000180018000000180024004200810100820044002000000000000 +1433:00000040201008040202040810204000 +1434:60600040201008040202040810204000 +1435:66660040201008040202040810204000 +1436:00000040201008242222240810204000 +1437:00000040201008043232040810204000 +1438:00000002040810204040201008040200 +1439:06060002040810204040201008040200 +143A:0000000000000000000000000000400220041008081064206240018000000000 +143B:0000000000000000000000000000400220041008081004260246018000000000 +143C:0000000000000000000000000000018062406420081010082004400200000000 +143D:0000000000000000000000000000018002460426081010082004400200000000 +143E:0000000000000000018001800000018062406420081010082004400200000000 +143F:0000000000000000018001800000018002460426081010082004400200000000 +1440:000000000000010000800040002000100C080C08001000200040008001000000 +1441:00000000000004000200010000800040002C002C004000800100020004000000 +1442:018001800000010000800040002000100C080C08001000200040008001000000 +1443:06000600000004000200010000800040002C002C004000800100020004000000 +1444:000000000000001000200040008001001A001A00010000800040002000100000 +1445:00000000000000200040008001000200040C040C020001000080004000200000 +1446:003000300000001000200040008001001A001A00010000800040002000100000 +1447:00600060000000200040008001000200040C040C020001000080004000200000 +1448:00000180018000200C400C800100020004000400020001000080004000200000 +1449:00000000040810201008040000000000 +144A:00000000101010101000000000000000 +144B:00000000202038242400000000000000 +144C:000000000000000000001008100810081008100810081008081007E000000000 +144D:0180024002400180000007E00810100810081008100810081008100800000000 +144E:0000000000000000000007E00810100810081008100810081008100800000000 +144F:0000000001800180000007E00810100810081008100810081008100800000000 +1450:00000000000000000FE0001000080008000800080008000800100FE000000000 +1451:00000300030000000FE0001000080008000800080008000800100FE000000000 +1452:00000CC00CC000000FE0001000080008000800080008000800100FE000000000 +1453:00000000000000000FE0001000080088008800880088000800100FE000000000 +1454:00000000000000000FE0001000080008018801880008000800100FE000000000 +1455:000000000000000003F80400080008000800080008000800040003F800000000 +1456:000000600060000003F80400080008000800080008000800040003F800000000 +1457:000000000000000000000804080408046804680408040804040803F000000000 +1458:00000000000000000000402040204020402C402C4020402020401F8000000000 +1459:0000000000000000000003F00408080408046804680408040804080400000000 +145A:000000000000000000001F80204040204020402C402C40204020402000000000 +145B:0000000000C000C0000003F00408080408046804680408040804080400000000 +145C:000000000600060000001F80204040204020402C402C40204020402000000000 +145D:0000000000000000000007F00008000400046004600400040004000807F00000 +145E:000000000000000000003F80004000200020002C002C0020002000403F800000 +145F:0000000001800180000007F00008000400043004300400040004000807F00000 +1460:000000000C000C0000003F80004000200020002C002C0020002000403F800000 +1461:0000000000000000000001FC0200040004003400340004000400020001FC0000 +1462:000000000000000000000FE0100020002000201820182000200010000FE00000 +1463:0000000000600060000003F80400080008006800680008000800040003F80000 +1464:000000000300030000001FC0200040004000401840184000400020001FC00000 +1465:0000000000000000000003F80400680068000800080068006800040003F80000 +1466:000000003C4040403C00000000000000 +1467:00000000000000000000201420142014201420102010201010200FC000000000 +1468:000000000000000000000FC41024201420142010201020102010201000000000 +1469:00000000000000003F88004800280028002000200020002000403F8000000000 +146A:00000000000000000FE8100820082008200020002000200010000FE000000000 +146B:0000000000384444443C040404040000 +146C:18242418003844444478404040400000 +146D:00000000003844444478404040400000 +146E:00003030003844444478404040400000 +146F:0000000000040404043C444444380000 +1470:00000C0C00040404043C444444380000 +1471:0000363600040404043C444444380000 +1472:00000000004040404078444444380000 +1473:00006060004040404078444444380000 +1474:00000000001C2222221E026262020000 +1475:000000000070888888780B0B08080000 +1476:00000000000E1111111ED0D010100000 +1477:000000000070888888F0868680800000 +1478:00000C0C000E1111111ED0D010100000 +1479:000060600070888888F0868680800000 +147A:0000000000010161610F1111110E0000 +147B:000000000008080B0B78888888700000 +147C:0000030300010161610F1111110E0000 +147D:000018180008080B0B78888888700000 +147E:0000000000101010D0DE1111110E0000 +147F:000000000080808686F0888888700000 +1480:0000181800101010D0DE1111110E0000 +1481:0000C0C00080808686F0888888700000 +1482:00000000001010D0D01ED1D1110E0000 +1483:00000000202020382424180000000000 +1484:000000000404041C2424180000000000 +1485:0000000000728A8A8A78080808080000 +1486:0000000000728A8A8AF0808080800000 +1487:00000000000A0A0A0A78888888700000 +1488:00000000004242424278444444380000 +1489:00000000003844444404040404040000 +148A:30484830003844444440404040400000 +148B:00000000003844444440404040400000 +148C:00003030003844444440404040400000 +148D:00000000000404040404444444380000 +148E:00000C0C000404040404444444380000 +148F:00003636000404040404444444380000 +1490:00000000004040404040444444380000 +1491:00006060004040404040444444380000 +1492:00000000001C22222202C2C202020000 +1493:00000000007088888B0B080808080000 +1494:00000000000E1111D1D0101010100000 +1495:00000000007088888880868680800000 +1496:00000C0C000E1111D1D0101010100000 +1497:000060600070888888808C8C80800000 +1498:00000000000202C2C2022222221C0000 +1499:00000000000808080B0B888888700000 +149A:00000606000202C2C2022222221C0000 +149B:000018180008080B0B08888888700000 +149C:0000000000101010D0D01111110E0000 +149D:00000080808080868680888888700000 +149E:0000181800101010D0D01111110E0000 +149F:0000C0C0008080868680888888700000 +14A0:0000000000101010D0D011D1D10E0000 +14A1:00000000202020202424180000000000 +14A2:00000000040404042424180000000000 +14A3:00000000007C04040404040404040000 +14A4:30484830007C40404040404040400000 +14A5:00000000007C40404040404040400000 +14A6:00003030007C40404040404040400000 +14A7:000000000004040404040404047C0000 +14A8:00000C0C0004040404040404047C0000 +14A9:000036360004040404040404047C0000 +14AA:000000000040404040404040407C0000 +14AB:000060600040404040404040407C0000 +14AC:00000000001F01016161010101010000 +14AD:0000000000F808080B0B080808080000 +14AE:00000000001F1010D0D0101010100000 +14AF:0000000000F880808686808080800000 +14B0:00000C0C001F1010D0D0101010100000 +14B1:00003030007C40404646404040400000 +14B2:000000000001010161610101011F0000 +14B3:00000000000808080B0B080808F80000 +14B4:0000060600020202C2C20202023E0000 +14B5:00001818000808080B0B080808F80000 +14B6:0000000000101010D0D01010101F0000 +14B7:00000000008080808686808080F80000 +14B8:0000181800101010D0D01010101F0000 +14B9:000060600040404046464040407C0000 +14BA:00000000001010D0D010D0D0101F0000 +14BB:0000000020202020203C000000000000 +14BC:000000001C20201C0000000000000000 +14BD:0000000004040404043C000000000000 +14BE:00000000182408103C00000000000000 +14BF:000000003C42020204081020407E0000 +14C0:0000000000000000000000000000000000001FE001100110011000E000000000 +14C1:0000000000000000030004800480030000000FF01100110011000E0000000000 +14C2:0000000000000000000000000000000000000FF01100110011000E0000000000 +14C3:0000000000000000000000000300030000000FF01100110011000E0000000000 +14C4:00000000000000000000000000000000000000E00110011001101FE000000000 +14C5:00000000000000000000000000C000C0000000E00110011001101FE000000000 +14C6:00000000000000000000000006600660000000E00110011001101FE000000000 +14C7:0000000000000000000000000000000000000E001100110011000FF000000000 +14C8:000000000000000000000000030003000000070008800880088007F800000000 +14C9:00000000000000000000000000000000000007F8304430440044003800000000 +14CA:0000000000000000000000000000000000003FC0022C022C022001C000000000 +14CB:000000000000000000000000000000000000038004403440344003FC00000000 +14CC:0000000000000000000000000000000000000E301130110011000FF000000000 +14CD:000000000000000000000000030003000000038004403440344003FC00000000 +14CE:0000000000000000000000000C000C0000000E301130110011000FF000000000 +14CF:0000000000000000000000001980198000000E001100110011000FF000000000 +14D0:000000003048483F0000000000000000 +14D1:000000002222221C0000000000000000 +14D2:000000000609097E0000000000000000 +14D3:0000000000000000000000000000000000001FE000100010001000E000000000 +14D4:0000000000000000060009000900060000000FF01000100010000E0000000000 +14D5:0000000000000000000000000000000000000FF01000100010000E0000000000 +14D6:0000000000000000000000000600060000000FF01000100010000E0000000000 +14D7:00000000000000000000000000000000000000E00010001000101FE000000000 +14D8:00000000000000000000000000C000C0000000E00010001000101FE000000000 +14D9:00000000000000000000000003300330000000E00010001000101FE000000000 +14DA:0000000000000000000000000000000000000E001000100010000FF000000000 +14DB:000000000000000000000000030003000000070008000800080007F800000000 +14DC:00000000000000000000000000000000000007F8300430040004003800000000 +14DD:0000000000000000000000000000000000003FC0002C002C002001C000000000 +14DE:00000000000000000000000000000000000003FC340034000400038000000000 +14DF:0000000000000000000000000000000000001FE0200C200C20001C0000000000 +14E0:00000000000000000000000001800180000003FC340034000400038000000000 +14E1:0000000000000000000000000C000C0000001FE0200C200C20001C0000000000 +14E2:00000000000000000000000000000000000018E01810001000101FE000000000 +14E3:00000000000000000000000000000000000001C0002C002C00203FC000000000 +14E4:00000000000000000000000000600060000018E01810001000101FE000000000 +14E5:00000000000000000000000000C000C0000001C0002C002C00203FC000000000 +14E6:000000000000000000000000000000000000038034003400040003FC00000000 +14E7:000000000000000000000000000000000000071808180800080007F800000000 +14E8:000000000000000000000000030003000000038034003400040003FC00000000 +14E9:0000000000000000000000000C000C0000000E301030100010000FF000000000 +14EA:000000006080807E0000000000000000 +14EB:000000000C300C300C00000000000000 +14EC:000000061860300C020C306018060000 +14ED:0000000040404040201C040404040000 +14EE:0C12120C000404040870404040400000 +14EF:00000000040404040870404040400000 +14F0:000C0C00040404040408704040400000 +14F1:000000000404041C2040404040400000 +14F2:000C0C000404041C2040404040400000 +14F3:006666000404041C2040404040400000 +14F4:00000000404040700804040404040000 +14F5:00606000404040700804040404040000 +14F6:00000000202020202010CEC202020000 +14F7:00000000808080868640380808080000 +14F8:00000000020202C2C204382020200000 +14F9:00000000080808080810E68680800000 +14FA:00060600020202C2C204382020200000 +14FB:00181800080808080810E68680800000 +14FC:000000000262620E1020202020200000 +14FD:000000000404041C2046464040400000 +14FE:000606000262620E1020202020200000 +14FF:000C0C000404041C2046464040400000 +1500:000000004040407008C4C40404040000 +1501:00000000808086E61008080808080000 +1502:006060004040407008C4C40404040000 +1503:00C0C000808086E61008080808080000 +1504:0000000010D0D01C02C1C10101010000 +1505:00000000202030080808000000000000 +1506:00000000182010083000000000000000 +1507:00000000080818202020000000000000 +1508:000000002020201C0000000000000000 +1509:00000000202038041C24180000000000 +150A:0000000004041C203824180000000000 +150B:00303000202030080808001818000000 +150C:000018001800000410081010182004400480048000400C200C10000800040000 +150D:000060006000000040FE4100620012001200120002003200310000FE00000000 +150E:00000000180018000000108010801880048004F0048800880C880C7000000000 +150F:0000000018001800000010801080188004800480048800880C880C7000000000 +1510:000000000000000000000E00110011001100010001100110011000E000000000 +1511:0000000000000000000000E001100110011001001100110011000E0000000000 +1512:0000000000C000C0000000E001100110011001001100110011000E0000000000 +1513:0000000000000000000000000000000000000C601210111010900C6000000000 +1514:0000000000000000000001800180000000000C601210111010900C6000000000 +1515:0000000000000000000000000000000000000C601090111012100C6000000000 +1516:0000000000000000000001800180000000000C601090111012100C6000000000 +1517:0000000000000000000007000880088008800080308830880088007000000000 +1518:000000000000000000001C00220022182218020002200220022001C000000000 +1519:0000000000000000000000700088308830880080088008800880070000000000 +151A:0000000000000000000001C002200220022002002218221822001C0000000000 +151B:0000000000600060000000700088308830880080088008800880070000000000 +151C:0000000001800180000001C002200220022002002218221822001C0000000000 +151D:0000000000000000000000000000000000003318348404440424031800000000 +151E:00000000000000000000000000000000000018CC242C2220212018C000000000 +151F:0000000000000000000000C000C0000000003318348404440424031800000000 +1520:00000000000000000000030003000000000018CC242C2220212018C000000000 +1521:0000000000000000000000000000000000003318348404440424031800000000 +1522:00000000000000000000000000000000000018CC212C2220242018C000000000 +1523:0000000000000000000000C000C0000000003318342404440484031800000000 +1524:0000000000000000000003000300000000000C661096111012100C6000000000 +1525:00000000485424000000000000000000 +1526:00000000040810207C04040404040000 +1527:18242418402010087C40404040400000 +1528:00000000402010087C40404040400000 +1529:00606000402010087C40404040400000 +152A:0000000004040404047C201008040000 +152B:000C0C0004040404047C201008040000 +152C:0066660004040404047C201008040000 +152D:0000000040404040407C081020400000 +152E:0060600040404040407C081020400000 +152F:000000000204C8D03E02020202020000 +1530:0000000008102343F808080808080000 +1531:00000000100804C2DF10101010100000 +1532:0000000080402616F880808080800000 +1533:00181800100804C2DF10101010100000 +1534:00C0C00080402616F880808080800000 +1535:0000000002020202023ED0C804020000 +1536:000000000808080808FB432010080000 +1537:0006060002020202023ED0C804020000 +1538:001818000808080808FB432010080000 +1539:000000001010101010DFC20408100000 +153A:000000008080808080F8162640800000 +153B:001818001010101010DFC20408100000 +153C:00C0C0008080808080F8162640800000 +153D:000000001010D0D0101FC2C408100000 +153E:0000000020203C081020000000000000 +153F:00000000282854540000000000000000 +1540:0000000010107C101000000000000000 +1541:00000000000044281028440000000000 +1542:0000000000000000000000000000000010F010801080108010800F0000000000 +1543:000000000000000000000000000000001E10021002100210021001E000000000 +1544:0000000000000000000000000000000001E002100210021002101E1000000000 +1545:000000000000060009000900060000000F00108010801080108010F000000000 +1546:000000000000000000000000000000000F00108010801080108010F000000000 +1547:000000000000000000000600060000000F00108010801080108010F000000000 +1548:00000000007C020202027C4040400000 +1549:00003030007C020202027C4040400000 +154A:00000000004040407C020202027C0000 +154B:00000000003E404040403E0202020000 +154C:00001818003E404040403E0202020000 +154D:00000000000202023E404040403E0000 +154E:00000C0C001F202020201FC1C1010000 +154F:00003030007C808083837C0404040000 +1550:00000000182020180808000000000000 +1551:00000000300C300C3000000000000000 +1552:0000006018060C3040300C0618600000 +1553:0000000000000000000000001800240224041808081004200240018000000000 +1554:0000000001800240024001800000018002400420081018082404240218000000 +1555:0000000000000000000000000000018002400420081018082404240218000000 +1556:0000000000000000018001800000018002400420081018082404240218000000 +1557:0000000000000000060009000980064000200010001000200040008001000200 +1558:0000060006000000060009000980064000200010001000200040008001000200 +1559:0000000000000000006000900190026004000800080004000200010000800040 +155A:0000006000600000006000900190026004000800080004000200010000800040 +155B:0000001800180000001800240064009801003200320001000080004000200010 +155C:0000018001800000018002400640098010002018201810000800040002000100 +155D:0000000C122C40201008000000000000 +155E:000000000000000000000C08120812081C08100810081008081007E000000000 +155F:000000000000000000001030104810481038100810081008081007E000000000 +1560:0000000000000000000007E008101008100810081C08120812080C0800000000 +1561:0000000000000000000007E00810100810081008103810481048103000000000 +1562:0000000001800180000007E008101008100810081C08120812080C0800000000 +1563:0000000001800180000007E00810100810081008103810481048103000000000 +1564:000000000000000007E0091009080608000800080008000800100FE000000000 +1565:000001800180000007E0091009080608000800080008000800100FE000000000 +1566:000000000000000003F00448084808300800080008000800040003F800000000 +1567:000000C000C0000003F00448084808300800080008000800040003F800000000 +1568:000000600060000001F80224042404183400340004000400020001FC00000000 +1569:00000300030000000FC01120212020C0200C200C2000200010000FE000000000 +156A:000000001C2A2A24201E000000000000 +156B:000000000000000000001110111011101110111010101010082007C000000000 +156C:0000000000000000000007C00820101010101110111011101110111000000000 +156D:000000000000000000001FC00020001000101F100010001000201FC000000000 +156E:0000000000000000000003F804000800080008F808000800040003F800000000 +156F:000000000000000008102A541C3808101C382A54081000000000000000000000 +1570:000000000000000000001450145014501450139010101010082007C000000000 +1571:0000000000000000000007C00820101010101390145014501450145000000000 +1572:000000000000000000001FC000201E100110011001101E1000201FC000000000 +1573:0000000000000000000003F8040008780880088008800878040003F800000000 +1574:000000000000000000000E001100110011000F00012001400180010000000000 +1575:0000000000000000000001C002200220022003C012000A000600020000000000 +1576:0000000001800180000001C002200220022003C012000A000600020000000000 +1577:0000000000000000000001000180014001200F001100110011000E0000000000 +1578:0000000003000300000001000180014001200F001100110011000E0000000000 +1579:00000000000000000000020006000A00120003C002200220022001C000000000 +157A:00000000030003000000020006000A00120003C002200220022001C000000000 +157B:000000001030501C12120C0000000000 +157C:0000000000424242427E424242420000 +157D:00000000442810284400000000000000 +157E:003000480048003000001C70208820881C8804F0048000800080008000000000 +157F:000000000000000000001C70208820881C8804F0048000800080008000000000 +1580:000000000060006000001C70208820881C8804F0048000800080008000000000 +1581:000000000000000000001C08200820081C080478048800880088007000000000 +1582:000000000018001800001C08200820081C080478048800880088007000000000 +1583:000000000000000000001C80208020801C8004F0048800880088007000000000 +1584:0000000000C000C000001C80208020801C8004F0048800880088007000000000 +1585:0000000000000000000006400840087006480248023000000000000000000000 +1586:00000000000E1111110F050509090000 +1587:00000000000E1111111E141412120000 +1588:0000000000090905050F1111110E0000 +1589:0000000000121214141E1111110E0000 +158A:000000000000000000000E001100110011000100012001400180010000000000 +158B:0000000000000000000001C0022002200220020012000A000600020000000000 +158C:00000000000000000000010001800140012001001100110011000E0000000000 +158D:00000000000000000000020006000A001200020002200220022001C000000000 +158E:000C00120012000C0000301C482248223C2204A004A003200020002000000000 +158F:00000000000000000000301C482248223C2204A004A003200020002000000000 +1590:00000000001800180000301C482248223C2204A004A003200020002000000000 +1591:000000000000000000003002480248023C02048204A203220022001C00000000 +1592:000000000006000600003002480248023C02048204A203220022001C00000000 +1593:000000000000000000003020482048203C2004A004A203220022001C00000000 +1594:000000000030003000003020482048203C2004A004A203220022001C00000000 +1595:0000000000000000000006000900090007800090009000600000000000000000 +1596:0000000000000000000031804A404A403FE00024002400180000000000000000 +1597:00000000003C424A4A32020202020000 +1598:00000000003C4252524C404040400000 +1599:000000000002020202324A4A423C0000 +159A:0000000000404040404C5252423C0000 +159B:00000000000000000000000000001FE000001FE001100110011000E000000000 +159C:00000000000000000000000000000FF000000FF01100110011000E0000000000 +159D:00000000000000000000000000001FE0000000E00110011001101FE000000000 +159E:00000000000000000000000000001FE000000E001100110011000FF000000000 +159F:0000003F003048483F00000000000000 +15A0:0000000000000000000000000080004000200FF01000100010000E0000000000 +15A1:0000000000000180018000000080004000200FF01000100010000E0000000000 +15A2:00000000000000000000000000E00010001000101FE008000400020000000000 +15A3:00000000000000C000C0000000E00010001000101FE008000400020000000000 +15A4:0000000000000000000000000E001000100010000FF000200040008000000000 +15A5:0000000000000600060000000E001000100010000FF000200040008000000000 +15A6:000000003040403C0810000000000000 +15A7:00000000040810207C043E0404040000 +15A8:00000000201008043E207C2020200000 +15A9:00606000201008043E207C2020200000 +15AA:000000000404043E047C201008040000 +15AB:000C0C000404043E047C201008040000 +15AC:000000002020207C203E040810200000 +15AD:003030002020207C203E040810200000 +15AE:000000002078203C0810200000000000 +15AF:0000000000808080BCC28282C2BC0000 +15B0:0000000000BCFEFEFEFEBC8080800000 +15B1:00000000000202027AFEFEFEFE7A0000 +15B2:0000000000808080BCFEFEFEFEBC0000 +15B3:00000000007AFEFEFEFE7A0202020000 +15B4:00000000007C4040407C404040400000 +15B5:0000000000040404047C0404047C0000 +15B6:0000000000404040407C4040407C0000 +15B7:00000000007C0404047C040404040000 +15B8:000000000000000000000E100A100A1009E00800080008000800080000000000 +15B9:0000000000000000000000100010001000100010079008500850087000000000 +15BA:000000000000000000000800080008000800080009E00A100A100E1000000000 +15BB:0000000000000000000008700850085007900010001000100010001000000000 +15BC:000000000000000000000C100A20094008800800080008000800080000000000 +15BD:0000000000000000000000100010001000100010011002900450083000000000 +15BE:0000000000000000000008000800080008000800088009400A200C1000000000 +15BF:0000000000000000000008300450029001100010001000100010001000000000 +15C0:0000000000000000000000100010001007100890089000500050003000000000 +15C1:0000000000000000000008000800080008E0091009100A000A000C0000000000 +15C2:0000000000000000000000300050005008900890071000100010001000000000 +15C3:000000000000000000000C000A000A000910091008E008000800080000000000 +15C4:00000000000000000000000000004002200410080FF004200240018000000000 +15C5:00000000000000000000000000000180024004200FF010082004400200000000 +15C6:0000000008000400020001000180014001200120014001800100020004000800 +15C7:0000000008000400020001000180054005200520054001800100020004000800 +15C8:000000000800040002000100018001400D200D20014001800100020004000800 +15C9:00000000004000800100020006000A00120012000A0006000200010000800040 +15CA:000000000000000000000000000040023FFC1008081004200240018000000000 +15CB:0000000000000000000000000000018002400420081010083FFC400200000000 +15CC:0000000008000400060005000480044004200420044004800500060004000800 +15CD:0000000008000400060005000480054005200520054004800500060004000800 +15CE:0000000008000400060005000480044005A005A0044004800500060004000800 +15CF:0000000000400080018002800480088010801080088004800280018000800040 +15D0:0000000000000000000000000000410421081110092005400380010000000000 +15D1:0000000000000000000000000000010003800540092011102108410400000000 +15D2:0000000004000200010000800040002007F00020004000800100020004000000 +15D3:000000000400020001000080044004200FF00420044000800100020004000000 +15D4:000000000400020001000080004006200FF00620004000800100020004000000 +15D5:000000000020004000800100020004000FE00400020001000080004000200000 +15D6:0000000000000000000000000000410421081FF0092005400380010000000000 +15D7:000000000000000000000000000001000380054009201FF02108410400000000 +15D8:0000000004000200010001800140012007F00120014001800100020004000000 +15D9:000000000400020001000180054005200FF00520054001800100020004000000 +15DA:00000000040002000100018001400D201FF00D20014001800100020004000000 +15DB:0000000000100020004000C00140024007F00240014000C00040002000100000 +15DC:000000000000000000001FF8100810081008100810081008081007E000000000 +15DD:0000000000000000000007E008101008100810081008100810081FF800000000 +15DE:00000000000000001FC0102010101010101010101010101010201FC000000000 +15DF:00000000000000001FC0102010101110111011101110101010201FC000000000 +15E0:00000000000000001FC0102010101010131013101010101010201FC000000000 +15E1:000000000000000007F00810101010101010101010101010081007F000000000 +15E2:000000000000000000001818142812481188100810081008081007E000000000 +15E3:0000000000000000000007E00810100810081008118812481428181800000000 +15E4:00000000000000001FE0101008080408020802080408080810101FE000000000 +15E5:00000000000000001FE0101008080448024802480448080810101FE000000000 +15E6:00000000000000001FE010100808040802C802C80408080810101FE000000000 +15E7:000000000000000007F80808101010201040104010201010080807F800000000 +15E8:0000000000000000000010081008100810081FF810081008081007E000000000 +15E9:0000000000000000000007E00810100810081FF8100810081008100800000000 +15EA:00000000000000001FC0042004100410041004100410041004201FC000000000 +15EB:00000000000000001FC0042004100490049004900490041004201FC000000000 +15EC:00000000000000001FC0042004100410059005900410041004201FC000000000 +15ED:000000000000000007F00840104010401040104010401040084007F000000000 +15EE:00000000101010107C00000000000000 +15EF:00000000000000000000410441044104410441044104410422881C7000000000 +15F0:000000000000000000001C702288410441044104410441044104410400000000 +15F1:000000000000000000000FE00010001000100FE00010001000100FE000000000 +15F2:000000000000000000000FE00010001002100FE00210001000100FE000000000 +15F3:000000000000000000000FE00010001006100FE00610001000100FE000000000 +15F4:0000000000000000000007F008000800080007F008000800080007F000000000 +15F5:000000000000000000007FFC41044104410441044104410422881C7000000000 +15F6:000000000000000000001C7022884104410441044104410441047FFC00000000 +15F7:000000000000000000000FE00810081008100FE00810081008100FE000000000 +15F8:000000000000000000000FE00810081008900FE00890081008100FE000000000 +15F9:000000000000000000000FE00810081009900FE00990081008100FE000000000 +15FA:0000000000000000000007F008100810081007F008100810081007F000000000 +15FB:00000000000000000000610C593447C4410441044104410422881C7000000000 +15FC:000000000000000000001C702288410441044104410447C45934610C00000000 +15FD:000000000000000000000FE00810041002100FE00210041008100FE000000000 +15FE:000000000000000000000FE00810041002500FE00250041008100FE000000000 +15FF:000000000000000000000FE00810041002D00FE002D0041008100FE000000000 +1600:0000000000000000000007F008100820084007F008400820081007F000000000 +1601:00000000442810000000000000000000 +1602:00000000004040404040444444380000 +1603:00000000003844444404040404040000 +1604:0000000000000000000000000000000000000FF0000800080008007000000000 +1605:0000000000000000000000000000000000000FF0000800480048000800700000 +1606:0000000000000000000000000000000000000FF0000800680068000800700000 +1607:000000000000000000000000000000000000070008000800080007F800000000 +1608:00000000000000000000400040004100410041044104410422881C7000000000 +1609:000000000000000000001C702288410441044104010401040004000400000000 +160A:000000000000000000001FE000100010001007E000100010001001E000000000 +160B:000000000000000000001FE000100410041007E004100410001001E000000000 +160C:000000000000000000001FE000100010031007E003100010001001E000000000 +160D:000000000000000000000F001000100010000FC01000100010000FF000000000 +160E:000000000000000000001070108810881088104810081008081007E000000000 +160F:0000000000000000000007E008101008100812081108110811080E0800000000 +1610:00000000000000000FE00010000800080008070808880808081007E000000000 +1611:00000000000000000FE00010000800080088078808880808081007E000000000 +1612:00000000000000000FE0001000080008018807C809880808081007E000000000 +1613:000000000000000003F00408080808880870080008000800040003F800000000 +1614:000000000000000007F8003000C00100020004E005100410022001C000000000 +1615:00000000000000000FF00600018000400020039004500410022001C000000000 +1616:000000000000000001C0022004100450039000200040018006000FF000000000 +1617:00000000000000000000000010E0111012481488148818901860100000000000 +1618:00000000000000000000000021E02210244828C829483108311020E000000000 +1619:00000000000000000000000021F02208246428F429643104310820F000000000 +161A:000000000000000000000000100018601890148814881248111010E000000000 +161B:0000000000000000000000000008061809181128112812480888070800000000 +161C:000000000000100008780580020002000400047004880408020801F000000000 +161D:00000000000000000F801040102011200E2000200040004001A01E1000080000 +161E:000000000000200011F00A08040404C40904090808F010001000100000000000 +161F:000000000000200011F00A08044404C40944090808F010001000100000000000 +1620:000000000000200011F00A08046404E40964090808F010001000100000000000 +1621:000000000000000000000E081108110811081210101008600790000800040000 +1622:000000000000000000000000000000003C04040404040404020801F000000000 +1623:000000000000000000000000000000000F801040202020202020203C00000000 +1624:0000000000000400040004000780004000200020002000200040078000000000 +1625:0000000000000400040004000780004001200120012001200040078000000000 +1626:0000000000000400040004000780004000200320032000200040078000000000 +1627:00000000000000200020002001E002000400040004000400020001E000000000 +1628:000000000000000000000000000020003C04240404040404020801F000000000 +1629:000000000000000000000000000000000F801040202020202024203C00040000 +162A:0000000000000E00040004000780004000200020002000200040078000000000 +162B:0000000000000E00040004000780004001200120012001200040078000000000 +162C:0000000000000E00040004000780004000200320032000200040078000000000 +162D:00000000000000E00040004003C004000800080008000800040003C000000000 +162E:000000000000000000001E78042008101008100810081008081007E000000000 +162F:0000000000000000000007E008101008100810081008081004201E7800000000 +1630:000000000000080008000FE00010000800080008000800100FE0080008000000 +1631:000000000000080008000FE00010008800880088008800100FE0080008000000 +1632:000000000000080008000FE00010000801880188000800100FE0080008000000 +1633:0000000000000008000803F804000800080008000800040003F8000800080000 +1634:00000000000000000000000000000002701E101210101010082007C000000000 +1635:0000000000000000000000000000000003E00410080808084808780E40000000 +1636:000000001C00080008000FE00010000800080008000800100FE0080008000000 +1637:000000001C00080008000FE00010008800880088008800100FE0080008000000 +1638:000000001C00080008000FE00010000801880188000800100FE0080008000000 +1639:0000000000380010001007F008001000100010001000080007F0001000100000 +163A:000000000000000000000002610E210A210821082108210821081EF000000000 +163B:0000000000000000000000000F78108410841084108410845084708640000000 +163C:0000000000001C0008000FE00010001000100FE00010001000100FE008000000 +163D:0000000000001C0008000FE00010001008100FE00810001000100FE008000000 +163E:0000000000001C0008000FE0001000100C100FE00C10001000100FE008000000 +163F:000000000000007000200FE01000100010000FE01000100010000FE000200000 +1640:000000000000000000001818042004200810100810081008081007E000000000 +1641:0000000000000000000007E00810100810081008081004200420181800000000 +1642:000000000000000023E02410180800080008000800081808241023E000000000 +1643:000000000000000023E02410180800880088008800881808241023E000000000 +1644:000000000000000023E02410180800080188018800081808241023E000000000 +1645:00000000000000000F88104820302000200020002000203010480F8800000000 +1646:000000007C0810207C00000000000000 +1647:000010107C0810207C10100000000000 +1648:00000000000000000000339809200920101020082008200810100FE000000000 +1649:000000000000000000000FE01010200820082008101009200920339800000000 +164A:00000000000023E024101808000820083808200800081808241023E000000000 +164B:00000000000023E024101808008820883888208800881808241023E000000000 +164C:00000000000023E024101808000820C839E820C800081808241023E000000000 +164D:0000000000000F881048203020002008203820082000203010480F8800000000 +164E:00000000000000000000000021081110111021082108210821081EF000000000 +164F:0000000000000000000000001EF0210821082108210811101110210800000000 +1650:00000000000009E006100010001000100FE0001000100010061009E000000000 +1651:00000000000009E006100010001002100FE0021000100010061009E000000000 +1652:00000000000009E006100010001003100FE0031000100010061009E000000000 +1653:0000000000000790086008000800080007F00800080008000860079000000000 +1654:000000000000000000000000210811101FF021082108210821081EF000000000 +1655:0000000000000000000000001EF021082108210821081FF01110210800000000 +1656:00000000000013E00C100408040804081FF00408040804080C1013E000000000 +1657:00000000000013E00C100408048804881FF00488048804080C1013E000000000 +1658:00000000000013E00C100408040804C81FF004C8040804080C1013E000000000 +1659:00000000000007C808301020102010200FF8102010201020083007C800000000 +165A:000010103C4038047810100000000000 +165B:000000000000000000000000238811101FF021082108210821081EF000000000 +165C:0000000000000000000000001EF021082108210821081FF01110238800000000 +165D:00000000000013E00C100408040814081FF01408040804080C1013E000000000 +165E:00000000000013E00C100408048814881FF01488048804080C1013E000000000 +165F:00000000000013E00C100408040814C81FF014C8040804080C1013E000000000 +1660:00000000000013E00C100408040814081FF01408040804080C1013E000000000 +1661:00000000000000000000000023881110111021082108210821081EF000000000 +1662:0000000000000000000000001EF0210821082108210811101110238800000000 +1663:00000000000009E006100010001008100FE0081000100010061009E000000000 +1664:00000000000009E00610001000100A100FE00A1000100010061009E000000000 +1665:00000000000009E00610001000100B100FE00B1000100010061009E000000000 +1666:0000000000000790086008000800081007F00810080008000860079000000000 +1667:00000000000000000000000023881110193025482388210821081EF000000000 +1668:0000000000000000000000001EF0210821082388254819301110238800000000 +1669:00000000000027E018100808040822083FF0220804080808181027E000000000 +166A:00000000000027E018100808044822483FF0224804480808181027E000000000 +166B:00000000000027E018100808040822683FF0226804080808181027E000000000 +166C:0000000000000FC810302020204020881FF820882040202010300FC800000000 +166D:00000000424224241818242442420000 +166E:00000000000000000044281028440000 +166F:000000000000000000001C70208820881C880478040800080008000800000000 +1670:00000000000000000000301C482248223C220482048203020002000200000000 +1671:00000000000000000000281C542254223E2202A002A001200020002000000000 +1672:00000000001800180000281C542254223E2202A002A001200020002000000000 +1673:000000000000000000002802540254023E02028202A201220022001C00000000 +1674:000000000006000600002802540254023E02028202A201220022001C00000000 +1675:000000000000000000002820542054203E2002A002A201220022001C00000000 +1676:000000000030003000002820542054203E2002A002A201220022001C00000000 +1677:0000000008102646F8087C0808080000 +1678:00000000402313087C40F84040400000 +1679:00606000402313087C40F84040400000 +167A:000000000808087C08F8462610080000 +167B:001818000808087C08F8462610080000 +167C:00000000404040F8407C0B1320400000 +167D:00606000404040F8407C0B1320400000 +167E:000000107C107C100000000000000000 +167F:000000007C007C000000000000000000 +1680:0000000000000000000000000000FFFF00000000000000000000000000000000 +1681:0000000000000000000000000000FFFF01000100010001000100010000000000 +1682:0000000000000000000000000000FFFF02800280028002800280028000000000 +1683:0000000000000000000000000000FFFF05400540054005400540054000000000 +1684:0000000000000000000000000000FFFF0AA00AA00AA00AA00AA00AA000000000 +1685:0000000000000000000000000000FFFF15501550155015501550155000000000 +1686:0000010001000100010001000100FFFF00000000000000000000000000000000 +1687:0000028002800280028002800280FFFF00000000000000000000000000000000 +1688:0000054005400540054005400540FFFF00000000000000000000000000000000 +1689:00000AA00AA00AA00AA00AA00AA0FFFF00000000000000000000000000000000 +168A:0000155015501550155015501550FFFF00000000000000000000000000000000 +168B:0000000000400040008000800100FFFF01000200020004000400000000000000 +168C:0000000000A000A0014001400280FFFF0280050005000A000A00000000000000 +168D:000000000150015002A002A00540FFFF05400A800A8015001500000000000000 +168E:0000000002A802A8055005500AA0FFFF0AA0154015402A802A80000000000000 +168F:00000000055405540AA80AA81550FFFF15502AA02AA055405540000000000000 +1690:0000000000000000000001000100FFFF01000100000000000000000000000000 +1691:0000000000000000000002800280FFFF02800280000000000000000000000000 +1692:0000000000000000000005400540FFFF05400540000000000000000000000000 +1693:000000000000000000000AA00AA0FFFF0AA00AA0000000000000000000000000 +1694:0000000000000000000015501550FFFF15501550000000000000000000000000 +1695:0000000004400440028002800100FFFF01000280028004400440000000000000 +1696:0000010001000280028004400440FFFF04400440028002800100010000000000 +1697:0000000000000000000000000000FFFF0800080009C0084008400FC000000000 +1698:0000000000000000000000000000FFFF1290092006C006C00920129024480000 +1699:05500FF805500FF805500FF80550FFFF00000000000000000000000000000000 +169A:0000000000000000000000000000FFFF00000FF0000000000000000000000000 +169B:000000002000100008000400020001FF02000400080010002000000000000000 +169C:0000000000040008001000200040FF8000400020001000080004000000000000 +169D:00007FFE7BCE73BE7B8E7BB671CE7FFE7FFE738E6DB671B67DB6738E7FFE0000 +169E:00007FFE7BCE73BE7B8E7BB671CE7FFE7FFE73866DBE718E7DBE73867FFE0000 +169F:00007FFE7BCE73BE7B8E7BB671CE7FFE7FFE73866DBE718E7DBE73BE7FFE0000 +16A0:0092A4C890A0C0808080808080808000 +16A1:00AA94A8D0A0C0808080808080808000 +16A2:0080C0A0908884848484848484848400 +16A3:0080C0A0908884829292929292929200 +16A4:0080C0A090888484B4B4848484848400 +16A5:0080C0A0908884C2A292929292929200 +16A6:00808080C0A090888890A0C080808000 +16A7:00808080C0A090A8A890A0C080808000 +16A8:0080C0A090C8A0908880808080808000 +16A9:0080C2A498C2A4988080808080808000 +16AA:0080C2A498C0A0908080808080808000 +16AB:0080C0A090C8A0908880808080808000 +16AC:00101090503090583412181412101000 +16AD:00101010101018141218141210101000 +16AE:00080808080818284818284808080808 +16AF:00101012141812345890305090101000 +16B0:00101012141810305090305090101000 +16B1:0080C0A09088848890A0A09088848200 +16B2:00000004081020402010080400000000 +16B3:008080808080808080C0A09088848200 +16B4:0082848890A0C0808080808080808000 +16B5:00B2B48890A0C0808080808080808000 +16B6:0042444850E0E0E04040404040404000 +16B7:00828244442828101028284444828200 +16B8:00828244442828545428284444828200 +16B9:0080C0A0908890A0C080808080808000 +16BA:008282828282E2928E82828282828200 +16BB:0082828282E2928EE2928E8282828200 +16BC:00101010925438103854921010101000 +16BD:00101010101038383810101010101000 +16BE:00101010905030101814121010101000 +16BF:00202020202030282422202020202000 +16C0:00101010905038383814121010101000 +16C1:00101010101010101010101010101000 +16C2:00101010101038383810101010101000 +16C3:00000010204088442204081000000000 +16C4:00101010103854929254381010101000 +16C5:00101010121418103050901010101000 +16C6:00080808080808182848880808080800 +16C7:00101814121010101010109050301000 +16C8:0082C4A89080808080808090A8C48200 +16C9:00929254543838101010101010101000 +16CA:00081020402010081020402010080000 +16CB:0040404040444C546444040404040400 +16CC:00101010101010100000000000000000 +16CD:00101010101038383800000000000000 +16CE:00101010109254381000000000000000 +16CF:00103854921010101010101010101000 +16D0:00081828488808080808080808080800 +16D1:000818284888081C1C1C080808080800 +16D2:00605048444850606050484448506000 +16D3:00404044485064485060404040404000 +16D4:00C0A090A890A0C0C0A090A890A0C000 +16D5:0082848890A0C08080C0A09088848200 +16D6:0082C6C6AAAA92928282828282828200 +16D7:0082C6AA92AAC6828282828282828200 +16D8:00929254543838101010101010101000 +16D9:00383838101010101010101010101000 +16DA:00406050484442404040404040404000 +16DB:00406050484442E0E0E0404040404000 +16DC:00000000102844828244281000000000 +16DD:00824428102844828244281028448200 +16DE:0082C6C6AAAA92929292AAAAC6C68200 +16DF:00001028448282442810284482000000 +16E0:0000820847102AA0124002000200020002000200020002000200020002000000 +16E1:00101010925438103854921010101000 +16E2:00000208031002A0024002000200020002000200020012002A00460082000000 +16E3:00101010101010101038385454929200 +16E4:00929254543838545438385454929200 +16E5:0082C6AA92AAC68282C6AA92AAC68200 +16E6:00101010101010101038385454929200 +16E7:00000000000000001010101010101000 +16E8:00103854921010101010109254381000 +16E9:00040C14244424140C04040404040400 +16EA:004040E040444C546444040E04040400 +16EB:00000000000038383800000000000000 +16EC:00007070700000000000707070000000 +16ED:000000383810D6FED610383800000000 +16EE:00101814121010305090101010101000 +16EF:00925454383810101010383854549200 +16F0:00101010385492929292925438101000 +16F1:00404040404040404854644442424200 +16F2:000808080888C8A89888808080808000 +16F3:00081C2A492A1C080808080808080800 +16F4:0040404044464C5464C4440404040400 +16F5:00081020100810201008102010080000 +16F6:00808040402224181028488404020200 +16F7:00404040407048444242424242424200 +16F8:00080808080808080808142222414100 +16F9:00007FFE7BCE73BE7B8E7BB671CE7FFE7FFE61CE6FB663C66FF66FCE7FFE0000 +16FA:00007FFE7BCE73BE7B8E7BB671CE7FFE7FFE61866FB663866FB66FB67FFE0000 +16FB:00007FFE7BCE73BE7B8E7BB671CE7FFE7FFE618E6FB6638E6FB66F8E7FFE0000 +16FC:00007FFE7BCE73BE7B8E7BB671CE7FFE7FFE61C66FBE63BE6FBE6FC67FFE0000 +16FD:00007FFE7BCE73BE7B8E7BB671CE7FFE7FFE618E6FB663B66FB66F8E7FFE0000 +16FE:00007FFE7BCE73BE7B8E7BB671CE7FFE7FFE61866FBE638E6FBE6F867FFE0000 +16FF:00007FFE7BCE73BE7B8E7BB671CE7FFE7FFE61866FBE638E6FBE6FBE7FFE0000 +1700:00000000000000006004100A7808081008100820084008800700000000000000 +1701:0000000000000000400030000FFC04020A8073400222001C0000000000000000 +1702:000000000000000003E0041000100020005000100010082007C0000000000000 +1703:0000000000000000400020021FFC0100010043FC3C0200020004000000000000 +1704:00000000000000001F6020900090011002900090009001103E0C000000000000 +1705:0000000000000000000000004E0C511221E201023E0C40000000000000000000 +1706:0000000000000000401C4022404220801F000800100010000000000000000000 +1707:000000000000000040FC43022C02303010480F80000000000000000000000000 +1708:000000000000000007C009201110121001000080010002000100000000000000 +1709:0000000000000000780C08120812101010182024204010800F00000000000000 +170A:00000000000000000FC010202010400840084008410822901C60000000000000 +170B:00000000000000000006000870080BD00C300820084008800700000000000000 +170C:00000000000000000004000A300A481C08100820084008800700000000000000 +170D:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE738E6DB66DB66DB6738E7FFE0000 +170E:0000000000000000407C43823C82010000800100010000800300000000000000 +170F:000000000000000001C00220041000080008010803080C900060000000000000 +1710:0000000000000000000C001238220824084A0442048202840318000000000000 +1711:0000000000000000001C106221822602180C0000000000000000000000000000 +1712:0000000C000C0000000000000000000000000000000000000000000000000000 +1713:0000000000000000000000000000000000000000000000000000001800180000 +1714:0000000000000000000000000000000000000000000000000000010003800100 +1715:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE7B8673BE7B867BF671867FFE0000 +1716:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE7BCE73BE7B8E7BB671CE7FFE0000 +1717:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE7B8673F67BEE7BDE71DE7FFE0000 +1718:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE7BCE73B67BCE7BB671CE7FFE0000 +1719:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE7BCE73B67BC67BF671CE7FFE0000 +171A:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE7B8673B67B867BB671B67FFE0000 +171B:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE7B8E73B67B8E7BB6718E7FFE0000 +171C:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE7BC673BE7BBE7BBE71C67FFE0000 +171D:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE7B8E73B67BB67BB6718E7FFE0000 +171E:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE7B8673BE7B8E7BBE71867FFE0000 +171F:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE7B8673BE7B8E7BBE71BE7FFE0000 +1720:000000000000000000040008181068200840088009000A000C00000000000000 +1721:000000000000000000040008181068200848089009200A000C00000000000000 +1722:000000000000000007E000400080010007F00020004000800100000000000000 +1723:000000000000000010E011100A10062005C00800080008000000000000000000 +1724:0000000000000000101010301050109011101210141018101010000000000000 +1725:0000000000000000101010201040108011401220140018001000000000000000 +1726:00000000000000001080118811881290129014A014A018C01080000000000000 +1727:00000000000000000808081008200040388009000A000C000800000000000000 +1728:000000000000000047183AE80208020802080208020802080208000000000000 +1729:0000000000000000000478080808081008180824084008800700000000000000 +172A:00000000000000003FC000400080008001000100020002000200000000000000 +172B:00000000000000000C0436080508089008500820085008880F00000000000000 +172C:00000000000000001008281848280848088809080A080C080808000000000000 +172D:000000000000000000000000000000001FF80000000000000000000000000000 +172E:0000000000000000210023002300250025002960299031102020000000000000 +172F:0000000000000000304048C208A4091811001200120014001800000000000000 +1730:000000000000000000200060186068A008A00924094C0A740C02000000000000 +1731:0000000000000000100808100820084008800900120014001800000000000000 +1732:00000000003C0000000000000000000000000000000000000000000000000000 +1733:0000000000000000000000000000000000000000000000000000000000780000 +1734:0000000000020002000200020002000200020002000200040004000800301FC0 +1735:0000000000000000004000800080010001000200020004000400000000000000 +1736:0000000000000000010802100210042004200840084010801080000000000000 +1737:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE63867DF671EE7DDE63DE7FFE0000 +1738:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE63CE7DB671CE7DB663CE7FFE0000 +1739:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE63CE7DB671C67DF663CE7FFE0000 +173A:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE63867DB671867DB663B67FFE0000 +173B:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE638E7DB6718E7DB6638E7FFE0000 +173C:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE63C67DBE71BE7DBE63C67FFE0000 +173D:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE638E7DB671B67DB6638E7FFE0000 +173E:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE63867DBE718E7DBE63867FFE0000 +173F:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE63867DBE718E7DBE63BE7FFE0000 +1740:000000080008001038103820082008400FC00F80000000000000000000000000 +1741:000000080008001038103820082008400FC00F8000001F001F00000000000000 +1742:00000000000000000F800F80008000F001E00040004000800080000000000000 +1743:000000000000000003F003F0000000000000000000001F801F80000000000000 +1744:000000000000000002000200040007F007F00010002000200040000000000000 +1745:000000000000000007F007F000200020007C007C00801F801F80000000000000 +1746:000000000000000011E211E2112222442244224444887CF87CF8000000000000 +1747:00000000000000000108010801083E103E100210042007E007E0000000000000 +1748:000000000000000007F807F80040008000800080010001000100000000000000 +1749:00000000000000003C3C3C3C042008400840084010801F801F80000000000000 +174A:000000000000000000000FE00FE000200020004000400FC00FC0000000000000 +174B:00000000000800080010041007F007F00820082008201FE01FC0000000000000 +174C:00000000000000003E7C3E7C024404880488048809100F100F10000000000000 +174D:00000000000000000000000000001FF81FF80000000000000000000000000000 +174E:000000000000000001F001F00110221022203FE03FE004000400080008000000 +174F:000000000400040008F808F80888110810101FF01FF000000000000000000000 +1750:000000003E003E000200040007C007C00040008000F800F80008001000100020 +1751:000000000000000002000200020004000400040008000FE00FE0000000000000 +1752:0000007C007C0000000000000000000000000000000000000000000000000000 +1753:000000000000000000000000000000000000000000000000000000F800F80000 +1754:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE61B66FB661867DF661F67FFE0000 +1755:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE61866FBE61867DF661867FFE0000 +1756:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE61CE6FBE618E7DB661CE7FFE0000 +1757:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE61866FF661EE7DDE61DE7FFE0000 +1758:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE61CE6FB661CE7DB661CE7FFE0000 +1759:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE61CE6FB661C67DF661CE7FFE0000 +175A:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE61866FB661867DB661B67FFE0000 +175B:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE618E6FB6618E7DB6618E7FFE0000 +175C:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE61C66FBE61BE7DBE61C67FFE0000 +175D:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE618E6FB661B67DB6618E7FFE0000 +175E:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE61866FBE618E7DBE61867FFE0000 +175F:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE61866FBE618E7DBE61BE7FFE0000 +1760:00000000000000000004000A3008481008100820084008801700200020001000 +1761:0000000000000010002600483008481008100820084008800700000000000000 +1762:00000000100810201008102010081000 +1763:0000000000000000301808200440028001000280044008201018000000000000 +1764:0000000000000FE0311840840100020001000080010002000100008001000000 +1765:000000000000000000000000401C20221FC22004400000000000000000000000 +1766:0000000000000000400020004000803840443F84400880004000200040000000 +1767:0000000000E00100020604083408481008100820084008800700000000000000 +1768:0000000000000FE0311841040100010001000100010001000100010001000000 +1769:0000000000000000000600083008481008100828084408820700000000000000 +176A:00000000000007F0080810042004200420042004200810100FE0000000000000 +176B:00000000000000000006000833C84C3008100820084008800700000000000000 +176C:0000000000000000000C00123012482408200840084008800700000000000000 +176D:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE738E6FB663B66DB6738E7FFE0000 +176E:0000000000000000000E00103010482008200854085A08AC0716000800000000 +176F:000000000000000003C00C20102020004000400041FC46023802000000000000 +1770:0000000000000000002000503050489008A009180910090C0608000000000000 +1771:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE61EE7DCE7BEE77EE77C67FFE0000 +1772:0000000800040008000000000000000000000000000000000000000000000000 +1773:0000000000000000000000000000000000000000000000000010000800100000 +1774:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE61B67DB67B8677F677F67FFE0000 +1775:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE61867DBE7B8677F677867FFE0000 +1776:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE61CE7DBE7B8E77B677CE7FFE0000 +1777:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE61867DF67BEE77DE77DE7FFE0000 +1778:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE61CE7DB67BCE77B677CE7FFE0000 +1779:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE61CE7DB67BC677F677CE7FFE0000 +177A:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE61867DB67B8677B677B67FFE0000 +177B:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE618E7DB67B8E77B6778E7FFE0000 +177C:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE61C67DBE7BBE77BE77C67FFE0000 +177D:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE618E7DB67BB677B6778E7FFE0000 +177E:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE61867DBE7B8E77BE77867FFE0000 +177F:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE61867DBE7B8E77BE77BE7FFE0000 +1780:00000000000000000760089004000FF008100810081008100810000000000000 +1781:0000000000000000038004400420022000400380042004400380000000000000 +1782:00000000000000000760089004000FF00810081009900A900C10000000000000 +1783:000000000000000019982A202B300910091009100910091006E0000000000000 +1784:0000000004000200028003400180004006200A200AA003600220000000000000 +1785:00000000000000000EC011201000183008500850083008100FF0000000000000 +1786:0000000000000000076008901000087008901E702910291010E0000000000000 +1787:00000000000000200310049008600C0004400440054006C00440000000000000 +1788:00000000000000001C66228822CC2244224432442A442A4431B8000000000000 +1789:00000000000000000DB8124410441044104418441444144418440010070808F0 +178A:00000000038000400320042003C000000220022002A003600220000000000000 +178B:00000010002800080C18142014300410041004100410041003E0000000000000 +178C:00000000000000000EE011101010082000C003100C3010300FD0000000000000 +178D:00000000000000001B062488208C2084208431C42AA42AA43198000000000000 +178E:00000000000000001C38224422642224222432242AA42B643224000000000000 +178F:00000000000000000760089004000FE008200C200A200A200C20000000000000 +1790:0000000000200010031004E008000C6004A004A00460042007E0000000000000 +1791:000000000000000003F8040408080860049003E0008008800F80000000000000 +1792:00000000000000000EC01120100018300850085009300A900C70000000000000 +1793:000000000000000001C002200440040003C00040054006C00440000000000000 +1794:0000000000000000061808200C300410041004100410041003E0000000000000 +1795:000000000020031004900860080008300850085009300A900C70000000000000 +1796:0000000000000000077008880808080808080C080A080A080C08000000000000 +1797:0000000000000000076008900400000003F002100A1012100E10000000000000 +1798:00000000000000000C3010401860082008200FE00820082007C0000000000000 +1799:000000000000000008CC15101598188810881088108810881F70000000000000 +179A:000000000000000000C001000180008000800080028004800300000000000000 +179B:00000000000000000F0C10901098108810881888148814881870000000000000 +179C:0000004000A0002000E001200180008000800080028004800300000000000000 +179D:00000000000000000760089004000FE0082008A80A700D200C20000000000000 +179E:00000000000000000C3010401860082008A808700820082007C0000000000000 +179F:00000000000000000C18102018300F10111019101510151018E0000000000000 +17A0:00000000000000000C78108418C4084408440844084408440784000000000000 +17A1:00000000000000001FC62028404C430424841F0444047C0401C40254016C0044 +17A2:0000000000000000061808200C30041007F00410145024901C70000000000000 +17A3:0000000000000000061808200C30041007F00410145024901C70000000000000 +17A4:00000000000000000C78108418C408440FC4084429444A4439C4000000000000 +17A5:000000000020031004900260000007F004100610051005100610000000000000 +17A6:00000004000A0002000E00121F9810881C8812881C8800081F881888148818F8 +17A7:0000000000000000038004400420022000400390043004500390000000000000 +17A8:000000000000000007600890040003C0042000400390043003D0000000000000 +17A9:00000000000000000E0011001080089001100E5010D011500E50000000000000 +17AA:010000800040074008C00640010003C0042000400390043003D0000000000000 +17AB:0000000000000000061808200C300410041004100410041003E00030070808F0 +17AC:0000000000000000061808200C300410041004100410041003E00030070808F6 +17AD:0000000000000000077008880808080808080C080A080A080C080060071008E0 +17AE:0000000000000000077008880808080808080C080A080A080C080060071008EC +17AF:0000000000000000030001000170019000100710095005B00110000000000000 +17B0:000000000000000007700888080808080C080A080A080C08000003F804900360 +17B1:000000000000038004400620010003C0042000400390043003D0000000000000 +17B2:000000000000001007E0080008E00910091008200810081007E0000000000000 +17B3:000000000000038804500620010003C0042000400390043003D0000000000000 +17B4:AAAA0001A5442945B1282929A510000180000871948822A9BE98227980045555 +17B5:AAAA0001A5442945B1282929A51000018000081194282245BE7C224580005555 +17B6:000000000000001E002200020002000200020002000200020002000000000000 +17B7:00000380044003F8000000000000000000000000000000000000000000000000 +17B8:00000390045003F0000000000000000000000000000000000000000000000000 +17B9:00000390046803F8000000000000000000000000000000000000000000000000 +17BA:005003D0047003F8000000000000000000000000000000000000000000000000 +17BB:00000000000000000000000000010101 +17BC:00000000000000000000000000000000000000000000000000000240024003C0 +17BD:0000000000000000000000000000000000000000000000000000022002A00360 +17BE:00000390045003F0C000A000800080008000C000A000A000C000000000000000 +17BF:005003D0047003FEC001A001800180018001C001A001A001C0011007080107FE +17C0:001800080010003EC001A001800180018001C001A001A001C0011007080107FE +17C1:0000000000000000C000A000800080008000C000A000A000C000000000000000 +17C2:1800880070000000C000A000800080008000C000A000A000C000000000000000 +17C3:9800640044001800C000A000800080008000C000A000A000C000000000000000 +17C4:000000000000001EC022A002800280028002C002A002A002C002000000000000 +17C5:000400020002001EC022A002800280028002C002A002A002C002000000000000 +17C6:0180024001800000000000000000000000000000000000000000000000000000 +17C7:0000000000000000000200050005000200000002000500050002000000000000 +17C8:0000000000000000000000000000000200000002000000000000000000000000 +17C9:0000014001400140000000000000000000000000000000000000000000000000 +17CA:0760089004000000000000000000000000000000000000000000000000000000 +17CB:00010101000000000000000000000000 +17CC:0388045002200400000000000000000000000000000000000000000000000000 +17CD:03880450022001A0000000000000000000000000000000000000000000000000 +17CE:008003E000800080000000000000000000000000000000000000000000000000 +17CF:01E6021C02A00360000000000000000000000000000000000000000000000000 +17D0:000C004400380000000000000000000000000000000000000000000000000000 +17D1:00000FF000000000000000000000000000000000000000000000000000000000 +17D2:0000000000000000000000000000000000000000000000000100038001000000 +17D3:0380044003800000000000000000000000000000000000000000000000000000 +17D4:00000000000000000180098012800C8000800080008000800080000000000000 +17D5:0000000000000000068026804A80328002800280028002800280000000000000 +17D6:00000000304830007800304830000000 +17D7:00000000000000001EF0210838082408380800080008200820081FF000000000 +17D8:0000000000000000331BB4AB54A5149114911651155115511631000000000000 +17D9:00000000000000000380044009200AA00AA00AA0092004400380000000000000 +17DA:00000000000000000000000071008A88AA959252445038200000000000000000 +17DB:000000000000000000C001000180008003E00080028004800300000000000000 +17DC:00000000001C22201C02122418000000 +17DD:000003C004200810000000000000000000000000000000000000000000000000 +17DE:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE63866DBE6D8E6DBE63867FFE0000 +17DF:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE63866DBE6D8E6DBE63BE7FFE0000 +17E0:000000000000000007C0082008200820082008200820082007C0000000000000 +17E1:000000000000000007C00820091006100010001000100E1011E0000000000000 +17E2:0000200020002000277028882C082A082A082C08200820081FF0000000000000 +17E3:00000000000000001EF021082108210821083108290829083108000000000000 +17E4:0000000000000004000803E8041808C0092008800840082007E0000000000000 +17E5:00000600091009200A2007E0040008C0092008800840082007E0000000000000 +17E6:0000000000000000180008000BE00C10001006100910082007C0000000000000 +17E7:00000002000400041DC422242024202420243024282428243018000000000000 +17E8:00000008001007D0083010001030105010901050101013D00C30000000000000 +17E9:000000000000000000080F1010D0103008001F00208024401830000000000000 +17EA:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE61866FB663866FB661B67FFE0000 +17EB:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE618E6FB6638E6FB6618E7FFE0000 +17EC:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE61C66FBE63BE6FBE61C67FFE0000 +17ED:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE618E6FB663B66FB6618E7FFE0000 +17EE:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE61866FBE638E6FBE61867FFE0000 +17EF:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE61866FBE638E6FBE61BE7FFE0000 +17F0:00000000000000003048484830000000 +17F1:00000000000000001028284444000000 +17F2:00000000000000002020202020000000 +17F3:00000000000000000000245A89000000 +17F4:00000000000000004444282810000000 +17F5:00000000000000442810282810000000 +17F6:00000000000000002010100808000000 +17F7:00000000000000000000225488000000 +17F8:00000000000000000810102020000000 +17F9:00000000000000182040780418000000 +17FA:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE61866FB663866FB66FB67FFE0000 +17FB:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE618E6FB6638E6FB66F8E7FFE0000 +17FC:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE61C66FBE63BE6FBE6FC67FFE0000 +17FD:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE618E6FB663B66FB66F8E7FFE0000 +17FE:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE61866FBE638E6FBE6F867FFE0000 +17FF:00007FFE7B8673F67BEE7BDE71DE7FFE7FFE61866FBE638E6FBE6FBE7FFE0000 +1800:0000000003800440042004200420032000200040008001000200020002000000 +1801:0000000000000000000000000000666666660000000000000000000000000000 +1802:000000000000000000000080008001C003E001C0008000800000000000000000 +1803:00000000000000000000081008101C383E7C1C38081008100000000000000000 +1804:0000000000000000018001800000000000000000018001800000000000000000 +1805:00000080008001C003E011C81088389C7C3E389C108811C803E001C000800080 +1806:000000000000000000000000000007E007E00000000000000000000000000000 +1807:000000000000000000000000000007E007E00180018000800000000000000000 +1808:0000000000000400020001000180018001800180010002000400000000000000 +1809:0000000000001040082004100618061806180618041008201040000000000000 +180A:0000000000000000000000000000038003800000000000000000000000000000 +180B:AAAA0001BC442045B8282029A010000180001C11A03018118410387D80005555 +180C:AAAA0001BC442045B8282029A010000180001C79A00418398440387D80005555 +180D:AAAA0001BC442045B8282029A010000180001C79A00418398404387980005555 +180E:AAAA0001A2443645AA282229A2100001800001E1820001C1802003C180005555 +180F:00007FFE7BCE73B67BCE7BB671CE7FFE7FFE73866DBE6D8E6DBE73BE7FFE0000 +1810:0000000003C0042004200810081008100810081008100420042003C000000000 +1811:0000000003C0042004200810081008100410041000100820042003C000000000 +1812:0000000003C00420042008100810081008100812081204240438020000000000 +1813:00000000034004A004A008900890089008900812081204240438020000000000 +1814:0000000003C0042000200210041004100810081008100420042003C000000000 +1815:0000000000000020002000500050004808480844084404420482030000000000 +1816:0000000003C0040004000880088008E00890089008100420042003C000000000 +1817:0000000007E00810031004880488088808880888088804900490006000000000 +1818:000000000000004000400080008001000100021002100420042007C000000000 +1819:0000000003C0042004200820084008400860080008000420042003C000000000 +181A:00007FFE7BCE73B67BCE7BB671CE7FFE7FFE7B8673B67B867BB671B67FFE0000 +181B:00007FFE7BCE73B67BCE7BB671CE7FFE7FFE7B8E73B67B8E7BB6718E7FFE0000 +181C:00007FFE7BCE73B67BCE7BB671CE7FFE7FFE7BC673BE7BBE7BBE71C67FFE0000 +181D:00007FFE7BCE73B67BCE7BB671CE7FFE7FFE7B8E73B67BB67BB6718E7FFE0000 +181E:00007FFE7BCE73B67BCE7BB671CE7FFE7FFE7B8673BE7B8E7BBE71867FFE0000 +181F:00007FFE7BCE73B67BCE7BB671CE7FFE7FFE7B8673BE7B8E7BBE71BE7FFE0000 +1820:00000000000030205010101010101E201E2012201240114000C0000000000000 +1821:00000000000030005000100010001F801FC01040104010400040018001000000 +1822:00000000000031C05220122012201E001E001200120011000080004000000000 +1823:00000000000030005000100010001FE01FE011201120112000C0000000000000 +1824:00000000000030005000100010001FF81FF811201120112000C0000000000000 +1825:00000000000030005000100010001FFC1FFE11261122112200C0000000000000 +1826:00000000000030005000100010001FFE1FFE11281124112200C0000000000000 +1827:00000000000030005000100010001FFC1FFE11061102112200C0000000000000 +1828:00000000000030005000100010001C001C001000100010000000100010000000 +1829:00000000007000880108010801081F001F001900110010800040000000000000 +182A:0000000000000F801040104010401E401E401200120012000C00000000000000 +182B:0000000000000F801040104010401E401E400240020002001E001C0000000000 +182C:00000000000003800440044004401FF01FF00440024006400040000000000000 +182D:00000000000003800440044004401FF01FF00440024006400040060000000600 +182E:00000400040018001000300050001C001C001000100010000000000000000000 +182F:00004000400030001000300050001C001C001000100010000000000000000000 +1830:0000000000000C00140014005400270007000400040004000000000000000000 +1831:00001B001B0000000C0014001400570027000400040004000000000000000000 +1832:0000000000000000100028004400878047802E00140004000000000000000000 +1833:00000000000000001000100010001FC01FC01000120015000900060000000000 +1834:00000000000000000000000000001FF01FF00040004003C007C0040000000000 +1835:00000000000000000000000000001F001F001000100008000800040004000000 +1836:00000000000000000000000000001F001F001000100008000400080000000000 +1837:00000000000000000000000000001F001F001000100008000800140024000000 +1838:00000000000000000000000000001F001F001000100012000C00000000000000 +1839:0000000000000F801040104010401E401E401200120012000C00100010000000 +183A:0000000000000F00108010801080108010801000100018001400140000000000 +183B:0000000000000F001080108010801C801C801000100018001400140000000000 +183C:00000000000000000000000000001FF01FF00100010001C007200EC000000000 +183D:00000000000000000000000000001FF01FF001000100010007200EC000000000 +183E:00000000000030005000100010001E781E781240124012200140008000000000 +183F:000000001800240044004C005400470047004400440050004800300000000000 +1840:00000000400030001000300050001E781E781240124012200140008000000000 +1841:000000000000000000000000000013C013C01200120011000A00040000000000 +1842:00000000000000000000000000001FFC1FFC1290129012900C60000000000000 +1843:00000000000000001000100010001C001C000000000000000000000000000000 +1844:00000000000030005000100010001FC01FC01200120012001180000000000000 +1845:00000000030032805240124012201E201E201220124012400000000000000000 +1846:00000000000030005000100010001FC01FC012401240124011C0000000000000 +1847:00000000000031E05210120812081FC81FC81240124012401180008000600000 +1848:00000000000030005100108010801FC01FC012401240124011C0000000000000 +1849:00000000000031E05210120812081FC81FC81240124012401180000000000000 +184A:00000000000000000000000000001FF81FFC1A04120412040188003000200000 +184B:00000000000000000000000000001FC01FE01220122012200C40018001000000 +184C:00000000000011801240142014207C207C201400140012001E00000000000000 +184D:00000000000030005000100010001FC01FC01B00120012000000120012000000 +184E:00000000000030005000100010001FC01FC01B00120000000C0012000C000000 +184F:0000000001800880148013001100310031000900050003000000000000000000 +1850:00000000000000000C00120012001380138012000A0006000000000000000000 +1851:00000000000000000000000000001F001F00140012000A000C00000000000000 +1852:00000000000000000000000000001FC01FC00100010001000E0012000C000000 +1853:00000000000000000000000000001FC01FC00100010001000600080007000000 +1854:00000000000000000000000000001FC01FC00100010001000600080000000000 +1855:00000000000000000000000000001E001E001000100008000800000000000000 +1856:00000000000000000000000000001F801F80100010000E000900060000000000 +1857:0000070008800840084008400800080008000800040002000600000000000000 +1858:000007000880084008400840080018001800080004000A000000000000000000 +1859:00000000000000000000000000001E781E7C1A4C124412240140008000000000 +185A:00000000070008801040104010401E701E701240124012400C80010003C00000 +185B:00000000000002001E00120012001F801F8010001000100012000C0000000000 +185C:00000000000000000000000000001FC01FC001000F000F000900030004000000 +185D:000000800040108011000100020012001200120012000A000A00060000000000 +185E:00000000000000000000000000001FC01FC01A00120011000100008000000000 +185F:00000000000000002200140008003F803F801800100010000000000000000000 +1860:00000000008031005100100010001FC01FC01240124012401180000000000000 +1861:00000000000000000000000000001FF01FF01280124012200C00000000000000 +1862:00000000000000000000000000001FF01FF01B10121012100020004000400000 +1863:000001000080010001000200020012001200120012400A800600004000800000 +1864:00000000031004A0048008400840387038700840084004801C80000000000000 +1865:00000060039004E0048008400840387838780840084004801C80000000000000 +1866:0000000000000D801240124010401E401E401200120012000C00000000000000 +1867:000000000000030005001500090001C001C00100110009000500000000000000 +1868:0000000001C002200420022001200FF80FF80020002000200000000000000000 +1869:0000000000000100120028004400878047802E00140004000000000000000000 +186A:00000000000000000000000000003F003F001000080004000400040018000000 +186B:000000000C00120002000100010001F801F80100010000800090006000000000 +186C:00000100020000000E0011001080108010801000180014001400000000000000 +186D:000006000900060000000E001100108010801000180014001400000000000000 +186E:0000040004001F0004000C001400178057802400040004000000000000000000 +186F:000000001F00040004000C001400178057802400040004000000000000000000 +1870:00000000000010001000100010001C001C001000100010001000000000000000 +1871:00000000000006000900060000001FC01FC00100010001000600080000000000 +1872:0000000000000C0012000C0000003F003F001000080004000400040018000000 +1873:00000000000000000000000000001FE01FE01100110008800880044004400000 +1874:00000008000400080010001000201F201F201920112010A000A0006001080210 +1875:00000000000000000000000000001F001F801180108008801400140000000000 +1876:000000000C0012000200010001003FF83FF80100010000800090006000000000 +1877:00000000000006000900060000001F801F801000100008000800000000000000 +1878:0000000000000D800D80000000001FC01FC00100010001000600080000000000 +1879:00007FFE7BCE73B67BCE7BB671CE7FFE7FFE61CE7DB67BC677F677CE7FFE0000 +187A:00007FFE7BCE73B67BCE7BB671CE7FFE7FFE61867DB67B8677B677B67FFE0000 +187B:00007FFE7BCE73B67BCE7BB671CE7FFE7FFE618E7DB67B8E77B6778E7FFE0000 +187C:00007FFE7BCE73B67BCE7BB671CE7FFE7FFE61C67DBE7BBE77BE77C67FFE0000 +187D:00007FFE7BCE73B67BCE7BB671CE7FFE7FFE618E7DB67BB677B6778E7FFE0000 +187E:00007FFE7BCE73B67BCE7BB671CE7FFE7FFE61867DBE7B8E77BE77867FFE0000 +187F:00007FFE7BCE73B67BCE7BB671CE7FFE7FFE61867DBE7B8E77BE77BE7FFE0000 +1880:000000000000020001000C8012C012C012C012C00C8001000200000000000000 +1881:0000000000000000000000000CC0132013200CC0000000000000000000000000 +1882:0000000000000000104018C0154012401240154018C010400000000000000000 +1883:0000000000000E0011000100010002001C0002000100010011000E0000000000 +1884:0000000000000E001100100010000800070008001000100011000E0000000000 +1885:000000000000000000000C62129421082108252818C800000000000000000000 +1886:000000040EE811101550089000040EE811101550089000040EE8111015500890 +1887:00000000000030005000100010001FF81FFC1004100810101000000000000000 +1888:0000000000C031205220140014001C001C001400140012401180000000000000 +1889:000000000600090008801080108010F010F01000100008000800040000000000 +188A:00000000000030005180124012201E201E001200120012000100100020000000 +188B:00000000000000000000000000001FF01FF00100010007C00820082000C00000 +188C:00000000000000000000000000003F003F000800040012000A00060000000000 +188D:00000000000000000000000000001FFC1FFC131012A012400C00000000000000 +188E:00000000000000000000000000001FF01FF01000118009400940060000000000 +188F:00000000000000000000000000001FF01FF01000100008000E00060000000000 +1890:00000000000000000000000000001FC01FC01400120009000900060000000000 +1891:00000000000000000000000000001F801F801000120009000A00040000000000 +1892:00000000060009000880104010401F401F000100010009000600000000000000 +1893:00000000060009000880104010401F401F00010001000E00100012000C000000 +1894:0000070008800840084008401040107010701040104008000000028002800000 +1895:0000070008800840084008400840087008700840084008000880070000000000 +1896:000000000000000000000000000007C007C00040004003800040018000000000 +1897:0000000000000700088008400840084008000800088008800700000000000000 +1898:00000000000000000000000000001FC01FC0140012000B800C00000000000000 +1899:00000000000000000F001080108013E017E01480148013000800078000000000 +189A:000000480054064809000880088078FE78FE0880088008003800000000000000 +189B:00000000000030005000100010001FC01FC01000130014801300000000000000 +189C:00000E0011000E001F000C000C00178017805400240004000000000000000000 +189D:00000000000000601E900C600C0017F817F85400240004000000000000000000 +189E:00000000100011800A400980040007F807F80400020002000100010000000000 +189F:00000000000004400AA0044000001FF81FF81000080008000400040000000000 +18A0:00000000000001000200020000001F801F801400120009000A00040000000000 +18A1:00000000024002A012402800440087F047F02E00140004000000000000000000 +18A2:000000000000030005001500090001C001C00100010000000000050005000000 +18A3:000000001000100008000800040007F807F80400020002000100010000000000 +18A4:000003000480030000000300050015C009C00100110009000500000000000000 +18A5:000003000480030000000300050015C009C00100010001000100000000000000 +18A6:00000000000000000000000000001F001F0011000A0004000000000000000000 +18A7:00000000000000000000000000001780178012000A000900050005000E000000 +18A8:0000000000300E481130108010801EFC1EFC1200120012000C00000000000000 +18A9:0000000000000000000000000000000000000000000000000000600010000800 +18AA:00004000400033001480330050001FC01FC01000100010001000000000000000 +18AB:00007FFE7BCE73B67BCE7BB671CE7FFE7FFE618E6DB6618E6DB66D8E7FFE0000 +18AC:00007FFE7BCE73B67BCE7BB671CE7FFE7FFE61C66DBE61BE6DBE6DC67FFE0000 +18AD:00007FFE7BCE73B67BCE7BB671CE7FFE7FFE618E6DB661B66DB66D8E7FFE0000 +18AE:00007FFE7BCE73B67BCE7BB671CE7FFE7FFE61866DBE618E6DBE6D867FFE0000 +18AF:00007FFE7BCE73B67BCE7BB671CE7FFE7FFE61866DBE618E6DBE6DBE7FFE0000 +18B0:0300048004801B00140012001100108010401040108011001200140018000000 +18B1:06000900090006C0014002400440084010401040084004400240014000C00000 +18B2:18C024C0240018C0014002400440084010401040084004400240014000C00000 +18B3:01800240024001B0005000900110021064106410021001100090005000300000 +18B4:18242458201008040202040810204000 +18B5:1824241A040810204040201008040200 +18B6:18242458201008046262040810204000 +18B7:024002400180000007F00800100010001000100010001000080007F000000000 +18B8:30484830004040404078444444380000 +18B9:0C12120C00101010D0DE1111110E0000 +18BA:304848300040404040404040407C0000 +18BB:000000000000000000C00120012000C0000000E00110011001101FE000000000 +18BC:0000000000000000060009000900060000000E001100110011000FF000000000 +18BD:0000000000000000060009000900060000000E001000100010000FF000000000 +18BE:18242418000404041C20404040400000 +18BF:30484830004040407008040404040000 +18C0:0000000000000180024002400180000000000C601210111010900C6000000000 +18C1:0000000000000180024002400180000000000C601090111012100C6000000000 +18C2:0000000000000060009000900060000000000318348434440424031800000000 +18C3:182424180008080808F8402010080000 +18C4:6090906000404040407C081020400000 +18C5:18242418003E404040403E0202020000 +18C6:00000000000000000000000000000000000003FC344034400440038000000000 +18C7:0000000000000000000000000000000000001FE0220C220C22001C0000000000 +18C8:00000000000000000000000001800180000003FC344034400440038000000000 +18C9:0000000000000000000000000C000C0000001FE0220C220C22001C0000000000 +18CA:000000000000000000000000000000000000003830443044004407F800000000 +18CB:00000000000000000000000000000000000001C0022C022C02203FC000000000 +18CC:000000000000000000000000003000300000003830443044004407F800000000 +18CD:00000000000000000000000001800180000001C0022C022C02203FC000000000 +18CE:000000000000000000000000000000001E04020462046204010800F000000000 +18CF:0000000000000000000000000000000003C00420681068100810081E00000000 +18D0:0000000000000000000001800180000003C00420681068100810081E00000000 +18D1:000000000000000003C00020001000101810182003C002000200020000000000 +18D2:000001800180000003C00020001000101810182003C002000200020000000000 +18D3:000000000000000000F00100020002001A00190000F000100010001000000000 +18D4:00000010102828444400000000000000 +18D5:00000000384444444400000000000000 +18D6:00000000304848704040000000000000 +18D7:00000000304848404040000000000000 +18D8:00000000784040404040000000000000 +18D9:000000003E4848300000000000000000 +18DA:00000000080808106040400000000000 +18DB:0000000062928C000000000000000000 +18DC:00000008C8D414223E00000000000000 +18DD:0000002026565088F800000000000000 +18DE:18242418000000000000000000000000 +18DF:00181800000000000000000000000000 +18E0:000000000000000000000000000000007816081608100810042003C000000000 +18E1:0000060006000000040004000400078000400020002000200040078000000000 +18E2:000000600060000000200020002001E00200040004000400020001E000000000 +18E3:000000000000000000000E201120112C112C1220102010200840078000000000 +18E4:0000000000000000000000000FC01020202C222C21C0200010000FE000000000 +18E5:0000000000000000000022202220222C222C22202020202010400F8000000000 +18E6:000000000600060000001FC00020001000101F100010001000201FC000000000 +18E7:0000000000C000C0000007F008001000100011F010001000080007F000000000 +18E8:000000000000000000000E001100110011000F30053005000900090000000000 +18E9:0000060600090905050F1111110E0000 +18EA:000000000000000000000F001080128012800C98009800800080008000000000 +18EB:000006060002020202324A4A423C0000 +18EC:0000000000300030000000300050005008900890071000100010001000000000 +18ED:00000000000000000000000042104210421642164210421042103DE000000000 +18EE:000000000300030000000FE00010001000100FE00010001000100FE000000000 +18EF:0000000000C000C0000007F008000800080007F008000800080007F000000000 +18F0:000000000000000000001FC020002000200C1FCC2000200020001FC000000000 +18F1:00000180018000000FF00600018000400020039004500410022001C000000000 +18F2:00000000000000000000000000201860246C44AC44A0492022201C2000000000 +18F3:00000030101010103800000000000000 +18F4:00000000586440404000000000000000 +18F5:000000003C4038047800000000000000 +18F6:00007FFE7BCE73B67BCE7BB671CE7FFE7FFE61CE6FBE638E6FB66FCE7FFE0000 +18F7:00007FFE7BCE73B67BCE7BB671CE7FFE7FFE61866FF663EE6FDE6FDE7FFE0000 +18F8:00007FFE7BCE73B67BCE7BB671CE7FFE7FFE61CE6FB663CE6FB66FCE7FFE0000 +18F9:00007FFE7BCE73B67BCE7BB671CE7FFE7FFE61CE6FB663C66FF66FCE7FFE0000 +18FA:00007FFE7BCE73B67BCE7BB671CE7FFE7FFE61866FB663866FB66FB67FFE0000 +18FB:00007FFE7BCE73B67BCE7BB671CE7FFE7FFE618E6FB6638E6FB66F8E7FFE0000 +18FC:00007FFE7BCE73B67BCE7BB671CE7FFE7FFE61C66FBE63BE6FBE6FC67FFE0000 +18FD:00007FFE7BCE73B67BCE7BB671CE7FFE7FFE618E6FB663B66FB66F8E7FFE0000 +18FE:00007FFE7BCE73B67BCE7BB671CE7FFE7FFE61866FBE638E6FBE6F867FFE0000 +18FF:00007FFE7BCE73B67BCE7BB671CE7FFE7FFE61866FBE638E6FBE6FBE7FFE0000 +1900:000000000000FF801080208040807C800880108020804E807180000000000000 +1901:0000000000003E00020002000400040008000800100010001F00000000000000 +1902:0000000000003F8042008400840084008400840084004A403180000000000000 +1903:0000000000007880090012002400780014002200220022001C00000000000000 +1904:000000000000FF80208020802080208011800E80008000800080000000000000 +1905:0000000000005E004480494050805C0042004100210022001C00000000000000 +1906:0000000000007080088004800280028002802280528054803880000000000000 +1907:0000000000007F8008001000200078004E004000408021001E00000000000000 +1908:0000000000007F80008078800480048078800080008000800080000000000000 +1909:0000000000001F002000200020001F0020002000200020001F00020004000800 +190A:0000000000007F800400040034004C0046004940308001400240000000000000 +190B:0000000000001F00208040800100060001000080408020801F00000000000000 +190C:0000000000007C0004000400040004003F804440444044403880000000000000 +190D:00000000000060C01F0004000400070000800040404020801F00000000000000 +190E:0000000000007C80188020802080188020802080208011000E00000000000000 +190F:0000000000007C0004000400080008001E001000200020003E00000000000000 +1910:0000000000002200410041008080808080808080490049003600000000000000 +1911:0000000000000000770088800880088008800880888088807700000000000000 +1912:00000000000060C01F00040004001C0020004180424022801F00000000000000 +1913:0000000000003880448044804880508051802E80008000800080000000000000 +1914:0000000000007F80088008801080108020804080788006800180000000000000 +1915:0000000000007E00040008001C00020032004A003C0008000000000000000000 +1916:0000000000007C00040004000800080018001800240022004100000000000000 +1917:00000000000031802E80208010800E8000800080008000800080000000000000 +1918:0000000000001080308050809080108009800680008000800080000000000000 +1919:00000000000043C0420042004200420042004200420042003C00000000000000 +191A:0000000000001D002300210021002100210023001D0001000100000000000000 +191B:0000000000003F80448044804480448044803880008000800080000000000000 +191C:0000000000001F002100420044004F0040804000200010800F00000000000000 +191D:0000000000007F80100010001E00110011000100010001000100000000000000 +191E:0000000000007F80100010001F00010001001100290025001E00010000000000 +191F:00007FFE7BCE73B67BC67BF671CE7FFE7FFE7B8673BE7B8E7BBE71BE7FFE0000 +1920:300048003F800000000000000000000000000000000000000000000000000000 +1921:0000003C00420004000700000000000000000000000000000000000000000000 +1922:000000000000000000000000000000000000000000000000000030804B003C00 +1923:000000000000000800140014000C000400040008000800100010000000000000 +1924:0000000000000012002D002D001B000900090012001200240024000000000000 +1925:300048003F80000800140014000C000400040008000800100010000000000000 +1926:300048003F800012002D002D001B000900090012001200240024000000000000 +1927:6000180006000000000000000000000000000000000000000000000000000000 +1928:008031000A000400000000000000000000000000000000000000000000000000 +1929:0000000000000000000000000000000000000000000100220052000C00000000 +192A:0000000000000000000000000000000000000000000000000000004000A00110 +192B:00000000000000000000000000000072000A00320046003A0002000000000000 +192C:00007FFE7BCE73B67BC67BF671CE7FFE7FFE61C67DBE61BE6FBE61C67FFE0000 +192D:00007FFE7BCE73B67BC67BF671CE7FFE7FFE618E7DB661B66FB6618E7FFE0000 +192E:00007FFE7BCE73B67BC67BF671CE7FFE7FFE61867DBE618E6FBE61867FFE0000 +192F:00007FFE7BCE73B67BC67BF671CE7FFE7FFE61867DBE618E6FBE61BE7FFE0000 +1930:000000000000003E001000200022001C00000000000000000000000000000000 +1931:000000000000000000000000000000000000000C00120012000C000000000000 +1932:00000000000000000000000000000000000000000000000000000C0012000C00 +1933:0000000000000000000000000000000000000000000000000000003800440000 +1934:0000000000000080004000400044002A002A001C000000000000000000000000 +1935:0000000000000042002200220026001A00020000000000000000000000000000 +1936:0000000000000044002A002A001C000800080008000800080008000000000000 +1937:0000000000000000000000000000000000000000000000000020001000080000 +1938:0000000000000024002400240018000000000000000000000000000000000000 +1939:0000000000000000000000000000000000000000000000000010002000400000 +193A:0280000000000000000000000000000000000000000000000000000000000000 +193B:000000000000000000000000000000000000000000000000000000007F800000 +193C:00007FFE7BCE73B67BC67BF671CE7FFE7FFE63C67DBE71BE7DBE63C67FFE0000 +193D:00007FFE7BCE73B67BC67BF671CE7FFE7FFE638E7DB671B67DB6638E7FFE0000 +193E:00007FFE7BCE73B67BC67BF671CE7FFE7FFE63867DBE718E7DBE63867FFE0000 +193F:00007FFE7BCE73B67BC67BF671CE7FFE7FFE63867DBE718E7DBE63BE7FFE0000 +1940:00000000000002000400080008000830084808480428021001E0000000000000 +1941:00007FFE7BCE73B67BC67BF671CE7FFE7FFE6DEE6DCE61EE7DEE7DC67FFE0000 +1942:00007FFE7BCE73B67BC67BF671CE7FFE7FFE6D866DF661867DBE7D867FFE0000 +1943:00007FFE7BCE73B67BC67BF671CE7FFE7FFE6D8E6DF661C67DF67D8E7FFE0000 +1944:0000000000000180024002400140004000400040004000000040000000000000 +1945:0000000000000460029001200100010001000100010000000100000000000000 +1946:0000000000000380044008200820082008200820082004400380000000000000 +1947:00000000000008000800080008000860089008900850042003C0000000000000 +1948:0000000000000100028002800440044008200820101010101010000000000000 +1949:00000000000007800840080004000380004000200020042003C0000000000000 +194A:0000000000001830044002800280010002800280044008203018000000000000 +194B:00000000000003C004A008A0084008000800084008A004A003C0000000000000 +194C:000000000000038004400820080008000800084008A004A003C0008000400020 +194D:0000000000000C4010A011000900060003000480044004400380000000000000 +194E:0000000000001010101010100820082004400440028002800100000000000000 +194F:0000000000001FE012200A200640024000800080010002000400000000000000 +1950:00000000000048542404040404000000 +1951:000000000000485424041C241C000000 +1952:00000000000058644444444444000000 +1953:000000000000A0561A1212161A000000 +1954:000000000000A052121212161A000000 +1955:0000000000004242424242562A000000 +1956:000000000000B6DA929292B2D2000000 +1957:000000000000B6DA929292B6DA000000 +1958:0000000000000202020242562A000000 +1959:00000000000044444444444C34000000 +195A:000000000000969A929292B6DA000000 +195B:00000000000044447C44444C34000000 +195C:000000000000969A929292B6DA020408 +195D:00000000000058644444444C34000000 +195E:000000000000B6DA929292B2D2102040 +195F:000000000000B65A1212121212102040 +1960:000000000000485424041C241C040810 +1961:000000000000A052121212161A020408 +1962:000000000000464A4A52526242000000 +1963:00000010101010101010101010000000 +1964:0000003C2424243C242424342C000000 +1965:0000003C242424242424242424000000 +1966:0000003C24242424242424242404041C +1967:0000002020202020202020203C003C00 +1968:0000002020202020202020203C000000 +1969:0000002424242424242424243C000000 +196A:0000003C2424243C242424342C202038 +196B:0000003C242424242424242424202038 +196C:0000003C202020202020202020000000 +196D:000000000000A052121212161A102040 +196E:00007FFE7BCE73B67BC67BF671CE7FFE7FFE73866FBE638E6DBE73867FFE0000 +196F:00007FFE7BCE73B67BC67BF671CE7FFE7FFE73866FBE638E6DBE73BE7FFE0000 +1970:000000000000F8484848484A84000000 +1971:0000000000001824447C404438000000 +1972:0000000000001C244444444C34000000 +1973:00000000000040242A2A26221C000000 +1974:00000000000018244040404438000000 +1975:00007FFE7BCE73B67BC67BF671CE7FFE7FFE61867DBE7B8677F677867FFE0000 +1976:00007FFE7BCE73B67BC67BF671CE7FFE7FFE61CE7DBE7B8E77B677CE7FFE0000 +1977:00007FFE7BCE73B67BC67BF671CE7FFE7FFE61867DF67BEE77DE77DE7FFE0000 +1978:00007FFE7BCE73B67BC67BF671CE7FFE7FFE61CE7DB67BCE77B677CE7FFE0000 +1979:00007FFE7BCE73B67BC67BF671CE7FFE7FFE61CE7DB67BC677F677CE7FFE0000 +197A:00007FFE7BCE73B67BC67BF671CE7FFE7FFE61867DB67B8677B677B67FFE0000 +197B:00007FFE7BCE73B67BC67BF671CE7FFE7FFE618E7DB67B8E77B6778E7FFE0000 +197C:00007FFE7BCE73B67BC67BF671CE7FFE7FFE61C67DBE7BBE77BE77C67FFE0000 +197D:00007FFE7BCE73B67BC67BF671CE7FFE7FFE618E7DB67BB677B6778E7FFE0000 +197E:00007FFE7BCE73B67BC67BF671CE7FFE7FFE61867DBE7B8E77BE77867FFE0000 +197F:00007FFE7BCE73B67BC67BF671CE7FFE7FFE61867DBE7B8E77BE77BE7FFE0000 +1980:00000000000000001C70228801040104010422081C3000080004008400780000 +1981:00000180024000001C70228801040104010422081C3000080004008400780000 +1982:00000000000000000E38114420822002200210040E3800000000000000000000 +1983:00000000384402021A241A0202423C00 +1984:00000000000000000E3810442082208211040E38000000F8010400E4021401F8 +1985:000000000000000003C004200810081008100420024000000000000000000000 +1986:03C00420081008000BC00C200810081008100420024000000000000000000000 +1987:000000000000000003C004200810081008100B100C9000100010042003C00000 +1988:000000000000000007C00820081006100810082007C000000000000000000000 +1989:00000000000000001C70220801040104010422881C7000000000000000000000 +198A:00300048004000400E40114010400C40104010800F0000000000000000000000 +198B:000000000000000003C004200810081008100420024000200010041003E00000 +198C:03C00420081008000BC00C200810081008100420024000200010041003E00000 +198D:00000000000000000E38100420022002208211440E3800000000000000000000 +198E:00000000000000000E38114420822082208211040E3800000000000000000000 +198F:000000003C4241314145390101221C00 +1990:00000000000000000E38104420822082208211040E38002000300208010800F0 +1991:1E2140404E51414641211E0000000000 +1992:000000000000000007F008081004100410840888077000000000000000000000 +1993:000000000000000007C00820080008000800080007C000200010082007C00000 +1994:0018002400200020062008201020102010200840078000000000000000000000 +1995:00000000000000001C70228820881850202020521F8C00000000000000000000 +1996:00000000000000000E38104420822082208211040E38002001E00204020801F0 +1997:00000000000000000E3811442082200210060E3A000203E2041205E2040403F8 +1998:00000000000000001C70228801040104010422081C7000000000000000000000 +1999:000000000000000002400420081008100BD0042003D000100010041003E00000 +199A:3E403F013945413141423C0000000000 +199B:00000000000000000E38104420822082208211040E38000003E00410041003E0 +199C:00000000000000000E38104420822082208211040E3800080308048804480230 +199D:0F001080204020002E38314420822002200210040E3800000000000000000000 +199E:000000001C22414141221C0000000000 +199F:00000000000000000E38110420822082208210440E3800000000000000000000 +19A0:00000000000000000E38104420822082208211040E3800000000000000000000 +19A1:00000000384402020204180402423C00 +19A2:000000000000000002400420081008100810042003C000000000000000000000 +19A3:00000000384442221151210202040000 +19A4:00182400384402020204180402423C00 +19A5:000001800240000002400420081008100810042003C000000000000000000000 +19A6:00000000000000000E38114420822002200210040E38000003E00410041003E0 +19A7:00000000384402023A443A003C42423C +19A8:000000000000000003C0042008100810081004200240000003C00420042003C0 +19A9:03C00420081008000BC00C2008100810081004200240000003C00420042003C0 +19AA:00000000000000001C70220801040104010422881C70000007C00820082007C0 +19AB:03C00420081008000BC00C200810081008100420024000200390046004400380 +19AC:00007FFE7BCE73B67BC67BF671CE7FFE7FFE61C66DBE61BE6DBE6DC67FFE0000 +19AD:00007FFE7BCE73B67BC67BF671CE7FFE7FFE618E6DB661B66DB66D8E7FFE0000 +19AE:00007FFE7BCE73B67BC67BF671CE7FFE7FFE61866DBE618E6DBE6D867FFE0000 +19AF:00007FFE7BCE73B67BC67BF671CE7FFE7FFE61866DBE618E6DBE6DBE7FFE0000 +19B0:00000000304926003049260000000000 +19B1:00000000384402020244380000000000 +19B2:1C224141415D634141221C0000000000 +19B3:00000000384402020244784040423C00 +19B4:00000000000000001040104010401040104008C0074000400040004800300000 +19B5:000000000000000003C004200810081008100420023000000000000000000000 +19B6:00000000000000001C1C22224141414141412222131300000000000000000000 +19B7:384440201820404040221C0000000000 +19B8:000000001C2222140814630000000000 +19B9:1C2A4949495D634141221C0000000000 +19BA:3C4202021E22404040221C0000000000 +19BB:00000000000000000F08108800480048004810C80F4800480048004800300000 +19BC:07000880104010401048174818C81048104808C8074800480048004800300000 +19BD:000000000000000007840844102410241024086407A400240024002400180000 +19BE:00180024002000201C2022202220142008201440638000000000000000000000 +19BF:07000A80124012401248174818C81048104808C8074800480048004800300000 +19C0:07000880104010401048174818C81048104808C8074800480048004800300000 +19C1:000000001C22414141231D010D120C00 +19C2:000000000000000003C004200810081008100B100C90001000D0012000C00000 +19C3:000000000000000007C00820080008000800080007C000200610092007C00000 +19C4:000000000000000002400420081008100BD0042003D000100310049003E00000 +19C5:00000000000000000E38114420822002200210060E3A0002001A002400180000 +19C6:000000003844020202041804324A3C00 +19C7:000000000000000002400420081008100810043003D0001000D0012000C00000 +19C8:000000001C20405C62221C0000000000 +19C9:000000001C22625C40201C0000000000 +19CA:00007FFE7BCE73B67BC67BF671CE7FFE7FFE71866FB66F866FB671B67FFE0000 +19CB:00007FFE7BCE73B67BC67BF671CE7FFE7FFE718E6FB66F8E6FB6718E7FFE0000 +19CC:00007FFE7BCE73B67BC67BF671CE7FFE7FFE71C66FBE6FBE6FBE71C67FFE0000 +19CD:00007FFE7BCE73B67BC67BF671CE7FFE7FFE718E6FB66FB66FB6718E7FFE0000 +19CE:00007FFE7BCE73B67BC67BF671CE7FFE7FFE71866FBE6F8E6FBE71867FFE0000 +19CF:00007FFE7BCE73B67BC67BF671CE7FFE7FFE71866FBE6F8E6FBE71BE7FFE0000 +19D0:000000001C22414141221C0000000000 +19D1:00000000384402020244380000000000 +19D2:000000000E0202020202020202443800 +19D3:000000003C42010101423C1008040200 +19D4:000000001E21404040211E0408102000 +19D5:00000000000000000E38114420842004200410040C0400040024002400180000 +19D6:003C4240444A484442221C0000000000 +19D7:00000000000000001C7022884108400840082008180800080009000900060000 +19D8:00000000182424244242810000000000 +19D9:000000001C2241414946404040423C00 +19DA:000000000008000803D00420080008000800042003C000000000000000000000 +19DB:00007FFE7BCE73B67BC67BF671CE7FFE7FFE638E6DB66D8E6DB6638E7FFE0000 +19DC:00007FFE7BCE73B67BC67BF671CE7FFE7FFE63C66DBE6DBE6DBE63C67FFE0000 +19DD:00007FFE7BCE73B67BC67BF671CE7FFE7FFE638E6DB66DB66DB6638E7FFE0000 +19DE:0000000C001200100C10121021102110211010900C6000000000000000000000 +19DF:0000000C001200100C10121021102110211010900C60000007C00820082007C0 +19E0:0000000001C0022002200220022001C0000803F8040008E0092008A00A200DE0 +19E1:000003800440054002400040044003800000024004C003400040004000400000 +19E2:00001000136014901410131010100FE00000024004C003400040004000400000 +19E3:000000000EE0111011101910151019100000024004C003400040004000400000 +19E4:00000200040009000A800A00090007800000024004C003400040004000400000 +19E5:04800B80040009000A800A00090007800000024004C003400040004000400000 +19E6:040005800640004002400540044003800000024004C003400040004000400000 +19E7:0000001006C8092808280C280A280C100000024004C003400040004000400000 +19E8:002003E0040008E0092008A00A200DC00000024004C003400040004000400000 +19E9:00000040004003C004000300044003800000024004C003400040004000400000 +19EA:00001C3822442A441244024422441C380000024004C003400040004000400000 +19EB:00001C3822442A541224020422441C380000024004C003400040004000400000 +19EC:00003900452C555225420522450238FC0000024004C003400040004000400000 +19ED:000038EC4512551225120592455239920000024004C003400040004000400000 +19EE:00001C1022202A481254025022481C3C0000024004C003400040004000400000 +19EF:00241C5C22202A481254025022481C3C0000024004C003400040004000400000 +19F0:002003E0040008E0092008A00A200DC0002003E0040008E0092008A00A200DC0 +19F1:0000048009800680008000800080000003800440054002400040044003800000 +19F2:000004800980068000800080008000001000136014901410131010100FE00000 +19F3:0000048009800680008000800080000000000EE0111011101910151019100000 +19F4:000004800980068000800080008000000200040009000A800A00090007800000 +19F5:000004800980068000800080008004200BE0040009000A800A00090007800000 +19F6:0000048009800680008000800080040005800640004002400540044003800000 +19F7:00000480098006800080008000800000001006C8092808280C280A280C100000 +19F8:0000048009800680008000800080002003E0040008E0092008A00A200DC00000 +19F9:000004800980068000800080008000000040004003C004000300044003800000 +19FA:000004800980068000800080008000001C3822442A441244024422441C380000 +19FB:000004800980068000800080008000001C3822442A541224020422441C380000 +19FC:000004800980068000800080008000003900452C555225420522450238FC0000 +19FD:0000048009800680008000800080000038EC4512551225120592455239920000 +19FE:000004800980068000800080008000001C1022202A481254025022481C3C0000 +19FF:000004800980068000800080008000241C5C22202A481254025022481C3C0000 +1A00:0000000000000000000000000000000000800110022004400880010000000000 +1A01:0000000000000000000000000000000001200120029002900460056000000000 +1A02:0000000000000000000000000000000002000100008000C00120021000000000 +1A03:00000000000000000000000000000000004000A0011002880440082000000000 +1A04:0000000000000000000000000000000001200120029002900460046000000000 +1A05:0000000000000000000000000100028004400220010001800240042000000000 +1A06:0000000000000000000000000000000004400440028002800100010000000000 +1A07:00000000000000000000000000000000084004200210031004A0084000000000 +1A08:0000000000000000000000000000000000800080014001400220022000000000 +1A09:0000000000000000000000000000000005400440028002800100010000000000 +1A0A:000000000000000000000000000000000080008001400140022002A000000000 +1A0B:0000000000000000000000000000002001100290028804480450092002800000 +1A0C:00000000000000000000000000000000012001200290021004A0044000000000 +1A0D:00000000000000000000000000000000004000A00110031004A0084000000000 +1A0E:0000000000000000000000000000000002200220055004900808094800800000 +1A0F:0000000000000000000000000000000002200220055004900948094800000000 +1A10:00000000000000000000000000000000042004200A500A50118815A800000000 +1A11:0000000000000000000000000000000001800240042001800240042000000000 +1A12:00000000000000000000000000000000042004200A500A101148118800000000 +1A13:00000000000000000000000000000000042004200A500A501188118800000000 +1A14:000000000000000000000000000000000180066008100408033000C000000000 +1A15:00000000000000000000000000000000042004200A500A50118811A800000000 +1A16:0000000000000000000000000000000004200A50118811880A50042000000000 +1A17:0000000000000000000008000000000000000000000000000000000000000000 +1A18:0000000000000000000000000000000000000000000000000000000000000010 +1A19:0000000000000000000000000000000000004000800080004000200000000000 +1A1A:0000000000000000000000000000000000000006000200020001000100000000 +1A1B:0000000010000800040008000000000000000000000000000000000000000000 +1A1C:00007FFE7B8673B67B867BB671B67FFE7FFE7BC673BE7BBE7BBE71C67FFE0000 +1A1D:00007FFE7B8673B67B867BB671B67FFE7FFE7B8E73B67BB67BB6718E7FFE0000 +1A1E:0000000000000000000030003000000000000180018000000000000C000C0000 +1A1F:0000000000000000000000000000100010003800440000004400380010001000 +1A20:0000000000000000000003700488084408440844048800300000000000000000 +1A21:0000000000000000000003C00420001003D00430043003C80000000000000000 +1A22:03E0040004000400040005C00620001003D00430043003C80000000000000000 +1A23:0000000000000000000001E00210040804080408021001200000000000000000 +1A24:03C0040004000400040005E00610040804080408021001200000000000000000 +1A25:0000000000000000000005000AA800A40124022402A401580000000000000000 +1A26:0000000000000000000001E0021004080208040804C803280000000000000000 +1A27:0000000000000000000001C00220011000900110022001C00000000000000000 +1A28:0000000000800080004003300488004400440044048803700000000000000000 +1A29:0000000000000000000000F00108020802100208010800C80000000000000000 +1A2A:03E0040004000400040005E00610041004200410021001900000000000000000 +1A2B:0000000000800080004003300488044402440444048803700000000000000000 +1A2C:00000000000000000000033004880044004400440488077004000404040403F8 +1A2D:0000000000000000000002200510040802080408049003600000000000000000 +1A2E:0000000000000000000002200510040802080408041803E8000803C8041003E0 +1A2F:0000000000000000000001C0022000100010002000C001300008000000000000 +1A30:0000000000000000000002800550004800880108015000A00000000000000000 +1A31:00000000000000000000011002A804A404A404A4024801100000000000000000 +1A32:0000000000000000000003700488084408440844048803300000000000000000 +1A33:0000000000000000000003E0041002080148022804A803480000000000000000 +1A34:0000000000000000000002700488041004200410020801F00000000000000000 +1A35:0000000000000000000001E0021004080408040802D001200000000000000000 +1A36:0000000000000000000001C0022004000400040002E001100008000000000000 +1A37:0000000000000000000001200210040804080408021001E00000000000000000 +1A38:0000000600080010001000100210041004100410022001C00000000000000000 +1A39:0000000000000000000002100528042802280428049003680000000000000000 +1A3A:03F004080400040003F800080208040802080408029001600000000000000000 +1A3B:00000000000000000000012002D0040804080408021001200000000000000000 +1A3C:03E00400040004000400052006D0040804080408021001200000000000000000 +1A3D:0000000000000000000003700488004400440044048803300000000000000000 +1A3E:00000000000000000000012002100408040804E8021001E80004000000000000 +1A3F:0000000000000000000000300488084408440844048803700000000000000000 +1A40:0006000800080008000803880408040803080408041003E00000000000000000 +1A41:0000000000000000000003800440022001100490044803880000000000000000 +1A42:0000000000000000000002200550048802080008000803E80418048803F40020 +1A43:0000000000000000000003300488088408840844044803300000000000000000 +1A44:0000000000000000000003C004200010001003E0001003D00430049003E80020 +1A45:0000000000000000000001E00210040804080408021001E00000000000000000 +1A46:0000000000000000000401E8021004E804080408021001200000000000000000 +1A47:0000000000000000000003300488004400440054048803740000000000000000 +1A48:0000000000000000000003300488004400440044048803700000000000000000 +1A49:0000000000000000000003300448084408840884048803300000000000000000 +1A4A:0000000000000000000001E0021004080208040804C8032802000270020801F0 +1A4B:0000000000000000000003700488004400440044048803300008000400000000 +1A4C:00000000000000000000033004480844088408840488033000100190021001E0 +1A4D:00000000000000000000033004C8040804080210000003E0041004C805480208 +1A4E:00FC0102010000FE0002033204CA040A040A0212000203E2041204CA054A020C +1A4F:0000000000000000000001E00210000800080408061005E004000400021001E0 +1A50:03C0040004000400040005E00610000800080408061005E004000400021001E0 +1A51:0000000000000000000001E00210040804080408041004E004000400021001E0 +1A52:0800100010001000100013701488104410441044148813301008100410000800 +1A53:0006000800080008000803080488088808880848044803300000000000000000 +1A54:000000000000000000000248052400920092009205B402480000000000000000 +1A55:0800100010001000100010001000100010001000100010001000100010000800 +1A56:00000000000000000000000000000000000000000000000000000C8012400980 +1A57:000000000000000600010001000100010001000100010001000100650092004D +1A58:000C0010000C0010000C00000000000000000000000000000000000000000000 +1A59:01E0021002D00150000000000000000000000000000000000000000000000000 +1A5A:00A00150011000A0000000000000000000000000000000000000000000000000 +1A5B:00000000000000000000000000000000000000000000000000400F4010400F80 +1A5C:0000000000000000000000000000000000000000000000000000094008C007A0 +1A5D:0000000000000000000000000000000000000000000000000000084008400780 +1A5E:00000000000000000000000000000000000000000000000000000C8002400D80 +1A5F:00007FFE7B8673B67B867BB671B67FFE7FFE61866FBE618E7DBE61BE7FFE0000 +1A60:00000000000000000000000000000000000000000000000000000008001C0008 +1A61:0000000000000000000000000003000000000000000300000000000000000000 +1A62:0000001000200040000000000000000000000000000000000000000000000000 +1A63:0000000000000000000000020001000100010001000100020000000000000000 +1A64:00000000000E0011001100010001000100010001000100010000000000000000 +1A65:01E0021002100120000000000000000000000000000000000000000000000000 +1A66:01E0021002200110000000000000000000000000000000000000000000000000 +1A67:01F0020802480110000000000000000000000000000000000000000000000000 +1A68:03B0044804480290000000000000000000000000000000000000000000000000 +1A69:0000000000000000000000000000000000000000000000000010001000180000 +1A6A:00000000000000000000000000000000000000000000000000280028002C0000 +1A6B:0000000000780064000200000000000000000000000000000000000000000000 +1A6C:0000000000000000000000000000000000000000000000000000002000480036 +1A6D:0000000100010001000100010001000100010001000100010005000900090006 +1A6E:0000000000000000000040008000800080008000800040000000000000000000 +1A6F:000000000000000000005000A000A000A000A000A00050000000000000000000 +1A70:0000400080008000800040008000800080008000800040000000000000000000 +1A71:0000000080004000200060008000800080008000800040000000000000000000 +1A72:00004000A0002000200060008000800080008000800040000000000000000000 +1A73:0040004000A00318000000000000000000000000000000000000000000000000 +1A74:0200050002000000000000000000000000000000000000000000000000000000 +1A75:0000080008000800000000000000000000000000000000000000000000000000 +1A76:0000020014000800000000000000000000000000000000000000000000000000 +1A77:0000001000280044000000000000000000000000000000000000000000000000 +1A78:0002000200020012000C00000000000000000000000000000000000000000000 +1A79:0018000400180010000C00000000000000000000000000000000000000000000 +1A7A:00700048012400E4000000000000000000000000000000000000000000000000 +1A7B:000C001600140014000000000000000000000000000000000000000000000000 +1A7C:00340048012000C0000000000000000000000000000000000000000000000000 +1A7D:00007FFE7B8673B67B867BB671B67FFE7FFE618E7DB67BB677B6778E7FFE0000 +1A7E:00007FFE7B8673B67B867BB671B67FFE7FFE61867DBE7B8E77BE77867FFE0000 +1A7F:0000000000000000000000000000000000000000000000000600090009000600 +1A80:0000000000000000000001C00220041004100410022001C00000000000000000 +1A81:0000000000000000000003800440002000200020044003800000000000000000 +1A82:00000000000000000000001000100010001000100010001004100410022001C0 +1A83:0000000000000000038004400020002000200440038002000100010000800040 +1A84:000000000000000001C00220040004000400022001C000400080008001000200 +1A85:0000000000000000000001C002200410071004900310001004100410022001C0 +1A86:01C00220041004000460049004E0048004700410022001C00000000000000000 +1A87:0000000000000000000003800440044004400440044002400040004000400030 +1A88:0000000000000000000001C00220041004100510029001200000000000000000 +1A89:000000000000000001C0022004100470048004E00490046004000410022001C0 +1A8A:00007FFE7B8673B67B867BB671B67FFE7FFE73866DB673866DB673B67FFE0000 +1A8B:00007FFE7B8673B67B867BB671B67FFE7FFE738E6DB6738E6DB6738E7FFE0000 +1A8C:00007FFE7B8673B67B867BB671B67FFE7FFE73C66DBE73BE6DBE73C67FFE0000 +1A8D:00007FFE7B8673B67B867BB671B67FFE7FFE738E6DB673B66DB6738E7FFE0000 +1A8E:00007FFE7B8673B67B867BB671B67FFE7FFE73866DBE738E6DBE73867FFE0000 +1A8F:00007FFE7B8673B67B867BB671B67FFE7FFE73866DBE738E6DBE73BE7FFE0000 +1A90:0000000000000000000001C00220041004100410022001C00000000000000000 +1A91:0000000000000000002001A00260040004000500028001000000000000000000 +1A92:01C0022004100410041004000400040004000600050002000000000000000000 +1A93:000000000100010000801C70220801040104010422881C700000000000000000 +1A94:0000000000000000000002600490042004400420021003E0020002E0021001E0 +1A95:0020002000400180020004600490042004400420021003E00000000000000000 +1A96:0010002000200020002002200520042002200420052002C00000000000000000 +1A97:0000000000000000000002400520041002100410052002C00000000000000000 +1A98:0000000000000000000018C02520421040102060004003F8044409F20A490431 +1A99:000000000000000000000E181104208220822882144408380000000000000000 +1A9A:00007FFE7B8673B67B867BB671B67FFE7FFE73866DB671867DB673B67FFE0000 +1A9B:00007FFE7B8673B67B867BB671B67FFE7FFE738E6DB6718E7DB6738E7FFE0000 +1A9C:00007FFE7B8673B67B867BB671B67FFE7FFE73C66DBE71BE7DBE73C67FFE0000 +1A9D:00007FFE7B8673B67B867BB671B67FFE7FFE738E6DB671B67DB6738E7FFE0000 +1A9E:00007FFE7B8673B67B867BB671B67FFE7FFE73866DBE718E7DBE73867FFE0000 +1A9F:00007FFE7B8673B67B867BB671B67FFE7FFE73866DBE718E7DBE73BE7FFE0000 +1AA0:0000000003E004900888108410841FFC108410840888049003E0000000000000 +1AA1:00000000038004800880108010801FFC108410840888049003E0000000000000 +1AA2:0012004C003800D000201CC0222001100110011022201DC00000000000000000 +1AA3:000000000080014001C002200C9815540C98022001C001400080000000000000 +1AA4:0000000000000FE0101027C8282829C8281027E0100C0FF00000000000000000 +1AA5:000003E00220094815540AA865535A2D44115A2D65530AA815540948022003E0 +1AA6:000001C00220041004100190026002000260019004100410022001C000000000 +1AA7:000000000000000003B004480A48040800080010006001800200040004000400 +1AA8:0000000000000000000002000200020002000200020002000000000000000000 +1AA9:0000000000000000000009000900090009000900090009000000000000000000 +1AAA:0000000000000000000004000800090007000100010001000000000000000000 +1AAB:000000000000000000000880108012800E800280028002800000000000000000 +1AAC:000000380004000401C4022800300E201140018011000E000000000000000000 +1AAD:00000000000000000000010002800500044002200410041004100410022001C0 +1AAE:00007FFE7B8673B67B867BB671B67FFE7FFE61866DBE618E6DBE6D867FFE0000 +1AAF:00007FFE7B8673B67B867BB671B67FFE7FFE61866DBE618E6DBE6DBE7FFE0000 +1AB0:00142A49000000000000000000000000 +1AB1:00081455080000000000000000000000 +1AB2:00364936000000000000000000000000 +1AB3:00082A1C080000000000000000000000 +1AB4:00000822000000000000000000000000 +1AB5:00000000000000000000000000552255 +1AB6:00000000000000000000000000002A55 +1AB7:00000000000000000000000000080804 +1AB8:00000000000000000000000000242412 +1AB9:00000000000000000000000000204080 +1ABA:0000000000000000000000000020C0C0 +1ABB:00004281814200000000000000000000 +1ABC:0024C3C3C3C324000000000000000000 +1ABD:00000000000000000000000042818142 +1ABE:00000000000000000000428181420000 +1ABF:00000000000000000000000000005428 +1AC0:00000000000000000000000000002854 +1AC1:00007FFE7B8673B67B867BB671B67FFE7FFE71EE6FCE6FEE6FEE71C67FFE0000 +1AC2:00007FFE7B8673B67B867BB671B67FFE7FFE71866FF66F866FBE71867FFE0000 +1AC3:00007FFE7B8673B67B867BB671B67FFE7FFE718E6FF66FC66FF6718E7FFE0000 +1AC4:00007FFE7B8673B67B867BB671B67FFE7FFE71B66FB66F866FF671F67FFE0000 +1AC5:00007FFE7B8673B67B867BB671B67FFE7FFE71866FBE6F866FF671867FFE0000 +1AC6:00007FFE7B8673B67B867BB671B67FFE7FFE71CE6FBE6F8E6FB671CE7FFE0000 +1AC7:00007FFE7B8673B67B867BB671B67FFE7FFE71866FF66FEE6FDE71DE7FFE0000 +1AC8:00007FFE7B8673B67B867BB671B67FFE7FFE71CE6FB66FCE6FB671CE7FFE0000 +1AC9:00007FFE7B8673B67B867BB671B67FFE7FFE71CE6FB66FC66FF671CE7FFE0000 +1ACA:00007FFE7B8673B67B867BB671B67FFE7FFE71866FB66F866FB671B67FFE0000 +1ACB:00007FFE7B8673B67B867BB671B67FFE7FFE718E6FB66F8E6FB6718E7FFE0000 +1ACC:00007FFE7B8673B67B867BB671B67FFE7FFE71C66FBE6FBE6FBE71C67FFE0000 +1ACD:00007FFE7B8673B67B867BB671B67FFE7FFE718E6FB66FB66FB6718E7FFE0000 +1ACE:00007FFE7B8673B67B867BB671B67FFE7FFE71866FBE6F8E6FBE71867FFE0000 +1ACF:00007FFE7B8673B67B867BB671B67FFE7FFE71866FBE6F8E6FBE71BE7FFE0000 +1AD0:00007FFE7B8673B67B867BB671B67FFE7FFE63CE6DB66DB66DB663CE7FFE0000 +1AD1:00007FFE7B8673B67B867BB671B67FFE7FFE63EE6DCE6DEE6DEE63C67FFE0000 +1AD2:00007FFE7B8673B67B867BB671B67FFE7FFE63866DF66D866DBE63867FFE0000 +1AD3:00007FFE7B8673B67B867BB671B67FFE7FFE638E6DF66DC66DF6638E7FFE0000 +1AD4:00007FFE7B8673B67B867BB671B67FFE7FFE63B66DB66D866DF663F67FFE0000 +1AD5:00007FFE7B8673B67B867BB671B67FFE7FFE63866DBE6D866DF663867FFE0000 +1AD6:00007FFE7B8673B67B867BB671B67FFE7FFE63CE6DBE6D8E6DB663CE7FFE0000 +1AD7:00007FFE7B8673B67B867BB671B67FFE7FFE63866DF66DEE6DDE63DE7FFE0000 +1AD8:00007FFE7B8673B67B867BB671B67FFE7FFE63CE6DB66DCE6DB663CE7FFE0000 +1AD9:00007FFE7B8673B67B867BB671B67FFE7FFE63CE6DB66DC66DF663CE7FFE0000 +1ADA:00007FFE7B8673B67B867BB671B67FFE7FFE63866DB66D866DB663B67FFE0000 +1ADB:00007FFE7B8673B67B867BB671B67FFE7FFE638E6DB66D8E6DB6638E7FFE0000 +1ADC:00007FFE7B8673B67B867BB671B67FFE7FFE63C66DBE6DBE6DBE63C67FFE0000 +1ADD:00007FFE7B8673B67B867BB671B67FFE7FFE638E6DB66DB66DB6638E7FFE0000 +1ADE:00007FFE7B8673B67B867BB671B67FFE7FFE63866DBE6D8E6DBE63867FFE0000 +1ADF:00007FFE7B8673B67B867BB671B67FFE7FFE63866DBE6D8E6DBE63BE7FFE0000 +1AE0:00007FFE7B8673B67B867BB671B67FFE7FFE61CE6FB663B66FB661CE7FFE0000 +1AE1:00007FFE7B8673B67B867BB671B67FFE7FFE61EE6FCE63EE6FEE61C67FFE0000 +1AE2:00007FFE7B8673B67B867BB671B67FFE7FFE61866FF663866FBE61867FFE0000 +1AE3:00007FFE7B8673B67B867BB671B67FFE7FFE618E6FF663C66FF6618E7FFE0000 +1AE4:00007FFE7B8673B67B867BB671B67FFE7FFE61B66FB663866FF661F67FFE0000 +1AE5:00007FFE7B8673B67B867BB671B67FFE7FFE61866FBE63866FF661867FFE0000 +1AE6:00007FFE7B8673B67B867BB671B67FFE7FFE61CE6FBE638E6FB661CE7FFE0000 +1AE7:00007FFE7B8673B67B867BB671B67FFE7FFE61866FF663EE6FDE61DE7FFE0000 +1AE8:00007FFE7B8673B67B867BB671B67FFE7FFE61CE6FB663CE6FB661CE7FFE0000 +1AE9:00007FFE7B8673B67B867BB671B67FFE7FFE61CE6FB663C66FF661CE7FFE0000 +1AEA:00007FFE7B8673B67B867BB671B67FFE7FFE61866FB663866FB661B67FFE0000 +1AEB:00007FFE7B8673B67B867BB671B67FFE7FFE618E6FB6638E6FB6618E7FFE0000 +1AEC:00007FFE7B8673B67B867BB671B67FFE7FFE61C66FBE63BE6FBE61C67FFE0000 +1AED:00007FFE7B8673B67B867BB671B67FFE7FFE618E6FB663B66FB6618E7FFE0000 +1AEE:00007FFE7B8673B67B867BB671B67FFE7FFE61866FBE638E6FBE61867FFE0000 +1AEF:00007FFE7B8673B67B867BB671B67FFE7FFE61866FBE638E6FBE61BE7FFE0000 +1AF0:00007FFE7B8673B67B867BB671B67FFE7FFE61CE6FB663B66FB66FCE7FFE0000 +1AF1:00007FFE7B8673B67B867BB671B67FFE7FFE61EE6FCE63EE6FEE6FC67FFE0000 +1AF2:00007FFE7B8673B67B867BB671B67FFE7FFE61866FF663866FBE6F867FFE0000 +1AF3:00007FFE7B8673B67B867BB671B67FFE7FFE618E6FF663C66FF66F8E7FFE0000 +1AF4:00007FFE7B8673B67B867BB671B67FFE7FFE61B66FB663866FF66FF67FFE0000 +1AF5:00007FFE7B8673B67B867BB671B67FFE7FFE61866FBE63866FF66F867FFE0000 +1AF6:00007FFE7B8673B67B867BB671B67FFE7FFE61CE6FBE638E6FB66FCE7FFE0000 +1AF7:00007FFE7B8673B67B867BB671B67FFE7FFE61866FF663EE6FDE6FDE7FFE0000 +1AF8:00007FFE7B8673B67B867BB671B67FFE7FFE61CE6FB663CE6FB66FCE7FFE0000 +1AF9:00007FFE7B8673B67B867BB671B67FFE7FFE61CE6FB663C66FF66FCE7FFE0000 +1AFA:00007FFE7B8673B67B867BB671B67FFE7FFE61866FB663866FB66FB67FFE0000 +1AFB:00007FFE7B8673B67B867BB671B67FFE7FFE618E6FB6638E6FB66F8E7FFE0000 +1AFC:00007FFE7B8673B67B867BB671B67FFE7FFE61C66FBE63BE6FBE6FC67FFE0000 +1AFD:00007FFE7B8673B67B867BB671B67FFE7FFE618E6FB663B66FB66F8E7FFE0000 +1AFE:00007FFE7B8673B67B867BB671B67FFE7FFE61866FBE638E6FBE6F867FFE0000 +1AFF:00007FFE7B8673B67B867BB671B67FFE7FFE61866FBE638E6FBE6FBE7FFE0000 +1B00:0FE0111012900920000000000000000000000000000000000000000000000000 +1B01:01000AA00AA007C0000000000000000000000000000000000000000000000000 +1B02:0100028000400020000000000000000000000000000000000000000000000000 +1B03:00000200010000F0000000000000000000000000000000000000000000000000 +1B04:0000000000000000000200050001000200010001000100010001000000000000 +1B05:000000000000000000000E70112824A42A2422FC24A412240CC4000000000000 +1B06:00000000000000000000380044389244A8828882928249443628000000000000 +1B07:000000000000000011B02A480A080A0804C8010000C0022001C0000000000000 +1B08:000000000000000046CCA9222821282113260400030008800700000000000000 +1B09:00000000000000000B800440004000800300040009C00A200410000000000000 +1B0A:0000000000000000173008880084010406180800138014400820000000000000 +1B0B:000000000000000008101428042803C801800200018004400380000000000000 +1B0C:00000000000000004098A14421421E420C0C10000C0022001C00000000000000 +1B0D:000000000000000011B02A480A0A0A7C04880110009000600040000000000000 +1B0E:000000000000000046C0A920282E29F112210442024901890106000000000000 +1B0F:000000000000000003800C001000138014400C20000000000000000000000000 +1B10:000000000000000046C5A92B282E282210420782080210C20F3C000000000000 +1B11:000000000000000046C0A9202820282010400780080011C00E20000000000000 +1B12:000000000000000046CCA9222821282110460780080011C00E20000000000000 +1B13:000000000000000023CC542A142A3F2A54AA2312000000000000000000000000 +1B14:000000000000000023C0542014203F2054A0231C000200000000000000000000 +1B15:0000000000000000239854541454145412940EE4000000000000000000000000 +1B16:00000000000000002338551415141514155408A4000000000000000000000000 +1B17:0000000000000000236054901410141014100C10000000000000000000000000 +1B18:00000000000000000870144804280E28152808C8000000000000000000000000 +1B19:00000000000000003C30422842284A284A2831C8000000000000000000000000 +1B1A:000000000000000011E02A100A100A600A100608000800000000000000000000 +1B1B:0000000C0012000F46C2A9222822282210420782080210C20F3C000000000000 +1B1C:000000000000000046C6A9292829282928291832000000000000000000000000 +1B1D:0000000000000000236054901010381054104800210022001C00000000000000 +1B1E:0000000000000000236054901010111011100E00000000000000000000000000 +1B1F:0000000000000000203050281028102813280CC8000000000000000000000000 +1B20:0000000000000000101028100810081009900660000000000000000000000000 +1B21:00000000000000009CE2A3154015001500150019000000000000000000000000 +1B22:000000000000000023CC542A172A10AA10AA0F12000000000000000000000000 +1B23:000000000000000011E0289008500A5009500790010000000000000000000000 +1B24:000000000000000008701488048809C812A80C48000000000000000000000000 +1B25:0000000000000000107828240814081409940664000000000000000000000000 +1B26:000000000000000008F0150805080FC8152808C8000000000000000000000000 +1B27:0000000000000000106028500850085008500790000000000000000000000000 +1B28:00000000000000001088295008E0084008400780000000000000000000000000 +1B29:000000000000000046CCA92A282A282A282A1832000000000000000000000000 +1B2A:000000000000000020F05108090803C8152808C8000000000000000000000000 +1B2B:00000000000000001FB024282428032804280448038800000000000000000000 +1B2C:0000000000000000200850141114111412940C64000000000000000000000000 +1B2D:000000000000000010E029100510051005100610000000000000000000000000 +1B2E:0000000000000000460CA90A290A290A290A10F2000000000000000000000000 +1B2F:000000000000000008F0144804280428042803C8000000000000000000000000 +1B30:000000000000000047E6A9152A95289524A51C39000000000000000000000000 +1B31:0000000000000000206050501250155011500FD0010000000000000000000000 +1B32:00000000000000001060285008501C502A501190000000000000000000000000 +1B33:000000000000000040CCA12A212A212A212A1E12000000000000000000000000 +1B34:0000010000000440000000000000000000000000000000000000000000000000 +1B35:0000000000000000000C00020001000100090006000000000000000000000000 +1B36:03C014200C200240000000000000000000000000000000000000000000000000 +1B37:03C015200EA00460000000000000000000000000000000000000000000000000 +1B38:000000000000000000000000000000010003000300030005000900110012000C +1B39:0000000000000000000000000000000100020004000400020001000100020004 +1B3A:000000000000000000000000000000000000002000100410099008A007C00080 +1B3B:0000000000000000000C0002000100010009002600100410099008A007C00080 +1B3C:00E0012012400A80000000000000000000000000000000002308548814880870 +1B3D:00E0012012400A80000C00020001000100090006000000002308548814880870 +1B3E:0000000000000000300048000800100010002000200020001000000000000000 +1B3F:38004000300008003000B000C800900010002000200020001000000000000000 +1B40:0000000000000000300C48020801100110092006200020001000000000000000 +1B41:3800400030000800300CB002C801900110092006200020001000000000000000 +1B42:00E0012012400A80000000000000000000000000000000000000000000000000 +1B43:00E0012012400A80000C00020001000100090006000000000000000000000000 +1B44:000E001100110001000200020002000200020002000200010001000000000000 +1B45:000000000000000023CC542A1C2A3F2A5CAA2B12080008800700000000000000 +1B46:00000000000000004716A8AD28AD7CADAAAD4444000000000000000000000000 +1B47:000000000000000023CC542A172A10AA14AA0F12040004400380000000000000 +1B48:00000000000000000830142804280528052803C80100011000E0000000000000 +1B49:000000000000000008F0144804280528052803C80100011000E0000000000000 +1B4A:00000000000000001060285008501D502B5011900100011000E0000000000000 +1B4B:00000000000000004302A2A522A572B5AAB544B5004D00000000000000000000 +1B4C:00007FFE7B8E73B67B8E7BB6718E7FFE7FFE6DC66DBE61BE7DBE7DC67FFE0000 +1B4D:00007FFE7B8E73B67B8E7BB6718E7FFE7FFE6D8E6DB661B67DB67D8E7FFE0000 +1B4E:00007FFE7B8E73B67B8E7BB6718E7FFE7FFE6D866DBE618E7DBE7D867FFE0000 +1B4F:00007FFE7B8E73B67B8E7BB6718E7FFE7FFE6D866DBE618E7DBE7DBE7FFE0000 +1B50:0000000000000000018002400240018000000000000000000000000000000000 +1B51:00000004000A0007236254921412141214140C38000000000000000000000000 +1B52:000000000000000011B02A480A0A0A7C04880110009000600040000000000000 +1B53:000000000000000046C0A9202820282010400780080011C00E20000000000000 +1B54:0000000000000000000000000B00088009000880048003000000000000000000 +1B55:0000000000000000078008400B2008A0092008A004A003200020002000100000 +1B56:000000000000000003800C001000138014400C20000000000000000000000000 +1B57:00000000000000004622A95429382910291018E0000000000000000000000000 +1B58:00000000000000001088295008E0084008400780000000000000000000000000 +1B59:0000000000000000202250541138111012900C60000000000000000000000000 +1B5A:00000000000000000C3012481248924892486189000900060000000000000000 +1B5B:000000000000000046CCA92A282A282A282A180A023F124A118A100A118A0E72 +1B5C:0000000000000000018002400240018000000000000000000000000000000000 +1B5D:0000000000000000031004A003C00000031004A003C000000000000000000000 +1B5E:0000000000000000020005000080008000400040002000200020000000000000 +1B5F:0000000000000000104028A00410041002080208010401040104000000000000 +1B60:0000000000000000018000400180044003800000000000000000000000000000 +1B61:0000000000000000000C00020001000100090006000000000000000000000000 +1B62:0000000000000000058006400440008000800100010001000080000000000000 +1B63:0000000000000000004000C000C000C001400240044004800300000000000000 +1B64:0000000000000000000002000500008000800040004000000000000000000000 +1B65:00000000000000000000000002000200010000F0000000000000000000000000 +1B66:00000000000000000000000003C014200C200240000000000000000000000000 +1B67:0000000000000000000000000070009009200540000000000000000000000000 +1B68:0000000000000000080010002000200010000800080010002000000000000000 +1B69:000000000000000046CCA92A282A282A104A078A080A118A0E72000000000000 +1B6A:0000000000000000080014000400080004000400040008000800080004000400 +1B6B:0080010000800000000000000000000000000000000000000000000000000000 +1B6C:0000000000000000000000000000000000000000000000000000008001000080 +1B6D:0300010007C00100010000000000000000000000000000000000000000000000 +1B6E:000003C000000000000000000000000000000000000000000000000000000000 +1B6F:0100028004400000000000000000000000000000000000000000000000000000 +1B70:070001000FE00380054000000000000000000000000000000000000000000000 +1B71:07F0014002200410000000000000000000000000000000000000000000000000 +1B72:0440028001000000000000000000000000000000000000000000000000000000 +1B73:0380044005400440038000000000000000000000000000000000000000000000 +1B74:0000000000000000000010002800280044004400000000000000000000000000 +1B75:0000000000000000000030004800480048003000000000000000000000000000 +1B76:0000000000000000000090006800280054004400000000000000000000000000 +1B77:00000000000000000000B8004400640054003800000000000000000000000000 +1B78:0000000000000000000000000000000078000000000000000000000000000000 +1B79:0000000000000000000010001000200020004000780000000000000000000000 +1B7A:0000000000000000000000004000200078001000080000000000000000000000 +1B7B:00000000000000000000900050002000300048007C0000000000000000000000 +1B7C:0000000000000000000000000000300030000000000000000000000000000000 +1B7D:00007FFE7B8E73B67B8E7BB6718E7FFE7FFE618E7DB67BB677B6778E7FFE0000 +1B7E:00007FFE7B8E73B67B8E7BB6718E7FFE7FFE61867DBE7B8E77BE77867FFE0000 +1B7F:00007FFE7B8E73B67B8E7BB6718E7FFE7FFE61867DBE7B8E77BE77BE7FFE0000 +1B80:0020005000200000000000000000000000000000000000000000000000000000 +1B81:0022005400080000000000000000000000000000000000000000000000000000 +1B82:0000000000000000000000000000000000040012000A00080000000000000000 +1B83:000000000000000005F00820084008E00810042003C000000000000000000000 +1B84:000000000000000000C00100010002000200042007E000000000000000000000 +1B85:000000000000000007000100010002300240042007E000000000000000000000 +1B86:00000000000000000BE0104010F011C810200840078000000000000000000000 +1B87:000000000000000007000500030002000220045007D000000000000000000000 +1B88:000000000000000000F00100010008F00810042003C000000000000000000000 +1B89:00000000000000500420080008F008200870041003E000000000000000000000 +1B8A:0000000000000000077001100110022002200440044000000000000000000000 +1B8B:000000000000000001F802480248049004900920092000000000000000000000 +1B8C:000000000000000007000100010002700210042007E000000000000000000000 +1B8D:000000000000000007000100010002400220041007F000000000000000000000 +1B8E:0000000000000000070401080108021006100B2004E000000000000000000000 +1B8F:00000000000000000180020002000400052009900F4800000000000000000000 +1B90:00000000000000000700010001000200024004A007A000000000000000000000 +1B91:00000000000000000E3E0242020204C404A409280F1800000000000000000000 +1B92:0000000000000000002000400C700490049009200F2000000000000000000000 +1B93:000000000000000001C002000200044004A008900F8800000000000000000000 +1B94:00000000000000000F000100010002000200040007E000000000000000000000 +1B95:000000000000000007700110011002200220044007C000000000000000000000 +1B96:000000000000000007080110011002200220044007C000000000000000000000 +1B97:000000000000000000880110011002200220044007C000000000000000000000 +1B98:0000000000000000019F022102010462045208940F8C00000000000000000000 +1B99:000000000000000007F000100E1002200220044007C000000000000000000000 +1B9A:0000000000000000002000400C4404A404A809280F1000000000000000000000 +1B9B:000000000000000003E0000007C0004003E00080008000000000000000000000 +1B9C:000000000000000001C20244024404880488091009F000000000000000000000 +1B9D:00000000000000000180020002000470041008200FE000000000000000000000 +1B9E:00000000000000000F780108010807BC02100420042000000000000000000000 +1B9F:000000000000000007F00110011007E002200440044000000000000000000000 +1BA0:0000000000000000003C00240E24024802480490079000000000000000000000 +1BA1:00000000000000000000000000000000000700050008000800100010041007E0 +1BA2:000000000000000000000000000000000000000000000000000004100A0801F0 +1BA3:0000000000000000000000000000000000000000000000000C00140016000000 +1BA4:0700010006000000000000000000000000000000000000000000000000000000 +1BA5:00000000000000000000000000000000000000000000000001C0004000800000 +1BA6:000000000000000000000000E000200070008000E00000000000000000000000 +1BA7:0000000000000000000000000000000700010002001C00070000000000000000 +1BA8:11000A0004000000000000000000000000000000000000000000000000000000 +1BA9:29001A0004000000000000000000000000000000000000000000000000000000 +1BAA:00000000000000000000001F0001000200040007000100020004000400040003 +1BAB:0000000000000000000000000000000000000000000000000100038001000000 +1BAC:0000000000000000000000000000000000000000000000001A0022001C000000 +1BAD:0000000000000000000000000000000000000000000000001B0009000D800000 +1BAE:00000000000000000FDF0251025104920492091409F400000000000000000000 +1BAF:00000000000000000FC8024802490FC904D50955097200000000000000000000 +1BB0:000000000000000003C00420081008100810042003C000000000000000000000 +1BB1:000000000000000007E00910010002700210042007E000000000000000000000 +1BB2:000000000000000007000900010002000390042007E000000000000000000000 +1BB3:000000000000000007000900010002300240042007E000000000000000000000 +1BB4:000000000000000001C00240005003E004800100010000000000000000000000 +1BB5:000000000000000006C00AA002800440044008200FE000000000000000000000 +1BB6:000000000000000000C00120010002300240042007E000000000000000000000 +1BB7:0000000000000000038C0490049009200920124033C000000000000000000000 +1BB8:00000000000000001C1824240420084018402C80138000000000000000000000 +1BB9:000000000000000003C00520010002300240042007E000000000000000000000 +1BBA:0000000000000000000007E00020002007C00040008000800100010002000200 +1BBB:000000000000000007700110011002200220044007C0000007C0000000000000 +1BBC:00000000000000000C0E100210022304228444887C49001100720092006C0000 +1BBD:00000000000000000F3E112219260240024002400FF800000000000000000000 +1BBE:00000000000000001F7C010419640A28124804101FFC00000000000000000000 +1BBF:00000000000000000FE000200F2000400E4000800C8000000000000000000000 +1BC0:000000000000000000000000000001C04220242018E000000000000000000000 +1BC1:000000000000000000000000000001C04220240018E000000000000000000000 +1BC2:0000000000000000000000003B80444008401080210000000000000000000000 +1BC3:000000000000000000000E0031804040000000000CC000000000000000000000 +1BC4:000000000000000000000E003180404008801100220000000000000000000000 +1BC5:000000000000000000000E003180404044404A40318000000000000000000000 +1BC6:000000000000000000001F8020404020402020401F8000000000000000000000 +1BC7:000000000000000000000000000000007FC00000000000000000000000000000 +1BC8:0000000000000000000000000000038044403800000000000000000000000000 +1BC9:00000000000000007E00000007C008201010082007C000000000000000000000 +1BCA:00000000000000007E0000001CE0030004800840078000000000000000000000 +1BCB:0000000000000000000000000E0031804040404071C000000000000000000000 +1BCC:0000000000000000000000000E0031804040000071C000000000000000000000 +1BCD:0000000000000000000000001F00100010000F00008000800000000000000000 +1BCE:0000000000000000000000000E00318040400080010000000000000000000000 +1BCF:0000000000000000000000000E0031804040000001C000000000000000000000 +1BD0:00000000000000000000000001800600180060E00C0003000000000000000000 +1BD1:00000000000000000000000001800600180060000C0003000000000000000000 +1BD2:000000000000000000000E00318040401F002080404000800000000000000000 +1BD3:0000000000000000000000007C0000007FC0000001C000000000000000000000 +1BD4:0000000000000000000000007CE01100120013000CC000000000000000000000 +1BD5:00000000000000000000380044C003000C003000060001800000000000000000 +1BD6:000000000000000000003FC0108009000600090030C000000000000000000000 +1BD7:000000000000000000000000000071802240244019C000000000000000000000 +1BD8:0000000000000000000000003BC0442008000C00030000000000000000000000 +1BD9:0000000000000000000000000E003180404000000E0000000000000000000000 +1BDA:0000000000000000000000000E00318048400400020000000000000000000000 +1BDB:0000000000000000000000000000718022402440180000000000000000000000 +1BDC:000000000000000000000000380044C0112012200C0000000000000000000000 +1BDD:0000000000000000000001800600180060001800060001800000000000000000 +1BDE:000000000000000000000000070018C020201000080000000000000000000000 +1BDF:0000000000000000000000000E00318040400000700000000000000000000000 +1BE0:000000000000000000000780184020004C006300180000000000000000000000 +1BE1:00000000000000000000000030004A004D2048C0300000000000000000000000 +1BE2:00000000000000000000000030000C00030000C0060018000000000000000000 +1BE3:000000000000000000001F8020404620462020401F8000000000000000000000 +1BE4:000000000000000000000E00318040400E00110000000E000000000000000000 +1BE5:000000000000000000000E00000011000E00404031800E000000000000000000 +1BE6:0700000007000000000000000000000000000000000000000000000000000000 +1BE7:0000000000000000000000000008000400020004000800000000000000000000 +1BE8:0040002000100020004000000000000000000000000000000000000000000000 +1BE9:0000000070000000000000000000000000000000000000000000000000000000 +1BEA:000000000000000000000000000C001200120012000C00000000000000000000 +1BEB:00000000000000000000000000000000000C0000000C00000000000000000000 +1BEC:0000000000000000000000000011000A0004000A001100000000000000000000 +1BED:0040002007100020004000000000000000000000000000000000000000000000 +1BEE:0000000000000000000000000000000000000000002000100008001000200000 +1BEF:0000000002000400080000000000000000000000000000000000000000000000 +1BF0:0000000000070000000000000000000000000000000000000000000000000000 +1BF1:0007000000070000000000000000000000000000000000000000000000000000 +1BF2:0000000000000000000000000000000000080004000200000000000000000000 +1BF3:00000000000000000000000000000000000E0000000000000000000000000000 +1BF4:00007FFE7B8E73B67B8E7BB6718E7FFE7FFE61B66FB663866FF66FF67FFE0000 +1BF5:00007FFE7B8E73B67B8E7BB6718E7FFE7FFE61866FBE63866FF66F867FFE0000 +1BF6:00007FFE7B8E73B67B8E7BB6718E7FFE7FFE61CE6FBE638E6FB66FCE7FFE0000 +1BF7:00007FFE7B8E73B67B8E7BB6718E7FFE7FFE61866FF663EE6FDE6FDE7FFE0000 +1BF8:00007FFE7B8E73B67B8E7BB6718E7FFE7FFE61CE6FB663CE6FB66FCE7FFE0000 +1BF9:00007FFE7B8E73B67B8E7BB6718E7FFE7FFE61CE6FB663C66FF66FCE7FFE0000 +1BFA:00007FFE7B8E73B67B8E7BB6718E7FFE7FFE61866FB663866FB66FB67FFE0000 +1BFB:00007FFE7B8E73B67B8E7BB6718E7FFE7FFE618E6FB6638E6FB66F8E7FFE0000 +1BFC:0000101020082388145008201450228821082288145008201450238820081010 +1BFD:00000000000001000280028004401AB021081AB0044002800280010000000000 +1BFE:0000000000000000111022202220222011100888088808881110000000000000 +1BFF:00000000000000000E0001000080008000800080008001000E00000000000000 +1C00:00000000000000000000000003E0040004000FE00400040007C0000000000000 +1C01:0000000000000000000000000FC0040005800640084000800100000000000000 +1C02:00000000000000000000000002600480088008400820042003C0000000000000 +1C03:000000000000000000000000040008401240122011200B400480000000000000 +1C04:0000000000000000000000000400084012403FF011200B400480000000000000 +1C05:000000000000000000000000080007C000800080010001000100000000000000 +1C06:0000000000000000000000000180024002401C20024002400180000000000000 +1C07:0000000000000000000000000060008007800980024004200FE0000000000000 +1C08:0000000000000000000000000360048009400940088004000200000000000000 +1C09:000000000000000000000000082007C00200052008C004000200000000000000 +1C0A:0000000000000000000000000200010004800A40098004000200000000000000 +1C0B:0000000000000000000000000800080005C0022005C008000800000000000000 +1C0C:000000000000000000000000010012400F8002000F8012400100000000000000 +1C0D:00000000000000000000000001800240044008200920092008C0000000000000 +1C0E:0000000000000000000000000FC000800080004000400C401380000000000000 +1C0F:000000000000000000000000062009C0080004000FE000000000000000000000 +1C10:0000000000000000000000001FE008401040102008200E2011C0000000000000 +1C11:0000000000000000000000000FC0100010001FC010800C401380000000000000 +1C12:00000000000000000000000004200A5012501130111008A004C0000000000000 +1C13:0000000000000000000000000300048008400820082004400380000000000000 +1C14:000000000000000000000000024005A008900810081004200240000000000000 +1C15:0000000000000000000000001FC0018002000F80124002400180000000000000 +1C16:0000000000000000000000000FE00100008007E0088009000600000000000000 +1C17:0000000000000000000000000FF00420084008400820042003C0000000000000 +1C18:0000000000000000000000000400088011401540148013600C00000000000000 +1C19:0000000000000000000000000240048004E007801C8002400120000000000000 +1C1A:0000000000000000000000000300040008800700084008800700000000000000 +1C1B:00000000000000000000000010400F8008000400040008001000000000000000 +1C1C:00000000000000000000000004400A2012101110111008A004C0000000000000 +1C1D:0000000000000000000000000030084004400FE0044004400380000000000000 +1C1E:0000000000000000000000001040088005000200050008801040000000000000 +1C1F:0000000000000000000000000300048008400FE0082004400380000000000000 +1C20:0000000000000000000000000400084011401540148013000C00000000000000 +1C21:00000000000000000000000004000800094009400A80042003C0000000000000 +1C22:0000000000000000000000000DD0122015501550122008000400000000000000 +1C23:00000000000000000000000007C009200140038004A0044003A0000000000000 +1C24:0000000000000000000000000000000000000002000A000A0004000000000000 +1C25:0000000000000000000000000010000800080008000800080010000000000000 +1C26:0000000000000000000000000001000200020002000200020001000000000000 +1C27:000000004000A000800040004000400040004000400040004000C00000000000 +1C28:0000000000000000000000002000400040004000400040002000000000000000 +1C29:00000000000000003FC040004000400040004000400040002000000000000000 +1C2A:000000000000000000000000000200010001000100010001000100010012000C +1C2B:000000000000000000000006000100020001000100010001000100010012000C +1C2C:0000000000000000000000000000000000000000000000000000020004000F00 +1C2D:0000010002000300000000000000000000000000000000000000000000000000 +1C2E:0000000002800000000000000000000000000000000000000000000000000000 +1C2F:0000010004400000000000000000000000000000000000000000000000000000 +1C30:000003C0042000C0000000000000000000000000000000000000000000000000 +1C31:0000010002800100000000000000000000000000000000000000000000000000 +1C32:0000032004C00000000000000000000000000000000000000000000000000000 +1C33:0000000007C00000000000000000000000000000000000000000000000000000 +1C34:00000000000000000000000080004000A000A000A00040008000000000000000 +1C35:0000000000000000000000000000000040008000800040000000000000000000 +1C36:0FE0100000000000000000000000000000000000000000000000000000000000 +1C37:0000000000000000000000000000000000000000000000000000000000400000 +1C38:00007FFE7BC673BE7BBE7BBE71C67FFE7FFE63CE7DB671CE7DB663CE7FFE0000 +1C39:00007FFE7BC673BE7BBE7BBE71C67FFE7FFE63CE7DB671C67DF663CE7FFE0000 +1C3A:00007FFE7BC673BE7BBE7BBE71C67FFE7FFE63867DB671867DB663B67FFE0000 +1C3B:0000000000000000000000000000008000800080008000800080000000000000 +1C3C:0000000000000000000000000000024002400240024002400240000000000000 +1C3D:0000000000000000000000000000000002200140008001400220000000000000 +1C3E:0000000000000000000000000000000002200140049001400220000000000000 +1C3F:0000000000000000000000001088091004A0042004A009101088000000000000 +1C40:0000000000000000000000000000038004400440044003800000000000000000 +1C41:0000000000000000000000000100028002C00140004000800100000000000000 +1C42:00000000000000000000000007C0082000C003000400030000C0000000000000 +1C43:0000000000000000000000000F80104007E00810002007C00020000000000000 +1C44:000000000000000000000000022005C004000800083007C00000000000000000 +1C45:00000000000000000000000008100420046004A0052006200810000000000000 +1C46:00000000000000000000000000200050008000400820061001E0000000000000 +1C47:0000000000000000000000000080044002400240014001800200000000000000 +1C48:0000000000000000000000000180024002000400040003800060000000000000 +1C49:0000000000000000000000000180024002800260020002000100000000000000 +1C4A:00007FFE7BC673BE7BBE7BBE71C67FFE7FFE6D866DB661867DB67DB67FFE0000 +1C4B:00007FFE7BC673BE7BBE7BBE71C67FFE7FFE6D8E6DB6618E7DB67D8E7FFE0000 +1C4C:00007FFE7BC673BE7BBE7BBE71C67FFE7FFE6DC66DBE61BE7DBE7DC67FFE0000 +1C4D:0000000000000000000000001F80008003E00080008000800100000000000000 +1C4E:0000000000000000000000001F80008003E0008003E000800100000000000000 +1C4F:0000000000000000000000000D2013E00120012001200F201040000000000000 +1C50:00000038444444444444444444380000 +1C51:00000062524A464040404020100E0000 +1C52:00000018242414081020424224180000 +1C53:000000324A4A3E1020204040300C0000 +1C54:0000001E2040404060524E4224180000 +1C55:00000010204648505048464224180000 +1C56:0000005C22524C4040404020100C0000 +1C57:0000000C523204081020424224180000 +1C58:000000344A5A64404040404224180000 +1C59:0000001C204040404C52524A24180000 +1C5A:0000001C22660A1222424242221C0000 +1C5B:0000003C4242424242424242423C0000 +1C5C:0000001C2240404E50504E4224180000 +1C5D:0000001C2244481026104844221C0000 +1C5E:00000048546242424242625448400000 +1C5F:000000245ADA1232525292A2A4480000 +1C60:00000040485462424242422214080000 +1C61:00000048444242424242426254480000 +1C62:0000001222424242424242462A120000 +1C63:00000064928A0A0A12E2824224180000 +1C64:0000003844060A0A1212222242420000 +1C65:000000424244444848505060221C0000 +1C66:000000444482828282828292AA440000 +1C67:00000010284442424242462A12020000 +1C68:0000007804024222120A0622528C0000 +1C69:00000040485462420202422214080000 +1C6A:0000003844444444444444BA827C0000 +1C6B:00000010284482925410704044380000 +1C6C:00000044AA9282828282828244440000 +1C6D:000000304884848C90A0A0A2924C0000 +1C6E:000000384404080810102020423C0000 +1C6F:0000003C62A4A42424242525463C0000 +1C70:00000058949292929292929252340000 +1C71:0000003CC644444848505060221C0000 +1C72:0000003844060A0A12122222C37E0000 +1C73:0000001824420E1212120E4224180000 +1C74:00000048546242424242424244480000 +1C75:00000034529292929292929294580000 +1C76:000000629288080A12E2824224180000 +1C77:000000182422124E82828292AA440000 +1C78:00000000181800000000000000000000 +1C79:00000000000000000000001818000000 +1C7A:00000000181800000000001818000000 +1C7B:00000000000060920C00000000000000 +1C7C:00000000000000380000000000000000 +1C7D:000000304844241C0404044428100000 +1C7E:00000000001010101010101000000000 +1C7F:00000000002424242424242400000000 +1C80:00000000001C2A4A4440444A2A1C0000 +1C81:0000000000001E1222222222227F4141 +1C82:00000000000038444444444444380000 +1C83:0000000000001C2240404040221C0000 +1C84:00000000324E02020202020202020000 +1C85:0000000000007F494949494949490000 +1C86:000000007010101010101C12121C0000 +1C87:0000202078202020203C2222223C0000 +1C88:000000444A2A28103844444444380000 +1C89:00007FFE7BC673BE7BBE7BBE71C67FFE7FFE73CE6DB673C66DF673CE7FFE0000 +1C8A:00007FFE7BC673BE7BBE7BBE71C67FFE7FFE73866DB673866DB673B67FFE0000 +1C8B:00007FFE7BC673BE7BBE7BBE71C67FFE7FFE738E6DB6738E6DB6738E7FFE0000 +1C8C:00007FFE7BC673BE7BBE7BBE71C67FFE7FFE73C66DBE73BE6DBE73C67FFE0000 +1C8D:00007FFE7BC673BE7BBE7BBE71C67FFE7FFE738E6DB673B66DB6738E7FFE0000 +1C8E:00007FFE7BC673BE7BBE7BBE71C67FFE7FFE73866DBE738E6DBE73867FFE0000 +1C8F:00007FFE7BC673BE7BBE7BBE71C67FFE7FFE73866DBE738E6DBE73BE7FFE0000 +1C90:000000002020101008040242423C0000 +1C91:000000002038080834424242423C0000 +1C92:000000304848080834424242423C0000 +1C93:000000002C525252524C40201C620000 +1C94:000000003C42420202022242423C0000 +1C95:000000003C4242021C020242423C0000 +1C96:0000000020505054381C1212120C0000 +1C97:00000000344A4A4A4A4A4A4A4A320000 +1C98:000000003C4242424242424242240000 +1C99:000000000C0202021C020242423C0000 +1C9A:000000002A555555414142201E610000 +1C9B:000000003C424202023E4242423C0000 +1C9C:00000000023C4040407C4242423C0000 +1C9D:00000000285454545444444444240000 +1C9E:0000000020180402021C0242423C0000 +1C9F:00000000060A525222021222221C0000 +1CA0:00000000043840685454545444240000 +1CA1:00000000404040485048444444380000 +1CA2:000000001824243C66665A42423C0000 +1CA3:000000006C12120202020222221C0000 +1CA4:00000000344A4A4A4A340212221C0000 +1CA5:00000000040C04041C24040444380000 +1CA6:000000002C525252424440201C620000 +1CA7:00000000224242261A022242423C0000 +1CA8:0000000028545404041C242424180000 +1CA9:00000000384478405C62424242420000 +1CAA:000000004C4242425C424242423C0000 +1CAB:0000000004020202023E4242423C0000 +1CAC:0000000028545454407C442828100000 +1CAD:000000000818280819261D0444380000 +1CAE:00000000404040485078444444380000 +1CAF:00000000CCA2A2241418304A2AC40000 +1CB0:0000100C02120C02120C0242423C0000 +1CB1:00000000C8A6A1A9A6C1928C44380000 +1CB2:000000003C4242424224241824420000 +1CB3:000000003E0204081C020242423C0000 +1CB4:0000000008100C02021C0242423C0000 +1CB5:000000003844443E043E444444380000 +1CB6:00000000101010385454381010100000 +1CB7:000000003C42420408102042423C0000 +1CB8:000000004442424264584044423C0000 +1CB9:000000003C424242423C1012120C0000 +1CBA:000000003C42424040300C1C22400000 +1CBB:00007FFE7BC673BE7BBE7BBE71C67FFE7FFE638E6DB6638E6DB6638E7FFE0000 +1CBC:00007FFE7BC673BE7BBE7BBE71C67FFE7FFE63C66DBE63BE6DBE63C67FFE0000 +1CBD:000000003C42422010080442423C0000 +1CBE:000000004224182424424242423C0000 +1CBF:000000003C42424242424242423C0000 +1CC0:00000000028001000380044029281AB029280440038001000280000000000000 +1CC1:000000000000000001C00220055004900550022001C000000000000000000000 +1CC2:000000000000000001C0022005D0041005D0022001C000000000000000000000 +1CC3:000000000000000001C00220041004100410022001C000000000000000000000 +1CC4:00000000000000001BBB200823CB481055969420F2AC002001C8024801B00000 +1CC5:00000000000000001CF8040004F0080009E0100013C000000000000000000000 +1CC6:00000000000000000EFF100010FE2200253C44807C5800000000000000000000 +1CC7:0000000000000000667D0884C8051188914B2250BE3600000000000000000000 +1CC8:00007FFE7BC673BE7BBE7BBE71C67FFE7FFE71CE6FB66FCE6FB671CE7FFE0000 +1CC9:00007FFE7BC673BE7BBE7BBE71C67FFE7FFE71CE6FB66FC66FF671CE7FFE0000 +1CCA:00007FFE7BC673BE7BBE7BBE71C67FFE7FFE71866FB66F866FB671B67FFE0000 +1CCB:00007FFE7BC673BE7BBE7BBE71C67FFE7FFE718E6FB66F8E6FB6718E7FFE0000 +1CCC:00007FFE7BC673BE7BBE7BBE71C67FFE7FFE71C66FBE6FBE6FBE71C67FFE0000 +1CCD:00007FFE7BC673BE7BBE7BBE71C67FFE7FFE718E6FB66FB66FB6718E7FFE0000 +1CCE:00007FFE7BC673BE7BBE7BBE71C67FFE7FFE71866FBE6F8E6FBE71867FFE0000 +1CCF:00007FFE7BC673BE7BBE7BBE71C67FFE7FFE71866FBE6F8E6FBE71BE7FFE0000 +1CD0:0080014002200000000000000000000000000000000000000000000000000000 +1CD1:008001C002A00000000000000000000000000000000000000000000000000000 +1CD2:000003E000000000000000000000000000000000000000000000000000000000 +1CD3:0000012002400480000000000000000000000000000000000000000000000000 +1CD4:0000000000000000000000000000003800000000000000000000000000000000 +1CD5:0000000000000000000000000000000000000000000000000000089004900360 +1CD6:00000000000000000000000000000000000000000000000000000000040007E0 +1CD7:00000000000000000000000000000000000000000000000000000300040003E0 +1CD8:00000000000000000000000000000000000000000000000000000420022001C0 +1CD9:0000000000000000000000000000000000000000000000000000008001400220 +1CDA:0140014001400000000000000000000000000000000000000000000000000000 +1CDB:02A002A002A00000000000000000000000000000000000000000000000000000 +1CDC:0000000000000000000000000000000000000000000000000000008000800080 +1CDD:0000000000000000000000000000000000000000000000000000000000800000 +1CDE:0000000000000000000000000000000000000000000000000000000001200000 +1CDF:0000000000000000000000000000000000000000000000000000000004900000 +1CE0:007C008000600000000000000000000000000000000000000000000000000000 +1CE1:000C0012001100100010001000100010001000100010001000100010001000F0 +1CE2:0000000000000000000000000240000007E00000024000000000000000000000 +1CE3:0000000000000000002000100008000800700000000000000000000000000000 +1CE4:000000000000000004000800100010000E000000000000000000000000000000 +1CE5:000000000000000000000000000000000E001000100008000400000000000000 +1CE6:0000000000000000000000000000000000700008000800100020000000000000 +1CE7:0000000000180024002000100008000800700000000000000000000000000000 +1CE8:000000000000000000000000000000000E001000100008000400240018000000 +1CE9:00000000000000000C6012902C682008200820081010082007C0000000000000 +1CEA:00000000000004400AA00AA004400820101010101010082007C0000000000000 +1CEB:00000000000004600A900A7004100810101010101010082007C0000000000000 +1CEC:00000000000004000A200A500450083010181014102408480780000000000000 +1CED:0000000000000000000000000000000000000000000000000100008000400020 +1CEE:0000000000000780080008000800072004000400044003800000000000000000 +1CEF:000000000000078008400900040003C004000500048003000000000000000000 +1CF0:0000018002400200011001800240042004200420024001800000000000000000 +1CF1:0000000000000000020004000840080007E00010021000200040000000000000 +1CF2:00000000000000000810042003C00000000003C0042008100000000000000000 +1CF3:0000000000000000081004200240024002400240042008100000000000000000 +1CF4:0000108008800700000000000000000000000000000000000000000000000000 +1CF5:AAAA000180000001901008218440028181000281844008219010000180005555 +1CF6:AAAA000180000001800000018000111191100EE1800000018000000180005555 +1CF7:0003000400080008000800080008000800080008000800080010001000100000 +1CF8:0000030004800480030000000000000000000000000000000000000000000000 +1CF9:0000183024482448183000000000000000000000000000000000000000000000 +1CFA:00000000000000000C6012901C700FE000000C6012901C700FE0000000000000 +1CFB:00007FFE7BC673BE7BBE7BBE71C67FFE7FFE618E6FB6638E6FB66F8E7FFE0000 +1CFC:00007FFE7BC673BE7BBE7BBE71C67FFE7FFE61C66FBE63BE6FBE6FC67FFE0000 +1CFD:00007FFE7BC673BE7BBE7BBE71C67FFE7FFE618E6FB663B66FB66F8E7FFE0000 +1CFE:00007FFE7BC673BE7BBE7BBE71C67FFE7FFE61866FBE638E6FBE6F867FFE0000 +1CFF:00007FFE7BC673BE7BBE7BBE71C67FFE7FFE61866FBE638E6FBE6FBE7FFE0000 +1D00:000000000000102844447C4444440000 +1D01:0000000000001E28487E4848484E0000 +1D02:0000000000003E4909097E48493E0000 +1D03:000000000000784448FE484444780000 +1D04:0000000000003C4240404040423C0000 +1D05:00000000000078444444444444780000 +1D06:000000000000784444E4444444780000 +1D07:0000000000007C4040784040407C0000 +1D08:0000000000003C4202021C02423C0000 +1D09:0000000000007C101010101018001010 +1D0A:0000000000001F040404040444380000 +1D0B:00000000000022242830302824220000 +1D0C:000000000000202028302060203E0000 +1D0D:000000000000222236362A2A22220000 +1D0E:000000000000444C4C54546464440000 +1D0F:0000000000003C4242424242423C0000 +1D10:0000000000003C4202020202423C0000 +1D11:00000000000000003E414141413E0000 +1D12:00000000000000003E41414141220000 +1D13:00000000000000203E514949453E0200 +1D14:00000000000036490909794949360000 +1D15:00000000000044444438444444380000 +1D16:0000000000003C424242000000000000 +1D17:000000000000000000004242423C0000 +1D18:0000000000007C42427C404040400000 +1D19:0000000000003E42423E122242420000 +1D1A:000000000000424222123E42423E0000 +1D1B:0000000000007F080808080808080000 +1D1C:000000000000424242424242423C0000 +1D1D:00000000000000007F020101017E0000 +1D1E:00000000000000001F420101411E0000 +1D1F:000000000000007F01017E01017E0000 +1D20:00000000000041412222141408080000 +1D21:00000000000042425A5A666642420000 +1D22:0000000000007E0204081020407E0000 +1D23:0000000000007E04081C0202423C0000 +1D24:000000003C4242021C384040423C0000 +1D25:0000000000387CFEFE7C3810926C0000 +1D26:0000000000007E404040404040400000 +1D27:00000000000008081414222241410000 +1D28:0000000000007F222222222222220000 +1D29:0000000000007C42427C404040400000 +1D2A:000000000000494949493E0808080000 +1D2B:0000000000001E121212121222620000 +1D2C:000000102844447C4444000000000000 +1D2D:0000001E28487E48484E000000000000 +1D2E:00000078444478444478000000000000 +1D2F:000000784448FE484478000000000000 +1D30:00000078444444444478000000000000 +1D31:0000007C40407840407C000000000000 +1D32:0000007C04043C04047C000000000000 +1D33:0000003C40404E42463A000000000000 +1D34:0000004242427E424242000000000000 +1D35:0000007C10101010107C000000000000 +1D36:0000001F040404044438000000000000 +1D37:00000022242830282422000000000000 +1D38:0000002020202020203E000000000000 +1D39:0000002236362A222222000000000000 +1D3A:000000446464544C4C44000000000000 +1D3B:000000444C4C54646444000000000000 +1D3C:0000003C42424242423C000000000000 +1D3D:00000044443844444438000000000000 +1D3E:0000007C42427C404040000000000000 +1D3F:0000007C42427C484442000000000000 +1D40:0000007F080808080808000000000000 +1D41:0000004242424242423C000000000000 +1D42:000000444444546C6C44000000000000 +1D43:000000000038043C443C000000000000 +1D44:00000000007844784038000000000000 +1D45:00000000003A4642463A000000000000 +1D46:00000000007C12FC907C000000000000 +1D47:00000040404078444478000000000000 +1D48:0000000404043C44443C000000000000 +1D49:000000000038447C4038000000000000 +1D4A:000000000038047C4438000000000000 +1D4B:00000000003C4038403C000000000000 +1D4C:00000000007804380478000000000000 +1D4D:00000000003A44443C04380000000000 +1D4E:00000000007C10101018001000000000 +1D4F:00000040404850605048000000000000 +1D50:00000000007649494949000000000000 +1D51:00000000005C6242424A040000000000 +1D52:00000000003844444438000000000000 +1D53:00000000003844044438000000000000 +1D54:00000000003844440000000000000000 +1D55:00000000000000444438000000000000 +1D56:00000000007844444478404000000000 +1D57:00000010107C1010100C000000000000 +1D58:00000000004444444C34000000000000 +1D59:00000000007C08040478000000000000 +1D5A:00000000004949494937000000000000 +1D5B:00000000004444282810000000000000 +1D5C:000000387CFEFE7C38926C0000000000 +1D5D:0000003844447C42625C400000000000 +1D5E:00000000002252140810200000000000 +1D5F:00000038404038444438000000000000 +1D60:0000000000264949493E080800000000 +1D61:00000000006112141830488600000000 +1D62:00000000000000001000301010107C00 +1D63:00000000000000000000586440404000 +1D64:000000000000000000004444444C3400 +1D65:00000000000000000000444428281000 +1D66:00000000000000003844447C42625C40 +1D67:0000000000000000000022520C102020 +1D68:00000000000000000000384478403008 +1D69:00000000000000000000264949493E08 +1D6A:00000000000000000000611214183048 +1D6B:0000000000008E89898F8888996E0000 +1D6C:000000202870AC3222222222322C0000 +1D6D:000000050E14344C444444444C340000 +1D6E:0000000C1010107C1010143850100000 +1D6F:0000000000007C4A4A4A7BCE4A4A0000 +1D70:0000000000002C322222336E22220000 +1D71:0000000000002C3222336E22322C2020 +1D72:0000000000002C3220203966A0200000 +1D73:0000000000000E111110395610100000 +1D74:0000000000003C424033CC02423C0000 +1D75:0000000010107C1010325C10100C0000 +1D76:0000000000007E04086A9C10207E0000 +1D77:00000000003C42423C041C2222225C40 +1D78:00004242427E42424242000000000000 +1D79:0000000000007E04081010083C42423C +1D7A:000000000000004810501060105C7CE2114212421442184210422C4200000000 +1D7B:0000000000007C10107C1010107C0000 +1D7C:0000000000007010107C1010100C0000 +1D7D:0000000000002C3222227F22322C2020 +1D7E:0000000000002222227F2222221C0000 +1D7F:0000000000004224FF42424224180000 +1D80:0000004040405C6242424242635D0106 +1D81:0000000202023A4642424242463B0106 +1D82:0000000C1010107C1010101018180830 +1D83:0000000000003A44444444473D05857A +1D84:0000004040404448506050484642020C +1D85:000000180808080808080808083E020C +1D86:000000000000744A4A4A4A4A4B4B0106 +1D87:0000000000005C624242424243430106 +1D88:000000000000586444444444665A424C +1D89:0000000000002C322220202030301060 +1D8A:0000000000003C4240300C02433D0106 +1D8B:0000000C101010101010101E1212620C +1D8C:0000000000004242422424261A1A020C +1D8D:0000000000004444281010284646020C +1D8E:0000000000007E0204081020407E020C +1D8F:0000000000003844043C44444E320203 +1D90:000000000000344C444444444C360203 +1D91:000003040404344C44444444443C0403 +1D92:0000000000003C42427E4040423C0403 +1D93:0000000000003C42403C4040423C0403 +1D94:0000000000003C42023C0202427C4030 +1D95:00000000000070880808FE8A8A720203 +1D96:000000080800180808080808083C0403 +1D97:0000000000003C4202020202427C4030 +1D98:0000000C101010101010101010604030 +1D99:0000000000004444444444444C360203 +1D9A:0000000000007E0408101C02023C2018 +1D9B:00000000005C6242625C000000000000 +1D9C:00000000003840404038000000000000 +1D9D:00000000003840586438400000000000 +1D9E:0000641828043C444438000000000000 +1D9F:00000000007804380478000000000000 +1DA0:0000000C10107C101010000000000000 +1DA1:000000080808083E0848300000000000 +1DA2:00000000003A4642463A023C00000000 +1DA3:0000004444444C340404000000000000 +1DA4:0000001000301038107C000000000000 +1DA5:0000000000301010100C000000000000 +1DA6:0000007C10101010107C000000000000 +1DA7:0000007C10107C10107C000000000000 +1DA8:000000080018080808384C3200000000 +1DA9:00000070101010101010100C00000000 +1DAA:00000070101010101818083000000000 +1DAB:0000002020202020203E000000000000 +1DAC:00000000007649494949010600000000 +1DAD:00000000004949494937010100000000 +1DAE:00000000002C32222222204000000000 +1DAF:00000000005864444444040200000000 +1DB0:0000002232322A262622000000000000 +1DB1:000000000038447C4438000000000000 +1DB2:00000000103854545438100000000000 +1DB3:00000000003840380478403000000000 +1DB4:0000000C101010101010600000000000 +1DB5:00000010107C1010100E020C00000000 +1DB6:000000000022227F261A000000000000 +1DB7:00000042244242422418000000000000 +1DB8:0000002222222222221C000000000000 +1DB9:0000000000CC44444830000000000000 +1DBA:00000010282828444444000000000000 +1DBB:00000000007C0810207C000000000000 +1DBC:0000007C04081020447C040300000000 +1DBD:0000007E02041826497E080800000000 +1DBE:00000000007E0408103C027C00000000 +1DBF:0000001824427E422418000000000000 +1DC0:24100824000000000000000000000000 +1DC1:24081024000000000000000000000000 +1DC2:00000000000000000000000070381C0E +1DC3:00022418000000000000000000000000 +1DC4:00020478000000000000000000000000 +1DC5:0040201E000000000000000000000000 +1DC6:00780402000000000000000000000000 +1DC7:003C4080000000000000000000000000 +1DC8:00885422000000000000000000000000 +1DC9:00225488000000000000000000000000 +1DCA:0000000000000000000000002C302020 +1DCB:008E7000000000000000000000000000 +1DCC:00E21C00000000000000000000000000 +1DCD:0000018006600810000000000000000000000000000000000000000000000000 +1DCE:00300808100000000000000000000000 +1DCF:00000000000000000000001020380810 +1DD0:0000000000000000000000000000113F +1DD1:0064924C000000000000000000000000 +1DD2:00182414040810000000000000000000 +1DD3:00926C00000000000000000000000000 +1DD4:EC127C906E0000000000000000000000 +1DD5:EC1272926C0000000000000000000000 +1DD6:E1117A9A640000000000000000000000 +1DD7:1C2020201C0810000000000000000000 +1DD8:30081C24180000000000000000000000 +1DD9:2810281C241800000000000000000000 +1DDA:1C241C04380000000000000000000000 +1DDB:1C202C24180000000000000000000000 +1DDC:20242834240000000000000000000000 +1DDD:180808081C0000000000000000000000 +1DDE:202020203C0000000000000000000000 +1DDF:446C5444440000000000000000000000 +1DE0:58644444000000000000000000000000 +1DE1:4464544C440000000000000000000000 +1DE2:38243828240000000000000000000000 +1DE3:18240408040200000000000000000000 +1DE4:1C201804380000000000000000000000 +1DE5:18242060202000000000000000000000 +1DE6:3C0418203C0000000000000000000000 +1DE7:001C24241C0000000000000000000000 +1DE8:101C121C000000000000000000000000 +1DE9:18242824380000000000000000000000 +1DEA:38043C24180000000000000000000000 +1DEB:0C103810100000000000000000000000 +1DEC:10381038100000000000000000000000 +1DED:00182424588000000000000000000000 +1DEE:38243820000000000000000000000000 +1DEF:0C101010600000000000000000000000 +1DF0:0024245C800000000000000000000000 +1DF1:00925428000000000000000000000000 +1DF2:14001C241C0000000000000000000000 +1DF3:28001824180000000000000000000000 +1DF4:28002828380000000000000000000000 +1DF5:0010107C000000000000000000000000 +1DF6:0012120C000000000000000000000000 +1DF7:00484830000000000000000000000000 +1DF8:00303000000000000000000000000000 +1DF9:0000000000000000000000000000827C +1DFA:00007FFE7B8E73B67BB67BB6718E7FFE7FFE61866FB663866FB66FB67FFE0000 +1DFB:49499292000000000000000000000000 +1DFC:000000000000000000000000000000000000000000000000000007E018182004 +1DFD:0000000000000000000000324C00324C +1DFE:08102010080000000000000000000000 +1DFF:000000000000000000000000004A2440 +1E00:0000000018242442427E424242182418 +1E01:0000000000003C42023E42463A182418 +1E02:001000007C4242427C424242427C0000 +1E03:0000004840405C6242424242625C0000 +1E04:000000007C4242427C424242427C0010 +1E05:0000004040405C6242424242625C0008 +1E06:000000007C4242427C424242427C003C +1E07:0000004040405C6242424242625C003C +1E08:081020003C42424040404042423C0830 +1E09:0000081020003C4240404040423C0830 +1E0A:00100000784442424242424244780000 +1E0B:0000001202023A4642424242463A0000 +1E0C:00000000784442424242424244780010 +1E0D:0000000202023A4642424242463A0010 +1E0E:0000000078444242424242424478003C +1E0F:0000000202023A4642424242463A003C +1E10:00000000784442424242424244781020 +1E11:0000000202023A4642424242463A0810 +1E12:00000000784442424242424244783048 +1E13:0000000202023A4642424242463A1824 +1E14:10083C007E4040407C404040407E0000 +1E15:201008003C003C42427E4040423C0000 +1E16:08103C007E4040407C404040407E0000 +1E17:081020003C003C42427E4040423C0000 +1E18:000000007E4040407C404040407E1824 +1E19:0000000000003C42427E4040423C1824 +1E1A:000000007E4040407C404040407E324C +1E1B:0000000000003C42427E4040423C324C +1E1C:00221C007E4040407C404040407E0418 +1E1D:0000221C00003C42427E4040423C0830 +1E1E:001000007E4040407C40404040400000 +1E1F:0800000C1010107C1010101010100000 +1E20:00003C003C424240404E4242463A0000 +1E21:0000000078023A44444438203C42423C +1E22:00001000444444447C44444444440000 +1E23:0000004840405C624242424242420000 +1E24:00000000444444447C44444444440010 +1E25:0000004040405C624242424242420008 +1E26:00240000424242427E42424242420000 +1E27:2400004040405C624242424242420000 +1E28:00000000424242427E42424262621060 +1E29:0000004040405C624242424262621060 +1E2A:0000000082828282FE82828282822838 +1E2B:0000004040404E51614141414141141C +1E2C:000000003E08080808080808083E324C +1E2D:000000080800180808080808083E324C +1E2E:04082A003E08080808080808083E0000 +1E2F:000204082200180808080808083E0000 +1E30:00040810424448506060504844420000 +1E31:00020448404044485060504844420000 +1E32:00000000424448506060504844420010 +1E33:00000040404044485060504844420010 +1E34:0000000042444850606050484442003C +1E35:0000004040404448506050484442003C +1E36:000000004040404040404040407E0010 +1E37:000000180808080808080808083E0008 +1E38:00003C004040404040404040407E0010 +1E39:003C00180808080808080808083E0008 +1E3A:000000004040404040404040407E003C +1E3B:000000180808080808080808083E001C +1E3C:000000004040404040404040407E1824 +1E3D:000000180808080808080808083E1824 +1E3E:00040810424266665A5A424242420000 +1E3F:00000408100076494949494949490000 +1E40:00001000424266665A5A424242420000 +1E41:00000008000076494949494949490000 +1E42:00000000424266665A5A424242420008 +1E43:00000000000076494949494949490008 +1E44:0000080042626252524A4A4646420000 +1E45:0000000800005C624242424242420000 +1E46:0000000042626252524A4A4646420008 +1E47:0000000000005C624242424242420008 +1E48:0000000042626252524A4A464642003C +1E49:0000000000005C62424242424242003C +1E4A:0000000042626252524A4A4646421824 +1E4B:0000000000005C624242424242421824 +1E4C:0408324C3C42424242424242423C0000 +1E4D:020408324C003C4242424242423C0000 +1E4E:2400324C3C42424242424242423C0000 +1E4F:002400324C003C4242424242423C0000 +1E50:10083C003C42424242424242423C0000 +1E51:201008003C003C4242424242423C0000 +1E52:08103C003C42424242424242423C0000 +1E53:081020003C003C4242424242423C0000 +1E54:000408107C4242427C40404040400000 +1E55:0000040810005C6242424242625C4040 +1E56:001000007C4242427C40404040400000 +1E57:0000000800005C6242424242625C4040 +1E58:001000007C4242427C48444442420000 +1E59:0000001000005C624240404040400000 +1E5A:000000007C4242427C48444442420008 +1E5B:0000000000005C624240404040400800 +1E5C:00003C007C4242427C48444442420008 +1E5D:000000003C005C624240404040400800 +1E5E:000000007C4242427C4844444242003C +1E5F:0000000000005C62424040404040003C +1E60:001000003C424240300C0242423C0000 +1E61:0000001000003C4240300C02423C0000 +1E62:000000003C424240300C0242423C0008 +1E63:0000000000003C4240300C02423C0008 +1E64:240810003C424240300C0242423C0000 +1E65:0020081020003C4240300C02423C0000 +1E66:082214083C424240300C0242423C0000 +1E67:0008002214083C4240300C02423C0000 +1E68:000800003C424240300C0242423C0008 +1E69:0000000800003C4240300C02423C0008 +1E6A:000800007F0808080808080808080000 +1E6B:001000001010107C10101010100C0000 +1E6C:000000007F0808080808080808080008 +1E6D:000000001010107C10101010100C0010 +1E6E:000000007F080808080808080808003E +1E6F:000000001010107C10101010100C003C +1E70:000000007F0808080808080800081422 +1E71:000000001010107C10101010120C1422 +1E72:000000004242424242424242423C0024 +1E73:000000000000424242424242463A0028 +1E74:000000004242424242424242423C324C +1E75:000000000000424242424242463A324C +1E76:000000004242424242424242423C1422 +1E77:000000000000424242424242463A1422 +1E78:0408324C0042424242424242423C0000 +1E79:020408324C00424242424242463A0000 +1E7A:24003C004242424242424242423C0000 +1E7B:000024003C00424242424242463A0000 +1E7C:0000324C004141222222141408080000 +1E7D:0000324C000042424224242418180000 +1E7E:00000000414141222222141408080008 +1E7F:00000000000044444428282810100010 +1E80:00201008424242425A5A666642420000 +1E81:00001008040041494949494949360000 +1E82:00040810424242425A5A666642420000 +1E83:00000408100041494949494949360000 +1E84:00240000424242425A5A666642420000 +1E85:00000022000041494949494949360000 +1E86:001000004444444454546C6C44440000 +1E87:00000008000041494949494949360000 +1E88:000000004444444454546C6C44440010 +1E89:00000000000041494949494949360008 +1E8A:00100000444428281010282844440000 +1E8B:00000010000044442810102844440000 +1E8C:00240000424224241818242442420000 +1E8D:00000024000042422418182442420000 +1E8E:00080000414122221408080808080000 +1E8F:0000000800004242424242261A02023C +1E90:182400007E02020408102040407E0000 +1E91:0000182400007E0204081020407E0000 +1E92:000000007E02020408102040407E0008 +1E93:0000000000007E0204081020407E0008 +1E94:000000007E02020408102040407E003C +1E95:0000000000007E0204081020407E003C +1E96:0000004040405C62424242424242003C +1E97:000044001010107C10101010100C0000 +1E98:00081408000041494949494949360000 +1E99:0008140800004242424242261A02023C +1E9A:0002010102003C42023E4242463A0000 +1E9B:0010000C101010301010101010100000 +1E9C:0000000C101010341830501010100000 +1E9D:0000000C107C10301010101010100000 +1E9E:0000003E424444484C424242524C0000 +1E9F:000000001C20202018244242423C0000 +1EA0:0000000010282844447C444444440010 +1EA1:0000000000003C42023E4242463A0010 +1EA2:4020204018242442427E424242420000 +1EA3:0008040408003C42023E4242463A0000 +1EA4:0214284410282844447C444444440000 +1EA5:0002142844003C42023E4242463A0000 +1EA6:4028142208141422223E222222220000 +1EA7:0040281422003C42023E4242463A0000 +1EA8:0402142854282844447C444444440000 +1EA9:02010A1422003C42023E4242463A0000 +1EAA:192608142208141422223E2222220000 +1EAB:1926081422003C42023E4242463A0000 +1EAC:0008142208141422223E222222220008 +1EAD:0000182400003C42023E4242463A0008 +1EAE:0810443810282844447C444444440000 +1EAF:0408104438003C42023E4242463A0000 +1EB0:2010443810282844447C444444440000 +1EB1:201008221C003C42023E4242463A0000 +1EB2:1008B27C10282844447C444444440000 +1EB3:0808104438003C42023E4242463A0000 +1EB4:324C827C10282844447C444444440000 +1EB5:324C00423C003C42023E4242463A0000 +1EB6:0000443810282844447C444444440010 +1EB7:0000002418003C42023E4242463A0010 +1EB8:000000007E4040407C404040407E0010 +1EB9:0000000000003C42427E4040423C0010 +1EBA:100808107E4040407C404040407E0000 +1EBB:1008081000003C42427E4040423C0000 +1EBC:00324C007E4040407C404040407E0000 +1EBD:000000324C003C42427E4040423C0000 +1EBE:021428447E4040407C404040407E0000 +1EBF:0002142844003C42427E4040423C0000 +1EC0:402814227E4040407C404040407E0000 +1EC1:0040281422003C42427E4040423C0000 +1EC2:04122A447E4040407C404040407E0000 +1EC3:0402122C44003C42427E4040423C0000 +1EC4:324C1028447E40407C404040407E0000 +1EC5:324C102844003C42427E4040423C0000 +1EC6:001824007E4040407C404040407E0008 +1EC7:0000182400003C42427E4040423C0008 +1EC8:080404083E08080808080808083E0000 +1EC9:001008081000180808080808083E0000 +1ECA:000000003E08080808080808083E0008 +1ECB:000000080800180808080808083E0008 +1ECC:000000003C42424242424242423C0008 +1ECD:0000000000003C4242424242423C0008 +1ECE:100808103C42424242424242423C0000 +1ECF:0010080810003C4242424242423C0000 +1ED0:021428443C42424242424242423C0000 +1ED1:0002142844003C4242424242423C0000 +1ED2:402814223C42424242424242423C0000 +1ED3:0040281422003C4242424242423C0000 +1ED4:04122A443C42424242424242423C0000 +1ED5:0402122C44003C4242424242423C0000 +1ED6:324C1028443C424242424242423C0000 +1ED7:324C102844003C4242424242423C0000 +1ED8:001824003C42424242424242423C0008 +1ED9:0000182400003C4242424242423C0008 +1EDA:08102201394644444444444444380000 +1EDB:00000810220139464444444444380000 +1EDC:20100A01394644444444444444380000 +1EDD:000020100A0139464444444444380000 +1EDE:10080A11394644444444444444380000 +1EDF:00100808120139464444444444380000 +1EE0:00324C02394546444444444444380000 +1EE1:00324C00020139464444444444380000 +1EE2:00000201394644444444444444380010 +1EE3:00000000020139464444444444380010 +1EE4:000000004242424242424242423C0008 +1EE5:000000000000424242424242463A0008 +1EE6:100808104242424242424242423C0000 +1EE7:001008081000424242424242463A0000 +1EE8:04081201454644444444444444380000 +1EE9:0000040812014546444444444C340000 +1EEA:40201201454644444444444444380000 +1EEB:0000402012014546444444444C340000 +1EEC:10080A11454644444444444444380000 +1EED:0010080812014546444444444C340000 +1EEE:324C0201454644444444444444380000 +1EEF:00324C0002014546444444444C340000 +1EF0:00000201454644444444444444380010 +1EF1:0000000002014546444444444C340010 +1EF2:20100800414122221408080808080000 +1EF3:0020100800004242424242261A02023C +1EF4:00000000414122221408080808080008 +1EF5:0000000000004242424242261A023C08 +1EF6:08040408414122221408080808080000 +1EF7:0010080810004242424242261A02023C +1EF8:00324C00414122221408080808080000 +1EF9:0000324C00004242424242261A02023C +1EFA:000000F0505050505050505050FE0000 +1EFB:0000006C2424247E2424242424FF0000 +1EFC:000000000408101020244242423C0000 +1EFD:00000000000008102020484444380000 +1EFE:00000000424222141408080808384830 +1EFF:00000000000042422214140808384830 +1F00:000030102000324A444444444A320000 +1F01:000030201000324A444444444A320000 +1F02:000068284400324A444444444A320000 +1F03:000068482400324A444444444A320000 +1F04:000064284800324A444444444A320000 +1F05:000064482800324A444444444A320000 +1F06:64980030102000324A4444444A320000 +1F07:64980030201000324A4444444A320000 +1F08:C040800018242442427E424242420000 +1F09:C080400018242442427E424242420000 +1F0A:D050880018242442427E424242420000 +1F0B:D090480018242442427E424242420000 +1F0C:C850900018242442427E424242420000 +1F0D:C890500018242442427E424242420000 +1F0E:6498602040182424427E424242420000 +1F0F:6498604020182424427E424242420000 +1F10:0000180810003C42403C4040423C0000 +1F11:0000181008003C42403C4040423C0000 +1F12:0000341422003C42403C4040423C0000 +1F13:0000342412003C42403C4040423C0000 +1F14:0000321424003C42403C4040423C0000 +1F15:0000322414003C42403C4040423C0000 +1F16:00007FFE7B8673BE7B8E7BBE71BE7FFE7FFE7BCE73BE7B8E7BB671CE7FFE0000 +1F17:00007FFE7B8673BE7B8E7BBE71BE7FFE7FFE7B8673F67BEE7BDE71DE7FFE0000 +1F18:C04080007E4040407C404040407E0000 +1F19:C08040007E4040407C404040407E0000 +1F1A:D05088007E4040407C404040407E0000 +1F1B:D09048007E4040407C404040407E0000 +1F1C:C85090007E4040407C404040407E0000 +1F1D:C89050007E4040407C404040407E0000 +1F1E:00007FFE7B8673BE7B8E7BBE71BE7FFE7FFE7B8673BE7B8E7BBE71867FFE0000 +1F1F:00007FFE7B8673BE7B8E7BBE71BE7FFE7FFE7B8673BE7B8E7BBE71BE7FFE0000 +1F20:0000180810005C624242424242420202 +1F21:0000181008005C624242424242420202 +1F22:0000341422005C624242424242420202 +1F23:0000342412005C624242424242420202 +1F24:0000321424005C624242424242420202 +1F25:0000322414005C624242424242420202 +1F26:324C00180810005C6242424242420202 +1F27:324C00181008005C6242424242420202 +1F28:C0408000424242427E42424242420000 +1F29:C0804000424242427E42424242420000 +1F2A:D0508800424242427E42424242420000 +1F2B:D0904800424242427E42424242420000 +1F2C:C8509000424242427E42424242420000 +1F2D:C8905000424242427E42424242420000 +1F2E:64986020404242427E42424242420000 +1F2F:64986040204242427E42424242420000 +1F30:000018081000301010101010100C0000 +1F31:000018100800301010101010100C0000 +1F32:000068284400301010101010100C0000 +1F33:000068482400301010101010100C0000 +1F34:000064284800301010101010100C0000 +1F35:000064482800301010101010100C0000 +1F36:324C00180810003010101010100C0000 +1F37:324C00181008003010101010100C0000 +1F38:C04080003E08080808080808083E0000 +1F39:C08060003E08080808080808083E0000 +1F3A:D05088003E08080808080808083E0000 +1F3B:D09048003E08080808080808083E0000 +1F3C:C85090003E08080808080808083E0000 +1F3D:C89050003E08080808080808083E0000 +1F3E:64986020403E080808080808083E0000 +1F3F:64986040203E080808080808083E0000 +1F40:0000180810003C4242424242423C0000 +1F41:0000181008003C4242424242423C0000 +1F42:0000341422003C4242424242423C0000 +1F43:0000342412003C4242424242423C0000 +1F44:0000321424003C4242424242423C0000 +1F45:0000322414003C4242424242423C0000 +1F46:00007FFE7B8673BE7B8E7BBE71BE7FFE7FFE6DCE6DBE618E7DB67DCE7FFE0000 +1F47:00007FFE7B8673BE7B8E7BBE71BE7FFE7FFE6D866DF661EE7DDE7DDE7FFE0000 +1F48:C04080003C42424242424242423C0000 +1F49:C08040003C42424242424242423C0000 +1F4A:D05088003C42424242424242423C0000 +1F4B:D09048003C42424242424242423C0000 +1F4C:C85090003C42424242424242423C0000 +1F4D:C89050003C42424242424242423C0000 +1F4E:00007FFE7B8673BE7B8E7BBE71BE7FFE7FFE6D866DBE618E7DBE7D867FFE0000 +1F4F:00007FFE7B8673BE7B8E7BBE71BE7FFE7FFE6D866DBE618E7DBE7DBE7FFE0000 +1F50:000018081000424242424242423C0000 +1F51:000018100800424242424242423C0000 +1F52:000034142200424242424242423C0000 +1F53:000034241200424242424242423C0000 +1F54:000032142400424242424242423C0000 +1F55:000032241400424242424242423C0000 +1F56:324C00180810424242424242423C0000 +1F57:324C00181008424242424242423C0000 +1F58:00007FFE7B8673BE7B8E7BBE71BE7FFE7FFE61CE6FB661CE7DB661CE7FFE0000 +1F59:C0804000414122221408080808080000 +1F5A:00007FFE7B8673BE7B8E7BBE71BE7FFE7FFE61866FB661867DB661B67FFE0000 +1F5B:D0904800414122221408080808080000 +1F5C:00007FFE7B8673BE7B8E7BBE71BE7FFE7FFE61C66FBE61BE7DBE61C67FFE0000 +1F5D:C8905000414122221408080808080000 +1F5E:00007FFE7B8673BE7B8E7BBE71BE7FFE7FFE61866FBE618E7DBE61867FFE0000 +1F5F:64986040204122221408080808080000 +1F60:00000C04080022414149494949360000 +1F61:00000C08040022414149494949360000 +1F62:00003414220022414149494949360000 +1F63:00003424120022414149494949360000 +1F64:00003214240022414149494949360000 +1F65:00003224140022414149494949360000 +1F66:324C0018081000224149494949360000 +1F67:324C0018100800224149494949360000 +1F68:C04080003E4141414141221414770000 +1F69:C08040003E4141414141221414770000 +1F6A:D05088003E4141414141221414770000 +1F6B:D09048003E4141414141221414770000 +1F6C:C85090003E4141414141221414770000 +1F6D:C89050003E4141414141221414770000 +1F6E:324C1808101C22414141221414770000 +1F6F:324C1810081C23414141221414770000 +1F70:000020201000324A444444444A320000 +1F71:000010202000324A444444444A320000 +1F72:0000101008003C42403C4040423C0000 +1F73:0000081010003C42403C4040423C0000 +1F74:0000101008005C624242424242420202 +1F75:0000081010005C624242424242420202 +1F76:000010100800301010101010100C0000 +1F77:000008101000301010101010100C0000 +1F78:0000101008003C4242424242423C0000 +1F79:0000081010003C4242424242423C0000 +1F7A:000010100800424242424242423C0000 +1F7B:000008101000424242424242423C0000 +1F7C:00001010080022414149494949360000 +1F7D:00000408080022414149494949360000 +1F7E:00007FFE7B8673BE7B8E7BBE71BE7FFE7FFE61867DBE7B8E77BE77867FFE0000 +1F7F:00007FFE7B8673BE7B8E7BBE71BE7FFE7FFE61867DBE7B8E77BE77BE7FFE0000 +1F80:000030102000324A444444444A322030 +1F81:000030201000324A444444444A322030 +1F82:000068284400324A444444444A322030 +1F83:000068482400324A444444444A322030 +1F84:000064284800324A444444444A322030 +1F85:000064482800324A444444444A322030 +1F86:324C0030102000324A4444444A322030 +1F87:324C0030201000324A4444444A322030 +1F88:C040800018242442427E42424242100C +1F89:C080400018242442427E42424242100C +1F8A:D050880018242442427E42424242100C +1F8B:D090480018242442427E42424242100C +1F8C:C850900018242442427E42424242100C +1F8D:C890500018242442427E42424242100C +1F8E:6498602040182424427E42424242100C +1F8F:6498604020182424427E42424242100C +1F90:0000180810005C624242424242422232 +1F91:0000181008005C624242424242422232 +1F92:0000341422005C624242424242422232 +1F93:0000342412005C624242424242422232 +1F94:0000321424005C624242424242422232 +1F95:0000322414005C624242424242422232 +1F96:324C00180810005C6242424242422232 +1F97:324C00181008005C6242424242422232 +1F98:C0408000424242427E42424242422018 +1F99:C0804000424242427E42424242422018 +1F9A:D0508800424242427E42424242422018 +1F9B:D0904800424242427E42424242422018 +1F9C:C8509000424242427E42424242422018 +1F9D:C8905000424242427E42424242422018 +1F9E:64986020404242427E42424242422018 +1F9F:64986040204242427E42424242422018 +1FA0:0000180810002241414949494936080C +1FA1:0000181008002241414949494936080C +1FA2:0000341422002241414949494936080C +1FA3:0000342412002241414949494936080C +1FA4:0000321424002241414949494936080C +1FA5:0000322414002241414949494936080C +1FA6:324C001808100022414949494936080C +1FA7:324C001810080022414949494936080C +1FA8:C04080003E4141414141221414770806 +1FA9:C08040003E4141414141221414770806 +1FAA:D05088003E4141414141221414770806 +1FAB:D09048003E4141414141221414770806 +1FAC:C85090003E4141414141221414770806 +1FAD:C89050003E4141414141221414770806 +1FAE:64986020401C22414141221414770806 +1FAF:64986040201C22414141221414770806 +1FB0:000044443800324A444444444A320000 +1FB1:000000007C00324A444444444A320000 +1FB2:000020201000324A444444444A322030 +1FB3:000000000000324A444444444A322030 +1FB4:000010202000324A444444444A322030 +1FB5:00007FFE7B8673BE7B8E7BBE71BE7FFE7FFE63866DBE63866DF663867FFE0000 +1FB6:000000324C00324A444444444A320000 +1FB7:000000324C00324A444444444A322030 +1FB8:42423C0018242442427E424242420000 +1FB9:003C000018242442427E424242420000 +1FBA:8080400018242442427E424242420000 +1FBB:4080800018242442427E424242420000 +1FBC:0000000018242442427E42424242100C +1FBD:00000000180810000000000000000000 +1FBE:00000000000000000000202020180000 +1FBF:18081000000000000000000000000000 +1FC0:324C0000000000000000000000000000 +1FC1:324C0066000000000000000000000000 +1FC2:0000101008005C624242424242422232 +1FC3:0000000000005C624242424242422232 +1FC4:0000081010005C624242424242422232 +1FC5:00007FFE7B8673BE7B8E7BBE71BE7FFE7FFE71866FBE6F866FF671867FFE0000 +1FC6:000000324C005C624242424242420202 +1FC7:000000324C005C624242424242422232 +1FC8:808040007E4040407C404040407E0000 +1FC9:408080007E4040407C404040407E0000 +1FCA:80804000424242427E42424242420000 +1FCB:40808000424242427E42424242420000 +1FCC:00000000424242427E4242424242100C +1FCD:68284400000000000000000000000000 +1FCE:64284800000000000000000000000000 +1FCF:324C0018081000000000000000000000 +1FD0:000044443800301010101010100C0000 +1FD1:000000003C00301010101010100C0000 +1FD2:101008006600301010101010100C0000 +1FD3:081010006600301010101010100C0000 +1FD4:00007FFE7B8673BE7B8E7BBE71BE7FFE7FFE63B66DB66D866DF663F67FFE0000 +1FD5:00007FFE7B8673BE7B8E7BBE71BE7FFE7FFE63866DBE6D866DF663867FFE0000 +1FD6:000000324C00301010101010100C0000 +1FD7:00324C006600301010101010100C0000 +1FD8:22221C003E08080808080808083E0000 +1FD9:003E00003E08080808080808083E0000 +1FDA:808040003E08080808080808083E0000 +1FDB:408080003E08080808080808083E0000 +1FDC:00007FFE7B8673BE7B8E7BBE71BE7FFE7FFE63C66DBE6DBE6DBE63C67FFE0000 +1FDD:68482400000000000000000000000000 +1FDE:64482800000000000000000000000000 +1FDF:324C0018100800000000000000000000 +1FE0:000042423C00424242424242423C0000 +1FE1:0000003C0000424242424242423C0000 +1FE2:101008006600424242424242423C0000 +1FE3:081010006600424242424242423C0000 +1FE4:0000180810003C4242424242625C4040 +1FE5:0000181008003C4242424242625C4040 +1FE6:000000324C00424242424242423C0000 +1FE7:00324C006600424242424242423C0000 +1FE8:22221C00414122221408080808080000 +1FE9:00003E00414122221408080808080000 +1FEA:80804000414122221408080808080000 +1FEB:40808000414122221408080808080000 +1FEC:C08040007C4242427C40404040400000 +1FED:10100800660000000000000000000000 +1FEE:08101000660000000000000000000000 +1FEF:10100800000000000000000000000000 +1FF0:00007FFE7B8673BE7B8E7BBE71BE7FFE7FFE61CE6FB663B66FB66FCE7FFE0000 +1FF1:00007FFE7B8673BE7B8E7BBE71BE7FFE7FFE61EE6FCE63EE6FEE6FC67FFE0000 +1FF2:0000101008002241414949494936080C +1FF3:0000000000002241414949494936080C +1FF4:0000040808002241414949494936080C +1FF5:00007FFE7B8673BE7B8E7BBE71BE7FFE7FFE61866FBE63866FF66F867FFE0000 +1FF6:000000324C0022414149494949360000 +1FF7:000000324C002241414949494936080C +1FF8:808040003C42424242424242423C0000 +1FF9:408080003C42424242424242423C0000 +1FFA:808040003E4141414141221414770000 +1FFB:408080003E4141414141221414770000 +1FFC:000000003E4141414141221414770806 +1FFD:08101000000000000000000000000000 +1FFE:18100800000000000000000000000000 +1FFF:00007FFE7B8673BE7B8E7BBE71BE7FFE7FFE61866FBE638E6FBE6FBE7FFE0000 +2000:00000000000000000000000000000000 +2001:00000000000000000000000000000000 +2002:00000000000000000000000000000000 +2003:00000000000000000000000000000000 +2004:00000000000000000000000000000000 +2005:00000000000000000000000000000000 +2006:00000000000000000000000000000000 +2007:00000000000000000000000000000000 +2008:00000000000000000000000000000000 +2009:00000000000000000000000000000000 +200A:00000000000000000000000000000000 +200B:AAAA00019E44024584540855906C1E4580000E3990240C3982201C2180005555 +200C:AAAA00019E44024584540855906C1E45800012099A0816499248123180005555 +200D:AAAA00019E44024584540855906C1E4580000041804002418240018180005555 +200E:AAAA000180000001C72244B7C72A4523F4A20001800000018000000180005555 +200F:AAAA000180000001F2224A37F22A5223CBA20001800000018000000180005555 +2010:0000000000000000003C000000000000 +2011:0000000000000000003C000000000000 +2012:0000000000000000007E000000000000 +2013:0000000000000000007E000000000000 +2014:000000000000000000FF000000000000 +2015:000000000000000000FF000000000000 +2016:00000014141414141414141414141400 +2017:00000000000000000000000000FF00FF +2018:00000810101800000000000000000000 +2019:00001808081000000000000000000000 +201A:00000000000000000000000018080810 +201B:00001810100800000000000000000000 +201C:00002244446600000000000000000000 +201D:00006622224400000000000000000000 +201E:00000000000000000000000066222244 +201F:00006644442200000000000000000000 +2020:0000081C082A7F2A081C080808080000 +2021:00081C082A7F2A08082A7F2A081C0800 +2022:00000000000000387C7C7C3800000000 +2023:0000000000002030383C383020000000 +2024:00000000000000000000000018180000 +2025:00000000000000000000000036360000 +2026:00000000000000000000000049490000 +2027:00000000000000000018180000000000 +2028:AAAA00018000020182000201820003C180003BDDC21233DD8A1073D180005555 +2029:AAAA000180000381824003818200020180003BDDC21233DD8A1073D180005555 +202A:AAAA000180000001C39E4251C39E4291FA5E0001800000018000000180005555 +202B:AAAA000180000001F21E4A11F21E5211CBDE0001800000018000000180005555 +202C:AAAA000180000001F39E4A51F25E4251C3900001800000018000000180005555 +202D:AAAA000180000001C38C4253C3924293FA4C0001800000018000000180005555 +202E:AAAA000180000001F20C4A13F2125213CBCC0001800000018000000180005555 +202F:00000000000000000000000000000000 +2030:0000000042A4A44810102A55558A0000 +2031:0000000040A0A04C30C02A55552A0000 +2032:000000000C1810200000000000000000 +2033:00000000336644880000000000000000 +2034:000000003F7E54A80000000000000000 +2035:00000000301808040000000000000000 +2036:00000000CC6622110000000000000000 +2037:00000000FC7E2A150000000000000000 +2038:00000000000000000000000000102844 +2039:00000000000404080810080804040000 +203A:00000000202010100808101020200000 +203B:00000000004922144914224900000000 +203C:00000000242424242424240024240000 +203D:000000003C4A4A0A0C08080008080000 +203E:7E000000000000000000000000000000 +203F:0000000000000000000000000000423C +2040:3C420000000000000000000000000000 +2041:00000000000000000000020408102844 +2042:000000000000081C0800227722000000 +2043:00000000000000003C3C000000000000 +2044:00000000020204080810102040400000 +2045:0000000E080808080E08080808080E00 +2046:00000070101010107010101010107000 +2047:000000EE111122CC8888880000880000 +2048:000000720A0A12624242420000420000 +2049:0000005C424244585050500000500000 +204A:0000000000007E020202020404040404 +204B:00000000FC5E5E5E5C50505050505000 +204C:000000001E3A3A3A1E00000000000000 +204D:00000000785C5C5C7800000000000000 +204E:0000000000000008492A1C2A49080000 +204F:00000000000018180000001810100800 +2050:0000003C424200000042423C00000000 +2051:0008492A1C2A49080008492A1C2A4908 +2052:00000000626204080810102046460000 +2053:000000000000000000718E0000000000 +2054:00000000000000000000000000003C42 +2055:00000000925438FE3854920000000000 +2056:00000000000006060060600006060000 +2057:0000000000000000333366664444888800000000000000000000000000000000 +2058:00000000000018180066660018180000 +2059:00000000000066660018180066660000 +205A:00000000181800000000000018180000 +205B:00000018180000006666000000181800 +205C:00000000000054107C10540000000000 +205D:00000000181800001818000018180000 +205E:00000000100000100000100000100000 +205F:00000000000000000000000000000000 +2060:AAAA00018000000180000001A2082209AA083689A27000018000000180005555 +2061:AAAA00018C001001908810899104110591047D05910411059088608980005555 +2062:AAAA000180000001800000018000042182400181824004218000000180005555 +2063:AAAA000180000001800000018000000180000001800018018800080190005555 +2064:AAAA00018000000180000101810001018FE00101810001018100000180005555 +2065:00007FFE61CE7DB661B66FB661CE7FFE7FFE73866FBE63866DF673867FFE0000 +2066:AAAA000180000001A39C2249A3882289BA5C0001800000018000000180005555 +2067:AAAA000180000001B91C2509B9082909A5DC0001800000018000000180005555 +2068:AAAA000180000001B9DC2209B9882049A39C0001800000018000000180005555 +2069:AAAA000180000001F39C4A49F2484249C39C0001800000018000000180005555 +206A:AAAA0001800007C181000101810007C180001E79A0801C7182083CF180005555 +206B:AAAA000180000381844007C18440044180001E79A0801C7182083CF180005555 +206C:AAAA0001800003E180800081808003E1800039F6C5087DE7C501450F80005555 +206D:AAAA0001800001C1822003E182200221800039F6C5087DE7C501450F80005555 +206E:AAAA000180002271B2882AF9A688228980003C79A2802271A2083CF180005555 +206F:AAAA000180002271B2882A89A688227180003C79A2802271A2083CF180005555 +2070:00000018244242422418000000000000 +2071:0000001000301010107C000000000000 +2072:00007FFE61CE7DB661B66FB661CE7FFE7FFE61867DF67B8677BE77867FFE0000 +2073:00007FFE61CE7DB661B66FB661CE7FFE7FFE618E7DF67BC677F6778E7FFE0000 +2074:0000000C1424447E0404000000000000 +2075:0000007C404078040478000000000000 +2076:00000018204078444438000000000000 +2077:0000007C040808101010000000000000 +2078:00000038444438444438000000000000 +2079:0000003844443C040830000000000000 +207A:0000000010107C101000000000000000 +207B:0000000000007C000000000000000000 +207C:00000000007C00007C00000000000000 +207D:00000408101010101008040000000000 +207E:00002010080808080810200000000000 +207F:00000000005864444444000000000000 +2080:00000000000000001824424242241800 +2081:00000000000000001030501010107C00 +2082:00000000000000003844041820407C00 +2083:00000000000000003844043804443800 +2084:00000000000000000C1424447E040400 +2085:00000000000000007C40407804047800 +2086:00000000000000001820407844443800 +2087:00000000000000007C04080810101000 +2088:00000000000000003844443844443800 +2089:00000000000000003844443C04083000 +208A:0000000000000000000010107C101000 +208B:0000000000000000000000007C000000 +208C:00000000000000000000007C00007C00 +208D:00000000000000040810101010100804 +208E:00000000000000201008080808081020 +208F:00007FFE61CE7DB661B66FB661CE7FFE7FFE73866DBE738E6DBE73BE7FFE0000 +2090:0000000000000000000038043C443C00 +2091:0000000000000000000038447C403C00 +2092:00000000000000000000384444443800 +2093:00000000000000000000442810284400 +2094:0000000000000000000078047C443800 +2095:00000000000000004040586444444400 +2096:00000000000000002020242830282400 +2097:00000000000000003010101010107C00 +2098:00000000000000000000764949494900 +2099:00000000000000000000586444444400 +209A:00000000000000000000586464584040 +209B:000000000000000000003C4038047800 +209C:000000000000000010107C1010100C00 +209D:00007FFE61CE7DB661B66FB661CE7FFE7FFE738E6DB671B67DB6738E7FFE0000 +209E:00007FFE61CE7DB661B66FB661CE7FFE7FFE73866DBE718E7DBE73867FFE0000 +209F:00007FFE61CE7DB661B66FB661CE7FFE7FFE73866DBE718E7DBE73BE7FFE0000 +20A0:000000003C40405E50503C10101E0000 +20A1:000000000A3E4A54546868725C100000 +20A2:000000001C22424056585050321C0000 +20A3:000000003F2020203E2020FC20200000 +20A4:000000000E10107E107E10103E610000 +20A5:000000000101764D4D49495969690000 +20A6:000000002222327F2A7F262622220000 +20A7:0000000068585F5C6C4A4949494E0000 +20A8:0000000070484B4C74545249494E0000 +20A9:0000002222227F2A7F36362222000000 +20AA:000000000000F28AAAAAAAAAA2BC0000 +20AB:000000020F023A4642424242463A007E +20AC:000000000C12207C207C2020120C0000 +20AD:000000004244485060FE504844420000 +20AE:000000007F08080E380E380808080000 +20AF:0000000070484848484E4D4D4E740404 +20B0:00000000384444442818546462420408 +20B1:00007C42FF42FF427C40404040400000 +20B2:000010103C52525050565252563A1010 +20B3:00000000182424FF42FF424242420000 +20B4:000000003C420202FF30FF40423C0000 +20B5:000010103C52525050505052523C1010 +20B6:000000002828287E2828282829260000 +20B7:000000003C424220180452AAAAFCA8A8 +20B8:000000000000FE00FE10101010100000 +20B9:0000000000000FF0018000400FF0004000800F00040002000100008000400000 +20BA:0000002020283060A83062A224380000 +20BB:0000000040A0FC224254E84044380000 +20BC:00000000000000101038545454540000 +20BD:000000003C2222227C207C2020200000 +20BE:0000287CAAAAAA808080804020FE0000 +20BF:00002828FC4242427C42424242FC2828 +20C0:00007FFE61CE7DB661B66FB661CE7FFE7FFE71CE6FB66FB66FB671CE7FFE0000 +20C1:00007FFE61CE7DB661B66FB661CE7FFE7FFE71EE6FCE6FEE6FEE71C67FFE0000 +20C2:00007FFE61CE7DB661B66FB661CE7FFE7FFE71866FF66F866FBE71867FFE0000 +20C3:00007FFE61CE7DB661B66FB661CE7FFE7FFE718E6FF66FC66FF6718E7FFE0000 +20C4:00007FFE61CE7DB661B66FB661CE7FFE7FFE71B66FB66F866FF671F67FFE0000 +20C5:00007FFE61CE7DB661B66FB661CE7FFE7FFE71866FBE6F866FF671867FFE0000 +20C6:00007FFE61CE7DB661B66FB661CE7FFE7FFE71CE6FBE6F8E6FB671CE7FFE0000 +20C7:00007FFE61CE7DB661B66FB661CE7FFE7FFE71866FF66FEE6FDE71DE7FFE0000 +20C8:00007FFE61CE7DB661B66FB661CE7FFE7FFE71CE6FB66FCE6FB671CE7FFE0000 +20C9:00007FFE61CE7DB661B66FB661CE7FFE7FFE71CE6FB66FC66FF671CE7FFE0000 +20CA:00007FFE61CE7DB661B66FB661CE7FFE7FFE71866FB66F866FB671B67FFE0000 +20CB:00007FFE61CE7DB661B66FB661CE7FFE7FFE718E6FB66F8E6FB6718E7FFE0000 +20CC:00007FFE61CE7DB661B66FB661CE7FFE7FFE71C66FBE6FBE6FBE71C67FFE0000 +20CD:00007FFE61CE7DB661B66FB661CE7FFE7FFE718E6FB66FB66FB6718E7FFE0000 +20CE:00007FFE61CE7DB661B66FB661CE7FFE7FFE71866FBE6F8E6FBE71867FFE0000 +20CF:00007FFE61CE7DB661B66FB661CE7FFE7FFE71866FBE6F8E6FBE71BE7FFE0000 +20D0:0010207E000000000000000000000000 +20D1:0008047E000000000000000000000000 +20D2:00000000101010101010101010100000 +20D3:00000000001010101010101000000000 +20D4:004C5260780000000000000000000000 +20D5:00324A061E0000000000000000000000 +20D6:10207E20100000000000000000000000 +20D7:08047E04080000000000000000000000 +20D8:00000000000000182424180000000000 +20D9:00000000000000383424180000000000 +20DA:000000000000001C2C24180000000000 +20DB:00002A2A000000000000000000000000 +20DC:00005555000000000000000000000000 +20DD:000003800C60301820084004400480028002800240044004200830180C600380 +20DE:00007FFE4002400240024002400240024002400240024002400240027FFE0000 +20DF:0000010002800440082010102008400480024004200810100820044002800100 +20E0:000003800C603018300858044C0486028302818240C44064203830180C600380 +20E1:2442FF42240000000000000000000000 +20E2:0000000000003FFC4002400240024002400240024002400240023FFC7FFE0000 +20E3:00003FFC60065FFA500A500A500A500A500A500A500A500A5FFA60063FFC0000 +20E4:008001C00140036002200410041008080808180C10041004200220023FFE0000 +20E5:00002020201010101010080808080000 +20E6:00002828282828282828282828280000 +20E7:00001FFF00010001000100010001000100010001000100010001000100010000 +20E8:00000000000000000000000000000054 +20E9:00FF8100000000000000000000000000 +20EA:000000000000000000000000040008001FFC0800040000000000000000000000 +20EB:00000A0A0A1414141414282828280000 +20EC:000000000000000000000000007E0408 +20ED:000000000000000000000000007E2010 +20EE:000000000000000000000010207E2010 +20EF:000000000000000000000008047E0408 +20F0:24187E18240000000000000000000000 +20F1:00007FFE61CE7DB661B66FB661CE7FFE7FFE61EE6FCE63EE6FEE6FC67FFE0000 +20F2:00007FFE61CE7DB661B66FB661CE7FFE7FFE61866FF663866FBE6F867FFE0000 +20F3:00007FFE61CE7DB661B66FB661CE7FFE7FFE618E6FF663C66FF66F8E7FFE0000 +20F4:00007FFE61CE7DB661B66FB661CE7FFE7FFE61B66FB663866FF66FF67FFE0000 +20F5:00007FFE61CE7DB661B66FB661CE7FFE7FFE61866FBE63866FF66F867FFE0000 +20F6:00007FFE61CE7DB661B66FB661CE7FFE7FFE61CE6FBE638E6FB66FCE7FFE0000 +20F7:00007FFE61CE7DB661B66FB661CE7FFE7FFE61866FF663EE6FDE6FDE7FFE0000 +20F8:00007FFE61CE7DB661B66FB661CE7FFE7FFE61CE6FB663CE6FB66FCE7FFE0000 +20F9:00007FFE61CE7DB661B66FB661CE7FFE7FFE61CE6FB663C66FF66FCE7FFE0000 +20FA:00007FFE61CE7DB661B66FB661CE7FFE7FFE61866FB663866FB66FB67FFE0000 +20FB:00007FFE61CE7DB661B66FB661CE7FFE7FFE618E6FB6638E6FB66F8E7FFE0000 +20FC:00007FFE61CE7DB661B66FB661CE7FFE7FFE61C66FBE63BE6FBE6FC67FFE0000 +20FD:00007FFE61CE7DB661B66FB661CE7FFE7FFE618E6FB663B66FB66F8E7FFE0000 +20FE:00007FFE61CE7DB661B66FB661CE7FFE7FFE61866FBE638E6FBE6F867FFE0000 +20FF:00007FFE61CE7DB661B66FB661CE7FFE7FFE61866FBE638E6FBE6FBE7FFE0000 +2100:00000000003051523408132444030000 +2101:0000000000305152340B142241060000 +2102:000000001E31505050505050311E0000 +2103:40A0A0403C42424040404042423C0000 +2104:0000000010103C505050503C101E0000 +2105:00000000003041423408162949060000 +2106:00000000003041423408102949060000 +2107:000000003E42404038404042423C0000 +2108:000000007C4202121E120202423C0000 +2109:40A0A0407E4040407C40404040400000 +210A:0000000000003A4642423E023F423C00 +210B:00000000127596141C34549494630000 +210C:000018B66068743666666666E6063408 +210D:00000000715151515F51515151710000 +210E:00000000000000400080008000F0018801080108021002100210042000000000 +210F:000000000000005000E0038004F0018801080108021002100210042000000000 +2110:000000000C14240404060C1424283000 +2111:00000000397FC68066086CA6663C0000 +2112:0000000C12123C101010107099660000 +2113:000000182424242830602020221C0000 +2114:000000004848FE484A4D494949360000 +2115:00000000715159595555535351710000 +2116:00000000929595D2D0B7B09090900000 +2117:000000003C42B9A5A5B9A1A1423C0000 +2118:000000000000204C5222222A54505020 +2119:000000007C525252525C505050700000 +211A:000000001C32515151515151361E0100 +211B:000000402E113151515E545252210000 +211C:00000000446EB233363C3636A2C30000 +211D:000000007E515151515E585452710000 +211E:000000007C4242427C504A444A500000 +211F:000038087C4A4A4A7C6858484C4A0800 +2120:00000000719B5531D100000000000000 +2121:00000000FE525A525F00000000000000 +2122:00000000F15B55515100000000000000 +2123:0000300C85894A525424287850800000 +2124:000000007E0A0A1214242848507E0000 +2125:000000003C08103E0408180402423C00 +2126:000000003E4141414141221414770000 +2127:000000007714142241414141413E0000 +2128:000000003C464606081E020666A6663C +2129:000000000000300808080808080C0000 +212A:00000000424448506060504844420000 +212B:1824180018242442427E424242420000 +212C:000000002E5151515E515151512E0000 +212D:000000001624686866666468221C0000 +212E:0000000000000000000007E00810181818181FF818001800081007E000000000 +212F:00000000000000182448704044380000 +2130:000000000E1220201C204044423C0000 +2131:000000003C42020404083E1020200000 +2132:0000000002020202023E0202027E0000 +2133:0000000063362A2A2A2A2A6AAA490000 +2134:0000000000001824534E424224180000 +2135:00000000000044462214286472620000 +2136:0000000000103E02020202023F7E0000 +2137:0000000000403C1E0202020E32320000 +2138:0000000000403E1F0202020203020000 +2139:0000000018180038181818187E000000 +213A:000000000000000000000000000000081FE820302050205020301FE000000000 +213B:00000000000000007C004000400040007222451448884F88489448A200000000 +213C:0000000000000000000000001FF80A500A500A500A500A480A240E1C00000000 +213D:0000000000000000000000000C040A08091004A0024002400480090012001C00 +213E:000000007F5553515050505050700000 +213F:00000000000000003FF8145014501450145014501450145014501C7000000000 +2140:00000000000000001FF81228091804880240024004800908121814281FF80000 +2141:000000005C62424272020202423C0000 +2142:000000007E0202020202020202020000 +2143:000000000202020202020202027E0000 +2144:00000000080808080814222241410000 +2145:000000000000000007E00530052809280A280A481250145014601FC000000000 +2146:0000000000000000003800280028004807D00A50129014A014A00FE000000000 +2147:00000000000000000000000003E00510091013F01400140014200FC000000000 +2148:00000000000000200040000000E00140014001400280028002800FE000000000 +2149:000000000000000800100000003800500050005000A000A000A000A008C00700 +214A:000010107C525252525C1010101E0000 +214B:000000004E3121514A0C1422221C0000 +214C:000000000000000034C04D20252005201FF825241FC405080500020000000000 +214D:0000000042A2E4A80813142241460000 +214E:000000000000000404043C04047C0000 +214F:0000000000000000000000000000000011102AA82AA82AA811106EEC00000000 +2150:0000000022622428281E122244440400 +2151:0000000022622428281E1A2E424C0000 +2152:0000000042C24448502255B595120000 +2153:0000000022622428281C1224424C0000 +2154:0000000062122448781C1224424C0000 +2155:0000000022622428281E182C424C0000 +2156:0000000062122448781E182C424C0000 +2157:0000000062122418681E182C424C0000 +2158:000000002262F428281E182C424C0000 +2159:00000000226224282816182E4A4E0000 +215A:00000000724264186816182E4A4E0000 +215B:000000002262242828141A244A4E0000 +215C:000000006212241868141A244A4E0000 +215D:000000007242641868141A244A4E0000 +215E:000000007212244848141A244A4E0000 +215F:00000000226224282810102040400000 +2160:000000001C08080808080808081C0000 +2161:000000007E24242424242424247E0000 +2162:000000007F2A2A2A2A2A2A2A2A7F0000 +2163:000000007F29292929292626267F0000 +2164:000000007F22222214141408083E0000 +2165:00000000FF4A4A4A4A4A3232327F0000 +2166:00000000FF55555555252525257F0000 +2167:00000000FFB5B5B5B555555555FF0000 +2168:000000007F2A2A2A24242A2A2A7F0000 +2169:000000007F22221408081422227F0000 +216A:000000007F2A2A2A12122A2A2A7F0000 +216B:000000007F55555525255555557F0000 +216C:000000007020202020202020227E0000 +216D:000000001A26404040404040221C0000 +216E:00000000782422222222222224780000 +216F:0000000063223636362A2A2A2A7F0000 +2170:000000000808000818080808081C0000 +2171:00000000242400246C242424247E0000 +2172:000000002A2A002A7E2A2A2A2A7F0000 +2173:000000002020003B69292926267F0000 +2174:000000000000007722222214083E0000 +2175:000000000202005A4E4A4A32327F0000 +2176:00000000050500555F555525257F0000 +2177:00000000151500B5BFB5555555FF0000 +2178:000000002020002A6A24242A2A7F0000 +2179:00000000000000772214081422770000 +217A:000000000202002A2E12122A2A7F0000 +217B:00000000050500555F252555557F0000 +217C:000000000818080808080808081C0000 +217D:000000000000001A26404040221C0000 +217E:000000000206021A26424242261B0000 +217F:000000000000742A2A2A2A2A2A7F0000 +2180:000000003E49494949494949493E0000 +2181:000000007824322A2A2A2A3224780000 +2182:000000000000000007C00920139015501550155015501390092007C000000000 +2183:000000003C42420202020242423C0000 +2184:0000000000003C4202020202423C0000 +2185:000000003A46808080808080463A0202 +2186:00000000101010101010925438100000 +2187:000000F8467149655565497146F80000 +2188:0000000000000FE0311847C44924539455545394492447C431180FE000000000 +2189:0000000022525458281C1224424C0000 +218A:000000007E02020408304042423C0000 +218B:000000003C42424040384042423C0000 +218C:00007FFE61EE7DCE61EE6FEE61C67FFE7FFE73C66DBE73BE6DBE73C67FFE0000 +218D:00007FFE61EE7DCE61EE6FEE61C67FFE7FFE738E6DB673B66DB6738E7FFE0000 +218E:00007FFE61EE7DCE61EE6FEE61C67FFE7FFE73866DBE738E6DBE73867FFE0000 +218F:00007FFE61EE7DCE61EE6FEE61C67FFE7FFE73866DBE738E6DBE73BE7FFE0000 +2190:0000000000000010207F201000000000 +2191:0000081C2A0808080808080808080808 +2192:000000000000000804FE040800000000 +2193:08080808080808080808082A1C080000 +2194:000000000000002442FF422400000000 +2195:0000081C2A0808080808082A1C080000 +2196:00000000007860504804020000000000 +2197:00000000001E060A1220400000000000 +2198:00000000004020120A061E0000000000 +2199:00000000000002044850607800000000 +219A:0000000000040414247F241404040000 +219B:000000000020202824FE242820200000 +219C:0000000000000000000000003800301C28220441038000000000000000000000 +219D:000000000000000000000000001C380C4414822001C000000000000000000000 +219E:000000000000002448FF482400000000 +219F:0000081C2A081C2A0808080808080808 +21A0:000000000000002412FF122400000000 +21A1:0808080808080808082A1C082A1C0800 +21A2:0000000000000011227C221100000000 +21A3:0000000000000088443E448800000000 +21A4:0000000000000012227E221200000000 +21A5:0000081C2A08080808080808083E0000 +21A6:0000000000000048447E444800000000 +21A7:00003E08080808080808082A1C080000 +21A8:0000081C2A08080808082A1C083E0000 +21A9:0000000000000211217E201000000000 +21AA:0000000000002044423F020400000000 +21AB:0000000000000215257E241400000000 +21AC:0000000000002054523F121400000000 +21AD:00000000000000245AE7422400000000 +21AE:000000000008082C4AFF4A2C08080000 +21AF:00004040404858684808082A1C080000 +21B0:00000000000000102078241404040404 +21B1:0000000000000008041E242820202020 +21B2:04040404040404142478201000000000 +21B3:2020202020202028241E040800000000 +21B4:000000000000000000FC04150E040000 +21B5:0404040404040414247C201000000000 +21B6:0000000000001E21A971200000000000 +21B7:0000000000007884958E040000000000 +21B8:0000007E007860504804020000000000 +21B9:00000050607E6050000A067E060A0000 +21BA:000000000000002E4C4A42423C000000 +21BB:0000000000000074325242423C000000 +21BC:0000000000000010207F000000000000 +21BD:0000000000000000007F201000000000 +21BE:0000080C0A0808080808080808080808 +21BF:00000818280808080808080808080808 +21C0:000000000000000804FE000000000000 +21C1:000000000000000000FE040800000000 +21C2:08080808080808080808080A0C080000 +21C3:08080808080808080808082818080000 +21C4:00000008047E04080010207E20100000 +21C5:00002474AC242424242424352E240000 +21C6:00000010207E20100008047E04080000 +21C7:00000010207E20100010207E20100000 +21C8:0000247EA52424242424242424240000 +21C9:00000008047E04080008047E04080000 +21CA:0000242424242424242424A57E240000 +21CB:00000000000010207E007E0408000000 +21CC:00000000000008047E007E2010000000 +21CD:00000000000808287E887E2808080000 +21CE:000000000008082C7E897E2C08080000 +21CF:00000000001010147E117E1410100000 +21D0:00000000000000103E403E1000000000 +21D1:00000814361414141414141414140000 +21D2:00000000000000087C027C0800000000 +21D3:00001414141414141414143614080000 +21D4:00000000000000247E817E2400000000 +21D5:00000814361414141414143614080000 +21D6:0000000000785068540A040000000000 +21D7:00000000001E0A162A50200000000000 +21D8:000000000020502A160A1E0000000000 +21D9:0000000000040A546850780000000000 +21DA:000000000000103E40FE403E10000000 +21DB:000000000000087C027F027C08000000 +21DC:000000000000002042F5482000000000 +21DD:000000000000000442AF120400000000 +21DE:0000081C2A0808083E083E0808080808 +21DF:08080808083E083E0808082A1C080000 +21E0:00000000000000102077201000000000 +21E1:0000081C2A0808000808080800080808 +21E2:000000000000000402EF020400000000 +21E3:08080800080808080008082A1C080000 +21E4:0000000000000050607F605000000000 +21E5:000000000000000A06FE060A00000000 +21E6:00000000000010305F815F3010000000 +21E7:000008142277141414141414141C0000 +21E8:000000000000080CFA81FA0C08000000 +21E9:00001C14141414141414772214080000 +21EA:0000081422771414141C001C141C0000 +21EB:000008142263222222222263417F0000 +21EC:000008143E63222222222263417F0000 +21ED:0000081C2A6B2A2A2A2A2A6B497F0000 +21EE:0008142A7722632222222222223E0000 +21EF:0008142A7722632222222263417F0000 +21F0:000000000000086C7A417A6C08000000 +21F1:00000000007F405C5854424140400000 +21F2:000000000001014121150D1D017F0000 +21F3:00000814361414141414143614080000 +21F4:000000000000000000000000000007080884FFFE088407080000000000000000 +21F5:0000242E35242424242424AC74240000 +21F6:0000000402FF020402FF020402FF0204 +21F7:000000000000002444FF442400000000 +21F8:000000000000002422FF222400000000 +21F9:0000000000000000000000000000092011103FF8111009200000000000000000 +21FA:0000000000000000000000000000114021407FFF214011400000000000000000 +21FB:000000000000000000000000000002880284FFFE028402880000000000000000 +21FC:0000000000000000000000000000129022887FFC228812900000000000000000 +21FD:000000000000002060BF602000000000 +21FE:000000000000000406FD060400000000 +21FF:0000000000000000000000000000081018182FF4181808100000000000000000 +2200:0000000041413E222214141408080000 +2201:00000000182424202020202424180000 +2202:000000001C2202021E22424444380000 +2203:000000007E0202027E020202027E0000 +2204:000004047E0A0A127E122222227E4040 +2205:000000000000001D22454951225C0000 +2206:000000000808141414222222417F0000 +2207:000000007F4122222214141408080000 +2208:000000000000003E40407E40403E0000 +2209:000000000004043E48487E50503E2020 +220A:0000000000000000003E407E403E0000 +220B:000000000000007C02027E02027C0000 +220C:000000000004047C0A0A7E12127C2020 +220D:0000000000000000007C027E027C0000 +220E:000000007E7E7E7E7E7E7E7E7E7E0000 +220F:000000007F2222222222222222227700 +2210:00000000772222222222222222227F00 +2211:000000007E4220100804081020427E00 +2212:0000000000000000007E000000000000 +2213:000000007F000808087F080808000000 +2214:0000081C08000808087F080808000000 +2215:00000000020404080810102020400000 +2216:00000000402020101008080404020000 +2217:000000000000082A1C081C2A08000000 +2218:00000000000000001824241800000000 +2219:0000000000000000183C3C1800000000 +221A:00000704040404047414140C0C040400 +221B:00006714641464047414140C0C040400 +221C:00005754741414047414140C0C040400 +221D:00000000000000364848360000000000 +221E:00000000000000364949360000000000 +221F:000000000000004040404040407E0000 +2220:000000000000000002040810207E0000 +2221:000000000000000002140814247E0400 +2222:000000000000000A0C1464140C0A0000 +2223:00000000181818181818181818180000 +2224:0000000018181A1C1818385818180000 +2225:00000000242424242424242424240000 +2226:00000000242426242C34246424240000 +2227:00000000000008081414222241410000 +2228:00000000000041412222141408080000 +2229:0000000000003C424242424242420000 +222A:000000000000424242424242423C0000 +222B:00060A08080808080808080808283000 +222C:000A1514141414141414141414546800 +222D:00152A2A2A2A2A2A2A2A2A2A2AAAD400 +222E:00060A0808081C2A2A1C080808283000 +222F:000A151414143E55553E141414546800 +2230:00152A2A2A7EABABAB7E2A2A2AAAD400 +2231:00060A0808081D2B2F08080808283000 +2232:00060A0808081D2B2F2A1C0808283000 +2233:00060A0808085C6A7A2A1C0808283000 +2234:00000000000018180000006666000000 +2235:00000000000066660000001818000000 +2236:00000000000018180000001818000000 +2237:00000000000066660000006666000000 +2238:0000000000001818007E000000000000 +2239:00000000000006060078000606000000 +223A:0000000000006666007E006666000000 +223B:0000000000181800324C001818000000 +223C:0000000000000000324C000000000000 +223D:00000000000000004C32000000000000 +223E:00000000000000003249260000000000 +223F:00000000000000304849090600000000 +2240:00000000001008080810101008000000 +2241:0000000000000404083A541020200000 +2242:00000000000000007E0000324C000000 +2243:00000000000000324C00007E00000000 +2244:000000040408083A5410107E20204040 +2245:00000000324C00007E00007E00000000 +2246:00000000324C02047E08107E20400000 +2247:000004043A4C08107E10207E20404000 +2248:00000000000000324C00324C00000000 +2249:000000000004043A4C103A5420200000 +224A:0000000000324C00324C007E00000000 +224B:0000000000324C00324C00324C000000 +224C:000000004C3200007E00007E00000000 +224D:000000000000423C00003C4200000000 +224E:00000000000018660000661800000000 +224F:00000000000000186600007E00000000 +2250:00000000181800007E00007E00000000 +2251:0000001818007E00007E001818000000 +2252:0000006060007E00007E000606000000 +2253:0000000606007E00007E006060000000 +2254:000000000000005E00005E0000000000 +2255:000000000000007A00007A0000000000 +2256:000000000000007E24247E0000000000 +2257:00000018242418007E00007E00000000 +2258:000000003C4200007E00007E00000000 +2259:00000018244200007E00007E00000000 +225A:00000042241800007E00007E00000000 +225B:0000083E1C1400007E00007E00000000 +225C:00000814223E00007E00007E00000000 +225D:0000121476547400007E00007E000000 +225E:00000068545454007E00007E00000000 +225F:0030480810100010007E00007E000000 +2260:00000000000002047E08107E20400000 +2261:000000000000007E007E007E00000000 +2262:000000000002047E087E107E20400000 +2263:0000000000007E007E007E007E000000 +2264:0000000000000618601806007E000000 +2265:0000000000006018061860007E000000 +2266:0000000618601806007E00007E000000 +2267:0000006018061860007E00007E000000 +2268:0000000618601806047E08107E204000 +2269:0000006018061862047E08107E204000 +226A:00000000000912244890482412090000 +226B:00000000009048241209122448900000 +226C:00000000241818242424241818240000 +226D:000000020204857E08107EA120404000 +226E:00000008080C18103050303018242000 +226F:00000000084828101814181020602020 +2270:0000000002020E1468181E107E202000 +2271:0000000008087018162870207E404000 +2272:000000000000061860180600324C0000 +2273:000000000000601806186000324C0000 +2274:0000000004040E1868181E103A642020 +2275:000000000808781816187010326C2020 +2276:00000000061860180660180618600000 +2277:00000000601806186006186018060000 +2278:000002020E1468181E70282E50608080 +2279:00000404681816187016386038264040 +227A:00000000000202041860180402020000 +227B:00000000004040201806182040400000 +227C:0000000000020204186018641A040200 +227D:00000000004040201806182658204000 +227E:000000000002020418601804669A0000 +227F:00000000004040201806182059660000 +2280:0000000004060A0C0870181422220000 +2281:0000000004444828180E183050602000 +2282:0000000000003E404040403E00000000 +2283:0000000000007C020202027C00000000 +2284:0000000004043E485050603E40400000 +2285:0000000002027C0A0A12127C20200000 +2286:0000000000003E404040403E007E0000 +2287:0000000000007C020202027C007E0000 +2288:0000000004043E484850503E207E4000 +2289:0000000002027C0A0A12127C207E4000 +228A:0000000000003E404040403E047E1000 +228B:0000000000007C020202027C087E2000 +228C:000000004242424A527E524A423C0000 +228D:0000000042424242425A5A42423C0000 +228E:0000000042424252527A5252423C0000 +228F:0000000000007E404040407E00000000 +2290:0000000000007E020202027E00000000 +2291:0000000000007E404040407E007E0000 +2292:0000000000007E020202027E007E0000 +2293:0000000000007E424242424200000000 +2294:00000000000042424242427E00000000 +2295:0000000000001C2A497F492A1C000000 +2296:0000000000001C22417F41221C000000 +2297:0000000000001C22554955221C000000 +2298:0000000000001C22454951221C000000 +2299:0000000000001C22414941221C000000 +229A:0000000000001C22495549221C000000 +229B:0000000000001C22495D49221C000000 +229C:0000000000001C225D415D221C000000 +229D:0000000000001C22415D41221C000000 +229E:0000000000007F49497F49497F000000 +229F:0000000000007F41417F41417F000000 +22A0:0000000000007F63554955637F000000 +22A1:0000000000007F41414941417F000000 +22A2:0000000000004040407E404040000000 +22A3:0000000000000202027E020202000000 +22A4:0000000000007F080808080808000000 +22A5:0000000000000808080808087F000000 +22A6:0000000000202020203C202020200000 +22A7:00000000002020203C203C2020200000 +22A8:00000000004040407E407E4040400000 +22A9:0000000000505050505E505050500000 +22AA:00000000005454545457545454540000 +22AB:00000000005050505E505E5050500000 +22AC:0000000000404048487E484840400000 +22AD:00000000004048487E487E4848400000 +22AE:0000000000505054545E545450500000 +22AF:00000000005054545E545E5454500000 +22B0:00000000000C020418601804020C0000 +22B1:00000000003040201806182040300000 +22B2:00000000000000061A621A0600000000 +22B3:00000000000000605846586000000000 +22B4:00000000000000061A621A06007E0000 +22B5:000000000000006058465860007E0000 +22B6:0000000000000000000000000000300C481E4FFE481E300C0000000000000000 +22B7:0000000000000000000000000000300C78127FF27812300C0000000000000000 +22B8:0000000000000000000000000000003800443FC4004400380000000000000000 +22B9:00000000000008080063000808000000 +22BA:000000003E0808080808080808080000 +22BB:000000000000002222141408003E0000 +22BC:0000000000003E000814142222000000 +22BD:0000000000003E002222141408000000 +22BE:000000000000004040407848487E0000 +22BF:000000000000000002060A12227E0000 +22C0:00000000081414142222224141410000 +22C1:00000000414141222222141414080000 +22C2:000000003C4242424242424242420000 +22C3:000000004242424242424242423C0000 +22C4:00000000000000081422140800000000 +22C5:00000000000000001818000000000000 +22C6:00000000000000083E1C140000000000 +22C7:0000000000001842247E244218000000 +22C8:00000000000041635549556341000000 +22C9:00000000000041625448546241000000 +22CA:00000000000041231509152341000000 +22CB:00000000000000201008142200000000 +22CC:00000000000000020408142200000000 +22CD:00000000000000004C3200007E000000 +22CE:00000000000041222214141408000000 +22CF:00000000000008141414222241000000 +22D0:0000000000003E404E50504E403E0000 +22D1:0000000000007C02720A0A72027C0000 +22D2:0000000000003E414955555555550000 +22D3:000000000000555555555549413E0000 +22D4:000000000808081C2A2A2A2A2A2A0000 +22D5:00000000242424247E24247E24240000 +22D6:00000000000204081022100804020000 +22D7:00000000004020100844081020400000 +22D8:0000000000000000000002220444088811102220111008880444022200000000 +22D9:0000000000000000000044402220111008880444088811102220444000000000 +22DA:00000618601806007E00601806186000 +22DB:00006018061860007E00061860180600 +22DC:0000000000007E000618601806000000 +22DD:0000000000007E006018061860000000 +22DE:0000000002041A641860180402020000 +22DF:00000000402058261806182040400000 +22E0:0000000414162ACC1868181412222020 +22E1:000000020A4A442B1816183060602020 +22E2:0000000202047E484850507E207E4000 +22E3:0000000202047E0A0A12127E207E4000 +22E4:0000000000007E404040407E087E2000 +22E5:0000000000007E020202027E087E2000 +22E6:00000000000618601806043A5C204000 +22E7:00000000006018061862043A5C204000 +22E8:00000002020418601804063A5C204000 +22E9:00004040201806182042443A5C204000 +22EA:000000000002020E166A1A1E10202000 +22EB:00000000000404685C56687020404000 +22EC:000000000002020E166A1A1E107E2000 +22ED:00000000000404685C566870207E4000 +22EE:00000000181800001818000018180000 +22EF:0000000000000000DBDB000000000000 +22F0:000000000303000018180000C0C00000 +22F1:00000000C0C000001818000003030000 +22F2:0000000000000000000007F00800100010007FF010001000080007F000000000 +22F3:0000000000000000000007F00800100010101FF010101000080007F000000000 +22F4:0000000000003E40427E42403E000000 +22F5:0000000001800180000007F00800100010001FF010001000080007F000000000 +22F6:0000000000001FF0000007F00800100010001FF010001000080007F000000000 +22F7:000000007E003E40407E40403E000000 +22F8:0000000000003E40407E40403E007E00 +22F9:000000000000000000001FC0200040007FC040007FC0400020001FC000000000 +22FA:000000000000000000003F800040002000203FF80020002000403F8000000000 +22FB:000000000000000000003F800040002020203FE02020002000403F8000000000 +22FC:0000000000007C02427E42027C000000 +22FD:0000000000003FE000003F800040002000203FE00020002000403F8000000000 +22FE:000000007E007C02027E02027C000000 +22FF:000000000000000000001FF81000100010001FF81000100010001FF800000000 +2300:0000000000000000000807D0082010501090111012101410082017C020000000 +2301:00000000000000009058341200000000 +2302:000000000000182442424242427E0000 +2303:00000000081422000000000000000000 +2304:00000000000000000000002214080000 +2305:000000003E0008142200000000000000 +2306:000000003E003E000814220000000000 +2307:00000010080408100804081008040000 +2308:00001E10101010101010101010100000 +2309:00007808080808080808080808080000 +230A:000010101010101010101010101E0000 +230B:00000808080808080808080808780000 +230C:00000000000000000007080808000000 +230D:00000000000000000070080808000000 +230E:00000000000008080807000000000000 +230F:00000000000008080870000000000000 +2310:000000000000000000007E4040400000 +2311:000000000000413E2222223E41000000 +2312:000000000000000000001C2241410000 +2313:000000000000000000001C22417F0000 +2314:00000000000000001C22412214080000 +2315:000000000000001C22414141225C8000 +2316:00000080008003E004900888108410047E3F100410840888049003E000800080 +2317:00000000002424FF2424FF2424000000 +2318:00000000000022553E143E5522000000 +2319:0000000000004040407E000000000000 +231A:0000282828283854929B824438282828 +231B:000000007E242424181824243C7E0000 +231C:00784040400000000000000000000000 +231D:001E0202020000000000000000000000 +231E:00000000000000000000004040407800 +231F:00000000000000000000000202021E00 +2320:00000000060A08080808080808080808 +2321:08080808080808080808283000000000 +2322:0000000000000000003C420000000000 +2323:0000000000000000423C000000000000 +2324:00000000000000007708142200000000 +2325:00000000000000006710080700000000 +2326:00000000000000FCAA91AAFC00000000 +2327:000000000000007F5549557F00000000 +2328:000000000000007E7E7E003C00000000 +2329:0000000800080010001000200020004000800040002000200010001000080008 +232A:0000200020001000100008000800040002000400080008001000100020002000 +232B:000000000000003F5589553F00000000 +232C:00000000008001400220049008480A280A080A28084804900220014000800000 +232D:00000000000000000081010201C40224041804100C10122011C0204040800000 +232E:000000000000000003C004200810100810FE110812080A1004202BC030003800 +232F:0000000000000000000000000FF0000000007FFE000000000FF0000000000000 +2330:000004020C061E0F080410081008201020104020402080408040FFC000000000 +2331:0000000000001F00248044408420842487FF84248420444024801F0000000000 +2332:000000000000000000003C0023802070200C7FFE200C207023803C0000000000 +2333:0000000000000000000000000000000060005C0043804070400C7FFE00000000 +2334:00000000000000000000000040024002400240024002400240027FFE00000000 +2335:0000000000000000000000004001200210040808041002200140008000000000 +2336:000000007F08080808080808087F0000 +2337:000000003E22222222222222223E0000 +2338:0000007F4141417F41417F41417F0000 +2339:0000007F414949417F414949417F0000 +233A:0000007F4149556341635549417F0000 +233B:0000007F4141414955554941417F0000 +233C:0000007F41415D634141635D417F0000 +233D:00000008081C2A4949492A1C08080000 +233E:00000000001C22495549221C00000000 +233F:000000000204040808FF102020400000 +2340:000000004020201010FF080404020000 +2341:0000007F4143454549515161417F0000 +2342:0000007F4161515149454543417F0000 +2343:0000007F4141475961594741417F0000 +2344:0000007F4141714D434D7141417F0000 +2345:00000008080808287F28080808080000 +2346:000000080808080A7F0A080808080000 +2347:0000007F414149517F514941417F0000 +2348:0000007F414149457F454941417F0000 +2349:000000000000005C22514945221D0000 +234A:00000000080808080808087F007F0000 +234B:000000000808081C1C2A2A3E08080000 +234C:00007F414141416363555549417F0000 +234D:00007F41414949555563637F417F0000 +234E:000000000808081C2A2A1C08087F0000 +234F:00000000081C2A087F08080808080000 +2350:00007F495D6B494949494949497F0000 +2351:000000003E003E080808080808080000 +2352:0000000008083E2A2A1C1C0808080000 +2353:00007F414955556363414141417F0000 +2354:00007F41417F636355554949417F0000 +2355:000000007F08081C2A2A1C0808080000 +2356:0000000808080808087F082A1C080000 +2357:00007F494949494949496B5D497F0000 +2358:000000000808080000000000003E0000 +2359:00000000000808141422223E003E0000 +235A:000000000008142241221408003E0000 +235B:000000000000001824241800003E0000 +235C:00000000001C22414141221C007F0000 +235D:000000001C2249554941414141410000 +235E:00007F414949494141414141417F0000 +235F:000000001C22497F5D55221C00000000 +2360:00007F414149494141494941417F0000 +2361:002424007F0808080808080808080000 +2362:00242400003E22221414080800000000 +2363:0024240000083E1C1400000000000000 +2364:00242400000000182424180000000000 +2365:002424000000001C22414141221C0000 +2366:00000000494949494949492A1C080000 +2367:00000008081F28484848281F08080000 +2368:00242400000000324C00000000000000 +2369:00242400402010080402040810204000 +236A:000000003C0000180808100000000000 +236B:00000000003E22221414394E00000000 +236C:000000001C222222336E2222221C0000 +236D:0000000008080808083A4C0808080000 +236E:000000001818000018080810003E0000 +236F:00007F4143457F497F516141417F0000 +2370:00007F414955554549494149417F0000 +2371:00000000324C00222214140800000000 +2372:0000000000324C000814142222000000 +2373:00000000000000180808080808060000 +2374:0000000000003C4242424242625C4040 +2375:00000000000014224949494949360000 +2376:0000000000324A4444444A32007E0000 +2377:00000000003E40407C40403E007E0000 +2378:000000000018080808080806001E0000 +2379:000000000022414949494936007F0000 +237A:000000000000324A444444444A320000 +237B:000000000000000200040008001001FC00400080410022001400080000000000 +237C:000000000A000C00080018002800180008000C000A000C004FFE500060007800 +237D:0000000000000000000000000000000000000000783C082008200FE000000000 +237E:000000000000000003C004200810100810081FF80420042004201C3800000000 +237F:000008080808081C3E1C080808080000 +2380:00000038043C44443A00824428100000 +2381:000000000000000000000000380004003C00440044003A5400007FFC00000000 +2382:000000000000000000000000387004083C78448844883A7400007EFC00000000 +2383:0000000000000000400420081390004073DC0440145023A84004000000000000 +2384:0000000000000000000000003FF02108220422042204220421083FF000000000 +2385:0000000000000000010001001D701110111011101110111011101D7001000100 +2386:00000100028004400820121003087E8440427E84030812100820044002800100 +2387:00000000000000000000000000000020003000E801300220040078FE00000000 +2388:00000100010023881D701930155023882388155019301D702388010001000000 +2389:000000000F8030604010401080088008F078888888884510451032600F800000 +238A:000000000F80306040107FF0A02890489048888888884510451032600F800000 +238B:0000000001807C6048105010680844080208810880884050401030600F800000 +238C:000000000000000007E0081010087C0828081008381C44224422381C00000000 +238D:000000000000000007E0042004200420042004200420042004203C3C00000000 +238E:000000000000000001FC021004200420042004200420042008403F8000000000 +238F:000000000000000000001FF00280044008201010082004400280010000000000 +2390:00000000000000000000010002800440082010100820044002801FF000000000 +2391:000000000000000000001FF00280044008201FF0082004400280010000000000 +2392:0000000000000000000001000280044008201FF00820044002801FF000000000 +2393:000000000000000000000000000000007FFC0000739C00000000000000000000 +2394:0000000000000000000007E0081010082004400220041008081007E000000000 +2395:00007F414141414141414141417F0000 +2396:0000000000007C7C7878707060604000 +2397:00006DB040104FFC48044A044E044BE450244BE44E047A0408040FFC00000000 +2398:00007FF040104EDC4804490449845F4050245F444980790408040CDC00000000 +2399:000001E0032005200F20082038384824882288228FE2800240043FF800000000 +239A:000000000000000000001FF020284244449449245244448428081FF000000000 +239B:000E1830303030303030303030303030 +239C:30303030303030303030303030303030 +239D:3030303030303030303030303030180E +239E:0070180C0C0C0C0C0C0C0C0C0C0C0C0C +239F:0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C +23A0:0C0C0C0C0C0C0C0C0C0C0C0C0C0C1870 +23A1:003E3030303030303030303030303030 +23A2:30303030303030303030303030303030 +23A3:3030303030303030303030303030303E +23A4:007C0C0C0C0C0C0C0C0C0C0C0C0C0C0C +23A5:0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C +23A6:0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C7C +23A7:00060C18181818181818181818181818 +23A8:18181818181810204020101818181818 +23A9:18181818181818181818181818180C06 +23AA:18181818181818181818181818181818 +23AB:00603018181818181818181818181818 +23AC:18181818181808040204081818181818 +23AD:18181818181818181818181818183060 +23AE:08080808080808080808080808080808 +23AF:000000000000000000FF000000000000 +23B0:060C1818181818181818181818183060 +23B1:60301818181818181818181818180C06 +23B2:00000000000000007FFE300E3006180218000C000C0006000600030003000180 +23B3:018003000300060006000C000C00180018023006300E7FFE0000000000000000 +23B4:00000000000000007FFE40024002000000000000000000000000000000000000 +23B5:0000000000000000000000000000000000000000000000000000400240027FFE +23B6:000000000000000000000000400240027FFE00007FFE40024002000000000000 +23B7:08080808080808086828281818080800 +23B8:80808080808080808080808080808080 +23B9:01010101010101010101010101010101 +23BA:FF000000000000000000000000000000 +23BB:00000000FF0000000000000000000000 +23BC:0000000000000000000000FF00000000 +23BD:000000000000000000000000000000FF +23BE:003F2020202020202020202020202000 +23BF:00202020202020202020202020203F00 +23C0:00000100010003800D601110111021082108111011100D600380010001000000 +23C1:0000FFFF010003800D601110111021082108111011100D600380010001000000 +23C2:00000100010003800D601110111021082108111011100D6003800100FFFF0000 +23C3:0000010001000380038005400540092009201110111021083FF8010001000000 +23C4:0000FFFF01000380038005400540092009201110111021083FF8010001000000 +23C5:0000010001000380038005400540092009201110111021083FF80100FFFF0000 +23C6:0000010001000100010001001D00230001880170010001000100010001000000 +23C7:0000FFFF01000100010001001D00230001880170010001000100010001000000 +23C8:0000010001000100010001001D002300018801700100010001000100FFFF0000 +23C9:0000FFFF01000100010001000100010001000100010001000100010001000000 +23CA:00000100010001000100010001000100010001000100010001000100FFFF0000 +23CB:00FC0404040404040404040404040400 +23CC:0004040404040404040404040404FC00 +23CD:00000080793C42044404400440044004400440044004400440047FFC00000000 +23CE:00000000003E00220022002204220C42178220024004200817F00C0004000000 +23CF:00000000000010387CFE00FEFEFE0000 +23D0:08080808080808080808080808080808 +23D1:00000000000000008244380000000000 +23D2:000000000000FE008244380000000000 +23D3:000000000000000082443800FE000000 +23D4:000000000000000000000000FFFE000082824444383800000000000000000000 +23D5:000000000000000000000000000000008282444438380000FFFE000000000000 +23D6:00000000000000000000000000000000418222441C3800000000000000000000 +23D7:0000000000000000000200020002000200027FFE000000000000000000000000 +23D8:0000000000000000400240024002400240027FFE000000000000000000000000 +23D9:0000000000000000410241024102410241027FFE000000000000000000000000 +23DA:08080808080808080808087F001C0008 +23DB:0000000000000000000000001FF810081008FFFF100810081FF8000000000000 +23DC:000000000000000000000000000000000000000007E0381C4002800100000000 +23DD:0000000080014002381C07E00000000000000000000000000000000000000000 +23DE:000000000000000000000000000000000000010002803C784004800200000000 +23DF:00000000800240043C7802800100000000000000000000000000000000000000 +23E0:00000000000000000000000000000000000000000FF010082004400200000000 +23E1:000000004002200410080FF00000000000000000000000000000000000000000 +23E2:000000000000000000007FC040204020401040104008400840047FFC00000000 +23E3:00000000008001400220041009C80A280A280A2809C804100220014000800000 +23E4:0000000000000000000000000000000000007FFE000000000000000000000000 +23E5:000000000000000000000000000000000FFC10081008201020107FE000000000 +23E6:0000000000000000000000001800240042007FFC008400480030000000000000 +23E7:000000002400240022002206A91871A021C003E001C002A00410080810040000 +23E8:0000000000000000246A2A2A2A240000 +23E9:00000000000000000000208030C038E03CF03EF83CF038E030C0208000000000 +23EA:00000000000000000000020806180E381E783EF81E780E380618020800000000 +23EB:00000000000000000100038007C00FE01FF000000100038007C00FE01FF00000 +23EC:00000000000000001FF00FE007C00380010000001FF00FE007C0038001000000 +23ED:000000000000000000004104618471C479E47DF479E471C46184410400000000 +23EE:000000000000000000004104430C471C4F3C5F7C4F3C471C430C410400000000 +23EF:00000000000000000000104818481C481E481F481E481C481848104800000000 +23F0:00000100193037D82828111021082108210822082408101008200FE01C700000 +23F1:00000300030007D808381110210821082108200820081010082007C000000000 +23F2:00000000000007C008201010240822082108200820081010082007C000000000 +23F3:000000007FFC1010101012900D6006C0028006C0082011101AB015507FFC0000 +23F4:0000000000000000004000C001C003C007C00FC007C003C001C000C000400000 +23F5:000000000000000008000C000E000F000F800FC00F800F000E000C0008000000 +23F6:0000000000000000000000000100038007C00FE01FF03FF80000000000000000 +23F7:0000000000000000000000003FF81FF00FE007C0038001000000000000000000 +23F8:0000000000000660066006600660066006600660066006600660066000000000 +23F9:00000000000000001FF81FF81FF81FF81FF81FF81FF81FF81FF81FF800000000 +23FA:000000000000000007E00FF01FF81FF81FF81FF81FF81FF80FF007E000000000 +23FB:01800180018001801998399C318C718E61866186700E300C381C1FF80FF003C0 +23FC:000007E01FF83C3C781E718E61866186618661866186718E381C1FF80FF003C0 +23FD:018003C003C003C003C003C003C003C003C003C003C003C003C003C003C00180 +23FE:0400080018003800380078007800780078007C003C003E001F000F8007E001F0 +23FF:000000000000001C007801940624182260221822062401940078001C00000000 +2400:000000000000000000004A506A505A50499E0000000000000000000000000000 +2401:0000000000000000000039924252325E0A527192000000000000000000000000 +2402:000000000000000000003BA44124311809247124000000000000000000000000 +2403:000000000000000000007BA44124791841247924000000000000000000000000 +2404:0000000000000000000079BE42487A4842487988000000000000000000000000 +2405:000000000000000000007A4C42527B5242D67A4E000000000000000000000000 +2406:0000000000000000000031A44A287A304A2849A4000000000000000000000000 +2407:0000000000000000000073D04A1073D04A1073DE000000000000000000000000 +2408:000000000000000000001E3811401E3011081E70000000000000000000000000 +2409:0000000000000000000022F822203E2022202220000000000000000000000000 +240A:0000000000000000000020F8208020F820803E80000000000000000000000000 +240B:0000000000000000000022F82220222014200820000000000000000000000000 +240C:000000000000000000003EF820803EF820802080000000000000000000000000 +240D:000000000000000000001EF0208820F020901E88000000000000000000000000 +240E:000000000000000000001E7020881C8802883C70000000000000000000000000 +240F:000000000000000000001EF820201C2002203CF8000000000000000000000000 +2410:00000000000000000000391C2510251C251039DC000000000000000000000000 +2411:0000000000000000000071884A184A084A08719C000000000000000000000000 +2412:0000000000000000000071984A044A084A10719C000000000000000000000000 +2413:0000000000000000000071984A044A184A047198000000000000000000000000 +2414:0000000000000000000071844A0C4A144A1C7184000000000000000000000000 +2415:0000000000000000000049926A546A585BD44A52000000000000000000000000 +2416:000000000000000000003452429A311609127112000000000000000000000000 +2417:000000000000000000007BB84124793841247938000000000000000000000000 +2418:00000000000000000000332444B447AC44A434A4000000000000000000000000 +2419:000000000000000000003E8820D83EA820883E88000000000000000000000000 +241A:000000000000000000003A5C4252325C0A52719C000000000000000000000000 +241B:0000000000000000000079CE4210799040507B8E000000000000000000000000 +241C:000000000000000000001E7010801E60101010E0000000000000000000000000 +241D:000000000000000000000E701080166012100EE0000000000000000000000000 +241E:000000000000000000001C7012801C60141012E0000000000000000000000000 +241F:0000000000000000000012701280126012100CE0000000000000000000000000 +2420:000000000000000000003B80424033800A007200000000000000000000000000 +2421:0000000000000000000073D04A104BD04A1073DE000000000000000000000000 +2422:00000000141810305C121212121C0000 +2423:000000000000000000000000427E0000 +2424:0000000048685848001010101E000000 +2425:0000000000010A152A54284000000000 +2426:000000003C4242402010100010100000 +2427:00007FFE61B67DB661866FF661F67FFE7FFE61867DF661EE6FDE61DE7FFE0000 +2428:00007FFE61B67DB661866FF661F67FFE7FFE61CE7DB661CE6FB661CE7FFE0000 +2429:00007FFE61B67DB661866FF661F67FFE7FFE61CE7DB661C66FF661CE7FFE0000 +242A:00007FFE61B67DB661866FF661F67FFE7FFE61867DB661866FB661B67FFE0000 +242B:00007FFE61B67DB661866FF661F67FFE7FFE618E7DB6618E6FB6618E7FFE0000 +242C:00007FFE61B67DB661866FF661F67FFE7FFE61C67DBE61BE6FBE61C67FFE0000 +242D:00007FFE61B67DB661866FF661F67FFE7FFE618E7DB661B66FB6618E7FFE0000 +242E:00007FFE61B67DB661866FF661F67FFE7FFE61867DBE618E6FBE61867FFE0000 +242F:00007FFE61B67DB661866FF661F67FFE7FFE61867DBE618E6FBE61BE7FFE0000 +2430:00007FFE61B67DB661866FF661F67FFE7FFE63CE7DB671B67DB663CE7FFE0000 +2431:00007FFE61B67DB661866FF661F67FFE7FFE63EE7DCE71EE7DEE63C67FFE0000 +2432:00007FFE61B67DB661866FF661F67FFE7FFE63867DF671867DBE63867FFE0000 +2433:00007FFE61B67DB661866FF661F67FFE7FFE638E7DF671C67DF6638E7FFE0000 +2434:00007FFE61B67DB661866FF661F67FFE7FFE63B67DB671867DF663F67FFE0000 +2435:00007FFE61B67DB661866FF661F67FFE7FFE63867DBE71867DF663867FFE0000 +2436:00007FFE61B67DB661866FF661F67FFE7FFE63CE7DBE718E7DB663CE7FFE0000 +2437:00007FFE61B67DB661866FF661F67FFE7FFE63867DF671EE7DDE63DE7FFE0000 +2438:00007FFE61B67DB661866FF661F67FFE7FFE63CE7DB671CE7DB663CE7FFE0000 +2439:00007FFE61B67DB661866FF661F67FFE7FFE63CE7DB671C67DF663CE7FFE0000 +243A:00007FFE61B67DB661866FF661F67FFE7FFE63867DB671867DB663B67FFE0000 +243B:00007FFE61B67DB661866FF661F67FFE7FFE638E7DB6718E7DB6638E7FFE0000 +243C:00007FFE61B67DB661866FF661F67FFE7FFE63C67DBE71BE7DBE63C67FFE0000 +243D:00007FFE61B67DB661866FF661F67FFE7FFE638E7DB671B67DB6638E7FFE0000 +243E:00007FFE61B67DB661866FF661F67FFE7FFE63867DBE718E7DBE63867FFE0000 +243F:00007FFE61B67DB661866FF661F67FFE7FFE63867DBE718E7DBE63BE7FFE0000 +2440:000000000E0A0A0A0808282828380000 +2441:0000000002020202023E222222220000 +2442:0000000022222222223E080808080000 +2443:0000000008080808083E222222220000 +2444:000000003E2A2A2A08082A2A2A3E0000 +2445:0000000022362A362200000000000000 +2446:00000000000E6E6E60606E6E0E000000 +2447:000000000303031B1818D8C0C0C00000 +2448:00000000075757505050505050500000 +2449:00000000006D6D6D6D6D6D6D6D6D0000 +244A:00000000A0A050282814140A05050000 +244B:00007FFE61B67DB661866FF661F67FFE7FFE6D8E6DB6618E7DB67D8E7FFE0000 +244C:00007FFE61B67DB661866FF661F67FFE7FFE6DC66DBE61BE7DBE7DC67FFE0000 +244D:00007FFE61B67DB661866FF661F67FFE7FFE6D8E6DB661B67DB67D8E7FFE0000 +244E:00007FFE61B67DB661866FF661F67FFE7FFE6D866DBE618E7DBE7D867FFE0000 +244F:00007FFE61B67DB661866FF661F67FFE7FFE6D866DBE618E7DBE7DBE7FFE0000 +2450:00007FFE61B67DB661866FF661F67FFE7FFE61CE6FB661B67DB661CE7FFE0000 +2451:00007FFE61B67DB661866FF661F67FFE7FFE61EE6FCE61EE7DEE61C67FFE0000 +2452:00007FFE61B67DB661866FF661F67FFE7FFE61866FF661867DBE61867FFE0000 +2453:00007FFE61B67DB661866FF661F67FFE7FFE618E6FF661C67DF6618E7FFE0000 +2454:00007FFE61B67DB661866FF661F67FFE7FFE61B66FB661867DF661F67FFE0000 +2455:00007FFE61B67DB661866FF661F67FFE7FFE61866FBE61867DF661867FFE0000 +2456:00007FFE61B67DB661866FF661F67FFE7FFE61CE6FBE618E7DB661CE7FFE0000 +2457:00007FFE61B67DB661866FF661F67FFE7FFE61866FF661EE7DDE61DE7FFE0000 +2458:00007FFE61B67DB661866FF661F67FFE7FFE61CE6FB661CE7DB661CE7FFE0000 +2459:00007FFE61B67DB661866FF661F67FFE7FFE61CE6FB661C67DF661CE7FFE0000 +245A:00007FFE61B67DB661866FF661F67FFE7FFE61866FB661867DB661B67FFE0000 +245B:00007FFE61B67DB661866FF661F67FFE7FFE618E6FB6618E7DB6618E7FFE0000 +245C:00007FFE61B67DB661866FF661F67FFE7FFE61C66FBE61BE7DBE61C67FFE0000 +245D:00007FFE61B67DB661866FF661F67FFE7FFE618E6FB661B67DB6618E7FFE0000 +245E:00007FFE61B67DB661866FF661F67FFE7FFE61866FBE618E7DBE61867FFE0000 +245F:00007FFE61B67DB661866FF661F67FFE7FFE61866FBE618E7DBE61BE7FFE0000 +2460:07C0183020084104430485028102810281028102410447C42008183007C00000 +2461:07C0183020084384444484428042808281028202440447C42008183007C00000 +2462:07C0183020084384444484428042818280428442444443842008183007C00000 +2463:07C018302008408441848282848288828FC28082408440842008183007C00000 +2464:07C01830200847C4440484028402878280428042444443842008183007C00000 +2465:07C0183020084184420484028402878284428442444443842008183007C00000 +2466:07C01830200847C4404480428082808280828102410441042008183007C00000 +2467:07C0183020084384444484428442838284428442444443842008183007C00000 +2468:07C018302008438444448442844283C280428042408443042008183007C00000 +2469:07C018302008400444648C9294928492849284925F6440042008183007C00000 +246A:07C018302008400444448CC295428442844284425FF440042008183007C00000 +246B:07C018302008400444648C9294128422844284825FF440042008183007C00000 +246C:07C018302008400444648C9294128422841284925F6440042008183007C00000 +246D:07C018302008400444148C329452849284FA84125F1440042008183007C00000 +246E:07C018302008400444F48C82948284E2841284925F6440042008183007C00000 +246F:07C018302008400444748C82948284E2849284925F6440042008183007C00000 +2470:07C018302008400444F48C1294128422842284425F4440042008183007C00000 +2471:07C018302008400444648C9294928462849284925F6440042008183007C00000 +2472:07C018302008400444648C9294928472841284125F6440042008183007C00000 +2473:07C01830200840044C64929282928492889290925E6440042008183007C00000 +2474:00000000100820842184428240824082408240824082208423E4100800000000 +2475:00000000100823C424244422402240C2410242024402240427E4100800000000 +2476:00000000100823C424244422402241C2402240224422242423C4100800000000 +2477:000000001008204420C4414242424442444247E2404220442044100800000000 +2478:00000000100827E424044402440247C2402240224022242423C4100800000000 +2479:00000000100821C422044402440247C2442244224422242423C4100800000000 +247A:00000000100827E4202440224042404240424082408220842084100800000000 +247B:00000000100823C424244422442243C2442244224422242423C4100800000000 +247C:00000000100823C424244422442243E240224022402220442384100800000000 +247D:00000000400288319849A885888588858885888588858849BE31400200000000 +247E:00000000400288119831A851881188118811881188118811BE7D400200000000 +247F:00000000400288799885A885880588198821884188818881BEFD400200000000 +2480:00000000400288799885A885880588398805880588858885BE79400200000000 +2481:00000000400288099819A82988498889888988FD88098809BE09400200000000 +2482:00000000400288FD9881A881888188F98805880588058885BE79400200000000 +2483:00000000400288399841A881888188F98885888588858885BE79400200000000 +2484:00000000400289F99809A809881188118811882188218821BE21400200000000 +2485:00000000400288799885A885888588798885888588858885BE79400200000000 +2486:00000000400288799885A8858885887D8805880588058809BE71400200000000 +2487:0000000040029C31A249A2858285848588859085A085A049BE31400200000000 +2488:000000000000000001000300050001000100010001000100010007D000000000 +2489:00000000000000000780084008400040018002000400080008000FD000000000 +248A:0000000000000000078008400840004003800040004008400840079000000000 +248B:00000000000000000080018002800480088008800FC000800080009000000000 +248C:00000000000000000FC00800080008000F800040004000400840079000000000 +248D:000000000000000003800400080008000F800840084008400840079000000000 +248E:00000000000000000FC000400040008000800080010001000100011000000000 +248F:0000000000000000078008400840084007800840084008400840079000000000 +2490:0000000000000000078008400840084007C00040004000400080071000000000 +2491:00000000000000001060309051081108110811081108110810907C6200000000 +2492:00000000000000001020306050A01020102010201020102010207CFA00000000 +2493:000000000000000010F0310851081008103010401080110011007DFA00000000 +2494:000000000000000010F0310851081008107010081008110811087CF200000000 +2495:000000000000000010103030505010901110111011F8101010107C1200000000 +2496:000000000000000011F831005100110011F010081008100811087CF200000000 +2497:0000000000000000107030805100110011F011081108110811087CF200000000 +2498:000000000000000011F8300850081010101010101020102010207C2200000000 +2499:000000000000000010F031085108110810F011081108110811087CF200000000 +249A:000000000000000010F031085108110810F810081008100810107CE200000000 +249B:00000000000000003C304248428402840C8410842084408440487E3100000000 +249C:00000000000010082004200443C24422402243E244224422246423A410080000 +249D:00000000000014082404240445C246224422442244224422262425C410080000 +249E:00000000000010082004200443C244224402440244024402242423C410080000 +249F:00000000000010282024202443A244624422442244224422246423A410080000 +24A0:00000000000010082004200443C24422442247E244024402242423C410080000 +24A1:00000000000010C821042104410247C241024102410241022104210410080000 +24A2:00000000000010082004202443A24442444244424382420223C42424142803C0 +24A3:00000000000014082404240445C2462244224422442244222424242410080000 +24A4:000000000000111021082008430441044104410441044104210827C810100000 +24A5:00000000000010502048200840C4404440444044404440442048204814900300 +24A6:0000000000001408240424044442448245024602450244822444242410080000 +24A7:000000000000131021082108410441044104410441044104210827C810100000 +24A8:0000000000001004200220024761449144914491449144912492249210040000 +24A9:00000000000010082004200445C2462244224422442244222424242410080000 +24AA:00000000000010082004200443C244224422442244224422242423C410080000 +24AB:00000000000010082004200445C246224422442244224422262425C414080400 +24AC:00000000000010082004200443A244624422442244224422246423A410280020 +24AD:00000000000010082004200445C2462244224402440244022404240410080000 +24AE:00000000000010082004200443C244224402430240C24022242423C410080000 +24AF:00000000000010082104210447C241024102410241024102210420C410080000 +24B0:000000000000100820042004442244224422442244224422246423A410080000 +24B1:0000000000001008200420044422442244224242424242422184218410080000 +24B2:0000000000001004200220024411449144914491449144912492236210040000 +24B3:0000000000001008200420044422442242424182418242422424242410080000 +24B4:00000000000010082004200444224422442244224422426221A42024102803C0 +24B5:00000000000010082004200447E240224042408241024202240427E410080000 +24B6:07C0183020084104428482828442844287C28442444444442008183007C00000 +24B7:07C0183020084784444484428442878284428442444447842008183007C00000 +24B8:07C0183020084384444484428402840284028442444443842008183007C00000 +24B9:07C0183020084704448484428442844284428442448447042008183007C00000 +24BA:07C01830200847C4440484028402878284028402440447C42008183007C00000 +24BB:07C01830200847C4440484028402878284028402440444042008183007C00000 +24BC:07C018302008438444448442840285C28442844244C443442008183007C00000 +24BD:07C018302008444444448442844287C284428442444444442008183007C00000 +24BE:07C01830200847C4410481028102810281028102410447C42008183007C00000 +24BF:07C01830200843E4408480828082808280828482448443042008183007C00000 +24C0:07C0183020084444444484828502860285028482444444442008183007C00000 +24C1:07C0183020084404440484028402840284028402440447C42008183007C00000 +24C2:07C0183020084444444486C286C2854285428442444444442008183007C00000 +24C3:07C01830200840044444864286428542854284C244C444442008183007C00000 +24C4:07C0183020084384444484428442844284428442444443842008183007C00000 +24C5:07C0183020084784444484428442878284028402440444042008183007C00000 +24C6:07C018302008438444448442844284428442854246C443842068183007C00000 +24C7:07C0183020084784444484428442878285028482448444442008183007C00000 +24C8:07C0183020084384444484428402838280428442444443842008183007C00000 +24C9:07C0183020084FE4410481028102810281028102410441042008183007C00000 +24CA:07C0183020084444444484428442844284428442444443842008183007C00000 +24CB:07C0183020084824482484428442844282828282410441042008183007C00000 +24CC:07C0183020084444444484428542854286C286C2444444442008183007C00000 +24CD:07C0183020084444444482828282810282828282444444442008183007C00000 +24CE:07C0183020084824482484428442828281028102410441042008183007C00000 +24CF:07C01830200847C4404480428082810282028402440447C42008183007C00000 +24D0:07C018302008400443848442804283C2844284C2434440042008183007C00000 +24D1:07C0183024084404440485828642844284428442464445842008183007C00000 +24D2:07C0183020084004438484428402840284028442438440042008183007C00000 +24D3:07C01830204840444044834284C284428442844244C443442008183007C00000 +24D4:07C018302008400443848442844287C284028442438440042008183007C00000 +24D5:07C01830200840C441048102810287C281028102410441042108183007C00000 +24D6:07C0183020084044434484828482830282028382444444442388183007C00000 +24D7:07C0183024084404440485828642844284428442444444442008183007C00000 +24D8:07C0183021084104400483028102810281028102410447C42008183007C00000 +24D9:07C0183020484044400480C28042804280428042404444842308183007C00000 +24DA:07C0183020084404440484828502860286028502448444442008183007C00000 +24DB:07C0183020084304410481028102810281028102410447C42008183007C00000 +24DC:07C01830200840044EC489228922892289228922492440042008183007C00000 +24DD:07C0183020084004458486428442844284428442444440042008183007C00000 +24DE:07C0183020084004438484428442844284428442438440042008183007C00000 +24DF:07C0183020084004458486428442844284428642458444042408183007C00000 +24E0:07C0183020084004434484C2844284428442844244C443442048183007C00000 +24E1:07C0183020084004458486428442840284028402440440042008183007C00000 +24E2:07C0183020084004438484428402838280428442438440042008183007C00000 +24E3:07C0183020084104410487C28102810281028102410440C42008183007C00000 +24E4:07C01830200840044444844284428442844284C2434440042008183007C00000 +24E5:07C0183020084004444484428282828282828102410440042008183007C00000 +24E6:07C018302008400448248922892289228922892246C440042008183007C00000 +24E7:07C0183020084004444484428282810282828442444440042008183007C00000 +24E8:07C0183020084004444484428442844282C28142404440442388183007C00000 +24E9:07C018302008400447C48042808281028202840247C440042008183007C00000 +24EA:07C0183020084104428484428442844284428442428441042008183007C00000 +24EB:07C01FF03FF87FFC7BBCF33EEABEFBBEFBBEFBBE600C7FFC3FF81FF007C00000 +24EC:07C01FF03FF87FFC7B9CF36EEBEEFBDEFBBEFB7E600C7FFC3FF81FF007C00000 +24ED:07C01FF03FF87FFC7B9CF36EEBEEFBDEFBEEFB6E609C7FFC3FF81FF007C00000 +24EE:07C01FF03FF87FFC7BECF3CEEBAEFB6EFB06FBEE60EC7FFC3FF81FF007C00000 +24EF:07C01FF03FF87FFC7B0CF37EEB7EFB1EFBEEFB6E609C7FFC3FF81FF007C00000 +24F0:000007C01FF03FF83B88737C6B7C7B1C7B6C7B6C20983FF81FF007C000000000 +24F1:000007C01FF03FF83B0873EC6BEC7BDC7BDC7BBC20B83FF81FF007C000000000 +24F2:000007C01FF03FF83B98736C6B6C7B9C7B6C7B6C20983FF81FF007C000000000 +24F3:07C01FF03FF87FFC7B9CF36EEB6EFB8EFBEEFBEE609C7FFC3FF81FF007C00000 +24F4:07C01FF03FF87FFC739CED6EFD6EFB6EF76EEF6E619C7FFC3FF81FF007C00000 +24F5:07E0181823C44C32500A9089A185A085A08591C9500A4C3223C4181807E00000 +24F6:07E0181823C44C32500A9189A045A085A10591C9500A4C3223C4181807E00000 +24F7:07E0181823C44C32500A9189A045A185A0459189500A4C3223C4181807E00000 +24F8:07E0181823C44C32500A9289A285A3C5A0859089500A4C3223C4181807E00000 +24F9:07E0181823C44C32500A91C9A105A185A0459189500A4C3223C4181807E00000 +24FA:07E0181823C44C32500A9189A205A385A2459189500A4C3223C4181807E00000 +24FB:07E0181823C44C32500A91C9A045A045A0859089500A4C3223C4181807E00000 +24FC:07E0181823C44C32500A9189A245A185A2459189500A4C3223C4181807E00000 +24FD:07E0181823C44C32500A9189A245A1C5A0459189500A4C3223C4181807E00000 +24FE:07E0181823C44C32500A9269A695A295A2959769500A4C3223C4181807E00000 +24FF:07C01FF03FF87EFC7D7CFBBEFBBEFBBEFBBEFBBE7D7C7EFC3FF81FF007C00000 +2500:00000000000000FF0000000000000000 +2501:00000000000000FFFF00000000000000 +2502:08080808080808080808080808080808 +2503:18181818181818181818181818181818 +2504:00000000000000DB0000000000000000 +2505:00000000000000DBDB00000000000000 +2506:08080808000008080808000008080808 +2507:18181818000018181818000018181818 +2508:00000000000000AA0000000000000000 +2509:00000000000000AAAA00000000000000 +250A:08080800080808000808080008080800 +250B:18181800181818001818180018181800 +250C:000000000000000F0808080808080808 +250D:000000000000000F0F08080808080808 +250E:000000000000001F1818181818181818 +250F:000000000000001F1F18181818181818 +2510:00000000000000F80808080808080808 +2511:00000000000000F8F808080808080808 +2512:00000000000000F81818181818181818 +2513:00000000000000F8F818181818181818 +2514:080808080808080F0000000000000000 +2515:080808080808080F0F00000000000000 +2516:181818181818181F0000000000000000 +2517:181818181818181F1F00000000000000 +2518:08080808080808F80000000000000000 +2519:08080808080808F8F800000000000000 +251A:18181818181818F80000000000000000 +251B:18181818181818F8F800000000000000 +251C:080808080808080F0808080808080808 +251D:080808080808080F0F08080808080808 +251E:181818181818181F0808080808080808 +251F:080808080808081F1818181818181818 +2520:181818181818181F1818181818181818 +2521:181818181818181F1F08080808080808 +2522:080808080808081F1F18181818181818 +2523:181818181818181F1F18181818181818 +2524:08080808080808F80808080808080808 +2525:08080808080808F8F808080808080808 +2526:18181818181818F80808080808080808 +2527:08080808080808F81818181818181818 +2528:18181818181818F81818181818181818 +2529:18181818181818F8F808080808080808 +252A:08080808080808F8F818181818181818 +252B:18181818181818F8F818181818181818 +252C:00000000000000FF0808080808080808 +252D:00000000000000FFF808080808080808 +252E:00000000000000FF0F08080808080808 +252F:00000000000000FFFF08080808080808 +2530:00000000000000FF1818181818181818 +2531:00000000000000FFF818181818181818 +2532:00000000000000FF1F18181818181818 +2533:00000000000000FFFF18181818181818 +2534:08080808080808FF0000000000000000 +2535:08080808080808FFF800000000000000 +2536:08080808080808FF0F00000000000000 +2537:08080808080808FFFF00000000000000 +2538:18181818181818FF0000000000000000 +2539:18181818181818FFF800000000000000 +253A:18181818181818FF1F00000000000000 +253B:18181818181818FFFF00000000000000 +253C:08080808080808FF0808080808080808 +253D:08080808080808FFF808080808080808 +253E:08080808080808FF0F08080808080808 +253F:08080808080808FFFF08080808080808 +2540:18181818181818FF0808080808080808 +2541:08080808080808FF1818181818181818 +2542:18181818181818FF1818181818181818 +2543:18181818181818FFF808080808080808 +2544:18181818181818FF1F08080808080808 +2545:08080808080808FFF818181818181818 +2546:08080808080808FF1F18181818181818 +2547:18181818181818FFFF08080808080808 +2548:08080808080808FFFF18181818181818 +2549:18181818181818FFF818181818181818 +254A:18181818181818FF1F18181818181818 +254B:18181818181818FFFF18181818181818 +254C:00000000000000EE0000000000000000 +254D:00000000000000EEEE00000000000000 +254E:08080808080800000808080808080000 +254F:18181818181800001818181818180000 +2550:000000000000FF00FF00000000000000 +2551:14141414141414141414141414141414 +2552:0000000000000F080F08080808080808 +2553:000000000000001F1414141414141414 +2554:0000000000001F101714141414141414 +2555:000000000000F808F808080808080808 +2556:00000000000000FC1414141414141414 +2557:000000000000FC04F414141414141414 +2558:0808080808080F080F00000000000000 +2559:141414141414141F0000000000000000 +255A:14141414141417101F00000000000000 +255B:080808080808F808F800000000000000 +255C:14141414141414FC0000000000000000 +255D:141414141414F404FC00000000000000 +255E:0808080808080F080F08080808080808 +255F:14141414141414171414141414141414 +2560:14141414141417101714141414141414 +2561:080808080808F808F808080808080808 +2562:14141414141414F41414141414141414 +2563:141414141414F404F414141414141414 +2564:000000000000FF00FF08080808080808 +2565:00000000000000FF1414141414141414 +2566:000000000000FF00F714141414141414 +2567:080808080808FF00FF00000000000000 +2568:14141414141414FF0000000000000000 +2569:141414141414F700FF00000000000000 +256A:080808080808FF08FF08080808080808 +256B:14141414141414FF1414141414141414 +256C:141414141414F700F714141414141414 +256D:00000000000000030408080808080808 +256E:00000000000000E01008080808080808 +256F:08080808080810E00000000000000000 +2570:08080808080804030000000000000000 +2571:01010202040408081010202040408080 +2572:80804040202010100808040402020101 +2573:81814242242418181818242442428181 +2574:00000000000000F00000000000000000 +2575:08080808080808080000000000000000 +2576:000000000000000F0000000000000000 +2577:00000000000000000808080808080808 +2578:00000000000000F0F000000000000000 +2579:18181818181818180000000000000000 +257A:000000000000000F0F00000000000000 +257B:00000000000000001818181818181818 +257C:00000000000000FF0F00000000000000 +257D:08080808080808081818181818181818 +257E:00000000000000FFF000000000000000 +257F:18181818181818180808080808080808 +2580:FFFFFFFFFFFFFFFF0000000000000000 +2581:0000000000000000000000000000FFFF +2582:000000000000000000000000FFFFFFFF +2583:00000000000000000000FFFFFFFFFFFF +2584:0000000000000000FFFFFFFFFFFFFFFF +2585:000000000000FFFFFFFFFFFFFFFFFFFF +2586:00000000FFFFFFFFFFFFFFFFFFFFFFFF +2587:0000FFFFFFFFFFFFFFFFFFFFFFFFFFFF +2588:FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF +2589:FEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFE +258A:FCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFC +258B:F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8 +258C:F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0 +258D:E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0 +258E:C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0 +258F:80808080808080808080808080808080 +2590:0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F +2591:88228822882288228822882288228822 +2592:AA55AA55AA55AA55AA55AA55AA55AA55 +2593:EEBBEEBBEEBBEEBBEEBBEEBBEEBBEEBB +2594:FFFF0000000000000000000000000000 +2595:01010101010101010101010101010101 +2596:0000000000000000F0F0F0F0F0F0F0F0 +2597:00000000000000000F0F0F0F0F0F0F0F +2598:F0F0F0F0F0F0F0F00000000000000000 +2599:F0F0F0F0F0F0F0F0FFFFFFFFFFFFFFFF +259A:F0F0F0F0F0F0F0F00F0F0F0F0F0F0F0F +259B:FFFFFFFFFFFFFFFFF0F0F0F0F0F0F0F0 +259C:FFFFFFFFFFFFFFFF0F0F0F0F0F0F0F0F +259D:0F0F0F0F0F0F0F0F0000000000000000 +259E:0F0F0F0F0F0F0F0FF0F0F0F0F0F0F0F0 +259F:0F0F0F0F0F0F0F0FFFFFFFFFFFFFFFFF +25A0:000000000000007F7F7F7F7F7F7F0000 +25A1:0000000000007F41414141417F000000 +25A2:0000000000003E41414141413E000000 +25A3:0000000000007F415D5D5D417F000000 +25A4:0000000000007F417F417F417F000000 +25A5:0000000000007F55555555557F000000 +25A6:0000000000007F557F557F557F000000 +25A7:0000000000007F53496553497F000000 +25A8:0000000000007F65495365497F000000 +25A9:0000000000007F556B556B557F000000 +25AA:00000000000000003C3C3C3C00000000 +25AB:0000000000003C24243C000000000000 +25AC:0000000000007F7F7F7F000000000000 +25AD:0000000000007F41417F000000000000 +25AE:00000000003C3C3C3C3C3C3C00000000 +25AF:00000000003C24242424243C00000000 +25B0:000000000000003F7EFC000000000000 +25B1:000000000000003F42FC000000000000 +25B2:000000000018183C3C7E7E0000000000 +25B3:000000000018182424427E0000000000 +25B4:0000000000000000183C7E0000000000 +25B5:000000000000000018247E0000000000 +25B6:00000000000060787E7E786000000000 +25B7:00000000000060584646586000000000 +25B8:00000000000000303C3C300000000000 +25B9:00000000000000302C2C300000000000 +25BA:0000000000000060787E786000000000 +25BB:00000000000000605846586000000000 +25BC:00000000007E7E3C3C18180000000000 +25BD:00000000007E42242418180000000000 +25BE:00000000000000007E3C180000000000 +25BF:00000000000000007E24180000000000 +25C0:000000000000061E7E7E1E0600000000 +25C1:000000000000061A62621A0600000000 +25C2:000000000000000C3C3C0C0000000000 +25C3:000000000000000C34340C0000000000 +25C4:00000000000000061E7E1E0600000000 +25C5:00000000000000061A621A0600000000 +25C6:0000000000081C3E7F3E1C0800000000 +25C7:00000000000814224122140800000000 +25C8:000000000008142A5D2A140800000000 +25C9:00000000001C22595D4D221C00000000 +25CA:00000018182424424224241818000000 +25CB:00000000001C22414141221C00000000 +25CC:00000000001400410041001400000000 +25CD:00000000001C36555555361C00000000 +25CE:00000000001C22495549221C00000000 +25CF:00000000001C3E7F7F7F3E1C00000000 +25D0:00000000001C32717171321C00000000 +25D1:00000000001C26474747261C00000000 +25D2:00000000001C2241417F3E1C00000000 +25D3:00000000001C3E7F4141221C00000000 +25D4:00000000001C2E4F4F41221C00000000 +25D5:00000000001C2647477F3E1C00000000 +25D6:00000000001838787878381800000000 +25D7:00000000000C0E0F0F0F0E0C00000000 +25D8:FFFFFFFFFFFFE7C3C3E7FFFFFFFFFFFF +25D9:FFFFFFFFFFE7DBBDBDDBE7FFFFFFFFFF +25DA:FFFFFFFFFFE7DBBD0000000000000000 +25DB:0000000000000000BDDBE7FFFFFFFFFF +25DC:00000000001820404000000000000000 +25DD:00000000000C02010100000000000000 +25DE:00000000000000000101020C00000000 +25DF:00000000000000004040201800000000 +25E0:00000000001C22414100000000000000 +25E1:00000000000000004141221C00000000 +25E2:0101030307070F0F1F1F3F3F7F7FFFFF +25E3:8080C0C0E0E0F0F0F8F8FCFCFEFEFFFF +25E4:FFFFFEFEFCFCF8F8F0F0E0E0C0C08080 +25E5:FFFF7F7F3F3F1F1F0F0F070703030101 +25E6:00000000000000384444443800000000 +25E7:00000000007E727272727E0000000000 +25E8:00000000007E4E4E4E4E7E0000000000 +25E9:00000000007E7A7262427E0000000000 +25EA:00000000007E42464E5E7E0000000000 +25EB:00000000007F494949497F0000000000 +25EC:0000000000081414222A417F00000000 +25ED:00000000000018183434727E00000000 +25EE:000000000018182C2C4E4E7E00000000 +25EF:0000000001C00630080810041004200220022002100410040808063001C00000 +25F0:00000000000000007E527242427E0000 +25F1:00000000000000007E424272527E0000 +25F2:00000000000000007E42424E4A7E0000 +25F3:00000000000000007E4A4E42427E0000 +25F4:0000000000003C5291F18181423C0000 +25F5:0000000000003C428181F191523C0000 +25F6:0000000000003C4281818F894A3C0000 +25F7:0000000000003C4A898F8181423C0000 +25F8:00007E44485060400000000000000000 +25F9:00007E22120A06020000000000000000 +25FA:00000000000000000040605048447E00 +25FB:0000000000000000007E424242427E00 +25FC:00000000000000007E7E7E7E7E7E0000 +25FD:000000000000000000003C24243C0000 +25FE:00000000000000007C7C7C7C7C000000 +25FF:00000000000000000002060A12227E00 +2600:0000084922001C3E3E1C002249080000 +2601:000000002076FF7E0000000000000000 +2602:000000001C3E7F080808081000000000 +2603:8BC803C02FF104248A5028120A504994042147E008101088781E1088081007E0 +2604:00000022222424282902304848300000 +2605:000000000008087F1C36220000000000 +2606:00000000080877222A36220000000000 +2607:00000000000204081020100A060E0000 +2608:0000000000007E424448504A464E0000 +2609:0000000000003C4281999981423C0000 +260A:00000000000018242466A54200000000 +260B:00000000000042A56624241800000000 +260C:00000000000004083048483000000000 +260D:00000000000609090608304848300000 +260E:000000000000003E63002A637F000000 +260F:0000000000003E415D3E49417F000000 +2610:000000003FF820082008200820082008200820082008200820083FF800000000 +2611:000000003FF8200820082038286828C829882B082E082C0820083FF800000000 +2612:000000003FFC200420042C34266423C4218423C426642C3420043FFC00000000 +2613:00000000222214140808141422220000 +2614:055004411C3E7F080808081000000000 +2615:000009201240124009200920124000001FC83FF42FD4201420381FC000000000 +2616:00000100028004400820101020082008200820082008200820083FF800000000 +2617:00000100038007C00FE01FF03FF83FF83FF83FF83FF83FF83FF83FF800000000 +2618:00000000028007C007C03398793C3FF8793C3118020002000200040008000000 +2619:00000000000401C823E847E84FE87FD83FDC0FE407E403E401C4000800000000 +261A:00000000000000007E1F1F0E00000000 +261B:00000000000000003F7C7C3800000000 +261C:00000000000000007E11190E00000000 +261D:000000000004041C3424241800000000 +261E:00000000000000003F444C3800000000 +261F:00000000000000182424341C04040000 +2620:0000E7A57E81A5A5815A5A42BDE70000 +2621:000000003804040808101020201C0000 +2622:07E0181824245C3A5C3ABE7DBE7DBE7D8181818183C143C247E223C4181807E0 +2623:00000000044008201010101013900C603EF84444854283820280044018300000 +2624:0000030001007FFC23881FF001000D6011100FE0092007C00540038005400100 +2625:0000000000001C2214083E0808080000 +2626:0000000000103810FE1010701C100000 +2627:000000001C12121C1054381038540000 +2628:0000000000103810FE10101010100000 +2629:000000000000001C08497F49081C0000 +262A:000000001E2140C2C7C240211E000000 +262B:000000000000054006C0000015502928292829282548139007C0010000000000 +262C:000000000000008002A0049009C81AAC1AAC19CC1C9C1BEC11C402A000800000 +262D:0000000000000C0239790D3E63C10000 +262E:0000000000003E4949495D6B493E0000 +262F:07E018182004400240029C31BE31FF03E783E7C7FFFF7FFE7FFE3FFC1FF807E0 +2630:00000000000000007FFC7FFC000000007FFC7FFC000000007FFC7FFC00000000 +2631:00000000000000007C7C7C7C000000007FFC7FFC000000007FFC7FFC00000000 +2632:00000000000000007FFC7FFC000000007C7C7C7C000000007FFC7FFC00000000 +2633:00000000000000007C7C7C7C000000007C7C7C7C000000007FFC7FFC00000000 +2634:00000000000000007FFC7FFC000000007FFC7FFC000000007C7C7C7C00000000 +2635:00000000000000007C7C7C7C000000007FFC7FFC000000007C7C7C7C00000000 +2636:00000000000000007FFC7FFC000000007C7C7C7C000000007C7C7C7C00000000 +2637:00000000000000007C7C7C7C000000007C7C7C7C000000007C7C7C7C00000000 +2638:00000000000000493E3E773E3E490000 +2639:0000003C4281A58199A581423C000000 +263A:000000003C4281A581A599423C000000 +263B:000000003C7EFFDBFFDBE77E3C000000 +263C:0000000000492A1C771C2A4900000000 +263D:00000000380C0605050505060C380000 +263E:000000000E18305050505030180E0000 +263F:00000022221C2222221C083E08080000 +2640:00000000001C2222221C083E08080000 +2641:00000008083E08081C2222221C000000 +2642:00000000000703053844444438000000 +2643:000000000202023A46060A7E02020000 +2644:00000000202070202C32222424240000 +2645:00000000006B2A3E2A6B081C141C0000 +2646:000000000859CB4949493E083E080800 +2647:000000007C4242427C404040407E0000 +2648:00000000225514140808080808080000 +2649:0000000000000041221C2222221C0000 +264A:00000000413E1414141414143E410000 +264B:0000000000003E4948300609493E0000 +264C:00000000001C22221274949465020000 +264D:00000000547C555755555555067C0000 +264E:000000000000001C222277007F000000 +264F:00000000547C54545454545455030000 +2650:000000000000000F0345291028440000 +2651:00000000314E8408103C62A2A21C0000 +2652:0000000000002A5400002A5400000000 +2653:0000000000424224247E242442420000 +2654:000000081C08775D49492A7F417F0000 +2655:000000000808492A2A5D2A3E223E0000 +2656:0000000000557F4141222241417F0000 +2657:000000000814222222221477417F0000 +2658:000000021E2242423A122242427E0000 +2659:000000000000182424182424427E0000 +265A:000000081C08775D49492A7F7F7F0000 +265B:000000000808492A2A5D2A3E3E3E0000 +265C:0000000000557F7F7F3E3E7F7F7F0000 +265D:00000000081C3622363E1C7F7F7F0000 +265E:000000021E367E7E3E1E3E7E7E7E0000 +265F:000000000000183C3C183C3C7E7E0000 +2660:0000000008081C3E7F7F7F3E081C0000 +2661:00000000003649414141221408080000 +2662:00000000080814142222141408080000 +2663:000000001C1C1C087F7F6B08081C0000 +2664:00000000080814224141413E081C0000 +2665:0000000000367F7F7F7F3E1C08080000 +2666:0000000008081C1C3E3E1C1C08080000 +2667:000000001C141C08775D6B08081C0000 +2668:000000085192929249494952817E0000 +2669:00000000080808080808083878700000 +266A:00000000080C0A0A0808083878700000 +266B:0000001C171111111171F1E70F0E0000 +266C:0000001C17111D171171F1E70F0E0000 +266D:000040404040405C6646444850600000 +266E:00000040404E7E72424E7E7202020000 +266F:00000424263E7C6424263E7C64242000 +2670:00000000140808493E49080808140000 +2671:000000001C14086B5D6B080814080000 +2672:03C005200A9812480AD004303004480A8C115009A005AE26525852861E5C0020 +2673:0380044004400820002839181B382900210843844004802280427EFC00400020 +2674:038004400440082000283B1818B82900220843844004802280427EFC00400020 +2675:038004400440082000283B1818B82B00208843044004802280427EFC00400020 +2676:038004400440082000283A981AB82B80208840844004802280427EFC00400020 +2677:038004400440082000283B981A382B00208843044004802280427EFC00400020 +2678:0380044004400820002839981A382B80224841844004802280427EFC00400020 +2679:038004400440082000283B9818B82900210841044004802280427EFC00400020 +267A:03800440044008200028381818382800200840044004802280427EFC00400020 +267B:03C005E00EF81E780EF004303004780EFC1F700FE007EE265E785EFE1E7C0020 +267C:07E01FF83E7C7DBE7BDEFF8FF7DFE7FFF3EFF7EFEFF76FB6710E3FBC1FF807E0 +267D:07E018182184424244228071882198018C1188119009504A4EF22044181807E0 +267E:00000000000003800C601010200826C84924492426C8200810100C6003800000 +267F:0000000000000600060004000780040017E0202020102050108C0F0000000000 +2680:00000000000000001FF010101010101011101010101010101FF0000000000000 +2681:00000000000000001FF010101010141010101050101010101FF0000000000000 +2682:00000000000000001FF010101410101011101010105010101FF0000000000000 +2683:00000000000000001FF010101450101010101010145010101FF0000000000000 +2684:00000000000000001FF010101450101011101010145010101FF0000000000000 +2685:00000000000000001FF010101450101014501010145010101FF0000000000000 +2686:00000000000003C0042008101008200420642064200410080810042003C00000 +2687:00000000000003C0042008101008200426642664200410080810042003C00000 +2688:00000000000003C007E00FF01FF83FFC3F9C3F9C3FFC1FF80FF007E003C00000 +2689:00000000000003C007E00FF01FF83FFC399C399C3FFC1FF80FF007E003C00000 +268A:000000000000000000000000000000007FFC7FFC000000000000000000000000 +268B:000000000000000000000000000000007C7C7C7C000000000000000000000000 +268C:0000000000000000000000007FFC7FFC000000007FFC7FFC0000000000000000 +268D:0000000000000000000000007C7C7C7C000000007FFC7FFC0000000000000000 +268E:0000000000000000000000007FFC7FFC000000007C7C7C7C0000000000000000 +268F:0000000000000000000000007C7C7C7C000000007C7C7C7C0000000000000000 +2690:000000704E4242724E40404040400000 +2691:000000707E7E7E7E4E40404040400000 +2692:000008325C7C3E7E7C1FF8277443228101000280044008201010200840040000 +2693:000000000380044004400380010007C001002108711C210811100FE000000000 +2694:0000400420081010082004400280010002800440282810102828400400000000 +2695:0000010001000FF0113011000FC00120012007C0090007800140038001000000 +2696:000000000000010011107FFC39385454545492929292FEFE7C7C383800000000 +2697:000000000000000003E007F00BF80BF811F010E0100001F00248044400000000 +2698:0000000003800440044004400380010039383D781D700D600380010001000000 +2699:000000000100210817D0082010101010711C10101010082017D0210801000000 +269A:00000100028039387FFCFD7E0540038001000100010001000100010000000000 +269B:018002400240742E8E7185A14E7235AC35AC4E7285A18E71742E024002400180 +269C:01000280044034584C648442B29ACAA61AB010101BB00AA03AB826C819300100 +269D:010002800440044008006BFC8802882260241810065000882108264818300000 +269E:30000C00030000C00030000C00003FFC0000000C003000C003000C0030000000 +269F:000C003000C003000C00300000003FFC000030000C00030000C00030000C0000 +26A0:000001000280028004400440092009201110111021082008410440047FFC0000 +26A1:0000000002040810207E040810204000 +26A2:000000000000000000000EE011102288228811100EE004400EE0044000000000 +26A3:00000000000001C000C001400E38111823A825401A200C200440038000000000 +26A4:000000380018002801C0022007100A90116010C0088007000200070002000000 +26A5:0000000000000000007000300050038004400820082004400380010003800100 +26A6:00000000000000000038001800A800400EA011002080208011000E0000000000 +26A7:000000000000E00EC006A80A10102BA004400820082004400380010003800100 +26A8:00001038541038103844828244380000 +26A9:000000000000000000000000000000001C002208414441FE414422081C000000 +26AA:00000000000000003844828282443800 +26AB:0000000000000000387CFEFEFE7C3800 +26AC:0000000000000000001C2222221C0000 +26AD:000000000000000000000000000000000EE011102288228811100EE000000000 +26AE:0000000000000000000000000000000000800EB811C411C411C40EB800800000 +26AF:0000000000000000000000000000000000003838444447C44444383800000000 +26B0:000000000C0013C0203E4002400240024002603E53C22E3E1BC00C0000000000 +26B1:000007C002800FE010102008200810101010101008200820082007C000000000 +26B2:00000000001C2222221C080808080000 +26B3:0000000000384402020418107C100000 +26B4:0000000010284482442810107C100000 +26B5:00000000925438FE385492107C100000 +26B6:0000000000000100010001000100393804400280793C04400280010000000000 +26B7:00000012141814121038444444380000 +26B8:000000001C38707070381C083E080000 +26B9:000000000000422418FF182442000000 +26BA:00000000000044444428282810FE0000 +26BB:000000000000FE102828284444440000 +26BC:0000000000007E4242424A7E207E0000 +26BD:0000000001C007300F38173C100421C223E239CE1C1C180C09C807F001C00000 +26BE:0000000001C006300C1812241004214220022142100412240C18063001C00000 +26BF:000000007FFC4004438444444444438441044104410441C4410440047FFC0000 +26C0:0000000000000000000007E0181821842184381C2FF42A541A5807E000000000 +26C1:0000000007E0181821842184381C2FF42A543A5C2FF42A541A5807E000000000 +26C2:00000000000000000FF0381C67E65E7A5E7A47E2500A55AA65A6381C0FF00000 +26C3:00000FF0381C67E65E7A5E7A47E2500A55AA45A2500A55AA65A6381C0FF00000 +26C4:03C003C00FF004200A5008100A500990042007E008101088781E1088081007E0 +26C5:00000000000001200148001000C0072C09A010602010201010600F8000000000 +26C6:0000222244440088100022224444008810002222444400801012222444480000 +26C7:8BC803C02FF107E48DB02FF20DB04E7407E147E00FF01F787FFE1F780FF007E0 +26C8:0000072008CC10B22102208211040A1807E02000444000801010222044400000 +26C9:00003FF820082008200820082008200820081010082004400280010000000000 +26CA:00003FF83FF83FF83FF83FF83FF83FF83FF83FF81FF00FE00380010000000000 +26CB:0000000000007FF04510489050506030401060305050489045107FF000000000 +26CC:0000000000000000202010400880040002000100088010402020000000000000 +26CD:00003C00420042008100FF00FF00FF0042004200004000A00110020804040FFE +26CE:000000000000000000000440044004501E48254824F014400440066000000000 +26CF:000040C027001C001C003E003300218040C0406000300018000C000600000000 +26D0:000000E0031005C803F804E8003000401C00218022001AC002203C2000000000 +26D1:0000000007001DC038E07DF0FFF84010401040102020202018C0070000000000 +26D2:00000000070018C020205050489081088208840848905050202018C007000000 +26D3:000022102A381C5408441C442A54223822102A381C5408441C442A5422380010 +26D4:00000000000007001FC03FE07FF07FF0C018C0187FF07FF03FE01FC007000000 +26D5:000000000C301E302D300C3008E00BC00A000BC008E00C300CB40C780C300000 +26D6:00000000018003C007E00BD011D82ADC7BDE3B541B880FD007E003C001800000 +26D7:0000018002400420081014282E245522842144AA247410280810042002400180 +26D8:0000000007FC07FC07FC0FFC1FFC3FFC3FFC3FFC3FFC3FFC3FFC3FFC00000000 +26D9:00000000180619061906190630066106C106C106C006C106C106C10600000000 +26DA:00000000781E781E700E600600000000000000006006700E781E781E00000000 +26DB:00000000000000001FF018300C600C6006C007C0038003800100010000000000 +26DC:00000000180318431843184330036043C043C043C403C443C443C44300000000 +26DD:0000000000003FF83018282824482288210822882448282830183FF800000000 +26DE:00000000FDF8F8F8E038D018C818840802008108C098C058E038F8F8FDF80000 +26DF:000000007FF07FF07FFC7FF27FF27FFE7FFE7FFE6FF657EA381C100800000000 +26E0:00007FFE3E021C42084200020042004200020042004200020042004200020000 +26E1:0000400060007000780070006000400040804040422046104E085E047FFE0000 +26E2:00000010387C10107C82BABA827C0000 +26E3:00000100193019300100010003800C60082010101010101008200C6003800000 +26E4:0000010001000280028002807FFC244814500C600AA0092016D0183020080000 +26E5:0000010001000280028000807F5C2048141008600A00092014D0183020080000 +26E6:00000100010002800280020075FC240810500C2000A009201650183020080000 +26E7:00002008183016D009200AA00C60145024487FFC028002800280010001000000 +26E8:0000000000003FF02010231023102FD02FD023102310201030300CC003000000 +26E9:00000000FFFE1010101010101FF0101010101010101010101010101000000000 +26EA:0100010007C001000100038007C01FF07C7C3838339837D837D837D800000000 +26EB:0000000000000F80088078F04010401040104010401040104010401000000000 +26EC:000000000000000000000180018000000000000000000C300C30000000000000 +26ED:000000000000010011100BA0044008203838082004400BA01110010000000000 +26EE:000000000000010011100BA004440824783C482044400BA01110010000000000 +26EF:000000000000010011100BA004400BA03BB80BA004400BA01110010000000000 +26F0:00000000000000000100028004600410081813F83FFC3FFC7FFE7FFE00000000 +26F1:000007E01818282447E2791E41020200020002000400040004007FFE7FFE0000 +26F2:00001450228842844004438447C407C000007FFC3FF80FE00FE01FF03FF80000 +26F3:0000018001E001F8010001000100010001003D787D7CFC7E7EFC3FF807C00000 +26F4:0000000003000300030007E00A5012482248FFFC3FF81FF80FF0000000000000 +26F5:000001000180014005400D20152025104510FDF80100FFFC3FF81FF80FF00000 +26F6:0000381C400240024002000000000000000000000000400240024002381C0000 +26F7:0000000038003800380006000E207FF01C201C0C0E300FC003001C0000000000 +26F8:0000000000000000000000F000F000F000F01FF03FF03FE008403FF800000000 +26F9:0000038003800380000003FC07800B80138C238C038006C006C00C600C60783C +26FA:0000060005000E800E400E201F101F081F043F823F84318871C871D071E00000 +26FB:0000000007C01830200830180820044004400440082030182008183007C00000 +26FC:00000000010001000100010007C00000000010101010101010107C7C00000000 +26FD:000000000F801FD8104410421FF21FCA1FCA1FCA1FCA1FC41FC07FF000000000 +26FE:00007FFE7FFE7006701A701A701A7006780E7C1E4FF247E26006781E7FFE0000 +26FF:000000007FFC400440047FFC7FFC400440047FFC400040004000400040000000 +2700:0000000038047C1E6C3C7F783FF003E03FF07F786C3C7C1E3804000000000000 +2701:000038007C006C007C003C000E007FFCFFFED9C0F8E070000000000000000000 +2702:0000000038067C1C6C387F703FE003C03FE07F706C387C1C3806000000000000 +2703:00000000000000007000F8E0D9C0FFFE7FFC0E003C007C006C007C0038000000 +2704:00000000700C8832AE4481887910062078508188AE448832700C000000000000 +2705:00000000000000000004000A001200242048509051202A40248011000E000000 +2706:07C01830200841C447E48FF28F729E629C029F024F0446042008183007C00000 +2707:07C01930238843844104838287C287C287C28BA25C7458342008183007C00000 +2708:000008000F00060007C0C380E3C07FFE7FFEE3C0C38007C006000F0008000000 +2709:00000000000000007FFE6006500A499247E247E24992500A60067FFE00000000 +270A:000000000000000003600C90149035F8550454E454C43704280810100FE00000 +270B:00000A801540154035405540554C5552402240044008201010100FE000000000 +270C:18302448228812901110092008207CFC92829272922292427C0420081FF00000 +270D:00000008001C003803F70CF511CD238547056FE512052FFD7005600700000000 +270E:000000001800260055004A80714028A014500A28052802C8011800F800000000 +270F:00000000000000003FF050288FF4A8168FF450283FF000000000000000000000 +2710:0000000000F8011802C805280A28145028A071404A8055002600180000000000 +2711:000000000000000000F07908866C80FE866C790800F000000000000000000000 +2712:000000000000000000E079F0FF38FF0EFF3879F000E000000000000000000000 +2713:0000000000000000000000040008001040204040208021001200140008000000 +2714:00000000000000000004000E401CE038E07070E071C03B803F001E000C000000 +2715:00000000101038381C700EE007C0038007C00EE01C7038381010000000000000 +2716:101038387C7CFEFE7FFC3FF81FF00FE01FF03FF87FFCFEFE7C7C383810100000 +2717:00006018306031C01B000E000E001B00198030C0306060306018200000000000 +2718:00006018707031E03B801F000E001F001B8039C030E070706038601020000000 +2719:07C00440054005400540FD7E8102BFFA8102FD7E054005400540044007C00000 +271A:07C007C007C007C007C0FFFEFFFEFFFEFFFEFFFE07C007C007C007C007C00000 +271B:038003800380038003800380FC7EFC7EFC7E0380038003800380038003800000 +271C:07C007C007C007C007C0F83EF83EF83EF83EF83E07C007C007C007C007C00000 +271D:000000000380038003801FF01FF01FF003800380038003800380000000000000 +271E:078004C004C004C07CF8400C400C7CFC3CFC04C004C004C004C007C003C00000 +271F:00000FE008207BBC43845FF45FF45FF443847BBC0BA00BA00BA008200FE00000 +2720:00000FF803E021C221C231C63FFE3FFE3FFE31C621C221C203E00FF800000000 +2721:000000000100028004407FFC244818300820183024487FFC0440028001000000 +2722:038007C007C003800380610CF93EFFFEF93E610C0380038007C007C003800000 +2723:038007C007C007C00380711CF93EFFFEF93E711C038007C007C007C003800000 +2724:07C00FE00FE007C0638CF39EFFFEFFFEFFFEF39E638C07C00FE00FE007C00000 +2725:0100038007C007C00100310C710EFFFF710E310C010007C007C0038001000000 +2726:01000380038007C007C01FF07FFCFFFE7FFC1FF007C007C00380038001000000 +2727:010002800280044004401830600C8002600C1830044004400280028001000000 +2728:0000040004000A00110060C011100A10042804C6002800100110028001000000 +2729:0000010002800280FC7E4004383808201010111026C828283018000000000000 +272A:07C01FF03EF87EFC7C7CC006F01EF83EF01EF11E67CC6FEC3FF81FF007C00000 +272B:0000010003800380FFFE7C7C383808201C701FF03EF838383018000000000000 +272C:0000010002800280FC7E438427C817D01390101027C828283018000000000000 +272D:0000010002801C70E10E4FE4238817D01450111022882C683018000000000000 +272E:0000010002801D70E38E5FF42FE817D016D0155022882C683018000000000000 +272F:00000100038005C0F9FE5D8C27B813F00FD01D9019D032E82C78301800000000 +2730:00000100028002C0FC7E4007383E083C1010111827C82F2C3C1C180C00000000 +2731:00000380038003804384F39E3FFC0FF03FFCF39E438403800380038000000000 +2732:00000380038003804384F39E3C7C08303C7CF39E438403800380038000000000 +2733:01000100210811100D600FE007C0FFFE07C00FE00D6011102108010001000000 +2734:0100010021081BB01FF00FE01FE0FFFE1FF00FE01FF01BB02108010001000000 +2735:010002803CF82CC8269832B87D4C83864D7C3A9832C826683E78028001000000 +2736:000001000100010043843BB81FF00FE01FF03BB8438401000100010000000000 +2737:082008200C6006C0E6CE3BB81FF007C01FF03BB8E6CE06C00C60082008200000 +2738:08200C600EE00FE0FFFE7FFC3FF81FF03FF87FFCFFFE0FE00EE00C6008200000 +2739:010019300FE04FE47FFC3FF83FF8FFFE3FF83FF87FFC4FE40FE0193001000000 +273A:0920492425481550CBA637D80FE0FFFE0FE037D8CBA615502548492409200000 +273B:0100038003800380E10E711C0D6003800D60711CE10E03800380038001000000 +273C:038007C007C0638CF11EF39E3C7808203C78F39EF11E638C07C007C003800000 +273D:038007C007C0638CF39EF11E3D7807C03D78F11EF39E638C07C007C003800000 +273E:038004400440745CFC7EFEFE7FFC2108438487C28FE277DC07C007C003800000 +273F:038007C00FE077DCFFFEFC7EF01E701C18303EF87FFC7EFC7EFC3C7800000000 +2740:038004400920793C8542B39A8FE26FEC17D027C84924529442843C7800000000 +2741:03803C78454451144D646FEC86C2BC7A86C26FEC4D64511445443C7803800000 +2742:07C01EF03EF85C7467CCFC7EE82E8822E82EFC7E67CC5C743EF81EF007C00000 +2743:038004C004C074DCBCE69F9E4F3C3FF87264E672CE7A765C0640064003800000 +2744:0000010005400380C92631184D6403804D643118C92603800540010000000000 +2745:0000010005400BA0C92631184D6483824D643118C9260BA00540010000000000 +2746:09200D6007C01390C9263118ED6E0380ED6E3118C926111007C00D6009200000 +2747:000003C023C413C8099005A0700E7DBE7DBE700E05A0099013C823C403C00000 +2748:07C047C427C813900BA0E00EFBBEFBBEFBBEE00E0BA0139027C847C407C00000 +2749:038007C007C077DCFBBEF93E7D7C07C07D7CF93EFBBE77DC07C007C003800000 +274A:010003803398311809200540638CFFFE638C0540092031183398038001000000 +274B:0100038033983BB8193007C077DCFFFE77DC07C019303BB83398038001000000 +274C:0000000018303C781EF00FE007C007C00FE01EF03C7838381010000000000000 +274D:0000000003C00C301008100C2004200620062006100E100C0C3C03F801E00000 +274E:00007FFC6FEC47C4638C711C783C7C7C783C711C638C47C46FEC7FFC00000000 +274F:00001FF81008100E100E100E100E100E100E100E1FFE07FE07FE000000000000 +2750:000007FE07FE1FFE100E100E100E100E100E100E100E10081FF8000000000000 +2751:00001FF8100C100E100E100E100E100E100E100E1FFE0FFE07FE000000000000 +2752:000007FE0FFE1FFE100E100E100E100E100E100E100E100C1FF8000000000000 +2753:000003800FE01E70183018F001E0038003000300030000000300078007800300 +2754:07C0082013901450085000900120024002800280038000000380044004400380 +2755:038006C00C6008200C60044006C0028002800380000003800440044003800000 +2756:00000100038007C00380111038387C7C38381110038007C00380010000000000 +2757:018003C003C003C003C003C003C0018001800180018000000180018000000000 +2758:0180018001800180018001800180018001800180018001800180018001800000 +2759:03C003C003C003C003C003C003C003C003C003C003C003C003C003C003C00000 +275A:0FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00000 +275B:01C007000C000F800FC00FE00FE00FE007C00380000000000000000000000000 +275C:038007C00FE00FE00FE007E003E0006001C00700000000000000000000000000 +275D:1C1C7070C0C0F8F8FCFCFEFEFEFEFEFE7C7C3838000000000000000000000000 +275E:38387C7CFEFEFEFEFEFE7E7E3E3E06061C1C7070000000000000000000000000 +275F:000000000000000007000F801FC01FC01FC00FC007C000C003800E0000000000 +2760:000000000000000038387C7CFEFEFEFEFEFE7E7E3E3E06061C1C707000000000 +2761:0000001000100FFE3FF87E107E103F100FF0001030307820786031C01F000000 +2762:03800FE01FF01FF01FF00FE00380010001000000038007C007C007C003800000 +2763:00000EE01FF01FF01FF00FE0038001000000038007C007C007C0038000000000 +2764:000000003C787EFCFFFEFFFEFFFE7FFC7FFC3FF81FF00FE007C0038001000000 +2765:1C003F007F807FC07FE07FF03FF81FFC3FF87FF07FE07FC07F803F001C000000 +2766:000000001F0421F801800E701FF81FF81FF80FF007E003C00180019000E00000 +2767:000000002000138017C417E217F21BFE3BFC27F027E027C02380100000000000 +2768:00000002040C1818181818180C040200 +2769:0000002010180C0C0C0C0C0C18102000 +276A:000000060C1C3838383838381C0C0600 +276B:00000030181C0E0E0E0E0E0E1C183000 +276C:000000060C0C1818303018180C0C0600 +276D:0000003018180C0C06060C0C18183000 +276E:000000070E0E1C1C38381C1C0E0E0700 +276F:0000007038381C1C0E0E1C1C38387000 +2770:0000000F1E1E3C3C78783C3C1E1E0F00 +2771:000000F078783C3C1E1E3C3C7878F000 +2772:00000004081010101010101010080400 +2773:00000020100808080808080808102000 +2774:0000001E38303018187018183030381E +2775:000000781C0C0C18180E18180C0C1C78 +2776:07C01FF03FF87EFC7CFCFAFEFEFEFEFEFEFEFEFE7EFC783C3FF81FF007C00000 +2777:07C01FF03FF87C7C7BBCFBBEFFBEFF7EFEFEFDFE7BFC783C3FF81FF007C00000 +2778:07C01FF03FF87C7C7BBCFBBEFFBEFE7EFFBEFBBE7BBC7C7C3FF81FF007C00000 +2779:07C01FF03FF87F7C7E7CFD7EFB7EF77EF03EFF7E7F7C7F7C3FF81FF007C00000 +277A:07C01FF03FF8783C7BFCFBFEFBFEF87EFFBEFFBE7BBC7C7C3FF81FF007C00000 +277B:07C01FF03FF87E7C7DFCFBFEFBFEF87EFBBEFBBE7BBC7C7C3FF81FF007C00000 +277C:07C01FF03FF8783C7FBCFFBEFF7EFF7EFF7EFEFE7EFC7EFC3FF81FF007C00000 +277D:07C01FF03FF87C7C7BBCFBBEFBBEFC7EFBBEFBBE7BBC7C7C3FF81FF007C00000 +277E:07C01FF03FF87C7C7BBCFBBEFBBEFC3EFFBEFFBE7F7C7CFC3FF81FF007C00000 +277F:07C01FF03FF87FFC7B9CF36EEB6EFB6EFB6EFB6E609C7FFC3FF81FF007C00000 +2780:07C0183020084084418483828182818281828182418441842008183007C00000 +2781:07C01830200847C44FE48C62806281C287028C024FE44FE42008183007C00000 +2782:07C01830200847C44FE48C62806281C280628C624FE447C42008183007C00000 +2783:07C01830200840E441E4836286628C629FF29FF2406440642008183007C00000 +2784:07C0183020084FE44FE48C028FC28FE280628C624FE447C42008183007C00000 +2785:07C01830200847C44FE48C028FC28FE28C628C624FE447C42008183007C00000 +2786:07C0183020084FE44FE48062806280C283828602460446042008183007C00000 +2787:07C01830200847C44FE48C628C6287C28C628C624FE447C42008183007C00000 +2788:07C01830200847C44FE48C628C628FE287E280624FE447C42008183007C00000 +2789:07C01830200844E44DF49DB28DB28DB28DB28DB24DF44CE42008183007C00000 +278A:07C01FF03FF87F7C7E7CFC7EFE7EFE7EFE7EFE7E7E7C7E7C3FF81FF007C00000 +278B:07C01FF03FF8783C701CF39EFF9EFE3EF8FEF3FE701C701C3FF81FF007C00000 +278C:07C01FF03FF8783C701CF39EFF9EFE3EFF9EF39E701C783C3FF81FF007C00000 +278D:07C01FF03FF87F1C7E1CFC9EF99EF39EE00EE00E7F9C7F9C3FF81FF007C00000 +278E:07C01FF03FF8701C701CF3FEF03EF01EFF9EF39E701C783C3FF81FF007C00000 +278F:07C01FF03FF8783C701CF3FEF03EF01EF39EF39E701C783C3FF81FF007C00000 +2790:07C01FF03FF8701C701CFF9EFF9EFF3EFC7EF9FE79FC79FC3FF81FF007C00000 +2791:07C01FF03FF8783C701CF39EF39EF83EF39EF39E701C783C3FF81FF007C00000 +2792:07C01FF03FF8783C701CF39EF39EF01EF81EFF9E701C783C3FF81FF007C00000 +2793:07C01FF03FF87B1C720CE24EF24EF24EF24EF24E720C731C3FF81FF007C00000 +2794:00001F800FC007E003F0FFF8FFFCFFFEFFFCFFF803F007E00FC01F8000000000 +2795:0000000003800380038003803FF83FF83FF80380038003800380000000000000 +2796:0000000000000000000000007FFC7FFC7FFC0000000000000000000000000000 +2797:0000000003800380038000007FFC7FFC7FFC0000038003800380000000000000 +2798:0000000008001C003E001E000F20032000E000F003F000700008000000000000 +2799:00000000000001000180E0C0FCF0FFFEFCF0E0C0018001000000000000000000 +279A:0000000000000008007003F000F000E003200F201E003E001C00080000000000 +279B:0000000000000200010001C000F0FFFE00F001C0010002000000000000000000 +279C:000000C001E001F000F87FFCFFFEFFFEFFFE7FFC00F801F001E000C000000000 +279D:000000000010001000180018FFFCFFFEFFFC0018001800100010000000000000 +279E:00000010001000180018FFFCFFFCFFFEFFFCFFFC001800180010001000000000 +279F:000000000000002000300038AAFCAAFEAAFC0038003000200000000000000000 +27A0:00000000000000200030AAF8AAFCAAFEAAFCAAF8003000200000000000000000 +27A1:000000000000002000300038FFFCFFFEFFFC0038003000200000000000000000 +27A2:400070002C00230010C01030080C07FE0FFC1FF01FC03F003C00700040000000 +27A3:400070003C003F001FC01FF00FFC07FE080C103010C023002C00700040000000 +27A4:400070003C003F001FC01FF00FFC07FE0FFC1FF01FC03F003C00700040000000 +27A5:00000000000080008010C0187FFC7FFE3FFC0018001000000000000000000000 +27A6:0000000000000000001000183FFC7FFE7FFCC018801080000000000000000000 +27A7:00000080008000C007C007E007E007F007E007E007C000C00080008000000000 +27A8:00000000000000400040FFE0FFF0FFFEFFF0FFE0004000400000000000000000 +27A9:000000000000006000707FD8400C4006400C7FD8007000600000000000000000 +27AA:000000000000006000707FE86004600260047FE8007000600000000000000000 +27AB:0000000000080018002400443F8240028006FF1EFE7C05F00FC00F000C000000 +27AC:00000C000F000FC005F0FE7CFF1E800640023F82004400240018000800000000 +27AD:00000000008000C0FFA0801080088004800E801CFFB87FF000E0004000000000 +27AE:0000004000E07FF0FFB8801C800E800480088010FFA000C00080000000000000 +27AF:00000000004000600050FFC8400440024007FFCE7FDC00780070002000000000 +27B0:0000000000631C2222221C0000000000 +27B1:00000020007000787FDCFFCE400740024004FFC8005000600040000000000000 +27B2:07C01FF03F787F3C7F1C000E000600020006000E7F1C7F3C3F781FF007C00000 +27B3:0000000000000000FE004908248C1FFE248C4908FE0000000000000000000000 +27B4:000000000400060007003F001F000F08008800580038007801F8000000000000 +27B5:000000000000000000007C083E0C1FFE3E0C7C08000000000000000000000000 +27B6:00000000000001F800780038005800880F081F003F0007000600040000000000 +27B7:0000000002000300038003803F881F880FD800F8007800F803F8000000000000 +27B8:0000000000000020FC107E183FFC1FFE3FFC7E18FC1000200000000000000000 +27B9:00000000000003F800F8007800F80FD81F883F88038003800300020000000000 +27BA:00000000006000F000F07838FF0CFFFEFF0C783800F000F00060000000000000 +27BB:000000000000004060E078F0FC78FFFEFC7878F060E000400000000000000000 +27BC:0000000000000000F8107C183E1C1FFE3E1C7C18F81000000000000000000000 +27BD:000000000000F860FC707E787FFC3FFE7FFC7E78FC70F8600000000000000000 +27BE:000000000000022001100088FFC40002FFC40088011002200000000000000000 +27BF:00000000000000000000E3C71C382244224422441C3800000000000000000000 +27C0:000000000000000040444850607E0000 +27C1:000000000100028002800440044009200AA01290145027C820083FF800000000 +27C2:000000000000000010101010107C0000 +27C3:0000000000000000000007F808001030104810481030080007F8000000000000 +27C4:000000000000000000001FE000100C08120812080C0800101FE0000000000000 +27C5:000000001C22220404080810100E0000 +27C6:000000001C2222101008080404380000 +27C7:00000000000041412A22141408080000 +27C8:0000000000000000000040FE41002200220012001200090008FE000000000000 +27C9:000000000000000000007F020082004400440048004800907F10000000000000 +27CA:00000000101010103810101010100000 +27CB:0000000000000000000000100020004000800100020004000800000000000000 +27CC:000000003FFC2000100010000800080008000800080008001000100020002000 +27CD:0000000000000000000008000400020001000080004000200010000000000000 +27CE:0000000000001FFC1004108410841144114412241224141414141FFC00000000 +27CF:0000000000001FFC1414141412241224114411441084108410041FFC00000000 +27D0:0000000000000000000000800140022004100888041002200140008000000000 +27D1:00000000000008081414222A41410000 +27D2:000000000000000011101110111011101110111011101110092007C000000000 +27D3:000000000000000002021202027E0000 +27D4:00000000000000007E40404840400000 +27D5:000000000000000038040C0C0A14092408C408C409240A140C0C380400000000 +27D6:0000000000000000201C30302850249023102310249028503030201C00000000 +27D7:0000000000000000700E18181428124811881188124814281818700E00000000 +27D8:00000000010001000100010001000100010001000100010001001FF000000000 +27D9:000000001FF00100010001000100010001000100010001000100010000000000 +27DA:00000000000000000000028002807EFC02807EFC028002800000000000000000 +27DB:000000000000000000000280028002807EFC0280028002800000000000000000 +27DC:00000000000000000000000000001C00220023FC22001C000000000000000000 +27DD:0000000000000000000000004000400040007FFE400040004000000000000000 +27DE:0000000000000000000000000002000200027FFE000200020002000000000000 +27DF:000000003844443810101010107C0000 +27E0:0000001028284444FE44442828100000 +27E1:0000010002800280044008203018400430180820044002800280010000000000 +27E2:000000800140014002200410180CE002180C0410022001400140008000000000 +27E3:0000010002800280044008203018400730180820044002800280010000000000 +27E4:00001FFE10021002100210021002F002100210021002100210021FFE00000000 +27E5:00007FF840084008400840084008400F400840084008400840087FF800000000 +27E6:003E28282828282828282828283E0000 +27E7:007C14141414141414141414147C0000 +27E8:00000408081010202010100808040000 +27E9:00002010100808040408081010200000 +27EA:00000A141428285050282814140A0000 +27EB:000050282814140A0A14142828500000 +27EC:00000002040C1414141414140C040200 +27ED:00000040203028282828282830204000 +27EE:00000002040808080808080808040200 +27EF:00000040201010101010101010204000 +27F0:000000000100028006C00AA01AB02AA80AA00AA00AA00AA00AA00AA000000000 +27F1:000000000AA00AA00AA00AA00AA00AA02AA81AB00AA006C00280010000000000 +27F2:000000000000000001E00210040808042A041C0408040008021001E000000000 +27F3:0000000000000000078008401020201020542038201010000840078000000000 +27F4:0000000000000000038005480924FFFE09240548038000000000000000000000 +27F5:00000000000000000000100020007FFF20001000000000000000000000000000 +27F6:0000000000000000000000080004FFFE00040008000000000000000000000000 +27F7:00000000000000000000100820047FFE20041008000000000000000000000000 +27F8:0000000000000000100020007FFE80007FFE2000100000000000000000000000 +27F9:000000000000000000100008FFFC0002FFFC0008001000000000000000000000 +27FA:0000000000000000081010083FFC40023FFC1008081000000000000000000000 +27FB:00000000000000000000100220027FFE20021002000000000000000000000000 +27FC:00000000000000000000400840047FFE40044008000000000000000000000000 +27FD:0000000000000000080210023FFE40023FFE1002080200000000000000000000 +27FE:0000000000000000401040087FFC40027FFC4008401000000000000000000000 +27FF:0000000000000000000000082224D55E08840008000000000000000000000000 +2800:00000022000022000022000022000000 +2801:00000032300022000022000022000000 +2802:00000022000032300022000022000000 +2803:00000032300032300022000022000000 +2804:00000022000022000032300022000000 +2805:00000032300022000032300022000000 +2806:00000022000032300032300022000000 +2807:00000032300032300032300022000000 +2808:00000026060022000022000022000000 +2809:00000036360022000022000022000000 +280A:00000026060032300022000022000000 +280B:00000036360032300022000022000000 +280C:00000026060022000032300022000000 +280D:00000036360022000032300022000000 +280E:00000026060032300032300022000000 +280F:00000036360032300032300022000000 +2810:00000022000026060022000022000000 +2811:00000032300026060022000022000000 +2812:00000022000036360022000022000000 +2813:00000032300036360022000022000000 +2814:00000022000026060032300022000000 +2815:00000032300026060032300022000000 +2816:00000022000036360032300022000000 +2817:00000032300036360032300022000000 +2818:00000026060026060022000022000000 +2819:00000036360026060022000022000000 +281A:00000026060036360022000022000000 +281B:00000036360036360022000022000000 +281C:00000026060026060032300022000000 +281D:00000036360026060032300022000000 +281E:00000026060036360032300022000000 +281F:00000036360036360032300022000000 +2820:00000022000022000026060022000000 +2821:00000032300022000026060022000000 +2822:00000022000032300026060022000000 +2823:00000032300032300026060022000000 +2824:00000022000022000036360022000000 +2825:00000032300022000036360022000000 +2826:00000022000032300036360022000000 +2827:00000032300032300036360022000000 +2828:00000026060022000026060022000000 +2829:00000036360022000026060022000000 +282A:00000026060032300026060022000000 +282B:00000036360032300026060022000000 +282C:00000026060022000036360022000000 +282D:00000036360022000036360022000000 +282E:00000026060032300036360022000000 +282F:00000036360032300036360022000000 +2830:00000022000026060026060022000000 +2831:00000032300026060026060022000000 +2832:00000022000036360026060022000000 +2833:00000032300036360026060022000000 +2834:00000022000026060036360022000000 +2835:00000032300026060036360022000000 +2836:00000022000036360036360022000000 +2837:00000032300036360036360022000000 +2838:00000026060026060026060022000000 +2839:00000036360026060026060022000000 +283A:00000026060036360026060022000000 +283B:00000036360036360026060022000000 +283C:00000026060026060036360022000000 +283D:00000036360026060036360022000000 +283E:00000026060036360036360022000000 +283F:00000036360036360036360022000000 +2840:00000022000022000022000032300000 +2841:00000032300022000022000032300000 +2842:00000022000032300022000032300000 +2843:00000032300032300022000032300000 +2844:00000022000022000032300032300000 +2845:00000032300022000032300032300000 +2846:00000022000032300032300032300000 +2847:00000032300032300032300032300000 +2848:00000026060022000022000032300000 +2849:00000036360022000022000032300000 +284A:00000026060032300022000032300000 +284B:00000036360032300022000032300000 +284C:00000026060022000032300032300000 +284D:00000036360022000032300032300000 +284E:00000026060032300032300032300000 +284F:00000036360032300032300032300000 +2850:00000022000026060022000032300000 +2851:00000032300026060022000032300000 +2852:00000022000036360022000032300000 +2853:00000032300036360022000032300000 +2854:00000022000026060032300032300000 +2855:00000032300026060032300032300000 +2856:00000022000036360032300032300000 +2857:00000032300036360032300032300000 +2858:00000026060026060022000032300000 +2859:00000036360026060022000032300000 +285A:00000026060036360022000032300000 +285B:00000036360036360022000032300000 +285C:00000026060026060032300032300000 +285D:00000036360026060032300032300000 +285E:00000026060036360032300032300000 +285F:00000036360036360032300032300000 +2860:00000022000022000026060032300000 +2861:00000032300022000026060032300000 +2862:00000022000032300026060032300000 +2863:00000032300032300026060032300000 +2864:00000022000022000036360032300000 +2865:00000032300022000036360032300000 +2866:00000022000032300036360032300000 +2867:00000032300032300036360032300000 +2868:00000026060022000026060032300000 +2869:00000036360022000026060032300000 +286A:00000026060032300026060032300000 +286B:00000036360032300026060032300000 +286C:00000026060022000036360032300000 +286D:00000036360022000036360032300000 +286E:00000026060032300036360032300000 +286F:00000036360032300036360032300000 +2870:00000022000026060026060032300000 +2871:00000032300026060026060032300000 +2872:00000022000036360026060032300000 +2873:00000032300036360026060032300000 +2874:00000022000026060036360032300000 +2875:00000032300026060036360032300000 +2876:00000022000036360036360032300000 +2877:00000032300036360036360032300000 +2878:00000026060026060026060032300000 +2879:00000036360026060026060032300000 +287A:00000026060036360026060032300000 +287B:00000036360036360026060032300000 +287C:00000026060026060036360032300000 +287D:00000036360026060036360032300000 +287E:00000026060036360036360032300000 +287F:00000036360036360036360032300000 +2880:00000022000022000022000026060000 +2881:00000032300022000022000026060000 +2882:00000022000032300022000026060000 +2883:00000032300032300022000026060000 +2884:00000022000022000032300026060000 +2885:00000032300022000032300026060000 +2886:00000022000032300032300026060000 +2887:00000032300032300032300026060000 +2888:00000026060022000022000026060000 +2889:00000036360022000022000026060000 +288A:00000026060032300022000026060000 +288B:00000036360032300022000026060000 +288C:00000026060022000032300026060000 +288D:00000036360022000032300026060000 +288E:00000026060032300032300026060000 +288F:00000036360032300032300026060000 +2890:00000022000026060022000026060000 +2891:00000032300026060022000026060000 +2892:00000022000036360022000026060000 +2893:00000032300036360022000026060000 +2894:00000022000026060032300026060000 +2895:00000032300026060032300026060000 +2896:00000022000036360032300026060000 +2897:00000032300036360032300026060000 +2898:00000026060026060022000026060000 +2899:00000036360026060022000026060000 +289A:00000026060036360022000026060000 +289B:00000036360036360022000026060000 +289C:00000026060026060032300026060000 +289D:00000036360026060032300026060000 +289E:00000026060036360032300026060000 +289F:00000036360036360032300026060000 +28A0:00000022000022000026060026060000 +28A1:00000032300022000026060026060000 +28A2:00000022000032300026060026060000 +28A3:00000032300032300026060026060000 +28A4:00000022000022000036360026060000 +28A5:00000032300022000036360026060000 +28A6:00000022000032300036360026060000 +28A7:00000032300032300036360026060000 +28A8:00000026060022000026060026060000 +28A9:00000036360022000026060026060000 +28AA:00000026060032300026060026060000 +28AB:00000036360032300026060026060000 +28AC:00000026060022000036360026060000 +28AD:00000036360022000036360026060000 +28AE:00000026060032300036360026060000 +28AF:00000036360032300036360026060000 +28B0:00000022000026060026060026060000 +28B1:00000032300026060026060026060000 +28B2:00000022000036360026060026060000 +28B3:00000032300036360026060026060000 +28B4:00000022000026060036360026060000 +28B5:00000032300026060036360026060000 +28B6:00000022000036360036360026060000 +28B7:00000032300036360036360026060000 +28B8:00000026060026060026060026060000 +28B9:00000036360026060026060026060000 +28BA:00000026060036360026060026060000 +28BB:00000036360036360026060026060000 +28BC:00000026060026060036360026060000 +28BD:00000036360026060036360026060000 +28BE:00000026060036360036360026060000 +28BF:00000036360036360036360026060000 +28C0:00000022000022000022000036360000 +28C1:00000032300022000022000036360000 +28C2:00000022000032300022000036360000 +28C3:00000032300032300022000036360000 +28C4:00000022000022000032300036360000 +28C5:00000032300022000032300036360000 +28C6:00000022000032300032300036360000 +28C7:00000032300032300032300036360000 +28C8:00000026060022000022000036360000 +28C9:00000036360022000022000036360000 +28CA:00000026060032300022000036360000 +28CB:00000036360032300022000036360000 +28CC:00000026060022000032300036360000 +28CD:00000036360022000032300036360000 +28CE:00000026060032300032300036360000 +28CF:00000036360032300032300036360000 +28D0:00000022000026060022000036360000 +28D1:00000032300026060022000036360000 +28D2:00000022000036360022000036360000 +28D3:00000032300036360022000036360000 +28D4:00000022000026060032300036360000 +28D5:00000032300026060032300036360000 +28D6:00000022000036360032300036360000 +28D7:00000032300036360032300036360000 +28D8:00000026060026060022000036360000 +28D9:00000036360026060022000036360000 +28DA:00000026060036360022000036360000 +28DB:00000036360036360022000036360000 +28DC:00000026060026060032300036360000 +28DD:00000036360026060032300036360000 +28DE:00000026060036360032300036360000 +28DF:00000036360036360032300036360000 +28E0:00000022000022000026060036360000 +28E1:00000032300022000026060036360000 +28E2:00000022000032300026060036360000 +28E3:00000032300032300026060036360000 +28E4:00000022000022000036360036360000 +28E5:00000032300022000036360036360000 +28E6:00000022000032300036360036360000 +28E7:00000032300032300036360036360000 +28E8:00000026060022000026060036360000 +28E9:00000036360022000026060036360000 +28EA:00000026060032300026060036360000 +28EB:00000036360032300026060036360000 +28EC:00000026060022000036360036360000 +28ED:00000036360022000036360036360000 +28EE:00000026060032300036360036360000 +28EF:00000036360032300036360036360000 +28F0:00000022000026060026060036360000 +28F1:00000032300026060026060036360000 +28F2:00000022000036360026060036360000 +28F3:00000032300036360026060036360000 +28F4:00000022000026060036360036360000 +28F5:00000032300026060036360036360000 +28F6:00000022000036360036360036360000 +28F7:00000032300036360036360036360000 +28F8:00000026060026060026060036360000 +28F9:00000036360026060026060036360000 +28FA:00000026060036360026060036360000 +28FB:00000036360036360026060036360000 +28FC:00000026060026060036360036360000 +28FD:00000036360026060036360036360000 +28FE:00000026060036360036360036360000 +28FF:00000036360036360036360036360000 +2900:0000000000000000000002280214FFFE02140228000000000000000000000000 +2901:0000000000000000000005280514FFFE05140528000000000000000000000000 +2902:0000000000000000088010803FFF40803FFF1080088000000000000000000000 +2903:000000000000000001100108FFFC0102FFFC0108011000000000000000000000 +2904:0000000000000000049008881FFC20821FFC0888049000000000000000000000 +2905:00000000000000000000402840147FFE40144028000000000000000000000000 +2906:0000000000000000080010023FFE40023FFE1002080000000000000000000000 +2907:0000000000000000001040087FFC40027FFC4008001000000000000000000000 +2908:080808080808083E0808082A1C080000 +2909:0000081C2A08083E0808080808080808 +290A:000000000100038005400D601550054005400540054005400540054000000000 +290B:00000000054005400540054005400540054015500D6005400380010000000000 +290C:00000000000000000000100020007F7F20001000000000000000000000000000 +290D:0000000000000000000000080004FEFE00040008000000000000000000000000 +290E:00000000000000000000100020007DEF20001000000000000000000000000000 +290F:0000000000000000000000080004F7BE00040008000000000000000000000000 +2910:00000000000000000000402820141B7E20144028000000000000000000000000 +2911:0000000000000000000000080004AAAE00040008000000000000000000000000 +2912:00007F1C2A0808080808080808080808 +2913:08080808080808080808082A1C7F0000 +2914:00000000000000000000410821041FFE21044108000000000000000000000000 +2915:00000000000000000000428822841FFE22844288000000000000000000000000 +2916:00000000000000000000402820141FFE20144028000000000000000000000000 +2917:00000000000000000000412821141FFE21144128000000000000000000000000 +2918:00000000000000000000452825141FFE25144528000000000000000000000000 +2919:00000000000000000000000200047FF800040002000000000000000000000000 +291A:00000000000000000000400020001FFE20004000000000000000000000000000 +291B:00000000000000000000001200247FF800240012000000000000000000000000 +291C:00000000000000000000480024001FFE24004800000000000000000000000000 +291D:0000000000000000000011003A007FFF3A001100000000000000000000000000 +291E:000000000000000000000044002E7FFF002E0044000000000000000000000000 +291F:0000000000000000000011023A027FFE3A021102000000000000000000000000 +2920:000000000000000000004088405C7FFE405C4088000000000000000000000000 +2921:00003C00300028002400020001000080004000200012000A0006001E00000000 +2922:0000001E0006000A0012002000400080010002002400280030003C0000000000 +2923:00003C0030002800240002000100008000400020001000080024001800000000 +2924:0000007800180028004800800100020004000800100020004800300000000000 +2925:0000300048002000100008000400020001000080004800280018007800000000 +2926:0000003000480010002000400080010002000400480050006000780000000000 +2927:0000781E6006500A481204200240018001800240042008101008200400000000 +2928:0000001E2006100A08120420024001800180024004200812100A2006001E0000 +2929:00002004100808100420024001800180024004204812500A6006781E00000000 +292A:0000780060045008481004200240018001800240042048105008600478000000 +292B:0000000020041008081004200040008001000200042008101008200400000000 +292C:0000000020041008081004200200010000800040042008101008200400000000 +292D:0000001E2006100A08120420020001000080004004200812100A2006001E0000 +292E:0000001E2006100A08120420004000800100020004200812100A2006001E0000 +292F:0000001E2006100A081204200200010000800040042008101008200400000000 +2930:00002004100808100420004000800100020004200812100A2006001E00000000 +2931:0000781E6006500A481204200040008001000200042008101008200400000000 +2932:0000781E6006500A481204200200010000800040042008101008200400000000 +2933:000000000000000000003C08420481FE00040008000000000000000000000000 +2934:0000001000380054001000100020FFC000000000000000000000000000000000 +2935:00000000FFC00020001000100010005400380010000000000000000000000000 +2936:00080008000800080008040808101FE008000400000000000000000000000000 +2937:100010001000100010001020081007F800100020000000000000000000000000 +2938:000020100808040404042828303C0000 +2939:0000040810102020202014140C3C0000 +293A:00000000000000000000000023C02C3030083C04000000000000000000000000 +293B:000000000000000000000000203C100C0C3403C4000000000000000000000000 +293C:00000000000000000000000003C40C34100C203C070000000000000000000000 +293D:00000000000000000000000023C02C3030083C4400E000400000000000000000 +293E:00000000000000100008000400043C0430082C3023C000000000000000000000 +293F:0000000000000800100020002000203C100C0C3403C400000000000000000000 +2940:000000000080010003800D601090101020082008101010100C60038000000000 +2941:000000000200010003800D601210101020082008101010100C60038000000000 +2942:000000000000000800047FFE00040008100020007E0020001000000000000000 +2943:000000000000100020007FFE2000100000080004007E00040008000000000000 +2944:00000000000000080004007E00040008100020007FFE20001000000000000000 +2945:0000000000000000000000080004FFFE00040008080008003E00080008000000 +2946:0000000000000000000020004000FFFF400020000020002000F8002000200000 +2947:0000000000000000001011080A04FFFE0A041108001000000000000000000000 +2948:0000000000000000101023884444FFFE44442388101000000000000000000000 +2949:00001038543854101010384444380000 +294A:00000000000000000000100020007FFE00040008000000000000000000000000 +294B:00000000000000000000000800047FFE20001000000000000000000000000000 +294C:00001018141010101010105030100000 +294D:00001030501010101010101418100000 +294E:00000000000000000000100820047FFE00000000000000000000000000000000 +294F:00002030282020202020202830200000 +2950:00000000000000000000000000007FFE20041008000000000000000000000000 +2951:00000818280808080808082818080000 +2952:00000000000000000000480050007FFF40004000000000000000000000000000 +2953:000000000000000000000012000AFFFE00020002000000000000000000000000 +2954:00003E080C0A08080808080808080808 +2955:000008080808080808080A0C083E0000 +2956:00000000000000000000400040007FFF50004800000000000000000000000000 +2957:0000000000000000000000020002FFFE000A0012000000000000000000000000 +2958:00003E08182808080808080808080808 +2959:000008080808080808082818083E0000 +295A:00000000000000000000080210023FFE00020002000000000000000000000000 +295B:00000000000000000000401040087FFC40004000000000000000000000000000 +295C:000010181410101010101010107C0000 +295D:00007C10101010101010101418100000 +295E:00000000000000000000000200023FFE10020802000000000000000000000000 +295F:00000000000000000000400040007FFC40084010000000000000000000000000 +2960:000010305010101010101010107C0000 +2961:00007C10101010101010105030100000 +2962:000000000000100020007FFE0000000000007FFE200010000000000000000000 +2963:00000000022006300A2802200220022002200220022002200220022000000000 +2964:000000000000000800047FFE0000000000007FFE000400080000000000000000 +2965:000000000220022002200220022002200220022002200A280630022000000000 +2966:000000000000100020007FFE0000000800047FFE000000000000000000000000 +2967:000000000000000000007FFE2000100000007FFE000400080000000000000000 +2968:000000000000000800047FFE0000100020007FFE000000000000000000000000 +2969:000000000000000000007FFE0004000800007FFE200010000000000000000000 +296A:0000000000000000100020007FFE00007FFE0000000000000000000000000000 +296B:0000000000000000000000007FFE00007FFE2000100000000000000000000000 +296C:0000000000000000000800047FFE00007FFE0000000000000000000000000000 +296D:0000000000000000000000007FFE00007FFE0004000800000000000000000000 +296E:00000000022006200A2002200220022002200220022002280230022000000000 +296F:000000000220023002280220022002200220022002200A200620022000000000 +2970:000000000000000000007FFC000200027FFC0000000000000000000000000000 +2971:0000000000001F8000001F880004FFFE00040008000000000000000000000000 +2972:0000000000003800444003880004FFFE00040008000000000000000000000000 +2973:00000000000000000000100020007FFF200011C00222001C0000000000000000 +2974:0000000000000000000000080004FFFE00043808444003800000000000000000 +2975:0000000000000000000000080004FFFE38044448038038004440038000000000 +2976:0000000000180060018006000800060001800060021804000FF8040002000000 +2977:00000000000000060018106021807FF021801060001800060000000000000000 +2978:000000000C00030000C000300008003000C003000C2000100FF8001000200000 +2979:0000000003F80400080008000800040003F80000002000100FF8001000200000 +297A:00000000000000000000000001FE120024007FFE2400120001FE000000000000 +297B:000000000FE0001000080008000800100FE00000020004000FF8040002000000 +297C:0000000000204040201F204040200000 +297D:0000000000020101027C020101020000 +297E:000000000000000000000C601290010001000100010001000100000000000000 +297F:00000000000000000000000001000100010001000100010012900C6000000000 +2980:0000002A2A2A2A2A2A2A2A2A2A2A2A00 +2981:000000000000183C7E7E3C1800000000 +2982:00000000182424180000182424180000 +2983:00001E24241414244424141424241E00 +2984:00007824242828242224282824247800 +2985:0000000C181828282828282818180C00 +2986:00000030181814141414141418183000 +2987:0000000C141424242424242414140C00 +2988:00000030282824242424242428283000 +2989:000000040C0C1414242414140C0C0400 +298A:00000020303028282424282830302000 +298B:0000000E0808080808080808080E000E +298C:00000070101010101010101010700070 +298D:0000001E181412101010101010101E00 +298E:00000078080808080808084828187800 +298F:0000001E101010101010101214181E00 +2990:00000078182848080808080808087800 +2991:00000004080810102626101008080400 +2992:00000020101008086464080810102000 +2993:0000000000000040008C00F0018003000D0011000D000300018000F0008C0040 +2994:00000000000001001880078000C00060005800440058006000C0078018800100 +2995:00000000000000A019400740038002E0029802840298026001C0074018A00000 +2996:0000000000000280014C017000E003A00CA010A00CA0032001C00170028C0000 +2997:0000000C183838383838383838180C00 +2998:00000030181C1C1C1C1C1C1C1C183000 +2999:00000000080000080000080000080000 +299A:00201008102010081020100810201008 +299B:000000000000000040281028247E2000 +299C:000000000000004040404070507E0000 +299D:000000000000404040784454447F0000 +299E:0000000000000000001000200040009C012002180404083810003FFE00000000 +299F:000000000000000000000618207E0000 +29A0:00000000000000503028262830500000 +29A1:0000000000000000413E631408080000 +29A2:00000000000000007E20100804020000 +29A3:000000000000000040201008047E0000 +29A4:000000000000000002040810207E007E +29A5:000000000000000040201008047E007E +29A6:000000000000000000000040201E0000 +29A7:00000000000000000000001E20400000 +29A8:00000000000000780018012800C800C0012002200410081010103FFE00100000 +29A9:0000000000000F000C000A4009800180024002200410040804043FFE04000000 +29AA:00000000000000103FFE1010081004100220012000C000C80128001800780000 +29AB:00000000000004003FFE04040408041002200240018009800A400C000F000000 +29AC:00000000000010001000103C3E0C119410641060109011001200140018001000 +29AD:000000000000000800083C08307C298826080608090800880048002800180008 +29AE:0000000000001000180014001200110010901060106411943E0C103C10001000 +29AF:000000000000000800180028004800880908060826082988307C3C0800080008 +29B0:0000000000000000000017C0082014101210111010901050082007D000000000 +29B1:00000000000007C0000007D0082010501090111012101410082017C000000000 +29B2:0000010002800100000007D0082010501090111012101410082017C000000000 +29B3:010000800FC00080010007D0082010501090111012101410082017C000000000 +29B4:020004000FC00400020007D0082010501090111012101410082017C000000000 +29B5:0000000000000000000007C00820101010103FF810101010082007C000000000 +29B6:0000000000000000000007C0092011101110111011101110092007C000000000 +29B7:0000000000000000000007C0082012901290129012901290082007C000000000 +29B8:0000000000000000000007C0082014101210111010901050082007C000000000 +29B9:0000000000000000000007C00820111011101110111017D0082007C000000000 +29BA:0000000000000000000007C00920111011101FF010101010082007C000000000 +29BB:0000000000000000000017D0082014501290111012901450082017D000000000 +29BC:00000000000003E004100808122410441084110412240808041003E000000000 +29BD:0000010003800540010007C0092011101110111011101110092007C001000000 +29BE:00000000000003E0041009C81224141414141414122409C8041003E000000000 +29BF:00000000000003E0041009C813E417F417F417F413E409C8041003E000000000 +29C0:00000000000003E00410080810C413041404130410C40808041003E000000000 +29C1:00000000000003E004100808118410641014106411840808041003E000000000 +29C2:000000000000000000001F0020804040404840544048404020801F0000000000 +29C3:000000000000000000000F8010402020203C2020203C202010400F8000000000 +29C4:0000000000001FFC100C101410241044108411041204140418041FFC00000000 +29C5:0000000000001FFC18041404120411041084104410241014100C1FFC00000000 +29C6:0000000000001FFC10041084149412A411C412A41494108410041FFC00000000 +29C7:0000000000001FFC1004100411C412241224122411C4100410041FFC00000000 +29C8:0000000000001FFC1004100413E412241224122413E4100410041FFC00000000 +29C9:000000003FC020402040204023FC224422443FC402040204020403FC00000000 +29CA:000001000000010002800280044004400820082010101010200820087FFC0000 +29CB:00000000010002800280044004400820082010101010200820087FFC00007FFC +29CC:0000008001400140022002200410041009C80A0811841044238220027FFF0000 +29CD:0000000001000280028004400440082008201010101020082008FFFE00000000 +29CE:1800160011801060101010601180163018D003100C1010100C10031000D00030 +29CF:00000000000000000000006801A80628182820281828062801A8006800000000 +29D0:000000000000000000002C002B0028C028302808283028C02B002C0000000000 +29D1:00000000000041637579756341000000 +29D2:0000000000004163574F576341000000 +29D3:0000000000004163777F776341000000 +29D4:00000000000041627478746241000000 +29D5:0000000000004123170F172341000000 +29D6:00000000000000FE4428102844FE0000 +29D7:00000000000000FE7C3810387CFE0000 +29D8:00002010081020100810201008102000 +29D9:00000810201008102010081020100800 +29DA:0000000004400220011002200440022001100220044002200110022004400000 +29DB:0000000001100220044002200110022004400220011002200440022001100000 +29DC:00000000000000304949360000000000 +29DD:00000000001C22364949360000000000 +29DE:000000000000082A5D5D2A0800000000 +29DF:0000000000000000000000000000300C48124FF24812300C0000000000000000 +29E0:000000003FF83FFC3004300430043004300430043004300430043FFC00000000 +29E1:0000000000000000061A627E007E0000 +29E2:00000000000000000000000000000000210821082108210821083FF800000000 +29E3:00000000000000120024004800907FFE02407FFE090012002400480000000000 +29E4:00000000064009920024004800907FFE02407FFE090012002400480000000000 +29E5:00000000000000000012002400487FFE01207FFE04807FFE1200240048000000 +29E6:0000000000000000400240027FFE400240027FFE400240020000000000000000 +29E7:0000000000000000010001001FF0010001001FF0010001000000000000000000 +29E8:0000000000007FFC3F083F081F101F100F200F20074007400380038001000000 +29E9:0000000000007FFC21F821F811F011F009E009E005C005C00380038001000000 +29EA:0000000000000100038007C00FE01FF00FE007C0038001000540038001000000 +29EB:00001038387C7CFE7C7C383810000000 +29EC:000000000000000001C00220041004100410022001C0008002A001C000800000 +29ED:000000000000000001C003E007F007F007F003E001C0008002A001C000800000 +29EE:0000007C10FE8282828282FE107C0000 +29EF:0000007C10FEFEFEFEFEFEFE107C0000 +29F0:0000007C1010284482442810107C0000 +29F1:0000007C1010387CFE7C3810107C0000 +29F2:0000007C1038448282824438107C0000 +29F3:0000007C10387CFEFEFE7C38107C0000 +29F4:00000000000000000000400800041FFE00044008000000000000000000000000 +29F5:00000000404020201010080804040000 +29F6:00007800040408081010202040400000 +29F7:000000404020207C1008080404000000 +29F8:01010202040408081010202040400000 +29F9:80804040202010100808040402020000 +29FA:00000000002828FE2828000000000000 +29FB:00000000005454FE5454000000000000 +29FC:00000202041860806018040202000000 +29FD:0000808040300C020C30408080000000 +29FE:00000000000007C007C00380610C793C7FFC793C610C0380038007C007C00000 +29FF:00000000000000000000600C783C7FFC783C600C000000000000000000000000 +2A00:00000000000003E004100808100410041084100410040808041003E000000000 +2A01:00000000000003E004900888108410841FFC108410840888049003E000000000 +2A02:00000000000003E004100C18122411441084114412240C18041003E000000000 +2A03:0000000000001020102010201020102013201320102010200840078000000000 +2A04:00000000000010101010101010101110111017D011101110082007C000000000 +2A05:0000000000001FF0101010101010101010101010101010101010101000000000 +2A06:00000000000010101010101010101010101010101010101010101FF000000000 +2A07:000000000000024005A005A00990099012481248242424244812481200000000 +2A08:0000000000004812481224242424124812480990099005A005A0024000000000 +2A09:0000000000002008101008200440028001000280044008201010200800000000 +2A0A:00000000000000001FF010100B0004800A400A4004800B0010101FF000000000 +2A0B:00060A087E4A28180818284A7E082830 +2A0C:0000092416DA12481248124812481248124812481248124812485B6824900000 +2A0D:00060A08080808083E08080808283000 +2A0E:00060A080808083E083E080808283000 +2A0F:00060A0808080A0C0818280808283000 +2A10:00060A0808081C2A281C080808283000 +2A11:00060A08080808082F2B1D0808283000 +2A12:00060A0808080E020A020E0808283000 +2A13:00060A0808080C020A020C0808283000 +2A14:000C141010101E1105111E1010506000 +2A15:00060A0808081C222A221C0808283000 +2A16:00060A0808083E2A2A2A3E0808283000 +2A17:00060A08082848FE492A080808283000 +2A18:00060A0808492A1C081C2A4908283000 +2A19:00060A0808081C2A2A2A2A0808283000 +2A1A:00060A0808082A2A2A2A1C0808283000 +2A1B:00060A0808080808080808082830003E +2A1C:3E00060A080808080808080808283000 +2A1D:0000000000000000100818181428124811881188124814281818100800000000 +2A1E:0000000002060A122222120A06020000 +2A1F:000000000018242418001824241C0418 +2A20:0000000000001100088004400220011000880110022004400880110000000000 +2A21:20302824202020202020202020200000 +2A22:0000081408000808087F080808000000 +2A23:0000081422000808087F080808000000 +2A24:000000324C000808087F080808000000 +2A25:0000000000000808087F080808000800 +2A26:0000000000000808087F08080800324C +2A27:000000000000101010FE101611020407 +2A28:0000000000000808087F081C3E080000 +2A29:0000000018080810007E000000000000 +2A2A:0000000000000000007E000800000000 +2A2B:0000000000000040007E000200000000 +2A2C:0000000000000002007E004000000000 +2A2D:00000000000000000180060008800880108017F0108008800880060001800000 +2A2E:0000000000000000018000600110011001080FE8010801100110006001800000 +2A2F:00000000000000221408142200000000 +2A30:00000000181800422418244200000000 +2A31:000000000000004224182442007E0000 +2A32:0000000000000042241824427E000000 +2A33:0000000000000000000002200140088805500220055008880140022000000000 +2A34:00000000000000000180060008000A10112010C011200A100800060001800000 +2A35:0000000000000000018000600010085004880308048808500010006001800000 +2A36:000001800240000003C00C3010081428224421842244142810080C3003C00000 +2A37:000007E0181823C44C32500A9429A245A185A2459429500A4C3223C4181807E0 +2A38:0000000000000000000003E00410088808080BE808080888041003E000000000 +2A39:00000100028002800440044008200920111017D02108210840047FFC00000000 +2A3A:00000100028002800440044008200820101017D02008200840047FFC00000000 +2A3B:00000100028002800440044008200C60129011102288244840047FFC00000000 +2A3C:000000000000000002027E0000000000 +2A3D:000000000000000040407E0000000000 +2A3E:000000000008141408000814140C0418 +2A3F:000000002222222222222222227F0000 +2A40:0000000000003C42425A5A4242420000 +2A41:0000000000004141415D4141413E0000 +2A42:000000007E00424242424242423C0000 +2A43:000000007E003C424242424242420000 +2A44:0000000000003E414141414955550000 +2A45:000000000000555549414141413E0000 +2A46:00000000002424241800182424240000 +2A47:00000000001824242400242424180000 +2A48:00000024242418003C00182424240000 +2A49:00000018242424003C00242424180000 +2A4A:000000000000000000009292926C0000 +2A4B:000000000000000000006C9292920000 +2A4C:0000000000FF424242424242423C0000 +2A4D:0000000000003C424242424242FF0000 +2A4E:0000000000001FF0101017D01450145014501450145014501450145000000000 +2A4F:0000000000001450145014501450145014501450145017D010101FF000000000 +2A50:00000000000000003FFE1004100411441084155412241554108C094807F00000 +2A51:0000000000000100000001000280028004400440082008201010101000000000 +2A52:0000000000000100000010101010082008200440044002800280010000000000 +2A53:0000000000000100028002800440044008200920129012902448244800000000 +2A54:0000000000002448244812901290092008200440044002800280010000000000 +2A55:00000000000000000000024005A005A009900990124812482424242400000000 +2A56:0000000000000000000024242424124812480990099005A005A0024000000000 +2A57:0000000000000000100810101020104010801100120014001800100000000000 +2A58:00000000000000000004000C0014002400440084010402040404080400000000 +2A59:000000000000000000004004200811100AA004400AA011102008400400000000 +2A5A:0000000000000100038003800540054009200920111011102108210800000000 +2A5B:0000000000002108210811101110092009200540054003800380010000000000 +2A5C:000000000000010002800280044004403FF80820101010102008200800000000 +2A5D:000000000000200820081010101008203FF80440044002800280010000000000 +2A5E:00001FF000001FF0000001000280028004400440082008201010101000000000 +2A5F:00000000000001000280028004400440082008201010101000001FF000000000 +2A60:00000000000001000280028004400440082008201010101000001FF000001FF0 +2A61:00000000000000000000000000000000000004400280010000001FF000000000 +2A62:0000000000001FF000001FF00000101010100820082004400440028002800100 +2A63:00000000000010101010082008200440044002800280010000001FF000001FF0 +2A64:000000000000001800680188060818083FF81808060801880068001800000000 +2A65:00000000000030002C00230020C020303FF8203020C023002C00300000000000 +2A66:000000000000007F007F000800000000 +2A67:000000000008007F007F007F00000000 +2A68:00000000000000000000028002803FF802803FF802803FF80280000000000000 +2A69:00000000000000000000054005403FF805403FF805403FF80540000000000000 +2A6A:00000000000020006498000000000000 +2A6B:00000000000008006498004000000000 +2A6C:00000000000000649800FC0064980000 +2A6D:000000001000324C007E007E00000000 +2A6E:000000002A1C081C2A007F007F000000 +2A6F:00000030488400649800649800000000 +2A70:00000000649800649800FC00FC000000 +2A71:00000000007C007C0010107C10100000 +2A72:000000000010107C1010007C007C0000 +2A73:000000000000007E007E00324C000000 +2A74:00000000000000000000000000002BF8000000002BF800000000000000000000 +2A75:00000000000000000000000000007E7E0000000000007E7E0000000000000000 +2A76:00000000000000000000000000007BDE000000007BDE00000000000000000000 +2A77:00000000000024007E00007E00240000 +2A78:00000000000000000000124800003FFC00003FFC00003FFC0000000000000000 +2A79:0000000000000000003000C003000C4010A00C40030000C00030000000000000 +2A7A:000000000000000018000600018004600A100460018006001800000000000000 +2A7B:1800240008000800003008C003000C0010000C00030000C00030000000000000 +2A7C:0030004800100010180006100180006000100060018006001800000000000000 +2A7D:0000000000000000000000600180060008000600018008600600018000600000 +2A7E:000000000000000000000C00030000C0002000C003000C2000C003000C000000 +2A7F:0000000000000000000000600180060008400600018008600600018000600000 +2A80:000000000000000000000C00030000C0082000C003000C2000C003000C000000 +2A81:0000000000000000040000600180060008000600018008600600018000600000 +2A82:000000000000000000400C00030000C0002000C003000C2000C003000C000000 +2A83:0000000000000020000000600180060008000600018008600600018000600000 +2A84:000000000000080000000C00030000C0002000C003000C2000C003000C000000 +2A85:000000000000006001800600080006000180006000000000071008E0071008E0 +2A86:0000000000000C00030000C0002000C003000C00000000000E2011C00E2011C0 +2A87:00000000000000000060018006000800060001800060004000800FE002000400 +2A88:00000000000000000C00030000C0002000C003000C00004000800FE002000400 +2A89:0000006001800600080006000180006000100020075008E007100AE004000800 +2A8A:00000C00030000C0002000C003000C00002000400EA011C00E2015C008001000 +2A8B:00186080601800FC00FC006018041860 +2A8C:00601804186000FC00FC001860806018 +2A8D:000000000000006001800600080006000180006000000000071008E000000FF0 +2A8E:0000000000000C00030000C0002000C003000C00000000000E2011C000001FE0 +2A8F:00061820180600324C00601804186000 +2A90:00601804186000324C00061820180600 +2A91:000C3040300C6018041860007C007C00 +2A92:0060180418600C3040300C007C007C00 +2A93:000C3040300C40300C60180418620C30 +2A94:00300C020C30020C300618201846300C +2A95:0000000000000000000000600180060008600180060008000600018000600000 +2A96:000000000000000000000C00030000C00C20030000C0002000C003000C000000 +2A97:0000000000000000000000600180060008600180060008400600018000600000 +2A98:000000000000000000000C00030000C00C20030000C0042000C003000C000000 +2A99:00000000000000000FE000000FE0000000600180060008000600018000600000 +2A9A:00000000000000000FE000000FE000000C00030000C0002000C003000C000000 +2A9B:0000000000600180060008600180060008600180060008000600018000600000 +2A9C:000000000C00030000C00C20030000C00C20030000C0002000C003000C000000 +2A9D:00000000000000000000071008E00000003000C003000400030000C000300000 +2A9E:0000000000000000071008E0000000000C00030000C0002000C003000C000000 +2A9F:00000000071008E00000003000C003000400030000C0003000000FF000000FF0 +2AA0:0000000008E0071000000C00030000C0002000C003000C0000000FF000000FF0 +2AA1:00000000000000000000003000C003300CC011000CC0033000C0003000000000 +2AA2:0000000000000000000018000600198006600110066019800600180000000000 +2AA3:0000000000000000018C063018C0210018C00630018C00003FFC000000000000 +2AA4:0000000000000000060C01B000E0011000E001B0060C00000000000000000000 +2AA5:0000000000000000400430180C6002800C603018400400000000000000000000 +2AA6:000000000000000000000000000000C003200C1010100C10032000C000000000 +2AA7:0000000000000000000000000000060009801060101010600980060000000000 +2AA8:0000000000000000000000C003200C1010100C10032010C00C00030000C00000 +2AA9:0000000000000000000006000980106010101060098006100060018006000000 +2AAA:00000000000000000000003000C003000C001FF00C00030000C0003000000000 +2AAB:0000000000000000000018000600018000601FF0006001800600180000000000 +2AAC:000000000000003000C003000C001FF00C00030000C0003000001FF000000000 +2AAD:00000000000018000600018000601FF0006001800600180000001FF000000000 +2AAE:000000000000000000000000038004403C7800003FF800003FF8000000000000 +2AAF:0000000000000010002000C003001C00030000C00020001000001FF000000000 +2AB0:00000000000008000400030000C0003800C003000400080000000FF800000000 +2AB1:0000000000000010002000C003001C00030000C00020005000801FF002000400 +2AB2:00000000000010000800060001800070018006000800108001001FF004000800 +2AB3:00000010002000C003001C00030000C00020001000001FF000001FF000000000 +2AB4:000010000800060001800070018006000800100000001FF000001FF000000000 +2AB5:00000010002000C003001C00030000C00020003000401FF001001FF004000800 +2AB6:000010000800060001800070018006000800104000801FF002001FF008001000 +2AB7:0010002000C003001C00030000C000200010000007900860071008E000000000 +2AB8:10000800060001800070018006000800100000000E2011C00E2011C000000000 +2AB9:0010002000C003001C00030000C0002000500040079008E0071009E002000200 +2ABA:10000800060001800070018006000800108000800F2011C00E2013C004000400 +2ABB:0000000000000042008403180C6073800C600318008400420000000000000000 +2ABC:0000000000004200210018C0063001CE063018C0210042000000000000000000 +2ABD:0000000000000000000000000FF81000200026002600200010000FF800000000 +2ABE:0000000000000000000000003FE00010000800C800C8000800103FE000000000 +2ABF:0000003E4040403E0008083E08080000 +2AC0:0000007C0202027C0010107C10100000 +2AC1:0000003E4040403E0022140814220000 +2AC2:0000007C0202027C0044281028440000 +2AC3:000000001818003E4040403E007E0000 +2AC4:000000003030007C0202027C007E0000 +2AC5:00000000003E4040403E007E007E0000 +2AC6:00000000007C0202027C007E007E0000 +2AC7:0000000000003E404040403E00324C00 +2AC8:0000000000007C020202027C00324C00 +2AC9:00000000003E4040403E00324C324C00 +2ACA:00000000007C0202027C00324C324C00 +2ACB:000000003E4040403E00047E087E1000 +2ACC:000000007C0202027C00047E087E1000 +2ACD:00000000000000007FFE400040004000400040004000400040007F0000000000 +2ACE:00000000000000007FFE0002000200020002000200020002000200FE00000000 +2ACF:00000000000000000000000007F008101010101010101010081007F000000000 +2AD0:0000000000000000000000001FC01020101010101010101010201FC000000000 +2AD1:000000000000000007F008101010101010101010081007F000001FF000000000 +2AD2:00000000000000001FC01020101010101010101010201FC000001FF000000000 +2AD3:0000003E4040403E007C0202027C0000 +2AD4:0000007C0202027C003E4040403E0000 +2AD5:0000003E4040403E003E4040403E0000 +2AD6:0000007C0202027C007C0202027C0000 +2AD7:00000000000000000000000000003E3E0140014001403E3E0000000000000000 +2AD8:00000000000000000000000000003E3E014007F001403E3E0000000000000000 +2AD9:000000000000000007C009201110111011101110111011101110111000000000 +2ADA:000000000FE0010007C009201110111011101110111011101110111000000000 +2ADB:000000000100010007C009201110111011101110111011101110111001000100 +2ADC:000000000000000001000110012001400180111013101510092017C000000000 +2ADD:000000000000000001000100010001000100111011101110092007C000000000 +2ADE:0000000000040404043C040404040000 +2ADF:000000000000000000000000000000001FF00100010001000000000000000000 +2AE0:000000000000000000000000000000000100010001001FF00000000000000000 +2AE1:000000000000010001000138014001300108017001003FF80000000000000000 +2AE2:00000000000000000000200020003FF020003FF020003FF02000200000000000 +2AE3:0000000000000000000000140014001400143FF4001400140014001400000000 +2AE4:000000000000000000000008000800081FF800081FF800080008000800000000 +2AE5:000000000000000000000014001400143FF400143FF400140014001400000000 +2AE6:0000000000000000000028002800280028003FFC280028002800280000000000 +2AE7:0000000000000000000000001FF000001FF00100010001000000000000000000 +2AE8:0000000000000000000000000100010001001FF000001FF00000000000000000 +2AE9:0000000000000100010001001FF000001FF00100010001000000000000000000 +2AEA:00000000000000001FF002800280028002800280028002800280028000000000 +2AEB:00000000000000000280028002800280028002800280028002801FF000000000 +2AEC:000000000000000000000000000000001FF800081FF800080008000000000000 +2AED:000000000000000000000000000000001FF810001FF810001000000000000000 +2AEE:000000001818583818181C1A18180000 +2AEF:00000000384444381010101010100000 +2AF0:00000000101010101010384444380000 +2AF1:000000007C1010101010384444380000 +2AF2:0000000014141414147F141414140000 +2AF3:00000000000000000240024002400240024007500AE002400240024000000000 +2AF4:0000000000000000092009200920092009200920092009200920092000000000 +2AF5:0000000000000000092009200920092009203FF8092009200920092000000000 +2AF6:00000000181800001818000018180000 +2AF7:0000000000000018006001980660199822201998066001980060001800000000 +2AF8:00000000000030000C0033000CC03330088833300CC033000C00300000000000 +2AF9:0000000000600180060008000600018008600600018008600600018000600000 +2AFA:000000000C00030000C0002000C003000C2000C003000C2000C003000C000000 +2AFB:0000000000000000024802480490049009200920124012402480248000000000 +2AFC:0000000000000000092009200920092009200920092009200920092009200000 +2AFD:0000000000000000009000900120012002400240048004800900090000000000 +2AFE:00000000003828282828282828380000 +2AFF:00000000382828282828282828283800 +2B00:00000000000001F8010800880108022804580880110022001400080000000000 +2B01:0000000000003F00210022002100288034400220011000880050002000000000 +2B02:000000000000080014002200110008800458022801080088010801F800000000 +2B03:00000000000000200050008801100220344028802100220021003F0000000000 +2B04:0000000000000000081018182FF440022FF41818081000000000000000000000 +2B05:0000000000000000080018003FFC7FFC3FFC1800080000000000000000000000 +2B06:000010387CFE38383838383838380000 +2B07:00003838383838383838FE7C38100000 +2B08:00000000000001F801F800F801F803F807D80F801F003E001C00080000000000 +2B09:0000000000003F003F003E003F003F8037C003E001F000F80070002000000000 +2B0A:00000000000008001C003E001F000F8007D803F801F800F801F801F800000000 +2B0B:0000000000000020007000F801F003E037C03F803F003E003F003F0000000000 +2B0C:0000000000000000081018183FFC7FFE3FFC1818081000000000000000000000 +2B0D:000010387CFE38383838FE7C38100000 +2B0E:0000000000000000000000000000FFF80008002A001C00080000000000000000 +2B0F:0000000000000008001C002A0008FFF800000000000000000000000000000000 +2B10:00000000000000000000000000001FFF10005400380010000000000000000000 +2B11:00000000000010003800540010001FFF00000000000000000000000000000000 +2B12:000000000000000000001FF81FF81FF81FF81FF810081008100810081FF80000 +2B13:000000000000000000001FF810081008100810081FF81FF81FF81FF81FF80000 +2B14:000000000000000000001FF81FF817F813F811F810F81078103810181FF80000 +2B15:000000000000000000001FF818081C081E081F081F881FC81FE81FF81FF80000 +2B16:000000000000000000000180034007200F101F081F080F100720034001800000 +2B17:00000000000000000000018002C004E008F010F810F808F004E002C001800000 +2B18:00000000000000000000018003C007E00FF01FF8100808100420024001800000 +2B19:00000000000000000000018002400420081010081FF80FF007E003C001800000 +2B1A:0000000000002AA80000200800002008000020080000200800002AA800000000 +2B1B:00007FFE7FFE7FFE7FFE7FFE7FFE7FFE7FFE7FFE7FFE7FFE7FFE7FFE7FFE0000 +2B1C:00007FFE4002400240024002400240024002400240024002400240027FFE0000 +2B1D:00000000000000003C3C3C3C00000000 +2B1E:00000000000000003C24243C00000000 +2B1F:000000000000018003C007E00FF01FF83FFC1FF81FF80FF00FF007E000000000 +2B20:000000000000018002400420081010082004100810080810081007E000000000 +2B21:0000000000000000010006C0183020082008200820082008183006C001000000 +2B22:0000000000000000010007C01FF03FF83FF83FF83FF83FF81FF007C001000000 +2B23:000000000000000007E00FF01FF83FFC7FFE7FFE3FFC1FF80FF007E000000000 +2B24:0000000001C007F00FF81FFC1FFC3FFE3FFE3FFE1FFC1FFC0FF807F001C00000 +2B25:0000000000000010387CFE7C38100000 +2B26:00000000000000102844824428100000 +2B27:0000001038387C7CFE7C7C3838100000 +2B28:00000010282844448244442828100000 +2B29:00000000000010387C38100000000000 +2B2A:000000000000001038387C3838100000 +2B2B:00000000000000102828442828100000 +2B2C:000000000000000000000000000000000FE07FFCFFFEFFFE7FFC0FE000000000 +2B2D:000000000000000000000000000000000FE0701C80028002701C0FE000000000 +2B2E:00183C3C3C7E7E7E7E7E3C3C3C180000 +2B2F:00182424244242424242242424180000 +2B30:0000000000000000000010E021107FFF211010E0000000000000000000000000 +2B31:2040FF40202040FF40202040FF402000 +2B32:000000000000000001C012A024907FFF249012A001C000000000000000000000 +2B33:00000000000000000000100024447AAB21101000000000000000000000000000 +2B34:00000000000000000000142028207FFF28201420000000000000000000000000 +2B35:00000000000000000000145028507FFF28501450000000000000000000000000 +2B36:00000000000000000000140228027FFE28021402000000000000000000000000 +2B37:00000000000000000000140228047ED828041402000000000000000000000000 +2B38:0000000000000000000010002000755520001000000000000000000000000000 +2B39:00000000000000000000104220447FF820441042000000000000000000000000 +2B3A:0000000000000000000010A220A47FF820A410A2000000000000000000000000 +2B3B:00000000000000000000140228047FF828041402000000000000000000000000 +2B3C:00000000000000000000144228447FF828441442000000000000000000000000 +2B3D:0000000000000000000014A228A47FF828A414A2000000000000000000000000 +2B3E:00000000000000000800108820507FFF20501088080000000000000000000000 +2B3F:00000000000000000000103C20427F8120001000000000000000000000000000 +2B40:00000000000001F8000011F820007FFF20001000000000000000000000000000 +2B41:000000000000001C022211C020007FFF20001000000000000000000000000000 +2B42:00000000000000000000100020007FFF201C122201C0001C022201C000000000 +2B43:00000000000060001800060801840FFE01840608180060000000000000000000 +2B44:000000000000000000007F80004800247FFE002400487F800000000000000000 +2B45:00000000020004000FFF10003FFF40003FFF10000FFF04000200000000000000 +2B46:0000000000400020FFF00008FFFC0002FFFC0008FFF000200040000000000000 +2B47:0000000000000380444038080004FFFE00040008000000000000000000000000 +2B48:0000000000000000000000080004FFFE03844448380003804440380000000000 +2B49:00000000000001C00222101C20007FFF20001000000000000000000000000000 +2B4A:00000000000000000000100020007FFF21C01222001C01C00222001C00000000 +2B4B:00000000000000000000100020007FFF2000101C022201C00000000000000000 +2B4C:0000000000000000000000080004FFFE00040388444038000000000000000000 +2B4D:00000000008001000200040008001FF800100020004002800300038000000000 +2B4E:000000000000001C0C14102020000000 +2B4F:00000000000000202010140C1C000000 +2B50:000001000100028002807C7C20081010082004400820111026C8383800000000 +2B51:0000000000000100038003803FF81FF00FE00FE01EF03C783018000000000000 +2B52:0000000000000100028002803C7810100820092012902C683018000000000000 +2B53:00000000008003C00FE01FF01FF81FFC1FFC1FF81FF00FE003C0008000000000 +2B54:00000000008003400C201010100810041004100810100C200340008000000000 +2B55:000007C00FE018303018600C600C600C600C600C301818300FE007C000000000 +2B56:0000000000000FE01FF0301867CC682C682C67CC30181FF00FE0000000000000 +2B57:000007C00FE018303018638C644C644C644C638C301818300FE007C000000000 +2B58:000000000000000003800FE00C601830183018300C600FE00380000000000000 +2B59:000007C00FE018303838644C628C610C628C644C383818300FE007C000000000 +2B5A:00000000000003C0042004200840095008E01040100010002000200000000000 +2B5B:0000000000000F00108010800840084000200020001000540038001000000000 +2B5C:0000000000000020007000A800200040004000400040008000800F8000000000 +2B5D:0000000000000F80008000800040004000400040002000A80070002000000000 +2B5E:0000000000000100010001000100020002000220021004780590062000000000 +2B5F:0000000000000000000000000000020002000220041004780590062000000000 +2B60:00000000000000000000100030007FFE30001000000000000000000000000000 +2B61:000000000100038007C001000100010001000100010001000100010001000100 +2B62:000000000000000000000008000C7FFE000C0008000000000000000000000000 +2B63:000000000100010001000100010001000100010001000100010007C003800100 +2B64:000000000000000000002008600CFFFE600C2008000000000000000000000000 +2B65:000000000100038007C00100010001000100010001000100010007C003800100 +2B66:00000000000000001E001C001C00120001000080004000200010000800000000 +2B67:0000000000000000007800380038004800800100020004000800100000000000 +2B68:0000000000000000100008000400020001000080004800380038007800000000 +2B69:000000000000000000080010002000400080010012001C001C001E0000000000 +2B6A:00000000000000000000100030007DB630001000000000000000000000000000 +2B6B:000000000100038007C001000100000001000100000001000100000001000100 +2B6C:000000000000000000000008000C6DBE000C0008000000000000000000000000 +2B6D:000000000100010000000100010000000100010000000100010007C003800100 +2B6E:00000000000000001C000C101408200420042004200420041008081007E00000 +2B6F:0000000000000000003808301028200420042004200420041008081007E00000 +2B70:0000000000000000000044004C005FFE4C004400000000000000000000000000 +2B71:0000000007C000000100038007C0010001000100010001000100010001000100 +2B72:00000000000000000000002200327FFA00320022000000000000000000000000 +2B73:0000000001000100010001000100010001000100010007C003800100000007C0 +2B74:00007FFE618E7DB6618E6FB6618E7FFE7FFE61B67DB67B8677F677F67FFE0000 +2B75:00007FFE618E7DB6618E6FB6618E7FFE7FFE61867DBE7B8677F677867FFE0000 +2B76:00000000000000000FC000000780070007000480004000200010000800000000 +2B77:000000000000000001F8000000F0007000700090010002000400080000000000 +2B78:0000000000000000080004000200010000900070007000F0000001F800000000 +2B79:00000000000000000008001000200040048007000700078000000FC000000000 +2B7A:00000000000000000140114031407FFE31401140014000000000000000000000 +2B7B:000000000100038007C001000100010001000FE001000FE00100010001000100 +2B7C:000000000000000002800288028C7FFE028C0288028000000000000000000000 +2B7D:0000000001000100010001000FE001000FE0010001000100010007C003800100 +2B7E:000000000000000044004C005FFE4C004400002200327FFA0032002200000000 +2B7F:0000000004F804000420047004F804200420042004201F200E20042000201F20 +2B80:000000000000100030007FFE300010000008000C7FFE000C0008000000000000 +2B81:0000000004200E201F200420042004200420042004200420042004F804700420 +2B82:0000000000000008000C7FFE000C0008100030007FFE30001000000000000000 +2B83:000000000420047004F8042004200420042004200420042004201F200E200420 +2B84:00000000100030007FFE300010000000100030007FFE30001000000000000000 +2B85:0000000008201C703EF808200820082008200820082008200820082008200820 +2B86:000000000008000C7FFE000C000800000008000C7FFE000C0008000000000000 +2B87:00000000082008200820082008200820082008200820082008203EF81C700820 +2B88:000003E007F00EF81CFC38FC30002000300038FC1CFC0EF807F003E000000000 +2B89:0000000003E007700E381C1C380E30063E3E3E3E3E3E1E3C0E38063000000000 +2B8A:000007C00FE01F703F383F1C000C0004000C3F1C3F381F700FE007C000000000 +2B8B:0000000006300E381E3C3E3E3E3E3E3E3006380E1C1C0E38077003E000000000 +2B8C:00000000080018003FF0180808040002000200020002000400080FF000000000 +2B8D:0000000000000008001C103E1008100810081008100810080810042003C00000 +2B8E:0000000007F80800100020002000200020001008080C07FE000C000800000000 +2B8F:00000000000000F0010802040402040204020402040204021F020E0004000000 +2B90:00000000000000000000001E00020004100430087FF830001000000000000000 +2B91:000000000000000000007800400020002008100C1FFE000C0008000000000000 +2B92:000000000000000000007F7E00020002020206026FFE06000200000000000000 +2B93:000000000000000000007EFE40004000404040607FF600600040000000000000 +2B94:00000000002000403EFC20442024A8007004200E0015240422043F7C02000400 +2B95:0000000000000000002000307FF87FFC7FF80030002000000000000000000000 +2B96:00007FFE618E7DB6618E6FB6618E7FFE7FFE73CE6DBE718E7DB673CE7FFE0000 +2B97:000000007FFC40044FE420082FE8111011100920092005400440028001000000 +2B98:00000004003800C803100C10302040403FE00FF003F000F80038000400000000 +2B99:00000000010002800280064006400E200E201E101F103E883C68301840040000 +2B9A:000040003800260011801060081804040FF81FE01F803E003800400000000000 +2B9B:00000000400430182C7822F811F010F008E008E004C004C00280028001000000 +2B9C:00000004003800F803F00FF03FE07FC03FE00FF003F000F80038000400000000 +2B9D:0000000001000380038007C007C00FE00FE01FF01FF03EF83C78301840040000 +2B9E:0000400038003E001F801FE00FF807FC0FF81FE01F803E003800400000000000 +2B9F:00000000400430183C783EF81FF01FF00FE00FE007C007C00380038001000000 +2BA0:00000002000200020002100230027FFE30001000000000000000000000000000 +2BA1:000040004000400040004008400C7FFE000C0008000000000000000000000000 +2BA2:00000000000000000000100030007FFE30021002000200020002000200000000 +2BA3:000000000000000000000008000C7FFE400C4008400040004000400000000000 +2BA4:0000000004000E001F0004000400040004000400040004000400040007F00000 +2BA5:00000000004000E001F00040004000400040004000400040004000401FC00000 +2BA6:0000000007F00400040004000400040004000400040004001F000E0004000000 +2BA7:000000001FC000400040004000400040004000400040004001F000E000400000 +2BA8:0000000000000002100230067FFCFFFC7FF83000100000000000000000000000 +2BA9:00000000000080008010C0187FFC7FFE3FFC0018001000000000000000000000 +2BAA:0000000000000000100030007FF8FFFC7FFC3006100200020000000000000000 +2BAB:0000000000000000001000183FFC7FFE7FFCC018801080000000000000000000 +2BAC:000000000000020007000F801FC0070007000700070007000700038000E00000 +2BAD:0000000000000100038007C00FE003800380038003800380038007001C000000 +2BAE:00000000000000E003800700070007000700070007001FC00F80070002000000 +2BAF:0000000000001C0007000380038003800380038003800FE007C0038001000000 +2BB0:000000220036002A0022002204220A2213FC20044008201013E00A0004000000 +2BB1:000044006C00540044004400442044503FC820041002080407C8005000200000 +2BB2:000004000A0013E020104008200413FC0A22042200220022002A003600220000 +2BB3:00000020005007C80804100220043FC8445044204400440054006C0044000000 +2BB4:000004000A00110020804040318011001100110011FE09040508030400FE0000 +2BB5:000000200050008801040202018C0088008800887F88209010A020C07F000000 +2BB6:000000FE03040508090411FE11001100110031804040208011000A0004000000 +2BB7:00007F0020C010A020907F88008800880088018C020201040088005000200000 +2BB8:00000100028004400FE010100C600440044007C0000007C0044007C000000000 +2BB9:0000000000007FFC4004410442844444482450144004400440047FFC00000000 +2BBA:0000000003FC0204020402043FC42244224423FC2040204020403FC000000000 +2BBB:0000000003FC03FC03FC03FC3FFC23FC23FC23FC2040204020403FC000000000 +2BBC:0000000003FC03FC03FC03FC3FFC3FFC3FFC3FFC3FC03FC03FC03FC000000000 +2BBD:000000003FFC20042004241422242144208421442224241420043FFC00000000 +2BBE:0000000007C00820101020082448428441044284244820081010082007C00000 +2BBF:0000000007C01FF038383018644C628C610C628C644C301838381FF007C00000 +2BC0:0000000000007FFC7FFC7FFC7FFC7FFC7FFC7FFC7FFC7FFC7FFC7FFC00000000 +2BC1:0000000000000100038007C00FE01FF03FF81FF00FE007C00380010000000000 +2BC2:00000000000007E00FF00FF01FF81FF83FFC3FFC1FF80FF007E003C001800000 +2BC3:0000000007C00FE01FF03FF87FFC7FFC7FFC7FFC7FFC3FF81FF00FE007C00000 +2BC4:0000038007C03FF83FF83FF87FFCFFFEFFFEFFFE7FFC3FF83FF83FF807C00380 +2BC5:0000000001000380038007C007C00FE00FE01FF01FF03FF83FF87FFC00000000 +2BC6:0000000000007FFC3FF83FF81FF01FF00FE00FE007C007C00380038001000000 +2BC7:00000008003800F803F80FF83FF87FF83FF80FF803F800F80038000800000000 +2BC8:0000400070007C007F007FC07FF07FF87FF07FC07F007C007000400000000000 +2BC9:0000404A4C58787E081C2222221C0000 +2BCA:0000000007C00FE01FF03FF83FF87FFC7FFC0000000000000000000000000000 +2BCB:000000000000000000000000000000007FFC7FFC3FF83FF81FF00FE007C00000 +2BCC:010001000380038007C00FE03FF8FFFE3FF80FE007C003800380010001000000 +2BCD:000000000000200810100C600FE007C007C007C00FE00C601010200800000000 +2BCE:0100010003800280044008203018E00E30180820044002800380010001000000 +2BCF:000000000000200810100C600BA00440044004400BA00C601010200800000000 +2BD0:00000000010001001FF01110111010107C7C1010111011101FF0010001000000 +2BD1:000000000100028004400BA01450204841842108101009200440028001000000 +2BD2:000000000000010001000FE0010001000FE0010001000FE00100010001000000 +2BD3:00000000000000000380044008202828282824481390082007C0010007C00100 +2BD4:000000001C702288210807C00100038004400820082008200440038000000000 +2BD5:00000000038004400820082008204444638C50144C6423881010082007C00000 +2BD6:00000000000007C008A0105020482028202820282048105008A007C000000000 +2BD7:0000000000000100038007C00100038004400BA0082008200440038000000000 +2BD8:00000000000000003C3C04200420042005A005A00420042004203C3C00000000 +2BD9:00000000000001800240027801C00040008000800100018002401E4001800000 +2BDA:000000001110210821082108193007C009201110092007C0092007C000000000 +2BDB:000000000000000001C00120012001C00100010007C00820082007C000000000 +2BDC:0000000000000000012001A0016001200100010007C00820082007C000000000 +2BDD:000000000000070002800140012000A000A00120014002800700010007C00100 +2BDE:0000000000000100038007C00FE01FF00FE007C003800100010007C001000100 +2BDF:0000000000000000000000000000200830182C681390082007C0010007C00100 +2BE0:000000000000380004000270028802880288047008203FF8002000F800200020 +2BE1:00000000000007C0082010102100210027C0210021001110092007C001000100 +2BE2:0000000000000100038007C0010001000100193007C0010006C0183000000000 +2BE3:00000000000007C0082010102108210827C80100010001000100010001000100 +2BE4:000000000000380004000200020002500250045008503FF80050005000500050 +2BE5:0000000000000000044004400380054007C00540038001000100010001000100 +2BE6:0000000000000100038007C00100010001000100010002800440082010103FF8 +2BE7:0000000000000000200820081110092007C00100010007C00920111020082008 +2BE8:00000040004000C000C001C01FC00FC007C003C001C003C00780060008000000 +2BE9:00000400040006000600070007F007E007C007800700078003C000C000200000 +2BEA:0000010001000380038007407F3C3F081F100F6007400F201ED0183020080000 +2BEB:0000010001000380038005C079FC21F811F00DE005C009E016F0183020080000 +2BEC:00000000020806180E381E783EF87FFE3EF81E780E3806180208000000000000 +2BED:00000100038007C00FE01FF03FF80100038007C00FE01FF03FF8010001000000 +2BEE:00000000104018601C701E781F7C7FFE1F7C1E781C7018601040000000000000 +2BEF:0000008000801FFC0FF807F003E001C000801FFC0FF807F003E001C000800000 +2BF0:0000000000003938054003800380010001000100038003800540393800000000 +2BF1:0000000000000380044008200820082004400380010007C00380010000000000 +2BF2:00000000000000001900250025001FC001000180004000200020002000000000 +2BF3:00000000000000003FF8200820082008200820083FF8010006C0183000000000 +2BF4:00000000000000007FFC410422881450082008201450228841047FFC00000000 +2BF5:0000000000000000410441042288145008200820145022884104410400000000 +2BF6:00000000000000003FF8200820082008200820083FF8010001001FF000000000 +2BF7:00000000000000001010082004400280010002800440082010103FF800000000 +2BF8:000000000000000001000100010001003FF80380054009201110210800000000 +2BF9:000000000000000000003FF800003FF800001C702288210822881C7000000000 +2BFA:00000000000000000000000000001C702288228822881C700000000000000000 +2BFB:0000000000000000000000000000701C88228AA28822701C0000000000000000 +2BFC:0000000000000380044004400440038000000380044004400440038000000000 +2BFD:0000000000000100038007C00100010001000380044004400440038000000000 +2BFE:00000000000000000000000000000020002000200020002000200FE000000000 +2BFF:000000007C7C10101C1C10107C7C0000 +2C00:00000000101010107C54541010100000 +2C01:0000000092929292FE80808080FE0000 +2C02:0000000044AA6C284444444444380000 +2C03:000000006090907020204C52928C0000 +2C04:00000000384444444444286CAA440000 +2C05:000000003844041C041C040444380000 +2C06:000000000000824428286C92926C0000 +2C07:000000003844824438FE926428100000 +2C08:000000000020508888FF8D8D55220000 +2C09:000000007C6C92927C10101010380000 +2C0A:000000007C6C92926C28444482FE0000 +2C0B:00000000FE8244285482828244380000 +2C0C:00000000626565669696969991000000 +2C0D:000000002020203C04043C2020200000 +2C0E:0000000038444444447CAAAAAA440000 +2C0F:00000000000000000FF812A412A40C98008003E0077009480948063000000000 +2C10:000000003C222222FCA0A02020200000 +2C11:000000001C221E020202021E221C0000 +2C12:000000003E2A2A2AE420202020200000 +2C13:00000000404040407C424242427C0000 +2C14:00000000384482828254284482FE0000 +2C15:00000000FEAAAAAAAAAAAAAAAA440000 +2C16:0000000048B46C242724246CB4480000 +2C17:00000000101038549292929254381010 +2C18:000000002020202020202C32528C0000 +2C19:000000007CAAAA92828292AAAA7C0000 +2C1A:000000001E1212127292929292720000 +2C1B:0000000092929292FE44828244380000 +2C1C:000000007191916A0A0A0A0404040000 +2C1D:0000000044447C92FE44828244380000 +2C1E:00000000929292929292929292FE0000 +2C1F:000000000000000003F8011000A000E01F10151008E000A0011003F800000000 +2C20:000000007E422418F898A424427E0000 +2C21:0000000010282844447C929292FE0000 +2C22:00002090786C4482828282446C3C1208 +2C23:000000007C4A4A4A4C50506060400000 +2C24:000000001C222060B8602020221C0000 +2C25:000000000C121030DCB01010120C0000 +2C26:0000000010284C92FE444444447C0000 +2C27:00000000000000001C38224402400EC003700EC00240024022441C3800000000 +2C28:0000000000000000387044883C80058006E0058004803C804488387000000000 +2C29:0000000000000000103828444C4092C0FF7038C0444082404444383800000000 +2C2A:0000000018242424FFA5242424180000 +2C2B:00000000F88850708E8A705088F80000 +2C2C:000000001C0404040404040408100000 +2C2D:0000000082C2B28AFE8AB2C282020000 +2C2E:00000000245456525252565A52520000 +2C2F:00007FFE61C67DBE61BE6FBE61C67FFE7FFE61867DBE618E6FBE61BE7FFE0000 +2C30:0000000000001010107C545410100000 +2C31:0000000000002A2A2A3E2020203E0000 +2C32:00000000000044AA6C28444444380000 +2C33:000000000000609090702C52928C0000 +2C34:00000000000038444444286CAA440000 +2C35:00000000000038441C041C0444380000 +2C36:0000000000000000C6286C92926C0000 +2C37:0000000000001C221C7F493214080000 +2C38:00000000000000205088FF8D55220000 +2C39:0000000000007C6C92927C1010380000 +2C3A:0000000000007C6C92926C4482FE0000 +2C3B:000000000000FE824428544444380000 +2C3C:000000000000444A4AACACB2A2000000 +2C3D:00000000000020203C04043C20200000 +2C3E:000000000000182424243C5A5A240000 +2C3F:0000000000000000000000001FF025481930010007C00EE012900C6000000000 +2C40:0000000000001C12127C505010100000 +2C41:0000000000001C221E02021E221C0000 +2C42:0000000000003E2A2A2A642020200000 +2C43:00000000000040404078444444780000 +2C44:00000000000038444454284482FE0000 +2C45:000000000000FEAAAAAAAAAAAA440000 +2C46:00000000000048B46C26246CB4480000 +2C47:00000000000010103854929254381010 +2C48:000000000000202020202C32528C0000 +2C49:0000000000007CAA92828292AA7C0000 +2C4A:0000000000000E0A0A3A4A4A4A3A0000 +2C4B:0000000000002A2A2A3E1422221C0000 +2C4C:00000000000062A2A274141408080000 +2C4D:000000000000447C92FE444444380000 +2C4E:000000000000545454545454547C0000 +2C4F:00000000000000000000000003F8011000E01F10151008E0011003F800000000 +2C50:0000000000003E2214784854223E0000 +2C51:000000000000001028447C9292FE0000 +2C52:000000002090786C448282446C3C1208 +2C53:00000000000078545458505060400000 +2C54:0000000000000C12305C3010120C0000 +2C55:000000000000040A186E58080A040000 +2C56:00000000000010284C92FE44447C0000 +2C57:0000000000000000000000001C3822440EC003700EC0024022441C3800000000 +2C58:0000000000000000000000001C3822441EC0037002C01E4022441C3800000000 +2C59:000000000000000000000000081C1422266049B87F601C2022221C1C00000000 +2C5A:000000000000102828FEAA2828100000 +2C5B:0000000000007848304E4A3048780000 +2C5C:0000000000001C040404040408100000 +2C5D:0000000000000262524A7E4A52620000 +2C5E:00000000000024545652565A52520000 +2C5F:00007FFE61C67DBE61BE6FBE61C67FFE7FFE61866FBE618E7DBE61BE7FFE0000 +2C60:000000002020207020702020203E0000 +2C61:000000180808081C081C0808083E0000 +2C62:000000001010101034581010101F0000 +2C63:000000003C2272223C20202020200000 +2C64:000000007C4242427C48444442425020 +2C65:0000000000003946043C54644CB40000 +2C66:000000001010117E14181030508C0000 +2C67:00000000444444447C44444444460202 +2C68:00000040404058644444444444460202 +2C69:00000000424448506060504844430101 +2C6A:00000040404044485060504844430101 +2C6B:000000007E02020408102040407E0202 +2C6C:0000000000007E0204081020407E0202 +2C6D:000000001A26424242424242261A0000 +2C6E:00000000424266665A5A424242420A04 +2C6F:00000000424242427E42422424180000 +2C70:000000004C52624242424242625C0000 +2C71:00000000000082858548484830300000 +2C72:00000000848A8A88A8A8D8D888880000 +2C73:00000000000042555554545454280000 +2C74:0000000020505262C224242418180000 +2C75:00000000202020203C20202020200000 +2C76:0000000000002020203C202020200000 +2C77:000000000000264949494949493E0808 +2C78:0000000000003844447C4045453A0000 +2C79:000000000C02020202020242463A0000 +2C7A:0000000000003E4141414955553E0000 +2C7B:0000000000003E0202021E02023E0000 +2C7C:000000000000000004000C0404041408 +2C7D:00000041412222141408000000000000 +2C7E:000000003C424040300C0202423C0906 +2C7F:000000007E020404081020204060100E +2C80:00000000C0201010384844444A310000 +2C81:000000000000C020103844444A310000 +2C82:000000007844444878444442427C0000 +2C83:00000000000070485070484444780000 +2C84:000000007E4040404040404040400000 +2C85:0000000000007C404040404040400000 +2C86:0000000010080C0C14121212A1FF0000 +2C87:000000000000201018181414A2FE0000 +2C88:000000003C664280FE808042663C0000 +2C89:0000000000003C4280FE8080423C0000 +2C8A:000000003A4440404020100804040800 +2C8B:0000000000003A444040201804040800 +2C8C:00000080FE0202040810204040FE0200 +2C8D:000000000080FE020408102040FE0200 +2C8E:00000000424242427E42424242420000 +2C8F:0000000000004242427E424242420000 +2C90:00000000182424A4FF25242424180000 +2C91:0000000000001824A4FF252424180000 +2C92:00000000301010101010101010080000 +2C93:00000000000030101010101010080000 +2C94:000000004C4448507048444242420000 +2C95:0000000000004C444850704844420000 +2C96:0000000060101808080C142442830000 +2C97:000000000000C0201010182844860000 +2C98:000000008282C6AA9282828282820000 +2C99:000000000000446C5444444444440000 +2C9A:000000008282C2A292928A8682820000 +2C9B:00000000000044646454544C4C440000 +2C9C:00000080FF020C30F80402020C7F0100 +2C9D:000000000080FC041860F008187E0200 +2C9E:00000000386C4482828282446C380000 +2C9F:000000000000386C448282446C380000 +2CA0:00000000FF4242424242424242420000 +2CA1:0000000000007E242424242424240000 +2CA2:000000007C4242427C40404040404040 +2CA3:0000000000007C4242427C4040404040 +2CA4:000000001C36224040404022361C0000 +2CA5:0000000000001C3622404022361C0000 +2CA6:00000000FE1010101010101010100000 +2CA7:000000000000FE101010101010100000 +2CA8:00000000838244281010101010100000 +2CA9:00000000000083442810101010100000 +2CAA:00001010387C5492929292547C381010 +2CAB:000000001010387C549292547C381010 +2CAC:00000000434224181818242442420000 +2CAD:00000000000043241818242442420000 +2CAE:00001010939254381010101010101000 +2CAF:00000000101093543810101010101000 +2CB0:000000004492929292929292926C0000 +2CB1:000000000000449292929292926C0000 +2CB2:0000000000101010FE00000000000000 +2CB3:000000000000000010107C0000000000 +2CB4:00000000040810204620100804000000 +2CB5:00000000000000081020442010080000 +2CB6:0000000002FE000002FE000002FE0000 +2CB7:000000000000027E00027E00027E0000 +2CB8:0000004040201008040810207C000000 +2CB9:000000000000202010080408103C0000 +2CBA:000000000000000002FE000000000000 +2CBB:000000000000000000027E0000000000 +2CBC:00000000929292929292929292920000 +2CBD:00000000000092929292929292920000 +2CBE:0000000092929292FF92929292920000 +2CBF:000000000000929292FF929292920000 +2CC0:000000003C2222223C20FEA020202020 +2CC1:0000000000003C2222223C20FEA02020 +2CC2:54107C1044929292929292926E027C80 +2CC3:000054107C104492929292926E027C80 +2CC4:000000407E020C307804020202047800 +2CC5:0000000000407C0408103C0202423C00 +2CC6:00000000040404080808081010102020 +2CC7:00000000000004040808081010102020 +2CC8:000000003C424202047E1020423C0000 +2CC9:0000000000003C4242047E30423C0000 +2CCA:000000003C424A320204081020400000 +2CCB:0000000000003C424A32040810200000 +2CCC:0000000078C4C202047C02020202827C +2CCD:00000000000078C4C2023C040202827C +2CCE:000000001E1111212220204040408080 +2CCF:0000000000001E112121224040408080 +2CD0:000000004040404040404040427E0000 +2CD1:000000000000404040404040447C0000 +2CD2:000000000204081020404C52423C0000 +2CD3:000000000000040810204C52423C0000 +2CD4:000C1020180808080808080808180000 +2CD5:0000000C102018080808080808180000 +2CD6:000000002020202020202020227EA040 +2CD7:000000000000101010101010123E5020 +2CD8:00000000424242424242424242FF0000 +2CD9:000000000000242424242424247E0000 +2CDA:0000000010080C0C54321A16A3FF0000 +2CDB:00000000000010080C2C1A0E537F0000 +2CDC:003C4040386C4482828282446C380000 +2CDD:0000003C4040386C448282446C380000 +2CDE:000000007E22202020202020223E0000 +2CDF:0000000000007E2220202020243C0000 +2CE0:00000000102649516224584080800000 +2CE1:00000000000010264972245880800000 +2CE2:00000000FC203C2222223C2020202020 +2CE3:000000000000FC203C2222223C202020 +2CE4:0000000000004C44485070484442021C +2CE5:00001E11111E1092D6BA929292921010 +2CE6:001E11111E10FE545454545454541010 +2CE7:01E00110011001E001007FFE391C6D3645228140814045226D36391C01000100 +2CE8:001E11111E107E101010101010101010 +2CE9:1E11111E101056545438383854541010 +2CEA:0000000000000000000000001FFC3636222241404140222236361C1C00000000 +2CEB:000000006C9292926C00FE0000000000 +2CEC:0000000000006C92926C00FE00000000 +2CED:00000000424242665A5A664242420000 +2CEE:0000000000004242665A5A6642420000 +2CEF:000000000C000FFC000C00000000000000000000000000000000000000000000 +2CF0:603E6000000000000000000000000000 +2CF1:067C0600000000000000000000000000 +2CF2:000810203C82424242424242423C0000 +2CF3:0000000810203C8242424242423C0000 +2CF4:00007FFE61C67DBE61BE6FBE61C67FFE7FFE61B66FB663866FF66FF67FFE0000 +2CF5:00007FFE61C67DBE61BE6FBE61C67FFE7FFE61866FBE63866FF66F867FFE0000 +2CF6:00007FFE61C67DBE61BE6FBE61C67FFE7FFE61CE6FBE638E6FB66FCE7FFE0000 +2CF7:00007FFE61C67DBE61BE6FBE61C67FFE7FFE61866FF663EE6FDE6FDE7FFE0000 +2CF8:00007FFE61C67DBE61BE6FBE61C67FFE7FFE61CE6FB663CE6FB66FCE7FFE0000 +2CF9:00000000D8D848242424241212120000 +2CFA:0000000018181020202020404C4C0000 +2CFB:00000000303010080808080464640000 +2CFC:00000000363624484848489090900000 +2CFD:00000000000000040810100804380000 +2CFE:000000000000181010D6101030000000 +2CFF:00300804000000000000000000000000 +2D00:00000000000000007E222020203E0200 +2D01:0000000000000000C444447C0402423C +2D02:0000000000000000FC4444444442023C +2D03:0000000000407C141038444444380000 +2D04:0000000000000000FC44444444460202 +2D05:000000000000000000000000000000003FF01110111011101110111001000080 +2D06:00000040701010101C121212121C0000 +2D07:000000000000000000000000000000001FF808880888088808880F8800000000 +2D08:00000000000000007E32220202020000 +2D09:0000000020202038242424241C040404 +2D0A:000000000000000000000000000000001FF8088808880888088808F800000000 +2D0B:000000203C0404041E24242424180000 +2D0C:000000007C4440407C44444444440000 +2D0D:00000000000000000000000000000000311011101110111011101FF800000000 +2D0E:0000000000000000B2D21212121F0000 +2D0F:0000000000000000B2D21212121F0202 +2D10:0000000000000000010001000100010011F011101110111011101F1000000000 +2D11:000000004040404048484848487C0400 +2D12:0000000000000000FC44447C4040403C +2D13:00000000000000000008000800080008188808880888088808880FF800080008 +2D14:000000000000000000000000000000001FF808880888088808880FF800800080 +2D15:0000000010101016BAD0101010100000 +2D16:0000000000000000FC44444444460000 +2D17:0000000000000000622222223E020202 +2D18:00000000000000622222223E0202423C +2D19:000000002020203C2424242020202020 +2D1A:0000000000000000FC44444444444038 +2D1B:000000000000000001000100010001001FF011101110111011101F1000000000 +2D1C:000000000000000000000000000000001FF80888088808880888089808000800 +2D1D:00000000000000007C24203804242418 +2D1E:000000000000000066222222223E2020 +2D1F:00000000000000C0FE22140C12214080 +2D20:000000000000000000000000000000003F10111011101110111011F800000000 +2D21:00000000404040784C40404040400000 +2D22:00000000000000004078040404780000 +2D23:00000000040404046424243C04040404 +2D24:000000000000000000006222223E0808 +2D25:000000000000000000F00110010001001FF011101110111011101F1000000000 +2D26:00007FFE618E7DB661B66FB6618E7FFE7FFE61CE7DBE618E6FB661CE7FFE0000 +2D27:00000000000000001824040830404438 +2D28:00007FFE618E7DB661B66FB6618E7FFE7FFE61CE7DB661CE6FB661CE7FFE0000 +2D29:00007FFE618E7DB661B66FB6618E7FFE7FFE61CE7DB661C66FF661CE7FFE0000 +2D2A:00007FFE618E7DB661B66FB6618E7FFE7FFE61867DB661866FB661B67FFE0000 +2D2B:00007FFE618E7DB661B66FB6618E7FFE7FFE618E7DB6618E6FB6618E7FFE0000 +2D2C:00007FFE618E7DB661B66FB6618E7FFE7FFE61C67DBE61BE6FBE61C67FFE0000 +2D2D:00000000000000003C040810203C0000 +2D2E:00007FFE618E7DB661B66FB6618E7FFE7FFE61867DBE618E6FBE61867FFE0000 +2D2F:00007FFE618E7DB661B66FB6618E7FFE7FFE61867DBE618E6FBE61BE7FFE0000 +2D30:00000000000000000000182424180000 +2D31:00000000000000384482FE8244380000 +2D32:00000000000000385492FE9254380000 +2D33:000000000000FE442810102844820000 +2D34:00000000000082442810102844FE0000 +2D35:000000000000FE442810102844FE0000 +2D36:000000000000D6D61010101010100000 +2D37:00000000000010282828284444440000 +2D38:00000000000044444428282828100000 +2D39:00000000007E404040784040407E0000 +2D3A:00000000007E0202027E0202027E0000 +2D3B:00000018242418007E00182424180000 +2D3C:000000000000EE28282838282828EE00 +2D3D:000000000000FE84889090A8C4820000 +2D3E:0000000000606000000C0C0000606000 +2D3F:00000000000082C4A890908884FE0000 +2D40:00000000000000385492929254380000 +2D41:000000000000003A448A92A244B80000 +2D42:00001818000018180000181800001818 +2D43:00000000000001020408182442810000 +2D44:0000000000001010107C444444440000 +2D45:00000000000092543810102844820000 +2D46:00000000000000006666000066660000 +2D47:000000000000FE84889090A0C0FE0000 +2D48:0000000000000000000000000000000000001998199800000000000000000000 +2D49:00000000000810201008102010080000 +2D4A:00000000007C101010101010107C0000 +2D4B:00000000000000C62810101028C60000 +2D4C:000000000000282828FE28FE28282800 +2D4D:0000000000002424242C342424242400 +2D4E:00000000007E404040404040407E0000 +2D4F:00000000000010101010101010101000 +2D50:000000000000101010FE10FE10101000 +2D51:00000000101010101010101010001010 +2D52:000000000000003C0408182424180000 +2D53:00000000182424180000182424180000 +2D54:00000000000000384482828244380000 +2D55:00000000000000384482928A443A0000 +2D56:000000000000444444447C1010100000 +2D57:00000000181800001818000018180000 +2D58:0000000000C3C3000018180000C3C300 +2D59:000000000000003844BABABA44380000 +2D5A:000000000000003A448A928244380000 +2D5B:00000000001E294640404046291E0000 +2D5C:000000000000101010107C1010101000 +2D5D:00000000000082442810102844820000 +2D5E:00000000001E294650785046291E0000 +2D5F:00000000007E4048487C4848407E0000 +2D60:000000000000102828282844447C0000 +2D61:000000000000444444444444447C0000 +2D62:00000000000000081020100810200000 +2D63:00000092925438101010385492920000 +2D64:00000000000030282420202020200000 +2D65:0000009292543810FE10385492920000 +2D66:00000000000408102040201008040000 +2D67:000000000000000000EE000000000000 +2D68:00007FFE618E7DB661B66FB6618E7FFE7FFE73CE6FB663CE6DB673CE7FFE0000 +2D69:00007FFE618E7DB661B66FB6618E7FFE7FFE73CE6FB663C66DF673CE7FFE0000 +2D6A:00007FFE618E7DB661B66FB6618E7FFE7FFE73866FB663866DB673B67FFE0000 +2D6B:00007FFE618E7DB661B66FB6618E7FFE7FFE738E6FB6638E6DB6738E7FFE0000 +2D6C:00007FFE618E7DB661B66FB6618E7FFE7FFE73C66FBE63BE6DBE73C67FFE0000 +2D6D:00007FFE618E7DB661B66FB6618E7FFE7FFE738E6FB663B66DB6738E7FFE0000 +2D6E:00007FFE618E7DB661B66FB6618E7FFE7FFE73866FBE638E6DBE73867FFE0000 +2D6F:002424243C0000000000000000000000 +2D70:00000000000002020202040408106000 +2D71:00007FFE618E7DB661B66FB6618E7FFE7FFE61EE7DCE7BEE77EE77C67FFE0000 +2D72:00007FFE618E7DB661B66FB6618E7FFE7FFE61867DF67B8677BE77867FFE0000 +2D73:00007FFE618E7DB661B66FB6618E7FFE7FFE618E7DF67BC677F6778E7FFE0000 +2D74:00007FFE618E7DB661B66FB6618E7FFE7FFE61B67DB67B8677F677F67FFE0000 +2D75:00007FFE618E7DB661B66FB6618E7FFE7FFE61867DBE7B8677F677867FFE0000 +2D76:00007FFE618E7DB661B66FB6618E7FFE7FFE61CE7DBE7B8E77B677CE7FFE0000 +2D77:00007FFE618E7DB661B66FB6618E7FFE7FFE61867DF67BEE77DE77DE7FFE0000 +2D78:00007FFE618E7DB661B66FB6618E7FFE7FFE61CE7DB67BCE77B677CE7FFE0000 +2D79:00007FFE618E7DB661B66FB6618E7FFE7FFE61CE7DB67BC677F677CE7FFE0000 +2D7A:00007FFE618E7DB661B66FB6618E7FFE7FFE61867DB67B8677B677B67FFE0000 +2D7B:00007FFE618E7DB661B66FB6618E7FFE7FFE618E7DB67B8E77B6778E7FFE0000 +2D7C:00007FFE618E7DB661B66FB6618E7FFE7FFE61C67DBE7BBE77BE77C67FFE0000 +2D7D:00007FFE618E7DB661B66FB6618E7FFE7FFE618E7DB67BB677B6778E7FFE0000 +2D7E:00007FFE618E7DB661B66FB6618E7FFE7FFE61867DBE7B8E77BE77867FFE0000 +2D7F:00000000000000000000000000041F04 +2D80:000000000600060006000F000F8019C0D8C0F8FCD8D618DC18C018C000000000 +2D81:0000000007FC0FFC18A610A611461F7C0E3C0200020036003C00340000000000 +2D82:00000000000001F803E4063C6C007C006C000C000C000C00043003F000300000 +2D83:000000000600060006000F000F8019C0D8C0F800D80018001800180000000000 +2D84:0000000060607FE006000F000F8019C0D8C0F800D80018001800180000000000 +2D85:000000000000000000000F000F8019C0D8C0F800D80018001800180000000000 +2D86:00000000038006C00C600C600C600C600EC007803FF0333003003F0030000000 +2D87:000018301FF006C00C600C600C600C600EC007803FF0333003003F0030000000 +2D88:0000000007F80FCC187818001C000C0007C000C000C00CC00FC00C0000000000 +2D89:18181FF8018007F80FCC187818000C0007C000C000C00CC00FC00C0000000000 +2D8A:0000000003000300030003C000C001C031E03F70373006300630060000000000 +2D8B:000000000000000001803180B180FF80B1803180300030003000300000000000 +2D8C:0000000001C003E036203E20364007F801980300030006000E00000000000000 +2D8D:0180018001C003E036203E20364007F801980300030006000E00000000000000 +2D8E:0C300FF0018001C033E03E20364007F801980300030006000E00000000000000 +2D8F:00000000000001F003580358364C3E4C364C064C060006000600060000000000 +2D90:00000000000001FC03CC06CC0CAA0CEE6C007F006E800C4006C0038000000000 +2D91:0000000001C003E00230033001F0006000C007F006187E186300030000000000 +2D92:000000000C300FF01FF819980180018031803F80330006000C00080000000000 +2D93:01C063C07E000C001C003300638061C060C000FC00D400DC00C000C007F80E1C +2D94:00000000C0C0FFC00C001E003E007300636003E0037C030C0300030000000000 +2D95:0000000060607FE006000F001F00398031800180018001F001900FF00C000000 +2D96:01C063C07E000C001C003300638061D860D800FE00C600C000C000C007F80E1C +2D97:00007FFE618E7DB661B66FB6618E7FFE7FFE73866DF671EE7DDE73DE7FFE0000 +2D98:00007FFE618E7DB661B66FB6618E7FFE7FFE73CE6DB671CE7DB673CE7FFE0000 +2D99:00007FFE618E7DB661B66FB6618E7FFE7FFE73CE6DB671C67DF673CE7FFE0000 +2D9A:00007FFE618E7DB661B66FB6618E7FFE7FFE73866DB671867DB673B67FFE0000 +2D9B:00007FFE618E7DB661B66FB6618E7FFE7FFE738E6DB6718E7DB6738E7FFE0000 +2D9C:00007FFE618E7DB661B66FB6618E7FFE7FFE73C66DBE71BE7DBE73C67FFE0000 +2D9D:00007FFE618E7DB661B66FB6618E7FFE7FFE738E6DB671B67DB6738E7FFE0000 +2D9E:00007FFE618E7DB661B66FB6618E7FFE7FFE73866DBE718E7DBE73867FFE0000 +2D9F:00007FFE618E7DB661B66FB6618E7FFE7FFE73866DBE718E7DBE73BE7FFE0000 +2DA0:000000001FF81998018003C003E0067036303E30363006300630063000000000 +2DA1:000000003FF033300300078007C00CE06C6C7C7C6C6C0C600C600C6000000000 +2DA2:000000003FF033300300078007C00CE06C607C606C600C600C6C0C7C000C0000 +2DA3:000000001FF81998018003C003E0067036303E30363000300030003000000000 +2DA4:000000003FF033300300078007C00CE06C607C606C600C7C0C640C7C00000000 +2DA5:000000007FE066600300078007C00CE06C607C606C600C600C600C6000000000 +2DA6:000000000FFC0CCC00C001E003E0073036303E30363006000600060000000000 +2DA7:00007FFE618E7DB661B66FB6618E7FFE7FFE61866DF661EE6DDE6DDE7FFE0000 +2DA8:000018181FF81998018001801FF81998018001801F8019800180000000000000 +2DA9:000018181FF81998018001801FF81998018001981FF819980180000000000000 +2DAA:000018181FF81998018001801FF81998018001801F80199801F8001800000000 +2DAB:000018181FF81998018001801FF81998018001801F8019800380070018001800 +2DAC:000018181FF81998018001801FF81998018001801FF0199001F0000000000000 +2DAD:000030303FF03330018001801FF81998018001801F8019800180000000000000 +2DAE:301830183BA006C00C600C600C600C600EC07FF8631803003F00330003000000 +2DAF:00007FFE618E7DB661B66FB6618E7FFE7FFE61866DBE618E6DBE6DBE7FFE0000 +2DB0:000000000000000000007C3E666606607FE06660066006600660000000000000 +2DB1:000000000000000000007C3E666606607FFE6666066006600660000000000000 +2DB2:000000000000000000007C3E666606607FE0666006600666067E000600000000 +2DB3:000000000000000000007C3E666606607FE06660066000600060000000000000 +2DB4:000000000000000000007C3E666606607FE06660067C0664067C000000000000 +2DB5:61807F800C000C007C3E666606607FE066600660066006600660000000000000 +2DB6:000000000000000000007C3E666606607FE06660066006000600000000000000 +2DB7:00007FFE618E7DB661B66FB6618E7FFE7FFE63866DF663EE6DDE63DE7FFE0000 +2DB8:000000000000000003E007F00C98188CF88CC88C1CCE1AAD1AAD1EEF00000000 +2DB9:000000000000000003E007F00C98188FF88BC8881CCC1AAA1AAA1EEE00000000 +2DBA:000000000000000003E007F00C98188CF88CC88C1CCC1AAC1AAC1EEF00030000 +2DBB:000000000000000003E007F00C981CCCFAACDAAC1EEC0018001C0032003E0000 +2DBC:000000000000000003F007F80C9B188EF88BC8881CCC1AAA1AAA1EEE00000000 +2DBD:000000000000000003F007F80CD81CCCFAEADA6A1E6E00500050007000000000 +2DBE:000000000000000003F007F80C9818CCF8AAC8AA1CEE1A001A001E0000000000 +2DBF:00007FFE618E7DB661B66FB6618E7FFE7FFE63866DBE638E6DBE63BE7FFE0000 +2DC0:00000C300E700180018003F00D98199819B00FC0018001800180018000000000 +2DC1:00000C300E700180018003F00D98199819B00FC0019801F80198018000000000 +2DC2:00000C300E700180018003F00D98199819B00FC001800180019801F800180000 +2DC3:000018601CE00300030007E01B30333033601F80030006000C00380038003800 +2DC4:00000C300E700180018003F00D98199819B00FC0018001F0019001F000000000 +2DC5:000030C039C00600018003F00D98199819B00FC0018001800180018000000000 +2DC6:00000C300E70018002400240018003F00D98199819B00FC00180018000000000 +2DC7:00007FFE618E7DB661B66FB6618E7FFE7FFE71866FF66FEE6FDE71DE7FFE0000 +2DC8:0000000000000D980DD80FF00E60066006600660066006600660066000000000 +2DC9:0000000000001B301BB01FE01CC00CC00CF80CD80CC00CC00CC00CC000000000 +2DCA:0000000000001B301BB01FE01CC00CC00CC00CC00CC00CC00CC00CF800180000 +2DCB:0000000000000D980DD80FF00E60066006600060006000600060006000000000 +2DCC:0000000000001B301BB01FE01CC00CC00CC00CC00CC00CF80CC80CF800000000 +2DCD:000000000000199819D81FF01860066006600660066006600660066000000000 +2DCE:0000000000000D980DD80FF00E60066006600660060006000600060000000000 +2DCF:00007FFE618E7DB661B66FB6618E7FFE7FFE71866FBE6F8E6FBE71BE7FFE0000 +2DD0:30C039C0C630FFF0C63001C003E0067006300630063006300630063000000000 +2DD1:30C039C0C630FFF0C63001C003E006700636063E063606300630063000000000 +2DD2:30C039C0C630FFF0C63001C003E0067036303E30363006300636063E00060000 +2DD3:30C039C0C630FFF0C63001C003E0067006300630003000300030003000000000 +2DD4:30C039C0C630FFF0C63001C003E00670063006300630063E0632063E00000000 +2DD5:30C039C0C630FFF0C63003C00FE0187006300630063006300630063000000000 +2DD6:30C039C0C630FFF0C63001C003E0067006300630060006000600060000000000 +2DD7:00007FFE618E7DB661B66FB6618E7FFE7FFE63866DF66DEE6DDE63DE7FFE0000 +2DD8:0000000018601CE00FC007803F8030C000C000C000C000C000C000C000000000 +2DD9:0000000030C039C01F800F007F00618001F001B0018001800180018000000000 +2DDA:0000000030C039C01F800F007F0061800180018001800180018001F000300000 +2DDB:0000000030C039C01F800F007F006180018001800180038007007C0060000000 +2DDC:0000000030C039C01F800F007F00618001800180018001F0019001F000000000 +2DDD:0000000030C039C01F800F003F0025803D800180018001800180018000000000 +2DDE:30C039C01F80060006000F007F00618001800180018001800180018000000000 +2DDF:00007FFE618E7DB661B66FB6618E7FFE7FFE63866DBE6D8E6DBE63BE7FFE0000 +2DE0:04182038241800000000000000000000 +2DE1:38243824380000000000000000000000 +2DE2:38202020200000000000000000000000 +2DE3:1C1414243E4200000000000000000000 +2DE4:54543854540000000000000000000000 +2DE5:18240824180000000000000000000000 +2DE6:24283028240000000000000000000000 +2DE7:1E121252220000000000000000000000 +2DE8:446C5444440000000000000000000000 +2DE9:24243C24240000000000000000000000 +2DEA:18242418000000000000000000000000 +2DEB:3C242424240000000000000000000000 +2DEC:38243820200000000000000000000000 +2DED:18202018000000000000000000000000 +2DEE:7C101010100000000000000000000000 +2DEF:44281028440000000000000000000000 +2DF0:242424243E0200000000000000000000 +2DF1:24241C04040000000000000000000000 +2DF2:545454547C0000000000000000000000 +2DF3:545454547E0200000000000000000000 +2DF4:18243C24180000000000000000000000 +2DF5:3F444434000000000000000000000000 +2DF6:18041C241C0000000000000000000000 +2DF7:18243C201C0000000000000000000000 +2DF8:081C081C222200000000000000000000 +2DF9:04281028281000000000000000000000 +2DFA:107C101C121C00000000000000000000 +2DFB:4C5272524C0000000000000000000000 +2DFC:4C427E524E0000000000000000000000 +2DFD:10283854540000000000000000000000 +2DFE:7C442838545400000000000000000000 +2DFF:5F514A7E555500000000000000000000 +2E00:0000003C202020202000000000000000 +2E01:0000003C202420202000000000000000 +2E02:00000004081020202020000000000000 +2E03:00000020100804040404000000000000 +2E04:00000004081020242020000000000000 +2E05:00000020100804240404000000000000 +2E06:0000007C101010101000000000000000 +2E07:0000007C101410101000000000000000 +2E08:00000038444024108848300000000000 +2E09:00000038444020108848300000000000 +2E0A:00000070880810204448300000000000 +2E0B:0000007C4444447C0000000000000000 +2E0C:00000040201008040000000000000000 +2E0D:00000004081020400000000000000000 +2E0E:000000800100038000000FE0010002807FFC028001000FE00000038001000200 +2E0F:0000000000000000000000000000000000000000000000000000000000007FFE +2E10:0000000000000000000000000000000000000000000000007FFE100020004000 +2E11:0000000000000000000000000000000000000000000000007FFF000800040002 +2E12:00000000000000000000000000100810 +2E13:0000000000000008001000200440008001000200044008001000200000000000 +2E14:00000000000000080010002000400080010022002400280010000E0000000000 +2E15:00000000000000E0001000280048008801000200040008001000200000000000 +2E16:00000000000820100804081020080000 +2E17:00000000000000000618600618600000 +2E18:000000001010001010305052523C0000 +2E19:0000000000000A2BACAFB07EE0DC0000 +2E1A:0000000000240000007E000000000000 +2E1B:00001824241800314946000000000000 +2E1C:00000000000000000000004020100804 +2E1D:00000000000000000000000408102040 +2E1E:00000018180000314946000000000000 +2E1F:0000000000000031494600000C0C0000 +2E20:00000010101010101C10101010100000 +2E21:00000008080808083808080808080000 +2E22:0000000E080808080800000000000000 +2E23:00000070101010101000000000000000 +2E24:00000000000000000008080808080E00 +2E25:00000000000000000010101010107000 +2E26:000000000000003E4040403E00000000 +2E27:000000000000007C0202027C00000000 +2E28:00000012242448484848484824241200 +2E29:00000090484824242424242448489000 +2E2A:00000000000066660000001818000000 +2E2B:00000000000018180000006666000000 +2E2C:00000000000066660000006666000000 +2E2D:000000000000181800DBDB0018180000 +2E2E:000000003C4242402010100010100000 +2E2F:08101008081000000000000000000000 +2E30:00000000000000182424180000000000 +2E31:00000000000000183C3C180000000000 +2E32:00000000000000000000081010180000 +2E33:00000000000000000000181800000000 +2E34:00000000000000000000180808100000 +2E35:00000000081010180000001818000000 +2E36:00000818082878280818080808080000 +2E37:0000080C080A0F0A080C080808080000 +2E38:0000080808081C082A7F2A081C080000 +2E39:000000003C42403C42423C0000000000 +2E3A:0000000000000000000000000000000000003FFC000000000000000000000000 +2E3B:0000000000000000000000000000000000007FFF000000000000000000000000 +2E3C:00000000000000000000001408140000 +2E3D:00000008000800080008000800080000 +2E3E:000C1008040810080408100804180000 +2E3F:000A7F8A8AFF8A7F0A0A0A0A0A0A0000 +2E40:0000000000000000003C003C00000000 +2E41:00000000000000000000000018101008 +2E42:00000000000000000000000066444422 +2E43:0000000000000000000000000000180018001FFE000000000000000000000000 +2E44:00000008102000000000000000081020 +2E45:00000000000000001824240000000000 +2E46:00000000242418001824240000000000 +2E47:00000000000000002424180000000000 +2E48:00000000000000005444380000000000 +2E49:00000000000018080810001808081000 +2E4A:00000000020204183C3C182040400000 +2E4B:00082A7F2A08082A7F2A08082A7F2A08 +2E4C:00000000000060101060000060600000 +2E4D:000000007E4448506040404040400000 +2E4E:00000000000000046870000060600000 +2E4F:00000000006264081224081026060000 +2E50:00003FE00F8007080708071807F807F807F80718070807080F803FE000000000 +2E51:00000FF803E021C021C031C03FC03FC03FC031C021C021C003E00FF800000000 +2E52:000000007E02020202020202221C0000 +2E53:00007FFE61867DBE618E6FBE61867FFE7FFE618E6FF661C67DF6618E7FFE0000 +2E54:00007FFE61867DBE618E6FBE61867FFE7FFE61B66FB661867DF661F67FFE0000 +2E55:00007FFE61867DBE618E6FBE61867FFE7FFE61866FBE61867DF661867FFE0000 +2E56:00007FFE61867DBE618E6FBE61867FFE7FFE61CE6FBE618E7DB661CE7FFE0000 +2E57:00007FFE61867DBE618E6FBE61867FFE7FFE61866FF661EE7DDE61DE7FFE0000 +2E58:00007FFE61867DBE618E6FBE61867FFE7FFE61CE6FB661CE7DB661CE7FFE0000 +2E59:00007FFE61867DBE618E6FBE61867FFE7FFE61CE6FB661C67DF661CE7FFE0000 +2E5A:00007FFE61867DBE618E6FBE61867FFE7FFE61866FB661867DB661B67FFE0000 +2E5B:00007FFE61867DBE618E6FBE61867FFE7FFE618E6FB6618E7DB6618E7FFE0000 +2E5C:00007FFE61867DBE618E6FBE61867FFE7FFE61C66FBE61BE7DBE61C67FFE0000 +2E5D:00007FFE61867DBE618E6FBE61867FFE7FFE618E6FB661B67DB6618E7FFE0000 +2E5E:00007FFE61867DBE618E6FBE61867FFE7FFE61866FBE618E7DBE61867FFE0000 +2E5F:00007FFE61867DBE618E6FBE61867FFE7FFE61866FBE618E7DBE61BE7FFE0000 +2E60:00007FFE61867DBE618E6FBE61867FFE7FFE73CE6FB663B66DB673CE7FFE0000 +2E61:00007FFE61867DBE618E6FBE61867FFE7FFE73EE6FCE63EE6DEE73C67FFE0000 +2E62:00007FFE61867DBE618E6FBE61867FFE7FFE73866FF663866DBE73867FFE0000 +2E63:00007FFE61867DBE618E6FBE61867FFE7FFE738E6FF663C66DF6738E7FFE0000 +2E64:00007FFE61867DBE618E6FBE61867FFE7FFE73B66FB663866DF673F67FFE0000 +2E65:00007FFE61867DBE618E6FBE61867FFE7FFE73866FBE63866DF673867FFE0000 +2E66:00007FFE61867DBE618E6FBE61867FFE7FFE73CE6FBE638E6DB673CE7FFE0000 +2E67:00007FFE61867DBE618E6FBE61867FFE7FFE73866FF663EE6DDE73DE7FFE0000 +2E68:00007FFE61867DBE618E6FBE61867FFE7FFE73CE6FB663CE6DB673CE7FFE0000 +2E69:00007FFE61867DBE618E6FBE61867FFE7FFE73CE6FB663C66DF673CE7FFE0000 +2E6A:00007FFE61867DBE618E6FBE61867FFE7FFE73866FB663866DB673B67FFE0000 +2E6B:00007FFE61867DBE618E6FBE61867FFE7FFE738E6FB6638E6DB6738E7FFE0000 +2E6C:00007FFE61867DBE618E6FBE61867FFE7FFE73C66FBE63BE6DBE73C67FFE0000 +2E6D:00007FFE61867DBE618E6FBE61867FFE7FFE738E6FB663B66DB6738E7FFE0000 +2E6E:00007FFE61867DBE618E6FBE61867FFE7FFE73866FBE638E6DBE73867FFE0000 +2E6F:00007FFE61867DBE618E6FBE61867FFE7FFE73866FBE638E6DBE73BE7FFE0000 +2E70:00007FFE61867DBE618E6FBE61867FFE7FFE61CE7DB67BB677B677CE7FFE0000 +2E71:00007FFE61867DBE618E6FBE61867FFE7FFE61EE7DCE7BEE77EE77C67FFE0000 +2E72:00007FFE61867DBE618E6FBE61867FFE7FFE61867DF67B8677BE77867FFE0000 +2E73:00007FFE61867DBE618E6FBE61867FFE7FFE618E7DF67BC677F6778E7FFE0000 +2E74:00007FFE61867DBE618E6FBE61867FFE7FFE61B67DB67B8677F677F67FFE0000 +2E75:00007FFE61867DBE618E6FBE61867FFE7FFE61867DBE7B8677F677867FFE0000 +2E76:00007FFE61867DBE618E6FBE61867FFE7FFE61CE7DBE7B8E77B677CE7FFE0000 +2E77:00007FFE61867DBE618E6FBE61867FFE7FFE61867DF67BEE77DE77DE7FFE0000 +2E78:00007FFE61867DBE618E6FBE61867FFE7FFE61CE7DB67BCE77B677CE7FFE0000 +2E79:00007FFE61867DBE618E6FBE61867FFE7FFE61CE7DB67BC677F677CE7FFE0000 +2E7A:00007FFE61867DBE618E6FBE61867FFE7FFE61867DB67B8677B677B67FFE0000 +2E7B:00007FFE61867DBE618E6FBE61867FFE7FFE618E7DB67B8E77B6778E7FFE0000 +2E7C:00007FFE61867DBE618E6FBE61867FFE7FFE61C67DBE7BBE77BE77C67FFE0000 +2E7D:00007FFE61867DBE618E6FBE61867FFE7FFE618E7DB67BB677B6778E7FFE0000 +2E7E:00007FFE61867DBE618E6FBE61867FFE7FFE61867DBE7B8E77BE77867FFE0000 +2E7F:00007FFE61867DBE618E6FBE61867FFE7FFE61867DBE7B8E77BE77BE7FFE0000 +2E80:00000000000000000E000180006000101C00030000C000200000000000000000 +2E81:0000007C1F801000100010001000100010001000100020002000200040008000 +2E82:000000000000000000003FF80008000800100010002000200000000000000000 +2E83:0000100010001000100010001000100010001000100010001010101010100FF0 +2E84:00000000FFE00020002000200020002000200020002000100012000A00060002 +2E85:0040004000800100010003000500090001000100010001000100010001000100 +2E86:00000FF008100810081008100810081008100810081010101010101020504020 +2E87:00001FF01010101010101010101010101010101010102008200A200A40068002 +2E88:0400040007F00820084010002000000000000000000000000000000000000000 +2E89:0004000400040044004400440044004400440044004400440004000400140008 +2E8A:040004000400040004000400040007F004000400040004000400040004000400 +2E8B:00000000000000000000000000003FF020102010201020502020200420041FFC +2E8C:0100111009200100000000000000000000000000000000000000000000000000 +2E8D:0208210810900820000000000000000000000000000000000000000000000000 +2E8E:000000000000FFFE0440044004400440044008400840104210422042403E8000 +2E8F:022002100408080410026422042004200420042004200420082208221022601E +2E90:01000100010001000100FFFE024002400240044004400840084210422042C03E +2E91:0220021004080804100267E2042004200420042004200420082208221022601E +2E92:000000003FF020102010201020103FF02000200020002004200420041FFC0000 +2E93:00000100010002100410082010401F80010002000420081010083FFC00040004 +2E94:000004000400040007F0042008200820082008401FC00040004000407FFC0000 +2E95:00000000000000003FF8000800083FF80008000800083FF80008000000000000 +2E96:08000800080008000C004A004A00880008000800080008000800080008000800 +2E97:000000000000000000000200020002200290124812242214221042000A000400 +2E98:0100010001001FC001000100010001C007001900010001000100010005000200 +2E99:0800080008000FFC18102410442082200140008001800240042008101008E006 +2E9A:00007FFE61867DBE618E6FBE61867FFE7FFE73866DB671867DB673B67FFE0000 +2E9B:3FF002000200420042007FFC0480048004800880088010842084407C80000000 +2E9C:3FF820082FE820082FE800000000000000000000000000000000000000000000 +2E9D:00001FF01010101010101FF01010101010101FF0101010101010101010501020 +2E9E:0080008000FE088008800FF8100814102210412001400080010002000C007000 +2E9F:00001FF01010121011101110FFFE20102210211021103FFC0010001000A00040 +2EA0:000000103FF82008200820083FF8200020883FFC2080204020202010380E3004 +2EA1:200010001000800040004800080010001000E000200020002000200000000000 +2EA2:01000100010021081110092001000140052009101108E1044104010005000200 +2EA3:0000000000000000000000000000000000000000248822444244800400000000 +2EA4:0010007C0780F808210818900890000000000000000000000000000000000000 +2EA5:007C1F9011101110210821044002000000000000000000000000000000000000 +2EA6:020002000200220012000A000200020006000A00120062002200020002000200 +2EA7:010011001FF821000100FFFE0000000000000000000000000000000000000000 +2EA8:4400280010002800480088000800180028004800880008000800500020000000 +2EA9:FE0010001000100010001000FE00100010001000100016003800C00000000000 +2EAA:00000000FC0008001000100010005C0050005000500050005C00F00040000000 +2EAB:3FF82448244824483FF800000000000000000000000000000000000000000000 +2EAC:00007E0000000000FE0010001000540052005200900010001000100050002000 +2EAD:200010001000F800080010001000380054009400100010001000100010001000 +2EAE:00001040104010403EFE289049108A1000000000000000000000000000000000 +2EAF:080008001000120022007C000800100024007E00020000005200490089000000 +2EB0:10001000200024004400F800100020004000FC00400000001C00E00040000000 +2EB1:3FF8200824482288210822882448200800000000000000000000000000000000 +2EB2:3FF82448244824483FF800000000000000000000000000000000000000000000 +2EB3:00003FFC20044008044008201010000000000000000000000000000000000000 +2EB4:00007FFE4444844804400440044004400440044008400842104210422042403E +2EB5:0000000000003FFC224422442244224422442244224422442244200400000000 +2EB6:101008203FF801001FF001000200FFFE040008001000E0000000000000000000 +2EB7:082004407FFC01001FF00100FFFE000000000000000000000000000000000000 +2EB8:0440044004407C7C044004400000FFFE010001003FF801000100010001000100 +2EB9:020002083FC802100220FFFE0080010002000C003000C0000000000000000000 +2EBA:010001003FF80108FFFE01083FF8010801000100010001000100010001000100 +2EBB:010001001FF80108FFFE01081FF80100FFFE0000000000000000000000000000 +2EBC:07F8040805080488044804680408041804280448058808880808100820284010 +2EBD:02000C00707C400440044004400440047CFC400440044004400440047CFC4004 +2EBE:08200820FFFE0820082000000000000000000000000000000000000000000000 +2EBF:08200820FEFE0820082000000000000000000000000000000000000000000000 +2EC0:0000082008200820082008200820F83E08200820082008200820082008200000 +2EC1:010001F801003FFC210421602F88210820F8200023E02220222044244824901C +2EC2:200010000000FC00080010001000340058009400140010001000100010001000 +2EC3:7FFC044004403FF8244824483FF8000000000000000000000000000000000000 +2EC4:00000000FFFE0480048004807FFC4484448444844484489448F4500440047FFC +2EC5:1FF01010101011101110111011101110129012900480048008823082C07E0000 +2EC6:080008001FE020204040BFF8210821083FF8210821083FF82108410841288010 +2EC7:0400040007F0082010403FF85108118812481528198812481428180810281010 +2EC8:20001000100000000000F0001000100010001000100014001800100000000000 +2EC9:1FF0101010101010111011101110111011101210028004400820101020080000 +2ECA:00007F004100410041007F004900080008004F004800480048004F00F0004000 +2ECB:0200020002007FFC04000900110021003FF801000100FFFE0100010001000100 +2ECC:20001000100000000000F000100010001000100010001000280047FE00000000 +2ECD:2000100008004000200010000000F000100010001000100010002800440083FE +2ECE:00002000100000000000F800080010002000780008000800100010002800C7FE +2ECF:0000003C00240028002800300028002400240024003400280020002000200020 +2ED0:100010001E00200020007C0090001000FE001000100012001400180010000000 +2ED1:0FF808000FF008000FF00800FFFE1200111010A0104012201418180610000000 +2ED2:0FF8080008000FF0080008000FF008000800FFFE0400082010103FF810080000 +2ED3:0800081008200840088009000800FFFE0A0009000880084009200A180C060800 +2ED4:200013FC10044004400440044004400440044004400440044004400440144008 +2ED5:020004001FF0101010101FF010001FF8100810081FF810001FF8100810081FF8 +2ED6:F800880090009000A000900090008800880088008800F0008000800080008000 +2ED7:7FFC0100FFFE91128D6201001D70610C00000000000000000000000000000000 +2ED8:020002007FF802003FF00200FFFC00001FE010201FE010201FE01020102010C0 +2ED9:010001000104FFFE010001103FF8010001047FFE010401040104012801100100 +2EDA:7FFC020004001FF0101011101110111011101110129002400420181060080000 +2EDB:3FF02010201028502450229022902110211022902292244A484A400680020000 +2EDC:FFC000400044004800500060005000480044002000200012000A000600020000 +2EDD:0100028004400A203118DFF610101FF010101FF0100811901060121014081804 +2EDE:080008001400120029007E00A2003E0022003E0020003E00200020003E002000 +2EDF:080008001400120029007E00A2003E0022003E002000280024002A0032002000 +2EE0:2000200020003E00440048008000100010001000100012001400180010000000 +2EE1:088808881110222011100888FFFE02001FF010101FF010101FF010101FF01010 +2EE2:7FE0002000201020102010201FFC000400040004FFE400040004002800100000 +2EE3:1FF010101F90109010907FFE40029FF410101FF010101FF01010101010501020 +2EE4:020004003FF8210821083FF8220822083FF8051009200948117C2102410280FE +2EE5:040004000FE0102020407FF8A10821083FF8210821083FF800000000FFFE0000 +2EE6:010002001FF01010121011101150102010001FFC000400047FE4000400280010 +2EE7:0100010001FE010001003FF8200828282448228821082288244828283FF82008 +2EE8:010001007FFC010001003FF801000100FFFE08001FF02820444003801C70E00E +2EE9:04403FF804400440FFFE01001FF0111011101FF0111011101FF0044008201010 +2EEA:1FF0101010101FF001003FF8210821083FF8210821083FF8210A0102010200FE +2EEB:020001007FFC0820044003801C70F01E10101FF0101010101FF0101020104010 +2EEC:020001007FFC0820044003800C603018C8260820082008200820102010202020 +2EED:0100010011F811001100FFFE00002928254823883FF823882548292821083FF8 +2EEE:0100010011F8110011001100FFFE00002108210822882448282820083FF80008 +2EEF:020001007FFC10100820FFFE01001FF011101FF0111011101FF01112010200FE +2EF0:0420041004100400FFFE048004880488049008A008C0108211822282447E8000 +2EF1:04003FF820083EF802807A800AFCFE940AD47AA402A47AD40A94FEFC0A8279FE +2EF2:04000FC010803FF0D1101FF011101FF001003FF821083FF821083FF8010200FE +2EF3:040004000FE0102020407FF8A10821083FF8210821083FF821080102010200FE +2EF4:00007FFE61867DBE618E6FBE61867FFE7FFE61B66FB663866FF66FF67FFE0000 +2EF5:00007FFE61867DBE618E6FBE61867FFE7FFE61866FBE63866FF66F867FFE0000 +2EF6:00007FFE61867DBE618E6FBE61867FFE7FFE61CE6FBE638E6FB66FCE7FFE0000 +2EF7:00007FFE61867DBE618E6FBE61867FFE7FFE61866FF663EE6FDE6FDE7FFE0000 +2EF8:00007FFE61867DBE618E6FBE61867FFE7FFE61CE6FB663CE6FB66FCE7FFE0000 +2EF9:00007FFE61867DBE618E6FBE61867FFE7FFE61CE6FB663C66FF66FCE7FFE0000 +2EFA:00007FFE61867DBE618E6FBE61867FFE7FFE61866FB663866FB66FB67FFE0000 +2EFB:00007FFE61867DBE618E6FBE61867FFE7FFE618E6FB6638E6FB66F8E7FFE0000 +2EFC:00007FFE61867DBE618E6FBE61867FFE7FFE61C66FBE63BE6FBE6FC67FFE0000 +2EFD:00007FFE61867DBE618E6FBE61867FFE7FFE618E6FB663B66FB66F8E7FFE0000 +2EFE:00007FFE61867DBE618E6FBE61867FFE7FFE61866FBE638E6FBE6F867FFE0000 +2EFF:00007FFE61867DBE618E6FBE61867FFE7FFE61866FBE638E6FBE6FBE7FFE0000 +2F00:000000000000000000047FFE0000000000000000000000000000000000000000 +2F01:0100018001000100010001000100010001000100010001000100010001000000 +2F02:0000000004000200010000800040004000000000000000000000000000000000 +2F03:0200020002000200020002000200020002000200040004000800100020000000 +2F04:00403FE000400080010002000400080010002004200420061FFC000000000000 +2F05:00400040004000400040004000400040004000400040004003C0004000000000 +2F06:00101FF80000000000000000000000000000000000047FFE0000000000000000 +2F07:000000000100008000847FFE0000000000000000000000000000000000000000 +2F08:0100010001000100010001000100010001000280044008201010200E40040000 +2F09:08400C60084008400840084008400840084008401040104420444046803C0000 +2F0A:1E000100010001000100028002800440044008201010200C4006800200000000 +2F0B:00C0004000400640044004400420082008200810101010082004400680020000 +2F0C:20043FFE20042004200420042004200420042004200420042024201C20080000 +2F0D:00000000000020023FFE20044008000000000000000000000000000000000000 +2F0E:0400030001000000004000800080010001000600020002000200020000000000 +2F0F:00200FF0082008200820082008200820082008200820082210222022401E0000 +2F10:2004300620042004200420042004200420042004200420043FFC200400000000 +2F11:00043FFE01040104010401040104010402040204040404040844103860100000 +2F12:01000100010001083FFC01080108010801080208020804080888107060200000 +2F13:1000100010041FFE100420044004000400040004000400040044003800100000 +2F14:08000C00080008100820084009800A000C003800C80008040804080607FC0000 +2F15:20083FFC20002000200020002000200020002000200020083FFC200000000000 +2F16:7FFC200020002000200020002000200020002000200020083FFC000000000000 +2F17:0100010001000100010001047FFE010001000100010001000100010001000000 +2F18:0200020002000200020003800240023002180208020002000200020002000000 +2F19:042007F0042004200420042004200420042004E0044004000400040004000000 +2F1A:20043FFE20002000200020002000200020002000200020004000400080000000 +2F1B:018001000100020002000400040008200810100811FCFE044004000000000000 +2F1C:00103FF80810081004200420024002400180018002400420181E600400000000 +2F1D:10081FFC1008100810081008100810081008100810081FF81008000000000000 +2F1E:20043FFE20042004200420042004200420042004200420043FFC200400000000 +2F1F:0100018001000100010001083FFC01000100010001000100010001047FFE0000 +2F20:0100018001000100010001047FFE01000100010001000100010001083FFC0000 +2F21:0400041007F80C101220214001800E70700E0000000000000000000000000000 +2F22:0200020012100BF8041004100A200A20114021404080014006201818E0060000 +2F23:02000200020803FC040804080C10121021204120004000800100060038000000 +2F24:010001800100010001047FFE0100010001000280044008201010200E40040000 +2F25:020003000200020002047FFE042004200820082010400E8001800670780E0000 +2F26:00083FFC0010002000C0008000847FFE00800080008000800480038001000000 +2F27:00000100008020843FFE20044008000000000000000000000000000000000000 +2F28:00200020002000247FFE0020002008200420042004200020012000E000400000 +2F29:008000800080008000800C900888108410862082408200800480038001000000 +2F2A:0200020002000208FFFC020002000280028004800484088410842086C07C0000 +2F2B:10081FFC1008100810081FF81008100010001000100020002000400080000000 +2F2C:010001000100210421042104210421043FFC21040100010002000C0070000000 +2F2D:01000100010001004104410441044104410441044104410441047FFC40040000 +2F2E:0444044408880888111011102220444022201110088808880444044404440000 +2F2F:00083FFC01000100010001000100010001000100010001047FFE000000000000 +2F30:00107FF800100010001000103FF020102000200020002004200420061FFC0000 +2F31:00800080008010841FFE10841084108410841084108410BC1088008000800000 +2F32:00083FFC010001000100010001047FFE01000100010001000100010001000000 +2F33:0300020004000430082010407F80210002000420081013E87C0C200400000000 +2F34:0100008000841FFE100010001000100010001000100020002000400080000000 +2F35:08007C0008000800100024003E00040084004400280010002800C40683FC0000 +2F36:0410041004100410041004107FFE041004100410041008100810101020100000 +2F37:0120011801080100011E01E07F003080008000800040004200220012000E0000 +2F38:00103FF80010001000101FF0100010083FFC000800080008010800F000200000 +2F39:00083FFC000800080008000800081FF8000800080008000800083FF800080000 +2F3A:00C0008001000200040000C00080010002000460004000800100020004000000 +2F3B:00C000800100020004C008800100030005000900110001000100010001000000 +2F3C:0100008000C00040040004002408240424062402440084100410041803F00000 +2F3D:0200024002200200021C02E07F000218021002200140018202440C24701E0000 +2F3E:001010381FC010081FFC1008100810081FF81008100020002000400080000000 +2F3F:001000787F80010001103FF8010001047FFE0100010001000900070002000000 +2F40:0080008000847FFE008000901FF80410041002200140008001400630380E0000 +2F41:01000100010401FE010001103FF80810042004200240018001800E70700E0000 +2F42:0100008000847FFE082008200820044004400240028001800660181860060000 +2F43:002008200420022002200820042002200224003E03E07C202020002000200000 +2F44:002010701F801000100010041FFE104010401040104020402040404080400000 +2F45:0100008000847FFE02000200020803FC02080208020804080888107060200000 +2F46:00081FFC01000100010001047FFE0240024002400240044208421042603E0000 +2F47:10101FF8101010101010101010101FF0101010101010101010101FF010100000 +2F48:20083FFC20082008200820083FF820082008200820083FF82008000000000000 +2F49:08100FF80810081008100FF00810081008100FF0081008101090207040200000 +2F4A:00800080008000847FFE0080028002A004A00490089008881086608400800000 +2F4B:0800080008040FFE100821104100010001000100018002400420181860060000 +2F4C:00800080008000800080088808FC08800880088008800880088008847FFE0000 +2F4D:00047FFE02000200021003F804100C1012202120414000800100060078000000 +2F4E:042007F00420042004200820101C20001FF808100420024001800E70700C0000 +2F4F:00081FFC10881088108810887FFE11081108210822087FFE041009F030200000 +2F50:0040104010401040104C12481F501060104010401040104413443C46103C0000 +2F51:001000383FC001000100011C3FE00100010E01F07F0001020102010200FE0000 +2F52:001010381FC01080108010881FFC1080108010801080124214227812200E0000 +2F53:080008080FFC10002FF04000BFF000100010001000100012000A000600020000 +2F54:010001000100011801107D2005400580094009201110210C4906870202000000 +2F55:0080008000800080088C0888089010A020C00080018002400420181860060000 +2F56:001010381FE01120112011201120112011101110111021082108410681020000 +2F57:044004200810100C2004402004200440024002800180018002400C30300E0000 +2F58:00181810062001C002300C0C30240420044002400280018002C00C30300E0000 +2F59:0010041004100410041007F0001000103FF00410041004100410081030100000 +2F5A:104010401040104010441FFE100010201FF01020102010201020202040200000 +2F5B:00047FFE00400840084010443FFE01400240044008401040224041C000800000 +2F5C:00800080108010881FFC10802080408000847FFE008000800080008000800000 +2F5D:010001A00110011001047FFE0100010001000280044008201010200E40040000 +2F5E:0100008000847FFE01000100023005E01E4008800100021005F81E0C08040000 +2F5F:00083FFC01000100010001101FF80100012001100110010001047FFE00000000 +2F60:0008103C1FE0112011201120112011201110111011501148214843A681220000 +2F61:00047FFE04000400042007F008200A20092009201020102213227C22201E0000 +2F62:0810081008147FFE08100810081008100FF008100810081008100FF008100000 +2F63:00801080108010881FFC10802080408000901FF800800080008000847FFE0000 +2F64:10041FFE1084108410841FFC1084108410841FFC1084208420A4409C80880000 +2F65:20043FFE20842084208420843FFC208420842084208420843FFC200400000000 +2F66:00047FFE0084008800801080108810FC10801080188014802280C18080FE0000 +2F67:008008440FFE4800280028000800180068004800080010001000200040000000 +2F68:00087F1002A22244142808101008200440020000000000000000000000000000 +2F69:0100010012081FFC10081008100810081FF810081008100810081FF810080000 +2F6A:0080008010841FFE1084108810801FF812101210112020C020C043309C0E0000 +2F6B:10081FFC12481248124812481248124812481248124812487FFE000000000000 +2F6C:10101FF81010101010101FF01010101010101FF01010101010101FF010100000 +2F6D:00101FF800200340008000847FFE018802900480088010802480438001000000 +2F6E:0800080008080FFC10802080008000847FFE0080014002200410180E60040000 +2F6F:00047FFE01000100020004080FFC1408240844080408040807F8040800000000 +2F70:00101FF800000000000000047FFE00800CA00890108820844484038001000000 +2F71:0100010021043FFE210422042244222424F43F14281420042004203C20080000 +2F72:0008003C1FC00080008000847FFE008001C002A0049008881086608200800000 +2F73:0100008020823FFE200440080440044004400420082008101008200C40060000 +2F74:02000100008000883FFC000008100810042004200240024000847FFE00000000 +2F75:10001060104012441F7E289049108A1008100810081008100890087008200000 +2F76:0080108C08880C9004A000C47FFE028002C004A0089010882086408200800000 +2F77:01800100023004201FC00880012002103FFC108400800C900888108620820000 +2F78:0800080008080FFC1080208000847FFE008010841084108410841FFC10040000 +2F79:20043FFE2004211421142A942464222425242954309421042024201C20080000 +2F7A:0830042002447FFE0100010001101FF8010001047FFE01000100010001000000 +2F7B:02047FFE02042244122412240204060C1A3462C40204020412240E1C04080000 +2F7C:01000100010C3FE8011001247FFE0080010006300CC017046404040603FC0000 +2F7D:00047FFE0080008021043FFE2244224422442244224422442244225C20080000 +2F7E:01000104FFFE010001103FF801000104FFFE054005200910110C2106C1020000 +2F7F:00047FFE082008200FE00820082008200FE00824083E0FE07820002000200000 +2F80:010001081FFC01087FFE01081FF8010801003FF801047FFE0100010001000000 +2F81:0100010021043FFE210421842244243429142104218422442424281C20080000 +2F82:20083FFC2100210021083FFC2008200820083FF82108210021043FFE20000000 +2F83:0180010002081FFC100810081FF81008100810081FF8100810081FF810080000 +2F84:00047FFE01000200042008107FF82104010001083FFC0100010001047FFE0000 +2F85:02002704387E20042004200420043E7C200420042004200420043FFC20040000 +2F86:001000783F80008000847FFE0080008008880FFC0808080808080FF808080000 +2F87:10101010101012141F7E1210225052500A900AFE041008101010201040100000 +2F88:010001000A100FF809100890089008147FFE091008900890081010F020200000 +2F89:10101FF8101010101FF0101010101FF01200110C113010C01660781820060000 +2F8A:0400042007F0084010883FFC5108110811081FF810081002100210020FFE0000 +2F8B:0810081008102A542A542A542A542A542A543E7C2A5408101010201040100000 +2F8C:010001FC010001003FFE200221042110213821C02F0021022102410280FE0000 +2F8D:00800080008010881FFC1088108810881FF810880080008800847FFE30020000 +2F8E:00C00080010012081FFC124812481248124812481248124812487FFE00000000 +2F8F:180811FC200040000C040BFE1010301050109010101010101090107010200000 +2F90:0100008000847FFE0180028C04880C50146024404420049005080E0604020000 +2F91:00047FFE0220022022243FFE222422242224222423E422242004200420040000 +2F92:00201FF0102010201FE0102010201FE0102010201FE014A408843086C07C0000 +2F93:042007F0042008441FFE288448840FFC088408840FFC10841084209C40880000 +2F94:02000104FFFE000000001FF000001FF0000010101FF8101010101FF010100000 +2F95:044004200810100C218402400420181860060FF00810081008100FF008100000 +2F96:00083FFC000008100FF80810081008100FF0081004600440024002847FFE0000 +2F97:00047FFE01000200040C1A08631004A019C062A00490188E6084048003000000 +2F98:006000C00188065C1A2001C003200C60109003301C50009003101D2000C00000 +2F99:08080FFC080808080FF8080808080FF8080808080FF8080803600C1830060000 +2F9A:0080008000881FFC008000847FFE02401248124422442442444209C030800000 +2F9B:0100010001101FF8010001047FFE01000900090809FC09001500230040FE0000 +2F9C:08100FF80810081008100FF008900080088808FC088014801280218640FC0000 +2F9D:008009100FF808100FF0081008160FF408187FF000500190061018F060200000 +2F9E:010001047FFE010011081FFC11081FF811081FF8110801047FFE010001000000 +2F9F:010000883FFC08200420024002447FFE010001083FFC01000100010001000000 +2FA0:10041FFE1000101017F8100010041FFE124012481250222022904F0884060000 +2FA1:006001801E3800C01F1800601F8000801080108818FC148022804180807E0000 +2FA2:1FF0101010101FF0101000003FF8210821083FF820082004200420061FFC0000 +2FA3:00047FFE024012441FFE124412441244143C180410041FFC10041FFC10040000 +2FA4:003000F83F0001101110092009447FFE0380054009201110210E410401000000 +2FA5:10081FFC110811081FF8110811081FF81108010001083FFC010001047FFE0000 +2FA6:0080018002400420081010086FF6010001083FFC01001118091009247FFE0000 +2FA7:08100FF808000FF008000FF0080008047FFE08880850082009900E0E38040000 +2FA8:7EFC428442847EFC428442847EFC400440044004400440044024401C40080000 +2FA9:010012101FF810101FF010001FF810081FF8108800847FFE0080008000800000 +2FAA:010001103FF801107FFE01103FF0011031880990076009207118270602000000 +2FAB:0480044004440FFE0840184028484FFC084008480FFC084008440FFE08000000 +2FAC:00047FFE010021043FFE21042944252425242104294425242524211C21080000 +2FAD:0104FFFE01003FF80104FFFE00003FF82108210821083FF82008207820100000 +2FAE:0240024002447E7E0240024002483E7C0240024002447E7E0240024002400000 +2FAF:00047FFE008021043FFE2244224423C42244224423C4224422443FFC20040000 +2FB0:08200824FFFE08200FE001003FF821083FF821080100FFFE0100010001000000 +2FB1:020002201FF004247FFE00000FF008100FF000803FFC10803FFC008000800000 +2FB2:02400240024002447E7E024002403E7C024002447E7E0240024002447FFE0000 +2FB3:030001087FFC102008200440FFFE000010101FF810101FF010101FF010100000 +2FB4:00047FFE008011081FFC10081FF810081FF810081FF8100803600C1830060000 +2FB5:20083FFC204821E82F0821082FE8292829282FE82928214A21EA4F2684020000 +2FB6:3FE0002400280D30392C092209127FEE092409280930112C1112210A41060000 +2FB7:008001800240052018986FF608100FF008100FF0080809900A603C1810060000 +2FB8:083004207FFE008011101FF8101010101FF010101FF0101010101FF010100000 +2FB9:002000703F8001047FFE054009203118C8160FF808100FF008100FF008100000 +2FBA:10081FFC110011101FF811001FF8110011041FFE002409142494248440380000 +2FBB:08100FF8081009F029123FFE20044FF408100FF008100FF00810087008200000 +2FBC:010000847FFE00000FF008100FF020043FFE200427E4242427E4243C20080000 +2FBD:22003F0C200820103F2620443F8820107F26104410082210FF20414001800000 +2FBE:8002BEFA8822BEFA8822BEFA8002800280028002800280028012800E80040000 +2FBF:02102924244432A42994224424A43FFC2004103010C01700180410040FFC0000 +2FC0:00047FFE00000FF008100FF000003FFC2004244422842FF42104211C21080000 +2FC1:010012081FFC110811081FF8110811081FF81088019002A804FE1882607E0000 +2FC2:042007F0042008401FF8288848880FF8088808880FF808082444222242220000 +2FC3:01000A100FF808100FF008100FF008080FFC08000FFC29242494449400180000 +2FC4:0100010401FE01003FFC22142924244432A429942244252428943FFC20040000 +2FC5:010020843FFE222022243FFE22243FFC280428202FA4283829A25E22883E0000 +2FC6:008000847FFE08880888149423E20490190863F604200B4030C001201E100000 +2FC7:010040847FFE441044107F7E4410555455545554555455546494A49684100000 +2FC8:04247FFE042007E000047FFE01001FF811081FF811081FF810080C30700E0000 +2FC9:00701F8001087FFE010007E0191862860D60711E0D6403800560191863060000 +2FCA:10081FFC1108192815481FF8110801003FF8010001007FFE2444222242220000 +2FCB:124812480A500A507FFE108820845FFE1084118412C414A41894109C10880000 +2FCC:3FFC224422443E7C224402403E7C22443E7C22443E7C22440242024201FE0000 +2FCD:07E0042027E4242427E4242427E424243E7C02407E7E12481248224842480000 +2FCE:08200820FF2408FE7E2000247FFE424442447E48422824101E30704E21840000 +2FCF:060838FC20083EF820083FF820080940252821082948252A210A294673820000 +2FD0:01000FF008100FF008100FF008101FF811081FF811087FFE0420042038200000 +2FD1:020001047FFE02483EB0152815282534592208100FF008100FF0101060100000 +2FD2:0080089008F80880FFFE044044444AA451147FFC44444AA451147FFC40040000 +2FD3:104008447F7E2240147C7F04007C3E40227C3E40227C3E40227E2E42243E0000 +2FD4:08400FE0084010807FFC11447F7C05447F6C05547D6C05447F7E05027CFC0000 +2FD5:01800660181863C600007BDE4A527BDE00003FFC22443FFC2244225C22480000 +2FD6:00007FFE61867DBE618E6FBE61BE7FFE7FFE63CE6DBE6D8E6DB663CE7FFE0000 +2FD7:00007FFE61867DBE618E6FBE61BE7FFE7FFE63866DF66DEE6DDE63DE7FFE0000 +2FD8:00007FFE61867DBE618E6FBE61BE7FFE7FFE63CE6DB66DCE6DB663CE7FFE0000 +2FD9:00007FFE61867DBE618E6FBE61BE7FFE7FFE63CE6DB66DC66DF663CE7FFE0000 +2FDA:00007FFE61867DBE618E6FBE61BE7FFE7FFE63866DB66D866DB663B67FFE0000 +2FDB:00007FFE61867DBE618E6FBE61BE7FFE7FFE638E6DB66D8E6DB6638E7FFE0000 +2FDC:00007FFE61867DBE618E6FBE61BE7FFE7FFE63C66DBE6DBE6DBE63C67FFE0000 +2FDD:00007FFE61867DBE618E6FBE61BE7FFE7FFE638E6DB66DB66DB6638E7FFE0000 +2FDE:00007FFE61867DBE618E6FBE61BE7FFE7FFE63866DBE6D8E6DBE63867FFE0000 +2FDF:00007FFE61867DBE618E6FBE61BE7FFE7FFE63866DBE6D8E6DBE63BE7FFE0000 +2FE0:00007FFE61867DBE618E6FBE61BE7FFE7FFE61CE6FB663B66FB661CE7FFE0000 +2FE1:00007FFE61867DBE618E6FBE61BE7FFE7FFE61EE6FCE63EE6FEE61C67FFE0000 +2FE2:00007FFE61867DBE618E6FBE61BE7FFE7FFE61866FF663866FBE61867FFE0000 +2FE3:00007FFE61867DBE618E6FBE61BE7FFE7FFE618E6FF663C66FF6618E7FFE0000 +2FE4:00007FFE61867DBE618E6FBE61BE7FFE7FFE61B66FB663866FF661F67FFE0000 +2FE5:00007FFE61867DBE618E6FBE61BE7FFE7FFE61866FBE63866FF661867FFE0000 +2FE6:00007FFE61867DBE618E6FBE61BE7FFE7FFE61CE6FBE638E6FB661CE7FFE0000 +2FE7:00007FFE61867DBE618E6FBE61BE7FFE7FFE61866FF663EE6FDE61DE7FFE0000 +2FE8:00007FFE61867DBE618E6FBE61BE7FFE7FFE61CE6FB663CE6FB661CE7FFE0000 +2FE9:00007FFE61867DBE618E6FBE61BE7FFE7FFE61CE6FB663C66FF661CE7FFE0000 +2FEA:00007FFE61867DBE618E6FBE61BE7FFE7FFE61866FB663866FB661B67FFE0000 +2FEB:00007FFE61867DBE618E6FBE61BE7FFE7FFE618E6FB6638E6FB6618E7FFE0000 +2FEC:00007FFE61867DBE618E6FBE61BE7FFE7FFE61C66FBE63BE6FBE61C67FFE0000 +2FED:00007FFE61867DBE618E6FBE61BE7FFE7FFE618E6FB663B66FB6618E7FFE0000 +2FEE:00007FFE61867DBE618E6FBE61BE7FFE7FFE61866FBE638E6FBE61867FFE0000 +2FEF:00007FFE61867DBE618E6FBE61BE7FFE7FFE61866FBE638E6FBE61BE7FFE0000 +2FF0:EDB600008102810200008102810200008102810200008102810201008002B6DA +2FF1:EDB6000080028002800200008002800236D8800280020000800280020000EDB6 +2FF2:EDB600008442844280020440844280020440844280020440844284420000EDB6 +2FF3:EDB600008002800280020000B6DA800200008002B6DA0000800280020000EDB6 +2FF4:AAAA00008002155080021010800210108002101090120000955280020000AAAA +2FF5:DBB60000800280020D608822800208208002882288220000882288220000DBB6 +2FF6:DBB600008822882200008822882200008822800288220D60800280020000DBB6 +2FF7:DB6D000180008001056D84008001040180008401056D8000800100018000B6DB +2FF8:DB6D0001800080010B6D8800800108018800800108018800800108018800B6DB +2FF9:DB6D00018000800136D18010800100118010800100118010800100118010B6DB +2FFA:DB6D08018800800108018800800108018800800108018B6C800100018000B6DB +2FFB:0000DB60802000009B6C902400009024902400009024DB64000010041B6C0000 +2FFC:00007FFE61867DBE618E6FBE61BE7FFE7FFE61C66FBE63BE6FBE6FC67FFE0000 +2FFD:00007FFE61867DBE618E6FBE61BE7FFE7FFE618E6FB663B66FB66F8E7FFE0000 +2FFE:00007FFE61867DBE618E6FBE61BE7FFE7FFE61866FBE638E6FBE6F867FFE0000 +2FFF:00007FFE61867DBE618E6FBE61BE7FFE7FFE61866FBE638E6FBE6FBE7FFE0000 +3000:0000000000000000000000000000000000000000000000000000000000000000 +3001:000000000000000000000000000010000C000600020000000000000000000000 +3002:000000000000000000000000000000000C00120012000C000000000000000000 +3003:0000000000000240024002400480048009000900000000000000000000000000 +3004:0000060018202030412841A881448D0493044908440824101860018000000000 +3005:00000000020001000100023003C8041008201240218000800040000000000000 +3006:0000000000100008001006200940088009401220141018003000200000000000 +3007:0000078018602010400840088004800480048004400840082010186007800000 +3008:0008000800100010002000200040008000400020002000100010000800080000 +3009:1000100008000800040004000200010002000400040008000800100010000000 +300A:0048004800900090012001200240048002400120012000900090004800480000 +300B:1200120009000900048004800240012002400480048009000900120012000000 +300C:00F8008000800080008000800080008000800080008000000000000000000000 +300D:000000000000000001000100010001000100010001000100010001001F000000 +300E:01F801080178014001400140014001400140014001C000000000000000000000 +300F:0000000000000000038002800280028002800280028002801E8010801F800000 +3010:00F800F000E000E000E000C000C000C000C000C000C000E000E000F000F80000 +3011:1F000F00070007000300030003000300030003000300070007000F001F000000 +3012:00007FFE000000007FFE01000100010001000100010001000100010000000000 +3013:3FFE3FFE3FFE3FFE3FFE0000000000003FFE3FFE3FFE3FFE3FFE000000000000 +3014:0008001000200040004000400040004000400040004000400020001000080000 +3015:1000080004000200020002000200020002000200020002000400080010000000 +3016:03F8021002200240024002800280028002800280024002400220021003F80000 +3017:1FC008400440024002400140014001400140014002400240044008401FC00000 +3018:0008003000500050005000500050005000500050005000500050003000080000 +3019:10000C000A000A000A000A000A000A000A000A000A000A000A000C0010000000 +301A:00F800A000A000A000A000A000A000A000A000A000A000A000A000A000F80000 +301B:1F0005000500050005000500050005000500050005000500050005001F000000 +301C:0000000000000000000000003E004182007C0000000000000000000000000000 +301D:0090004800240000000000000000000000000000000000000000000000000000 +301E:0900120024000000000000000000000000000000000000000000000000000000 +301F:0000000000000000000000000000000000000000000000000900120024000000 +3020:00003FFC3FFC00003FFC3FFC5596D9B9A5A5A5A5599A4182242413C8081007E0 +3021:0180010001000100010001000100010001000100010001000100010000000000 +3022:006000400C400840084008400840084008400840084000400040004000000000 +3023:0008200821082108210821082108210821082108210820082008000800000000 +3024:001000101020082004400240018000C001200210040808083000000000000000 +3025:00000420043008201CC003000480084008201020102010201040084007800000 +3026:00000100008000847FFE00000000000000000000000000000000000000000000 +3027:000001000100010001003FFC0000000000003FFC000000000000000000000000 +3028:0100010001007FFE0000000000003FFC00000000000000007FFE000000000000 +3029:0800080008000FFC10102810042002200140008000C0012002100C1030000000 +302A:0000000000000000000000000000000000000000000000006000900090006000 +302B:0000600090009000600000000000000000000000000000000000000000000000 +302C:0000000600090009000600000000000000000000000000000000000000000000 +302D:0000000000000000000000000000000000000000000000000006000900090006 +302E:00000000000000000000000000000000C000C000000000000000000000000000 +302F:000000000000000000000000C000C0000000C000C00000000000000000000000 +3030:000000000000000000000000618692490C300000000000000000000000000000 +3031:0100018001000200020004000800100010000800040002000100010000800080 +3032:0100018001100208024804200820100010000800040002000100010000800080 +3033:0400060004000800080008001000100010002000200020004000400080008000 +3034:0400060004400820088008401040100010002000200020004000400080008000 +3035:8000800040002000200010001000080008000400040002000200010001000000 +3036:07C0183020085FF45FF480029FF29FF2810281028102410441042108183007C0 +3037:8282828282824444444428282828101010102828282844444444828282828282 +3038:010001000100010001000100FFFE010001000100010001000100010001000000 +3039:082008200820082008200820FFFE082008200820082008200820082008200000 +303A:10881088108810881088FFFE1088108810881088108820882088408880080000 +303B:0000000002000100008000400080010000800040002000000000000000000000 +303C:0000000000003FF82018202820482088210822082408280830083FF800000000 +303D:0000000010002860449003100010001000100010001000100008000800040000 +303E:DB6D80010E00918980710000801180211FF8808181011FF8840188000001DB6D +303F:00FE82C6C6AAAA92AAAAC6C682FE0000 +3040:00007FFE63CE7DB671B67DB663CE7FFE7FFE6DCE6DB661B67DB67DCE7FFE0000 +3041:00000000000000000400020013800E00048007E00D10161026102A2010C00000 +3042:00000400020002C01F000480048007E00D101508220826082A10106000000000 +3043:000000000000000000000000000010401020101010300A000C00040000000000 +3044:0000000000000000400020602010200822082418140818000800000000000000 +3045:0000000000000000000002000180000013800C40004000400040008003000000 +3046:0000020001C00000000003C01C20002000200020002000400040008001000000 +3047:0000000000000000000002000180000001C00E80010002000700090010F00000 +3048:0000040003800000000011C00E800100020004000E001100210020F800000000 +3049:00000000000000000000104008300C2038000BC00C201820282018C008000000 +304A:00000000080004300508060C1C000460059006080C0834880C70040000000000 +304B:0000000008000400046047103C88089808800880108011002500220000000000 +304C:0000000808240410044047203C90088808980880108011002500220000000000 +304D:00000200010001600F80008000F01F400020002007F008100800060001C00000 +304E:00000408022402D01F00010001E03E80004000400FE0102010000C0003800000 +304F:0000008000400040008001000600080008000400020001000080004000400000 +3050:0000008000400040008801240610080008000400020001000080004000400000 +3051:00000080204010201020103C23E0202020202020202018201040104000800000 +3052:0000010840A420502040207847C0404040404040404030402080208001000000 +3053:00000000080007E00080010000000000000000002000200010100FE000000000 +3054:00000008080407F00088010000000000000000002000200010100FE000000000 +3055:000004000200013021C01E800040004007E00820100010000C0003C000000000 +3056:000004080204013021C81E800040004007E00820100010000C0003C000000000 +3057:0000000010000800080008000800080008000800080808100460038000000000 +3058:0000000010200890084008000800080008000800080808100460038000000000 +3059:00000100008040F83F800080038004C0044003C0004000800080010002000000 +305A:00000128009440F83F800080038004C0044003C0004000800080010002000000 +305B:0000000000801040084008784BC03C400840084008C00840040003E000000000 +305C:0000000800841050084808784BC03C400840084008C00840040003E000000000 +305D:0000000009C0064000800100023807C038800100020002000200010000E00000 +305E:0000000009C8066400900100023807C038800100020002000200010000E00000 +305F:000000000800048007003C0008F008180820100010001100210020F800000000 +3060:000000080824049007003C0008F008180820100010001100210020F800000000 +3061:00000800040004C047003C00080008C00B201C1010100010002000C007000000 +3062:00000800040804C447103C08080008C00B201C1010100010002000C007000000 +3063:000000000000000000000000000001C00620381000100010002000C007000000 +3064:000000000000000003E04C103008000800080008001000600380000000000000 +3065:000000080024001003E04C103008000800080008001000600380000000000000 +3066:00000000003843C03C800100010002000200020002000200010000E000000000 +3067:00000000003843C03C880124011002000200020002000200010000E000000000 +3068:000000000400020002000200027003800600080010001000080007F000000000 +3069:000000000408022402100200027003800600080010001000080007F000000000 +306A:00000400020002803F0004700818082010401040204003C00460045003800000 +306B:000000002000100010F01318202020002000200022002A0011F8100010000000 +306C:0000000001000080008013E01510190812082A084C084C685490206800000000 +306D:000010000800080008004CE03F100C1008101810181028F0591808E000000000 +306E:00000000000003C00D2011101108220822082408241028101060018000000000 +306F:0000004020201020143813E0202020202020202029E01230122811C000000000 +3070:0000008840442050287827C0404040404040404053C024602450238000000000 +3071:0000009840642064287827C0404040404040404053C024602450238000000000 +3072:00000000004004403C2008200830102810201020104010400880070000000000 +3073:00000008004404503C2808200830102810201020104010400880070000000000 +3074:00000030004804483C3008200830102810201020104010400880070000000000 +3075:00000000040003800080010002000200010002B04C88389C2480030000000000 +3076:000000000400038800A4011002000200010002B04C88389C2480030000000000 +3077:000000000400039800A4012402180200010002B04C88389C2480030000000000 +3078:0000000000000000000006000900108020400030000C00000000000000000000 +3079:0000000000000010004806200900108020400030000C00000000000000000000 +307A:0000000000300048004806300900108020400030000C00000000000000000000 +307B:00000000223011C01040103823E020202020202029E01230122811C000000000 +307C:00000000446823842090207847C040404040404053C024602450238000000000 +307D:00000018446423A42098207047C040404040404053C024602450238000000000 +307E:00000100008010F00F80008010E00F80008000800F8010E010900F0000000000 +307F:000000000880078001000100022002100FF03418442448203040008000000000 +3080:00000800040027001C3004081C0C240024002C2018100810081007E000000000 +3081:0000000001000080108013C01CA0111029082A08460844084A10306000000000 +3082:00000200010011000E000380120024201C200710041004100410022001C00000 +3083:000000000000000000000100088009E00E103C10046002000200010001000000 +3084:00000100008001C0180010F00B084C0834080270020001000100008000800000 +3085:000000000000000000000200010021E0271029103110232021C0010002000000 +3086:000000000300408021E022902488288830883488229021E00080010002000000 +3087:000000000000000002000100012001C00100010001000F0011C011200E000000 +3088:0000020001000100013001C001000100010001001F80216021101E0000000000 +3089:00000200010001C0060008000800080009E00E1008100810002000C003000000 +308A:0000100009800A400C200C200820082008200820004000400080010002000000 +308B:0000000008C0074000800100020007C00C201010201003900460044003800000 +308C:000000001000080009C00A201C206C2008201820182028204824181808000000 +308D:0000000011800E800100020004000FC00820101020100010002000C007000000 +308E:0000000000000000000008000400040006E01D1006100C100C10142004400000 +308F:000010000800080008004CE03F100C080808180818082810482018C008000000 +3090:00000000098006800100010003E00E1012082408240828C8193010E000000000 +3091:0000000009800700020007C008201020062009C0070008001CE0231040380000 +3092:00000400020012C00F00040004200F3818C02180028004800800080007E00000 +3093:000002000100010002000200040004000F000880108010882090206000000000 +3094:0000020001C80004001003C81C20002000200020002000400040008001000000 +3095:00000000000000000000040004603F1004880898108011002500220000000000 +3096:0000000000000080004008200820083811E01020102014201440084000800000 +3097:00007FFE63CE7DB671B67DB663CE7FFE7FFE73866DF671EE7DDE73DE7FFE0000 +3098:00007FFE63CE7DB671B67DB663CE7FFE7FFE73CE6DB671CE7DB673CE7FFE0000 +3099:0000000400120008000000000000000000000000000000000000000000000000 +309A:0000000600090009000600000000000000000000000000000000000000000000 +309B:0000100048002000000000000000000000000000000000000000000000000000 +309C:0000300048004800300000000000000000000000000000000000000000000000 +309D:000000000000000000000C000300008000C00100000000000000000000000000 +309E:000000000000002000900C400300008000C00100000000000000000000000000 +309F:000000000600018008000800080008000FC0102000100010002000C003000000 +30A0:000000000000000000000000000007E000000000000007E00000000000000000 +30A1:000000000000000000000000000021E01E200240018001000100020004000000 +30A2:00000000000021F01E1000200240018001000100010002000200040008000000 +30A3:0000000000000000000000200040008003801C80008000800080008000800000 +30A4:00000000002000200040008003000D0030800080008000800080008000800000 +30A5:000000000000000000000200010001E01E200820084000400080010002000000 +30A6:0000000002000100010001F03E10101010200820084000400080010002000000 +30A7:000000000000000000000000000000E00F0001000100010001E01E1000000000 +30A8:000000000000000000701F800200010001000100010003F03C08000000000000 +30A9:000000000000000000000100008010E00F800180028004800880118000800000 +30AA:0000000000800040004020781FC000C00140024004400840104000C000400000 +30AB:0000000002000100010021F01F1002100210042004200820114020C000800000 +30AC:0000000802240114011021F01F1002100210042004200820114020C000800000 +30AD:0000000004000200027003801D000100017803803C8000800040004000400000 +30AE:0000000804240214027003801D000100017803803C8000800040004000400000 +30AF:0000000004000270039002200420044008401080008001000200040008000000 +30B0:00000008082404D4075004400840088010802100010002000400080010000000 +30B1:0000000008000400040004380FC0090010802080008001000100020004000000 +30B2:0000000808240414041004380FC0090010802080008001000100020004000000 +30B3:000000000000000021F01E100010001000100020002003E01C20000000000000 +30B4:000000080024001443D03C400040004000400080008007803880000000000000 +30B5:00000000008008400440044024F81F4004400440044000800080010002000000 +30B6:0000000800A408540450044024F81F4004400440044000800080010002000000 +30B7:0000000000000C000200000018000408001000200040008013000C0000000000 +30B8:0000000000080C240214001018000408001000200040008013000C0000000000 +30B9:00000000000010E00F200040004000800080014002200C103010000000000000 +30BA:00000008002421D41E5000800080010001000280044018206020000000000000 +30BB:000000000800040004000478058826101C20044004000400020001F000000000 +30BC:000000080824041404100478058826101C20044004000400020001F800000000 +30BD:0000000000201010081004100420042000400040008000800100020004000000 +30BE:0000000800A42054105008400840084000800080010001000200040008000000 +30BF:000000000200010001F002100220052008C010400080010002000C0030000000 +30C0:000000080424021403F0042004200A4011402080010002000400180060000000 +30C1:00000000004001801E00010000F823801C800080008001000100020004000000 +30C2:00000008006401941E10010000F823801C800080008001000100020004000000 +30C3:0000000000000000000000000000044012200A20084000400080010002000000 +30C4:0000000000000410220811080910081000200020004000800100020000000000 +30C5:0000000800241094085044402440104010800080010002000400080000000000 +30C6:00000000000011E00E000000007823801C800080010001000200040008000000 +30C7:00000008002411D40E10000020F01F0000800080010001000200040008000000 +30C8:0000000008000400040004000400070004C00420040004000400040004000000 +30C9:00000020109008500840080008000E0009800840080008000800080008000000 +30CA:0000000001000080008020F81F80008000800080010001000200040008000000 +30CB:000000000000000000E01F00000000000000000001F03E080000000000000000 +30CC:00000000000010F00F10002000200E4001C000C0012002100C10300000000000 +30CD:000000000200010001E01E2000400080010003400D3031080100010001000000 +30CE:0000000000400020002000200040004000800080010002000400080010000000 +30CF:0000000000000000000008800440042008100810100820084008000000000000 +30D0:0000000000080024001408900440042008100810100820084008000000000000 +30D1:0000001800240024001808800440042008100810100820084008000000000000 +30D2:00000000000010000800080008E00F000800080008000800040003F000000000 +30D3:000000000010104808280820080008E00F00080008000800040003F000000000 +30D4:000000000030104808480830080008E00F00080008000800040003F000000000 +30D5:00000000000010F00F1000100020002000400040008001000200040000000000 +30D6:00000008002423D41C5000400080008001000100020004000800100000000000 +30D7:00000018002423E41C5800400080008001000100020004000800100000000000 +30D8:0000000000000000000002000500488030400030000C00000000000000000000 +30D9:0000000000200090005002400500488030400030000C00000000000000000000 +30DA:0000000000600090009002600500488030400030000C00000000000000000000 +30DB:0000000002000100010021F01F00010001400920091011102100030001000000 +30DC:0000000802240114011021F01F00010001400920091011102100030001000000 +30DD:0000001802240124011821F01F00010001400920091011102100030001000000 +30DE:000000000000000020F01F080010002000400C80030000800040000000000000 +30DF:000000000400030000C00020080006000180004010000C00030000C000200000 +30E0:0000000002000100010001000200020002400420043029C81E08000000000000 +30E1:000000000040002000200020062001C0004000A00090010002000C0030000000 +30E2:00000000000010E00F000200020023F81E0002000200020001F0000000000000 +30E3:0000000000000000000000000400027003901E20014001000080008000800000 +30E4:00000000080004000478038826101A2001400100010000800080008000000000 +30E5:000000000000000000000000000001C00E400040008001E01E10000000000000 +30E6:0000000000000000000011C00E4000400080008001F03E080000000000000000 +30E7:00000000000000000000000001E00E20002001E00E40004001C00E2000000000 +30E8:00000000000001F01E100010001001E00E2000200020002001E00E1000000000 +30E9:00000000000011C00E00007023901C100010002000200040008003000C000000 +30EA:0000000000400820042004200420042004200420004000400080010002000000 +30EB:0000000000000100088004800480048804880490089008A010C0208000000000 +30EC:0000000010000800080008000800080008100820084008800B000C0000000000 +30ED:000000000000000021F01E10101010100820082009E00E100800000000000000 +30EE:000000000000000000000000000010F00F100820042004400040008001000000 +30EF:00000000000021F01E1010100810082008200040004000800100020004000000 +30F0:0000000001000080008001F01E800880048005F03E8800800080008000800000 +30F1:000000000000000001E01E20024001800100010001F03E080000000000000000 +30F2:00000000000001F01E100010002001E00E200040004000800100060018000000 +30F3:00000000000000001800040802080010001000200040008013000C0000000000 +30F4:0000000804240214021043E03C20202010401040008000800100020004000000 +30F5:0000000000000000000000000200010011E00E2002200220042008C010400000 +30F6:0000000000000000000000000800040004600780088010800100020004000000 +30F7:00040012000821F01E1010100810082008200040004000800100020004000000 +30F8:0000000801040090008801F01E800880048005F03E8800800080008000800000 +30F9:000000080004001001E81E20024001800100010001F03E080000000000000000 +30FA:00040002000801F41E100010002001E00E200040004000800100060018000000 +30FB:0000000000000000000000000300078007800300000000000000000000000000 +30FC:000000000000000000000000000040F83F000000000000000000000000000000 +30FD:000000000000000000000C000300008000400020000000000000000000000000 +30FE:000000000000002000900C400300008000400020000000000000000000000000 +30FF:0000000021E01E10001000100010001000100010001000100010001000100000 +3100:00007FFE63EE7DCE71EE7DEE63C67FFE7FFE73CE6DB66DB66DB673CE7FFE0000 +3101:00007FFE63EE7DCE71EE7DEE63C67FFE7FFE73EE6DCE6DEE6DEE73C67FFE0000 +3102:00007FFE63EE7DCE71EE7DEE63C67FFE7FFE73866DF66D866DBE73867FFE0000 +3103:00007FFE63EE7DCE71EE7DEE63C67FFE7FFE738E6DF66DC66DF6738E7FFE0000 +3104:00007FFE63EE7DCE71EE7DEE63C67FFE7FFE73B66DB66D866DF673F67FFE0000 +3105:0000000002000200040008001FF0001000100020004000400280010000000000 +3106:0000000001000100020007F00010001002200140008001400620380000000000 +3107:000000003FF81008100810081008100810081008100810080008000000000000 +3108:000000001FF810001000100010001000100010000FFC00000000000000000000 +3109:000002000200040008001FF8010801080208040808101010012000C000000000 +310A:0000000000400040008000807FFE010001000220021007F00008000800000000 +310B:000000000FE000200040008001F8000800100010002002200140008000000000 +310C:0000008000800480048008800FF80088010802100210041008A0104000000000 +310D:0000020802080410041008201040208010400820041004100208020800000000 +310E:000000003FFE01000200040007F8000800080010001002200140008000000000 +310F:000000000FFE0400040004000400080008000800100010002000000000000000 +3110:000000000020082008200820082008E00F200020002000200020002000000000 +3111:00000000001000200040008003000C0002000180004000300008000400000000 +3112:000000003FFE0080008000800080008000800080008000800080000000000000 +3113:0000010001002108210821082108210821083FF80100010001007FFC00000000 +3114:000000100060008001080610002000C003400440184000400040004000400000 +3115:000000000FFC00040004040407FC040004000400040008001000000000000000 +3116:0000000000003FF8200820082208210821082088208820083FF8000800000000 +3117:000000001FFC0104010401040108010801280110010001000100000000000000 +3118:000001000100010001003FFE01000100010001F8000800100020002000400000 +3119:000000000100010001000200020004000820101020083FFC0004000000000000 +311A:0000000020101020084004800300020002000200020002000200000000000000 +311B:000000003FFE00400040004007C00800100010001008081007E0000000000000 +311C:00000080008000803FFC0080008007800800100010001008081007E000000000 +311D:0000000004100410041004107FFE0410042004200440040003F0000000000000 +311E:000000001FFC0080088011001FF8010802080210041008201020004000000000 +311F:000000000180068038800080008000400040002000100010000C000000000000 +3120:00000000008001000200041008201FC000800100061018183FE4000400000000 +3121:000000000FF8000800100420024001C000C00130020804041804200000000000 +3122:000000001FF0041004200820084010803FF80008001000200040008000000000 +3123:0000100010001000100010001FFC000400080008001000100020000000000000 +3124:0000000000800080008001001FF8028002800480048008801080207E00000000 +3125:0000000000400040008001000100020004000400080010007FFC000000000000 +3126:000000000040044004400440044004400840084008401040203E000000000000 +3127:00000000000000000000000000003FFC00000000000000000000000000000000 +3128:00000008000804100220012000C000C001200210040808041004000000000000 +3129:000000001008100810081008100810081008100810081FF80008000000000000 +312A:000000007FFE020002000200020003F00410041004100810081010A020400000 +312B:000000007FFC04400440044004400440084008400840104010402040403C0000 +312C:00000100008000001FFE10001000100010001000100010002000200040000000 +312D:000000007FFC0100010001003FF8210821082108210821082108010001000000 +312E:00000180018000003FFC0080008007800800100010001008081007E000000000 +312F:000000001FE0004000800100020007F801080108010801080150012000000000 +3130:00007FFE63EE7DCE71EE7DEE63C67FFE7FFE63CE7DB671B67DB663CE7FFE0000 +3131:00000000000020081FFC08080008000800080008000800080008000000000000 +3132:00000000000041083FFC11080108010801080108010801080000000000000000 +3133:00000000000082607F1022100210023002280248024402820301000000000000 +3134:0000000000000000000030000800080008000800080807FC0000000000000000 +3135:00000000000000000204C1FE20A02020205023881D0402020000000000000000 +3136:00000000000000400038C40223FF21002078208423841C840078000000000000 +3137:000000000000000070101FF8100010001000100010080FFC0000000000000000 +3138:000000000000000062883FFC208020802080208023841C7E0000000000000000 +3139:00000000000020101FF80810001030101FF81000100010100FF8000000000000 +313A:00000000000082047FFE22840204FF044004400443043C040000000000000000 +313B:00000000000041443FFE114401447FC42044204423C41C7E0040000000000000 +313C:00000000000042083F04028402847EFC2084208423841CFC0000000000000000 +313D:00000000000084607E1024100410FE3040284048468439020000000000000000 +313E:00000000000042C43F7E024002447F7E2040204023441C3E0000000000000000 +313F:00000000000085087EFC04000400FE8440484048464A3BFF0000000000000000 +3140:00000000000084407E38050204FFFE0040384044464438380000000000000000 +3141:00000000000038100FF80810081008100810081008100FF80800000000000000 +3142:00000000002000101010081008100FF00810081008100FF00810000000000000 +3143:00000000000802842144114411441F7C1144114411441F7C1144000000000000 +3144:00000000000004604210221022103E102228222822443E442282000000000000 +3145:0000000002000180008000800080014001400220041008083004000000000000 +3146:00000000000008400420042004200A200A5011482084C3020000000000000000 +3147:0000000000000200010007C008201010101010101010082007C0000000000000 +3148:00000000000020101FF809000100010002800440082010106008000000000000 +3149:000000000000000081047FFE242004200A50095010882104C602000000000000 +314A:00000000040003E0000020081FFC088001400220041008083004000000000000 +314B:00000000000010080FFC0408000800F83F081008000800080008000000000000 +314C:00000000000038200FF0080008200FF008000800081007F80000000000000000 +314D:00000000000020101FF80800000008100420022042483FFC1000000000000000 +314E:000000000000040003C040083FFC100003C0042008100810042003C000000000 +314F:004000300010001000100012001F001000100010001000100010001000100000 +3150:0020011800C80048004800480078004800480048004800480048004800080000 +3151:00400030001000100012001F00100012001F0010001000100010001000100000 +3152:0020011800C80048004800780048004800780048004800480048004800080000 +3153:004000300010001000100010001003F001100010001000100010001000100000 +3154:0010008C006400240024002403E4012400240024002400240024002400040000 +3155:0040003000100010001003F00110001003F00110001000100010001000100000 +3156:0010008C00640024002403E40124002403E40124002400240024002400040000 +3157:000000000000000000000000010000800080008040823FFF1000000000000000 +3158:00400030001000100010001008100412041F05F07E1020100010001000100000 +3159:0010008C00640024002408240424043C042407E47C2420240024002400040000 +315A:00200018000800080008040802080208020803F87E0820080008000800080000 +315B:000000000000000000000000004004200220022042223FFF1000000000000000 +315C:00000000000000000000000040023FFF10800080008000800080008000800000 +315D:00200018000800080008000801E87E08280809F8088808080808080800080000 +315E:002000980048004800480048004803C87C4828480BC808480848084800080000 +315F:002000180008000800080008000801E87E082408040804080408040800080000 +3160:00000000000000000000000040023FFF12200220022002200220022002200000 +3161:00000000000000000000000000000000000040023FFF10000000000000000000 +3162:0020001800080008000800080008000801F87E08200800080008000800080000 +3163:0040003000100010001000100010001000100010001000100010001000100000 +3164:AAAA00018000000180000001913C11219F381121912000018000000180005555 +3165:000000000000C1802040204020402040204023441C3E00000000000000000000 +3166:000000000000C0C4207E204020402040204023421C3F00000000000000000000 +3167:000000000000C0202010201020102010202823481C8401020000000000000000 +3168:000000000000C0102010202820282044204423821CFF00000000000000000000 +3169:00000000000088507FE808480848FC54405440623C4100000000000000000000 +316A:00000000000042C83F7C024002407F402040204023441C3E0000000000000000 +316B:00000000000088907C480A480A48FFD442544E6233C100000000000000000000 +316C:0000000084207E2004200450FC504088408847043BFE00000000000000000000 +316D:00000000000084007E00050404FEFE4040384044464438380000000000000000 +316E:000000000000000862843F442244227C2244224422443F7C2044000000000000 +316F:00000000000062203F10221022102210222822283E4422820000000000000000 +3170:00000000000062103F102228222822442244224422823FFF2000000000000000 +3171:000030081FFC1008100810081FFC1100008007E0081010081008081007E00000 +3172:00000000000004000282827F42227E024202420242027E024202000000000000 +3173:00000000040002C8827C424042407E404240424042447E3E4200000000000000 +3174:000000000000114288BF48824882798249424A427A224C120000000000000000 +3175:0000000000001132889F48904890799049504A507A524C2F0000000000000000 +3176:0000000000000800860445FE44A07C20442044507C8847060000000000000000 +3177:00000000040002C4827E424042447E7E4240424042447E3E4200000000000000 +3178:0010200810081FF8100810081FF81108008007E0081010081008081007E00000 +3179:0010248812481E78124812481E781248008007E0081010081008081007E00000 +317A:000000000000090404FE044404040A040A0411042104C0840000000000000000 +317B:00000000000008000580044006400A400A401140214440BE0000000000000000 +317C:00000000000010C4087E08400840144014402240414480BE0000000000000000 +317D:000000000004100208820842087E144214422242217E40C20000000000000000 +317E:000000000000120209FF08900810142814282244414281810000000000000000 +317F:000000000100010002800280044004400820082010103FF80000000000000000 +3180:00000000181808083C3C4242424242424242424242423C3C0000000000000000 +3181:0000030001000FE0101020082008200820082008200810100FE0000000000000 +3182:00003000120479FE84A08420842084508450848885047A020000000000000000 +3183:000030001020782084508450848884888488850485047BFE0000000000000000 +3184:000020101FF80000042042483FFC1100008007E0081010081008081007E00000 +3185:0000000020401C3881027FFF20001C382244224422441C380000000000000000 +3186:0000000040083FFC1200010007C0082008200820082007C00000000000000000 +3187:004000300010001000100912091F091009F27E1F201000100010001000100000 +3188:0020011800C800480048047802482248127813C87C4820480048004800080000 +3189:0020001800080008000802081108090809080BE87C0820080008000800080000 +318A:00200018000800080008000801E87F0829780908097809080908090800080000 +318B:0020011800C80048004800480348FC4855C8144815C814481448004800080000 +318C:002000180008000800080008000801E87F082908090809080908090800080000 +318D:0000000000000000000000000100038001000000000000000000000000000000 +318E:0020001800080008000800080008000802080708020800080008000800080000 +318F:00007FFE63EE7DCE71EE7DEE63C67FFE7FFE73866DBE738E6DBE73BE7FFE0000 +3190:0000000000800080008000800080008000800000000000000000000000000000 +3191:0000000002000200020002200240028003000000000000000000000000000000 +3192:000000000000000000003FC00000000000000000000000000000000000000000 +3193:0000000000001F800000000000003FC000000000000000000000000000000000 +3194:000000001FE000000FC0000000003FF000000000000000000000000000000000 +3195:000000003FE02520252028E020203FE000000000000000000000000000000000 +3196:000000000400040007800400040004003FC00000000000000000000000000000 +3197:0000040004003FC0244024403FC0040004000400000000000000000000000000 +3198:000000003FC00400060005000400040004000000000000000000000000000000 +3199:000000003FC022403FC022403FC0224002000200000000000000000000000000 +319A:000000003F80030004000800104020401FC00000000000000000000000000000 +319B:000000003FE002003FE02220232024A028600000000000000000000000000000 +319C:000000003FE0020002000200020002000A000400000000000000000000000000 +319D:000000001FC0020002003FE00200050008E01040000000000000000000000000 +319E:0000084009503DF00B50095009280D0830F80000000000000000000000000000 +319F:000004000400040004000A000900108020400000000000000000000000000000 +31A0:00000800080010003FF800080008000800080008000800F00110012000C00000 +31A1:000000001FF8020802080208020802100290026002001E00220022001C000000 +31A2:0000002004200420042004200420086009A00E20002001E00220022001C00000 +31A3:0000000004400440088008801100110022001100110008B808C4044404380000 +31A4:000000000800080008007FFC080408080810080008000800080007F800000000 +31A5:000000000800080008007FFC080408080810080008180824082407F800080000 +31A6:000000007FFC0200020004000800100020002020104008800500020000000000 +31A7:000000007FFC0200020004000800100020C02120114008800560020000000000 +31A8:00000000101008200820044004400280028001FC028004401830600C00000000 +31A9:00000000201010200840048003000200020002000F801200220022001C000000 +31AA:00000000000000180024004400447FF800400040000000000000000000000000 +31AB:0000000010100820082004400440028002800100028C04521822605C00400000 +31AC:0000000020003FF8210821082108210821082108210821082108000000000000 +31AD:000000007FFC0920092009200920092009200920092009201120611E00000000 +31AE:000000007FFC01001100110021003FF801080108020832084C104A1032200000 +31AF:00000000008001000200041008201FC000800118062418243FF80010000C0000 +31B0:00001830044002807FFC41044104410441044104410441044104410441040000 +31B1:000000007FFC01007FFC41044704480450045044488445044204400440040000 +31B2:000000007FFC010001000100010001000100010001000100010001007FFC0000 +31B3:000000800080008000800080008000800080008003E004800880088007000000 +31B4:0000000000000000000000000100020007E00020002000200140008000000000 +31B5:0000000000000000000000000100020007E00120022004200940008000000000 +31B6:00000000000000000000000007E00100020007C0004000400140008000000000 +31B7:000000000000000000000000000007E002000200020002000400080000000000 +31B8:000000003FF80010002000400080010002000400080010003FF8000000000000 +31B9:0000000000002000200020002000200020003FF8000000000000000000000000 +31BA:00000000000001000100010001007FFC01000100010001000000000000000000 +31BB:0000000000000000000004400440088008801100088008800440044000000000 +31BC:000000000200043008300C4002C0018001800240046008301018201800000000 +31BD:00003FF80200043008300C4002C0018001800240046008301018201800000000 +31BE:000000001010101008200820082004403FF80440024002800280018001000000 +31BF:0000000000000440044004200420041004100810080808081008200800000000 +31C0:0000000000000000002000C003001C0008000000000000000000000000000000 +31C1:0400020002000100010001000100010001000100010001000100010005000200 +31C2:1000100010001000080008000800040004000200020001000090005000200000 +31C3:000000000000000000008000400020001804060201FC00000000000000000000 +31C4:00000800080008000800080008000800080008000800080008000FF000000000 +31C5:000000003F00010001000100010001000100010001000100010001F000000000 +31C6:0000000000003FF0001000100010001000100010001000100010005000200000 +31C7:000000001FF80008000800080008001000100020002000400040008001000200 +31C8:000000007F80008000800080008000800080008000800080008200820082007C +31C9:00002000200020002000200020003FF800080008000800080010001000A00040 +31CA:000000000F80008000800080008000800080009000A000C00080000000000000 +31CB:000000003FFC000800100020007C000400040004000800080010002000400080 +31CC:000003E000200040008000800040004000200020002000200140008000000000 +31CD:0000000000007F800080008000800080008000800040003E0000000000000000 +31CE:000000003F80008000800080008000F000100010001000100010001000100000 +31CF:0000080008000800080004000400020002000100010000800040002000140008 +31D0:00000000000000000000000000007FFE00000000000000000000000000000000 +31D1:0000010001000100010001000100010001000100010001000100010001000000 +31D2:0000000000200020004000400080010002000400000000000000000000000000 +31D3:0000004000400040004000400040004000800080010001000200040008000000 +31D4:0000000000000000040002000100008000400040000000000000000000000000 +31D5:0000000000001FF8000800080008000800080008000800080008000800000000 +31D6:0000000000007FFC000800100000000000000000000000000000000000000000 +31D7:00000000100010001000100010001000100010001000100010001FFC00000000 +31D8:0000001000100010001000100010001000100010001000103FF0001000000000 +31D9:0000040004000400040004000400040004200440048005000600040000000000 +31DA:0000008000800080008000800080008000800080008000800080028001000000 +31DB:0000004000400080008001000200040002000100008000400020000000000000 +31DC:00000040004000800080010001000200040008001FF800000000000000000000 +31DD:0000080008001400240002000200010001000080004000200010000A00040000 +31DE:00002000200020002000200020003FF800080008000800080008000800080000 +31DF:0000080008000800080008000800080008000800080008080808080807F80000 +31E0:00007FF00020004000800100020004000800100020004004400440063FFC0000 +31E1:000000003FF8001000100020007C000400040004000400040008002800100000 +31E2:0000000000100010002000200040004000800080010001002200240038000000 +31E3:0000000000001FF020084004400440044004400420081FF00000000000000000 +31E4:00007FFE63EE7DCE71EE7DEE63C67FFE7FFE61B66FB663866FF661F67FFE0000 +31E5:00007FFE63EE7DCE71EE7DEE63C67FFE7FFE61866FBE63866FF661867FFE0000 +31E6:00007FFE63EE7DCE71EE7DEE63C67FFE7FFE61CE6FBE638E6FB661CE7FFE0000 +31E7:00007FFE63EE7DCE71EE7DEE63C67FFE7FFE61866FF663EE6FDE61DE7FFE0000 +31E8:00007FFE63EE7DCE71EE7DEE63C67FFE7FFE61CE6FB663CE6FB661CE7FFE0000 +31E9:00007FFE63EE7DCE71EE7DEE63C67FFE7FFE61CE6FB663C66FF661CE7FFE0000 +31EA:00007FFE63EE7DCE71EE7DEE63C67FFE7FFE61866FB663866FB661B67FFE0000 +31EB:00007FFE63EE7DCE71EE7DEE63C67FFE7FFE618E6FB6638E6FB6618E7FFE0000 +31EC:00007FFE63EE7DCE71EE7DEE63C67FFE7FFE61C66FBE63BE6FBE61C67FFE0000 +31ED:00007FFE63EE7DCE71EE7DEE63C67FFE7FFE618E6FB663B66FB6618E7FFE0000 +31EE:00007FFE63EE7DCE71EE7DEE63C67FFE7FFE61866FBE638E6FBE61867FFE0000 +31EF:00007FFE63EE7DCE71EE7DEE63C67FFE7FFE61866FBE638E6FBE61BE7FFE0000 +31F0:00000000000000000000000040002E0032002400440008001000200040000000 +31F1:0000000000000000000000000000600010000000610012000400480030000000 +31F2:00000000000000000000000000008E00720004000400080014002200C2000000 +31F3:0000000000000000000000002000200020003000280024002000200020000000 +31F4:00000000000000000000000000008E00720004003400080014002200C2000000 +31F5:0000000000000000000000000000048002400220042008101010000000000000 +31F6:0000000000000000000000004000400040004E0070004000400040003E000000 +31F7:00000000000000000000000000008E00720004000400080010002000C0000000 +31F8:0000000000000000000000000000000000000200050008C00030000000000000 +31F9:00000000000000000000200010001E00F0001000540092001000500030000000 +31FA:000000000000000000000000020001000100010001000200022014D00F080000 +31FB:0000000000000000000000008C00700000008E00720002000400080070000000 +31FC:0000000000000000000000000000880044004400440004000400080030000000 +31FD:0000000000000000000000000240012001200120012001240224042808300000 +31FE:0000000000000000000000000000800040004000400044004800500060000000 +31FF:00000000000000000000000000F01F10101010101020102011F01E0000000000 +3200:00001818200440024FF240124012401240124012401240124002200418180000 +3201:000018182004400244024402440244024402440247FA40024002200418180000 +3202:000018182004400240024FF2480248024802480248024FF24002200418180000 +3203:00001818200440024FF2401240124FF24802480248024FFA4002200418180000 +3204:000018182004400240024FF248124812481248124FF240024002200418180000 +3205:00001818200440024812481248124FF24812481248124FF24002200418180000 +3206:0000181820044082408240824142414242224412480A40024002200418180000 +3207:000018182004400243C244224812481248124812442243C24002200418180000 +3208:00001818200440025FF241024102428242824442482250124002200418180000 +3209:00001818200443E2400240024FFA4082414242224412480A4002200418180000 +320A:00001818200440024FF2401240125FF240124012401240124012200418180000 +320B:00001818200440024FF2480248024FF24802480248024FF24002200418180000 +320C:000018182004400240024FF2400244224422424242425FFA4002200418180000 +320D:000018182004400243C240025FFA400243C244224422442243C2200418180000 +320E:00001818202440225FA240A2413E422244224822502260224022202418180000 +320F:0000181820244022502250225022503E50225FE2402240224022202418180000 +3210:00001818202440225FA250225022503E50225FA2402240224022202418180000 +3211:00001818202440225FA240A240A25FBE502250225FA240224022202418180000 +3212:000018182024402240225F225122513E51225F22402240224022202418180000 +3213:0000181820244022512251225F22513E51225F22402240224022202418180000 +3214:0000181820244022442244224A224A3E512260A2402240224022202418180000 +3215:00001818202440224E2251225122513E512251224E2240224022202418180000 +3216:00001818202440225FE242224222453E452248A2506240224022202418180000 +3217:000018182024472240225FE24222423E452248A2506240224022202418180000 +3218:00001818202440225FA240A27F22423E44224822502260224022202418180000 +3219:00001818202440225FA250225FA2503E50225FA2402260224022202418180000 +321A:00001818202440225FA2402250A2493E49224BE27C2240224022202418180000 +321B:0000181820244F2240227FE240224F3E50A250A24F2260224022202418180000 +321C:0000301840049FF2810282828C62B01A8002BFFA810281028102410431180000 +321D:00003018400499EAA44AA4DAA52A992A800A88828882BEFA8002400430180000 +321E:30184004806299FAA462A492A4929862800288FA8822BE228022400430180000 +321F:00007FFE63867DF671867DBE63867FFE7FFE7B8673BE7B8E7BBE71BE7FFE0000 +3220:0000200840048002800280028012BFFA80028002800280028002400420080000 +3221:00002008400480229FF280028002800280028012BFFA80028002400420080000 +3222:0000200840249FF28002800280428FE2800280028012BFFA8002400420080000 +3223:0000200840048002BFFAA44AA44AA44AA44AA44ABFFA80028002400420080000 +3224:0000200840249FF28202820282229FF28422842284228422BFFA400420080000 +3225:000020084004820281028012BFFA800280028442842288129012400420080000 +3226:000020084204820282028212827A8382BE02820282028222822241E420080000 +3227:0000200840848482848284828482848288428822901AA0128002400420080000 +3228:000020084204820282429FE28242824282428442844A884A903A400420080000 +3229:000020084104810281028112BFFA810281028102810281028102400420080000 +322A:0000301847F48412841287F28412841287F28412841288529022400430180000 +322B:000030184104810289128922894291028282828284428822B01A400430180000 +322C:00003018410481028112BDA285428542892289229112A50A8202400430180000 +322D:00003018410481028102BFFA8102838285428922B11A81128102400430180000 +322E:000030184104828284428822B7DA81029FF2810289228542BFFA400430180000 +322F:0000301841048102810281029FF281028102810281028102BFFA400430180000 +3230:0000301840048FE28822882288228FE28822882288228FE28822400430180000 +3231:0000301848448942BDF28A429C429BFAA842A8E289528A4A8842400430180000 +3232:000030184204BFFA840287E28C2297E2A42287E2842284228462400430180000 +3233:0000301850448842BE42844289F28C429A42A842884288428BFA400430180000 +3234:00003018440487F284228A429182810287F2BC128412841287F2400430180000 +3235:000030184844A9F2BC42A842ABFA8C229BFAA92288A2882288E2400430180000 +3236:0000301840149E1293FA9E1292329E5292929F1280129252A122400430180000 +3237:0000301851F48912BF12831285F28CA29AA2AAA288AA892A8A1A400430180000 +3238:000030185214891289229FFA910AA1029FF28112821284129862400430180000 +3239:0000301844A48492888288FA9B82A88288828842884A882A881A400430180000 +323A:000030184034BBC2A84AAA4AA952AFFAB842A8428042804281C2400430180000 +323B:00003018491484A29FFA900A87E2804280829FFA808280828382400430180000 +323C:000030185F2494229F3A91429F52940A9F8280029FF29292BFFA400430180000 +323D:000030184104818282428422889AB08284E28482848284829FFA400430180000 +323E:0000301851048BFA844A9FE28C3A87E2842287E2842287E29C3A400430180000 +323F:00003018488489F28892BE92892289228FFA8AAA8AAA8CCA8912400430180000 +3240:0000301848FC8F9292A2AA4294228BD2900AAFF284A28A92B10A400430180000 +3241:000030184444844288428FFA9842A8E288E289528A4A8C428842400430180000 +3242:00003018420484028FE2882288228FE288228FE2882288228FE2400430180000 +3243:000030185FF48202844288229FF2810281028FE281028102BFF2400430180000 +3244:00003FF84004BEFAA28ABEFAA28ABEFAA00AA7CAA44AA44AA7CAA01A40043FF8 +3245:00003FF8400484428442884293FABE4A844A884A924ABD4A90AA811240043FF8 +3246:00003FF8400482028102BFFA84428442844282828282810286C2B83A40043FF8 +3247:00003FF840049EF2A5229FE289429FE28122BFFA81229FE28102830240043FF8 +3248:0000FC7EE00EC0068872988A088808880888888A888ABE72C006E00EFC7E0000 +3249:0000FC7EE00EC0069C72A28A028802881C88A08AA08ABE72C006E00EFC7E0000 +324A:0000FC7EE00EC0069C72A28A02880C880288828AA28A9C72C006E00EFC7E0000 +324B:0000FC7EE00EC006A472A48A24883E880488848A848A8472C006E00EFC7E0000 +324C:0000FC7EE00EC006BE72A08A20881C880288828AA28A9C72C006E00EFC7E0000 +324D:0000FC7EE00EC0069C72A28A20883C882288A28AA28A9C72C006E00EFC7E0000 +324E:0000FC7EE00EC006BE72A28A028804880488888A888A8872C006E00EFC7E0000 +324F:0000FC7EE00EC0069C72A28A22881C882288A28AA28A9C72C006E00EFC7E0000 +3250:000000000000000077DE491049104910711E4110411041104110411E00000000 +3251:00001FF0200840049C22A262822282229C22A022A022BEFA400420081FF00000 +3252:00001FF0200840049C72A28A820A820A9C72A082A082BEFA400420081FF00000 +3253:00001FF0200840049C72A28A820A82329C0AA00AA08ABE72400420081FF00000 +3254:00001FF0200840049C92A292829282FA9C12A012A012BE12400420081FF00000 +3255:00001FF0200840049CFAA282828282729C0AA00AA08ABE72400420081FF00000 +3256:00001FF0200840049C72A28A828282F29C8AA08AA08ABE72400420081FF00000 +3257:00001FF0200840049CFAA28A820A82129C12A022A022BE22400420081FF00000 +3258:00001FF0200840049C72A28A828A82729C8AA08AA08ABE72400420081FF00000 +3259:00001FF0200840049C72A28A828A828A9C7AA00AA08ABE72400420081FF00000 +325A:00001FF0200840049C72A28A828A8C8A828A828AA28A9C72400420081FF00000 +325B:00001FF0200840049C22A26282228C2282228222A2229CFA400420081FF00000 +325C:00001FF0200840049C72A28A820A8C0A82728282A2829CFA400420081FF00000 +325D:00001FF0200840049C72A28A820A8C32820A820AA28A9C72400420081FF00000 +325E:00001FF0200840049C92A29282928CFA82128212A2129C12400420081FF00000 +325F:00001FF0200840049CFAA28282828C72820A820AA28A9C72400420081FF00000 +3260:00000FF01008200440025FF2401240124012401240124012200410080FF00000 +3261:00000FF01008200440024802480248024802480248024FF2200410080FF00000 +3262:00000FF0100820044FF2480248024802480248024FF24002200410080FF00000 +3263:00000FF0100820044FF2401240124FF24802480248024FFA200410080FF00000 +3264:00000FF0100820044FF2481248124812481248124FF24002200410080FF00000 +3265:00000FF0100820044812481248124FF24812481248124FF2200410080FF00000 +3266:00000FF0100820844082408241424142422242224412480A200410080FF00000 +3267:00000FF01008200443C244224812481248124812442243C2200410080FF00000 +3268:00000FF01008200440024FFA40824082414242224412480A200410080FF00000 +3269:00000FF01008200443E240024FFA4082414242224412480A200410080FF00000 +326A:00000FF0100820044FF2401240125FF24012401240124012200410080FF00000 +326B:00000FF0100820044FE2480248024FE24802480248024FF2200410080FF00000 +326C:00000FF01008200440024FF2400244224222424242425FFA200410080FF00000 +326D:00000FF01008200447E240025FFA400243C24422442243C2200410080FF00000 +326E:00000FF0102820245FA240A2413E41224222442248225022202410280FF00000 +326F:00000FF010282024502250225022503E50225FE240224022202410280FF00000 +3270:00000FF0102820245FA250225022503E50225FA240224022202410280FF00000 +3271:00000FF0102820245FA240A240A25FBE502250225FA24022202410280FF00000 +3272:00000FF01028202440225F225122513E512251225F224022202410280FF00000 +3273:00000FF010282024512251225F22513E512251225F224022202410280FF00000 +3274:00000FF010282224422244224622493E50A2602240224022202410280FF00000 +3275:00000FF0102820244E2251225122513E512251224E224022202410280FF00000 +3276:00000FF0102820245FE242224222453E48A2506260224022202410280FF00000 +3277:00000FF0102827A440225FE24222453E48A2506260224022202410280FF00000 +3278:00000FF0102820245FA240A241225E3E4422482250226022202410280FF00000 +3279:00000FF0102820245FA250225FA2503E50225FA240226022202410280FF00000 +327A:00000FF0102820245FA2402250A2493E49224BE27C224022202410280FF00000 +327B:00000FF010282F2440227FE240224F3E50A250A24F224022202410280FF00000 +327C:00000FF010082E8440BA5E8A44EA4A8A51AA40AA5E2252223EFC10080FF00000 +327D:00000FF010083F6C429A449A4A9A516A400A7F8A440A44FA200C10080FF00000 +327E:00000FE010102388444444444444438440044FE441044104210810100FE00000 +327F:00001FF020085EF48C428C80ED0E0E020D028C828C425EF420081FF000000000 +3280:00001FF020084004800280028012BFFA8002800280028002400420081FF00000 +3281:00001FF0200840249FF280028002800280028012BFFA8002400420081FF00000 +3282:00001FF0200840249FF2800280428FE280028012BFFA8002400420081FF00000 +3283:00001FF020085FF4929292929292929294F2981290129FF2501420081FF00000 +3284:00001FF0200840049FF2810281028FE282228222822282227FFC20081FF00000 +3285:00001FF0220841048002BFFA8002844284228812900AA00A400420081FF00000 +3286:00000FF0100822044202423243C25E02420242024212421221F410080FF00000 +3287:00001FF0200840848482848284428442882288229012A00A400420081FF00000 +3288:00001FF02208420482029FC28242824282428442844A884A503C20081FF00000 +3289:00000FE010102108410441045FF441044104410441044104200810100FE00000 +328A:00001FF0200847F48412841287F28412841287F284128412485430281FF00000 +328B:00001FF02008410489128922894291028282828284428822701C20081FF00000 +328C:00001FF0210841048112BDA285428542892289229112A50A420420081FF00000 +328D:00001FF0210841048102BFFA8102838285428922B11A8112410420081FF00000 +328E:00001FF02108428484428822B7DA81029FF28102892285427FFC20081FF00000 +328F:00001FF021084104810281029FF2810281028102810281027FFC20081FF00000 +3290:000007F0080817F424122412241227F224122412241227F21414080807F00000 +3291:00001FF028484944BDF28A429C429BFAA842A8E289528A4A484420081FF00000 +3292:00001FF022087FFC840287E28C2297E2A42287E284228422446420081FF00000 +3293:00001FF030484844BE42844289F28C429A42A842884288424BFC20081FF00000 +3294:00001FF0240847F484228A429182810287F2BC128412841247F420081FF00000 +3295:00001FF0284869F4BC42A842ABFA8C229BFAA92288A2882248E420081FF00000 +3296:00001FF020185E1493FA9E1292329E5292929F1280129252612420081FF00000 +3297:00001FF0200851F48912BF12831285F28CA29AA2AAAA892A4A1C20081FF00000 +3298:00001FF03218491489229FFA910AA1029FF2811282128412586420081FF00000 +3299:00001FF0248878548892BE9288A28DA29AAAAACA889289924E7420081FF00000 +329A:00000FF010083FFC49124FF249124FF241025FFA410A420A244C18380FF00000 +329B:00001FF0220842048202BFFA8442844288428E82818282625C1420081FF00000 +329C:00001FF030484BFC88A283FABA4A8BFA8AAA8AEA8A1A940263FC20081FF00000 +329D:00001FF02BF8491489F289129BFAAC8A8B528DEA892288C24F3C20081FF00000 +329E:00000FF012083CFC508A508A5E8A508A508A528A5CB25082208410080FF00000 +329F:00001FF030884844A3FA94428442884289F2B0429042904253FC20081FF00000 +32A0:00001FF8200441FABE4189F9890989F989098FF9B10981F94092230C1FF80000 +32A1:00001FF02448444488428FFA9842A8E288E289528A4A8C42484420081FF00000 +32A2:00001FF020085FFC900AA41287E2840287F280129FD2801240A420481FF00000 +32A3:00001FF02008400480029FF28102810289E2890289029FF2400420081FF00000 +32A4:00001FF0210841048102810281F2810281028102810281027FFC20081FF00000 +32A5:000007F0088810842FFA288A288A288A2FFA288A208220821084080807F00000 +32A6:00001FF020087FFC81028102818281428122812281028102410420081FF00000 +32A7:00001FF022084204BFFA8202840287F2888288829082A0824FFC20081FF00000 +32A8:00001FF021084104BFFA8202840287E28C229422A42287E2442420081FF00000 +32A9:00000FF010083FFC520253F254825FFA50825142522254123FFC10080FF00000 +32AA:00001FF0200840849FFA900AA7E280029FFA808288A28892529421081FF00000 +32AB:00000FF0191824A45FFA500A47E2404240825FFA40824082238410080FF00000 +32AC:00001FF03E486844BE7AA282BEA2A812BF0280029FF292927FFC20081FF00000 +32AD:00001FF02108418482428422889AB08284E28482848284825FFC20081FF00000 +32AE:00000FF011082BFC444A5FE24C3A47E2442247E2442247E23C3C10080FF00000 +32AF:00000FF0188829F448927E92492249224FFA4AAA4AAA4CCA291410080FF00000 +32B0:00001FF021087FFC848284F289929A52AD2288A2884288A24B1C20081FF00000 +32B1:00001FF0200840049C72A28A82828CF2828A828AA28A9C72400420081FF00000 +32B2:00001FF0200840049CFAA28A820A8C1282128222A2229C22400420081FF00000 +32B3:00001FF0200840049C72A28A828A8C72828A828AA28A9C72400420081FF00000 +32B4:00001FF0200840049C72A28A828A8C8A827A820AA28A9C72400420081FF00000 +32B5:00001FF020084004A472A48AA48ABE8A848A848A848A8472400420081FF00000 +32B6:00001FF020084004A422A462A422BE2284228422842284FA400420081FF00000 +32B7:00001FF020084004A472A48AA40ABE0A84728482848284FA400420081FF00000 +32B8:00001FF020084004A472A48AA40ABE32840A840A848A8472400420081FF00000 +32B9:00001FF020084004A492A492A492BEFA8412841284128412400420081FF00000 +32BA:00001FF020084004A4FAA482A482BE72840A840A848A8472400420081FF00000 +32BB:00001FF020084004A472A48AA482BEF2848A848A848A8472400420081FF00000 +32BC:00001FF020084004A4FAA48AA40ABE128412842284228422400420081FF00000 +32BD:00001FF020084004A472A48AA48ABE72848A848A848A8472400420081FF00000 +32BE:00001FF020084004A472A48AA48ABE8A847A840A848A8472400420081FF00000 +32BF:00001FF020084004BE72A08AA08A9C8A828A828AA28A9C72400420081FF00000 +32C0:0000107C304410441044107C104410441044107C104410441044104410947C88 +32C1:0000007C184424442444047C044408440844087C104410441044204420943C88 +32C2:0000007C184424442444047C044404441844047C044404440444244424941888 +32C3:0000007C244424442444247C244424443C44047C044404440444044404940488 +32C4:0000007C3C4420442044207C204420443844047C044404440444244424941888 +32C5:0000007C184424442444207C204420443844247C244424442444244424941888 +32C6:0000007C3C4404440444047C084408440844107C104410441044104410941088 +32C7:0000007C184424442444247C244424441844247C244424442444244424941888 +32C8:0000007C184424442444247C244424441844047C044404440444244424941888 +32C9:0000003E232264A224A224BE24A224A224A224BE24A224A224A224A224CA7344 +32CA:0000003E222266222222223E222222222222223E2222222222222222224A7744 +32CB:0000003E232264A224A220BE20A221222122213E2222222222222422244A77C4 +32CC:000000000000000042004204427442887E884288427042404278428400840078 +32CD:000000000000000000000002651A96A494A4F42484188410941C64220022001C +32CE:0000000000000000008200823C82424442447E444028402842103C1000000000 +32CF:00000000000000004FB8422442224222422242224222422242247A3800000000 +32D0:000003800C60101020082FE840244144418441042208240810100C6003800000 +32D1:000003800C6010102048208841044304450449042108210810100C6003800000 +32D2:000003800C60111021082FE848244824402440442048208811100C6003800000 +32D3:000003800C6010102008200847C44104410441042FE8200810100C6003800000 +32D4:000003800C60101020882FE841844284448448842288218810100C6003800000 +32D5:000003800C60111021082FE841244224444448442288210810100C6003800000 +32D6:000003800C601010220823C84F04410441F44FC42048204810100C6003800000 +32D7:000003800C601010220823E842244424484440442088230810100C6003800000 +32D8:000003800C601010240827E844844884508440842108260810100C6003800000 +32D9:000003800C60101020082FE840244024404440442FE8200810100C6003800000 +32DA:000003800C601010224822484FF44244424442442088230810100C6003800000 +32DB:000003800C601010260821084C044224404440842908260810100C6003800000 +32DC:000003800C60101020082FC840444044408441842248244810100C6003800000 +32DD:000003800C60101022082FE84224424442844204220821E810100C6003800000 +32DE:000003800C6010102008282844244424404440842108260810100C6003800000 +32DF:000003800C601010220823E842244624454448C420A8230810100C6003800000 +32E0:000003800C60101020E82F8840F45F84408440842108260810100C6003800000 +32E1:000003800C6010102208292845244424404440842108260810100C6003800000 +32E2:000003800C60101027C820084FE44084408440842108260810100C6003800000 +32E3:000003800C6010102208220842044304428442442208220810100C6003800000 +32E4:000003800C60111020882FE840844084408440842108260810100C6003800000 +32E5:000003800C601010200821E84E04400440F44F042008200810100C6003800000 +32E6:000003800C60101020082FC840444644418441842248244810100C6003800000 +32E7:000003800C60101020082FC840444084410443442528210811100C6003800000 +32E8:000003800C6010102008202840244024404440842108260810100C6003800000 +32E9:000003800C6010102008228842444424582440042008200810100C6003800000 +32EA:000003800C6010102008280849844E0448044804280827C810100C6003800000 +32EB:000003800C60101020082FE840244024402440442048208811100C6003800000 +32EC:000003800C6010102008220845044884404440242008200810100C6003800000 +32ED:000003800C60111021082FE841044544492441242508230810100C6003800000 +32EE:000003800C60101020082FE840244344408440442048200810100C6003800000 +32EF:000003800C601010230820C8460441844004460421C8201810100C6003800000 +32F0:000003800C60111021082108420442044444442427E8282810100C6003800000 +32F1:000003800C6010102008202840244224414440C420A8230810100C6003800000 +32F2:000003800C6010102FC8220843C45E0442044204220821E810100C6003800000 +32F3:000003800C60121022082FE842244144410441042088208810900C6003800000 +32F4:000003800C6010102008200847E44024404440842FE8200810100C6003800000 +32F5:000003800C601010200827E8402447E44024402427E8200810100C6003800000 +32F6:000003800C60101027C820084FE44024402440442048208813100C6003800000 +32F7:000003800C6010102248224842444244424440442088230810100C6003800000 +32F8:000003800C6010102108250845044514452445442588290810100C6003800000 +32F9:000003800C6010102408240844044424444444842508260810100C6003800000 +32FA:000003800C601010200828E84F244824484449E42E08280810100C6003800000 +32FB:000003800C60101020082FE848244824402440442048208811100C6003800000 +32FC:000003800C60109020882FE8448444845FE440842088208810900C6003800000 +32FD:000003800C60101020082FE840244344408440443FF8200810100C6003800000 +32FE:000003800C60101020082FE8402447E4402440442088230810100C6003800000 +32FF:0000203050C0484E844ABBFA004AFCCA24EA255A254A244A2C4E204A20482040 +3300:7C04040A154A192411201220200000000040004000407C600050004000400000 +3301:3E0002100A500C50085408541058000000003E00027C02040218041018200000 +3302:3E0002400A200C040818086010000000013E2282528A090C0408000800100000 +3303:3E0002000A000C7C080008001000000000000800280028002A002A002C000000 +3304:02000438080018002800087C08000000010281E941240A203020C04001800000 +3305:020004400820180428180860080000000400380008003E000800080010000000 +3306:08003E002208227C021804280848000000002000100002000C00300000000000 +3307:00007CF810081010102010507C8800004022782948248BB00828102060200000 +3308:00003E000800087C080008003E00000010003E001200127C1200120024000000 +3309:04003E4004200C04141824600C00000000003E00020004000800140022000000 +330A:04003E0004000C7C140024000C000000080008001000200022003E0002000000 +330B:10043E0812101230125012102410000024002400240024000400080030000000 +330C:10383E00127C12041204120824300000002000202A202A300228042018200000 +330D:10003E7C124412441244127C24000000240024002400247C0400080030000000 +330E:4100FCBE4A2248224822483E9000000000004000200004001800600000000000 +330F:4080FA5049084802480C48309000000000007C00040004002800100008000000 +3310:20407D2010807C001000080008000000020407D2024802400240024004800000 +3311:4080FA5C2100F8002000103E100000000000000000007C000000000000000000 +3312:10003E0008003E380808047C04000000240024002400247C0400080030000000 +3313:4080FA442114F814201510151016000040807A404900A83E1800100060000000 +3314:10003E0008003E0008000400040000000000007C004400440044007C00000000 +3315:20007CF810887C88108808F80800000041327482527490141015202740410000 +3316:4002FBC22242FA54224813D410200000020002080228FB2802AA022A022C0000 +3317:10003E3E08223E220822043E040000000008F8088AA88AAC082A104861880000 +3318:408C7A40491E88020802100460080000100010002000400044007C0004000000 +3319:408C7A40491E8802080210046008000022002210420883028A8CFA300A000000 +331A:20003C2024A044A004A808A830B000004110FCAF4A4950C941494049384F0000 +331B:10001E7C124422440244047C180000000010007C00083E100038005400100000 +331C:10001E002400047C040004000800000000003E00020004000800140022000000 +331D:00003E1002500250025402543E580000080008003E0008000800100020000000 +331E:00003E000200027C020002003E00000008403EA008A02A402A00080018000000 +331F:14043E0814101430045008101010000010001E10125022500254045418580000 +3320:14003E401420140404180860100000001008E0082010FBA02022203E40020000 +3321:20901490449024900810702000C00000010281E941240A203020C04001800000 +3322:10003E4012201404101810600E0000000400380008003E000800080010000000 +3323:10003E4012201404101810600E00000010001000100018001400100010000000 +3324:40807A404900A83E180010006000000000007C00040008001000280044000000 +3325:1C2000903E400800080008001000000000200014004400240008007000000000 +3326:2100248022003000280020002000000000000010005000500054005400580000 +3327:1000100010001800140010001000000000000040002000040018006000000000 +3328:080008003E000800080010002000000000000008000800080008001000200000 +3329:040004000454045404040808103000000800080008000C000A00080008000000 +332A:0004000814101230125022100010000000002A002A0002000200040018000000 +332B:010002805280493E48008800000000004008FA084908502C40CA430838080000 +332C:010002805280493E480088000000000000005400540004000400080030000000 +332D:010004805200483E48008800000000000000402040A044A048A850A860B00000 +332E:813E9A82E28A810C80088008781000000200FA080A28132822AA522A8A2C0000 +332F:81109A9EE2928122800280047818000000001000500050005400540058000000 +3330:204026A038A02040200020001E0000000000007C0004000400040004007C0000 +3331:40404D2070804000400040003C00000000000010005000500054005400580000 +3332:00007C0004F804080430082030400000E0220029EAA42AB020A8412086200000 +3333:00003E000208021002300450181000000020002000203E300028002000200000 +3334:0100F480122A102A10022004C01800004000280488144FD41115E11507D60000 +3335:00383E00027C0204020404081830000000002000100002000C00300000000000 +3336:00402078504808880408001000600000400078044814ABD41815101560160000 +3337:0100228052800900040000000000000000000024001400140004000800300000 +3338:0100229C528009000400003E000000002000260038002000200020001E000000 +3339:0000101028500450025400540058000000002A002A0002000200040018000000 +333A:010022A052900902040C00300000000000003E00020004000800140022000000 +333B:010022805280093E040000000000000020401520448024000800700000000000 +333C:010024805200083E040000000000000010001E0012002A000600040018000000 +333D:10827D4411485498542810083008000000202020102002300C28302000200000 +333E:10407D2410945414541510153016000010001000100018001400100010000000 +333F:08003E0008002A002A0008001800000000000040002000040018006000000000 +3340:10807D5011485482540C10303000000010801240110018001400100010000000 +3341:08003E0008002A7C2A0008001800000000000800280028002A002A002C000000 +3342:08003E0008002A7C2A0008001800000000002000100002000C00300000000000 +3343:00043E0802100230145008100410000010001E7C124402440244047C18000000 +3344:00043E0802100230145008100410000000000800280028002A002A002C000000 +3345:00003E0002540254140408080430000000000000140012001200220000000000 +3346:00003E1002500250145408540458000010001E00120022000200040018000000 +3347:00007C8004400408283010C008000000000040202B9088824B8C10B0E3800000 +3348:1820043C30240844000430080C30000000003E402220220422183E6000000000 +3349:1800040030000800000030000C00000000480048004800480008001000600000 +334A:1848044830480848000830100C600000010004845214481449D5881500160000 +334B:04000400040028001000280040000000020407D2024802400240024004800000 +334C:09020BE90924512021205120824000002000208020403008283020C020000000 +334D:020002000200147C080014002000000010001010105018501454105410580000 +334E:100010003E00127C140010001000000021002480220030002800200020000000 +334F:100010003E00127C140010001000000000000800280028002A002A002C000000 +3350:007C1C040414041804103E100020000000002000100002000C00300000000000 +3351:2400240024542454040408083030000010001010105018501454105410580000 +3352:2400240024002400040008003000000000380000007C00040004000800300000 +3353:1102513551C551025500550058F000000000000000007C000000000000000000 +3354:000008002800287C2A002A002C0000000080FA44091408140815101560160000 +3355:0000200020002200240028003000000000100010002000400044007C00040000 +3356:0000408040404408483050C06000000088208E949442C400A401840688180000 +3357:00003E0022542254020404081830000010001000100018001400100010000000 +3358:001018102410241E24102410247C244424442444247C24442400245418AA00AA +3359:001010103010101E10101010107C104410441044107C1044100010547CAA00AA +335A:001018102410241E04100410087C084408441044107C1044200020543CAA00AA +335B:001018102410241E04100410047C184404440444047C04442400245418AA00AA +335C:001024102410241E24102410247C3C4404440444047C04440400045404AA00AA +335D:00103C102010201E20102010207C384404440444047C04442400245418AA00AA +335E:001018102410241E20102010207C384424442444247C24442400245418AA00AA +335F:00103C100410041E04100810087C084410441044107C10441000105410AA00AA +3360:001018102410241E24102410247C184424442444247C24442400245418AA00AA +3361:001018102410241E24102410247C184404440444047C04442400245418AA00AA +3362:001026106910291E29102910297C294429442944297C29442900295476AA00AA +3363:001022106610221E22102210227C224422442244227C22442200225477AA00AA +3364:001026106910291E21102110227C224422442444247C2444280028547FAA00AA +3365:001026106910291E21102110217C264421442144217C21442900295476AA00AA +3366:001029106910291E29102910297C2F4421442144217C21442100215471AA00AA +3367:00102F106810281E28102810287C2E4421442144217C21442900295476AA00AA +3368:001026106910291E28102810287C2E4429442944297C29442900295476AA00AA +3369:00102F106110211E21102210227C224424442444247C24442400245474AA00AA +336A:001026106910291E29102910297C264429442944297C29442900295476AA00AA +336B:001026106910291E29102910297C264421442144217C21442900295476AA00AA +336C:000863089488948F1488148824BE24A224A244A244BE44A2848084AAF3550055 +336D:000862089608920F12081208223E222222224222423E42228200822AF7550055 +336E:000863089488948F10881088213E212221224222423E42228400842AF7D50055 +336F:000863089488948F1088108820BE232220A240A240BE40A2848084AAF3550055 +3370:000864889488948F1488148824BE27A220A240A240BE40A2808080AAF0D50055 +3371:0000000043C042204220422053CC6A124A024A0E4A124A124A164A0A00000000 +3372:0000000002000200020002003A3C46424202423E4242424246463A3A00000000 +3373:000000000842144214421442224222423E422242414241424142413C00000000 +3374:00000000400040004000400071944A5A485249D04A504A504AD0715000000000 +3375:0000000000820082008200827882844484448444842884288410781000000000 +3376:0000000000000000000000005C3C6242424042404240424062425C3C40004000 +3377:0000000001000100010001001D682354415441544154415423541D5400000000 +3378:001E0002021E0210021E02003AD046A882A882A882A882A846A83AA800000000 +3379:001E0002020E0202021E02003AD046A882A882A882A882A846A83AA800000000 +337A:000000007C8410841084108410841084108410841084108410847C7800000000 +337B:0000000A0009FE091008927F524854481078FE551055109510D610B5110A0010 +337C:00001E300AEEEA4AAAFAAA4AEA4AB6CAA0EAAEDAEB4AAA4A0E4E0A4A00000000 +337D:0000000010FE10101010FE5010501050285E2850285044504450445082FE0000 +337E:000000010E81EA42AA02AA94EE55AA17AA21AA20EE6FAA290A29122F26290000 +337F:2A057F842A3F7702A23A27122AB90000104428F4441EBA2400D4FE4424447A5F +3380:0000000000100028002800285C446244427C4244428262825C82408240004000 +3381:00000000001000280028002858446444447C4444448244824482448200000000 +3382:00000000001000280028002811441144117C12442282228222823D8240004000 +3383:00000000001000280028002868445444547C5444548254825482548200000000 +3384:00000000801080288028802884448844907CA044D08288828482828200000000 +3385:00000000407C4042404240424242447C48425042684244424242417C00000000 +3386:00000000417C4142634263425542557C49424942414241424142417C00000000 +3387:000000003C7C42424242404240424E7C424242424242424246423A7C00000000 +3388:00000000000C00040004000471E48A14801481F4821482148A3471DE00000000 +3389:00000000800C80048004800493649494A414C474A49494948CB48F5E00000000 +338A:0000000000FE0080008000805C8062F842804280428062805C80408040004000 +338B:0000000000FE00800080008058F8648044804480448044804480448000000000 +338C:00000000007E004000400040227C2240224022404440444044407B4080008000 +338D:00000000000000000000000411341148114811482230222022383DC440444038 +338E:0000000000000000000000086868549054905490546054405470548800880070 +338F:0000000040004000400040044234444848485048683044204238414400440038 +3390:000041004100410041004100413E7F0241044108411041204140417E00000000 +3391:000084408440844084408440945E97C2A444C448A44894508C608C7E00000000 +3392:00008A408A40DA40DA40AA40AA5E8BC28A448A448A488A488A508A5E00000000 +3393:0000000072408A408A408240825E83C29E448A448A488A488A507A5E00000000 +3394:00000000FC8024802480248024BE2782248424882488249024A024BE00000000 +3395:00000000000800140014002411281148114822502252226222645DD840004000 +3396:000000000008001400140024762849484948495049524962496448D800000000 +3397:0000000002080214021402243A284648424842504252426246643BD800000000 +3398:000000004008401440144024422844484848505068524462426441D800000000 +3399:000000001C0022002000200078C8213421242124212421242124212400000000 +339A:00000000000000000000000059D8652445244524452445244524452400000000 +339B:00000000000000000000000022A422DA229242924492449244927B9280008000 +339C:00000000000000000000000034682A542A542A542A542A542A542A5400000000 +339D:0000000000000000000000001C682254405440544054405422541C5400000000 +339E:0000000040004000400040004268445448545054685444544254415400000000 +339F:001E0002001E0010001E000068D054A854A854A854A854A854A854A800000000 +33A0:001E0002001E0010001E000038D044A880A880A880A880A844A838A800000000 +33A1:003C0004003C0020003C00002CC0332022202220222022202220222000000000 +33A2:001E0002801E8010801E800084D088A890A8A0A8D0A888A884A882A800000000 +33A3:001E0002000E0002001E000068D054A854A854A854A854A854A854A800000000 +33A4:001E0002000E0002001E000038D044A880A880A880A880A844A838A800000000 +33A5:003C0004001C0004003C00002CC0332022202220222022202220222000000000 +33A6:001E0002800E8002801E800084D088A890A8A0A8D0A888A884A882A800000000 +33A7:0002D004A808A810A820A840A880A978AA840280047808041084207840008000 +33A8:0010D02EA822A84EA888A88EA900AA78AC840480087810041084207840008000 +33A9:000000003E0021002100210021783E842004207C20842084208C207400000000 +33AA:0000000081C0812081208120853C89C29102A11ED12289228526831A00000000 +33AB:0000000089C08920D920D920A93CA9C28902891E892289228926891A00000000 +33AC:0000000071C0892089208120813C81C29D02891E892289228926791A00000000 +33AD:0000000000020002000200025B1A64A640A247A248A248A249A646DA00000000 +33AE:008200840084B188CA889A90AA90AAA0AAAC9DD20090010C01020212040C0800 +33AF:0090009E0092B1AECAA89AAEAAC0AAC0AA989DA400A001180104022402180400 +33B0:0000000000000000000000005C786284428042704208420462845C7840004000 +33B1:0000000000000000000000005878648444804470440844044484447800000000 +33B2:000000000000000000000000113C1142114011382204220222423DBC40004000 +33B3:0000000000000000000000006878548454805470540854045484547800000000 +33B4:0000000000820082008200825C82624442444244422862285C10401040004000 +33B5:0000000001040104010401045888648844884450445044204420442000000000 +33B6:00000000008200820082008222822244224422444428442844107B1080008000 +33B7:00000000008200820082008234822A442A442A442A282A282A102A1000000000 +33B8:000000008104810481048104850488889088A088D05088508420822000000000 +33B9:0000000082828282C682C682AA82AA4492449244822882288210821000000000 +33BA:000000000222022202220122591465144494449444B464C85848404840004000 +33BB:000000000222022202220122591465144494449444B444C84448444800000000 +33BC:000000000222022202220122251425142494249448B448C84848764880008000 +33BD:000000000222022202220122691455145494549454B454C85448544800000000 +33BE:000000008222822282228122851489149094A094D0B488C88448834800000000 +33BF:0000000083228322C722C722AA94AA949294929482B482488248824800000000 +33C0:000000004070408841044104490449045104610451044888448847DE00000000 +33C1:00000000443844446C826C82548254824482448244824444444445EF00000000 +33C2:00000000000000000000000030D048A808A838A848A848A858A82AAA00000000 +33C3:000000003C0022002200220022343C4C224421442144214C22343C0400040004 +33C4:0000000000000000000000001C382244408040804080408022441C3800000000 +33C5:0000000400040004000400043C74428C4084408440844084428C3C7400000000 +33C6:001070208840808081008A0076010A4D125222924312828C0248024E0011000E +33C7:000000003C0042008100800080708088808880888088818842883C7200000000 +33C8:0000000004F804840484048474848CF884848482848284828C8474F800000000 +33C9:000000001E0021004100400040424042402243A44114411823081D1000100060 +33CA:0000000020002000200020002C7832842204227C22842284228C227400000000 +33CB:00000000427C42424242424242427E7C42404240424042404240424000000000 +33CC:00000000000010001000000030B810C4108410841084108410847C8400000000 +33CD:0000000041414242444448485050606060605050484844444242414100000000 +33CE:0000000045044504458C498C5154615451244924450445044504450400000000 +33CF:0000000040004020402040204278442048205020682044244224411800000000 +33D0:000000003000100010001000100010EC109210921092109210927C9200000000 +33D1:000000003000100010001000100010BC10C210821082108210827C8200000000 +33D2:000000006000200020002002271A28A428A428A428982890289CF7220022001C +33D3:00000000300010001000100011021084104810301030104810847D0200000000 +33D4:00000000008000800080008034B82AC42A842A842A842A842AC42AB800000000 +33D5:000000000018008800880008698854885488548854885488548857FE00000000 +33D6:00000000000C000400040004D1C4AA24AA24AA24AA24AA24AA24A9DF00000000 +33D7:000000007C4242424242424242427C7E40424042404240424042404200000000 +33D8:00000000000000000000000058D064A844A844A844A878A840A844AA40004000 +33D9:00000000E72294A294B694B694AAE72A84228422842284228422842200000000 +33DA:000000007C7C42424242424242427C7C40484048404440444042404200000000 +33DB:0000000000000000000000003C2C4232402038200420022042203C2000000000 +33DC:000000001E0021004000400030820C82034400C400A840A821101E1000000000 +33DD:0000000088A088A088A088A044BC45224D224D22552222222222223C00000000 +33DE:000000022204220822102220144014B4092A0A2A042A082A102A202A40000000 +33DF:00000802140422083E102220224022B4012A022A042A082A102A202A40000000 +33E0:0000107C30441044104410441044107C10441044104410441044107C7C440044 +33E1:0000187C24442444044404440844087C08441044104410442044207C3C440044 +33E2:0000187C24442444044404440444187C04440444044404442444247C18440044 +33E3:0000247C244424442444244424443C7C04440444044404440444047C04440044 +33E4:00003C7C20442044204420442044387C04440444044404442444247C18440044 +33E5:0000187C24442444204420442044387C24442444244424442444247C18440044 +33E6:00003C7C04440444044408440844087C10441044104410441044107C10440044 +33E7:0000187C24442444244424442444187C24442444244424442444247C18440044 +33E8:0000187C24442444244424442444187C04440444044404442444247C18440044 +33E9:0000267C69442944294429442944297C29442944294429442944297C76440044 +33EA:0000227C66442244224422442244227C22442244224422442244227C77440044 +33EB:0000267C69442944214421442244227C22442444244424442844287C7F440044 +33EC:0000267C69442944214421442144267C21442144214421442944297C76440044 +33ED:0000297C694429442944294429442F7C21442144214421442144217C71440044 +33EE:00002F7C684428442844284428442E7C21442144214421442944297C76440044 +33EF:0000267C694429442844284428442E7C29442944294429442944297C76440044 +33F0:00002F7C61442144214422442244227C24442444244424442444247C74440044 +33F1:0000267C69442944294429442944267C29442944294429442944297C76440044 +33F2:0000267C69442944294429442944267C21442144214421442944297C76440044 +33F3:0000319E4A524A520A520A521252125E12522252225222524252425E79920012 +33F4:0000311E4B124912091209121112111E11122112211221124112411E7B920012 +33F5:0000319E4A524A52085208521092109E10922112211221124212421E7BD20012 +33F6:0000319E4A524A52085208521052119E10522052205220524252425E79920012 +33F7:0000325E4A524A520A520A52125213DE10522052205220524052405E78520012 +33F8:000033DE4A124A120A120A121212139E10522052205220524252425E79920012 +33F9:0000319E4A524A520A120A121212139E12522252225222524252425E79920012 +33FA:000033DE48524852085208921092109E11122112211221124112411E79120012 +33FB:0000319E4A524A520A520A521252119E12522252225222524252425E79920012 +33FC:0000319E4A524A520A520A521252119E10522052205220524252425E79920012 +33FD:0000319E4A524A520A520A520A52325E0A520A520A520A524A524A5E31920012 +33FE:0000311E4B124912091209120912311E09120912091209124912491E33920012 +33FF:00000000000600020002040234E24912481248F231122112393244D744003800 +3400:0440044004400440044004407C7C0440044004400440044004400440FFFE0000 +3401:0000FFFE010001003FF82108210821082288224824282828200820083FF82008 +3402:0100010001F83F000104010400FC100010201020163CF8E010221122161E1800 +3403:0100028004400820101020084004FFFE01000100010001000100010001000100 +3404:01000100010001003FF801002100210041007FFE010001000100010001000100 +3405:0000001000102020102008400440028001000280044008201010200840000000 +3406:001000F81F0010001FF810081FF810081FF810001FFC10042004200440288010 +3407:020002003FE00420042008223022C01E00007FF0006001800600180420041FFC +3408:060001000280044008203018C0063FF80010006001800600180420041FFC0000 +3409:00007FFC01000100010001000100050002007FF0006001800600180420041FFC +340A:010001000100FFFE010001003FF8000000007FF0006001800600180420041FFC +340B:0100010001003FF801000100FFFE000000007FF0006001800600180420041FFC +340C:080008001FFC200041008100117013901D10F11011501122110210020FFE0000 +340D:00FC7F00020821081110102000003FF80010006001800600180420041FFC0000 +340E:020001007FFC0820044003801C70E00E00003FF80010006003801C0420041FFC +340F:00003FFC010001001FF0021004107FFE00007FF0006001800600180420041FFC +3410:10001000FEFC22844488285010202858C58600007FF0006003801C0420041FFC +3411:08001FF0282007C01830E18E0C40030000807FF0006001800600180420041FFC +3412:00007FF8040808503020DFF8100810081FF800007FF0006003801C0420041FFC +3413:0000FFFE00101F90109010901F90005000207FF0006001800600180420041FFC +3414:02000100FFFE00001FF0101010101FF000007FF0006001800600180420041FFC +3415:010001003FF8210821083FF8210821083FF800007FF0006003801C0420041FFC +3416:082008200820FFA0082008207F20002000207F204120412241227F22411E0000 +3417:02083FD00220FFFE02000C703F84C80407FC00007FF0006003801C0420041FFC +3418:010011100920FFFE054009203118C10600007FF0006001800600180420041FFC +3419:00007FFC00001FF010101FF008200440FFFE00007FF0006003801C0420041FFC +341A:7FFC02003FF00410FFFE00001FF010101FF000007FF0006003801C0420041FFC +341B:0840084017FC3080510093F81508110811F800007FF0006003801C0420041FFC +341C:1040144012401040FEF8104810489248544810483848548A928A110A52062400 +341D:11001100F9F8120819E83128D1E81008505020207FF0006003801C0420041FFC +341E:082008207FFC08200FE008200FE00820FFFE10102FE8404483820C0810080FF8 +341F:044004407C7C04403C7804407C7C044004407FF0006001800600180420041FFC +3420:07A0F82048A025207F20022007A2FC2244220C1E00003FF001C01E0420041FFC +3421:200027FC204023F8FAA82AA82AA82A1828402FFC28A029122A0A480247FE8000 +3422:203C17C08244492813F8E01027FE202020A000407FF0006003801C0420041FFC +3423:00803FFE20802FF8208027F0249027F024903FFC20802FF840604380840403FC +3424:204023F8204021F0F91029F0291029F0291029F029102BFA28A2491247FE8000 +3425:100829C8455EB94A11CA7D4A11CA55523D6AE38400003FF001C01E0420041FFC +3426:3BB822083BB82488FFFE10502788C1061FF0010003003FF001C01E0420041FFC +3427:0080108008800480048000807FFC01840288049008803080C080008002800100 +3428:00007CFC0404282810100808FEFE121214141010101010101010101050502020 +3429:24242424242424247E7E242424242424FEFE2424242424242424444444448484 +342A:020001000100FFFE0000010021082108210821083FF80288044008203018C006 +342B:020001000100FFFE00000820044022882108228824482828200820083FF80008 +342C:02000100FFFE0400082010103FF810080000111011101110211021124112800E +342D:02000100FFFE000000003FF82008200827C82448244827C8200820083FF82008 +342E:02000100FFFE1010244844441FF004401FF004407FFC04900C603518C6060400 +342F:01007FFC08201FF010101FF000001FE001007FFC09203FF8C8260FE008200FE0 +3430:080009FC0904110411043104310451049104110411041104110411FC11041000 +3431:0100010002800440082010502188C606382000C007003818006003807C000000 +3432:0840084008401040104037FE30405040904010A010A010901110110812041402 +3433:080008000BFC10901090309030905090909010901090109211121112120E1400 +3434:08800880088010FC110431043284544890281010101010201040108011001600 +3435:08000BFC08401040104030403FFE504090401040104010401040104011401080 +3436:080008000BFC120412043204320453FC92041200120012021202120211FE1000 +3437:08000FF00810101012103210321053FC90041004100417F41004100410281010 +3438:08800880088010FC1104310832405440904010A010A010901110110812041402 +3439:0900090009FC1200140031F83000500093F8100810081008100A100A10061002 +343A:1120112011202220222066206620AA2022202250225022502248228822842302 +343B:082008200820102013FE3222322252229252124A128A130212021202120A1204 +343C:080808680B88108810883088308853FE90881088108810881108110812081408 +343D:08000BF80A081208132832A832A85248924812A812A8132A140A140A18061002 +343E:080008000BF810001000300037FC5120912011201120112012221222141E1800 +343F:081008780BC01040104033F830405040904017FE104010401040104011401080 +3440:084008400840104017FE3040304050A090A010A0111011101288124814441802 +3441:084008400A4812481248324833F8504890401040144414441444144417FC1004 +3442:100017FC10402040204067FC6444A44424A42494251426042404240424142408 +3443:1220122012202420257C69246E24A2242424242429242F242144204420942108 +3444:080009F8090811481128312837FE520892481228122813FE1008100810501020 +3445:09000900090011FE1240324034405040907C1040104010401040104017FE1000 +3446:08000BFC0A0412041204320433FC5090909010901090111211121212140E1800 +3447:0880088008F811081210342033FC50049004100411FC10041004100413FC1004 +3448:08400840084017FE108031203120522093FC1020112811241222142210A01040 +3449:100017F81408240827F864886488A4E82528252826A8244A244A288A29063202 +344A:08400820082017FE109030903090529492921292149210901110111012501420 +344B:10A010A010A020A027FC64A464A4A4A424A427FC24A424A424A424A427FC2404 +344C:08000BFE0A00120013FC3220322052F892201220122013FC1200120013FE1000 +344D:1040104017FC2040204063F86040A04027FE20E0215021502248244428422040 +344E:1000124812482490249062486248A00020402444244424442444244427FC2004 +344F:084008200BFE120214143010301053FE90101110109010901010101010501020 +3450:084008400840107C1040304037FE500090401040125012481444184411401080 +3451:08400840088013FC12043204320453FC9204120413FC12041204120413FC1204 +3452:01000280044008203018CFE6010001001FF0111011101FF0028004401830E00E +3453:082008400888110413FE3042304057FE908010FC114411441228121014681186 +3454:08000BFE0820104011FC31043104512491241124112411441050108811041204 +3455:082008200A221222122233FE3040504090FC1104128414481050102010C01700 +3456:111011101110221022FE66926692AA92229222FE229222102210221022102210 +3457:088009000BF8120813F8320833FA520A920C17F810181028104811881E281010 +3458:1014101210102FFE201062906292A2922FD2229422942288228A249A24262842 +3459:10001FFE14802490249067906490A490249027902490249224D22F92208E2080 +345A:100017DE12522252225467D46258A25422522FD22252225A2254245025502890 +345B:084008400FFE1040104037FC3444544497FC104010E0115012481C4610401040 +345C:1208121C126022402FC06240627EA2C823482E4822482248224822482A882508 +345D:100017FC1040204023F860406040A7FC211021102FFE21102110221022102410 +345E:104010401244224424A861106208AC06211021102FFE21102110221022102410 +345F:0808081C09E01100110031FE311051109110111017FE10001090110812041402 +3460:08800AFC0AA412A412A8329032A850C69020102011FC10201020102013FE1000 +3461:100017BC14A424A424A467A464A4A4A424A427A42434252824A0256026202020 +3462:09000900091E139211123112311257D291121112121A129417D0125010101010 +3463:091009100910111017BC31103110533893B81554155419921110111011101110 +3464:111011101FFE21102110600067FCA4442444244427FC24442444244427FC2404 +3465:08000BF80A0813F8120833F83100510093FC1494189411241244148411281210 +3466:084008200BFC1204120433FC32005228922413FE122012501250148815041A02 +3467:103813C0104027FC20E061506248AC4623F02020204027FC2040204021402080 +3468:08000BF80A08120813F83100310053F8944010401FFE104010A0111012081C06 +3469:08000BFE0A521252125233FE3020504090FC1104128810501020104011801600 +346A:084008200FFE11081090306031985606910811F8110811F81108110812081408 +346B:0840084008A011101288344633F0501090A01040114815041514151418F01000 +346C:12101210121022102F7E65106510A510257C29442544224422442544257C2844 +346D:100017FC1444244427FC64446444A7FC200020002FFE22082208220824082808 +346E:08000BFE0A22102013FE302031FC512491FC112411FC102013FE102010201020 +346F:08000FFE0840108013FC3204320453FC920413FC1204120413FC100011081204 +3470:090009F80A0813F0101037FE30805144966810B01128166810A4112216A01040 +3471:08000BF80890106017FC30A4312852209460104017FC10E0115012481C461040 +3472:104010401FFE2040204067FC6514A4A425F42444244425F42444244424542408 +3473:090009000BFE1442125233F230825114960813FE14421A5213F2108211141608 +3474:0BF8080809F8100813F8300037FC544493F812481258104013F8111010E0171E +3475:0820081009FE110011203520333C51509190131015FE11101128122812441482 +3476:0900090009FC120015F8300033F8508892A811C817F8108A11CA16AA10861082 +3477:11101212145427D82010601267D2A44E244027D22454245827D024522552248E +3478:084008400FFC104013F8320833F850009FFE100813E8122813E8100810281010 +3479:0100028004400FE03118DFF611101FF011101FF000000FE008200FE008200FE0 +347A:08A0089009FE132015FC312031FC512091FE110013FC1088109E1102120A1404 +347B:1080104017FE2402289460506524A54A28FA2300204024442444244427FC2004 +347C:10101010103C2FA42AC46AA86A90AFA82AC62A802ABC2AA42FA428A4203C2024 +347D:1040144412482FFE280263F86208A20823F82040204027FC204020402FFE2000 +347E:084008FC09081650112030C033205FFE900013FC100013FC100013FC120413FC +347F:124814901248200023F8624863F8A24823F8204027FC20E0215022482C462040 +3480:1080104017FC211020A067FC6444A5F4244425F42514251425F4240424142408 +3481:100017FC1444244425F4644467FCA51424A425F4244427FC2444244427FC2404 +3482:090809080FFE1108104433F43048505097FE108011FC130415FC190411FC1104 +3483:08140BFE081013D0101033D0301053D0925013D0125013C8124A13CA11861242 +3484:0910091409D21250127E3550309052A89128114412441482100812A412521452 +3485:08200BFE084010F81348303033D0503C91C41048103013C410A8119016A810C6 +3486:084008A0091816E6100033F8320853F8900017BC108414A4129414A412941108 +3487:1100110013FC26A82AA862A867FCA2A822A822A82FFE200022A8225424542000 +3488:10081788108821102FDE649464A4A79424942794249424C827882C9420A420C2 +3489:08400A48095017FC140431F03110511091F0104017FC10E01150124814461040 +348A:100017BC129426B42AD464A465ACA8402108210825A8252C252825A82E7E2000 +348B:14801482149C2FD024906790649EA794249424942FD42014251428A430242044 +348C:1110155415B8291022A864446000A7FC240429E821202120212022222422281E +348D:088009100BF8121014A437BC3080511093E01040108817FC1044124815441080 +348E:08000BF8088017FC111032083CA650A097BC10A013B810A017BC10A010A010A0 +348F:084008200FFE149213FC309033FC509097FE1108120414621010118010601010 +3490:0910091009DE12A81444310031FC520495F4111411F4111411F4111410281010 +3491:100017FE14282624257E644864C8A47E2648257E24482448257E264027FE2000 +3492:10A014A412A820A027FC611060A0A7FC204023F8204027FC215022482C462040 +3493:10101410127C201020FE60446628A2FE2210227C221022FE2210221025FE2800 +3494:100017FC14A424A427FC620063FEA4422BFA224A23FA2052207A278A22142008 +3495:1040102017FE20282224627E64C8A748217E224824C82F7E21482248247E2840 +3496:1110111017FC211023F8624863F8A24823F8204027FC2444245425F42414240C +3497:111017FC111021F0211061F06110A7FE24022BFC211023F8204023F8204027FC +3498:100017BC15142794248867886514A7A22080204027FC2000220821102FFE2000 +3499:11081110123E22A224BE6F22613EA20824BE2FAA20AA202A2AAA2AAE28082008 +349A:103E17C01244212823F8604067FCA00023F8200823F8200823F82544252A28FA +349B:100017BC108424A4229464A46120A21027FC2A2023FC222023FC222023FE2200 +349C:09400A4C0A641244134C326432A453AC92A412A417FE10001110110812041404 +349D:09080FFE0908100013FC3294329453FC902813FE1220132412A81292142A18C6 +349E:08200A220BFE109011FE331035FE511091FE111011FE110013DE125212721206 +349F:104017FE100023FC224063F86240A3F8224023FC2004255420A823102D482186 +34A0:110011BC152427A824906AA86146A2A027BC20A023B820A027BC20A02FFE2000 +34A1:11821E3C10882A902522643C6788AA12223E2F8822082AAC2AAA2BCA2EA82090 +34A2:104010A0111022082DF660006EEEAAAA2EEE20002FFE29222FFE2922292A2804 +34A3:1040102017FE24A824FE6550677CA550257C2550257E254028A42A8A328A2478 +34A4:0BFC090809F8110811F8310E37F8500897FE1294139C1294139C12D617BC1084 +34A5:115013F8155427FC255467FC6554A7FC200027FC200023F8220823F821102FFE +34A6:17FC144417FC244427FC60006FBEAAAA2FBE2AAA2FBE2040204027FC20402FFE +34A7:141812141F90253E2AA86DE868BEAFA822282FBE2AA82AA82BA828BE2AA02920 +34A8:104015F6191229B22D5669B26912ADF620802FFE220825F4291221F0210420FC +34A9:11F0121013E0202027FC61886650A1A8266421A022482FBE2AAA2FBE228A2FBE +34AA:03800C603EF8E8A63EF822883EF828A03EF8100011FC5CA0515450B85D54E0B2 +34AB:00000FF8080008000FF008000800FFFE0440044004400440084408441044603C +34AC:00007DFC002000200020FCF8282028202820282029FC28002800480247FE8000 +34AD:00003E7C22442244224422443E7C1428142814281428144A254A268A44868100 +34AE:000001FE7820004000A20334FC5828942B34285228922B502822480247FE8000 +34AF:108813FE9088540059FC10A8FCA82BFE28A828A829FC28202BFE4C2048208020 +34B0:060001000280044008203018C00600001FF0010001000100010001007FFC0000 +34B1:060001000280044008203218C20607F00810141022200140008003001C00E000 +34B2:060001000280044008203018DFF61010101010101FF01010101010101FF01010 +34B3:00007FFC4104410441045144492449245554638C410441044104410441144108 +34B4:060001000280044008203118D116111011101FF001002108210821083FF80008 +34B5:040008003FF8200820083FF8200820083FF80000000004400820101020084004 +34B6:04400440082010102108C2061FF01010101010101FF01010101010101FF01010 +34B7:00001FF0101011101110111012901450101010107FFC00000440082010102008 +34B8:0820042004407FFC020006001908629004A018C061A002980C863080C2800100 +34B9:10101010FEFE10107C7C44447C7C44447C7C44447C7C4444FEFE282844448282 +34BA:00007FFC4004482444445FF440044884488449444A2448044FF4400440144008 +34BB:7FFC40045FF440045FF400001FF010101FF010101FF010101FF004421842E03E +34BC:08200820FFFE082008200FE001007FFC4104514449245554638C410441144108 +34BD:3FF820082FE820082FE8111009207FFC0400FFFE10102FE8C82608A0084807F8 +34BE:00003FF820082FE820082FE820401040FEFE21203CAC24F427A444AC54A2887E +34BF:3FF820082FE820082FE808007F281424497E55C87F7E08487F7E55485D7E4340 +34C0:00007FFE40028004020002000200020002800240022002100200020002000200 +34C1:000000007FFE4002844408201010000000000000000000000000000000000000 +34C2:00007FFE400280243E2001FE00447E4414C814281410146A2586240243FE8000 +34C3:00007FFE4002900408007F1C00E03E2000203E3E01E03E22222222223E1E2200 +34C4:101022107F10421094FEF79208923610C92830A8C428192862480C4A308AC106 +34C5:0000400023FE202000200820082010201020E020202020202020202020A00040 +34C6:0040404020A020A001100A080C0611101120E140218021002104210420FC0000 +34C7:0010407827C0204000400840084017FE1040E0A020A021102110220824040802 +34C8:0000400027FE204000400880088011F81308E508290821082108210821F80108 +34C9:0010407823C02040004007FE104010402040E3F8220822082208220823F80208 +34CA:000047FC2404240405F40404140415F42514E514251425F42404240424140408 +34CB:011041102110211007FC0110111011102110EFFE200021102108220824040804 +34CC:0040404020A021100208040613F810402040E04023F820402040204027FE0000 +34CD:00804040204027FE00800110120817FC2124E1202120212022222222241E0800 +34CE:000043F8200821F800080BF8080017FC1404E3F02110211020A0204021B0060E +34CF:000047FC240424A40514060C140415F42514E514251425F42514240424140408 +34D0:0040404023F82040004007FC111012082444E04023F820402040204027FC0000 +34D1:0040404027FC204000400FFE111010A027FCE04020402FFE2040204020400040 +34D2:2040104004780BC47044103C110012800C603118C10609901148214805000200 +34D3:004040402FFE2040004007FC151414A425F4E444244425F42444244424540408 +34D4:010842082788248807BE0488178814C824A8EFA8218822882488288822A80110 +34D5:00144012201027FE0410041017F214922492E5B426D42488254A293A2A261042 +34D6:000047FC244427FC044407FC124812482FFEE248224827FC20402FFE20400040 +34D7:010047BC21142394011407A4114C10802110E3E0204827FC2044224825440080 +34D8:00003FF820082FE8210823C824482A88210826083BE8210A2FEA414A41269FF2 +34D9:0200010001001FF040444844448442844104428444444824502440047FFC0004 +34DA:000400047F04082408240824082408240824082408240F24F004400400140008 +34DB:000001FC00447E440844084408440844084408440E84F0844104010402280410 +34DC:0800080010FC102422244224FC2404240824102424244224FE44424400940108 +34DD:22042204220422247F24222422242224FFA42224222422242204420442148208 +34DE:0800080008FC7F240824082408247F24082408240824FFA40844084408940908 +34DF:0404040404043FA424A4252424243FA420A42924252422242504488490940008 +34E0:08040804080408240FA40824082408247F24412441244124410441047F144108 +34E1:200420043F04482488240824FF24082408244924492449044F04790401140008 +34E2:100410041F042124612492240C2412242124C0A43F242124210421043F142108 +34E3:08040804140422244124BEA4002400243E2422242224222422043E0422140008 +34E4:080408040804FFA4082408247F24002400247F244124412441047F0441140008 +34E5:08044904290429242A240824FF240124012401247F24012401040104FF140108 +34E6:0004FFC40804082410247F244124412441247F2441244124410441047F144108 +34E7:0804080414042224512488A47E240224042408247F244124410441047F144108 +34E8:080408040804FFA408242A242A242A245D2488A4082414241204210441148008 +34E9:100410041F0421244224BFA424A424A43FA424A424A43FA42484448442948108 +34EA:100008007EFC422442247E24422442247E244024482444244A44524460944108 +34EB:08040804FFC41224212440A4BF241224122412247FA412241204220422144208 +34EC:080449042A047F2408241024FFA42224412480A47F241124110421044A148408 +34ED:00047F0441047F2441247F2420247FA488A448A454A440A47E84008405140208 +34EE:00043F84248424A42EA424A43FA420A42EA42AA42AA42EA42084408442948108 +34EF:2484248449049224492424A424A400247FA448A448A47FA4488448847F944088 +34F0:0004FF84080408243E24AAA4AAA4BEA4AAA4AAA4AAA4BEA480848F84F0940008 +34F1:0804140422044124BEA4002478A44AA44AA47AA44AA44AA47A8448844A945908 +34F2:080204023FC2204220523FD2201220123FD2355235525FD255425542944A10C4 +34F3:00083E0822483E4822483E480048FF48084808482F082828281058004FFE8000 +34F4:0004FF84080410247F2455245524552455244B240824FFA41404220441148088 +34F5:0004F784948494A4F7A400247F240024FFA4202440247F24010401040A140408 +34F6:20042F04F504252475242524F5242924232408240824FFA41404220441148088 +34F7:080410047F0441247F2441247F2441247F240824FFA41C242A04490488140808 +34F8:00047704550455247724142414247724412441247724142414041F04F0144008 +34F9:00047FC4440454A4652444244A24512460A4442454A4652444044A0491142088 +34FA:08040F8408047FA448A44F2478A447A4482444247FA441245A0444048A143108 +34FB:0004FF84948494A4FFA400240024FFA4082408244F24482448044F84F8140008 +34FC:08040804FF841C242B24C8A414242224492488A449242A244904888428141008 +34FD:0804490449047F2410240824FFA480A43F240024FFA408242A044904A8941008 +34FE:00027FC240427FC242124A9247124A9250524A124FD252124202BFE2820A0204 +34FF:070478040804FFA42A24492494A42224492488A449242A244904888428141008 +3500:00047F0441047F2441247F240824FFA400247F2441247F240804490488941808 +3501:050472041284512421245EA480A43F24212421243F2421241204078478142008 +3502:0404248415047FD4151424944454209420943BF44894AA8413E4208440948088 +3503:108010F825107BFC112425247DFC0102550294FE00007FF80408080810506020 +3504:00027FC20A027FC24A524A527FD2041224921512FFD20E1215022482444A0404 +3505:04023F8204827FC204923F920412555275D244527FD2445275C25542554A8444 +3506:0004F7842104A524F7A46324B5A421247FA440A440A47FA4408440847F944088 +3507:0904F6441284A12440A4F7641524152479A440248F24F1241504120455142908 +3508:22042204FF84222414241424F7A414241424772414241424F784140414141408 +3509:00027FC240427FCA400A5FCA420A5FCA524A5FCA420A7FEA62A26FA2A0AA2064 +350A:0402FFE200027FC240525F5251527FD200123F9220923F9220823F82000AFFE4 +350B:00047A0452047BA44A247B2454A478A400247F245524552455045784FC140008 +350C:FC044B8478844AA479244D24FAA40CA407A4F82428A44D241A042904C8940808 +350D:42047BC4A50410A47FA440A47FA440A47FA440A47FA42124FFC4210441148108 +350E:52107EFE28447E28A2FE3E1020103E7C22103E1000007FF80408080810506020 +350F:00027FC210023F8A508A108A1F8A000AFBEA208A79EA492ACB22492279EA4924 +3510:210221023DE2528288527FD20A127BD20A123B920A127BD20A020FC2F80A4004 +3511:0820FFFE28207DFC44887C5041FE7C2045FC7C2000007FF80408080810506020 +3512:44427FC212023FC26212BFD222123FD222123FD220127FD251426EC24A4A4EC4 +3513:04200E207820082008FC08240824FF2408240824082408440844088409280A10 +3514:100010007E7C1244124412442244227C4A4484001FF02008200820081FF00000 +3515:202020203F20402080FC7E24002400247C240424052405240344014400A80110 +3516:100010007E7C1244124412442244227C4A44840000003FF00010001000100010 +3517:1210121012107F9012FE12927F92521252127FD212521252235222A2422A8244 +3518:102010209220922092FC9224FE24102410249224922492449E44F28401280210 +3519:4220242000207E2024FC242424242424FF242424242424242444444444A88510 +351A:04200E203820082008FCFF24082408243E2422242224222422443E4422A80110 +351B:010001007FFC01001FF000001FF0101010101FF002007FF80408080810506020 +351C:02200F20F020012091FC4A240024FE24042408240F24F8444844088429281210 +351D:0010FF9008100810FF9088FE8892CC92AA92AA92DD929992889288A28AAA8144 +351E:02200F2078200820FF7C08242A242A24EBA42A242AA46B24AA44084408940908 +351F:082028203EF8482808A83E48084A0EAA7926020202007FF80408080810506020 +3520:00207E2042207E2042FC7E2420247F2489244924552441247D4401440AA80510 +3521:082010207F20552049FC552441247F2400244424772444245544664444A80110 +3522:108010F825107BFC112425247DFC0102550294FE02007FF80408080810506020 +3523:00083F8824883F8824BE3F8A000AFBEAAAAAAAAAFBEAAAAAAAB2FBF2002A0044 +3524:102008207F20412086FC782449242A24FF242A244124BE242A443E442AA83F10 +3525:0010FF10A510A510FF7E44129492F7120492F3929012F4929712F42294AAB3C4 +3526:2210FF9008107F10107EFF9222124912BE9222123E1222123E9225222A2A3144 +3527:08100F9008107F9048FE7E1248925F9255125F1255125F124012BFA22AAA7FC4 +3528:100010003FFC4524BDC405141CF464041FC410441FC410441FC4104411541088 +3529:100010003FFC22045FC482043FE4040408841FC400041FC4154415443FE80010 +352A:100010003FFC2204420483F402043FE42AA42524326425242AA43FE420280010 +352B:0400040004000400FFFE0480048004840488089008E0108210822082407E8000 +352C:203021C03E0820081FF800001FF010101FF010101FF00100FFFE010001000100 +352D:000043F84208420843F87A08420843F8400047FE40404A4052786240454008FE +352E:51105112FA5453D870102012FBD2AA4EFA4023D2FA542258FBD0225252528ACE +352F:00007FFC400047F044104410480C500047F044104410441047F040007FFE0000 +3530:00007FFC4220422043A044B044A844A44AA4512041204220442048207FFE0000 +3531:00007FFC400042804CB848884EB848884FF8414042204410580840007FFE0000 +3532:00007FFC422045204AA05F7869284F2849284F28482A4A2A4D4648807FFE0000 +3533:00007FFC420045384AA85F6869284F2849284F2A482A4A4A4D4648807FFE0000 +3534:00007FFC40004FF848884FF848884FF842204FF842205FFC441048087FFE0000 +3535:7FFE40005E7852485E7851444F3C42204FF8422042205FFC4220441048087FFE +3536:7FFE44207FBC4A647F9840665F7C51105FFE51445F7C44447FFC442844447FFE +3537:00007FFC40004FF8408040804FF8488849484A284C284808482848107FFE0000 +3538:7FFE4000403E4FC0487C48404BFE4A424A784AC44A3C520054F06494490C7FFE +3539:104010401040104011FC1044FE44104410441084108410841104110412281410 +353A:0100010001007FFC0100110011201020FFFE102010201022100210020FFE0000 +353B:00007FFC010003000560191861040100000001000100FFFE0100010001000100 +353C:10A01090FDFE13201DFC3120D1FC112051FE210000000100FFFE010001000100 +353D:0100010001FE010001003FF82008200827C82448244827C8200820083FF82008 +353E:00003FE02020202020202020202020202140208020002004200420041FFC0000 +353F:0000FFFE10101010101010101010101010101070119016101810001000100010 +3540:010001003FF821083FF821083FF800001FF0101010101052102210020FFE0000 +3541:010032000C7C124469440844FFC410442444244448448A5411483F4011400040 +3542:00003FFE208020802140222024102908308620802FF020102020402040408080 +3543:00003FFE2000200027FC21102110211021102FFE211021102210421044108810 +3544:00003FFE200020002FFC20802100221024202FC020802100221044084FFC8404 +3545:00003FFE2000200027FC2444244427FC2444244427FC24442040404040408040 +3546:00003FFE2000204020402FFE20402040204027FC240424042404440447FC8404 +3547:00003FFE20002080204020402FFC20002408220822102110212040005FFE8000 +3548:00003FFE2080204020003FFE20802100228426882A5032202210428843068200 +3549:00003FFE208020802140222024102BE83006200027F024102410441047F08410 +354A:00003FFE2000204820442FFE204027FC244427FC244427FC2444444444548408 +354B:00003FFE2080214022202410280837F6208020802FF82080249042A05FFE8000 +354C:00003FFE200027F8240827F8240827F820002FFC20103FFE2410421042508020 +354D:00003FFE22802240224027FC24402C4037F82440244027F82440444047FC8400 +354E:00003FFE208020802FFC20803FFE220024082FFC20002FFC292449247FFE8000 +354F:00003FFE20003F8820482F282908294829282F0E20782908260843885C088808 +3550:00003FFE2100263824082738240827F8220027FC280425542554480440288010 +3551:00003FFE220422043FC422042FBE20042FA428942F942884250443845C148808 +3552:3FFE240822103FFE20802FFC20803FFE20A02F2822243FFE42285F12822A06C6 +3553:00003FFE200027FC255424E427FC204027FC20402FFE24A4285247FC40408FFE +3554:3FFE20103F102AFE2E102AFE2EAA2AAA3EFE22003EFE2A205E144AA2BF280218 +3555:0100010002000420081010083FFC10040100010002000420081010083FFC1004 +3556:0400082010103FF80810102024487EFC02040100FFFE054009203118C1060100 +3557:41002210FF9008107F200820FFA0104010483E8442FC84040800140023FEC000 +3558:0400082010103FF80810102024487EFC010006C01830E10E0920111025080200 +3559:1080108020F04510FE2029FC4524A3243D2445FC4450A858109428924512820E +355A:00003FF01010121011200920082044402440228001000280044008203018C006 +355B:00003FF000201E40018006601818E0043FF010100820044003800C603018C006 +355C:010001003FF8210821083FF8010001003FF010100820044003800C603018C006 +355D:010001007FFC010001001FF0101010101FF000003FF00820044003801C70E00E +355E:00003F00217C21243F242424242424283F283528351055105528972804440482 +355F:080008000F0008FC08447F445544554455287F28551055105528512845444282 +3560:4140212003FE0A2017FCEA2023FC222023FE02003FF00820044003801C70E00E +3561:08000F00087CFFA480A47F2414242228492816282110FE10222822283E442282 +3562:10001E00107CFF4481447E4400447E2842287E2842107E1042287E2824444282 +3563:00400840082010201010200840049FF2101010101010101010101FF010100000 +3564:01000100790049004BF04910491049104910491079104A1202120412080E1000 +3565:004000407C404440444044404440444044A044A07CA045100110020804040802 +3566:00001FF01010101010101FF0010001000100FFFE02800440082010102008C006 +3567:000001FC790449044904490449FC490449004900790049000200020004000800 +3568:000001F0791049104910491049904950495049107910491202120212040E0800 +3569:0020002078204BFE48204820482049FC4820482078204BFE0020002000200020 +356A:0040004078404BFC4A444C484840484048A048A078A0492001220222041E0800 +356B:0080004078404FFE49004900490049F849084908790849080208020804500820 +356C:002001207920491049104A484A484C444882488079104908020807FC02040000 +356D:001000787BC048404840484048404FFE484048A078A048900110010802040402 +356E:0020011079084A044A044C104910491048A048A0784048A00110020804040802 +356F:0100010001007FFC410442844444482457D444444444444447C4444440144008 +3570:0008003C79E048204820483C49E048204820483E7BE04820002200220022001E +3571:00900088788848804FFE48A048A048A048A048A07920492201220222021E0400 +3572:00400040F040904097FE904090E090E091509150F24894440842004000400040 +3573:00000008790848884A524A524A224A224A524A927B0A4A0A020203FE00020000 +3574:000000007BFE4A024C04480049F04910491049107910491202120212040E0800 +3575:000003FE7820482048204820482049FC48204820482078204820002007FE0000 +3576:000003FC78404840484048404BF8488848884888788849080108010807FE0000 +3577:00200020784049FC490449044904490449FC4904490479044904010401FC0104 +3578:00800040784048004FFC480048084A084A08491079104910012000200FFE0000 +3579:00400048784448404BFE4880488048FC4944494479484A500220045008880306 +357A:00007CF84488448844887CF800000000FFFE080010001FF00010001000A00040 +357B:0200010000007FFC010003000D603118C10401001FF01010101010101FF01010 +357C:0100010079FE4A024A024C8A48524A224A524A8A7A024BFE0002000200140008 +357D:0008008878484A284A284A084A084A084A084A084A107A984B24022400420082 +357E:0100010009200910110821044104000000403E4422482270224022423E42223E +357F:00701F8001000100FFFE054009203118C0061FF010101010101010101FF01010 +3580:004000407BF848484FFE48484BF8484048404BF87840484007FC004000400040 +3581:00080190786048984B04484048404FFE48804890791049200248048409FC0084 +3582:004000407BF84A484A484BF84A484A484BF848407848483000640194060C0004 +3583:0008003C7BC04A004A004BFE4A004A004A004AFC7A844A840484048408FC0084 +3584:0104012479244924492449244BB44B6C4D244924792449240124022402040404 +3585:00280024782448204BFE4A204A244A244A244BA87A284A100212042A04460882 +3586:00500050785048504BFE4A524A524A524A524BFE7A524A520252025203FE0202 +3587:000003FE7820482048404BFE4A524A524A524A527A524A5202520242020A0204 +3588:02083FD00220FFFE02000C703F84C80407FC00001FF01010101010101FF01010 +3589:002000207850488849244A224C204920493C492079204920012007FE00000000 +358A:000003FC7804480449FC480448044BFC480848084FFE79084888008800280010 +358B:0100028004401830E44E0440044004400840104000007C8844B044C47C84447C +358C:0880088013F03090509090921112120E140000003E442258226022423E42223E +358D:0040044002401240084009FC7E400040004000003E442258226022423E42223E +358E:00807C8844B044C444847C7C0100028004401830E44E04400440044008401040 +358F:000001FC7904490449FC4904490449FC4820482079FC48200020002003FE0000 +3590:7CF8448844887CF800003FF002100210FFFE021004103FF0081010002000C000 +3591:0014001278104FFE48104A904A924A924FD24A947A944A88028A049A04260842 +3592:0108008878904BFC482448244BFC4A204A204BFE786248A2012A022404200020 +3593:010001F87B084C90486049984E4648404BF848407BF8484007FC004000400040 +3594:000001FC7820482048204BFE4850488849044AFA7C8848880088008800F80088 +3595:0040002079FC4800488848504BFE48204820482079FC48200020002000200020 +3596:020001003FF808200440FFFE010001003FF8010001003FF8200820083FF82008 +3597:004002487A484A484BF8484048A049104A884C4678404BF00010002000200040 +3598:000003FC7A004A004AF84A004A004BFC4AA04AA47AA84A900290048804A408C2 +3599:100010007E7C124412441244227C4A44840000003E442258226022423E42223E +359A:0810081017FE30105210911011101050102000003E442258226022423E42223E +359B:010001007FFC010001001FF0101010101FF000003E442258226022423E42223E +359C:02000100FFFE00001FF0101010101FF0000000003E442258226022423E42223E +359D:010001003FF801000100FFFE09203118C10600003E442258226022423E42223E +359E:000001FC79044904490449FC482048204BFE4A227A524A8A030A0202020A0204 +359F:001C03E0F08492449148911097FE9402900093F8F108911000A0004001B0060E +35A0:002000207BFE4850488849044AFA480048004BFE782049240122022200A00040 +35A1:00800040F7FE91209120923C9244966492949348F24892300220025002880306 +35A2:00800040EFFEA800A890A890AA90AA92AADCAA90EA90AA92129212D2270E0000 +35A3:0040002079FC48004908489048004BFE4800480079FC49040104010401FC0104 +35A4:000001FC780848104A224AAA4A724A224A724AAA7B264AA20242020203FE0002 +35A5:000007FCF404943495C49444944497FC944494E4F554964C0444044407FC0404 +35A6:00400040F7FC904093F8924893F8924893F89040F0E0915002480C4600400040 +35A7:001C03E07A204BFE4A204A924B0A4A0649FC4904790449FC0104010401FC0104 +35A8:000001F87808480849F8480848084BFE48204A22797448A80124022200A00040 +35A9:00000FC0F4BC94A494A497A494A494A897A894A8F49095D00EA800A800C40082 +35AA:0014001278104FFE481048104BD24A524A524A547BD4480800EA071A02260042 +35AB:0020002079FC482048204BFE488849444A4248F879884A500020005001880606 +35AC:0080031C7A044A044B9C4A044A044BFC480048007BF849080090006001980606 +35AD:000003FCF040904097FE90A09110920894469040F04892640252045201400080 +35AE:00400040F0A0911092089DF6900097FC94A494A4F7FC94A404A404A404140408 +35AF:3FF820082FE8200827C8244827C82028201000003E442258226022423E42223E +35B0:00807C8844B044C444847C7C00003FF820082FE8200827C8244827C820282010 +35B1:0100FFFE088010F83148D328149010601198160600003FF8200820083FF82008 +35B2:10001000FE7C2244444434440844147C2244C0003E442258226022423E42223E +35B3:1080088047FC21100A1011A070601090130800003E442258226022423E42223E +35B4:011001107BFE49104880488049FC49544A544C9478A449240244008401280210 +35B5:000001F87908490849F8490849F8490849F8490879084FFE0000011002080404 +35B6:000007FCF0A090A097FC94A494A494A497FC9040F04097FC004000400FFE0000 +35B7:000001FC7904490449FC4904490449FC48004BFE78204920013C012002A0047E +35B8:0040007C78404BFE4A424A784BC04A444A3C4A007AFC4A8003FE0480048008FC +35B9:0010011079084A044DFA488849084A284C104BF87AA84AA802A802A80FFE0000 +35BA:00400040F7FC904093F8908097FC9110920895F6F110911001F00110011001F0 +35BB:000003F8F090906097FC90A49128922094609040F7FC90E0015002480C460040 +35BC:008800887BFE4888488848F84888488848F848207BFE487000A8012402220020 +35BD:000003FE7820484049FC4904490449FC490449FC7904490401FC000000880104 +35BE:00007EFC428442847EFC10100820FFFE0100210821083FF8040808003000C000 +35BF:00000FDEF4929492949497949498949497929492F49295DA0E94009000900090 +35C0:00400040E148A148A94AAA52AAD6AB5AA94AAA52ED6AAF7A094A08420FFE0002 +35C1:000003DE7A524A524BDE480049FC48004BFE4880790049FC0004000400280010 +35C2:00200020792449224A2A483048C04F0049FC490479FC490401FC010401FC0104 +35C3:000003FC7A044BFC4A204BFE4A104A8A4B0648007BFC4A0403FC020403FC0204 +35C4:000003FC7A944A944A944BFC488048404FFE488078F848880108010802280410 +35C5:0100013C79244FE44924493C49244BA44AA44ABC7AA44AA403A4004400540088 +35C6:008800887BFE488848F8482049FC4924492449FC78204BFE0020002000200020 +35C7:000003DE7A424A424A424BDE4A004A3E4BD24A127A144BD40208021402240242 +35C8:000003FC788848504BFE4A224BFE4A224BFE4A2278404BFE0042008201140208 +35C9:08007F7C08243E2408447F54088804000FE0144003801C70EFEE08200FE00820 +35CA:00003EF822882288228822883EF8000000007EFC42844284428442847EFC4284 +35CB:0080008079FC4A044C084BFE4A004A804AFC4B207A204BFE0420045008881306 +35CC:0040002079FE49024A0449FC4840488849FC4824782049FC0020002003FE0000 +35CD:003803C0F040904097FC91509248944693F89208F20893F80208020803F80208 +35CE:02000200F7BC92A492A494A495BC9840904097FCF0E091500248044408420040 +35CF:000003FE78104820486848A44B22482048004BFE78204920013C0120012007FE +35D0:004000407BFC484048A049104A884C4648004BF87AA84AA802A802A80FFE0000 +35D1:010003BCEE10A210A23CAF90A210A23CA210AF90E27EA2100210021004100810 +35D2:00800040F7FE900093F892089208920893F890A4F12893100510094801860100 +35D3:00100420F2F89288908890F89E80928092FC9284F28492FC0284050008FE0000 +35D4:0040007C78404BFE4A424A784BC44A3C4A404A207BFE4A880250042004580986 +35D5:008800887BFE488849FC48884BFE482049FC492479FC492403FE010401140108 +35D6:003C03C078444A244928490048404B9C4A044A047B9C4A040204020403FC0204 +35D7:00407C8045FC452445247DFC212421447DFC2490251027FE4410441094100810 +35D8:002800247BFE482049FC492449FC492449FC492478084BFE0088004800480018 +35D9:0080008079FC4A44495449F4488449284A9049FC7A444D5401F4008401280210 +35DA:000007FCF0A090A097FC94A494A497FC90409040F7FC90E0015002480C460040 +35DB:02100210F3DE95289884903893C09040904097FCF04090A000A0011002080C06 +35DC:00800040F7FC9080910893F09060918497FE9002F7FC944407FC044407FC0404 +35DD:01040084788848004BFE4820482049FC482048207BFE480002A4025204520000 +35DE:000800087788527E524A544A57485D7C55545554755457540548008801140022 +35DF:2080104087FC4040104023F8E040204027FC200000007C8844B044C47C84447C +35E0:084008407E8413FE220214FC0884148462FC00003E442258226022423E42223E +35E1:0440FFFE0440100027F86110A13C21042214240800007C8844B044C47C84447C +35E2:01C8070871085FE8511E57CA554A57CA554A57CA710A57CA011201D20E2A0444 +35E3:02A802A877FC52A852AA54E6580057FC5444504073F852480248024802580040 +35E4:002800243FFE2220232422242FA822182A92522A464680820FF808080FF80808 +35E5:0200011E77D2501257D4545457D8501457D25092711251DA0714011005100210 +35E6:00101F20EACEAAAAAEAAAAAAAAAAAEAAAAAAAAAAEBEAAEAC1A28024802480288 +35E7:004000207BFE4A8A49044BFE4840488849FC4824782049FC0020002003FE0000 +35E8:00007F7848485F4C64805F7844484A4851307F4C00003FF8200820083FF82008 +35E9:000003DE78424A52494A4A524842482049FC4904790449FC0104010401FC0104 +35EA:009000927AD44A9A4AD24F4E488849F0482048447BFE48220128022404A20040 +35EB:010001107BDC4A544D544A8849084AF44C0248007BFC48400150024805440080 +35EC:111009207FFE40029FF410101FF002000FE034C00700388003F81D3001C03E00 +35ED:001C01E07820492448A84BFE487048A849244A227840482402A2028A04880078 +35EE:202020103DFE4510457CA9141914117E21147D14A57C251025283E2802440482 +35EF:01081FD001207FFC02000FF03810CFF008100FF000007C8844B044C47C84447C +35F0:01240124722454245954514A529256105A105250725C5250025002B0029E0300 +35F1:014001207BFE4E204BFC4A204BFC4A204BFE4A4078404FFE015002480C460040 +35F2:004003F878484FFE48484BF848404FFE48004BF87A484BF8024803F8000007FE +35F3:021002107BDE4A284D4448A049104A084DF6480078004BF80208020803F80208 +35F4:079E0492F79E9492979E940294F2949294F29492F4F294920492053204020406 +35F5:02100290EA90AB3EB222A544A890B210A290AB10EA28B228052808C410440082 +35F6:002403A878924D144A084C044BBA48A848C64B807A3C4B8400A8009002A80144 +35F7:002003FE7A5249FC485049FC48504BFE480049FC790449240124005800840302 +35F8:0280048EE8E0B140A040A24EA5F4AC44B444A554E554A5740594040404140408 +35F9:0140012073FE56205BFC522053FC5220522053FE724050240522050A08F80000 +35FA:000003F8708057FC511052085CA650A057BC50A073B850A007BC00A000A000A0 +35FB:000004F8728852E850A850A85DFC55045574555475745504051405080A0011FE +35FC:00A004A4F2A890A097FC911090A097FC904093F8F04097FC015002480C460040 +35FD:11002BDE4A5273D42A524BD27A1A12942350C24000003FF8200820083FF82008 +35FE:05100518EFA8A528A76AA2AAAFAAAAACAAACAFA8E238AFAA022A022A02260220 +35FF:0000079E7492579E5492579E540255FA541255D2755255D204120452042A0404 +3600:008003387A084BB84A084A084BF848404A4849504FFE78E0495002480C460040 +3601:000007FCF4A497FC904093F8904097FC911090A0F3F890400FFE004000400040 +3602:010800907BFE490849084A524B9C49084A524BDE784048A402AA028A04780000 +3603:008803FE788848204BFE484048F849884A8848F87840482402A2028A04880078 +3604:020002FEE2AAA2AAAFAAA2FEA620A710AAFEAA20F220A23C0224024402540288 +3605:02400240E4AEA890B300A2E0A45EAC44B5E4A444E554A4E4044404640584040C +3606:00400FFEE040A7FCA000A3F8A208AFFEA802A7FCE110A3F8004007FC00400FFE +3607:01100554F5B8991092A89444900097FC94449040F7FC90E0015002480C460040 +3608:0400057CF60494A89390907C941497949A5092509FDCF250955004B0089E0100 +3609:02100210F3DE95289084900097BC94A497A494A4F7A49434052806A004200020 +360A:07FC0040EFFEA842A358A040A358A080A040AFFEE000A7FC000007FC040407FC +360B:07DE051277D2545457C8551457E2500053FC520473FC520403FC020403FC0108 +360C:020203C2E202AFEAAA2AAB8AAE4AA9CAA80AAFEAEA0AAD4A0A820DC212AA2584 +360D:0108014CE52AA548A88EA138A288A7EABC8AA7ECE48CA7E8048A07FA04260442 +360E:040002FEE202A802AB92A892AFDEAAAAABCAAAAAEB92AAD20FAA08C608820806 +360F:211017FE108003F8F20813F8120813F8120813F8280047FE00903EE422843E7C +3610:001007C8753E57C0551457D25522550057D450547554554805480454005401A2 +3611:041004101F7CE414A414AEFEA014AE14A07CBF10E45404381654251214500820 +3612:0C3871E0102013FEFD2431FC392455FC502093FE10007C8844B044C47C84447C +3613:07BC04A4F7BC94A497BC944495F4944495F49554F5F4955405F404E40554044C +3614:004007FE749253FC509053FC509057FE510853FC750A51F8010801F800900108 +3615:009007FE78904BE84A884BCE4A504BD44AA24BE278004BFC0294029407FE0000 +3616:0200011EEFC4A448A29EAFD2A912AA1EAC92A91EEA12AC52089E0900120C0412 +3617:07BC04A4F7BC94A497BC94A497BC912093FE9220F7FC9A2003FC022003FE0200 +3618:210447C88812F3BC20084B92F83E0380AAAAABAA00003FF8200820083FF82008 +3619:07BC04A477BC500057FE54005590549E57D4556475D4555405D405680BC81054 +361A:0FBE08A2EFBEA8A2AFBEA802AB92A892AFDEAAAAEBCAAAAA0B920AD20FAA08C4 +361B:004000A073185DF6500053F8520853F8511057DC72844FFC045007DC045204CE +361C:51184B947C3ED3A87C7E53A87C3E53A87EBE43A000003FF8200820083FF82008 +361D:00007FFC400440044FC44044484444844284410442844444484440047FFC4004 +361E:00007FFC4204420442045FE4422442244224442444244824494450847FFC4004 +361F:00007FFC40044444444444445FF444444444444448444844504440047FFC4004 +3620:00007FFC4004420441444144448454A45514665444444BC4500440047FFC4004 +3621:00007FFC400440045FF4511451145FF4511451145FF45114410441047FFC4004 +3622:00007FFC41044924452445445FF442844284428444944894507440047FFC4004 +3623:7FFC400447C4444447C440044FE448244FE448244FE4482448A448447FFC4004 +3624:00007FFC4144655455544774641457F44414577465544554495450147FFC4004 +3625:FFFE8002861AF8E2AA42949290E2BE4AC8FABE2288AAAB26BE628002FFFE8002 +3626:104010401040104011FCFE44104410441044108416841884E104410402280410 +3627:100011F8100810501020FC1013FE10221024102010201C20E020402000A00040 +3628:202020202020202023FEFA22222222222252224A228A3B02E2024202020A0204 +3629:10101110111011121112FD1411D811101110111011101D12E1524192010E0000 +362A:1008103C11E010201020FC3C11E010201020103E13E01C20E02240220022001E +362B:108810881088108811FCFC881088108813FE108810881C88E088410801080208 +362C:21002100210021FCFA042484208421042144222427F43A14E004400400280010 +362D:20802080213E21022242FA4227C220822082210221423A22E7E24222000A0004 +362E:100011FC110411041104FD0411FC11241120112011101D10E208420804040802 +362F:10801080110011FE1200FC40104013FC1044104410841C84E104410402280410 +3630:10101110109010901010FD10109010901010101E13F01C10E010401000100010 +3631:10201020102011FC1124FD2411FC11241124112413FE1D04E104410401140108 +3632:200023FC2204220423FCFA402240224023F8224822483A48E488448A090A0206 +3633:044004447C48047004400C423442C43E010001003FF8010001000100FFFE0000 +3634:01000110791049104910492849247944010001003FF8010001000100FFFE0000 +3635:10401040104017FE1080FCA0112011FC1324152411241D24E134412800200020 +3636:081008101EFC221052900C9008FE10102010411001003FF801000100FFFE0000 +3637:1110111013FC11101110FC00120812081110111010A01C40E0A0411002080C06 +3638:0000FFFE104010443E484270A44018421042213EC1003FF801000100FFFE0000 +3639:0880088828902EA028C028842E84F07C010001003FF8010001000100FFFE0000 +363A:2120212821242224FA20263E2BE022242224222822283A10E212422A02460282 +363B:200023FE220222222222FA2223FE222222222252224A3A8AE302420203FE0202 +363C:1040104411F410481050FDFE1040108011FE124014801CFCE004400400280010 +363D:084008487F4408440840FFFE0040084408447F440828082A0F12F02A40460082 +363E:2040202023FE22022404F80021FC20202020202023FE3820E020402000A00040 +363F:100011FC1104110411FCFD04110411FC1020102011FC1C20E020402003FE0000 +3640:2080204027FC24042110FA082484208023F0209020903910E1124212040E0800 +3641:1080108010FE110012FCFC8410A4109413FE108411241D14E1FE400400280010 +3642:110410841088101011FCFD041104110411FC105010501C90E0924112020E0400 +3643:1010103811C011001100FDFC111011101110111013FE1C00E090410802040402 +3644:11101112111411D81110FD121152118E1120102011FC1C20E020402003FE0000 +3645:200023F8220822082208FBF82040204027FC20E021503A48E444484200400040 +3646:2040202023FE22022444F84023FE20402090209021103920E224424204FE0842 +3647:100013FE104010801144FE24106812B0113012A810681CA4E122422000A00040 +3648:20402040207C204023FCFA44227023C02244223C22003AF0E49044920912120E +3649:10501050105011FC1154FD54115411FC115411541D54E3FE4000008801040202 +364A:200021FC210021F82100F9F821002FFE2280224822503A20E210428803060200 +364B:1088108813FE10881088FCF81088108810F810881C88E3FE4000008801040202 +364C:1020102011FC102413FEFC2411FC10201124112411741DACE124412402240424 +364D:200027BC208422942108FA9424A42840200027BC20A43AA4E128429004A80846 +364E:2014201227FE2410F41027F02492249227D225543554E488454A0A1A08261042 +364F:1100110011FE120015FCFD0411FC110411FC108010FC1D08E290406001980606 +3650:102011241124112411FCFC0013FE1020104011FC11541D54E15441540154010C +3651:00F03F0001001FF011101FF001007FFC412441F45E14400801003FF80100FFFE +3652:00F87E084A504A207EFC4A244A287E2000A0014001003FF801000100FFFE0000 +3653:010001003FF80100FFFE08203EF808200E2078FC01003FF801000100FFFE0000 +3654:1040104011FC108413FEFC0011FC110411FC102013FE1C20E22043FE00200020 +3655:200023FE222223FE2222FBFE200021FC210421FC210439FCE104410401140108 +3656:1004101E13E0102011FCFD24112411FC102013FE12221E2AE2FA4202020A0204 +3657:200023F82248224823F8FA48224823F8200027FE22403A44E228429003080206 +3658:200023FE2050205023FEFA52225223FE2000204027FE3888E190406000D80304 +3659:2120111097FE4128493409281132E124223A2262259E01003FF801000100FFFE +365A:1088105013FE102011FCFC2013FE100010A010FC11201C20E3FE402000200020 +365B:1028102413FE102011FCFD2411FC112411FC11241C08E3FE4088004800480018 +365C:0100FFFE00001FF010101FF000007FFC40044FE448244FEC01003FF80100FFFE +365D:204021FC204420942108FBDE214A214A229421FC210439FCE10441FC0104010C +365E:1020104011FC110411FCFD0411FC110411FC102013FE1C70E0A8412402220020 +365F:2100209E23D222522252FBDE2252225223D2221E22923A52E2D24352022A0044 +3660:7F7848485F4C64805F7844484A4851307F4C000001003FF801000100FFFE0000 +3661:21242124222424242954F94A229226102A102250225C3A50E25042B0029E0300 +3662:2088208823FE20882088F8F8202023FE2222233222AA3B76E2224222022A0224 +3663:20002F3E2120213CF1202F3C282028FE28502F523154E148414801440A620440 +3664:2040207C204023FE2242FA7823C4223C220822F023243AA8E5FE442008A00040 +3665:2080204027FC2110FA482484212023F02010208821503B20E510494801860100 +3666:0808144822285C8888487F0E08F82A084908180801003FF801000100FFFE0000 +3667:200023FE205023DE2252FA5223DE205023FE222222223BFEE222422203FE0202 +3668:224822482554275C2248FD54275C22482FFE222022283A28E5144494042C0844 +3669:2040204027FC20A02514FA0827FC2A0A23F8220823F83840E248444409440080 +366A:202023FE202021FC2000FBFE220221FC200021FC210439FCE104408803FE0000 +366B:10A0109011FE132011FCFD2011FC112011FE11001C20E3FE407000A803260020 +366C:081408127F102AFE2A105D101C282A284944888201003FF801000100FFFE0000 +366D:20002FFE28002A28F9482BEE289228842AA02AA83BE8E8884894091409241242 +366E:2210221023DE22282544F8A02110220825F6200020003BF8E208420803F80208 +366F:08203E2008F87F282228496A3E2A08567E8200003FF80000FFFE082010103FF8 +3670:10001EFC22247F44A99C3F50297C3F9029FE29104510821001003FF80100FFFE +3671:00207C3C44207DFE0122FD3841E47D1C05702A54148C01003FF801000100FFFE +3672:2040202027FE20282224F27E24C82748217E224824C8377EE1484248047E0840 +3673:2014201227FE2410F5D0241425D4255825CA24163442E82442A2028A04780000 +3674:210021F8220827FE2288FB2423FE220022FC220022FC3A00E2FC448404FC0884 +3675:102013FE100010F81088FCF8100013FE120212FA128A1EFAE22641F8002003FE +3676:0100FFFE10101FF00000111009207FFE40029FF410101FF001003FF80100FFFE +3677:200023FE220223FE2202FBFE21082252239C210822523BDEE00042A402520452 +3678:212821AA216C2228FAFE264426282AFE2210227C22103AFEE210422802440282 +3679:2088208823FE208823FEFA5223FE200023FE224220F83908E290406000C00700 +367A:27FE242025FC252425FCFC2027FE250425FC250425FC3D04E5FC4488050407FE +367B:202027FE240025FC2524F5FC252425FC242025FC242037FEE5244AFA082013FE +367C:23F82248224823F82248FA4823F820002FBE2AAA2AAA3FBEEAAA4AAA0FBE08A2 +367D:2020202027FE202023AEF92423AE22AA23AE22AA23AE3850E050408801040602 +367E:22A0244C24A4260CF4A4264C24A42FFE280223F03020E04047FC004001400080 +367F:211027FC204023F82040F7FC200023D4211227FE23503534E78C42CA045608C2 +3680:210821EC210A27E8F52825DE272824EA240A27EA340CE7EC4A2A0BEA115607E2 +3681:101010107C7C1010FEFE4444EEEE44446464DEDE0000FEFE28282A284C4A8886 +3682:204027FC224823F8F0402FFE2AAA23B8211027FC3110EFFE412803100D480186 +3683:010001007FFC01001FF000007FFE400284442388244820083FF8082004407FFC +3684:01007FFC01001FF000007FFE51129FF411101FF000007FFC010411F0290047FE +3685:020007E00820144003801C70E00E1FF0010011001FF821005FF00100FFFE0000 +3686:02000100FFFE00001FF010101FF010101FF008000FF01420224041800E60701C +3687:044022882108228824483FF81210220847E4082014402280010006C01830E00E +3688:1010101010101E101210221022FE52108A100410041008100810101020104010 +3689:00003FF008100820083C120417E438544588068039F80610192000C003003C00 +368A:202020103C1045FE4820A824104428F84E12122224445588081010282044C182 +368B:200021FC3D2445244974A92411FC29044F74135425545574090412042214C408 +368C:200021FC3D24452449FCA924112429FC4E2013FE247054A8092412222020C020 +368D:202021FC3D2445FC4820ABFE100029FC4F0413FC250455FC090411FC2088C104 +368E:010001007FFC0280044008203018C0060000200820082008200820083FF80008 +368F:010001007FFC0280044008203018C006082008207FFC08200820102010202020 +3690:010001007FFC010002C004201810600801000100FFFE0280044008203018C006 +3691:00003FF8000800081FF8000800083FF801000100FFFE0280044008203018C006 +3692:0100010001007FFC01002120111011102928454402800280044008203018C006 +3693:010001007FFC028004400820311001007FFC0380054009203118C10601000100 +3694:020002007FFC044008203018C82604403FF801000100FFFE0100010001000100 +3695:020002007FFC044008203458C4467FF804483FF824403FFC0844105420484040 +3696:010002001FF0101010101FF0101010101FF0010001007FFC028004401830E00E +3697:020002007FFC044008203018DFF6101010101FF010101FF010101010FFFE0000 +3698:10201020102010207DFC102010201020FDFE1020105010502888248845048202 +3699:100010007E7C124412441244227C4A4485000100FFFE0280044008203018C006 +369A:020002007FFC044008203218C7E608203440028003001FF0E81008100FF00810 +369B:020002007FFC0440082038D8CF06081007F000001FF010101FF010101FF01010 +369C:020002007FFC044008203098C0A63FF800803E8022483E5000240E54718C0604 +369D:020002007FFC044008203018C806084013F8304057FC904013F8104017FC1000 +369E:020002007FFC044008203018C82608207EFC08201C702A6848A4892208200820 +369F:08001FC020807FF0A0103FF020883CF420843D7C01007FFC028004401830E00E +36A0:020002007FFC044008203458C2863FF801001FF001007FFC0000248822444244 +36A1:10101010FEFE101028284444FEFE040474745454545474745454040414140808 +36A2:10801080108020802FFE61086108A2082210261021A0204020A0211022082C04 +36A3:02000200FFFE08401C8003800470180862000200FFFE08201C4003800C707008 +36A4:1048104410441040FE4E23F02240224042402440142008221412220A42068002 +36A5:100011FC10201020FC202420242027FE24204820282010202820442084A00040 +36A6:100011FE10481048FC4824482448244824484848284810482888448885080208 +36A7:10201010101010FEFC8024802480248024804880288010802880450085000200 +36A8:100013F010901090FC902490249027F02490489028901092288A448A84860082 +36A9:100010FC10841084FC8425FE24842484248449FE288410842884448484940088 +36AA:1008103C11E01020FC20243C25E024202420483E2BE01020282244228422001E +36AB:200023FC20842088F8884890489C488489444944312811282A104A2884440182 +36AC:10401040108010FCFD0426042484244424444814282410442984440484280010 +36AD:1040105010481048FC4025FE24502450245048502890109028924512850E0200 +36AE:1000100011FE1102FD02240024782448244848482848104A284A448A84860100 +36AF:200023F822082208FB284AA84AA84A488A484AA832A8132A2C0A440A88061002 +36B0:100011FE10101010FC202420246824A425224A22282010202820440083FE0000 +36B1:1008101C10E01080FC802480248024FE24884888288810882888448885FE0000 +36B2:1020102010201020FC3E24202420242025FC4904290411042904450485FC0104 +36B3:210021002100211CFBD4495449544954895449543154115429544A5C83540480 +36B4:20402040204023FEF88048A0492049FC8B244D24312411242934492880200020 +36B5:10401040107C1084FD8826502420245024884B0628601010280844C084200010 +36B6:100011F811081108FD08250825F82500250049FC290411042904450485FC0104 +36B7:2020202020502050F88849044A22482048A890A4512421223222482048A08040 +36B8:100011FC10041004FDF42404240425F42514491429F411142804440484280010 +36B9:20002080231E2252FA524A524A524A524A5292D2535A22543090489049108210 +36BA:100011FC10441048FC8E2482257A2614242048202BFE10202820442084A00040 +36BB:00003FF8210821083FF8210821083FF804000400FFFE08201C4003800C703008 +36BC:1000100011FC1124FD2425242524252425FC4924292411242924452485FC0104 +36BD:00007DFE1040108011FC10041E04E00442280210FFFE08201C4003800C707008 +36BE:100011FC11041104FD04250425FC2450245048502850109228924512820E0400 +36BF:1040104010FC1084FD0426F42494249424F448842894108828824482847E0000 +36C0:1080108010F81108FE10242025FC24042404480429FC10042804440485FC0004 +36C1:100011FC10201020FD2424A424A8242027FE4820282010202820442084200020 +36C2:1008101C11E01100FD00257C2554255425544954297C1140294046428242043E +36C3:080008007F7C08243E2408247F4408540A880200FFFE08201C4003800C707008 +36C4:10401020102011FEFC40244024A024A225A44A982C901088288844A484C20080 +36C5:100013FE10881088FCF82488248824F824884888288E13F82808440884080008 +36C6:100011FC10441048FC5E2482248A252424204BFE2820107028A8452482220020 +36C7:10201010101011FEFD00251025102510257C4910291011102910461082FE0400 +36C8:1040104411F41048FC5025FE2440248025FE4A402C8010FC2804440484280010 +36C9:100013FE10501050FDFC25542554255425544954298C11042904450485FC0104 +36CA:100010F810881088FC8824882526262025FE4820287010A82924462284200020 +36CB:2040204020A020A0F9104A484C46484049449152524A244A3048484049408080 +36CC:2040204020902108FBFC48244920492049FC9220502027FE3020482048208020 +36CD:10201020102013FEFC2024202524252425244AAA282010502850448881040202 +36CE:100010FC10841084FC84248424FC2400240049FE290211022902450285FE0102 +36CF:1028102410241020FDFE2420252024B224B4486828A811242A22442084A00040 +36D0:100013FE10201020FDFC2524252425FC2524492429FC112028A0444080B0030E +36D1:08000F7C28443F44612892100C683186C0000400FFFE08201C4003800C707008 +36D2:100011FE10001000FCFC24842484248424FC4800288410442848440085FE0000 +36D3:21842068203020C8FB0448404BFE48A0492093FC552421243134492848208020 +36D4:1040104010FC1088FD50242024D8272624F8482028F810202BFE442080200020 +36D5:100010F810881088FCF8240025FC25242524492429FC110029004502850200FE +36D6:2040204020882104FBFE4802488849448A4248F8318812502820485081880606 +36D7:1020102010A810A8FCA8257426222420242049FC282010202820442083FE0000 +36D8:2020202023FE2020F8204BFE4A024C0449F89010502023FE3020482048A08040 +36D9:1040102011FC1000FC88245027FE24202420482029FC10202820442084200020 +36DA:100011F8100810D0FC2025FC2524252425FC4924292411FC292445248524010C +36DB:1040108011F81108FDF8250825FA250A250C4BF8281810282848458886280010 +36DC:1040104024FE6488A548245024202450228C0200FFFE08201C4003800C707008 +36DD:100011FC11041104FDFC2504250425FC2504490429FC10002888448481020202 +36DE:100013FE10201020FDFC2420242027FE248848882BFE10882888450881080208 +36DF:1080108010F81108FE1025FC25242524252449242BFE10502850448881040602 +36E0:210020BE22822202FA024AFA4A8A4A8A4AFA928A528A22FA32024A024A0A8204 +36E1:1040102013FE1202FC0425F82400240027FE48902890109029124512820E0400 +36E2:201C21E020202020FBFE48A849244A2289F84888309010BE2902490282140408 +36E3:100010F810881088FCF8240025FC250425244924292411242850444880840304 +36E4:200023FE20002000FBDE4A524A524A524B5A92D65252225232524A524A5282D6 +36E5:1020102213B410A8FCA8252426A2244025FC4904290411FC2904450485FC0104 +36E6:2110211021102110F7BC51105110533853B89554555429922110511051108110 +36E7:1020112411241124FDFC2400240027FE2440488028FC11842A84448484FC0084 +36E8:21082088209023FCF84048404BF8484088404FFE30A010A0292049228222041E +36E9:1040102013FE1080FD0427FE240225FC250449FC290411FC2904450485140108 +36EA:1020102013FE1050FC882524262225FC252449FC292411FC28224422841E0000 +36EB:100010FC10841084FCFC2484248424FC244048FE292A124A28924522844A0084 +36EC:2020202021FC2020F8204BFE488849044A22902051FC2020302048204BFE8000 +36ED:10881088108813FEFC88248827FE240025FC4904290411FC2904450485FC0104 +36EE:1040102013FE1222FCA4252824502488250448F8288810882850442080D80306 +36EF:22102210239024BCF91457D455545554555497D452A422AC22C25482547E8800 +36F0:100011FC110411FCFD1025FE2510254A2586480029FC110429FC450485FC0104 +36F1:100011FC11241124FDFC2524252425FC24004BFE292011222914454885840102 +36F2:100013FE10201040FDFC2504250425FC250449FC2904110429FC440084880104 +36F3:01007FFC082004407FFC41041FF01110115011200200FFFE08201C4003C03C38 +36F4:2092212422482124F892484048804BFE4A02928A5252222232524A8A4BFE8202 +36F5:101E13E010441124FC88242025FC2524252449FC292411242BFE450485140108 +36F6:1020112411241124FDFC2480248027FE24904910295212542AA8442888440082 +36F7:0C48704413FEFC50305058929492110E12000200FFFE08201C4003800C707008 +36F8:1020102013FE1020FC2025FC2400240025FC4904290411FC28004488845003FE +36F9:210021FE21102210FAFE4A924E924AFE4A92929252FE229032504A204A588286 +36FA:1040102013FE1000FD04248827FE240025FC4904290411FC2904450485FC0104 +36FB:2020202023FE2050F8884B2649FC4820482093FE5000202031FC4820482083FE +36FC:1008103C11E01020FC2027FE242024A0252C4924292411AC2924452485FC0104 +36FD:2040202023FE2202F820492448A848204BFE907050A820A831244A2248208020 +36FE:2008200C200A23FEFA084A084AE84A0A4A0A92EC52AC22A832EA4A1A4A268442 +36FF:20A820A823FE20A8F8A848004BFE4A22882049FC312411242934492880200020 +3700:21002100213C2124FBA44924493C4BA44B649524593C212431244924493C8124 +3701:1020102013FE1070FCA82524262225FC250449FC290411FC2904440083FE0000 +3702:08087E0808FEFE0808487E2808080F28F0100400FFFE08201C4003800C707008 +3703:2090208820FE2100F9004B3C4D004900493C91005100213C31244924493C8124 +3704:200027FC24042434F5C4544455F45554555495F45444245425F4549458069002 +3705:1040102013FE1040FC8825F02420244425FE480229FC112429FC452485FC0104 +3706:2010209224522254FA1048FE48104E388A544A92331012102A10450088FE0000 +3707:2020202021FC2020FBFE482049FC48208BFE4800304010242AA24A8A84880078 +3708:00207E7C14C40838FEC62A2048FCA844128C0200FFFE08201C4003800C707008 +3709:2124224822482124FBF84A084BF848004BF89248524823F832024A0249FE8000 +370A:200023FC22042204FBFC4A484A484AFC8A484A4833FE12A42AA8449084C80886 +370B:2104208420882000FBFE4800488849048A0249FC315411542954495487FE0000 +370C:10001078FE4810487C480086FE0082FC7C441044FC2824286810302848448582 +370D:1020101011FE1110FD7C251425FE2514257C4910297C114429444644827C0444 +370E:101E13E011221094FC40248825F0242024C449FE282210202BFE445084880306 +370F:100010FC10841084FCFC240025FE250225FE490229FE110229FE444884840102 +3710:1020112411241124FDFC240027FE240025FC4904290411FC2888445083FE0000 +3711:40482FFE004087FC544417FCE44427FC244420000200FFFE08201C4003C03C38 +3712:1040119C11041104FDDC2504250425FC248848882BFE10882888448885080208 +3713:1088108813FE1088FC2024502488250426FA4800280011FC2904450485FC0104 +3714:1080104013FC1108FC9027FE240025F82508490829F81090289045128212040E +3715:2010201022FE2110F97C4854487C4B54897C491031FE111029104A90847E0000 +3716:2090209027FE2090FBFC4A944BFC4A944BFC900051F8210831F8490849F88108 +3717:2040208821FC2108FA524BFE485049884E2690C0531020643388483048C08700 +3718:1020103C102011FEFD22253825E4251C2500497C2944117C2944457C854402FE +3719:2040202023FE2250FA504BFE4A524A528BFE4A00329212D42A98449284D2088E +371A:2040202027FE2402F90049FE4A104E204A7C92445244227C32444A444A7C8244 +371B:21082108210827C8F11E57D2556457C0554897C8510827C82114511451248142 +371C:21082108210827D0F11E579451245FD4521493D452542248224854D454248842 +371D:2020205020882124FAFA481048204BFE485091FC5154218C310449FC490481FC +371E:08047F7808407F40497E7F4849487F4808487F480A88FFFE08201C4003C03C38 +371F:2008238820882110F7DE529452A4539452949394529422C82388569450A480C2 +3720:1020122213FE1090FC8825FE2710251025FE4910291011FE2910451085FE0100 +3721:2124212422242424F954494A4A924E104A109250525C225032504AB04A9E8300 +3722:102011FC112413FEFD2425FC242025FC252449FC284013FE288845D08470038C +3723:2110211421D22250FA7E4D5048904AA8492891445244248230084AA44A528452 +3724:200023FE205023FEFA524BFE480049FC490491FC510421FC30204BFE48208020 +3725:200023FE22522252FBFE480049FC490449FC910451FC210431FC488849048202 +3726:200023FC200423FCF8044BFC48004BBC492497BC500823FE3108488848A88010 +3727:200027FE24002628F54857EE5492548456A096A857E824882494551459249242 +3728:200023FE220223FEFA104A544A384A548A824A50327C12902A1045FE84100810 +3729:2040208023FE2222FAAA4A224BFE4A724AAA9202502023FE3020485048888306 +372A:08047F782240FF40087E7F482A484948A8881400FFFE08201C4003800C707008 +372B:228822A826A82BF0F01E522455D45C14541495D4555425482568555456148422 +372C:210021F8220827FEFA884B244BFE4A008AFC4A0032FC12002AFC448484FC0884 +372D:1020112410A813FEFE0224F82488248824F8480029FC112429FC452485FC0104 +372E:200823E8228823EEFA284BF44A824BE2880049FC315411542954495487FE0000 +372F:200027DE24922492F5D2555E555055D05492949257CE20002000552454928892 +3730:21242174225822DAFBFE49544ADA4BFE88A2482033FE107028A8492482220020 +3731:2042239C221023DEFA944A944C204BFC4A0493FC520423FC32044BFC49088204 +3732:20402FFE240027FCF00057FC540457FC50809C9C57D43D54355C5C965556AE22 +3733:2080204027FC2000FBF84AA84BF848404A449118524420A831904A884CA680C0 +3734:210827FE210823FCFA944BFC48004FFE4C0291F8510821F8310849F8490881F8 +3735:204027FE200023FCFA404BF84A404BF84A4093FC5004255430A84B104D488186 +3736:21F0221027FC2204FBFC4A244BB84A2249FE921057FC224433FC48D0494A863E +3737:F7FC124817FCFC4686ECF55416EC155456EC24440200FFFE08201C4003C03C38 +3738:0820FFFE28207DFC44887C5041FE7C2045FC7C200200FFFE08201C4003C03C38 +3739:23DE225223DE2252FBDE4A524BDE489049FE911053FE251031FE491049FE8100 +373A:252827BE294827BEFB184DAA49464BFC4A0493FC520423FC32044BFC49088204 +373B:244424E42A0A2EEEF4045AEA5E0E50E05AAA9AEA504020242522550A590880F8 +373C:21FC212421FC2124FBFE4AAA4BFE4AAA4BFE900053FE228A30F84888488883FE +373D:0888111022201110088800001FE0004000800100FFFE01000100010005000200 +373E:0020FC200450085010881104160218883088D088108810881088110851082208 +373F:0000FDF8040808501020101015FE18223024D020102010201020102050A02040 +3740:00003E7C22042A08260822102210FF7E421052104A1042107F90021014500820 +3741:10001FF820085FC890481FC810481FE800103FE000800100FFFE010005000200 +3742:0104FD0E0530092017E01120153E196431A4D724112411241124112455442284 +3743:0080FC8004F80908121011FC152419243124D1FC10501050109010925112220E +3744:20201020FE2001FC7C2044A87CA800A87CA804A808F81E22F0221022501E2000 +3745:1000FE7810487C480048FE8682007CFC00447C4408281E28F010102850442182 +3746:0020FDFE042009FC100011FC150419FC3088D3FE100011FC1104110451FC2104 +3747:20201010FEFE00007C7C44447C7C00007C7C080810101EFEF010101050502020 +3748:210447C88812F3BC20084B92F83E0380AAAAABAA00007C7C0808FEFE10103030 +3749:0200010001007FFE400280040000000000000000000000007FFC000000000000 +374A:0200010001007FFE4002800400003FF01010082004400280010006C01830E00E +374B:0200010001007FFE400280041FE0004000800100010001000100010005000200 +374C:0200010001007FFE4202820407E004200840104000800180024004201810600C +374D:020001007FFE500290041FF8100020003FF800080008FFC80008000800500020 +374E:020001007FFE40028204010001007FF8003000C003000C003000480087FE0000 +374F:020001007FFE400281040280044008203458C446044004400840084010402040 +3750:0200010001007FFE40828484044008401020221042088406084010203FF01010 +3751:020001007FFE4002820401007FFC0400040007F0041008100810101020A04040 +3752:0200010001007FFE4002810401007FFC010001001FF01010101010101FF01010 +3753:020001007FFE4002810402800C603018CFE600001FF01010101010101FF01010 +3754:020001007FFE4002820401007FFC08201010244844440280010006C01830E00E +3755:020001007FFE4202810409002828282447E400003FF00820044003801C70E00E +3756:020001007FFE420287E41840648003200C4071F806081A10012000C007007800 +3757:020001007FFE420281041FF010101FF010101FF0110410881050122014181806 +3758:020001007FFE420281043FF800001FF000001FF000001FF0101010101FF01010 +3759:020001007FFE400280043FF801001FF001007FFC0000FFFE0000082010102008 +375A:020001007FFE4002801C7BE00840104022787A400A402BFC1000280047FE8000 +375B:020001007FFE400288040FFC1040304053F89248124812A81318120813F81208 +375C:020001007FFE444284443FF804400440FFFE00001FF010101FF010101FF01010 +375D:020001007FFE40028824082008207EFC08201C301A702A6848A4892208200820 +375E:020001007FFE400280047FFC044004403C78200820083C7804400440FFFE0000 +375F:020001007FFE4002BFFC00001FF010101FF010101FF010101FF004421842E03E +3760:020001007FFE40029FF410101FF010101FF012100100FFFE0000082010102008 +3761:020001007FFE400280047F0022FC3E4422443E44222822282F10F22842440282 +3762:020001007FFE400280F43F0001001FF011101FF001007FFC412441F45E144008 +3763:020001007FFE400288047F7C08243E2408447F5408880200FFFE04401830E00E +3764:01007FFE4822BFFC08203FF80820FFFE01003FF821083FF82108FFFE20082018 +3765:020001007FFE400284242420252424A83C2007FE0470FCA82524262224204420 +3766:01007FFE49029FFC31005FF091001FF011001FF810003FE0084008F810086030 +3767:01007FFE4402BFFC082007C0783811101110292845443FF801000100FFFE0000 +3768:020001007FFE41029FF401007FFC00001FF010101FF0048808503820CB180C06 +3769:01007FFE400281043FF820802FF820883FFE20882FF824C422A8449858868180 +376A:020001007FFE4002904410407C4011F8FE48444828C87C4810AAFEAA11061202 +376B:01007FFE4002810479F04A9050606198560649F04A406BF8544043F8404047FC +376C:20201020FE20822011FC7C2010207C2011FEFE2010507C50448844887D044602 +376D:01007FFE4002900413F812085BF8560853F8914013F8144011F0104017FC1000 +376E:01007FFE400288042A003E7C49447F4400443E2800287F1008102A2849441882 +376F:020001007FFE400280741F800200FFFE082037D8C4463FF8200827C8244827D8 +3770:01007FFE42029FF41490125011301FF00100FFFE92122FE8440407E008203060 +3771:01007FFE408A8BFC488849FC495479FC08000BFEFA4248784888495088600980 +3772:01007FFE411297FC511053F852A877FC141411F0F01057FC544453F892481258 +3773:0200020002000200FFFC0200020012901248122422242212421282000A000400 +3774:00087C08000801FE0008FE082488244824482408240824282412440243FE8000 +3775:00003FF820083FF820083FF800007FFC00200020FFFE08200420042000A00040 +3776:3FF8244824483FF80000044004420842303EC0000020FFFE0820042004A00040 +3777:3FF000101FF000103FF000407DF011501C94E14C0020FFFE0820042004A00040 +3778:010011102108450408003FF8200820083FF8200820083FF8044008421042603E +3779:01001110216843841C00E8001FE020204040BFF8210821083FF80492188AE07E +377A:22101410FF90141014147F521552FF9215107F1414043608551094A014401580 +377B:22102210FF9022103E5408527F5249907F1008147F0408087F0808100F20F0C0 +377C:200021FC20202020FC2028202BFE282028202820282028A02842480247FE8000 +377D:2020202020202024FDA828B028B0292829242A2428A028402802480247FE8000 +377E:20402040204023FCFC80288028F8292029202A20282029FC2802480247FE8000 +377F:2020202021FC2124FD28292029F82908295029202A502A882D0A480247FE8000 +3780:20402040204023FEFC802890291229542A902C28282428442982480247FE8000 +3781:200021F8210821F8FD0829F82800291829E02904290428FC2802480247FE8000 +3782:201C21E020442124FC88282028202BFE284828C8283028682986480247FE8000 +3783:2840244842449244104029FE445082507C5044504450445244527C92448E0100 +3784:2040204023FC20A0FD102A482DF4295029F0295029F42844283E480247FE8000 +3785:200021FC212421FCFD2429FC282029FE287028A829242A202822480247FE8000 +3786:2020202021FC2050FC882BFE280829E82928292829E829282808481A480287FE +3787:200021FC212421FCFD2429FC28002BFE29222914294829842902480247FE8000 +3788:2040202021FC2104FD0429FC290029FC2B542B542DFC29542954490E480287FE +3789:2088205023FE2020FDFC28402BFE288029FC2A202C202BFE2802480247FE8000 +378A:1040544054407C4092FC9250FE5000507C500050FE50105254929292510E2200 +378B:00003FFC200420043FFC200020002FF82408241022202140208041404630980E +378C:00003FFC200420043FFC200027F82010202020402FFE20402040404041408080 +378D:00003FFC200420043FFC210021002FE0212025202220232024A24422481E9000 +378E:00003FFC200420043FFC20002FF82888288828882FF8280028024802480287FE +378F:00003FFC200420043FFC200020782780208020402FF8201020604180460099FE +3790:00003FFC200420043FFC2000208020402FFC200024082210212040005FFE8000 +3791:00003FFC200420043FFC20002888249022A0208022A02492288A4082407E8000 +3792:00003FFC20043FFC210022002FF8280828082FF8280828084FF8480888080FF8 +3793:00003FFC20043FFC200028602F88280827F820002FF828084FF848088FF80808 +3794:00003FFC20043FFC210023F02C202240218022402CF821084690406081800E00 +3795:00003FFC20043FFC22202410280837F6241027F0241027F04410441084500420 +3796:00003FFC200420043FFC20803FFC20802FF8288828A829D022A04490588C8080 +3797:00003FFC200420043FFC209020882FFC2080288825D022A02490488C42808100 +3798:3FFC20043FFC20002FFC2100230824882D50226025E029504250444899440080 +3799:3FFC20043FFC200020F03F0021E02F0021F43F0420FC20884ED042A084981986 +379A:3FFC20043FFC2000203827C020402FFE20402140265C2444475C444487FC0404 +379B:00003FFC20043FFC2288249028E43284247C2C0034FC248444FC448484FC0484 +379C:3FFC20043FFC220C2470281030FE223824542C92342025FE444444C8843805C6 +379D:00243FFE222023A422243FA82B10529A462680421FF810081FF8100020004000 +379E:00003FFC20043FFC24482848305422A425002C103490249C44904550863E0400 +379F:3FFC20043FFC22202FF821402FF82A282DD828082FF820805FFC41408630180C +37A0:3FFC20043FFC20802FF821402A2827F02C1837F4241027F04080488892840100 +37A1:3FFC20043FFC2000273822102F7C20002738221023BC2EC8413043108D480186 +37A2:010001002108210821082108210821083FF801000100010001000100FFFE0000 +37A3:01002108210821083FF80100054008203018DFF6021002100210041008A01040 +37A4:010001002108210821083FF800000100010001000280044008203018C0060000 +37A5:01002108210821083FF80000060001000100028002800440082010102008C006 +37A6:100010F01090109054905490549054905490549054905C9264920112010E0200 +37A7:01002108210821083FF8000000003FF004100420087C08041004200440288010 +37A8:100011FC1004100854105420542057FE5420542054205C206420002000A00040 +37A9:0100210821083FF8000000000FE0082008200A200920092210221022201E4000 +37AA:00003FF0001000101FF000100010FFFE0100010021082108210821083FF80008 +37AB:01002108210821083FF80200010001007FF8003000C003000C003000480087FE +37AC:010001002108210821083FF8000000003FF801000100010001000100FFFE0000 +37AD:010001007FFC01000280044008203018C106010021082108210821083FF80008 +37AE:01002108210821083FF8080008001FF810082010402000400C80030000800040 +37AF:00003FF0001000103FF02000200420041FFC010001002108210821083FF80008 +37B0:10801080108011FC552056205420542057FE542054205C206420002000200020 +37B1:0100210821083FF8000000003FF82008200820083FF82008200820083FF82008 +37B2:102010201020102055FC552455245524552455FC55245C206420002000200020 +37B3:100810881048104854085488544854485408540E55F85C086408000800080008 +37B4:1004101E11F0111055105510551055FE5510551055105D08650A014A01860102 +37B5:01002108210821083FF8020001007FFC0820082004400280010006C01830E00E +37B6:10401020102013FE54885488548854885488545054505C206450008801040602 +37B7:01002108210821083FF80100010000007FFC010001003FF801000100FFFE0000 +37B8:01002108210821083FF8000000007FFC01000300056009103108C10401000100 +37B9:1000100013FE1008540855E8552855285528552855E85D286408000800280010 +37BA:01002108210821083FF8080008001FF0210001007FFC0280044008203018C006 +37BB:0100210821083FF800001FF010101FF00000FFFE10001FF00010001000A00040 +37BC:00003FF0002000C07D040588095011202118C50602000100210821083FF80008 +37BD:2028202420242020ABFEAA20AA24AA24AA24AA28AA28BA90CB12022A00460082 +37BE:100011FC11041104550455FC550055405544554855705D4065420242023E0400 +37BF:0100210821083FF8000001003FF801000100FFFE10100820044003801C70E00E +37C0:00701F8001000100FFFE054009203118C006010001002108210821083FF80008 +37C1:100011FE11001100557C551055105510551055FE55105D106510021002100410 +37C2:100010FC108410A454945484548457FE5504554455245D0465FE000400280010 +37C3:100011FC1004100455F45404540455F45514551455F45D146404000400280010 +37C4:108410441048100055FE5420542054FC5420542055FE5C206420002000200020 +37C5:10001088105011245554558C550455FC5400549054905C90651001120212040E +37C6:2090209421142118AB10AD32A952A90EA920A820ABFEB820C820002000200020 +37C7:10201020112411245524552456AA54725420542055FC5C206420002003FE0000 +37C8:102810241024102055FE5420552054B254B4546854A85D246222002000A00040 +37C9:2040202023FE2202AC24A920A9FCA920AA20A820ABFEB820C820002000200020 +37CA:1008103C11C01004554454A8540055F85410542057FE5C206420002000A00040 +37CB:110410841088101055FC55045504550455FC545054505C9064920112020E0400 +37CC:10901088108013FE54A054A854B054A454A854B055245D2A6532022202DE0400 +37CD:1040102011FC1104550455FC5504550455FC552055225D146508014401820100 +37CE:2008203C23C02044AA24A928A900A840ABFEA888A908BB90C860005001880604 +37CF:10201020105010885544562254F854085410542055FC5D046504010401FC0104 +37D0:1048104811FE104854485420541055FE5480548054805C806480008000FC0000 +37D1:2020202023FE2020A820ABFEAA02AC04A9F8A810A820BBFEC820002000A00040 +37D2:0100210821083FF800003FF80408FFFE04083FF808001FF8280848088FF80808 +37D3:21842068203020C8AB04A840ABFEA8A0A920ABFCAD24B924C934012800200020 +37D4:0100210821083FF8010002800C603118CFE6004000801FF0101010101FF01010 +37D5:0100210821083FF800000020792048A04A204920483C4BE07820482000200020 +37D6:0100210821083FF800003FF801001FF001007FFC00000820FFFE082010202020 +37D7:01000100410451445554638C41047DF455545554555465944D3441047FFC0004 +37D8:100011FC112411245574552455FC55045574555455545D746504020402140408 +37D9:10881088108813FE5488548857FE540055FC550455045DFC6504010401FC0104 +37DA:10201020FDFC1020302039F85488905010201050118C0100210821083FF80008 +37DB:0100210821083FF8000010881088FBFE108810881CF8F0881088108850F82088 +37DC:0100210821083FF800407C4004FC04847D28402040A87CA404A4052428A01040 +37DD:1040102011FC100055085490540057FE5400540055FC5D046504010401FC0104 +37DE:10481044105E11E054285412546A55965448545E55E05C2464280012006A0186 +37DF:0100210821083FF8000008207FFC0820FFFE10102FC848448FC20810081007F0 +37E0:200023FE2202228AAA52ABFEAA22AA22AAAAAAAAAAAABAFACA020202020A0204 +37E1:0100210821083FF80000111009207FFC0400FFFE10102FE8C82608A0084807F8 +37E2:0100210821083FF802003FF804800840FFFE00101F90109010901F9000500020 +37E3:2104211421142114ABD2A922A92AAB48AB88AD50AD10B914C922017E01220100 +37E4:0100210821083FF800003FF000101FF00010FFFE111009A005401930E50E0200 +37E5:0100210821083FF8040008201FF00210FFFE08A03318CC4603801C3001C03E00 +37E6:010041047FFC00007FFC41043FF801001FF011101FF011101FF00100FFFE0100 +37E7:010041047FFC00003EF822883EF800003FF80000FFFE08000FF0001000A00040 +37E8:102011241124112455FC540057FE5420544055FC55545D54655401540154010C +37E9:00207F20413E7F4448A47F24482845105328614600000100210821083FF80008 +37EA:100011FC1124112455FC5524552455FC540057FE55205D226514014801840102 +37EB:1040108011FC110455FC550455FC5420543257B454A85D286524022404A20040 +37EC:010041047FFC0500397821083D7821083FF801003FF00820044003801C70E00E +37ED:100011FC110411FC551055FE5510554A5586540055FC5D0465FC010401FC0104 +37EE:1040102013FE12025488550456225428542457FE54205C506450008801040202 +37EF:010041047FFC020001007FFE48029FF4282007C01830E00E1FF010101FF01010 +37F0:200023FE22022000A9FCA904A9FCA904A9FCA840A820BBFEC800008801040202 +37F1:2104208420882000ABFEA820A820A9FCA820A820ABFEB800CAA4025204520000 +37F2:100011FE11101120557C5544557C5544557C551055105D546552029202500420 +37F3:200023FE20502050ABFEAA52AA52ABFEA820A820ABFEB870C8A8012406220020 +37F4:2020204023FC2224AA24ABFCAA24AA44ABFCA840A8A8B8B4C93C01220222041E +37F5:0100210821083FF800003FF824483FF800007FFC010011F811001100FFFE0000 +37F6:010041047FFC00003FFC2080210027F0241027F0241027F0408044908A881104 +37F7:1088108813FE1088542054505488550456FA540054005DFC6504010401FC0104 +37F8:2020204021FC2104A9FCA904A9FCA840ABFEA888A924BA22CDFC002000200020 +37F9:20103F202ACE2AAAAEAAAAAAAAAAAEAAAAAAAAAAABEABEACDA28024802480288 +37FA:010041047FFC01003FF82108FFFE21083FF811101FF00400FFFE082007C07838 +37FB:08047F7808407F40497E7F4849487F4808487F4808880100210821083FF80008 +37FC:0100210821083FF8082008207F3E08443EA40824FF2810281E1022284A448482 +37FD:100013FE105011FC5554555455FC540055FC540057FE5C2064A8012402A20040 +37FE:101011FE1110117C551455FE5514557C5510557C55545D7C6554027C0254044C +37FF:2088208823FE2088A824ABFEA850A888A904AA8AA888BBFEC888008801080208 +3800:04001FF010101FF010101FF010001FFC10001FFC4924849C0100210821083FF8 +3801:2040208821FC2108AA52ABFEA850A988AE26A8C0AB10B864CB88003000C00700 +3802:21082108210827D0A91EAF94A924AFD4AA14ABD4AA54BA48CA4804D404240842 +3803:2040202023FE2088A850ABFEAA22AAFAAA22AAFAAA8ABA8ACAFA0202020A0204 +3804:0100210821083FF800007EFC22441A3462C404001FF010101FF010101FF01010 +3805:010041047FFC020013FC240043F88A0813F8320853F8910013F8151010E0171C +3806:200023DE22522252ABDEA800A9FCA924A9FCA924A9FCB820CBFE002000200020 +3807:0100210821083FF820501048FE4801FE7C5044507C501050545052929292310E +3808:200023DE225223DEAA52ABDEAA02AAFAAA22AA72AA22BA22CAFA0202020A0204 +3809:102011FC1088105055FE540055FC552455FC552455FC5C2065FC002003FE0000 +380A:2040207C204023FEAA42AA78ABC4AA3CAA00AA50AA54BB54C4D8045009FE0000 +380B:21083FF800001FF010107FFC44447C7C00003FF80000FFFE10001FF800080070 +380C:0100210821083FF800202220FFBE22423E9422103E102210FFA8242842448282 +380D:010041047FFC08801FFC30805FF890801FF810801FFC11007FFC05401930E10E +380E:20A0209021FE2320A9FCA920A9FCA920A9FEA900A820BBFEC87000A803260020 +380F:108813FE1088100055FC54A854A857FE54A854A855FC5C2063FE002000200020 +3810:010041047FFC000000701F800200FFFE082037D8C4463FF8200827C8244827D8 +3811:0100210821083FF800003FF824483FF802807EFC02803EF802807EFC02800280 +3812:20022FE222822FEAAAAAAAAAAFEAA80AABCAA80AAFEAB90AC5420522092A0304 +3813:208823FE208823FEAA02A9FCA800ABFEA840A8A2AB54B8B8CB54009203500020 +3814:0100210821083FF800403E2022FC22883E5021FE20203E2052FC52209E201220 +3815:010041047FFC004078804BF8524863F852484BF8484868B450BC41224222441E +3816:41047FFC08207FFC01003FF80100FFFE02403C500848FFFE08507E240854198C +3817:2040208023FE2222AAAAAA22ABFEAA72AAAAAA02A820BBFEC850008801040602 +3818:0100210821083FF80A0033B822083A38238820883AB82288FFFE082010102008 +3819:202023FE200021FCA904A9FCA800ABFEAA02A9FCA840BBA4C8D8033400D20330 +381A:2144214425542364A94EABE4A804AA2CA944ABE4A884BBE4C88400E407140008 +381B:108813FE10A8109055FE572055FC552055FC552055FE5D0063FC00880070038E +381C:220022BE23022254A9C8A83EAA0AABCAAD28A928AFEEB928CAA80258044E0080 +381D:108811DC108813DE54885554562255FC550455FC55045DFC650401FC00880104 +381E:22204AA08ABE1FC420A46F24A0282FA82210272822442F820100210821083FF8 +381F:10501190109E13EA548A55D2568A54A45450548857265CA8647000A801240060 +3820:2040207C204023FCAA44ABF0AA44AAFCAAA8AAF8AAA8BAF8CA0005FC05540BFE +3821:202023FE200023FCAA20ABF8AA20ABF8AA20ABFEA802BAAAC854018806A400C2 +3822:21083FF802001FF011101FF012101FF004A808BA3082C27E01007FFC0C48763E +3823:200023FE222222CCAA44ABEEAA44AAEEAB54AA44AA10BA90CA9E049004900BFE +3824:202023FE200021DCA954A9DCA888ABFEA888ABFEA888BBFEC894018802A400C2 +3825:27FC244427FC2444AFFCA800AFBEAAAAAFBEAAAAAFBEB840C84007FC00400FFE +3826:20A821FC22AA23FEAAAAABFEAAAAABFEA800ABFEA800B9FCC90401FC008803FE +3827:202023FE224823FEAA48AAECAB5AAA48AA50ABDEAA50BBDCCA5005DE04500850 +3828:2154212423DE2154ABAEAD54AFFEAC92AFFEAA44ABDEBA44CBD4020C0284034C +3829:0080008021402220241020003FFC0000092009200920112011222122411E8000 +382A:00007FFC0100010001000100010001F8010001000100010001000100FFFE0000 +382B:00007DF01110119011521D12E20E440001003FF80100FFFE028004401830600C +382C:00007CF81088108810881CF8E00041003FF801000100FFFE028004401830E00E +382D:00007C7C1010101010101010FEFE000000007C7C1010101010101E10F0FE4000 +382E:220014007F7C141055103610FF9000103E10221022103E10221022103EFE2200 +382F:00001FF01010101010101FF01000100010001FF81008100810081FF810080000 +3830:10007E7C124412441244227C4A4484001FF0001000101FF01000100410040FFC +3831:3FF000103FF020041FFC08207FFC08200FE008200FE00820FFFE082010102008 +3832:0840084008407F4249444948495049604940494049404B4208420842083E0800 +3833:060001000280044008203118C10601001FF01110111011101150112001000100 +3834:1000100011FC7C24542454A454A454A45524542454245C441044108411141208 +3835:02000100FFFE1000100010001FF8010001003FF8210821082128211001000100 +3836:1020102010407CF854885488548854885488548854885C8A108A110A11061200 +3837:100013FC10847C8854885490549C54845544554455285D281210122814441182 +3838:1020102010207C2055FC54205420542057FE542054505C501088108811041202 +3839:1020102010507C5054885504560254885488548854885C881088110811081208 +383A:1020102010207CA854A454A2552255205624542454285C081010102010C01300 +383B:020002083FD002200240FFFE010002800C801FF82888488888A8089000800080 +383C:1004100E10F07C805480548054FE54885488548854885C881088110811081208 +383D:10401040107C7C8455885650542054505488570654605C10100810C010201010 +383E:10001EF8228862A894920882307EC10001003FF8210821082128211001000100 +383F:0880088828902EA028C028842E84F17C01003FF8210821082128211001000100 +3840:0100210811080910092001007FFC410441044384454449244104410441144008 +3841:1020102013FE7C505488550456FA540057FE544054805DFC1004100410281010 +3842:00047FA410243F2451240A040C043114C1083FF8210821082128211001000100 +3843:1010111011107D285544550055FE540054A854A854A85CA810A810AA112A1206 +3844:1040104010807CFE5502560255F25512551255F255125D1211F2100210141008 +3845:10201020107C7C8455485430542054485590543E54425DA41018101010601180 +3846:1080104013FC7D005500550055F854005550555055505D50125012521452180E +3847:100013FE11207D28552855E855285528552855E855285D2A113A13EA10261020 +3848:1080108010F87D08561055FC55245524552455FC54505C50109010921112120E +3849:201023882088F8FEA890AB90AA24AA24AA38AB88A890B89020A420BE22822100 +384A:10401040107C7C8455085600542055CE5502550255CE5D021102110211FE1102 +384B:1020102013FE7C5054885524562255FC552455FC55245DFC10221022101E1000 +384C:100011FE11027D7A5502557A540054FC548454FC54845CFC1084108410941088 +384D:02001FF010101FF010101FF00200FFFE08203118DFF611101150112001000100 +384E:1040104810847DFE542057FE548855245642558854105C621184101810601380 +384F:204020A02110FA08ADF6A800ABC4AA54AA54ABD4AA54BA5423D42244225422C8 +3850:210820882090FBFEA800ABC4AA54AA54ABD4AA54AA54BBD422542244225422C8 +3851:0610381008527E5408901C282A284844088201003FF821082108212821100100 +3852:1008101C11F07D10551055FE5510557C5544557C55445D7C11441244127C1444 +3853:200023FE2222F820ABFEA820A9FCA924A9FCA924A9FCB82023FE202020202020 +3854:00407F40127E0C88FF4819482A504820A850118C01003FF82108212821100100 +3855:1088108813FE7C8854A8542055FC55245524552457FE5C201050108811041202 +3856:1008103C11E07C2057FE542055FC552455FC552455FC5C2011FC102013FE1000 +3857:2004201E23F0FA1EAA10AAFEAA92AA98AAF2AA8EAA80BAB822A824AA254A2A86 +3858:1088105010007DFE545055FC545457FE545455FC54505CD81154125210501050 +3859:1020104011FC7D04555455245554550455FC540055125DD4111811521192110E +385A:1088108813FE7C8855FC548857FE542055FC552455FC5D2413FE110411141108 +385B:1088108813FE7CA8541057FE5480548054FC540054A85CA810A810AA112A1206 +385C:2100211023DCFA54AD54AA88A908AAF4AC02A800ABFCB8402150224825442080 +385D:2020247C2284F948A830A8CEAE10AA7CAA10AA7CAA10BAFE2210221025FE2800 +385E:202021FC2124FBFEA924A9FCA820A9FCA924A9FCA840BBFE208821D02070238C +385F:2090209027FEF890ABFCAA94ABFCAA94ABFCA800A9F8B90821F8210821F82108 +3860:202027A420A8FA92A914AA08ADF4A802ABF8AA08AA08BBF8220821102FFE2000 +3861:200023FE2200FA04ABF4AA04AAEEAAA4AAA4AAECAA04BAA42244227425942008 +3862:21FC210421FCF904A9FCA800ABFEAA52ABFEA800ABFEB88020FC208421142208 +3863:102008207F3E0020223E1402FFBE88A0093E7F20493E49204D3E4A200822081E +3864:205022522154F850ABFEA888A850ABFEA820A9FCA820BBFE20A8212426222020 +3865:203E27C02244F928ABF8A840AFFCA800ABF8A808ABF8B80823F82544252A28FA +3866:1020101011FE7D0254FC54A8553054FC558454FC54845CFC108410FC10481084 +3867:2040202023FEFA8AA904A812ABD4A848AA8AA974AA02B9FC210421FC208823FE +3868:2148214C22AAF808AFFEA948AB68A94AAB6AA94CAB6CB948216A239A20262042 +3869:210447C88812F3BC20084B92F83E0380AAAAABAA01003FF82108212821100100 +386A:203E27C42128FBFEAA02ABFEAAA0AAEEAAAAAAEEABA8BA4622F82548243029CE +386B:100011FC210421FC450445FCF88009FE1222112229524502FDFA440200140008 +386C:1110212045447978111025247D7C05240110FFFE20803E88225222224A5A8586 +386D:441049245E7844104A285F7C40007FFE441049245E7844104A285F7C40007FFE +386E:49204920AABEEBA04940AABCEB802900FFB8240825082508228A528A45868882 +386F:010000803FFE2000201020F827802080208020FE3F802080408240828082007E +3870:010000803FFE2000200027F82080208020803FFE208020804080408082800100 +3871:010000803FFE21002100210023F0221024202820204020C0412042108C083006 +3872:010000803FFE20002090208820FE2F802080208820902060204241A24E1A8006 +3873:010000803FFE2000203C27C024402440244027FE242024202412450A46068402 +3874:010000803FFE2080204020402FFC20002408220822102110412040009FFE0000 +3875:010000803FFE20802140222024902848304627F0201020204340408080400020 +3876:010000803FFE2000200027F8240824082408240827F824084120421084080804 +3877:010000803FFE2000208020802FFC21C022A022A02490288857F4408080800080 +3878:010000803FFE2200220023FE2500290031F82100210021FC4100410081000100 +3879:010000803FFE2000200023F82208220823F82208220823F8420842088FFE0000 +387A:010000803FFE2000200027F82408240827F82408240827F8400040009FFE0000 +387B:010000803FFE20002180263C24A424A424A424A425A426B42528412042208420 +387C:010000803FFE208020802FF828882FF828882FF820842048203041D45E0C8004 +387D:010000803FFE2000204027F820483FFE204827F8204027FC40405FFE80400040 +387E:010000803FFE200027F8240827F8240827F82484248824502420451846068400 +387F:010000803FFE2208210821102FFE204024442444244427FC2084410046009800 +3880:010000803FFE204020402FFE204027FC2444245424E8215042484C4680400040 +3881:010000803FFE208021F022102D2020D023202C7C218426884050406081800E00 +3882:010000803FFE2040208027F82408240827F82400240027FC4404440487FC0404 +3883:010000803FFE2100208027F8240827F8240827F8248224442428451046088406 +3884:010000803FFE200020002FFC200023F822082208220823F82000420841109FFE +3885:010000803FFE200027FC204023F820402FFE211021102FFE2110421042108410 +3886:010000803FFE200027FC2444244427FC2444244427FC204027FC404040408FFE +3887:010000803FFE210020802FFC200027F8200027F8200027F82408440847F88408 +3888:010000803FFE2280224027FE24402C4037FC2440244027FC4440444087FE0400 +3889:010000803FFE2000218C2E70221022103F90261E27702A902A1252124212820E +388A:010000803FFE20802FF82140222024103FFE201027D0245047D0401080500020 +388B:010000803FFE22202278248825502C243448259E242224642598441044608580 +388C:010000803FFE20002EFC2A082AE82CA82AA82AA82AA82AE84EA8480888280810 +388D:010000803FFE200021102FFE2110204023F8224822482FFE20A0411046089806 +388E:010000803FFE2000203827C020402FFE20402140265C2444275C444447FC8404 +388F:010000803FFE204020A023182DF62000278424A427A424A427A4448444948588 +3890:010000803FFE200023F0221023D0225022502FFC280429E4292449E448148808 +3891:00803FFE2280224027FC24402FF8344027F8244027FC248040805FFE80800080 +3892:00803FFE2040207E20402FFE28422BF8284229FE290429FC490451FC910427FE +3893:00803FFE204027FC21102FFE200023F8220823F8220823F840404FFE80400040 +3894:010000803FFE220024482848305422A425002C103490249C44904550863E0400 +3895:010000803FFE22282224257E29482E4822FE254829482F7E42484448887E1040 +3896:010000803FFE200020782F80249022A03FFE2490280837F6449047F0849007F0 +3897:00803FFE203827C020802FFC211027F8391621F020002FFE480249F2891209F6 +3898:010000803FFE221021202FFC21202FF821283FFE21282FF820004A4849249124 +3899:00803FFE251025103FD0253C271422142F942A942F9422144FA4422483541C88 +389A:00803FFE208020F820802FFC28842BF028882BF82A482BF84A4857FC9084230C +389B:00803FFE204020A0211022082DF6200027BC24A424A427BC411042A884440882 +389C:00803FFE22083FFE220823F8200027FC244427FC244427FC40404524850A08FA +389D:010000803FFE24002706293832082F882ABE2F882A9C2FAA4008554895482008 +389E:00807FFE40007E7C52244A1452244FF848884FF848884FF842205FFC44108808 +389F:00000020F82008201020113C2120792009200920492031FC10002C0043FE8000 +38A0:000003FCFA040A0412F4129422947A940AF40A944A04321412082C0043FE8000 +38A1:0440247C24A83D5004287DFE24884448841808200820FFFE0820102020204020 +38A2:082049202A3E7F4841A85D2855105D28424608200820FFFE0820102020204020 +38A3:2420FF20247E7EC482287A104A287AC6040008200820FFFE0820102020204020 +38A4:084008487F4408440840FFFE104010401F401140112021222112410A4A068402 +38A5:00207F28412441245D20413E41E05D205520552055205D2441144114450C4204 +38A6:0020FF2802247A244A207A2E00F0FF2002207A204A204A107A12020A0A060402 +38A7:00007FF0001000103FF0200020003FF800080008FFE800080008000800500020 +38A8:00007DFC0420042004207C20402043FE40207C20042004200420042028201020 +38A9:00407C40048004FC05047E044004410440847C44044404040404040428281010 +38AA:0000F9FC0800080008007BFE40804080410079FC080408040804080450282010 +38AB:0020F8200820082009247924412441244124792409240924092409FC50042000 +38AC:0040F840084008400BFE7840408040904090792009200A480A440C8451FE2082 +38AD:00207C200420043E04207C20402041FC40847C88044804500420045029881606 +38AE:0080F88008FE09000A207920412C417443A47924093409280922090250FE2000 +38AF:0000FBFC0A040A040A047BFC4220422043FE7A200A200A100A120A8A53062202 +38B0:0010F810081009FE09127914411041FC414479440928092809100A2852442482 +38B1:0020F840088809040BFE780240204020412879240A240A220C22082050A02040 +38B2:00007CF804087CF840807CF804080408285010200000FFFE0000082010102008 +38B3:00807C8004FE050006007C1C41E0412041227D24052805100510054829841102 +38B4:00003FF8000800083FF8200020003FFC00043FE42AA424A42B2424A43FE80010 +38B5:0020F8200850088809047A0241FC4000400079FC090409040904090451FC2104 +38B6:0000FBFE08200820084079FC41044104410479FC090409040904090451FC2104 +38B7:00107C920492049204FE7C204020407E40827D42042404280410042028401180 +38B8:0020F7201120113E1144F744844484A48428F7281110111011281148AA844502 +38B9:00407C2005FC040004887C5043FE402040207C2005FC04200420042028201020 +38BA:0040F82009FC08000888785043FE404040407BFE088809880850083050C82304 +38BB:001CF9E0082008200BFE78A84124424240407BFE0888090808D0083050482184 +38BC:00207D2404A404A804207DFC4124412441747DAC052405240524050429141108 +38BD:0000F7EE124212421242F3CE8248824883C8F24E124212E217421042A0544048 +38BE:0000FBFE0850085009FC79544154415441FC7820082009FC0820082053FE2000 +38BF:0080F8BC0884090809FE7B204520417C4190791009FE09100928092851442182 +38C0:0020F8200BFE082009FC790441FC410441FC790409FC09040BFE088851042202 +38C1:0088F8880BFE088808887BFE408041FC43247DFC092409FC092409245124210C +38C2:0000FBFE080009FC0904790441FC400043FE7A8A0A520BFE0A220A22522A2204 +38C3:0200F11E17C212021482F7DE805087908490F79E1482178214821482A4944588 +38C4:0200F97E08400C7C0A4478FC4140467E422078200BFE087008A8092452222020 +38C5:0000FBDE08880AA80BFE798842DA44A641F87908090809F80908090851F82108 +38C6:07FCF24817FC1C4616ECF55486EC855486ECF454140817FC104013F8A0404FFE +38C7:08000FE010201FC000407FFC09003200CC803080CFF80888088808A808900080 +38C8:20203C3C444478780808FEFE5050A8A84848BEBE2A2A2A2A2A2A2E2E08080808 +38C9:000400047F08081008200844080408080810082208420F04F008401000600180 +38CA:040008001FF02820444003801C70E10E0600384001880610382000C007007800 +38CB:11001104110411087FD01122190215041108FFD0112211021104210821104160 +38CC:08000804080408080F900822080208047F08411041224102410441087F104160 +38CD:08000804100422084110FFA2008200047F08411041224102410441087F104160 +38CE:010002001FF010101FF010101FF001001150218846441990062018C007003800 +38CF:08000804FF84140822104122BE8222043E0822103E220802FF84080808100860 +38D0:080010047F0441087F1041227F0208040808E8902D222A024904888828101060 +38D1:02023FC222042F8822903FC222822F8422082F902A822F824A844F888A9009A0 +38D2:410022040004FF888890AAA29C828884FF8800107F2241027F0441087F104160 +38D3:08020DC228443D484490A9423242C404248815107FC20E0215042488C4500420 +38D4:0800080013FE2020482008201020302050209020102010201020102010A01040 +38D5:084008401040204048400FFE10403040504090A010A010901110110812041402 +38D6:08400840104020404BFE0840104030A050A090A0111011101288124814441802 +38D7:08400820102021FC49040904110431FC51049100110011001100120012001400 +38D8:08800880110021FC4A040C0411E431245124912411E411241004100410281010 +38D9:104010402040404097FC144424446444A44427FC244424442444244427FC2404 +38DA:08000BFC120422044AF40A04120432F452949294129412F41204120412141208 +38DB:0840084010A021104A080C0613F83000500093F8120812081208120813F81208 +38DC:100217E22242424A924A124A224A67EAA24A224A224A224A22422442244A2844 +38DD:08280824102420204BFE082011243124512493A8112811101212122A14461082 +38DE:08900890110821484A440C92110833FC509490901090109011121112120E1400 +38DF:08200820102023FE4820082011FC3000500091FC110411041104110411FC1104 +38E0:10401040207C40849588165024206450A488270624602410240820C020202010 +38E1:111011102110421092FE169226926A92A29222FE229222102210221022102210 +38E2:09080888109023FC4824082413FC3220522093FE106210A2112A122414201020 +38E3:10401040204047FE9040145022486248A55428A220A021102110220824042802 +38E4:08500848105E23E44828083210CA370650509048105E13E41028103210CA1706 +38E5:111011102110427C921016102AFE6208A20822FE220822482228220822282210 +38E6:08380BC0104020404FFC095012483486508097FC1110121011A0106010901308 +38E7:11001208244847889108124827C86008A7C8244827C8244827CA244A244A24C6 +38E8:12101210221042109F7E151025106510A57C29442544224422442544257C2844 +38E9:111011102110411097BC111021106338A3B82554255429922110211021102110 +38EA:083C0FC01244212848000BFC1080308057FE910011F812881250142018D81306 +38EB:0808083C11E020204BFE082011FC312451FC912411FC102011FC102013FE1000 +38EC:080009F81108210849F8080017FE310851F8910811F81108113E17C810081008 +38ED:08000888125222224A520A8A120233FE50889144127A10881150102010D81706 +38EE:0820082013FE202048200BFE128A325252FA9222122212FA12221222122A1204 +38EF:08000BFE120222024BFE0A101292325452FE928212FE128212FE1482148A1884 +38F0:081C09E01020212448A80BFE107030A8512492221040102412A2128A14881078 +38F1:08200BFE102021FC48200BFE100031FC510491FC110411FC110411FC10881104 +38F2:121012102A904A909FBE102420546F94A01420142F94288828882F9428942022 +38F3:1100110023FC46A89AA812A827FC62A8A2A822A82FFE200022A8225424542000 +38F4:1110111027FC411091101FFE204067FCA44427FC244427FC2000211022082404 +38F5:10101410227C401090FE1044262862FEA210227C221022FE2210221025FE2800 +38F6:10401FFE200047FC940415F4251467FCA00023F8220823F8220823F820002FFE +38F7:1080104027FC444492A8129424746000A3F822A82FFE200027FC204021402080 +38F8:150815482DA8453E9FA8124824486ABEA30825882988237E25402920251E2200 +38F9:1040102027FE44A894FE1550277C6550A57C2550257E254028A42A8A328A2478 +38FA:0400040004000400251024882444444404000400040004000400040004000400 +38FB:1010082004400280010002800C603018C0060100088848844812481287F00000 +38FC:1000100011FC1044184455445144514491441244104410841084110412281410 +38FD:02000200FFFE042008201C4003800C7070080100088848844812481287F00000 +38FE:100013FC11041144192454A85088508890501050102010201050108811041602 +38FF:10401040108018FC550452045004910410841044104410041004100410281010 +3900:030000802140222024102808300620003FFC0100088848844812481287F00000 +3901:00003FF801000100FFFE0280044008203018C106088848844812481287F00000 +3902:00003FE0082008400C780A081210112020C043308C0E02005104511290120FF0 +3903:10401020102013FE18805480508050FC90841084108410841104110412281410 +3904:10201020102013FE1820542051FC512491241124112411341128102010201020 +3905:7FF80200420042007FFC0480088010842084C07C010008844892481287F00000 +3906:1008101C11E01100190055FC5144514491441128112811101110122812441482 +3907:1010107813C0104018405440504057FE904010A010A010901110110812041402 +3908:1000104010201010189054805080528492821282128214881088108810781000 +3909:100013FC1010191055105110521093FE10301050109011101210141010501020 +390A:1004130810D01020185054885104500090041104108810501020105011881606 +390B:101010901090188855085104520495FA10881088108810881108110812281410 +390C:10881088108810881BFE548850885088908810F8108810881088108810F81088 +390D:00007DFE1040108011FC10041E04E00440280110088848844812481287F00000 +390E:100010007E7C1244124412442244227C4A448400010008844892481287F00000 +390F:1080108010F811081B1054A0504050A093181C0610C010201010118010601010 +3910:0100010001FE010001003FF8200820083FF82008010008844892481287F00000 +3911:10201020102010201BFE54405040508090FC1184128410841084108410FC1084 +3912:10201020102013FE18505450508851249222102011FC10201020102010201020 +3913:10401040104010401BFC544050E050E091501150124815F41842104010401040 +3914:1088108810881908557E53085508914811281128110811081108110811281110 +3915:10201020112411241924552451FC502090201124112411241124112411FC1004 +3916:10401020102013FE1A0254045000500093FE1020102010201020102010A01040 +3917:010001007FFC01003FF80200FFFE082012102208C2261290124822480A000400 +3918:1080108010F811081A10542053FC50049004100411FC10041004100413FC1004 +3919:3FF8200820083FC8204820483FC8200820083FF8010008844892481287F00000 +391A:10801080113C1A0054805080517E930815081108110811081108110811281110 +391B:10801088109C1970551053105510911011FE11101110111011101110117C1100 +391C:202820242024202033FEAA20A224A224A32422A8222822102212242A24462882 +391D:10401020102013FE18405488510453FE909210901090109011121112120E1400 +391E:1040102013FE1A025400503853C090401040107C17C0104010421042103E1000 +391F:044004403FF8244824483FF8244824483FF80100088848844812481287F00000 +3920:7F84082410243F2451240A24040408043014C008010008844892481287F00000 +3921:200420042FC422143214ABD4A254A454A6542554289420942104220424142808 +3922:1040104017FE1080190055FC5304550499FC1104110411FC1104110411141108 +3923:101008207FFC08200820FFFE0820102020204120088848844812481287F00000 +3924:1020102013FE12221A2257FE5222522293FE1020112010A0104010A011181606 +3925:10401020102017FE18405484510853F090221044118816101020105011881604 +3926:204020402FFE3040A840A7FCA444A44427FC2040224021402080214022302C0E +3927:1008101C11E01100190055FE51005100917C1144114411441144127C12441400 +3928:10881088108810881BFE548850885088908817FE100010881084110412021402 +3929:08000FF010202C4003801C70E00E1FF0101010101FF002005104511290120FF0 +392A:0000FFFE100010F83E884288A4A818941084207CC10008844892481287F00000 +392B:040004007FFC08001FF028104FF088100FF0081008500A205104511290120FF0 +392C:1020102011FC18205420502053FE90001020102011FC10201020102013FE1000 +392D:1010107813C01040184057FE50A0511092081516111011101110121012101410 +392E:2200140019FC24204C2014F82420442005FC2800110008844892481287F00000 +392F:100013FE120212521A8A5706520252FA928A128A128A12FA128A1202120A1204 +3930:0900090011FE1280348050FC9080108010FC1080108002005104511290120FF0 +3931:100013FC1000100019F855085108510891F81000110810881090100017FE1000 +3932:010001007FFC11101110292845440280044008203018C106088828A4282447E0 +3933:100013FE10101820546850A453229020100011FC110411041104110411FC1104 +3934:20002FFE248024903490AF90A490A490A49027902490249224D22F92208E2080 +3935:00407E40047E08880E881948E850082008502888130602005104511290120FF0 +3936:10901088108013FE18A054A850B050A490A810B01124112A1132122212DE1400 +3937:1040104010A011101A88544651F050109020104013F812081208120813F81208 +3938:1040104013FC18405440504057FE909012941292149219121110121014501820 +3939:105010481048184057FE504052449164116810D0115012481444104211401080 +393A:208020402FFE22003200AA00A3F8A000A2482248224822482248244A244A2806 +393B:0600387C224432642A5422442A54324804401840610008844892481287F00000 +393C:1110111011101390193C5514511457D4911411141214129417D4122410541088 +393D:1020102013FE182055FC504053FE9048108810FE110811481228140810281010 +393E:100013FE12021252188855045020502093FE1020107010A81124162210201020 +393F:1040108017FE11101A48544653F85248924813F81248124813F810421042103E +3940:1040104013FC1040184055F8510851F8910811F8110811F81108110817FE1000 +3941:010001007FFC01001FF01290129052905FF040007FFC02005104511290120FF0 +3942:100013F8120813F81A0857F8500053FC901017FE101012101110101010501020 +3943:100013DE125212521BDE5652525253DE920212021202120212021202120A1204 +3944:1020102011FC1820542053FE50889144124210F8118812501020105011881606 +3945:101C13E010841A445548511057FE9402100013F81108111010A0104011B0160E +3946:1040104013F81848544857FE5048904813F8144412E811501248144611401080 +3947:10501048105E13E41828543250CA570690501048105E13E41028103210CA1706 +3948:10201020FE3E9220922092FC9A84948410FC1100088848844812481287F00000 +3949:1040102011FC100019085490500053FE9000100011FC11041104110411FC1104 +394A:200027BC24A424A434A4AFBCA4A4A4A4A4A427BC24A424A424A424A42AA4314C +394B:0840082017FE104030A451A89290148810C41082010008844892481287F00000 +394C:1100110011FC1A045484549452A4908417FC108411C412A41494108410A81010 +394D:1108110817FE1108190855F85108510891F81108110817FE1000109011081204 +394E:0C80708011FCFD24322438445444508491041228111008844892481287F00000 +394F:10901090109013FC1A945694529453FC92941294129417FE1000109011081204 +3950:010002800C603018C7C600003EF8228822883EA8009002005104511290120FF0 +3951:00007FFC02001FF010101FF010101FF010107FFE410288844892481287F00000 +3952:1008103C13C010441A2455285100502093FE107010A810A81124122214201020 +3953:1040104013FC18A05510520857FE900813C812481248124813C8100810281010 +3954:1040102013FE1880550453FE500291FC110411FC110411FC1104110411141108 +3955:01000910092012C0043019086914091012A004401830600C01004884481287F2 +3956:00907890490849086A445C524888FDF84808484048244AA24A8A4C8888781800 +3957:11FC1104110411FC1904550451FC5040902013FE108810881050102010D81706 +3958:22002200227E27123212AA52A252AFD2A2522292241225122FA224A2204A2084 +3959:1020102011FC11241924552451FC50209040102010A41282128A128A14781000 +395A:20402140265C3444AC44A75CA444A44427FC244420A020A02110220824042802 +395B:100013FC10081810542053AE52A292AA12A412A413AA103210A0104017FE1000 +395C:100013FE12221BFE562253FE500091FC110411FC110411FC1104110411141108 +395D:2000277E21243124A93CA724A424A43C242427242126217C210421042A042404 +395E:11041088100013FE184054C25122525490981138125410941112161010501020 +395F:110011F8120813F0181057FE50805144966810B01128166810A4112216A01040 +3960:100013FE10221920553C512052FE940011FC110411FC110411FC110411141108 +3961:100013FC120413FC1A00569852E05284927C122013FE127014A815241A221020 +3962:11081088109017FE1890549053FC52949294130C120413FC1204120413FC1204 +3963:020002007FFC0440092037D8C1061FF001000FE001003FF801004884481287F2 +3964:00207E20145008887F442A2249F8880828101020010008844892481287F00000 +3965:11FC1124112411FC1924552451FC5020902013FE1222122A12FA120A12021206 +3966:3FFC20802FF82080249024902AA83144222024103FFE02005104511290120FF0 +3967:100013FE1020104019FC5504510451FC910411FC1104110411FC100010881104 +3968:102010F8FC20242025FC4800282010F82820442081FC02005104511290120FF0 +3969:1040104413F41848545057FE5040908011F81308150811F81108110811F81108 +396A:1020112410A810201BFE54A851245202904017FE108811081190106011981604 +396B:1040102017FE100019F8550851F8500093FC1204120413FC1204120413FC1204 +396C:2080204027FC3208A910A7FEA402A884204027FC210021F82108220822282410 +396D:1020102013FE102019FC544053FE508891241222112410A81124122210A01040 +396E:1080108011FC1244195455F450845128929011FC1244155411F4108411281210 +396F:007C7F80110808903FF80100FFFE00003FF800081FF800083FF8020851249FE4 +3970:10A0132E122212221BAE5622522253FE902013FE110410881050102010D81306 +3971:100013FE122812281AEE5628522852EE9228122812EE12281228122813FE1000 +3972:01007FFC01001FF010101FF010101FF01010FFFE1010200801004884481287F2 +3973:200027FE2420244035FCAD04A5FCA504A5FC2524242024A829242A2230A02040 +3974:2004203E27E0343EAC20A5FEA522A53825E2251E250029782A48324A248A2906 +3975:200027FE240225FA3442ACC2A52AA46AA4B2252A246A24AA2522244227FE2402 +3976:01007FFE44429FF404403FF80440FFFE082012102108C9062828282447E40000 +3977:010000803FFE20402FFE22482248255428A223182C0620804A444A4A920A01F8 +3978:0000FDFC85248524FDFC9124912491FCFD049000902090149552B542CE488438 +3979:1010545038881104FEFA10483848548891281210010008844892481287F00000 +397A:1020102011FC1820542053FE5080910413FE100213FC12941294129417FE1000 +397B:002800243FFE20A02F2422242FA822182B1252AA4A46848201004884481287F2 +397C:200027FC20403278AA40AFFEA100A1FC220023FC200425542554280420282010 +397D:102013FE102019FC542053FE500091FC110411FC110411FC110411FC10881104 +397E:100013FE124812481BFE5648522053FE924012FC13441244127C120013FE1000 +397F:08207F20087E7E4408A4FF2810101E2822444682810008844892481287F00000 +3980:2020247C22843148A830A0CEA610A27C2210227C221022FE2210221025FE2800 +3981:004027FC104013F8024873F8124813F8104017FC284047FE01004884481287F2 +3982:111009203FFC20044FE808200FE001003FF82108211802005104511290120FF0 +3983:1040102013FC18005508509053FE922012A012FC1320122012FC1420142019FE +3984:010000803FFE222022202F7C222027702AA83224208020484A444A1491F00000 +3985:22A822A827FC32A8AAAAA4E6A800A7FC2444204023F822482248224822582040 +3986:1040107C10401BFE5642527853C4923C120812F0132412A815FE142018A01040 +3987:1040102013FE12501A5057FE5252525293FE1200129212D41298149214D2188E +3988:22082110200027FC3040ABF8A040A7FCA00023F822A822A822A822A82FFE2000 +3989:102013FE102019FC540053FE520291FC100011FC110411FC1104108813FE1000 +398A:108813FE1088100019FC54A850A853FE90A810A811FC102013FE102010201020 +398B:2040204027FC3110AA48A446A3F8A05027FC208023F82D0821F8210821F82108 +398C:01F03E0003F03E0003FA7E0201FE0C20703C1DE2F0221C1E01004884481287F2 +398D:100013DE125212521BDE5488505053FE90201124112411FC1024104010801100 +398E:102011FC102413FE182455FC502053FE900011FC112411FC112411FC100013FE +398F:200027BC24A427BC3420ACA4A39CA000A11027FC211021102FFE211022082404 +3990:101417FE10101BD0541053D0501093D0125013D0125013C8124A13CA11861242 +3991:2008278820883110AFDEA494A4A4A79424942794249424C827882C9420A420C2 +3992:100013FE125212521BFE542053FE500091FC100011FC100011FC110411FC1104 +3993:1110111411D212501A7E5550509052A89128114412441482100812A412521452 +3994:3E1022143E1222103EFE00103E2822283E2822443E44228227004884481287F2 +3995:20202720253C254435A8AE10A528A546A53825102550267E2490247C241024FE +3996:2000279E2492279E3492AF9EA442A422A40A25462542255226322402240A2404 +3997:2110211027BC3110ABB8A554A912A00023F8200027FC20402248244429422080 +3998:10207E20423E7E4442A47E241028FF2820103E284244868201004884481287F2 +3999:11FC112411FC192455FC502053FE922A12FA120A1246102010A4128A128A1478 +399A:401020082108F8BE008050142208FA3E22082A487A3C2AA82AA8528841888008 +399B:0A0033B822083BB820883AB82288FFFE082012102108C9062828282447E40000 +399C:210827FE2148222037FEAA20A3FCA220A3FC222023FE220027F8211020E02F1E +399D:3C20D0404DFC3104C9FC150425FCCC5014502492D50E0A0001004884481287F2 +399E:01007FFC01003FF80000FFFE00023FF00100FFFE00107DFC44907D30489487F2 +399F:31FCCB242D2431FCC924152425FCCC2015FC2420D4200BFE01004884481287F2 +39A0:228422842AA426C4329EAFE4A004A454A28C2FE4210427C4210421C42E142008 +39A1:244424E428A83AAAAEEEA4A4AAAAAEEE224220402FFE20E0215022482C462040 +39A2:1108110811EE12941842540053DE525293D2125213D2121A1294135012101010 +39A3:2100479C828017C0203E6788A4882788210827C829082FE821104884481287F2 +39A4:1040FE40107C7C840028FE2082207C5000887D2644107C5445422F4AF2384000 +39A5:20402FFE284227FC3040ABF8A040A7FCA04027FC24A427FC20402524252A28FA +39A6:2000279E2492379EAC92A79EA482A532251225B2251225F224A2252A261A2404 +39A7:2108252827BE294837BEAB18A5AAA946A3F82208220823F82208220823F82208 +39A8:27BC24A427BC24A437BCAC44A5F4A444A5F4255425F4255425F424E42554244C +39A9:201C2EE02A542A283A7CAC10AAFEAA00AAFC2A042A7C2C0428FC2814294A2A38 +39AA:224822E8230836EAAA1CA2E8A208A2E825B428E2200023F8211020E023182C06 +39AB:252827BE294837BEAB18A5AAA946A3FC220423FC220423FC220423FC21082204 +39AC:200027FC24A424A437FCAA10A2A8A4BEAF68223C24A82FBC20282AA82ABE2020 +39AD:27FC20402FFE28423358A840A358A000AEEE2AAA2EEE20002FFE224825542FFE +39AE:0240022003F87E00020003F83E00020002FC7F100120014001840E447034000C +39AF:004800440040FFFE004008400844104422447F28012800120F32F04A40860302 +39B0:225022482248554088C00040FFFE00400040002400280012003200CA03060002 +39B1:004000487F4400440040FFFE0040084408447F440828082A0F12F02A40460082 +39B2:084008487F4408440840FFFE104010441F4411441128112A2112252A42468082 +39B3:084008487F4408440840FFFE0040084408447F440828082A0F12F02A40460082 +39B4:004800440040FFFE20403E404244B4440C443228C1287E124232424A7E864302 +39B5:0828482448247F20482E88F00820FFA418241C282A2829104912882A08460882 +39B6:004800440040FFFE00407F40104422447F4409283E2808120F32F04A00860302 +39B7:0028FC2404246820102EFEF092209224FE2492289228FE109212922A92468682 +39B8:082808240FA408207F2E41F07F2041247F2449280828FF900812082A08460882 +39B9:00207C2844247C2444207C3E01E0FE2440247E28AA282A104A32924A2A864502 +39BA:00287FA440245F20402E7FF055205224592450A842287F9052124A2A82460682 +39BB:0028EF242124A920652EA9F0212010247E24422842287E104212422A7E464282 +39BC:082808247F2410203E2E1070FFA02224412490A8262822103612222A3E462282 +39BD:20142012FC1023FE40107BD04A50CBD278124BD248147AAC4D4A4AAA48165822 +39BE:020001003FFC200420043FFC2080248024F027903C90249244B2440283FE0000 +39BF:020001003FFC200420043FFC208020802FF821C022A022A04490488890840080 +39C0:020001003FFC200420043FFC20002FF022102220233822884450442088D81306 +39C1:010000803FFC20043FFC208020802FFC208020803FFE2100421044088FFC0404 +39C2:020001003FFC200420043FFC200020002FFC288428842FFC488448848FFC0804 +39C3:1004100410841084FE841084108412841C8C30B4D0C410841004100450042004 +39C4:1000100011041104FD0411041104150419043104D1041104110411FC50042000 +39C5:1000100011FC1044FE441044104412441C443044D04410841084110452282410 +39C6:1020102010201020FDFC11241124152419243124D12411341128102050202020 +39C7:1000100011FC1104FD0411041104150419743104D10411041104110451142108 +39C8:100011FC10041004FC0410FC10801480190031FCD00410041004100450282010 +39C9:1100110011FC1200FC0011F8100014001BF83008D0081008100A100A50062002 +39CA:10201020102013FEFC20102011FC152419243124D12411341128102050202020 +39CB:1040104810441044FC4013FE10401440184030A0D0A010901110110852042402 +39CC:1008103C11E01020FC20103C11E014201820303ED3E01020102210225022201E +39CD:10401020102013FEFC801080108014FC18843084D08410841104110452282410 +39CE:100011FE10081088FC881088110815FE18183028D04810881108120850282010 +39CF:200023FC22042204FA94225422242A243254E2542294230422042204A2144208 +39D0:2000200027BC20A4F8A424A422A42AA83128E1282290229024A82828A0444082 +39D1:1020112010A010A0FC2013FE1022142218423052D04A108A1082110252142408 +39D2:20402020202023FEFA022404200028903090E0902088210821082104A2044402 +39D3:1008103C13D01290FE901290129016901A903288D28812C812A414D454922800 +39D4:2028202420242020FBFE222022242A243224E228222822102212242AA4464882 +39D5:20002080231E2252FA52225222522A523252E2D2235A225420902090A1104210 +39D6:1040102011FC1104FD0411FC11001500197C3108D110112011421282527E2400 +39D7:1090109010901290FE9212D4129816901A903290D290129212D21712520E2000 +39D8:088008882E9028E428842E7CF00000E01F0001003FF801007FFC010005000200 +39D9:1000104010201028FC08108814901A9432A2D2A214C210881188128854782000 +39DA:1000100013FC1100FD0011F01110151019903250D2501210121212925312220E +39DB:04402440247C248024902508040800E01F0001003FF801007FFC010005000200 +39DC:100013FE12101210FE1012FE129216921A923292D29A12941210121053FE2000 +39DD:100010007E7C124422442A7C440080E01F0001003FF801007FFC010005000200 +39DE:1008103C11E01020FC2011FE10401440187C30A4D0A811281110122854442082 +39DF:2200217E21402440FA402240204029403140E2402640224022402240A27E4000 +39E0:1020104010881104FBFE1002142018203128D124122412221422102050A02040 +39E1:10201010101013FEFC201042108415F818103022D0C413081010102850C42302 +39E2:200027FC24042444FC44244427FC2C443444E4A42494251426042404A7FC4404 +39E3:10201120112011FCFD201220102013FE187030A8D0A811241124122250202020 +39E4:10401020102013FEFC40108815041BFE3092D0901090109011121112520E2400 +39E5:10201120112011FCFD201220102013FE18903090D0901090111211125212240E +39E6:20802080210021FCFA04240423E42A243224E3E42224222423E42004A0284010 +39E7:1040102013FC1040FC90110813FC100419503150D1501150125012525452280E +39E8:1008101C11E01100FD0011FE11001500197C3144D14411441144127C52442400 +39E9:200027FC24042404F5F42444244425F43554E5542554255425742446A4464842 +39EA:1040104010FC1104FA0811FE1500197C3144D1441154114811421242523E2400 +39EB:100013FE10201020FC4011FC1154155419543154D15411541154114451142108 +39EC:00007DF0111011901D52F20E440000E01F0001003FF801007FFC010005000200 +39ED:7CFC1088109010881E84F094408800E01F0001003FF801007FFC010005000200 +39EE:10001040119C1104FD041104110415DC19043104D1041104110411FC51042000 +39EF:10401040104411F4FC48105013FE104018803184D29814E010821082507E2000 +39F0:1008103C13C01200FE201220122013FE18203020D12811241222142250A02040 +39F1:0808081C147022104110BEFC001000103E1022FE2210221022103E1022500020 +39F2:2080204027FC2404F848204020402BFC30E0E1502150224824442842A0404040 +39F3:1088FD0412FA1C48F0881128321000E01F0001003FF801007FFC010005000200 +39F4:101010D813941094FC9013FE10901494189430D8D398109010AA10CA52862102 +39F5:100013FE10101020FC6810A413221020180031FCD10411041104110451FC2104 +39F6:1040108011F81108FDF8110811FA150A190C33F8D01810281048118856282010 +39F7:100011FC10201020FC2013FE10501488190432FAD48810881088108850F82088 +39F8:1040102013FE1000FDF81108110815F8180033FCD00810301020102050A02040 +39F9:100011FC110411FCFD0411FC100015FE180833FED00811081088100850282010 +39FA:1020102213B410A8FCA8112412A2104019FC3104D10411FC1104110451FC2104 +39FB:100013FE10401080FD441224106812B0193032A8D06810A41122122050A02040 +39FC:1020102013FE1020FC2011FC102014201BFE3040D0A411A81290148850C62080 +39FD:100011FC11041124FD2411FC1124152419743154D15411741104110451FC2104 +39FE:1080108010FC1154FA5410A415241A443094D108104010A412AA128A54782000 +39FF:1088108810881088FD5412221442102018203120D13C112012A01260543E2800 +3A00:103C11E0102013FEFC2011FC14241BFE3024D1FC107010A81124162250202020 +3A01:1040104013FC1040FC4011F8110815F8190831F8D10811F81108110857FE2000 +3A02:1020102013FE1020FDFC112411FC152419FC3020D07010A81124162250202020 +3A03:1040102013FE1000FDFC110411FC140019FC3008D01013FE1020102050A02040 +3A04:200027FC24442444FDF4244424442FFC3404E5F42514251425F42404A4144808 +3A05:1088108813FE1088FCA8102011FC152419243154D14C11841104110451142108 +3A06:2110211021102110F7BC21102110233833B8E5542554299221102110A1104110 +3A07:102049FC212409F871481230144C00E01F0001003FF801007FFC010005000200 +3A08:1040102017FE1108F890106011981E063108D1F8110811F81108110852082408 +3A09:100013FC120413FCFE2013FE1210128A1B063000D3FC120413FC120453FC2204 +3A0A:1040104013FE1080FDFC122015FE100019FC3104D1FC110411FC110451142108 +3A0B:1040104413F41048F85017FE1040188031F8D308150811F81108110851F82108 +3A0C:08007F7808483E4800487F86410082FC3C4408447E2808287F10082828441182 +3A0D:08083EFE08087F4808283E0808287F1000201FC001003FF801007FFC01000300 +3A0E:100013FE10201040FDFC1154115415541954312CD02013FE1050108851042202 +3A0F:1020112411241124FDFC108014801BFE3090D1101152125412A8142858442082 +3A10:2100217C21442244F244267C2A10221032FEE2382254225422942312A2104210 +3A11:1000108812521222FE52128A120217FE18883144D27A10881150102050D82706 +3A12:1020102013FE1050FC88132611FC1420182033FED000102011FC1020502023FE +3A13:1040102013FE1202FC8811041222112019FC3220D02017FE1020102050202020 +3A14:20142012201027FEF410241025D024123412E5D42554254825DA242AA8465082 +3A15:100013F811081110F91C12E412A41A5434A8D10013FC12941294129457FE2000 +3A16:2008200827C82210FA1E24A427D429143114E7D42114210821C82E14A4144022 +3A17:10401040107E1040FBFC100415FC180433FCD0401240127C1240154054FE2800 +3A18:1020102010A410A2FD2A10101460198036FCD08410FC108410FC108450FC2084 +3A19:101E13E011221094FC40108811F0142018C431FED022102013FE105050882306 +3A1A:1090109013FE1090FD0011FC120411E4192431E4D12411E41124100450282010 +3A1B:100013DE125213DEFA5213DE12021A223222D2221252124A128A1202520A2204 +3A1C:1040107C104013FEFA42127813C41A3C3240D22013FE12881250142054582986 +3A1D:100013FE12021202FBFE121012921A5432FED28212FE128212FE1482548A2884 +3A1E:1020102013FE1020FDFC102013FE1440188831F0D02413FE1022112452A22040 +3A1F:1020112411241124FDFC100013FE140019FC3104D10411FC1088105053FE2000 +3A20:100013FE12021000FDFC110411FC150419FC3040D02013FE1000108851042202 +3A21:200027FE240225FAFC4224C2252A2C6A34B2E52A246A24AA25222442A7FE4402 +3A22:21102212245427D8F810201227D22C4E3440E7D22454245827D02452A552448E +3A23:2120211022082486F91023F82008280037BCE08424A4229424A42084A2944108 +3A24:200027FE24502488FDFE269024FC2C9034FCE490249024FE24802400A7FE4000 +3A25:2008210821082208F2BE24AA2F2A212A322AE4AA2FB620A220222AA2AAAA4824 +3A26:10A0109011FE1320FDFC112011FC152019FE3100D3F811081090106051982606 +3A27:10401048108411FEFC2013FE108815041BFE3524D12411FC1124112451FC2104 +3A28:104013BE12121292FE5212AA132410401BFE3222D22213FE1222122253FE2202 +3A29:1040102013FE1202FAEC122412441A4432EED22412A412A4124E1460549E2900 +3A2A:100011FC110411FCFD0411FC1020152418A83020D3FE1090109011125212240E +3A2B:20902290229C22A0FAD02288228828803000E3F822A822A822A822A8AFFE4000 +3A2C:2040204023F82040F7FE200023F822083208E3F820A4212823102D48A1864100 +3A2D:1040102013FC1204FBFC120012F81A8832F8D20013FC132415FC1502590220FE +3A2E:2020224024EC24A4F4A424E424A424A436E4E40C2110211021102112A212440E +3A2F:2200211E27D22012F7D4245427D8201437D2E092211221DA27142110A5104210 +3A30:1040102013FE1088FD241242109015F818083044D0A81190128814A450C22080 +3A31:204020FC21082650F92020C023202FFE3000E3FC200023FC200023FCA20443FC +3A32:2110211027FC2110F840202027FC2C043444E04027FC20E021502248AC464040 +3A33:1040102013FE1202FC2011FC105014881BFE3008D1E8112811E8100850282010 +3A34:2110211021102FDEF12027C0245C27C43448E7C821102FD021222122A11E4100 +3A35:1108109017FE1000FBC4125413D41A5433D4D24412CC100013FC108451142608 +3A36:1040108011FC1104FDFC110411FC150019FE3100D1FE100212AA12AA5202200C +3A37:1088108813FE1088FCF8102011FC152419FC3020D3FE102011FC102053FE2000 +3A38:1040102013FE1242FC28129412AA14CA18F83300D02011241124112451FC2004 +3A39:108813DE108811DCFC8813DE108814001BFC3004D00411FC1004100453FC2004 +3A3A:1088108813FE1088FC8810F814201BFE3222D33212AA137612221222522A2224 +3A3B:08047F7808403E402A7E3E482A48FF4808A81FC001003FF801007FFC01000300 +3A3C:00407CF8554854307DCE54F854887CF800201FC001003FF801007FFC01000300 +3A3D:200427C420042394FA94239420142FD43554E55427D42554254427C4A4544008 +3A3E:2208211027FC2040FBF8204027FC28403020E1C02044276821502248AD464080 +3A3F:2040207C204027FEF442247825C2243E3500E53825A826AA2AA62940B2FE4400 +3A40:2040207C204027FEF442247825C224BE3480E5FC255426D424B4292EAA24504C +3A41:1040102013FE1202FCA0109011FE15201B2031FCD12011FC1120112051FE2100 +3A42:220422042784F494290C27C425643554E7C42546257C27C425442544A44448C4 +3A43:2040202027FE2492FBFC209023FC289037FEE1082204246220102180A0604010 +3A44:10201124112411FCFC0011FC112415FC192431FCD040102412A2128A54782000 +3A45:100013FE105013DEFE52125213DE10501BFE3222D22213FE1222122253FE2202 +3A46:221421122FD22010F07E2790249024903790E12825A825682928214AA54A4286 +3A47:102011FC102413FEFC2411FC14201BFE3000D1FC112411FC112411FC500023FE +3A48:1040102013FE128AFD0411FC14441BFE3044D1FC108011FC1284148450FC2084 +3A49:204020A0211826E6F80023F822082BF83000E7BC208424A4229424A4A2944108 +3A4A:101C13E010441124FC8811FC1154155419FC3008D7FE11081088108850282010 +3A4B:204023F8204827FEF04823F820402554375CE44427FC2444275C2554A5544844 +3A4C:109017FC109413FCFA9013FE11121BFA350ED1F8110811F8110811F850902108 +3A4D:1210121013DE1528FCA4102013FE10201BFE3222D22A127410A8112456222020 +3A4E:20082788248C278AF48827BE200827883488E7882494279424942494A49445A2 +3A4F:100011FC112411ACFD74112411FC142019FC3020D3FE100012A4125254522000 +3A50:2210221023DE2528F8C4204023FC284037FCE0102FFE201022102110A0504020 +3A51:200023F8208027FCF11022082CA620A037BCE0A023B820A027BC20A0A0A040A0 +3A52:2110211027BC2110FBB825542912280033F8E00027FC204022482444A9424080 +3A53:2C7844486C4844867D7800487C301048FCA41FC001003FF801007FFC01000300 +3A54:40004FDC48544854EFD44A944AA64FC06A9CCA944FD44814528852486454C822 +3A55:100011FC102013FEFA2211AC142019AC3050D0C8132610F8100810D050202010 +3A56:100013FE100011FCFD2411FC15241BFE3000D1FC112411FC112411FC500023FE +3A57:244427FC212023FEF6202BFC222023FC3220E3FE220027FC2108211EA2024C1C +3A58:1104108813FE1020FDFC102013FE145419923090D3FE109010D4138A509621A2 +3A59:2080204027FE2512FBFC211027FC291037FEE110224825F428422040A7FC4000 +3A5A:211027FC211027FCF40423F8200027FC3080E14426A8217026A82126A6A04040 +3A5B:27FC244427FCF44425F4255425F43554E5F4244C27FC241427FC2514A4B447FC +3A5C:201027D0251027DEF45027E8250427C43000E3F822A822A822A822A8AFFE4000 +3A5D:204027FE200021F8F90821F820002FFE3402E3F82180264421B82668A1A64E60 +3A5E:2110255425B82910F2A82444200027FC3444E04027FC20E021502248AC464040 +3A5F:1040102013FE1252FDFC105011FC14501BFE3088D12412FA1020112452A22040 +3A60:2080204027FC24A0F7FC24A427FC24003524E5A8253025A4251C2800AAA45452 +3A61:200027FC2100F3F82508210821F83000EFBE2208279E24922CB22492A79E4492 +3A62:210827FE21082000FBFC229422942BFC3028E3FE2220232422A82292A42A48C6 +3A63:27BC24A42294F4A42FFE284227FC3040E3F8224823F8224823F82040A7FC4040 +3A64:214827C8210827D0F55E27E4255427D43554E11427D4220823C82254A55448A2 +3A65:2114211227D22110F1102FFE229026D23292E6D2229426D4228A22CAAF164022 +3A66:10A0109011FE1320FDFC112011FC152019FE3100D3FE1252128A137652522276 +3A67:11FC110411FC1104FDFC108811FC14881BFE3088D12412AA107010A851242060 +3A68:108813DE108811DCFC8813DE108817FC180431FCD00413FC104012A4528A247A +3A69:2400249E25042608F45E245223D2211E3112ED5E25522592295E2920B52C4212 +3A6A:2100213E22082290F4BE2F222122223E34A2EFBE20A220222ABE2A80A8144022 +3A6B:2042239C221023DEFA94229424202BFC3204E3FC220423FC220423FCA1084204 +3A6C:210821CC210A27E8F52E25D8274824CA340AE54C276C2548254A297AA7A64042 +3A6D:22A0244C24A4260CF4A4264C24A42FFE3802E3F02020204027FC2040A1404080 +3A6E:2140226C2244236CFAA423AC22A42FFE3108E2F4244223F8204027FCA04040C0 +3A6F:221023D0241E2FE4F5542FF4254827D431B2E22027C0208827FC2044A3504488 +3A70:211027FE211023F8FA0823F820002FBC34A4E7BC20402FFE21502248AC464040 +3A71:101E13E011221094FBFE125217FE180433C4D27E13C4125413CC128452D42348 +3A72:21102FFE211027BCFCA427BC2140292033FEE22027FC2A2023FC2220A3FE4200 +3A73:2108229423DE26B4FBDE229423DE2A9433DEE21027FC210820902060A1984606 +3A74:27BC24A427BC24A4F7BC24A427BC212033FEE22027FC2A2023FC2220A3FE4200 +3A75:210821EC210A2FEAF9282BC8293E2FE83948EBE82A282B682AA82BF4AAB452A2 +3A76:221023DE25282084F7FE224827FC2C4636ECE55426EC255426EC2444A4544408 +3A77:204027FE249223FCF89023FC20902FFE3108E3FC252221F8212021FEA0024556 +3A78:11FC112411FC1124FBFE12AA17FE1AAA33FED02013FE124210F81150502023FE +3A79:11FC112411FC1124FBFE12AA17FE1AAA33FED00013FE128A10F81088508823FE +3A7A:00100410441044FE4410441044FC774444444444442844285510662844440182 +3A7B:201020107E1042FE84107F1040FC5E44524452445A2854285010942898441182 +3A7C:101010103E1042FEA410181010FC2444C8441F442128D2280C1008283044C182 +3A7D:10101010FE1010FE1010FE1092FC9244FE441044382854289210102810441182 +3A7E:02100F10781008FEFF102A102AFCFF442A442A44FF28082808100E2870442182 +3A7F:1020102020203F3E404480443E4402A40428082810102010212821281F440082 +3A80:00407C401040108010FE11081288FC8810881050105010201050108851042202 +3A81:081008101410141E2210521088FC084400447E44022804280410082808440082 +3A82:201020107F10801E00107E1000FC0044FC440444042805280510032801440082 +3A83:00100010FF90021E02107A104AFC4A444A444A447A284A28021002280A440482 +3A84:282028202820FE3E2A442A44FE44A8A4A828FF28291029102D284A4848848902 +3A85:7FFC01003FF82108228824482118010001FC01003FF00820044003801C70E00E +3A86:021007107810481E481048107EFC484448444844482844284510632849440482 +3A87:0820282028203E3E4844084408447FA414281428141014102528264844848102 +3A88:08100810081E7F10081008FCFF440044084408287F28081008100F28F0444082 +3A89:082008201420223E4144BEC4004400A43E2822282210221022283E4822840102 +3A8A:00107E101210121EFF10121012FC7E44204420447E286228A21022283E442282 +3A8B:00107F1041107F1E41107F1000FC00447F4408440828FFA80810082808440882 +3A8C:0010FC100410681E1010FE1092FC9244FE4492449228FE289210922892448682 +3A8D:082008207F20083E08447F44414482A43C28042808100F107828082828441082 +3A8E:081008100810FF9E08102A102AFC2A445D4488C4082814281210212841448082 +3A8F:101020107F10491E49107F1049FC51447F4424444428FFA80410042804440482 +3A90:081004103F10211E21103F1024FC264425443F44242824284A10492891442082 +3A91:08100810FF90141E2210491088FC7F4449447F4449287F2808100A280C440882 +3A92:101067104110411E7710411041FC7F4414441444142814282510262844448082 +3A93:02100F107810081EFF9008102AFC2A44EBC42A442AA86B28AA10082808440882 +3A94:221022102210221EF790221022FC66447744AAC4AA2832282210222822442282 +3A95:081008100F9E08107F1041FC7F4441447F4449280828FF900810082808440882 +3A96:00107E1002103E1E0210FF9008FC094449442A441C282A28C910092828441082 +3A97:101008107F1E0010221014FCFF44004400443E282228221022103E2822440082 +3A98:082008201420223E4144BEC4084408A47F28492849107F100828144822844102 +3A99:00207F204920493E7F44494449447FA40828FF281C102A104928884808840902 +3A9A:242024207E20243E2444FF4400447EA4422842287E10421042287E4842840102 +3A9B:22102210FF10221E3E1022103EFC22442244FF4440285428621040287E440082 +3A9C:101092109210921EFE100010FEFC10442044FE44AA28AA28AA10AA28AA448682 +3A9D:08100810FF90081E7F1049106BFC5D4449447F4408281C282A10492888440882 +3A9E:0010FF108110BD1E8110BD1081FC00447E4442447E2842287E1042287E444282 +3A9F:10200820FF20003E3E4422443E4400A47F28412841107F10412841487F844102 +3AA0:441028100010FF1E2810FE102AFCFF442A44FE4428286C28AA10292828442882 +3AA1:101008107F10411E08103E1008FC3E4408447F4408283E28221022283E442282 +3AA2:28104B104910491E6B10491049FC7F4408447F44012832280C10122861440082 +3AA3:102008207F20003E3E4422443E4400A47F2841285D1055105D28412845444282 +3AA4:00207F2049207F3E49447F442A442AA4FFA82A282A107F100828FFA808440882 +3AA5:10101E1010107F1E51105C1072FC4E4440445F4451285F2851105F285144BF82 +3AA6:10200820FF20813E00447E4408447EA44A287E284A107E100028244842848102 +3AA7:0810141022105D1E80903E1022FC3E4400447744112855283310552811443382 +3AA8:22101410FF9E08107F1008FCFFC449442A44FFA800287F10411041287F444182 +3AA9:04083F8804887FEE04883F88043C555475D444547FD4444875C8555455548462 +3AAA:00107F101010FF9E2210411094FC1444F7C4144477281428F790142814441482 +3AAB:10101F101010FF9E80907F102AFC5544A2447F44A2A83E2822103E2822443E82 +3AAC:0010EE102210AA1E6610AA1000FC24447F44C8447E2848287E1048287F444082 +3AAD:10101F10101EFF109110FCFC9144BF44AA44BE28AA28BE1080107F285544FF82 +3AAE:00087FC80408FFEE84283588041C359400140014EEF4AAA8AAA8AAB4EEF4AAA2 +3AAF:020001007FFC0820044003801C70E10E01001FF801000100FFFE010001000100 +3AB0:020001007FFC0820044003801C70E10E1110092005407FFC054009203118C106 +3AB1:0080208010F80108FE1009FC092449242924112413FE28502850488881040202 +3AB2:00400440024012400840084001FC7E400040004000407FF80008000800080008 +3AB3:0040044002401240084009FC7E400040004000001FF02008200820081FF00000 +3AB4:00107C10009000500010FE9028502810281E29F028102A104C10481080100010 +3AB5:101010109490585010107C9010501010FE1E11F0101010102010201040108010 +3AB6:0010FE101090105020107C9044504410441E7DF04410441044107C1044100010 +3AB7:0010FE10009000507C104490445044107C1E01F04410241028100E10F0104010 +3AB8:22082248FFA8222822083E48222822283E0E22782208FF080008140822084108 +3AB9:08087F484928FFA849087F4808287F28490E7F781008FF08210872080C08F308 +3ABA:08080848FFA80828EB88AAC8EBA8AAA8EB8EAAF8EB8814081208220841088108 +3ABB:210447C88812F3BC20084B92F83E0380AAAAABAA04401240087EFFC000400040 +3ABC:00000004FF78044004407440547E544854485448744854480448048814880908 +3ABD:0000FFFE0000000C7CF04480448044807CFE4488448844887C88450801080208 +3ABE:100010041E78224062409440087E144822484148BE482248224822883E882308 +3ABF:08004904497849407F401040207E48488848494849487F480848108820884108 +3AC0:00007C0444787C4044407C40007EFE4882488248FE4882488248FE8882880108 +3AC1:11009102AABCBBA09120AAA0BBBE8024FFA492249224A1A48024FFC400440084 +3AC2:100008047F784040524052407F7E524852485E48404855485548558880880108 +3AC3:202010201020FF20202020203E202220225022502250225042884A8885040202 +3AC4:02000100FFFE100010003FF8480884087FE810081F8810882088208842A88110 +3AC5:2020102010500088FD04220220F83C00240027FE248824882488448855088A08 +3AC6:202010200050FE50208821043E22242024A824A4252425224622542088A00040 +3AC7:10100810FF2820443E822210220842204A10840800003FF80008000800080008 +3AC8:10100810FF2820443E822210220842204A1084081FF02008200820081FF00000 +3AC9:2040104010FC0104FE0821FE21003D7C254425442554254825424542553E8A00 +3ACA:2100110011FE0200FC0021FE20083C0825E825282528252825E8440854288810 +3ACB:2080108010FE0120FE2021FC21243D2425FC2524252427FE2504450455148908 +3ACC:2080108010FE0100FE00200021FE3C1024102490249C24902490449055FE8800 +3ACD:2100110011FE0200FC902090215E3D6427542554255425482548455455148922 +3ACE:2100110013FEFC0023FE222239FC282029FC292429FC292429FC48205BFE8020 +3ACF:2100110011FE0200FDFC205021FC3D54255425FC244027FE2488459054708B8C +3AD0:00001FF0101010101FF0101010101FF00000203823C03C04200420041FFC0000 +3AD1:004000407C40444045FC444444447C4444444484448444847D04450402280410 +3AD2:00001FF0101010101FF0101010101FF008200820FFFE08200820102020204020 +3AD3:004000407C8044FE4500460044FC7C0844104420444044807D02450200FE0000 +3AD4:00001FF0101010101FF0101010101FF00200020003F8020002000200FFFE0000 +3AD5:00001FF0101010101FF0101010101FF000007FFC04400440084010422042C03E +3AD6:0200020003F802000200FFFE000000001FF0101010101FF0101010101FF01010 +3AD7:00001FF010101FF010101FF000001FE000400180FFFE01000100010005000200 +3AD8:00007FFC010003000570190CE10201001FF0101010101FF0101010101FF01010 +3AD9:002000207C20442045FC442044207C2047FE4420445044507C88448801040202 +3ADA:08001FF82248444808881108222804101FF0101010101FD0101010101FF01010 +3ADB:000001FC7D0445044504450445FC7C5044504450445044927C924512020E0400 +3ADC:000001F8790849084908490879F8490849084908490879F84800000007FE0000 +3ADD:0008003C7BE04A204A204A204A207BFE4A204A104A104A127A0A4A8A03260212 +3ADE:002001247924492449FC482048207BFC49044888488848507820485001880606 +3ADF:000000F87C8844884488448845067E00440044FC448444847C84448400FC0084 +3AE0:002000207D2444A444A8442045FC7C204420442047FE44207C20442000200020 +3AE1:1FF010101FF010101FF008001FF02820444003801C70E30E00C00E0001800040 +3AE2:00200020782049FC4820482048207BFE482048404840488879044BFE01020000 +3AE3:1FF010101FF010101FF001003FF8210821083FF8210821083FFA0102010200FE +3AE4:00001FF010101FF010101FF0010000801F0001047D88095011202118C5060200 +3AE5:004000407CFC45044688445044207C40448045FC468444847C84448400FC0084 +3AE6:0840084010FC10883550542094D8170614F81488148814F81488108810F81088 +3AE7:00001FF010101FF010101FF0111009200100FFFE0380054009203118C1060100 +3AE8:0040002078204BFE4A024C4478404BFE48884888490878D04820005000880304 +3AE9:010001007FFC01000820FFFE082008201FF0101010101FF0101010101FF01010 +3AEA:01007FFC01003FF80200FFFE08203018D3F61210121013F01210121013F01210 +3AEB:00001FF010101FF010101FF000007FFC044004402448144814500440FFFE0000 +3AEC:00800080790049FC4A044C047BE44A244A244BE44A247A244BE4000400280010 +3AED:00001FF010101FF010101FF001003FF80100FFFE00407FFC0840044001400080 +3AEE:088008882E9028E028842E84F07C00001FF0101010101FF0101010101FF01010 +3AEF:1FF010101FF010101FF000003FF820083FF820083FF800007FFC04401842E03E +3AF0:008000407BF84A084A084BF84A087A084BF84A404A444A287A104A8803060200 +3AF1:00001FF010101FF010101FF001003FF80100FFFE044024484444884211402080 +3AF2:002000207BFE482048204BFE7A024C0449F8481048207BFE4820002000A00040 +3AF3:00003FFC20002FF820003FFC24482530260E20002FF828084FF848088FF80808 +3AF4:004000447BF4484848484FFE782048404BF849104A207DFE4820002000A00040 +3AF5:0090009078904F9E4890489048907B9C4890489048904F9E7890489000900090 +3AF6:000001FC780448FC480449FC78004BFE4A22482049FC79244924013401280020 +3AF7:08207FFC08200FE008200FE00820FFFE10102008DFF610101FF010101FF01010 +3AF8:00400040F7FE904093F8904897FEF04893F890409240927CF240954004FE0800 +3AF9:1FF010101FF010101FF00000061838E020803E8022FC3E902090209040908110 +3AFA:08200820082014502288492408201450228841061FF010101FF010101FF01010 +3AFB:00400040F0A0911092089DF69000F7FC94A494A497FC94A4F4A494A404140408 +3AFC:008200827A824BEA4C8A488A4FFA788A4BEA4AAA4AAA4AAA7AA24AE2008A0084 +3AFD:000001F87808480849F8480848087BFE48204A22497448A879244A2200A00040 +3AFE:0020012478A448A848204BFE4A027A024AFA4A8A4A8A4A8A7AFA4A02020A0204 +3AFF:00A00090788049FE49104B104DFC7910491049FC49104910791049FE01000100 +3B00:004000207BFE480049FC490479FC480049FC480848107BFE4820002000A00040 +3B01:00001FF010101FF010101FF0204010A0811042E8140623F8E208220823F82208 +3B02:01FC0124792449FC4924492479FC482048204BFE4A227A2A4AFA020A02020206 +3B03:3FF820083FF820083FF8100020087FFC00043FF820083FF8110822900C60F01E +3B04:1FF010101FF010101FF000003FFC20802FF820803FFC22204A285424A4A20840 +3B05:3FF820083FF820083FF800007FFC44447FFC0000FFFE08000FF810082028C010 +3B06:000003FC7A044BFC4A204BFE4A107A8A4B0648004BFC4A047BFC4A0403FC0204 +3B07:0080008078F849084A104DFC79244924492449244BFE78504850008801040602 +3B08:000001F87908490849F84908790849F848004BFC4A947A944A94029407FE0000 +3B09:000003FE7820484049FC4954795449544954492C48207BFE4850008801040202 +3B0A:1FF010101FF010101FF000FC7F0811103FF80200FFFE080017F02220C1C00E3C +3B0B:008000BC7884490849FE4B204D20797C4990491049FE49107928492801440182 +3B0C:1FF010101FF010101FF00100FFFE00001FF010101FF010101FF0092011102308 +3B0D:002800247BFE482049FC492479FC492449FC492448087BFE4888004800480018 +3B0E:00001FF010101FF010101FF0082012483CF0082014503EF80000248822444244 +3B0F:000003FE780049FC4904490479FC48004BFE4A8A4A527BFE4A220222022A0204 +3B10:000003FC78904A94499848904FFE780049F84908490849F87908490801F80108 +3B11:0200011EF7D2901297D4945497D8F01497D29092911291DAF714911005100210 +3B12:008800887BFE488848244BFE7850488849044A8A48887BFE4888008801080208 +3B13:000003FE785049FC4954495449FC780049FC48004BFE482078A8492402A20040 +3B14:000007BCF08494A4929494A49050F188962690C093109064F388903000C00700 +3B15:022201127914483E4F8848884908793E4B884D484908493E7908490801080108 +3B16:02100110F79E94A494D497949408F4149462980093F89208F208920803F80208 +3B17:0110011479D24A504A7E4D5048907AA8492849444A444C8278084AA402520452 +3B18:002001FC78244BFE482449FC48207AAA4BAE4A224BFE4A227BAE4AAA02AA0422 +3B19:000E03F078444A2449084BF87A084BFC4A044BFE4A027AAA4AAA050204140808 +3B1A:02080108F7C89210949E9FD49064F7949494979494949788F488949404A405C2 +3B1B:004000A0F11896E6900093F89208F3F8900097BC908494A4F29494A402940108 +3B1C:0000FEFE20204444FEFE12127C7C10101EFEE0001FF010101FF010101FF01010 +3B1D:0104008878004BFE4A224AAA4A727A224BFE480049FC490479FC490401FC0104 +3B1E:002002227BFE480049FC490449FC790449FC488049FE4A227D52490201FA0006 +3B1F:4044402440287EFEAA922AD62ABA4A924AFE9200127C2244227C4244947C0844 +3B20:02100210F3D0945E98A493D49054F05493C89048905497E2F00092A402520452 +3B21:000001FC78204BFE4A2249AC782049AC485048C84B2678F8480800D000200010 +3B22:010400887BFE482049FC48207BFE4854499248904BFE789048D4038A009601A2 +3B23:02840284FAA496C4929E97C49004F454928C97C4910497C4F10491C40E140008 +3B24:000003FE7A024BFE4A024BFE79084A524B9C49084A527BDE480002A402520452 +3B25:3FF820083FF820083FF811101FF041047FFC0200FFFE09203558DFF605400920 +3B26:008803FE78A8489049FE4B2079FC492049FC492049FE79004BFC00880070038E +3B27:3FF820083FF820083FF811101FF00100FFFE0A203458CF8601201FF009501320 +3B28:01100110F11097BC911091109FFEF2A892A896EC9AAA92AAF2A895A804480898 +3B29:008803DE788849DC48884BDE48887BFC480449FC48044BFC78404AA4028A047A +3B2A:0FE008200FE008200FE07C7C44447C7C4544FFFE88020FF010101FE00020FFFE +3B2B:0440FFFE044017D2F01C17D03452D7CE0000444482221FF010101FF010101FF0 +3B2C:07BC04A4F7BC94A497BC94A497BCF12093FE922097FC9A20F3FC922003FE0200 +3B2D:001E03E0792248944BFE4A527BFE48044BC44A7E4BC47A544BCC028402D40348 +3B2E:3FF820083FF820083FF84450FE4844FE7D9010FCFE9092FCFE901090FEFE2880 +3B2F:00803FFE0800EFF8A000AFF8A808EFF8A220BD5CB7F4BC94F5DC1C9617F62CA2 +3B30:0100010001003FF8210821083FF8210821083FF801000280044008203018C006 +3B31:28503E7C4890FEFE14281528264A44861FF0101010101FF0101010101FF01010 +3B32:00887C50100011FC7C50548855047DFC555455547D5493FE600020005FFE8000 +3B33:00803C80248025FC25203E202420242027FE3C20242024202420442054208820 +3B34:00907890489048904BFC78904890489048907BFE480048904888490849049A04 +3B35:00403C20242025FE24003C882504260224883C88245024502420445054888B06 +3B36:00207920492049FC49207A2048204BFE4800780049FC49044904490449FC9904 +3B37:00007BFE4A224A224A227BFE4A224A624A727AAA4B224A224A224A024BFE9A02 +3B38:00883C8825FE248824883C502450249425943E98249024B224D24492548E8880 +3B39:00803C8024F8250826103DFC2424242425FE3C24242425FC2424442054A08840 +3B3A:0020792448A849FC48407BFE49084A244C2279FC492449244934492848209820 +3B3B:008878884BFE48A848107BFE4880488048FC780048A848A848A848AA492A9A06 +3B3C:104010407EFE108021FC3E8424FC6484BCFC2440247C3CC42528241024682D86 +3B3D:00003CF8248824F824003DDC255425DC24003DFE248024FC2404440454288810 +3B3E:7F7848485F4C64805F784A4851307F4C00001FF010101FF010101FF010101070 +3B3F:010878884BC848104BDE7A644BD448144BD47854489448E84B8848944A949922 +3B40:0110791049DE4AA84C4478004BFC48204928792849284AB44C6248204BFE9800 +3B41:1000100013F81088FC90109030A038BC54845484910411041104120412281410 +3B42:1020102010201020FC2010A830A438A455225122922210201020102010A01040 +3B43:1020102010401040FC84108431083BF855105410902010401088110413FE1102 +3B44:100013F010901090FC90109030903BF05490549090901092108A108A10861082 +3B45:1000100013FC1000FC001000300039F85400540090001000100017FE10001000 +3B46:00003FE00420047C08043014C10801007FFC01003FF8054009203118C1060100 +3B47:1040104010801088FD0413FE30023890549054909090109011121112120E1400 +3B48:10401040104013F8FC4810483048384857FE544090A010A01110111012081406 +3B49:08200820FFFE08200920010001007FFC03800540092011102108C10601000100 +3B4A:1010111011101110FD1011FE31003900550055F8910811081108120812081408 +3B4B:10201020102013FEFC201020302039FC54205420902013FE1020102010201020 +3B4C:1020102011201120FDFC112032203820542053FE902010201020102010201020 +3B4D:40802080089C17E0E08020842084207C01000100FFFE054009203118C1060100 +3B4E:100013FC12041204FE94125432243A2456545254929413041204120412141208 +3B4F:10201020102011FEFC20102030FC3820542055FE90221022102A102410201020 +3B50:020002007FFC044008203018C10601007FFC01003FF8054009203118C1060100 +3B51:10201020102011FCFC20102030203BFE547054A890A811241124122210201020 +3B52:100011F811081108FD08110831F83900550055FC910411041104110411FC1104 +3B53:1020102010401088FD0413FE30023888548853FE908810881108110812081408 +3B54:1008103C13E01020FD2410A430A8382057FE5420902010201020102010A01040 +3B55:10201020102011FCFC20102030203BFE5420544090401088110413FE11021000 +3B56:10A010A810A41124FD20133E3BE03520512051209120112011141114110C1104 +3B57:010001007FFC0380054009203118C10600003FF82448244824482448FFFE0000 +3B58:1020102010501088FD04120231FC3800540055FC910411041104110411FC1104 +3B59:10201020102011FCFC20102033FE3808540855FE900810881048100810281010 +3B5A:1080108010FE1100FE00101C31E0392055225524912811101110114811841102 +3B5B:1004101E11E01100FD0611783150395055525554914811481144125412621440 +3B5C:1028102410241020FBFE102031243924552453A8912811101212122A14461082 +3B5D:082008207EFC08201C702AA8C826020002001FE00420042008221022201E4000 +3B5E:1020102011241122FA2A101030603B805440504093FC10441084108411141208 +3B5F:044004403FF8044004400440FFFE08203118C1061FF0030005C0193061080100 +3B60:10201120112011FCFD20122030203BFE5490549090901090111211121212140E +3B61:10201020104011FCFD0411043194395455245524915411941104110411FC1104 +3B62:200427C422842294FA942294229477D46A94A294A29422942284248424942888 +3B63:1100108010BC1204FE0412F432943A945694529492F412941204120412141208 +3B64:1020104011FC1104FD4411243124390C550055FE9002100213FA100210141008 +3B65:1040104010F81088FD1013FC3104392455245124912411241050108811041202 +3B66:1040102013FE1202FC00103833C038405440507C93C0104010421042103E1000 +3B67:020004001FF011101090FFFE101012102150402001007FFC05401930E10E0100 +3B68:200027DE20922492FC94249427D870946992A192A292229A2494289022902110 +3B69:1004101E11E01022FD1210943080380855FE5408908810481048100810281010 +3B6A:1028102413FE1020FC2011FC3124392455FC5524912411FC112411241124110C +3B6B:1020102010A810A8FCA8117432223820542055FC902010201020102013FE1000 +3B6C:100013FE10401080FD441224306838B055305228906810A41122122010A01040 +3B6D:200223E22222222AFA2A23EA210A710A6BEAA12AA12A212A2222222224AA2844 +3B6E:2124212422482248F9242124200077FE6880A1FCA10422882450202020C02700 +3B6F:100013FE11201128FD2811E831283928552855E89128112A113A13EA10261020 +3B70:088028882EF028842E84F17C0100FFFE01003FF821082388255809201110610C +3B71:100011FE1100117CFD541154317C39545554557C911011101110110011FE1000 +3B72:1000105010481084FD24102030503888550652F8908810881088108810F81088 +3B73:1020102211FA1024FC2413FE3010382055FC5488911012FE1410101010501020 +3B74:108012FC12A412A4FEA8129032A838C65420542091FC10201020102013FE1000 +3B75:1100110011FC1204FA0415F43154395455F45154915411F41114100410281010 +3B76:1104110417FE1104FD44102037FE3880548054FC908410841104110412141408 +3B77:11FC1124112411FCFD24112431FC3840544053FE904210821082110212141408 +3B78:1080108010F81108FA1011FC31243924552451FC90501058109410921112120E +3B79:10101388108810FEFC90139032243A24563853889090109010A410BE12821100 +3B7A:1020102013FE1050FC881124322239FC552455FC912411FC10221022101E1000 +3B7B:1020112410A410A8FC2013FE32023A0256FA528A928A128A12FA1202120A1204 +3B7C:1020102213B410A8FCA8112432A2384055FC5504910411FC1104110411FC1104 +3B7D:1040102013FE1200FE1C12F032903A9056FE52909290129012AA12CA14A61812 +3B7E:100013FE12021202FBFE121032923A92569252FE921012921292149214FE1802 +3B7F:200023FC220423FCFA0423FC200071806E3EA422A422242225A2262A24242020 +3B80:100011FC10081010FA2212AA32723A22567252AA932612A21242120213FE1002 +3B81:11841068103010C8FB24102033FE384054FC518492FC108410FC108410941088 +3B82:1FF010101FF010101FF010101FF01010FFFE08203118C1061FF0054009201110 +3B83:101C11E010201020FBFE10A831243A42544053FE9088110810D0103010481184 +3B84:1040102013FE1080FC8011FE31423A2255FA508290F2109211121152122A1004 +3B85:010001007FFC054009203118C90608801FFC30805FF890801FF810801FFC1000 +3B86:1020102010501088FD04128A305039FC542054F8902013FE1020102010201020 +3B87:100013FC10401040FBFE10A031103A0854465040904812641252145211401080 +3B88:1020102013FE1050FC88110432FA3800540053FE902011241122122210A01040 +3B89:211021102110227CFA10269236546A1062FEA210A22822282228224422442282 +3B8A:200827C820482288F93E208827D8715C692CA12AA14821082108210825082208 +3B8B:2100211E27F22112FA1423D4225876546BD2A252A25223DA22542250225022D0 +3B8C:100017FE10401080FBFC129432943AF45694529492F412941294129413FC1204 +3B8D:0820FFFE00003E0822483E4822483E482208261801007FFC05401930E10E0100 +3B8E:100013FE10101020FC6810A433223820540051FC915411541154115417FE1000 +3B8F:2040204027FC20E0F95022482C4673F86800A000A7FC20402248244429422080 +3B90:1020102010A410A2FD2A10103860358056FC508490FC108410FC108410FC1084 +3B91:1008103C11E01020FC2013FE302038A0552C5524912411AC1124112411FC1104 +3B92:100013FE10501050FDFC11543154395455FC5420902011FC1020102013FE1000 +3B93:1100117E11101110FD90115E3B22352A512651429152110C11041104117E1100 +3B94:1008103C11E01020FBFE102031FC392455FC512491FC102011FC102013FE1000 +3B95:100013FE10201040FDFC1154315439545554552C902013FE1050108811041202 +3B96:1088108813FE1088FCF8102031FC3924552455FC902013FE1020102010201020 +3B97:00207E20145008887F442A2249F888082810102001007FFC05401930E10E0100 +3B98:2008278820882290F91E211427E471546B14A314A51425082908211425242242 +3B99:100013DE12521252FBDE100031FC380057FE5080910011FC1004100410281010 +3B9A:010001F801003FF8210822C82D28228824483FF801007FFC05401930E10E0100 +3B9B:100011FC11041104FDFC1104310439FC540053FE90201120113C112012A0147E +3B9C:100013FE12001224FAA412A432E43A3E57E452A492A412A4132E120013FE1000 +3B9D:2000229E22522252F5522112229272526C32A3D2A25A22542250225023D02250 +3B9E:1020112010BE1042FC841310311039285544548290FC10841084108410FC1084 +3B9F:2008200827E82108F93E220823D8765C6A6CA26AA248224823C8224820082008 +3BA0:1088108813FE1088FC0013FE3A023424502053FE907010A810A8112412221020 +3BA1:080008FC2A802CF8488808F8148022FC40000100FFFE054009203118C1060100 +3BA2:108010BC10841108FDFE13203520397C5590511091FE11101128112811441182 +3BA3:00007DFC44207D2045FE7C5048525492650E0100FFFE054009203118C1060100 +3BA4:020001007FFC49241290244818306FEC082008200FE001007FFC05401930E10E +3BA5:10401048108411FEFC2013FE3888350453FE5524912411FC1124112411FC1104 +3BA6:1020102013FE1020FBFE1242348C39F05420504493FE10221128122414A41040 +3BA7:1040108011FC1104FD0411FC310039FE550055FE900212AA12AA140210141008 +3BA8:100011FC112411FCFD2411FC38883544524250F8918812501020105011881606 +3BA9:1020104011FC1104FDFC110431FC390455FC5440902010A4128A128A14781000 +3BAA:100013B811281128FD3A11AA37263A405420502093FE107010A8112412221020 +3BAB:1040102013FE1202FC2411FC382035FC502053FE902011FC1104110411FC1104 +3BAC:1090108811041242FC8811FC3804340053DE50429252114A12521042114A1084 +3BAD:100013FC100810D0FC2013FE328A3A5256FA5222922213FE1222122213FE1202 +3BAE:108013DE108A11CAFC8A13D230A6380854F0542091FC102013FE102010A01040 +3BAF:200027FE240225FAFC4224C2252A746A6CB2A52AA46A24AA2522244227FE2402 +3BB0:1020104011FC1104FD5411243154390455FC5400911211D4111811521192110E +3BB1:1088108813FE1088FC2010A038FC3520502053FE90501050109010921112120E +3BB2:1080108011FC1244FD5411F438843528529051FC9244155411F4108411281210 +3BB3:2044272425282500FD7C2710251075106DFEA710A5102528252825442B442082 +3BB4:10A0112C11241124FDAC1124312439FC542055FC908810501020105010881306 +3BB5:22202120213E27A0FA40223C23A472B46AACA2A4A2FE22A424A424A429A4304C +3BB6:2440225E22922012F7D2211E255275526D52A7DEA152211222122222242A2844 +3BB7:1050104813FC10A0FD22121E311039E0550454FC900011FC110411FC110411FC +3BB8:1044102412281100FD7C101030103B7E551051109128112411441280147E1000 +3BB9:2008200827C82210FA1E24A427D471146914A7D4A114210821C82E1424142022 +3BBA:010001007FFC03800540092037D8C10600007BBC4AA44AA44AA44AA47BBC4AA4 +3BBB:100011FC10A41088FC50102030D83B26542051FC9124112411FC102213FE1002 +3BBC:1040102013FC1204FA0413FC32003BDC5644535492CC124412CC1554144418CC +3BBD:2100223C27A424A4F6A425A424C27F806CBCA4A4A6A425A424942488249429A2 +3BBE:10007E7C42447E7C42447E7C484444445A94610801007FFC05401930E10E0100 +3BBF:100011FC112411FCFD2411FC30A838A857FE54A890A811FC102013FE10201020 +3BC0:22102110211027BEFA40220023BE728A6A88A2A8A2AE22A824A825A8285E3080 +3BC1:20202710257C2500FD442628250075FE6D00A500A57C264424442444247C2444 +3BC2:22A822A827FC22A8FAAA24E6280077FC6C44A040A3F822482248224822582040 +3BC3:1020102013FE1070FCAC13223850348851245222912410A81124122210A01040 +3BC4:08207EFC08701CA82B26C820087C3F8020003FFC20002FF828884FF8480287FE +3BC5:2040202027FE2420FC4025FC252475FC6D44A5FCA45024902BFE281030102010 +3BC6:1040102013FC1000FD08109033FE3A2056A052FC9320122012FC1420142019FE +3BC7:1050105013DE1050FDDC105033DE385054505420902011FC1020102013FE1000 +3BC8:2010201024FE2210FA1020FE209276926AFEA210A238225422922210251028FE +3BC9:1020103E102011FEFD20113C31E2391E550455789192115412FE121014501020 +3BCA:200027FC20402278F2402FFE210071FC6A00A3FCA00425542554280420282010 +3BCB:40004CFE7010422042FC3E84108410FCFE8430FC3884548452FC904810841102 +3BCC:2000227E21102130F84A209A262C724C6A9AA22AA24A22882228251028FE2000 +3BCD:20902290229E22A2FAD423A8209470A46FFEA284A2A422942294228424942888 +3BCE:22082108210827C8F83E27882018779C682CA7AAA4C824882488278824882008 +3BCF:08007F7808483E4800863E782A483E304048808401007FFC05401930E10E0100 +3BD0:00407BFC488049F852204DFC488868F8508840F8408801007FFC05401930E10E +3BD1:20002F3E2120213CF1202F3C282078FE6850AF52A1542148214821442A622440 +3BD2:200E27F020442224F90823FC220473FC6A04A3FCA20423FC2090211022122C0E +3BD3:204020A0211826E6F80023F8220873F86800A7BCA08424A4229424A422942108 +3BD4:01F03E0003F03E0003FA7E0201FE0C20703C1DE2F0221C1E0100FFFE0920711C +3BD5:22402242225C27F0FA5023D0225E73D46A54A254A7F420142294246428242044 +3BD6:1020102013FE1020FDFC1154315439FC540053FE9040102412A2128A14881078 +3BD7:200027BC24A427BCFCA427BC244474446DF4A444A4E42554264C244424542408 +3BD8:2108210827C82108F91E2392202473806808A7C8A10821082594295425242242 +3BD9:2208210827C82210F49E2FD4206477946C94A794A49427882488249424A425C2 +3BDA:1210121013DE1228FD4410A031103A0855F65000900013F81208120813F81208 +3BDB:1020102013FE1020FDFC100033FE3A52545051DC910411DC1050105013FE1000 +3BDC:1088108813FE1088FC2013FE3088388855545222902017FE1020102010201020 +3BDD:2010279024BC24A4F4C427A8211071286946A5C0A53C2524252425A42E3C2024 +3BDE:2080209E21122152FA5E2780209E71126A52A7DEA052201E2552255224122016 +3BDF:10101010FEFE3838545492823FF000101FF00010FFFE111009A005401930E30E +3BE0:102013FE104810F0FC2013FE3242389055F85028912011FC122017FE10201020 +3BE1:10401040FEFC3884550492F42894449492F410845494388854829282507E2000 +3BE2:100013DE125213DEFE10125231CE3800548853FE9088108813FE108811041202 +3BE3:21082FFE21082090F10823FC2C8A71286A50A040A7FC20E0215022482C462040 +3BE4:101010101010FEFE1010545454545454BABA1010383854549292101010101010 +3BE5:10101010FEFE10107C7C54547C7C54547C7C1010383854549292101010101010 +3BE6:211027FC211021F0F91021F0211077FC6910A248A44623F820E0215826442040 +3BE7:2100213C211427D4F91421242FCC7100693CA524A5E4253C2724250024FE2800 +3BE8:100013FE10501050FBFE125232523BFE552450A893FE107010A8112416221020 +3BE9:00107E1022FE1C10227C7714557C2250557E08127F121C162A28492888440882 +3BEA:100011FC102013FEFA2211AC302039AC545050C8932610F8100810D010201010 +3BEB:1040107C104013FEFA42127833C43A3C560053FE924013A4125815B4145219B0 +3BEC:1010FEFE5454929200407BF8084817FE20487BF808400BF8504027FC584087FE +3BED:1040107C104013FEFA4213F832443AFC56A852F892A812F8122015FC1444198C +3BEE:100011FC11541154FDFC108031FE3A4255F25152915211F2104A13FA100A1004 +3BEF:108011FC12881070FBAE10F8312039FC542051FC910411FC110411FC10881104 +3BF0:11FC1154115411FCFC2013FE302039FC550455FC910411FC110411FC110417FE +3BF1:01007FFC11101FF00100FFFE90021FF821007FFC11101FF00100FFFE0920711C +3BF2:2110211027BC2110FBB82554291270006BF8A000A7FC20402248244429422080 +3BF3:2288228827E8FA90241E27E474546854AF54A554255427482548205422942122 +3BF4:1088108813FE1088FC2013FE3202388855245450908811FC128A108810F81088 +3BF5:211027FE211023F8F84027FC204073F86A48A3F8A24823F8204027FC20402FFE +3BF6:1020108812521326FE52128A32223BFE54885144927A10881150102010D81706 +3BF7:212821AA216C2228FAFE264436286AFE6210A27CA21022FE2210222822442282 +3BF8:204023F8204827FEF84823F8204077FE6800A2A4A45223F822A822A82FFE2000 +3BF9:20042FE422842FE4FABE2AA42FE470046FD4A00CAFEC2104254425242924230C +3BFA:00407E40487E7EA043107EFE48AA48AA7EFE000001007FFC05401930E10E0100 +3BFB:01007FFC11101FF00100FFFE82120D2032C00DA032900D883100FFFE0920711C +3BFC:108813FE10881020FDFC102033FE3840548855FC900011FC1154115417FE1000 +3BFD:102017FE140213FCFE2413FC32003AFC568452FC928412FC128414FC14481884 +3BFE:202824FE222822FEF8AA20FE2EAA72FE6A00A27CA244227C2244227C250028FE +3BFF:1124124811241000FBFC129432643A9457FC524893681248136A124A12461362 +3C00:10501190109E13EAFC8A11D2328A38A454505088932610A8107010A811241060 +3C01:200027FC2100FBF82508210871F86800AFBEA208279E24922CB22492279E2492 +3C02:202023FE2202241CFBE0212420A873FE6924A202A5FC212421FC212421FC2104 +3C03:220624382F882892FFA428BC2F8872146FBEAA8AAA882AAC2AAA2BCA22282210 +3C04:20142792249E24F0F794248A249677E26C94A492A79E20702514248A28962062 +3C05:2020201024FE2244FA2820FE209276FE6A92A2BAA2AA22BA2286250028FE2000 +3C06:01007FFC11101FF00100FFFE82823EF802807EFC028001007FFC05401930E10E +3C07:2114211227D22110F1102FFE229076D26A92A6D2A29426D4228A22CA2F162022 +3C08:1010FEFE54549292004027FC104013F8024873F8124813F8104017FC284047FE +3C09:201020102F7E2410F43C29102F7E72246A4AAF30A210227E23382E5424922010 +3C0A:2108210827AA212CF1082FD4201274A26948A108A7AA212C210821942E242442 +3C0B:2100213E250825D0F53E25222FE2703E6922A57EA56225A228BE210022142C22 +3C0C:11FC102013FE1222FDAC102031AC389055FE532095FC112011FC112011FE1100 +3C0D:08407F7C1440FF7C22043E7C22403E7C2242263E01007FFC05401930E10E0100 +3C0E:1020122213FE1090FDFE131035FE391055FE551091FE110013DE125212721206 +3C0F:110811EE12941020FBFE100030F8388854F8500093FE120212FA128A12FA1206 +3C10:2008273E2590255EFD64265E250075DE6D52A55EA552265E2452245624A0251E +3C11:20202294228A247AF800228A31446A286AAAA186A0402FFE215022482C462040 +3C12:22A0244C24A4260CFCA4264C34A46FFE6802A3F0A020204027FC204021402080 +3C13:27D0251027DE2450F7E8250427C473F86A08A3F8A20823F8220823F821102208 +3C14:224822E8230826EAFA1C22E832086AE865B4A8E2A00023F8211020E023182C06 +3C15:211027FC204023F8F84027FC200073D46912A7FEA3502534238C208A22962102 +3C16:13D0129013DE1268FBC4128433F8390855F8510891F8110811F810901112160E +3C17:201427FE249024D4FC9427FA35AA6A9661A2A3F8A20823F82040227C254028FE +3C18:208020F8210821F0F81027FE255473BC6FCAA13EA388256A208827FE20882108 +3C19:251825142F90253EF72822682FBE7AA86FA8A23EAFA822283FE8253E28A03060 +3C1A:220C210A27C8229EF55426F4245E77D46914A7DEA554255425D4245E25502490 +3C1B:21102FFE255424E4F8A82AAA2EEE74A46AAAAEEEA2422FFE215022482C462040 +3C1C:2200221E2FC42208F79E24922792749E6F92A49EA79224922FDE2500248C2892 +3C1D:00403E402240227C2284228823203E2020202050205022502C88308821040202 +3C1E:082008200820087E49424984491049104910491049284F287948004400840102 +3C1F:202020207F20807E00427E8400100010FC100410042805280528034401440082 +3C20:102008200820FF7E004200843C10241024102410242825284648444480840102 +3C21:082008201420127E214240849210121012101210122812282228224442448282 +3C22:00207E202420247E244224842410FF1024102410242824282448244444848502 +3C23:142014201420547E55425E845410541054105410542854285D487644C4840102 +3C24:00200020FFA0027E02427A844A104A104A104A107A284A28024802440A840502 +3C25:122052205220527E5242FF845210521052105E104028402840487FC400840102 +3C26:0820082008207F7E084208840810FF901010101024284228FF48414400840102 +3C27:104010402040287C4484FE88432000207C2044504450445044887C8845040202 +3C28:002000207E20427E4242428442107E1042100010242822284248424480840102 +3C29:0820082008207F7E49424984491049107F10481008280A280F48F14440840102 +3C2A:0820082008207F7E08420884FF100010081008107F28082808480F44F0844102 +3C2B:0820282028203E7E4842088408107F1014101410142814282548264444848102 +3C2C:2020202020207F7E41428184791049104910791049284928792801440A440482 +3C2D:10401040FE40287C448482887D200020FE20205040507C500488048829041202 +3C2E:00207F204020407E5E42408440107F10501051105A2854285228914498441082 +3C2F:0020FF200020007E7E424284421042107E1000104228222824280F44F0444082 +3C30:082008207F20087E08422A842A102A105D108890082814281428224442448082 +3C31:072078200820087E7F4208847F10491049107F10492849287F28084408440882 +3C32:0420052004A0FFBE042204447550559055107310029032A8C5A808C410440082 +3C33:0040FE402840287C2884EE88832082208220EE50285028502E88F08841040202 +3C34:102008207F20007E22421484FF10001000103E102228222822483E4422840102 +3C35:1020082000207F7E004222842210551088900810FF2808280848084408840902 +3C36:222022203A204B3E4AA2AA4412502890479080103F102128212821443F442182 +3C37:00200020FFA0227E22423A844A104B904A10AA101228122822A8234442448082 +3C38:082008201420227E4142BE84081008107F10491049287F280848144422844102 +3C39:0110019001507F9E411241225D08414841485D48558855945D54415442D48462 +3C3A:002077205120513E512277444050409077104110491075284228424445444982 +3C3B:08200820FF20083E08227E4400507E90421042107E10422824280F44F0444082 +3C3C:0020FF208820887EFE428884AA10AA10DD10881094289228A128C044FF440082 +3C3D:0020FFA08020BF7EA142BF84A110BF108810FF909228B2288C289244A144FF82 +3C3E:082010207E20427E7E4242847E1010100810FF1020283E28224842444A848502 +3C3F:0E40F0402240927C448420884520F82010202450FE501050FE88288845048202 +3C40:202020207F20917E55427D8421104A10A4107F10912855287D2821444A448482 +3C41:08202A202A203E7E494249847F1000103E1000107F2808282A48494428841102 +3C42:041002103FD0221E2F9222A43FC822882F88220832482A9427144A9452548622 +3C43:082014202220497EBEC204840810FF9014107F105528632841487F4441847F02 +3C44:00207F2049206B7E5D4249847F1008107F1008100F28F0280128554454444082 +3C45:0820FFA008207F7E0042FF8480907F1000107F1041287F28412822440FC4F082 +3C46:08200F2008207F7E49424C847910471040105F1040285F2851285F448A443F82 +3C47:08207F202A202A3E5D220844FF5000907F1041105D1055285D2841447F444182 +3C48:22202220F7A0227E7742AA84225000107F100010FFA80828492888C428441082 +3C49:142055203620147EFF42228414107F1008107F100828FF281C282A4449440882 +3C4A:FF2010207E20427E7E424284FF1091104A10A5101C2820287E28A2441C44E282 +3C4B:3F9004107FD0445EB5920424358812083FC86408BF8824143F9424143FD42022 +3C4C:7F8821083F0821083F1E21D2FF240100FFC852887388528873945AD4F7A410C2 +3C4D:4848444840485E4EA0AAAEB2C0C44E4440448E84AAA4EAEA0A0AAEAAAAAA0010 +3C4E:7F2055207F202A7E49422A8461103E104410FF1049287F2849287F440044AA82 +3C4F:00001FF00000000000007FFC01000100110011F81100110011001100FFFE0000 +3C50:000000103F0800080000FFFE00000400040027002400240024002780F8004000 +3C51:0100010011F811001100FFFE020004000FF0101068200440028003001C00E000 +3C52:0100010011F811001100FFFE0000FFFE00101F90109010901F90001000500020 +3C53:08200820085048504E8849244A12481049FC4804480848884E50F02000100010 +3C54:044004441748147014421742783E020007F0081034200240008003000C007000 +3C55:100011FC100410FC50045DFC500053FE5222502051FC5D247124C13401280020 +3C56:1040102013FE100050885C88515452225000502053FE5C207020C02000200020 +3C57:1020104011FC110451FC5D0451FC510451FC502850245DFE7050C08801040202 +3C58:3FFE29142F1229102F7E20102F2829282F2829442F4429824B40447C84401FFE +3C59:000003FEFC40204020803C80450045FC64049404080408041004200440288010 +3C5A:000000FCFC84208420843CFC44844484648494FC088408841104210442148408 +3C5B:00000000FDFE202020203C7C44444484648495480A2808101010202040408080 +3C5C:00000020FC20202020203C204520453C652095200920092012A02260443E8800 +3C5D:00100010FF902210227E3A124A124B924A12AA121212121222922322422A8044 +3C5E:00800040FC40200023FC3C0044084508650894900890089010A0202047FE8000 +3C5F:00100010FC1021FE21123D14451045FC65449544092809281110222842448482 +3C60:00200020FC20202023FE3C204420442065FC9504090409041104210441FC8104 +3C61:00200120FD2021FC21203E20442047FE6490949008900890111221124212840E +3C62:00400020FDFC210421043DFC4504450465FC9520092209141108214441828100 +3C63:0004001EFDE0202221123C944480442065FE9444088409C81030202840C48302 +3C64:00800086F898209023D03890489E499469D49AB40A94149410942094409480A4 +3C65:00200020F9FC202020203BFE488849446A4298F8098812501020205041888606 +3C66:00200020FDFC205020883D0447FE440865E89528092809E81128200840288010 +3C67:00400020FBFE22022504390049DE4A526A529B520C9A1094111021124212840E +3C68:00400020FBFE2202240438004BFE482068209920093C112012A02260443E8800 +3C69:00200020F9FC202020203BFE4802489468509910089013FE1028204440828302 +3C6A:000001FCFD0421FC21103DFE4510454A6586940009FC090411FC210441FC8104 +3C6B:0020FC2023FE202021FC3D2445AC4574652495FC0820087010A8212442228020 +3C6C:000003F8FA48224823F83A484A484BF868009FFE0A4012441228229043088206 +3C6D:00800338FA28222823A83A464A004A7C6BA49A240A2813A81610222842448282 +3C6E:00200020FDFC212421FC3C2047FE440065FC9504092409241124205040888304 +3C6F:00200124FD24212421FC3C0047FE440065FC9504090409FC1088205043FE8000 +3C70:0040FC2023FE224220203DFC4488445067FE9420082009FC1020202040208020 +3C71:00200040FBFC222422243BFC4A244A446BFC984008A810B4113C21224222841E +3C72:02080108F910200027FC380049104A086C049BF80AA812A812A822A84FFE8000 +3C73:04407FFC04401FF010101FF010101FF00400FFFE10102FE8C2060FE004403F80 +3C74:002003FEF82021FC20203BFE480049FC690499FC090411FC110421FC40888104 +3C75:002001FCFC20208823FE3C8845FC450465FC950409FC090411FC208841048202 +3C76:00820082FBF4208820803BE248024BE46A289A200BE012221142207447888210 +3C77:00A00090FDFE232021FC3D2045FC452065FE950008200BFE107020A843268020 +3C78:001003C8FA7E224022623BD44A004A3E6BC89A480E7E1248124823C842488008 +3C79:000003FEFA2222CC22443BEE4A444AEE6B549A440A101290129E249044908BFE +3C7A:0040007CF84023FC22443BF04A444AFC6AA89AF80AA812F8120025FC45548BFE +3C7B:00401FFEE40047FC400077FC540497FC51102EAE2BFA2E4A4AEE4E4A8BFA1650 +3C7C:00003E78224822482248228622003EFC20442044202822282C10302820440182 +3C7D:0800087808487F4849480886080014FC14441444142825282610442880440182 +3C7E:100008780848FF480848108622007CFC094412442428C82814102228C0440182 +3C7F:10001078FE48104810487C86000000FCFE4482448228BA28821082288A448582 +3C80:00007F78404840485E48408640007EFC504451445A2854285210512898441182 +3C81:20001078FE48824828484486820000FC7C441044102810281E10F02840440182 +3C82:10009278524854481048FE86820082FCBA44AA44AA28AA28BA1082288A448582 +3C83:100010781E4810487E4842867E0042FC7E44004420283E28201022282C443182 +3C84:10001078FE4810487C480086FE0082FC00447C4410287C2810101E28F0444182 +3C85:20001078FE48824810487C8610007CFC1044FE4410287C28441044287C444582 +3C86:08007F7808483E4800863E782A483E30414882840C603118CFE6004006800180 +3C87:08007F7808483E4800863E782A483E3048489FF4282007C01830E18E0C400300 +3C88:08007F7808483E4800863E782A483E30404880867FF8080810303FF8D0081FF8 +3C89:1000FE7810487C480048FE8682007CFC2044CE44AA28EE28AA10EE2828444982 +3C8A:10001F381028FFA880A87F462A00557CA2247F24A2A83E2822103E2822443E82 +3C8B:080008001FE020204040BFF8200820083FF8000020843E9820E020842684387C +3C8C:08001DF87048104810501C5C7084108410841D04F1281212100210020FFE0000 +3C8D:1010103811C0FE40107811C0FC40447C47C0284428441044183C240043FE8000 +3C8E:04080E1C70E0102010201C3C70E0102010201E3CF0E0102214221822101E0000 +3C8F:0408243C25E0242024203E3C21E020203C20243E27E02420242244224422841E +3C90:08201C207050105010881D44722210F810081C10F0101022102210020FFE0000 +3C91:08201C207020102411A81CB070B0112811281D24F22410A0104010020FFE0000 +3C92:2008201C40E07E208220023C7AE04A204A204A3C7AE04A2202220222141E0800 +3C93:08281C24702411FE11201D2871A8115011141D34F14C1104120010020FFE0000 +3C94:1004080E7F7000102210141CFF7008100810081E7F700810081208120812080E +3C95:04081E1CE0E022209220543C40E00420FF20043C44E0242224220422141E0800 +3C96:0804490E29702A1008107F1C417041107F10411E41707F10411241124512420E +3C97:04081E1CE0E0022092204C3C00E0FE200420083C0EE0F82248220822281E1000 +3C98:00087E1C42E042207E20423C42E07E204220423C7EE0002224222222411E8100 +3C99:08401C2071FE104010881DFC700410A810A81CA8F12A1226100010020FFE0000 +3C9A:1020082040A824A4092A723010C0170000F03F0001F03F0001F87F02010200FE +3C9B:20003E7C48440844FF441444227C400000F03F0001F03F0001F87F02010200FE +3C9C:1008521C54E090202820443C82E010201020523C54E0902228222422421E8000 +3C9D:08501C4870FE119012901CFE7090109010FE1C90F09010FE108010020FFE0000 +3C9E:1004080E00707F100010221C227055108890081EFF700810081208120812080E +3C9F:2204220E7F7022102A10081C3E702A102A102A1EFF700810141212122212400E +3CA0:082008207E7E08C4FF281C102A2848C600F03F0001F03F0001F87F02010200FE +3CA1:0804080E7F701C102A10491C00707E100010FF1E08704A10491289122812100E +3CA2:1004080E7E70421042107E1C427040107F10551E55707F10D51255125512430E +3CA3:5008961C92E09220D620923C92E0FE201020FE3C02E0642218222422C21E0000 +3CA4:1004080E7F7000103E10221CFF7022103E10189E35705210911214921812100E +3CA5:1004080E7F7048105E104A1C7F704A105E10481E5E705210521252125E12920E +3CA6:102010201050FE8811067C1844E07C2044387CE01020FE3C11E010221022101E +3CA7:10003BF0E150211020A03840E1B0264E21F03950E1F0204823FA200A20021FFE +3CA8:2408241CFEE024200020FE3C24E03C2024203C3C24E02E22F4220422041E0400 +3CA9:10003BF8E20823F822083BF8E00027BC20843CA4E29424A42296210A20021FFE +3CAA:0A04740E157052102210211C5D7080107E10421E42707E10421224120F12F00E +3CAB:2808AA1C6CE02820FE20443C28E0FE2010207C3C10E0FE2210222822441E8200 +3CAC:2808241C7EE0C82048207E3C48E048207E20483C48E07E224022AA22AA1E0000 +3CAD:0804290E29704A101410221C4170001022102A9EB7706210221252124512888E +3CAE:12103A10E3DE252820843840E0A0211022E83C04E1F02110211221F220021FFE +3CAF:00047A0E52707B904A107B1C54F0789000107F1E5570551055125792FC12000E +3CB0:0804FF0E91704A10A5101C1C00707F105510FF9E00707F10081208122812100E +3CB1:11243A48E12423FC22943A64E29423FC22483B68E248236A2246236220021FFE +3CB2:7F04490E7F704910FF90AA9CFFF0AA90FF90001EFFF0A2903E1222122792F80E +3CB3:08201C20F120912091FC9120FE20902093FE902090508A50A688D28809040202 +3CB4:20003FFC40009FF000007FF0041004107FD0445044507FD2444A040A04060402 +3CB5:20003FFC40009FF000007FF0249015107FD040507FD040527FCA404A41464082 +3CB6:20003FFC40009FF000007FF0041007F004107FD055504A5264CA4A4A55467FC2 +3CB7:20003FFC40009FF000007FF02A903B9000103F9024903F92248AFFEA04060402 +3CB8:0000200013FC1008801040204840088010801100E10022022202220221FE0000 +3CB9:000021F011101110811041104910091011101110E210221222122412240E0800 +3CBA:00402040104010408040404E48700FC010401040E040204220422042203E0000 +3CBB:0840084008401044176831703160515091501248124814441842104011401080 +3CBC:0000200812081208820841104910091010A010A0E040204020A0211022080C06 +3CBD:000023FC10841084808442844A840A8414841084E08420842104210422280410 +3CBE:020001007FFE40028104010001003D8405880950092011102108C10605000200 +3CBF:00402020102013FE820042004A000A0012001200E20022002200240024000800 +3CC0:009020881088108080BE47C04080104410442048E03020222052218A26060002 +3CC1:000023FE12001220822042204A200A2012201250E25022502488248829041202 +3CC2:0020212011201110811042484248144418822080E1102108220827FC22040000 +3CC3:0080208013F010908090411249120A4E14401040EFFE20402040204020400040 +3CC4:00802080108010FC8104410842401440104020A0E0A021102110220824040802 +3CC5:0000200017FE102080204040484008D011481244E44220402040204020400040 +3CC6:00102110109010908010421049100910101E17F0E01020102010201020100010 +3CC7:0020211011081204820444104110111010A020A0E04020A02110220824040802 +3CC8:004020401040104087FC40404950095011501150E1522252224E244020400040 +3CC9:000021FC11041104810441FC49040904110411FCE10421042204220424140808 +3CCA:00802080110011FE8210421045101110111020A0E0A0204020A0211022080406 +3CCB:0008203C13C01200820042004A000BFC12201220E2202220222022202FFE0000 +3CCC:000027FC14441444844447FC44441444144427FCE44420402040204020400040 +3CCD:00402040104017FE808040A0492009FC13241524E12421242134212820200020 +3CCE:0040204010801110820847FC40041110111027FEE11021102210221024100810 +3CCF:00402040104017FC844444444444144417FC2040E24021402080214022300C0E +3CD0:011021101110111087D041104310139015502510E910211221122112210E0100 +3CD1:0000200013F812A882A842A84AA80AA812A812A8E2A822A822A82FFE20000000 +3CD2:00402040104017FE80A041104208142610202040E0802108220427FE22020000 +3CD3:004020401040104087FE40804880090013FC1504E90421042104210421FC0104 +3CD4:000420041784108480BE4484428412A411142114E28422842484280420140008 +3CD5:0000210810881090800043FE48000800100011FCE00020002000200023FE0000 +3CD6:00802040104017FE808040804940094413481530E92021102108214421820100 +3CD7:000023F81108115080A0404041B0160E10402040E3F820402040204027FC0000 +3CD8:00802040104017FE80804110420817FC11242120E120212022222222241E0800 +3CD9:004020801108120487FE400248000BFC120413FCE20423FC2204220422140208 +3CDA:002820241024102083FE42204A240A24132412A8E22822102212242A24460882 +3CDB:00402140165C14448444475C4444144417FC2444E0A020A02110220824040802 +3CDC:009020901090111081FE43104D10093811381154E15421922110211021100110 +3CDD:01002108111C1270821046104A10121012FE2210E210221022102210227C0200 +3CDE:011021101110121082FE469256921A92129222FEE29222102210221022100210 +3CDF:044004403FF804400440FFFE082011102928C546038005400920311005000200 +3CE0:001024101210121080FE40104610122812242244E24222822200250028FE0000 +3CE1:040842082208200800FE8E084248522812282208E20822282210250028FE0000 +3CE2:0010207813C01040804047FE48A0091012081516E11021102110221022100410 +3CE3:00402040104413F48048405047FE104010802184E29824E028822082207E0000 +3CE4:011049102510251001108FFE4110511015982554E95422102210241028101010 +3CE5:000027FC1040104083F84040404017FC11102110EFFE21102110221022100410 +3CE6:0014401220102FFE00108290429252921FD22294E2942288228A249A24260842 +3CE7:00002FFE14801490849047904490149014902790E490249224D22F92208E0080 +3CE8:012421241248124881244124400017FE108021FCE10422882450202020C00700 +3CE9:0000407C20442E44046484544454544415FE2444E7443C442044208420940108 +3CEA:000027FC1020104080D041485244144410402000E3F822082208220823F80208 +3CEB:010001087D1005A009603118C50602000C00307820083C78200820083FF82008 +3CEC:0100210011FE1200840041FE482208241120113CE1202120212022A0247E0800 +3CED:000023F812081208820843F84040104017FC20E0E15022482444284220400040 +3CEE:000023FC1204120483FC42004A200A2213B212B4E2A822A8252425242AA20040 +3CEF:0080204017FC1000811040A04FFE104010402040E7FC20402040204020400040 +3CF0:0040202013FC1040809041084BFC080411101110E7FE21102110211022100410 +3CF1:0000278014BC152485244624452414BC14A424A4E6A42524243C242424000400 +3CF2:0020482024202020082085FE4420502012202450EC502450248824C825240202 +3CF3:00402040104017FC804040404BF80A08120813F8E0A020A021222122221E0400 +3CF4:004020281088129082A442C2448A118816782000E04027FC204020402FFE0000 +3CF5:003823C0104017FC80E0415052481C4613F02020E04027FC2040204021400080 +3CF6:00E84F08222829280548800847C8508811082108E1E82F08210A210A250A0206 +3CF7:0100210011FC12A484A441244A44089411081000E3FC220423FC220423FC0204 +3CF8:0108210817FE1108810840004890089211141318E510213221522112210E0100 +3CF9:0200420022FE22100F9082104610577C16902A90EA103210221022FE22000200 +3CFA:02404240227E22800F00827842085308121026FEEA102210221022102A500420 +3CFB:01102110111017FC811041104FFE100013F82208E20823F82208220823F80208 +3CFC:00500048FFFE00403E4022243E2800120E2A70C6030A7D90096011202518C206 +3CFD:002027201120113E814047404490141014102754E15221522192211025500220 +3CFE:02082108111017FC8040404043F8104010802FFEE1202120222022222422081E +3CFF:0040202013FC1040809041084BFC0844104017FCE0E0215022482C4620400040 +3D00:0108210817FE11088000403C4BC00820101013FCE0082010206021802240043E +3D01:000023F8104010408FFE41104208151613F82110E11027FC2110211022100410 +3D02:0020402020202EF804A884A844F854A814A824A8E5FE26883888208820A80090 +3D03:0040202013FE1202820243FE4220122013B222B4E2A824A82524292432A20040 +3D04:000027FE14021492848A450A4402140214F22492E49224922492249227FE0402 +3D05:010001087D1005A009603118C50602003FF82448282837D8244827C820083FF8 +3D06:000023F8100811F8800843F8400017FE14422844E3F822482248224822580040 +3D07:1088108810881088D6EA52AC52A85AA856EC52AA52AA94C81088108852A82110 +3D08:0010203813C0120083FC4220422012201FFE2000E04024442444244427FC0004 +3D09:00402090110813FC8108421044A417BE10822000E3FC20002000200027FE0000 +3D0A:044422441284101487D4411445541554155427D4E15421142204220424140808 +3D0B:0040204013F8104887FE40484BF8084012481248E2E823582248224824480848 +3D0C:02104210221022100F7E851045105510157C2944E544224422442544257C0844 +3D0D:03F04010202020440E5883F04250524815E82448E4442BF43042204021400080 +3D0E:0040204017FC10A08110420845F61000100027FCE04022482244244421400080 +3D0F:0080204017FC140481104208440413F810402040E3F820402040204027FC0000 +3D10:000040FE2F1029100950895E4F52495219522F7EE902290229022F0229140008 +3D11:0040202017FE14008504448847FE142015242524E52425FC2844288031000200 +3D12:0080204017FE1090829844944114123014002110E1102FFE2110211022100410 +3D13:000023FC1244124483FC42444A440BFC10001040E0242522250A290820F80000 +3D14:0080208011F81208841043FC480409FC100413FCE00420402124252A250A08F8 +3D15:0108210817FE1108800040384BC00840104017FCE0E021502248244428420040 +3D16:0110211017FC111081F0404043F81248124823F8E0402FFE2040204020400040 +3D17:000023FE1050105083FE42524A520BFE10001040E7FE20882190206020D80304 +3D18:000027FE140215FA840245FA4402100013FC2204E3FC220423FC220423FC0204 +3D19:0008203C17C0104080404FFE40401140165C2444E444275C2444244427FC0404 +3D1A:02082110100017FE80804184424414A811302270E4A8212822242C2220A00040 +3D1B:0008200817C81210821E44A447D41114111427D4E114210821C82E1424140022 +3D1C:0080204017FC1404840447FC4400140017FC26A4EAA42BFC2AA42AA432A4020C +3D1D:060478440844FF441C442A44C9140A880C603118C92605400920111025080200 +3D1E:0008203C13C010448224412849000A7C12441244E27C224422442244227C0244 +3D1F:000023FE120012FC828442FC4A840AFC120012FCE208221023FE241024500820 +3D20:00008FF8401000208040577A554A156A35525552D76A504A514250825FFE0002 +3D21:003823C01040104087FC41505248144613F82208E20823F82208220823F80208 +3D22:0090909048900190917C4954495403542554497CD95449104910491049100110 +3D23:002090204BFE002091FC482449FC012025FE4822D82A48544850488849040202 +3D24:021042082200227E0F9082104210571016FC2A10EA102210221022FE22000200 +3D25:04108410445404389510557C55441544357C5544D544577C5944404440540048 +3D26:0040202017FE1402800041F84908090811F81000E3FC22042204220423FC0204 +3D27:0040208013FC120483FC420443FC120413FC2000E04020242522250A28F80000 +3D28:0044272415281500857C47104510151015FE2710E5102528252825442B440082 +3D29:012422481248112483F842084BF8080013F81248E24823F82202220221FE0000 +3D2A:0040208013F8120883F842084BF80A0813F81040E7FE20E02150224824460040 +3D2B:40002FDE225282525FF4425402582FD4241247D2CC524C5A545467D044500010 +3D2C:010822081788148887BE4488478814C814A82FA8E18822882488288822A80110 +3D2D:0080204017FC140480A041104A08080013F81208E3F8220823F8220823F80208 +3D2E:000027FC1404140487FC4420452414A815FC2504E5FC250425FC290429141108 +3D2F:002027A414A814B084A247A2449E148014BE27A2E4A224BE24A228A22ABE1122 +3D30:01102212145417D88010401247D2144E144027D2E454245827D024522552048E +3D31:0080204017FC140480A041104248104017FC2040E44422A820A0211022080C06 +3D32:0004203E17E0143E842045FE4522153815E2251EE50029782A48324A248A0906 +3D33:04484444244024FE04509F544458545214542458E45227543C9A2092212E0240 +3D34:002024A414A8152084504488450417FE142024A4E52824502488250427FE0000 +3D35:00402028109012A482C2448A41881678100023FCE2942294229422942FFE0000 +3D36:0080208017FE1522811043FC56201A2013FC2220E22023FC2220222023FE0200 +3D37:00104F9025102510077C855447545510151025A8E7282D28214A214A21860100 +3D38:000027BC14A417BC84A447BC4404144414442444E4A424942514240424140408 +3D39:0010209214521254821040FE4010163812542292E31022102210250028FE0000 +3D3A:00208820442005FC902048A848A804A825744A22D85048504888488849040202 +3D3B:00044FC42004200407BE8484448454A417942014E8842484250421C42E140008 +3D3C:0040202017FE1402810041FE421016201A7C2244E244227C22442244227C0244 +3D3D:0008403C27C02040024881504FFE515012482C46E08020442A422A1231F00000 +3D3E:010841082FC82110011E8FD44864401417942094E11421C82F08211425240242 +3D3F:0000407E2F902220027C82444244527C1244227CE2442244227C2A0024280044 +3D40:04204220223E2F4004A08420473C555015102510E5FE2510252829282B441082 +3D41:0108210817FE1148802047FE4880090813FC1004E1502150215022522252044E +3D42:0040202013FE1200824842484BFE0A4812481248E27822002554252A2A2A1000 +3D43:0410840844081F7E95425542552015243F284430C420452247A25CA2481E0000 +3D44:00142012101217FE801043D04A500BD4101417D4E11427F8210A228A24560822 +3D45:004020A0111012488DF6402048400BF8120813F8E20823F8220823F821100208 +3D46:000840282F28293E0928894849084F7E19002900E93E29222F222922203E0022 +3D47:01A44E2422242224027E8FA44224522412242FBCE8A428A428A42FA428BC0024 +3D48:008890884888008893DE494849480148255E4A52D95248924892495E49520200 +3D49:008890884888008893DE48884888019C25DC4AAADAAA4CC84888488848880088 +3D4A:000023F8120813F8820843F850001FFE148027BCE494279424D42F88209400A2 +3D4B:000027FC14A414A487FC40004BF80A0813F81208E3F8220823F8211022080404 +3D4C:0408841C49F01110A51045FE4910197C2944497CC944497C49444A444A7C0C44 +3D4D:0000279E1492179E8492479E44421422140A2546E542255226322402240A0404 +3D4E:079E2492179E1492879E440244F2149214F22492E4F224922492253224020406 +3D4F:0110211017FC1110804047FC4110111012A82444E0402FFE2040204020400040 +3D50:40002FFE28008A2849484BEE089228842AA04AA8CBE848884894491449241242 +3D51:0200420027BC22A404A485BC480053F8120823F8E20823F8220823F821100208 +3D52:009027FC109413FC829043FE49120BFA150E11F8E10821F8210821F820900108 +3D53:008040402FFE280203F8820843F8520813F82000EFFC2240227C254024FE0800 +3D54:0040204017FC11108248444643F8105017FC2080E3F82D0821F8210821F80108 +3D55:0080211013F8121084A447BC404010A013582C46E04822642252245221400080 +3D56:0100210017DE125286924112429E14C0111023E0E04827FC2254244829440080 +3D57:43FC22400BF80A4013F82240E3FC20042554200801087D90096011202518C206 +3D58:08100A146AD42C582A544A94A950102008100A146AD42C582A544A94A9521020 +3D59:004027FC104013F8800043F8420813F811102FFEE00023F82208220823F80208 +3D5A:01102208141411A080604198464410A013182DF6E04027FC224821502FFE0000 +3D5B:011020A017FC104083F8404047FC124811502FFEE00023F82208220823F80208 +3D5C:0010241012FE1210801048FE448214AA119222BAEE9222FE22922292228A0084 +3D5D:008080405FFE0148823046905B08020627FC4524C61445EC452445E444140408 +3D5E:00C84708212A212C0FC881084388555419142122E04020242522250A290800F8 +3D5F:028842A826A82BF0001E822445D45C14141425D4E55425482568255426140422 +3D60:004047FE24022914020887FC440457FC14202524E52425FC24202924292411FC +3D61:03F8204017FC1444835840404358120013F82408EBC8224823E82212220201FE +3D62:000047FC20402FFE0842835840405358100027FCE444244427FC2444244407FC +3D63:00109F1051101F3E91225F4448101F9024905490DAA850A85EA840C445440282 +3D64:000027BC108414A4829444A4404017FC10402248E248255420A0211022080C06 +3D65:0080204017FC1484805045285554199416F02000E3F822A822A822A82FFE0000 +3D66:002021FE144012FC811042FE400016FC128422FCE28422FC2284228C250008FE +3D67:011027FE111013F8820843F84A080BF8110013FCE4442AA4220423F420140008 +3D68:00407C2045FC44887C5043FE7C20A5FC24203C2001087D90096011202518C206 +3D69:010827FE1108100084884FFE448814F8140027FCE0402FFE215022482C460040 +3D6A:0208211017FC104083F8404047FC10001440227CE08422282C20245024880106 +3D6B:01F8201017FE10A0804047BC408411CE17382108E31827FC240427FC240407FC +3D6C:00009DF85488149014FC1D549524555416881C0015FC55549554255427FE4C00 +3D6D:0040204413F8105087FE404051FC170411FC2104E1FC20002524249228920000 +3D6E:004027FC10A013188D1643F8411011F0104023F8E24823F8204027FC20400040 +3D6F:40002FF828088BE849084BE80A282BE82A284BE8CA084BFA4A0A53FA55562032 +3D70:0140224C12641244834C42644AA40BAC12A412A4E7FE20002110210822040404 +3D71:00044FE422842FE40ABE8AA44FE4500417D4200CEFEC2104254425242924030C +3D72:0100420027FC2AA802A88FFE42A852A81FFE2208E3BE24882AA8213E22080C08 +3D73:00404FFE280227BC04A4829444E450A013182C46E090232020C8231020600380 +3D74:000C800A57FE140895E85D48454A05EA3D2A552CD5EC554C654A49EA48161022 +3D75:07E0225C13C4125483C8426847D41064103C27C0E144226820D0214826460040 +3D76:0110411427D221100FFE829044505FF4149427F4E49427E8248A27FA24260042 +3D77:2010110810887CBE020029141108FC3E108810887D1C13081108210821084008 +3D78:004020A01110120885F4480243B812A813B82000E7FC24A427FC24A424A4040C +3D79:0428842844FE04289500557C5544157C3544557CD510577E5910402840440082 +3D7A:0210221017DE152888C440804BFC0A2413FC1244E3FC2120222027FE20200020 +3D7B:40502E962A928A924AD64E920A922AFE2A104EFCCA444A444A285210522826C6 +3D7C:000027FC140410808338420843B8120813F82200E7FC28042554255428280010 +3D7D:03F82248124813F88248424843F810001FBE2AAAEAAA2FBE2AAA2AAA2FBE08A2 +3D7E:0200823C5FA402248FBC42245FE4003C2FA448A4CFBC48904F9848A848AA09C6 +3D7F:0080210013F8120883F8420843F8120814102FBEE8A228A22FBE28A228A20FBE +3D80:00004EEE2A222AAA0A668EAA4A104A281A442F92EA202AC82A322AC42A1816E0 +3D81:03909C10411E15108A7E4852425C02703F52424ED2404A5C42544A5444960122 +3D82:0088908849FC008890884BFE482001FC252449FCD92449FC4800488849040202 +3D83:0080908049FE0354915449544BFE015425544954DBFE48004954492A4A2A0000 +3D84:07BC24A417BC14A487BC448444F41514162425B4E51425B4251425F424140408 +3D85:42A0244C24A4860C44A4464C04A42FFE280243F0C020404047FC404041400080 +3D86:04104210227A2F1200148F7E40084F10103C2F64E9A4293C29242F24293C0024 +3D87:42282228227C82284F2842FE0610277C2AD44A7CD254427C4200422842440282 +3D88:0110455425B8291002A884444FFE4842104023F8E248224823F8204427FC0004 +3D89:0308BC1044BE11228432492A5E22042629205F3EC4025F02447A4A02510A2084 +3D8A:00004FBE2A082A100A3E8FA248A248BE18A22FBEEA222A222A3E2A002F940022 +3D8B:050855482DA8253E0FA8824844484ABE13082588E988237E25402920251E0200 +3D8C:00449F444AAA0AEE8E444AAA4AEE0E002A284AAACBAA4EEE5A28422842480288 +3D8D:0200422227922494093E87C84548555E17C82548E57E27C820082AA82AA80008 +3D8E:01FC495425FC240001FE80005CFC448414FC2452E4CC254824642B0030FE0000 +3D8F:001C4EE02A542A280A7C8C104AFE4A001AFC2A04EA7C2C0428FC2814294A0A38 +3D90:0040202017FE14A884FE4550477C1550157C2550E57E254028A42A8A328A0478 +3D91:021082104510089E90526FA2400800083DC85548D5485DD44894489455542222 +3D92:1F3E91225F3E11229F3E500257FA148237F25482D7F2548257FA500A5AAA1014 +3D93:02109FFE4214000A07FE140895E85D4805EA3D2A15EC554CA54A09EA08161022 +3D94:000043F822A822A803F880004FBE4AAA1AAA2FBEE0402FFE20A0211022080C06 +3D95:021043DE2528288407BC84A447BC54A417BC2404E5F4251425F4251425F4040C +3D96:088089F84A881070138E3400B5FC55AC157415FC142055FC942013FE1154122A +3D97:20287F78AA147F7C2A543FB206001FF010101FF010101FF001843D480930730E +3D98:021043DE2528288407FC80A047FC54A417FC2208E3F8220823F820402FFE0040 +3D99:0284AAA456D4029EA7D451245224055E298452C4F4C451BE52A05490528E0100 +3D9A:07FE209017FE149287FE428047DE12921392211EE7D2255227DE21122FD20126 +3D9B:1080888049FE3D0012A0112C9D3455AC1534155415DC5554A7FE24884D048202 +3D9C:0002BEFA628A3EFA208231C6AAAA60823FFE2AAA2AAA7FFEAAAA2AAA32CA4104 +3D9D:004090204BFE02A492BE4BE84ABE02A826BE4AA8DABE4AA04A144B524D4A0A38 +3D9E:03F8220813F8120883F840404FFE14A417BC2110E7FC21102FFE212423180D86 +3D9F:47FC244427FC84444FFE4AAA0FBE2AAA2FBE4220C7C040844FFE404245480884 +3DA0:00009EFE54AA1EAA94FE5E10547C14103FFE4128D57C551055FE511041100610 +3DA1:00003FF8210821082108292829282948310822882248244A242A482A50068002 +3DA2:01001110111022A0044008203018C20602003FE002200420042008223022C01E +3DA3:00003FF801000100FFFE01000100000001001110111022A0044008203018C006 +3DA4:10801080108010FC550459045284944810281010101028202440448041008600 +3DA5:100011FC1020102054205820502093FE10201020102028202420442040208020 +3DA6:100011F8100810505420581053FE902210241020102028202420442040A08040 +3DA7:10201020102011FE55225922512291221152114A118A290225024502410A8104 +3DA8:00007FFC008001000300056009183104C1020100010000002488224442448004 +3DA9:10201020102011FE55225A24502090201050105010502850249044924112820E +3DAA:00007FFC01000300056019186104000001001110111022A0044008203018C006 +3DAB:010001007FFC0100210412C80C30F00C01021110111022A0044008203018C006 +3DAC:10201020102015FE58205020502091FC107010A810A829242524422240208020 +3DAD:1010109010901110557E5A52539290921112111212522BD224624422404A8084 +3DAE:00007FFC010001003FF8210822882448200820180100111022A004401830E00E +3DAF:10001080131E125256525A5252529252125212D2135A2A542490449041108210 +3DB0:10881088108814885BFE508850889088108810F8108828882488448840F88088 +3DB1:102010201020102055FE58205070907010A810A811242AFA2420442040208020 +3DB2:100011FC11241124552459FC51249124112411FC11242924252445244104820C +3DB3:01003FF00110FFFE01103FF001003FF80100FFFE00000100111022A00C60701C +3DB4:10201020107C108455485830502090481190103E104229A42418441040608180 +3DB5:0810087813C0304050409FFE10401040104017FC100000002488224442448004 +3DB6:10201020102017FE5A42544450A090A211A4129814902888248444A240C08080 +3DB7:1080108011FC15045A0451E45124912411E41124112429E42504440440288010 +3DB8:1040104011FC14445884508451289210110813DE114A294A254A4252435A84A4 +3DB9:100011FC102014205BFE50005020902213B210B410A829282524422444A28040 +3DBA:100011FC1020102054205BFE50509088110412FA148828882488448840F88088 +3DBB:08001FF0282007C01830E10E1FF001001FF001007FFC01000100488844448444 +3DBC:10201040108815045BFE5082508091FC1220102013FE28202450448841048602 +3DBD:100011FC11041504590451FC5020902013FE122212522A8A270A4202420A8204 +3DBE:00007FFC04403FF8244824483FF800007FFC010011101120228004401830E00E +3DBF:1020102013FE102054205BFE5202940411F8101010202BFE2420442040A08040 +3DC0:08202AA42CA849201450228841047FF0041004100410FFD00412040A04060402 +3DC1:100011F8100810D0542059FC5124912411FC1124112429FC252445244124810C +3DC2:00007E7C48047E4442287E1048287EC401001110111022A0044008203018C006 +3DC3:010011081108229004401830EFEE08000FE008000FE00800FFFE111014E0181C +3DC4:100011FC1124152459FC5124512491FC102013FE107028A82524422240208020 +3DC5:7F00227C3E0422283E1023A8FE44020001001110111022A0044008203018C006 +3DC6:1020104011FC110455FC590051FC910411FC102010202BFE2420442040208020 +3DC7:204020403C4045FEA84010902090C89211523D5446908428282810442084C102 +3DC8:1020102013FE105054885924522291FC112411FC112429FC24224422401E8000 +3DC9:00043F84208420843FBE20042F8420243FD422142A442A845204450488941048 +3DCA:0820082008207EFC08201C301A702A6848A48922082008200000488844448444 +3DCB:102010A210A211245450588853049022102010A410A429282450448841048202 +3DCC:100011FC100414FC580451FC500093FE1222102011FC29242524453441288020 +3DCD:1020102010501488590452FA500091FC1154115411FC2954255445544104810C +3DCE:100011FC110411FC550459FC508091FE122211221152290225FA440240148008 +3DCF:0640387C08907E1008FE1C102A10481001001110111022A0044008203018C006 +3DD0:1040119C1104110455DC5904510491FC1020102011FC28202420442043FE8000 +3DD1:010011081108229004401830E00E3FF804403FF824483FF801003FF80100FFFE +3DD2:11FC1124112415FC5924512451FC9020102013FE12222A2A26FA420A42028206 +3DD3:1080108010FC15545AD450B4512C924410941108104028A426AA428A44788000 +3DD4:1008103C13C014445A2451285100927C12441244127C2A4426444244427C8244 +3DD5:221012101410FF92145214547F5855905510632841287F28414841447F844102 +3DD6:00007DFC444444447C44444444947C88110014FC588450849084288444FC8084 +3DD7:00002FBC28A42FA4283C2FA228A24F9E81001110111022A0044008203018C006 +3DD8:10401088110413FE540259FC5104910411FC102013FE287024A8452442228020 +3DD9:11081088109017FE580053C45254925413D4125412542BD426544244425482C8 +3DDA:1040102013FE100055FC590451FC900013FE120211FC28202420442040A08040 +3DDB:08000BF81208320853F8904017FE10E0115012481C4610400000488844448444 +3DDC:2080204027FE2090AA98B494A114A2302440204027FE204050A0491042088C06 +3DDD:1040102013FE12025488590452229028102413FE102028502450448841048202 +3DDE:200023FE220022FCAA84B2FCA284A2FC220022FC2208221053FE4C1044508820 +3DDF:10081210117C15445844507C57409140117E11421142297E25424280447E8000 +3DE0:0110092012E00C187104091012A00C60701C10103EFC4210149008FE3010C010 +3DE1:00007EFE42807EFC42847EFC42807EFE01001110111022A0044008203018C006 +3DE2:082004407FFC01003FF80200FFFE080037F0C0801FFC0100111022A00C60701C +3DE3:1088105013FE102055FC582053FE900010A010FC1120282027FE442040208020 +3DE4:10001078FE4810487C480086FE0082FC7C44104412285428A810242844448182 +3DE5:100015F854105820902429A844B090A815285924522290A02840440081FC0000 +3DE6:0020FF2024A43CA424A83D20242024502F50F488050406020400488844448444 +3DE7:100011FE11101520597C5144517C9144117C1110111029542552429242508420 +3DE8:1020122213FE148059F852885070938E102011FC102029FC242043FE40208020 +3DE9:000027DC25042784249C2790251247CE0000010011101120228004401830E00E +3DEA:10A0109011FE132055FC592051FC912011FE110013FC2888249E4502420A8404 +3DEB:08007F7808483E4800863E782A483E30404880840100111022A004401830E00E +3DEC:1088108813FE1088540059FC510491FC110411FC10202BFE2450448841048202 +3DED:210013F0151000E0775C11F0104013FC284047FE0100111022A004401830E00E +3DEE:1090109017FE109057FC5A9453FC929413FC100011F8290825F8450841F88108 +3DEF:1020102055FC584090F810402BFE4488912412227CF8102011FC1E20F0204020 +3DF0:1040102013FE140059545124515491FC102013FE12422A9226FA420A42028206 +3DF1:1010101022107F7C01103E1022103EFE22103E2022442AFE2442000024884244 +3DF2:21C8270821082FE8A91EB7CAA54AA7CA254A27CA210A27CA511249D24E2A8444 +3DF3:3FFE224824FE2D9036FC249024FC249024FE248020402248445040A083180C06 +3DF4:3FFE21042E3822102FBC27182AB432522000208024882890214042204C18B006 +3DF5:100011FC112415AC5974512451FC902011FC102013FE280026A4425244528000 +3DF6:111017FC21102FFE6100A3F826482BF8224823F8224822580000488844448444 +3DF7:100013DE125217DE5A10525251CE9000108813FE1088288827FE448841048202 +3DF8:100011FC110415FC590451FC500091FC10A813FE10A829FC242043FE40208020 +3DF9:108813FE10881020543E582051FC910411FC110411FC282027FE442040208020 +3DFA:20203E20443EA84446844228761042287E44010211101120228004401830E00E +3DFB:1080108011FE13545554595453FE91541154115417FE28002554452A422A8000 +3DFC:0440FFFE0440044017D01012F7DC14503452D7D2100E0100111022A00C60701C +3DFD:1088105013FE102055FC582053FE912410A813FE100029FC2504450441FC8104 +3DFE:2040207C204023FEAA42B278A3C4A23C220023FE224023A452584DB4445289B0 +3DFF:1020102010501488590452FA5000900011DC1154115429DC2488448841548222 +3E00:102013FE100014F8588850F8500093FE120212FA128A2AFA262641F8402083FE +3E01:10501252115414505BFE5088505093FE102011FC10202BFE24A8412446228020 +3E02:011027FC1080034870B0136810A4132010402FFE4100111022A004401830E00E +3E03:00107F1049106B1E5D1049107F7C08447F4408440F7CF0440000488844448444 +3E04:2040202023FE2088A852B7ACA2AAA2A825AC2000210421FC510449FC41048204 +3E05:2210221023DE2528A884B000A7BCA4A427A424A427A4243455284EA044208020 +3E06:112011FC122017FE580051FC510491FC105013DE105029DC245043DE40508050 +3E07:108811DC108813DE54885954522291FC110411FC110429FC250445FC40888104 +3E08:081024483F7E64C8BF7E24483F7E24483F7E20400100111022A004401830E00E +3E09:210827C8AAAAB12CAFE8210857D44912892200000100111022A004401830E00E +3E0A:2108210827CE2112A924B7DEA552A55E27D2211E2392255E5940491441128122 +3E0B:203C21E03D2444A8A9FE50A82124420291FC5524552459FC9124292425FC4504 +3E0C:11FC102013FE122255AC582051AC909011FE132015FC292025FC452041FE8100 +3E0D:210821EC210A27E8AD28B5DEA728A4EA240A27EA240C27EC5A2A4BEA515687E2 +3E0E:13FC110811F8150859F8510E57F8900817FE1294139C2A94279C42D647BC8084 +3E0F:00803FFE24103F7C26382D5435322F3C2120273821202F3C248849504630B80E +3E10:2850FE4828FE399012907CFE54907C9010FE7C901090FEFE2880440024884244 +3E11:2FEC48246BAC48246BAC4AA4FFFE88227EFC2C684AA40100111022A00C60701C +3E12:00FC7F00020821081110102000F83F0001000100FFFE0100010001003FF80000 +3E13:00FC7F0002082108111010203FF82008200820083FF82008200820083FF82008 +3E14:00F87F00211011101220FFFE040008001FF028104FF088100FF008100FF00810 +3E15:0228077E38482AFE2A482A7E2A482A7E2A40297E2922289C28624830480E8800 +3E16:000028F824884288408884F804884888288810F8188824882488408883FE0000 +3E17:084010202850448803001CE0E01E3FF820082FE8200827C8244827C820282010 +3E18:084010202850448803001CE0E01E1FF012901FF000007FFC0100010005000200 +3E19:084010202850448803001CE0E21E1FD00220FFFE03000FF03810CFF008100FF0 +3E1A:0008848844502820105028884500840800880488445028501020285044888506 +3E1B:040025FC2444244424443C4404940488FD0024FC248424842484448444FC8484 +3E1C:04202410241025FE25023E5404880504FC0024FC242024202420442045FE8400 +3E1D:044024402440247C24443E8820A021203C202450245024482488448445048602 +3E1E:041024902490249024903EFE208020803C8024F8248824882488448844888508 +3E1F:04802484249824E024823E82207E20003CFC2484248424FC2484448444FC8484 +3E20:0890489048904A9249947C98409041987A944C9248904890491249124A128C0E +3E21:08204920492049FC49207E20402043FE787048A848A8492449244A2248208820 +3E22:0844484449FE484448447DFE404040FE79924AFE489248FE4892489248928886 +3E23:08504A52495448504BFE7C88405043FE782049FC48204BFE48A849244E228820 +3E24:409022882288FABE028053D42208FA3E23882288729C22882288448844888888 +3E25:09F04A104FFC4A044BFC7E2443B8422279FE4A104FFC4A444BFC48D0494A8E3E +3E26:00003FF800801080108020803FFC0080108008800680018000F0008E02800100 +3E27:00007EFC0484248424FC248444847EFC0C92149214942488448884A414C20880 +3E28:08040804488448847E844884888408840E8CF89448E408840804080408040804 +3E29:080008FC482048207E204820882009FE0E20F820482008200820082008200820 +3E2A:11041124512451247D245124912411241D24F124512411241124122412041404 +3E2B:0804080E48F048807E80488088FE08880E88F888488808880888090809080A08 +3E2C:10201020502053FE7C20502091FC11241D24F124512411341128102010201020 +3E2D:1000100051FC51247D245124912411241DFCF100510011001102110210FE1000 +3E2E:10101090509050887D085104920415FA1C88F088508810881108110812281410 +3E2F:08080888484848487E084888884808480E08F80E49F808080808080808080808 +3E30:10201010501051FE7D025204908010881C90F0A050C0108210821082107E1000 +3E31:1080108050FE51007A205120912C11741BA43124D13411281122110210FE1000 +3E32:084008404840487E7EA048A08920083C0E20F8204820083E0820082008200820 +3E33:10201020505050507C885124921210101DFCF004500810881050102010101010 +3E34:0000FFFE040008001FF02810C8100FF0010011001FF821000100FFFE01000100 +3E35:10201020502053FE7C20502091FC10001C00F1FC510411041104110411FC1104 +3E36:100011FC510451247D24512491FC11241D24F154514C118C1104110411FC1104 +3E37:080008007F7C08243E2408447F540888090011001FF821000100FFFE01000100 +3E38:1008101C51E051007D0051FE910011001D7CF144514411441144127C12441400 +3E39:1004101E51E050227D125094908010081DFEF008508810481048100810281010 +3E3A:1020082040A824A4092A723010C01700010011001FF821000100FFFE01000100 +3E3B:10201040508851047DFE5002908010FC1D20F02053FE10201050108811041202 +3E3C:1040104050FC50887D50502090D813261CF8F02050F8102013FE102010201020 +3E3D:080008FC488448847EFC4884888408FC0E84F88448FC08000848084408820902 +3E3E:100013FC5044514479445284909411081A403020D0A41282128A128A14781000 +3E3F:1020102053FE50207DFC500093FE12021C04F0F050901090109011121112120E +3E40:1020102053FE5020782053FE9202140419F83010D02013FE1020102010A01040 +3E41:1040102053FE50007C0051FC910411041DFCF020512811241222142210A01040 +3E42:00007EFC48447E4442287E1048287EC6010011001FF821000100FFFE01000100 +3E43:044004407C7C04403C7804407C7C0440054011001FF821000100FFFE01000100 +3E44:100011FC512451FC7D2451FC908811441E42F0F8518812501020105011881606 +3E45:1080108050FC51547AD450B4912C124418943108D04010A412AA128A14781000 +3E46:100013FE522250207DFE502091FC11241DFCF12451FC102013FE102010201020 +3E47:100011FC510451FC7D0451FC908011FE1E22F1225152110211FA100210141008 +3E48:082008207E7E08C4FF281C102A2848C6010011001FF821000100FFFE01000100 +3E49:100011FE511051207D7C5144917C11441D7CF110511011541152129212501420 +3E4A:1040104053FE52A27C9051FE912013201DFCF120512011FC1120112011FE1100 +3E4B:1120113C514452A87A1056A89AC612801A8832B0D28412881232120412181260 +3E4C:1040102053FC50007D08509093FE12201EA0F2FC5320122012FC1420142019FE +3E4D:1040102053FE50887C5053FE922212FA1E22F2FA528A128A12FA1202120A1204 +3E4E:100011FC512451FC7D2451FC904010881DF0F020504413FE1022112412221060 +3E4F:1088108853FE50887CF8502091FC11241DFCF02053FE102011FC102013FE1000 +3E50:11102110CAA814443240D27C154014FE090011001FF821000100FFFE01000100 +3E51:101417FE501053D0781053D0901013D01A5033D0D25013C8124A13CA11861242 +3E52:10501252515450507BFE5088905013FE182031FCD02013FE1050108811041602 +3E53:1020102051FC50207BFE5108939C11081988363ED00013FE109010901112120E +3E54:100013FE500051FC7D2451FC912413FE1C00F1FC512411FC112411FC100013FE +3E55:7DFE002000FCFE8428FC288428FC4A844CFC884811841FF82100FFFE01000100 +3E56:1020112450A851FC784053FE908811041AFA3040D1A4105811B4105213901030 +3E57:102013FE502051FC7C0053FE900211FC1C20F3FE500013FE100413BE12A4138C +3E58:100011FC502053FE7E2251AC902011AC1C00F3FE502011FC115411541154110C +3E59:108812AA52DC54887954522293FE12021DFC3104D1FC110411FC110411FC1104 +3E5A:108812AA52DC54887954522293FE120218F83088D0F8100011FC110411FC1104 +3E5B:200027FEA040A2EEFAAAABEAAAAE2AE83BAAECE6228825F42290206021982606 +3E5C:08200A280924092408207EFE0820082008501450125012882088210442048402 +3E5D:0004441E29F0111029104910891009FE1910291049108908090A094A51862102 +3E5E:0008441C29E011002900490089FE0910191029104910891009100A1052102410 +3E5F:00404440284013F828484848884808481FFE284048A088A00910091052082406 +3E60:00204420282013FE2820492489240924192429FC4824882008220822501E2000 +3E61:00404420282013FE28404840888809081BF028204840888809040BFC51042000 +3E62:02008A005200221E57D292521252125232525252925212521452145EA9525080 +3E63:0080888050F82108531094A0104010A033185C0690C0102010101180A0604010 +3E64:00204420282011FC2820482088200BFE182028404840888809040BFE51022000 +3E65:00404420280013FE282048208820082019FC2820482088200820082053FE2000 +3E66:00008BFC508420845084910411141208340051FC9104110411041104A1FC4104 +3E67:00204420282011FC292449248924092419242BFE482088500850088851042202 +3E68:002044202820102029FC492489240924192429FC492489240924092451FC2104 +3E69:000045FC2884108828504820885008881B26282049FC88200820082053FE2000 +3E6A:000097BC54A424A454A494A414A41FFE34A454A494A414A414A415A4A8545088 +3E6B:002044202BFE102029FC482489FC092019FE2822482A88540850088851042202 +3E6C:004088405FFE2040504097FC1444144437FC50409240114010801140A2304C0E +3E6D:0020442029FC1124292449FC8924092419FC282048248818083208CA53062002 +3E6E:000045FE28201020284049FC89040904190429FC490489040904090451FC2104 +3E6F:009044902890111029FE4B108D10093819382954495489920910091051102110 +3E70:004044442A441148295048408FFE0890189028904890889209120912520E2400 +3E71:000045FC29041104290449FC882008201920293C492089200AA00A60543E2800 +3E72:0020442229FA102428244BFE8810082019FC288849108AFE0C10081050502020 +3E73:000047FE2840104029FC488488840BFE1800280049FC89040904090451FC2104 +3E74:000045FE2820102029FC4924892409FC1924292449FC892008A0084050B0230E +3E75:000045FE2800109229244A4889240892180029FE482088200820082053FE2000 +3E76:0000880653B8208850889108113E1388308852889288113E11001280A47E4800 +3E77:4210241418122412521010FEFF10201028107E28AA282A282A442E4408840902 +3E78:0020444029FC1104290449FC8904090419FC28504850885008920892510E2200 +3E79:0040882053FE222052FC9224122413FE3224522492FC122012501450A4884906 +3E7A:002044222BB410A828A849248AA2084019FC2904490489FC0904090451FC2104 +3E7B:001C45E0282010202BFE48A889240A4218402BFE4888890808D0083050482184 +3E7C:0080448028FE11022A424A4A895208421BFE284248E289520A4A084250542008 +3E7D:00504448285E13E42828483288CA0F0618502848485E8BE40828083250CA2706 +3E7E:0110891053D8225454529A90111012FE3C00500093F8120812081208A3F84208 +3E7F:00204420283E102029FC490489FC090419FC292448208BFE0820082050202020 +3E80:0080448028FC11542A5448A489240A4418942908484088A40AAA0A8A54782000 +3E81:009245242A4811242892484088800BFE1A022A8A4A528A220A520A8A53FE2202 +3E82:00148812501027FE5410941015D01412341255D49554154815DA142AA8465082 +3E83:008844882BFE1088290049FC89040A0419F42914491489F40914080450282010 +3E84:004044A0291012082DF648008BC40A541A542BD44A548A540BD40A44525422C8 +3E85:0080888051FC220454089BFE1200128032FC5320922013FE14201450A8885306 +3E86:02104510287E1310292849A88944080019FC2904492489240924085050882304 +3E87:001090145FD229126910A97E2B902A906A90AB982928292829242FC4A0444082 +3E88:00204524292411FC28204BFE8800082019FC2924492489FC0820082453FE2102 +3E89:10001078FE4810487C480086FE0082FC7C4400441428FE281010282844448182 +3E8A:01044488280013FE2820482089FC082018202BFE484088240AA20A8A54882078 +3E8B:0120891052082486591093F81008100037BC508494A4129414A41084A2944108 +3E8C:011088A0500027FE50A093F810A817FE30A853F890A011B012A814A6A0A040A0 +3E8D:0040882053FE2202541491E01100110031FC5110911017FE10001090A1084204 +3E8E:002097FE542025FC542497FE142415FC342055FC952415FC152419FCA924512C +3E8F:002045FC292413FE292449FC882009FC192429FC48408BFE088809D05070238C +3E90:012446482924100029FC492489FC092419FC28204BFE887008A8092456222020 +3E91:0040448829FC11082A524BFE885009881E2628C04B1088640B88083050C02700 +3E92:000097BC508424A4529494A410501188362650C09310106413881030A0C04700 +3E93:002047FE282011FC28204BFE880009FC190429FC490489FC090409FC50882104 +3E94:000E8BF050442224510893F8120813FC320453FE920212AA12AA1502A4144808 +3E95:007897C05248215057FC91501248140633F85248924813F812481248A3F84208 +3E96:00089788508821106FDEA49424A427946494A794249424C827882C94A0A440C2 +3E97:000047DE2A5212522BDE480089FC092419FC292449FC88200BFE082050202020 +3E98:0090448829FE11102B104DFE8910091019FE2910491089FE09000AA452522452 +3E99:0080884057FE240251F8914817FE122833FC501093F81248124812A8A1104608 +3E9A:00109410527C201050FE9044162812FE3210527C921012FE12101210A5FE4800 +3E9B:03FC8A4053F8224053F8924013FC10043554500891101FFE11101110A2104410 +3E9C:00908BFC529423FC529493FC100013FC320052F8920013FE15201514A5484986 +3E9D:001097D0551027DE545097E8150417C4300053F892A812A812A812A8AFFE4000 +3E9E:01408A4C52642244534C926412A413AC32A452A497FE100011101108A2044404 +3E9F:000097BC508424A4529494A41120121037FC5A2093FC122013FC1220A3FE4200 +3EA0:008090405FFE29126208A5842E0E2A746A54AB542AD42A542A522D54B75C4084 +3EA1:000097FE544425986488A7DE248825DC66AAA48824202520253C2920A92057FE +3EA2:07FC904057FE24425B5C9040175C112033FC56209BFC122013FC1220A3FE4200 +3EA3:010891EC510A27E86528A5DE272824EA640AA7EA240C27EC2A2A2BEAB15647E2 +3EA4:0148894C52AA200857FE91481368114A336A514C936C1148116A139AA0264042 +3EA5:01F08A1057FC220453FC922413B8122231FE521097FC124413FC10D0A14A463E +3EA6:00449F445AAA2AEE6E44AAAA2AEE2E006A28AAAA2BAA2EEE3A282228A2484288 +3EA7:07BC94A457BC200057FC908013F8120833F8520893F81110120817BCA4A447BC +3EA8:00200020FC201020102010407C4010401080108810841D04E3FE410200020000 +3EA9:00040004FE841084108410847C841084108C109410E41E84F004400400040004 +3EAA:00400040FE401040104010507C4810441044104010401E40F040404000400040 +3EAB:00080008FE081088108810887C8810881088108810881E08F008400800280010 +3EAC:000001F0FD101110111011107D9011501150111011101D12E2124212040E0800 +3EAD:000001FCFC041008101010207C2013FE1020102010201C20E020402000A00040 +3EAE:000001FCFC001000100013FE10407C40108010FC100410041C04E00440280010 +3EAF:00007FFC010001003FF801000100FFFE00000100FFFE0280044008203018C006 +3EB0:000003FEFC201020102011FC7D2411241124112411241D34E128402000200020 +3EB1:100017F82110613CA10422042414280820007FFC01003FF801200110FFFE0000 +3EB2:000001F8FC481048104810487C4811F81088108810881C88E088408803FE0000 +3EB3:00200020FE20103E102010207C2011FC1084108810481E50F020405001880606 +3EB4:00200028FE241024102011FE7C2010201020105010501E50F088408801040202 +3EB5:00800080FC8010FC1104110812407C40104010A010A011101D10E20844040802 +3EB6:00080088FE481048100810887C4810481008100E11F81E08F008400800080008 +3EB7:00200028FC24102011FC10207C70107010A810A811241D24E222402000200020 +3EB8:080009F011103190515091521112120E04007FFC01003FF801200110FFFE0000 +3EB9:00200020FC401088110413FE7C021088108813FE10881C88E108410802080408 +3EBA:000001FCFD041104110411FC11047D04110411FC110411041D04E10441FC0104 +3EBB:00200020FC2013FE102010207DFC11241124112411241D34E128402000200020 +3EBC:000003FEFC221024102010207D20113C1120112011201D20E2A04260043E0800 +3EBD:000001FEFC101010102010207C6810A41122122210201C20E020400003FE0000 +3EBE:000003FCFA042204220422F4FA9422942294229422F43A94E204420402140208 +3EBF:000001FEFD1011101110117C11447D4411441144117C11101D10E11041FE0000 +3EC0:00200020FBFE2222222223FE2222FA2223FE2020212038A0E04040A001180606 +3EC1:00000000FDFC1104110411747D5411541154115411741D04E10441FC01040000 +3EC2:01040084FC88100013FE10887C881088108817FE10881C88E108410802080408 +3EC3:044004403FF824483FF824483FF800007FFC010001003FF801200110FFFE0000 +3EC4:0008003CFDC01000100013FE7C2010201120113C11201D20E2A04260043E0800 +3EC5:00200020FC5010881104120210F87C00100013FE102010401C88E10443FE0102 +3EC6:00400080F908220427FE20022000FBFC220423FC220423FC3A04E20402140208 +3EC7:00200020FC501088110412027DFC10201020102011FC1C20E020402003FE0000 +3EC8:0008001CFDE01100110011FE7D001100117C114411441D44E144427C02440400 +3EC9:00200020F920213C2120212027FEF8002020212421243A28E410402000C00700 +3ECA:00800080FCF81108121011FC11247D24112411FC105010501C90E0924112020E +3ECB:00200020FDFE1020102011FC7D24112411FC102010701CA8E124422200200020 +3ECC:00200020FC501088110412FA7C20102013FE102011281D24E222442200A00040 +3ECD:000001FCFD04110411FC10007C0011FC1020102013FE1C20E050408801040202 +3ECE:010001007FFC0100FD7C111011107D7C11101D10E2FE4280044008203018C006 +3ECF:000001FCFC04100410FC10047C0411FC102010A410A41D28E050408801040202 +3ED0:00400040FC88110413FE100210887D44124210F8118812501C20E05041880606 +3ED1:001C00E0FC2011FE107010A87D24122210F8101010201DFEE020402000A00040 +3ED2:000003FEFA02221A22E222222222FBFE2222227222AA3B26E222422203FE0202 +3ED3:000007E0FA5E2252225223D22252FA5423D4225422483AE8E754405400620040 +3ED4:0008003CFDE0102013FE10A810A87CA813FE10A810A813FE1C20E02041FC0000 +3ED5:000003FEFA02220223FE22102292FA92229222FE22103A92E292449204FE0802 +3ED6:00400040FBF82048204827FE2048F84823F8244422E83950E248444601400080 +3ED7:044004407C7C04403C7804407C7C044004407FFC01003FF801200110FFFE0000 +3ED8:00400020FBFE2222202021FC2124F92421FC2124212439FCE124402000200020 +3ED9:00400020FBFE2080210423FEF80221FC210421FC210439FCE104410401140108 +3EDA:000003DEFA522252225223DE2252FA52225223DE22523A52E2524252055208A6 +3EDB:000001F8FD08110811F811087D0811F8108011FC12541C94E124424400940108 +3EDC:00880088F8882088215422222442F82020202120213C3920E2A04260043E0800 +3EDD:00820082FBE22082208A23EA22AAFAAA23EA208A21CA3AAAE4A24082008A0084 +3EDE:00400020FBFE2202220223FE2200FA0023FE235225523DFEE552455209520106 +3EDF:00400040FBFE208021FC222025FEF80021FC210421FC210439FCE10401140108 +3EE0:00400020FBFE220220882104FA222028202423FE20203850E050408801040202 +3EE1:00480148FD4813FE114811487D78110011FE102013FE1C70E0A8412406220020 +3EE2:02100110F91027BE2228224823AAFAAE22BA22EA22AE3AA8E4AA44A209A2101E +3EE3:00880088FBFE208820F8208820F8F888208823FE21003948E184410001FE0000 +3EE4:00880088FBFE2088210021FC2104FA0421F42114211439F4E114400400280010 +3EE5:00880048FC5013FE105010507DFC11541154118C11041DFCE104410401FC0104 +3EE6:01FC0124FD2411FC112411247DFC1020102013FE12221E2AE2FA420A02020206 +3EE7:01040104F9DE22442554209E2104FA24242423FE207038A8E124462200200020 +3EE8:00007EFC48447E5443287E9048287EC600007FFC01003FF801200110FFFE0000 +3EE9:011000A0F80027FE20A023F8F8A827FE20A823F820A039B0E2A84CA600A000A0 +3EEA:00A00090FDFE132015FC11207DFC112011FE110013FC1C88E09E4102020A0404 +3EEB:000001FCFD2411FC112411FC7CA810A813FE10A810A81DFCE02043FE00200020 +3EEC:01FC0020FBFE222221AC2020F9AC200021FC200023FE3880E0FC400400280010 +3EED:00400020FBFE2020204822F2F924225220F8200820203BFEE020402000200020 +3EEE:01000110FBDC225425542288F90822F42402200023FC3840E150424805440080 +3EEF:0040007CF84023FE22422278FBC4223C220822F023243AA8E5FE442008A00040 +3EF0:008803DEFC8811DC108813DE7C88100013FC100410041DFCE004400403FC0004 +3EF1:0020047CFA842148203020CE2610FA7C2210227C22103AFEE210421005FE0800 +3EF2:002001FCFD2413FE112411FC7C2011FC112411FC10401DFEE08841D00070038C +3EF3:00880088FBFE2088204220E2FB82208A208A27EA218A39CAE2AA4482008A0084 +3EF4:000001F8FD0811F8110811F87C0013FC129413FC10001DF8E090406001980606 +3EF5:03FE0202FBFE220022FC220823FEFA10223023CE22423A84E4EE47840884018C +3EF6:010801EEFA942042202021FC2024FBFE202421FC202039FEE02043FE00200020 +3EF7:02080208EFBE420842084FBE4AAAEAAA4AAA4BAE4208671CCAAA124802080208 +3EF8:000007BCF908252827BC231825AAF946200023F822083A08E3F84208020803F8 +3EF9:FDFC104021A27C54A5B824543D92246000007FFC01003FF801200110FFFE0000 +3EFA:3FFE21042E3822102FBC27182AB4325220002FFC208027F820A040905FFE8000 +3EFB:01080088FBC8201023DE226423D4F81423D42054209438E8E388409402940122 +3EFC:000003FEFC5013FE125213FE7C0011FC110411FC11041DFCE02043FE00200020 +3EFD:00A00090FDFE132011FC11207DFC112011FE110013DE1E52E252427202020206 +3EFE:0100FFFE104824FE799010FC22907CFC089030FEC0807FFC01003FF80120FFFE +3EFF:000003F8FAA822A823F82100FBFC248423E422A422A43BE4E09447F400140008 +3F00:00100410FA7C201020FE20442628FAFE2210227C22103AFEE210421005FE0800 +3F01:01040088FBFE202021FC2020FBFE20542192209023FE3890E0D4438A009601A2 +3F02:0A0033B822083BB820883AB82288FFFE80027FFC01003FF801200110FFFE0000 +3F03:01240248F924200023FC22942264FA9423FC224823683A48E36A424A02460362 +3F04:01240124FAAA23AE212422AAFBAE202427FE201027D43D54E7CA454A07D60022 +3F05:00200010FBFE224422FE224423FEFA1022FE229222FE3A92E2FE420002440482 +3F06:008802AAFADC24882154222227FEFC0221F82040204039F8E050404803FE0000 +3F07:00200222FBFE209021FE231025FEF91021FE211021FE21003BDEE25202720206 +3F08:000007FCF4A424A427FC221022A8F4BE2F68223C24A82FBC3028CAA80ABE0020 +3F09:0210071038102A7C2A542A542A102A282A282948294A288628404A304D0E8900 +3F0A:1008101C10E8FEA810A854A854A854A854A87CA410A410A414A2192811340224 +3F0B:1008101C10E810A8FEA810A810A810A87CA844A444A444A444A27D2845340224 +3F0C:08081C1C70E850A850A850A858A854A854A854A450A450A458A255289D340624 +3F0D:1008101C10E8FEA810A87CA810A8FEA830A838A454A454A490A2112811341224 +3F0E:0220071038102AFE2A002A442A822A282A1029282944288428404A304D0E8900 +3F0F:04081E1CE0E822A892A854A848A810A8FCA824A444A428A410A2292845348224 +3F10:0804040E7F74415441547F5440547F54555455527F52555255505594819A0312 +3F11:1008101CFEE810A8FEA892A8D6A8BAA892A8FEA410A438A454A2932811341224 +3F12:027C0744387C2A442A7C2A002AFE2A402A7E29AA295228AA28444A304D0E8900 +3F13:08881C50700053FE505051FC585457FE545455FC505050D8595456529C500450 +3F14:0008001C7CE844A87CA844A87CA800A87CA854A454A454A456A2F92801340224 +3F15:1008921C54E8FEA882A87CA844A87CA800A87CA454A47CA454A255287D344624 +3F16:11F03A10E3E0A020A7FCA188B650A9A8AE64A9A0A248AFBEBAAAAFBE3A8A0FBE +3F17:000001FCFE801080108010F81088108811481128112811081108114A518A2106 +3F18:100011FC10801080548054F8548854885548552855285D086508014A018A0106 +3F19:100010FC1040FE40924092789248924892A892989A88948810AA10CA108A1006 +3F1A:100008FC0840FF40004000783C48244824A824982488258846AA44CA808A0006 +3F1B:00007EFC24402440244024782448FF4824A824982488248824AA24CA448A8406 +3F1C:01001FF011101110FFFE02801C70E00E00007FFC08000FE0092010A41624181C +3F1D:10001EF8228862A894920882307EC00000007FFC08000FE0092010A41624181C +3F1E:00007EFC084008404A402A782C480848FFA808980888088808AA08CA088A0806 +3F1F:100010FC20407E4042404278424842487EA842984288428842AA7ECA428A0006 +3F20:100008FC08407F4041408278204820483EA820982088208826AA38CA208A0006 +3F21:080028FC28403E404840887808487F4818A81C982A882A8848AA88CA088A0806 +3F22:0000FEFC904090409040BC78A448A448A4A8A498BC88908890AA90CAFE8A0006 +3F23:0000FEFC1040104020407C784448444844A87C984488448844AA7CCA448A0006 +3F24:080008007F7C08243E2408447F54088800007FFC08000FE0092010A41624181C +3F25:100012FC7A4014401440FF78104820487EA8909820883C8804AA04CA148A0806 +3F26:00007DF01110119011521D12E20E440000007FFC08000FE0092010A41624181C +3F27:0000FCFC044068401040FE7892489248FEA892989288FE8892AA92CA928A8606 +3F28:080008FC14402240514088787E48024804A808987E88428842AA7ECA428A0006 +3F29:0400057C04A07F2044204438742855285558564856485448655A4D6A934A0106 +3F2A:080008FC7F40084008402A782A482A485DA888980888148814AA22CA428A8006 +3F2B:00007EFC4A404A407E404A784A487E4808A8FF9818882C882AAA4ACA888A0806 +3F2C:100010FC7C4010401040FE78444828487CA810981088FE8810AA10CA108A1006 +3F2D:1020103E7C2011FC11041D04E1FC010400007FFC08000FE0092010A41624181C +3F2E:100010FCFE4010407C401478FE4814487CA81098FC88248844AA28CA308AC806 +3F2F:0800087CFFA0082008207F3849287F2849587F4808481C482A5A496A884A0806 +3F30:0800107C7F20492049207F38492849287F5814482448FF48045A046A044A0406 +3F31:04447C5804621C42E43E00007FFC482410107FFC08000FE0092010A41624181C +3F32:0000FEFC10402040FE40AA78AA48AA48A2A896981088FE8810AA28CA448A8206 +3F33:100010FC52405140954008783048C0487EA842987E8842887EAA42CA7E8A4206 +3F34:00007CFC544054407C40547854487C4810A8FE9892889688BEAA82CA8A8A8406 +3F35:00003EFC22203E2022383E280048FF680858084A2F4A286A284658004FFE8000 +3F36:100010FC2840444082407C780048E248AAA8AA98EA88AA88AAAAE2CAAA8AA406 +3F37:100092FC92409240FE400078FE48104820A8FE98AA88AA88AAAAAACAAA8A8606 +3F38:1000087CFFA080A0142022384928142822584148BEC82248225A226A3E4A2206 +3F39:440044FCFF4054400840FF78404840487EA800985488548855AA56CA948A0006 +3F3A:100008FC7F4048405E404A787F484A485EA848985E88528852AA52CA5E8A9206 +3F3B:11102110CAA814443240D27C154014FE08007FFC08000FE0092010A41624181C +3F3C:0000FEFC2840FE40AA40AA78FE4800487CA80098FE88108854AA92CA508A2006 +3F3D:100010FCFE401040BA405478BA481048BAA85498BA88108828AA24CA428A8006 +3F3E:0800047C7FA0522052207FB852A852A87FD8524852485BC8525A52EA9B4A1206 +3F3F:1000087C7F202220FF2000387F2849287F5849487F4808487F5A086A0F4AF006 +3F40:2200147CFF2014207F20553863285D2841587F480848FF48145A226A414A8006 +3F41:3FFE21042E3822102FBC27182AB4325220003FFE240027F0249048524B128C0E +3F42:0800147C22205D2080A03E3822283E280058774811485548335A556A114A3306 +3F43:0E00F0FC92405440FE403878544882487CA8549854887C8854AA54CA7C8A4406 +3F44:240CFF7024403C40247E3C482448FF482448428800007FFC08000FE011241C9C +3F45:0A0074FC15405240224021785D4880487EA8429842887E8842AA24CA0F8AF006 +3F46:100092FC5440FE4082407C7844487C4800A87C9854887C8854AA54CA7C8A4406 +3F47:0A803138228838382288393822887FFE4002BFF408000FE0092010A41624181C +3F48:48F8705044203DFC20247CB890A07D7E2A007FFC08000FE0092010A41624181C +3F49:00007E40487E7E9043087EFE48AA7EFE00007FFC08000FE0092010A41624181C +3F4A:49005D7C6120DDA043205D3841285D28B6D89C4800487F48025A346A1C4A6306 +3F4B:210447C88812F3BC20084B92F83E0380AAAAABAA00007FFC08000FE011241C9C +3F4C:7F00087CFFA088A06B2010386F28452855586B4810487F48495A7F6A494A7F06 +3F4D:220022FC22402240FF402278224822483EA822982288228822AA3ECA228A0006 +3F4E:22102210FF1022103EFE22923E9222102228FF28402854286248404A7E8A0106 +3F4F:204010A083184DF61000E3F8220823F800001010FFFE10101FF010101FF01010 +3F50:48884850480049FEFC5049FC48544BFE485479FC485048D849547A5248500050 +3F51:4BFE48504BFE4A52FE524BFE480049FC790449FC490449FC48207BFE48200020 +3F52:00107C10549054907CFC549055107C101010FEFC12101210221022104AFE8400 +3F53:010011001FF821005FF00100FFFE081048507E7C489088107E7C08100F10F0FE +3F54:28102810AA506C7C2850FE901010307C4A109C102C10DAFE2900C8C0283E1000 +3F55:010001003FF821083FF821083FF800007FF8000810081FFE0002000200140008 +3F56:004000407C40544055FC544454447C4454445484548454847D04450402280410 +3F57:002000207C2054205420542054207C2054505450545054887C88450402040402 +3F58:004000207C0055FC5400540054F07C9054905490549054927C924512010E0200 +3F59:004000407C805488550457FE54027C9054905490549054907D124512020E0400 +3F5A:00003FF8210821083FF8210821083FF8000011003FF841000100FFFE01000100 +3F5B:008000807D0055FC5604540455E47D245524552455E455247C04440400280010 +3F5C:10001EF8228862A894920882307EC0003FF8210821083FF8210821083FF82008 +3F5D:7F0408441E44224454440844300CC0001FF0111011101FF0111011101FF01010 +3F5E:00003EF82288228822883EF8000000003FF8210821083FF8210821083FF82008 +3F5F:0004001E7DE054225512549454807C0855FE5408548854487C48440800280010 +3F60:002000207C2057FE5420542055247D24552456AA542054507C50448801040202 +3F61:00400080F9FCA924A924A9FCF924A944A9FCA890A910FBFE8810001000100010 +3F62:00400080FBFCA910AA48AC46FBF8AA48AA48ABF8AA48FA488BF800420042003E +3F63:00140012F810AFFEA810A810FBD2AA52AA52AA54ABD4F80888EA071A02260042 +3F64:008000807CFE5502562254AA54727C2255FE5422547254AA7D224422000A0004 +3F65:000000FC7C48543055FE545254947D105630542055FE54707CA8452402220020 +3F66:08202AA44D28145022887FFE400280043FF8210821083FF8210821083FF82008 +3F67:00840044F848ABFEA884A884F908A94AAA52AB9CA884F9088908025203DE0042 +3F68:01080088F890ABFCA840A9F8F840ABFEA880A900A9FCFA208C20082003FE0000 +3F69:00400088F9FCA908AA52ABFEF850A988AE26A8C0AB10F8648B88003000C00700 +3F6A:01040088F800ABFEAA22AAAAFA72AA22ABFEA800A9FCF90489FC010401FC0104 +3F6B:0100FFFE104824FE799010FC22907CFC089030FEC0803FF821083FF821083FF8 +3F6C:0000FEFE00007C7C444444447C7C0000FEFE92929292FEFE92929292FEFE8282 +3F6D:000001FCF820ABFEAA22A9ACF820A9ACA800ABFEA820F9FC895401540154010C +3F6E:0FE009200FE009200FE07C7C54547C7C54547D7C11001FF821005FF00100FFFE +3F6F:022203FEF890A9FEAB10ADFEF910A9FEA910A9FEA900FBFE8A8A037602520276 +3F70:0000777C55145514551077105550555C55507750555055505550B55089BE1300 +3F71:008000401FFE1000900852085208120832085208923813C82208200840088008 +3F72:008000401FFE1000900057FE50801100320053F8900810082008200840508020 +3F73:008000401FFE1000900057FC5040104030405FFE904010402040204041408080 +3F74:008000401FFE10009010501057FE101030105210912010A0204020A043188C06 +3F75:008000401FFE1000904050405040104037FC504090401040204020404FFE8000 +3F76:008000401FFE1000900053F850081008300853F8920012022202220241FE8000 +3F77:008000401FFE1040904050445768117031605150925012482444284241408080 +3F78:008000401FFE10009040504053FC1244344850A090A01120212022224422881E +3F79:008000401FFE1000901C53E05200120033F85288928812502420245048889306 +3F7A:008000401FFE100097F8510851101120313C5204928812502420245048889306 +3F7B:008000401FFE1040904057FC5040104037F85208911010A0204020A043188C06 +3F7C:008000401FFE1000900457E45024102433E45204940417E42024202441448084 +3F7D:008000401FFE10409040504057FE1040304053F8920812082208220843F88208 +3F7E:008000401FFE1000904052485248124833F85048904014442444244447FC8004 +3F7F:008000401FFE1000901C53E052901290329052909290128824C824A448D49092 +3F80:010000803FFE20002080A0806FFC208020806080BFFE2100221044084FFC8404 +3F81:008000401FFE104090505048504017FC30E05160915012482444284240408040 +3F82:008000401FFE108090805110520817FC3204500093F812082208220843F88208 +3F83:008000401FFE1080904057FC54041808320052109260138022002204420481FC +3F84:008000401FFE10009040504057FC14443444544497FC14442444244447FC8404 +3F85:008000401FFE1040905C53E05240124033FC504490C4115422482C4040408040 +3F86:008000401FFE1040904053F85248124833F8524892481FFE2208220842288210 +3F87:010000803FFE20002000A7F86408240827F86408A40827F82408440847F88408 +3F88:008000401FFE100091085108510812FE320856489A2812282208220842288210 +3F89:008000401FFE1040904050A0511012483426502093F81008211020A040408020 +3F8A:010000803FFE20402040AFFE604027FC24446454A4E8215022484C4640408040 +3F8B:008000401FFE11109110521052FE16103A385238925412542292221042108210 +3F8C:008000401FFE10009040524053FC144030405FFE91201120212022224422981E +3F8D:008000401FFE100090005FFE5040108037FC54A494A414A424A424A444948408 +3F8E:008000401FFE1000900057BC54A414A434A454A494E414042404240447FC8404 +3F8F:008000401FFE1000904057FC504010403FFE5000904017FC204020405FFE8000 +3F90:008000401FFE100090045FC45214121437D454549A5411942084210442148C08 +3F91:008000401FFE104090A0511052081DF63000500093F812082208220843F88208 +3F92:008000401FFE11009100511E5FD2125232525452949212922112229E44528840 +3F93:008000401FFE100093F0521053F0100037F8540897F8140827F8240844288410 +3F94:008000401FFE1000900053F85208120833F8500097FC14042404240447FC8404 +3F95:008000401FFE1080904057FC520811103FFE5040904017FC2040204040408040 +3F96:008000401FFE1000900057FC544417FC344457FC904017FC204020404FFE8000 +3F97:008000401FFE1100908057F8540817F8340857F8948214442428251046088406 +3F98:008000401FFE100097FC504053F8124833F8524893F812402140208043608C1E +3F99:008000401FFE1010972050C0513016883FFE5100924017F82A48226842508040 +3F9A:008000401FFE1120912455E85530152235A25E1E900013F8200020004FFE8000 +3F9B:008000401FFE100093F8500851F8100833F8500097FC140423F8211040E0871C +3F9C:008000401FFE10009040504057FC1040324852489554184220A0211046089806 +3F9D:010000803FFE20803FFCA0806FF828882FF86888AFF820803FFE408040808080 +3F9E:010000803FFE20002FFCA1206FFC292429246A1CAC042FFC280448044FFC8804 +3F9F:008000401FFE10009040527C524012403FFE5040914412482410206043809C00 +3FA0:008000401FFE10009880557C52101D103110517C93101D10211021104A7E8400 +3FA1:008000401FFE1100911E57D2511211123FF251129292145A2FD4245040108010 +3FA2:008000401FFE104090405FFE504012483248555498E2115022482C4640408040 +3FA3:00803FFE20802140A2206410280837F66080A0802FF82080249042A05FFE8000 +3FA4:008000401FFE1080904057FC540411103208540493F810402040204047FC8000 +3FA5:008000401FFE1000920053BC521412143FD45014920816882A4822144A148422 +3FA6:008000401FFE1080904057FC520811103FFE500093F812082208220843F88208 +3FA7:008000401FFE100093F8524853F8124833F8504097FC10E0215022484C468040 +3FA8:010000803FFE20802FF8A140622024103FFE6010A7D0245027D0401040508020 +3FA9:008000401FFE1000903853C050401FFE31505154975811542354254C40408040 +3FAA:008000401FFE104092485454586213803FF8520893F8120823F8220843F88208 +3FAB:008000401FFE104093FC5204520413FC320053FC9354155425FC29544144810C +3FAC:008000401FFE1000942457A854321522361E510093FC120423FC220443FC8204 +3FAD:010000803FFE20002310AE10625422543F586690A6102B282A28524442448282 +3FAE:008000401FFE1040908053F8520813F8320853F8900017FC204023FC40408FFE +3FAF:008000401FFE100093F8524853F8124833F8500097FE12442228229043088206 +3FB0:010000803FFE2200223CA2246FA4223C22246FA4A8BC28A42FA448C440548088 +3FB1:010000803FFE20402F50A1246A1824083BF66120A1202FFC212042244424881C +3FB2:010000803FFE22102F90A21E6FA422243FD46414A7942488248848944AA49142 +3FB3:010000803FFE288024FCA12464203850298C6100BFFE2210272040C043308C08 +3FB4:008000401FFE1040904057FC51501248344653F8920813F8220823F842088FFE +3FB5:008000401FFE120091085FC850081788303E5788900817882488248847888488 +3FB6:00803FFE200023F8A20863C822482FFE6802B3FC220823F8220843F842088218 +3FB7:00803FFE2000203EAFC0687C28402BFE6A42AA782AC42A3C320054F06494890C +3FB8:008000401FFE102097FE500051F8110831F8500097FE140225FA250A45FA8406 +3FB9:010000803FFE21202128A5B065242524259C6E40A04027FC20E0415042488C46 +3FBA:010000803FFE200027FCA44067F8244027F86440A7FC20042AA44AA450148008 +3FBB:008000401FFE1010972855445582167C3510551095FE15102754249245528420 +3FBC:010000803FFE200029F8A50865F821083DF86524A5182548258445044A0091FE +3FBD:010000803FFE20402880A5F8610821082DF86500A5FC2504250445FC4A0091FE +3FBE:008000401FFE120891105FFE512017FC31245FFE912417FC2330252859268120 +3FBF:010000803FFE22002100AFBE68A22FA428A86FA4AA2229222AAA4CA448208020 +3FC0:010000803FFE20202E2EA42464A424A424A46EAEA424242424444644588E8100 +3FC1:008000401FFE108093F8520853F8120833F8508097FC1210244829F640408040 +3FC2:008000401FFE11109550555057DE102437D45114911417D4210821084FD48022 +3FC3:008000401FFE12A892A857FC52AA14E6380057FC944413F82248224842588040 +3FC4:010000803FFE20002FDCAA146BD42D1629206FDCA9142A942C5448084FD48022 +3FC5:010000803FFE22102410A89C7090229025FE6C10B490249C24904550463E8400 +3FC6:00801FFE1000103893C0504017FC315052489486104017FC20A223144D488186 +3FC7:008000401FFE100097BC508454A4129434A4510093FC120423FC220443FC8204 +3FC8:010000803FFE22282224A57E69482E4822FE6548A9482F7E22484448487E9040 +3FC9:00803FFE204027FCA44467FC20403FFE6404A7FC240427FC240447FC42088404 +3FCA:00803FFE20002F78A2106A502F7C26306B54B28C27F8240827F8440847F88408 +3FCB:00801FFE100013F8920853F8100037BC54A497BC10401FFE215022484C468040 +3FCC:00803FFE20802140A22064103BEC20006F78A94829482F782220455048889104 +3FCD:010000803FFE2000287CAF1471242FCC2AA86FBEAAC82F882AFE4A885088A188 +3FCE:00801FFE104017FC91505FFE111037FC540497FC140417FC240427FC41108208 +3FCF:00803FFE200027F8A0886FFE210827F86310A4A02FFC304023F840404FFE8040 +3FD0:00803FFE2210223EAF4462A822103FA8625EA2222A542B082A104A605600A3FE +3FD1:00803FFE20002FBEA492628A2492222067FEAC2037FE242027FE442047FE8400 +3FD2:00803FFE20402FFCA04067FC20003FFE6002A7F820403FFE20084F7E49488F18 +3FD3:00803FFE204027FCA2486248255428A26318ADF6211021F02240427C454088FE +3FD4:010000803FFE200027FCA44467FC244427FC6000AFBE2AAA2FBE4AAA4FBE88A2 +3FD5:00803FFE20002F3CA9246F3C29242F3C69E4AA242C442B642A244B644A248BEC +3FD6:00803FFE2040207CA04067FE244225F86444A4FC24A824F824A849FC495493FE +3FD7:00803FFE20002300BCFE64103F7C2E44757CA4442E7C2A442A7C53285244A082 +3FD8:00803FFE22082AAAA248651428A22FFE6802A3F8220823F8200047FC440487FC +3FD9:010000803FFE200023F8A2A863F820002FBE6AAAAFBE20402FFE40A043188C06 +3FDA:00803FFE20002FFEA9126FFE2228244469FEAF48227E25482F7E4048557E9540 +3FDB:00803FFE20002FBEA514671C25542FFE6920AFFC29242FFC2A244BB85222A39E +3FDC:00803FFE210027F8A54864A827F8221067F8BD2E27F820002FFC49244FFC8924 +3FDD:040008003FF8200820083FF8200820083FF8020004000820101020087FFC2004 +3FDE:1008103C21E07C204420443C45E044207C20443E47E0442044227C224422001E +3FDF:1020102020407CFC44844484448444847CFC44844484448444847C8444FC0084 +3FE0:1040104422447948495048404FFE48907890489048904892491279124A0E0400 +3FE1:020004001FF010101FF010101FF00000244814500C601450644808421042603E +3FE2:00007CFC448444FC7C8444FC44847D14020808003FF820083FF820083FF82008 +3FE3:100013F822087BF84A084BF849004BFC7C444A444AA44A044BF4780448280010 +3FE4:1040104023FC784049F848804BFC49107A084DF64910491049F07910491001F0 +3FE5:1040104023FE7AA2489049FE49104B107DFE4910491049FE4910791049FE0100 +3FE6:08007F7808483E4800863E782A483E30404884861FF010101FF010101FF01010 +3FE7:102013FE202079FC48004BFE480249FC78204BFE48004BFE48047BBE4AA4038C +3FE8:100013FE22227ACC4A444BEE4A444AEE7B544A444A104A104A5E7A504A5005FE +3FE9:112410A823FE7A0248F848884BFE4AAA7A724BFE48204BFE48207FFE4AA40452 +3FEA:0820082008207F7849284A2848287EA84268422852584C48444A4A8A92862102 +3FEB:208020843E9820E42684387C00801FFC1084108817F01210212020C043301C0E +3FEC:08000800087C7F5449544A5448547E54427C424052404C4044424A42923E2000 +3FED:0C107010401040FE40927E94489048FC58A448A44CA84AA84890492889440282 +3FEE:1010101010107CFE54925494549054FC54A4FEA410A810A82890252845448282 +3FEF:010006C01830EFEE00001FF010101FF001003FFC21042FE82420424041809E7C +3FF0:201010100010FEFE00922894449082FC04A444A428A810A82890452885440282 +3FF1:100C11F0FD0011FE1D10F2101210341001003FFC21042FE82420424041809E7C +3FF2:10101010FE1010FE28924494FE9004FC74A454A454A874A85490052815440A82 +3FF3:082A082A08547F54492A4A2A482A7E0042FE429252924CFE44924A9292FE2082 +3FF4:10101010FF1024FE429281947E9024FC3CA424A43CA824A82E90F52805440682 +3FF5:080008FE08107F2049FE4AAA48AA7EAA42A2429652104CFE44104A2892442082 +3FF6:20101010FE1000FE44922894FE90A2FC10A4FEA420A83CA82490452855448A82 +3FF7:441024102810FEFE10927C941090FEFC20A43EA448A848A88E90792821440282 +3FF8:087C0844087C7F44497C4A0048FE7EAA42FE420052FC4C4444284A1092682186 +3FF9:10101210117C7C1054FE504453287DFE4510657C591049FE5510951022FE0400 +3FFA:7F0841087F08417E7F4A224A7F48227CFFD422544954AAD41C482A8849141822 +3FFB:00001FF0010001000100FFFE0100010001003FF82448244824482448FFFE0000 +3FFC:00003FF808200820FFFE082010202020402000003FF8244824482448FFFE0000 +3FFD:0440082010102FE8C40608000FE00020014000803FF8244824482448FFFE0000 +3FFE:020001007FFE400280043FF001000100050002003FF8244824482448FFFE0000 +3FFF:00007FFC0104110011F81100290047FE80003FF82448244824482448FFFE0000 +4000:100009F841082508092811107102110210FE00003FF8244824482448FFFE0000 +4001:0200FFFE04000FF018102FF0C8100FF00810083000003FF824482448FFFE0000 +4002:01007FFC40040400FFFE08201E4003C03C3800003FF8244824482448FFFE0000 +4003:00007FFC02000D08719002A00CC071A006981A86E1003FF824482448FFFE0000 +4004:020001007FFE42028924284849940E1077F000003FF8244824482448FFFE0000 +4005:20201020FC2009FC102038205420902013FE100000003FF824482448FFFE0000 +4006:01003FF80108FFFE01083FF801007FFC0000110826D01830E00E3FF82448FFFE +4007:1080108011FCFE20102011FC7C20452445247DFC00003FF824482448FFFE0000 +4008:7DFC44207D2045207DFE505048905512620E00003FF8244824482448FFFE0000 +4009:00701F800200FFFE082037D8C4463FF8200827C8244827D800003FF82448FFFE +400A:27BC14A4929444A4404011B02E4EE390206023882070038000003FF82448FFFE +400B:210021FE2220243EF82023FE22AA225223263A52E2AA43FE00003FF82448FFFE +400C:01003FF80108FFFE01083FF801007D7C11107D7C44447C7C44447FFC2448FFFE +400D:1040FEF82948FE3001CE7CF844207DFC44887CF81088FEF810503FF82448FFFE +400E:000003FE7C40444044807C80450045FC7C044404440444047C04440400280010 +400F:100010001FFC200420045FE490241FE410241FE410241FE41024000400280010 +4010:00087E084210422042447E044208421042227E424204420442087E10422000C0 +4011:000001F87C8844C844A87CA8448844507C504450442044207C50448801040202 +4012:0008003C7DE0442044207C20442047FE7C204420442044207C20442000200020 +4013:004000407C40444045F87C48444844487D4844C8444844A87CAA450A02060402 +4014:000000007DFC444444447D44454445447D444644444444847C84450402280410 +4015:000403E478244824482479E4490449047A044BE4482448247824482401440084 +4016:000000007DFC442044207C20442047FE7C204420445044507C88448801040202 +4017:0040004078404BF848487848484848487BFE484048A048A07910491002080406 +4018:000003FC789048904890789048904FFE78904890489048907910491002100410 +4019:00000100797E49124912791249D24F12791249124952499279224822004A0084 +401A:1FF010101FF010101FF010101FF000000C0070FC408440844C84709440880080 +401B:01000100790049FC4AA47CA448A4492479244A444C44488479044A0404280010 +401C:080008001FF82248444808881128221004001FF010101FF010101FF010101FF0 +401D:00100110791049124912791449D84910791049104910491279524992010E0000 +401E:001001107C90449044107D10449044907C10441E47F044107C10441000100010 +401F:0090009078904BFC489478944BFC4A907A904BFE48924892791A491402100410 +4020:00007CFC4484448444847CFC4484448444847CFC4484448444847CFC44840000 +4021:002000207C204420443E7C20442044207DFC4504450445047D04450401FC0104 +4022:00400040788048FC49207A20482048207BFE4820485048507888488801040202 +4023:00000040782048284808788848904A947AA24AA24CC2488879884A8804780000 +4024:102010203F304128A224142208203020DFF010101FF010101FF010101FF01010 +4025:0008001C7DE0450045207D20452045FE7C20442044A844A47D22462200A00040 +4026:00200020782048204BFE78204820482079FC4904490449047904490401FC0104 +4027:01100110791049104BFC79104910491079104FFE4800491079084A0804040804 +4028:0008003C79E0482048207BFE48204820782049FC490449047904490401FC0104 +4029:0080008078F849084B107CA0484048A079184A064DF849087908490801F80108 +402A:00800080793C4A004C807880497E4B087D084908490849087908490801280110 +402B:0040004078A049104A087C064BF8480078004BF84A084A087A084A0803F80208 +402C:0040004078A049104A087C064BF84840784048404BF848407840484007FE0000 +402D:002000107C1045FE44207C24444444F87C124422444445887C10442800440182 +402E:008000407BFC49004900790049F8480079504950495049507A504A520452080E +402F:004800447BFE484048407BFC4A444A447BFC4A444A444BFC7A444A4402540208 +4030:0088788449024A2248207850488849047A0249FC490449047904490401FC0104 +4031:0080008079F849104AA0784049B04E4E79F0484049F048407FFC484000400040 +4032:0100010079FC4A004DF87908494849287BFE49084A484A287BFC480800500020 +4033:002000207BFE4820482079FC4924492479FC4820487048A879244A2200200020 +4034:000003FC780049244A487C904A48492478004BFC484048407840484007FE0000 +4035:00200040788849044BFE7882488049FC7A2048204BFE48207850488801040602 +4036:008000407BF84A084A087BF84A084A087BF84A404A444A287A104A8803060200 +4037:00880088788849C8489E788A488A4BEA788A488A490A494A7BEA4912002A0044 +4038:080C08F07E8008800EFE78880888290812081FF010101FF010101FF010101FF0 +4039:0020002078204BFE482078204924492479244AAA482048507850488801040202 +403A:108020FC6910AA9028602890230C00001FF010101FF010101FF010101FF01010 +403B:0020002079FC492449FC792449FC48007BFE4880490049FC7804480400280010 +403C:000003FC7A004A004AF87A004A004BFC7AA04AA44AA84A907A904C8804A408C2 +403D:0004000E7BB8488848887928492E4BA878A84AA84AA8493E79004A80047E0800 +403E:0000FEFC104420287E10A2283EC600001FF010101FF010101FF010101FF01010 +403F:0104010EF130912097E0F120913E9164F1A4972491249124F124912405440284 +4040:1FF010101FF010101FF010101FF0080C08F07E8008800EFE7888088829081208 +4041:004000207BFE4800480079FC49044904790449FC482048A879244A2200A00040 +4042:7EFC48447E4442287E1048287EC600001FF010101FF010101FF010101FF01010 +4043:002000207BFE4820482079FC482048207BFE484048A449A87A904C8800C60080 +4044:0020002079FC482048207BFE4888485079FC482048204BFE7820482000200020 +4045:000001FC7808481048207BFE482048A0784049FC495449547954495407FE0000 +4046:004000807BFC49104A487C464BF84A487A484BF84A484A487BF848420042003E +4047:020001007FFE4202A96C49940E1077F000001FF010101FF010101FF010101FF0 +4048:104008403E7E228823503E20205841869FF010101FF010101FF010101FF01010 +4049:104808443E7E23C022243E282212206A41869FF210101FF010101FF010101FF0 +404A:000003F87948491048A0784049B04E0E79F8490849F8490879F8490801F80108 +404B:0048014879484BFE494879484978490079FE48204BFE487078A8492406220020 +404C:000003FE7A224BFE4A227BFE480049FC790449FC490449FC7904490401140108 +404D:00140012F01097FE9410F41095D09412F41295D495549548F5DA942A08461082 +404E:004000207BFE480049FC790449FC48007BFE4A0249FC48207820482000A00040 +404F:000003FE785048504BFE7A524A524BFE780048404FFE48887990486000D80304 +4050:008800887BFE488848A8782049FC4924792449244BFE48207850488801040202 +4051:000001F8790849F8490879F848004BFE790049FC4A544C9479244A4400A80110 +4052:000001F87908490849F878004FFE490879F8490849F84908793E4FC800080008 +4053:000000887A524A224A527A8A4A024BFE788849444A7A48887950482000D80706 +4054:001E03E078444924488879FC484048407BFE488048FC494479284A1000680186 +4055:000003FC7A044BFC4A207BFE4A104A8A7B0648004BFC4A047BFC4A0403FC0204 +4056:0020012478A848204BFE78A849244A0278404BFE488849087990486001980604 +4057:002001247924492449FC78004BFE480079FC4904490449FC7888485003FE0000 +4058:0008003C7BC048044A44792849FC4A2078204BFE482049247924492401FC0004 +4059:000001FC790449FC490479FC48204BFE7A0248404BFE48887990486000980304 +405A:000001F87908490849F878004BFC4A047BFC4A044BFC4A047BFC489001080204 +405B:002000407BFC4A244A247BFC4A244A447BFC484048A848B4793C49220222041E +405C:000001FC7D0445FC45047DFC442045247CA8442047FE44907C9045120212040E +405D:08202AA42CA84920145022887FFE40029FF410101FF010101FF010101FF01010 +405E:082014502288082014502288FFFE08001FF028104FF088100FF008100FF00810 +405F:0108008878904BFC484079F848404BFE7880490049FC4A207C20482003FE0000 +4060:011000A078004FFE48A07BF848A84FFE78A84BF848A049B07AA84CA600A000A0 +4061:000003DE7A524BDE4A527BDE4A024A227A224A224A524A4A7A8A4A02020A0204 +4062:02100110F11097BE9240F20093BE928AF28892A892AE92A8F4A895A8085E1080 +4063:00207BFE482049FC492479FC492449FC78224BFE48084BFE7908488800280010 +4064:004000207BFE488848507BFE4A224AFA7A224AFA4A8A4A8A7AFA4A02020A0204 +4065:000003FE7A484A484BFE7A484A204BFE7A404AFC4B444A447A7C4A0003FE0000 +4066:0040007C78404BFE4A427A784BC44A3C7A004AFC4A844AFC7A844CFC048409FE +4067:008800887BFE488848F8782049FC492479FC482049FC48207BFE485000880306 +4068:0200011EF7D2901297D4F45497D89014F7D29092911291DAF714911005100210 +4069:0040004078F849084A1079FC4924492479FC4924492449FC78004954012A022A +406A:02000202E23CAFA0A220EFA0AABEAFA4EAA4AFA4A224AFA4E224A24402440284 +406B:000001FC792449AC4974792449FC482079FC48204BFE48007AA44A5204520000 +406C:0104008878004BFE4A227AAA4A724A227BFE480049FC490479FC490401FC0104 +406D:002800247BFE4850488879044A024998795449104BBE49107AA84AA804440882 +406E:000007BCF108952897BCF31895AA9946F00093F892089208F3F89208020803F8 +406F:004000A0F11896E69000F3F8920893F8F00097BC908494A4F29494A402940108 +4070:000000FEF0109720927CF2449244927CF244927C93C49E44F07C902800440082 +4071:0020002079FC48204BFE79084B9C490879884E3E48004BFE789048900112020E +4072:000003FE7A524A524BFE780049FC490479FC490449FC490479FC488801040202 +4073:008800887BFE488848247BFE4850488879044A8A48884BFE7888488801080208 +4074:00400FFEF00097FC9404F5F4951497FCF00093F8920893F8F20893F800000FFE +4075:000001FC7954495449FC78004BFE480079FC490449FC48627894498802A400C2 +4076:01080208F7C8945097DEF46497D49214F11497D4921493C8F2489454055408A2 +4077:0A803138228838382288393822887FFE40029FF410101FF010101FF010101FF0 +4078:009003FCF29493FC9294F3FC900093FCF20092F8920093FEF520951405480986 +4079:001003C87A7E4A404A627BD44A004A3E7BC84A484E7E4A487A484BC802480008 +407A:000001FC795449FC482079FC48204BFE7888485049FC48207BFE482000200020 +407B:044404E4E8A8AAAAAEEEE4A4AAAAAEEEE242A040AFFEA0E0E150A2480C460040 +407C:01FC792449AC492449FC782049FC48207BFE49544A2A482079FC482003FE0000 +407D:01240248792448004BFC7A944A644A947BFC4A484B684A487B6A4A4A02460362 +407E:010807FE790848004BFC7A944A944BFC78284BFE4A204B247AA84A92042A08C6 +407F:7F146B125D107F7E08107F100828FFA855449FF210101FF010101FF010101FF0 +4080:011007FCF04093F89040F7FC900093D4F11297FE93509534F38C908A02960102 +4081:01F00210F7FC920493FCF22493B89222F1FE921097FC9244F3FC90D0014A063E +4082:07BC04A4F7BC94A497BCF4A497BC9120F3FE922097FC9A20F3FC922003FE0200 +4083:003C07C0F244912897FCF4A497FC9008F78894FE978894A8F798950805A80690 +4084:03DE7A524BDE4A524BDE78A049FE4B207DFC492049FE480079FC48880070078E +4085:044404E4EA0AAEEEA404EAEAAE0EA0E0EAAAAAEAA040A7FCE444A7FC00440FFE +4086:00407C400440287C10840884FF041A4428242824480448048804080428281010 +4087:00007CFC0424282410240824FE241AFC28442844484448448844084429FE1000 +4088:00107C10041028FE10920892FE921A9228FE289248104814881209FE28821000 +4089:0080F8BC0884510821FE1320FD20357C3190511051FE51109128112851442182 +408A:0080F8F8090853FE25121122FDFE344030A25354509853349054109253502020 +408B:100010FCFE4810307DFE44527C94111012307C2011FE50707CA8112412221020 +408C:0020F9FC0888505023FE1000FDFC352431FC512451FC502091FC102053FE2000 +408D:01FCF90409FC510421FC1088FDFC348833FE5088512452AA907010A851242060 +408E:0528FFBE094857BE231815AAFD4637FC320453FC520453FC920413FC51082204 +408F:200021FC3C445044904410441094FE88110010FC108428842484448440FC8084 +4090:2020202021247D245124912411FCFC2010201124112429242524452441FC8004 +4091:2048204820487D48514A916C1148FD48114811481148294A256A478A41068000 +4092:202020203C2053FE9020102011FCFE00100011FC110429042504450441FC8104 +4093:200021FC21047D0451FC91041104FDFC1104110411FC2850249044924112820E +4094:2020202021FC7C20502093FE1088FC5011FC102010202BFE2420442040208020 +4095:208020FC21047DF8500893FE1040FCA21334105810942B342452449043508020 +4096:0000FFFE020002100408040408000FF81808280848088808080808080FF80808 +4097:00400040FE401044104420483E5062606240A2C0234022443E442244003C0000 +4098:000003FCFD041144112420A83C8864886450A450242024203C50248821040602 +4099:0000007CFE441048104820503E4862486244A244224422683E50224000400040 +409A:00080088FC501020105020883D0064086488A488245024503C20245020880306 +409B:000001F8FC081050102020103DFE64226424A420242024203C20242020A00040 +409C:00200020FC2013FE102020203C2065FC6420A420242027FE3C20242020200020 +409D:00500048FC481040105E21E03C4064446444A448243024223C52248A23060002 +409E:0000FFFE040008001FF02810C8100FF001000100FFFE054009203118C1060100 +409F:080008007F7C094411441144257C42000000FFFE08001FF82808C8080FF80808 +40A0:00400040FC8010FC112022203C20642067FEA420245024503C88248821040202 +40A1:0008001CFCE01080108020803C8064FE6488A488248824883C88248821FE0000 +40A2:00400040FC7C1084118822503C2064506488A706246024103C0824C020200010 +40A3:00900090F8902290229242D47A98CA904A904A904A904A927AD24712020E0000 +40A4:00880088FC881108117E23083D0865486528A528250825083D08250821280110 +40A5:000001FCFD041104110421FC3D20652065FEA520252025103D12254A21860102 +40A6:00200020FC501088110422123C2064406588A410242024443D88241020600380 +40A7:00800080FC8011FE110222043C2064206528A524262426223C22242020A00040 +40A8:0008001CFDE01100110021003DFE65106510A530251825143D12221002100410 +40A9:000001FCFD041124112421243DFC65246524A554254C258C3D04250421FC0104 +40AA:00900090FC901292119420983C9065986694A492249024903D1225122212040E +40AB:00800080F8FC21082290406079984E26C82049FC48204A207BFE482000200020 +40AC:00007DF01110119011521D12E20E44000000FFFE08001FF82808C8080FF80808 +40AD:00400020FC2013FE100020883D0466026488A488245024503C20245020880306 +40AE:080008007F7C08243E2408447F5408880800FFFE08001FF82808C8080FF80808 +40AF:00200010FC1011FE110021103D106510657CA510251025103D10221002FE0400 +40B0:004200E2FB82208A208A408A7BEA488AC98A49CA4AAA4A827C824882008A0084 +40B1:01040084FC88101011FC21043D04650465FCA450245024903C922512220E0400 +40B2:08207E2008FCFF24102424447E5422880100FFFE08001FF82808C8080FF80808 +40B3:00200020FCA810A810A821743E2264206420A5FC242024203C20242023FE0000 +40B4:00400020FDFE1000100020FC3C00640064FCA400240024FC3C84248420FC0084 +40B5:000001FCFC20102013FE20003C0065FC6504A524252425243D54248821040602 +40B6:00880088F88821C8209E408A788A4BEAC88A488A490A494A7BEA4912002A0044 +40B7:001C01E0FC20102013FE20203CA864AA67ACA4A824AA25AA3EA6242020200020 +40B8:00140012F81027FE201040107BD2CA524A524A544BD4480878EA471A02260042 +40B9:00200040FCFE1124129820503C6067806420A42424A424A83D30245020880306 +40BA:000001FCFD24112411FC21243D2465FC6420A7FE247024A83D24222200200020 +40BB:000000FCFC8010F8108020F83C8067FE6540A524252825103D08254421820100 +40BC:00200020F85020882144422279F84808C850482048A44A827A8A4A8A04780000 +40BD:00200020FC3E102011FC21043DFC650465FCA524242027FE3C20242020200020 +40BE:00200020F82023FE2020412479244924CAAA487048A848A879244A2204200020 +40BF:00200022FBB420A820A841247AA24840C9FC4904490449FC7904490401FC0104 +40C0:00200020FBFE202021FC40247BFE4824C9FC48404BFE488479C8483000CC0302 +40C1:000001FEFC481048104821CE3D0265026502A5CE244824483C48244821FE0000 +40C2:000001FCFD04110411FC21043D0465FC6400A51225D425183D1025522192010E +40C3:000003FEFA02228A225243FE7A424A22CBFE4A824A824A827AFA4A02020A0204 +40C4:00400020FBFE2000200041FC79044904C90449FC482048A879244A2200A00040 +40C5:01040088FC5011FC112421243DFC65246524A5FC242024203DFE242020200020 +40C6:00840084FDFE1084108420FC3C84648464FCA484248425FE3C00244820840102 +40C7:00200040FCFC108410FC20843CFC64206420A5FE252225223D2A252420200020 +40C8:01100112FDD41118115221923D2E644065FCA504250425FC3D04250421FC0104 +40C9:000001FCFD0411FC111021FE3D10654A6586A40025FC25043DFC250421FC0104 +40CA:00900090FBFC2090200041F879084908C9F84908490849F87908490807FE0000 +40CB:004000A0F910220825F640007BC44A54CA544BD44A544A547BD44A44025402C8 +40CC:000003FEFC50105011FC21543D54655465FCA420242025FC3C20242023FE0000 +40CD:01040088F80023FE204040C27922CA54489849384A5448947912461000500020 +40CE:00000040FBFE20882104464278FC4B08C8B048D04F3E48C27B24481800600780 +40CF:000001FCFD0411FC110421FC3C20652065FEA620242025FC3C20242023FE0000 +40D0:00400020FBFE2202208841047A224828C8244BFE482048507850488801040202 +40D1:0100023CF7A424A426A445A474C2DF8054BC54A456A455A474945488049409A2 +40D2:000003FEF80021FC2104410479FC4800CBFE4A8A4A524BFE7A224A22022A0204 +40D3:00880088FBFE208821FC40887BFE4820C9FC492449FC49247BFE490401140108 +40D4:00200010FDFE1102100020FC3C84648464FCA40025FE25023D02250221FE0102 +40D5:08202AA42CA84920145022887FFE40028004FFFE08001FF82808C8080FF80808 +40D6:00400080F9FC2104210441FC7900C9FE490049FE48024AAA7AAA440200140008 +40D7:000203E2F82221EA202A47FA788A4AAAC9CA488A49CA4AA27C924882028A0104 +40D8:000003DCFA9423D4225443C87A884A94CBE24800482049FC7820482003FE0000 +40D9:00400020FBFE2250225043FE7A52CA524BFE4A004A924AD47A98449204D2088E +40DA:04200220F23E2F4024A04420773CD5505510551055FE5510752859280B441082 +40DB:00100010FAFE2110217C4054787C4B54C97C491049FE491079104A90047E0000 +40DC:00007F7848485F4C64805F7844484A4851307F4C00007FFC08001FF868080FF8 +40DD:02080248F7482290229E4FE47114D2145FD45494591451C87F08511405140222 +40DE:08407F4022F83E4800483EC804487EAA08AA290612027FFC08001FF868080FF8 +40DF:02880288F7C82290229E4FD47024D7D4545457D4545457C874485454046404C2 +40E0:02100110F11027BE2240420073BED28A528852A852AE52A874A855A8085E1080 +40E1:000003DEF88822A823FE41887ADA4CA6C9F84908490849F87908490801F80108 +40E2:02100210F51024BE282247447210D2105F1052105AA85728722853440C440082 +40E3:000E03F0F8442224210843F87A08CBFC4A044BFE4A024AAA7AAA450204140808 +40E4:004003F8F04827FE204843F87040D554575C544457FC5444775C555405540844 +40E5:002001FCFC88105013FE20003DFC652465FCA52425FC24203DFC242023FE0000 +40E6:08407F40227E3E8801483E4804507E200850288C10007FFC08001FF868080FF8 +40E7:008079F84A884870538E492049FC6A2050F84020FFFE04000FF83808CFF80808 +40E8:000003BEF8A220A220BE43887A08CA3E4A2A4BAA48AA48BE7888408A057E0202 +40E9:005001FCFD5411FC115421FC3C0065FE6500A57C250025FE3D50255421480266 +40EA:002003FEF80023FC220442F47A944BFCC80049F8490849F8790849F8000003FE +40EB:010001F8FA0827FE228843247BFECA004AFC4A004AFC4A007AFC448404FC0884 +40EC:00400248FA4823F8208043F87A484BF8CA484BF8484848B478BC49220222041E +40ED:00140012F7FE241025D0441475D4D55855CA54165442582472A2528A04780000 +40EE:00100410F27C201020FE40447628D2FE5210527C521052FE7210521005FE0800 +40EF:00200040F8F8228A218C40F8798C4A8AC8F848204BFE487078A8492406220020 +40F0:00800040F7FE24022A2443BC74A4DAA8551052E854045BFA70405248044400C0 +40F1:01140112F7D2211021104FFE7290D6D2529256D2529456D4728A52CA0F160022 +40F2:010003DCFA542366224047DC7A544B48CA544CA248004BFC7A944A9407FE0000 +40F3:01240248F924200023FC42947A644A94CBFC4A484B684A487B6A4A4A02460362 +40F4:04100210F07A27122014477E7008D710503C576455A4553C75245724053C0024 +40F5:004007FEF00023FC224043F87240D3F8524053FC5004555470A853100D480186 +40F6:00400020FDFE100011FC21543DFC64206522A48C252224543CC8254422520060 +40F7:00400FFEF40027FC200047FC7404D7FC50805C9C57D45D54755C5C9615562E22 +40F8:0148014CFAAA200827FE41487B68494ACB6A494C4B6C4948796A4B9A00260042 +40F9:03DE0252FBDE225223DE42227AFA4A22CAFA4AAA4AFA4AAA7AFA4A7202AA0226 +40FA:002007FEF48827DE248845DC76AAD488545057DE545055DC74505BDE08501050 +40FB:03FE0020F7FE242221AC428077DED2925392511E57D2555277DE51120FD20126 +40FC:1020082008207E200420082808241C222A224A20882008200820082008200820 +40FD:202010201020FBFE08201020102039FC54849488104810501020105011881606 +40FE:201011101110F9120912111411D83910551095101110111211521192110E1000 +40FF:202010201020F82009FC10201020382055FE9420105010501088108811041202 +4100:209010881088F88008BC13C010803888548894901060104410A41114120C1004 +4101:204811481148F948094813FE1148394855489548117811001100110011FE1000 +4102:202010201020F82009FC112411243924552495FC112411241124112411FC1104 +4103:202010201020F9FC0924112419243524512493FE102010501050108811041202 +4104:200011FC1104F9240924112411FC392455249554114C118C1104110411FC1104 +4105:0100111009203FF802007FFC082010102FE8C0063FF801001110210845040200 +4106:2008103C11E0F820082013FE10203820542095FC110411041104110411FC1104 +4107:200011FC1104F904090411FC1000380057FE9420102011FC1020102013FE1000 +4108:200013FC1000F80009F811081108390855F89400110810881090100017FE1000 +4109:201010D81394F894089013FE10903894549490D81398109010AA10CA12861102 +410A:202010201020FBFE08201020102039FC5440942010A41282128A128A14781000 +410B:2020102013FEF85008881124122239FC552495FC112411FC10221022101E1000 +410C:400023DE2042F94A1084114A225234206800ABDE205221522094214822542422 +410D:208810881088FBFE0888108817FE380055FC9504110411FC1104110411FC1104 +410E:2020102011FCF8500888110413FE380855E89528112811E81128100810281010 +410F:2088108813FEF8880800101C19E03420502093FE102010501050108811041202 +4110:1000540054FC7C8492849284FE8400FC7C800080FE80108254829282507E2000 +4111:201C13E01220FBFE0A201292130A3A0655FC9504110411FC1104110411FC1104 +4112:202010201050F8880944122211F838085450942010A41282128A128A14781000 +4113:2020104011FCF90409FC110411FC380057FE9420102011FC1020102013FE1000 +4114:2004101E13E0F82009FC1124192435FC502093FE1222122A12FA1202120A1204 +4115:2020102213B4F8A808A8112412A2384055FC9524112411FC1124112411FC1104 +4116:404020A02110FA0815F6100023C432546A54ABD42254225423D42244225422C8 +4117:405022522252FA5213DE1202220233FE6A02AA0223DE22522252225224522802 +4118:2020101011FEF884084811FE11023A24541095FE1040107C1044108410941108 +4119:200013FE1202F80009FC110411FC390455FC9440102013FE1000108811041202 +411A:4090209027FEF89013FC129423FC32946BFCA80021F8210821F8210821F82108 +411B:202011FC1124FBFE092411FC102039FC552495FC104013FE108811D01070138C +411C:2040102013FEF80009541124195435FC502093FE1242129212FA120A12021206 +411D:2020102013FEF82009FC10401BFE348851049242159C110411DC110411FC1104 +411E:4100211023DCFA5415541288210832F46C02A80023FC20402150224825442080 +411F:01F03E0003F03E0003FA7E0201FE0C20703C1DE2F0221C1E0000FFFE11102308 +4120:202013FE1000FBFC0A0412F412943BFC540095F8110811F8110811F8100013FE +4121:208010F81108FBFE0944119211FE3900557C9500117C1100117C1244127C1444 +4122:4080204027FCF91010A41F58255435526B58A800220823F8220823F822082408 +4123:202013FE1020F9FC080013FE12523BFE550495FC110411FC110411FC10881104 +4124:4108210827CEF912112417DE2552355E6FD2A91E2392255E2940211421122122 +4125:47FC20402FFEF84213581040235830006EEEAAAA2EEE20002FFE224825542FFE +4126:04000EFC780408080810FF20082018201C202A202A2048208820082008A00840 +4127:04000E0079FC08440848FF480850185E1C422A422A8248828882090209140A08 +4128:08001DFCF02010201020FC20102033FE38205420542090201020102010A01040 +4129:04200E28782408240820FF2E08F018201C202A202A2048108812080A08060802 +412A:08401C40F08010FC1104FE041004310438845444544490041004100410281010 +412B:04000E0078FC08040804FF04080418FC1C842A802A80488088820882087E0800 +412C:08201C20F0201120112CFD34116433A439245534552891221122110210FE1000 +412D:08081C3CF1E010201020FC20102033FE38205420542090201020102010201020 +412E:08201C20F020102011FCFC201020382035FE5420505090501088108811041202 +412F:04000EFC784808480848FF48084819FE1C482A482A4848488848084808880908 +4130:08001DFEF00810881088FC88110831FE38185428544890881108120810281010 +4131:08401C20F02013FE1080FC80108030FC38845484548490841104110412281410 +4132:08201C20F02011FE1122FD22112231223952554A558A910211021102110A1104 +4133:08201C20F02011201120FD20113C312039205520552091201120112017FE1000 +4134:08001CFCF08410841084FCFC10843084388454FC548490841104110412141408 +4135:00701F80010001007FFC054009203118C00601001FF011001100FFFE01000100 +4136:08901C90F09013FC1094FC9413FC3A90369053FE50929092111A111412101410 +4137:08001C00F3FE10201020FC40104038FC35845284548490841084108410FC1084 +4138:08201C20F04011FC1104FD041104310439FC5504550491041104110411FC1104 +4139:00F83F0001007FFC092011102288CC643018C1E61F000100FFFE010001000100 +413A:08201C20F3FE102011FCFC2411FC312039FE5422542A90541050108811041202 +413B:08901C90F09012921194FC98109031983A94549254909090111211121212140E +413C:08001DFEF02010201020FDFC112431243954554C558C91041104110411FC1104 +413D:08001DFCF05010501050FDFC1154315439545554555C91841104110411FC1104 +413E:08281C24F024102013FEFC2011243124392457A8552891101212122A14461082 +413F:08201C20F1FC11241124FDFC1124312439FC542054249018103210CA13061002 +4140:08021C02F3E2110A110AFDEA112A3A2A372A52AA544A904A10821102120A1404 +4141:01007FFC40040400FFFE08201E4003C03C3801E01F0001007FFC05401930610C +4142:08801C80F0F811081310FCA0104038A03518520655F891081108110811F81108 +4143:00007DF01110119011521D12E20E440000E01F0001007FFC05401930E10E0100 +4144:08401C40F1FC10441084FC8411283210390857DE554A914A114A1252135A14A4 +4145:08201C20F1FC10201020FC2013FE30003820542055FC90201020102013FE1000 +4146:08101C10F210113E1122FC441010389034905310512891281128114410441082 +4147:00007FFC04403FF8244824483FF8000000E01F0001007FFC05401930E10E0100 +4148:0100111009203FF802007FFC082010D02F08C1061FF005400920111061080100 +4149:08001DFEF04810481048FC481248314A394A554C544890481048104813FE1000 +414A:08401C20F3FE12001200FE0C12F032203A20563E53E0922014221422181E1000 +414B:08801C80F0F811081210FDFC11243124392455FC54509050109010921112120E +414C:08001CFCF084108410FCFC0011FE3102390255FE5502910211FE1102110A1104 +414D:08001C06F3B810881088FD08113E3B88348852885288913E11001280147E1800 +414E:081C1DE0F020102013FEFCA81124322239F85488549090BE1102110212141408 +414F:08001DFCF104110411FCFD00111831E0393855E0553C91E011221222121E1400 +4150:08001DF8F108110811F8FD08110831F83908550855F89090109011121212140E +4151:08081C3CF3C010441224FD28110030403BFE5488510893901060105011881604 +4152:08901C90F3FE10901090FC40102033FE39005500550091001100110011F81000 +4153:12003A00E23C27D42454F854275435546D546554A74825482048205422942122 +4154:08921C92F12412481124FC921092300039FE5522552291FE1122112211FE1102 +4155:08001DFEF102110211FEFD10111031FE39105510557E914211421242127E1442 +4156:08201C20F3FE10501088FD24122231FC392455FC552491FC10221022101E1000 +4157:081C1DE0F020102013FEFCA811243A42344053FE5088910810D0103010481184 +4158:08201C20F02013FE1020FD24112431243AAA547054A890A81124122214201020 +4159:08001DFCF104110411FCFD04110431FC3800551255D49118111011521192110E +415A:08201D24F0A8102011FCFC4013FE3888350452FA5488908810A810921082107E +415B:08FC1C84F08410FC1084FC8410FC300039FE5502550291FE1102110211FE1102 +415C:08081C3CF1E0102013FEFCA810A830A83BFE54A850A893FE1020102011FC1000 +415D:08401C20F02013FE1202FC9411083204380055FC542090201020102017FE1000 +415E:08001DF8F10811F81108FDF8100031FC381057FE541091101090101010501020 +415F:00401848708411FE1020FBFE108831243A425588501090621184101810601380 +4160:08001DFCF104110411FCFD04110439FC340053FE50209120113C112012A0147E +4161:08001DFEF020104011FCFD04110431FC390455FC5504910411FC100010881104 +4162:08201C20F3FE122213FEFE2213FE300039FC550455FC910411FC110411141108 +4163:08201C40F1FC110411FCFD0411FC30003BFE5420542091FC1020102013FE1000 +4164:08081C3CF1E010201020FDFE102030A0392C5524552491AC1124112411FC1104 +4165:08001DFCF10411FC1104FDFC108031FE3A2255225552910211FA100210141008 +4166:08881C88F3FE10881088FC0011FC31243924552455FC91241124112411FC1104 +4167:08401C20F3FC10001108FC9013FE300039F85508550891F81108110811F81108 +4168:081C1DE0F020102013FEFCA81124322239FC5504550491FC1104110411FC1104 +4169:08201C20F3FE102011FCFC881050302038585586540091FE110211FE10841102 +416A:08201C20F1FC112411FCFC2013FE300039FC5504552491241124105010881304 +416B:08401C20F3FE10001000FDFC110431FC390455FC542090A81124122210A01040 +416C:09041C84F088100013FEFC00108831043A0255FC555491541154115417FE1000 +416D:08201C10F1FE10841048FDFE11023224381055FE5440907C1044108410941108 +416E:08201C20F050104810A4FDFE128430FC388454FC548090FC11441144127C1044 +416F:08201C10F1FE1110117CFD1411FE3114397C5510557C914411441244127C1444 +4170:08001DFCF124112411FCFD241154318C390455FC5440902010A4128A128A1478 +4171:08201D24F124112411FCFC0013FE300039FC5504550491FC1088105013FE1000 +4172:08401C44F1F8105013FEFC4010F831823A7E540055FC910411FC110411FC1104 +4173:08801C80F1FC12441154FDF4108431283A9055FC5244955411F4108411281210 +4174:0020182073FE102013FEFA42148C31F03820544453FE90221128122414A41040 +4175:09041C84F088100013FEFC20102039FC3420542053FE900012A4125214521000 +4176:08001DFEF100117E1100FDFE1154314839645542550491FE114412241204140C +4177:08881C88F3FE108810A8FC50108831743A22542055FC902010A8112412A21040 +4178:08881C88F3FE10881040FC2011FC3888345053FE5020902011FC102010201020 +4179:08201DFCF12413FE1124FDFC102031FC392455FC504093FE108811D01070138C +417A:08001DFCF05011FC1154FD5411FC300039FC540057FE902010A8112412A21040 +417B:08401C20F3FE10001154FD24115439FC342053FE5242929212FA120A12021206 +417C:08001DF8F10811F81108FDF810003BFC369453FC500091F81090106011981606 +417D:08007F7808483E4800863E782A483E30404881E41F0001007FFC05401930610C +417E:00001BDE708812A813FEF98812DA34A639F85508510891F81108110811F81108 +417F:08881FFEF088100011FCFCA810A833FE38A854A855FC902013FE102010201020 +4180:08001DFCF12411AC1174FD2411FC382035FC502053FE900012A4125214521000 +4181:08001DFCF15411FC1020FDFC102033FE3888545055FC902013FE102010201020 +4182:10203BFEE288225023FEFA5022FC32546BFE6254A2FC225022D8255426522850 +4183:211017FC004073F8120813F812082FFE400001E01F0001007FFC05401930610C +4184:08101DFEF00011FE1102FD7A114A39FE340054FC508490FC108410FC100011FE +4185:0A201D3EF04210941310FD28104631FC390455FC550491FC110411FC10881104 +4186:08F81C88F08810F81000FDDC1154315439DC542057FE907010A8112412221020 +4187:1000E7FC248425E42524FDE4252435E46D0465F4A50425F42414255625562832 +4188:1000E4FE228222FE2080F8AA2E9C32AA6A8062A8A2BE22C822BE2288250828FE +4189:10003BFCE294229423FCF910225233DC681263CEA24023D2225C23D0225222CE +418A:00941B987092118E1280F9FC112431FC392455FC508891FC108813FE10881104 +418B:108039F8E20827FE2252FBDE2050335E695267DEA152235E215027D22152233E +418C:0394191077BE111813AAFD46102033FE380057FC500093FC100013FC120413FC +418D:12103910E7DE2010245EFA8227DE30106FDE6450A7DE245027DE2450245224CE +418E:1148394CE2AA200827FEF9482368314A6B6A614CA36C2148216A239A20262042 +418F:09241CA8F3FE10A81326FDFC112431FC392455FC548893FE108817FE11041202 +4190:01001FF002007FFC082037D8C1063FF811107D7C2020FEFE5454BABA10105454 +4191:020001007FFE400288241010200800007FFC0100010001000100010005000200 +4192:020001007FFE40028824121022081FE002200A200420062009221022201E4000 +4193:020001007FFE4002882411102208044008201FF004500440044008441044603C +4194:020001007FFE48229114210801003FF82108210821083FF82108010001000100 +4195:020001007FFE4822911401003FF0011001100110FFFE0280044008203018C006 +4196:020001007FFE48229014220802007FFC0400048008801100222044108FF80408 +4197:020001007FFE48229014200800007C8844884488448844987CE8448800080008 +4198:020001007FFE4822901420081FF0111011101FF0111011101FF0111001000100 +4199:020001007FFE4822901400007FFC01000100110011F8110011001100FFFE0000 +419A:020001007FFE4822901400003FF820082FE8200827C82448244827C820082018 +419B:020001007FFE482290140000001879E048404840487E4BC0484078444844003C +419C:020001007FFE4822941404007FFC08001FF028104FF088100FF0081008500820 +419D:020001007FFE400288241010210802003FF824482448244824482448FFFE0000 +419E:020001007FFE482290141FF010101FF010101FF0000010F01F00100410040FFC +419F:020001007FFE4822911422880C603018CFE600001FF01010101010101FF01010 +41A0:01007FFE4822901400003FFC210021003FF8200820083FF8210021003FFC0000 +41A1:020001007FFE4822921401001FF010101FF010101FF011081090126014181806 +41A2:020001007FFE482290141040FDF810481448184833FED04010A0111052082406 +41A3:020001007FFE4822901400003FFC20002FF820003FFE2908289048604A188C06 +41A4:01007FFE4822901402001FF010101FF010121FF410187FF001900E10F0500020 +41A5:020001007FFE482290147FFC02000D08719002A00CC071A006981886E2800100 +41A6:020001007FFE482291140910092012C0043019086914091012A004401830600C +41A7:01007FFE482290741F8001007FFC05401930E10E04007FFC08201C4003807C78 +41A8:01007FFE482290141FF010101FF010101FF000003FF801007FFC04401830E00E +41A9:01007FFE482290141FF010101FF010101FF010101FF002007FFC04401830E00E +41AA:1040102095FC550458501088FD04280028F828202820282029FC4800480287FE +41AB:01007FFE4822901408001FF82A4844480A88110822A8041001004884481287F2 +41AC:01007FFE482290140FE008203FF820083FF820083FF820083FF8082010102008 +41AD:01007FFE4822901408007F7C08107F1049107F1049FE7F100810FF9008100810 +41AE:01007FFE4822901423F8100811F8800843F8500017FC2404E3F8211020E0271C +41AF:01007FFE4822BEFC12480C3032C800003EF812480C3032C8FFFE082007C07838 +41B0:020001007FFE482290143FF8200027F0241027F020002F7829482F7820003FFC +41B1:020001007FFE482290142040124890B04108460410402244E44820A023182C06 +41B2:01007FFE482291143FF820802FF820883FFE20882FF824C422A8449858868180 +41B3:01007FFE4822901423FC10801144066870B01128166810A4112416A0284047FE +41B4:01007FFE48229FD410403FF051101FF011103FF821083FF821083FFA010200FE +41B5:020001007FFE4822901408207FFC511449247FFC00001FF010101FF010101FF0 +41B6:01007FFE4822911408801FFC30805FF810801FF810801FFC1000248822444244 +41B7:01007FFE482290141FF002207FFC04887A8001003FF8282837D8244827C82018 +41B8:020001007FFE482290947EA00444282817D02008DFF610101FF0082004407FFC +41B9:01007FFE49229FF404407FFC00001FF011101FF011101FF001003FF80100FFFE +41BA:01007FFE4822901400F83F0011100920FFFE09203018DFF611101FF011101FF0 +41BB:020001007FFE482290147C200420FF3E22443EA422283E282390FE2842440282 +41BC:01007FFE4822901421F8110811E8012873FC120412F4129412F412142A0847FE +41BD:01007FFE482291FC01003FFC21042FE021082FF823002C9023605CD843469CC0 +41BE:01007FFE482290143F2024203F3E21403F5024883F0800003FF824482448FFFE +41BF:01007FFE4822905409FC490449FC490479FC090409FCF8204BFE48A849248A22 +41C0:01007FFE482290142200FF7E22243E3C08247F24493C7F240826FF7C08040804 +41C1:01007FFE4822901420443E2844FEFF1049107F7C49107F1000FE55104A908A90 +41C2:0200010001007FFC00001010082004400000FFFE010001000100010001000100 +41C3:1000080008FC7E8400840484448444FC2484288028800E82F0824082007E0000 +41C4:1040084008407EFE00800500447C44082410282028400E80F102410200FE0000 +41C5:1050084808487E40005E05E0444044442444284828300E22F052408A03060002 +41C6:1008088808487E4800080488444844482408280E29F80E08F008400800080008 +41C7:200011FC1104FD04010409FC8920892049FE4920512051101D12E14A41860102 +41C8:200011FC1084FC880050082088D88B064820482051FC50201C20E02043FE0000 +41C9:2000100013FEFC2000200840884088FC49844A84548450841C84E08440FC0084 +41CA:202010101010FDFE010009108910891049104920512851241E44E2FE44420800 +41CB:10200820087C7E840148043044284448259E282228420EA4F018401000600180 +41CC:2020112410A4FCA8002009FC8904890449FC4904510451FC1D04E10441140108 +41CD:200011FC1104FD04010409FC882088204920493C512051201EA0E260443E0800 +41CE:204810481048FDFE0048084889FE880048FC4884508450FC1C84E08440FC0084 +41CF:2040102013FEFC0001FC090489FC880049FC4808501053FE1C20E02040A00040 +41D0:2020102011FCFC2400240BFE8824882449FC4A22517450A81D24E22240A00040 +41D1:2040108011FCFD24012409FC8924894449FC4890511053FE1C10E01040100010 +41D2:7DFC44207D2045FE7C5048525492650E020001003FF8000008200440FFFE0000 +41D3:0BFE104061FC090411FC610405FC090431FCC088030401003FF808200440FFFE +41D4:0100FFFE20003FF800003FF820083FF80200711C57D47014545C729651D6B622 +41D5:000021FC102013FEFA2201AC082089AC88004BFE502051FC1D54E1544154010C +41D6:104010403F7E48908508080008001FF821084108020802080408180860500020 +41D7:104010403F7E2890450880000440082010102108C2060400082010103FF81008 +41D8:104010403F7E2890450880007FFC04000FF00810082010201FC00040FFFE0000 +41D9:20403F7E4890850800007F08010801083F08200840087F08010801080A080408 +41DA:104010403F7E4890850800000840084010403050504890441044104010401040 +41DB:104010401F7E28902488450881000100110011F81100110011001100FFFE0000 +41DC:204020407EFE5110880808000FFC10042108410001000280044008203018C006 +41DD:104010403F7E2890450880400420040004FEFF000210016001840E447034000C +41DE:104010403F7E4890850810101010FFFE101010101FF01010101010101FF01010 +41DF:104010403F7E28904508902010203E2022FC4224A42414440844108421144208 +41E0:104010403F7E28904508820001007FFC010001003FF8010001000100FFFE0000 +41E1:204020407EFE51108A0801007FFE400280043FF8010001000100010005000200 +41E2:104010403F7E2890450881000100FFFE010001001FF01010101010101FF01010 +41E3:104010403F7E489085080280044009203118C106010009201110210805000200 +41E4:20403F7E489085080000FFFE010001007FFC4104428444444824400440144008 +41E5:104010403F7E4890850800007FFC01000100110011F8110011001100FFFE0000 +41E6:104010403F7E2890450881001FF0111011101110FFFE0280044008203018C006 +41E7:104010403F7E489085080000FFFE01003FF8210822882448282820083FF82008 +41E8:20403F7E4890850808001FF0282007C01830E10E1FF0010011001FF801000100 +41E9:104010403F7E4890850801003FF821083FF821083FF8010800B001C20E32700E +41EA:104010403F7E4890850800007FFC040008201FF0011001003FF801000100FFFE +41EB:20403F7E4890850800003FFC2080208027F82408240827F8208020803FFE0000 +41EC:104010403F7E48908508110011003FF841000100FFFE054009203118C1060100 +41ED:20403F7E48908508020002083FD00220FFFE0100061008E03F00C808080807F8 +41EE:104010403F7E489085080810087813C0304050409FFE10401040104017FC1000 +41EF:104010403F7E2890450880007FFC10101FF010101FF01010103EFFD000100010 +41F0:104010403F7E4890850800001FC000447D88055009203118C50602003FF80000 +41F1:104010403F7E4890850800003FF8220823C824482A882108228824083FF82008 +41F2:104010403F7E4890850801003FF8010011100920FFFE0280044008203018C006 +41F3:104010403F7E28904548822003F87E0003F03E0003FCFE20014000840764781C +41F4:104010403F7E489085080000FFFE04403FF8244824482848303820083FF82008 +41F5:104010403F7E48908508200C11F01100810049FE49101110E110221022102410 +41F6:20403F7E4890850808001FF020205FF811081FF811081FF81108210821284010 +41F7:20403F7E489085083F04210421243F24082408247FA408A410A4108422944108 +41F8:104010403F7E289045089FF0101010101FF000003FF801001FF001007FFC0000 +41F9:20403F7E4890850800003FF80408FFFE04083FF808001FF8280848088FF80808 +41FA:20403F7E4890850800007FFC00001FF0101010101FF0000008200440FFFE0000 +41FB:20403F7E489085083FF820083FF8200020702F8020F02F8020F85F824082807E +41FC:20403F7E489085081FF010101FF000003FF8210821083FF8200220021FFE0000 +41FD:104010403F7E48909508100C11F0FD00110011FE1D10F1101110121052102410 +41FE:104010403F7E4890850801007FFC00003FF800003FF800003FF820083FF82008 +41FF:20403F7E489085080100FFFE01003FF8210821083FF8238805601918E1060100 +4200:104010403F7E489085083F842A842A942A94FFD42A942A942A942A8420942188 +4201:20403F7E4890850802800C6037D8C0063FF8248824883FF82488248824A82010 +4202:104010403F7E48908508101008207FFC082008200820FFFE0820082010202020 +4203:20403F7E4890850823FC10841084808449144A0815FCE1042104210421FC2104 +4204:104010403F7E289045089FE040445194492443C445444924551442047FFC0004 +4205:104010403F7E4890852800907FFC00803E88228822503E5000240754788C2104 +4206:20403F7E4890850800803FFC200420043FFC20A020902FFC2120421044089806 +4207:20403F7E48908508010001FC01003FF820083FF820083FF80100FFFE01000100 +4208:104010403F7E489085083EFC22A422A43EA422FC22803E80228222824A7E8400 +4209:204020407EFE51108A0801003FF80820FFFE04007FFC08201C4003800C707008 +420A:20403F7E4890850801003FF80100FFFE1010220847E40820144003801C70E00E +420B:20403F7E4890850801047D9809603118C50602001FF010101FF010101FF01010 +420C:20403F7E48908508100009F80908410821F82908090811F87108110817FE1000 +420D:20403F7E489085080080FFFE10001FF800001FF010101FF010101FF010101FF0 +420E:20403F7E4890850812207FFC122013E010001FF80100FFFE05401930E10E0100 +420F:20403F7E4890850800007FFC00001FF010101FF000003FF821083FF821083FF8 +4210:104010403F7E48909548104013FE5880549051109152125414A8102810441082 +4211:20403F7E489085081FF010101F9010907FFC40044FE4482448244FE440144008 +4212:20403F7E489085080100FFFE01003FF8244822882FE821083FF8210821282010 +4213:104010403F7E489085081FF010101FF010101FF008001FFC2104528414541FE8 +4214:20403F7E489085087CF8440844087CF8400041F87C88405040207C5040884306 +4215:20403F7E489085081FF010101FF010101FF000007FFC110011F8290047FE8000 +4216:20403F7E489085080C10709010501010FC903050381E55F05010901010101010 +4217:20403F7E4890850809100A0817FC31105208948411F813081490106011981606 +4218:20403F7E4890850808200440FFFE1020102024487CF80810102024487EFC0204 +4219:104010403F7E4890850810001008240879FE100824887E48004854084A288A10 +421A:20403F7E48908508080010103FF800081FF0101010101FF001004884481287F2 +421B:20403F7E4890850808000F7C084408447F44552855287F105510552855444382 +421C:20403F7E489085080BF8080811F8300853F8900017FC140413F8111010E0171C +421D:20403E7E4890BFFC010411F011002FFE40009FF010101FF010101FF010101030 +421E:20403F7E4890850800807FFC00001FF010101FF000003FF820083FF820083FF8 +421F:204020407EFE511088083F0421243F2421243F24212421243F24120421144088 +4220:20403F7E4890850800FC7F00220811103FF80200FFFE04000FF0122021C0CE3C +4221:20403F7E4890850808001FF82A4844480A88110822A8041001004884481287F2 +4222:20403E7E4890900020087FFC00043FF820083FF80100FFFE054009203118C106 +4223:104010403F7E4890850800207F20043E044427A42428242824102F28F0444082 +4224:20403F7E4890850810881088FC8813FE3088388854F854889088108810F81088 +4225:20403F7E4890850810101F1022107FBEA4923F9224923F92249224A242AA8144 +4226:20403F7E489085082448238824483FF81010220847E40820144003801C70E00E +4227:20403E7E489080F87F00221011201FE010201FF010101FFC20042AA44AA4800C +4228:20403F7E4890850800007DF8450849F8510849F8452445285510494841864100 +4229:20403F7E489085080804140422245D248024112409244A2427A4F80440140008 +422A:20403F7E489085087FFC00001FF010101FF000007FFC482444445FF44104410C +422B:20403F7E489085081020102025FC7D2409241154254C7D840104550455148108 +422C:20403F7E48908508404427FE204087FC444457FC1444E7FC2444244424540408 +422D:204020407EFE51108A0804003FF821083FF821083FF8029004A808FA308AC07E +422E:20403F7E489085082080108010FCFD0402F44894489448F410941E04F0284010 +422F:20803EFE4910BFF801001FF010101FF010101FF010101FF01010FFFE08201010 +4230:20403F7E489085081020112410A8FC2011FC11041DFCF10451FC110451142108 +4231:104010403F7E4890850800FC7F00220811100C20307820083C7820083FF82008 +4232:20403F7E4890850810783E4822482A862300FEFC22442A44222842104A2884C6 +4233:20403F7E48909FF810081FF810081FF800007EFC224412240A1412246AD40408 +4234:20403F7E48908508102008407FFC04803FF00490FFFE04903FF00CA03498C486 +4235:20403F7E4890854808203218C4460FE000207EFC224412240A1412242A544488 +4236:104010403F7E4A9085087FFE400289241290244808203FF8C82608200FE00820 +4237:20403F7E48909508108010F8FD08129030603998560651F89108110811F81108 +4238:20403F7E4890850810041F2422147F84A4A43F9424863FBC2484248442848104 +4239:20403F7E489085087FFE48028BF4108033F85208920813F81208120813F81208 +423A:20403F7E48908508104010FC24887D50082010D827067C60001054C054308008 +423B:20403F7E48908508002878244BFE482079FC492449FC792449FC49244924990C +423C:20403F7E50908A0801007FFE42028924284849940E1077F00100210821083FF8 +423D:20403F7E4890850808207FFC08200FE001003FF821083FF801007FFC0100FFFE +423E:20403F7E4890850810201124FCA8102031FC390455FC910411FC110411141108 +423F:20403F7E489085087FFC40041FF010101FF010101FF00100FFFE082010102008 +4240:20403F7E4890850800803FFC222022203FFC2220222023E020004A4849249124 +4241:20403F7E489085080010FF9022283E4422923E08227C2384FE08023002080204 +4242:20403E7E48909FF011101FF011101FF0040008201FC003103FF8112025104208 +4243:20403F7E489085080440247C24A83D50042804487DFE24882448244844088418 +4244:20403F7E4890850878404BF8504067FC51104A884CF4691052A0404041B04E0E +4245:104010403F7E4890954810407C4011F8FE48444828C87C4810AAFEAA11061202 +4246:20403F7E489085081FF010101FF010101FF010001FFC10001FFC492484940008 +4247:20403F7E4890950811047FC411241F2411241F2411247FE42924308420143FC8 +4248:20403F7E4890850824207E20243EFF4400A47E2442287E2842107E2842444682 +4249:20403F7E4890850820003E1C44E87EA8AAA83EA82AA83EA82AA42B542B744612 +424A:20803EFE551088201FF00210FFFE09203FF8D1161FF011101FF001007FFC0100 +424B:20403F7E4890850811FC1124FDFC2500257C4944297C1144297C4644827C0444 +424C:20403F7E4890850878904BFC48805144566848B049284E6868A4512246A04040 +424D:20403F7E489085087C7C44447C7C44447D7C40844A244A14525441C440144008 +424E:20403F7E48908508111009203FFC20044FE808200FE001007FFC05401930610C +424F:20403F7E4890850810001EFC22247F44A99C3F50297C3F9029FE291045108210 +4250:20403F7E489085081020FE2010207DFC54207C2054F87C881088FE8810F81088 +4251:20403F7E4890850810003FFC4AA00AA07FFC0AA00AA07FFC0000248822444244 +4252:20803EFE491080F83F0011100920FFFE09203018DFF611101FF011101FF01010 +4253:20403F7E48908508100011FC1124FDFC312439FC542053FE90A8112412221020 +4254:20403F7E5090880800900088FBFE20483C3245CE4890A88813FE10482032C1CE +4255:20403F7E48908508082004403FF8292825483FF800001FF010101FF010101FF0 +4256:20403F7E4890850808107F1008287F4449927F08497C7F040808FFB008080804 +4257:20403F7E4890850811F81108FDF8100013FC11081DF8F10811F8110E57F82008 +4258:20403F7E489085081040102013FEFA0214FC300039FE542050A8912412A21040 +4259:20403E7E4890BFF801007FFE41029D7401001D7000003FF80000FFFE10103FF8 +425A:20403F7E489085083FF824483FF800007FFE4002BFF408000FE0112416A4181C +425B:20403E7E489084003FF8292825482FE8254828280100FFFE02800C603018C006 +425C:20403F7E4890850820A020907DFE9120132011FCFD2011FC2920252041FE8100 +425D:20403F7E4890951808203FF801007FFC02403C500848FFFE08507E240854198C +425E:20403F7E4890850800283FFE20202FA420282F9048AA4FC682820900282847E4 +425F:20403E7E4890812011FC1320FDF8112015F8192031F8D10013F8111050E0271E +4260:20403F7E4890850822204AA08ABE1FC420A46F24A0282F28291029A829443082 +4261:20803EFE4910FFFE00003FF8200827C824483FF810101FF010101FF00000FFFE +4262:20403E7E489081007FFC11102928FFFE00003FF8200827C8244827C820083FF8 +4263:20403E7E489082001CF010101EF010101FF008001FFC20044924249424944008 +4264:20403F7E4890850849202A20FF3E2A4449A41024FE282228641018282444C282 +4265:20403F7E4890854811FE1122FD7A118A155219223152D1FE104012A4528A247A +4266:20403E7E48908FF841402FF829480FF8E1002FFC24102BE8322423E052088FFE +4267:20403E7E4890F784428462A454A469A414242224DD2408247F244A042F94F008 +4268:20403E7E4890900008787F48224814867F0010FC694416446D281490642818C6 +4269:20403F7E48908508100013FE1200FE7C1244327C3A0056EE52AA92EE120013FE +426A:20403F7E489085083FF821083FF821083FF80000FEFE9292FEFE9292FEFE8282 +426B:20403E7E48908640387C08947E241C442A94490802C01D30E92E054009201310 +426C:20803EFE491080803FFE20202F2831102A0A277C294A378428784F484130874C +426D:20803EFE49109084210810843FF82448238824483FF829482528294A25263182 +426E:20403E7E4890FC7C44447C7C44447D7C44844FE459044FC449044FC449044FEC +426F:20403E7E4890BF7C24443F2821103F2824463FF010101FF010101FF008201010 +4270:20403E7E4890BE2022103AFE2A007F2841443E8222283E2822103E2822442682 +4271:20403F7E4890A508100003FEFA000A7C12442A7C7200AAEE2AAA22EE220023FE +4272:20403E7E48908000F7FC124817FCFC4686EC8554F6EC155416EC144454542408 +4273:20403F7E4890850820443E2844FEFF1049107F7C49107F1000FE55104A908A90 +4274:20403F7E489085087FFC00003EF822883EF804403FF80440FFFE04901C60671C +4275:20403F7E48909FF8149012501FF00200FFFE0AA03458CFE6155007C004A00670 +4276:20403E7E4890A4483F7E64C8BF7E24483F7E24483F7E20401FF0082007C0F83E +4277:20403F7E489085081E7812483FFC20202E20223C3FC829282F2849905F288144 +4278:204020407EFE5110880841102788F83E53942008FBBE2008739C228843888288 +4279:20403E7E4890BFF801007FFE492284143BB82AA83BB800007FFC11102928FFFE +427A:080008004AFC2A202C200820FE2018201C202A202A2048208820082009FE0800 +427B:1004101E95F0551059101110FD1031FE3910551055109108110A114A11861102 +427C:0804080E4AF02A802C800880FEFE18881C882A882A8848888888090809080A08 +427D:10201020952454A458A81020FDFC30203820542057FE90201020102010201020 +427E:044004447C78044004421C42E43E0000111009207FFC054009203118C1060100 +427F:1008103C95E05420592410A4FCA8302039FE5420542090201020102010A01040 +4280:10201020942054205BFE1020FC20302039FC5504550491041104110411FC1104 +4281:10201120952055FC59201220FC2033FE3890549054909090111211121212140E +4282:1020102097FE5420582011FCFD2431243924552C547090A81124162210201020 +4283:200027FC2404AC0475F42444FC4425F475546D54AD5425542574244624462842 +4284:00007DF01110119011521D12E20E4400111009207FFC054009203118C1060100 +4285:1040104094FC55045A881050FC203040388055FC568490841084108410FC1084 +4286:04003878200820083C78200820083FF80000111009207FFC054009203118C106 +4287:1028102495FE5420582011FCFD24312439FC5524552491FC112411241124110C +4288:1080108094FE55005AFC1084FCA430943BFE54845524911411FE100410281010 +4289:1040102095FC55045A281020FC2031FC3870546854A890A41124122210201020 +428A:100011FC9504550459FC1100FD1C3170391C5570551E91F0111011121112120E +428B:1048114895485548594811C8FC7E30483BC855485548914811481148125C1440 +428C:10201010941055FE59001148FD4A314A396C55485548914A114A126A12461400 +428D:0C8070FC1124FD2412243844548491281010111009207FFC054009203118C106 +428E:1020112494A8542059FC1040FDFE3088390456FA5488908810A810921082107E +428F:102010A494A4552858501088FD043024382054A854A891301050108811041202 +4290:100011FC9504550459FC1104FD0431FC3800551255D49118111011521192110E +4291:1020112494A454A8582011FCFD04310439745554555491541174110411141108 +4292:10A01090948055FE59101310FDFC3110391055FC55109110111011FE11001100 +4293:100011FC9504550459FC1104FD0431FC380057FE54209120113C112012A0147E +4294:2088208823FEA88870A82020F9FC212471246924ABFE20202050208821042202 +4295:20102010207CAB1471FE2114FA7C2210777C6910A9FE25102210230024FE2800 +4296:2020202023FEA820702023FEFA8A225272FA6A22AA2222FA22222222222A2204 +4297:1020104095FC550459FC1104FDFC30003BFE5420542091FC1020102013FE1000 +4298:1020102095FE552259FE1122FDFE300038FC548454FC908410FC108410941088 +4299:0000FDFE204840487DFEC44844887D080008111009207FFC054009203118C106 +429A:20102220217CA9447044207CFB402140717C6944A944217C21442280247E2000 +429B:2000245C2294A91472942454F926210077DC6914AD9425542948210825142222 +429C:102013FE942055FC592411FCFD2431FC382257FE540893FE1108108810281010 +429D:101C11E09420552458A813FEFC7030A8392456225440902412A2128A14881078 +429E:2040202023FEA888705023FEFA2222FA72226AFAAA8A228A22FA2202220A2204 +429F:2088208823FEA888708820F8F82023FE72226B32AAAA237622222222222A2224 +42A0:7DFC44207D2045FE7C5048525492650E111009207FFC054009203118C1060100 +42A1:100011F8950855F8590811F8FC0033FC3A9457FC540091F81090106011981606 +42A2:0440247C24A83D5004287DFE248844488418111009207FFC054009203118C106 +42A3:1088108895FC5488588813FEFC2031FC392455FC552491FC1000108811041202 +42A4:100013FE945057FE5A5213FEFC0031FC390455FC550491FC102013FE10201020 +42A5:202021FC2024ABFE702421FCF82022AA73AE6A22ABFE222223AE22AA22AA2422 +42A6:102013FE942055FC580013FEFE0231FC380055FC550491FC1104108813FE1000 +42A7:209027FC2094ABFC729023FEF91223FA750E69F8A90821F8210821F820902108 +42A8:0100FFFE20003FF800003FF820083FF80100755C539477D4511473965556B122 +42A9:103C13E0952454A85BFE10A8FD24320239FC5524552491FC1124112411FC1104 +42AA:1088108897FE548859FC1124FDFC312439FC542057FE9222122A12FA120A1206 +42AB:200023FC2294AA9473FC2000F890279E70906890AB9C20902090279E20902090 +42AC:0DFC712411FC1124FDFC30203BFE54A851248222111009207FFC05401930E10E +42AD:102013FE942055FC580013FEFC0231FC382057FE540093FE100413BE12A4138C +42AE:200023DE2042AA52714A2252F890210873FE6D10A9FE211021FE211021FE2100 +42AF:1020101095FE5528597C1128FDFE3110397C5554557C9154117C120012441482 +42B0:22102110203AAB92701423BEF8082390703C6BE4AAA422BC22A423A422BC2024 +42B1:2148214C22AAA80877FE2148FB68214A736A694CAB6C2148216A239A20262042 +42B2:0010FE0828FEFE00AA44AA28FEFE108854A838BEFEC8108838BE55089108127E +42B3:202023FE2248ABFE724822ECFB5A224872506BDEAA5023DC225025DE24502850 +42B4:1088108894EE55545A221050FC8831743A0255DC555491DC1088108811541222 +42B5:104010402040244045F8F848104820484848FC480448004A548A548A81060200 +42B6:1020102020202520452CF934116423A44924FD34052801225522550280FE0000 +42B7:080808081008120822FE7C080818101824287E28024800885208490889280010 +42B8:100011FC200024004400FBFE104020404880FCFC040400045404540480280010 +42B9:1008103C21E024204420F820102023FE4820FC20042000205420542080200020 +42BA:100011FE204024404440F87C108420844884FD0405FC00085408540881FE0000 +42BB:104010402040247E4482F884112022204820FC50045000485488548481020200 +42BC:10101010201024904490F890109E20904890FC90049000905490549083FE0000 +42BD:10201020202025FC4424F824102420244BFEFC20045000505488548881040202 +42BE:102010202020242045FEF8201070207048A8FCA8052401245622542080200020 +42BF:102010202020242045FCF820102020204BFEFC20045000505488548881040202 +42C0:010000803FFC20043FFC2080211023E02040208827FC20444250444889440080 +42C1:10401020200025FC4400F80010F020904890FC900490009254925512810E0200 +42C2:080408441028121022287C440880100424447E44022800285210492889440082 +42C3:1008103C21E024204420F83C11E020204820FC3E07E00020542254228022001E +42C4:100011FC210425044594F954115421244924FD54055401945504550481140108 +42C5:101010102090249044FEF890111020104810FDFE041000105410541080100010 +42C6:10401020202025FC4504F904110421FC4904FD00050001005500560082000400 +42C7:100011FC210425044504F90411FC21204920FD20052001105510550882040402 +42C8:08007F7C114432280C101228634604201FC0018006103FF80108112025104208 +42C9:1040102020202BFE4A02F404100020904890FC90048801085508550482040402 +42CA:1000100021FE24104410F81010902090489EFC90049000905490549083FE0000 +42CB:100011FC210425044504F9FC1120212049FEFD20052001105512554A81860102 +42CC:100011FE210025004500F9FC110421044904FD0405FC01005500550081FE0000 +42CD:1000100021FE24084408F9E8112821284928FD2805E801285408540880280010 +42CE:1000100021FC25044504F90411FC21044904FD0405FC01045400540083FE0000 +42CF:10801080208024FE4540F9401240207C4840FC400440007C5440544080400040 +42D0:10281024202428204BFEF220122422244A24FA280A280290AB12AA2A80460082 +42D1:100011FE202024204420F9FE112221224952FD4A058A010255025502810A0104 +42D2:100011F8200824504420F81013FE206248A4FCA0052002205420542080A00040 +42D3:1080108020F825084610FC2011FC20044804FC0405FC00045404540481FC0004 +42D4:100011FE201024104420F820106820A44922FE22042000205420540083FE0000 +42D5:081813E0304057FC904013F8020004201FC0018006103FF80108112025104208 +42D6:1020102020FC242445FEF82410FC20204820FCFC0420002055FE542080200020 +42D7:100011FE212025204520F9FC110421044904FD0405FC01205520552081FE0000 +42D8:1020102023FE28204820F1FC102020204BFEF87008A800A8A924AA2284200020 +42D9:100013FE210825084508F9F81108210849F8FD080508011E57E8540880080008 +42DA:100013DE204228424A52F14A114A204248C6F94A0A520042A842A842814A0084 +42DB:10201020212424A444A8F820102023FE4870FCA804A801245524562280200020 +42DC:100008FC3E44222822103E28224644209FC0018006103FF80108112025104208 +42DD:10401024222425084508F810104020404BFEFC88050801905460545081880604 +42DE:100011FC210425044504F9AC115421544954FD5405AC01045504550481140108 +42DF:100011F82008240845F8F9001104210448FCFC40042000A4AA8AAA8A84780000 +42E0:1028102421FE24204420F9FC1124212449FCFD24052401FC552455248124010C +42E1:10201020205028884904F2FA102020204BFEF82009280124AA22AC2280A00040 +42E2:080C08F07E8008800EFE788808882908164808801F0002103FF8010815202210 +42E3:201020103F244044BEF8221032202A44FF7E221252104A547F52029214500820 +42E4:084008407F40087C3E840884FF04104422247C240904FF8408844904A8A81010 +42E5:100011FC2124252445FCF924112421FC4820FC2005FC00205420542083FE0000 +42E6:1080108020FE250046FCF88410A4209449FEFC840524011455FE540480280010 +42E7:100011FC2104250445FCF910111021FE4910FD10057C014455445544817C0244 +42E8:1040102021FC24004508F890100023FE4800FC0005FC01045504550481FC0104 +42E9:10001040239C2A044A04F39C120422044BFCFC9004900090549055128212040E +42EA:2000277E450445049574E554265445549554F55405741554AE04A40484140408 +42EB:1080108020F825084610F9FC1024202449FEFC24042401FC5424542080A00040 +42EC:100013FC204028404BFEF0A0111022084C46F84008480264AA52AC5281400080 +42ED:1040102023FE28804904F3FE100221FC4904FDFC050401FC5504550481140108 +42EE:10201020205024884504FA0210F820204820FDFC0420012454A454A883FE0000 +42EF:104808443E7E23C022243E282212206A444688821F0002103FF8010815202210 +42F0:1FF010101FF010101FF010101FF01010FFFE11102248CF8602201FF009481320 +42F1:1020102020202BFE4820F124112421244AAAF87008A800A8A924AA2284200020 +42F2:100011F02110291049F0F04013F822484A48FBF80A480248ABFAA8428042003E +42F3:1050105223DC245044D2FB4E100021FC4904FDFC050401FC5504550481140108 +42F4:100010FC2048243045FEF852109421104A30FC2005FE007054A8552482220020 +42F5:100011FC210425FC4504F9FC108021FE4A22FD220552010255FA540280140008 +42F6:100013FE2020244045FCF904110421FC4904FDFC0504010455FC540080880104 +42F7:00207E20247E18A4FF2829104A2898C6044008801F0002103FF8010815202210 +42F8:1008101C21F025104510F9FE1110217C4944FD7C0544017CA944AA44827C0444 +42F9:100013FE200029FC4904F10411FC20004BFEFA220A2203FEAA22AA2283FE0202 +42FA:108811C827082908492AF12A17AC21484B08FB880D540514A914A92481240142 +42FB:1020102023FE28204820F3FE128A22524AFAFA220A2202FAAA22AA22822A0204 +42FC:100011F82088249044FCF954112421544A88FC0005FC0154A954A95483FE0000 +42FD:21042104410447C4913EE10427C440249114F11407C41104A904A1C48E140408 +42FE:1000104023FE28884904F64210FC230848B0F8D00F3E00C2AB24A81880600780 +42FF:100011FC2124292449FCF124112421FC4800FBFE09200122A914A94881840102 +4300:10C41704212429144914F784112421144B94FB460D3C0504A904A90481040104 +4301:100013FE205028504BFEF252125223FE4800FC4007FE00885590546080D80304 +4302:100013FC220422044BFCFA0013FC22404A88FBFC0A241220ADFCA420882013FE +4303:1082108222A229CA488AF3EA122A222A4BEAFA2A0A2A03EAAA22AA2282AA0244 +4304:11FC102021FC25244554F904112C2020483CFC2005F800885450542080D80306 +4305:1020101021FE2510457CF91411FE2114497CFD10057C0144A944AA44827C0444 +4306:1020104023FC2A244A24F3FC122422444BFCF84008A800B4A93CA9228222041E +4307:1020102023FE28204BFEF242148C21F04820F8440BFE0022A928AA2484A40040 +4308:100011FC210429FC4904F1FC100023DE4842FA52094A00C6AB5AA842814A0084 +4309:100013FE22522A524BFEF000100023FE4820F820093C0120A920A92087FE0000 +430A:1008103C23C028044A44F12811FC22204820FBFE08200124A924A92481FC0004 +430B:1088108823FE28884820F050108821044AFAFC00040001FC5504550481FC0104 +430C:100013DE20422A52494AF2521042202049FCFD04050401FC5504550481FC0104 +430D:1088108823FE248844F8F82011FC212449FCFC2005FC002055FC542083FE0000 +430E:00407CF8554854307DCE54F854887CF8044008801F0002103FF8010815202210 +430F:1040102023FE2A424828F29412AA24CA48F8FB0008200124A924A92481FC0004 +4310:100E13F020442A244908F3FC120423FC4A04FBFC0A0403FCA890A91082120C0E +4311:100013DC22942BD44A54F3C8128822944BE2F800082001FCA820A82083FE0000 +4312:1040102023FE22504A50FBFE125222524BFEFA000A9212D4AA98A49284D2088E +4313:20783F48404CBE802A78FF284A107F28044408801F0002103FF8010815202210 +4314:100013FE22002A7C4A44F244127C22004AEEFAAA0AAA02AAAAEEAA0083FE0000 +4315:2040202047FE44909490E49027FC449094D8F5B805B416D4A892A89090900090 +4316:10A0109021FE2B2049FCF12011FC212049FEFD00042003FE547054A883260020 +4317:2100210043FC46A89AA8E2A827FC42A892A8F2A80FFE1000AAA8A25484540000 +4318:082049202A3E7F4849485DA86B104928454608801F0002103FF8010815202210 +4319:1088108821FC24884488FBFE102021FC4924FDFC052401FC5400548881040202 +431A:100013FE205028504BFEF252125223FE4924F8A80BFE0070A8A8A92486220020 +431B:10001E0C22F05420284410F82810FF2400FE7E1200507E5400927F1242507E20 +431C:10501252215428504BFEF088105023FE4820F9FC082003FEA8A8A92486220020 +431D:2110211047BC411093B8E5542912400093F8F00007FC1040AA48A44489420080 +431E:10201020205024884504FAFA1000200049DCFD54055401DC5488548881540222 +431F:101013C8227E2A404A62F3D41200223E4BC8FA480E7E0248AA48ABC882480008 +4320:02907FD0421E5EA242885D0855485ED4846208801F0002103FF8010815202210 +4321:109013FC22942BFC4A94F3FC100023FC4800FBFC0A0403FCA908A89087FE0000 +4322:100011FC20202BFE4A22F1AC102021AC4850F8C80B2600F8A808A8D080200010 +4323:1108110821EE2A944842F01011FE210248F8FC8804F8008054FC548480FC0084 +4324:200027FC424844449FFEE44426EC455496ECF44406EC1554AEECA44484540408 +4325:103E17C0224421284BF8F84017FC20004BF8F8080BF81008ABF8A544852A08FA +4326:100013DE20422A52494AF252109021084BFEFD1009FE0110A9FEA91081FE0100 +4327:102013FE202029FC4800F3FE100221FC4820FBFE080003FEA804ABBE82A4038C +4328:1088108823FE28884910F1DE125225544A88F9740A0201FCA820A92482220060 +4329:110817FE210828004BFCF294129423FC4828FBFE0A200324AAA8AA92842A08C6 +432A:13DE125223DE2A524BDEF242127A228A4B12FADA0A8A02DAAA8AAAFA820A0204 +432B:13D0129023DE2A684BC4F28413F8210849F8FD0805F8010855F854908112060E +432C:1110109023DE28104A5EF18213DE20104BDEFA500BDE0250ABDEAA50825202CE +432D:1088108823FE28A84890F1FE112023FC4D20F9FC092001FEA900AAA482520452 +432E:11FC102023FE2A2249ACF02011AC2000489EFBF2089E01D2AABEAC92809E0092 +432F:108813FE20882BDE4A52F3DE10A0209049FEF9200BFC0520A9FCA92081FE0100 +4330:13FC110821F8290849F8F10E17F820084FFEFA940B9C0294AB9CAAD687BC0084 +4331:40807FFC48008FF8A000EFF848084FF8A100FC9C15D45C14555C5C9695D62C22 +4332:108813FE208829F04820F3FE102021FC49ACFD7405FC002055FC542083FE0154 +4333:27FC224847FC4C4696ECE55426EC455496ECF454040817FCA840A3F8805007FC +4334:40807FFC48008FF8A000EFF848084FF8A220FD5C17F45C9455DC5C9697F62CA2 +4335:13FE120223FE2A924A54F29212FE22AA4AFEFB220AFA02AAAAFAAA2285FA0004 +4336:101010102010241045FEF810103020304050FC50409001101C10E01040500020 +4337:102010202020242045FCF924112421244124FDFC412401241D24E12441FC0104 +4338:10201020202025FC4420F84013FE20404080FDFC400400881C50E02040100010 +4339:100013FC220422044A04FAF4129422944294FA9442F402941A04E20442140208 +433A:100013FE2088248844F8F888108820F84088FC88408E03F81C08E00840080008 +433B:100013DE204220424A52F94A114A204240C6F94A425200421842E042414A0084 +433C:110410842088241045FCF9041104210441FCFC50405000901C92E112420E0400 +433D:1008103C23C020444A24F9281100202043FEF87040A800A81924E22244200020 +433E:1020102023FE20204820FBFE128A225242FAFA22422202FA1A22E222422A0204 +433F:100013FE200021FC4904F90411FC200043FEFA22422203FE1A22E22243FE0202 +4340:10901290229C22A04AD0FA88128820804000FBF842A802A81AA8E2A84FFE0000 +4341:10881448225020FC4820F850169422384250FA98423402541A90E22045FE0800 +4342:200020FC3C20502090201020FE2011FE10205420542054205C20642004A00040 +4343:000801FC7E0022081108111008001FF821000100FFFE0100210821083FF80008 +4344:202020203C205020903E1020FE20102011FC5504550455045D04650405FC0104 +4345:202020203C50505090881124FE12101011FC5404540854885C50642004100010 +4346:204020203C2051FE91021204FE00100011FE5420542054205C20642004A00040 +4347:2004201E3CE0500090101008FEFE100210045408541054205C4064A0051E0000 +4348:200021FC3C205020912410A4FEA8102013FE5420542054205C20642004200020 +4349:200020003CFC508490841084FE84108410FC5484540054485C44648404820102 +434A:204020203C2051FE90001088FF04120210885488545054505C20645004880306 +434B:2008203C3DE0502091FE10A8FEA810A811FE54A854A855FE5C20642005FC0000 +434C:204020203CFC500090881048FE5011FE1000540054FC54845C84648404FC0084 +434D:1000FE7810487C480048FE8682007CFC20443C445028FE28101054287C440182 +434E:408843FE7888A02023FE2250FBFE225223FEAA80AAFEAA80BAFECC020AAA0004 +434F:00003FF824482448244824483FF8200820082008200820082008200820282010 +4350:00007FFC444444447FFC00003FF8010001000100FFFE01000100010001000100 +4351:00003FF822282AA824482AA8312800003FF801000100FFFE0100010001000100 +4352:00007FFC444444447FFC010001007FFC03800540092011102108C10601000100 +4353:00007FFC444444447FFC00003FFC0040104020403FFE01400640184061400080 +4354:00007FFC444444447FFC020002007FFC0400048008801100222044108FF80408 +4355:00007FFC444444447FFC000000F03F00210021003FFC208020402A243114210C +4356:00007FFC444444447FFC08001FF020105F90109010901F901050102410040FFC +4357:00007FFC444444447FFC020001007FFC040008201FC0008003200C103FF80008 +4358:00007FFC444444447FFC01001110092005407FFC0540092011102108C1060100 +4359:00007FFC44447FFC10003FFC40009FF012101110FFFE221021103FFC00100060 +435A:00007FFC444444447FFC01001FF010101FF010101FF011081090126014181806 +435B:00007FFC444444447FFC00003FF821082FE8210827C8244827C820083FF82008 +435C:7FFC44447FFC090008801FFC108030805FF8908010801FF8108010801FFC1000 +435D:7FFC44447FFC000001047D9809603118C50602001FF010101FF010101FF01010 +435E:7FFC40044AA444444AA400500048FFFE00403E4022243E2800120E2A70C60302 +435F:7FFC44447FFC00002448238824483FF81010220847E40820144003801C70E00E +4360:7FFC44447FFC01000080FFFE0440139014501FF001007FFC44444FE44424400C +4361:00007FFC44447FFC00803FFE22203FFC22243FFC284028482F7048444B448C3C +4362:00007FFC44447FFC10003FFC4AA00AA07FFC0AA00AA07FFC0000248822444244 +4363:7FFC44447FFC00003FF801007FFE41029D7400003FF821083FF821083FF82008 +4364:00007FFC44447FFC0100FFFE02887D7025484D6690101FF010101FF010102010 +4365:00007FFC44447FFC00007FFE40005F3C44107F7E4E345552609044F84480BFFE +4366:7FFC44447FFC100008287F24147E494855C87F7E08487F7E514855485D7E4340 +4367:10881048505050007DFC5020902010FC1C20F02051FE10201020102010201020 +4368:442024202820FDFE102010207DFC11241124FD24112411342128202040208020 +4369:444024402840FE8010FE11087E8810881088FE50105010202050208841048202 +436A:442024202820FDFE102010207C2011FC1070FCA810A811242124222240208020 +436B:442024102810FDFE110212047C8010881090FCA010C0108220822082407E8000 +436C:440025FC2820FC20112410A47CA8102013FEFC20102010202020202040208020 +436D:440024FC2884FEA4109410847C8413FE1104FF441124110421FE200440288010 +436E:445024502850FD5210D410587C50105810D4FD5210501050209220924112820E +436F:4440244028FCFD04120811FE7D00117C1144FD441154114821422242423E8400 +4370:440025FC2904FD24112411247DFC11241124FD54114C118C2104210441FC8104 +4371:442024202850FC88110412FA7C20102013FEFC20112811242222242240A08040 +4372:88004840539CFA042204239CFA04220423FCF89020902090209041124212840E +4373:88004BDE5042F94A2084214AFA5224202000FBDE205221522094414842548422 +4374:881C49E05020F82023FE20A8F92422422040FBFE2088210820D0403040488184 +4375:4440244028F8FD08101011FC7C24102413FEFC24102411FC2024202040A08040 +4376:442024202BFEFC2011FC11247DFC112411FCFC20107010A82124262240208020 +4377:4440244029FCFC8413FE10007DFC110411FCFC2013FE1020222023FE40208020 +4378:442824242BFEFC2011FC11247DFC112411FCFD24100813FE2088204840488018 +4379:4420244029FCFD0411FC11047DFC110411FCFC28102413FE2050208841048602 +437A:8820482051FCF92421FC2020FBFE222223FEF8202040202422A2428A44788000 +437B:88004BDE5252FBDE22102252F9CE20002088FBFE2088208823FE408841048202 +437C:88004BDE5088FAA823FE2188FADA24A621F8F908210821F82108410841F88108 +437D:88004BFE5222FACC224423EEFA4422EE2354FA4422102290229E449044908BFE +437E:00007EEE2422242224AA24662422FF222426246A24B224222422242244AA8444 +437F:00007EFC224412241A3462C4020400007FFC010001003FF801000100FFFE0000 +4380:0014EE1222122210AAFE66902292229226926A94B29422B422CA228AAA164422 +4381:100011DC10441044FF5410CC104410447C4C44D44564444444447C4445540088 +4382:0040EE4022FC2284AB0466F42294229426F46A84B294228822822282AA7E4400 +4383:100011DC10447C44555454CC7C445444544C54D4FF6444444444444455544888 +4384:0000FDDC24442444255424CC54444844804C7CD445644444444444447D544488 +4385:100011DC20447C44455444CC444444447C4C44D44564444444447C4445540088 +4386:00007EFC224412241A3462C4030402800C603218C1061FE00020064001800040 +4387:100021DC7C444444655454CC5444FC44444C64D4556454444444444455548888 +4388:0020EE2022FC22A4AAA466FC22A422A426FC6A20B22422182212226AAB864402 +4389:000CEE0A220822FEAA8866882288228A26EA6A8AB28C228C228A228AAA964522 +438A:100010EE1E22222262AA9466082214222226416ABEB22222222222223EAA2244 +438B:080028EE28223E2248AA0866FF22002200263E6A22B2222222223E2222AA0044 +438C:0000EE7C22442244AA446644227C221026106A50B25E225022502270AA9E4500 +438D:0028EC2425FE2420B4206DFC2524252425FC6D24B52425FC25242524B524490C +438E:0000EDFE24A024A8B4A86CE824A824A824A86CE8B4A824AA24BA25EAB4264820 +438F:080008EE1422222251AA88667E2202220426086A7EB2422242227E2242AA0044 +4390:100011DCFE4410447D5444CC7C4444447C4C54D41164FE441044104411541088 +4391:0000EEFC22042204AA7C6604220422FE26106A92B254223822542292AA504420 +4392:0048EE44225E23E0AA286612226A239626486A5EB3E0222422282212AA6A4586 +4393:0010EE1022DA2254AA5466922350222026FE6A82B28222FE22822282AAFE4482 +4394:0028EC2427FE2420B5FC6D2425FC252425FC6D24B40827FE24882448B4484818 +4395:08202AA44D28145022887FFE400280043EF8020812480A28124822880A280410 +4396:440024EE2822FE2292AAD666BA229222FE26006A7CB244227C2244227CAA4444 +4397:060078EE1022FFA222AA5D6694A21C2200267F6A41B25D2255225D2241AA4344 +4398:08007F7E0912FF92095A7F360812AA92EB9688BAFFD28892EB92AA92AA9208B6 +4399:200011DCFE4482447D5454CC98447C44C44C7CD445647C4444447C4429544488 +439A:0088EDDC248825DCB4886DDC248825FC24046CFCB40425FC24202554B54A4A3A +439B:020002083FD00220FFFE02000C703F84C80407FC00001FF0101010101FF01010 +439C:101012107E12147E1414FE1408FE100820307E22A06422B82D223022201E0000 +439D:02203FC00280FFFE02200FC03408C3F800007EFC224412240A1412246AD40408 +439E:010001081FD001207FFC02000FF03810CFF008100FF000003FF8000800080008 +439F:100013FE10201020FC4025FC2554255425544954295411542954454481140108 +43A0:200023FE20202040FDFC25542554A5546554255435442D16250A440243FE8000 +43A1:0000FFFE020004003FF82488248824A82010010011101120228004401830E00E +43A2:104010401080FCFE11007A0010FCFC0810103820344054809102110210FE1000 +43A3:100810481128FD28112879081108FD0811083908354855949114102210421082 +43A4:100011FC1104FD0411FC79001100FDFE1102397A354A554A927A120214141008 +43A5:100010501048FC84112478201050FC8811063AF8348854889088108810F81088 +43A6:102010A410A4FD28105078881104FC24102038A834A855309050108811041202 +43A7:1040102010FCFC00108878481050FDFE1000380034FC54849084108410FC1084 +43A8:1020102013FEFC50108879241222FDFC112439FC352455FC90221022101E1000 +43A9:109210921124FE48112478921092FC0011FE3922352255FE9122112211FE1102 +43AA:100011FC1104FDFC110479FC1000FDFE10083BFE340855089088100810281010 +43AB:105011241154FD0411FC78501088FD4410783888348855509020105010881106 +43AC:100013FE1252FE5213FE78201020FDFC1020382037FE54409088110413FE1102 +43AD:101010501250FD7C1090781010FEFF00117C39443544517C5144910012FE1400 +43AE:1040102011FCFC88105079FC1104FD2411FC392435745554915411741104110C +43AF:1088108813FEFC8810F8782011FCFD2411FC382035FC542093FE105010881306 +43B0:1142115C13F0FD501150795E13F4FC1411D43954355455D49154115411E41004 +43B1:200023FC2294FA9423FC71102252FBDC201273CE6A40A3D2225C23D0225222CE +43B2:0000FF0024FC24043C08241024203C20244024402E80F48244820482047E0400 +43B3:0000FF7C244424443C44247C24443C442444247C2E44F4444444048404940508 +43B4:0048FF48244824483CFC244824483C4825FE24482E48F4484448048804880508 +43B5:0040FF20242824083C08244824543D52255225602E60F44444C40544063C0400 +43B6:0020FC20482049FC79244924492479FC492449244D2479FCC924082008200820 +43B7:0020FD20492049FC79204A2048207BFE487048A84CA87924C9240A2208200820 +43B8:0000FDFE4820482078FC4844484479FE480048004CFC7884C884088408FC0884 +43B9:00F83F0011100920FFFE09203118C1063FF808200FE008200FE0083EFFE00020 +43BA:0082FC824A824BEA7C8A488A4FFA788A4BEA4AAA4EAA7AAACAA20AE2088A0884 +43BB:0000FDFC492449247974492449FC7904497449544D547974C9040A040A140C08 +43BC:0000FDF84808480879F8480848087BFE48204A224D7478A8C9240A2208A00840 +43BD:001CFDE04920492079FE4910494A7986480249FC4D047904C9FC0904090409FC +43BE:0020FC204850488879044AFA480079FC495449544DFC7954C95409540904090C +43BF:0008FCC84B084908792A492A4BAC794849084B884D547914C914092409240942 +43C0:0082FC824BE24882788A4BEA4AAA7AAA4BEA488A4DCA7AAACCA20882088A0884 +43C1:0040FC204BFE4A42782049FC488878504BFE48204C2079FCC820082008200820 +43C2:00A0FD2C4924492479AC4924492479FC482049FC4C887850C820085008880B06 +43C3:0000FDFE4902480078FC488448FC788448FC48204C1079FEC800084808840902 +43C4:0040FC204BFE4A8A79044BFE4840788849FC48244C2079FCC82008200BFE0800 +43C5:0080FC8849EE492A7AAA49444884797A4A0048004DFE7820C8A809240AA20840 +43C6:0050FC504BFE48507BFE4A524BFE7A524BFE48004DFC7904C9FC090409FC0904 +43C7:0000FDFC485049FC7954495449FC780049FC48004FFE7820C8A809240AA20840 +43C8:0108F9085254525474BC57085110722454BE578A580870ACD56A154A14281010 +43C9:0000FDFC490449FC790449FC4888795449DC48884D5479DCC80009A809540A54 +43CA:0110FC904BDE48107A5E49824BDE78104BDE4A504FDE7A50CBDE0A500A520ACE +43CB:01003FF80108FFFE01083FF8054009203118C10625781348A178A5441D3C0100 +43CC:084008201010200840069FF0101010101FF0101010101FF01010101010501020 +43CD:02000400082010103FF8100800001FF010101FF010101FF01010101010501020 +43CE:00003C0024F0249024903C90249024D024B03C902490249224924512550E8A00 +43CF:00003DFC2420242024203C2027FE242024203C20242024202420442054A08840 +43D0:00203C20242025FC24243C242424242427FE3C20245024502488448855048A02 +43D1:020004000FF81210692004C003000C0071003FF8228824482108228824482018 +43D2:00083C882488248824883CFE2480248024803CFC248424842484450455048A04 +43D3:00003CFC2400240034002DFE245024502C5034502450245224524492548E8900 +43D4:00003DF82448244824483C48244825F824883C88248824882488448857FE8800 +43D5:00083C3C25E0242024203C20242027FE24203C20242024202420442055FC8800 +43D6:00043DE42424242424243DE42504250425043DE4242424242424442455448884 +43D7:00803C8024FC250026003CF82400240025F83C0824082408240A440A54068802 +43D8:00003DFE2528252825283D2825282528252A3D2A254A25462580450055FE8800 +43D9:00203C20242025FE25223E242420242024503C50245024502490449255128A0E +43DA:00203C20242024A824A43CA22522252026243C24242824082410442054C08B00 +43DB:00403C40248024FC25043E042484244424443C14242424442584440454288810 +43DC:00007BFC4884488848887890489C488449447944492849284A104A284C449982 +43DD:00203C20242025FC24203C4027FE244024803DFC240424882450442054108810 +43DE:00203C20242027FE24203C20242025FC24703CA824A825242524462254208820 +43DF:00403C202428240824083C482454255225523D602660244424C44544563C8800 +43E0:00407820482048004BFC780048084908490878904890489048A048204BFE9800 +43E1:00003CFC2400240024003DFE2420242024A83CA4252425222622442054A08840 +43E2:00103C10241024FE24923C94249024FC24A43CA424A824A82490452855448A82 +43E3:00003CF82488248824883CF82488248824883CF8248824882488448857FE8800 +43E4:00003DFC2404240425F43C04240425F425143D1425F425142404440454288810 +43E5:00203C20242025FC25243D2425FC252425243D2427FE25042504450455148908 +43E6:00083C3C25E0242024203FFE2420242024203DFC250425042504450455FC8904 +43E7:00203C20247C248425483C302420244825903C3E244225A42418441054608980 +43E8:00403C8025F8250825083D0825F8250025003D0025FC25042504450455FC8904 +43E9:00203C202450245024883D0426FA240024003CF8248824882488448854F88888 +43EA:00003DFE2488248824883CF82488248824F83C882488249E27E8440854088808 +43EB:009078904890491049FE7B104D10493849387954495449924910491049109910 +43EC:00203C202448248425FE3C122490249024FE3D10241025FE2410441054108810 +43ED:00207920492049FC49207A2048204BFE487078A848A8492449244A2248209820 +43EE:00403C4025FC244424443C842494250824003D02248424482400444854848902 +43EF:0020782048204BFE48207820482049FC4840782048A44A824A8A4A8A4C789800 +43F0:00007BFC4844494449447A84489449084A40782048A44A824A8A4A8A4C789800 +43F1:000079FC4904490449FC7900490049FE4902797A494A494A4A7A4A024C149808 +43F2:01083C88249025FC24243C2425FC252025203DFE246224A2252A462454208820 +43F3:0104790E493049204FE07920493E496449A47F24492449244924492449449B84 +43F4:00203D2424A424A824203DFC2504250425FC3D04250425FC2504450455148908 +43F5:0090788848804BFE48A078A848B048A448A878B04924492A49324A224ADE9C00 +43F6:01103D12251425D825103D122552258E25203C2025FC24202420442057FE8800 +43F7:00003DFC250425FC25043DFC2400240025FC3C20242027FE2420442054208820 +43F8:00007BFC4840484049F8788848884BFE4800780049F849084908490849F89908 +43F9:00003DFC2504250425FC3D04250425FC25043D0425FC24502490449255128A0E +43FA:00403C4024FC248825503C2024D8272624F83C2024F8242027FE442054208820 +43FB:1020102020204420FEFC02207C20442045FE7C2044207C48448445FE54824800 +43FC:00483C44245E25E024283C12246A259624483C5E25E0242424284412546A8986 +43FD:00403C2025FC240025083C90240027FE24003C0025FC25042504450455FC8904 +43FE:00203C2025FE242024FC3C4025FE248825243E2224F8242025FE442054208820 +43FF:104008403E7E228823503E20205841869FF010101FF010101FF0101010501020 +4400:00203C2025FC245024883D0427FE240825E83D28252825E82528440854288810 +4401:00007BFE4840488049447A2448684AB049307AA8486848A449224A2048A09840 +4402:000079F84808480849F8780848084BFE48207A22497448A849244A2248A09840 +4403:00007BFE4A024A1A4AE27A224A224BFE4A227A724AAA4B264A224A224BFE9A02 +4404:00403C40247C248425083E00242025CE25023D0225CE25022502450255FE8902 +4405:00003DFC2504250425FC3D002540257C25903D1025FE25102528452855448A82 +4406:0008783C4BC048444A247928490048204BFE787048A848A849244A224C209820 +4407:00803C8024FC255426543C942524245424883C0025FC250425FC450455FC8904 +4408:004078404BFC4840484079F8490849F8490879F8490849F8490849084FFE9800 +4409:00923C922524264825243C922492240025FE3D22252225FE2522452255FE8902 +440A:00003DFC2504250425FC3D04250425FC24003D1225D42518251045525592890E +440B:00907890490849484A447C9249084BFC4844782048A44A824A8A4A8A4C789800 +440C:044004403FF824483FF82448FFFE10102008DFF610101FF010101FF010101030 +440D:00203C2027FE242024203DFC2400240025FC3D04250425FC2400448854508BFE +440E:000079FC4904490449FC7904490449FC48007BFE48204920493C49204AA09C7E +440F:00203C2027FE242025FC3C4027FE248825043EFA2488248824F84488548888F8 +4410:008871C857085108512A712A57AC51485308738855545514591451245124B142 +4411:00483D48254827FE25483D482578250025FE3C2027FE247024A8452456228820 +4412:00003C4025FE248825043E4224F8270824903C7027BE244225A4441854608B80 +4413:00003DFE2410242024FC3C84248424FC24843CFC2484248424FC444854848902 +4414:00203C1025FE250225023DFE2500250025FE3DAA26AA24FE24AA44AA54AA8886 +4415:00003CF82488248824F83C0025FE248824F83C8824F82488249E47E854088808 +4416:00007BFC4A044A044BFC7A204B244AA84A207BFE4A704AA84AA84D244A229820 +4417:00203C2024FA242424283DFE2420244024FC3D442644247C24444444547C8844 +4418:001E7BE048444924488879FC484048404BFE788048FC494449284A1048689986 +4419:008878884BFE488848F8782049FC4924492479FC48204BFE4820482048209820 +441A:00007BDE4A524A524A527BD24A524A524A527BD24A1A4A944A504AB04B109810 +441B:00203C2025FE245024883D0427FE248824F83C8824F82488249E47E854088808 +441C:002078204BFE482049FC790449FC490449FC790449FC49044BFE488849049A02 +441D:00203D2424A8242025FC3D04250425FC25043DFC2504250425FC440054888904 +441E:00007BDE484248424BDE7A104A104BDE48427A52494A494A4A5248424A949908 +441F:008878884BFE488849FC78884BFE482049FC792449FC49244BFE490449149908 +4420:00883C8827FE24A824103FFE2480248024FC3C0024A824A824A844AA552A8A06 +4421:02000100FFFE02847D78255025484D6401003FF8228824482108228824482018 +4422:0080788049FC4A44495479F4488449284A9079FC4A444D5449F4488449289A10 +4423:00003CF82488248824F83C0025FC250425FC3D0425FC250425FC445054888904 +4424:00843C44244825FE24203CFC242025FE24403C8024FE25102610441055FE8800 +4425:0090788849044A424C8879FC480448004BDE78424A52494A4A524842494A9884 +4426:00203C2024FC242024203DFE2440248425FE3C0225FC25542554455457FE8800 +4427:004078204BFC480049F8790849F848004BFC7A044AF44A944AF44A044A149A08 +4428:1000FE7810487C480048FE8682007CFC00447C4444287C2844107C2844444D82 +4429:00203D242524252425FC3C0027FE240025FC3D04250425FC2488445057FE8800 +442A:00A0789049FE4B204DFC792049FC492049FE79004BFC4888489E49024A0A9C04 +442B:012479244A244C244954794A4A924E104A107A504A5C4A504A504AB04A9E9B00 +442C:009078904FFE48904BFC7A944BFC4A944BFC780049F8490849F8490849F89908 +442D:02A872A857FC52A852AA74E6580057FC5444704053F85248524852485258B040 +442E:004078204BFC4800490878904BFE4A204AA07AFC4B204A204AFC4A204C2099FE +442F:00003DFC252425FC25243DFC2440248825F03C20244427FE2422452456228860 +4430:0120793C49444AA84A107EA84AC64ABC4AA47ABC4AA44ABC4A244A244A249A2C +4431:004078204BFE488848507BFE4A224AFA4A227AFA4A8A4A8A4AFA4A024A0A9A04 +4432:00007BDE48424A52494A7A524842482049FC7904490449FC4904490449FC9904 +4433:00403C4024F8250826103DFC2524252425FC3D24252425FC24004554552A8A2A +4434:7DFC44207D2045FE7C5048525492650E1FF010101FF010101FF0101010501020 +4435:00883C8825FC248824883FFE242025FC25243DFC252425FC2400448855048A02 +4436:00007BDE48884AA84BFE79884ADA4CA649F87908490849F84908490849F89908 +4437:00007BDE4A524A524BDE780049FC492449FC792449FC48204BFE482048209820 +4438:00203DFC242427FE24243DFC242027FE24003DFC252425FC252445FC54008BFE +4439:002079FC48244BFE482479FC48204AAA4BAE7A224BFE4A224BAE4AAA4AAA9C22 +443A:00007BFE48504BFE4A527BFE480049FC490479FC490449FC48204BFE48209820 +443B:00207BFE482049FC490479FC482049FC488878504BFE482049FC482048209820 +443C:00807BDE488A49CA488A7BD248A64840488879F048244BFE482249244AA29840 +443D:008878884BFE4888488878F848204BFE4A227B324AAA4B764A224A224A2A9A24 +443E:00003DFC255425FC24203DFC242027FE24883C5025FC242027FE442054208820 +443F:004078804BFE4A224AAA7A224BFE4A724AAA7A0248204BFE4820485048889B06 +4440:00107BC84A7E4A404A627BD44A004A3E4BC87A484E7E4A484A484BC84A489808 +4441:3AB821083AB82288393822887FFE40029FF410101FF010101FF0101010501020 +4442:01407A4C4A644A444B4C7A644AA44BAC4AA47AA44FFE4800491049084A049C04 +4443:00883DFE248825FE35022CFC240025FE2C20345025AA245C25AA444855A88810 +4444:00403CF8248824F824883CF8240025FC25243DFC252425FC240047FE54888908 +4445:00887BFE488849FC4954795449FC48004BFE7A4248F848884948483048609B80 +4446:010878904BFC484049F878804BFC494849FC7B0A4DF8490849FA4934498C9902 +4447:00427B9C4A104BDE4A947A944C204BFC4A047BFC4A044BFC4A044BFC49089A04 +4448:012479744A584ADA4BFE79544ADA4BFE48A278204BFE487048A849244A229820 +4449:E040BFFEA400A7FCA000E7FCA404A7FCA040EE4EABEAAEAAAAAEAE4A2AAA7710 +444A:0010787C4A54497C491078FE48444B7C4944797C4944497C492849444A809C7E +444B:00207BFE480049DC495479DC48884BFE48887BFE48884BFE489449884AA498C2 +444C:03DE7A524BDE4A524BDE7A224AFA4A224AFA7AAA4AFA4AAA4AFA4A724AAA9A26 +444D:03DE7A524BDE4A524BDE7A524BDE498C4A5278404FFE48884990486048D89B04 +444E:0148794C4AAA48084FFE79484B68494A4B6A794C4B6C4948496A4B9A48269842 +444F:00887BFE48884BDE4A527BDE48A0489049FE79204BFC4D2049FC492049FE9900 +4450:00407E40484048FE48807E804310421042587E5448944892491248107E500020 +4451:00287EAA486C482848FE7E44422842FE42107E7C481048FE481048287E440082 +4452:0000FE0011FC2024282444A4FEA412A4112410247C24104410441E84F1144208 +4453:08207FFC08200FE008200FE008207FFE4002BFFC08201FF001001FF001007FFC +4454:0020402098208BFE8820882089FCD9248924892489248934F928882000200020 +4455:060038F820083EF820083FF800003FF821083FF821083FF8210A410A41068102 +4456:002040209BFE882089FC88248BFED82489FC88208920893EF9208AA0027E0400 +4457:000041F8990889F8890889F88800DBFE890089FC8A548C94F9248A4400A80110 +4458:0108408898908BFC884089F88840DBFE8880890089FC8A20FC20882003FE0000 +4459:08001CFC708410841084FDFE108410847C8445FE4484448444847C8444940088 +445A:08001CFC708410841084FCFC108410847C8444FC4484448444847C8445140208 +445B:08041C1E71F011101110FD10111011FE7D10451045104508450A7D4A45A60112 +445C:08481D48714813FE1148FD48117811007DFE442047FE447044A87D2446220020 +445D:00003EF8228822883EF80000FFFE902210203DF84420A520192011FC20204020 +445E:3FFC24902960261038882290256022102C083FFC10103EFC4210149018FEE010 +445F:0F10F020117C8944427C0044FF7C810042FE771092105A7C2F10221042FE8200 +4460:080011FC3E04220832102A202A20FE20222032202A202A20222042204AA08440 +4461:100021F87C8844C864A854A85488FC5044506450542054204450448855048A02 +4462:100020007DFC4490649054905490FC90449064905490549244924492550E8A00 +4463:080410043F082110292025442504FF08211029222542250421084110452082C0 +4464:082010203E50225032882B442A22FE20220033FC2A042A08220842104A108420 +4465:080010FC3E44224832482A502A5CFE44224432442A682AA8229042984B248442 +4466:084010403E8022FC33042A042AF4FE94229432942AF42A94220442044A288410 +4467:1088208878884908697E5B084D08F94849284928690859084908490849289910 +4468:108020807CFE450066205520552CFD7447A46524553455284522450254FE8800 +4469:081010103E10221032FE2A102A10FE10227C32442A442A44224442444A7C8444 +446A:082010203E50225032882B042AFAFE00220032F82A882A88228842884AF88488 +446B:088410483E0022FC32482A482A48FE4823FE32482A482A48224842884A888508 +446C:085010503E50235232D42A582A50FE5822D433522A502A50229242924B12860E +446D:100021007CBE4488640856085508FD484448648857885488448844FE54808800 +446E:100020F87C884488648854885526FE2045FE6420547054A84524462254208820 +446F:110820887C9045FC6424542455FCFD20452065FE546254A2452A462454208820 +4470:081010103E90229E32902A902BFEFE00221032922A922B14220442084A3085C0 +4471:104020207BFE4A026D04590049DEFA524A524B526C9A5894491049124A129C0E +4472:082010203E3E222032FC2A842AFCFE8422FC32A42A202BFE222042204A208420 +4473:102020207C504488650456FA5400FDFC4554655455FC5554455445545504890C +4474:084410443EFE224432442A7C2A44FE44227C32442A442AFE220042284A448482 +4475:100021FE7D02457A6502557A5400FCFC448464FC548454FC4484448454948888 +4476:081010103EFE2210327C2A102AFEFE00227C32442A7C2A44227C42444A548448 +4477:102020107DFE4502650255FE5500FD7E4542657E5542557E45424542554A8A44 +4478:082010103EFE228232002A7C2A00FE0022FE32102A102A54225242924A508420 +4479:104020207BFE4A2268A459284850F888490448F8688858884850482048D89B06 +447A:100023FC7A044A346BC45A444BF4FB544B544BF46A445A544BF44A944C069802 +447B:1108208878884BDE6910592049DEF94249444944695E59444A444A444CD49808 +447C:104020407CFE452264AA54FA5442FC94454864FE552256AA44FA444254948908 +447D:100021FC790449FC690459FC4800FBDE48424A52694A58C64B5A4842494A9884 +447E:10A0209079FE4B2069FC592049FCF92049FE49006BF859084890486049989E06 +447F:102020107BFE4A02688058FE4910FB204D7C49446944597C49444944497C9944 +4480:1110211079DE4AA86C4458884888F9084B7E4D08694859284908490849289910 +4481:100023DE78424A52694A5A524842F82049FC4904690459FC4904490449FC9904 +4482:109022907A9E4AA26AD45BA84894F8A44FFE4A846AA45A944A944A844C949888 +4483:101020507A50497C6890581048FEFB00497C49446944597C494449004AFE9C00 +4484:100020007BFE4A0269FC580048F8F88848F8480069FC592449FC492449FC9904 +4485:102021247CA845FC644057FE5488FD0447FE650455FC550445FC450455FC8904 +4486:110820887BE849106A9E5FD44864FBD44A544BD46A545BC84A484A544A649AC2 +4487:104020207BFE4A0269FC580048F8F88848F8480069FC592449FC492449FC9904 +4488:102021FC7C20448867FE548855FCFD0445FC650455FC550445FC448855048A02 +4489:108021007BFE4D5469545BFE4954F9544BFE490469DE5A444954489E49049A04 +448A:0440244022FC2288431040FCBEA410A420A43EFC0280028002820282147E0800 +448B:1040104010FC7C88551054FC54A454A454A4FEFC1080108028822482447E8000 +448C:0020FF20817C00447E88427C7E5442547E54107C0840FF4000422442423E8100 +448D:20401040FEFC0088451028FCFEA4A2A410A4FEFC20803C8024824482547E8800 +448E:24202420FF7C24441288FE7C245442548154247C2440FF4024422442443E8400 +448F:4440244028FCFE889310D6FCBAA492A4FEA400FC7C8044807C8244827C7E4400 +4490:2220FFA0227C7F4455887F7C0054FFD480D43E7C22403E4022423E42223E3E00 +4491:00000000000000001010081008200000FFFE0000000000000000000000000000 +4492:08200820FFFE0820082000003FF8000800480188060818086008000800500020 +4493:08200820FFFE082008200000FFFE0400040008001FF000100010001000A00040 +4494:08200820FFFE0820082000400440044004200820082010101010200840048002 +4495:08200820FFFE0820092001000100010011101108210421044102810205000200 +4496:08200820FFFE0820082000007FF0041004100410FFD00412040A040604020400 +4497:04400440FFFE0440080008001FFC200040009FE0002000C003000C0410040FFC +4498:08200820FFFE08200820040004000FF01010282044400280010006C01830E00E +4499:08200820FFFE08200820010001000100010001F80100010001000100FFFE0000 +449A:08200820FFFE082008200100010011101108210421144120004001800E00F000 +449B:08200820FFFE0820100010FC22044204FC040804100422044104FF0441280010 +449C:08200820FFFE08200920110011001FF8210041000100FFFE0100010001000100 +449D:08200820FFFE08200008181006600180066018186C240240018006601818E006 +449E:08200820FFFE0820092001003FFC2104410802800280048008821082207E4000 +449F:08200820FFFE082000001FF01010121011101010FFFE10102010201040508020 +44A0:08200820FFFE0820092001007FFC010001003FF801000100FFFE010001000100 +44A1:08200820FFFE082000007F08010801083F08200840087F08010801080A080408 +44A2:08200820FFFE0820082000000C0070FC4084408440844C847094408800800080 +44A3:08200820FFFE082000001FF0101010107FFC101010107FFC1010101010501020 +44A4:08200820FFFE0820082000003FF82008200820083FF82008200820083FF82008 +44A5:08200820FFFE082000007FFC010001003FF82108210821082128211001000100 +44A6:08200820FFFE082001F03E00020001007FF8006001800E003000480087FE0000 +44A7:08200820FFFE0820092001003FF8010001000100FFFE0400082010103FF81008 +44A8:04400440FFFE0440080008001FF8210041000100FFFE0280044008203018C006 +44A9:08200820FFFE0820000000F01F00010001007FFC054009203118C10601000100 +44AA:0820FFFE08200400082010103FF8000808200820FFFE08200820102020204020 +44AB:08200820FFFE08200000085008481040307C57C09040102010201014100C1004 +44AC:08200820FFFE0820082000003FF800000000FFFE010011102108410485020200 +44AD:08200820FFFE082000001FF0001000107FFC00000020FFFE0820042004A00040 +44AE:08200820FFFE082000007FFE400280040FE008200A20092009221022201E4000 +44AF:08200820FFFE082000007FFE420282041FE002200C2004200A2011222022401E +44B0:04400440FFFE044000003FFE20002FFC2080208027F8208020802FFC20003FFE +44B1:04400440FFFE04403FF0002000C07D040588095011202118C5060200FFFE0000 +44B2:04400440FFFE04401008101CFEE0122022202220643E15E0082214222222C01E +44B3:08200820FFFE082000000FE008201020611C0100FFFE054009203118C1060100 +44B4:08200820FFFE0820040004007FFC08001FF028104FF088100FF0081008500820 +44B5:08200820FFFE0820100011F8FC082410242025FE442024201820182024A0C240 +44B6:08200820FFFE0820092001003FF821083FF821083FF8010800B001C20E32700E +44B7:08200820FFFE082000F01F0001000100FFFE010001001FF0101010101FF01010 +44B8:08200820FFFE0820092002003FF82448244824482448244824482448FFFE0000 +44B9:08200820FFFE0820092001007FFC01003FF80100FFFE054009203118C1060100 +44BA:08200820FFFE0A20040008201FC0008003200C103FF801081110210845040200 +44BB:04400440FFFE04400800087C080449044904497C494049404F427942003E0000 +44BC:08200820FFFE0820044004403FF82448244824483FF82448244824483FF82008 +44BD:08200820FFFE082000003FF820082AA82AA8244824482AA82AA8200820282010 +44BE:08200820FFFE08200A200100FFFE02000500090418882850C8200A180C060800 +44BF:08200820FFFE08207FFE40029FF4101010101FF0101010101FF0101010501020 +44C0:08200820FFFE0820092001007FFC010001001FF000001FF0101010101FF01010 +44C1:08200820FFFE082001003FF801000100FFFE000000207FFC0820042004A00040 +44C2:08200820FFFE08200A200100FFFE00003FF800003FF800003FF820083FF82008 +44C3:04400440FFFE04401FF010101FF000003FF8210821083FF8200220021FFE0000 +44C4:08200820FFFE08204400280C11F02900C90019FE2910491089100A1052102410 +44C5:08200820FFFE08200820200C11F01100810049FE49101110E110221022102410 +44C6:04400440FFFE04401000100C11F0FD00110011FE1D10F1101110121052102410 +44C7:08200820FFFE082001003FF801000100FFFE0440244844448842084011402080 +44C8:04400440FFFE0440100010F8208841088A06100031F850889050102010D81706 +44C9:08200820FFFE082000007E7C2444244844507F48144424444454844814400840 +44CA:0820FFFE082000007FFC020002003FF004100810FFFE00001FF0101010101FF0 +44CB:08200820FFFE08202008103C13E082204A204BFE1220E2102212228A23062202 +44CC:08200820FFFE0820092001007FFC010001003FF80000010008844892481287F0 +44CD:04400440FFFE04401FF010101FF010101FF000003FF80100FFFE010001000100 +44CE:04400440FFFE04401080108014FC55045A045084904410442804240444288010 +44CF:08200820FFFE082000007FFC010003000D603118C1041FF0101010101FF01010 +44D0:0820FFFE082001007FFC044008203118C1063FF80100111011141FF4010400FC +44D1:08200820FFFE0820200017FC91104110411017FE2110E1102210221024100810 +44D2:04400440FFFE044010001FF820085FC8924812481FC8124812481FC800280010 +44D3:0820FFFE0A2002007FFC02003FF80400FFFE08201FFC20204420822002A00040 +44D4:08200820FFFE082001081FD00120FFFE01001FF0082030C0CFFC008002800100 +44D5:08200820FFFE082023F01000100007FC7120112012241224141C280047FE0000 +44D6:08200820FFFE0A2001007FFE40028824121022081FF004100410081010A02040 +44D7:08200820FFFE08200440082011102208C44608201FF0011008844892481287F0 +44D8:0820FFFE0820000008401F6022505448084037FEC0001FF0101010101FF01010 +44D9:0820FFFE082000701F800100FFFE010009207924092809321922E91E01000100 +44DA:04400440FFFE0440100021F84108890811F83108510891F81108110817FE1000 +44DB:08200820FFFE082000003FF820083FF820802490249027F02080488848888FF8 +44DC:08200820FFFE08202008103C13E082204A204BFE1220E2102212228A23262212 +44DD:0820FFFE082000001FE0004001807FFC0100050002003FF824482448FFFE0000 +44DE:08200820FFFE092000803FFC200420043FFC20A020902FFC2120421044089806 +44DF:08200820FFFE082000003FF8210827C821082FE8200827C8244847C840288010 +44E0:08200820FFFE082001047D9809603118C50602001FF010101FF010101FF01010 +44E1:08200820FFFE0820282020003E7C484488440844FF4408441444227C41448000 +44E2:08200820FFFE082000003FF8210821082FE8210827C8244827C820083FF82008 +44E3:08200820FFFE0820FFFE010001007FFC41045144492455546594410441144108 +44E4:04400440FFFE044008001FF822484448088811082228041001004884481287F2 +44E5:0600010006C01830E44E3FF804401FF010101FF010101FF001007FFC01000100 +44E6:08200820FFFE0820044004403FF8244824483FF824482448FFFE082010102008 +44E7:0440FFFE044000003FF0002000C0793C4904496849107928014405000200FFFE +44E8:08200820FFFE08207FFE400288041FF821000100FFFE0100210821083FF80008 +44E9:04400440FFFE04401020102011FEFC20102031FC388454885050902010D81306 +44EA:08200820FFFE08201FF010101FF010101FF008001FF822484488090812282410 +44EB:08200820FFFE092001003FF804400820FFFE00101F9010901F90001000500020 +44EC:08200820FFFE0820010001FC01003FF820083FF820083FF80100FFFE01000100 +44ED:08200820FFFE0820010432040C243224C9240824FFA408242A244904A8941008 +44EE:08200820FFFE08203E400240147E0888FF480A48185028504820085028881104 +44EF:0820FFFE09203FF801001FF001007FFC00001FF01210FFFE20903FFC00100060 +44F0:0820FFFE082000007FFC04403FF8244824483FF8010001003FF801000100FFFE +44F1:0820FFFE08200440274C247024422F42F03E01007FFC054009203118C1060100 +44F2:04400440FFFE044009080890100013FC3204520493FC1090109011121212140E +44F3:04400440FFFE0440000009F8110821F8450809F8192429284910094809860900 +44F4:0820FFFE08200000FFFE02003FF8248824A821100100FFFE028004401830E00E +44F5:08200820FFFE082000001FF0101010101FF000007EFC4284428442847EFC4284 +44F6:04400440FFFE044008080808FF8808487F4849487F481C482A48490888280810 +44F7:08200820FFFE08A02100123C94804100437E15082108E1082108210821282110 +44F8:04400440FFFE044008007EF812202420182065FC08207E201220242018206420 +44F9:08200820FFFE092002800E603118DFE610201FE010201FE01008119014601810 +44FA:0820FFFE0820101008207FFC01003FF80100FFFE01007FFC028004401830E00E +44FB:08200820FFFE08207FFE4002BE24002001FC7E4814C81430146A2586240243FE +44FC:0820FFFE08201088108413FEFCA424A824B424A848B228A410AA2932452282DE +44FD:04400440FFFE0440200010FCFE0400047C0400FC7C8000807C8044827C82447E +44FE:08200820FFFE082020401248444420140860738020000400FFFE082007C07838 +44FF:0820FFFE082000003FE0044002807FFC444442845FF441047FFC410441047FFC +4500:0440FFFE0440103813C0204027FC6150A248244620802FFE2110232020E02718 +4501:08200820FFFE082000007FFC04403FF824483FF801007FFC05401930E10E0100 +4502:0820FFFE0A2001007FFE420281043FF808200440FFFE01003FF8010001000100 +4503:08200820FFFE0820200011F8FD08090811F83908550895F81108110817FE1000 +4504:0820FFFE082000FC7F002208111020203FF841000100FFFE0100210821083FF8 +4505:0820FFFE082000007FFC00201F2011201F200000FFFC00201F2011201F200060 +4506:08200820FFFE0820440029FC112429FC492499FC282049FC8820082053FE2000 +4507:0820FFFE08200100210821083FF800007FFC00001FF010101FF008200440FFFE +4508:0440FFFE04403FF801007FFC00001FF010101FF010101FF010101FF008201010 +4509:08200820FFFE08200C1C71E010201020FDFE307038A854A85124922210201020 +450A:08200820FFFE08200108FC9011FC109010907C9013FE10901C90F11041100210 +450B:04400440FFFE04401020102024207CA808A4112225227E280010542054C08300 +450C:0820FFFE082002001FF010101FF010101FF002007FFC08203118CFE601000100 +450D:08200820FFFE082000001FF811001FF011001FF011001FFC0004292444940008 +450E:08200820FFFE0820204017FC104003F87248124813F8115012481444284047FE +450F:0820FFFE08200040224013F81440004077FC100013F8120813F8280047FE0000 +4510:04400440FFFE04402120111017FC80904064539C11202110E7FC20902064239C +4511:04400440FFFE04400808144822285D0888C808287F0E08F82A084908A8881008 +4512:08200820FFFE0820008078404BFC5108609057FE480049F86908510841F84108 +4513:0820FFFE082020001040FE4000FE7C9001107C1001FE7C10441044107C104410 +4514:0820FFFE082001003FF80440FFFE00001FF010101FF010101FF004421842E03E +4515:04400440FFFE0440002878244BFE482079FC492449FC792449FC49244924990C +4516:0820FFFE0820000078404BF8504067FC51104A884CF4691052A0404041B04E0E +4517:08200820FFFE082020881050FBFE0820102039FC5420942013FE102010201020 +4518:04400440FFFE0440200020F83C88508810F8FC88108854F854885C8875FE0400 +4519:08200820FFFE08201080288044FCB90412047C841044944450041E04E0284010 +451A:0820FFFE08203FFC20002FF820003FFC24482630240E2FF848084FF888080818 +451B:08200820FFFE082023FC204021F821083DF8210821F8250829F8300020900108 +451C:04400440FFFE04400020FC2049FC7924492479FC49244D24FBFE090409140908 +451D:0440FFFE044008442F7828422F3EF40008201FC003100C083FFC010415102208 +451E:0820FFFE0A2001007FFC020044442F88111022484FE400200100FFFE01000100 +451F:0440FFFE044000200C4070FC13081090FC6030903B3E544255A4901810601380 +4520:04400440FFFE044010201124FCA8102031FC390455FC910411FC110411141108 +4521:04400440FFFE044008001FE020207FF8A1083FF821083FF80000248822444244 +4522:0820FFFE0820145022880820145022881FF00000FFFE10001FF8000800500020 +4523:0820FFFE082003043C2404247FA416242504440C11001FF82100FFFE01000100 +4524:08200820FFFE0820000013FE20207C4045FC450445047DFC450445047DFC4504 +4525:0820FFFE082001003FF00110FFFC01103FF0092025482FE82388254829284108 +4526:04400440FFFE0440110011FC1200FDF83148392857FE5148922813FC10501020 +4527:0820FFFE082003043C2404247FA416242504440C01007FFC05401930E10E0100 +4528:0820FFFE08201050104824FE45907A9010FC2490449078FC0890109020FEC080 +4529:04400440FFFE044008200820FFBE08447FA449247F281C282A10492888440882 +452A:0820FFFE082001007FFC01002928111029280100292811102AA804401830E00E +452B:04400440FFFE044000207C2007FE182051FC5D24512C50705CA87124C2220020 +452C:0820FFFE082000003FF821083FF821083FF804403FF80440FFFE082010102008 +452D:0820FFFE09207FFC41041490142823E800003FF821083FF821083FF821082118 +452E:08200820FFFE0820220C2270FF4022403E40227E3E482248FF48224841488088 +452F:0820FFFE082000107F10141014FE7F105510557C574461447F4441447F7C4144 +4530:0820FFFE09207FFC40043FF800001FF010101FF000003FF821083FF821083FF8 +4531:08200820FFFE082011F81108FDF8100013FC11081DF8F10811F8110E57F82008 +4532:08200820FFFE082000907EA00444282817D02008DFF610101FF0082004407FFC +4533:04400440FFFE044010281E2432FE4A20A450185010882106C000248822444244 +4534:0440FFFE044008002A003E7C49447F4400443E2800287F1008102A2849441882 +4535:0820FFFE082000007C7C44447C7C44447D7C41045FF44384454449245124410C +4536:0820FFFE0820000011FC1104FDFC110415FC180037FED020113C112052A0247E +4537:0820FFFE08200000FEFE10107C7C1010FEFE010006C01A30E10E1FE000400080 +4538:0440FFFE04400120FFFE02800C603018C00610281424FEFE1020285044888106 +4539:0820FFFE0820010878904BFC48805144566848B049284E6868A4512246A04040 +453A:0440FFFE04407BFC488049F8522055FC480049F8490869F8510841F841084118 +453B:0820FFFE08201040FE4000807CFE45087E8800887C500850FE20105050882306 +453C:0820FFFE082000007EFC122452A49324264C409008502E5C28502E50F1FE0000 +453D:0820FFFE082023F8120813F8820843F8510013FC2444EAA4220423F420142008 +453E:0820FFFE082023F8220823F8FA0823F8290033FC6444AAA4220423F4A0144008 +453F:0820FFFE08200440FFFE04403FF82848303827C820083FF80020FFFE08200460 +4540:04400440FFFE044008207F20083E3E4200943E1000107F1008282A2849441882 +4541:0820FFFE082004407C7C04403C7804407C7C05400100FFFE05401930E10E0100 +4542:0820FFFE082000802110120817FC000473F8120813F810C411A812902C8847FE +4543:0820FFFE0820004078A049104BF8550651F0490049F049006FFC5100421043F8 +4544:0820FFFE082000001FC000447D88055009203518C2061FF000003FF82448FFFE +4545:0820FFFE08200080112C1124FDAC252425FC482029F810882850442080D80306 +4546:0440FFFE044020A021102208F5F62000678474A4AFA4A4A427A4248424942588 +4547:0820FFFE092000803FFC208021002FF828882FF829082FF84254445C9842603E +4548:0820FFFE0820004809484BFE49487978090009FEF8204BFE487048A88B260820 +4549:0820FFFE08203FF824483FF801003FF80100FFFE04403FF80100FFFE01000100 +454A:0820FFFE0920FFFE00003FF8200827C824483FF810101FF010101FF00000FFFE +454B:0820FFFE08201040102013FE12207EFC122413FE12241EFCE22004FC048408FC +454C:0820FFFE082000000CA0709011FE1120FB2031FC392055FC5120912011FE1100 +454D:0820FFFE0A200100FFFE04881A70EC1808063FF824482FE8345827C820282010 +454E:08200820FFFE082001FC7C0044F844887CF8440045FC7D2445FC45247DFC4504 +454F:0440FFFE0440101008203FF801007FFC02403C500848FFFE08507E240854198C +4550:08200820FFFE082021FC1000FCF8088810F8380055FC952411FC112411FC1104 +4551:0440FFFE0440001C11E0104425247C880820102025FC7C4800C8543054688184 +4552:0820FFFE0920FFFE01003FF800001FF010101FF00820FFFE10007EF8228846F8 +4553:0820FFFE0A2001007FFE50829EFC22885450282017D82006DFF0010011102308 +4554:0820FFFE08202100411C828014402BBE7108A7C821082948250821C82E282410 +4555:0820FFFE082011F8090809F8410823FC2A940BFC100073F81090106011981606 +4556:0820FFFE0820400C2F70211002240278E3122E7E221022542A92243050008FFE +4557:0820FFFE0A201FF010101FF010101FF000003FF821083FF82108FFFE08201020 +4558:0440FFFE0440100013FC284045F8930809F8FD0805F8090851F8200010900108 +4559:0440FFFE044008207F280824FFFE12203FA46424BFA824183F92242A3FC62082 +455A:0820FFFE08203FFC208027F0249027F020803FFC241027F0241027F022203FFC +455B:0440FFFE044020201020FDFC002078A800A878A801747A224850488879044A02 +455C:0820FFFE08207CF824481428244801007FFC0820145022880100FFFE01000100 +455D:0820FFFE0820001E0DE07044112410A8FDFC312439FC552453FE910411141108 +455E:0820FFFE08207C7C44447C7C44447D7C47C4444447C4444447D444A44544462C +455F:0820FFFE082000002FEC48244BA4682C4BA46AAC4BA44824FFFE101020084004 +4560:0820FFFE082000803FFE20202F2831102A0A277C294A378428784F484130874C +4561:0820FFFE08207C7C44447C7C44447C7C47C4444447C440044FE448244FE4400C +4562:08200820FFFE082000887C5013FE102021FC3C4067FEA480257C26103C1025FE +4563:0820FFFE082023F8120803F8FA080BF811002BFC7444AAA42A0423F420142008 +4564:0820FFFE08207700557C774400487F5049487F4449447F540848FFC008400840 +4565:0440FFFE0440111025484924BFFA210835582928355821083558292835582118 +4566:0820FFFE082001007FFC10001FF808200FE079384FA87AA84AB8792A4AAA9C46 +4567:0440FFFE04403E2022103AFE2A007F2841443E8222283E2822103E2822442682 +4568:0440FFFE044001243CA825FC24403DFE248825443E8A24F0242445FC54A88964 +4569:0440FFFE04401000102013FE7850128A31FC3A8A54F8508890F8112412221060 +456A:04400440FFFE044023F812A893F8404043F8104027FCE11023F8204027FC2040 +456B:0820FFFE08A0111E13D25A5E53D05A52E3CE120827E44822144003801C70E00E +456C:0820FFFE082003FEF80009FC0924F9FC812487FEF80009FC092409FC512427FE +456D:0440FFFE0440101010547C581090FE280044549292547C5810901C28E0444182 +456E:0440FFFE0440110011FC7E441154FEE4444429F47C4410E4FF54104410541008 +456F:0820FFFE08200000FE1C28E8FEA8AAA8FEA800A87CA800A4FEA4554A92783008 +4570:0440FFFE0440101C13E0152454A85BFE5124920211FC112429FC252445FC8104 +4571:0820FFFE082000007DFE002000FC7E8442FC42847EFC428424FC0F00F0484084 +4572:0820FFFE08A03FFE20402FFE240425F4251427FC200027FC20004FFE424884C4 +4573:0820FFFE08200000F7FC124817FCFC4686EC8554F6EC155416EC144454542408 +4574:0440FFFE044000A00C9071FE112013FCFD2031FC392055FE500092A412521452 +4575:0440FFFE0450102010FCFE8410FC10847CFC008000FE7C8044FE44027D524406 +4576:0440FFFE0440209010FEFD9002FC789000FC789000FC788049FC488878704B8E +4577:0820FFFE092000803FFE24103F7C26382D543492212027C021104FF844A48990 +4578:0440FFFE04407F1049106BFE5D107F10087C7F0008000F7CF0440044557C5544 +4579:0440FFFE044020101048FE4044FE4590AA9010FCFE9010FC5490529092FE3080 +457A:0820FFFE0820244814507FFC082004407FFC0100FFFE22003E7C23A47E180266 +457B:0440FFFE04403F7E12241B3412A43FFC22403FF822483FF828442F7848428F3E +457C:0820FFFE08204450FE4844FE7D901290FEFE9290FE9010FEFE90289044FE8280 +457D:0820FFFE082001FC7D5445FC44807DFC124411F45D5451F450445DF4E0140008 +457E:0820FFFE082000001E7812483FFC20202E20223C3FC829282F2849905F288144 +457F:0440FFFE04504420FEFC44847CFC1084FEFC9280FEFE1080FEFE280245528206 +4580:0820FFFE08203C782448FFFE02001FF0149012501FF0082010107C7C44447C7C +4581:2810FEFE284400287CFE54007C7C54447C7C1044FE7C9210920ABAAA8AA4851C +4582:0820FFFE29284FD2F03C23884812FBBE0280ABAA00F03F000100FFFE01000300 +4583:0820FFFE0A207FFC08001FF068100FF04444FEFE5454FEFE20207C7CC4C47D7C +4584:0820FFFE08204450FE4844FE7D9010FCFE9092FCFE901090FEFE288044488224 +4585:0820FFFE08203FF801007FFE492284143BB82AA83BB800007FFC11102928FFFE +4586:0440FFFE04400020FBFE2154F9DCA888A9FCD88889FC8888FBFE898AFEA488C2 +4587:0820FFFE2A28F3BC2508739CAD6A27C80000FFFE950A6B7055047F3824823FBC +4588:010001F801003FFE210221F02F0420FC2000241824E027042404440443FC8000 +4589:010001F801003FFE210221F02F0420FC200023F8204020402FFE404041408080 +458A:0020043E042085FE4522293829E01122111E2900297845484548824A024A0486 +458B:0410079004103F90249027103C102490239020282F282928296449A491242042 +458C:0404078404043FD4245427143C5423D420142F14291429044944498491142008 +458D:010001F801003FFE210221F02F0420FC210021FC2210251028A0404041B0860C +458E:00407840487C504053FC624452704BC04A444A3C6A0052F0449044924912520E +458F:010001F801003FFE210221F02F0422FC220027F82D48334822E8449E49088218 +4590:04100E1E301020FE2092209C3EF02492248E248024B824A824A8452A452A8246 +4591:08000F00087C7F4449444E44787C4944474440444E7C4A444A02520291FE2000 +4592:010001F801003FFE210221F02F0420FC20002FF8200027F0241047F042209FFC +4593:1010101E921092FE9292929CFEF01092108E928092B892A89EA8F32A012A0246 +4594:1020103E10207DFE1122113811E0FD22111E110021784948FD48464A024A0486 +4595:08000F0008787F4849484E7878484948477840484E484AFC4A02520291FE2000 +4596:08000F00087C7F5449544E7C78544954477C40104E104A104A12520291FE2000 +4597:01FC01003FFE210221F02F0420FC20282FFE28202BA428282BAC2A944BAC9044 +4598:10401E4010787E8853105CFC70A452A44EFC40205C505458545456929492210E +4599:3F9024183F1421123F10247C3F8020802FFC288428F02F84287C49E04924921C +459A:10201E4010FC7E8452845CFC708052FE4E8040FE5C0254AA54AA560294142008 +459B:08100F10087C7F1049FE4EA278444978471440FE4E104A544AB2520291FE2000 +459C:1E3C10207EFE52A25CB872E44E9C40805CB8952A23465FF010101FF010101FF0 +459D:0008007C07807900010001003FF82108210821083FF82100011001F87F042004 +459E:0808080808087F0849FE4908490849087F48482808280A080F08F10840280010 +459F:02000100FFFE100010001FF8000001001FF0111011101FF0110001087FFC2004 +45A0:100011F011107D1055105510559055507D505110111015121D12E612420E0400 +45A1:100011F810487C4854485448544855F87C885088108814881C88E48843FE0000 +45A2:1020102010207CA854A454A2552255207E245024102814081E10E22040C00300 +45A3:1008101C11F07D5055505550555055507D505148114815481D44E64442420400 +45A4:100010F83E884288A4A818941084207CC1001FF0111011101FF001087FFC2004 +45A5:1FF0022001407FFC048418886280010001001FF0111011101FF001087FFC2004 +45A6:1020102011247D245524552455FC54207C205124112415241D24E52441FC0004 +45A7:1000100010FC7C845484548454FC54847C84508410FC14841E00E20041FE0000 +45A8:1000100011FE7C2054205440544054FC7C845184128414841E84E28440FC0084 +45A9:1040102010287C0854085448545455527D525160126014441CC4E544423C0000 +45AA:088008882E9028A028C028842E84F07C01001FF0111011101FF001087FFC2004 +45AB:1010105010507C885488550456FA54207C20502011FC14201E20E22040200020 +45AC:100011FC11247D24552455FC552455247D2451FC112414201C20E42040200020 +45AD:1110091009207FFC0200FFFE08203018C1061FF0111011101FF001087FFC2004 +45AE:1020102010407DFC55045504557455547D545154115415741D04E50441140108 +45AF:01003FF80100FFFE01003FF80100FFFE000001003FF821083FF801087FFC0004 +45B0:1004101E11E07D0055065578555055507D52115415481D48E544425402620440 +45B1:100011FE11007D0055FE55105510557C7D105110111015FE1D00E50041FE0000 +45B2:1080108011FC7D04560455E4552455247DE45124112415E41D04E40440280010 +45B3:1020101011FE7D025400541C54E054207C20503E11E014201E22E222401E0000 +45B4:1050105010507D5254D45458545054587CD45152105014501E92E2924112020E +45B5:1020102010207DFC55245524552455247DFC5124102014281C24E5FE40820000 +45B6:100013FE10407C8055445624546854B07D305228106814A41D22E62040A00040 +45B7:218420682030F8C8AB04A840ABFEA8A0F920A3FC252429243934E92840200020 +45B8:02403C500848FFFE08480E5078240854198C01003FF821083FF801087FFC0004 +45B9:208820882088FB8EA888A888A800A9FCF820A02023FE28203820E82040200020 +45BA:1080108011F821082A906C60A9982E4628402BF82A482A482BF8204427FC2004 +45BB:1020101011FE7C205448548455FE54027CA850A810A814A81EA8E2AA412A0206 +45BC:21002100211EFB92A912A912A912AFD2F912A112221A2A943FD0EA5040100010 +45BD:03083C0804487F480C4816482508442805101FF0111011101FF001087FFC2004 +45BE:1020101011FE7D02560454F8540054007DFE5050105014501E92E292410E0200 +45BF:0C8070FC1124FD241224384454849128101001003FF821083FF801087FFC0004 +45C0:2020202021FCF820A820ABFEA888A944FA42A0F821882A503820E85041880606 +45C1:1020102011FC7C505488550457FE54087DE85128112815E81D28E40840280010 +45C2:10201020103C7C2055FC5524553055E07D24511C110015701D50E5524292050E +45C3:10481044105E7DE054285412546A55967C48505E11E014241E28E212406A0186 +45C4:1050108811547C2054D85706540854F07C80508010FC14901C90E51042100010 +45C5:100010FC10807CF8548054F8548057FE7D405124112815101D08E54441820100 +45C6:1020101011FE7D02560454F8548854887CF85080108014FC1E84E28440FC0084 +45C7:1080108010FE7D02562254AA547254227DFE5022107214AA1D22E422400A0004 +45C8:1040102013FE7C805480548054FC54007CFC508410FC14841EFCE28440FC0084 +45C9:10F8108810887CF85488548854F854007DFC5104110415FC1D04E50441FC0104 +45CA:102010A210A27D2454505488570454227C2050A410A415281C50E48841040202 +45CB:1088108813FE7C88548854F8548854887CF8502013FE14701CA8E52442220020 +45CC:100011FC11047DFC550455FC542055207DFE5220102015FC1C20E42043FE0000 +45CD:0FE010201FC00040FFFE0C1073200DC072B00C8EF3003FF821083FF801047FFE +45CE:100013FE10507C5055FC5554555455547DFC5020102015FC1C20E42043FE0000 +45CF:1040102011FE7D2254A45528545054887D0450F8108814881E50E22040D80306 +45D0:1040FEFE21203CAC24F427A444AC54A2887E01003FF821083FF801087FFC0004 +45D1:100010FC10847CFC548454FC548454207C1051FE100014841E48E20041FE0000 +45D2:210820902000FBFCA890A890A892AC92FA94A298209028903890E89047FE0000 +45D3:2080208020FCF954AAD4A8B4A92CAA44F894A108204028A43AAAEA8A44780000 +45D4:108010BC10847D0855FE57205520557C7D90511011FE15101D28E52841440182 +45D5:01007FFC50043EF84288A2AA1492187EE1001FF0111011101FF001087FFC2004 +45D6:20A820A823FEF8A8A8A8A800ABFEAA22F820A1FC212429243934E92840200020 +45D7:2210221023DEFD28A884A800ABFCA890F890A09027FE28903890E91042100410 +45D8:1020102010FC7C20542055FE544054847DFE500211FC15541D54E55443FE0000 +45D9:01007FFE44429FF404403FF80440FFFE082011102FE8C9260FE001103FF81008 +45DA:1028102413FE7C2055FC552455FC55247DFC5124100817FE1C88E44840480018 +45DB:2120213C2144FAA8AA10AEA8AAC6AABCFAA4A2BC22A42ABC3A24EA244224022C +45DC:204023BE2212FA92AA52AAAAAB24A840FBFEA22222222BFE3A22EA2243FE0202 +45DD:20201020FDFC092411FC392455FC9020102001003FF821083FF801087FFC0004 +45DE:00003FF80100FFFE02800C603018C00610207EFC52A47EFC10201424FEFE0202 +45DF:7F7848485F4C64805F7844484A4851307F4C01003FF821083FF801087FFC0004 +45E0:20401040FEFE21003DFE242224A044BC55608A3E01003FF821083FF801047FFE +45E1:200023FE2020F93CA920AFFEA880A8FEF900A1FE20022AAA3AAAEC0240140008 +45E2:1010105012507D7C5490541054FE57007D7C51441144157C1D44E50042FE0400 +45E3:08200820FFFE08200FE008200FE0000010207EFC52A47EFC10201424FEFE0202 +45E4:101011FE11107D7C551455FE5514557C7D10117C15541D7CE554427C0254044C +45E5:212421242224FC24A954A94AAA92AE10FA10A250225C2A503A50EAB0429E0300 +45E6:2020247C2284F948A830A8CEAE10AA7CFA10A27C22102AFE3A10EA1045FE0800 +45E7:1020101011FE7D10557C551455FE55147D7C111015921D54E538425402920430 +45E8:1040104010F87D08561055FC552455247DFC5124112415FC1C00E554412A022A +45E9:200C200A2008FBFEAA08AA48AA6AAA4AFBFAA24C224C2AEC3B5AEC4A44D60822 +45EA:00803FFE222022203FFC222023E020002A48312420802FF848884FF880841FFE +45EB:1020101011FE7D485548554855FE55487D4851EC115A15681D48E54842480048 +45EC:210013F0151000E0775C11F0104013FC284047FE01003FF821083FF801047FFE +45ED:2020202021FCF924A9FCA820ABFEAA22FBFEA020204028243AA2EA8A44780000 +45EE:2020202023FEF820AAAAA924AAAAA820FAAAA12422AA28503850E88841040602 +45EF:20282224217EF9C8A948A87EAB48A948F97EA1482148297E3940EA80447E0000 +45F0:200021FC2124FBFEA924A9FCA800A9FCF904A1FC210429FC3904E9FC40880104 +45F1:205022522154F850ABFEA888A850ABFEF820A1FC20202BFE3850E88841040602 +45F2:2020212420A8FBFEA8A8A924AA22A904F904A1DE22442D54389EE90442040404 +45F3:201023D22054F948A88AA904AAFAAC00F9FCA104210429FC3904E88847FE0000 +45F4:2110211021DEFAA8AC44A806ABB8A888F908A3BE20882A88393EEAC0443E0000 +45F5:100013FE10007DFC552455FC552457FE7C0051FC112415FC1D24E5FC400003FE +45F6:108813FE10887DFC550455FC550455FC7C8051FE122215521D02E5FA400A0004 +45F7:1040102011FC7C88545057FE540055FC7D0451FC110415FC1C20E694428A047A +45F8:0100FFFE104824FE799010FC22907CFC089030FEC1803FF821083FF801047FFE +45F9:2108209023FEF908A908AA52AB9CA908FA52A3DE204028A43AAAEA8A44780000 +45FA:00187BE0104022787A400A402BFC10002FFE400010207CF854A87CF81224FEFC +45FB:2108210821EEFA94A842A800ABDEAA52FBD2A25223D22A1A3A94EB5042100010 +45FC:201C21E02020FBFEA820A9FCA9ACA974F9FCA02021FC28203BFEE8004154022A +45FD:10A0209045FE792013FC25207DFC012055FE81003FF821083FF801087FFC0004 +45FE:200023FE2202FBFEAA02ABFEA908AA52FB9CA10822522BDE3800EAA442520452 +45FF:2040202023FEFA22A954A94AAA3AA800F9FCA15423FE280039FCE82040A00040 +4600:08003FF020103FF020003FF820083FF80100FFFE11207CF854A87CF81224FEFC +4601:08287F240820FFFE12203FA46424BF2824123FAA01463FF821083FF801047FFE +4602:2088208C23EAF888A888ABFEA948AB6AF94AA36A214C2B6C394AE96A47960022 +4603:21FC212421ACF924A9FCA820A9FCA820FBFEA154222A282039FCE82043FE0000 +4604:01081FD001207FFC02000FF03810CFF008100FF010207CF854A87CF81224FEFC +4605:20444258FF6201427E3E42007E4C42727E42423E10207CF854A87CF81224FEFC +4606:102013FE12227DFC542054F8542055FC7C2011FC15541DFCE44042A4028A047A +4607:01007FFC082007C01930EFEE09200FE001103FF810207CF854A87CF81224FEFC +4608:2FE829482BE8F95EA80AABEAAAAAABEAFAAAABEA288A2BEA3AAAEBEA4A2A1276 +4609:3FF801007FFC04401930EFEE09200FE001103FF810207CF854A87CF81224FEFC +460A:221023DE2528F884ABFCAA94AA94ABFCF828A3FE22202B243AA8EA92442A08C6 +460B:2148214C22AAF808ABFEA948AB68A94AFB6AA14A236C294C396AEB8A40160022 +460C:3FFC24202FF825203FFC220027F02A1033F03FFC10207CF854A87CF81224FEFC +460D:0820FFFE08201FF011101FF011107FFC41245FEC10207CF854A87CF81224FEFC +460E:244428E82E0EFCE4AA0AAEEEA8A0AAEAF800A3F820082BF83A00EBFC40040038 +460F:0800083E10227F245524552855245524552255225522553457A8FC2000200020 +4610:0800080010787F2855285528556C556A55AA552A5528552857C8FC4800980100 +4611:0830080810007F705510551A55DA555C55585558555455545794FC1200500020 +4612:0810081010207F4455FE5528554455A2553C5544554455A85790FC2800440082 +4613:08100810101E7F225524554055105566554255425566554257C2FC42007E0042 +4614:08200810107E7F425510551C552455545508553655C0553C57A4FC24003C0024 +4615:12001100211C4FC08000100023BE6288A2882288228822A824C8248828282010 +4616:10001200221C43C085001100213E6FC8A10821082548254825C8264820282010 +4617:11001540254E47C0800017C0221E6444A784210422442FE42104254429342308 +4618:21002FE0410E47C081001FE0221E6444A784210422442FE42104254429342308 +4619:110017C0224E4FE0800017C0245E67C4A10423C4250427E4210427C425542548 +461A:02000100FFFE05000C883450C530060E040001000100FFFE0100010001000100 +461B:200011F00110FD100910111011103510591095101510111211121212120E1400 +461C:202010200020FC2009FC11241124352459249524152411341128102010201020 +461D:205010480048FC40087C13C010403440584094201420102010141014100C1004 +461E:200013F80008FC0809081108110835FE58029402140213FA1002100210141008 +461F:200011FC0024FC24082411FC11203520592095FE14221022102A102410201020 +4620:204010400040FC4009FE10401040348458A494A4152811281210142810441182 +4621:2080208820B03EC020842684387C22000100FFFE05000C883450C530060E0400 +4622:204010200020F9FE090212041000340059FE9420142010201020102010A01040 +4623:209010900090F290129222D422986A90B2902A902290229223D22E12240E2000 +4624:204010500048F8400BFC104014E038E055509150124814441842104010401040 +4625:200011FC0124FD24092411FC11243524592495FC152410201020102010201020 +4626:200011FC0104FD04090411FC11003540594495481570114011421242123E1400 +4627:202010200020FDFC0924112411243524592497FE142010501050108811041202 +4628:204010200020FBFE0800108815043A0254889088105010501020105010881306 +4629:2080108001FCFD040A0411E41124352459E49524152411E41104100410281010 +462A:204010200020FBFE0840108815043BFE549290901090109011121112120E1400 +462B:080008007F7C114421441A440C7C32000100FFFE05000C883450C530060E0400 +462C:202810240024F8200BFE102011243524592497A8152811101212122A14461082 +462D:200011FE0020FC200848108411FE34225820942015FC10201020102013FE1000 +462E:010001007FFC11101110292845440100FFFE1200111010A010401430180E1000 +462F:2020112400A4FCA8082011FC1104350459FC9504150411FC1104110411141108 +4630:2004100E03B8F08810882128212E6BA8B0A82AA822A8213E21002280247E2800 +4631:0100FFFE0820111022880C603018DFF6101010101FF004880C503530C60E0400 +4632:200011FC0004F8FC080411FC100033FE560299F8148810881050102010D81306 +4633:202010200050FC880904120210F83420582095FC1420112410A410A813FE1000 +4634:220812280228F2281FA4224422546E92B7102AA02A203228224422FC22442200 +4635:200011FC0004F80409FC100414043BFE54209222117410A81124122210A01040 +4636:200011FC0008F010122222AA22726A22B2722AAA232622A22242220223FE2002 +4637:2020112400A4FCA8082011FC11243524597495AC152411241124110411141108 +4638:2080104007FEF1201120223C22446E64B2942B48224822302220225022882306 +4639:2040102003FEF8000888108815543A225400902013FE10201020102010201020 +463A:2040102003FEF2021404200023FE6820B0202920213C212022A02260243E2800 +463B:2040102003FEF880090413FE100235FC590495FC150411FC1104110411141108 +463C:2040102003FEF2021504210021DE6A52B2522B52249A2094211021122212240E +463D:20001040039CFA040A04139C120436045BFC949014901090109011121212140E +463E:2040102003FEFA020C0411F81108350859F89500150011FC1104110411FC1104 +463F:200013FE0202F20213FE221022926A92B2922AFE221022922292249224FE2802 +4640:200013DE0252F252125223DE22526A52B2522BDE2252225222522252255228A6 +4641:20481044005EFDE008281012106A35965848945E15E0102410281012106A1186 +4642:209010900108F1481244249221086BFCB044282020A42282228A228A24782000 +4643:2040104003FEF88009FC122015FE300055FC990415FC110411FC110411141108 +4644:2008103C01E0F820082013FE102034A0592C9524152411AC1124112411FC1104 +4645:200013FE0050F8500BFE125216523BFE5400904017FE10881190106010D81304 +4646:201013D40058FA52098C108815043AFA5420902011FE10201050108811041202 +4647:200013FE0020FC4009FC1154115435545954952C142013FE1050108811041202 +4648:210011780108F20812FE26402A406A7CB2902A1022FE22102228222822442282 +4649:2008101C01F0FD10091011FE1110357C5944957C1544117C11441244127C1444 +464A:20A810A803FEF8A808A8100013FE3622582095FC152411241134112810201020 +464B:2040102003FEFA020C0411FC100035FC590495FC150411FC1104100013FE1000 +464C:2020102001FCF92409FC102013FE340059FC9504152411241124105010881304 +464D:200013FA000CF84A0B88112A112635225BF8952A152C112A1128122A12261422 +464E:201E13E00122FC940840108811F0342058C495FE1422102013FE105010881306 +464F:2028102403FEF82009FC112411FC352459FC9524140813FE1088104810481018 +4650:200013FE0000F9FC0904110415FC380057FE928A125213FE12221222122A1204 +4651:2080104007FEF00013F822082FFE6A08B3F828A4212823102510294821862100 +4652:2040102003FEF840088811F01020344459FE940215FC112411FC112411FC1104 +4653:200013FE0252FA520BFE1020142039FC5420902017FE10401088110413FE1102 +4654:200013FE0200FA7C0A441244167C3A0056EE92AA12AA12AA12EE120013FE1000 +4655:212411240224F4A41154214A23926D08B1082928212E212821282158214E2180 +4656:202012220222F3FE100023DE22526A52B3DE2A52225223DE22522252255A28A4 +4657:2040102003FEF888085013FE16223AFA562292FA128A128A12FA1202120A1204 +4658:201410120010F7FE1410249024D26C92B7F22C94249425C82AAA289A31A62042 +4659:200013FE0202F3FE1210225422386A54B2822A50227C2290221025FE24102810 +465A:02001FF010101FF010101FFC10001FFC0004492C0200FFFE06801C48E530060E +465B:2040102003FEF88809241242109035F85808944414A81190128814A410C21080 +465C:2020147C0284F148103020CE26106A7CB2102A7C221022FE2210221025FE2800 +465D:0100FFFE08207E2008F8FF2814287F6A082AFF560B8204880C503530C60E0400 +465E:202017A400A8F2921114220825F46802B3F82A08220823F8220821102FFE2000 +465F:200017FC0444F5F4149427FC24046DF4B5142DF4244424F4254425FC244427FC +4660:200017FE0400F628154827EE24926C84B6A02EA827E824882494251429243242 +4661:202011FC0124F9FC082013FE100035FC590495FC150411FC110411FC10881104 +4662:210410880000FBFE0A2212AA1272322257FE980015FC110411FC110411FC1104 +4663:200011FC0040FBFE088811041652305057DE985015DC105013DE105010501050 +4664:2000127C0144F1741054205426FE6A82B2BA2AAA22BA2282228A2284250028FE +4665:200011FC0020FBFE0A2211AC142039AC545090C8132610F8100810D010201010 +4666:208813FE0088F9FC0954115415FC380057FE924210F810881148103010601380 +4667:201C11E00020FBFE082011FC11AC357459FC942015FC102013FE10001154122A +4668:21FC112401FCF92409FC102013FE34A859249642142013FE10601194168810C6 +4669:208813FE0088FBFE0A0211FC14003BFE544090A2135410B81354109213501020 +466A:22882108FABE2008729CA92A2288FFFE0A203118CFE6028804501C2065180606 +466B:209413980092FD8E0A8011FC112435FC592495FC148811FC108813FE10881104 +466C:23DE125203DEFA520BDE125217DE398C5652904017FE10881190106010D81304 +466D:204017FE0492F3FC109023FC20906FFEB1082BFC250A21F82240227C254028FE +466E:208813FE0088FBDE0A5213DE14A0389055FE912013FC152011FC112011FE1100 +466F:201417FE0490F4D4149427FA25AA6A96B1A22BF8220823F82040227C254028FE +4670:220C110A07C8F29E155426F4245E6FD4B1142FDE2554255425D4245E25502490 +4671:23FE120203FEFA920A54129216FE3AAA56FE932212FA12AA12FA122215FA1004 +4672:00007FFC044004403FF8244824483FF801000100FFFE0280044008203018C006 +4673:00007FFC044004403FF8244824483FF801001110111022A0044008203018C006 +4674:7FFC04403FF8244824483FF80200FFFE08201FF02828C8260FE00808080807F8 +4675:00007FFC04403FF8244824483FF801003FF80100FFFE000001003FF80100FFFE +4676:0010FE10281029FE2922FE20AA50AA50AAD2AACCAF48C24482448252FE608240 +4677:1FF010101FF010101FF010101FF004421842E03E0020FFFE0820042004A00040 +4678:00087E08420842FE7E08420842887E48424842087E0824282412240243FE8000 +4679:00007EFC2484248424FC24842484FFFC2484248424FC2450245024924492850E +467A:100011FC1104110455FC5904510491FC1104110411FC2850245044924112820E +467B:0800087C0B447C44487C484448447F7C09441944297C49288B28084A084A0886 +467C:00007EFC1284128422FC2A84448480FC3E84228422FC225022503E922292010E +467D:01000100FFFE0280244818303FF8D0161FF010101FF010101FF004421842E03E +467E:200010FC1084FE8482FC0484408440FC7C84408440FC40504C5070924092010E +467F:100010FC10847C8410FC10841084FEFC1084388434FC5250905010921092110E +4680:0800107C3E442244327C2A442A44FE7C224432442A7C2A282228424A4A4A8486 +4681:0800087C10447F44417C41445D44557C55445544557C5D284128414A454A4286 +4682:100010FC10847C8410FC1084FE8428FC28846C84AAFC2850285048924892990E +4683:0800087C0F440844087C7E444244427C7A444A444A7C7A284228424A7E4A4286 +4684:00007E7C02443E44027CFFC40844097C49442A441C7C2A28C928094A284A1086 +4685:0800087C0844FF44087C2A442A442A7C5D4488441C7C2A284928884A084A0886 +4686:2200227C7F4422442A7C08443E442A7C2A442A44FF7C08281428124A224A4086 +4687:1000107C52445144957C08443044C07C7E4442447E7C42287E28424A7E4A4286 +4688:0000FF7C144414447F7C554455447F7C084408447F7C082808280F4AF04A4086 +4689:20002F7CF5442544757C2544F544297C23440844087CFFA81428224A414A8086 +468A:2200147C00447F44007C14442244417C00447F44557C5528552857CAFC4A0086 +468B:00003E7C224422443E7C00447F44417C7F4441447F7C41287F28144A224A4286 +468C:0800107C7F4441447F7C41447F44107CFFC42244497C88A87F68084A084A0886 +468D:0800FF7C08447E44087CFF4400447E7C42447E44427C7E2842287E4A244A4286 +468E:0800087C7F4410443E7C1044FFC4227C414490C4267C22283628224A3E4A2286 +468F:08004A7C2C440844FF7C2A444944887C42447744927C5A282F28224A424A8286 +4690:4000777CA5442544FD7C27445544807C7E444244427C7E284228424A7E4A4286 +4691:0000FEFCAA84AA84FEFC00847C8444FC7C8444847CFC44507C5000922892450E +4692:1000087C7F442244FF7C00447F44497C7F4449447F7C08287F28084A0F4AF086 +4693:0000FEFC2884FE84AAFCFE8400847CFC44847C8444FC7C501050FE921092110E +4694:200010FCFE8482847CFC548498847CFCC4847C8444FC7C5044507C922892450E +4695:7700007C77445544777C554408447F7C54447F44557C7F2855285E4A554A9B86 +4696:0000FEFC1084FE8492FC54840084EEFCAA84EE8400FCFE505450BA921092FF0E +4697:200820487848484890447C8454A455227C20544054407C48548455FE44828C00 +4698:12001380249C490087C01540257E67C8A548254827C8254825482548246828D0 +4699:100010FE3C002400487CBE442A442A7C3E442A442A7C3E442A004A0042FE8600 +469A:101010503C50247C4890BE102A102AFE3E282A282A283E282A4A4A4A42868700 +469B:101010503C50247C4850BE902A102AFE3E002A002A7C3E442A444A44427C8644 +469C:102010403CFE24924892BEFE2A922AA23EFE2A482A883FFE2A084A0842088608 +469D:2040202079FE480090887C88555456227C00542055FE7C205420542044208C20 +469E:2020202078204BFE90207D24552455247EAA547054A87CA85524562244208C20 +469F:100010FC3C8424FC4884BEFC2A002AFE3E082BFE2A083E882A484A0842288610 +46A0:200021FC7904490491FC7D04550455FC7C00551255D47D185510555245928D0E +46A1:200021FC7924492491FC7D24552455FC7C20541054547D425542554A46388C00 +46A2:2048214879484BFE91487D48557855007DFE542057FE7C7054A8552446228C20 +46A3:100010FC3C84248448FCBE842A842AFC3E002BFE2A203EA02ABC4AA04360863E +46A4:1000107C3C542454487CBE542A542A7C3E102AFE2A923E962ABE4A82428A8684 +46A5:100010EE3C22242248EEBE882A882AEE3E222AAA2A663E662AAA4A2242AA8644 +46A6:2008203C79D0491C91107D7C555455587D705554554C7D40567854A8442A8C46 +46A7:200021DC7844495490CC7D54542854447D92542054C87C3254C4541844608D80 +46A8:201221D478484A8A91047E0255DC54547C6255C0551E7DC25454544845548CA2 +46A9:201821E078404BFE90887D74565254707C0055FC55047D745554557445048D0C +46AA:200021FC7954495491FC7C0057FE54007DFC550455FC7C625494558846A48CC2 +46AB:10207E204A7E7EC41028FF1020283EC652001FE020405FF091101FF011102130 +46AC:2020212478A84BFE90A87D24562255087DC8565E55487CA854BE550845088E08 +46AD:208823FE7888480091DC7D5455DC54887DFE569054FC7C9054FC549044FE8C80 +46AE:2000100011FCFE4400487C4800507C5E00427C424482448244827D0245140208 +46AF:100408040804FFA400247F2400247F2400247F244124412441247F0441140008 +46B0:208010801080FE8400887C9000A07CC000807C804480448444847C84447C0000 +46B1:202010201020FE2000207CA800A47CA401227D224622442044207C2044A00040 +46B2:200810081010FE2000407C8800087C1000207C444484440844107C2044C00300 +46B3:202010200020FDFE00207820002079FC00847888484848504820785049880606 +46B4:200010FC1084FE8400847CFC00847C8400847CFC4484448444847C8445140208 +46B5:200810881048FE4800087C8800487C4800087C0E45F8440844087C0844080008 +46B6:2000100011FCFE2000207C2000207DFE00207C204450445044887C8845040202 +46B7:209010900108FD0802047C0203FC7880010079F8480848084808780848500020 +46B8:202010201050FE5000887D0402027C8800887C884488448844887D0845080208 +46B9:201011100110FD120112791401D87910011079104910491249527992490E0000 +46BA:204010401040FE8000FE7D0802887C8800887C504450442044507C8845040202 +46BB:020007F0182062400980060019007FFC00003FF800003FF800003FF820083FF8 +46BC:200011F81048FE4800487C4800487DF800887C884488448844887C8847FE0000 +46BD:2008103C11E0FE2000207C3C01E07C2000207C3E47E0442044227C224422001E +46BE:2008103C11E0FE2000207C2000207DFE00207C204420442044207C2045FC0000 +46BF:204010401040FE7C00847C8801207C2000207C504450445044887C8845040202 +46C0:2008101C01E0FD00010079FC01447944014479284928491049107A284A440482 +46C1:200010FC1084FE8400847DFE00847C8400847DFE4484448444847C8444940088 +46C2:200810680388FC880088788800887BFE0088788848884888490879084A080408 +46C3:2000100011FCFC0000007C0003FE7C9000907C904490449044927D124512020E +46C4:42002200023CFBA402A472A404A474A40AB471285120512252227222541E0800 +46C5:200011FC1124FD2401247DFC01247D2401247DFC4524442044207C2044200020 +46C6:202010201020FE2001FC7D2401247D2401247DFC4524452445247D2445FC0104 +46C7:200010F81088FE8800887C8801067E0000007DFC4504450445047D0445FC0104 +46C8:204010401080FCFC01207E2000207C2001FE7C204450445044887C8845040202 +46C9:200011FC1104FF0401047DFC01207D2001FE7D204520451045127D4A45860102 +46CA:2000100010FCFE8400847C8400847C8400FC7C844400444844447C8444820102 +46CB:202810240024FC2001FE792001247924012479284928491849127A1A4A260442 +46CC:2040104010FCFE8401047EF400947C9400F47C844494448844827C82447E0000 +46CD:209010900090FBFC0094789403FC7A9002907BFE48924892491A79144A100410 +46CE:204010200020FBFE02027C04000078900090789048884908490879044A040402 +46CF:200010FC1084FE8400847CFC00807CA000A27CA444B844A044A27D22451E0200 +46D0:00003FF800087FC800083F8820883FA80110FFFE00003FF800003FF820083FF8 +46D1:200010400020FC280008788800907A9402A27AA24CC2488849887A8844780000 +46D2:00007DFE108010FC1E04F02801107FFC00003FF800003FF800003FF820083FF8 +46D3:0480248024FC24A02510040001007FFC00003FF800003FF800003FF820083FF8 +46D4:200013FE1020FE2000407DFC01547D5401547D544554455445547D4445140108 +46D5:2020102003FEFE2202227BFE02227A2203FE7820492048A0484078A049180606 +46D6:2020102001FCFD24012479FC0124792401FC782048244818483278CA4B060002 +46D7:00407E2049FE480048007EFC4200420042FC7E00480048FC488448847EFC0084 +46D8:20801088009CFD7001107B100510791001FE79104910491049107910497C0100 +46D9:209010900090FD1001FE7B100510793801387954495449924910791049100110 +46DA:08007EF808483E4808887EA809107FFC00003FF800003FF800003FF820083FF8 +46DB:2000100011FCFF0401047D7401547D5401547D544574450445047DFC45040000 +46DC:202010200040FDFC010479040194795401247924495449944904790449FC0104 +46DD:200011FC0024FC2401FC784400447BFE00007820482049244924792449FC0004 +46DE:200011FC1104FDFC01047DFC00007C0001FC7C20442047FE44207C2044200020 +46DF:202010200020FBFE002078200124792401247AAA482048504850788849040202 +46E0:200011FE1000FE0000FC7C8400847C8400FC7C004484444444487C0045FE0000 +46E1:201C13E00220FE2003FE7A2002907B0A020679FA490849084908790849F80108 +46E2:201C11E00020FC2003FE78A801247A22000078F8488848884888788A490A0206 +46E3:2020102001FCFD2401FC792401FC780003FE7880490049FC4804780448280010 +46E4:200010FC1084FE8400847C8400FC7C1000107C90449E449044907CD0453E0200 +46E5:218410680030FCC80304784003FE78A001207BFC4D2449244934792848200020 +46E6:200010501048FE8401247C2000507C8801067EF84488448844887C8844F80088 +46E7:201011101110FD9201547D1001FE7D1001387D544592451045107D1045FE0000 +46E8:2040102011FCFE0000887C5003FE7C2000207C2045FC442044207C2044200020 +46E9:200011FE1048FE4800487DCE01027D0201027DCE4448444844487C4845FE0000 +46EA:2040102003FEFA0200887904020279FC000479FC490049FC4804780448280010 +46EB:200010FC0080FCF8008078F800807BFE01407924492849104908794449820100 +46EC:2080108001FCFD04028478F40144784403FC78444954495449F4780448280010 +46ED:2020102001FCFC2000207BFE0088785001FC782048204BFE4820782048200020 +46EE:2088108810E8FD2C012A7EA800487CA0011E7E0044FC448444847C8444FC0084 +46EF:200011FE0102FD0201FE7910011079FE01107910497E494249427A424A7E0442 +46F0:200011FC1104FF0401FC7D0401047DFC00007D1245D4451845107D524592010E +46F1:2020102001FCFD240124792401FC78200040782048A44A824A8A7A8A44780000 +46F2:2020104001FCFD0401FC790401FC782000207BFE4A224A224A2A7A2448200020 +46F3:2020102003FEFC5000887924022279FC012479FC492449FC48227822481E0000 +46F4:2020102001FCFC500088790403FE780801E87928492849E84928780848280010 +46F5:201C13E00044F92400A8789003FE7A02000079FC488448884850782048D80306 +46F6:2020102003FEFC2001FC782003FE7820000078204BFE487048A879244A220020 +46F7:2040102003FEFA020504790001DE7A5202527B524C9A4894491079124A12040E +46F8:2020101001FEFD0001107910011E79100110797E4942494249427A424A7E0442 +46F9:208010FC0104FDF800087BFE004078A20334785848944B34485278904B500020 +46FA:21FC11240124FDFC0124792401FC7850008879044A8A48884888788849080208 +46FB:2008101C01F0FD10011079FE0110797C0144797C4944497C49447A44427C0444 +46FC:2040119C0104FD0401DC7904010479FC0000780049FC4820482078204BFE0000 +46FD:2008103C01E0FC2000207BFE002078A0012C7924492449AC4924792449FC0104 +46FE:2020102003FEFC2001FC782003FE7840008879F048244BFE482279244AA20040 +46FF:200013FE0000FDFC0104790401FC780003FE7A8A4A524BFE4A227A224A2A0204 +4700:400023DE014AF94A035A756A014A72D6002070205120513C5120712057FE0000 +4701:202011FC0220FBFE02007A2003FC7A2003FE7A004BE048204BFE785048880306 +4702:2020104001FCFD0401FC790401FC784003FE788849244A224DFC782048200020 +4703:20501048FEFE00907DFE00907CFE00907C9044FE7C8001003FF80100FFFE0000 +4704:200011FE0102FDFE011079540138795401827950497C499049107AFE4A100410 +4705:2020122203FEFC90008879FE03107D1001FE7910491049FE4910791049FE0100 +4706:00803FFE24103F7C26382D5434923FFC20002FF820002FF820004FF848088FF8 +4707:2040102003FEFC8801247A42009079F80008784448A849904A887CA448C20080 +4708:212412480124FC0001FC792401FC792401FC78204BFE487048A8792446220020 +4709:2020102003FEFC7000AC7B220050788801247A22492448A849247A2248A00040 +470A:2090109007FEF89003FC7A9403FC7A9403FC780049F8490849F8790849F80108 +470B:202011FC0124FDFC00207BFE000079FC010479FC490449FC490479FC48880104 +470C:1204110420082B8A4812F3BC100423884812FBBE0A820280AAAAABAA82A20000 +470D:2020102001FCFC200154788801047AFA008878F8488848F8482078A849240060 +470E:208812AA02DCFC8801547A2200007BFE02427C444BFC48444844788449140208 +470F:4020272005FEFD40057C7690057E7500057C7544557C5644547C74445444044C +4710:00407BFC488051F84A204DFC688852F84188FFFE00003FF800003FF820083FF8 +4711:200013FE0050FDDC0104790401DC785000507BFE4840482048A47A8A4A8A0478 +4712:2040108003FEFE2202AA7A2203FE7A7202AA7A0248204BFE4850788849040602 +4713:208813FE0088FC0001487BFE01487978010079FC48204BFE487078A84B260020 +4714:202010FE0240FD7C0090797E00007B7C0144797C4944497C4944794C4A80047E +4715:2088108803FEFC8801FC792401FC792401FC78204BFE4A224A2A7AFA4A0A0206 +4716:200013FE0050FBFE02527BFE000079FC010479FC490449FC490479FC48880104 +4717:4014201207FEF41005D0741405D4755805CA74165442582452A2728A54780000 +4718:4288228807E8FA90041E77E40454785407547554555457485548705452940122 +4719:200013FE0202FBFE02027BFE01087A52039C79084A524BDE48007AA44A520452 +471A:440022FE02AAF8AA00FE70100E54729202107254529252105210750058FE0000 +471B:208011F80210FDFC012479FC00927B0E008079F84A1049FC492479FC4892030E +471C:2040107C0040FBFE020279FC00A87954028879FC4A8A48F8488878F8488800F8 +471D:2044128402EAFE4E02A47AEE02227BFE02447A844AEA4A4E4AA47AEE4A2203FE +471E:4040202003FEF888005277AC02AA72A805AC7000510451FC510471FC51040204 +471F:2088108C03EAF88800887BFE01487B6A014A7B6A494C4B6C494A796A4B960022 +4720:2042139C0210FBDE02947A9404207BFC02047BFC4A044BFC4A047BFC49080204 +4721:43FC204001F8F90801F8710807FE744202A4728A547A508051F872885070038E +4722:202013FE0222FDFC002078F8002079FC002079FC495449FC48407AA44A8A047A +4723:0008201C11E0110001000100F1FE111011101110111015101910121002100410 +4724:011041102110211007FC0110E110211021102FFE200029103108220804040804 +4725:0000407C2F442144027C0244E4442744217C250025002AFE3200250008FE0000 +4726:0110211017FE1110020003FCF40413E4122413E4122417E41A24100400280010 +4727:000023DE114A114A035A056AF14A12D6102010201120153C1920112007FE0000 +4728:0020202011FC112401FC0020F3FE122213FE1020104014241AA2128A04780000 +4729:0110411027FC211001F00208E2EA26AC22A822AA26EA2A06300022A402520452 +472A:0040244022404A4089F8144822484148BC4824482448244A248A3C8A25060200 +472B:0000240022F84A208820142022204120BC2024202420242024203DFC24000000 +472C:0020242022204A2089FC152423244124BD2425FC2524252425243D2425FC0104 +472D:010001F801007FFE40029FF40820111022880C603018DFF6101010101FF01010 +472E:0020241022FE4A8289141450227E4150BC90241025FE241024103C1024100010 +472F:00402440227E4A82892214AA22724122BCFE2422247224AA25223C22240A0004 +4730:0020484045FC950411FC290445FC80407BFE488849244A224DFC782048200020 +4731:000049F8450895F8110829F8440083FC7A944BFC480049F84890786049980606 +4732:01244A484524940013FC2A94466482947BFC4A484B684A484B6A7A4A4A460362 +4733:00007FFC000000001FF0101010101FF008200440FFFE1000100010001FF80000 +4734:0020FE200020003E7C204420442045FC7C840088444828502E20F05041880606 +4735:0010FE10001001FE7D124514451045FC7D440144452829282F10F22842440482 +4736:0020FE20003C00447CA84410442844D67C1000FC441028902EFEF01040100010 +4737:0000FEFC0004007C7C0444FC440045FE7D0200FC444428442E28F01040680186 +4738:0000FEFE008200827CFE4480448C44B07C9C00B0449E28F02E92F112410E0200 +4739:0020FE2001FE00207C2045FC452445247DFC0020447028A82F24F22240200020 +473A:0048FE48004801FE7C48444845FE44007CFC0084448428FC2E84F08440FC0084 +473B:0000FEFC008400847CFC4484448444FC7C0001FE442028A02EBCF0A04160023E +473C:00207E20247E18A4FF2829104A2898C600007FFC00001FF010101FF004407FFC +473D:0020FE50008801047EFA440045E2452A7D2A01EA452A292A2FEAF122412A0164 +473E:0020FE1001FE00007C84444845FE44007CFC0084448428FC2E84F08440FC0084 +473F:00003F2024203F3E21403F5024883F0800007FFC00001FF010101FF004407FFC +4740:0020FEDE008A00CA7CAA44D244A644007CFE0092449228FE2E92F09240FE0082 +4741:08202AA42CA84920145022887FFE40029FF400001FF010101FF008200440FFFE +4742:7E7848487E8E420042F87E4848307ECE00007FFC00001FF010101FF004407FFC +4743:0000FEFE008200FE7C8244FE444444AA7CEE004444AA28EE2E00F0D440AA012A +4744:0108FA9403DE06B47BDE529453DE529473DE021097FC510860903860C1980606 +4745:0020FE200820102030204A209DFC28204C209A202A204820882008202BFE1000 +4746:08001FF822484488095012207FFC02000D1072A00CC071A006981886E2800100 +4747:000025FC2220424080A425382450249825382454249425502422440243FE8000 +4748:001CFDE01100210061FE95003900517C994435445554914811421242523E2400 +4749:044024481450FFFE800200007FFC02000D1072A00CC071A006981886E2800100 +474A:0020FC2013FE202061FC94243BFE502499FC34205520913E112012A0527E2400 +474B:0040FC2013FE2202600095FC380050009BFE3420552891241222142250A02040 +474C:0000FBDE2042414AA084154A3A525420980037DE505291521094114852542422 +474D:0000FBFE22224020A1FE142039FC512499FC352451FC902013FE102050202020 +474E:0020FD241124212461FC94003BFE5020984035FC55549154115411545154210C +474F:0020FDFC112423FE612495FC382051FC992435FC544093FE108811D05070238C +4750:0010FB9022FE42A0A2BE17483ABE52809ABE36A252BE9322123E122252222226 +4751:0020FDFC1088205063FE940039FC512499FC352455FC902011FC102053FE2000 +4752:03F0FD2E11E2212A61E495343BEA5032981E35E054A29134106810A453222020 +4753:0124FA4821244000A3FC16943A6452949BFC364853689248136A124A52462362 +4754:0088FBFE208843DEA25217DE38A0509099FE352053FC952011FC112051FE2100 +4755:03FCF90811F8210865F8990E37F8500897FE3A94579C9294139C12D657BC2084 +4756:1008201CD5F0095051502150D15019502950C94819482948C9440A4452422400 +4757:0C203020C22014204BFE3020C870147024A8CCA815242622C420042028201020 +4758:0C0030F8C288148848883106CA0015FC2484CC8414482450C420045028881306 +4759:0C0031FEC300150449443128C92815102510CD2815282544C584050029FE1000 +475A:100021FCD5040904510421FCD10019402944C94819702940C9420A42523E2400 +475B:10102010D41009FE51122114D11019FC2944C94419282928C9100A2852442482 +475C:10402040D488090453FE2002D08819442A42C8F819882A50C820085051882606 +475D:0C203020C3FC145048883104CBFE140825E8CD28152825E8C528040828281010 +475E:10202020D43E082051FE2122D13819E02922C91E19002978CA480A4A548A2906 +475F:1080209ED7EA088A51CA208AD3EA189228A6C8201BFE2820C850088851042602 +4760:100021FED5100920517C2144D17C1944297CC91019102954C9520A9252502420 +4761:10882088D7FE0888508820F8D0201BFE2A22CB321AAA2B76CA220A22522A2224 +4762:100021F8D50809F8510821F8D0001BFC2A94CBFC180029F8C890086051982606 +4763:1200217ED4400C7C524420FCD1401E7E2A20C8201BFE2870C8A8092452222020 +4764:0C203020C3FC142049543088C90416FA2488CCF8148824F8C42004A829241060 +4765:104021FCD50409FC510421FCD10419FC2820C92418A82924C8200BFE50202020 +4766:10402080D7FE0A52525227FED000181E2BE0C8A219222A74C8A8092456222020 +4767:00407C40448044FC7D04460444847C44444444147C2400442984240444288010 +4768:040025FC2488245024202450008C1FF010101FF010101FF010101FF008201010 +4769:00207C20445044887D04461244207C40458844107C2000442988241044608380 +476A:00007C0045FE44127C14441044907C90449E44907C90009028D02530451E8200 +476B:00807C80448044FE7D40454046407C7C444044407C40007C2840244044408040 +476C:00407C20440045FC7C20442044207C2045FC44207C2000202820242047FE8000 +476D:00807C80450045FC7E04440445E47D24452445247DE401242804240444288010 +476E:00207C10441045FE7C20442044447C8445F844107C200044288225FE44828000 +476F:00807C8044FE45007E204520452C7D7447A445247D3401282922250244FE8000 +4770:00207C20442045FC7C20442047FE7C08440845FE7C0800882848240844288010 +4771:02001FF0081010307EFC2244468C1FF010101FF010101FF010101FF008201010 +4772:00007CFC448444847CFC449044907C88448445327D0802002860241844048000 +4773:08000F7C28447F28A11016283846DFF010101FF010101FF010101FF008201010 +4774:01007FFC01001FF011101FF001007FFE50129FF410101FF010101FF008201010 +4775:00287C2445FE44207C2045FC45247D2445FC45247D2401FC292425244524810C +4776:00407C2047FE44007C0045FC45047D0445FC44207D2801242A22242244A08040 +4777:20003E7C48440844FF44247C42001FF010101FF010101FF010101FF008201010 +4778:00887C8847FE44887CA8442047FE7C20442045FC7C8400882850242044D88306 +4779:004078204BFE4A027D04490049DE7A524A524B527C9A0094511049128A12040E +477A:102008107EFC04482448183064CC1FF010101FF010101FF010101FF008201010 +477B:00007DFC450445047DFC451045107DFE451045107D7C014429442544457C8244 +477C:00207C2047FE44207DFC442047FE7C0045FC45047DFC010429FC250445148108 +477D:000079FE49104910797C4910491079FE490049107910017C51104A108AFE0400 +477E:3F500048FFFE08402F2028122F0AF0063FFA20083FF820083FF820083FF80820 +477F:0500397821083D7822083FF808203FF8D0161FF010101FF010101FF008201010 +4780:00807CBC448445087DFE472045207D7C459045107DFE01102928252845448182 +4781:00007BFE4A004AFC7A844AFC4A847AFC4A204BFE7A4802C852304A488A8403FE +4782:00007DFC442044407DFC455445547D544544452C7C2003FE2850248845048202 +4783:0008700857C85210721E54A457D47114511457D47114010851C84E1484140022 +4784:2040FEFE21203CAC24F447AC54A2887E00001FF010101FF010101FF008201010 +4785:000079FE4900497E790049FE49547948496449427900017E51424A428A7E0442 +4786:00207D2444A844207DFC450445047DFC450445FC7D04010429FC240044888104 +4787:08203E2008F87F282A685D2A08563E8200001FF010101FF010101FF008201010 +4788:001E7BE0494448A879F84908490879FC4904490479FE010252AA4AAA8D0A0004 +4789:00207D2444A845FC7C4047FE44887DFC468A44F87C8800F8288824F844508088 +478A:007C78404BFE4A427A784BC44A3C7AA84B544AF87B8C02FA52884AF88A8804F8 +478B:0200713C57A4502474BC532457A4713C512457A4713C059055584968812A0346 +478C:00087C3C45E05420542057FE54205420542055FC550411042904250445FC8104 +478D:00207C2047FE442055FC542057FE540055FC550455FC110429FC250441148108 +478E:00F87C88448854F85488548854F8540055FC5504550411FC2904250445FC8104 +478F:00007DFC4524452455FC5524552455FC54205410545411422942254A42388000 +4790:00207C2047FE542055FC544057FE5488550456FA5488108828F82488448880F8 +4791:08000800087C7E1008100810FF10141014105610551095102410241054FE8800 +4792:080008FE08827E8208BA0882FF8214BA14AA56AA55AA94BA24822482548A8884 +4793:080008FE08007E5208A40928FF94144A140056FE551095102410241055FE8800 +4794:080008FE08827E8208FE0880FF8C14B0149C56B0559E94F024922512550E8A00 +4795:0800087C08107EFE08920854FF101454140056FE551094FE24AA24AA54AA8886 +4796:0850084808487E40085C09E0FE400840282028242E14280C280458004FFE8000 +4797:0808080808087E0808FE0818FE180828282828482E482888281858004FFE8000 +4798:08400840087C7E8009000800FEF80810282028402E842884287C58004FFE8000 +4799:100013FE10207C20102011FCFD241124112451245D2451345128702050208FFE +479A:0810081008FE7E10081008FCFF040804286828102E282844288258004FFE8000 +479B:080009FE08207EA008BC08A4FEA408FC280428042E042828281058004FFE8000 +479C:0800080009FE7E1008200820FE68086428A229222E202820282058004FFE8000 +479D:0800080008FC7E2008200820FE2008FC282828242E24282029FE58004FFE8000 +479E:1050105010507DFC10541054FDFC1150115051FE5C525052505A709451108FFE +479F:0820082008407EFC08840884FE8408FC288428842E8428FC288458004FFE8000 +47A0:080009FE08207E200840087CFEC40944284428442E44287C284458004FFE8000 +47A1:0800080008FC7E84088408FCFE84088428FC28842E0029FE280058004FFE8000 +47A2:0840084008407EFE08A00920FE3C08202820283E2E202820282058004FFE8000 +47A3:0808081C08E07E80088008FEFE90089028B028982E94291029105A004FFE8000 +47A4:1080108011007DFC12041004FDE41124112451245DE451245004702850108FFE +47A5:0810081009FE7E20084008FCFF44087C2844287C2E442854284858004FFE8000 +47A6:08200820083C7E4408A80810FF2808442882287C2E442844287C58004FFE8000 +47A7:0808081C08E07E8008FE0880FE8008BC28A428A42EA4293C29245A004FFE8000 +47A8:0820082008FC7E20082009FEFE00082028FC28202E20282029FE58004FFE8000 +47A9:0810081008287E440882087CFF000800287C28442E44287C284458004FFE8000 +47AA:080008FE08807E8408B808A0FFBE08A428A428A42EC4288028FE58004FFE8000 +47AB:100011FC10447C4413FE1044FC4411FC108050FC5D84528450FC708450008FFE +47AC:080C087008107EFE08380854FE920800287C28242E2E2842288A59044FFE8000 +47AD:1020104810847DFE10021048FC841142107C50845D6850105068718450008FFE +47AE:0810081008287E4408BA0810FEFE0810285828942F122850282058004FFE8000 +47AF:080E08F008227E9208540800FF7C0808281028FE2E102810285058204FFE8000 +47B0:1020102011FC7C20102013FEFC501050115451525E5250905090713050008FFE +47B1:0828084408927E1008280844FE82097C284428442E44287C284458004FFE8000 +47B2:101010D813947C94109013FEFC94109410D853925CAA50CA5286710250008FFE +47B3:0820081008FC7E0008840848FEFE080028FC28842E8428FC288458004FFE8000 +47B4:11FC112411247D74112411FCFD041174115451545D7451045204721454088FFE +47B5:100011EE10227CAA104410AAFD32120011EE50225CAA504450AA711252208FFE +47B6:11F8110811087DF811081108FDF8108011FC52545C9451245244709451088FFE +47B7:100011FC11047DFC11001110FD541154117C51105D5451545254747C50008FFE +47B8:100010F810007C0011FC1020FD241222106050005DFC5104510471FC50008FFE +47B9:0820084008FC7E8408FC0884FEFC080029FE28202EFC282029FE58004FFE8000 +47BA:081E09F009107F1009FE0910FF7E0942297E29422F7E2942297E5A004FFE8000 +47BB:11F8105010207DFC112411FCFD2411FC112450405DFC50445084712852108FFE +47BC:0820083C08447E78080808FEFF20085228AC28582EAC284A28AA58104FFE8000 +47BD:08100810087C7E1008FE08A2FE440878281428FE2E10285428B258004FFE8000 +47BE:101E13E0123C7A2012FE12A2FAB812E4129C52805AB85328554A728650008FFE +47BF:01007FFE44429FF404403FF80440FFFE092017D02108DFF6010011F8290047FE +47C0:0844082808FE7E10087C0810FEFE08202820287E2E882908287E58004FFE8000 +47C1:1124124811247C0011FC1124FDFC112411FC50205DFE507050A8712452208FFE +47C2:10FC108410FC7C8410FC1000FDFE114A11FE50005CFC5048503070CC53028FFE +47C3:1040108811FC7D08125213FEFC50118C162251C85C3251CC503071C050008FFE +47C4:102013FE10207DFC102013FEFC0011FC110451FC5D0451FC510471FC50888FFE +47C5:08047F7808403E402A7E3E482A48FF4809883FF00100FFFC110011F8290047FE +47C6:11FC112411FC7D2411FC10A8FCA813FE10A850A85DFC502053FE702050208FFE +47C7:0894091809DE7E94095A09DEFE9409FE289028D42EAA29162A2258004FFE8000 +47C8:109411D210907DFE101011D4FD5411D4101453E85C8A51CA509673E250008FFE +47C9:11FC115411547DFC108011FCFE4411F4115451545DF4504451F4701450088FFE +47CA:1020103E10207DFE112211F8FD2211FE112051525DAC525A52AA744850908FFE +47CB:1040107C10847D0813FE1144FD92117C1100517C5D00517C5244727C54008FFE +47CC:1048104C11FA7C4813FE10A8FDFA134A15EC514C5DEA514A51F6712250008FFE +47CD:104011FC11247D94114C1124FDFC102013FE528A5D2453FE508070FC51048FFE +47CE:108811DC10887DDE10881154FE2211FC110451FC5D0451FC510471FC50888FFE +47CF:1124117412587BFE115412DAFBFE1082102053FE587050A85124722250208FFE +47D0:13FE120012227ECC124413EEFE4412EE135452105E90529E549073FE50008FFE +47D1:1020105010887D74120211FCFD5411FC100051FC5D5451FC5154710C50008FFE +47D2:108813FE10887BDE125213DEF8A011FE112053FC5D2051FC512071FE51008FFE +47D3:00007C0045FE442044207C201020102010205C205020502050205C20E0A00040 +47D4:00407E404240424042407E60085008484E444844484048404E40F04000400040 +47D5:00007DF8448844C844A87CA8108810505C505050502050205C50E08801040202 +47D6:00207C204420442045247D24112411245D245124512451245D24E1FC00040000 +47D7:00047C1E45F0451045107D10111011FE11105D1051105108510A5D4AE1860102 +47D8:00807C40444047FC44007C0011F011105D105110511051125D12E212020E0400 +47D9:00007900497E49124912791211D2171251125D12515251925922E022004A0084 +47DA:00007CFC4400440044007DFE104810485C485048504850485C88E08801080208 +47DB:00207C20442047FE44207C2011FC11245D245124512451345D28E02000200020 +47DC:00207C20442045FE45227D221122112211525D4A518A510251025D02E10A0104 +47DD:00007CF84488448844887D06120011FC10845C845048505050205C50E0880306 +47DE:00207C20442044A844A47CA21122112012245C245028500850105C20E0C00300 +47DF:0200077C384420442044207C3F90241024502C5C24502650255044B0449E8500 +47E0:00287C244424442045FE7D201124112411245D285128516851945D14E02C0044 +47E1:00047C1E45F0451045107D10111011FE11105D1051105108510A5D4AE1A60112 +47E2:00807C80448044FE45027D04122010205CA850A4512451225E22E02000A00040 +47E3:00207C284424442045FC7C20107010705CA850A8512451245E22E02000200020 +47E4:00407C204428440844087C48105411525D525160526050445CC4E144023C0000 +47E5:00007DF84408445044207C1013FE10625CA450A0512052205C20E02000A00040 +47E6:00087C3C45E0442044207DFE104010405C7C50A450A851285D10E22804440082 +47E7:00007C0045FC452445247D241124112411FC5D245124512451245D24E1FC0104 +47E8:00007DFC4504450445047DFC1120112011FE5D205120511051125D4AE1860102 +47E9:00207C20442045FC44207C20102013FE5C205040504050885D04E3FE01020000 +47EA:00047C1E45E0440044207C1011FE100410085C105020504050805D40E23E0000 +47EB:0100111009207FFE40029FF4101010101FF00100110011F81100290047FE8000 +47EC:00087C1C45E0450045007D00110011FE5D105110511051105D10E11007FE0000 +47ED:00807C80448044FE45407D401240107C5C4050405040507C5C40E04000400040 +47EE:00907C944492451245107F7E1510111011105D285128512851285D44E1440182 +47EF:00087C3C45E0442044207DFE102010205C2051FC510451045D04E10401FC0104 +47F0:00407C40449C450046407C4010BE118812885C885088508850885C88E0A80090 +47F1:00207C2047FE442044207DFC112411245D24512C507050A85D24E62200200020 +47F2:00407C20442047FE44407C88110413FE10925C905090509051125D12E20E0400 +47F3:00003EEE2222222222AA3E660822086628AA2E22282228AA284458004FFE8000 +47F4:00007DFE45004500457C7D00110011FE5D505152515451485D48E24402520460 +47F5:00287C244424442045FE7C20112010B25CB4506850A851245E22E02000A00040 +47F6:00207C2044A844A844A87D741222102010205DFC5020502050205C20E3FE0000 +47F7:0104790E493049204FE07920113E11641DA457245124512451245D24E1440384 +47F8:00207C20447C44C445287C90106011805C48504851FE50485C48E08800880108 +47F9:00047C1E45E0442245127C941080100811FE5C085088504850485C08E0280010 +47FA:00007EFC4284428442FC7E84088408FC4E84488448FC48004E48F04400820102 +47FB:00207C204450448845047E0210F810205C2053FE502051245D22E22200A00040 +47FC:00087C0C44EA440A44087DFE1048104811485D6851485148514A5D6AE3860102 +47FD:00407C2045FC444044907D0813FC10045D505150515051505E50E2520452080E +47FE:00007BDE4842494A4884794A125214201C0053DE5052515250945D48E2540422 +47FF:00007DF84408440845F87C08100813FE5C205222517450A85D24E22200A00040 +4800:00207D2444A444A844207DFC1104110411745D545154515451745D04E1140108 +4801:0040789049084BFC49087A1014A417BE50825C0053FC50005800E00007FE0000 +4802:082008207EFC08301C682AA4C92208201FF010101FF0010011F81100290047FE +4803:00007BFE482048204BFE7A221222133252AA5EAA537652665A22E222022A0204 +4804:00507C50445045FC45547D54115411FC5D545154515453FE5C00E05000880104 +4805:00007DFE4502451A45627D22112211FA5D225132516A51A65D22E12201FE0102 +4806:00007CFC448044F844807CF8108013FE11405D245128511051085D44E1820100 +4807:00007DFE4502450245FE7D10115211525D52517E511051525D52E252027E0402 +4808:0020782049FC482448247BFE1024102451FC5E22517450A85924E22200A00040 +4809:00207C1045FE450246047CF8108810885CF85080508050FC5C84E08400FC0084 +480A:00907C904490479E44907C901090139C10905C905090539E50905C90E0900090 +480B:00407C8045FC452445247DFC112411445DFC5090511053FE5C10E01000100010 +480C:00207C2247B444A844A87D2412A210405DFC510451FC51045DFCE10401140108 +480D:00007BDE4A424A424A427BDE1200123E53D25E12521453D45A08E21402240242 +480E:00007DFE4502450245FE7D0011FE11205D4451FE511251105EFEE210041009FE +480F:00107BD448584A52498C7888110412FA10205C2053FE502050505C88E1040202 +4810:00007DFC450445FC45047DFC110411FC5C28502453FE50505C50E08801040202 +4811:002078204BFE485048887B2611FC10201C2053FE5000502051FC5C20E02003FE +4812:00807C9E449245D244927C9E109211D25D52515E515251525DD2E022002A0044 +4813:00887C48445047FE44507C5011FC11545D54518C510451FC5D04E10401FC0104 +4814:00007C844448440045FE7C20104411A810305C585198503450525D90E0500020 +4815:009078924AD44A984A927AD2170E10201C2053FE507050A851245E22E0200020 +4816:00207D2044BE444244847F101110112811445C8250FC508450845C84E0FC0084 +4817:00207C4045FC450445FC7D0411FC11045DFC5028502453FE5C50E08801040202 +4818:00207C4045FC450445547D241154110411FC5C00511251D451185D52E192010E +4819:00207C1045FE448444487DFE1102122410105DFE5040507C50445C84E0940108 +481A:0080F04097FC94049110F208203C23D0A290BA90A290A288A288B4A4C4D40892 +481B:0008783C4BC048044A44792811FC12201C2053FE5020512451245D24E1FC0004 +481C:00887C8845FE448844007DFE1088108810F85C8850F85088509E5DE8E0080008 +481D:00007CF84488448844F87C0011FC11045DFC510451FC51045DFCE05000880104 +481E:0014F012901097FE9410F49024D22492A7F2BC94A494A5C8BAAAE89A11A60042 +481F:08207E2008F8FF2814287F6A082AFF5608821FF010101FF0010011F83100CFFE +4820:14507FFC245247CE80007FFC41043FF821083FF810101FF0010011F83100CFFE +4821:00207C3C442045FE45227D3811E4111C11005D7C5144517C51445D7CE14402FE +4822:0820FFFE08203FF824483FF800007FFE40029FF410101FF0010011F83100CFFE +4823:00007BDE4A524BDE4A107A5211CE10001C8853FE5088508853FE5C88E1040202 +4824:00007DDC4554455445DC7C0011FC112411FC5D2451FC502053FE5C20E0200020 +4825:0108F10895489390911EF7D425642554A554BF54A5D4A548A548B554C46404C2 +4826:00807CEE454A444A45FA7C4E10AA110010FC5C84508450FC50845C84E0FC0084 +4827:00007BFC4A044A044BFC7A2212FC122813FE5E2052FC538452FC5C84E4FC0884 +4828:00807CF8450847FE45447D9211FE11005D7C5100517C51005D7CE244027C0444 +4829:0020F13C912097FE9010F01423FE2210A3F0BA54A254A2D4BB68E44A08960322 +482A:00447A844AEA4A4E4AA47AEE122213FE12445E8452EA524E52A45EEEE22203FE +482B:03F0792E49E2492A49E4793413EA10321C1E53E050A2513450685CA4E3220020 +482C:00A0F74E915A952A922AF21C25DA280AA1EAB92AA1EAA22CA148B068C3880008 +482D:0108F10897CE91129124F7DE2552255EA7D2B91EA392A55EA940B114C1120122 +482E:012478A849FC48404BFE790813FC152251FC5D2051FC512059FEE00202AA0004 +482F:0040F0A0911092089DF6F0002EEE2AAAAEEEB800AFFEA922AFFEB922C92A0804 +4830:00887BFE48884BDE4A527BDE10A0109011FE5D2053FC552051FC5D20E1FE0100 +4831:03FE7A024BFE4A924A547A9212FE12AA52FE5F2252FA52AA5AFAE22205FA0004 +4832:102020207C5044507C8845247E12441045FCFC040C0814882450442094100810 +4833:102020207D2445247D2445247DFC44204420FD240D2415242524452495FC0804 +4834:102020107C1044007DFE44007C0444844484FC480C4814482450441095FE0800 +4835:104420447C4444847CBE45847E8444A44494FC940C8414842484448494940888 +4836:104020407C8044FC7D2046207C20442047FEFC200C5014502488448895040A02 +4837:105020507C5045527CD444587C50445844D4FD520C5014502492449295120A0E +4838:102020207DFC44507C8845047EFA440047FEFC400C8015FC2404440494280810 +4839:102020107C1045FE7C2044247C4444F84412FC220C4415882410442894440982 +483A:108020407C5E45027D02457A7D4A454A454AFD4A0D7A154A25024502950A0904 +483B:102020107DFE45027C4844847D0244FC4404FCFC0C8014FC2404440494280810 +483C:102020507C8845047EFA44007DE2452A452AFDEA0D2A152A25EA4522952A0964 +483D:102021247924492479FC48007BFE480049FCF904190429FC488888502BFE1000 +483E:100023DE7A524BDE7A524BDE7A024A224A22FA221A522A4A4A8A8A022A0A1204 +483F:102021FC7D2445FC7C2047FE7C0045FC4504FDFC0D0415FC250445FC94880904 +4840:101021FE7C0045FE7D02457A7D4A45FE4400FCFC0C8414FC248444FC940009FE +4841:111020907BDE48107A5E49827BDE48104BDEFA501BDE2A504BDE8A502A5212CE +4842:080408040844FF4408447F4449447F4449447F4C0874FF440804080408040804 +4843:104010401040FE4011FC7C4454447C4454447C841084FE841104110412281410 +4844:100010F01090FE9010907C9054907C9054907C901090FE9210921112110E1200 +4845:108210921092FE9210927C9254927C9254927C921092FE921092111211021202 +4846:101010901090FE8810887D2455247E2254207C401048FE44108411FE10821000 +4847:1000100011FCFE0010007C0057FE7C9054907C901090FE9011121112120E1400 +4848:100810881050FE2010507C8855007C0854887C881050FE501020105010881306 +4849:104010201000FDFC10007C0054F07C9054907C901090FE9210921112110E1200 +484A:1008101C11E0FD0011007DFC55447D4455447D281128FF101110122812441482 +484B:102010201020FDFE10207C2054207DFC54847C881048FE501020105011881606 +484C:104010401040FC4013FE7C4054807C9054907D201120FE481244148411FE1082 +484D:102010201020FC2011FC7C2054207C2055FE7C201050FE501088108811041202 +484E:102010101010FEFE10827C8254827CFE54827C801080FE801080110011001200 +484F:100811C81048FE4810487DC855087D0855107DD01054FE541052105E12821100 +4850:102010101010FEFE10827D0454407C4854507C601040FE4210421042103E1000 +4851:100011FC1104FD0411047DFC55207D2055FE7D201120FD101112114A11861102 +4852:1000100011FCFD2411247D2455247D2455FC7D241124FD241124112411FC1104 +4853:11001100211C47C0810017C0257E67C8A54827C821082FE82108210821282110 +4854:10201020107CFC8411487C3054207C4855907C3E1042FDA41018101010601180 +4855:100011F81010FC2010247DA854B07CA855287D241222FCA01040100011FC1000 +4856:1000100011FCFE0010507C8855247C2054207DFC1020FE201020102013FE1000 +4857:7DF0111011901D52F20E05001FF001001FF011101FF011101FF00100FFFE0100 +4858:1080108010FEFD0211027EFA54AA7CAA54FA7CAA10AAFEFA108A100210141008 +4859:1020101010FCFE8410847CFC54847C8454FC7CA210A4FE981090108810C41082 +485A:1020104011FCFD0411047DFC55047D0455FC7C501050FE5010921092110E1200 +485B:10101010FEFE10107C7C545454547C7C545454547C7C1010FEFE101010101010 +485C:1020102011FCFC2010207DFE54887D0456227C2011FCFE201020102013FE1000 +485D:2040202023FEFA022504F900A9DEFA52AA52FB52249AF894211021122212240E +485E:1FF010101FF010101FF01010FFFE11103FF8C1061FF011101FF01110FFFE0100 +485F:1020104010FEFC9210927CFE54927CA254FE7C481088FDFE1008100810081008 +4860:10201020103EFE2010207CFC54847CFC54847CFC1084FEFC1000104810841102 +4861:1110111211D4FD1811527D92552E7C4055FC7D041104FDFC1104110411FC1104 +4862:1040102011FEFD0211027DFE55007D0055FE7DAA11AAFEFE12AA12AA14A21086 +4863:100013FE1222FC2011FE7C2055FC7D2455FC7D2411FCFC2013FE102010201020 +4864:02003FD00260FFFE1C10EFF008100FF001007FFC11101FF01110FFFE01000100 +4865:1040102013FEFE0210507C8855247C5054887D0412FAFC881088108810F81088 +4866:21F820882070F98C2000FBDEAA52F98CAA52F82023FEF87020A8212426222020 +4867:1040108011FCFD0411047DFC55007DFE55007DFE1002FEAA12AA140210141008 +4868:082004407FFC0100FFFE04001FF0E1003FFC01001FF011101FF01110FFFE0100 +4869:1020102013FEFC2011FC7D0455FC7D0455FC7D0411FCFD0413FE108811041202 +486A:1020101011FEFD0211027DFE55007DEE55227DAA1166FD22116612AA12221466 +486B:10201220117CFCA410187CE657107D7E55107D7C1110FDFE1110111012FE1400 +486C:200021F82108F9F82108F9F8A800FBFCAA94FBFC2000F9F82090206021982606 +486D:1084104811FEFE1010FC7C2055FE7C40547C7CA41124FEFC1044104411FE1000 +486E:112411241224FCA411547D4A57927D0855087D28112EFD2811281158114E1180 +486F:1020104011FCFD24117C7D8C55547D2455547DFC1040FC2412A2128A14881078 +4870:0878FF4808863E782A483E30404881043FF801001FF011101FF01110FFFE0100 +4871:200023FE2200FA7C2244FA44AA7CFA00AAEEFAAA22AAFAAA22EE220023FE2000 +4872:100013DE1252FE5213DE7C0055FC7D2455FC7D2411FCFC2013FE102010201020 +4873:214021442158FBF02150F9D0A95EF9D4A954F95423F4F8142154223424142024 +4874:102011FC1088FC5013FE7C0055FC7D2455FC7D2411FCFC2011FC102013FE1000 +4875:104412241128FC7E10107C28574A7D1C55287D4C111AFD2A1148111012FE1400 +4876:201023C8227EFA402262FBD4AA00FA3EABC8FA48267EFA48224823C822482008 +4877:108813FE1088FC2011FC7C2057FE7C4054887DFC1000FDFC1154115417FE1000 +4878:108813FE1088FDFC11547D5455FC7C2854247DFE1120FD241114114A11961122 +4879:102011FE1020FDFE11027EFC54A47CFC54A47CFC1000FDFE10A210BC1160123E +487A:208823DE2088F9DC2088FBDEA888FBFCA804F9FC2004FBFC204022A4228A247A +487B:204021FC2124F994214CF924A9FCF820ABFEFA8A2124FBFE208020FC2104220C +487C:200021FC2020FBFE2222F9ACA820F9ACA800FBEE22AAFAAA22AA22AA23EE22AA +487D:252827BE2948FFBE2318FDAAA946FBFCAA04FBFC2204FBFC220423FC21082204 +487E:210821EC210AFFEA2928FBC8A93EFFE8A948FBE82A28FB682AA82BF42AB432A2 +487F:21FC202023FEFA2221ACF820A9ACF800ABBEFAAA23BEF80023FE212422AA27FE +4880:104010401040FEFE2080290048F87E08081008200E40F8804902090208FE0800 +4881:100010FC1084FE84208428FC48847E84088408FC0E84F8844884088409140A08 +4882:104010201020FE0021FE280048047E84088408480E48F848485008100BFE0800 +4883:00407C2045FC44887C5043FE7C20A5FC24203C2010080810066001800E70F00E +4884:101024FE42447E2800FE7E10427C7E10082008207EFC08301C682AA4C9220820 +4885:02001C7810081E7810081FF800003FFC20002FF820003FFE288848504A308C0E +4886:000001FE7D00457C450001FE39542948296429422B082DFE4948412882080418 +4887:200011FE7D00457C450001FE39542948296429422B082DFE4948412882080418 +4888:3FFC20002FF820003FFE286849104A888C643FF8D55613901FF00A2009200FE0 +4889:111827C8244836D8254826C837D800003FFC20002FF820003FFC24484430860E +488A:000023F81010102000400040F7FE104010401040104011401080280047FE0000 +488B:000023FC1090109000900090F090109010901110111012101410280047FE0000 +488C:0040404020402FFE00400040E7FC244424442444245424482040204050008FFE +488D:00802040104017FE01000100F1F8110811081108120812081450282047FE0000 +488E:000023FC1090109000900090F7FE109010901110111012101410280047FE0000 +488F:001021101090109000100210F1101110101E17F0101010101010281047FE0000 +4890:000021F81108110801F80108F10811F811081108110817FE1000280047FE0000 +4891:0008203C13E0122002200220F3FE122012101212128A13261212280047FE0000 +4892:0080204017FC100001100208F414111010A0104010A011101208280047FE0000 +4893:0040202013FE1202040401FCF020102017FE10201020102010A0284047FE0000 +4894:004020A0111012080DF60000F00013F812081208120813F81000280047FE0000 +4895:002820241024102003FE0220F224122413A812281212121A14261442288047FE +4896:0040204013F8104807FE0048F3F8104013F81040104017FC1040284047FE0000 +4897:0120412021202FFC09240924E9242FFC2924292429242FFC200050008FFE0000 +4898:0040202013FE120204140010F3FE1010111010901090101010101050282047FE +4899:000023FC1204120403FC0204F20413FC1204120413FC100011081204280047FE +489A:00004FFE204027FC044407FCE44427FC2040274020C020B02108220450008FFE +489B:000023FC12041294030C0204F2F41294129412F4120412141208280047FE0000 +489C:03F8200811F8100803F80000F7FC144413F81248124812681250284047FE0000 +489D:000027FE10901090039C0204F204139C10901090109017FE1000280047FE0000 +489E:0210421022102F7C02100630E7382AD42A52329223102210221050008FFE0000 +489F:0420422020202FBE04480488E72825282510291029283544228450008FFE0000 +48A0:00404244224424A801100208EC06211021102FFE21102210221054108FFE0000 +48A1:029042902FFC229002F00200E3F82040204027FC21502248244450408FFE0000 +48A2:004040A0211022880C4603F8E20823F8220823F8220025FC250429FC50008FFE +48A3:002020FE134C107007A001FEF00011FC100011FC100011FC110411FC280047FE +48A4:03904E18221422100F7E0610E7382AB42A54325022902210221050008FFE0000 +48A5:000027FC1040127802400FFEF00013F8120813F8120813F8120813F8280047FE +48A6:0080204017FC1040009005E4F24814A411F01010104017FC10401040284047FE +48A7:000027BC108414A4029404A4F0501188162610C0131010641388103028C047FE +48A8:02244224242429240154024AE6922A102250225E2250225022B0229E53008FFE +48A9:00105F902210221E0FA404C4E4943FD420082F88289428A22FC250008FFE0000 +48AA:0078478020802FFC01200210E5E8292627F8240825E8252825E8241850008FFE +48AB:072025FE1540157C0690057EF500157C1544157C1644147C1444144C280047FE +48AC:003C47C020442224010807FEE4022A08220823BE24882AA8213E220854088FFE +48AD:0208411027FC204003F80040E7FC20002440227C208422282C20245054888FFE +48AE:000047FC20402FFE08420358E0402358200027FC244427FC244427FC50008FFE +48AF:0244444820B0230C0C420244E4A823183C06240827BE28883528223E54088FFE +48B0:07BC208414A4129404A40120F21017FC1A2013FC122013FC122013FE2A0047FE +48B1:004027FC104013F8000007FCF4A417FC120813F8120813F8120813F8291047FE +48B2:07BC24A417BC14A407BC0140F3FC124017FC1A4013FE129010601398280047FE +48B3:00003C7C24442448244824502448244824442444244425684650444080400040 +48B4:0000077C78440848084808500848FFC808440844104410682050204040408040 +48B5:00007E7C004400480048FF50104810482044204444444268FF50414000400040 +48B6:0800087C084408487F48085018481C482A442944484488680850084008400840 +48B7:00003F3E212221242924252825242124FFE22122212221342128412045208220 +48B8:00003F3E2122212421243F28212421243F2221222122213427A8F82040200020 +48B9:00007FBE4022402440247F2841244124412241227F224034402840207FA00020 +48BA:0800087C49444948494849507F48084808444944494449684F50794000400040 +48BB:00007FBE4822482448247F2841244124412241227F224834482848207FA00020 +48BC:1200123E122212247F241228122412241222FFA2002212341128212020A040A0 +48BD:044004407FFC0440FFFE10102FE8C8260FE000001FF011101FF0100410040FFC +48BE:0800287C28443E484848085008487F4814441444144414682550264044408040 +48BF:1000083E0822FFA480A411281024FFA42222222242223434082814202220C120 +48C0:1000107C3F4421484248BFD020482F48294429442D442A6828504A404C408840 +48C1:0000F7BE10A210A494A452A852A410A431A252A294A210B410A810A052A02120 +48C2:0800087C08447F4808483E5008487F4818441C442A442A684850884008400840 +48C3:2000207C3F444848884808507F48084808442E44284428682F50F04040400040 +48C4:0800087C144422484148BE50084808487F4408442A4429684950884028401040 +48C5:00003FBE202220242F24202820243FA4282228A22D222A34292848A04C208820 +48C6:00007FBE002224A449249228492424A400227FA20822083408280BA0FC200020 +48C7:08000A7C094408487F480850084849482A4408441C442A68C950084028401040 +48C8:00007CF8448844887CF800007DFC5524552455247DFC410041004D02710240FE +48C9:20401248444420140860738020001FF010101FF000003FF821083FF820021FFE +48CA:0800493E29222A2408247F28412441245D225522552255345D28412045204220 +48CB:010007BE782208A444A42528202404247FA20C221622153424A8442084200420 +48CC:0800041E7FD2401243945E14521852145FD252125212521A5554595094D00250 +48CD:0800083EFFA214242224492888A47F2449227F2249227F3408280A200C200820 +48CE:248024BE49229224492424A824A400247FA248A248A27FB448A848A07FA040A0 +48CF:1500153E152225242FA465286524A524252225223FE22034252824A028A03020 +48D0:2200227C7F4422482A4808503E482A482A442A44FF4408681450124022404040 +48D1:00003FBE20222FA42AA42AA82FA42AA42AA22FA222222FB4422843A09C200820 +48D2:0800083E7F2249247F240828FFA400247F22412249224934492814202220C120 +48D3:0000FFBE00227F24412441287F240024FFA2A2A294A2FFB488A888A08AA08120 +48D4:0800497C2A4408487F48415041487F4841447F44414441687F50004022404140 +48D5:00007FBE48227F2448247F28482448247FA200A2AAA2AAB4AAA880A005200220 +48D6:00007E7848487E4848787E0048FC48A47EA402A4AAFCAA80AA8082821482087E +48D7:0800103E7F2241247F2441287F241024FFA22222492288B47F68082008200820 +48D8:0800493E2A22FFA480A43E28222422243E2208227F22083408280F20F0204020 +48D9:0400445E44527FD200147BD44A584A547BD24A524A527BDA4A544A50AB501490 +48DA:08007F3E4922FFA449247F2808247F2449227F221022FF34212872200C20F320 +48DB:0800083EFFA21C242B24C8A814242224492288A249222A34492888A028201020 +48DC:08000F3E08227FA448A44E287924472440225F2251225F3451285F2051A0BE20 +48DD:00003FDE205220523FD422342FD822943FF222122FD2385A2FD448504FD08850 +48DE:0000F7BE94A294A4F7A422281424FFA40822492249227F340928102020204020 +48DF:0000F7BE2122A524F7A46328B5A421247FA240A240A27FB440A840A07FA040A0 +48E0:1100111E7BD21112FFF411142A9844543FB2209220923F9A209420903F902090 +48E1:4100223EFFA208247F240828FFA4152464A22422FFA224343528E2A025A068A0 +48E2:2280229E27D2FA922294729427F8F81427D274526C52A7DA2454245027D02450 +48E3:2480151E7FD240521F1411147FD855544E527FD204127FDA0414FFF02A504530 +48E4:7BC04A5E7BD24A527BD414143FD86414BF9224123FD2001A3F9410900F10F090 +48E5:0020FFA0142014227F225524552855305720612041207F22412241227F1E4100 +48E6:0020FFA0142014207F7C5524552455245724612441247F24414441447F944108 +48E7:0020FFA8142414247F20553E55E055205720612041207F20411441147F0C4104 +48E8:0010FF901410141C7F70551055105510571E61F041107F12411241127F0E4100 +48E9:0020FE20282029FCFE20AAA8AAA8AAA8AEA8C2A882F8FE2282228222FE1E8200 +48EA:0010FE10281028FEFE10AA10AAFEAA92AE92C2928292FE9A82948210FE108210 +48EB:0010FE10281028FEFE10AA10AAFCAA44AE44C2448228FE2882108228FE448282 +48EC:0048FE4428442840FE5EABE0AA40AA44AE44C2488230FE228252828AFF068202 +48ED:0010FE1428122812FE10AAFEAA10AA10AE10C2288228FE2882288244FE448282 +48EE:0028FE2428242820FEFEAA20AA20AA3CAE34C2548254FE5482888288FF148222 +48EF:0000FFBC142414247F24553C552455245724613C41247F24412441247F7E4100 +48F0:0000FFBE142014207F20553E5522552257226122413E7F20412041207F3E4100 +48F1:0020FFA01420147C7F445584557455545754615441747F54410441047F284110 +48F2:0020FE2028402848FE84AAFCAA04AA48AE48C2FE8248FE4882488288FE888308 +48F3:0000FEFC28042804FEFCAA04AA04AAF4AE94C2948294FEF482048204FE148208 +48F4:0000FE4428282892FEAAAAC6AA82AAFEAE28C2288228FE288248824AFE8A8306 +48F5:0000FEFE28482848FE78AA48AA48AA78AE48C248824EFEF882088208FE088208 +48F6:0008FE1C28702810FE10AAFEAA10AA10AE10C27C8244FE4482448244FE7C8244 +48F7:0010FE502850287CFE90AA10AA10AAFEAE10C2388238FE5482548292FE108210 +48F8:083813C0304057FC9040104013F81000FFFE04403FF82848303827C820083FF8 +48F9:0050FE5828542894FE90AA9CABF0AA94AE94C2948298FE9882948294FEAC82C4 +48FA:0000FE7C28442844FE7CAA00AAFEAA82AE82C2FE8282FE8282FE8282FE8A8284 +48FB:0010FE1028282844FE92AA08AA7CAA04AE08C210827CFE4482448244FE7C8244 +48FC:0020FE1028FE2800FE00AA7CAA44AA44AE7CC2108254FE5282928210FE508220 +48FD:20003E7C48440844FF441444227C4000FFFE04403FF82848303827C820083FF8 +48FE:0020FE1028FE2882FF04AA7CAA44AA44AE7CC2448244FE7C82448244FFFE8200 +48FF:0000FE7C28102810FEFEAA10AA10AA50AE20C2FE82AAFEAA82AA82AAFFFE8200 +4900:0044FE4429FE2844FE54AA10ABFEAA20AE40C27E82C2FF4282428242FE7E8242 +4901:0048FE4829FC2848FE78AA48AA78AA48AE48C3FE8280FEA882C48280FEFE8200 +4902:0088FE882BFE2888FE88AAF8AA88AA88AEF8C22083FEFE7082A88324FE228220 +4903:0040FE2029FE2800FE84AA48ABFEAA00AEFCC2848284FEFC82848284FEFC8284 +4904:0000FEFE28102820FEFEAAAAAAAAAABAAEAAC2AA82BAFEAA82AA82AAFEFE8282 +4905:0010FE1028282844FE82AA7CAA00AAE2AEAAC2AA82EAFEAA82AA82E2FEAA82A4 +4906:0010FED42848294AFE84AA84AB02AAF8AE20C22083FCFE2082508248FE848304 +4907:0020FE1028FE2882FE28AA44AA92AA28AE44C282827CFE0482288210FE2882C4 +4908:0044FE82297C2820FE40AA7CAA04AA28AE10C2FE82AAFEAA82AA82AAFFFE8200 +4909:0010FE0C282428AAFEB0AB24AA64AB9CAE00C2FE82AAFEAA82AA82AAFFFE8200 +490A:0044FE4428FE2844FE00AAFEAA44AA44AE7CC244827CFE44824E82F4FE048204 +490B:4408240C280AFE0829FE2808FE08AAEAAAAAAEAAC2ECFE0C822A82CAFE168222 +490C:0020FE2028502848FEA4ABFEAA84AAFCAE84C2FC8280FEFC83448344FE7C8244 +490D:0088F88823FE2088F888A8F8A820ABFEDA228B328AAAFB768A228A22FA2A8A24 +490E:00FCFE28281029FEFE52AA94AB50AA20AEFEC2AA82C6FEBA82AA82BAFE828286 +490F:0028FEEE282828EEFE28AAEEAA28AA06AEF8C21082FEFE1082FE8210FE508220 +4910:0000FBDE208822A8FBFEA988AADAACA6D9F889088908F9F889088908F9F88908 +4911:0028FE28287C2828FE28AAFEAA10AA7CAE54C27C8254FE7C82008228FE448282 +4912:0124F92422AA23AEF924AAAAABAEA924DBFE89108914F9148A8A8A4AFA168C22 +4913:0048FE4829FE2848FEFEAA82AB7CAA00AEFEC22082D2FE2C82D8822CFECA8230 +4914:42043FD88A904F9E2A945FD48224FFFE04803FF82488287830083FF820083FF8 +4915:0124F974225822DAFBFEA954AADAABFED8A288208BFEF87088A88924FA228820 +4916:01FCF90421FC2104F9FCA888A9FCA888DBFE88888924FAAA887088A8F9248860 +4917:08207F7C14C47F3822D63E3822507F7C0810FFFE04403FF8284837B820083FF8 +4918:0148F94C22AA2008FBFEA948AB68A94ADB6A894A8B6CF94C896A8B8AF8168822 +4919:00F8F90821F02010FBFEA8C4AB28A8D4DB3288D08A28FFBE8AAA8FBEFA8A8FBE +491A:00003DFC2524252425FC3D24252425FC24203C2025FC24202420442057FE8800 +491B:10041004288424844284BC8410841084FE8C109494E4588450041E04F0044004 +491C:102010202820243C41E0B82010201020FC3E13E09420582250221C22E01E4000 +491D:10001040299E25124112B91211121112FD121112955A599451101C10E0104010 +491E:10401050284824484040B9FE10501050FC5010509490589050921D12E10E4200 +491F:1000100029FE25024302BC0010781048FE4810489448584A504A1E8AF0864100 +4920:10101010281024904290BC90109E1090FE9010909490589050901E90F1FE4000 +4921:10201020282025FC4124B92411FC1124FD24112497FE590451041D04E1144108 +4922:100011FC290425044104B9FC10401040FDFC10449444588450841D04E2284410 +4923:1008103C29E024204124B8A410A81020FDFE10209420582050201C20E0A04040 +4924:10201010281025FE4220BC24104410F8FE1210229444598850101E28F0444182 +4925:1040104028FC25044208B9FE1100117CFD4411449554594851421E42E23E4400 +4926:10A810A428A42520412EBBF015201124FD2411249528591051321D4AE1864102 +4927:1000100029FC25044104B97411541154FD5411549574590451041DFCE1044000 +4928:1004101E29E025004106B97811501150FD5211549548594851441E54E2624440 +4929:1020101029FE25024000B81C10E01020FC20103E95E0582050221C22E01E4000 +492A:100010F8288824884088B88811261220FDFE1020947058A851241E22E0204020 +492B:102011242924252441FCB82010501088FD441222942059F850081C10E0104020 +492C:201022105110491084547A5222522090F81021142E04B20862083A10E22000C0 +492D:21842068503048C88304784023FE20A0F92023FC2D24B12461343928E0200020 +492E:101010102890249E4090B89013FE1000FC1010929492591452081C10E0604380 +492F:100213E2294425484140B942114213E4FD4811409542594251441E44E2484450 +4930:108010807DFC124410481CA0E11006C81830EFEE01003FF809200540FFFE0000 +4931:10201124292425FC4000B80C11F01100FD0011FE9510591051101E10E2104410 +4932:1020102029FC24204020B82013FE1048FC48114C954A5A4A50881C88E1284210 +4933:2080204057FE492081207A3C22442664FA9423482A48B23062203A50E2880306 +4934:200021FC5008481082227AAA22722222FA7222AA2B26B2A262423A02E3FE0002 +4935:109010902890279E4090B8901090139CFC90109094905B9E50901C90E0904090 +4936:102010202BFE24504088B924122211FCFD2411FC952459FC50221C22E01E4000 +4937:200023FE52004AFC82847AFC228422FCFA2023FE2A48B2C862303A48E28403FE +4938:208020FC510449F880087BFE204020A2FB3420582894B33460523890E3500020 +4939:104010202BFE262240A4B92810501088FD0410F89488588850501C20E0D84306 +493A:100010022BDC24904090B91011DE1354FD541154955459D451541C24E0244044 +493B:104010402BFE248041FCBA2015FE1000FDFC110495FC590451FC1D04E1144108 +493C:2040208051FC490481FC790421FC2020F83223B428A8B12861243A24E4A20040 +493D:100011FC295425544154B9FC102010A8FCA41124942058A850A41D24E0204020 +493E:101E11E0282225124094B880102011CEFD02110295CE590251021D02E1FE4102 +493F:108013DE288A25CA408ABBD210A61008FCF0102095FC582053FE1C20E0A04040 +4940:10201124292425FC4020BBFE10001020FDFC1124952459FC50201C24E3FE4102 +4941:200023FC500848D080207BFE228A2252FAFA22222A22B3FE62223A22E3FE0202 +4942:200023FE52024CFC800079FC204020A4FB3820582894B33460523890E3500020 +4943:104010402BFE26924088B9FE13101510FDFE1110951059FE51101D10E1FE4100 +4944:200023FE52004A4882487AFC22482248FBFE22002AFCB28462FC3A84E2FC0484 +4945:01007FFC01007D7C11107D7C11101CFEE10006C01830EFEE01003FF80920FFFE +4946:0100FFFE04407C7C04403C7804407D7C06C01830EFEE01003FF811100920FFFE +4947:1020101029FE25024102B9FE110011EEFD2211AA9566592251661EAAE2224466 +4948:2088208853FE488880247BFE20502088F904228A2888B3FE60883888E1080208 +4949:100013FE2A02244040F8B908121011FCFD24112495FC585050581C96E112420E +494A:102013FE282025FC4020BBFE100011FCFD0411FC950459FC51041DFCE0884104 +494B:1020101029FE240042FCBC8410FC1000FEFC10089410585050201E00F1544252 +494C:020001007FFC40043C7824483C7824483D7806C01830EFEE01003FF80920FFFE +494D:08207E2008F8FF2814287F6A082AFF56098206C01830EFEE01003FF80920FFFE +494E:23FE220052FC4A0083FE7A9422A822C4FA0022FC2A84B2FC62843CFCE484088C +494F:2280228E54EA494A804A724A25EA2C4AF44A256AA54A754E25683788C4080408 +4950:00207E7C14C40838FEC62A2048FCA844118C06C01830EFEE01003FF80920FFFE +4951:102010202BFE24A840A8B97412221070FCA811469478588851501C20E0504180 +4952:7CF8048804F87C2041FC7D2405FC04282BFC16C41830EFEE01003FF80920FFFE +4953:1088108829FE248840F8B88810F81088FDFE108895245AFA50201C20E1FE4000 +4954:200023FE5050485083FE7A52225223FEF92420A82BFEB07060A83924E6220020 +4955:2108210855484B90811E77D425642554F5542754A5D4754825483554C46404C2 +4956:108810502BFE245041FCB954118C1174FD0411FC94205BFE50501C88E1044202 +4957:2108210857C84908811E7B9220242380F80827C82908B10865943954E1240342 +4958:10881088295426224088B88811541222FDFC1104950459FC51041D04E1FC4104 +4959:2044272455284D7E85107630254A251AF52C254CA51A762A24483408C4280410 +495A:3FF820082EE82AA82EE82AA82EE82AA82FE8228824483BB8210A4FEA45469FF2 +495B:108013DE288A25CA408ABBD210A61040FC8811F094245BFE50221D24E2A24040 +495C:200023DE52524BDE82527BDE22222222FAFA22222A72B2AA63263A22E22A0204 +495D:202023FE52504BFE82527BFE229422D8FA9222CE2A00B28462983CE2E482087E +495E:2108220827C854508FDE746427D42214F91427D42A14B3C862483C54E55408A2 +495F:2200227C52444A7C87447A7C2220237EFA9226522A6AB242627A3A02E2140608 +4960:2088208853FE48888014781223FE2210FAF422142AF4B2A862AA3AFAE2160422 +4961:2114255455544DFE855477D4245C2440F77E2510A5FE751025383554C5920910 +4962:0810FF7E08107F7C41047F2822101F28E14406C01830EFEE01003FF80920FFFE +4963:2C7844486C4844867D7800487C301048FD8406C01830EFEE01003FF80920FFFE +4964:11FC10202BFE262241ACB82011AC1040FCFC110496F4589450F41C8AE082407E +4965:202023FE5088485083FE7A5023FC2254FBFE22542BFCB25062D83D54E6520850 +4966:202021FE54404AFC81107AFE200026FCFA8422FC2A84B2FC62843A8CE50008FE +4967:2040207C50404BFE820279FC20A82154FA8821FC2A8AB0F8608838F8E08800F8 +4968:200023DE52524BDE82527BDE220222FAFA8A22FA2A02B2FA628A3AFAE2020206 +4969:228822A856A84BF0801E722425D42C14F41425D4A554754825683554C6140422 +496A:200023FE52024BFE82027BFE21082252FB9C21082A52B3DE60003AA4E2520452 +496B:2110211457D249108FFE729024502FF4F49427F4A49477E8248A37FAC4260042 +496C:108813FE2888242443FEB82011FC1124FDFC112495FC592450081DFEE0884058 +496D:14141010FEFE10105454383854549292313006C01830EFEE01003FF80920FFFE +496E:200023FE50504BFE82527BFE200023DEFA9223D22A52B3D2629A3A94E3D00010 +496F:200023FC52944A9483FC7910225223DCF81223CE2A40B3D2625C3BD0E25202CE +4970:2040202057FE4900810079FC20002088FBFE22AA2AAAB3FE608838AAE3FE0022 +4971:202023FE52024840819C790421DC2104F9FC21002BFEB40262AA3AAAE4140008 +4972:200827E854084DC8855E755225E42400F7E826A8A6A877E8241437F4C0240042 +4973:23FC204051F8490881F8790827FE2442FAA4228A2C7AB08061F83A88E070038E +4974:2020222253FE489081FE7B1025FE2110F9FE211029FEB10063DE3A52E2720206 +4975:20102010577E4D1085FE754425EE2744F56425DEA50075FE2728352AC04A0086 +4976:200023FE52224ACC82447BEE224422EEFB5422442A10B210625E3A50E25005FE +4977:244227722AA2511A8BEA722A23EA222AFBEA222A2BEAB14A67F23942E24A0444 +4978:F7FC124817FCFC4686ECF55416EC155457EC26C41830EFEE01003FF80920FFFE +4979:208023DE508A49D280A67BD0209C2050FBFE20502AAAB3FE62523AAAE3FE0002 +497A:200023FC3810211041107910A21023FEF8302050209021102A10341020500020 +497B:100010003DFC20204020BC20102013FEFC5010501050109014921912120E0400 +497C:108010803C8020FC4154BE5410541094FC941124122410441444188411280010 +497D:204020483A44224043FE7880A08020FCF9442144214822502A20345028880306 +497E:200023FE3A022484408078FCA0802100F9FC2004200423F42804300420280010 +497F:1008101C3DE021004100BDFE11201120FD3C11241124112415241A4412540488 +4980:200027BC3884208444A47A94A2942084F98C229424A420842884308422940108 +4981:2100211E391227D241147914A7D82114F91227D22112211A2914321022100410 +4982:204020203BFC220442047BFCA20023DCFA44235422CC22442ACC3554244408CC +4983:208820883BFE20A8402279FAA0242028FBFE204020FC21842AFC348420FC0084 +4984:102013FE3C2021FC4124BDFC112411FCFC2213FE1050109415881AA814C40082 +4985:208820503BFE202041FC7820A3FE2124F8A823FE200021FC2904310421FC0104 +4986:23DE22523BDE225243DE78A0A1FE2320FDFC212021FE200029FC30882070078E +4987:00103E50205020483C8820A43D2422422040FE8010F820084408FE0802500020 +4988:00403E40204020403DFE20403C40204020FCFE90109021104510FE1002FE0000 +4989:00003EFE20AA20AA3CAA20AA3CAA20AA20AAFEAE10C220824482FEFE02820000 +498A:00203E202020203C3C2020203DFE20002020FE2010A820A44522FE2202A00040 +498B:00883C8820883BD0209E3BE4209427D4F91421D421544948F9484A5402D40422 +498C:00007C7C44447C7C44447C7C410441044FE44104410441045FF4400440144008 +498D:7C7C44447C7C44447C7C4004440447F4480457C4418442044414441443F4400C +498E:7C7C44447C7C44447C7C40044FC440045FE4450445044504492450E440144008 +498F:00007C7C44447C7C44447C7C410442844464581C444444444444484450544008 +4990:00007C7C44447C7C44447C7C400440E45F0441045FE441047FFC410445144208 +4991:7C7C44447C7C44447C7C420442044FC4424442445FF442044504448448545008 +4992:7C7C44447C7C44447C7C40045FE44104420447C44C445444444447C444544008 +4993:7C7C44447C7C44447C7C4104410441F4410441044FE4482448244FE440144008 +4994:7C7C44447C7C44447C7C400440044FE448244FE448244FE440045FF44004400C +4995:7C7C44447C7C44447C7C4004482444445FF4444444447FFC444448444844504C +4996:7C7C44447C7C44447C7C410441045FF441044FE440044FE448244FE44824400C +4997:7C7C44447C7C44447C7C410442044FE44AA44AA44AA44AA45FF4400440144008 +4998:7C7C44447C7C44447C7C40044FE448244FE448244FE4491448A44A444C24481C +4999:7C7C44447C7C44447C7C410441045FF441047FFC40445FF44844444441544088 +499A:7C7C44447C7C44447C7C400440E44F0441045FF441044FE448244FE440144008 +499B:7C7C44447C7C44447C7C420447C448845FE441245FF441244FE441044304400C +499C:7C7C44447C7C44447C7C40045FF442044FE444247FFC40044FE448244FF44008 +499D:7C7C44447C7C44447D7C41044FE441045FF442844AA44A945494448449944008 +499E:7C7C44447C7C44447C7C400449F44444504449F44444484458444BFC4804400C +499F:7C7C44447C7C44447C7C410449244924555441044FE4410441045FF44004400C +49A0:7C7C44447C7C44447C7C40045FF44204451459A44AC445A45A9444945A84410C +49A1:7C7C44447C7C44447C7C41045FF4501447C4444447C4440447E4442447E4400C +49A2:7C7C44447C7C44447C7C5084488463E45084488457F47104522457F45014400C +49A3:7C7C44447C7C44447E7C41045FF4482444447FFC40044FE4482448244FE4400C +49A4:7C7C44447C7C44447C7C40044EE44AA444444AA451044EE44AA444444AA4510C +49A5:7C7C44447C7C44447C7C4004444444445EF444444EE45554644C444444544008 +49A6:7C7C44447C7C44447C7C410442844C6477DC41045FF4492445447FFC4004400C +49A7:7C7C44447C7C44447C7C400442044CE448244EE448244FE4428444945874400C +49A8:7C7C44447C7C44447C7C41045FF441044FE449244FE449244FE445444924410C +49A9:7C7C44447C7C44447FFC48244FE448244FE448244FE444044FC4544443945C68 +49AA:7C7C44447C7C44447FFC48244FE448244FE444044FF459146A944FD44054402C +49AB:7C7C44447C7C44447C7C400444445FF4444441044FE449245FF442844444482C +49AC:7C7C44447C7C44447C7C44045EF444544E5444545EB445045FF442844444482C +49AD:7C7C44447C7C44447C7C40E44F0441045FF44544492457D4444447C4445447C8 +49AE:7C7C44447C7C44447D7C4FE441044FE442045FF444444FE4545C67C4444447CC +49AF:7C7C44447C7C44447C7C40047F444844527C5F9444545F54442447547C94510C +49B0:783C48247A3C4BA47CBC4FC4554447C445444FE449244FE449244FE4411440F4 +49B1:7C7C44447C7C44447C7C41E45E2445444F8448844FC448444FE448245524656C +49B2:7C7C44447C7C44447C7C420447C448445FF46A244C944FF448044BE44A2453EC +49B3:7C7C44447C7C44447C7C520457746D54775455646F547C545654556466C4444C +49B4:7C7C44447C7C44447FFC4AA44FE441044FE441045FF444444FE441045FF4410C +49B5:7C7C44447C7C44447C7C40045FF449245FF4711C5BB455545BB455545BB4511C +49B6:200013FC1004420447C4484450844FE441245FF441244FE44104450442144008 +49B7:200013FC10044004410449244924555441044FE4410441045FF4400440144008 +49B8:200017FC00044FE449244FE449244FE441045FF45114515457D450545034400C +49B9:00207C2044204820482050204BFE482044204420442068205020402040204020 +49BA:00007C0045FE4820482050204820482044204420442068205020402040A04040 +49BB:00007DFC440448084810502048204BFE44204420442068205020402040A04040 +49BC:00407C4044404BF8484850484848484847FE444044A068A05110411042084406 +49BD:00007DF844084850482050104BFE482244244420442068205020402040A04040 +49BE:1040104020807C88450447FE7C02409040907C90449044907D124512020E0400 +49BF:00207C204420482049FC512449244924452445FC452468205020402040204020 +49C0:00407C40444048404BFE5040488048904490452045206A485244448441FE4082 +49C1:00807C80450049FC4A04540449E449244524452445E469245004400440284010 +49C2:00007DFC444448444844504448944888450044FC448468845084408440FC4084 +49C3:00007C0045FC4924492451244924492445FC4524452469245124412441FC4104 +49C4:00807C8044F849084B1054A0484048A04518460645F869085108410841F84108 +49C5:004078404BFC484053F8504863F852404BFC4844485468A850A0411042084406 +49C6:00907C90449048904BFC509048904890449047FE440068905088410841044204 +49C7:0040782048204BFE5040504060A050A249A44A984C906888508440A240C04080 +49C8:00007BFE48505050505061FC5154495449544954695C51844104410441FC4104 +49C9:00007DFC4524492449FC5124492449FC4420442045FC68205020402043FE4000 +49CA:00207D20452049FC4920522048204BFE4400440045FC69045104410441FC4104 +49CB:00007DFC4504490449FC5104490449FC4504450445FC6850509040924112420E +49CC:0008783C4BC0504452246128510048404BFE4888690853904060405041884604 +49CD:00887C8445024A224820505048884904460245FC450469045104410441FC4104 +49CE:00007CFC4484488448FC500049FE4902450245FE4502690251FE4102410A4104 +49CF:00407C4044FC48884950502048D84B2644F8442044F8682053FE402040204020 +49D0:00407C2047FE480049FC510449FC480045FC440844106BFE5020402040A04040 +49D1:004078204BFE52025404600053FE482048204920693C512042A04260443E4800 +49D2:00207C2044204BFE482051244924492446AA447044A868A85124422244204020 +49D3:00007DFC452449244974512449FC490445744554455469745104420442144408 +49D4:00207C20445048884944522249F848084450442044A46A82528A428A44784000 +49D5:00147812481057FE5010601053D24A524A524A546BD4500840EA471A42264042 +49D6:00487C44445E49E048285012486A49964448445E45E0682450284012406A4186 +49D7:01007D0045FE4A004DFC510449FC490445FC448044FC69085290406041984606 +49D8:010079F84A0853F0501067FE508049444E6848B06928566840A4412246A04040 +49D9:00407A484A48524853F8604050A049104A884C86689052A84294449442804100 +49DA:00207C1045FE480048FC508448FC480045FE4502457A694A517A4102410A4104 +49DB:004078204BFC5108509063FE52024C4448204BFC688050F84088410841284210 +49DC:00207C1045FE4910497C511449FE4914457C4510457C694451444244427C4444 +49DD:00207D24452449FC482053FE4800482045FC4524452469FC5020402443FE4102 +49DE:00007DFE452049FC492051FC4920492045FE440246AA6AAA52AA420240144008 +49DF:001E7DE04422491248945080482049CE4502450245CE69025102410241FE4102 +49E0:00207BFE482051FC512461FC512449FC48224BFE680853FE4108408840284010 +49E1:00107DFE4510497C491451FE4914497C4510457C4554697C5154427C4254444C +49E2:00007BFE4A00527C52446244527C4A004AEE4AAA6AAA52AA42EE420043FE4000 +49E3:00007DFC445049FC4954515449FC480045FC440047FE682050A8412442A24040 +49E4:00507A524954505053FE608850504BFE482049FC682053FE4050408841044602 +49E5:002078204BFE502051FC612451FC492449FC48226BFE5042402442A2428A4478 +49E6:000E7BF048445224510863F852084BFC4A044BFE6A0252AA42AA450244144808 +49E7:010478884BFE482051FC502063FE5054499248904BFE689050D4438A409641A2 +49E8:00507A524954485053FE5088605053FE482049FC48206BFE50A8412446224020 +49E9:00087B884888511057DE629452A44B944A944B946A9452C84388469440A440C2 +49EA:002078104BFE4A1052FE5254625452BA4A284A444A826A2052FE4444443848C6 +49EB:00207BFE480051FC510461FC50004BFE4A0249FC684053A440D8433440D24330 +49EC:004078204BFE520251FC6148525049FC4B0449FC690451FC410441FC40884104 +49ED:004078804BFE5222528A625253264A524AAA4BFE6840502442A2428A44884078 +49EE:00207BFE4A2251FC502060F8502049FC482049FC695451FC404042A4428A447A +49EF:01F07A104FFC520453FC622453B84A2249FE4A106FFC524443FC40D0414A463E +49F0:0406E438AF08A910B224AFBCCA88AA94AFBEAA8AAA88AFACC02A954A95488018 +49F1:20502048208020FEFD90269024FC2490249024FC25902690449040FE80800080 +49F2:00507C48108010FE1190129010FCFE90109010FC10901090109010FE10801080 +49F3:08500848088008FE49904E9048FC4890489048FC48904E905890E0FE00800080 +49F4:105010481080FEFE11901290FCFC0490049048FC28901090289044FE82800080 +49F5:105010481080FEFE9390129010FC2890289028FC28904A904C9088FE00800080 +49F6:090008801FFC30805FF890801FF810801FFC12000100FFFE0000082010102008 +49F7:205020483C8044FEA990129028FC4490829030FC08900090609010FE08800080 +49F8:10501048108010FEFD90129010FC10907C9044FC4490449044907CFE44800080 +49F9:010000803FFE2250224824FE24902D9036FE2490249024FE4490449084FE0480 +49FA:082808240840FF7E10C81148207E3E486248A27E2248224822483E7E22400040 +49FB:08500848148022FE4190BE9000FC00903E9022FC2290229022903EFE22800080 +49FC:1050504850807CFE5190929010FCFE90009000FC7C904490449044FE7C804480 +49FD:0628782408404A7E2AC82D48087EFF4818481C7E2A482A484848887E08400840 +49FE:10501048284044FE82907D9012FC1090FE9010FC10907C90449044FE7C804480 +49FF:242824247E40247E24C8FF48007E7E484248427E7E48424842487E7E42400040 +4A00:20501048288044FE9190129054FC38901090FEFC10903890549094FE10801080 +4A01:7E20243E1848FFA829104A28984609001FFC30805FF890801FF810801FFC1000 +4A02:0620382008A47EA819202C504A8809041FFC30805FF890801FF810801FFC1000 +4A03:00287E2442407E7E42C87F48087EFF488148107EFF4822486448187E2440C240 +4A04:082814242240497EBEC80548087EFFC814487F7E5548634841487F7E41407F40 +4A05:10281024FE40107EAAC84548827E7D4844487C7E44487C481048547E92403040 +4A06:49202A3E7F4849485DA86B10492841460A001FF831005FF091001FF011001FF8 +4A07:285024487EFEC9907EFC48907EFC48907EFE40807DFC0488285010202858C586 +4A08:20501048FE8082FE7D90569098FC7C90C4907CFC44907C9044907CFE28804480 +4A09:002877245540777E55C87748557E77482248557E1048FF482248647E1C40E340 +4A0A:08801FFC3080DFF810801FFC14283F7E64C8BF7E24483F7E10041E7C12442244 +4A0B:00003FF801007FFE41029D7401001D70000000F03F00020003F87E02020201FE +4A0C:00003FF801007FFE41029D7401001D7000001FF000007FFC044008441044603C +4A0D:3FF801007FFE41029D7401001D70000008203FF808200820FFFE102020204020 +4A0E:3FF801007FFE41029D7401001D7000007F1001107F1040207F2401420AFE0442 +4A0F:3FF801007FFE41029D7401001D704080208009FC12042448E04020A023182C06 +4A10:3FF801007FFE41029D7401001D70010006C01830E7CE00001FF010101FF01010 +4A11:3FF801007FFE492284140100FFFE01007FF801083FF821003FFC0284044C1830 +4A12:3FF801007FFE41029D7401001D7000007EFC224412240A14122422444A940408 +4A13:3FF801007FFE41029D7401001D7000003FF8200827C8244827C820083FF82008 +4A14:00003FF801007FFE41029D7401001D70000011100920FFFE044008423042C03E +4A15:3FF801007FFE41029D7401001D70000011FC482020200BFE7020102010A00040 +4A16:3FF801007FFE41029D7404007FFC08001FF028104FF088100FF0081008500820 +4A17:3FF801007FFE41029D74000000FC7F00121009203FF00040FFFE010005000200 +4A18:3FF801007FFE41029D7400001FF010101FF010101FF010101FF004421842E03E +4A19:3FF801007FFE41029D7401001D700000203813C08040484017FEE040204023FC +4A1A:3FF801007FFE41029D7401001D7008001FF86488090836280110489487F20000 +4A1B:3FF801007FFE41029D7401001D700000100CFDF0110039FE5510921012101410 +4A1C:3FF801007FFE41029D7401001D7000003E7C22443E7C22443E7C22444A948508 +4A1D:3FF801007FFE41029D74000001003FF80100FFFE10101FF010101FF010101030 +4A1E:3FF801007FFE41029D74000001F87F0001001FF011107FFC412441F45E144008 +4A1F:3FF801007FFE41029D7401001D702000104083F8404017FC2040E3F820402FFE +4A20:3FF801007FFE492284141FF010101FF010101FF008001FFC2104528414541FE8 +4A21:3FF801007FFE41029D7401001D7000001FE0004051944924551442047FFC0004 +4A22:3FF801007FFE41029D7408207FFC08200FE008200FE00820FFFE124014201FF8 +4A23:3FF801007FFE41029D7408207FFC08200FE001003FF821083FF80100FFFE0100 +4A24:3FF801007FFE41029D7401001D702040104007FCF44417FC144417FC280047FE +4A25:3FF801007FFE41029D7409001FF831005FF091001FFC10003FF0082007C0F83E +4A26:3FF801007FFE41029D7402003FF808207FFC41043FF8040007F0081010502020 +4A27:3FF801007FFE41029D7401001D7020201050FE880526441028FC2E08F0704008 +4A28:3FF801007FFE41029D740080210013F80208F3F8120013FC120413FC280047FE +4A29:3FF801007FFE41029D7401001D7020201020FDFC092411FC392455FC90201020 +4A2A:3FF801007FFE41029D74000011FC112411FCFD2411FC10201DFCE02043FE0000 +4A2B:3FF801007FFE41029D74000001007FFC11102BA845641918E3E60E4001800E40 +4A2C:3FF801007FFE41029D7401001D702000111081104FBC1110E3B8255429122110 +4A2D:00107F100854FFB888906B7C08446B44007C7E440044FF7C104422447F540148 +4A2E:3FF801007FFE49229414FEFE10107C7C1010FEFE10103FF800081FF800083FF8 +4A2F:3FF801007FFE41029D7400207BFE482051FC612451FC492449FC687050A84124 +4A30:3FF801007FFE49228414211017FC911041F048400BF81248E3F820402FFE2040 +4A31:3FF801007FFE41029D74120027FC42088BF8120833F8510093F8151010E0171E +4A32:00207F20083CFFC488886B7E08526B52007EFF90082C7F2A5528554A554A4386 +4A33:3FF801007FFE41029D7400003EF822883EF822883EF822883EF814502692450E +4A34:3FF801007FFE41029D740000550836087F7E14087F4808283E2808080F287810 +4A35:3FF801007FFE4922A7FC10A017FC84A447FC520813F82208E3F8204027FC2040 +4A36:3FF801007FFE41029D7408201FF000104FE44AA449647FFC0440FC7C24444444 +4A37:3FF801007FFE41029D74000011087BCE11083B88557EBF9220943F88209421A2 +4A38:3FF801007FFE41029D7400187BE0495053F8604053F8480849F86840529444F4 +4A39:3FF801007FFE41029D74108011FC228828706B8EA9FC29AC297429FC28202154 +4A3A:3FF801007FFE49229FF404400FE000007C7C1010FEFE92925454FEFE28287C7C +4A3B:7C7C1010FEFE92927C7C54547C7C00007C7C1010FEFE92927C7C54547C7C0000 +4A3C:104411FEFE5410487CFE1190FEFE00907CFE44907CFE44807DFE4444543849C6 +4A3D:04407C7C04403C7804407C7C044004403FF0001000103FF02000200420041FFC +4A3E:010000803FFE2000212021202F3C212021202738212021204F3C412081200120 +4A3F:00003FF801000200FFFE08203018C44604407C7C04403C7804407C7C04400440 +4A40:04407C7C04403C7804407C7C04401FF010101FF010101FF010101FF008201010 +4A41:04407C7C04403C7804407C7C04403FF002007FF802020DFE70401C78F1C41C3C +4A42:0020FE2010202050FE50AA88AB44BA22AA20AAF8BA08AA08AA10FE1082200020 +4A43:0010FE9010902092FE92AA94AAF4BA98AA90AA90BA90AA92AAB2FED2828E0000 +4A44:0000FE7C10442044FE54AA54AA54BA54AA54AA54BA10AA28AA28FE4A828A0106 +4A45:0010FE10101020FEFE92AA94AA90BAFCAAA4AAA4BAA8AAA8AA90FEA883440282 +4A46:0040FE401040207EFEA0AAA0AB20BA3EAA20AA20BA20AA3EAA20FE2082200020 +4A47:0010FE1010102010FE1EAA10AA10BA10AAFEAA82BA82AA82AA82FE8282FE0082 +4A48:0040FE40107E2080FF7CAA44AA64BA54ABFEAA44BAA4AA94AAFEFE0482280010 +4A49:0014FE1210FE2010FE10AAFEAA92BA92AAFEAA92BA92AAFEAA92FE9282920086 +4A4A:0020FE1010FE2082FE40AA4EAA6ABAAAAAAAAAAABB6CAA28AA4AFE4A828A0106 +4A4B:0010FE0810FE20A4FEA4AAA4AAFEBAA4AAA4AAF6BAACAAB4AAA4FEA483240024 +4A4C:0028FE241040207EFEC8AB48AA7EBA48AA48AA7EBA48AA48AA7EFE4082AA012A +4A4D:0010FE1010FE2010FEAAAA44AA82BB7CAA44AA7CBA44AA7CAA10FE5482920030 +4A4E:0010FE1010282044FE82AA7CAA00BAEEAAAAAAAABAEEAA44AA44FEAA82AA0112 +4A4F:0024FEFE10242000FEFEAAAAAAAABAFEAA14AAFEBA90AAD2AAACFEAA82960122 +4A50:22202220FF20227E3E4008807F3C490449087F100820FFC008420842083E0800 +4A51:2200227EFF0222023E02083E7F20492049407F7E0802FF820802080208140808 +4A52:2200227EFF1022103E1008107F1049FE49107F100810FF900810081008500820 +4A53:28802880FC8028FE390212427C42548254A27D1213FAFD0A1002100210141008 +4A54:280028F8FE882888388811067E0055FC54847C841048FE501020105010881306 +4A55:28002840FD9E2912391211127D12551255127D12115AFD941110101010101010 +4A56:28202820FE2028A838A410A27D22552056247C241028FE081010102010C01300 +4A57:280028FCFE842884388410FC7C84548454847CFC1084FE841104110412141408 +4A58:22002200FF7E22083E1008107F24494449787F080810FF940822087E08220800 +4A59:28202810FE1029FE382010207C44548455F87C101020FE44108211FE10821000 +4A5A:2804281EFDF02910391011107D1055FE55107D101110FD08110A114A11A61112 +4A5B:28402820FC282808380810487C54555255527D601260FC4410C41144123C1000 +4A5C:28202820FE20282039FC11247D24552455247DFC1124FF241124112411FC1104 +4A5D:2808281CFDF02950395011507D50555055507D481148FD681154127412521400 +4A5E:28202820FE202820383E10207C20542055FC7D041104FF041104110411FC1104 +4A5F:28202820FDFE282039FC10247DFC552055FE7C22102AFC541050108811041202 +4A60:50005006FBB8508870882108F93EAB88A888FA882288F93E21002280247E2800 +4A61:28202820FC202BFE382010207D24552455247EAA1020FC501050108811041202 +4A62:5104510EF930512077E02120F93EA964A9A4FF242124F9242124212425442284 +4A63:28202820FC502888390412FA7C20542057FE7C201128FD241222142210A01040 +4A64:280028FCFE84288438FC10847C8454FC54847C8410FCFE50105010921112120E +4A65:5004500EFBB8508870882128F92EABA8A8A8FAA822A8F93E21002280247E2800 +4A66:108020FC6910AA9028602890230C04407FFC044007C001001FF01110FFFE0100 +4A67:28402820FDFE2800380010FC7C00540054FC7C001000FCFC1084108410FC1084 +4A68:280028FCFE8028F8388010F87C8057FE55407D241128FF101108114411821100 +4A69:50405020FBFE520275042100F9DEAA52AA52FB52249AF894211021122212240E +4A6A:28202810FDFE29023A0410F87C88548854F87C801080FCFC1084108410FC1084 +4A6B:500053FEF820502073FE2222FA22AB32AAAAFAAA2376FA6622222222222A2204 +4A6C:28202820FDFE282038FC10407DFE548855247E2210F8FC2011FE102010201020 +4A6D:28202820FDFC2850388811047FFE540855E87D281128FDE81128100810281010 +4A6E:280029F8FC08280839F810087C0857FE54207E221174FCA81124122210A01040 +4A6F:500053FCF8085010702023AEFAA2AAAAAAA4FAA423AAF83220A0204027FE2000 +4A70:280028F8FE88288838F810007DFE548854F87C8810F8FE88109E13E810081008 +4A71:504050A0F910520875F62000FBC4AA54AA54FBD42254FA5423D42244225422C8 +4A72:28402820FDFE2948394811FE7D48557855007DFC1144FD4811281210122814C6 +4A73:28402820FDFE292238A411287C50548855047CF81088FC881050102010D81306 +4A74:2880289EFC9229D23892109E7C9255D255527D5E1152FD5211D21022102A1044 +4A75:28002BFEFE2228203BFE10207DFC552455FC7D2411FCFC2013FE102010201020 +4A76:28202924FD2429FC382011FE7C00542055FC7D241124FDFC1020102413FE1102 +4A77:28202810FDFE2884384811FE7D02562454107DFE1040FC7C1044108410941108 +4A78:28882888FDFE2888380011FE7C88548854F87C8810F8FC88109E11E810081008 +4A79:280028FEFE00287C3844107C7C0054FE54827CAA1092FEFE1092109210921086 +4A7A:50905088F9045242748821FCF804A800ABDEF8422252F94A22522042214A2084 +4A7B:280029FEFD2029FC392011FC7D20552055FE7C0212AAFEAA12AA120210141008 +4A7C:28202A20FD7C28A4381810E67F10557E55107D7C1110FDFE1110111012FE1400 +4A7D:500053FEFA00527C72442244FA7CAA00AAEEFAAA22AAFAAA22EE220023FE2000 +4A7E:50405020FBFE520072482248FBFEAA48AA48FA482278FA002554252A2A2A3000 +4A7F:282029FCFC2028883BFE10887DFC550455FC7D0411FCFD0411FC108811041202 +4A80:282029FEFF0228F8388810F87C8054FC54847CFC1000FE2010541142114A1238 +4A81:28502952FCD4285039FE10887C5055FE54207CFC1020FDFE1050108811041202 +4A82:52085208FFBE520872082FBEFAAAAAAAAAAAFBAE2208FF1C2AAA324822082208 +4A83:51085088FBC8501073DE2264FBD4A814ABD4F8542094F8E82388209422942122 +4A84:28882888FDFC2888388813FE7C2055FC55247DFC1124FDFC1000108811041202 +4A85:280029FCFD54295439FC10807DFE564255F27D521152FDF2104A13FA100A1004 +4A86:285029FCFD5429FC395411FC7C0055FC54007DFC1104FDFC1088105013FE1000 +4A87:28882BFEFC8828243BFE10207DFC552455FC7D2411FCFD24100811FE10881058 +4A88:2810287CFE54297C391010FE7C00577C55447D7C1140FD7C1144117C1280147E +4A89:51245248F924500073FC2294FA64AA94ABFCFA482368FA48236A224A22462362 +4A8A:51105090FBDE5010725E2182FBDEA810ABDEFA5023DEFA5023DE2250225222CE +4A8B:2810287CFE54297C391010FE7C44577C55447D7C1144FD7C112811441280147E +4A8C:51F05210FBFC560473FC2224FBB8AA22A9FEFA1027FCFA4423FC20D0214A263E +4A8D:53DE5252FBDE525273DE2222FAFAAA22AAFAFAAA22FAFAAA22FA227222AA2226 +4A8E:522253FEF89051FE731025FEF910A9FEA910F9FE2100FBFE228A237622522276 +4A8F:101010107E1022FEFF9200927E9242AA7EAA08CA7E82088248827E82088A0884 +4A90:104010207C282408FE0800487C5445527D5211607E60104450C47D44123C1000 +4A91:102010107E1022FEFF8200847E4042447E4808507E60084248427E42083E0800 +4A92:102010107E0022FEFF1000107E1042107E7C08107E10081048107E1008FE0800 +4A93:102010207E202220FF3C00207E2042207EFC08847E84088448847E8408FC0884 +4A94:102810247DFE2420FE2001FC7D2445247DFC11247D2411FC51247D241124110C +4A95:108010807CFE2502FE2200AA7C7244227DFE10227C7210AA51227C22100A1004 +4A96:104010407E7E2280FF7C00447E7C42447E7C08207E3C084448A87E10082808C6 +4A97:100011DC7D442544FF4401DC7D0045007DDC11147D1411D451087D0811141122 +4A98:100010FC7C842484FEFC00847C8444FC7C0011FE7C101090509C7C901150123E +4A99:101410127DFE2410FEFE00927CFE44927CFE10927C0411FE50447C241024100C +4A9A:100011FC7D0425FCFF0401FC7C0047DE7C4212527D4A10C6535A7C42114A1084 +4A9B:101E10F07C922454FEFE00547C9245007CFE10927C9210FE50927C9210FE1082 +4A9C:104010787C8825FEFEA400D27CFE44807CBC10807CBC108050BC7D24113C1224 +4A9D:104411FE7C542448FEFE01907CFE44907CFE10907CFE108051FE7C44103811C6 +4A9E:00003FF80100FFFE028004401830E44E04407C7C04403C7804407C7C0440FFFE +4A9F:100011F8FE88105010207C50558C545055DC545055DC5C5011DC105013FE1000 +4AA0:1640F87C9084FE2832205250968C100004407C7C04403C7804407C7C0440FFFE +4AA1:11201CBE704250947D9034A85C46900004407C7C04403C7804407C7C0440FFFE +4AA2:12201D3E70425094531051287D46145035DC345055DC985011DC105013FE1000 +4AA3:1220113E1042FC94131011287C46545055DC54505DDC305051DC905013FE1000 +4AA4:281E29F02892EE5429FE2854EE92290028FE2892EE9228FE28922E92F0FE4082 +4AA5:10001EFC1044FF2881107E2800C67E2842EE7E2842EE7E2842EE7E2824FE4200 +4AA6:200010007CF8002044202820FE2000207C20442044207C20442044207DFC4400 +4AA7:202010207C2000A044AC28B4FEE401A47CA444B444A87CA244A244827C7E4400 +4AA8:204010407C4000FC44842904FE0400847C44444444447C04440444047C284410 +4AA9:202010207C20005044502888FF4402227C2044F844087C08441044107C204420 +4AAA:10007E7C124422444A7C844401003FF80820FFFE00001FF010101FF010101FF0 +4AAB:200010FE7C00005244A42928FE94004A7C0044FE44107C10441044107DFE4400 +4AAC:202010207DFE0020442029FEFF0202047CF8441044207DFE442044207CA04440 +4AAD:202010107CFE000044442828FEFE00007C7C444444447C7C444444447C7C4444 +4AAE:204010407CFE012244AA28FAFE4200947D4844FE45227EAA44FA44427C944508 +4AAF:08202AA44D28145022887FFE41029FF404407FFC00001FF010101FF010101FF0 +4AB0:2040102079FC0088485033FEFC0001FC790449FC490479FC48204A947A8A4C7A +4AB1:000001FEFC20044005FC050405047DFC410441FC4104450459FC608841040202 +4AB2:000000FEFE10282028FC2884288428FC288428FC28842A844CFC484880840102 +4AB3:000000FE7E10122012FCFF84128412FC7E8412FC1084108420FC204840848102 +4AB4:080008FE08107F20497C08440844147C1444147C14442544267C440080280044 +4AB5:00007EFE0410242024FC248444847FFC0C8414FC1484248444FC844814840902 +4AB6:00007CFE4410442044FC7C84448444FC7C8444FC448444844EFCF04800840102 +4AB7:200020FE40107E2082FC02847A844AFC4A844AFC7A844A8402FC024814840902 +4AB8:00007EFE421042207EFC4884488448FC7E8448FC488448844AFC4A4866844302 +4AB9:00007EFE0810082010FC1484328451FC908410FC108400840EFCF04840840102 +4ABA:100010FE10107E2010FC10841084FEFC108410FC2084288444FCFE4842840102 +4ABB:100010FE20104420FEFC0284248424FC2484FEFC2484248424FC444844848502 +4ABC:100010FE9210922092FC9284FE8410FC108492FC928492849EFCF24800840102 +4ABD:00007CFE4410442044FC7C840084FEFC208440FC7C84048404FC044828841102 +4ABE:0010FF10082810287E44428242087E1042647E08421242647E08243042C08100 +4ABF:080008FE10107F20417C41446544557C4944497C55446544417C7F0041280044 +4AC0:00007EFE421042207EFC428442847EFC408448FC44844A8452FC604840840102 +4AC1:100011FE20207C4045FC45047D0445FC45047DFC4504450445FC7C8845040202 +4AC2:100010FE3E104220A47C18441044247CC8441F7C2144D2440C7C08003028C044 +4AC3:00007F7E401040205E7C404440447F7C5044517C5A445444527C910098281044 +4AC4:440024FE281000207CFC4484448444FC7C8428FC288428842AFC4C4888840102 +4AC5:100008FE7F104120497C084408447F7C0844187C1C442A44497C880008280844 +4AC6:0400053E048804107FBE44224422753E5522553E5522522252BEA680899410A2 +4AC7:0C0030FEC6101820637C0C44F044007C7E44427CFF444244FF7C42004A284444 +4AC8:0800497E491049207F7C08441444227C514488FC08447E44027C040004280844 +4AC9:0C0030FEC210142048FC3084C88414FC2484CCFC14842484C4FC044828841102 +4ACA:0000FEFE08101020347C52449144107C00447E7C42444244427C42007E284244 +4ACB:0C0070FE1010FE2038FC5484928400FC1084FCFC2484448428FC10482884C502 +4ACC:080010FE7F104920497C7F444944497C7F44147C2444FF44047C040004280444 +4ACD:140014FE1410F720147C14441444777C1444147C1444F744147C140014281444 +4ACE:0000F77E11105520227C55448944107C0044F77C11445544227C550089281044 +4ACF:2200227EFF902220227C3E442244227C3E44227C2244FF44007C140022284144 +4AD0:2200227E22102220F7FC22442244667C7744AAFCAA443244227C220022282244 +4AD1:100010FEFE10102028FC4484FE8404FC748454FC5484748454FC044814840902 +4AD2:000006FE781048207F7C48444544537C6144007C7E4442447E7C42007E284244 +4AD3:200010FE7C10002044FC24842884FEFC008400FC7C84448444FC44487C844502 +4AD4:20002F7EF5102520757C2544F544297C2344087C0844FFC4147C2200412880C4 +4AD5:200010FEFE10002044FC2884FE8482FC10847CFC5484548454FC5C4810841102 +4AD6:220022FEFF1022203E7C22443E44227C2244FF7C40445444627C40007E280044 +4AD7:0000777E51105120517C77444044407C7744417C49447544427C420045284944 +4AD8:00007CFE44107C2044FC7C8420847EFC928452FC6A8442847AFC024814840902 +4AD9:080008FE7F1008202A7C2244FFC4227C2A44087C7F441C442A7C490089280844 +4ADA:00003EFE221022203A7C2A442A447F7C41445D7C554455445D7C410045284244 +4ADB:20002F3E210841105FBEC82248224FBE5222423E5FA24222453E448048945022 +4ADC:08002A3E2A08AA90CCBEDDA2FFA2AABEAAA2DDBEFFA299A288BE8F80F0940022 +4ADD:060078FE08100820FF7C1C442A44497CBE44227C22443E44227C22003E282244 +4ADE:440024FE28100020FEFC108410847CFC108410FCFE840084AAFCAA48AA840102 +4ADF:00007CFE441044207CFC0084FE8482FCFE8482FCFE848284FEFC284844848502 +4AE0:180060FE0C1070200CFC70840084FEFC108434FC528490847CFC44487C844502 +4AE1:2200147EFF901420147C7F441544FFFC15447F7C14443644557C948014281444 +4AE2:03007C7E471044205F7C554456445C7C5544537C50445744557C5500A9A80044 +4AE3:0E00F0FE2210922044FC20844484F8FC108424FCFE841084FEFC284844848302 +4AE4:0000FF7E811000207E7C42447E44427C7E44107C0844FF44007C240042288144 +4AE5:080010FE7F104920497C7F44497C49447F7C10441A7C2CA82FC44882480287FE +4AE6:0800083E7F080810083EFFA22022413EFFA240BE00227F22553E55005794FC22 +4AE7:100020FE7C1044207CFC44847C8410FCFE8428FC548492847CFC104810841102 +4AE8:1200123E12087A1013FE7CA210A2FCBE22A23ABE29222922293E4A805A9484A2 +4AE9:1000223E7F08421094BEF7A20822363EC92230BEC4221922623E0C003014C022 +4AEA:100010FEFE101020BAFC5484BA8410FCBA8454FCBA84108428FC244842848102 +4AEB:08007F7E4910FFA0497C7F4408447F7C49447F7C1044FF44217C72000C28F344 +4AEC:0000F7BE2108A510F7BE6322B5A2213E7FA240BE40A27FA240BE40807F9440A2 +4AED:10007CFE54107C2010FCFE8400847CFC44847CFC44847C8444FC7C4828844502 +4AEE:00007F7E01103F20017C7F440044777C2544F77C0244FFC4427C22002A280444 +4AEF:4100211E0FE4F108429E44527FF2505E5752555E55525752555E5040A14C0092 +4AF0:0020F92420A843FEF8A889248A22F9048904F9DE8A448D54F89E010452048C04 +4AF1:00007FBE08087F9054BE54A254A241BE00227FBE08227FA254BE5480549441A2 +4AF2:0280025E7FC442085E1E42925E92571E5D5242DE88520492545E51408F0C0012 +4AF3:00007F7E551055207F7C20447F44917C7D44557C55447D44117C7D0005280244 +4AF4:2200223EF7882210773EAAA22262003E7F22003EFFA20822493E4880A8941022 +4AF5:10007F3E49086510533E49227F22083EFFA2A2BE4922FFA2203E3F0041148322 +4AF6:20802A9EF5E42A8871DE6AB2A4922A9E2092041E04127FD20A1E1100208C4052 +4AF7:0000FFBE0808EB90AABEEBA20822FFBE0822EBBEAAA2EBA2083E0F80F8144022 +4AF8:00007FDE404A434A5C4A444A5F4A554A55525F52446A45445F404922801E0000 +4AF9:00007FC0407E43485C4844485F48554855485F484448457E5F404922801E0000 +4AFA:100011FC1104FD3411C4114421F42954295429F4514455545DF4851602060402 +4AFB:00007FDE405243525C52445E5F52555255525F52445E45405F404922801E0000 +4AFC:00107F1041104D7C711451147D1455FE7D10512855247D4444804042803E0000 +4AFD:00007FC6405843485C4E44585F4E5578554A5F4A444A45465F404922801E0000 +4AFE:00407C2044284C087448545455527D6256607C4454C4553C52007D004482807E +4AFF:001E7FCA404A434A5C5244665F40555E55525F52445E45525F404922801E0000 +4B00:00487C4844884CBE752A55CA544A7C8A54AA7DF25412542A52447D004482807E +4B01:00107F08417E4D42712051247D3855207D225122551E7D0044804042803E0000 +4B02:00287C2444204DFC7520552455247D2855287D105594552C52447D004482807E +4B03:00107F0841004D7C710051447D2455287D28511055FE7D0044804042803E0000 +4B04:00147C1244104DFE7510551455147DD455087D0A551A552652427D004482807E +4B05:00407C4045FC4C847484552856107D0857DE7D4A554A5652525A7DE44482807E +4B06:00447D8444944C9477F4549455947DD456B47C945484549452887D004482807E +4B07:440025FC290401347DC4454445F445547D5429F4294429542BF44D168A060402 +4B08:00007F4441284D00717C51447D44557C7D285128554A7D8644804042803E0000 +4B09:00207C2045FC4C20742057FE54507C5055547D525652549052907D304482807E +4B0A:00107F1041FE4D10715451547DBA55107D28512455427D8044804042803E0000 +4B0B:00207C2044F84C2075FC548855447C7854887D505420545052887D084482807E +4B0C:10001DFC11047D3455C4594471F455544D5441F45D44555457F4951622060402 +4B0D:00807C8044FC4D54765454A455547C8854207C145552554A52387D004482807E +4B0E:00147C1247FE4C10741055D455547D5455CC7C0A54CA571652227D404482807E +4B0F:00207F10417C4D44712851FE7D00557C7D445144557C7D4444804042803E0000 +4B10:00187CE044204DFC747054A855247C4057FE7C8855905470538C7D004482807E +4B11:007C7F54417C4D54717C51007D7C55447D7C5144557C7D4444CC4042803E0000 +4B12:00207DFC45044C507488552454507C8855067CF85408545052207D50448A807E +4B13:00207F1041FE4D44712851FE7D00557C7D44517C55447D7C44804042803E0000 +4B14:00207C5044884D0474F8540055C47D5455D47D5455D4554453547D484482807E +4B15:00007DFC45044D3475C455447DF4555455547DF4554455547DF4491682060402 +4B16:00107F20417C4D44717C51447D7C55007D7C5110557C7D1044FC4042803E0000 +4B17:00007CF844887C9844E87CA800A8FEF840A87EF8AAA82AAA4AAA92FA2A864502 +4B18:00207DFC44004CF8748854F854007DFC55047D7455545574530C7D004482807E +4B19:000E7F7041124D447120517C7D9055107DFE511055547D7C44804042803E0000 +4B1A:00007DFC45204DF8752055F855207DFC54047D545554540452287D104482807E +4B1B:01FC7D2445FC4D2475FC54A854A87FFE54A87CA855FC542053FE7D2044A2807E +4B1C:00407C2045FC4C507524555455FC7C2055FC7D4455545574530C7D004482807E +4B1D:00287F7C41284DFE7110517C7D54557C7D54517C55007D4444824042803E0000 +4B1E:00207DFE44204CFC740055FE54027CF854207DFE540455DE53547DCC4482807E +4B1F:00827D7A452A4DAA754A559A55427CA255F27C4A55F2555252E67DF84482807E +4B20:00003FF801007FFE41029D7401001D7000047FE808247212120EFFD0122A221E +4B21:02003FD00260FFFE1C10EFF008100FF000047FE808247212120EFFD0122A221E +4B22:0800080014FC122429247E24A2243E2422243E242024284424442A8433282210 +4B23:082008201420127E29407E80A23C3E0422083E102020284024422A42323E2000 +4B24:00003FFC200420043FFC208023602C9837F6241027F0241027F4446845188604 +4B25:04200210013EFFC00022011A02860D603FF8C8260FE008200FE808D00A300C08 +4B26:080008781448124829487E86A3003EFC22443E442028282824102A2832442182 +4B27:0800080014FC120029007E00A3FE3E5022503E502050285024522A92328E2100 +4B28:10801080288025FE5202FC8244827DE244A27CA2412A512A4A1A540264144008 +4B29:00007FFC010003600D18710402800D603FF8C8260FE008200FE808D00A300C08 +4B2A:0800080014FE121029107E20A2203E6822643EA22122282024202A2032202020 +4B2B:0804081E14F0129029907E90A2903EFE22903E9020902888248A2AAA32D6208A +4B2C:10201020282025FC5324FD2445247D2445247FFE402050504850548865044202 +4B2D:00007DFC444444447C94010802800D603FF8C8260FE008200FE808D00A300C08 +4B2E:10081048292825285328FD0845087D0845087D08414851944914542264424082 +4B2F:0810081014101210291E7E10A2103E1022FE3E822082288224822A8232FE2082 +4B30:080008FE1422122229227E22A24A3E4422803E7E2042284224422A42327E2042 +4B31:102010202820242053FEFC7044A87CA845247D24422250F84820542064204020 +4B32:08400840148012FC29047E04A2F43E9422943E9420F4289424042A0432282010 +4B33:10201020292424A452A8FC2045FC7C2044207C2043FE50204820542064204020 +4B34:10201020282025FE5220FC2044207DFC44707CA840A851244924562264204020 +4B35:10201010281025FE5220FC2444447CF844127C22404451884810542864444182 +4B36:080008FC1484128429FC7E84A2843EFC22A23EA42098289024882AA432C22080 +4B37:08200820147C128429487E30A2203E4823903E3E204229A424182A1032602180 +4B38:7F7C08041E282210542809443280CD603FF8C8260FE008200FE808D00A300C08 +4B39:100011FE282024205248FC8445FE7C2244207C2041FC50204820542067FE4000 +4B3A:110410842888240053FEFC2044207DFC44207C2043FE50204820542064204020 +4B3B:10281024283E25E05220FC3C45E07C20443E7DE0402250244818546A65864002 +4B3C:0800087C14441244297C7E00A2FE3E8222823EFE2082288224FE2A82328A2084 +4B3D:088408441448120029FC7E84A2843E8422FC3E482048284824482A8A328A2106 +4B3E:10881048285025FC5224FC2445FC7D2045207DFE40225022486A54A465204020 +4B3F:100011FC2904250453FCFD00451C7D70451C7D70411E51F0491055126512420E +4B40:100010782A2825285128F82848787B284928792A412A512649225A806C7E4000 +4B41:100CFEF010801CFEF088110832880D603FF8C8260FE008200FE808D00A300C08 +4B42:100010F82888248852F8FC0045FC7D2445247D2441FC510049005502650240FE +4B43:10201020285024885144FA2249F878084850782040A452824A8A5A8A6C784000 +4B44:102010202BFE242053FCFD2445FC7C2045FC7C2443FE502449FC542064A04040 +4B45:100011FC290425245324FDFC45247D2445747D54415451744904550465FC4104 +4B46:7F2048307E2842247E2049207E800D603FF8C8260FE008200FE808D00A300C08 +4B47:1080108028FC25045244FC4447FC7C4445F47C0441F4511449F4540464284010 +4B48:10101010287C271451FEF9144A7C7A104F7C791041FE55104A10530064FE4800 +4B49:1020102028FE244052FCFD1046FE7C0044FC7C8440FC508448FC548464944088 +4B4A:108810882BFE248852A8FC2045FC7D2445247D2443FE50204850548865044202 +4B4B:1100117C294426445244FE7C4A107A104AFE7A38425452544A945B126A104210 +4B4C:107CFF44107C7E44427C7F44028C0D603FF8C8260FE008200FE808D00A300C08 +4B4D:1020102029FC24205220FCF844207C2045FC7C0041FC51544954555467FE4000 +4B4E:10481148294827FE5148F9484978790049FE782043FE507048A859246E224020 +4B4F:1040102029FE25025102F9FE4900790049FE79AA41AA52FE4AAA5AAA6CA24086 +4B50:11041088280027FE5020F82049FC782048207BFE404050244AA25A8A6C884078 +4B51:10881050280025FE5250FDFC44547DFE44547DFC405050D84954565264504050 +4B52:1010102028FC248452FCFC8444FC7C8444FC7C20401050544942554A66384000 +4B53:102011242924252453FCFC0047FE7C0045FC7D04410451FC4888545067FE4000 +4B54:10101220297C25445044F87C4B407940497C79444144517C49445A806C7E4000 +4B55:100CFEF054807CFE5488FF0812880D603FF8C8260FE008200FE808D00A300C08 +4B56:1040102029FE25005148F94849FE794849487948417851004AD452AA652A4800 +4B57:1040102029FC24885050FBFE480079FC490479FC410451FC489058926912460E +4B58:100011FC290425FC5104F9FC48207BFE480079FC410451FC482059246A224060 +4B59:100013DE288826A853FEF9884ADA7CA649F87908410851F84908590869F84108 +4B5A:102011FC2888245053FEFC0045FC7D2445FC7D2441FC502049FC542067FE4000 +4B5B:100813882888251057DEFA944AA47B944A947B94429452C84B885E9468A440C2 +4B5C:1020102029FC24205354FC8845047EFA44887CF8408850F8482054A865244060 +4B5D:10201050288825745202FDFC45247DAC45247DFC400050F8488854F8648840F8 +4B5E:100011FC295425FC5220FDFC44207FFE44887C5041FC50204BFE542064204020 +4B5F:108813FE288824005148FBFE49487978490079FC402053FE487058A86B264020 +4B60:102013FE2A88265053FEFA504AFC7A544BFE7A5442FC52504AD8555466524850 +4B61:103C13C0294424A451F8F8204BFC780049F8780841F8500849F85AC46AAA447A +4B62:104010202BFE26225154F94A4A3A780049FC795443FE500049FC582068A04040 +4B63:104010202BFE24885052FFAC4AAA7AA84DAC7800410451FC490459FC69044204 +4B64:1010107C2A54257C5110F8FE48007B7C4944797C4140517C4944597C6A80447E +4B65:110810902BFC244051F8F8804BFC794849FC7B0A45F8510849FA5934698C4102 +4B66:108813FE2888241252FEF8104CFE7A924AFE789241FE52924E045AFE6A44422C +4B67:102013FE2A4827FE5248FAEC4B5A7A484A207A44427852144AFE5A106A5444B2 +4B68:122213FE289025FE5310FDFE491079FE491079FE410053FE4A8A5B766A524276 +4B69:102013FE2A4827FE5248FAEC4B5A7A484A507BDE425053DC4A5055DE64504850 +4B6A:200021FC21043DFC45044BFE800021FC212421FC212425FC282031FC202003FE +4B6B:4084444859FE6020424042FC3E8400847CFC448444847CFC448444847CFC4484 +4B6C:4092452459246092420042FE3E1000207CFC448444FC7C8444FC44847CFC4484 +4B6D:440028FEFE10102020FC7C84448444FC7C8444FC44847C8444FC44487C844502 +4B6E:3F042018FF62220C7F7010100820FFFE02003FF820083FF820083FF820083FF8 +4B6F:042078201124FF241124392455FC90207C20452445247D24452445247DFC4404 +4B70:0420782011FCFE4010F8384057FE90887D24462244F87C2045FC44207C204420 +4B71:0420792410A4FEA8102039FC552491247D7445AC45247D24452445047D144508 +4B72:0420782011FCFE501088390457FE90087DE8452845287DE8452844087C284410 +4B73:7C4011FCFD2439FC5524FDFC24681BA2651E7FF809203FF8C8260FE008200FE0 +4B74:00001FF811001FF011001FF011001FFC0004292444940108FFFE010001000100 +4B75:00007E7848487E4848487E48486848587E580248AA48AA4AAA4A828A14860900 +4B76:00007EFE48487E4848487E48484848487E480248AA48AA48AA88828815080A08 +4B77:00087F1C48707F1048107F1C487048107F90009EAAF0AA90AA9280920512020E +4B78:00107E8848847E8449027E02488848887E880250AA50AA20AA50828815040A02 +4B79:00007C40519E7D1251127D12511251127D120512555A55945510841014100810 +4B7A:00207E1048107EFE48007E00487848487E480248AA48AA4AAA4A828A14860900 +4B7B:00107E5048507E5048887E8849044AFA7E480248AA48AA48AA88828815280A10 +4B7C:00007F3C48007F0048007F7E482448247FA400A4AAA4AAA4AAA480A405440284 +4B7D:00087F2848287F28483E7F28484848087F8800FEAA88AA88AA88808805080208 +4B7E:00207E2848247E2448207E2048FC48207E200250AA50AA50AA88828815040A02 +4B7F:00107E1048507E50487C7E90491048107EFE0210AA28AA28AA28824414440882 +4B80:00407E4048FC7E8449047EF4489448947EF40284AA94AA88AA828282147E0800 +4B81:00207E2048407E4848847EFC480448487E4802FEAA48AA48AA48828814880908 +4B82:00287E2448247E2048FE7E204820483C7E340254AA54AA54AA88828815140822 +4B83:00107E1048107E7E48107E10481048FE7E100210AA20AA28AA4482FE14420800 +4B84:00107F0848087F7E48107F10482448247FB80088AA90AA90AAA480BE05020200 +4B85:00147E1248127E1048FE7E90489248927E920294AA94AAB4AACA828A14160822 +4B86:00007EFE48087E1048347E52489048107E000210AA10AAFEAA10821014100810 +4B87:00207E2048FC7E2449FE7E2448FC48207E2002FCAA20AA20ABFE822014200820 +4B88:00107F10481E7F2248547F08481048647F88009EAAA2AAC2AA94808805100260 +4B89:00407E40487E7E8049007E1C48E048A07EA202A4AAA8AA90AA9082A814C40882 +4B8A:00207C2051FE7C2051FC7C2451FC51207DFE0422542A54545450848815040A02 +4B8B:00027C0253E27C8A508A7CEA50AA512A7DAA056A564A544A54828482150A0A04 +4B8C:0090F890A090F910A1FEFB10A510A138F9380954A954A992A910891009103110 +4B8D:3FF821003FF021003FF021003FFC492486940108FFFE048808503A20CC180806 +4B8E:00C27C3450187C6451827C2051FE50507C9005FE56925492549A849414100810 +4B8F:00007EFE48107E10487C7E24482448FE7E000200AA7CAA44AA448244147C0844 +4B90:00007EFE48827E8248AA7EC6488248BA7EAA02AAAABAAAAAAA828282148A0884 +4B91:00047E1E48E07E12488A7E4C484048087EFE0208AA88AA48AA28820814280810 +4B92:00147E1248FE7E1048107EFE489248927EFE0292AA92AAFEAA92829214920886 +4B93:00207E20483E7E2048FC7E8448FC48847EFC02A4AA20ABFEAA20822014200820 +4B94:00047E1E48F07E1048FE7E54485448547EFE0254AA54AAFEAA10821014FE0800 +4B95:0000FBDEA042F94AA084F94AA252A420F8000BDEA852A952A89489480A543422 +4B96:007C7E4448447E7C48447E44487C48007EFE0282AA82AAFEAA82828214FE0882 +4B97:00107E9248927E9248FE7E0048FE48807EBE0288AA88AAFEAA88830815080A08 +4B98:00007E2048CE7E8248827EEE488248827EFE0228AA28AA28AA48824A148A0906 +4B99:00087E0C480A7E0849FE7E08480848EA7EAA02AAAAECAA0CAA2A82CA14160822 +4B9A:00107E10487E7E1048107EFE482448427E90023CAA44AAA4AA288210142808C6 +4B9B:0014FB94A294FAA4A2BEFAA4A364A2B4FAAC0AACAAA4AAA4AB248A240A24322C +4B9C:00147E5448547EFE48547E54485C48407E7E0210AAFEAA10AA38825414920810 +4B9D:00007EFE48927E1048FE7E10487C48547E7C0254AA7CAA10AAFE821014100810 +4B9E:00207E2049FE7E2048FC7E4049FE48887F0402FAAA88AA88AAF88288148808F8 +4B9F:00407C2051FE7D2250A47D28505050887D0404F8548854885450842014D80B06 +4BA0:00007EFE48007E7C48447E44487C48007EFE0292AA92AAFEAA92829214FE0882 +4BA1:00407E40487E7E80487C7E44487C48447E7C0220AA3CAA44AAA88210142808C6 +4BA2:00047E1E48F07E1048107EFE481048507E960292AA92AAD6AA92829214FE0882 +4BA3:00007EFC48447E3848447EEE48AA48447EAA0210AAFEAA38AA54829214100810 +4BA4:00207E2049FE7F5248487EFE489049907EFE0290AA90AAFEAA90829014FE0880 +4BA5:00007EFE48007E7C48447E7C480048FE7E8202AAAA92AAFEAA92829214920886 +4BA6:00207E1048FE7E00487C7E44487C48007EFE0282AABAAAAAAABA8282148A0884 +4BA7:101010281044FE8211FE7C9044FC7C9044FC7C9010FEFE0212AA12AA14141008 +4BA8:00207E1048FE7EA248107EFE484448287EFE0210AA10AA7CAA10821014100810 +4BA9:00007E7C48447E7448547EFE4882487C7E44027CAA44AA7CAA44824414540848 +4BAA:00847C8450DE7D4451547EDE504450847D24042055FE547054A8852416220820 +4BAB:0020F9FCA124FBFEA124F9FCA020A1FCF92409FCA840ABFEA88889D00870338C +4BAC:00487E4849FE7E4848007EFC488448FC7E8402FCAA20ABFEAA20825014880906 +4BAD:000E7EF048227E9248447EFE488248FE7E8202FEAA82AAFEAA288248148A0906 +4BAE:00207C2053FE7CA850A87D74522250707CA80546567854885550842014500980 +4BAF:0088F888A088FBD0A09EFBE4A094A7D4F91409D4A954A948A9488A540AD43422 +4BB0:00207E1048FE7E4448287EFE488248927EFE0292AABAAAAAAAAA82BA14820886 +4BB1:0000FA7EA110F930A04AF89AA62CA24CFA9A0A2AAA4AAA88AA288D1008FE3000 +4BB2:00287E28487C7E2848287EFE4810487C7E54027CAA54AA7CAA00822814440882 +4BB3:003CFBE0A124F8A8A3FEF8A8A124A202F9FC0924A924A9FCA924892409FC3104 +4BB4:00107ED448487F4A48847E84497A48007EFC0284AAFCAA00AA84824815FE0800 +4BB5:00207DFC50887C5053FE7C0051FC51247DFC052455FC542055FC842017FE0800 +4BB6:00507E4848FE7F9048FC7E9048FC48907EFE0280AA10AAFEAA38825414920810 +4BB7:00007EFE48AA7EAA48FE7E4048FE49227EFA02AAAAAAAAFAAA2282FA140A0804 +4BB8:0A803138228838382288393822887FFE51029FF411001FF011001FFC2A44492C +4BB9:0020F93CA120FBFEA010F814A3FEA210FBF00A54AA54AAD4AB688C4A08963322 +4BBA:0040F820A3FEF888A052FFACA2AAA2A8FDAC0800A904A9FCA90489FC09043204 +4BBB:0020FBFEA020F9FCA000FBFEA002A1FCF8200BFEA800ABFEA8048BBE0AA4338C +4BBC:00127E5448A87E4448927E54489848247EC20284AAEEAB24AAB4825E14440884 +4BBD:0040F820A3FEFA50A3FEFA52A3FEA200FA940AD8AA90AAD2AA8E8C000954322A +4BBE:0110F890A3DEF810A25EF982A3DEA010FBDE0A50ABDEAA50ABDE8A500A5232CE +4BBF:0020FBFEA24AF9FEA048F9FEA048A3FEF88409FEAA84A8FCA920893C0AA0347E +4BC0:03FCF908A1F8F908A1F8F90EA7F8A008FFFE0A94AB9CAA94AB9C8AD60FBC3084 +4BC1:00400FFEF200A3F8F000A7F8F408A7F8F2201D5C57F4BC9495DC1C9657F62CA2 +4BC2:3FF821003FF021003FF892487EFC48907EFC48907EFEAAAA0100FFFE0920711C +4BC3:0040F82008204BFE4A024C4448407FFE048804881D08E4D04420045028881304 +4BC4:0000F8FC08844884488448FC48207C2005FE05221D52E58A450A0502290A1104 +4BC5:0000F1FE108450FC508450FC50867BFC08040BDE3852C952089409482A541422 +4BC6:00207F20412079204920FFA080A07F2041207F2041207F2241224122451E4200 +4BC7:00207C204420742054FCFE2482247C2444247C4444447C444484448455284A10 +4BC8:00007CFC440074005400FEFE82507C5044507C5044507C5244524492548E4900 +4BC9:00407C404440747C5444FE8882A07D2044207C5044507C484488448455044A02 +4BCA:00007C0045FE74045404FEF482947C9444947C9444F47C944404440454144808 +4BCB:00507C484448744055FEFE4082407C7C44A47CA444A87D284510462854444882 +4BCC:00007CFE4482748254FEFEA082A07CA044F87CA844A87CA84528452A564A4886 +4BCD:00207C20445074505488FF2482127C1045FC7C0444087C884450442054104810 +4BCE:00207C20445074505488FF0482FA7C2044207C2045FC7C204420442054204820 +4BCF:00047C1E44F074105410FEFE82107C1044107CFE44827C824482448254FE4882 +4BD0:00107C10441074FE5492FE9282AA7CC644927C9244AA7CC644824482548A4884 +4BD1:00207C20452474A454A8FE2083FE7C5044507C5044507C5244524492548E4900 +4BD2:00207C20444E74805520FE20825E7CC445447C4444447C444444444454544848 +4BD3:00207C2044FC74205420FE2083FE7C0044207C2044FC7C204420442055FE4800 +4BD4:00207C1045FE75025400FE1C82E07C2044207C3E45E07C2044224422541E4800 +4BD5:00007C0645D874485448FE88829E7DC844487D4845487C9E44804540563E4C00 +4BD6:00207C1044FC74845484FEFC82847C8444FC7CA244A47C984490448854C44882 +4BD7:01107D12451475D85510FF1283527D8E45207C2045FC7C204420442057FE4800 +4BD8:00207C1045FE75025604FEF882007C0045FE7C5044507C5044924492550E4A00 +4BD9:00147C1244FE74105410FEFE82927C9244FE7C9244927CFE4492449254924886 +4BDA:00207C4444F874105424FEFE82027CFC44847CFC44847CFC4484448454944888 +4BDB:00407C2045FC75045480FE9C82D47D5445547D5446D87C504494449455144A0C +4BDC:00007CFC4484748454FCFE8482847CFC44407CFE452A7E4A44924522544A4884 +4BDD:00207C2044FE744054FCFF1082FE7C0044FC7C8444FC7C8444FC448454944888 +4BDE:00007CF84488748854E8FEA882A87DFC45047D7445547D544574450455144908 +4BDF:00007C844448740055FEFE2082447DA844307C5845987C344452459054504820 +4BE0:00007CF84488748854F8FE8882887CF844007DFC45547D544554455457FE4800 +4BE1:00887C50440075FE5450FFFC82547DFE44547DFC44507CD84554465254504850 +4BE2:00803FFE24103F7C26382D5437FA220823C822482FFE2A0A23F8420842288210 +4BE3:00207DFC452475FC5420FFFE82007DFC45047DFC45047DFC450445FC54884904 +4BE4:00107C28444474BA5500FEFE82927CD644927CFE44007C7C4444447C5444487C +4BE5:00007CFE448274FE5482FEFE82447CAA44EE7C4444AA7CEE440044D454AA492A +4BE6:00247CFE4424740054FEFEAA82AA7CFE44147CFE44907CD244AC44AA54964922 +4BE7:01007FFC00001FF010101FF000007FFE40029FF4101017D0145017D010101030 +4BE8:0100FFFE00001FF010101FF000007FFC40044FE448244FEC0200FFFE1830E00E +4BE9:0100FFFE00001FF010107FFC40044FE448244FEC00003FF821083FF820021FFE +4BEA:200011FEFE1000207CFC44847C8400FCFE8482FCBA84AA84AAFCBA4882848702 +4BEB:00207C1045FE7C0044FC7C8410FCFE0001FE7D02457A7D4A117A5502930A3104 +4BEC:1000FEEE44AA7CAA00EEFE00AA7CBA54827CFE54447C7C1010FEFE1010101010 +4BED:3E0420183E6020043E182062FF0422187F6000003FF00820044003801C70E00E +4BEE:3E0420183E6020043E182062FF0422187F6000003FE00420047C08043014C008 +4BEF:3E0420183E6020043E182062FF0422187F60010011102108416403801C00E000 +4BF0:3E0420183E6020043E182062FF0422187F60028004401C70E44E044008401040 +4BF1:3E0420183E6020043E182062FF0422187F6000007FFC01000770190CE1020100 +4BF2:3E0420183E6020043E182062FF0422187F6000003FF821083FF8200220021FFE +4BF3:3E0420183E6020043E182062FF0422187F60044008203218C44608201FF00810 +4BF4:3F0820303EC42018FF62220C7F7000000FE01020601C1FE0082004C00780F87E +4BF5:3E0420183E6020043E182062FF0422187F6001003FF801000820FFFE08201020 +4BF6:3F0820303EC42018FF62220C7F7000001FF010101FF010101FF01010FFFE0000 +4BF7:3E0420183E6020043E182062FF0422187F600090FFFE10887E50102420D4C70C +4BF8:3E0420183E6020043E182062FF0422187F60410021FC0A441048E0A021182606 +4BF9:3F042018FF62220C7F7000003FF000101FF000107FFE40029FF4082007C0F83E +4BFA:3F042018FF62220C7F7000183FE021003FFC20802C64301C1FF0101010101FF0 +4BFB:3F0820303EC42018FF62220C7F7011001FF82100FFFE00001FF010101FF01010 +4BFC:3E0420183E6020043E182062FF0422187F601400082014A46CA8155064881906 +4BFD:3F0820303EC42018FF62220C7F7001003FF80440FFFE00001FF010101FF01010 +4BFE:3F042018FF62220C7F7000003FF8210827C821082FE8200827C8444847C88018 +4BFF:3E0420183E6020043E182062FF0422187F6001003FF80820145001007FFC0100 +4C00:3F042018FF62220C7F7000001FF00100FFFE0920711C0200FFFE082007C07838 +4C01:3F042018FF62220C7F7000003FF000101FF00010FFFE111009A005401930E30E +4C02:3F0820303EC42018FF62220C7F7000183FE0121009207FFC05401930E10E0100 +4C03:3E0420183E6020043E182062FF0422187F60082004407FFC044024481450FFFE +4C04:3F0820303EC42018FF62220C7F7000003FF821083FF821083FF84904489287F2 +4C05:3F042018FF62220C7F7000007FFC02001FF010101FF010101FF010101FF00820 +4C06:3F042018FF62220C7F7000001FF0022001407FFC188462880100FFFE0920711C +4C07:3F042018FF62220C7F7002001FD00220FFFE03000FF03810CFF008100FF00810 +4C08:3F042018FF62220C7F70082004407FFC01003FF80200FFFE080037F0C0801FFC +4C09:3F042018FF62220C7F70000010783E4822482A86FF7822482A2842104A2884C6 +4C0A:3F042018FF62220C7F700110FFFE21083FF821083FF821080020FFFE08200460 +4C0B:3F042018FF62220C7F7000001FF010101FF010107FFC44043FF8082007C07838 +4C0C:3E0420183E6020043E182062FF0422187F60108821544A22113C312052A0147E +4C0D:3F042018FF62220C7F7001007FFC09103108C6C41930E92E05C0193061080300 +4C0E:3F042018FF62220C7F7001001FF011101FF00100FFFE10101FF010101FF00820 +4C0F:3F042018FF62220C7F7008287F240820FFFE12203FA46424BF2824123FAA2046 +4C10:3F042018FF62220C7F7024203F3E21403F5024883F0800003FF824482448FFFE +4C11:3F042018FF62220C7F7000003FF801007FFE492285147FFC02003FF824482458 +4C12:3F042018FF62220C7F7008207FFC08207FFE40029FF40600192006C038A00318 +4C13:3F042018FF62220C7F7002001FF014901250FFFE92122FE8440407E008203060 +4C14:3F042018FF62220C7F7008003E7822482A867E7822482A30464C3FF82448FFFE +4C15:3F042018FF62220C7F7001FC01003FFE210221F02F0420FC20004FFC4914BFFE +4C16:3F042018FF62220C7F7028503E7C4890FEFE1528264A5FF6149012501FF00820 +4C17:BEFA8822BEFA8822BEFA84028782888297C284428FE289228FE289228F1281F6 +4C18:BEFA8822BEFA8822BEFA8002BEFA924A8A2A934A82828C62B19A860280729F86 +4C19:0010FE1000107CFE44107C1000FCFE448244AA449228FE289210922892448682 +4C1A:0020FE1000107CFE44447C440044FE448244AA289228FE109210922892448682 +4C1B:0000FE0001FE7C4044407C780048FE488268AA989298FE88928A92AA92CA8686 +4C1C:0000EFEE200227C22442E7CE80088FE88828EAAE29222FE229222922A92A4864 +4C1D:0044FE2400287CFE44927CD600BAFE9282FEAA00927CFE44927C9244927C8644 +4C1E:713C17C4719C47F0725C17C45A5423C8FFFE00001FF010107FFC44445FF4410C +4C1F:3FF80000FFFE082010103FF802081FF011101FF012101FF004A808BA3082C07E +4C20:081010107F10497C49547F54497C49547F54107C1A102C902F904810480287FE +4C21:080810087F284928493E7F48490849087F7E10081A082C942F924820484287FE +4C22:102020407C8E550054207C5E54C455447C4410442A442D544F48480287FE0000 +4C23:100021FC7D04550455AC7D54555455547D5411AC2B042D144F08480287FE0000 +4C24:10201040FDFC11247D2455FC7D2455247DFC1040386854B292BE11201122121E +4C25:00507FFC00403E4822503E2000547FFC11141FF012101FF004A808BA3082C07E +4C26:080010087F10497E494A7F7E4952497E7F2810481A7E2C882F884808480287FE +4C27:1020203C7C2054FE54A27CB854E4549C7C8010B82AA82D2A4F464A0287FE0000 +4C28:100021FC7D2455FC55007D7C5544557C7D44117C2A442D7C4F00480287FE0000 +4C29:102010407DFC12941494FFFC10A420A47EFCA22022443E6A226E22A03EA2231E +4C2A:1020924054FCAA94449482FC7CA444A444FC7C204444446A7C6E44A044A24D1E +4C2B:1010207C7C1054FE54447CEE544454EE7C0010FE2A282D2A4F46488287FE0000 +4C2C:10FC20287C1055FE54527C9055FE54AA7CC610BA2AAA2DBA4F84480287FE0000 +4C2D:0020FE4010FCFE94AA94AAFCAAA486A400FCFE201044FE6AAA6EAAA0AAA2871E +4C2E:208843FEF820A9FCA820FBFEA854A992F89023FE209054D45B8A5E9651A28FFE +4C2F:1100215C7D84555854C87D3E55CA56A87DEC10A82B682D5E4F80480287FE0000 +4C30:00207C4010FCFE94929454FC10A454A400FCFE201044FE6AAA6EAAA0AAA2871E +4C31:0020FE4010FCFE94929454FC00A4EEA4AAFCEE200044FE6A546EBAA010A2FF1E +4C32:102010203E20422084207F20492049207F20492049207F22002255224A9E8A80 +4C33:200020007CFE441088107E10521052107E10521052107E100010AA10AA500020 +4C34:20402040788048FC91007E0054F854087C10542054407C800084AA84AA7C0000 +4C35:200021FC7C04440888107E20522053FE7E20522052207E200020AA20AAA00040 +4C36:202020107C10440089FE7E40524052407E40524052407E400040AA40AA7E0000 +4C37:20202020782049FE90207C20542054FC7C20542054207DFE0020AA20AA200020 +4C38:200820487848484890447C8454A455227C20544054407C480084ABFEAA820000 +4C39:202820247C244420882E7EF0522052247E24522852287E100032AA4AAB860002 +4C3A:2004200E7C70444088407E40527E52487E48524852487E480048AA88AA880108 +4C3B:102010203E20423E84447F44494449A47F28492849107F10002855284AC48A82 +4C3C:202020207820485090507C88554456227C2054F854087C080010AA10AA200020 +4C3D:2020202078204BFE90207C2055FC55247D24552455247D340128AA20AA200020 +4C3E:2000200078FC48A490A47CA454A454A47CFC548054807C800082AA82AA7E0000 +4C3F:20402040787E488091207CA054AC54B47DE454A454B47CA800A2AA82AA7E0000 +4C40:20202020782048FC90A47CA454A454A47CA455FE54207C500050AA88AB040202 +4C41:2020202078204BFE90507C50548855247E22542055FC7C200020AA20AA200020 +4C42:201020507850489090FC7D5455D454947C94551455547DD40054AA24AA340048 +4C43:201020107C504450887C7E90531052107EFE521052287E280028AA44AA440082 +4C44:2008201C79F0495091507D50555055507D50554855487D680154AA74AA520400 +4C45:2020202078204BFE90207C20542055FC7C7054A854A87D240124AA22AA200020 +4C46:200021FC78444848908E7C82557A56147C20542057FE7C200020AA20AAA00040 +4C47:200020007CFC448488847E8452FC52847E84528452FC7E840000AA00ABFE0000 +4C48:200020FC7800480090007DFC542054207CA854A455247D220222AA20AAA00040 +4C49:200020F87888488890887CF8548854887C8854F854887C880088AA88ABFE0000 +4C4A:20202020792448A490A87C20542057FE7C7054A854A87D240124AA22AA200020 +4C4B:204820487848484891FE7C48544854487C4855FE54007C480044AA84AA820102 +4C4C:200020FE7C90449088907EBC52A452A47EA452A452BC7E900090AA90AAFE0000 +4C4D:200021FE7840484090407C78548854A87C98550855487C300010AA10ABFE0000 +4C4E:200021FE7800480090FC7C84548454FC7C84548454FC7C840000AA00ABFE0000 +4C4F:200021FE7800480090FC7C84548454847CFC540054847C440048AA00ABFE0000 +4C50:2008203C79C0480491447CA8540055F87C10542057FE7C200020AA20AAA00040 +4C51:2080208C78B048A093E07CA054BE54E87CA857A854A87CA800A8AAA8AAC80188 +4C52:2000207C7C444444887C7E0052FE52927E92529252FE7E800080AA82AA82007E +4C53:2000200679D8484890487C88549E55C87C48554855487C9E0080AB40AA3E0400 +4C54:2088208878884910915E7D64575455547D54555455547D480148AB54AB140122 +4C55:2080208078FE490092FC7C8454A454947DFE548455247D1401FEAA04AA280010 +4C56:200020FE7C28442888287EEE52AA52AA7EAA52AA52EE7E280028AA28AA480088 +4C57:08000F7C28447F28A11016283846CFE010403FF051101FF011101FF024884244 +4C58:03043C2404247FA416242504440C0FE010403FF051101FF011101FF024884244 +4C59:20802080789C48F490947C9457F454147C94549455C87EA80088AA94AA9401A2 +4C5A:200021F87808480890F87C08540855FC7C20552454A87C7000A8AB24AAA20040 +4C5B:20142012781049FE90107C1055D255527D52555455D47C0800CAAB1AAA260042 +4C5C:20482048784849FE90487C4855FE54007CFC548454847CFC0084AA84AAFC0084 +4C5D:2020204078FE489290927CFE549254A27CFE544854887DFE0008AA08AA080008 +4C5E:2020202079FE485090887D0456FA54007C0055FE54207CA400A2AB22AA200060 +4C5F:200020FE7C82448288FE7E88528852FE7E88528852BE7EA200A2AAA2AABE0122 +4C60:20482044785E49E090287C12546A55967C48545E55E07C240028AA12AA6A0186 +4C61:2080208078FE490292227CAA547254227DFE542254727CAA0122AA22AA0A0004 +4C62:2080208078F8490892107DFC542454247DFE542454247DFC0024AA20AAA00040 +4C63:2040202079FE480090887C88555456227C00542055FE7C200020AA20AA200020 +4C64:20402040787C488491087E00542054CE7C82548254EE7C820082AA82AAFE0082 +4C65:24043FA44424FFA404243F8424942FE810403FF051101FF011101FF024884244 +4C66:20502048788048FE91907E9054FC54907C9054FC54907C900090AAFEAA800080 +4C67:2020212478A8482091FC7C4057FE54887D0456FA54887C8800A8AA92AA82007E +4C68:2082208273E2908A208AFBEAAAAAAAAAFAAAAAEAA88AF9CA02A2AC82A88A0084 +4C69:200020FE7C8244C688AA7EFE52A252927EFE52A252A27EBA0082AA82AA8A0084 +4C6A:2010201079FE481090107CFE541054107DFE542054527CD40148AA44AA620040 +4C6B:04047FC404243FA424A43FA4150424944FE810403FF051101FF011101FF02488 +4C6C:200021FE78124890909C7C90557E56007CFC548454FC7C8400FCAA84AA940088 +4C6D:208020FE7890489090D07CBC559456947CAC54A454B47C880088AA88AAFE0080 +4C6E:2080209E73EA908A21CAF88AABEAA892F8A6A820ABFEF8200050A888A9040602 +4C6F:7E20243E1848FFA829104A2898460FE010403FF051101FF011101FF024884244 +4C70:2008203C79E0482093FE7C2055FC55247DFC552455FC7C2001FCAA20ABFE0000 +4C71:202020107CFE440088447E2852FE52827E10527C52547E540054AA5CAA100010 +4C72:2040207C788448F890087DFE544054A47D38545854947D340054AA92AB500020 +4C73:200021FE7900497C91547D54557C55547D54557C55107D10017CAA10AA1004FE +4C74:2040205E78404860915E7D525552555E7C52545254527C5E0052AA40AA5E0040 +4C75:205020887924484090907DF8540854007DDC544455547CCC0154AA44AA5400C8 +4C76:2100209E79D2495491547DD8555455527DD25512559A7D5401D0AB50AA100010 +4C77:0F1008107F9048A04E3E79444F2451245F2475285F2855105F284028AAC40082 +4C78:20A0212C7924492491AC7D24552455FC7C2055FC54887C500020AA50AA880306 +4C79:204420247C2844FE88107E7C521052FE7E205220527C7E500090AB10AAFE0000 +4C7A:202021247924492491FC7C0057FE54007DFC550455047DFC0088AA50ABFE0000 +4C7B:2000207C7C44447488547EFE5282527C7E44527C52447E7C0044AA44AA540048 +4C7C:200021FE7902490291FE7D245524557E7D24552455FE7D520154AA48AA640442 +4C7D:202020207850484890A47DFE568454FC7C8454FC54807CFC0144AB44AA7C0044 +4C7E:202021FC79244BFE91247DFC542055FC7D2455FC54407DFE0088ABD0AA70038C +4C7F:21002102711C97D02110FFD0AD5EAFD4FD54AFD4A914FFD40114A924A9240144 +4C80:08207E2008F8FF2814287F6A082A0FE610423FF051101FF011101FF024884244 +4C81:200423E47224922423EEFA04AAE4AA04FA0CABF4AA44FA640554AD44AA5400C8 +4C82:22102110711097BE2240FA00ABBEAA8AFA88AAA8AAAEFAA804A8ADA8A85E1080 +4C83:209221247892480090FE7C9254FE54927CFE541055FE7C380054AA92AB100010 +4C84:2208220873C8921027DEFA54AB64AAD4FFF4AA54AD54FCC807C8A854AAA40142 +4C85:2100213C712493A4213CF924A924ABBCF924A924A93CF92802A8AACAAC4A0886 +4C86:202020207C78444888907E7C525452547E7C525452547E7C0000AAAAAAAA0000 +4C87:20102210797C4910907C7C545754557C7D10553855547D920110AA90AA7E0000 +4C88:2020201079FE494891487D4855FE55487D4855EC555A7D680148AB48AA480048 +4C89:21402144715893F02150F9D0A95EA9D4F954A954ABF4F8140154AA34AC140024 +4C8A:2010239072FE92A022BEFB48AABEAA80FABEAAA2AABEFB22023EAA22AA220226 +4C8B:2088208879DC488893DE7C88555456227CFC548454847CFC0084AA84AAFC0084 +4C8C:2108210877C89108211EFB92A824AB80F808AFC8A908F9080594A954A9240342 +4C8D:112420A879FC48406BFE59084A84FCFA49104BFC6D2459FC492449FC48009954 +4C8E:200823887088911027DEFA94AAA4AB94FA94AB94AA94FAC80388AE94A8A400C2 +4C8F:2048216A78DC484890B47D2255FE55027C20542054FC7C240044AA44AA940108 +4C90:2020203E782049FE91227DFC5522557E7D54557C55547D7C0110AAFEAA2204C6 +4C91:210420887BFE482091FC7C2057FE54547D92549057FE7C9000D4AB8AAA9601A2 +4C92:210021DE724A948A23EAFAB6AAA4ABF4FABEAAA4ABE4FABE02A4AAA4AA240464 +4C93:202020207850488891047EFA540054007DDC555455547DDC0088AA88AB540222 +4C94:200023FE700091FC2124F9FCA924ABFEF800A9FCA924F9FC0124A9FCA80003FE +4C95:2084204879FE4848914A7CCC544855FE7C0054FC54847C8400FCAA84AA8400FC +4C96:202023FE702091FC2000FBFEA802A9FCF820ABFEA800FBFE0004ABBEAAA4038C +4C97:21202120725692482580F970AA2EAA24FEF4AA24AAACFA740224AA34AAC4020C +4C98:2108210879EE4A9490427C1055FE55027CF8548854F87C8000FCAA84AAFC0084 +4C99:2108210871EE92942042F800ABDEAA52FBD2AA52ABD2FA1A0294AB50AA100010 +4C9A:2088208873EE90922084FBEEAAAAAAAEFBEAA88EA9CAFAAE04A0A88CA88A0092 +4C9B:208823FE788849FC91547DFC540057FE7E0254F854887CF80088AAF8AA8800F8 +4C9C:3C3C4848FCFC54547C7C54547C7CAAAA3C3C4848FCFC54547C7C54547C7CAAAA +4C9D:202020207C50445088887D04560254F87C88548854A87C9000821C82E07E4000 +4C9E:204020207C20440089FE7C00540454847C84544854487C4800501C10E3FE4000 +4C9F:200020407D9E451289127D1255D255127D125512555A7D9401101C10E0104010 +4CA0:202020207DFE442088FC7C4055FE54887D0456FA54887C8800F81C88E08840F8 +4CA1:208820487C5045FE88507C5055FC55547D54558C55047DFC01041D04E1FC4104 +4CA2:01243CA825FC244027FE3D08268424FA25103FFC252425FC252445FC54008BFE +4CA3:0F1008107F9048A04E3E79444F2451245F2475285F2855105F284028BF440082 +4CA4:400044FE7A28882814FEFAAAAAAAA8AAF9AEAAC2AE82FAFE02821A82E2FE4082 +4CA5:02003FE004221822E21E1FF010101FF010101FF010001FFC10001FFC2A44452C +4CA6:101020107F1041107F7E41107F1040107F9040287FA800A8AAA8AAC481440682 +4CA7:1040108011FC110411FCFD0411FC110011FE11001DFEE00242AA02AA0202000C +4CA8:004000807DFC110411FC110411FC110011FE110011FE1C02E2AA42AA0202000C +4CA9:3FFC20043FFC220027F0241027F0241027F0240027FC240047FC40048AA40AAC +4CAA:1040108011FC110411FCFD0411FC110011FE290025FE240242AA42AA8202000C +4CAB:0080FDF8290829F8290829F8290029FC290029FC280429542A5C480247FE8000 +4CAC:1004201E7CF044907C9044907C9040FE7E9040907E900288AA8AAAAA82C60C82 +4CAD:04200E40F0FC908490FC9084FCFC908090FE908090FE88028AAAC6AA8302000C +4CAE:00207C4000FC008400FCFE8428FC288028FE288028FE2A024EAA4AAA8202000C +4CAF:00207E4022FC248424FC28842EFC22802AFE248044FE4A0292AA20AA4102000C +4CB0:0040008079FC010401FC0104FDFC210021FE210041FE50028AAAFAAA0A02000C +4CB1:102020107F0041FE7F2041207F3C40247FA440247FA400A4AAA4AAA481540688 +4CB2:0020284024FC248442FC528490FC108020FE208048FE4402FCAA44AA0102000C +4CB3:1020084008FCFF8400FC00843CFC248024FE248024FE250246AA44AA8102000C +4CB4:1040108011FC150459FC510451FC910011FE110011FE280226AA42AA4202800C +4CB5:0100111021E84F04F2001FF010101FF010101FF010001FFC10001FFC2A44452C +4CB6:1FF00000FFFE0844323CDFF010101FF010101FF010001FFC10001FFC2A44452C +4CB7:04001FF010101FF010101FF010001FFC10001FFC492484940108FFFE0920711C +4CB8:1040108011FC290425FC4304A9FC290029FE290029FE28024AAA4AAA8A02000C +4CB9:00407E8009FC090411FC150433FC510091FE110011FE00020EAAF2AA4202000C +4CBA:4840488049FC4904FDFC490449FC490079FE490049FE48024AAA7AAA4A02000C +4CBB:2040108001FCFD0421FC410449FC8900F1FE110021FE20024AAAFAAA0A02000C +4CBC:1040108051FC51047DFC510491FC110011FE7D0011FE100212AA1EAAE202400C +4CBD:00400080F9FC210421FC410479FC4900C9FE490049FE48027AAA4AAA0202000C +4CBE:00007DFE108010FC1E04F02802101FF010101FF010101FFC10001FFC0004492C +4CBF:00203E4022FC228422FC3E8420FC288028FE2E8028FE28024AAA4CAA8902000C +4CC0:101020107C5044507C7C44907D1040107EFE40107E280228AA28AA4482440C82 +4CC1:105020487C4844407DFE44407C40407C7EA440A47EA80328AB10AA2882440C82 +4CC2:0020FC4024FC248444FC548488FC00807CFE448044FE440244AA7CAA4502000C +4CC3:02001FF010101FF010101FFC10001FFC0004492C08001EF8228854980882307E +4CC4:1420144014FC548455FC5E8454FC548054FE548054FE54025DAA76AAC502000C +4CC5:100020007F3E41227F2241227F22403E7FA240007F940094AAA2AAA281420600 +4CC6:1040108021FC790449FC490449FC490079FE490049FE48024AAA7AAA4A02000C +4CC7:00203C4024FC34842CFC248424FCFE8044FE648054FE44027EAA04AA2902100C +4CC8:104020407CFC44847D0446F47C9440947EF440847E940288AA82AA82827E0C00 +4CC9:204020803DFC4504A9FC110429FC450083FE310009FE000262AA12AA0A02000C +4CCA:2820244024FC2084FEFC208420FC3E8042FE448054FE880216AA22AA4202000C +4CCB:2040208021FCF904A9FCA904A9FCA900F9FEA10021FE28023AAAEAAA4202000C +4CCC:1040108021FC4904FDFC050479FC490049FE790049FE78024AAA4AAA4A02580C +4CCD:24102420247C24447F7C2444247C2440247EFF40007E240224AA42AA4302820C +4CCE:0040408099FC890489FC890489FCD90089FE890089FE8802FAAA8AAA0202000C +4CCF:1040108011FC7D0411FC1104FDFC010011FE11007DFE100212AA1EAAE202400C +4CD0:410021FC0A441048E0A0211826061FF010101FF010101FFC10001FFC0004492C +4CD1:10201040FEFC108420FC3E8422FC6280BEFE228022FE3E0222AA22AA2302260C +4CD2:08207F280824FFFE10207F2041247F2441247FA840287F900092AAAAAAC60182 +4CD3:102012407EFC148414FCFF8408FC108020FE7E80A0FE22022CAA30AA2102000C +4CD4:060038F820083CF820083FF802001FF010101FF010101FFC10001FFC0004492C +4CD5:0E20F04022FC928454FC0084FCFC088010FE168018FEF00252AA12AA5202200C +4CD6:100021FE7CA044A87CA844E87CA840A87EA840E87EA802AAAABAABEA82260C20 +4CD7:02001FF010101FF010101FFC5244892C02403C500848FFFE08507E240854198C +4CD8:201040D8F3949094F09093FEF0908094F89480D8FB980890A8AAA8CA8A863102 +4CD9:081008207F7C49447F7C49447F7C0040FF7E2040407E7E0202AA02AA1502080C +4CDA:00407C8045FC7D0445FC7D0401FC01007DFE110011FEFE0212AA12AA1202100C +4CDB:00207E4042FC42847EFC428442FC7E8010FE1080FEFE220264AA18AA2502C20C +4CDC:1020104028FC448482FC7C8410FC1080FEFE108054FE520292AA10AA5102200C +4CDD:202010407CFC008444FC288400FCFE8000FE00807CFE440244AA44AA7D02440C +4CDE:081008207F7C10443E7C1044FFFC2240497E88C03E7E08027FAA08AA0902080C +4CDF:00200E40EAFCAA84AAFCAE84EAFCAA80AAFEAE80EAFEAA020AAA12AA1302260C +4CE0:02100F20787C0844FF7C2A442A7CFF402A7E2A40FF7E080208AA0EAA7102200C +4CE1:2820244040FC7E84C8FC48847EFC488048FE7E8048FE480248AA7EAA4102400C +4CE2:4840488049FCFD0449FC490479FC490079FE490049FEFC0202AA52AA4A02840C +4CE3:08507F480840FFFE20403E502222465A82861FF010101FF010101FFC5244892C +4CE4:10109220527C5444107CFE44927C9240BA7ED640927E920292AA82AA8B02840C +4CE5:1020924092FCFE8410FC288444FC928008FEFC8004FE080252AA22AA1202000C +4CE6:20201040FEFC828400FC7C8400FC7C8044FE7C8044FE7C0202AA1EAAE202400C +4CE7:21004178F1089208F2FE9640FA40827CFA908210FAFE0A10AA28AA288A443282 +4CE8:102020407CFC44847CFC44847CFC0080FEFE108010FE7C0212AA1EAAF202400C +4CE9:0020FE4028FC2884FEFCAA84AAFCFE8010FEFC8024FE44022AAA12AA2A02C40C +4CEA:1020924092FC9284FEFC0084FEFC108020FEFE80AAFEAA02AAAAAAAAAB02860C +4CEB:0A107420157C5244227C2144417CBE40087E08407F7E080214AA12AA2302400C +4CEC:28402880FDFC290439FC11047DFC550055FE7D0011FEFC0212AA12AA1202100C +4CED:0020EE40AAFCAA84AAFCEA84AAFCAA80EAFE8A80CAFEAE02D8AA88AA0902080C +4CEE:00207C1045E07C2245B47CA8452456A28A401FF010101FF010101FFC5244892C +4CEF:1C20704010FCFE8410FC7C8454FC7C8054FE7C8010FE7C0210AA1EAAF102400C +4CF0:1008179014BC24A424BC67A4A23C22202FBE272026BE2A822AAA322A2202220C +4CF1:00207E7C14C40838FEC62A2048FCA844128C1FF010101FF010101FFC5244892C +4CF2:11FE1100FD7C11001DFEF1541248546422421FF010101FF010101FFC5244892C +4CF3:1020544054FC7C8492FC9284FEFC00807CFE0080FEFE100254AA92AA5102200C +4CF4:0020FE40AAFCAA84AAFCFE8410FC548052FE928010FE540252AA92AA1102100C +4CF5:11041108111E7D1213DE5552555E5550BB5E1150395E554292521252154A1884 +4CF6:100E20F07C2244927C4444207C4440F87E1040247EFE0210AAFEAA2882440C82 +4CF7:11102110CAA814443240D27C154014FE0A001FF010101FF010101FFC5244892C +4CF8:00803FFE24103F7C26382D543412210027F0241027F0241027FC40044AA4800C +4CF9:20404020F3FE9202F00893EEF008801CFBE48154F9480954A964A942893E3200 +4CFA:08101420227C4944BEFC0444087CFFC0147E7F40557E6302412A7F2A41427F0C +4CFB:08047F7808403E402A7E3E482A48FF480A881FF010101FF010101FFC5244892C +4CFC:100020FE7C8044807CBC44A47CA440BC7E8040EE7EAA02AAAAEEAA8082FE0C00 +4CFD:1020924092FCFE8428FC24847EFCC88048FE7E8048FE7E0248AA48AA7F02400C +4CFE:0A107420157C5244227C21445D7C80407E7E4240427E7E0242AA24AA0F02F00C +4CFF:24102620357C54445F7C7444947C64402A7E4940917E0002AAAAAAAAAB02000C +4D00:101008207F7C2244FF7C00447F7C49407F7E49407F7E08027F2A082A0F42F00C +4D01:20201040FEFC82847CFC54847CFC54807CFE1080FEFE920292AABAAA8B02840C +4D02:20103E20427CFF44497C49447F7C1040287ED540267ECD0215AA24AAD502080C +4D03:102010407CFC1084FEFC4484EEFC448064FEDE8000FEFE0228AA2AAA4D02880C +4D04:0F10F020117C8944427C0044FF7C8140427E7740927E5A022F2A222A4242820C +4D05:08107F20087C2244FFFC22447F7C41407F7E41407F7E41027F2A222A4142808C +4D06:2820AA406CFC2884FEFC448428FCFE8010FE7C8010FEFE0210AA28AA4502820C +4D07:00107F20087CFFC488FC6B44087C6B40147E2A40457EBE0202AA04AA1902040C +4D08:10202040FEFC9284D6FCBA84FEFC9280BAFED68082FE1002FEAA28AA4502820C +4D09:0020FE40AAFCAA84FEFC0084FEFC00807CFE44807CFE2A0264AAA2AA3102200C +4D0A:41082210FFBC08247F3C0824FFBC152064BE2420FFBE2402352AE2AA2582688C +4D0B:200043FCF2949294F3FC9000F7FE8000FBFC8204FBFC08A2A914AB088D443182 +4D0C:104820487DFE44487CFE44827D7C40007EFE40207ED2022CAAD8AA2C82CA0C30 +4D0D:00100020777C5544557C7744557C5540777E5540557E7702002A552A88C2000C +4D0E:00001FF011101FF011103FF82AA83EF82AA83FF810101FF010101FFC5244892C +4D0F:22082210FFBC22243E3C41245D3CD5E0553E5520DD7E4182002A552A4A828A8C +4D10:0808FF9084BC77242A3C77242ABCFFA0003E7F20413E7F02412A7F2A2202410C +4D11:7F0849107F3C4924FFBCAAA4FFBCAAA0FFBE0020FFBEA2823E2A222A2782F80C +4D12:7F080810FFBC88A46B3C08246B3C0020EFBEAAA0EFBE0002FFAA492AAA82FF8C +4D13:0010FFA0087C084408647F544944494C4940497E49024D024A7A0802080A0804 +4D14:2020104000FCFE8400A4288444948288048044FE2802100229FA440284140008 +4D15:7F0408441E44224454440844320CDFE01420126010001FF800087F8800280010 +4D16:10201040FEFC10847CA41084FE9400887C8044FE7C0244027DFA440254144808 +4D17:00207E4042FC7E8442A47E8442947E88148012FEFF02100229FA240242148008 +4D18:03107C20477C44445F64555456445C4C5540537E50025702557A5502A98A0004 +4D19:02087910493E4BA248327AAA412247E67920693EAB82A902297A3902290A0104 +4D1A:104010201E2010FC1000FE009278C648AA48D648AA48C64A924AFE8A82860100 +4D1B:101010921E5210541010FEFE9282C682AAFED682AA82C6FE9282FE82828A0084 +4D1C:101010201EFE10921092FEFE9292C692AAFED620AA24C65A925EFE908292010E +4D1D:1000107C1E44107C1044FE7C9200C7FEAAA0D6EEAAAAC6EA92BAFFE48224002A +4D1E:100011DC1E44115410CCFF549250C648AAFED790AAFEC69092FEFE9082FE0080 +4D1F:00803FFE22203FFC22243FFC242027BC2422279E200023F0221042904452980E +4D20:00803FFE22203FFC22243FFC242027BC2422279E203827C020405FFE41108E0E +4D21:00007FFE024012480A503FFE22203FFC22243FFC284028482F7048444B448C3C +4D22:00803FFE22203FFC22243FFC242027BC2422279E204020402FFE415042488C46 +4D23:08047F1E54F054107F92555255547F1054FE54105E10541054105C1056508020 +4D24:00803FFE22203FFC22243FFC242027BC242227DE224023FC24404BF840409FFE +4D25:00803FFE22203FFC22243FFC242027BC2422279E24003FBC24A444A44ABC9124 +4D26:00803FFE22203FFC22243FFC242227BE20403FFE200027F8200047F8440887F8 +4D27:081C7F70541054FE7F38555455927F10542054FE5E24544454285C10562880C4 +4D28:08007F7E544854507F5C555455547F5C545454545E5C5448545C5CAA568A8118 +4D29:00803FFE22203FFC22243FFC20003FFC21402FF829482FF820005FFC44908988 +4D2A:00803FFE22203FFC22243FFC280024F824083E78220824FE2E545538445484B2 +4D2B:08007F7C541054FE7F92555455107F54542854545E8A547C54045C0856308008 +4D2C:08480844FF442A402A5E5DE088401C402A4050401E2022225412080A14066002 +4D2D:08080808FF082A082AFE5D0888181C182A2850281E4822885408080814286010 +4D2E:08100810FF102A102A925D9288921C922A9250921E922292549208FE14026000 +4D2F:08400840FF402A7E2AAA5D2A882A1C4A2A4A50921F1222225422084214946008 +4D30:08480844FF442A402A5E5DE088401C442A4450481E3022225452088A15066002 +4D31:08200810FF102AFE2A825D0488401C482A5050601E40224254420842143E6000 +4D32:08100810FF102AFE2A105D1088101C7C2A1050381E3822545454089214106010 +4D33:08200810FF102AFE2A825D0488001C282A2850281E2822285444084414446082 +4D34:08100810FF102A102A1E5D1088101C102AFE50821E8222825482088214FE6082 +4D35:10841048FE0054FC5448BA481048384855FEA2483C484448A84810882888C108 +4D36:10401040FEFC54885550BA2010D83B2654F8A2203CF84420ABFE10202820C020 +4D37:10401020FE2055FE5502BA0410F838005400A3FE3C504450A89010922912C20E +4D38:080E08F0FF222A922A545D00887C1C082A1050101EFE22105410081014506020 +4D39:0800087CFF542A542A7C5D5488541C7C2A1050FE1E1022385454089214106010 +4D3A:08200810FF7C2A002A445D2888001CFE2A0050001E7C224454440844147C6044 +4D3B:0640387C08947E242CD44A0801007FFC11102BA845641918E3E60E4001800E40 +4D3C:10481044FE5E55E05428BA12106A39965448A25E3DE04424A8281012286AC186 +4D3D:10201040FEFE54925492BAFE109238A254FEA2483C8845FEA80810082808C008 +4D3E:10841044FE4855FE5420BAFC102039FE5440A2803CFE4510AA10141029FEC000 +4D3F:100011FEFF0254785400BAFC104038A45538A2583C944534A85210902950C020 +4D40:10101092FE54541054FEBA82108238FE5482A2FE3C824482A8FE10002844C082 +4D41:10481148FF5E556A5554BBC81050386455C4A37E3D444564A95411442954C248 +4D42:10201010FEFE54445428BAFE1082389254FEA2923CBA44AAA8AA10BA2882C086 +4D43:08280828FF7C2A282A285DFE88101C7C2A54507C1E54227C5400082814446082 +4D44:105011FCFF5455FC5554BBFC100039FC5400A3FC3D0445FCA88810502BFEC000 +4D45:08207F20083E3E4408A87F1010281E462280FFFE11C82AB40DD0764E01801E40 +4D46:10481048FEFE544854FEBA82117C380054FEA2203CD2442CA8D8102C28CAC030 +4D47:081004107FD04910493E49247FD4491459145D946B544D084908491489140922 +4D48:111023E040480BFC110033F0551010E0111012883FFE24103F7C26384D549412 +4D49:00803FFE24103F7C26382D543492214026303BEE20002FA428A44FA448A4898C +4D4A:0088788849FC488868885BFE4820FDFC492449FC492449FC4800488849049A02 +4D4B:282028207DFE28402840FEFC10847D8456FC54847C8454FC54847C8428944488 +4D4C:282028207C2029FC2820FEA810A87CA8557456227C50545054887C8829044602 +4D4D:282028107DFE280028FCFE8410FC7C0054FC54087C1055FE54107C1028504420 +4D4E:282029247D24292429FCFE0013FE7C20544055FC7D54555455547D542954450C +4D4F:280029DC7C44295428CCFF5410287C44559254207CC8543254C47C1828604580 +4D50:280029DC7D54295429DCFE0011FC7D2455FC55247DFC542057FE7C2028204420 +4D51:0C00700011FCFE24382454A490A428A455249024542438445444928451142208 +4D52:0C0070FC1084FE8438845484908428FC54849084548438845484928450FC2084 +4D53:0C1070101090FE9038FE549091102810541091FE541038105410921050102010 +4D54:0C20702013FEFE2039FC552491FC292455FC9020547038A85524962250202020 +4D55:0C0071FC1104FF0439FC5510911029FE55109110557C394455449344517C2244 +4D56:7E7C48047E2842107E2848FC7F0001007FFC09103288CC643938C54609203310 +4D57:0C0071FC1000FEF83888548890F8280055FC9124552439FC5524932451FC2104 +4D58:0C0070FC1084FEFC388454FC900029FE548090FE552A3A4A5492932250542088 +4D59:0C00702010FEFE4438825520907C288854509068559E382254D49208503021C0 +4D5A:0C1E71E01022FF1238945480902029CE5502910255CE39025502930251FE2102 +4D5B:0C0071EE114AFFEA392A55E49144294A55F09000541038FE5410921051FE2000 +4D5C:0C5071FC1154FFFC395455FC900029FE5500917C550039FE5550935451482266 +4D5D:00207F2049206B205D2049207F2008207F2008200F20F022002255224A9E8000 +4D5E:00047F0449046B245D2449247F2408247F2408240F24F024000455044A948008 +4D5F:0000FE7C9210D610BA109210FE1010FEFE1010101E10E0100210AA10A8108010 +4D60:0040FE409240D6FCBA849304FE041084FE4410441E44E0040204AA04A8288010 +4D61:00003FF801007FFC04401830E00E3FF8292825483FF801007FFC0100FFFE4444 +4D62:0010FE109210D67CBA109210FE1010FEFE1010381E38E0540254AA92A8108010 +4D63:0000FE0092FCD684BA849284FEFC1084FE8410841EFCE0840200AA00A9FE8000 +4D64:3FF808200820FFFE0820102020207FF8292825483FF801007FFC0100FFFE4444 +4D65:0040FE40927CD684BB0892FCFEA410A4FEA410FC1E80E0800282AA82A87E8000 +4D66:0000FE9C9248D608BA889248FE5E1008FE2810481EC8E0480248AA48A8488018 +4D67:08207F280824FFFE00207F2049246B2449247F2808287F100812FFAA0046AA82 +4D68:0048FE449240D6FEBA509254FE581052FE5410581E52E054029AAA92A92E8240 +4D69:03043C2404247FA416242504440C3FF8292825483FF801007FFC0100FFFE4444 +4D6A:0000FEFC9284D684BAFC9284FE8410FCFE0010901E92E0F40298AA92A8D2808E +4D6B:01007FFC50043EF84288A2AA1492187EE0003FF8292825483FF80100FFFE2448 +4D6C:0010FE1092DAD654BA549292FF501020FEFE10821E82E0FE0282AA82A8FE8082 +4D6D:0020FE2092FAD624BA2893FEFE201040FEFC11441E44E07C0244AA44A87C8044 +4D6E:0000FE7C9244D67CBA44927CFE0010FEFE40107E1EAAE12A024AAA92A82A8044 +4D6F:0008FE1C92E0D620BBFE9220FEFC10A4FEFC10A41EFCE02002FCAA20A9FE8000 +4D70:0040FE7E9280D77CBA44927CFE44107CFE0010FE1E40E0FE032AAA4AA8928026 +4D71:0010FE1092FED610BA7C9200FE7C1044FE7C10281EFEE000027CAA44A87C8044 +4D72:007CFE449244D67CBA0092EEFEAA10AAFEEE10101EFEE0380254AA92A9108010 +4D73:0010FE289244D6BABB0092FEFE9210D6FE9210FE1E00E07C0244AA7CA844807C +4D74:0000FEFE92AAD6AABAEE9228FEEE10AAFEAA10EE1EAAE0AA02EEAAA8A82A801E +4D75:20403F7E48909FF8149012501130FFFE08203FF8D55613901FF001007FFC2448 +4D76:200021FC21547D5445DC845075DC5554555455DC7554555405DC05502852103E +4D77:100011FC11547D5411DC1050FDDC0154115411DC7D54115411DC1D50E052403E +4D78:7C101052FE94382854449FF212901EF002803EF822883EF822883EFA028201FE +4D79:201C7DC8917EFDC828185FF092901EF002803EF822883EF822883EFA028201FE +4D7A:21F8210821F8250AF5FA250A25FA2402279E20903090EF9E4492049204920892 +4D7B:1C4414441CEE55445DEE55445DEE41447744140014FEF702557E550255FE9502 +4D7C:0440247C24A83D5004287DFE248844488FF848244FE448247FFC0440FC7C2444 +4D7D:0810FF7E08107E7C42447E282418FEE601003FF80100FFFE040008201FF00810 +4D7E:081017FE3210D15010200810FF1008FE7E1000FC7E4442487E2824101E28E0C6 +4D7F:0810FF1008FC7E1000FC7E4442287E1024281EC6E10001FC01003FF820083FF8 +4D80:0810FF7E08107E7C42047E4824381E44E10006C01830E7CE00001FF010101FF0 +4D81:0810FF7E08107E7C42447E3824447E8201187D6009183FF6D0101FF010101FF0 +4D82:2020CE208220EE7C82448284FE04008492449224DA249204DA0492049328D910 +4D83:2010CE108210EE2882288244FE4400A292109210DA7C9204DA0892089310D910 +4D84:2000CEFC8210EE1082948254FE58001093FE9210DA109210DA1092109310D910 +4D85:2020CE20823CEE4482A88210FE2800449282927CDA449244DA449244937CD944 +4D86:2028CE248240EE7E82C88348FE7E00489248927EDA489248DA48927E9340D940 +4D87:2010CE1082FEEE9282FE8292FEFE0000927C9244DA7C9244DA7C92449344D94C +4D88:2014CE1283FEEE1082FE8292FEFE009292FE9292DA0493FEDA4492249324D90C +4D89:2020CEDE828AEECA82AA82D2FEA6000092FE9292DA9292FEDA92929293FED982 +4D8A:20007CFC44247C2444247C240024FEFC9244FE449244FE440044FE4445FE8400 +4D8B:20007CFC44447C4844487C50005CFE449244FE449268FEA80090FE9845248442 +4D8C:20407C4044FC7C8445047EF40094FE9492F4FE849294FE880082FE82447E8400 +4D8D:0040FEF8208828F84488FCF8140011FC11247DFC112411FC1C00E3FE40880108 +4D8E:10103E1022283E2822443E82007C7F0049007F7C49447F440044FFC4227C4244 +4D8F:4420287C0044FC7C1444147CFC0090FE9092FEFE329232FE5A0054FE90441084 +4D90:20107C2844447CBA45007CFE0092FED69292FEFE9200FE7C0044FE7C4444847C +4D91:20207CF844207DFC45047CF800A8FEF892A8FEF89244FEFC0020FEB844A0857C +4D92:0100FFFE02847D78255025484D6420083FF820083FF822083FF8244843889C68 +4D93:2040202023FEF888A852AFACAAAAAAA8ADACA800A904B9FC210421FC21042204 +4D94:102050205C2050A0FEAC28B4AAE4D7A482A4FEB4AAA8AAA2D6A29E82E27E0200 +4D95:080028002F7C2854FF54145455546B54417C7F40554055406B424F42713E0100 +4D96:081028102F102828FF28144455446BA241107F10557C55046B084F0871100110 +4D97:0800287E2F042804FF74145455546B5441547F54557455546B044F0471140108 +4D98:082028102F1028FEFF00140455446B4441247F24552855286B084F1071FE0100 +4D99:0800287E2F402840FF40147C55446B4441447F44557C55406B404F40717E0100 +4D9A:081028102F10287CFF54145455546B54417C7F54551055146B124F7E71220100 +4D9B:7F0408441E44224454440844310CC9E009007FFC04402AA83FF824482AA83FF8 +4D9C:101050505C50507CFE502890AA10D6FE8200FE00AA7CAA44D6449E44E27C0244 +4D9D:102050205C2051FCFE2028A8AAA8D6A88374FE22AA50AA50D6889E88E3040202 +4D9E:082428242F7E2824FF24143C55246B24413C7F24552455FE6B004F2471220142 +4D9F:102050205C3C5044FE482880AA20D6CC8284FE84AACCAA84D6849E84E2FC0284 +4DA0:00283FFE20202FA420282F9048AA4FC68082010011F81100FFFE04402AA83FF8 +4DA1:100250E25CA250AAFEAA28EAAAAAD6AA82EAFEAAAAAAAAA2D6E29E02E24A02A4 +4DA2:100C500A5C0850FEFE882888AAFAD68A828AFEECAAACAAACD6EA9E8AE2960322 +4DA3:101050545C545054FE7C2800AAFED600827CFE44AA44AA7CD6449E28E2FE0200 +4DA4:1000507C5C445074FE5428FEAA82D67C8244FE7CAA44AA7CD6449E44E2540248 +4DA5:1020503C5C2050FEFEA228B8AAE4D69C8280FEBCAAA4AABCD6A49EBCE2A4037E +4DA6:102051FC5C2050FCFE2029FEAA00D6FC8284FEFCAA84AAFCD6849EFCE2480284 +4DA7:101050105C7E5010FEFE2844AAEED6448264FEDEAA00AAFED6289E28E24A0286 +4DA8:101050105C285044FE82287CAA00D6EE82AAFEAAAAEEAA44D6449EAAE2AA0312 +4DA9:102050105DFE5054FFA828ACABAAD6A883ACFE00AA84AAFCD6849EFCE2840304 +4DAA:104C51FA5C4851FEFE082868AA5AD6FA83AAFEFCAAACAAFCD6AA9EFAE2960222 +4DAB:13DE52525FDE5000FFFE2A00AAC8D64E83EAFEB2AAEAAAAAD6EA9EB4E3E4022A +4DAC:00007C7C1010FEFE1010101008407F7C1440FF7C22043E7C22403E7C2242263E +4DAD:140012FE12101010FF90147C14101510151016FE260024022C02540243FE8000 +4DAE:04400420FFFE0910116021844F0480FC00001FF001007FFC028004401830600C +4DAF:208027FC240427BCF0A056BE52A257B652AA96AA50B626A222BE57A052A2867E +4DB0:1000FF8680B8F7881408D7CE5458F6C85548D54E16F8D44857CAF40A544ACFC6 +4DB1:408047FC740497BC50A026BE52A28FB60AAA66AA10B606A282BE47A022A2067E +4DB2:104013FE12027FDE5450575E7D5257DA55565756FC5A4752455E47D055524B3E +4DB3:081008081400227E5D0080807F3855287F2800287F28552A7F2A554A55464380 +4DB4:08402A7C48941410212846C41830EFEE00003BB82AA87FFC44447FFC4444444C +4DB5:1004103E2BE0463CBA2002FCFEA4AAB8FEE4029CFE80AAB8FEA8AAAAAB2A8646 +4DB6:020003F802007FFE000011F811087DF811081DF8300057FE1090109C5150223E +4DB7:00000110791049104910491049104910491049107A104A1202120412040E0800 +4DB8:00000080788048804880492049204A204840484078884884010403FE01020000 +4DB9:000001000100210821082108210821083FF80100010002000200040008003000 +4DBA:3C102410241025FF3D112511251125293D252543258125012501450155058902 +4DBB:3C202420242025FE3D2224242420242824283C48244824882489450956078800 +4DBC:7848488449124A21784449824BFE480278204810495249414A458845A83C1000 +4DBD:3D5225222552258A3DFE2448244824873D102420247C24842548442054588984 +4DBE:000008100810681F8BA188AAEBC88888FF88081408140C1412222122C1410000 +4DBF:084808481448124828487E48A2483E4822483E482088288924892A8933072100 +4DC0:0000000000007FFC00007FFC00007FFC00007FFC00007FFC00007FFC00000000 +4DC1:0000000000007C7C00007C7C00007C7C00007C7C00007C7C00007C7C00000000 +4DC2:0000000000007C7C00007FFC00007C7C00007C7C00007C7C00007FFC00000000 +4DC3:0000000000007FFC00007C7C00007C7C00007C7C00007FFC00007C7C00000000 +4DC4:0000000000007C7C00007FFC00007C7C00007FFC00007FFC00007FFC00000000 +4DC5:0000000000007FFC00007FFC00007FFC00007C7C00007FFC00007C7C00000000 +4DC6:0000000000007C7C00007C7C00007C7C00007C7C00007FFC00007C7C00000000 +4DC7:0000000000007C7C00007FFC00007C7C00007C7C00007C7C00007C7C00000000 +4DC8:0000000000007FFC00007FFC00007C7C00007FFC00007FFC00007FFC00000000 +4DC9:0000000000007FFC00007FFC00007FFC00007C7C00007FFC00007FFC00000000 +4DCA:0000000000007C7C00007C7C00007C7C00007FFC00007FFC00007FFC00000000 +4DCB:0000000000007FFC00007FFC00007FFC00007C7C00007C7C00007C7C00000000 +4DCC:0000000000007FFC00007FFC00007FFC00007FFC00007C7C00007FFC00000000 +4DCD:0000000000007FFC00007C7C00007FFC00007FFC00007FFC00007FFC00000000 +4DCE:0000000000007C7C00007C7C00007C7C00007FFC00007C7C00007C7C00000000 +4DCF:0000000000007C7C00007C7C00007FFC00007C7C00007C7C00007C7C00000000 +4DD0:0000000000007C7C00007FFC00007FFC00007C7C00007C7C00007FFC00000000 +4DD1:0000000000007FFC00007C7C00007C7C00007FFC00007FFC00007C7C00000000 +4DD2:0000000000007C7C00007C7C00007C7C00007C7C00007FFC00007FFC00000000 +4DD3:0000000000007FFC00007FFC00007C7C00007C7C00007C7C00007C7C00000000 +4DD4:0000000000007FFC00007C7C00007FFC00007C7C00007C7C00007FFC00000000 +4DD5:0000000000007FFC00007C7C00007C7C00007FFC00007C7C00007FFC00000000 +4DD6:0000000000007FFC00007C7C00007C7C00007C7C00007C7C00007C7C00000000 +4DD7:0000000000007C7C00007C7C00007C7C00007C7C00007C7C00007FFC00000000 +4DD8:0000000000007FFC00007FFC00007FFC00007C7C00007C7C00007FFC00000000 +4DD9:0000000000007FFC00007C7C00007C7C00007FFC00007FFC00007FFC00000000 +4DDA:0000000000007FFC00007C7C00007C7C00007C7C00007C7C00007FFC00000000 +4DDB:0000000000007C7C00007FFC00007FFC00007FFC00007FFC00007C7C00000000 +4DDC:0000000000007C7C00007FFC00007C7C00007C7C00007FFC00007C7C00000000 +4DDD:0000000000007FFC00007C7C00007FFC00007FFC00007C7C00007FFC00000000 +4DDE:0000000000007C7C00007FFC00007FFC00007FFC00007C7C00007C7C00000000 +4DDF:0000000000007C7C00007C7C00007FFC00007FFC00007FFC00007C7C00000000 +4DE0:0000000000007FFC00007FFC00007FFC00007FFC00007C7C00007C7C00000000 +4DE1:0000000000007C7C00007C7C00007FFC00007FFC00007FFC00007FFC00000000 +4DE2:0000000000007FFC00007C7C00007FFC00007C7C00007C7C00007C7C00000000 +4DE3:0000000000007C7C00007C7C00007C7C00007FFC00007C7C00007FFC00000000 +4DE4:0000000000007FFC00007FFC00007C7C00007FFC00007C7C00007FFC00000000 +4DE5:0000000000007FFC00007C7C00007FFC00007C7C00007FFC00007FFC00000000 +4DE6:0000000000007C7C00007FFC00007C7C00007FFC00007C7C00007C7C00000000 +4DE7:0000000000007C7C00007C7C00007FFC00007C7C00007FFC00007C7C00000000 +4DE8:0000000000007FFC00007C7C00007C7C00007C7C00007FFC00007FFC00000000 +4DE9:0000000000007FFC00007FFC00007C7C00007C7C00007C7C00007FFC00000000 +4DEA:0000000000007C7C00007FFC00007FFC00007FFC00007FFC00007FFC00000000 +4DEB:0000000000007FFC00007FFC00007FFC00007FFC00007FFC00007C7C00000000 +4DEC:0000000000007C7C00007FFC00007FFC00007C7C00007C7C00007C7C00000000 +4DED:0000000000007C7C00007C7C00007C7C00007FFC00007FFC00007C7C00000000 +4DEE:0000000000007C7C00007FFC00007FFC00007C7C00007FFC00007C7C00000000 +4DEF:0000000000007C7C00007FFC00007C7C00007FFC00007FFC00007C7C00000000 +4DF0:0000000000007C7C00007FFC00007FFC00007FFC00007C7C00007FFC00000000 +4DF1:0000000000007FFC00007C7C00007FFC00007FFC00007FFC00007C7C00000000 +4DF2:0000000000007C7C00007C7C00007FFC00007C7C00007C7C00007FFC00000000 +4DF3:0000000000007FFC00007C7C00007C7C00007FFC00007C7C00007C7C00000000 +4DF4:0000000000007FFC00007FFC00007C7C00007FFC00007C7C00007C7C00000000 +4DF5:0000000000007C7C00007C7C00007FFC00007C7C00007FFC00007FFC00000000 +4DF6:0000000000007C7C00007C7C00007FFC00007FFC00007C7C00007FFC00000000 +4DF7:0000000000007FFC00007C7C00007FFC00007FFC00007C7C00007C7C00000000 +4DF8:0000000000007FFC00007FFC00007C7C00007FFC00007FFC00007C7C00000000 +4DF9:0000000000007C7C00007FFC00007FFC00007C7C00007FFC00007FFC00000000 +4DFA:0000000000007FFC00007FFC00007C7C00007C7C00007FFC00007C7C00000000 +4DFB:0000000000007C7C00007FFC00007C7C00007C7C00007FFC00007FFC00000000 +4DFC:0000000000007FFC00007FFC00007C7C00007C7C00007FFC00007FFC00000000 +4DFD:0000000000007C7C00007C7C00007FFC00007FFC00007C7C00007C7C00000000 +4DFE:0000000000007C7C00007FFC00007C7C00007FFC00007C7C00007FFC00000000 +4DFF:0000000000007FFC00007C7C00007FFC00007C7C00007FFC00007C7C00000000 +4E00:0000000000000000000000000000FFFE00000000000000000000000000000000 +4E01:00007FFC01000100010001000100010001000100010001000100010005000200 +4E02:0000FFFE040004000800080010001FF000100010001000100010001000A00040 +4E03:02000200020002000200023C07C0FA0002000200020002040204020401FC0000 +4E04:01000100010001000100010001000100010001000100010001000100FFFE0000 +4E05:0000FFFE01000100010001000100010001000100010001000100010001000100 +4E06:0000FFFE02000200040004000800080010002000400080000000000000000000 +4E07:00000000FFFE04000400040007F0041004100810081010101010201040A08040 +4E08:00800080008000807FFC0080108010800880048002800100028004401830E00E +4E09:000000007FFC00000000000000003FF800000000000000000000FFFE00000000 +4E0A:02000200020002000200020003F80200020002000200020002000200FFFE0000 +4E0B:0000FFFE02000200020002000240022002100208020802000200020002000200 +4E0C:0000FFFE08200820082008200820082008200820082010201020202040208020 +4E0D:00007FFC00800080010001000340052009101108210441048100010001000100 +4E0E:1000100010001FFC1000200020003FF8000800080008FFC80008000800500020 +4E0F:0000FFFE01000100210021FC2104210421043FFC000400040004000400280010 +4E10:0000FFFE01000100210021FC2100210021003FFC000400040004000400280010 +4E11:00003FF0021002100210021002103FF0041004100410041004100410FFFE0000 +4E12:00003FF8010801080908050802080308048804880808105020200000FFFE0000 +4E13:0100010001003FF802000200FFFE040008000FF0001000200640018000400020 +4E14:00001FF01010101010101FF01010101010101FF01010101010101010FFFE0000 +4E15:00007FFC0080010001000340052009103108C1040100010001000000FFFE0000 +4E16:02201220122012201220FFFE122012201220122013E01000100010001FFC0000 +4E17:111011101110111011101110FFFE11101110111011101110111011101FF01010 +4E18:001000781F8010001000100010001FFC104010401040104010401040FFFE0000 +4E19:0000FFFE0100010001007FFC4104410442844244442448244004400440144008 +4E1A:04400440044004404444244424481448145014600440044004400440FFFE0000 +4E1B:08200820082008200820082008201450125022882088410482020000FFFE0000 +4E1C:0200020002007FFC04000900110021003FF80100092011102108410405000200 +4E1D:0810081010201020224442847CF804080810102020407EFC00000000FFFE0000 +4E1E:00003FF00020004000807D0405880950092011102108410685000200FFFE0000 +4E1F:00007FFC0100010001003FF8010001000100FFFE02000400082010103FF81008 +4E20:04400440044004447C48045004600440044204421C42E43E44000000FFFE0000 +4E21:0000FFFE0100010001007FFC410449244924492449244FE44024400440144008 +4E22:001000F83F00010001003FF8010001000100FFFE02000400082010103FF81008 +4E23:0000FFFE0440044004407C7C4444444444447C7C044408400840104020404040 +4E24:0000FFFE0440044004407FFC4444444444444AA44A9451144204400440144008 +4E25:00007FFC024012480A5002403FFE200020002000200020002000400040008000 +4E26:1010082004407FFC0440044004404444244414481450044004400440FFFE0000 +4E27:010001007FFC01001110091009200100FFFE1200111010A010401430180E1000 +4E28:0100010001000100010001000100010001000100010001000100010001000100 +4E29:0040004010401040104010401040104010C013401C4010400040004000400040 +4E2A:0100010002800440082010102108C10601000100010001000100010001000100 +4E2B:0000201010200840048001000100010001000100010001000100010001000100 +4E2C:0100010001001100090009000100030005000900310001000100010001000100 +4E2D:01000100010001003FF8210821082108210821083FF821080100010001000100 +4E2E:00007FF00410041004107FD0041004100410FFD00412040A040A040604020400 +4E2F:0100010C017007807900010C017007807900010C017007807900010001000100 +4E30:0100010001007FFC0100010001003FF8010001000100FFFE0100010001000100 +4E31:04400440444444444444444444444C44547C644404400840084010402040C040 +4E32:010001003FF8210821083FF8010001007FFC410441047FFC4104010001000100 +4E33:044004403FF8244824483FF8044004407FFC444444447FFC4844104020404040 +4E34:08800880088049FE49404A204C20480049FC492449244924492409FC09040800 +4E35:0440244814500440FFFE0000082004403FF801000100FFFE0100010001000100 +4E36:0000000000000000000004000200010000800040004000000000000000000000 +4E37:0000000000000008200810100810042004400080000000000000000000000000 +4E38:02000200020002007FE0022012200A20042004200A20092211222022401E8000 +4E39:00001FF0101010101210111011101010FFFE1010101010102010201040508020 +4E3A:010021001100110001007FF80208020802880448044808081008200840508020 +4E3B:0200010000007FFC01000100010001003FF801000100010001000100FFFE0000 +4E3C:08200820082008207FFC08200A2009200820FFFE082008201020102020204020 +4E3D:0000FFFE000000003EF822882288228832C82AA82AA82288228822882AA82490 +4E3E:2208110811100020FFFE082011102108CFE6010001007FFC0100010001000100 +4E3F:0100010001000100010001000100010001000200020004000400080010002000 +4E40:000000000000080008001400140024004200010000C00030000E000000000000 +4E41:000000003F000100010001000100010001000080008000400020001000080006 +4E42:000000102010201010201020082008400440028001000280044008203018C006 +4E43:00003FF00410042004200440047C040408040804080410041004200440288010 +4E44:000000100010001000100220012000C0004000A0011022102400380020000000 +4E45:04000400040007E008200820104020404080008001400240042008103008C006 +4E46:0010081008101020102020407FC020800080014001400220042008103008C006 +4E47:002003F03E00020002000200020003FCFE000200020002040204020401FC0000 +4E48:01000100020002000440084010802080410002000420081010083FFC10040000 +4E49:020001102110201010201020082008400440028001000280044008203018C006 +4E4A:0000000801FC7E00000820081010101008200840000000000000000000000000 +4E4B:02000100010000007FF800100020004000800100020004001800240043FE0000 +4E4C:010002001FF01010101010101050102010001FFC000400047FE4000400280010 +4E4D:080008000FFE12001200220043F882000200020003FC02000200020002000200 +4E4E:001000F83F0001001110091009200100FFFE0100010001000100010005000200 +4E4F:001001F87E0000000200010001007FF8003000C003000C003000480087FE0000 +4E50:002000F01F0010001100210021003FFC01000920091011082104410405000200 +4E51:000801FC7F00010009040908119021A045408540092011102108410681000100 +4E52:002000F01F00100010001FF81080108010801080FFFE00000800100020004000 +4E53:002000F01F00100010001FF81080108010801080FFFE00000040002000100008 +4E54:001000F83F00010002007FFC044008203018C826082008200820102010202020 +4E55:000800FC3F8020802FF8208020803FFE208020802FF82888488848A888900080 +4E56:00701F8001000100FFFE0100092009247928093009221922E91E010001000100 +4E57:00F83F0001007FFC09200920FFFE092009207FFC0380054009203118C1060100 +4E58:00F83F0001007FFC01000924F93809223922CB9E054009203118C10601000100 +4E59:00007FF00020004000800100020004000800100010002004200420041FFC0000 +4E5A:100010001000100010001000100010001000100010001004100410040FFC0000 +4E5B:00000000FFFC0004000800100000000000000000000000000000000000000000 +4E5C:000000001000103010D017103810D0101010105010201002100210020FFE0000 +4E5D:04000400040004007FE0042004200420082008200820102210222022401E8000 +4E5E:080008001FFC1000200040009FE000200040018006000804100410040FFC0000 +4E5F:010001001100113011D017103910D1101110115011201102100210020FFE0000 +4E60:00007FF8000800080808040802080208006801880E0870082008000800500020 +4E61:020002000420082010403F800108020804101FE000400080010006001800E000 +4E62:082008200820082049204920492049204920492049204F2279220022001E0000 +4E63:084008401040104022404240FC4004400840104024404242FE424242003E0000 +4E64:0000FFFE02000240022002100208020000007FF0006001800600180420041FFC +4E65:000801FC7E000010101008200440008000007FF0006001800600180420041FFC +4E66:0220021002083FE00220022002200220FFFC0204020402040204022802100200 +4E67:0040044002401240084009FC7E400040004000007FF0006003801C0420041FFC +4E68:08200820102022204120FFA000A000207F20412041204122412241227F1E4100 +4E69:08200820082008200FA00820082008207F20412041204122412241227F1E4100 +4E6A:0000FDFC052405240924092411FC112421242124412441FC400240023FFE0000 +4E6B:100010007E7C124412441244227C4A4484007FF0006001800600180420041FFC +4E6C:00003FFC20003FF820083FF820003FFC00007FF0006001800600180420041FFC +4E6D:0000FFFE040008001FF02810C8100FF000007FF0006001800600180420041FFC +4E6E:0C0070FC408444845C8464944488088010807FF0006001800600180420041FFC +4E6F:00F87F0011100920FFFE01000100050002007FF0006001800600180420041FFC +4E70:00007FFC0004088804802480108010800100FFFE010002C0042008103008C004 +4E71:04400E40384008400840FF40084008403E4022402240224222423E42223E0000 +4E72:4080208009FC12042448E04020A023182C0600007FF0006003801C0420041FFC +4E73:02200F20F020012091204A200020FE20042008200F20F82248220822281E1000 +4E74:080C08F07E8008800EFE788808882908120800007FF0006003801C0420041FFC +4E75:102008207F20002022201420FFA00820082008207F20082208220822081E0800 +4E76:012001107FFC01003FF821083FF821083FF8210800003FF001C01E0420041FFC +4E77:1020082040A824A409221228703010C0170000007FF0006003801C0420041FFC +4E78:0800087C28442E643A54EAFE2A442AA42A942EFE2804282A201220021FFE0000 +4E79:08200820FFA008207F2041207F2041207F2049200820FFA208220822081E0800 +4E7A:061838E020803EFC22903E902090411080007FF0006001800600180420041FFC +4E7B:10100810FF2820443E822210220842204A1084087FF0006003801C0420041FFC +4E7C:2080104087FC4040104023F8E040204027FC20007FF0006003801C0420041FFC +4E7D:01081FD001207FFC02000FF03810CFF008100FF000003FF001C01E0420041FFC +4E7E:104010401080FEFE11007E0044FC7C0844107C201040FE801102110210FE1000 +4E7F:0F20F020112089204220102022207C2008201120FFA008A24A228922281E1000 +4E80:04000FE010403FF051101FF011101FF001003FF821083FF821083FFA010200FE +4E81:08200820FFA0087E7F4041807F7C41047F0800107F200840FFC20842083E0800 +4E82:0F20F02049202220FE2014200820FF209520BD208320BD2295228922951EA300 +4E83:082049202A20FFA02A20492088A04120412077A09120552227A24122811E0100 +4E84:0820FFA008207F200020FFA080A07F2000207F2041207F22412222220F9EF000 +4E85:0010001000100010001000100010001000100010001000100010001000500020 +4E86:00007FF800100020004001800100010001000100010001000100010005000200 +4E87:0800080008000FFC100411082110410001000100010001000100010005000200 +4E88:00001FF000100220014000807FFE008200840080008000800080008002800100 +4E89:080008001FE020204040BFF8010801087FFE010801083FF80108010005000200 +4E8A:010001007FFC111009203FF801080108FFFE010801083FF80108010005000200 +4E8B:01000100FFFE01003FF821083FF801003FF80108FFFE01083FF8010005000200 +4E8C:0000000000003FF800000000000000000000000000000000FFFE000000000000 +4E8D:00003FF80000000000000000FFFE010001000100010001000100010005000200 +4E8E:00003FF80100010001000100FFFE010001000100010001000100010005000200 +4E8F:00003FF8000000000000FFFE0400040008000FF0001000100010001000A00040 +4E90:00003FF8020002000200FFFE0400040008000FF0001000100010001000A00040 +4E91:00003FF80000000000000000FFFE0200040004000840102020107FF820080008 +4E92:00007FFC0400040004000FF008100810101010201FE0002000400040FFFE0000 +4E93:00003FF8000000000000FFFE0820082008200820082010201020202040208020 +4E94:00007FFC02000200020002003FF00410041004100410081008100810FFFE0000 +4E95:08200820082008207FFC0820082008200820FFFE082008201020102020204020 +4E96:000000003FF8000000000000FFFE0000000000003FF8000000000000FFFE0000 +4E97:010001002108210821083FF80000000000003FF80000000000000000FFFE0000 +4E98:00007FFC000000001FF0101010101FF0101010101FF0101000000000FFFE0000 +4E99:00007FFC0400040004000FF008100A10111010200420022000400040FFFE0000 +4E9A:00007FFC044004400440044044442444244814481450044004400440FFFE0000 +4E9B:04400440244427482470244224422F42F03E400000001FF0000000007FFC0000 +4E9C:00007FFC0440044004403FF824482448244824483FF8044004400440FFFE0000 +4E9D:0400082010103FF80810102024487EFC020400003FF8000000000000FFFE0000 +4E9E:00007FFC0440044004403C7820082008200820083C78044004400440FFFE0000 +4E9F:00003FF0002000400180793C49044944492849107928014405000200FFFE0000 +4EA0:020001000100FFFE000000000000000000000000000000000000000000000000 +4EA1:0200010001000000FFFE1000100010001000100010001000100010001FFC0000 +4EA2:020001000100FFFE000000000FE00820082008200820082210221022201E4000 +4EA3:020001000100FFFE042004200420042004200420042008200820102020204020 +4EA4:020001000100FFFE0000101010082024482404400280010002800C403030C00E +4EA5:0200010000007FFC02000400082010403F8801100620184060A003100C087004 +4EA6:020001000100FFFE044004402450244824484444444488440840104021404080 +4EA7:020001007FFC00000820042004403FFE20002000200020002000400040008000 +4EA8:02000100FFFE00001FF0101010101FF000003FF0006001800100010005000200 +4EA9:020001000100FFFE000000003FF82108210821083FF82108210821083FF82008 +4EAA:02000100FFFE0440145024484844094010807FE0002000200010001000080006 +4EAB:020001007FFC00001FF010101FF000001FE000400180FFFE0100010005000200 +4EAC:02000100FFFE000000001FF01010101010101FF0010011101108210445040200 +4EAD:020001007FFC00001FF010101FF000007FFE40029FF401000100010005000200 +4EAE:020001007FFC00000FE008200FE000007FFE400287C40440044008423042C03E +4EAF:02000100FFFE00001FF010101FF000003FF8200820083FF8200820083FF82008 +4EB0:02000100FFFE000000001FF010101FF010101FF0010011101108210445040200 +4EB1:02000100FFFE0800080013F81208320853F89208120813F81208100017FC1000 +4EB2:020001003FF8000008200440FFFE010001007FFC010009201110210845040200 +4EB3:01007FFC00001FF010101FF000007FFE400280F43F00020003F87E02020201FE +4EB4:01007FFC00001FF010101FF000007FFE41029FF401007FFC02003FE00822701E +4EB5:0100FFFE000008407DF808480CC8784A08AA2906130204880C503530C60E0400 +4EB6:0100FFFE00003FF8200827C824483FF800001FF010101FF010101FF00000FFFE +4EB7:010000803FFC041002203FFE22402FF822483FFE22482FF826604A50524C8240 +4EB8:20881048FC5001FC7D2445247DFC01247D2409FC10201C20F3FE102050202020 +4EB9:0100FFFE00002FEC48246BAC48246BAC4AA4FFFE90121FF010101FF01010FFFE +4EBA:0100010001000100010001000280028004400440082008201010200840048002 +4EBB:0800080008001000100030003000500090001000100010001000100010001000 +4EBC:01000100010001000280028004400440082010102008C00600000000FFFE0000 +4EBD:010001000100028002800440082010102008C006020001000080008000000000 +4EBE:008000800080208020802140214022202220241028083006200020003FFE0000 +4EBF:080008000BFC1008101030203040508090801100110012021202120211FE1000 +4EC0:08200820082010201020302037FE502090201020102010201020102010201020 +4EC1:08000800080013FC1000300030005000900010001000100017FE100010001000 +4EC2:084008400840104013FC30443044504490441084108410841104110412281410 +4EC3:080008000BFE1020102030203020502090201020102010201020102010A01040 +4EC4:00003FFE20002000208020802080208020802140214022204220441088081006 +4EC5:08000BFC09041104110430883088508890501050102010201050108811041602 +4EC6:0840084008401040104030503048504490441040104010401040104010401040 +4EC7:090009000900110017F0311031105110911011101110121212121412180E1000 +4EC8:0800082009201120112031203120512091201110111012101208140818041002 +4EC9:080009F0091011101110311031105110911011101110111211121212120E1400 +4ECA:0100010002800440082012102108C10600001FF0001000200020004000800100 +4ECB:0100010002800440082010102008C82608200820082008201020102020204020 +4ECC:010001000280024004200810110861040100028002800440082010102008C006 +4ECD:080008000BF810881090309030A050BC90841084110411041104120412281410 +4ECE:0820082008200820082008200820082008501450125012882088210442048402 +4ECF:08400840084010401040308030805080910011101108120817FC120410041000 +4ED0:0100010002800440082010102108C10601000100FFFE01000100010001000100 +4ED1:0100010002800440082010102008C806083008C00F0008080808080807F80000 +4ED2:0100010002800440082010102008C6060180004000000C00030000C000200000 +4ED3:010001000280044008203018C0060FE00820082008A008440804080407FC0000 +4ED4:08000BF80808101010203040304057FE90401040104010401040104011401080 +4ED5:084008400840104010403FFE304050409040104010401040104017FC10001000 +4ED6:084008400A401258126832C833485E4892481248125812421202120211FE1000 +4ED7:081008100810101013FE30103010511091101090109010501020105011881606 +4ED8:081008100810101017FE30103010501091101090109010101010101010501020 +4ED9:1040104010402040244464446444A4442444244424442444244427FC20042000 +4EDA:0100010002800440082010102108C1060100210821082108210821083FF80008 +4EDB:081008780BC01040104030403040507E97C010401040104210421042103E1000 +4EDC:08000800080013FE10203020302050209020102010201020102017FE10001000 +4EDD:0100010002800440082010102008C0061FF0010001000100010001007FFC0000 +4EDE:080008000BFC1044104432443244524494841084108411041104120414281810 +4EDF:081008780BC0104010403040304057FE90401040104010401040104010401040 +4EE0:08000BFC084010401040304030405FFE90401040104010401040104010401040 +4EE1:08800880090011FE1200340031F8500890101060108011001202120211FE1000 +4EE2:08800880090011FC120432043404590490841044104410041004100410281010 +4EE3:089008880888108010BE37C03080504090401040102010221012100A10061002 +4EE4:01000100028004400A2011102108C0061FF00010002004400280010000800080 +4EE5:0010041022102110211020102010202020202020244028503088210402020402 +4EE6:0820082008201020102031283124512492221222122214221020102010A01040 +4EE7:02000200020003F8020002000200FFFE0100010001000280044008203018C006 +4EE8:080008000BFC100010003000300051F89000100010001000100017FE10001000 +4EE9:084008400840104010403040307C504090401040104010401040104017FE1000 +4EEA:088008480A481208120831103110511090A010A01040104010A0111012081406 +4EEB:084008400880108011003110321054209020104010801108120417FE12021000 +4EEC:0900088008BC1204120432043204520492041204120412041204120412141208 +4EED:080008000BF81088108832883188508890C810A81098110E1108120814501820 +4EEE:0808083C0BC012001200320033F8528892881288125012501220145014881906 +4EEF:0840084008401148114432423242544890481048101010101020104011801600 +4EF0:080008800B3C122412243224322452249224122412B413281220102010201020 +4EF1:0840084008A010A01110328834465040900013F8100810101010102010201040 +4EF2:084008400840104017FC3444344454449444144417FC14441040104010401040 +4EF3:08200A200A2012221222322433A85230922012201220122212A21322121E1000 +4EF4:080009FC09041104110431FC31045104910411FC110411041204120414141808 +4EF5:11001100110023F8224062406440A04020402FFE204020402040204020402040 +4EF6:082008200920112011FC322032205420902017FE102010201020102010201020 +4EF7:0840084008A010A0111032083406511091101110111011101110121012101410 +4EF8:081008780FC0104010403040304057FE904010A010A011101110120814041802 +4EF9:08400840084017FC10403040304053FC9040104010401FFE1040104010401040 +4EFA:01000280044008203018C0061FF01000100010001FF01000100010001FF80000 +4EFB:081008780BC010401040304030405FFE90401040104010401040104017FC1000 +4EFC:080008000BFE1020102030203020502091FC1020102010201020102017FE1000 +4EFD:081008900890108811083104320455FA90881088108810881108110812281410 +4EFE:08000FFE08801080108030F8310851089108120813F810101010101017FE1000 +4EFF:08800840084017FE11003100310051F891081108110811081208120814501820 +4F00:082009200920111011103248324854449882108011101108120817FC12041000 +4F01:010001000280044008203118C1060100110011F81100110011001100FFFE0000 +4F02:1040104010402FFE2040604067FCA44424442444244424542448204020402040 +4F03:08000BF80808111010A0304037FE504290441040104010401040104011401080 +4F04:08000BFC08441044104433FC32405240944017FE10421042104A104410401040 +4F05:08400840084017FC1040324832485248924813F81048104010421042103E1000 +4F06:09000900090011FC12A434A430A4512491241244144410841104120414281010 +4F07:080009F0091011101110320E340053F891081110109010A0104010A013181C06 +4F08:0800088008401020112031003100550495021502150219081108110810F81000 +4F09:08800840084013FC1000300031F05110911011101110111211121212120E1400 +4F0A:08000BF808881088108837FE30885088908813F8108810801100110012001400 +4F0B:100017F81108211021106120613CA10421042288228822502420245028882306 +4F0C:08000BFE0A00120012F8328832885288928812A81290128214821482187E1000 +4F0D:08000BFC084010401040304033F8508890881088108811081108110817FE1000 +4F0E:08400840084017FE10403040304057F892081208111010A0104010A011181606 +4F0F:0840085008481048104037FE3040504090A010A010A011101110120814041802 +4F10:089008880888108010BE37C03080504490441048103010221052118A16061002 +4F11:084008400840104017FE304030E050E091501150124814441842104010401040 +4F12:0808081C09E011001100310031FE511091101110111011101110121012101410 +4F13:080008000BFE102010203040304050D091481244144410401040104010401040 +4F14:080008000BFE12021404300031F05110911011101110111212121212140E1800 +4F15:08400840084013FC10403040304057FE904010A010A011101110120814041802 +4F16:088008800880108017FE3080310051FC91441244124814501420185010881306 +4F17:0100010002800440082010102828C82608200820082014501250228841048202 +4F18:089008880888108017FE30A030A050A090A010A01120112211221222121E1400 +4F19:08400840084010401244324432485450904010A010A011101110120814041802 +4F1A:010001000280044008203018CFE6000000007FFC02000400082010103FF81008 +4F1B:08000BFC0A001208128832503250522092201250125012881308120013FE1000 +4F1C:088008800BF01090109031123112524E944010401FFE10401040104010401040 +4F1D:080008000BFC10001000300037FE50409040108010801108120417FE12021000 +4F1E:010001000280044008203018C1061110091009200100FFFE0100010001000100 +4F1F:08400840084017FE1040304033FC5040904017FE10421042104A104410401040 +4F20:08400840084013F81040308037FE5080910013F81008111010A0104010201020 +4F21:08400840084017FE108030A0312053FC90201020102017FE1020102010201020 +4F22:08000BFC0810111011103110321053FE90301050109011101210141010501020 +4F23:08000BF80A0812081248324832485248924812A812A81120112012221422181E +4F24:08800880090011FE12003440304053FC90441044108410841104110412281410 +4F25:090009080908111011203140310057FE91401120112011101108114411821100 +4F26:0840084008A010A0111032083406511091201140118011001104110410FC1000 +4F27:0840084008A01110120834043BF2521092101210125012201204120411FC1000 +4F28:0900090009FC1204120435043884508490141024104413841104100410281010 +4F29:08800840084017FC1110311031105110911010A010A0104010A0111012081C06 +4F2A:08400A4009401140104037FC30445044908410A4109411141104120414281810 +4F2B:084008200820100013FE3202340450009000100010001000100013FE10001000 +4F2C:080009FC090411041104310431FC512491201120111011101208120814041802 +4F2D:08800840084017FE104030803108521097E0104010801108120417FE12021000 +4F2E:12001200127C22242FA464A464A4A4A824A82928251022102528294830842102 +4F2F:08400840088013FC120432043204520493FC1204120412041204120413FC1204 +4F30:084008400840104017FE30403040504093F81208120812081208120813F81208 +4F31:0840084008A010A0111032083446504091501148124812441444104011401080 +4F32:08000BFC0A041204120433FC32005240924412481270124014421442183E1000 +4F33:08480A480A481248124837FE3248524892481248127812001200120013FE1000 +4F34:08400A4409481150104037FC3040504090401FFE104010401040104010401040 +4F35:1000100017FC24A424A464A464A4A4A424A42524251C26042404240427FC2404 +4F36:0840084008A010A0111032483426502093F810081010111010A0104010201020 +4F37:104010401040204027FC64446444A444244427FC244424442444244427FC2404 +4F38:08400840084017FC14443444344457FC94441444144417FC1444104010401040 +4F39:080009F809081108110831F831085108910811F8110811081108110817FE1000 +4F3A:08000BFC0804100417F43004300453E492241224122413E41004100410141008 +4F3B:08000BF808401040124831483150504097FE1040104010401040104010401040 +4F3C:1008110810882448244864086408A40824102410241025282624244420822102 +4F3D:140014001400243C2FA464A464A4A4A424A424A424A424A428A428BC32A42100 +4F3E:08000BFC082010201040304030D0514892441444104010401040100017FE1000 +4F3F:080008000BFC1204120432043204520493FC1204100010901088110412021402 +4F40:08000BF80A0812081208320833F85200920013FC120412041204120413FC1204 +4F41:08400840088010801110320837FC5004900013F8120812081208120813F81208 +4F42:080008000BFE10201020302031205120913C1120112011201120112017FE1000 +4F43:1000100017FC2444244464446444A7FC2444244424442444244427FC24042000 +4F44:090809080908110817FE310831085108910811F8110811081108110811F81108 +4F45:08400840084013FC10403040304057FE90E01150115012481444184210401040 +4F46:080008000BFC12041204320433FC52049204120413FC12041000100017FE1000 +4F47:08400820082013FE120234043000500093FE1020102010201020102010A01040 +4F48:08400840084017FE108030A0312051FC93241524112411241134112810201020 +4F49:084008400840104013FC30403040504097FE1040108010801110120817FC1204 +4F4A:08200820082013FE12223224322053FC92841288124812501220145014881906 +4F4B:08000BFC088410841084310431145208940011FC110411041104110411FC1104 +4F4C:1120112011202522252265E46528A530252025202520252225E23E22281E2000 +4F4D:088008400840100017FC3000300852089208111011101110112010201FFE1000 +4F4E:0808083C0BE0122012203220322053FE9220121012101212120A128A13261212 +4F4F:08800840080017FC104030403040504097FC104010401040104010401FFE1000 +4F50:088008800880108017FE30803100510091FC1220122014201420182013FE1000 +4F51:084008400840104017FE30803080510093FC1504190411041104110411FC1104 +4F52:08400840084013F81248324832485248924817FE104010A010A0111012081406 +4F53:084008400840104017FC304030E050E091501150124815F41842104010401040 +4F54:084008400840107E104030403040504093FC1204120412041204120413FC1204 +4F55:0800080017FE1008200833C8524892481248124813C812481008100810281010 +4F56:1000108010402028212861086110A51425222522254229882108230824F82800 +4F57:08400820082013FE12023404310051089110112011C011021102110210FE1000 +4F58:010001000280044008203018CFE6000000007FFC010011101108210445040200 +4F59:0100010002800440082010102FE8C10601003FF8010011101108210445040200 +4F5A:104010401240224023FC62406440A0402FFE204020A020A02110220824042802 +4F5B:1120112011202FFC2124612467FCA52029202FFE21222122222A222424202820 +4F5C:09000900090011FE12803280348050F890801080108010FC1080108010801080 +4F5D:11001100120023FC2404680463E4A22422242224222423E42224200420282010 +4F5E:100013F8100020002FFE60806080AFFE21082210261021A02060209023082C04 +4F5F:0880088008F81108131034A0304050A093181C0610C010201010118010601010 +4F60:08800880088011FE110232043420502091281124122412221422102010A01040 +4F61:1040104010A020A0211062086444A84220402444244424442444244427FC2004 +4F62:08000BFE0A001200120033FC320452049204120413FC12001200120013FE1000 +4F63:100017FC14442444244467FC6444A444244427FC244424442444284428543008 +4F64:080008000FFC1100110031F0311051109190125012501210121212921312120E +4F65:0100010002800440082010102FE8C0060210111009100920082000407FFC0000 +4F66:080008000FFE104010403080308051F893081508190811081108110811F81108 +4F67:084008400840107C10403040304057FE90401040105010481044104010401040 +4F68:0880088009FC1104120435F431145114911411F4110411281112110210FE1000 +4F69:100017FC1404240425F464446444A5F425542554255425542574244624462842 +4F6A:080008000BFC1204120432F4329452949294129412F41204120413FC12041000 +4F6B:0880088009F81208151030A0304050A093181C0613F812081208120813F81208 +4F6C:08400840084413F41048305037FE504090801184129814E018821082107E1000 +4F6D:0900090009F8131014A0304031B0564E904013FC1040144017FE104010401040 +4F6E:0840084008A011101208340633F85000900013F8120812081208120813F81208 +4F6F:0A0809080910100017FC3040304053F89040104017FE10401040104010401040 +4F70:08000BFE08201020104031FC31045104910411FC110411041104110411FC1104 +4F71:010001000280044008201010EFEE000000007FFC0100010011F811001100FFFE +4F72:0880088008FC1104128834503020504091FC13041D0411041104110411FC1104 +4F73:084008400BFC1040104030403FFE50009040104013FC1040104010401FFE1000 +4F74:08000BFE09081108110831F83108510891F811081108111E17E8100810081008 +4F75:090408840888100013FE308830885088908817FE108810881108110812081408 +4F76:0840084008401FFE1040304037FC5000900013F8120812081208120813F81208 +4F77:08000BF80A08120813F83208320853F892441248123012201210128813061200 +4F78:081008780BC01040104037FE30405040904013F8120812081208120813F81208 +4F79:1100110013F8220824106BFE6200A2F82288228822A8229022822482247E2800 +4F7A:0840084008A011101208340633F850409040104013F810401040104017FE1000 +4F7B:089008900890149212943098309051989294149210901090111211121212140E +4F7C:10801040104027FC200061106208A4042110211020A0204020A0211022082C06 +4F7D:102010201420227E224260846010A11021102E10222822282248224420842102 +4F7E:081009100908120814043BFA3208520893F81208120813F81208120812281210 +4F7F:104010401FFE2040204067FC6444A44427FC2040224021402080214022302C0E +4F80:10041FC414842494249464946494AFD424942494249424942484288428943088 +4F81:10401240124023FC244068406040A7FE212021202120212022222222241E2800 +4F82:084008200BFE12001200320C32F052209220123E13E0122014221422181E1000 +4F83:100017FC14042404240467FC6000A2482248224822482248224A244A244A2806 +4F84:100017FE104020802110620867FCA0442040204027FC2040204020402FFE2000 +4F85:08400820082017FE10403084310853F090221044118816101020105011881604 +4F86:0100010001007FFC010011101110292845440380054009203118C10601000100 +4F87:1040104017FE204027FC604463FCA240244027FE204220AA20A4211022082C06 +4F88:1080108011F82210252060C06090A3202C7C2084210826902060204021802E00 +4F89:1040104017FC20A0211062086DF6A00027FC2080210023F82008200820502020 +4F8A:084008440A4411481150304037FE5090909010901090109211121112120E1400 +4F8B:1004100417C42214221463D46254A45426542554289420942104220424142808 +4F8C:01000280044009203098CFE6004000803FF800000000FFFE082010103FF80008 +4F8D:08400840084013FC1040304037FE5010901017FE101012101110111010501020 +4F8E:084008400A4811481150304037FE504090E01150115012481444184210401040 +4F8F:08400A400A4013FC14403040304057FE90E01150115012481444184210401040 +4F90:084008400880110013FC3294329452949294129412941294129412941FFE1000 +4F91:084008400FFE1080110031FC3304550499FC1104110411FC1104110411141108 +4F92:08400820082013FE12023444304053FE90881088110810D01020105010881304 +4F93:084008400BF8104817FE304833F85040904017FC104010401FFE104010401040 +4F94:084008400890110813FC30243120512091FC1220102017FE1020102010201020 +4F95:100017FC10402040208067FC64A4A4A424A424A424A424A424A4248424142408 +4F96:010002800440082037D8C00600003FF82488248824883FF82488248824A82010 +4F97:100017FC1404240425F464046404A5F425142514251425F42404240424142408 +4F98:08400820082013FE12023404303853C090401040107E17C0104010421042103E +4F99:082808240824102017FE3020302057E0912011101110111011CA170A12061002 +4F9A:08800880090011FC1204340433E45224922413E41224122413E4100410281010 +4F9B:091009100910111013FC311031105110911017FE100011101108120814041804 +4F9C:088009000BF812081288324832485FFE92081288124812481208120814281810 +4F9D:08800840084017FE108030803140514493481530192011101108114411821100 +4F9E:090009000900111E17D232523252525292521492129211121292125E14521800 +4F9F:08400840084017FE10803080317C51089310151011FE11101110111011501120 +4FA0:08400840084017FC10403248315050409FFE10A010A011101110120814041802 +4FA1:100017FE10A020A020A067FC64A4A4A424A424A424A424A424A427FC24042000 +4FA2:08000FFC0840104013F83248324853F8924812481FFE12081208120812281210 +4FA3:100013F8120822082208620863F8A000200027FC240424042404240427FC2404 +4FA4:088008880BE8109010A037FE3080510093FC1480190011F81008100810501020 +4FA5:0880088008BC13C01050302430D4530C900017FE1090109011121112120E1400 +4FA6:08400840087E1040104033F832085248924812481248124810A0111012081404 +4FA7:100417C414442454255465546554A55425542554255421042284224424142808 +4FA8:081008780BC01040104037FE30A0511092081516111011101110121012101410 +4FA9:0840084008A011101208340631F05000900017FC104010801110120817FC1204 +4FAA:088008400FFE1208111030A0304051B0960E1110111011101110121012101410 +4FAB:088008401FFE12001200320033FC508090801FFE110812081390106011981604 +4FAC:10401040104027FC248468886140A14423482530292021102108214421822100 +4FAD:08000BF80A08120813F8322032205210920814C61420180011C0103010081000 +4FAE:0900090009FC120015F831083148512897FE11081248122813FC100810501020 +4FAF:08000BF80808100817FE3100310053F8944010401FFE104010A0111012081C06 +4FB0:08000BF80888108817FE3088308853F89100110013F815081908110811F81108 +4FB1:08000BF80A081208120833F83000500097FC1040104013F8104010401FFE1000 +4FB2:08000BFC0A00120012F83200320053FC92A012A412A812901290148814A418C2 +4FB3:084008400A4812481248355438E25040904017FC10401040104010401FFE1000 +4FB4:01000280044008203018CFE600003F04092409243F241124112417A47804200C +4FB5:08000BF8080811F8100833F8300057FC940413F01110111010A0104011B0160E +4FB6:080009F8090811081108310831F85040908013FC120412041204120413FC1204 +4FB7:08000BF80A08120813F83200320053FC920412F41294129414F4140418281010 +4FB8:08000FFC0800100013F8320832085208920813F810001208110811101FFE1000 +4FB9:1000100C1770211021106210627CA710211025102510227C2200250028FE3000 +4FBA:08400A480A48124813F8304030A0511092881446104013F01010102010201040 +4FBB:0A0809080910102013F832083208520893F810A010A0112011221222141E1800 +4FBC:082008200BFE1020102033FE3202540491F81010102013FE1020102010A01040 +4FBD:0BF80A480A4813F81248324833F85080908017FC108411041104120414281810 +4FBE:084008440BF41048104837FE3020504093F81110122015FE1820102010A01040 +4FBF:100017FE104027FC2444644467FCA444244427FC224021402080214022302C0E +4FC0:0808083C0BC01044122431283100504093FE1088110813901060105011881604 +4FC1:080008F80888108812F83200320053FC9044104417FE104010A0111012081406 +4FC2:0804081E0BE01080110833F030205048918417FE102211281124122214A21040 +4FC3:08000BF80A0812081208320833F8504090401240127C12401240154018FE1000 +4FC4:102811A41724212021206FFE6120A12421A423282D2821102112212A25462282 +4FC5:085008480848104017FE304032445164916810D0115012481444104211401080 +4FC6:0840084008A01110120835F63040504097FC1040125012481444184411401080 +4FC7:08000C400ABE110812883488308850BE918812881488108810881088153E1200 +4FC8:08400A400A4013FC14403840304057FE9000100013F812081208120813F81208 +4FC9:08000FFC0880108013F83108310857FE9000100013F812081208120813F81208 +4FCA:084008400888110413FE300230885144924210F8118812501020105011881606 +4FCB:08000BF80A08120813F8300037FC54449444144417FC14001402140213FE1000 +4FCC:1048104417FE2040204067FC6444A44427FC2444244427FC2444244424542408 +4FCD:088008400BF81208120833F83208520893F81240124412281210128813061200 +4FCE:100011F811082908250845F891081108110811F8290825084508810807FE0000 +4FCF:08400A4809481150104033F83208520893F81208120813F81208120812281210 +4FD0:108411C417042114211461146FD4A11423142394255425042904210421142108 +4FD1:100017F8101021A0204067FC6444A44427FC2444244427FC2444244424542408 +4FD2:084008200BFE1202140431F83000500093FE10901090109011121112120E1400 +4FD3:08000BFC080011241248349032485124900013FC104010401040104017FE1000 +4FD4:08000BF80A08120813F83208320853F89208120813F81120112012221422181E +4FD5:1080104017FE2402284460406040A7FC20E02150215022482444284220402040 +4FD6:100017FC1020204020D061486644A040200023F8220822082208220823F82208 +4FD7:091009080A041444104030A0311052089C0613F8120812081208120813F81208 +4FD8:0808083C0BC0100412443128300053F89010102017FE10201020102010A01040 +4FD9:1208111010E02110220860806FFEA140224027FC2A4422442254224820402040 +4FDA:100017FC1444244427FC64446444A7FC2040204027FC2040204020402FFE2000 +4FDB:0900090009F01210122037FC3A445244924413FC12A410A0112012221422181E +4FDC:1040104017FC244427FC644467FCA0003FFE2100220023FC2004200420282010 +4FDD:08000BF80A081208120833F83040504097FC10E0115012481444184210401040 +4FDE:01000280044008203018CFE600003E0822483E4822483E48224822082A282410 +4FDF:104010801110220827FC61046100A3F8244020402FFE204020A0211022082C06 +4FE0:08400840084017FE1040324832485248955418A210A011101110120814041802 +4FE1:084008200BFE1000100031FC3000500091FC1000100011FC1104110411FC1104 +4FE2:0880088009F8131014A0304031B05E4E90801320104411881610102010C01700 +4FE3:08000BF80A08120813F83000300057FC904010401FFE104010A0111012081406 +4FE4:09080888089013FC1024302433FC5220922013FE106210A2112A122414201020 +4FE5:104010401FFE204027FC64446444A7FC2444244427FC20403FFE204020402040 +4FE6:1040104017FC204023F8608067FEA090211021FE221022902450281020502020 +4FE7:08200820082013FE10203020302051FC9040102010A41282128A128A14781000 +4FE8:08000BFC089012941198309033FE520092001200120012001200140014001800 +4FE9:10001FFE1120212021206FFC6924A92429242AA42A542C4C2884280428142808 +4FEA:10001FFE1000200027BC64A464A4A4A426B425AC24A424A424A424A424A425AC +4FEB:08400840084017FC10403248314851509FFE10E0115011501248144418421040 +4FEC:108811C81F08210821086FD06110A3102390255425642922217E212221022100 +4FED:0840084008A010A01110320835F6500090881048124811501110102017FE1000 +4FEE:1080108011F821082A906C60A9982E2628C02B10282028C82B10206021802600 +4FEF:1040102017FE2400248864886508A57E27082548252825282908290831282110 +4FF0:100011801700211E21126FD26112A3122392235225522512291E211221002100 +4FF1:08000BF80A08120813F8320833F8520893F8120812081FFE1000111012081404 +4FF2:12101110111027D0203E62926252A452289222922112211222A224A2284A2084 +4FF3:089008900890179E109030903090539C909010901090179E1090109010901090 +4FF4:10A0109010BC27C8205060646194AE0C20A0209020BC27C82050206421942E0C +4FF5:1040104017FC2040204063F86040A0402FFE2088215023202510294821862100 +4FF6:0900090009DC11141114311437D4501491141114158815481948111415141222 +4FF7:100017BE14AA24AA24AA67AA64AAA4AA24BE27A024A024A024A228A22AA2311E +4FF8:084008400FFC104013F8308037FC51109248144611F0104017FC104010401040 +4FF9:08000FFE089010901090339C320452049204139C109010901090109017FE1000 +4FFA:084008800BFC11101248344633F85248924813F81248124813F810421042103E +4FFB:0880088009F81208151030E033185C0693F81248124813F81248124813F81208 +4FFC:088008400FFE1100120837FC300453F8920813F8120813F81208120812281210 +4FFD:101010901710243E242264446790A51025102510252825282528294429443082 +4FFE:084008800BFC1224122433FC3224524493FC1090111017FE1010101010101010 +4FFF:08400840087C104013FC3244327053C09244123C120012F0149014921912120E +5000:080009FC090011F8110031F831005FFE92801248125012201210128813061200 +5001:09000900090013DE129234923092509293F2109210921152115E122014201800 +5002:08840884090813DE110831083108510897BE1108110811081108120812081408 +5003:1110111013D8225424526A906110A2FE2C00200023F822082208220823F82208 +5004:09080890086011981644304037FE508091FC130415FC110411FC110411141108 +5005:088008400BFC10001110311032A854449000104017FE10401040104010401040 +5006:100017FC1040204027FC64446444A6642554255426EC24CC2444244424542408 +5007:1080104017FE24022A04620063BCA4A424A426A429342128222222222422281E +5008:08400840084017FC1040324832485248955410E0115011501248144418421040 +5009:0100028004400A203118DFF610101FF010101FF010002FF8280848088FF80808 +500A:089008900908114812443492310853FC9044102010A41282128A128A14781000 +500B:100017FC1444244427FC64446444A5F425142514251425F42514240427FC2404 +500C:084008200BFE1202140431F83108510891F81100110011FC1104110411FC1104 +500D:088008400BFC100012083108311057FE9000100013FC12041204120413FC1204 +500E:08900890089013FC12943294329453FC92941294129417FE1000109011081204 +500F:1080108011F821082A906C60A9982E46285028482BFC284028A0211022082404 +5010:0840084010FC10883550542094D81706142014A414A415281450104810841302 +5011:100017BC14A424A427BC64A464A4A7BC24042404240424042404240424142408 +5012:100410041FC422142214649467D4A114211427D42114211421C42E0424142008 +5013:08400A440A44144810A0311036085044904012481248145010A0111012081C06 +5014:100017FC1404240427FC64206524A524252425FC242025242524292429FC3004 +5015:081008780BC01040104037FC324852489FFE1248124817FC1040104017FC1000 +5016:084008400FFC1040104037FE311050A097FC104010401FFE1040104010401040 +5017:100017BC14A424A424A467BC64A4A4A424A427BC24A424A424A424A42AA4314C +5018:1040124811482150204067FC6404A40425F425142514251425F4240424142408 +5019:100013F8100828082FFE69006900ABF82C4028402FFE284028A0211022082C06 +501A:084008400BFC10A01110320837FE500893C812481248124813C8100810281010 +501B:090809080FFE1108110831F83108510891F81108110817FE1000109011081204 +501C:100017FC1444244425F464446444A7FC240425F42514251425F4240424142808 +501D:08100810FF9008107F1041107F1041107F1049100828FFA80848084408840902 +501E:088008400FFE1000100033F83208520893F81040125012481444184411401080 +501F:09100910091017FC111031103FFE500093F81208120813F81208120813F81208 +5020:09400920092013FE122036203BFC5220922013FC12201220122013FE12001200 +5021:09F80908090811F81108310831F8500093FC1204120413FC1204120413FC1204 +5022:1040104017FE204023F8604867FEA04823F820402240227C2240254024FE2800 +5023:1410121012102FA0243E644467A4A4A424A824A8249024902AA8292830442082 +5024:082008200BFE104011FC3504350455FC950415FC1504150415FC140017FE1000 +5025:08400820082013FE1202349431085204900011FC102010201020102017FE1000 +5026:10401248115027FC208061006FFEA21024082BF43212221022502224220421FC +5027:1080104017FE2402280463F06000A00027FC2040225022482444284421402080 +5028:08000BFC0A04120413FC3220322053FE9220122012FC12841284148414FC1884 +5029:084008400FFC104013F8304037FE500093F8120813F8120813F8120812281210 +502A:080008400B9C12041204339C3204520493FC109010901090109011121212140E +502B:1040104010A0211022086DF66000A7FC24A424A427FC24A424A424A424142408 +502C:08400840087E104013FC320433FC520493FC1244104017FE1040104010401040 +502D:08380BC00840104017FC315032485486908017FC1110121011A0106010901308 +502E:08000BF80A48124813F83248324853F8904017FC10E011501248144610401040 +502F:12081228122822282FA462446254A69227102AA02A203228224422FC22442200 +5030:1040104017FC204020406FFE6208A484288221F82208251020A0204021B02E0E +5031:100017FC1404240427FC64046404A7FC20002420242227AC2430242225A2261E +5032:104010401FFE2040204067FC6444A7FC244427FC24E421502248244438422040 +5033:104010401FFE204027FC644467FCA04027FC20443FFE204427FC204021402080 +5034:084008400FFE10A01150324835F650409150111017FE11101110111012101410 +5035:081008180BD41014101037FE30105090909012D012901290128A12EA17061202 +5036:08000BFC0A04120413FC320433FC5204920413FC100017FE1000110812041402 +5037:084008400FFC10A01110320835F65000900017FC104012481244144411401080 +5038:0808083C0BC01044122431283100502093FE107010A810A81124122214201020 +5039:0840084008A01110120835F63040504093F81248124813F810A0111012081406 +503A:084008400FFC104013F8304037FE500093F8120812481248124810A011101608 +503B:10001FDE14922492249467946498A49427922492249225DA2E94209020902090 +503C:084008400FFC1040104033F8320853F8920813F8120813F8120812081FFE1000 +503D:0840084008A01110120835F63040504097FC1040104013F81208120813F81208 +503E:100010FE14102420247C64446754A45424542454255426542420202820442082 +503F:088008400BFC10001108309037FE5040904017FE108811081090106011981604 +5040:1110111017FC21102150604063F8A248224822482FFE204020A0211022082406 +5041:103E17C0108424442208604067FCA444244427FC244424443FFE240424142408 +5042:09080888089017FE100033C43254525493D41254125413D412541244125412C8 +5043:08000BFE0A0012FC128432FC328452FC922013FE124812C812301248128413FE +5044:100017FC1040208027FC64A464A4A4A42484244C20402FFE20A0211022082C06 +5045:1008103C17C020402FFE604067FCA44427FC244427FC204027FC20402FFE2000 +5046:1040104017FC204023F860806FFEA110220827FC2A0A220823F82208220823F8 +5047:100017BC14842484248467BC6400A40027BC2424242427A82410242824442482 +5048:08000BF80A0813F8120833F8310053FC9444124412A4120413F4100410281010 +5049:088008800BF8110817FE300033F8520893F8104017FC1040144017FE10401040 +504A:0804081E0BE0102011FC3124312451FC902013FE1222122A12FA1202120A1204 +504B:08000BFC0A04120413FC32003284524892FC1248124813FE1448144818881108 +504C:1108110817FE21082148604067FEA080210023FC250429042104210421FC2104 +504D:08000BF80A08120813F83208320853F8900017FE1040124012781240154018FE +504E:08000BF80A48124813F83248324853F8900017FE124012441228129013081206 +504F:1080104017FC2404240467FC6400A40027FC26A42AA42BFC2AA42AA432A4220C +5050:084008200BFC10001108309033FE5210922012C81210122412C8141014601980 +5051:20002FF8280848684B884888C8884BE84AA84AA84BE8488A48AA50EA57266002 +5052:08000BF80A0813F8120833F830005FFE920013FC149419241244148411281210 +5053:08000BFC0A04120413FC320033FC5240928813FC1224122015FC1420182013FE +5054:08000BDE0A52125213DE300031FC500097FE1080110011FC1004100410281010 +5055:0A200A240BA8123012A23322325E508093FC1204120413FC1204120413FC1204 +5056:084008440BF41048105037FE3040508091F81308150811F81108110811F81108 +5057:0820082009241122122A303030C0570091FC110411FC110411FC110411FC1104 +5058:08000BF80A0812081208320833F85000900017BC14A414A414A414A417BC14A4 +5059:088008400BFC10001108309037FE5442984413FC124412441254124810401040 +505A:1210121012102FA0223E62446224AFA428A428A828A828902FA8282820442082 +505B:1008103C17C0204020406FFE6040A140265C24442444275C2444244427FC2404 +505C:1080104017FC200023F8620863F8A0002FFE280223F820402040204021402080 +505D:089008920F9C10901192368E300053FC920413FC120413FC1204120412141208 +505E:08900A900A9017FE1290329032F0520093FC104017FE10E0115012481C461040 +505F:084008800BF8120813F8320833F8500097FC1040104013F81040104017FC1000 +5060:08000BFE0850105013FE3252325253FE9000104017FE10881190106010D81304 +5061:090809080FFE110811F8310831F85108910817FE125012881304120013FC1000 +5062:13901E101210221222526FD46258A69027102AA82A2832282248224422842302 +5063:088008400FFC1000120831103FFE500093F81208120813F81208120813F81208 +5064:09080888089017FE1090309033FC52949294130C120413FC1204120413FC1204 +5065:1020102010FC2E2423FE622464FCA4202EFC222022202BFE2420262029FE3000 +5066:08000BFE08221120113C312032FE540091FC110411FC110411FC110411141108 +5067:1000108017FC211022086C8661F8A610216021A02E7E21842648203020C02F00 +5068:1120112415A82530252465A46E1CA040204027FC20E0215022482C4620402040 +5069:090009000BF8120814103BFC320453FC920413FC120413FC1000110812041402 +506A:100017FC100023F82208620863F8A00027FC2444244427FC2444244427FC2404 +506B:111011101210247C2910611062FEA6082A0822FE220822482228220822282210 +506C:1100110013FC24942B9461646254A4842128221020402124252A250A28F82000 +506D:08000FFE0840108013FC3294329452F49294129412F412941294129413FC1204 +506E:080009F80908110811F8300037FE510891F8110811F81108113E17C810081008 +506F:088008400FFE100013F832083208520893F810A4112813101510194811861100 +5070:0900093C0FD411141394311437D45124914C104017FE104010A0111012081C06 +5071:103C17E01420242027FE642065FCA504250425FC250425FC2904290431FC2104 +5072:08000BFC0A44124413FC3244324453FC9000104010241522150A190810F81000 +5073:104014441444244427FC60006FFEA040208027FC24A424A424A424A424A4240C +5074:100217C21442245227D264526452A7D22452245227D2200222822242244A2804 +5075:1040107E1040204027FC64046404A7FC240427FC2404240427FC211022082404 +5076:100017FC1444244427FC64446444A7FC20402FFE284228522BF22912280A2804 +5077:084008A00910120815F6300033C45254925413D41254125413D41244125412C8 +5078:09C008A00910120815F6300033CA524A925413D41268125413D4124A124A12C0 +5079:0840084010FC10883550542094D8170614F814A814A814A814F810A810A810F8 +507A:091009100BD8125414523A90311052FE9C0013F81208120813F81208120813F8 +507B:0820092408A8102013FE30A831245202904017FE108811081190106011981604 +507C:08400840087E104013FC300431FC500493FC10401240127C1240154014FE1800 +507D:08400A40094017F81088309030FC5104910813FE1202142A1AAA128214141008 +507E:1040104017FC204022486FFE6208A00027FC240424442444244420B0230C2C02 +507F:08400A480950104017FE3402380451F09000100017FC10801110120817FC1204 +5080:1040108017FC2444244467FC6444A48427FC208021502164227C24422842303E +5081:1140165C14442444275C64446444A7FC204027FC2208211020A0204021B02E0E +5082:1004103E17E0243E242065FE6522A53825E2251E250029782A48324A248A2906 +5083:084008400FFC104013F8304037FE5080911013E0104817FC1044124815441080 +5084:104010401FFE244422A861106208AC0623F8220823F8220823F8220823F82208 +5085:085008480FFE104017FC344437FC544497FC144410081FFE1208110811281010 +5086:100017FE1420244025FC650465FCA50425FC2524242024A829242A2230A02040 +5087:090809080FFE1108100037FE310851F8910811F81108113E17C8100810081008 +5088:100017FC10A020A027FC64A464A4A7FC2040204027FC20E0215022482C462040 +5089:08000BFE0A0012FC120033FE32A8529092C81286120813FE1288144814081818 +508A:080009F80908110811F8300033FC520493FC120413FC120413FC109011081204 +508B:091009100FFC111013F8311037FC504093F8124813F8124817FE120812281210 +508C:08000BFC0A4013F8124033F83240524093FC1004155415541554140410281010 +508D:1080104017FC2208211067FE6402A884204027FC210021F82108220822282410 +508E:1040104017FC204023F8620863F8A20823F8220823F822082FFE211022082404 +508F:1040102017FE242025FC642467FEA42425FC242025FC25042504290429FC3104 +5090:1080104017FE200023F8620863F8A00027FC240425F4251425F4240424142408 +5091:1208120813BE24882AA8613E6208A448284827FC20E0215022482C4620402040 +5092:083C0FC00A4411281080311033E05040918813FC1044104017FC10A01110160E +5093:1080104017FE2402240267FE6400A7DE24422652254A24C62B5A2842314A2084 +5094:0A080910080017FE10A037FC30A45FFE90A417FC10A011B012A81CA610A010A0 +5095:1080108017FE2522211063FC6620AA2023FC2220222023FC2220222023FE2200 +5096:0840084008A01190124837FE3A0853F8920813F8120013F81508150819F81108 +5097:088008400FFC1080110833F03060518497FE100217FC144417FC144417FC1404 +5098:01000280044008203118D116111029284544111029284544FFFE010001000100 +5099:088808880BFE1088108837FE308051FC932415FC112411FC112411241124110C +509A:1410121012102FA0203E654464A4A8A431282528221022102528292830442082 +509B:084008200BFE120214943108326450909108120415FA11081108110811F81108 +509C:1004103E17C02244212461286200A3FC244020402FFE20402444244427FC2004 +509D:08000BF80A0813F8120833F83000500097BC108414A4129414A4108412941108 +509E:09080888089013FC104031F8304053FE9080110011FC12201420182013FE1000 +509F:092009100A081486191033F83008500097BC108414A4129414A4108412941108 +50A0:1204110411042FC4203E67846004A7A420142794248424842484278424942008 +50A1:1410120812082FBE2000608268A2A8A22492251225142114220421882E3E2400 +50A2:1080104017FC2404200063F86080A144266820B02128266820A4212226A02040 +50A3:084008400FFC104013F8308037FC511092481446124811501248144411401080 +50A4:1110111417D221102FFE62106210AFD4241429142FD4210821CA2F1A25262142 +50A5:08400A480950104017FE3402380453F89208120813F810A0112011241224141C +50A6:080009F8090811E8112837FE340251F8910811F8110811F81108110811281110 +50A7:1080104017FE2402281463E06200A20023FC221022102FFE2000211022082404 +50A8:1020102018FA2424242861FE6020BC4024FC25442644247C25442644247C2044 +50A9:102810241740217E21C86948657EA5482248227E254825482948207E20402040 +50AA:1080111013F8221024A46FBE6042A0A023182C46219026642188263021C02E00 +50AB:100017FC144427FC244467FC6100A21027E020C823042FFE2042224825442882 +50AC:08200A220BFE1090108831FE3310551091FE1110111011FE1110111011FE1100 +50AD:102017FE142025FC242467FE6424A5FC242025FC252425FC252429FC2924312C +50AE:08A008A00FFE10A017FC34A437FC54A497FC100013F8120813F8120813F81208 +50AF:084008800BFC124412F4331432A4524492A413FC104010241522150A190810F8 +50B0:10401444144427FC200067BC64A4A4A427BC24A424A427BC24A424A42AB43148 +50B1:11241124122424242954614A6292A6102A102250225C2250225022B0229E2300 +50B2:121012101FD022202FBE6244BFA42424242427A824A8249024A829A828443082 +50B3:10401FFE104027FC244467FC6444A7FC20422FFE20102FFE2210211021502020 +50B4:100017FC140024F82488648864F8A40025DC25542554255425DC240027FE2000 +50B5:08200BFE082011FC102033FE300051FC910411FC110411FC110411FC10881104 +50B6:10141012101027FE2410649064D2A49227F22494249425C82AAA289A31A62042 +50B7:090009FC0A0015F8110831F8310851F8900017FE110013FC14A4112412541088 +50B8:1040104017FC2040255462486554A04025542248255420A020A0211022082C06 +50B9:088008400BF8111010A037FE300053F8920813F8120813F81120112212221C1E +50BA:090009100BDC125415543288310852F49402100013FC10401150124815441080 +50BB:084008800BFC12941264329433FC50909108128414FA11081290106011981606 +50BC:1110111017FE211021F0604063F8A24823F8204027FC20402FFE20A02110260C +50BD:104017FC111020A02FFE600063F8A20823F8220823F820402FFE204020402040 +50BE:100011FE1010242024FC64846784A4FC248424FC2584268424FC204820842102 +50BF:100017FC1040227822406FFE6100A1FC220023FC200425542554280420282010 +50C0:12A812A817FC22A822AA64E66800A7FC2444204023F822482248224822582040 +50C1:1008103C17C02040224861506FFEA15022482C46208020442A422A1231F02000 +50C2:104013F812482FFE224863F86040A3F8224823F820802FFE211020E023182C04 +50C3:111011101FFE2110240067FC6804B7F4249427F4249427F42494249424342008 +50C4:10001FFE10A027FC24A464A467FCA00027FC20002FFE20402248244429422080 +50C5:111011101FFE211021F0604067FCA44427FC20402FFE204027FC20402FFE2000 +50C6:1020182015FE242021FC61246DFCA52425FC242025FE242024202A2031FE2000 +50C7:08000FBC088414A4129434A430505188962610C0131010641388103010C01700 +50C8:13F8120813F8220823F8600067FCA4A424A427FC200023F8211020E023182C06 +50C9:010002800440082037D8C00600003EF8228822883EF808200820145022884104 +50CA:100017FC10A027FC24A467FC6040AFFE2110220827F62A1023F02204220421FC +50CB:084008A0091012481DF63020304053F8920813F8120813F8120813F811101208 +50CC:121012101F9022202FBE6AC46AA4AFA42AA42AA82FA822103FA8222822442282 +50CD:11C8170811082FE8211E67CA654AA7CA254A27CA210A27CA211221D22E2A2444 +50CE:100017BC14A427BC242064A4639CA000211027FC211021102FFE211022082404 +50CF:090009F00A1017FC1A24324433FC5080914416A81130166810A8112416A21040 +50D0:088808500BFE102011FC302033FE512490A817FE100011FC1104110411FC1104 +50D1:103813C0108027FE2110620865F6A91021F0200027FC240425F4251425F4240C +50D2:1080104017FC2514220863F86088A7FE208823F8210023F82508290821F82108 +50D3:08400BF80A4813F8104037FE300053F8920813F8120813F8120813F811101208 +50D4:090808900FFE109013FC3294331C520493FC120413FC100817FE110810A81010 +50D5:10A014A412A820A027FC611060A0A7FC204023F8204027FC20A0211022082C06 +50D6:104017FC104023F8200063F86208A3F821102FFE200023F82208220823F82208 +50D7:08880AAA0ADC148811543222300053FE9242144413FC10441044108411141208 +50D8:220832482A484A90421E5FE4D0545054575455545554554857485054515450A2 +50D9:1110111017FC211021106FFE6040A7FC244427FC244427FC2000211022082404 +50DA:1040104017FC20A02514620867FCAA0A23F8220823F820402248244429442080 +50DB:1510151015102F90253E67226544A790251025102F902028252828A430442082 +50DC:102017A410A822922114620865F4A80223F82208220823F8220821102FFE2000 +50DD:17FC140417FC240025F8641067FEA4202460279C2484250829DE2F0831082318 +50DE:1004103E17C02244212863F86208A3FC220423FE240226AA2AAA2A0230142008 +50DF:124812481554275C22486554675CA2482FFE22202228222825142494242C2844 +50E0:08780FC00A48115017FC31503248540693F81248124813F81248124813F81208 +50E1:104010401FFE204027FC644467FCA44427FC20442FFE204220242522250A28F8 +50E2:103C17C010442224210867FE6402AA08220823BE24882AA8213E220824082808 +50E3:1110111017BC21102FFE611062A8A44423FA2208220823F82208220823F82208 +50E4:08000BDE0A52125213DE300031FC512491FC112411FC102013FE102010201020 +50E5:1040104017FC20402FFE611067BCA1102190263E20002FFE2120212222222C1E +50E6:141412121F922010207E6F906890A8902F9022282B282AA83228224A2A4A2486 +50E7:09040888080013FE122232AA3272522293FE100011FC110411FC110411FC1104 +50E8:104017FC104021102FFE611063F8A20823F8220823F8220823F8211022082404 +50E9:179E1492179E2492279E640264F2A49224F2249224F224922492253224022406 +50EA:08000BFC0848103013FE305230945350902013FE1252128A1376125212721206 +50EB:08000FFE08901090139C32043204539C9090109017FE10401524150A190A10F8 +50EC:1140112013FE222026206BFC6220A22023FC2220222023FE2200252424922892 +50ED:100017BC1108252827BC631865AAA946200023F82208220823F82208220823F8 +50EE:08400BF8091010A017FC300033F8524893F8124813F8104013F8104017FE1000 +50EF:10401248115027FC215062486444A208220823BE24882AA8213E220824082808 +50F0:10101010FEFE1010FEFE929292923838545492921010111002800C603018C006 +50F1:084008200BFE1202120233FE3250524892FE139012FE129014FE149018FE1080 +50F2:100017FE10A027FC24A464A467FCA208220823BE24882AA8213E220824082808 +50F3:100017FC10A020A027FC64A464A4A7FC2248215027FC20E0215022482C462040 +50F4:100017BC14A427BC24A467BC6404A5F4251425F4251425F42514240424142408 +50F5:10001FFE100027FC244467FC6444AFFE200027FC244427FC244427FC20002FFE +50F6:100017FC14A424A427BC60A067BCA4A424A427BC24A424A427BC24A220A2207E +50F7:110817FE1108200024886FFE6488A4F8240027FC20402FFE215022482C462040 +50F8:1110111017BC211023B865546912A00023F8200027FC20402248244429422080 +50F9:10001FFE11202FFC29246FFC6000A7F8240827F8240827F8240827F822102408 +50FA:13F81208120823F8200067BC64A4A4A427BC20402FFE21602250244838462040 +50FB:10101008178824BE248064946788A47E2408278826BE2A882A882B8832882008 +50FC:10A010A017FC24A427FC64A467FCA00027FC200023F8220823F8211020A02FFE +50FD:10C81708112A212C2FC861086388A55429142122204020242522250A290820F8 +50FE:083C0BC008441224110837FE344252A4928A147A108010F8110812901060179E +50FF:1080104017FE25122BFC611067FCA11027FE2110224825F42842204027FC2000 +5100:111017FE104023FC204067FEA080272821242FFE212021A42F1A2112276E0000 +5101:1140112013FE222027FC6A2063FCA22023FE2200279E2492249224F224022406 +5102:08900BFC0A9413FC129433FC300053FC920012F8120013FE1520151415481986 +5103:10401FFE100027FC240465F46514A7FC200023F8220823F8220823F820002FFE +5104:088008400BFC1108109037FE300053FC920413FC120413FC10401524150A18FA +5105:10401248115027FE2402680463F8A20823F8200027FC244427FC244427FC2404 +5106:1288128817E82290241E67E46454A85427542554255427482548205422942122 +5107:08000BFC0A94129413FC300037FE500093FC120413FC10A2111413081D441182 +5108:104010A013182DF6200067FC6554A4E427FC200023F8220823F8220823F82208 +5109:1040104010A02110220865F66800A7BC24A424A427BC22102210252829443082 +510A:1110111017BC211023B865546912A00027FC2044224022782240254028FE3000 +510B:120013F8141027FE2D48762467FEA40025FC240025FC240025FC290429FC3104 +510C:121014101F9028902FBE68A46FD4A41422142FD424142788248828942A943122 +510D:082008880A5213261252328A322253FE90881144127A10881150102010D81706 +510E:111417D211102FFE21106FD06112A7D2255227D4255427C8210A2FDA21262142 +510F:108010DC128423D424486A946324AC402248215027FC20E0215022482C462040 +5110:1080104017FE24022BFC61486250A7FC220427FC2A0423FC220423FC21082204 +5111:08000BFE0A0213FE120233FE31085252939C1108125213DE100012A412521452 +5112:100017FC10402FFE284263586040A35820002FFE204027FC24A424A424A4240C +5113:10401FFE104027FC200063F86208AFFE280227FC211023F8204027FC20402FFE +5114:104017FC104023FC20006FFE6002A3F8204027FE200027FE200827FE24A82798 +5115:1080104017FC211020A46F586554A5522B582000220823F8220823F822082408 +5116:101017D0151027DE245067E86504A7C4200023F822A822A822A822A82FFE2000 +5117:1400157C160424A82390607C6414A7942A5022502FDC2250255024B0289E2100 +5118:08400BF8084817FE104833F8304057FE900012A4145213F812A812A81FFE1000 +5119:101014FE129222FE201061FE6000AEFE228222FE228022FE228222FE250028FE +511A:088808880BFE108813FE325233FE500093FE124210F811081290106010C01700 +511B:1100120017FC2AA822A86FFE62A8A2A82FFE220823BE24882AA8213E22082C08 +511C:1080104017FC244422A862946474A00023F822A82FFE200027FC204021402080 +511D:1110155415B8291022A864446000A7FC2444204027FC20E0215022482C462040 +511E:100017FC124824442FFE644466ECA55426EC244426EC255426EC244424542408 +511F:0A4809500FFE140211F8310833FC520493FC120413FC120413FC110812041402 +5120:09240A480924100013FC32943264529493FC124813681248136A124A12461362 +5121:13F81248124823F82248624863F8A0002FBE2AAA2AAA2FBE2AAA2AAA2FBE28A2 +5122:1020103E102027FE242265F86422A5FE252425FC252425FC28402AA4328A247A +5123:1040102017FE248825FC648867FEA42025FC252425FC252429FC288831042202 +5124:0BF80A080BF8120813F8311037FC51109FFE11101248155410E01150124810C0 +5125:08200BFE082011FC100033FE325253FE910411FC110411FC110411FC10881104 +5126:1080104017FC24A027FC64A467FCA400252425A8253025A4251C28002AA43452 +5127:12081FBE12082FBE2208651468A2A7FC240427FC240427FC240427FC21102208 +5128:08420B9C0A1013DE12943294342053FC920413FC120413FC120413FC11081204 +5129:10001F7C1944297C2F446944697CAF20297E29AA2F2A204A2A922922294A3104 +512A:17FC108013F8220823F862086FFEA8822548251428F4210023F8250820F02F0E +512B:104017FE100021F8210861F86000A7FE240223F82180264421B8266821A62E60 +512C:1200123C1FA422242FBC62247FE4A03C2FA428A42FBC28902F9828A828AA29C6 +512D:1400123C1FA4202428BC65246FA4A23C22242FA4223C2B102A9832A82A2A2446 +512E:100017FE14442598248867DE6488A5DC26AA248824202520253C2920292037FE +512F:1248115017FC20802FFE620867FCAA4223F8224023F8224023FC200425542008 +5130:11101FFE1110203C2FC064886250A7F8240827FC240427FE28022AAA32AA2004 +5131:142012201FBE2520223E7F82603EAFA028BE2FA028BE2FA028BE28A028A2299E +5132:14101210127A2F1220146F7E6008AF10203C2F6429A4293C29242F24293C2024 +5133:09F00A100FFC120413FC322433B8522291FE121017FC124413FC10D0114A163E +5134:104017FC100023B822A863B86110A7FC211027FC21102FFE212823102D482186 +5135:108011F812882070238E680069FCA92429AC292429FC282029FC202023FE2154 +5136:0A220BFE089011FE131035FE311051FE911011FE110013FE128A137612521276 +5137:17BE100017BC24A426B464A46040A7FE24A027FC24A427FC251229DC291231CE +5138:100017FC14A424A427FC621062A8A4BE2F68223C24A82FBC20282AA82ABE2020 +5139:152817BE194827BE231865AA6946A3FC220423FC220423FC220423FC21082204 +513A:151815141F90253E272862686FBEAAA82FA8223E2FA822283FE8253E28A03060 +513B:1248115017FC240421F0611067FCA55424E427FC204027FC20402FFE22A42452 +513C:17BC14A417BC200027FE64006590A49E27D4256425D4255425D425682BC83054 +513D:17FC144417FC24442FFE6AAA6FBEAAAA2FBE222027C020842FFE204225482884 +513E:104017FC124823F820406FFE6AAAA3B8211027FC21102FFE212823102D482186 +513F:08400840084008400840084008400840084008400840104210422042403E8000 +5140:00000000FFFE08400840084008400840084008400840104410442044403C8000 +5141:0100010002000440082010103FF804480440044004400840084210422042C03E +5142:0100010001007FFC01001100110021003FFE02800480048008841084207CC000 +5143:00003FF8000000000000FFFE04400440044004400840084210422042403E8000 +5144:00003FF8200820082008200820083FF80440044004400840084010422042C03E +5145:02000100FFFE04000400082010103FF80448044004400440084408441044603C +5146:04400440444424481450144004600C50144824444440084208421042203E4000 +5147:08202448228821082288244828283FF80440044004400440084408441044603C +5148:0100110011001FF8210041000100FFFE044004400440084008421042203EC000 +5149:010021081108091009200100FFFE0440044004400440084208421042203EC000 +514A:04400440082011102108C206044008201FF0045004400440084408441044603C +514B:01000100FFFE010001003FF82008200820083FF804400440084010422042C03E +514C:04400440082010102008DFF61010101010101FF004400440044008441044603C +514D:080008000FE0102020407FF8A108210821083FF822880480088010822082C07E +514E:000801FC7F00010001003FF82108210821083FF8228804A0089010922082C07E +514F:001000F81F80108010F81080108010801FFE11201120112022222222441E9800 +5150:000023F82208220823F82208220823F82208000004400440044008441044603C +5151:10100820044000001FF01010101010101FF0145004400440084408441044603C +5152:0000060038F8200820083CF8200820083FF8044004400440084408441044603C +5153:00007EFE081008104890489048907EFE08100810142814282548264A448A8106 +5154:080008000FE0102020407FF8A108210821083FF8228804A0089010922082C07E +5155:00003C7824482448244827C8200820083FF8244804400440084010422042C03E +5156:02000100FFFE082011102208444408201FF0045004400840084010422042C03E +5157:02000100FFFE0820101020085FF41010101010101FF00440044008441044603C +5158:00207C200048008401FEFE02240024FC2484248424FC24842402440243FE8000 +5159:08100810FF10081008107F7E411041107F101410141014102412240243FE8000 +515A:01001110091009207FFE400280041FF0101010101FF00440044008423042C03E +515B:0808081CFF70081008107F1041FE41107F101410141014102412240243FE8000 +515C:0100120067DC4444444447C44444444457C4601C04400440044008441044603C +515D:08080828FF24084408427F80417C41247F24144414441494250A240243FE8000 +515E:083808E0FF20083808E07F20413C41E07F2414241424141C2402240243FE8000 +515F:0810285028503E7C4890081008107EFE1428142814281428254A264A44868100 +5160:0100121017D2F454145817D014523452D7CE100004400440044008441044603C +5161:080008FEFF100820087C7F444144417C7F441444147C14442402240243FE8000 +5162:0820082008207EFE082008207EFC428442847EFC14501450255026924492810E +5163:100011FEFD00117C11547D7C4554457C7D10297C29102AFE2C00480247FE8000 +5164:101011FE9528557C592811FEFD10297C2954297C29542A7C2A284C44480287FE +5165:0400020001000100010002800280028004400440082008201010201040088006 +5166:040042004100410040804080414041404220422044104808500440007FFE0000 +5167:0400020002007FFC410441044284428444444824501440044004400440144008 +5168:0100010002800440082010102FE8C106010001001FF00100010001007FFC0000 +5169:0000FFFE0100010001007FFC4104514449244924555465944104410441144008 +516A:0600010002800C603018CFE600003E24222422483E4822903E48224822242624 +516B:0000004004400440044004400440042008200820081010101008200820044002 +516C:00800480048008400840102020104208820604000440082010203FF010100000 +516D:02000100008000800000FFFE0000000004400420081008081008200440040000 +516E:044004400820082010102008DFF6040008000FE0002000200020002001400080 +516F:201010100820084000007FF80208020802080208022802100200020002000200 +5170:101008100420044000007FFC0000000000003FF80000000000000000FFFE0000 +5171:04200420042004203FFC042004200420042004207FFE00000420081010082004 +5172:00007FFC010001003FF801000100FFFE0000044004400820082010102008C006 +5173:10100810082000003FF8010001000100FFFE010002800280044008203018C006 +5174:0408020821081110081008200040FFFE00000440042008100808100820044004 +5175:002000F01F00100010001FF81080108010801080FFFE00000840102020104008 +5176:082008207FFC082008200FE0082008200FE008200820FFFE0000082010102008 +5177:00001FF0101010101FF010101FF010101FF010101010FFFE0440082010102008 +5178:0440044004403FF82448244824483FF8244824482448FFFE0440082010102008 +5179:082004200440FFFE1020102020402448448878F008101020142822447EFC0204 +517A:0440082010102FE8C4260420082010A0604000003E442258226022423E42223E +517B:0820044002887FFC01003FF80200FFFE04400830344EC4440440044008401040 +517C:102008407FFC048004803FF00490FFFE04903FF00CC014A02498C48604800480 +517D:082004403FF821083FF821083FF80000FFFE00001FF01010101010101FF01010 +517E:082004403FF821083FF821083FF8000008207FFC08200820FFFE082010102008 +517F:08100420FFFE08203EF808283EAA0866389200001FF000007FFC040008101FF8 +5180:04447C7804421C3EE4003FF821083FF821083FF804403FF80440FFFE10102008 +5181:440025FE29027D0255FE55247D24557E55247D2411FE1152FD54124812641442 +5182:00007FFC40044004400440044004400440044004400440044004400440144008 +5183:00007FFC4004400440045FF44004400440045FF4400440044004400440144008 +5184:00003FF8200820082008FFFE200820082008FFFE200820082008200820282010 +5185:0100010001007FFC410441044104428442444424481450144004400440144008 +5186:00007FFC410441044104410441047FFC40044004400440044004400440144008 +5187:02000200FFFE040004000FF00810181028104810881008100810081008500820 +5188:00007FFC40044004400448244444428441044284444448244004400440144008 +5189:0100010001003FF8210821083FF8210821082108FFFE20082008200820282010 +518A:00003FF824482448244824482448FFFE24482448244824482448240820282010 +518B:00007FFC40044004400447C4444444444444444447C444444004400440144008 +518C:00001E7812481248124812481248FFFE12481248124812481248128826A84110 +518D:0000FFFE010001003FF8210821083FF821082108FFFE20082008200820282010 +518E:00001FF0101010101F90109010907FFC40044004400440044004400440144008 +518F:00007FFC400444444824501467CC444444444444444447C44444400440144008 +5190:00003FF820082FE820082FE800001FF010101FF010101FF01010101010501020 +5191:010001003FF821083FF821083FF800001FF0101017D0101017D0101010501020 +5192:00003FF820082FE820082FE8200800001FF010101FF010101FF010101FF01010 +5193:082008207FFC08203FF80820FFFE01003FF821083FF82108FFFE200820282010 +5194:00003FF820082FE820082FE800007DFC4420442047FE44207C20442000A00040 +5195:7FFC40045FF440045FF404000FE010203FF8510811081FF8028004821882607E +5196:00007FFE40028004000000000000000000000000000000000000000000000000 +5197:000000007FFE4002800400000FC00840084008400840104210422042403E8000 +5198:0100010001003FFC2104410801000280028002800480048008841084207C4000 +5199:00007FFE4002900410001FF8100020003FF800080008FFC80008000800500020 +519A:000000007FFE400281040100010021082108210821082108210821083FF80008 +519B:00007FFE4002820402003FF80400090011003FF801000100FFFE010001000100 +519C:0100010001007FFC4204820805000508089018A02840482088100A080C060800 +519D:00007FFE400280041FF0101010101FF0101010101FF0101010101010FFFE0000 +519E:00007FFE4002810411100920054001007FFC0540092011102108C10601000100 +519F:00007FFE410282041FF010101FF010101FF0000010F01F00100410040FFC0000 +51A0:00007FFE400280043E08000800FE7E08144814281408142A2412240243FE8000 +51A1:00007FFE40029FF400007FFC02000D08719002A00CC071A006981886E2800100 +51A2:00007FFE400280047FFC0200060819106AA004C01BA062980C863080C2800100 +51A3:00007FFE400280047F0022FC22443E44224422283E2822102790FA2842440282 +51A4:00007FFE400288040FE0102020405FF8110811081FF8028004A008921082607E +51A5:00007FFE400280041FF010101FF010101FF012100100FFFE0000082010102008 +51A6:000000007FFE400280243E38002000207EF814081450142014542484240443FC +51A7:00007FFE400280040820082008207EFC08201C301A702A6848A4892208200820 +51A8:00007FFE400280043FF800001FF010101FF000003FF821083FF821083FF82008 +51A9:00007FFE400282041CF010101EF010101FF008001FFC20044924249424944008 +51AA:FFFE84423FF804401FF010101FF010101FF002007FFC09203FF8D11611300100 +51AB:000040002000200000000800080010001000E000200020002000200020000000 +51AC:040004000FF010102820444003800C603018C006070000C000200E0001800040 +51AD:010001000100FFFE02800440082010102608C186004000000C00030000C00020 +51AE:0000400027FC204000400840084010401040E0402040204020402FFE20000000 +51AF:000047F02010201002100A100A1013FC1004E004200427F42004200420280010 +51B0:004040402040204400680770116011502150E248224824442842204021400080 +51B1:000047FE20802080008008F80908110811082208E3F820102010201027FE0000 +51B2:004040402040204007FC0444144414442444E44427FC24442040204020400040 +51B3:00804080208027F800880088108810882FFEE080214021402220241028081006 +51B4:000043FC20102110011009100A1013FE1030E050209021102210241020500020 +51B5:000047F8240824080408040817F811202120E1202120222022222422281E1000 +51B6:0040404020802110020807FC1004100023F8E208220822082208220823F80208 +51B7:0040404020A020A0011002481426102023F8E0082010211020A0204020200020 +51B8:0040424421482150004007FC104010402040EFFE204020402040204020400040 +51B9:009040882088208007FE0080110011FC2144E244224824502420285020880306 +51BA:000043FC2204220402040BFC0A20122013FEE220222022102212228A23060202 +51BB:00404040204027FE008009200920122013FCE020212821242222242220A00040 +51BC:00404240224023FC04400040104017FE2120E1202120212022222222241E0800 +51BD:000440042FC42224022403A412A414A426A4E5A4292421242204220424140808 +51BE:0040404020A021100208140613F81000200023F8E20822082208220823F80208 +51BF:0040404023F8204807FE004813F810402040E7FC204020402FFE204020400040 +51C0:0100410023F02410002017FC104410442FFE2044E04427FC2044204021400080 +51C1:004040402FFE2040004007FC1444144427FCE04020E0215022482C4620400040 +51C2:0100410021F02210022007FC1A4412442244E3FC22A420A0212022222422081E +51C3:0040404020A02110020805F61040104027FCE040225022482444284421400080 +51C4:0040404027FC204003F8004817FE104823F8E08027FE21082390206021980604 +51C5:000047FC2444244407FC0444144415F42514E514251425F42514240427FC0404 +51C6:01404120212023FE022016201BFC1220222023FCE2202220222023FE22000200 +51C7:02084228222822280FA40244125416922710EAA02A203228224422FC22440200 +51C8:003C47C02244212800000BF80848104817FEE048204823F82048204021400080 +51C9:008040402FFE2000000003F81208120823F8E040225022482444284421400080 +51CA:0040404027FC204003F8104017FE100023F82208E3F8220823F8220822280210 +51CB:000047FC2444244405F40444144417FC2404E5F42514251425F4240424140808 +51CC:0040404023F82040004007FE111012882484E1F0231024A0204020A023100C0C +51CD:0040404027FC204003F80A480BF8124813F8E04020E0215022482C4620400040 +51CE:0040404020A021100208040611F010402040E3F820402248214821502FFE0000 +51CF:00144012201027FE0410041015D014122412E5D42554254825DA242A28461082 +51D0:000047FC20A020A007FC04A414A414A427FCE040204027FC204020402FFE0000 +51D1:0040404027FC204003F8008017FC11102208E5F6204023F8204020A021100608 +51D2:004042482248224803F8000017FC100023F8E208220823F8211020A027FE0000 +51D3:000047FC20A020A007FC04A414A417FC2040E04027FC20E0215022482C460040 +51D4:0040404020A02190024817FE1A0813F8220823F8E20023F82508250829F80108 +51D5:000047FC2404200003F80A080BF8120813F8E080204027FC2000211022080404 +51D6:4140212003FE0A2017FCEA2023FC222023FE02000100FFFE0100010001000100 +51D7:0040444427FC2120011003FE122016202BFCE220222023FC2220222023FE0200 +51D8:04804482249C2FD004900790149E17942494E4942FD42014251428A430240044 +51D9:000047FC24A427FC004003F8104017FC2110E0A023F820402FFE204020400040 +51DA:0110411027BC211003B805541912100023F8E00027FC20402248244429420080 +51DB:00404FFE200027FC040405F4151415F42404E7FC200023F820002FFE224804C4 +51DC:00404FFE200027FC040405F4151415F42404E7FC200823F020402FFE21500E4E +51DD:0400457C260424A80390107C141417942A502250EFDC2250255024B0289E0100 +51DE:08008BDE4A924A920BD22A5E2A502BD04A92CA924BCE50004000452444920892 +51DF:00404FFE204027FC000007FC14A417FC2208E3F8220823F8220823F821100208 +51E0:00000FE0082008200820082008200820082008201020102220222022401E8000 +51E1:00000FE00820082008200A20092008A008A008201020102220222022401E8000 +51E2:0200020004001FE01020102010201020102010201020102220222022401E8000 +51E3:02000200020002001FE0102010201020102010201020102220222022401E8000 +51E4:00003FF8200820082FC8204828482488228821082288244A284A400A40068002 +51E5:00003FFC200420043FFC2000200023E02220222022202220242244224822901E +51E6:100010F010901E901290229022905290949414940894090C1400230040FE8000 +51E7:00003FF820082108210821082FE829282928292829A8294A210A410A41068002 +51E8:00003FF8200820082FC8200820083FE82208248828483FEA282A400A40068002 +51E9:00003FF820082108210821082FE82108238823482528252A290A510A41068002 +51EA:00003FF820082088208820882088248824E824882488248A248A5FFA40068002 +51EB:020004003FE02020242022A020403FF800081F8810A8109010822082407E8000 +51EC:00003FF8200820082FE82008200827C82448244827C8244A244A47CA44468002 +51ED:08380BC01040304057FE90401040104013F800000FE00820082010222022C01E +51EE:00003FF8200820082FE82108220827C82448244827C8244A244A47CA44468002 +51EF:100092F092909290FE900090FE90029002907E904090409246925912610E0200 +51F0:00003FF8220827C8244827C8244827C820082FE8210827CA210A4FEA40068002 +51F1:0800490049787F480048FF4800487F48414841487F484248244A0F4AF08A4106 +51F2:00003FF8244822883FF822882FE822A83FF822A82FE8228A26CA4AAA52968282 +51F3:00907EA004442BA810102FE8C8260FE004407FFC00000FE0082008221022601E +51F4:000043FC22400BF80A4013F82240E3FC2004255420080FE0082008221022601E +51F5:000000000000000040044004400440044004400440044004400440047FFC0004 +51F6:000000101010082044444284410442844444482450146014400440047FFC0004 +51F7:01000100010001004FE4410441044104410441045FF44004400440047FFC0004 +51F8:00000FE008200820082008200820783C4004400440044004400440047FFC4004 +51F9:00007C7C444444444444444444444444444447C440044004400440047FFC4004 +51FA:0100010021082108210821083FF801080100010041044104410441047FFC0004 +51FB:0100010001003FF8010001000100FFFE0100010021082108210821083FF80008 +51FC:01000100010001105D244544458449444924511461144504420440047FFC0004 +51FD:00003FF00020004051944924454441044544492451144504420440047FFC0004 +51FE:00003FF00020004041845D745594555455245D5441944504420440047FFC0004 +51FF:0440244814500440FFFE0000044022882FE8210821082FE8210821083FF80008 +5200:000000003FF80208020802080208020802080408040808080808100820504020 +5201:00003FF800080008000800480088010802080408080810086008000800500020 +5202:0004000400040044004400440044004400440044004400040004000400140008 +5203:00003FF802080208020822082208220842080208040804080808080810506020 +5204:00007FF004100410241014100C100410061005900870081E1010101020A0C040 +5205:00007FE00420042004200420242824244422842208200820102010202140C080 +5206:00400440042008201010200840049FE204200420042008200820102021404080 +5207:1000100011FC104410441E44F044104410441244144418841084010402280410 +5208:000401040104212411240A240A24042404240A240A2411242104400480140008 +5209:1004100420043FA4402480243F2402240424082410242024408440843F940008 +520A:00047F0408040824082408240824FFA408240824082408240804080408140808 +520B:0004070478040824082408240824FFA408240824102410242004200440148008 +520C:0404040404040424FFA404240424042444242424242404240404040414140808 +520D:040004000FF0101020204040BFF80008000800081FF80008000800083FF80008 +520E:2004200420043FA454A494A414A424A424A448A488A410A42084408485140208 +520F:200420043F84402480243F24002400247F240124012401240144014400D40048 +5210:00043F04210421242924252425242124FFE42124212421242104410445148208 +5211:00047F8412041224122412241224FFE412241224122412242204220442148208 +5212:100414041204102413A4FC2410241124112412240C2408A414842284C1940088 +5213:00043F04000400240024FFA41224122412241224122422A42304420480140008 +5214:0804080408047F240924092409240924FFE40824082414241204210441148008 +5215:00003FF80208020804080850302000007EFC122412241224224422444A948508 +5216:00043F042104212421243F242124212421243F24212421242104410445148208 +5217:00047F84080408241F2411242124212452248A24042404240804100420144008 +5218:100408040804FFA4022442242224142414240824082414242404420482140008 +5219:00047F0441044124492449244924492449244924492414241204210440948088 +521A:00047F0441044124652455245524492449245524552465244104410445144208 +521B:0804080414041224212440A4BE242224222422242A242424208420841F940008 +521C:1202120212027F82129212927F92521252127FD21252125223422282420A8204 +521D:2000100001FCFC44084410441044344458449444144410841084110412281410 +521E:00043F042104212421243F24212421243F242124212421242784F80440140008 +521F:00047F041104112421242524422480243F2421242124212421043F0421140008 +5220:00027BC24A424A4A4A4A4A4A4A4AFFEA4A4A4A4A4A4A4A4A4A425A42854A0884 +5221:00027F824082408240927F92441244127FD24412441242124242514260CA4044 +5222:0804080414041224212448A4842404247F240124222414240804040404140008 +5223:0804080408041024122421247FA420A400243F2421242124210421043F142108 +5224:040444842484252404247FA4042404240424FFE4042408240804100420144008 +5225:00047F044104412441247F240024102410241F2411241124210421044A148408 +5226:0804080408047F24082408240824FFA408241024102422244104FF8440940008 +5227:0800080008FC7F24082408240824FFA41024102424244224FF44414400940108 +5228:100410043F0421244124BD24252425243D24212425242224208420841F940008 +5229:010407847C04042404240424FFA40C241624152424A424244404840404140408 +522A:00047F0455045524552455245524FFA455245524552455245504510445144208 +522B:00047F044104412441247F2410241024FF24112411241124210421044A148408 +522C:14041204100417247824102417A4F824112412240C2408A414842284C1940088 +522D:00047F04020404240C2412242124C0A400247F240824082408040F04F0144008 +522E:02040F04780408240824FFA40824082408247F2441244124410441047F144108 +522F:00047F84000400243F24212421243F24212421243F24212400040784F8144008 +5230:0004FF840804102422244124FFA408A4082408247F24082408040F84F8144008 +5231:2400240025F824487E482448254C254AFE4A2448244824482448448844A88510 +5232:080408047F04082408240824FFA40024082408247F24082408040F04F0144008 +5233:08040804FF84142422244124BEA40024FFA4102420247F24010401040A140408 +5234:00047F041104122423A420A44AA489240824FFA418242C242A04490488940808 +5235:0004FF84220422243E24222422243E242224222427A4FA244204020402140208 +5236:0404240424043FA444240424FFE4042404243FA424A424A42684250404140408 +5237:00023FC2204220423FD22212221222123FD252525252525293421282020A0204 +5238:0100111009203FF8020002007FFC082010102FE8C42604200820082011402080 +5239:01046204140408241424222449240824FFA408242A2429244884888428141008 +523A:08040804FF84082408247F24492449244D244A241C242A244904888408140808 +523B:100408040004FFA40824112421247E240424092412242424CC0412042114C088 +523C:1000100010FC7E24102410A410A4FEA410A41124202428244444FE4442940108 +523D:08040804140422244124BEA400240024FFA41024102422244104FF0441140008 +523E:080408040804FFA40824492429242A24FFA40824082414241204210441148008 +523F:08044904490449247F24102410243F244124A12412241424080410042014C008 +5240:08044904490449247F2400247F24012401243F242024202423042C0430140008 +5241:00043E0422042224222449A488240824FFA408241C242A244904888408140808 +5242:10040804FF840224642418242624C12422A42224222422242204420442148208 +5243:420422042404FF2409240924FF2488248824FFA418A428A44A84890408140808 +5244:00047F84000424A449249224492424A400247FA40824082408040B84FC140008 +5245:00047F84000400243F242124212421243F240024212411241204078478142008 +5246:080404043F04212421243F24212421243F242024242422242504290430142008 +5247:00047F04410441247F24412441247F24412441247F2400242204210440948088 +5248:00043F04210421243F2400247FA440A440A47FA440A440A47F84408442944108 +5249:080408042A042A242A245D2488A4082408247F240824082408040F84F8144008 +524A:0804490429042A2408247F24412441247F24412441247F244104410445144208 +524B:08080808FF48084808487F48414841487F481448140814282412240243FE8000 +524C:08040804FF84082408247F24492449247F2408241C242A244904880408140808 +524D:101008100820FFFE00003E08224822483E48224822483E48220822082A282410 +524E:02046404180416242124CA2409240824FFA418241C242A242904488488940808 +524F:4200240000FC7E24242424A424A424A4FEA42524242424242444444444948508 +5250:00047F044104412441247F2408240824FFA488A494A4A2A4C284808482948108 +5251:0804080414041224212440A4BE24002411240924492422242204078478142008 +5252:1204120412047F2412241224FFA400243F24212421243F24210421043F142108 +5253:0C80708011FCFD2432243844548491041228101000007FF80408080810506020 +5254:00043F04210421243F24212421243F2410243FA44AA492A42484488412942108 +5255:120212021202F3C21212121212127392121212121212F3D212021202120A1204 +5256:100408047F84002421241224FFE4002400243F242124212421043F0421140008 +5257:240422042F04F024142409243524CB2424242F24F0241224140409043514C308 +5258:22042204FF84222422243E24222422243E2422242224FFA40004220441148088 +5259:4200240001F87E4824482448254C254AFE4A2448244824482448448844A88510 +525A:04020402FFC204023F9224923F9204123F920492FFD204923F820402140A0804 +525B:00027FC2404251424A527FD2445244525552555255525F5240424042414A4084 +525C:080404047F8440A420243BA42AA42AA42AA45AA44BA48A241204128423144208 +525D:20043E0442047C240424FFA40824092449242A241C242A24C904090428141008 +525E:080408047F84142422244124FFE4012479244924492449247904010405140208 +525F:00047B8408842AA411242AA444A4882400247BA408A42AA411042A8444948808 +5260:10040804FF84002400247F244124412441247F2408242A244904888428141008 +5261:0804090449044A2488241424222449248824492449248A241404220441148088 +5262:0004FF84080410242824C4A40D2456242524D5240CA414A42404C40414140808 +5263:08040804140422244124BEA4082408247F24492449247F240804140422144108 +5264:10040804FF840224642418242624C12422A43E24222422243E04420442148208 +5265:00047E0402043E240224FFA40824092449242A241C242A24C904090428141008 +5266:08040804FF8414242224492488A47F2449247F2449247F2408040A040C140808 +5267:00043F84208420A43FA4242424243FA4242424243FA450A4508490841F941088 +5268:08040804FF8408247F240824FFA40824FFA4102420247F24A10421043F142108 +5269:070278020802FF822A122A92EB122A926A92A9921C122A1249028882080A0804 +526A:0820FFFE00003E0822483E4822483E482208261800007FF80408080810506020 +526B:040202023FE2248224923FF22492279220122FD22052249222824102468A9844 +526C:08044904490449247F240024FFA4082410247F24552455245504550455144308 +526D:00043F84208420A43FA420243FA4242429242FA422242FA4220443845E148808 +526E:00047F0441044124792449244924FFA480A4BEA4A2A4A2A4BE84808482948108 +526F:00027FC200023F82209220923F9200127FD2445244527FD2444244427FCA4044 +5270:03823C0204027FC215121512FFD2151215127FD20E12151224824442840A0404 +5271:08000800147E22124112BED2085208527F52499249127F1208221422224A4184 +5272:10040804FF8480A409247F2408247F240824FFA408247F24410441047F144108 +5273:22042204FF8422240824142422244124BEA4002400247F24410441047F144108 +5274:0804490449047F240024FF2400247F24412441247F24422424040F04F0144008 +5275:08040C041204292444A4BF2421243F2421243F2420243F24510451049F141108 +5276:20043F0441047E240224FFA4102428A4CD2416242524CD2414842484D4140808 +5277:080404043F8411240A243FA422242A242FA4322422242FA42204420443949C08 +5278:0804FF8408047F2449247F2449247F2408A4FFA40224FFA4420422040A140408 +5279:0004770411045524332455240C243324C4A4182462240CA4710406041814E008 +527A:082008207E7E08C4FF281C102A2848C600003FFE20002FF82208420844289810 +527B:0202222222223FEA000A3DEA252A252A3DEA252A252A3DEA2522252255AA8A44 +527C:100422047F04422494A4F7A408243624C92430A4C424192462040C043014C008 +527D:0002FFE20A027FC24A524A527FD200127FD20012FFF2041224824442942A0804 +527E:00027FC240024F82489248924F9240125DD25552555255525DC240027FEA0004 +527F:49049204490400247F2449247F2449247F240824FFA41C242A04490488140808 +5280:00047F0412040C24FFA414A42524D4240824FFA494A4A2A4DD8494849C948188 +5281:120211023FC222026212BFD2221222123FD2221222123FD2200254824A4A8A44 +5282:00027FF24002514A4A4A5F7A449A442A550A554A5F4A444A44A248A2492A9204 +5283:08047F040904FFA409247F240824FFA400247F2449247F2449047F040014FF88 +5284:420442047BC44524A8A4142422244124BEA4002400247F24410441047F144108 +5285:00047F04550455247F2420247FA490A47CA454A454A47CA41284FE8402940108 +5286:02023FF22882250A3FEA250A2FCA254A3FEA254A2FCA250A2D825542652A8504 +5287:08040F0408047FA448A47E244924472440247FA4482455244A04B7040A943608 +5288:00407C2045FC44887C5043FE7C20A5FC24203C2000007FF80408080810506020 +5289:080277C252424A42555264920A1211123F92C4523F120492250217C27C0A2004 +528A:04020B0230C2DF2200127FD255524E527FD200123F9220923F8220823F8A2084 +528B:00047F0441047F240024F7A494A4F7A408240824FFA41C242A04490488940808 +528C:020213C212027FEA010A014A3FEA210A3F0A254A254A2D4A368244A2896A3224 +528D:08040804140422244124BEA40024002477245524552477242204220455148888 +528E:0800080014FC22244124BE240024002477245524552477242244224455948908 +528F:080449042A04FFA480A43E24222422243E2400247F2449247F0449047F144108 +5290:11027FC2150212023FD26412BF9224123F9224123FD220127F8211020E0A7184 +5291:080204027FC211020A52F59255525532B592001220923F9220823F82208A4084 +5292:08000800147E22124112BE5200520052775255925512771222222222554A8884 +5293:08023F8220823F8220923F9200127FD244527FD244527FD20002FFE2110A2104 +5294:08000800147C22244124BE2400A4006477245534552C7726222422245544888C +5295:0844738442047BE452A452A484247FA440A47FA440A47FA440847F8421144088 +5296:3E024202FF8240827F924492771244523FD24212FF9248927F821A02294AC7C4 +5297:52827BE294827BEA318A5AAA946A3FCA204A3FCA204A3FCA20423FC2108A2044 +5298:02023FF224823FEA248A2ECA35AA248A250A3DEA250A3DCA25025DE2450A8504 +5299:1F0221023E0202027FD2189265121A9266521A122492FBF2AAA2FBE228AAFBE4 +529A:7FC240427FC252424A9252525FD255525FD264525F5255525F424442BF4A0084 +529B:02000200020002007FF802080208020802080408040808080808108820504020 +529C:1020102010201020FF201120112011201120112021202122212241224A1E8400 +529D:004000400040FC4005FC04444844284410441084288424844504810402280410 +529E:02000200020002007FF002100210121812142412441208100810101020A04040 +529F:004000400040FE4011FC1044104410441044108410841E84F104410402280410 +52A0:100010001000107CFE4412441244124412441244124412442244227C4A448400 +52A1:040004000FF0182024C003000CC03230C20E1FF0021004100410081010A02040 +52A2:00200020FF20202020FC20243E24222422242224222422244244424494A80910 +52A3:0100111011082124414401800E00F10001003FF8020802080408080810506020 +52A4:022007203820202020FC20243F24242424242424242424442444448445288210 +52A5:102008200820FF2000FC00243C24242424242424242425444644448481280210 +52A6:020002003FF00410081010A06040102010207EFC12241224224422444A948508 +52A7:04200E207820082008FC7E24082408240824FF24082408440844088429281210 +52A8:004000407C40004001FC0044FE4420442044208448844484FD04450402280410 +52A9:00207C204420442044FC7C24442444247C244424442444444E44F08401280210 +52AA:10001000FEFC22844488285010202858C586020002007FF80408080810506020 +52AB:0820082008207E2008FC08240824FF241024102420244444FE44428401280210 +52AC:2020202020207E2042FC82247A244A244A244A247A244A440244028415280A10 +52AD:00207E201220122022FC2A24442480243E2422242224222422443E4422A80110 +52AE:08200820482048207EFC482488240824FF240824082414442244428481280210 +52AF:00200020FF20102010FC10243E2422246224A224222422443E44228401280210 +52B0:1020102020207E2042FC4224422442247E2442244224422442447E4442A80110 +52B1:00107FD0401040105F7E481248124F12491249124912491249125122952A2244 +52B2:00207E200420082018FC24244224812400247E240824084408440E84F1284210 +52B3:08200820FFFE082000007FFE420282043FF00210021004100410081010A02040 +52B4:22081108111000207FFE4002820402007FF80208020804080408080810506020 +52B5:0100111009203FF8020002007FFC082012102208DFF604100410081010A02040 +52B6:04200E207020402040FC7F24402440245E2452245224522452449E4492A80110 +52B7:2220122014207F2008FC08243E24082408247F24082408441044108421284210 +52B8:082008207F20082008FC0824FFA40024082408247F24082408440F44F0A84110 +52B9:102008200020FF2000FC24244224812424241424082414442244428481280210 +52BA:101010102410427EFF120912481248127F1288220822FFA20842084208940908 +52BB:00107F904010407E7F92441244125F12441244227FA2402240427FC200940108 +52BC:082008200820FF2008FC08247E24002400247E244224422442447E4442A80110 +52BD:7F84082410243F2451240A24040408043014C20802007FF80408080810506020 +52BE:102008200820FF2008FC102422247C24092412242424C82414442244C0A80110 +52BF:084008407DF808480C4819C8684A08AA2886130202007FF80408080810506020 +52C0:0820082008207F2008FC08247F24412441247F24142414242544264444A88110 +52C1:00207F20002025204AFC9224492424A400247F240824082408440F44F8A80110 +52C2:0820282028203E2048FC0824FF24002400243E242224222422443E4422A80110 +52C3:082008207F20082008FC7F24412482243C24042408240F447844088429281210 +52C4:201020103F904010BF7E211229122512FFD22112491245127F9201220A2A0444 +52C5:08200820FFA0082008FC7F24492449247F2408241C242A444944888409280A10 +52C6:102008207E20422042FC7E24422442247E244024482444444A44528461284210 +52C7:3FF0066001803FF821083FF821083FF82108220802007FF80408080810506020 +52C8:00107E1002103410087E7F12491249127F12491249127F1249124922492A4344 +52C9:202020203E20442088FC7F244924492449247F4414441494250A240243FE8000 +52CA:08200820FF20087C08247F24412441247F241444145414882502240243FE8000 +52CB:00203E20222022203EFC00247F2441244924492449244944144412842128C210 +52CC:082049202A207F2008FC1024FFA422244124BEA422242A24244420442CA83110 +52CD:10100810FF900010007E7F124112411241127F1208122A12491288A2282A1044 +52CE:082008207E20082008FCFF242224412488A408247E24082408440F44F8A84110 +52CF:102008207F20002022FC1424FFA4002400243E242224222422443E4422A80110 +52D0:00203E20042008207EFC08240824282410247F245524554455445784FD280210 +52D1:082008200820FF2008FC2A242A242A245D2488241C242A444944888409280A10 +52D2:22202220FFA022203EFC08247F24492449247F240824FFC40844088409280A10 +52D3:441044907510461054FE64924B9210127F12411241127F12411241227F2A4144 +52D4:0020FFA0082010207F7C552455245D24552455245D245524554455447F944108 +52D5:0F2078200820FFA0087C7F2449247F2449247F2408247F2408440FC4F8944108 +52D6:0020FF208120BD2081FCBD24812400247E2442247E2442247E4442447EA84310 +52D7:1FF010101FF010101FF000003E2022203EFC22243E2422242F44F04440940108 +52D8:22202220FF2022203EFC22243E2422242224FF2440245444624440847F280210 +52D9:0040FC4004FC688811500820FED813063440304053FC50449084108451142208 +52DA:52105210FF9052105E7E40127F1200127F1241124912491249121422222AC144 +52DB:00203E20222022203EFC00247F2441247F2441247F2441247F44144422A84110 +52DC:282044209220202048FCFC2404240024EE242224AA246624AA442244AAA84510 +52DD:0020792448A8482049FC78404BFE488849447A424DF848484888488849289A10 +52DE:08202AA42CA84920145022887FFE410281043FF8020802080408080810506020 +52DF:04407FFC04401FF010101FF010101FF00400FFFE10102208DFF6041008503020 +52E0:0020772011205520337C55240C243324C4A4182462240CA4714406441894E108 +52E1:0020FFA014207F2055FC55247F2400247F240024FFA408242A444944A8A81110 +52E2:10407C4011F8FE4844C892487CAA10AA1D06E20202007FF80408080810506020 +52E3:08107F1008107F10087EFF9200127F1241127F1241127F1241127F22222A4144 +52E4:22202220FFA022203EFC08247F2449247F2408247F2408447F4408840F28F210 +52E5:7CF8048804F87C2041FC7D2405FC04282BFC120402007FF80408080810506020 +52E6:49209220492000207F7C49247F2449247F240824FFA41C242A44494488940908 +52E7:202020203F20482088FC7F24142422247F24A4243F2424243F4424443FA82110 +52E8:20203E204220FF2049FC49247F2410242824D5242624CD2415442444D4A80910 +52E9:5220FFA052205E2040FC7F2400247E2442247E2442247E4442447E8425284210 +52EA:061078101010FF90227E5D1294921C1200127F1241125D1255125D22412A4344 +52EB:0F10F81049102A7EFF922A12491280927F12492249227F22494249427F944108 +52EC:081049102A107F10107EFF9222125112A2923C1209127F120812492288AA1844 +52ED:101008107F102210FF7E00127F1249127F1249127F1208127F1208220F2AF044 +52EE:08100F1008107F9048FE7E124912471240127F92481255124A12B7220AAA3644 +52EF:0820FF200020FF20817CBD24A524FF2400247E2442247E2442447E440094FF08 +52F0:100010FE7E92129222FE2A92449280FE4410FF0855285520556455AA5928B318 +52F1:22102210FF9022107F7E49127F1249127F120812FF9288928A92BEA282AA81C4 +52F2:7F200820FF2008FC7F2449247F2449247F2408447F440894FF08000024484224 +52F3:071078100810FF90087E7F126B125D127F1208127F120812FF920022552A8AC4 +52F4:08100F9008107F9048FE7E1248925F9255125F1255125F1248125522B2AA5E44 +52F5:00107F904A107F904A7E5F1255125F1255125F1244127F926492AEA2A2AA2144 +52F6:22104F90821E14A42FD46014AF9428882F88289429A202007FFC040418286010 +52F7:0810FF9000107710557E771222127F1222127F122212FF9228926522B22A2144 +52F8:2210FF902210F79094FEF792281224127F924812FF1248127F1248227FAA4044 +52F9:100010003FFC2004400480040004000400040004000400040004000400280010 +52FA:0800080010001FF8200840088008040802080108010800080008000800500020 +52FB:0800080010001FF82008400880081F880008000800083FC80008000800500020 +52FC:100010003FFC2004440484043F84048404840884089410942074400400280010 +52FD:0800080010001FF8200842088208020805080488048808481048200800500020 +52FE:0800080010001FF820084208820804080408088810483FE81028000800500020 +52FF:0800080008001FFC124422444244844404440884108421044204040408281010 +5300:080008000FFC10042004480484040204002400C403041C040804000400280010 +5301:0800080008001FF811082908450882080308048804480838100E200840500020 +5302:100010003FFC200448048844088409040E0408140814081407F4000400280010 +5303:080008000FFC1004210441049104128412441424182410041FE4000400280010 +5304:100010003FFC20044204810400043FF408040804080408040FE4000400280010 +5305:080008001FF0101020105F909090109010901F9010501020100410040FFC0000 +5306:0800080008001FFC1244224442449C440644098410C421244214040408281010 +5307:100010003FFC2204420487E40824102424440244028401040604180460280010 +5308:0800080010001FF820084088888825282228252828A820283FE8000800500020 +5309:100010003FFC20044004BFE4020412440A440A8402047FF40204020402280210 +530A:100010003FFC2004420492440A8402047FF407040A8412446224020402280010 +530B:100010003FFC200448048FC4120402047FF40204124412441FC4004400280010 +530C:100010003FFC22044504888410446FB400041FC4104410441FC4000400280010 +530D:100010001FFC22444224BFF402043FE422243FE422243FE42224222422B42048 +530E:100010001FFC24047FE48884124462341FC412441FC412441FC4022401F40008 +530F:10401040FEFC2884450482F47C940094FEF4208440947C8804820482287E1000 +5310:100010001FFC20047FE480041FC410441FC400043FE422243FE422243FF42028 +5311:100010003FFC28045EF492141E1412F41E8412847EF40A1412142A5444280010 +5312:100010001FFC28844884BFE40A8405040884174460341FC4104410441FD41048 +5313:100010003FFC4004BDE4252425243D34260425E43C2420A428442CA433282010 +5314:100010003FFC28045EF492941E9412F41E0412F47E940A9412F42A0444280010 +5315:1000100010001008103010C013001C001000100010001004100410040FFC0000 +5316:0880088008841088109030A030C05080918012801480108210821082107E1000 +5317:044004400440044404487C500460044004400440044004421C42E442443E0400 +5318:409241244248492448925040608043FE4202428A42524A224A524A8A3BFE0202 +5319:00003E4022403E4422483E500060FF40084408442F44283C280058004FFE8000 +531A:00007FFC4000400040004000400040004000400040004000400040007FFE0000 +531B:00007FFC4200420047F0441048205020404040A041104608580440007FFE0000 +531C:00007FFC40804080448044F047905C9044D044A44484440443FC40007FFE0000 +531D:00007FFC4080408040804FF8488848884888488848A84890408040807FFE0000 +531E:00007FFC400040004FF84080408040804080408040805FFC400040007FFE0000 +531F:00007FFC4000410040805FFC400043E04220422042244424481C50007FFE0000 +5320:00007FFC4000403847C04400440047FC4420442044204820482050207FFE0000 +5321:00007FFC400040004FF84080408047F04080408040804FF8400040007FFE0000 +5322:00007FFC4400440047F84928512862484448488851084250442040007FFE0000 +5323:00007FFC400040004FF8488848884FF8488848884FF84888408040807FFE0000 +5324:00007FFC400040005FFC408040804FF8408040A040905FFC400040007FFE0000 +5325:00007FFC4200441048085FFC4004441044107FFE44104410481050107FFE0000 +5326:00007FFC442044205FA0487852285FA8422843A85E2A4A2A424642807FFE0000 +5327:00007FFC408040805FFC4080449044904AA8514441204220441048107FFE0000 +5328:00007FFC4220522052205E2043FC42207E205220522052F8620042007FFE0000 +5329:00007FFC4080488848884FF840805FFC400040804FF840805FFC40007FFE0000 +532A:00007FFC424042407E7C424042405E78424042407E7C4240424042407FFE0000 +532B:00007FFC44004FFC5124624444A849104FF848084FF848084FF840007FFE0000 +532C:7FFE4080414042204C1873F640004FA448A44FA448A44FA448844A9449087FFE +532D:00007FFC44205F2044205F7855285F2855285F28442A5F2A444644807FFE0000 +532E:00007FFC40804FF848884FF840807FFE40004FF84888496842104C087FFE0000 +532F:00007FFC40A0489045FE612057FC452049FC7920492049FE490040007FFE0000 +5330:7FFE40005F7C51445F7C40004FF848884FF848884FF840807FFE408040807FFE +5331:7FFE40804FF848884FF840807FFE48084FF848084FF848084FF8441048087FFE +5332:00007FFC40805FFC42204C1877F6441047F040004F7849484F7840007FFE0000 +5333:7FFE4080414042204C1873E640005F7C514451445F7C44104A28514440007FFE +5334:7FFE48404F7C54906FF848084FF848084FF848084FF842205FFC442048207FFE +5335:7FFE40804FF840804FF849484FF8441047F0441047F0441047F0422044107FFE +5336:7FFE44105FFC44904FFC58806FF848804FF848804FFC4408473844087FFE0000 +5337:7FFE49484F7849484F7849484F78448047F84C8057F0648047FC44007FFE0000 +5338:00000000FFFE10001000100010001000100010001000100010001FFE00000000 +5339:00007FFC444044404440444044404440444444444844483C500040007FFE0000 +533A:00007FFC4000401044104220414040804140422044104810400040007FFE0000 +533B:00007FFC440044004FF8508040805FFC4080414042204410580840007FFE0000 +533C:00007FFC40804140422044105BEC400047F04410441047F0441040007FFE0000 +533D:7FFE40004FF848084FF848084FF841005FFE4210472040C043304C0840007FFE +533E:00007FFC40804FF848084FF848004FFC592469244FFC4924492C40007FFE0000 +533F:00007FFE422042205FFC422041005FFC420047F84A08520843F840007FFE0000 +5340:00007FFC40004FF0481048104FF040005E78524852485E78524840007FFE0000 +5341:010001000100010001000100FFFE010001000100010001000100010001000100 +5342:00007FF004100410041004100410FFD0041004100412040A040A040604020400 +5343:001000F83F000100010001000100FFFE01000100010001000100010001000100 +5344:084008400840084008400840FFFE084008400840084008400840084008400840 +5345:101011101110111011101110FFFE111011101110111011101110211020104010 +5346:020002003FE00420042008221022211E41000100FFFE01000100010001000100 +5347:012007A03C200420042004200420FFFE04200420042008200820102020204020 +5348:0800080008001FF811002100410001000100FFFE010001000100010001000100 +5349:0100010001007FFC01000100092008200820FFFE082008201020102020204020 +534A:0100210811080910092001003FF8010001000100FFFE01000100010001000100 +534B:0100010001007FFC01000100092008200820FFFE08200820082008200FE00820 +534C:201024902490249024902490FFFE249024902490249024902490249024902010 +534D:00043F84008400840084008400843FFC2084208020802080208020FE20002000 +534E:08800888109030E0518096841084107C11000100FFFE01000100010001000100 +534F:2080208020802080FBF020902090229822942492289220902110211022502420 +5350:200021FC210021002100210021003FFC01040104010401040104FF0400040000 +5351:020004003FF8210821083FF8220822083FF808801080FFFE0080008000800080 +5352:020001007FFC0820082008201450228801000100FFFE01000100010001000100 +5353:010001FC010001001FF010101FF010101FF011100100FFFE0100010001000100 +5354:2040204023FC2084F88421142208201024102FBE24922492249228A22AAA3144 +5355:1010082004403FF8210821083FF8210821083FF801000100FFFE010001000100 +5356:010001003FF8010001007FFC04040288128008800900FFFE0240042018106008 +5357:01000100FFFE010001007FFC482444444FE4410441045FF44104410441144008 +5358:2208110811103FF8210821083FF8210821083FF801000100FFFE010001000100 +5359:22102210FF9022103E1022103E7E22102210FFD040105210611040107F900010 +535A:205020482FFE204027FCFC4427FC244427FC244420082FFE2208210821282010 +535B:210447C88812F3BC20084B92F83E0380AAAAABAA01000100FFFE010001000100 +535C:0200020002000200020002800240022002100210020002000200020002000200 +535D:084008400840084008400840F87E084008400840084008400840084008400840 +535E:0200010001000000FFFE02000200024002200210021002000200020002000200 +535F:004000407C4044404440446044504448444444447C4044400040004000400040 +5360:01000100010001FE01000100010001003FF8200820082008200820083FF82008 +5361:0200020003F8020002000200FFFE020002000240022002100208020002000200 +5362:0100010001FC010001001FF81008100810081FF8100810002000200040008000 +5363:0100010001FE010001003FF8200820083F88208820883F88200820083FF82008 +5364:0100010001FE010001003FF8200824482288210822882448282820083FF82008 +5365:0100010001FE010001003FF8200829282528224825482888214822283FF82008 +5366:0840084008407F4008400860FFD0084808447F440840084008400FC0F0400040 +5367:00207FA04820482048207F304128412441227F224820482048207FA000200020 +5368:0100010001FC01001FF010101F9010907FFC40044FE4482448244FE440144008 +5369:000003F802080208020802080208020802080208022802100200020002000200 +536A:000003F802080208020802880248024802080208022802100200020002000200 +536B:00007FF8020802080208020802080208022802100200020002000200FFFE0000 +536C:0000060078FC408440844084408440844084408440844EA87090008000800080 +536D:00000000FEFC10841084108410841084108410841E84F0A84090008000800080 +536E:007C3F80200020003FFE2000200027F024102410245024242404440443FC8000 +536F:0C0070FC44844484448444844484448444844C8474A804900880088010802080 +5370:0000060078FC4084408440847E8440844084408440844EA87090008000800080 +5371:040004000FF0101020205FFC100013F012101210125012202204220441FC8000 +5372:000000007F7C1144114421442544424480443F4421442154214821403F402140 +5373:00007E7C424442447E44424442447E444044484444544A485240604000400040 +5374:08000800087C7F44084408440844FFC41044104424444254FF48414000400040 +5375:0C0070FC4484448464A454945494448444844C8474A804900880088010802080 +5376:100010003E7C4244A444184410442444C8441F442144D2540C4808403040C040 +5377:0100111009203FF8020002007FFC082010102FE8C826082008A80848080807F8 +5378:200020003F7C4844884408447F44084408442E44284428542F48F04040400040 +5379:08000800107C7F445544554455445544554455445544555457C8FC4000400040 +537A:1FC000447D88055009203118C50602003FF800001FF010101050102410040FFC +537B:14001200217C49440844144422444144BE4422442244225422483E4022400040 +537C:0080FC8029F82A082DFE2900297829482968295029442A442C3C480247FE8000 +537D:080010007E7C42447E4442447E440044404440447E44405440484C4070400040 +537E:00007700557C5544774400447F440044FFC420443F440154014801400A400440 +537F:080073DE42524A524A524BD24A524A524A525BD26A124A9A125412B023104210 +5380:080008007F7C1C442A44494414442244494488442A441C542A48C94028401040 +5381:0808144822285C8888487F0E08F82A08490818087FFC01040114010801000100 +5382:00003FFE20002000200020002000200020002000200020002000400040008000 +5383:040004000FF0101020205FFC1000100010001000100010002000200040008000 +5384:00003FFE2000200027F024102410241024102450242024042404440443FC8000 +5385:00003FFE2000200020002FFE2040204020402040204020402040404041408080 +5386:00003FFE20002080208020802FFC208420842104210422042204440448289010 +5387:00003FFE2000201020F827802080208020FE3F802080208220824082407E8000 +5388:00003FFE200020002FFC20802080208020803FFE208020802080408040808080 +5389:00003FFE200020002FFE2100210021F821082108210822082208440848509020 +538A:00003FFE2000200027FE201022102210241027FE20502090211042104C508020 +538B:00003FFE200020802080208020802FFC2080208020902088208840805FFE8000 +538C:00003FFE200020802090208820802FFC20802140214022202220441048089006 +538D:00003FFE2000208020802FFC21002240244027FC204020404FFE404080400040 +538E:00003FFE20002000203C27C024402440244027FE242024202412450A46468422 +538F:00003FFE20002200220023FE2480248028FC3080208020FC2080408040808080 +5390:00003FFE20002220221022002FFC22402240224824502460484248C2933E2000 +5391:00003FFE200020202FA028A228A428A828B028A028A028A22FA248A2401E8000 +5392:00003FFE20002100210023FC2240244020403FFE204024442444444447FC8004 +5393:00003FFE2040204027FC204020402FFE20002040204027FC204040404FFE8000 +5394:00003FFE2000200027FC20802110220827FC2044204027FC204040404FFE8000 +5395:00003FFE20002F8428A428A42AA42AA42AA42AA42AA422242504448448949008 +5396:00003FFE241024083FFE249024A024C8249024A424C8249228E24982567EA000 +5397:00003FFE2080204027FC2000211020A02FFE2040204027FC2040404040408040 +5398:00003FFE200027FC2444244427FC2444244427FC2040204027FC404040408FFE +5399:00003FFE204020402FFC204027FC244427FC244427FC20402FFE404040408040 +539A:00003FFE200027F8240827F8240827F8200027F8201020202FFE404041408080 +539B:00003FFE2000200C2F70294029402940297E2948294829482F48408840888108 +539C:00003FFE2000203827C0204027FC224822482FFE224822482FFE4040404087FC +539D:00003FFE221022102FFC221022103FFE200027F82408240847F84408840807F8 +539E:00003FFE2120212021203F3E212021202F3C212021203F3E2120412041208120 +539F:00003FFE2080210027F02410241027F02410241027F020802490488852848100 +53A0:00003FFE20002F84288428A42FA428A42FA428A428A42FA42024490448949088 +53A1:00003FFE2080210027FC240427FC240427FC2040274421682250444859468080 +53A2:00003FFE22002200227C2F442244267C27442AC42A7C324422444244427C8244 +53A3:00003FFE20A020903FFE21402630380E2FF828882FF828884FF8488880800080 +53A4:00003FFE2000230C2E70221022103FFE2210273826B42A542A52529042108210 +53A5:00003FFE2000289025102FBE222222442A902A902F9022104228442884440882 +53A6:3FFE20003FFC210027F8240827F8240827F8240827F8220047F84A0881F01E0E +53A7:00003FFE20802FFC208027F8240827F8240827F8240827F824087FFE42108408 +53A8:00003FFE20083F8820082F08297E290829082F4820282908260843885C288810 +53A9:00003FFE20002F7E291029102F502950297E2F1028282A2829284B4A4D4A8886 +53AA:00003FFE21102FFE211021F0204027FC244427FC20402FFE204047FC40408FFE +53AB:00003FFE221022102F90221E2FA422243FD4241427942488248848944AA49142 +53AC:3FFE200027F8240827F8240827F8222027B02D2827FE380047F8440887F80408 +53AD:00003FFE20102F9428922F9028FE2F9020102F9028902F9028A84FA848C48982 +53AE:00003FFE2900290C3FB0292029202F3E29282F28292829285FA840488A881108 +53AF:00003FFE221022103FFE27182AB4325222102210208024442452441243F08000 +53B0:00007FFE420852484A504A9E5FE4505457545554554857485048515450948022 +53B1:00003FFE204020A0211022082DF6200027BC24A424A427BC211042A844448882 +53B2:00003FFE21102FFE211023F8224823F8224823F8204027FC245445F44414840C +53B3:1104088408883FFE20002710211E2FD424A427942494278824E85F9440A480C2 +53B4:3FFE28882F8A20082FBE28882F88289429A2200027FC244427FC444447FC8040 +53B5:3FFE20802FF828082FF844904A8881007EFE48905EBC52A45EBC48906AD49930 +53B6:0200020002000200040004000400080008401020101020107FF8200800080000 +53B7:020002000200FFFE0400040004400840088010801100221044088FFC04040004 +53B8:080808080808080808081010101010102020242424244242FEFE424202020000 +53B9:020002003FE002200220042004220822311EC10002000420081010083FFC1004 +53BA:010001000100FFFE0280044009203118C20602000420081010083FFC10040004 +53BB:0100010001003FF80100010001000100FFFE020002000400082010103FF80008 +53BC:020002000400082010103FF81108010009200910110821044104010005000200 +53BD:020002000400082010103FF80008101010101010202024244242FEFE42420000 +53BE:00007FF00410041004103F90041004107FD0041008101112208A7FCA00460002 +53BF:00001FF0101010101FF0101010101FF010101010FFFE0400082010103FF81008 +53C0:01000100FFFE01003FF8210821083FF8210821083FF80400082010103FF80008 +53C1:0200044008201FF002007FFC0820101027C8C00600000FE0000000003FF80000 +53C2:0200044008201FF002007FFC082010902308CC4601800610182000C007007800 +53C3:040008201FF0102024487EFC010006C018B0E30E0C403190062038C007007800 +53C4:040008201FF0102024487EFC010006C01830E00E0FE000001FF000007FFC0000 +53C5:040008201FF0102024487EFC010006C01830E20E02201290124822480A000400 +53C6:000E03F078440224010803FEFE42104013FE208028FC4544FD28421004680186 +53C7:00100210797C001400FE0014FB7C21922154413851544992F930490002FE0400 +53C8:00003FF01010101010200820082004400440028001000280044008203018C006 +53C9:00003FF01010121011200920082004400440028001000280044008203018C006 +53CA:00003FE008200820084008400CF80A080A080910111010A0204020A043188C06 +53CB:020002000200FFFE040004000FF00A1012101120214040808140062018186006 +53CC:00000000FDFC0484448444842888288810501050282028204450448881040202 +53CD:001000F83F00200020003FF8240824102210222021402080414042208C183006 +53CE:0400040045FC448444844484448844884C505450642044200450048805040602 +53CF:020002003FF0021002100210FFFE020002003FF010100820044003801C70E00E +53D0:00FC3F00010001007FFE0200040007F80A080A08111020A0404080A003180C06 +53D1:01001110110822003FFC0200040007F80A080908111010A0204040A003181C06 +53D2:00003FF000201E40018006601818E00400003EF8028822881450082034D8C306 +53D3:01000100FFFE01003FF8210821083FF801003FF010100820044003801C70E00E +53D4:080008000EFC084408440844FF440028082808284A1049108928084828841102 +53D5:00003EF8020822881450082034D0C30800003EF8028822881450082034D8C306 +53D6:0000FF8022FC22443E44224422443E442228222827A8FA104210022802440282 +53D7:0008007C3F88110808907FFE400280043FF0082004400280010006C01830E00E +53D8:02000100FFFE044014502448444400003FF0082004400280010006C01830E00E +53D9:0800080014FC22444144BE44084408287F2808282A1029104928884828841102 +53DA:00003E7C2204220422043E7C200020003EFC204420443E282010202820C42302 +53DB:1008101C95E0590011007DFC11441144FF441128112811102110222842448482 +53DC:020001007FFE4112912422C00430180CE0023FF010100820044003801C70E00E +53DD:100010FC108410847C941088108010FCFEA410A410A824A84290FEA842C40082 +53DE:00007F00417C41247F2440245F24402840287FA84410551094A8A4A814440882 +53DF:010005003978210821083D78210821083FF801003FF00820044003801C70E00E +53E0:1FE0044003800C407EFC22441C3862440000FFFE90121FF010101FF01010FFFE +53E1:10001F00107CFFA480A47F242A245528A2287F28A2903E1022283E2822443E82 +53E2:24481450FFFE08207FFC01003FF80100FFFE22003EFC22443E282390FE2802C6 +53E3:000000003FF820082008200820082008200820082008200820083FF820080000 +53E4:0100010001000100FFFE0100010001001FF0101010101010101010101FF01010 +53E5:0800080010001FF8200840089F8810881088108810881F881088000800500020 +53E6:00001FF01010101010101FF0020002007FF80208040804080808100820504020 +53E7:00001FF01010101010101FF0000000007FF8040804080808080810082050C020 +53E8:000000007DFC44444444444444444444444444447C4444840084010402280410 +53E9:000000FC7C8444844484448444844484448444847C9444880080008000800080 +53EA:00001FF01010101010101010101010101FF01010000008200810100820044004 +53EB:000400047C8444844484448444844484448C44B47CC444840004000400040004 +53EC:00007FF804080408080808081050202040009FF810081008100810081FF81008 +53ED:000000207920492049204920492049204920491079104A100208040808041002 +53EE:000000007BFE4820482048204820482048204820782048200020002000A00040 +53EF:00007FFE001000101F10111011101110111011101F1011100010001000500020 +53F0:0200020004000820101020087FFC200400001FF010101010101010101FF01010 +53F1:004000407C4044424444444844504460444044C07D40444200420042003E0000 +53F2:0100010001003FF82108210821083FF82108010011000900060005801870E00E +53F3:020002000200FFFE04000400080008001FF8280848088808080808080FF80808 +53F4:020002003FE00220042004220822301EC0001FF010101010101010101FF01010 +53F5:00007FFC40004000400047F0441044104410441047F04410400040007FFE0000 +53F6:0020002078204820482048204BFE482048204820782048200020002000200020 +53F7:00001FF01010101010101FF00000FFFE080010001FF000100010001000A00040 +53F8:00003FF8000800087FE8000800081F8810881088108810881F88108800280010 +53F9:000007F87A084A084A0849104910491048A048A07840484000A0011002080C06 +53FA:020001007880488048404840484048A048A048A0791049100208020804040802 +53FB:00400040784048404BFC48444844484448444884788448840104010402280410 +53FC:000003FC780448044804481448244844488449044A0478044804000400280010 +53FD:000001F0791049104910491049104910491049107A104A1202120412040E0800 +53FE:00003FF800600180010001000100050002001FF010101010101010101FF01010 +53FF:000000007DFC44204420442044204420442044207C2044200020002003FE0000 +5400:0008003C7DE0442044204420442047FE442044207C2044200020002000200020 +5401:000001FC782048204820482048204BFE48204820782048200020002000A00040 +5402:02000100FFFE1000100010001FF8000000001FF010101010101010101FF01010 +5403:00800080790049FE4A004C0049F8480848104860788049000202020201FE0000 +5404:040004000FE0082014402280410006C01830E00E1FF01010101010101FF01010 +5405:000000007EFC4284428442844284428442844284428442847EFC428400000000 +5406:00200020784048404884488449084BF849104810782048400088010403FE0102 +5407:000003F8780848104820484048404FFE48404840784048400040004001400080 +5408:010001000280044008203018CFE6000000001FF010101010101010101FF01010 +5409:010001000100FFFE0100010001003FF8000000001FF01010101010101FF01010 +540A:00001FF01010101010101FF0010001003FF82108210821082128211001000100 +540B:00100010781048104BFE48104810481049104890789048100010001000500020 +540C:00003FFC200420042FF42004200427E424242424242427E42424200420142008 +540D:0200020007F00810142062400280010006001FF8E8080808080808080FF80808 +540E:001000F81F00100010001FFE10001000100017F8140824082408440887F80408 +540F:01000100FFFE010001003FF82108210821083FF811000900060005801870E00E +5410:0040004078404840484048404FFC48404840484078404840004000400FFE0000 +5411:0200040008007FFC4004400447C4444444444444444447C44444400440144008 +5412:0008003C7BC04840484048404840487E4BC048407840484200420042003E0000 +5413:000007FE78404840484048404850484848444844784048400040004000400040 +5414:0020002078204920492C493449644BA449244934792849220122010200FE0000 +5415:00001FF010101010101010101FF0000000003FF820082008200820083FF82008 +5416:0000020279044888485048204820482048204820782048200020002000200020 +5417:000003F07810481049104910491049FC4804480478044BF40004000400280010 +5418:00800080788049FC49204A20482048204BFE4820782048200020002000200020 +5419:00400040784048404A444A444A484C50484048A078A049100110020804040802 +541A:000003F87888488848884FFE4888488848884BF8788848800100010002000400 +541B:00003FF804080408FFFE040804083FF8080008001FF81808280848088FF80808 +541C:000003F8788848884888488848884FF849084908790849080108010807FE0000 +541D:020001007FFC0820044003800C603018C0061FF010101010101010101FF01010 +541E:00003FF801000100FFFE0280044008203018DFF610101010101010101FF01010 +541F:0040004078A048A049104A884C46484048004BF8780848100010002000200040 +5420:004000507848484848404FFE4840484048A048A048A079104910020804040802 +5421:002002207A204A224A224A244BA84A304A204A207A204A2202A20322021E0000 +5422:01000080088848044812481287F0000000001FF810081008100810081FF81008 +5423:00000040F0209010909090809080928492829282F28294880088008800780000 +5424:0040004078A048A049104A084C06491049104910791049100110021002100410 +5425:000000007BFE48104810482048204868486448A479224A220420002000200020 +5426:00007FFC008001000300056009183104C10200001FF01010101010101FF01010 +5427:000003F87A484A484A484A484A484BF84A084A007A004A020202020201FE0000 +5428:0040004078404BFC48404A484A484A484A484BF87848484000420042003E0000 +5429:0010009078904888490849044A044DFA48884888488878884908010802280410 +542A:00A000A078A0492449244B284D304920496049A07920492201220122011E0100 +542B:01000100028004400A203118C1060FE0004000801FF01010101010101FF01010 +542C:0008001C79E049004900490049FE491049104910791049100110021002100410 +542D:0080004078404FFC4800480049F04910491049107910491202120212040E0800 +542E:00800080790049104A084FFC48044920492049207920492002220222041E0800 +542F:010000801FFC1004100410041FFC10001000100017FC24042404440487FC0404 +5430:00400040784048404BFE4840488048904890492079204A480244048401FE0082 +5431:0020002078204BFE48204820482049FC48844888784848500020005001880606 +5432:000403E478244824482449E4490449044A044BE4782448240024002401440084 +5433:000007E00420142017E0100010001FF001100110FFFE0280044008203018C006 +5434:00001FF0101010101FF0000000003FF801000100FFFE0280044008203018C006 +5435:004000407840494849444A424A424C4848484848781048100020004001800600 +5436:004000200020FBFE8A228A228A328A4A8A4A8A86FB068A0202020202020A0204 +5437:0040004078404BF848484848484848484FFE484078A048A00110011002080406 +5438:000007F87908491049104920493C490449044A887A884A500420045008880306 +5439:00800080788048FC490449084A404C40484048A078A049100110020804040802 +543A:000001F07910491049104A0E4C004BF849084910789048A0004000A003180C06 +543B:01000100790049FC4AA44CA448A4492449244A447C4448840104020404280010 +543C:001007D078504890491049104950499049104F107910491201120112050E0200 +543D:002000207920492049FC49204A20482048204BFE782048200020002000200020 +543E:00007FFC020002003FF0041004100810FFFE00001FF01010101010101FF01010 +543F:0100110011001FF8210041000100FFFE010001001FF01010101010101FF01010 +5440:000003FC78104910491049104A104BFE48304850789049100210041000500020 +5441:00400040788048FC49044A044884484448444814482478444984000400280010 +5442:00001FF010101010101010101FF0020004003FF820082008200820083FF82008 +5443:000003FE7A004A004AF84A884A884A884A884AA87A904A8204820482087E1000 +5444:00003FE00420047C0804101461080100FFFE010001003FF8200820083FF82008 +5445:0080004078404FFC4910491049104910491048A078A0484000A0011002080C06 +5446:00001FF01010101010101FF0010001007FFC03800540092011102108C1060100 +5447:010001047D880550092011102108C50602001FF010101010101010101FF01010 +5448:00001FF01010101010101FF0000000007FFC010001003FF801000100FFFE0000 +5449:000007E00420142017E0100010001FF000100010FFFE00000440082010102008 +544A:0100110011001FF8210041000100FFFE000000001FF01010101010101FF01010 +544B:0040004078404BFC4840484048404FFE484048A078A049100110020804040802 +544C:001001107890489048104910489048904810481E7BF048100010001000100010 +544D:0000000079FC4800480048004BFE48204820484078404888010403FE01020000 +544E:000001FC790449044904490449FC492449204920791049100208020804040802 +544F:000800687B8848884888488848884BFE48884888788848880108010802080408 +5450:0040004078404BFC4A444A444A444A444AA44A947B144A040204020402140208 +5451:001000F83F00010002007FFC044008203018C0061FF01010101010101FF01010 +5452:000003FC78404840484048404FFE484048A048A078A0492001220222041E0800 +5453:009000907BFE4890489048004BF8481048204840788049000202020201FE0000 +5454:00400040784048404FFE4840484048A048A048A0791049100288024804440802 +5455:000003FC7A004A084A884A504A504A204A204A507A504A880308020003FE0000 +5456:000003FE7A004A204A204A204AFC4A244A244A247A444A440484048409281210 +5457:000001FC79044904492449244924492449244924792448500048008401020602 +5458:00001FF0101010101FF000003FF82008210821082108210822C8043018086004 +5459:00001FF01010101010101FF0010001007FFC4104428444444824400440144008 +545A:004000407C40448044FE450846884488448844507C5044200050008801040202 +545B:0040004078A048A049104A084C0649F049104910795049200104010400FC0000 +545C:0020004079FC49044904490449144908490049FE7802480203FA000200140008 +545D:0040002079FC4904490449FC49004900497C49087910492001420282027E0400 +545E:000001FC780448044BF44804480449F449144914791449F40004000400140008 +545F:0080004078404BFE48404840488849084BF0482078404888010403FE01020000 +5460:00400040784048404FFC484048E048E0495049504A487DF44842004000400040 +5461:000003FC7A044A044A044BFC4A204A204BFE4A207A204A100212028A03060202 +5462:000003FC7A044A044A044BFC4A004A404A444A487A704A4004420442083E1000 +5463:000001F8790849484928490849084FFE4A084A887A484A0803FE000800500020 +5464:0040004078A048A049104A484C2648204BF848087810491000A0004000200020 +5465:0040004078404BF84A484A484BF84A484A484A484FFE7A084A08020802280210 +5466:002001207120522052FC54A4572451245224522474A447A400C4004400940108 +5467:0008003C7BE04A204A204A204A204BFE4A204A107A104A12020A028A03260212 +5468:00003FF8210821082FE8210821083FF8200827C82448244827C8400840288010 +5469:000001FC7800480048004BFE48204820492849247A244A220422002000A00040 +546A:000003FC7A044A044A044A044BFC4890489048907890491201120212040E0800 +546B:0020002078204820483E48204820482049FC4904490479044904010401FC0104 +546C:000000007BFC4A944A944A944A944A944A944A944A9C7B044A04020403FC0204 +546D:004802487A484A484A484FFE4A484A484A484A487A784A000200020003FE0000 +546E:0000000079FC4904490449044904490449FC4904780048900088010402020402 +546F:000001FC78204820492448A448A848204BFE4820782048200020002000200020 +5470:0440044024442758246024422F42F03E40001FF010101010101010101FF01010 +5471:0008003C7BD04A904A904A904A904A904A904A887A884AC802A404D404920800 +5472:0090009078904A904A924AD44A984A904A904A907A904A9203D20E12040E0000 +5473:0040004078404BFC4840484048404FFE48E0495079504A480444084200400040 +5474:00800080790049FC4A044C0449E449244924492479E449240004000400280010 +5475:000000007BFE4808480849E8492849284928492879E849280008000800280010 +5476:02000200E27CA224AFA4A4A4A4A4A4A8A4A8A928E510A2100528094810840102 +5477:000007FCF4449444944497FC94449444944497FCF44490400040004000400040 +5478:000003FC782048204840484048D049484A444C44784048400040000007FE0000 +5479:004000407A404A404BFC4A404C4048404FFE484078A048A00110020804040802 +547A:000001F879084908490849F848004BFE4880490079F848080008000800500020 +547B:0040004078404BF84A484A484A484BF84A484A487A484BF80248004000400040 +547C:0008003C7BE04820492448A448A848204BFE4820782048200020002000A00040 +547D:0100010002800440082037D8C00600003EF82288228822883EA8229000800080 +547E:0000000079FC49044904490449FC49044904490479FC49040000000003FE0000 +547F:00200020782049FC4820482048204BFE4820484078404888010403FE01020000 +5480:000001F879084908490849F849084908490849F8790849080108010807FE0000 +5481:01080108790849084FFE490849084908490849F8790849080108010801F80108 +5482:000003FE7A104A104A104AFE4A924A924A924A927A9A4A940210021003FE0000 +5483:0120012079204AA04AAC4EB44AE44BA44AA44AB47AA84AA202A20282027E0200 +5484:00200020792449244924492449FC4824482048207A224A220222022203FE0002 +5485:020001003FF8000008200440FFFE000000001FF010101010101010101FF01010 +5486:0080008079FC49044A044DF449144914491449F4790449280112010200FE0000 +5487:00000040782048284808488848904A944AA24AA27CC248880188028804780000 +5488:0090009078904BFC489448944BFC4A904A904BFE78924892011A011402100410 +5489:0040004078404BF84A484A484A484A484A484FFE784048A000A0011002080406 +548A:003803C07840484048404FFC484048E048E0495079504A480444084200400040 +548B:01000100790049FE4A804A804C8048F848804880788048FC0080008000800080 +548C:04000E007800087C0844FF44084418441C442A442A444844887C084408000800 +548D:002000207840488849044BFE4802480049FC4904790449040104010401FC0104 +548E:104010401E502248224454440840144023FEC0001FF01010101010101FF01010 +548F:00400020781049E0482248344BB848B048A848A8792849240224042200A00040 +5490:0088008878884908497E4B084D08494849284928790849080108010801280110 +5491:01000100793E49084FC849084908494849884F08790849080108010805280210 +5492:00007CF84488448844887CF8000000000FC0084008400840104010422042C03E +5493:000000007BFC4900490049F04910491049904A507A504A10021202920312020E +5494:004000407840487C4840484048404FFE48404840785048480044004000400040 +5495:00200020782048204BFE48204820482049FC4904790449040104010401FC0104 +5496:04000400F400943C9FA494A494A494A494A494A4F4A494A408A408BC12A42100 +5497:00400040784048404BFE48404880488048FE491079104A100210041001FE0000 +5498:0040004078404BFE488048A0492049FC4B244D24792449240134012800200020 +5499:00900088788848804BFE48A048A048A448A449287928493202220262049E0800 +549A:0080008078F849084B104CA0484048A04B184C0678C048200010018000600010 +549B:0040002078204BFE4A024C04480048004BFE4820782048200020002000A00040 +549C:0040002078204BFE4A024C04490049084910492079C049020102010200FE0000 +549D:0108010871085210529454A457BC510851085210742057BC000000000FFE0000 +549E:000003FC789048904890489048904FFE48904890789048900110011002100410 +549F:000003FE78204820484049FC49044904490449FC490479044904010401FC0104 +54A0:00001FF0101010101FF000007FFC10101FF010101FF01010103EFFD000100010 +54A1:000003FE79084908490849F84908490849F849087908491E07E8000800080008 +54A2:00003EF8228822883EF800003FF80000FFFE040008000FF00010001000A00040 +54A3:004000447A444948495048404FFE4890489048907890489201120112020E0400 +54A4:0040002078204BFE4A024C0448384BC048404840787E4FC0004000420042003E +54A5:000003FE78204840488849044BFE4822482048207BFE48200020002007FE0000 +54A6:00400040F7FE904097FC904493FC9240944097FEF04290AA00A4011002080C06 +54A7:00040004EFC4A214A214A3D4A254A454A654A554E894A0940104020404140808 +54A8:4080208009FC12042448E04020A023182C0600001FF01010101010101FF01010 +54A9:01040084788848004BFE4820482049FC482048207BFE48200020002000200020 +54AA:004000407A484948495048404FFE484048E0495079504A480444084200400040 +54AB:00003E7C22442244224422443E7C2A002828282428442442248242004180807E +54AC:00800040F04097FC900091109208940491109110F0A0904000A0011002080C06 +54AD:0020002078204BFE4820482049FC4800480049FC790449040104010401FC0104 +54AE:00200120792049FC49204A2048204BFE487048A878A849240124022200200020 +54AF:0080008078F849084B104CA0484048A049184A067DF849080108010801F80108 +54B0:0080008079FC49044A0449E44924492449E44924792449E40104000400280010 +54B1:0020004079FC49044904490449FC49044904490449FC79044904010401FC0104 +54B2:02080108791048004BFC4840484048404FFE4840784048A000A0011002080406 +54B3:00400020F02097FE90409084910893F090229044F18896100020005001880604 +54B4:0040004078404BFE4880489048904912495249547A904A280428004400840102 +54B5:002000207BFE4850488849044AFA48004BFE4840788049FC0004000400280010 +54B6:0008003C79E0482048204BFE48204820482049FC790449040104010401FC0104 +54B7:0090009078904A9249944898489049984A944C9278904890011201120212040E +54B8:0050004800403FFE204020402F44204420442F28292829122F32494A40868102 +54B9:0040002078204BFE4A024C4448404BFE48884888790848D00020005000880304 +54BA:000003FE7800480049FC4904490449FC4904490479FC49040000000003FE0000 +54BB:009000907890491049FE4B104D10493849384954795449920110011001100110 +54BC:00001FF0101010101F90109010907FFC400440044FE4482448244FE44004400C +54BD:000007FCF40494449444944497FC9444944494A4F49495140604040407FC0404 +54BE:0040004078444BF4484848504FFE4840488049844A987CE048820082007E0000 +54BF:0100017CF1249224922496FE9A2492249224927CF22492200220022002400280 +54C0:02000100FFFE000000001FF0101010101FF0028004440C283410C50806060400 +54C1:00001FF010101010101010101FF0000000007C7C44444444444444447C7C4444 +54C2:000007FE7890489048904BFC4A944A944A944A947A9C4B040204020403FC0204 +54C3:000003FC7A044A044AF44A044A044AF44A944A947A944AF40204020402140208 +54C4:01100110791049104BFC49104910491049104FFE780049100108020804040804 +54C5:01000100790049FE4A024A024D1248A24A4A4AAA7B1A4A0A03FA000200140008 +54C6:00800080F1F89210952090C0909093209C7C9084F10896900060004001800E00 +54C7:0020002079FC4820482048204BFE48004820482079FC48200020002003FE0000 +54C8:0040004000A0F8A089108A088C0689F4880088008BF8FA088A08020803F80208 +54C9:0840084808447F4408400840FFFE004000443E442228222A22123E2A22460082 +54CA:00400040F7FE9080910091FC9304950499FC9104F10491FC0104010401140108 +54CB:021002507250525C5F7452D4525452545254525C725053520E420442003E0000 +54CC:0008003CF7C09400941C95E09520952295249528F51095100508094409821100 +54CD:0040004078804BFC4A044A044AF44A944A944A947A944AF40204020402140208 +54CE:011001107BFC4910491048004A084A084910491078A0484000A0011002080C06 +54CF:000003F87A084A084BF84A084A084BF84A444A487A304A200210028803060200 +54D0:000003FE7A004A004BFC4A204A204AF84A204A207A204BFC0200020003FE0000 +54D1:000003FC78904890489048924C924A944A944A98789048900090009007FE0000 +54D2:001002107910491048FE48104B104928492449447942498201000280047E0000 +54D3:0080008078BC4BC04850482448D44B0C48004BFE7890489001120112020E0400 +54D4:01100112791449D8491049124952498E492048207BFE48200020002000200020 +54D5:002001247924492449FC4840484048FC49044A84784848500020004000800300 +54D6:0080008078FE49104A10481048FC4890489048907BFE48100010001000100010 +54D7:00900094791449184B104D324952490E492048207BFE48200020002000200020 +54D8:00800080793C4A004C804880497E4B084D084908790849080108010801280110 +54D9:0040004078A049104A084C0649F0480048004FFC784048800110020807FC0204 +54DA:000001F079104910491049104A4E4C404BFC484078E049500248044600400040 +54DB:00807C8844B044C444847C7C00000440082010102FE8C4260420082010A06040 +54DC:004000207BFE490448884850482048D84B064888788848880088010801080208 +54DD:00400040F04097FC948498889140914493489530F92091100108014401820100 +54DE:00400040789049084BFC48244920492049FC4A2078204FFE0020002000200020 +54DF:02200220F220943C95449F449284922494149F94F404900401840E0404280010 +54E0:00200120792049FE4A204C2048204BFE4800480079FC49040104010401FC0104 +54E1:00001FF0101010101FF000003FF820083FF820083FF820083FF8082010102008 +54E2:000003FE7820482049FC482048204BFE488848887BFE48880088010801080208 +54E3:000003FC7800480049F849084908490849F84800790848880090000007FE0000 +54E4:0110010879004FFE494849504964494849504A647A484A520462044209BE1000 +54E5:00007FFC00101F90109010901F900000FFFE00101F90109010901F9000500020 +54E6:002801A4F724912091209FFE9120912491A49328FD2891100112012A05460282 +54E7:0020002079FC4820482048204BFE48484848494C794A4A4A0088008801280210 +54E8:0020012478A448A8482049FC4904490449FC4904790449FC0104010401140108 +54E9:000007FCF444944497FC9444944497FC90409040F7FC9040004000400FFE0000 +54EA:00000FDE72525252525457D45258525452525FD27252525A0254045005500890 +54EB:000001FC79044904490449FC482048204920493C7920492002A00260043E0800 +54EC:0100010079FE4A044A044EF44A944A944A944A947AF44A940204020402140208 +54ED:00003C782448244824483C78000001100108FFFE01000280044008203018C006 +54EE:004000447BF4484848484FFE482048404BF849107A204DFE0820002000A00040 +54EF:000001FC7904490449FC4904490449FC4904490479FC4850009000920112020E +54F0:004000207BFE4A024C24492049FC49204A2048207BFE48200020002000200020 +54F1:002000207BFE482048204BFE4A024C0449F8481078204BFE0020002000A00040 +54F2:080C08F07E8008800EFE788808882908120800001FF01010101010101FF01010 +54F3:0208021C726052405FC05240527E52C853485E4872485248024802480A880508 +54F4:008000407BF84A084A084BF84A084A084BF84A407A444A280210028803060200 +54F5:000203E27A224A2A4A2A4BEA490A490A4BEA492A792A492A0222022204AA0844 +54F6:0088008878884B8E48884888480049FC482048207BFE48200020002000200020 +54F7:0008003C7BC048444A244928490048104BFE4810791048900090001000500020 +54F8:0008003C7BC048444A244928490048404BFE488879084B900060005001880604 +54F9:0008003C7BC048044A44492848004BF8481048204FFE78204820002000A00040 +54FA:00480044F7FE9040904093FC9244924493FC9244F24493FC0244024402540208 +54FB:000001FC790449FC490449FC4800480049FC482078204BFE0020002000200020 +54FC:004000207BFE480049F84908490849F848004BFC780848300020002000A00040 +54FD:000007FEF04097FC9444944497FC9444944497FCF24091400080014002300C0E +54FE:010400847888481049FC49044904490449FC48507850489000920112020E0400 +54FF:080008007F7C114411442544427C0000FFFE00101F90109010901F9000500020 +5500:001C01E0782048204BFE48A849244A2249F84888789048BE0102010202140408 +5501:004000207BFE4800480049FC4800480049FC4800780049FC0104010401FC0104 +5502:01100108F2049444904090A0911092089C0693F8F20892080208020803F80208 +5503:010001007BF84A084C104BFC4A444A444BFC4A447A444BFC0244044404540808 +5504:000001FC7904490449FC4904490449FC4904490449FC78004888008401020202 +5505:0040004078A049104A884C4649F04810482048407BF84A080208020803F80208 +5506:00400040788849044BFE4802488849444A4248F879884A500020005001880606 +5507:00003FFC20002FF820003FFE248824502530260E20002FF8480848088FF80808 +5508:000001F87908490849F848004BFC4A444A444A447BFC4A000202020201FE0000 +5509:00400080F110920897FC9104910093F8944090409FFEF04090A0011002080C06 +550A:0020002078204BFE482048204924492449244AAA782048500050008801040202 +550B:002000207850488849044AFA482048204BFE4820792849240222042200A00040 +550C:0004000E7BB8488848884928492E4BA848A84AA87AA8493E01000280047E0800 +550D:004000207BFE4A024C0449F8480048004BFE48907890489001120112020E0400 +550E:004200E27B82488A488A488A4FEA488A498A49CA7AAA4A8204820082008A0084 +550F:01840068783048C84B0448404BFE48A049204BFC7D2449240134012800200020 +5510:010000803FFE20802FF820883FFE20882FF820802FF82808480848088FF80808 +5511:00400040F24892489248955498E29040904097FCF0409040004000400FFE0000 +5512:00000FFEF0A090A097FC94A494A494A4951C9604F40497FC0404040407FC0404 +5513:002000207BFE482049FC4924492449FC4924492449FC78204BFE002000200020 +5514:000007FCF040904093F89088908897FE90009000F3F892080208020803F80208 +5515:0020004079FC4904490449FC4904490449FC482078204BFE0020002000200020 +5516:000003FC7890489048904BFC4A944A944A944A947BFC48900090009007FE0000 +5517:0020002079FC4820482048204BFE482048204920793C492002A00260043E0800 +5518:0000FEFC104420443E286210A2283E44228200001FF01010101010101FF01010 +5519:001008907510521255525954515851905310552879285128014801440A840502 +551A:000001FC780448FC480449FC48004BFE4A0249F8788848880050002000D80306 +551B:00400040F7FC904093F8904097FE908090F89108F31094A0004000A003180C06 +551C:010001007FFC01003FF8054009203118C10600003E442258226022423E42223E +551D:000001FC782048204BFE4800480049FC49044924792449240154008801040602 +551E:01040124791449144FC449244914495449864F3C790449040104010405040204 +551F:010001003FF801000100FFFE040008201FF000103E442258226022423E42223E +5520:008800887BFE488848004BFE4A024C4448404BFC784448840084010402280410 +5521:000003FE7850485048504BFE4A524A524A524AAA7AA64B0202020202020A0204 +5522:0020012478A448A8482049FC4904492449244924792449240050008801040202 +5523:0020004079FC4904490449FC4904490449FC48407840487E07C000420042003E +5524:01000100F1F0921094209BF89248924892489248F7FE90A000A0011002080C06 +5525:001004107A284A2848444992490849084AFE4E027A044A440228021002080008 +5526:00100210791049104C544A524A524890481049147E044A0802080210022000C0 +5527:000007BC74A454A454A457A454A454A454A457A47434552804A0056006200020 +5528:000007BC74A455245524563C552454A454A454BC76A4552404240424047E0400 +5529:001C01E0782048204BFE48A849244A4248404BFE7888490800D0003000480184 +552A:00400040F7FC904093F8908097FC911092489446F1F0904007FC004000400040 +552B:0040004078A049104A084C0649F0484048404BF878404A48014801500FFE0000 +552C:00400040787C48404BFC4A444A704BC04A444A3C7A004AF0049004920912120E +552D:008800887BFE4888488848F84888488848F8488878884BFE0000008801040202 +552E:090008800FFC10803FF850809FF810801FFC00001FF81008100810081FF81008 +552F:00A00090788049FE49104B104DFC4910491049FC79104910011001FE01000100 +5530:000207E27422542A57EA548A548A548A57EA56AA76AA5AAA0AA212E2008A0084 +5531:01F80108790849F84908490849F848004BFC4A047A044BFC0204020403FC0204 +5532:000000407B9C4A044A044B9C4A044A044BFC489078904890009001120212040E +5533:004000207BFC4A044A044BFC4A004A284A244BFE7A204A500250048805040A02 +5534:02080108F11097FC9040904093F8904090809FFEF1209120022002220422081E +5535:004000807BFC49104A484C464BF84A484A484BF84A487A484BF800420042003E +5536:0088008878884BFE488848884FFE480049FC4904790449FC0104010401FC0104 +5537:004000207BFE488049044BFE480249FC490449FC790449FC0104010401140108 +5538:0040004078A049104A884C4648004BF048104820784049240522050A090800F8 +5539:0108008878084FD44A144A224A004BC84A444A447A404A500248044405440880 +553A:0090009078904BFC4A944A944A944BFC4A944A944A947FFE4800009001080204 +553B:0040004078404FFC48404A484A484A484D5448E0795049500248044408420040 +553C:008000407BFC4800490848904FFE484048404FFE788849080090006001980604 +553D:01000106F138912097A09120913E932493A49564F52499240124012401240144 +553E:00100078F3C09040904097FC9248924897FE9248F24897FC0040004007FC0000 +553F:01000100F3FC9494989491249244948491289210F0409124052A050A08F80000 +5540:000003FE7A104A104AFE4A104A104BFE4A004A107A104AFE0210041005FE0800 +5541:000007FCF444944495F49444944497FC940495F4F514951405F4040404140808 +5542:00E80F08E228A928A548A008A7C8A088A108A108E1E8AF08010A010A050A0206 +5543:00200120793C492049204FFE48004BFC4A044BFC7A044BFC0204020402140208 +5544:000003FE7840488049444A2448684AB049304AA8786848A40122022000A00040 +5545:00200020783E482049FC490449FC490449FC492448207BFE4820002000200020 +5546:020001007FFC082004403FF820082448282837D82448244827C8200820282010 +5547:020001007FFC082004403FF821082FE8210827C82448244827C8200820282010 +5548:0020002079FC482048204BFE4888485049FC482078204BFE0020002000200020 +5549:011001107110511057BC51105110533853B85554755459920110011001100110 +554A:00000EFCEA08AA08AAE8AAA8ACA8AAA8AAA8AAA8EAE8AAA80C08080808280810 +554B:0008003C7BC048444A244928490048204BFE487078A848A80124022204200020 +554C:0040002078204BFE4A024C9449084A04480049FC782048200020002007FE0000 +554D:004000207BFE480049FC490449FC480049FC480878104BFE0020002000A00040 +554E:200021FE20203E2049FC8844084409FEFE00080008FC08840884088408FC0884 +554F:00007CF844887CF844887CF8400840084FC8484848484FC84848400840284010 +5550:00800040F7FC90009110911092A8944490009040F7FE90400040004000400040 +5551:002000207BFE482049FC48244BFE482449FC48207920493E012002A0027E0400 +5552:000003FE7A024A024BFE4A104A924A924A924AFE7A104A920292049204FE0802 +5553:104008403E7E228823483E5020204058418680001FF01010101010101FF01010 +5554:104808443E7E23C022243E282212206A418680021FF01010101010101FF01010 +5555:0100010079FC4A044D0449E44A8448844FF448847AA44AA403E4000400280010 +5556:00400244F244944890A091109608904490409248F248945000A0011002080C06 +5557:0080008078F849084A104C0048404B9C4A044A047B9C4A040204020403FC0204 +5558:00800040F7FE94029A04920093BC94A494A496A4F9349128022202220422081E +5559:04400440244427582460244224422F42F03E00003E7C2244224422443E7C2244 +555A:00001FF0101010101FF00100FFFE02003FF8200827C8244827C820083FF82008 +555B:002000207BFE482049FC48244BFE482449FC48407BFE488401C8003000CC0302 +555C:000007BC708452945108529454A45840500057BC70A452A40128029004A80846 +555D:000001807700511E51125FD2511253125392535275525512091E011201000100 +555E:000007FE7890489048904B9C4A044A044A044B9C789048900090009007FE0000 +555F:082004203F20213E214421443F4420A420283F283110511051289F2811440082 +5560:060C3870204020403F7E244824482448448881001FF01010101010101FF01010 +5561:00900090F090979E909090909090939C90909090F090979E0090009000900090 +5562:000003FE782048204BFE4A224A224B324AAA4AAA7B764A6602220222022A0204 +5563:0400040077DE5912511251125FD25112511255D27512551A05D41E1008100010 +5564:004000807BFC4A244A244BFC4A244A444BFC489079104FFE0010001000100010 +5565:0040004078A049104A084DF6484048404FFC484078404BF80208020803F80208 +5566:012001107110517E57805104514451C4512453247528512801080110057E0200 +5567:002000207BFE482049FC48204BFE480049FC4904792449240124005000880304 +5568:002000207BFE482049FC48204BFE480049FC490479FC490401FC010401140108 +5569:01100110F7D09110911091189FF4901291129110F7D09110011001D00E100410 +556A:021002107220527C5FC45244524452C4537C5E4472445244024402440A7C0444 +556B:004000447BF4484848504FFE4840488049F84B087D0849F80108010801F80108 +556C:010001007FFC010011100920FFFE00003FF8200827C8244827C820083FF82008 +556D:0210021072105FBC52105510557E57905120513C71C45F080528011001080104 +556E:00400040F27C9240924092409FFE900094449444F4A494940514040407FC0004 +556F:000003FE7A024A024BFE4A224A224AFA4A224A327A2A4BFE0202020203FE0202 +5570:000003FE7A524A524A524BFE4820484048FC49047A8848500020004001800600 +5571:002001247924492449FC480048004BFE4840488078FC49840284048400FC0084 +5572:0088008879084BDE4A524A624A424A524BCA4A4A7A424A42024203C202540008 +5573:00400248F15097FC908091009FFE921094089BF4F212921002500224020401FC +5574:01040088785049FC4924492449FC4924492449FC7820482003FE002000200020 +5575:00100410721052FE58925494549052FC52A454A47CA854A80490052805440282 +5576:004000207BFE4A024C0448004BFE482048204920793C492002A00260043E0800 +5577:0100009E7BD24A524A544BD44A584A544BD24A127A924A5A02D4035002100010 +5578:004000407BF848484FFE48484BF848404A484A487AE84B580248024804480848 +5579:000003FC7A044A044BFC4A204A204BFE4A204A207AFC4A840284048404FC0884 +557A:000001FC790449FC490449FC48004BFE490049FE7A4A4C920122024200940108 +557B:01003FF8082004407FFE41029FF411101150112001003FF8200820083FF82008 +557C:0040002079FC4800488848504BFE4A224C2449FC492479244934012800200020 +557D:004000A079104A084DF648004BF84A084A084BF87910491007FC011002100410 +557E:008801C877085108512A512A57AC514853085388755455140914012401240142 +557F:008800887BFE488848F8488848F8488848884BFE790049480184010001FE0000 +5580:004000207BFE4A02488048F849084A90486049987E0649F80108010801F80108 +5581:01FC0124792449FC4924492449FC482048204BFE7A224A2A02FA020A02020206 +5582:000003F87A484A484BF84A484A484BF848004FFE7A404A440228029003080206 +5583:00400040F7FC9040904097FC951494A495F49444F44495F40444044404540408 +5584:082004407FFC01003FF801007FFC11100920FFFE00001FF0101010101FF01010 +5585:000001FC790449FC490449FC4904484048204BFE780049040088000007FE0000 +5586:101010101010FEFE101010107C7C000000007C7C44444444444444447C7C4444 +5587:0104010477C45104511457D45554555457D45114739455540944010401140108 +5588:022002247BA84A304AA24B224A5E48804BFC4A047A044BFC0204020403FC0204 +5589:010001787108520852FE56405A40527C5290521072FE52100228022802440282 +558A:00140012701057FE5410541055D05412541255D47554554805DA042A08461082 +558B:0048014879484BFE494849484978490049FE48207BFE487000A8012406220020 +558C:00007EFC428442847EFC00001008110811085548532891082108210841088108 +558D:009000927AD44A984A924AD24F0E482048204BFE787048A80124062200200020 +558E:000001FC7904490449E4492449244BFE4A024AFA7A8A4A8A02FA0202020A0204 +558F:01080108F7FE91089148904097FE9080910093FCF50499040104010401FC0104 +5590:0100011E77F25112521453D4525856545BD25252725253DA02540250025002D0 +5591:008000407BFC4800490848904FFE480049F84908790849F80108010801F80108 +5592:0088008879EC492A4A284D484888497E4E0049FC7904490401FC0104010401FC +5593:000003FE785048504BFE4A524A524BFE480048404FFE78884990006000D80304 +5594:000003FC7A044A044BFC4A004BFC4A404A884BFC7A244A2005FC0420082013FE +5595:000007FE784048804BFC4A944A944AF44A944A947AF44A940294029403FC0204 +5596:010801087108510857BE510853085388557E55227922512201220122013E0122 +5597:000003FE7A2248204BFE482049FC492449FC492479FC482003FE002000200020 +5598:00400444F444944497FC90009FFE9040908097FCF4A494A404A404A404A4040C +5599:010001F8F20893F0901097FE90809144966890B0F128966800A4012206A00040 +559A:01000100F3F09410982097FC940494A495149444F0409FFE00A0011002080C06 +559B:003C07C07A44492848004BFC488048804FFE490079F84A880250042008D80306 +559C:01007FFC01003FF800003FF820083FF80820FFFE00003FF8200820083FF82008 +559D:000003F87A084BF84A084BF849004BFC4C444A447AA44A0403F4000400280010 +559E:008001007BDE4A524A524BD24A524A524BD248127A5A4B940210025001D00010 +559F:000003FE7A224BFE4A224BFE480049FC490449FC790449FC0104010401140108 +55A0:0008003C79E048204BFE482049FC492449FC492479FC482001FC002003FE0000 +55A1:0040004079FC48844BFE480049FC490449FC48207BFE4820022003FE00200020 +55A2:0004001E7BE0482048204FFE482048A04B2E4A227A224BAE0222022203FE0202 +55A3:0100010079FC4A044C0449E44924492479E44804002800102488224442448004 +55A4:0020004079FC490449FC490449FC48004BFE4820782049FC0020002003FE0000 +55A5:004000207BFE4A484A484BFE4A484A784A004AFC7A444A480228041004680986 +55A6:00001FF0101010101FF000007D7C454445447D7C01002108210821083FF80008 +55A7:004000207BFE4A024C0449FC480049FC490449FC790449FC0104000003FE0000 +55A8:00800040F7FE900093F8920893F8900097FE9402F9F49110011002120412080E +55A9:01C000A079104A084DF648004BCA4A4A4A544BD47A684A5403D4024A024A02C0 +55AA:010001007FFC01003D7825483D780100FFFE1200111010A010401430180E1000 +55AB:0080009E7BEA488A49CA488A4BEA489248A648207BFE48200050008801040602 +55AC:00F83F000200FFFE04400FE03458C7C600003FF8200827C8244827C820282010 +55AD:004000207BFC4800490848904BFE4A104A204AC87A104A2402C8041004600980 +55AE:00007EFC428442847EFC00003FF821083FF821083FF80100FFFE010001000100 +55AF:002000207BFE485048A849244AFA482048A848887BFE48880088008801080208 +55B0:0040004078A049104A884C464BF84A084BF84A087BF84A440228029003080204 +55B1:000007FEF40095FC9524952495FC9524952495FCF420942005FC0820082013FE +55B2:011001107210529E54A25F2251425212548A5FCA744250020A82094211540008 +55B3:00400040F7FC90E091509248944693F8920893F8F20893F8020800000FFE0000 +55B4:0014001277FE5410541057F05492549257D2555475545488054A0A1A08261042 +55B5:008800887BFE48884888480049FC49244924492479FC49240124012401FC0104 +55B6:2208111000207FFE400280041FF0101010101FF000003FF8200820083FF82008 +55B7:002001FC782048884BFE4888480049FC49044924792449240124005000880304 +55B8:012001107FFC01003FF821083FF821083FF8210800007C8844B044C47C84447C +55B9:00400040F7FC90A0911092489DF69040904097FCF000904003F8004000400FFE +55BA:0106017871105222524456F85A14522252FE5212721052540292031202500220 +55BB:004000A079104A084DF648004BC44A544A544BD47A544A5403D40244025402C8 +55BC:0080008079F84A084C104BFC480449FC48044BFC780448400124052A050A08F8 +55BD:0020012478A848204BFE48A849244A0248404FFE788849080190006001980604 +55BE:2208111000207FFE410291041FF021000100FFFE00001FF0101010101FF01010 +55BF:00001FF0101010101FF000007C7C444444447C7C01007FFC05401930E10E0100 +55C0:10001078FE4810487C480086FE0082FC00447C4400287C28441044287C444582 +55C1:0004001E7BF04A1E4A104AFE4A924A984AF24A8E7A804AB802A804AA054A0A86 +55C2:0008003C7BC048044A44492849FC4A2048204BFE782049240124012401FC0004 +55C3:004000207BFE480049FC490449FC48004BFE4A027AFA4A8A02FA0202020A0204 +55C4:07FC0080F3F8920893F8920893F8920893F89080F1F8931004A0004001B00E0E +55C5:004000807BF84A084BF84A084BF84A084BF8485078484FFE00A0011002080C06 +55C6:00400040F0A09190924897FE9A0893F8920893F8F20093F80508050809F80108 +55C7:010001007FFC111029284544FFFE00003FF8200827C8244827C820083FF82008 +55C8:012402487A4849244BF84A084BF848004BF84A487A484BF80202020201FE0000 +55C9:002000207BFE482049FC48204BFE4840488849F078244BFE0022012402A20040 +55CA:000001FC782048204BFE480049FC490449FC490479FC490401FC008801040202 +55CB:004001FC7844489449084BDE494A494A4A9449FC790449FC010401FC0104010C +55CC:02080108F110900097FC900091109208940493F8F2A892A802A802A80FFE0000 +55CD:0440025E7292501257D2511E55525552555257DE7152511202120222042A0844 +55CE:000001FE792049FC492049FC4920492049FE48027AAA4AAA02AA020200140008 +55CF:008800887BFE488848A84850488849244A2249FC782048A80124022200A00040 +55D0:004000207BFE4A024C2449FC482049FC48204BFE782049FC0104010401FC0104 +55D1:0020002079FC482048204BFE488049044BFE48027BFC4A940294029407FE0000 +55D2:01100110F7FC9110904090A09110920895F69000F00093F80208020803F80208 +55D3:03F00110F0E09318900097BC94A4931894A49040F7FC90E0015002480C460040 +55D4:00400040F7FC904093F8920893F8920893F89208F3F892080FFE011002080404 +55D5:000003FE7A004AFC4A004BFE4AA84A904AC84A867A084BFE0288044804080818 +55D6:0140065CF4449444975C9444944497FC904097FCF208911000A0004001B00E0E +55D7:000001FC790449E449244BFE4A0249FC490449FC790449FC0104010401140108 +55D8:001E03E0792248944840488849F0482048C449FE7822482003FE005000880306 +55D9:004000207BFC490848904BFE4A024C4448204BFC788048F80088010801280210 +55DA:0040008079FC4904490449FC490049FE490049FE78024AAA02AA040200140008 +55DB:0108009078004BFE48A04BFC48A44FFE48A44BFC78A049B002A80CA600A000A0 +55DC:0040004479F848504BFE484048F849824A7E4C0079FC490401FC010401FC0104 +55DD:00000FFEF00093F89208920893F8900097FC9514F4A497FC0444044404540408 +55DE:0084004478484BFE488448844908494A4A524B9C788449080108025203DE0042 +55DF:0108008878904BFC484049F848404BFE4880490079FC4A200420082003FE0000 +55E0:0E40F04022789288555000207C500888110610F81E88F0885088108850F82088 +55E1:0090008879044A424C8849FC480448004BDE48427A52494A02520042014A0084 +55E2:000001F87908490849F84908490849F848004BFC7A944A940294029407FE0000 +55E3:00003E7C220422043EF400047F045574555455547F5455545574550451144308 +55E4:00200124792449FC48204BFE4800482049FC4924792449FC0020002403FE0102 +55E5:00400080F3F8920893F8920893F8908097FC9110F24894440BFA004000400040 +55E6:00400040F7FC904097FC9484991893E090409088F7FC90440250044809480080 +55E7:10007E7812482A48457882800C6037D8C0063FF8248824883FF8248824A82010 +55E8:00800880E4FEA100AAFCA484A4A4A094A3FEA484ED24A51405FE040404280010 +55E9:0020012478A8482049FC4904490449FC490449FC4904790449FC000000880104 +55EA:00400040F7FC904093F8908097FC9110926895C6F04093F800E0015806440040 +55EB:000003FC790849F8490849F8490E4FF848084FBC78A44AA40128029004A80846 +55EC:01100110F7FE9110910092FE920896089AE892A8F2A892E802A8020802280210 +55ED:01007FFC01001FF010101FF010101FF010101FF01010FFFE00903EE422843E7C +55EE:000000FEEE28AA28AA28AAFEAAAAAEAAAAAAAAAAEAAEAAC20E820A8200FE0082 +55EF:000007FCF444944497FC944494A49514940497FCF04090240522050A090800F8 +55F0:020003FC752455245D2455FC5524552455745554755455540574050405FC0504 +55F1:00200050788849744A0248F8488848F8480C49F0782049FC002003FE00200060 +55F2:00900108F29490609198964690FC930890B090D0F73E90C20324001800600780 +55F3:000E03F078444A2449084BFE4A4248404BFE488078FC49440128021004680186 +55F4:010800907BFC4840484049F8484048404BFC48A078A848B4013C01220222041E +55F5:01FC0808E450A420A1FCA124BD24A5FCA524A5FCE524A524052C0A0011FE0000 +55F6:000001FC792449FC492449FC48A848A84BFE48A878A849FC002003FE00200020 +55F7:01080108710857D0511E579451245FD4521453D472545248024804D404240842 +55F8:08207F20087E7E4408A4FF2810101E282244468280003FF8200820083FF82008 +55F9:0020082075FE542051FC51245DFC552455FC542075FE542004200A2011FE0000 +55FA:002002227BFE4890488849FE4B104D1049FE4910791049FE0110011001FE0100 +55FB:004000207BFE4A004A484A484BFE4A484A484A487A784A000554052A0A2A1000 +55FC:008800887BFE4888480049FC490449FC490449FC78204BFE0050008801040202 +55FD:01080108F7C89108911E97D29564954097C89108F38895480954011401240142 +55FE:04200220723E5F4054A05420573C55505510551075FE5510052809280B441082 +55FF:004000A079104A484DF6482048404BF84A084BF87A084BF8020803F801100208 +5600:00800040F7FC911090A097FC944495F4944495F4F514951405F4040404140408 +5601:00140012701057FE5410549054D2549257F25494749455C80AAA089A11A60042 +5602:0040785E48524A524A524A527A5E02407A5E4AD24B524A524852785E48520040 +5603:002007FE742055FC542457FE542455FC542055FC752455FC052409FC0924112C +5604:010003F87A084BF84A084BF84A004BFE4A004BFE78424FFA0164065818460040 +5605:000007BE7488548857A854A854A857BE54105518749855A806AA044A00460080 +5606:01100110F7FE911091F0904093F8924893F89040F7FC90400FFE00A00110060C +5607:00800110F3F8921094A49FBE904290A093189C46F19096640188063001C00E00 +5608:00A000A077FE50A057FC54A457FC54A457FC500073F8520803F8020803F80208 +5609:0100FFFE01003FF800001FF010101FF00820FFFE10007F7C11442144457C8244 +560A:002002227A224BFE48004BFE4A204BFC4A204BFE7A004A2005FC04200BFE0000 +560B:02080248E748A290A29EAFE4A114A214AFD4A494E914A1C80F08011405140222 +560C:00000FFEE0A0A7FCA4A4A4A4A7FCA000A7FCA000EFFEA0400248044409420080 +560D:004003F8F2489FFE924893F8904093F8924893F8F0809FFE011000E003180C04 +560E:07FC00807BF84A084BF84A084BF84A084BF84910797C4F800090006201B20E0E +560F:100011DC11441144FD4411DC110011007DDC4514451445D445087D0845140122 +5610:000007BCF08494A4929494A490509188962690C0F31090640388003000C00700 +5611:0040007C78404BFE4A424A784BC44A3C4A084AF07B244AA805FE042008A00040 +5612:008803DE788849DC48884BDE488848004BFC4804780449FC0004000403FC0004 +5613:00000FFEE82AA826AFFEA822ABAAAAAAABAAA832E996AE2E084608820FFE0802 +5614:000003FE7A004A7C4A444A444A7C4A004AEE4AAA7AAA4AAA02EE020003FE0000 +5615:000007FCF040927892409FFE910091FC920093FCF00495540554080400280010 +5616:002003FE782049FC48204BFE480049FC490449FC790449FC010401FC00880104 +5617:111009207FFE50129FF4000020F03F0420041FFC00001FF810081FF810081FF8 +5618:0040007C78404BFE4A424A784BC44A3C4A004A507A544B5404D8045009FE0000 +5619:04100210E8FEA492A2FCA4A4ACA8A510A528A6C6E080AFFE0110032000E00718 +561A:0200027C7444597C5144527C56005AFC520853FE720852880248020802280210 +561B:00400020F7FE94909490949097FC949094D895B8F5B496D40892089010900090 +561C:004007FC7150515052E8544450E053585C46508071F8520804D0002000D00708 +561D:0204020477845494590C57C45564555457C45546757C57C405440544044408C4 +561E:0290029077D0529053BC511457D45554555457D4711457D40124012401540188 +561F:0200023EEF62A264A2A4AFE8A124A224A7A2ACA2F4A2A7B404A804A007A004A0 +5620:07FC0080F3F8920893F8920893F8920897FE94A2F89C97F00050002400D4030C +5621:0020012478A84BFE4A0248F84888488848F84820782049FC0020002003FE0000 +5622:000007DE7542555457C85544557E57CA510A510877C85108010801C80E280410 +5623:00400444744457FC500057BC54A454A457BC54A474A457BC04A404A40AB41148 +5624:00000FBEE8A2AAAAAAAAAAAAA514A8A2A080AFFEE110A21003A0006001980E04 +5625:021002107450595C5150525056FE5A0052105250725C525002B00290030E0200 +5626:3FF820083FF8101020085FF404403FF824483FF80400FFFE08201E4003C03C38 +5627:00800040F7FE9402989490509524954A98FA9300F04094440444044407FC0004 +5628:0040004077FC50445FFE504457FC5040555454E4744457FC04E409540A4C1044 +5629:008803FE7888480049FC48A848A84BFE48A848A879FC482003FE002000200020 +562A:000003FE7A524A524BFE480049FC490449FC490479FC490401FC008801040202 +562B:0110011479D24A504A7E4D5048904AA8492849447A444C82000802A402520452 +562C:000003F8F20893F8920893F890009FFE948097BCF494979404D40F88009400A2 +562D:0104010477E85110510057C4500457C85450544277C25444028400E80F100420 +562E:008802AA7ADC4C8849544A2248004BFE4A424C447BFC48440044008401140208 +562F:004003F8F04897FE904893F890409554975C9444F7FC9444075C055405540844 +5630:024802487554575C52485554575C52485FFE52207228522805140494042C0844 +5631:000007FCF40497FC940095FC942095FC952495FCF42097FE062A06FA0A0A1206 +5632:0200023C0FA4E224A224AFBCA8A4AFA4A8A4AFBCA224E224AFA402240244028C +5633:002001FC792449FC48204BFE480049FC490449FC790449FC010401FC00880104 +5634:00900294F2D8929292D2970E91F0921097FC9A44F3FC924403FC044404540808 +5635:0020002079FC48204BFE49084B9C490849884E3E78004BFE009000900112020E +5636:04800482E49CAFD0A490A790A49EA794A494A494EFD4A014051408A410240044 +5637:004001FC790449FC490449FC490449FC4820492478A84924002003FE00200020 +5638:0080008079FE4B544D5449544BFE4954495449544FFE78004954012A022A0000 +5639:00400040F7FC90A09514920897FC9A0A93F89208F3F890400248044409440080 +563A:003803C0F08097FE9110920895F6991091F09000F7FC940405F4051405F4040C +563B:004007FCF04093F8900093F8920893F891109FFEF00093F80208020803F80208 +563C:3E7C22443E7C00003FF821083FF821083FF80000FFFE00003FF820083FF82008 +563D:000003DE7A524A524BDE480049FC492449FC492479FC482003FE002000200020 +563E:000003FE78504BFE4A524BFE480049FC490449FC790449FC002003FE00200020 +563F:000007FCF444955494E4944497FC904097FC9040F0409FFE0000052404920892 +5640:000003DE7A524BDE4A104A5249CE480048884BFE7888488807FE008801040202 +5641:000007FEF0909090939C92049204939C90909090F7FE90400524050A090A00F8 +5642:01080090F7FE909093FC9294931C920493FC9204F3FC900807FE010800A80010 +5643:003C03E0792448A84BFE48A849244A0249FC4924792449FC0124012401FC0104 +5644:008003DE788A49CA488A4BD248A64840488849F078244BFE0022012402A20040 +5645:0004003EF7C09244912893F8920893FC920493FEF40296AA0AAA0A0210140008 +5646:000007BC7108552857BC531855AA5946500053F87208520803F80208020803F8 +5647:002001FC788848504BFE480049FC492449FC492479FC482001FC002003FE0000 +5648:04140212EF92A010A07EAF90A890A890AF90A228EB28AAA81228024A0A4A0486 +5649:00080788708851105FDE549454A4579454945794749454C807880C9400A400C2 +564A:000003FC784848304BFE485248944B5048204BFE7A524A8A0376025202720206 +564B:0208010877C85010579E549457A4501457945094711451C80708011405240242 +564C:02080110F00097FC9444955494E4944497FC9000F3F8920803F8020803F80208 +564D:01400120F3FE922096209BFC9220922093FC9220F22093FE0200052404920892 +564E:002003FE782049FC48004BFE4A0249FC480049FC790449FC0104008803FE0000 +564F:004000A0F11896E6900093F8920893F8900097BCF08494A4029404A402940108 +5650:00003E7C224422443E7C00003FFC010001007FFE00003E7C224422443E7C2244 +5651:0020004079FC490449FC490449FC4820492448A87924482003FE002000200020 +5652:0020012478A84BFE48A849244A224904490449DE7A444D54009E010402040404 +5653:0040007C78404BFE4A424A784BC44A3C4A004A507B544B5405DC04500BFE0000 +5654:002007A4F0A892929114920895F4980293F89208F20893F8020801100FFE0000 +5655:00F83F2009401FE010201FF010101FFC20042AA4400CBFF8200820083FF82008 +5656:00000FBEF208971C92089FBE904090A093189C46F02093F80008001000200040 +5657:00A004A4F2A890A097FC911090A097FC904093F8F04097FC00A0011002080C06 +5658:00000FFEE800AA28A948ABEEA892A884AAA0AAA8EBE8A8880894091409241242 +5659:004000A0F11092489DF690A0924892A893F89040F7FC9484052405F40414040C +565A:000003FC78044BFC48044BFC48004BBC49244FBC78084BFE0108008800A80010 +565B:00200020793C492049204FFE480048204AAA4A227BFE4A7202AA022203FE0002 +565C:010003F0F4109FFC944497FC944497FC90009FFEF00093F8020803F8020803F8 +565D:01080108E214A294A4BCAF08A110A224A4BEAF8AE088A02C0AAA0ACA08280010 +565E:00400040F0A09110920895F6980097BC94A494A4F7BC92100210052809441082 +565F:010000803FFE224824FE2D9036FC249024FC249024FE24804FFC48048FFC0804 +5660:001004107A7C481048FE48444E284AFE4A104A7C7A104AFE0210021005FE0800 +5661:010001F87A084FFE4A884B244BFE4A004AFC4A007AFC4A0002FC048404FC0884 +5662:00800100F7FC94449554944497FC94E495549404F04097FE00A0011002080C06 +5663:000003F87AA84AA84BF849004BFC4C844BE44AA47AA44BE4009407F400140008 +5664:01100110F7BC911093B895549912900093F89000F7FC90400248044409420080 +5665:009003FC7A944BFC4A944BFC48004BFC4A004AF87A004BFE0520051405480986 +5666:0020013C79204FFE481048144BFE4A104BF04A547A544AD40368044A08960322 +5667:008800887BFE488849FC492449FC492449FC48207BFE4A22022A02FA020A0206 +5668:00003E7C224422443E7C01200110FFFE02800C603018C0063E7C224422443E7C +5669:00007FFC01003D78254825483D7801007FFC01003D78254825483D780100FFFE +566A:03F80208F20893F8900097BC94A494A497BC9040FFFE91600250044818460040 +566B:008000407BFC490848904FFE48004BFC4A044BFC7A044BFC00400524050A08FA +566C:02100210F3DE95289884900097FC904092489248F248955408E200400FFE0000 +566D:0108020877C8545057DE546457D45214511457D4721453C802480454055408A2 +566E:000003FC7A944A944BFC48004FFE48004BFC4A047BFC48A2011403080D440182 +566F:003C03C070445224510857FE544252A4528A547A708050F8010802900060079E +5670:0040002077FE50285224527E54C85748517E524874C8577E01480248047E0840 +5671:0040007C78404BFE4A424A784BC44A3C4A004BFE7A404BA4025805B4045209B0 +5672:004000A0F3189DF6900097FC955494E497FC9000F3F8920803F8020803F80208 +5673:0020003E78204BFE4A224BF84A224AFE4A844AFC7A004AFC022005FE04480986 +5674:002001FC782048884BFE488849FC490449FC490479FC490401FC008801040202 +5675:211017FE108003F8F20813F8120813F8120813F8280047FE00003FF820083FF8 +5676:008803FE788849FC490449FC490449FC488049FE7A224D52010201FA000A0004 +5677:021001107790503E54A253445F9050105790549077A854A804A807C400440082 +5678:0200023EE208BFD0A23EAAA2AAA2AABEAAA2AFBEE222A22202BE030002140022 +5679:00400248F15097FE9402980493F8920893F89000F7FC944407FC044407FC0404 +567A:0200010277DC50105450529057DE5114511457D4711455940554092405240244 +567B:00800040F7FE95129BFC911097FC911097FE9110F24895F40842004007FC0000 +567C:00100008778854BE548054945788547E5408578876BE5A880A880B8812880008 +567D:0800FF0008FE7E1000107E3042387E542492FF1000107E10421042007EFE4200 +567E:004000207BFE4A8A49444A2249FC48884BFE480079FC490401FC010401FC0104 +567F:03DE00427A52494A4A5248204BFE4888488849547A22482003FE002000200020 +5680:004000207BFE4A224954494A4A3A480049FC49547BFE480001FC002000A00040 +5681:000003DE78424A52494A4A52489049084BFE4D1079FE491001FE011001FE0100 +5682:001007D0751057DE545057E8550457C4500053F872A852A802A802A80FFE0000 +5683:040002FE7AAA48AA48FE48104E544A924A104A547A924A100210050008FE0000 +5684:008803FE78A8489049FE4B2049FC492049FC492079FE490003FC00880070038E +5685:000007FCE040AFFEA842A358A040A358A000AFFEE040A7FC04A404A404A4040C +5686:010807FEF108902097FE900091F8910891F89000F7FE940205FA050A05FA0406 +5687:01100110711057BC511051105FFE52A852A856EC7AAA52AA02A805A804480898 +5688:00000FFEE808ABC8AA4CABCAAA48ABDEA808ABC8EA48ABD40A540BD40A5412E2 +5689:02840284EAA4A6C4A29EAFE4A004A454A28CAFE4E104A7C4010401C40E140008 +568A:008003F8F20893F8920893F8900097FC944497FCF44497FC00000FFE01100210 +568B:004007FC704053FC500057FE500253F8504057FE700057FE000807FE04A80798 +568C:0080004077FC511050A45F58555455525B585000720853F8020803F802080408 +568D:004003F8704857FE504853F8504057FE500052A4745253F802A802A80FFE0000 +568E:004007FEF00091F8910891F8900097FE940293F8F180964401B8066801A60E60 +568F:004007FCF04097FE94029BFC924893F8924893F8F00097FC02440278054008FE +5690:012400A87BFE4A8A48F8490C49F0490248FE480079FC490401FC010401FC0104 +5691:003C07C0F0409FFE904097FC955494E497FC9040F7FC90400FFE000005240892 +5692:0040002077FE548857DE548855DC56AA54885440748855F00420044809FC1084 +5693:0080004077FE54025A2453BC54A45AA8551052E874045BFA00400248044400C0 +5694:004007FC704057FE54025BFC524853F8524853F8710857FC02440278054008FE +5695:010003F074105FFC544457FC544457FC5524589273F8520803F8020803F80208 +5696:008803DE788849DC48884BDE48884BFC480449FC78044BFC004002A4028A047A +5697:03F80208F3F8920893F8911097FC91109FFE9110F248955400E00150024800C0 +5698:07FC0080E3F8A208A3F8A208AFFEA882A548A514E8F4A10003F8050800F00F0E +5699:00200120793C49204FFE48904A944B6C4A044BFC7A944A94036C020403FC0004 +569A:00003E7C22443E7C00003FFC21003FF820083FF821003FFC00003E7C22443E7C +569B:044404E4E8A8AAAAAEEEA4A4AAAAAEEEA242A040EFFEA0E0015002480C460040 +569C:01FC012479AC492449FC482049FC48204BFE49547A2A482001FC002003FE0000 +569D:0040002077FE548855FC548857FE542055FC552475FC552409FC088811040202 +569E:0100FFFE01007FFC00003FF820083FF81010FEFE10107C7C00007C7C44447C7C +569F:0090031EF12A97CA910A93929522995690889124F22294A8007001AC06220060 +56A0:020205E274A256AA552A566A510A528A544A5BAA710A57CA0122054201EA0E04 +56A1:05080508EFBEA508A708A208AFBEAA80AA88AF88E23EAF8802080208023E0200 +56A2:01007FFC11101FF00100FFFE94522FE844441FF004407FFC05081890EA600C18 +56A3:3EF822883EF80000FFFE01001FF01010111002C00C30700800003EF822883EF8 +56A4:002007FE748857DE548855DC56AA548C55F0542075FC542007FE082008A01040 +56A5:0110011077FC511051F0520852EA56AC52A852AA76EA5A06000002A402520452 +56A6:000007FE74445598548857DE548855DC56AA548874205520053C0920092017FE +56A7:0040007C78404BFC4A444BF04A444AFC4AA84AF87AA84AF8020005FC05540BFE +56A8:0210011077DE5010545E528257DE501057DE545077DE545007DE0450045204CE +56A9:04140412E9FEAA10B2FEBC92A4FEA892B2FEBE92E20481FE2A442A242024000C +56AA:03DE02527BDE4A524BDE4A424A7A4A8A4B124ADA7A8A4ADA028A02FA020A0204 +56AB:0400023CEFA4A024A8BCA524AFA4A23CA224AFA4E23CAB100A9812A80A2A0446 +56AC:0100013E750855D0553E55225FE2503E5122557E756255A208BE010002140C22 +56AD:0800FF7E08087E0800107E3442527E922410FF10007C7E44424442447E7C4244 +56AE:11002BDE4A5273D42A524BD27A1A12942350CA403FFC200427E4242427E4200C +56AF:07FC0040F7FE94429B5C9040975C912093FC9620FBFC922003FC022003FE0200 +56B0:004000207BFE4A484BFE4A484AEC4B5A4A484BFE7A204A7C02C40344047C0844 +56B1:010801EC710A57E8552855DE572854EA540A57EA740C57EC0A2A0BEA115607E2 +56B2:200011DCFD5401547DDC44007DFC01247DFC092411FC1C20F3FE102050202020 +56B3:3AB821083AB82288393822887FFE400291041FF02100FFFE00001FF010101FF0 +56B4:3E7C22443E7C00003FFE20002E20223C3FA829482F2829282F1049D07F288144 +56B5:01F0021077FC520453FC522453B8522251FE521077FC524403FC00D0014A063E +56B6:03DE02527BDE4A524BDE4A524BDE498C4A5248407FFE48880190006000D80304 +56B7:004007FCF00093B892A893B8911097FC911097FCF1109FFE012803100D480186 +56B8:00080FE8E928AB68A9AEA928AFE8A108AFE8A11EE112BFF200121552155E2012 +56B9:0820083CEE20B4FEA4A2A4B8BFE2A49EB582B5BCF5AAB79C18FF010801280210 +56BA:01FC095475FC5488505053FE5C4054A25534545875B45452059204500A2011FE +56BB:00007BDE489249124BD24A527A5E03C07A5E4BD24A524A524BD2781E49920240 +56BC:003C07C07244512857FC54A457FC5008578854FE778854A80798050805A80690 +56BD:011007D0711E57A451545FD45208539454A25BFC720453FC020403FC01080204 +56BE:008803FE78884BDE4A524BDE48A0489049FE49207BFC4D2001FC012001FE0100 +56BF:010807FE712853FE522057FC5A2053FC522053FE7080531C0204039C020403FC +56C0:02080208E27EAF88A23EAFAAAABEAFAAAABEAF8AE27EAF84027E02240214020C +56C1:03FC010879F8490849F8490E4FF848084FFE4A947B9C4A94039C02D607BC0084 +56C2:3EF822883EF80000FFFE02001FF010101FF010101FF0082010103EF822883EF8 +56C3:04140212EFA0A53EA564AAA4A03EA224AFA4A23EEB24AAA412A4023E0A200420 +56C4:04180214EF90A53EAAA8ADE8A8BEAFA8A228AFBEEAA8AAA80BA808BE0AA00920 +56C5:0000EEFEAA82AA82EEFE00A4FEA492FEFEA492A4FEFE10A8FEAA112411321220 +56C6:008803FE788849FC492449FC49244BFE4A2A4AFA7A2649FC012401FC002203FE +56C7:0FBE000077BC54A456B454A4504057FE54A057FC74A457FC051209DC091211CE +56C8:010807FE71085390513C57D452B4555C5396512273FC500007FE0080010403FE +56C9:000007FC74A454A457FC521052A854BE5F68523C74A85FBC00280AA80ABE0020 +56CA:01007FFC11101FF00100FFFE92921EF004403FF80440FFFE04880C503530C60E +56CB:052807BE794857BE531855AA594653FC520453FC720453FC020403FC01080204 +56CC:01100FFEE510A400AF06B138AF88AA88AABEAF88EA9CAF9A0028154815480008 +56CD:10101010FEFE10107C7C00007C7C44447C7C2828FEFE00007C7C44447C7C4444 +56CE:00440E28EAFEAA92AED6AABAAAFEAE00AA7CAA44EE44A07C0A440944117C0044 +56CF:281029FEFE1028FC380010FC7C8454FC7C4811FE7C0010FCFE84288444FC8284 +56D0:010801ECE10AAFEAA928ABC8A93EAFE8A948ABE8EA28AB680AA80BF40AB412A2 +56D1:07FC040477FC552454A8552455FC555455FC564475F4555409F4084413F40008 +56D2:011007FE711057BC54A457BC54A457BC544457FC755455F4044404E405540448 +56D3:008003DE788A49D248A64BD0489C48504BFE48507AAA4BFE025202AA03FE0002 +56D4:004007FC724853F850405FFE5AAA53B8511057FC71104FFE012803100D480186 +56D5:0790051E77A8548457BE552A57BE500053F8520873F8520803F800A00124061C +56D6:021007DEE928AFFEA912AFFEA228A444A9FEAF48E27EA5480F7E0048157E1540 +56D7:00007FFC4004400440044004400440044004400440044004400440047FFC4004 +56D8:00007FFC400440044FC44844484448444FC448044824482447E4400440144008 +56D9:00007FFC4004400440047F8440844084408440847F844084400440047FFC4004 +56DA:00007FFC4004410441044104410442844244444444244824502440047FFC4004 +56DB:000000007FFC444444444444444444444844483C5004600440047FFC40040000 +56DC:00007FFC400440044104410442044204444448245FF44814400440047FFC4004 +56DD:00007FFC400440044FE44044408441045FF4410441044104450442047FFC4004 +56DE:00003FFC2004200427E42424242424242424242427E4200420043FFC20040000 +56DF:0200020004007FFC40044824444442844104428444444824400440047FFC4004 +56E0:00007FFC40044104410441045FF441044284424444244814501440047FFC4004 +56E1:00007FFC4204420442047FFC444444444884468441044284444448247FFC4004 +56E2:00007FFC4004408440845FF4408441844284448448845084428441047FFC4004 +56E3:00007FFC4004408440845FF4408448844484448440844084428441047FFC4004 +56E4:00007FFC410441045FF44104492449244FE441144114411440F440047FFC4004 +56E5:00007FFC4004420441045FF44004400447C4444444444454483450047FFC4004 +56E6:00007FFC4004410441045D1445A445444924491451146504420440047FFC4004 +56E7:00007FFC40044444442448145014600447C4444444444444444444447FFC4004 +56E8:00007FFC40045FF440844104410443844544492451146114410441047FFC4004 +56E9:00007FFC400440044FE4400440045FF44204444448245FF4481440047FFC4004 +56EA:040008007FFC4004408448944514422445444884514442244C2440047FFC4004 +56EB:00007FFC4404440447F449544954525442944494491442A4444440047FFC4004 +56EC:00007FFC44444444444447C444444444444447C444444444444444447FFC4004 +56ED:00007FFC40044FE4400440045FF444844484448448944894507440047FFC4004 +56EE:00007FFC4504450449245944698449044F144914491448F4480440047FFC4004 +56EF:00007FFC400440045FF4410441044FE44104410441045FF4400440047FFC4004 +56F0:00007FFC4104410441045FF4410443844344452449145114410441047FFC4004 +56F1:040008007FFC4204420447F4481452244144408441444624580440047FFC4004 +56F2:00007FFC4444444444445FF44444444444447FFC44444444484450447FFC4004 +56F3:00007FFC40044104448442A45224484444444284410446C4583440047FFC4004 +56F4:00007FFC410441045FF441044FE441045FF4411441144154412441047FFC4004 +56F5:00007FFC41044104428444444824549C650446044424442443E440047FFC4004 +56F6:00007FFC400444444824511441044FE44104410441045FF4400440047FFC4004 +56F7:00007FFC400440E44F04410441045FF44304458449445124410440047FFC4004 +56F8:00007FFC400440045FF44104410449E44904490449045FF4400440047FFC4004 +56F9:00007FFC41044104428444444A24511C6FE4402440444284410440847FFC4004 +56FA:00007FFC410441045FF4410441044FE44824482448244FE4482440047FFC4004 +56FB:00007FFC40045FE4502450245FE451045FF4510450945454583440047FFC4004 +56FC:00007FFC42044204444448245FF440144FE4482448244FE4482440047FFC4004 +56FD:00007FFC400440045FF4410441044FE44104414441245FF4400440047FFC4004 +56FE:00007FFC4204420447E44C445284410446C4783C43044084460441847FFC4004 +56FF:00007FFC420442045FF444044FE4542467E4442447E4442444A444447FFC4004 +5700:7FFC400444444824521441045FF44404440447E44424482448A450447FFC4004 +5701:00007FFC41045FF440044FE440044FE440044FE448244FE4482440047FFC4004 +5702:00007FFC40044FE44204451459A442C444A459A4429444945A8441047FFC4004 +5703:00007FFC414441245FF441044FE449244FE449244FE44924496440047FFC4004 +5704:00007FFC40045FF442044FE444247FFC40044FE4482448244FE440047FFC4004 +5705:3FF00020064001807FFC444442845FF4410441047FFC4104410441047FFC4004 +5706:00007FFC40044FE448244FE440045FF45014511451145294444448247FFC4004 +5707:00007FFC4104428444444BA450144FE44AA44AA44FE44AA44AA448647FFC4004 +5708:00007FFC492445445FF442047FFC482457D4644C44C4442443E440047FFC4004 +5709:00007FFC410441044FE441045FF4444442844FE441045FF4410441047FFC4004 +570A:7FFC41044FE441044FE441047FFC40044FE448244FE448244FE4482448647FFC +570B:00007FFC40A440947FFC40845E94529452A45EA4405446B4591440047FFC4004 +570C:00007FFC4104511451145FF440047FFC41045FF452945294503440047FFC4004 +570D:7FFC42044FE444245FFC40044FE448244FE441045FF4410451045FFC41047FFC +570E:7FFC440448245FF440144FE448244FE448244FE448244FE4444448247FFC4004 +570F:00007FFC492445445FF442047FFC482457D4604C47C4442443E440047FFC4004 +5710:00007FFC40045FF4529452945FF441047FFC440447F44814505460247FFC4004 +5711:7FFC41245FF441044FE449244FE449244FE4492440445FF44844454440847FFC +5712:00007FFC41044FE441045FF440044FE448244FE4411446A45A4442247FFC4004 +5713:7FFC40044FE448244FE440045FF450145FF450145FF450145FF4444448247FFC +5714:7FFC41044FE441045FF4420444444FE440044FE44AA44AA45FF440047FFC4004 +5715:7FFC410441044FE441245FF441244FE441045FF448244FE448244FE440047FFC +5716:7FFC40044FE448244FE441047FFC41045FF4501457D454545FF440047FFC4004 +5717:7FFC420444444FE441047FFC42045FF4545457D4545457D454545FF440047FFC +5718:7FFC41045FF441044FE449244FE449244FE441145FF440445FF4484444C47FFC +5719:00007FFC4444482457D441044FE44AA44BA44AA44BA44AA44FE440047FFC4004 +571A:7FFC41044FE449244FE441045FF448244FE448244FE448244FE4444448247FFC +571B:7FFC40045FF452945FF441044FE441045FF4444442844FE441047FFC41047FFC +571C:7FFC40045FF452945FF440047FFC40044FE448244FE445144CA4744446247FFC +571D:0000FFFE800291129392A82ABBBA9012ABAAB83A8382AAAAABAA8002FFFE8002 +571E:FFFE9112A3A2B83A9392A82ABBBA8282ABAA8102BFFA854289229112FFFE8002 +571F:0100010001000100010001003FF80100010001000100010001000100FFFE0000 +5720:10801080108010801080FE80108010801080108016801884E0844084007C0000 +5721:0100010001000100010001003FF80100010001200110011001000100FFFE0000 +5722:1000100013FE10201020FE20102010201020102016201820E020402000A00040 +5723:00003FF0082004400280010006C01830E10E01001FF00100010001007FFC0000 +5724:10401040104010401040FE60105010481044104416401840E040404000400040 +5725:0100010001003FF8010001000100FFFE0440044004400440084408441044603C +5726:12001100108010801040FC40104010A010A010A011101D10E208420804040802 +5727:00003FFE200020802080208020802FFC2080208020802080208040805FFE8000 +5728:020002000400FFFE080008401040304057FC904010401040104010401FFE1000 +5729:100011FC102010201020FC20102013FE1020102010201C20E020402000A00040 +572A:10401040108010FE1100FE0010FC10081010102010401C80E102410200FE0000 +572B:1008103C13C010401040FE401040107E13C0104016401842E0424042003E0000 +572C:200021FC200020002000FBFE20802080210021FC20043804E004400400280010 +572D:010001003FF8010001000100FFFE0000010001003FF8010001000100FFFE0000 +572E:1000100011F810081008FC08100811F81108110011001D00E102410200FE0000 +572F:100011FC110411041104FD04110411FC1100110011001D00E102410200FE0000 +5730:1020102010201120112CFD34116413A41124113411281D22E122410200FE0000 +5731:00200C2070201020102011FC1020FE201020102010201020202023FE40008000 +5732:1008103C11E010201020FC20102013FE1020102010201C20E020402000200020 +5733:11041124112411241124FD24112411241124112411241D24E124422402040404 +5734:10401040108010FC1104FD04120414841044102410241C04E004400400280010 +5735:10401040104010401040FE40107C10401040104016401840E040404007FE0000 +5736:010001007FFC0280044008203118C10601003FF80100010001000100FFFE0000 +5737:100013FE104010401040FE40105010481044104416401840E040404000400040 +5738:10201020102010201124FD24112411241124112411241D24E12441FC00040000 +5739:10401020102013FE1200FE0012001200120012001E00E2004200040004000800 +573A:200023F0202020402080F90023FC21242124212422243A44E444488401280210 +573B:1008101C11E011001100FD0011FE11101110111011101D10E110421002100410 +573C:00003FF8200820083FF8200820083FF8010001003FF8010001000100FFFE0000 +573D:11001100110011FC12A4FCA410A41124112412441C44E0844104020404280010 +573E:100017F8110811101110FD20113C1104110412881E88E2504420045008880306 +573F:10201020105010501088FD04120210881088108810881C88E088410801080208 +5740:10201020102011201120FD20113C11201120112011201D20E120412007FE0000 +5741:1004101E11F011101110FD10111011FE1110111011101D08E10A414A01860102 +5742:1008101C11E011001100FDFC114411441144112811281D10E110422802440482 +5743:1000100011FC10001000FC0013FE10901090109010901C90E1124112020E0400 +5744:200021F0211021102110FA0E240023F821082110209038A0E04040A003180C06 +5745:10201020105010501088FD4412221020100011FC10041C08E008401000100020 +5746:104010401040108010FEFD08128810881088105010501C20E050408801040202 +5747:10401040108010FC1104FE04108410441044101410241C44E184400400280010 +5748:1000100013FC12041408FC0011F011101110111011101D12E2124212040E0800 +5749:10201020102013FE1020FD2411241124112411FC10241C20E0224022001E0000 +574A:10401020102013FE1080FC80108010FC1084108410841C84E104410402280410 +574B:10101090109010881108FD04120415FA1088108810881C88E108410802280410 +574C:0440082010102FE8C4260420082010A0614001003FF8010001000100FFFE0000 +574D:100011F8110811081148FD281128110817FE110811081D08E108420802280410 +574E:10801080108010FC1104FD0812401440104010A010A01D10E110420804040802 +574F:1000100013FE10101010FC2010201068106410A41D22E2224420002000200020 +5750:01001110111011101110292825244544810001003FF8010001000100FFFE0000 +5751:10801040104013FC1000FC0011F011101110111011101D12E1124212020E0400 +5752:2080208820B03EC0208020842684387C210001003FF8010001000100FFFE0000 +5753:0820082008207FFC08200820FFFE10202020412001003FF801000100FFFE0000 +5754:010001047D880550092011102108C5060200010001003FF801000100FFFE0000 +5755:00781FA01120112011201110211021084004010001003FF801000100FFFE0000 +5756:00003FF800000000FFFE044004420842303EC10001003FF801000100FFFE0000 +5757:10401040104013FC1044FC441044104413FE104010A01CA0E110420804040802 +5758:100017FE108010801080FCF8110811081108120813F81C10E010401007FE0000 +5759:00007FFE0888088811102220111008880888010001003FF801000100FFFE0000 +575A:040025FC2504248824502420245825860400010001003FF801000100FFFE0000 +575B:1000100011FC10001000FC0013FE10201020104010401C88E10443FE01020000 +575C:200023FE220022202220FA2022FC22242224222422443A44E484448409281210 +575D:100011FC110411041124FD24112411241124112411241C50E048408401020602 +575E:1020104011FC11041104FD0411141108110011FE10021C02E3FA400200140008 +575F:10801040104017FC1110FD1011101110111010A010A01C40E0A0411002080C06 +5760:00407C404440484044A044A0551049084204450201003FF801000100FFFE0000 +5761:20202020202023FE2222FA24222023FC2284228822483A50E220445004880906 +5762:10201020112410A410A8FC2011FC10201020102013FE1C20E020402000200020 +5763:01001110092001007FFE40028104010001003FF80100010001000100FFFE0000 +5764:10201020102011FC1124FD24112411FC1124112411241DFCE124402000200020 +5765:100011F8110811081108FDF811081108110811F811081D08E108410807FE0000 +5766:1000100011FC11041104FD0411FC11041104110411FC1D04E000400003FE0000 +5767:1000100013FE10201020FC40104010FC1184128414841C84E084408400FC0084 +5768:10401020102013FE1202FC04110011081110112011C01D02E102410200FE0000 +5769:110811081108110817FEFD0811081108110811F811081D08E108410801F80108 +576A:100011FC102010201124FCA410A8102013FE102010201C20E020402000200020 +576B:1020102010201020103EFC201020102011FC110411041D04E104410401FC0104 +576C:2008203C23D022902290FA90229022902290228822883AC8E2A444D404920800 +576D:100011FC110411041104FDFC110011401144114811701D40E1424242023E0400 +576E:10201020104010401088FD0413FE1002100011FC11041D04E104410401FC0104 +576F:100013FC102010201040FE4010D011481244144416401840E040400007FE0000 +5770:100011FE110211021102FD7A114A114A114A114A117A1D4AE1024102010A0104 +5771:10201020102011FC1124FD2411241124112413FE10201C50E050408801040202 +5772:10901090109013FC1094FC9413FC1290129013FE10921C92E11A411402100410 +5773:202021202120222022FCF4A4272421242224222424A437A4E0C4404400940108 +5774:010001003FF801000100FFFE08201010210841043FF8010001000100FFFE0000 +5775:1008101C11E011001100FD00110011FE1110111011101D10E110411007FE0000 +5776:200021F8210821482128F908210827FE2208228822483A08E3FE400800500020 +5777:2000200027FE20082008FBC8224822482248224823C83A48E008400800280010 +5778:10801080110011FC1204FC0411E411241124112411E41D24E004400400280010 +5779:10401020102013FE1202FC04100010901090109010881D08E108410402040402 +577A:105010481048104013FEFC80108010FC1144114411281D28E210422804440182 +577B:1008103C13E012201220FE20122013FE1220121012101E12E20A428A03260212 +577C:1008101C11E011001100FD0011FE11101110113011181D14E112421002100410 +577D:10201020105010501088FD241212101011FC100410081C88E050402000100010 +577E:10401020102013FE1202FC041000100013FE102010201C20E020402000A00040 +577F:2088208820882108217EFB08250821482128212821083908E108410801280110 +5780:1008103C13E010201124FCA410A8102013FE102010201C20E020402000A00040 +5781:10401040108010FC1120FE201020102013FE102010501C50E088408801040202 +5782:001000F83F00010001007FFC09200920FFFE092009207FFC010001003FF80000 +5783:108010401040100013FCFC00100811081108109010901C90E0A0402007FE0000 +5784:04400420FFFE0910112011C023044D0480FC010001003FF801000100FFFE0000 +5785:109010881088108013FEFCA010A010A410A410A811281D32E1224262029E0400 +5786:20402040207E20402040FBFC22042204220423FC22043A00E200440004000800 +5787:2000200023DE22522252FA52225222522272220222023A02E20243FE02020000 +5788:089008881080309E57E0908010441034110C01003FF8010001000100FFFE0000 +5789:1080108011FC11041204FDF411141114111411F411041D28E112410200FE0000 +578A:200023FC220422042204FBFC2220222023FE222022203A10E212428A03060202 +578B:00047F84122412241224FFA4122422042214410881003FF801000100FFFE0000 +578C:200023FE2202220222FAFA02220222FA228A228A228A3AFAE2024202020A0204 +578D:10201020104011FC1104FD04110411FC1104110411FC1D04E104410401FC0104 +578E:2080208021F822082510F8A0204020A023182C0623F83A08E208420803F80208 +578F:1020102011FC102413FEFC2411FC1020102011FC10201C20E3FE402000200020 +5790:4080208009FC12042448E04020A023182C06010001003FF801000100FFFE0000 +5791:2040204020FC21082290F86020482190263E204220843B48E030402000C00700 +5792:0400082010103FF80810102024487EFC0204010001003FF801000100FFFE0000 +5793:20402020202027FE2040F884210823F0202220443988E6104020005001880604 +5794:00007FFC044004403FF8244824483FF8010001003FF8010001000100FFFE0000 +5795:007C3F8020003FFE20002FF8280828082FF8208020802FFC40804080BFFE0000 +5796:1040108011F811081108FD0811F811001100110011FC1D04E104410401FC0104 +5797:10901090109012921194FC98109011981294149210901C90E11241120212040E +5798:10901094109211121110FF7E151011101110112811281D28E128414401440182 +5799:10201020112410A410A8FC2013FE10901090109010901C92E1124112020E0400 +579A:010001003FF8010001000100FFFE1010101010107CFC101010101E10F0FE4000 +579B:100011F0111011101110FD10124E144013FC10401CE0E1504248044600400040 +579C:100013F81088109010BCFD0411141248104017FE10401CE0E150424804460040 +579D:1040104010FC11041208FDFE1100117C1144114411541D48E1424242023E0400 +579E:2040202023FE22022000F83823C020402040207C23C03840E0424042003E0000 +579F:110410841088100013FEFC20102011FC1020102013FE1C20E020402000200020 +57A0:100011F81108110811F8FD08110811F81144114811301D20E110414801860100 +57A1:08A00890108030FC57809048105010241054118C160401003FF801000100FFFE +57A2:1008101C11E011001100FDFE11001100117C114411441D44E144427C02440400 +57A3:100013FE1000100011FCFD04110411FC1104110411FC1D04E000400003FE0000 +57A4:200027FE204020802110FA0827FC20442040204027FC3840E04040400FFE0000 +57A5:2040204020A02110FA08240623F82000200023F822083A08E208420803F80208 +57A6:00003FF020103FF020103FF0220821902C60311C01003FF801000100FFFE0000 +57A7:20402040208023FC2204FA0422F422942294229422943AF4E204420402140208 +57A8:1040102013FE12021414FC10101013FE1010111010901C90E010401000500020 +57A9:00007FFC04402448144814500440FFFE0000010001003FF801000100FFFE0000 +57AA:110410841088100011FEFC8810881088108813FE10881C88E108410802080408 +57AB:084008407DF808480C4819C8684A08AA2886110201003FF801000100FFFE0000 +57AC:108810881088108811FEFC8810881088108813FE10001C88E084410402020402 +57AD:200023FC209020902090F892249222942294229820903890E090409007FE0000 +57AE:2040204027FC20A02110FA082DF6200027FC208021003BF8E008400800500020 +57AF:101012101110111010FEFC10131011281124114411421D82E1004280047E0000 +57B0:10201020103E10201020FDFE1000100011FE102010281C24E022402000200020 +57B1:1020112410A410A410A8FC2013FC10041004100411FC1C04E004400403FC0004 +57B2:102011241124112411FCFC0011FC1004100411FC11001D00E102410200FE0000 +57B3:20802080213C22002480F880217E23082508210821083908E108410801280110 +57B4:20402020202027FE2000F800209022542224222422543A94E204420403FC0004 +57B5:10401020102013FE1202FC44104013FE1088108811081CD0E020405000880304 +57B6:1040102011FC10001088FC5013FE10201020102011FC1C20E020402000200020 +57B7:100013F81208120813F8FE08120813F81208120813F81D20E12042220422181E +57B8:1040102013FE12021404FDF81000100013FE109010901C90E1124112020E0400 +57B9:2100211E21122FD22114F91427D8211421122FD22112391AE214421004100810 +57BA:1008103C11C010041144FCA8100011F81010102013FE1C20E020402000A00040 +57BB:100011FC1104110411FCFD04110411FC1104110411FC1C00E088408401020202 +57BC:10F8208841088A06100031F850889050102010D8170601003FF801000100FFFE +57BD:200C11F08100490009FE1110E11022102210251001003FF801000100FFFE0000 +57BE:100011FC110411FC1104FDFC1000100011FC10201C20E3FE4020002000200020 +57BF:2040202023FE22002200FAFE22042228221023FE3A12E2144210041004500820 +57C0:00F83F000100FFFE01000924F93809223922C91E01003FF801000100FFFE0000 +57C1:102011241124112411FCFC20105010881144122210201DF8E008401000100020 +57C2:100013FE1020102011FCFD24112411FC1124112411FC1D20E0A0404000B0030E +57C3:204020802110220827FCF904210023F82440204027FE3840E0A0411002080C06 +57C4:210021F8230824902060F9982646204023F8204023F83840E7FC404000400040 +57C5:004078204BFE508048F84488550849284210410001003FF801000100FFFE0000 +57C6:1080108010F811081210FDFC1124112411FC112411241DFCE124422402140408 +57C7:100011F8100810D01020FDFC1124112411FC112411241DFCE12441240124010C +57C8:104010401088110413FEFC0210881144124210F81D88E2504020005001880606 +57C9:10201020102013FE1020FC2011241124112412AA10201C50E050408801040202 +57CA:0100210821083FF8000001047D88095011202518C20601003FF801000100FFFE +57CB:100011FC1124112411FCFD24112411FC1020102011FC1C20E020402003FE0000 +57CC:1040102011FC11041104FDFC1104110411FC112011221D14E108414401820100 +57CD:100010FC1084108410FCFC0011FE1102110211FE11021D02E1FE4102010A0104 +57CE:20282024202027FE2420FC20242427A424A424A824A83C90E692492A08461082 +57CF:2008201C277021102110FA50225C27502150255025503A7CE200450008FE1000 +57D0:100011FC100410FC1004FDFC100013FE120211F810881C88E050402000D80306 +57D1:080C08F07E8008800EFE7888088829081208010001003FF801000100FFFE0000 +57D2:1008103C13C010441224FD281100101013FE101011101C90E090401000500020 +57D3:1008103C13C011241098FC601390101013FE101011101C90E090401000500020 +57D4:2048204427FE20402040FBFC2244224423FC224422443BFCE244424402540208 +57D5:100011FC110411041104FDFC1000100013FE102010201DFCE020402003FE0000 +57D6:2108210827FE21082108F800209020922114231825103932E1524112010E0100 +57D7:101010101090109E1090FC9013FE10001010109210921D14E208401000600380 +57D8:200820082788248824FEFC88248827C824A824A824883C88E788448800280010 +57D9:200023F82208220823F8F800200027FC2404244424443C44E4B4410806041802 +57DA:200023F8220822082208FBF82040204027FC244424A43D14E614440404140408 +57DB:200027FC240424A42514FE0C240425F42514251425143DF4E514440404140408 +57DC:082008207EFC08301C682AA4C9220820092001003FF8010001000100FFFE0000 +57DD:20202020205020882144FA2221F820082050202020A43A82E28A428A04780000 +57DE:1040102013FE12021404FC0013FE102010201120113C1D20E2A04260043E0800 +57DF:20142012201027FE2010F81023D222522252225423D43808E0EA471A02260042 +57E0:1020104011FC110411FCFD0011FC110411FC10201C20E3FE4020002000200020 +57E1:200027FE209020902090FB9C220422042204239C20903890E090409007FE0000 +57E2:204022482150204023F8F88027FC2110220825F429123910E1504124010400FC +57E3:1040102013FE10001088FC88115412221000102013FE1C20E020402000200020 +57E4:2040208023FC22242224FBFC2224224423FC20903910E7FE4010001000100010 +57E5:1020102013FE102011FCFC2013FE100011FC110411FC1D04E1FC410401140108 +57E6:2040202023FE22022504F90021DE225222522352249A3894E11041120212040E +57E7:100011F81108110811F8FD0811F8110811F811081D08E3FE4000009001080204 +57E8:2040204020A021102208FDF6200027FC24A424A427FC3CA4E4A444A404140408 +57E9:1080108011F811081210FDFC1024102413FE102410241DFCE024402000A00040 +57EA:10401020102013FE1202FC9411081204100011FC10201C20E020402007FE0000 +57EB:2020212420A420A82020FBFE2202220222FA228A228A3A8AE2FA4202020A0204 +57EC:2040204027FC204023F8FA4823F8224823F8204020E03950E2484C4600400040 +57ED:2040204023F82048F84827FE2048204823F8244422E83950E248444601400080 +57EE:10201122112212241050FC8813041022102011241D24E2284050008801040602 +57EF:2040208027FE21102248FC4623F82248224823F822483A48E3F840420042003E +57F0:1008103C13C010441224FD281100102013FE107010A81CA8E124422204200020 +57F1:2100210021DC2114F114211427D42014211421143588E5484948011405140222 +57F2:1020102013FE102011FCFC4013FE10881124122210F81C20E3FE402000200020 +57F3:2080208020F82108FA1024002040239C22042204239C3A04E204420403FC0204 +57F4:2040204027FC20402040FBF8220823F8220823F822083BF8E20842080FFE0000 +57F5:2008203C21E020202020FBFE2124212427FE212421243BFEE020402003FE0000 +57F6:104010407C40104011F8FE480048454892C810487C68105A108A1C8AE1064202 +57F7:104010407C4011F81048FE48444829487CC8104810A8FEA8108A110A11061202 +57F8:100011FC110411FC1104FDFC1080108011FE124A144A1C92E122424200940108 +57F9:1040102011FC10001108FC90100013FE1000100011FC1D04E104410401FC0104 +57FA:082008207FFC08200FE008200FE00820FFFE082011102108CFE6010001003FF8 +57FB:1040102013FE100011FCFD0411FC100011FC10081C10E3FE4020002000A00040 +57FC:2040204023FC20A02110FA0827FE200823C8224822483A48E3C8400800280010 +57FD:200023F8200821F82008FBF8200027FE2442284423F83A48E248424802580040 +57FE:00007F7C22443E4422283E1023A8FE440282010001003FF801000100FFFE0000 +57FF:23F8120882084BF80A401248E27022442444253C09003FF801000100FFFE0000 +5800:100013FE1202120213FEFE1012921292129212FE12101E92E292449204FE0802 +5801:100011FC1124112411FCFD24112411FC102013FE10701CA8E124422200200020 +5802:0100111009207FFE40029FF4101010101FF0010001003FF801000100FFFE0000 +5803:102008107EFE10201E3C1224122422444A94850801003FF801000100FFFE0000 +5804:20002040239C22042204FB9C2204220423FC209020903890E09041120212040E +5805:7F7C48447F44414841287F30481048287F44008201003FF801000100FFFE0000 +5806:21402120212023FE2220FE202BFC2220222023FC22203A20E22043FE02000200 +5807:08200820FFFE08200FE001003FF821083FF801007FFC01003FF80100FFFE0000 +5808:200023FE2202228A2252FBFE2222222222AA22AA22AA3AFAE2024202020A0204 +5809:2040202023FE20802104FBFE200221FC210421FC210439FCE104410401140108 +580A:00007FFC04403C78200820083C780440FFFE010001003FF801000100FFFE0000 +580B:200023DE225222522252FBDE22522252225223DE22523A52E2524252055208A6 +580C:200027FC2444244427FCFC44244425F42514251425143DF4E514440407FC0404 +580D:2100210021F02210FA2027FC2A442244224423FC22A438B0E128422A0422081E +580E:2020202021FC20202020FBFE20882144224220F821883A50E020405001880606 +580F:0820081009FE7E40187C2C442A8448948908080001003FF801000100FFFE0000 +5810:100013FE1210121012FEFE10121013FE1200121012101EFEE210441005FE0800 +5811:100CFEF0208048807EFE08880E88F9084A08090801003FF801000100FFFE0000 +5812:100011FC1104110411FCFD04110411FC1000111211D41D18E11041520192010E +5813:102011241124112411FCFC0011FE1100117C111011101DFEE110421002100410 +5814:100013FE120212521088FD041020102013FE102010701CA8E124422200200020 +5815:00207BFE484048FC51844AFC488468FC5084418C01003FF801000100FFFE0000 +5816:21242248249022482124F880210027FC2404251424A43C44E4A4451407FC0404 +5817:1040102013FE12021088FD0412221028102413FE10201C50E050408801040202 +5818:204022482150204023F8F88027FC2110224824443842E3F84040004007FC0000 +5819:200027FC20A020A027FCFCA424A424A427FC20403840E7FC404000400FFE0000 +581A:100013FE1222102013FEFC2011FC112411FC112411FC1C20E3FE402000200020 +581B:200023FE200021FC2104F90421FC200023FE222222223BFEE222422203FE0202 +581C:1020102013FE102011FCFD2411AC1174112411FC10201C70E0A8412402220020 +581D:100011FC1104110411E4FD24112413FE120212FA1E8AE28A42FA0202020A0204 +581E:20902290229027FE2290FA9022F0220023FC204027FE38E0E15042480C460040 +581F:208020FC210421F82008FBFE204020A22334205820943B34E052409003500020 +5820:2100217821082208FAFE26402A40227C2290221022FE3A10E228422802440282 +5821:08000BF8120833F8504097FC115012481446114001003FF801000100FFFE0000 +5822:2100217C21442244FA44267C2A10221022FE223822543A54E294431202100210 +5823:11FC1124112411FC1124FD2411FC1020102013FE12221E2AE2FA420A02020206 +5824:100011FC1104110411FCFD04110411FC100013FE10201D20E13C412002A0047E +5825:00407F40127E0C88FF4819482A504820A850118C01003FF801000100FFFE0000 +5826:1110111211D411181152FD92112E104011FC110411041DFCE104410401FC0104 +5827:100013FE1020104011FCFD54115411541154112C1C20E3FE4050008801040202 +5828:100011FC110411FC1104FDFC108011FE1222112211521D02E1FA400200140008 +5829:2100213C21002100F9BC25642524253C252421242124393CE1244100017E0100 +582A:1088108813FE108810F8FC8810F81088108813FE11001D48E184410001FE0000 +582B:20002088225222222252FA8A220223FE20882144227A3888E150402000D80706 +582C:204020A02110220825F6F80023C42254225423D422543A54E3D44244025402C8 +582D:1020104011FC110411FCFD0411FC100013FE102010201DFCE020402003FE0000 +582E:100013DE1252125213DEFC0011FC100013FE108011001DFCE004400400280010 +582F:010001003FF80100FFFE08203EF808200E2078FC0000FFFE044008421042603E +5830:200023FE220022FC2284FAFC228422FC222023FE22483AC8E2304248028403FE +5831:100010FC7C8410841094FE88448028FC7CA410A410A8FEA8109010A810C41082 +5832:7E7C42447E4442447E44484444545A486240404001003FF801000100FFFE0000 +5833:200023FC2224222423FCFA0022FC2284228422FC22843AFCE484448408FC1084 +5834:200023F8220823F82208FBF820002FFE220023FC24943924E244448401280210 +5835:2040204423F42048F85027FE2040208021F82B08350821F8C108010801F80108 +5836:2040204023FE208021FCFA2025FE200021FC210421FC3904E1FC410401140108 +5837:2080204027FC20002208F9102FFE200023F8220822083BF8E208420803F80208 +5838:20002FF828082868FB88288828882BE82AA82AA83BE8E88A48AA10EA17262002 +5839:1008103C11E0102013FEFC2011FC112411FC112411FC1C20E1FC402003FE0000 +583A:23F82248224823F82248FA4823F820A02110220825163910E110411002100410 +583B:204013F890484FFE404813F82040E3FC20402FFE2040204001003FF80100FFFE +583C:080808087E0808FEFE0808487E2808080F28F01001003FF801000100FFFE0000 +583D:100013FE1252125213FEFC00100013FE10201020113C1D20E120412007FE0000 +583E:2040204027FC204023F8F88027FE2110220827FC3A0AE20843F80208020803F8 +583F:20142012201027FE2410FC1025D02412241225D425543D48E5DA442A08461082 +5840:200023FC2204220423FCFA002284224822FC224822483BFEE448444808881108 +5841:3FF821083FF821083FF8600C183006C01830610C01003FF801000100FFFE0000 +5842:2110211027FC2110F1102FFE2110220827F42A123210E3F04204020401FC0000 +5843:2108210827FE2148F82027FE2200220023FC200022483A48E248444A044A0846 +5844:200023FC229422942294FBFC2080204027FE208020F83888E108410802280410 +5845:208023382228222823A8FA462200227C23A4222422283BA8E610422802440282 +5846:2080204027FE2090FA942492200023F8200823F822003BFCE004400400280010 +5847:1040102013FE12021404FDFC100011FC110411FC11041DFCE104400003FE0000 +5848:00007DFC44207D2045FE7C5048525492650E01003FF8010001000100FFFE0000 +5849:204022482150224824A4F918260623F8220823F822083BF8E208420802280210 +584A:2020204023FC22242224FBFC2224224423FC204020A838B4E13C41220222041E +584B:08202AA42CA84920145022887FFE4002810401003FF8010001000100FFFE0000 +584C:200023F8220823F82208FBF82000200027BC208424A43A94E4A4408402940108 +584D:0020792448A8482049FC78404BFE488849247A224C2049FC482048204BFE9800 +584E:1040102013FE12021050FC88112410501088110412FA1C88E088408800F80088 +584F:102011241124112411FCFC0013FE100011FC110411041DFCE088405003FE0000 +5850:1020102013FE102011FCFC2013FE1040108811F01C24E3FE4022012402A20040 +5851:2200147CFF44087C4944497C7F4408441094210841003FF801000100FFFE0000 +5852:201020102710257C2510F51025FE2708250825FE25083548E728400800280010 +5853:100013FE1202100011FCFD0411FC110411FC10401C20E3FE4000008801040202 +5854:2110211027FC21102040F8A02110220825F6200020003BF8E208420803F80208 +5855:21202110220824862910FBF82008200027BC208424A43A94E4A4408402940108 +5856:203823C0204027FC2150F954275821542354254C20E03950E248444408420040 +5857:204010A0911042084DF6104027FCE040224824442942208001003FF80100FFFE +5858:2040202027FE242025FCFC2427FE242425FC242025FC3D04E504490409FC1104 +5859:1040102013FE100011FCFD0411FC100013FE12021EFAE28A42FA0202020A0204 +585A:200027FE2402280427FEF8802184224426A821303AF0E4A8412802240CA20040 +585B:200027FC20A020A027FCFCA424A427FC2040204027FC38E0E15042480C460040 +585C:200027FE240229F42000FBF820802144266820B03928E66840A4012206A00040 +585D:2040202023FC21082090FBFE22022444202023FC208038F8E088410801280210 +585E:020001007FFE44429FF404403FF80440FFFE082011102108DFF6010001007FFC +585F:0820FFFE082000007FFC08401F48625014621842E03E01003FF801000100FFFE +5860:2010242022F82288F88820F82E80228022FC228422843AFCE284450008FE0000 +5861:111811E2110210FE1000FCFC128412FC128412FC12841EFCE20043FE01080204 +5862:1040108011FC11041104FDFC110011FE110011FE1C02E2AA42AA040200140008 +5863:200013F8920842084BF8080017FCE04023F8204027FC01003FF801000100FFFE +5864:100011F81108110811F8FC0013FC120413FC120413FC1E04E3FC409001080204 +5865:200023FE200021FC2104F90421FC200023FE228A22523BFEE2224222022A0204 +5866:7C2045FE482051FC492445FC452455FC482043FE402001003FF801000100FFFE +5867:220821082110200027FCF80021102208240423F822A83AA8E2A842A80FFE0000 +5868:2090209023FC20902090F89027FE209021482244244A3954E14A424A01400080 +5869:2100210021FE220025F8F908210821F8200023FC22943A94E294429407FE0000 +586A:101E11E0102211121094FC80102011CE1102110211CE1D02E102410201FE0102 +586B:2040204027FC204023F8FA0823F8220823F8220823F83A08EFFE411002080404 +586C:200027FE2420244025FCFD0425FC250425FC25243C20E4A849240A2210A00040 +586D:100011F81108110811F8FD08110811F8100013FC12941E94E294429407FE0000 +586E:2084210423C4224423DEFA4423C42264225427D420C43944E244444401540088 +586F:204023BE221222922252FAAA2324204023FE222222223BFEE222422203FE0202 +5870:210011FC920045F84148112823FEE148222823FC205001203FF801000100FFFE +5871:10007E7C42447E7C42447E7C484444445A94610801003FF801000100FFFE0000 +5872:210021FC220025F82108F9F8210821F8200027FE21003BFCE4A4412402540088 +5873:2020247C228421482030F8CE2610227C2210227C22103AFEE210421005FE0800 +5874:20202222222223FE2000FBDE2252225223DE225222523BDEE2524252055A08A4 +5875:010000803FFE22203FFC22243FFC28402F7828422F3E20802FF840807FFE8000 +5876:2040202023FE22502250FBFE2252225223FE220022923AD4E298449204D2088E +5877:20202020203E20202020FBFE22022326228A225223263A52E28A432603FE0202 +5878:200023FE2200227C2244FA44227C220022EE22AA22AA3AAAE2EE420003FE0000 +5879:08047F7808407F40497E7F4849487F4808487F48088801003FF801000100FFFE +587A:010000803FFE221022102FBC231826B42A52208020802FFC408040809FFE0000 +587B:1088108813FE10881000FDFC110411FC110411FC1C20E3FE4050008801040202 +587C:102013FE102011FC1124FDFC112411FC102213FE1C08E3FE4108008800280010 +587D:2040204027FC20402554FA482554204025542248255438A0E0A0411002080C06 +587E:1040FE4000407DF844487C4800C87C4808AAFEAA1106520221003FF80100FFFE +587F:102011FC112413FE1124FDFC102011FC112411FC1C40E3FE408801D00070038C +5880:200027FC240427FC2420FCA8247024A8250424A03CFCE52044200BFE08201020 +5881:23F8220823F8220823F8F80027FC24A424A427FC20003BF8E11040E003180C06 +5882:100013FE105011FC1154FD5411FC100011FC100013FE1C20E0A8412402A20040 +5883:2080204023F82110F8A027FE200023F8220823F822083BF8E120412202220C1E +5884:20142012201027FE2410FC9024D2249227F224943C94E5C84AAA089A11A60042 +5885:7F7C49047F2849107F7E08127F1408100F50F02001003FF801000100FFFE0000 +5886:22A822A827FC22A8FAAA24E6280027FC2444204023F83A48E248424802580040 +5887:102011FC1088105013FEFC0011FC110411FC110411FC1C20E3FE402000200020 +5888:224822482FE8224823DEF24A23CA224A224A2FEA240A354AE632441207EA0044 +5889:202027FE242025FCF42427FE242425FC242025FC3524E5FC452409FC0924112C +588A:08207E2008F8FF2814287F6A082AFF560882010001003FF801000100FFFE0000 +588B:2040208821FC21082252FBFE20502188262620C023103864E388403000C00700 +588C:2040202023FE22002248FA4823FE2248224822483A78E2004554052A0A2A1000 +588D:10007EFC42107E9042907EFE001040287E2840484C8A710601003FF80100FFFE +588E:2200211E27D2201227D4FC5427D8201427D22092211239DAE714411005100210 +588F:0420247E24943D48043005C87C0825FE24882448441881003FF801000100FFFE +5890:1088108813FE108810F8FC2011FC112411FC102013FE1C20E1FC402003FE0000 +5891:2040202023FE20882050FBFE222222FA222222FA228A3A8AE2FA4202020A0204 +5892:2040202023FE20882050FBFE2252228A230622FA228A3A8AE2FA4202020A0204 +5893:04407FFC04401FF010101FF010101FF00400FFFE10102108CFE6010001003FF8 +5894:1020122213FE10901088FDFE1310151011FE111011101DFEE110411001FE0100 +5895:200027FC20402278F2402FFE210021FC220023FC3004E5544554080400280010 +5896:204020A0211022082DF6F00023F8220823F8200027FC3444E7FC444407FC0404 +5897:21042088200023FE2222FBFE2222222223FE200021FC3904E1FC410401FC0104 +5898:2110211021102FDEF12027C0245C27C4244827C83110EFD041220122011E0100 +5899:2040204027FC20402248F95027FE200023F8220822E83AA8E2E8420803F80208 +589A:22782128246C22AA202AF94822982040204027FC20E03950E2484C4600400040 +589B:200427C42444244427DEFC0425C42404241427EC3C84E4C44AA40A8414940188 +589C:00887C5045FC484050A24B5444B8675458924350402001003FF801000100FFFE +589D:2020202021FC202023FEF908239C21082188263E20003BFEE09040900112020E +589E:22082110200027FC2444FD5424E4244427FC200023F83A08E3F8420803F80208 +589F:2040207C204023FE2242FA7823C4223C2200225022543B54E4D8445009FE0000 +58A0:100013DE1252125213DEFC0011FC112411FC112411FC1C20E3FE402000200020 +58A1:1088105013FE102011FCFC2013FE112410A813FE10001DFCE104410401FC0104 +58A2:202423A820922514F2082C0427BA20A827C6240037BCE08440A8009005280244 +58A3:20A024A422A820A027FCF91020A027FC204023F83840E7FC40A0011002080C06 +58A4:204023F8224823F8F84027FE200023F8220823F822083BF8E20843F801100208 +58A5:102011FC1088105013FEFC0011FC112411FC112411FC1C20E1FC402003FE0000 +58A6:103C13E0112410A813FEFCA81124120211FC112411241DFCE124412401FC0104 +58A7:203823C0208027FE2110FA0825F6291021F0200027FC3C04E5F4451405F4040C +58A8:00003FF8292825483FF801003FF80100FFFE2448422401003FF801000100FFFE +58A9:221021102FD0201027BEFCA427D4201427942094211439C8EF08411405140222 +58AA:08407F40007E3E8823483E4800503E5004207F500888290411003FF80100FFFE +58AB:2108209027FE209023FCFA94231C220423FC22043BFCE00847FE010800A80010 +58AC:00403C78248828F030102BFE244025A4345829B4205221B001003FF80100FFFE +58AD:2028202423FE22202224FBA42298249025AA284623FA3AA8E2A842A80FFE0000 +58AE:00407BFC488051F8622055FC488848F8688850F8408841003FF801000100FFFE +58AF:104013FE188055F8522095FC108810F8108810F8108801003FF801000100FFFE +58B0:200023FE205023FE2252FBFE200021FC210421FC210439FCE02043FE00200020 +58B1:202027A420A822922114FA0825F4280223F8220822083BF8E20841100FFE0000 +58B2:2100210023FC26A82AA8F2A827FC22A822A822A82FFE3000E2A8425404540000 +58B3:102011FC1020108813FEFC8811FC110411FC110411FC1D04E1FC408801040202 +58B4:2110211027FC21102110F7FE204027FC244427FC244437FCE000411002080404 +58B5:100011FC102013FE1222FDAC102011AC100011FC1C00E3FE4040008801FC0084 +58B6:20102410227C201020FEF844262822FE2210227C22103AFEE210421005FE0800 +58B7:108813FE1088100011FCFCA810A813FE10A810A811FC1C20E3FE402000200020 +58B8:2108210827FE21082044FBF42048205027FE208021FC3B04E5FC490401FC0104 +58B9:200027BC24A427BC24A4FFBC240425F4251425F425143DF4E514440404140408 +58BA:2080210027FC24442554FC4427FC24E4255424043840E7FE40A0011002080C06 +58BB:2040204027FC2248FA4825542FFE200023F8220822E83AA8E2E8420803F80208 +58BC:0800FF7808487F4849867F0049787F480828FF9049287F4401003FF80100FFFE +58BD:221024102F9028902FBEF8A42FD4241422142FD424143788E48848940A941122 +58BE:0600F8FC4A8424FC3884CCFC36A2CA9412A86AC4048201003FF801000100FFFE +58BF:200027FC24A427FC2040FBF8204027FC211020A03BF8E0404FFE004000400040 +58C0:20102008278824BEF48024942788247E2408278836BEEA884A880B8812880008 +58C1:00407C2045FC44887C5043FE7C20A5FC24203D2001003FF801000100FFFE0000 +58C2:3F7821483F4820862A783F482A483F2820104A289146200001003FF80100FFFE +58C3:100013FE100011FC1124FDFC112413FE100011FC11241DFCE12441FC000003FE +58C4:000027882088FABE210877D86B5CA52A29482508220801003FF801000100FFFE +58C5:02000100FFFE104824FE799010FC22907CFC089030FEC08001003FF80100FFFE +58C6:0A803138228838382288393822887FFE4002810401003FF801000100FFFE0000 +58C7:20402FFE200027FC2404FDF4251427FC200023F822083BF8E20843F800000FFE +58C8:20402FFE200027FC2404FDF4251425F4240427FC20083BF0E0404FFE01500E4E +58C9:2040207C204023FE2242FA7823C4223C220023FE22403BA4E25845B4045209B0 +58CA:2020202027FE202023FEFA52225223FE2040202027FE38A4E1A84290048800C6 +58CB:20402248215027FE2402F80423F8220823F8200027FC3C44E7FC444407FC0404 +58CC:2080204027FE2110FA08251423F8211023F8211027FC3928E3104D4801860100 +58CD:420C2FB082204FA00ABE2FA84AA8CFA842285FA84248028801003FF80100FFFE +58CE:203C27C020402FFEF04027FC255424E427FC204037FCE0404FFE000005240892 +58CF:201027D0251027DEFC5027E8250427C4200023F822A83AA8E2A842A80FFE0000 +58D0:7FFC111021087FFCB55A292835582108355829283458201801003FF80100FFFE +58D1:08000F00087CFFA480A47F24492494A822107F28A2443E0201003FF80100FFFE +58D2:211027FC2110204023F8F84027FC2080211023F820003BF8E2A842A80FFE0000 +58D3:00003FFE288C2F8A28882FBE20082F8828882F94289429A2404047FC80401FFE +58D4:204027FC204023FC2000F7FE200223F8204027FE200037FEE00847FE04A80798 +58D5:204027FE200021F8F90821F8200027FE240223F829803644E1B8466801A60E60 +58D6:100011FC102013FE1222FDAC102011AC100013FE10201DFCE15441540154010C +58D7:204023F8204827FE2048FBF8204027FE200022A424523BF8E2A842A80FFE0000 +58D8:00001FF011101FF011101FF000003EF82AA83EF82AA83EF801003FF80100FFFE +58D9:2040202027FE248825FCFC8827FE242025FC25243DFCE52445FC040004880904 +58DA:2040207C204023FC2244FBF0224422FC22A822F822A83AF8E20045FC05540BFE +58DB:27BC24A427BC24A427BCFC8424F42514262425B425143DB4E51445F404140408 +58DC:11FC110411FC110413FEFC2013FE122211AC102011FC1C00E3FE4040008801FC +58DD:202029FC252421FCF82023FE2D0425FC250425FC25043DFCE48845040BFE1000 +58DE:208020402FFE200027FCFCA427FC224821502208244438A8E11043080D460180 +58DF:08407E7C2440FF7C00047E7C42407E7C42407E7C4242463E01003FF80100FFFE +58E0:2210211027DE2010245EFA8227DE201027DE245027DE3C50E7DE4450045204CE +58E1:10001F7C1024FFA480A87F102A285546A2107F10A2BC3E1022103E1022FE3E00 +58E2:200027FE244425982488F7DE248825DC26AA248824203520E53C4920092017FE +58E3:40445F444AAA4AEE4E44EAAA4AEE4E004A284AAA6BAA4EEE9A28022802480288 +58E4:204027FC200023B8F2A823B8211027FC211027FC3110EFFE412803100D480186 +58E5:27FE240025FC25AC2574FDFC242025FC242027FE3C00E554482009FC102003FE +58E6:21102FFE211027BC24A4F7BC2140212023FE222027FC3A20E3FC422003FE0200 +58E7:27BC24A427BC200027FEFC002590249E27D4256425D43D54E5D445680BC81054 +58E8:00003EF82AA83EF82AA83EF800003EF82AA83EF82AA83EF801003FF80100FFFE +58E9:27FC20402FFE28422358F5002FBC25242724223C2FA43AA4EFBC42241FA4024C +58EA:244428E82E0E24E4FA0A2EEE20A02AEA200023F820083BF8E20043FC00040038 +58EB:010001000100010001000100FFFE01000100010001000100010001003FF80000 +58EC:001000F83F000100010001000100FFFE0100010001000100010001003FF80000 +58ED:01000100FFFE010001007FFC000000003FF80108010801280110010001000100 +58EE:0820082008204820282028200BFE182028204820882008200820082009FC0800 +58EF:042024202420242024203C2007FE0420FC20242024202420242045FC44008400 +58F0:01000100FFFE01007FFC00003FF8210821083FF8200020002000400040008000 +58F1:010001007FFC010001001FF000007FFE40028004101010E01F08100810080FF8 +58F2:010001007FFC010001001FF000007FFE4002844404400440044008441044203C +58F3:010001007FFC010001001FF000007FFE400280040FE00820082010222022C01E +58F4:01000100FFFE010001007FFC00001FF0101010101FF0000008200440FFFE0000 +58F5:010001007FFC0100010001003FF8000010101010FEFE1010101010107C7C0000 +58F6:010001007FFC010001001FF000007FFE40028444044024481448145004407FFC +58F7:010001007FFC01001FF000007FFE444284443FF8244824483FF804400440FFFE +58F8:010001007FFC01001FF000007FFE4002BFFC04402448144814500440FFFE0000 +58F9:010001007FFC01001FF000007FFE40029FF400001FF010101FF008200440FFFE +58FA:010001007FFC01001FF000007FFE444284443C7820083C7804400440FFFE0000 +58FB:100013FE10221120113CFD2012FE140011FC110411FC1D04E1FC410401140108 +58FC:010001007FFC01001FF000007FFE4002BFFC04403C7820083C780440FFFE0000 +58FD:01007FFC01003FF80000FFFE00023FF00100FFFE00007FFC00107DFC44907C30 +58FE:0800087EFF40084008407E7C00447E44424442447E7C424024400F40F07E4000 +58FF:1088105013FE105011FCFF54118C1174110411FC1C0873FE2108008800A80010 +5900:01003FF801001FF001007FFC01041FF011101FF00100FFFE00083EFE22483E18 +5901:0100FFFE01003FF800007FFC44447FFC00003FF821082FE8210827C824483FF8 +5902:0400040004000FF008101010302048208440028001000280044008203018C006 +5903:00003FF00410042004200440047C04040BE4082409441084114422244C288010 +5904:1040104010401E40126022502248524494441440084008401440230040FE8000 +5905:040004000FF01820644003801C70E10E01001FF0010021003FF8010001000100 +5906:040004000FF01820644003801C70E10E1FF001001FF001007FFC010001000100 +5907:040004000FF01820644003801C70E00E1FF0111011101FF0111011101FF01010 +5908:040004000FF01820644003801C70E10E111009207FFC05400920111061080100 +5909:01000100FFFE04401450244848C4140027F0082014402280410006C01830E00E +590A:0400040004002FF028101010302048208440028001000280044008203018C006 +590B:0400082010103FF8000808201210220847E4082014402280010006C01830E00E +590C:010001003FF801000100FFFE1210220847E4882214402280010006C01830E00E +590D:100010001FFC20005FF090101FF010101FF004000FF01820644003801C70E00E +590E:010011101110292845443FF801000100FFFE08000FF01420224041800E60701C +590F:7FFC02001FF010101FF010101FF010101FF008001FF02820444003801C70E00E +5910:10001FE020207FF8A30824881FF010101FF010101FF008001FF0282007C0F83E +5911:210827C820086B9AB02C2388200853944A928BA204000FE0144003801C70E00E +5912:0000FFFE110013DC52545BD4525C53D05A52E3CE24084FE4944203801C70E00E +5913:17C0621C47C4444477DC444447C4745C47C4000024084FE4944203801C70E00E +5914:0440FFFE110013DC52545BD4525C53D05A52E3CE24084FE4944203801C70E00E +5915:020002000200020007F80408080810102410422001400080010002000C007000 +5916:10401040104010403E40226042504248A4441444084008401040204040408040 +5917:1000100010F81E8812882288228852888AA804900480088208821082207E4000 +5918:10001000107C1E4412442244224452448A440444044408540848104020404040 +5919:00003FF8200820082FE82208220827C8244828483488228A210A420A44068802 +591A:0200020007F008203840048003400C8071F802080C103220014001800E007000 +591B:00003FF0001000101FF000100010FFFE020007F008103420024001800E007000 +591C:02000100FFFE0880088010F81108314852289510111010A0104010A011181606 +591D:2020202021203D2025FC45204620A420142009FC082010201020202043FE8000 +591E:102010203F304128A224142208203020C02000003E442258226022423E42223E +591F:20202020407C7E4482A802107A204AD04A1E4A227A644A9402080210142008C0 +5920:102010203E40427EA4821902107A284ACF4A114A327A4A4A040208023014C008 +5921:101010103E1042FEA4101810107C2800CF00117C32444A4404440844307CC044 +5922:0820FFFE08203FF824483FF800007FFE420287F408103420024001800E007000 +5923:0100FFFE10103FF800003FF824483FF800007FFE44028FF4342002C007007800 +5924:02000FF0346003801D007FFE4002BFFC01003FF821083FF821083FF810102008 +5925:00207E204A7C4A447EA84A104A207ED0081EFF2218642C942A084A10882008C0 +5926:22202220FF7C22443EA822103E2022D0221EFF2240645494620840107E2000C0 +5927:01000100010001000100FFFE010001000280028004400440082010102008C006 +5928:100010001000200020007F80008001000100FFFE01000280044008203018C006 +5929:00003FF80100010001000100FFFE01000280028004400440082010102008C006 +592A:01000100010001000100FFFE0100010002800280044004400A2011102108C006 +592B:01000100010001003FF8010001000100FFFE028004400440082010102008C006 +592C:0100010001001FF001100110011001100110FFFE02800280044008203018C006 +592D:001000F83F000100010001000100FFFE0100028002800440082010102008C006 +592E:0100010001001FF011101110111011101110FFFE02800280044008203018C006 +592F:010001007FFC0280044008203018C10601003FF8020802080408080810506020 +5930:010001007FFC0280044008203018C44604400440044004400840084010402040 +5931:01001100110011001FF8210041000100FFFE010002800280044008201010600C +5932:010001007FFC0280044008203118C10601000100FFFE01000100010001000100 +5933:010001000100FFFE02800440082010102008CFE600000000000000007FFC0000 +5934:00800080088004802480108010800080FFFE010001400220041008083004C004 +5935:010001007FFC0280044008203018C10601000920091011082104410405000200 +5936:082008200820082008207EFE0820082008501450125012882088210442048402 +5937:01000100FFFE01003FF8010801083FF8210021003FFC0284044C08203018C006 +5938:010001007FFC0440082017D02008C0063FF8040008000FF00010001000A00040 +5939:0100010001007FFC0100111009200100FFFE010002800280044008203018C006 +593A:010001007FFC0280044008203018C0460040FFFE004010400840084001400080 +593B:010001007FFC01000280044008203018C0061FF010101010101010101FF01010 +593C:010001007FFC0280044008203018C92609200920092009201120112021204020 +593D:020002007FFC044008203018CFE6000000007FFC02000400082010103FF81008 +593E:0100010001007FFC01001110111011102928454402800280044008203018C006 +593F:010001007FFC0280044008203018DFF61110111011101FF0100410040FFC0000 +5940:00007FFC01000300056019186104000001000100FFFE0280044008203018C006 +5941:020002007FFC044008203018DFF610001220114010801140122010001FF80000 +5942:080008000FE0102020405FF09110111011101110FFFE0280044008203018C006 +5943:020002007FFC044008203018C0F63F00210021003FFC208020402A243114210C +5944:020002007FFC044009203118DFF6111011101FF0111011101FF40104010400FC +5945:020002007FFC044008203018C60638F82088228822882E8832A8249004800880 +5946:020002007FFC044008203018DFF6100010001FE0102010201FE0100010001FF8 +5947:010001003FF8028004400820FFFE001000101F90109010901F90001000500020 +5948:020002007FFC044008203018CFE6000000007FFC010011101108210445040200 +5949:010001007FFC01003FF80200FFFE044009203118CFE6010001003FF801000100 +594A:00800FF840805FFC40804FF840805FFC40007F0001007FFC028004401830E00E +594B:010001007FFC0280044008203018C0061FF0111011101FF0111011101FF01010 +594C:0100010001FC010001001FF0101010101FF0010001007FFC028004401830E00E +594D:0100111009203FF8020002007FFC082010102448C44604400840084010402040 +594E:020002007FFC044009203118CFE6010001007FFC000001003FF801000100FFFE +594F:010001007FFC01003FF80200FFFE0440082037D8C1061FF0010002C00C303008 +5950:080008001FE020204040BFF822882448282821080100FFFE028004401830E00E +5951:080008007F7C08243E2408247F44085409880100FFFE0280044008203018C006 +5952:020002007FFC04400A203118DFF6040008401F8001100620384001A00E107008 +5953:020002007FFC044008203218C7E618400580068039F80610192000C003003C00 +5954:020002007FFC044009203118CFE60100092008207FFC08200820102010202020 +5955:020001007FFC0440245044488944108001000100FFFE0280044008203018C006 +5956:0840484028FC09041A8828504820884009800100FFFE0280044008203018C006 +5957:010001007FFC028004400FF03418C7E6040007E00400FFFE040008101FF80008 +5958:2420242024203DFC0420FC20242024F845000100FFFE0280044008203018C006 +5959:040008201FF00210FFFE08203118DFF611101FF011101FF40104010400FC0000 +595A:00FC7F002208151008401F8003200C103FF8010801007FFC028004401830E00E +595B:020002007FFC044008203018C0063CF824883CF8248824F83C88248801280210 +595C:044004407C7C04403C7804407C7C044005400100FFFE0280044008203018C006 +595D:020002007FFC044008203FF8D11617D011101FF0101017D0245027D040108030 +595E:020002007FFC044008203018C90608801FFC30805FF890801FF810801FFC1000 +595F:020002007FFC044008203E78D24E12481E78124812481E78124822882AA84510 +5960:08200440FFFE04403FF82848303827C820083FF801007FFC028004401830E00E +5961:7FFC02001FF010101FF010101FF010101FF00200FFFE08203458C44608401040 +5962:020002007FFC044008203218DFD60220FFFE03000FF03810CFF008100FF00810 +5963:00003FF802007FFC04401830E00E3CF8248824F83C8824F824883C8801280210 +5964:020002007FFC044008203FF8C10602003FF8244827C8244827C824483FF82008 +5965:020004003FF82008292825482FE82548292820080100FFFE02800C603018C006 +5966:00407EFC15440838FE441AA22CFC4844A894110801007FFC028004401830E00E +5967:020004003FF820682FA825482FE823482528280801007FFC02800C603018C006 +5968:083E4BC42A48292008081BFE2908C8880828091001007FFC028004401830E00E +5969:02007FFC04201818E0063FF8200027F0241027F020002F7829482F7820003FFC +596A:02007FFC04201898E8461FF830805FF810801FF810801FFC1020FFFE08200460 +596B:020002007FFC044008203018C14625481778840847F814082778E54825482808 +596C:0440247C24A83D5004287DFE2488444885180100FFFE0280044008203018C006 +596D:01000100FFFE01007D7C11107D7C45447D7C45447D7C0280044008203018C006 +596E:02007FFC04201818E9061FF831005FF891001FFC10003FF821083FF821083FF8 +596F:02007FFC04201918E9E609007FFC00283FFE20202FA422282A90532A46469882 +5970:00003FF824483FF80000FEFEAAAAAAAAFEFE010001007FFC028004401830E00E +5971:210447C88812F3BC20084B92F83E0380AAAAABAA01007FFC028004401830E00E +5972:100010EEFEAA28AA44EE90007AFE1492FEFE10927CFEC4107DFE44107C104410 +5973:02000200020002000400FFFE0420082008201040184006800180066018106008 +5974:1000100011FC1084FC8424842488248824504850282010202850448881040202 +5975:1000100013FE1020FC2024202420242024204820282010202820442084A00040 +5976:1000100013F81088FC90249024A024BC24844884290411042904460482280410 +5977:1008103C11E01020FC202420242027FE24204820282010202820442084200020 +5978:100011FC10201020FE202220222023FE42202420142008201420222042208020 +5979:1020102010201120FD2C2534256427A425244934292811222922450284FE0000 +597A:10801080108010F8FD0825082510261024204820285010502888450882040402 +597B:1020102010201020FEFE22442244224442442484144808281410222842448082 +597C:1010103811E01020FE2022202220223E43E024201420082214222222421E8000 +597D:100010FC10041008FC102420242025FE24204820282010202820442084A00040 +597E:1020102010201020FD242524252425242524492429241124292445FC80040000 +597F:20402040204023FEFC88248825082490645024203450248A2502440243FE8000 +5980:00400040FC40044007FE048804887C8840884108409044505820605040880304 +5981:10401040108010FCFD0426042404250424844844284410042804440484280010 +5982:100010001000107CFE4422442244224442442444144408441444227C42448000 +5983:1000100011F81008FC082408240825F825084900290011002902450284FE0000 +5984:02000100FFFE100010001FF802000200FFFE042008201E400180066018186004 +5985:1000100011FC1020FC2024202420242024204820282010202820442083FE0000 +5986:08400840084048402BFE28880888088818882908C89008500820085008880B04 +5987:1000100011FC1004FC042404240425FC2404480428041004280445FC80040000 +5988:100013F010101010FD102510251025FC24044804280413F42804440484280010 +5989:10201020102011FEFD222624242024202450485028501050289044928512020E +598A:1008103C11E01020FC202420242027FE24204820282010202820442085FC0000 +598B:1020102010201020FDFC24202420242027FE4820285010502888448885040202 +598C:1088108810881088FDFC24882488248827FE4888288810882888450885080208 +598D:100013FE10881088FC882488248827FE24884888288810882888448881080208 +598E:1020102010501050FC8825042602248824884888288810882888450881080208 +598F:10401020102013FEFC8824882488248824884850285010202850448881040602 +5990:1010109010901088FC882524252426222420484028481044288445FE84820000 +5991:1000100011FC1124FD2425242524252425FC4900290011002902450284FE0000 +5992:10401020102011FEFD022502250225FE25024900290011002A00460084000800 +5993:10201020102013FEFC202420242025FC24844888284810502820445081880606 +5994:10801040104013FCFC00240025F02510251049102910111229124612820E0400 +5995:1020102010201020FDFC252425242524252449FC292410202820442084200020 +5996:1008103C11E01020FC20242025FE242024204850285010502888448881040202 +5997:1020102010501050FC88254426222420240049FC280410082808441084100020 +5998:1000100010FC1000FC00240025FE24202420484028401088288445FE84820000 +5999:10201020102010A8FCA424A22522252026244824282810082810442080C00300 +599A:1000100011FE1010FC1024202420246824A449222A2210202820442084200020 +599B:01002108210821083FF801000100FFFE02000200FFFE08201C4003800C707008 +599C:10401040104013F8FC4824482448244827FE484028A010A02910451082080406 +599D:042024202420242025FE3C4404440444FC442484244824282410442844448582 +599E:100011F810481048FC482448244825F824884888288810882888448883FE0000 +599F:00001FF0101010101FF0101010101FF002000200FFFE08201C4003800C707008 +59A0:1020102010201020FDFE2522252225222552494A298A110229024502850A0104 +59A1:1008101C11E01100FD00250025FE251025104910291011102910461082100410 +59A2:1010109010901088FD082504260425FA24884888288810882908450882280410 +59A3:1010111011101112FD12251425D82510251049102910111229524592850E0000 +59A4:100011F810081050FC20241027FE242224244820282010202820442084A00040 +59A5:00FC7F00020821081110102002000200FFFE042008201E400180066018186004 +59A6:10201020102013FEFC202420242025FC24204820282013FE2820442084200020 +59A7:100011FC10001000FC0027FE24902490249048902890109229124512820E0400 +59A8:10401020102011FEFC4024402440247C24444844284410442884448481280210 +59A9:200023FC20402040F84048404FFE484088A048A030A0112029224A22841E0800 +59AA:100011FE11001104FD4425282528251025104928292811442984450085FE0000 +59AB:1020112010A010A0FC2027FE2422242224424852284A108A2882450282140408 +59AC:1000100013FE1020FC202440244024FC25844A842C8410842884448484FC0084 +59AD:2050204820482040FBFE4880488048FC89444944312811282A104A2884440182 +59AE:100011FC11041104FD0425FC25002540254449482970114029424642823E0400 +59AF:1020102010201020FDFC252425242524252449FC292411242924452485FC0104 +59B0:10801080108010FEFD4025402640247C244048402840107C2840444084400040 +59B1:100013FC10841084FC84250425142608240049FC290411042904450485FC0104 +59B2:1000100010FC1084FC84248424FC24842484488428FC10842800440085FE0000 +59B3:10801080108010FEFD0225042620242024A848A4292411222A22442080A00040 +59B4:100010F83E884288A4A818941084207CC2000200FFFE08201C4003800C707008 +59B5:10401020100013FEFC2024202420242025FC4820282010202820442083FE0000 +59B6:10201010101011FEFC2024202444248425F8481028201044288245FE84820000 +59B7:1020102011201120FDFC25202620242025FE4820285010502888448885040202 +59B8:1000100013FE1008FC0825E8252825282528492829E811282808440884280010 +59B9:10201020102011FCFC202420242027FE247048A828A811242924462284200020 +59BA:10201020102013FEFC202420242025FC247048A828A811242924462280200020 +59BB:010001007FFC01003FF80108FFFE01083FF80200FFFE08201C4003800C707008 +59BC:1040102010281008FC08244824542552255249602A60104428C44544823C0000 +59BD:10201020102011FCFD242524252425FC25244924292411FC2924442080200020 +59BE:020001003FF8000008200440FFFE020002007FFC042008401C8003800C707008 +59BF:100010007E7C1244124422444A7C844402000200FFFE08201C4003800C707008 +59C0:101C11E010201020FC2027FE24202470247048A828A811242A22442080200020 +59C1:10801080110011FCFE04240425E425242524492429E411242804440484280010 +59C2:1004101E11E01000FC20241025FE2404240848102820104028804540823E0000 +59C3:1000100013FE1020FC20242025202520253C4920292011202920452087FE0000 +59C4:100011FC11041104FD0425FC2520252025FE4920292011102912454A85860102 +59C5:10201020112410A4FCA8242025FC2420242048202BFE10202820442084200020 +59C6:100010FC108410A4FC942484248427FE250449442924110429FE440484280010 +59C7:0810081017FE3010521091101110105012200200FFFE08201C4003800C707008 +59C8:1020102010501050FC8825242612241025FC4804280810882850442084100010 +59C9:10201020102013FEFC20242025FC252425244924292411342928442084200020 +59CA:10201020102E11F0FD202520252025FE2422486228A2112A2E24442084200020 +59CB:1020102010201040FC48248425FE2482240048FC288410842884448480FC0084 +59CC:10201020102011FCFD24252425FC2524252449242BFE11042904450485140108 +59CD:100011FC11541154FD542554255427FE25544954295411542954454485140108 +59CE:10201020102011FCFD2425242524252425244BFE282010502850448881040202 +59CF:1088108810881088FDFE248824882488248848F8288810882888448884F80088 +59D0:100011F811081108FD0825F825082508250849F8290811082908450887FE0000 +59D1:1020102010201020FDFE24202420242025FC4904290411042904450485FC0104 +59D2:1008104811281128FD2825082508250825084908294811942914442284420082 +59D3:1020102011201120FDFC252026202420242049FC282010202820442083FE0000 +59D4:00701F8001000100FFFE054009203118C2060200FFFE08201C4003800C707008 +59D5:0880088828902EA028C028842E84F07C02000200FFFE08201C4003800C707008 +59D6:100011FE11001100FD0025FC250425042504490429FC11002900450085FE0000 +59D7:100011DC11541154FD542554255427FE2554495429541154295446D48224044C +59D8:1104108410881000FDFE24882488248824884BFE288810882908450882080408 +59D9:10801088109C1170FD1027102510251025FE49102910111029104510857C0100 +59DA:2090209020902292F9944898489049988A944C9230901090291249128212040E +59DB:100011FE11021102FD7A25022502257A254A494A294A117A29024502850A0104 +59DC:082004407FFC01003FF80100FFFE02000400FFFE082010201C4003800C707008 +59DD:20202120212021FCF9204A2048204BFE487090A850A8212431244A2248208020 +59DE:10201020102013FEFC20242025FC2400240049FC290411042904450485FC0104 +59DF:10201010101013FEFC202442248425F82410482228C413082810442880C40302 +59E0:10201020104011FEFD022502257A254A254A494A294A117A29024502850A0104 +59E1:1008103C11E01020FC2027FE24202420242049FC290411042904450485FC0104 +59E2:1020102010481084FDFE2402240024FC248448FC288410FC2884448484940088 +59E3:10401020102011FEFC0024882504260224884888285010502820445080880306 +59E4:1008101C11E01100FD0025FE25002500257C4944294411442944467C82440400 +59E5:10401040104411F4FC48245027FE2440248049842A9810E028824482847E0000 +59E6:04000400FFFE08201C4003800C70700800101010FEFE2224646418182434C2C2 +59E7:10001000FE7C2210641018102410C21010FE1010FE102210641018102410C210 +59E8:2040204027FC2040FBF848484BF84A408BFC4844305410A828A0491082080406 +59E9:1080108010FE1110FE10241024FC2490249048902BFE10102810441084100010 +59EA:100011FE10201040FC88250425FE24222420482029FE10202820442083FE0000 +59EB:100011FE11201120FD2025FC250425042504490429FC11202920452085FE0000 +59EC:100011FE11101110FD10257C2544254425444944297C11102910451085FE0000 +59ED:02001FF00410085010207EFC12242A5444880400FFFE08201C4003800C707008 +59EE:100013FE10001000FDFC2504250425FC2504490429FC11042800440083FE0000 +59EF:1040104412441148FD50244027FE2490249048902890109229124512820E0400 +59F0:1080108011FC1104FE0425E42524252425E44924292411E42904440484280010 +59F1:1020102013FE1050FC88250426FA240027FE4840288011FC2804440484280010 +59F2:20402020202023FEFA024C4448404BFE48889088510820D03020485048888304 +59F3:1040104010FC1104FE88245024202440248049FC2A8410842884448484FC0084 +59F4:00047FA410243F2451240A040C043014C2080200FFFE08201C4003800C707008 +59F5:200027FC24042404F5F45444544455F455549554555425542574544654468842 +59F6:1020102010501088FD04260225FC2400240049FC290411042904450485FC0104 +59F7:1020102011FE1040FC4024FC2484258426FC4884288410FC2884448484940088 +59F8:100011DC10881088FC882488248827DE24884888288810882888450881080208 +59F9:10401020102011FEFD022604241825E024404840287E13C0284044448444003C +59FA:10201120112011FCFD202620242027FE2490489028901090291245128212040E +59FB:100011FC11041124FD24252425FC252425244954294C118C2904450481FC0104 +59FC:10201020107C1084FD482430242024482590483E284211A42818441084600180 +59FD:1040104010FC1104FE0825FE2500257C254449442954114829424542853E0200 +59FE:1020102010501088FD04260225FC24202420482029FC10202820442083FE0000 +59FF:4080208009FC12042448E04020A023182C060400FFFE08201C4003800C707008 +5A00:2028202420242020FBFE48204924492489244BA8312811102A124A2A84460082 +5A01:0028002400203FFE202020203FE4222422243FA824A828902512422A45469882 +5A02:1088108810881088FDFE24882488248824884BFE280010882884450482020402 +5A03:1020102011FC1020FC20242027FE24002420482029FC10202820442083FE0000 +5A04:010011100920FFFE054009203118C0060200FFFE042008201C4003800C707008 +5A05:200023FC20902090F89048924C924A948A944A98309010902890489087FE0000 +5A06:2080208020BC23C0F850482448D44B0C88004BFE3090109029124912820E0400 +5A07:1008101C10E01020FC2025FE2450248825044A8A288810882888448884880108 +5A08:02000100FFFE0440145014482444420402007FFC042008401C8003800C707008 +5A09:1020102011FC1124FDFC252425FC240027FE4880290011FC2804440484280010 +5A0A:100011F811081108FDF82508250825F82508490829F81090289045128212040E +5A0B:1020112410A410A8FC2025FC2504250425FC4904290411FC2904450485140108 +5A0C:100011FC11241124FDFC2524252425FC2420482029FC10202820442087FE0000 +5A0D:2028202420242020FBFE4A204A244A248BA44AA832A812902A924DAA84460882 +5A0E:080C08F07E8008800EFE78880888290812080200FFFE08201C4003800C707008 +5A0F:10901088108013FEFCA024A824B024A424A848B02924112A2932462282DE0400 +5A10:1008103C11C01004FD4424A8240025F8241048202BFE10202820442084A00040 +5A11:1020082040A824A4092A723010C0170002007FFC042008401C8003800C707008 +5A12:1080108010FE1100FEFC248424A4249425FE48842924111429FE440484280010 +5A13:200023FC22042204FBFC4A004A184AE08A384AE0323C13E02A224C22841E0800 +5A14:1020102013FE1020FC2025FC25042504250449FC28501050289244928112020E +5A15:1020102013FE1020FC2025FC2524252425FC4820287010A82924462280200020 +5A16:100011FC11041104FD04250425FC242024204920293E1120292046A0847E0800 +5A17:2000200623B82088F8884908493E4B8888884A883288113E29004A80847E0800 +5A18:1040102011FC1104FD0425FC2504250425FC4920292211142908454485820100 +5A19:100011FE10001092FD24264825242492240049FE282010202820442083FE0000 +5A1A:11FC1124112411FCFD24252425FC244024404BFE284210822882450282140408 +5A1B:200020F820882088FAF84A004A004BFC8844484437FE104028A0491082080406 +5A1C:20002FDE22522252F25457D45258525452529FD25252225A2254545055508890 +5A1D:100013FE10101020FC6824A427222420240049FC290411042904450485FC0104 +5A1E:2008203C23C02044FA244928490048408BFE4888310813902860485081880604 +5A1F:200021F821082108F9F848004BFC4A044A0493FC5204220433FC4A044A148208 +5A20:200023FC22002200FAF84A004A004BFC8AA04AA432A812902A904C8884A408C2 +5A21:20202020202023FEF8204820482049FC8840482030A412822A8A4A8A84780000 +5A22:1020102010501088FD44262224F824082410482029FC11042904450485FC0104 +5A23:11081088109011FCFC24242425FC2520252049FE286210A2292A462484200020 +5A24:2420242024203DFC0420FC20242024F846000200FFFE08201C4003800C707008 +5A25:101010D813941094FC9027FE24902494249448D82B98109028AA44CA84860182 +5A26:1010103811C01100FD0025FC25102510251049102BFE10002890450882040402 +5A27:1104108410881010FDFC25042504250425FC48502850109028924512820E0400 +5A28:100011FC110411FCFD0425FC2400240025FC4820282013FE2820442084200020 +5A29:1080108010F81108FE1025FC25242524252449FC28501050289044928112020E +5A2A:100013FE10401040FDFC2484248427FE2400480029FC11042904450485FC0104 +5A2B:2004200E23B82088F8884928492E4BA888A84AA832A8113E29004A80847E0800 +5A2C:2010201823D42014F8104FFE4810489088904AD0329012902A8A4AEA87060202 +5A2D:2020204020882104FBFE4882488049FC8A20482033FE10202850488881040602 +5A2E:1040102013FE1000FC0025FC2400240025FC4800280011FC2904450485FC0104 +5A2F:200020F820882088FAF84A004A004BFC8804480437FE100028A0491082080406 +5A30:21082148212822A8FAA84E884A884A884A88928852A822D432944A224A428282 +5A31:200023F822082208FBF8480048004BF88840484037FE104028A0491082080406 +5A32:200021FC21042104F90449FC482048204BFE92225252228A330A4A024A0A8204 +5A33:204220E22382208AF88A488A4BEA488A498A91CA52AA228234824882488A8084 +5A34:110010BC10041124FD24252425FC2524257449AC292411242924450485140108 +5A35:200027E0225E2252FA524BD24A524A544BD49254524822E83754485448628040 +5A36:00007F7C22443E4422283E1023A8FE4402820400FFFE08201C4003800C707008 +5A37:1008103C11E01020FDFE24A824A824A827FE48A828A813FE2820442085FC0000 +5A38:1088108813FE1088FC8824F82488248824F84888288813FE2800448885040202 +5A39:20102388208820FEF8904B904A244A244A3893885090209030A448BE4A828100 +5A3A:200023DE2042214AF884494A4A524C2088004BDE305211522894494882540422 +5A3B:1020102013FE1020FDFC252425FC252425FC4820287010A82924462280200020 +5A3C:10FC1084108410FCFC84248424FC240025FE4902290211FE2902450285FE0102 +5A3D:100011F810081008FDF82408240827FE24204A22297410A82924462280A00040 +5A3E:100011FE11101110FD7C2510251025FE250049102910117C2910461082FE0400 +5A3F:00007BFE480851E8492845E85408482842100200FFFE08201C4003800C707008 +5A40:2000277E25042504F57455545654555455549554557425542604540454148408 +5A41:01001FF01110FFFE11101FF001001FF011101FF00200FFFE08201C4003C03C38 +5A42:2020204021FC2104F9FC490449FC4820482093FE52222222322A4A2448208020 +5A43:2040202023FE2202F80049FC480048004BFE90205128212432224C2248A08040 +5A44:1040102011FC1000FD082490240027FE2400480029FC11042904450485FC0104 +5A45:1100110011FC1204FC44255424E4244427FC484428E411542A44444484140008 +5A46:202013FE922242204BFC1284E448243029CE0400FFFE08201C4003800C707008 +5A47:2008203C23C02044FA244928490048208BFE487030A810A829244A2284200020 +5A48:2020202021FC2020F8204BFE488849448A4248F8318812502820485081880606 +5A49:2040202023FE2202FD04490049DE4A528A524B52349A1094291049128212040E +5A4A:1020102013FE1020FC2025FC2420242027FE484028A411A82A90448884C60080 +5A4B:10201020103E1020FDFE2522253825E02522491E290011782A48464A848A0906 +5A4C:2100210021DC2114F114511457D4501451149114558825482948511455148222 +5A4D:1020102011FC1050FC88250427FE240825E84928292811E82928440884280010 +5A4E:10A01090109011FEFD20252027FC2520252049FC29201120292045FE85000100 +5A4F:1080108010F81108FE1025FC25242524252449FC28501058289444928112020E +5A50:100011FC11241124FDFC2524252425FC24204BFE287010A82924462280200020 +5A51:201C21E020202020FBFE48A849244A42484093FE5088210830D0483048488184 +5A52:102010A210A21124FC50248827042422242048A428A411282850448885040202 +5A53:04400440FC7E04407C7C0440FC7E044006400200FFFE08201C4003800C707008 +5A54:209020902090279EF890489048904B9C489090905090279E3090489048908090 +5A55:2020202023FE2020F9FC48244BFE482489FC48203120113E29204AA0827E0400 +5A56:200023FC20402040FBFE48A049104A084C4690405048226432524C5249408080 +5A57:20002040239C2204FA044B9C4A044A048BFC489030901090289049128212040E +5A58:1020112410A81020FDFC244027FE248825044AFA2C88108828A844928482007E +5A59:1080108010F81108FE1025FC2424242425FE4824282411FC2824442084A00040 +5A5A:201C23E0222023FEFA204A924B0A4A0649FC9104510421FC3104490449FC8104 +5A5B:1040102013FE1000FC0025FC2504250425FC4820292811242A22442280A00040 +5A5C:00007F7C48447F4441287F1048287F4400820400FFFE08201C4003800C707008 +5A5D:2040202023FE2202FC0448004BFE482088204920313C11202AA04A60843E0800 +5A5E:1020102011FC1020FC2027FE2488245025FC4820282013FE2820442084200020 +5A5F:200023FE22222222FBFE4A224A224AFA4A8A928A528A22FA328A4A024BFE8202 +5A60:1040102013FE1202FC0425F82508250825F84900290011FC2904450485FC0104 +5A61:20202020202023FEF8204924492449248AAA487030A810A829244A2284200020 +5A62:1040108011FC1124FD2425FC2524254425FC4890291013FE2810441084100010 +5A63:2050225222522252FBDE4A024A024BFE8A024A0233DE12522A52425284520802 +5A64:200023FE22222222FAFA4A224A224BFE8A024AFA328A128A2AFA4A02820A0404 +5A65:10201020103E1020FDFC250425FC250425FC4924282013FE2820442084200020 +5A66:200021FC200420FCF80449FC48004BFE4A22902051FC21243124493449288020 +5A67:1020102013FE1020FDFC242027FE240025FC490429FC110429FC450485140108 +5A68:1020102010501088FD0426FA240025FC2554495429FC1154295445548504010C +5A69:1020112411241124FDFC240025FE2500257C4910291011FE2910461082100410 +5A6A:082008207EFC08301C682AA4C92208200A207FFC042008401C80038006703808 +5A6B:100011FC11041104FDFC2504250425FC2400491229D41118291045528592010E +5A6C:1008103C11C01044FD2424A82490241C25E04820282013FE2820442085FC0000 +5A6D:100011FE10481048FC4825CE25022502250249CE284810482848444885FE0000 +5A6E:100011FC11041104FDFC2510251025FE25104910297C114429444544857C0244 +5A6F:0000FEFE00007C7C444464645454444446440200FFFE08201C4003800C707008 +5A70:10501050105011FCFD542554255425FC25544954295413FE2800448881040202 +5A71:00407C2005FC7C4040887DF00420044829FC10040200FFFE08201C4003C03C38 +5A72:1088108813FE1088FC8824502450249425944A98289010B228D24492848E0080 +5A73:200023FE20002000F8F848A84AAA4AFA4AAA92AA52AA22FA32024A024BFE8002 +5A74:00003EF822882AA82AA82AA81450628802007FFC042008401C80038006703808 +5A75:11041088105011FCFD24252425FC2524252449FC282010202BFE442084200020 +5A76:2040202023FE2222F82049FC4924492449FC9124512421FC3124482048208020 +5A77:1040102013FE1000FDFC250425FC240027FE4A0229FC10202820442084A00040 +5A78:100010FC108410FCFC8424FC240025FE248048FE292A124A2892452284540088 +5A79:200023FE20502050FBFE4A524A524BFE4800904057FE20883190486048D88304 +5A7A:00207E20247E18A4FF2829104A2898C602007FFC042008401C80038006703808 +5A7B:2020202023FE2020F8204BFE4A8A4A524AFA9222522222FA32224A224A2A8204 +5A7C:1088108813FE1088FCA8242027FE2440248048FC298412842884448484FC0084 +5A7D:200023DE22422242FA424BDE4A004A3E4BD29212521423D432084A144A248242 +5A7E:21C020A021102208FDF648004BCA4A4A4A5493D45268225433D44A4A4A4A82C0 +5A7F:100013FE10221120FD3C252026FE240025FC490429FC110429FC450481140108 +5A80:21FC2124212421FCF924492449FC4820482093FE5222222A32FA4A0A4A028206 +5A81:2040204021FC2084FBFE480049FC490449FC902053FE202032204BFE48208020 +5A82:2040202021FC2000F88848504BFE4A224C2491FC512421243134492848208020 +5A83:200021FC20482030FBFE4852489449108A30482033FE107028A8492486220020 +5A84:1104108813FE1020FC2025FC2420242027FE4800282013FE2820445080880306 +5A85:1088108813FE1088FCF8248824F8248824884BFE290011482984450085FE0000 +5A86:100013FE10201040FDFC2554255425542554492C282013FE2850448881040202 +5A87:1040102011FC1000FC88245027FE2420242049FC282010A82924462280A00040 +5A88:200023FE22222020FBFE482049FC492449FC912451FC202033FE482048208020 +5A89:200023FC22042204FBFC4A004BFC4A408A884BFC322412202DFC4420882013FE +5A8A:21082088209027FEF8004BC44A544A544BD49254525423D432544A444A5482C8 +5A8B:1020102013FE1020FDFC244027FE248825044AFA2888108828F84488848800F8 +5A8C:1088108813FE1088FC88240025FC25242524492429FC11242924452485FC0104 +5A8D:1040104010F81108FE1025FC250425FC250449FC290411FC2800448881040202 +5A8E:1020102211FA1024FC2827FE2420244024FC49842A8410FC2884448484FC0084 +5A8F:1020112411241124FDFC240027FE2420244049FC29541154295445548554010C +5A90:00007F7C444444445F7C51405F4244427FBE0200FFFE08201C4003800C707008 +5A91:2008203C21E02020FBFE482049FC492449FC912451FC202031FC48204BFE8000 +5A92:21102110211027FCF91029F0291029F048404FFE284010E011502A4E44448040 +5A93:1020104011FC1104FDFC250425FC240027FE4820282011FC2820442083FE0000 +5A94:200027FE20402080FBFC4A944A944AF44A94929452F4229432944A944BFC8204 +5A95:1020105010881104FEFA240025FC2504250449FC288810882BFE448881080208 +5A96:2110211027FC2110F95048404BF84A488A484A4837FE104028A0491082080406 +5A97:2040202023FE2202FC0449FC480049FC490491FC510421FC310448004BFE8000 +5A98:1110111211D41118FD522592252E244025FC4904290411FC2904450485FC0104 +5A99:200C200A200823FEFA084BF84A4A4A4A8BEA4AAC32AC124C2AAA4B0A82160422 +5A9A:100011FC11241124FDFC2500257C25442544497C2944117C29444644827C0444 +5A9B:203C27C022442128F8004BFC488048804FFE910051F8228832504C2048D88306 +5A9C:10201020103E1020FC2025FC250425FC250449FC290411FC2800448885040202 +5A9D:0610381008527E5408901C282A2848440A820200FFFE08201C4003800C707008 +5A9E:100011FC11041104FDFC2504250425FC24004BFE28201120293C452082A0047E +5A9F:10481148114813FEFD4825482578250025FE48202BFE107028A8452486220020 +5AA0:1040104013FE1080FDFC262025FE240025FC490429FC110429FC450485140108 +5AA1:1020102013FE1020FDFC252425AC2574252449FC2820107028A8452482220020 +5AA2:100011FE1102117AFD02257A2502240024FC488428FC108428FC448484FC0084 +5AA3:212020A024782228F8A8492A4F2A494649A0902053FE207030A849244A228020 +5AA4:100011FC11241124FDFC2524252425FC24204810285411422942454A82380000 +5AA5:2040202021FE2102F90249FE4900490089FE49AA31AA12FE2AAA4AAA84A20086 +5AA6:200023FE222223FEFA224BFE480049FC490491FC510421FC3104490449148108 +5AA7:100010FC10841084FCF42494249425FE2502497A294A114A297A4502850A0104 +5AA8:21082088209027FEF89048904BFC4A944A94930C520423FC32044A044BFC8204 +5AA9:1080109E109213F2FC92249E249225D22552495E2952115229D24422842A0044 +5AAA:200021F821082108F9F84908490849F888004BFC329412942A944A9487FE0000 +5AAB:20402040207E2040FBFC480449FC48048BFC48403240127C2A40454084FE0800 +5AAC:2100217C21442244FA444E7C4A104A104AFE92385254225432944B124A108210 +5AAD:0BFE3020C1FC09043124C52409243050C08803040200FFFE08201C4003C03C38 +5AAE:204020A021102208FDF648004BC44A544A5493D45254225433D44A444A5482C8 +5AAF:20402240214027F8F888489048FC490489084BFE3202142A2AAA4A8284140008 +5AB0:2080208021FC2244F95449F4488449284A9091FC5244255431F4488449288210 +5AB1:2008203C23C02004FA44492849FC4A20482093FE502021243124492449FC8004 +5AB2:1020104011FC1154FD242554250425FC2400491229D41118291045528592010E +5AB3:2020204021FC2104F9FC490449FC490489FC4840302010A42A8A4A8A84780000 +5AB4:2020202021FC2020FBFE480049FC4904490491FC5052209431884EA448C28080 +5AB5:0020792448A8482049FC78404BFE488849447A424DFC488849D0483048489984 +5AB6:2108210827FE2108F8004FFE490849F8490891F85108213E37C8480848088008 +5AB7:200023FE220022FCFA004BFE4AA84A908AC84A86320813FE2A884C4884080818 +5AB8:20202124212421FCF8204BFE4800482049FC9124512421FC302048244BFE8102 +5AB9:204023BE22122292FA524AAA4B2448404BFE9222522223FE32224A224BFE8202 +5ABA:2108254825482550F7DE502450145FD450149794549424A824C8549458149022 +5ABB:10783E4822482A86FF7822482A2842104A2884C60200FFFE08201C4003C03C38 +5ABC:100010F810A810A8FCD8248824F82400240049FC295411542954455483FE0000 +5ABD:200021FE212021FCF92049FC4920492089FE480232AA12AA2AAA4A0280140008 +5ABE:1088108813FE1088FDFC248827FE242025FC492429FC11242BFE450485140108 +5ABF:2020204023FC2224FA244BFC4A244A448BFC484030A810B4293C49228222041E +5AC0:2040204027FC2040FBF848804FFC49108A684DC6304013F828E0495886440040 +5AC1:2040202023FE2202F80049FC484048A24B34905850942334305248904B508020 +5AC2:10A0112C11241124FDAC2524252425FC242049FC288810502820445080880306 +5AC3:1020102013FE1020FDFC250425FC250425FC490429FC11042BFE448881040202 +5AC4:100011FE11101120FD7C2544257C2544257C4910291011542952469282500420 +5AC5:21082088209023FCF84049F848404BFE4880910051FC2220342048204BFE8000 +5AC6:1040102013FE1202FC50248825242450248849042AFA10882888448884F80088 +5AC7:100013FE12021000FDFC250425FC250425FC4840282013FE2800448881040202 +5AC8:08202AA42CA84920145022887FFE400282040200FFFE08201C4003800C707008 +5AC9:2020201021FE2100F9204D204B3C495089904B1035FE111029284A2882440482 +5ACA:2020202023FE2020F9FC48204BFE4840488891F0502423FE302249244AA28040 +5ACB:200023DE20422042FBDE4A104A104BDE48429252514A214A325248424A948108 +5ACC:10881050100013FEFC5025FC245427FE245449FC285010D82954465284500050 +5ACD:101E11E010221112FC942480242025CE2502490229CE11022902450285FE0102 +5ACE:2040202023FC2108F8904BFE4A024C44482093FC508020F83088490849288210 +5ACF:2100209E23D22252FA544BD44A584A544BD292125292225A32D44B504A108010 +5AD0:200827C825482548F7FE5554555457D45214922457D4224822485254555488A0 +5AD1:7FFC03000D70710C01007FFC04403FF824483FF80400FFFE08201E4003C03C38 +5AD2:200E23F020442224F9084BFE4A4248404BFE908050FC214431284A104C688186 +5AD3:108010F811081210FDFC25242554258C25044810291211D4291845528592010E +5AD4:2040202023FE2202FC1449E04900490049FC9110511027FE3000489049088204 +5AD5:100011FE1140117CFD90251025FE2528254449FE2820101029444542824A0038 +5AD6:100013FE105011FCFD54255425FC240025FC48002BFE102028A8452482A20040 +5AD7:200023FE2200227CFA444A444A7C4A004AEE92AA52AA22AA32EE4A004BFE8000 +5AD8:100011FC112411FCFD2425FC2440248825F04820284413FE2822452482220060 +5AD9:2420222022202F7EF4805400577C551455109550555C255029505B5050BEA100 +5ADA:200021F8210821F8F90849F848004BFC4A9493FC500021F83090486049988606 +5ADB:7F7848485F4C64805F7844484A4851307F4C0400FFFE08201C4003800C707008 +5ADC:202021FC20882050FBFE480049FC490449FC910451FC202033FE482048208020 +5ADD:1020101011FE1110FD7C251425FE2514257C4910299211542938465482920430 +5ADE:202023FE222022FCFA244BFE4A244AFC8A204AFC32A412FC2AA44CFC84A408AC +5ADF:200023FE22482248FBFE4A484A204BFE4A4092FC53442244327C4A004BFE8000 +5AE0:08203E7E08A47F281C102A2849443FFE210021003FFE2210272040C043308C0C +5AE1:2040202023FE2088F8504BFE4A224AFA4A2292FA528A228A32FA4A024A0A8204 +5AE2:11F87D0811F81108FDF8110829F824904112860E0200FFFE08201C4003C03C38 +5AE3:200027FC20402278FA404FFE490049FC4A0093FC500425543554480448288010 +5AE4:1088108813FE1088FCF8242025FC252425FC48202BFE102029FC442083FE0000 +5AE5:102013FE102011FCFD2425FC252425FC24224BFE280813FE2908448884280010 +5AE6:2020212420A823FEFA0248F84888488848F8902051FC21243124493449288020 +5AE7:102013FE102011FCFC2027FE240025FC250449FC290411FC290445FC84880104 +5AE8:1088108813FE1088FCF8242025FC252425FC482029FC10202BFE445080880306 +5AE9:2108210827C82110F11E57E45554555457D49114539425482948511451148122 +5AEA:200027BC208424A4FA944CA4485049884E2690C0531020643388483048C08700 +5AEB:2110211027FC2110F8004BF84A084BF88A084BF8304017FC28A0491082080406 +5AEC:2040202023FE2200FA484A484BFE4A488A484A48327812002D54452A8A2A1000 +5AED:2040207C204023FEFA424A784BC44A3C8A084AF0332412A82DFE442088A00040 +5AEE:11FC102013FE1222FDAC242025AC240025FC48002BFE108028FC440484280010 +5AEF:08207F20087E7E4408A4FF2810101E28224446828200FFFE08201C4003C03C38 +5AF0:2108210827C82108F11E57D25564554057C89108538825482954511451248142 +5AF1:1020102013FE1020FD2424A827FE240025FC4904297411542974450485FC0104 +5AF2:2040202027FE2490F490549057FC549054D895B855B426D42892589050908090 +5AF3:082049202A3E7F4849485DA86B10492841460400FFFE08201C4003800C707008 +5AF4:102013FE102011FCFD0425FC242025FC248848502BFE102029FC442084200020 +5AF5:2080208021FE2354FD5449544BFE49544954915457FE20003154492A4A2A8000 +5AF6:2090208821FE2110FB104DFE4910491089FE4910311011FE29004AA482520452 +5AF7:2020272025FE2540F57C5690557E5500557C9544557C2644247C54445444844C +5AF8:1088105013FE1020FDFC242027FE252424A84BFE280011FC2904450485FC0104 +5AF9:1088108811FC1088FC8827FE242025FC252449FC292411FC2800448881040202 +5AFA:239C2294239C2294FB9C4A044AF44A944AF4929452F4229432944B344A04820C +5AFB:200023DE225223DEFA524BDE4A224A224AFA9222527222AA33264A224A2A8204 +5AFC:200021FC212421ACF974492449FC482089FC482033FE10002AA44A5284520000 +5AFD:2020202023FE2050FA8A49044BFE4D0449FC910451FC202031244A224CA28040 +5AFE:2020212420A823FEF8A849244A224904890449DE32441554289E490482040404 +5AFF:202021FC202423FEF82449FC48204BFE480091FC512421FC312449FC480083FE +5B00:2004203E27C02244F12853F8520853FC520493FE540226AA2AAA5A0250148008 +5B01:202027A420A82292F9144A084DF448028BF84A08320813F82A0841108FFE0000 +5B02:2110209423D22012FA5049904FFE48104BD29252525423D4324A4A4A4BD68022 +5B03:0BFE104061FC090411FC610405FC090431FCC0880504FFFE08201E4003C03C38 +5B04:202023FE202021FCF8004BFE4A0249FC480091FC510421FC310448884BFE8000 +5B05:108813FE10881000FDFC24A824A827FE24A848A829FC10202BFE442084200020 +5B06:204020A0211826E6F00053F8520853F8500097BC508424A4229454A452948108 +5B07:102011FC112411FCFC2027FE240025FC250449FC290411FC290445FC84880104 +5B08:2020202021FC2020FBFE49084B9C49084988963E500023FE309048904912820E +5B09:102013FE102011FCFC0025FC250425FC24884BFE280011FC2904450485FC0104 +5B0A:0440FFFE044017D0F01217DC3452D7D2100E0400FFFE08201C4003800C707008 +5B0B:200023DE22522252FBDE480049FC492449FC912451FC202033FE482048208020 +5B0C:101811E0104013FEFC88257426522470240049FC29041174295445748504010C +5B0D:2108254825482550F7DE501457E4501457D4911457D4210821085FD450248042 +5B0E:2200220823A824A8F93E57C85548555C554897C852BE228022825482547E8800 +5B0F:203C23E0212420A8FBFE48A849244A0249FC9124512421FC3124492449FC8104 +5B10:1020102010501088FD0426FA2400240025DC4954295411DC2888448885540222 +5B11:2040202021FC2088F8504BFE480049FC490491FC510421FC30204A944A8A847A +5B12:1020105010881174FE0225FC252425AC252449FC280010F8288844F8848800F8 +5B13:2108220827C82450F7DE546457D45214511497D4521423C822485454555488A2 +5B14:22002208238824A8F93E57C85548557E554897C852BE228022A25492547E8800 +5B15:100011FC115411FCFC2025FC242027FE2488485029FC10202BFE442084200020 +5B16:00407C2045FC44887C5043FE7C20A5FC24203C200200FFFE08201C4003C03C38 +5B17:202023FE200023FCFA044AF44A944BFC480091F8510821F8310849F8480083FE +5B18:20882448225020FCF82048504E944A388A504A98323412542A904A2085FE0800 +5B19:2020202023FE2124F9244AAA4FFE480049FC9104517421543174490449FC8104 +5B1A:202023FE22882250FBFE4A504AFC4A548BFE4A5432FC12502AD84D5486520850 +5B1B:200023FC22942294FBFC48004FFE48004BFC920453FC20A231144B084D448182 +5B1C:10207E20243EFF4200947E1042287E2842447E820200FFFE08201C4003C03C38 +5B1D:208023F8220823F8FA084BF84A004BFC8A004BFC304413FC28A0499486C80086 +5B1E:208823FE208821FCF8204BFE482049FC492491FC512421FC30204BFE482087FE +5B1F:2104208823FE2020F9FC48204BFE48544992909053FE209030D44B8A489681A2 +5B20:10F81088108810F8FC0025DC2554255425DC48202BFE107028A8452482220020 +5B21:203C23C020442224F10857FE544252A4528A947A508020F8210852905060879E +5B22:2080204027FE2110FA084D144BF849104BF8911057FC212833104D4849868100 +5B23:2040202023FE2222F954494A4A3A480049FC915453FE200031FC482048A08040 +5B24:2040202027FE2488F7DE548855DC56AA54889440548825F02420544859FC9084 +5B25:200023DE20422252F94A4A52489049084BFE951051FE211031FE491049FE8100 +5B26:204027FC204023FCF00057FE500253F8504097FE500027FE200857FE54A88798 +5B27:204023F8204827FEF8484BF848404FFE480092A4545223F832A84AA84FFE8000 +5B28:2108209023FE2108F9084A524B9C49088A524BDE304010A42AAA4A8A84780000 +5B29:2140224C22642244FB4C4A644AA44BAC8AA44AA437FE10002910490882040404 +5B2A:2040202023FE2202F9FC49484A5049FC4B0491FC510421FC310449FC48888104 +5B2B:208822AA22DC2488F9544A2248004BFE8A22482033FE107028A8492486220020 +5B2C:200021FC202023FEFA2249AC482049AC480093FE502021FC315449544954810C +5B2D:200027FC22482444FFFE544456EC555456EC944456EC255426EC544454548408 +5B2E:3FFE28882F8A20082FBE28882F88289429A220803FFE2208271040E0431C9C02 +5B2F:20402FFE204027FCF00053F852085FFE580297FC511023F8204057FC50408FFE +5B30:3EF822883EF822883EF822883EF8145022880400FFFE08201C4003800C707008 +5B31:420C2FB082204FA00ABE2FA84AA8CFA842285FA84248FFFE08201C4003C03C38 +5B32:0000F93EA92AA92AF93EAFAAAAAAFABE42904490FABE491249124A92ACAA1044 +5B33:108813FE10A81090FDFE272025FC252025FC492029FE11002BFC44888070038E +5B34:0100FFFE20003FF800003FF820083FF8010079384FA87AA84AB8792A4AAA9C46 +5B35:21082110223E2222F4BE5722513E520854BE97AA502A20AA256A552E54088008 +5B36:104010F8108810F8FC8824F8240025FC252449FC292411FC280047FE84880108 +5B37:2040202027FE2488F7DE548855DC56AA54889440549025202448548455FC8884 +5B38:202023FE2202241CFBE0492448A84BFE4924920255FC212431FC492449FC8104 +5B39:220024EC24A424A4F6EC54A454A456EC54A494A45FFE20002110510852048404 +5B3A:23FE224823FE2248FA204BFE4A404AFC8B444A7C320013FE28404AA4828A047A +5B3B:202023FE202021FCF8004BFE4A524BFE490491FC510421FC310449FC48888104 +5B3C:220225E224A226AAF52A566A510A528A544A9BAA510A27CA2122554251EA8E04 +5B3D:23FA22AA23FA2002F7FE540055FC555455FC940057FE204027FE50A051188606 +5B3E:2108210827CE2112F12457DE5552555E57D2911E5392255E2940511451128122 +5B3F:2110211027FC2110F1F0520852EA56AC52A892AA56EA2A06200052A452528452 +5B40:21FC202023FE2222F9AC482049AC4800489E93F2509E21D232BE4C92489E8092 +5B41:3FF801007FFE41029D7401001D7000003BB82AA83BB80400FFFE082007C07838 +5B42:221023DE25282084FBF84A084BF84A088BFA4A243298130628004BFC82940FFE +5B43:204027FC200023B8FAA84BB849104FFC491097FC511027FE31284B104D488186 +5B44:23DE225223DE2252FBDE4A224AFA4A224AFA92AA52FA22AA32FA4A724AAA8226 +5B45:2148214C22AA2008F7FE51485368514A536A914C536C2148216A539A50268042 +5B46:23DE225223DE2252FBDE4A524BDE498C4A52904057FE20883190486048D88304 +5B47:2108229423DE26B4FBDE4A944BDE4A944BDE921057FC21083090486049988606 +5B48:222223FE209021FEFB104DFE491049FE491091FE510023FE328A4B764A528276 +5B49:208823FE208823DEFA524BDE48A0489049FE912053FC252031FC492049FE8100 +5B4A:202023FE224823FEFA484AEC4B5A4A488A504BDE325013DC2A504DDE84500850 +5B4B:23DE200023DE2252FB5A4A5248204BFE4A5093FE525223FE32924ADC4A9284CE +5B4C:210447C88812F3BC20084B92F83E0380AAAAABAA0200FFFE08201C4003C03C38 +5B4D:27BC24A427BC2000F7FE54005590549E57D4956455D4255425D455685BC89054 +5B4E:23FE220223FE2292FA544A924AFE4AAA4AFE932252FA22AA32FA4A224DFA8004 +5B4F:208823FE208823DEFA524BDE4A524BDE4A2293FE52AA22FA32224A724AAA8224 +5B50:00007FF800100020004001800100FFFE01000100010001000100010005000200 +5B51:00007FF800100020004001840118016003801D00E10041000100010005000200 +5B52:00007FF80010002000400180010001FE01000100010001000100010005000200 +5B53:00007FF800100020204011800900050003000100018001400130010C05000200 +5B54:00407E4002400440084008400A400C403840C8400840084208420842283E1000 +5B55:00003FF008100820083C100417C4205440880100FFFE01000100010005000200 +5B56:00007EFC02040408081008200A200DFE3820C820082008200820082028A01040 +5B57:020001007FFE400280041FE0004000800100FFFE010001000100010005000200 +5B58:04000400FFFE0800080013F810103020504097FE104010401040104011401080 +5B59:00207E2002200420082008A80AA40CA43922C9220A2208200820082028A01040 +5B5A:00F87F0022101110112000001FE0004000800100FFFE01000100010005000200 +5B5B:010001003FF8010001007FFE400280040FE000400080FFFE0100010005000200 +5B5C:0040FC400440088010FE1108168818883088D050105010201050108851042202 +5B5D:020002083FD002200240FFFE010002003FE0104020805FFC8080008002800100 +5B5E:00001FE0004000800100FFFE0100010005000200091049084824482487E00000 +5B5F:00001FE000400180FFFE01000100050002003FF82448244824482448FFFE0000 +5B60:00003FF800087FC800083F8820883FA800103FE000800100FFFE010005000200 +5B61:00207E2002200440084808840BFE0C823800C8FC088408840884088428FC1084 +5B62:0080FC8005FC0904120415F4151419143114D1F4110411281112110250FE2000 +5B63:00701F80010001007FFC054009203118CFE600400080FFFE0100010005000200 +5B64:0008F83C0BD01290229022902A9032902290E288228822C822A424D4A4924800 +5B65:10001000FEFC2244642818102428C2C600003FE000800100FFFE010005000200 +5B66:22081108111000207FFE400280041FE000400180FFFE01000100010005000200 +5B67:0820102022FC7C24082412447F54008801003FE000800100FFFE010005000200 +5B68:00001FE000800100FFFE0100010005007A7C080810101EFEF010101050502020 +5B69:0020FC1004100BFE10201042148419F83010D02210C413081010102850C42302 +5B6A:02000100FFFE0440145014482444444400003FE000800100FFFE010005000200 +5B6B:000CFDF004200844108811F01420184431FED022102010A81124122250A02040 +5B6C:7FFC008003600D1871040100100010FCFE042208221064FE141008103450C220 +5B6D:0000FDFC0504090411FC1104150419FC3104D10411FC10001088108451022202 +5B6E:0040FC2007FE0A02100011FC1400180033FED020112811241222142250A02040 +5B6F:00007EFC48447E4442287E1048287EC600003FE000800100FFFE010005000200 +5B70:10400840FF4000407EF842487E4801487EC8044808680E5AF88A088A29061202 +5B71:3FFC20043FFC200023F020203FFE204020C02FBE210423885E7E42088A280410 +5B72:0000FDFE04480848104811CE150219023102D1CE104810481048104853FE2000 +5B73:082004407FFC12483CF0082014503EF800003FE000800100FFFE010005000200 +5B74:1FE00040FFFE010003007C7C08081EFEF010105030201FF010101FF010101FF0 +5B75:200ECEF08A22AA92AA54EE00AA7CAA08AA10AA10EEFEA8102810481048508820 +5B76:0820FFFE082012483CF0082014503EF800003FE000800100FFFE010005000200 +5B77:08203E7E08A47F281C102A2849443FFE200023F0202020402FFE404041408080 +5B78:0A803138228838382288393822887FFE4002BFE400800100FFFE010005000200 +5B79:3E1022FE3E4420287EFEA2103EFC221000003FE000800100FFFE010005000200 +5B7A:0000FDFC04200BFE122211AC142019AC3000D3FE102011FC115411545154210C +5B7B:0020FDFC04240BFE102411FC14201BFE3000D2A4145211FC1154115457FE2000 +5B7C:52107EFE28447E28A2FE3E1020103E7C22103E1000001FE00040FFFE01000300 +5B7D:0820FFFE28207DFC44887C5041FE7C2045FC7C2000001FE00040FFFE01000300 +5B7E:03DEFA520BDE125223DE22522BDE318C2252E04027FE208821902060A0D84304 +5B7F:210447C88812F3BC20084B92F83E0380AAAAABAA00001FE00040FFFE01000300 +5B80:0200010001007FFE400280040000000000000000000000000000000000000000 +5B81:0200010001007FFE4002800400003FF801000100010001000100010005000200 +5B82:0200010001007FFE4002800400000FE0082008200820102010222022401E8000 +5B83:020001007FFE4002800408000808083009C00E00080008040804080407FC0000 +5B84:0200010001007FFE4002820402001FE0022002200420042008221022201E4000 +5B85:020001007FFE40028004002003F03E00020003FCFE0002040204020401FC0000 +5B86:020001007FFE400280043FF8000800083FF8200020003FFC0004000400280010 +5B87:020001007FFE400280043FF8010001000100FFFE010001000100010005000200 +5B88:020001007FFE4002804400400040FFFE00400040104008400840004001400080 +5B89:020001003FFC2004420802000200FFFE0420082018400640018002600C107008 +5B8A:0200010001007FFE40028104012001107FFC010002800280044008203018C006 +5B8B:020001007FFE40028104010001007FFC03800540092011102108C10601000100 +5B8C:020001007FFE400280041FF0000000007FFC044004400440084408441044603C +5B8D:020001007FFE40028204010000800000FFFE0000044004200810100820044004 +5B8E:020001007FFE4002800400F03F0001000100FFFE01000280044008203018C006 +5B8F:020001007FFE4002820402007FFC04000480088009001100222044108FF80408 +5B90:020001007FFE40028404040007F00810081014202220014000400080FFFE0000 +5B91:020001007FFE4002882408203FF8082008200820FFFE08201020102020204020 +5B92:020001007FFE4002800400F83F00010001F83F00010001FC7F020102010200FE +5B93:0200010001007FFE400281040090089048244842488289020E101810E7F00000 +5B94:020001007FFE4002820401007FFC0100010001003FF8010001000100FFFE0000 +5B95:020001007FFE4002800400007FFC0400040008001FF82808C80808080FF80808 +5B96:020001007FFE400280047E10021002103E10202040287E24024402FE14420800 +5B97:0200010001007FFE400280041FF0000000007FFC010011101108210445040200 +5B98:020001007FFE400280041FF0101010101FF0100010001FF8100810081FF81008 +5B99:020001007FFE4002810401003FF82108210821083FF82108210821083FF82008 +5B9A:020001007FFE4002800400003FF801000100110011F811001100290047FE8000 +5B9B:020001007FFE400290041EF812882288228852A88C90048208821082207E4000 +5B9C:020001007FFE400280041FF0101010101FF0101010101FF010101010FFFE0000 +5B9D:020001007FFE4002800400007FFC0100010001003FF8010001200110FFFE0000 +5B9E:020001007FFE4002888404800480108008800880FFFE01400220041018086004 +5B9F:020001007FFE4002810401003FF801001FF001007FFC0280044008203018C006 +5BA0:020001007FFE4002842404100410FFFE04800888089010A010C220824182867E +5BA1:020001007FFE410281043FF8210821083FF8210821083FF82108010001000100 +5BA2:020001007FFE400288040FF010202C4003801C70E00E1FF0101010101FF01010 +5BA3:020001007FFE400280043FF800001FF010101FF010101FF010100000FFFE0000 +5BA4:020001007FFE400280043FF8040008201FF0011001003FF801000100FFFE0000 +5BA5:020001007FFE420282047FF804000FF018102FF048108FF00810081008500820 +5BA6:020001007FFE400280043FF8210021003FF02010201020103FF0210021003FFC +5BA7:020001007FFE400280043FFC2080208027F82408240827F8208020803FFE0000 +5BA8:020001007FFE4002800404404448245024600C403460C852084A1042203E4000 +5BA9:020001007FFE410291140920054001007FFC0540092011102108C10601000100 +5BAA:020001007FFE4002810411001FF821000100FFFE04400440044008423042C03E +5BAB:020001007FFE400280041FF0101010101FF000003FF82008200820083FF82008 +5BAC:020001007FFE4002809400883FFC208020883E88225022502A244454418C8604 +5BAD:020001007FFE400280043FF80408FFFE04083FF808001FF8280848088FF80808 +5BAE:020001007FFE400280041FF0101010101FF0020004003FF8200820083FF82008 +5BAF:020001007FFE4002810C1FD00120FFFE01001FF0082030C0CFFC008002800100 +5BB0:020001007FFE420281043FF8000008200440FFFE010001007FFC010001000100 +5BB1:020001007FFE40028884088010FE11403240547C90401040107E104010401040 +5BB2:020001007FFE400280041FF0101010101FF00100FFFE054009203118C1060100 +5BB3:020001007FFE400281043FF801001FF00100FFFE01001FF0101010101FF01010 +5BB4:020001007FFE40029FF410101FF010101FF00400FFFE08201C4003800C703008 +5BB5:020001007FFE40029114092001001FF010101FF010101FF01010101010501020 +5BB6:020001007FFE400280047FFC02000D08719002A00CC071A006981886E2800100 +5BB7:020001007FFE400280F43F00111009200100FFFE0380054009203118C1060100 +5BB8:020001007FFE400280043FF820002FF020003FFC248824504420451886060400 +5BB9:020001007FFE4002882411102288044008203018DFF61010101010101FF01010 +5BBA:020001007FFE40029FF4101010101FF00000FFFE09200920112011222122411E +5BBB:020001007FFE4002BFF410104824244803801C70E00E0100210821083FF80008 +5BBC:020001007FFE400280243E2001FE00447E4414C814281410146A2586240243FE +5BBD:020001007FFE400284443FF8044000001FF0101011101110129004821882E07E +5BBE:020001007FFE400280741F80100010001FF810801080FFFE0000084010202010 +5BBF:020001007FFE400288040FFC1040308053F89208120813F81208120813F81208 +5BC0:020001007FFE4002801400F83F001110082001007FFC054009203118C1060100 +5BC1:01007FFE400281047FFC01003FF80108FFFE01083FF8110011F8290047FE8000 +5BC2:020001007FFE400288040F7C08440844FF44002808282A104910892828441082 +5BC3:020001007FFE48028FE4102020405FF8110811081FF8028004A008921082607E +5BC4:020001007FFE420282043FF804800840FFFE00101F90109010901F9000500020 +5BC5:020001007FFE40029FF401001FF0111011101FF0111011101FF0044008201010 +5BC6:020001007FFE40028224094028884B141C10E7F001002108210821083FF80008 +5BC7:020001007FFE400280243E38002000207EF814081450142014542484240443FC +5BC8:01007FFE4102BFFC01001FF00100FFFE00001FF010101FF010101FF010101030 +5BC9:020001007FFE490288841FFC108030805FF8908010801FF8108010801FFC1000 +5BCA:020001007FFE420283F402003FF820083FF820083FF820083FF8082010102008 +5BCB:020001007FFE4822BFFC08203FF80820FFFE10102FE8C82608A00848080807F8 +5BCC:020001007FFE4002BFFC00001FF010101FF000003FF821083FF821083FF82008 +5BCD:020001007FFE4002820409084924482487E000003FF8244824482448FFFE0000 +5BCE:020001007FFE4002840425FC24203C2005FC05247D2425542594250445148508 +5BCF:020001007FFE48028FE410403FF852481428110801007FFC028004401830E00E +5BD0:020001007FFE40028424242025FC3C20042007FE7C6024B02528262644208420 +5BD1:020001007FFE40028BFC080811F8300853F8900017FC140413F8111010E0171C +5BD2:020001007FFE44429FF404403FF80440FFFE082013102088C046060001800040 +5BD3:020001007FFE40029FF411101FF011101FF001003FF8210821482FE824282010 +5BD4:020001007FFE40029FF410101FF010101FF000007FFC110011F8290047FE8000 +5BD5:020001007FFE4002BFFC02003FF8244824483FF80000FFFE0100010005000200 +5BD6:020001007FFE4002A3FC100811F8800843F8500017FC2404E3F8211020E0271C +5BD7:01007FFE420281440880292847E4180061003FF821083FF82108FFFE20082018 +5BD8:01007FFE4102BFFC01001FF010101FF010101FF010101FF01010FFFE08201010 +5BD9:020001007FFE40028004061C38E828A82CA82AA82AA82AA828A455545D748212 +5BDA:020001007FFE4002BFFC01001FF001007FFC10001FF02100FFFE010021083FF8 +5BDB:020001007FFE4822BFFC08201FF010101FF010101FF010101FF004421842E03E +5BDC:020001007FFE41029494142823E800003FF824482448FFFE0100010005000200 +5BDD:01007FFE4002800413F8100891F8500853F8100037FC540493F8111010E0171C +5BDE:01007FFE400284443FF804401FF010101FF010101FF002007FFC04401830E00E +5BDF:01007FFE400290841EF822885450282017D82006DFF001001110210845040200 +5BE0:020001007FFE4102BFFC2108FFFE21083FF811101FF00400FFFE082007C07838 +5BE1:01007FFE4002BFF404001FF010101FF010101FF01010FFFE082037D8C2460CC0 +5BE2:01007FFE4002840424FC2404247C3C0404FC04007DFE250224FC2448443085CE +5BE3:020001007FFE4042842425FC24003CF8040004F87C0024F82488248844F88488 +5BE4:020001007FFE400285FC242024F83C48044805FE7C0024FC2484248444FC8484 +5BE5:01007FFE4002BCFC24481428254806C01830E30E0C403180063038C007003800 +5BE6:01007FFE40029FF41110FFFE22103FF010101FF010101FF010101FF008201010 +5BE7:01007FFE4102949414A823E800003FF82448FFFE00003FF80100010005000200 +5BE8:01007FFE44429FF404403FF80440FFFE082011102FE8C1060920111025080200 +5BE9:01007FFE400280FC3F0011100920FFFE09203018DFF611101FF011101FF01010 +5BEA:01007FFE400280FC7F00221011201FE010201FF010101FFC20042AA44AA4800C +5BEB:01007FFE400282041CF010101EF010101FF008001FFC20044924249424944008 +5BEC:020001007FFE4822BFFC08201FF010101FF010101FF010101FF00452184AE03E +5BED:01007FFE4102BFFC01001FF011101FF011101FF001087FFC02044908482487E4 +5BEE:01007FFE400281047FFC044028281FF02828CFE608200FE00100111025080200 +5BEF:01007FFE490288841FFC30805FF890801FF810801FFC10003E7C224423D42008 +5BF0:01007FFE4002BFFC24483FF80000FFFE00001FF010101FF005081890EA600C1C +5BF1:020001007FFE404289FC490449FC490479FC090409FCF8204BFE48A849248A22 +5BF2:020001007FFE4002A47C3A0422281E1020FE3E124850085E7F5014B0229E4100 +5BF3:01007FFE4082BEFC09243EA809247EA000401FF010101FF010101FF008201010 +5BF4:020001007FFE400288047F7C2244147CFF44087C7F44087C2A28492AA94A1086 +5BF5:0100FFFE88427F7C2240147CFF04007C7F40417C7F40417C7F40417C4542423E +5BF6:01007FFE4082BEFC09203EFC08207EA400FC1FF010101FF010101FF008201010 +5BF7:01007FFE48229D7449245D7449245D7449247FFC00007FFC10101FF00820FFFE +5BF8:0040004000400040FFFE00400040004010400840084000400040004001400080 +5BF9:0010001000107E1002FE02102410149008500850141012102210401000500020 +5BFA:0100010001003FF801000100FFFE002000207FFC082004200420002000A00040 +5BFB:00003FF8000800081FF8000800083FF800200020FFFE08200420042000A00040 +5BFC:00003FF0201020103FF0200420041FFC00200020FFFE08200420042000A00040 +5BFD:000801FC7E0002082108111010400040FFFE0040104008400840004001400080 +5BFE:2010101010100010FEFE04100410489028501050101028102410441080500020 +5BFF:020002007FFC02003FF80400FFFE082008201FFC102024204220822000A00040 +5C00:000800087F884008407E5F0851085148512851285F08510840087F8800280010 +5C01:0808080808087F08087E0808FF080048082808287F08080808080F08F0284010 +5C02:01000100FFFE01003FF821083FF821083FF80020FFFE08200420042000A00040 +5C03:012001107FFC01003FF821083FF821083FF821080020FFFE0820042004A00040 +5C04:080810083E0822083EFE22083E0822082248FE2806280A08120822084A280410 +5C05:08080808FF08080808FE7F08414841287F281408140814282412240243FE8000 +5C06:088008F809084A1028A0284008900B1018102BFEC81009100890081008500820 +5C07:0440247C24C4252824903CA004480588FC0825FE240824882448440884280410 +5C08:01007FFC01003FF821083FF821083FF80104FFFE0022FFFE0820042004A00040 +5C09:00043F84208420843FBE20042F84202420143FD422042A844A4452448A140408 +5C0A:08200440FFFE04403FF82848303827C820083FF80020FFFE0820042004A00040 +5C0B:00003FF000101FF000103FF000003E7C08447F7C0020FFFE0820042004A00040 +5C0C:08080808FF880808087E7F0800087F48412841287F08000822081788F8284010 +5C0D:1408140855083608147EFF080008224814287F2808083E0808080F0878282010 +5C0E:211017FE108003F8F20813F8120813F8120813F8280047FE0020FFFE08200460 +5C0F:0100010001000100010011101108110421042102410281020100010005000200 +5C10:01000100010009200910110811042104410001000000180024000380007E0000 +5C11:010001000100092009101108110421144110012000400080010002000C007000 +5C12:010001000280044008203118C106010009200910110821044104010005000200 +5C13:0800080008001FFC100021004100810001001110110821044102810205000200 +5C14:0800080008001FFC100421084100810001001110110821044102810205000200 +5C15:00003FF008100820083C10041004211441080920091011082104410405000200 +5C16:01000100092009101108210800000104FFFE01000280028004400830300EC004 +5C17:0200020003F8020002000200FFFE010001000920111021084104010005000200 +5C18:01000100092009101108210441040000010001003FF8010001000100FFFE0000 +5C19:010011101108210441043FF82008200827C824482448244827C8200820282010 +5C1A:010021081110092001003FF82008200827C824482448244827C8200820282010 +5C1B:0100010009200910110821044104101010101010545452529292101050502020 +5C1C:010009201110210800000100FFFE02800C603018C10609200910110825080200 +5C1D:01001110092001007FFE400280041FF0000000007FFC0400082010103FF81008 +5C1E:010001007FFC2288145008203FF8D0161FF010101FF001001110210845040200 +5C1F:00103E1022103E5422523E520090FF12080408082F102860298058004FFE8000 +5C20:22102210FF1022103E5422523E5222902210FF1440045408620840107E2000C0 +5C21:100011FC9104550459FC1104FD0429FC2800291229D429182B104D524992810E +5C22:0400040004000400FFFE048004800480048008800880108210822082407E8000 +5C23:04400420081010082004444284420440044004400440084208421042203E4000 +5C24:0420041004100400FFFE048004800480048008800880108210822082407E8000 +5C25:20802080208021F8FD082A082888284828482808280828502822480247FE8000 +5C26:004024402240427C808425042444242424242404240424282412440243FE8000 +5C27:0200020002FC7F20014000840764381C0000FFFE04400440044008423042C03E +5C28:0420041004100400FFFE049004A004C8049008A408C8109210E221824E7E8000 +5C29:000024FC22204220802024F8242024202420242025FC24002402440243FE8000 +5C2A:200023F820402040FC40284029F028402840284028402BF82802480247FE8000 +5C2B:000001FCFE202420242025FC242024202420242027FE24002400440243FE8000 +5C2C:2020202020502088FD042A022888288828882888290829082A0A480247FE8000 +5C2D:010001007FFC010009200820FFFE082008207FFC04400440084010422042C03E +5C2E:200023F820882090FCBC290429142A4828402BFC28E029502A4A484247FE8000 +5C2F:2080208021F82208FDFE2900297829482968295029442A442C3E480247FE8000 +5C30:203C21E0202023FEFC2029FC292429FC292429FC282029FC28204BFE480287FE +5C31:20401050FE48004800407DFE4450445044507C501090549092921112510E2200 +5C32:2088205023FE2050FDFC28542BFE285429FC285028D829542A52485247FE8000 +5C33:20F8208820E820A8FDFC290428F8288828F8288828F82888288848AA489287FE +5C34:2090229022BC22D0FE882A8828002BF82AA82AA82AA82FFE2802480247FE8000 +5C35:202021FC212421FCFC202BFE290429FC290429FC290429FC28884906480287FE +5C36:03E8FE882BCE2A502BE42A822BE0280029FC2954295429542BFE480247FE8000 +5C37:23E8228823CE2250FFE42A822BE0280029FC2954295429542BFE480247FE8000 +5C38:00001FF810081008100810081FF8100810001000100010002000200040008000 +5C39:000000003FF004100410FFFE041004103FF00410040008000800100020004000 +5C3A:00001FF810081008100810081FF8108010801080104010402020201040088006 +5C3B:00003FF8200820083FF8210021002FE0212021202220222044224422881E1000 +5C3C:00001FFC1004100410041FFC10001200120C123013C012022202220241FE8000 +5C3D:00001FF81008100810081FF81048104010202310208840068C00030000800040 +5C3E:00003FFC200420043FFC200020F02F00210021F02F00210021F85F02410280FE +5C3F:00003FF8200820083FF82080208020882ED022E022A024A04490488892840100 +5C40:00003FF8200820083FF8200020003FFC200427E42424242447E4400480280010 +5C41:00003FF8200820083FF820002840284028442F4828502860484449448A440C3C +5C42:00003FFC200420043FFC200020002FFC200020003FFE2100221044084FFC8404 +5C43:00003FFC200420043FFC2000200027FC240424442444244424B4410846049802 +5C44:00003FFC200420043FFC208020402FFE28023124212022102210440848049002 +5C45:00003FF8200820083FF8208020803FFE208020802FF82808480848088FF80808 +5C46:00003FFC200420043FFC2000208028842BE4288428842FF4280448044FFC8004 +5C47:00003FFC200420043FFC200027FC24442444244427FC24442444444447FC8404 +5C48:00003FF8200820083FF820802888288828882FF820803084508450849FFC0004 +5C49:00003FF8200820083FF820902490249024903FFC2490249044F04400840007FE +5C4A:00003FF8200820083FF82080208020802FF8288828882FF8488848888FF80808 +5C4B:00003FFC200420043FFC20002FFC2100221027F8208820802FFC40804080BFFE +5C4C:00003FFC200420043FFC200027FC2404240427FC20402FFE2842484A48448040 +5C4D:00003FFC200420043FFC200020003FFE2420242427A828B0352042224422981E +5C4E:00003FFC200420043FFC2080249022A020803FFC21C022A02490488850868080 +5C4F:00003FF8200820083FF8241022202FF8222022203FFC22204220442084200820 +5C50:00003FFC20043FFC2020242029FE3020222025FC2C8434884450442084D80706 +5C51:00003FF8200820083FF82080249022A02FF828082FF828084FF8480888280810 +5C52:00003FFC20043FFC20002FF828002BF828002FFC2A482A5052205298A3060200 +5C53:00003FFC200420043FFC200027FC240427FC240427FC240427FC411042088404 +5C54:000002FE3C822082208220FE3E8024A024A224A424B82EA0F1224122021E0400 +5C55:3FFC200420043FFC222022203FFC222022203FFC244024442428451046088406 +5C56:00003FFC20043FFC210020802FF8241022203FFC208020804FF8408080800080 +5C57:00083F082108217E3F08204823283C2827083C0827A83C122402440243FE8000 +5C58:00003F7E210221043F082008237E3C0827083C0827883C2A2412440243FE8000 +5C59:00003FFC20043FFC20002EFC2A082AE82CA82AA82AA82AE84AA84E0888280810 +5C5A:00003FFC20043FFC20003FFE20802FFC28842CA42A9428844CA44A948884080C +5C5B:00003FFC200420043FFC210822102F7C221022103F7E22102210441044108810 +5C5C:00003FFC200420043FFC222824A82AA823FE24A82CA834A824B8448044FE8400 +5C5D:00003FFC200420043FFC212021202F3C212021202738212021204F3C41208120 +5C5E:00003FFC20043FFC20002FF820802FF828882FF820803FFC509457F490141008 +5C5F:3FFC20043FFC200024883FFE248824F8240027FC20402FFE415042488C460040 +5C60:00003FFC20043FFC2080208827F020A03FFE208023F826085BF8420883F80208 +5C61:3FFC20043FFC249022A03FFC22A02490288821003FFC2210472040C083300C08 +5C62:3FFC20043FFC20802FF828883FFE28882FF8249027F021005FFE441083E01C1C +5C63:3FFC20043FFC22102410289C3090229025FE2C103490249C44904550863E0400 +5C64:3FFC20043FFC221021202FFC2A9429A42FFC200027F8240847F8440887F80408 +5C65:3FFC20043FFC210029FE320021FC250429FC390429FC288049FC4A8888700B8E +5C66:00003FFC20043FFC2000252428A831FC24A8292438402BFE4888499088700B8C +5C67:3FFC20043FFC244825482BFE354825782D0035FE242027FE44A8452486220420 +5C68:3FFC20043FFC242029FC312423FE25242DFC34A824F8244045FE44888470058C +5C69:3FFC20043FFC220025FC284033FE24882D74365225FC2504457445548574050C +5C6A:3FFC20043FFC20402FFE288227FC21102BFA260C2BFA220843F84040844808C4 +5C6B:3FFC20043FFC200022FE2A202BFE2E4422BA23283EFE2A824ABA4AAA92BA2286 +5C6C:3FFC20043FFC249022A024902FF829482FFC24842FF4349447F440948FF40008 +5C6D:3FFC20043FFC220823F8220823F8211022082FBE28A22FBE48A24FBE851408A2 +5C6E:01000100210821082108210821083FF801080100010001000100010001000100 +5C6F:010001000100FFFE010021082108210821083FF8010001020102010200FE0000 +5C70:101008100820FFFE010001002108210821083FF802080400040008003000C000 +5C71:01000100010001002108210821082108210821082108210821083FF800080000 +5C72:0008007C078078000100010001002108210821082108210821083FF800080000 +5C73:060001000280044008203118C10601002108210821082108210821083FF80008 +5C74:010001002108210821083FF8020002007FF80208040804080808100820504020 +5C75:01002108210821083FF8000000003FFC20002000200020002000400040008000 +5C76:010001002108210821083FF8000000007FF8040804080808080810082050C020 +5C77:1000100013F810885490549054A054BC5484548455045D046504020402280410 +5C78:1000100011FC102054205420542054205420542054205C206420002003FE0000 +5C79:10401040108010FE5500560054FC54085410542054405C806502010200FE0000 +5C7A:1000100011F8100854085408540855F85508550055005D006502010200FE0000 +5C7B:1000100011FC104454445544554455445544564454445C846484010402280410 +5C7C:1000100013FC109054905490549054905490549054905C9265120112020E0400 +5C7D:100011FC1020102054205420542057FE5420542054205C206420002000200020 +5C7E:102010201020102055245524552455245524552455245D24652401FC00040000 +5C7F:104010401040107E54405480548054FC5404540454045DF46404000400280010 +5C80:0100010021082108210821083FF80000010041044104410441047FFC00040000 +5C81:01002108210821083FF80200020007F00810141022200140008003001C00E000 +5C82:01002108210821083FF8000000003FF00010001000103FF02000200420041FFC +5C83:01002108210821083FF8000000003FF802081208120822080408080810506020 +5C84:100010FC10841084548454FC54845484548454FC54845C846504010402140408 +5C85:1008101C11E01100550055FC554455445544552855285D106510022802440482 +5C86:1008103C11E010205420542057FE54205420545054505C506488008801040202 +5C87:01002108210821083FF800000C0070FC4084408440844C847094408800800080 +5C88:100011FE1008108854885488550855FE5418542854485C886508020800280010 +5C89:10801080108010FC55545654545454945494552456245C446444008401280010 +5C8A:00003FF8210821083FF82000200220021FFE010001002108210821083FF80008 +5C8B:100013FC1084108854885490549C54845544554455285D286610022804440182 +5C8C:0100210821083FF800003FF0082008400CF80A08111010A0204020A043188C06 +5C8D:100011FC1088108854885488548857FE5488548854885C886488010801080208 +5C8E:101010901090108855085504560455FA5488548854885C886508010802280410 +5C8F:100011FC10001000540057FE549054905490549054905C9265120112020E0400 +5C90:10201020102013FE54205420542055FC5484548854485C506420005001880606 +5C91:0100210821083FF80100028004400A203118C1061FE000200040004000800100 +5C92:10201020105010505488554456225420540055FC54045C086408001000100020 +5C93:1008101C10E010805480548054FE54885488548854885C886508010802080408 +5C94:0440082010102FE8C4260420082010A06040010001002108210821083FF80008 +5C95:01002108210821083FF801000280044008203458C44604400440084008401040 +5C96:100011FE1100110455445528552855105510552855285D446584010001FE0000 +5C97:0100210821083FF800003FF82008204824482288210822882448280820282010 +5C98:100011FC1104110455245524552455245524555454505C90649001120212040E +5C99:001000F83F00010002007FFC044008203018C10601002108210821083FF80008 +5C9A:0100210821083FF800001FF0101010501450129011101292244A284A40068002 +5C9B:010002001FF0101012101150102010001FFC0204222422243FE4000400280010 +5C9C:0100210821083FF800003FF82108210821083FF820002002200220021FFE0000 +5C9D:0100210821083FF8080008001FFC2400440087F00400040007F8040004000400 +5C9E:10801080108010FE554055405640547C5440544054405C7E6440004000400040 +5C9F:10201020102011FC5524552455245524552457FE54205C506450008801040202 +5CA0:100010FE10801080548054FC548454845484548454FC5C806480008000FE0000 +5CA1:00007FFC40044824442444445FF4410441044924492449244FE4400440144008 +5CA2:0100210821083FF800000000FFFE001000101F90109010901F90001000500020 +5CA3:10801080110011FC5604540455E455245524552455E45D246404000400280010 +5CA4:20402020202023FEAA02AC04A800A890A890A890A888B908C908010402040402 +5CA5:10101010101011FE55125514551055FC5544554455285D286510022802440482 +5CA6:01002108210821083FF80200010001007FFC00001010082004400000FFFE0000 +5CA7:0100210821083FF800007FF80408080810502020DFF81008100810081FF81008 +5CA8:100010F810881088548854F854885488548854F854885C886488008803FE0000 +5CA9:01002108210821083FF8000000007FFC040004000FF818082808C8080FF80808 +5CAA:0100210821083FF804403FF8044804481FF8144024403FFC0844105420484040 +5CAB:102010201020102055FC552455245524552455FC55245D246524012401FC0104 +5CAC:100011FC11241124552455FC55245524552455FC55245C206420002000200020 +5CAD:1020102010501050548855245612541055FC540454085C886450002000100010 +5CAE:10201010101011FE5502560454805488549054A054C05C8264820082007E0000 +5CAF:100011FE1010101054205420546854A45522562254205C206420000003FE0000 +5CB0:2010209020902110A97EAA52AB92A892A912A912AA52BBD2C8620022004A0084 +5CB1:089008881080309E57E0908010441034110C010021082108210821083FF80008 +5CB2:100011FC110411045504550455FC54505450545054505C9264920112020E0400 +5CB3:00701F80100010001FF8108010801080FFFE010001002108210821083FF80008 +5CB4:1008101C10E0108054805480548054FE5488548854885C886488008801FE0000 +5CB5:102010201020102055FE54205420542055FC550455045D046504010401FC0104 +5CB6:10201020104011FC550455045504550455FC550455045D046504010401FC0104 +5CB7:100011FC11041104550455FC5520552055FE552055205D106512014A01860102 +5CB8:0100210821083FF800003FFC20002FF8208020803FFE20804080408080800080 +5CB9:100013FC108410845484550455145608540055FC55045D046504010401FC0104 +5CBA:0100210821083FF8010002800C603218C1061FE0002000400C80030000800040 +5CBB:1004101E11F0111055105510551055FE5510551055105D08650A014A01A60112 +5CBC:100011FC10201020552454A454A8542057FE542054205C206420002000200020 +5CBD:0100210821083FF8020002007FFC0400090011003FF801001110210845040200 +5CBE:1020102010201020543E54205420542055FC550455045D046504010401FC0104 +5CBF:0100210821083FF8000008004BF848084808480849F848084808100813F82008 +5CC0:01002108210821083FF80000010001003FF8210821083FF8210821083FF82008 +5CC1:0100210821083FF800000C0070FC4084448444845C8464944888088010806080 +5CC2:10401040107C108455885650542054505488570654605C10640800C000200010 +5CC3:020821081110102000007FFE400281040100210821082108210821083FF80008 +5CC4:100013FC110410885450542054D85726542055FC54205C2067FE002000200020 +5CC5:1020102010401088550457FE54025488548857FE54885C886508010802080408 +5CC6:10201020105010885504560255FC5400540055FC55045D046504010401FC0104 +5CC7:0100210821083FF8010002800C603018CFE600001FF01010101010101FF01010 +5CC8:2080208020F82108AB10ACA0A840A8A0A918AA06ADF8B908C908010801F80108 +5CC9:0100210821083FF808000FF010202C4003801C70E00E1FF0101010101FF01010 +5CCA:040008003FF0201020103FF020003FF8200820083FF80100210821083FF80008 +5CCB:1080108011FC1104560455E45524552455E4552455245DE46504000400280010 +5CCC:100011FE102010405488550455FE54225420542055FE5C206420002003FE0000 +5CCD:2020202021FC2024ABFEA824A9FCA820A820A9FCA820B820CBFE002000200020 +5CCE:0100210821083FF800003FF020103FF020103FF02208211020A024402830300E +5CCF:100013FE10201020544055FC555455545554555455545D546554014401140108 +5CD0:10201010101013FE54205442548455F85410542254C45F086410002800C40302 +5CD1:0100210821083FF801000280044008203018CFE6010001001FF0010001007FFC +5CD2:100011FE11021102557A55025502557A554A554A554A5D7A65020102010A0104 +5CD3:1020102013FE102055FC542455FC552055FE5422542A5C546450008801040202 +5CD4:10401040104411F45448545057FE54405480558456985CE064820082007E0000 +5CD5:0100210821083FF802000100FFFE00001FF0101010101FF0101010101FF01010 +5CD6:20402020202023FEAA02AC44A840ABFEA888A888A908B8D0C820005000880304 +5CD7:1040104010FC1104560855FE5500557C5544554455545D4865420242023E0400 +5CD8:100013FE1000100055FC5504550455FC5504550455FC5D046400000003FE0000 +5CD9:10201020102011FC5420542057FE5408540855FE54085C886448000800280010 +5CDA:0100210821083FF8000002007FFC04401830E10E01001FF0010001007FFC0000 +5CDB:0100210821083FF800047F84082408241F24212451240A24040408043014C008 +5CDC:0100210821083FF801000280044008203118C10609F00900090009007FFC0000 +5CDD:0100210821083FF800003FF820082FE8200827C82448244827C8200820282010 +5CDE:0100210821083FF808001FE020205FFC900017F0141014542424240443FC8000 +5CDF:0100210821083FF8040004007FFC08001FF028104FF088100FF0081008500820 +5CE0:10201020103E1020542055FE5400540055FE542054285C246422002000200020 +5CE1:10201020102011FC5420552454A454A8542057FE54505C506488008801040202 +5CE2:2002200227E2210AA90AA9EAA92AAA2AAB2AAAAAAC4AB84AC8820102020A0404 +5CE3:1080108010BC13C05450542454D4570C540057FE54905C9065120112020E0400 +5CE4:1008103C11E01020542057FE545054885504568A54885C886488010801080208 +5CE5:1080108010F81108561055FC5424542455FE542454245DFC6424002000A00040 +5CE6:02000100FFFE044014501448244444440100010021082108210821083FF80008 +5CE7:10401020102013FE54005488550456025488548854505C506420005000880306 +5CE8:101010D813941094549057FE54905494549454D857985C9064AA00CA02860102 +5CE9:010041047FFC0000064038500848FFFE084008400E2478280812082A28C61302 +5CEA:10001050104810845524542054505488550656F854885C886488008800F80088 +5CEB:200027DE20922292AA94AA94ABD8A894A992A992AA92BA9ACC94089002900110 +5CEC:1028102413FE1020542055FC5524552455FC552455245DFC652401240124010C +5CED:1020112410A410A8542055FC5504550455FC550455045DFC6504010401140108 +5CEE:200023F820882088AFFEA888A888ABF8A900A900ABF8BD08C908010801F80108 +5CEF:010041047FFC08001FF0282007C01830E10E1FF001001FF001007FFC01000100 +5CF0:1040104010FC10885550542054D8572654F8542054F85C2067FE002000200020 +5CF1:000045FC2824102429FC484488440BFE18002820482089240924092451FC2004 +5CF2:0100210821083FF800000608780808480848FF481C482A484948880808280810 +5CF3:0100210821083FF8000010401040247E24886488A54824502420205020882306 +5CF4:100011FC1104110455FC5504550455FC5504550455FC5C50645000920112020E +5CF5:2040202023FE2202AC44A840ABFEA840A890A890A910B920CA24024204FE0842 +5CF6:020004001FF010101FF010101FF010001FFC10001FFC020422243FE400280010 +5CF7:0100210821083FF8020001003FF808200440FFFE010001007FFC010001000100 +5CF8:2028202420242020ABFEAA20AA24AA24ABA4AAA8AAA8BA90CA9205AA04460882 +5CF9:010002800C603018CFE601003FF801001110250802000100210821083FF80008 +5CFA:100013FE1020102055FC5524552455FC5524552455FC5D2064A0004000B0030E +5CFB:2040204020882104ABFEA802A888A944AA42A8F8A988BA50C820005001880606 +5CFC:10201120112011FC55205620542057FE5400540055FC5D046504010401FC0104 +5CFD:10201020102013FE5420542055245524552456AA54205C506450008801040202 +5CFE:200C11F08100490009FE1110E11022102210251001002108210821083FF80008 +5CFF:100013FE1040104055FC5484548457FE5400540055FC5D046504010401FC0104 +5D00:0100210821083FF8020001001FF010101FF010101FF011081090126014181806 +5D01:0100210821083FF81080108010FC7D041248104010401CA0E0A0411002080C06 +5D02:2088208823FE2088A800ABFEAA02AC44A840ABFCA844B884C884010402280410 +5D03:20402040204027FCA840AA48A948A950AFFEA8E0A950B950CA48044408420040 +5D04:10201020105010505488550456FA54005444542455245CA86488001003FE0000 +5D05:10401040107C1084550856FE5492549254FE549254925CFE64920112010A0204 +5D06:20402020202023FEAA02AC94A908AA04A800A9FCA820B820C820002007FE0000 +5D07:0100210821083FF8020001007FFE40029FF400007FFC01001110210845040200 +5D08:020001007FFE40029FF400007FFC11102108450402000100210821083FF80008 +5D09:1020102213B410A854A8552456A2544055FC550455045DFC6504010401FC0104 +5D0A:2088208820882088ABDEA888A888A99CA9DCAAAAAAAABCC8C888008800880088 +5D0B:0100210821083FF800007FFC11101110FFFE111011107FFC0100FFFE01000100 +5D0C:100011FE1102110255FE5510551055FE55105510557E5D4265420242027E0442 +5D0D:10201020102013FE542055245524552456AA547054A85CA86524022204200020 +5D0E:1020102011FC10505488550457FE540855E8552855285DE86528000800280010 +5D0F:201C23E0222023FEAA20AA92AB0AAA06A9FCA904A904B9FCC904010401FC0104 +5D10:100011FC1104110455FC5504550455FC5400551255D45D18651001520192010E +5D11:0100210821083FF800001FF810081FF810081FF82080208C3EF020822682387E +5D12:0100210821083FF8020001007FFC0820145022880100FFFE0100010001000100 +5D13:200023FE22222222ABFEAA22AA22AAFAAA8AAA8AAA8ABAFACA8A020203FE0202 +5D14:010041047FFC090008801FFC108030805FF8908010801FF8108010801FFC1000 +5D15:100011FE11101110557C5510551055FE5500551055105D7C6510021002FE0400 +5D16:0100210821083FF800003FFC20802FF820803FFC200020804FF840809FFE0000 +5D17:0100210821083FF800007FFC482444445FF441044924492449244FE440144008 +5D18:1020102010501088550456FA540055FC5554555455FC5D54655401540104010C +5D19:0100210821083FF802800C6037D8C0063FF8248824883FF82488248824A82010 +5D1A:2020202021FC2020A820ABFEA888A944AA42A8F8A988BA50C820005001880606 +5D1B:200023FE22022202ABFEAA10AA92AA92AA92AAFEAA10BA92CA92049204FE0802 +5D1C:2008203C21E02020ABFEA8A8A8A8A8A8ABFEA8A8A8A8BBFEC820002001FC0000 +5D1D:1020102013FE102055FC542057FE540055FC550455FC5D0465FC010401140108 +5D1E:2040202023FE2000A9FCA904A9FCA800A9FCA808A810BBFEC820002000A00040 +5D1F:0100210821083FF8010002800C603018CFE6010001003FF811100920FFFE0000 +5D20:1020102013FE102055FC552455FC552455FC542054705CA86124062200200020 +5D21:200021FC20082010AA22AAAAAA72AA22AA72AAAAAB26BAA2CA42020203FE0002 +5D22:101E13E011221094540055FC5424542457FE542454245DFC6424002000A00040 +5D23:010041047FFC00701F8001007FFC05401930E10E04007FFC08201C4003807C78 +5D24:21842068203020C8AB24A820ABFEA840A8FCA984AAFCB884C8FC008400940088 +5D25:1040108011FC1124552455FC5524554455FC549055105FFE6410001000100010 +5D26:2040208027FE2110AA48AC46ABF8AA48AA48ABF8AA48BA48CBF800420042003E +5D27:0100210821083FF8101010901090FD0831483A44544250909088110813FC1104 +5D28:1020102013FE102055FC542457FE542455FC542055205D3E652002A0027E0400 +5D29:0100210821083FF800003E7C224422443E7C224422443E7C224422444A948508 +5D2A:1040102013FE100054885488555456225400542057FE5C206420002000200020 +5D2B:0100210821083FF800003FF820083FF820802490249027F02080488848888FF8 +5D2C:0100210821083FF80100FFFE01003FF821083FF821083FF803800D603118C106 +5D2D:0100210821083FF81000100CFEF0208048807EFE08880E88F888490809080A08 +5D2E:0100210821083FF800003FF8210821082FE8210827C8244827C820083FF82008 +5D2F:10201020105010885504560254F85420542055FC54205D2464A400A803FE0000 +5D30:1092109211241248552454925492540055FE552255225DFE6522012201FE0102 +5D31:0100210821083FF800003F0421243F2421243F24212421243F24120421144088 +5D32:1020104011FC110455FC550455FC540057FE542054205DFC6420002003FE0000 +5D33:204020A021102208ADF6A800ABC4AA54AA54ABD4AA54BA54CBD40244025402C8 +5D34:0100210821083FF8002800243FFE20202FA422242FA824982D12422A45468882 +5D35:100010FC108410FC548454FC540055FE548054FE552A5E4A6492012200540088 +5D36:0100210821083FF8080008087F0808FEFF08084808287F2808080F08F0284010 +5D37:10881048105013FE5450545055FC55545554558C55045DFC6504010401FC0104 +5D38:100013FE1020104055FC5504550455FC550455FC55045D0465FC000000880104 +5D39:2040202021FC2000A888A850ABFEAA22AC24A9FCA924B924C934012800200020 +5D3A:0100210821083FF820401040FEFE212020AC3CB425E424AC24A044A25482887E +5D3B:211021102210247CA910A910AAFEAE08AA08AAFEAA08BA48CA28020802280210 +5D3C:100011FC1104110455FC5504550455FC540057FE54205D20653C012002A0047E +5D3D:0100210821083FF800001FF0111011101FF0111011101FF001004884481287F2 +5D3E:200023FE20502050ABFEAA52AA52ABFEA800A840AFFEB888C990006000D80304 +5D3F:100011DC1154115455DC540055FC540057FE548054FC5C046404000400280010 +5D40:0100210821083FF80000084008207EFC082018201CFC2A202A20482089FE0800 +5D41:1088108813FE108854F8548854F85488548857FE55005D486584010001FE0000 +5D42:0100210821083FF8004013F8204847FE884813F8304053FC904017FE10401040 +5D43:1020101011FE10005484544855FE55085510556455085D1265640208023004C0 +5D44:2104208823FE2020A820A9FCA820A820ABFEA800A820BBFEC820005000880306 +5D45:0100210821083FF8002800243FFE20202FA420242FA8289828924FAA40468082 +5D46:0C487044104013FEFC503890549091121212110E01002108210821083FF80008 +5D47:08481C44F04013FE1050FC5010923892350E5420502091241124112411FC1004 +5D48:203C27C022442128A800ABFCA880A880AFFEA900A9F8BA88CA50042008D80306 +5D49:2040202023FE2000A9FCA904A9FCA800ABFEAA02A9FCB820C820002000A00040 +5D4A:203823C0204027FCA950A954AF58A954AB54AD4CA8E0B950CA48044408420040 +5D4B:100011FE1112111255FE5500557E55425542557E55425D7E62420242047E0842 +5D4C:0100210821083FF800202220223EFF42229422103E10221022283E2822440082 +5D4D:00407F40127E0C88FF4819482A504820A850118C01002108210821083FF80008 +5D4E:21FC2124212421FCA924A924A9FCA820A820ABFEAA22BA2ACAFA020A02020206 +5D4F:010041047FFC00002448238824483FF81010220847E40820144003801C70E00E +5D50:0100210821083FF800001FF0101010D01710111017D0155027CA212A4FE68022 +5D51:100011FC110411FC550455FC548055FE5622552255525D0265FA000200140008 +5D52:00001FF0101010101FF000007C7C444444447D7C01002108210821083FF80008 +5D53:0100210821083FF800001FF0101010101FF000007EFC4284428442847EFC4284 +5D54:010041047FFC00001FF011101FF011101FF00000FFFE111010A014401830100E +5D55:2000208822522222AA52AA8AAA02ABFEA888A944AA7AB888C950002000D80706 +5D56:1020102013FE107054A85524562255FC550455FC55045DFC6504000003FE0000 +5D57:0100210821083FF8004800443FFE20402F4422442A282AA83112422A44C69B02 +5D58:2088208823FE2088A800ABFEAA02AC24A820ABFEA870B8A8C8A8012402220020 +5D59:0100210821083FF800000C1070901050FC903050381E55F05010901010101010 +5D5A:0100210821083FF8104010403E7C4084BD2810201020FE501050148819041202 +5D5B:0100210821083FF802800C6037D8C0063E0822483E4822483E48220822282610 +5D5C:010041047FFC020001003FF808200440FFFE00101F90109010901F9000500020 +5D5D:2020212420A82020ABFEA8A8A924AA02A840AFFEA888B908C990006001980604 +5D5E:010002800C603018CFE601003FF80100111025080200101092929292FEFE0202 +5D5F:010041047FFC00003FFC2280224027FC2C4037F8244027F82440444047FC8400 +5D60:101E13E0112210945440548855F0542054C455FE54225C2063FE005000880306 +5D61:010041047FFC044008203218C4460FE000207EFC224412240A1412242A544488 +5D62:102010201050104854A455FE568454FC548454FC54805CFC65440144027C0044 +5D63:1020101011FE1110557C551455FE5514557C5510557C5D4465440244027C0444 +5D64:08202AA42CA84920145022887FFE40028104010021082108210821083FF80008 +5D65:2104210421DE2244AD54A89EA904AA24AC24ABFEA870B8A8C924062200200020 +5D66:102011241124112455FC540057FE540055FC550455045DFC6488005003FE0000 +5D67:204023BE22122292AA52AAAAAB24A840ABFEAA22AA22BBFECA22022203FE0202 +5D68:2040208021FC2104A904A9FCA900A9FEA900A9FEA802BAAACAAA040200140008 +5D69:010041047FFC0200FFFE00001FF010101FF000007FFC40044FE448244FE4400C +5D6A:2040202023FC2000A9F8A908A9F8A800ABFCAA04AAF4BA94CAF4020402140208 +5D6B:20842044204823FEA884A884A908A94AAA52AB9CA884B908C908025203DE0042 +5D6C:0100210821083FF8020004003FF821083FF821083FF8029004A808FA308AC07E +5D6D:2040202023FC2108A890ABFEAA02AC44A820ABFCA880B8F8C888010801280210 +5D6E:1020102013FE102055FC550455FC550455FC550455FC5D0463FE008801040202 +5D6F:11081088109013FC544055F8544057FE5480550055FC5E206420082003FE0000 +5D70:10881050100011FE545055FC545457FE545455FC54505CD86554025200500050 +5D71:2040202023FE2202AC94A908AA64A890A908AA04ADFAB908C908010801F80108 +5D72:1020104011FC110455FC550455FC550455FC542057FE5C7064A8012402220020 +5D73:0100210821083FF8082004407FFC01003FF80200FFFE080037F0C0801FFC0000 +5D74:2040224821502248ACA4A918AE06ABF8AA08ABF8AA08BBF8CA08020802280210 +5D75:0100210821083FF8004078404BFC48404FFE78104FFE48104A10791048500020 +5D76:200023DE20422042ABDEAA10AA10ABDEA842AA52A94AB94ACA52004202940108 +5D77:2124212422242424A954A94AAA92AE10AA10AA50AA5CBA50CA5002B0029E0300 +5D78:0100210821083FF81110211041108AA8144430405240927C1240154014FE1800 +5D79:010041047FFC00007CF8048804F87C2041FC41247D2405FC042004242BFE1002 +5D7A:200027BC208424A4AA94ACA4A850A988AE26A8C0AB10B864CB88003000C00700 +5D7B:1020101011FE1110557C551455FE5514557C551055925D546538025402920430 +5D7C:2040202023FC2000A908A890ABFEAA20AAA0AAFCAB20BA20CAFC0420042009FE +5D7D:2154215423FE2154A954AA72AC00ABFEAA22A820A9FCB924C9240124012C0020 +5D7E:010041047FFC08201FF0102025487EFC04401930E64E1990062018C007003800 +5D7F:010041047FFC00000000FDFC104011F8110811F8110811F8110811F850902108 +5D80:11FC102013FE122255AC542055AC540055FC540057FE5C8064FC000400280010 +5D81:102011FC112413FE552455FC542055FC552455FC54405FFE648801D00070038C +5D82:102011FC1088105057FE540055FC550455FC550455FC5C2067FE002000200020 +5D83:22002202223C2FA0AA20AFA0AABEAFA4AAA4AFA4AA24BFA4CA24024402440284 +5D84:0100210821083FF808067F7808407F40497E7F4849487F4808487F4808880908 +5D85:082008207F20087E7E4408A4FF2810101E28224446828100210821083FF80008 +5D86:2090209027FE2090ABFCAA94ABFCAA94ABFCA800A9F8B908C9F8010801F80108 +5D87:200023FE2200227CAA44AA44AA7CAA00AAEEAAAAAAAABAAACAEE020003FE0000 +5D88:0100210821083FF80440247C24A83D50042804487DFE24882448244844088418 +5D89:0100210821083FF800A0009079FE49204B204DFC492049FC7920492001FE0100 +5D8A:0100210821083FF810A01090F9FE11201B2015FC3120D1FC1120112051FE2100 +5D8B:1040108011FC110455FC550455FC550055FE550055FE5C0262AA02AA0202000C +5D8C:010041047FFC04001FF010101FF010101FF010001FFC10001FFC492484940008 +5D8D:100013DE10421252554A56525442542055FC550455045DFC6504010401FC0104 +5D8E:0100210821083FF800003F0821083F0820FE2E0820483F2844285508A4A80C10 +5D8F:010041047FFC00007FFE40005FDC45045FC4554459DC50505FD050525FD2904E +5D90:010041047FFC010079F04A9050606198560649F04A406BF8544043F8404047FC +5D91:208020F8210823FEAD12A922A9FEA840A8A2AB54A898BB34C854009203500020 +5D92:21042088200023FEAA22AAAAAA72AA22ABFEA800A9FCB904C9FC010401FC0104 +5D93:103C13E0112410A855FE54A85524560255FC552455245DFC6524012401FC0104 +5D94:0100210821083FF808401440227C5C8489283E2008204A5028500E8871042202 +5D95:2090208821FE2110AB10ADFEA910A910A9FEA910A910B9FEC90002A402520452 +5D96:204020A0211826E6A800ABF8AA08ABF8A800AFBCA884BCA4C29404A402940108 +5D97:208822AA22DC2488A954AA22A800ABFEAA42AC44ABFCB844C844008401140208 +5D98:0100210821083FF81090108813FEFC48103231CE3890548853FE9048103211CE +5D99:2020212420A823FEA8A8A924AA22A904A904A9DEAA44BD54C89E010402040404 +5D9A:010041047FFC01007FFC044028281FF02828CFE608200FE00100111025080200 +5D9B:1020102011FC102055545488550456FA548854F854885CF8642000A801240060 +5D9C:010041047FFC00003E7C081048907EFE1428244A46863FF820083FF820083FF8 +5D9D:202027A420A82292A914AA08ADF4A802ABF8AA08AA08BBF8CA0801100FFE0000 +5D9E:00407BFC488051F8622055FC488848F8688850F840884100210821083FF80008 +5D9F:2088205023FE2050A9FCA954A98CA974A904A9FCA808BBFEC908008800A80010 +5DA0:101811E0104013FE5488557456525470540055FC55045D74655401740104010C +5DA1:010041047FFC00003FFE289025102FBE22222AD42A902F902228442844448882 +5DA2:2020202021FC2020ABFEA908AB9CA908A988AE3EA800BBFEC89000900112020E +5DA3:010041047FFC010008801FFC30805FF810801FF810801FFC1000248822444244 +5DA4:010041047FFC01003FF80100FFFE08203EF808207EFC00007FFC04401842E03E +5DA5:20002FFE28002A28A948ABEEA892A884AAA0AAA8ABE8B888C894091409241242 +5DA6:108010F8110813FE5544559255FE5500557C5500557C5D00657C0244027C0444 +5DA7:100011FC115411FC542055FC542057FE5488545055FC5C2067FE002000200020 +5DA8:0A803138228838382288393822887FFE4002810401002108210821083FF80008 +5DA9:105011FC115411FC555455FC540055FE5500557C55005DFE6550015401480266 +5DAA:010041047FFC24481450FFFE082004407FFC01003FF80100FFFE05401930E10E +5DAB:2050225221542050ABFEA888A850ABFEA820A9FCA820BBFEC8A8012406220020 +5DAC:2104208823FE2020A9FCA820ABFEA854A992A890ABFEB890C8D4038A009601A2 +5DAD:0100210821083FF810407C2045FC44887C5043FE40207C2045FC44207C204420 +5DAE:1020102010501088550456FA5400540055DC555455545DDC6488008801540222 +5DAF:41047FFC00003E2822243E240020FFFE22203E2822283E1022122F2AF2464282 +5DB0:210021DE224A248AABEAAAB6AAA4ABF4AABEAAA4ABE4BABECAA402A402240464 +5DB1:108813FE108811FC550455FC550455FC548055FE56225D52650201FA000A0004 +5DB2:010041047FFC08801FFC30805FF890801FF810801FFC10003E7C224423D42008 +5DB3:21083FF800007FFC06003B0804B019C062A00C98732610207CFC10201E20F1FE +5DB4:04003FF82008292825482FE8254829280200FFFE08203118D11611101FF00010 +5DB5:200023FC22942294ABFCA800A890AF9EA890A890AB9CB890C890079E00900090 +5DB6:010041047FFC000022204AA08ABE1FC420A46F24A0282F28291029A829443082 +5DB7:010041047FFC0000247C3A0422281E1020FE3E124850085E7F5014B0229E4100 +5DB8:208822AA22DC2488A954AA22A800ABFEAA22A820ABFEB870C8A8012406220020 +5DB9:202023FE202021FCA800ABFEA802A9FCA820ABFEA800BBFEC80403BE02A4038C +5DBA:010041047FFC100013FC284045F8930809F8FD0805F8090851F8200010900108 +5DBB:010041047FFC08207F280824FFFE12203FA46424BFA824183F92242A3FC62082 +5DBC:2140224C22642244AB4CAA64AAA4ABACAAA4AAA4AFFEB800C910010802040404 +5DBD:0100210821083FF8001052182F945014977E1010372850289728154457442082 +5DBE:203E27C022442128ABF8A840AFFCA800ABF8A808ABF8B808CBF80544052A08FA +5DBF:200021FC202023FEAA22A9ACA820A9ACA800ABFEA820B9FCC95401540154010C +5DC0:010041047FFC08002A284D240820142E3F706424BF2424283F12242A3F462082 +5DC1:200023FE224823FEAA48AAFCAAA4AAFCAAA4AAFCAA20BBFEC32A057A050A0906 +5DC2:21083FF808801FFC30805FF890801FF810801FFC10003FFC24242BD4224423CC +5DC3:41047FFC08407F7C2240147CFF04007C7F40417C7F40417C7F40417C4542423E +5DC4:2110209023DE2010AA5EA982ABDEA810ABDEAA50ABDEBA50CBDE0250025202CE +5DC5:21083FF808007EFE08103E20227C3E4422543E5422543E542254FF2824444282 +5DC6:208822AA22DC2488A954AA22ABFEAA02A8F8A888A8F8B800C9FC010401FC0104 +5DC7:208820CC208A23E8AAA8AADEABA8AA6AAA0AABEAAC0CBFECCA2A03EA015607E2 +5DC8:010041047FFC000029007DFC29043A4411547CE455F47C4410E4FD5410541008 +5DC9:21F0221027FC2204ABFCAA24ABB8AA22A9FEAA10AFFCBA44CBFC00D0014A063E +5DCA:23DE225223DE2252ABDEAA52ABDEA98CAA52A840AFFEB888C990006000D80304 +5DCB:010041047FFC10007DFC44047CFC40047DFC44007DFE11225CFC50A45EACF020 +5DCC:41047FFC220811103FFC20002E20223C3FA829482F2829282F1049D07F288144 +5DCD:010041047FFC0C20704011FCFD2439FC552493FCFC24245A685E10902912C60E +5DCE:200027FE204022EEAAAAABEAAAAEAAE8ABAAACE6AA88BDF4CA90006001980606 +5DCF:208823FE208823DEAA52ABDEA8A0A890A9FEA920ABFCBD20C9FC012001FE0100 +5DD0:010041047FFC08007F7C00443E7C22443E7C00107F6441245DFE55245D244344 +5DD1:252827BE294827BEAB18ADAAA946ABFCAA04ABFCAA04BBFCCA0403FC01080204 +5DD2:210447C88812F3BC20084B92F83E0380AAAAABAA01002108210821083FF80008 +5DD3:010041047FFC22003CFE21101F7C52445E7C52445E7C52447F7C002824444282 +5DD4:21083FF808007EFE08103E20227C3E44227C3E44227C3E44227CFF2824444282 +5DD5:2108209027FE2108ABFEAA54ABC8AA3EABC8AA5CABC8B840CBFE00880070038C +5DD6:010041047FFC00001E7812483FFC20202E20223C3FC829282F2849905F288144 +5DD7:23DE225223DE2000ABFEAA00AAC8AA4EABEAAAB2AAEABAAACAEA02B405E4082A +5DD8:210821EC210A2FEAA928ABC8A93EAFE8A948ABE8AA28BB68CAA80BF40AB412A2 +5DD9:211027FE204022EEAAAAABEAAAAEAAE8ABAAACE6AA88BDF4CA90006001980606 +5DDA:010041047FFC08000F9008147F9248FE7E1048905FA851285F28554455449382 +5DDB:0000000008880888088811101110222022201110111008880888088800000000 +5DDC:0000041004100820082010402080410020801040082008200410041000000000 +5DDD:1004108410841084108410841084108410841084108410842084208440048004 +5DDE:1004108410841084108454A45294529490841084108410842084208440048004 +5DDF:02000100FFFE1000100010001FF800001110111011101110211021124112800E +5DE0:00007FFE00000888111022201110088800003FF80100010001000100FFFE0000 +5DE1:000021241124112402480248F490124812481124112411241000280047FE0000 +5DE2:088811102220111008883FF821083FF821083FF80100FFFE054009203118C106 +5DE3:22081108111000003FF821083FF821083FF80100FFFE054009203118C1060100 +5DE4:1084210810843FF82448238824483FF80000294825282948252A210A29463182 +5DE5:000000007FFC0100010001000100010001000100010001000100FFFE00000000 +5DE6:020002000200FFFE04000400040008000FF8108010802080408080803FFE0000 +5DE7:000003FEFC40104010801080110011FC100410041E04E0044004000400280010 +5DE8:00003FF82000200020003FF02010201020103FF020002000200020003FFC0000 +5DE9:000001F07D1011101110111011901150115011101D10E11242120212040E0800 +5DEA:00003FF8200020003FF0201020103FF0200020003FFC00007FF8000800080008 +5DEB:000000007FFC01000100111011101110292829284544858401000100FFFE0000 +5DEC:00007DF01110111011121D12E20E440001003FF80100FFFE028004401830600C +5DED:00407C4013FC104410441C84E114420801003FF80100FFFE028004401830600C +5DEE:082004407FFC010001003FF802000200FFFE0400080017F82080408080801FFC +5DEF:00207C1005FE08201048288445FE820200A87CA810A810A810AA1D2AE1264200 +5DF0:0020FE1055FE5420A848548455FE0002FEA810A810A810A81EAAF12A41260200 +5DF1:00003FF0001000100010001000103FF02000200020002004200420041FFC0000 +5DF2:00003FF0001000100010201020103FF02000200020002004200420041FFC0000 +5DF3:00003FF0201020102010201020103FF02000200020002004200420041FFC0000 +5DF4:00003FF8210821082108210821083FF82008200020002002200220021FFE0000 +5DF5:007C3F80200020003FFE200020002FF82888288828882FF828084802480287FE +5DF6:0000FEFC2284228442844A84848400FC7E8042804280428242827E82427E0000 +5DF7:044004403FF804400440FFFE044008201FF02828C8260FE008200808080807F8 +5DF8:00007F7C4844484448445E445244527C524052405E404842484248427F3E0000 +5DF9:1FC000447D88055009203118C50602003FF800003FF000103FF0200420041FFC +5DFA:00007CF8448844887CF84080428442843E7C00000000FFFE0000082010102008 +5DFB:0100111009203FF802007FFC082010102FE8C02600200FE008000808080807F8 +5DFC:00003FF0211021103FF02000200420041FFC00003E442258226022423E42223E +5DFD:00007CF844887CF8408042843E7C044004403FF804400440FFFE082010102008 +5DFE:0100010001003FF8210821082108210821082108210821282110010001000100 +5DFF:01000100FFFE0100010001003FF8210821082108210821282110010001000100 +5E00:00007FFC0100010001003FF82108210821082108210821282110010001000100 +5E01:000801FC7F00010001003FF82108210821082108210821282110010001000100 +5E02:0200010000007FFC0100010001003FF821082108210821082128211001000100 +5E03:020002000200FFFE0400090011003FF851089108110811081128111001000100 +5E04:0800080008FE7F1049104910491049104910491049104B100810081008500820 +5E05:082008204820482049FC49244924492449244924492409341128102020204020 +5E06:100011F011107D1055105510559055505550551055105D1211121212120E1400 +5E07:010001003FF80108FFFE01083FF8010001003FF8210821082128211001000100 +5E08:08000BFE48204820482049FC4924492449244924492409341128102020204020 +5E09:1010109010907C8855085504560455FA5488548854885C881108110812281410 +5E0A:1000100011FC7D24552455245524552455FC550055005D001102110210FE1000 +5E0B:00783F80208020803FFC20402822311A21061FF0111011101150112001000100 +5E0C:18180660018006603A180200FFFE048008801FF82888488888A8089000800080 +5E0D:020001003FFC200420043FFC2040204027FC2444244424444454444880400040 +5E0E:1020102010207DFE55225624542054205450545054505C50109010921112120E +5E0F:1020102010207DFE5420542054FC5420542055FE54225C22102A102410201020 +5E10:1080108410847C88549054A0548057FE54A0549054905C88108410A210C01080 +5E11:10001000FEFC2244642818102428C34601003FF8210821082128211001000100 +5E12:08A0109030BE57C0904010241014110C01003FF8210821082128211001000100 +5E13:1020102010207DFE54205420542055FC547054A854A85D241124122210201020 +5E14:1010101010107DFE55125514551055FC5544554455285D281110122812441482 +5E15:1020102010407DFC550455045504550455FC550455045D041104110411FC1104 +5E16:1020102010207C20543E54205420542055FC550455045D041104110411FC1104 +5E17:1050104810487C4055FE54405440547C54A454A454A85D281110122810441082 +5E18:020001007FFE400288241010210801003FF82108210821082128211001000100 +5E19:1020102011207D2055FC55205620542057FE542054505C501088108811041202 +5E1A:00001FF000100FF000101FF000007FFE410281041FF011101110115011200100 +5E1B:010002001FF010101FF010101FF0010001003FF8210821082128211001000100 +5E1C:1000100011FC7D04550455045504550455FC550454005C901088110412021402 +5E1D:020001003FF80000082004407FFE410281041FF0111011101150112001000100 +5E1E:100013FE10207C20544055FC55045504550455FC55045D041104110411FC1104 +5E1F:020001007FFC0440245044488944108001003FF8210821082128211001000100 +5E20:02001CF0101010101EF0101010101FF001003FF8210821082128211001000100 +5E21:1104108410887C0055FE548854885488548857FE54885C881108110812081408 +5E22:1020102010507C885504560255FC5400540055FC55045D041104110411FC1104 +5E23:1110091009207FFC02000400FFFE11102108DFF6111011101150112001000100 +5E24:10001000FE7C224442443444087C3400C20001003FF821082108212821100100 +5E25:102020207C20442045FC45247D24412441247D244524453445287C2044200020 +5E26:092009207FFC0920092000007FFE410281041FF0111011101150112001000100 +5E27:10201020103E7C20542055FC550455245524552455245D241050104810841104 +5E28:1104108410887C1055FC55045504550455FC545054505C9010921112120E1400 +5E29:1020112410A47CA8542055FC5504550455FC550455045DFC1104110411141108 +5E2A:100011FE11007D00557C5500550055FE5550555255545D481148124412521460 +5E2B:100023FE7C204420442045FC7D24412441247D244524453445287C2044200020 +5E2C:00003FF80208FFFE04083FF808001FF82808CFF800801FFC1084109410880080 +5E2D:010000803FFE222022203FFC2220222023E020802FF82888488848A888900080 +5E2E:0800087CFF4808507E480844FF54104820404100BFF821082108212821100100 +5E2F:092009207FFC09200FE000007FFE410281041FF0111011101150112001000100 +5E30:080009FC480448FC480449FC48004BFE4A22482049FC09241124113421284020 +5E31:2040204027FCF840ABF8A880AFFEA890A910A9FEAA10BA902450281020502020 +5E32:1044104410887DDC548854885488548855DE548854885C881088108810881108 +5E33:100010FC10807CF8548054F8548057FE5540552455285D101108114411821100 +5E34:10481044105E7DE054285412546A55965448545E55E05C2410281012106A1186 +5E35:2040202023FEFA02AD04A900A9DEAA52AA52AB52AC9AB894211021122212240E +5E36:145014507FFC1450245247CE80007FFC41041FF0111011101150112001000100 +5E37:1050104810807CFE5590569054FC5490549054FC54905C90109010FE10801080 +5E38:0100111009207FFE40028FE4082008200FE001001FF011101110115011200100 +5E39:2080204023FCF800A908A890AFFEA840A840AFFEA888B9082090206021982604 +5E3A:1088108811FC7C88548854F85488548854F8548854885DFE1000108811041202 +5E3B:2040204027FCF840ABF8A840AFFEA800ABF8AA08AA48BA48224820A021102608 +5E3C:200023FE2202FA02ABFEAA22AA22AAFAAA22AA32AA2ABBFE2202220223FE2202 +5E3D:200023FC2204FAF4AA04AAF4AA04A800A9F8A908A9F8B90821F8210821F82108 +5E3E:1020102211FA7C24542857FE5420544054FC558456845CFC1084108410FC1084 +5E3F:210021782108FA08AAFEAE40AA40AA7CAA90AA10AAFEBA102228222822442282 +5E40:10201020103E7C20542055FC550455FC550455FC55045DFC1000108811041202 +5E41:100013FE10207C4055FC5504550455FC550455FC55045D0411FC100010881104 +5E42:00007FFE40029FF410101FF010101FF00200FFFE09203FF8D116115011200100 +5E43:1040104011FC7C8457FE540055FC550455FC542057FE5C20122013FE10201020 +5E44:200023FC2204FA04ABFCAA00ABFCAA40AA88ABFCAA24BA2025FC2420282033FE +5E45:100011FE10007CF85488548854F8540055FC552455245DFC1124112411FC1104 +5E46:100011FC11047DFC550455FC548055FE5622552255525D0211FA100210141008 +5E47:080808087E0808FEFE0808487E2808080F28F11001003FF82108212821100100 +5E48:200023FC2204FA04ABFCAA00AA84AA48AAFCAA48AA48BBFE2448244828883108 +5E49:204821482148FBFEA948A948A978A900A9FEA820ABFEB87020A8212426222020 +5E4A:100011FC10207C2057FE540055FC550455FC550455FC5D0411FC108811041202 +5E4B:10783E4822482A86FF7822482A2842104A28854601003FF82108212821100100 +5E4C:100011FC11047DFC550455FC5420552454A8542057FE5C50105010921112120E +5E4D:101E11E010227D1254945480542055CE5502550255CE5D021102110211FE1102 +5E4E:200023FE2202F800A9FCA904A9FCA904A9FCA840A820BBFE2000208821042202 +5E4F:2040202023FEFA02A800A9FCA840A8A2AB34A858A894BB342052209023502020 +5E50:0020792448A849FC48407BFE49084A244C2279FC492449244934492848209820 +5E51:12101A902A904AA08FBE10442FA46224A2242FA82AA82A902AA82BA822442282 +5E52:1020104011FC7D24557C558C55545524555455FC54405C2412A2128A14881078 +5E53:2040208821FCF908AA52ABFEA850A988AE26A8C0AB10B8642388203020C02700 +5E54:200021F82108F9F8A908A9F8A800ABFCAA94ABFCA800B9F82090206021982606 +5E55:04407FFC04401FF010101FF010101FF00400FFFE11103FF8D116115011200100 +5E56:100013FE10507DFC5554555455FC540055FC540057FE5C2010A8112412A21040 +5E57:200023FE221AFA16ABFEAA12AAEAAAAAAAAAAAEAAA0EBA6A239A222623FE2202 +5E58:102013FE10207DFC542057FE540055FC550455FC55045DFC110411FC10881104 +5E59:1088108813FE7C88540055FC550455FC550455FC54205DFE1050108811041202 +5E5A:087CFF4808507E480844FF54104822405FF090101FF010103FF8210821180100 +5E5B:102011FC10887C5057FE540055FC550455FC550455FC5C2013FE102010201020 +5E5C:100011FC11047DFC550455FC542057FE540055FC55045DFC1020112412221060 +5E5D:200023DE2252FA52ABDEA800A9FCA924A9FCA924A9FCB82023FE202020202020 +5E5E:205022522154F850ABFEA888A850ABFEA820A9FCA820BBFE2050208821042602 +5E5F:2110209423D2F812AA50A990AFFEA810ABD2AA52AA54BBD4224A224A23D62022 +5E60:2080208021FEFB54AD54A954ABFEA954A954A954AFFEB8002154212A222A2000 +5E61:207827C02248F950ABFCA950AA48AC06ABF8AA48AA48BBF82248224823F82208 +5E62:102011FC10887C5057FE540055FC552455FC552455FC5C2011FC102013FE1000 +5E63:49202A207F3E49485DA86B2849104928404601003FF821082108212821100100 +5E64:082049202A3E7F4841A85D2855105D28424601003FF821082108212821100100 +5E65:212420A823FEFA02A8F8A888A8F8A80CA9F0A820A9FCB82023FE202020A02040 +5E66:00407C2045FC44887C5043FE7C20A5FC24203D2001003FF82108212821100100 +5E67:10F8108810887CF8540055DC5554555455DC542057FE5C7010A8112412221020 +5E68:210021F82208FFFEAA88AB24ABFEAA00AAFCAA00AAFCBA0022FC248424FC2884 +5E69:102011FC10207C8857FE548855FC550455FC550455FC5D0411FC108811041202 +5E6A:208823FE2088FBFEAA02A9FCA800ABFEA840A8A2AB54B8B82354209223502020 +5E6B:08083EFE08087F4808283E0809287FF028200FE008200FE001003FF821082118 +5E6C:202023FE2020F9FCA800ABFEA802A9FCA820ABFEA800BBFE200423BE22A4238C +5E6D:210827FE2108F800ABFCAA94AA94ABFCA828ABFEAA20BB2422A82292242A28C6 +5E6E:2040202023FEFA44ABF4AA44AAEEAA04AAF4AAACAAE4BA1422A4247425942808 +5E6F:2108210821EEFA94A842A800ABDEAA52ABD2AA52ABD2BA1A2294235022102010 +5E70:102013FE12227DFC542054F8542055FC542055FC55545DFC104012A4128A147A +5E71:23DE225223DEFA52ABDEAA22AAFAAA22AAFAAAAAAAFABAAA22FA227222AA2226 +5E72:00003FF801000100010001000100FFFE01000100010001000100010001000100 +5E73:00007FFC010001001110091009200100FFFE0100010001000100010001000100 +5E74:100010001FFC2080208040801FF8108010801080FFFE00800080008000800080 +5E75:00007C7C10101010101010101010FEFE10101010101010102010201040108010 +5E76:10100810082000007FFC0820082008200820FFFE082008201020102020204020 +5E77:0808080810107C7C1010101010101010FCFE1010101010102010201040108010 +5E78:010001003FF801000100FFFE082004403FF801000100FFFE0100010001000100 +5E79:102010201050FE5010887D0446FA7C2044207C2011FCFE201020102010201020 +5E7A:0200020004000810101020207FC02080010002000400082010103FF810080000 +5E7B:0800080011FC100422044204FC0404040804100424044204FE04420400280010 +5E7C:104010402040204045FC4444F84408441044108428844484FD04450402280410 +5E7D:0100010009200920514455547DF44924492455547DF44514410441047FFC0004 +5E7E:1110212045447978111025247D7C15241110FFFE1080108828522422405A8186 +5E7F:0100008000803FFC200020002000200020002000200020002000400040008000 +5E80:010000803FFE2000200022002204221822602380220022022202420241FE8000 +5E81:010000803FFE2000200020002FFE204020402040204020404040404081400080 +5E82:010000803FFE2000208020802080208020802140214022204220441088081006 +5E83:010000803FFE20002080208020802100210021002210220844084FFC84040004 +5E84:0100008000803FFC20002080208020802FFC208020802080208040805FFE8000 +5E85:010000803FFE20002100210022202220244028802100220844044FFE84020000 +5E86:010000803FFE20002080208020802FFC20802140214022204220441088081006 +5E87:010000803FFE20002420242024242428273024202420242245224622841E0000 +5E88:010000803FFE20802140222024102908308620802FF020104020402080400080 +5E89:010000803FFE204020402FFE204024442444244427FC204220424042403E8000 +5E8A:010000803FFE2000208020802FFC208021C022A022A024904888508680800080 +5E8B:010000803FFE208020803FFC208020802FF02410222021404080416086183806 +5E8C:010000803FFE200020002FFC2020242028202FFE20A021204620582080A00040 +5E8D:010000803FFE2000201C27E02400240027FE2420242024204820482090202020 +5E8E:010000803FFE2040204020A0211022082D162110211021104110421082100410 +5E8F:010000803FFE200023F8201020A020402FFE2042204420404040404081400080 +5E90:010000803FFE2100208027F824082408240827F8240824004400480088001000 +5E91:010000803FFE200020002FFC208020803FFE21402140224042424442883E1000 +5E92:010000803FFE20802080208020802FFC2080208020902088408840809FFE0000 +5E93:010000803FFE210021003FFC2200248028802FF8208020805FFE408080800080 +5E94:010000803FFE200020002104288424842448224822102210402040409FFE0000 +5E95:010000803FFE2000203C27C024402440244027FE242024202412450A46468422 +5E96:010000803FFE2200220027F8280837C82448244827C824282412440243FE8000 +5E97:010000803FFE20802080208020FC2080208027F8240824084408440887F80408 +5E98:010000803FFE2000200027FC2444244427FC2444244427FC2444404040408040 +5E99:010000803FFE2000208020802FF82888288828882FF82888488848888FF80808 +5E9A:010000803FFE200020802FF8208820883FFE208820882FF8414042208C183006 +5E9B:010000803FFE2000211021102512251425D8251025102510251245D25E12880E +5E9C:010000803FFE200022082208240824FE2C083488244824484408440884280410 +5E9D:010000803FFE2100210023F82610292020C023303C0E20C04020430080C00020 +5E9E:010000803FFE2220221022002FFC22402240224824502460484248C2933E2000 +5E9F:010000803FFE2080249028882FFE210021FC2284228824502420485051888606 +5EA0:010000803FFE241022203FFC208020802FF8208020803FFE2080408040808080 +5EA1:010000803FFE208020403FFE20802100228426882A5032204210428883060200 +5EA2:010000803FFE200020002FFC2100221027F8208820802FFC40804080BFFE0000 +5EA3:010000803FFE212021202924252821302120233025282924222042224422881E +5EA4:010000803FFE2000204027FC204020403FFE200020102FFC4210411081500020 +5EA5:010000803FFE20002220222024202DFE347024A824A825242622442044208420 +5EA6:010000803FFE222022203FFC2220222023E020002FF02410422041C08630380E +5EA7:010000803FFE20802490249024902AA831C420802FF8208040804080BFFE0000 +5EA8:010000803FFE2080208827F020A03FFE20802FF02620384047FC404081400080 +5EA9:010000803FFE20802140222024103BEC208020802FF820804490488892840100 +5EAA:010000803FFE24102410247E3F102410257C26443C4424284410442894440882 +5EAB:010000803FFE20803FFC20802FF828882FF828882FF820805FFE408080800080 +5EAC:010000803FFE221022083FFE224822502264224822522264444A447288C2133E +5EAD:010000803FFE20002E0E22F0241024102EFE221022102AFE4400460089FE1000 +5EAE:010000803FFE20002FFC21202FFC292429242A1C2C042FFC480448048FFC0804 +5EAF:010000803FFE204820442FFE204027FC244427FC244427FC2444444444548408 +5EB0:010000803FFE22082108211027FC2110211021102FFE21104110421084100810 +5EB1:010000803FFE208020802FFC20803FFE2408290433F22610492040C08730380E +5EB2:010000803FFE204020402FFE204022482248255428E2215042484C4680400040 +5EB3:010000803FFE2080210027FC244427FC248427FC212022203FFE402040208020 +5EB4:00803FFE221022102FFC221022103FFE200027F82408240847F84408840807F8 +5EB5:010000803FFE200020802FFC2120221024882FF6349027F0249047F24082807E +5EB6:010000803FFE2000222022203FFC22202220222023E020004A48492491240000 +5EB7:010000803FFE20802FF820883FFE20882FF8288024C422A84490488892860100 +5EB8:00803FFE20802FF820883FFE20882FF820802FF828882FF848884FF888880898 +5EB9:010000803FFE221022103FFE221023F0200027F8240827F84420441088081006 +5EBA:010000803FFE221024882924221027F8208820802FFC21C042A0449898860080 +5EBB:010000803FFE222022203FFC2220222023E020002410241044104A2891442082 +5EBC:010000803FFE280029FC28202E4029FC2904292429242B242D24485040888304 +5EBD:010000803FFE200027F8248827F8248827F820802FFC288448A44BF489140808 +5EBE:010000803FFE200022802CB8288828882EB8288828882FF8414042208C183006 +5EBF:010000803FFE211021102FFE2110200027FC2444244427FC2444444447FC8404 +5EC0:010000803FFE20402FFE2842224824B023082C0427F82208211040E043189C06 +5EC1:010000803FFE20002F84288428A42FA428A42FA428A42FA44024490488941088 +5EC2:010000803FFE20002200227C3F442244267C27442AC42AFC52446244827C0244 +5EC3:010000803FFE20402F5021242A1824083BF6212021202FFC212042244424881C +5EC4:010000803FFE20002F78294829482F862900297C2F4428442A2849104B288D46 +5EC5:010000803FFE20802FFC20803FFE220024082FFC20002FFC49244924BFFE0000 +5EC6:010000803FFE208021002FFC28842FFC28842FFC21482154425C44468842303E +5EC7:00803FFE2080277C2424252424A425542648208027FC244447FC444487FC0404 +5EC8:010000803FFE20002FFC208027F8240827F8240827F8220027F84A0841F09E0E +5EC9:010000803FFE220821102FFE212027FC21243FFE212427FC2330452859268120 +5ECA:010000803FFE220021002FBE28A22FA428A82FA42A2229222AAA4CA448208020 +5ECB:010000803FFE2140265C2444275C244427FC20402FFC2208211040E043188C06 +5ECC:010000803FFE22203FFE22223FFE240027FC240027FE2002224A4926500A8004 +5ECD:010000803FFE2400221E2F922014289825143FD220122F9A489448908F900890 +5ECE:010000803FFE200029FE282028FC2E8428FC288428FC2A844CFC480080480084 +5ECF:010000803FFE24002FBC28A42FA428C22F80207E29222A222C94488847948062 +5ED0:00803FFE20002F7E291029102F502950297E2F1028282A2849284B4A8D4A0886 +5ED1:00803FFE24103FFE241027F020802FF828882FF820803FFC40804FF880803FFE +5ED2:010000803FFE22102F90221E2FA422243FD4241427942488448848948AA41142 +5ED3:00803FFE22003FBC20242FA428A82FA820242FA4212423F45E2842208A200420 +5ED4:010000803FFE20802FF828883FFE28882FF8249027F021003FFE441043E09C1C +5ED5:010000803FFE20102F2829442A922C7C2A082910297E2D002AFE4820484488FE +5ED6:00803FFE20002F7C2924251429A421602618388623202C4041884E3081C00E00 +5ED7:010000803FFE22A822A82FFC22AA24E628002FFE284223F84248424882580040 +5ED8:010000803FFE208020402FFC29202FFC29242FFC2A202A244BB8522492A4231C +5ED9:010000803FFE200027FC244427FC244427FC211027FC21102FFE400042088404 +5EDA:010000803FFE22043FC422042FBE20042FA428942F942884450443849C140808 +5EDB:00803FFE20002FF828882FF828882FF820802FF820803FFE488853E480803FFE +5EDC:00803FFE200027FC240427FC244425F8245027FE244024F849884AF8948800F8 +5EDD:00803FFE2900290C3FB0292029202F3E29282F28292829285FA840488A881108 +5EDE:010000803FFE22002220252028BE374222942F90221032904A2843A89C440882 +5EDF:010000803FFE22002FBC22242FA428BC2FA428A42FBC22245FA4424482540288 +5EE0:00807FFE420852484A504A9E5FE4505457545554554857485048515450948022 +5EE1:010000803FFE220024002FFC355025502FFC255025503FFE40004A4889241124 +5EE2:010000803FFE20402F5021242A1824083B7621502F8C28782F48413045488284 +5EE3:010000803FFE22202FF822203FFC20802FF828882FF828884FF8422084100808 +5EE4:00803FFE20803FFC20802FF828882FF828882FF820803FFC40A45F3A91221F1E +5EE5:00803FFE214026303BEC20002FF82AA829C82FF8200027F0441047F0841007F0 +5EE6:010000803FFE2010278824BE248027A22494243E2F882C8854BE478884880008 +5EE7:00803FFE204027FC2248224825543FFE200027FC240425F4451445F4840407FC +5EE8:00803FFE24002F3C311422242FCC2A802FA82ABE2FC82A884ABE4A8888881188 +5EE9:00803FFE20402FFE200027FC240425F4251427FC200823F040404FFE81500E4E +5EEA:00803FFE20402FFE200027FC240425F4251427FC200027FC40004FFE824804C4 +5EEB:00803FFE20002EEE2A222AAA2A662EAA2A102A282E542AAA4A50522492482610 +5EEC:00803FFE2040207C204027FE244225F8244424FC24A824F844A849FC895413FE +5EED:00803FFE2010237C2E10227C2F1022FE2644277C2AC42A7C5244427C82280244 +5EEE:00803FFE20002FBE28A22FBE28A22FBE28A22FBE251428A24FFE431080E00F1C +5EEF:010000803FFE240027222914323E2F882A882F9C2A882F88403E554895480008 +5EF0:00807FFE40207E2055FE54205DFC555455545DFC542056105C547542454A8638 +5EF1:00803FFE20002AA835242ABE2F6829682FBE20282FA82ABE4FA8482888BE07A0 +5EF2:00803FFE20002FBE2514271C25542FFE29202FFC29242FFC4A244BB89222239E +5EF3:00807FFE40107F1052FE5E1052FE5EAA52AA7EFE42007EFE4A245E124AA4BE9C +5EF4:00000000F80008001000100020007800080008004800300010002C0043FE8000 +5EF5:00000124F92409241248124824907A480A4809244924312410002C0043FE8000 +5EF6:0008003CF9E0082010201120213C792009200920492031FC10002C0043FE8000 +5EF7:0008003CF9E008201020102021FC782008200820482033FE10002C0043FE8000 +5EF8:00200020F82009FC11241124212479FC09240924492431FC10002C0043FE8000 +5EF9:00200020F84009FC11041104210479FC09040904490431FC11042C0043FE8000 +5EFA:00400040FBF8084817FE104823F878400BF80840484037FC10402C4043FE8000 +5EFB:000003FCFA040A0412F4129422947AF40A040A044BFC320410002C0043FE8000 +5EFC:000007FEF890089013FC129422947A940A9C0B044A0433FC12042C0043FE8000 +5EFD:000003FCFA940A9412F4129422947AF40A940A944A9433FC12042C0043FE8000 +5EFE:0000000008200820082008200820FFFE08200820082008201020102020204020 +5EFF:08100810081008100810FFFE081008100810081008100810081008100FF00810 +5F00:00007FFC08200820082008200820FFFE08200820082008201020102020204020 +5F01:02000400082010103FF80008082008200820FFFE082008201020102020204020 +5F02:00003FF0201020103FF0200420041FFC000008200820FFFE0820102020204020 +5F03:010000803FFC0200042008101FF80008042004207FFE04200420082010202020 +5F04:00007FFC010001003FF801000100FFFE000008200820FFFE0820102020204020 +5F05:0440082010102FE8C4260420082010A0604008200820FFFE0820102020204020 +5F06:010001003FF80100FFFE040008201FF0001008200820FFFE0820102020204020 +5F07:010002800C603018CFE600001FF010101FF008200820FFFE0820102020204020 +5F08:020001007FFC04402450444889441080000008200820FFFE0820102020204020 +5F09:2420242024203DFC0420FC20242024F8440008200820FFFE0820102020204020 +5F0A:082049202A3E7F4849485DA86B104928434608200820FFFE0820102020204020 +5F0B:022002100210020002FEFF0002000200020001000100008000420022001A0006 +5F0C:0048004400440040FFFE00400040004000400040002000227F92000A00060002 +5F0D:0048004400440040FFFE0040004000407E400040002000220F12F00A40060002 +5F0E:0048004400440040FFFE004000407F40004000403E2000220012078AF8064002 +5F0F:0048004400440040FFFE004000403E4008400840082008220F12780A20060002 +5F10:00483E4400440040FFFE0040004000407E400040002000220F12F00A40060002 +5F11:00144412281013FE28104410101011F0FC9010905890548894EA138A51062002 +5F12:441028141012281045FE1010141011D0FC9030903890548850EA938A10061002 +5F13:00007FF00010001000103FF02000200040007FF8000800080008000800500020 +5F14:00003FF80108010801081FF81100110021003FFC010401040114010801000100 +5F15:00087F080108010801083F082008200840087F0801080108010801080A080408 +5F16:00003FF8000800081FF8100020003FFC000400040004002800100000FFFE0000 +5F17:0440044004407FF8044804483FF8244024403FFC044408440854104820404040 +5F18:00207C200420042004207C404040404040807C880484050407FE050228021000 +5F19:00007CFE0410041004107C10401041FE40107C10041004100410041028501020 +5F1A:0820042004407FF8010801083FF8210021003FFC010401040114010801000100 +5F1B:0020F82008200920092C7934416443A441247934092809220922090250FE2000 +5F1C:00007DFC0404040404047CFC4080408041007DFC040404040404040428281010 +5F1D:00007DFC0524052405247D24412441FC41047D00050005000502050228FE1000 +5F1E:00407C400440047C04847C884120402040207C50045004500488048829041202 +5F1F:0820042004407FF8010801083FF8210021003FFC030405040914110861000100 +5F20:0100F9080908091009207940410047FE41407920092009100908094451822100 +5F21:00007CFE0480048004807CFC4084408440847C8404FC04800480048028FE1000 +5F22:00207D240524052405FC7C20402043FC41047C88048804500420045029881606 +5F23:0088F88808880908097E7B084508414841287928090809080908090851282110 +5F24:0004F81E09F0091009107910411041FE4110791009100908090A094A51A62112 +5F25:0080F880088009FE09027A0444204020412879240A240A220C22082050A02040 +5F26:0040F82008200BFE084078404088410843F078200840088809040BFC51042000 +5F27:0008F83C0BD00A900A907A904290429042907A880A880AC80AA40CD454922800 +5F28:0000FBFC088408840884790441144208440079FC090409040904090451FC2104 +5F29:08007F7C114432280C101228614600003FF000103FF020003FF8000800500020 +5F2A:00007DFC0408041004307C484084430240007DFC04200420042004202BFE1000 +5F2B:00007DFE0520052005207DFC4104410441047D0405FC05200520052029FE1000 +5F2C:00007DFE0510051005507D5C4144414441447D44055C05500510051029FE1000 +5F2D:0000FBFE09080908090879F84108410841F879080908091E0BE8080850082008 +5F2E:111009207FFC0400FFFE10102008DFF600100FF0080010001FF8000800280010 +5F2F:02000100FFFE044014502448444400003FF000103FF020003FF8000800500020 +5F30:00207D2404A404A804207DFC4104410441FC7D04050405FC0504050429141108 +5F31:00007EFC020402047EFC408040807EFC22441224060C1A3462C4020414280810 +5F32:0000F9F80908090809F8780043FC420442047BFC0A040A040BFC0A0452142208 +5F33:0000FBFC080009240A487C904248412440007BFC084008400840084057FE2000 +5F34:0040F8200BFE080009FC790441FC400041FC780808100BFE0820082050A02040 +5F35:0000F8FC088008F8088078F8408047FE41407924092809100908094451822100 +5F36:0040F8200BFE0800080079FC41044104410479FC082008A809240A2250A02040 +5F37:0020F840088809040BFE7822402043FE42227A220BFE08200824082257FE2002 +5F38:0000FBDE0A520A520A527BDE4252425242527BDE0A520A520A520A52555228A6 +5F39:0104F888085009FC0924792441FC4124412479FC082008200BFE082050202020 +5F3A:0000F9FC0904090479FC402083FE8222FA220A220BFE082008240822903F63C1 +5F3B:0000F01E17C211021102F7DE855085508550F6DE14421442144217C2A4544008 +5F3C:0000F01E17C211021202F7DE845084508450F7DE14421442144217C2A4544008 +5F3D:0048F94809480BFE094879484178410041FE78200BFE087008A8092456222020 +5F3E:0242F924080009FC0924792441FC4124412479FC082008200BFE082050202020 +5F3F:01007FFE44429FF404403FF80440FFFE08201FF02028DFE610001FF0001000E0 +5F40:1000FE7810487C480048FE8682007CFC00447C4404287C2840107C2804440D82 +5F41:0000FBFE080809E8092879E8400043FE400879E80928092809E8080850282010 +5F42:0440244814500440FFFE0000FC8004F87D20402081FCFC200450045028881104 +5F43:0000F9FC092409FC092479FC40A840A843FE78A808A809FC08200BFE50202020 +5F44:0000FBFE0A000A7C0A447A44427C420042EE7AAA0AAA0AAA0AEE0A0053FE2000 +5F45:0108F8900FFE08000BC47A5443D4425443D47A440ACC08000BFC088451142608 +5F46:49202A3E7F4849485DA86B10492841463FF000103FF020003FF8000800500020 +5F47:0020F9FC08240BFE082479FC402042AA43AE7A220BFE0A220BAE0AAA52AA2422 +5F48:0000FBDE0A520A520BDE780041FC412441FC792409FC08200BFE082050202020 +5F49:0088F88809FC088808887BFE402041FC412479FC092409FC0800088851042202 +5F4A:0000FBFE080009FC092479FC412443FE400079FC092409FC092409FC500023FE +5F4B:0000FBFC0A940A940BFC780047FE400043FC7A040BFC08A209140B085D442182 +5F4C:0000F7FC124814441FFEF44486EC855486ECF44416EC155416EC1444A4544408 +5F4D:0040F02017FE148815FCF48887FE842085FCF52415FC152415FC1400A4884904 +5F4E:21084FD2F03C23884812FBBE0280ABAA00003FF000103FF020003FF800080070 +5F4F:03DEFA520BDE0A520BDE78A041FE432045FC792009FE080009FC08885070278E +5F50:000000007FF800080008000800083FF800080008000800087FF8000800000000 +5F51:04000400040008000FF008101010102020203FE00040004000800080FFFE0000 +5F52:080008004BFC480448044804480449FC4804480448040804100413FC20044000 +5F53:0100210811080910092001007FF80008000800083FF80008000800087FF80008 +5F54:08000FE0082010201FC000400040FFFE010021081190056009203118C5060200 +5F55:00003FF0001000101FF000100010FFFE010021081190056009203118C5060200 +5F56:08000FF010101FE00020FFFE02000D08719002A00CC071A006981886E2800100 +5F57:1010FEFE10107C7C1010FEFE101000007FF8000800083FF8000800087FF80008 +5F58:08000FF010101FE00020FFFE0200421043D2751441184FD041126292444E0820 +5F59:08000FF010101FE000207FFE40029FF411101FF011101FF00100FFFE1110610C +5F5A:00003FF000101FF000107FFE40029FF411101FF011101FF00100FFFE1110610C +5F5B:3FF000101FF00010FFFE92485484FF7A3828544892980820FFFE082010202020 +5F5C:08000FF010101FE00020FFFE92485484FF7A3828544892980820FFFE08201020 +5F5D:08000FE010201FC00040FFFE92245478FE1238FE545492920820FFFE08201020 +5F5E:3FF000101FF00010FFFE92245478FE1238FE545492920820FFFE082010202020 +5F5F:0044FDFE04540448FCFE059004FEFC9000FE0890FEFE088049FE2844083819C6 +5F60:7E4403FE3E5402487EFE0190EEFE4A906EFEC09004FEFE8045FE244424380DC6 +5F61:0040008001000600180000200040018006001800001000200040018006003800 +5F62:00007F8412041208121012221202FFC412081210122212022204220842108260 +5F63:100408040808FF90222422442208221214221444080808101420230040FE8000 +5F64:00003F04210421082910252225022104FFC82110212221022104410845108260 +5F65:020001003FF8042003C004203FFC202021C02E10206021882E10406043809C00 +5F66:020001003FF8082004403FFC2000202021C02E10206021882E10406043809C00 +5F67:005000480040FFFE004000507C6045C8445044647DA800120E32F0CA43060002 +5F68:0002FFE2000400087BD04A424A424A446B485AD04A424A424A444A484A505AE0 +5F69:010007847804088844902522200204047F880C10162215022484440884100460 +5F6A:0400078404043FC8245027243C84238820102F24290429084912512290FE2000 +5F6B:00003F84248424882E9024A23F8220842E882A902AA22E822084408842908160 +5F6C:1082108210841088FBD01082308239C455A852909282148210841088109010A0 +5F6D:08000804FF84080808107F2200027F04410841107F22000222041788F8104060 +5F6E:10000804FF848088141022224902140422084110BEA22202220422083E102260 +5F6F:0000FF8414047F08551055227F0200047F080010FFA208022A044908A8901060 +5F70:100008047F0422081410FFA200027F0441087F1041227F020804FF8808100860 +5F71:00007F0441047F0841107F220802FFC400087F1041227F020804490888901860 +5F72:7BC200027BC44A486B504A4204027FC44A087FD04A427FC252445B88525099E0 +5F73:0800080010002000480008001000300050009000100010001000100010001000 +5F74:08400840108020FC490409041204348450449024102410041004100410281010 +5F75:08400840104022404A580A6812C8374852489268125012441244120411FC1000 +5F76:100017F82108411091101120213C6104A1042288228822502420245028882306 +5F77:08400820102023FE48800880108030FC50849084108410841104110412281410 +5F78:082009201120211049100A48124834445882908011101108120817FC12041000 +5F79:080009F01110211049100A0E140033F851089110109010A0104010A013181C06 +5F7A:0800080013FE2020482008201020302051FC9020102010201020102017FE1000 +5F7B:1000120022FC42249224122423A46E24A224222422A423242244204420942108 +5F7C:08200820102023FE4A220A24122033FC52849288124812501220145014881906 +5F7D:0808083C13E022204A200A20122033FE5220921012101212120A128A13261212 +5F7E:0840084010A020A049100A481426302053F890081010111010A0104010201020 +5F7F:08900890109023FC4894089413FC3290529093FE10921092111A111412101410 +5F80:08800840100027FC484008401040304057FC904010401040104010401FFE1000 +5F81:0800080013FE20204820082011203120513C9120112011201120112017FE1000 +5F82:080009F811082108490809F811083108510891F8110811081108110817FE1000 +5F83:082009201120212049FC0A2012203420502091FC102010201020102017FE1000 +5F84:08000BF8101020204860089811043602500093FC104010401040104017FE1000 +5F85:08400840104023FC4840084017FE3010501097FE101012101110111010501020 +5F86:08000FFE1090209048900BFC1294329452949294129C13041204120413FC1204 +5F87:08800880110021FC4A040C0413E43224522493E41224122413E4100410281010 +5F88:08000BF8120822084BF80A08120833F852449248123012201210128813061200 +5F89:09040884108820004BFE0820102031FC5020902013FE10201020102010201020 +5F8A:0800080013FC22044A040AF4129432945294929412F41204120413FC12041000 +5F8B:0840084013F820484FFE084813F83040504093F81040104017FC104010401040 +5F8C:08200840108821104BE00840108833FC5084908011F813081490106011981606 +5F8D:0820082011FC20204820082017FE30005020902011FC10201020102017FE1000 +5F8E:080009FC11042104490409FC1000300053FE9020102011FC1020102013FE1000 +5F8F:082008201120213C4920092017FE300050209124112412281410102010C01700 +5F90:1040104020A04110920815F620406040A7FC2040225022482444284421402080 +5F91:08000BFC100021244A480C9012483124500093FC104010401040104017FE1000 +5F92:0820082011FC20204820082013FE302050209120113C112012A01260143E1800 +5F93:080409041088209048000BFE102030205120913C1120112012A01260143E1800 +5F94:0888088813FE208848880840102033FC5008901010201040108011001280147E +5F95:10401040204047FC9040124821486150AFFE20E0215021502248244428422040 +5F96:0840082013FE2202480009FC1000300053FE9020112811241222142210A01040 +5F97:08000BF8120823F84A080BF8100033FC501097FE101012101110101010501020 +5F98:089008901090279E489008901090339C509090901090179E1090109010901090 +5F99:082008201120213C4920092017FE300050209120113C112012A01460183E1000 +5F9A:104010402FFE404097FC1444255464E4A44427FC20E0215022482C4620402040 +5F9B:0840084013FC20A049100A0817FE300853C892481248124813C8100810281010 +5F9C:0820092410A420A848200BFE1202320252FA928A128A128A12FA1202120A1204 +5F9D:0840084017FC204048400BF8120833F8520893F8120813F8120812081FFE1000 +5F9E:088808881088208849540A221442302050209120113C112012A01260143E1800 +5F9F:100017FC2444444495F41444244467FCA40425F42514251425F4240424142808 +5FA0:08400840104027FC48400A4812483248555490E0115011501248144418421040 +5FA1:1400140027DE4912911211122FD26112A11225D22512251A25D43E1028102010 +5FA2:1040104027FE404093F8104827FE6048A3F820402240227C2240254024FE2800 +5FA3:11101110211047FC911011102FFE6000A3F82208220823F82208220823F82208 +5FA4:08100810177C211449FE0A14127C3710517C951015FE12101210150018FE1000 +5FA5:080009FC1104210449FC0904110431FC500093FE10201120113C112012A0147E +5FA6:100017BC24844484948417BC24006400A7BC2424242427A82410242824442482 +5FA7:0840082013FE22024A020BFE1200320053FE9352155215FE1552155219521106 +5FA8:0840088013F822084BF80A0813F8300057FC9040104013F81040104017FC1000 +5FA9:0900090011FE22004DFC090411FC310451FC908010FC11081290106011981606 +5FAA:103C17E02420442097FE142025FC6504A50425FC250425FC2904290431FC2104 +5FAB:0880088013F821084FFE080013F8320853F8904017FC1040144017FE10401040 +5FAC:0840082013FC210848900BFE12023444502093FC108010F81088110811281210 +5FAD:0808083C13C020044A44092811FC3220502093FE102011241124112411FC1004 +5FAE:110815482548455097DE102420146FD4A0142794249424A824C8249428143022 +5FAF:083C0FC0124421284880091013E03040518893FC1044104017FC10A01110160E +5FB0:08000BFE1020213C4920092017FE300057FE90201120113C1120112017FE1000 +5FB1:100017FC20A047FC94A414A427FC6000A7FC20002FFE20402248244429422080 +5FB2:100017FC240447FC942014A8247064A8A50424A024FC252024202BFE28203020 +5FB3:0820082017FE204048400BFC1294329453FC904010241522150A190810F81000 +5FB4:12101A902A904AA08FBE104420246FA4A22422282FA8221022282FA820442082 +5FB5:110815482548455097DE101427E46014A7D4211427D4210821082FD420242042 +5FB6:1108110825484390911E17D425646554A554275425D4254825482554246424C2 +5FB7:104010402FFE404097FC14A424A467FCA0002FFE204020242522250A290820F8 +5FB8:08400BF8111020A04BFC080013F8324853F8924813F8104013F8104017FE1000 +5FB9:1210111027D0421094BE1FE420546794A49427942494278824882494249425A2 +5FBA:0820082011FC20204BFE0908139C31085188963E100013FE109010901112120E +5FBB:104010A023184DF6900017FC255464E4A7FC200023F8220823F8220823F82208 +5FBC:121014102F9048909FBE18A42FD46414A2142FD424142788248828942A943122 +5FBD:12101A902A904FA0803E1FC4242468A4AF24222824A83FD022282AA832442682 +5FBE:12101A902A904F90943E12242FD46014AF9420142F9420082F8828942F942022 +5FBF:0910089013DE20104A5E098213DE301053DE925013DE125013DE1250125212CE +5FC0:104017FC200043B892A813B8211067FCA11027FC21102FFE212823102D482186 +5FC1:0BF80A0813F822084BF80A4813F8344457FC90801FFE1248155418E2115016C8 +5FC2:17BC14A427BC44A497BC14A427BC6120A3FE222027FC2A2023FC222023FE2200 +5FC3:0000020001000080008004000408240424042402440244128410041003F00000 +5FC4:1000100010001000180054005000500090001000100010001000100010001000 +5FC5:00000400021001100120082028482844288449024A028C120810181027F04000 +5FC6:1000100013FC1008181054205040508090801100110012021202120211FE1000 +5FC7:104010401040104019FC54445044504490441084108410841104110412281410 +5FC8:00003FF80000000000000000FFFE000001000880088848044812481287F00000 +5FC9:1000100017FC1084188454845084508490841084110411041204120414281810 +5FCA:1000100013FE1020182054205020502090201020102010201020102010A01040 +5FCB:1000100013F8100818085408500853F892081200120012021202120211FE1000 +5FCC:00003FF0001000103FF02000200420041FFC0100088848844812481287F00000 +5FCD:00003FF802081208120824080808105060200100088848844812481287F00000 +5FCE:001000F83F0001000100FFFE0100010001000000010008844892481287F00000 +5FCF:1010107813C0104018405440504057FE90401040104010401040104010401040 +5FD0:02000200020003F8020002000200FFFE00000100088848844812481287F00000 +5FD1:0000FFFE02000240022002100208020000000100088848844812481287F00000 +5FD2:0048004400440040FFFE0040084004401440554050A050A29292120A0E060002 +5FD3:100011FC1020102018205420502053FE90201020102010201020102010201020 +5FD4:10801080110011FE1A00540051F8500890101060108011001202120211FE1000 +5FD5:1040104010401840544053FE50409040104010A010A010901110110812041402 +5FD6:10101010101010101BFE54105010501091101090109010101010101010501020 +5FD7:0100010001087FFC0100010001103FF800000A102908292C6824482407E00000 +5FD8:02000100FFFE10001000100010001FF800000100088848844812481287F00000 +5FD9:10201010101010001BFE54805080508090801080108010801080108010FE1000 +5FDA:1020102010201120192C5534516453A491241134112811221122110210FE1000 +5FDB:100011F0111011101910551051905150915011101110111211121212120E1400 +5FDC:010000803FFE2000210020802240220022002A082A042A145210421081F00000 +5FDD:00003FF801000100FFFE0280044009203118C106119011482124412405000200 +5FDE:020001007FFC0820044003800C603018C0060100088848844812481287F00000 +5FDF:10401020102013FE188854885088508890881050105010201050108811041602 +5FE0:010001003FF82108210821083FF8210801000100088848844812481287F00000 +5FE1:10201020102010201BFE5622522252229222122213FE12221020102010201020 +5FE2:00007FFC020002003FF0041004100810FFFE0000010008844892481287F00000 +5FE3:100013FC1084108818885490509C508491441144112811281210122814441182 +5FE4:10801080108011FC192056205020502093FE1020102010201020102010201020 +5FE5:100010003FFC20004FF080003FF000100810041014905050514A514A8F060002 +5FE6:1040104010A018A0551052085406911011101110111011101110121012101410 +5FE7:10901088108810801BFE54A050A050A090A010A01120112211221222121E1400 +5FE8:1000100013F818005400500057FC9120112011201120112012221222141E1800 +5FE9:04400440082010102208C44608201FF000100100088848844812481287F00000 +5FEA:102011201120191055105248524894441882108011101108120817FC12041000 +5FEB:10401040104013F8184854485048504897FE104010A010A01110111012081406 +5FEC:100013F81008191054A0504057FE904210441040104010401040104011401080 +5FED:10401020102010001BFE54405040506090501048104410441040104010401040 +5FEE:10401040104017FE18405440504057F892081208111010A0104010A011181606 +5FEF:1008103C13E012201A205620522053FE9220121012101212120A128A13061202 +5FF0:1080108013F01890549051125112924E144010401FFE10401040104010401040 +5FF1:10401040104013FC1A4454485040504090A010A010A0112011221222141E1800 +5FF2:10401040104010401BFE5440504050A090A010A0111011101288124814441802 +5FF3:10201020102013FE1820552451245124912411FC1024102010221022101E1000 +5FF4:1040104010A018A05510528854469040100013F8100810101010102010201040 +5FF5:01000100028004400A203118C1060FE000400080010008844892481287F00000 +5FF6:1000100011FC18005400500053FE90201020104010401088110413FE11021000 +5FF7:10001008110810881A5256525222522292521292130A120A120213FE10021000 +5FF8:100013F81088108818885488508857F891081108110811081108110817FE1000 +5FF9:1000100013FE1020182054205020502091FC1020102010201020102017FE1000 +5FFA:10801080108010FC1904550852405440904010A010A010901110110812041402 +5FFB:1008101C11E011001900550051FE511091101110111011101110121012101410 +5FFC:10801040104017FC1800540051F05110911011101110111211121212120E1400 +5FFD:080008001FF81248224844880888110822280410010008844892481287F00000 +5FFE:1100110011FC1A00540051F85000900013F8100810081008100A100A10061002 +5FFF:0440082010102FE8C4260420082010A060400100088848844812481287F00000 +6000:1000100017FE102018205440504050D091481244144210401040104010401040 +6001:010001007FFC0100028004400A203118C0060100088848844812481287F00000 +6002:0820082008200820145012502288208841048202010008844892481287F00000 +6003:100013FC104018405440504057FE904010A010A010A0112011221222141E1800 +6004:100013FC120012081A8856505250522092201250125012881308120013FE1000 +6005:110011081108111019205540510057FE91401120112011101108114411821100 +6006:1040104010A018A055105208540691F011101110115011201104110410FC1000 +6007:100013FE120012001A0057FC520452049204120413FC12001200120013FE1000 +6008:10481248124812481A4857FE5248524892481248127812001200120013FE1000 +6009:1080108011FC11041A0455F451145114911411F4110411281112110210FE1000 +600A:100013FC108410841884550451145208940011FC110411041104110411FC1104 +600B:100013FC120412041A0457FC5220522093FE1220122012101212128A13061202 +600C:100013FC102010201840544050D0514892441444104010401040100017FE1000 +600D:10801080108018FE554051405240907C104010401040107E1040104010401040 +600E:080008000FFC1400240047F00400040007F80400010008844892481287F00000 +600F:10401040104013F81A48564852485248924817FE104010A010A0111012081406 +6010:10801080110011FC1A04540451E451249124112411E411241004100410281010 +6011:2040224421483150A840A7FCA040A04020402FFE204020402040204020402040 +6012:10001000FEFC22844488285010202858C5860000010008844892481287F00000 +6013:21002100213E211237D2AA52A252A254A254249422882108229424A428422080 +6014:1000100013FE10201820542051205120913C1120112011201120112017FE1000 +6015:10201020104011FC190455045104510491FC1104110411041104110411FC1104 +6016:10401040104013FE188054A0512051FC93241524112411241134112810201020 +6017:104010401040187E544050405040904013FC1204120412041204120413FC1204 +6018:010001007FFC010001001FF0101010101FF00100088848844812481287F00000 +6019:10201020102010201BFE54205020502091FC1104110411041104110411FC1104 +601A:100011F811081108190855F851085108910811F8110811081108110817FE1000 +601B:1000100011FC11041904550451FC51049104110411FC11041000100013FE1000 +601C:1040104010A018A0551052485426902013F810081010111010A0104010201020 +601D:00003FF8210821083FF8210821083FF820080100088848844812481287F00000 +601E:10201020102010201BFE562252225222922213FE122212221222122213FE1202 +601F:1008103C13E012201A205620522053FE9220121012101212120A128A13261212 +6020:02000400082010103FF800081FF0101010101FF0010008844892481287F00000 +6021:10201020104018405488510453FE9002100011FC110411041104110411FC1104 +6022:102010201120112019FC55205220502093FE1020105010501088108811041202 +6023:090009001FF0210001007FFC0280044008203018C10608844892481287F00000 +6024:0810081017FE3010521091101110105010200100088848844812481287F00000 +6025:08000FE0102020405FF8000800081FF8000800083FF802005104511290120FF0 +6026:100013F8104010401A4855485150504097FE1040104010401040104010401040 +6027:102010201120112019FC552052205020902011FC102010201020102013FE1000 +6028:100010F83E884288A2A8149008841084207CC000010008844892481287F00000 +6029:100011FC11041104190455FC51005140914411481170114011421242123E1400 +602A:100017F81208111018A0544050A053189C46104017FC1040104010401FFE1000 +602B:10901090109013FC1894549453FC5290929013FE10921092111A111412101410 +602C:1000100013FE12521A5256525252525292521292128E13021202120213FE1202 +602D:1000104010201028180854885090529492A212A214C210881188128814781000 +602E:2220222022203420AD7CA924AE24A2242424242429242F242144204420942108 +602F:10401040104010401BFC54405040504097FE1040108010801110120817FC1204 +6030:10401020102013FE184054405088510893F0102010401088110413FC11041000 +6031:080008001FF812482A4844880A88110822A80410010008844892481287F00000 +6032:100013FE10201020182057FE522252229252124A128A130212021202120A1204 +6033:100013FC120412041A04560453FC5090909010901090111211121212140E1800 +6034:10281024102410201BFE56205224522492241228122812901312122A10461082 +6035:10201028102410201BFE54205070507090A810A8112412221420102010201020 +6036:10201020102013FE1A225624522053FC92841288124812501220145014881906 +6037:011001080100FFFE01001110111011102110C00E010008844892481287F00000 +6038:0120011001007FFC0380054009203118C1060000010008844892481287F00000 +6039:104010402240227863C8AE48226822522242220221FE02005104511290120FF0 +603A:10401020101019E05422503453B890B010A810A8112811241224142210A01040 +603B:10100820044000001FF01010101010101FF01010010008844892481287F00000 +603C:000800087E0802FE240814480828140822284010010008844892481287F00000 +603D:10401040104013FC18405440504057FE90E01150115012481444184210401040 +603E:1000100011FC1104190455045104510491FC1104100010901088110412021402 +603F:100017F81208111018A0544051B0564E904013F81040104017FC104010401040 +6040:1040104010FC11081A90546050485190963E1042108413481030102010C01700 +6041:08380BC01040304057FC90401040104013F80100088848844812481287F00000 +6042:10801080110011FC1A04540453E45224922413E41224122413E4100410281010 +6043:1040104010401BFC5440504057FE9010101017FE101012101110111010501020 +6044:10201020102013FE1820542051FC5000900011FC110411041104110411FC1104 +6045:10401040104419F45448505053FE904010801184129814E010821082107E1000 +6046:100017FE10801080188054F85108514891281208128810501010101017FE1000 +6047:100013FE120012001BFC5620522052F892201220122013FC1200120013FE1000 +6048:10401040109011081BFC54245120512091FC1220102017FE1020102010201020 +6049:11001104113811C01902550250FE500091FC1104110411FC1104110411FC1104 +604A:2040204023FC3084A884A114A208A01024102FBE24922492249228A22AAA3144 +604B:02000100FFFE0440145014482444444400000100088848844812481287F00000 +604C:109010901090129219945498509051989294149210901090111211121212140E +604D:10401044124419485550504057FE9090109010901090109211121112120E1400 +604E:100013FE102010401888550453FE50229020102013FE10201020102017FE1000 +604F:100010FCFE042208221064FE141008103450C220010008844892481287F00000 +6050:00007DF011101110119011501D12E212440E0800010008844892481287F00000 +6051:1040104010FC11041A0855FE5100517C914411441154114811421242123E1400 +6052:100013FE1000100019FC5504510451FC9104110411FC11041000100013FE1000 +6053:100017FE10901890549053FC5294929412941294129C13041204120413FC1204 +6054:10401020102013FE180054885104520290881088105010501020105010881306 +6055:10001000FE7C2244444434440844147C2244C000010008844892481287F00000 +6056:020004003FF8244822882108228824483FF80100088848844812481287F00000 +6057:1020102013FE10501888550452FA500093FE1040108011FC1004100410281010 +6058:109010901090191055FE53105510913811381154115411921110111011101110 +6059:082004407FFC010001003FF801000100FFFE0100088848844812481287F00000 +605A:01003FF801000100FFFE000001003FF801000100FFFE02005104511290120FF0 +605B:1000100013FC12041A0456F4529452949294129412F41204120413FC12041000 +605C:102810241024182057FE5020502097E0112011101110111011CA170A12061002 +605D:080008007F7C08243E2408247F44085408880100088848844812481287F00000 +605E:1040104017FC10401BF8544853F8524093FC1044105410A810A0111012081406 +605F:11001100110019FE56025202551298A2124A12AA131A120A13FA100210141008 +6060:10401040104013FE1880549051105110937C151011101110111011FE11001100 +6061:10081190106010981B045440504057FE90801090111011201248148419FC1084 +6062:10401040104013FE188054905090511291521154129012281428104410841102 +6063:4080208009FC12042448E04020A023182C060100088848844812481287F00000 +6064:10401040108011001BFC56945294529492941294129412941294129417FE1000 +6065:0000FF20241024103C00244024403D44254225422E42F4484448044804380400 +6066:10401040108013FC1A04560452F4529492941294129412F41204120412141208 +6067:0000FFFE020004003FF824882488248824A82010010008844892481287F00000 +6068:100013F8120812081BF85608520853F892441248123012201210128813061200 +6069:00003FF8210821082FE821082288244828283FF8010008844892481287F00000 +606A:1080108010F811081B1054A0504050A09118120615F811081108110811F81108 +606B:200027FC2404240435F4AC04A404A5F4A5142514251425F42404240424142408 +606C:1008103C11E01020182055FE50205020902011FC110411041104110411FC1104 +606D:044004403FF804400440FFFE0440082012102208C2261290124822480A000400 +606E:1040104010A011101A08540653F850409040104013F810401040104017FE1000 +606F:010002001FF010101FF010101FF010101FF01010010008844892481287F00000 +6070:1040104010A011101A08540653F85000900013F8120812081208120813F81208 +6071:10901090110811481A445492510853FC909410901090109011121112120E1400 +6072:11041084108810001BFE548850885088908817FE108810881108110812081408 +6073:00003FF020103FF020103FF0220821902C60301C010008844892481287F00000 +6074:02000100FFFE00003FF820083FF820083FF80100088848844812481287F00000 +6075:01000100FFFE01003FF821083FF821083FF80000010008844892481287F00000 +6076:00007FFC04402448144814500440FFFE00000100088848844812481287F00000 +6077:08400840104037FC50E091501150124814441842104002005104511290120FF0 +6078:2010201027903010A87EA012AFD2A21222122422252228A22FC2204220942108 +6079:100013FE122012281A24562053FE522092201250125012501488148819041202 +607A:102011241124112419FC540051FC5004900411FC110011001102110210FE1000 +607B:200427C4244424543554AD54A554A554A5542554255421042284224424142808 +607C:10401020102017FE180054005090525492241224125412941204120413FC1004 +607D:100013FE12021C44544053FC508090A0112011FC1020102017FE102010201020 +607E:1090109017FE109018905440502057FE91001100110011001100110011FC1000 +607F:3FF0066001803FF821083FF821083FF821082018010008844892481287F00000 +6080:100013FC100818D0542053FE5222922213FE1222122213FE12221222122A1204 +6081:100011F81108110819F8540053FC5204920413FC1204120413FC120412141208 +6082:12201224122813B01A20562252A2531E9040104013FC10401040104017FE1000 +6083:200027FC244424443444AFFCA444A4C4A4E42554264424442444240427FC2404 +6084:1020112410A410A8182055FC5104510491FC1104110411FC1104110411141108 +6085:10101090108811081A0455FA51085108910811F810901090109011121212140E +6086:010002800C603018CFE601003FF8111025080200010008844892481287F00000 +6087:1040104010A011101A0855F65040504097FC1040125012481444184411401080 +6088:10101014101210101BFE54105150515497F4115411541148124A125A14261042 +6089:00F83F00111009200100FFFE092011102108C006010008844892481287F00000 +608A:080C08F07E8008800EFE78880888290812080100088848844812481287F00000 +608B:1040102017FE11081890546050605198960611F8110811081108110811F81108 +608C:11081088109013FC1824542453FC5220922013FE106210A2112A122414201020 +608D:100011FC110411FC190455FC5000500091FC1020102013FE1020102010201020 +608E:10201120112011FE1A205420502053FE9000100011FC11041104110411FC1104 +608F:10201020102013FE1820542051245124912412AA102010501050108811041202 +6090:4420282010A428A448A8992028204850885008885104220201004884481287F2 +6091:1048104413FE1840544053FC5244924413FC1244124413FC1244124412541208 +6092:100011F81108110819F8540053FC52449244124413FC12001202120211FE1000 +6093:100013F8120812081BF85608520853F89208120813F81120112012221422181E +6094:1100110011FC1A0055F851085148912817FE11081248122813FC100810501020 +6095:2208211020E03110AA08A080AFFEA140224027FC2A4422442254224820402040 +6096:1020102013FE1820542053FE5202940411F81010102013FE1020102010A01040 +6097:1080108011F81A08541053FC52449244124413FC10A010A011221122121E1400 +6098:00003FF8240027F028803FFC2140222024103FFC010008844892481287F00000 +6099:1040102013FE100019F85508510851F8900013FC100810301020102010A01040 +609A:1020102013FE1020182055FC5124512491FC1020107010A81124122210201020 +609B:10401040108811041BFE540250885144924210F8118812501020105011881606 +609C:100011FC11041104190455FC5000500093FE1020102011FC1020102013FE1000 +609D:200027FC2444244437FCAC44A444A7FCA040204027FC2040204020402FFE2000 +609E:100010F8108810881AF85600520053FC9044104417FE104010A0111012081406 +609F:100013FE1040104019FC5484508453FE9000100011FC11041104110411FC1104 +60A0:10401040247E6488A54824502420205820862300010008844892481287F00000 +60A1:0604780408440844FF441C442A44490488140808010008844892481287F00000 +60A2:1080104013F812081A0857F85208520893F81240124412281210128813061200 +60A3:01001FF0111011101FF001003FF8210821083FF8010002005104511290120FF0 +60A4:020004003FF8220823C824482A882108228824083FF8200801004884481287F2 +60A5:02000100FFFE00003FF800003FF800003FF820083FF802005104511290120FF0 +60A6:12081108111010201BF856085208520893F810A010A0112011221222141E1800 +60A7:108411C4170411141914551457D4511493141394155415041904110411141108 +60A8:0900090011FC3204544899501148124414441140108002005104511290120FF0 +60A9:104212221124110418085400520A528A925212221252128A130A120213FE1002 +60AA:00007FFC04403FF8244824483FF80440FFFE0100088848844812481287F00000 +60AB:01007FFC01003FF800007FFE40028FE4082010222022C11E288828A4482407E0 +60AC:1FF010101FF010101FF01010FFFE082010103FF810080100288828A4482407E0 +60AD:108012FC12A412A41AA8569052A850C69020102011FC10201020102013FE1000 +60AE:200023F82208220833F8A800A000A7FCA04020402FFE204020A0211022082C06 +60AF:110010BE128212021A42562253FE5292925212221252128A130A1202120A1204 +60B0:1040102013FE1202180055FC5000500093FE1020112811241222142210A01040 +60B1:109010901090179E189054905090539C909010901090179E1090109010901090 +60B2:044004407C7C044004403C78044004407C7C0440010008844892481287F00000 +60B3:00803FFE008007F8240827F8240827F8240827F820003FFE01004884481287F2 +60B4:1080104013FC18005510511052A894441000104017FE10401040104010401040 +60B5:100010FC108018F8548050F8508097FE11401124112811101108114411821100 +60B6:00007C7C44447C7C44447C7C42044104450454245454645443C4400440144008 +60B7:1040102013FC12041A0457FC52005228922413FE122012501250148815041A02 +60B8:203823C0204027FC30E0A950A248AC46A3F02020204027FC2040204021402080 +60B9:01007FFE40029FE410201FE010001FF0101010101FF002005104511290120FF0 +60BA:1040102013FE1A02540451F85108910811F81100110011FC1104110411FC1104 +60BB:1020102013FE1020182057FE5088505093FE1020102017FE1020102010201020 +60BC:10401040107E10401BFC560453FC520493FC1244104017FE1040104010401040 +60BD:1040104017FC10401BF8544857FE504893F8108017FE11081390106011981604 +60BE:10401020102013FE1A02549451085204900011FC102010201020102017FE1000 +60BF:100013FC104010401BFE54A05110520894461040104812641252145211401080 +60C0:2040204020A03110AA08ADF6A000A7FC24A424A427FC24A424A424A424142408 +60C1:080C08F07E8018802CFE2A884888888809080100088848844812481287F00000 +60C2:1080108010F811081A1054005040539C92041204139C12041204120413FC1204 +60C3:100013FC120412041BFC5604520453FC90001220122413A81230122212A2131E +60C4:08000F7C08440844FF4808282A30491089282844108202005104511290120FF0 +60C5:1020102013FE102051FC582057FF940011FC110411FC110411FC11041114110C +60C6:100013FE122212221AFA5622522253FE920212FA128A128A12FA1202120A1404 +60C7:1040102013FE100019FC550451FC500091FC1008101013FE1020102010A01040 +60C8:100013F8124812481BF85648524853F8904017FC10E011501248144610401040 +60C9:10400840407E2040084013FC7204120413FC1000010008844892481287F00000 +60CA:1040102013FE1000180055FC5104510491FC1020112811241222142210A01040 +60CB:1040102013FE12021D04550051DE525292521352149A1094111011121212140E +60CC:020001007FFE400290041EF8228824A8549008841084607C01004884481287F2 +60CD:1040104010A011101A08540651F05040904013F8104012481148115017FC1000 +60CE:08207FFC08200FE008200FE00820FFFE10102208C10609002828282447E40000 +60CF:211021102110211037BCA910A110A338A3B82554255429922110211021102110 +60D0:10141012101017FE1810541053D252529252125413D4100810EA171A12261042 +60D1:00500048FFFE00403E4022243E2800120E2A70C603020100288828A4482407E0 +60D2:0600787C08440844FF441C442A44497C88440800010008844892481287F00000 +60D3:1020112410A81BFE5440508057FE9108120415FA1908110811281112110210FE +60D4:104012441244144818A0551056085044904012481248145010A0111012081C06 +60D5:100011FC110411FC190455FC5080508091FE124A144A10921122124210941108 +60D6:1FF010101FF010101FF008001FF82248448809081228241001004884481287F2 +60D7:2040204020A03110AA88A446A800A3F020102020204021242522250A290820F8 +60D8:100013FE1202128A1A5257FE5242522293FE12821282128212FA1202120A1204 +60D9:200027BC208422943108AA94A4A4A840A00027BC20A422A42128229024A82846 +60DA:1080108010FC11541A5454A45124524490941108104010A412AA128A14781000 +60DB:101C13E0122013FE1A205692530A520691FC1104110411FC1104110411FC1104 +60DC:10881088108813FE1888548857FE500091FC1104110411FC1104110411FC1104 +60DD:1020112410A410A8182057FE5202520292FA128A128A128A12FA1202120A1204 +60DE:201020902710243E3422AC44A790A510A5102510252825282528294429443082 +60DF:10A01090108011FE1910571055FC5110911011FC11101110111011FE11001100 +60E0:010001007FFC01003FF821083FF821083FF80104FFFE0102288828A4482407E0 +60E1:00007FFC04403C78200820083C780440FFFE0000010008844892481287F00000 +60E2:01000080088848044812481287F00000101008082220A124A4A2A4A41D1C0000 +60E3:108050807CFC515492541CA4F124124410941108010008844892481287F00000 +60E4:10101388108810FE1890579052245224923813881090109010A410BE12821100 +60E5:01000500397821083D7821083FF8028004401830E10E08844892481287F00000 +60E6:1040102013FE12001A205620523E5220922012FC128412841284148414FC1884 +60E7:100013F8120812081BF8560853F8520893F8120812081FFE1000111012081404 +60E8:20802090210833FCA840A7FEA110A2482C862310202020C42308203020C02700 +60E9:100023FE40208920113C31205120912017FE1000010008844892481287F00000 +60EA:01007FFC01001FF010101FF010101FF010101FF01010FFFE01004884481287F2 +60EB:08000FF010202C4003801C70E00E1FF011101FF011101FF001004884481287F2 +60EC:200027FE2420242035FCAC20A524A4A8A7FE2420245024482484250427FE2000 +60ED:21002102211C2FD03210AA10A51EA7D4A114211421D42F142514212421242144 +60EE:11041088105011FC1924552451FC5124912411FC1020102013FE102010201020 +60EF:11FC1124112413FE1924552451FC500091FC1104112411241124105810841302 +60F0:1040104013FE108019FC562055FE500091FC110411FC110411FC110411141108 +60F1:109211241248112418925440508053FE9202128A125212221252128A13FE1202 +60F2:100013FE122210201BFE542051FC512491FC112411FC102013FE102010201020 +60F3:080008F808887E8808F818881CF82A88488808F8010008844892481287F00000 +60F4:2040244424443444AFFCA000AFFEA040208027FC24A424A424A424A424A4240C +60F5:10901290129017FE1A90569052F0520093FC104017FE10E0115012481C461040 +60F6:1020104011FC110419FC550451FC500093FE1020102011FC1020102013FE1000 +60F7:01007FFC01003FF80200FFFE08201FF02828CFE608200FE001004884481287F2 +60F8:110011FE120215F2191255F2511251FA900413F81010102017FE102010A01040 +60F9:08207FFC08200200FFFE08001FF02810C8100FF0010008844892481287F00000 +60FA:100011FC110411FC190455FC5020512091FE1220102011FC1020102013FE1000 +60FB:200227C22442245237D2AC52A452A7D2A452245227D2200222822242244A2804 +60FC:1040102013FE12021A0257FE5200520093FE1352155215FE1552155219521106 +60FD:100013FC120413FC1A2057FE5210528A9306100013FC120413FC120413FC1204 +60FE:10001088125212221A52568A520253FE90881144127A10881150102010D81706 +60FF:100011FC1104110419FC5504510451FC900013FE10201120113C112012A0147E +6100:208821C827083108A92AA12AA7ACA14823082388255425142914212421242142 +6101:0E207820082408A4FEA819202C504A50888809040A020100288828A4482407E0 +6102:08107F1008107F7E41123E1204120F1278220822284A108401004884481287F2 +6103:1040102013FE1A02540451FC500091FC110411FC110411FC1104100013FE1000 +6104:100013F8124812481BF85648524853F8900017FE124012441228129013081206 +6105:2110211027FC211031F0A840A3F8A248A24823F820402FFE2040204020402040 +6106:1200213C48009400217E6208AE08220822282210210008844892481287F00000 +6107:1040104011FC10841BFE540051FC510491FC102013FE1020122013FE10201020 +6108:010002800C6037D8C0063E0822483E4822483E482208261801004884481287F2 +6109:104010A0111012081DF6540053C45254925413D41254125413D41244125412C8 +610A:100013FE100011FC1904550451FC500093FE1222122213FE1222122213FE1202 +610B:103C17C012441928540053FC5080908017FE110011F812881250142018D81306 +610C:1080108010F811081A1055FC51045154918C1124102013FE1050108811041602 +610D:00207F20413E7F4448A47F244828451053286146010008844892481287F00000 +610E:1100110011FE1A0055FC510451FC910411FC108010FC11081290106011981606 +610F:01003FF808200440FFFE00001FF010101FF010101FF002005104511290120FF0 +6110:100017FE104010801BFC5694529452F49294129412F412941294129413FC1204 +6111:100013FC108810501BFE562253FE522293FE1222104013FE1042108211141208 +6112:100013F812081BF8560853F8510093FC1444124412A4120413F4100410281010 +6113:200023F8220833F8AA08A3F8A000AFFE220023FC249429242244248421282210 +6114:2080204027FC3000AA08A110AFFEA00023F82208220823F82208220823F82208 +6115:200027BC24A424A437BCA800A3F8A000A7FC2100220023F82008200820502020 +6116:1110111017FC111019F0551051F05110911017FE120012901308120013FC1000 +6117:00407F40127E0C88FF4819482A504820A850108C010008844892481287F00000 +6118:1040102013FE1202188054F85108529090601198160611F81108110811F81108 +6119:020001007FFE48029FF4282007C01830E00E1FF010101FF001004884481287F2 +611A:1FF011101FF011101FF001003FF8210821482FE82428201001004884481287F2 +611B:007C3F80110808907FFE41029494142823E808000FF01420224041800E60701C +611C:200027FE2420242035FCAC20A4A8A4A8A5742420245024482484250027FE2000 +611D:100013FE120012FC1A8456FC528452FC922013FE124812C812301248128413FE +611E:100013FE102010401BFE56525252525292421226102017FE1050108811041602 +611F:002800243FFE20202FA420242FA8289828924FAA4046808201004884481287F2 +6120:100011F81108110819F85508510851F8900013FC129412941294129417FE1000 +6121:1080108010FC11541AD454B4512C524490941108104010A412AA128A14781000 +6122:100013FC124412441BFC5644524453FC9000104010241522150A190810F81000 +6123:100013FC12941A94569453FC5080904017FE108010F810881108110812281410 +6124:102011FC102010881BFE5488500051FC91041124112411241124105010881304 +6125:2110211027FC21103150A840A3F8A248A24822482FFE204020A0211022082406 +6126:1020102011FC192455FC502053FE900011FC1104112411241124105010881304 +6127:2040208027FC24443444AFFCA444A484A7FC208021502164227C24422842303E +6128:08007F7808483E4800867F78414800303ECE0000010008844892481287F00000 +6129:100011FC102010201BFE540051FC510491FC110411FC110411FC108811041202 +612A:100011F81108110819F8540053FC520493FC120413FC120413FC109011081204 +612B:1040104017FC10401BF8544057FE5080911013E0104817FC1044124815441080 +612C:2200147CFF44087C4944497C7F44084410942108410008844892481287F00000 +612D:1040104411F810501BFE544050F85182927E140011FC110411FC110411FC1104 +612E:1008103C13C010041A44552851FC5220902013FE102011241124112411FC1004 +612F:10A0109011FE1B2055FC512051FC912011FE110013F811081090106011981606 +6130:100011FC110411FC190455FC5020512490A8102013FE1090109011121212140E +6131:1020101011FE190055205120553C93501190131015FE11101128122812441482 +6132:100011F8110811E8192857FE540251F8910811F8110811F81108110811281110 +6133:00003E7C22443E7C22443E7C22443E7C00000100088848844812481287F00000 +6134:10201020105018C8552453FE550491FC110411FC110011FC1284128414FC1084 +6135:100013DE104210421BDE5610521053DE90421252114A114A1252104212941108 +6136:104011FC10441094190857DE514A514A929411FC110411FC110411FC1104110C +6137:1040124812481A4857F8500057FC900013F81208120813F8111010A017FE1000 +6138:082008207F7C2A242A245D2408241C442A944808010008844892481287F00000 +6139:2040202023FE22023494A908A264A090A108220425FA21082108210821F82108 +613A:1088108813FE1088180055FC510451FC910411FC1124102013FE102010201020 +613B:000C7DF00440088811F010201C44F3FE102211245222206001004884481287F2 +613C:120C13F2120219FE540051FC550495FC150415FC150415FC140017FE11041202 +613D:1028102413FE102019FC552451FC512491FC1124100813FE1088104810481018 +613E:1100110011FC1A0055F8500053F8908812A811C817F8108A11CA16AA10861082 +613F:00003FFE208027F8240827F8240827F8225024482944208020444A424A1291F0 +6140:103C17C0124419285480511053E09040118813FC1044104017FC10A01110160E +6141:3FF820082FF822082D2822C82DA822982D8820083FF802005104511290120FF0 +6142:200017F8911040A047FC144427FCE44427FC244424040100288828A4482407E0 +6143:2120211022083486A910A3F8A008A00027BC208424A4229424A4208422942108 +6144:200027FC20A020A037FCACA4A4A4A7FCA040204027FC20E0215022482C462040 +6145:100013F81148111018A0544051B0564E904013F81248124813F8104417FC1004 +6146:103C13C010441224192855005040539C92041204139C12041204120413FC1204 +6147:0600387820483E4822863E0022FC3E4420283E1022284A4685004884481287F2 +6148:08200440FFFE10201020244878F0102024487EFC02040100288828A4482407E0 +6149:2080204027FC20803108ABF0A060A184A7FE200227FC244427FC244427FC2404 +614A:211020A0200027FE30A0ABF8A0A8A7FEA0A823F820A021B022A82CA620A020A0 +614B:108024987EE000847E7C42007E9842E07E844284467C02005104511290120FF0 +614C:2108210827FE21483020AFFEA200A200A3FC2000224822482248244A244A2846 +614D:200023F8224822A83318AA08A3F8A000A00027FC24A424A424A424A42FFE2000 +614E:2040204027FC204033F8AA08A3F8A208A3F8220823F822082FFE211022082404 +614F:100013FE1202100019FC550451FC510491FC1040102013FE1000108811041202 +6150:3FF801007FFC00001FF010101FF010101FF010101FF0082011104884481287F2 +6151:200023FC210821F83108A9F8A10EA7F8A00827BC20A422A42128229024A82846 +6152:1050105013FE10501BFE565253FE525293FE100011FC110411FC110411FC1104 +6153:20002FFE20A027FC34A4ACA4A7FCA000A7FC20002FFE20402248244429422080 +6154:2110211027FC21103000ABF8A208A3F8A20823F8204027FC20A0211022082C06 +6155:04407FFC04401FF010101FF010101FF00400FFFE12102208CB2612902A900400 +6156:200027FE242A242637FEAC22A7AAA6AAA7AA24322596262E2446248227FE2402 +6157:08200820FFBE08447FA449247F281C282A1049288844088201004884481287F2 +6158:2080211023F8221034A4AFBEA042A0A0A3182C46219026642188263021C02E00 +6159:08047F7808407F40497E7F4849487F4808487F48088802005104511290120FF0 +615A:22002202223C2FA03220AFA0AABEAFA4AAA42FA422242FA42224224422442284 +615B:1020122213FE1090188855FE5310551091FE1110111011FE1110111011FE1100 +615C:20203FA0403EBF4429A425247FE8292845107FA8014402825104511290120FF0 +615D:3FFC24202FF825203FFC220027F02A1033F020003FFC02005104511290120FF0 +615E:102011FC108810501BFE540051FC510491FC110411FC102013FE102010201020 +615F:21C8270821082FE8311EAFCAA54AA7CAA54A27CA210A27CA211221D22E2A2444 +6160:21082108210827D0311EAF94A124AFD4A21423D422542248224824D424242842 +6161:2040204027FC20403554AA48A554A040A5542248255420A020A0211022082C06 +6162:23F8220823F83208ABF8A000A7FCA4A424A427FC200023F8211020E023182C06 +6163:100011FC112413FE192455FC500051FC910411FC110411FC110411FC10881104 +6164:08787F4808483E8600787F4841489C2815102628404602005104511290120FF0 +6165:10101450127C1290181054FE50005600927C12441244127C1244150018FE1000 +6166:0A2009207FBE08446AA41C242A28491028281046010008844892481287F00000 +6167:1010FEFE10107C7C1010FEFE10103FF800081FF800083FF801004884481287F2 +6168:200027BE2488248837A8ACA8A4A8A7BEA4102518249825A826AA244A20462080 +6169:2010241022FE3210A8FEA092A6FEA29222FE221022FE22102210251028FE2000 +616A:100013FE1200127C1A445644527C520092EE12AA12AA12AA12EE120013FE1000 +616B:1110211041108AA814443240527C9240154018FE110008844892481287F00000 +616C:1088108813FE108818F8542051FC512491FC102013FE102011FC102013FE1000 +616D:081408127F104AFE2C10FF101C282A2849448882010008844892481287F00000 +616E:010001FC01003FFE21022FF4210027F8244827F8244827F820804A44521281F0 +616F:110011FC120015F8190855F8510851F8900017FE110013FC14A4112412541088 +6170:3F0821083F7E20082F4820285FA8440895282C90010008844892481287F00000 +6171:102013FE102011FC192455FC512451FC902213FE100813FE1108108810281010 +6172:1088108813FE1088188854F8502053FE9222133212AA137612221222122A1224 +6173:200027DC251427D43454AFC8A508A514A7E22000204027FC204020402FFE2000 +6174:100013DE10421252194A56525042502091FC1104110411FC1104110411FC1104 +6175:202027FE242025FC3424AFFEA424A5FCA42025FC252425FC252429FC2924312C +6176:00803FFE22203FFC22243FFC20003FFE20822A5431F2220027F84A0841F09E0E +6177:2040202027FE242035FCAC24A7FEA424A5FC2420256224B429282A2630A02040 +6178:145014507FFC245247CE80007FFC41041FF011101150112001004884481287F2 +6179:10407C4011F8FE48444828C87C68109AFE8A1106120202005104511290120FF0 +617A:204023F822482FFE3248ABF8A040A3F8A24823F820802FFE211020E023182C04 +617B:10401248115013F8188057FC5110520897FC1A0A13F8120813F8120813F81208 +617C:002800243FFE2220232422242FA822282A92522A46468102288828A4482407E0 +617D:20142012201027FE3410AC90A4D2A492A7F22494249425C82AAA289A31A62042 +617E:14202220493E144222944110BE28222822443E82010008844892481287F00000 +617F:43FE222023FC0A200BFC1220E3FE212227FA2122022602005104511290120FF0 +6180:100017BC108414A41A9454A450505188962610C0131010641388103010C01700 +6181:1040108013FC12441AF4571452A4524492A413FC104010241522150A190810F8 +6182:7FFC02001FF010101FF010107FFE41029494142823E808001FF0682007C0F83E +6183:01007FFC01003FF80200FFFE08203CF8D0161CF010101FF001004884481287F2 +6184:104027FC40408BF8120833F8520893F8120813F8120817FE01004884481287F2 +6185:7F200820FF2008FC7F2449247F2449247F2408447F440894FF08020851249FE4 +6186:1020112410A813FE1A0254F85088508890F81020102011FC1020102013FE1000 +6187:0688388809FE7E88088808F83E88228822883EF8010008844892481287F00000 +6188:1040107C104013FE1A42567853C4523C920012501254135414D8145019FE1000 +6189:1082108217F41088188057E2500253E49228122013E012221142107417881210 +618A:111017FC21102FFE6100A3F826482BF8224823F82248225801004884481287F2 +618B:082049202A3E7F4449A45D286B28491049284346010008844892481287F00000 +618C:08401440227C5C8489443E2C08144A2428C40E28701022005104511290120FF0 +618D:203823C0208027FE3110AA08A5F6A910A1F0200027FC240425F4251425F4240C +618E:11041088100013FE1A2256AA5272522293FE100011FC110411FC110411FC1104 +618F:2100211023DC22543554AA88A108A2F4A402200023FC20402150224825442080 +6190:20402248215027FC3150AA48A444A208A20823BE24882AA8213E220824082808 +6191:43FC22400BF80A4013F82240E3FC200425542008010008844892481287F00000 +6192:104013F8124813F8184057FE500053F8920813F8120813F8120813F811101208 +6193:204020402FFE204037FCAC44A7FCA444A7FC20442FFE204220242522250A28F8 +6194:2140212023FE22203620ABFCA220A220A3FC2220222023FE2200252424922892 +6195:202027A420A822923114AA08A5F4A802A3F82208220823F8220821102FFE2000 +6196:081408127F102AFE2A105D101C282A2849448882010008844892481287F00000 +6197:082008207F3E2A442AA45D2408281C102A284846010008844892481287F00000 +6198:102013FE102019FC540051FC510491FC108817FE100011FC1104110411FC1104 +6199:01007FFC01003FF800003FF820083FF80820FFFE20083FF801004884481287F2 +619A:100013DE125212521BDE540051FC512491FC112411FC102013FE102010201020 +619B:100013FE10501BFE565253FE500091FC110411FC110411FC102013FE10201020 +619C:2020272025FE2540357CAE90A57EA500A57C2544257C2644247C24442444244C +619D:08407F40007E3E8823483E4800503E5004207F500888290411004884481287F2 +619E:221021102FD0201037BEACA4A7D4A014A7942094211421C82F08211425142222 +619F:200027FC20A020A037FCACA4A4A4A7FCA248215027FC20E0215022482C462040 +61A0:3FFE289025102FBE22222AD42A902F90222844284444888201004884481287F2 +61A1:1210121013DE152818A4542053FE502093FE1222122A127410A8112416221020 +61A2:1020102011FC10201BFE5508539C51089188163E100013FE109010901112120E +61A3:103C13E0112410A81BFE54A85124520291FC1124112411FC1124112411FC1104 +61A4:102011FC102010881BFE548851FC510491FC110411FC110411FC108811041202 +61A5:08202AA80820145022887FFC400402003FF804080850302001004884481287F2 +61A6:108812AA12DC148819545622500053FE9242144413FC10441044108411141208 +61A7:102011FC108810501BFE540051FC512491FC112411FC102011FC102013FE1000 +61A8:7C200420FF3E22443EA422283E282390FE28424402820100288828A4482407E0 +61A9:1C10702010FCFE8410FC7C8444FC44847CFC4400010008844892481287F00000 +61AA:279E2492279E2492379EAC02A4F2A492A4F2249224F224922492253224022406 +61AB:200027BC24A427BC34A4AFBCA484A444A5F4242424A4244424A4250424142408 +61AC:100013F812081BF8560853F8504097FE100013F8120813F810401248144410C0 +61AD:2040204027FC20A03514AA08A7FCAA0AA3F8220823F820402248244429442080 +61AE:2100210023FC36A8AAA8A2A8A7FCA2A822A822A82FFE200022A8225424542000 +61AF:200027BC2108252837BCAB18A5AAA946A00023F82208220823F82208220823F8 +61B0:100013FC104810301BFE545250945350902013FE1252128A1376125212721206 +61B1:221421122FD22010307EAF90A490A490A790212825A825682928214A254A2286 +61B2:01007FFC41043FF801001FF00100FFFE01003FF824483FF801004884481287F2 +61B3:100013FC100413FC180457FC500053BC912417BC100813FE1108108810A81010 +61B4:200027FC24A424A437BCA8A0A7BCA4A4A4A427BC24A424A427BC24A220A2207E +61B5:00407C2045FC44887C5043FE7C20A5FC24203C20010008844892481287F00000 +61B6:1080104013FC1908549057FE500093FC120413FC120413FC10401524150A18FA +61B7:2110211027BC3110ABB8A554A912A00027FC2044224022782240254028FE3000 +61B8:2040204020A03110AA08A5F6A800A7BC24A424A427BC22102210252829443082 +61B9:109013FC12941BFC569453FC500093FC120012F8120013FE1520151415481986 +61BA:110011F8120817FE1A88572453FE520092FC120012FC120012FC148414FC1884 +61BB:102017FE100013FE1A0256FA528A53FE900011FC110411FC110411FC100017FE +61BC:2220FFA0223E20447FA481287D2845107D280A44048202005104511290120FF0 +61BD:21102FFE21103200ABFCA4A4ABA4A164225424942108204020242522250A28F8 +61BE:2014201227FE241035D0AC14A5D4A558A5CA24162442282422A2228A24782000 +61BF:2108220827C8245037DEAC64A7D4A214A11427D4221423C822482454255428A2 +61C0:204020A023182DF63000AFFCA554A4E4A7FC200023F8220823F8220823F82208 +61C1:200023FC22943294ABFCA000A7FEA00023FC220423FC20A2211423082D442182 +61C2:211027FE211023F83040AFFCA040A3F8A24823F8224823F8204027FC20402FFE +61C3:2220FFA022203EFC08247F2449247F2408247F440854FF8801004884481287F2 +61C4:228822882FE8228833BEA90AA7CAA54AA7CA210A27CA210A27D2211221EA2E44 +61C5:1040107C104013FE1A42567853C4523C920013FE124013A4125815B4145219B0 +61C6:23F82208220833F8A800A7BCA4A4A4A427BC20402FFE21602250244838462040 +61C7:0600F8FC4A8424FC3884CCFC36A2CA9412A86AC4048202005104511290120FF0 +61C8:2200239E248A290A37D2AD66A540A7D4A55E256427C42544255E2544244428C4 +61C9:010000803FFE224824FE2D9034FC249024FC249024FE24804244524A920A21F8 +61CA:2080210027FC24443554AC44A7FCA4E4A554240420402FFE20A0211022082C06 +61CB:27882088FABE210877D86B5CA52A294825082208010008844892481287F00000 +61CC:200027FC24A427FC3040ABF8A040A7FCA11020A023F820402FFE204020402040 +61CD:20402FFE200027FC3404ADF4A514A5F4A40427FC200823F020402FFE21502E4E +61CE:2040204027FC3248AA48A554AFFEA00027FC240425F4251425F4240427FC2404 +61CF:10A0109011FE132019FC552051FC512091FE110013DE12521252127212021206 +61D0:1040102013FE100019FC5554515451FC902013FE10501094118812A814C41082 +61D1:01104FFE211027FC80A047FC54A414A4E56426542484240C01004884481287F2 +61D2:221022102F9C22243248AFBEAAA2AAAAAFAA222A272A2AAA3288221422222242 +61D3:103C13C010441224190857FE544252A4928A147A108010F8110812901060179E +61D4:20402FFE200037FCAC04A5F4A514A5F4240427FC200023F820002FFE224824C4 +61D5:00003FFE288C2F8A28882FBE20082F8828882F94289429A2408042408A1411F2 +61D6:080C147022105C1088FE3E1008104A7C28440E44707C22005104511290120FF0 +61D7:21102110211037BCA910A110AFFEA2A822A826EC2AAA22AA22A825A824482898 +61D8:42A827FC22AA84E6400057FC1444E3F822482258214008844892481287F00000 +61D9:1140124C126412441B4C566452A453AC92A412A417FE10001110110812041404 +61DA:203E27C02244212833F8A840A7FCA000A3F8200823F8200823F82544252A28FA +61DB:20402FFE204027FC3000ABF8A208AFFEA80227FC211023F8204027FC20402FFE +61DC:1088108813FE10881BFE565253FE500093FE124210F811081290106010C01700 +61DD:2400257C260434A8AB90A07CA414A7942A5022502FDC2250255024B0289E2100 +61DE:108813FE108813FE1A0255FC500053FE904010A2135410B81354109213501020 +61DF:140855083608147E7F0814487F2808283E0808080F28781021004884481287F2 +61E0:2080204027FC211030A4AF58A554A552AB582000220823F8220823F822082408 +61E1:2040202027FE248837DEAC88A5DCA6AAA4882440249025202448248425FC2884 +61E2:201027D0251027DE3450AFE8A504A7C4A00023F822A822A822A822A82FFE2000 +61E3:011047FC211081F0404017FC1664E55426EC2444244C02005104511290120FF0 +61E4:204027FC204033FCA800A7FEA002A3F8204027FE200027FE200827FE24A82798 +61E5:204027FC204027FE3402ABFCA248A3F8A24823F8200027FC22442278254028FE +61E6:200027FC20402FFE3842AB58A040A358A0002FFE204027FC24A424A424A4240C +61E7:2080204027FC244432A8AA94A474A000A3F822A82FFE200027FC204021402080 +61E8:20002FFE28082BC83A4CABCAAA48ABDEA8082BC82A482BD42A542BD42A5432E2 +61E9:2208211027FC3040ABF8A080A7FCA14823FC260A2BF8220823FA2234228C2302 +61EA:23F8220823F8220833F8A910A7FCA110AFFE21102248255420E02150224820C0 +61EB:1042139C12101BDE56945294542093FC120413FC120413FC120413FC11081204 +61EC:00803FFE22202FF822203FFC20802FF828882FF828882FF842205494924A23FA +61ED:2040202027FE248835FCAC88A7FEA420A5FC252425FC252425FC240024882904 +61EE:27FC208023F83208ABF8A208AFFEA8822548251428F4210023F8250820F02F0E +61EF:0A20FFA0493E7F4449A451240828FF2820103E284244868201004884481287F2 +61F0:220225E224A226AA352AAE6AA10AA28AA44A2BAA210A27CA2122254221EA2E04 +61F1:110817FE110810001BFC5694529453FC902813FE1220132412A81292142A18C6 +61F2:22204AA08ABE1FC420A46F24A0282FA822102FA822442F8201004884481287F2 +61F3:108813DE108819DC548853DE508893FC100411FC100413FC104012A4128A147A +61F4:2114211227D23110A910A7FEA290A6D2229226D2229426D4228A22CA2F162022 +61F5:110817FE110813FC1A9457FC500057FE940211F8110811F8110811F8110811F8 +61F6:2108210827CE21123124AFDEA552A55EA7D2211E2392255E2940211421122122 +61F7:208020402FFE200037FCACA4A7FCA248A1502208244420A8211023082D462180 +61F8:3E0E22F03E2022443EF822103E2422FE7F1008542A92595001204884481287F2 +61F9:204027FC200023B832A8ABB8A110A7FCA11027FC21102FFE212823102D482186 +61FA:2448244C2AAA3008AFFEA288AEE8A28A2EEA228C2EEC228822EA2F1A24262042 +61FB:109413981092118E1A8055FC512451FC912411FC108811FC108813FE10881104 +61FC:27BC24A427BC24A437BCACA4A7BCA120A3FE222027FC2A2023FC222023FE2200 +61FD:21102FFE211027BC34A4AFBCA140A120A3FE222027FC2A2023FC222023FE2200 +61FE:13FC110811F8190855F8510E57F8900817FE1294139C1294139C12D617BC1084 +61FF:1020FF2010BE7C440050FE9083907CA800A47CC244207C1045542F42F14A4238 +6200:210447C88812F3BC20084B92F83E0380AAAAABAA010008844892481287F00000 +6201:2850FE4828FE399012907CFE54907C9010FE7C901090FEFE28804504249243F0 +6202:202027FE248827DE3488ADDCA6AAA488A45027DE245025DC24502BDE28503050 +6203:2248215027FC240431F0A910A7FCA554A4E427FC204027FC20402FFE22A42452 +6204:13DE125213DE12521BDE54A051FE532095FC112011FE100011FC10881070178E +6205:1000FEF82820FEFC00007CF844887CF844887CF81088FEF81050020851249FE4 +6206:1040FEF82948FE3001CE7CF844207DFC44887CA810A8FE5011884884481287F2 +6207:1040FEF82948FE3001CE7CF844207DFC44887CF81088FEF81050028851249FE4 +6208:022002100210020002FEFF0002080208021001200140008003420C22701A0006 +6209:00900088008800807FFE408040804088408840904060484450A46114420C0404 +620A:0090008800803FFE208020802084204420482048203020222052408A43068C02 +620B:02400220022002FC7F0002000200023EFFC002100120014001840E447034000C +620C:0050004800403FFE20402040204420443E442028202820122032404A40868102 +620D:0050004800403FFE204020402044304428442428242820122032404A40868102 +620E:004800440040FFFE00400840084408447F440828082810121032204A40860302 +620F:0020002800247E240220023E25E0142408240828142812102232404A00860102 +6210:0050004800403FFE2040204020443E4422442228222822122A32444A40868102 +6211:04400E50784808480840FFFE084008440A440C48183068220852088A2B061002 +6212:004800440040FFFE00401240124412447F441228122812122232224A40860302 +6213:004800440040FFFE0040004000443E4422442228222822123E32224A00860302 +6214:0240022002FC7F10016003841C64E01C0240022002FC7F10016003841C64E01C +6215:042024282424242424203C3E05E00424FC242428242824102432444A84860502 +6216:004800440040FFFE004000403E442244224422283E2800120732784A20860302 +6217:0828082414241220212E40F0BE202224222422282A2824102112212A1F460082 +6218:1020102810241E241020103E11E010247E2442284228421042327E4A42860102 +6219:0028FF2481248120BD2E81F08120BD24A524A528A528BD108112812A85468282 +621A:0028002400203FFE222023A0222422243FE4202822282A903252422A4A468482 +621B:7FFC02001FF010101FF010101FF010101FF0024003F87E20014000840764381C +621C:005000480040FFFE00403E4022443E4400447F2808283E1208320F4A78862302 +621D:00287E24422442207E2E42F042207E24422442287E2800102412222A41468182 +621E:7FFC02001FF010101FF010101FF010107FFE424283FC7E20014000840764381C +621F:08200828FFA408247F20413E7FE041247F2449280828FF900832084A08860902 +6220:10400848FF44004442402440FFFE00407E44424442287E2A4212422A7E464282 +6221:22202228FF2422243E20223E3FE022242224FF28402854106232404A7E860102 +6222:3F28212421243F200020FFFE21203F2421243F28212827D0F912412A01460182 +6223:0A28742415245220222E21F04120BE24082408287F2808101412122A22464082 +6224:00107E14221224103F16557849125512A21200147F145508551A57AAFC460082 +6225:00207E2842247E2442207E3E09E048247F2488287E2808100F32F04A40860102 +6226:90A8492400247F20492E49F07F20492449247F2808280810FF92082A08460882 +6227:08280C241224292044AEBFF021203F2421243F2820283F105112512A9F461182 +6228:0028FF2402247A204A2E7AF00020FF2402247A284A284A107A12022A0A460482 +6229:0028FF2422245520F72E00F0FF2000247E24422842287E104212422A7E464282 +622A:082008287F240820FFFE142022247FA4A4243F2824283F1024123FAA20462082 +622B:10141012FE1011FE20103C1025D26552BD52255425D43C0824CA271A24262C42 +622C:00107F941212529033161278FFD200123F12211421143F08211A212A3F462182 +622D:10100814FF92809000167F7808127F1249127F1449147F08001A222A41468082 +622E:0010771411125510331655780C123312C492181462140C88711A062A1846E082 +622F:10281E2410247F20512E5CF072204E2440244A286AA85B104A128F2A78460082 +6230:0010F79494929490F79600787F1249127F1249147F140808FF9A082A08460882 +6231:08100F1408127F9048964E787912471240124A146A94AA88BB9A0A2A7F462082 +6232:08280F2408247F20492E4CF07920472440245F2840285F1051125F2A8A463F82 +6233:0020EE282224AA246620AA3E01E024247F24C8287E2848107E32484A7F864102 +6234:08207F280824FFFE00207F2049247F2449247F2822287F102212FFAA22464182 +6235:7728552477245520772E55F0772022247FA4A4283F2824103F12242A3FC62082 +6236:001000F81F0010001FF81008100810081FF81008100010002000200040008000 +6237:0200010001001FF810081008100810081FF81008100010001000200020004000 +6238:00007FFE000000001FF81008100810081FF81008100010002000200040008000 +6239:020001003FFC200420043FFC200020002FF0202020C0210042004404840403FC +623A:08000400047C3F442144214421443F44217C204020402040204240424042803E +623B:020001003FFC200420043FFC2080208020802FFC214021404220441088081006 +623C:0000FC7E0440044004407C7C4444444444447C7C044408400840104020404040 +623D:020001003FFC200420043FFC20002220212024202220207E5FA0402080200020 +623E:020001003FFC200420043FFC208020A020902FFC214021404220441088081006 +623F:020001003FFC200420043FFC210020803FFC2200220023F84408440888281010 +6240:0208071C38E0208020803E8022FE228822883E88208820884108410882080408 +6241:020001003FFC200420043FFC200020002FFC292429242FFC492449248924080C +6242:020001003FFC200420043FFC2080208020FC208020802FF8480848088FF80808 +6243:020001003FFC200420043FFC200020002FFC280429E42924492449E488140808 +6244:020001003FFC200420043FFC210022002FFC280429E42924492449E488140808 +6245:010000803FFC20043FFC210023F02C2022C023403CFC23084C90406081801E00 +6246:020001003FFC200420043FFC210020802FFC2140224426284A10528883060200 +6247:020001003FFC200420043FFC200020003F7C2104292425144924514485140208 +6248:010000803FFC20043FFC200027F0241027F020002FF828884FF84802880207FE +6249:010000803FFC20043FFC212021203F3E212021202F3C212041205F3E81200120 +624A:010000803FFC20043FFC24882490296022182C84348A2488495042208C183006 +624B:001000F83F00010001003FF8010001000100FFFE010001000100010005000200 +624C:1000100010001000F8001000140018003000D000100010001000100050002000 +624D:0080008000800080FFFE01800280028004800480088010802080408002800100 +624E:1080108010801080FE801080108012801C803080D080108410841084507C2000 +624F:1080108010801080FDF010901090149018903090D090109211121112520E2400 +6250:1040104010401040FDFC10441044144418443084D08410841104110452282410 +6251:1080108010801080FE8010A0109012881C843084D08010801080108050802080 +6252:1000102011201120FD2011201120152019203110D21012101208140854042802 +6253:1000100013FE1020FC2010201020142018203020D02010201020102050A02040 +6254:1000100013F81088FC90109010A014BC18843084D10411041104120452282410 +6255:1040104010401040FC4010801080148019003110D108120817FC120450042000 +6256:1200110010801080FC401040104014A018A030A0D11011101208120854042802 +6257:1020102010201020FC20102011FC142018203020D02010201020102053FE2000 +6258:1008103C13C01040FC4010401040147E1BC03040D040104210421042503E2000 +6259:1010101010101010FDFE10101010151019103090D09010501020105051882606 +625A:10401040108010FCFD0412041004150418843044D04410041004100450282010 +625B:1000100011FC1020FE201020102012201C203020D02010201020102053FE2000 +625C:100011FC10201020FC20102014201BFE3020D020102010201020102050A02040 +625D:100011FC10001000FC0013FE10401440188030FCD00410041004100450282010 +625E:100011FC10201020FC20102014201BFE3020D020102010201020102050202020 +625F:100013F010901090FC901090109013F018903090D0901092108A108A50862082 +6260:100017F812081288FE4811501110151018A030A0D040104010A0111052082C06 +6261:1020102010201120FD2C1134116417A419243134D12811221122110250FE2000 +6262:10401040108010FEFD00120010FC140818103020D04010801102110250FE2000 +6263:1000100011FC1104FD0411041104150419043104D1041104110411FC51042000 +6264:1000100013FC1090FC9010901090149018903090D090109211121112520E2400 +6265:102010201020103CFDE0102010201420183E33E0D020102210221022501E2000 +6266:1008103C11E01020FC201020102017FE18203020D02010201020102050202020 +6267:1040104010401040FDF8104810481448194830C8D04810A810AA110A52062402 +6268:1000100011FC1044FC4411441144154419443244D04410841084110452282410 +6269:10201010101011FEFD0011001100150019003100D10011001100120052002400 +626A:1100108010BC1204FA04120416041A043204D204120412041204120452142208 +626B:1000100013FC1004FC041004100415FC18043004D0041004100413FC50042000 +626C:100011F810101020FC40108011FE149218923092D11211221222144250942108 +626D:100011FC10441044FC441044104415FC18843084D08410841084108457FE2000 +626E:1010109010901088FD081104120415FA18883088D08810881108110852282410 +626F:1020102010201120FD201120113C152019203120D12011201120112057FE2000 +6270:1040105010481048FC4011FE1050145018503050D090109010921112510E2200 +6271:100013FC10841088FC881090109C148419443144D12811281210122854442182 +6272:1040104010A010A0FD10128814461040180033F8D00810101010102050202040 +6273:1008101C11E01100FD0011FC1144154419443128D12811101110122852442482 +6274:1020102010501050FC8811041202108818883088D08810881088110851082208 +6275:1020102010201050FC50108815041A023060D010100010C01020101050082000 +6276:1020102010201020FDFC1020102014201BFE3020D05010501088108851042202 +6277:1008103C11E01020FC20102013FE142018203050D05010501088108851042202 +6278:1010111011101110FD1011FE11001500190031F8D10811081108120852082408 +6279:1010111011101112FD12111411D8151019103110D110111211521192510E2000 +627A:1008103C13E01220FE201220122017FE1A203210D2101212120A128A53062202 +627B:10801080108010FCFD04110812401440184030A0D0A010901110110852042402 +627C:200023FE22002200FAF8228822882A883288E2A82290228224822482A87E5000 +627D:10201020102013FEFC20112411241524192431FCD024102010221022501E2000 +627E:1090108810881080FCBC13C01080148818883090D060104410A41114520C2004 +627F:1FE000400080010479280FF00920111017D0210821084FE48102010005000200 +6280:10201020102013FEFC201020102015FC18843088D04810501020105051882606 +6281:1040104010801088FD0413FE1002149018903090D090109011121112520E2400 +6282:1000100013FE1020FC2010201020142019FC3020D02010201020102057FE2000 +6283:1040102010201000FDFE10401040146018503048D04410441040104050402040 +6284:10201020102010A8FCA410A2112215201A243024D02810081010102050C02300 +6285:10801080108010FEFD0212421042148218A23112D3FA110A1002100250142008 +6286:10401020102013FEFC8810881088148818883050D05010201050108851042602 +6287:1000100011FE1102FD021102110215FA19023102D1021102110211FE51022000 +6288:100011FC11041104FD0411FC11041504190431FCD10411041204120454142808 +6289:10401040104013F8F84810481448184837FED04010A010A01110111052082406 +628A:100011FC11241124FD241124112415FC19043100D10011001102110250FE2000 +628B:1000104010201010FC901080108012841A823282D28214881088108850782000 +628C:10201020102011FEFD2212241020142018503050D0501050109010925112220E +628D:1008106813881088FC88108814881BFE3088D088108810881108110852082408 +628E:1000100011FC1000FC00100013FE142018203040D0401088110413FE51022000 +628F:1000100011FC1000FC00100013FE109018903090D090109011121112520E2400 +6290:1020102010201020FDFE1122112215221952314AD18A110211021102510A2104 +6291:10001080133C1224FE241224122416241A243224D2B413281220102050202020 +6292:100011F810081050FC20101013FE142218243020D02010201020102050A02040 +6293:1008101C11F01150FD5011501150155019503148D14811481144124452422400 +6294:1000100013FE1020FC201040104014D019483244D44410401040104050402040 +6295:100010F810881088FC881106120015FC18843084D04810501020105050882306 +6296:1010111010901090FC101110109014901810301ED3F010101010101050102010 +6297:10801040104013FCFC00100011F0151019103110D110111211121212520E2400 +6298:1008101C11E01100FD00110011FE151019103110D11011101110121052102410 +6299:1008103C11E01020FC2011FC10201420182033FED02010201020102050A02040 +629A:100013FC10401040FC40104017FE104018A030A0D0A0112011221222541E2800 +629B:121012101210127CFA14179412941A9432A4D2A412D4128A14821482587E3000 +629C:1040104010401040FBFE1080148018FC3144D144114812501220145058882306 +629D:20802080213E2102FA42224227C228823082E1022142222227E22222A00A4004 +629E:100011FC11041104FD04110411FC152419203120D11011101208120854042802 +629F:10201020102011FCFC20104011FE1440188031FCD00410881050102050102010 +62A0:100011FE11001104FD4411281128151019103128D12811441184110051FE2000 +62A1:1040104010A010A0FD1012081406111019203140D18011001104110450FC2000 +62A2:1040104010A010A0FD101208140611F019103110D15011201104110450FC2000 +62A3:10401040108010FCFD0412041084144418443014D02410441184100450282010 +62A4:10401020102011FEFD021102110215FE19023100D10011001200120054002800 +62A5:100011FC11041104FD141108110015FC19443144D12811281110112851442182 +62A6:100013FE10201020FC2013FE122216221A52324AD28A130212021202520A2204 +62A7:1000100011FC1104FD0411041104150419FC3104D00010901088110452022402 +62A8:100011FC10201020FD2410A410A814201BFE3020D02010201020102050202020 +62A9:10201020102011FCFD24112411FC152419243124D7FE11041104110451142108 +62AA:10401040104013FEFC8010A0152019FC3324D524112411241134112850202020 +62AB:10101010101011FEFD121114111015FC19443144D12811281110122852442482 +62AC:1020102010401088FD0413FE1002140019FC3104D10411041104110451FC2104 +62AD:10401020102013FEFA021404100018F03090D0901090109011121112520E2400 +62AE:1040104010A01110FA081426104018803310D020104010881310102050C02700 +62AF:100011F811081108FD0811F811081508190831F8D10811081108110857FE2000 +62B0:10201020102011FCFD24112411241524192433FED02010501050108851042202 +62B1:1080108011FC1104FA0415F4111419143114D1F4110411281112110250FE2000 +62B2:1000100017FE1008FC0813C8124816481A483248D3C812481008100850282010 +62B3:100011FC11041104FD0411FC1100154019443148D170114011421242523E2400 +62B4:2048224822482248FA4827FE22482A483248E2482278220022002200A3FE4000 +62B5:1008103C13E01220FE201220122013FE1A203210D2101212120A128A53262212 +62B6:1020102011201120FDFC1120122010201BFE3020D05010501088108851042202 +62B7:100013FC10201020FC40104014D019483244D444104010401040100057FE2000 +62B8:1008103C13C01000FC40102013FC140818103020D040108011001280547E2000 +62B9:10201020102013FEFC201020102015FC187030A8D0A811241124122250202020 +62BA:10201020102011FCFC201020102013FE187030A8D0A811241124122250202020 +62BB:10201020102013FEFA22122216221BFE3222D222122213FE1222102050202020 +62BC:100011FC11241124FD2411FC11241524192431FCD12410201020102050202020 +62BD:1020102010201020FDFC112411241524192431FCD12411241124112451FC2104 +62BE:1020102010201020FDFE1020102014201BFE3020D04010401088110453FE2102 +62BF:100013FC12041204FE0413FC122016201BFE3220D22012101212128A53062202 +62C0:100011FC11041104FD04110411FC145018503050D050109210921112520E2400 +62C1:220022002200221EF7D22252225222523252E252225222522452245EA9525080 +62C2:10901090109013FCFC94109413FC16901A9033FED0921092111A111452102410 +62C3:10801080108010FEFD4011401240107C18403040D040107E1040104050402040 +62C4:10401020100013FEFC2010201020142019FC3020D02010201020102053FE2000 +62C5:1000100011FC1104FD04110411FC150419043104D1FC11041000100053FE2000 +62C6:1008101C11E01100FD00110011FE151019103130D11811141112121052102410 +62C7:100011F811081148FD281108110817FE1A083288D248120813FE100850502020 +62C8:104010401040107EFC4010401440184033FCD204120412041204120453FC2204 +62C9:1040102010201000FBFE1000140419043104D088108810881090101057FE2000 +62CA:1088108810881108FD7E13081508114819283128D10811081108110851282110 +62CB:221022102210227CFA1427D422942A9432A4E2A422D4228A24822482A87E5000 +62CC:10201020112410A4FCA8102011FC142018203020D3FE10201020102050202020 +62CD:10201020104011FCFD0411041104150419FC3104D10411041104110451FC2104 +62CE:1040104010A010A0FD101248142610201BF83008D010111010A0104050202020 +62CF:10001000FEFC2244642818102428C2C600201FC001003FF801007FFC01000300 +62D0:100011FC11041104FD0411FC104014401BFC3044D04410841084110452282410 +62D1:1088108810881088FDFE108810881488188830F8D08810881088108850F82088 +62D2:100011FE11001100FD0011FC1104150419043104D1FC11001100110051FE2000 +62D3:1000100013FE1020FC201040104014FC19843284D48410841084108450FC2084 +62D4:1050104810481040FBFE1080148018FC3144D144112811281210122854442182 +62D5:10201010101011FEFD02120410801488189030A0D0C0108210821082507E2000 +62D6:1080108010FE1100FE201120112C15741BA43124D13411281122110250FE2000 +62D7:2020212021202220FAFC24A4272429243224E22424A427A420C42044A0944108 +62D8:10801080110011FCFA04140411E419243124D12411E411241004100450282010 +62D9:1020102011241124FD24112415FC18243020D020122212221222122253FE2002 +62DA:1020102010401088FD0413FE10021488188833FED08810881108110852082408 +62DB:100013FC10841084FC841104111412081C0031FCD10411041104110451FC2104 +62DC:04001EFCF020102010FCFE20102010FC1020FE2011FE10202020202040208020 +62DD:100013FE10201020FDFC1020102015FC18203020D3FE10201020102050202020 +62DE:1008101C11E01100FD001100110015FE19103110D11011101110111057FE2000 +62DF:1008108810481228FA28120812081A083208D208121012981324122450422082 +62E0:220022382228FBA822A822A834A826AAEAAA22AA2126214022802260A41E4800 +62E1:10201010101011FEFD0011101110151019103120D1281124124412FE54422800 +62E2:1090108810881080FBFE10A014A018A430A4D1281128113212221262549E2800 +62E3:1040104017FC1080FC8013E0112012201BFC3020D12811241222142250A02040 +62E4:104010401040107CFC40104014401BFE3040D040105010481044104050402040 +62E5:200027FC24442444FC4427FC24442C443444E7FC2444244424442844A8545008 +62E6:1000110810881090FC0013FE10001400180031FCD00010001000100053FE2000 +62E7:10401020102013FEFA0214041000180033FED020102010201020102050A02040 +62E8:1040104812441240FBFE1080148018FC3144D144114812501220145058882306 +62E9:200027F822082110F0A0204021B0264E3040E3F82040204027FC2040A0404040 +62EA:100017FE10901090FC9013FC129416941A943294D29C13041204120453FC2204 +62EB:100011F811081108FDF81108110815F819443148D13011201110114851862100 +62EC:1008103C11E01020FC2013FE10201420182031FCD10411041104110451FC2104 +62ED:1028102410241020FBFE102014201BA03120D1101110111011CA170A52062002 +62EE:10201020102013FEFC20102011FC1400180031FCD10411041104110451FC2104 +62EF:100011FC10081010FC2213B210B414A819283124D22214A01040100057FE2000 +62F0:10801088109C1170FD1013101510111019FE3110D110111011101110517C2100 +62F1:1088108810881088FDFE108810881488188833FED00010881084110452022402 +62F2:044004407FFC0440FFFE08203018C0E61F0001003FF801007FFC010005000200 +62F3:0100111009203FF802007FFC082010F03F08C1061FE001003FF8010005000200 +62F4:1020102010501088FD04120211FC142018203020D1FC10201020102053FE2000 +62F5:10401040104013FEFC801080117815081B103510D1FE11101110111051502120 +62F6:1124112412481124FD241000108014FC19043184D24814281010102050C02300 +62F7:1040104411F41048FC5013FE1040148019FE3240D48010FC1004100450282010 +62F8:1040104010FC1108FA90106014481990363ED042108413481030102050C02700 +62F9:1040104011FC1044FC84108415281A103108D3DE114A114A114A1252535A24A4 +62FA:1020102013FE1020FC2011FC112415241924312CD07010A81124162250202020 +62FB:10401040104013FEFC8010901090151219523154D29012281428104450842102 +62FC:1104108410881000FDFE108810881488188833FED08810881108110852082408 +62FD:1020102011FC1124FD2411FC1124152419FC3020D0241018103210CA53062002 +62FE:1020102010501088FD04120211FC1400180031FCD10411041104110451FC2104 +62FF:010006C01830EFEE00001FF010101FF000201FC001003FF801007FFC01000300 +6300:1004101E11E01100FD0611781150155019523154D14811481144125452622440 +6301:10201020102011FCFC20102013FE1008180833FED00810881048100850282010 +6302:1020102011FC1020FC20102013FE100018203020D1FC10201020102053FE2000 +6303:100011FE10201040FC88110411FE142218203020D1FE10201020102053FE2000 +6304:1040104412441148FD50104017FE109018903090D090109211121112520E2400 +6305:100013F810881090FCBC110415141A483040D7FE104010E01150124854462040 +6306:100011F011101110FD101110124E14401BFC3040D0E011501248144650402040 +6307:11001104113811C0FD02110210FE140019FC3104D10411FC1104110451FC2104 +6308:08007F7C08243E2408247F44085408F83F0001003FF801007FFC010005000200 +6309:10401020102013FEFA02144410401BFE3088D088110810D01020105050882304 +630A:10401040107C1040FC4013FE100010001BFE3040D05010481044104050402040 +630B:100013FE12201220FE2013FC120416041A043204D3FC12201220122053FE2000 +630C:1080108011F81208FD1010A0144018A03318DC0613F812081208120853F82208 +630D:10401020102013FEFC0010881104120218883088D05010501020105050882306 +630E:2040204027FC20A0F11022082DF6200037FCE080210023F820082008A0504020 +630F:100011FE11021102FD7A11021102157A194A314AD14A117A11021102510A2104 +6310:10001000FE7C224442443444087C3400C2201FC001003FF801007FFC01000300 +6311:1090109010901292FD941098109015981A943492D0901090111211125212240E +6312:200220022FC22212FA1223D222522C523652E5522892209221022202A40A4804 +6313:10401020102013FEFA02140410381BC03040D040107E17C0104010425042203E +6314:10401020102013FEFC40104010A014A219A43298D4901088108410A250C02080 +6315:100013FE11081108FD0811F81108150819F83108D108111E17E8100850082008 +6316:1040102013FE1202FC881104120214F818103020D04010801102110250FE2000 +6317:1020102013FE1020FDFC102411FC152019FE3022D02A10541050108851042202 +6318:1020102011241122FA2A101014601B803040D04013FC10441084108451142208 +6319:2208110811100020FFFE0820101020E8DF0601003FF801007FFC010005000200 +631A:1080FBF010901990F0941154520C24E41F0001003FF801007FFC010005000200 +631B:02000100FFFE044014502448444400F03F0001003FF801007FFC010005000200 +631C:100013FC10901090FC901092149212941A943298D09010901090109057FE2000 +631D:2408220822082008F8FE2E0822482A283228E2082208222822102500A8FE4000 +631E:1010121011101110FCFE10101310152819243144D142118211001280547E2000 +631F:10201020102011FCFC20112410A414A8182033FED05010501088108851042202 +6320:1080108010BC13C0FC50102410D4130C180033FED090109011121112520E2400 +6321:1040124411441144FD48104017FC100418043004D3FC10041004100457FC2004 +6322:2010207823C02040F84027FE20A029103208E5162110211021102210A2104410 +6323:1080108011F01210F82013FC1044184437FED044104413FC1044104051402080 +6324:1080104017FE1208FD1010A0144019B0360ED110111011101110121052102410 +6325:100013FE12021444FC4013FC108014A0192031FCD020102017FE102050202020 +6326:100013FC10041004FDFC1004100417FC18083008D7FE11081088108850282010 +6327:100013DE10421042FA52114A154A184230C6D14A1252104210421042514A2084 +6328:2040208021102208F7FC2104210023F83440E0402FFE204020A02110A2084C06 +6329:1010109010881108FA0415FA110819083108D1F810901090109011125212240E +632A:100017DE12521252FA5417D412581A543252DFD21252125A1254145055502890 +632B:2040204022482248F248255428E220403040E7FC2040204020402040AFFE4000 +632C:1020102013FE1020FC2013FE1202140419F83010D02013FE1020102050A02040 +632D:100013FE10201020FDFC1124112415FC19243124D1FC112010A0104050B0230E +632E:11081088109013FCFC24102413FC16201A2033FED06210A2112A122454202020 +632F:100013FC12001200FEF81200120017FC1AA032A4D2A812901290148854A428C2 +6330:100011FC11041104FD0411FC100014001BFE3020D02011FC1020102053FE2000 +6331:1010121011101110FC5412521252109018103114D604120812081210522020C0 +6332:204012484444201408607380200000F03F0001003FF801007FFC010005000200 +6333:100011FE10001092FD24124811241492180031FED02010201020102053FE2000 +6334:1100110011FC1200FDF81108114815281BFE3108D248122813FC100850502020 +6335:100013FE10201020FDFC102014201BFE3088D08813FE10881088110851082208 +6336:100011FC11041104FDFC1100110015FE1902317AD14A114A127A120254142008 +6337:2100211E211227D2F914211427D829143112E7D22112211A21142210A2104410 +6338:100011FC11041104FDFC1104150419FC3104D10411FC1050105010925112220E +6339:100011F811081108FDF8100013FC12441A443244D3FC12001202120251FE2000 +633A:2000200C27702110F9102210227C2F103110E5102510227C22002500A8FE5000 +633B:1004100E13B81088FC881128152E1BA830A8D2A812A8113E11001280547E2800 +633C:1008103C13C01044FA2411281500184033FED088110813901060105051882604 +633D:1080108011F81208FC1013FC124416441A4433FCD0A010A011221122521E2400 +633E:10201020102013FEFC20102011241524192432AAD02010501050108851042202 +633F:101C11E010201020FDFE102011FC1524192431FCD124112411FC102050202020 +6340:110011F813081490FC601198164610401BF83040D3F8104017FC104050402040 +6341:10201120112011FCFD201220102013FE18003000D1FC11041104110451FC2104 +6342:100013FE10401040FDFC1084108417FE18003000D1FC11041104110451FC2104 +6343:100011FC10441044FBFE1044144419FC3080D08011FC12841484108450FC2084 +6344:1028102410241020FDFE1020112014B218B43068D0A811241222102050A02040 +6345:200027F8201021A0F84027FC24442C4437FCE444244427FC24442444A4544408 +6346:200027FC24442444FC4427FC24442CC434E4E5542644244424442404A7FC4404 +6347:10201020102011FCFC20102013FE145018503154D15211521252109050902130 +6348:1020102010501088FD0412FA102014201BFE3020D12811241222142250A02040 +6349:100011FC11041104FD0411FC102014201920313CD120112012A01260543E2800 +634A:1008103C13C01004FA44112810001BF83010D02017FE10201020102050A02040 +634B:1008103C13C01044FA2411281500181033FED010111010901090101050502020 +634C:200427C424442454FC5427D422142A1437D4E2542254225424442444A9545088 +634D:100011FC110411FCFD0411FC1000140019FC3020D02013FE1020102050202020 +634E:1020112410A410A8FC2011FC1104150419FC3104D10411FC1104110451142108 +634F:100011FC11041104FDFC1104110415FC18203020D1FC10201020102053FE2000 +6350:100011F811081108FDF8100013FC16041A0433FCD204120413FC120452142208 +6351:100010FC10841284FEFC1284128416FC1A0033E0D02013FE1020105050882306 +6352:1020102013FE1020FC2011FC1124152419FC3020D07010A81124122250202020 +6353:200027DE20922492F494249427D820943192E1922292229A24942890A2904110 +6354:1080108011FC1104FA0815FE1122192231FED122112211FE11221222522A2404 +6355:1048104417FE1040FC4013FC124416441BFC3244D24413FC1244124452542208 +6356:1040102013FE1202FC0411F8100014001BFE3090D090109011121112520E2400 +6357:101010101090109EFC90109013FE140018103092D09211141208101050602380 +6358:1040104010881104FBFE1002148819443242D0F8118812501020105051882606 +6359:1020102013FE1020FDFC1124112415FC19243124D1FC102013FE102050202020 +635A:100011FC11241124FDFC1124112415FC18203020D1FC10201020102053FE2000 +635B:100011F811081108FD08110811F81400180033FCD20412041204120453FC2204 +635C:1020102011FC1124FD2411FC1124152419FC3020D3FC10881050102050D82306 +635D:1104108410881010FDFC11041104150419FC3050D050109010921112520E2400 +635E:1088108813FE1088FC0013FE12021444184033FCD04410841084110452282410 +635F:100010F810881088FCF8100011FC150419243124D12411241050104850842304 +6360:1008101C11E01100FD0011FE1110151019103110D7FE10001090110852042402 +6361:1040104010A010A0FD10120815F6100018883048D24811501110102057FE2000 +6362:1080108010F81108FA1015FC112419243124D12417FE10501050108851042602 +6363:2040208023F82208FA88224822182A0033FEE0822492249227F22002A0144008 +6364:200023FC22042204FBFC220022182AE03238E2E0223C23E022222422A41E4800 +6365:1040102013FE1202FD04110011DE12521A523352D49A1094111011125212240E +6366:1020102010501088FD04120210F81420182031FCD020112410A410A853FE2000 +6367:1020102013FE1020FDFC104013FE148819243222D0F8102013FE102050202020 +6368:1020102010501088FD0412FA102014201BFE3020D02011FC1104110451FC2104 +6369:1040102013FC1204FA0413FC16001A283224D3FE122012501250148855042A02 +636A:101C13E0122013FEFE201292130A120619FC3104D10411FC1104110451FC2104 +636B:200027BC24A424A4FFBC24A424A42FBC3404E4042404240424042404A4144408 +636C:2040202027FE2400FC88248825082D7E3708E5482528252829082908B1284110 +636D:1040108013FC1224FA2413FC16241A4433FCD090111017FE1010101050102010 +636E:11FE11021102FF0211FE1310151019FF1110311051FE928212821482548228FE +636F:200420042FC42214FA14249427D429143114E7D42114211421C42E04A4144008 +6370:100011FC11241124FDFC1124112415FC182033FED07010A81124122250202020 +6371:100013FE12101210FEFE1210121017FE1A003210D21012FE1210141055FE2800 +6372:1020112410A813FEFC40108017FE11081A0435FAD908110811281112510220FE +6373:1008101C11E01100FDFE11101510191037FED000102012221222122253FE2002 +6374:2090209021082148FA44249221082BFC3044E02020A42282228A228AA4784000 +6375:10901090109013FCFE941294129417FC1A943294D29417FE1000109051082204 +6376:1010107813C01040F84017FC12481A4837FED248124817FC1040104057FC2000 +6377:2040204027FE2040FBF8204827FE284833F8E0402240227C22402540A4FE4800 +6378:1020102011FC1024FC2413FE1024142419FC3222D17410A81124122250A02040 +6379:1020102013FE1050FCA8112412FA142018A83088D3FE10881088108851082208 +637A:1020102013FE1050FC88110412FA1000180033FED02011241122122250A02040 +637B:1020102010501088FD44122211F8140818503020D0A41282128A128A54782000 +637C:101C11E010201020FBFE10A815241A423040D3FE1088110810D0103050482184 +637D:1040102013FE1000FC88108815541A223000D02013FE10201020102050202020 +637E:1040102013FE1202FC0411F81108150819F83100D10011FC1104110451FC2104 +637F:1020102013FE1020FDFC102413FE142419FC3040D3FE108411C8103050CC2302 +6380:201020902710243EF4222444279025103510E5102528252825282944A9445082 +6381:100010FC108010F8FC8010F8108017FE19403124D12811101108114451822100 +6382:1040102013FE1200FE201220123E12201A2032FCD28412841284148454FC2884 +6383:100011FC100410FCFC0411FC100013FE1A223020D1FC11241124113451282020 +6384:2040204020A02110F2082DF6200027FC34A4E4A427FC24A424A424A4A4144408 +6385:1020102013FE1020FDFC102013FE140019FC3104D1FC110411FC110451142108 +6386:100013FE1202128AFE5213FE122216221AAA32AAD2AA12FA12021202520A2204 +6387:200027BC20842294F908229424A428403000E7BC20A422A421282290A4A84846 +6388:101C13E010841244FD48111017FE1402180033F8D108111010A0104051B0260E +6389:10201020103E1020FDFC110415FC190431FCD124102013FE1020102050202020 +638A:1040102011FC1000FD081090100013FE18003000D1FC11041104110451FC2104 +638B:1040102013FE1200FE1C12F0129016901AFE3290D290129012AA12CA54A62812 +638C:111009203FFC20044FE808200FE000F03F0001003FF801007FFC010005000200 +638D:100011FC11041104FDFC1104110415FC18003112D1D41118111011525192210E +638E:1040104013FC10A0FD10120817FE10081BC83248D248124813C8100850282010 +638F:1080108010FE1102FE8210F2114214421BFA3042D152115211F2100250142008 +6390:10401040107C1084FD081200102015CE19023102D1CE11021102110251FE2102 +6391:1088108813FE1088FC8810F81088148818F83088D08813FE1000108851042202 +6392:109010901090179EF890109010901B9C3090D0901090179E1090109050902090 +6393:2100210021DC2114F914211427D428143114E1142588254829482114A5144222 +6394:00007EFC48447E4442287E1048287EC600201FC001003FF801007FFC01000300 +6395:1020102011FC1020FC2013FE108815441A4230F8D18812501020105051882606 +6396:1080104017FE1120FD20123C124416641A943348D24812301220125052882306 +6397:100017FE10901090FC90139C120416041A04339CD09010901090109057FE2000 +6398:200027FC24042404F7FC2420252425243524E5FC2420252425242924A9FC5004 +6399:103C17C012441128FC0013F81448184837FED048104813F81048104051402080 +639A:100013FE10201020FBFE122212221B3232AAD2AA1376126612221222522A2204 +639B:1088108813E81088FC88108817EC140A188A3088D3E81088108810E853882108 +639C:10001040139C1204FE04139C120416041BFC3090D0901090109011125212240E +639D:10141012101017FEF810101017D21A523252D25413D4100810EA171A52262042 +639E:1020112211221224FC5010881304142218203124D12412281050108851042602 +639F:1040102013FE1202FC04100013FE142018203120D13C112012A01260543E2800 +63A0:1040102013FE1000FC0011FC1104150419FC3020D12811241222142250A02040 +63A1:1008103C13C01044FA2411281500182033FED07010A810A81124122254202020 +63A2:200027FC240424A4F91022082040284037FCE04020E0215022482C46A0404040 +63A3:24043FA44424FFA404243F842494258800201FC001003FF801007FFC01000300 +63A4:100013DE12521252FA5213DE12521A523252D3DE1252125212521252555228A6 +63A5:1080104013FC1000FD08109017FE1040184037FED08811081090106051982604 +63A6:100011FC110411FCFD0411FC1080148019FE324AD44A10921122124250942108 +63A7:10401020102013FEFA02149411081A043000D1FC102010201020102057FE2000 +63A8:10A01090108011FEFD10131015FC1110191031FCD1101110111011FE51002100 +63A9:1040108017FE1110FE48144613F816481A4833F8D248124813F810425042203E +63AA:10881088108813FEF888108817FE180031FCD104110411FC1104110451FC2104 +63AB:20002FC024BC24A4F4A427A424A424A837A8E4A8249025D02EA820A8A0C44082 +63AC:1100110011FC1204FC44115414E4184433FCD04410E411541244104450142008 +63AD:200023FC20402040FBFE20A021102A083446E0402048226422522452A1404080 +63AE:1040102013FC1204FE0413FC120012FC1A8432FCD28412FC1484148458942088 +63AF:10201120113C1120F92017FE10001BFC3204D3FC120413FC1204120452142208 +63B0:10003A86E2B824882448F85E202827882288FABE2288248824882A8851288010 +63B1:00F03F0001003FF801007FFC010005047A7810107CFC1010FEFE101050502020 +63B2:100011FC110411FCFD0411FC108015FE1A023112D1EA110A10FA100250142008 +63B3:2040207C204023FEFA42227823C42A3C3240E24023FC224424842484A9144208 +63B4:200023FE22022202FBFE222222222AFA3222E232222A23FE22022202A3FE4202 +63B5:1020102010501088FD0412FA100017DE1A523252D25213DA1254101050102010 +63B6:1040102013FE1220FEFC1224122417FE1A243224D2FC12201250145054882906 +63B7:2440225E22922012FFD421142118291437F2E1122112211A22942250A4504810 +63B8:11041088105011FCFD24112411FC1524192431FCD020102013FE102050202020 +63B9:100011FC10081010F82013FE142018A03040D1FC115411541154115457FE2000 +63BA:10801090110813FCFC4017FE111012481C863310D02010C41308103050C02700 +63BB:100011FC10841088FC50102014D81B263020D1FC1124112411FC102253FE2002 +63BC:11FC1124112413FEFD24112411FC140019FC3104D12411241124105850842302 +63BD:11081090100013FCFC901090109214921A943298D09010901090109057FE2000 +63BE:210021F8220823F0F81027FE208029443668E0B02128266820A42122A6A04040 +63BF:1088108813FE1088FCA8102013FE1440188030FCD18412841084108450FC2084 +63C0:1020102013FE1020FDFC112411AC1574192431FCD020107010A8112452222020 +63C1:10201020103E1020FC2011FC110415FC190431FCD10411FC1000108851042202 +63C2:21082088209027FEF890209023FC2A943294E30C220423FC22042204A3FC4204 +63C3:11081088109017FEF80013C412541A5433D4D254125413D412541244525422C8 +63C4:204020A021102208FDF6200023C42A543254E3D42254225423D42244A25442C8 +63C5:FDFE204840487DFEC44844887D0800E81F0001003FF801007FFC010005000200 +63C6:101013D410581252FD8C1088110412FA18203020D3FE10201050108851042202 +63C7:1020102013FE1020FC2013FE128A16521AFA3222D22212FA12221222522A2204 +63C8:1100110011FE1202FC8217F2100213F2180233F2D00213F2121213F250142008 +63C9:200021FC20482030FBFE2052209429103230E02023FE207020A82124A6224020 +63CA:100013FE100011FCFD04110411FC14001BFE3222D22213FE1222122253FE2202 +63CB:100011FC11241124FDFC1124112415FC180033FED12011221114114851842102 +63CC:100011FC11241124FDFC1124152419FC3000D040102412A2128A148850782000 +63CD:2040204027FC2040FBF8208027FC29103208E5F6204023F8204020A0A1104608 +63CE:1040102013FE1202FC0411FC140019FC3104D1FC110411FC1104100053FE2000 +63CF:1088108813FE1088FC88100011FC152419243124D1FC11241124112451FC2104 +63D0:100011FC11041104FDFC1104110415FC180033FED0201120113C112052A0247E +63D1:1040119C11041104FDDC1104110415FC18003000D1FC10201020102053FE2000 +63D2:2008203C27C02040F8402FFE20402940365CE4442444275C24442444A7FC4404 +63D3:22102110211027BEFA28224823AA2AAE32BAE2EA22AE22A824AA24A2A9A2501E +63D4:1080108010FC1154FAD410B4152C1A443094D108104010A412AA128A54782000 +63D5:1088108813FE1088FCF8108810F81488188833FED10011481184110051FE2000 +63D6:100011F811081108FDF8100017FE150819F83108D1F81108113E17C850082008 +63D7:101C13E012201220FBFE122012FC1A843284D2FC128412FC1484148458FC2084 +63D8:1020104011FC1104FDFC110411FC14001BFE3020D02011FC1020102053FE2000 +63D9:1040102013FE1202FE0213FE120016001BFE3352D55215FE1552155259522106 +63DA:100011F8110811F8FD0811F814001BFE3100D1FC125414941124124450A82110 +63DB:1080108011F81208FC1013FE12021A52328AD222102017FE1050108851042602 +63DC:1020105010881104FEFA100015FC19043104D1FC1088108813FE108851082208 +63DD:1088108811EC112AFA2815481088197E3600D1FC1104110411FC1104510421FC +63DE:1040102013FE1000FD04108817FE100019FC3104D10411FC1104110451FC2104 +63DF:100013FE10221120FD3C112012FE140019FC3104D1FC110411FC110451142108 +63E0:100013FE120012FCFA8412FC16841AFC3220D3FE124812C812301248528423FE +63E1:200023FC22042204FBFC220023FC2A403288E3FC2224222025FC2420A82053FE +63E2:1040102013FE1202FC8010F815081A903060D198160611F81108110851F82108 +63E3:2040244424442444F7FC20002FFE20403080E7FC24A424A424A424A4A4A4440C +63E4:100013DE12521252FA5213D212521A523252D3D2121A1294125012B053102010 +63E5:1080104013FC1000FD08109017FE1442184433FCD24412441254124850402040 +63E6:1082108217F21082FC8A13EA16AA1AAA33EAD08A11CA12AA14A21082508A2084 +63E7:04047FC404243FA424A43FA41504249444281FC001003FF801007FFC01000300 +63E8:1040102013FE1000FDFC110411FC14001BFE3202D1FC10201020102050A02040 +63E9:1110111211D41118FD521192112E144019FC3104D10411FC1104110451FC2104 +63EA:208821C827082108F92A212A27AC29483308E3882554251429142124A1244142 +63EB:0620382008A47EA819202C504A8809E41F0001003FF801007FFC010005000200 +63EC:1040102013FE1202FC88110412221028182433FED02010501050108851042202 +63ED:100013F8120813F8FE0813F8110013FC1C443244D2A4120413F4100450282010 +63EE:100013FE12221020FDFE102011FC152419FC3124D1FC102013FE102050202020 +63EF:220022FE22202220FB2022BC26442A54324CE28422A4221822082208A2FE4200 +63F0:1008103C11E01020FBFE102015FC192431FCD12411FC102011FC102053FE2000 +63F1:49042A247F2441247F2441247F244104432C1FC001003FF801007FFC01000300 +63F2:10481148114813FEFD4811481178150019FE3020D3FE107010A8112456222020 +63F3:1080109E13EA108AFDCA108A13EA149218A63020D3FE10201050108851042602 +63F4:203C27C022442128F80023FC2080288037FEE10021F8228822502420A8D84306 +63F5:20102010277C2114F9FE2214227C2F10317CE51025FE221022102500A8FE4000 +63F6:20002FDE24922492F4942794249824943792E492249225DA2E942090A0904090 +63F7:101C11E010201020FDFE10A0112C1524192431ACD124112411FC112450202020 +63F8:1020102013FE1070FCA81124122211FC190431FCD10411FC1104100057FE2000 +63F9:1050105213DC1050FCD2134E100015FC190431FCD10411FC1104110451142108 +63FA:1008103C13C01004FA44112815FC18203020D3FE102011241124112451FC2004 +63FB:2014201227FE2410FC1027F024922C9237D2E55425542488254A2A1AA8265042 +63FC:100013FE10401080FDFC1284108414FC18203022D3B410A81128122454A22040 +63FD:10901290129E12A8FAC4108015FC19043124D12411241154105010905112260E +63FE:100011F811081108FDF81108110815F8180033FCD29412941294129457FE2000 +63FF:22102210221023BEF422244427902A103210EF902228222822A82344A2444082 +6400:210021F022102420FBFC224422442BFC30A0E122261E20C020302180A0604010 +6401:2200217C25042484F4F4251426A4244434A4E71C25F42514251425F4A5144408 +6402:1020112410A81020FBFE10A811241A023040D7FE108811081190106051982604 +6403:11081088109013FCFE041204120413FC18403020D0A41282128A128A54782000 +6404:2100213C21002100F9BC256425242D3C3524E1242124213C21242100A17E4100 +6405:24842244224827FEFC02280423F82A083248E248224822A820A02122A2224C1E +6406:1088108813FE1088FDFC108813FE142019FC3124D1FC112413FE110451142108 +6407:204020A021182686F84023F0201028A03040E7FE2088215023202510A9484186 +6408:1040102013FE1202FC5010881124145018883104D2FA10881088108850F82088 +6409:1040104013FE12A2FC9011FE15101B1035FED110111011FE1110111051FE2100 +640A:1080108011FC1244FD5411F4108415281A9031FCD244155411F4108451282210 +640B:1004101E13F0121EFE1012FE129216981AF2328ED28012B812A814AA554A2A86 +640C:200023FC22042204FBFC224822482AFC3248E24823FE22A422A82490A4C84886 +640D:100011F811081108FDF8100013FC16041BFC3204D3FC120413FC109051082204 +640E:20062F7821102120FA44227823102A24367EEA122210225422522292AA504420 +640F:1028102413FE1020FDFC112411FC152419FC3124D00813FE1088104850482018 +6410:2080204027FC2080F90823F02060298437FEE00227FC244427FC2444A7FC4404 +6411:1108110817FE1108F80017FE110819F83108D1F81108113E17C8100850082008 +6412:1040102013FC1108FC9013FE12021444182033FCD08010F81088110851282210 +6413:11081088109013FCFC4011F8104017FE18803100D1FC12201420182053FE2000 +6414:200023F821482110F8A0204021B02E4E3040E3F82248224823F82044A7FC4004 +6415:1020102011FC1020FC2013FE108015041BFE3002D3FC12941294129457FE2000 +6416:1040108011FC1248FD3010C0130011FC1A203020D3FE10201124112451FC2004 +6417:1020104011FC1104FDFC110411FC150019FE3100D1FE1042124A13FA50142008 +6418:1040104411F81050FBFE104014F81982327ED40011FC110411FC110451FC2104 +6419:100013FE120012FCFE0013FE12A816901AC83286D20813FE1288144854082818 +641A:104011FC10441094FD0813DE114A154A1A9431FCD10411FC110411FC5104210C +641B:111010A0100017FEF8A013F810A81FFE30A8D3F810A011B012A814A650A020A0 +641C:10A0112C11241124FDAC1124112415FC182031FCD08810501020105050882306 +641D:1020104011FC1104FDFC110411FC150419FC3028D02413FE1050108851042202 +641E:1040102013FE1000FDFC110411FC14001BFE3202D2FA128A12FA1202520A2204 +641F:21002100213E27C8F90827C825482FC8357EE7C821082FE821082108A1084108 +6420:2440225E22922012F7D2211E255225523552E7DE2152211222122222A42A4844 +6421:23F0211020E02318F80027BC24A42B1834A4E04027FC20E021502248AC464040 +6422:100013FC10901294FD98109017FE180031F8D108110811F81108110851F82108 +6423:20142012201027FEFC10241027F22C923492E5B426D42488254A293AAA265042 +6424:1104108410881000FBFE1000148819043202D1FC115411541154115457FE2000 +6425:10101220117C1144FC44107C13401540197C3144D144117C11441280547E2000 +6426:200027BC20842084F7BC2420242027BC3084E4A42294229424A42084A5284210 +6427:2080204027FE2402FC0227FE24002FDE3442E652254A24C62B5A2842B14A4084 +6428:100011FC110411FCFD0411FC100014001BDE3042D252114A12521042514A2084 +6429:2208220823BEF4882AA8213E22083448E84827FC20E0215022482C46A0404040 +642A:2040202027FE2420FDFC242427FE2C2435FCE42025FC250425042904A9FC5104 +642B:08783E48228E2A007EF822482A3046CC80201FC001003FF801007FFC01000300 +642C:2100223C27A424A4F6A425A424C22F8034BCE4A426A425A424942488A49449A2 +642D:2110211027FC2110F84020A021102A0835F6E000200023F822082208A3F84208 +642E:100013FE10501050FBFE125216521BFE3020D02013FE107010A8112456222020 +642F:103C13C010441224F928110014401B9C3204D204139C12041204120453FC2204 +6430:100011FC110411E4FD2413FE120211FC190431FCD10411FC1104110451142108 +6431:100013FC12041204FBFC124012201BFC3288D25013FE122015FC142058202020 +6432:2080204027FC2404F9102208203C2BD03290E29022902288228824A4A4D44892 +6433:1040102013FE1202FC2411FC102015FC182033FED02011FC1104110451FC2104 +6434:01007FFE44429FF404403FF80440FFFE082017D02108DFF601007FF801000300 +6435:200023F8224822A8FB18220823F828003000E7FC24A424A424A424A4AFFE4000 +6436:10201020105010C8FD2413FE150411FC190431FCD10011FC1284128454FC2084 +6437:1020102013FE1020FDFC110411FC150419FC3104D1FC110413FE108851042202 +6438:1020102013FE1020FDFC104013FE1488193432E2D02011FC107010AC53222020 +6439:100013FE100011FCFD04110411FC14001BFE328AD25213FE12221222522A2204 +643A:10A0109011FE1320FDFC112011FC152019FE3100D3FC1088109E1102520A2404 +643B:010006C01830EFEE00001FF010101FF0040C78F010107CFC1010FEFE10103030 +643C:10401248115013F8F88017FC11101A2835C4D84213F8104017FC104051402080 +643D:1088108813FE1088FCA81050108815241A2231FCD02010A81124122250A02040 +643E:1040102013FE128AFD04108010FE15401A40307CD0401040107E104050402040 +643F:11003906E2B822882448F85E238820082008FBBE228822882288238842A88010 +6440:1040108011FC1104FD0411FC110015FE190031FED00212AA12AA140250142008 +6441:200027FC24442444F7FC244424A425143404E7FC204020242522250AA90840F8 +6442:100013FC110811F8FD0811F8110E17F818083008D20411081090110852042402 +6443:100011FC10201020FBFE100015FC190431FCD10411FC110411FC108851042202 +6444:100013FC110811F8FD0811F8110E17F8180837BCD0A412A41128129054A82846 +6445:2040207C204027FEF442247027C42444343CE4202410245425422942A94A5238 +6446:100013FE12521252FBFE1020142019FC3020D02017FE10401088110453FE2102 +6447:1008103C13C01004FA44112811FC1A203020D3FE102011241124112451FC2004 +6448:1040102013FE1202FC1411E01100150019FC3110D11017FE1000109051082204 +6449:1040102013FE1202FCA81124145018883346D0F8110812881050102050402380 +644A:202820242740217EF1C82948257E25483248E27E254825482948207EA0404040 +644B:2000245C22942114FA9424542126290037DCE1142594255429482108A5144222 +644C:1040102013FC1000FD08109017FE1A2032A0D2FC1320122012FC1420542029FE +644D:1040102017FE1402FD0011FE121016201A7C3244D244127C12441244527C2244 +644E:200027BC208424A4FA9424A4205029883626E0C02310206423882030A0C04700 +644F:1020102013FE1020FDFC104013FE148819043242D59C110411DC110451FC2104 +6450:212421242224F4242954214A22923610EA102250225C2250225022B0A29E4300 +6451:200027FE242A2426F7FE242227AA26AA37AAE4322596262E24462482A7FE4402 +6452:200023FC22042204FBFC220022842A4832FCE248224823FE24482448A8885108 +6453:1020147C12841148FC3010CE16101A7C3210D27C121012FE1210121055FE2800 +6454:1040102013FE1020FC4812F21124165218F83008D02013FE1020102050202020 +6455:22A822A827FC22A8FAAA24E628002FFC3444E04023F8224822482248A2584040 +6456:1100111013DC1254FD54128811081AF43402D00013FC10401150124855442080 +6457:2108210827C82108F91E27D225642D4037C8E1082388254829542114A1244142 +6458:2080204027FC2110F8A027FC24442DF43444E5F42514251425F42404A4144408 +6459:2010241022FE2210F8FE209226FE2A9232FEE21022FE221022102510A8FE4000 +645A:1020112410A813FEFA0210F81488188830F8D020102011FC1020102053FE2000 +645B:1040102013FE1000FD541124115415FC182033FED242129212FA120A52022206 +645C:100011FC112413FEFD2411FC100015FC190431FCD10411FC110411FC50882104 +645D:1040102013FE1250FE5013FE125216521BFE3200D29212D41298149254D2288E +645E:100013FC124413FCFE4413FC108015101BE03048D18413FE1022112852A42442 +645F:102011FC112413FEFD2411FC102015FC192431FCD04013FE108811D05070238C +6460:1040108013FC1244FAF4131412A41A4432A4D3FC104010241522150A590820F8 +6461:200027BE24882488F7A824A824A827BE3410E518249825A826AA244AA0464080 +6462:1040107C104013FEFA42127813C41A3C3208D2F0132412A815FE142058A02040 +6463:1040107C104013FEFA42127813C41A3C3200D2FC128412FC128414FC548429FE +6464:1020102013FE1020FAAA112412AA182032AAD12412AA10501050108851042602 +6465:110011FC120015F8F90811F8150819F83000D7FE110013FC14A4112452542088 +6466:2200220E2F74F254255428D427543054EFD424542754215421522154A55C4284 +6467:1020122213FE1090FC8811FE1310151019FE3110D11011FE1110111051FE2100 +6468:100013FE120213FEFE101254123816541A823250D27C1290121015FE54102810 +6469:00803FFE24103F7C26382D543412203827C0204027F820402FFE404041408080 +646A:20902290229E22A2FAD423A8209428A437FEE28422A4229422942284A4944888 +646B:2200227C22442744FA7C224422442F7C3244E244227C22282528254AA84A5086 +646C:1080104013F81110F8A017FE10001BF83208D3F8120813F81120112252222C1E +646D:2040202023FE2200FA48224823FE2A483248E248227822002554252AAA2A5000 +646E:08207F20087E7E4408A4FF2810101E2822645FC281003FF801007FFC01000300 +646F:08207E2008F8FF2814287F6A082AFF5608A21FC001003FF801007FFC01000300 +6470:08203E2008F87F282A685D2A08563E8200201FC001003FF801007FFC01000300 +6471:100011F8110811F8FD0811F8100017FC1A9433FCD00011F81090106051982606 +6472:22002202223C2FA0F2202FA02ABE2FA43AA4EFA422242FA422242244A2444284 +6473:100013FE1200127CFE441244127C16001AEE32AAD2AA12AA12EE120053FE2000 +6474:11FC102013FE1222FDAC102011AC140019FC3000D3FE108010FC100450282010 +6475:20142012201027FEFC10249024D22C9237F2E494249425C82AAA289AB1A64042 +6476:102013FE102011FCFD2411FC112415FC182233FED00813FE1108108850282010 +6477:1124124811241000FDFC112411FC152419FC3020D3FE107010A8112456222020 +6478:1110111017FC1110FC0013F8120817F81A0833F8D04017FC10A0111052082406 +6479:04407FFC04401FF010101FF010101FF00400FFFE10502788C1061FF001000300 +647A:200027BC208424A4FA9424A42084284033F8E208220823F822082208A3F84208 +647B:1040108811FC1108FA5213FE145019883626D0C0131010641388103050C02700 +647C:200027DC251427D4FC5427C825082D1437E2E000204027FC20402040AFFE4000 +647D:100013FE105011FCFD54115411FC140019FC3000D3FE102010A8112452A22040 +647E:2000277C21442144F97C271024102C7C3454E7542154217C21102114AAFE4402 +647F:1020105010881346FC2011FC108814501BFE3000D1FC110411FC110451FC2104 +6480:08007F7808483E4800863E782A483E3040689FC601003FF801007FFC01000300 +6481:102013FE104810F0FC2013FE1242109019F83028D12011FC122017FE50202020 +6482:200027FC244427FCFC4427FC21002BF83510E0E023182C0623F82208A3F84208 +6483:1078FE4810487C8654787C485430FECE10201FC001003FF801007FFC01000300 +6484:20002FBE28A22AAAFAAA2AAA251428A23080EFFE2110221023A02060A1984E04 +6485:20002FFE28002A28F9482BEE289228843AA0EAA82BE8288828942914A9245242 +6486:49202A3E7F4849485DA86B104928414600201FC001003FF801007FFC01000300 +6487:2108210825482390F91E27D425642D543554E75425D4254825482554A46444C2 +6488:208822AA22DC2488F954222220002BFE3242E44423FC204420442084A1144208 +6489:08407F40227E3E8801483E4804507E200850288C10F03F0001007FFC01000300 +648A:279E2492279E2492FF9E240224F22C9234F2E49224F2249224922532A4024406 +648B:200027BC24A427BCFCA427BC24042DF43444E4E42444244425F42404A4144408 +648C:104013F8124813F8F84017FE10001BF83208D3F8120813F8120813F851102208 +648D:200027BC21082528F7BC231825AA29463000E3F82208220823F82208A20843F8 +648E:102013FE102011FCFC0013FE120215FC180031FCD10411FC1104108853FE2000 +648F:100013FC100413FCFC0413FC100017BC192437BCD00813FE1108108850A82010 +6490:112410A813FE1202FCF8108810F8140019FC3010D11011FE1050109053102030 +6491:112410A813FE1202FCF8108810F8140C19F03020D1FC102013FE102050A02040 +6492:2288228827C82290FA9E27D420242FD43454E7D4245427C824482454A46444C2 +6493:1020102011FC1020FBFE1108179C19083188D63E100013FE109010905112220E +6494:100011FC110411FCFD0411FC14201BFE3000D1FC110411FC1020112452222060 +6495:24802482249C2FD0F4902790249E27943494E4942FD42014251428A4B0244044 +6496:2008278820882110FFDE249424A427943494E794249424C827882C94A0A440C2 +6497:1088108811FC1088FC8813FE102015FC192431FCD12411FC1000108851042202 +6498:1210121013DE1228FD4410A015101A0835F6D000100013F81208120853F82208 +6499:2108209027FE2090FBFC2294231C2A0433FCE20423FC200827FE2108A0A84010 +649A:2110211421D22250FA7E255020902AA83128E14422442482200822A4A2524452 +649B:1020112410A813FEFCA8112412221104190431DED2441554109E110452042404 +649C:202027A420A82292F914220825F4280233F8E208220823F822082110AFFE4000 +649D:2004203E27C02244F92823F822082BFC3204E3FE240226AA2AAA2A02B0144008 +649E:102011FC10881050FDFE100011FC152419FC3124D1FC102011FC102053FE2000 +649F:101C11E0104013FEFC88110412FA148818F83000D3FE120212FA128A52FA2206 +64A0:21102114211227D2F91027DE24702FD23452E7D421142FD8210A211AA1264142 +64A1:2080211023F82210FCA427BC204028A03358EC462048226422522452A1404080 +64A2:100013FE105013FEFE5213FE100015FC190431FCD10411FC102013FE50202020 +64A3:100013DE12521252FBDE100015FC192431FCD12411FC102013FE102050202020 +64A4:2208210827C82210F49E2FD4206427943494E7942494278824882494A4A445C2 +64A5:202423A820922514F2082C0427BA20A837C6E40027BC208420A82090A5284244 +64A6:1040104017FC1110FA48144613F8185037FCD08013F81D0811F8110851F82108 +64A7:21102110221C22A4F4C82F3E212A222A34AAEFBE20A020222AA22AA2A81E4000 +64A8:1090108811FE1110FB1015FE1110191031FED110111011FE110012A452522452 +64A9:2040204027FC20A0F514220827FC2A0A33F8E20823F8204022482444A9444080 +64AA:2080211023F82080F7FE224825F4284233F8E24823F8224823F82040A7FC4040 +64AB:1100110013FC16A8FAA812A817FC1AA832A8D2A81FFE100012A8125454542000 +64AC:103813C0107813C0FC7813C4103C140018C63738D1CE173811CE1738514A2186 +64AD:207827C022482150FBFC215022482C0633F8E248224823F822482248A3F84208 +64AE:200023F8220823F8FA0823F820002FFE3480E7BC2494279424D42F88A09440A2 +64AF:1088105013FE1020FDFC104013FE148019FC3284D4FC108410FC108450FC2084 +64B0:200027BC24A427BCFC2024A4239C28003110E7FC211021102FFE2110A2084404 +64B1:2020272025FE2540FD7C2690257E2D00357CE544257C2644247C2444A444444C +64B2:1050125211541050FBFE108814501BFE3020D1FC102013FE1050108851042602 +64B3:221022102510F4BE2822274422103210EF1022102AA8272822282344AC444082 +64B4:221021102FD02010F7BE24A427D420143794E094211421C82F082114A5144222 +64B5:1088108813DE1088FBDE108811541A2233FCD080112013FC102017FE50202020 +64B6:108813FE10881000FDFC10A810A817FE18A830A8D1FC102013FE102050202020 +64B7:220022FE22102FA0F27C2244275420543054E7542554255425282724A5424082 +64B8:210023F024102FFCF44427FC244427FC3000EFFE200023F8220823F8A20843F8 +64B9:12441124112813FEFA0211F8150819F83108D1F8110811F8109010905112260E +64BA:2080204027FC2514FA48244423F82A4833F8E04027FC244427FC2444A0404040 +64BB:20102410227C2010F8FE204426282AFE3210E27C221022FE22102210A5FE4800 +64BC:2014201227FE2410F5D0241425D4255835CAE4162442282422A2228AA4784000 +64BD:2108220827C82450F7DE246427D422143114E7D4221423C822482454A55448A2 +64BE:1000127C11441174FC54105416FE12821ABA32AAD2BA1282128A1284550028FE +64BF:1020102010501088FD0412FA1000140019DC3154D15411DC1088108851542222 +64C0:2108210821142FD4F12227C0245C27C83448E7C8213E2FC821082108A1084108 +64C1:2040202027FE2028FA24227E24C82F48317EE24824C82F7E21482248A47E4840 +64C2:200027FC20402FFEF842235820402B583000E7FC2444244427FC2444A44447FC +64C3:109013FC129413FCFE9413FC100017FC1A0032F8D20013FE1520151455482986 +64C4:1040107C104013FEFE4213F8124412FC1AA832F8D2A812F8122015FC5444298C +64C5:102013FF1000FDFE1102117A114A157A190231FED00010FC108410FC508433FF +64C6:1108110817FE1108F84413F41048185037FED08011FC130415FC190451FC2104 +64C7:100013FE125213FEFC2011FC14201BFE3088D05011FC102017FE102050202020 +64C8:1050125211541050FBFE108814501BFE3020D1FC102013FE10A8112456222020 +64C9:100013F812A812A8FBF8110013FC1C8433E4D2A412A413E4109417F450142008 +64CA:083C7F242A243E422A3CFFA449187F6600201FC001003FF801007FFC01000300 +64CB:20402248215027FEF402280423F8220833F8E00027FC244427FC2444A7FC4404 +64CC:2210221023DE2528F8C4204027FE28403248E248255428A220A02110A2084C06 +64CD:23F82208220823F8F80027BC24A42CA437BCE0402FFE216022502448B8464040 +64CE:2420FF20247E7EC482287A104A287AC604201FC001003FF801007FFC01000300 +64CF:2288228827E82290FC1E27E4245428543754E5542554274825482054A2944122 +64D0:100013FC12941294FBFC100017FE180033FCD20413FC10A2111413085D442182 +64D1:101013D412521252FBD0101017FE1A5033D2D25213D4125412EA174A50562062 +64D2:204020A021102248FDF620A022482AA833F8E04027FC2484252425F4A414440C +64D3:200027FE24282624FD7E244824C82C7E3648E57E24482448257E2640A7FE4000 +64D4:108010F8110813FEFD44119211FE1500197C3100D17C1100117C1244527C2444 +64D5:10A0109011FE1320FDFC112011FC152019FE3100D3DE12521252127252022206 +64D6:108813FE108811FCFD0411FC110415FC188031FED2221552110211FA500A2004 +64D7:20102008278824BEF48024942788247E3408E78826BE2A882A882B88B2884008 +64D8:3E1022FE3E4420287EFEA2103EFC221000201FC001003FF801007FFC01000300 +64D9:1040108013FE1222FEAA122213FE16721AAA3202D02013FE1020105050882306 +64DA:1040107C104013FEFE42127813C4163C1A0033FED24013A4125815B4545229B0 +64DB:108813FE10881000FD4813FE11481578190031FCD02013FE107010A853262020 +64DC:2108210827CC210AF90827DE24482EC83548E7C8255427D425542554A45444E2 +64DD:200027BC24A424BCF7A424BC24A427A43024E04C23F822A822A822A8AFFE4000 +64DE:22102A9027102220FFBE224427A42AA43228EFA82490289025282228A5444882 +64DF:200027FC2248F4442FFE244426EC3554E6EC244426EC255426EC2444A4544408 +64E0:2080204027FC2110F0A42F58255425523B58E000220823F8220823F8A2084408 +64E1:20402FFE204027FCF00023F822082FFE3802E7FC211023F8204027FCA0404FFE +64E2:200027BC208424A4FA9424A421202A1037FCEA2023FC222023FC2220A3FE4200 +64E3:204027FC204023FCF80027FE20022BF83040E7FE200027FE200827FEA4A84798 +64E4:208023F8220823F8FA0823F820002FFC3444E7FC244427FC20002FFEA1104210 +64E5:00007E40487E7E9043087EFE48AA7EFE00201FC001003FF801007FFC01000300 +64E6:2080204027FE2402FA2423BC24A42AA83510E2E824042BFA20402248A44440C0 +64E7:0A0033B822083BB820883AB82288FFFE082037D8C1061FF001007FFC01000300 +64E8:200820682F8828EEF88A2BF22AA42AC43B84EAA42A642A0A2AEA2AAAAAAA5530 +64E9:200027FC20402FFEF842235820402B583000EFFE204027FC24A424A4A4A4440C +64EA:3FFE28882F8A20082FBE28882F88289429A227F8204027FC20405FFE404080C0 +64EB:20002FFE28082BC8FA4C2BCA2A482BDE3808EBC82A482BD42A542BD4AA5452E2 +64EC:2400257C2604F4A82390207C24143794EA5022502FDC2250255024B0A89E4100 +64ED:108813FE10A81090FDFE132011FC152019FC3120D1FE110013FC10885070238E +64EE:2110211427D22110FFFE229024502FF43494E7F4249427E8248A27FAA4264042 +64EF:1040102013FE1202FDFC1148165019FC3304D1FC110411FC110411FC50882104 +64F0:1040102013FE1222FD54114A123A100019FC3154D3FE100011FC102050A02040 +64F1:200027BC24A427BCFCA427BC24842DF43694E4E4271C24E424A424A4A4E4440C +64F2:2440228E2FEAF28A2FEA2AAA2C6C3BAAE82A2FEA210A2FEA228C2448A8284008 +64F3:1108110811EE1294FC42100013DE16521BD23252D3D2121A1294135052102010 +64F4:2040202027FE2488FDFC248827FE2C2035FCE52425FC252425FC2400A4884904 +64F5:202027FE248827DEF48825DC26AA248C35F0E42025FC242027FE2820A8A05040 +64F6:121013DE15281084FD08109017FE10001BD43254D3D4125413D41244525422C8 +64F7:2200227E22102FA0F27C22442744207C3044E77C25442544257C2700A5284044 +64F8:1124124811241000FBFC129416641A9433FCD24813681248136A124A52462362 +64F9:2290229027D0229EFB92212227C82D4837C8E10827C821142FD42294A4544822 +64FA:200027FC24A424A4F7FC222024A427B83022EF9E28802FA428B82FA2A8A2499E +64FB:210827C825482FF0F55E27E4211427D43554E7D422142FC824482694A1944662 +64FC:210023F024102FFCF44427FC244427FC3524E89223F8220823F82208A3F84208 +64FD:244424E428A82AAAFEEE24A42AAA2EEE3242E0402FFE20E021502248AC464040 +64FE:27FC208023F82208F3F822082FFE28823548E51428F4210023F82508A0F04F0E +64FF:2020201024FE2244FA2820FE20922EFE3292E2BA22AA22BA22862500A8FE4000 +6500:22882108FABE2008729CA92A2288FFFE082037D8C1061FF001007FFC01000300 +6501:2208211027FC2040FBF8208027FC294833FCE60A2BF8220823FA2234A28C4302 +6502:23F82248224823F8F248224823F820003FBEEAAA2AAA2FBE2AAA2AAAAFBE48A2 +6503:1088108813FE1088FD1011DE125215541A883174D20211FC1020112452222060 +6504:2020203E202027FEFC2225F824222DFE3524E5FC252425FC28402AA4B28A447A +6505:108811DC108813DEFC881154122211FC190431FCD10411FC110411FC50882104 +6506:108813DE108813DEFD54122211FC142019FC3124D1FC112411FC102053FE2020 +6507:20402FFE284227FCF84023F820402FFC3040E7FC24A427FC20402524A52A48FA +6508:102013FE125013FEFA5213FE12941AD83292D2CE120812F0122015FC54A82B26 +6509:27FC204027FE2442FB5C2040275C292033FCE6202BFC222023FC2220A3FE4200 +650A:200027FE24442598FC8827DE24882DDC36AAE48824202520253C2920A92057FE +650B:2108210827CE2112F92427DE25522D5E37D2E11E2392255E29402114A1124122 +650C:2FFE28022BFA2AAAFBFA28022BFA280239F2E91229F228AA29922ACAA8824FFE +650D:40807FFC48004FF8E0004FF848084FF86080DC9C57D45D54555C5C965556EE22 +650E:1040107C104013FCFE4413F0124416FC1AA832F8D2A812F8120015FC55542BFE +650F:1110109013DE1010FA5E118217DE181033DED25013DE125013DE1250525222CE +6510:104017FE149213FCFC9013FC109017FE19483224D5FA10A411A8129054C82086 +6511:1140126C1244136CFEA413AC12A417FE19083244D5F2104017FC104050402040 +6512:2108252827BE2948F7BE231825AA29463000E3F822082248224820B0A1084604 +6513:204027FE249223FCF89023FC20902FFE3108E3FC250A21F82240227CA54048FE +6514:27BC24A427BC24A4FFBC244425F42C4435F4E55425F4255425F424E4A554444C +6515:2448244C2AAAF0082FFE22882EE8328AEEEA228C2EEC228822EA2F1AA4264042 +6516:13DE125213DE1252FBDE125213DE198C3252D04017FE10881190106050D82304 +6517:204027FE24A027FCFCA427FC25142DD83512E54E25A424A827FE28A8A9245222 +6518:204027FC200023B8FAA823B821102FFC3110E7FC21102FFE21282310AD484186 +6519:11F0121017FC1204FBFC122413B81A2231FED21017FC124413FC10D0514A263E +651A:108812AA12DC1488F954122217FE1A0230F8D08810F8100011FC110451FC2104 +651B:104017FE14921108FC80131C1204179C1A0433FCD24813681248136A52462362 +651C:122213FE109011FEFB1015FE111019FE3110D1FE110013FE128A137652522276 +651D:13FC110811F81108FDF8110E17F8180837FED294139C1294139C12D657BC2084 +651E:200027FC24A4F4A427FC221022A834BEEF68223C24A82FBC20282AA8AABE4020 +651F:204027FE24A027FCFCA427FC24002DFC3504E574252425FC257429ACA92451FC +6520:202027FE248827DEFC8825DC26AA2C883450E7DE245025DC24502BDEA8505050 +6521:241822142F90253EFAA82DE828BE2FA83228EFBE2AA82AA82BA828BEAAA04920 +6522:252827BE294827BEFB1825AA29462BFC3204E3FC220423FC220423FCA1084204 +6523:21084FD2F03C23884812FBBE0280ABAA00201FC001003FF801007FFC01000300 +6524:251825142F90253EF72822682FBE2AA83FA8E23E2FA822283FE8253EA8A05060 +6525:221023DE25282084FBFC22A422542BFC3080E7FE22A825E4285223F8A15042C8 +6526:2FBE200027BC24A4F6B424A4204027FE34A0E7FC24A427FC251229DCA91251CE +6527:2200221E2FC42208F79E24922792249E3792E49E279224922FDE2500A48C4892 +6528:20402FFE2A0A2434F3C02290228822A434D0E18E2E742B542AD42A52AB5A5294 +6529:2248215027FC2404F9F0211027FC2D5434E4E7FC204027FC20402FFEA2A44452 +652A:22AC244426AC2444F6AC24042FFE2A0A33F8E20823F8220823F820A0A124461C +652B:13DE125213DE1252FBDE10A011FE1B2035FCD12011FE100011FC10885070278E +652C:2790251E27A82484FFBE252A27BE280033F8E20823F8220823F820A0A124461C +652D:21F0221023E02020F7FC2188265021A83664E1A022482FBE2AAA2FBEA28A4FBE +652E:204027FC224823F8F0402FFE2AAA23B83110E7FC21102FFE21282310AD484186 +652F:0100010001007FFC0100010001003FF01010082004400280010006C01830E00E +6530:102010201020FE2010FC1024FC24442444242844284410941908240043FE8000 +6531:202010201020FDFE00200820882089FC48844888504850501C20E05041880606 +6532:10101010FE1010FE28104410FEFC044474445444542874285410042814440982 +6533:11FC100410FCFE0411FC1000FDDE449247DE28082BFE110818A8241043FE8000 +6534:01000100010001FC0100010001003FF01010082004400280010006C01830E00E +6535:0400040004000FFE08101010302048208440028001000280044008203018C006 +6536:084008404840488048FE49084A88488848885850685048200850088809040A02 +6537:00400040FE40208020FE210842887C8804880450045004200450048829041202 +6538:082008200820103E12443244524492A412281228121012101228104810841102 +6539:00400040FC8004FE0508050806887C8840884050405044205850608841040202 +653A:004000407C40448044FE4508468844887C884050405040204450588861040202 +653B:004000400040FE8010FE1108128810881088105010501E20F050408801040202 +653C:00407C401040108010FE11081288FE8810881050105010201050108811041202 +653D:002014201220123E214421444044BEA41228122812101210222822484A848502 +653E:204010400040FE8020FE21083E88248824882450245024204450548889040202 +653F:00200020FF20083E0844084448444EA448284828481048104F28F04800840102 +6540:1040104020407C8044FE4508468844887C8844504450442044507C8845040202 +6541:1020102010201E3E1020102010207DFC44844488444844507C20445001880606 +6542:1020102020203F3E414481443D4425A4252825283D102510012801480A840502 +6543:0020FE208220823E8244FE44904490A4FF289028901088108928A528C3448182 +6544:0040FC400440688010FE0908FE88128834883050505050209050108851042202 +6545:1040104010401080FEFE1108128810887C8844504450442044507C8845040202 +6546:08100810141E22104110BEFC004400443E4422282228221022103E2822440082 +6547:08100810FF900820083E7F44492449244D244A281C282A10492888A808440882 +6548:102008200020FF3E00442444424481A424281428081014102228424880840102 +6549:104010409440548058FE1108FE88308838885450545090201050108811041202 +654A:081008100E10081E08100810FEFC0044084408444A2849288910082828441082 +654B:204020403C404480C4FE290812882888448882507C504420445044887D044602 +654C:04200E203820083E0844FF44084408A43E2822282210221022283E4822840102 +654D:081008101410221E4110BE1008FC08447F4408442A2829284910882828441082 +654E:0240644018402480D2FE1108FE882088FE88445088500F20F850088829041202 +654F:402040207F20803E7E44424452444AA4FFA8422892108A10FF28024814840902 +6550:00207F204020403E5E44404440447FA4502851285A1054105228912898441082 +6551:1040144012401080FEFE11081088928854881050385054209250108851042202 +6552:1210121012102FA02ABE6AC46AA4AFA42AA42AA82AA82F902228222822442282 +6553:004028402440428080FE7D084688448844887C502850282028502A884D048A02 +6554:0020FF201020103E7E4422442244FFA4002800287E104210422842287E444282 +6555:08200820FFA0083E08447F44494449A47F2808281C102A104928884808840902 +6556:0820082008207F3E08443E440844FFA410281E281210121022282A4844848102 +6557:00407C40448044FE7D08450846887C88448844507C5000202850248845048202 +6558:082008201420223E4144BE44084408A47F2808282A1029104928884828841102 +6559:082008207EA0093E0A44FF4408447EA4242848288F1078100828084828841102 +655A:44402440284000807CFE4508468844887C882850285028202A504C8889040202 +655B:082008201420123E214440C4BE4400A411280928491022102228074878842102 +655C:082008201420223E514488447E4402A4142808282A10A110A128A5281C440082 +655D:0810491029102A20083E7F44492449245D246B28492849104928412845444282 +655E:0820492029202A3E08447F44414441A45D285528551055105D28412845444282 +655F:1420142014207F3E5544554455447FA4552855285510FF902428224842848102 +6560:0010F7101110551E2210551089FC10440044F744112855282210552889441082 +6561:00107E104210421E7E10421042FC7E4420447F44952825284910912825444282 +6562:00207E200220043EFF44224422443EA422283E28221022102F28F22842440282 +6563:242024207E20243E2444FF4400447EA442287E2842107E10422842284A444482 +6564:00107F104910491E7F10491049FC7F440844FF441C282A284910882808440882 +6565:0810091049104A1E8810141022FC49448844494449288A281410222841448082 +6566:10200820FF20003E7E4442447E4400A47E28042808100F10F828084828841102 +6567:081008107F1E1410221041FCFF4402447A444A284A287A104A1002280A440482 +6568:102008207F20003E22441444FF4400A400283E282210221022283E2822440082 +6569:511029102A100020FFBE80C401247E24042408280F28F8100828082828441082 +656A:0020F7201120553E22445544994400A4F7281128551022105528894810840102 +656B:082010207E20423E7E4442447E4410A40828FF2820103E10222842484A848502 +656C:22202220FFA0223E40447F44414481A47D28452845107D10452801280A440482 +656D:00207E2042207E3E42447E440044FFA440287F2895102510492891482A844502 +656E:02100F107810081E0810FF1028FC4B44494449446B28492849107F2841440082 +656F:0010FE108210FE1E8810FF1088FCA544C3440044FE288228FE108228FE448282 +6570:082049202A20083EFF442A44494488A41028FE2822104210642818283444C282 +6571:0810491049107F1E0010FF1000FC7F44414441447F28422824100F28F0444082 +6572:10100810FF10001E7E1042107EFC0044FF448144BD28A528BD10812885448282 +6573:0820492049207F3E0044FF4400447FA4412841287F10421024280F48F0844102 +6574:08200820FFBE08447FA449247F282A104928884600007FFC010011F81100FFFE +6575:102008207F20223E14447F44414449A47F2849285D10551055285D2841444382 +6576:0210E210BFD0A220AFBECAC4AFA4AAA4AFA4A228A728CA909268822882448282 +6577:0A200920FFA0083E7F4449447F4449A47F2849281010FF9020283E2842448682 +6578:08107F104910FFA0493E7F4408247F2449247F281028FF10212872280C44F382 +6579:082008200F20083EFF448144064478A449282A28FF1018102C284A4888840902 +657A:0010FF90801E9F10911091FC9F448044BBC4AAA8AAA8AA90BB908028FFC40082 +657B:10001FE020207FF8A30824881FF010101FF010101FF008001FF8282007C0F83E +657C:0810FF9008107F1E00107F1041FC7F442244FFC400287F28411041287F444182 +657D:061078101010FF9E22105D1094FC1C4400447F4441285D2855105D2841444382 +657E:22101410FF9008207F3E0844FFA449242A24FFA800287F10412841287F444182 +657F:061078101010FFA0223E5D4494A41C2400247F2841285D1055285D2841444382 +6580:00107F10551E55107F1020FC7F4491447D44552855287D1011107D2805440282 +6581:00207F2055207F3E08447F440844FFA4222814287F100810FFA8084808840902 +6582:082008201420223E4144BE44004400A477285528551077102228222855448882 +6583:49202A3E7F4849485DA86B10492841460000FFFE10803E9842E024841884E07C +6584:08203E3E08447FA82A10492808443FFE20802FFC249024902AA851C446B0988E +6585:34104B105510631E55106B10557CFFA480A47E2404280F28F810082828441082 +6586:34104B1055106320553E6B445524FFA480A47E2804280F10F828082828441082 +6587:020001000100FFFE10101010082008200440028001000280044008203018C006 +6588:020001007FFC0820044003801C70E00E0FE000400080FFFE0100010005000200 +6589:020001007FFC0820044003801C70F01E10101FF0101010101FF0101020104010 +658A:020001007FFC0820044003801C70E00E3FF808200FE008200FE0083EFFE00020 +658B:020001007FFC0820044003801C70E00E1FF0020004003FF82488248824A82010 +658C:0010201411D20012FC100BFE08104890289012D012902A902A8A4AEA87060202 +658D:01007FFC0820044003801C70E00E1FF010101FF010101FF010101FF00842F03E +658E:020001007FFC0820044003801C70E00E17D0101017D011101590255029104010 +658F:0040202011FC0104FD0409FC0904490429FC1120112229142908494481820100 +6590:04407C7C044004403C78044004407C7C04400100FFFE0820044003801C70E00E +6591:00000200F93E21082FC820882488FA8822BE210821083A88E2884448087E0000 +6592:0040202011FE0102FD0209FE0900490029FE11AA11AA2AFE2AAA4AAA84A20086 +6593:0200417C25040444FDF4144415F41554957455D4255425F454E455548444044C +6594:20201020FEA0052C6924112429ACD52411247DFC55247C5010501C88E5044202 +6595:03DE225213DE0252FFDE0A220AFA4A222AFA12AA12FA2AAA2AFA4A7282AA0226 +6596:01007FFC082007C01830E7CE244837D82448FFFE90121FF010101FF01010FFFE +6597:0040044002400240104008400840004000FE7F40004000400040004000400040 +6598:1010101010901E5012102290225052108A1E05F0041008100810101020104010 +6599:080808884A482A482C080888FE4818481C082A0E2AF848088808080808080808 +659A:1020102024487EFC224400007FFE4442824410400840007EFFC0004000400040 +659B:100810883C4824484808BE882A482A483E082A0E2AF83E082A084A0842088608 +659C:08080848142822284108BE48082808287F0E08782A0829084908880828081008 +659D:00003E7C224422443E7C00007FFE4442824410400840007EFFC0004000400040 +659E:080828484B28492849086B48492849287F0E4978080814081208210841088008 +659F:22082248FF2822283E0822483E282228220EFF7840085408620840087E080008 +65A0:22082248FFA822287F082248FFA808287F0E49787F084908FFC8410845084208 +65A1:102010201050FE8811047C1244907C5045107C90101EFEF01010101010101010 +65A2:220822487F2822282208FFC808287F28490E7F7849087F080008220841088088 +65A3:00087F48552855287F0820487FA890A87C8E54F854887C881288FE8802880108 +65A4:001000F81F001000100010001FFE104010401040104010402040204040408040 +65A5:001000F81F001000100010001FFE1040104011C0106010502048204040408040 +65A6:0200070438782040204020403F7E244824482448244824482448448844888108 +65A7:044008201850248803000CC03030C0EE1F00100010001FF81080108020804080 +65A8:0408241C24E0248024803C8004FE0488FC882488248824882508450846088408 +65A9:2008201C21E0FD004100510091FEFD10111011101D10F1105110121012101410 +65AA:2000200440787E40824002407A7E4A484A484A487A484A480248028814880908 +65AB:0008001CFCE01080108020803CFE64886488A488248824883D08250822080408 +65AC:1008101C10E0FE8010807C8054FE7C9054907C901090FE901090111011101210 +65AD:0400040455784E4044407F40447E4E48554865484448444840487F8800880108 +65AE:240024047E7824402440FF40007E7E48424842487E48424842487E8842880108 +65AF:220022047F78224022403E40227E22483E4822482248FF480448228841888108 +65B0:100008047F78004022401440FF7E084808487F4808482A484948888828881108 +65B1:100010047D7812401440FF40107E20487E48A24822483E48224822883E882308 +65B2:000077045578554077401440147E7748414841487748144814481F88F0884108 +65B3:22002202FFBC22203E2008207F3E49247F2408247F2408247F2408440F44F084 +65B4:080049022A3CFFA02A20492088BE4124412477A49124552427A4414481440184 +65B5:10006F044578554069404B40107EFFC8144877484148774814481788F8882108 +65B6:00000DFC7154415441FC40807DFC4A4449F44954495449F4484449F448148808 +65B7:0882509C5D5049D054905DDE44547FD4489450945D5449D454945DD444647FC4 +65B8:7FC2405C7FD052504A90525E5FD455545FD464545F5455545F544454BF640084 +65B9:020001000100FFFE04000400040007F004100410041008100810101020A04040 +65BA:202010200050FE50208821043E02248824882488248824884488550889080208 +65BB:208010800080FEFC210022003CF02490249024902490249244925512890E0200 +65BC:202010200020FE50205020883D04260224602410240024C04420541088080000 +65BD:2080108010FE0120FE202120212C3D7427A425242534252A2522450254FE8800 +65BE:208010800080FEFE212022203C2025FC25242524252425244534552888200020 +65BF:2080108010FE0100FE0020FC20043C08241025FE241024102410441054508820 +65C0:202010200048FE8421FE20023C20242024A824A4252425224622542088A00040 +65C1:020001003FF8082004407FFE420281043FF80400040007F00810081010502020 +65C2:2080108010FE0100FE0C20F020803C80248024FE248824882488450855088A08 +65C3:2080108010FE0100FE0020FC20843CA42494248425FE24842484450455148A08 +65C4:2080108010FE0100FE1C21E020203C3C25E02420243E27E0242044225422881E +65C5:2080108010FE0100FE0C20F020903C902492249424882488248444A454C28880 +65C6:2080108010FE0120FE2021FE20203C2025FC2524252425242534452854208820 +65C7:2080108010FE0100FE10201020FE3C92249024FC24A424A424A8451055288A46 +65C8:2020101001FEFE20204820843DFE240224A824A824A824A844A854AA892A0206 +65C9:01107FFC01003FF821083FF821083FF821080080FFFE08000FF810082028C010 +65CA:2080108010FE0100FE0020FC20403C402478244824A82498248844AA54CA888E +65CB:2080108010FE0100FE0021FC20243C2424A024A024BC24A024A04560553E8A00 +65CC:2080108010FE0110FE10209020FE3C902510241024FE24102410441055FE8800 +65CD:2080108010FE0120FE20205020883D242612241025FC24042488445054208810 +65CE:2080108010FE0100FE0020FC20843C8424FC248024A424A824B0452255228A1E +65CF:2080108010FE0100FE80208020FC3CA02520242027FE24202450445054888906 +65D0:2100110011FE0200FC50205022543D58245024D825542652245044505492890E +65D1:2020102011FC0050FC88210423FE3C0825E82528252825E82528440854288810 +65D2:2100110011FE0240FC2021FE20403C8425FE240224A824A824A844AA552A8A26 +65D3:2100110011FE0220FD2420A820203DFC250425FC250425FC2504450455148908 +65D4:40102010007CF71441FE4114727C5210577C511051FE551052105300B4FE0800 +65D5:10100810FF2820443E822210220842204A10840800007C8844B044C47C84447C +65D6:2100110011FE0200FC2021FC20503C8827FE240825E8252825E8440854288810 +65D7:2100110011FE0200FC8821FC20883CF8248824F82488248827FE445054888904 +65D8:2110109413D20012FA50219027FE38102BD22A522A542BD42A4A4A4A4BD69822 +65D9:203C13E0112400A8FDFE20A821243E0225FC2524252425FC2524452455FC8904 +65DA:210011FE120001FEFC5021FC21543DFC240025FC240027FE242044A855248A64 +65DB:2100110011FE0200FC1C23E021243CA827FE2524260225FC252445FC552489FC +65DC:210011FE122004FCFC0021FE21023D7A254A25FE248424FC248444FC540089FE +65DD:208010FE11300248FCB4210221FE3DAA257225FE240024FC248444FC548488FC +65DE:2080108010FE0100FE44202822FE3D2024542728255C252A254A452856908C7E +65DF:2100110001FEFE002540224C3A642B4C2A642AA42BAC2AA44FFE689091080204 +65E0:00003FF002000200020002007FFC0480048004800880088010842084407C8000 +65E1:00003FF002000200420042007FFC0480048004800880088010842084407C8000 +65E2:00007DFC442044207D20452045FE7C204020483044504A5052926092410E0200 +65E3:100021FC7C2044207D2045207DFE0020402040307C50405040924C92710E0200 +65E4:00007DFC442044207520552055FEFE208220BA30AA50AA50BA9282928B0E8600 +65E5:00001FF0101010101010101010101FF01010101010101010101010101FF01010 +65E6:00001FF010101010101010101FF010101010101010101FF000000000FFFE0000 +65E7:200023FC2204220422042204220423FC2204220422042204220423FC22042000 +65E8:2000207023803C08200820081FF800001FF0101010101FF0101010101FF01010 +65E9:00001FF0101010101FF0101010101FF001000100FFFE01000100010001000100 +65EA:002000207C2044204420442047FE7C2044204420442044207C20442000200020 +65EB:000000007DFC44444444444444447C4444444444444444847C84450402280410 +65EC:080008000FFC100410042FC4484488440FC4084408440FC40844000400280010 +65ED:200020F820882088FC8824F8248824882488248824F8248A2402440243FE8000 +65EE:020002003FE0042008223022C01E00001FF0101010101FF0101010101FF01010 +65EF:00001FF0101010101FF0101010101FF0020002007FE00420042008221022601E +65F0:000000FC7C2044204420442044207DFE44204420442044207C20442000200020 +65F1:1FF0101010101FF0101010101FF000003FF801000100FFFE0100010001000100 +65F2:00001FF0101010101FF0101010101FF001000100FFFE0280044008203018C006 +65F3:004000407C8044FC4504460444047D0444844444444444047C04440400280010 +65F4:000001FC7C2044204420442047FE7C2044204420442044207C20442000A00040 +65F5:00001FF0101010101FF0101010101FF00000010021082108210821083FF80008 +65F6:000800087C08440845FE440844087C0844884448444844087C08440800280010 +65F7:00400020782049FE490049007900490049004900490079004900020002000400 +65F8:000001F87C1044204440448045FE7C9244924492451245227E22444200940108 +65F9:01002108210821083FF80100FFFE00001FF0101010101FF0101010101FF01010 +65FA:000007FC784048404840484078404BFC4840484048407840484000400FFE0000 +65FB:1FF0101010101FF0101010101FF0020001007FFC08200440038004401830E00E +65FC:004000207C2047FE4488448844887C8844884450445044207C50448801040602 +65FD:0020002078204BFE4820492449247924492449FC4824482078224822001E0000 +65FE:01000100FFFE010021083FF80102010200FE00003FF820083FF820083FF82008 +65FF:008000807C8045FC4520462044207C2047FE4420442044207C20442000200020 +6600:004000407C8044FC4504460444847C4444444414442444447D84440400280010 +6601:0020002078204BFE4820482049FC792449244924492449347928482000200020 +6602:3FF820083FF820083FF800000C0070FC4084408440844C847094408800800080 +6603:00001FF010101FF010101FF000003FFC20802080214021402220441048089006 +6604:0008003C7BC04A004A004A007BF84A884A884A884A507A504A20045004880906 +6605:000003FC7884488848884890489C788449444944492849287A104A2804440182 +6606:00003FF0201020103FF0201020103FF00000208020843E9820E020842684387C +6607:00001FF010101FF010101FF000000720782008200820FFFE0820102010202020 +6608:002000107C1044FE4482448244827CFE44824480448044807C80450001000200 +6609:004000207C2047FE4480448044807CFC44844484448444847D04450402280410 +660A:00001FF010101FF010101FF0000000003FF801000100FFFE028004401830E00E +660B:3FF801000200FFFE044008203018C0061FF0101010101FF0101010101FF01010 +660C:1FF0101010101FF0101010101FF000003FF8200820083FF8200820083FF82008 +660D:000001FC7D0445044504450445047DFC45044504450445047D0445FC01040000 +660E:000000FC7C844484448444FC7C844484448444FC7C8444840104010402140408 +660F:00783F80208020803FFC20402822301A20061FF0101010101FF0101010101FF0 +6610:001000907C9044884508450446047DFA44884488448844887D08450802280410 +6611:002000207C5044504488454446227C20440045FC440444087C08441000100020 +6612:01000100790049FC4AA44CA448A4792449244A444C44488479044A0404280010 +6613:0FF0081008100FF0081008100FF0040008001FFC224442440484088411280210 +6614:044004403FF804400440FFFE000000001FF0101010101FF0101010101FF01010 +6615:0004000E7CF044804480448044FE7C8844884488448844887C88450801080208 +6616:00100090789048884888492449247A224C4048404888488479044BFE01020000 +6617:00001FF0101010101FF0101010101FF0020001007FFC00000440082010102008 +6618:00001FF010101FF010101FF002000100FFFE040007F004100810101020A04040 +6619:00001FF010101FF010101FF000003FF800000000FFFE0400082010103FF81008 +661A:01000100FFFE01002288145008203018DFF6101010101FF0101010101FF01010 +661B:000001FE7D004500450045FC45047D044504450445FC45007D00450001FE0000 +661C:00001FF010101FF010101FF00000FFFE08001FF8224844480888110822280410 +661D:104010403E5022485444084017FE2000DFF0101010101FF0101010101FF01010 +661E:000003FE7820482048204BFE7A224A224A524A4A4A8A7B024A020202020A0204 +661F:00001FF010101FF010101FF0010011001FF8210041001FF0010001007FFC0000 +6620:00200020782049FC492449247924492449244BFE482078504850008801040202 +6621:002000107C1045FE4420442044447C8445F84410442044447C8245FE00820000 +6622:002000207D2445244524452445FC7C2044204524452445247D24452401FC0004 +6623:002000207C5044884504461244207C4045884410442044447D88441000600380 +6624:002000207C5044504488452446127C1045FC4404440844887C50442000100010 +6625:010001007FFC01003FF80200FFFE082010102FE8C82608200FE0082008200FE0 +6626:00001FF010101FF010101FF002007FFC044008203458C4460440044008401040 +6627:00200020782049FC4820482048207BFE487048A848A8492479244A2200200020 +6628:01000100790049FE4A804A804C8078F848804880488048FC7880488000800080 +6629:0040004078404FFE4840484048407BFC484048E049504A487C46484000400040 +662A:00001FF010101FF010101FF0082010103FF808280820FFFE0820102020204020 +662B:00800080790049FC4A044C0449E479244924492449E449247804480400280010 +662C:00003FF820083FF820803FFC20402C243014200C1FF010101FF010101FF01010 +662D:000003FC788448844884490449147A084C0049FC490449047904490401FC0104 +662E:00001FF010101FF010101FF0004000407DFC1044104410841C84E10442280410 +662F:1FF0101010101FF0101010101FF00000FFFE0100110011F811002900450083FE +6630:00001FF010101FF010101FF0000000007FFC0100110011F811001100FFFE0000 +6631:1FF0101010101FF0101010101FF00200010001007FFC0000101008200440FFFE +6632:0090009078904BFC489448947BFC4A904A904BFE48927892491A011402100410 +6633:004000407A404A404BFC4A404C4078404FFE484048A048A079104A0804040802 +6634:00001FF010101FF010101FF000000C0070FC448444845C846494488810806080 +6635:000001FC79044904490449FC49007940494449484970494079424A42023E0400 +6636:08000400027C3C44044404C4757C164416441544257C248044408430140E0800 +6637:00001FF0101010101FF0101010101FF000003FF82448244824482448FFFE0000 +6638:004000407C7C44844588465044207C5044884706446044107C0844C000200010 +6639:00400020781049E0482248347BB848B048A848A8492879244A24042200A00040 +663A:00001FF010101FF010101FF000007FFC01003FF8210822882448282820082018 +663B:00001FF010101FF010101FF000007CFC10841084108410841E94F08840800080 +663C:00001FF8100810081FF81040102020102FE848268FE008200FE000007FFC0000 +663D:00900088788848804BFE48A048A078A448A44928492849327A224A62049E0800 +663E:00001FF0101010101FF0101010101FF0044044442444144814500440FFFE0000 +663F:00200010781049FE490049107910491049104920492879244A4402FE04420800 +6640:0090009078904A9249944898489079984A944C9248904890791249120212040E +6641:00001FF0101010101FF0101010101FF0244814500C601450644808421042603E +6642:002000207C2045FC4420442047FE7C08440845FE440844887C48440800280010 +6643:00001FF010101FF010101FF00100111009200100FFFE0440044008421042603E +6644:004000447A444948495048404FFE7890489048904890489279124912020E0400 +6645:000003FE7800480049FC4904490479FC4904490449FC49047800480003FE0000 +6646:002000207DFC44204420442047FE7C004420442045FC44207C20442003FE0000 +6647:002000207BFE4850488849047AFA48004BFE4840488079FC4804000400280010 +6648:004000207C2047FE4400448845047E0244884488445044507C20445000880306 +6649:00007FFC0810102024487EFC02040000FFFE00001FF010101FF010101FF01010 +664A:000003FE7840488049104A084BFC7844484048404BFC48407840484007FE0000 +664B:00007FFC0440244814500440FFFE00001FF0101010101FF0101010101FF01010 +664C:0040004078804BFC4A044A044AF47A944A944A944A944AF47A044A0402140208 +664D:000001FE7D024502457A450245027D7A454A454A454A457A7D024502010A0104 +664E:01100110791049104BFC49107910491049104FFE480079104908020804040804 +664F:00001FF010101FF010101FF001007FFC42040200FFFE08201C4003800C707008 +6650:0020001078104BFE48204842488479F84810482248C44B087810482800C40302 +6651:00001FF010101FF010101FF0020004003FF8200827C82448244827C820282010 +6652:000007FE7890489048904BFC4A947A944A944A944A9C4B047A044A0403FC0204 +6653:0080008078BC4BC04850482448D47B0C48004BFE4890489079124912020E0400 +6654:00900094791449184B104D324952790E492048204BFE48207820482000200020 +6655:1FF010101FF010101FF000007FFE42029FF4040009001FF001007FFC01000100 +6656:000003FE7A024C4448404BFC488078A0492049FC482048207BFE482000200020 +6657:0040004078A049104A884C4649F07810482048404BF84A087A084A0803F80208 +6658:000001FC7D0445FC450445FC44007C0045FC4420442047FE7C20442000200020 +6659:00400040788849044BFE4802488879444A4248F849884A507820485001880606 +665A:0080008079F84A084C104BFC4A447A444A444BFC48A048A079224922021E0400 +665B:000003F87A084A084BF84A087A084BF84A084A084BF87920492002220422181E +665C:00001FF010101FF010101FF004407FF801083FF821003FFC0304051419086100 +665D:01003FF80108FFFE01083FF801007FFC00003FF820083FF820083FF80000FFFE +665E:01840068783048C84B0448407BFE48A049204BFC4D2479244934012800200020 +665F:1FF010101FF010101FF000883FFC208020883E88225022502A244454418C8604 +6660:00280024782448204BFE4A207A244A244BA44AA84AA87A904A9205AA04460882 +6661:004800447BFE484048404BFC4A447A444BFC4A444A444BFC7A444A4402540208 +6662:080C08F07E8008800EFE788808882908120800001FF010101FF010101FF01010 +6663:0104010E793049204FE04920793E496449A44F24492479244924012405440284 +6664:000003FE7840484049FC488448847BFE4800480049FC49047904490401FC0104 +6665:004000207BFE4A024C0449F8780048004BFE48904890789049120112020E0400 +6666:0100010079FC4A004DF84908494879284FFE49084A484A287BFC480800500020 +6667:00200120792049FC49204A2078204BFE4800480049FC79044904010401FC0104 +6668:1FF010101FF010101FF000003FFC20002FF820003FFE2908289048604A188C06 +6669:0080008079F84A084C104BFC4A447A444A444BFC48A048A079224922021E0400 +666A:0090009078904BFC4A944A944A947BFC4A944A944A944FFE7800489001080204 +666B:00400040787E48404BFC4A044BFC7A044BFC4A4448404FFE7840484000400040 +666C:004000207BFE48004888488849547A22480048204BFE48207820482000200020 +666D:000003FE7A224A224AFA4A227A224BFE4A024AFA4A8A7A8A4AFA0202020A0404 +666E:082004407FFC044024481450FFFE00001FF0101010101FF0101010101FF01010 +666F:1FF010101FF010101FF00100FFFE00001FF0101010101FF00100210845040200 +6670:0200020CF27092409F409240927EF64897489AC89A489248F248924802480288 +6671:0020012279224A24485048887B0448224820492449247A284850008801040602 +6672:000000407B9C4A044A044B9C7A044A044BFC489048907890489001120212040E +6673:080C08F07E8018802CFE2A884888888809081FF0101010101FF0101010101FF0 +6674:002000207BFE482049FC48204BFE780049FC490449FC490479FC490401140108 +6675:104008403E7E228823503E20205841869FF0101010101FF0101010101FF01010 +6676:0FE0082008200FE0082008200FE000007EFC428442847EFC428442847EFC4284 +6677:1FF010101FF010101FF008401F6022505448084037FEC0001FF0101010101FF0 +6678:1FF010101FF010101FF000207F20043E044427A42428242824102F28F0444082 +6679:01FC010479FC4904490449FC7800490049FE4A4A4C4A789249120222004A0184 +667A:20003E7C48440844FF441444227C40001FF0101010101FF0101010101FF01010 +667B:004000807BFC49104A484C464BF87A484A484BF84A484A487BF848420042003E +667C:00800040F7FE94029A04920093BCF4A494A496A499349128F22292220422081E +667D:01100110F110911097BC91109110F33893B8955495549992F110911001100110 +667E:004000207BFE4800480049FC49047904490449FC482048A879244A2200A00040 +667F:00FC00847C8444FC4484448444FC7C0045FE4502450245FE7D02450201FE0102 +6680:0090008879004A7E4C90489049107B104D7E49104910491079104910017E0100 +6681:0020002079FC482048A848887BFE488848004BFE4890789049120112020E0400 +6682:100CFEF0208048807EFE08880E88F9084A081FF8101010101FF0101010101FF0 +6683:00001FF010101FF010101FF004407C7C044004407C7C04400440FC7E04400440 +6684:004000207BFE4A024C0449FC480079FC490449FC490449FC7904480003FE0000 +6685:0100013CF100910091BC95649524F53C952491249124913CF1249100017E0100 +6686:02100110F11097BE9228924893AAF2AE92BA92EA92AE92A8F4AA94A209A2101E +6687:000007BCF4849484948497BC9400F40097BC9424942497A8F410942804440482 +6688:1FF010101FF010107FFC41043FF801001FF011101FF011101FF00100FFFE0100 +6689:000003FE7A2248204BFE482079FC492449FC492449FC78204BFE002000200020 +668A:000003FE7C20444045FC450445047DFC450445FC450445047DFC440000880104 +668B:00207F20413E7F4448A47F2448284510532861461FF010101FF010101FF01010 +668C:001003D478584A52498C488849047AFA482048204BFE48207850488801040202 +668D:000001FC7D0445FC450445FC44807DFE46224522455245027DFA440200140008 +668E:008800887BFE488848A8482049FC7924492449244BFE48207850488801040202 +668F:004000447BF4484848504FFE4840788049F84B084D0849F87908490801F80108 +6690:0040004079FC48844BFE480049FC790449FC48204BFE48207A204BFE00200020 +6691:1FF010101FF010101FF002001FD00220FFFE03000FF03810CFF008100FF00810 +6692:000001FC790449FC490449FC7820492049FE4A20482079FC4820002003FE0000 +6693:00407F40127E0C88FF4819482A504820A850108C1FF010101FF010101FF01010 +6694:002000207BFE482048204BFE7A8A4A524AFA4A224A227AFA4A220222022A0204 +6695:002000207BFE482049FC492479AC4974492449FC4820787048A8012402220020 +6696:003C07C07A44492848004BFC788048804FFE490049F87A884A50042008D80306 +6697:008000407BFC4800490848904FFE780049F84908490849F87908490801F80108 +6698:000001F8790849F8490849F878004BFE490049FC4A547C944924024400A80110 +6699:00400040F7FC904093F8908097FCF110920895F691109110F1F09110011001F0 +669A:0008003C7BC048044A44492879FC4A2048204BFE482079244924012401FC0004 +669B:0108008878904BFC484049F848407BFE4880490049FC4A207C20482003FE0000 +669C:20201010FEFE00004444242428280EFEF00000001FF010101FF010101FF01010 +669D:000003FE7A02480049FC490449FC790449FC484048204BFE7800488801040202 +669E:0020004079FC490449FC490479FC490449FC48204BFE787048A8012402220020 +669F:002001247924492449FC48007BFE480049FC4904490479FC4888005003FE0000 +66A0:1FF010101FF010101FF00100FFFE10101FF000007FFC40044FE448244FE4400C +66A1:0090008879044A424C8849FC780448004BDE48424A52794A4A520042014A0084 +66A2:100011F811087DF8550855F87C0057FE550055FC7E5454941124124410A81110 +66A3:0100010079FC4A004DF848007BF848884AA849C84FF8788A49CA06AA00860082 +66A4:0020004079FC490449FC490479FC48404BFE488849247A224DFC002000200020 +66A5:000001FC790449FC490449FC78204BFE4A0248404BFE78884990006000980304 +66A6:00003FFE221022103FBE27182AB432522210200027F8240827F8440847F88408 +66A7:000E03F078444A2449084BFE7A4248404BFE488048FC79444928021004680186 +66A8:7DFC44207D2045FE7C5048525492650E1FF010101FF010101FF00000FFFE0000 +66A9:010001107BDC4A544D544A8879084AF44C0248004BFC78404950024805440080 +66AA:008800887BFE4888488848F878204BFE4A224B324AAA7B764A220222022A0224 +66AB:08047F7808407F40497E7F4849487F4808487F4808881FF010101FF010101FF0 +66AC:08203E2008F87F282228496A3E2A08567E8200001FF010101FF010101FF01010 +66AD:0020004079FC490449FC490449FC7820492448A8492448207BFE482000200020 +66AE:04407FFC04401FF010101FF010101FF00400FFFE10102FE8C8260FE008200FE0 +66AF:008800887BFE4888480049FC790449FC490449FC48207BFE4850008801040202 +66B0:01240124F22494249954914A9292F6109A109250925C9250F25092B0029E0300 +66B1:000003FE7A484A484BFE4A487A204BFE4A404AFC4B447A444A7C020003FE0000 +66B2:002001FC788848504BFE480049FC790449FC490449FC48207BFE482000200020 +66B3:008803DE788849DC48884BDE788848004BFC4804480479FC4804000403FC0004 +66B4:1FF010101FF010101FF008207FFC0820FFFE08203118C9260540092015102208 +66B5:008800887BFE488848F8482079FC492449FC482049FC78204BFE005000880306 +66B6:02100110F11097BE9240920093BEF28A928892A892AE92A8F4A895A8085E1080 +66B7:002003FE782049FC492449FC792449FC48224BFE48087BFE4908008800280010 +66B8:00400040F7FC90A09514920897FCFA0A93F8920893F89040F248944409440080 +66B9:07F8440827F8240807F80240E7FC2C4037F8244027F8244027FC54008FFE0000 +66BA:000003DE7A524A524BDE480079FC492449FC492449FC78204BFE002000200020 +66BB:000001FC790449FC490449FC78204BFE480049FC490479FC4820012402220060 +66BC:49202A3E7F4849485DA86B10492841461FF0101010101FF0101010101FF01010 +66BD:0020012478A84BFE48A849244A227904490449DE4A444D54789E490402040404 +66BE:02080108F7C89010979E949497A4F01497949094911491C8F708911405240242 +66BF:002003FE782049FC480049FC790449FC48884BFE480079FC4904010401FC0104 +66C0:002003FE782049FC48004BFE7A0249FC480049FC490479FC4904008803FE0000 +66C1:10007EFC42107E9042FE7E3040507C92410E5FF070101FF010101FF00000FFFE +66C2:0088008879FC488848884BFE782049FC492449FC492479FC4800008801040202 +66C3:00100210797C481448FE48144B7C799249544938495449927930490002FE0400 +66C4:008803FE7888480049FC48A848A87BFE48A848A849FC48207BFE482000200020 +66C5:1FF010101FF010101FF004407FFC04403FF809207FFC09203FF801007FFC0100 +66C6:3FFE2000218C2E7022103FBE27182AB43252221027F8240847F8440887F80408 +66C7:1FF010101FF010103FF801007FFE41029D7400003FF80000FFFE10103FF80008 +66C8:002001FC788848504BFE480079FC492449FC492449FC782049FC002003FE0000 +66C9:0020002079FC48204BFE49087B9C490849884E3E48007BFE489000900112020E +66CA:009007FC78944BFC4A904BFE79124BFA4D0E49F8490879F8490801F800900108 +66CB:000003FE78504BFE4A524BFE780049FC490449FC490479FC482003FE00200020 +66CC:00F87C8844F87C8844F87C8802A801107FFC482410102FE8010001007FFC0000 +66CD:004001FC790449FC490449FC790449FC4820492448A87924482003FE00200020 +66CE:000001FC795449FC482049FC78204BFE4888485049FC78204BFE002000200020 +66CF:1FF010101FF010101FF0210027DE545297D4E458245457D29512F49A25544610 +66D0:0FE008200FE008200FE07C7C44447C7C44447D7C11001FF821005FF00100FFFE +66D1:1FF010101FF010107FFC44447C7C44447D7C06C01930E64E01800E2000C01F00 +66D2:01080208F7C8945097DE946497D4F214911497D4921493C8F2489454055408A2 +66D3:3FF820083FF820083FF811101FF041047FFC0200FFFE09203FF8C5460BA01110 +66D4:02880288F7E89290941E97E49454F8549754955495549748F548905402940122 +66D5:010001F87A084FFE4A884B247BFE4A004AFC4A004AFC7A004AFC048404FC0884 +66D6:003C03C0F0449224910897FE9442F2A4928A947A908090F8F10892900060079E +66D7:00500252795448504BFE488878504BFE482049FC48207BFE48A8012406220020 +66D8:000001FC78204BFE4A2249AC782049AC48004BFE482079FC495401540154010C +66D9:000003FE7A524A524BFE482449FC78284BFE482048FC49847AFC488400FC0084 +66DA:011007FCF11097FC940493F89000F7FC9080914496A89170F6A8912606A00040 +66DB:003C07C0F0409FFE904097FC9554F4E497FC904097FC9040FFFE900005240892 +66DC:000007BCF08494A4929494A49120F21097FC9A2093FC9220F3FC922003FE0200 +66DD:03F80208F3F8920893F8911097FCF1109FFE911092489554F0E09150024800C0 +66DE:000003FE7A484BFE4A484AFC7AA44AFC4AA44AFC4A207BFE4B2A057A050A0906 +66DF:1FF010101FF010107FFC44447C7C44447FFC20002FF820003FFC24484430860E +66E0:00400020F7FE948895FC948897FEF42095FC952495FC9524F5FC940004880904 +66E1:0FE008200FE008200FE07C7C44447C7C4444FFFE90121FF010101FF01010FFFE +66E2:004000207BFE4A2249FC48507A8A49FC4A8A48F8488878F84820012402A20040 +66E3:01100110F7FC911091F0920892EAF6AC92A892AA96EA9A06F00092A402520452 +66E4:07FC0040F7FE94429B5C9040975CF12093FC96209BFC9220F3FC922003FE0200 +66E5:0040007C78404BFC4A444BF07A444AFC4AA84AF84AA87AF84A0005FC05540BFE +66E6:011007FCF04093F8904097FC9000F3D4911297FE93509534F38C908A02960102 +66E7:3FF820083FF820083FF800107F1000FE3E9222923EFE00107F1455127FFE4902 +66E8:02100110F7DE9010945E928297DEF01097DE945097DE9450F7DE9450045204CE +66E9:1FF010101FF010101FF00100FFFE22883EF804403FF80440FFFE04901C60671C +66EA:000003FEF252925293FE91089154F25E97B4911E925497DEF0149554055E0010 +66EB:210447C88812F3BC20084B92F83E0380AAAAABAA00001FF010101FF010101FF0 +66EC:0FBE0000F7BC94A496B494A49040F7FE94A097FC94A497FCF51299DC091211CE +66ED:02480150F7FC940491F0911097FCF55494E497FC904097FCF0409FFE02A40452 +66EE:07BC04A4F7BC900097FE94009590F49E97D4956495D49554F5D495680BC81054 +66EF:03FE02027BFE4A924A544A927AFE4AAA4AFE4B224AFA7AAA4AFA022205FA0004 +66F0:000000007FFC40044004400440047FE440044004400440047FFC400400000000 +66F1:00003FF82008200820083FF82108210821083FF8210801000100010001000100 +66F2:04400440044004407FFC44444444444444447FFC44444444444444447FFC4004 +66F3:0100010001003FF8210821083FF8210821083FF8009000A0004201A20E1AF006 +66F4:0000FFFE010001003FF8210821083FF8210821083FF811000A00060019C0E03E +66F5:0120011001003FF8210821083FF8210821083FF8009000A0004201A20E1AF006 +66F6:080008001FF8224844480888112822101FF0101010101FF0101010101FF01010 +66F7:00001FF010101FF010101FF0080008001FFC21045284944410041F8400280010 +66F8:01003FF00110FFFE01103FF001003FF80100FFFE00001FF010101FF010101FF0 +66F9:04400440FFFE04403FF824483FF824483FF800001FF010101FF010101FF01010 +66FA:01000100FFFE01003FF821083FF821083FF800001FF010101FF010101FF01010 +66FB:1FF010101FF010101FF00000101010103EFC4210A490149008FE101020104010 +66FC:00001FF010101FF010101FF000007FFC44447FFC00003FF0082007C01830E00E +66FD:082004403FF821083FF821083FF800001FF0101010101FF0101010101FF01010 +66FE:082004403FF82108292825483FF800001FF0101010101FF0101010101FF01010 +66FF:082008207EFC0820FEFE1450228841069FF0101010101FF0101010101FF01010 +6700:1FF010101FF010101FF00000FFFE22003EF822883E9022502F20F25042880306 +6701:3E7C081048907EFC1428244A468600001FF0101010101FF0101010101FF01010 +6702:1FF010101FF010101FF00000FFFE22203E2022FC3E2422242F24F24442540288 +6703:010002800C6037D8C0063FF8292825483FF800001FF010101FF010101FF01010 +6704:1020102013FE7C2055FC55247DAC5574552455FC7C20547010A8112412221020 +6705:100011FC11047DFC110411FC1080FDFE122211222152290245FAFC0244140008 +6706:444024402840FE7E92AAD72ABA2A924AFE4A00927D1244227C2244427C944408 +6707:1010282044FEBA920092FEFE9292D69292FEFE2800487DFE44087C0844087C08 +6708:07FC040404040404040407FC04040404040407FC040404040804080410142008 +6709:02000200FFFE040004000FF0081018102FF0481088100FF00810081008500820 +670A:0000780049FC4800480078004BFE489048907890489048904892491249129A0E +670B:00003E7C2244224422443E7C2244224422443E7C22442244224442844A948508 +670C:00103C502450245024883C88250426FA24483C48244824482488448855288A10 +670D:00003EFC2284228422943E88228022FC22A43EA422A822A8229042A84AC48482 +670E:00203C202450245024883D242612241025FC3C04240824882450442054108810 +670F:00203C202524252425243D2425FC242024203D24252425242524452455FC8804 +6710:00803C80250025FC26043C0425E4252425243D2425E425242404440454288810 +6711:00487A484A484A484A487FFE4A484A484A487A484A784A004A004A004BFE9800 +6712:00203C20242025FC25243D242554258C25243D242554258C2504450455148908 +6713:00503C502450255224D43C582450245824D43D52265024502492449255128A0E +6714:4200227C2444FF440844087C4944494449447F7C094410441084208441148208 +6715:00883C482450240025FC3C202420242027FE3C20245024502488448855048A02 +6716:00403C2025FC250425043DFC2504250425FC3D20252225142508454455828900 +6717:1000087C7E44424442447E7C424442447E44407C484444445A84628441140208 +6718:00407840488849044BFE7802488849444A4278F849884A504820485049889E06 +6719:0000FE7C8244AA44A644C67C8244BA44AA44AA7CAA44AA44FE84828401140208 +671A:02000100FFFE100010001FF800007CFC448444FC7C8444FC44847C8401140208 +671B:1000087CFF44207C2044267C3844209401087FFC010001003FF801000100FFFE +671C:00403C2027FE240025FC3D0425FC240025FC3C08241027FE2420442054A08840 +671D:0800083EFFA208227F22413E7F2241227F22493E0822FFA208420842088A0904 +671E:08207FFC08200FE008200FE00820FFFE10102FE8C8260FE008200FE008200860 +671F:2200227C7F44224422443E7C224422443E44227C2244FF440484228441148208 +6720:008878884BFE488848A8782049FC4924492479244BFE48204850488849049A02 +6721:000078884A524A224A527A8A4A024BFE488879444A7A48884950482048D89B06 +6722:00007F7C48447E7C42447E7C48447F5400887FFC01003FF801000100FFFE0000 +6723:00203DFC2488245027FE3C0025FC252425FC3D2425FC242025FC442057FE8800 +6724:3E7C22443E7C22443E7C22444A9485083E7C22443E7C22443E7C22444A948508 +6725:00887AAA4ADC4C8849547A2248004BFE4A427C444BFC48444844488449149A08 +6726:00887BFE48884BFE4A0279FC48004BFE484078A24B5448B84B5448924B509820 +6727:011078904BDE48104A5E79824BDE48104BDE7A504BDE4A504BDE4A504A529ACE +6728:01000100010001007FFC03800540054009201110210841048102010001000100 +6729:0100010001000100FFFE01000100092009101108110821044104810405000200 +672A:0100010001003FF8010001000100FFFE03800540092011102108C10601000100 +672B:010001000100FFFE0100010001007FFC03800540092011102108C10601000100 +672C:01000100010001007FFC0380054005400920111021084FE48102010001000100 +672D:0880088008800880FE80088018801C802A802A804880888408840884087C0800 +672E:0100012001100100FFFE01000920092009200920112011202120411E81000100 +672F:01000120011001107FFC03800540054009201110210841048102010001000100 +6730:010001007FFC0380054009203118C1063FF80010006003801C0420041FFC0000 +6731:0100110011001FF8210041000100FFFE03800540092011102108C10601000100 +6732:1040104010401040FC4010403040384054A054A090A011101110120814041802 +6733:1000102011201120FD2011203120392055205110911012101208140818041002 +6734:0840084008400840FE40085018481C442A442A40484088400840084008400840 +6735:00000FE00820082008201020201EC10001007FFC0380054009203118C1060100 +6736:00003FF008100820083C10041004201441080100FFFE054009203118C1060100 +6737:0800080009FC0844FE44084418441C442A442A44484488840884090409280A10 +6738:1040104010401040FDFC10443044384454445484908410841104110412281410 +6739:1080108010801080FDF0109030903890549054909090109211121112120E1400 +673A:100011F011101110FD10111031103910551055109110111211121212120E1400 +673B:0804080408840884FE84088418841C842A8C2AB448C488840804080408040804 +673C:0880088008800884FE88089018A01CC02A802A804880888408840884087C0800 +673D:100013FE10401040FC801080310039FC54045004900410041004100410281010 +673E:080008000BFE0820FE20082018201C202A202A20482088200820082008A00840 +673F:01000100FFFE010001003FF821082108210821282390054009203118C1060100 +6740:00081810066001800660181861040100FFFE0100112011102108210445040200 +6741:0880084008400820FE20082018201C502A502A50484888880888088409040A02 +6742:020002003FE0042004220822111E61000100FFFE010009201110210845040200 +6743:100013FC11041104FD0410883088388854505450902010201050108811041602 +6744:1008103C11E01020FC20102030203BFE54205420902010201020102010201020 +6745:100011FC10201020FC20102030203BFE54205420902010201020102010A01040 +6746:100011FC10201020FC20102030203BFE54205420902010201020102010201020 +6747:100011FC10001000FC0013FE30403840548054FC900410041004100410281010 +6748:100013FC11041144FD2410A83088388854505450902010201050108811041602 +6749:0804080408080810FE20084418041C082A102A224842880408080810082008C0 +674A:1104112411241124FD2411243124392455245124912411241124122412041404 +674B:100011F011101110FD10111031903950555055109110111211121212120E1400 +674C:1000100013FC1090FC90109030903890549054909090109211121112120E1400 +674D:100011FC10041008FC10102030203BFE54205420902010201020102010A01040 +674E:010001007FFC0380054009203118C1060FE000400080FFFE0100010005000200 +674F:010001007FFC0380054009203118C10600001FF010101010101010101FF01010 +6750:0808080808080808FEFE080818181C182A282A28484888880808080808280810 +6751:1010101010101010FDFE10103010381055105490909010101010101010501020 +6752:1000100011FC1044FC4411443944354452445044908410841104110412281410 +6753:10401040108010FCFD0412043004390454845444904410041004100410281010 +6754:1008103C13C01040FC4010403840347E53C050409040104210421042103E1000 +6755:0820082008200820FE2009FE18201C202A202A50485088500888088809040A02 +6756:1010101010101010FDFE10103010391055105490909010501020105011881606 +6757:02000100FFFE1000100010001FF801000100FFFE0380054009203118C1060100 +6758:00003FFC200420043FFC2000208020803FFE21C022A024902888508640808080 +6759:0848084408440840FE5E09E018401C402A402A40482088220812080A08060802 +675A:10401040108010FEFD00120030FC380854105420904010801102110210FE1000 +675B:100011FC10041004FC0410FC30803880550055FC900410041004100410281010 +675C:1020102010201020FC20102033FE382054205420902010201020102017FE1000 +675D:1020102010201120FD2C113431643BA455245534912811221122110210FE1000 +675E:1000100011F81008FC081008300839F855085500910011001102110210FE1000 +675F:01000100FFFE010001003FF82108210821083FF82388054009203118C1060100 +6760:1000100011FC1020FC2010203020382054205420902010201020102013FE1000 +6761:040004000FF01820644003801D70E10E01007FFC010009201110210845040200 +6762:010001007FFC0380054009203118C10600003FF80100010001000100FFFE0000 +6763:1020102010201020FD241124312439245524552491241124112411FC10041000 +6764:1000100013FE1080FC80108030FC388454845484910411041204120414281810 +6765:0100010001007FFC0100111009100920FFFE0380054009203118C10601000100 +6766:10801080108010F8FD08110831103A1054205020905010501088110812041402 +6767:1020101010101000FDFE10803080388054805480908010801080108010FC1000 +6768:100011F810101020FC40108031FE389254925492911211221222144210941108 +6769:100013F010101010FD101110311039FC54045404900413F41004100410281010 +676A:10201020102010A8FCA410A23122392056245424902810081010102010C01300 +676B:0810081008100890FE900890189E1C902A902A9048908890089008900BFE0800 +676C:100011FC10001000FC0013FE30903890549054909090109211121112120E1400 +676D:10801040104013FCFC00100031F03910551055109110111211121212120E1400 +676E:10201020102013FEFC20102031FC392455245524912411341128102010201020 +676F:1000100013FE1020FC201040384034D051485244944410401040104010401040 +6770:0100010001007FFC03800540092011102108C106010000002488224442448004 +6771:01000100FFFE010001003FF821083FF821083FF82388054009203118C1060100 +6772:1FF0101010101FF0101010101FF0010001007FFC0380054009203118C1060100 +6773:010001007FFC0380054009203118C1061FF0101010101FF0101010101FF01010 +6774:084008400840087CFE84088819201C202A202A50485088500888088809040A02 +6775:10801080108011FCFD2012203020382057FE5420902010201020102010201020 +6776:10201020102013FEFC20112431243924552455FC9024102010221022101E1000 +6777:100011FC11241124FD241124312439FC55045500910011001102110210FE1000 +6778:100010F810881088FC881106320039FC54845484904810501020105010881306 +6779:10A010A010A01124FD24132835303920556051A09120112211221122111E1100 +677A:1000104010201010FC90108030803A8456825282928214881088108810781000 +677B:080009F808480848FE48084818481DF82A882A8848888888088808880BFE0800 +677C:100011F810081050FC20101033FE382254245420902010201020102010A01040 +677D:1008103C11E01020FC2011FC38203420502053FE902010201020102010A01040 +677E:1010109010901088FC88112431243A225440544090881084110413FE11021000 +677F:1008101C11E01100FD0011FC3144394455445528912811101110122812441482 +6780:04400440082010102208C44608201FF001100100FFFE054009203118C1060100 +6781:100013FC10841088FC881090309C388455445544912811281210122814441182 +6782:080008FC08840884FE8408FC18841C842A842AFC488488840884088409140A08 +6783:10401040108010FCFD0412043084384454445414902410441184100410281010 +6784:10801080108010FCFD04110432443844548454A4911411F41014100410281010 +6785:100011FC10881088FC88108830883BFE54885088908810881088110811081208 +6786:1008103C11E01020FC20103C31E038205420503E93E01020102210221022101E +6787:1010111011101112FD12111431D83910551055109110111211521192110E1000 +6788:208020843E9820E020842684387C21000100FFFE0380054009203118C1060100 +6789:1000100013FE1020FC2010203020382055FC5020902010201020102017FE1000 +678A:10001040119E1112FD1211123112391255125512915A11941110101010101010 +678B:10401020102013FEFC801080308038FC54845484908410841104110412281410 +678C:1010109010901088FD0811043A0435FA50885088908810881108110812281410 +678D:1090109011081108FA04140233FC3880550051F8900810081008100810501020 +678E:1020102010201020FDFC10203020382057FE5420905010501088108811041202 +678F:100011F811081108FD0813FE31083908550853FE910811081108110811281110 +6790:1008101C11E01100FD00110031FE391055105110911011101110121012101410 +6791:100017FE10801080FC8010F8390835085108520893F810101010101017FE1000 +6792:080009FE08080888FE88088819081DFE2A182A284848888809080A0808280810 +6793:0808088808480848FE08088818481C482A082A0E49F888080808080808080808 +6794:1020102010501050FC88114432223820540055FC900410081008101010101020 +6795:10401040104013FCFA4414483040384054A050A090A0112011221222141E1800 +6796:0808083C09E00820FE20082019FE1C202A202A50485088500888088809040A02 +6797:1020102010201020FDFE10203070387054A850A8912412221420102010201020 +6798:10201020102011FEFD221122312239225552554A918A110211021102110A1104 +6799:100011FE11001100FD78114831483948554855689150114211421142123E1400 +679A:1040104010401080FCFE11083288388854885450905010201050108811041202 +679B:1008101C11F01150FD5011503150395055505548914811481144124412421400 +679C:00001FF0111011101FF0111011101FF011100100FFFE054009203118C1060100 +679D:10201020102013FEFC201020302039FC54845488904810501020105011881606 +679E:1110111011101110FD10111031103910551052A8926812281444144418841102 +679F:1000100011FC1000FC00100033FE38205420544090401088110413FE11021000 +67A0:1040104011F81048FC88108A310A3A265420502093FE10201020102010201020 +67A1:1008106813881088FC88108830883BFE54885488908810881108110812081408 +67A2:100013FC12001208FE88125032503A2056205250925012881308120013FE1000 +67A3:01000100FFFE01003FF821082388254809203018C606018000400E0001800040 +67A4:0820082808240824FE2009FE18201C202A202A50485088500888088809040A02 +67A5:200023FE22002220FA20222022FC72246A24A224A24422442484248429283210 +67A6:10401020102011FCFD041104310439FC55045500910011001100120012001400 +67A7:100011FC11041104FD241124312439245524555490501090109011121212140E +67A8:1080108410841088FC9010A030803BFE54A0549090901088108410A210C01080 +67A9:010001007FFC052009103108C5440440082011102108C206044008201FF00010 +67AA:1040104010A010A0FD101208340639F055105110915011201104110410FC1000 +67AB:200023F822082208FB2822A822A872486A48A2A8A2A8232A240A240A28063002 +67AC:100011F811081108FD4811283928350853FE5108910811081108120812281410 +67AD:010002001FF010101210115010201FFC010401047FF4038805401930E10E0100 +67AE:0810081008100810FE1E081018101C102AFE2A82488288820882088208FE0882 +67AF:1020102010201020FDFE10203020382055FC5504910411041104110411FC1104 +67B0:100011FC10201020FD2410A430A8382057FE5420902010201020102010201020 +67B1:0820082008200840FE48088419FE1C822A002AFC488488840884088408FC0884 +67B2:0400080010103FF800081FF0101010101FF00100FFFE054009203118C1060100 +67B3:1000100011FC1104FD0411043104390455FC5504900010901088110412021402 +67B4:100011F811081108FD0811F83000380057FC5444904410841084110412281410 +67B5:100011F811081108FD0811F830003BFE5480550091F810081008100810501020 +67B6:080008007F7C094411441144257C420001000100FFFE054009203118C1060100 +67B7:220022002200FA1E27D2225272526A52AA52A252225222522452245E29523080 +67B8:10801080108011FCFD04120431E4392455245524912411E41124100410281010 +67B9:1080108011FC1104FA0415F431143914551451F4910411281112110210FE1000 +67BA:10201020102013FEFC201020302039FC547054A890A811241124122210201020 +67BB:1048114811481148FD4813FE3148394855485548917811001100110011FE1000 +67BC:12201220FFFE1220122013E010001FF801000100FFFE054009203118C1060100 +67BD:010001007FFC01001010FFFE101010101FF00100FFFE054009203118C1060100 +67BE:10201020102013FEFC20102031243924552455FC912411241224122414241020 +67BF:10201020102013FEFC20102038A83488508857FE908810881108110812081408 +67C0:10101010101011FEFD121114311039FC55445544912811281110122812441482 +67C1:10201010101011FEFD02120430803888549054A090C0108210821082107E1000 +67C2:1080108010FE1100FA201120312C397457A45124913411281122110210FE1000 +67C3:1020102010501050FC8811243212381055FC5404900810881050102010101010 +67C4:100013FE10201020FC2013FE32223A225652524A928A130212021202120A1204 +67C5:100011FC11041104FD0411FC31003940554455489170114011421242123E1400 +67C6:1040102010201000FDFE10003004388454845448904810481050101013FE1000 +67C7:103811C010401040FC4013FC304038E054E05550915012481444184210401040 +67C8:10201020112410A4FCA8102031FC38205420542093FE10201020102010201020 +67C9:0804081E09E00800FE20081019FE1C042A082A1048208840088009400A3E0800 +67CA:10401040107C1084FD881250302038505488530690601010100810C010201010 +67CB:089008881080309E57E0908010441034110C0100FFFE054009203118C1060100 +67CC:100011FC10041004FDF41004300439F45514551491F411141004100410281010 +67CD:10201020102011FCFD24112431243924552453FE902010501050108811041202 +67CE:1088108810881108FD7E13083508394855285528910811081108110811281110 +67CF:10201020104011FCFD0411043104390455FC5504910411041104110411FC1104 +67D0:08200820FFFE082008200FE0082008200FE00100FFFE054009203118C1060100 +67D1:1088108810881088FDFE108830883888548854F8908810881088108810F81088 +67D2:20801080009C47E0208008841084607C21000100FFFE054009203118C1060100 +67D3:2080108003F04090211009121212640E29000100FFFE054009203118C1060100 +67D4:00001FF0022001407FFC04841888628001000100FFFE054009203118C1060100 +67D5:100011F810081050FC20101033FE386254A454A0912012201420102010A01040 +67D6:100013FC10841084FC84110431143A08540051FC910411041104110411FC1104 +67D7:1010109010901108FD081204340239F855085508910811081108110811F81108 +67D8:1000100013FE1020FC201040304038FC55845284948410841084108410FC1084 +67D9:100011FC11241124FD2411FC31243924552455FC912410201020102010201020 +67DA:1020102010201020FDFC112431243924552455FC912411241124112411FC1104 +67DB:10201020102011FCFD241124312439FC55245524912411FC1124102010201020 +67DC:100011FE11001100FD0011FC310439045504550491FC11001100110011FE1000 +67DD:1008101C11E01100FD00110031FE391055105530911811141112121012101410 +67DE:10801080108010FEFD4011403240387C544050409040107E1040104010401040 +67DF:10201020102011FCFD24112431FC39245524552493FE11041104110411141108 +67E0:20402020202023FEFA022404200070006BFEA020A02020202020202020A02040 +67E1:100011FC10001000FBFE10003020382257B250B490A811281124122414A21040 +67E2:1008103C13E01220FE20122032203BFE5620521092101212120A128A13261212 +67E3:1020102011201120FDFC11203220382057FE5420905010501088108811041202 +67E4:100011F811081108FD0811F831083908550855F8910811081108110817FE1000 +67E5:01000100FFFE0540092011103FF8D01610101FF0101010101FF00000FFFE0000 +67E6:0800080008FC0884FE84088418FC1C842A842A8448FC88840800080009FE0800 +67E7:1008101C11F01150FD5011503150395055505548914811681154127412521400 +67E8:10401040104013FEFC8010A0392035FC53245524912411241134112810201020 +67E9:100013FC12001240FE40127832883A9057105220925012881304120013FE1000 +67EA:1010109010901110FD7E12523392389255125112925213D210621022104A1084 +67EB:10901090109013FCFC94109433FC3A90569053FE90921092111A111412101410 +67EC:01000100FFFE010001003FF82108292825483FF82388054009203118C1060100 +67ED:1050104810481040FBFE1080308038FC55445144912811281210122814441182 +67EE:1020102011241124FD24112431FC382054205524912411241124112411FC1004 +67EF:1000100017FE1008FC0813C832483A485648524893C812481008100810281010 +67F0:010001007FFC054009203118CFE6000000007FFC010011101108210445040200 +67F1:10401020100013FEFC2010203020382055FC5420902010201020102013FE1000 +67F2:1000104010201028FC08108830903A9456A252A294C210881188128814781000 +67F3:10001080131E1252FE52125232523A52565252D2935A12541090109011101210 +67F4:0880088828902EA028C028842E84F07C01000100FFFE054009203118C1060100 +67F5:100011FC11541154FD54115431543BFE55545554915411541154114411141108 +67F6:1000100013FE1252FE52125232523A525652528E92821302120213FE12021000 +67F7:100011FC11041104FD04110431FC3850545054509050109210921112120E1400 +67F8:100011FE10101010FC201020306838A455225222902010201020100013FE1000 +67F9:10201020102E11F0FD201120312039FE5422546290A2112A1624102010201020 +67FA:100011FC11041104FD0411FC3040384055FC5444904410841084110412281410 +67FB:010001007FFC054009203118C1061FF010101FF010101FF010101010FFFE0000 +67FC:10401020102013FEFA0214043000389054905090908811081108110412041402 +67FD:100011FC10841088FC501020305038885726502091FC10201020102013FE1000 +67FE:1000100013FE1020FC20102031203920553C5520912011201120112017FE1000 +67FF:10401020100013FEFC20102031FC392455245524912411241134112810201020 +6800:101C11E011001100FDFE11003100397C554455449154114811421242123E1400 +6801:21002100211E21D2FA522252225275526892A092A11A21142210241028102010 +6802:100010FC108410A4FC94108430843BFE550455449124110411FE100410281010 +6803:1008101C11E01100FD0011FE31203920553C5524912411241124124412541488 +6804:22081108111000207FFE4002810401007FFC03800540092011102108C1060100 +6805:100011DC11541154FD54115431543BFE5554515491541154115412D41224144C +6806:010001007FFC01003FF8210821083FF80280044008203318C0C6060001800040 +6807:100011FC10001000FC0013FE3020382055285524922412221422102010A01040 +6808:105010481040105CFDE01040305E39E054445048903010221052108A13061002 +6809:1088108813FE1088FC88100033FE3842544254429042104A1044104010401040 +680A:1090108810881080FBFE10A030A038A454A451289128113212221262149E1800 +680B:10401040104017FEF880112031203A2057FC5020912811241222142210A01040 +680C:10201020103E1020FC2011FC31043904550455FC910411001100120012001400 +680D:1020102011201120FDFC112032203820542055FC902010201020102013FE1000 +680E:1008103C13C01200FE20122032203BFE54205420912811241222142210A01040 +680F:1000110810881090FC0013FE30003800540055FC900010001000100013FE1000 +6810:10401020101011E0FC22103433B838B054A854A8912811241224142210A01040 +6811:2004200427842084F8BE2484228472A46914A114A28422842484280420142008 +6812:1080108011FC1104FE0411E43124392455E45524912411E41104100410281010 +6813:1020102010501088FD04120231FC38205420502091FC10201020102013FE1000 +6814:080008007F7C08243E2408447F54088809000100FFFE054009203118C1060100 +6815:100011FE11201120FD2011FC310439045504550491FC11201120112011FE1000 +6816:100017FE10901090FC9013FC32943A9456945294929C13041204120413FC1204 +6817:00007FFC044004403FF8244824483FF801000100FFFE054009203118C1060100 +6818:10201020107C1084FD481030302038485590543E904211A41018101010601180 +6819:2080208020FC2108FA902060219876266820A1FCA020222023FE202020202020 +681A:1088104810501000FDFC10203020382055FE5420905010501088108811041202 +681B:1040104011FC1044FC84108431283A10550853DE914A114A114A1252135A14A4 +681C:1020102013FE1020FC2011FC312439245524552C907010A81124162210201020 +681D:1008103C11E01020FC2013FE30203820542055FC910411041104110411FC1104 +681E:00007EFC08200820FEFE08201020202041200100FFFE054009203118C1060100 +681F:1104108410881000FDFE108830883888548853FE908810881108110812081408 +6820:083813C03040504097FC1040104013F800000100FFFE054009203118C1060100 +6821:10401020102011FEFC00108831043A0254885088905010501020105010881306 +6822:100013FE10201020FC4011FC31043904550455FC910411041104110411FC1104 +6823:10801088109C1170FD1013103510391055FE55109110111011101110117C1100 +6824:2020242022202220F83221B220B472A86AA8A4A8A52429242A22202020A02040 +6825:0100410021FC0A441448E0A02110260801000100FFFE054009203118C1060100 +6826:1082109210921092FC92109232DA3AB654925092909210921092111211021202 +6827:1020102011FC1124FD2411FC3124392455FC542090241018103210CA13061002 +6828:101010101210113EFD2210443810349050905310912811281128114410441082 +6829:100013DE10421042FE52114A314A384254C6514A9252104210421042114A1084 +682A:10201120112011FCFD20122030203BFE547054A890A811241124122210201020 +682B:10401040104017FEF8801080317C39085710551091FE11101110111011501120 +682C:1040104010F81108FA1011FC31243924552451FC910011001102110210FE1000 +682D:100013FE10201020FC4011FC3154395455545554915411541154114411141108 +682E:100013FE11081108FD0811F83108390855F855089108111E17E8100810081008 +682F:1040104017FE1080FD0013FC3504390455FC5504910411FC1104110411141108 +6830:10A810A410A41120FD2E13F03520392455245524912811101132114A11861102 +6831:1088108810881088FDFE108830883888548853FE900010881084110412021402 +6832:1040104411F41048FC5013FE3040388055FE5240948010FC1004100410281010 +6833:10401040104411F4FC48105033FE384054805584929814E010821082107E1000 +6834:1080108010FE1100FA0010FC308438A45494508493FE10841084110411141208 +6835:1002100217E2110AF90A11EA312A3A2A572A52AA944A104A10821102120A1404 +6836:100013FC12041244FE44124433FC3A44564452A4929413141204120413FC1204 +6837:1104108410881000FBFE1020302039FC5420502093FE10201020102010201020 +6838:10201010101013FEFC201042308439F85410542290C413081010102810C41302 +6839:100013F812081208FBF8120832083BF856445248923012201210128813061200 +683A:11001104113811C0FD02110230FE380055FC5504910411FC1104110411FC1104 +683B:1028102410241020FBFE102030203BA0552051109110111011CA170A12061002 +683C:1080108010F81108FB1014A0304038A05518520695F811081108110811F81108 +683D:084008487F4408440840FFFE004008440844FF4418282C2A2A12492A88460882 +683E:02000100FFFE0440145014482444444400000100FFFE054009203118C1060100 +683F:1090109410921112FD10137E3110391055105528912811281128114411441182 +6840:101010103EFC4210A490149008FE101020104110FFFE054009203118C1060100 +6841:10801080113C1200FC801080317E3B0855085508910811081108110811281110 +6842:1020102011FC1020FC20102033FE38005420542091FC10201020102013FE1000 +6843:1090109010901292FD941098309039985694549290901090111211121212140E +6844:10201020112410A4FCA8102033FE3890549054909090109211121112120E1400 +6845:1040104010FC1104FE0811FE3100397C554451449154114811421242123E1400 +6846:100011FE11001100FDFE11103110397C55105510911011FE1100110011FE1000 +6847:10001000FE7C224442443444087C3400C3000100FFFE054009203118C1060100 +6848:01007FFC40040400FFFE08201E4003C03C380100FFFE054009203118C1060100 +6849:10401020102013FEFE02144430403BFE54885488910810D01020105010881304 +684A:0100111009203FF8020002007FFC082011102108DFF6030005C0193061080100 +684B:1020102013FE1020FDFC102431FC392055FE5422902A10541050108811041202 +684C:0100010001FC01001FF810081FF810081FF80100FFFE054009203118C1060100 +684D:1020102013FE1050FC88110432FA380057FE5440908011FC1004100410281010 +684E:100013FE10201040FC88110433FE38225420542093FE10201020102017FE1000 +684F:1000101E13F21092FC941094309838945492549290F2171A1214101010101010 +6850:100013FC12041204FEF4120432043AF456945294929412F41204120412141208 +6851:1FE0064001800E4000007CF82448183066CC01007FFC054009203118C1060100 +6852:010001007FFC010009200820FFFE082009200100FFFE054009203118C1060100 +6853:100013FE10001000FDFC1104310439FC5504550491FC11041000100013FE1000 +6854:10201020102013FEFC20102031FC3800540055FC910411041104110411FC1104 +6855:10001040119C1104FD041104310439DC5504550491041104110411FC11041000 +6856:1020102010401080FDFC11543154395455545554915411541154115413FE1000 +6857:100013F810881090FCBC110439143648504057FE904010E01150124814461040 +6858:1040108011F81108FD08110831F839005500550091FC11041104110411FC1104 +6859:1040104010901108FBFC10243120392055FC5220902017FE1020102010201020 +685A:1124112412481124FD241000308038FC55045184924814281010102010C01300 +685B:08200820083E0820FE2009FE18001C002BFE2A20482888240822082008200820 +685C:1040102412241108FD0810103040384057FE5488910811901060105011881604 +685D:2208220822082388FABE228824A874A86AA8A128A13E21082208220824082808 +685E:21002100211E21D2FA542254225875546892A092A112211A2214241028102010 +685F:10501048107E13C0FC40107C3BC03440507E53C090441028103210CA17061002 +6860:100011FE10481048FC4810483248394A554A554C904810481048104813FE1000 +6861:1080108010BC13C0FC50102430D43B0C540053FE9090109011121112120E1400 +6862:10201020103E1020FC2011FC3104392455245524912411241050104810841104 +6863:1020112410A410A4FCA8102033FC38045404500491FC10041004100413FC1004 +6864:1020112411241124FDFC100031FC3804540455FC910011001102110210FE1000 +6865:2010207823C02040F84027FE20A071106A08A516A11021102110221022102410 +6866:1090109411141118FB1015323152390E5520502093FE10201020102010201020 +6867:1020102010501088FD04120238F83400500053FE902010401088110413FE1102 +6868:0840484028FC09041A882850486089800100FFFE0380054009203118C1060100 +6869:10201010101011FEFD00111031103910557C5510911011101110121012FE1400 +686A:100013FC10041004FDFC100430043BFC5408500897FE11081088108810281010 +686B:2010221021102110F4542252225270906810A114A604220822082210222020C0 +686C:1020082040A824A409227228103010C007000100FFFE054009203118C1060100 +686D:100013FC12001200FEF8120032003BFC56A052A492A812901290148814A418C2 +686E:100013FE10101020FC6810A433223820540055FC910411041104110411FC1104 +686F:100011FC11041104FD0411FC3000380057FE5420902011FC1020102013FE1000 +6870:101C13E012201220FBFE122032903B0A560651FA910811081108110811F81108 +6871:100013FC10001124FA48149032483924540053FC904010401040104017FE1000 +6872:1020102013FE1020FC2013FE3A02340451F85010902013FE1020102010A01040 +6873:10401080110413FEFC22102033FE385054885124922211FC1020102010201020 +6874:1008103C11C01004FD4410A8300039F85410502093FE10201020102010A01040 +6875:2008203C23C02044FA242128210070406BFEA088A10823902060205021882604 +6876:200027F8201021A0F84027FC244474446FFCA444A44427FC2444244424542408 +6877:1080108010F81108FA1015FC3124392455FC5124912411FC1124122412141408 +6878:11841068103010C8FB04104033FE38A0552053FC952411241134112810201020 +6879:1040102011FC1104FD0411FC3104390455FC5520912211141108114411821100 +687A:100013FE10501050FC5013DE32523A525652525293DE10501090109011101210 +687B:210021F823082490F8602198264670406BF8A040A3F8204027FC204020402040 +687C:010001007FFC092011102108C284044009203118CB2605C01930610805000200 +687D:010001007FFC05401930E10E082009201550238801003FF801000100FFFE0000 +687E:100011FC10441044FBFE1044304439FC5480508091FC12841484108410FC1084 +687F:100011FC110411FCFD0411FC3000380055FC5420902013FE1020102010201020 +6880:1020102013FE1020FC2011FC3124392455FC5420907010A81124122210201020 +6881:000023F01090829452922492E110225025200100FFFE054009203118C1060100 +6882:1028102410241020FDFE1020312038B254B4546890A811241222102010A01040 +6883:2000200C27702110F9102210327C6F106110A510A510227C2200250028FE3000 +6884:100013FE10501050FDFC115431543954558C5504910411FC1104110411FC1104 +6885:1100110011FC1200FDF811083948352857FE51089248122813FC100810501020 +6886:2100211E21122FD2F114211427D871146912AFD2A112211A2214221024102810 +6887:100013FE10201020FDFC102030203BFE5488508893FE10881088110811081208 +6888:1040102013FE1000FDF81108310839F8540053FC900810301020102010A01040 +6889:1048114811481148FD4811C8307E384857C851489148114811481148125C1440 +688A:080C08F07E8008800EFE78880888290812080100FFFE054009203118C1060100 +688B:100011F811081108FDF8100033FC3A04560453FC9204120413FC120412141208 +688C:1020102010501088FD0412FA3020382057FE5420912811241222142210A01040 +688D:1020104011FC1104FD0411FC3104390455FC54409040107E17C010421042103E +688E:1020104011FC1104FDFC110431FC38005500550C91F011001102110210FE1000 +688F:10201120112011FCFD20122030203BFE5400540091FC11041104110411FC1104 +6890:12201224122813B0FE20122232A23B1E5440504093FC10401040104017FE1000 +6891:2010289025102212F5522954215871906B10A528A9282128214821442A842502 +6892:1020102010501088FD44122230F838085410542091FC11041104110411FC1104 +6893:1040102011FC1000FC88105033FE38205420542091FC10201020102010201020 +6894:1008101C11E01100FDFE1100317C3954555455549154117C114012421242143E +6895:100013FC10441144FD441284389435085240502090A41282128A128A14781000 +6896:080008FC08840884FEFC088418841CFC2A842A8448FC88000848084408820902 +6897:100013FE10201020FDFC1124312439FC5524552491FC112010A0104010B0130E +6898:100011FC11041104FDFC1104310439FC5504550491FC1050105010921112120E +6899:1020102011FC1124FD2411FC3020382057FE5222922213FE1222102010201020 +689A:1080108011F81208FC1013FC32443A44564453FC90A010A011221122121E1400 +689B:20002FDE22522252FA5427D432586A546252AFD2A252225A2254245025502890 +689C:10201020102013FEFC20102039243524512452AA902010501050108811041202 +689D:0840084010FC10883550542094D81726142015FC142014A81524122210A01040 +689E:100011F810081008FDF811003104390454FC5440902010A4128A128A14781000 +689F:04001FF010101FF010101FF010001FFC10001FFC01043FF405481930E10E0100 +68A0:100011F811081108FD08110831F83800540053FC920412041204120413FC1204 +68A1:1040102013FE1202FC0411F83800340053FE50909090109011121112120E1400 +68A2:1020112410A410A8FC2011FC3104390455FC5104910411FC1104110411141108 +68A3:1020112411241124FDFC10203050388855445222902011F81008101010101020 +68A4:1020112411241124FDFC100030883888550452FA904810481088108811281210 +68A5:020001007FFE48229214244808201FF001100100FFFE054009203118C1060100 +68A6:082008207EFC08201C702AA8C826040007F0081014202240018002000C007000 +68A7:100013FE10401040FDFC108430843BFE5400500091FC11041104110411FC1104 +68A8:03083C0804487F480C4816482508442805100100FFFE054009203118C1060100 +68A9:100011FC11241124FDFC1124312439FC5420542091FC10201020102013FE1000 +68AA:100013FC10001000FDF811083108390855F85400910810881090100017FE1000 +68AB:100011FC100410FCFC0411FC380037FE520251F8908810881050102010D81306 +68AC:1020102011FC1124FDFC112431FC380057FE5480910011FC1004100410281010 +68AD:1040104010881104FBFE100230883944564250F8918812501020105011881606 +68AE:100011FC11041104FDFC1100310039FE5502557A914A114A127A120214141008 +68AF:11081088109011FCFC24102431FC3920552051FE906210A2112A122414201020 +68B0:1010101410121010FBFE10103150395457F4515491541148124A125A14261042 +68B1:100013FE12221222FE2213FE32223A62567252AA932212221222120213FE1202 +68B2:1010109010881108FA0415FA31083908550851F890901090109011121212140E +68B3:1040102013FC1040FC90110833FC38045550515091501150125012521452180E +68B4:1004100E13B81088FC881128312E3BA854A852A892A8113E11001280147E1800 +68B5:082008207EFC08201C702AA8C82600000FE0082008200A20092011222022401E +68B6:100013FC12041204FBFC120032183AE0563852E0923C13E012221422141E1800 +68B7:100010FC1E0410487E28421042287EC401000100FFFE054009203118C1060100 +68B8:208421C427042114F914211427D471146B14A394A55425042904210421142108 +68B9:1008101C11E01100FD0011FE311039105510511097FE10001090110812041402 +68BA:082008207EFC08201C702AA8C8260000FFFE0200024002200210020802000200 +68BB:22502250225025FCF4542C5435FC75506D50A5FEA4522452245A249424902510 +68BC:1020102013FE1020FDFC104033FE3848548854FE910811481228140810281010 +68BD:10201020102013FEFC201020302039FC5440542090A41282128A128A14781000 +68BE:10201020102013FEFC20112430A438A855FE547090A810A81124122214201020 +68BF:101012101110117EFC2010283748397E5508550891FE110811081288147E1000 +68C0:1040104010A010A0FD10120835F6380054885048924811501110102017FE1000 +68C1:1104108410881010FDFC11043104390455FC54509050109010921112120E1400 +68C2:100013F810081008FDF8100830083BF8544051489148125010A0111012081406 +68C3:0C8070FC1124FD24122438445484912810100100FFFE054009203118C1060100 +68C4:020001007FFC10103FF801081110FFFE11101FF001007FFC05401930E10E0100 +68C5:207823C0204027FCF84023F8204877FE6848A3F8A0E0215022482C4620402040 +68C6:1020102010501088FD0412FA300039FC5554555491FC1154115411541104110C +68C7:1090109011081148FA44149231083BFC5444502090A41282128A128A14781000 +68C8:1020102013FE1020FDFC102033FE380055FC550491FC110411FC110411141108 +68C9:1020104011FC1104FDFC110431FC3820542053FE92221222122A122410201020 +68CA:08207FFC08200FE008200FE00820FFFE11102108DFF6030005C0193061080100 +68CB:1108110813FC1108FD0811F83108390855F85108910817FE1000109011081204 +68CC:2008203C23C02044FA242128210070206BFEA070A0A820A82124222224202020 +68CD:100011FC11041104FDFC1104310439FC5400551291D41118111011521192110E +68CE:100013FE12021252FC8811043020382057FE5420907010A81124162210201020 +68CF:100011FC110411FCFD0411FC300039FE540853FE900811081088100810281010 +68D0:044004407C7C04403C7804407C7C044005400100FFFE054009203118C1060100 +68D1:109010901090179EF890109030903B9C549050909090179E1090109010901090 +68D2:1020102013FE1020FDFC104033FE38885524522290F8102013FE102010201020 +68D3:1080104011FC1000FD08108830903BFE5400540091FC11041104110411FC1104 +68D4:101C13E0122013FEFE201292330A3A0655FC5104910411FC1104110411FC1104 +68D5:1040102013FE1202FC0011FC3000380057FE5420912811241222142210A01040 +68D6:100010FC108010F8FC8010F830803BFE55405524912811101108114411821100 +68D7:01007FFC01003FF823880D60301001007FFC01003FF82108238805601918E106 +68D8:10201020FDFC102010207CF854A854A854A85CB81020387054A8952610201020 +68D9:1040102013FC1204FE0413FC32003A28562453FE922012501250148815041A02 +68DA:100013DE12521252FE5213DE32523A52565253DE9252125212521252155218A6 +68DB:1040102013FE1080FD0413FE300239FC550455FC910411FC1104110411141108 +68DC:21082088200827D4FA142222220073C86A44A244A24022502248244425442880 +68DD:100011FC11041124FD2411FC3124392455745554915411741104110411FC1104 +68DE:100013FE1202121AFEE2122232223BFE5622527292AA13261222122213FE1202 +68DF:1020102013FE1020FDFC112431FC392455FC5420907010A81124162210201020 +68E0:0100111009207FFE40029FF4101010101FF00100FFFE054009203118C1060100 +68E1:100013FE1202128AFE5213FE32223A2256AA52AA92AA12FA12021202120A1204 +68E2:100013FE1202128AFE5213FE32423A2257FE52829282128212FA1202120A1204 +68E3:1020102011FC1024FC2413FE3824342451FC5222917410A81124122210A01040 +68E4:10881088108813FEFC88108837FE380055FC5104910411FC1104110411FC1104 +68E5:2088248822882108F93E22882498701C68ACA2AAA14821082288228824882808 +68E6:1080108011F01210FC2013FC3044384457FE5444904413FC1044104011401080 +68E7:10481044105E11E0FC281012306A39965448545E91E0102410281012106A1186 +68E8:102008203E3E224422843E282210402881440100FFFE054009203118C1060100 +68E9:1050125212521252FBDE120232023BFE5602520293DE12521252125214521802 +68EA:1020112211221224FC5010883304382254205524912412281050108811041602 +68EB:10141012101017FEF810101033D23A525652525493D4100810EA171A12261042 +68EC:1020112410A81020FDFC104033FE3888550452FA9488108810A810921082107E +68ED:2080204027FE2120F920223C224476646A94A348A24822302220225022882306 +68EE:010001007FFC054009203118C106082008207EFC08301C682AA4C92208200820 +68EF:1020102010501088FD44122231F838085450542090A41282128A128A14781000 +68F0:2010207823C02040F84027FC224872486FFEA248A24827FC2040204027FC2000 +68F1:1020102011FC1020FC2013FE30883944564254F8918812501020105011881606 +68F2:1020102013FE1020FDFC102433FE382455FC504093FE108411C8103010CC1302 +68F3:100013DE1042114AFC84114A3A523420500053DE905211521094114812541422 +68F4:200027BE24A224A2FCAA27A424A074BE6CAAA7AAA4AA24AA24A424A424AA29B0 +68F5:100011FC11241124FDFC1124312439FC542053FE907010A81124122210201020 +68F6:10401040104017FCF840124832483A48555450E0915011501248144418421040 +68F7:20002FC024BC24A4F4A427A424A474A86FA8A4A8A49025D02EA820A820C42082 +68F8:00007F00227C3E0422283E1023A8FE4402000100FFFE054009203118C1060100 +68F9:10201020103E1020FDFC110431FC390455FC5524902013FE1020102010201020 +68FA:1040102013FE1202FC0411F83108390855F85500910011FC1104110411FC1104 +68FB:0820FFFE08200460081037E8C22404A018400100FFFE054009203118C1060100 +68FC:082008207EFC08201C702AA8C8240440082010102FE8C4260420082010A06040 +68FD:082008207EFC08201C702AA8C92402800E603118C1061FE00020004000800100 +68FE:082008207EFC08201C702AA8C82600007FFE40028FE40820082010222022C01E +68FF:10001040139C1204FE04139C32043A0457FC549090901090109011121212140E +6900:1040102013FE1202FD04110031DE3A5256525352949A1094111011121212140E +6901:1040102013FE1000FDFC110431FC380055FC5408901013FE1020102010A01040 +6902:100011F810081008FDF8100830083BFE54205222917410A81124122210A01040 +6903:10401040107C1040FBFC124432703BC05644523C920012F0149014921912120E +6904:1080104013FC1000FD08109037FE3840544057FE908811081090106011981604 +6905:2040204023FC20A0F910220827FE70086BC8A248A248224823C8200820282010 +6906:100011FC11241124FD74112431FC390455745154915411741104120412141408 +6907:100011F811081108FDF8110831F8390855F85108910817FE1000109011081204 +6908:1100110011FC1204FC84149432A4388457FC508491C412A41494108410A81010 +6909:02000100FFFE10103EFC4210149018FEE0100110FFFE054009203118C1060100 +690A:1040102013FE1000FC88108831543A225400502093FE10201020102010201020 +690B:1040102013FE1000FC0011FC3104390455FC5420912811241222142210A01040 +690C:10401020102013FEFA02149431083A04540051FC902010201020102017FE1000 +690D:1020102013FE1020FC2011FC310439FC550455FC910411FC1104110417FE1000 +690E:10A01090109011FEFD10131035FE3910551055FE91101110111011FE11001100 +690F:100017FE10901090FC90139C32043A045604539C909010901090109017FE1000 +6910:100013FC12041204FBFC122032203BFE5620522092FC12841284148414FC1884 +6911:1040108011FC1124FD2411FC3124394455FC5490911013FE1010101010101010 +6912:2100210021DC2114F914211427D470146914A114A58825482948211425142222 +6913:100013FE10401080FD44122430683AB0553052A8906810A41122122010A01040 +6914:1092109211241248FD2410923092380055FE5522912211FE1122112211FE1102 +6915:2008208822882288FABE24482018779C6AACA2AAA2C822882288248824882988 +6916:1040102011FC1104FD0411FC3120391055FE55209120113C1124124412541488 +6917:1040102013FE1202FC04100033FE382054205520913C112012A01260143E1800 +6918:082008207EFC08201C702AA8C824020001007FF8006001800E003000480087FE +6919:11F81108110811F8FD08110831F8380057FC5204920413FC1204120413FC1204 +691A:100013DE12521252FBDE125232523BDE560252029202120212021202120A1204 +691B:1108110817FE1108FD08100038903492511453189510113211521112110E1100 +691C:1020102010501088FD0412FA3020382055FC5524912411FC1050108811041202 +691D:100011FC7D0411241124FC5010902912460E8100FFFE054009203118C1060100 +691E:080C08F07E8018802CFE2A884888888809080100FFFE054009203118C1060100 +691F:1020102011FC1020FC2013FE3002389454505510909013FE1028104410821302 +6920:100CFEF0208048807EFE08880E88F9084A080100FFFE054009203118C1060100 +6921:1002100217E2110AFD0A124A33EA388A548A53EA908A108A10E21702120A1004 +6922:100013FE12021202FBFE122232223AFA56225232922A13FE1202120213FE1202 +6923:10901090109013FCFE94129432943BFC56945294929417FE1000109011081204 +6924:100013FE12521252FE5213FE3020384054FC5104928810501020104011801600 +6925:11001100110013DEFA9214923092389257F2509290921152115E122014201800 +6926:1020112410A81020FDFC104033FE38885544524295F810481088108811281210 +6927:1020102010501088FD0412FA30003BDE56525252925213DA1254101010101010 +6928:1040102013FE1200FE44124432843ABE578452A4929412941284128414941088 +6929:1040102013FE1220FEFC122432243BFE5624522492FC12201250145014881906 +692A:10841048100011FEFC48104830483A48554A554C904810481048104813FE1000 +692B:11041088105011FCFD24112431FC3924552455FC9020102013FE102010201020 +692C:1040102013FE1202FC0411F83108390855F85508910811F81108110817FE1000 +692D:201027902490257EFD202620257C74A46CA4A4BCA6A4253C242424242424242C +692E:10401048108411FEFC2013FE3088392456425188901010621184101810601380 +692F:1020112411241124FDFC100033FE3820544055FC91541154115411541154110C +6930:20002FDE24922492F4942794249874946F92A492A49225DA2E94209020902090 +6931:1100110011FE1200FDFC110431FC390455FC548090FC11081290106011981606 +6932:1040104011FC1084FBFE100031FC390455FC502093FE1020122013FE10201020 +6933:100011FC11241124FDFC1124312439FC540053FE912011221114114811841102 +6934:102011DC11141114FD1411D43126390055DC5514911411D41708110811141122 +6935:100013DE12421242FE4213DE32003A3E57D25212921413D41208121412241242 +6936:1000108812521222FE52128A32023BFE54885144927A10881150102010D81706 +6937:20142012201027FEFC10241025D074126C12A5D4A554254825DA242A28463082 +6938:22102110211027BEFA28224823AA72AE6ABAA2EAA2AE22A824AA24A229A2301E +6939:1110111017FC1110FDF0111039F03510511057FE920012901308120013FC1000 +693A:2100217C21442244FA44267C2A1072106AFEA238A25422542294231222102210 +693B:100013FE120012FCFE8412FC32843AFC562053FE924812C812301248128413FE +693C:1080108E11201210FCC010AE31043B1455245164912411241124110411141108 +693D:210021F8220823F0F81027FE208071446E68A0B0A128266820A4212226A02040 +693E:11081088109017FEF80013C432543A5457D45254925413D412541244125412C8 +693F:1020102013FE1020FDFC104033FE3888550452FA9088108810F81088108810F8 +6940:1004101E13E01020FDFC1124312439FC542053FE9222122A12FA1202120A1204 +6941:1040102013FE1202FC8010F831083A9054605198960611F81108110811F81108 +6942:1020102013FE1070FCA81124322239FC550451FC910411FC1104100013FE1000 +6943:100013FC12041204FBFC120033FC3A40568853FC9224122015FC1420182013FE +6944:1040102013FE1202FE0213FE32003A0057FE5352955215FE1552155219521106 +6945:100013FE100011FCFD04110431FC380057FE5222922213FE1222122213FE1202 +6946:100013FE10501050FBFE125232523BFE5400504097FE10881190106010D81304 +6947:100011FC11041104FDE4112431243BFE560252FA928A128A12FA1202120A1204 +6948:100013FE10221120FD3C11203AFE340051FC510491FC110411FC110411141108 +6949:1088108813FE1088FCA8102033FE3840548054FC918412841084108410FC1084 +694A:100011F8110811F8FD0811F830003BFE550051FC925414941124124410A81110 +694B:1082108217F21082FC8A13EA32AA3AAA57EA508A91CA12AA14A21082108A1084 +694C:1040102013FC1000FD08109033FE3A10562052C89210122412C8141014601980 +694D:010001007FFC0380054009203118C10600007BBC4AA44AA44AA44AA47BBC4AA4 +694E:100013FE12221020FDFE102031FC392455FC552491FC102013FE102010201020 +694F:1020102013FE1050FC88132631FC3820542053FE9000102011FC1020102013FE +6950:11FC1124112411FCFD24112431FC385054885104928A10881088108811081208 +6951:101013D410581252FD8C108831043AFA5420502093FE10201050108811041202 +6952:100011FC11241124FDFC1124312439FC54005440902412A2128A148810781000 +6953:200027FC24042434FDC4244425F475546D54A5F4A444245425F4249428063002 +6954:2100213C27D42114FB94211427D47124694CA040A7FE204020A0211022082C06 +6955:1040104013FE1080FDFC122035FE380055FC550491FC110411FC110411141108 +6956:100013DE12521252FE5213D232523A52565253D2921A1294125012B013101010 +6957:2020202020FC2E24FBFE222424FC74206EFCA220A2202BFE2420262029FE3000 +6958:00207E20247E1884FF2829104A2899440100FFFE0380054009203118C1060100 +6959:2008278820882288F93E210827D8715C6B2CA32AA54825082908210825082208 +695A:082008207EFC08201C702AA8C82400007FFC0104110011F81100290047FE8000 +695B:1088108813FE1088FCA8102033FE38205420542091FC11041104110411FC1104 +695C:2100211E211227D2F912211E211277D26C52A45EA45227D224522022202A2044 +695D:1020102013FE1020FDFC112431AC3974552455FC9020107010A8112412221020 +695E:100013FC12941294FE9413FC3080384057FE548090F810881108110812281410 +695F:1040102013FE1000FDFC110439FC340053FE520291FC10201020102010A01040 +6960:1020102013FE1020FC2013FE328A3A5256FA5222922212FA12221222122A1204 +6961:11C010A011101208FDF6100033CA3A4A565453D49268125413D4124A124A12C0 +6962:11081088109017FEF890109033FC3A945694530C920413FC1204120413FC1204 +6963:100013FC12241224FBFC120032FC3A84568452FC928412FC1284128414FC1884 +6964:1080108010FC1154FAD410B4312C3A4454945108904010A412AA128A14781000 +6965:103C17C012441128FC0013FC3080388057FE550091F812881250142018D81306 +6966:1040102013FE1202FC0411FC300039FC550455FC910411FC1104100013FE1000 +6967:2110211027FC2110F950204023F872486A48A248A7FE204020A0211022082406 +6968:10201020103E1020FC2011FC310439FC550455FC910411FC1000108811041202 +6969:210021FE21102210FAFE2292269272FE6A92A292A2FE22902250222022582286 +696A:10481148114813FEFD4811483178390055FE542093FE107010A8112416221020 +696B:100011F811081108FDF8100037FE390855F8550891F81108113E17C810081008 +696C:100011FC110411FCFD0411FC388035FE522251229152110211FA100210141008 +696D:044024481450FFFE082004407FFC01003FF80100FFFE054009203118C1060100 +696E:1020102211FA1024FC2813FE3020384054FC5184928410FC1084108410FC1084 +696F:201C23E022202220FBFE222022FC72846A84A2FCA28422FC2484248428FC2084 +6970:1020102010A0112CFD24112431AC3924552455FC912410501050108811041202 +6971:2040204027FC2040FBF8208027FC71106A08A5F6A04023F8204020A021102608 +6972:2014201227FE2410FC1027F0249274926FD2A554A5542488254A2A1A28263042 +6973:1088108813FE1088FC8810F83088388854F8542093FE107010A8112412221020 +6974:1040102011FC1000FC88105033FE3A22542455FC912411241134112810201020 +6975:100013FC10081010FC2013AE32A23AAA56A452A493AA103210A0104017FE1000 +6976:410021FC0A441048E0A0211026081FF410101FF001007FFC05401930E10E0100 +6977:1110111211D41118FD521192312E384055FC5104910411FC1104110411FC1104 +6978:208821C827082108F92A212A27AC71486B08A388A55425142914212421242142 +6979:100013F811081110FD1C12E432A43A5454A8510093FC12941294129417FE1000 +697A:100010FC10481030FDFE1052389435105230502091FE107010A8112412221020 +697B:1020104011FC1104FDFC110439FC340053FE5020902011FC1020102013FE1000 +697C:2020212420A82020FBFE20A8212472026840A7FEA08821082190206021982604 +697D:0100420427C81450044017D02448C44407C00100FFFE054009203118C1060100 +697E:1040108011FC1104FDFC110431FC3820543253B490A811281124122414A21040 +697F:101C11E010201020FBFE10A831243A2255FC5104910411FC1104110411FC1104 +6980:100010F810881088FC88108830F83888540053DE925212521252125213DE1252 +6981:1040102011FE1102FE0411FC3040388855FC5424902011FC1020102013FE1000 +6982:200027BE24882488FFA824A824A877BE6C10A518A49825A826AA244A20462080 +6983:082008207EFC08201C702AA8C82600003FF8210821083FF8210821083FF82008 +6984:10901290129E12A8FEC4108031FC39045524552491241154105010901112160E +6985:100011F811081108FDF81108310839F8540053FC929412941294129417FE1000 +6986:104010A011101208FDF6100033C43A54565453D49254125413D41244125412C8 +6987:1040102011FC1000FC88105033FE3820542055FC902010A81124122210A01040 +6988:110010BC12841204FEF4129432943AF4560452F49294129412F4120412141208 +6989:1044112410881010FBFE108831243A2254F85020902013FE1020102010201020 +698A:120811081108103EFBAA10AA30BE392A55AA536A953E112A1108110811081108 +698B:100011FC100410FCFC0411FC3004380057DE5442904213DE1042104213DE1042 +698C:100013FA100C104AFB88112A3126392257F8512A912C112A1128122A12261422 +698D:200023FE22022202FBFE2210229272546AFEA282A2FE228222FE2482248A2884 +698E:13FE104011FC1104FDFC110431FC390455FC548090FC11081290106011981606 +698F:1104108410881000FBFE100030883904560251FC915411541154115417FE1000 +6990:100013FC12041204FBFC124832483AFC5648524893FE12A412A8149014C81886 +6991:1028102413FE1020FDFC112431FC392455FC5524900813FE1088104810481018 +6992:100013DE10421042FBDE121032103BDE54425252914A114A1252104212941108 +6993:20402028209022A4FAC2248A218876786800A3FCA29422942294229427FE2000 +6994:1100109E13D21252FE5413D432583A5457D252129292125A12D4135012101010 +6995:1040102013FE1202FC501088312438505488510492FA10881088108810F81088 +6996:08007F7808483E4800487F864100BEFC004408447E2818282C104A2888440982 +6997:100013FC10901294FD98109037FE380055F85508910811F81108110811F81108 +6998:200020FC3E8048F888887EF8148022FC40000100FFFE054009203118C1060100 +6999:1088108813FE1088FC2010503888350452FA5000900011FC1104110411FC1104 +699A:1104108410881000FBFE1020302039FC5420502093FE100012A4125214521000 +699B:1020102013FE1020FDFC10403BFE3488513452E2902011FC107010AC13221020 +699C:1040102013FC1108FC9013FE32023C44542053FC908010F81088110811281210 +699D:2000245C22942114FA942454212671006FDCA114A59425542948210825142222 +699E:100011FE11101120FD7C1144317C3944557C5510911011541152129212501420 +699F:1040102013FE1242FC2011FC3088385057FE5020902011FC1020102010201020 +69A0:100013FE12021000FDFC110431FC390455FC5440902013FE1000108811041202 +69A1:1020102013FE1020FDFC102033FE3840548855F0902413FE1022112412A21040 +69A2:1040102013FE1202FC0011FC304038A257345458909413341052109013501020 +69A3:1008103C13C01004FA44112831FC3A20542053FE902011241124112411FC1004 +69A4:2208220823BE2488FAA8213E220874486848A7FCA0E0215022482C4620402040 +69A5:100011FC110411FCFD0411FC3020392454A8502093FE1090109011121212140E +69A6:102010201050FE5010887D0446227C2045FC7C601070FEA810A4112412201020 +69A7:100013FE12281228FEEE122832283AEE5628522892EE12281228122813FE1000 +69A8:1040102013FE128AFD04108030FE39405640507C90401040107E104010401040 +69A9:1040107C104013FEFE42127833C43A3C5640522093FE12881250142014581986 +69AA:100011FE112011FCFD2011FC3120392055FE500292AA12AA12AA120210141008 +69AB:10A0109011FE1320FDFC112031FC392055FE5500902013FE1020102010201020 +69AC:1020102011FC1020FBFE100031FC3904550451FC90521094118816A410C21080 +69AD:2084210423C42244FBDE224433C46A646254A7D4A0C421442244244421542088 +69AE:08202AA44D28145022887FFE4002810401007FFC0380054009203118C1060100 +69AF:201020102710257CFD10251025FE77086D08A5FEA50825482728200820282010 +69B0:1040104411F81050FBFE104030F83982567E540091FC110411FC110411FC1104 +69B1:2080204027FE2000FBF822082FFE72086BF8A0A4A12823102510294821862100 +69B2:200023F8224822A8FB18220823F870006800A7FCA4A424A424A424A42FFE2000 +69B3:2040202023FE2202FAEC2224224472446AEEA224A2A422A4224E2460249E2900 +69B4:104013BE12121292FE5212AA3324384057FE5222922213FE1222122213FE1202 +69B5:1108110817FE1108F80017FE310839F8550851F89108113E17C8100810081008 +69B6:1020101013FE1220FAFC122433FE3A2456FC522092FC12841284148414FC1884 +69B7:1080108017FE1522FD1013FC36203A2057FC5220922013FC1220122013FE1200 +69B8:1100113E112A112AF93E17AA312A393E55085108913E118817081208107E1000 +69B9:1004101E13F0121EFE1012FE32923A9856F2528E928012B812A814AA154A1A86 +69BA:00203D2424A8242025FC3C4027FE248825243E2225FC247024A8452456248820 +69BB:100011FC110411FCFD0411FC3800340053DE50429252114A12521042114A1084 +69BC:1020102011FC1020FC2013FE3080390457FE540293FC12941294129417FE1000 +69BD:103C17C012441128FC80111033E03840558853FC9044104017FC10A01110160E +69BE:100011FC110411E4FD2413FE320239FC550455FC910411FC1104110411141108 +69BF:1020112411241124FDFC100033FE380055FC5504910411FC1088105013FE1000 +69C0:0100FFFE00001FF010101FF000007FFC40044FE448244FEC0100FFFE0920711C +69C1:1040102013FE1000FDFC110431FC380057FE520292FA128A12FA1202120A1204 +69C2:20062F7821102120FA44227833106A24667EAA12A2102254225222922A502420 +69C3:10003E7822482A48FE8623782A4842304A48848401007FFC05401930E10E0100 +69C4:103C13C010441224FD28110030403B9C56045204939C12041204120413FC1204 +69C5:100013FE100011FCFD04110431FC380057FE528A925213FE12221222122A1204 +69C6:1110111017FE1110FA0013FC34043BE4562453E4922413E41224100410281010 +69C7:111811E0110210FEFC00117C3144397C5544557C9144117C110011FE10881104 +69C8:100013FE120012FCFE0013FE32A83A9056C85286920813FE1288144814081818 +69C9:1020101011FE1100F9201520333C39505590531095FE11101128122812441482 +69CA:2200147CFF44087C4944497C7F44084410942108FFFE054009203118C1060100 +69CB:1088108813FE1088FDFC108833FE382055FC552491FC112413FE110411141108 +69CC:10101220117C1144FC44107C33403940557C55449144117C11441280147E1000 +69CD:10201020105010C8FD2413FE350439FC550451FC910011FC1284128414FC1084 +69CE:11081088109013FCFC4011F830403BFE5480550091FC12201420182013FE1000 +69CF:10881050100013FEFC5011FC30543BFE545455FC905010D81154125210501050 +69D0:1020104011FC1124FD2411FC3124394455FC544090B010A4113C11221222141E +69D1:00007CF84488448844887CF810201020FDFC307038A854A85124922210201020 +69D2:1040102013FE1040FC8811F03020384455FE540291FC112411FC112411FC1104 +69D3:100011FC10201020FBFE100031FC390455FC510491FC110411FC108811041202 +69D4:1040108013F81208FBF8120833F8388057FC5110924814441BFA104010401040 +69D5:10201020103E1020FDFC110431FC390455FC502093FE107010A8112412221020 +69D6:01007FFC01001FF000007FFE4002BFF408001FF068100FF00100FFFE0920711C +69D7:1040104017FE1080FDF8128834F8380057FE520292FA128A12FA1202120A1204 +69D8:1104108813FE1020FDFC102033FE3820552454A8907010A81124162210A01040 +69D9:1020102013FE1020FDFC110431FC390455FC550491FC110413FE108811041202 +69DA:100013FE105013FEFE52125233FE380055FC5504912411241124105010881304 +69DB:10481148114E1150FD68114431443840540055FC915411541154115417FE1000 +69DC:10A0109011FE1320FDFC112031FC392055FE510093FC1088109E1102120A1404 +69DD:1020104011FC1104FDFC110431FC390055FE550091FE1042124A13FA10141008 +69DE:1080104017FC1110F8A017FE30003BF8564853F8924813F8124A1042103E1000 +69DF:1040102013FE1202FC1411E03100390055FC5110911017FE1000109011081204 +69E0:2020242022FA2224F82821FE2E2072406AFCA344A244227C22C42344227C2044 +69E1:11F810881070118CFC0013DE3252398C5652502093FE107010A8112416221020 +69E2:100013DE10421252FD4A12523042382055FC5504910411FC1104110411FC1104 +69E3:1040102013FE1202FC2011FC3050388857FE540891E8112811E8100810281010 +69E4:1010101012FE1110FD7C1054307C3B54557C511091FE111011101290147E1000 +69E5:108813DE108811DCFC8813DE3888340053FC5004900411FC1004100413FC1004 +69E6:202027FE242025FCFC2427FE242475FC6C20A5FCA52425FC252429FC2924312C +69E7:08047F7808407F40497E7F4849487F4808487F48088801007FFC05401930E10E +69E8:2200211E27D22012F7D4245427D870146FD2A092A11221DA2714211025102210 +69E9:00007DFC44207D2045FE7C5048525492650E0100FFFE054009203118C1060100 +69EA:2100223E27882488FCA827A824BE74886F88A010A4982718242824AA23CA2086 +69EB:102013FE102011FCFD2411FC312439FC542253FE900813FE1108108810281010 +69EC:2200220E2F742254F55428D4275470546FD4A454A754215421522154255C2284 +69ED:20142012201027FEFC10249024D274926FF2A494A49425C82AAA289A31A62042 +69EE:1040108811FC1108FA5213FE30503988562650C0931010641388103010C01700 +69EF:1020122213FE1090FC8811FE3B10351051FE5110911011FE1110111011FE1100 +69F0:2020247C22842148F83020CE2610727C6A10A27CA21022FE2210221025FE2800 +69F1:100011FE10481048FDFE114A314A398E550255FE910211FE10001154112A122A +69F2:2204220427842494F90C27C4256475546FC4A546A57C27C425442544244428C4 +69F3:0440247C24A83D5004287DFE2488444885180100FFFE054009203118C1060100 +69F4:1040102013FC1204FBFC120032F83A8856F8520093FC132415FC1502190210FE +69F5:1020102011FC1124FDFC102033FE3A2257FE50209040102412A2128A14781000 +69F6:200027FE242A2426F7FE242227AA76AA6FAAA432A596262E2446248227FE2402 +69F7:08203E2008F87F282228496A3E2A08567E820100FFFE054009203118C1060100 +69F8:2110211027D02110F93C27D4201472B46D54A11CA7D42114211421E427262242 +69F9:1020104011FC1104FDFC110431FC3820552454A89124102013FE102010201020 +69FA:2040202027FE2420FDFC242427FE74246DFCA420A56224B429282A2630A02040 +69FB:2200227C22442744FA7C22442244777C6A44A244A27C22282528254A284A3086 +69FC:11F87D0811F81108FDF8110829F824904112860E01007FFC05401930E10E0100 +69FD:1090109017FE1090FBFC129433FC3A9457FC500091F8110811F8110811F81108 +69FE:100011F8110811F8FD0811F830003BFC569453FC900011F81090106011981606 +69FF:1088108817FE1088FCF8102031FC392455FC502093FE102011FC102017FE1000 +6A00:1040102013FE1088FC5013FE32223AFA562252FA928A128A12FA1202120A1204 +6A01:1020102013FE1020FDFC104033FE388855045242959C110411DC110411FC1104 +6A02:2104220447C89452E45C47C89452F45E17C20100FFFE054009203118C1060100 +6A03:1100109E13D21252FE5213DE32523A5257D2521E9292125212D21352122A1044 +6A04:2010271025FE2510FD7C2654257C75546D7CA510A53826542492241024102410 +6A05:2124212422242424F954214A229276106A10A250A25C2250225022B0229E2300 +6A06:1040102013FE1000FD541124315439FC542053FE9242129212FA120A12021206 +6A07:2120213C214422A8FA1026A82AC672BC6AA4A2BCA2A422BC222422242224222C +6A08:2080204023F82110F8A027FE200073F86A08A3F8A20823F82120212222222C1E +6A09:1020102013FE1020FAAA112432AA382056AA512492AA10501050108811041602 +6A0A:24482288F93E22886458729CA92A228825480100FFFE0280044008203018C006 +6A0B:20FE240422282210F8FE20922E9272FE6A92A2FEA29222922296250028FE2000 +6A0C:100011FC112413FEFD2411FC300039FC550455FC910411FC110411FC10881104 +6A0D:102013FE102011FCFC2013FE300039FC550455FC910411FC110411FC10881104 +6A0E:1020101013FE1202F88010FE31103B20557C51449144117C11441144117C1144 +6A0F:100011FC112411FCFD2411FC3040388855F05420904413FE1022112412221060 +6A10:10201020103E1020FC2013FE32023B26568A525293261252128A132613FE1202 +6A11:22782128246C22AAF82A2148229870406840A7FCA0E0215022482C4620402040 +6A12:1040102013FE1242FC2812943AAA34CA50F85300902011241124112411FC1004 +6A13:102011FC112413FEFD2411FC302039FC552455FC904013FE108811D01070138C +6A14:1124124811241000FDFC112431FC392455FC502093FE107010A8112416221020 +6A15:2108210827C82108F91E27D2256475406FC8A108A38825482954211421242142 +6A16:010006C01830EFEE00001FF010101FF0000013FEFC0811E8392855E890081018 +6A17:11FC102013FE1222FDAC102031AC380055FC500093FE108010FC100410281010 +6A18:1020112410A813FEFE0210F83088388854F85420902011FC1020102013FE1000 +6A19:100013FE105011FCFD54115431FC380055FC540093FE102010A8112412A21040 +6A1A:1040102013FE1250FE5013FE32523A5257FE5200929212D41298149214D2188E +6A1B:200027BC208424A4FA9424A4205071886E26A0C0A31020642388203020C02700 +6A1C:1040102013FE1200FE48124833FE3A4856485248927812001554152A1A2A1000 +6A1D:1040107C104013FEFE42127833C43A3C560052FC928412FC128414FC148419FE +6A1E:100013FE1200127CFE441244327C3A0056EE52AA92AA12AA12EE120013FE1000 +6A1F:102011FC10881050FBFE100031FC390455FC510491FC102013FE102010201020 +6A20:1088108813FE1088FC8810F830203BFE5622533292AA137612221222122A1224 +6A21:1110111017FC1110FC0013F832083BF8560853F8904017FC10A0111012081406 +6A22:1040108011FC1104FDFC110431FC390055FE550091FE100212AA12AA1202100C +6A23:1104108813FE1020FDFC102033FE3820541054E0902213B410A8112416A21040 +6A24:2110211E21222254F20826942AE272886A88A2BEA28822AC222A224A22282210 +6A25:108813FE10881080FDF8128830703B8E542055FC902011FC102013FE10201020 +6A26:1210121013DE1528F884102030103BFE5420502091FC10201020102013FE1000 +6A27:2000245C22942114FA94241420A67140691CA7D4A11423942548290821142122 +6A28:200023FE220223FEFA102254223872546A82A250A27C2290221025FE24102810 +6A29:1080108011FE1220FC4013FE3890350853FE551091FE111011FE111011FE1100 +6A2A:1110111013FCFD10111017FE30403BF8564853F8924813F81000111012081404 +6A2B:200027DC251427D4FC5427C8250875146FE2A000A04027FC204020402FFE2000 +6A2C:1040108013FC1244FEF4131432A43A4456A453FC904010241522150A190810F8 +6A2D:1088108813FE1088FCF8108830F8388857FE5088912412FA1020102013FE1000 +6A2E:100013FE10501050FBFE125232523BFE54205124912412281050108811041202 +6A2F:1020102013FE1020FD2410A833FE380055FC5504917411541174110411FC1104 +6A30:100011FC102013FEFE2211AC302039AC540055FC900411FC1004100411FC1004 +6A31:20002FBE28A22AAAFAAA2AAA251478A26880AFFEA110221023A0206021982E04 +6A32:101417FE101013D0FC1013D030103BD0565053D0925013C8124A13CA11861242 +6A33:100013FC100413FCFC0413FC30003BBC552457BC900813FE1108108810A81010 +6A34:1110109413D21012FA50119037FE381057D25252925413D4124A124A13D61022 +6A35:1090108811FE1110FB1015FE3110391055FE5110911011FE110012A412521452 +6A36:100011F8110811F8FD0811F8380037FE524053DC925413D4126817C810541062 +6A37:082008207EFC18302C684AA488207F7C22443E4422283E28221027A8FA440282 +6A38:1050125211541050FBFE108830503BFE542051FC902013FE1050108811041602 +6A39:210421042FE42104F93E27C4200477E46C54A454A7C42444228420E42F142408 +6A3A:108813FE10881000FDFC10A830A83BFE54A854A891FC102013FE102010201020 +6A3B:102011FC112411FCFC2013FE300039FC550455FC910411FC110411FC10881104 +6A3C:27FC240427FC2400FDF8241027FE74206C60A79CA484250829DE2F0831082318 +6A3D:1088105013FE1050FDFC1154318C3974550455FC900813FE1108108810A81010 +6A3E:2114211221122790F97E21502FD471546954A548A5EA25562722250024FE2800 +6A3F:100013DE12521252FBDE100031FC392455FC512491FC102013FE102010201020 +6A40:1040102013FE1040FC8411FE30A838AA5526520091FC11541154115413FE1000 +6A41:1110111011DE12A8FC44110031FC3A0455F4511491F4111411F4111410281010 +6A42:1088105013FE1050FDFC1154318C3974550455FC902013FE1050108811041202 +6A43:102413A810921514FA08140433BA38A854C65380923C138410A8109012A81144 +6A44:2008278820882110FFDE249424A477946C94A794A49424C827882C9420A420C2 +6A45:1080108011FE1354FD54115433FE39545554515497FE10001154112A122A1000 +6A46:20003FFC529092907FFC12901290FFFE082008207EFC18202C704AA889240820 +6A47:103813C0107813C0FC7813C4383C340050C6573891CE173811CE1738114A1186 +6A48:1020102011FC1020FBFE1108339C39085588563E900013FE109010901112120E +6A49:1020112410A813FEFCA8112432223904550451DE92441554109E110412041404 +6A4A:100013FE105013DEFA52125233DE385057FE5222922213FE1222122213FE1202 +6A4B:101811E0104013FEFC88117432523870540055FC91041174115411741104110C +6A4C:13DE125213DE1252FBDE120232F23A9256F2529292F212921292133212021206 +6A4D:100013DE125213DEFE5213DE32023AFA562252729222122212FA1202120A1204 +6A4E:103C13E0112410A8FBFE10A831243A0255FC5124912411FC1124112411FC1104 +6A4F:1088105013FE1020FDFC102033FE392454A853FE900011FC1104110411FC1104 +6A50:01007FFC11101FF00100FFFE80023FF804001FF068100FF00100FFFE0920711C +6A51:2040204027FCF8A02514220877FC6A0AABF8A20823F820402248244429442080 +6A52:100011FC102013FEFE2211AC302039AC540055FC900013FE1040108811FC1084 +6A53:203C27C02044FA24210827FE74026A08AA08A3BE24882AA8213E220824082808 +6A54:221021102FD02010F7BE24A427D470146F94A094A11421C82F08211425142222 +6A55:112410A813FE1202FCF8108830F8380055FC5410911011FE1050109013101030 +6A56:1020112410A813FEFE0210F83088388854F8502093FE107010A8112412221020 +6A57:1088108813FE1088FC0013DE32523A5257DE5252925213DE12521022102A1044 +6A58:100013FC10481030FBFE105230943B50542053FE9252128A1376125212721206 +6A59:102017A410A81292F914120835F4380257F85208920813F8120811101FFE1000 +6A5A:102011FC102413FEFC2411FC30203AAA57AE522293FE122213AE12AA12AA1422 +6A5B:20002FFE28002A28F9482BEE289278846AA0AAA8ABE828882894291429243242 +6A5C:3FFE289025103FDE22222A882F882294242228803FFE21C022A0449858868080 +6A5D:100013FE105013FEFE5213FE300039FC550455FC910411FC102013FE10201020 +6A5E:1020102013FE1020FDFC112431FC392455FC502293FE1042102412A2128A1478 +6A5F:1124112412AA13AEF92412AA33AE392457FE511091141114128A124A12161422 +6A60:102013FE104010F8FB48103033D0383C55C45048903013C410A8119016A810C6 +6A61:108010F8110813FEFD12112239FE344050A25354909813341054109213501020 +6A62:2020272025FE2540FD7C2690257E75006D7CA544A57C2644247C24442444244C +6A63:208020402FFE2882F548251428F470006FFCA444A7FC244427FC244424542408 +6A64:01002488242443E4000024241212A0A0A4A41C1C01007FFC05401930E10E0100 +6A65:282211FC28284BFE984029FC4E8488FC288410FC01007FFC05401930E10E0100 +6A66:102011FC10881050FBFE100031FC392455FC512491FC102011FC102013FE1000 +6A67:11041088100013FEFE2212AA32723A2257FE540091FC110411FC110411FC1104 +6A68:102011FC10201088FBFE108831FC390455FC510491FC110411FC108811041202 +6A69:108812AA12DC1488F954122233FE3A02540050F890881088108A110A12061400 +6A6A:1110111411D21250FA7E155030903AA85528514492441482100812A412521452 +6A6B:1088108813FE1088FCF8100033FE382055FC552491FC112411FC108811041202 +6A6C:100013DE108812A8FBFE118832DA3CA655F85108910811F81108110811F81108 +6A6D:102013FE102011FCFD0411FC302039FC5488505093FE102011FC102010201020 +6A6E:104013BE12921252FEAA1324304039FC550455FC910411FC110411FC10881104 +6A6F:208822AA22DC2488F9542222200073FE6A42A444A3FC20442044208421142208 +6A70:104011FC110411FCFD0411FC310439FC5420552490A81124102013FE10201020 +6A71:200027FE24002404F7E4240425DE75446D44A5D4A40C2544248424E42B142008 +6A72:102013FE102011FCFC0011FC390435FC508853FE900011FC1104110411FC1104 +6A73:2010275425382510FD7C271025FE75286D24A752A5FC2514252425242B542088 +6A74:1090109212D4129AFAD2174E308839F05420504493FE10221128122414A21040 +6A75:2288228827C82290FA9E27D4202477D46C54A7D4A45427C824482454246424C2 +6A76:21102114211227D2F91027DE247077D26C52A7D4A1142FD8210A211A21262142 +6A77:2040228822EA2EAAF2AC22E822AA76AA6AE6A000A1202120212022222422281E +6A78:10F81088108810F8FC88108830F8380057DE5252925213DE1252125213DE1252 +6A79:108010F8111013FCFD2411FC392435FC500053FE900011FC110411FC110411FC +6A7A:100013DE125213DEFE5213DE32023AFA568A52FA928A12FA128A1202120A1204 +6A7B:200023F820482048FBF82088208877FC6800A7BCA294229427BC229422D42F3E +6A7C:2220223C24442578F9082EFE222074D2681AAF2CA0CC201A232A2CC820282010 +6A7D:10101210117C1010FCFE1044332839FE5510557C911011FE1110111012FE1400 +6A7E:11FC1104110411FCFC0013DE32523A5257DE502093FE107010A8112416221020 +6A7F:100013FE100011FCFD2411FC31243BFE540055FC912411FC112411FC100013FE +6A80:20402FFE200027FCFC0425F4251477FC6800A3F8A20823F8220823F820002FFE +6A81:102013FE100011FCFD04117431543974550455FC900810F0102013FE10A81326 +6A82:109013FC129413FCFE9413FC30003BFC560052F8920013FE1520151415481986 +6A83:001E7BE4492853FC602053FE48004BFC680453FC400443FC0100FFFE0920711C +6A84:2108220827C82450FFDE246427D472146914A7D4A21423C822482454255428A2 +6A85:1020113C112013FEFC10101433FE3A1057F05254925412D41368144A18961322 +6A86:2108210821482548F58E290822887448693EA162A5A22522292222A2247E2822 +6A87:10A0109011FE1320FDFC112031FC392055FE510093DE12521252127212021206 +6A88:100013FC12941294FBFC100037FE380057FC520493FC10A2111413081D441182 +6A89:100017E0125E13D2FE5213D23A7237DE504053FE902011FC1020102013FE1000 +6A8A:2108210821142FD4F12227C0245C77C86C48A7C8A13E2FC82108210821082108 +6A8B:108813FE108813FEFC88112432FA382055FC552491FC112411FC102013FE1020 +6A8C:200023FC22942294FBFC20002090779E6890A090A39C20902090279E20902090 +6A8D:1040102011FC1088FC5013FE300039FC550455FC910411FC10201294128A147A +6A8E:1020105010881124FEFA10503124395455FC502093FE1242129212FA120A1206 +6A8F:1050125211541050FBFE108830503BFE542051FC902013FE10A8112416221020 +6A90:110011F8120817FEFA88132433FE3A0056FC520092FC120012FC148414FC1884 +6A91:100011FC102013FEFA2211AC302039AC540051FC9124112411FC1124112411FC +6A92:082008207EFC18302C684AA69FF010D01710111017D0155027CA212A4FE68022 +6A93:210026DC24542454F6D42454246677C0681CA014A7D42114210821C827142222 +6A94:1020112410A813FEFE0210F83088388854F8540091FC112411FC112411FC1104 +6A95:0800FF7808487F4849867F0049787F480828FF9049287F440100FFFE0920711C +6A96:104412241128107EFC101028334A391C5528554C911A112A1148111012FE1400 +6A97:00407C2045FC44887C5043FE7C20A5FC24203C2001007FFC05401930E10E0100 +6A98:20102008278824BEFC8024942788747E6C08A788A6BE2A882A882B8832882008 +6A99:21F8210821F8250AF5FA250A25FA74026F9EA090A0902F9E2492249224922892 +6A9A:2110211027BC2110FBB82554291270006FFCA044A24022782240254028FE3000 +6A9B:2000227C21442174F854205426FE72826ABAA2AAA2BA2282228A2284250028FE +6A9C:204020A023182DF6F00027FC255474E46FFCA000A3F8220823F8220823F82208 +6A9D:101013D412521252FBD0101037FE3A5057D2525293D4125412EA174A10561062 +6A9E:2200239E248A290AF7D22566254077D46D5EA564A7C42544255E2544244428C4 +6A9F:100013FE105013FEFE5213FE300039FC550455FC910411FC110411FC10881104 +6AA0:2420FF20243E7E4482847A284A107A2804440100FFFE054009203118C1060100 +6AA1:100011FC115411FCFC2011FC30203BFE5488545091FC102013FE102010201020 +6AA2:1020102010501088FD0412FA3000380055DC5554915411DC1088108811541222 +6AA3:2040204027FC2248FA4825542FFE70006BF8A208A2E822A822E8220823F82208 +6AA4:10441028120011FEFD20107C30443B7C5544517C9144117C11441280147E1000 +6AA5:1104108813FE1020FDFC10203BFE34545192509093FE109010D4138A109611A2 +6AA6:20022FE222822FEAFAAA2AAA2FEA700A6BCAA00AAFEA210A25422522292A2304 +6AA7:108813FE10881100FBFC155430D43B24545450949348102010A4128A128A1478 +6AA8:1104108813FE1020FDFC102033FE38005620513E904211141610122812441082 +6AA9:102013FE100011FCFD04117431543974550455FC900011FC100013FE11241262 +6AAA:1020104010F8128AFD8C10F8318C3A8A54F8502093FE107010A8112416221020 +6AAB:2080204027FE2402FA2423BC34A46AA86510A2E8A4042BFA20402248244420C0 +6AAC:211027FC211027FCF40423F8200077FC6880A144A6A8217026A8212626A02040 +6AAD:2200227C254424C4F87C27442244727C6F52A252AA542748224823542C622040 +6AAE:204027FC204023FCF80027FE200273F86840A7FEA00027FE200827FE24A82798 +6AAF:20402FFE204027FCF80023F832086FFE6802A7FCA11023F8204027FC20402FFE +6AB0:21082110223E2222F4BE2722213E72086CBEA7AAA02A20AA256A252E24082008 +6AB1:110811EE12941042FC88108833FE388854F8548890F8108813FE108811041202 +6AB2:13FE122213FE1222FEFA12AA32FA3AAA56FA522693FE120A13FE128A125A13FE +6AB3:2080204027FE2402FBFC2148225077FC6A04A7FCAA0423FC220423FC21082204 +6AB4:108813FE10A81090FDFE132031FC392055FC512091FE110013FC10881070138E +6AB5:1044128412EA124EFEA412EE32223BFE5644528492EA124E12A412EE122213FE +6AB6:1020102013FE1050FC8813FE32003A7C5644527C920012EE12AA12EE120013FE +6AB7:200027FC22482444FFFE244426EC75546EECA444A6EC255426EC244424542408 +6AB8:1040102013FE1222FD54114A323A380055FC515493FE100011FC102010A01040 +6AB9:24202220223E2F40F490247E272475426DFEA504A57425542974290433142008 +6ABA:204027FE200021F8F90821F8200077FE6C02A3F8A180264421B8266821A62660 +6ABB:100813E8128813EEFE2813F432823BE2540051FC915411541154115417FE1000 +6ABC:203E27C022442128FBF8204027FC70006BF8A008A3F8200823F82544252A28FA +6ABD:100011FC102013FEFA2211AC302039AC540053FE902011FC115411541154110C +6ABE:08202AA44D28145022887FFE4002882408207EFC08301C682AA4C92208200820 +6ABF:3FFE28942F9228902FFE20102F9028A82FA428C4298020404FFE416086581846 +6AC0:110817FE110811F8FD0811F8390837FE5108529495E2104813FC1040124814C4 +6AC1:1040102013FE1242FC2812943AAA34CA5378502091FC112411FC102213FE1002 +6AC2:200027BC208424A4F29424A4212072106FFCAA20A3FC222023FC222023FE2200 +6AC3:27FE242025FC2524FDFC242027FE75046DFCA504A5FC250425FC2488250427FE +6AC4:101C11E0102013FEFC2011FC31AC397455FC542091FC102013FE10001154122A +6AC5:2080204027FC2110F0A42F58255475526B58A000A20823F8220823F822082408 +6AC6:2104221427CC2544FD5427CC2546755C6FC4A104A2A422D424F02482287E2000 +6AC7:2080209E208427E8FCBE2492249277DE6E52A55EA5522492289E2940314C2252 +6AC8:202427A820922514F2E8240423FA72086BF8A110A7FC200021F021102212240E +6AC9:200027FE24842484F7E4249E25C474046DD4A54CA5C42544288428C433142008 +6ACA:200027BC24A427BCFCA427BC248475F46E94A4E4A71C24E424A424A424E4240C +6ACB:104011FC11241194FD4C112439FC342053FE528A912413FE108010FC1104120C +6ACC:23FC204021F82108F9F8210827FE74426AA4A28AA47A208021F822882070238E +6ACD:1042139C121013DEFE94129434203BFC560453FC920413FC120413FC11081204 +6ACE:2040202027FE2488FDFC248827FE74206DFCA524A5FC252425FC240024882904 +6ACF:200020FE242822FEFAAA20FE201071FE6E44A2FEA344227C2242223E250028FE +6AD0:1FF011101FF011101FF000003EF82AA83EF82AA83EF801007FFC05401930E10E +6AD1:23F82248224823F8FA48224823F870006FBEAAAAAAAA2FBE2AAA2AAA2FBE28A2 +6AD2:1088108813FE1088FD1011DE3A52355452885174920211FC1020112412221060 +6AD3:108011F8120815FCFD2411FC392435FC5154522A91FC110411FC110411FC1104 +6AD4:100013FE124813FEFE4812FC32A43AFC56A452FC922013FE132A157A150A1906 +6AD5:108811DC108813DEFC881154322239FC550455FC910411FC110411FC10881104 +6AD6:2020203E202027FEFC2225F8242275FE6D24A5FCA52425FC28402AA4328A247A +6AD7:110817FE11081000FBFC129432943BFC542853FE9220132412A81292142A18C6 +6AD8:108813DE108811DCFC8813DE30883BFC540451FC900413FC104012A4128A147A +6AD9:1088108817FE1088FBFE1200327C3A44567C520092EE12AA12AA12EE120013FE +6ADA:100013DE125213DEFE5213DE32023AFA568A52FA920212FA128A12FA12021206 +6ADB:1108110811EE1294FC42100033DE3A5257D2525293D2121A1294135012101010 +6ADC:01007FFC11101FF00100FFFE88421F6032504C4837FEC1007FFC05401930E10E +6ADD:102013FE102011FCFC0013FE32523BFE550455FC910411FC110411FC10881104 +6ADE:2120213C21442278FA8824FE2F2071526A1AA4ACAFCC209A202A2AC82AA82810 +6ADF:244424E428A82AAAFEEE24A42AAA7EEE6A42A040AFFE20E0215022482C462040 +6AE0:202027FE241027D4FD4A2484250277DC6C54A5E6A50025DC2844285431482094 +6AE1:2210221023DE2528F884204423F870506FFCA080A3F82D0821F8210821F82108 +6AE2:210827C825482FF0F55E27E4211477D46D54A7D4A2142FC82448269421942662 +6AE3:110817FE11081410FAFE1210307C3854567C5254927C121012FE1210151018FE +6AE4:121013DE15281084FD08109037FE380057D4525493D4125413D41244125412C8 +6AE5:1040102013FE1244FBF4124432EE3A0456F452AC92E4121412A4147415941808 +6AE6:102013FE125013FEFE5213FE32003BFE56925348923A124012FC1548143019CE +6AE7:24102210207A2712F814277E20087710683CA764A5A4253C25242724253C2024 +6AE8:1040107C104013FCFE4413F032443AFC56A852F892A812F8120015FC15541BFE +6AE9:13DE125213DE1252FBDE1242327A3A8A571252DA928A12DA128A12FA120A1204 +6AEA:200027FE24442598FC8827DE248875DC6EAAA488A4202520253C2920292037FE +6AEB:00207F2410FC28284DFE1620247C4EC4157C64440C7C01007FFC05401930E10E +6AEC:2200213C27A42024F4BC232427A4713C6924A7A4A13C259025582968252A2246 +6AED:2F7E29102F502950FF7E2A282B287D4A6886A7F8A40827F8240827F820002FFE +6AEE:100013FE102013AEFEAA12AA33AE382057FE502093AE12AA12AA13AE102013FE +6AEF:2206223827882488F90827DE254875486FDCA55AA56827E820082AA82AA82008 +6AF0:208020402FFE2000F7FC24A427FC72486950A208A44420A8211023082D462180 +6AF1:52107EFE28447E28A2FE3E1020103E7C22103E1001007FFC05401930E10E0100 +6AF2:20202F3C214425BEFA2A212A2FBE72906B2AA25AA22C225C222A22482A282410 +6AF3:2210211027DE2010F45E228227DE70106FDEA450A7DE245027DE2450245224CE +6AF4:2108210827CE2112F92427DE2552755E6FD2A11EA392255E2940211421122122 +6AF5:1088108813FE10A8FC9011FE31203BFC552051FC912011FE110012A412521452 +6AF6:102013FE122211FCFC2010F8302039FC542055FC915411FC104012A4128A147A +6AF7:208027FC240427BCF8A026BE22A277B66AAAA6AAA0B626A222BE27A022A2267E +6AF8:2140226C2244236CFAA423AC22A477FE6908A244A5F2204027FC204020402040 +6AF9:211027FE215023F8F84827FE204873F86D54A75CA44427FC2444275C25542954 +6AFA:200027FC20402FFEF8422358204073586800A000AEEE2AAA2AAA2AAA2EEE2AAA +6AFB:13DE125213DE1252FBDE125233DE398C5652504097FE10881190106010D81304 +6AFC:2148214C22AAF80827FE21487368694AAB6AA14C236C2148216A239A20262042 +6AFD:00187BE0495053F8604053F8480849F86840529444F401007FFC05401930E10E +6AFE:21822E3C20882A90F522243C27887A126A3EAF88A2082AAC2AAA2BCA2EA82090 +6AFF:108812AA12DC1488F954122233FE3A0254F8508890F8100011FC110411FC1104 +6B00:204027FC200023B8FAA823B8211077FC6910A7FCA1102FFE212823102D482186 +6B01:22882FE82AA82FE8FABE2FE830086FDC681AABE8A8282FC82AA82A482B283228 +6B02:108813FE10881412FAFE101034FE3A9256FE509291FE1292160412FE1244122C +6B03:11F0121017FC1204FBFC122433B83A2255FE521097FC124413FC10D0114A163E +6B04:13DE125213DE1252FBDE122232FA3A2256FA52AA92FA12AA12FA127212AA1226 +6B05:2140226C2244236CFAA423AC22A477FE6908A2F4A44223F8204027FC204020C0 +6B06:2108229423DE26B4FBDE229423DE72946BDEA210A7FC21082090206021982606 +6B07:13FC110811F81108FDF8110E37F8380857FE5294939C1294139C12D617BC1084 +6B08:122213FE109011FEFB1015FE311039FE551051FE910013FE128A137612521276 +6B09:249222942FFE2110F7FC204023F870406FFEA480A7BC2494279424C82F9420A2 +6B0A:108813FE108813DEFE5213DE30A0389055FE512093FC152011FC112011FE1100 +6B0B:13DE125213DE1252FBDE125233DE389055FE511093FE151011FE111011FE1100 +6B0C:2090209027FE2094F80A21FE250877E8694AA1EAAF2A25EA254C29EA22162462 +6B0D:210827FE212823FEFA2027FC2A2073FC6A20A3FEA080231C2204239C220423FC +6B0E:2288F93E2288729CA92A2288FFFE80023E0822FE3E0822483E28280824283A10 +6B0F:200027FC24A424A4F7FC221022A874BE6F68A23CA4A82FBC20282AA82ABE2020 +6B10:13DE100013DE1252FB5A125230203BFE565053FE925213FE129212DC129214CE +6B11:252827BE294827BEFB1825AA294673FC6A04A3FCA20423FC220423FC21082204 +6B12:210447C88812F3BC20084B92F83E0380AAAAABAA01007FFC05401930E10E0100 +6B13:2248215027FC2404F9F0211027FC75546CE4A7FCA04027FC20402FFE22A42452 +6B14:13DE125213DE1252FBDE10A031FE3B2055FC512091FE100011FC10881070178E +6B15:27BC24A427BC2000F7FE24002590749E6FD4A564A5D4255425D425682BC83054 +6B16:2790251E27A82484F7BE252A27BE70006BF8A208A3F8220823F820A02124261C +6B17:108813FE108813DEFE5213DE32523BDE562253FE92AA12FA1222127212AA1224 +6B18:13FE120213FE1292FE54129232FE3AAA56FE532292FA12AA14FA142219FA1004 +6B19:27FC244427FC2444FFFE2AAA2FBE7AAA6FBEA220A7C020842FFE204225482884 +6B1A:21F0221023E02020F7FC2188265071A86E64A1A0A2482FBE2AAA2FBE228A2FBE +6B1B:23FE202027FE2422F9AC228027DE72926B92A11EA7D2255227DE21122FD22126 +6B1C:204027FC224823F8F0402FFE2AAA73B86910A7FCA1102FFE212823102D482186 +6B1D:2288F93E2288729CA92A22887FFC44447FFC22083EFE22483E28280824283A10 +6B1E:27FC20402FFE2842FB582040235870006EEEAAAAAEEE20002FFE224825542FFE +6B1F:228027DE229227D2FD5E27D231126C9E67D2AD12B7DE250827CC251427D42422 +6B20:0800080008000FFC10041108211041000100028002800440082010102008C006 +6B21:00804080208020FC010409080A4014401040E0A020A021102110220824040802 +6B22:00800080FC8004FC050449082A401440104028A024A045108110020804040802 +6B23:022007203820207E204220843F10241024102410242824282448444444848102 +6B24:2020202020203F7E2042408440107E10021002101A28E2284248024414840902 +6B25:004000407C40447C4484448845207C2044204450445044507C88448801040202 +6B26:084008401440147C228452888920082000207E50025004500488088809040202 +6B27:00407E404040447C6484548849204820542054506450405040887E8801040202 +6B28:2040204040407E7C828402887B204A204A204A507A504A500288028815040A02 +6B29:00207F201120117E21422584421080103F1021102128212821283F4421440082 +6B2A:102010209220927E92429284FE10101010109210922892289E48F24400840102 +6B2B:202020203F20487E884208847F10081008102E10282828282F48F04440840102 +6B2C:102008200820FF7E0842108422107C10091012102428C82814482244C0840102 +6B2D:0020FE208220927E92429284FE1092109210AA10A628C2288248FE4482840102 +6B2E:422022202420FF7E084208844910491049107F10092810281048204440848102 +6B2F:104010401040FE7C108410887D20002000207C504450445044887C8845040202 +6B30:0820082010207F7E5542558455105510551055105528552857A8FC4400440082 +6B31:104010402840247C428480887D20002000207C504450445044887C8845040202 +6B32:142012202120497E0842148422104110BE1022102228222822483E4422840102 +6B33:082008200F20087E08427F845510551055107F10552855285528514445444282 +6B34:104008407E40427C42847E88432042207E204050485044504A88528861044202 +6B35:40404C407040447C44843C8841207C2090201050FE5010502888248845048202 +6B36:08200820FFA0087E08427F84491049107F1008101C282A284948884408840902 +6B37:422024201820247E52421084FF10201028107E10AA282A282A482E4408840902 +6B38:102010202020447EFE42028440107C1090101010FE2810281048284444848502 +6B39:082008207F20143E22224144FF5002907A104A104A107A284A2802440A440482 +6B3A:22202220FFA0227E22423E84221022103E1022102228FFA82448224442848102 +6B3B:104052405440907C288444888320102010205250545090502888248843048202 +6B3C:0020F7201120557E22425584891010100010F710112855282228554489441082 +6B3D:104010402840247C4284BC8811201020FE2010509450585050881E88F1044202 +6B3E:08200820FF20087E08427E8400107E100010FF1008284A284948894428841102 +6B3F:102010203E20227E4442808410106610421042106628422842487E4442840102 +6B40:082008207F201C7E2A42498400107E100010FF1008284A284948894428841102 +6B41:22202220FF20227E3E4222843E1022102210FF1040285428624840447E840102 +6B42:102092209220927EFE420084FE1010102010FE10AA28AA28AA28AA44AA448682 +6B43:02200F207820087E0842FF8428104B10491049106B28492849487F4441840102 +6B44:00203E202220227E3A422A842A107F1041105D10552855285D28414445444282 +6B45:0040FE402840287CFE84AA88AB20FE2010201050FE50105010881E88F1044202 +6B46:10200820FF20007E42422484FF1000107E10421042287E28424842447E844302 +6B47:00207E2042207E7E42427E8420107F1089104910552841287D2801440A440482 +6B48:102028204420827E7D420084F11095109510F51095289528F52891449544B282 +6B49:22201420FFA0147E14427F841510FF9015107F1014283628552894C414441482 +6B4A:10200820FF20007E7E4242847E100010FF108110BD28A528BD28814485448282 +6B4B:03207C204720447E5F42558456105C10551053105028572855485544A9840102 +6B4C:0020FF2002207A7E4A427A840010FF1002107A104A284A287A2802440A440482 +6B4D:102020207F20417E41427F8440107FD040107F9000A8AAA8AAA800C405440282 +6B4E:22202220FF20227E3E4208847F1049107F1008107F280828FF48144422844102 +6B4F:22202220FFA0227E3E4208847F1049107F1008107F2808287F2808440F44F082 +6B50:0020FFA080209F7E914291849F108010BB90AA90AAA8AAA8BBA88044FFC40082 +6B51:0410079004103FDE245227243C88238820882F0832482A945FD442148A140422 +6B52:20201020FE20447E2842FE8482109210FE109210BA28AA28AA28BA4482448682 +6B53:202020203F20483E88227F44145022907F10A4103F1024283F2824443F442082 +6B54:10201E2010207F3E51225C4472504E9040104A106A905B284A288F4478440082 +6B55:08207F200820223EFFA222447F5041907F1041107F1041287F28224441448082 +6B56:0820FF2008207E7E00427E8442107E102410FF1000287E28422842447E444282 +6B57:04103F9004907FDE04923FA40408554875C844487FC8445475D4555455548462 +6B58:0820292029204A7E144222844110001022102A90B72862282228524445448882 +6B59:0820142022205D3E80A23E4422503E9000107710111055283328554411443382 +6B5A:11100A107FD0041E3F9204247FC8248815087FC800083F94209420943F9420A2 +6B5B:082008201420227E4142BE840010001077105510552877282228224455448882 +6B5C:00207F205520557E7F4220847F1091107D10551055287D2811287D4405440282 +6B5D:00207F2055207F7E08427F840810FF90221014107F280828FFA8084408440882 +6B5E:00207F2041207F7E41427F842210551077102210552877280028554455440082 +6B5F:28204B204D20497E6B424D845510771055105510FFA800282228214441448082 +6B60:772055202220557EF742558422105510FF9014107F28552863285D4441447F82 +6B61:22202220FFA0227E77425584771012103F106410BF2824283F2824443F442082 +6B62:01000100010001001100110011F81100110011001100110011001100FFFE0000 +6B63:00007FFC0100010001000100110011F8110011001100110011001100FFFE0000 +6B64:0440044004402444244827502460244024402440244024422F42F042403E0000 +6B65:0100010011F8110011001100FFFE0100010011081110212040C003001C00E000 +6B66:004000503F4800480040FFFE0040044004402740242024222412278AF8064002 +6B67:0820082008200BFE48204E20482049FC4884488848484E505820E05001880606 +6B68:0100010011F8110011001100FFFE00000100110011F811001100290047FE8000 +6B69:0100010011F8110011001100FFFE0100011011081114212440C003001C00E000 +6B6A:00007FFC0100030005601918610400007FFC0100110011F811001100FFFE0000 +6B6B:080008FE0880088048804EFC488448844884488448FC4E805880E08000FE0000 +6B6C:010011F811001100FFFE010002001FF0101012101110FFFE1210211040508020 +6B6D:10201020102011FC50205C2053FE5008500851FE50085C887048C00800280010 +6B6E:0100010011F811001100FFFE00000810081048904E9C489048904E90F1FE0000 +6B6F:0100010011F811001100FFFE0000292825482FE823882548292820083FF80008 +6B70:00007EFC122452A4932422442A544488081008104E9C489048904E90F1FE0000 +6B71:1008103C11E0102053FE5C2051FC512451FC512451FC5C2071FCC02003FE0000 +6B72:008008FC088008807FFE002800243FFE20202FA422242A182A90512A46469882 +6B73:008008FC088008807FFE002800243FFE20202FA422242B182A9252AA4A468482 +6B74:3FFE221022103FBE261027382AD43292221022502040227C424042409FFE0000 +6B75:102011FE102011FC50205DFE500051FC510451FC51045DFC7104C1FC00880104 +6B76:08442F7828422F3EF0001FF011101FF011101FF001003FF821482FE824282018 +6B77:3FFE2000230C3C7024103F7E24102E3835542492208024F844804480BFFE0000 +6B78:10007DFC44047CFC40047DFC44007FFE122210205DFC512451245D34E1280020 +6B79:0000FFFE02000200040007F8080810102410422001400080010002000C007000 +6B7A:0080008000FE088008800FF8100814102210412001400080010002000C007000 +6B7B:0000FFFC1080108010841E88229022A052C08C800480088408841084207C4000 +6B7C:0008003CFDE0202020203C20442047FE64209420082008201020202040208020 +6B7D:0008001CFDE0210021003D0045FE451065109510091009101110221042108410 +6B7E:00800080FC8020FC21543E5444544494649495240A2408441044208441288010 +6B7F:00800080FCFC210421043E28441047FC65049488088808501020205041888606 +6B80:0008003CFDE0202020203C2045FE442064209450085008501088208841048202 +6B81:000000F8FC88208820883D06460045FC64849484084808501020205040888306 +6B82:000001F8FD08210821083DF845084508650895F8090809081108210847FE8000 +6B83:00200020FC2021FC21243D2445244524652497FE082008501050208841048202 +6B84:00200020FC50208821043E124420444065889410082008441188201040608380 +6B85:00200020FD20212021FC3D2046204420642095FC082008201020202043FE8000 +6B86:0020FC202020204020483C8445FE4482640094FC088408841084208440FC8084 +6B87:00800080FCFE210022F83C104420444065FC9494089409241224244440A88110 +6B88:00200020FC40208021FC3D544554455465549554095409541154215443FE8000 +6B89:0080FE8020FC210421043FF445144514A5F41914091411F41114200440148008 +6B8A:00200120FD2021FC21203E20442047FE647094A808A809241124222240208020 +6B8B:00500048FC40205C21E03C40445E47E064449448083008221052208A43068002 +6B8C:000003FCF800212422483C904A48492468009BFC084010401040204047FE8000 +6B8D:0008003CFDC0200421443CA8440045F8641094200BFE08201020202040A08040 +6B8E:00200020FC2023FE20203C2045244524652496AA082008501050208841048202 +6B8F:00280024FC24202023FE3C20452044B264B4946808A809241222202040A08040 +6B90:00200020FDFE202020203DFC4524452465FC9420087008A81124222240208020 +6B91:0020FC2023FE202020203DFC45044504650495FC08500850109220924112820E +6B92:000000F8FC88208820F83C0045FC450465249524092409241050204840848304 +6B93:00200020FC50205020883D0446FA440064449424092408A81088201043FE8000 +6B94:00200020F9FC202420243BFE4824482469FC9A22097410A81124222240A08040 +6B95:00400020FDFC200021083C90440047FE6400940009FC09041104210441FC8104 +6B96:0020FC2023FE202020203DFC450445FC650495FC090409FC1104210447FE8000 +6B97:00400080FBFC211022483C464BF84A486A489BF80A48124813F820424042803E +6B98:00900088FCBC23C020503C2444D4472C649094BC0BC008481050202440D4830C +6B99:001C03E0FA2023FE22203A924B0A4A0669FC9904090411FC1104210441FC8104 +6B9A:01040088FC5021FC21243D2445FC4524652495FC0820082013FE202040208020 +6B9B:000003FCF808201020203BAE4AA24AAA6AA49AA40BAA103210A0204047FE8000 +6B9C:00480148FD4823FE21483D484578450065FE94200BFE087010A8212446228020 +6B9D:00200020FBFE202021FC38404BFE488869349AE2082011FC107020AC43228020 +6B9E:000001F8F908210821F838004BFC4A046BFC9A040BFC120413FC209041088204 +6B9F:000001F8FD08210821F83D08450845F8640097FC0A940A941294229447FE8000 +6BA0:00200040FDFC210421FC3D0445FC450465FC942808240BFE1050208841048602 +6BA1:00400020FBFE2202241439E04900490069FC9910091017FE1000209041088204 +6BA2:01540154FBFE215421543A724C004BFE6A22982009FC112411242124412C8020 +6BA3:0088FC8823FE208820F83C2045FC452465FC94200BFE082011FC202043FE8000 +6BA4:008000FEFD0022FC20843CFC448444FC640097FE088009FE12522092412A8044 +6BA5:0040FC2023FE220220003DFC442045FC652495FC092409FC1000208841048202 +6BA6:00400080FDFC210421FC3D0445FC450065FE950009FE080212AA22AA4202800C +6BA7:02140112FBD22010203E3BD04A504A506BD099280BA813681528212A452A8246 +6BA8:002001FCFD2421FC20203FFE440045FC650495FC090409FC110421FC40888104 +6BA9:008000DCFA8423D424483A944B244C406A4899500FFC10E0115022484C468040 +6BAA:002003FEF82021FC20003BFE4A0249FC680099FC090411FC1104208843FE8000 +6BAB:000003DEFA52225223DE380049FC492469FC992409FC102013FE202040208020 +6BAC:000001FCFD5421FC20203DFC442047FE6488945009FC082013FE202040208020 +6BAD:000003FEFC0021FC21243DFC452447FE640095FC092409FC112421FC400083FE +6BAE:00200020FC50208821043EFA4400440065DC9554095409DC1088208841548222 +6BAF:00400020FBFE220221FC39484A5049FC6B0499FC090411FC110421FC40888104 +6BB0:002003FEF82021FC20003BFE4A524BFE690499FC090411FC110421FC40888104 +6BB1:0088008CFBEA208820883BFE49484B6A694A9B6A094C136C114A216A47968022 +6BB2:0148014CFAAA200827FE39484B68494A6B6A994C0B6C1148116A239A40268042 +6BB3:00000FE00820082008201020201EC0003FF010100820044003800C603018C006 +6BB4:00007EF840884488648854864900480055FC54846488405040207E5000880306 +6BB5:060038F82088208820883C86210020003DFC208420882C50F020205020882306 +6BB6:1000087800487F480848088608007EFC08440844082808280F10F02840440182 +6BB7:0600387820483E4822483E8622003EFC20443E442228222842104A2884440182 +6BB8:080008787F48084808483E8600003EFC2A442A443E2820282010402840448182 +6BB9:00007F78484848485F486486440044FC7F4444444A285128601040287E440182 +6BBA:040044782848104828484486920010FCFE441044582854289210122850442182 +6BBB:080008787F4808483E4800867F0041FC82443C44242824282510262844448182 +6BBC:080008787F4808483E4800867F0041FCBE4400443C2824282510262844448182 +6BBD:420024781848244852481086FF0020FC3E446244BE2822283E1022282A442582 +6BBE:100010787D4812481448FF86100020FC7E44A24422283E28221022283E442382 +6BBF:00003F78214821483F4820862A002AFC3F442A442A283F2820104A2891442182 +6BC0:2000CE7882488248EE4882868200FEFC10441044FE28102810101E28F0444182 +6BC1:2000CE7882488248EE4882868200FEFC00440044FE28102810101E28F0444182 +6BC2:1000FE7810487C480048FE86820010FC7C44204450287C281010FE2810441182 +6BC3:20001078FE4800487C4844867C0000FCFE448244BA28AA28BA1082288A448582 +6BC4:10007E7810487E4852487E8652007EFC1044FF4410287E28421042287E444382 +6BC5:100008787F4822481448FF86100029FCCE4414442628CD2815102428D4440982 +6BC6:0000FFB880289F28912891469F00807CBBA4AAA4AAA8AAA8BB908028FFC40082 +6BC7:1000673841287728412841467F00087C49242A24FFA81C282A10492888440882 +6BC8:2040CE9C8A94AA94AAD4EE94AAA6AAC0AA9CAA94EE94A8D42B884888489488A2 +6BC9:7F7848485F4C64805F784A4851307F4C00007FFC1110111029284544FFFE0000 +6BCA:0878FF4808863E782A483E3040489FF40200FFFE08203FF8D0161390129013B0 +6BCB:00001FF01110111011101110FFFE21102210221022103FFC0410081010A02040 +6BCC:00001FF011101110111011101110FFFE221022102210221022103FF000100010 +6BCD:00001FF01010121011101110FFFE20102210211021103FFC0010001000A00040 +6BCE:10001FFC200020005FF0911011101110FFFE2210221022103FFC001000A00040 +6BCF:10001FFC200020005FF0901012101110FFFE2010221021103FFC001000A00040 +6BD0:01000100FFFE01003FF800001FF011101110FFFE211022103FFC041008501020 +6BD1:00103E502250325C2A7422D42254FF544254525C4A5042507F420242143E0800 +6BD2:01003FF801001FF001007FFC00001FF012101110FFFE221021103FFC00100060 +6BD3:402040107DFE80207C48448465FE5402FEA844A8A4A894A8FEAA052A29261200 +6BD4:0080208020802084208820903EA020C0208020802080208226823882207E0000 +6BD5:2080208820B03EC0208020842684387C21000100FFFE01000100010001000100 +6BD6:2080208820B03EC0208020842684387C0100009048A4484289820E101810E7F0 +6BD7:001001107D1055125512551455D87D1055105510551055127D524592010E0000 +6BD8:00003FF8210821083FF8210821083FF80000208020843E9820E020842684387C +6BD9:410041187DE041044D0470FC0000FFFE108010883E9042E0148008843084C07C +6BDA:1FC020807FE0A0203FE020883CF420841FFC20407FF0A2103FF005441924E0FC +6BDB:001001F87E000200020003F03E000200020003FCFE00020002040204020401FC +6BDC:08201C207020102010A81CA47124112212221C20F02010A2104210020FFE0000 +6BDD:08041C08703011C010041C08703011C010041C08F03011C2100210020FFE0000 +6BDE:2080208820B03EC020842084267C380000F03F0001F03F0001F87F02010200FE +6BDF:0100111011082124414401800E00F00000F03F0001F03F0001F87F02010200FE +6BE0:080008007F7C094411441144257C420000F03F0001F03F0001F87F02010200FE +6BE1:08401C407040107C10401C40704011F811081D08F10811FA110A10020FFE0000 +6BE2:10003BF8E0A020A023F83AA8E2A822A822B83B08E20823F8220A200220021FFE +6BE3:00007EFC22441224060C1A3462C4000000F03F0001F03F0001F87F02010200FE +6BE4:281824E04220923810E02020443CFEE002222422241E24002402440243FE8000 +6BE5:11003900E1FC220424043BE4E22423E422243A24E3E42004202A201220021FFE +6BE6:0008FF1C44E0442044207C3C44E044207C20443C44E04F22F4220422041E0400 +6BE7:10503848E0402FFC20403A48E2482F5022503A20E2282468289A210A20021FFE +6BE8:08201CA070FC112010201DFE7050105010901C92F112120E100010020FFE0000 +6BE9:08201C20712410A410A81C2073FE102010701CA8F1241222102010020FFE0000 +6BEA:10403840E090210823FC3824E12021FC21203A20E7FE20202022202220221FFE +6BEB:01007FFC00001FF010101FF000007FFE400281F43E0003F03E0003FA7E0201FE +6BEC:08201C28702413FE10201D2470A8107010A81D24F22210A0104010020FFE0000 +6BED:0008FF1C00E000207E20423C42E042207E20003C42E0222224220F22F01E4000 +6BEE:1020102011241122FA2A101014601B80303CD3C0107C13C0107C17C25042203E +6BEF:10403A44E244244820A03910E608204420403A48E248245020A22112220A1FFE +6BF0:08401C2071FC100010881C5073FE100010F81C88F088108A10FA10020FFE0000 +6BF1:11003900E1FC220424843C94E2A427FC208439C4E2A4249420AA209220021FFE +6BF2:0004F70E117055102210551C897010100010F71E11705510221255128912100E +6BF3:01F03E0003F03E0003FA7E0201FE0000183071C01C7871C01C7871C41444183C +6BF4:10903890E090279E20903890E39C209020903890E79E20902092209220021FFE +6BF5:0808101C24E07E201020FF3C24E042208920303CC4E008223222C422381EC000 +6BF6:08401C8871FC102413FE1C88713412C210181CE0F00C103011C010020FFE0000 +6BF7:00047F0E41705D1041105D1C417000103E10221E3E7022103E1222123E12220E +6BF8:08001DFC712411FC11241DFC7020101411521D42F248103A100210020FFE0000 +6BF9:0804140E22704110BE90001C78F04A904A907A9E4AF04A907A9248924A92590E +6BFA:10203850E088210426FA3800E3C4225423D43A54E3D42244225622CA20021FFE +6BFB:1008101CFEE020207E20883C7EE000207E20423C7EE042227E2242224A1E4400 +6BFC:00087E1C42E07E2042207E3C20E07F209120513C69E041227D2201220A1E0400 +6BFD:10103810E77C211422FE3A14E77C2110217C3910E6FE2210251228FE20021FFE +6BFE:00047F0E41707F1041107F1C0070F7901090949E52F03190D69210925292210E +6BFF:1004220E7F7042109490F79C08703610C910309EC470191062120C123012C00E +6C00:08047F0E4970FF9049107F1C08707F1049107F1E1070FF10211272120C12F30E +6C01:11103910E7FC211023F83A08E3F8220823F83840E7FC20A02112220A20021FFE +6C02:08203E7E08A47F281C102A2849443FFE200020782F8020F0278040FA4F82807E +6C03:1004080E7F702210FF10001C7F7049107F10491E7F7008107F1208120F12F00E +6C04:7E04140E0870FF1029104A1CA87010107F10551E63705D1055125D124112430E +6C05:082049202A3E7F4841A85D2855105D2842F63F0001F03F0001F87F02010200FE +6C06:11083890E3FC209022943998E09027FE200039F8E10821F8210A21FA20021FFE +6C07:11003BF0E4102BF822483BF8E24827FC20003BF8E20823F8220A23FA20021FFE +6C08:1008FE1C00E0FE208220BA3CAAE0FE2000207C3C44E07C2244227C22001EFE00 +6C09:00047F0E41707F100010F79C94F0F7900810081EFF701C102A1249128892080E +6C0A:10203BFEE00023FC22043AF4E29423FC210839F8E10821F8200227FE20021FFE +6C0B:2404FF0E2470FF1081107E1C0070FF101010289ED5702E10D5122492D412080E +6C0C:108039F8E20825FC212439FCE12421FC21543AFAE08820F8208A20FA20021FFE +6C0D:7704550E777055107710551C777022107F90A41E3F7024103F1224123F92200E +6C0E:3F84248E3FF024907FD0555C7FF055507FD0041E7FF048501F122A1204127FCE +6C0F:001000F83F802080208020803FFE208020802040204020222012280A30062002 +6C10:001000F83F802080208020803FFE208020802040204020222112288A30462042 +6C11:00003FF82008200820083FF8208020803FFC20802040204024242814300C2004 +6C12:00F03F00210021003FFC2080204028243114210C0100FFFE0100010001000100 +6C13:200013FC12040204FA0443FC4220422043FE4220422042107A12028A03060202 +6C14:100010003FFC20004FF080003FF000100010001000100010000A000A00060002 +6C15:100010003FFC20004FF080003FF000100410041004100410080A080A10062002 +6C16:100010003FFC20004FF080003FF000103F101110121017D0204A204A42868102 +6C17:100010003FFC20004FF080003FF00010009030900D100210050A188A60460002 +6C18:100010003FFC20004FF080003FF000100010111011101110210A210A41068102 +6C19:100010003FFC20004FF080003FF000100410041044504450444A7FCA00460002 +6C1A:100010003FFC20004FF080003FF000102490249024902490248A448A44868082 +6C1B:20003FFC40009FF000007FF00010121021104090BF501112110A110A25064202 +6C1C:20003FFC40009FF000007FF000103F90209020903F902092208A208A3F862082 +6C1D:100010003FFC20004FF080003FF0041004107FD044504A50514A604A41464082 +6C1E:20003FFC40009FF000007FF000107FD004107FD044504A52514A604A41464082 +6C1F:20003FFC40009FF000007FF012107F9012907F9052107FD2124A134A22864202 +6C20:20003FFC40009FF000007FF0041004107FD044507FD044527FCA444A04060402 +6C21:20003FFC40009FF000007FF010101F90209051100E103192CC6A030A1C060302 +6C22:20003FFC40009FF000007FF000103FD003100CD070301FD2020A020A7FF60002 +6C23:100010003FFC20004FF080003FF00410249015107FD00E10150A248A44460402 +6C24:20003FFC40009FF000007FF000107FD0445044505F5044524A4A514A7FC64042 +6C25:20003FFC40009FF000007FF000107FD00A103F902A902A92338A208A3F862082 +6C26:20003FFC40009FF000007FF004107FD0081011103E100492190A620A0D063082 +6C27:20003FFC40009FF000007FF011100A107FD004103F900412FFEA040A04060402 +6C28:20003FFC40009FF000007FF004107FD040500810FFD01112320A0C0A1B066082 +6C29:20003FFC40009FF000007FF000107F901210125092905312520A120AFFC60002 +6C2A:20003FFC40009FF000007FF004107FD004103F9020903F920A0A124A224641C2 +6C2B:20003FFC40009FF000007FF000107FD02490491024907FD2040A040AFFE60002 +6C2C:20003FFC40009FF000007FF00010FFD01210739040904092738A120A1206FFE2 +6C2D:20003FFC40009FF000007FF004107FD004103F9024903F92248A3F8A15062482 +6C2E:20003FFC40009FF000007FF0041024900B10109060500412248A0B0A10866042 +6C2F:20003FFC40009FF000007FF000107F9000903F900090FFF2248A150A24864C42 +6C30:20003FFC40009FF000007FF004107FD004103F900410FFF2208A3F8A20862182 +6C31:20003FFC40009FF000007FF010901F9010903FF010103FD24A4A124A25460882 +6C32:20003FFC40009FF000007FF000103F9020903F9020903F92000A7FCA4A46FFE2 +6C33:20003FFC40009FF000007FF000103F9024902A903F9000127FCA4A4A4A46FFE2 +6C34:010001000100010801087D9005A0094009401120111021084106810005000200 +6C35:0000200010001000800040004800080010001000E00020002000200020000000 +6C36:00003FF000200040008401087D9005A005400940092011102108C10605000200 +6C37:0100010011000908090801907DA005400940092011102108C106010005000200 +6C38:0200010000801F00010401087D9005A005400940092011102108C10605000200 +6C39:00400040F84008440F480950116012502248244448444140408240023FFE0000 +6C3A:01000100010041082108111011200180054009201110E1084104010005000200 +6C3B:008020801080108087FC40844884088410841084E10421042104220422280410 +6C3C:010001047D880550092011102108C5060200010001000280044008203018C006 +6C3D:01000280044008203118C10601003D8405880950092011102108C10605000200 +6C3E:000023F812081208820842084A080A0812501220E20022022202220221FE0000 +6C3F:010021001100110087F041104910091011101110E110221222122412280E1000 +6C40:0000200013FE1020802040204820082010201020E02020202020202020A00040 +6C41:00402040104010408040404047FE104010402040E04020402040204020400040 +6C42:0120011001007FFC01002108111009A003400520091011086106010005000200 +6C43:0000202011201120812041204920092011201110E11022102208240828041002 +6C44:0040204010401040804040404840084010A010A0E0A021102110220824040802 +6C45:000027FE10801080810041004A000BF810081008E00820082008200820500020 +6C46:0600010002800C603118C10601003D8405880950092011102108C10605000200 +6C47:000023FE12001200820042004A000A0012001200E20022002200220023FE0000 +6C48:000027FC10041004800440144824084410841104E60420042004200420280010 +6C49:000027F812081208820841104910091010A010A0E040204020A0211022080C06 +6C4A:000027F812081288824841504910091010A010A0E040204020A0211022080C06 +6C4B:00802080110011FC820442045404190410842044E04420042004200420280010 +6C4C:0204224412441244824442444244124412442244E24422442244244424040804 +6C4D:008020801080108087F0409048900A9011901090E1502152220A220A24060802 +6C4E:000023F012101210821043105290125012502210E210221224122412280E1000 +6C4F:0040204010401040804047FE4840084010A010A0E0A021102110220824040802 +6C50:00802080108010FC810441044284144810282010E01020202040208021000600 +6C51:0010207813C01040804040404840087E17C01040E040204220422042203E0000 +6C52:004020201020100087FE41004900090011001100E10021002100210021FC0000 +6C53:000023F8100810108020404048400FFE10401040E04020402040204021400080 +6C54:00802080110011FE8200440041F8100810102060E08021002202220221FE0000 +6C55:0040204010401040844444444444144414442444E4442444244427FC20040000 +6C56:010001002108210821083FF80000010001047D880550092011102108C5060200 +6C57:0000200013FC1040804040404840084017FE1040E04020402040204020400040 +6C58:0010207813C010408040404048400FFE10401040E04020402040204020400040 +6C59:000021FC102010208020402048200BFE10201020E02020202020202020A00040 +6C5A:000023F810401040804047FE48800880110011F8E00820082008200820500020 +6C5B:000027F01110111081104110411017D011102110E1102112210A210A21060102 +6C5C:000023F812081208820842084A080BF812001200E20022022202220221FE0000 +6C5D:00802080108010808FFE41084108120812102610E1A0204020A0211022080C04 +6C5E:00003FF8010001000100FFFE0000010001047D880550092011102108C5060200 +6C5F:0000200017FC1040804040404840084010401040E040204020402FFE20000000 +6C60:0040204012401258826842C853481E4812482248E25822422202220221FE0000 +6C61:000023F810001000800047FE40801080110021F8E00820082008200820500020 +6C62:00402040104010408040404047FC104010402040E0402040204020402FFE0000 +6C63:00802080108010F88108410849100A1010201020E05020502088210822040402 +6C64:000023F0102010408080410043FC112411242124E22422442444288421280210 +6C65:00402040104017FE80404040404017FC12042208E11020A0204020A023180C06 +6C66:0008203C13E01220822042204A200BFE12201210E2102212220A228A23060202 +6C67:000027FC111011108110411049100FFE11101110E11021102110211022100410 +6C68:000023FC12041204820442044A040BFC12041204E2042204220423FC22040000 +6C69:0000200017FC140484044404440417F414042404E4042404240427FC24040000 +6C6A:000027FC1040104080404040404013FC10402040E0402040204020402FFE0000 +6C6B:011021101110111087FC41104110111011102FFEE11021102110221022100410 +6C6C:082008207FFC08200820FFFE10202020412001047D88095011202118C5060200 +6C6D:002020201020102083FE42224A220A221252124AE28A230222022202220A0204 +6C6E:0100410021FC2204020485044884408410142024E04423842104200420280010 +6C6F:0080408020802FFE008080804120512011202240E2402488248829FC20840004 +6C70:004020401040104087FE4040484008A010A010A0E11021102288224824440802 +6C71:0040205010481048804047FE4840084010A010A0E0A021102110220824040802 +6C72:000027F81108111081104120493C090411041288E28822502420245028880306 +6C73:0008203C13C01200820042004BF80A8812881288E25022502220245024880906 +6C74:008020401040100087FE4080488008C010A01090E08820882080208020800080 +6C75:0040204010A010A0811042884C460840100013F8E00820102010202020200040 +6C76:00802040104017FC8110411049100910111010A0E0A0204020A0211022080C06 +6C77:008020801080108081F841084A080D10111010A0E0A0204020A0211022080406 +6C78:00802040104017FE81004100490009F811081108E10821082208220824500820 +6C79:0000200811081088825242524A220A2212521292E30A220A220223FE20020000 +6C7A:00802080108017F8808840884888088817FE1080E14021402220241028081006 +6C7B:00802080108011FC812041204A200820102017FEE02020202020202020200020 +6C7C:002020201120112081FC422042201420102027FEE02020202020202020200020 +6C7D:0100210011FC1200840041F84800080013F81008E0082008200A200A20060002 +6C7E:001021101110120882084404580213F811082108E10821082208220824500820 +6C7F:000023F81008111080A0404047FE104210442040E04020402040204021400080 +6C80:0800087C080409280910EA082CFE2A1229144910489088900810081028501020 +6C81:0000208010401020812041004100150415022502E50229082108210820F80000 +6C82:0008203C13C012008200420043FE121012102210E21022102210241024100810 +6C83:0010207817C0104080404040404017FE104020A0E0A021102110220824040802 +6C84:0000200013FC10008000400047FE104010402080E0802108220427FE22020000 +6C85:0000200013F810008000400047FC112011202120E120212022222222241E0800 +6C86:00802040104017FC8000400049F0091011101110E110211222122212240E0800 +6C87:0080208011001110820847FC4004112011202120E120212022222222241E0800 +6C88:00402040104017FE84444848404010A010A020A0E120212022222222241E0800 +6C89:0000200013FE12028404400041F0111011102110E110211222122212240E0800 +6C8A:1020102010207E2453A894B010A8112429222A222C2028A22842480247FE8000 +6C8B:009020881088108087FE40A048A008A010A010A0E120212221222222221E0400 +6C8C:00402040104017FC804042484A480A48124813F8E048204020422042203E0000 +6C8D:000027FE10801080808040F84908090811081208E3F820102010201027FE0000 +6C8E:01202120112012248224462856301A20126022A0E220222222222222221E0200 +6C8F:0000220012FC12248224422453A41E2412242224E2A423242244204420940108 +6C90:004020401040104087FE404048E008E011501150E24824442842204020400040 +6C91:000023F8108810888088408848880BF811081108E1082108210821082FFE0000 +6C92:0080208010FC11048104422848100BFC11041088E08820502020205021880606 +6C93:010001087D1005A009603118C50602001FF0101010101FF0101010101FF01010 +6C94:000027FE104010408240427C4A440A44124413FCE00420042004200420280010 +6C95:01002100110011FC82A444A440A4112411242244E44420842104220424280010 +6C96:004020401040104087FC44444444144414442444E7FC24442040204020400040 +6C97:00003FF801000100FFFE028004401830E10E11100B2005C01930610805000200 +6C98:0020222012201222822242244BA80A3012201220E220222222A22322221E0000 +6C99:0040204010401148814442424242144810482048E01020102020204021800600 +6C9A:0040204010401040824042404A7C0A4012401240E2402240224022402FFE0000 +6C9B:0040404020402FFE0040804047FC544414442444E44424542448204020400040 +6C9C:0010221012101210821043FE4A000A00120013F8E20822082208240824080808 +6C9D:0820082008200A200A32EDB228B42CA82AA82AA8492449248A22082028A01040 +6C9E:00004FFE20402040004087FC4444544414442444E44424542448204020400040 +6C9F:01002100110011FC820444844084110411442224E7F422142004200420280010 +6CA0:0008203C17D01490849044904490149014902488E48824882484288428821000 +6CA1:000021F01110111081104210540E180013F82208E108211020A0204021B00E0E +6CA2:000021FC110411048104410449FC092411201120E11021102208220824040802 +6CA3:00202020102013FE80204020482009FC10201020E02027FE2020202020200020 +6CA4:000023FC12001208828842504A500A2012201250E25022882308220023FE0000 +6CA5:000023FE12001220822042204AFC0A2412241224E24422442484248429281210 +6CA6:0040204010A010A0811042084406111011202140E18021002104210420FC0000 +6CA7:0040404020A02110020884044BF2421012102210E25022202204220421FC0000 +6CA8:000023F812081208832842A84AA80A48124812A8E2A8232A240A240A28061002 +6CA9:0040224011401140804047FC40441044108420A4E09421142104220424280810 +6CAA:00802040104013FC82044204420413FC12042200E20022002400240028001000 +6CAB:00402040104017FE8040404048400BFC104010E0E15022482446284020400040 +6CAC:00402040104013FC8040404048400FFE10E01150E15022482444284220400040 +6CAD:004020501048104087FC404040E010E011502150E24824442842204020400040 +6CAE:000023F812081208820843F84A080A08120813F8E2082208220822082FFE0000 +6CAF:010001087D1005A009603118C50602007FFC040008001FF82808C8080FF80808 +6CB0:0000200017FE104080404080488009F813081508E90821082108210821F80108 +6CB1:00802040104017FC840448084200121012202240E38022042204220421FC0000 +6CB2:0100210013FC120084404840427812C813482E48E248225A2242220221FE0000 +6CB3:0000200017FE1008800843C84248124812482248E3C822482008200820280010 +6CB4:0040204010A01110820844264040108013102020E04020882310202020C00700 +6CB5:00802080108011FE810242045420102011282124E22422222422202020A00040 +6CB6:000023FC10001000800040004FFE104010402248E24424442442284221400080 +6CB7:009020881088108087FE4080490009FC11441244E24824502420285020880306 +6CB8:01202120112017F88128412847F81520152027FCE12421242234222824200820 +6CB9:004020401040104087FC444444441444144427FCE44424442444244427FC0404 +6CBA:000027FC1444144484444444444417FC14442444E4442444244427FC24040000 +6CBB:0040204010801110820847FC4004100013F82208E20822082208220823F80208 +6CBC:000027FC108410848084410441141208140023FCE20422042204220423FC0204 +6CBD:004020401040104087FE40404840084013F81208E20822082208220823F80208 +6CBE:004020401040107E804040404840084013FC1204E20422042204220423FC0204 +6CBF:000021F01110111081104110420E1400100023F8E20822082208220823F80208 +6CC0:000023FC1004100487F4400448040BE412241224E22423E42004200420140008 +6CC1:000027F8140814088408440847F8112011202120E120222022222422281E1000 +6CC2:000023FC12041204820442F44A940A9412941294E2F422942204220422140208 +6CC3:01002100120013FC8404480443E4122412242224E22423E42224200420280010 +6CC4:004822481248124882484FFE4248124812482248E27822002200220023FE0000 +6CC5:000027FC140414448444444444441444144424A4E49425142604240427FC0404 +6CC6:004020401240124083FC42404440104017FE2040E0A020A02110220824040802 +6CC7:020022001200121E87D242524A520A5212521252E25222522452245E29521080 +6CC8:0080208010F81108831044A0404010A013182C06E0C020202010218020600010 +6CC9:010002001FF0101010101FF0101010101FF001047D88095011202118C5060200 +6CCA:00402040108013FC820442044A040A0413FC1204E20422042204220423FC0204 +6CCB:00402040104017FC804040404150111011102FFEE11021102210221024100810 +6CCC:0000208010401028812841084110151415222522E54229882108230824F80800 +6CCD:004020401040104087FC404048E008E011501150E24825F42842204020400040 +6CCE:01002100110011FE82804280448010F810802080E08020FC2080208020800080 +6CCF:0040204012481248824842484BF8084810401040E44424442444244427FC0004 +6CD0:0010479024902510057E86124512549214922492E692251224222422244A0484 +6CD1:0220422022202420057C89244E24422414242424E9242F242144204420940108 +6CD2:0008203C13D01290829042904A900A9012901288E28822C822A424D424920800 +6CD3:0008278810881088808847884408141014102790E09420A420A220BE25020200 +6CD4:010821081108110887FE410841081108110821F8E10821082108210821F80108 +6CD5:004020401040104087FC4040404010401FFE2040E0802100221024082FFC0404 +6CD6:00002100163C14A484A444A444A414A414A425A4E6B424A82120212022200420 +6CD7:0000200017FC14A484A444A444A414A414A42524E51C26042404240427FC0404 +6CD8:0010207817C01040844442444248104017FE2040E04020402040204021400080 +6CD9:000023F810401040824841484950084017FE1040E04020402040204020400040 +6CDA:0120212011201524852445E84530152015202520E520252225E22E22241E0000 +6CDB:00102078178010008080404047F8101010202040E08021002200250028FC0000 +6CDC:0008203C13E01220822042204A200BFE12201210E2102212220A228A23260212 +6CDD:0008203C13C01200820042004BFE0A1012101270E21022182214241024100810 +6CDE:00802040104017FC840448084000100017FC2040E04020402040204021400080 +6CDF:000027FC10401040804040404A400A7812401240E2402240224022402FFE0000 +6CE0:0040204010A010A0811042484426102013F82008E010211020A0204020200020 +6CE1:0100210011FC1204820447E44A241224122423E4E21422082202220221FE0000 +6CE2:00202020102013FE822242244A200BFC12841288E24822502220245024880906 +6CE3:008020401040100087FC40004008120812082110E1102110212020202FFE0000 +6CE4:0008210810881448844844084408140814102410E41025282624244420820102 +6CE5:000023FC12041204820443FC4A000A4012441248E270224024422442283E1000 +6CE6:000023FC1204120483FC42404A400A4013F81248E24822482488248A290A0206 +6CE7:002820241024102083FE42204A240A2412241228E22822902312222A20460082 +6CE8:00802040100017FC804040404040104013FC2040E0402040204020402FFE0000 +6CE9:004022401240124083FC444054401840104023FCE0402040204020402FFE0000 +6CEA:000023FC12041204820443FC4A040A04120413FCE20422042204220423FC0204 +6CEB:00802040104017FE804040804108121017E02040E0802108220427FE22020000 +6CEC:00402020102013FE820244044000109010902090E08821082108210422040402 +6CED:010821081108120882FE46084A08120812882248E24822082208220822280210 +6CEE:0040204012481148815040404BF8084010401040E7FC20402040204020400040 +6CEF:000023FC12041204820443FC4A200A2013FE1220E22022102212228A23060202 +6CF0:010001007FFC01003FF80200FFFE044009203118CB2605C01930610805000200 +6CF1:00402040104013F8824842484A480A48124817FEE04020A020A0211022080406 +6CF2:00402040105C13E0824042404A400BFC104410C4E14422542C48204020400040 +6CF3:00802040102013C0804440444F48115011602160E25024482844304221400080 +6CF4:010001087D1005A009603118C506020000003FF82448244824482448FFFE0000 +6CF5:0000FFFE040008001FF02810C8100FF0010001047D88095011202118C5060200 +6CF6:22081108111000207FFE40028004010001047D880550092011102108C5060200 +6CF7:012021101110110087FE41404940094811481250E2502262244224C2293E1000 +6CF8:00402040107E1040804043FC4A040A04120413FCE20422002200240024000800 +6CF9:000023F812081208820842084BF80A0812081208E20823F8200020002FFE0000 +6CFA:0008203C17C0140084404440444017FE10402040E24822442442284221400080 +6CFB:000027FE14021904810041FC49000A0013FC1004E00427F42004200420280010 +6CFC:004020481244124083FE4080488008FC11441144E14822502220245028880306 +6CFD:000027F81208111080A0404041B0164E104023F8E040204027FC204020400040 +6CFE:000027F8101010208060409841041602100023FCE04020402040204027FE0000 +6CFF:000023F81208120883F842084A080BF812441248E23022202210228823060200 +6D00:0080210013F812088288424842481FFE12082288E24822482208220824280810 +6D01:0040404020402FFE0040804047FC5000100023F8E20822082208220823F80208 +6D02:00402020102017FE8090409048900A9412921292E49220902110211022500420 +6D03:00802080108017FE810041204A200AA414A41528EA5020502088210822040402 +6D04:000027FE1402140284F244924492149214922492E4F224922402240227FE0402 +6D05:000027FC1040104083F842484A480BF812481248EFFE22082208220822280210 +6D06:000023F810101020804447644168115012502248E4442942208020002FFE0000 +6D07:000027FC140414448444444447FC1444144424A4E49425142604240427FC0404 +6D08:0100210013F8120884104BFE420012F812882288E2A8229022822482247E0800 +6D09:0008203C13C01200820043FE4A000A00120012FCE28422842484248428FC0084 +6D0A:00402040104017FE80804080497C090813101510E1FE21102110211021500120 +6D0B:020821081110100087FC4040404013F810402040E7FE20402040204020400040 +6D0C:000240022FC22212021283D24252545216522552E892209221022202240A0804 +6D0D:000027FE14201420842044F84488148814882488E4F824202420242027FE0000 +6D0E:0040208013FC1204820442044BFC0A0412041204E3FC22042204220423FC0204 +6D0F:00002FFE10401040808047FC44A414A414A424A4E4A424A424A4248424140408 +6D10:00802080113C120084804080497E0B0815081108E10821082108210821280110 +6D11:0120412821242224022086204AFC422012202250E25022502288228823040202 +6D12:00002FFE10A010A087FC44A444A414A414A424A4E51C26042404240427FC0404 +6D13:0040204017FC1040804043F84A480A4812481258E0E0215022482C4620400040 +6D14:00402040104013FC8040404047FE1010101027FEE01022102110211020500020 +6D15:001021101108120884044BFA4208120813F82208E20823F82208220822280210 +6D16:000023F81208120883F84000400017FC10402040EFFE204020A0211022080C06 +6D17:00402240124013FC84404840404017FE11202120E120212022222222241E0800 +6D18:0080208813E8109080A047FE4880090013FC1480E90021F82008200820500020 +6D19:00402240124013FC84404040404017FE10E02150E15022482444284220400040 +6D1A:0100210011F8131084A0404051B0164E104023FCE040244027FE204020400040 +6D1B:0080208011F81208851040A0404010A013182C06E3F822082208220823F80208 +6D1C:08001FF0282007C01830E00E1FF010101FF001047D88095011202118C5060200 +6D1D:00802040104017FC84044888408017FC11102110E21021A0204020A021100608 +6D1E:000027FC1404140485F44404440415F415142514E51425F42404240424140408 +6D1F:0040204017FE104087FC404443FC1240144027FEE04220AA20A4211022080C06 +6D20:004020401090110883FC40244920092011FC1220E02027FE2020202020200020 +6D21:0040204017FC1040804043F84840084017FE10E0E15021502248244428420040 +6D22:0100217C11241224822446FE4A2412241224227CE22422202220222022400280 +6D23:00402040124811488150404047FE104010E02150E15022482444284220400040 +6D24:0040204010A011108208440643F8104010402040E3F820402040204027FE0000 +6D25:0040204013F8104887FE40484BF80840104013F8E040204027FC204020400040 +6D26:000027FE10201020804043FC4A040A04120413FCE20422042204220423FC0204 +6D27:0040204017FE1080810041FC4304150419FC2104E10421FC2104210421140108 +6D28:00802040104017FC800041104208140411102110E0A0204020A0211022080C06 +6D29:00402040104017FC8444444447FC1444144427FCE02820122032204A21860E02 +6D2A:011021101110111087FC41104110111011102FFEE00021102108220824040804 +6D2B:004020401080110083FC42944A940A9412941294E2942294229422942FFE0000 +6D2C:000027F81408140887F84488448814E815282528E6A8244A244A288A29061202 +6D2D:000023FE1200120083FC42204A200AF812201220E22023FC2200220023FE0000 +6D2E:0090209010901492829440984090119812942492E0902090211221122212040E +6D2F:080008007F7C08243E2408447F540888090001047D88095011202118C5060200 +6D30:000023FE12001200820043FC4A040A0412041204E3FC22002200220023FE0000 +6D31:000027FC1208120883F84208420813F812082208E20E23F82E08200820080008 +6D32:01042124112411248124412445B4156C19242124E12421242124222422040404 +6D33:010021001100111E87D242524252125212522492E29221122292225E24520800 +6D34:020821081110100087FC41104110111011102FFEE11021102210221024100810 +6D35:00802080110011FC8204440443E41224122423E4E224222423E4200420280010 +6D36:02002200120013FC840444044A24114414942554E634241427F4200420280010 +6D37:000027FE104010808110420847FC104410402040E7FC2040204020402FFE0000 +6D38:008020881488129082A040804FFC112011202120E120212422242224241C0800 +6D39:000027FC1000100083F84208420813F812082208E3F82208200020002FFE0000 +6D3A:0080208010FC1104828844504020104011FC2304ED0421042104210421FC0104 +6D3B:0010207813C01040804047FE40401040104023F8E20822082208220823F80208 +6D3C:0040204013F810408040404047FC100010402040E3F820402040204027FC0000 +6D3D:0040204010A011108208440643F81000100023F8E20822082208220823F80208 +6D3E:0008203C17C01400841C45E04520152215242528E51025102508294429821100 +6D3F:0040204017FC10A0811042084DF6100017FC2080E10023F82008200820500020 +6D40:005020501050105083FE42524A520A52125213FEE25222522252225223FE0202 +6D41:0080204017FE10808110420847FC100410002248E24822482248224A244A0846 +6D42:020821081110100083FC40404840084017FE1040E04020A020A0211022080406 +6D43:00402040104017FC80404248515010401FFE20A0E0A021102110220824040802 +6D44:0100210013F0121084204BFC4044104417FE2044E04423FC2044204021400080 +6D45:00A02090108010B887C0408040BC17C010882090E060204420A42114260C0004 +6D46:0840484028FC09041A8828504860898001047D880550092011102108C5060200 +6D47:0080208010BC13C08050402448D40B0C100017FEE090209021122112220E0400 +6D48:00402040107E1040804043F84A080A4812481248E248224820A0211022080404 +6D49:010021FE11101510857C45544554155415542554E5542154225C221024100810 +6D4A:00402040104017FC844444444444144417FC2444E040204820442FFE24020000 +6D4B:000427C414441454855445544554155415542554E55421042284224424140808 +6D4C:01202128112412248220463E4BE0122412242228E22822102212222A22460282 +6D4D:0040204010A011108208440641F01000100027FCE04020802110220827FC0204 +6D4E:0080204017FE1208811040A0404011B0160E2110E11021102110221022100410 +6D4F:0204410421042FE4009484944294529411142114E29422942444284430140008 +6D50:0040202013FC1000810840904BFE0A0012001200E20022002200240024000800 +6D51:000023FE12021444804043FC488008A0112011FCE020202027FE202020200020 +6D52:004044402240227C005080904E10521012FE2210E21022902310221020100010 +6D53:00402040104017FC848448884140114413482530E92021102108214421820100 +6D54:000027F81008100883F84008400817F810102010EFFE22102110211020500020 +6D55:000023F81208120883F842204A200A10120814C6E420280021C0203020080000 +6D56:0010207817801088844842504200102017FC2020E22021202120202020A00040 +6D57:005020481048104087FE40404A440964116810D0E15022482444204221400080 +6D58:000023FC1204120483FC42004A180AE0123812E0E23C23E022222422241E0800 +6D59:0208421C226022400FC08240427E52C813482E48E2482248224822482A880508 +6D5A:008020801110120887FC400441101288148421F0E31024A0204020A023100C0C +6D5B:0040204010A011108288444641F0101010202040E3F822082208220823F80208 +6D5C:0010203813C01200820043FC4220122012202220EFFE20002120221024080804 +6D5D:01102108110017FE814841504964094811501264E24822522462244229BE1000 +6D5E:000023F8120812088208420843F8104010402240E27C22402240254028FE1000 +6D5F:0210221012101420853E4D444DA4152415282528E51025102428242824440482 +6D60:0208211010E01110820840804FFE1140124027FCEA4422442254224820400040 +6D61:0040204013FC1040804047FE5402180411F02010E0202FFE2040204021400080 +6D62:000027FC1000100083F842084A080A08120813F8E0002208210821102FFE0000 +6D63:0080204017FC1404880843F04000100017FC2120E120212022242224241C0800 +6D64:0040202013FE1202844440404BFE084010901090E11021202224224224FE0842 +6D65:000023F81208120883F8400047FC144414442444E7FC24002402240223FE0000 +6D66:004840442FFE2040004087FC4444544417FC2444E44427FC2444244424540408 +6D67:000023F812081208820843F84800080017FC1040E04023F8204020402FFE0000 +6D68:0080204017FE140288444040404017FC10E02150E15022482444284220400040 +6D69:00402240124013FC84404840404017FE10002000E3F822082208220823F80208 +6D6A:0080204013F81208820843F84A080A0813F81240E24422282210228823060200 +6D6B:000047FE240229140208840443F8504010402040E7FC20402040204020400040 +6D6C:000027FC1444144487FC4444444417FC10402040E7FC2040204020402FFE0000 +6D6D:00002FFE104017FC8444444447FC1444144427FCE24021402080214022300C0E +6D6E:0008203C13C010048244412848000BF810101020E7FE20202020202020A00040 +6D6F:000027FC1040104083F84088408817FE10002000E3F822082208220823F80208 +6D70:008421C417041114811441144FD4111413142394E55425042904210421140108 +6D71:000023FC1200120082F842004A000BFC12A012A4E2A822902290248824A408C2 +6D72:010021F813081490806041984646104013F82040E3F8204027FC204020400040 +6D73:0088208410BE17C08032400E48000BFC120413FCE20423FC2204220422140208 +6D74:0110210812041444804040A041101208140623F8E20822082208220823F80208 +6D75:000227821484148886904582448214841FC82490E482248224842488289011A0 +6D76:0040202013FE12028424412049FC092012201020E7FE20202020202020200020 +6D77:0100210011FC120085F841084948092817FE1108E248222823FC200820500020 +6D78:000023F8100811F8800843F8400017FC140423F0E110211020A0204021B0060E +6D79:00402040104017FE8040424842481248155428A2E0A021102110220824040802 +6D7A:010821081108113E81AA456A452A152A192A213EE12A21082108210821080108 +6D7B:000027FC140414A48514460C540415F415142514E51425F42514240424140408 +6D7C:0100210011F01210822047FC4A441244124423FCE2A420A0212022222422081E +6D7D:0008203C13C01044822441284900084013FE1088E10823902060205021880604 +6D7E:0040204013FC10408040404047FE109012942292E49229122110221024500820 +6D7F:000023FC1204120483FC42044A040BFC12041204E3FC20002110210822040404 +6D80:000023F81208120883F84208420813F812082208E3F82120212022222422181E +6D81:01022102110411088FD041024302138415482550E90221022104210821100160 +6D82:0040204010A01110820845F64040104017FC2040E25022482444284421400080 +6D83:000027FC14441444844447FC444414C414E42554E64424442444240427FC0404 +6D84:0040204017FC144487FC444447FC10001FFE2100E20023FC2004200420280010 +6D85:000027FC1404140487FC4404440417FC10402040E7FC2040204020402FFE0000 +6D86:0000203E1788148884884488448817BE14882488E48824882788248820080008 +6D87:000023FC100011248248449052481124100023FCE04020402040204027FE0000 +6D88:0040224811481150804043F84A080A0813F81208E20823F82208220822280210 +6D89:002020201120113C8120412047FE100010202124E12422282410202020C00700 +6D8A:000023FC10441144814442844894090812401020E0A42282228A228A24780000 +6D8B:0040202013FE1202840440504048104017FE2040E0A020A02110211022080406 +6D8C:000027F8101011A0804047FC4444144417FC2444E44427FC2444244424540408 +6D8D:0040204413F41048804847FE4020104013F82110E22025FE2820202020A00040 +6D8E:0008201C1770111081104250425C175011502550E550227C2200250028FE1000 +6D8F:0000200C1770111081104210427C171011102510E510227C2200250028FE1000 +6D90:012043A82E24222402209FFE4220522412A42328E2282E102232224A2A860402 +6D91:004040402FFE2040004087FC4444544417FC2040E0E0215022482C4620400040 +6D92:000023F81088108887FE408848880BF811001100E3F825082908210821F80108 +6D93:000021F81108110881F840004BFC0A04120413FCE204220423FC220422140208 +6D94:004022481248124883F8404048A0091012881446E04023F02010202020200040 +6D95:02102110112017F88048404847F81440144027FCE0C421442254244828400040 +6D96:012021101110120082FE460056041A8412842248E24822482250221022FE0200 +6D97:0010209010881108820445FA41081108110821F8E0902090209021122212040E +6D98:004020801110120887FC4104410013F814402040EFFE204020A0211022080C06 +6D99:0040202013FC1204820443FC4A000A20122013FEE22022502250248825040A02 +6D9A:020821081110102083F842084A080A0813F810A0E0A0212021222222241E0800 +6D9B:0040204017FC104083F8408047FE1090111021FEE21022902450281020500020 +6D9C:0020202013FE102081FC40004BFE0A0214041090E0902090209021122112020E +6D9D:0108210817FE1108800047FE54021884108027FCE08421042104220424280810 +6D9E:00402040104017FC804042484148115017FE20E0E15021502248244428420040 +6D9F:00202420122012FE804040504E9012FE12102210E3FE22102210251028FE0000 +6DA0:000027FC1444144485F4444444E4144415F42454E45424742444244427FC0404 +6DA1:000023F812081208820843F84040104017FC2444E4A425142614240424140408 +6DA2:000023F81208120883F84000400017FC14042444E444244424B4210826041802 +6DA3:0100210011F0121084204BF84248124812482248EFFE20A020A0211022080C06 +6DA4:0080208011F813088490406041981646104027FCE04022482244244421400080 +6DA5:008040402FFE200003F88208420853F8100023F8E01020602040204021400080 +6DA6:0200217C1504140485F444444444144415F42444E444244425F4240424140408 +6DA7:0200217C15041404840445F44514151415F42514E51425F42404240424140408 +6DA8:00404F442144214801488F50484058FE18502F50E1482148214421442A620440 +6DA9:000023FC10441244824444844094110812202020E13C21202120212027FE0000 +6DAA:0080204013FC100082084108411017FE10002000E3FC22042204220423FC0204 +6DAB:0080404027FE2402080483F84208520813F82200E20023FC2204220423FC0204 +6DAC:0040204017FC104080404FFE411010A017FC2040E0402FFE2040204020400040 +6DAD:001C23E0108412448148411057FE1402100023F8E108211020A0204021B0060E +6DAE:000247E22422242A07EA848A448A548A17EA26AAE6AA2AAA2AA232E2208A0084 +6DAF:000027FE1420142085FC4420442017FE14002420E42025FC242028202BFE1000 +6DB0:000027BC108412948108429454A41840100027BCE0A422A42128229024A80846 +6DB1:000021FC110011F8810041F851001FFE12802248E25022202210228823060200 +6DB2:0080204017FE11208120423C4244166412942348E24822302220225022880306 +6DB3:00402020102013FE8202449441081204100021FCE02020202020202027FE0000 +6DB4:0080404027FE24020A04820043BC54A414A426A4E9342128222222222422081E +6DB5:000023F8101010208444455444E4144414E42554E64C25442484240427FC0004 +6DB6:0010207813C01040804047FC424812481FFE2248E24827FC2040204027FC0000 +6DB7:0040204017FC104083F842484BF80A4813F81040E0E0215022482C4620400040 +6DB8:000027FC1444144487FC4444444415F415142514E51425F42514240427FC0404 +6DB9:003823C01040104087FC415042481486108027FCE110221021A0206020900308 +6DBA:000023FC1204120483FC42204A200BFE12201220E2FC22842284248424FC0884 +6DBB:0040204010A01110820845F64040104017FC2040E04023F82208220823F80208 +6DBC:0080204017FE1000800043F84A080A0813F81040E25022482444284421400080 +6DBD:001C23E0122013FE822042924B0A0A0611FC1104E10421FC2104210421FC0104 +6DBE:0040204417681150815042484544108013F82208E20823F82208220823F80208 +6DBF:00004FFE20802184024484684AB0413012A82468E8A421242222242020A00040 +6DC0:0040202013FE12028404400043FE102010202120E13C212022A02260243E0800 +6DC1:0080204013FC10008108409047FE1040104027FEE08821082090206021980604 +6DC2:000023F8120813F8820843F848000BFC101017FEE01022102110201020500020 +6DC3:00402248115017FC808041004FFE121014082BF4F212221022502224220401FC +6DC4:0124212412481490824841244124100017FC2444E44427FC2444244427FC0404 +6DC5:0200420C227022400F408240427E564817482AC8EA4832482248224822480288 +6DC6:0210212010C013308C8840804FFE110013F82608EBF8220823F8220822280210 +6DC7:0108210817FE1108810841F84908090811F81108E10827FE2000209021080204 +6DC8:000023FE1202120283FE42104A920A92129212FEE21022922292249224FE0802 +6DC9:000023F81248124883F842484A480BF8104017FCE0E021502248244620400040 +6DCA:0100210011F81208841048204180163C14042404E7BC24042404240427FC0404 +6DCB:011021101110111087BC41104110133813B82554E55429922110211021100110 +6DCC:0040224811481150804047FC4404140415F42514E514251425F4240424140408 +6DCD:000027FC1444144485F44444444417FC140425F4E514251425F4240424140808 +6DCE:0040204017FC104083F8408047FC111012482446E1F0204027FC204020400040 +6DCF:000023FC120413FC820443FC48000BFC10401040E7FE204020A0211022080406 +6DD0:03F82208120813F88208420843F8100017FC2404E40427FC2404240427FC0404 +6DD1:0100210011DC11148114411447D4101411142114E58825482948211425140222 +6DD2:0040204017FC104083F8404847FE104813F82080E7FE21082390206021980604 +6DD3:020842082FFE2208028880404FFE4100110021F8E10821082208220824280810 +6DD4:0040204017FC1040804043F84A080BF8120813F8E20823F8220822082FFE0000 +6DD5:0040204013F81040804047FC4110120814442040E3F820402040204027FC0000 +6DD6:00402040107E104083FC42044BFC0A0413FC1244E04027FE2040204020400040 +6DD7:0100210011FC12048484449442A4108417FC2084E1C422A42494208420A80010 +6DD8:0100210011FC1204850441E44284108417F42084E2A422A423E4200420280010 +6DD9:0080404027FE2402080483F04000500017FC2040E25022482444284421400080 +6DDA:0040202013FC1204820443FC4A000A28122413FEE22022502250248825040A02 +6DDB:01042104150417D4891441144FF4111417D42554E5542554254425C421140108 +6DDC:000027BC14A414A484A447BC44A414A414A427BCE4A424A424A424A42AA4114C +6DDD:000027BE14AA14AA84AA47AA44AA14AA14BE27A0E4A024A024A228A22AA2111E +6DDE:02084228222822280FA482444254569217102AA0EA203228224422FC22440200 +6DDF:00902090109013FC829442944A940BFC12941294E29427FE2000209021080204 +6DE0:000027FC1444144487FC4444444417FC10002000EFFE22082208220824080808 +6DE1:004022441244144880A041104608104410402248E248245020A0211022080C06 +6DE2:00142012101017FE801040104BD20A5212521254E3D4200820EA271A22260042 +6DE3:00002040139C12048204439C4A040A0413FC1090E0902090209021122212040E +6DE4:0210411020102FA8042884444402579014882488E48024A0249028882A881100 +6DE5:008020F81088110881F0401048100BFE10201222E17420A82124222220A00040 +6DE6:0040204010A011108208440641F01040104023F8E0402248214821502FFE0000 +6DE7:0040202013FE12028444402048280888109012A4E2C224822188228824780000 +6DE8:003C27C012441128800043F84848084817FE1048E04823F82048204021400080 +6DE9:0040204017FC104080404FFE42081484188221F8E208251020A0204021B00E0E +6DEA:0040204010A0111082084DF6400017FC14A424A4E7FC24A424A424A424140408 +6DEB:0008203C17C01084844442484210103C17C02040E0402FFE2040204027FC0000 +6DEC:0080204017FC10008110411042A8144410002040E7FE20402040204020400040 +6DED:0080204017FC1404840447FC4440144017FE24E0E95029503248244428420040 +6DEE:01402120112013FE822046204BFC1220122023FCE2202220222023FE22000200 +6DEF:0080204017FE1100820847FC400413F8120823F8E20823F82208220822280210 +6DF0:0040204010A0111082884446400013F010102020E04021242522250A290800F8 +6DF1:000027FC140414A4811042084040104017FC2040E0E0215022482C4620400040 +6DF2:00402040107C104083FC42444A700BC01244123CE20022F0249024922912120E +6DF3:0080204017FC100083F842084BF8080013F81010E02027FC2040204021400080 +6DF4:0100210013FC1494889441244244148411282210E0402124252A250A28F80000 +6DF5:00A024A414A414A487BC4404440417FC14042404E7BC24A424A424A428A41004 +6DF6:00402040104017FC8040424842481248155420E0E15021502248244428420040 +6DF7:000027FC1404140487FC4404440417FC10002420E42227AC2430242225A2061E +6DF8:0040204017FC104083F8404047FE100013F82248E24823F82208220822280210 +6DF9:0040208017FE11108248444643F81248124823F8E248224823F820422042003E +6DFA:00A0209010BC17C88050406451941E0C10A02090E0BC27C82050206421940E0C +6DFB:000023FC1040104087FE40A04110120814462040E04822642252245221400080 +6DFC:010001087D1005A009603118C506020008100A146AD42C582A544A94A9521020 +6DFD:0108210817FE110881084020482009201120113CE1202120212021202FFE0000 +6DFE:010006C01830EFEE01003FF811100920FFFE000001087D90096011202518C206 +6DFF:0040208013F8120883F842084BF80840104017FCE44424442454244820400040 +6E00:0040204017FE10A08150424845F6104011502110E7FE21102110211022100410 +6E01:0040474421682150024884444940408010002040E74421682250244829460080 +6E02:03F82208120813F8820842084BF80880104017FCE110211020A0204021B00E0E +6E03:0108210817FE11088148404047FE1080110023FCE50429042104210421FC0104 +6E04:009020901090179E8090409048900B9C10901090E090279E2090209020900090 +6E05:2040104017FC004083F840404FFE080013F8120813F8E20823F8220822280210 +6E06:0844448420042FD404948494449454941FF42494E49424942484288428941088 +6E07:000023F8120813F8820843F849000BFC14041224E3D4221421F4200420280010 +6E08:0040202017FE11088090406041981606110821F8E10821F82108210822080408 +6E09:002020201120113C8120412047FE100010282124E122222A2410202020C00700 +6E0A:04442444165415548564444447FC144414C424E4E55425542644284428441044 +6E0B:002020201120113C8120412047FE100010002204E10820902108220424020000 +6E0C:000023F81008100883F84008400817FE10402444E2E821502248244621400080 +6E0D:0040204017FC104083F8404047FE100013F82208E2482248224820A021100608 +6E0E:0040204013F81040804047FC4004112810A02220E12027FC2050208821040604 +6E0F:0040204013FC10A08110420857FE100813C82248E248224823C8200820280010 +6E10:01004102211C2FD002108210451E57D411142114E1D42F142514212421240144 +6E11:000023F81208120883F8404047FC1444144427FCE444244427FC20422042003E +6E12:0040208013FC1224822443FC4A240A4413FC1090E11027FE2010201020100010 +6E13:003C27C010841444824842104840084013F81040E04027FC20A0211022080C06 +6E14:0100410023F0221004208FFC5444544417FC2444E44427FC200020002FFE0000 +6E15:04442244128417D48114411451141FF411142114E29422542444244428140008 +6E16:0080204017FC1444804043F84248124813F82248E24823F82248204020400040 +6E17:00802090110813FC804047FE411012481C862310E02020C42308203020C00700 +6E18:000023F81090106087FC40A44128122014602040E7FC20E0215022482C460040 +6E19:0100210013F01410882047FC440414A415142444E0402FFE20A0211022080C06 +6E1A:0080208817E8109080A04FFE4080110013F82608EA0823F82208220823F80208 +6E1B:00142012101017FE8410441045D01412141225D4E554254825DA242A28461082 +6E1C:000027FC1040108087FC44A444A414A41484244CE0402FFE20A0211022080C06 +6E1D:004020A01110120885F6480047C41454145427D4E454245427D4244425540488 +6E1E:0208211017FE1040808043F84A080A0813F81208E20823F82208220823F80208 +6E1F:0080204017FC100083F8420843F810001FFE2802E3F820402040204021400080 +6E20:23FC120083F84A080A0813F8E20023FC21000100FFFE054009203118C1060100 +6E21:0040202017FE1488848847FE448814F8140025FCE48424882450282028D81306 +6E22:40002FF8280888684B88488808882BE82AA84AA8CBE8488A48AA50EA57262002 +6E23:0040204017FC10E081504248444613F8120823F8E20823F8220820002FFE0000 +6E24:021082105FD00210823E5FD2505220922F124112C21243925E2242224A4A0484 +6E25:000023FC1204120483FC42004BFC0A40128813FCE224222025FC2420282013FE +6E26:000023F81208120883C84248424817FC140425F4E514251425F4240424140408 +6E27:0080204013FC10008108409047FE1442184423FCE24422442254224820400040 +6E28:000023F81248124883F842484A480BF8100017FEE24022442228229023080206 +6E29:000023F81208120883F84208420813F8100027FCE4A424A424A424A42FFE0000 +6E2A:0008203C17C0104083F842484A480BF8104017FCE444245425F4240424140408 +6E2B:00902290129017FE8290429042F0120013FC2040E7FE20E0215022482C460040 +6E2C:000227C21442145287D24452445217D214522452E7D2200222822242244A0804 +6E2D:000027FC144417FC844447FC400013F8120823F8E20823F82208220822280210 +6E2E:0110211017FE1110800047FE4008100813C82248E24823C82248200820280010 +6E2F:0110211017FC111081104FFE4110120817F42A12E21023F02204220421FC0000 +6E30:004020A0111012088DF6400043F81208120823F8E110211027FC211022100410 +6E31:01002100113E17C8854845484548154817C82508E108214821C82E48243E0000 +6E32:0080404027FC2404080883F8400053F8120823F8E20823F82208200027FC0000 +6E33:0000277E11241124813C47244424143C14242724E126217C210421042A040404 +6E34:000023F8120813F8820843F849000BFC14441244E2A4220423F4200420280010 +6E35:020842082FFE22080208800047FC544414442444E7FC24442444244427FC0404 +6E36:0110211017FC11108150404043F8124812482248EFFE204020A0211022080406 +6E37:0080204017FC11108208440443F81208120823F8E110211021122212240E0800 +6E38:02102110111017BE8220424043BC128412882288E2BE22882488248829A81010 +6E39:0200220013FE1402888247FA400217F2100227F2E00227F2241227F220140008 +6E3A:401020102F10891049144F52095229922F104914C9044F084910402040400180 +6E3B:00402040124812448454406049800E0013F81208E3F8220823F8220823F80208 +6E3C:0208211017FE1040804043FC4840084017FE1000E04027FC20A0211022080C06 +6E3D:0128212417A4112081204FFE4020102417A424A8E4A82490279224AA20460082 +6E3E:000027FC1444104087FE40404BF80A4813F81248E3F8204027FE204020400040 +6E3F:0040204017FC10E0815042484C4613F810002000E7FC20402248244429420080 +6E40:002027A810B014A483184110420815F410402040E7FC204020A0211022080404 +6E41:02102210122812288F444282427C130012002E7CE2442244224422442A7C0444 +6E42:000027BC14A414A487BC400043F810001FFE2100E20023F82008200820500020 +6E43:010043BC2E102210023C8F904210523C12102F90E27E22102210221024100810 +6E44:000023FC1224122483FC42004AFC0A84128412FCE28422FC2484248428FC1084 +6E45:004040402FFE204007FC8444455454E4144427FCE0E0215022482C4620400040 +6E46:0080204017FC1000820841104FFE100013F82208E20823F82208220823F80208 +6E47:0080204017FC120881104FFE400013F8120823F8E20823F82208220822280210 +6E48:020842082FFE2208020883F84208520813F82040EFFE20E0215022482C460040 +6E49:0208421C2270221003108AFE4A104A101210227CE244224422442244227C0244 +6E4A:0040204017FC104083F8408047FC1110120825F6E04023F8204020A021100608 +6E4B:0080208013F8110887FE40004BF80A0813F81040E7FC2040244027FE20400040 +6E4C:0040204010A01110828844464BF80A0813F81208E3F822442228229023080204 +6E4D:004024441444144487FC40004FFE1040108027FCE4A424A424A424A424A4040C +6E4E:000027FE1040108087FE4492449214F214922492E4F224922492249227FE0402 +6E4F:000027FE1040108083FC42044A040BFC120413FCE204220423FC200021080204 +6E50:021042102220227C0FC482444244574416FC2A44EA44324422442244227C0244 +6E51:000027FC104412408278424055FE180013F82208E3F8220823F8220822280210 +6E52:000023F81208120883F840004FFE120813F82208E3F82208227E2F8820080008 +6E53:001021101108120485FA408841081228141023F8E2A822A822A822A82FFE0000 +6E54:0208410821102FFE000087C44454545417D42454E45427D42454244425540488 +6E55:00102010177C111481FE4214427C1710117C2510E5FE22102210250028FE0000 +6E56:0100211E111217D28112411E411217D21452245EE45227D224522022202A0044 +6E57:01042104110417C4813E410447C4102411142114E7C42104210421C42E140408 +6E58:02004200227C22440F448244427C574416C42A44F27C224422442244227C0244 +6E59:0080204017FE1090829844944114123014402040E7FE204020A0211022080C06 +6E5A:00402488152815E8844844A845E8140815E82528E5E8252825EA292A292A1166 +6E5B:0108210817FE110881F8410849F80908110817FEE25022882304220023FC0000 +6E5C:000023F81208120883F842084A080BF8100017FEE040224022782240254008FE +6E5D:0220222413A8123082A243224A5E088013FC1204E20423FC2204220423FC0204 +6E5E:0040207E1040104087FC4404440417FC140427FCE404240427FC211022080404 +6E5F:0040208013F8120883F842084BF8080017FC1040E04023F82040204027FC0000 +6E60:004024441444144487FC4100410017FE11202220E2A422A82550245028880106 +6E61:03F82248124813F8824842484BF80840104017FCE444245425F424142404040C +6E62:000027FC100013F88208420843F8100017FC2444E44427FC2444244427FC0404 +6E63:000023FC120413FC822043FE4A100A8A13061000E3FC220423FC220423FC0204 +6E64:02102110111017BE822842484BAA0AAE12BA12EAE2AE22A824AA24A229A2101E +6E65:0080204017FC14048110420844441050104827FEE04020A020A0211022080406 +6E66:000023F8120813F8820843F848400A4013FC1440E04023F82040204027FE0000 +6E67:000027F8111010A087FC444447FC144417FC2444E08027FC2084210422280410 +6E68:000023FC120413FC820443FC4A040BFC10501048E7FE204020A0211022080C06 +6E69:0008203C17C010408FFE404047FC144417FC2444E7FC204027FC20402FFE0000 +6E6A:010021F8120813F0801047FE40801144166820B0E128266820A4212226A00040 +6E6B:43902E102210821242524FD40258269027104AA8CA2852284248424442840302 +6E6C:0610381008527E5408901C282A444882090001047D88095011202118C5060200 +6E6D:01082088109017FE809040904BFC0A941294130CE20423FC2204220423FC0204 +6E6E:000027FC10A010A087FC44A444A414A417FC2040E04027FC204020402FFE0000 +6E6F:000023F8120813F8820843F850001FFE120023FCE49429242244248421280210 +6E70:008021F81208151080E043184C0613F810402240E3FC244023F820402FFE0000 +6E71:0040204017FC104083F8404047FC104017FC2080E10023F82D08210821F80108 +6E72:003C27C012441128800043FC4880088017FE1100E1F822882250242028D80306 +6E73:004040402FFE2040004087FC451454A415F42444E44425F42444244424540408 +6E74:01082090100013FC809040904092149212942298E09020902090209027FE0000 +6E75:0208211017FC104083F8404047FC1100110023F8E4102820204020A023180C06 +6E76:0080210013F8120883F8420843F8104010402764E16821502248244429420080 +6E77:0040204017FC104083F8408047FE1110120827FCEA0A220823F82208220803F8 +6E78:0080204017FE100083F8420843F8100017FE2402E9F42110211022122412080E +6E79:000027FE140015FC8524452445FC1524152425FCE420242025FC2820282013FE +6E7A:0100217C114412448244467C4A10121012FE2238E25422542294231222100210 +6E7B:0040202017FE100081F8410849F8080013FC1204E20423FC2204220423FC0204 +6E7C:0100261C14041404871C4404440417FC10002000E7FC2040204020402FFE0000 +6E7D:0248424824902FFE049082484248500017FC2444E44427FC2444244427FC0404 +6E7E:010020801FFC112085284924400017F0101027F0E40027F82008200820500020 +6E7F:000027F81408140887F84408440817F811202120E9242528233021202FFE0000 +6E80:011041102FFE2110000087FC4040504017FC2444E554255425F4240424140408 +6E81:0088208813FE1088800043FE42021424102023FEE07020A820A8212422220020 +6E82:0102210217C21112811247D24552155217D22112E392254229222102210A0104 +6E83:0040204013F8124883F840404FFE100013F82208E2482248224820A021100608 +6E84:00402444144417FC808041F84208151010E02318EC4623F820402FFE20400040 +6E85:00104F94289228900A9E8AF04A905A9E1AF02A94EA942208250A249A28261042 +6E86:42002200257C84A448245724022422282FA84228CB104A9052A842284A440482 +6E87:004022481150104087FC41504248140410802FFEE1102210232020C023300C08 +6E88:00402240114017F88088409048FC0904110813FEE202242A2AAA228224140008 +6E89:000027BE1488148887A844A844A817BE14102518E49825A826AA244A20460080 +6E8A:000027BC14841484848447BC4400140017BC2424E42427A82410242824440482 +6E8B:000023F811081110811C42E442A4125414A82100E3FC22942294229427FE0000 +6E8C:001023D410581452828C4108420415FA10902090E7FE2090211021122212040E +6E8D:000027FC10A014A482A840A04FFE100013F82208E20823F82208220823F80208 +6E8E:02102210127C12108F90421042FE170016902A10EA7C32102210221022FE0200 +6E8F:0040202017FE142085FC442447FE142415FC2420E5FC25042504290429FC1104 +6E90:000027FE1420144085FC450445FC150415FC2524E42024A829242A2230A00040 +6E91:004022441148104083FC42044A040BFC120413FCE204220423FC200021080204 +6E92:0040204013F8104087FE40004BF80A08120813F8E0A4212823102D4821860100 +6E93:011020A0100017FE80A043F840A817FE10A823F8E0A021B022A82CA620A000A0 +6E94:020821081110100087FC404048400BF810401040E7FE2000254824A428A40000 +6E95:000047FE240229F4000083F840805144166820B0E128266820A4212226A00040 +6E96:2140112083FC524017F82A40E3F8224023FC22000100FFFE0100010001000100 +6E97:003823C0104017FC81504154475811541354254CE0E021502248244428420040 +6E98:0040204013FC104080404FFE4080111013F82008E7FC24A424A424A42FFE0000 +6E99:0040204017FC104083F8408047FC111012482446E24821502248244421400080 +6E9A:0110211017FC1110804040A049100A0815F61000E00023F82208220823F80208 +6E9B:0080204017FC140481104208483C0BD012901290E2902288228824A424D40892 +6E9C:0080277C1424152484A445544648108017FC2444E44427FC2444244427FC0404 +6E9D:0110211017FC111083FC41104FFE104013FC2244E3FC22442FFE220422140208 +6E9E:000023F81148111080A0404041B0164E104023F8E248224823F8204427FC0004 +6E9F:000027FC1404100083F842084BF80A0813F81080E04027FC2000211022080404 +6EA0:01082088109013FC804041F848400BFE10801100E1FC22202420282023FE0000 +6EA1:001020101710157C8510451045FE1708150825FEE50825482728200820280010 +6EA2:020821081110100087FC400041101208140423F8E2A822A822A822A82FFE0000 +6EA3:022042202250248805048EFA540055FC15542554E5FC2554255425542504050C +6EA4:000023FC124013F8824043F84A400A4013FC1004E55425542554240420280010 +6EA5:005040482FFE204007FC844447FC544417FC2444E0082FFE2208210821280010 +6EA6:010825481548155087DE402440141FD410142794E49424A824C8249428141022 +6EA7:000027FC10A010A087FC44A444A417FC10402040E7FC20E0215022482C460040 +6EA8:0110211417D2111081104FFE4010111417D42114E3942548290A211A21260142 +6EA9:0080210013F81208820843F84A000BFE120013FCE00425542554280420280010 +6EAA:003C27C0124411288080411043E01040118823FCE044204027FC20A02110060E +6EAB:400023F822480A488AA8530853F822082000C7FC44A444A444A444A44FFE0000 +6EAC:0208211017FC1040804043F84840088017FC10A0E1282134223C22222422081E +6EAD:000027FC144417FC844447FC41101208148421F8E20825082090206021980E06 +6EAE:020024FE17101510857C45544754145414542754E554255C2510271025100010 +6EAF:0440425E2292201207D2811E45525552155227DEE152211222122222242A0844 +6EB0:004022481248124883F8400047FC100013F82208E20823F8211020A027FE0000 +6EB1:0040204017FC104083F8408047FC1110126825C6E04023F820E0215826440040 +6EB2:00402140165C14448444475C4444144417FC2040E7F8211020A0206023981C06 +6EB3:000021F81108110881F840004BFC0A0413FC1204E3FC220423FC209021080204 +6EB4:0040208013F8120883F8420843F8120813F82050E04827FE20A0211022080C06 +6EB5:000021B81628142887A844A847CE148017B82428E7A824A8249028902AA81146 +6EB6:0040202013FE1202849441084A64089011081204E5FA21082108210821F80108 +6EB7:000027FE140215FA844244C2452A146A14B2252AE46A24AA2522244227FE0402 +6EB8:0040204017FC104083F8404047FE1080111023E0E04827FC2044224825440080 +6EB9:0040204017FC10408FFE4882411013E010402088E7FC20442248244429420080 +6EBA:000027BC1084108487BC4420442017BC108424A4E294229424A4208425280210 +6EBB:000023F8120813F8820843F8400017BC108424A4E294218C26B4208422940108 +6EBC:00002FFE1210121084A44738421014A417BC2040E04027FC204020402FFE0000 +6EBD:000023FE120012FC820043FE4AA80A9012C81286E20823FE2288244824080818 +6EBE:0080210017FC1444844447FC4444148417FC20C8E1502168227C22422442083E +6EBF:001080945F54155495585510557C1F10351055FED51055105F10511040100010 +6EC0:0080204017FC1080810843F04860098417FE1002E7FC244427FC244427FC0404 +6EC1:40102F1029288A284A444CBA0A10291029FE4910CD584A544892491248500820 +6EC2:0080404027FC221001208FFE4882504417FC2100E10021F82108220822280410 +6EC3:0120211012081486891043F84008100017BC2084E4A4229424A4208422940108 +6EC4:0040204010A01190824847FE4A0813F8120823F8E20023F82508250829F80108 +6EC5:00142012101017FE8410441047F21492149225B4E6D42488254A293A2A261042 +6EC6:00002FFE100013F88208420843F8100017FC2514E4A427FC2444244424540408 +6EC7:0040204017FC104083F8420843F8120813F82208E3F822082FFE211022080404 +6EC8:0080204017FE100083F8420843F8100017FC2404E5F4251425F4240424140408 +6EC9:000023F8120813F8820843F848400A4811501040E7FC2120212022242424081C +6ECA:0100210011FC120085F840004BF8088812A811C8E7F8208A21CA26AA20860082 +6ECB:01082088109017FE810841084210129414A42738E1082210221024A427BC0084 +6ECC:44202420247C88444AA84A101A282AD62A104AFECA104A544892491248500820 +6ECD:00402244124413FC80404FFE4000104013FC2244E24423FC2040204427FE0202 +6ECE:08202AA42CA84920145022887FFE4002810401047D88095011202118C5060200 +6ECF:01104208251420A000E083184C0653F810402040E7FC2040224821502FFE0000 +6ED0:0208220813BE14888AA8413E42081448184827FCE0E0215022482C4620400040 +6ED1:000023F8120813C882484FFE480213F8120823F8E20823F82208220822280210 +6ED2:000027FC100813C88248424843C810001FFE2008E3C82248224823C820280010 +6ED3:0080204017FC1484804043F8411010A017FC2040E04023F82040204020400040 +6ED4:003E4FC020842444024882104100561C14042404E71C24042404240427FC0404 +6ED5:0020792448A849FC482078404BFE488849247A224D2448A849244A2248A09840 +6ED6:0080204017FE100083F842084FFE120813F820A4E12823102510294821860100 +6ED7:0210221013DE1528888440784780108010F82780E08020F82F8420842084007C +6ED8:000047FE24022914020885F44040504017FC2000E00023F82208220823F80208 +6ED9:000027FE1450148885FE469044FC149014FC2490E49024FE2480240027FE0000 +6EDA:0080204017FC111082484484412013F010102088E15023202510294821860100 +6EDB:0004203E17C0124481244128420013FC14402040EFFE20402444244427FC0004 +6EDC:0040208013F8120883F842084BF8088017FC1110E24824442BFA204020400040 +6EDD:0080204017FC111080A047FE48000BF8124813F8E24823F8224A2042203E0000 +6EDE:0150215017FC11508150400047FE1442184423F8E24822482248225820400040 +6EDF:0420842044781F488490447C44541E542454447CC4405F4044424442443E0400 +6EE0:000023FC110811F8810841F8410E17F8100827BCE0A422A42128229024A80846 +6EE1:0108210817FE1108800047FE4090109017FE2492E492256A26462402240A0404 +6EE2:0110211017FE111080004FFE4802100017FC2040E04023F8205020482FFE0000 +6EE3:000023FE120012FC820043FE4AA80A9012C81286E20022FC2284248424FC0884 +6EE4:0040207C104017FE8442447047C41444143C2420E410245425422942294A1238 +6EE5:00902490149E149084A844A444C41080100027FCE4A424A424A424A42FFE0000 +6EE6:008040402FFE20A002A882A444A45040104027FEE0E021502248244428420040 +6EE7:4410221022108FA0403E454404A428A431284528C21042104528492850440082 +6EE8:0080204017FE1402881443E04A000A0013FC1210E2102FFE2000211022080404 +6EE9:005040482E8022FE039092904AFC5A90149024FCEA902A90329020FE20800080 +6EEA:00004FBE20882510023E81224FAA52AA122A222AE22A222A221022142A220442 +6EEB:4440244024FC88884B505A201AD82B062AF84A88CAF84A884AF8488848880898 +6EEC:0040202013FC120483FC42004AF80A8812F81200E3FC232425FC2502290200FE +6EED:000027FC144417FC844447FC5248124817FE2248E24827FC20402FFE20400040 +6EEE:420023C222028FE44A284B920E4229C428084B92CA824A844A8A4C92547E0800 +6EEF:02A822A817FC12A882AA44E6480017FC14442040E3F822482248224822580040 +6EF0:0080204013F8111080A047FE400013F8120823F8E20823F82120212222220C1E +6EF1:408020402FFE880250044F90001C20102F90457CC50445284910492A514220FE +6EF2:0080211013F8121084A44FBE404210A013182C46E19026642188263021C00E00 +6EF3:0080204017FC111080A047FC44A41514160C25F4E514251425F4240424140408 +6EF4:0080204017FC111080A047FC444415F4144425F4E514251425F4240424140408 +6EF5:0080404027FE2402089480504524554A18FA2300E04024442444244427FC0004 +6EF6:01082108110817D0811E479451241FD4121423D4E2542248224824D424240842 +6EF7:00402040107E1040804047FC4404164C151424A4E64C24A42514264C27FC0404 +6EF8:0210411021102FDE0028878840085788103E2788E48824882488278824880008 +6EF9:0040207C104017FE8442447845C4143C140824F0E52424A827FE282028A01040 +6EFA:02204220243E25480DA895104528544614802040E1242522250A250A28F80000 +6EFB:0040202013FC1000810840904BFE0A2012A012FCE320222022FC2420242009FE +6EFC:0110211017BE111083B845544912100013F02210E290225022522212240E0800 +6EFD:002027FE142015FC842447FE442415FC142025FCE52425FC252429FC2924112C +6EFE:0080204017FC1110820845F44110111011F02088E15023202510294821860100 +6EFF:0110211017FC1110811041F0404017FC14442664E55426EC2444244424540448 +6F00:08007F7808483E4800863E782A483E304048808401087D90096011202518C206 +6F01:0100210013F0121084204FFC5444144417FC2444E44427FC2000252424920892 +6F02:00004FFE20A027FC04A484A447FC500017FC2000EFFE20402248244429420080 +6F03:008040402FFE2802120483BC422452241FA42028E2282B10329022282A440482 +6F04:00202222122213FE800043FE4A200BFC122013FEE200222025FC24202BFE0000 +6F05:024824901248100083F842484BF80A4813F81040E7FC20E0215022482C460040 +6F06:0040204017FC10E08158464440A0111012482C46E24821502248244421400080 +6F07:021042102450295C0150825046FE5A0012102250E25C225022B02290230E0200 +6F08:0100211013DC125485544288410812F414022000E3FC20402150224825440080 +6F09:0080204017FC14A084A047FC44A414A417FC2400E52425A82530292429A4111C +6F0A:004043F822482FFE024883F8404053F8124823F8E0802FFE211020E023180C04 +6F0B:00204F3C29442AA80A108C284AC6493819102950ED7E2A90287C281028FE0800 +6F0C:011041102FFE211001F0804047FC544417FC2040EFFE204027FC20402FFE0000 +6F0D:00004FFE282A28260FFE88224BAA4AAA1BAA2832E9962E2E284628822FFE0802 +6F0E:01244124222424240954814A429256101A102250E25C2250225022B0229E0300 +6F0F:000047FE2402240207FE840047FE542017FE2622E6AA2A222AAA3222222A0204 +6F10:08207E2008F8FF2814287F6A082AFF56098201047D88095011202118C5060200 +6F11:0100423E2788248804A887A844BE548817882010E4982718242824AA23CA0086 +6F12:0000277C11441144817C47104410147C14542754E154217C211021142AFE0402 +6F13:0080204017FE100082A8424842A813F8104027FCE484252425F424142404040C +6F14:0080204017FC1404800043F8404013F8124823F8E24823F82000211022080404 +6F15:00A020A017FE10A087FC44A447FC14A417FC2000E3F8220823F8220823F80208 +6F16:0208224817481290829E4FE4411412141FD42494E91421C82F08211425140222 +6F17:0040208013FC124482F443144AA40A4412A413FCE04020242522250A290800F8 +6F18:07FE240015FC140087FE451445481586140025FCE50425FC250429FC2904110C +6F19:00404FFE204027FC044487FC444457FC10422FFEE0102FFE2210211021500020 +6F1A:000027FC140014F88488448844F8140015DC2554E554255425DC240027FE0000 +6F1B:00402248115017FC804040804FFE111012482446EA4821502248244421400080 +6F1C:0110211017BC111083B845544912111010402040E7FC2040204020402FFE0000 +6F1D:000027BC108414A4829444A44084104013F82208E20823F82208220823F80208 +6F1E:000E27F010441224810843FC4A040BFC120413FCE20423FC2090211022120C0E +6F1F:0040444422482FFE080283F84208520813F82040E04027FC204020402FFE0000 +6F20:0110211017FC1110800043F84A080BF8120813F8E04027FC20A0211022080C06 +6F21:010021FC120015F8810841F8490809F8100017FEE10023FC24A4212422540088 +6F22:0110211017FE111081F040404BF80A4813F81040E7FC20402FFE20A02110060C +6F23:0020482025FE242001FC81244DFC552415FC2420E5FE242024202A2031FE0000 +6F24:0110411027BC211003B885544912408010802FFCE1102210212020C023300C08 +6F25:008040402FFE29120248844443F8504010402FFEE000204023F8204020400FFE +6F26:08203E3E08447FA82A10492808443FFE200020882ED022A02490488852868100 +6F27:0110411021102FDE012087C0445C57C4144827C8E1102FD021222122211E0100 +6F28:0020247C12841148803040CE4610127C1210227CE21022FE2210221025FE0800 +6F29:0420422022202F7E04808400477C551415102550E55C255029502B5030BE2100 +6F2A:0020492025FC222006508A8843FE520816E82AA8E2A822E822A822082A280410 +6F2B:03F8220813F8120883F8400047FC14A414A427FCE00023F8211020E023180C06 +6F2C:004027FC104013F8804047FE48000BF8120813F8E20823F8220823F821100208 +6F2D:0110211017FC1110804847FC40A0111012082514E11027FE2110211022100410 +6F2E:0040202017FE142085FC442447FE142415FC2420E56224B429282A2630A00040 +6F2F:000027FC144417FC844447FC4100121017E020C8E3042FFE2042224825440882 +6F30:00402444144417FC800047BC44A414A417BC24A4E4A427BC24A424A42AB41148 +6F31:0108210817C81108811E47D24564154017C82108E38825482954211421240142 +6F32:00004F3E2120213C01208F3C482048FE18502F52E1542148214821442A620440 +6F33:004027FC111010A08FFE400043F8120813F82208E3F820402FFE204020400040 +6F34:00402444144417FC8080404047FE14021BF42000E7FC20402250244829440080 +6F35:0108210812881250841E4B944124111417D42114E59425482948211425240242 +6F36:0040204013F8124883F8404047FC144417FC2040E08020482544251428F00000 +6F37:0200211E17D2101287D4445447D8101417D22092E11221DA2714211025100210 +6F38:02004202223C2FA002208FA04ABE4FA41AA42FA4E2242FA42224224422440284 +6F39:000027FC1040127882404FFE410011FC120023FCE00425542554280420280010 +6F3A:0040204017FC1040855442484554104015542248E55420A020A0211022080C06 +6F3B:000027BC108414A4829444A440501188162620C0E31020642388203020C00700 +6F3C:0040244417FC1120811043FE522016201BFC2220E22023FC2220222023FE0200 +6F3D:000027FC140417FC842044A8447014A8150424A0E4FC252024202BFE28201020 +6F3E:0208211017FC104083F8404047FC1040102021C0E0442768215022482D460080 +6F3F:0440247C24A83D5004287DFE24884448851801047D88095011202118C5060200 +6F40:000027FC14A414A487FC4000401C17E012482248E24825542554286220400040 +6F41:200024FE3810222022FC1E84008408FC0A84ECFC28842C844AFC4A48A8841102 +6F42:00402444144417FC80004208411017FC11102110E5142318211021102FFE0000 +6F43:0240444028FC3088035084204CD8570614F82488E4F8248824F8248824880498 +6F44:0108210817C81110811E47E44554155417D42114E39425482948211421140122 +6F45:0100210013FC144080804FFE4120121017FC2A20E3FC222023FC222023FE0200 +6F46:01104FFE211020000FFE8882511443E010402088E7FC20442250244829440080 +6F47:011041102FFE2110004087FC40445FFE104427FCE04025642554265428441044 +6F48:000027FC14A414A484A447FC40801144166820B0E128266820A4212226A00040 +6F49:00402444144417FC800047FC440417FC140427FCE000242427A8243225A2061E +6F4A:421022102510849E48105710027C22242FA44224CB284AA8529042284A440482 +6F4B:42102210251084A0483E5744002424A432A44AA8C8A8411043A85C2840440082 +6F4C:0080204017FC1514820847FC4080111013F82048E04023F8204020402FFE0000 +6F4D:04508448448008FE8B905E9044FC049028905EFCC8904090469058FE40800080 +6F4E:0108210815481390811E47D44564155415542754E5D4254825482554246404C2 +6F4F:000027F81090106087FC40A4412816A0104027FCE4A4251426EC24A424E4040C +6F50:0140212013FE122086204BFC4220122013FC2220E22023FE2200252424920892 +6F51:002423A81092151482084C0447BA10A817C62400E7BC208420A8209025280244 +6F52:010041F0221027FC0A24824443FC5080114426A8E130266820A8212426A20040 +6F53:004040402FFE204007FC844447FC544417FC2044EFFE204220242522250A08F8 +6F54:010027BC11141394811447A4414C1080111023E0E04827FC2044224825440080 +6F55:0100210013FC16A88AA842A847FC12A812A822A8EFFE200022A8225424540000 +6F56:00004FBE220827BC02088FBE400057FC14442444E7FC24002402240223FE0000 +6F57:0140212013FE16208BFC422043FC122013FE2240E0402FFE215022482C460040 +6F58:007827C01248115087FC41504248140613F82248E24823F82248224823F80208 +6F59:0004203E17C01244812843F84A080BFC120413FEE40226AA2AAA2A0230140008 +6F5A:004023F8104817FE804843F840401554175C2444E7FC2444275C255425540844 +6F5B:000027BC1108152887BC431855AA1946100023F8E208220823F82208220803F8 +6F5C:0110411027BC21100FFE811042A8544413FA2208E20823F82208220823F80208 +6F5D:004020A0111816E6800043F84A080BF8100017BCE08424A4229424A422940108 +6F5E:0010279014BC14A484C447A841101128114625C0E53C2524252425A42E3C0024 +6F5F:010026381408140887384408440817F8120027FCE80425542554280420280010 +6F60:000027BC14A417BC842044A4439C1000111027FCE11021102FFE211022080404 +6F61:021041102FD0201007BE84A447D4501417942094E11421C82F08211425140222 +6F62:0110211017FC111081104FFE404017FC144427FCE44427FC2000211022080404 +6F63:000027BC14A417BC84A447BC4484144415F42424E4A4244424A4250424140408 +6F64:000027BC14A417BC84A447BC440415F4144424E4E444244425F4240424140408 +6F65:000027FC10A010A087FC44A444A417FC12482150E7FC20E0215022482C460040 +6F66:0040204017FC10A08514420847FC1A0A13F82208E3F820402248244429440080 +6F67:02082110100017FC8444455444E4144417FC2000E3F8220823F8220823F80208 +6F68:0080210017FC14A484A44FFE4000103C17C02144E24424E8215022482C460040 +6F69:000027FC144417FC844447FC4110111017FC2110E1102FFE2000211022080404 +6F6A:020043DE251221120FD28292425E540013FC2204E20423FC2204220423FC0204 +6F6B:00402248115013F8808047FC41101288151621E0E04823FC20442248244400C0 +6F6C:000027BC14A414A487BC40004BF80A4813F81248E3F8204027FC204020400040 +6F6D:000027FC10A017FC84A447FC400013F8120823F8E20823F8204027FC20400040 +6F6E:0100411E27D22112011287DE445257D2145227DEE11221122FD22122212A0144 +6F6F:000023FC100413FC800443FC48000BBC112417BCE00823FE2108208820A80010 +6F70:004023F8124813F8804047FE48000BF8120813F8E20823F8220823F821100208 +6F71:004027FC104013F8800047FC440413F8100023F8E20823F82208211027FC0000 +6F72:01104E102254223802108F7C4244534416FC2644EA44227C2244224422540248 +6F73:000023FC1204120483FC42224AFC0A2813FE1220E2FC238422FC248424FC0884 +6F74:0020492025FA222406288BFE4220524016FC2B44E244227C224422442A7C0444 +6F75:0288228817C81290829E4FD4402417D4145427D4E45427C824482454246404C2 +6F76:000027FC1444155484E4444447FC104017FC2040E0402FFE2000252424920892 +6F77:021023DE15281084804043F8404817FE104823F8E04023FC204027FE20400040 +6F78:042084205FFC0420956855AA652600002FF84808CFF848084FF8480848280810 +6F79:0040204017FC10E08150464C40401110111027BCE11023B82554291221100110 +6F7A:07FC240417FC140085F8441047FE14201460279CE484250829DE2F0831080318 +6F7B:003823C0104017FC8150424844A4111012482C46E24821502248244421400080 +6F7C:004023F8111010A087FC40004BF80A4813F81248E3F8204023F8204027FE0000 +6F7D:0208211017FC10A084A442A84FFE100013F82208E20823F82208220823F80208 +6F7E:00402248115017FC8150424844441208120823BEE4882AA8213E220824080808 +6F7F:000027FC144415F4849447FC440415F4151425F4E44424F4254425FC244407FC +6F80:00004FBC229426B40AD484A445AC584011082108E5A8252C252825A82E7E0000 +6F81:40402040227C824042404FFE0000220822084228CBAE4A284A284BA85E7E0000 +6F82:010825481548155087DE401447E4101417D42114E7D4210821082FD420240042 +6F83:0BFE104061FC090411FC610405FC090431FCC088010C7D90096011202518C206 +6F84:002027A410A812928114420855F4180213F82208E20823F8220821102FFE0000 +6F85:004023F8104817FE804843F8404017FE100023F8E24823F8224823F8200007FE +6F86:0040404027FC20400FFE811047BC51101190263EE0002FFE2120212222220C1E +6F87:0110455425B8291002A88444400057FC14842888E7F820882088210822280410 +6F88:0208210817C81210849E4FD44064179414942794E49427882488249424A405C2 +6F89:00084788208821100FDE849444A4579414942794E49424C827882C9420A400C2 +6F8A:0108209017FE109083FC42944B1C0A0413FC1204E3FC200827FE210820A80010 +6F8B:000023F8120813F8820843F8404017FE100023F8E20823F820402248244400C0 +6F8C:04804482249C2FD004908790449E579414942494EFD42014251428A430240044 +6F8D:010441042FE42104013E87C4400457E414542454E7C42444228420E42F140408 +6F8E:010441042FE82110010087C4400457C814502442E7C22444228420E82F100420 +6F8F:000023F81208120883F8400047BC14A414A427BCE04024442444244427FC0004 +6F90:000047FC20402FFE0842835840405358100027FCE0002FFE2100220827FC0204 +6F91:000027FE10A017BC84A444A447BC10A017FC2444E44427FC2444244427FC0404 +6F92:000020FE10101720827C42444244127C1244227CE3C42E44207C202820440082 +6F93:01402140127E1480897C4144427C16441A7C2220E23C224422A82210222802C6 +6F94:01082128122817BE84A844C8448814FE17802480E4BE24A224A227A224BE0022 +6F95:01102FFE1110100087FC415051501FFE11502150E7FC20402FFE204020400040 +6F96:000027BC14A417BC84A447BC4444144415F42444E4E42554264C244424540408 +6F97:000027BC14A417BC84A447BC440415F4151425F4E51425F42514240424140408 +6F98:0110211017BC111083B845544912100013F82208E20823F82208220823F80208 +6F99:00002080173C140487BC440447FC120013FC2400E7FE2002255224AA28AA0004 +6F9A:010027FC14441554844447FC44E4155410002FFEE20023FC2004200420280010 +6F9B:010043F024102FFC144487FC444457FC10002FFEE00023F8220823F8220803F8 +6F9C:0200217C1504144485F4444445F41554157425D4E55425F424E425542444044C +6F9D:008040402FFE28820548851448F4400017FC2444E7FC244427FC244424540408 +6F9E:0040207C104017FE844245F8444415FC150825F8E40025FE24202BFE28881306 +6F9F:00404FFE200027FC040485F4451455F4140427FCE00823F020402FFE21500E4E +6FA0:000027FC14A414A487BC40A047BC14A414A427BCE4A424A427BC24A220A2007E +6FA1:03F84208220823F8000087BC44A454A417BC2040EFFE21602250244838460040 +6FA2:00402248115017FE8402480443F8120813F82000E7FC244427FC244427FC0404 +6FA3:0108410821142FD4012287C0445C57C8144827C8E13E2FC82108210821080108 +6FA4:000027FC14A417FC804043F8404017FC111020A0E3F820402FFE204020400040 +6FA5:4400273C291492144FA44ACC0A802FA82ABE4AC8CF884A884ABE4A8848881188 +6FA6:00004FBE20882510023E81224FA252BE1222223EE2222222223E22002A140422 +6FA7:00A020A017FC14A487FC44A447FC100017FC2000E3F8220823F8211020A00FFE +6FA8:0210221013DE15288884400047FC104012482248E248255428E220402FFE0000 +6FA9:0A803138228838382288393822887FFE410281047D88095011202118C5060200 +6FAA:000047FC20402FFE084283584040535810A02398EC4623F02010232020C00020 +6FAB:0110211017FC111083F842484BF80A4813F81040E7FC2444245425F42414040C +6FAC:0440227C1084112886204250488C0BF8120813F8E20823F8220823F821100208 +6FAD:0040202017FE10288224427E44C81748117E2248E4C82F7E21482248247E0840 +6FAE:004040A023182DF6000087FC455454E417FC2000E3F8220823F8220823F80208 +6FAF:008040DC228423D404488A9443244C4012482150E7FC20E0215022482C460040 +6FB0:0040204010A01110820845F6400017BC14A424A4E7BC22102210252829441082 +6FB1:40002FDC285488544FD44A940AA62FC02A9C4A94CFD448145288524864540822 +6FB2:00A024A412A810A087FC411040A017FC104023F8E04027FC215022482C460040 +6FB3:0080210017FC14448554444447FC14E415542404E0402FFE20A0211022080C06 +6FB4:000023FC1294129483FC400047FE100013FC2204E3FC20A2211423082D440182 +6FB5:0200210217DC10108450429047DE1114111427D4E11425942554292425240244 +6FB6:00404FFE200027FC040485F4451457FC100023F8E20823F8220823F820000FFE +6FB7:03F8220813F8120883F8400047FC14A417FC2040E7FE210021F8210822280410 +6FB8:0014201217FE141085D0441445D4155815CA2416E442282422A2228A24780000 +6FB9:020043F8241027FE0D48962447FE540015FC2400E5FC240025FC290429FC1104 +6FBA:0080204013FC1108809047FE400013FC120423FCE20423FC20402524250A08FA +6FBB:00882448125010FC802040504694123812502298E23422542290222025FE0800 +6FBC:00102008178814BE848044944788147E14082788E6BE2A882A882B8832880008 +6FBD:0040207C104013FE824242784BC40A3C120013FEE24023A4225825B4245209B0 +6FBE:00102410127C101080FE4044462812FE1210227CE21022FE2210221025FE0800 +6FBF:0110211017BC111083B845544912100013F82000E7FC20402248244429420080 +6FC0:021044102F9028900FBE88A44FD4541412142FD4E4142788248828942A941122 +6FC1:000027FC14A414A487FC420053FE14421BFA224AE3FA2052207A278A22140008 +6FC2:002027FE1508149087FC445045FC145417FE2454E5FC245024D829542A521050 +6FC3:009023FC129413FC829443FC48000BFC120012F8E20023FE2520251425480986 +6FC4:000044F8228822E800A880A84DFC450415742554E5742504251425082A0011FE +6FC5:00404FFE280223F8000883F8400857FC144423F8E248204027F8211020E00F1E +6FC6:004027FC104011108FFE411043F8120813F82208E3F8220823F8211022080404 +6FC7:0040204017FC1248824845544FFE100017FC2404E5F4251425F4240427FC0404 +6FC8:03D42252125213D080104FFE425013D4125423D4E25422F82F4A244A20560062 +6FC9:002840242F40297E09C88F48497E59481F48297EE94829482F48297E20400040 +6FCA:0020213C112017FE801040144BFE0A1013F01254E25422D42368244A28960322 +6FCB:0110211017BC111083B845544912100017FC2044E24022782240254028FE1000 +6FCC:1C20702211B4FCA810A87D2456A27C4055FC7D0411047DFC11041F04F1FC4104 +6FCD:01104FFE2110220003FC84A44BA4416412542494E108204020242522250A08F8 +6FCE:01F8210811F8150A85FA450A45FA1402179E2090E0902F9E2492249224920892 +6FCF:000027BE1108110887BE4108410817BE10002080E0442512252229C023040CFC +6FD0:03FC220413FC120483FC40444BF8085017FE1040E1FC270421FC210421FC0104 +6FD1:021042102F9C222402488FBE4AA25AAA1FAA222AE72A2AAA3288221422220242 +6FD2:4200227E2A108BA04A7C4A441FD4205422544AD4CAD44B545120422844441882 +6FD3:004027FC111010A087FE44A047F814A817FE24A8E7F824A025B02AA82CA610A0 +6FD4:000027FC124814448FFE444446EC155416EC2444E6EC255426EC244424540408 +6FD5:000027FC140417FC840447FC421014A417382210E4A427BC2000254824A408A4 +6FD6:000027FC14A414A487FC404843F8105017FE2040E1F8230825F8210821F80108 +6FD7:01102FFE111013F8820843F8420813F810802FFEE24827FC2A4A224822580040 +6FD8:0080204017FC144482A842944474100013F822A8EFFE200027FC204021400080 +6FD9:0110455425B8291002A884444FFE480210402248E248245020A0211022080C06 +6FDA:0110455425B8291002A88444400057FC14442040E7FC20E0215022482C460040 +6FDB:011027FC111017FC840443F8400017FC10802144E6A8217026A8212626A00040 +6FDC:004023F8104817FE804843F8404017FE100022A4E45223F822A822A82FFE0000 +6FDD:010827FE110811F8810841F8410817FE11082294E5E2204823FC2040224804C4 +6FDE:008023F8120813F8820843F8400017FC144427FCE44427FC20002FFE21100210 +6FDF:0080204017FC111080A44F58455415521B582000E20823F8220823F822080408 +6FE0:004027FE100011F8810841F8400017FE140223F8E180264421B8266821A60E60 +6FE1:000047FC20402FFE084283584040535810002FFEE04027FC24A424A424A4040C +6FE2:07BC208414A4129484A4404047FC1110111022A8E44420402FFE204020400040 +6FE3:4210221022289FA842444F8A08A82F9828C84FA8C20E5FB84208420842080208 +6FE4:004027FC104013FC800047FE400213F8104027FEE00027FE200827FE24A80798 +6FE5:008041F82690206001A08FFE480247FC104027FCE44427FC244427FC22080404 +6FE6:003E27C01244112883F8404047FC100013F82008E3F8200823F82544252A08FA +6FE7:028442842AA426C4029E8FE440045454128C2FE4E10427C4210421C42E140008 +6FE8:0210212017FC1210821044A44738121014A427BCE08021482554251428F00000 +6FE9:010827FE1148122087FE4A2043FC122013FC2220E3FE220027F8211020E00F1E +6FEA:021042102F9C22240FC8823E4FAA502A1FAA28BEEFA028A02FA228A22AA2091E +6FEB:001027D0151017DE845047E8450417C4100023F8E2A822A822A822A82FFE0000 +6FEC:0040207C104017FE840243FC424814A4111023F8E60C2BFA220823F8220803F8 +6FED:011027FC1110104083F8404047FC1080111023F8E00023F822A822A82FFE0000 +6FEE:012821AA116C122882FE464456281AFE1210227CE21022FE2210222822440282 +6FEF:000027BC108414A4829444A44120121017FC2A20E3FC222023FC222023FE0200 +6FF0:422822242440857E49C85F48027E244829485F7EC14840485548557E50400040 +6FF1:0080404027FE24020BFC8148425057FC120427FCEA0423FC220423FC21080204 +6FF2:0200421C2F942214071480264F8048BC17142014E2142F8827082A9432240242 +6FF3:0108452827BE294807BE831845AA594613F82208E20823F82208220823F80208 +6FF4:0110455425B8291002A884444FFE484210402764E16821502248244429420080 +6FF5:002027FE140213FC822443FC4A000AFC128412FCE28422FC228424FC24480884 +6FF6:07BC24A417BC14A487BC4404443415C4144427FCE44425F4251425F424140408 +6FF7:0108799009603518C206011047FC211081F0404017FC1664E55426EC2444244C +6FF8:01102FFE1110104081B04E4E43F8120813F82208E3F8220025FC250429FC0104 +6FF9:000027FC144417FC844447FC404017FC10402FFEE5242892204027FC20400FFE +6FFA:00142792149E14F08794448A449617E214942492E79E20702514248A28960062 +6FFB:0010277C1554157C851046FE4500157C1544257CE544267C2444247C24280444 +6FFC:044444E428A82AAA0EEE84A44AAA4EEE12422040EFFE20E0215022482C460040 +6FFD:02084FBE22082FBE0208851448A257FC140427FCE40427FC240427FC21100208 +6FFE:0020203E102017FE842245F8442215FE152425FCE52425FC28402AA4328A047A +6FFF:000027FE148817FE848845FC452415FC152425FCE42027FE262A2AFA2A0A1206 +7000:07FC408023F8220803F882084FFE588215482514E8F4210023F8250820F00F0E +7001:0208211017FC104083F8408047FC114813FC260AEBF8220823FA2234228C0302 +7002:010043F024102FFC144487FC444457FC15242892E3F8220823F8220823F80208 +7003:40002F7C2944897C4F444944097C2F20297E49AACF2A404A4A924922494A1104 +7004:0210221013DE15288084400047BC14A417A424A4E7A42434252826A024200020 +7005:0110455425B8291002A884444FFE480213F82040E04023F8205020482FFE0000 +7006:00404FFE204027FC000087FC44A457FC120823F8E20823F8220823F821100208 +7007:0040202017FE148885FC448847FE142015FC2524E5FC252429FC288831040202 +7008:07BC24A4129414A48FFE484247FC104013F82248E3F8224823F8204027FC0040 +7009:00404FFE28822338020883B8420853F8120027FCE80425542554280420280010 +700A:010023DC12541366824047DC42541348125424A2E00023FC2294229427FE0000 +700B:004047FC2404283807C08248415057FC12482404EBFA224823F8224823F80208 +700C:0080204017FC14A087FC44A447FC1400152425A8E53025A4251C28002AA41452 +700D:002027FE140015FC852445FC452415FC142025FCE42027FE25242AFA282013FE +700E:010827FE1108100083FC42944A940BFC102813FEE220232422A82292242A08C6 +700F:020225E214A216AA852A466A410A128A144A2BAAE10A27CA2122254221EA0E04 +7010:0114211217D2111081104FFE429016D2129226D2E29426D4228A22CA2F160022 +7011:03F8220813F8120883F8411047FC11101FFE2110E248255420E02150224800C0 +7012:00404FFE2248255408E2815042484DF6100027FCE40425F4251425F4240407FC +7013:028842A826A82BF0001E822445D45C1415D42494E49425C82488249425D40422 +7014:02009FDC42140F9480145FD450660F80201C4F94C2145FD447084A8852540222 +7015:0100213E150815D0853E45224FE2103E1122257EE56225A228BE210022140C22 +7016:07FC204017FE14428B5C4040475C112013FC2620EBFC222023FC222023FE0200 +7017:00404FFE284227FC004083F8404057FC104027FCE4A427FC20402524252A08FA +7018:0040207C104013FC824443F04A440AFC12A812F8E2A822F8220025FC25540BFE +7019:4400223C2FA4802448BC45240FA4223C22244FA4C23C4B104A9852A84A2A0446 +701A:0410841044281F4484825F0051EE1F2231AA5F66C4225F6644AA442244AA0444 +701B:0080BFFC48000FF880004FF848080FF820805C9CD7D45D54555C5C9655562E22 +701C:00084F8820082708053E852A472A502A1FAA2DBEEAA82F882A8A2A8E2ABA0990 +701D:000027FE14441598848847DE448815DC16AA2488E4202520253C2920292017FE +701E:022042202FB822480F90827C4F9450141FFE2894EF9428FC2F9428902A900930 +701F:011027FE115013F8804847FE404813F81554275CE44427FC2444275C25540954 +7020:0110455425B8291002A8844447FC5484111023E0E04827FC2044224825440080 +7021:00104E7E2B202ABC0AC88CBE4A004BBC1AA42ABCEAA42CBC28A428AC29400A3E +7022:002049FC252421FC002083FE4D0445FC150425FCE50425FC248825042BFE1000 +7023:010041BC252427A804908AA8414652A017BC20A0E3B820A027BC20A02FFE0000 +7024:008040402FFE200007FC84A447FC524811502208E44420A8211023082D460180 +7025:07BC24A4129414A4804047FC400011F0111021F0E00027FC240424E424A404EC +7026:00109F90427A04128C1452FE47080A10333C46E4CAA4523C422442244A3C0424 +7027:0210211017DE1010845E428247DE101017DE2450E7DE245027DE2450245204CE +7028:0108210817CE1112812447DE4552155E17D2211EE392255E2940211421120122 +7029:01804E3E22083F90023E87224AA2527E1022273EE5222522257E298029141022 +702A:20207F3EAA447FA82A103F2804441FF010101FF010101FF001843D480930730E +702B:02009FDC42140F9480145FD450660F80241C4894CF1442945FC84A8852540622 +702C:4200223E2F888210423E4FA20AA22ABE2FA2423EC72246A24ABE520042140222 +702D:0410841044281F4484825F7C55001FE235AA5FAAC4EA5FAA44AA44E244AA04A4 +702E:07FC40402FFE2842035880404358500011102FBEE11023B82554291221100110 +702F:008822AA12DC14888154422247FE140211F82108E1F8200023FC220423FC0204 +7030:40002EFE2254829242FE4E9208D628BA28D64E92C2D642BA42D642924A9A0484 +7031:40002FFE29128FFE40004FFE08802AA2288A494ACA2A488A4AAA5082514A2224 +7032:0208820845080890905E6FA4401400143DD45554D5545DC84888489455542222 +7033:011027FE1110104087FE44A047FC14A417FC2500E5FC250025FC280435540008 +7034:07BC24A417BC14A487BC44A447BC131814A42080EFFC2110232020C021B00608 +7035:0248215017FC1150864C43F8424813F8124823F8E11027FC21102FFE22080404 +7036:00404F402A7E2A800A008F7C49444944197C2F00EAEE2AAA2AAA2AAA2FEE00AA +7037:000027BC14A4129484A443F8424813F8124823F8E11027FC21102FFE22080404 +7038:0448444C2AAA20080FFE82884EE8528A1EEA228CEEEC228822EA2F1A24260042 +7039:404020A0211082084DF640000EEE2AAA2EEE4000CFFE49224FFE4922492A0804 +703A:01F0221017FC120483FC42244BB80A2211FE1210E7FC224423FC20D0214A063E +703B:011447D221102FFE001087D0455257D2155227D4E29427C8228A2FFA22A60442 +703C:004027FC100013B882A843B8411017FC111027FCE1102FFE212823102D480186 +703D:004027FE149213FC809043FC409017FE110823FCE50A21F82240227C254008FE +703E:07BC24A417BC14A487BC444445F4144415F42554E5F4255425F424E42554044C +703F:021043D0241E2FE405548FF4454857D411B22220E7C0208827FC204423500488 +7040:07FC40402FFE28420358804043585000127C2FC4E27C27442AFC3244227C0244 +7041:4FBE28A22FBE88A24FBE484209F2291229F24912C9F248464F6A49524A4A0CC6 +7042:003C27C01244112887FC44A447FC1008178824FEE78824A82798250825A80690 +7043:015023F8155417FC855447FC455417FC100027FCE00023F8220823F821100FFE +7044:03FC210811F8110881F8410E47F8100817FE2294E39C2294239C22D627BC0084 +7045:07FC444427FC244407FC80004FBE5AAA1FBE2AAAEFBE2040204027FC20400FFE +7046:009027FE109013E8828843CE4A500BD412A213E2E00023FC2294229427FE0000 +7047:049242942FFE211007FC804043F850401FFE2480E7BC2494279424C82F9400A2 +7048:07BC24A417BC14A487BC44A447BC112013FE2220E7FC2A2023FC222023FE0200 +7049:0A98951454900A3E9F2851685F3E00283F28553ED5285F2850A850BE4FA00020 +704A:0FBE45282FBE2308059A892647FC500013F82208E3F8200027FC249425F4044C +704B:00404FFE29202FFC09248FFC49004BFE18022AAAE8442BF828402FFC291013F8 +704C:01104FFE211027BC04A487BC4140512013FE2220E7FC2A2023FC222023FE0200 +704D:0FBE48A22FBE28A20FBE8C424A924FDE19262D5AEFD22912292A2A462C0A0804 +704E:05089FC8555C1FC895485FFE40081FD020144FBEC8804FBE48AA452A43AA1C7E +704F:40002FBE28888F9048BE4FA202223FEA202A4FAAC8AA4FAA42084A9452520622 +7050:0110455425B8291002A884444FFE484210A02318EDF6204027FC224821500FFE +7051:0FBE400027BC24A406B484A4404057FE14A027FCE4A427FC251229DC291211CE +7052:052847BE294827BE031885AA494653FC120423FCE20423FC220423FC21080204 +7053:210447C88812F3BC20084B92F83E0380AAAAABAA01087D90096011202518C206 +7054:05109FD0555C1FE495485FFE402A1FEA202A4FBEC8A04FA048A2452243A21C1E +7055:040C820A5FC8051E92545574505E1FD422145FDED45455545754505E51501090 +7056:002027FE148817DE848845DC46AA1488145027DEE45025DC24502BDE28501050 +7057:081088FE48003EFE2A822ABAAAAA6AFE3E00287C08444A7C8E443A7C100000FE +7058:451825142F90853E472842680FBE2AA82FA8423ECFA842285FE8453E48A01060 +7059:0248215017FC140481F0411047FC155414E427FCE04027FC20402FFE22A40452 +705A:02AC444426AC244406AC84044FFE4A0A13F82208E3F8220823F820A02124061C +705B:4F1E29122F1E89124F1E4BBA0AAA2BBA29F24952C9F2495249F248424BFA0846 +705C:0080BFFC48000FF880004FF848080FF820005DDCD5545DD4555C5DD654962D62 +705D:40002FBE28888F9048BE4FA202223FFE20224FBEC8A24FA2423E4A8052540622 +705E:47FC20402FFE8842435845000FBC25242724423CCFA44AA44FBC42245FA4024C +705F:07FC240417FC152484A8452445FC155415FC2644E5F4255429F4284433F40008 +7060:0790251E17A8148487BE452A47BE100013F82208E3F8220823F820A02124061C +7061:011027FE111017BC84A447BC44A417BC144427FCE55425F4244424E425540448 +7062:004027FC124813F880404FFE4AAA13B8111027FCE1102FFE212823102D480186 +7063:444428E82E0E84E44A0A4EEE00A02AEA200047F8C00847F8440047FC40040038 +7064:444424E42A0A8EEE44044AEA0E0E20E02AAA4AEAC0404FFE415042484C460040 +7065:02001FF010101FF010101FF0092013107C7C44447C7C44447C7C92925454B2B2 +7066:00009FDE50441FC8905E5FD24892155E3DD2489ED5525DD2401E5540554C0012 +7067:42102A902F9C8AA44FC84ABE0FAA202A3FEA403ECFA048A04FA248A245221F9E +7068:04109F9C493406089FB6401C4F8808BE2F8048BECFA2423E5FA2423E42140222 +7069:42082A882F9C8A884F884ABE0F8820103FD4403ECF8048BE4FAA48AA452A1FFE +706A:428822E82F5E82EC475A4AE802082FFE29425494C55847F2420443E8420203E4 +706B:010001000100110811081110212021004280028004400440082010102008C006 +706C:0000000000000000000000000000000000000000000000002488224442448004 +706D:0000FFFE0100010011081108111021204280028004400440082010102008C006 +706E:010011081108229004401830E00E0440044004400440084010422042C03E0000 +706F:1000100013FE1020542058205020902010201020102028202420442040A08040 +7070:040004000400FFFE0480088008880A9012A014802140414082200210040E1804 +7071:1000100011FC1044544458445044904410441044104428842484450442288410 +7072:080408040804094449444A444C44884408440844144412442104210440148008 +7073:0800080008001FFC100422044244924412842204050404840844100460280010 +7074:1000100011FC1020542058205020902010201020102028202420442043FE8000 +7075:00003FF8000800081FF8000800083FF801001110111022A0044008203018C006 +7076:10201020102010205420582051FC902010201020102028202420442043FE8000 +7077:010011081108229004401830E00E082008200820FFFE08200820102020204020 +7078:040004000FE01040208003600C18700401001110111022A0044008203018C006 +7079:1010107813C01040544058405040907E17C010401040284224424442403E8000 +707A:1020102010201120552C5934516493A411241134112829222522450240FE8000 +707B:010001003FF8010001000100FFFE000001001110111022A0044008203018C006 +707C:10401040108010FC55045A045004910410841044104428042404440440288010 +707D:1110111022204440222011101110000001001110111022A0044008203018C006 +707E:020001007FFE400281040100110811081110212002800280044008203018C006 +707F:102010201020102055245924512491241124112411242924252445FC40048000 +7080:100011F8101014205840508051FE909210921092111229222622444240948108 +7081:00007FF80200420042007FFC0480088010842084C07C00002488224442448004 +7082:101010901090148858885124512492221440104010882884250443FE41028000 +7083:0440082010102FE8C4260420082010A06040010011101120228004401830E00E +7084:100013F81088148858885088508897F811081108110829082508410847FE8000 +7085:00001FF0101010101FF0101010101FF00100110811102280044008203018C006 +7086:10401020102013FE548858885088908810881050105028202450448841048602 +7087:104010401040148058FE51085288908810881050105028202450448841048202 +7088:100010F81088148858885106520091FC10841084104828502420445040888306 +7089:10801040104015FC59045104510491FC11041100110029002600420044008800 +708A:104010401040127C528454885920902010201050285028502488448841048202 +708B:1000100011FE1010541058205020906810A41122122228202420442040208020 +708C:1020102010501450588851045202908810881088108828882488450841088208 +708D:1008101C11E01500590051FC5144914411441128112829102510422842448482 +708E:010011081110212002C004301808600401001110111022A0044008203018C006 +708F:10401040104014405944514451489250104010A010A028902510410842048402 +7090:10201020102011FC54205820502091FC1020102010202BFE2420442040208020 +7091:10201020102014205BFE50205070907010A810A811242A222420442040208020 +7092:10201020102010A854A458A25122912012241024102828082410442040C08300 +7093:101011101090109054105910509090901010101E13F028102410441040108010 +7094:10401040104017F8584850485048904817FE104010A028A02510411042088406 +7095:10801040104013FC5400580051F09110111011101110291225124612420E8400 +7096:10201020102011FE5420592451249124112411FC1024282024224422401E8000 +7097:08200820FFFE0820082008200FE0082001001110111022A0044008203018C006 +7098:1008101C11E015005900510051FE911011101110111029102510421042108410 +7099:020004000FF81210692004C003000C0071001110111022A0044008203018C006 +709A:002000207C20442444A444A444A87D2044204450445044507C88448801040202 +709B:010011081108229004401830E00E08800888109030E0518096841084107C1000 +709C:10401040104013FE5440584051FC9040104013FE10422842244A444440408040 +709D:1040104010A014A059105208540691F011101110115029202504450440FC8000 +709E:10401020102014005BFE50405040906010501048104428442440444040408040 +709F:1000100011FC15045904510451FC91041104110411FC29042400400043FE8000 +70A0:100011FC11241124552459FC51249124112411FC112428202420442040208020 +70A1:1000100013FE14205820502051209120113C1120112029202520412047FE8000 +70A2:102010281024102055FE58205070907010A810A811242A222420442040208020 +70A3:1000100013FE1008540859E8512891281128112811E829282408440840288010 +70A4:100013FC108410845484590451149208140011FC110429042504450441FC8104 +70A5:10901090109013FC5494589453FC9290129013FE10922892251A451442108410 +70A6:10501048104814405BFE5080508090FC11441144112829282610422844448182 +70A7:1080108010FE15005A205120512C917413A41124113429282522450240FE8000 +70A8:10201010101015FE5902520450809088109010A010C0288224824482407E8000 +70A9:1040104010A014A0591052485426902013F810081010291024A0444040208020 +70AA:10201020112415245924512451FC902010201124112429242524452441FC8004 +70AB:10201010101015FE582050205044908411F8101010202844248245FE40828000 +70AC:100011FE11001100550059FC510491041104110411FC29002500450041FE8000 +70AD:0100210821083FF808000800FFFE10801088148824902940414082200C183006 +70AE:1080108011FC15045A0455F451149114111411F4110429282512450240FE8000 +70AF:100011FE110215025902517A514A914A114A114A117A294A25024502410A8104 +70B0:080008001FF020105F90109010901F901050102410040FFC0000488844448444 +70B1:02000400082010103FF800081FF0101010101FF00100111022A004401830E00E +70B2:102010201040108855045BFE5002900011FC1104110429042504450441FC8104 +70B3:100013FE10201420582053FE522292221252124A128A2B0226024202420A8204 +70B4:10201020102011FC5524592451249124112413FE102028502450448841048202 +70B5:10401040107C108455885A50502090501088130610602810240844C040208010 +70B6:1020102010201020543E58205020902011FC1104110429042504450441FC8104 +70B7:10401020100015FE582050205020902011FC1020102028202420402043FE8000 +70B8:11001100110015FE5A805280548090F810801080108028FC2480448040808080 +70B9:02000200020003FC020002003FF02010201020103FF000002488224442448004 +70BA:020012000A007FF0042004400FF8080810101FFC20042AA44AA4900400280010 +70BB:1000100013FE102054205840504090FC11841284148428842484448440FC8084 +70BC:1040104017FC108054805BE05120922013FC1020112829242622442240A08040 +70BD:1000100011FC1104550459045104910411FC1104100028902488450442028402 +70BE:100011FC110411045504590451FC9050105010501050289224924512420E8400 +70BF:1020104011F815085908514851289128110817FE110829082508410842288410 +70C0:1008103C13E01020552458A450A8902013FE1020102028202420442040A08040 +70C1:1008101C11E0110055205920512091FE1020102010A828A42522462240A08040 +70C2:1000110810881490580053FE50009000100011FC100028002400400043FE8000 +70C3:100011FC100810105430584850849302100011FC102028202420442043FE8000 +70C4:10401020102013FE540058885104920210881088105028502420445040888306 +70C5:102010201040148059FC51545154915411541154115429542554415443FE8000 +70C6:10801080113C120054805880517E930815081108110829082508450841288110 +70C7:10201020105014885904520251FC90201020102011FC28202420442043FE8000 +70C8:00047F84082408241F24212451240A24040408143008C0002488224442448004 +70C9:080008001FE020204040BFF820082288244828280100111022A004401830E00E +70CA:11041084108814005BFE5020502091FC1020102013FE28202420442040208020 +70CB:08400840104037FC50E091501150124814441842104000002488224442448004 +70CC:109010901090151059FE53105510913811381154115429922510451041108110 +70CD:10201120112011FC55205A20502093FE1090109010902890251245124212840E +70CE:00003FF808200820FFFE08201020202041201110111022A0044008203018C006 +70CF:020004001FF0101010101FF010001FFE10001FFC000409242494249440280010 +70D0:1020104011F8150859485128512893FE11081148112829282508420842288410 +70D1:10901090109014925A945098509091981294149210902890251241124212840E +70D2:10281024102414205BFE5020502093A0112011101110291025CA470A42068002 +70D3:1020102011FC14205820502053FE90001020102011FC28202420402043FE8000 +70D4:100011FE11021102557A59025102917A114A114A114A297A25024502410A8104 +70D5:0028002400203FFE202020202FA4222422642AA832282510249248AA50468082 +70D6:084008487F4408440840FFFE00400844294429442A28482A1412122A22464082 +70D7:10201010101013FE54205842508491F81010102210C42B082410442840C48302 +70D8:108810881088108855FE588850889088108813FE100028882484450442028402 +70D9:1080108010F815085B1054A0504090A01118120615F829082508450841F88108 +70DA:102010201050108855045A0251FC9000100011FC110429042504450441FC8104 +70DB:10201020102011FC552459245124912411FC112410202828242445FE40828000 +70DC:100013FE1000140059FC5104510491FC1104110411FC29042400400043FE8000 +70DD:00001FE0004000807D040588095011202118450682001FF00000488844448444 +70DE:10881088108814885BE85088518C91CA12AA1288148828882488448840888088 +70DF:100013FE120216225A22522253FE922212221252124A2A8A2702420243FE8202 +70E0:1040104017FE1080550059FC5304950419FC1104110429FC2504450441148108 +70E1:010011081108229004401830E44E04403FF804400440FFFE0000082010102008 +70E2:1040102013FE12025400583853C090401040107C13C0284024424442403E8000 +70E3:10401040104013FE54805890509091121152115412902A282428444440848102 +70E4:1040104411F4104854505BFE5040908011FE1240148028FC2404440440288010 +70E5:100011FE11201120552059FC510491041104110411FC29202520452041FE8000 +70E6:100013FE1020104055FC59045104912411241124112429442450448841048204 +70E7:2080208020BC23C0A850B024A0D4A30C200027FE2090209051124912420E8400 +70E8:10901094111415185B1055325152910E1120102013FE28202420442040208020 +70E9:10201020105014885904520250F89000100013FE102028402488410443FE8102 +70EA:108810481050100055FC58205020902013FE1020105028502488448841048202 +70EB:23F0102080C043FC11242124E2442484292820100100111022A004401830E00E +70EC:100011FC1104150459FC511051109108110412621410280024E0441840048000 +70ED:104010401040FDF8104810481CC83048D0AA10AA510622020000488844448444 +70EE:7F84082410243F2451240A24040408043014C10811101120228004401830E00E +70EF:11841068103014C85B04504053FE90A0112013FC152429242534412840208020 +70F0:1008103C11C01004554458A8500091F81010102013FE28202420442040A08040 +70F1:100013FE120216525A8A5306520292FA128A128A128A2AFA268A4202420A8204 +70F2:080C08F07E8008800EFE7888088829081208010011101120228004401830E00E +70F3:1028102413FE1020542059FC5124912411FC1124112429FC252445244124810C +70F4:100011FE100014925924524851249092100011FE102028202420442043FE8000 +70F5:1088108813FE10885400588050FC910412041484104428442404440440288010 +70F6:1000100613B8148858885108513E9388108812881288293E25004280447E8800 +70F7:1040102013FE16025C0451F85000900013FE10901090289025124112420E8400 +70F8:1080108010FE15005AFC508450A4909413FE10841124291425FE440440288010 +70F9:0100FFFE00001FF010101FF000003FF000600180010005000200488844448444 +70FA:1040102011FC1104550459FC5104910411FC1120112229142508454441828100 +70FB:1004100E13B8148858885128512E93A810A812A812A8293E25004280447E8800 +70FC:100013FE1040148059445224506890B011301228106828A42522422040A08040 +70FD:1040104010FC10885550582050D8932610F8102010F8282027FE442040208020 +70FE:01000910092012C0043019086914091012A004401830610C1FF0010001007FFC +70FF:100213C2124416485B5052C2524292441FE8125012422A4226444248445088E0 +7100:10001050104810845524582050509088110612F8108828882488448840F88088 +7101:0080008078FC49044A48484078B0030C0C02010011101120228004401830E00E +7102:1040104024FE6488A55024202450208801041110111022A0044008203018C006 +7103:1020102011FC10205420582053FE90481048114C114A2A4A2488448841288210 +7104:00003FF80408FFFE04083FF808001FF8280848088FF808080000488844448444 +7105:10201120112011FC55205A20502093FE1000100011FC29042504450441FC8104 +7106:100010FC1084108454FC580051FE9102110211FE1102290225FE4502410A8104 +7107:1020112410A410A8542059FC5104910411FC1104110429FC2504450441148108 +7108:1000087C3E442244227C3E4022422042413E9110111022A0044008203018C006 +7109:00007FFC010011F811001100FFFE08000FF810001FFC00042924249440280010 +710A:100011FC110411FC550459FC5000900011FC102010202BFE2420442040208020 +710B:2420242024203DFC0420FC20242024F84400010011101120228004401830E00E +710C:10401040108815045BFE500250889144124210F811882A502420405041888606 +710D:11081088109015FC5824502451FC9120112011FE106228A2252A422444208020 +710E:1000100C11F0FD00110011FE1D10F11011101210521024100000488844448444 +710F:00003FF0002000400180793C4944492849107928014405000200488844448444 +7110:100013FE1040104055FC5884508493FE1000100011FC29042504450441FC8104 +7111:100013FE122216225A2253FE52229262127212AA13222A222622420243FE8202 +7112:100010FC108410845484588450FC9000100011FE110229022502450241FE8102 +7113:10201020105014885944522250F890081010102011FC29042504450441FC8104 +7114:10401040107C148459085210513E912211221122113E292225224522413E8122 +7115:1080108010F815085A1055FC512491241124112413FE28502450448841048602 +7116:110010BE128216025A2252125252924212CA135612522A3226024202420A8204 +7117:100011FC1104150459FC5100510091FE1102117A114A294A267A420244148008 +7118:020002007FFC02003FF80400FFFE08201FFC20204420822002A0004024884244 +7119:1040102011FC100055085890500093FE1000100011FC29042504450441FC8104 +711A:082008207EFC08301C682AA4C922082009201110111022A0044008203018C006 +711B:7C7C44447C7C44447D7C4104410449244924494451844244422444244804500C +711C:100011FC1104110455FC5904510491FC1000111211D42918251045524192810E +711D:101C13E0122013FE56205A92530A920611FC1104110429FC2504450441FC8104 +711E:1040102013FE100055FC590451FC900011FC100810102BFE2420442040A08040 +711F:10881088108817FE5888508857FE900011FC1104110429FC2504450441FC8104 +7120:1040102013FE100054885888515492221000102013FE28202420442040208020 +7121:100010001FFC2AA04AA00AA07FFC0AA00AA00AA07FFC00002488224442448004 +7122:10201010101015FE5902525450889104100010FC102028202420442041FE8000 +7123:00007F0022FC3E4422443E44222822282F10F228424402820000488844448444 +7124:010000803FFE2210221025FE2C903450441044508520111022A004401830E00E +7125:1040102013FE12025504590051DE925212521352149A2894251045124212840E +7126:090008801FFC108030805FF8908010801FF8108010801FFC1000488844448444 +7127:10901090110815485A445492510893FC1044102010A42A82268A428A44788000 +7128:100013FC120412F456045AF4500091F8110811F8110829F82508450841288110 +7129:100013DE125216525A5253DE52529252125213DE12522A5226524252455288A6 +712A:1040102013FE120254885904520291FC100411FC110029FC2404440440288010 +712B:1088108813FE108854A8582051FC912411241154114C29842504450441148108 +712C:100011F81108150859F85108510891F8108011FC125428942524424440948108 +712D:08202AA42CA84920145022887FFE400280040FE00820082008221022201EC000 +712E:201020902710243EAC22B444A790A51025102510252825285528494449449082 +712F:10201020103E142059FC510451FC910411FC112410202BFE2420442040208020 +7130:10401040107C148459085200502091CE1102110211CE29022502450241FE8102 +7131:010011081108229004401830E00E08100A102A542C5448981410222842448082 +7132:2080204027FE2120A920B23CA244A664229423482248223052204A5042888306 +7133:10A01090108015FE5910531055FC9110111011FC11102910251045FE41008100 +7134:1040102013FE108055045BFE500291FC110411FC110429FC2504450441148108 +7135:100013FE1202168A5A5253FE5222922212AA12AA12AA2AFA26024202420A8204 +7136:102010281E24222033FE4A20A450145008881088210442020000488844448444 +7137:1040108011FC1124552459FC5124914411FC109011102BFE2410441040108010 +7138:00003E7C224422443E7C224422443E7C01001110111022A0044008203018C006 +7139:100013FE1202168A5A5253FE5242922213FE128212822A8226FA4202420A8204 +713A:100011FC110411FC550459FC5000902811C8108810882BFE2488448841088208 +713B:11F81108110815F85908510851F8900013FC120412042BFC2604420443FC8204 +713C:1020102011FC102054A8588853FE9088100013FE1090289025124512420E8400 +713D:00007CFC448444FC7C8444FC44847C84011402080100111022A004401830E00E +713E:10201020105014885944522251F890081050102010A42A82268A428A44788000 +713F:1040102013FE16205AFC5224522493FE1224122412FC2A202650445044888906 +7140:100013FE120216025BFE521052929292129212FE12102A922692449244FE8802 +7141:1088108813FE108854F8588850F89088108813FE110029482584450041FE8000 +7142:1088108813FE108854F8582051FC9124112411FC10202BFE2420442040208020 +7143:1020102013FE105054885B2651FC9020102013FE1000282025FC4420402083FE +7144:1008103C11E014205BFE502051FC912411FC112411FC282025FC442043FE8000 +7145:102011DC11141114551459D45126910011DC1114111429D42708450841148122 +7146:100013DE124216425A4253DE5200923E13D2121212142BD42608421442248242 +7147:100013FE1222102055FE582051FC912411FC112411FC282027FE442040208020 +7148:200027FC24042434ADC4B444A5F4A554255425F42444245455F44C9448069002 +7149:1020102013FE102055FC592451AC9174112411FC1020287024A8452442228020 +714A:1040102013FE1202540459FC500091FC110411FC110429FC2504440043FE8000 +714B:100011FC110415FC590451FC5020912011FE1220102029FC2420402043FE8000 +714C:1020104011FC150459FC510451FC900013FE1020102029FC2420402043FE8000 +714D:208821C827082108A92AB12AA7ACA14823082388255425145914492441248142 +714E:10100820FFFE00003E4822483E4822483E0822082A2824100000488844448444 +714F:100013FE100015FC5904510451FC900013FE122212222BFE2622422243FE8202 +7150:1088108813FE108854A8582051FC91241124112413FE28202450448841048202 +7151:01081FD001207FFC02000FF03810CFF008100FF00100111022A004401830E00E +7152:2040204021FC2084ABFEB000A1FCA10421FC202023FE202052204BFE40208020 +7153:102011241124112455FC580053FE9020104011FC11542954255445544154810C +7154:1020522054209020283C44208220102010FC5284548490842884248442FC8084 +7155:00007F7C444454445744517C51405740544244427F3E00002488224442448004 +7156:101E13E010441524588851FC5040904013FE108010FC29442528421040688186 +7157:100013FE1020104055FC5954515491541154112C10202BFE2450448841048202 +7158:20142012201027FEAC10B410A5D0A412241225D42554254855DA4C2A48469082 +7159:100013FE105014505BFE52525252925213FE102010202BFE2420402047FE8000 +715A:00007CFE448044FC7C8444FC44807CFE01001110111022A0044008203018C006 +715B:00003EF822883EF822883EF822883EF801001110111022A0044008203018C006 +715C:100011FC110415FC590451FC51049040102013FE100029042488400047FE8000 +715D:100013FC122416245BFC520052FC9284128412FC12842AFC2684428444FC8884 +715E:202020203C40447E88847F44024402287E2802100228FE440082488844448444 +715F:100013FE122213FE56225BFE500091FC110411FC110429FC2504450441148108 +7160:10481148114817FE594851485178910011FE102013FE287024A8412446228020 +7161:20102010207C2714A9FEB114A27CA210277C211021FE251052104B0044FE8800 +7162:08202AA44D28145022887FFE400280041FE0042004203FA004200414040C0404 +7163:100011FC104814305BFE5052509491101230102013FE287024A8412446228020 +7164:1088108813FE1088548858F85088908810F8102013FE287024A8452442228020 +7165:2080208020F82108AA10B5FCA104A154218C2124202023FE5050488841048602 +7166:0100790049FC4A044C0479E44924492449E44804782800102488224442448004 +7167:00007DFC44444444444444947D0844FC4484448444847CFC0000488844448444 +7168:100011FC1124112455FC5924512491FC100013FE112029222514454841848102 +7169:100013FE1020144059FC5104510491FC110411FC1104290425FC440040888104 +716A:11081088109017FE5890509053FC92941294130C12042BFC2604420443FC8204 +716B:2108209020002BFEB080A184A244A4A82130227024A8212852244C2248A08040 +716C:200023F822082BF8B208A3F8A000A7FE220023FC2494292452444C8449288210 +716D:2484490424A400247FA408241F24612412240C043014C0080000488844448444 +716E:020002083FD00220FFFE01000FF03810CFF0081008100FF00000488844448444 +716F:1110111211D4111855525992512E904011FC1104110429FC2504450441FC8104 +7170:100010F8108814885888508850F89088100013DE12522A522652425243DE8252 +7171:100011FC1104150459E45124512493FE120212FA128A2A8A26FA4202420A8204 +7172:08000BF8120833F8504097FC11501248144410400100111022A004401830E00E +7173:1100113C112417A45924513C512493A412A412BC12A42AA427A4444440548088 +7174:100011F81108150859F85108510891F8100013FC12942A942694429447FE8000 +7175:1020102013FE1420582053FE528A925212FA122212222AFA26224222422A8204 +7176:100011FC1104150459FC5104510491FC100013FE10202920253C412042A0847E +7177:2080204027FE2000ABF8B208A3F8A00027FE240229F4211051104A124412880E +7178:1040102011FE1102550259FE5100910011FE11AA12AA2AFE24AA44AA40A28086 +7179:1088108813FE148859FC508853FE902011FC112411FC292427FE410441148108 +717A:200024F822882288A8F8B088AE88A2F822A22294228822A852C44A84450088FE +717B:1020101013FE16205AFC522453FE922412FC122012FC2A842684448444FC8884 +717C:2080208021FC2A44B154A1F4A084A128229021FC2244255451F4488449288210 +717D:1020101011FE1502590251FE510091EE112211AA11662922256642AA42228466 +717E:100011FC1124152459FC51245154918C110411FC1040282024A4428A428A8478 +717F:1028102413FE102055FC592451FC912411FC112410082BFE2488444840488018 +7180:100011FC110411FC550459FC5020912410A8102013FE2890249045124212840E +7181:104011FC1044109455085BDE514A914A129411FC110429FC250445FC4104810C +7182:2100210021FC2A00B5F8A000A3F8A08822A821C827F8208A51CA4EAA48868082 +7183:00407EFC15440838FE441AA22CFC4844A89411080100111022A004401830E00E +7184:1020104011FC150459FC510451FC910411FC1040102028A4268A428A44788000 +7185:100013F8124812A857185A0853F89000100017FC14A42CA424A444A44FFE8000 +7186:1020102011FC1420582053FE5080910413FE100213FC2A942694429447FE8000 +7187:1040102013FE140059FC510451FC900013FE120212FA2A8A26FA4202420A8204 +7188:00002FBC2A242A242FA428BC28A02FA02A224A224F9E80002488224442448004 +7189:100010FC1084108454FC580051FE910211FE110211FE290225FE444840848102 +718A:1080249842E07E8400847E7C42807E9842E07E844284467C0000488844448444 +718B:108024987EE000847E7C42007E9842E07E844284467C0100111022A00C60701C +718C:100013DE125217DE5A5253DE520292221222122212522A4A268A4202420A8204 +718D:1020101011FE1102540058FC5084908410FC100011FE29022502450241FE8102 +718E:1008103C13C010045644592851FC9220102013FE102029242524452441FC8004 +718F:00F83F000100FFFE01003FF8292825483FF801003FF80100FFFE488844448444 +7190:100013FE1202100055FC590451FC910411FC104010202BFE2400448841048202 +7191:10881050100015FE585051FC505493FE105411FC105028D82554425240508050 +7192:08202AA42CA84920145022887FFE400281041110111022A0044008203018C006 +7193:2080210023F82208AA08B3F8A200A3FE220023FC200425545554480440288010 +7194:1040102013FE160258505088512490501088110412FA28882488448840F88088 +7195:100011FC102014205BFE500051FC910411FC110411FC290425FC448841048202 +7196:101E11E01022111254945880502091CE1102110211CE29022502450241FE8102 +7197:2040204020A02990B248A7FEAA08A3F8220823F8220023F855084D0849F88108 +7198:104013BE121216925A5252AA5324904013FE122212222BFE2622422243FE8202 +7199:00007F7C444444445F44517C51405F40444244427FBE00002488224442448004 +719A:100011FC112415FC592451FC50A890A813FE10A810A829FC242043FE40208020 +719B:100013FE105011FC5554595451FC900011FC100013FE282024A8452442A28040 +719C:1020104011FC1524597C518C51549124115411FC1020281025544542414A8238 +719D:1040102013FE125056505BFE5252925213FE120012922AD42698449244D2888E +719E:100013DC129417D45A5453C85288929413E21000102029FC2420402043FE8000 +719F:1040FE4000407DF844487C4800C87C4808AAFEAA110652022000488844448444 +71A0:100013DE10421252554A5A525042902011FC1104110429FC2504450441FC8104 +71A1:204023F822482FFEAA48B3F8A040A3F8224823F820802FFE511048E043188C04 +71A2:1020147C12841548583050CE5610927C1210127C12102AFE2610421045FE8800 +71A3:1020122213FE1090548859FE5310951011FE1110111029FE2510451041FE8100 +71A4:100013DE1042114A54C6594A525290021040102011FC280025084488409083FE +71A5:20FE240422282210A8FEB092AE92A2FE229222FE2292229252964D0048FE8000 +71A6:102011241122152A5A325060519097FE112011FC112029FC2520452041FE8100 +71A7:11102110CAA814443240D27C154014FE0800010011101120228004401830E00E +71A8:3F0821083F7E20082F4820285FA8440895282C900100111022A004401830E00E +71A9:1040102013FC16045BFC520052F8928812F8120013FC2B2425FC4502490280FE +71AA:20102190261E2222AA54B208AF90A2642208271E2AA2224252144A0842108260 +71AB:1040102013FE120056485A4853FE92481248124812782A002554452A4A2A9000 +71AC:082008207F20087E7E4408A4FF2810101E282244468280002488224442448004 +71AD:1010FEFE10107C7C1010FEFE10103FF800081FF800083FF8111022A00C60701C +71AE:200027BC208424A4AA94B4A4A050A188262620C0231020645388483040C08700 +71AF:1088108813FE108854F8582051FC912411FC102011FC282027FE445040888306 +71B0:100013FE1200167C5A445244527C920012EE12AA12AA2AAA26EE420043FE8000 +71B1:104010407C4010F8FE48444892C87C4810AA1CAAE10642020000488844448444 +71B2:400044FE7810422042FC3E84008410FC528452FC5484908428FC244844848102 +71B3:100011F8110811F8550859F8500093FC129413FC100029F82490446041988606 +71B4:20402444244427FCA800B7FCA404A7FC240427FC2000242457A84C3245A2861E +71B5:1040102013FE1488585053FE5252928A130612FA128A2A8A26FA4202420A8204 +71B6:200023F8220823F8AA08B3F8A000AFFE248027BC2494279454D44F88409480A2 +71B7:11041088100013FE56225AAA5272922213FE100011FC290425FC450441FC8104 +71B8:200027BC21082528AFBCB318A5AAA946200023F82208220853F84A08420883F8 +71B9:01007FFC01003FF800003FF820083FF80820FFFE00003FF820083FF824884244 +71BA:102013FE102011FC540059FC510491FC108813FE100029FC2504450441FC8104 +71BB:204020A021182EE6B000A3F8A208A3F8200027BC208424A452944CA44A948108 +71BC:200027FC244427FCAC44B7FCA110A11027FC211021102FFE5000491042088404 +71BD:102011FC102417FE582451FC502092AA13AE122213FE2A2227AE42AA42AA8422 +71BE:1110109413D214125A50519057FE901013D2125212542BD4264A424A43D68022 +71BF:1088108811FC108854885BFE502091FC112411FC112429FC2400448841048202 +71C0:100013DE1252125257DE580051FC912411FC112411FC282027FE442040208020 +71C1:108813FE1088100055FC58A850A893FE10A810A811FC282027FE442040208020 +71C2:100013FE105013FE56525BFE500091FC110411FC110429FC242047FE40208020 +71C3:1110111411D216505A7E5550509092A81128114412442C82240842A442528452 +71C4:101010523E5422904428804410826610425242546698421042287E2842440082 +71C5:081008527E5408900828FF4424824210895208547E98081008280F28F8444082 +71C6:101C11E0104017FE5888510452FA948810F8100013FE2A0226FA428A42FA8206 +71C7:1088105013FE105055FC5954518C9174110411FC10082BFE2508448840A88010 +71C8:202027A420A82A92B114A208A5F4A80223F82208220823F8520849104FFE8000 +71C9:2208210827C82010AF9EB494A7A4A01427942094211421C85708491445248242 +71CA:1108211002E00C1870040010525294942828C4C401007FFC05401930E10E0100 +71CB:1090108811FE15105B1055FE5110911011FE1110111029FE250042A442528452 +71CC:102011FC102014885BFE508851FC910411FC110411FC290425FC448841048202 +71CD:22402242225C27F0AA50B3D0A25EA3D42254225427F4201452944C6448248044 +71CE:2040204027FC20A0AD14B208A7FCAA0A23F8220823F8204052484C4449448080 +71CF:100013FC104814305BFE505250949350102013FE12522A8A2776425242728206 +71D0:20402248215027FCA950B248A444A210239024BC2A902150517E4A1042108410 +71D1:102011FC108814505BFE500051FC912411FC112411FC282025FC442043FE8000 +71D2:1020102011FC14205BFE5108539C91081188163E10002BFE249044904112820E +71D3:24482288F93E22886458729CA92A22882448010011101120228004401830E00E +71D4:103C13E0112410A855FE58A85124920211FC1124112429FC2524452441FC8104 +71D5:0440FFFE0440044017D01012F01C17D014503452D7D2100E0000488844448444 +71D6:100013FC100413FC54045BFC500093BC112417BC10082BFE2508448840A88010 +71D7:279E2492279E2492AF9EB402A4F2A49224F2249224F2249254924D3244028406 +71D8:100013DE125217DE5A5253DE5242922212FA121212522A2226524282420A8204 +71D9:23F8120893F8420843F810002FFEE20027FC292422540588111022A00C60701C +71DA:1010525254549090282844448282101010525254549890102828242842448082 +71DB:0000FEFE12907EFC42847EFC1290FEFE01001110111022A0044008203018C006 +71DC:2000279E2492279EAC92B79EA442A422240A25462542255256324C02440A8404 +71DD:100011FC110415FC590451FC502093FE100011FC110429FC2420452442228060 +71DE:142012203F3E24426494BF1024103F10242824283F4420820000488844448444 +71DF:08202AA44D28145022887FFE40029FF410101FF000003FF8200820083FF82008 +71E0:2080210027FC2444AD54B444A7FCA4E425542404204027FE50A0491042088C06 +71E1:100013FE125213FE542059FC502093FE1088105011FC282027FE442040208020 +71E2:0A803138228838382288393822887FFE41029114111022A0044008203018C006 +71E3:102013FE100011FC5504597451549174110411FC100828F0242047FE40A88326 +71E4:1088108813FE148859FC512451FC912411FC102013FE2A22262A42FA420A8206 +71E5:10F81088108814F8580051DC5154915411DC102013FE287024A8412442228020 +71E6:208020DC22842BD4B448AA94A324AC402248215027FC20E051504A484C468040 +71E7:104412241128147E58105028534A911C1128114C111A292A2548411042FE8400 +71E8:220821102FFE2840B7FCA040AFFEA054279221102FFE211051D44F0A49168322 +71E9:2108220827C82450AFDEB464A7D4A214211427D4221423C852484C54455488A2 +71EA:108813FE108815005BFC555450D49324105410941348282024A4428A428A8478 +71EB:102013FE1288125057FE5A5052FC925413FE125412FC2A5026D8455446528850 +71EC:210026DC24542454AED4B454A466A7C0201C201427D42114510849C847148222 +71ED:200023F822A82AA8B3F8A100A3FCA48423E422A422A423E450944FF448148008 +71EE:210827C820086B9AB02C2388200853944A928BA200003FF0082004C00780F87E +71EF:100011FC102013FE562259AC502091AC105010C8132628F8240844D040208010 +71F0:203C23C020442224A908B7FEA442A2A4228A247A208020F851084A904060879E +71F1:1040102011FC1488585053FE500091FC110411FC110429FC24204294428A847A +71F2:104013FC1044109455085BDE514A92D611FC110411FC290425FC450441FC8088 +71F3:200027BE24922492ACAAB7A4A4C0A4BE24A224A227BE24A250004AA442528452 +71F4:204020A023182DF6B000A7FCA554A4E427FC200023F8220853F84A084BF88208 +71F5:10101410127C141058FE5044562892FE1210127C12102AFE2610421045FE8800 +71F6:109013FC129417FC5A9453FC500093FC120012F812002BFE2520451445488986 +71F7:102013FE100015FC5904517451549174110411FC100029FC240043FE41248262 +71F8:100011FC102013FE562259AC502091AC100013FE102029FC255445544154810C +71F9:FEFE202050509A9A2C2C48489C9C2A2AC8C818180100111022A004401830E00E +71FA:102013FE100014F8588850F8500093FE1202127212522A76242043FE40A88326 +71FB:101C11E0102013FE542059FC51AC917411FC102011FC282027FE44004154822A +71FC:204023F8204827FEA848B3F8A040A7FE200022A4245223F852A84AA84FFE8000 +71FD:204027FC204023FCA800B7FEA002A3F8204027FE200027FE50084FFE44A88798 +71FE:01007FFC01003FF80000FFFE00023FF00100FFFE00107DFC44907C3024884244 +71FF:100013DE10421252554A5A525090910813FE151011FE291025FE451041FE8100 +7200:21102110211027BCA910B110AFFEA2A822A826EC2AAA22AA52A84DA844488898 +7201:100813E8128817EE5A2853F4528293E2100011FC115429542554415447FE8000 +7202:2FEC48244BA4682C4BA46AAC4BA44824FFFE810211101120228004401830E00E +7203:108812AA12DC148859545222500093FE1222102013FE287024A8412446228020 +7204:100013FE124817FE5A4852FC52A492FC12A412FC12202BFE272A457A450A8906 +7205:11FC112411AC152459FC502051FC902013FE1154122A282025FC402043FE8000 +7206:11FC110411FC150459FC508853FE908817FE108811242AAA247040A841248060 +7207:0820FFFE082010407C4011F8FE4844C892487CAA10AA1D06E202488844448444 +7208:2020203E202027FEAC22B5F8A422A5FE252425FC252425FC58404AA4528A847A +7209:11241248112414005BFC52945264929413FC124813682A48276A424A42468362 +720A:2080204027FC24A0AFFCB4A4A7FCA400252425A8253025A4551C48004AA49452 +720B:21C82708210827C8A93EB7CAA54AA7CA254A27CA210A27CA510A4FEA4AAA9156 +720C:2040202027FE2488ADFCB488A7FEA42025FC252425FC252455FC4C0044888904 +720D:244424E428A82AAAAEEEB4A4AAAAAEEE224220402FFE20E051504A484C468040 +720E:1040102013FE122255FC5850528A91FC128A10F8108828F82420452442A28040 +720F:200027FE24442598AC88B7DEA488A5DC26AA248824202520553C4920492097FE +7210:1040107C104013FC56445BF0524492FC12A812F812A82AF8260045FC45548BFE +7211:1088108813FE14A8589051FE512093FC152011FC112029FE250042A442528452 +7212:101010101EFE221054AAA8441082287CCA442A7C2C44487C1410125422924030 +7213:13DE125213DE16525BDE5242527A928A131212DA128A2ADA268A42FA420A8204 +7214:211027FC204023F8A840B7FCA000A3D4211227FE23502534538C488A42968102 +7215:210827C820086B9AB02C2388200853944A928BA20100111022A004401830E00E +7216:2210211027DE2010AC5EB282A7DEA01027DE245027DE245057DE4C50445284CE +7217:11FC110411FC150459FC508853FE908811FC10A813FE28A825FC442043FE8020 +7218:108010DE128213D454485AB4514A96A411FA128810F8288824FA449440A880C4 +7219:102013FE100015DC595451DC508893FE108813FE10882BFE2494418842A480C2 +721A:204020A021102208ADF6B000AEEEAAAA2EEE20002FFE29225FFE4922492A8804 +721B:13DE125213DE16525BDE522252FA922212FA12AA12FA2AAA26FA427242AA8226 +721C:249222942FFE2910B7FCA040A3F8A0402FFE248027BC249457944CC84F9480A2 +721D:101E13E0112214945BFE525253FE900413C4127E13C42A5427CC428442D48348 +721E:2040204023F82248ABF8B044A7FCA00422082FBE2AAA2FBE52084A8A4FBE8082 +721F:208823FE208823DEAA52B3DEA0A0A09021FE212023FC252051FC492041FE8100 +7220:27BC24A427BC24A4AFBCB4A4A7BCA12023FE222027FC2A2053FC4A2043FE8200 +7221:108813FE108811FC552459FC512493FE122A12FA122629FC252445FC402283FE +7222:00803FFE24103F7C26382D54341221202F3C2120273821202F3C41205244A122 +7223:2248215027FC2404A9F0B110A7FCA55424E427FC204027FC50404FFE42A48452 +7224:211027FE211027BCACA4B7BCA4A4A7BC244427FC255425F454444CE445548448 +7225:13FE120213FE16925A54529252FE92AA12FE132212FA2AAA24FA442249FA8004 +7226:2790251E27A82484AFBEB52AA7BEA00023F8220823F8220853F848A04124861C +7227:27FC20402FFE2842AB58B040A358A0002EEE2AAA2EEE20005FFE4A4845548FFE +7228:2FEC48246BAC48246BAC4AA4FFFE88227EFC2C684AA4FFFE11102928C6C61830 +7229:228822E82F5E22ECAF5ABAE8A208AFFE29423494255827F252044BE8420283E4 +722A:001000F81F201220122012201220122012201210121022102208420842048002 +722B:00000008007C07807A1021101120100000000000000000000000000000000000 +722C:0E00740055FC55245524552455FC550055005502550252FE5200510090FE1000 +722D:000801FC7E10221011203FF801080108FFFE010801083FF80108010005000200 +722E:024007403A7C2A842B742A542A542A742A482942294228BE28404830480E8800 +722F:000801FC7E102210112001003FF8210821083FF821082108FFFE200820282010 +7230:000801FC7E10221011203FF8020002007FFC04000FE01420224041808660381C +7231:000801FC7E10221011207FFE420282047FF8040007F00A10112020C043301C0E +7232:00FC7F00121009201FF0101010101FF8100810081FFE20022AA2495251548008 +7233:00F83F2009401FE010201FF010101FFC20042AA4400C9FE00040018005000200 +7234:0004FF0E8D748B54FF548954E954A954EB548554E5548B549154FF9200920100 +7235:00FC7F00220811107FFC44447FFC00087E0842FE7E0842487E28480874284210 +7236:044008201010200840240820082004400440028001000280044008203018C006 +7237:044008201850248803000CC03030C00E1FF00210021002100250022002000200 +7238:044008201850248803000CC03030C00E1FF0111011101FF01010100410040FFC +7239:044008201850248803000CC03230C7CE1A4001A01E7801880E90006003803C00 +723A:084010202850448803001CE0E01E00007F7822483E5022483E4423D4FE480240 +723B:00081810066001800660181860040020082004400280010002800C403030C00E +723C:040045F829081108290845F881080508450829F8110829084508810807FE0000 +723D:010001007FFC01002928111029280100292811102AA80280044008203018C006 +723E:00007FFC21084104BFFA21083558292835582108355829283558210821282010 +723F:00100810081008100FF00010001000107FF00810081008101010101020104010 +7240:042024202420242025FE3C2004700470FCA824A8252425242622442044208420 +7241:0400240025FE240824083DE805280528FD28252825E825282408440844288410 +7242:048424442448240025FE3C20042004FCFC20242025FE24202420442044208420 +7243:04482548254827FE25483D4805780500FDFE242027FE247024A8452446228420 +7244:042024202450244824A43DFE068404FCFC8424FC248024FC25444544467C8444 +7245:102057FE542055FC542477FE142415FCF42055FC552455FC552455FC5524892C +7246:082028202BFE292429243AAA0FFE0800F9FC2904297429542974490449FC8904 +7247:004010401040104010401FFC1000100010001FE0102010201020202020204020 +7248:0808481C49E0490049007DFC41444144794449284928491049104A284A448C82 +7249:04202420252424A424A83E2021FC20203C20242027FE24202420442044208420 +724A:040025FC2444244424443E44209420883D0024FC248424842484448444FC8484 +724B:04482444245E25E024283E12206A21963C48245E25E0242424284412446A8586 +724C:0840488049FC492449247DFC4124414479FC489049104BFE4810481048108810 +724D:0820482048FC482048207DFE4002409478504890485049FE4828484448828902 +724E:0880488048FC49544AD47CB4412C424478944908484048A44AAA4A8A4C788800 +724F:08204850488849044AFA7C0041E2412A792A49EA492A492A49EA4922492A8964 +7250:0808483C49E0482048207DFE402040A0792C4924492449AC4924492449FC8904 +7251:0840482049FE490249027DFE4100410079FE49AA4AAA4AFE4CAA48AA48A28886 +7252:0848494849484BFE49487D484178410079FE48204BFE487048A849244E228820 +7253:0820481049FE488448487DFE41024224781049FE4840487C4844488448948908 +7254:082848244BFE482049FC7D2441FC412479FC492448084BFE4888484848488818 +7255:0820484049FC4924497C7D8C41544124795449FC484048244AA24A8A4C888878 +7256:084048204BFE4A024BFE7E1443FE42107AFE4A924AFE4A924AFE4A924C928896 +7257:081049FE4910497C49147DFE4114417C7910497C4954497C49544A7C4A548C4C +7258:08204BFE482049FC48007FFE425243FE790449FC490449FC490449FC48888904 +7259:00003FFC004000401040104020403FFE01400240044008401040604001400080 +725A:111009207FFE40029FF410101FF000007FFC104020403FFE0240044019406080 +725B:01001100110011001FF82100410001000100FFFE010001000100010001000100 +725C:08000800480048007E004800880008000E00F800480008000800080008000800 +725D:08800880488048847E88489088A008C00E80F8804880088408840884087C0800 +725E:10401040504050407DFC5044904410441C44F084508410841104110412281410 +725F:02000400082010103FF80008010011001FF821000100FFFE0100010001000100 +7260:10201020502051207D2C5134916413A41D24F134512811221122110210FE1000 +7261:08200820482048207E20482089FC08200E20F82048200820082008200BFE0800 +7262:020001007FFE40028104110011001FF8210041000100FFFE0100010001000100 +7263:1000100051FC50447C445144914411441D44F244504410841084110412281410 +7264:10201010501050007DFE5080908010801C80F080508010801080108010FC1000 +7265:10401020502053FE7C805080908010FC1C84F084508410841104110412281410 +7266:0808083C49E048207E20483C89E008200E20F83E4BE00820082208220822081E +7267:08400840484048807EFE49088A8808880E88F850485008200850088809040A02 +7268:10801040504053FC7C00500091F011101D10F1105110111211121212120E1400 +7269:10801080508050FC7D545254905410941C94F124522410441044108411281010 +726A:08100810489048907EFE4890891008100E10F9FE481008100810081008100810 +726B:08500848484848407E5E49E0884008440E44F848483008220852088A0B060802 +726C:10201020502E51F07D205120912011FE1C22F06250A2112A1624102010201020 +726D:1000100053FC52947E945294929412941E94F294529C13041204120413FC1204 +726E:08A0109030BE57C0904010241014110C09001FF821000100FFFE010001000100 +726F:10201020502050207DFE5020902010201DFCF104510411041104110411FC1104 +7270:10201020502050207DFC5124912411241D24F1FC512411241124112411FC1104 +7271:1000100053FE50087C0851E8912811281D28F12851E811281008100810281010 +7272:10201020512051207DFC5120922010201C20F1FC502010201020102013FE1000 +7273:100010FC508450A47C945084908413FE1D04F1445124110411FE100410281010 +7274:1004101E51F051107D105110911011FE1D10F11051101108110A114A11A61112 +7275:010001003FF80280044008207FFE410289040FF0110001007FFC010001000100 +7276:0100111009203FF802007FFC082011102908CFF6110001007FFC010001000100 +7277:10201020505050887D04520291FC10201C20F02051FC10201020102013FE1000 +7278:1040102053FE52027C0451F8900810101C20F3FE502010201020102010A01040 +7279:10201020502051FC7C20502093FE10081C08F1FE500810881048100810281010 +727A:100017FE509050907C9053FC929412941E94F294529C13041204120413FC1204 +727B:10901088508051FE7CA050A890B010A41CA8F0B05124112A1132122212DE1400 +727C:100011FE500050927D245248912410921C00F1FE502010201020102013FE1000 +727D:01007FFC08201FC002007FFE48229FF4011011001FF821000100FFFE01000100 +727E:100013FE504050407DFC5084908413FE1C00F00051FC11041104110411FC1104 +727F:10201120512051FC7D205220902013FE1C00F00051FC11041104110411FC1104 +7280:00003FFC20043FFC2000288826B02808248027F8288020805FFE408080800080 +7281:03083C0804487F480C48164825084428051011001FF821000100FFFE01000100 +7282:0C8070FC1124FD241244388455289010010011001FF821000100FFFE01000100 +7283:1040102051FC50007D085090900013FE1C00F00051FC11041104110411FC1104 +7284:1020102051FC50507C88510493FE10081DE8F128512811E81128100810281010 +7285:100013FE5202528A7E5253FE922212221EAAF2AA52AA12FA12021202120A1204 +7286:1020102053FE50207C2051FC910411FC1D04F1FC510411FC1104110417FE1000 +7287:010009000FF0110001007FFC0100111051507C7C90901E10F0FE501010101010 +7288:1020112450A850207DFC504093FE10881D04F2FA5488108810A810921082107E +7289:1040102053FE50007DFC510491FC10001DFCF008501013FE1020102010A01040 +728A:1020102051FC50207C2053FE900210941C50F110509013FE1028104410821302 +728B:100011F8510851087DF8510891F811081DF8F108510817FE1000109011081204 +728C:100013DE524252427A4253DE9200123E1BD23212D21413D41208121412241242 +728D:10101010577C51147DFE5214927C17101D7CF51055FE12101210150018FE1000 +728E:08087E0808FEFE0808487E2808080F28F11011001FF821000100FFFE01000100 +728F:1080104053FC52047E0453FC920012001FFCF354535415FC155415541944110C +7290:10C417045124511479145784912411141B943346D53C15041104110411041104 +7291:100011FC510451FC7D0451FC910411FC1C28F02453FE10501050108811041202 +7292:1040102053FE50007DFC510491FC10001FFEF20252FA128A12FA1202120A1204 +7293:1080108051FC5244795451F4908411281A9031FCD244155411F4108411281210 +7294:1100110051FC52007DF8500093F810881AA831C8D7F8108A11CA16AA10861082 +7295:1088108853FE5088788857FE908011FC1B2435FCD12411FC112411241124110C +7296:08202AA42CA84920145022887FFE410289041FF821000100FFFE010001000100 +7297:1040102053FE52027C2451FC902011FC1C20F3FE502011FC1104110411FC1104 +7298:010000803FFE22102F7C26382B5432922040224023FC244020405FFE40408040 +7299:1040108851FC51087A5253FE905011881E2630C0D31010641388103010C01700 +729A:3F0821083F7E20082F4820285FA8440895282C9011001FF82100FFFE01000100 +729B:08203E7E08A47F281C102A2849443FFE2480248027F8288020805FFC40808080 +729C:1108108853C850107BDE526493D410141BD43054D09410E81388109412941122 +729D:102011FC508850507DFE500091FC11241DFCF12451FC102011FC102013FE1000 +729E:101811E0504053FE7C885174925210701C00F1FC51041174115411741104110C +729F:7CF8048804F87C2041FC7D2405FC04282BFC100411001FF82100FFFE01000100 +72A0:1104108853FE50207DFC502093FE10541D92F09053FE109010D4138A109611A2 +72A1:100013FE524853FE7E4852FC92A412FC1EA4F2FC522013FE132A157A150A1906 +72A2:102013FE502051FC7C0053FE925213FE1D04F1FC510411FC110411FC10881104 +72A3:11241248512450007BFC5294926412941BFC3248D3681248136A124A12461362 +72A4:100013FC529452947BFC5110925213DC181233CED24013D2125C13D0125212CE +72A5:1040102053FE52507BFE525293FE12001A9432D8D29012D2128E140015541A2A +72A6:13F8120853F852087BF8511097FC11101FFE3110D248155410E01150124810C0 +72A7:111017FC504053F8784057FC900013D4191237FED3501534138C108A12961102 +72A8:081024483F7E64C8BF7E24483F7E24483F7E204011001FF82100FFFE01000100 +72A9:7C4011FCFD2439FC5524FDFC246818A2651E11001FF821000100FFFE01000100 +72AA:211027FEA040A2EEFAAAABEAAAAE2AE83BAAECE6228825F42290206021982606 +72AB:51184B947C3ED3A87C7E53A87C3E53A87EBE43A011001FF82100FFFE01000100 +72AC:01000120011001100100FFFE010001000280028004400440082010102008C006 +72AD:0000440028001000280048008800080018002800480088000800080050002000 +72AE:01100108010801007FFE0200040007F80A080A08111020A0404080A003180C06 +72AF:0000440029F81108290849088908090819282910490089020902090250FE2000 +72B0:00804480288010802BF0489088900890189028904890889209120912520E2400 +72B1:004044402840104029F8484888480848194828C8484888A808AA090A52062402 +72B2:00104410281010102BFE48308830085018502890489089100A10081050502020 +72B3:00404440288010FC29044A048804090418842844484488040804080450282010 +72B4:000045FC282010202820482088200BFE18202820482088200820082050202020 +72B5:00804480290011FE2A004C0089F8080818102860488089000A020A0251FE2000 +72B6:084008480844484428402FFE08400840184028A0C8A00890091009080A040C02 +72B7:00204410281011FE2900490089000900190029004900890009000A0052002400 +72B8:000047F02810101029104910891009FC1804280448048BF40804080450282010 +72B9:00904488288810802BFE48A088A008A018A028A04920892209220A22521E2400 +72BA:00804440284013FC2800480089F00910191029104910891209120A12520E2400 +72BB:00204420282013FE2820482089FC092419242924492489340928082050202020 +72BC:00108FD0505020905110911011501190311057109110111211121112A50E4200 +72BD:000045FC28101110291049108A100BFE183028504850889009100A1050502020 +72BE:0040885050482048504097FE1040104030A050A090A0111011101208A4044802 +72BF:00404420282010002BFE48408840086018502848484488440840084050402040 +72C0:042024282424242424203DFE04200420FC202450245024502488448845048602 +72C1:004044402880108829044BFE88020890189028904890889009120912520E2400 +72C2:0000440029FC1020282048208820082019FC2820482088200820082053FE2000 +72C3:000045FC284410442844484488440BFC18842884488488840884088453FE2000 +72C4:00404440284010402944494489480A50184028A048A088900910090852042402 +72C5:0008443C29E010202820482088200BFE18202820482088200820082051FC2000 +72C6:002044202820102029FC492489240924192429FC492488200820082050202020 +72C7:00404440284010402BFE484088E008E0195029504A488C440842084050402040 +72C8:000045FC29041104292449248924092419242924492488500848088451022602 +72C9:000045FE2810101028204820886808A419222A22482088200820080053FE2000 +72CA:00003FF820083FF820083FF820083FF801100108FFFE0280044008203018C006 +72CB:000045FC2800100028004BFE88200820192829244A248A220C22082050A02040 +72CC:002044202920112029FC49208A200820182029FC482088200820082053FE2000 +72CD:0080448029FC11042A044DF489140914191429F4490489280912090250FE2000 +72CE:000045FC29241124292449FC89240924192429FC492488200820082050202020 +72CF:0080448028FE11002A204920892C09741BA42924493489280922090250FE2000 +72D0:0008883C53D02290529092901290129032905288928812C812A414D4A4924800 +72D1:0040444028A010A029104A488C2608201BF828084810891008A0084050202020 +72D2:00904490289013FC289448948BFC0A901A902BFE48928892091A091452102410 +72D3:00104410281011FE29124914891009FC194429444928892809100A2852442482 +72D4:000045FC29041104290449FC89000940194429484970894009420A42523E2400 +72D5:002089205120222052FC94A4172411243224522494A417A410C41044A0944108 +72D6:00404420282013FE2A024C048800089018902890488889080908090452042402 +72D7:00804480290011FC2A044C0489E409241924292449E489240804080450282010 +72D8:00284424282410202BFE4A208A240A241A242A284A288A900B120A2A50462082 +72D9:000045F829081108290849F889080908190829F8490889080908090857FE2000 +72DA:0000440029FC11042904490489FC09041904290449FC89040800080053FE2000 +72DB:00204420284011FC290449048904090419FC2904490489040904090451FC2104 +72DC:00204420282010202BFE48208820082019FC2904490489040904090451FC2104 +72DD:00804480288011FE29024A048C200820192829244A248A220C22082050A02040 +72DE:00404420282013FE2A024C04880008001BFE2820482088200820082050A02040 +72DF:000045FE2800100029FC4904890409FC1904290449FC89040800080053FE2000 +72E0:000045F82908110829F84908890809F819442948493089200910094851862100 +72E1:00404420282013FE2800488889040A0218882888485088500820085050882306 +72E2:0080448028F811082B104CA0884008A019182A064DF889080908090851F82108 +72E3:009044902890129229944898889009981A942C9248908890091209125212240E +72E4:00204420282013FE2820482089FC0800180029FC490489040904090451FC2104 +72E5:0080448029FC11042A0449E48924092419E42924492489E40904080450282010 +72E6:00008BF852A822A852A89FFE12A812A832A85FFE92A812A812A812A8A2084218 +72E7:0008443C29E0102028204BFE88200820182029FC490489040904090451FC2104 +72E8:00284424282410202BFE48208924092419242BA8492889100A120A2A54462082 +72E9:0040882053FE220254149010101013FE301051109090109010101010A0504020 +72EA:000045FE29021102297A49028902097A194A294A494A897A09020902510A2104 +72EB:00404440284413F4284848508FFE0840188029844A988CE008820882507E2000 +72EC:00204420282011FC292449248924092419FC29244820882808240BFE51022000 +72ED:00204420282011FC2820492488A408A818202BFE485088500888088851042202 +72EE:010089FE51102510557C9554155415543554555495541154125C1210A4104810 +72EF:0040884050A021105208940611F01000300057FC9040108011101208A7FC4204 +72F0:0080448029F0121028204BFC884408441FFE284448448BFC0844084051402080 +72F1:002094285224222450209E2012FC12203220525092D0135012881088A1044202 +72F2:00008810579020905110921012D81354325456929A92131212101210A2504620 +72F3:0040884050A02110520895F61040104037FC50409250124814441844A1404080 +72F4:02208A24522823B05220922212A2131E3040504093FC104010401040A7FE4000 +72F5:00904488288013FE28A048A888B008A418A828B04924892A09320A2252DE2400 +72F6:01844468283010C82B0448408BFE08A019202BFC4D2489240934092850202020 +72F7:000045F82908110829F848008BFC0A041A042BFC4A048A040BFC0A0452142208 +72F8:000045FC2924112429FC4924892409FC1820282049FC88200820082053FE2000 +72F9:00204420282013FE282048208924092419242AAA482088500850088851042202 +72FA:004044202BFE1000280049FC8800080019FC2800480089FC0904090451FC2104 +72FB:00404440288811042BFE4802888809441A4228F849888A500820085051882606 +72FC:0040442029FC1104290449FC8904090419FC2920492289140908094451822100 +72FD:000045FC2904110429FC4904890409FC1904290449FC88000888088451022202 +72FE:0104890E5130212057E09120113E116431A457249124112411241124A5444284 +72FF:0004440E2BB8108828884928892E0BA818A82AA84AA8893E09000A80547E2800 +7300:00108A10511021105454925212521090301051149604120812081210A22040C0 +7301:008489C457042114511491141FD41114331453949554150419041104A1144108 +7302:000045FC290411FC290449FC8800080019FC282048208BFE0820082050202020 +7303:0040884050A020A05110920815F61000308850489248115011101020A7FE4000 +7304:004044202BFE1000280049FC89040904190429FC482088A809240A2250A02040 +7305:009088905090279E509090901090139C309050909090179E10901090A0904090 +7306:044004407C7C04403C7804407C7C04400440012001107FFC028004401830E00E +7307:00204420283E102029FE4922893809E01922291E490089780A480A4A548A2906 +7308:0040448029FC1124292449FC8924094419FC289049108BFE0810081050102010 +7309:008844882BFE1088288848F88888088818F8288848888BFE0800088851042202 +730A:00009040539C22045204939C1204120433FC50909090109010901112A212440E +730B:01100108FFFE0280044008203018C00614281224FDFE10202850245044888106 +730C:081008140812FF1208102AFE2A102A105D1088281C282A284944884408840902 +730D:00408840504027FC5040924812481248355450E09150115012481444A8424040 +730E:00884488288813FE288848888FFE080019FC2904490489FC0904090451FC2104 +730F:0040882053FC2204520493FC120012FC328452FC928412FC14841484A8944088 +7310:02088908511027FC5040904013F8104030805FFE9120112012201222A422481E +7311:000045FC2904110429FC4904890409FC1800291249D48918091009525192210E +7312:00107E1442127E1242107EFE00107E1042107E2842287E28424442444A844502 +7313:00008BF85248224853F89248124813F8304057FC90E0115012481446A0404040 +7314:004044202BFE1202280049FC880008001BFE2820492889240A220C2250A02040 +7315:002097205120213E5142974414901410341057549152115211921110A5504220 +7316:01F84508290811F82908490889F808001BFC2A044A048BFC0A040A0453FC2204 +7317:0040884053FC20A05110920817FE100833C852489248124813C81008A0284010 +7318:00828882528223EA548A908A17FA108A33EA52AA92AA12AA12A212E2A08A4084 +7319:003C47C02A44112828004BF8884808481FFE284848488BF80848084051402080 +731A:00A04490288011FE29104B108DFC0910191029FC49108910091009FE51002100 +731B:000045FC2808101028204BFE882008A0184029FC495489540954095457FE2000 +731C:002044202BFE102029FC48208BFE080019FC290449FC890409FC090451142108 +731D:0080884057FC20005110911012A814443000504097FE104010401040A0404040 +731E:0040884050A02110520895F61040104037FC5040904013F812081208A3F84208 +731F:0000948452442248500093F81248124833F85248924813F8124A144AA4464802 +7320:00904490289013FC2A944A948A940BFC1A942A944A948FFE0800089051082204 +7321:00008BFE52522252525293FE1020104030FC51049288105010201040A1804600 +7322:0100891E511227D25112911E111217D23452545E945217D214521022A02A4044 +7323:000044882A5212222A524A8A8A020BFE188829444A7A88880950082050D82706 +7324:001045D428581252298C488889040AFA1820282049FE88200850088851042202 +7325:00008BF85248224853F89248124813F8300057FE9240124412281290A3084206 +7326:000097FC5404243465C4A44425F425546554A5F42444245425F42494A8065002 +7327:000045FC2904110429E4492489240BFE1A022AFA4A8A8A8A0AFA0A02520A2204 +7328:003C97C052442128500093FC1080108037FE510091F8128812501420A8D84306 +7329:00008BF8520823F8520893F81040124033FC5440904013F810401040A7FE4000 +732A:0040884453F42048505097FE1040108031F85308950811F811081108A1F84108 +732B:008844882BFE10882888480089FC09241924292449FC89240924092451FC2104 +732C:000097FC544427FC544497FC100013F8320853F8920813F812081208A2284210 +732D:010089F8520823F0501097FE10801144366850B09128166810A41122A6A04040 +732E:08100814FF92081208107F7E4110551049105D1049287F284928494445444282 +732F:004094445444244457FC90001FFE1040308057FC94A414A414A414A4A4A4440C +7330:0080449E2BEA108A29CA488A8BEA089218A628204BFE88200850088851042602 +7331:00008BF85090206057FC90A4112812203460504097FC10E011501248AC464040 +7332:000045FC290411FC290449FC888009FE1A2229224952890209FA080250142008 +7333:000097BC54842484548497BC1400140037BC5424942417A814101428A4444482 +7334:010089785108220852FE96401A40127C3290521092FE121012281228A2444282 +7335:0080884053FC2204520493FC1200120033FC5354935415FC15541554A944410C +7336:01084488289017FE289048908BFC0A941A942B0C4A048BFC0A040A0453FC2204 +7337:221012141412FF92141014FE7F1055105510632841287F28414441447F844102 +7338:00008BFC5224222453FC920012FC1284328452FC928412FC12841284A4FC4884 +7339:0040904057FC20E051509248144613F8320853F8920813F812081000A7FE4000 +733A:0008443C2BC010042A44492889FC0A2018202BFE482089240924092451FC2004 +733B:00068F78511021205244927813101224367E5A129210125412521292A2504620 +733C:002844242BFE102029FC492489FC092419FC292448088BFE0888084850482018 +733D:000047FE2A02100029FC490489FC090419FC284048208BFE0800088851042202 +733E:00008BF8520823C852489FFE180213F8320853F8920813F812081208A2284210 +733F:0040904053F8204057FE900013F81208320853F890A4112813101D48A1864100 +7340:0140965C54442444575C9444144417FC304057FC9208111010A01040A1B0460E +7341:00008BFC524023F8524093F81240124033FC50049554155415541404A0284010 +7342:000045FE29101120297C4944897C0944197C29104910895409520A9252502420 +7343:08104914491249127F1000FE7F1000107F1041287F28412822440F44F0844102 +7344:02109114511227D250109790103E17903010579094A814A814A817C4A0444082 +7345:020094FE57102510557C955417541454345457549554155C15101710A5104010 +7346:0020444029FC110429FC490489FC08401BFE288849248A220DFC082050202020 +7347:0208891057FC2040504093F81040108037FC50A091281134123C1222A422481E +7348:020889085110200057FC900011101208340453F892A812A812A812A8AFFE4000 +7349:0040884057FC204053F8908017FC1110326855C6904013F810E01158A6444040 +734A:0040884050A02190524897FE1A0813F8320853F8920013F815081508A9F84108 +734B:004045FC290411FC290449FC890409FC1820292448A8892408200BFE50202020 +734C:000045F8290811F8290849F888000BFC1A942BFC480089F80890086051982606 +734D:0080884053F8211050A097FE100013F8320853F8920813F811201122A2224C1E +734E:0440247C24A83D5004287DFE248844488418012001107FFC028004401830E00E +734F:008844882BFE1088280049FC890409FC190429FC48208BFE0850088851042202 +7350:002045FC288810502BFE480089FC090419FC290449FC88200BFE082050202020 +7351:01008902511C27D0511097D0155E17D4355457D4911417D411141124A1244144 +7352:08207F20083E7E440884FF2820103E284244872201107FFC028004401830E00E +7353:01089108510827D0511E979411241FD4321453D492541248124814D4A4244842 +7354:0020444029FC110429FC490489FC0820192428A8492488200BFE082050202020 +7355:002046222BFE1090288849FE8B100D1019FE2910491089FE0910091051FE2100 +7356:002045FC282010882BFE488889FC090419FC290449FC890409FC088851042202 +7357:00009FFE58002A286948ABEE289228846AA0AAA82BE8288828942914A9245242 +7358:082049202A3E7F4849485DA86B104928414440200110FFFE02800C603018C006 +7359:0108890855482390511E97D4156415543554575495D4154815481554A46444C2 +735A:0088448829FC108828884BFE882009FC192429FC492489FC0800088851042202 +735B:00A094A452A820A057FC911010A017FC304053F8904017FC10A01110A2084C06 +735C:0020452428A813FE28A849248A220904190429DE4A448D54089E090452042404 +735D:000045FC284810302BFE485288940B5018202BFE4A528A8A0B760A5252722206 +735E:002045FC288810502BFE480089FC092419FC292449FC882009FC082053FE2000 +735F:0020442029FC10202BFE49088B9C090819882E3E48008BFE089008905112220E +7360:0040904057FC20A05514920817FC1A0A33F8520893F8104012481444A9444080 +7361:00808B1C52042204539C9204120413FC310053FE940212AA12AA1402A0144008 +7362:00388BC0508027FE5110920815F6191031F0500097FC140415F41514A5F4440C +7363:9090491402127F1249107FFE49107F100010FFA800287F28414441447F844102 +7364:0208890857C82010579E949417A4101437945094911411C817081114A5244242 +7365:01088A0857C8245057DE946417D41214311457D4921413C812481454A55448A2 +7366:008847FE288811FC290449FC890409FC188029FE4A228D52090209FA500A2004 +7367:00008BFC5294229453FC900017FE100033FC520493FC10A211141308AD444182 +7368:000045FC2954115429FC488089FE0A4219F22952495289F2084A0BFA500A2004 +7369:0020893C512027FE5010901413FE121033F05254925412D41368144AA8964322 +736A:004088A053182DF6500097FC155414E437FC500093F8120813F81208A3F84208 +736B:0040444028A011102A084DF6880008001BB82AA84AA88BB80910091052A82444 +736C:0200939E548A290A67D2A566254027D4655EA56427C42544255E2544A44448C4 +736D:021092105F9C22246248AFBE2AA22AAA6FAAA22A272A2AAA32882214A2224242 +736E:000097FC524824446FFEA44426EC255466ECA44426EC255426EC2444A4544408 +736F:003C97C050402FFE504097FC155414E437FC504097FC10401FFE1000A5244892 +7370:0080884057FC244452A892941474100033F852A89FFE100017FC1040A1404080 +7371:004044202BFE120229FC49488A5009FC1B0429FC490489FC090409FC50882104 +7372:008847FE28A8109029FE4B2089FC092019FC292049FE89000BFC08885070238E +7373:000045FC282013FE2A2249AC882009AC18002BFE482089FC095409545154210C +7374:011097FC511027FC540493F8100017FC3080514496A8117016A81126A6A04040 +7375:01248A485124200053FC92941264129433FC524893681248136A124AA2464362 +7376:03FC884051F8210851F8910817FE144232A4528A947A108011F81288A070438E +7377:0040882057FE248855FC948817FE142035FC552495FC152415FC1400A4884904 +7378:77105514771200127F1049FE7F1049107F100028FFA800287F4441447F844102 +7379:0040887C504023FC524493F0124412FC32A852F892A812F8120015FCA5544BFE +737A:0108890857CE2112512497DE1552155E37D2511E9392155E19401114A1124122 +737B:08100F1408127F1249105EFE49107F104A105F2851285B2855445F4455849502 +737C:00009EFE5254229262FEAE9228D628BA68D6AE9222D622BA22D62292AA9A4484 +737D:004097FC500023B852A893B8111017FC311057FC91101FFE11281310AD484186 +737E:01108FFE511027BC54A497BC1140112033FE522097FC1A2013FC1220A3FE4200 +737F:000097FE504022EE62AAABEA2AAE2AE86BAAACE6228825F422902060A1984606 +7380:000097FC54A424A467FCA21022A824BE6F68A23C24A82FBC20282AA8AABE4020 +7381:07BC94A457BC200057FE94001590149E37D4556495D4155415D41568ABC85054 +7382:024097E2525C2EF06AB0AEF0201E27D46554A7D4255427D421142FE4A1244144 +7383:03DE46522BDE12522BDE48A089FE0B201DFC292049FE880009FC08885070278E +7384:020001000100FFFE02000420082010403F8011000200042008103FF810080008 +7385:101008100810FE101054105220524290FC104814100420084408FE10422000C0 +7386:101008080808FEFE1010101020204242FCFC4848101020204444FEFE42420000 +7387:020001007FFC020044442F88111022484FE400200100FFFE0100010001000100 +7388:10400840087EFE801100101C20E042A0FCA248A410A820904490FEA842C40082 +7389:00007FFC010001000100010001003FF8010001000120011001100100FFFE0000 +738A:000000007FFC010001200110011001003FF801000100010001000100FFFE0000 +738B:00007FFC010001000100010001003FF8010001000100010001000100FFFE0000 +738C:00400040FF4008400840084008407E4008400840084008420F42F042403E0000 +738D:1000100010003FFC21004100810001003FF801000100010001000100FFFE0000 +738E:00000000FEFE1010101010107C1010101010101010101E10F010401000500020 +738F:00400040FE40104011FC10447C4410441044108410841E84F104410402280410 +7390:00000020FD201120112011207D2011201120111011101E10E208440808041002 +7391:000001F0FD1011101110111011107D1011101110111011121D12E212420E0400 +7392:00000000FDFC1020102010207C2010201020102010201C20E020402003FE0000 +7393:00400040FE8010FC110412047C0411041084104410441E04F004400400280010 +7394:01040124FD241124112411247D2411241124112411241D24E124422402040404 +7395:000001FCFC201020102010207C2013FE1020102010201C20E020402000200020 +7396:00800080FC8010F8110811087D1012101020102010501C50E088410802040402 +7397:000001FCFC201020102010207C2013FE1020102010201C20E020402000A00040 +7398:00000000FDF810081008100810087DF811081100110011001D02E10240FE0000 +7399:00800080FC8010FE1080110011007DFC10041004100413F41C04E00440280010 +739A:000001F8FC101020104010807DFE10921092109211121D22E222444200940108 +739B:000003F8FC0810081108110811087DFE10021002100213FA1C02E00240140008 +739C:00100090FC901088108811247D2412221440104010881C84E10443FE01020000 +739D:00800080FC8011FC112012207C20102013FE102010201C20E020402000200020 +739E:00200020FC20102011FC10207C20102013FE102010501C50E088408801040202 +739F:00400020FC2013FE1088108810887C8810881050105010201C50E08841040602 +73A0:00200020FC501050108811047E0210881088108810881C88E088410801080208 +73A1:000001FEFE081088108810887D0811FE1018102810481E88F108420800280010 +73A2:00100090FC9010881108110412047DFA10881088108810881D08E10842280410 +73A3:00400020FE20100013FE10407C4010601050104810441E44F040404000400040 +73A4:00200020FC2013FE1020102010207DFC10201020102013FE1C20E02040200020 +73A5:000000FCFE841084108410FC7C841084108410FC10841E84F104410402140408 +73A6:00400040FC4013F8104810487C48104817FE104010A01CA0E110411002080406 +73A7:00400040FC801088110413FE7C0210901090109010901C90E1124112020E0400 +73A8:00000000FDFC1020102010207C20102011FC102010201C20E020402003FE0000 +73A9:00000000FDFC10001000100013FE7C9010901090109010901D12E112420E0400 +73AA:00200020FC5010501088114412227C20100011FC100410081C08E01040100020 +73AB:00400040FE40108010FE11087E8810881088105010501E20F050408801040202 +73AC:000001F8FD081108114811287D28110817FE110811081D08E108420802280410 +73AD:00100110FD101112111211147DD811101110111011101D12E1524192010E0000 +73AE:00400040FC4013FE1040104011FC7C40104013FE104210421C4AE04440400040 +73AF:00000000FDFE10101010102010207C6810A41122122210201C20E02040200020 +73B0:000001FCFD0411041124112411247D2411241154105010901C90E1124212040E +73B1:00200020FE501050108811047E0210F81088108810A81E90F0824082007E0000 +73B2:00200020FC5010501088112412127C1011FC1004100810881C50E02040100010 +73B3:00500054FC5210921090119E11F07E9010901090109010901C8AE08A40860082 +73B4:00480148FD481148114813FE7D4811481148114811781D00E100410001FE0000 +73B5:00880088FE88108813FE10887C881088108810F810881E88F088408800F80088 +73B6:000001FCFC201020112410A47CA8102013FE102010201C20E020402000200020 +73B7:00200020FC201020103E102010207C2011FC1104110411041D04E10441FC0104 +73B8:00800080FDFC1104120415F411147D14111411F4110411281D12E10240FE0000 +73B9:00400020FE2011FE102010207C44108411F8101010201E44F08241FE00820000 +73BA:080008001FFC2104410809201110250802007FFC01003FF801200110FFFE0000 +73BB:00200020F82023FE222222242220FBFC2284228822483A50E220445004880906 +73BC:00900090F8902290229222D4FA9822902290229022903A92E3D24E12040E0000 +73BD:00800080FD0011FC120414047DE411241124112411E41D24E004400400280010 +73BE:000001FCFD241124112411FC7D241124112411FC11241C20E020402000200020 +73BF:000001FCFE441044104410447C941088110010FC10841E84F084408400FC0084 +73C0:00200020FC4011FC1104110411047D0411FC1104110411041D04E10441FC0104 +73C1:00000000FBFC2100210021F02110F9102190225022503A10E21242920312020E +73C2:00000000FDFE1008100811E811287D281128112811E811281C08E00840280010 +73C3:00200020FC2011FC1124112411FC7D241124112413FE11041D04E10441140108 +73C4:00200020FD20112011FC112012207C20102011FC102010201C20E02043FE0000 +73C5:00200020FC2011FC112411247D2411FC1124112411241DFCE124402000200020 +73C6:00200020FC401088110413FE7C02100011FC110411041D04E104410401FC0104 +73C7:000001F8FD081108110811F87D081108110811F811081D08E108410807FE0000 +73C8:02000200FA00221E27D222522252FA522252225222523A52E452445E09521080 +73C9:000001FCFD041104110411FC11207D2011FE1120112011101D12E14A41860102 +73CA:0000F7BC24A424A424A424A4F4A42FFE24A424A424A434A4E4A445A408541088 +73CB:00000080FB1E2252225222522252FA52225222D2235A3A54E090409001100210 +73CC:00000040F8202028200820882090FA9422A222A224C23888E188428804780000 +73CD:00200020FC501088110412127C2010401188101010201C44E188401000600380 +73CE:00800080FC8010FE110211047E20102010A810A411241D22E222402000A00040 +73CF:00000000FDFC10201020102010207C2011FC1020102810241C24E02043FE0000 +73D0:00200020FC2011FC1020102010207DFE10201020104010481C84E1FE40820000 +73D1:00900088FC88108013FE10A010A07CA410A410A8112811321D22E262429E0400 +73D2:00200020FDFC102413FE10247DFC1020102011FC10201C20E3FE402000200020 +73D3:00400020FC2013FE100010887D0412021088108810501C50E020405000880306 +73D4:00400040F84027FE20802080F97C21082310251021FE3910E110411001500120 +73D5:00400040FDFC1044108410847D281210110813DE114A1D4AE14A4252035A04A4 +73D6:00200020FD2410A410A8102013FE7C9010901090109010921D12E112420E0400 +73D7:00200120FD2011FC112012207C2013FE1090109010901C90E11241120212040E +73D8:00200040FDF81108114811287D2813FE1108114811281D28E108420802280410 +73D9:00880088FC88108813FE108810887C88108817FE100010881C84E10442020402 +73DA:000001FCFD041124112411247DFC112411241154114C1D8CE104410401FC0104 +73DB:00200020FDFE1040104010FC7C84118412FC108410841CFCE084408400940088 +73DC:01040084FC88100013FE10207C2011FC1020102013FE1C20E020402000200020 +73DD:000003DEF84220422252214AF94A204220C6214A22523842E0424042014A0084 +73DE:00800080F8F82108231024A02040F8A02118220625F821083908E10801F80108 +73DF:000007F8F408240827F824882488F4E82528252826A8244A344AC88A09061202 +73E0:00200120FD2011FC112012207C2013FE107010A810A81D24E124422200200020 +73E1:0000FEFE101010107C7C10101010FEFE0100010001000280044008203018C006 +73E2:000001F8FD08110811F811087D0811F81144114811301D20E110414801860100 +73E3:00800080FDFC1104120411E47D24112411E4112411241DE4E104400400280010 +73E4:00800080FC8011FC112012207C20102017FE102011241D24E124412401FC0004 +73E5:000003FEFD081108110811F87D08110811F8110811081D1EE3E8400800080008 +73E6:00200020FC4011FE110211027D7A114A114A114A114A1D7AE1024102010A0104 +73E7:00900090F8902292219420982090F99822942492209020903912E1120212040E +73E8:00200020FC5010881104120211FC7C00100011FC110411041D04E10441FC0104 +73E9:00800080F93C220024802080217EFB082508210821083908E108410801280110 +73EA:00200020FDFC10201020102013FE7C001020102011FC10201C20E02043FE0000 +73EB:00400020FC2013FE104010887D0413FE1092109010901C90E1124112020E0400 +73EC:00280024F824202023FE22202224FA24222423A822283A10E212442A04460882 +73ED:00800080F8BE2288228822882288FABE2288248820883908E108423E04000800 +73EE:000007FCF404240425F424442444F5F425542554255425543574C44604460842 +73EF:00400040FC4411F41048105013FE7C4010801184129810E01C82E082407E0000 +73F0:00200124FCA410A410A8102011FC7C041004100411FC10041C04E00441FC0004 +73F1:00400024FA242108210820102040F84023FE208821083990E060405001880604 +73F2:000003FEFA022444204023FC2080F8A0212021FC20203820E3FE402000200020 +73F3:02040104F9082FE8229422A42288FA8A2292212421043908E2904240043E0800 +73F4:001000D8FB942094209023FEF8902094209420D823983890E0AA40CA02860102 +73F5:000001FCFD041104110411FC7C00100013FE102010201DFCE020402003FE0000 +73F6:01080088FC9011FC1024102411FC7D20112011FE106210A21D2AE22444200020 +73F7:00100018FBD42014201027FE2010F890209022D022903A90E28A42EA07060202 +73F8:000003FEF840204021FC20842084FBFE2000200021FC3904E104410401FC0104 +73F9:00280024F824202023FE22202224FA2423A422A822A83A90E29245AA04460882 +73FA:000001FCFC44104413FE10447C4411FC1080108011FC1E84E484408400FC0084 +73FB:00800080FCFE110012FC10847CA4109413FE108411241D14E1FE400400280010 +73FC:000001FCFD04110411FC11047D0411FC1104110411FC1C00E088408401020202 +73FD:00000006FBB8208820882108213EFB88208822882288393EE1004280047E0800 +73FE:000001FCFD04110411FC110411047DFC1104110411FC10501C90E0924112020E +73FF:000001FCFD041104110411FC7C2010201120113C11201D20E2A04260043E0800 +7400:00200020FC5010881144122210F87C081010102011FC11041D04E10441FC0104 +7401:01000100FDFE1200140011FE7C2210241120113C11201D20E12042A0047E0800 +7402:00200010FDFE1000100010FC10007C0010FC1000100010FC1C84E08440FC0084 +7403:00280024FC24102013FE102011207CB210B4106810A811241E22E02040A00040 +7404:000000FCFC84108410FC10007DFE1102110211FE11021D02E1FE4102010A0104 +7405:00400020FDFC1104110411FC11047D0411FC1120112211141D08E14441820100 +7406:000001FCFD24112411FC112411247DFC1020102011FC10201C20E02043FE0000 +7407:001C01E0FC20102013FE10A87D24122211F8108810901CBEE102410202140408 +7408:0008003CFDC01004114410A810007DF81010102013FE10201C20E02040A00040 +7409:00400020FBFC20402090210823FCF8042150215021503950E25042520452080E +740A:000007DEF89224922494249427D8F8942192219222923A9AE494489002900110 +740B:01840068F83020C823042040FBFE20A0212023FC25243924E134412800200020 +740C:00200124FD24112411FC10207C5010881144122210201DF8E008401000100020 +740D:004200E2FB82208A208A208A27EAF88A218A21CA22AA3A82E4824082008A0084 +740E:00240224FD24117E102410247C24137E1124112411241D24E144410002FE0400 +740F:00200420FA2022FE204020502E90FAFE2210221023FE3A10E210451008FE0000 +7410:00200124FCA410A8102011FC11047D2411241124112411241C50E08841040202 +7411:00200124FCA410A8102011FC7D04110411FC110411041DFCE104410401140108 +7412:00400040FCFC1088115010207CD8132610F8102010F81C20E3FE402000200020 +7413:00400020FBFE2202240421F82000F80023FE209020903890E1124112020E0400 +7414:00400020FBFE22022404200023FEF82020202120213C3920E2A04260043E0800 +7415:00400080FDFC1124112411FC11247D4411FC1090111013FE1C10E01040100010 +7416:00480044FC5E11E0102810127C6A11961048105E11E01C24E0284012006A0186 +7417:00400020FDFE1000108810887D5412221000102013FE1C20E020402000200020 +7418:001C03E0FA2023FE22202292230AFA0621FC2104210439FCE104410401FC0104 +7419:00140012F81027FE20102010FBD222522252225423D43808E0EA471A02260042 +741A:000003FCFA04220423FC22202220FBFE2220222022FC3A84E284448404FC0884 +741B:000007FCFC0424A4211022082040F84027FC204020E03950E2484C4600400040 +741C:00400040F84027FC204022482248FA48255420E021503950E248444408420040 +741D:01FC0104FD0411FC110411047DFC1040102013FE10881C88E050402000D80706 +741E:7CFC448444FC7C8444FC44847C84011402087FFC01003FF801200110FFFE0000 +741F:00A00090FC9011FE111013107DFE1110111011FE11101D10E11041FE01000100 +7420:00500050FC5011FC1154115411547DFC11541154115413FE1C00E08841040202 +7421:01000100F9DC21142114211427D4F8142114211425883D48E948411405140222 +7422:000003FEF8402080214422242068FAB0213022A8206838A4E122422000A00040 +7423:00400020F9FC2000210820902000FBFE2000200021FC3904E104410401FC0104 +7424:00800080FDF81108121015FC7C24102413FE102410241DFCE024402000A00040 +7425:00400040F87C204023FC22442270FBC02244223C22003AF0E49044920912120E +7426:00400040FBFC20A02110220827FEF80823C8224822483A48E3C8400800280010 +7427:00007FFC04403C7820083C780440FFFE00007FFC01003FF801200110FFFE0000 +7428:000001FCFD04110411FC110411047DFC1000111211D411181D10E1524192010E +7429:00FC0084FC8410FC108410847CFC100011FE110211021DFEE102410201FE0102 +742A:01080108FBFC2108210821F82108F90821F8210821083BFEE000409001080204 +742B:00200020FDFC104010F8104013FE7C881124122210F810201DFCE02040200020 +742C:00400020FBFE22022504210021DEFA5222522352249A3894E11041120212040E +742D:000001F8FC08100811F810087C0813FE1020122211741CA8E124422200A00040 +742E:00400020FBFE2202200021FC2000F80023FE202021283924E222442200A00040 +742F:00200010FDFE1102120410F87C88108810F8108010801CFCE084408400FC0084 +7430:00200122F9222224205020882304F82220202124212422283850E08801040602 +7431:000001FCFD241124117411247DFC11041174115411541D74E104420402140408 +7432:00900090F890239E209020902090FB9C209020902090239E3890E09000900090 +7433:01100110F910211027BC21102110FB3823B8255425543992E110411001100110 +7434:0000FEFE101010107C7C10101010FEFE010006C01A30E10E1FE0004000800100 +7435:0000FEFE101010107C7C10101010FEFE0000208020843E9820E020842684387C +7436:0000FEFE101010107C7C10101010FEFE00003FF8210821083FF8200220021FFE +7437:01080088F89023FC2040204021F8F840204027FE20A038A0E12041220222041E +7438:00200020FC3E102011FC110411FC7D0411FC1124102013FE1C20E02040200020 +7439:0000FEFE101010107C7C10101010FEFE010001007FFC054009203118C1060100 +743A:02100110F910247C221022102010F97E21102210262022243A42E2FE02420000 +743B:00200020FC5010881104120210F87C20102011FC102011241CA4E0A843FE0000 +743C:00400020FBFE2000200021FCF904210421FC202021283924E222442200A00040 +743D:00200022FDFA1024102813FE7C20104010FC118412841CFCE084408400FC0084 +743E:03F80248FA4823F82248224823F8F8A021102208251621103910E11002100410 +743F:000003FEFA22202023FE2020F9FC212421FC212421FC3820E3FE402000200020 +7440:0004001EFBE0202021FC21242124F9FC202023FE22223A2AE2FA4202020A0204 +7441:000001FEFD02117A1102117A11027C0010FC108410FC10841CFCE08440FC0084 +7442:000001FEFD12111211FE11007D7E11421142117E11421D7EE2424242047E0842 +7443:00400040FBFC204021F8208023FCF910220825F621103910E1F04110011001F0 +7444:00400020FBFE2202240421FC2000F9FC210421FC210439FCE104400003FE0000 +7445:000001FCFD04110411FC11047D0411FC100013FE10201D20E13C412002A0047E +7446:000001FCFD0411FC110411FC10207D2011FE1220102011FC1C20E02043FE0000 +7447:002001FEFC2010FC102011FE7C0010FC10A4109411FE1CA4E11441FE00040018 +7448:000001FCFC48103013FE10527C9411101230102013FE1C70E0A8412406220020 +7449:000001FCFD0411FC111011FE7D10114A1186100011FC1D04E1FC410401FC0104 +744A:0008000CF80A23FE2208220822E8FA0A220A22EC22AC3AA8E2EA421A02260442 +744B:00400040FDFC108413FE10007DFC110411FC102013FE1C20E22043FE00200020 +744C:000003FEFC20104011FC115411547D541154112C102013FE1C50E08841040202 +744D:00800080F8F82108221025FCF9042154218C212420203BFEE050408801040602 +744E:01100112FDD41118115211927D2E104011FC110411041DFCE104410401FC0104 +744F:00400020FBFE22022088210421FCF890211023FE20503890E110461000500020 +7450:01080088F89027FE200023C42254FA5423D4225422543BD4E2544244025402C8 +7451:008000FCFD0411F8100813FE10407CA213341058109413341C52E09043500020 +7452:000000FCFC8410FC108410FC10007DFE108010FE112A124A1C92E12240540088 +7453:00200020FBFE202021FC2124F9AC2174212421FC20203870E0A8412402220020 +7454:00400080FDFC110411FC11047DFC1020103213B410A81D28E124422404A20040 +7455:000003DEFA422242224223DE2200FA3E23D2221222143BD4E208421402240242 +7456:00800338FA28222823A822462200FA7C23A4222422283BA8E610422802440282 +7457:003C07C0FA442128200023FC2080F88027FE210021F83A88E250442008D80306 +7458:00000FDEF4922492249427942498F49427922492249225DA3E94C09000900090 +7459:00920124FA482124209220402080FBFE2202228A22523A22E252428A03FE0202 +745A:0100013CF92427E42124213C2124FBA422A422BC22A43AA4E3A4404400540088 +745B:00880088FBFE208820A8202021FCF9242124212423FE3820E050408801040202 +745C:004000A0F910220825F6200023C4FA54225423D422543A54E3D44244025402C8 +745D:00200040FDFC110411FC11047DFC100013FE102010201DFCE020402003FE0000 +745E:00200222FA22222223FE200027FEF820204023FE22523A52E252425202520206 +745F:0000FEFE101010107C7C10101010FEFE011008A0484449828E121810E7F00000 +7460:004003BEFA122292225222AA2324F84023FE222222223BFEE222422203FE0202 +7461:0100027EFB88228822BE22AA23AAFA2A222A23AA22AA3AAEE288438802880008 +7462:00400020FBFE2202249421082264F8902108220425FA3908E108410801F80108 +7463:00200124FCA8102011FC11047D0411FC110411FC11041D04E1FC400000880104 +7464:00400080FDFC1248113010C013007DFC1220102013FE10201D24E12441FC0004 +7465:000001F8FD08110811F811087D0811F8100013FC12941E94E294429407FE0000 +7466:00400080FDFC1104110411FC7D0011FE110011FE10021EAAE2AA440200140008 +7467:00200020FBFE202021FC204023FEF888213422E2202039FCE07040AC03220020 +7468:000003FCF89022942198209027FEF80021F82108210821F83908E10801F80108 +7469:08202AA44D28145022887FFE400280043FFC010001001FF80100012001107FFE +746A:000001FEFD2011FC112011FC7D20112011FE100212AA1EAAE2AA420200140008 +746B:001E01E0FC221112109410807C2011CE1102110211CE1D02E102410201FE0102 +746C:204017FE8090490813FCE1502252244E00007FFC01003FF801200110FFFE0000 +746D:00200010FBFE222022FC222423FEFA2422FC222022FC3A84E284448404FC0884 +746E:000003FEF850205023FE22522252FBFE2020202023FE3870E0A8412406220020 +746F:0100009EFBD22252225423D42258FA5423D2221222923A5AE2D4435002100010 +7470:00200040FBFC2224222423FC2224FA4423FC204020A838B4E13C41220222041E +7471:00200020FBFE202021FC210421FCF90421FC210421FC3904E3FE408801040202 +7472:00400040F8A02190224827FEFA0823F8220823F822003BF8E508450809F80108 +7473:00840044FC4811FE102010FC7C2011FE1040108010FE1D10E210441001FE0000 +7474:1000FE7810487C480048FE8682007CFC0044FE4410287C2810101E28F0444182 +7475:000001FCFCA41088105010207CD81326102011FC11241D24E1FC402203FE0002 +7476:0008003CFBC0200422442128F9FC2220202023FE20203924E124412401FC0004 +7477:000E03F0F8442224210823FE2242F84023FE208020FC3944E128421004680186 +7478:00400020FBFE2202241421E02100F90021FC2110211027FE3800E09001080204 +7479:00880088FBFE208820A820502088F9742222202021FC3820E0A8412402A20040 +747A:00200124FCA813FE120210F87C88108810F8102011FC1D24E124413401280020 +747B:000001FCFD2413FE112411FC7C0011FC110411FC11041DFCE10441FC00880104 +747C:002003FEFC2011FC112411FC11247DFC102213FE100813FE1D08E08840280010 +747D:01240124FA2424242954214AFA9226102A102250225C3A50E25042B0029E0300 +747E:00880088FBFE208820F8202021FCF92421FC202023FE3820E1FC402003FE0000 +747F:00007F7848485F4C64805F7844484A4851307F4C00007FFC01003FF80120FFFE +7480:00200222FBFE2090208821FE2310FD1021FE2110211039FEE110411001FE0100 +7481:00400080FBFC224422F4231422A4FA4422A423FC20403824E522450A090800F8 +7482:00880088FBFE208820F8208820F8F88823FE208821243AFAE020402003FE0000 +7483:00400020FBFE2000215421242154F9FC202023FE22423A92E2FA420A02020206 +7484:00400020FDFC1088105013FE7C0011FC110411FC11041DFCE09040920112060E +7485:01240248FD24100011FC11247DFC112411FC102013FE1C70E0A8412406220020 +7486:000007BCF88424A4229424A42050F988262620C023103864E388403000C00700 +7487:02100110F91027BE2240220023BEFA8A228822A822AE3AA8E4A845A8085E1080 +7488:01080108F90827D0211E2794F9242FD4221423D422543A48E24844D404240842 +7489:00100410FAFE221020FE209226FEFA9222FE221022FE3A10E210451008FE0000 +748A:00880088FBFE2088208820F82020FBFE2222233222AA3B76E2224222022A0224 +748B:002001FCFC88105013FE10007DFC110411FC110411FC1C20E3FE402000200020 +748C:00400020FBFE2202200021FC2020F9FC212421FC212439FCE000408801040202 +748D:008803FEF888200021FC20A820A8FBFE20A820A821FC3820E3FE402000200020 +748E:00000FBEF8A22AAA2AAA2AAA2514F8A220802FFE21103A10E3A0406001980E04 +748F:010001F8FA0823F020102FFE2080FC8824EA274A244C3DE8E44A464A04A60110 +7490:00100790FCBC24A424C427A82110F928214625C0253C3D24E52445A40E3C0024 +7491:00800080F9FE23542554215423FEF9542154215427FE20003954E12A022A0000 +7492:002007A4F8A822922114220825F4F80223F8220822083BF8E20841100FFE0000 +7493:008803FEFC88101C11E0102013FE7CA81124122211F810881C9EE082410A0204 +7494:01040088F80023FE222222AA2272FA2223FE200021FC3904E1FC410401FC0104 +7495:000003FCF80423FC200423FC2000FBBC212427BC20083BFEE108408800A80010 +7496:0200017EF840247C224420FCF940267E2220202023FE3870E0A8412402220020 +7497:21F8110841F821080BFE090073FC14A41154128800007FFC01003FF80120FFFE +7498:00200124F8A823FE20A821242222F904210421DE22442554389EE10402040404 +7499:00200020FBFE2050228A2104FBFE250421FC210421FC3820E124422204A20040 +749A:000003FCF848203023FE20522094FB50202023FE22523A8AE376425202720206 +749B:004003F8F84827FE204823F8F8402554275C244427FC3C44E75C455405540844 +749C:00880088FDFC1088108813FE10207DFC112411FC112411FC1C00E08841040202 +749D:002001FCFD2411FC102013FE7C0011FC110411FC11041DFCE10441FC00880104 +749E:00500252F954205023FE20882050FBFE202021FC20203BFEE050408801040602 +749F:000001FCFD0411FC110411FC7C2013FE100011FC11041DFCE020412402220060 +74A0:003C03E0FD2410A813FE10A87D24120211FC112411241DFCE124412401FC0104 +74A1:00280424FA7E22C82148207E2648FA48227E224822483A7EE240450008FE0000 +74A2:000003FEF85023DE2252225223DEF85023FE222222223BFEE222422203FE0202 +74A3:01240124FAAA23AE212422AA23AEF92427FE211021143914E28A424A02160422 +74A4:00200020FBFE202021FC2124F9FC212421FC202223FE3842E02442A2028A0478 +74A5:02880288F7E82290241E27E42454F8542754255425543748E548405402940122 +74A6:003C03C0F8442224210827FE2442FAA4228A247A208038F8E10842900060079E +74A7:3E1022FE3E4420287EFEA2103EFC221000007FFC01003FF801200110FFFE0000 +74A8:008000DCFA8423D424482A942324FC402248215027FC38E0E15042480C460040 +74A9:0040007CF84023FE2242227823C4FA3C220023FE22403BA4E25845B4045209B0 +74AA:01FC0104F90421FC200023DE2252FA5223DE202023FE3870E0A8412406220020 +74AB:00200124FCA813FE120210F810887C8810F8100011FC11241DFCE12441FC0104 +74AC:01080208F7C8245027DE246427D4F214211427D4221423C83248C454055408A2 +74AD:000004FEFA92227C2010207C2654FA7C2254227C221022FE3A10E51008FE0000 +74AE:002007FEF80023FE220222FA228AFBFE200021FC210439FCE10441FC000007FE +74AF:00200050FC881174120211FC7D2411AC112411FC10001CF8E08840F8008800F8 +74B0:000003FCFA94229423FC2000FBFE200023FC220423FC38A2E11443080D440182 +74B1:000007BEF108210827BE21082108F7BE20002080204425123522C9C003040CFC +74B2:00880448FA5020FC202020502694FA382250229822343A54E290422005FE0800 +74B3:00A000FCFD2013FE10A811247E2211FC110411FC11041DFCE10441FC00880104 +74B4:00880088FBDE208821DC22AA2488F80023FE20222120393CE12042A0047E0800 +74B5:0140024CFA642244234C226422A4FBAC22A422A427FE3800E110410802040404 +74B6:004003F8F84827FE204823F8F84027FE200022A424523BF8E2A842A80FFE0000 +74B7:014807C8F90827D0255E27E4FD5427D42554211427D43A08E3C84254055408A2 +74B8:00400020FBFE220221FC2148FA5021FC230421FC210439FCE10441FC00880104 +74B9:002003FEFC2011FC100013FE10027DFC102013FE100013FE1C04E3BE42A4038C +74BA:2FEC48244BA4682C4BA46AAC4BA44824FFFE80027FFC01003FF801200110FFFE +74BB:03DE0042FA52214A2252202023FEF8882088215422223820E7FE402000200020 +74BC:000803E8FA8823EE222823F42282FBE2200021FC21543954E154415407FE0000 +74BD:7FFC21087FFCB55A29283558210835582928355800007FFC01003FF80120FFFE +74BE:00400020FBFE2088205227AC22AAFAA825AC2000210439FCE10441FC01040204 +74BF:0040007CF84027FE240223FCFA4824A4211023F8260C3BFAE20843F8020803F8 +74C0:000001FCFC2013FE122211AC7C2011AC100013FE10201DFCE15441540154010C +74C1:008803FEFCA8109011FE13207DFC112011FC112011FE1D00E3FC40880070038E +74C2:008803FEFC88102011FC102013FE7C40108811FC100011FC1D54E15447FE0000 +74C3:03F80248FA4823F822482248FBF820002FBE2AAA2AAA3FBEEAAA4AAA0FBE08A2 +74C4:002003FEFC2011FC100013FE7E5213FE110411FC11041DFCE10441FC00880104 +74C5:044404E4F8A82AAA2EEE24A42AAAFEEE224220402FFE20E03150C2480C460040 +74C6:0042039CFA1023DE229422942420FBFC220423FC22043BFCE20443FC01080204 +74C7:03FC0040F9F8210821F8210827FEFC4222A4228A247A3880E1F842880070038E +74C8:00500190FC9E13EA108A11D2128A7CA410501088132610A81C70E0A841240060 +74C9:008801DCFC8813DE108811547E2211FC110411FC11041DFCE10441FC00880104 +74CA:010001F8FA0827FE22622292F9FC210421FC210421FC3880E1F842880070038E +74CB:00200010F4FE2244222820FE2092F6FE229222BA22AA22BA3286C50008FE0000 +74CC:00400020FDFE100011FC115411FC7C201122108C112210541CC8E14442520060 +74CD:0008073EF590255E2564265E2500F5DE2552255E2552265E3452C45604A0051E +74CE:01080108F7CE2112212427DE2552F55E27D2211E2392255E3940C11401120122 +74CF:01100090FBDE2010225E2182FBDE201023DE225023DE3A50E3DE4250025202CE +74D0:0040007CF84023FC224423F0FA4422FC22A822F822A83AF8E20045FC05540BFE +74D1:000007FEF4442598248827DE2488F5DC26AA248824202520353CC920092017FE +74D2:01040514F7DE29242FFF210CF3552DA723FC220422243A24E24400B001080604 +74D3:03DE0252FBDE225223DE222222FAFA2222FA22AA22FA3AAAE2FA427202AA0226 +74D4:03DE0252FBDE225223DE225223DEF98C2252204027FE3888E190406000D80304 +74D5:F7FC124817FCFC4686ECF55416EC155456EC244400007FFC01003FF80120FFFE +74D6:002003FEF80021DC215421DC2088FBFE208823FE208827FE3894E18806A400C2 +74D7:022203FEF89021FE231025FE2110F9FE211021FE210023FE3A8AE37602520276 +74D8:008803FEF88823DE225223DE20A0F89021FE212023FC3D20E1FC412001FE0100 +74D9:004003FCF84021F8200023FCF80421F0204023FC20083BBCE2A8439805240892 +74DA:052807BEF94827BE231825AAF94623FC220423FC22043BFCE20443FC01080204 +74DB:010801ECF10A2FEA29282BC8293EFFE829482BE82A282B683AA8CBF40AB412A2 +74DC:001000F81F2012201220122012201220122012101290225022A8432842048002 +74DD:02200720383C2A442A842A242A142A142A0429042928289028404A304D0E8900 +74DE:0210071038502A7C2A902B102AFE2A102A2829242942288228404A304D0E8900 +74DF:02400740387C2A842B742A542A542A742A482942294228BE28404A304D0E8900 +74E0:1008101CFEE828A844A882A87CA800A8FEA820A440A47CA404A2052829341224 +74E1:1008101C7CE810A810A8FEA844A828A87CA810A410A4FEA410A2112811341224 +74E2:0008FE1C28E8FEA8AAA8AAA8FEA800A87CA800A4FEA410A454A2932851342224 +74E3:409021C82708FD3E058055542548FD7E25482548755C25282508494849A89128 +74E4:1008FE1C00E8EEA8AAA8EEA844A8FEA844A8FEA444A4FEA450A2CB2865344224 +74E5:06FE38202C542AB42A5829B454545D9290307EFC52A47EFC10201424FEFE0202 +74E6:0000FFFE04000400040007E008200A20092009200820102213221C22101E0000 +74E7:0020FC202020202020203DFC2420242054204C20442044205422640243FE0000 +74E8:000001FC7C801080108010F8108810881148112811281D08E108414A018A0106 +74E9:0010FC3820E0202020203C2025FC242054204C20442044205422640243FE0000 +74EA:0004FC0E20F0208020803CFC248424C454A84C90452845445602640243FE0000 +74EB:044008203018DFE604200420082010A020407FFC08000FE0092010A41624181C +74EC:200011FC0080FE80208020F83C88248825482528252825084508554A898A0106 +74ED:000011FC10801080FE8092F81088108829482928292829084B084D4A898A0106 +74EE:0440082010102208C44608201FF0000000007FFC08000FE0092010A41624181C +74EF:00007EFC40404440644054784848484854A854986488408840AA7ECA008A0006 +74F0:0010FC502048208820843D0226F8244854484C88448845285612640243FE0000 +74F1:0020FC7021C0204020703DC02440247857C04C4844484448543A640243FE0000 +74F2:0020FC2021FE202021243D24252425FC54204C244424441C5402640243FE0000 +74F3:100011FC10801080FE8010F8108810887D4845284528450845087D4A458A0106 +74F4:100010FC284024404240917808480848FEA802984488288810AA08CA088A0006 +74F5:100011FC208028804480FEF8428800887D4845284528450845087D4A458A0106 +74F6:420024FC00407E402440247824482448FEA824982488248824AA44CA448A8406 +74F7:0100410021FC0A441448E0A02110260C00007FFC08000FE0092010A41624181C +74F8:0000FDFC2020204020F83C88248824F854884C8844F844885402640243FE0000 +74F9:00007EFC424042407E4000787E48424842A87E98428842887EAA42CA4A8A4406 +74FA:00003EFC204020403C40207820483C4820A82098FE88208824AA42CAFE8A4206 +74FB:420024FC1840244052401078FF48204828A87E98AA882A882AAA2ECA088A0806 +74FC:0000FDFC2124212421FC3D24252425FC54204DFC4420442055FE640243FE0000 +74FD:0100111009207FFE40029FF410101FF000007FFC08000FE0092010A41624181C +74FE:0C0071FC1080FE80388054F8928800881148FD28252845082908114A298AC506 +74FF:100008FC7F40004022401478FF48004800A83E982288228822AA3ECA228A0006 +7500:02000F7C78200820FFA02A382A28FFA82A582A48FFC80848085A0F6AF04A4006 +7501:220022FC4440EE404440447844484448EFA844984488448844AA44CA448A8406 +7502:1000087C7E20422042207E38422840287F58554855487F48D55A556A554A4306 +7503:0620382008A47EA819202C504A88090400007FFC08000FE0092010A41624181C +7504:0000FEFC28402840FE40AA78AA48FE4810A81098FE88108810AA1ECAF08A4006 +7505:0000FDFE2100217C21543D7C2554257C55104D7C451046FE5402640243FE0000 +7506:082004407FFC12483CF0082014503EF800007FFC08000FE0092010A41624181C +7507:08202AA42CA84920145022887FFE400280047FFC08000FE0092010A41624181C +7508:080010FC7E4042407E4042787E4842487EA80898FF8818882CAA4ACA888A0806 +7509:2200147CFFA0142014207F381528FFA815587F4814483648555A94EA144A1406 +750A:08007F7C4920FFA049207F3808287F2849587F481048FF48215A726A0C4AF306 +750B:200010FCFE4044402840FE7882489248FEA89298BA88AA88AAAABACA828A8606 +750C:0000FEFC80408040BC40A478A448BC4880A8EE98AA88AA88EEAA80CAFE8A0006 +750D:0820FFFE08203FF824483FF800007FFE4002BFF408000FE0092010A41624181C +750E:100010FCFE4010407C4054787C4854487CA81298FE880888FEAA48CA288A1806 +750F:08047F0808103E6400083E1022643E0814107F6000007FFC08000FE011241C9C +7510:0800497C2A200820FF202A38492888284258774892485A482F5A226A424A8206 +7511:440024FC2840FE409240D678BA489248FEA800987C8844887CAA44CA7C8A4406 +7512:2000207C7FA0D52055205538FFA8552855585548FFC800486A5A556A954A0006 +7513:00407C2045FC44887C5043FE7C20A5FC24203C2000007FFC08000FE011241C9C +7514:20003E7C4220FFA0512064B87FA840285F5840485F4840485F5A516A5F4A9106 +7515:0100FFFE104824FE799010FC22907CFC089030FEC0807FFC08000FE011241C9C +7516:3EF822883EF822883EF822883EF8145022887FFC08000FE0092010A41624181C +7517:08000F7C08207F2049205E3849287F284A585F4851485B48555A5F6A554A9506 +7518:08100810081008107FFE08100810081008100FF008100810081008100FF00810 +7519:005000480040FFFE004022402240FF40224022203E20221222123E0A22060002 +751A:082008207FFC082008200FE0082008200FE008200820FFFE1220141010001FF8 +751B:4404441E44F04410FE1044FE4410441044107CFE44824482448244827CFE4482 +751C:08881C887088108811FEFC88108810887C8844F84488448844887C8844F80088 +751D:08480F4808487F4849FE4E4878484948477840485E485248527A520291FE2000 +751E:0100111009207FFE40029FF410101FF000001010FFFE10101FF010101FF01010 +751F:01001100110011003FFC21004100810001003FF80100010001000100FFFE0000 +7520:002000207D20452045FC452046207C20442045FC442044207C20442003FE0000 +7521:08100810489048907EFE48908910081008107EFE0810081008100E10F1FE4000 +7522:010000803FFE022001C002203FFE2080248027FC2880308027F8408040809FFE +7523:010000803FFE041002203FFE2080248027FC2880308027F8408040809FFE0000 +7524:00100010FF50087C105030904A109C7C28104C109A1029FE48808860281E1000 +7525:11FC1124512451FC7D24512491FC10407C4013FE104210821C82E10242140408 +7526:0010FF101050107CFE5092909210FE7C92109210FE1090FE500020005FFE8000 +7527:101050507E7E90907C7C10101EFEE0001FF010101FF010101FF0101010501020 +7528:00003FF82108210821083FF82108210821083FF8210821082108410841288010 +7529:00003FF82108210821083FF82108210821083FF82108210821284112410280FE +752A:040008003FF82108210821083FF82108210821083FF821082108410841288010 +752B:01200110FFFE010001003FF8210821083FF8210821083FF82108210821282010 +752C:00003FF00020064001803FF8210821083FF8210821083FF82108210821282010 +752D:7FFC01000770190CE10200003FF8210821083FF8210821083FF8410841288110 +752E:08001FF822484488095012203FF8210821083FF8210821083FF8410841288110 +752F:020001007FFE41029494142823E800003FF821083FF821083FF8210821282010 +7530:00003FF8210821082108210821083FF8210821082108210821083FF820080000 +7531:01000100010001003FF821082108210821083FF821082108210821083FF82008 +7532:00003FF82108210821083FF82108210821083FF8210801000100010001000100 +7533:0100010001003FF82108210821083FF82108210821083FF82108010001000100 +7534:01000100010001003FF821082108210821083FF820082008200820083FF82008 +7535:0100010001003FF82108210821083FF82108210821083FF8210A0102010200FE +7536:0200020004003FF821082108210821083FF821082108210821083FF820080000 +7537:3FF8210821083FF8210821083FF8000001007FFC010401040204040418146008 +7538:0800080010001FF820084008BF88248824883F88248824883F88208800500020 +7539:010001003FF821083FF821083FF80000FFFE080010001FF00010001000A00040 +753A:000000007DFE54105410541054107C1054105410541054107C10441000500020 +753B:0000FFFE000000004FE4492449244FE44924492449244FE4400440047FFC0004 +753C:00003FF8210821083FF8210821083FF800000000FFFE01000100010005000200 +753D:008200927C9254925492549254927C9254925492549254927C92451201020202 +753E:0888111022201110088800003FF82108210821083FF82108210821083FF82008 +753F:002000107C10540055FE548054807C8054805480548054807C80448000FC0000 +7540:00001FF0111011101FF0111011101FF000000000FFFE08200820082010202020 +7541:010001001FF0111011101FF0111011101FF00000FFFE08200820082010202020 +7542:008000807C8054F85508550855107E1054205420545054507C88450802040402 +7543:104010401040FE7C92849284FF0492449224FE24920410041004100410281010 +7544:0408420821101110102000403FF82108210821083FF82108210821083FF82008 +7545:100011F810107C20544054807DFC5454545454947D2454241044108411281010 +7546:100008080808FF88000800087F104910491049207F244924494249FE7F424102 +7547:004000407C8054FC5504560454847C4454445414542454447D84440400280010 +7548:0008001C7DE05500550055FC55447D4455445528552855107D10462802440482 +7549:002000207C20542055FC542054207C2057FE5420545054507C88448801040202 +754A:008800887C88548855FE548854887C8857FE5488548854887C88450801080208 +754B:004000407C40548054FE550856887C8854885450545054207C50448801040202 +754C:00001FF0111011101FF0111011101FF002800C603458C4460440084008401040 +754D:002000207C5054505488550456027C8854885488548854887C88450801080208 +754E:002000287C245424542055FE54207C2054205450545054507C88448801040202 +754F:00001FF0111011101FF0111011101FF00000FFFE111010A010401430180E1000 +7550:0000FFFE00001FF0101010101FF000003FF8210821083FF8210821083FF82008 +7551:100011FC1124112455245924512491FC1124112411242924252445FC41048000 +7552:101008100810FF90001000107F104910491049287F284928494449447F844102 +7553:010001047D88095011202118C50602003FF8210821083FF8210821083FF82008 +7554:002000207D2454A454A8542055FC7C205420542057FE54207C20442000200020 +7555:1FF0111011101FF0111011101FF000003FF8210821083FF8210821083FF82008 +7556:0008001C7DF055505550555055507D5055505548554855687D54467402520400 +7557:02000100FFFE00001FF010101FF000003FF8210821083FF8210821083FF82008 +7558:002000207C2055FC5524552455FC7D245524552457FE55047D04450401140108 +7559:060078FC4044484444445A94610800003FF8210821083FF8210821083FF82008 +755A:0200044008201FF002007FFC082010103FF8D11611101FF0111011101FF01010 +755B:002000207C5054885504561254207C4055885410542054447D88441000600380 +755C:020001007FFC040008201FC003100C083FFC00043FF821083FF821083FF82008 +755D:102008200820FFBC002400447F444988490849107F104928492849447F844102 +755E:01000100FFFE012001207D205538554855487D885510551055287D4845840102 +755F:00003FF821083FF821083FF81210220847E4882214402280010006C01830E00E +7560:010002001FF010101FF010101FF000003FF8210821083FF8210821083FF82008 +7561:002000107C1055FE5420542454447CF854125422544455887C10442800440182 +7562:00003FF821083FF821083FF8092009207FFC092009203FF801007FFC01000100 +7563:010002800C603018CFE600001FF010101FF000003FF821083FF821083FF82008 +7564:002000207C2055FC5420542057FE7C08540855FE540854887C48440800280010 +7565:00800080F8F8A908AB10ACA0F840A8A0A918AA06ADF8F9088908010801F80108 +7566:002000207DFC54205420542057FE7C005420542055FC54207C20442003FE0000 +7567:00003FF821083FF821083FF808001FF0282007C01830E00E1FF010101FF01010 +7568:010011100920FFFE054009203118C0061FF0111011101FF0111011101FF01010 +7569:004000207C2055FE5440544054A07CA255A45698549054887C8844A400C20080 +756A:00F83F00111009200100FFFE092010103FF8D11611101FF0111011101FF01010 +756B:01003FF80108FFFE01083FF801007FFC00003FF821083FF821083FF80000FFFE +756C:010002800C603018CFE601003FF81110250802003FF821083FF821083FF82008 +756D:002000207C505488550456FA54207C2057FE5420552855247E22442200A00040 +756E:008000807CFE550056FC548454A47C9457FE5484552455147DFE440400280010 +756F:00400040F888A904ABFEA802F888A944AA42A8F8A988FA508820005001880606 +7570:00003FF821083FF821083FF8082008207FFC08200820FFFE0000082010102008 +7571:00007FFC02803EF8228822883EF802803FF8210821083FF8210821083FF82008 +7572:010002800C6037D8C0063FF809201110250802003FF821083FF821083FF82008 +7573:00003FF821083FF821083FF80000FFFE80021FF010101FF010101FF01010FFFE +7574:00200020FBFEA820A9FCA840FBFEA848A888A8FEA908F9488A28040800280010 +7575:01003FF80108FFFE01083FF80100FFFE00001FF051145FF451145FF440047FFC +7576:0100111009207FFE40029FF4101010101FF000003FF821083FF821083FF82008 +7577:000003DEF842A94AA884A94AFA52AC20A800ABDEA852F9528894014802540422 +7578:002000207DFC54505488550457FE7C0855E85528552855E87D28440800280010 +7579:00400020FBFEAA02AD04A900F9DEAA52AA52AB52AC9AF894891001120212040E +757A:00007FFC00003FF821083FF82108FFFE00003FF821083FF821083FF80000FFFE +757B:002001247CA8542055FC544057FE7C8855245622542055FC7C20442003FE0000 +757C:000000FC7C8454FC548454FC54007DFE548054FE552A564A7C92452200540088 +757D:0008003C7DE0542057FE542055FC7D2455FC552455FC54207DFC442003FE0000 +757E:1FF0111011101FF0111011101FF00000FEFE92929292FEFE92929292FEFE8282 +757F:1110212045447978111025247D7C05240110FFFE00807C8854527C22545A7D86 +7580:0020542055FEA82055FC542403FE7C2455FC54207CA054BC54A07D60453E0200 +7581:000007BCF884ACA4AA94ACA4F850A988AE26A8C0AB10F8648B88003000C00700 +7582:00003FF821083FF821083FF8183006C018307FFE50129FF410101FF01010FFFE +7583:002001FC7C88545057FE540055FC7D2455FC552455FC54207DFC442003FE0000 +7584:00200124F8A8ABFEA8A8A924FA22A904A904A9DEAA44FD54889E010402040404 +7585:000003FEF800A9FCA924A9FCF924ABFEA800A9FCA924F9FC892401FC000003FE +7586:0000FBFE080009FCF92481FC8124FBFE480049FCE92449FC692489FC500023FE +7587:002003FEF820A9FCA800ABFEF802A9FCA820ABFEA800FBFE880403BE02A4038C +7588:0080F8BE0080709C5294729C0280FABEAAAAACAAF8BEA8AAA8AAF93E89220200 +7589:1FF011101FF011103FF82AA83EF82AA8FFFE88020FF010101FE00020FFFE0000 +758A:1FF011101FF011103FF82AA83EF82AA8FFFE90121FF010101FF01010FFFE0000 +758B:000000007FFC0104010801001100110011F81100110011002900250043FE8000 +758C:010001007FFC01003FF80108FFFE01083FF80100110011F81100290047FE8000 +758D:00007FFC0104110011F0290047FE80001FF010101FF010101FF00000FFFE0000 +758E:002000207DFE0420082011FC512451245DFC5020507050A85D247222C0200020 +758F:002000107DFE04200848108451FE50025CA850A850A850A85D2A712AC22A0406 +7590:01003FF801007FFE40029FF411101FF011101FF000007FFC010411F02900C7FE +7591:40004DFC7008445044203DFE40247C2890A010B8FEA010A028E02520451E8200 +7592:008000401FFE1000900050005000100030005000900010002000200040008000 +7593:008000401FFE1000900057F8510811103120513C910411042204220444288810 +7594:008000401FFE1000900057FC5040104030405040904010402040204041408080 +7595:008000401FFE1000900052005208121032605380920012042204220441FC8000 +7596:008000401FFE1000900057FC5084108430845084909410882080208040808080 +7597:008000401FFE1000900057FC5008101030205040904010402040204041408080 +7598:008000401FFE10009000500057FC10403040504090401040204020404FFE8000 +7599:008000401FFE1100910053FC5400180033F850109060108021002202420281FE +759A:008000401FFE11009100510053F01210341058209020104020A0211046089806 +759B:008000401FFE10009010501057FE101030105210911011102010201040508020 +759C:008000401FFE10009000500057FE104030405050904810442040204040408040 +759D:008000401FFE100090405040504014443444544494441444244427FC40048000 +759E:008000401FFE1000900053F85000100037FE5080910013F82008200840508020 +759F:008000401FFE1000900053FC5200120032005FFE92001200220023FC40008000 +75A0:008000401FFE1000900057FC5100110031F85108910812082208240848509020 +75A1:008000401FFE100093F0502050C0110033FC5124912412242244244448A88110 +75A2:008000401FFE100090405040524412443248545090A010A02110220844048802 +75A3:008000401FFE100090905088508017FE30A0512091201120222222224422881E +75A4:008000401FFE1000900053F8524812483248524893F812002202220241FE8000 +75A5:008000401FFE1040904050A0511012083D165110911011102110221042108410 +75A6:008000401FFE10009040504053F810483048504897FE10A020A0211042088C06 +75A7:008000401FFE1000903C57C054401440344057FE942014202412250A46068402 +75A8:008000401FFE1000900057FC50101210341057FE90501090211022104C508020 +75A9:008000401FFE1080908057F0511011123212544E904017FE2040204040408040 +75AA:008000401FFE1020922052205222122433A852309220122222A22322421E8000 +75AB:008000401FFE100093F052105210140E380057F89208111020A0204041B08E0E +75AC:008000401FFE100093FE52005220122032FC5224922412442244248444A88910 +75AD:008000401FFE10009110511051101110311052A8926812282444244448849102 +75AE:008000401FFE104090A05110520814063BF052109210125022202204420481FC +75AF:008000401FFE1000900053F85208132832A85248924812A8252A240A48069002 +75B0:008000401FFE10809040500057FC10403040504093F81040204020404FFE8000 +75B1:008000401FFE1200920053FC54041BE43224522493E4121422082202420281FE +75B2:008000401FFE1040904057FC5444144037F85508951014A0244028A049189606 +75B3:008000401FFE1000920852085FFE12083208520893F812082208220843F88208 +75B4:008000401FFE1000900057FE5008100833C85248924813C82248200840288010 +75B5:008000401FFE1000911051105512151435D8551095101510251225D25E12880E +75B6:008000401FFE100090485248524812483FFE5248924812782200220043FE8000 +75B7:008000401FFE1000903C57C054401440344057FE942014202412250A46468422 +75B8:010000803FFE20002000A7F86408240827F86408A40827F8200040005FFE8000 +75B9:008000401FFE104090A051105208142630C05310902010C02308201040E08700 +75BA:008000401FFE1000907857805040102037FC5008903010C023002480487E9000 +75BB:008000401FFE1000900053FC520412043204520493FC12042090210842048402 +75BC:008000401FFE1100910053F85610192030C053309C0E10C02020230040C08020 +75BD:008000401FFE1000900053F85208120833F85208920813F8220822084FFE8000 +75BE:008000401FFE1200920053FC5240144030405FFE904010A020A0211042088C06 +75BF:010000803FFE21203FFCA12461242FFC29206920AFFE21222222422A44248820 +75C0:008000401FFE1200920053FC5404180433E45224922413E42224200440288010 +75C1:008000401FFE10809080508050FC1080308057F8940814082408240847F88408 +75C2:010000803FFE24002400A4006FBC24A424A464A4A4A424A428A448BC52A4A100 +75C3:008000401FFE108090405FFE50801108321057E0904010802110220847FC8204 +75C4:008000401FFE1200920053FE5500190031F85100910011FC2100210041008100 +75C5:008000401FFE1000900057FC5040104037FC544494A415142614240444148408 +75C6:008000401FFE100093FC5204520413FC3200524092441248227024424442883E +75C7:008000401FFE100090005FFC504010403240527C92401240224022405FFE8000 +75C8:008000401FFE1000900057FC5444144437FC5444944417FC2444284448549008 +75C9:008000401FFE100097F85010502010D833045C0293F81040204020404FFE8000 +75CA:008000401FFE104090A0511052081DF63040504093F81040204020404FFE8000 +75CB:008000401FFE10009040504057FC14443444544497FC10402048207C4F828402 +75CC:008000401FFE1000900057FC540415F4340455F49514151425F4240444148408 +75CD:008000401FFE10409FFE50405FFC104437FC544097FE104220AA211442088C06 +75CE:008000401FFE108090405FFE5080110833F05020904411882610206841848602 +75CF:008000401FFE1040904057FE5080110033FC550499FC110421FC210441148108 +75D0:008000401FFE1000900057FC5404140435F45514951415F42404240447FC8404 +75D1:008000401FFE108091F852105D2010C031A0567C908411082690206040C08700 +75D2:008000401FFE111090A057FC5040104033F85040904017FC2040204040408040 +75D3:008000401FFE100097FC50805110120837FC5044904017FC204020404FFE8000 +75D4:008000401FFE1040904057FC504010403FFE501090101FFE2210211041508020 +75D5:008000401FFE100097F8540857F8140837F85484948814502420251846068400 +75D6:008000401FFE1000900053FC5090109034925292929410982090209047FE8000 +75D7:008000401FFE1200920053FE54001BF8328852489FFE1488244827FC40088030 +75D8:008000401FFE1000900057FC500013F83208520893F81000211020A04FFE8000 +75D9:008000401FFE100097FC5000524814903248500097FC1040204020404FFE8000 +75DA:010000803FFE20802088A7F060A03FFE20806FF0A620384027FC404041408080 +75DB:010000801FFE100097F850A0504017FC344457FC944417FC2444244444548448 +75DC:008000401FFE1000903853C0504017FC31505248944611F02110211042128C0E +75DD:010000803FFE22102208BFFE6248225022646248A2522264244A447248C2933E +75DE:008000401FFE100097FC5020504011D036485044900013F822082208420883F8 +75DF:008000401FFE104092485150504013F8320853F8920813F82208220842288210 +75E0:008000401FFE10809108520457FE110A3284548291F813082490206041988E06 +75E1:008000401FFE105090485FFE504017FC344457FC944417FC2444244444548448 +75E2:008000401FFE100090C45704511411143FD45314939415542504290441148108 +75E3:008000401FFE10009040504057FC1040304053FC900010402124252A450A88F8 +75E4:008000401FFE1040904052485248155438E25040904017FC2040204040408FFE +75E5:008000401FFE10009210512057F814083408540897F81120212022224422981E +75E6:008000401FFE100097FC508053F8108831085FFE900013F82208220843F88208 +75E7:008000401FFE10109210511051541452329252109114160422082210422080C0 +75E8:008000401FFE1108910857FE5108100037FE5402904017FC2084210442288C10 +75E9:008000401FFE104097FC544457FC144437FC504097F81208211020E043188C06 +75EA:008000401FFE110091F0521054201BF83248524892481FFE20A0211042088C06 +75EB:008000401FFE10009200517C5404144435F4544494E415542644244444548408 +75EC:008000401FFE100093F8520853F8120833F8510093FC14942924224444A88110 +75ED:008000401FFE100097BC54A454A417BC34A454A497BC14A424A424A44AA4914C +75EE:008000401FFE100093FC520053F8120033F852009FFE14882450252046188406 +75EF:008000401FFE1080904057FC540413F03210521093F0120023F82208420883F8 +75F0:008000401FFE10409248525054A0111032085C449248125024A0211042088C06 +75F1:008000401FFE100090905090579E10903090539C90901090279E209040908090 +75F2:008000401FFE1110911051105FFE111035545554955415542554295641108110 +75F3:010000803FFE22102210A2107FBE221026106738AAB42A543292421042108210 +75F4:008000401FFE1200920053BC5524192431245FE49124112422A422BC44248800 +75F5:00801FFE1000103893C0504017FC315052489C4611F010202FFE204041408080 +75F6:008000401FFE10A090A057FC54A414A437FC54A494A41FFE2000211042088404 +75F7:010000803FFE20002080AFFC6120221024886FF6B49027F0249047F24082807E +75F8:010000803FFE21002504A7C469143FF4211467D4A5542554255445C441148108 +75F9:008000401FFE100093F8524853F8124833F850009FFE11102110211042108410 +75FA:008000401FFE1080910057FC544417FC348457FC914012403FFE204040408040 +75FB:00803FFE20002038AFC068402FFC28206B1AAC0627F8240827F8440847F88408 +75FC:008000401FFE100097FC5444544417FC344455F49514151425F4240447FC8404 +75FD:008000401FFE1120911053FE522016203BFC5220922013FC2220222043FE8200 +75FE:008000401FFE1000977E55045574165435545554955415742754240444148408 +75FF:008000401FFE103897C050405FFE115032485C4690801FFE2108231040E08F1C +7600:010000803FFE20002410A2106FA8242824446792A488248828A048905288A108 +7601:008000401FFE1000904057FC5110111032A8544490401FFE2040204040408040 +7602:008000401FFE10009FFC5120512017383408540897381120212021205FFE8000 +7603:010000803FFE20002FFCA100630824882D506260A5E029502250444859448080 +7604:010000803FFE22102FFCA21062103FFE200067F8A408240827F84408440887F8 +7605:008000401FFE1208911057FC544417FC344457FC944410402FFE204040408040 +7606:008000401FFE1090910853FC504017FE311052689D86103021C0201840608380 +7607:00803FFE200827F0A0406FFE204027FC6444A7FC244427FC204047FC40408FFE +7608:008000401FFE110097BC51145794111437A4514C90401FFE20A0211042088C06 +7609:008000401FFE104090A053185DF61000378454A497A414A427A4248444948588 +760A:010000803FFE200022F8A20864082DFE348064F8A520242025FE445044888506 +760B:010000803FFE20002FF8A80868682B8828886BE8AAA82BE8288A50EA5726A002 +760C:008000401FFE1100910457C4511417D4355457D4911413942554294441148108 +760D:008000401FFE100093F8520853F8120833F850009FFE120027FC292442548488 +760E:008000401FFE111097FC511051F0111031F0511097FE120022902308420083FC +760F:008000401FFE1040904453F45048105037FE508091F8130825F8290841F88108 +7610:010000803FFE20002280ACB8688828882EB86888A8882FF8214042204C18B006 +7611:010000803FFE200023F0A21063D0225022506FFCA80429E4292449E448148808 +7612:008000401FFE100097FE54425BFC104033F8524893F8124823F820404FFE8040 +7613:010000803FFE220023F0A4206FFC34A425146444A0402FFE20A0411042088C06 +7614:008000401FFE111091105FFE511010403FFE5040904017FC2404240447FC8404 +7615:008000401FFE100097BC5484548417BC3400547C97A414242428279044288446 +7616:008000401FFE1080904057FC521011203FFE500093F8120823F8220843F88208 +7617:010000803FFE20802FF8A49062A03FFE21406220AC9830862FF8408040809FFC +7618:008000401FFE124891505FFE51501248344450809FFE11082390206041988604 +7619:008000401FFE100097FC5248511010E033185C4693F8124823F8204447FC8004 +761A:010000803FFE28902510AFBE622222442A906A90AF9022102228442844448882 +761B:008000401FFE110097BC51145394111437A4514C9100104020242522450A88F8 +761C:010000803FFE210027F8A40867F8240827F86408A7F8208020444A424A1291F0 +761D:008000401FFE100097FC54A454A417FC30405150924814442150224844448040 +761E:010000803FFE204027FCA2486248255428A26318AC4623F8204040404FFE8000 +761F:010000803FFE200027F8A40867F8240827F86000AFFC2924292449247FFE8000 +7620:008000401FFE1444924854A45110120837FC5A0A93F8120823F8220842288210 +7621:008000401FFE104091B05E4E53F8120833F8520893F8120025FC250449FC8104 +7622:010000803FFE24002F78A9486D482B863F006978A9482D482B28491049289346 +7623:010000803FFE20802100AFFC68842FFC28846FFCA1482154225C44464842B03E +7624:008000401FFE1080977C542455A415543648508097FC144427FC244447FC8404 +7625:008000401FFE111090A057FC504013F8308057FC910013F82440284047FE8000 +7626:008000401FFE1140965C5444575C144437FC504097FC1208211020E043188C06 +7627:00803FFE208020FCA0806FFE288228F06F84A87C280029FC29004BFE490091FC +7628:00801FFE104017FC904053F8120833F8520893F8120813F822082FFE41108208 +7629:008000401FFE1110911057FC515010A0311052E89C0613F82208220843F88208 +762A:00803FFE210027F8A40867F8240827F86408A7F8212026183A664388420881F8 +762B:010000803FFE20502048BEFE72902A902BFE6490A4902AFE2A90529040FE8080 +762C:008000401FFE1000973C5120513C1720343C5420977E1128212A212445248232 +762D:00803FFE20003FFEA1206FFC29242FFC6000A7F820002FFC2248444449428080 +762E:008000401FFE111093F8521054A417FC30A053189C4613902064239840608380 +762F:008000401FFE142092205F7E544014A0373C5550951015FE251029284B449082 +7630:00803FFE200027FCA44467FC244427FC6100A20827F020C42FFE444849449082 +7631:010000803FFE20402FFEA2486248255428A26318AC0620802A444A4A520A81F8 +7632:010000803FFE22002448A848705422A425006C10B490249C24904550463E8400 +7633:00803FFE20002F7CA924651429A421606618B88623202C4021884E3041C08E00 +7634:00803FFE204027FCA1106FFE200023F86208A3F8220823F820404FFE40408040 +7635:010000803FFE222023BCA4A46AA82510220865F6A80027FC2250444849448080 +7636:010000803FFE22202220AFA0623E2FC22A946A90AF90221027284AA852448282 +7637:010000803FFE22102210AF90623E2FA42AD46A94AF94220827084A9452248242 +7638:008000401FFE120097BC52A454A415BC384057FC94A41554244424A44514840C +7639:010000803FFE22102520A8BC7744220422246F94A2142A84270443C45C288010 +763A:010000803FFE20002FFCA8046FFC28002FFE6820ABFE2B322AAA4B324AAA9206 +763B:010000803FFE20802FF8A8887FFE28882FF86490A7F021003FFE441043E09C1C +763C:008000401FFE111097FC511053F8120833F8520893F810402FFE20A043188C06 +763D:00803FFE22083FFEA20863F8204027FC6444A7FC20402FFE204047FC40409FFE +763E:00803FFE20402E78AA886B102CFC2A046AFCAA042BFC2E2028144952494A8A38 +763F:00803FFE20002FBEA8A26AAA2AAA2AAA6514A8A23FFE2208271040E0431C9C02 +7640:010000803FFE22202FF8A2207FFC20802FF86888AFF828882FF8422044108808 +7641:008000401FFE108094FC550058FC128432FC54849CFC144024FC2548443085CE +7642:008000401FFE104097FC50A0551413F8360C5BFA920813F82040244449428080 +7643:00803FFE20202F3CA9446AA82C102A286946A9382D502A7E2890487C481088FE +7644:008000401FFE1120911053FE56201BFC322053FC922013FE2200252444928892 +7645:008000401FFE100097FE50A057BC14A437BC50A097FC144427FC244447FC8404 +7646:010000803FFE21102554A5B8691022A824446FFEA88230842FF8410842288C10 +7647:00803FFE20002F3CA9246F3C29242F3C6804A9E4292429E4292449E449248A6C +7648:010000803FFE20402F50A1246A1824083B766150AF8C28782F48413045488284 +7649:00803FFE20002FBEA8A26FBE200027FC6444A7FC244427FC20407FFE40408040 +764A:010000803FFE20102F28A9446A922C7C2A086910A97E2D002AFE4820484488FE +764B:008000401FFE100097FC50A053B8120833B850A09FFE10402124252A450A88F8 +764C:008000401FFE100093F8520853F8100037BC54A497BC10402444244447FC8004 +764D:010000803FFE20802E4EA44465F4242425246EAEA444244424A446A4590E8200 +764E:008000401FFE100097BC54A457BC14A437BC540495F4151425F4251445F4840C +764F:00801FFE100017FC94A457FC10003FFE500093F8120813F8214423284D10818C +7650:00801FFE10A013189DF6500017FC355454E497FC100013F8220823F8420883F8 +7651:00803FFE212027F8A52867F825282FFE6800ABFC28002FFE2A444A285298A306 +7652:00803FFE204021A0A6187BF6200027A864A8A7A824A8278824A845904A5491F2 +7653:010000803FFE25102950B55067DE28243B946814AB942A942A884AC84A948C22 +7654:008000401FFE104097FC51105FFE100033F8520893F8120823F82544452A88FA +7655:008000401FFE1040902057FE5228127E34C8577E924814C8277E2248447E8840 +7656:010000803FFE20102788A4BE648027A22494643EAF882C8834BE478844888008 +7657:00803FFE200027FCA0406FFE284223586040A358200027FC244447FC444487FC +7658:00801FFE11101FFE911053F8124833F8524893F8104017FC245425F44414840C +7659:010000803FFE21002E78A8086F7828082FF86888ACC82AA82CCA4AAA4CC68882 +765A:00803FFE220023F8A4106FFE352426FA6400A5FC240025FC240049FC490491FC +765B:00803FFE20402FFEA00067FC240425F46514A7FC200823F020404FFE41508E4E +765C:010000803FFE20002FDCA8546FD42AA22A806FDCAA942FD4280852885454A862 +765D:00803FFE20402FFEA00067FC240425F46514A7FC200027FC20004FFE424884C4 +765E:00803FFE22102F9CA22462482FBE2AA26AAAAFAA222A272A2AAA529442228242 +765F:00803FFE210027F8A6486528249827F86210A5E8380627F8254847F845488558 +7660:010000803FFE20402FFEA0A06F5E255425546B5AA20823F8220843F844088808 +7661:010000803FFE2480273CA48463942408277E6A0AA2282FAE22284558484E9080 +7662:00801FFE1208111097FC504013F830805FFE921017F81A1623F0226443188204 +7663:010000803FFE24002744A928727E2F902A906FBCAA902F90207E43905C108010 +7664:008000401FFE121093DE5528588417BC34A457A494A417A42434252846A08420 +7665:010000803FFE25102950B55067DE28243B946814AFD429142B8849084FD48822 +7666:00803FFE200027FCA55464E427FC204067FCA0402FFE24A4285247FC40408FFE +7667:00803FFE20002FFCA8886B3029102FBC6BB8AD542912284029784940494097FC +7668:00803FFE200027FCA0406FFE284223586220A7FE2C2037FC242047FC442087FE +7669:010000803FFE2210221EBFA262442FBE2AA26ABEAFA2223E27224ABE52948222 +766A:00803FFE2010237CAE10627C2F1022FE6644A77C2AC42A7C3244427C42288244 +766B:00803FFE24003FBEA4086F10293E2F22692AAF2A292A2F2A292A7F94491290A2 +766C:010000803FFE24002722A914723E2F882A886F9CAA882F88203E554855488008 +766D:00803FFE20002FBEA8A26FBE28A22FBE68A2AFBE251428A22FFE431040E08F1C +766E:00803FFE20042EF8AA546AFE2C102AFE6A04AAFC2A042EFC282049544A4A8838 +766F:00801FFE14A417BC94A457BC14A437BC512093FE122017FC2A2023FC422083FE +7670:00803FFE20002AA8B5246ABE2F6829686FBEA0282FA82ABE2FA8482848BE87A0 +7671:00803FFE25182F94A53E672822682FBE6AA8AFA8223E2FA822285FBE452088A0 +7672:00803FFE22003FBEA2086F9028BE2FA268BEAFA228BE2FA228BE5FC0491490A2 +7673:00803FFE244427FCA4446FFE2AAA2FBE6AAAAFBE220827F020C44FFE424884C4 +7674:00803FFE24442AEAAE0E64E42AAA2EEE6000A7FC204027FC20404FFE404080C0 +7675:00803FFE244428E8AE0E64E42A0A2EEE60A0AAEA20402FFE28A24912484288A6 +7676:00887C9004A004C0448224442448085008201020101020084004800200000000 +7677:00907EA002444448283010102008DFF6010001000100FFFE0100010001000100 +7678:00907EA002444448283010102008CFE6010001007FFC010002C0042018106008 +7679:00907EA002444448283010102FE8C8260820101C2FE000200C4003800C707008 +767A:00907EA002444448283010102008DFF6044004407FFC0440084008441044603C +767B:00803E9002A424481450082017D02008DFF6101010101FF0082004407FFC0000 +767C:00907EA00444282810103CF8C49604903D0C200041F87C0804D0042028501188 +767D:0100020004003FF820082008200820083FF8200820082008200820083FF82008 +767E:0000FFFE0100020004003FF82008200820083FF820082008200820083FF82008 +767F:0820082010203F2021202120212021203F2021202120212221223F22211E0000 +7680:020004003FF8200820083FF8200820083FF80000203823C03C04200420041FFC +7681:020004001FF0101010101FF0101010101FF001000100FFFE0100010001000100 +7682:010002001FF0101010101FF0101010101FF00200020003FCFE000204020401FC +7683:040008003FF8200820083FF8200820083FF8044004400440084408441044603C +7684:1040104020407E7C42844284430442447E2442244204420442047E0442280010 +7685:1000100021FC7D2445244524452445247DFC45004500450045027D0244FE0000 +7686:208020883CB020C020842C84317C02001FF0101010101FF0101010101FF01010 +7687:020004001FF010101FF010101FF000007FFC010001003FF801000100FFFE0000 +7688:1004100E20F07C80448044FC44A444A47CA444A844A8449045107D2846440082 +7689:1090109020907A904A924AD44A984A907A904A904A904A924AD27F124A0E0000 +768A:1020102020507C5044884524461244107DFC44044408448844507C2044100010 +768B:020004001FF010101FF010101FF002007FFC044009203118CFE6010001000100 +768C:1020102020207DFE44204420442045FC7C7044A844A8452445247E2244200020 +768D:020004001FF010101FF010101FF0200020F83E882088208826A8389000800080 +768E:1040102020207BFE4800488849044A0278884888485048204850788849040602 +768F:1084104820007CFC44484448444844487DFE44484448444844487C8844880108 +7690:020004001FF010101FF010101FF021081110092011102108FFFE010001000100 +7691:1020112421247D2445FC440045FC44047C0445FC4500450045027D0244FE0000 +7692:101010D82394789448904BFE48904894789448D84B98489048AA78CA4A860102 +7693:1020112021207DFC45204620442047FE7C00440045FC450445047D0445FC0104 +7694:100011FC21047DFC450445FC440044007DFC4420442047FE44207C2044200020 +7695:00000000FEFE1020102020407EFC4284428442847EFC4284428442847EFC4284 +7696:1040102023FE7A024C0449F8480048007BFE489048904890491279124A0E0400 +7697:100011FC212479244974492449FC4904797449544954497449047A044A140408 +7698:1020102023FE7C2045FC442047FE44007DFC450445FC450445FC7D0445140108 +7699:080C08F07E8018802CFE2A8848888888090804001FF010101FF010101FF01010 +769A:102011242124792449FC48004BFE480079FC4904490449FC488878504BFE0000 +769B:020004001FF010101FF010101FF0081010207EFC428442847EFC428442847EFC +769C:1020101021FE7C0044FC448444FC44007DFE4502457A454A457A7D02450A0104 +769D:102020207D2444A47CA844207DFE0050FE50105010507C5210521E92F08E4100 +769E:1020104021FC790449FC490449FC48407BFE488849244A224DFC782048200020 +769F:102013FE20207DFC442047FE440045FC7D0445FC450445FC45047DFC44880104 +76A0:1020122223FE7890488849FE4B104D1079FE4910491049FE4910791049FE0100 +76A1:1020104021FC7D0445FC450445FC44207D2444A84524442047FE7C2044200020 +76A2:1020102021FC78204BFE49084B9C490879884E3E48004BFE489078904912020E +76A3:108813FE2088780049FC48A848A84BFE78A848A849FC48204BFE782048200020 +76A4:103C13E0212478A84BFE48A849244A0279FC4924492449FC4924792449FC0104 +76A5:104011FC210479FC490449FC490449FC7820492448A8492448207BFE48200020 +76A6:1088110823C87A504BDE4A644BD4491478944FF4491449C849487A544B5404A2 +76A7:103C13C020447A2449084FFE4C424AA47A8A4C7A488048F849087A904860079E +76A8:02001FF010101FF010101FF020407EFC42847EFC42847EFC01003FF80100FFFE +76A9:100021FC7D0445FC7D0445FC7C200124FCA8102013FE7C9010901D12E212440E +76AA:1124117422587ADA4BFE49544ADA4BFE78A248204BFE487048A879244A220020 +76AB:1040102023FE7A504BFE4A524BFE4A007A944AD84A904AD24A8E7C004954022A +76AC:11FC102023FE7A224DAC482049AC489079FE4B204DFC492049FC792049FE0100 +76AD:101E13E0212278944BFE4A524BFE48047BC44A7E4BC44A544BCC7A844AD40348 +76AE:0080008000803FFC2084208820802FF02410241022202140208041404630980E +76AF:0800087C08107F1049104A1048107EFE4210421052104C1044104A1092102010 +76B0:08200820087E7F4249824A7A484A7E4A427A4242524A4C4444424A42923E2000 +76B1:201020103E1042FE84920894FE9002FC02A47EA402A802A80290FF2802440082 +76B2:0010FF10911010FEFE922094289048FC7EA408A408A80EA8F890492809440A82 +76B3:10101410121010FEFE921094109092FC54A410A438A854A89290112851442282 +76B4:10101010201044FEFE9228944490A2FC3CA444A444A8A8A81090292845448282 +76B5:241024107E1024FE2492FF9400907EFC42A442A47EA842A842907F2842440082 +76B6:10101010FE1038FE5492929410907CFC44A47CA444A87CA800901D28E1444282 +76B7:08100810FF1008FE08927E9400907EFC42A442A47EA842A824900F28F1444282 +76B8:0010FE10921010FEFE9210947C9054FC7CA454A47CA810A8FE90112811441282 +76B9:080008FE08927F1049FE4A10487C7E54427C4254527C4C1044FE4A1092102010 +76BA:40104010FE1022FEAA92FA94429094FC48A4FEA422A8AAA8FA90432894440882 +76BB:10101E1010107EFE52925C9472904EFC40A45CA454A85CA854905D2896443882 +76BC:1010FE1010107CFE0092FE9482907CFC00A47CA444A87CA8449029280F44F282 +76BD:1010FE100010FEFE8292BA94AA90FEFC00A47CA444A87CA844907D280044FE82 +76BE:1010FE1010107CFE0092FE94AA90FEFC44A47CA444A87CA844907D2828444482 +76BF:000000003FF82448244824482448244824482448244824482448FFFE00000000 +76C0:0100010001800140012001100108010001003FF82448244824482448FFFE0000 +76C1:00003FF008100820083C10041004201440083FF82448244824482448FFFE0000 +76C2:00003FF801000100FFFE010001000500020000003FF8244824482448FFFE0000 +76C3:00007FFC010003000570090C3102C10000003FF82448244824482448FFFE0000 +76C4:00007FF801083FF821003FFC01040114010800003FF8244824482448FFFE0000 +76C5:010001003FF82108210821083FF82108010001003FF8244824482448FFFE0000 +76C6:0440082010102FE8C4260420082010A0604000003FF8244824482448FFFE0000 +76C7:010001007FFC028004400A203118C00600003FF82448244824482448FFFE0000 +76C8:00003FF008100FA008BC128411042294444800003FF8244824482448FFFE0000 +76C9:00701F8001000100FFFE054009203118C0063FF82448244824482448FFFE0000 +76CA:101008200000FFFE000008201010200840043FF82448244824482448FFFE0000 +76CB:024002207FFC04000BF0112020C043301C0E00003FF8244824482448FFFE0000 +76CC:100010F83E884288A2A8149008841084207CC0003FF8244824482448FFFE0000 +76CD:010001003FF801000100FFFE040008201FF000103FF8244824482448FFFE0000 +76CE:010001001FF011101110FFFE02800C603018C0063FF8244824482448FFFE0000 +76CF:0240022003F87E0003FCFE10016003821C62E01E00003FF8244824482448FFFE +76D0:082008207F20082808240F22F020402000003FF82448244824482448FFFE0000 +76D1:04402440247C2440249024882508040000003FF82448244824482448FFFE0000 +76D2:010002800C603018CFE600001FF010101FF000003FF8244824482448FFFE0000 +76D3:100009FC402020200BFE10207020102010A000403FF8244824482448FFFE0000 +76D4:040004007FFC08401248125024A0411082080C0600003FF8244824482448FFFE +76D5:100009F0411025900550095071121112120E14003FF8244824482448FFFE0000 +76D6:082004407FFC010001003FF801000100FFFE000000003FF8244824482448FFFE +76D7:4080208009FC12042448E04020A023182C0600003FF8244824482448FFFE0000 +76D8:020004001FF011101090FFFE10101210215040203FF8244824482448FFFE0000 +76D9:012001107FFC01003FF821083FF821083FF8210800003FF824482448FFFE0000 +76DA:011001087FFC0100211811A007401920E118450602003FF824482448FFFE0000 +76DB:009000883FFC208020883E48225022244A54448C81043FF824482448FFFE0000 +76DC:0080208011FC820454482040E0A023182C0600003FF8244824482448FFFE0000 +76DD:3FF000101FF00010FFFE111009A005401930E50E02003FF824482448FFFE0000 +76DE:021002FC7F4000840764781C021002FC7F4000840764781C00003FF82448FFFE +76DF:00007CFC448444FC7C8444FC44847C84011402083FF8244824482448FFFE0000 +76E0:08000FE010201FC000407FFC0600192006C039B0068C398000003FF82448FFFE +76E1:01003FF80108FFFE01083FF801007FFC248842443FF8244824482448FFFE0000 +76E2:00207C28542455FE7C20545054507C88010402023FF8244824482448FFFE0000 +76E3:00003F2024203F3E21403F5024883F0800003FF82448244824482448FFFE0000 +76E4:10783E4822482A86FF7822482A2842104A2884463FF8244824482448FFFE0000 +76E5:1100611C4D444544759C49844944755C420400003FF8244824482448FFFE0000 +76E6:010006C01930E7CE0080FFFE04403FF8284837B820083FF800003FF82448FFFE +76E7:010001F801003FFC21042FE0210827F8249027F0249027F020004FF84948BFFE +76E8:0BFE104061FC090411FC610405FC090431FCC08801043FF824482448FFFE0000 +76E9:08207F20083EFF4422A47F280828FF10082808463FF8244824482448FFFE0000 +76EA:23F8120893F8420843F810002FFEE20027FC2924225404883FF824482448FFFE +76EB:010006C01830EFEE00001FF010107FFC04401FF014501BB010103FF82448FFFE +76EC:00407E7C48907E1042FE7E10487C48447E7C00003FF8244824482448FFFE0000 +76ED:102022207C3E0A447FA408247F2814287F1008287F4408823FF824482448FFFE +76EE:00003FF82008200820083FF82008200820083FF820082008200820083FF82008 +76EF:000000007BFE4820482078204820482078204820482048207820482000A00040 +76F0:000001FC7C20442044207C20442047FE7C204420442044207C20442000200020 +76F1:000001FC7C20442044207C20442047FE7C204420442044207C20442000A00040 +76F2:02000100FFFE1000100010001FF800001FF010101FF010101FF010101FF01010 +76F3:002000107C10440045FE7C80448044807C804480448044807C80448000FC0000 +76F4:010001007FFC01001FF0101010101FF010101FF010101FF010101010FFFE0000 +76F5:004000407C8044FE45007E0044FC44087C104420444044807D02450200FE0000 +76F6:000000007DFC440044007C0047FE44907C904490449044907D124512020E0400 +76F7:004000407C8044FC45047E04448444447C444414442444447D84440400280010 +76F8:080008FC08840884FE8408FC18841C842A842AFC488488840884088408FC0884 +76F9:0020002078204BFE4820792449244924792449FC4824482078224822001E0000 +76FA:0008001C7CE0448044807C8044FE44887C884488448844887D08450802080408 +76FB:00900090790849084A047C024BFC4880790049F8480848087808480800500020 +76FC:0010009078904888490879044A044DFA78884888488848887908490802280410 +76FD:002000207C2045FC44207C20442045FC7C204420442047FE7C20442000200020 +76FE:007C3F8020803FFC20802FF8280828082FF8280828082FF8480848088FF80808 +76FF:004000207C2047FE44887C88448844887C884450445044207C50448801040602 +7700:000000FC7C84448444847CFC448444847C8444FC448444847D04450402140408 +7701:010011101108212440C003000C003FF8D0081FF810081FF8100810081FF81008 +7702:0004001E7DF0451045107D10451045FE7D104510451045087D0A454A01860102 +7703:0000000079FC4800480078004BFE4820782048404840488879044BFE01020000 +7704:000003FE7C20442045207D3E452245227D2245FE440244027C02440200140008 +7705:0008001C79E04900490079FC49444944794449284928491079104A2802440482 +7706:004000207C2045FE44407C404440447C7C444444444444447C84448401280210 +7707:004000407840494849447A424A424C4878484848481048107820484001800600 +7708:0040004078404BFC4A447C484840484078A048A048A0492079224A22041E0800 +7709:00003FF8210821083FF820002FF8280828082FF828082FF8480848088FF80808 +770A:0008003C7DE0442044207C3C45E044207C20443E47E044207C2244220022001E +770B:00F87F0001003FF80200FFFE040008001FF028104FF088100FF008100FF00810 +770C:00000FF048104FF048104FF048104FF040007FFC010011101108210445040200 +770D:000001FE7D00450445447D28452845107D104528452845447D84450001FE0000 +770E:000001FC7800480048007BFE48204820792849244A244A227C22482000A00040 +770F:002000207C2045FC45247D24452445247D2447FE442044507C50448801040202 +7710:000000007BFE48204820782049204920793C4920492049207920492007FE0000 +7711:0010009078904910497E7A524B924892791249124A524BD278624822004A0084 +7712:002000207C2045FC45247D24452445FC7D244524452445FC7D24442000200020 +7713:00280024782448204BFE7A204A244A247A244A284A284A907B124A2A00460082 +7714:00007FFC444444447FFC01000920111021084104092011102108410401000100 +7715:002000207C50448845047E12442044407D884410442044447D88441000600380 +7716:000001FC7D04450445047D0445FC44507C504450445044927C924512020E0400 +7717:008000807D0045FC46047C0445E445247D24452445E445247C04440400280010 +7718:01000100FFFE01002288145008203018DFF610101FF010101FF010101FF01010 +7719:002000207C20444044487C8445FE44827C0044FC448444847C84448400FC0084 +771A:010011001FF821005FF00100FFFE00001FF010101FF010101FF010101FF01010 +771B:002000207C2045FC44207C20442047FE7C7044A844A845247D24462200200020 +771C:002000207C2047FE44207C20442045FC7C7044A844A845247D24462200200020 +771D:0040002078204BFE4A027C04480048007BFE4820482048207820482000A00040 +771E:20703F8420041FFC00000FF848084FF848084FF848084FF840007FFE10102008 +771F:010001007FFC01001FF010101FF010101FF010101FF01010FFFE082010102008 +7720:000001FC7D04450445047DFC452045207DFE4520452045107D12454A01860102 +7721:0004001E7DF0451045107D10451045FE7D104510451045087D0A454A01A60112 +7722:10001EF8228862A894920882307EC0001FF010101FF010101FF010101FF01010 +7723:002000207D20452045FC7D20462044207DFE4420445044507C88448801040202 +7724:000001FC7D04450445047DFC450045407D444548457045407D424642023E0400 +7725:088008882E9028E028842E84F07C00001FF010101FF010101FF010101FF01010 +7726:0090009078904A904A927AD44A984A907A904A904A904A927AD24F12020E0000 +7727:000001FC7C44444444447C44449444887D0044FC448444847C84448400FC0084 +7728:0008003C7BC04800484078204BFC4808781048204840488079004A80047E0000 +7729:0040002078204BFE48407840488849087BF048204840488879044BFC01040000 +772A:000001FE7C20442044207DFE452245227D52454A458A45027D024502010A0104 +772B:002000207D2444A444A87C2045FC44207C20442047FE44207C20442000200020 +772C:00900088788848804BFE78A048A048A478A44928492849327A224A62049E0800 +772D:002000207DFC442044207C2047FE44007C20442045FC44207C20442003FE0000 +772E:000001FE7D024502457A7D024502457A7D4A454A454A457A7D024502010A0104 +772F:00200020792448A448A8782048204BFE787048A848A8492479244A2200200020 +7730:000001FE7C20444044887D0445FE44227C20442045FE44207C20442003FE0000 +7731:002000207BFE482049FC782449FC492079FE4822482A48547850488801040202 +7732:000003FE7C88448844F87C88448844F87C884488448E47F87C08440800080008 +7733:004000407CFC450446887C50442044407C8045FC468444847C84448400FC0084 +7734:0080008079FC49044A0479E44924492479E44924492449E47904480400280010 +7735:002000207C7C448445487C30442044487D90443E444245A47C18441000600180 +7736:000001FE7D00450045FE7D104510457C7D104510451045FE7D00450001FE0000 +7737:0100111009203FF802007FFC082010102FE8C8260FE008200FE008200FE00820 +7738:00400040789049084BFC78244920492079FC4A2048204FFE7820482000200020 +7739:008800487C50440045FC7C20442044207FFE4420445044507C88448801040202 +773A:0090009078904A9249947898489049987A944C9248904890791249120212040E +773B:010400847C88440047FE7C20442045FC7C20442047FE44207C20442000200020 +773C:000003F87A084A084BF87A084A084BF87A444A484A304A207A104A8803060200 +773D:0004001E7DE0450045067D78455045507D524554454845487D44465402620440 +773E:00007FFC444444447FFC000000FC7F0011101110111029282528454481820100 +773F:00400020781049E0482278344BB848B078A848A8492849247A244C2200A00040 +7740:082004407FFC01003FF80200FFFE04000FF018102FF0C8100FF008100FF00810 +7741:0100010079F04A104C207BF8484848487BFE484848484BF87848484001400080 +7742:0208050808881248050808883FF820002FF828082FF828082FF848084FF88808 +7743:00400040788849044BFE7802488849447A4248F849884A507820485001880606 +7744:002001247CA444A844207DFC450445047DFC4504450445FC7D04450401140108 +7745:000001FC7D0445FC45047DFC440044007DFC4420442047FE7C20442000200020 +7746:004000207BFE4A024C0479F8480048007BFE48904890489079124912020E0400 +7747:0108008878904BFC482478244BFC4A207A204BFE486248A2792A4A2404200020 +7748:000001FC7D04450445047DFC440044007DFE4420442045FC7C20442003FE0000 +7749:0020002079244924492479244AAA4C727820482049FC48207820482003FE0000 +774A:000000FC7C84448444FC7C0045FE45027D0245FE450245027DFE4502010A0104 +774B:001000D87B94489448907BFE48904894789448D84B98489078AA48CA02860102 +774C:0080008079F84A084C107BFC4A444A447A444BFC48A048A079224922021E0400 +774D:000003F87A084A084BF87A084A084BF87A084A084BF8492079204A220422181E +774E:01840068783048C84B0478404BFE48A079204BFC4D2449247934492800200020 +774F:000003FE7A224A224A227BFE4A224A627A724AAA4B224A227A224A0203FE0202 +7750:0020002078204BFE4820792448A448A87BFE487048A848A879244A2204200020 +7751:0040004078A048A049107A084DF64800788848484A4849507910482007FE0000 +7752:0020012279224A24485078884B0448227820492449244A287850488801040602 +7753:0090009078904BFC4A947A944A944BFC7A944A944A944FFE7800489001080204 +7754:002000207850488849047AFA480049FC7954495449FC4954795449540104010C +7755:004000207BFE4A024D04790049DE4A527A524B524C9A4894791049120212040E +7756:0020002079FC482048207BFE488849447A4248F849884A507820485001880606 +7757:000001F87908490849F87908490849F8788049FC4A544C9479244A4400940108 +7758:00003FF8244824483FF80000FFFE00001FF010101FF003040C881870EA180C06 +7759:004000207BFC4A044A047BFC4A004A287A244BFE4A204A507A504C8805040A02 +775A:000003FE7A104A104AFE7A104A104BFE7A004A104A104AFE7A104C1005FE0800 +775B:002000207BFE482049FC78204BFE480079FC490449FC490479FC490401140108 +775C:003C07C07A44492848007BF8484848487FFE484848484BF87848484001400080 +775D:0C8070FC1124FE24384454A8911000001FF010101FF010101FF010101FF01010 +775E:0020002078204BFE48207924492449247AAA487048A848A879244A2204200020 +775F:004000207BFE48004888788849544A22780048204BFE48207820482000200020 +7760:0020012478A8482049FC78404BFE488879044AFA4C88488878A848920082007E +7761:00100078F3C090409040F7FC92489248F7FE9248924897FCF040904007FC0000 +7762:00A00090788049FE49107B104DFC4910791049FC49104910791049FE01000100 +7763:08000EFC0844FF4408282A10492808441FF210101FF010101FF010101FF01010 +7764:000001FC7924492449FC7924492449FC780048004BFE48887888488801080208 +7765:004000807BFC4A244A247BFC4A244A447BFC489049104FFE7810481000100010 +7766:0020002079FC482048207BFE488849047A22482049FC48207820482003FE0000 +7767:001C03E07A204BFE4A207A924B0A4A0679FC4904490449FC7904490401FC0104 +7768:000000407B9C4A044A047B9C4A044A047BFC489048904890789049120212040E +7769:000001F87808480849F8780848084BFE78204A22497448A879244A2200A00040 +776A:00007FFC44447FFC01003FF80100FFFE082004403FF80100FFFE010001000100 +776B:002000207BFE482049FC78244BFE482479FC48204920493E79204AA0027E0400 +776C:0008003C7BC048444A247928490048207BFE487048A848A879244A2204200020 +776D:000001FC792449244974792449FC4904797449544954497479044A0402140408 +776E:004000A079104A084DF678004BC44A547A544BD44A544A547BD44A44025402C8 +776F:00207E20427E7EA448247F284810652843461FF010101FF010101FF010101FF0 +7770:008800887BFE488848A878204BFE4840788048FC49844A847884488400FC0084 +7771:000003DE7A424A424A427BDE4A004A3E7BD24A124A144BD47A084A1402240242 +7772:000001FC790449FC490479FC4820492079FE4A20482049FC7820482003FE0000 +7773:002000207BFE485048887B2649FC482078204BFE4800482079FC4820002003FE +7774:000003FE7A2248204BFE782049FC492479FC492449FC48207BFE482000200020 +7775:012801247BA4492049207FFE482048247BA44AA84AA84A907B92482A00460082 +7776:004000407BFC484049F878804BFC49107A084DF64910491079F04910011001F0 +7777:00200020F0FC9E2493FEF22494FC9420FEFC922092209BFEF420962009FE1000 +7778:000003FC7A244A244BFC7A004AFC4A847A844AFC4A844AFC7A844A8404FC0884 +7779:004000447BF4484848507FFE4840488079FC4B044D0449FC7904490401FC0104 +777A:008000BC7884490849FE7B204D20497C7990491049FE49107928492801440182 +777B:004000207BFE4A024C0479FC480049FC790449FC490449FC7904480003FE0000 +777C:000001FC7904490449FC7904490449FC78004BFE48204920793C492002A0047E +777D:001003D478584A52498C788849044AFA782048204BFE48207850488801040202 +777E:040008007FFC44447FFC01003FF80100FFFE082004403FF80100FFFE01000100 +777F:010001F801007FFE40029FF4092032900C603FF8D0161FF010101FF010101FF0 +7780:7E20243E1848FFA829104A28984600001FF010101FF010101FF010101FF01010 +7781:000003FC7A044BFC4A047BFC4A044BFC785048484FFE484078A0491002080C06 +7782:022807243C24242024FE3F2024202F3C29342F5429542F54298849884F148922 +7783:0008001C79F04910491079FE4910497C7944497C4944497C79444A44027C0444 +7784:008800887BFE48884888780049FC49247924492449FC49247924492401FC0104 +7785:008801C8F7089108912AF12A97AC9148F308938895549514F914912401240142 +7786:0020002079FC492449FC78204FFE480079FC4904492449247924485000880304 +7787:001000927A5249544910787E48104B38795449924910491079104A80047E0000 +7788:0090008879044A424C8879FC480448007BDE48424A52494A7A524842014A0084 +7789:1000FE7810487C480048FE8682007CFC00447C4444287C2844107C2844447D82 +778A:002000107BFE4A204AFC7A244BFE4A247AFC4A204AFC4A847A844C8404FC0884 +778B:002000207BFE482049FC790449FC490479FC490449FC49047BFE488801040202 +778C:0020002079FC482048207BFE488049047BFE48024BFC4A947A944A9407FE0000 +778D:0140065CF4449444975CF444944497FCF04097FC92089110F0A0904001B00E0E +778E:004000207BFE4A024C2479FC482049FC78204BFE482049FC7904490401FC0104 +778F:7FFC44447FFC01001FF001007FFC00001FF010101FF0048808503820CB180C06 +7790:1FF810081FF810081FF810081FF800007E7E42427E7E42427E7E42427E7E4242 +7791:000003FE7A02480049FC790449FC490479FC484048204BFE7800488801040202 +7792:01080108F7FE91089000F7FE90909090F7FE94929492956AF6469402040A0404 +7793:02020122782A4FEA482A7BAA482A4BAA782A4BAA4AAA4AAA7BAA4AAA00420082 +7794:002003FE782049FC48207BFE480049FC790449FC490449FC790449FC00880104 +7795:002001FC788848504BFE780049FC490479FC490449FC48207BFE482000200020 +7796:7F7848485F4C64805F784A4851307F4C00001FF010101FF010101FF010101FF0 +7797:0040008079FC490449FC790449FC490079FE490049FE48027AAA4AAA0202000C +7798:000003FE7A004A7C4A447A444A7C4A007AEE4AAA4AAA4AAA7AEE4A0003FE0000 +7799:008800887BFE4888480079FC490449FC790449FC48204BFE7850488801040202 +779A:004000207BFE4A02480079FC482049FC792449FC492449FC7800488801040202 +779B:01240124F22494249954F14A92929610FA109250925C9250F25092B0029E0300 +779C:002001FC79244BFE492479FC482049FC792449FC48404BFE788849D00070038C +779D:004000207BFE480049547924495449FC78204BFE4A424A927AFA4A0A02020206 +779E:008800887BFE4888488878F848204BFE7A224B324AAA4B767A224A22022A0224 +779F:000003FE785049FC4954795449FC480079FC48004BFE482078A8492402A20040 +77A0:0020012478A84BFE4A0278F84888488878F84820482049FC7820482003FE0000 +77A1:0200027CF2449744927CF2449244977CF2449244927C9228F528954A084A1086 +77A2:0820FFFE08203FF824483FF800007FFE40029FF410101FF010101FF010101FF0 +77A3:0020002079FC492449FC78204BFE4A227BFE4820484048247AA24A8A04780000 +77A4:00007BDE4A524BDE4A527BDE4A024AFA7A224A724A224A227AFA4A02020A0204 +77A5:082049202A3E7F4849485DA86B10492843461FF010101FF010101FF010101FF0 +77A6:002003FE782049FC480079FC490449FC78884BFE480049FC7904490401FC0104 +77A7:00A0009079FE49104B107DFE4910491079FE4910491049FE79004AA402520452 +77A8:00A004A4F2A890A097FCF11090A097FCF04093F8904097FCF0A0911002080C06 +77A9:000007FCF40497FC9400F5FC942095FCF52495FC942097FEF62A96FA0A0A1206 +77AA:002007A4F0A892929114F20895F49802F3F89208920893F8F20891100FFE0000 +77AB:000003FE78504BFE4A527BFE480049FC790449FC490449FC78204BFE00200020 +77AC:003C07C0F04492249108F7FE94029A08F20893BE94889AA8F13E920804080808 +77AD:00400040F7FC90A09514F20897FC9A0AF3F8920893F89040F248944409440080 +77AE:02080108F7C89210949EFFD490649794F494979494949788F488949404A405C2 +77AF:03DE7A524BDE4A524BDE7A024AF24A927AF24A924AF24A927A924B3202020206 +77B0:00080788F08891109FDEF49494A49794F4949794949494C8F7889C9400A400C2 +77B1:008803FE7888480049FC78A848A84BFE78A848A849FC48207BFE482000200020 +77B2:000003FC784848304BFE785248944B5078204BFE4A524A8A7B764A5202720206 +77B3:002001FC788848504BFE780049FC492479FC492449FC482079FC482003FE0000 +77B4:0080008079FE4B544D5479544BFE4954795449544FFE48007954492A022A0000 +77B5:00400248F15097FC9150F24894449208F20893BE94889AA8F13E920804080808 +77B6:002001FC792449FC48207BFE480049FC790449FC490449FC790449FC00880104 +77B7:00007BDE4A524BDE4A527BDE4A024AFA7A8A4AFA4A8A4AFA7A8A4A02020A0204 +77B8:008803FE7888480049487BFE49484978790049FC48204BFE787048A803260020 +77B9:003C03C0F04492249108F7FE944292A4F28A947A908090F8F10892900060079E +77BA:004000A0F3189DF69000F7FC955494E4F7FC900093F89208F3F8920803F80208 +77BB:010001F87A084FFE4A887B244BFE4A007AFC4A004AFC4A007AFC4C8404FC0884 +77BC:0040004078A049104A087DF6480048007BB84AA84AA84BB87910491002A80444 +77BD:0810FF7E08107E7C42447E282418FEE600001FF010101FF010101FF010101FF0 +77BE:00003EF822883EF822883EF822883EF801007FFC482410102FE8010001007FFC +77BF:3EF822883EF822883EF822883EF808801FFC30805FF890801FF810801FFC1000 +77C0:028802A8F6A89BF0901EF22495D49C14F41495D495549548F568955406140422 +77C1:00C80708F12A912C9FC8F10893889554F914912290409024F522950A090800F8 +77C2:01FC0104790449FC48007BDE4A524A527BDE48204BFE487078A8492406220020 +77C3:004000207BFE4A224954794A4A3A480079FC49544BFE480079FC482000A00040 +77C4:001C01E078204BFE482079FC49AC497479FC482049FC48207BFE48000154022A +77C5:000003DE78424A52494A7A52489049087BFE4D1049FE491079FE491001FE0100 +77C6:008803FE78A8489049FE7B2049FC492079FC492049FE49007BFC48880070038E +77C7:008803FE78884BFE4A0279FC48004BFE784048A24B5448B87B54489203500020 +77C8:004001FC790449FC490479FC48204BFE7A8A49244BFE488078FC488401140208 +77C9:004000207BFE4A0249FC79484A5049FC7B0449FC490449FC790449FC00880104 +77CA:01080110F23E922294BEF722913E9208F4BE97AA902A90AAF56A952E04080008 +77CB:000003FE7A484BFE4A487AFC4AA44AFC7AA44AFC4A204BFE7B2A4D7A050A0906 +77CC:002000107BFE4A444AFE7A444BFE4A107AFE4A924AFE4A927AFE4A0002440482 +77CD:7CF844887CF844887CF809001FF831005FF091001FFC10003FF0082007C0F83E +77CE:010001F87A084FFE4A627A9249FC490479FC490449FC488079F84A880070038E +77CF:004001FC79244994494C792449FC48207BFE4A8A49244BFE788048FC0104020C +77D0:01FC78204BFE4A224DAC782049AC489079FE4B204DFC492079FC492001FE0100 +77D1:0040007C78404BFC4A447BF04A444AFC7AA84AF84AA84AF87A004DFC05540BFE +77D2:010807FE79084BFC4A947BFC48004FFE7C0249F8490849F8790849F8010801F8 +77D3:011078904BDE48104A5E79824BDE48107BDE4A504BDE4A507BDE4A50025202CE +77D4:00887BFE48884BDE4A527BDE48A0489079FE49204BFC4D2079FC492001FE0100 +77D5:21084FD2F03C23884812FBBE0280ABAA00001FF010101FF010101FF010101FF0 +77D6:03DE78004BDE4A524B5A7A5248204BFE7A504BFE4A524BFE7A924ADC029204CE +77D7:01003FF801000FE00820092009207FFC08207EFC08203EF822882AA82AA8FFFE +77D8:02480150F7FC940491F0F11097FC9554F4E497FC904097FCF0409FFE02A40452 +77D9:0FBE08A2EFBEA8A2AFBEE802AB92A892EFDEAAAAABCAAAAAEB92AAD20FAA08C4 +77DA:03FE02027BFE4A924A547A924AFE4AAA7AFE4B224AFA4AAA7AFA4A2205FA0004 +77DB:00001FF000100220014000807FFE018202840480088010802080C08002800100 +77DC:00207E200250245018880944FE220A20180019FC280448088808081028101020 +77DD:00207C200450285010880924FE121A1029FC2804480848888850082028101010 +77DE:1FF0022001407FFC04841888628001003FF82448282837D82448244827C82018 +77DF:00107C9204522854101008FEFE821A8228FE2882488248FE88820882288A1084 +77E0:00487C48044829FE10480848FFFE1A0028FC2884488448FC8884088428FC1084 +77E1:03DEFA520BDE525223DE10A0FDFE372035FC512051FE500091FC10885070278E +77E2:0800080008001FF81100210041000100FFFE010002800280044008203018C006 +77E3:02000400082010103FF8080808001FF0210001007FFC0280044008203018C006 +77E4:00407C40048004FC05207E204020402043FE7C20045004500488048829041202 +77E5:20002000207C7E444844884408440844FF44084414441444227C224442008000 +77E6:080008001FE020204040BFFC240024002FF8308020803FFC414042208410180C +77E7:200421E43C245024902411E41104FF04110411E4102428242424442441448084 +77E8:2008203C21E07C205020902013FEFC2010201050105028502488448841048202 +77E9:200021FE3D005100910011FC1104FF041104110411FC29002500450041FE8000 +77EA:2010202020FC7C8450A490941094FDFE108410A4109428942484450441148208 +77EB:2008203C21E07C20502093FE1050FC881104128A108828882488450841088208 +77EC:2020202021247D245124912412AAFC721020102011FC28202420442043FE8000 +77ED:200021FE3C00500090FC10841084FE8410FC1000108428442448440041FE8000 +77EE:201C21E03C20502093FE10A81124FE42104013FE1088290824D0443040488184 +77EF:201821E03C4053FE908811741252FE70100011FC11042974255445744104810C +77F0:210420883C0053FE922212AA1272FE2213FE100011FC290425FC450441FC8104 +77F1:208823FE20A87C9051FE932011FCFD2011FC112011FE290027FC44884070838E +77F2:200023FE42527A52A3FE2110225223DCF81223CE224023D2525C4BD04A5282CE +77F3:0000FFFE020002000400040008000FF81808280848088808080808080FF80808 +77F4:00000000FEFE1010101020103E1062106210A210221022103E10221000500020 +77F5:00040004FE041044104420443E4462446244A244224422043E04220400140008 +77F6:000001F0F9102110211041107910C91049104910491049127A124212040E0800 +77F7:000001FCFC041008101020203C2067FE6420A420242024203C20242020A00040 +77F8:000001FCFC201020102020203C2067FE6420A420242024203C20242020200020 +77F9:00000000FDFC1090109020903C9064906490A490249024923C922492210E0200 +77FA:0008003CFDE01020102020203C20643E65E0A420242024223C222422201E0000 +77FB:00400040FE8010FE110022003CF86410A4202440244024823D02250200FE0000 +77FC:00000000FDFC1020102020203C2064206420A420242024203C20242023FE0000 +77FD:00400040FC40107E108220823D4266246414A408240824103C20244020800300 +77FE:000001F0F9102110211041107990C95049504910491049127A124212040E0800 +77FF:00200010FC1010FE108020803C8064806480A480248024803C80250021000200 +7800:000001F8FC101020104020803DFE64926492A492251225223E22244220940108 +7801:000001F8FC081008108820883C8864FE6402A402240225FA3C02240220140008 +7802:00200020FC2010A810A420A23D2265206624A424242824083C10242020C00300 +7803:000000FCFC84108410A420943C94648465FEA484248424843C84250421140208 +7804:00200020FC2011FC102420243C24642465FEA420245024503C88248821040202 +7805:00200020FC201020103221B23CB464A864A8A4A8252425243E22242020A00040 +7806:00200020FC20102011FC20203C20642067FEA420245024503C88248821040202 +7807:00400020FC2013FE108820883C8864886488A450245024203C50248821040602 +7808:000001FEFD001100117821483D4865486548A568255025423D422542223E0400 +7809:010001007FFC01003FF801007FFC01007FFC040008003FF0C81008100FF00810 +780A:00400020FC0011FC100020003CF064906490A490249024923C922512210E0200 +780B:00100010FC101090109020903C9E64906490A490249024903C90249023FE0000 +780C:00000100F97E21122112411279D24F12C91249124952499279224822004A0084 +780D:00400040FC40107C108420883D2064206420A450245024503C88248821040202 +780E:00200020FC501050108821043E0264886488A488248824883C88250821080208 +780F:00100050FC501050108820883D0466FA6448A448244824483C88248821280210 +7810:000003FCF884208820884090789CC88449444944492849287A10422804440182 +7811:000003FCF8102110211041107A10CBFE48304850489049107A10441000500020 +7812:00100110FD101112111221143DD865106510A510251025123D522592210E0000 +7813:000000F8FC881088108821063E0065FC6484A484244824503C20245020880306 +7814:000001FCFC881088108820883C8867FE6488A488248824883C88250821080208 +7815:00400040FDF810481088208A3D0A66266420A42027FE24203C20242020200020 +7816:00200020FC2011FC102020403DFE64406480A5FC240424883C50242020100010 +7817:00400040FC4013FE108020A03D2065FC6420A420242027FE3C20242020200020 +7818:00200020FC2013FE102021243D2465246524A5FC242424203C222422201E0000 +7819:00000000FBFC2100210041F079104910C9904A504A504A107A124A920312020E +781A:000001FCFD041104112421243D2465246524A554245024903C9025122212040E +781B:00200020FC501050108821443E2264206400A5FC240424083C08241020100020 +781C:000003F8FA082208232842A87AA8CA484A484AA84AA84B2A7C0A440A08061002 +781D:00200020FC2011FC102020203C2065FE6420A420244024483C8425FE20820000 +781E:00200020FC2013FE102020203C2065FC6470A4A824A825243D24262220200020 +781F:00800080FC8010FE114021403E40647C6440A4402440247E3C40244020400040 +7820:000000F8FC881088108820F83C8864886488A4F8248824883C88248823FE0000 +7821:00000000FDFC1020102020203C20642065FCA420242824243C24242023FE0000 +7822:00000000FDFE1008100821E83D2865286528A52825E825283C08240820280010 +7823:00200010FC1011FE110222043C8064886490A4A024C024823C822482207E0000 +7824:00800080FCFE1100122021203D2C657467A4A524253425283D22250220FE0000 +7825:0004001EFDF01110111021103D1065FE6510A510251025083D0A254A21A60112 +7826:088008882E9028E028842E84F07C00007FFC040008003FF0C81008100FF00810 +7827:00200020FC201020103E20203C20642065FCA504250425043D04250421FC0104 +7828:00400020FDFC1104110421FC3D006500657CA508251025203D422682227E0400 +7829:00900090F89023FC209440947BFC4A90CA904BFE48924892791A491402100410 +782A:000000FCFC8410A4109420843C8467FE6504A544252425043DFE240420280010 +782B:00400020FC0013FE102020203C20642065FCA420242024203C20242023FE0000 +782C:00400020FC20100011FE20003C0464846484A448244824483C50241023FE0000 +782D:0004001EFDE01000102020103DFE64046408A410242024403C802540223E0000 +782E:10001000FEFC2244642818102428C2C60000FFFE08001FF82808C8080FF80808 +782F:00200020FD2010A0103221B23CB464A864A8A4A8252425243E22242020A00040 +7830:000001FCFC201020112420A43CA8642067FEA420242024203C20242020200020 +7831:00200020FC501050108821243E12641065FCA404240824883C50242020100010 +7832:00800080FDFC1104120425F43D1465146514A5F4250425283D12250220FE0000 +7833:00000000FEFE1020102020403E7C62C462C4A3442244224422443E7C22440000 +7834:00100010FC1011FE111221143D1065FC6544A544252825283D10262822440482 +7835:00200020FC20102011FE20203C70647064A8A4A8252426FA3C20242020200020 +7836:00200020FC4011FC110421043D04650465FCA504250425043D04250421FC0104 +7837:00200020FC2011FC112421243D2465FC6524A524252425FC3D24242020200020 +7838:000003FEFA102210221042FE7A924A92CA924A924A9A4A947A104A1003FE0000 +7839:01100110FBFC2110211040007A08CA084910491048A0484078A0411002080C06 +783A:000001FEFD001100110021FE3D206520653CA524252425243D24224402540488 +783B:04400420FFFC0910116021844F0480FC0000FFFE08001FF82808C8080FF80808 +783C:00200020FC501050108821043E02640065FCA420242024203C20242023FE0000 +783D:000001FCFD241124112421FC3D2465246524A5FC252425243D2425242104020C +783E:0008001CFDE01100112021203D2065FE6420A42024A824A43D22262220A00040 +783F:00200010F81021FE2100411079104910C9104920492849247A444AFE04420800 +7840:00200020FD241124112421243DFC64206420A524252425243D24252421FC0004 +7841:000001FCFC081010103020483C8467026400A5FC242024203C20242023FE0000 +7842:00200020FC501088110422023DFC64206420A42025FC24203C20242023FE0000 +7843:00200120FD2011FC112022203C2067FE6470A4A824A825243D24262220200020 +7844:00200020FD2410A410A820203DFE64906490A490249024923D122512220E0400 +7845:00200020F9FC2020202040207BFE4800C820482049FC48207820482003FE0000 +7846:00200020FC501050108821043EFA64006400A4F8248824883C88248820F80088 +7847:00200020FC4011FC110421043D9465546524A524255425943D04250421FC0104 +7848:00200020FC2013FE102020203DFC64006400A5FC250425043D04250421FC0104 +7849:00200020FDFC102413FE202421FC7C206420A5FC2420242027FE3C2024200020 +784A:00400040FCFC1104120821FE3D00657C6544A544255425483D422542213E0200 +784B:00200010FC1013FE102020423C8465F86410A42224C427083C10242820C40302 +784C:00400040FC781088115020203C5064886506A4F8248824883C88248820F80088 +784D:000001F8FD08110811F821083D0865F86544A548253025203D10254821860100 +784E:000207E2FA42224A224A424A7A4A4FEACA4A4A4A4A4A4A4A7A424C42044A0844 +784F:000001DCFC881088108820883C8867DE6488A488248824883C88250821080208 +7850:000001FEFD021102117A21023D02657A654AA54A254A257A3D022502210A0104 +7851:01040084FC88100013FE20883C8864886488A7FE248824883D08250822080408 +7852:000003FEFC50105011FC21543D5465546554A554258C25043D04250421FC0104 +7853:00400040FC4411F41048205023FE7C406480A584269824E024823C82247E0000 +7854:00880088FC88108813FE20883C8864886488A7FE240024883C84250422020402 +7855:000003FEFC20104011FC21043D0465246524A524252425443C50248821040204 +7856:00200020FC2011FC102021243CA464A86420A7FE245024503C88248821040202 +7857:00800080F8BC23C02050402478D44B0CC8004BFE4890489079124912020E0400 +7858:00000000FDFC1104110421743D5465546554A554257425043D0425FC21040000 +7859:00200124FD24112411FC20003DFC64046404A5FC250025003D02250220FE0000 +785A:0008003CFDE01020102023FE3C5064886504A68A248824883C88250821080208 +785B:00400020F82027FE2090409078904A94CA924A924C9248907910491002500420 +785C:000001FEFC001092112422483D2464926400A5FE242024203C20242023FE0000 +785D:00200124FCA410A8102021FC3D04650465FCA504250425FC3D04250421140108 +785E:00200120FD2011FC112022203C2067FE6400A40025FC25043D04250421FC0104 +785F:0004000EFBB8208820884128792E4BA8C8A84AA84AA8493E79004A80047E0800 +7860:00400020FDFC1104110421FC3D04650465FCA520252225143D08254421820100 +7861:00400020FBFE2202244440407BFE4840C8904890491049207A244A4204FE0842 +7862:00200020FC501088110422FA3C20642067FEA420252825243E22242220A00040 +7863:00200022FDFA1024102423FE3C10642065FCA488251026FE3C10241020500020 +7864:00200020FC2013FE102020203D2465246524A6AA242024503C50248821040202 +7865:00900088FC8013FE10A020A83CB064A464A8A4B02524252A3D32222202DE0400 +7866:000003FEFC20102011FC20203C2067FE6488A48827FE24883C88250821080208 +7867:000001F8FC0810D0102021FC3D24652465FCA524252425FC3D2425242124010C +7868:00200020FDFE102011FC21243D2465FC6524A52425FC24203DFE242020200020 +7869:080C08F07E8008800EFE7888088829081208FFFE08001FF82808C8080FF80808 +786A:001000D8FB942094209043FE78904894C89448D84B98489078AA48CA02860102 +786B:00400020FBFC2040209041087BFC4804C9504950495049507A504A520452080E +786C:000001FEFC20102011FC21243D2465FC6524A52425FC25203CA0244020B0030E +786D:00480048FDFE1048104820203C1065FE6480A480248024803C80248020FC0000 +786E:00400040FC7C1084110822FE3C92649264FEA492249224FE3C922512210A0204 +786F:000001F8FD08110811F821083D0865F86508A50825F824903C9021120212040E +7870:1020082040A824A4092A723010C017000000FFFE08001FF82808C8080FF80808 +7871:000001FCFD241124112421FC3D2465646574A5AC252425243D24250421FC0104 +7872:00000050FC481084112420203C5064886506A6F8248824883C88248820F80088 +7873:00200020F9FC2020202040207BFE4848C848494C494A4A4A7888488801280210 +7874:00880088FDFE1088108820503C5064946594A698249024B23CD22492208E0080 +7875:00200020FC3E1020102021FE3D02654A652AA5122512252A3D4A250221FE0102 +7876:00200124FD24112411FC20203C5064886544A622242025F83C08241020100020 +7877:00400040F8A020A0211042087DF64800C88848484A4849507910482007FE0000 +7878:00200124FD24112411FC20003DFE6500657CA510251025FE3D10221002100410 +7879:02080228F22822282FA442447254D69257105AA05A205228724452FC02440200 +787A:000001FEFC20104010A221123C3465586498A554243424523C90251020500020 +787B:00007EFC48447E4442287E1048287EC60000FFFE08001FF82808C8080FF80808 +787C:000003DEFA522252225243DE7A524A52CA524BDE4A524A527A524A52055208A6 +787D:00400080FBFC2110224844467BF84A48CA484BF84A484A487BF848420042003E +787E:0008003CFDE0102013FE20A83CA864A867FEA4A824A827FE3C20242021FC0000 +787F:00400020F82023FE2202449479084A04C80049FC482048207820482007FE0000 +7880:00400040FCF81108101021FC3C24642467FEA424242425FC3C24242020A00040 +7881:08207FFC08200FE008200FE00820FFFE10103FF8C4060FE0182068200FE00820 +7882:00400020FBFE2202200041FC78004800CBFE4820492849247A224C2200A00040 +7883:00200020FBFE202021FC40207BFE4800C9FC490449FC490479FC490401140108 +7884:01100110F910211027BC411079104B38CBB84D544D5449927910491001100110 +7885:000003FEFA02221A22E242227A224BFECA224A724AAA4B267A224A2203FE0202 +7886:202013FC82244BF812882450E470298C2000FFFE08001FF82808C8080FF80808 +7887:00400020FBFE2202240440007BFE4820C8204920493C49207AA04A60043E0800 +7888:001C03E0FA2023FE222042927B0A4A06C9FC4904490449FC7904490401FC0104 +7889:000001FCFD241124117421243DFC65046574A554255425743D04220402140408 +788A:00480044FC5E11E0102820123C6A65966448A45E25E024243C282412206A0186 +788B:00200124FD24112411FC20003DFE640865E8A528252825E83D28240820280010 +788C:000001F8F808200821F8400878084BFEC8204A22497448A879244A2200A00040 +788D:000001F8FD0811F8110821F83C0065FC6410A7FE241025103C90241020500020 +788E:00400020FDFE1000108820883D5466226400A42027FE24203C20242020200020 +788F:00480048FC4811FE104820483DFE640064FCA484248424FC3C84248420FC0084 +7890:00200020F9FC2020202043FE78884944CA4248F849884A507820485001880606 +7891:00400080FDFC1124112421FC3D24654465FCA490251027FE3C10241020100010 +7892:00200020FC501088110422023CF864206420A5FC242025243CA424A823FE0000 +7893:00500048FC8010FE119022903CFC64906490A4FC249024903C9024FE20800080 +7894:0008000CFCEA100A100821FE3C4864486548A568254825483D4A256A23860102 +7895:00200020FDFC10501088210423FE7C0865E8A528252825E825283C0824280010 +7896:00200020FC501088110422FA3C0065FC6554A55425FC25543D5425542104010C +7897:00400020FBFE22022504410079DE4A52CA524B524C9A4894791049120212040E +7898:00500050FC5011FC115421543D5465FC6554A554255427FE3C00248821040202 +7899:000003FEFA02228A225243FE7A224A22CAAA4AAA4AAA4AFA7A024A02020A0204 +789A:00400020FDFC1000110820903C0067FE6400A40025FC25043D04250421FC0104 +789B:00200020FBFE202021FC40207BFE4800C9FC4904492449247924485000880304 +789C:00800090F90823FC204047FE79104A48CC864B10482048C47B08483000C00700 +789D:000003FEFC20104011FC21543D5465546554A52C242027FE3C50248821040202 +789E:00001FF010101FF000007C7C44447C7C0000FFFE08001FF82808C8080FF80808 +789F:00900290FA9027FE229042907AF0CA004BFC48404FFE48E0795042480C460040 +78A0:00400020FBFE200021FC410479FC4800CBFE4A0249FC48207820482000A00040 +78A1:002001FEFC2010FC102021FE3C0064FC64A4A49425FE24A43D1425FE20040018 +78A2:000000FCFC84108410F420943C9465FE6502A57A254A254A3D7A2502210A0104 +78A3:000001FCFD0411FC110421FC3C8065FE6622A522255225023DFA240220140008 +78A4:00880088FBFE208820A8402079FC4924C92449244BFE48207850488801040202 +78A5:00800040FBFC2204220443FC7A00CA004BFC4B544B544DFC7D5445540944010C +78A6:00400020FBFE2202208040F879084A90C86049984E0649F87908490801F80108 +78A7:0020FE4010FC7C8410FC1E84F0FC00007FFC040008003FF0C81008100FF00810 +78A8:000001FCFD24112411FC21243D2465FC6400A7FE252025223D14254821840102 +78A9:000003FEFC20104011FC21043D0465FC6504A5FC250425043DFC240020880104 +78AA:00880088FBFE208820F8408878F84888C8884BFE490049487984490001FE0000 +78AB:00800338FA28222823A842467A004A7CCBA44A244A284BA87E104A2802440282 +78AC:000003DEFA422242224243DE7A004A3ECBD24A124A144BD47A084A1402240242 +78AD:000001F8F90821F8210841F878004BFEC90049FC4A544C9479244A4400A80110 +78AE:000001FCFD04110411FC21043D0465FC6400A7FE242025203D3C252022A0047E +78AF:00920124FA4821242092404078804BFECA024A8A4A524A227A524A8A03FE0202 +78B0:01080090F80023FC2090409078924C92CA944A98489048907890489007FE0000 +78B1:00140012F01027FE2410441075D0D412541255D45554554875DA542A08461082 +78B2:00400020F9FC2000208840507BFE4A22CC2449FC492449247934492800200020 +78B3:00200124F924212421FC408078804BFEC890491049524A547AA84C2808440082 +78B4:00200020FBFE207020A841247A2249FCC90449FC490449FC7904480003FE0000 +78B5:00200020FC3E1020102021FC3D0465FC6504A5FC250425FC3C00248821040202 +78B6:0080009EFBEA208A21CA408A7BEA4892C8A648204BFE48207850488801040602 +78B7:0008001CFDF01110111021FE3D10657C6544A57C2544257C3D442244027C0444 +78B8:000007FCF404243425C4444475F4D554555455F45444545475F4549408061002 +78B9:00400020FBFE2202240441FC780049FCC90449FC490449FC7904480003FE0000 +78BA:00400040FBFE22A2209041FE79104B10CDFE4910491049FE7910491001FE0100 +78BB:00200010FDFE100010FC20843CFC640065FEA502257A254A3D7A2502210A0104 +78BC:000001FEF92021FC212041FC79204920C9FE48024AAA4AAA7AAA4A0200140008 +78BD:000001FCFC20102013FE20003DFC650465FCA50425FC25043DFC248821040202 +78BE:000001FEFD02110211FE21243D24657E6524A52425FE25523D54264822640442 +78BF:000003FEFA02220223FE42107A92CA544AFE4A824AFE4A827AFE4482048A0884 +78C0:02440124F928207E2010435479544954C97C49144920492079404A80047E0000 +78C1:01080088F09027FE210841087210D29454A4573851085210721054A407BC0084 +78C2:004003BEFA122292225242AA7B244840CBFE4A224A224BFE7A224A2203FE0202 +78C3:0004001EFBF0221E221042FE7A92CA984AF24A8E4A804AB87AA844AA054A0A86 +78C4:00200010FDFE1110117C21143DFE6514657CA510257C25443D442244027C0444 +78C5:00400020FBFC2108209043FE7A024C44C8204BFC488048F87888490801280210 +78C6:000001FCFD0411E4112423FE22027DFC6504A5FC250425FC25043D0425140108 +78C7:00200040FDFC1104115421243D54650465FCA400251225D43D1825522192010E +78C8:00200040FBFC2224222443FC7A244A44CBFC484048A848B4793C49220222041E +78C9:03F00110F0E02318200047BC74A4D31854A4504057FC50E0715052480C460040 +78CA:7FFC040008001FF0281048108FF000007EFE102020407EFCA34422443E7C2244 +78CB:00840044FC4811FE102020FC3C2065FE6440A48024FE25103E10241021FE0000 +78CC:00200020FBFE202021FC410479FC4904C9FC490449FC49047BFE488801040202 +78CD:00400020FBFE2202242441FC782049FCC8204BFE482049FC7904490401FC0104 +78CE:001E03E0FD2210941040208821F07C2064C4A5FE2422242027FE3C5024880306 +78CF:00880050FC0013FE105021FC3C5467FE6454A5FC245024D83D54265220500050 +78D0:08783E48228E2A007EF822482A3046CC0000FFFE08001FF82808C8080FF80808 +78D1:00200124FD24112411FC20003FFE640065FCA504250425FC3C88245023FE0000 +78D2:000000FCFC84108410FC20003DFE650265FEA50225FE25023DFE244820840102 +78D3:00100220F97C21442044407C7B404940C97C49444944497C79444A80047E0000 +78D4:02080208F3BE24882AA8413E7208D448584857FC50E0515072485C4600400040 +78D5:00200020FCFC1020102021FE3C40648465FEA40225FC25543D54255423FE0000 +78D6:000001DEFC42115210CA21523C42642064FCA484248424FC3C84248420FC0084 +78D7:00280024FBFE202021FC412479FC4924C9FC492448084BFE7888484800480018 +78D8:0008003CFBC020042244412879FC4A20C8204BFE482049247924492401FC0004 +78D9:00400020FBFE208821244242789049F8C808484448A849907A884CA400C20080 +78DA:002003FEFC2011FC112421FC3D2465FC6422A7FE240827FE3D08248820280010 +78DB:08047F7808407F40497E7F4849487F4808487F4808887FFC08001FF868080FF8 +78DC:01000110FBDC22542554428879084AF4CC0248004BFC484079504A4805440080 +78DD:00880088F88823D0209E43E478944FD4C91449D44954494879484A5402D40422 +78DE:00200222FA2223FE200043DE7A524A52CBDE4A524A524BDE7A524A52055A08A4 +78DF:000007BCF88424A4229444A478504988CE2648C04B1048647B88483000C00700 +78E0:00200020F83E2020202043FE7A024B26CA8A4A524B264A527A8A4B2603FE0202 +78E1:02480248F7E8224823DE424A73CAD24A524A5FEA540A554A7632541207EA0044 +78E2:00200020FBFE202022AA41247AAA4820CAAA49244AAA48507850488801040602 +78E3:00400088F9FC2108225243FE78504988CE2648C04B1048647B88483000C00700 +78E4:000000DCFB14221423D442547BE6CA404BDC4A144BD44A547A484448055408A2 +78E5:000001FCFD2411FC112421FC3C40648865F0A420244427FE3C22252422220060 +78E6:000003FEFC5011FC115421543DFC640065FCA40027FE24203CA8252422A20040 +78E7:002003FEFC2011FC102023FE3C0065FC6504A5FC250425FC3D0425FC20880104 +78E8:00803FFE22102F7C221027382AD422102FFC2100220027F84A08520883F80208 +78E9:000C000AF80823FE220842487A6ACA4A4BFA4A4C4A4C4AEC7B5A444A04D60822 +78EA:00200222FBFE2090208841FE7B104D10C9FE4910491049FE7910491001FE0100 +78EB:01240124F22424242954414A7292D6105A105250525C5250725052B0029E0300 +78EC:08007F7808483E4800863E782A483E304048FFFE08001FF82808C8080FF80808 +78ED:03FE0200FAFC220023FE42947AA8CAC44A004AFC4A844AFC7A8444FC0484088C +78EE:00200124FD2411FC102020503C8865746602A5FC255425543DFC25542154010C +78EF:01240124FAAA23AE212442AA7BAE4924CFFE4910491449147A8A4A4A02160422 +78F0:00880050FBFE202021FC40207BFE4924C8A84BFE480049FC7904490401FC0104 +78F1:008802AAFADC24882154422278004BFECA424C444BFC48447844488401140208 +78F2:0200017EF840247C224440FC79404E7ECA2048204BFE487078A8492402220020 +78F3:01040088F80023FE222242AA7A724A22CBFE480049FC490479FC490401FC0104 +78F4:002007A4F0A822922114420875F4D80253F85208520853F8720851100FFE0000 +78F5:000003DEFA5223DE225243DE7A024AFACA8A4AFA4A8A4AFA7A8A4A02020A0204 +78F6:0080031CFA042204239C42047A04CBFC49004BFE4C024AAA7AAA440200140008 +78F7:00200124F8A823FE20A841247A224904C90449DE4A444D54789E490402040404 +78F8:00880050FBFE205021FC4154798C4974C90449FC48204BFE7850488801040202 +78F9:000003FEFC5013FE125223FE3C0065FC6504A5FC250425FC3C2023FE00200020 +78FA:00880088FDFC1088108823FE3C2065FC6524A5FC252425FC3C00248821040202 +78FB:003C03E0FD2410A813FE20A83D24660265FCA524252425FC3D24252421FC0104 +78FC:00A00090FDFE132011FC21203DFC652065FEA500242027FE3C7024A823260020 +78FD:00200020F9FC202023FE41087B9C4908C9884E3E48004BFE789048900112020E +78FE:000003DEFA52225223DE400079FC4924C9FC492449FC48207BFE482000200020 +78FF:3FFE21042E3822102FBC27182AB4325220002FFC210023F826085A0843F88208 +7900:03DE0252FBDE225223DE42027AF24A92CAF24A924AF24A927A924B3202020206 +7901:00A00090F9FE2110231045FE79104910C9FE4910491049FE79004AA402520452 +7902:002003FEFC2011FC100021FC3D0465FC6488A7FE240025FC3D04250421FC0104 +7903:012400A8FBFE220220F8408878F8480CC9F0482049FC48207BFE482000A00040 +7904:001801E0FC4013FE108821743E5264706400A5FC250425743D5425742104010C +7905:02080108F7C82010279E449477A4D01457945094511451C87708511405240242 +7906:00200020FC501088110422FA3C00640065DCA554255425DC3C88248821540222 +7907:00400080FBFE222222AA42227BFE4A72CAAA4A0248204BFE7850488801040602 +7908:00440224F928207E201040287B4A491CC928494C491A492A7948491002FE0400 +7909:01080208F7C8245027DE446477D4D214511457D4521453C872485454055408A2 +790A:0878FFC808483E862B783E482A28FF9049287F4600007FFC08001FF868080FF8 +790B:000001FCFD5411FC102021FC3C2067FE6488A45025FC24203FFE242020200020 +790C:000001FCFC2013FE122221AC3C2065AC6400A5FC252425243DFC2524212401FC +790D:008803FEFC8811FC110421FC3D0465FC6480A5FE262225523D0225FA200A0004 +790E:00880088FBDE208821DC42AA7C884800CBFE48224920493C79204AA0047E0800 +790F:00500252F954205023FE408878504BFEC82049FC48204BFE78A8492406220020 +7910:0A803138228838382288393822887FFE4002BFF404000FF0181068100FF00810 +7911:00200124FCA813FE120220F83C88648864F8A40025FC25243DFC252421FC0104 +7912:01040088FBFE202021FC40207BFE4854C99248904BFE489078D44B8A009601A2 +7913:000003FEFC0011FC112421FC3D2467FE6400A5FC252425FC3D2425FC200003FE +7914:001003C8FA7E2240226243D47A004A3ECBC84A484E7E4A487A484BC802480008 +7915:3E1022FE3E4420287EFEA2103EFC22100000FFFE08001FF82808C8080FF80808 +7916:0140024CFA642244234C42647AA44BACCAA44AA44FFE48007910490802040404 +7917:00400020FBFE220221FC41487A5049FCCB0449FC490449FC790449FC00880104 +7918:000003FEFA0223FE220243FE79084A52CB9C49084A524BDE78004AA402520452 +7919:020002BEFB02225421C8403E7A0A4BCACD2849284FEE49287AA84A58044E0080 +791A:008803FEF888202021FC40207BFE4840C88849FC480049FC7954495407FE0000 +791B:000803E8FA8823EE222843F47A824BE2C80049FC495449547954495407FE0000 +791C:0A0033B822083BB820883AB82288FFFE10103FF8C4060FF0181068100FF00810 +791D:000001FCFC2013FE122221AC3C2065AC6400A7FE242025FC3D5425542154010C +791E:008803FEF88823FE220241FC78004BFEC84048A24B5448B87B54489203500020 +791F:000007C4F51427C8250847D47514D50057D450545554554875485454005401A2 +7920:01080090FBFE2108210842527B9C4908CA524BDE484048A47AAA4A8A04780000 +7921:008803FEFC88102413FE20203DFC652465FCA52425FC25243C0825FE20880058 +7922:01080090FBFC204021F840807BFC4948C9FC4B0A4DF8490879FA4934018C0102 +7923:004801FEFC48100011FE214A3D4A65FE6414A5FE251025923D4C254A21160222 +7924:00880088FBFE2088211041DE7A524D54CA8849744A0249FC7820492402220060 +7925:07DE0512F7D2245427C8451477E2D00053FC520453FC520473FC520403FC0108 +7926:00200010FBFE224422FE42447BFE4A10CAFE4A924AFE4A927AFE4A0002440482 +7927:000001FCF92421FC212441FC79044800CBFE4AAA4AAA4BFE7AAA4AAA03FE0222 +7928:00001FF011101FF011103FF82AA83EF82AA83EF800007FFC08001FF868080FF8 +7929:0042039CFA1023DE229442947C204BFCCA044BFC4A044BFC7A044BFC01080204 +792A:000001FEFD2811FE1128217C3D54657C6554A57C251025FE3D9222BA028A0484 +792B:01240174FA5822DA23FE41547ADA4BFEC8A248204BFE487078A8492402220020 +792C:22882108FABE2008729CA92A2288FFFE08203FF8C4060FF0181068100FF00810 +792D:01FC0020FBFE222225AC402079AC4890C9FE4B204DFC492079FC492001FE0100 +792E:001007C8F53E27C0251447D27522D50057D450545554554875485454005401A2 +792F:008802AAFADC2488215442227BFE4A42C88849F048244BFE7822492402A20040 +7930:000007FEF4442598248847DE7488D5DC56AA54885420542074BC54A004A00BFE +7931:08407F7C1440FF7C22043E7C22403E7C2242263E00007FFC08001FF868080FF8 +7932:01100090FBDE2010225E41827BDE4810CBDE4A504BDE4A507BDE4A50025202CE +7933:00400020FBFE224823FE42487AEC4B5ACA484BFE4A204A7C7AC44B44047C0844 +7934:008803FEF088241222FE401074FED29252FE509251FE5292760452FE0244022C +7935:01FC0020FBFE222221AC402079AC4800C89E4BF2489E49D27ABE4C92009E0092 +7936:008803FEF88823DE225243DE78A04890C9FE49204BFC4D2079FC492001FE0100 +7937:009007FEF89023E8228843CE7A504BD4CAA24BE248004BFC7A944A9407FE0000 +7938:052807BEF94827BE231845AA79464BFCCA044BFC4A044BFC7A044BFC01080204 +7939:07BC04A4F7BC200027FE44007590D49E57D4556455D4555475D455680BC81054 +793A:00003FF80000000000000000FFFE010001001110110821044102810205000200 +793B:200010001000F800080010001000380054009400100010001000100010001000 +793C:208010801080F8800880108010803880548094801080108410841084107C1000 +793D:2000100013F8F8880890109010A038BC54849484110411041104120412281410 +793E:202010201020F8200820102013FE382054209420102010201020102017FE1000 +793F:204010401080F8FC090412041004390454849444104410041004100410281010 +7940:2000100011FCF90409041104110439FC55049500110011021102110210FE1000 +7941:200010FC1084FC8804880890108838885484928410C410A81090108010801080 +7942:202010201020F920092C113411643BA455249534112811221122110210FE1000 +7943:200013F01010F81009101110111039FC54049404100413F41004100410281010 +7944:202010201050F850088811041202388854889488108810881088110811081208 +7945:2008103C11E0F8200820102013FE382054209450105010501088108811041202 +7946:2000100011FCF8200820102010203BFE54209420105010501088108811041202 +7947:2004101E11F0F91009101110111039FE5510951011101108110A114A11861102 +7948:2008101C11E0F9000900110011FE391055109510111011101110121012101410 +7949:202010201020F92009201120113C392055209520112011201120112017FE1000 +794A:204010201020FBFE08801080108038FC54849484108410841104110412281410 +794B:200010F81088F88808881106120039FC54849484104810501020105010881306 +794C:202010201020F82009FC112411243924552495FC112410201020102010201020 +794D:2008103C11E0F8200820102010203BFE54209420102010201020102011FC1000 +794E:202010201020FBFE0820102019FE3420502093FE10221022102A102410201020 +794F:2000100013FEF82008201040184034FC51849284148410841084108410FC1084 +7950:202010201020F8200BFE10401040388054FC9184128410841084108410FC1084 +7951:202010201120F92009FC11201220382057FE9420105010501088108811041202 +7952:200013FC1084F8840884110411143A08540095FC110411041104110411FC1104 +7953:205010481048F8400BFE1080108038FC55449544112811281210122814441182 +7954:208810881088F908097E13081508394855289528110811081108110811281110 +7955:200010401020F8280808108810903A9456A292A214C210881188128814781000 +7956:200011F81108F908090811F811083908550895F8110811081108110817FE1000 +7957:4008203C23E0FA2012201220222033FE6A20AA1022102212220A228A23262212 +7958:00003E7C0000000000007EFE081008102A542952495288900810081028501020 +7959:202010201020F9FC0820102010203BFE547094A810A811241124122210201020 +795A:208010801080F8FE094011401240387C544094401040107E1040104010401040 +795B:202010201020F9FC0820102010203BFE5420942010401048108411FE10821000 +795C:202010201020F8200BFE10201020382055FC9504110411041104110411FC1104 +795D:200013FC1204FA040A04120413FC3890549094901090111211121212140E1800 +795E:202010201020F9FC09241124112439FC55249524112411FC1124102010201020 +795F:0100111011101FF0410441047FFC00003FF80000FFFE01001110210845040200 +7960:200011FC1004F8040BF41004100439E455249524112411E41004100410141008 +7961:088008882E9028E028842E84F07C00003FF80000FFFE01001110210845040200 +7962:208010801080F8FE090211041220382054A894A4112411221222102010A01040 +7963:2080108010FEF9000A00101C11E0392055229524112811101110114811841102 +7964:200013DE1042F8420A52114A114A384254C6914A1252104210421042114A1084 +7965:210410841088F8000BFE1020102039FC5420902013FE10201020102010201020 +7966:200011FC1104F90409FC1000100039FC5420902013FE10201050108811041202 +7967:209010901090FA9209941098189035985294949210901090111211121212140E +7968:00007FFC04403FF8244824483FF800003FF80000FFFE01001110210845040200 +7969:202011201120F9FC0920122010203BFE547094A810A811241124122210201020 +796A:2040104010FCF9040A0811FE1100397C554495441154114811421242123E1400 +796B:202010201050F8880904120211FC3800540095FC110411041104110411FC1104 +796C:200013FE1020F8400888110413FE38225420902013FE10201020102017FE1000 +796D:100010801EBC22445448A83010102FE8C00600007FFC01001110210845040200 +796E:202010201020FBFE0820102011FC3800540095FC110411041104110411FC1104 +796F:20201020103EF820082011FC1104392455249524112411241050104810841104 +7970:202011201120F9FC0920122010203BFE5400940011FC11041104110411FC1104 +7971:210410841088F81009FC11041104390455FC94501050109010921112120E1400 +7972:200011FC1004F8FC080411FC10003BFE560291F8108810881050102010D81306 +7973:200013FC1200FA000AF8120012003BFC56A092A412A812901290148814A418C2 +7974:201010141012F8100BFE10101150395457F4955411541148124A125A14261042 +7975:400023FE2222FA22122213FE222232626A72AAAA232222222222220223FE2202 +7976:410820882090FBFC1024102423FC32206A20ABFE206220A2212A222424202020 +7977:2020102013FEF82009FC104013FE3848548894FE110811481228140810281010 +7978:200011FC1104F904090411FC1820342053FE92221252128A130A1202120A1204 +7979:2080108010FEF9020A8210F21142384257FA94421152115211F2100210141008 +797A:2108110813FCF908090811F81108390855F89508110817FE1000109011081204 +797B:200011FC1104F924092411FC1124392455749554115411741104110411FC1104 +797C:200011FC1124F92409FC1124192435FC502093FE107010A81124122210201020 +797D:2040102013FEF8000888108811543A225400902013FE10201020102010201020 +797E:2020102011FCF820082013FE18883544524290F8118812501020105011881606 +797F:208010F81088F90809F01010181037FE50209222117410A81124122210A01040 +7980:0100FFFE00003FF8200827C8244827C820083FF800003FF80000FFFE11102308 +7981:082008207EFC1C702AA849268A2000001FF000000000FFFE0100111025084204 +7982:200011FC1124F9240974112411FC390455749554115411741104120412141408 +7983:4040204027FCF840104013F8220833F86A08ABF8220823F8220822082FFE2000 +7984:400021F82008F80811F81008200833FE6820AA22217420A82124222220A02040 +7985:210410881050F9FC0924112411FC3924552495FC1020102013FE102010201020 +7986:2040108013FCFA240A2413FC1A24364453FC9090111017FE1010101010101010 +7987:2040104413F4F848085017FE1040388055F89308150811F81108110811F81108 +7988:200013FE1222F8200BFE102011FC392455FC952411FC102013FE102010201020 +7989:208810481050FBFE0850105011FC39545554958C110411FC1104110411FC1104 +798A:4100213C27D4F9141394111427D43124694CA84027FE204020A0211022082C06 +798B:200013FE1050F85009FC11541154395455FC9420102011FC1020102013FE1000 +798C:408420442048FBFE108410842108314A6A52AB9C208421082108225223DE2042 +798D:200011FC1104F90409E4112411243BFE560292FA128A128A12FA1202120A1204 +798E:20201020103EF820082011FC110439FC550495FC110411FC1000108811041202 +798F:400023FE2000F9FC1104110421FC30006BFEAA22222223FE2222222223FE2202 +7990:203C17C01244F928080013FC1080388057FE950011F812881250142018D81306 +7991:21FC11241124F9FC0924112419FC3420502093FE1222122A12FA120A12021206 +7992:210011F81208FBF0081017FE10803944566894B01128166810A4112216A01040 +7993:200011F81108F9F8090811F810003BFE550095FC125414941124124410A81110 +7994:200011FC1104F90409FC1104190435FC500093FE10201120113C112012A0147E +7995:2040104011FCF8840BFE100011FC390455FC902013FE1020122013FE10201020 +7996:2088108813FEF888088810F81088388854F8902013FE107010A8112412221020 +7997:200011FC1124F92409FC1124112439FC54009440102412A2128A148810781000 +7998:2040102011FCF8000888105013FE3A22542495FC112411241134112810201020 +7999:2050105213DCF85008D2134E100039FC550495FC110411FC1104110411141108 +799A:210410841088F8000BFE1020182035FC5020902013FE100012A4125214521000 +799B:2020102013FEF82009FC110411FC390455FC950411FC110413FE108811041202 +799C:08202AA44D28145022887FFE400280043FF80000FFFE01001110210845040200 +799D:200011FC1124F9FC092411FC18883544524290F8118812501020105011881606 +799E:2040102013FEF80009FC110419FC340053FE920212FA128A12FA1202120A1204 +799F:2020101011FEF910097C111411FE3914557C9510117C114411441244127C1444 +79A0:4004201E23F0FA1E121012FE229232986AF2AA8E228022B822A824AA254A2A86 +79A1:200011FE1120F9FC092011FC1120392055FE900212AA12AA12AA120210141008 +79A2:200011FC1104F9FC090411FC1800340053DE90421252114A12521042114A1084 +79A3:2028102413FEF82009FC112411FC392455FC9524100813FE1088104810481018 +79A4:200013FE1252FA520BFE100013DE38425652954A10C6135A10421042114A1084 +79A5:2088108813FEF88808F8108810F8388857FE9488112412FA1020102013FE1000 +79A6:020027DE491297D2211265DAA5142FD000003FF80000FFFE0100111025080200 +79A7:404027FC2040FBF8100013F8220833F86910AFFE200023F82208220823F82208 +79A8:4124212422AAFBAE112412AA23AE31246FFEA91021142114228A224A22162422 +79A9:400023FE2222FBFE122213FE208830886BFEA888208827FE2000208821042202 +79AA:200013DE1252FA520BDE100011FC392455FC952411FC102013FE102010201020 +79AB:200013FE1050FBFE0A5213FE100039FC550495FC110411FC102013FE10201020 +79AC:202010501088F9740A0211FC112439AC552495FC100010F8108810F8108810F8 +79AD:408824482250F8FC10201050269432386A50AA98223422542290222025FE2800 +79AE:409023FC2294FBFC129413FC200033FC6800ABFC220423FC2108209027FE2000 +79AF:409023FC2294FBFC129413FC200033FC6A00AAF8220023FE2520251425482986 +79B0:400023FE2124FA2217FE1222237632AA6B76AA22237622AA23762222222A2204 +79B1:404027FC2040FBFC100017FE200233F86840AFFE200027FE200827FE24A82798 +79B2:200013FE1248FBFE0A4812FC12A43AFC56A492FC122013FE132A157A150A1906 +79B3:202013FE1000F9DC095411DC188837FE508893FE108817FE1094118816A410C2 +79B4:404020A021100208F5F610002EEE2AAA6EEEB0002FFE29222FFE2922292A2804 +79B5:400023BE2288FB9012BE13A2203E37E2693EA92225BE2514252225002BFE3000 +79B6:452827BE2948FFBE131815AA294633FC6A04ABFC220423FC220423FC21082204 +79B7:4100255E2384F90817DE11122392355E6912A81E21522FF2211E2280244C2812 +79B8:0100010001007FFC420442044404444448245FF4481440044004400440144008 +79B9:001000F83F0001001FF0111011101FF001007FFC410441245FF448144004400C +79BA:00003FF8210821083FF8210821083FF801007FFC410441245FE4482440144008 +79BB:02000100FFFE00001450139014501FF001007FFC420444444FE4442440144008 +79BC:010001FC01001FF01450139014501FF001007FFC420444444FE4442440144008 +79BD:010002800C603118CFE60440139014501FF001007FFC420444444FE44424400C +79BE:001000F83F000100010001007FFC038005400540092011102108C10601000100 +79BF:00701F80010001007FFC054009203118C006044004400440044008421042603E +79C0:00701F80010001007FFC054009203118CFE60420044004780808080810506020 +79C1:04200E20782008200820FF40084018401C402A482A84488489FE088208020800 +79C2:00F83F0001000100FFFE0540092011102008C10401000280044008203018C006 +79C3:00701F80010001007FFC054009203118C0060FC00840084008441044203C4000 +79C4:04000EFC780408080810FF20082019FE1C202A202A2048208820082008A00840 +79C5:08081C3CF3C010401040FC401040307E3BC054405040904210421042103E1000 +79C6:08001DFCF02010201020FC20102033FE38205420542090201020102010201020 +79C7:08401C40F040104011F8FC4810483048394854C8544890A810AA110A12061402 +79C8:08201C20F02010201124FD24112431243924552455249124112411FC10041000 +79C9:00F83F0001007FFC01003FF80108FFFE01083FF80380054009203118C1060100 +79CA:00701F80010001007FFC054009203118C0E61F00010001007FFC010001000100 +79CB:08401C40F04010401144FD4411483250384054A054A090901110110812041402 +79CC:103811C010401440584053FC504090E010E0115011502A482444484240408040 +79CD:08201C20F020102011FCFD2411243124392455FC552490201020102010201020 +79CE:08101C90F09010881108FD04120435FA38885488548890881108110812281410 +79CF:08081C3CF1E010201020FC3C11E038203420503E53E09020102210221022101E +79D0:08001C00F1FC10001000FC0013FE30203820544054409088110413FE11021000 +79D1:08101D10F09010901010FD10109038903410501E53F090101010101010101010 +79D2:08201C20F02010A810A4FCA2112231203A245424542890081010102010C01300 +79D3:08201C20F02013FE1020FC20102031FC38845488544890501020105011881606 +79D4:08801C40F04013FC1000FC0011F03110391055105510911211121212120E1400 +79D5:08101D10F11011121112FD1411D83110391055105510911211521192110E1000 +79D6:08041C1EF1F011101110FD10111031FE3910551055109108110A114A11861102 +79D7:08081C3CF1E010201020FC2013FE302038205450545090501088108811041202 +79D8:08001C40F02010281008FC8810903A9436A252A254C290881188128814781000 +79D9:08201C20F020102013FEFC201020302039FC5504550491041104110411FC1104 +79DA:08201C20F12410A410A8FC2011FC38203420502053FE90201020102010201020 +79DB:08101C10F01011FE1112FD14111031FC39445544552891281110122812441482 +79DC:08001DFCF10411041104FDFC11003140394455485570914011421242123E1400 +79DD:08381DE0F02010201020FDFC10203070387054A854A891241124122210201020 +79DE:08201C20F020102011FCFD2411243124392455FC552491241124112411FC1104 +79DF:08001DF8F10811081108FDF811083108390855F8550891081108110817FE1000 +79E0:08001DFEF01010101020FC20106838A435225222502090201020100013FE1000 +79E1:08501C48F048104013FEFC80108030FC39445544552891281210122814441182 +79E2:08201C20F05010501088FD241212301039FC5404540890881050102010101010 +79E3:08201C20F02013FE1020FC20102031FC387054A854A891241124122210201020 +79E4:08001DFCF02010201124FCA410A830203BFE5420542090201020102010201020 +79E5:08201C20F0201020103EFC201020302039FC5504550491041104110411FC1104 +79E6:01007FFC01003FF80200FFFE082010D02F08C1061FF005400920111061080100 +79E7:08201C20F02011FC1124FD2411243124392457FE542090501050108811041202 +79E8:08801C80F08010FE1140FD401240307C384054405440907C1040104010401040 +79E9:08201C20F120112011FCFD201220302039FE5420545090501088108811041202 +79EA:08041C1EF1F011101110FD10111031FE3910551055109108110A114A11A61112 +79EB:08401C50F048104017FCFC4010E038E035505150524894441842104010401040 +79EC:08001DFEF10011001100FDFC110431043904550455FC91001100110011FE1000 +79ED:08201C20F02E11F01120FD20112039FE3422546250A2912A1624102010201020 +79EE:08201C20F04010401088FD0413FE3002380055FC550491041104110411FC1104 +79EF:04000E0078FC08840884FF84088418841CFC2A842A0048488844088408820902 +79F0:08801C80F08010FE1102FD041220302038A854A4512491221222102010A01040 +79F1:08001DFEF1021102117AFD021102317A394A554A554A917A11021102110A1104 +79F2:08201C20F02011FC1020FC2013FE3008380855FE540890881048100810281010 +79F3:08081C3CF1E010201020FDFE10203020382055FC550491041104110411FC1104 +79F4:08201C20F05010881104FE0211FC3000380055FC550491041104110411FC1104 +79F5:08001DFCF10411241124FD2411FC312439245554554C918C1104110411FC1104 +79F6:0100410021FC0A441448E0A02110260800E01F0001007FFC05401930E10E0100 +79F7:08001DFEF02010401088FD0411FE30223820542055FE90201020102013FE1000 +79F8:08201C20F02013FE1020FC2011FC3000380055FC550491041104110411FC1104 +79F9:00801888709C11701110FB101510311039FE55105110911011101110117C1100 +79FA:08401C20F3FE12021000FC3813C038403440507C53C0904010421042103E1000 +79FB:08201C20F07C10841148FC30102030483990543E544291A41018101010601180 +79FC:08201D20F12011FC1120FE20102033FE387054A850A891241124122210201020 +79FD:08201D24F124112411FCFC40104038FC35045284504890501020104010801300 +79FE:08201C20F02013FE1242FC4410A038A235A4529854909088108410A210C01080 +79FF:08281C24F3FE10201020FDFC1124312439FC5524552491FC112411241124110C +7A00:09841C68F03010C81304FC4013FE38A0352053FC552491241134112810201020 +7A01:01007FFC00001FF010101FF000007FFE400280741F800100FFFE05401930E10E +7A02:08401C20F1FC11041104FDFC1104310439FC5520552291141108114411821100 +7A03:08041C1EF1E010021122FC94100039FC3408501053FE90101010101010501020 +7A04:08401C40F088110413FEFC02108831443A4254F8518892501020105011881606 +7A05:08101C90F08811081204FDFA11083108390855F854909090109011121212140E +7A06:08001CFCF08410841084FC8410FC3800340055FE510291021102110211FE1102 +7A07:08001DFCF12411241124FDFC11243164397455AC552491241124110411FC1104 +7A08:08001DFCF10411FC1104FDFC1000380035FC5420502093FE1020102010201020 +7A09:08001DFEF020102011FCFD24112431FC3924552455FC912010A0104010B0130E +7A0A:09081C88F09011FC1024FC2411FC3120392055FE546290A2112A122414201020 +7A0B:00000DFCF10411041104FDFC1000380035FC5420502091FC10201020102017FE +7A0C:08201C20F05010881104FEFA102030203BFE5420552891241222142210A01040 +7A0D:08201D24F0A410A81020FDFC1104310439FC5504550491FC1104110411141108 +7A0E:09041C84F088101011FCFD041104310439FC54505450909010921112120E1400 +7A0F:08001DFEF04810481048FDCE11023102390255CE504890481048104813FE1000 +7A10:08201C20F05010881104FEFA100031FC3954555455FC9154115411541104110C +7A11:08201C20F1FC10201020FDFE108831043A22542051FC90201020102013FE1000 +7A12:08001DFCF10411241124FDFC1124312439745554555491741104110411FC1104 +7A13:08881C88F08813FE1088FC8817FE300039FC5504550491FC1104110411FC1104 +7A14:08201C20F05010881144FE2211F838083450542050A49282128A128A14781000 +7A15:08401C20F3FE100011FCFD0411FC380035FC5408501093FE1020102010A01040 +7A16:08801C40F1FC10001108FC88109033FE3800540055FC91041104110411FC1104 +7A17:08401C80F1FC11241124FDFC1124394435FC5490511093FE1010101010101010 +7A18:08881C88F3FE10881088FCF81088388834F85488508893FE1000108811041202 +7A19:08201C20F3FE10201020FDFC110431FC390455FC550491FC1104110417FE1000 +7A1A:08A01C90F09011FE1110FF1015FE3110391055FE55109110111011FE11001100 +7A1B:10003BFEE202221A22E2FA22222233FE6A226272A2AA23262222222223FE2202 +7A1C:10203820E1FC20202020FBFE208831446A4260F8A18822502020205021882606 +7A1D:10003BDEE25222522252FBDE225232526A5263DEA252225222522252255228A6 +7A1E:08001DFCF124112411FCFD24112431FC382057FE547090A81124122210201020 +7A1F:0100FFFE00003FF8200827C8244827C820083FF800001FF00100FFFE0920711C +7A20:08001DFCF12411241174FD2411FC310439745554555491741104120412141408 +7A21:08401C20F3FE10001088FC88115432223800542053FE90201020102010201020 +7A22:10143812E01027FE2010F81023D232526A526254A3D4200820EA271A22262042 +7A23:2008203C7DE0442088207C2055FE54207C70546854A87CA401221C20E0204020 +7A24:08401C20F3FE10001000FDFC1104310439FC5420552891241222142210A01040 +7A25:00701F8001007FFC054009203118C006149022481FF010101FF010101FF01010 +7A26:08401C40F1FC108413FEFC0011FC390435FC502053FE9020122013FE10201020 +7A27:08801C9EF3EA108A11CAFC8A13EA389234A6502053FE90201050108811041602 +7A28:08401C20F1FE11021102FDFE1100390035FE55AA51AA92FE12AA12AA14A21086 +7A29:08001DFEF12211FE1122FDFE100030FC388454FC548490FC1084108410941088 +7A2A:09001D00F1FE120015FCFD0411FC310439FC548054FC91081290106011981606 +7A2B:08001DFEF00010FC1084FC8410FC300039FE5522552291FE1122112211FE1102 +7A2C:08001DFCF020104011FCFD54115439543544552C502093FE1050108811041202 +7A2D:09101D12F1D411181152FD92112E304039FC5504550491FC1104110411FC1104 +7A2E:08081C3CF1E0102013FEFC2011FC312439FC552455FC902011FC102013FE1000 +7A2F:08001C88F25212221252FE8A12023BFE34885144527A90881150102010D81706 +7A30:08001DFEF0121090109CFC90117E320038FC548450FC908410FC108410941088 +7A31:081E1DE0F04411241088FC2011FC3924352455FC5124912413FE110411141108 +7A32:08041C1EF1E010221112FC941080313E39225522553E912211221122113E1122 +7A33:08401CF8F108121011FCFC04100439FC3404540451FC9040102412A2128A1478 +7A34:08881C50F00011FE1050FDFC105433FE385455FC545090D81154125210501050 +7A35:08841C44F04813FE1084FC841108314A3A52579C508491081108125213DE1042 +7A36:08141C12F01013FE1014FC18139032B43A98569053B2900C10CA171A10661002 +7A37:08001DFCF12411FC1124FDFC108831443A4254F8518892501020105011881606 +7A38:08401C20F3FE10401088FDF01020304439FE540255FC912411FC112411FC1104 +7A39:08201C20F3FE102011FCFD0411FC390435FC550451FC910417FE108811041202 +7A3A:10003BFCE204220423FCFA40222033FC6A886250A3FE222025FC242028202020 +7A3B:081E1DE0F02211121094FC80102031CE3902550255CE91021102110211FE1102 +7A3C:08401C20F3FE12021000FDFC104030A23B345458509493341052109013501020 +7A3D:08501C48F3FC10A01122FE1E111031E0390454FC540091FC110411FC110411FC +7A3E:01007FFC08200FE000007FFC48244FE440045FEC01007FFC05401930E10E0100 +7A3F:08401C20F3FE100011F8FD0811F8380037FC520452F49294129412F412141208 +7A40:1000FE7810487C480048FE8682007CFC00447C441028FE283810542892441182 +7A41:08881C88F1FE10881000FDFE1088308838F8548854F89088109E11E810081008 +7A42:08201C20F3FE102011FCFD2411FC392435FC5440502492A2128A148810781000 +7A43:08401C20F3FE12021050FC88112430503888550452FA90881088108810F81088 +7A44:11003910E3DC22542554FA88210832F46C026000A3FC20402150224825442080 +7A45:08201C10F1FE1110117CFD1411FE3914357C5510519291541138125412921430 +7A46:08201C40F1FC110411FCFD0411FC38203524563250C093181060118C103013C0 +7A47:10403888E1FC21082252FBFE205031886E2660C0A31020642388203020C02700 +7A48:010000803FFE22102F7C26382B543292203827C020402FFE215042484C468040 +7A49:08001DFEF10211FE1110FD541138395435825550517C9190111012FE12101410 +7A4A:1000E7BE2488248827A8FCA824A837BE6C106518A49825A826AA244A20462080 +7A4B:10003BDEE0422252214AFA52202830C46B126060A188203221C4201820602380 +7A4C:2008203C79E0482090207C2055FE54207C70546854A87CA40122AA20AA200020 +7A4D:08201DFEF02011FC1020FDFE100031FC390455FC550491FC110411FC10881104 +7A4E:40004CFE7010442044FC3C8400840CFC708410FCFE84108438FC544890841102 +7A4F:08081C3CF1C010441124FCA811FC300438FC540455FC904010A412AA128A1478 +7A50:1100E1F0222027F82A48FBF8224833F8684067FCA44427FC244427FE2042203E +7A51:08201C20F3FE10201124FCA813FE300039FC5504557491541174110411FC1104 +7A52:00701F800100FFFE05401930E20E1FF010101FF010101FFC10001FFC0004492C +7A53:10003BFEE22223FE2222FBFE208830886BFE6088A08827FE2000208821042202 +7A54:0088188871FC10881088FBFE102031FC392455FC512491FC1000108811041202 +7A55:08A01C90F1FE132011FCFD2011FC392035FE5500502093FE107010A813261020 +7A56:0124192472AA13AE1124FAAA13AE31243BFE551051149114128A124A12161422 +7A57:08201C20F3FE102011FCFD2411FC392435FC502253FE9042102412A2128A1478 +7A58:08201C20F1FC102013FEFD08139C31083988563E500093FE109010901112120E +7A59:08501E52F154105013FEFC88105033FE382055FC502093FE1050108811041602 +7A5A:08181DE0F04013FE1088FD7412523070380055FC55049174115411741104110C +7A5B:08901C88F1FE11101310FDFE1110391035FE5510511091FE110012A412521452 +7A5C:08201DFCF088105013FEFC0011FC312439FC552455FC902011FC102013FE1000 +7A5D:100039F8E10821F82108F9F8200037FE6A4063DCA25423D4226827C820542062 +7A5E:08801CF8F11013FC1524FDFC112431FC380057FE540091FC110411FC110411FC +7A5F:1088E448225020FC2020F850269432386A506298A23422542290222025FE2800 +7A60:08501DFCF15411FC1154FDFC100031FE3900557C550091FE1150115411481266 +7A61:0020182073FE11241124FAAA17FE300039FC5504517491541174110411FC1104 +7A62:08201D3CF12017FE1010FC1413FE32103BF05654525492D41368144A18961322 +7A63:10803840E7FE21102208FD1423F831106BF86110A7FC212823102D4821862100 +7A64:08001DFCF02013FE1222FDAC102031AC380057FE502091FC115411541154110C +7A65:11403A4CE2642244234CFA6422A433AC6AA462A4A7FE20002110210822042404 +7A66:08401C20F3FE120211FCFD48125039FC370455FC510491FC110411FC10881104 +7A67:10803840E7FC211020A4FF58255435526B586000A20823F8220823F822082408 +7A68:0C2071FC1124FDFC10203BFE540091FC010439FC290429FC29044DFC48888104 +7A69:103EE7C02244212823F8F84027FC30006BF86008A3F8200823F82544252A28FA +7A6A:10003BFEE124222227FEFA22237632AA6B766222A37622AA23762222222A2204 +7A6B:00881BFE70A8109011FEFB2011FC312039FC552051FE910013FC10881070138E +7A6C:10403820E7FE248825FCFC8827FE34206DFC6524A5FC252425FC240024882904 +7A6D:08801DF8F20815FC1124FDFC112431FC3954562A55FC910411FC110411FC1104 +7A6E:08401C20F3FE125013FEFE5213FE32003A9456D8529092D2128E140015541A2A +7A6F:00201BFE702013AE12AAFBAE102033FE380057FE520292FA128A12FA120213FE +7A70:1040E7FC200023B822A8FBB8211037FC691067FCA1102FFE212823102D482186 +7A71:001E1BE07122109413FEFA5213FE30043BC4567E53C4925413CC128412D41348 +7A72:13DE3800E3DE2252235AFA52202033FE6A5063FEA25223FE229222DC229224CE +7A73:1528E7BE294827BE2318FDAA294633FC6A0463FCA20423FC220423FC21082204 +7A74:0200010001007FFE400280440440044004200820082010101010200840048002 +7A75:020001007FFE40028824101020081FE000C0030004000800100810080FF80000 +7A76:020001007FFE400288241210220802003FE002200420042008221022201E4000 +7A77:020001007FFE400288241010220802007FF00210041004100810101020A04040 +7A78:020001007FFE400288241010220804000FF0101068200440028003001C00E000 +7A79:020001007FFE482290142FF8001000101FF0100020003FF80008000800500020 +7A7A:020001007FFE400288241010200800001FF0010001000100010001007FFC0000 +7A7B:020001007FFE4002882410102FE80100010001007FFC01000100010005000200 +7A7C:020001007FFE400288241010210801007FFC0540092011102108C10601000100 +7A7D:020001007FFE48229014282808203FF8082008200820FFFE0820102010202020 +7A7E:020001007FFE48229014200800F03F0001000100FFFE0280044008203018C006 +7A7F:020001007FFE4822901400003FFC0040104020403FFE01400640184061400080 +7A80:020001007FFE482291142108FFFE01002108210821083FF8010A0102010200FE +7A81:020001007FFE4002882411102148012001007FFC01000280044008203018C006 +7A82:020001007FFE48229014210811001FF8210041000100FFFE0100010001000100 +7A83:020001007FFE48229014200021FC2C44F0442044204424842884310422280410 +7A84:020001007FFE4822901428080FF81400240047F00400040007F8040004000400 +7A85:020001007FFE4822901420081FF0101010101FF010101FF0101010101FF01010 +7A86:020001007FFE4822901401F03E00020001007FF8006001800E003000480087FE +7A87:020001007FFE4822901408001FF020105F90109010901F901050102410040FFC +7A88:020001007FFE482290140840084012F822487C480848144822887E8821280210 +7A89:020001007FFE4822901420081FF0010001003FF8210822882448280820282010 +7A8A:020001007FFE4822901420781FA012201220122012101290224822A843248202 +7A8B:020001007FFE4822901421081110111011101FF001002108210821083FF80008 +7A8C:020001007FFE4822901420080C0070FC4084448444845C846494488808801080 +7A8D:020001007FFE48229014200800007DFE1040108011FC10041E04E00440280010 +7A8E:020001007FFE4822911422081FF010101210115010201FFC000400047FD40008 +7A8F:020001007FFE48229014100009FC4820202020200BFE10207020102010A01040 +7A90:020001007FFE4822901401003FF801000100FFFE000001003FF801000100FFFE +7A91:020001007FFE48229014200808001FF821000100FFFE0100210821083FF80008 +7A92:020001007FFE4822901400007FFC040008201FF0011001003FF801000100FFFE +7A93:020001007FFE482292142408082010103FF80008010008844892481287F00000 +7A94:020001007FFE4822921401007FFC08201010244844440280010006C01830E00E +7A95:020001007FFE4822901404404448245024600C403460C852084A1042203E4000 +7A96:020001007FFE4822911409000FF011000100FFFE00001FF0101010101FF01010 +7A97:020001007FFE4822921404003FF8220823C824482A882108228824083FF82008 +7A98:020001007FFE482290143FF80408FFFE04083FF808001FF8280848088FF80808 +7A99:020001007FFE4822911C0FD00120FFFE01001FF0082030C0CFFC008002800100 +7A9A:020001007FFE4822909400883FFC208020883E88225022502A244454418C8604 +7A9B:020001007FFE4822901420083E2001FE00247E4414E81410146A2586240243FE +7A9C:020001007FFE4822911401003FF821083FF801007FFC41047FFC410401000100 +7A9D:020001007FFE482290142FE8082008200FE001003FF821082288244820082018 +7A9E:020001007FFE4822941427E8082010402678180810081E78100810081FF81008 +7A9F:020001007FFE482290143FF820083FF820802490249027F02080488848888FF8 +7AA0:020001007FFE482290143FF811101FF011101FF00100FFFE054009203118C106 +7AA1:01007FFE482290143EF8020814D00820145062883EF80288145008203458C286 +7AA2:020001007FFE4822901400500048FFFE00403E4022243E2800120E2A70C60302 +7AA3:020001007FFE4822921401007FFC0820145022880100FFFE0100010001000100 +7AA4:020001007FFE482290143FF810081FF810081FF82080208C3EF020822682387E +7AA5:020001007FFE48229014000011FC7D0411241124FD241154285024904112860E +7AA6:020001007FFE482291142FE801007FFC048412880900FFFE0260041018086004 +7AA7:020001007FFE4822911401FC01003FF820083FF820083FF80100FFFE01000100 +7AA8:020001007FFE4A2291143FF808200440FFFE00001FF010101FF010101FF01010 +7AA9:020001007FFE482290143FF810101F9010907FFC40044FE448244FE44004400C +7AAA:020001007FFE48229014004023F81040804047FC10002040E3F82040204027FC +7AAB:01007FFE4822901408007F7C08243E2408447F5408880200FFFE04401830E00E +7AAC:020001007FFE492292940C6037D8C0063E0822483E4822483E48220822282610 +7AAD:020001007FFE4822911409207FFC05401930610C0400FFFE08201E4003C03C38 +7AAE:01007FFE4822901408003F7C21043F04217C3F4021407F7C05041904E5280210 +7AAF:020001007FFE48229014244802803FF801001FF001007FFC0000248822444244 +7AB0:01007FFE4822901401F87E002208111020003FF841000100FFFE010021083FF8 +7AB1:020001007FFE4822909411F822886870ABAE282029FC282028A8292422A42040 +7AB2:020001007FFE48229014080049482A280808FF48182E2CF84A08880808080808 +7AB3:020001007FFE48229014061C38E828A82CA82AA82AA82AA828A455545D748212 +7AB4:01007FFE4822901401007FFC01001FF010101FF010101FF01010FFFE10102008 +7AB5:01007FFE482294141FF010101FF010101FF010001FFC10001FFC492484940008 +7AB6:01007FFE482291143FF82108FFFE21083FF811101FF00400FFFE082007C07838 +7AB7:01007FFE482290140040FD9E4952495279524952795249DA5D54E89008900910 +7AB8:01007FFE4822901400F83F0011100920FFFE09203118C20609002908282447E4 +7AB9:01007FFE4822901405FC242024F83C48044805FE7C0024FC2484248444FC8484 +7ABA:020001007FFE48229014000011F87D0811F81108FDF8110829F824904112860E +7ABB:01007FFE4822911402003FF8220827E82A48218826483FF801004884481287F2 +7ABC:01007FFE48229114222011101FF011101FF011101FF001007FFC05401930E10E +7ABD:020001007FFE4822901422203C20213E1F4220943F104810FFA8142822444182 +7ABE:01007FFE4822901408207F20083E3E4200943E1000107F1008282A2849441882 +7ABF:01007FFE4822911479F04A9050606198560649F04A406BF8544043F8404047FC +7AC0:020001007FFE4822901401F8FD0811F8110851F85D0851F850905C90F112060E +7AC1:01007FFE4822901401F03E0003F03E0003FA7E0201FE0C20703C1DE2F0221C1E +7AC2:01007FFE482291147FFC044028281FF02828CFE608200FE00100111025080200 +7AC3:01007FFE492297D401007FFC11101FF011103FF821083FF821083FFA010200FE +7AC4:01007FFE4822961438F820083CF820083FF80000294825282948252A29463182 +7AC5:01007FFE482290143E2022203E3E22443EA408247F2810281E1022282A444482 +7AC6:01007FFE4822901408003E7C22443E44227C3E0022FEFE8212822282CAFE0482 +7AC7:01007FFE492297D401003FF824483FF810101FF010101FF010101FF008201010 +7AC8:01007FFE492297D401007FFC00001FF012903EF822883EF822883EFA028201FE +7AC9:01007FFE4822901408407E7C2440FF7C00047E7C42407E7C42407E7C4242463E +7ACA:01007FFE482290140C40707C104055FC39241154FD0433FE3A22564A92FA1206 +7ACB:02000100010000007FFC000000101010082008200440044004800000FFFE0000 +7ACC:1000080008F07E9000900490449044902490289028900E92F0924112010E0200 +7ACD:1020082008207E200020042047FE44202420282028200E20F020402000200020 +7ACE:020001003FF8000008200440FFFE0000044004407FFC04400840084010402040 +7ACF:1008083C09E07E2000200420442047FE2420282028200E20F020402000200020 +7AD0:100008F808887E8800880506460045FC2484288428480E50F020405000880306 +7AD1:204010401040FC4003FE08408880889048904920512052481E44E48441FE0082 +7AD2:020001003FF8000008200440FFFE001000101F90109010901F90001000500020 +7AD3:1008081C08E07E200020043C44E044202420283E29E00E20F02240220022001E +7AD4:200810681388FC880088088888888BFE48884888508850881D08E10842080408 +7AD5:201010901090FC88010809048A048DFA48884888508850881D08E10842280410 +7AD6:08004BF84A08491048A0484048B04B0C0A0001003FF8000008200440FFFE0000 +7AD7:1020082008207EA800A404A2452245202624282428280E08F010402000C00300 +7AD8:1040084008807EFE0102060244F244922492289228F20E92F002400200140008 +7AD9:1020082008207E20003E04204420442025FC290429040F04F104410401FC0104 +7ADA:204010201020FDFE01020A048800880049FE4820502050201C20E02040A00040 +7ADB:1020082008507E50008805244612441025FC280428080E88F050402000100010 +7ADC:020001003FF808200440FFFE00001FF011101FF011101FF01112010200FE0000 +7ADD:1020081008107EFE00000400448444842444284828480E10F01041FE00000000 +7ADE:020001003FF808200440FFFE00001FF0101010101FF00440044008423042C03E +7ADF:020001003FF808200440FFFE00001FF010101FF010101FF0044008421042603E +7AE0:020001003FF808200440FFFE00001FF010101FF010101FF00100FFFE01000100 +7AE1:100009FE08107E10002004FC44844484248428FC28840E84F084408400FC0084 +7AE2:202010401088FD0401FE0802888088FC4920482053FE50201C50E08841040202 +7AE3:204010401088FD0403FE0802888889444A4248F8518852501C20E05041880606 +7AE4:2040102013FE0202FC4400400BFE884088904890511051201A24E24204FE0842 +7AE5:020001003FF808200440FFFE00001FF011101FF011101FF001003FF80100FFFE +7AE6:2020102013FEFC20002009FC8924892449FC4820507050A81D24E22240200020 +7AE7:1020084008F87E8800F8048844F8448A248C29F828180E28F048408803280010 +7AE8:20201020103EFC2001FC090489FC890449FC4924502053FE1C20E02040200020 +7AE9:2020101011FEFD02020408F88888888848F84888508850F81C88E08843FE0000 +7AEA:00007EFC48447E4442287E1048287EC6020001003FF8000008200440FFFE0000 +7AEB:2040104010F8FD08001009FC882488244BFE4824502451FC1C24E02040A00040 +7AEC:2004101E13E0FC2001FC0924892489FC48204BFE5222522A1EFAE202420A0204 +7AED:200011FC1104FDFC010409FC888089FE4A224922515251021DFAE00240140008 +7AEE:200013FC1204FE0403FC0A008A848A484AFC4A48524853FE1C48E44848881108 +7AEF:202011241124FD2401FC08008BFE8820484049FC515451541D54E1544154010C +7AF0:100009FE09007F7C01540554457C45542554297C29100F10F17C4210021004FE +7AF1:202013FE1020FDFC012409FC892489FC48224BFE500853FE1D08E08840280010 +7AF2:21041088100003FEFA2202AA0A728A228BFE480051FC510419FCE10401FC0104 +7AF3:201013D21054FD48008A09048AFA8C0049FC4904510451FC1D04E08847FE0000 +7AF4:2088105013FEFC5001FC0954898C8974490449FC500853FE1D08E08840A80010 +7AF5:200013FE100803BEFA8802A80ABE8B8888084BFE528A52521BFEE222022A0224 +7AF6:20201010FEFE44442828FEFE00007EFC428442847EFC28502A502C924912820E +7AF7:1020FE7C44A42818FEE600107CFE44107C9044FE7C101020FE7C10C8103011CE +7AF8:20201010FEFE44442828FEFE00007C7C44447C7C44447C7C28282A284C4A8886 +7AF9:10401040104010403EFE289049108A1008100810081008100810081008500820 +7AFA:104010401F7E289024884508800000003FF800000000000000000000FFFE0000 +7AFB:104010401F7E289024884508820002007FF80208040804080808100820504020 +7AFC:104010401F7E28902488450880000FE0082008200A200920092210222022401E +7AFD:104010403F7E2890450880003FF801000100FFFE010001000100010005000200 +7AFE:104010401F7E2890248845088100117013901D10F11011501122110210020FFE +7AFF:104010403F7E4890850800003FF8010001000100FFFE01000100010001000100 +7B00:104010403F7E4890850802000100FFFE0800080008000800080008000FFC0000 +7B01:104010401F7E289024884508800000003FF801000100010001000100FFFE0000 +7B02:104010403F7E28904508820002007FE002200A200420062009221022201E4000 +7B03:104010403F7E28904508BFF00010101010101FFC000400047FE4000400280010 +7B04:104010403F7E4890850800007FFC082008200820FFFE08200820102020204020 +7B05:104010403F7E28904508981006600180066018186C240240018006601818E006 +7B06:104010403F7E2890450880003FF82108210821083FF820002002200220021FFE +7B07:104010403F7E289045088100008000007FFE0100012001100108010001000100 +7B08:104010403F7E2890450880003FE0082008400C780A081210112020C043308C0E +7B09:104010403F7E4890950810001FF820084C088208006801881E08080800500020 +7B0A:104010403F7E28904508801000F81F2012201220122012102210220842048202 +7B0B:104010403F7E489085083FF002100210FFFE021004103FF0081010002000C000 +7B0C:104010403F7E489085083FFC0020102020203FFE012002200C203020C0A00040 +7B0D:104010403F7E4890850801003FF8210821082288244828282008200820282010 +7B0E:104010403F7E4890850800001FF0000000007FFC04400440044408441044603C +7B0F:104010403F7E4890950810001FF8224842488488088811082208440808501020 +7B10:204020407EFE51108A0801007FFC000000000FE00820082008221022201EC000 +7B11:104010403F7E2890450880F03F0001000100FFFE01000280044008203018C006 +7B12:104010403F7E28904508828004400A203118C1061FE000200040004000800100 +7B13:104010403F7E489085082080208020883C9020A020C0208424842884307C0000 +7B14:104010403F7E4890850800F83F00010001F83F00010001FC7F020102010200FE +7B15:104010403F7E2890450880001FF010101110111011101290149008823082C07E +7B16:104010403F7E2890450880002410221021102110201024202830304821840602 +7B17:104010403F7E2890450888001FF02820444003801C70E30E00C00E0001800040 +7B18:104010401F7E289024884508810001FE010001003FF82008200820083FF82008 +7B19:104010403F7E28904508910011003FFC4100810001003FF8010001000100FFFE +7B1A:20403F7E4890850800003FF8210821083FF8210821083FF82108010001000100 +7B1B:104010403F7E2890450881003FF82108210821083FF82108210821083FF82008 +7B1C:104010403F7E2890450880000100210821083FF801000100410441047FFC0004 +7B1D:104010403F7E489085083FF820082FC820482688210822882C4820083FF82008 +7B1E:104010403F7E48908508082010103FF8000800001FF01010101010101FF01010 +7B1F:104010403F7E2890450880781FA012201220122012101290224822A843248202 +7B20:104010401F7E2890248845088200010001007FFC00001010082004400000FFFE +7B21:104010403F7E2890450880001FF0101010101FF010101FF010101010FFFE0000 +7B22:104010403F7E489085083FF8200820083FF8208020803FFC204020242C14300C +7B23:20403F7E4890850808001FF020105F90109010901F901050102410040FFC0000 +7B24:20403F7E4890850800007FF80408080810502020DFF81008100810081FF81008 +7B25:104010403F7E2890450880003FF800087FE800081F88108810881F8810A80010 +7B26:104010403F7E489085080810081013FE30105110909010901010101010501020 +7B27:20403F7E4890850800001E78124812481248FFFE124812481248128826A84110 +7B28:104010403F7E4890850801007FFC03800540092011102FE8C106010001000100 +7B29:104010403F7E28904508885008481040307C57C09040102010201014100C1004 +7B2A:104010403F7E2890450880001FF0101010101FF0101010101FF00000FFFE0000 +7B2B:104010403F7E2890450881701F80110021003FFC0304050409043128C1100100 +7B2C:20403F7E489085083FF8010801083FF8210021003FFC030405041928E1100100 +7B2D:104010403F7E28904508828004400A203118C1061FE0002000400C8003000080 +7B2E:104010403F7E28904508880008001FFC2400440087F00400040007F804000400 +7B2F:104010403F7E28904508900011F8FE881288228824506450182018502488C306 +7B30:20403F7E4890850804403FF8044804481FF8144024403FFC0844105420484040 +7B31:104010403F7E4890950810001FF8200840089F88108810881F88000800500020 +7B32:104010403F7E28904508882010103FF8000808200820FFFE0820082010202020 +7B33:104010403F7E489085081000107C7E441244124412441244224422444A7C8444 +7B34:104010403F7E489085080000FFFE001000101F90109010901F90001000500020 +7B35:104010403F7E48908508100009F84908210825080528091071021102110210FE +7B36:104010403F7E28904508880008001FF0210001007FFC0280044008203018C006 +7B37:104010403F7E489085080C0070FC4084448444845C8464944888088010806080 +7B38:104010403F7E2890450880003FFC2000200027F82408240827F8200020003FFE +7B39:104010403F7E28904508822012201220FFFE1220122013E0100010001FFC0000 +7B3A:20403F7E489085080240022003F87E00020003FCFE10012000C007443834000C +7B3B:104010403F7E2890450880007CFC10841084108410841E94F088408000800080 +7B3C:104010403F7E28904508804004207FFC04800488089008A010C223824C82807E +7B3D:104010401F7E28902488450880003FF8244824482448244824482448FFFE0000 +7B3E:104010403F7E489085082080108017F8008870881108110812281410280047FE +7B3F:20403F7E4890850808000FF010202C4003801C70E00E1FF0101010101FF01010 +7B40:104010403F7E2890450881003FF801000100FFFE000001003FF801000100FFFE +7B41:104010403F7E2890454884403FF82448244824483FF82448244824483FF82008 +7B42:104010403F7E4890854820401258926843C84E480A48125AE242220221FE2000 +7B43:104010403F7E489085083FF8210821082FE8210822882448282820083FF82008 +7B44:104010403F7E4890850804404448245024600C403460C852084A1042203E4000 +7B45:104010403F7E48908508110011003FF841000100FFFE0440084010422042C03E +7B46:104010403F7E489085083FF00110FFFE01103FF001003FF80100FFFE01000100 +7B47:104010403F7E2890450880007EFC088408880890088808840E84F0A840900080 +7B48:20403F7E4890850800F01F0001000100FFFE010001001FF0101010101FF01010 +7B49:20403F7E4890850801003FF801000100FFFE000000207FFC0820042004A00040 +7B4A:204020407EFE51108A0801007FFC08201010244844440280010006C01830E00E +7B4B:104010403F7E489085083E20222022FC3E24222422243E24224442444A948508 +7B4C:104010403F7E289045088280044008203018CFE6010001001FF0010001007FFC +7B4D:20403F7E4890950810001FF820085FC890481FC810481FC81048000800500020 +7B4E:104010403F7E489095081000FE7C124422442244644414440844147C2244C000 +7B4F:104010403F7E2890450888A00890108030FC57809048105010241054118C1604 +7B50:20403F7E4890850800003FFE20002FFC2080208027F8208020802FFC20003FFE +7B51:104010403F7E4890850800007DF011101110119011501D12E2124212040E0800 +7B52:104010403F7E28904508BFF820082FE8200827C82448244827C8200820282010 +7B53:104010403F7E2890450880007EFC082008200820FEFE08200820102020204020 +7B54:104010403F7E2890450882800C603018CFE600001FF01010101010101FF01010 +7B55:20403F7E48908508100021FC4000880013FE3020502090201020102010A01040 +7B56:104010403F7E489085080100FFFE01003FF821082388255809201110610C0100 +7B57:104010403F7E489085081040104027FC6444A444244427FC2444204020402040 +7B58:104010403F7E28904508880008007EFC088408840E847884088408FC28841000 +7B59:104010403F7E4890850801007FFC01003FF80100FFFE054009203118C1060100 +7B5A:20403F7E48908508208020883EB020C42084267C39000100FFFE010001000100 +7B5B:20403F7E4890850808004BFE4820482049FC4924492449241134112820204020 +7B5C:104010403F7E289045089110092001007FF8000800083FF8000800087FF80008 +7B5D:104010403F7E2890450888001FF020205FF80108FFFE01081FF8010805000200 +7B5E:204020407EFE51108A0801003FFC2004410801007FFC054009203118C1060100 +7B5F:20403F7E4890850800F87F00221011203FE000400080FFFE0100010005000200 +7B60:104010403F7E28904508908010FC7D041204108410541C24E044418400280010 +7B61:204020407EFE51108A880440082037D8C10601003FF801001110210845040200 +7B62:104010403F7E48908508100011FCFD24112411241DFCF10011001102510220FE +7B63:204020407EFE511088080608780808480848FF481C482A484948880808280810 +7B64:204020407EFE51108A0801001FF010101FF010101FF011081090126014181806 +7B65:104010403F7E2890450880001FF0101010101FF000003FF8200820083FF82008 +7B66:204020407EFE51108A0801003FFC20045FE800007FFC0440044008441044603C +7B67:104010403F7E289045089FF010101FF010101FF010101FF0044008421042603E +7B68:104010403F7E4890850802800C603118CFE6004000801FF0101010101FF01010 +7B69:104010403F7E489085083FE0044002803FF821083FF821083FF8210821282010 +7B6A:104010403F7E28904508BFFC20002FF828882FF828882FF8208020803FFE0000 +7B6B:104010403F7E2890450880003FF820083FF820083FF820083FF8082010102008 +7B6C:104010403F7E28904508809000883FFC208020883E48225022244A54448C8104 +7B6D:20403F7E4890850800003FF801001FF001007FFC00000820FFFE082010202020 +7B6E:104010403F7E4890850800007FFC01001110111011102928454485840100FFFE +7B6F:104010403F7E489085283E20222022FC3E2422243E24222422442F44F0944108 +7B70:104010403F7E289045088880088010FE11403240547C90401040107E10401040 +7B71:104010403F7E4890850810401040247E24886488A54824502420205020882306 +7B72:104010403F7E48908508111009201FF010101FF010101FF01010101010501020 +7B73:104010403F7E4890850800387BC00840104023F8784008402BFC1000280047FE +7B74:104010403F7E4890850801007FFC11101110292845440280044008203018C006 +7B75:20403F7E4890850800187BE00840104022787A400A402BFC1000280047FE8000 +7B76:104010403F7E4890850811001FF821000100FFFE00001FF0101010101FF01010 +7B77:104010403F7E48908508104011F818485448504853FE904010A0111012081406 +7B78:20403F7E489085081FF010101FF010101FF000003FF80100FFFE010001000100 +7B79:20403F7E4890850801007FFC02003FF80400FFFE08201FFC2420422080A00040 +7B7A:104010403F7E489085083FFE20002FFC2080208027F820A020902FFC20003FFE +7B7B:20403F7E489085087FFC01003FF821083FF821083FF821001A00060019C0603E +7B7C:20403F7E489085081FF0101010101FF000003FF820082108220804E01818E004 +7B7D:104010403F7E489085081FF010101FF000003FF80100FFFE028004401830E00E +7B7E:104010403F7E2890450882800440082037D8C00602101110092008407FFC0000 +7B7F:104010403F7E289045088FE0144003801C70E10E01003FF80100111025080200 +7B80:20403F7E4890850810000BF8200827C82448244827C82448244827C820082018 +7B81:204020407EFE51108A0801003FF808200440FFFE00001FF0101010101FF01010 +7B82:104010403F7E4890850801007FFC11101110292845440380054009203118C106 +7B83:20403F7E4890850800007F0022FC3E4422443E44222822282F10F22842440282 +7B84:204020407EFE51108A0804003FF821083FF822083FF808801080FFFE00800080 +7B85:104010403F7E489085083FF821083FF821083FF80000FFFE0820082010202020 +7B86:20403F7E4890850800003FF8210822882448000020843E9820E020842684387C +7B87:20403F7E4890850800003FF8210821082FE8210827C8244827C820083FF82008 +7B88:20403F7E4890850820801110120887FC4204500013F82208E208220823F82208 +7B89:20403F7E48908508100011F8FD08110815F8184033FCD0441084108451142208 +7B8A:104010403F7E4890952808207E50105010881F0612601210220022C04A308408 +7B8B:20403F7E48908508021002FC7F4000840764781C021002FC7F4000840764781C +7B8C:20403F7E489085087F84100422247F24092408247F24082408240F04F0144008 +7B8D:20403F7E48908508100013FE1220FE2012FC12A41EA4F2A412B412A8522023FE +7B8E:20403F7E4890850801F801003FFE210221F02F0420FC200027E044224822B01E +7B8F:20403F7E4890850800FC7F00220811103FF80108FFFE01083FF8010805000200 +7B90:20403F7E4990BFF801001FF00100FFFE00001FF010101FF010101FF010101030 +7B91:20403F7E489085087FFC01003FF80108FFFE01083FF8110011F8290047FE8000 +7B92:20403F7E489085081FF000100FF000101FF000007FFE41029FF4111011501120 +7B93:20403F7E489085083FF000101FF00010FFFE111009A005401930E10E05000200 +7B94:104010403F7E48908528104009FC49042104250405FC09047104110411FC1104 +7B95:20403F7E48908508082008207FFC08200FE008200FE00820FFFE082010102008 +7B96:104010403F7E48908508082008207EFC08200C701A682AA44922882008200820 +7B97:20403E7E489080003FF820083FF820083FF820083FF80820FFFE082010202020 +7B98:20403F7E489085083FF8200820C8270821082FE823882548292821083FF82008 +7B99:20403F7E489085083EFC228422943E88228022FC3EA422A422A822904AA884C6 +7B9A:104010403F7E289045088C04122421245EA480243F242124212421043F142108 +7B9B:20403F7E48908508001C7DF00950115011501D503148D14811441254525A2468 +7B9C:20403F7E4890850801007FFE40028824101020081FF00100010001007FFC0000 +7B9D:104010403F7E4890850810881088FBFE108810881CF8F0881088108850F82088 +7B9E:20403F7E48908508111009203FF802007FFC082010102FE8C8260868080807F8 +7B9F:104010403F7E289045089FF810081FF810081FF82080208C3EF020822682387E +7BA0:20803EFE491080F83F0001007FFC09200920FFFE092009207FFC010001003FF8 +7BA1:20403F7E4890850801007FFE40029FE410201FE010001FF0101010101FF01010 +7BA2:204020407EFE51108A0801007FFE400290041EF8228824A8549008841084607C +7BA3:204020407EFE511088080804FFA408247F2449244B241C242A24490488140808 +7BA4:204020407EFE51108A0801007FFC08200820145022880100FFFE010001000100 +7BA5:20403F7E489085082020102013FC822442204BF80A881288E25024202450298C +7BA6:20403F7E489085083FF801001FF001007FFC00001FF01010111002C00C307008 +7BA7:20403F7E4890850800003FFC208020802FF8249022A02FFC2140222024103FFE +7BA8:20403F7E48908508100011FC1088FC70138E10201DFC3020D3FE102050202020 +7BA9:20403F7E489085083FF8244824483FF8020007F008103420024001800E007000 +7BAA:20403F7E48908508082004403FF821083FF821083FF80100FFFE010001000100 +7BAB:10401F7C28A045103FF80108FFFE01083FF80100254825282528292821084108 +7BAC:20403F7E4890850808207FFC08200200FFFE040008001FF02810C8100FF00810 +7BAD:20403F7E4890850810100820FFFE00003E4822483E4822483E0822082A282410 +7BAE:20403F7E50908A0801007FFE40029FF400001FF010101FF010101FF00000FFFE +7BAF:20403F7E48908508080017FC304053F8924813F8124813F8114010C013301C0E +7BB0:20403E7E48909FF820085FC890481FC810681FD000001FE00040FFFE01000300 +7BB1:104010403F7E28904508880008FC7E84088418FC1C842A842AFC4884888408FC +7BB2:20403F7E489085281120092009FC422020202BFE08901090709011121112120E +7BB3:20403F7E489085083FF820083FF8241022202FF8222022202FFC422044208820 +7BB4:104010403F7E2890452880243FFE20202FA420242FA8289828924FAA40468082 +7BB5:20403F7E489085081110216843841C00FFF010101FF010101FF010101FF01010 +7BB6:204020407EFE51108808087C7F440844087C3E442244227C22443E8422940108 +7BB7:104010403F7E4890A5481040FEFE212020AC3CB425E424AC24A044A25482887E +7BB8:104010403F7E2890450882001FD00220FFFE03000FF03810CFF008100FF00810 +7BB9:20403F7E4890850810401440247C7884110424447E24002454044A048A280010 +7BBA:20403F7E489085087FFC01003FF80200FFFE08201FF02828CFE608200FE00820 +7BBB:20403F7E48908508004013F8204847FE884813F8304053FC904017FE10401040 +7BBC:20403F7E489085083FFC20043FFC20002FF8220024102FF820804FF84080BFFE +7BBD:20403E7E48909FF001007FFC01001FF011101FF011101FF001003FF80100FFFE +7BBE:20403F7E48908508080049042A247F2441247F2441247F244124410445144208 +7BBF:20403F7E489085081FF010101FF000007FFC10101FF010101FF0103EFFD00010 +7BC0:104010403F7E4890850800007E7C42447E4442447E44484444545A4862404040 +7BC1:204020407EFE51108A081FF010101FF010101FF000007FFC01003FF80100FFFE +7BC2:20403F7E489085081FF010101FF010101FF021003FF841009FF00100FFFE0000 +7BC3:20403F7E489085083FF821083FF820002FF828082FF828084FF848088FF80808 +7BC4:20403F7E4890850808007F7C08447F4449447F4449547F480842FFC20842083E +7BC5:20403F7E489085080100210821083FF80000FFFE02003FF82488248824A82010 +7BC6:20403E7E489088000FE010201FC00040FFFE06003B0804B019C062A00C987306 +7BC7:20403F7E4890850800803FFC20043FFC20002FFC292429242FFC49244924880C +7BC8:20403F7E48908508080008087F0808FEFF08084808287F2808080F08F0284010 +7BC9:20403F7E489085087DF01110119011521D12E20E01007FFC054009203118C106 +7BCA:104010403F7E489085082090109013FC80904890489017FEE000209021082204 +7BCB:104010403F7E489085083FFC20802FF82080249024902AA83144222024103FFE +7BCC:20403F7E4890850809F00810101037FC510091F81240104017FC10A01110120C +7BCD:20403F7E489085080C20702010A410A4FCA83120382054505050908811041202 +7BCE:104010403F7E4890850800207C2044A87CA445227D22462844107C6001800600 +7BCF:104010403F7E489085282220223EFF42229422103E10221022283E2822440082 +7BD0:20403F7E48908508100013FEFE20122032FC3AA456A492A412B412A8122013FE +7BD1:20403F7E489085081FF011101FF00100FFFE00001FF01010111002C00C307008 +7BD2:204020407EFE51108A880E603118DFE610201FE010201FE01008119014601810 +7BD3:20403F7E48908508111009207FFC05401930610C0400FFFE08201E4003C03C38 +7BD4:20803EFE49109FF010101FF000003FF820083FF820083FF820083FF808201010 +7BD5:20403F7E4890850801003FF801007FFC080010103FF800003FF824482448FFFE +7BD6:20803EFE491080803FFC20802FF820883FFE20882FF820804FF848088FF80808 +7BD7:20803EFE491088801FFC30805FF890801FF810801FFC10003FF00C6003807C7C +7BD8:20803EFE491090001FFC210451141FF4020814001FFC210451141FF404143808 +7BD9:20403E7E48908200FFFE00001FF010101FF000007FFC40044FE448244FE4400C +7BDA:20403F7E489085083FFC224022403E7822402E7022403E78224022403FFC0000 +7BDB:20403F7E4890850800007EFC02047EFC40807EFC020422441A3462C414280810 +7BDC:20403F7E489085081FC000447D88055009203118C50602003FF8000024884244 +7BDD:20403F7E489085487FFC04403FF80440FFFE11101FF01110FFFE101010501020 +7BDE:20403F7E48908508200017FC140487FC440457FC104027FCE04020402FFE2000 +7BDF:20403F7E4890850808400FFC104033F8504097FE120813F8120813F812081218 +7BE0:20403F7E48908508108011F822886870ABAE282029FC282028A8292422A42040 +7BE1:20403F7E48909FF810101FF010101FF010101FF002007FFC04401A30E44E0FE0 +7BE2:20803EFE4910BFF801007FFC00001FF010101FF010101FF010101FF008201010 +7BE3:20403F7E489085083FF8082004407FFE420281043FF8040007F0081010502020 +7BE4:20403F7E4890850800001FF811001FF011001FF011001FFC0004292444940008 +7BE5:104010403F7E489085087FFC04403FF824483FF801007FFC05401930E10E0100 +7BE6:20403E7E489082003FF82448238824483FF8000020843E9820E020842684387C +7BE7:20403F7E4890850804007FFC450408801FFC30805FF810801FF810801FFC1000 +7BE8:20403F7E48908508784048A05110620855F648404BFC68405150424845444080 +7BE9:20403E7E4890900023FE7C20442045FC7D2441247D24452445347D2844200020 +7BEA:20403F7E4890857C3F8020F820802FFC288428F02B882878480051E09224241C +7BEB:20403F7E489085087DF0111011901D52E20E5FF001001FF001007FFC01000300 +7BEC:20403F7E4890850806C01A30E10E1FF010101FF010101FF010002FF848088FF8 +7BED:20403F7E50908A0801003FF80820FFFE00003FF821083FF821083FFA010200FE +7BEE:20403F7E489085080480248024FC24A0251000003FF8244824482448FFFE0000 +7BEF:104010403F7E4890952810243C3E41E0BC20102E13F4FC281012106A15861802 +7BF0:20403F7E489085081000087C7F4422481450FFC800443E44225422483E402240 +7BF1:20403F7E489085080080FFFE0440139014501FF001007FFC44444FE44424400C +7BF2:20403F7E489085081010FEFE10107C7C1010FEFE10103FF800081FF800083FF8 +7BF3:20403F7E489085083FF821083FF821083FF80920FFFE09203FF801007FFC0100 +7BF4:20403F7E4890850823FC10801144066870B01128166810A4112416A0284047FE +7BF5:20403F7E489085081110211041108AA8144430405240927C1240154014FE1800 +7BF6:20403E7E4890FFFC010011F81100FFFE10001FF820003FFC0004492484940008 +7BF7:20403F7E4890850823F0151010E0071C704013F8104011F0104017FC284047FE +7BF8:20803EFE491088201FF0102025487EFC04401930E64E1990062018C007003800 +7BF9:20403F7E489085081FF0149012501FF00200FFFE08203FD8C84608C0080807F8 +7BFA:104010403F7E48909528104011FC7D2411FC11441DFC7050109013FE50102010 +7BFB:20403F7E489085087FFC04403FF824483FF800003FF80000FFFE111025080200 +7BFC:20403F7E48908508120067DC444447C4444457DC60000440044008421042603E +7BFD:20403F7E48908508140027DE4912811217D221126112A5D2251A25D42E102410 +7BFE:20403F7E489085083FF8244824483FF800903FFC208030482850242440D4830C +7BFF:20803EFE4910FFFC01003FF821083FF821083FF801047FFC0020FFFE08200460 +7C00:20803EFE4910BFF801003FF80100FFFE10101FF010101FF010101FF008201010 +7C01:20403F7E489085081020213C4120892017FE300050209120113E112012A0147E +7C02:20403F7E489085087FFC40A47FFC40845E9452945E64405446B459147FFC4004 +7C03:20403F7E489085280C4070FC13081090FC6030903B3E544255A4901810601380 +7C04:20803EFE4910BFF820083FF8200027F0241027F020002FF828884FF8480287FE +7C05:20403F7E4890850800803FFC041002203FFE208024802FFC308047F840809FFE +7C06:20403F7E50908A0801007FFE4022BE3C00207EF814081450142424D4440483FC +7C07:20403F7E4890850820401040FEFE212020403CFC2520242025FE445054888906 +7C08:20403F7E489085083FFC20043FFC220824102F78241024103F7C441044108810 +7C09:20403F7E48908548224013F81440004077FC100013F8120813F8280047FE0000 +7C0A:20403F7E4890850808207FFC08200FE008200FE00820FFFE11102FE8C1063FF8 +7C0B:20403F7E489085081FF010101FF010101FF410881470180E3FF824482448FFFE +7C0C:20403F7E489085080820FFA0083E7F42499449107F101C102A28492888440882 +7C0D:20403F7E489085083FF82108FFFE21083FF811101FF00400FFFE082007C07838 +7C0E:20403F7E489085081090109013FCFC9013FE10001DF8F10811F8110851F82108 +7C0F:20403F7E4890850800803FFE22203FFC22243FFC284028482F7048444B448C3C +7C10:20403F7E4890850808207F20083E7F4249847F1049107F100828FFA808440882 +7C11:20403F7E489085087FFC00001FF01010FFFE10101FF0048808503820CB180C06 +7C12:20803EFE49109FF010101FF010101FF010101FF00200FFFE08203518CA2617F0 +7C13:20403F7E4890850800047F0849105D6049047F0841105D6255045D0845108260 +7C14:20403F7E489085087FFC00003FF81010FFFE10103FF8048808503820CB180C06 +7C15:20403F7E4890850822207F2022203EFC08247F2449247F240844FF4408940908 +7C16:20403F7E48908508040C55704E4044405F7E44484E48554844487F8800880108 +7C17:20403F7E489095080BF040902A94129275121250142001007FFC05401930E10E +7C18:20403F7E489085083FF00110FFFC01103FF0092025482FE82388254829284108 +7C19:20803EFE4950804827FC204023F8FA4823F8224823F8224820102FFE211020B0 +7C1A:20403F7E489085087FFC444444447FFC0028FFFE08207F2449284D104A2A0846 +7C1B:20403F7E48908508220C2270FF4022403E40227E3E482248FF48224841488088 +7C1C:20403F7E4890850823F8120893F8420843F810002FFEE20027FC292422540488 +7C1D:20403F7E489085087FFC044028281FF02828CFE608200FE00100111025080200 +7C1E:20403F7E489085083EF822883EF800001FF011101FF011101FF00100FFFE0100 +7C1F:20403E7E4890FFFC04403FF824483FF810101FF010101FF00100FFFE01000100 +7C20:20403F7E489085283FF801001FF011101FF011101FF0111000003FF82448FFFE +7C21:20403F7E489085083E7C22443E7C22443E7C200427E4242427E4242427F42008 +7C22:20403F7E489085083E7C22443E7C22443F7C20842FF420442244218426542008 +7C23:20803EFE49109FF011101FF001007FFC10101FF010101FF010101FF008201010 +7C24:20403E7E4890BFF824483FF800001FF010101FF010101FF010101FF008201010 +7C25:20403F7E4890850800701F800200FFFE082037D8C4463FF8200827C8244827D8 +7C26:20403F7E4890850800907EA00444282817D02008DFF610101FF0082004407FFC +7C27:20403E7E489084403FF80440FFFE01003FF821083FF821083FF8082010102008 +7C28:20403F7E489085087CF844887CF842843E7C04403FF80440FFFE082010102008 +7C29:20403F7E4890850808202AA80820145022887FFC400402003FF8040808503020 +7C2A:20403F7E489085083E7C081048907EFE1428244A46863FF820083FF820083FF8 +7C2B:20803EFE4910BFF80108FFFE01083FF825483D7821083FF821083D7825484548 +7C2C:20403F7E48908508008078F849084A907860119812065DF8510851085DF8E108 +7C2D:20403F7E489085087FFC111029284544FFFE08203018DFF6101010101FF01010 +7C2E:20403F7E4890850808203EF808207EFC145022885FF410101FF010101FF01010 +7C2F:20403F7E489085081088108813FEFC8810F8388834F8508853FE908811041202 +7C30:20403F7E489085080820484049FC7D2441FC414479FC48A049204BFE48208820 +7C31:20403F7E48908508104808487EFC104810781E4812781248224823FE4A488484 +7C32:20403F7E4890850800203C4025FC25243DFC254425FC3C50249027FE54108810 +7C33:20403F7E4890850808107F2808443E82227C3E1022103EFE08107F1008100810 +7C34:20403F7E4890850801F801003FFE210221F02F0420FC292425285FFE42108408 +7C35:20403F7E489085081040FE7810887D5054207CD857067CF81088FE8810F81088 +7C36:20403F7E48908508200011F8FC0808F810083BFE5420953410A8112412A21040 +7C37:20403F7E48909FF820207FFEA4882BF4200027F8200027F8200047F8440887F8 +7C38:20403F7E4890850824102410FEFE24923C9024FC3CA424A4FEA8291045288246 +7C39:20403E7E4890911009203FFC20044FE808200FE000003FF821083FF821083FF8 +7C3A:20403F7E489085087FFE44429FF404403FF80440FFFE082011102FE8C1061FF0 +7C3B:20403F7E4890850821F8110811E8012873FC120412F4129412F412142A0847FE +7C3C:20403F7E48908508211027FCF91027FC291037FEE24823F822482FFEA2084218 +7C3D:20403F7E5090890802800440183067CC00003EF8228822883EF8082014502288 +7C3E:20403F7E489085083FFC22203FFC22402FF822483FFC22482FF846604A50B24C +7C3F:20403F7E4890854827FC104013F8824843F84A480BF81248F01027FC22102130 +7C40:20403F7E489085082080277CF4A425A436542088E7FC244427FC2444A7FC4404 +7C41:20403F7E4890850808207F3C08443E882A7C2A443E5408541C542A2848440882 +7C42:20403F7E48908508084014402AFE7F10A2103EFE22923E92289A24942A103010 +7C43:20403F7E489085083F2024203F3E21403F5024883F0800003FF824482448FFFE +7C44:20403F7E4890BFFC208027F0249027F020803FFC241027F0241027F022203FFC +7C45:20403F7E489085080A0033B822083A38238820883AB82288FFFE082010102008 +7C46:20803EFE491088207FFC09201FF831005FF091001FFC10003FF0082007C0F83E +7C47:20803EFE491080803FFC00000FF008107FFE40029FF40100069839E00690398C +7C48:20403F7E489085087F7C14207F20553855287F48086808587F4A084A0F6AF046 +7C49:20803EFE4910FFFE01003FF800001FF010107FFE48229FF401003FF80100FFFE +7C4A:20803EFE4910BEF812480A28124808801FFC30805FF890801FF810801FFC1000 +7C4B:20403E7E489080007FFC21084104BFFA21083558292835582108355829283558 +7C4C:20803EFE4910FFFC01003FF80000FFFE00023FF00100FFFE00107DFC44907C30 +7C4D:20403F7E4890850810487CFC10487C4811FEFE0010FC388454FC948410FC1084 +7C4E:20403F7E48908508247C3A0422281E1020FE3E124850085E7F5014B0229E4100 +7C4F:20403F7E48908508208011FEFE8821FE20883CF8248824F8248845FE54888904 +7C50:20403E7E489080203D2424A825FC3C4027FE24883D2426AA247044A855248A62 +7C51:20403E7E48909FF0149012501FF00200FFFE09203FF8CA2609200FE808D00E38 +7C52:20403F7E4890850827FE20A0F7BC24A437BC20A067FCA44427FC2444A7FC4404 +7C53:20803EFE4910A03817C01248815047FC524814042BFAE24823F8224823F82208 +7C54:20403E7E489088007F204920FFBE49447FA42A243E281028FF1022281C446282 +7C55:20403F7E48908508104011BC1114FD5411AC304039FC552451FC912411FC1104 +7C56:20403E7E489084203F280424FFFE122073A4122473A812287392121A17A6F842 +7C57:20403E7E4890BFF801007FFE41029D7408801FFC30805FF890801FF810801FFC +7C58:20403E7E489081243CA825FC24403DFE248825443E8A24F0242445FC54A88964 +7C59:20403F7E48908508100029F84408B8F810087DFE1020953450A81D24E2A24040 +7C5A:20803EFE491081F801003FFC21042FE0210827F8249027F024904FF849489FFC +7C5B:20403F7E48908508109010882BFE4448B83211CE7C90108897FE50481C32E1CE +7C5C:20403F7E4890850811FC1154FDFC102015FC182033FED08811FC102053FE2020 +7C5D:20403F7E489085087FFC10001FF808200FE079384FA87AA84AB8792A4AAA9C46 +7C5E:20403E7E4A90A7DE491297D2211265DAA5142FD000003FF80000FFFE11102308 +7C5F:20403F7E489095081080FEF811087EFC548454FC7C8410FC388454FC90481084 +7C60:20403F7E4890950808407E7C2440FF7C00047E7C42407E7C42407E7C4242463E +7C61:20403F7E48908508104010A0FD1012E814061BB832A8D3B81110111052A82444 +7C62:20403F7E4890850808201420223E5D4480A47724552877282210222855448882 +7C63:20403F7E4890FD7C44447C7C44447C7C41045FF441045FF455545FF44544592C +7C64:20403E7E4890912011282AA4FFFE122073A4122473A812287392121A17A6F842 +7C65:20803EFE491082800C6037D8C0063BB82AA83BB800003FF824883FF8248824B8 +7C66:20403F7E489085FC10202BFE4420B9FC11247DFC112495FC50201DFEE02047FE +7C67:20403F7E489085F840802FFC28840BF0E8882BF829402AA8317022A851608FFE +7C68:20403F7E4890850808201420223E5D4280847710551077102228222855448882 +7C69:20403E7E489087F8454824A827F80040EFFC2A1424882BF4210021F052108FFE +7C6A:20803EFE49108882511C5DD048905DD0445E7FF451145DD448945DD444547FE4 +7C6B:20403F7E4890850828503E7C4890FEFE1528264A5FF6149012501FF008201010 +7C6C:20403F7E4890950808287F24147E494855C87F7E08487F7E514855485D7E4340 +7C6D:20403E7E4890BF7E12241B3412A43FFC22403FF822483FF828442F7848428F3E +7C6E:20403E7E4890FFFC44447FFC10A0209045FE792013FC25207DFC012055FE8100 +7C6F:20403F7E489085087FFC10001FF808200FE07BB84AA87BA84AB87BAA492A9AC6 +7C70:20403F7E489085083EF822883EF822883FF831005FF091001FFC082007C0F83E +7C71:20403E7E4890BFF801007FFE41029D7401001D7048907EFCC9907EFC48907EFC +7C72:20403F7E4890850818FE24107E7C81447F7C55447F7C00447F7C55287F445582 +7C73:0100210811080910092001007FFC038005400540092011102108C10601000100 +7C74:06000100028004401830E10E1110092005407FFC0540092011102108C1060100 +7C75:081008104A102A102C100810FEFE18101C102A102A1048108810081008100810 +7C76:080008004AF02A902C900890FE9018901C902A902A90489288920912090E0A00 +7C77:0808081C4AE02A202C200820FE20183E1DE02A202A20482288220822081E0800 +7C78:100013F09490549058901090FC9033F03890549054909092108A108A10861082 +7C79:10401040944054405BFE1088FC88308838885508549090501020105010881304 +7C7A:084008404A402AFE2C800900FE7C18081C102A202A4048808902090208FE0800 +7C7B:01001110092001007FFC05400920111060080100FFFE0280044008203018C006 +7C7C:102010209420542059241124FD2431243924552455249124112411FC10041000 +7C7D:100011FC9404540858101020FC2033FE38205420542090201020102010A01040 +7C7E:1000100095FC544458441144FD44314439445644544490841084110412281410 +7C7F:080808084A082A082CFE0808FE0818081C882A482A4848088808080808280810 +7C80:10101010941054105BFE1010FC10311039105490549090501020105011881606 +7C81:0808081C4AE02A202C200820FE2019FE1C202A202A2048208820082008200820 +7C82:040004000FE01040208003600C187004111009207FFC054009203118C1060100 +7C83:101011109510551259121114FDD83110391055105510911211521192110E1000 +7C84:1008101C95E05500590011FCFD44314439445528552891101110122812441482 +7C85:10801080948054FC59541254FC54309438945524562490441044108411281010 +7C86:10201020942054A858A410A2FD2231203A245424542890081010102010C01300 +7C87:10801040944057FC58001000FDF03110391055105510911211121212120E1400 +7C88:100011F89448544858481048FC4831F838885488548890881088108813FE1000 +7C89:101010509450545058881088FD0432FA38485448544890481088108811281210 +7C8A:208020883CB020C020842C84307C0000111009207FFC054009203118C1060100 +7C8B:1040104095F854485888108AFD0A32263820542057FE90201020102010201020 +7C8C:100411E494245424582411E4FD043104390455E4542490241024102411441084 +7C8D:1008103C95E054205820103CFDE030203820543E57E09020102210221022101E +7C8E:080008FC4A842A842C840884FEFC18A01CA02AA02A904890890809080A040C02 +7C8F:082008204A202A202C2009FEFE2018201C202A502A504850888808C809240A02 +7C90:082008104A102AFE2C820882FE8218FE1C822A802A8048808880090009000A00 +7C91:1000100095FC552459241124FD24312439FC5500550091001102110210FE1000 +7C92:082008104A102A002DFE0800FE0418841C842A482A4848488850081009FE0800 +7C93:088808884A882A882DFE0888FE8818881C882AF82A8848888888088808F80888 +7C94:080008FE4A802A802C8008FCFE8418841C842A842AFC48808880088008FE0800 +7C95:10201020944055FC59041104FD04310439FC5504550491041104110411FC1104 +7C96:10201020942055FE58201020FC2031FC387054A854A891241124122210201020 +7C97:100011F895085508590811F8FD083108390855F8550891081108110817FE1000 +7C98:1020102094205420583E1020FC20302039FC5504550491041104110411FC1104 +7C99:102010209420542059FC1124FD243124392455FC552491241124112411FC1104 +7C9A:1080108094FE55005A201120FD2C31743BA45524553491281122110210FE1000 +7C9B:010001003FF80108FFFE01083FF80100292825482FE823882548292841088108 +7C9C:0100111011101FF0410441047FFC0000111009207FFC054009203118C1060100 +7C9D:100011FE95005500590011FEFD203120393C5524552491241124124412541488 +7C9E:100013FE9450545059FC1154FD54315439545554558C91041104110411FC1104 +7C9F:7FFC044004403FF8244824483FF80000111009207FFC054009203118C1060100 +7CA0:108810889488548859FE1088FC883088388857FE540090881084110412021402 +7CA1:100011FE95025502597A1102FD02317A394A554A554A917A11021102110A1104 +7CA2:0100410021FC0A441448E0A021102608111009207FFC054009203118C1060100 +7CA3:100011DC9554555459541154FD5433FE3954555455549154115412D41224144C +7CA4:02003FF8292825482FE82388254829283FF80000FFFE10001FF8000800500020 +7CA5:0100F93C09040D440B84793C412047E04120793C0B840D440904090451282110 +7CA6:0100111009207FFC054009203118C10610103EFC4210A290149008FE3010C010 +7CA7:10201010941055FE59001110FD103110397C5510551091101110121012FE1400 +7CA8:080009FE4A202A202C4008FCFE8418841C842AFC2A8448848884088408FC0884 +7CA9:10401040944455F458481050FDFE304038805584569890E010821082107E1000 +7CAA:0100111009207FFC054009203118C44604403FF804400440FFFE082010102008 +7CAB:100013FE94205420584011FCFD54315439545554555491541154114411141108 +7CAC:105010509450545059FC1154FD543154395455FC555491541154115411FC1104 +7CAD:082008204A502A482C840902FEFC18001C002AFC2A8448848884088408FC0884 +7CAE:1040102095FC5504590411FCFD04310439FC5520552291141108114411821100 +7CAF:100011F89508550859F81108FD0831F83908550855F89090109011121212140E +7CB0:1008103C95C05404594410A8FC0031F83810542057FE90201020102010A01040 +7CB1:000023F0909042941292E51222502420111009207FFC054009203118C1060100 +7CB2:08000F7C28043F44612892100C683184C000111009207FFC054009203118C106 +7CB3:100011FE9420542059FC1124FD2431FC3924552455FC912010A0104010B0130E +7CB4:100011FC9524552459FC1124FD2431FC3820542055FC90201020102013FE1000 +7CB5:04003FF820C82F2825483FF8254829283FF80000FFFE10001FF8000800500020 +7CB6:100011F89408540859F81008FC0833FE38205622557490A81124122210A01040 +7CB7:1080108094FE55025A42124AFD5230423BFE544254E29152124A104210541008 +7CB8:1088108897FE5488588810F8FC88308838F85488548893FE1000108811041202 +7CB9:1040102095FE540058881088FD5432223800542055FE90201020102010201020 +7CBA:1040108095FC5524592411FCFD24314439FC5490551093FE1010101010101010 +7CBB:100010FC948054F8588010F8FC8033FE39405524552891101108114411821100 +7CBC:080049122A120812FF242A24494888904248774892245A242F92221242128200 +7CBD:2040202023FEAA02700021FCF800200073FE6820A92821242222242220A02040 +7CBE:1020102095FE542058FC1020FDFE300038FC548454FC908410FC108410941088 +7CBF:100011FC9524552459FC1124FD2431FC382057FE547090A81124122210201020 +7CC0:1088108895FE548858881050FC50309439945698549090B210D21092108E1080 +7CC1:10401048948455FE582013FEFC8831243A425588541090621184101810601380 +7CC2:1088108897FE548858F81088FCF83088388857FE550091481184110011FE1000 +7CC3:100010FC948454FC588410FCFC0031FE388054FE552A924A1092112210541088 +7CC4:1040102095FE5502590211FEFD00310039FE55AA55AA92FE12AA12AA14A21086 +7CC5:200021FC2048A83073FE2052F894211072306820ABFE207020A8212426222020 +7CC6:100013FE9420544059FC1154FD54317439545554557491541154115411FC1104 +7CC7:108010BC9484550859FE1320FD20317C3990551055FE91101128112811441182 +7CC8:200023FE2022A920713C2120FAFE240071FC6904A9FC210421FC210421142108 +7CC9:200020882252AA227252228AFA0223FE70886944AA7A20882150202020D82706 +7CCA:1080109E949255D25892109EFC9231D23952555E5552915211D21022102A1044 +7CCB:210820882090ABFE700023C4FA54225473D46A54AA5423D422542244225422C8 +7CCC:2088208821ECA92A72282548F888217E760069FCA904210421FC2104210421FC +7CCD:210820882090AFFE71082108FA10229474A46F38A9082210221024A427BC2084 +7CCE:100011FE9500557C59541154FD7C31543954557C55109110117C1210121014FE +7CCF:200023FE2202AA0273FE2210FA92225472FE6A82AAFE228222FE2482248A2884 +7CD0:1028102497FE542059FC1124FDFC312439FC5524540893FE1088104810481018 +7CD1:200023DE2042A84273DE2210FA1023DE70426A52A94A214A2252204222942108 +7CD2:1088108897FE5488588813FEFC8031FC3B2455FC552491FC112411241124110C +7CD3:1000FE7810487C480048FE8682007CFC104454443828FE281010382854449182 +7CD4:100011FC94A4548858501020FCD83326382055FC5524912411FC102213FE1002 +7CD5:11041084948854005BFE1020FC2031FC3820542057FE900012A4125214521000 +7CD6:1020101095FE5510597C1114FDFE3114397C5510557C914411441244127C1444 +7CD7:2040208023F8AA0873F82208FBF8220873F86850A84827FE20A0211022082C06 +7CD8:1040102095FE5502580010FCFC4030A23B345458549493341052109013501020 +7CD9:101010509650557C58901010FCFE3300397C55445544917C1144110012FE1400 +7CDA:1048104895FE544858001048FD48314839FE5448544893C811481148117E1240 +7CDB:1020112494A857FE5A0210F8FC88308838F85420542091FC1020102013FE1000 +7CDC:010000803FFE22102F7C26382B5432922080249022A03FFC21C042A044989886 +7CDD:2040208821FCA908725223FEF8502188762668C0AB1020642388203020C02700 +7CDE:111009207FFC054019307FFC11101FF011101FF004403FF80440FFFE08201010 +7CDF:2090209027FEA89073FC2294FBFC229473FC6800A9F8210821F8210821F82108 +7CE0:1020101095FE5510597C1114FDFE3114397C5510559291541138125412921430 +7CE1:1040102095FC5488585013FEFC0031FC390455FC550491FC109010921112160E +7CE2:1088108897FE5488580011FCFD0431FC390455FC542093FE1050108811041202 +7CE3:200027BC2108AD2877BC2318FDAA294670006BF8AA08220823F82208220823F8 +7CE4:2288228827C8AA90729E27D4F82427D474546FD4AC5427C824482454246424C2 +7CE5:100011FE942055FE59521152FD523106380055FE542091FE1152115211521106 +7CE6:102013FE942055FC580011FCFD0431FC388857FE540091FC1104110411FC1104 +7CE7:100011FC950455FC590413FEFC0031FC392455FC552491FC102011FC102013FE +7CE8:200023BE20A2A8A270BE2388FA08223E722A6BAAA8AA20BE2088208A257E2202 +7CE9:10201050948855745A0211FCFD2431AC392455FC540090F8108810F8108810F8 +7CEA:00407C2045FC44887C5043FE7C20A5FC24203C20111009207FFC05401930E10E +7CEB:200023FC2294AA9473FC2000FBFE200073FC6A04ABFC20A2211423082D442182 +7CEC:200027FC24A4ACA477FC2048FBF8205077FE6840A9F8230825F8210821F82108 +7CED:202020882252AB267252228AFA2223FE70886944AA7A20882150202020D82706 +7CEE:201027D02510AFDE745027E8FD0427C470006BF8AAA822A822A822A82FFE2000 +7CEF:100011FC942057FE5A2211ACFC2031AC380057FE542091FC115411541154110C +7CF0:23FE222223FEAA2272FA22AAFAFA22AA72FA6A26ABFE220A23FE228A225A23FE +7CF1:52107EFE28447E28A2FE3E1020103E7C22103E10111009207FFC05401930E10E +7CF2:200023FE2248ABFE724822FCFAA422FC72A46AFCAA2023FE232A257A250A2906 +7CF3:553C1424FFA422427F00083CFF8408286B1049287F4410100920FFFE0920711C +7CF4:200011DC2844455490CC11545400384810FEFD9012FC389054FC949010FE1080 +7CF5:0820FFFE28207DFC44887C5041FE7C2045FC7C20111009207FFC05401930E10E +7CF6:540055DC7C44115454CC55547C00004854FE399012FCFC9038FC549092FE1080 +7CF7:208823FE2088ABDE725223DEFA5223DE72226BFEAAAA22FA2222227222AA2224 +7CF8:02000400082010403F800100061018087FFC0104092009101108210445040200 +7CF9:080008001000120022007C000800100024007E00020000005200490089000000 +7CFA:084008401040124022407C400840104024407E400240004452444944893C0000 +7CFB:00F83F000400082010403F800100061018087FFC010409201110210845040200 +7CFC:104010402040244045FCF844104420444844FC84048400845504550482280410 +7CFD:0800080010FE121022107C100810101024107E10021000105210491089500020 +7CFE:080408041044124422447C4408441044244C7E54026400445204490489040004 +7CFF:1000100021FC24444444F844104420444844FC44044400845484550482280410 +7D00:1000100021F824084408F808100821F84908FD00050001005502550280FE0000 +7D01:100013FC210425444524F8A8108820884850FC50042000205450548881040602 +7D02:080808081008120822FE7C080808100824487E28022800085208490889280010 +7D03:10821092209224924492F892109220924892FC92049200925492551281020202 +7D04:10401040208024FC4504FA04100421044884FC44044400045404540480280010 +7D05:1000100021FC24204420F820102020204820FC20042000205420542083FE0000 +7D06:100011FC202024204420F820102023FE4820FC20042000205420542080A00040 +7D07:10401040208024FE4500FA0010FC20084810FC20044000805502550280FE0000 +7D08:104010402040244045F8F848104820484948FCC8044800A854AA550A82060402 +7D09:1000100021FC24444444F944114421444944FE44044400845484550482280410 +7D0A:020001007FFC082007C01830E20E04201FC0018006103FF80108112025104208 +7D0B:10401020202027FE4488F888108820884888FC50045000205450548881040602 +7D0C:10401050204824484440F9FE105020504850FC500490009054925512810E0200 +7D0D:10201020202025FE4522F922112221224952FD4A058A010255025502810A0104 +7D0E:10401048204424444440FBFE104020404840FCA004A000905510550882040402 +7D0F:10081088204824484408F888104820484808FC0E05F800085408540880080008 +7D10:100011F8204824484448F848104821F84888FC88048800885488548883FE0000 +7D11:1000100021FE24104410F8201020206848A4FD22062200205420542080200020 +7D12:10201020205024504488F904120220884888FC88048800885488550881080208 +7D13:100011F8200824504420F81013FE20224824FC20042000205420542080A00040 +7D14:1020102020202BFE4820F124112421244924FDFC0424002054225422801E0000 +7D15:10101110211025124512F91411D821104910FD100510011255525592810E0000 +7D16:100411E4202424244424F9E4110421044904FDE4042400245424542481440084 +7D17:10201020202024A844A4F8A2112221204A24FC24042800085410542080C00300 +7D18:10401040204028404BFEF040108020904890F92009200248AA44AC8481FE0082 +7D19:1004101E21F025104510F910111021FE4910FD1005100108550A554A81860102 +7D1A:100013FC208424884488F890109C20844944FD4405280128AA10AA2884440182 +7D1B:10101090209024884508F904120425FA4888FC88048800885508550882280410 +7D1C:1000100020FC24004400F80011FE20204820FC4004400088548455FE80820000 +7D1D:1008103C21E024204420F820102023FE4820FC20042000205420542081FC0000 +7D1E:10201020202025FE4522FA24102020204850FC5004500050549054928112020E +7D1F:10201020205024504488F944122220204800FDFC040400085408541080100020 +7D20:01003FF801001FF00100FFFE020004201FC0018006103FF80108112025104208 +7D21:10401020202025FE4440F8401040207C4844FC44044400445484548481280210 +7D22:010001003FF8010001007FFE420284241FC0018006103FF80108112025104208 +7D23:1040104021F828484888F08A110A22264820F8200BFE0020A820A82080200020 +7D24:1004100E20F024804480F88010FE20884888FC88048800885488550881080208 +7D25:084008407F4008400E4078440844283C144008801F0002103FF8010815202210 +7D26:1000100021FC25244524F9241124212449FCFD00050001005502550280FE0000 +7D27:040025FC2488245024202450028C04201FC0018006103FF80108112025104208 +7D28:1088108820882908497EF308150821484928FD28050801085508550881280110 +7D29:102010202120252045FCF920122020204BFEFC20045000505488548881040202 +7D2A:1090109020902A904A92F2D4129822904A90FA900A900292AAD2AF12820E0000 +7D2B:088028882EF028842E84F07C020004201FC0018006103FF80108112025104208 +7D2C:102010202020242045FCF924112421244924FDFC052401245524552481FC0104 +7D2D:20082788408840889088E788240844109410F790009410A4A8A2A0BE85020200 +7D2E:042004207FA00E221522649E020004201FC0018006103FF80108112025104208 +7D2F:00003FF821083FF821083FF8020004201FC0018006103FF80108112025104208 +7D30:1000100021FC25244524F9241124212449FCFD24052401245524552481FC0104 +7D31:105010482048244047FEF880108020FC4944FD4405280128AA10AA2884440182 +7D32:10481148214825484548FBFE114821484948FD48057801005500550081FE0000 +7D33:10201020202025FC4524F924112421FC4924FD24052401FC5524542080200020 +7D34:10101010201025FE4512F914111021FC4944FD4405280128A910AA2882440482 +7D35:1040102020202BFE4A02F404100020004BFEFC20042000205420542080A00040 +7D36:10201020202025FC4420F820102023FE4820FC2004400048548455FE80820000 +7D37:10201020205024504488F9241212201049FCFC04040800885450542080100010 +7D38:10401020200025FE4420F8201020202049FCFC20042000205420542083FE0000 +7D39:100011FC204424444444F844109420884900FCFC048400845484548480FC0084 +7D3A:108810882088248847FEF888108820884888FCF8048800885488548880F80088 +7D3B:10201020202025FC4524F924112421244924FFFE042000505450548881040202 +7D3C:1090109020902BFC4894F09413FC22904A90FBFE08920092A91AA91482100410 +7D3D:10201010201025FE4502FA04108020884890FCA004C0008254825482807E0000 +7D3E:10201020205024884504FA12102020404988FC10042000445588541080600380 +7D3F:10201020204024404488F90413FE20024800FDFC050401045504550481FC0104 +7D40:10201020212425244524F92411FC20204820FD24052401245524552481FC0004 +7D41:1080108020FE25004620F920112C21744BA4FD24053401285522550280FE0000 +7D42:10401040207C28844988F250102020504888FB0608600010A808A8C080200010 +7D43:10201010201025FE4420F8201044208449F8FC1004200044548255FE80820000 +7D44:100011F8210825084508F9F8110821084908FDF805080108A908A90887FE0000 +7D45:100011FE210225024502F97A114A214A494AFD4A057A014A55025502810A0104 +7D46:10201020212424A444A8F82011FC20204820FC2007FE00205420542080200020 +7D47:10801080210029FC4A04F40411E421244924FD2405E401245404540480280010 +7D48:10201020204025FC4504F9041104210449FCFD04050401045504550481FC0104 +7D49:102010282024242045FEF8201070207048A8FCA8052402225420542080200020 +7D4A:102010202020242045FEF87010A820A84924FD24062200F85420542080200020 +7D4B:10201010201025FE4500F910111021104910FD2005280124AA44AAFE84420800 +7D4C:100011FC208424884450F820105020884B26FC2005FC00205420542083FE0000 +7D4D:10801088209C25704510FB101510211049FEFD100510011055105510817C0100 +7D4E:10401040209C25004640F84010BE21884A88FC88048800885488548880A80090 +7D4F:1020102021FC25244524F9FC1124212449FCFC2004240018543254CA83060002 +7D50:1020102020202BFE4820F02011FC20004800FDFC050401045504550481FC0104 +7D51:10201120212025FC4520FA20102023FE4870FCA804A801245524562280200020 +7D52:11041124212429244924F12415B4256C4924F92409240124A924AA2482040404 +7D53:1020102021FC24204420F82013FE20004820FC2005FC00205420542083FE0000 +7D54:100013FE202024204440F9FC110421044904FDFC050401045504550481FC0104 +7D55:100013FC204424444484F928121021FC4924FD2405FC01005502550280FE0000 +7D56:10401044224429484950F04017FE20904890FC900490009255125512820E0400 +7D57:1000100021FE25024502F97A114A214A494AFD4A057A0102550255FE81020000 +7D58:101010102210293E4922F044101020904890FB1009280128A928A94480440082 +7D59:100013FE2000240045FCF904110421FC4904FD0405FC01045400540083FE0000 +7D5A:100013FE204024404440F87C108420A44894FD04054400285408540883FE0000 +7D5B:108010F811082290206065986646A48825F02420244825FC2020212422A22040 +7D5C:08007F7C08243E2408447F540A8804201FC0018006103FF80108112025104208 +7D5D:1020102023FE24504488F90412FA20004BFEFC40048001FC5404540480280010 +7D5E:10401020202025FE4400F888110422024888FC88045000505420545080880306 +7D5F:10201020205024884504FA0211FC20204820FC2005FC00205420542083FE0000 +7D60:1020102021FE24404440F8FC108421844AFCFC84048400FC5484548480940088 +7D61:10401040207824884550F820105020884906FCF8048800885488548880F80088 +7D62:1080108021FC25044604F9E41124212449E4FD24052401E45504540480280010 +7D63:110410842088280049FEF088108820884888FBFE08880088A908A90882080408 +7D64:100013FE2050245045FCF954115421544954FD54058C01045504550481FC0104 +7D65:10901094209229124910F37E151021104910FD28052801285528554481440182 +7D66:10201020205024884504FA0211FC20004800FDFC050401045504550481FC0104 +7D67:100011FE21022502457AF9021102217A494AFD4A054A017A55025502810A0104 +7D68:10281024202428204BFEF020112421244924FBA809280110AA12AA2A84460082 +7D69:1090109020902A924994F098109021984A94FC9208900090A912A9128212040E +7D6A:100011FC210425244524F92411FC21244924FD54054C018C5504550481FC0104 +7D6B:040008201FF0102024487EFC020004201FC0018006103FF80108112025104208 +7D6C:1008103C21E024204420FBFE102020204820FDFC050401045504550481FC0104 +7D6D:111009207FFC0200FFFE08203218C4261FC0018006103FF80108112025104208 +7D6E:08007F7C114432440C44327CC20004201FC0018006103FF80108112025104208 +7D6F:10201010201025FE4420F824104420F84812FC22044401885410542880440182 +7D70:100011FE202024404488F90411FE20224820FC2005FE00205420542083FE0000 +7D71:1040102020202BFE4840F088110423FE4892FC900490009055125512820E0400 +7D72:102010202048248845F0F8201040208849FCFC24042000A85524562280A00040 +7D73:1080108020FC29084A90F060119826264820F9FC08200220ABFEA82080200020 +7D74:11041084208828004BFEF020102021FC4820FC2007FE00205420542080200020 +7D75:10201020205028884904F20210F820004800FBFE08200040A888A90483FE0102 +7D76:1040104020F825084610F9FC112421244924FDFC050001005502550280FE0000 +7D77:1080FBF010901990F0941154520C24241FC0018006103FF80108112025104208 +7D78:100011F82108250845F8F908110821F84908FD0805F80090549055128212040E +7D79:100010F82088248844F8F80011FC21044904FDFC0504010455FC550481140108 +7D7A:11841068203028C84B04F04013FE20A04920FBFC0D240124A934A92880200020 +7D7B:1080108020F825084610F9FC112421244924FDFC04500050549054928112020E +7D7C:1008103C21E024964448F830104821944824FC4C059400245444558480280010 +7D7D:100010FC208424844484F88410FC20004800FDFE050201025502550281FE0102 +7D7E:10281024202428204BFEF220122422244BA4FAA80AA80290AA92ADAA84460882 +7D7F:102810242024242045FEF820112020B248B4FC6804A801245622542080A00040 +7D80:1020102023FE24204420F9FC1124212449FCFC20047000A85524562280200020 +7D81:2100211E411247D29114E11427D841149112F7D20112111AA914A21082100410 +7D82:1040102023FE24004400F9FC110421044904FDFC04500050549054928112020E +7D83:1020112420A424A84420F9FC1104210449FCFD04050401FC5504550481140108 +7D84:1040102023FE2A024C04F1F8100020004BFEFC900490009055125512820E0400 +7D85:100011FC200424FC4404F9FC100023FE4A02FDF8048800885450542080D80306 +7D86:100013FE2020242045FCF924112421FC4924FD2405FC012054A0544080B0030E +7D87:100013FE2050245045FCF95411542154498CFD04050401FC5504550481FC0104 +7D88:11081088209025FC4424F82411FC21204920FDFE046200A2552A562484200020 +7D89:101C11E02020242047FEF8A81124222249F8FC88049000BE5502550282140408 +7D8A:1020102020202BFE4820F020112421244924FAAA08200050A850A88881040202 +7D8B:1040102023FE2A024C44F04013FE20404890F89009100120AA24AA4284FE0842 +7D8C:10001050204824844524F820105020884906FEF8048800885488548880F80088 +7D8D:1020102023FE28204820F3FE1202240449F8FC10042003FE5420542080A00040 +7D8E:1000100623B828884888F108113E23884888FA880A88013EA900AA80847E0800 +7D8F:1008103C23C028444A24F128110020404BFEF88809080390A860A85081880604 +7D90:110410842088241045FCF9041104210449FCFC500450009054925512820E0400 +7D91:100013FE22222A224A22F3FE122222624A72FAAA0B220222AA22AA0283FE0202 +7D92:1008103C21C024044544F8A8100021F84810FC2007FE00205420542080A00040 +7D93:100011FE200028924924F248112420924800FDFE042000205420542083FE0000 +7D94:1000100CFEF02820444482F87C100024FEFE201240507C540492051228501020 +7D95:1020102020202BFE4820F020102021FC4840F82008A40282AA8AAA8A84780000 +7D96:1004100E23B828884888F128112E23A848A8FAA80AA8013EA900AA80847E0800 +7D97:100013FE22022A524A8AF306120222FA4A8AFA8A0A8A02FAAA8AAA02820A0204 +7D98:1040104020FC24884550F82010D8232648F8FC2004F8002057FE542080200020 +7D99:10101110211025924554F91011FE21104938FD54059201105510551081FE0000 +7D9A:1020102023FE282049FCF00013FE22024C04F89008900090A890A9128112020E +7D9B:100013FC204429444944F284109421084A40F82008A40282AA8AAA8A84780000 +7D9C:1040102023FE2A024800F1FC100020004BFEF82009280124AA22AC2280A00040 +7D9D:10881088208828884BDEF0881088219C49DCFAAA0AAA04C8A888A88880880088 +7D9E:1008103C21E028204BFEF0A810A820A84BFEFCA804A803FE5420542081FC0000 +7D9F:1040102023FC2A044A04F3FC120022284A24FBFE0A200250AA50AC8885040A02 +7DA0:108010F82088290849F0F010101023FE4820FA22097400A8A924AA2280A00040 +7DA1:1040102023FE24004400F9FC110421044904FDFC042000A85524562280A00040 +7DA2:100011FC212425244574F92411FC21044974FD54055401745504560482140408 +7DA3:1020112420A8242045FCF84013FE20884904FEFA0488008854A854928082007E +7DA4:7E7C12442A484444BE44225422483E00044008801F0002103FF8010815202210 +7DA5:100011FC2124292449FCF124112421FC4800F8000BFE0088A888A88881080208 +7DA6:08207FFC08200FE008200FE00820FFFE14502888DF0602103FF8010815202210 +7DA7:1040102023FE240045FCF90411FC200049FCFC08041003FE5420542080A00040 +7DA8:1088108823FE24884488F8F81088208848F8FC88048803FE5400548881040202 +7DA9:1040102023FE2A024D04F10011DE22524A52FB520C9A0094A910A9128212040E +7DAA:1020102023FE242045FCF82013FE200049FCFD0405FC010455FC550481140108 +7DAB:10481044205E25E04428F812106A21964848FC5E05E0002454285412806A0186 +7DAC:101C13E020842A444948F11017FE24024800FBF809080110A8A0A84081B0060E +7DAD:10A01090208025FE4510FB1015FC21104910FDFC05100110551055FE81000100 +7DAE:104008403E7E228823503E2020584186844008801F0002103FF8010815202210 +7DAF:1080108021FC25044684F8F4114420444BFCFC440554015455F4540480280010 +7DB0:1040102023FE2A024C04F1F81108210849F8FD00050001FC5504550481FC0104 +7DB1:100013FE22022A8A4A52F3FE122222224AAAFAAA0AAA02FAAA02AA02820A0204 +7DB2:100011FE2102218A4952F9FE1122211221FE4942F542017A55025502550A8104 +7DB3:100013DE22522A524A52F3DE125222524A52FBDE0A520252AA52AA52855208A6 +7DB4:100013DE2042294A4884F14A125224204800FBDE08520152A894A94882540422 +7DB5:1008103C23C028444A24F128110020204BFEF87008A800A8A924AA2284200020 +7DB6:100011FC2124292449FCF124112421FC4820FBFE087000A8A924AA2280200020 +7DB7:1040102021FE24004488F888115422224800FC2005FE00205420542080200020 +7DB8:10201020205024884504FAFA100021FC4954FD5405FC0154555455548104010C +7DB9:1088108820E8252C452AFAA8104820A0491EFE0004FC00845484548480FC0084 +7DBA:1020102021FC24504488F90413FE200849E8FD28052801E85528540880280010 +7DBB:1040102023FE2A024C04F00013FE20204820F920093C0120AAA0AA60843E0800 +7DBC:1040108021FC25244524F9FC1124214449FCFC90051003FE5410541080100010 +7DBD:10201020203E242045FCF90411FC210449FCFD24042003FE5420542080200020 +7DBE:1020102021FC28204820F3FE108821444A42F8F809880250A820A85081880606 +7DBF:1020104021FC290449FCF10411FC20204820FBFE0A220222AA2AAA2480200020 +7DC0:1020102023FE242045FCF82413FE202449FCFC4007FE008455C8543080CC0302 +7DC1:1020102023FE242045FCF82413FE202449FCFC200520013EA920AAA0827E0400 +7DC2:1020112221222A244850F088130420224820F92409240228A850A88881040602 +7DC3:10881088208824884554FA22144220204820FD20053C0120AAA0AA60843E0800 +7DC4:100011FC2104250445FCF904110421FC4800FD1205D40118551055528192010E +7DC5:20002FC044BC44A494A4E7A424A444A897A8F4A8049015D0AEA8A0A880C40082 +7DC6:100011FC210425FC4504F9FC1080208049FEFE4A044A0092A922AA4280940108 +7DC7:1092109221242A484924F0921092200049FEFD22052201FE5522552281FE0102 +7DC8:1020102021FC24204420FBFE1088205049FCFC20042003FE5420542080200020 +7DC9:100013FE202028204BFEF222122223324AAAFAAA0B760266AA22AA22822A0204 +7DCA:7EFC48447E4442287E1048287EC604201FC0018006103FF80108112025104208 +7DCB:1090109020902B9E4890F0901090239C4890F8900890039EA890A89080900090 +7DCC:101C11E0202028204BFEF0A8112422424840FBFE08880108A8D0A83080480184 +7DCD:101C13E022202BFE4A20F292130A220649FCFD04050401FC5504550481FC0104 +7DCE:1014101220102BFE4810F01013D222524A52FA540BD4000CA86AAB8A81160022 +7DCF:10901090210829484A44F492110823FC4844F82008A40282AA8AAA8A84780000 +7DD0:4000400C7EF080207C4444F864105424FEFE4412A4509454FE92051228501020 +7DD1:100011F82008280849F8F008100823FE4820FA22097400A8A924AA2280A00040 +7DD2:1020102221FA24244428FBFE1020204048FCFD84068400FC5484548480FC0084 +7DD3:1088108823FE288848A8F02011FC21244924F9240BFE0020A850A88881040202 +7DD4:1020112420A428A84820F3FE120222024AFAFA8A0A8A028AAAFAAA02820A0204 +7DD5:1040102023FE24884450F82010D823064888FCF80488008854F8550881080208 +7DD6:1020102221FA24244428FBFE1024204248FCFD84068400FC5484548480FC0084 +7DD7:11001100213C29244BA4F124113C23A44B64FD24093C0124A924A924813C0124 +7DD8:1008100C200A2BFE4A08F20812E8220A4A0AFAEC0AAC02A8AAEAAA1A82260442 +7DD9:1088108823FE248844F8F82011FC21244924FDFC042003FE5420542080200020 +7DDA:1040108021FC290449FCF10411FC20204832FBB408A80128A924AA2484A20040 +7DDB:100013FE2020244045FCF954115421544954FD2C042003FE5450548881040202 +7DDC:1000200C7CF044207C4444F87C10102410FEFE12925092549292971210501020 +7DDD:100011F82108290849F8F00017FE210849F8F90809F80108A93EAFC880080008 +7DDE:1080133822282A284BA8F2461200227C4BA4FA240A2803A8AE10AA2882440282 +7DDF:1008103C21E028204BFEF02011FC212449FCFD2405FC002055FC542083FE0000 +7DE0:1080104023FC28004908F09017FE24424844FBFC0A440244AA54AA4880400040 +7DE1:100011FC210425FC4510F9FE1110214A4986FC0005FC010455FC550481FC0104 +7DE2:1088108823FE24884488F80011FC21244924FD2405FC01245524552481FC0104 +7DE3:108010FC210429F84808F3FE104020A24B34F85808940334A852A89083500020 +7DE4:1048114821482BFE4948F1481178210049FEF8200BFE0070A8A8A92486220020 +7DE5:1100117C21442A444A44F67C1A1022104AFEFA380A540254AA94AB1282100210 +7DE6:100011FC2124252445FCF924112421FC4820FC10045401425542554A82380000 +7DE7:1088104820502BFE4850F05011FC21544954FD8C050401FC5504550481FC0104 +7DE8:1040102021FE25024502F9FE1100210049FEFDAA05AA02FEAAAAAAAA84A20086 +7DE9:101E13E0204425244488F9FC104020404BFEFC8004FC01445528561080680186 +7DEA:1100117E211025104590F95E1322252A4926FD420552010C55045504817E0100 +7DEB:1080108020FC29544AD4F0B4112C22444894F908084000A4AAAAAA8A84780000 +7DEC:100017FE204028804BFCF294129422F44A94FA940AF40294AA94AA9483FC0204 +7DED:100013FE22222BFE4A22F3FE100021FC4904FDFC050401FC5504550481140108 +7DEE:1100110021FE2A004DFCF10411FC210449FCFC8004FC01085690546081980606 +7DEF:1040104021FC28844BFEF00011FC210449FCF8200BFE0020AA20ABFE80200020 +7DF0:104010A021102A084DF6F00013C422544A54FBD40A540254ABD4AA44825402C8 +7DF1:1100117821082A084AFEF6401A40227C4A90FA100AFE0210AA28AA2882440282 +7DF2:1010101023902A904A94F3B212B222D24B90FA940A840388AA90A82080400180 +7DF3:010000803FFE22003FBC22142F9422143FA4220C24202FC041085FFC88881184 +7DF4:1020102023FE242045FCF92411AC21744924FDFC0420007054A8552482220020 +7DF5:1000108822522A224A52F28A120223FE4888F9440A7A0088A950A82080D80306 +7DF6:110011FE21102A104AFEF292169222FE4A92FA920AFE0290AA50AA2082580286 +7DF7:100013FE2222242045FEF82011FC212449FCFD2405FC002057FE542080200020 +7DF8:100013FE2050245045FCF9541154215449FCFC20042001FC5420542083FE0000 +7DF9:100011FC2104290449FCF104110421FC4800FBFE08200120A93CA92082A0047E +7DFA:100010FC2084248444F4F894109421FE4902FD7A054A014A557A5502810A0104 +7DFB:2008200847C84210921EE4A427D441149114F7D401141108A9C8AE1484140022 +7DFC:100010F82088248844F8F888108820F84800FDFC055401545554555483FE0000 +7DFD:10201020203E24204420F9FC110421FC4904FDFC050401FC5400548881040202 +7DFE:100011FE2100257C4554F954117C21544954FD7C05100110557C5610821004FE +7DFF:1040109021082BFC4804F00011F821084908F9F808400024AAA2AA8A84880078 +7E00:100013DE22422A424A42F3DE1200223E4BD2FA120A1403D4AA08AA1482240242 +7E01:100011FC200428FC4804F3FE104020A24B34F85808940334A852A89083500020 +7E02:10881048205025FC4504F904110421FC4820FC10045401425542554A82380000 +7E03:100013FE20222520453CF92012FE240049FCFD0405FC010455FC550481140108 +7E04:100011FC212425FC4524F9FC102021FC4924FDFC052401FC542054228022001E +7E05:100C100A20082BFE4A08F3F8124A224A4BEAFAAC0AAC024CAAAAAB0A82160422 +7E06:2100213C4100410091BCE5642524453C9524F1240124113CA924A100817E0100 +7E07:1040102023FE2A024C04F1FC100021FC4904FDFC050401FC5504540083FE0000 +7E08:08202AA44D28145022887FFE420284241FC0018006103FF80108112025104208 +7E09:100013FC20902A944998F09017FE200049F8FD08050801F85508550881F80108 +7E0A:11041084208828004BFEF000108821044A02F9FC09540154A954A95487FE0000 +7E0B:10101220217C25444444F87C13402140497CFD440544017CA944AA80847E0000 +7E0C:124411242128247E4410FB5411542154497CFD1405200120A940AA80847E0000 +7E0D:1020101021FE24844448F9FE110222244810FDFE0440007C5444548480940108 +7E0E:100011FC210425E44524FBFE120221FC4904FDFC050401FC5504550481140108 +7E0F:08783E48228E2A007EF822482A3046CC844008801F0002103FF8010815202210 +7E10:1080108021FC2A444954F1F4108421284A90F9FC0A440554A9F4A88481280210 +7E11:10881050200025FE4450F9FC105423FE4854FDFC045000D85554565280500050 +7E12:10841044204825FE4420F8FC102021FE4840FC8004FE01105610541081FE0000 +7E13:100011FE21102520457CF944117C2144497CFD1005100154A952AA9282500420 +7E14:11F810882070298C4800F3DE1252218C4A52F8200BFE0070A8A8A92486220020 +7E15:100010F820A824A844D8F88810F820004800FDFC055401545554555483FE0000 +7E16:1040102023FE2A024C24F1FC102021FC4820FBFE082001FCA904A90481FC0104 +7E17:1040102023FE280049FCF10417FE210449FCFC5204940188568854A480C20080 +7E18:101E13E0212228944840F08811F0202048C4F9FE08220020ABFEA85080880306 +7E19:1088108821FE24884400F9FE1088208848F8FC8804F80088549E55E880080008 +7E1A:101E11E0202225124494F880102021CE4902FD0205CE01025502550281FE0102 +7E1B:1028102423FE242045FCF92411FC212449FCFD24040803FE5488544880480018 +7E1C:100010FC2084248444FCF80011FE210249FEFD0205FE010255FE544880840102 +7E1D:1020102023FE242045FCF90411FC210449FCFD0405FC010457FE548881040202 +7E1E:1040102023FC280049F8F10811F820004BFCFA040AF40294AAF4AA0482140208 +7E1F:100013FE220022FC4A00FBFE12A822904AC8FA860A0813FEAA88A44884080818 +7E20:1000FE7810487C480048FE8682007CFC2044444478281428FE10542892443182 +7E21:1040102023FE2A424820F1FC108820504BFEFC20042001FC5420542080200020 +7E22:0020792448A849FC48407BFE488849444A8A78F0482449FC482049244A229860 +7E23:00007C0C44F07C2044447CF844107C2444FEFE12105054545292931250502020 +7E24:1020102023FE242045FCF82013FE20404888FDF0042403FE5422552482A20040 +7E25:1020102023FE242045FCF84013FE20884934FEE2042001FC547054AC83220020 +7E26:108010A2211225144680F8FE110821084B28FD2E0528012855285558814E0180 +7E27:1110111E21222A544A08F6941AE222884A88FABE0A8802ACAA2AAA4A82280210 +7E28:100011FC210425FC4504F9FC1020212448A8FC2007FE0090549055128212040E +7E29:1100111023DC2A544D54F288110822F44C02F8000BFC0040A950AA4885440080 +7E2A:100011FC212425FC4524F9FC10A820A84BFEFCA804A801FCA820ABFE80200020 +7E2B:1020147C228429484830F0CE1610227C4A10FA7C0A1002FEAA10AA1085FE0800 +7E2C:100C100A200823FE4A08FA48126A224A4BFAFA4C0A4C12ECAB5AA44A84D60822 +7E2D:1040102023FE28004954F124115421FC4820FBFE0A420292AAFAAA0A82020206 +7E2E:1020101023FE2A024880F0FE111023204D7CF9440944017CA944A944817C0144 +7E2F:1040102023FE2A024800F1FC102021FC4924FDFC052401FC5400548881040202 +7E30:11081108222824AE44A8F928137E25004908FD28052E01285558554881860100 +7E31:1124112422242C244954F14A129226104A10FA500A5C0250AA50AAB0829E0300 +7E32:100011FC212425FC4524F9FC1040208849F0FC20044403FE5422552482220060 +7E33:102013FE202025FC4524F9FC112421FC4822FDFE040801FE5508548880280010 +7E34:102013FE204820F04820FBFE1242209049F8F828092011FCAA20A7FE80200020 +7E35:100011F8210829F84908F1F8100023FC4A94FBFC080001F8A890A86081980606 +7E36:08207E2008F8FF2814287F6A082AFF560A8204200FC002103FF8010815202210 +7E37:102011FC21242BFE4924F1FC102021FC4924FDFC044003FE548855D08070038C +7E38:1088108823FE24884400F9FC110421FC4904FDFC042003FE5450548881040202 +7E39:100013FE205025FC4554F95411FC200049FCFC0007FE002054A8552482A20040 +7E3A:1010101022FE2510457CF854107C2354497CFD1005FE0110A910AA90847E0000 +7E3B:010000803FFE22102F7C26382B543292210827F0206023842FFE404245488884 +7E3C:12101110211027BE4A40FA0013BE228A4A88FAA80AAE12A8ACA8A5A8885E1080 +7E3D:1020104021FC2524457CF98C115421244954FDFC0420001055545542814A0238 +7E3E:102013FE202025FC4420FBFE100021FC4904FDFC050401FC550455FC80880104 +7E3F:1040108821FC29084A52F3FE105021884E26F8C00B100064AB88A83080C00700 +7E40:1020122223FE28904888F1FE1310251049FEFD10051001FE5510551081FE0100 +7E41:20203F20403EBE482AA8FF284A107F28044608801F0002103FF8010815202210 +7E42:1040102023FE28204848F2F21124225248F8FC08042003FE5420542080200020 +7E43:1020122222222BFE4800F3DE125222524BDEFA520A5203DEAA52AA52855A08A4 +7E44:7F7848485F4C64805F784A4851307F4C044008801F0002103FF8010815202210 +7E45:112412482124280049FCF12411FC212449FCF8200BFE0070A8A8A92486220020 +7E46:100013DE20422A52494AF252102820C44B12F86009880032A9C4A81880600380 +7E47:00000E0CF0F02220924444F820103C2450FE1012FE501054549255125C506420 +7E48:10081388209028A448BEF38A1208223E4A2AFBAA08AA00BEA888A88A82BE0102 +7E49:11FC110421FC250445FCF90411FC20504954FCD804D80154565254908092010E +7E4A:1088108C23EA28884888F7FE1008214A494AFD5A0B6C014CA94AA9EA87160022 +7E4B:1078FE4810487C8654787C485430FECE144008801F0002103FF8010815202210 +7E4C:1040108023FC2A944A64F29413FC20904908FA840CFA0108AA90A86081980606 +7E4D:1020102021FC242447FEF82411FC202049ACFD74052401FCA964AAB4832C0424 +7E4E:1110111421D22A504A7EF550109022A84928F9440A440482A808AAA482520452 +7E4F:100013DE22522BDE4A10F25211CE20004888FBFE08880088ABFEA88881040202 +7E50:1020102023FE282049FCF12411FC212449FCF8220BFE0042A824AAA2828A0478 +7E51:101811E020402BFE4888F174125220704800FDFC05040174555455748104010C +7E52:1104108820002BFE4A22F2AA127222224BFEF80009FC0104A9FCA90481FC0104 +7E53:100011F8210821F84908F9F8100027FE4A40FBDC0A5413D4AA68A7C880540062 +7E54:1110109423D228124A50F19017FE20104BD2FA520A5403D4AA4AAA4A83D60022 +7E55:1088105023FE282049FCF02013FE212448A8FBFE080001FCA904A90481FC0104 +7E56:2288228847C84290929EEFD4202447D49454F7D4045417C8AC48A454846404C2 +7E57:1020112420A82BFE48A8F124122221044904F9DE0A440554A89EA90482040404 +7E58:100013FC204828304BFEF052109423504820FBFE0A52028AAB76AA5282720206 +7E59:103C13E0212428A84BFEF0A81124220249FCFD24052401FC5524552481FC0104 +7E5A:1020102021FC24204554F888110422FA4888FCF8048800F8542054A881240060 +7E5B:081008107F1E08103E7E0842FF7E22427C7E085212107F7E08102A1049101810 +7E5C:1088105023FE245045FCF954118C21744904FDFC040803FE5508548880A80010 +7E5D:13DE125223DE2A524BDEF20212F222924AF2FA920AF20292AA92AB3282020206 +7E5E:1020102021FC28204BFEF108139C21084988FE3E080003FEA890A8908112020E +7E5F:100013DE22522A524BDEF00011FC212449FCFD2405FC002057FE542080200020 +7E60:01002488242443E4000024241212A0A0A4A41C1C04201FC002103FF809201310 +7E61:204023F8404847FE9048E3F820404554975CF44407FC1444AF5CA55485540844 +7E62:102011FC212425FC4420FBFE100021FC4904FDFC050401FC550455FC80880104 +7E63:102011FC20242BFE4824F1FC102023FE4800FDFC052401FC552455FC800003FE +7E64:0820FFFE08201FF01490125011301FF00400FFFE12502F88C2261FF009481320 +7E65:102013FE202029FC4800F1FC110421FC4888FBFE080001FCA904A90481FC0104 +7E66:2000277C41444144917CE7102410447C9454F7540154117CA910A1148AFE0402 +7E67:100011FC20202BFE4A22F1AC102021AC4800FDFC040003FE5440548881FC0084 +7E68:10101210217C241044FEF844132821FE4910FD7C051001FE5510551082FE0400 +7E69:100011FC2154255445DCF85011DC21544954FDDC0554015455DC55508052003E +7E6A:10201050208829744A02F1FC112421AC4924FDFC040000F8548854F8808800F8 +7E6B:0878FFC808483E862B783E482A28FF9049287F4604201FC002103FF809201310 +7E6C:1020102023FE29244924F2AA17FE200049FCFD04057401545574550481FC0104 +7E6D:0820FFFE082000007FFC4924492455FC5DAC49FC55245D3C41CC6B0441144008 +7E6E:100013FE200025FC4524F9FC112423FE4800FDFC052401FC552455FC800003FE +7E6F:100013FC22942A944BFCF00017FE20004BFCFA040BFC00A2A914AB088D440182 +7E70:11FC1104210429FC4800F3DE125222524BDEF8200BFE0070A8A8A92486220020 +7E71:108813FE208829004BFCF55410D423244854F8940B480020A8A4AA8A828A0478 +7E72:110011DE224A2C8A4BEAF2B612A423F44ABEFAA40BE402BEAAA4AAA482240464 +7E73:2108220847C8445097DEE46427D442149114F7D4021413C8AA48A454855408A2 +7E74:3E1022FE3E4420287EFEA2103EFC2210045008801F0002103FF8010815202210 +7E75:102017FE20002BFE4A02F2FA128A23FE4800F9FC090401FCA904A9FC800007FE +7E76:1040102021FC24884450FBFE100021FC4904FDFC050401FCA820AA94828A047A +7E77:109013FC229423FC4A94FBFC100023FC4A00FAF80A0013FEAD20A51485480986 +7E78:10881448225028FC4820F050169422384A50FA980A340254AA90AA2085FE0800 +7E79:100011FC215425FC4420F9FC102023FE4888FC5005FC002057FE542080200020 +7E7A:1210121023D02C5E48A4F3D4105420544BC8F848085407E2A800AAA482520452 +7E7B:100011FC20202BFE4A22F1AC102021AC4800FBFE082001FCA954A9548154010C +7E7C:1044128422EA2A4E4AA4F2EE122223FE4A44FA840AEA024EAAA4AAEE822203FE +7E7D:1040102023FE2A0249FCF148125021FC4B04F9FC090401FCA904A9FC80880104 +7E7E:1010107C2254257C4510F8FE1000237C4944FD7C0540017C5544557C8280047E +7E7F:100813E822882BEE4A28F3F4128223E24800F9FC09540154A954A95487FE0000 +7E80:112811AA216C2A284AFEF64416282AFE4A10FA7C0A1002FEAA10AA2882440282 +7E81:101C11E020202BFE4820F1FC11AC217449FCFC2005FC002057FE54008154022A +7E82:20403E7E4890BFF8248822483FF80200FFFE092012502F88C2261FF009481320 +7E83:2080204047FC411090A4EF58255445529B58F000020813F8AA08A3F882080408 +7E84:108813FE208828204A3CF144103820D64B38F910097C0110A97EA910831004FE +7E85:244424E448A84AAA9EEEE4A42AAA4EEE9242F0400FFE10E0A950A2488C460040 +7E86:11FC112421AC252445FCF82011FC20204BFEFD54062A002055FC542083FE0000 +7E87:920054FEFE10302054FC9284208444FC788410FC2484FE8410FC544892843102 +7E88:1100113E21082FD0493EF12213A2203E4822FBBE0AA202A2AABEAB8082940022 +7E89:108811DC20882BDE4888F154122221FC4904FDFC050401FC550455FC80880104 +7E8A:1020101021FE2528457CF92811FE2110497CFD54057C0154A97CAA0082440482 +7E8B:13FC104021F8290849F8F10817FE24424AA4FA8A0C7A0080A9F8AA888070038E +7E8C:102013FE202029FC4800F3FE125223FE4904FDFC050401FC550455FC80880104 +7E8D:1FF011101FF011103FF82AA83EF82AA83EF808801F0002103FF8010815202210 +7E8E:1088108C23EA28884888F3FE1148236A494AFB6A094C036CA94AA96A87960022 +7E8F:202027FE440045FC9524E5FC252445FC9420F5FC042017FEAD24AAFA882013FE +7E90:1200113E27C828104ABEF262142220BE4AA2FABE09220122AABEAA8084140022 +7E91:1040107C20402BFC4A44F3F0124422FC4AA8FAF80AA802F8AA00ADFC85540BFE +7E92:13FE120022FE22924AFEFA9212FE22104AFEFA100BFE12AAAA10A2FE841009FE +7E93:13DE125223DE2A524BDEF25213DE218C4A52F8400FFE0088A990A86080D80304 +7E94:11F0121027FC2A044BFCF22413B8222249FEFA100FFC0244ABFCA8D0814A063E +7E95:102013FE200029DC4954F1DC108823FE4888FBFE088807FEA894A98886A400C2 +7E96:1148114C22AA28084FFEF1481368214A4B6AF94C0B6C0148A96AAB9A80260042 +7E97:122213FE209029FE4B10F5FE111021FE4910F9FE090003FEAA8AAB7682520276 +7E98:252827BE494847BE9318E5AA294643FC9204F3FC020413FCAA04A3FC81080204 +7E99:200023FE4252425293FEE1082154425E97B4F11E025417DEA814A554855E0010 +7E9A:13DE100023DE2A524B5AF252102023FE4A50FBFE0A5203FEAA92AADC829204CE +7E9B:0100FFFE01001FF01210FFFE10901FF0001C3EE022242AF82A24FFFE2A5459B2 +7E9C:1790151E27A82C844FBEF52A17BE20004BF8FA080BF80208ABF8A8A08124061C +7E9D:11FC112421FC29244BFEF2AA13FE22AA4BFEF88809F00064ABFEA92482220060 +7E9E:444444E44A0A4EEEA404AAEACE0E40E04AAA8AEAA040E0240522A50AA90800F8 +7E9F:10001000200024004400F800100020004000FC00400000001C00E00040000000 +7EA0:10041004208424844484F88410842084408CFCB440C400841C04E00440040004 +7EA1:100011FC202024204420F820102023FE4020FC20402000201C20E02040A00040 +7EA2:1000100021FC24204420F820102020204020FC20402000201C20E02043FE0000 +7EA3:100810082008240845FEF808100820084088FC48404800081C08E00840280010 +7EA4:1008103C21E024204420F820102023FE4020FC20402000201C20E02040200020 +7EA5:10401040208024FE4500FA0010FC20084010FC20404000801D02E10240FE0000 +7EA6:108010802080210445FEFA04140420844044FC24002400041C04E04440280010 +7EA7:100013FC208420884888F890109C20844144F944412801281A10E22844440182 +7EA8:104010402040244045F8F848104820484148FCC8404800A81CAAE10A42060402 +7EA9:10201010201025FE4500F900110021004100FD00410001001D00E20042000400 +7EAA:1000100023F820084808F008100823F84208FA00420002021A02E20241FE0000 +7EAB:1000100023FC20444844FA44124422444484F884408401041904E20444280810 +7EAC:10201020202025FE4420F82010FC20204020FDFE402200221C2AE02440200020 +7EAD:1000100021FC24004400F80013FE20204020FC40404000881D04E3FE41020000 +7EAE:10401040204020404BFEF840108020904090F920412002481A44E48441FE0082 +7EAF:10401040204023FC4840FA48124822484248FBF8404800401842E042403E0000 +7EB0:10101110211025124512F91411D821104110FD10411001121D52E192410E0000 +7EB1:10401040204021484944FA42124224484048F848401000101820E04041800600 +7EB2:100013FC220422044A94FA54122422244254FA54429403041A04E20442140208 +7EB3:10201020202020204BFEF222122222224252FA4A428A03021A02E202420A0204 +7EB4:1008103C21E024204420F820102023FE4020FC20402000201C20E02041FC0000 +7EB5:11101110211021104910F910111021104110FAA8426802281C44E44448841102 +7EB6:1040104020A020A04910FA08140621104120F940418001001904E10440FC0000 +7EB7:10101090209020884908F904120425FA4088F888408800881908E10842280410 +7EB8:1008103C23E022204A20FA20122023FE4220FA10421002121A0AE28A43060202 +7EB9:10801040204027FC4910F110111021104110F8A040A0004018A0E11042080C06 +7EBA:10401020202027FE4480F880108020FC4084FC84408400841D04E10442280410 +7EBB:104010202020240045FEF902120420004000FC00400000001C00E1FE40000000 +7EBC:100411E4202424244424F9E4110421044104FDE4402400241C24E02441440084 +7EBD:100011FC204424444444F844104421FC4084FC84408400841C84E08447FE0000 +7EBE:100011F8200824504420F81013FE20224024FC20402000201C20E02040A00040 +7EBF:105010482040245C45E0F840105E23E04044FC48403000221C52E08A43060002 +7EC0:110811082108250847FEF908110821084108FDF8410801081D08E10841F80108 +7EC1:10481248224822484A48F7FE124822484248FA48427802001A00E20043FE0000 +7EC2:10501048204820404BFEF880108020FC4144F944412801281A10E22844440182 +7EC3:1040104027FC20804880FBE01120222043FCF820412801241A22E42240A00040 +7EC4:100011F8210821084908F9F8110821084108F9F8410801081908E10847FE0000 +7EC5:10201020202025FC4524F924112421FC4124FD24412401FC1D24E02040200020 +7EC6:1000100021FC25244524F9241124212441FCFD24412401241D24E12441FC0104 +7EC7:1000100021FC25044504F9041104210441FCFD04400000901C88E10442020402 +7EC8:1080108020F821084B10FCA0104020A04318FC0640C000201810E18040600010 +7EC9:1080108020F821084A10FC2013FC20044004F80441FC00041804E00443FC0004 +7ECA:10201020212424A444A8F82011FC20204020FC2043FE00201C20E02040200020 +7ECB:10901090209023FC4894F89413FC22904290FBFE40920092191AE11442100410 +7ECC:10201020212425244524F92411FC20204020FD24412401241D24E12441FC0004 +7ECD:100013FC208420844884F904111422084400F9FC410401041904E10441FC0104 +7ECE:100013FC210420884850F82010D823264020F9FC402000201BFEE02040200020 +7ECF:100011FC200824104430F848108423024000FDFC402000201C20E02043FE0000 +7ED0:10201020204024884504FBFE1002200041FCFD04410401041D04E10441FC0104 +7ED1:2100211E211247D25114F11427D821144112F7D24112011A3114C21002100410 +7ED2:10281024202420204BFEF820112421244124FBA8412801101A12E22A44460082 +7ED3:10201020202027FE4420F82011FC20004000FDFC410401041D04E10441FC0104 +7ED4:1040104027FC20A04910FA081DF6200047FCF880410003F81808E00840500020 +7ED5:1080108020BC23C04850F82410D4230C4000FBFE409000901912E112420E0400 +7ED6:100011FE202024404488F90411FE20224020FC2041FE00201C20E02043FE0000 +7ED7:10801080213C22004C80F080117E23084508F908410801081908E10841280110 +7ED8:1040104020A021104A08F40611F020004000FBFC404000801910E20847FC0204 +7ED9:1040104020A021104A08F40613F820004000FBF8420802081A08E20843F80208 +7EDA:10801080210021FC4A04F40413E422244224FBE4422402241BE4E00440280010 +7EDB:1080108020FC21084A90F860119826264020F9FC402002201BFEE02040200020 +7EDC:1080108020F821084B10FCA0104020A04118FA0645F801081908E10841F80108 +7EDD:1080108020F821084A10F5FC112421244124F9FC410001001902E10240FE0000 +7EDE:10401020202025FE4400F888110422024088FC88405000501C20E05040880306 +7EDF:10401020202023FE4840F888110423FE4092F890409000901912E112420E0400 +7EE0:100013FE2020242045FCF924112421FC4124FD2441FC01201CA0E04040B0030E +7EE1:1020112420A424A84420F9FC1104210441FCFD04410401FC1D04E10441140108 +7EE2:100011F82108210849F8F80013FC22044204FBFC420402041BFCE20442140208 +7EE3:103813C0204020404FFCF9501248244643F0F9104120017C1A04E20444280810 +7EE4:10001050204824844524F820105020884106FCF8408800881C88E08840F80088 +7EE5:1008103C23C020444A24F9281100204043FEF888410803901860E05041880604 +7EE6:1080108021F823084C90F060119826464040FBFC404002481A44E44441400080 +7EE7:10201220222023244AA8F22013FC22204270FAA8432402201A20E22043FE0000 +7EE8:11081088209023FC4824F82413FC22204220FBFE406200A2192AE22444200020 +7EE9:1040104027FC20404BF8F04017FE200043F8FA08424802481A48E0A041100608 +7EEA:1040104423F420484850F7FE1040208041F8FB08450801F81908E10841F80108 +7EEB:1020102021FC20204820FBFE108821444242F8F8418802501820E05041880606 +7EEC:1088108823FE248844A8F82011FC21244124FD2443FE00201C50E08841040202 +7EED:1020102021FC24204420FBFE100220944050FD10409003FE1C28E04440820302 +7EEE:1020102021FC24504488F90413FE200841E8FD28412801E81D28E00840280010 +7EEF:109010902090279E4890F8901090239C4090F8904090079E1890E09040900090 +7EF0:10401040207E20404BFCFA0413FC220443FCFA44404007FE1840E04040400040 +7EF1:1020112420A420A84820FBFE1202220242FAFA8A428A028A1AFAE202420A0204 +7EF2:100011FC2104250445FCF904110421FC4000FD1241D401181D10E1524192010E +7EF3:100011F02110211049F0F84013F822484248FBF8424802481BFAE0424042003E +7EF4:10A01090208025FE4510FB1015FC21104110FDFC411001101D10E1FE41000100 +7EF5:1020104021FC210449FCF10411FC20204020FBFE422202221A2AE22440200020 +7EF6:101C13E0208422444948F91017FE24024000FBF84108011018A0E04041B0060E +7EF7:200027BC24A444A454A4F7BC24A424A444A4F7BC44A404A434A4C4A40AA4114C +7EF8:100013FE222222224AFAFA22122223FE4202FAFA428A028A1AFAE202420A0404 +7EF9:1080108020FE25024682F8F21142204243FAFC42415201521DF2E00240140008 +7EFA:1088108821EC212A4A28F5481088217E4600F80041FC01041904E10441FC0104 +7EFB:10401248215020404BF8F88017FC21104208FDF4491201101950E124410400FC +7EFC:1040102023FE22024800F9FC1000200043FEF820412801241A22E42240A00040 +7EFD:1040102023FE22024C04F80013FE20204020F920413C01201AA0E260443E0800 +7EFE:1040102023FE22024C04F9F81108210841F8F900410001FC1904E10441FC0104 +7EFF:100011F82008200849F8F808100823FE4020FA22417400A81924E22240A00040 +7F00:200027BC208442945108F29424A428404000F7BC40A402A43128C29004A80846 +7F01:11241124224824904A48F9241124200043FCFA44424403FC1A44E24443FC0204 +7F02:1088108823FE248844F8F82011FC21244124FDFC402003FE1C20E02040200020 +7F03:11001100213E21224FA2F122113E23A24362FD22493E01221922E122413E0122 +7F04:20142012201047FE5410F41025D024124412F5D44554054835DAC42A08461082 +7F05:100017FE204020804BFCF294129422F44294FA9442F402941A94E29443FC0204 +7F06:10901290229E22A84AC4F88011FC21044124F924412401541850E0904112060E +7F07:100011FC2104210449FCF904110421FC4000FBFE40200120193CE12042A0047E +7F08:20102010271045105514F752255225924710F514450807103520C04000800300 +7F09:100011F82108210849F8F00017FE210841F8F90841F80108193EE7C840080008 +7F0A:100011F82108210849F8F908110821F84000FBFC429402941A94E29447FE0000 +7F0B:1020102021FC252445FCF82013FE200041FCFD04412401241D24E05040880304 +7F0C:100011FC2124212449FCF924112421FC4000F840402402A21A8AE48840780000 +7F0D:1008103C21E020204820FBFE1124212447FEF924412403FE1820E02043FE0000 +7F0E:10801338222822284BA8FA461200227C43A4FA24422803A81E10E22842440282 +7F0F:110011FE211022104AFEF292169222FE4292FA9242FE02901A50E22042580286 +7F10:1040108021FC210449FCF90411FC20204032FBB440A801281924E22444A20040 +7F11:11001178210822084AFEF6401A40227C4290FA1042FE02101A28E22842440282 +7F12:10101220217C25444444F87C13402140417CFD444144017C1D44E280447E0000 +7F13:103C17C0224421284800FBFC1080208047FEF90041F802881A50E42048D80306 +7F14:1040102021FC24004488F85013FE22224424FDFC412401241D34E12840200020 +7F15:1020112420A820204BFEF8A8112422024040FBFE408801081990E06041980604 +7F16:1080104023FC22044A04FBFC1200220043FCFB54435405FC1D54E5544944010C +7F17:100013FC220423FC4A20FBFE1210228A4306F80043FC02041BFCE20443FC0204 +7F18:108010FC210421F84808FBFE104020A24334F858409403341852E09043500020 +7F19:100013FC209022944998F89017FE200041F8F908410801F81908E10841F80108 +7F1A:1050104827FE20404BFCFA4413FC224443FCFA44400803FE1908E08840A80010 +7F1B:100013FE220022FC4A00FBFE12A8229042C8FA86420803FE1A88E44844080818 +7F1C:1040104027FC20404BF8FA0813F8220843F8FA0843F802081FFEE11042080404 +7F1D:1020147C228421484830F8CE1610227C4210FA7C421002FE1A10E21045FE0800 +7F1E:1040102023FE200049FCF90417FE210441FCF852409401881A88E4A440C20080 +7F1F:1040102023FE200049FCF90411FC200043FEFA0242FA028A1AFAE202420A0204 +7F20:2040202027FE440055FCF524252425FC4524F52445FC042035FCC820082013FE +7F21:1040102023FE20004954F924115421FC4020FBFE424202921AFAE20A42020206 +7F22:11041084208820004BFEF800108821044202F9FC415401541954E15447FE0000 +7F23:10881050200025FE4450F9FC105423FE4054FDFC405000D81D54E25240500050 +7F24:1040102023FE22024C14F9E01100210041FCF910411007FE1800E09041080204 +7F25:100013FE205025FC4554F95411FC200041FCFC0043FE00201CA8E12442A20040 +7F26:100011F8210821F84908F9F8100023FC4294FBFC400001F81890E06041980606 +7F27:100011FC212425FC4524F9FC1040208841F0FC20404403FE1C22E12442220060 +7F28:20002FBE28A24AAA5AAAFAAA251428A24080F7FE4110021033A0C06001980E04 +7F29:2040202027FE44025100F1FE221026204A7CF2444244027C3244C244027C0244 +7F2A:100017BC208424A44A94F4A4105021884626F8C0431000641B88E03040C00700 +7F2B:112412482124240045FCF92411FC212441FCFC2043FE00701CA8E12446220020 +7F2C:220022FE22104FA0527CF244275420544054F754455405543528C72405420082 +7F2D:1020102023FE20504A8AF90413FE250441FCF90441FC00201924E22244A20040 +7F2E:1088105023FE202049FCF82013FE212440A8FBFE400001FC1904E10441FC0104 +7F2F:11041088200023FE4A22FAAA1272222243FEF80041FC010419FCE10441FC0104 +7F30:100013FE200025FC4524F9FC112423FE4000FDFC412401FC1D24E1FC400003FE +7F31:101014FE229222FE4810F9FE10002EFE4282FAFE428002FE1A82E2FE450008FE +7F32:11FC1104210421FC4800FBDE1252225243DEF82047FE007018A8E12446220020 +7F33:100013FC229422944BFCF80017FE200043FCFA0443FC00A21914E3084D440182 +7F34:2108220827C8445057DEF46427D422144114F7D4421403C83248C454055408A2 +7F35:2108252827BE494857BEF31825AA29464000F3F8420802483248C0B001080604 +7F36:0800080010001FF82100410001000100FFFE010021082108210821083FF80008 +7F37:200020003F3E482288220822FFA2082208224922492A49244F20792000200020 +7F38:200020003F7E481088100810FF10081008104910491049104F1079FE01000000 +7F39:080008001FF8210041000100FFFE01002108210821083FF80000488844448444 +7F3A:202020203C2051FC90241024FE24102413FE5420545054505C88648805040202 +7F3B:200020003DFE504090401078FE48104810685498549854885C8A64AA04CA0086 +7F3C:204020403C40507C90441088FEA0112010205450545054485C88648405040202 +7F3D:202020203C20502091FE1070FEA810A811245524562254F85C20642004200020 +7F3E:208420483C0050FC90481048FE48104811FE5448544854485C48648804880108 +7F3F:2008201C3CE05080908010FEFE80108010BC54A454A454A45CA4653C05240200 +7F40:205020503C50515290D41058FE50105810D45552565054505C9264920512020E +7F41:400043FE7A02A28A225223FEFA22222222AAAAAAAAAAAAFABA02CA02020A0204 +7F42:3EF822882AA82AA82AA81450228849041FF821000100FFFE010021083FF80008 +7F43:08202AA44D28145022887FFE400288041FF821000100FFFE0100210821083FF8 +7F44:08007F7808483E4800863E782A483E30404890861FF02100FFFE010021083FF8 +7F45:4040407C7840A3FE22422278FBC4223C2208AAF0AB24AAA8BDFECC2008A00040 +7F46:200021FC3D2453FE912411FCFE0011FC110455FC550455FC5D0465FC04880104 +7F47:410840907BFEA09023FC2294FB1C220423FCAA04ABFCA808BBFEC90800A80010 +7F48:400043FE7850A3FE225223FEF80021FC2104A9FCA904A9FCB820CBFE00200020 +7F49:412440A87BFEA20220F82088F8F8200C21F0A820A9FCA820BBFEC82000A00040 +7F4A:08787F4808483E862B783E482A28FF9049287F4620003FF84100FFFE21083FF8 +7F4B:0100FFFE104824FE799010FC22907CFC089030FEC8803FF84100FFFE21083FF8 +7F4C:3EF822883EF822883EF822883EF81450228810001FF02100FFFE010021083FF8 +7F4D:1FF011101FF011103FF82AA83EF82AA83EF810001FF02100FFFE010021083FF8 +7F4E:41FC410479FCA10423FE2020FBFE222221ACA820A9FCA800BBFEC840008801FC +7F4F:4040407C7840A3FC224423F0FA4422FC22A8AAF8AAA8AAF8BA00CDFC05540BFE +7F50:408843FE7888A3DE225223DEF8A0209021FEA920ABFCAD20B9FCC92001FE0100 +7F51:00007FFC40044004421452944A54442444244A544A5452946104400440144008 +7F52:00003FF82448244824483FF80000000000000000000000000000000000000000 +7F53:00003FF820082448228821082288244820080000000000000000000000000000 +7F54:00007FFC4004482444445FF4410440845FF444044404440447E4400440144008 +7F55:00007FFE40028824101020081FF0010001000100FFFE01000100010001000100 +7F56:00003FF82448244824483FF801000280044008203018C2060100008000800000 +7F57:00003FF82448244824483FF8020004000FF0101068200440028003001C00E000 +7F58:00003FF8244824483FF8000000007FFC010003000570090C3102C10001000100 +7F59:00007FFE400288241010210801000100FFFE03800540092011102108C1060100 +7F5A:00007FFC444444447FFC0000200810880088F088108810881488180810280010 +7F5B:00007FFC444444447FFC000000781FA01220122012101290124822A843248202 +7F5C:00007FFC444444447FFC020001007FFC010001003FF8010001000100FFFE0000 +7F5D:00007FFC444444447FFC00001FF0101010101FF010101FF010101010FFFE0000 +7F5E:00007FFC44447FFC00003FF0002006400180FFFE0282048408803080C2800100 +7F5F:00007FFC444444447FFC01000100FFFE010001001FF01010101010101FF01010 +7F60:7FFC444444447FFC00003FF8200820083FF8208020803FFC208020442C24301C +7F61:00007FFC444444447FFC000000007FFC0100110011F8110011001100FFFE0000 +7F62:00007FFC444444447FFC010001003FF801000100FFFE0400082010103FF81008 +7F63:00007FFC444444447FFC01003FF801000100FFFE000001003FF801000100FFFE +7F64:00007FFC444444447FFC082004407FF801083FF821003FFC0304051419086100 +7F65:7FFC44447FFC00001FF010101FF000003FF820083FF820083FF8200820282010 +7F66:7FFC44447FFC000000F87F00221011203FE000400080FFFE0100010005000200 +7F67:00007FFC444444447FFC082008207EFC08201C301A702A6848A4892208200820 +7F68:3FF8244824483FF802007FFC044009203FF8D1161FF011101FF40104010400FC +7F69:00007FFC44447FFC010001FC01003FF820083FF820083FF80100FFFE01000100 +7F6A:00007FFC444444447FFC000004407C7C044004407C7C04400440FC7E04400440 +7F6B:00007FFC444444447FFC000008207F200820FF30082808247F2408200F20F020 +7F6C:7FFC44447FFC00003EF8020814D00820145062883EF80288145008203458C286 +7F6D:00007FFC444444447FFC00500048FFFE00403E4022243E2800120E2A70C60302 +7F6E:7FFC444444447FFC0100FFFE02001FF010101FF010101FF010101FF01010FFFE +7F6F:00007FFC44447FFC01003FF808200440FFFE00001FF010101FF010101FF01010 +7F70:7FFC444444447FFC080004047FA400243F2400243F2400243F2421043F142108 +7F71:7FFC444444447FFC0100FFFE01003FF8244822882FE821083FF8210821282010 +7F72:00003FF8244824483FF802001FD00220FFFE03000FF03810CFF008100FF00810 +7F73:7FFC444444447FFC00001FF0111011101FF0111011101FF001004884481287F2 +7F74:3FF8244824483FF8010001003FF80100FFFE040008201FF00010488844448444 +7F75:7FFC444444447FFC00001FF811001FF011001FF011001FFC0004292444940008 +7F76:7FFC444444447FFC040079FC40444844545462883FF821083FF821083FF82008 +7F77:7FFC444444447FFC1080249842E07E8400847E7C42807E9842E07E844284467C +7F78:7FFC444444447FFC10080808FF0800FE7E0800887E4800487E0842087E284210 +7F79:00007FFC444444447FFC10A0109019FE552053FC952011FC1120112011FE1100 +7F7A:7FFC44447FFC1110222011101FF011101FF011101FF001007FFC05401930E10E +7F7B:7FFC444444447FFC00003F0821083F0820FE2E0820483F2844285508A4A80C10 +7F7C:7FFC44447FFC00003FF821083FF821083FF80920FFFE09203FF801007FFC0100 +7F7D:7FFC444444447FFC00007FFE42004A4452A4452448A452244AA4530444949848 +7F7E:3FF8244824483FF8082004403FF8292825483FF800001FF010101FF010101FF0 +7F7F:00007FFC44447FFC01003FF80440FFFE11101FF011101FF001003FF80100FFFE +7F80:3FF82AA824482AA80000FFFE02803EF822883EF802803FF821083FF821083FF8 +7F81:00007FFC44447FFC22007F7822083E4808487F7C49047F0408F4FF0408140808 +7F82:7FFC444444447FFC100011FC25047DFC080011FC25047DFC010455FC5504810C +7F83:7FFC44447FFC0820FFFE08201FF010101FF01010FFFE09203FF8D11611300100 +7F84:7FFC444444447FFC1020103C24207DFC090411FC25047DFC002055FE54208020 +7F85:00007FFC444444447FFC1050148825FE7A9010FC24907EFC009054904AFE8A80 +7F86:7FFC44447FFC108024987EE000847E7C42007E9842E07E844284467C24884244 +7F87:7FFC444444447FFC2820FDFC2820385010887DFE54087DE81128FDE810081018 +7F88:00007FFC444444447FFC2800FDFE292039FC11207DFC55207DFE1002FEAA1004 +7F89:7FFC444444447FFC000021082390482473B820104BA4783E0388AAACABCA8298 +7F8A:0820042004407FFC0100010001003FF8010001000100FFFE0100010001000100 +7F8B:092009200920F93E09200920082001007FFC01000100FFFE0100010001000100 +7F8C:0820042004407FFC010001003FF802000200FFFE04800480088010822082C07E +7F8D:020002007FFC044008203018C82604407FFC01003FF80100FFFE010001000100 +7F8E:1010081004207FFC010001003FF80100FFFE010001007FFC028004401830E00E +7F8F:220412041408FF90082008447F0408080810FFA208420804100810102060C180 +7F90:08200820F83E082001003FF801000100FFFE04000FE01040608003401C30E00E +7F91:082004407FFC01003FF80100FFFE040007E0082010406080014006201818E006 +7F92:441024502850FE50108810887D0412FA1048FE48104810482088208841288210 +7F93:4400240029FCFD24112411247D24112411FCFD00110011002102210240FE8000 +7F94:0820042004407FFC0100010001003FF8010001000100FFFE0000488844448444 +7F95:082004407FFC01003FF80100FFFE010000801F0001047D88095011202518C206 +7F96:440024F82888FE88108811067E0011FC1084FE84104810502020205040888306 +7F97:0820042004407FFC010001003FF802000200FFFE049004A408BC10822082C07E +7F98:01043C842488240027FE3C20242025FC24203C2027FE24202420442054208820 +7F99:082004407FFC010001003FF801000100FFFE010011101120228004401830E00E +7F9A:442024202850FC50108811247E12101011FCFC04100810882050202040108010 +7F9B:082004407FFC01003FF80100FFFE04407FF804483FF824403FFC084410542048 +7F9C:444024202820FDFE110212047C00100011FEFC20102010202020202040A08040 +7F9D:4404241E29F0FD10111011107D1011FE1110FD1011101108210A214A41A68112 +7F9E:082004407FFC01003FF80200FFFE04000FF011102110CFF0021002103FFE0000 +7F9F:440025FC2808FC10103010487C8413021000FDFC102010202020202043FE8000 +7FA0:442024202BFEFC2011FC10247DFC112011FEFC22102A10542050208841048202 +7FA1:082004407FFC01003FF80100FFFE4080208009FC12042448E04020A023182C06 +7FA2:441424122810FDFE101010907C92109213F2FC9410941088208A211A41268242 +7FA3:3FF80208FFFE04083FF808001FF82808CFF804407FFC01003FF80100FFFE0100 +7FA4:00827E44122812FEFF10121012107E7C201020107E1062FEA21022103E102210 +7FA5:440025FE2800FC92112412487D2410921000FDFE102010202020202043FE8000 +7FA6:4420241029FEFD02120410F87C00100011FEFC501050105020922092410E8200 +7FA7:444024402888FD0413FE10027C8811441242FCF8118812502020205041888606 +7FA8:082004407FFC01003FF80100FFFE0080208011FC820454482040E0A023182C06 +7FA9:082004407FFC01003FF80100FFFE02403C500848FFFE08480E5078240854198C +7FAA:4440242029FCFD04110411FC7D04110411FCFD20112211142108214441828100 +7FAB:4440242029FEFD02120410507C8811041000FDFC102010202020202043FE8000 +7FAC:8808480C500AFBFE22082208FAE8220A220AFAEC22AC22A822EA421A42268442 +7FAD:884048A05110FA0825F62000FBC422542254FBD42254225423D44244425482C8 +7FAE:04407FFC01003FF80100FFFE248842443FF801001FF00100FFFE02800C60701C +7FAF:440025FC2904FDFC110411FC7C8011FE1222FD221152110221FA200240148008 +7FB0:442025242924FD2411FC10807C8013FE1090FD101152125422A8242848448082 +7FB1:440025FE2910FD20117C11447D7C1144117CFD10111011542152229242508420 +7FB2:04407FFC01003FF80100FFFE00283E240824FFFE2A207D2490A81E12022A0C46 +7FB3:443C27E02924FCA813FE10A87D24120211FCFD24112411FC2124212441FC8104 +7FB4:082004407FFC01003FF80100FFFE454429287CFE10107C7C1010FEFE10102010 +7FB5:442025FC2820FC8813FE10887DFC110411FCFD0411FC110421FC208841048202 +7FB6:88204BFE5000FBFC220422F4FA9423FC2000F9F8210821F8210841F8400083FE +7FB7:442024202850FC88110412FA7C00100011DCFD54115411DC2088208841548222 +7FB8:0100FFFE20003FF800003FF820083FF80440729C57D47114539C711657D6B122 +7FB9:04407FFC01003FF80100FFFE482482823FF801001FF00100FFFE02800C60701C +7FBA:880049FC5020FBFE222221ACF82021AC2000FBFE202021FC215441544154810C +7FBB:88204BFE5250FBFE225223FEFA0023FE2292FB48223A224022FC4548443089CE +7FBC:3FFC20043FFC22202FF8208027F020803FFC2AA83F7C24105F7C4410BF7E0810 +7FBD:00007EFC0204020422441224122402040A14122462C422440204020414280810 +7FBE:0000EE00227C2210AA1066102210221026106A10B210221022102210AAFE4400 +7FBF:00007EFC22441224060C1A3462C40204042004207FFE04200420082010202020 +7FC0:0010EE1022102210AAFE66922292229226926AFEB292221022102210AA104410 +7FC1:0440082012102408C8261FF0001000007EFC224412240A14122422444A940408 +7FC2:0008EE2822282228AA4466442282237C26246A24B224222422442244AA944508 +7FC3:080008EE08227E2210AA1066202228224826486A90B2142222227E2222AA0044 +7FC4:0010EE10221022FEAA10661022FC224426446A44B228222822102228AA444482 +7FC5:100011DC1044FE44115410CCFC4444CC45542844284411541888240043FE8000 +7FC6:00007EFC224412241A3462C404003FC004400844113C2100FFFE010001000100 +7FC7:00007EFC224412241A3462C4022401107FFE020007F00A10112060C003301C0E +7FC8:00007DDC5444544455547CCC54445444544C7CD4556410441044104411541088 +7FC9:100011DC1044FC44115430CC38445444524C90D411647C441044104411541088 +7FCA:200013DE1042FC420252094A894A884248C6494A525250421C42E042414A0084 +7FCB:0020EE10221022FEAA0066042244224426246A24B228222822082210AAFE4400 +7FCC:00007EFC22441224060C1A3462C4010000807FFC0000101008200440FFFE0000 +7FCD:0010EE10221022FEAA926694229022FC26A46AA4B2A822A822902328AA444482 +7FCE:100011DC28442444435490CC08440044FC4C04D4096450442044104411540088 +7FCF:00007EFC224412241A3462C4030406C01830E30E0C403180063038C007003800 +7FD0:0010EE1022502250AA7C66902310221026FE6A10B228222822282244AA444482 +7FD1:0040EE40228022FCAB04660422F4229426946A94B2F4229422042204AA284410 +7FD2:00007EFC224412241A3462C4010402001FF8100810081FF8100810081FF81008 +7FD3:100011DC1044FE44115410CC7C440044004C7CD44564444444447C4445540088 +7FD4:440025DC2844FE44115410CC7C441044104CFED4116410442044204441548088 +7FD5:010006C01830EFEE00001FF010101FF000007EFC224412240A1412246AD40408 +7FD6:100011DC28442444435480CC7C440044004C7CD44564444444447C4445540088 +7FD7:100010EE3E224222A4AA186610222422C8261F6A21B2D2220C22082230AAC044 +7FD8:200021DCFE442444295412CC2A44C6CC0154FC4428442954288A480247FE8000 +7FD9:100092EE92229222FEAA206620223E224226426AA4B214220822102220AAC044 +7FDA:7EFC224412241A3462C400007FFE42029FF4040009001FF001007FFC01000100 +7FDB:108010F811082290286069986E06ABB828882AA8299829982AA8288822A82110 +7FDC:00007EFC224412241A3462C4020401007FFC092009201550228804401830E00E +7FDD:100008EE7F22412292AA10667F2210221426246A24B228224A225122BFAA1144 +7FDE:0020EE1022FE2200AA00667C22442244267C6A10B254225222922210AA504420 +7FDF:00007EFC224412241A3462C4020409001FFC30805FF890801FF810801FFC1000 +7FE0:00007EFC224412241A3462C4020401007FFC0820145022880100FFFE01000100 +7FE1:04407C7C04403C7804407C7C0440044000007EFC224412240A1412246AD40408 +7FE2:00007F6E492249225DAA49667F2241225D26556A55B25D2241224122452A8264 +7FE3:7EFC22441A3462C4020401003FF80820FFFE04007FFC08201C4003800C707008 +7FE4:00007CEE442244227CAA0066FE22AA22AA26AA6AFEB2AA22AA22AA22A2AA8644 +7FE5:01081FD001207FFC02000FF03810CFF008100FF000007EFC22441A3462C4060C +7FE6:0820FFFE00003E0822483E4822483E482208261800007EFC22441A3462C4060C +7FE7:200011DCFE44824401547CCC00447C44444C7CD445647C4400441C44E1544088 +7FE8:7EFC22441A3462C402041FF010101FF010101FF000007FFC110011F8290047FE +7FE9:100008EE7E22422242AA7E66422240227F26556A55B27F22D522552255AA4344 +7FEA:0028EE9222AA2282AAFE6628224422A2263C6A44B24422A822102228AA444482 +7FEB:0000EE7C2200AA006600AAFE225010507E50425042507E52425242927E8E4300 +7FEC:7CF82448142824487FFC41043FF801001FF011101FF011101FF00100FFFE0100 +7FED:0040EE5C22442284AABE66902390229E26A86A88B2BE228822882294AA9444A2 +7FEE:0000FEEE00227C2244AA7C660022FE228226AA6A92B2FE229222922292AA8644 +7FEF:7CF8244814282548FFFE00001FF010101FF000007FFC40044FE448244FE4400C +7FF0:102010201050FE8811067C0045DC7C4445547CCC1044FECC1154104411541088 +7FF1:100021DC7C4444447D5444CC7C441044FE4C28D4556492447C44104411541088 +7FF2:0000FEEE2822FE22AAAAAA66FE2200227C26006AFEB210225422922250AA2044 +7FF3:00007F7848485F4C64805F7844484A4851307F4C00007EFC22441A3462C4060C +7FF4:0010EC1026FE2510B57C6C54247C2754257C6D10B5FE251025102690B47E4800 +7FF5:0010EE20227C2244AA7C6644227C2240267E6A40B27E220222AA22AAAB02440C +7FF6:100021DC7C4444447D5444CC7C441044544C38D455641044FE44104411541088 +7FF7:080049EE2A220822FFAA2A66492288224226776A92B25A222F22222242AA8244 +7FF8:10007EEE10222422FEAA24667E2242227E26426A7EB242227E22242242AA8144 +7FF9:10007DDC1044FE444554EECC4444EECC0154FC4428442954288A480247FE8000 +7FFA:2000FEEE8222FE2282AAFE668222FE221026926A54B292221022FE2210AA1044 +7FFB:0E00F1DC92445444FF5438CC544482447C4C54D455647C44544454447D544488 +7FFC:7EFC22441A3462C402043FF821083FF821083FF804403FF80440FFFE08201010 +7FFD:08004E764812FF12045A05367F9244127C125536555A75125A12929225DAC8A4 +7FFE:0000FEEEAA22AA22FEAA0066FE2200227C26446A7CB22A226422A22231AA2044 +7FFF:1000FEEE10227C2200AAFE6602227C221026FE6A00B2FF220222FF22AAAAE644 +8000:100011DC9044555458CC1154FC00284828FE29902AFC28902AFC4C9048FE8080 +8001:020002083FD002200240FFFE010002000C1018E02F0048088808080807F80000 +8002:020002083FC802100220FFFE0080010002000C003000C0000000000000000000 +8003:020002083FD002200240FFFE010002000FF81200240047F08010001000A00040 +8004:02203FC00280FFFE02200FC03408C3F8000001F03E0003F03E0003FA7E0201FE +8005:020002083FD002200240FFFE010002000FF0181028104FF0881008100FF00810 +8006:02083FD00220FFFE02000C703F84C80407FC00001FF010101FF010101FF01010 +8007:020002083FD002200240FFFE03001C00EFF810082FC8C8480FC8000800500020 +8008:02203FC00280FFFE02200FC03408C3F810003FF840089F8810881F8800500020 +8009:020002103FE00240FFFE010007F81C00E7F800081F88108810881F8800500020 +800A:020002103FE00240FFFE010006001FF0E40008201FF001001FF001007FFC0000 +800B:02203FC00280FFFE02200FC03408C3F800007FFC08201FF001001FF001007FFC +800C:00007FFC0100010002003FF82488248824882488248824882488248820282010 +800D:0000FFFE020004003FF82488248824A822100200FFFE08201C4003800C707008 +800E:0000FFFE020004003FF824882488248824A8211001007FFC028004401830E00E +800F:0002FFE20404040808107FC24A424A444A484A504A424A424A444848415040A0 +8010:0008FF880808080810FE7F085508550855485528552855085508550841284310 +8011:01002108210821083FF800000000FFFE020004003FF824882488248824A82010 +8012:010001007FFC010001003FF801000100FFFE0380054009203118C10601000100 +8013:1000100011FEFE1010107C101010FE1010103810341054105010901010501020 +8014:100010FC1004FC08100878101010FDFE10103810341054109010101010501020 +8015:108810881088FE8811FC7C881088FE8813FE3888348854885088910811081208 +8016:102010201020FCA810A478A21122FD2012243824342854089010102010C01300 +8017:1008101C10E0FE2010207C3C10E0FE201020383E35E05420502290221022101E +8018:100010FC1000FE0010007C0011FEFE201020384034485484508491FE10821002 +8019:1000100011FCFD24112479241124FD2411FC3900350055009102110210FE1000 +801A:101010101010FDFE111279141110FDFC11443944352855289110122812441482 +801B:102010201020FE4010487C8411FEFE82100038FC348454845084908410FC1084 +801C:100011F81108FD081108790811F8FD00110039FC350455049104110411FC1104 +801D:100010F81088FE8810887CF81088FE88108838F8348854885088908813FE1000 +801E:110011001100FD1C13D479541154FD5411543954355455549154125C13541480 +801F:100011FE1100FF0011007DFC1104FF041104390435FC55005100910011FE1000 +8020:102010201050FC8811047A0211FCFC00100039FC350455049104110411FC1104 +8021:1008100813C8FE48125E7A4A13CAFE4A124A3BCA364A524A526A93D216121026 +8022:1088108813FEFC8810007BFE1202FC4410403BFC344454849084110412281410 +8023:102010201050FC8811047AFA1000FDFC1154395435FC5554915411541104110C +8024:104810481048FDFE1048784811FEFC0010FC3884348454FC9084108410FC1084 +8025:1020112410A4FCA810207BFE1202FE0212FA3A8A368A528A52FA9202120A1204 +8026:11FC11241124FDFC1124792411FCFC2010203BFE3622522A52FA920A12021206 +8027:1020112410A8FC2013FE78A81124FE0210403BFE348851085190906011981604 +8028:100011FE1100FD7E110079FE1154FD4811643942350851FE5148922812081418 +8029:1088108813FEFC8811FC788813FEFC2011FC392435FC512453FE910411141108 +802A:1040102013FCFD0810907BFE1202FC4410203BFC348054F89088110811281210 +802B:102013FE1020FDFC10207BFE1000FDFC110439FC350455FC910411FC10881104 +802C:102011FC1124FFFE112479FC1020FDFC112439FC344055FE908811D01070138C +802D:1124112412AAFFAE11247AAA13AEFD2413FE391035145114528A924A12161422 +802E:1048116A10DCFE4810B47D2211FEFF021020382034FC54245044904410941108 +802F:108813FE10A8FC9011FE7B2011FCFD2011FC392035FE550093FC10881070138E +8030:13FC104011F8FD0811F8790817FEFC4212A43A8A347A508051F892881070138E +8031:1040102013FEFE4813FE7A4812ECFF5A12483BFE3620527C52C49344147C1844 +8032:1040102013FEFC0011FC795411FCFC201122388C3522545490C8114412521060 +8033:00007FFC101010101FF0101010101FF010101010103E17D0F810001000100010 +8034:0020FFA0222022203E20222022203E202220222027A0FA2242220222021E0200 +8035:0000FF80227E22083E08220822083E08220822082788FA084208020802280210 +8036:0000FFBE222222243E24222822243E242222222227A2FA344228022002200220 +8037:010001007FFC0280044008203FF8C8260FE008200FE0082009F87E2000200020 +8038:0820082014502288410400007FFC10101FF010101FF01010103EFFD000100010 +8039:0020FF20242024503C50248825443E22242024F82E08F4084410041004200420 +803A:0000FF0024FC24003C00240025FE3C20242024402E40F488448405FE04820400 +803B:0010FF10241024903C902490249E3C90249024902E90F4904490049005FE0400 +803C:0000FF7C244424443C4424FE24443C44244424FE2E44F4444444044404540448 +803D:0040FC4048404BFC7A444C484840784048A048A04CA07920C9220A220C1E0800 +803E:0040FF40244024403DFE244024403C50249024902EA0F5284544064404FE0442 +803F:0020FF20242024243CA424A424A83D20242024502E50F4504488048805040602 +8040:0048FF44244424403C5E25E024403C44244424482E30F4224452048A05060402 +8041:0010FC9048904888790849044A047DFA488848884C887888C90809080A280C10 +8042:00007FFC08200FE008200FE0083EFFE000203EF8028822881450082034D8C306 +8043:0020FF20242025FC3D24252425FC3D24252425242FFEF5044504050405140508 +8044:0020FC204850488879044A1248207840498848104C207844C988081008600B80 +8045:0040FC40488048FC79204A20482078204BFE48204C507850C888088809040A02 +8046:0020FF20245024503C88252426123C1025FC24042E08F4884450042004100410 +8047:0000FF0024FE24103C10241024903C90249E24902E90F4904490049007FE0400 +8048:0010FC9048904910797E4A524B927892491249124E527BD2C8620822084A0884 +8049:0010FF10249224923C92249224FE3C10241024922E92F4924492049204FE0402 +804A:0000FC804B1E4A527A524A524A527A524A524AD24F5A7A54C890089009100A10 +804B:04800440FFFE0940118466FC00007FFC08200FE008200FE0083EFFE000200020 +804C:0000FF0024FC24843C84248424843C8424FC24842E00F4484444048404820502 +804D:0040FC2048204BFE7A024C04480078004BFE48204C207820C820082008A00840 +804E:0050FF50245025523CD4245824503C5824D425522E50F450449204920512060E +804F:0000FDFC48204820784049FC49547954495449544D547954C954094409140908 +8050:0020FC2048204BFE7820482049FC7800480049FC4D047904C904090409FC0904 +8051:0000FDFE48884888788848F84888788848F848884C88789ECBE8080808080808 +8052:0008FF1C24E024203C2025FE24203C20242024FC2E84F4844484048404FC0484 +8053:00007DF0111011901D52F20E04007FFC08200FE008200FE0083EFFE000200020 +8054:0088FC484850480079FC4820482078204BFE48204C507850C888088809040A02 +8055:0020FD20492049FC79204A2048207BFE480048004DFC7904C904090409FC0904 +8056:00007F00227C3E4422443E4423C4FE7C024402007FFC01003FF801000100FFFE +8057:0020FC2048204BFE782048204924792449244AAA4C207850C850088809040A02 +8058:0020FC2049FC492479FC492449FC78004BFE48804D0079FCC804080408280810 +8059:0020FC204BFE482079FC48204BFE780049FC49044DFC7904C9FC090409140908 +805A:7F00227C3E0422283E1023A8FE44020000F87F0009041188635005201918E106 +805B:0020FF4024FE24923C9224FE24923CA224FE24482E88F5FE4408040804080408 +805C:0020FF10241025FE3D02265424883D04240024FC2E20F4204420042005FE0400 +805D:0014FC12481049FE7810481049D27952495249544DD47808C8CA0B1A08260842 +805E:00007C7C44447C7C44447C7C40044FE4444447C4444447C444745FC440544048 +805F:20003E7C4844FF441444227C40007FFC08200FE008200FE0083EFFE000200020 +8060:0084FF48240024FC3C48244824483C4825FE24482E48F4484448048804880508 +8061:0090FC90490849487A444C9249087BFC484448204CA47A82CA8A0A8A0C780800 +8062:0020FF1024FE24823D04240024FE3C10241024902E9EF490449004D0053E0600 +8063:0000FF2024CE24823C8224EE24823C8224FE24282E28F4284448044A048A0506 +8064:0040FC204BFE480079FC490449FC78004BFE4A024DFC7820C820082008A00840 +8065:0004FC1E4BE0482079FC4924492479FC48204BFE4E227A2ACAFA0A020A0A0A04 +8066:0080FC8048FC49547AD448B4492C7A44489449084C4078A4CAAA0A8A0C780800 +8067:0010FDD448584A52798C488849047AFA482048204DFE7820C850088809040A02 +8068:0108FD4A4A524B9C79084A524BDE7842488848884FFE7888C888090809080A08 +8069:0020FC2049FC492479FC48204BFE780049FC49044D247924C924085008880B04 +806A:0088FC48485049FC79044904490479FC482048104C547942C942094A0A380800 +806B:0108FD4A4A524B9C79084A524BDE7842482048204FFE7820C850088809040A02 +806C:0090FC8849044A427C8849FC480478004BDE48424E52794ACA520842094A0884 +806D:0010FF2024FE24923C9224FE24923C9224FE24202E24F45A445E04900492050E +806E:0084FC844908494A7A524B9C48847908494A4BDE4C427800C954092A0A2A0800 +806F:0108FD4A4A524B9C79084A524BDE784248904A924E927B9EC890089008900910 +8070:0020FC4049FC4924797C498C49547924495449FC4C407824CAA20A8A0C880878 +8071:08207F20087E7E4408A4FF2810101E2822447FFE88200FE0083EFFE000200020 +8072:08007F7808483E4800863E782A483E304048FFFE08200FE0083EFFE000200020 +8073:11102110CAA814443278D24015FC18007FFC08200FE008200FE0083EFFE00020 +8074:0020FC204BFE4840784049FC4954795449FC48404C247AA2CA8A0C8808780800 +8075:0020FDFC492449FC78204BFE480079FC490449FC4D0479FCC90409FC08880904 +8076:7FFC08200FE008200FE0083EFFE000207EFC24483C7824483C78264EFDF80408 +8077:0110FC944BD248127A5049904FFE78104BD24A524E547BD4CA4A0A4A0BD60822 +8078:0080FCF849084BFE7944499249FE7900497C49004D7C7900C97C0A440A7C0C44 +8079:0040FC204BFE4A227954494A4A3A780049FC49544FFE7800C9FC082008A00840 +807A:0040FC204BFE4A02791049DE4A527D544A8849744E0279FCC82009240A220860 +807B:42043FD88A904F9E2A945FD482247FFC08200FE008200FE0083EFFE000200020 +807C:002078200BFE1020FDFC4954495479FC48007BFE48405C24EAA24A8A0C880878 +807D:0020FC204BFE782049FC79544954F9FC0800FBFE284078242AA2FA8A0C880878 +807E:08403E7C1440FF7822083E782242263E00007FFC08200FE0083EFFE000200020 +807F:010001003FF80108FFFE01083FF8010001003FF801000100FFFE010001000100 +8080:010001003FF80108FFFE01083FF8010801000100010001000100010001000100 +8081:010000803FFC20043FFC20802FF820883FFE20882FF820804FFC4080BFFE0080 +8082:00200020FDFC202423FE3C2445FC4420642095FC0820082013FE202040208020 +8083:010001003FF80108FFFE01083FF8010021082548252825282928410841088108 +8084:40204C2070FC442445FE3C2440FC7C20902011FCFE20102029FE242044208020 +8085:01003FF80108FFFE01083FF8054025483D7821083FF821083D78254845488108 +8086:00203E2020FC20243DFE202420FC3C20202021FCFE20202025FE4220FE204220 +8087:08403E7E22A83E10206E41009FF00110FFFE01101FF001003FF80100FFFE0100 +8088:08243E3E22E83E12202A41469FF00110FFFE01101FF001003FF80100FFFE0100 +8089:0100010001007FFC410442844444492451044104428442444444480440144008 +808A:00003E0022FC220422083E102220222022403E4022802282228242824A7E8400 +808B:00203E202220222022FE3E222222222222223E2222422242224242824A948508 +808C:00003CF02490249024903C902490249024903C902490249224924512550E8A00 +808D:00403C402440244025F83C482448244824483C482448244A248A448A55068A00 +808E:00007FFE4002800400001FF0101010101FF0101010101FF01010101010501020 +808F:0600010002800C603118C1063FF8228824482928210822882448200820282010 +8090:00403C40248024FE25003E0024FC240824103C20244024802502450254FE8800 +8091:00403C40248024FC25043E042404250424843C44244424042404440454288810 +8092:00403C402440244025F83C482448254824C83C482468245A248A448A55068A02 +8093:02000100FFFE100010001FF800001FF010101FF010101FF01010101010501020 +8094:00203C2024202520252C3D34256427A425243D34252825222522450254FE8800 +8095:00003C0024FC242424243CA424A424A424A43D24242424442444448455288A10 +8096:010021081110092001003FF8200820083FF8200820083FF82008200820282010 +8097:00403C402440244027FE3C882488248824883D08249024502420445054888B04 +8098:00083C082408240825FE3C082408240824883C48244824082408440854288810 +8099:1FF0101010101FF000003FF8200820083FF8200820083FF82008200820282010 +809A:00203C202420242024203C2025FC242024203C20242024202420442057FE8800 +809B:00003C0025FC242024203C202420242024203C20242024202420442057FE8800 +809C:00043E042208221022203E442204220822103E2222422204220842104A2084C0 +809D:00003DFC2420242024203C20242027FE24203C20242024202420442054208820 +809E:00403C242524250425043C882488248824503C50242024202450448855048A02 +809F:00003CFC2400240024003DFE2440244024803CFC240424042404440454288810 +80A0:00003DF82410242024403C8025FE249224923C92251225222622444254948908 +80A1:00003CF82488248824883D06260025FC24843C84244824502420445054888B06 +80A2:00203C20242025FE24203C20242025FC24843C88244824502420445055888E06 +80A3:00203C202450245024883D442622242024003DFC240424082408441054108820 +80A4:00203C202420242025FC3C202420242027FE3C20245024502488448855048A02 +80A5:00003DFC2524252425243D24252425FC25043D00250025002502450254FE8800 +80A6:00103C502450245034882C88250426FA2C483448244824482488448855288A10 +80A7:00003C0025FE241024103C202420246824A43D22262224202420442054208820 +80A8:00203C20242025FC24203C20242025FC24203C20242027FE2420442054208820 +80A9:010000801FF8100810081FF8100017F8140817F8140827F82408440884280410 +80AA:00403C20242025FE24403C402440247C24443C44244424442484448455288A10 +80AB:0040784048404BFC48407A484A484A484A487BF84848484048424842483E9800 +80AC:00403C502448244824403DFE2450245024503C502490249024924512550E8A00 +80AD:00203C20242025FE25223D222522252225523D4A258A250225024502550A8904 +80AE:00403C20240025FC24003C0024F0249024903C902490249224924512550E8A00 +80AF:0100010011F811001100FFFE00001FF010101FF010101FF01010101010501020 +80B0:00203C282424242424203DFE2420242024203C50245024502488448855048A02 +80B1:00407840484048404BFE7840488048904890792049204A484A444C8449FE9882 +80B2:02000100FFFE080010103FF800081FF010101FF010101FF01010101010501020 +80B3:00803C80248024FC25543E542454249424943D24262424442444448455288810 +80B4:18180660018006603A180200FFFE04000FF818082FF848088FF8080808280810 +80B5:00043C0E24F0248024803C8024FE248824883C88248824882488450855088A08 +80B6:00103D102510251225123D1425D8251025103D102510251225524592550E8800 +80B7:00403C402440247C24843C882520242024203C50245024502488448855048A02 +80B8:00103C902490248825083D042624242224203DFE242024202420442054208820 +80B9:00483C482484248425023E0025FE244024803CFC240424042404440454288810 +80BA:00203C20242027FE24203C2025FC252425243D24252425342528442054208820 +80BB:010001F8010001003FFC200440081FF010101FF010101FF01010101010501020 +80BC:00887888488848884BFE7888488848884FFE7888488848884888490849089A08 +80BD:00203C202420242024203DFE2420242024203C5024502450248844C855248A02 +80BE:040025F824882450242024D8270604001FF010101FF010101FF0101010501020 +80BF:00203C202420242025FC3D242524252425243DFC252424202420442054208820 +80C0:00803C842484248824903CA0248027FE24A03C9024902488248444A254C08880 +80C1:00807880488048804BF0789048904A984A947C9248924890491049104A509C20 +80C2:00203C20242025FC25243D24252425FC25243D24252425FC2524442054208820 +80C3:00003FF821083FF821083FF800001FF010101FF010101FF01010101010501020 +80C4:010001003FF821083FF821083FF800001FF010101FF010101FF0101010501020 +80C5:00203C202520252025FC3D202620242025FE3C20245024502488448855048A02 +80C6:00003C0024FC248424843C8424FC248424843C8424FC24842400440055FE8800 +80C7:00503C50245025FC24543C5425FC255025503DFE24522452245A449454908910 +80C8:00503C482448244025FE3C402440247C24A43CA424A825282510462854448882 +80C9:00103C10242024FC24843C842484248424FC3C84248424842484448454FC8884 +80CA:00803C80250025FC36042C0425E425242D24352425E425242404440454288810 +80CB:00203C2024202420243E3C202420242025FC3D04250425042504450455FC8904 +80CC:048004987CE004841C84E47C40001FF010101FF010101FF01010101010501020 +80CD:0008781C49F049504950795049504950495079484948496849544A744A529C00 +80CE:00203C202420244024483C8425FE248224003CFC248424842484448454FC8884 +80CF:00203C20242E25F025203D20252025FE24223C6224A2252A2624442054208820 +80D0:00203C202524252435242D2425FC24202C203524252425242524452455FC8804 +80D1:00003C0024FC248424843C842484248424FC3C84240024482444448454828902 +80D2:00003CFC2484248424843CFC248024A024A23CA424B824A024A24522551E8A00 +80D3:00003DFC2420242025243CA424A8242027FE3C20242024202420442054208820 +80D4:088008882E9028E028842E84F07C01003FF82288244829282108228824482018 +80D5:00443C442444248424BE3D84268424A424943C94248424842484448454948888 +80D6:00203C20252424A424A83C2025FC242024203C2027FE24202420442054208820 +80D7:00203C202450248825043E122420244025883C10242024442588441054608B80 +80D8:00203C10241025FE24203C202444248425F83C1024202444248245FE54828800 +80D9:00803C80248024FE25403D402640247C24403C402440247E2440444054408840 +80DA:00007BFC482048204840784048D049484A447C4448404840484048004FFE9800 +80DB:00003DFC2524252425243DFC2524252425243DFC252424202420442054208820 +80DC:002078204920492049FC79204A204820482079FC48204820482048204BFE9800 +80DD:00043C1E25F0251025103D10251025FE25103D1025102508250A454A55A68912 +80DE:0080788049FC49044A047DF449144914491479F4490449284912490248FE9800 +80DF:00003CFC248424A424943C84248427FE25043D442524250425FE440454288810 +80E0:00203C20242025FC24203C20242027FE24203C2024402448248445FE54828800 +80E1:0800087C084408447F44087C08443E442244227C224422443E84228401140208 +80E2:00003C0025FE240824083DE82528252825283D2825E825282408440854288810 +80E3:0080788048FE49004A207920492C49744BA47924493449284922490248FE9800 +80E4:01002208244827882108224827C8200827C8244827C8244827CA444A444A84C6 +80E5:7FFC0104110011F81100290047FE80001FF010101FF010101FF0101010501020 +80E6:00203C20242025FC25243D242524252425243FFE242024502450448855048A02 +80E7:00907888488848804BFE78A048A048A448A478A84928493249224A624A9E9C00 +80E8:0040784048404FFE4880792049204A204BFC7820492849244A224C2248A09840 +80E9:00403C402440247C24403C40244027FE24403C40245024482444444054408840 +80EA:00203C20243C242024203CFC2484248424843CFC248424802480450055008A00 +80EB:000079FC480848104830784848844B02480079FC48204820482048204BFE9800 +80EC:10001000FEFC2244642818102428C2C601003FF8228824482108228824482018 +80ED:00003DFC2504252425243D2425FC252425243D54254C258C2504450455FC8904 +80EE:0080788048FC49084A90786049984E26482079FC48204A204BFE482048209820 +80EF:00203C2025FC245024883D0426FA240027FE3C40248025FC2404440454288810 +80F0:004078404FFC48404BF878484BF84A404BFC7844485448A848A049104A089C06 +80F1:004078444A444948495078404FFE48904890789048904892491249124A0E9C00 +80F2:004078204BFE48404890789049244BE448447848488849104A30484848849B04 +80F3:00403C402478248825503C202450248825063CF8248824882488448854F88888 +80F4:00007BFC4A044A044AF47A044A044AF44A947A944A944AF44A044A044A149A08 +80F5:00003DFE2420244024883D0425FE242224203C2025FE24202420442057FE8800 +80F6:0040782048204BFE4800788849044A0248887888485048504820485048889B06 +80F7:10001FFC20045454939414541FF400081FF010101FF010101FF0101010501020 +80F8:01007900490049FE4A027A024D1248A24A4A7AAA4B1A4A0A4BFA480248149808 +80F9:00003DFC2420242024403DFC2554255425543D54255425542554454455148908 +80FA:0040782048204BFE4A027C4448404BFE48887888490848D04820485048889B04 +80FB:00807880493C4A004C807880497E4B084D087908490849084908490849289910 +80FC:00843C48240024FC24483C482448244825FE3C48244824482448448854888908 +80FD:104024444248FF70014000427E42423E42007E44424842707E4042424A42443E +80FE:082008287F240820FFFE002008247F24492455286B2849105512632A45464282 +80FF:00203C2025FC242024203C2027FE240024203C2025FC24202420442057FE8800 +8100:1FC000447D88055009203518C2063FF800001FF010101FF010101FF010101030 +8101:00503C502450255234D42C58245024582CD43552245024502492449255128A0E +8102:01003D04253825C025023D0224FE240025FC3D04250425FC2504450455FC8904 +8103:00803C8024F8250826103DFC2524252425243DFC250025002502450254FE8800 +8104:0040784048404BFE4880789048904912495279544A904A284C28484448849902 +8105:02001FF00410085010207EFC12242A5444881FF010101FF010101FF010101030 +8106:00403C4024FC250426083DFE2500257C25443D442554254825424542553E8A00 +8107:0040784049FC48444884788449284A1049087BDE494A494A494A4A524B5A9CA4 +8108:0004781E49E049004906797849504950495279544948494849444A544A629C40 +8109:00407820481049E0482278344BB848B048A878A8492849244A244C2248A09840 +810A:2108111009201290244808203FF8C82608200FE0082008200FE0082008A00840 +810B:00001FF00410045008207EFC12442A9445081FF010101FF010101FF010101030 +810C:00803C8024FE251026103C1024FC249024903C9027FE24102410441054108810 +810D:002078204850488849047A0248F8480048007BFE48204840488849044BFE9902 +810E:000479884850482048507888492448204BFE782048A848A449224A2248A09840 +810F:00207810481049FE4900791049104910497C79104910491049104A104AFE9C00 +8110:004078204BFE490448887850482048D84B067888488848884888490849089A08 +8111:0040782048204FFE4800780048904A544A247A244A544A944A044A044BFC9804 +8112:00203C20252424A424A83C20242027FE24703CA824A825242524462254208820 +8113:0020782048204BFE4A427C4448A048A249A47A984C904888488448A248C09880 +8114:02000100FFFE04401450254841043FF822882448292821082288244820082018 +8115:00803C8024F8250826103DFC2524252425243DFC245024502490449255128A0E +8116:002078204BFE482048207BFE4A024C0449F8781048204BFE4820482048A09840 +8117:00803C8024FC255426543CA42524264424943D0825FC25042504450455FC8904 +8118:004078204BFE4A024C0479F8480048004BFE789048904890491249124A0E9C00 +8119:00283C242424242027FE3C20252024B224B43C6824A825242622442054A08840 +811A:01007900491E4B924912791249124FD2491279124A1A4A944FD04A5048109810 +811B:00007BFC480049244A487C904A48492448007BFC48404840484048404FFE9800 +811C:00003DFE2410242024FC3C84248424FC24843C8424FC24842484448454FC8884 +811D:004078204BFE480049F87908490849F848007BFC480848304820482048A09840 +811E:00203C2024A824A824A83D742622242024203DFC242024202420442057FE8800 +811F:00043C1E25E0242225123C942480240825FE3C08248824482448440854288810 +8120:0004780E4BB8488848887928492E4BA848A87AA84AA8493E49004A804C7E9800 +8121:000078064BB8488848887908493E4B8848887A884A88493E49004A804C7E9800 +8122:00803C8024FE250026FC3C8424A4249427FE3C842524251425FE440454288810 +8123:3FFC20002FF820003FFC24482430260E2FF828082FF848084FF8880808280810 +8124:000079FE49004900497C7900490049FE495079524954494849484A444A529C60 +8125:0020782048204BFE482078204924492449247AAA482048504850488849049A02 +8126:00107814481248104BFE7810489048504848780848884AA84A9A4AAA4C669802 +8127:00403C402488250437FE2C02248825442E4234F8258826502420445055888E06 +8128:00203C2027FE242024203DFC2524252425FC3C20247024A82524462254208820 +8129:1080108011F821082A906C60A9982E0629F8290829F8290829F8210821282110 +812A:00C23C342418246425823C2025FE245024903DFE26922492249A449454108810 +812B:00107890488849084A047DFA49084908490879F848904890489049124A129C0E +812C:0008783C4BC048044A44792848004BF8481078204FFE48204820482048A09840 +812D:000079FC49044904490479FC480048004BFE7820482049FC482048204BFE9800 +812E:0008783C4BC048444A247928490048404BFE788849084B904860485049889E04 +812F:004878444BFE484048407BFC4A444A444BFC7A444A444BFC4A444A444A549A08 +8130:00003DFE2400240024FC3C842484248424FC3C00248424442448440055FE8800 +8131:010478844888481049FC79044904490449FC785048504890489249124A0E9C00 +8132:00007BFC4A044A044BFC7A004A204A224BB27AB44AA84AA84D244D244AA29840 +8133:00427A2249244904480878004A0A4A8A4A527A224A524A8A4B0A4A024BFE9802 +8134:00003DFE2410242024683CA42522242024003CFC248424842484448454FC8884 +8135:000079FC4904490449FC7800480049FC482078204BFE48204850488849049A02 +8136:000079FC49044904490479FC482048204BFE7A224A524A8A4B0A4A024A0A9A04 +8137:004278E24B82488A488A788A4FEA488A498A79CA4AAA4A824C824882488A9884 +8138:0020782048504850488879044AFA480048447824492448A8488848104BFE9800 +8139:00003CFC248024F824803CF8248027FE25403D24252825102508454455828900 +813A:004078204BFE48004888788849544A22480078204BFE48204820482048209820 +813B:002078204BFE482049FC78244BFE482449FC78204920493E49204AA04A7E9C00 +813C:00007BFE482048204BFE7A224A224B324AAA7AAA4B764A664A224A224A2A9A04 +813D:00503C48248024FE25903E9024FC249024903CFC24902490249044FE54808880 +813E:004078804BFC4A244A247BFC4A244A444BFC789049104FFE4810481048109810 +813F:00203C2027FE242024203DFC2420242027FE3C4024A425A82690448854C68880 +8140:00203C202450248825043EFA240025FC25543D5425FC2554255445545504890C +8141:0084788C49084FBE49087908490849084FBE79084908490849084A08AA089408 +8142:00003DFC2524252425FC3D24252425FC24203FFE247024A82524462254208820 +8143:00203D2424A8242025FC3C4027FE248825043EFA2488248824A844925482887E +8144:00083C3C25E0242027FE3CA824A824A827FE3CA824A827FE2420442055FC8800 +8145:00203CA224A2252424503C882704242224203CA424A425282450448855048A02 +8146:00507850485049FC49547954495449FC4954795449544BFE4800488849049A02 +8147:001C79E0482048204BFE78A849244A4248407BFE4888490848D0483048489984 +8148:002078204BFE482049FC78204BFE480049FC790449FC490449FC490449149908 +8149:000078404B9C4A044A047B9C4A044A044BFC789048904890489049124A129C0E +814A:0088788848884BFE488878884FFE480049FC7904490449FC4904490449FC9904 +814B:008078404FFE492049207A3C4A444E644A947B484A484A304A204A504A889B06 +814C:004078804BFC49104A487C464BF84A484A487BF84A484A484BF848424842983E +814D:002078204850488849447A2249F848084850782048A44A824A8A4A8A4C789800 +814E:7EFC48447E4442287E1048287EC600001FF010101FF010101FF0101010501020 +814F:00007BDE4842494A4884794A4A524C2048007BDE48524952489449484A549C22 +8150:00803FFE2208220825FE2C883448245820802FFC29442AA4488449448A24080C +8151:002078104BFE4A004A447A444A844ABE4B847AA44A944A944C844C8448949888 +8152:00003DFC2504250425FC3D10251025FE25103D10257C254425444544557C8A44 +8153:0090789048904F9E4890789048904B9C4890789048904F9E4890489048909890 +8154:0040782048204BFE4A027C9449084A04480079FC48204820482048204FFE9800 +8155:004078204BFE4A024D04790049DE4A524A527B524C9A4894491049124A129C0E +8156:002078204BFE482049FC792449FC492449FC7820487048A849244E2248209820 +8157:00203C2025FC252425243DFC2524252425FC3C0027FE24882488448855088A08 +8158:00007BFE4A024A024BFE7A224A224AFA4A227A324A2A4BFE4A024A024BFE9A02 +8159:004078204BFE4A02480079FC480048004BFE7820492849244A224C2248A09840 +815A:004078204BFE4A024C0478004BFE482048207920493C49204AA04A604C3E9800 +815B:00003DFE2502250225FE3D0025FC252025443DFE2512251025FC4510561089FE +815C:00883C8827FE248824883CF82488248824F83C2027FE247024A8452456228820 +815D:00003DFC2420244025FC3D542554255425443D2C242027FE2450448855048A02 +815E:00403C7C248424F824083DFE244024A425383C58249425342454449255508820 +815F:00403C2025FE250226043DFC2440248825FC3C24242025FC2420442057FE8800 +8160:002078204BFE482049FC78404BFE488849047AFA482049FC4820485048889B04 +8161:000079FC4904490449E4792449244BFE4A027AFA4A8A4A8A4AFA4A024A0A9A04 +8162:01FC7924492449FC4924792449FC482048207BFE4A224A2A4AFA4A0A4A029A06 +8163:0040782049FC4800488878504BFE4A224C2479FC492449244934492848209820 +8164:00203C1025FE240024843C4825FE240024FC3C84248424FC2484448454FC8884 +8165:00007BF84A084BF84A087BF848404A404BFC7C4048404BF8484048404FFE9800 +8166:009279244A4849244892784048804BFE4A027A8A4A524A224A524A8A4BFE9A02 +8167:004078A049104A084DF678004BC44A544A547BD44A544A544BD44A444A549AC8 +8168:00203D242524252425FC3C0027FE242024403DFC25542554255445545554890C +8169:002078204BFE482048207BFE4A8A4A524AFA7A224A224AFA4A224A224A2A9A04 +816A:00007BFE4A2248204BFE782049FC492449FC792449FC48204BFE482048209820 +816B:00083C3C25E0242027FE3C2025FC252425FC3D2425FC242025FC442057FE8800 +816C:00003CFC2448243025FE3C522494251026303C2025FE247024A8452456228820 +816D:00003DDC2554255425DC3C0025FC240025FE3C8024FC24042404440454288810 +816E:000079FC4924492449FC7924492449FC4800784048244AA24A8A4C8848789800 +816F:00043C1E25F0251025103DFE2510257C25443D7C2544257C25444544557C8A44 +8170:00007BFE485048504BFE7A524A524BFE480078404FFE48884990486048D89B04 +8171:00107810487C4B1449FE79144A7C4A104F7C791049FE4D104A104B004CFE9800 +8172:00003DFC2524252425FC3D24252425FC24003FFE252025222514454855848902 +8173:00007A9E4A524A524D5279124A924A524C327BD24A5A4A544A504A504BD09A50 +8174:00203C2024A0252C25243D2425AC252425243DFC252424502450448855048A02 +8175:00007BDE4A424A424A427BDE4A004A3E4BD27A124A144BD44A084A144A249A42 +8176:00203DDC2514251425143DD42526250025DC3D14251425D42708450855148922 +8177:00003DFC240024F824883C8824F8240025FC3D24252425FC2524452455FC8904 +8178:00003CFC248424FC24843CFC240025FE24803CFE252A264A2492452254548888 +8179:00403C4024FE248025FC3E8424FC248424FC3C40247C24C42528441054688986 +817A:0040788049FC490449FC790449FC482048327BB448A8492849244A244CA29840 +817B:001878144FFE48104BD078104BF048104BE87A284AA84AA84AAA494A4A269C22 +817C:00003DFE2420244025FC3D542554257425543D54257425542554455455FC8904 +817D:00003CF82488248824F83C88248824F824003DFC255425542554455457FE8800 +817E:0248794849504FFC48407FFE49104A084DF67810491049FC48044BE448149808 +817F:00007A7C49444944487C78444F44497C4950794A49444954496249424A809C7E +8180:004078204BFC490848907BFE4A024C4448207BFC488048F84888490849289A10 +8181:00883C50240025FE24503DFC245427FE24543DFC245024D82554465254508850 +8182:2040FEFE21003C1C24E0449454A888C61FF010101FF010101FF0101010501020 +8183:00003CF824A824A824D83C8824F8240024003DFC255425542554455457FE8800 +8184:00A03D2C2524252425AC3D24252425FC24203DFC248824502420445054888B06 +8185:00203C1025FE2510257C3D1425FE2514257C3D10257C254425444544557C8A44 +8186:002078204BFE482049FC78204BFE4840488879F048244BFE482249244AA29840 +8187:00107A20497C49444844787C4B404940497C79444944497C49444A804C7E9800 +8188:00007BFE480049FC4904790449FC48004BFE7A8A4A524BFE4A224A224A2A9A04 +8189:01043C842488240027FE3C002488250426023DFC255425542554455457FE8800 +818A:002878244BFE482049FC792449FC492449FC792448084BFE4888484848489818 +818B:08202AA44D28145022887FFE40029FF410101FF010101FF01010101010501020 +818C:00203D2424A8255424883D0426FA248824883CF82488248824F8448854888898 +818D:00203C4025FC250425543D242554250425FC3C00251225D4251845525592890E +818E:001E7BE0492248944840788849F0482048C479FE482248204BFE485048889B06 +818F:01007FFC08200FE000007FFE48228FE400001FF010101FF010101FF010101030 +8190:2040FEFE21003C1C24E0449454A888C601003FF8228824482108228824482018 +8191:004078204BFE4A024C1479E04900490049FC791049104FFE4800489049089A04 +8192:00007BFE4A004A7C4A447A444A7C4A004AEE7AAA4AAA4AAA4AEE4A004BFE9800 +8193:010079FC4A004DF8490879F8490849F848007FFE49004BFC4CA449244A549888 +8194:004078204BFE4A504A507BFE4A524A524BFE7A004A924AD44A984A924AD29C8E +8195:000077FE542A542657FE742257AA56AA57AA74325596562E5446548257FEB402 +8196:00207A20497C48A4481878E64B10497E4910797C491049FE491049104AFE9C00 +8197:00207A224BFE4890488879FE4B104D1049FE7910491049FE4910491049FE9900 +8198:00007BFE485049FC4954795449FC480049FC78004BFE482048A849244AA29840 +8199:00007BBE48A248A248BE7B884A084A3E4A2A7BAA48AA48BE4888488A4D7E9A02 +819A:010001FC01003FFE20022FFC28842FFC28842FFC240827F8240847F844088418 +819B:0020792448A84BFE4A0278F84888488848F87820482049FC482048204BFE9800 +819C:008878884BFE4888480079FC490449FC490479FC48204BFE4850488849049A02 +819D:002078204BFE487048AC7B224850488849247A22492448A849244A2248A09840 +819E:00203DFE242025FC25243DFC252425FC24223DFE240825FE2508448854288810 +819F:004078204BFE482048487AF249244A5248F8780848204BFE4820482048209820 +81A0:00007BDE48424A52494A7A52482848C44B1278604988483249C4481848609B80 +81A1:0020792448A849FC48407BFE488849044BFE7D0449FC490449FC490449FC9904 +81A2:002079FC49244BFE492479FC482049FC492479FC48404BFE488849D048709B8C +81A3:004078204BFE4A8A49047BFE4840488849FC7824482049FC482048204BFE9800 +81A4:000079FC48204BFE4A2279AC482049AC480079FC480449FC4804480449FC9804 +81A5:10141010FDFE11107DD43948554A929611223FF8228824482108228824482018 +81A6:0020792448A84BFE48A879244A224904490479DE4A444D54489E49044A049C04 +81A7:00203DFC2488245037FE2C0025FC25242DFC352425FC242025FC442057FE8800 +81A8:008278824FF4488848807BE248024BE44A287A204BE04A22494248744F889A10 +81A9:00147BFE48104BD048107BD048104BD04A507BD04A504BC84A4A4BCA49869A42 +81AA:0040782049FC488848507BFE4A224C2449FC7924492C482049FC490449FC9904 +81AB:00203C2025FC242025543C88250426FA24883CF8248824F8242044A855248860 +81AC:00387BC048784BC048787BC4483C480048C67B3849CE4F3849CE4F38494A9986 +81AD:00203DFC252425FC24203FFE240025FC25043DFC250425FC250445FC54888904 +81AE:0020782049FC48204BFE79084B9C490849887E3E48004BFE4890489049129A0E +81AF:00107BD248544948488A79044AFA4C0049FC7904490449FC490448884FFE9800 +81B0:003C7BE0492448A84BFE78A849244A0249FC7924492449FC4924492449FC9904 +81B1:011078944BD248124A5079904FFE48104BD27A524A544BD44A4A4A4A4BD69822 +81B2:00A0789049FE49104B107DFE4910491049FE7910491049FE49004AA44A529C52 +81B3:008878504BFE482049FC78204BFE492448A87BFE480049FC4904490449FC9904 +81B4:00803C8025FE275425543D5427FE255425543D5427FE24002554452A562A8800 +81B5:00883C8827FE248824203FFE2488248825543E22242027FE2420442054208820 +81B6:00007BDE4A524BDE4A527BDE4A024AFA4A227A724A224A224AFA4A024A0A9A04 +81B7:0280724E54EA55AA59AA7EEA52AC54AA55EA7F8A528A52AA54AC54E858A8B008 +81B8:002079FE4C404AFC49107AFE48004EFC4A847AFC4A844AFC4A844A8C4D0098FE +81B9:00203DFC2420248827FE3C8825FC250425FC3D0425FC250425FC448855048A02 +81BA:00803FFE225024FC2D9036FC249024FC200027F8240827F8440847F884080418 +81BB:00207BFE48004BFC4A047AF44A944BFC480079F8490849F8490849F848009BFE +81BC:00007A7C49444974485478544EFE4A824ABA7AAA4ABA4A824A8A4A844D0098FE +81BD:00803CF8250827FE25443D9225FE2500257C3D00257C2500257C4544557C8A44 +81BE:00203C502488257426023DFC252425AC25243DFC240024F8248844F8548888F8 +81BF:00503DFC255425FC25543DFC240025FE25003D7C250025FE2550455455488A66 +81C0:7E7842487E4854867E7854487E3094CE62001FF010101FF010101FF010101030 +81C1:00207BFE4A884A504BFE7A504AFC4A544BFE7A544AFC4A504AD84D544E529850 +81C2:3E1022FE3E4420287EFEA2103EFC221000001FF010101FF010101FF010101030 +81C3:004078204FFE48284A247A7E4CC84F48497E7A484CC84F7E49484A484C7E9840 +81C4:0040787C48404BFE4A427A784BC44A3C4A007BFE4A404BA44A584DB44C5299B0 +81C5:00003DFC2554255425FC3C8025FE264225F23D52255225F2244A47FA540A8804 +81C6:0040782049FC488848507BFE480049FC490479FC490449FC48204A944A8A9C7A +81C7:00A0789049FE4B2049FC792049FC492049FE79004BDE4A524A524A724A029A06 +81C8:00887BFE488849FC490479FC490449FC488079FE4A224D52490249FA480A9804 +81C9:00203C202450248825043EFA2400240025DC3D54255425DC2488448855548A22 +81CA:00F83C88248824F824003DDC2554255425DC3C2027FE247024A8452456228820 +81CB:7E7842487E4854867E7854487E3094CE63003FF8228824482108228824482018 +81CC:008878884FC848BE48887BC8481C4BD44A547A544BD44A48498848D44F149A22 +81CD:0080704057FC511050A47F58555455525B587000520853F8520853F85208B408 +81CE:03DE78424A52494A4A5278204BFE4888488879544A2248204BFE482048209820 +81CF:004078204BFE4A0249FC79484A5049FC4B0479FC490449FC490449FC48889904 +81D0:001C3DE0242027FE24203DFC25AC257425FC3C2025FC242027FE440055548A2A +81D1:000079FC48204BFE4A2279AC482049AC48007BFE482049FC495449544954990C +81D2:00887BFE48A8489049FE7B2049FC492049FC792049FE49004BFC488848709B8E +81D3:0090709057FE5094500A77FE540855E8554A75EA552A55EA554C55EA5416B862 +81D4:03DE7A924BD24A544BC87A944BE2480049FC790449FC490449FC490449FC9888 +81D5:004078204BFE4A504BFE7A524BFE4A004A947AD84A904AD24A8E4C0049549A2A +81D6:2FEC48244BA4682C4BA46AAC4BA4FFFE10103FF8D0161FF010101FF010101030 +81D7:00207BFE4A8A49FC488879FC490449FC490479FC490449FC4890489449129A0E +81D8:01247A48492448004BFC7A944A644A944BFC7A484B684A484B6A4A4A4A469B62 +81D9:0110711057FC511051F0720852EA56AC52A872AA56EA5A06500052A45252B452 +81DA:0040787C48404BFC4A447BF04A444AFC4AA87AF84AA84AF84A004DFC49549BFE +81DB:01FC78204BFE4A224DAC782049AC489049FE7B204DFC492049FC492049FE9900 +81DC:0108752857BE594857BE731855AA5946500073F852085248524850B05108B604 +81DD:0100FFFE20003FF800003FF820083FF8054077DC555477D4511C7FF65556B922 +81DE:03DE7A524BDE4A524BDE7A524BDE489049FE79104BFE4D1049FE491049FE9900 +81DF:0090709057FE5094500A71FE550857E8514A71EA5F2A55EA554C59EA5216B462 +81E0:210447C88812F3BC20084B92F83E0380AAAAABAA01003FF82288244821082298 +81E1:2450FF4824FE3D9008FC7E9052FC7E9024FE4280BFF822882448292822882458 +81E2:052877BE594857BE531875AA594653FC520473FC520453FC520453FC5108B204 +81E3:00003FFC2100210021003FF820082008200820083FF82100210021003FFC0000 +81E4:00007E0048FC484448447E444244422842287E2848104810482848487E840102 +81E5:00207E204820482048207E204220422042507E5048504850484848887E840102 +81E6:0000FE7E1248124812487E7E42424242424242427E7E124812481248FE7E0000 +81E7:002800245FFE502057A07520152017A4F4A454A857A85510951227AA20464082 +81E8:00407E40487E488049007E7C42444244427C7E0048EE48AA48AA48AA7EEE00AA +81E9:0000FEFE12907EFC42847EFC1290FEFE02007FFC04401830E44E044008401040 +81EA:0100020004001FF01010101010101FF0101010101FF01010101010101FF01010 +81EB:0820082010207F20412041207F20412041207F204120412241227F22411E0000 +81EC:020004001FF010101FF010101FF010101FF00100FFFE054009203118C1060100 +81ED:020004003FF820083FF820083FF820083FF801200110FFFE028004401830E00E +81EE:02001FF010101FF010101FF010101FF0000000FC7F0011101110292845440100 +81EF:02001FF010101FF010101FF010101FF021081110092011102108FFFE01000100 +81F0:02001FF010101FF010101FF010101FF00000FFFE08401F48625014621842E03E +81F1:02001FF01490125011301FF001007FFE4A2291143FF8040007F0081010502020 +81F2:102020207E7C42847F0842FE7E8042BC7EA410A4FEB418A834A25322911E1200 +81F3:00007FFC02000400082010103FF80008010001003FF8010001000100FFFE0000 +81F4:0040FE401040208028FE4508FE881288108810507C50102010501E88F1044202 +81F5:0040FE401078208829504420FE501288110610F87C88108810881E88F0F84088 +81F6:0020FE20102021FE28404440FEBC1284118812887CFE108810881E88F0A84090 +81F7:084008487F4408440840FFFE00407F44104422447F28092A3E12082A0F46F082 +81F8:0000FEFE1010202028444482FEFE1212101010107CFE101010101E10F1FE4000 +81F9:0028F8242024402053FE8A20FA242A2423A4FAA822A822903A92E5AA44460882 +81FA:0100FFFE01003FF800001FF010107FFE40029FF408201FF001003FF80100FFFE +81FB:0020F82023FE402051FC8840FBFE28882134FAE2202021FC3870E0AC43220020 +81FC:00000400387820082008200820083C78200820082008200820083FF820080000 +81FD:040004000FF01010202040408C003078200820083C782008200820083FF82008 +81FE:010005003978210821083D782108210821083FF821080280044008203018C006 +81FF:001001F83F000100FFFE01000D003178210821083D782108210821083FF82008 +8200:00FC7F0002082108111010200C003078200820083C782008200820083FF82008 +8201:060038F8200820083EF8200820083FF808200820FFFE08200820102020204020 +8202:010001007FFC01003FF80200FFFE044008203418D87610101C7010101FF01010 +8203:060038F8200820083EF8200820083FF810001FF820003FFC0004492484940008 +8204:060038F8200820083EF8200820083FF810003FFC400489242494249440280010 +8205:3E7820083C7820083FF800001FF011101FF011101FF002007FF8040818286010 +8206:1100611C47C44204751C47C4410477DC41044104FFFE00000820101020084004 +8207:0A003238238822083A38238820883AB822882288FFFE00000820101020084004 +8208:00002FEC48244BA4682C4BA44AA46AAC4BA44824FFFE00000820101020084004 +8209:0A0033B822083BB820883AB82288FFFE082011102FE8C1061FF0010001000100 +820A:0820FFFE09201FFC30805FF890801FF810801FFC02001C7810081E7810081FF8 +820B:2FEC48244BA4682C4BA46AAC4BA4FFFE80021FF010101FF010101FF01010FFFE +820C:001000F83F0001000100FFFE0100010001001FF010101010101010101FF01010 +820D:01000280044008203018CFE6010001003FF8010001001FF0101010101FF01010 +820E:01000280044009203118CFE6010001003FF8000000001FF0101010101FF01010 +820F:04040E04784408440844FF44084408443E4C22542264224422043E0422040004 +8210:08041C1E71F011101110FD10111011FE7D10451045104508450A7D4A45860102 +8211:08201C20702011FC1124FD2411FC11247D24452447FE450445047D0445140108 +8212:100011F82808445082207C1013FE1022FE24102010207C20442044207CA04440 +8213:08001DFC710411FC1104FDFC108010807DFE464A444A449245227E4244940108 +8214:08001DFC7020102011FEFC50105010887D244622442444B244AA7D2A44A00040 +8215:08201CA270A211241050FC88130410227C2044A444A4452844507C8845040202 +8216:102810242BFE442082207DFC11241124FFFC112411247DFC452445247D24450C +8217:102810242BFE542092207DFC11241124FDFC01247D2445FC452445247D24450C +8218:1020101029FE450282007CF810881088FEF8108010807CFC448444847CFC4484 +8219:00F83F000100FFFE01001FF010101FF00C0C70701010FEFE10107C7C44447C7C +821A:08801CF8710813FE1144FD9211FE11007D7C4500457C4500457C7D44457C0244 +821B:1010101010101E1012FE2210229052908A90049004FE08100810101020104010 +821C:007C3F800108108808907FFE481208101EFC221052900C9008FE101020104010 +821D:02003FF00410FFFE1110222011107FFE440288241FF001001FF021003FF80100 +821E:10003FFC4AA00AA07FFC0AA00AA07FFC101010103EFC4210149008FE3010C010 +821F:020004001FF01010121011101110FFFE10101210111011102010201040508020 +8220:080010003EFC222432242A242A24FE24222432242A242A44224442844B288610 +8221:080010003E7C221032102A102A10FE10221032102A102A10221042104AFE8400 +8222:102020207C204420652455245524FD244524652455245524452445FC54048800 +8223:104020247D244504650454885488FC8844506450542054204450448855048A02 +8224:080010003E78224832482A482A48FE68225832482A482A4A224A428A4A868500 +8225:100020007DFC4524652455245524FD2445FC6500550055004502450254FE8800 +8226:102020207C204420642055FE5420FC204420645054505450448844C855248A02 +8227:081010203E78224832482A482A48FE68225832482A482A4A224A428A4A868500 +8228:1004200E7CF04480648054FC54A4FCA444A464A854A854904510452856448882 +8229:101020907C904488648855245524FE224420644054485444448445FE54828800 +822A:104020207C0045FC6400540054F0FC90449064905490549244924512550E8A00 +822B:104020207C2045FE644054405440FC7C44446444544454444484448455288A10 +822C:080010783E48224832482A862A00FEFC224432442A282A28221042284A448582 +822D:101021107D1045126512551455D8FD10451065105510551245524592550E8800 +822E:102020107C1044FE648254825482FCFE44826480548054804480450055008A00 +822F:102020207C20442065FC55245524FD24452465FC552454204420442054208820 +8230:100021FC7D044504652455245524FD2445246554545054504490449255128A0E +8231:102020207C504450648855045602FCF84488648854A8549044824482547E8800 +8232:082010203E50225032882B242A12FE1023FC32042A082A88225042204A108410 +8233:102020207C20442065FC55245524FD24452465FC552455244524452455FC8904 +8234:108020807C8044FE654055405640FC7C444064405440547E4440444054408840 +8235:082010103E1022FE32822A842A40FE44224832502A602A42224242424A3E8400 +8236:081010103E2022FC32842A842A84FE8422FC32842A842A84228442844AFC8484 +8237:102020107C1045FE642054205444FC8445F8641054205444448245FE54828800 +8238:100020007DFE4408640855E85528FD284528652855E855284408440854288810 +8239:080010783E48224832482A482A8EFF00220032FC2A842A84228442844AFC8484 +823A:100021FC7D244524652455FC5524FD24452465FC552454204420442054208820 +823B:102020207C3C4420642054FC5484FC84448464FC548454804480450055008A00 +823C:104820487C48444865FE54485448FC48444865FE540054484444448454828902 +823D:082010203E3C224432A82A102A28FED6221032FC2A102A9022FE42104A108410 +823E:100023FE7C50445065FC55545554FD5445546554558C55044504450455FC8904 +823F:102020207BFE4850688859044AFAF8004BFE4840688059FC4804480448289810 +8240:1008203C7DC04404654454A85400FDF84410642057FE54204420442054A08840 +8241:081010503E50227C32502A902A10FEFE220032002A7C2A44224442444A7C8444 +8242:104020407CFC44886550542054D8FF2644F8642054F8542047FE442054208820 +8243:100021FC7D24452465FC55245524FDFC4420642055FC54204420442057FE8800 +8244:102021247CA444A8642055FC5504FD0445FC6504550455FC4504450455148908 +8245:102020207C504488650456FA5420FC2047FE6420552855244622442254A08840 +8246:082010103EFC228432842AFC2A84FE8422FC32A22AA42A98229042884AC48482 +8247:100020067BB8488868885908493EFB8848884A886A88593E49004A804C7E9800 +8248:102020107DFE44206448548455FEFC0244A864A854A854A844A844AA552A8A06 +8249:100021FC7D04450465FC5500551CFD70451C6570551E55F04510451255128A0E +824A:081010203E7C2244327C2A442A7CFE10221032FE2A922A92229242964A108410 +824B:100021FC7C084410642057FE5420FCA0444065FC555455544554455457FE8800 +824C:102020207850488869445A2249F8F8084850482068A45A824A8A4A8A4C789800 +824D:100021FC7D04450465FC55105510FDFE45106510557C554445444544557C8A44 +824E:102020407DFC450465FC550455FCFC0047FE6420542055FC4420442057FE8800 +824F:108420487DFE4420644054FC5484FC8444FC6484548454FC4484448454FC8884 +8250:105021247D54450465FC54505488FD4444786488548855504420445054888906 +8251:102020107DFE4502650255FE5500FD0045FE65AA56AA54FE44AA44AA54AA8886 +8252:100021FE7D02457A6502557A5502FC0044FC648454FC548444FC448454FC8884 +8253:104821487D4847FE654855485578FD0045FE642057FE547044A8452456228820 +8254:104020207DFE4548654855FE5548FD78450065FC554455484528451055288AC6 +8255:102020107DFE4484644855FE5502FE24441065FE5440547C4444448454948908 +8256:108420447C4845FE642054FC5420FDFE4440648054FE55104610441055FE8800 +8257:110420847C88440067FE54005488FD04460265FC555455544554455457FE8800 +8258:10A0212C7D24452465AC55245524FDFC442065FC548854504420445054888B06 +8259:102020207C50444864A455FE5684FCFC448464FC548054FC45444544567C8844 +825A:105020507DFE445065FC555455FCFD5445FC640054F8548844F8448854F88888 +825B:102021FC7D2447FE652455FC5420FDFC452465FC544057FE448845D054708B8C +825C:115421547BFE495469545A724C00FBFE4A22482069FC592449244924492C9820 +825D:100021FC78204BFE6A2259AC4820F9AC480049FC680459FC4804480449FC9804 +825E:111021107DDE46A8644454505554FCD8445064D8555456524490449255128A0E +825F:102021FC7C88445067FE540055FCFD2445FC652455FC542045FC442057FE8800 +8260:101023D278544948688A59044AFAFC0049FC4904690459FC490448884FFE9800 +8261:1020212478A84BFE6A0258F84888F88848F8480069FC592449FC492449FC9904 +8262:102020207BFE492469245AAA4FFEF80049FC4904697459544974490449FC9904 +8263:1040207C78404BFE6A425BF84A44FAFC4AA84AF86AA85AF84A204DFC4844998C +8264:110420887BFE482069FC58204BFEF854499248906BFE589048D44B8A489699A2 +8265:101023D47A524A526BD058104FFEFA504BD24A526BD45A544AEA4F4A48569862 +8266:100823E87A884BEE6A285BF44A82FBE2480049FC69545954495449544FFE9800 +8267:108823FE7CA8449065FE572055FCFD2045FC652055FE550047FC448854708B8E +8268:108823FE78884BFE6A0259FC4800FBFE484048A26B5458B84B5448924B509820 +8269:104020207BFE488868525FAC4AAAFAA84DAC4800690459FC490449FC49049A04 +826A:108021F87E0845FC652455FC5524FDFC4554662A55FC550445FC450455FC8904 +826B:1040207C78404BFC6A445BF04A44FAFC4AA84AF86AA85AF84A004DFC49549BFE +826C:11F022107BFC4E046BFC5A244BB8FA2249FE4A106FFC5A444BFC48D0494A9A3E +826D:110822947BDE4EB46BDE5A944BDEFA944BDE4A106FFC59084890486049989E06 +826E:00003FF0201020103FF0201020103FF022002208211020A02440282030182006 +826F:020001003FF0201020103FF0201020103FF02208211020A02040242028183006 +8270:000001F8FD08050845F84508290829F811441148293029204510454881860100 +8271:2200227CFF4422443E7C08447F44497C7F5208527F540848FF48144422624140 +8272:080008001FE020204040BFF82108210821083FF820002002200220021FFE0000 +8273:1080108010F8FD08121015FC11247D24112411FC1100FD001102110210FE1000 +8274:28202820287CFE442A882A7CFE54A854A854FF7C294029402D424A42483E8800 +8275:4240244000FC7E88251024FC24A424A4FFA424FC2480248024824482447E8400 +8276:28402840FEF8AA88FF10AAFCFEA400A4FEA400FC7C8044807C8248823E7EC000 +8277:2A107F10AA9CFFA4AAC8FFBEAAAAFFAA002AFFBE00207F2041227F222222FF9E +8278:10101010101092929292929292929292FEFE1212101010102010201040108010 +8279:08200820FFFE0820082000000000000000000000000000000000000000000000 +827A:08200820FFFE0820082000003FE000C00300040008001000200420041FFC0000 +827B:08200820FFFE08200A20020002007FF802080408040808080808100820504020 +827C:08200820FFFE0820082000007FFC010001000100010001000100010005000200 +827D:08200820FFFE08200820040004007FE0042004200820082010222022401E8000 +827E:04400440FFFE044000200820082004400440028001000280044008203018C006 +827F:04400440FFFE044000003FF8040804100420047C080408041004204440288010 +8280:08200820FFFE0820082000003FF8020802080208020804080408080810506020 +8281:08200820FFFE0820082000000FE00820082008200820102210222022401E8000 +8282:08200820FFFE0820082000007FF8020802080208020802500220020002000200 +8283:08200820FFFE0820082000000FE0082008200A200920092210221022201E4000 +8284:08200820FFFE08200820020002007FE002200A200420062009221022201E4000 +8285:08200820FFFE08200A200210021002FEFF00020001000100008000420032000E +8286:08200820FFFE082000003FF0121011200820044002800100028004401830E00E +8287:08200820FFFE08200820010001003FF821082108210821082128211001000100 +8288:09200920F93E0920092001003FF8010001000100FFFE01000100010001000100 +8289:08200820FFFE0820082000003FF8010001000100FFFE01000100010001000100 +828A:04400440FFFE0440000000F83F00010001000100FFFE01000100010001000100 +828B:08200820FFFE082000003FF8010001000100FFFE010001000100010005000200 +828C:0820FFFE082000003FF800000000FFFE040008000FF000100010001000A00040 +828D:04400440FFFE0440100010001FF8200840088808040802080208000800500020 +828E:04400440FFFE044000003FF8000800083FF8200020003FFC0004000400280010 +828F:08200820FFFE082009200100010001003FF801000100010001000100FFFE0000 +8290:08200820FFFE082008200000FFFE020002000240022002100208020002000200 +8291:08200820FFFE082000003FF00010001000103FF020002004200420041FFC0000 +8292:08200820FFFE0820082002000100FFFE0800080008000800080008000FFC0000 +8293:08200820FFFE0820082000001FE0004000800100FFFE01000100010005000200 +8294:01002108210821083FF8010011101010929292929292FEFE2212201040108010 +8295:08200820FFFE08200A20020007F808081010642002400280010006001800E000 +8296:08200820FFFE0820092001000100FFFE0100028002800440082010102008C006 +8297:08200820FFFE0A20040008101FE000C003040C083FF01020004001800E007000 +8298:08200820FFFE082008202080208020883C9020A020C0208424842884307C0000 +8299:08200820FFFE0820092001003FF801000100FFFE01000280044008203018C006 +829A:08200820FFFE082009200100FFFE01002108210821083FF8010A0102010200FE +829B:08200820FFFE082000003FF002100210FFFE021004103FF0081010002000C000 +829C:08200820FFFE082000003FF0020002007FFC02800480048008841084207CC000 +829D:08200820FFFE08200A20010001007FF8003000C003000C003000480087FE0000 +829E:04400440FFFE044010001FFC20005FF880003FF0001000100010000A00060002 +829F:08200820FFFE082000000FE008201020601C00001FE00820044003801C70E00E +82A0:08200820FFFE08200820020001007FFC0820082004400280010006C01830E00E +82A1:04400440FFFE0440080008000FFC10042108410001000280044008203018C006 +82A2:08200820FFFE082000000800080013FC3000500090001000100017FE10001000 +82A3:08200820FFFE0820082000007FFC008001000300056009183104C10201000100 +82A4:04400440FFFE044000007F400240044008400F40F840484208420842283E1000 +82A5:08200820FFFE082009200280044008203458C446044004400840084010402040 +82A6:08200820FFFE0820092000803FF8200820083FF8200820002000400040008000 +82A7:08200820FFFE082000003FF0002006400180FFFE008200840080008002800100 +82A8:04400440FFFE044000003FF0082008400CF80A08111010A0204020A043188C06 +82A9:08200820FFFE08200920028004400A203118C1061FE000200040004000800100 +82AA:08200820FFFE082000783F802080208020803FFE2040204020242814300C2004 +82AB:08200820FFFE082000001FF0000000007FFC044004400440084408441044603C +82AC:08200820FFFE082000400440082010102008DFE6042004200820102021404080 +82AD:08200820FFFE082000003FF82108210821083FF820002002200220021FFE0000 +82AE:08200820FFFE0820092001003FF8210821082288244828282008200820282010 +82AF:08200820FFFE0820082002000100008004082404240244028410041003F00000 +82B0:08200820FFFE092001007FFC010001003FF0082004400280010006C01830E00E +82B1:08200820FFFE082000000888089010A030C050809180128214821082107E1000 +82B2:08200820FFFE0820092002800C603018C80608E00F0078080808080807F80000 +82B3:08200820FFFE08200A200100FFFE0400040007F0041008100810101020A04040 +82B4:08200820FFFE0820100010001FF8224842488488088811082208440808501020 +82B5:08200820FFFE0820092001003FF0011001100110FFFE0280044008203018C006 +82B6:08200820FFFE082010001FF8200844088408090810883FC81048000800500020 +82B7:08200820FFFE08200820010001000100110011F81100110011001100FFFE0000 +82B8:08200820FFFE0820082000003FF800000000FFFE02000400082010103FF81008 +82B9:08200820FFFE082000381FC0100010001FFC1040104010402040204040408040 +82BA:08200820FFFE0820082000F03F0001000100FFFE01000280044008203018C006 +82BB:080008001FF8220852481FC80408085030201FF8220852489FC8040808503020 +82BC:08200820FFFE0820082000F83F00010001F83F00010001FC7F020102010200FE +82BD:08200820FFFE082000003FFC0020102020203FFE012002200C203020C0A00040 +82BE:08200820FFFE082009200100FFFE010001003FF8210821082108212821100100 +82BF:08200820FFFE0820100017F8210821106120A13C210421042204220424282810 +82C0:08200820FFFE08200A2001007FFC000000000FE00820082008221022201EC000 +82C1:08200820FFFE0820082000000820082008200820082014501250228841048202 +82C2:08200820FFFE082009200100110811081110212002800280044008203018C006 +82C3:08200820FFFE08200A200200FFFE040004000FF008101420224041808670380E +82C4:08200820FFFE08200A2001000100FFFE02000200024002200210020002000200 +82C5:08200820FFFE0820082002044244244414440844084414442404420482140008 +82C6:08200820FFFE08200820200021FC2C44F0442044204424842884310422280410 +82C7:08200820FFFE092001007FFC010001001FF0010001007FFC0104010401140108 +82C8:08200820FFFE082000003FFC210021002FF82108210822082208440848509020 +82C9:08200820FFFE082000003FFC22402240224022442444243C280020003FFC0000 +82CA:08200820FFFE082000003FFC2000200027E02420242024A024444404440483FC +82CB:08200820FFFE0820082000001FF010101110111011101290028004821882607E +82CC:04400440FFFE04400800083009C00E000800FFFE0900088008400A300C0E0800 +82CD:08200820FFFE082009200280044008203018CFE60820082008A80848080807F8 +82CE:08200820FFFE08200A2001007FFE4002800400000000000000007FFC00000000 +82CF:08200820FFFE08200A2002007FF0021002142212221224124410081010A02040 +82D0:0820FFFE082000003FF8010801083FF8210021003FFC030405041928E1100100 +82D1:04400440FFFE044010001EF812882288228852A88C90048208821082207E4000 +82D2:08200820FFFE0820082001003FF8210821083FF821082108FFFE200820282010 +82D3:08200820FFFE0920028004400A203118C1061FE0002000400C80030000800040 +82D4:08200820FFFE08200400082010103FF8000800001FF01010101010101FF01010 +82D5:08200820FFFE082000007FF80408080810502020DFF81008100810081FF81008 +82D6:08200820FFFE0820092001003FF82108210821083FF82108210821083FF82008 +82D7:08200820FFFE0820082000003FF82108210821083FF82108210821083FF82008 +82D8:04400440FFFE044000003FF82008200827C824482448244827C8200820282010 +82D9:08200820FFFE08200A20010000007FFC001010100820044004800000FFFE0000 +82DA:08200820FFFE082000003FF8210821083FF8210821083FF82108410841288010 +82DB:08200820FFFE082000007FFC001000101F10111011101F101110001000500020 +82DC:08200820FFFE082000003FF8200820083FF8200820083FF8200820083FF82008 +82DD:08200820FFFE082008200000044004447C480470044004420C423442C43E0400 +82DE:04400440FFFE044008001FF020105F90109010901F901050102410040FFC0000 +82DF:04400440FFFE044010001FF8200840089F88108810881F881088000800500020 +82E0:08200820FFFE08203FF8200820083FF8208020803FFC204020242414280C3004 +82E1:08200820FFFE0820000024102210211021102010202024202850308821040602 +82E2:08200820FFFE082000001FF0101010101FF0100010001FF8100810081FF81008 +82E3:08200820FFFE082000003FF8200020003FF0201020103FF02000200020003FFC +82E4:08200820FFFE082000007FFC00800100036005101908610401000100FFFE0000 +82E5:08200820FFFE08200A200200FFFE040008001FF028104810881008100FF00810 +82E6:08200820FFFE0820092001000100FFFE010001001FF01010101010101FF01010 +82E7:08200820FFFE08200A2001007FFE400280043FF8010001000100010005000200 +82E8:04400440FFFE04401FF8100810081FF810001200123813C02204220441FC8000 +82E9:08200820FFFE0820092002003FF82008200820083FF82008200820083FF82008 +82EA:08200820FFFE082000007FFC010001003FF82108228824482828200820282010 +82EB:08200820FFFE08200920010001FE0100010001003FF82008200820083FF82008 +82EC:08200820FFFE082000003FF8210821082108210822882448282820083FF82008 +82ED:08200820FFFE08201040104021FC24444444F844104420444884FC8445280210 +82EE:08200820FFFE0820000008200820102031245124912411241124112411FC1004 +82EF:08200820FFFE0820010001007FFC03800540092011102FE8C106010001000100 +82F0:08200820FFFE082000007E10021002103E10202040287E24024402FE14420800 +82F1:08200820FFFE0820010001001FF0111011101110FFFE0280044008203018C006 +82F2:04400440FFFE0440080008001FFC2400440087F00400040007F8040004000400 +82F3:08200820FFFE0820040008001FF02820444003801C70E30E00C00E0001800040 +82F4:08200820FFFE082000001FF0101010101FF0101010101FF010101010FFFE0000 +82F5:08200820FFFE0820010011001FF821000100FFFE01000280044008203018C006 +82F6:08200820FFFE082009200280044009203118C106010009201110210805000200 +82F7:04400440FFFE044010101010FFFE1010101010101FF01010101010101FF01010 +82F8:08200820FFFE0820001000F83F00111009200100FFFE01000100010005000200 +82F9:08200820FFFE082000007FFC01001110091009200100FFFE0100010001000100 +82FA:08200820FFFE082000001FF012101110FFFE1010221021103FFC001000A00040 +82FB:04400440FFFE044008100810101013FE30105110909010901010101010501020 +82FC:08200820FFFE0920110011003FFC4100810001003FF8010001000100FFFE0000 +82FD:08200820FFFE0820000000781FA012201220122012101290224822A843248202 +82FE:08200820FFFE0820082001000090089048244842488289020E101810E7F00000 +82FF:08200820FFFE0820092001003FF801000100FFFE0380054009203118C1060100 +8300:08200820FFFE082004403FF8044804481FF8144024403FFC0844105420484040 +8301:08200820FFFE082009202108210821083FF8010801004104410441047FFC0004 +8302:08200820FFFE0820009000883FFC2080208820882050205020244054418C8604 +8303:04400440FFFE0440100009F84908210825080528091071021102110210FE0000 +8304:08200820FFFE082000001000107C7E441244124412441244224422444A7C8444 +8305:08200820FFFE082000003FF0002006400180FFFE0282048408803080C2800100 +8306:08200820FFFE082000000C0070FC4084448444845C8464944888088010806080 +8307:04400440FFFE044002100208FFFE040004000FF008101420224041808670380E +8308:08200820FFFE08200440044024442448275024602440244224422F42F03E4000 +8309:08200820FFFE092001000100FFFE010001007FFC0380054009203118C1060100 +830A:04400440FFFE0440001000781F80100010001FFC1040104010401040FFFE0000 +830B:08200820FFFE082008783F802080208020803FFE2040204022242914308C2084 +830C:04400440FFFE0440080008401040104037FE5040904010401040104013FC1000 +830D:04400440FC7E0440144010001FF8200840089F88108810881F88000800500020 +830E:04400440FFFE044000003FF0006001800E70700C1FF0010001000100FFFE0000 +830F:08200820FFFE08200820004004207FFC04800488089008A010C223824C82807E +8310:04400440FFFE0440100010001FF822484A4884880A8811082288440808501020 +8311:08200820FFFE092002001FF012101110115010201FFC00047FE4000400280010 +8312:04400440FFFE044010001E7C12442248225052488C4404440854104820404040 +8313:08200820FFFE08200A2001007FFE40028004044004400820082010102008C006 +8314:08200820FFFE082000007FFE4002810401003FF80100010001000100FFFE0000 +8315:08200820FFFE082000007FFE400280041FE0042004203FA004200414040C0404 +8316:04400440FFFE044008000FF010202C4003801C70E00E1FF0101010101FF01010 +8317:08200820FFFE0820020007F808103420024001800FF81808E80808080FF80808 +8318:04400440FFFE044000003FF804080850302000007EFC1224122422444A948508 +8319:08200820FFFE082000900088FFFE0080108810887E50105010242054418C8604 +831A:08200820FFFE0820060078FC408440847E844084408440944E88708000800080 +831B:04400440FFFE044000003FF020103FF020103FF02208211020A024402830300E +831C:04400440FFFE04400000FFFE044004403FF8244824482848303820083FF82008 +831D:08200820FFFE082000003FFC2080208027F82408240827F8208020803FFE0000 +831E:08200820FFFE082000003FFC210021003FF8200820083FF8210021003FFC0000 +831F:08200820FFFE082001003FF00110FFFE01103FF001003FF80100FFFE01000100 +8320:04400440FFFE0440000008400840104037FC50E0915011501248144418421040 +8321:08200820FFFE0A2001007FFC400480081FE000400080FFFE0100010005000200 +8322:08200820FFFE082000047F84082408241F24212451240A24040408043014C008 +8323:04400440FFFE044000001FF010101FF000003FF80100FFFE028004401830E00E +8324:0820FFFE0820020007E01840648003200C4071F806081A10012000C007007800 +8325:08200820FFFE082001003FF801000100FFFE000001003FF801000100FFFE0000 +8326:08200820FFFE09200100FFFE01003FF8210821082128239005601918E1060100 +8327:08200820FFFE0820092001003FF82108210821083FF80100011001F87F042004 +8328:08200820FFFE08204080208020FC0904124814402040E0A020A0211022082C06 +8329:08200820FFFE082000781F80100010001FFC1000100017F82408240847F88408 +832A:08200820FFFE08200100111009100920FFFE04400440044008421042203EC000 +832B:08200820FFFE082008202040102087FE490009001100E1002100210021FC0000 +832C:08200820FFFE0A2002000400FFFE08001040304053FC90401040104017FE1000 +832D:08200820FFFE08200A2001007FFC08201010244844440280010006C01830E00E +832E:08200820FFFE0A20020003F802000200FFFE0000010011101108210445040200 +832F:08200820FFFE0820000008500848104037FE504090A010A01110111012081406 +8330:0820FFFE092001003FF8210821083FF8210821083FF811000A00060019C0E03E +8331:04400440FFFE0540110011003FF841000100FFFE0380054009203118C1060100 +8332:04400440FFFE04401020102020402448448878F008101020142822447EFC0204 +8333:08200820FFFE08200820200017FC90404040484008401040E04020402FFE2000 +8334:04400440FFFE044000003FF82008200827C82448244827C8200820083FF82008 +8335:04400440FFFE044000003FF8210821082FE8210822882448282820083FF82008 +8336:08200820FFFE082009200280044009203118DFF6010009201110210805000200 +8337:08200820FFFE0820000008A00890108030FC57809048105010241054118C1604 +8338:08200820FFFE082000007FFC10101FF010101FF01010103EFFD0001000100010 +8339:08200820FFFE082010001000FE7C124422442244644414440844147C2244C000 +833A:08200820FFFE0A200100FFFE0400082010103FF804480440044008441044603C +833B:1010929292929292FEFE2010401080001010929292929292FEFE221220104010 +833C:08200820FFFE082000003FF820082FE8200827C82448244827C8200820282010 +833D:08200820FFFE082000001040104027FC6444A444244427FC2444204020402040 +833E:08200820FFFE0820082000007FFC082008200820FFFE08200820102020204020 +833F:08200820FFFE0820082000007DF011101110119011501D12E2124212040E0800 +8340:04400440FFFE144010001FF820085FC890481FC810481FC81048000800500020 +8341:08200820FFFE082000007FFC00001FF010101FF010101FF010100000FFFE0000 +8342:0820FFFE0A2002007FFC0440082037D8C0063FF808000FE00020002001400080 +8343:08200820FFFE09200280044008203018CFE6010001001FF0010001007FFC0000 +8344:08200820FFFE08200A2001007FFC040008401F8001100620384001A00E107008 +8345:08200820FFFE0820092002800C603018CFE600001FF01010101010101FF01010 +8346:12041204FFC4122400247FA4122412241224FFE4122412242204220442148208 +8347:04400440FFFE0440100021FC4000880013FE3020502090201020102010A01040 +8348:04400440FFFE0440101010103E1022FC4210A490149008FE1010201040108010 +8349:04400440FFFE044000001FF010101FF010101FF00100FFFE0100010001000100 +834A:08200820FFFE082000047F84122412241224FFE4122412242204220442148208 +834B:08200820FFFE082000007FFC010002003FF82488248824882488248824A82010 +834C:08200820FFFE0A2001007FFE400282040200FFFE042008201C4003800C707008 +834D:08200820FFFE082004404440448044FE450846885C9064504420045004880506 +834E:08200820FFFE082000007FFC040008201FF0011001003FF801000100FFFE0000 +834F:04400440FFFE04400810087813C0304050409FFE104010401040104017FC1000 +8350:08200820FFFE0A2002007FFC040009F8081018202BFE48208820082008A00840 +8351:08200820FFFE08200100FFFE01007FF801083FF821003FFC0284044C1830E00E +8352:08200820FFFE0A200100FFFE100010001FF8000011101110111021124112810E +8353:04400440FFFE0440101008207FFC082008200820FFFE08200820102020204020 +8354:0820FFFE0A2002003FF0041018A06040102010207EFC1224224422444A948508 +8355:08200820FFFE082000003E20222022FC3E24222422243E24224442444A948508 +8356:08200820FFFE0A2002083FD002200240FFFE0100061018E02F00C808080807F8 +8357:08200820FFFE0820009000883FFC2080208830882850245020244054418C8604 +8358:08200820FFFE0820000008204820282028200BFE082018202820C82009FC0800 +8359:08200820FFFE082020401040104007FC704010A01090110812041404280047FE +835A:08200820FFFE0820010001003FF8010011100920FFFE0280044008203018C006 +835B:08200820FFFE0A2002FC7F20014000840764381C00007FFC044008421042603E +835C:08200820FFFE0820208020883EB020C42084267C39000100FFFE010001000100 +835D:08200820FFFE082000047F044124492449244924492449241424220441148088 +835E:08200820FFFE082000F03F000200FFFE044008203458C4460440044008401040 +835F:08200820FFFE092002800440082037D8C00600003FF80200044008201FF00810 +8360:08200820FFFE0A2001007FFC0820044003800C603018C4460440044008401040 +8361:08200820FFFE0820000023F01020104080804BFC48A41124E244248421282210 +8362:08200820FFFE0A2001007FFE400280043FF801000100FFFE0100010005000200 +8363:08200820FFFE082000007FFE4002810401007FFC0380054009203118C1060100 +8364:0820FFFE082000007FFE420282043FF8090011001FF001000100FFFE01000100 +8365:08200820FFFE082000007FFE4002810401047D880550092011102108C5060200 +8366:08200820FFFE082000007FFE4002810411001FF821000100FFFE010001000100 +8367:08200820FFFE082000007FFE400281041110111022A00280044008203018C006 +8368:08200820FFFE08203FF000101FF000103FF00020FFFE08200420042000A00040 +8369:04400440FFFE04401FF0101010101FF010801040162021102088460681800040 +836A:04400440FFFE044000007C200420082010A810A41D24F1221222102050A02040 +836B:04400440FFFE044000007CFC4484488450FC4884448444FC5484488441144208 +836C:04400440FFFE044000007FFC04040288128008800900FFFE0240042018106008 +836D:08200820FFFE08201000100021FC4420F82010202020FC2040201C20E3FE4000 +836E:04400440FFFE044010081008200845FEF80810882048FC4840081C08E0284010 +836F:04400440FFFE04401080108020FC4504FA0410842044FC4400041C04E0284010 +8370:04400440FFFE0440102010201020FC2031FC3820542050209020102013FE1000 +8371:08200820FFFE08203FF820083FF8200020702F8020F02F8020F85F824082807E +8372:0440FFFE044000001FF0111011101FF0111011101FF001003FF801000100FFFE +8373:08200820FFFE082000007FFC00001FF0101010101FF0000008200440FFFE0000 +8374:04400440FFFE044010201020FDFC10201420182033FED0501050108851042202 +8375:08200820FFFE082000007FF80208120824280810310008844892481287F00000 +8376:08200820FFFE08200040004078A049104A884C4648404BF07810482000200040 +8377:04400440FFFE0440100017FE20086008A7C824482448244827C8200820282010 +8378:08200820FFFE092001003FF801007FFE40029FE400400180FFFE010005000200 +8379:08200820FFFE0820010011F811001100FFFE010009081110606001800E00F000 +837A:08200820FFFE08200820108010FC7D041204108410541C24E044418400280010 +837B:04400440FFFE04404420282010A428A448A89920282048508850088851042202 +837C:08200820FFFE092002800440082037D8C10601003FF801001110210845040200 +837D:08200820FFFE082000F87F00221011200200FFFE042008201C4003800C707008 +837E:0820FFFE08200400082010103FF804480820121067E80820144003801C70E00E +837F:08200820FFFE0820009000883FFC208020883E88225022502A244454418C8604 +8380:08200820FFFE082000003FF820002FF020003FFC248824504420451886060400 +8381:08200820FFFE082000007FFC01001110111011102928454485840100FFFE0000 +8382:08200820FFFE08203F04210421243F24082408247FA408A410A4108422944108 +8383:0440FFFE044030100CE003000CC03230FFFE080011003FF0D110115011200100 +8384:0820FFFE082000007FFC01003FF821083FF821083FF821001A00060019C0603E +8385:08200820FFFE082008800840104033FC50009008120811101110102017FE1000 +8386:08200820FFFE09200110FFFE01003FF821083FF821083FF82108210821282110 +8387:04400440FFFE044000203E20222022FC3E2422243E24222422442F44F0944108 +8388:08200820FFFE082021F011101110820C440053F011102110E0A0204021B02E0E +8389:04400440FFFE044000000608780808480848FF481C482A484948880808280810 +838A:04400440FFFE044000002420242024203C2007FE0420FC202420242025FC4400 +838B:04400440FFFE04400880088010FE11403240547C90401040107E104010401040 +838C:04400440FFFE0440082004401FF01010101010101FF00440044008421042603E +838D:04400440FFFE0440011001087FFC0100211811A007401920E118410605000200 +838E:08200820FFFE082000001020082040A824A40522092272281010106011800600 +838F:08200820FFFE082010001020FC2010A814A419223122D2281010106051802600 +8390:08200820FFFE08202040104013FC8244444810A010A0E120212022222422281E +8391:0440FFFE044008001FF0282007C01830E10E1FF001001FF001007FFC01000100 +8392:08200820FFFE082000001FF0101010101FF000003FF82008200820083FF82008 +8393:04400440FFFE144010003FFC40009FF012101110FFFE221021103FFC00100060 +8394:04400440FFFE044000003FF8200824482828301827C82448244824483FF82008 +8395:08200820FFFE092001007FFC054009203118C1061FF01010101010101FF01010 +8396:08200820FFFE082000007FFE08881110222011103FF8010001000100FFFE0000 +8397:08200820FFFE082001007FFC01003FF821083FF821083FF80100FFFE01000100 +8398:08200820FFFE0A2001003FF8000008200440FFFE010001007FFC010001000100 +8399:08200820FFFE082000003FF80408FFFE04083FF808001FF8280848088FF80808 +839A:04400440FFFE044000187BE00840104022787A400A402BFC1000280047FE8000 +839B:04400440FFFE044000387BC00840104023F8784008402BFC1000280047FE8000 +839C:08200820FFFE0820000010401040247E24886488A54824502420205020882306 +839D:08200820FFFE082001001110111011102928454481003FF801000100FFFE0000 +839E:08200820FFFE0A2001003FFC200440081FE000007FFC0440044008441044603C +839F:08200820FFFE09200280044009203098CFE6004000801FF0101010101FF01010 +83A0:04400440FFFE04701F8001007FFC054009203118CFC6044004F0081010506020 +83A1:04400440FFFE044000001FF0101010101FF00100110011F81100290047FE8000 +83A2:08200820FFFE0820092001007FFC11101110292845440280044008203018C006 +83A3:08200820FFFE092000807FFC080008000FF80000010008844892481287F00000 +83A4:08200820FFFE08200000FFFE04403FF824482448283830083FF820083FF82008 +83A5:08200820FFFE082044002BF81048284848489BF8284848888888088857FE2000 +83A6:08200820FFFE08200100111009201FF010101FF010101FF01010101010501020 +83A7:08200820FFFE082000001FF010101FF010101FF010101FF0044008421042603E +83A8:08200820FFFE0A2001001FF010101FF010101FF0110410881050122014181806 +83A9:08200820FFFE082000F87F00221011203FE000400080FFFE0100010005000200 +83AA:08200820FFFE0820064038500848FFFE084008400E2478280812082A28C61302 +83AB:08200820FFFE082000001FF010101FF010101FF001007FFC028004401830E00E +83AC:08200820FFFE0820040007E0082010403FF8510811081FF8028004821882607E +83AD:08200820FFFE082000007E7C42447E4442447E44404450544848544062404040 +83AE:08200820FFFE082000003FF821083FF821083FF802007FFC0404080410286010 +83AF:08200820FFFE082008202040104097FE40E0415011502248E444284220402040 +83B0:04400440FFFE04401080108010FC7D041248104010401CA0E0A0411002080C06 +83B1:08200820FFFE092001003FF80100111009207FFC0380054009203118C1060100 +83B2:08200820FFFE0820208017FC1140024073FC1040104017FE1040284047FE0000 +83B3:04400440FFFE044000107C10441045FE44107D104490449044107C1044500020 +83B4:04400440FFFE04401FF0101010101FF001007FFC410442844444484440144008 +83B5:08200820FFFE092002003FF82108210821083FF8228804900888108A2082C07E +83B6:08200820FFFE0820092002800440082037D8C00602101110092008407FFC0000 +83B7:08200820FFFE082044402850104828404FFE984028A048A08910091052082406 +83B8:04400440FFFE04404490288810882BFE48A098A028A0492089200A225222241E +83B9:08200820FFFE082000007FFE400280043FF8010001001FF00100014001207FFC +83BA:08200820FFFE08207FFE42029FF410101210115010201FFC000400047FD40008 +83BB:04400440FFFE044000003FE00420047C08043014C0083E44225822623E42223E +83BC:04400440FFFE04401020102023FE44207924112421247DFC00221C22E022401E +83BD:0820FFFE0820024002207FFC044008203018C82608207FFC0820102020204020 +83BE:0820FFFE0A2002007FFC0440092037D8C106092008207FFC0820082010202020 +83BF:04400440FFFE044008000804FFA408247F2449244B241C242A24490488140808 +83C0:08200820FFFE0A2001007FFE400290041EF82288248854A8089008841084607C +83C1:0820FFFE09203FF801001FF00100FFFE00001FF010101FF010101FF010101030 +83C2:08200820FFFE0820104020407E7C4284430442447E244224420442047E284210 +83C3:08200820FFFE0820200013FE920042004BFC0A041204E3FC2200220023FE2000 +83C4:08200820FFFE08200100FFFE01003FF821083FF821083FF803800D603118C106 +83C5:08200820FFFE082001007FFE40029FE410201FE010001FF0101010101FF01010 +83C6:08200820FFFE08207F0022FC22443E44224422283E2822102790FA2842440282 +83C7:04400440FFFE044010101010FEFE12102210227C6444144408441444227CC044 +83C8:08200820FFFE082010401020FC2011FC140018083108D0901090102053FE2000 +83C9:08200820FFFE08203FF000101FF00010FFFE111009A005401930E10E05000200 +83CA:04400440FFFE044010001FFC220452448A8402047FF407040A84124462140208 +83CB:08200820FFFE0820004000407BF8484048404FFC48E079504A48044408420040 +83CC:0820FFFE082000003FF8200820C8270821082FE823882548292821083FF82008 +83CD:08200820FFFE09200280044009203098CFE60040028001004884481287F20000 +83CE:08200820FFFE082000001FF810081FF810081FF82080208C3EF020822682387E +83CF:04400440FFFE0440200017FE100880084BC84A481248E3C82248200820280010 +83D0:0440244814500440FFFE082004407FFC01003FF80100FFFE028004401830E00E +83D1:08200820FFFE08200888111022201110088800003FF821083FF821083FF82008 +83D2:08200820FFFE082000003FF820083FF820083FF80100FFFE054009203118C106 +83D3:08200820FFFE082000003FF821083FF821083FF80100FFFE054009203118C106 +83D4:08200820FFFE08203EFC228422943E88228022FC3EA422A422A822904AA884C6 +83D5:08200820FFFE092002800C6037D8C0063FF8248824883FF82488248824A82010 +83D6:04400440FFFE04401FF010101FF010101FF000003FF820083FF820083FF82008 +83D7:04400440FFFE04401020102011FCFD24112411241DFCF1241124112451FC2104 +83D8:04400440FFFE0440101010901090FD0831483A44544250909088110813FC1104 +83D9:0820FFFE082000F83F0001007FFC09200920FFFE092009207FFC010001003FF8 +83DA:08200820FFFE0820021002FC7F4000840764781C021002FC7F4000840764781C +83DB:08200820FFFE082000007C7C44447C7C44447C7C400440044004400440144008 +83DC:08200820FFFE0820001000F83F001110082001007FFC054009203118C1060100 +83DD:08200820FFFE082010481044FDFE1040144018FC30A4D12811281210542820C6 +83DE:08200820FFFE08200C80708010FC1124FD243224384454445084910412281010 +83DF:0440FFFE044008000FE0102020405FF8110811081FF8028004A008921082607E +83E0:04400440FFFE04402020102013FC822442204BF80A881288E25024202450298C +83E1:04400440FFFE044000001FE040445194492443C445444924551442047FFC0004 +83E2:08200820FFFE082010801080FDFC120415F411141D14F1F4110C1102510220FE +83E3:08200820FFFE082000007F7C484448447F44412841287F10481048287F440082 +83E4:04400440FFFE0540111009203FF802007FFC082010102FE8C8260868080807F8 +83E5:04400440FFFE04401000100C11F0FD00110031FE391055105110921012101410 +83E6:04400440FFFE0440201813E01200020073FC1220122012201420282047FE0000 +83E7:08200820FFFE092000803FFE200020782F80288028802FFC284048244A948C4C +83E8:08200820FFFE0A2001003FF808200440FFFE04007FFC08201C4003800C707008 +83E9:08200820FFFE082001003FF808200440FFFE000000001FF0101010101FF01010 +83EA:0820FFFE0A2001007FFE400280043FF0040008001FF02810481008100FF00810 +83EB:08200820FFFE08207FFC01003FF821083FF801007FFC01003FF80100FFFE0000 +83EC:08200820FFFE082023FC10841084808449144A0815FCE1042104210421FC2104 +83ED:08200820FFFE082020801110120887FC4204500013F82208E208220823F82208 +83EE:08200820FFFE092000803FFE20802FF820883FFE20882FF8214042204C18B006 +83EF:04400440FFFE04407FFC11101110FFFE111011107FFC0100FFFE010001000100 +83F0:08200820FFFE0820001C7DF00950115011501D503148D14811441254525A2468 +83F1:08200820FFFE082001003FF80100FFFE1010220847E40820144003801C70E00E +83F2:08200820FFFE0820082004407C7C044004407C7C04400440FC7E044004400440 +83F3:08200820FFFE0820092002800C603018CFE6010001003FF811100920FFFE0000 +83F4:08200820FFFE0A2002007FFC044009203FF8D1161FF011101FF40104010400FC +83F5:04400440FFFE04407FFC482444445FF4410440845FF44404440447E440144008 +83F6:04400440FFFE044001007FFC01003FF80200FFFE092017D02108DFF601000100 +83F7:0820FFFE08201FF000100FF000101FF000007FFE41029FF41110115011200100 +83F8:04400440FFFE0440102008207E50105010881F0612601210220022C04A308408 +83F9:04400440FFFE0440100009F80908410821F82908090811F87108110817FE1000 +83FA:0820FFFE092000801FFC10041FFC100017F8140817F8240827F8440884280410 +83FB:04400440FFFE04400820082008207EFC08201C301A702A6848A4892208200820 +83FC:08200820FFFE082001000910092012C0043019086914091012A004401830600C +83FD:04400440FFFE044008000F7C08440844FF44002808282A104910892828441082 +83FE:04400440FFFE04403FF801000200FFFE08203118C10609901148214805000200 +83FF:08200820FFFE08207F84100422247F24092408247F24082408240F04F0144008 +8400:08200820FFFE092001F801003FFE210221F02F0420FC200027E044224822B01E +8401:04400440FFFE0440082008207FFC08200FE008200FE00820FFFE082010102008 +8402:04400440FFFE04400E00787C08440844FF4418441C442A444A44887C08440800 +8403:08200820FFFE0A2001007FFC08200820145022880100FFFE0100010001000100 +8404:0820FFFE082020003FFC48049FE422040204FFFC0204222422243FE400280010 +8405:0820FFFE08200100FFFE010021083FFA010200FE00003FF820083FF820083FF8 +8406:08200820FFFE0A2004003FF821083FF822083FF808801080FFFE008000800080 +8407:04400440FFFE04400FF808000FF008000FF00800FFFE111010A014401830100E +8408:08200820FFFE082000001FF010101FF010101FF010101FF00450084A1042603E +8409:08200820FFFE082000003EFC22A422A43EA422FC22803E80228222824A7E8400 +840A:08200820FFFE092001007FFC11101110292845440380054009203118C1060100 +840B:0820FFFE09207FFC01003FF80108FFFE01083FF80200FFFE08201C4003C07C38 +840C:08200820FFFE082000007CFC448444847CFC448444847CFC4504010402140C08 +840D:08200820FFFE0820200017FC904042484950084017FEE0402040204020400040 +840E:0820FFFE082000701F8001007FFC05401930E10E04007FFC08201C4003807C78 +840F:04400440FFFE044008001FE020204440B878200820083C78200820083FF82008 +8410:0820FFFE082001007FFC01003FF80108FFFE01083FF8110011F8290047FE8000 +8411:08200820FFFE092008801FFC108030805FF8908010801FF8108010801FFC1000 +8412:08200820FFFE0A2001007FFC08201210244808201FF00440044008441044603C +8413:08200820FFFE0A2001007FFE40029FF4101010101FF010101FF010101010FFFE +8414:04400440FFFE0440100011FCFC4410441494190832FCD0841084108450FC2084 +8415:0820FFFE0A2001007FFC0820044003801C70E82E0FE008200FE0082010202020 +8416:0820FFFE0820060038F8200820083CF8200820083FF80440044008423042C03E +8417:08200820FFFE0A2001007FFE400280041FF0000000007FFC1110210845040200 +8418:08200820FFFE0A2002007FFC0440082037D8C0063FF801000920111025080200 +8419:04400440FFFE044010201020FDFE11223224385054505490909011121212140E +841A:08200820FFFE0820100011FC1088FC70138E10201DFC3020D3FE102050202020 +841B:08200820FFFE08203FF820083FF820083FF820083FF80820FFFE082010202020 +841C:04400440FFFE044010201020FE3E9220922092FC92849A849484108410FC1084 +841D:0820FFFE082000003FF8244824483FF8020007F008103420024001800E007000 +841E:08200820FFFE082000003FF8210822882448000020843E9820E020842684387C +841F:08200820FFFE08200640384009F808487E4818C81C482A68289A488A09060A02 +8420:08200820FFFE082000003E7C224422443E7C224422443E7C224422444A948508 +8421:04400440FFFE04400020104009FC49042104250405FC09047104110411FC1104 +8422:08200820FFFE08202100110013F884084BE85228122823E8E2182204220421FC +8423:08200820FFFE0A2001007FFE400280041FF00100110011F81100290047FE8000 +8424:08200820FFFE082000007FFE410281041FF0111011101FF0010001087FFC0004 +8425:08200820FFFE08207FFE40029FF4101010101FF000003FF8200820083FF82008 +8426:08200820FFFE082000007FFE440288441F8003200C103FF80108112025104208 +8427:08200820FFFE082001003FF80108FFFE01083FF8010025482528292841088108 +8428:04400440FFFE044000207DFC4488485051FE4900450045005500490042004400 +8429:04400440FFFE04400C20702010A410A4FCA83120382054505050908811041202 +842A:08200820FFFE08200C10709010501010FC903050381E55F05010901010101010 +842B:0820FFFE082000F83F000100FFFE054009203118DFF610101FF010101FF01010 +842C:04400440FFFE04401FF011101FF011101FF001003FF8210821482FE824282010 +842D:08200820FFFE082000F03F0001001FF011101FF001007FFC412441F45E144008 +842E:08200820FFFE092002800C6037D8C0063E0822483E4822483E48220822282610 +842F:0820FFFE082004000FE010203FF850081FF810081FF810081FF8042008101008 +8430:08200820FFFE092001007FFC01003FF8292825483FF8038005601918E1060100 +8431:08200820FFFE0A2001007FFE40029FF400001FF010101FF010101FF00000FFFE +8432:08200820FFFE082000FC7F00220811103FF80200FFFE04000FF0122021C0CE3C +8433:08200820FFFE08200100FFFE01003FF8244822882FE821083FF8210821282010 +8434:0820FFFE08203F04210421243F2421243F24212421243F240024120421144088 +8435:04400440FFFE04401FF010101F9010907FFC40044FE4482448244FE440144008 +8436:0820FFFE082001007FFC01003FF80200FFFE08201FF02828CFE608200FE00820 +8437:04400440FFFE0440080049042A247F2441247F2441247F244124410445144208 +8438:08200820FFFE082005003978210821083D78210821083FF8028004401830E00E +8439:08200820FFFE092000803FFC20043FFC20002FFC292429242FFC49244924880C +843A:0820FFFE08207FFC40045FF440045FF400001FF010101FF010101FF010101FF0 +843B:08200820FFFE0A2001003FF808200440FFFE00001FF010101FF010101FF01010 +843C:0820FFFE082000003EF822883EF800003FF80000FFFE08000FF0001000A00040 +843D:08200820FFFE0820208010F811088290486049981606E1F82108210821F82108 +843E:0820FFFE082000003FE008200BF80A88112822905FF8124812481248FFFE0000 +843F:04400440FFFE0440203813C01040804047FC5040104023F8E208220823F82208 +8440:04400440FFFE0440103813C0FC40104017FC18403040D3F81208120853F82208 +8441:0440FFFE0440082004407FFC01003FF80100FFFE0200FFFE08201C4003C03C38 +8442:04400440FFFE044020203E20442088FC7F24492449247F441454248A450283FE +8443:08200820FFFE082000807C8044FE454046407C7C44404440447E7C4044400040 +8444:08200820FFFE082000403E40227E22A03EA0233C22203E20223E22204A208420 +8445:04400440FFFE0440000011F81108290845F89108110829F82508410887FE0000 +8446:04400440FFFE044008000BF81208320853F8904017FE10E0115012481C461040 +8447:0440FFFE04401FF0022001407FFC0484188862800100FFFE05401930E10E0100 +8448:04400440FFFE144020087FFC00043FF820083FF80100FFFE054009203118C106 +8449:04400440FFFE044012207FFC122013E010001FF80100FFFE05401930E10E0100 +844A:08200820FFFE092006C01830EFEE00001FF010101FF00820FFFE082010202020 +844B:08200820FFFE082000803C8024FC25043EF4249424943CF42494240454288810 +844C:0820FFFE08200400FFFE08201E4003C03C381010FEFE2224646418182434C2C2 +844D:04400440FFFE04407FFC00001FF010101FF000003FF821083FF821083FF82008 +844E:08200820FFFE0820004013F8204847FE884813F8304053FC904017FE10401040 +844F:08200820FFFE0820204013F890484FFE404813F82040E3FC20402FFE20402040 +8450:08200820FFFE0820044008203018CFE6042018A060403FF8244824482448FFFE +8451:04400440FFFE0440080008087F0808FEFF08084808287F2808080F08F0284010 +8452:04400440FFFE04401000100025FC7C200820102024207E20002054204BFE8A00 +8453:08200820FFFE082008202090109013FC80904890489017FEE000209021082204 +8454:0820FFFE0820000009F00810101037FC510091F81240104017FC10A01110120C +8455:08200820FFFE08201200213C49009400247E6108A2082E082208220822282010 +8456:08200820FFFE0A2001007FFE48229114212801107FFC0280044008203018C006 +8457:0820FFFE082002083FD002200240FFFE03000C003FF0C8100FF008100FF00810 +8458:04400440FFFE044008881110FFFE1110088800003FF821083FF821083FF82008 +8459:04400440FFFE0440080008FC7E84088418FC1C842A842AFC4884888408FC0884 +845A:04400440FFFE044008207FFC08200FE008200FE00820FFFE1240142010001FF8 +845B:0820FFFE08201FF010101FF010101FF008001FFC21045284944410041FA80010 +845C:0440FFFE044008007F7C08243E2408447F5408880100FFFE02800C603018C006 +845D:04400440FFFE044000207F202A2054FC2A2400247E24082408440E44F0944108 +845E:0820FFFE082000007DFC048804887CF8408840887CF80488049E05E828081008 +845F:08200820FFFE092002001FF010101FF010101FF000007FFC01003FF80100FFFE +8460:04400440FFFE04400BF8080811F8300853F8900017FC140413F8111010E0171C +8461:04400440FFFE24403FFC42247FF482043FE422243FE422243FE4222422A4204C +8462:08200820FFFE092001007FFC04800A603118C0063FF8244824482448FFFE0000 +8463:0820FFFE08201FF001007FFC01001FF011101FF011101FF001003FF80100FFFE +8464:04400440FFFE04401008100824087DFE0808108824487E48000854084A288A10 +8465:04400440FFFE044010100820FFFE00003E4822483E4822483E0822082A282410 +8466:0820FFFE082002003FF00410FFFE00001FF010101FF001001FF021003FF80100 +8467:04400440FFFE044008107F1008107F7E41123E1204120F1278220822284A1084 +8468:04400440FFFE04401FF011101FF011101FF00000FFFE111010A014401830100E +8469:04400440FFFE0440100021FC7D244524452445247DFC4500450045027D0244FE +846A:04400440FFFE044010041F0422247FA4A4A43FA424A43FA424A4248442948108 +846B:04400440FFFE04400800087C7F440844087C3E442244227C22443E8422940108 +846C:0820FFFE0820FFFE10803E9842E024841884E07C08200820FFFE082010202020 +846D:0820FFFE082000007CF8440844087CF8400041F87C88405040207C5040884306 +846E:0820FFFE0820060038F8208820883D06220021F83C8820882C50F02020D82706 +846F:08200820FFFE082010401440247C7884110424447E24002454044A048A280010 +8470:04400440FFFE044009100A0817FC31105208948411F813081490106011981606 +8471:04400440FFFE044008001FF82A4844480A88110822A8041001004884481287F2 +8472:0820FFFE0A2004001FF010101FF010101FF001047D88095011202118C5060200 +8473:04400440FFFE0440002800243FFE20202FA422242FA824982D12422A45468882 +8474:04400440FFFE0440002800243FFE20202FA420242FA8289828924FAA40468082 +8475:0820FFFE082000907EA00444282810102FE8C10601007FFC010002C00C307008 +8476:0820FFFE09207FFC00001FF010101FF000007FFE40029FF40100010005000200 +8477:0820FFFE08207FFC41043FF801001FF011101FF011101FF00100FFFE01000100 +8478:0820FFFE082000003FF8210821083FF8210821083FF802005104511290120FF0 +8479:08200820FFFE082020401040FEFE212020AC3CB425E424AC24A044A25482887E +847A:0820FFFE08201FF010101FF000007FFC10101FF010101FF0103EFFD000100010 +847B:04400440FFFE044000001FF0101010D01710111017D0155027CA212A4FE68022 +847C:08200820FFFE08202448238824483FF81010220847E40820144003801C70E00E +847D:08200820FFFE08207FFC04403FF824483FF80400FFFE08201C4003800C703008 +847E:08200820FFFE082010001EF8228862A894920882307EC10008844892481287F0 +847F:08200820FFFE08203FF821083FF820002FF828082FF828084FF848088FF80808 +8480:04400440FFFE04401FF010101FF010101FF000003FF8244824482448FFFE0000 +8481:08200820FFFE08202050104817FC00C00160F150124814441040280047FE0000 +8482:0820FFFE0A2001003FF8082004407FFE410281041FF011101150112001000100 +8483:0440FFFE044008000FE010201FC00040FFFE06003B0804B019C062A00C987306 +8484:08200820FFFE08207FFE400280043E0800087EFE14481428140A242A241243FE +8485:0440FFFE04401080088043F0289011127212140E1100FFFE05401930E10E0100 +8486:0820FFFE082000007DF0111011901D52F20E0400FFFE08201C4003800C707008 +8487:04400440FFFE044800243FFE20202FA428A42AA82AA82A902A92452A49469082 +8488:04400440FFFE044020883C9020E42C84307C04001FF010101FF010101FF01010 +8489:0820FFFE082001001FF011101FF00100FFFE00001FF01010111002C00C307008 +848A:04400440FFFE04400880109830E057849084107C00007C8844B044C47C84447C +848B:08200820FFFE0820008008F849102AA0285008901BFE29104890889008100830 +848C:04400440FFFE0440111009207FFC05401930610C0400FFFE08201E4003C03C38 +848D:0820FFFE0820240014007FE0042008200FF8080810081FFE2002255249548008 +848E:04400440FFFE0440201C13E0920E42F04A900A901292E2942288248824A428C2 +848F:08200820FFFE08207FFE4002BFF404803FF82488287830083FF820083FF82008 +8490:08200820FFFE0A2004003FF821083FF821083FF8029002A804B8088A3082C07E +8491:0820FFFE08200600387820483E4822863F0022FC3E4420443E2822104A2884C6 +8492:0440FFFE0440100023FE7C20442045FC7D2441247D24452445347D2844200020 +8493:04400440FFFE04401020102025FE7C200924112425247DFC002254225422801E +8494:08200820FFFE0820004078404BFC48404FFE78104FFE48104A10791048500020 +8495:04400440FFFE04401FF01110129014501FF000003FF8244824482448FFFE0000 +8496:0820FFFE09207FFC01001FF010101FF010101FF010101FF01010FFFE08201010 +8497:08200820FFFE08A0204013F8920843F84A080BF81242E2442228229023082206 +8498:0440FFFE044008007F7C114432440C7C3220DFC001003FF801007FFC01000300 +8499:0820FFFE08207FFE40028FE400007FFC06003B0804B019C062A00C9872860100 +849A:0820FFFE082000007FFC00001FF010101FF000007FFC482444445FF44104410C +849B:04400440FFFE0440202020203DFC50241024FC2411FE542054505C5074880506 +849C:08200820FFFE082000007C7C00000000FEFE1010101054545252929250502020 +849D:0440FFFE044000003FFC2080210027F0241027F0241027F0408044908A881104 +849E:08200820FFFE082021401120120082FC46005A8812482248E250220022FC2200 +849F:08200820FFFE08202080108010FCFD0402F44894489448F410941E04F0284010 +84A0:0820FFFE082002003FF820083FF820083FF820083FF8010008844892481287F0 +84A1:0820FFFE082001003FF8082004407FFE420281043FF8040007F0081010502020 +84A2:08200820FFFE0820784048A05110620855F648404BFC68405150424845444080 +84A3:08200820FFFE0820104020A041108A0815F6304053FC90401150124815441080 +84A4:08200820FFFE0820204010A0911042084DF6104027FCE0402248244429422080 +84A5:08200820FFFE0820040079FC40444844545462883FF821083FF821083FF82008 +84A6:0440FFFE044008801FFC30805FF890801FF810801FFC10003FF00C6003807C7C +84A7:04400440FFFE0440002800243FFE222023A422242FA8289828924FAA40468082 +84A8:0440FFFE044013F8104023F820406FFEA00023F8220823F8220823F822082218 +84A9:08200820FFFE08200C0071F811081108FDF83108390855F85108910817FE1000 +84AA:0820FFFE092001107FFC01003FF821083FF821083FF821080020FFFE08200460 +84AB:0440FFFE0440082004407FFC01003FF80200FFFE080017F8208040809FFC0000 +84AC:08200820FFFE08207FFE44028FE410203FF8510811081FF802800492188AE07E +84AD:0820FFFE082010001FFC210451141FF4020814001FFC210451141FF404143808 +84AE:08200820FFFE082004007FFC450408801FFC30805FF810801FF810801FFC1000 +84AF:11021102FFE2110A000A7BCA4A4A4A4A7BCA4A4A4A4A7BCA4A424A42AB4A1484 +84B0:08200820FFFE082010783E4822482A862300FEFC22442A44222842104A2884C6 +84B1:04400440FFFE044010281024FDFE102015FC192431FCD12411FC11245124210C +84B2:08200820FFFE0828404427FE204087FC444457FC1444E7FC2444244424540408 +84B3:04400440FFFE04401020102025FC7D2409241154254C7D840104550455148108 +84B4:08200820FFFE08204100227CFFC40844497C494449447F7C1144204440948108 +84B5:0440FFFE044000387FC02208151008401F8001201FF002107FFC04401830E00E +84B6:04400440FFFE04401010109024887D040A0211F824487C480088548855288210 +84B7:0820FFFE08201FF010101FF000003FF820083FF820083FF820083FF808201010 +84B8:08200820FFFE08201FC000447D88055009203118C50602003FF8000024884244 +84B9:0820FFFE082010100820FFFE04403FF80448FFFE04483FF80C603458C4460440 +84BA:0820FFFE092000801FFC1000920053F8544010403FFE504090A0211022084C06 +84BB:08200820FFFE082000007EFC02047EFC40807EFC020422441A3462C414280810 +84BC:08200820FFFE092006C01A30E10E1FF010101FF010101FF010002FF848088FF8 +84BD:0820FFFE082000003FF821082FE82288244828283FF8010008844892481287F0 +84BE:08200820FFFE08202040124811500040F7FC10E01150124814441040280047FE +84BF:0820FFFE08200200FFFE00001FF010101FF000007FFC40044FE448244FE4400C +84C0:04400440FFFE0440000C7DF00440088811F010201C44F3FE1022112452222060 +84C1:0820FFFE082001007FFC01003FF80200FFFE082017D02108DFF6054009201110 +84C2:08200820FFFE08207FFE40029FF410101FF010101FF00100FFFE082010102008 +84C3:0820FFFE08200500397821083D7821083FF801003FF00820044003801C70E00E +84C4:0820FFFE08200100FFFE08201FC003100C083FFC00043FF821083FF821083FF8 +84C5:04400440FFFE0440202017FE1080810843FC500411502150E15022522252244E +84C6:0820FFFE092000803FFC222022203FFC222023E020802FF8488848A888900080 +84C7:0820FFFE08201FF010101F9010907FFE40029FF410101FF010101FF010101030 +84C8:08200820FFFE082004003F7C21443F4821503F48284424442A54324820400040 +84C9:08200820FFFE0A2001007FFE400289241290244808203FF8C82608200FE00820 +84CA:0820FFFE0820044008203218C4460FE000207EFC224412240A1412242A544488 +84CB:0820FFFE082001003FF801007FFC080010103FF800003FF824482448FFFE0000 +84CC:0440FFFE04401110111029287FFC0100FFFE08001FF02820444003801C70E00E +84CD:0820FFFE0A203FC00280FFFE02200FC03408C3F800001FF010101FF010101FF0 +84CE:0820FFFE092000803FFC20802FF820883FFE20882FF820804FF848088FF80808 +84CF:08200820FFFE08200000061C38E828A82CA82AA82AA82AA828A455545D748212 +84D0:0820FFFE08203FFC20002FF820003FFC24482430260E20205FFC442082A00040 +84D1:0820FFFE082001007FFC00001FF01010FFFE10101FF0048808503820CB180C06 +84D2:04400440FFFE044008007F7C08107F1049107F1049FE7F100810FF9008100810 +84D3:08200820FFFE08A0104017FC20006208A1102FFE200023F82208220823F82208 +84D4:04400440FFFE0440082004407FFC010001003FF801000100FFFE248822444244 +84D5:04400440FFFE04401020102011FCFC20102033FE3800542051FC9020102013FE +84D6:0820FFFE082002003FF82448238824483FF8000020843E9820E020842684387C +84D7:08200820FFFE0820104023F84040884017FC3040524092781240154018FE1000 +84D8:0820FFFE0A2001007FFC08201210244848241FF00510088818502920CA180C06 +84D9:08200820FFFE092000803FFE2080249024902AA831C420802FF8408040809FFE +84DA:08200820FFFE0820108011FC228828706B8EA8202848299028642988203021C0 +84DB:04400440FFFE044008200820FFBE08447FA449244B281C282A10492888440882 +84DC:08200820FFFE08207F7C140414047F04557C574061407F40414241427F3E4100 +84DD:08200820FFFE08200480248024FC24A0251000003FF8244824482448FFFE0000 +84DE:08200820FFFE082000FC7F00220811100C20307820083C78200820083FF82008 +84DF:04400440FFFE044010041F0422247FA4A4A43FA424A43FA40004078478142008 +84E0:08200820FFFE09200080FFFE0440139014501FF001007FFC44444FE44424400C +84E1:08200820FFFE082023F8100811F8800843F8500017FC2404E3F8211020E0271C +84E2:04400440FFFE144008003E7C22443E44227C3E442244287C24442A4432942108 +84E3:0820FFFE082000007DFC0420284011FCFD041524112411241124105050882304 +84E4:08200820FFFE0820404023F820400FFE1110128824F4E11022A0204021B02E0E +84E5:08200820FFFE082000007FFE410282840C603018DFF601003FF8111009207FFC +84E6:0440FFFE04401FF010101FF01010FFFE10102FC8C04608400FF800087FA80010 +84E7:08200820FFFE0820108011F822886870ABAE282029FC282028A8292422A42040 +84E8:0440FFFE0440108011FC228828706B8EA80029FC290429FC290429FC2104210C +84E9:0820FFFE082000807CF805082A901060FD981606304053F89048108851502620 +84EA:08200820FFFE082047F8211020A007FCE44427FC244427FC2444245454088FFE +84EB:0820FFFE082023FC10801144066870B01128166810A4112416A0284047FE0000 +84EC:0820FFFE0820010023F0151010E0071C704013F8104011F0104017FC284047FE +84ED:0820FFFE092000803FFC20803FFC222024902FF8349427F0249047F24082807E +84EE:0820FFFE0820004027FC104013F8024873F8124813F8104017FC284047FE0000 +84EF:04400440FFFE04401110211041108AA8144430405240927C1240154014FE1800 +84F0:04400440FFFE04401020213C4120892017FE300050209120113E112012A0147E +84F1:08200820FFFE08202108109093FC40904890089017FEE0902090211021100210 +84F2:0820FFFE082000003FF8200027F0241027F020002F7829482F7820003FFC0000 +84F3:0440FFFE044008207FFC08200FE001003FF821083FF801007FFC0100FFFE0000 +84F4:0820FFFE09207FFC01003FF821083FF821083FF801047FFC0020FFFE08200460 +84F5:04400440FFFE0440102013FE1020FDFC102413FE1C24F1FC1020113C512022FE +84F6:04400440FFFE044000A0009079FE49204B204DFC492049FC7920492001FE0100 +84F7:04400440FFFE044010A01090F9FE11201B2015FC3120D1FC1120112051FE2100 +84F8:0440FFFE04407FFC04403FF824483FF824483FF800001FF010101FF010101FF0 +84F9:04400440FFFE0440140027DE4912811217D221126112A5D2251A25D42E102410 +84FA:08200820FFFE0820104010407C4010F8FE48444892C87C4810AA1CAAE1064202 +84FB:08200820FFFE0820104010407C4011F8FE48444828C87C4810AAFEAA11061202 +84FC:0820FFFE08203CF824481428254806C01830E30E0C403180063038C007003800 +84FD:0820FFFE08203FF821083FF821083FF80920FFFE09203FF801007FFC01000100 +84FE:08200820FFFE092001FC01003FF829282448228829282288244829283FF82008 +84FF:0820FFFE082001007FFE48028BF4108033F85208920813F81208120813F81208 +8500:04400440FFFE04401000087C7F4422481450FFC800443E44225422483E402240 +8501:0820FFFE09203FF80440FFFE00001FF010101FF010101FF00100FFFE01000100 +8502:0820FFFE08201FF011101FF011101FF0040008201FC003103FF8112025104208 +8503:08200820FFFE08207CF8048804F87C2041FC41247D2405FC042004242BFE1002 +8504:08200820FFFE08207C7C44447C7C44447C7C40044FE4482448244FE440144008 +8505:0820FFFE08207C7C44447C7C44447C7C41044FF442444644418442444C24400C +8506:08200820FFFE0820204013F8104087FE4110528814F42110E2A0204021B02E0E +8507:08200820FFFE082000007DFC44207D20452045FE7C50505048925492610E4200 +8508:0820FFFE082000007FFC04403FF824483FF800003FF80000FFFE111025080200 +8509:0820FFFE08200100FFFE101020085FF4101010101FF0048808503820CB180C06 +850A:04400440FFFE044011FC110415FC550459FC500091FC10202BFE242044208020 +850B:08200820FFFE0820220013BE921242125FD210142214EA88324822142A242442 +850C:0820FFFE082000000820FFA0083E7F42499449107F101C102A28492888440882 +850D:08200820FFFE092000803FFE22203FFC22243FFC284028482F7048444B448C3C +850E:04400440FFFE244010F8FC8800887906020079F8008878884850482078D84B06 +850F:0820FFFE0A2001007FFC082004407FFC4444482457D4644C444447C440144008 +8510:0820FFFE0A2001007FFC082004407FFC41045FF441044FE448244FE44004400C +8511:0820FFFE082000003FF8244824483FF800903FFC208030482850242440D4830C +8512:0820FFFE082000003FF80208FFFE04083FF808001FF82808CFF8000024444222 +8513:0820FFFE08201FF010101FF010107FFC44447FFC00003FF0082007C01830E00E +8514:0820FFFE28203FFC4004BFE400041FC410441FC400043FE422243FE422243FEC +8515:0820FFFE0820145014507FFC245247CE80007FFC41041FF01110115011200100 +8516:0820FFFE092001F801003FFC21042FE0210827F8241027F0241047F044109FFC +8517:08200820FFFE092000803FFC222022203FFC2220222023E020004A4849249124 +8518:0440FFFE044008201FF0102025487EFC04401930E64E1990062018C007003800 +8519:08200820FFFE082020401040FEFE210020003DFE2422242024BC44A055608A3E +851A:08200820FFFE082000003F0821083F0820FE2E0820483F2844285508A4A80C10 +851B:08200820FFFE082010041F2422147F84A4A43F9424863FBC2484248442848104 +851C:04400440FFFE0440082008207F3E08443EA40824FF2810281E1022284A448482 +851D:04400440FFFE04400020792448A848207BFE487078A848A849247A2248200020 +851E:0820FFFE082001003FF82108FFFE21083FF811101FF00400FFFE082007C07838 +851F:08200820FFFE082020401040FEFE212020403CFC2520242025FE445054888906 +8520:08200820FFFE0820104010FC24887D50082010D827067C60001054C054308008 +8521:0440FFFE044010801EF822885450282017D82006DFF001001110210845040200 +8522:0440FFFE0440202013FC82244BF812882450E470298C2400FFFE082007C07838 +8523:08200820FFFE08200440247C24A83D50042804487DFE24882448244844088418 +8524:0820FFFE0A2001007FFE42028924284849940E1077F00100210821083FF80008 +8525:08200820FFFE092002003FF8220827E82A48218826483FF801004884481287F2 +8526:0820FFFE082004001FF010101FF010101FF010001FFC10001FFC492484940008 +8527:0820FFFE08201010FEFE10107C7C1010FEFE10103FF800081FF800083FF80008 +8528:0820FFFE08207FFC45445FF442047FFC482457D4644C44C4442443E440047FFC +8529:0820FFFE0A2001007FFE4002BFFC01003FF821083FF821083FF8101020084004 +852A:04400440FFFE044008067F7808407F40497E7F4849487F4808487F4808880908 +852B:0820FFFE08207FFC010011F81100FFFE10001FF820003FFC0004492484940008 +852C:0820FFFE082000107DFE0420184851FE50025CA850A850A85D2A712AC22A0406 +852D:0820FFFE0820004078A04910524865F4502048404BF8680057FC4080411043F8 +852E:04400440FFFE04407FFC40A47FFC40845E9452945E64405446B459147FFC4004 +852F:04400440FFFE044000207BFE482051FC612451FC492449FC687050A841244622 +8530:0820FFFE09203FF820083FF8200027F0241027F020002FF828884FF8480287FE +8531:0820FFFE082022001478084814482A8609007EFC08442A4449288910282810C6 +8532:0820FFFE0A2001007FFE400280443E40007C7E88155014201452248A43FE8000 +8533:0440FFFE044023F8104013F8804047FE500013F82208E3F8220823F822082218 +8534:08200820FFFE092000803FFC242024203F7C24202E702D6834A4452244208420 +8535:04400440FFFE044800243FFE20202FA42A242FA828A82F902A124FAA40468082 +8536:0820FFFE09207FFC01003FF80100FFFE10101FF010101FF010101FF008201010 +8537:0820FFFE082001003FF811100920FFFE00003FF8200827C8244827C820083FF8 +8538:08200820FFFE0920120067DC444447C4444457DC60000440044008421042603E +8539:04400440FFFE044008200820143E22445DA48024112809284A1027A8F8444082 +853A:0820FFFE0820200017FC050444844FF459046FE449044FE449044FF448144008 +853B:0820FFFE0A2001007FFE400280243E3800207EF81408145014242454248443FC +853C:0820FFFE082043F8220823F80208E3F8210023FC244422A42A0433F420140008 +853D:04400440FFFE0440082049202A3E7F4449A449245D286B284910412845444282 +853E:0820FFFE08200640387C08947E241C442A9449080100FFFE054009203118C106 +853F:0820FFFE082000F87F00221011201FE010201FF010101FFC20042AA44AA4800C +8540:0440FFFE044010101010FEFE1010FEFE92929292969638385454929210101010 +8541:0820FFFE08203FF000101FF000103FF000003E7C08447F7C0020FFFE08200460 +8542:0440FFFE044000203D2424A825FC3C4027FE24883D2426FA2448444854A88910 +8543:0820FFFE082000F83F0011100920FFFE09203018DFF611101FF011101FF01010 +8544:0820FFFE08207C7C44447C7C44447C7C410440844AA44A144A5451C440144008 +8545:08200820FFFE082023F8124893F842484BF8084017FCE444245425F42414040C +8546:04400440FFFE044800243FFE20202FA428A42FA828A82F9028924FAA45468882 +8547:0820FFFE08203EF822883EF800001FF011101FF011101FF00100FFFE01000100 +8548:0820FFFE08207FFC04403FF824483FF810101FF010101FF00100FFFE01000100 +8549:08200820FFFE092008801FFC30805FF810801FF810801FFC1000248822444244 +854A:08200820FFFE0820082001002488242443E4000024241212A0A0A4A41C1C0000 +854B:0820FFFE0820010011F811001100FFFE081008104E9C489048904E90F1FE0000 +854C:04400440FFFE04401FF010101FF010101FF000007EFC42847EFC42847EFC4284 +854D:0440FFFE044020A01110120885F64000578414A427A4E4A427A4248424942588 +854E:0820FFFE082000701F800200FFFE082037D8C4463FF8200827C8244827C82018 +854F:08200820FFFE0820004453F42048505097FE108031FC530495FC190451FC2104 +8550:0440FFFE04407FFC1110292845441110292845447FFC0100FFFE010001000100 +8551:0820FFFE08207C7C44447C7C44447C7C400447C4444447C4444447C4445448C8 +8552:0820FFFE08203FF824483FF800001FF010101FF010101FF010101FF008201010 +8553:0820FFFE08203FF801007FFE41029D7401001D7000003FF80000FFFE10103FF8 +8554:0440FFFE0440100010FC7C841094FE88448028FC7CA410A4FEA8109010A810C6 +8555:08200820FFFE0820228814500BFE145025FC4D54158C250445FC850429FC1104 +8556:0820FFFE082023FC120043F82A080BF8720013FC1100FFFE05401930E10E0100 +8557:08200820FFFE0820008078F849084A907860119812065DF8510851085DF8E108 +8558:0820FFFE082001003FF80100FFFE08203EF808207EFC00007FFC04401842E03E +8559:0820FFFE09203FF801001FF011101FF011101FF001087FFC02044908482487E4 +855A:0820FFFE08201FF010107FFC44447C7C00003FF80000FFFE10001FF800080070 +855B:08200820FFFE08200C88705011FC1024FDFC312039FE546250AA912412201020 +855C:08200820FFFE082004407C7C04403C7804407C7C0440020009084924482487E0 +855D:04400440FFFE0440108010F825087E1009FC112425247DFC01005502550280FE +855E:0820FFFE08201FF010101FF01010FFFE22003EFC22443E4422282F10F22842C6 +855F:0820FFFE08A03E900464282810103EF8C2961E90110C20F03E90026014900908 +8560:0440FFFE044008007F7C114432440C44367CC8801F0002103FF8010815202210 +8561:0440FFFE05407FFC0920FFFE08203FF820083FF820083FF820083FF808201010 +8562:0820FFFE09201FF011101FF00100FFFE10101FF010101FF010101FF008201010 +8563:0820FFFE082000FC7F00220811107FFE400290243DF84420A92011FC2020C020 +8564:0820FFFE08200010FF50107C29904E10967C2510CD1014FE2440C430140E0800 +8565:0820FFFE082000507E4804FE2490259044FE7E900C9014FE2490449094FE0880 +8566:0820FFFE082000000BFE102021FC490411FC210445FC090411FC2000C0880104 +8567:0820FFFE0820020013FC240043F88A0813F8320853F8910013F8151010E0171C +8568:0820FFFE082000003FFE289025102FBE22222AD42A902F902228442844448882 +8569:08200820FFFE082023F8120893F8420843F810002FFEE20027FC292422540488 +856A:04400440FFFE044010003FFC4AA00AA07FFC0AA00AA07FFC0000248822444244 +856B:0820FFFE09201FF004407FFC00001FF011101FF011101FF001003FF80100FFFE +856C:04400440FFFE04401020102024407C8809F0102024487DFC002054A855248060 +856D:0820FFFE09203FF80108FFFE01083FF825483D7821083FF821083D7825484548 +856E:0820FFFE082002001CF010101EF010101FF008001FFC20044924249424944008 +856F:0820FFFE0820010079F04A9050606198560649F04A406BF8544043F8404047FC +8570:04400440FFFE044023F8120893F842084BF8080017FCE524252425242FFE0000 +8571:04400440FFFE04400C20712410A81020FDFC310439FC550451FC910411141108 +8572:0820FFFE0820220C14707F4049407F40497E7F480848FF480848088808880908 +8573:08200820FFFE08207C7C44447C7C44447C7C40044FE448244FE448244FE4400C +8574:04400440FFFE044021F8210845F88908F1F8200043FCFA9402941A94E7FE4000 +8575:0440FFFE0440204020A021583A264DF8490849F8A90811F81144212841508188 +8576:0820FFFE08203FF801007FFE41029D7401001D7006C01930EFEE004006800100 +8577:0820FFFE082000007DFE042028FC1084FEFC128414FC108410FC100050482084 +8578:0820FFFE0820000047BC248427BC0400E7BC240427A82410242854448FFE0000 +8579:0820FFFE0A200100FFFE10A0209045FE7B2011FC25207DFC0920112021FEC100 +857A:0440FFFE04403E2822243E240020FFFE22203E2822283E1022122F2AF2464282 +857B:08200820FFFE082000483E4820483CFC20483C482048FEFE20004448FE844302 +857C:0440FFFE044000203EFC20243DFE20243CFC2020FEFC102025FE7E2022200020 +857D:0820FFFE082002401FF812481FF812483FFC20002FF820003FFE24484530860E +857E:0820FFFE08203FF801007FFE41029D7401001D7000003FF821083FF821083FF8 +857F:0440FFFE0440101E13E0152254945BFC504097FE108011FC2A48243044488186 +8580:08200820FFFE082023F81248924842A84BF8080017FCE4A424A424A42FFE0000 +8581:0820FFFE082004003FF8292825482FE8254828280100FFFE02800C603018C006 +8582:0820FFFE082010003E2022203E3E22443EA408247F2810281E1022282A444482 +8583:0440FFFE0440202017FE100081F8410851F8100027FEE40225FA250A25FA2406 +8584:0820FFFE0820004827FC104013F8824843F84A480BF81248F01027FC22102130 +8585:0820FFFE082023FE2200FAFC4A004BFE4AA4929852C6220853FE4A8884480818 +8586:0820FFFE082000F87F00221011207FFC4204292847E408001FF0282007C0F83E +8587:04400440FFFE044022204AA08ABE1FC420A46F24A0282F28291029A829443082 +8588:0820FFFE092002800C6037D8C0063FF829283FF800001FF010101FF010101FF0 +8589:0820FFFE092011F81100FFFE00243FFE20202FA422242A182A90512A46469882 +858A:04400440FFFE044010041F0422247FA4A4A43FA424A43FA400042A8445540008 +858B:0820FFFE492021FC0A44F0B0230E3FF010101FF010101FF010101FF008201010 +858C:08200820FFFE0820210027DE545297D4E458245457D29512F49A255446108410 +858D:0440FFFE04407F102A107F1012100C107F904A905E9040905E924A9244924B8E +858E:0820FFFE08207FFC44447FFC00007FFE4922911431FC5F1090A0104411A4161C +858F:0820FFFE082001003FF80820FFFE00001FF010101FF010101FF04904489287F2 +8590:04400440FFFE04400C2071FC102013FEFC8831443A7A54885150902010D81706 +8591:0820FFFE08207FFC00003FF821083FF82108FFFE00003FF821083FF82108FFFE +8592:0440FFFE044008000F7828087F28A110162838C4D11009207FFC05401930610C +8593:0820FFFE082023F8100813F8800847FC544413F82248E04027F8211020E02F1E +8594:0820FFFE09207FFC111029284544FFFE00003FF8200827C8244827C820083FF8 +8595:0820FFFE082001003FFC22203FFC22402FF822483FFC22482FF846604A50B24C +8596:08200820FFFE082021F8110811E8012873FC120412F4129412F412142A0847FE +8597:0820FFFE08207FFC41044FE441045FF440044FE448244FE446944A6452147FFC +8598:0820FFFE0820004023F8104017FC0110F7FC104013F8104017FC1040284047FE +8599:04400440FFFE044020A020907DFE9120132011FCFD2011FC2920252041FE8100 +859A:0820FFFE082000FC7E8410FC10843CFC240047FEA48019FE0A521092212A4044 +859B:08200820FFFE082010407C2045FC44887C5043FE40207C2045FC44207C204420 +859C:0820FFFE082000403E2022FC22883E5021FE20203E2052FC52209E2012200020 +859D:0820FFFE08201FF020207FFEA4882BF4200027F8200027F8200047F8440887F8 +859E:0820FFFE082000407EA0119812463DF8250845F8A50819F80944112821904108 +859F:08200820FFFE092002800440183067CC00003EF8228822883EF8082014502288 +85A0:08200820FFFE082013FC104015F8550859F8510891F8110829F8249045088204 +85A1:0820FFFE08201FF010101FF010105FF450145FF440047C7C0440FC7C24444444 +85A2:04400440FFFE044020FC3C244444BE8C2A503E7C2A903E102AFE2A1042108610 +85A3:0440FFFE04400810FF1008FE7E1000107EFE42427E44422824100E28F0444182 +85A4:0820FFFE082000507E5011DC10503C5025DC6450945009DC0850105023FE4000 +85A5:0820FFFE08203FF824483FF808001FFC2204DFC412441FC402243FE410280010 +85A6:0820FFFE09203FFC24403FF824483FF8240027FC28002FFC20044AA451548008 +85A7:0820FFFE09207FFC00001FF010107FFE4002BFF408401F48625014621842E03E +85A8:0820FFFE08207FFC44447FFC00007FFE4002BFF408401F48625014621842E03E +85A9:0440FFFE0440002079FC4888505063FE52204AA04AFC6B2052FC4420442049FE +85AA:0820FFFE0820100008047F7822401440FF7E08487F4808482A484988A8881108 +85AB:0820FFFE08203FF80100FFFE11101FF011101FF001003FF80100FFFE24884244 +85AC:0820FFFE0920020047C4244817D0244847C40100FFFE054009203118C1060100 +85AD:0440FFFE044000200C4071FC112411FCFD4431FC3850549051FE901010101010 +85AE:0440FFFE0440000049202A20FF3E2A4449A41024FE282228641018282444C282 +85AF:0820FFFE08203FF824483FF802001FD00220FFFE03000FF03810CFF008100FF0 +85B0:0820FFFE08203FF80100FFFE01003FF829283FF801003FF80100FFFE24484224 +85B1:08200820FFFE0820140855083608147E7F0814487F2808283E0808080F287810 +85B2:0820FFFE09207FFE40029FF4092011C006001FF868080FF808080FF804100808 +85B3:0820FFFE0820004023F8104017FC000073F8120813F810C411A812902C8847FE +85B4:0820FFFE09207FFC4204A92847E400003FF82448FFFE00007FFC010005000200 +85B5:0820FFFE09207FFC01003FF80000FFFE00023FF00100FFFE00107DFC44907C30 +85B6:0440FFFE0440080031FCCB242D2431FCC924152425FCCC2015FC2420D4200BFE +85B7:0820FFFE08203FF801007FFE41029D7401001D7000007FFC02003FF824482458 +85B8:0820FFFE0820200017FC10A087FC44A457FC100027FCE0002FFE2040224824C4 +85B9:0820FFFE0920FFFE01003FF800001FF010107FFE48229FF401003FF80100FFFE +85BA:0820FFFE08200100FFFE02887D7025484D6690101FF010101FF0101020104010 +85BB:0820FFFE082022481490124883F8424853F8124823F8E0402FFE215022482444 +85BC:0820FFFE09203FFC24403FF824483FF828402F7828442F3C20804FF840809FFC +85BD:0820FFFE082000007F7C14207F20553855287F48086808587F4A084A0F6AF046 +85BE:0820FFFE08207FFC111021087FFCB55A29283558210835582928355820082018 +85BF:08200820FFFE0820247C3A0422281E1020FE3E124850085E7F5014B0229E4100 +85C0:0440FFFE044008202AA44D28145022887FFE410291141120228004401830E00E +85C1:0820FFFE082001007FFC08200FE000007FFC48244FEC01007FFC05401930E10E +85C2:0820FFFE08207F00227C3E0422283E1023A8FE4403F87F04118863700D18F106 +85C3:0440FFFE044008207F2000203E3E22423E8400107F1041105D2855285D444382 +85C4:0440FFFE044008207FFC08200FE00820FFFE14502F8841241FF0011009201310 +85C5:0820FFFE08207FFC44447FFC0800FF8400247F2400247F2400247F0441147F08 +85C6:0820FFFE0A2001007FFE4442BFFC0440FFFE082031D8CF0601007FFC01000300 +85C7:04400440FFFE04400A0033B822083A38238820883AB82288FFFE082010102008 +85C8:0440FFFE04400020F7A490A89292F114920895F4F84293F89040F0A091100608 +85C9:08200820FFFE082010487CFC10487C4811FEFE0010FC388454FC948410FC1084 +85CA:0440FFFE044000200DFE7102110211FEFD0031FE39AA56AA52FE94AA10A21086 +85CB:0820FFFE08203EF812480A28124808801FFC30805FF890801FF810801FFC1000 +85CC:0820FFFE0A2001007FFC42442B904C2837E0C1001FF011101FF001087FFC2004 +85CD:0820FFFE082000003F2024203F3E21403F5024883F0800003FF824482448FFFE +85CE:0820FFFE09203FF80108FFFE01083FF801007FFC248842443FF824482448FFFE +85CF:0440FFFE044800241FFE502057A0752417A4F4A857A85510951227AA20464082 +85D0:0820FFFE082008103020CAFC2C843084C8FC14842484CCFC1448244AD48A0906 +85D1:0440FFFE14401FE020207FF8A30824881FF011101FF008001FF0282007C0F83E +85D2:08200820FFFE08200DFC710411FC1104FDFC308039FE56225552910211FA1006 +85D3:08200820FFFE082020443E2844FEFF1049107F7C49107F1000FE0F10F0104010 +85D4:0820FFFE0A207FFC4104BFF8044028281FF02828CFE608200FE0010015102208 +85D5:0820FFFE0820100011FC7D2411FC7D2411FCFC2013FE3A22562A92FA120A1206 +85D6:0820FFFE08203F7C24443F2821103F2824463FF010101FF010101FF008201010 +85D7:0440FFFE044042102F9022100F9E0AA2EA882F88220827142A94322252428FFE +85D8:0820FFFE092001F801003FFC21042FE0210827F8249027F0249047F44A4A93FA +85D9:0440FFFE0440100008787F48224814867F0010FC694416446D281490642818C6 +85DA:0820FFFE09207FFC01003FF824483FF810101FF010101FF010101FF008201010 +85DB:0820FFFE0A2001007FFE42029CF410101EF010101FF008001FFC20040AA412AC +85DC:0820FFFE08200640387C08947E241C442A94490802C01D30E92E054009201310 +85DD:0820FFFE08203E2008F87F282A285D6A082A3E5600823FF80000FFFE10103FF8 +85DE:0820FFFE082000007FFC08001FF02810CFF000007EFE20407EFCA3443E7C2244 +85DF:04400440FFFE04403FF821083FF821083FF80000FEFE9292FEFE9292FEFE8282 +85E0:0820FFFE092002001FF010101FF010101FF020407EFC42847EFC42847EFC4284 +85E1:0820FFFE08A0404027FC211000A007FCE44427FC244425F4251425F4540C8FFE +85E2:04400440FFFE044022204AA08ABE1FC420A46F24A0282FA822102FA822442F82 +85E3:0820FFFE08207FFC44447FFC24987EE000847E7C42007E9842E07E844284467C +85E4:0440FFFE044000203D2424A825FC3C4027FE24883D2426AA247044A855248A62 +85E5:04400440FFFE044021104BA472B823904AA47BBC0100FFFE05401930E10E0100 +85E6:0820FFFE08A03FFE24103F7C26382D5434122FF8208027F820805FFE40808180 +85E7:04400440FFFE0440103C13C025447CA809FC104027FE7C8000F85548563080CE +85E8:08200820FFFE09203FFC24403FF824483FF828402F7828442F3C40004A489124 +85E9:0820FFFE0820203817C01248815047FC524814042BFAE24823F8224823F82208 +85EA:0440FFFE044008007F204920FFBE49447FA42A243E281028FF1022281C446282 +85EB:0820FFFE0820000027FC10A017FC84A447FC520813F82208E3F8204027FC2040 +85EC:0820FFFE08207DFC452449FC482053FE490445FC450455FC490441FC40884104 +85ED:0820FFFE09207FFE5022A8143EF822083E0822F83E8022FCFE0412042228CE10 +85EE:0440FFFE044010A0109011FEFD2013FC312039FC552051FE900012A412521452 +85EF:0820FFFE08203F0821083F7E20082F4820285FA8440895282C900100489487F2 +85F0:0820FFFE08207784428462A454A469A414242224DD2408247F244A042F94F008 +85F1:08200820FFFE092000803FFC2100AFF868882FF86888AFF8215042F84C8AB07E +85F2:04400440FFFE0440100013FE1200FE7C1244327C3A0056EE52AA92EE120013FE +85F3:0440FFFE05407FFC08200FE000007FFC48244FEC00003FF80100FFFE0920711C +85F4:04400440FFFE144010F824887CF8088810F824007DFC01545554555483FE0000 +85F5:0820FFFE08200BF8120833F8504097FE115012480100FFFE06801C48E530060E +85F6:0820FFFE08203FFE21042E3822102FBC27182AB432522040247C444044409FFE +85F7:04400440FFFE044020201022FDFC00287BFE004079FC068478FC488478FC4884 +85F8:04400440FFFE04400022FCFA2024602895FE344058FC948435FC568490FC2084 +85F9:04400440FFFE0440200011FCFD0401FC790401FC788001FE7A224D5279FA4806 +85FA:0820FFFE08207C7C44447C7C44447D7C44844FE459044FC449044FC449044FEC +85FB:0820FFFE082023F8120813F8800047BC54A417BC2040EFFE215022482C462040 +85FC:0820FFFE09207FFC41043FF801001FF001007FFC24483FF801004884489287F2 +85FD:04400440FFFE044008007F7C2244147CFF44087C7F44087C2A28492AA94A1086 +85FE:04400440FFFE14401080FEF811087EFC548454FC7C8410FC388454FC90481084 +85FF:0820FFFE08203FF801007FFE41029D7408801FFC30805FF890801FF810801FFC +8600:08200820FFFE082011FC1154FDFC102015FC182033FED08811FC102053FE2020 +8601:0820FFFE08207FFC01003D7825483D7801007FFC01003D7825483D780100FFFE +8602:0820FFFE09202488242443E424281214A0A0A4A41C1C0100FFFE05401930E10E +8603:0820FFFE092011F81100FFFE08102E5C28502E50F0FE01007FFC05401930E10E +8604:0820FFFE0820770C5570774000407F7E49487F4849487F480848FF8808880908 +8605:0820FFFE0820220047DC888017C0257E67C8A54827C821082FE8210822A82450 +8606:0820FFFE092001F801003FFC21042FE0210827F8249027F024904FF849489FFC +8607:04400440FFFE0440200C3E704410FF1049FE7F1049387F34005455528A900010 +8608:0820FFFE0820060038FE08107F7C1C442A7C49441C7C1444157C262824444082 +8609:0820FFFE08203FF82448FFFE901213F020102FFC6804A7F02210212020C02738 +860A:0440FFFE0440100010F824A87CA808D810F824007DFC01545554555483FE0000 +860B:04400440FFFE044009FE28202EFC2884FEFC088428FC2A8444FC08003048C084 +860C:0820FFFE0A2027DE491297D2211265DAA5142FD000003FF80000FFFE11102308 +860D:0820FFFE08A03F1004107FD0043E7FD255527FD204127FD20412FFE22AAA4544 +860E:0820FFFE08203FF801007FFE41029D7400003EF822A83EA822F83E844284867C +860F:0820FFFE0820400049FE742044FC3C8400FC7C8400FCFE8410FC5400D2482084 +8610:04400440FFFE0440203C13C0FD4400A879FC00407BFE008078F849487A3048CE +8611:0820FFFE08A03FFE22102FBC231826B42A5220003FFC44004FF8940827F80408 +8612:0820FFFE08A01CF0F11012F810A8FCF810A831FC392455FC552491FC1022101E +8613:08200820FFFE08200C8070F811081210FDFC312439FC552451FC90001154122A +8614:0440FFFE0440480075FE44203CFC00840CFC708410FCFE8410FC380054489084 +8615:0440FFFE04402020247C4AA4F81810E626104AFEFA10027CAA10AAFE051008FE +8616:0440FFFE044020207DFC44887C5041FE7C2045FC7C2001007FFC05401930E10E +8617:0820FFFE082000407C2045FC7C5043FE7C20A5FC3C2001007FFC05401930E10E +8618:0820FFFE082001007FFC00003EF822883EF804403FF80440FFFE04901C60671C +8619:0820FFFE08207F7848485E8664785F484A307F4C00007EFC22441A3462C4060C +861A:08200820FFFE082020443E2844FEFF1049107F7C49107F1000FE55104A908A90 +861B:0820FFFE0820241024FEFF2024443CFE24023C7C2444FF7C5444627C40447E4C +861C:04400440FFFE044029007DFC29043A4411547CE455F47C4410E4FD5410541008 +861D:04400440FFFE044008201420223E5D4280847710551077102228222855448882 +861E:04400440FFFE044008201420223E5D4480A47724552877282210222855448882 +861F:0440FFFE044001FC7CA845FC482051FC480445FC440455FC484042A4428A447A +8620:0820FFFE0820104057FC524855547FFE100017FCF40455F4551455F4940417FC +8621:0820FFFE08203EF822883EF822883EF822883EF814502288FFFE082007C07838 +8622:0440FFFE0440100008407E7C2440FF7C00047E7C42407E7C42407E7C4242463E +8623:04400440FFFE044022207F10227EFF9008107F10497C7F1049107F1022FE4100 +8624:0440FFFE0440103C27C07A4449284BF84A087BFC4A044BFE7A024CAA04AA0906 +8625:0820FFFE092002800C6037D8C0063BB82AA83BB800003FF824883FF8248824B8 +8626:04400440FFFE04403FF801007FFE41029D7401001D7000003BB82AA83BB82AA8 +8627:0820FFFE08A000F840802FFC28840BF0E8882BF829402AA8317022A851608FFE +8628:0820FFFE0820070CF87051102A2420783E104824FF7E081249544F5271920030 +8629:0820FFFE28203F20403EBE482AA8FF284A107F2808461F8002103FF811102308 +862A:0820FFFE09203FFC24403FF824483FF828402F7828442F3C44905FFC82A01C9C +862B:08200820FFFE082027D01510179E84A047A8554417C42000E7F8252825282FFE +862C:0440FFFE044010007DFC44047CFC40047DFC44007DFE11225CFC50A45EACF020 +862D:0820FFFE08207C7C44447C7C44447C7C41045FF441045FF455545FF44544592C +862E:0820FFFE08203FF824483FF800003FFE22042A942514289422544A8445148888 +862F:0820FFFE082021F8110841F821080BFE090073FC14A4115412883FF82448FFFE +8630:04400440FFFE044021FC210449FCF90413FE22524BFEF80001FCA888A870038E +8631:0440FFFE0440100093FE5420FEFC388454FC928400FC1484FEFC280044488084 +8632:0440FFFE04401FF011101FF011103FF82AA83EF82AA83EF801003FF80100FFFE +8633:08200820FFFE082022107F7C2210FF90087E7F0049107F10497C7F10227E4100 +8634:0820FFFE08201D7049245D7449245D7449247FFC00007FFC10101FF00820FFFE +8635:0820FFFE08200094FDD2481249507BFE481049D4795449D44F48F9CA09560822 +8636:0440FFFE04400C20704011FCFD2439FC552493FCFC24245A685E10902912C60E +8637:0440FFFE0440FFFE110013DE5A5253DE52505BD2E40E0FE0544483821C70E00E +8638:0820FFFE08200050FE4810FE11907CFC549054FC6C9044FE7C8045547D2A462A +8639:0820FFFE08A0104017FC10005BF856A853F892441158124410A8119016A810C6 +863A:0440FFFE0440100008287F24147E494855C87F7E08487F7E514855485D7E4340 +863B:0820FFFE08207F3C2A243E422A3CFFA449187F6608401F8002103FF811102308 +863C:0820FFFE08A03FFE24103F7C26382D54341221203F3E21202F3C41205F3E8120 +863D:0820FFFE08201FF011101FF011103FF82AA83EF82AA83EF801007FFC0920711C +863E:0820FFFE08A0204027FC200023F8FAA823F822442118224438A8E19046A800C6 +863F:0820FFFE08207FFC44447FFC10A0209045FE792013FC25207DFC012055FE8100 +8640:0820FFFE0920FFFE02887D7025484D6682807EFC02803EF802807EFC0280FFFE +8641:0440FFFE0440FFFE110013DE5A5253DE52505BD2E64E0FE0544483821C70E00E +8642:0820FFFE08203FF801007FFE41029D7400403EFC23483E3009CE2E7828487E78 +8643:0820FFFE08202294129215508FFE42905EF412942EF4E2942EE8228A22F62F22 +8644:0820FFFE08A021F822882070FBAEA8F8A850FBFE22A02AFC3B20CA78042009FE +8645:0820FFFE082001243CA825FC24403FFE248825FC3EA224F824A044FC54048AAC +8646:0820FFFE08201FF011101FF011107FFC4AA47EFC4AA47EFC20087FFC11102308 +8647:0820FFFE08A87BFE08880BDE7A5243DE40A079FE09200BFC0D2009FC512021FE +8648:0820FFFE082000007BDE489249124BD27A5E03C07A5E4BD24A524BD2799E4A52 +8649:0820FFFE08207F10007C3E44227C3E44007C7F40557E49407F7E490249AA4306 +864A:0820FFFE082021084FD2F03C23884812FBBE0280ABAA01007FFC05401930E10E +864B:0820FFFE082077DC444477DC4444FFFE92921C7010101FF008201FF0642C0860 +864C:0820FFFE49202A3E7F4849485DA86B1049285FF612903EF822883EF8228A3DFE +864D:0100010001F8010001003FFC200421082100211821E02F002104410440FC8000 +864E:010001F801003FFC210421602F88210820F8200023E02220222044244824901C +864F:010001F801003FFC210421602F88210820F821002FF821082108420844509820 +8650:010001F801003FFC210421602F88210820F8200027F824003FFE440047F88000 +8651:010001F801003FFC210421602F88210820F82000208020442A424A12521081F0 +8652:0008007C3F80208020F820802FFE288228F02F84287C28004BE052229422281E +8653:2020203E202021FEF922293829E02922291E29002B782D484948424A824A0486 +8654:010001F801003FFE210221F02F0420FC210020802FF822202140408043608C1C +8655:010001F801003FFE210221F02F0420FC2400243827A828AA352A42464580987E +8656:010001F801003FFE210221F02F0420FC201027E0224821502FFE404041408080 +8657:010001F801003FFE210221F02F0420FC2000201C27E0240027FE442044209FFE +8658:010001F801003FFE210221F02F0420FC200027F8240827F8240847F84408BFFE +8659:010001F801003FFC210421602F88210820F8210020882A242A445380460899F8 +865A:010001F801003FFC210421602F88210820F8224032482A482A5042405FFC8000 +865B:010001F801003FFE210221F02F0420FC2120292429242F3C212041205FFE8000 +865C:010001F801003FFC21042FE0210827F8249027F0249027F041005FF884080818 +865D:08200F2008207F7E496A4EAA782A492A474A40924E224A544A0A520291FE2000 +865E:010001F801003FFC21042FE0210827F8241027F020002FF820805FFC42209C1C +865F:0020783E482049FE4922793801E0FD22211E41007978094809480A4A524A2486 +8660:2010101E0010FEFE0092289C44F08292048E448028B810A828A8452A852A0246 +8661:010001F801003FFE210221F02F0420FC200021202924252821205FFE42108408 +8662:04101E1EE01022FE9292549C40F00492FF8E048044B824A824A8052A152A0A46 +8663:08100C1EEA100AFE0892FE9C28F02892B88EA880AAB8AAA8B6A8C32A812A0246 +8664:10101E1E10107EFE52925C9C70F052924E8E40805CB854A854A8972A952A2246 +8665:10281E24102E7EF052285C12702A52D64E28402E5CF0542454285612942A20C6 +8666:2810241E2E10F0FE2892129C2AF0D692288E2E80F0B824A828A812AA2B2AC646 +8667:08000FBC08007FC048404F3E7890479052205FBE72025F8252025F8252149F88 +8668:08020F8208047FC848504F0278824784400848907DE248825DC46AA8489088A0 +8669:1020923E522055FE11227D3845E07D22451E7D00117859485548964A524A2486 +866A:2120213C39642318FA66AABEB2AAE6BEAAAA9ABE8288BABEAA88AE7E2A0042AA +866B:0100010001003FF821082108210821083FF8210801000110010801FC7E040000 +866C:0840084008407F4049404940494049407F40484008400A440F44F144403C0000 +866D:0800080008FE7F2249224922492249227F22482208220A420F42F18241140208 +866E:1000100010F07C9054905490549054907C905090109014921C92E512410E0200 +866F:0804080408447F4449444944494449447F44484C08740A440F04F10440040004 +8670:0800080008FE7F1049104910491049107F10481008100A100F10F11040500020 +8671:00007FF0009003D07C1004103F902490249024903F900412048A07CA78462002 +8672:0820082008207F2049204930492849247F22482208200A200F20F12040200020 +8673:0820082008207F7C49444984490449447F24481408140A040F04F10440280010 +8674:1008101C10E07C20542054205420543E7DE05020102014221E22E222401E0000 +8675:1020102010207D20552C5534556457A47D245134112815221D22E50240FE0000 +8676:100011FC10207C2054205420542057FE7C205020102014201E20E22040A00040 +8677:0800087C08107F1049104910491049FE7F10481008100A100F10F11040100010 +8678:100011FC10047C0854105420542057FE7C205020102014201E20E22040A00040 +8679:1000100011FC7C2054205420542054207C205020102014201E20E22043FE0000 +867A:00200020FE2025FC25242524252425FC24202420242825FC2404440243FE8000 +867B:1020101010107C0055FE5480548054807C805080108014801E80E28040FC0000 +867C:1040104010807CFE5500560054FC54087C105020104014801D02E50240FE0000 +867D:00001FF0101010101FF0010001003FF8210821083FF80120011001F87F042004 +867E:100013FE10407C4054405440545054487C445044104014401E40E24040400040 +867F:0000FFFE040007F00810101020A041403FF8210821083FF8010001087FFC2004 +8680:2020202020203DFC45244924A124212421FC212420202028282433FE21020000 +8681:1040102411247D0455045488548854887C505050102014201C50E48841040602 +8682:100011F810087C0854885488548854FE7C025002100215FA1C02E40240140008 +8683:040008401F8003080C103FE000C0070079001FF0111011101FF001087FFC2004 +8684:1040102010207DFE544054405440547C7C445044104414441E84E28441280210 +8685:100011FE11007D0055785548554855487D485168115015421D42E542423E0400 +8686:1000100011FC7D2455245524552455247DFC5100110015001D02E50240FE0000 +8687:100010FC10847C845484548454FC54A07CA050A0109014901D08E50842040402 +8688:100011FC10887C8854885488548857FE7C885088108814881C88E50841080208 +8689:020001007FFC0820044003801C70E10E1FF0111011101FF0110001087FFC2004 +868A:1040102010207DFE54885488548854887C885050105014201E20E25040880106 +868B:1020102010207DFE55225522552255227D52514A118A15021D02E502410A0104 +868C:1020102010207DFC54205420542055FC7C205020102017FE1C20E42040200020 +868D:1010111011107D125512551455D855107D105110111015121D52E592410E0000 +868E:1000100010FC7C8454845484548454847CFC5084108414841E84E28440FC0084 +868F:100010FC10847C84548454FC548454847C8450FC108414841E84E28441140208 +8690:1040104010807CFC55045604548454447C445014102414441D84E40440280010 +8691:1020102010207DFE54205420542055FC7C845088104814501E20E25041880606 +8692:100010FC10847C8454A45494549454847DFE5084108414841C84E50441140208 +8693:100411E410247C24542455E4550455047D0451E4102414241C24E42441440084 +8694:1004101E11F07D1055105510551055FE7D105110111015081D0AE54A41860102 +8695:00003FF801000200FFFE044008203118DFF6111011101FF0110001087FFC2004 +8696:1000100011FC7C005400540057FE54907C905090109014901D12E512420E0400 +8697:1020102010207DFC54245424542454247DFE5020105014501E88E28841040202 +8698:1048104410447C4057FE5450545054507C505050109014921C92E512410E0200 +8699:1020102010507C5054885544562254207C0051FC100414081E08E21040100020 +869A:1008101C10E07C805480548054FE54887C885088108814881D08E50842080408 +869B:1020102010207C2055FC5524552455247D2451FC112414201E20E22040200020 +869C:100011FE10087C8854885488550855FE7C185028104814881D08E60840280010 +869D:1008103C11E07C205420543C55E054207C20503E13E014201E22E2224022001E +869E:1020102010207C2055FE5420547054707CA850A8112415241E22E42040200020 +869F:1000100011FC7C2054205420542054207DFC5020102014201C20E42043FE0000 +86A0:044008203018DFE60420042008A0104021001FF0111011101FF001087FFC2004 +86A1:1010109010907C8855085504560455FA7C885088108814881D08E50842280410 +86A2:1040102010007DFC5400540054F054907C905090109014921C92E512410E0200 +86A3:1008104810487C485444548454A455227C205040104014481C84E5FE40820000 +86A4:00003FF012100920044003801C70E10E1FF0111011101FF0110001087FFC2004 +86A5:1010108810847C8455025602548854887C885050105014201E50E28841040202 +86A6:100010FC10847C84548455FE548454847C8451FE108414841E84E28440940088 +86A7:1020102010507C5054885504560254887C885088108814881C88E50841080208 +86A8:1020102010207C2055FC5420542054207DFE5020105014501E88E28841040202 +86A9:0100210821083FF80100FFFE000001003FF8210821083FF8010001087FFC2004 +86AA:1010111010907C9054105510549054907C10501E13F014101E10E21040100010 +86AB:1040104010FC7C84550456F4549454947CF45084109414881E82E282407E0000 +86AC:100011FC11047D0455245524552455247D245154105014901C90E5124212040E +86AD:100011FC11047D04550455FC550055407D445148117015401D42E642423E0400 +86AE:1050105410527C925490559E55F056907C905090109014901E8AE28A40860082 +86AF:1004100E10F07C8054805480548054FE7C885088108814881C88E48843FE0000 +86B0:1020102010207C2055FC5524552455247D2451FC112415241D24E52441FC0104 +86B1:1080108010807CFE554055405640547C7C4050401040147E1E40E24040400040 +86B2:100011FC10207C20552454A454A854207FFE5020102014201E20E22040200020 +86B3:1004101E11F07D1055105510551055FE7D105110111015081D0AE54A41A60112 +86B4:201020902090F910A97EAA52AB92A892F912A11222522BD23862E822404A0084 +86B5:1000100013FE7C08540855E8552855287D28512811E815281C08E40840280010 +86B6:1088108810887C8855FE5488548854887C8850F8108814881E88E28840F80088 +86B7:100010FE10807C80548054FC548454847C84508410FC14801E80E28040FE0000 +86B8:1008101C11E07D005500550055FE55107D105130111815141D12E61042100410 +86B9:1044104410447C8454BE5584568454A47C945094108414841E84E28440940088 +86BA:1020102010207DFC5524552455FC55247D24512417FE15041D04E50441140108 +86BB:042004207FA00E20152224A2441E01001FF0111011101FF0110001087FFC2004 +86BC:1080108010807DFC5504560455E455247D245124112415E41D24E40440280010 +86BD:100011FE10107C1054205420546854A47D225222102014201C20E40043FE0000 +86BE:1010101010107DFE55125514551055FC7D445144112815281D10E62842440482 +86BF:1020101010107DFE54205420544454847DF85010102014441C82E5FE40820000 +86C0:1040102010007DFE54205420542054207DFC5020102014201C20E42043FE0000 +86C1:100011FC10447C4454445444549454887D0050FC108414841E84E28440FC0084 +86C2:1050104810487C4055FE54405440547C7CA450A410A815281D10E62840440082 +86C3:100011FE10207C20542055FE552255227D52514A118A15021D02E502410A0104 +86C4:1020102010207C2055FE5420542054207DFC5104110415041D04E50441FC0104 +86C5:1020102010207C20543E5420542054207DFC5104110415041D04E50441FC0104 +86C6:100010FC10847C84548454FC548454847C8450FC108414841C84E48443FE0000 +86C7:1020101010107DFE55025604548054887C9050A010C014821E82E282407E0000 +86C8:1020102011207D2055FC5520562054207DFE5020105014501E88E28841040202 +86C9:1020102010507C5054885524561254107DFC5004100814881E50E22040100010 +86CA:010001003FF8210821083FF8010001087FFC00043FF8244824482448FFFE0000 +86CB:7FFC0104110011F81100290047FE81001FF0111011101FF0110001087FFC2004 +86CC:1008101C11F07D5055505550555055507D505148114815681D54E67442520400 +86CD:2208111000207FFE4002810401003FF8210821083FF80120011001F87F042004 +86CE:100011FE11007D00550055FE552055207D3C5124112415241D24E64442540488 +86CF:100011FC10847C8854505420545054887F26502011FC14201C20E42043FE0000 +86D0:1050105010507C5055FC5554555455547D5451FC115415541D54E55441FC0104 +86D1:1020102010487C8455FE5412549054907CFE5110101017FE1C10E41040100010 +86D2:1040104010787C8855505420545054887D0650F8108814881E88E28840F80088 +86D3:082008287F240820FFFE002008247F24492449287F28481009120FAAF0464082 +86D4:1000100011FE7D025502557A554A554A7D4A514A117A15021D02E5FE41020000 +86D5:1020102011FE7C40544054FC548455847EFC5084108414FC1E84E28440940088 +86D6:1090108810807DFE54A054A854B054A47CA850B01124152A1D32E62242DE0400 +86D7:040008003FF020103FF020003FF820083FF801003FF821083FF801087FFC0004 +86D8:1104108410887C0057FE5420542055FC7C20502013FE14201E20E22040200020 +86D9:1020102011FC7C205420542057FE54007C20502011FC14201C20E42043FE0000 +86DA:2002200223E2F90AA90AA9EAA92AAA2AFB2AA2AA244A284A3882E902420A0404 +86DB:1020112011207DFC55205620542057FE7C7050A810A815241D24E62240200020 +86DC:2100217C2124FA24AA24AEFEAA24AA24FA24A27C22242A203A20EA2042400280 +86DD:100011F811087D0855F85508550855F87D445148113015201D10E54841860100 +86DE:1008103C11E07C20542057FE542054207C2051FC110415041D04E50441FC0104 +86DF:1040102010207DFE54005488550456027C885088105014501C20E45040880306 +86E0:2040204021FCF844A884A884A928AA10F908A3DE214A294A394AEA52435A04A4 +86E1:100013DE10427C425652554A554A54427CC6514A125214421C42E442414A0084 +86E2:1104108410887C0055FE5488548854887C8853FE108814881D08E50842080408 +86E3:1020102010207DFE5420542054FC54007C0050FC108414841E84E28440FC0084 +86E4:1020102010507C505488550456FA54007C0050F8108814881E88E28840F80088 +86E5:10201020107C7C8455485430542054487D90503E104215A41E18E21040600180 +86E6:1020102013FE7C2055FC542455FC55207DFE5022102A14541E50E28841040202 +86E7:100011FC11047D04550455AC555455547D54515411AC15041D04E50441140108 +86E8:100011FE10207C20544054FC548454847C8450FC108414841E84E28440FC0084 +86E9:00007DF01110119011521D12E20E45001FF0111011101FF0110001087FFC2004 +86EA:080008007F7C08243E2408447F54088809001FF0111011101FF001087FFC2004 +86EB:1040104010FC7D04560855FE5500557C7D445144115415481D42E542413E0200 +86EC:044004407FFC04400440FFFE082010102108DFF6111011101FF001087FFC2004 +86ED:100011FE10207C405488550455FE54227C20502011FE14201C20E42043FE0000 +86EE:02000100FFFE044014502448444401001FF0111011101FF0110001087FFC2004 +86EF:1040104010447DF45448545057FE54407C805184129814E01C82E482407E0000 +86F0:10801080FBF010901990F0941154520C25041FF0111011101FF001087FFC2004 +86F1:1020102010207DFC5420552454A454A87C2053FE105014501E88E28841040202 +86F2:2080208020BCFBC0A850A824A8D4AB0CF800A3FE209028903912E912420E0400 +86F3:208020BE2088FA88AABEAAAAAAAAAAAAFAAAA2AA22AA28AA392EE90842080408 +86F4:1040102013FE7C8854505420545054887D065088108814881C88E50841080208 +86F5:100011FE10007C9255245648552454927C0051FE102014201C20E42043FE0000 +86F6:1004101E11E07C2255125494548054087DFE5008108814481E48E20840280010 +86F7:1028102410247C2055FE5420552054B27CB4506810A815241E22E42040A00040 +86F8:1020112410A47CA8542055FC550455047DFC5104110415FC1D04E50441140108 +86F9:100011F810087CD0542055FC552455247DFC5124112415FC1D24E5244124010C +86FA:1020102010207DFC542054A854A854A87D745222105014501E88E28841040202 +86FB:1010109010887D08560455FA550855087D0851F8109014901C90E5124212040E +86FC:1020102011FE7C2055FC5524552455FC7D24512411FC14201DFEE42040200020 +86FD:100010FC10847C8454FC5484548454FC7C84508410FC14001E48E24440820102 +86FE:201020D82394F894A890ABFEA890A894F894A0D82398289038AAE8CA42860102 +86FF:1020102010507C885544562254F854087C10502011FC15041D04E50441FC0104 +8700:00003FF8244824483FF810001FFC22045FC4924412441FC4022403F47C142008 +8701:2100210021FEFA00AC00A9FEA822A824F920A13C212029203920EAA0447E0800 +8702:1040104010FC7C885550542054D857267CF8502010F814201FFEE42040200020 +8703:3FFC20002FF820003FFC24482430260E20802FF8288848884FF880841FFE0802 +8704:100011FE11007D00557C5500550055FE7D505152115415481D48E64442520460 +8705:1028102413FE7C20542055FC552455247DFC5124112415FC1D24E5244124010C +8706:100011FC11047D0455FC5504550455FC7D04510411FC14501C50E4924112020E +8707:080C08F07E8008800EFE788808882908120801003FF821083FF801087FFC0004 +8708:100011FC11047D0455FC5400540055FC7C20502013FE14201C50E48841040202 +8709:1008103C11C07C04554454A8540055F87C10502013FE14201E20E22040A00040 +870A:208421C42704F914A914A914AFD4A914FB14A39425542D043904E90441140108 +870B:1040102011FC7D04550455FC550455047DFC5120112215141D08E54441820100 +870C:1110111211147DD8551055125552558E7D20502011FC14201C20E42043FE0000 +870D:1020102010507C885504560254F854207C2053FE102015241D22E62240A00040 +870E:1000107C10447C44547C540054FE54827C8250FE108214821EFEE282408A0084 +870F:101C11E010207C2057FE54A8552456227DF85088109014BE1D02E50242140408 +8710:1088108810887DC8549E548A548A57EA7C8A508A110A154A1FEAE512402A0044 +8711:00187BE0104022787A400A402BFC10002FFE41003FF821083FF801087FFC0004 +8712:2004200E23B8F888A888A928A92EABA8F8A8A2A822A8293E3900EA80447E0800 +8713:2000200623B8F888A888A908A93EAB88F888A2882288293E3900EA80447E0800 +8714:1080108010FE7D02550256FA54AA54AA7CFA50AA10AA14FA1E8AE20240140008 +8715:1104108410887C1055FC5504550455047DFC5050105014901C92E512420E0400 +8716:100011FE114A7D4A554A557A554A554A7D4A517A114A154A1D4AE5FE41020000 +8717:200021FC2104F904A904A9FCA820A820FBFEA22222522A8A3B0AEA02420A0204 +8718:210021002100FBDEAA92AC92A892A892FBF2A09220922952395EEA2044200800 +8719:210421142114F914AFD2A922A92AAB48FB88A550251029143922E97E41220100 +871A:044004407C7C04403C7804407C7C044001001FF0111011101FF001087FFC2004 +871B:100011FC11047D0455FC5510551055FE7D105110117C15441D44E544417C0244 +871C:020001007FFE42028924284849940E1077F001003FF821083FF801087FFC0004 +871D:08207FFC08200FE008200FE00820FFFE10102108DFF611101FF001087FFC0004 +871E:1088108811FC7C88548854F8548854887CF85088108815FE1C00E48841040202 +871F:1020101011FE7C40548455FE540254FC7C8450FC108414FC1E84E28440940088 +8720:200023FE2202FA1AAAE2AA22AA22ABFEFA22A27222AA2B263A22EA2243FE0202 +8721:1048104810487DFE5448544855FE54007CFC5084108414FC1E84E28440FC0084 +8722:100011FC10087C10542057FE542054A07C4051FC115415541D54E55443FE0000 +8723:1088104810507DFC5420542055FC54207C2053FE105014501C90E4924112020E +8724:080C08F07E8018802CFE2A884888888809081FF0111011101FF001087FFC2004 +8725:210021062138F920AFA0A920A93EAB24FBA4A564252429243924E92441240144 +8726:1020102010507C88550456FA540055FC7D54515411FC15541D54E5544104010C +8727:2040202023FCFA04AA04ABFCAA00AA28FA24A3FE22202A503A50EC8845040A02 +8728:1020102013FE7C2055FC542457FE54247DFC50201120153E1D20E6A0427E0400 +8729:100011FC11247D245574552455FC55047D745154115415741D04E60442140408 +872A:1080108010FE7D02568254F2554254427FFA5042115215521DF2E40240140008 +872B:100011FC11047D0455FC5504550455FC7C00511211D415181D10E5524192010E +872C:200021FC2008F810AA22AAAAAA72AA22FA72A2AA23262AA23A42EA0243FE0002 +872D:10401040107C7C8455085600542055CE7D02510211CE15021D02E50241FE0102 +872E:201420122010FBFEA810A810ABD2AA52FA52A25423D4280C386AEB8A41160022 +872F:1020102011FE7C2054FC544055FE54887D24522210F814201DFEE42040200020 +8730:00003EFC22A43EA422FC3E80228222824A7E85003FF821083FF801087FFC0004 +8731:1040108011FC7D24552455FC552455447DFC5090111017FE1C10E41040100010 +8732:101C11E010207C2057FE54A8552456427C4053FE108815081CD0E43040480184 +8733:1020101011FE7C0054FC548454FC54007CFC5008101015FE1E10E21040500020 +8734:100010FC10847C8454FC5484548454FC7C4050FE112A144A1C92E522404A0084 +8735:1050115411547D5455DC5504550455FC7D04510411DC15541D54E55442540404 +8736:1040102011FE7C0054885488555456227C00502013FE14201E20E22040200020 +8737:1020112410A87C2055FC544057FE54887D0452FA148814881CA8E4924082007E +8738:00007EFC48447E4442287E1048287EC601001FF0111011101FF001087FFC2004 +8739:1088108813FE7C8854A8542055FC55247D245154114C15841D04E50441140108 +873A:20002040239CFA04AA04AB9CAA04AA04FBFCA090209028903890E9124212040E +873B:1020102013FE7C2055FC542057FE54007DFC510411FC15041DFCE50441140108 +873C:10A0109010807DFE5510571055FC55107D1051FC111015101D10E5FE41000100 +873D:200023FE2020F820ABFEAA22AA22AB32FAAAA2AA23762A663A22EA22422A0204 +873E:100011FC11247D2455FC5524552455FC7C2053FE107014A81D24E62240200020 +873F:2040202023FEFA02AD04A900A9DEAA52FA52A352249A28943910E9124212040E +8740:1020102013FE7C2055FC552455FC55247DFC5020107014A81D24E62240200020 +8741:00007FFC04403C7820083C780440FFFE01001FF0111011101FF001087FFC2004 +8742:2080228622B8FAA0ABE0AA3EAA2AAA2AFBAAA2AA22A42AA43AA4ECCA448A0892 +8743:100013DE10427D4A5484554A565254207C0053DE105215521C94E54842540422 +8744:200023FE2202FA8AAA52ABFEAA42AA22FBFEA28222822A823AFAEA02420A0204 +8745:3EF8082008207EFC08201450228841049FF2111011101FF0110001087FFC2004 +8746:10A810A813AE7CA854A8542055FC54207C20502013FE14201E20E22040200020 +8747:200021F02110F910A9F0A840ABF8AA48FA48A3F822482A483BFAE8424042003E +8748:200023FE2202FA02ABFEAA22AA22AAFAFA22A232222A2BFE3A02EA0243FE0202 +8749:1104108810507DFC5524552455FC55247D2451FC102014201DFEE42040200020 +874A:2040202023FEFA02AC04A800ABFEA820F820A120213C29203AA0EA60443E0800 +874B:200024842244FA48A800ABF8AA48AA48FBF8A24822482BF83A4AEC4A44460802 +874C:20C427042124F914A914AF84A924A914FB94A346253C2D043904E90441040104 +874D:200023DE2252FA52AA52ABD2AA52AA52FA52A3D2221A2A943A50EAB043100010 +874E:100011FC11047DFC550455FC548055FE7E225122115215021DFAE40240140008 +874F:2040202023FEF800A9FCA904A9FCA800FBFEA20221FC28203820E82040A00040 +8750:100011FE11027D7A5502557A550254007CFC508410FC14841EFCE28440FC0084 +8751:100013FE10227D20553C552056FE54007DFC510411FC15041DFCE50441140108 +8752:100013FE10207C4055FC5554555455747D545154117415541D54E55441FC0104 +8753:204020A02110FA08ADF6A800ABC4AA54FA54A3D422542A543BD4EA44425402C8 +8754:1110111211D47D1855525592552E54407DFC5104110415FC1D04E50441FC0104 +8755:10201020282025FC5324FD2445247D2445FC7D2440205028482455FE64824000 +8756:1040102013FE7E02540455FC540055FC7D0451FC110415FC1D04E40043FE0000 +8757:2020204021FCF904A9FCA904A9FCA800FBFEA020202029FC3820E82043FE0000 +8758:100011FE11007D7C5544557C5544557C7D1051FE112415641D18E524414201FE +8759:1020101011FE7D02550255FE550055007DFE51AA12AA14FE1CAAE4AA40AA0086 +875A:100010FC10487C3055FE5452549455107E30502011FE14701CA8E52442220020 +875B:200C200A2008FBFEAA08ABF8AA4AAA4AFBEAA2AC22AC2A4C3AAAEB0A42160422 +875C:1040104010F87D08561055FC550455FC7D0451FC110415FC1C00E48841040202 +875D:1040107C10847CF8540855FE544054A47D385058109415341C54E49241500020 +875E:100011FC11247D2455FC5500557C55447D44517C1144157C1D44E644427C0444 +875F:100011FE11227DFE552255FE540054FC7C8450FC108414FC1E84E28440940088 +8760:100011FE10007CFC5484548454FC54007DFE5122112215FE1D22E52241FE0102 +8761:100013FE10207C4055FC5554555455547D54512C102015FE1C50E48841040202 +8762:100013FE10207C4055FC5504550455FC7D0451FC110415041DFCE40040880104 +8763:210820882088FBDEA910A920A9DEA942F944A144215E29443A44EA4444D40808 +8764:1088104810507DFE5450545055FC55547D54518C110415FC1D04E50441FC0104 +8765:00207E20247E18A4FF2829104A2898C601001FF0111011101FF001087FFC2004 +8766:200023DE2242FA42AA42ABDEAA00AA3EFBD2A21222142BD43A08EA1442240242 +8767:1088108813FE7C8854A8542055FC55247D24512413FE14201E50E28841040202 +8768:00003FF0021002107FEA0206020208207EFC4AA44AA47EFC08200A24FEFE0202 +8769:1008103C11E07C2057FE542055FC55247DFC512411FC14201DFCE42043FE0000 +876A:100010FC10847CFC548454FC540055FE7C8050FE112A164A1C92E52240540088 +876B:1020102211FA7C24542857FE542054407CFC5184128414FC1E84E28440FC0084 +876C:200020882252FA22AA52AA8AAA02ABFEF888A144227A28883950E82040D80706 +876D:100011FC11047D0455FC5504550455FC7C0053FE102015201D3CE52042A0047E +876E:1040104010FE7C8055FC568454FC54847CFC5040107C14C41D28E41040680186 +876F:101E13E010447D24548855FC544054407DFE508010FC15441D28E61040680186 +8770:1020102013FE7C505488572655FC54207C2053FE100014201DFCE420402003FE +8771:02000100FFFE100010001FF8000008207EFC4AA44AA47EFC08200A24FEFE0202 +8772:2082208227F2F882A88AABEAAAAAAAAAFBEAA08A21CA2AAA3CA2E882408A0084 +8773:102011FE10207CFC542055FE540054FC7CA4509411FE14A41D14E5FE40040018 +8774:2100213C2124FBA4A924A93CA924ABA4FAA4A2BC22A42AA43BA4E84440540088 +8775:0620382008A47EA819202C504A88090401001FF0111011101FF001087FFC2004 +8776:204821482148FBFEA948A948A978A900F9FEA02023FE287038A8E92446220020 +8777:1020101011FE7D005544552855FE55107D5451541154157C1D14E52042400080 +8778:100010FC10847C8454F45494549455FE7D02517A114A154A1D7AE502410A0104 +8779:100010F810887C8854F85488548854F87C0051FC115415541D54E55443FE0000 +877A:2004201E23E0F820A9FCA924A924A9FCF820A3FE22222A2A3AFAEA02420A0204 +877B:2020202023FEF820A820ABFEAA8AAA52FAFAA22222222AFA3A22EA22422A0204 +877C:2020212420A8F820ABFEA8A8A924AA02F840A7FE208829083990E86041980604 +877D:1020102013FE7C2055FC544057FE54887D0452FA108814881CF8E488408800F8 +877E:2088208823FEF888A800ABFEAA02AC24F820A3FE207028A838A8E92442220020 +877F:100011FC11247DFC552455FC542055FC7D2451FC112415FC1C20E4224022001E +8780:088049F82A90286008901FFE2A10C950092001003FF821083FF801087FFC0004 +8781:1000127C11447D44547C54445744557C7D50514A114415541D62E5424280047E +8782:2100209E23D2FA52AA54ABD4AA58AA54FBD2A21222922A5A3AD4EB5042100010 +8783:2040202023FCF908A890ABFEAA02AC44F820A3FC208028F83888E90841280210 +8784:2100227E2388FA88AABEAAAAABAAAA2AFA2AA3AA22AA2AAE3A88EB8842880008 +8785:2020204021FCF904A9FCA904A9FCA904F9FCA040202028A43A8AEA8A44780000 +8786:208420442048FBFEA884A884A908A94AFA52A39C208429083908EA5243DE0042 +8787:101E13E011227C945440548855F054207CC451FE102214201FFEE45040880306 +8788:100011FE11107D20557C5544557C55447D7C5110111015541F52E29242500420 +8789:209020882104FA42AC88A9FCA804A800FBDEA0422252294A3A52E842414A0084 +878A:1088105010007DFE545055FC545457FE7C5451FC105014D81D54E65240500050 +878B:10A0112C11247D2455AC5524552455FC7C2051FC108814501E20E25040880306 +878C:10783E4822482A86FF7822482A2842104A2885463FF821083FF801087FFC0004 +878D:0020FE2000207CFC44A47CA400A4FEA482FCAAA49220FE28922492FE92428600 +878E:200023FE2000F9FCA904A904A9FCA800FBFEA28A22522BFE3A22EA22422A0204 +878F:2020201021FEF900A920AD20AB3CA950F990A31025FE29103928EA2842440482 +8790:2040208021FCF904A904A9FCA900A9FEF900A1FE20022AAA3AAAEC0240140008 +8791:1020104011FC7D0455FC550455FC55047DFC5028102415FE1C50E48841040202 +8792:102010201050FE8811267C2045FC7D2445247D2411FCFE201028103C13C41104 +8793:2040204027FCF840ABF8A880AFFCA910FA68A5C620402BF838E0E95846440040 +8794:2004201E23F0FA1EAA10AAFEAA92AA98FAF2A28E22802AB83AA8ECAA454A0A86 +8795:1020104011FC7D0455545524555455047DFC5000111215D41D18E5524192010E +8796:100010FC10847CF4549455FE550254FC7C8450FC108414FC1E84E28440940088 +8797:1020101011FE7D10557C551455FE55147D7C5110117C15441D44E644427C0444 +8798:1020112411247D2455FC540057FE54007DFC5104110415FC1C88E45043FE0000 +8799:010001007FFC038005401930E10E08207EFC4AA44AA47EFC08200A24FEFE0202 +879A:20444258FF6201427E3E42007E4C42727E42423E01003FF821083FF801047FFE +879B:2040202023FEFA02AC24A9FCA820A9FCF820A3FE202029FC3904E90441FC0104 +879C:08007F7808483E4800867F78414800303ECE01003FF821083FF801087FFC0004 +879D:2020204023FCFA24AA24ABFCAA24AA44FBFCA04020A828B4393CE9224222041E +879E:200021FE2120F9FCA920A9FCA920A920F9FEA00222AA2AAA3AAAEA0240140008 +879F:200023FE2202F800A9FCA904A9FCA904F9FCA04020202BFE3800E88841040202 +87A0:210420842088F800ABFEA800A888A904FA02A1FC215429543954E95447FE0000 +87A1:020001007FFC082007C01830E00E08207EFC4AA44AA47EFC08200A24FEFE0202 +87A2:08202AA44D28145022887FFE410281041FF0111011101FF0010001087FFC0004 +87A3:00203D2424A8242025FC3C4027FE24A825243EFA24A824A824F8442455FC8804 +87A4:20201020FE2005FC6924112429FCD52411247DFC55247C5010501C88E5044202 +87A5:1020102010507C4854A455FE568454FC7C8450FC108014FC1D44E544427C0044 +87A6:1020102013FE7C2055FC542057FE54407C8851F0102417FE1C22E52442A20040 +87A7:1040104411F87C5057FE544054F855827E7E540011FC15041DFCE50441FC0104 +87A8:1048104811FE7C48540055FE544854487DFE514A114A15B61D22E502410A0104 +87A9:2110211E2122FA54AA08AE94AAE2AA88FA88A2BE22882AAC3A2AEA4A42280210 +87AA:2040202023FEF888A850ABFEAA52AA8AFB06A2FA228A2A8A3AFAEA02420A0204 +87AB:08207F20083EFF4414A85610A5284C4681001FF0111011101FF001087FFC2004 +87AC:2090209027FEF890ABFCAA94ABFCAA94FBFCA00021F8290839F8E90841F80108 +87AD:2040202023FEF800A954A924A954A9FCF820A3FE22422A923AFAEA0A42020206 +87AE:2154215423FEF954A954AA72AC00ABFEFA22A02021FC29243924E924412C0020 +87AF:08207F20087E7E4408A4FF2810101E282244468281003FF821083FF801047FFE +87B0:2040202023FEFA50AA50ABFEAA52AA52FBFEA20022922AD43A98EC9244D2088E +87B1:3F0821083F7E20082F4820285FA8440895282C9001003FF821083FF801047FFE +87B2:2040202023FEFA8AA904ABFEA840A888F9FCA024202029FC3820E82043FE0000 +87B3:2020212420A8FBFEAA02A8F8A888A888F8F8A020202029FC3820E82043FE0000 +87B4:00207BFE482051FC612451FC492449FC687050A841243FFA21083FF801047FFE +87B5:100013FE10507DFC5554555455FC54007DFC500013FE14201CA8E52442A20040 +87B6:00003FFC20003FF820083FF820003FFC10207EFC52A47EFC10201424FEFE0202 +87B7:00803FFE22002FF828882FF829082FF822203FFC20A02FF848884FF880843FFE +87B8:14202220493E144222944110BE28222822443E8201003FF821083FF801047FFE +87B9:20802080208EFBE8A888ABE8AAAEABEAFAAAA3EA208A2BEA388AE892409200A2 +87BA:100011FC11247DFC552455FC544054887DF05020104417FE1C22E52442220060 +87BB:202021FC2124FBFEA924A9FCA820A9FCF924A1FC20402BFE3888E9D04070038C +87BC:1088108813FE7C8854F8542055FC55247DFC502013FE14201DFCE42043FE0000 +87BD:08001FF0282007C01830E18E0C40030010A07EFC52A47EFC10201424FEFE0202 +87BE:1040102013FE7E02540055FC542055FC7D2451FC112415FC1C00E48841040202 +87BF:0440247C24A83D5004287DFE24884448841801003FF821083FF801087FFC0004 +87C0:2040202023FEF820A848AAF2A924AA52F8F8A00820202BFE3820E82040200020 +87C1:3FF820083FF821003FFC20802C64301C10207EFC52A47EFC10201424FEFE0202 +87C2:104011FC11047DFC550455FC550055FE7D0051FE102215FA1C76E4A843260020 +87C3:200021F82108F9F8A908A9F8A800ABFCFA94A3FC200029F83890E86041980606 +87C4:08207E2008F8FF2814287F6A082AFF56088201003FF821083FF801087FFC0004 +87C5:1040102011FE7D005548554855FE55487D48114815781D00E6D442AA052A0800 +87C6:1088108813FE7C88540055FC550455FC7D0451FC102017FE1C50E48841040202 +87C7:04407FFC04401FF010101FF010101FF00400FFFE11103FF8D1161FF001087FFC +87C8:200023FE221AFA16ABFEAA12AAEAAAAAFAAAA2EA220E2A6A3B9AEA2643FE0202 +87C9:200023DE2042FA52A94AAA52A828A8C4FB12A0602188283239C4E81840600380 +87CA:1FF0022001407FFC048418886280010010207EFC52A47EFC10201424FEFE0202 +87CB:201C21E02020F924A8A8ABFEA870A8A8F924A222204028243AA2EA8A44880078 +87CC:1020104011FC7D24557C558C555455247D5451FC102014101D54E542414A0238 +87CD:2062238A208AFFEAA88AA9CAAAA2AC8AF8A4A02023FE287038A8E92442220020 +87CE:2088208823FEF888A888A8F8A820ABFEFA22A33222AA2B763A22EA22422A0224 +87CF:2088208823FEF888A820ABFCA824AFFEF824A3FC20202AB43AACEB2C42240424 +87D0:2020212420A8FBFEAA02A8F8A888A888F8F8A02021FC29243924E93441280020 +87D1:102011FC10887C5057FE540055FC55047DFC510411FC14201FFEE42040200020 +87D2:2088208823FEF888A824ABFEA850A888F904A28A20882BFE3888E88841080208 +87D3:208020F82108FBFEAD12A922A9FEA840F8A2A35420982B343854E89243500020 +87D4:200021FC2124F9ACA974A924A9FCA820F9FCA02023FE28003AA4EA5244520000 +87D5:2090229422D8FA92AAD2AF0EA9F0AA10FFFCAA4423FC2A443BFCEC4444540808 +87D6:214021442158FBF0A950A9D0A95EA9D4F954A15423F428143954EA3444140024 +87D7:01007FFC11101FF00100FFFE91121FF041047FFC01003FF821083FF801047FFE +87D8:10541092119E7EF0548A5486540254FC7C8450FC108414FC1E84E2FC40480084 +87D9:2110209423D2F812AA50A990AFFEA810FBD2A25222542BD43A4AEA4A43D60022 +87DA:08047F0808103E6400083E1022643E0814107F6001003FF821083FF801047FFE +87DB:2082208227F4F888A880ABE2A802ABE4FA28A22023E02A223942E87447880210 +87DC:101811E010407FFE54885574565254707C0051FC110415741D54E5744104010C +87DD:2200217E2040FC7CAA44A8FCA940AE7EFA20A02023FE287038A8E92442220020 +87DE:082049202A3E7F4849485DA86B10492841461FF0111011101FF001087FFC2004 +87DF:1020102011FC7C2055545488550456FA7C8850F8108814F81E20E2A841240060 +87E0:203C23E02124F8A8ABFEA8A8A924AA02F9FCA124212429FC3924E92441FC0104 +87E1:200E23F02044FA24A908ABF8AA08ABFCFA04A3FE22022AAA3AAAED0244140808 +87E2:102013FE10207DFC540055FC550455FC7C8853FE100015FC1D04E50441FC0104 +87E3:2124212422AAFBAEA924AAAAABAEA924FBFEA110211429143A8AEA4A42160422 +87E4:200023DE2252FBDEAA10AA52A9CEA800F888A3FE208828883BFEE88841040202 +87E5:1088108811FC7C88548857FE542055FC7D2451FC112415FC1C00E48841040202 +87E6:102011FC10207C8857FE548855FC55047DFC510411FC15041DFCE48841040202 +87E7:208822AA22DCFC88A954AA22A800ABFEFA42A44423FC28443844E88441140208 +87E8:3FFE289025103FDE22222A882F8822942422284027FC244427FC40444FFE8002 +87E9:20002FFE2800FA28A948ABEEA892A884FAA0AAA82BE828883894E91449241242 +87EA:2020202023FEF820A9FCA924A9FCA924F9FCA02223FE28423824EAA2428A0478 +87EB:200023FE2050FBFEAA52ABFEA800A9FCF904A1FC210429FC3820EBFE40200020 +87EC:200023DE2252FA52ABDEA800A9FCA924F9FCA12421FC28203BFEE82040200020 +87ED:1090108811FE7D10571055FE551055107DFE111015101DFEE50042A402520452 +87EE:1088105013FE7C2055FC542057FE55247CA853FE100015FC1D04E50441FC0104 +87EF:2020202021FCF820ABFEA908AB9CA908F988A63E20002BFE3890E8904112020E +87F0:202021FC2024FBFEA824A9FCA820AAAAFBAEA22223FE2A223BAEEAAA42AA0422 +87F1:2080208021FEFB54AD54A954ABFEA954F954A15427FE28003954E92A422A0000 +87F2:010001003FF821083FF801087FFC000410207EFC52A47EFC10201424FEFE0202 +87F3:100011FC10047CFC540455FC540055DC7C9453DC100817FE1D08E48840A80010 +87F4:240CFF7024403C40247E3C482448FF482448428801003FF821083FF801047FFE +87F5:200023FE2200FA04ABF4AA04AAEEAAA4FAA4A2EC22042AA43A44EA7445940008 +87F6:200027E0225EFBD2AA52ABD2AA72AFDEF840A3FE202029FC3820E82043FE0000 +87F7:2020212420A8FBFEAA02A8F8A888A888F8F8A00021FC292439FCE92441FC0104 +87F8:7FFC06003B0804B019C062A00C98728611207EFC52A47EFC10201424FEFE0202 +87F9:20003EFC4424BE542A983E502AFC3E102AFE2A1045103FF821083FF801047FFE +87FA:101011FE10007DFE5502557A554A55FE7C0050FC108414FC1E84E2FC400001FE +87FB:2104208823FEF820A9FCA820ABFEA854F992A09023FE289038D4EB8A409601A2 +87FC:2420FF20247E7EC482287A104A287AC605001FF0111011101FF001087FFC2004 +87FD:10101210117C7C1054FE5444572855FE7D10517C111015FE1D10E51042FE0400 +87FE:108010F811087FFE5544559255FE55007D7C5100117C15001D7CE544417C0244 +87FF:0878FFC808483E862B783E482A28FF9049287F4601003FF821083FF801047FFE +8800:1220113E10427C9457105528544655FC7D0451FC110415FC1D04E5FC40880104 +8801:11002BDE4A5273D42A524BD27A1A12942350C24001003FF821083FF801047FFE +8802:108813FE10887C00554857FE554855787D0051FC102017FE1C70E4A843260020 +8803:0100FFFE20003FF800003FF820083FF80000711C57D4755457DC715657D6B062 +8804:202020502088F924AEFAA850A924A954F9FCA02023FE2A423A92EAFA420A0206 +8805:100011FC11547D5455DC545055DC55547D5451DC115415541DDCE5504052003E +8806:0820FFFE08201FF011101FF011107FFC41245FEC01003FF821083FF801047FFE +8807:2088208823FEF888A9FCA924A9FCA924F9FCA02023FE2A223A2AEAFA420A0206 +8808:00107C1445FE7C9044947DD4448A7C8A291645223FF821083FF801087FFC0004 +8809:100011FC11547D5455FC540057FE54007DFC510411FC14621C94E58842A400C2 +880A:202023FE2288FA50ABFEAA50AAFCAA54FBFEA25422FC2A503AD8ED5446520850 +880B:100011FC11547D5455FC548055FC56447DF45154115415F41C44E5F440140008 +880C:100011FC11547DFC542055FC542057FE7C88505011FC14201FFEE42040200020 +880D:200823C82248FBCEAA4AABD2A904ABE4FCA4A2A423642A2A3BEAE82A414A0090 +880E:108813FE10887C2057FE5450548857267CF85020108815FE1C88E48841080208 +880F:210021DE224AFC8AABEAAAB6AAA4ABF4FABEA2A423E42ABE3AA4EAA442240464 +8810:2040202023FEF888A852AFACAAAAAAA8FDACA000210429FC3904E9FC41040204 +8811:208822AA22DCFC88A954AA22A800ABFEFA22A02023FE287038A8E92446220020 +8812:7FFC21087FFCB55A29283558210835582928355801003FF821083FF801047FFE +8813:208823FE2088FBFEAA02A9FCA800ABFEF840A0A2235428B83B54E89243500020 +8814:202023FE2000F9FCA904A9FCA800ABFEFA02A1FC20402BA438D8EB3440D20330 +8815:200021FC2020FBFEAA22A9ACA820A9ACF800A3FE202029FC3954E9544154010C +8816:108813FE10A87C9055FE572055FC55207DFC512011FE15001FFCE4884070038E +8817:200023DE2042FA52A94AAA52A890A908FBFEA51021FE291039FEE91041FE0100 +8818:2110211423F2F910AFFEAA90AA50AFF4FA94A3F422942BE83A8AEBFA42260042 +8819:2040202023FEFA02A9FCA948AA50A9FCFB04A1FC210429FC3904E9FC40880104 +881A:08207FFC08200200FFFE08001FF02810C8100FF010207CF854A87CF81224FEFC +881B:104811FE10487C0055FE554A554A55FE7C1451FE111015921D4CE54A41160222 +881C:22882108FABE2008729CA92A2288FFFE08203018C1063FF821083FF801047FFE +881D:200021FC2124F9FCA924A9FCA904A800FBFEA2AA22AA2BFE3AAAEAAA43FE0222 +881E:20403F7E4890BF7C21443F4421443F5424483A4001003FF821083FF801047FFE +881F:212422482124F800ABFCAA94AA64AA94FBFCA24823682A483B6AEA4A42460362 +8820:00007FFC02003FF8244827C8244827C824483FF810207CF854A87CF81224FEFC +8821:0FE010201FC00040FFFE0C1073200DC072B00C8EF3207CF854A87CF81224FEFC +8822:01007FFC01003FF80200FFFE08203FF8C8260FE010207CF854A87CF81224FEFC +8823:100011FE11287DFE5528557C5554557C7D54117C15101DFEE59242BA028A0484 +8824:08200440FFFE04403FF82848303827C820083FF810207CF854A87CF81224FEFC +8825:52107EFE28447E28A2FE3E1020103E7C22103E1001003FF821083FF801047FFE +8826:2040207C2040FBFCAA44ABF0AA44AAFCFAA8A2F822A82AF83A00EDFC45540BFE +8827:01007FFC01001FF000007FFE48029FF42810CFF010207CF854A87CF81224FEFC +8828:208823FE20A8F9FCA824ABFEA824A9FCFAAAA3AE22222BFE3A22EBAE42AA04AA +8829:22102110203AFB92A814ABBEA808AB90F83CA3E422A42ABC3AA4EBA442BC0024 +882A:08407F7C1440FF7C22043E7C22403E7C2242263E01003FF821083FF801047FFE +882B:0704782425241E2464241A24652419046514020810207CF854A87CF81224FEFC +882C:2110209023DEF810AA5EA982ABDEA810FBDEA25023DE2A503BDEEA50425202CE +882D:210013F0151000E0775C11F0104013FC284047FE10207CF854A87CF81224FEFC +882E:23EE228A22EAFB50ABEEAA4AAAA4ABEAF800A3DE20422A52394AEA52414A0084 +882F:00807FFE42004FF848884FF849084FF842807FFC44905F7C55545F7C4492BFFE +8830:102013FE10007DDC555455DC548857FE7C8853FE108817FE1C94E58842A400C2 +8831:01001FF011101FF001087FFC10207CF854A87CF81224FEFC00003FF82448FFFE +8832:440024FE28AA00AAFEFE004028FE452282FA00AAFEAAAAFAAA22AAFAAF0AF804 +8833:23DE225223DEFA52ABDEAA52ABDEA98CFA52A04027FE28883990E86040D80304 +8834:108813FE10887DFC555455FC542255FC7C2853FE104015FC1E84E4FC408400FC +8835:222223FE2090F9FEAB10ADFEA910A9FEF910A1FE21002BFE3A8AEB7642520276 +8836:3E7C48907EFC142A66C63FF820083FF820083FF810207CF854A87CF81224FEFC +8837:23DE225223DEFA52ABDEAA52ABDEA890F9FEA11023FE2D1039FEE91041FE0100 +8838:208823FE2088FBDEAA52ABDEA8A0A890F9FEA12023FC2D2039FCE92041FE0100 +8839:01007FFC11101FF00100FFFE88021FF068100FF010207CF854A87CF81224FEFC +883A:7CF81020FDFC28504488BFF620103FF020103FF010207CF854A87CF81224FEFC +883B:210447C88812F3BC20084B92F83E0380AAAAABAA01003FF821083FF801047FFE +883C:23DE225223DEFA52ABDEA8A0A9FEAB20FDFCA12021FE280039FCE8884070078E +883D:08282A244D2E087014243F246428BF12242A3F4610207CF854A87CF81224FEFC +883E:23FE220223FEFA92AA54AA92AAFEAAAAFAFEA32222FA2AAA3AFAEA2245FA0004 +883F:249079E414547DFC0004FFFC249479E41454FFFC10207CF854A87CF81224FEFC +8840:0100010002003FF82448244824482448244824482448244824482448FFFE0000 +8841:02000100FFFE1000100010001FF8010002003FF82448244824482448FFFE0000 +8842:08000800107E7F125512555255525552555255925512552257A2FC4200940108 +8843:0800080010FE7F10551055205530555855545592551255105790FC1000100010 +8844:080008FC10247F2455245524552455FC554455445544554457C4FC4401FE0000 +8845:0810081010947F545558551055FC55105510551055FE55105790FC1000100010 +8846:040008003FF824482448FFFE000000F87F0009041188635005201918E1060100 +8847:0804080E10707F405546555855545554555655545554555457D2FC9200980110 +8848:0800087E10247F24553C55245524553C552455245526557C5784FC0400040004 +8849:08200820103C7F4455A85510552855445582557C5544554457C4FC44007C0044 +884A:102410FE2024FE00AAFEAAAAAAAAAAFEAA14AAFEAA90AAD2AFACF8AA00960122 +884B:01003FF80108FFFE01083FF801007D7C11107D7C44447C7C45447FFC2448FFFE +884C:080009FC100020004800080013FE302050209020102010201020102010A01040 +884D:10001200211C410080001400223E6288A0882108270821082108210821282010 +884E:1000100027DC410081001100213E6108AFE82108210821082108210821282110 +884F:100010002F9C400080001FC0253E6508A5082508254829882908300820282010 +8850:1000100027DC44008400178024BE6488A48827882408240827C8200820282010 +8851:11001100229C42408420190020BE6008AFC82048208825082208210821282010 +8852:12001100201C4FC08200140024BE6888AF0821082208220824882F8820A82010 +8853:11001180215C4140810017C0213E6308A3882348254825082908210821282110 +8854:12001200239C4200840017802A3E6208AF882208220822082288230822282010 +8855:20002FE0482E48208BA01820283E6BA4AAA42AA42AA42BA42824282428B42848 +8856:14801480249C44809FE0148024BE6488A4882FE8200824882448284830082018 +8857:1100110027DC4100810017C0203E6108A10827C82108210821C82E0824282010 +8858:1400140027EE4900910011002FDE6104A10425C42504250425C43E0428142008 +8859:10001FC0221C42008F80148024BE6FC8A0082008278824882488248827A82490 +885A:140014E024AE4EA084A014E024BE6EA4AAA42AE42AA42AA42EA4212421342268 +885B:120012002FCE44409FE010002FDE6844AFC421042FC4210429042FE421142108 +885C:144012802FEE4100820017C0245E6444A7C42444244427C42444244427D42448 +885D:108011C0271C410087C0110027FE6548A7C8254827C8210827C821082FE82010 +885E:110017C0224E4FE0800017C0245E67C4A0042FE421042FE42924292429742108 +885F:154015402A8E4540854010002FDE6104A7C4244427C4244427C4244427D42448 +8860:110011002FEE410087C0144027DE6444A7C4244427C424442FE4228424542828 +8861:120013C0244E488087C01540255E67C4A544254427C421042FE4210422942448 +8862:2EE02AA04EEE4AA08EE01AA02EFE6444AFF4348427E4248427E4248427F42408 +8863:020001000100FFFE0200020005000508089018A02840482088100A080C060800 +8864:200010000000FC00080010001000340058009400140010001000100010001000 +8865:1040084000407E400240046008501A482C444A440A4008400840084008400840 +8866:200011FC0020F8200820102014203BFE54209020102010201020102010201020 +8867:200011FC0020F8200820102014203BFE54209020102010201020102010A01040 +8868:010001007FFC010001003FF801000100FFFE0500088818502820C9180A060C00 +8869:200013FC0104F944092410A81088348858509450142010201050108811041602 +886A:202010200020F920092C1134116437A459249534152811221122110210FE1000 +886B:1004080400087E100220044408041A082C104A220A42080408080810082008C0 +886C:201010100010FC1009FE10101010341059109490149010101010101010501020 +886D:202010200020FC2009FC1020102034205BFE9420145010501088108811041202 +886E:02000100FFFE000008201210244848241FF0029004440C283410C50806060400 +886F:201010900090FC8809081104120435FA58889488148810881108110812281410 +8870:02000100FFFE00001FF01010FFFE10101FF0028004440C283410C50806060400 +8871:200013FC0084F88808881090109C348459449544152811281210122814441182 +8872:202010200020FDFE09221122112235225952954A158A110211021102110A1104 +8873:201010900090F8880888112415243A225440904010881084110413FE11021000 +8874:202010200020FDFE09221224102034205850945014501050109010921112120E +8875:2000100001FCFD04090411041104350459FC9504150411041104110411FC1104 +8876:202010200020FC2009FC112411243524592495FC152410201020102010201020 +8877:02000100FFFE01003FF8210821083FF80100028004440C283410C50806060400 +8878:2040104000A0F8A0091012081406311055109910151011101110121012101410 +8879:2004101E01F0FD1009101110111035FE5910951015101108110A114A11861102 +887A:02000100FFFE00007FFC20403FFE02400D407080030804900C603518C6060400 +887B:200010FC0084FC84088411FE10843484588495FE148410841084108410941088 +887C:202010200020FBFE08201020102035FC58849488144810501020105011881606 +887D:2008103C01E0FC2008201020102035FE58209420142010201020102011FC1000 +887E:01000280044009203098CFE6004002800100FFFE05000C883450C530060E0400 +887F:202010200050FC500888114412223420580095FC140410081008101010101020 +8880:204010400080FCFC090412041084344458449414142410441184100410281010 +8881:010001003FF80100FFFE00001FF0101010101FF0050408883850CA200C180806 +8882:202010200020F9FC082410241424382455FE9020105010501088108811041202 +8883:200021FC2C44F04420842484291432080100FFFE05000C883450C530060E0400 +8884:2008103C01E0FC200820102011FE342058209450145010501088108811041202 +8885:04001FE0142012A010401FFC000402140108FFFE05000C883450C530060E0400 +8886:202010200020FDFE0820102010FC3420582095FE14221022102A102410201020 +8887:200010FC0084FC8408A410941094348459FE9484148410841084110411141208 +8888:080008007F7C094411441144257C42000100FFFE05000C883450C530060E0400 +8889:202010100010F9FE0902120410803488589094A014C0108210821082107E1000 +888A:202010200050F850088811241212301055FC9804140810881050102010101010 +888B:08A0109030BE57C0904010241014120C0100FFFE05000C883450C530060E0400 +888C:0100FFFE08001FF020105F9010D01FA010040FFC030004880C503530C60E0400 +888D:2080108001FCF9040A0415F411143514591495F4150411281112110210FE1000 +888E:202011200120F22012FC24A427246924B2242A2424A427A420C4204420942108 +888F:204010400040FC400BFE10401080348058FE9510151012101210141011FE1000 +8890:200010400020F8280808108814903A9456A292A214C210881188128814781000 +8891:200013FC0084F8840884110415143A08540091FC110411041104110411FC1104 +8892:2000100001FCFD040904110411FC35045904950415FC11041000100013FE1000 +8893:200011F80108FD08090811F811083508590895F8150811081108110817FE1000 +8894:2000100003FEF808080811E8112835285928952815E811281008100810281010 +8895:204010200020FBFE0A0214041000349058909490148811081108110412041402 +8896:202010200020FC2009FC112411243524592495FC152411241124112411FC1104 +8897:202010200050FC88090412121020344059889410142010441188101010601380 +8898:2080108000FEFD000A201120112C35745BA49524153411281122110210FE1000 +8899:202010200040FDFC090411041104350459FC9504150411041104110411FC1104 +889A:205010480048FC400BFE1080108034FC59449544152811281210122814441182 +889B:2004101E01F0FD1009101110111035FE5910951015101108110A114A11A61112 +889C:202010200020FDFE08201020102035FC587094A814A811241124122210201020 +889D:208810880088F908097E13081508314855289928150811081108110811281110 +889E:02000100FFFE0820101020085FF4101010101FF004440C283410C50806060400 +889F:202010200120F92009FC11201220302055FE9820145010501088108811041202 +88A0:02000100FFFE11001FF822007FFC048008603298C4440C283410C50806060400 +88A1:202010200020F9FC0924112415FC39245524912413FE11041104110411141108 +88A2:202010200124F8A408A8102015FC38205420902013FE10201020102010201020 +88A3:204811480148F948094813FE1148354859489548157811001100110011FE1000 +88A4:0100FFFE00001FF0022001407FFC048418886280030004880C503530C60E0400 +88A5:2000100003FEF82008201040144038FC55849284148410841084108410FC1084 +88A6:202010200124FD240924112411FC342058209524152411241124112411FC1004 +88A7:208010800100F9FC0A04140411E435245924952415E411241004100410281010 +88A8:204010200020FBFE08401040108835085BF0942014401088110413FC11041000 +88A9:202010200020FC20083E10201020342059FC9504150411041104110411FC1104 +88AA:202010200020F9FC0820102014203BFE5420904010401088110413FE11021000 +88AB:201010100010F9FE09121114151039FC55449144112811281110122812441482 +88AC:02000100FFFE080010103FF800081FF0101010101FF0048808503820CB180C06 +88AD:04400420FFFE0910116021844F0482FC0100FFFE05000C883450C530060E0400 +88AE:208010800080F9FE090012001420302055289924162412221422102010A01040 +88AF:204010480244FA400BFE1080148038FC55449144114812501220145018881306 +88B0:1FF012101110FFFE121021103FFC001002A00140FFFE04880C503420C5180606 +88B1:209010940092F9120910137E1510311055109928152811281128114411441182 +88B2:0100FFFE02000FE034C00700388003F81D3001C03F0004880C503530C60E0400 +88B3:20201020007CFC8409481030102034485990943E144211A41018101010601180 +88B4:2020102003FEFC500888110412FA34005BFE9440148011FC1004100410281010 +88B5:20801088009CF970091013101510311055FE99101510111011101110117C1100 +88B6:2080108000FCF9080A90106011983626582095FC1420122013FE102010201020 +88B7:202010200050F8880904120211FC3400580095FC150411041104110411FC1104 +88B8:204010400040FBFE08801080117835085B10951015FE11101110111011501120 +88B9:200013FE0020FC20084011FC11043504590495FC150411041104110411FC1104 +88BA:202010200020FBFE0820102011FC3400580095FC150411041104110411FC1104 +88BB:200013FE0020FC20084011FC1154355459549554155411541154114411141108 +88BC:2080108000F8F9080B1014A0104034A05918960615F811081108110811F81108 +88BD:410021002100011EF7D2125222526A52B2522C92229221122292225E24522800 +88BE:202011200120F9FC09201220102033FE547098A814A811241124122210201020 +88BF:2020102001FCF8200820102013FE30005420982015FC10201020102013FE1000 +88C0:200011FE0102F9220922112211FE352259229552154A118A1102110211FE1102 +88C1:084008487F4408440840FFFE10400844FF4410442928662AA212292A30462082 +88C2:00047F8408241F24212452240C243004C20C0100FFFE04880C503420C5180606 +88C3:20401040007CFC40084013FE100034005BFE9440145010481044104010401040 +88C4:20401040009CF9000A40104010BE35885A889488148810881088108810A81090 +88C5:082048202BFE082018202820C9FC0A000100FFFE05000C883450C530060E0400 +88C6:2020112400A4FCA408A8102013FC34045804940415FC10041004100413FC1004 +88C7:202010200040F88009FC11541154355459549554155411541154115413FE1000 +88C8:200013FE0202FC44084013FC108034A0592095FC1420102013FE102010201020 +88C9:200011F80108F90809F81108110835F859449548153011201110114811861100 +88CA:04001FF010101FF010101FF010001FFC10001FFC01043FEC04801C486530060E +88CB:200013FC0000FC0009F811081108350859F89400150810881090100017FE1000 +88CC:202010200020FBFE0820102011243524592496AA142010501050108811041202 +88CD:200013FE0222FA220A2213FE16223A62567292AA132212221222120213FE1202 +88CE:200011FC0104F904090411FC1000340059FE9420142011FC1020102013FE1000 +88CF:0100FFFE00001FF011101FF011101FF001001FF001007FFC04880C503530C60E +88D0:200010FC0084FC8408FC100011FE3502590295FE1502110211FE1102110A1104 +88D1:2040108001F8F90809F8110815FA390A550C93F8101810281048118816281010 +88D2:02000100FFFE0400387820083C7820083FF8028004440C283410C50806060400 +88D3:201010140012F8100BFE10101550395457F4915411541148124A125A14261042 +88D4:02000100FFFE048808503A20CC1808063FF82448282837D8244827C820282010 +88D5:200010500048FC840924102010503488590694F8148810881088108810F81088 +88D6:200011FE0100FD00097C1100110035FE59509552155411481148124412521460 +88D7:2040102003FCF8400890110813FC30045550995015501150125012521452180E +88D8:012001107FFC111009A00540193062080100FFFE05000C883450C530060E0400 +88D9:200011FC0044F8440BFE1044104435FC5880948015FC12841484108410FC1084 +88DA:080C08F07E8008800EFE78880888290812080100FFFE04880C503420C5180606 +88DB:0100FFFE00001FF010101FF000003FF821083FF820021FFE04881850EB300C0E +88DC:2028102403FEF820082011FC1124352459FC9524152411FC112411241124110C +88DD:242024203C2005FCFC20242024F846000100FFFE05000C883450C530060E0400 +88DE:210410840088FC1009FC11041104350459FC94501450109010921112120E1400 +88DF:1020082040A824A409227228103010C007000100FFFE04880C503420C5180606 +88E0:3FF80208FFFE04083FF808001FF82808CFF80100FFFE04880C503420C5180606 +88E1:200011FC0124FD2409FC1124112435FC5820942015FC10201020102013FE1000 +88E2:201012100110F97E082010281748357E5908950815FE110811081288147E1000 +88E3:202010200050F8880904120211FC340058449424112410A81088101013FE1000 +88E4:2010100801FEFD10091011FE112035285948957E1508110811FE120812081408 +88E5:210010BE0282F202120222FA228A6A8AB2FA2A8A228A22FA22022202220A2204 +88E6:0100FFFE000019F8609040607BFC40A441287A60030004880C503530C60E0400 +88E7:202010A200A2F9240850108813043022542098A414A411281050108811041202 +88E8:2040108003FCFA240A2413FC16243A4457FC9090111017FE1010101010101010 +88E9:200011FC0104FD0409FC1104110435FC5800951215D41118111011521192110E +88EA:2080108000FEFD020A8210F2114234425BFA94421552115211F2100210141008 +88EB:205012520252F25213DE220222026BFEB2022A0223DE22522252225224522802 +88EC:2020102001FCFC20082013FE108835445A4294F8158812501020105011881606 +88ED:20201020003EFC2009FE1122113835E05922951E150011781248124A148A1906 +88EE:20FC10840084FCFC0884108410FC340059FE9502150211FE1102110211FE1102 +88EF:200011FC0124FD240974112411FC350459749554155411741104120412141408 +88F0:200017BC0084F2941108229424A46840B0002FBC20A422A42128229024A82846 +88F1:2020102003FEF820082011FC102034205BFE944014A411A81290148810C61080 +88F2:200013FE0020F02013FE222222226B32B2AA2AAA2376226622222222222A2204 +88F3:0100111009207FFE40029FF410101FF00100FFFE05000C883450C530060E0400 +88F4:044004407C7C04403C7804407C7C06400100FFFE05000C883450C530060E0400 +88F5:02000100FFFE04407C7C04403C7804407C7C0440030804900C603518C6060400 +88F6:209010900090F79E1090209020906B9CB09028902090279E2090209020902090 +88F7:2020112400A8F82009FC104017FE3888550492FA1488108810A810921082107E +88F8:200011FC0124F92409FC1124152439FC542093FE107010A81124122210201020 +88F9:0100FFFE00001FF011101FF011101FF00100FFFE131065880C503530C60E0400 +88FA:2020102003FEF85008881124122231FC552499FC152411FC10221022101E1000 +88FB:08000E7C08047F4408282A1049281A440100FFFE05000C883450C530060E0400 +88FC:200011F80108F90809F81108150839F8548091FC125414941124124410941108 +88FD:24043FA44424FFA404243F842494258802000100FFFE04880C503420C5180606 +88FE:200013FC0204F20413FC222022206BFEB2202A2022FC22842284248424FC2884 +88FF:2020102001FCFC500888110413FE340859E89528152811E81128100810281010 +8900:2088108803FEFC88088810F81088348858F89488148813FE1000108811041202 +8901:00001FF011101FF011101FF00100FFFE09201110630804900C603518C6060400 +8902:2110111007D0F110111021182FF46812B112291027D02110211021D02E102410 +8903:20201120013CFD20092013FE100035FC590495FC150411FC1104110411141108 +8904:2020102003FEF82009FC102413FE342459FC944017FE108411C8103010CC1302 +8905:2040102001FCF8000888105013FE3222542499FC152411241134112810201020 +8906:200011FC0104FD0409FC1104110435FC580097FE14201120113C112012A0147E +8907:2100110001FEFA000DFC110411FC350459FC948014FC11081290106011981606 +8908:2008103C01E0F8200BFE102011FC352459FC952415FC102011FC102013FE1000 +8909:2100113C07D4F1141394211427D46924B14C284027FE204020A0211022082C06 +890A:2080104003FCF204120423FC22006A00B3FC2B54235425FC255425542944210C +890B:204811480148FBFE094811481578390055FE902013FE107010A8112416221020 +890C:200013FE0222F8200BFE102011FC352459FC952415FC102013FE102010201020 +890D:202011240124FD2409FC100013FE3420584095FC15541154115411541154110C +890E:02000100FFFE00180CE0302021FC3CA821243C20030804900C603518C6060400 +890F:0100FFFE00200C2031FC21243DFC212421243DFC030004880C503530C60E0400 +8910:200013F80208F3F8120823F821006BFCB4442A4422A4220423F4200420282010 +8911:201E13E00044FD24088811FC104034405BFE948014FC11441128121010681186 +8912:0100FFFE08000BF8120833F8504097FE11501248030004880C503530C60E0400 +8913:2100117C0144F2441244267C2A106A10B2FE2A38225422542294231222102210 +8914:200013FE0000F9FC0904110415FC380057FE9222122213FE1222122213FE1202 +8915:204010A00110F20815F6200023C46A54B2542BD42254225423D42244225422C8 +8916:208010FC0104FDF8080813FE104034A25B349458149413341052109013501020 +8917:200013FE0200FAFC0A8412FC16843AFC562093FE124812C812301248128413FE +8918:2040104001FCF8840BFE100015FC390455FC902013FE1020122013FE10201020 +8919:2050105203DCF85008D2134E100035FC590495FC150411FC1104110411141108 +891A:2020102201FAF824082813FE1420384054FC9184128410FC1084108410FC1084 +891B:2020112400A8F02013FE20A821246A02B0402BFE208821082190206021982604 +891C:008079F84A087DE8492879E8491449049AFC0100FFFE04880C503420C5180606 +891D:224211240000FDFC0924112411FC3524592495FC1420102013FE102010201020 +891E:200011F80108F90809F81108150839F8540093FC129412941294129417FE1000 +891F:200011FC0104F9FC090411FC14003BDE54429252114A10C6135A1042114A1084 +8920:2088108803FEFC8809FC108813FE342059FC952415FC112413FE110411141108 +8921:2088108803FEF888082010501488390456FA9000100011FC1104110411FC1104 +8922:0100FFFE02001FF011101FF012101FF004A808BA3382C4FE0C503530C60E0400 +8923:2040102003FEFA0208501088152438505488910412FA10881088108810F81088 +8924:2020102001FCF8200BFE100011FC3504590495FC14521094118816A410C21080 +8925:200013FE0200F2FC120023FE22A86A90B2C82A86220823FE2288244824082818 +8926:211012120454F7D81010201227D26C4EB4402FD22454245827D024522552248E +8927:7E1024523C5424903C282744FC8206000100FFFE05000C883450C530060E0400 +8928:210810880090FBFC084011F814403BFE5480910011FC12201420182013FE1000 +8929:10003E7822482A48FE8623782A4842304A4886840100FFFE06801C48E530060E +892A:2000127C0144F944087C10441744357C5950954A15441154116211421280147E +892B:2004101E03F0F21E121022FE22926A98B2F22A8E228022B822A824AA254A2A86 +892C:21F810880070F18C100023DE2252698CB252282023FE207020A8212426222020 +892D:0100FFFE00003FFC21003FF821003FFE29224496030004880C503530C60E0400 +892E:08202AA44D28145022887FFE400282040100FFFE05000C883450C530060E0400 +892F:2040102007FEF488148827FE24886CF8B4202DFC252425242934292830202020 +8930:01007FFE44429FF404403FF80440FFFE0A2011102FE8C28E04501C2065180606 +8931:02000100FFFE00003FF824483FF8111009201110230804900C603518C6060400 +8932:2020101001FEFD10097C1110117C3554597C9554157C111011FE121012101410 +8933:2010101002FEF910097C1054147C3B54557C911011FE111011101290147E1000 +8934:20481148014EF9500968114411443440580095FC155411541154115417FE1000 +8935:2040102003FEF80009541124155439FC542093FE1242129212FA120A12021206 +8936:200013DE0042FA52094A12521042342059FC9504150411FC1104110411FC1104 +8937:221012100450F95C1150225026FE6A00B2102A50225C225022B02290230E2200 +8938:202011FC0124FBFE092411FC142039FC552491FC104013FE108811D01070138C +8939:2110111007D0F110113C27D420146AB4B554291C27D42114211421E427262242 +893A:08207E2008F8FF2814287F6A082AFF560A820100FFFE04880C503420C5180606 +893B:0100FFFE08203E2008F87F282A685D2A08563E82030004880C503530C60E0400 +893C:400023FE205003FEF25213FE20206FFEB088290423FA250821F82102210220FE +893D:3F0821083F7E20082F4820285FA8440895282E900100FFFE06801C48E530060E +893E:200013FE0050FDFC0954115411FC340059FC940017FE102010A8112412A21040 +893F:2090109007FEF8900BFC129413FC36945BFC940015F8110811F8110811F81108 +8940:202013FE0020FDFC082013FE100035FC590495FC150411FC110411FC10881104 +8941:200013BE00A2F0A210BE238822086A3EB22A2BAA20AA20BE2088208A257E2202 +8942:2040108801FCF9080A5213FE14503988562690C0131010641388103010C01700 +8943:0100FFFE00000CF8308820F83C2021FC20A83D24030004880C503530C60E0400 +8944:0100FFFE00003EF822883EF804407FFC04403FF80440FFFE04441C28E5180606 +8945:200011FC0124FDFC092411FC10A834A85BFE94A814A811FC102013FE10201020 +8946:205012520154F8500BFE108814503BFE542091FC102013FE1050108811041602 +8947:200013DE0252FBDE0A5213DE16023AFA568A92FA128A12FA128A1202120A1204 +8948:200013DE0252FBDE0A10125211CE3400588897FE1488108817FE108811041202 +8949:279E1492079EF492179E240224F26C92B4F22C9224F224922492253224022406 +894A:200013F80208F3F8120823F820006FFEB4802FBC2494279424D42F88209420A2 +894B:420822080FBEE20822082FBE4AAA5AAAEAAA5BAE4208471C4AAA524842084208 +894C:200013DE0252FA520BDE100011FC352459FC952415FC102013FE102010201020 +894D:20A0109001FEFB2009FC112011FC352059FE9500142013FE107010A813261020 +894E:203C13E00124F8A80BFE10A81124360259FC9524152411FC1124112411FC1104 +894F:202413A80092F5141208240423BA68A8B0C62B80223C238420A8209022A82144 +8950:208010F80108FBFE0D12112215FE384054A29354109813341054109213501020 +8951:200011FC0004FCFC080411FC100035DC589497DC140813FE1108108810A81010 +8952:210811080548F390111E27D425646D54B5542F5425D4254825482554246424C2 +8953:2020102001FCF8200BFE1108139C35085988963E140013FE109010901112120E +8954:2088108803FEF888088810F814203BFE5622933212AA137612221222122A1224 +8955:210010BE0282F22212FA222222FA6AAAB2BA2AEA22AA22FA227222AA22222226 +8956:2080110007FCF4441554244427FC6CE4B5542C0420402FFE20A0211022082C06 +8957:200011FC0154F9FC082011FC14203BFE5488905011FC102013FE102010201020 +8958:202010500088FD740A0211FC112435AC592495FC140010F8108810F8108810F8 +8959:20F810880088FCF8080011DC1154355459DC942015FE107010A8112412221020 +895A:204412240128FC7E08101028134A351C5928954C151A112A1148111012FE1400 +895B:209013FC0294FBFC0A9413FC14003BFC560092F8120013FE1520151415481986 +895C:208010F80108FBFE0944119211FE3500597C9500157C1100117C1244127C1444 +895D:202010200050FC88090412FA1000340059DC9554155411DC1088108811541222 +895E:00407C2045FC44887C5043FE7C20A5FC24203E200100FFFE06801C48E530060E +895F:2110111007BCF11013B8255429126800B3F8280027FC20402248244429422080 +8960:2020112400A8FBFE0A0210F81088348858F8940015FC112411FC112411FC1104 +8961:200013F802A8F2A813F8210023FC6C84B3E42AA422A423E4209427F420142008 +8962:202013FE0000FBFC0A0412F4129437FC580095F8150811F8110811F8100013FE +8963:204010F80088FCF8088810F8100035FC592495FC152411FC100013FE10881108 +8964:200813E80288FBEE0A2813F416823BE2540091FC115411541154115417FE1000 +8965:212811AA016CF22812FE264426286AFEB2102A7C221022FE2210222822442282 +8966:200011FC0020FBFE0A2211AC142039AC540093FE102011FC115411541154110C +8967:200017FC0248F4441FFE244426EC6D54B6EC2C4426EC255426EC244424542408 +8968:214411440554F364115E27E420046A34B14C2BE4208423E4208420E427142008 +8969:202013FE0020FDFC080013FE125237FE590495FC150411FC110411FC10881104 +896A:210817FE0108F00013FC229422946BFCB0282BFE2220232422A82292242A28C6 +896B:2020102007FEF02013AE212423AE6AAAB3AE2AAA23AE20502050208821042602 +896C:200013FC0294F29413FC211022526BDCB0122BCE224023D2225C23D0225222CE +896D:2100113E0108F7D0113E212223A2683EB0222BBE22A222A222BE238022942022 +896E:21FC110401FCFD0409FC108811FC34885BFE9488152412AA107010A811241060 +896F:4200213C27A40024F4BC132427A4693CB1242FA4213C259025582968252A2246 +8970:2108110807CEF112112427DE25526D5EB7D2291E2392255E2940211421122122 +8971:2210111007DEF010145E228227DE6810B7DE2C5027DE245027DE2450245224CE +8972:08407F7C1440FF7C22043E7C22403E7C2242263E0100FFFE06801C48E530060E +8973:4148214C22AA0008F7FE11482368694AB36A294C236C2148216A239A20262042 +8974:27BC14A407BCF4A417BC244425F46C44B5F42D5425F4255425F424E42554244C +8975:23FC110801F8F10811F8210E27F86808B7FE2A94239C2294239C22D627BC2084 +8976:411427D221100FFEF01017D025526FD2B5522FD4229427C8228A2FFA22A62442 +8977:2140126C0244F36C12A423AC22A46FFEB1082AF4244223F8204027FC204020C0 +8978:252817BE0948F7BE131825AA29466BFCB2042BFC220423FC220423FC21082204 +8979:27BE100007BCF4A416B424A420406FFEB4A02FFC24A427FC251229DC291231CE +897A:211017FE0110F00017FE254A254A6EFEB7EA2D6A267E27CA244E257225422406 +897B:22A8124807BEF2A8175C2AAA22886FFEB2182DE4284223F8204027FC204020C0 +897C:210817FE0108F390113C27D422B46D5CB396292223FC200027FE2080210423FE +897D:211017FE0110F7BC14A427BC24A46FBCB4442FFC255425F4244424E425542448 +897E:0000FFFE0440044004407FFC444444444444444447C444444004400440044004 +897F:0000FFFE0440044004403FF8244824482448244828383008200820083FF82008 +8980:00007FFC044004403FF8244824483FF800000000000000000000000000000000 +8981:00007FFC044004403FF8244824483FF802007FFC042008401C80038006703808 +8982:FFFE04403FF824483FF8000001F03E0001007FF80060018006001800E7FE0000 +8983:FFFE04403FF824483FF800001FF010101FF010101FF00100FFFE010001000100 +8984:00007FFC04403FF8244824483FF80850104837FE504090A010A0111012081406 +8985:0040FE402840287EFEAAAB2AAA2AFE4A104AFE9225124422282210422894C408 +8986:FFFE04403FF824483FF8120027FC42088BF8120833F8510093F8151010E0171E +8987:FFFE04403FF824483FF822007F7C22443E44087C7F4449447F7C0844FF540888 +8988:FFFE04403FF824483FF810207E20523E4A447EA41028FF2820103E2842448682 +8989:FFFE04403FF824483FF828207DFC2850388813FE7C0855E87D2811E8FE081018 +898A:FFFE04403FF824483FF82800FDFE292039FC11207DFC55207DFE1002FEAA1004 +898B:00001FF0101010101FF0101010101FF0101010101FF00440044008423042C03E +898C:000001F8FD08050805F84908290811F81108290825F844908090011202120C0E +898D:010009201110210841041FF010101FF010101FF010101FF0044008421042603E +898E:00007E7C420442087E10421042FE7E10421042107E1024502422240243FE8000 +898F:100010FC10847C8410FC10841084FEFC1084108410FC2850245044928092010E +8990:00007E88425042207E50428842007E88425042207E5024882402240243FE8000 +8991:080048FC4884488448FC7E84408440FC40847C8444FC4450445044924492850E +8992:04000EFC7084108410FC1C84708410FC10841E84F0FC1050145018921092010E +8993:000801FC7E102210112000001FF010101FF010101FF010101FF004421842E03E +8994:00007FFC010003600D1871041FF010101FF010101FF010101FF004421842E03E +8995:1000087C0A440244127C134454C454FC54449844197C112831284F4A804A0086 +8996:200011FC1104F90409FC1104110439FC5504950411FC1050109010921112120E +8997:00007F7C014401447D7C014401447D7C454445447D7C45280128014A0A4A0486 +8998:100010FC10841E8410FC1084108410FC7E84428442FC425042507E924292010E +8999:200020FC20847E8442FC4484908410FC5484548452FC5250925010925092210E +899A:2208111000207FFE40029FF410101FF010101FF010101FF0044008421042603E +899B:0200077C38442044237C2C44284428FC2D442A442A7C29282928494A4C4A8886 +899C:280028FC28842884AAFC6C84288428FC6C84AA8428FC28502A504C924892810E +899D:00007CFC10841084FEFC1084108400FC1084528452FC9450285024924492810E +899E:00007CFC448444847CFC448444847CFC448444847CFC28502A502C924892810E +899F:0800087C0844FF44087C084408447E7C104408442A7CA128A128A54A1C4A0086 +89A0:00007E7C12441244FF7C124412447E7C204420447E7C6228A228224A3E4A2286 +89A1:0000007C7F440844087C2A442A442A7C5D444944887C08280F28F04A404A0086 +89A2:100052FC5484908428FC4484828410FC1084528454FC9050285024924292810E +89A3:0C0070FC1084FE8438FC5484928400FC1084FC8424FC4450285010922892C50E +89A4:10001EFC10847E8452FC5C84708452FC4E8440845CFC5450545096929492210E +89A5:1400147C14447F44557C554455447F7C55445544557CFFA82428224A424A8086 +89A6:1000287C444482447D7C0044F144957C9544F544957C9528F528914A954AB286 +89A7:3F2024203F3E21403F5024883FF810101FF010101FF010101FF004421842E03E +89A8:0000777C55445544777C00447F44007CFFC420443F7C01280128014A0A4A0486 +89A9:1000107C7D441244147CFF441044207C7E44A244227C3E282228224A3E4A2286 +89AA:1000087C7F440044227C1444FF44087C08447F44087C2A28492888CA284A1086 +89AB:1000087C7F440044227C14447F44517C08447F44107C1E281228224A2A4A4486 +89AC:0800497C49447F44007CFF4400447F7C414441447F7C422824280F4AF04A4086 +89AD:0000FF7C814400447E7C42447E44427C7E441044087CFF280028244A424A8186 +89AE:08202AA44D28145022887FFE40029FF410101FF010101FF010101FF00842F03E +89AF:2200227CFFC422447F7C2244FFC4087C7F4449447F7C4928FFE8414A454A4286 +89B0:10001E7C10447F44517C5C4472444E7C40445E44527C5E2852285E4A524ABF86 +89B1:08047F7808403E402A7E3E482A48FF4808881FF010101FF010101FF00442783E +89B2:2200227CFFC422443E7C08447F44497C7F4408447F7C08287F28084A0F4AF086 +89B3:2000207C3F444844887C7F441444227C7F44A4443F7C24283F28244A3F4A2086 +89B4:0A00747C15445244227C21445D44807C7E444244427C7E284228244A0F4AF086 +89B5:E700A57CE744A544E77C8144BD44A57CBD44A544BD7CA528A528CD4A814A8386 +89B6:0F00F07C49442244FE7C14440844FF7C9544BD44837CBD289528894A954AA386 +89B7:10001E7C10447F44517C5C4472444E7C40444A446AFC5B284A288F4A784A0086 +89B8:0000777C55447744557C774441445D7C55445D44557C5D285528414A454A4286 +89B9:0144F9548B548DF8F80E89128AEAFE0A8A0A8AEAFAAA52A452B456AA5B0A9210 +89BA:3AB821083AB82288393822887FFE50129FF410101FF010101FF004421842E03E +89BB:08000F7C08447F44497C4C447944477C40445F44407C5F2851285F4A8A4A3F86 +89BC:0000FF7C52449144FFFC9144DB44B57CDB449144DB7CB528DB28914A954A8286 +89BD:7E40487E7E9043087EFE48AA7FFE10101FF010101FF010101FF004421842E03E +89BE:1000087C7F444144867C784449442A7CFF442A44417CBE282A283E4A2A4A3E86 +89BF:1000FEFC10847C8400FCFE84AA84FEFC44847C8444FC7C5044507C922892450E +89C0:2200227CFFC42244777C55447744127C3F446444BF7C24283F28244A3F4A2086 +89C1:00001FF01010101011101110111011101110129012900480048008823082C07E +89C2:000001FC0104FD0405240524492429241124115428502490449081120212040E +89C3:00003E7C220422082A102A102AFE2A102A102A10081014501422240243FE8000 +89C4:100011FC11047D04112411241124FF241124115410502890249045128212040E +89C5:01F87E0012100910092000001FF010101110111011101290028004821882607E +89C6:200011FC1104F90409241124112439245524955410501090109011121212140E +89C7:100011FC11041F0411241124112411247D2445544450449044907D124612040E +89C8:04402440247C2490250804001FF010101110111011101290028004841884607C +89C9:2208111000207FFE400280041FF010101110111011101290028004841884607C +89CA:0800497C494449447F5400547F54015401543F542010202823282C4A308A0106 +89CB:0000007C7F44084408542A542A542A545D544954881008280F28F04A408A0106 +89CC:0800087C7E4408440854FF5401542A54185448542810FF281428224A414A8186 +89CD:1400147C14447F445554555455547F54555455545510FFA82428224A428A8106 +89CE:1000287C444482447D540054F15495549554F55495109528F528914A954AB286 +89CF:2400247CFF4424447E542454FF5408547E544A547E104A28FF28424A4A4A4486 +89D0:2200227CFFC422443E5408547F5449547F5408547F1008287F28084A0F4AF086 +89D1:10001E7C10447F4451545C5472544E5440544A546A905B284A288F4A784A0086 +89D2:080008001FE020204040BFF8210821083FF8210821083FF82108410841288010 +89D3:100410041F2421244224BFA424A424A43FA424AC24B43FA42484448442848104 +89D4:101010101F102110427EBF92249224923F92249224923F92249244A242AA8144 +89D5:1080108050F851087E1055FC912411241DFCF124512411FC1124122412141408 +89D6:20202020782049FC90247C24542454247DFE542054507C505488548845048E02 +89D7:1004101E3CF024904890BE902A902AFE3E902A902A903E882A8A4AAA42C68682 +89D8:101010103C1024104854BE522A522A903E102A142A043E082A084A10422086C0 +89D9:100010FC3C4424484848BE502A5C2A443E442A442A683EA82A904A9843248642 +89DA:2008201C79F0495091507D50555055507D50554855487D685554567446528C00 +89DB:100010003CFC24844884BE842AFC2A843E842A842AFC3E842A004A0043FE8600 +89DC:088028882EF028842E84F07C08000FC010803FF851081FF811081FF811082118 +89DD:1004101E3CF024904890BE902A902AFE3E902A902A903E882A8A4AAA42D6868A +89DE:104010403C7E2480497CBE082A102A203EFE2A4A2A4A3E922B124A2242548688 +89DF:101010103C7C24104810BE102AFE2A003E102A102A7C3E102A104A1042FE8600 +89E0:111009207FFC0200FFFE08203818CFC610803FF851081FF811081FF811082118 +89E1:104010403C7824884950BE202A502A883F062AF82A883E882A884A8842F88688 +89E2:08007F7C08243E2408447F5408880FC010803FF851081FF811081FF811082118 +89E3:100010FC3C2424244854BE882A102A503E7C2A902A103EFE2A104A1042108610 +89E4:2040204078FC490492087DFE5500557C7D44554455547D4855425542453E8E00 +89E5:20202020792448A490A87C2055FE54907C90549054907C9255125512460E8C00 +89E6:20202020782049FC91247D24552455247DFC552454207C28542457FE45028C00 +89E7:108810483C50240049FCBE202A202AFC3E202A202BFE3E202A204A2042208620 +89E8:200021FC7820482093FE7C00542054227FB254B454A87D285524562444A28C40 +89E9:202820247824482093FE7C20552054B27CB4546854A87D245622542044A08C40 +89EA:104010203CFC24004888BE502BFE2A203E202A202AFC3E202A204A2042208620 +89EB:2020202079FE482090207DFC552455247DFC542054707CA85524562244208C20 +89EC:20002040799C490491047DDC550455047DFC545054507C505490549245128E0E +89ED:2020202079FC485090887D0457FE54087DE8552855287DE85528540844288C10 +89EE:100010FC3C042404487CBE042A042AFE3E102A922A543E382A544A9242508620 +89EF:21042088785049FC91247D2455FC55247D2455FC54207C2057FE542044208C20 +89F0:102010203CFA24244828BFFE2A202A403EFC2B442A443E7C2A444A44427C8644 +89F1:00283FFE20202FA420282F9048AA4FC690823FF851081FF811081FF811082118 +89F2:208820507BFE482091FC7C2057FE54007CA054FC55207C2057FE542044208C20 +89F3:0800FFB808287F280028FFC6A0803E7C4224FF2449287F2849107F2849448B82 +89F4:1040107E3C80257C4844BE7C2A442A7C3E002AFE2A403EFE2B2A4A4A42928626 +89F5:2048204879FC484890487DFE542055FC7D2455FC55247DFC5400544844848D02 +89F6:200021DC7954495491DC7C0055FC55247DFC552455FC7C2057FE542044208C20 +89F7:0A803138228839382288FFFE88020FC010803FF851081FF811081FF811082118 +89F8:200021FC7954495491FC7C8055FC56447DF4555455547DF4544455F444148C08 +89F9:105010483CFE259048FCBE902AFC2A903EFE2A002AEE3EAA2AAA4ABA42828686 +89FA:48F8705044203DFC20247CB890A07D7E2A004FF010202FF848880FF808881098 +89FB:212421747A584ADA93FE7D5456DA57FE7CA2542057FE7C7054A8552446228C20 +89FC:208020F879084BFE91227D5254FC54847CFC548454FC7C4054FC554444388CEE +89FD:2010211279FE484890FE7D9056FE54907CFE549054FE7C8055DE555245728D06 +89FE:208820887BFE488890F87D04557457567D54555457747D0654005554452A8E2A +89FF:222223FE789049FE93107DFE551055FE7D1055FE54007DFE554A55F645528D76 +8A00:02000100FFFE000000003FF8000000003FF8000000003FF8200820083FF82008 +8A01:200010001000FE0000007C0000007C0000007C004400440044007C0044000000 +8A02:2000100011FEFE2000207C2000207C2000207C204420442044207C2044A00040 +8A03:204010401040FE4000407C5000487C4400447C404440444044407C4044400040 +8A04:2040202023FC2000FDF8240025F8240025F82508250825FA250A440243FE8000 +8A05:204010401040FE4001F87C4800487C4800487C484448444A448A7C8A45060200 +8A06:200410041084FE8400847C8400847C84008C7C9444E4448444047C0444040004 +8A07:100010001FFC20044204BFE400041FC400041FC400041FC410441FC410540008 +8A08:202010201020FE2000207C2003FE7C2000207C204420442044207C2044200020 +8A09:200011F00110FD100110791001907950015079104910491249127A124A0E0400 +8A0A:200013F00090FC900090789000907BF00090789048904892488A788A48860082 +8A0B:204010401040FEFC00847D0400047D0400847C444444440444047C0444280010 +8A0C:2000100010FCFE2000207C2000207C2000207C204420442044207C2045FE0000 +8A0D:200011F81088FEC800A87CA800887C5000507C504420442044507C8845040202 +8A0E:201010101010FE1001FE7C1000107C1001107C904490441044107C1044500020 +8A0F:200010FC1020FE2000207C2000207DFE00207C204420442044207C2044A00040 +8A10:200010FC1020FE2000207C2000207DFE00207C204420442044207C2044200020 +8A11:202010201020FEA000AC7CB400E47DA400A47CB444A844A244A27C82447E0000 +8A12:2000100010FCFE2400247CA400A47CA400A47D244424444444447C8445280210 +8A13:210411240124FD240124792401247924012479244924492449247A244A040404 +8A14:0100210821083FF802000100FFFE00003FF800003FF800003FF820083FF82008 +8A15:202010201020FE2001247D2401247D2401247D244524452445247DFC44040000 +8A16:204010401080FEFE01007E0000FC7C0800107C204440448045027D0244FE0000 +8A17:2008103C11E0FE2000207C2000207C3E01E07C204420442244227C22441E0000 +8A18:2000100010FCFE0400047C0400047CFC00847C804480448044827C82447E0000 +8A19:204010401040FDF800487C4800487D4800C87C4844A844A8448A7D0A45060202 +8A1A:200017FC020441045FF440044FE440044FE440044FE4482448244FE44824400C +8A1B:20A010A000A0FD2401247B2805307920016079A04920492249227922491E0100 +8A1C:201010501050FE5000887C8801047EFA00487C484448444844887C8845280210 +8A1D:200011FC1010FE9000907C9001107DFE00307C504450449045107E1044500020 +8A1E:2008103C11E0FE2000207C2003FE7C2000207C504450445044887C8845040202 +8A1F:200810481048FE4800447C8400A47D2200207C404440444844847DFE44820000 +8A20:200411E40024FC24002479E401047904010479E4482448244824782449440084 +8A21:202010201050FE5000887D4402227C2000007DFC4404440844087C1044100020 +8A22:2004100E10F0FE8000807C8000FE7C8800887C884488448844887D0845080208 +8A23:202010201020FDFC00247C2400247C2403FE7C204450445044887C8845040202 +8A24:200810881050FE2000507C8801007C0800887C884450445044207C5044880306 +8A25:202010200020FC2003FE7A2202227A2202527A4A4A8A4B024A027A024A0A0204 +8A26:202010200020FDFE01227A24002078200050785048504850489078924912020E +8A27:204010501048FE4800407DFE00507C5000507C504490449044927D12450E0200 +8A28:201010101010FE9000907C90009E7C9000907C904490449044907C9045FE0000 +8A29:200010080108FC8802527A5202227A2202527A924B0A4A0A4A027BFE48020000 +8A2A:204010201020FDFE00407C4000407C7C00447C444444444444847C8445280210 +8A2B:200010400020FC100090788000807A8402827A824A824C884888788848780000 +8A2C:202010201020FEA800A47CA201227D2002247C244428440844107C2044C00300 +8A2D:200010F81088FE8800887D0602007DFC00847C844448445044207C5044880306 +8A2E:200011FC0088FC880088788800887BFE00887888488848884888790849080208 +8A2F:200013FC0084FC8800887890009C788401447944492849284A107A2844440182 +8A30:202010200020FBFE0020792401247924012479FC4824482048227822481E0000 +8A31:208010800080FDFC01207A200020782003FE7820482048204820782048200020 +8A32:202010200020FC2001FC792401247924012479FC492448204820782048200020 +8A33:200011FC0104FD040104790401FC792401207920491049104A087A0844040802 +8A34:2008101C01E0FD000100790001FE7910011079304918491449127A104A100410 +8A35:2000100003FCFE9402947A9402947A9402947A944A9C4B044A047A044BFC0204 +8A36:2000100003FEFC08000879E8012879280128792849E849284808780848280010 +8A37:202010200020FDFC01247924012479FC01247924492449FC4924782048200020 +8A38:201C10E01020FE2000207DFE00207C7000707CA844A8452446227C2044200020 +8A39:202010281024FC2003FE7C2000707C7000A87CA84524462244207C2044200020 +8A3A:202010200050FC8801047A120020784001887810482048444988781048600380 +8A3B:204010200000FDFE002078200020782001FC782048204820482078204BFE0000 +8A3C:2000100003FEFC200020782001207920013C7920492049204920792047FE0000 +8A3D:208010800100FDFC02047C0401E479240124792449E449244804780448280010 +8A3E:088028882EF028842E84F07C01007FFC00003FF800003FF800003FF820083FF8 +8A3F:209010900090FA9002927AD402987A9002907A904A904A924AD27F124A0E0000 +8A40:202010201020FE20003E7C2000207C2001FC7D044504450445047D0445FC0104 +8A41:202010200020FC2003FE78200020782001FC7904490449044904790449FC0104 +8A42:208810880088FD08017E7B080508794801287928490849084908790849280110 +8A43:202010101010FDFE00207C2000447C8401F87C104420444444827DFE44820000 +8A44:202010200120FD2001FC79200220782003FE7820485048504888788849040202 +8A45:202010201050FE5000887D2402127C1001FC7C044408448844507C2044100010 +8A46:2004101E11F0FF1001107D1001107DFE01107D1045104508450A7D4A45A60112 +8A47:202010200020FDFC012479240124792401247BFE482048504850788849040202 +8A48:00003FF8244824483FF80100FFFE00003FF800003FF800003FF820083FF82008 +8A49:41002100013EF91207D27252025272540254749452885108529474A458420080 +8A4A:202010201124FEA400A87C2001FC7C2000207C2047FE442044207C2044200020 +8A4B:200011FC0104FD040104790401FC78500050785048504892489279124A0E0400 +8A4C:208810881088FE8801FE7C8800887C8800887CF84488448844887C8844F80088 +8A4D:204811480148FD4801487BFE0148794801487948497849004900790049FE0000 +8A4E:200010FE1080FE8000807CFC00847C8400847C8444FC448044807C8044FE0000 +8A4F:201010900090FD10017E7A5203927892011279124A524BD248627822484A0084 +8A50:208010801080FCFE01407D4002407C7C00407C404440447E44407C4044400040 +8A51:202010101010FEFE00827D0400407C4800507C604440444244427C42443E0000 +8A52:202010201020FE4000487C8401FE7C8200007CFC4484448444847C8444FC0084 +8A53:202010201020FDFC00207C2000207DFE00207C204440444844847DFE44820000 +8A54:200011FC1044FE4400447C4400947C8801007CFC4484448444847C8444FC0084 +8A55:200011FC1020FE2001247CA400A87C2003FE7C204420442044207C2044200020 +8A56:201010100010FDFE01127914011079FC014479444928492849107A284A440482 +8A57:200011FE1102FF0201027D7A014A7D4A014A7D4A457A454A45027D02450A0104 +8A58:202010200124FD240124792401FC782000207924492449244924792449FC0004 +8A59:205010480048FC4003FE7880008078FC01447944492849284A107A2844440182 +8A5A:2000100010FCFE8400847C8400FC7C8400847C8444FC448444007C0045FE0000 +8A5B:200010F81088FE8800887CF800887C8800887CF84488448844887C8845FE0000 +8A5C:202011240124FD2401FC782000207BFC01047888488848504820785049880606 +8A5D:204010200020FDFE01027A040000780001FE7820482048204820782048A00040 +8A5E:200011FC1004FE0401F47C0400047DF401147D1445F4451444047C0444280010 +8A5F:04800440FFFE0940118466FC01007FFC00003FF800003FF800003FF820083FF8 +8A60:204010200010FDE00022783403B878B000A878A8492849244A247C2248A00040 +8A61:200013DE0042FC420252794A014A784200C6794A4A52484248427842494A0084 +8A62:2080108001FCFD04020479E40124792401E47924492449E44904780448280010 +8A63:208010841098FEE000827C82007E7C0000FC7C84448444FC44847C8444FC0084 +8A64:201011101110FF2801447D0001FE7C0000A87CA844A844A844A87CAA452A0206 +8A65:202010201050FE5000887D0402FA7C0000007CF84488448844887C8844F80088 +8A66:201010140012FC1003FE7810001079D0009078904890488848EA7B8A48060002 +8A67:108010803EFC62449448483031102FE8C0061FF000001FF000001FF010101FF0 +8A68:204010200020FDFE0000788801047A0200887888485048504820785048880306 +8A69:202010200020FDFC0020782003FE7808000879FE480848884848780848280010 +8A6A:200011F80108FD0801F87908010879F801447948493049204910794849860100 +8A6B:2040102003FEFA020000783803C078400040787C4BC0484048427842483E0000 +8A6C:2008101C01E0FD00010079FE01007900017C79444944494449447A7C4A440400 +8A6D:2040104000FCFD04020879FE0100797C014479444954494849427A424A3E0400 +8A6E:202010200050FC8801047A0201FC78200020782049FC4820482078204BFE0000 +8A6F:202010200040FDFC01047904010479FC0104790449FC49044904790449FC0104 +8A70:202010200020FBFE0020782001FC7800000079FC490449044904790449FC0104 +8A71:2008103C11E0FE2000207DFE00207C2000207DFC4504450445047D0445FC0104 +8A72:202010101010FDFE00207C2400447CF800127C224444458844107C2844440182 +8A73:210410840088FC0003FE7820002079FC002078204BFE48204820782048200020 +8A74:2020102011FEFE4000407CFC00847D8402FC7C84448444FC44847C8444940088 +8A75:202011200120FDFC01207A2000207BFE0090789048904890491279124A12040E +8A76:208210920092FC920092789202DA7AB604927892489248924892791249020202 +8A77:200011FE1102FF02017A7D0201027D7A014A7D4A454A457A45027D02450A0104 +8A78:202010200124FCA400A8782000207BFE007078A848A8492449247A2248200020 +8A79:08000FF010203FFE6508A8843FFE200027F8200027F8200027F8440847F88408 +8A7A:20201020107EFE8201447C2800107C2000407CFE4542444244427C42447E0042 +8A7B:2080108000F8FD0803107CA0004078A001187A064DF849084908790849F80108 +8A7C:204010400040FDFE0080789000907912015279544A904A284C28784448840102 +8A7D:200011DC0088FC880088788800887BDE00887888488848884888790849080208 +8A7E:210011000100FDFE02027A02051278A2024A7AAA4B1A4A0A4BFA780248140008 +8A7F:2020102001FCFC200020782003FE78000020782049FC4820482078204BFE0000 +8A80:200013FE1088FE8800F87C8800887CF800887C88448E47F844087C0844080008 +8A81:210410840088FC0001FE78880088788800887BFE48884888490879084A080408 +8A82:205010501050FD5200D47C5800507C5800D47D524650445044927C924512020E +8A83:20201020107CFE8401487C3000207C4801907C3E444245A444187C1044600180 +8A84:2020102003FEFC20002079FC0020782003FE787048A848A849247A2244200020 +8A85:202011200120FDFC01207A2000207BFE007078A848A8492449247A2248200020 +8A86:200013FE0200FE0003FC7A2002207AF802207A204A204BFC4A007A004BFE0000 +8A87:2020102003FEFC500088790402FA780003FE7840488049FC4804780448280010 +8A88:200011FE0020FC400088790401FE78220020782049FE4820482078204BFE0000 +8A89:2208110811100020FFFE082011102FE8C0061FF000001FF000001FF010101FF0 +8A8A:1110091009207FFC0200FFFE09203FF8C0061FF000001FF000001FF010101FF0 +8A8B:200011F80008FC0801F879000104790400FC7840482048A44A8A7A8A44780000 +8A8C:202010200020FBFE00207820002079FC0040782048A44A824A8A7A8A4C780000 +8A8D:200013FC0044FD4401447A84009479080240782048A44A824A8A7A8A44780000 +8A8E:2020102003FEFC20002079FC0124792401FC7820487048A849247A2248200020 +8A8F:2020101010FCFE8400847CFC00847C8400FC7CA244A4449844907C8844C40082 +8A90:201010D80394FC9400907BFE00907894009478D84B98489048AA78CA4A860102 +8A91:4000244002BEF90802887488008870BE018872885488508850887088553E0200 +8A92:202010400088FD0403FE7882008079FC022078204BFE48204850788849040602 +8A93:080C7EF008800EFE78880A8819087FFC00003FF800003FF800003FF820083FF8 +8A94:2000100603B8FC8800887908013E7B8800887A884A88493E49007A80447E0800 +8A95:2004100E03B8FC8800887928012E7BA800A87AA84AA8493E49007A80447E0800 +8A96:2020102003FEFC2000207BFE02027C0401F8781048204BFE4820782048A00040 +8A97:204210E20382FC8A008A788A03EA788A018A79CA4AAA4A824C827882488A0084 +8A98:201C11E00020FC2003FE78A801247A2201F87888489048BE490279024A140408 +8A99:200011FE0000FC9201247A4801247892000079FE48204820482078204BFE0000 +8A9A:2020112410A4FEA800207DFC01047D0401FC7D04450445FC45047D0445140108 +8A9B:200011FC0004FCFC000479FC00007BFE020279F8488848884850782048D80306 +8A9C:204010400088FD0403FE780200887944024278F849884A504820785049880606 +8A9D:202010201050FE8801447E2200F87C0800107C2045FC450445047D0445FC0104 +8A9E:200013FC0040FC4001F8788800887BFE0000780049F849084908790849F80108 +8A9F:2020102211FAFE2400247DFE00107C2001FC7C88451046FE44107C1044500020 +8AA0:202810240024FC2003FE7A2002247A2403A47AA84AA84A904A927DAA44460882 +8AA1:201010140012FC1003FE78100150795407F47954495449484A4A7A5A44260042 +8AA2:200011F80108FD0801F87908010879F80108790849F84890489079124A12040E +8AA3:200011FC0020FC20012479240124792402AA7AAA4CB24820482078204BFE0000 +8AA4:200011FC0104FD0401FC7800000079FC002078204BFE48204850788849040202 +8AA5:202011200120FDFC01207A2000207BFE0000780049FC49044904790449FC0104 +8AA6:200011F81008FED000207DFC01247D2401FC7D24452445FC45247D244524010C +8AA7:2028102411FEFE2000207DFC01247D2401FC7D24452445FC45247D244524010C +8AA8:2080108010FEFD0002FC7C8400A47C9403FE7C844524451445FE7C0444280010 +8AA9:202010101010FEFE00007C7C00007C7C00007C7C4444444444447C7C44440000 +8AAA:201010900088FD0802047DFA01087908010879F848904890489079124A12040E +8AAB:200011FE0100FD00017C7900010079FE015079524954494849487A444A520460 +8AAC:210410840088FC1001FC79040104790401FC785048504890489279124A0E0400 +8AAD:2020102003FEFC2001FC780003FE7A020404789048904890489079124912020E +8AAE:2088108813FEFC8800887C5000507C9401947E98449044B244D27C92448E0080 +8AAF:20FC10841084FEFC00847C8400FC7C0001FE7D02450245FE45027D0245FE0102 +8AB0:20A010900080FDFE01107B1005FC7910011079FC49104910491079FE49000100 +8AB1:2020102003FEFC2001FC782403FE782401FC78204920493E49207AA04A7E0400 +8AB2:200011FC0124FD2401FC7924012479FC00207BFE487048A849247A2248200020 +8AB3:400023FE0202FA0203FE721002927292029272FE521052925292749254FE0802 +8AB4:2040102003FEFA02000079FC0000780003FE7820492849244A227C2248A00040 +8AB5:218410680030FCC80324782003FE784000FC79844AFC488448FC788448940088 +8AB6:2040102003FEFC000088788801547A22000078204BFE48204820782048200020 +8AB7:200013FE0202FE8A02527BFE02427A2203FE7A824A824A824AFA7A024A0A0204 +8AB8:201013880088FCFE00907B9002247A2402387B884890489048A478BE4A820100 +8AB9:205010500050FBDE00507850005079DC00507850485048504BDE785048500050 +8ABA:202010200020FBFE002079240124792402AA787048A848A849247A224C200020 +8ABB:2020102203B4FCA800A8792402A2784001FC7904490449FC4904790449FC0104 +8ABC:2020101001FEFD02020478F80088788800F87888488848F8488878884BFE0000 +8ABD:20001040039CFA0402047B9C02047A0403FC789048904890489079124A12040E +8ABE:7C7C44447C7C44447C7C41045FF440044FE440044FE440044FE448244FE4400C +8ABF:200011FC0124FD240174792401FC7904017479544954497449047A044A140408 +8AC0:2040108001FCFD24012479FC0124794401FC789049104BFE4810781048100010 +8AC1:200013DE0042FD4A0084794A02527C2000007BDE48524952489479484A540422 +8AC2:20401040007CFC8401087A00002079CE0102790249CE49024902790249FE0102 +8AC3:208810880088FC8803DE78880088799C01DC7AAA4AAA4CC84888788848880088 +8AC4:2040102003FEFC0001FC790401FC780001FC780848104BFE4820782048A00040 +8AC5:08207FFC08200FE008200FE00820FFFE11103FF8C0061FF000001FF010101FF0 +8AC6:2088108813FEFC8800887CF800887C8800F87C88448847FE44007C8845040202 +8AC7:202010A200A2FD240050788803047822002078A448A449284850788849040202 +8AC8:2008103C01E0FC2003FE78A800A878A803FE78A848A84BFE4820782049FC0000 +8AC9:201C11E00020FC2003FE78A801247A4200407BFE4888490848D0783048480184 +8ACA:2080108000FEFD0202427A4A0152784203FE784248E249524A4A784248540008 +8ACB:2020102003FEFC2001FC782003FE780001FC790449FC490449FC790449140108 +8ACC:2020102013FEFC2001FC7D2401FC7D2401FC7C20447044A845247E2244200020 +8ACD:2080108001F8FD0802107DFC0024782403FE7824482449FC4824782048A00040 +8ACE:204810481048FDFE00487C4801FE7C0000FC7C84448444FC44847C8444FC0084 +8ACF:200017E0025EFA5202527BD202527A5403D47A544A484AE84F54785448620040 +8AD0:17F8240867F8A2A024A4289C01007FFC00003FF800003FF800003FF820083FF8 +8AD1:200013FE0040FC8001447A2400687AB001307AA8486848A449227A2048A00040 +8AD2:2040102003FEFC00000079FC01047904010479FC482048A849247A2248A00040 +8AD3:20481044105EFDE000287C12006A7D9600487C5E45E0442444287C12446A0186 +8AD4:4100210001DCF9140114711407D4701401147114558855485948711455140222 +8AD5:20201020003EFC2001FE7922013879E00122791E490049784A487A4A448A0906 +8AD6:202010200050FC8801047AFA000079FC0154795449FC4954495479544904010C +8AD7:202010200050FC8801447A2201F878080050782048A44A824A8A7A8A44780000 +8AD8:2020102003FEFC20002079FC0020782003FE784048A449A84A907C8848C60080 +8AD9:201C13E00220FBFE02207A92030A7A0601FC7904490449FC4904790449FC0104 +8ADA:2020101010FEFE8201047C0000FE7C1000107C90449E449044907CD0453E0200 +8ADB:2020102000A0FD2C0124792401AC7924012479FC492448504850788849040202 +8ADC:204811480148FBFE014879480178790001FE78204BFE487048A879244E220020 +8ADD:200013FE0022FD20013C792002FE7C0001FC790449FC490449FC790449140108 +8ADE:2040102001FEFD02010279FE0100790001FE79AA49AA4AFE4AAA7AAA44A20086 +8ADF:200011FC0104FD0401FC7904010479FC00007BFE48204920493C79204AA0047E +8AE0:2040102003FEFA02040479FC000079FC010479FC490449FC490478004BFE0000 +8AE1:2088110402FAFC40008078F800087850002079FC49544954495479544BFE0000 +8AE2:200013FE0222FC2003FE782001FC792401FC792449FC48204BFE782048200020 +8AE3:200010FC1084FE8400F47C9400947DFE01027D7A454A454A457A7D02450A0104 +8AE4:200013DE0252FE5203DE780001FC780003FE7880490049FC4804780448280010 +8AE5:2008103C01E0FC2003FE782001FC792401FC792449FC482049FC78204BFE0000 +8AE6:2040102001FCFC000088785003FE7A22042479FC492449244934792848200020 +8AE7:2110111201D4FD1801527992012E784001FC7904490449FC4904790449FC0104 +8AE8:200013FE0000FDFC0104790401FC780003FE7A224A224BFE4A227A224BFE0202 +8AE9:208410480000FDFE0048784800487A48014A794C48484848484878484BFE0000 +8AEA:2040102003FEFC0001FC790401FC780003FE7A0249FC48204820782048A00040 +8AEB:2020102003FEFC2001FC792401AC7974012479FC4820487048A879244A220020 +8AEC:0C28702411FEFE503852548E91007FFC00003FF800003FF800003FF820083FF8 +8AED:204010A00110FA0805F6780003C47A5402547BD44A544A544BD47A444A5402C8 +8AEE:2020112000BEFC4200847B10011079280144788248FC48844884788448FC0084 +8AEF:202011240124FD2401FC780003FE7820004079FC49544954495479544954010C +8AF0:200011FC0124FD2401FC7924012479FC0000784048244AA24A8A7C8848780000 +8AF1:2040104001FCFC8403FE780001FC790401FC78204BFE48204A207BFE48200020 +8AF2:200013FE0050FC5001FC79540154795401FC7820482049FC482078204BFE0000 +8AF3:2020101011FEFE0000847C4801FE7C0000FC7C84448444FC44847C8444FC0084 +8AF4:2008100C000AFBFE02087A0802E87A0A020A7AEC4AAC4AA84AEA7A1A4A260442 +8AF5:2020102003FEFC2000207BFE028A7A5202FA7A224A224AFA4A227A224A2A0204 +8AF6:2088108803FEFC8800F8788800F8788800887BFE490049484984790049FE0000 +8AF7:400027FC0404FC3405C4744405F47554055475F45444545455F4749458061002 +8AF8:2020102201FAFC2400287BFE0020784000FC79844A8448FC4884788448FC0084 +8AF9:200011F80108FDF8010879F800007BFE010079FC4A544C9449247A4448A80110 +8AFA:2020101001FEFC000084784801FE7908011079644908491249647A084A3004C0 +8AFB:2020104001FCFD0401FC790401FC780003FE7820482049FC482078204BFE0000 +8AFC:201E13E00044FD24008879FC0040784003FE788048FC494449287A1048680186 +8AFD:2088108803FEFC8800F8782001FC7924012479FC48204BFE4820782048200020 +8AFE:2088108803FEFC8800A8782003FE7840008078FC49844A844884788448FC0084 +8AFF:200010F81088FE8800F87C0001FE7C8800F87C8844F84488449E7DE844080008 +8B00:2088108803FEFC88008878F80088788800F878204BFE487048A879244A220020 +8B01:200011FC1104FDFC01047DFC00807DFE02227D224552450245FA7C0244140008 +8B02:200013FE0222FBFE02227BFE000079FC010479FC490449FC4904790449140108 +8B03:200011FC0104FDFC010479FC0020792001FE7A20482049FC482078204BFE0000 +8B04:024879504BF848804FFC79104A484FFC48027BF848004BF848004BF84A089BF8 +8B05:2040104010FEFD2200AA7CFA00427C9401487CFE452246AA44FA7C4244940108 +8B06:2020101001FEFD02010279FE010079EE012279AA4966492249667AAA4A220466 +8B07:01007FFE44429FF404403FF80440FFFE09201FF02008DFF600001FF010101FF0 +8B08:1FF010101FF010101FF008207FFC0820FFFE0A203118DFF600000FE008200FE0 +8B09:2020104003FCFE2402247BFC02247A4403FC784048A848B4493C79224A22041E +8B0A:2088108803FEFCA800107BFE0080788000FC780048A848A848A878AA492A0206 +8B0B:4208220803BEF4880AA8713E02087448084877FC50E0515052487C4650400040 +8B0C:200013FE0008FDE8012879E800007BFE000879E84928492849E8780848280010 +8B0D:08202AA44D28145022887FFE4102BFF400001FF000001FF000001FF010101FF0 +8B0E:201010940254FD580110787E00107B30013879544994491049107A804C7E0000 +8B0F:20A0112C1124FD2401AC7D2401247DFC00207DFC4488445044207C5044880306 +8B10:404020280090FAA402C2748A01887678000073FC529452945294729457FE0000 +8B11:201E13E00122FC940040788801F0782000C479FE482248204BFE785048880306 +8B12:202010200050FC4800A479FE028478FC008478FC488048FC494479444A7C0044 +8B13:2020102003FEFC2001FC790401FC790401FC790449FC49044BFE788849040202 +8B14:4040207C0040FBFE0242727803C07244023C720052FC528053FE7480548008FC +8B15:4004201E03F0FA1E021072FE0292729802F2728E528052B852A874AA554A0A86 +8B16:200011FC0124FDFC012479FC00887944024278F849884A504820785049880606 +8B17:2040102003FCFD0800907BFE02027C4400207BFC488048F84888790849280210 +8B18:200013FC0204FA0403FC7A4002207BFC02887A504BFE4A204DFC7C2048200020 +8B19:208810500000FDFE005079FC00547BFE005479FC485048D849547A5248500050 +8B1A:210410840088FC0003FE780000887904020279FC495449544954795447FE0000 +8B1B:2088108803FEFC8801FC788803FE782001FC792449FC49244BFE790449140108 +8B1C:200011FE0110FD20017C7944017C7944017C79104910495449527A924A500420 +8B1D:4084210403C4FA4403DE724403C47264025477D450C451445244744451540088 +8B1E:2040102003FEFC0001FC790401FC780003FE7A024AFA4A8A4AFA7A024A0A0204 +8B1F:203C13C00044FA240128790000407B9C02047A044B9C4A044A047A044BFC0204 +8B20:2040108001FCFA48013078C0030079FC022078204BFE48204924792449FC0004 +8B21:2008103C03C0F8040244792801FC7A2000207BFE482049244924792449FC0004 +8B22:20A0109001FEFB2001FC792001FC792001FE79004BF849084890786049980606 +8B23:21FC102003FEFE2201AC782001AC780001FC78004BFE488048FC780448280010 +8B24:200013FE0050FDFC0154795401FC780001FC78004BFE482048A879244AA20040 +8B25:2020104001FCFD24017C798C01547924015479FC4820481049547942494A0238 +8B26:0878FF4808863E782A483E304148FFFC00003FF800003FF800003FF820083FF8 +8B27:2040102003FEFC0001547924015479FC00207BFE4A424A924AFA7A0A4A020206 +8B28:2088108803FEFC88000079FC010479FC010479FC48204BFE4850788849040202 +8B29:04407FFC04401FF010101FF010101FF00400FFFE11102FE8C0060FE008200FE0 +8B2A:2040102003FEFC8800507BFE02527A8A03067AFA4A8A4A8A4AFA7A024A0A0204 +8B2B:2040102003FEFC8800507BFE02227AFA02227AFA4A8A4A8A4AFA7A024A0A0204 +8B2C:200013DE0042FA52014A7A52002878C4031278604988483249C4781848600380 +8B2D:2108109007FEF80003C47A5403D47A5403D47A444ACC48004BFC788449140608 +8B2E:202013FE0020FDFC00207BFE000079FC010479FC490449FC490479FC48880104 +8B2F:2020103C0020FDFE0122793801E4791C0100797C4944497C4944797C494402FE +8B30:2010101002FEFD10017C7854007C7B54017C791049FE491049107A90447E0000 +8B31:202011FC0124FBFE012479FC002079FC012479FC48404BFE488879D04870038C +8B32:2040108801FCFD0802527BFE00507988062678C04B1048644B88783048C00700 +8B33:200013FE0200FE7C02447A44027C7A0002EE7AAA4AAA4AAA4AEE7A004BFE0000 +8B34:200011FC0124FBFE012479FC000079FC010479FC490449FC490479FC48880104 +8B35:200013DE0042FA52014A7A520042782001FC7904490449FC4904790449FC0104 +8B36:2040102001FEFD000148794801FE794801487948497849004AD47AAA452A0800 +8B37:08207E20087EFEC410281E10222846C68100FFFE00003FF800003FF820083FF8 +8B38:410821080108F7D0011E779401247FD4021473D452545248524874D454240842 +8B39:2088108803FEFC8800F8782001FC792401FC78204BFE482049FC78204BFE0000 +8B3A:08207E2008F8FF2814287F6A082AFF560982FFFE00003FF800003FF820083FF8 +8B3B:40102190061EFA22025472080F9072640208771E5AA252425214720852100260 +8B3C:2040107C0040FDFC0144797801C4793C01047978499449584AFE7A1044500020 +8B3D:7CF804887CF840207DFC052415FC0A22FFFE00003FF800001FF010101FF01010 +8B3E:200011F80108FDF8010879F800007BFC02947BFC480049F84890786049980606 +8B3F:4100211E07D2F912011277DE045277D2045277DE511251125FD27122512A0144 +8B40:200813880088F91007DE7A9402A47B9402947B944A944AC84B887E9448A400C2 +8B41:208813FE0088FC0001FC78A800A87BFE00A878A849FC48204BFE782048200020 +8B42:200013DE0252FE5203DE780001FC792401FC792449FC48204BFE782048200020 +8B43:4040207C0040FBFE0242727803C4723C020072505254535454D8745059FE0000 +8B44:210410880000FBFE02227AAA02727A2203FE780049FC490449FC790449FC0104 +8B45:400027DE014AFB5A056A725202D674200084708452D45296529472D4573E0000 +8B46:202013FE0020FDFC000079FC010479FC00887BFE480049FC4904790449FC0104 +8B47:2020102003FEFC8801247A2201FC782803FE784049FC4E8448FC788448FC0084 +8B48:4208210807C8F810079E749407A4701407947094511451C85708711455240242 +8B49:202017A400A8FA9201147A0805F4780203F87A084A084BF84A0879104FFE0000 +8B4A:2020102001FCFC2003FE7908039C790801887E3E48004BFE489078904912020E +8B4B:239C1294039CFE94039C7A0402F47A9402F47A944AF44A944A947B344A04020C +8B4C:400E23F00044FA24010873F8020873FC020473FE520252AA52AA750254140808 +8B4D:00803FFE229025FE2E9034FE249024FE24402FFE200027FC400047FC840407FC +8B4E:200013FC0048FC3003FE785200947B5000207BFE4A524A8A4B767A524A720206 +8B4F:2124112402AAFBAE01247AAA03AE792407FE7910491449144A8A7A4A4A160422 +8B50:2088105003FEFC5001FC7954018C7974010479FC48084BFE4908788848A80010 +8B51:201811E00040FBFE0088797402527870000079FC49044974495479744904010C +8B52:203C13E00124FCA803FE78A801247A0201FC7924492449FC4924792449FC0104 +8B53:2020102003FEFC2001FC792401FC792401FC78224BFE484248247AA24A8A0478 +8B54:200013DE0252FBDE02107A5201CE780000887BFE488848884BFE788849040202 +8B55:2080108001FEFB540554795403FE7954015479544FFE48004954792A4A2A0000 +8B56:200013DE0088FAA803FE798802DA7CA601F87908490849F84908790849F80108 +8B57:2210121003DEFA28054478A001107A0805F6780048004BF84A087A084BF80208 +8B58:2110109403D2F8120250799007FE781003D27A524A544BD44A4A7A4A4BD60022 +8B59:2090108801FEFD1003107DFE0110791001FE7910491049FE49007AA44A520452 +8B5A:200013FE0050FBFE02527BFE000079FC010479FC490449FC48207BFE48200020 +8B5B:2088108803DEF88807FE788801547A2201FC7904490449FC4904790449FC0104 +8B5C:2108109003FCF8900294799800907BFE000079F84908490849F87908490801F8 +8B5D:400027FC04A4FCA407BC70A007BC74A404A477BC54A454A457BC74A250A2007E +8B5E:200011FC0154FD5401FC780003FE780001FC790449FC4862489479884AA400C2 +8B5F:20F810880088FCF8000079DC0154795401DC78204BFE487048A879244A220020 +8B60:202017FE0000FBFE02027AFA028A7BFE000079FC490449FC490479FC480007FE +8B61:2020112400A8FBFE020278F80088788800F8780049FC492449FC792449FC0104 +8B62:204412240128FC7E00107828034A791C0128794C491A492A494879104AFE0400 +8B63:202010200050FC8801047AFA0000780001DC7954495449DC4888788849540222 +8B64:4108220807C8F45007DE746407D47214011477D4521453C852487454555408A2 +8B65:10207E204A7E7EC41028FF1020283EC64300FFFE00003FF800003FF820083FF8 +8B66:2420FF20247E7EC482287A104A287AC60500FFFE00003FF800003FF820083FF8 +8B67:402023FE0288FA5003FE725002FC725403FE725452FC525052D8755456520850 +8B68:409023FC0294FBFC029473FC000073FC020072F8520053FE5520751455480986 +8B69:2040102001FCFC8800507BFE000079FC010479FC490449FC48207A944A8A047A +8B6A:208813FE0088FDFC010479FC010479FC008079FE4A224D52490279FA480A0004 +8B6B:208010F80108FBFE0144799201FE7900017C7900497C4900497C7A444A7C0444 +8B6C:3E1022FE3E4420287EFEA2103EFC22100100FFFE00003FF800003FF820083FF8 +8B6D:410026DC0454FC5406D47454046677C0001C701457D45114510871C857140222 +8B6E:202010501088FD7402027DFC01247DAC01247DFC440044F844887CF8448800F8 +8B6F:200011FC0154FDFC002079FC00207BFE0088785049FC48204BFE782048200020 +8B70:2104108803FEFC2001FC782003FE7854019278904BFE489048D47B8A489601A2 +8B71:08207FFC01003FF80100FFFE11107D7C01007D7C01007D7C01007D7C45447D7C +8B72:4080204007FEF9100208751403F8711003F8711057FC512853107D4851860100 +8B73:200011FC0020FBFE022279AC002079AC00007BFE482049FC495479544954010C +8B74:2010107C0254FD7C011078FE00007B7C0144797C4940497C4944797C4A80047E +8B75:414421440554FB64015E77E400047234014C77E4508453E4508470E457140008 +8B76:0100FFFE00003FF800003FF820083FF80810FEFE00007CFC00007CFC44847CFC +8B77:208813FE00A8FC9001FE7B2001FC792001FC792049FE49004BFC78884870038E +8B78:202013FE0020FDFC00007BFE000279FC00207BFE48004BFE48047BBE4AA4038C +8B79:202013FE0000FDFC010479FC00007BFE020279FC48404BA448D87B3448D20330 +8B7A:220012BE0302FA5401C8783E020A7BCA052879284FEE49284AA87A584C4E0080 +8B7B:3EF822883EF822883EF822883EF814502288FFFE00003FF800003FF820083FF8 +8B7C:7E40487E7E9043087EFE48AA7EFE02000100FFFE00003FF800003FF820083FF8 +8B7D:0A0033B822083BB820883AB82288FFFE11103FF840049FF200001FF010101FF0 +8B7E:208813FE0000FDE2012A79EA012A79EA0122796648004BDE4A52794A4A5200C6 +8B7F:208813DE0088FDDC00887BDE00887BFC000479FC48044BFC48407AA44A8A047A +8B80:202013FE0020FDFC00007BFE02527BFE010479FC490449FC490479FC48880104 +8B81:4020201004FEFA44022870FE009276FE029272BA52AA52BA5286750058FE0000 +8B82:210011F80208FFFE02627A9201FC790401FC790449FC488049F87A884870038E +8B83:208811DC0088FBDE00887954022279FC010479FC490449FC490479FC48880104 +8B84:83F842480248E3F80248E24803F8E0000FBEEAAAAAAAAFBEAAAAEAAAAFBE08A2 +8B85:202013FE0202FC1C03E0792400A87BFE01247A024DFC492449FC792449FC0104 +8B86:22004F9C94802FDE6108AFC8250827D80100FFFE00003FF800003FF820083FF8 +8B87:23DE125203DEFE5203DE7A42027A7A8A03127ADA4A8A4ADA4A8A7AFA4A0A0204 +8B88:400027FE0444FD98048875FE048875DC06AA748854205520553C752055200BFE +8B89:2010107C0254FD7C011078FE00447B7C0144797C4944497C492879444A80047E +8B8A:210447C88812F3BC20084B92F83E0380AAAAABAA08001FF8282007C01830E00E +8B8B:08407F7C1440FF7C22043E7C22403E7C2342FFFE00003FF800003FF820083FF8 +8B8C:4110211007FCF91001F0720802EA76AC02A872AA56EA5A06500072A452520452 +8B8D:200013FE0020FBAE02AA7AAA03AE782003FE78204BAE4AAA4AAA7BAE482003FE +8B8E:3218291440207BBED06853A8783E53A850287BBE52A852A852A87BBE42A04020 +8B8F:22004F9C94802FDE6208AFC82A482AD80100FFFE00003FF800003FF820083FF8 +8B90:48907EFCC9907EFC48907EFC48907EFC0100FFFE00003FF800003FF820083FF8 +8B91:804040A00110E2080DF6E0000EEEEAAA0EEEE000AFFEA922AFFEE922A92A0804 +8B92:21F0121007FCFA0403FC7A2403B87A2201FE7A104FFC4A444BFC78D0494A063E +8B93:202013FE0000FDDC015479DC00887BFE00887BFE48884BFE489479884AA400C2 +8B94:400E2770052AFD14053E7608057E7500057E7502553E5602547E741454AA04BA +8B95:23DE125203DEFE5203DE7A2202FA7A2202FA7AAA4AFA4AAA4AFA7A724AAA0226 +8B96:2148114C02AAFC0803FE79480368794A036A794A4B6C494C496A7B8A48160022 +8B97:222213FE0090F9FE03107DFE011079FE011079FE49004BFE4A8A7B764A520276 +8B98:43FC210801F8F90801F8710E07F8700807FE7294539C5294539C72D657BC0084 +8B99:208813FE0088FBDE02527BDE00A0789001FE79204BFC4D2049FC792049FE0100 +8B9A:452827BE0948F7BE031875AA094673FC020473FC520453FC520473FC51080204 +8B9B:410827FE0108FB90013C77D402B4755C0396712253FC500057FE7080510403FE +8B9C:4248215007FCF40401F0711007FC755404E477FC504057FC50407FFE52A40452 +8B9D:23DE125203DEFC0003FE7A0002C87A4E03EA7AB24AEA4AAA4AEA7AB445E4082A +8B9E:810841EC010AEFEA0928EBC8093EEFE80948EBE8AA28AB68AAA8EBF4AAB412A2 +8B9F:81084FE40100E7CE0000EFEE0AA0EFEE0440E7CEA44AA7CAA44AE7CEA28A0440 +8BA0:000020001000100000000000F000100010001000100010001400180010000000 +8BA1:004020401040104000400040F7FE104010401040104010401440184010400040 +8BA2:0000200013FE102000200020F020102010201020102010201420182010A00040 +8BA3:0080208010801080008000A0F090108810841084108010801480188010800080 +8BA4:004020401040104000400040F040104010A010A010A015101910120804040802 +8BA5:000021F01110111001100110F1101110111011101110151219121212020E0400 +8BA6:0000200013FC104000400040F040104017FE1040104010401440184010400040 +8BA7:0000200013FE102000200020F020102010201020102014201820102007FE0000 +8BA8:001020101010101003FE0010F010101011101090109010101410181010500020 +8BA9:004020401040104000400040F07C10401040104010401440184010400FFE0000 +8BAA:002020201020102001240124F12411241124112411241124152419FC10040000 +8BAB:00802080110011FE02000400F1F8100810101060108015001A02120201FE0000 +8BAC:0010207813C0104000400040F040107E17C010401040144218421042003E0000 +8BAD:010421241124112401240124F124112411241124112415241924122402040404 +8BAE:008020481248120802080110F110111010A010A01040144018A0111002080C06 +8BAF:000027F01110111001100110F11017D01110111011101112150A190A11060102 +8BB0:0000200011F8100800080008F00811F811081100110011001502190210FE0000 +8BB1:0000200013FC104400440244F244124414841084108415041904120404280810 +8BB2:011021101110111007FC0110F11011101FFE1110111015101910121002100410 +8BB3:00402040104017FE00400040F3FC1040104017FE10421042144A184410400040 +8BB4:000023FC1200120802880250F2501220122012501250128817081A0013FE0000 +8BB5:000023FE12001200020003FCF20412041204120413FC120016001A0013FE0000 +8BB6:000023FC1010111001100110F21013FE10301050109015101A10141000500020 +8BB7:002020201020102003FE0222F22212221252124A128A130216021A02120A0204 +8BB8:00802080108011FC01200220F020102013FE1020102010201420182010200020 +8BB9:00A020A010A0112401240328F5301120116011A01120112215221922111E0100 +8BBA:0040204010A010A001100208F406111011201140118011001504190410FC0000 +8BBB:000020081108108802520252F222122212521292130A160A1A0213FE00020000 +8BBC:002021201120111001100248F248144418821080111015081A0817FC02040000 +8BBD:000043F822082208032802A8E2A82248224822A822A82B2A340A240A08061002 +8BBE:000021F0111011100110020EF40013F811081110109014A0184010A003180C06 +8BBF:00802040104017FE01000100F10011F811081108110815081A08120804500820 +8BC0:00402040104013FC00440044F044104417FE104010A014A01910120804040802 +8BC1:0000200013FE102000200020F1201120113C1120112015201920112007FE0000 +8BC2:002020201020102003FE0020F020102011FC1104110411041504190411FC0104 +8BC3:0000200017FE1008000803C8F24812481248124813C812481408180810280010 +8BC4:000023F81040104002480148F150104017FE1040104014401840104000400040 +8BC5:000021F811081108010801F8F1081108110811F8110815081908110807FE0000 +8BC6:0000200011FC110401040104F104110411FC1104100014901888110402020402 +8BC7:000023FC12041204020402F4F29412941294129412F416941A04120402140208 +8BC8:01002100110011FE02800280F48010F810801080108014FC1880108000800080 +8BC9:0008201C11E0110001000100F1FE111011101130111815141912121002100410 +8BCA:0040404020A0211002080426E040208023102020204028883310202000C00700 +8BCB:0008203C13E0122002200220F22013FE1220121012101212160A1A8A13260212 +8BCC:0080208010F8110802100420F3FC10041004100411FC10041404180413FC0004 +8BCD:000023FC1004100407F40004F00413E412241224122413E41404180410140008 +8BCE:002020201124112401240124F1FC102010201124112411241524192411FC0004 +8BCF:000023FC1084108400840104F1141208140011FC110411041504190411FC0104 +8BD0:00202020102013FE02220224F22013FC12841288124816501A20145004880906 +8BD1:000023FC1104108800500020F0D81326102011FC102014201BFE102000200020 +8BD2:0020202010401088010403FEF002100011FC1104110411041504190411FC0104 +8BD3:000023FE1200120003FC0220F22012F812201220122013FC16001A0013FE0000 +8BD4:0040404027FC2040004003F8E040204027FE20E0215029503248244408420040 +8BD5:002820241024102007FE0020F02017E0112011101110151019CA170A02060002 +8BD6:0020202011FC102000200020F3FE10001020102011FC10201420182013FE0000 +8BD7:00402040104013FC00400040F7FE1010101017FE101012101510191010500020 +8BD8:00202020102017FE00200020F3FE1000100011FC110411041504190411FC0104 +8BD9:00802080108017FE01000120F22012A414A415281A5010501488190812040402 +8BDA:00284024202027FE04200420E42427A424A424A824A82C903692292A08461082 +8BDB:00202120112011FC01200220F02013FE107010A810A815241924122200200020 +8BDC:00202120112011FC01200220F02013FE1090109010901090151219121212040E +8BDD:0008203C11E01020002003FEF0201020102011FC110411041504190411FC0104 +8BDE:0008401C2F70211002100450EF5C21502950295025502A7C33002480087E1000 +8BDF:0008403C23C02200020003FEE2002200220022FC22842A843484248408FC0084 +8BE0:0040204010A0111002080406F3F810401040104013F810401440184017FE0000 +8BE1:0100410023F8220804100BFEE20022F82288228822A822902A823482247E0800 +8BE2:0200420023FC240404040BE4E224222423E42224222423E42A24300420140008 +8BE3:01002104113811C001020102F0FE100011FC1104110415FC1904110401FC0104 +8BE4:0080208011F01210002003FCF044104417FE1044104413FC1444184011400080 +8BE5:008040402FFE208001100110E22427E42048208821102A203450208803040C04 +8BE6:020821081110100007FC0040F04013F81040104017FE10401440184010400040 +8BE7:00402020102013FE02020404F03813C010401040107E17C0144018421042003E +8BE8:000023FE12021444004003FCF08010A0112011FC102014201BFE102000200020 +8BE9:000047BC2084208404A40294E2942084218C229424A420842884308422940108 +8BEA:0040404027FC204003F80080E7FE2090211021FE22102A903450281000500020 +8BEB:0014401220102FFE00100290E29222922FD2229422942A88328A249A04260842 +8BEC:000047FC2040204002480248E248255424D2286220402840304020400FFE0000 +8BED:000047FC2040204003F80088E08827FE2000200023F822082A08320823F80208 +8BEE:0020212410A410A8002001FCF104110411FC1104110411FC1504190411140108 +8BEF:000043F82208220803F80000E7FC204020402FFE204020A028A0311022080406 +8BF0:00202120112011FE02200420F02013FE1000100011FC11041504190411FC0104 +8BF1:001C47E0204020400FFE0150E2482C4623F021102120217C2A04320424280810 +8BF2:0100210011FC120005F80108F148112817FE11081248122817FC180810500020 +8BF3:0000444022BE210802880488E08820BE218822882488208828883088253E0200 +8BF4:020821081110102003F80208F208120813F810A010A0152019221222041E0800 +8BF5:000047F8201021A0004007FCE444244427FC2444244427FC2C44344424540408 +8BF6:004040802110220807FC0104E10023F8244020402FFE204028A0311022080C06 +8BF7:0040404027FC204003F80040E7FE200023F8220823F822082BF8320822280210 +8BF8:0040404423F42048005007FEE040208021F82308250821F82908310821F80108 +8BF9:00004FC024BC24A404A407A4E4A424A827A824A8249025D02EA830A820C40082 +8BFA:0108410827FE210801480040E7FE2080210023FC250429042904310421FC0104 +8BFB:0020202011FC1020002003FEF002109410501110109013FE1428184410820302 +8BFC:00004FFE2080218402440468EAB0213022A8246828A421242A22342020A00040 +8BFD:009020901090179E00900090F090139C109010901090179E1890109000900090 +8BFE:000043F82248224803F80248E24823F8204027FC20E029503248244600400040 +8BFF:003843C02040204007FC0150E2482486208027FC21102A1031A0206000900308 +8C00:00404140265C24440444075CE444244427FC244420A020A02910320824040802 +8C01:01404120212023FE02200620EBFC2220222023FC222022202A2033FE22000200 +8C02:0040404020A0211002880446E80023F020102020204029243522250A090800F8 +8C03:000047FC2444244405F40444E44427FC240425F425142D1435F4240404140808 +8C04:0080408020F8210802100400E040239C22042204239C22042A04320423FC0204 +8C05:0040202013FE1000000001FCF1041104110411FC102014A81924122200A00040 +8C06:0080204017FC100003F80208F3F8100013F81010102017FC1840104001400080 +8C07:0080404027FC200001100110E2A824442000204027FE20402840304020400040 +8C08:004022441244144800A00110F6081044104012481248145018A0111002080C06 +8C09:0040202013FE1222002001FCF124112411FC1124112415FC1924102000200020 +8C0A:0040202013FE1202040401F8F108110811F81108110815F81908110807FE0000 +8C0B:020842082FFE2208020803F8E208220823F820402FFE20E0295032482C460040 +8C0C:0110411027FC211001F00110E1F02110211027FE220022902B08320023FC0000 +8C0D:00904290229027FE02900290E2F0220023FC204027FE20E0295032482C460040 +8C0E:0108410827FE2148002007FEE200220023FC2000224822482A48344A244A0846 +8C0F:004040402FFE204007FC0444E55424E4244427FC20E029503248244600400040 +8C10:0220222413A8123002A20322F25E108013FC1204120413FC16041A0413FC0204 +8C11:0040207C104013FE02420278F3C01244123C120012FC16801BFE1480048008FC +8C12:000043F8220823F8020803F8E10023FC2444224422A422042BF4300420280010 +8C13:000047FC244427FC044407FCE00023F8220823F8220823F82A08320822280210 +8C14:000047BC24A424A407BC0000E3F820002FFE2100220023F82808300820500020 +8C15:004020A01110120805F60000F3C41254125413D41254125417D41A44125402C8 +8C16:003C47C022442128000003FCE080208027FE210021F82A883250242008D80306 +8C17:010021F01210142003FC0244F24413FC10A01122161E10C01430198010600010 +8C18:00402240117C108401080620F22012501288110611F811081508190811F80108 +8C19:0080404027FC200002080110EFFE200023F82208220823F82A08320823F80208 +8C1A:0040202013FC100001080090F3FE1210122012C8121016241AC8141004600980 +8C1B:0040202011FC100000880050F3FE1222142411FC112411241534192810200020 +8C1C:0010409224522254021000FEE010263822542292231022102A10350028FE0000 +8C1D:0080404027FC2404040407FCE400240027FC26A42AA42BFC3AA42AA412A4020C +8C1E:000023FE10221120013C0120F2FE140011FC110411FC150419FC110401140108 +8C1F:0110411027FC2110000003F8E20823F8220823F8204027FC28A0311022080C06 +8C20:004042482150204007FE0402E80423F82208220823F820A0292031242224041C +8C21:000047FC244427FC044407FCE1102208248421F8220825083090206001980E06 +8C22:010842082788248807BE0488E78824C824A82FA821882A883488288802A80110 +8C23:0008203C13C0100402440128F1FC1220102013FE102011241524192411FC0004 +8C24:0040202013FC1108009003FEF2021444102013FC108010F81488190811280210 +8C25:020841082110200007FC0000E1102208240423F822A822A82AA832A82FFE0000 +8C26:02084110200027FE00A007FCE0A42FFE20A427FC20A029B032A82CA600A000A0 +8C27:00404028209022A402C2048AE1882678200023FC229422942A94329427FE0000 +8C28:011041102FFE211001F00040E7FC244427FC20402FFE20402FFC30402FFE0000 +8C29:03F8420823F8220803F80000E7FC24A424A427FC200023F8291030E023180C06 +8C2A:0080404027FC211000A007FCE44425F4244425F4251425142DF4340424140408 +8C2B:0108209017FE100003C40254F3D4125413D4124412CC14001BFC108401140608 +8C2C:000047BC208424A4029404A4E0502188262620C0231020642B88303020C00700 +8C2D:000023FE105013FE025203FEF00011FC110411FC110415FC182013FE00200020 +8C2E:000047BC2108252807BC0318E5AA2946200023F8220822082BF83208220803F8 +8C2F:0140412023FE222006200BFCE220222023FC222022202BFE3200252404920892 +8C30:0200417C2504244405F40444E5F42554257425D4255425F42CE435542444044C +8C31:0208411027FC20A004A402A8EFFE200023F82208220823F82A08320823F80208 +8C32:000047F82090206007FC00A4E12826A0204027FC24A425142EEC34A424E4040C +8C33:0108410827CC210A010807DEE44826C8254827C8255427D42D543554245404E2 +8C34:001044FE229222FE001001FEE0002EFE228222FE228022FE2A8232FE250008FE +8C35:020043F8241027FE0D481624E7FE240025FC240025FC2C0035FC290409FC1104 +8C36:0448444C2AAA20080FFE0288EEE8228A2EEA228C2EEC2A8832EA2F1A04260042 +8C37:08200810110821044280044008203018C0061FF010101010101010101FF01010 +8C38:08881C84F102122210201050FC881104120211FC110411042104210441FC8104 +8C39:004048404440944013FE2840448080907890492049204A484A447C8449FE0082 +8C3A:000024FC22084A4888481448228841FEBC1824282428244824883D0824280010 +8C3B:000025F822484A48884815F822484148BC4825F824482448248A3C8A250A0206 +8C3C:0048244822484A4889FE144822484148BC4825FE2400244824443C8424820102 +8C3D:002048204450948811442A2244F880087810482049FC49044904790449FC0104 +8C3E:0040482045FE95021204285044888104780049FC48204820482078204BFE0000 +8C3F:0E00F05022489284452420204450F888110624F8FE881088FE88288844F88288 +8C40:001E4BE0452294941040288845F0802078C449FE482248204BFE785048880306 +8C41:20001050FE48828411247C2010507C881104FEFA10887C88448844887CF84488 +8C42:000024EE22224AAA886614AA22104128BC442592242024C824323CC4241800E0 +8C43:000853884888891027DE32944AA487947A944B944A944AC84B887E9448A400C2 +8C44:00204BFE442095FC10002BFE465283FE790449FC490449FC490479FC48880104 +8C45:011050904BDE8810225E31824BDE84107BDE4A504BDE4A504BDE7A504A5202CE +8C46:00007FFC000000001FF010101010101010101FF00000101008200440FFFE0000 +8C47:0000FE0001FC00207C204420442044207C200020442028202E20F02043FE0000 +8C48:0100210821083FF800007FFC00001FF0101010101FF0000008200440FFFE0000 +8C49:0020FE20002001FE7C204420442045FC7C840088444828502E20F05041880606 +8C4A:04403FF824483FF824483FF800007FFC00001FF010101FF008200440FFFE0000 +8C4B:108010803EFC62449448483030102FE8C0061FF010101FF008200440FFFE0000 +8C4C:0040FC2003FE02027D04490049DE4A527A5203528C9A489451101912E212040E +8C4D:0020FE4000FE00927C9244FE449244A27CFE0048448829FE2E08F00840080008 +8C4E:7EFC48447E4442287E1048287E4400827FFC00001FF010101FF008200440FFFE +8C4F:0088FE50000001FE7C5045FC445447FE7C5401FC445028D82F54F25240500050 +8C50:08201D7049245D7449245D7449247FFC00007FFC00001FF010101FF004407FFC +8C51:2844FE28AA00FEFCAA14FE1400FCFE9000907CFE44327C32445A28541E90E110 +8C52:2A227F14AABEFF8AAA8AFFBEAAA8FFA8003EFF9A001A7F2A412E7F482208FF88 +8C53:2A107F10AA90FFBCAA90FFA8AAA8FFA40054FF82007C7F5441547F542254FFFE +8C54:2A087F08AA9CFF88AA88FFBEAA88FF900014FFBE00007F3E412A7F2A222AFFFE +8C55:00007FFC020006000908119062A004C008C011A06290048808863080C2800100 +8C56:00007FFC020006000908119062A014C008C015A06290048808863080C2800100 +8C57:0000FDFE2820284028A22B34285828942B34285228922B102850482247FE8000 +8C58:0020FC20102023FE6020952439245124992435FC5424902010221022501E2000 +8C59:020001003FF808200440FFFE02000D08719002A00CC071A006981886E2800100 +8C5A:00007BFE4840488049447A24486848B049307A28486848A449224A2048A09840 +8C5B:0000FCF810882088608895063A0051FC98843484544890501020105050882306 +8C5C:0000FDFE1048204860489448384853FE98483448544890481088108851082208 +8C5D:0000FDFC1124212461249524392451FC99043500550091001102110250FE2000 +8C5E:0040FE40088010FC31044A049CF428944C949A942AF448948804080428281010 +8C5F:0040FC2011FC2104610495FC39005100997C35085510912011421282527E2400 +8C60:0000FEF80888108830884AF89C8828884C889AF82A884888888808882BFE1000 +8C61:08001FE020207FF8A10822083FF80600191062A00CC071A006901888E2860100 +8C62:111009207FFC0400FFFE10102FC8C606191062A00CC071B006881884E2800100 +8C63:0000FDDC1088208860889488388853DE98883488548890881088110851082208 +8C64:0000FDF81108210861F89508390851F899443548553091201110114851862100 +8C65:0020FE10081011FE30204A249C4428F84C129A222A4449888810082828441182 +8C66:010001F801003FFE210221F02F0420FC20002FF823002C9023605CD843469CC0 +8C67:0028FC2413FE2020602095FC3924512499FC3524552491FC112411245124210C +8C68:00C2FC34101820646182942039FE5050989035FE56929092109A109450102010 +8C69:0000FDFE1020204060A295123834505898983514543490521090111050502020 +8C6A:01007FFC00001FF010101FF000007FFE40029FF40600192006C039B0068C3980 +8C6B:0080F8F8090853FE25121122FDFE244028A223542098233420542092A3504020 +8C6C:0020FE2008FA102430284BFE9C2028404CFC9B442A44487C88440844287C1044 +8C6D:0000FDDC11442144614495DC3900510099DC3514551491D41108110851142122 +8C6E:0020FDFC1020208863FE9488380051FC99043524552491241124105050882304 +8C6F:000EFEF00822109230444A209C4428F84C109A242AFE481088FE082828441082 +8C70:1000FE7810487C480048FE8682007CFC0044FE44202854282810DC282A44D982 +8C71:0000FCF81088208860F89488388850F8980035FC555491541154115453FE2000 +8C72:0000FDFE11102120617C9544397C5144997C3510551091541152129252502420 +8C73:010041047DF4492451446BAC4D3459646DB44B2C596469A4596441047FFC0004 +8C74:0020FE1008FE104430284AFE9C8228924CFE9A922ABA48AA88AA08BA28821086 +8C75:0124F924222444A4A154154A3B92550899083528512E912811281158514E2180 +8C76:0020FDFC1020208863FE948839FC510499FC350455FC910411FC108851042202 +8C77:0020FBFE202041FCA00017FE3A0251FC980035FC510491FC1104108853FE2000 +8C78:00E007007A0C113008C00780784000A003300C507090011006101810E0A00040 +8C79:0C403040C28014FC49043204C80415042484CC4414442404C404040428281010 +8C7A:0C103010C210141049FE3010C83014302450CC5014902510C410041028501020 +8C7B:0C0030FCC220142048203020C82015FE2420CC2014202420C420042028201020 +8C7C:0C103110C310151249123114C9D815102510CD1015102512C5520592290E1000 +8C7D:0C203020C22015FE49223122C92215222552CD4A158A2502C5020502290A1104 +8C7E:0C0031FEC210141048203020C86814A42522CE2214202420C42004002BFE1000 +8C7F:0C803080C28015FC49043204C9E415242524CD24152425E4C524040428281010 +8C80:0C203020C324152449243124C9FC14202420CD2415242524C524052429FC1004 +8C81:10402020D4200BFE52022404D00018902890C89018882908C908090452042402 +8C82:0C0031FCC244144448443044C89414882500CCFC14842484C484048428FC1084 +8C83:0C203020C24015FC49043104C904150425FCCD0415042504C504050429FC1104 +8C84:0C203020C3FC14244BFE3024C9FC14202420CDFC14202420C7FE042028201020 +8C85:10902090D490091051FE2310D51019382938C95419542992C910091051102110 +8C86:0C0031FEC200140048FC3084C88414FC2484CC8414FC2484C400040029FE1000 +8C87:0C0031F8C308150849F83108C90815F82544CD4815302520C510054829861100 +8C88:0C103020C2FC148448A43094C89415FE2484CCA414942494C484050429141208 +8C89:10802080D4F80908531024A0D04018A02918CA061DF82908C908090851F82108 +8C8A:0C0030FEC2201420484030FCC88414842484CCFC14842484C484048428FC1084 +8C8B:0C0031FCC30415FC490431FCC800140025FCCC20142027FEC420042028201020 +8C8C:0C203040C3FC1504490431FCC904150425FCCC5014502450C4920492290E1200 +8C8D:0C0031FCC324152449FC3124C92415FC2420CC2015FC2420C42004202BFE1000 +8C8E:10002040D79C0A045204239CD2041A042BFCC89018902890C89009125212240E +8C8F:10402080D5FC0924512421FCD124194429FCC89019102BFEC810081050102010 +8C90:104020A0D5100A0855F62000D3C41A542A54CBD41A542A54CBD40A44525422C8 +8C91:100023DED6420A42524223DED2001A3E2BD2CA121A142BD4CA080A1452242242 +8C92:0C203124C324152449FC3000CBFE14202440CDFC15542554C55405542954110C +8C93:0C883088C3FE148848883000C9FC15242524CD2415FC2524C524052429FC1104 +8C94:0C203040C3FC150449543124C954150425FCCC00151225D4C51805522992110E +8C95:101E23E0D522089450402088D1F0182028C4C9FE18222820CBFE085050882306 +8C96:11042084D488080053FE2000D08819042A02C9FC19542954C954095457FE2000 +8C97:102021FCD5240BFE512421FCD02019FC2924C9FC18402BFEC88809D05070238C +8C98:0C883088C3FE1488480031FCC90415FC2504CDFC142025FEC450048829041202 +8C99:100023FED6000A7C52442244D27C1A002AEECAAA1AAA2AAACAEE0A0053FE2000 +8C9A:100023DED6520A5253DE2000D1FC192429FCC92419FC2820CBFE082050202020 +8C9B:108823FED4880BDE525223DED0A0189029FEC9201BFC2D20C9FC092051FE2100 +8C9C:13DE2252D7DE0A5253DE20A0D1FE1B202DFCC92019FE2800C9FC08885070278E +8C9D:00003FF8200820083FF8200820083FF8200820083FF800000820101020084004 +8C9E:010001FC010001003FF8200820083FF820083FF8200820083FF8082010102008 +8C9F:0800101020087FFC200400003FF820083FF820083FF820083FF8082010102008 +8CA0:080008001FE020204040BFF820083FF820083FF820083FF80000046018186004 +8CA1:00107C10441044107DFE441044307C30445044507C9001102810241044508020 +8CA2:00003FF801000100FFFE00003FF820083FF820083FF820083FF8082010102008 +8CA3:04200210013EFFC00022001A3FF620103FF020103FF020103FF0084010202010 +8CA4:0020782048204920792C493449647BA449244934792801225122490288FE0000 +8CA5:00407C20440045FC7C00440044F07C90449044907C90009228922512450E8200 +8CA6:00007C0045FC44007C00440047FE7C90449044907C900090289225124512820E +8CA7:044008203018CFE6042018A060401FF010101FF010101FF010101FF008201010 +8CA8:0880109830E057849084107C00001FF010101FF010101FF010101FF008201010 +8CA9:0008781C49E04900790049FC49447944494449287928011051104A288A440482 +8CAA:010002800C603118CFE6004000801FF010101FF010101FF010101FF008201010 +8CAB:00001FF01110FFFE11101FF000001FF010101FF010101FF010101FF008201010 +8CAC:01003FF801001FF00100FFFE00001FF010101FF010101FF010101FF008201010 +8CAD:0008007C3F80208020803FFE208027F8240827F8240827F8240847F842108408 +8CAE:00203F2800240020FFFE00207FA040A07FA040907F9040907F8A120A21064082 +8CAF:00407C20442045FE7D02460444007C0045FE44207C2000202820242044A08040 +8CB0:12207FFC122013E010001FF800001FF010101FF010101FF010101FF008201010 +8CB1:00107810481049FE79124914491079FC494449447928012851104A288A440482 +8CB2:088028882EF028842E84F07C00001FF010101FF010101FF010101FF008201010 +8CB3:0024FFFE00203FA000207FA000203FA020A03F9020903F90208A3F8A11062082 +8CB4:01001FF011101FF00100FFFE00001FF010101FF010101FF010101FF008201010 +8CB5:040008201FF00210FFFE08203018DFF610101FF010101FF010101FF008201010 +8CB6:00047C1E45E044007C20441045FE7C04440844107C20004028802540463E8000 +8CB7:00007FFC444444447FFC00003FF820083FF820083FF820083FF8082010102008 +8CB8:08901088307ED7C01022101A00061FF010101FF010101FF010101FF008201010 +8CB9:00107C10449044907CFE449045107C10441044FE7C1000102810241045FE8000 +8CBA:00007DFC450445047D04450445FC7C50445044507C50005028922492450E8200 +8CBB:04407FF804483FF824403FFC08441FF4301C5FF010101FF010101FF008201010 +8CBC:00207C20442044207C3E442044207C2045FC45047D0401042904250445FC8104 +8CBD:00207C20442044407C48448445FE7C82440044FC7C8400842884248444FC8084 +8CBE:00047C1E45F045107D10451045107DFE451045107D100108290A254A45A68112 +8CBF:060078FC4044484444445A9461081FF010101FF010101FF010101FF008201010 +8CC0:100010007E7C124422442A7C44009FF010101FF010101FF010101FF008201010 +8CC1:01003FF801000820FFFE082000001FF010101FF010101FF010101FF008201010 +8CC2:0080788048F849087B104CA0484078A049184A067DF801085108490889F80108 +8CC3:081813E0304057FC904013F800001FF010101FF010101FF010101FF008201010 +8CC4:00207C2045FE44407C4044FC44847D8446FC44847C8400FC2884248444948088 +8CC5:00207C10441045FE7C20442444447CF8441244227C4401882810242844448182 +8CC6:00827C42444444007CFE444444447C44444445FE7C4400442884248445048204 +8CC7:410021FC0A441048E0A0211826061FF010101FF010101FF010101FF008201010 +8CC8:00007FFC04403FF824483FF800001FF010101FF010101FF010101FF008201010 +8CC9:00207C20444044807DFC455445547D54455445547D5401542954255447FE8000 +8CCA:00147C12441045FE7C10449044927C9247F244947C940088288A251A45268242 +8CCB:00407C20442045FE7C00448845047E02448844887C5000502820245044888306 +8CCC:0100FFFE08401F90062038D007087FF410101FF010101FF010101FF008201010 +8CCD:00207810481049FE7900491049107910497C49107910011051104A108AFE0400 +8CCE:00287C24443E45E07C20443C45E07C20443E45E07C2200242818246A45868002 +8CCF:00007CFC448444847CFC448444847CFC448444847CFC00002848244444828102 +8CD0:00407840488849047BFE4802488879444A4248F8798802505020485089880606 +8CD1:000079FE49004900797C4900490079FE495049527954014851484A448A520460 +8CD2:00207C20445044887D0446FA44007C0047FE44207D2801242A22242244A08040 +8CD3:01007FFE4002BFFC0910316003803FF8E0083FF820083FF820083FF808201010 +8CD4:01007FFE4002BFFC21083FF820002FF828082FF828082FF828084FF844108808 +8CD5:00287C24442444207DFE442045207CB244B444687CA801242A22242044A08040 +8CD6:00207C20445044887D0446FA44207C2047FE44207D2801242A22242244A08040 +8CD7:0020782049FC4924792449FC482078204BFE4A227A2203FE5222482088200020 +8CD8:00207810481049FE7900491049107910497C49107914011251124A108AFE0400 +8CD9:00007CFE449244927CBA449244FE7C8244BA44AA7CAA00BA28822502450A8204 +8CDA:01007FFC092015502388054009203FF8D0161FF010101FF010101FF008201010 +8CDB:082008207EFC0820FEFE145022885FF690101FF010101FF010101FF008201010 +8CDC:00007CFC448444847CFC448444847CFC444044FE7D2A024A28922522444A8084 +8CDD:00007BFE4A024A5278884904482078204BFE4820787000A851244E2288200020 +8CDE:111009207FFE40029FF410103FF820083FF820083FF820083FF8082010102008 +8CDF:00507C50445045FC7D54455445547DFC455445547D5403FE2800248845048202 +8CE0:00407C2045FC44007D08449044007DFE440044007DFC01042904250445FC8104 +8CE1:00803FFE20802FF820883FFE21082FF824102FF8341627F0441047F082200410 +8CE2:00007EFC48447E4442287E1048287FF610101FF010101FF010101FF008201010 +8CE3:0100FFFE01003FF800007FFC44447FFC10101FF010101FF010101FF008201010 +8CE4:00487C44445E45E07C284412446A7D964448445E7DE0002428282412446A8186 +8CE5:00407C2045FE44007C88448845547E22440044207DFE00202820242044208020 +8CE6:00087C0C44EA440A7C0845FE44487C48454845687D480148294A256A47868102 +8CE7:00207CA244A245247C50448847047C22442044A47CA401282850248845048202 +8CE8:01007FFC40041FF000007FFC1110250842041FF010101FF010101FF008201010 +8CE9:004078204BFE4A02780049FC480078004BFE48207928012452224C2288A00040 +8CEA:060C387020403F7E2448244844889FF010101FF010101FF010101FF008201010 +8CEB:01007FFC0920092015507FFE40029FF410101FF010101FF010101FF008201010 +8CEC:00007CFC448044F87C8044F844807FFE454045247D2801102908254445828100 +8CED:00207C2245FA44247C2847FE44207C4044FC45847E8400FC2884248444FC8084 +8CEE:01003FF80108FFFE01083FF801007FFC24885FF410101FF010101FF008201010 +8CEF:010079FE4A024DF2791249F2491279FA48044BF87810002057FE482088A00040 +8CF0:00207C2047FE44207DFC444047FE7C88450446FA7C88008828F82488448880F8 +8CF1:00007BFE4A2248207BFE482049FC792449FC492479FC002053FE482088200020 +8CF2:13F8120823F86040A7FC215022481FF010101FF010101FF010101FF008201010 +8CF3:012879244BA4492079204FFE482078244BA44AA87AA802905392482A88460082 +8CF4:10201020FE7810881110FEFC928492FCFE8410FC388454FC9200104810841102 +8CF5:00007DFE4502457A7D02457A45027C0044FC44847CFC008428FC248444FC8084 +8CF6:00207C20445044487CA445FE46847CFC448444FC7C8000FC29442544467C8044 +8CF7:01007FFC01003D7825483D7801007FFE50129FF410101FF010101FF008201010 +8CF8:00203D2424A825FC24403FFE248825FC268A3CF8248824F8248844F854508888 +8CF9:01047884488848007BFE4800488879044A0249FC79540154515449548FFE0000 +8CFA:011078A048004BFC78A04BF848A87BFE48A84BF878A001B052A84CA688A000A0 +8CFB:00287C2447FE44207DFC452445FC7D2445FC45247C0803FE2888244844488018 +8CFC:008878884BFE488879FC48884BFE782049FC492479FC012453FE490489140108 +8CFD:01007FFE44429FF404403FF80440FFFE08201FF02828CFE608200FE004400820 +8CFE:00207DFE482048FC48205DFE540054FC54845CFC488448FC48847EFC00480084 +8CFF:00007BDE48424A52794A4A52482878C44B1248607988003251C4481888600380 +8D00:7F7848485F4C64805F784A4851307F4C00001FF010101FF010101FF008201010 +8D01:7E2042207E20423E7E4442447E4424A442287E2842107E1042287E4824844302 +8D02:0040788849FC49087A524BFE485079884E2648C07B1000645388483088C00700 +8D03:0020782049FC492479FC48204BFE7A224BFE48207840002452A24A8A8C780000 +8D04:08207E2008F8FF2814287F6A082AFF5608821FF010101FF010101FF008201010 +8D05:08207F20087E7E4408A4FF2810101E2822445FF290101FF010101FF008201010 +8D06:002878244BFE4850788849044A027998495449107BBE011052A84AA88C440882 +8D07:41D42010FBFE109052C8228A57E680021FF010101FF010101FF010101FF00820 +8D08:0104788848004BFE7A224AAA4A727A224BFE480079FC010451FC490489FC0104 +8D09:00007BFE48504BFE7A524BFE480079FC490449FC790401FC50204BFE88200020 +8D0A:28503E7C4890FEFE1528264A44861FF010101FF010101FF010101FF008201010 +8D0B:3FFE225024882DFE369024FC249024FE200027FC240427FC440447FC82080404 +8D0C:00507A52495448507BFE488848507BFE482049FC782003FE5050488889040602 +8D0D:008078F849084BFE7944499249FE7900497C4900797C0100517C4A448A7C0444 +8D0E:008878884BFE488879FC492449FC792449FC48207BFE0222522A4AFA8A0A0206 +8D0F:0100FFFE20003FF800003FF820083FF8000077DC545477D4545C77D65296B462 +8D10:002079FC48244BFE782449FC48207BFE48004AA47C5201FC515449548FFE0000 +8D11:1000FEFC44202820FEFE00007CFC44847CFC44847CFC1084FEFC104810841102 +8D12:7E2051FC7D2445FC7C24514A7EF800003FF820083FF820083FF820083FF80820 +8D13:000C700A51FE550875E85548574A71EA512A5FEC754C054C55EA4A0A82160422 +8D14:3FF820083FF820083FF820083FF8082010107EFC42847EFC42847EFC24484284 +8D15:2010CEFE8A10AA7CAA00EEFEAAAAAAFEAA44AA7CEE44A87C2844487C48288844 +8D16:00207BFE482049FC78004BFE4A527BFE490449FC790401FC510449FC88880104 +8D17:3FFE224025F82D0835F8250825FE26AA240627F8240827F8440847F882100408 +8D18:012478A84BFE4A0278F8488849FC790449FC490479FC010451FC480088880104 +8D19:0E1C08107EFC4A945CB84A945CB8952A22461FF010101FF010101FF008201010 +8D1A:011078904BDE48107A5E49824BDE78104BDE4A507BDE025053DE4A508A5202CE +8D1B:1040FE7C44C82830FECE00787C2045FC7C8844F87C8810F8FE8810F810501088 +8D1C:0090709057FE5094700A51FE550877E8514A51EA7F2A05EA554C49EA82160462 +8D1D:00001FF010101010101011101110111011101110121002800440082010102008 +8D1E:0100010001FC010001003FF820082108210821082208220804C008303008C004 +8D1F:040004000FE0102020405FF010101110111011101110121002C0042018106008 +8D20:02000400082010103FF8000800001FF01010111011101110121004C018306008 +8D21:00003FF8010001007FFC000000001FF01010111011101110121004C018306008 +8D22:00107C104410541055FE54105430543054505450549011102810241044508020 +8D23:010001007FFC01003FF80100FFFE00001FF0101011101110111002600C187004 +8D24:040025F824882450242024D8270604001FF0101011101110111002600C187004 +8D25:00407C404440548054FE55085688548854885450545010202850248845048202 +8D26:00807C8444845488549054A0548055FE54A054A054901090288824A444C28080 +8D27:08800880109830E057849084107C00001FF0101011101110111002600C187004 +8D28:007C3FC0204020403FFE2040204027FC240424442444244424B4410846049802 +8D29:00047C0E44F04480548054FC54A454A454A454A854A810902910252842448082 +8D2A:01000280044009203098CFE6004000801FF0101011101110111002600C187004 +8D2B:044008203018DFE60420042008A010403FF0101011101110111002600C187004 +8D2C:00087C3C45C044005420541055FC5404540854105420104028802540423E8000 +8D2D:00807C80448054FC5504550456445444548454A4551411F42814240444288010 +8D2E:00407C204420540055FE5502560454005400540054001000280025FE44008000 +8D2F:1FF011101110FFFE111011101FF000001FF0101011101110111002600C187004 +8D30:00280024FFFE00203FA000207FA000203FA0209024902490248A0A0A11066082 +8D31:00507C484440445C55E05440545E57E054445448543010222852248A43068002 +8D32:01003FF801000820FFFE082000001FF01010111011101110121004C018306008 +8D33:12201220FFFE122013E010001FF800001FF0101011101110111002600C187004 +8D34:00207C2044205420543E54205420542055FC5504550411042904250445FC8104 +8D35:01001FF0111011101FF00100FFFE00001FF0101011101110111002600C187004 +8D36:00007DFC450445045504550455FC5450545054505450109228922512420E8400 +8D37:08901088307ED7C01022101A00061FF01010111011101110121004C018306008 +8D38:060078FC4044484444445A94610800001FF0101011101110111002600C187004 +8D39:04407FF804483FF824403FFC0844105420085FF010101110111002C00C303008 +8D3A:100010007E7C124422442A7C44009FF01010111011101110121004C018306008 +8D3B:00207C20442054405448548455FE5482540054FC548410842884248444FC8084 +8D3C:00147C12441045FE541054905492549257F2549454941088288A251A41268242 +8D3D:10801080FBF010901990F0941154520C24041FF010101110111002C00C303008 +8D3E:00007FFC04403FF8244824483FF800001FF0101011101110111002600C187004 +8D3F:00207C2045FE5440544054FC5484558456FC5484548410FC2884248444948088 +8D40:088008882E9028E028842E84F07C00001FF0101011101110111002600C187004 +8D41:083813C03040504097FC1040104013F800001FF010101110111002C00C303008 +8D42:00407C40447854885550542054505488550654F8548810882888248844F88088 +8D43:00207C10441045FE5500551055105510557C5510551011102910261042FE8400 +8D44:0100410021FC0A441448E0A02110260C1FF0101011101110111002600C187004 +8D45:00207C10441047FE54205442548455F85410542254C413082810242840C48302 +8D46:00007CFC4484548454FC54905490548854845532550812002860241844048000 +8D47:00287C244424542055FE5420552054B254B4546854A811242A22242044A08040 +8D48:00007DFE45004500557C5500550055FE55505552555411482948264442528460 +8D49:010001007FFC11100920FFFE054009203018DFF610101110111002C00C303008 +8D4A:00207C2044505488550456FA5400540057FE5420552811242A22242244A08040 +8D4B:00087C0C44EA440A540855FE544854485548556855481148294A256A43868102 +8D4C:004000407C4445FC4448545057FE544054F85588568854F82888248844F88088 +8D4D:01007FFC0920092015507FFE400280041FF0101011101110111002600C187004 +8D4E:00207C2045FC4420542057FE5402549454505510549013FE2828244440828302 +8D4F:111009203FFC20044FE808200FE000001FF0101011101110111002600C187004 +8D50:00007CFC4484548454FC5484548454FC544054FE552A124A28922522444A8084 +8D51:1FF010101110111002C00C30700800003EF822882AA82AA82AA8145022884104 +8D52:00007DFC452445245574552455FC550455745554555411742904260442148408 +8D53:00803FFE20802FF820883FFE21082FF824102FF8341624904490416082100C08 +8D54:00407C2045FC540055085490540057FE5400540055FC11042904250445FC8104 +8D55:00207CA244A245245450548857045422542054A454A411282850248841048202 +8D56:10801080FEF8110812107DFC5504552455247D24112439245450908811041202 +8D57:00007DFE4502457A5502557A5502540054FC548454FC108428FC248440FC8084 +8D58:08207F20087E7E4408A4FF2810101E28224446829FF01010111002C00C307008 +8D59:00287C2447FE542055FC552455FC552455FC5524540813FE2888244844488018 +8D5A:00887C50440055FE545055FC545457FE545455FC545010D82954265244508050 +8D5B:01007FFE44429FF404403FF80440FFFE08201FF02928C92609200AA004401820 +8D5C:00207DFE482048FC48205DFE540055FC55045D244924492449247E5000880304 +8D5D:3FFE225024FE2D9036FC249024FC249024FE200027FC2444444440B0830C1C02 +8D5E:081028503E7C48907EFE14282548468A81061FF010101110111002C00C303008 +8D5F:41D42010FBFE109052C8228A57E680021FF0101011101110111002600C187004 +8D60:00887C48445055FC552455AC5574552455FC540054F8108828F8248844F88088 +8D61:00807CF8450847FE5544559255FE5500557C5500557C1100297C2644427C8444 +8D62:0100FFFE20003FF800003FF820083FF8000077DC54547554555C75565296B462 +8D63:1040FE7844D02920FE5801867CF844207DFC44007CF81088FEA810A810501188 +8D64:0100010001003FF801000100FFFE044004402448244444428842084011402080 +8D65:0810081008107E10083E0822FF44149014105610551095282428242454448882 +8D66:0820082008207E40087E0884FF44144414445628552895102410242854448882 +8D67:080008FC08847E8408940888FF8014FC14A456A455A894A8249024A854C48882 +8D68:0810081008107EFE08920892FF92149214FE5692551095142412241E54F28800 +8D69:0820082008787E480890087CFF5414541454567C5540954024422442543E8800 +8D6A:08100810081E7E10081008FEFF82149214925692559294922428242454428882 +8D6B:0820082008207EF808200820FEFE1450145056D8555494522450249054908930 +8D6C:08200820083E7E20082008FCFF8414FC148456FC558494FC2400244854848902 +8D6D:0820082408F47E28082808FEFF101420147C56C45544957C24442444547C8844 +8D6E:100011DC11447D44114411DCFF00290029DC6D14AB1429D42908490849149922 +8D6F:1020101011FE7D10117C1114FDFE2914297C6D10AB7C294429444A444A7C9C44 +8D70:0100010001003FF801000100FFFE01000100110011F811001100290047FE8000 +8D71:010001003FF8010001000100FFFE00002010102000C003000C00130020FE4000 +8D72:0820082008207E2008FC0824FF240824282428442E442894290858004FFE8000 +8D73:0804080408447E4408440844FF44084C285428642E042804280458004FFE8000 +8D74:0420042004203F20043004287FA404240420242027A02420242054004FFE8000 +8D75:0800080408847E4408280828FE100810282828282E442884280058004FFE8000 +8D76:080008FC08207E2008200820FE2009FE282028202E202820282058204FFE8000 +8D77:0800080008F87E0808080808FEF80888288028802E842884287C58004FFE8000 +8D78:0810081008107E1008920892FE920892289228922E9228FE280258004FFE8000 +8D79:0820082008407EFE09020842FE220822280A28322EC22802281458084FFE8000 +8D7A:0820082008507E5008880944FE2208F8280828102E102820282058004FFE8000 +8D7B:0810081008107E5408520852FE900812280428082E102860298058004FFE8000 +8D7C:0420042004203F3E044204047F9004100410242827A42442248254004FFE8000 +8D7D:0820082008207EFC08240824FE2409FE282028502E482884290458004FFE8000 +8D7E:0800080C08707E400840087EFF480848284828482E882888290858004FFE8000 +8D7F:1004101E11F07D1011101110FDFE1110111051105D10514A5186710250008FFE +8D80:0810081008167EF808900890FEFE0812283228522E962910281058104FFE8000 +8D81:0820082008507E5008880924FE420890282028442E882810282058404FFE8000 +8D82:0840084008407EFE08820924FE2008A828A429222E2228A0284058004FFE8000 +8D83:082008A008A07EFC08A00920FE2009FE282028502E482884290458004FFE8000 +8D84:080008F808887E8808F80888FF8808F8288828882E8829FE280058004FFE8000 +8D85:080009FC08447E4408440894FF0808FC288428842E8428FC280058004FFE8000 +8D86:0800081C08F07E90089008FEFE900890289028AA2ECA28A6281258004FFE8000 +8D87:0820081008107EFE08040844FF440828282828282E1028FE280058004FFE8000 +8D88:0820082008207E3E08200820FF2008FC288428842E8428FC288458004FFE8000 +8D89:0810081008927E92089208FEFF100892289228922E9228FE280258004FFE8000 +8D8A:1028102410207DFC11201124FD241128112851105D94512C704450004FFE8000 +8D8B:0840084008787E88091008FCFE04080428FC28042E0429FC280058004FFE8000 +8D8C:0810081008107EFE0810087CFF00087C284428442E44287C284458004FFE8000 +8D8D:10201020107C7C8813501024FCC8131E102250E45C1850105060738050008FFE +8D8E:0810085008507EFC09100810FEFE0830283828542E942910281058004FFE8000 +8D8F:081C08E008207E2009FE0820FE2008FC288428842E8428FC288458004FFE8000 +8D90:080009DC08447E44095408CCFE4408CC295428442E44285428C858004FFE8000 +8D91:1020122011207D3E10421084FC901090131051105D2851245142708250008FFE +8D92:0810085008507E50095408D8FE5008D8295428522E922892290E5A004FFE8000 +8D93:100010F810887C8810881088FD26122011FE50205C7050A85124722250208FFE +8D94:100213F210827C8A108A11EAFD2A112A12AA504A5C4A5082510A720450008FFE +8D95:0800087C08447E7C0844087CFF00087C281028102EFE2810281058104FFE8000 +8D96:0810081008547E54085408BAFF100810287C28102E1028FE280058004FFE8000 +8D97:080008F808887E88088808F8FE2008A028BC28A02EA029602A3C58004FFE8000 +8D98:080008FE08827EFE0880088CFEF0089C28F0289E2EF02912290E5A004FFE8000 +8D99:0810089208547E1008FE0882FEFE088228FE28822E82288A288458004FFE8000 +8D9A:0820082009FE7E20082009FCFF24092429FC28702EA829242A2258204FFE8000 +8D9B:0820082008507E8809040AFAFE20082029FC28202EA828702BFE58004FFE8000 +8D9C:0880088009FE7E2208AA0872FE2209FE282228722EAA2922282A58044FFE8000 +8D9D:1020102010507C8811441222FDF81008105050205CA4528A528A747850008FFE +8D9E:0848084808FC7E48084809FEFE0008FC288428FC2E8428FC288458004FFE8000 +8D9F:1020112410A47CA811FC1104FD041174115451545D745104710C50004FFE8000 +8DA0:10201020103E7C2011FC1104FDFC110411FC51245C2053FE5020702050208FFE +8DA1:0850084808807EFE09900A90FEFC0890289028FC2E90289028FE58804FFE8000 +8DA2:11F8100810F87C0813FE1020FC24112410A850705CA85324502470A050408FFE +8DA3:100013E0115E7D4211D2114AFD4A11C4114451645DCA534A705250404FFE8000 +8DA4:0820081008FE7E82080008FEFF20084028FC29442E44287C284458004FFE8000 +8DA5:1088105013FE7C50105011FCFD54118C110451FC5D04510451FC710450008FFE +8DA6:1220113E10427C9413101128FC46100011FC51045D04510451FC710450008FFE +8DA7:080008FC08847EFC088408FCFE0009FE2810289C2E902890297E5A004FFE8000 +8DA8:108011FC12447D5411F41084FD18108011FC52445D5451F45084711850008FFE +8DA9:100011FC11247DFC112411FCFC88108811FC50885C8853FE5088710450008FFE +8DAA:1088108811FC7C88108813FEFC2011FC112451FC5D2451FC5000708851048FFE +8DAB:103C13C010407BFE10901108FAF4149213FC52045AF4529452F4720C50008FFE +8DAC:0810087C08107EFE084408EEFE4408EE280028FE2E28282A284658804FFE8000 +8DAD:10A0109011FE7D2013FC1120FDFC1120112051FE5C0052A45252745250008FFE +8DAE:0800087C08447E7C080008EEFEAA08EE281028FE2E382854289258104FFE8000 +8DAF:080009EE08AA7E6608AA0850FEFE099028FC28902EFC289028FE58804FFE8000 +8DB0:100013FE11247A2217FE1376FAAA1376122253765AAA53765222720650008FFE +8DB1:1108152817BE794817BE1318FDAA194613F852085A48524850A0711052088FFE +8DB2:152817BE19487FBE131815AAF94613FC120453FC5A0453FC520473FC51088FFE +8DB3:00001FF010101010101010101FF001000100110011F811002900250043FE8000 +8DB4:00007C204520452045207D20112011205D205110511052105E08E40808041002 +8DB5:00407C40444044FC44847D04100411045C845044504450045C04E00400280010 +8DB6:00007DFC4420442044207C20102013FE5C205020502050205C20E02000A00040 +8DB7:00407C40448044FE45007E0010FC10085C105020504050805D02E10200FE0000 +8DB8:0000FFFE040007F0081010A0604000001FF010101FF0010011F81100290047FE +8DB9:00207C20442045FC44247C24102410245DFE5020505050505C88E08801040202 +8DBA:00207C204420442045FC7C20102010205DFE5020505050505C88E08801040202 +8DBB:00207C204450445044887D44122210205C0051FC500450085C08E01000100020 +8DBC:00007DFE4448444844487C48104813FE5C485048504850485C88E08801080208 +8DBD:00407C20442047FE44807C80108010FC5C845084508450845D04E10402280410 +8DBE:00207C204420452045207D20113C11205D205120512051205D20E12007FE0000 +8DBF:00007BFC4884488848887890109C108451445D44512851285A10E22804440182 +8DC0:00007CFC4484448444847CFC108410845C8450FC508450845D04E10402140408 +8DC1:00007DFC4524452445247D24112411FC11045D005100510051025D02E0FE0000 +8DC2:00207C20442045FE44207C20102011FC5C845088504850505C20E05001880606 +8DC3:00087C3C45E0442044207C2013FE10205C205050505050505C88E08801040202 +8DC4:00207C204450445044887D04120210F85C88508850A850905C82E082007E0000 +8DC5:00087C1C45E0450045007D0011FE11105D105130511851145D12E21002100410 +8DC6:00207C204440444044887D0413FE100210005DFC5104510451045D04E1FC0104 +8DC7:00487D484548454845487FFE114811485D485148517851005D00E10001FE0000 +8DC8:00207C204450448845047E121020104011885C105020504451885C10E0600380 +8DC9:00207C204450445044887D24121210105DFC5004500850885C50E02000100010 +8DCA:00207C20442045FC44207C20102013FE5C7050A850A851245D24E22200200020 +8DCB:00507C484448444047FE7C80108010FC5D445144512851285E10E22804440182 +8DCC:00207C204520452045FC7D201220102011FE5C205050505050885C88E1040202 +8DCD:00207C204420442047FE7C201020102011FC5D045104510451045D04E1FC0104 +8DCE:00207C10441045FE45027E04108010885C9050A050C050825C82E082007E0000 +8DCF:010079004900491C4BD479541154115451545D54515451545954E25C03540480 +8DD0:00487C4844484548454A7D6C114811485D4851485148514A5D6AE38A01060000 +8DD1:00807C8045FC450446047DF4111411145D1451F4510451285D12E10200FE0000 +8DD2:00007C0045FE440844087DE81128112811285D2851E8512850085C08E0280010 +8DD3:00407C20440047FE44207C20102010205DFC5020502050205C20E02003FE0000 +8DD4:00807C80450045FC46047C0411E411245D24512451E451245C04E00400280010 +8DD5:00207C2044204420443E7C201020102011FC5D045104510451045D04E1FC0104 +8DD6:00007C0045FE442044207C40104010FC10845D845284508450845C84E0FC0084 +8DD7:0088788848884908497E7B081508114851285D28510851085908E10801280110 +8DD8:00207C20452444A444A87C2011FC10205C20502053FE50205C20E02000200020 +8DD9:00007DF84508450845087DF8110811085D0851F8510851085D08E10807FE0000 +8DDA:00007DDC4554455445547D54115413FE5D545154515451545D54E2D40224044C +8DDB:00107C10441045FE45127D14111011FC5D445144512851285D10E22802440482 +8DDC:00007DFC4504450445047DFC110011405D445148517051405D42E242023E0400 +8DDD:00007DFE4500450045007DFC110411045D04510451FC51005D00E10001FE0000 +8DDE:00087C1C45E0450045207D20112011FE5C20502050A850A45D22E22200A00040 +8DDF:00007DF84508450845F87D08110811F85D445148513051205D10E14801860100 +8DE0:00207C2047FE442045FC7C2411FC112011FE5C22502A505450505C88E1040202 +8DE1:00407C20442047FE44907C90109012945E925292549250905D10E11002500420 +8DE2:00207C20447C448445487C30102010485D90503E504251A45C18E01000600180 +8DE3:00207920492049FC49207A20102013FE50905C90509050905912E1120212040E +8DE4:00407C20442045FE44007C881104120210885C885050505050205C50E0880306 +8DE5:00007DFC44444448445E7C82108A11245C2053FE502050705CA8E12402220020 +8DE6:00207D20452045FC45207E20102013FE5C7050A850A851245D24E22200200020 +8DE7:00207C204450448845047E0211FC10205C20502051FC50205C20E02003FE0000 +8DE8:002078204BFE48504888790416FA100053FE5C40508051FC5804E00400280010 +8DE9:00207C2045FC452445247DFC112411245DFC5020502450185C32E0CA03060002 +8DEA:00407C4044FC450446087DFE1100117C5D445144515451485D42E242023E0400 +8DEB:00007DF01110119011521D12E20E44001FF010101FF0010011F81100290047FE +8DEC:00207C2045FC442044207C2013FE10005C20502051FC50205C20E02003FE0000 +8DED:0080788048FC49084A9078601198162610205DFC5020522053FE5C20E0200020 +8DEE:00007DFE4420444044887D0411FE10225C20502051FE50205C20E02003FE0000 +8DEF:00407C404478448845507C201050108811065CF85088508850885C88E0F80088 +8DF0:01047C844488440045FE7C88108810885C8853FE508850885D08E10802080408 +8DF1:00207C20442045FC44207C2013FE100810085DFE5008508850485C08E0280010 +8DF2:00207C204450448845047E0211FC100010005DFC5104510451045D04E1FC0104 +8DF3:00507C504450455244D47C581050105810D45D525050505050925C92E112020E +8DF4:00007BFE48504850485079FC115411541D545154515C518451045D04E1FC0104 +8DF5:00507C484440445C45E07C40105E11E05C445048503050225C52E08A03060002 +8DF6:00107A104910491048FE78101310112851245D44514251825900E280047E0000 +8DF7:00807C8044BC47C044507C2410D4130C5C0053FE509050905D12E112020E0400 +8DF8:01107D12451445D845107D121152118E11205C2053FE502050205C20E0200020 +8DF9:00007A0C497049104810781010FE171051105D10511051105910E280047E0000 +8DFA:00007CF84488448844887C88112612205DFE5020507050A85D24E22200200020 +8DFB:00407C2045FE448844507C201050108811065C885088508850885D08E1080208 +8DFC:00007DFC4504450445FC7D00110011FE5D02517A514A514A5E7AE20204140008 +8DFD:00007DF84408440845F87D00110411045CFC5040502050A45E8AE28A04780000 +8DFE:1040104024FE6488A5502420245020881FF410101FF0010011F81100290047FE +8DFF:00207C2045FC442044207C2013FE10205C205120513C51205EA0E260043E0800 +8E00:00007DFC4504450445047DFC102010205D20513C512051205EA0E260043E0800 +8E01:00007DFE4400449245247E481124109210005DFE5020502050205C20E3FE0000 +8E02:00007BFE49204928492879E81128112851285DE85128512A593AE3EA00260020 +8E03:00207D2444A444A844207DFC110411045DFC5104510451FC5D04E10401140108 +8E04:00107C104490449E44907C9013FE10005C105092509251145E08E01000600380 +8E05:080C08F07E8008800EFE78880888290812081FF010101FF0010011F83100CFFE +8E06:00407C404488450447FE7C021088114412425CF85188525050205C50E1880606 +8E07:00807C8044FE450046FC7C8410A410945DFE5084512451145DFEE00400280010 +8E08:00207C2047FE442044207DFC112411245DFC5020507050A85D24E22200200020 +8E09:00407C2045FC450445047DFC1104110411FC5D205122511451085D44E1820100 +8E0A:00007DF8440844D044207DFC112411245DFC5124512451FC5D24E1240124010C +8E0B:0100F100911E93929112F112211227D2A112B912A21AA294A7D0B250C0100010 +8E0C:00207C2047FE442045FC7C4013FE10485C8850FE510851485E28E40800280010 +8E0D:00207C2245FA442444247DFE1010102011FC5C88511052FE54105C10E0500020 +8E0E:00007DFE4410442044687CA41122102010005CFC5084508450845C84E0FC0084 +8E0F:002078224BB448A848A8792412A2104051FC5D04510451FC5904E10401FC0104 +8E10:00487C44445E45E044287C12106A119610485C5E51E0502450285C12E06A0186 +8E11:00887C8847FE448844887CF8108810885CF85088508853FE5C00E08801040202 +8E12:001C7DE04420442047FE7CA8112412425C4053FE508851085CD0E03000480184 +8E13:00A07C90449045FE45207D2013FC112011205DFC5120512051205DFEE1000100 +8E14:00207C20443E442045FC7D0411FC11045DFC5124502053FE5C20E02000200020 +8E15:00207C2047FE442045FC7C2413FE10245DFC50205120513E5D20E2A0027E0400 +8E16:00487C48444845FE44487C4811FE100010FC5C84508450FC50845C84E0FC0084 +8E17:00207C204450448845447E2211F810085C50502050A452825E8AE28A04780000 +8E18:01007D0045FC460444447D5410E4104413FC5C4450E4515452445C44E0140008 +8E19:00007BE0495C495449D47954115411D451545D54516853C85848E05400540062 +8E1A:00207C204450448845047EFA100011FC11545D5451FC515451545D54E104010C +8E1B:00207C2045FC442044207DFE108811045E22502051FC50205C20E02003FE0000 +8E1C:0020782049FC482048207BFE1088114412425CF85188525050205C50E1880606 +8E1D:00007DFC4524452445FC7D24112411FC10205DFE507050A851245E22E0200020 +8E1E:00007DFE4502450245FE7D10111011FE5D105110517E51425D42E242027E0442 +8E1F:0100790049004BDE4A927C921092109253F25C9250925152595EE22004200800 +8E20:004078204BFE4A024D04790011DE12521E525352549A509451105D12E212040E +8E21:00207D2444A8442045FC7C4013FE10885D0452FA548850885CA8E0920082007E +8E22:00007CFC4484448444FC7C84108410FC5C4050FE512A524A5C92E122004A0084 +8E23:00407C2045FC440045087C90100013FE10005C0051FC510451045D04E1FC0104 +8E24:00407C2045FE440044887C881154122210005C2053FE502050205C20E0200020 +8E25:00407C2045FC440044887C5013FE10405C4053FE508851885C50E03000C80304 +8E26:00207C2045FC445044887D0413FE10085DE85128512851E85D28E00800280010 +8E27:00807C80449C44F444947C9413F4101410945C9451C852A850885C94E09401A2 +8E28:008878884888488849547A221442102050205D20513C51205AA0E260043E0800 +8E29:00087C3C45C0444445247CA8108010205DFE507050A850A85D24E22204200020 +8E2A:004078204BFE4A024C0479F81000100053FE5C20512851245A22E42200A00040 +8E2B:01087C90440045FC44907C901092129211945D985090509050905C90E3FE0000 +8E2C:001C7DE04510451045FE7D101110117C5D445154515451545D54E22802440482 +8E2D:00807C8044F8450846107DFC102410245DFE5024502451FC5C24E02000A00040 +8E2E:00207C1045FE450045207D20113C11205D20517C514451445D44E244027C0444 +8E2F:0440F25E9292901297D4F11421182114A7F2B912A112A11ABA94E25004500810 +8E30:00207C504488450446FA7C0011E2112A5D2A51EA512A512A5DEAE122012A0164 +8E31:00407C2045FE454845487DFE114811785D0051FC514451485D28E210022804C6 +8E32:00087C1C45F0451045107DFE1110117C5D44517C5144517C5D44E244027C0444 +8E33:00207C2047FE442045FC7C4013FE10885D0452FA508850885CF8E088008800F8 +8E34:00007DFC4448443045FC7D2411FC11245DFC5124504051FC5C44E08401140208 +8E35:00087C3C45E0442047FE7C2011FC11245DFC512451FC50205DFCE02003FE0000 +8E36:00007DFC4504450445FC7D04110411FC5C0053FE502051205D3CE12002A0047E +8E37:00207C2245FA442444287FFE1020104010FC5D84528450FC50845C84E0FC0084 +8E38:00887C8847FE448844F87C8810F810885C8853FE510051485D84E10001FE0000 +8E39:00207D244524452445FC7C0013FE10205C4051FC515451545D54E1540154010C +8E3A:001078104F7C491449FE7A14127C1710517C5D1055FE52105A10E50008FE0000 +8E3B:00007CFC4484448444F47C94109411FE5D02517A514A514A5D7AE102010A0104 +8E3C:00007CFC448444FC44847CFC100011FE5C8050FE512A524A5C92E12200540088 +8E3D:00047C1E47E0442045FC7D24112411FC5C2053FE5222522A5EFAE202020A0204 +8E3E:00007DFE440044FC44847C8410FC100011FE5D22512251FE51225D22E1FE0102 +8E3F:000878C84B084908492A792A13AC11481D0853885554511451145D24E1240142 +8E40:00487D48454847FE45487D48117811005DFE502053FE50705CA8E12406220020 +8E41:00407C2045FE450245027DFE110011005DFE51AA51AA52FE5EAAE2AA04A20086 +8E42:00007DFC4448443047FE7C52109411105E30502053FE50705CA8E12406220020 +8E43:00887C8847FE448844A87C2013FE104010805CFC5184528450845C84E0FC0084 +8E44:00407C2045FC440044887C5013FE12225C2451FC512451245D34E12800200020 +8E45:00207C2047FE447044A87D24122211FC5D0451FC510451FC5D04E00003FE0000 +8E46:00007A7C49444944487C78441744117C11505D4A5144515451625D42E280047E +8E47:01007FFE44429FF404403FF80440FFFE08201FF02828CFE6010009F0150023FC +8E48:001E7DE04422451244947C80102011CE11025D0251CE510251025D02E1FE0102 +8E49:00847C44444845FE44207CFC102011FE5C40508050FE51105E10E41001FE0000 +8E4A:001E7BE0492248944840788811F0102050C45DFE502250205BFEE05000880306 +8E4B:00007DFC450445FC45047DFC1000100013DE5C425252514A52525C42E14A0084 +8E4C:00207C204450444844A47DFE128410FC5C8450FC508050FC5D44E144027C0044 +8E4D:00007BFC4A044A044BFC7A48124812FC12485E4853FE52A452A85C90E4C80886 +8E4E:00207C2047FE442045FC7D0411FC110411FC5D0451FC510453FE5C88E1040202 +8E4F:0004781E4BF04A1E4A107AFE1292129852F25E8E528052B85AA8E4AA054A0A86 +8E50:00207D2444A8455444887D0412FA148810885CF85088508850F85C88E0880098 +8E51:00007DFE448444FC44847CFC108613FC5C0453DE505251525C94E14802540422 +8E52:00487C4845FE444844007DFE104810485DFE514A514A51B65D22E102010A0104 +8E53:00407DBC4514459445547DA4114C100011FC5D24512451FC51245D24E1FC0104 +8E54:08047F7808403E402A7E3E482A48FF4808881FF010101FF0010011F83100CFFE +8E55:00007DFC452445FC45247DFC10A810A85DFE50A850A851FC5C20E3FE00200020 +8E56:00207C2047FE442045FC7C4013FE10885D045242559C51045DDCE10401FC0104 +8E57:004078204BFE4A504A507BFE1252125253FE5E00529252D45A98E49204D2088E +8E58:00007BDE48424A52494A7A52102810C453125C605188503259C4E01800600380 +8E59:00243FFE222023A422243FA82B10529A46269FF210101FF0010011F83100CFFE +8E5A:0020792448A84BFE4A0278F8108810881CF85020502051FC50205C20E3FE0000 +8E5B:02A8F2A897FC92A892AAF4E6280027FCA444B840A3F8A248A248B248C2580040 +8E5C:002078104BFE4A02488078FE111013201D7C51445144517C51445D44E17C0144 +8E5D:010879084A284CAE48A87928137E15001D085128512E512851585D48E1860100 +8E5E:000078FE48104A204A7C7A4413C4127C52445E7C52C453445A7CE02800440082 +8E5F:00207BFE482049FC48207BFE100011FC1D0451FC510451FC51045DFCE0880104 +8E60:004078204BFE4A004A487A4813FE124852485E48527852005D54E52A0A2A1000 +8E61:00487D48455E456A45547DC81050106413C45D7E5144516451545D44E2540448 +8E62:004078204BFE488848507BFE122212FA52225EFA528A528A5AFAE202020A0204 +8E63:00887C8847FE448844887CF8102013FE5E22533252AA53765E22E222022A0224 +8E64:012479244A244CA44954794A1392150811085D28512E512851285D58E14E0180 +8E65:00107C1046FE4510457C7C54107C13545D7C511051FE51105D10E290047E0000 +8E66:00207A224A224BFE48007BDE1252125253DE5E52525253DE5A52E252055A08A4 +8E67:009078904FFE48904BFC7A9413FC129453FC5C0051F8510859F8E10801F80108 +8E68:0110791449D24A504A7E7D50109012A851285D44524454825808E2A402520452 +8E69:49202A3E7F4849485DA86B10492841461FF010101FF0010011F81100290047FE +8E6A:002079FC492449FC48207BFE100011FC11045DFC510451FC51045DFCE0880104 +8E6B:000079FC484848304BFE7852109413501C2053FE5252528A53765E52E2720206 +8E6C:00107BD248544948488A790412FA140051FC5D04510451FC5904E08807FE0000 +8E6D:0104788848004BFE4A227AAA1272122253FE5C0051FC510459FCE10401FC0104 +8E6E:00007DFC445045FC45547DFC102013FE5C48508451FA52885CF8E0840084007C +8E6F:003C7DE0452444A845FE7CA8112412025DFC5124512451FC5D24E12401FC0104 +8E70:00007BFE4A004A044BF47A0412EE12A452A45EEC520452A45A44E27405940008 +8E71:00207DFC4488445047FE7C0011FC11245DFC512451FC50205DFCE02003FE0000 +8E72:008878504BFE485049FC7954118C117451045DFC500853FE5908E08800A80010 +8E73:00247BA848924D144A087C0413BA10A81CC65380523C538450A85C90E2A80144 +8E74:0214F1129FD29010907EF79024902490A790B928A5A8A568A928B14AC54A0286 +8E75:08287F2400FE3E2022503E504952988E00001FF010101FF0010011F83100CFFE +8E76:0000F7FE940096289548F7EE24922484A6A0BEA8A7E8A488BC94E51409241242 +8E77:3FFE289025103FDE22222A882F88229424222BF8220823F82040427C454088FE +8E78:0020792448A84BFE48A879241222110411045DDE52445554509E5D04E2040404 +8E79:00207C504488457446027CF8108810F810005DDC5044515450CC5D54E04400CC +8E7A:0020782049FC48204BFE7908139C11081D88563E500053FE50905C90E112020E +8E7B:00187DE0444047FE44887D741252107010005DFC5104517451545D74E104010C +8E7C:00507A52495448504BFE7888105013FE50205DFC502053FE5850E08801040602 +8E7D:00207C2045FC442045547C88110412FA10885CF8508850F850205CA8E1240060 +8E7E:010878884BC848104BDE7A6413D4101413D45C54509450E853885C94E2940122 +8E7F:004078204BFE4A8A49247A2211FC112451FC5C2053FE52225BFEE22200200020 +8E80:00007DFC452447FE45247DFC100011FC5D0451FC510451FC5D04E1FC00880104 +8E81:00F87C88448844F844007DDC115411545DDC502053FE50705CA8E12402220020 +8E82:00107A10497C481048FE7844132811FE11105D7C511051FE51105D10E2FE0400 +8E83:001078084BC84A7E4A407A5413C8127E52085FC8537E55485D48E5C809480008 +8E84:3E1022FE3E4420287EFEA2103EFC221000001FF010101FF0010011F83100CFFE +8E85:00007DFC4554455445FC7C8011FC124411F45D54515451F450445DF4E0140008 +8E86:0040787C48404BFE4A427A7813C4123C1E0053FE524053A452585DB4E45209B0 +8E87:008878884BFE48A8482279FA1024102853FE5C4050FC51845AFCE48400FC0084 +8E88:008879084BC84A504BDE7A6413D4111450945FF4511451C85948E254035404A2 +8E89:0820FFFE08201FF011101FF011107FFC41245FFC10101FF0010011F83100CFFE +8E8A:00207BFE482049FC48007BFE100211FC1C2053FE500053FE50045FBEE2A4038C +8E8B:0080F04097FC911090A4FF5825542552AB58B800A208A3F8BA08E3F802080408 +8E8C:008079004BFE4D5449547BFE1154115413FE5D0451DE524451545C9EE1040204 +8E8D:00007BDE48424A52494A7A521090110813FE5D1051FE511051FE5D10E1FE0100 +8E8E:0000F7FC924894449FFEF44426EC2554A6ECBC44A6ECA554A6ECB444C4540408 +8E8F:00487DFE4448450044BE7C821152117E11D25D7E5152517E51525D7EE1420106 +8E90:01247A48492448004BFC7A941264129413FC5E4853685248536A5E4AE2460362 +8E91:0440F28E9FEA928A9FEAFAAA2C6C2BAAA82ABFEAA10AAFEAA28CB448C8280008 +8E92:012479744A584ADA4BFE795412DA13FE10A25C2053FE507050A85D24E2220020 +8E93:00427B9C4A104BDE4A947A94142013FC52045FFC520453FC5A04E3FC01080204 +8E94:0020F7FE940095FC9524F5FC252425FCA420BDFCA420A7FEBD24EAFA082013FE +8E95:004078204BFE4A444BF47A4412EE120452F45EAC52E452145AA4E47405940808 +8E96:01107A124BAA493A4A927BBA108A13FE1D12521253AA513A52925FBAE08A03FE +8E97:22004F9C94802FDE6108AFC8250827D801001FF010101FF0010011F83100CFFE +8E98:011078904BDE48104A5E798213DE101013DE5E5053DE525053DE5E50E25202CE +8E99:03DE7A524BDE4A524BDE7A22129212FA1FA252FA52A252FA52A25EFAE2820206 +8E9A:0000F0FE942892FE92AAF0FE201021FEA644BAFEA344A27CBA42E23E050008FE +8E9B:22004F9C94802FDE6208AFC82A482AD800001FF010101FF0010011F83100CFFE +8E9C:0108F52897BE994897BEF31825AA2946A000BBF8A208A248BA48E0B001080604 +8E9D:03DE7A524BDE4A524BDE7A2212FA122252FA5EAA52FA52AA5AFAE27202AA0226 +8E9E:0248F2E8930896EA9A1CF2E8220822E8A5B4B8E2A000A3F8B910E0E003180C06 +8E9F:00207BFE480049DC495479DC108813FE1C8853FE508853FE50945D88E2A400C2 +8EA0:0820FFFE28207DFC44887DFE40207DFC44207FF010101FF0010011F83100CFFE +8EA1:03FCF10891F8910891F8F10E27F82008A7FEBA94A39CA294A39CB2D6C7BC0084 +8EA2:079EF492979E949297FEF51225F22512A5F2BC02A7BAA6AAA59AB6AAC59A0406 +8EA3:03DE7A524BDE4A524BDE7A5213DE109011FE5D1053FE551051FE5D10E1FE0100 +8EA4:0108F7FE910890009114F7BE21142794B17EAF80A13EA3A2B57EC922013E0122 +8EA5:0040F7FE949291089080F31C2204239CA204BBFCA248A368A248B36AC2460362 +8EA6:0528F7BE994897BE9318F5AA294623FCA204BBFCA204A3FCBA04E3FC01080204 +8EA7:03DE78004BDE4A524B5A7A52102013FE1E5053FE525253FE52925EDCE29204CE +8EA8:0110F7FE904092EE92AAFBEA2AAE2AE8ABAABCE6A288A5F4A290B060C1980606 +8EA9:03DE7A524BDE4A524BDE78A011FE132015FC5D2051FE500051FC5C88E070078E +8EAA:00887BFE48884BDE4A527BDE125213DE124A5EFE539252FE52925EFEE2820206 +8EAB:020004001FF010101FF010101FF2101410187FF00050009003101C10E0500020 +8EAC:080010FC3E0422043E04227C3E4022402280FEFC06040A04120422044A280410 +8EAD:102020207C2045FE7D2246247C2044204450FC500C5014502490449295120A0E +8EAE:101020507C5044507C8844887D0446FA4448FC480C4814482488448895280A10 +8EAF:100021FE7D0045047D4445287D2845104510FD280D2815442584450095FE0800 +8EB0:102020207C2044207DFE44707CA844A84524FD240E2214F82420442094200820 +8EB1:100021FC7C4444487C5E44827C8A45244420FDFE0C20147024A8452496220820 +8EB2:100020F87C8844887C8844887D26462045FEFC200C7014A82524462294200820 +8EB3:0800107C3E4422443E4422443E7C22002200FEFE06820A82128222824AFE0482 +8EB4:082010103EFC22843E8422FC3E84228422FCFEA206A40A98129022884AC40482 +8EB5:100021FC7C2444A47CA445247C54444844A0FC100C5415422542454A96380800 +8EB6:100021FC7D2445247DFC45247D2445FC4420FDFE0C7014A82524462294200820 +8EB7:101C21E07C2044207FFE44A87D2446424440FFFE0C88150824D0443094480984 +8EB8:102020207DFC44507C8845047FFE440845E8FD280D2815E82528440894280810 +8EB9:108020807CFE45027E2244AA7C72442245FEFC220C7214AA25224422940A0804 +8EBA:102021247CA444A87C2045FC7D0445044574FD540D5415542574450495140908 +8EBB:104020207DFE45027E0444507C8845044400FDFC0C2014202420442097FE0800 +8EBC:100020FC7C8044F87C8044F87C8047FE4540FD240D2815102508454495820900 +8EBD:100023FE7A004AFC7A844AFC7A844AFC4A20FBFE1A482AC84A308A482A8413FE +8EBE:108420487DFE44207C2044FC7C20442045FEFC000C2015FE2420445094880B06 +8EBF:1020201079FE4910797C491479FE4914497CF9101992295449388A542A921430 +8EC0:100023FE7A004A7C7A444A447A7C4A004AEEFAAA1AAA2AAA4AEE8A002BFE1000 +8EC1:102021FC7D2447FE7D2445FC7C2045FC4524FDFC0C4017FE248845D094700B8C +8EC2:1048216A7CDC44487CB445227DFE45024420FC200CFC14242444444494940908 +8EC3:100021DC7D5445547DDC44007DFC452445FCFD240DFC142027FE442094200820 +8EC4:111020947BD248127A5049907FFE48104BD2FA521A542BD44A4A8A4A2BD61022 +8EC5:100023FE7A004A587A544ABE7BA84AE84ABEFAA81AA82ABE4AA88AA82ABE14A0 +8EC6:105021FC7D5445FC7D5445FC7C0045FC4400FDFC0D0415FC2488445097FE0800 +8EC7:102023FE782049FC78004BFE780249FC4820FBFE18002BFE48048BBE2AA4138C +8EC8:104020207BFE4A547A7E4AA87BBC4AA84ABCFAA81ABE2AA04A548B422D4A1238 +8EC9:102023FE7A1249DC78A849DC78AA4BFE4800F9FC190429FC490489FC28881104 +8ECA:010001007FFC01003FF8210821083FF8210821083FF80100FFFE010001000100 +8ECB:08200820FFA008207F20492049207F20492049207F200822FFA20822081E0800 +8ECC:108010801080FC8013F07C9054907C9054907C901090FE9211121112120E1400 +8ECD:00007FFE410281043FF801001FF011101FF011101FF00100FFFE010001000100 +8ECE:01007FFC01003FF821083FF821083FF80100FFFE01003FF8200820083FF82008 +8ECF:1000100013FCFC9010907C9054907C9054907C901090FE9211121112120E1400 +8ED0:100011F01090FE9010907C9054907DF054907C901090FE92108A108A10861082 +8ED1:102010201020FE2010207DFE54207C2054207C501050FE501088108811041202 +8ED2:0800087C0810FF1008107F1049107F7E49107F100810FF100810081008100810 +8ED3:1000100010F0FE9010907C9054907CD054B07C901090FE9210921112110E1200 +8ED4:1000100011FCFE2410247CA454A47CA455247C241024FE441044108411141208 +8ED5:102010201020FC2011247D2455247D2455247D241124FF24112411FC10041000 +8ED6:1000100011FCFE2010207C2054207C2055FC7C201020FE201020102013FE1000 +8ED7:100010F81088FE8810887D0656007DFC54847C841048FE501020105010881306 +8ED8:102010201020FDFE10207D2455247D2455247DFC1024FE2010221022101E1000 +8ED9:102010201020FE3E10207C2054207DFC54847C881048FE501020105011881606 +8EDA:102010201020FE2010207DFE54207C2054207C501050FE50108810C811241202 +8EDB:100011FE1100FD0011787D4855487D4855487D681150FD4211421142123E1400 +8EDC:102010201020FDFE11227D2255227D2255527D4A118AFF0211021102110A1104 +8EDD:1004101E10F0FE9010907C9054907CFE54907C901090FE88108A10AA10C61082 +8EDE:1008101C10E0FE2010207C3C54E07C2054207C3E11E0FE20102410241024101C +8EDF:104010401040FE7C10847C8855207C2054207C501050FE501088108811041202 +8EE0:1008103C11E0FE2010207C2054207DFE54207C201020FE201020102011FC1000 +8EE1:102010201050FE5010887D4456227C2054007DFC1004FE081008101010101020 +8EE2:1000100010FCFE0010007C0055FE7C2054207C401040FE88108411FE10821000 +8EE3:01007FFC01003FF821083FF821083FF80100FFFE0100600C183006C01830600C +8EE4:1008103C13E0FC2011247CA454A87C2057FE7C201020FE201020102010A01040 +8EE5:104010401040FEFC10847D0454F47C9454947C941094FEF41094100410281010 +8EE6:100011FC1104FD0411047D0455FC7C5054507C501050FE9210921112120E1400 +8EE7:1004101E10F0FE9010907C9054907CFE54907C901090FE88108A10AA10D6108A +8EE8:102010201050FE5010887D2456127C1055FC7C041008FE881050102010101010 +8EE9:102010201020FE4010487C8455FE7C8254007CFC1084FE841084108410FC1084 +8EEA:201020902090F910217EFA52AB92F892A912F9122252FBD220622022204A2084 +8EEB:102010201050FE8811047E1254207C4055887C101020FE441188101010601380 +8EEC:040008201FF00210FFFE09203FF8C1061FF011101FF011101FF00100FFFE0100 +8EED:100010FE1080FE8010FE7C9054907CBC54907C901090FEFE1080108010FE1000 +8EEE:102010201020FDFC11247D2455247D2455247FFE1020FE501050108811041202 +8EEF:100011FC1020FC2011247CA454A87C2057FE7C201020FE201020102010201020 +8EF0:04447C5804621C42E43E01007FFC01001FF011101FF011101FF00100FFFE0100 +8EF1:1008101C11F0FD5011507D5055507D5055507D481148FD681154127412521400 +8EF2:102010201020FE2011FE7C2054207C2054FC7C841084FE841084108410FC1084 +8EF3:1040104010FCFE8411047EF454947C9454F47C841094FE8810821082107E1000 +8EF4:104010201000FDFE10207C2054207C2055FC7C201020FE201020102013FE1000 +8EF5:104410441044FE8410BE7D8456847CA454947C941084FE841084108410941088 +8EF6:1040102011FCFD0411047DFC55007D00557C7D081110FD2011421282127E1400 +8EF7:105010481048FC4013FE7C8054807CFC55447D441128FD281210122814441182 +8EF8:102010201020FE2011FC7D2455247D2455247DFC1124FF241124112411FC1104 +8EF9:1000100011FCFF0411047D0455047D0455FC7D041000FE901088110412021402 +8EFA:100011FC1044FE4410447C4454947C8855007CFC1084FE841084108410FC1084 +8EFB:1000100013FEFC0810087DE855287D2855287D2811E8FD281008100810281010 +8EFC:102010201120FD2011FC7D2056207C2055FE7C201050FE501088108811041202 +8EFD:100011FC1084FE8810507C2054507C8857267C2011FCFE201020102013FE1000 +8EFE:101010141012FC1013FE7C1054107DD054907C901090FC8810EA138A10061002 +8EFF:108410481000FEFC10487C4854487C4855FE7C481048FE481048108810881108 +8F00:100013FE1020FE2010407DFC55547D5455547D541154FF541154114411141108 +8F01:104810481048FE4811FE7C4854487C4854487DFE1000FE481044108410821102 +8F02:08207FFC0820FFFE101021085FF481021FF011101FF011101FF00100FFFE0100 +8F03:104010201020FDFE10007C8855047E0254887C881050FE501020105010881306 +8F04:102010201124FEA410A87C2057FE7C9054907C901090FE9211121112120E1400 +8F05:104010401078FE8811507C2054507C8855067CF81088FE881088108810F81088 +8F06:102010101010FDFE10207C2454447CF854127C221044FD881010102810441182 +8F07:102010201050FE8811047E0255FC7C2054207C2011FCFE201020102013FE1000 +8F08:1010102010FCFE8410A47C9454947DFE54847CA41094FE941084110411141208 +8F09:08207F280824FFFE0820FFA008247F2449247F2849287F100812FFAA08460882 +8F0A:100011FE1020FE4010887D0455FE7C2254207C2011FEFE201020102013FE1000 +8F0B:010041047FFC0200FFFE09203FF8C1061FF011101FF011101FF00100FFFE0100 +8F0C:200023FE2020F8202020FBFEAA22FA22AAAAFAAA22AAFAFA22022202220A2204 +8F0D:100010501048FE8411247C2054507C8855067EF81088FE881088108810F81088 +8F0E:101010921052FE5410107CFE54827C8254FE7C821082FEFE10821082108A1084 +8F0F:100013FE1050FC5011FC7D5455547D54558C7D041104FDFC1104110411FC1104 +8F10:1020101011FEFD0212047CF854007C0055FE7C501050FE5010921092110E1200 +8F11:100010FC1024FE2411FE7C2454247CFC54407C4010FCFEC411441044107C1044 +8F12:100013FE1120FD2811287DE855287D2855287DE81128FD2A113A13EA10261020 +8F13:1080108010F8FD0812107DFC55247D2455247DFC1050FE50109010921112120E +8F14:1028102413FEFC2010207DFC55247D2455FC7D241124FDFC112411241124110C +8F15:100011FE1000FE9211247E4855247C9254007DFE1020FE201020102013FE1000 +8F16:100010FE1092FE9210BA7C9254FE7C8254BA7CAA10AAFEBA10821102110A1204 +8F17:10001040119CFF0411047DDC55047D0455FC7C501050FE50109010921112120E +8F18:1020102010FCFC2010207DFE54487C8455227C781088FD48105010201050118C +8F19:100013E0115CFD5411547DD455547D5455D47D541148FD6813C8105410541062 +8F1A:10481044105EFDE010287C12546A7D9654487C5E11E0FE2410281012106A1186 +8F1B:200023FE2020F82023FEFA22AA22FB32AAAAFAAA2376FA6622222222222A2204 +8F1C:109210921124FE4811247C9254927C0055FE7D221122FDFE1122112211FE1102 +8F1D:100013FE922254205BFE1020FDFC292429FC292429FC28202BFE4C2048208020 +8F1E:200023FE2202FA8A2252FBFEAA42FA22ABFEFA822282FA8222FA2202220A2204 +8F1F:200023DE2042F94A2084F94AAA52FC20A800FBDE2052F9522094214822542422 +8F20:100011FC1124FD2411FC7D2455247DFC54207DFE1070FEA81124122210201020 +8F21:10401040107CFC8411087E0054207DCE55027D0211CEFD021102110211FE1102 +8F22:1020102011FCFC5010887D0457FE7C0855E87D281128FDE81128100810281010 +8F23:100011DC1154FD5411547DDC55547D5455547DDC1154FD54115412D41224144C +8F24:1020102011FEFE2010FC7C2055FE7C0054FC7C8410FCFE8410FC108410941088 +8F25:100011FC1104FD0411FC7D0455047DFC54007D1211D4FD18111011521192110E +8F26:08203EF808207EFC145023885FF401001FF011101FF011101FF00100FFFE0100 +8F27:104410441088FDDC10887C8854887C8855DE7C881088FE881088108810881108 +8F28:1020101011FEFD0210007CF854887C8854F87C801080FEFC1084108410FC1084 +8F29:04407C7C04403C7804407C7C05403FF801001FF011101FF01110FFFE01000100 +8F2A:102010201050FE8811047EFA54007DFC55547D5411FCFF54115411541104110C +8F2B:104810481048FDCE10487C4854487DCE54487C481048FDCE1048104810481048 +8F2C:1040102013FEFC0010007DFC55047D0455047DFC1020FEA81124122210A01040 +8F2D:100013FE1020FC4011FC7D5455547D5455547D2C1020FDFE1050108811041202 +8F2E:100010FC1048FE3011FE7C5254947D1056307C2011FEFE7010A8112412221020 +8F2F:100010F81088FE8810F87C0055FE7C8854F87C8810F8FE88109E13E810081008 +8F30:100010FC1084FEFC10847CFC54007DFE54807CFE112AFE4A1092112210541088 +8F31:2008200C200AFBFE2208FA08AAE8FA0AAA0AFAEC22ACFAA822EA221A22262442 +8F32:102011241124FD2411FC7C0057FE7C2054407DFC1154FF54115411541154110C +8F33:1020102013FEFC2011FC7C4057FE7C8855047EFA1020FDFC1020105010881304 +8F34:1008101C11F0FD1011107DFE55107D7C55447D7C1144FD7C11441244127C1444 +8F35:100010FC1084FEFC10847CFC54407CFE55127C9210AAFE8210FA100210141008 +8F36:108810481050FDFE10507C5055FC7D5455547D8C1104FDFC1104110411FC1104 +8F37:1080108010FEFD0212427DFA54027DF254027DF21002FDF2111211F210141008 +8F38:204020A02110FA0825F6F800ABC4FA54AA54FBD42254FA5423D42244225422C8 +8F39:1040104010FEFE8011FC7E8454FC7C8454FC7C40107CFEC41128101010681186 +8F3A:1052105210A4FDFE10A47C5254527C0054FE7C921092FEFE1092109210FE1082 +8F3B:100010FE1000FE7C10447C44547C7C0054FE7C921092FEFE1092109210FE1082 +8F3C:100010F81088FE8810F87C8854887CF854007DFC1154FF541154115413FE1000 +8F3D:104010481084FDFE10207FFE54887D0457FE7D241124FDFC1124112411FC1104 +8F3E:200023FC2204FA0423FCFA48AA48FAFCAA48FA4823FEFAA422A8249024C82886 +8F3F:010017C0611C47C4454477DC454447C4711C47C44104FFFE0000101020084004 +8F40:100010F810A8FEA810D87C8854F87C0054007DFC1154FF541154115413FE1000 +8F41:101E11E01022FD1210947C8054207DCE55027D0211CEFF021102110211FE1102 +8F42:0800FFB808287F280028FFC688807F7C08247F2449287F284910FFA808440882 +8F43:1020102013FEFC2011FC7C4057FE7C8855347EE21020FDFC107010AC13221020 +8F44:2040202023FEFA022424F9FCA820F9FCA820FBFE2020F9FC2104210421FC2104 +8F45:1020102011FCFC2013FE7C0055FC7D0455047DFC1052FC94118816A410C21080 +8F46:2040202023FEFA502250FBFEAA52FA52ABFEFA002292FAD42298249224D2288E +8F47:200023DE2042FA52214AFA52A828F8C4AB12F8602188F83221C4201820602380 +8F48:112412481124FC0011FC7D2455FC7D2455FC7C2013FEFC7010A8112416221020 +8F49:102013FE1020FDFC11247DFC55247DFC54227DFE1008FDFE1108108810281010 +8F4A:108813DE1088FDDC10887FDE54887C0057FC7C041004FDFC1004100413FC1004 +8F4B:1010101012FEFD10117C7C54547C7F54557C7D1011FEFD1011101290147E1000 +8F4C:100011FC1020FFFE12227DAC54207DAC54007DFC1004FDFC1004100411FC1004 +8F4D:2108208823E8F910229EFFD4A864FBD4AA54FBD42254FBC822482254226422C2 +8F4E:201C21E02040FBFE2088F904AAFAFC88A8F8F80023FEFA0222FA228A22FA2206 +8F4F:23FE220223FEFA0022FCFA08ABFEFA10AA30FBCE2242FA8424EE27842884218C +8F50:1050115210D4FC5011FE7C8854507DFE54207CFC1020FDFE1050108811041202 +8F51:1020102011FCFC2011547C8855047EFA54887CF81088FEF8102010A811241060 +8F52:102011FC1020FC8813FE7C8855FC7D0455FC7D0411FCFD0411FC108811041202 +8F53:103C13E01124FCA813FE7CA855247E0255FC7D241124FDFC1124112411FC1104 +8F54:2020212420A8FBFE20A8F924AA22F904A904F9DE2244FD54209E210422042404 +8F55:108813FE1088FDFC11047DFC55047DFC54807DFE1222FD52110211FA100A1004 +8F56:2020202023FEF9242124FAAAAFFEF800A9FCF9042174F9542174210421FC2104 +8F57:2014201223FEFA1022F0FA14AAF4FAB8AAEAFA162442F82422A2228A24782000 +8F58:100011FC1154FD5411FC7C0057FE7C0055FC7D0411FCFC621094118812A410C2 +8F59:1104108813FEFC2011FC7C2057FE7C5455927C9013FEFC9010D4138A109611A2 +8F5A:08007F3C2A243E422A3CFFA449187F6601007FFC11101FF01110FFFE01000100 +8F5B:214421442554FB64215EFBE4A804FA34A94CFBE42084FBE4208420E427142008 +8F5C:200021FC2020FBFE2222F9ACA820F9ACA800FBFE2020F9FC215421542154210C +8F5D:1A3823883A38238838B82288FFFE11103FF8C1061FF011101FF01110FFFE0100 +8F5E:200823E82288FBEE2228FBF4AA82FBE2A800F9FC2154F9542154215427FE2000 +8F5F:01003FF801001FF011101FF01110FFFE01001110FEFE54547C7C5454FEFE1010 +8F60:200021FC2124F9FC2124F9FCA904F800ABFEFAAA22AAFBFE22AA22AA23FE2222 +8F61:210427C4410897D2E55C47C89552F7DE0100AFEAA92A01003FF820083FF82008 +8F62:212421742258FADA23FEF954AADAFBFEA8A2F82023FEF87020A8212422222020 +8F63:200023FE2222FACC2244FBEEAA44FAEEAB54FA442210FA90229E249024902BFE +8F64:2040207C2040FBFC2244FBF0AA44FAFCAAA8FAF822A8FAF8220025FC25542BFE +8F65:208823FE2088FBDE2252FBDEAA52FBDEAA4AFAFE2392FAFE229222FE22822206 +8F66:0200020002007FFC04000900110021003FF801000100FFFE0100010001000100 +8F67:104010401040FE402040284048407E40084008400E40F84248420842083E0800 +8F68:208020802080FC8043F050909090FC90109010901C90F09251121112120E1400 +8F69:1000100010FEFE102010281048107E1009FE08100E10F8104810081008100810 +8F6A:102010201020FE20202029FE48207E20082008500E50F8504888088809040A02 +8F6B:1000100010FCFE24202428A448A47EA408A409240E24F8444844088409280A10 +8F6C:202020202020FDFC4020504093FEFC40108011FC1C04F0885050102010101010 +8F6D:200021FE2100FD00417851489148FD48114811681D50F14251421142123E1400 +8F6E:2040204020A0FCA0411052089406FD10112011401D80F1005104110410FC1000 +8F6F:104010401040FE7C2084288849207E20082008500E50F8504888088809040A02 +8F70:020002007FFC080011003FF80100FFFE010001003EF80288145008203458C286 +8F71:102010201020FE2021FE282048207E2008FC08840E84F8844884088408FC0884 +8F72:2000200021FEFC08400851E89128FD28112811281DE8F1285008100810281010 +8F73:20202020203EFC20402051FC9104FD04110411FC1D04F1005100120012001400 +8F74:202020202020FC2041FC51249124FD24112411FC1D24F1245124112411FC1104 +8F75:2000200021FCFD04410451049104FD0411FC11041C00F0905088110412021402 +8F76:202020202120FD2041FC51209220FC2013FE10201C50F0505088108811041202 +8F77:2008203C23E0FC20412450A490A8FC2013FE10201C20F0205020102010A01040 +8F78:202020202050FC88410452129020FC40118810101C20F0445188101010601380 +8F79:2008201C21E0FD00412051209120FDFE102010201CA8F0A45122122210A01040 +8F7A:100011FC1044FE442044284448947E88090008FC0E84F8844884088408FC0884 +8F7B:200021FC2008FC10403050489084FF02100011FC1C20F0205020102013FE1000 +8F7C:201020142012FC1041FE50109010FDD0109010901C90F08850EA138A10061002 +8F7D:082008287F240820FFFE10201024FF24202448287F2808100F12F82A08460882 +8F7E:100010FE1010FE202044288248FE7E12081008100EFEF8104810081009FE0800 +8F7F:2008203C21E0FC20402053FE9050FC881104128A1C88F0885088110811081208 +8F80:2010202020FCFC8440A450949094FDFE108410A41C94F0945084110411141208 +8F81:202020202050FC884104520291FCFC20102010201DFCF0205020102013FE1000 +8F82:104010401078FE882150282048507E88090608F80E88F8884888088808F80888 +8F83:204020202020FDFE400050889104FE02108810881C50F0505020105010881306 +8F84:200023FE2120FD28412851E89128FD28112811E81D28F12A513A13EA10261020 +8F85:2028202423FEFC20402051FC9124FD2411FC11241D24F1FC512411241124110C +8F86:200023FE2050FC50405053FE9252FE52125212AA1EA6F30252021202120A1204 +8F87:082008207EFC0820FEFE145022884206BFF8050009001FF00100FFFE01000100 +8F88:04407C7C04403C7804407C7C064002003FF8050009001FF00100FFFE01000100 +8F89:100013FE92025444584013FCFC8028A0292029FC282028202BFE4C2048208020 +8F8A:200021FC2104FD0441FC51049104FDFC100011121DD4F118511011521192110E +8F8B:200023FE2202FA8A425253FE9242FE2213FE12821E82F28252FA1202120A1204 +8F8C:2040202023FEFC00400051FC9104FD0411FC10201D28F1245222142210A01040 +8F8D:200023DE2042FD4A4084514A9252FC20100013DE1C52F1525094114812541422 +8F8E:209220922124FA48412450929092FC0011FE11221D22F1FE5122112211FE1102 +8F8F:2020202023FEFC2041FC504093FEFC88110412FA1C20F1FC5020105010881304 +8F90:200021FE2000FCFC4084508490FCFC0011FE11221D22F1FE5122112211FE1102 +8F91:200021F82108FD0841F8500097FEFD0811F811081DF8F108513E17C810081008 +8F92:100010F81088FE8820F8288848887EF8080009FC0F54F954495409540BFE0800 +8F93:204020A02110FA0825F6400053C49254FA5413D41A54F25453D41244125412C8 +8F94:2208220847D08A22F53C27C84110F93E07C0193EE1003FF8200820083FF82008 +8F95:2020202021FCFC2043FE500091FCFD04110411FC1C52F094518816A410C21080 +8F96:2040202023FEFE02442451FC9020FDFC102013FE1C20F1FC5104110411FC1104 +8F97:200023FC2204FA0443FC52489248FEFC124812481FFEF2A452A8149014C81886 +8F98:2040202023FEFA50425053FE9252FE5213FE12001E92F2D45298149214D2188E +8F99:2208210827C8FA10249E4FD450649794FC9417941C94F7885488149414A415C2 +8F9A:2020212420A8FBFE20A8412452229104F90411DE1A44F554509E110412041404 +8F9B:020001003FF8000008200440FFFE0100010001007FFC01000100010001000100 +8F9C:01007FFC01001FF010101FF001003FF808200440FFFE01003FF8010001000100 +8F9D:10401020202029FC4400FE88425001FE7C20442045FC442044207C2044200020 +8F9E:00201E10F01011FF1000FE441024102811FF7C10441045FF441044107C104410 +8F9F:00407C20442045FC44007C88405041FE7C206420A5FCA42024203C2024200020 +8FA0:02001FF010101FF010101FF010101FF001003FF80820FFFE01003FF801000100 +8FA1:204010201020FDFC000044882850FDFE10201020FDFC10202020202040208020 +8FA2:10401020FE2011FC1000FE88925093FEFE20102039FC54209220102010201020 +8FA3:2020102011FCFC20002045FC2924FD2411FC1020FC7010A82124222240208020 +8FA4:04201E10E01022FE92005444FE2882FE00107C10047C68101010281044108210 +8FA5:08204A1052107EFE24004844BE2822FE22103E10207C3E10221022103E102210 +8FA6:421022082208FA3E078052942288FABE22882288729C2288248844884A889108 +8FA7:401020082788FABE028052942288FABE22882288729C2288248844884A889108 +8FA8:2010108810887CBE00802A941288FEBE128810887C9C11081108220824084008 +8FA9:2010120811087D3E00002B141108FD3E110811087D1C11481188210820084008 +8FAA:08204F10481048FEFF00084410287EFE42107E10407C7F1041107F1041100010 +8FAB:2010108810887D3E01402BD41088FCBE110813C87C1C100810C8230820084008 +8FAC:401022082108F93E000057D42088FCBE22882108711C22882288448848088008 +8FAD:0F20F010491022FEFE0014440828FFFE9510BD10837CBD10951089109510A310 +8FAE:411021082288FABE078051142108FABE27C82148711C25882548494845088208 +8FAF:421021082008FBBE000053942008FBBE20082388729C22882288438842888008 +8FB0:00003FFC200020002FF8200020003FFC24802488245024204410450886060400 +8FB1:00003FFC20002FF820003FFE288848504A308C0E0020FFFE0820042004A00040 +8FB2:04403FF824483FF824483FF800003FFC20002FF820003FFE288848504A308C0E +8FB3:082008207EFC08201C702AA8C8243FFC20002FF820003FFE288848504A308C0E +8FB4:0000EEFEAA80AA80EEBC0080FE8092FEFEA092B2FEB410A8FEA8112411321220 +8FB5:003803C07C00003803C03C0C007007807800010011F811001100290047FE8000 +8FB6:000020001000100000000000F000100010001000100010001000280047FE0000 +8FB7:0000200010001000000007FCF000100010001000100010001000280047FE0000 +8FB8:0000200017F8110801100120F13C110411041204120414281810280047FE0000 +8FB9:00402040104013FC00440044F044108410841104110412281410280047FE0000 +8FBA:0000200017F8108800880088F088108810881108110812281410280047FE0000 +8FBB:0040204010401040004007FEF040104010401040104010401040280047FE0000 +8FBC:0200210010801040004000A0F0A0111011101208140418021000280047FE0000 +8FBD:000023F81010102000400040F040104010401040104011401080280047FE0000 +8FBE:004020401040104007FE0040F04010A010901108120414041000280047FE0000 +8FBF:004020401040144404440444F44414441444144417FC10041000280047FE0000 +8FC0:000021FC1020102000200020F3FE102010201020102010201020280047FE0000 +8FC1:0010207813C0104000400040F7FE104010401040104010401040280047FE0000 +8FC2:000023F81040104000400040F7FC104010401040104010401140288047FE0000 +8FC3:000023F81000100007FE0080F10011F810081008100810501020280047FE0000 +8FC4:0100210011FE1200040001F8F010106010801104110410FC1000280047FE0000 +8FC5:00004FE02220222002200220EFA02220222422142214220C220450008FFE0000 +8FC6:004020401040125802E80748F248126812541244120411FC1000280047FE0000 +8FC7:00102010101017FE00100010F210111011101010101010501020280047FE0000 +8FC8:0000200017FE1080008000FCF084108410841104110412281410280047FE0000 +8FC9:000021FC11041104010401FCF104110011001100110012001400280047FE0000 +8FCA:00004FFE2040204007FC0444E44424442444245424482040204050008FFE0000 +8FCB:000027FC1040104000400040F3F8104010401040104017FC1000280047FE0000 +8FCC:000021FC1104110401FC0104F10411FC11041104110412141408280047FE0000 +8FCD:0040204017FC104002480248F24813F8104410441044103C1000280047FE0000 +8FCE:00002080133C122402240224F2241224122412B4132812201020282047FE0000 +8FCF:004020401040104007FE0040F04010A010901108124414241020280047FE0000 +8FD0:000023F810001000000007FCF04010801110120817FC12041000280047FE0000 +8FD1:0008201C11E01100010001FEF110111011101110121012101410280047FE0000 +8FD2:00802040104017FE00000000F1F011101110111012121212140E280047FE0000 +8FD3:000023FC1010111001100210F3FE103010501090111016501020280047FE0000 +8FD4:0008203C13C01200020003FCF204128812501220125014881504280047FE0000 +8FD5:00802080108011FC01200220F020102017FE1020102010201020282047FE0000 +8FD6:005020481048104007FE0040F04010A010901108120414041000280047FE0000 +8FD7:000023FC1040104000400040F7FE104010A01090110812041404280047FE0000 +8FD8:000023FC1020102000400040F0D0114812441444104010401040280047FE0000 +8FD9:00802040104017FC00100210F12010A0104010A0111012081408280047FE0000 +8FDA:00402040104017FC04440444F444144417FC1444104010401040280047FE0000 +8FDB:00902090109013FC00900090F09017FE10901090111011101210280047FE0000 +8FDC:000023F810001000000007FCF120112011201120112412241224141C280047FE +8FDD:008040802FFC2080008007F8E08020802FFC208420842094208850808FFE0000 +8FDE:0040204017FE108000A00120F3FC10201020102017FE10201020282047FE0000 +8FDF:000021F811081108010801F8F108112011101208120414041000280047FE0000 +8FE0:004020401040107E00400040F3FC120412041204120413FC1204280047FE0000 +8FE1:000023FC1204120403FC0200F2801284129812E012821282147E280047FE0000 +8FE2:000023FC1084108400840114F20811FC11041104110411FC1000280047FE0000 +8FE3:004822481248124807FE0248F248124812781200120013FE1000280047FE0000 +8FE4:0200220013FC144004400A58F2E81748126812501244120411FC280047FE0000 +8FE5:000023FC1204120402F40294F294129412F41294120412141208280047FE0000 +8FE6:04004400243C2FA404A404A4E4A424A424A428A428BC32A4210050008FFE0000 +8FE7:0040204017FC1444044407FCF444144417FC1444104010401040280047FE0000 +8FE8:008020801110120807FC0204F00013F812081208120813F81208280047FE0000 +8FE9:00802080110011FE02020424F020112811241222142210A01040280047FE0000 +8FEA:00404040204027FC04440444E44427FC24442444244427FC200050008FFE0000 +8FEB:00402040108013F802080208F20813F812081208120813F81208280047FE0000 +8FEC:00802040100017FC00400040F04013F81040104010401FFE1000280047FE0000 +8FED:00402240124013FC02400440F04017FE104010A0109011081208280047FE0000 +8FEE:01002100110013FE02800480F0F81080108010FC108010801080280047FE0000 +8FEF:01102110111011D002580254F252155218901090111012101410280047FE0000 +8FF0:004020501048104007FC00C0F0E0115011481244144410401040280047FE0000 +8FF1:0080404027FC240408080200E210226023802204220421FC200050008FFE0000 +8FF2:00402040104013FC00400040F7FE104010801110120817FC1204280047FE0000 +8FF3:000023F81010102000500188F60413F810401040104017FC1000280047FE0000 +8FF4:000023FC1204120402F40294F29412F41204120413FC12041000280047FE0000 +8FF5:000023FC120412F402040204F2F41294129412F4120412141208280047FE0000 +8FF6:0040204017FE1080010003FCF50419FC110411FC110411141108280047FE0000 +8FF7:0040224811481150004007FCF04010E011501248144410401040280047FE0000 +8FF8:02082110100017FC01100110F11017FE11101110121012101410280047FE0000 +8FF9:00402020102017FE00900090F294129214921110111012501420280047FE0000 +8FFA:00004FFE20A020A007FC04A4E4A424A4251C2604240427FC240450008FFE0000 +8FFB:0040208011F81610012000C0F120167C10841348103010C01700280047FE0000 +8FFC:00402040104017FC00400040F3F81000100013F81208120813F81208280047FE +8FFD:0020204013FC1204020403FCF200120013FE1202120213FE1202280047FE0000 +8FFE:000427E411041114011403D4F2541254155410941094110412141408280047FE +8FFF:0100210011FC1204040403E4F224122413E41224122413E410041028281047FE +9000:03F82208120813F802080208F3F8124412281210128813041204280047FE0000 +9001:020241043088101003FE0020F020102017FF10201050108811042A02440183FF +9002:007823C01040104007FE0040F04013F812081208120813F81208280047FE0000 +9003:00A020A014A412A801B000A0F1B012A814A4112011241224141C280047FE0000 +9004:0080208010FC110802900060F1981626102011FC1020122013FE1020282047FE +9005:003C23C01200120003FE0200F20012FC12841484148418FC1084280047FE0000 +9006:0208410821102FFE00400040E4442444244427FC20842100220054008FFE0000 +9007:021042502250225C0F7402D4E2542254225C23502E422442203E50008FFE0000 +9008:0040208013FC1204020402F4F2941294129412F4120412141208280047FE0000 +9009:00402240124013F804400040F7FC11201120112012241224141C280047FE0000 +900A:00104F9020902110021002D8E354225426922A92231222102A50242050008FFE +900B:004840442FFE204007FC0444E7FC244427FC244424442454240850008FFE0000 +900C:00402040107C1040004003FCF20413F4121413F4120413FC1204280047FE0000 +900D:0040224811481150004003F8F208120813F81208120813F8120812282A1047FE +900E:000027FE1090109003FC0294F294130C120413FC1204120413FC1204280047FE +900F:003823C0104017FC01500248F44613F01110113C110412141408280047FE0000 +9010:000023FC1040108001440668F0B01128166810A41124162010A0284047FE0000 +9011:00402050104817FC00400248F15010E011501248144411401080280047FE0000 +9012:011020A013F81048004803F8F240124013FC10C4114412541448284047FE0000 +9013:003C47E0242025FC042007FEE420242025FC2524252429342928302050008FFE +9014:004020A01110120805F60040F04017FC10401248124414441140288047FE0000 +9015:000027FC1000124804900248F00017FC1040104010401FFE1000280047FE0000 +9016:09104510221026520A520254E29026282A24324422422A82250050008FFE0000 +9017:000027FC1000100003F80208F20813F810001208111017FC1000280047FE0000 +9018:00802100120817FC01040100F3F81440104017FE104010A011102A0847FE0000 +9019:0080204017FC100003F80000F3F8100013F81208120813F81208280047FE0000 +901A:000047F8201021A0004007FCE444244427FC2444244427FC2444245454088FFE +901B:00004880257C22100D100110E17C23102D10211021102A7E240050008FFE0000 +901C:00004FF82080208007F00110E1102FFC200027F82408240827F850008FFE0000 +901D:0208421C226022400FC0027EE2C823482E48224822482A48248851008FFE0000 +901E:03F822081208120803F80000F7FC1040104013F81040104017FC280047FE0000 +901F:0040204017FC104003F80248F24813F810E01150124814441040280047FE0000 +9020:0040224013F81440004007FCF000100013F81208120813F81208280047FE0000 +9021:00802110120817FC00040110F208150411F812081590106011902E0847FE0000 +9022:010021F81308149000600198F606104013F8104013F8104017FC1040284047FE +9023:004040402FFE204007FC0444E7FC244427FC20402FFE2040204050408FFE0000 +9024:001022101110145402520092F0101114160412081210122010C0280047FE0000 +9025:000023FC1294129402F40294F29412F412941294129413FC1204280047FE0000 +9026:00004FFE2000200007BC04A4E4A426B425AC24A424A424A425AC50008FFE0000 +9027:01102248144410A001100208F40613F812081208120813F81208280047FE0000 +9028:0040204017FC104001500150F2E8144410E01150124814441040280047FE0000 +9029:0000208017FC111002480C46F3F810401150111017FE111012101410281047FE +902A:0110211017FC111001100FFEF00013F8120813F8120813F81208280047FE0000 +902B:000047BC2084252802100528E84027BC2084252822102528284450008FFE0000 +902C:00842084110817BC01080108F108110817BE11081108110811082A0847FE0000 +902D:0080204017FC140403F00210F21013F0120013F81208120813F8280047FE0000 +902E:0040204013F8104807FE0048F3F8144412481150124814441140288047FE0000 +902F:000047F8200823F800080FFEE040244422E8215022482444214050808FFE0000 +9030:02204220223E2F400280027CE30422082E7E2208220822082A28241050008FFE +9031:000047FC2444244405F40444E7FC240425F4251425F42404280C50008FFE0000 +9032:0140212013FE122006200BFCF220122013FC1220122013FE1200280047FE0000 +9033:0080204017FE1100020807FCF00413F8120813F8120813F8120812282A1047FE +9034:00402040107E104003F80208F3F8120813F810401FFE10401040284047FE0000 +9035:0040204013F81040004007FCF1101248144413F81040104017FC1000280047FE +9036:003823C0104017FC01500248F44410801FFE11081390106011981604280047FE +9037:000023F8120813F8020803F8F10013FC14941924124414A811102A0047FE0000 +9038:0100410021F0221004200FFCE444244427FC20A02130212A2222241E50008FFE +9039:0040204013F81040004007FCF11010A013F81040104017FC10401040284047FE +903A:0040204013F8104007FE0080F11013E0104411A81690108810C4280047FE0000 +903B:000047FC24A424A407FC0080E1F82208251020A0204021802E0050008FFE0000 +903C:000027FC100013F8020803F8F00017FC144417FC144417FC1404280047FE0000 +903D:0108210817FE1108004007FEF080110013FC1504190411FC1104280047FE0000 +903E:004040A0211022080DF60000E78424A427A424A427A424842494258850008FFE +903F:01F8210811F8110801F80000F7FE110013FC14A4112412541088280047FE0000 +9040:008027FC110013F804400BFCF00013F8120813F8120813F8120812282A1047FE +9041:001E23E01220122003FE0220F2FC128412FC128412FC148414FC280047FE0000 +9042:0110209010A017FC00800144F66810B01128166810A4112416A0284047FE0000 +9043:0040202013FC100001080090F3FE122012C81210122412C812101460298047FE +9044:004044442444244407FC0000EFFE208027FC24A424A424A424A4240C50008FFE +9045:00004FFC280428040FFC0910E8A02FFC28402BF8284037FC204050408FFE0000 +9046:0080204017FC111000A007FCF444104013F812481248126812501040284047FE +9047:000023F8124813F8024803F8F04017FC14441454147415941404140C280047FE +9048:000043F8220823F8020803F8E0002FFC204022782240254028FE50008FFE0000 +9049:00402040107C104003F80208F3F8120813F8120813F810A011102A0847FE0000 +904A:042042202FBE2440043C0784E488248824FE24882488288829A850108FFE0000 +904B:000027FC144413F8004003F8F24813F8124813F8104017FC1040284047FE0000 +904C:000027BC14A417BC000003F8F00017FE110011F8100810081050282047FE0000 +904D:0080204013FC1204020403FCF20013FC1354155415FC19541144110C280047FE +904E:01F8210811E81128012803FCF20412F4129412F4120412141208280047FE0000 +904F:000023F8120813F8020803F8F10013FC14441AA4120413F41014280847FE0000 +9050:000047BC2484248407BC0400E40027BC2404240427A82410242854448FFE0000 +9051:0040208013F8120803F80208F3F8100017FC104013F8104017FC280047FE0000 +9052:020841102FFE20A007FC04A4E4A42524261C240427FC240427FC50008FFE0000 +9053:02082110100017FC008003F8F20813F8120813F8120813F81208280047FE0000 +9054:0040204013F8104007FC0110F0A017FC104013F8104017FC1040284047FE0000 +9055:0040204013F8108807FE0000F3F8120813F8104013FC144017FE1040280047FE +9056:004040402FFE204007FC0514E4A425F4244425F424442454244850008FFE0000 +9057:004023F8124813F800400FFEF00013F812081248124810A011102A0847FE0000 +9058:011027FC111013F8011007FCF04013F8124813F8124817FE120812282A1047FE +9059:004020FC1324109800E00700F1F81240104017FC1040124413FC280047FE0000 +905A:00402140165C1444075C0444F7FC104017FC10081190106011981604280047FE +905B:0080477C2424252404A40554E648208027FC244427FC244427FC50008FFE0000 +905C:00064FB82090212002440278E3102E24227E221222542A92245050208FFE0000 +905D:000027FC14A414A407FC0040F150124814441150124814441040280047FE0000 +905E:001E47E0243C242005FE0522E53825E2251E250029782A48328A250650008FFE +905F:000023FC1204120403FC0240F22013FC1288125013FE122015FC1420282047FE +9060:0040204013F8104007FC0000F3F8120813F810C411A8129014881084280047FE +9061:0440225E1292101207D2011EF5521552155217DE115212121222142A284447FE +9062:000023F8120813F8020803F8F00017BC108414A4129414A412941108280047FE +9063:004023F8124813F8004007FEF00013F8120813F8120013F8120813F8280047FE +9064:000023FC124013F8024003F8F24013FC10041554155415541428281047FE0000 +9065:003C23C010041244012801FCF220102013FE102011241124112411FC280047FE +9066:03FC224417FE124403FC0000F3FC120413FC120413FC120413FC11082A0447FE +9067:004047FC21102FFE000003F8E20823F8220823F820402FFE204050408FFE0000 +9068:021042102F90221E07A40244EF9424142788248824942AA2294250008FFE0000 +9069:0080404027FC211000A007FCE44427FC244425F4251425F42404240C50008FFE +906A:0080211013F8121004A407FCF0A013181C4613901064139810601380280047FE +906B:021042102F90223E0FA40AC4EAA42F94220827082A943224224450008FFE0000 +906C:022042202FA0223C0FC40A90EA902F90221027282AA83244228450008FFE0000 +906D:00A02FFE10A017FC04A407FCF4A417FC100013F8120813F8120813F8280047FE +906E:0040402027FE240004880488E7FE2488248824F828002AA43252245250008FFE +906F:0000477E25102530074A059AE52C274C259A252A254A25A82B1050008FFE0000 +9070:02A822A817FC12AA04E60800F7FC1444104013F8124812481258284047FE0000 +9071:004043F822482FFE024803F8E04023F8224823F820802FFE211020E053188FFE +9072:07FC440427FC242004A80470E4A8250424A024FC252024202BFE282050208FFE +9073:0110211017FC111000400248F2481554104013F81040104017FC280047FE0000 +9074:00402248115017FC01500248F4441210139014BC1A901150117E12102A1047FE +9075:01104FFE20A027FC04A4051CE60427FC240427FC20102FFE211020B050008FFE +9076:0040204013F8104007FC0210F73812101F7C100017FC11201224141C280047FE +9077:07FC20A017FC14A407FC0080F7FE120815F4191211F0110410FC280047FE0000 +9078:0F3C49242F3C28A2079E0110E7FC211021102FFE21102208240450008FFE0000 +9079:000023F81090106007FC0124F6A8104017FC14A4151416EC14A414EC280047FE +907A:004023F8124813F800400FFEF00013F8120813F8120813F811101208280047FE +907B:000027BC14A414A407BC0110F0A017FC10401248124813F810401080290047FE +907C:004040402FFC20A0051403F8E60C2BFA220823F8204022482444294450808FFE +907D:0040407C204027FE044205F8E44427FC24C0272228D42B183074239250208FFE +907E:0210421023DE2528088407FCE04022482248255428E220402FFE50008FFE0000 +907F:0010478824BE248004A20794E43E28082F8834BE24882788248850008FFE0000 +9080:020044102F9028900F9E08A4EFC422143FD424082788289432A2214250008FFE +9081:01104FFE211023F8024803F8E24823F8204027FC245425F42414240C50008FFE +9082:04004F3C291432140F940AA8EAA82FBC2AC82A882FBE2A882A88318850088FFE +9083:008040402FFE2A12140C0120E7FC20802144266821B0266821A426A450408FFE +9084:000047FC24A427FC00000FFEE00023F8220823F8214423282D9051088FFE0000 +9085:002027FE100013FC020402F4F29413FC110811F8110811F8100017FE280047FE +9086:002423A810921514020805F4F00213F8120813F81208111017FC280047FE0000 +9087:07FC424824442FFE044406ECE55426EC244426EC255426EC2444240C50008FFE +9088:011042202D7C25C402440D7CE3442544297C23282528292A254652808FFE0000 +9089:008043F8220823F8020803F8E0402FFE2912220825F42912211021F050008FFE +908A:008047F8254824A807F80040EFFC2A1424882BF4210021F02210243050008FFE +908B:02484490224827F8052804C8E52827F8249026D0249026D4248C26C450008FFE +908C:0190461E222A2F8A031206AAEA4420A023182C46225021602250254850808FFE +908D:010043F0251020E0071C03F8E24823F8224823F820082FFE2248215052488FFE +908E:04004F8C35702A2004441A78EF9020242F7E20102F5429922F3050008FFE0000 +908F:00004FFE29122FFE02280424E97E2FC8227E25482F7E21482AFE2A4050008FFE +9090:0FBE40002FBE2CB20AAA0040EFFE29202FFC29242FFC2A282BB22A1E53808FFE +9091:00001FF0101010101FF000003FF82108210821083FF82008200220021FFE0000 +9092:0000FF7C08440848084808500848084808440844084408680850284010400040 +9093:00007E7C02440248424824501448084808441444144422684250804000400040 +9094:00007F7C01440148014801503F48214820442044204421682650384020400040 +9095:088811102220111008881FF010101FF000003FF8210821083FF8200220021FFE +9096:0800083E0822082449244928492449244922492249224F347928002000200020 +9097:00007F7C08440848084808500848FFC808440844084408680850084008400840 +9098:00007F7C08440848084808500848FFC808440844084408680850084028401040 +9099:1000083E08220024FFA4202820242024202220222022203420283F2000200020 +909A:1000107C10441048FE4822502248224842442444144408681450224042408040 +909B:0000007C7F44084808480850084808480844084408440F68F050404000400040 +909C:1000107C10441F482148215051488A480A440444044408681050204040408040 +909D:0800043E04223FA4202420282024202420222022202220342028402040208020 +909E:0800087C08447F48084808500848FFC808441444124422682150414080400040 +909F:1000087C0844FF48004800503C48244824442444244425684650444080400040 +90A0:0000147C12441248214821504048BE481244124412441268225022404A408440 +90A1:1000083E0822FFA4102410281F24112411221122112211342128252042208020 +90A2:00007FBE12221224122412281224FFE412221222122212342228222042208220 +90A3:00007E7C1244124812487E50124812487E4412441244226822504A4084400040 +90A4:0200077C38442048204820503FC8244824442444244424682450444044408440 +90A5:0800087C08447F48494808500848144814441444144425682650444080400040 +90A6:0800087C0844FF48084808507E4808480844FF44084410681050204040408040 +90A7:00003F3E002200240024FFA81224122412221222122222B42328422080200020 +90A8:0800083E0822FFA4082449284924492449227F220822083409280A200C200820 +90A9:0800087C0844094849484A504C48884808440844144412682150214040408040 +90AA:00007FBE022222242224222842247FE406220A2212222234422882200A200420 +90AB:100010F81088FC8810F810007DFC11241124FF2411FC110021002102410280FE +90AC:1000203E7E22422442244A28442440247F22012201221D34E12841200A200420 +90AD:1000103E20223F24412481283D242524252225223D222534012801200A200420 +90AE:0800087C08447F4849484950494849487F4449444944496849507F4041400040 +90AF:2200223E22222224FFA42228222422243E2222222222223422283E2022200020 +90B0:0800083E102222244124FFA800A400247F22412241224134412841207F204120 +90B1:0000033E3C222024202420283FA42224222222222222223427A8F82040200020 +90B2:1000083E0A2202241224132854A454A4542298221922113431284F2080200020 +90B3:0000FF7C08440848104814503248514890441044104400680E50F04040400040 +90B4:00007FBE0822082408247FA848A448A454A252A262A240B440A840A042A04120 +90B5:00007F3E1122112421242528422480243F2221222122213421283F2021200020 +90B6:1200123E122212241224F3A812241224122212221222323452A8932012200020 +90B7:0000FF7C204420483C482450244834484C444C44444445685550654043400040 +90B8:010007BE7C2244244424442844247FA4442244224422423442A852A069A044A0 +90B9:2000207C3E44424884480850FE48024802447E44024402680250FE4002400040 +90BA:1400143E142214A494A455285524562414221422142217B4F828402000200020 +90BB:0800087C14441248214848D0844804487F440144224414680850044004400040 +90BC:00007FBE402240247FA4442844245F24442244227FA2403440287FA000200020 +90BD:0800087C7F44084808480850FFC80048084408447F44086808500F40F0404040 +90BE:0800487C48447F48484888500848FFC818441C442A4429684950884008400840 +90BF:0800083E08227F2408240828FFA4022402227FA202222234122802200A200420 +90C0:0800083EFFA2142422244128BEA40024FFA2102220227F34012801200A200420 +90C1:0800083EFF22102410243F2821246124BF22212221223F342128212025202220 +90C2:1000083E0022FFA40824112821247E240422092212222434CC2812202120C0A0 +90C3:0800087C144422484148BED0004800483E4422442244226822503E4022400040 +90C4:0100323E0C22122469240828FFA410242422242248228A3411283F2011200020 +90C5:0000FFBE0822102422244128FFA408A4082208227F22083408280FA0F8204020 +90C6:0800083E0822FFA4082408287F24002400227F224122413441287F2041200020 +90C7:2000203E7F22412481247928492449247922492249227934412801200A200420 +90C8:0200073E7822402440247FA8402440245F2251225122513451289F2091200020 +90C9:0000773E22222224222422282224F7A422222222222222342228422042208220 +90CA:1000087C0044FF48004824504248814824441444084414682250424080400040 +90CB:0800083E10227F24412441287F24412441227F224122413441287F2041200020 +90CC:100010F810887C8810F81000FDFC0124112411247DFC110011001D02E10240FE +90CD:0800103E3F222124292425282524FF2421222922252225342128412045208220 +90CE:0800043E3F22212421243F28212421243F222022242222342528292030202020 +90CF:0800083E0822FFA40824492829242A24FFA20822082214341228212041208020 +90D0:0800083E142222244124BEA800240024FFA21022102222344128FF2041200020 +90D1:2200123E14227F24082408280824FFA408220822142212342128412080200020 +90D2:000020F810887C8844F844007DFC452445247D2441FC510049005502650240FE +90D3:00007FBE48A208247FA41028142424247FA20422042207B4FC28442004200420 +90D4:008001DE771211121114251425D8751415125512551227DA201450108FF00010 +90D5:0400053E04A204247FA4442844247524552255225522523452A8A6A089A010A0 +90D6:00007FBE002200243F242128212421243F22002221221134122807A078202020 +90D7:30800D3E0622192460A408287FE4142424227FA2A4A224B426A8252004200420 +90D8:00003E3E22222224222422283E24002400227F2241224134412841207F204120 +90D9:0A00093EFFA2082408247F28492449247F22492249227F344928492049204320 +90DA:0000FFBE082208247F2411281124FFE4002200227F224134412841207F204120 +90DB:02000F3EF022012491244A280024FE24042208220F22F8344828082028201020 +90DC:0800483E48227F24482488280824FFA4002200227F224134412841207F204120 +90DD:0800083E7F22082408240828FFA412241222532252A292B4222822204A208420 +90DE:1000087C7E44424842487E50424842487E4451444A4444684450524062404040 +90DF:0800083E0822FFA408242A282A242A245D2288A2082214341228212041208020 +90E0:00007FBE082208247F24492849247F24492249227F220834682818202620C120 +90E1:00007F3E11221124FFE4112811247F24202220227F22A134212821203F202120 +90E2:00007F7C4144414841487F5000487F48084408447F44086808500F40F0404040 +90E3:0800087C7F44084808487F50414882483C44044408440F687850084028401040 +90E4:1400127C214449480848145022484148BE4422442244226822503E4022400040 +90E5:00007E7C424442487E48425042487E48424442447E4400682450224041408140 +90E6:00007FDE001200127BD44A544A584A546B525AD24A524A5A4A544A504A505AD0 +90E7:00003E3E222222243E2400287F2441244922492249224934142812202120C120 +90E8:1000083E7FA2002421241228FFE4002400223F222122213421283F2021200020 +90E9:61001A3E0C223224C9240828FFA410243F226122BF2221343F28212025202220 +90EA:0800083EFFA208247F240928FFA409247F221022FF22213472280C203320C0A0 +90EB:1000203E7F22492449247F28492451247F2224224422FFB40428042004200420 +90EC:0800083EFFA208247F240828FFA400247F2241227F2241347F28412045204220 +90ED:1000087CFF4400487E4842507E4800487E44044408440F68F850084028401040 +90EE:00003FBE24A224A42EA424A83FA420A42EA22AA22AA22EB420A840A042A08120 +90EF:0800093E49224A2488241428222449248822492249228A3414282220412080A0 +90F0:0000FC1E48124BD278544A5449587954489248925C92E95A49540A5008100810 +90F1:2100113E122200247FA41228122412241222FFA2122212341228122022204220 +90F2:0800087C0844FF4808482A502A482A485D4488441C442A684950884008400840 +90F3:1000677C414441487748415041487F4814441444144414682550264044408040 +90F4:1100111E111211127BD41114111833143B9255525512991A1114111011101110 +90F5:02000F3E78220824FFA42A282A24FFA42A222A22FFA2083408280F20F0204020 +90F6:200010F87C88008844F8280001FCFF24012401247DFC4500450045027D0244FE +90F7:200023DE22524A524BD4F254125823D44A12FA920A5212DA1354221040108010 +90F8:4100223E14227F24492449287F24492449227F2208220834FFA8082008200820 +90F9:00007E7C42447E4842487E5042487E4814441244FF4410682850244042408040 +90FA:212422483D244400A8F8108820F8C80011FC3D24452485FC290011042104C0FC +90FB:3F00A13EBF22A124BF24A128BF248024FFA20022492249349228922049204920 +90FC:1000103E7F222124FFE400287F2441247F220822FFA208348828FFE008200820 +90FD:080008BE7EA209240A24FFE8082410243F226122A1223F34212821203F202120 +90FE:00007FDE40125F9250945F9450985F9444127FD24912591A4614491050907FD0 +90FF:00007F7C494449487F4840505F48514851445F4451445F68515051409F401140 +9100:2200223EFFA222242A240828FFA4102420223F226122A134212821203F202120 +9101:140014BEF722142434A4D3A800247F2441227F2241227F344128412045204220 +9102:0000773E55225524772400287F240024FFA220223F220134012801200A200420 +9103:0800143E22224124BEA4002878A44AA44AA27AA24AA24AB47AA848A04AA05920 +9104:0000FF7C144414487F48555055487F48084408447F44086808500F40F0404040 +9105:010007BEF82208247F24492849247F240822FFA288A28AB4BEA880A082A08120 +9106:0000FFBE88A20824FFA408287F2449247F2249227F220834FFA8082008200820 +9107:1000179E109220922FF46414A41827D4291221122FF2211A2294225024502810 +9108:0A00747C15445248224821504148BE48084408447F4408681450124022404040 +9109:2100209E23D24A524A54F3D4125822544BD2FA120A92125A12D4235042108010 +910A:200027FE22524A524BD4F254125823D44A52FA520A7217DA1054205040508050 +910B:28004B7C494449486B48495049487F4808447F44014432680C50124061400040 +910C:0800043E7FA244245F2445287FA445245F2244225F225134512851205F209120 +910D:0000FFBE80A200247F2441287F2441247F2210220822FFB400282220412080A0 +910E:0800103E7F2241247F2441287F2441247F22102208222934A2A8A2A01E200020 +910F:00007FBE40225F2440247FA855245224592250A242227FB452284A2082200620 +9110:1000083EFFA2102422247C28082411247FA200A27F2249347F2849207F204120 +9111:00007FBE122252A433241228FFE400243F22212221223F34212821203F202120 +9112:1000103E3FA248A42AA43EA810A4252452223FA248A2AAB43EA810A025204220 +9113:0800103E7F2241247F2441287F2441247F220A220922FFB40828142022204120 +9114:1000203E7F22412441247F2840247FE440227FA200A2AAB4AAA800A005200220 +9115:2080211E23D24A524A54F3D4125822544BD2F8120A52139A1214225041D08010 +9116:00003F3E212221243F2400287FA440A47FA240A27FA240B47FA81220212040A0 +9117:1000087CFF4400487E4842507E480048FF448144BD44A568BD50814085408240 +9118:02003FDE22122F9222943FD422982F9422122F922A922F9A4A944F908A900990 +9119:1F00113E11221F2404247FE804243FA420A22EA22AA22EB420A83FA020A00020 +911A:2200223EFFA222247F2441287F2441247F220822FFA208341428222041208120 +911B:4900927C494400487F4849507F4849487F440844FFC41C682A50494088400840 +911C:0800043E7FA2522452247FA852A452A47FA2522252225BB4522852A09B201220 +911D:0000773E11225524332455280C243324C4A2182262220CB4712806201820E020 +911E:2200227CFFC422483E4808507F4849487F4408447F4408687F5008400F40F040 +911F:0800FFBE08227F2449247F2849247F2408A2FFA20222FFB4422822200A200420 +9120:7F00083EFFA288A46B2408286B2400247F220022FFA220343F2801200A200420 +9121:10007F3E41227F2441247F2840247FA440227FA208A27EB41DA82A20C9200820 +9122:00007FBE042227242424FFA820243FA440227FA200A2AAB4AAA800A005200220 +9123:08007F3E22221424FFA400287F2441247F2241227F220834FFA8082008200820 +9124:7E00427C7E4442487E480050FF48A548FF4400447E4402683450084014406240 +9125:1000203E7F2241247F2441287F2440247FA240227FA200B4AAA8AAA080A00320 +9126:2000203E7FA2D52455245528FFA4552455225522FFA200346A28552095200020 +9127:0500723E12A2512421245EA880A43F24212221223F222134122807A078202020 +9128:49202A3E7F4449A85D106B2849461FF010101FF000003FF821083FF820021FFE +9129:00007F3E01223F2401247F28002477242522F7220222FFB4422822202A200420 +912A:1200FF9E12927F9252147FD422587F54A1D23F1221123F1A21143F1012102110 +912B:4100223E0022FFA488A4AAA89CA488A4FFA200227F2241347F2841207F204120 +912C:03C07C1E289215123F14211421183F94209220923FD2205A55545550A1500090 +912D:2200147CFF4414487F48555063485D4841447F440844FF681450224041408040 +912E:1000EFBEA4A294A4AAA4C92810247F2441227F2241227F3441287F2022204120 +912F:2200143EFFA208247F240828FFA449242A22FFA200227F34412841207F204120 +9130:0800493E2A22FFA42A24492888A44124412277A29122553427A8412081200120 +9131:0F00F83E49222A24FFA42A28492480A47F22492249227F34492849207F204120 +9132:0000F7BE94A294A4F7A400287F2449247F2249227F220834FFA8082008200820 +9133:00007F3E55225524772414287724552455227722552255347728542014A00FA0 +9134:1400557C36441448FF48225014487F4808447F440844FF681C502A4049400840 +9135:00007F3E41227F240024F7A894A4F7A408220822FFA21C342A28492088A00820 +9136:04000B1E30D2DF3200147FD455584E547FD200123F92209A3F9420903F902090 +9137:12007FBE52A27FA452A47FA800247FA400227FA240A27FB4212812200FA0F020 +9138:2200FFBE22227F24552455287F240024FFA290A23E22223452280C201820E020 +9139:FC004BBE78A24AA479244D28FAA40CA407A2F82228A24D341A282920C8A00820 +913A:0800043E7FA24A245F244A287FA444245F2255225F2255345F288020912020A0 +913B:2200F7BE2222F7A4552488A87F2408247F2249227F2249347F280820FFA00820 +913C:2200773E2222F7A42224552888A47F2441227F2241227F3441287F2022204120 +913D:04007FDE40125F9254945F9454985F9444125F9244127FDA5494AF5084103FD0 +913E:7F80083E3F2221243F2421287FA448A4252252A20E2210343F2851200E207120 +913F:2200FFBE222277245524772800247F2449227F2249227F340828FFA008200820 +9140:2200221EFF9222123E1441145D58D59455125552DD5240DA001454904A508A50 +9141:3E00421EFF9240927F944494771844543FD24212FF92489A7F941A102950C7D0 +9142:1080529E7BD29492FBF431945AD8949400123F922092249A24940B1010906050 +9143:00007FCE040AFFEA842A358A040C358A000A000AEEEAAAAAAAACAAA8EEE8AAA8 +9144:11007FDE11127BD24A547BD4141812143FD224127F92A41A3F9424103FD02010 +9145:44407FDE12123FD26214BFD422183FD422123FD220127FDA51546ED04A504ED0 +9146:2A007F3EAAA2FFA4AAA4FFA8AAA4FFA40022FFA200227F3441287F202220FFA0 +9147:52807BDE9492FBF231945AD494983F9420923F9220923F9A20943F9011102090 +9148:7BC0001E7BD24A526B544A5404187FD44A127FD24A527FDA52545B90525099D0 +9149:0000FFFE044004407FFC444444444844503C600440047FFC400440047FFC4004 +914A:0000FF80147E14107F105510551055105710611041107F10411041107F504120 +914B:101008100820FFFE044004407FFC44444844503C60047FFC400440047FFC4004 +914C:0020FE202820287CFE44AA84AA04AA44AE24C2148214FE0482048204FE288210 +914D:0000FE0028F82808FE08AA08AA08AAF8AE88C2808280FE8082828282FE7E8200 +914E:0008FE0828082808FEFEAA08AA08AA08AE48C2288228FE0882088208FE288210 +914F:0020FE20282028A0FEACAAB4AAE4ABA4AEA4C2B482A8FEA282A28282FE7E8200 +9150:0000FE7C28102810FE10AA10AA10AAFEAE10C2108210FE1082108210FE108210 +9151:0000FEFC28202820FE20AA20AA20ABFEAE20C2208220FE2082208220FEA08240 +9152:00004FFE20A020A007FC84A444A454A4151C2604E40427FC2404240427FC0404 +9153:010002800C603118CFE600400080FFFE04803FF82488287830083FF820083FF8 +9154:0040FE4029F82848FE88AA8AAB0AAA26AE20C22083FEFE2082208220FE208220 +9155:0008FE1C28F02810FE10AA1CAAF0AA10AE10C21E82F0FE1082128212FE12820E +9156:0010FE1028102810FEFEAA92AA92AA10AE28C2288228FE288248824AFE8A8306 +9157:0000FE4428442828FEAAAAAAAA92AA92AEAAC2AA82A6FEC682828282FEFE8202 +9158:0000FE7828482848FE48AA86AB00AAFCAE44C2448228FE2882108228FE448382 +9159:0008FE8828482848FE08AA88AA48AA48AE08C20E82F8FE0882088208FE088208 +915A:0008FE2828282828FE44AA44AA82AB7CAE24C2248224FE2482448244FE948308 +915B:0000FEFC28002800FE00AAFEAA50AA50AE50C2508250FE5282528292FE8E8300 +915C:0020FE20282028FCFE20AA20AA20ABFEAE20C2508250FE4882888284FF048202 +915D:0000FE00287C2800FE00AA00AAFEAA10AE10C2208220FE44824282FEFE428200 +915E:0020FE2028202820FE20ABFEAA20AA20AE20C2508250FE50828882C8FF248202 +915F:0010FF90141014107F1E551055105510577C614441447F44414441447F7C4144 +9160:0000FE0028FE2804FE04AAF4AA94AA94AE94C29482F4FE9482048204FE148208 +9161:0020FE10281028FEFE82AA84AA40AA44AE48C2508260FE4282428242FE3E8200 +9162:0040FE402840287EFEA0AAA0AB20AA3CAE20C2208220FE3E82208220FE208220 +9163:0044FE4428442844FEFEAA44AA44AA44AE44C27C8244FE4482448244FE7C8244 +9164:0010FE1028102810FEFEAA10AA10AA10AE7CC2448244FE4482448244FE7C8244 +9165:0004FE1E28F02810FE10AA10AAFEAA10AE38C2348254FE5282908210FE108210 +9166:0020FE2828A428A0FEFEAA40AA40AA7CAEA4C2A482A8FEA882908328FE448282 +9167:0020FE1028FE2882FF0CAA08AA08AAFEAE08C2488228FE2882088208FE288210 +9168:082008287F240820FFFE0020FFA414247F245528632841107F12412A7F464182 +9169:0020FE20287E2882FF44AA28AA10AA20AE40C2FE8342FE4282428242FE7E8242 +916A:0020FE20283C2844FEA8AA10AA28AA44AE82C27C8244FE4482448244FE7C8244 +916B:0010FE1028282828FE44AA82AA7CAA10AE10C210827CFE1082108210FEFE8200 +916C:0004FE4428542854FE54AA54AADCAB74AE54C2548254FE5482548254FE848304 +916D:0020FE2028FE2820FE40AA7CAA44AAC4AF7CC2448244FE7C82448244FE44824C +916E:0000FEFE28822882FEBAAA82AA82AABAAEAAC2AA82AAFEBA82828282FE8A8284 +916F:0080FE82288C28F0FE82AA82AA7EAA00AEFCC2848284FEFC82848284FEFC8284 +9170:0010FE502850287CFE90AA10AA10AAFEAE28C2288228FE28824A824AFE868300 +9171:0840488029FC1A482830C9C00800FFFE04803FF82488287830083FF820083FF8 +9172:0000FE7C28442844FE44AA7CAA00AA00AEFEC2108210FE7C82108210FEFE8200 +9173:0020FE4428F82810FE24AAFEAA02AAFCAE84C2FC8284FEFC82848284FE948288 +9174:0010FE1028282828FE44AABAAA10AA10AEFEC2108258FE5482928312FE508220 +9175:0020FE2229FA2824FE24ABFEAA10AA20AFFCC2888310FEFE82108210FE508220 +9176:0040FE40287E2880FF7CAA44AA64AA54AEFEC24482A4FE9482FE8204FE288210 +9177:0010FE502850287CFE50AA90AA10AAFEAE00C200827CFE4482448244FE7C8244 +9178:0010FE1028202844FEFEAA28AA44AAA2AE3CC2448244FEA882108228FE448282 +9179:0004FE1E28E02822FE92AA54AA40AA08AFFEC2088288FE4882488208FE288210 +917A:0014FE1228FE2810FE10AAFEAA92AA92AEFEC2928292FEFE82928292FE928286 +917B:000EFEF028222892FE54AA00AA7CAA08AE10C21082FEFE1082108210FE508220 +917C:0020FE1029FE2820FE48AA84ABFEAA02AEA8C2A882A8FEA882A882AAFF2A8206 +917D:0000FEFE282828AAFE6CAA28AAFEAA80AE80C2808280FE8082808300FF008200 +917E:0000FBFE20002000FBDEAA52AA52AA52DB5A8AD68A52FA528A528A52FA528AD6 +917F:0020FE1028FC2884FE84AAFCAA84AA84AEFCC2A282A4FE9882908288FEC48282 +9180:0050FE48288028FEFF90AA90AAFCAA90AE90C2FC8290FE90829082FEFE808280 +9181:0000FEFC28042804FE7CAA04AA04AAFEAE10C2928254FE3882548292FE508220 +9182:0048FE4828482848FEFEAA48AA48AAECAEDCC35A8248FE4882488248FE488248 +9183:0020FE2029FE2850FEA8AB26AAF8AAA8AEA8C2F882A8FEA882F882AAFE22821E +9184:0040FE4028FE2882FF42AA7AAAA2AA22AFFEC22282AAFEAA82FA8202FE148208 +9185:0020FE1028FC2800FE84AA48AA00AAFEAE00C20082FCFE8482848284FEFC8284 +9186:0028FE24282E28F0FE28AA12AA2AAAD6AE28C22E82F0FE2482288212FE2A82C6 +9187:0020FE1028FE2800FE7CAA44AA7CAA00AE7CC2088210FEFE82108210FE508220 +9188:0020FEA228A22924FE50AA88AB04AA22AE20C2A482A4FF2882508288FF048202 +9189:0040FE2029FE2800FE88AA88AB54AA22AE00C22083FEFE2082208220FE208220 +918A:0000FEEE282228AAFE44AAAAAB12AA00AEEEC22A82AAFE4A824482A4FF2A8210 +918B:0048FE48284829FEFE48AA48ABFEAA00AEFCC2848284FEFC82848284FEFC8284 +918C:0000FEFC28842884FEFCAA84AA84AAFCAE00C2908292FEF482988292FED2828E +918D:0000FE7C2844287CFE44AA7CAA00ABFEAE10C210825EFE50825082B0FE9E8300 +918E:0008F80C200A23FEFA08AA08AAE8AA0ADA0A8AEC8AACFAA88AEA8A1AFA268C42 +918F:0020FE2028FA2824FE28ABFEAA20AA40AEFCC3448244FE7C82448244FE7C8244 +9190:0100F93C212427E4F924A93CA924ABA4DAA48ABC8AA4FAA48BA48844F8548888 +9191:0000FEFC28142850FE5CAA50AA7EAA80AE7CC244827CFE44827C8244FE44824C +9192:0000FE7C2844287CFE44AA7CAA10AA50AE7CC2908210FE7C82108210FEFE8200 +9193:0010FE1028FE2892FE92AA28AA28AA4AAE86C30082FEFEAA82AA82AAFEAA83FE +9194:0620382008A47EA819202C504A880904FFFE04403FF82848303827C820083FF8 +9195:0020FE1029FE2800FE7CAA44AA7CAA00AEFEC2828282FEFE82828282FEFE8282 +9196:0000FE7C28442844FE7CAA44AA44AA7CAE00C2FE82AAFEAA82AA82AAFFFE8200 +9197:0008FEEC282828AAFE44AA44AA84AB7AAE28C22882FEFE288228824AFE4A8286 +9198:0010FE10287E2810FE10AAFEAA20AA42AEFEC20082FEFEAA82AA82AAFFFE8200 +9199:0050FE9628922892FED6AA92AA92AAFEAE10C2FC8244FE4482288210FE2882C6 +919A:0008FE4A292A28ACFE88AA3EAA08AB98AE9CC2AA82CAFE8882888340FE3E8200 +919B:0044FE4428FE2844FE10AA28AA44AA82AE7CC2108210FE7C82108210FEFE8200 +919C:0010FE2028FE2892FE92AAFEAA92AA92AEFEC2208224FE5A825E8290FE92830E +919D:0044FE24282828FEFE10AA7CAA10AAFEAE20C220827CFE5082908310FEFE8200 +919E:0000FE7C28542854FE6CAA44AA7CAA00AE00C2FE82AAFEAA82AA82AAFFFE8200 +919F:08202AA44D28145022887FFE4002BFF404803FF82488287830083FF820083FF8 +91A0:0010FE10287C2854FE54AAFEAA28AA44AE82C30082FEFEAA82AA82AAFFFE8200 +91A1:0040FE2029FE2902FE50AA88AB44AA40AEFEC320823CFE20823E8220FE208220 +91A2:0020F82023FC2040F880A9F8AA88AC88D8F8880089FCF95489548954FBFE8800 +91A3:0020FE1028FE2890FEBCAA94AAFEAA94AEBCC29082BCFEA482A482A4FEBC8324 +91A4:083E4BC42A4829281BFE2908C8A80810FFFE04403FF82848303827C820083FF8 +91A5:0000FEFE282828FEFEAAAAAAAAFEAA00AE7CC20082FEFE1082548292FE508220 +91A6:0010FE20284428FEFE44AAAAAAEEAA10AE28C25482AAFE5082248248FE108260 +91A7:0000FBFE2200227CFA44AA44AA7CAA00DAEE8AAA8AAAFAAA8AEE8A00FBFE8800 +91A8:0020FE1028FE2828FE92AAAAAA82AAFEAE10C2FE82A2FEAA82BA8282FE8A8284 +91A9:0028FE2828FE2828FEFEAAAAAAFEAAAAAEFEC200827CFE44827C8244FE7C8244 +91AA:0000FEEE282228AAFE66AAAAAA10AA28AE44C3928220FEC8823282C4FE1882E0 +91AB:7F7848485E8664785F484A307F480084FFFE04403FF82848303827C820083FF8 +91AC:0440247C3CA805507C2825FE44888058FFFE04403FF82848303827C820083FF8 +91AD:0028FEAA286C2828FEFEAA44AA28AAFEAE10C27C8210FEFE82108228FE448282 +91AE:0028FE242840287EFEC8AB48AA7EAA48AE48C27E8248FE48827E8240FEAA832A +91AF:0040F82023FE2040F884A9FEA8A8A8AAD9268A0089FCF95489548954FBFE8800 +91B0:0000FEFE282828FEFEAAAAFEAA00AA7CAE44C27C8244FE7C821082FEFE108210 +91B1:0024FBA820922514FA08AC04ABBAA8A8D8C68B808A3CFB8488A88890FAA88944 +91B2:0028FEFE28AA28FEFEAAAAFEAA00AAFEAE80C2BE8280FEFE82A882AAFEA48332 +91B3:0000FEFE28AA28FEFE10AAFEAA10ABFEAE44C22882FEFE1083FE8210FE108210 +91B4:0028FEFE28AA28FEFEAAAAFEAA00AAFEAE00C2FE8282FEFE82448228FEFE8200 +91B5:0040F87C204023FEFA42AA78ABC4AA3CDA008BFE8A40FBA48A588DB4FC5289B0 +91B6:0010FE1028282844FE82AA7CAA00AAEEAEAAC2AA82EEFE44824482AAFEAA8312 +91B7:0010FEFE28442828FEFEAA00AA7CAA44AE7CC244827CFE2082948342FE44823C +91B8:0020FE1029FE2848FE84AB4AAAFCAA48AEFCC24883FEFE5482C88354FE628240 +91B9:0000FE7C281028FEFE92AA54AA10AA54AE00C2FE8210FEFE82AA82AAFEAA8286 +91BA:001CF9E0202023FEF820A9FCA9ACA974D9FC882089FCF8208BFE8800F9548A2A +91BB:0020FBFE202021FCF800ABFEA802A9FCD8208BFE8800FBFE88048BBEFAA48B8C +91BC:0110F91027FC2110F9F0AA08AAEAAEACDAA88AAA8EEAFA0688008AA4FA528C52 +91BD:0000F9FC202023FEFA22A9ACA820A9ACD8008BEE8AAAFAAA8AAA8AAAFBEE8AAA +91BE:0040F82023FE2248FBFEAA48AAECAB5ADA488B248AA8FBFE8A708AA8FD268820 +91BF:0020FBFE224823FEFA48AAECAB5AAA48DA208A448A78FA148AFE8A10FA548CB2 +91C0:0010FEFE280028EEFEAAAAEEAA44AAFEAE44C2FE8244FEFE825082CAFF648242 +91C1:2FEC48246BAC48246BAC4AA4FFFE92921D7010101FF004401830EFEE04201860 +91C2:001EFBE021222094FBFEAA52ABFEA804DBC48A7E8BC4FA548BCC8A84FAD48B48 +91C3:03DEF80023DE2252FB5AAA52A820ABFEDA508BFE8A52FBFE8A928ADCFA928CCE +91C4:0020FBFE224823FEFA48AAECAB5AAA48DA508BDE8A50FBDC8A508BDEFA508C50 +91C5:03DEFA5223DE2000FBFEAA00AAC8AA4EDBEA8AB28AEAFAAA8AEA8AB4FDE4882A +91C6:001000F83F00010011100910092001007FFC03800540092011102108C1060100 +91C7:001000F83F00020011100910082001007FFC03800540092011102108C1060100 +91C8:0C00F1FC1104550439041104FDFC112031203920552051109110110812041402 +91C9:0C20F0201020542039FC1124FD241124312439FC552451249124112411FC1104 +91CA:0C00F3FC1104548838501020FCD81326302039FC5420502093FE102010201020 +91CB:0C00F1FC115455FC382011FCFC2013FE3088385055FC502093FE102010201020 +91CC:00003FF8210821083FF8210821083FF8010001003FF8010001000100FFFE0000 +91CD:001000F83F000100FFFE01001FF011101FF011101FF001003FF80100FFFE0000 +91CE:00007F7C490449287F104908497E7F12081408107F10081008100F10F0504020 +91CF:00001FF010101FF01010FFFE00001FF011101FF011101FF001001FF001007FFC +91D0:08203E7E08A47F281C102A2849443FFE20002FF828882FF828884FF840809FFC +91D1:0100010002800440082010102FE8C10601003FF80100111009100920FFFE0000 +91D2:10001000280024004200BC0010001000FE0010009400580050001E00F0004000 +91D3:10801080288024804280BC8010801080FE8010809480588450841E84F07C4000 +91D4:1000100028FE24044208BC1010201020FE4010409480588250821E82F07E4000 +91D5:100011FC280424084210BC2010201020FE2010209420582050201E20F0A04040 +91D6:1000100029FC24444244BC4410441044FE4410449444588450841F04F2284410 +91D7:10041004280424444244BC4410441044FE4410449444580450041E04F0144008 +91D8:100010002BFE24204220BC2010201020FE2010209420582050201E20F0A04040 +91D9:10401040284024404240BC5010481044FE4410409440584050401E40F0404040 +91DA:108010802880248043F0B89010901090FC9010909490589251121D12E20E4400 +91DB:102010202820242042FCBC2410241024FE2410449444584450841E84F1284210 +91DC:044008201850248803000CC03030C00E1FF0010001003FF80100111009207FFC +91DD:10201020282024204220BC2013FE1020FE2010209420582050201E20F0204020 +91DE:10801040284024204220BC2010201050FE5010509448588850881E84F1044202 +91DF:10001010289024904090B89010901090FC9010909508590851081E04E2044402 +91E0:100010F0289024904290BC9010901090FE9010909490589250921F12F10E4200 +91E1:0820101021084284044008203018CFE6010001003FF8010011100920FFFE0000 +91E2:1000100029FC24444248BC481050105EFE4210429482588250821F02F1144208 +91E3:104010402840247C4284BC8411041044FE2410249404580450041E04F0284010 +91E4:08040804140822104120BE44080408087F10082249422A0408080F10F02040C0 +91E5:10201020282024204020B8A810A410A4FD2211229622582050201C20E0A04040 +91E6:1000100028FC24844284BC8410841084FE8410849484588450841EFCF0844000 +91E7:11041124292425244124B92411241124FD2411249524592451241E24E2044404 +91E8:100010FC280424084210BC20102011FEFE2010209420582050201E20F0A04040 +91E9:100011F0291025104110B91011901150FD5011109510591251121E12E20E4400 +91EA:100010FC282024204220BC20102011FEFE2010209420582050201E20F0A04040 +91EB:100010FC280024004200BDFE10401040FE8010FC9404580450041E04F0284010 +91EC:100010FC282024204220BC20102011FEFE2010209420582050201E20F0204020 +91ED:1000100028FC24204220BC2010201020FE2010209420582050201E20F1FE4000 +91EE:101010102810241043FEBC1010301030FE5010509490591050101E10F0504020 +91EF:104010202820240043FEBC8010801080FE8010809480588050801E80F0FC4000 +91F0:1000100029FC24244024B8A410A410A4FD2410249424584450441C84E1144208 +91F1:10201020282024204220BDFE10201020FE2010509450585050881E88F1044202 +91F2:1000100028FC24844284BC84108410FCFE8410809480588250821E82F07E4000 +91F3:10401040288024FE4100BA0010FC1008FC1010209440588051021D02E0FE4000 +91F4:1050104828482440425EBDE010401040FE4010409420582250121E0AF0064002 +91F5:100011F8288824C842A8BCA810881050FE5010509420582050501E88F1044202 +91F6:1020102028202520412CB934116413A4FD2411349528592251221D02E0FE4000 +91F7:10201020282024204020B82011FC1020FC2010209420582050201C20E3FE4000 +91F8:104010402840247C4244BC8410C41124FE1810089410581050201E40F0804100 +91F9:104010402840244043FEB88810881088FC8811089490585050201C50E0884304 +91FA:1008103C29E024204020B820102013FEFC2010209420582050201C20E0204020 +91FB:104010402840244041F8B84810481048FD4810C8944858A850AA1D0AE2064402 +91FC:1000100029FC24444044B94410C41044FC641054944C588650841D04E2284410 +91FD:1008101C29F025504150B95011501150FD5011489548594851441E44E2424400 +91FE:100011FE280824884088B888110811FEFC1810289448588851081E08E0284010 +91FF:1004100E28F024804280BC8010FE1088FE8810889488588850881F08F1084208 +9200:1000100029FC25244124B92411241124FDFC11009500590051021D02E0FE4000 +9201:10401020282025FE4240BC401040107CFE4410449444584450841E84F1284210 +9202:10201020282025FE4122BA2410201020FC5010509450585050901C92E112420E +9203:100010FC284824484248BC48104811FEFE4810489448584850481E48F0884108 +9204:10081088284824484208BC8810481048FE08100E95F8580850081E08F0084008 +9205:100010FC288424844284BCFC10841084FE8410FC9484588450841E84F1144208 +9206:10081048284824484044B88410A41122FC2010409440584850841DFEE0824000 +9207:102010202820242041FCB82010201020FDFE10209450585050881C88E1044202 +9208:1000100029FE24104210BC2010201068FE6410A29522582050201E20F0204020 +9209:10201020282025FE4122B92211221122FD52114A958A590251021D02E10A4104 +920A:10001040282024104050B84010401144FD42114295425A4450441C44E03C4000 +920B:10A010A028A025244124BB2815301120FD6011A09520592251221D22E11E4100 +920C:10201020282025FC4024B82410241024FDFE10209450585050881C88E1044202 +920D:10201020282025FE4020B92411241124FD2411FC9424582050221C22E01E4000 +920E:10801080288024FC4104B90412441044FC8410A4951459F450141C04E0284010 +920F:100411E4282424244024B9E411041104FD0411E49424582450241C24E1444084 +9210:10201020285024504088B94412221020FC0011FC9404580850081C10E0104020 +9211:1008101C29E025004100B9FC11441144FD4411289528591051101E28E2444482 +9212:100013FC288424884088B890109C1084FD4411449528592852101E28E4444182 +9213:1008103C29E024204020B820102013FEFC2010209420582050201C20E1FC4000 +9214:10201020282024A842A4BCA211221120FE2410249428580850101E20F0C04300 +9215:100011F8284824484048B848104811F8FC8810889488588850881C88E3FE4000 +9216:10101090289024884108B904120415FAFC8810889488588851081D08E2284410 +9217:10401040288024884104BBFE10021090FC9010909490589051121D12E20E4400 +9218:10201020282025FE4020B820102011FCFC8410889448585050201C50E1884606 +9219:102010202820243E4220BC20102011FCFE8410889448585050201E50F1884606 +921A:10101110291025124112B91411D81110FD1011109510591251521D92E10E4000 +921B:1048104428442440425EBDE010401044FE4410489430582250521E8AF1064002 +921C:104010402840244043FEB84010801090FC90112095205A4852441C84E1FE4082 +921D:101010102890249042FEBC9011101010FE1011FE9410581050101E10F0104010 +921E:10401040288024FC4104BA0410841044FC4410149424584451841C04E0284010 +921F:100011FC282424244224BDFC11201120FF2011FE94225822502A1E24F0204020 +9220:100010F8288824884288BD06120011FCFE8410849448585050201E50F0884306 +9221:102010202820242041FCB92411241124FD2411FC9524582050201C20E0204020 +9222:102010202820242041FEB82010701070FCA810A89524592452221C20E0204020 +9223:100010FE281024104290BC9E10901090FE9010FE9402580250021E02F0144008 +9224:1000100028FC24844284BC8410841084FEFC10849484588450841E84F0FC4084 +9225:102010202820242442A4BCA410A81120FE2010509450585050881E88F1044202 +9226:10201020282024204220BDFE10201020FE2010509450585050881EC8F1244202 +9227:10401020280025FC4000B80010F01090FC9010909490589250921D12E10E4200 +9228:1000100029FC24004000B80013FE1090FC9010909490589051121D12E20E4400 +9229:10201010281024FE4282BC82108210FEFE8210809480588050801F00F1004200 +922A:100011FE290025004178B94811481148FD4811689550594251421D42E23E4400 +922B:10401020282025FE4288BC8810881088FE5010509420582050501E88F1044202 +922C:100010FC288424844284BC8410FC1090FE9010909490588850881E84F1044202 +922D:088008882E9028E028842E84F17C06C01830EFEE01003FF809200540FFFE0000 +922E:100011FC290425044104B9FC11001140FD4411489570594051421E42E23E4400 +922F:10201020292425244124B92411FC1020FC2011249524592451241D24E1FC4004 +9230:10401020280025FE4020B82011FC1124FD2411249524592451341D28E0204020 +9231:100011FC290425044104B9FC11201120FDFE11209520591051121D4AE1864102 +9232:1008101C29F025504150B95011501150FD5011489548596851541E74E2524400 +9233:100010002BFE24084008B9E811281128FD28112895E8592850081C08E0284010 +9234:10201020285024504088B92412121010FDFC10049408588850501C20E0104010 +9235:100011FE282024204020B9FE11221122FD52114A958A590251021D02E10A4104 +9236:10201020282024404248BC8411FE1082FE0010FC9484588450841E84F0FC4084 +9237:102010202820242043FEB82010201020FDFC11049504590451041D04E1FC4104 +9238:105010482848244043FEBC401040107CFEA410A494A8592851101E28F0444082 +9239:10101010281025FE4112B914111011FCFD4411449528592851101E28E2444482 +923A:1000100029FC24204020B82010201020FDFC10209428582450241C20E3FE4000 +923B:100010FC288424844284BC8410FC1080FE8010FE9482588250821E82F0FE4082 +923C:10801080288024FE4340BD401240107CFE4010409440587E50401E40F0404040 +923D:10201020282025FE4040B850109010FEFD92129294925892509A1C94E0104010 +923E:102010202820242041FCB92411241124FD2411FC9524592451241D24E1FC4104 +923F:1000100029FC25244124B92411241124FDFC11249524592451241D24E1FC4104 +9240:100011FC292425244124B9FC11241124FD2411FC9524582050201C20E0204020 +9241:10201020285024884104BA1210201040FD8810109420584451881C10E0604380 +9242:10201020282025FC4124B924112411FCFD241020952058C050401CA0E1184206 +9243:10401040288024FC4120BA2010201020FDFE10209450585050881C88E1044202 +9244:102010202920252041FCB92012201020FDFE10209450585050881C88E1044202 +9245:100010FE288024804280BCFC10841084FE84108494FC588050801E80F0FE4000 +9246:1020102028202420403EB82010201020FDFC11049504590451041D04E1FC4104 +9247:1080108028FE250042207D20912C11747BA411249534592851221D02E0FE4000 +9248:10201010281025FE4102BA0410801088FC9010A094C0588250821C82E07E4000 +9249:10201010281025FE4020B82010441084FDF810109420584450821DFEE0824000 +924A:100011FC284424444044B84410941088FD0010FC9484588450841C84E0FC4084 +924B:1080108029FC25044204BDF411141114FD1411F49504592851121D02E0FE4000 +924C:101C11E0282024204020BBFE10201070FC7010A894A8592452221C20E0204020 +924D:10401020282824084008B84810541152FD5211609660584450C41D44E23C4000 +924E:102010202920252041FCB92012201020FC2011FC9420582050201C20E3FE4000 +924F:100010F8288824884088B8F810881088FC8810F89488588850881C88E3FE4000 +9250:100010002BFE24204020B840104010FCFD8412849484588450841C84E0FC4084 +9251:10101010282024FC4284BC8410841084FEFC10849484588450841E84F0FC4084 +9252:10401020280025FE4020B82010201020FDFC10209420582050201C20E3FE4000 +9253:10801080288024FE4120BA20102011FCFD2411249524592451341D28E0204020 +9254:100011FE291025104110B97C11541154FD5411549554595C51101D10E1FE4000 +9255:100010FE2880248042BCBCA410A410A4FEA410A494BC58A450801E80F0FE4000 +9256:10401040287C24844188BA5010201050FC8813069460581050081CC0E0204010 +9257:108810882888248843FEBC8810881088FE8810F89488588850881E88F0F84088 +9258:10501050285025FC4054B85411FC1150FD5011FE94525852505A1C94E0904110 +9259:1000100029FC25044104B90411041104FDFC11049400589050881D04E2024402 +925A:20002080531E4A5282527A5222522252FA5222D22B5AB25460903890E1100210 +925B:100010F8288824884088B88811061200FC0010FC9484588450841C84E0FC4084 +925C:1088108828882508417EBB0815081148FD2811289508590851081D08E1284110 +925D:102010102810240041FEB80010041084FC8410489448584850501C10E1FE4000 +925E:202820245024482083FE7A2022242224FA2422282A28B29063123A2AE0460082 +925F:100010FE281024104220BC2010681064FEA211229420582050201E00F1FE4000 +9260:10201020282025FC4124B92411241124FD2413FE9420585050501C88E1044202 +9261:10201020292424A440A8B82011FC1020FC20102097FE582050201C20E0204020 +9262:102010202820242043FEB82010701070FCA810A895245AFA54201C20E0204020 +9263:10201020282025FC4020B820102013FEFC2010209440584850841DFEE0824000 +9264:10801080290025FC4204BC0411E41124FD24112495E4592450041C04E0284010 +9265:102010282824242041FCB82010701070FCA810A89524592452221C20E0204020 +9266:1000100029FE24104010B81010901090FC9E10909490589050901C90E3FE4000 +9267:100010FC288424A44094B884108413FEFD0411449524590451FE1C04E0284010 +9268:10801080288024FE4102B90412201020FCA810A49524592252221C20E0A04040 +9269:10201020285024504088B90412221020FCA810A49524592252221C20E0A04040 +926A:102410A428A424A442A4BDFE10A410A4FEA410A494BC588050801E80F0FE4000 +926B:110011002900251C43D4B95411541154FD5411549554595451541E5CE3544480 +926C:100011FC290425044104B9FC11041104FD0411FC9504590451041D04E1FC4104 +926D:1000100028FC24844284BC8410FC1084FE84108494FC588450001E00F1FE4000 +926E:10201020282025FC4124B924112411FCFD241124952459FC51241C20E0204020 +926F:10081048292825284128B90811081108FD0811089548599451141C22E0424082 +9270:100011FC2804240443F4B804100411E4FD241124952459E450041C04E0144008 +9271:10201010281025FE4100B91011101110FD1011209528592452441EFEE4424800 +9272:102010202820243C4220BC20102011FEFE2010209428582450221E20F0204020 +9273:10901090289024904090BB9210941098FC9010909490599252921C92E08E4080 +9274:04402440247C24902488250802800C603018CFE601003FF8092005407FFC0000 +9275:10201020282025FC4124B92411241124FDFC11249420582850241DFEE0824000 +9276:100213E22942254A414AB94A114A13EAFD4A114A954A594A51421E42E24A4444 +9277:104810482848244841FEB84810481048FC4811FE9400584850441C84E0824102 +9278:10401020282025FE4000B88811041202FC8810889450585050201C50E0884306 +9279:10201020287C24844148B83010201048FD90103E944259A450181C10E0604180 +927A:100013FE2888248840F8B888108810F8FC881088948E5BF850081C08E0084008 +927B:10401040287824884150B82010501088FD0610F89488588850881C88E0F84088 +927C:110410842888240041FEB88810881088FC8813FE9488588851081D08E2084408 +927D:201020145012481083FE7810201021D0F89020902890B08860EA3B8AE0060002 +927E:102010202848248441FEB81210901090FCFE1110941059FE50101C10E0104010 +927F:10201020285024884104BA0211FC1000FC0011FC9504590451041D04E1FC4104 +9280:100011F82908250841F8B908110811F8FD4411489530592051101D48E1864100 +9281:10401040288024FE4102BA0211F21112FD1211F29512591251F21C02E0144008 +9282:10821092289224924092B89212DA12B6FC9210929492589250921D12E1024202 +9283:10401020282025FE4040B888110411FEFC9210909490589051121D12E20E4400 +9284:10201020284025FC4104B90411741154FD5411549554597451041D04E1144108 +9285:100011FC290425044174B90411041174FD5411549554597451041D04E1144108 +9286:100013FE282024204040B9FC11041104FD0411FC9504590451041D04E1FC4104 +9287:1020102029FE24204020B8FC10201020FDFE107094A858A851241E22E4204020 +9288:1020102029FC24204020B82013FE1000FC20102095FC582050201C20E3FE4000 +9289:1020102029FC242443FEB82411FC1020FC2011FC9420582053FE1C20E0204020 +928A:202820245024482083FE7A2022242224FA2423A82A28B21062123C2AE4460882 +928B:10801088289C25704110BB1015101110FDFE11109510591051101D10E17C4100 +928C:10201020282025FE4040B84010BC1084FD88128894FE588850881C88E0A84090 +928D:100011FE282024404088B90411FE1022FC20102095FE582050201C20E3FE4000 +928E:00007DF01110119011521D12E20E450006C01830EFEE01003FF811100920FFFE +928F:100011DC295425544154B954115413FEFD5411549554595451541ED4E224444C +9290:00047F8408241F24212452240C243104C6CC1830EFEE01003FF811100920FFFE +9291:10201120292025FC4120BA20102013FEFC9010909490589051121D12E212440E +9292:100011DC288824884088B888108813DEFC8810889488588850881D08E1084208 +9293:10201020285024884104BA0211FC1020FC20102095FC582050201C20E3FE4000 +9294:100013FE281024204068B8A413221020FC00102094205BFE50201C20E0204020 +9295:102010202BFE242041FCB82411FC1120FDFE1022942A585450501C88E1044202 +9296:10201120292025FC4120BA20102013FEFC7010A894A8592451241E22E0204020 +9297:1008101C29E025004100B9FE11001100FD7C11449544594451441E7CE2444400 +9298:1040104028FC25044288B85010201040FC8011FC9684588450841C84E0FC4084 +9299:2020202053FE48508088790422FA2000FBFE20402880B1FC60043804E0280010 +929A:105010502850255242D4BC5810501058FED411529450585050921E92F112420E +929B:1008103C29E024204020BBFE10201020FC2011FC9504590451041D04E1FC4104 +929C:11001100229C424084201BC0213E6108AFC8210829482588250821C82E282410 +929D:109010902890251041FEBB1015101138FD3811549554599251101D10E1104110 +929E:10001FF820085FC890481FC810481FE8011006C01830EFEE01003FF80920FFFE +929F:101010922892249242FEBC0010101010FEFE10929492589A50941E10F0104010 +92A0:10401040284425F44048B85013FE1040FC801184969858E050821C82E07E4000 +92A1:10201020282027FE4020B82011FC1000FC0011FC9504590451041D04E1FC4104 +92A2:200021FC5000480083FE780020202022FBB220B428A8B12861243A24E4A20040 +92A3:210021005100491E87D27A5222522252FA5224922A92B11262923A5EE4520800 +92A4:10201020292424A440A8B820102013FEFC7010A894A8592451241E22E0204020 +92A5:10401020282025FE4040B84010A010A2FDA412989490588850881CA4E0C24080 +92A6:100011FE290225224122B92211FE1122FD221152954A598A51021D02E1FE4102 +92A7:104010442A4425484150B84017FE1090FC9010909490589251121D12E20E4400 +92A8:10401020282027FE4202BC44104013FEFC881088950858D050201C50E0884304 +92A9:1008103C29E024204020B9FC10201020FC2013FE9420584050881D04E3FE4102 +92AA:1020102029FE24404240BCFC10841184FEFC1084948458FC50841E84F0944088 +92AB:1080108028F825084210BDFC11241124FD2411FC9500590051021D02E0FE4000 +92AC:1040104429F424484050BBFE10401080FDFE1240948058FC50041C04E0284010 +92AD:10281024283E25E04220BC3C11E01020FE3E11E09422582450181E6AF1864002 +92AE:02000100FFFE0440145024484444010006C01830EFEE01003FF811100920FFFE +92AF:102010202848248841F0B82010401088FDFC1024942058A851241E22E0A04040 +92B0:1088108829FE24884088B80011041104FC8810889450582050501C88E1044202 +92B1:100010F82888248840F8B820102011FCFD2411249524592451341D28E0204020 +92B2:100011FC290425FC4104B9FC10001000FDFC102094205BFE50201C20E0204020 +92B3:10101090288825084204BDFA11081108FD0811F89490589050901D12E212440E +92B4:080C08F07E8008800EFE78880888290816C81830EFEE01003FF811100920FFFE +92B5:1020104028F8248840F8B88810F8108AFC8C13F89418582850481C88E3284010 +92B6:102810242824242043FEB820112010B2FCB4106894A8592452221C20E0A04040 +92B7:10101092285224544210BCFE10821082FEFE1082948258FE50821E82F08A4084 +92B8:100013FE292025284128B9E811281128FD2811E89528592A513A1FEAE0264020 +92B9:101C11E02820242043FEB8A811241222FDF81088949058BE51021D02E2144408 +92BA:242024203DFC0420FC2024F8450006C01830EFEE01003FF809200540FFFE0000 +92BB:11081088289025FC4024B82411FC1120FD2011FE946258A2512A1E24E4204020 +92BC:1020102028A824A840A8B97412221020FC2011FC9420582050201C20E3FE4000 +92BD:101C13E02A20262043FEBA201290130AFE0611FA9508590851081D08E1F84108 +92BE:200021FC5020482083FE780020202022FBB220B428A8B12861243A24E4A20040 +92BF:100011F8280824D04020B9FC11241124FDFC1124952459FC51241D24E124410C +92C0:100011FE2800240042FCBC8410841084FEFC10009484584450481E00F1FE4000 +92C1:100010FC288424844284BC8410FC1000FE0011FE9502590251021F02F1FE4102 +92C2:1080108028FE250042FCB88410A41094FDFE10849524591451FE1C04E0284010 +92C3:1040102029FC25044104B9FC11041104FDFC11209522591451081D44E1824100 +92C4:100013FE282024A44128B85010881104FC0010FC9484588850501C20E0D84706 +92C5:1040102029FC24004088B85013FE1020FC20102095FC582050201C20E0204020 +92C6:108010FC7D04104410341CC4E11406C81830EFEE01003FF809200540FFFE0000 +92C7:100011FC2904250441FCB904110411FCFD04110495FC580050881C84E1024202 +92C8:101C09E0402024200BFE70501088110406C01830EFEE01003FF811100920FFFE +92C9:102010202BFE24204020B9FC11241124FDFC1020947058A851241E22E0204020 +92CA:10881084290226224020B85010881104FE0210FC9484588450841C84E0FC4084 +92CB:2004200E53B8488880887928212E23A8F8A822A82AA8B13E61003A80E47E0800 +92CC:2000200653B8488880887908213E2388F88822882A88B13E61003A80E47E0800 +92CD:2020202053FE482080207BFE22022404F9F820102820B3FE60203820E0A00040 +92CE:1020101029FE25024204B8F810001000FDFE10509450585050921C92E10E4200 +92CF:10201020282025FC4020B8A810A810A8FD7412229450585050881C88E1044202 +92D0:1040102029FE25024244B84011FE1040FC501090949058A051241D42E27E4422 +92D1:104010402888250443FEB80210881144FE4210F895885A5050201C50E1884606 +92D2:1040104028FC24884150B82010D81326FCF8102094F8582053FE1C20E0204020 +92D3:204220E25382488A808A788A23EA208AF98A21CA2AAAB28264823882E08A0084 +92D4:1080108028F825084210B9FC11241124FD2411FC9450585050901C92E112420E +92D5:2020202050204BFE80207820202021FCF840202028A4B282628A3A8AE4780000 +92D6:1004101E29E024224112B89410801020FDFE1044948459C850301C28E0C44302 +92D7:100010F82888248840F8B80011FC1104FD0411FC9504590451FC1D04E1144108 +92D8:100011FC2904250441FCB800100011FCFC20102097FE582050501C88E1044202 +92D9:100011FE2820242042FCBC44104411FEFE00100094FC588450841E84F0FC4084 +92DA:1040104024FE6488A55024202450218806C41830EFEE01003FF811100920FFFE +92DB:2020202051FC4924812479FC20202020FBFE22222A22B3FE62223820E0200020 +92DC:100011FC290425044104B90411FC1020FC201120953E592051201EA0E47E4800 +92DD:1004101E29E024224112B89410801008FDFE10089488584850481C08E0284010 +92DE:100011FE280024924124BA4811241092FC0011FE9420582050201C20E3FE4000 +92DF:100011FC280424FC4004B9FC100013FEFE0211F89488588850501C20E0D84306 +92E0:100011FE29002500417CB900110011FEFD5011529554594851481E44E2524460 +92E1:10201020285024884144BA2210F81008FC10102095FC590451041D04E1FC4104 +92E2:1008103C29C024044144B8A8100011F8FC10102097FE582050201C20E0A04040 +92E3:200027DE50924C9284947C9427D82094F99221922A92B29A64943890E2900110 +92E4:2008200853C84A48825E7A4A23CA224AFA4A23CA2A4AB24A626A3BD2E6120026 +92E5:100011FC290425044104B9FC10001000FDFE1020942059FC50201C20E3FE4000 +92E6:100011FC2904250441FCB900110011FEFD02117A954A594A527A1E02E4144008 +92E7:100011F82908250841F8B908110811F8FD08110895F8589050901D12E212440E +92E8:201020D85394489480907BFE20902094F89420D82B98B09060AA38CAE2860102 +92E9:1048104829FE24484248BC20101011FEFE8010809480588050801E80F0FC4000 +92EA:102810242BFE24204020B9FC11241124FDFC1124952459FC51241D24E124410C +92EB:03043C0404247FA40E2415246484050C06C01830EFEE01003FF811100920FFFE +92EC:101C11E0FD0011FC1D04F1681210312806C41830EFEE01003FF811100920FFFE +92ED:110410842888241041FCB90411041104FDFC10509450589050921D12E20E4400 +92EE:202820245024482083FE7A2022242224FBA422A82AA8B29062923DAAE4460882 +92EF:10201120292025FC4120BA20102013FEFC00100095FC590451041D04E1FC4104 +92F0:100011FC2924252441FCB924112411FCFC20102095FC582050201C20E3FE4000 +92F1:201020145012481083FE781020902050F84820082888B2A8629A3AAAE4660002 +92F2:1010103829C025004100B9FC11101110FD10111097FE580050901D08E2044402 +92F3:102010202BFE242041FCB84013FE1048FC8810FE9508594852281C08E0284010 +92F4:102010202BFE24204020B9FC11041104FD0411FC9450585050921C92E112420E +92F5:101C11E02820242043FEB8A811241222FC0010F89488588850881C8AE10A4206 +92F6:1020101029FE24204248BC8411FE1002FEA810A894A858A850A81EAAF12A4206 +92F7:200027E0525E4A5282527BD222522254FBD422542A48B2E867543854E0620040 +92F8:100011FC2904250441FCB910111011FEFD101110957C594451441D44E17C4244 +92F9:100010FC288024F84080B8F8108013FEFD4011249528591051081D44E1824100 +92FA:2040202053FE4A028504790021DE2252FA5223522C9AB09461103912E212040E +92FB:7E7C48047E4442287E1048287EC4010006C01830EFEE01003FF811100920FFFE +92FC:200023FE52024A8A82527BFE22222222FAAA22AA2AAAB2FA62023A02E20A0204 +92FD:10201020283E242041FCB90411FC1104FDFC112494205BFE50201C20E0204020 +92FE:1040104028FE24824142B87A10A21022FDFE102294AA58AA50FA1C02E0144008 +92FF:1020112428A424A84020B9FC11041104FD7411549554595451741D04E1144108 +9300:10201020285024884104BAFA100011FCFD54115495FC595451541D54E104410C +9301:100011FC2924252441FCB924112411FCFC2011FE947058A851241E22E0204020 +9302:1020102029FC24204020BBFE10881144FE4210F895885A5050201C50E1884606 +9303:102009FE4122252009FC110472681410112806C41830EFEE01003FF80920FFFE +9304:108010F82888250841F0B810101013FEFC201222957458A851241E22E0A04040 +9305:0640387C08947E241C442A94490806C01830EFEE01003FF809200540FFFE0000 +9306:102010202BFE242041FCB82013FE1000FDFC110495FC590451FC1D04E1144108 +9307:1080104029FC24004108B888109013FEFC00100095FC590451041D04E1FC4104 +9308:1020112428A8242041FCB84013FE1088FD0412FA9488588850A81C92E082407E +9309:101C13E02A2027FE4220BA92130A1206FDFC1104950459FC51041D04E1FC4104 +930A:1040102029FE24004088B88811541222FC00102095FE582050201C20E0204020 +930B:200023DE52524A5282527BDE22522252FA5223DE2A52B25262523A52E55208A6 +930C:102011242924252441FCB80011FE1100FD7C1110951059FE51101E10E2104410 +930D:1040108029FC25244124B9FC11241144FDFC109095105BFE50101C10E0104010 +930E:10401040287C24844108BA00102011CEFD02110295CE590251021D02E1FE4102 +930F:100013FE285024504050B9DC11041104FD0411DC9450585050501C50E3FE4000 +9310:10A01090288025FE4110BB1015FC1110FD1011FC9510591051101DFEE1004100 +9311:2040202053FC4A0482047BFC22002228FA2423FE2A20B25062503C88E5040A02 +9312:2000277E55044D048574755426542554F5542554A574755426043404C4140408 +9313:10881048285025FC4020B82011FC1020FC2013FE9450585050901C92E112420E +9314:102010222BB424A840A8B92412A21040FDFC1104950459FC51041D04E1FC4104 +9315:100011FC2904250441FCB904110411FCFC00111295D4591851101D52E192410E +9316:08000E7C08047F4408282A104928194406C01830EFEE01003FF811100920FFFE +9317:101C11E02820242043FEB8A811241242FC4013FE9488590850D01C30E0484184 +9318:2008203C51E0482083FE78A820A820A8FBFE20A828A8B3FE60203820E1FC0000 +9319:10921092292426484124B89210921000FDFE1122952259FE51221D22E1FE4102 +931A:1080108028F825084210B9FC10241024FDFE1024942459FC50241C20E0A04040 +931B:102010202BFE245040A8B92412FA1020FCA8108897FE588850881C88E1084208 +931C:202020205050488881447A2221F82008F850202028A4B282628A3A8AE4780000 +931D:2040202053FE4A02800079FC20002000FBFE20202928B12462223C22E0A00040 +931E:104010202BFE240041FCB90411FC1000FDFC100894105BFE50201C20E0A04040 +931F:102010A228A225244050B88813041022FC2010A494A4592850501C88E1044202 +9320:2040202053FE4A028404780023FE2020F8202120293CB12062A03A60E43E0800 +9321:1020102029FC24504088B90413FE1008FDE81128952859E851281C08E0284010 +9322:10481044285E25E04228BC12106A1196FE48105E95E0582450281E12F06A4186 +9323:200023DE5042494A8084794A22522420F80023DE2852B15260943948E2540422 +9324:108810882BFE24884288BCF810881088FEF8108894885BFE50001E88F1044202 +9325:104010202BFE24804104BBFE100211FCFD0411FC950459FC51041D04E1144108 +9326:1020104028FC248440FCB88410FC1020FC2011FE95225922512A1D24E0204020 +9327:1020101029FE25024204BCF810881088FEF81080948058FC50841E84F0FC4084 +9328:108810882BFE24884088B80011FC1124FD24112495FC592451241D24E1FC4104 +9329:10F81088288824F84088B88810F81000FDFC1104950459FC51041D04E1FC4104 +932A:10501050285025FC4154B954115411FCFD54115495545BFE50001C50E0884104 +932B:100010FC2884248440FCB884108410FCFC4010FE952A5A4A50921D22E04A4084 +932C:102010202BFE242041FCB92411FC1124FDFC1020947058A851241E22E0204020 +932D:100011FC292425244174B92411FC1104FD7411549554597451041E04E2144408 +932E:100011FC290425244124B9FC11241124FD7411549554597451041D04E1FC4104 +932F:10481048284825FE4248BC4811FE1000FEFC1084948458FC50841E84F0FC4084 +9330:10201020282025FE4020B87010A810A8FD2412229420580051541D2AE22A4000 +9331:010002800C603018DFF601003FF8111009207FFC00007EFE08103E7C08107EFE +9332:100011F82808240841F8B808100813FEFC201222957458A851241E22E0A04040 +9333:100011FC280824104020BBFE102010A0FC4011FC9554595451541D54E3FE4000 +9334:1020102029FC24204020BBFE10881104FE22102095FC582050201C20E3FE4000 +9335:108810882BFE24884088B85010501094FD941298949058B250D21C92E08E4080 +9336:2020202053FE4820802079FC20202020FBFE204028A4B1A862903C88E0C60080 +9337:20882088208857E8888873E822A823E8FAA823E82888B7E8608A388AE08A0086 +9338:2020202050204BFE8020792421242124FAAA207028A8B0A861243A22E4200020 +9339:10201120293C25204120BBFE100011FCFD0411FC950459FC51041D04E1144108 +933A:110811082BFE25084148B82013FE1080FC8010F89488588850881D08E1284210 +933B:2010201451D2481280107BFE20102090F89022D02A90B290628A3AEAE7060202 +933C:2020202053FE48508088790422FA2000F80023FE2820B12461223A22E0A00040 +933D:100013FE282024A44128B85010881144FC4010FC95845A8850501C20E0D84706 +933E:1004FF7828407F7E08480F48F888090806C01830EFEE01003FF811100920FFFE +933F:10201020283E242041FEB922113811E0FD22111E9500597852481E4AE48A4906 +9340:100011FC290425FC4104B9FC100011FEFC0813FE9408590850881C08E0284010 +9341:2010209057104C3E8422744427902510F5102510A528752825283944C9441082 +9342:10201020285024884104BA0210F81020FC2011FC9420592450A41CA8E3FE4000 +9343:2080208050FC4954825478A421242244F89421082840B0A462AA3A8AE4780000 +9344:104010202BFE24004000B9FC11041104FDFC10209528592452221C22E0A04040 +9345:221021102110547C8A1072102010217EF91022102E20B22462423AFEE2420000 +9346:200023DE52524A5283DE7A52225223DEFA0222022A02B20262023A02E20A0204 +9347:1110111229D425184152B992112E1040FDFC1104950459FC51041D04E1FC4104 +9348:108810882BFE248840A8B82011FC1124FD24112497FE582050501C88E1044202 +9349:100011FC2904250441FCB904110411FCFC0013FE94205920513C1D20E2A0447E +934A:102010202BFE242041FCB92411AC1174FD2411FC9420587050A81D24E2224020 +934B:100010F82888248840E8B8A810A811FCFD0411749554595451741D04E1144108 +934C:0020112049FC22200BFE10907092110E16C01830EFEE01003FF811100920FFFE +934D:2040202053FE4A4882487BFE22482278FA0022FC2A44B24862283C10E4680986 +934E:1008101C29F025104110B9FE1110117CFD44117C9544597C51441E44E27C4444 +934F:1020102028FC244441FEB80010FC1084FCFC102095FE582051201DFEE0204020 +9350:2000208852524A2282527A8A220223FEF88821442A7AB08861503820E0D80706 +9351:1040104028FE248041FCBA8410FC1084FCFC1040947C58C451281C10E0684186 +9352:100010FC2848243041FEB85210941110FE30102095FE587050A81D24E2224020 +9353:100010F82888248840F8B80013FE1088FCF8108894F85888509E1DE8E0084008 +9354:200023DE52524A5283DE780021FC2000FBFE20802900B1FC60043804E0280010 +9355:100013FE2A22242043FEB82011FC1124FDFC112495FC582053FE1C20E0204020 +9356:108810882BFE248840F8B88810F81088FC8813FE9500594851841D00E1FE4000 +9357:1040102029FC24004088B85013FE1222FC2411FC9524592451341D28E0204020 +9358:200223C252424A5283D27A52225223D2FA5222522BD2B00261823942E24A0404 +9359:1090089043FC2090089017FE7090110816C41830EFEE01003FF811100920FFFE +935A:100010FC288424FC4084B8FC100011FEFC8010FE952A5A4A50921D22E0544088 +935B:2080233852284A2883A87A462200227CFBA422242A28B3A866103A28E2440282 +935C:200023DE52424A4282427BDE2200223EFBD222122A14B3D462083A14E2240242 +935D:11FC1124292425FC4124B92411FC1020FC2013FE96225A2A52FA1E0AE2024206 +935E:10201020283E24204020B9FC110411FCFD0411FC950459FC50001C88E1044202 +935F:100011FC290425FC4104B9FC10201120FDFE1220942059FC50201C20E3FE4000 +9360:1020104028FC248440FCB88410FC1000FDFE1020942058FC50201C20E1FE4000 +9361:100011FC2924252441FCB924112411FCFC0013FE9520592251141D48E1844102 +9362:100010FE2800247C4244BC44107C1000FEFE1092949258FE50921E92F0FE4082 +9363:1048104829FE24484200BDFC10441044FE94110896FC588450841E84F0FC4084 +9364:1008103C29E024204020BBFE102010A0FD2C1124952459AC51241D24E1FC4104 +9365:1080109E2BEA248A41CAB88A13EA1092FCA6102097FE582050501C88E1044602 +9366:22102110211057BE8A28724823AA22AEFABA22EA2AAEB2A864AA3CA2E9A2101E +9367:1080108028FE25024242B9FA100211F2FC0211F2940259F251121DF2E0144008 +9368:101011D428582652418CB888110412FAFC20102095FE582050501C88E1044202 +9369:108810882BFE248840A8B82013FE1040FC8010FC95845A8450841C84E0FC4084 +936A:00207E20247E1884FF2829104A28994406C01830EFEE01003FF811100920FFFE +936B:0620382008A47EA819202C504A88090406C01830EFEE01003FF811100920FFFE +936C:208821C857084908812A712A27AC2148F3082388A554751429143124C1240142 +936D:108010BC2884250841FEBB201520117CFD90111095FE591051281D28E1444182 +936E:204020A051104A0885F6780023C42254FA5423D42A54B25463D43A44E25402C8 +936F:2080208050FC495482D478B4212C2244F89421082840B0A462AA3A8AE4780000 +9370:101E13E0284425244088B9FC10401040FDFE108094FC594451281E10E0684186 +9371:2048214851484BFE8148794821782100F9FE20202BFEB07060A83924E6220020 +9372:100011FC290425FC4110B9FE1110114AFD86100095FC590451FC1D04E1FC4104 +9373:3F2024203F3E21403F5024883F08010006C01830EFEE01003FF811100920FFFE +9374:102011242924252441FCB80013FE1020FC4011FC9554595451541D54E154410C +9375:20102010577C491481FE7214227C2710F17C2510A5FE721022103500C8FE0000 +9376:100011FC2924252441FCB924112411FCFC2010109454594251421D4AE2384000 +9377:102010202BFE24504088BB2611FC1020FC2013FE9400582051FC1C20E02043FE +9378:1080109E289225D24092B89E109211D2FD52115E9552595251D21C22E02A4044 +9379:104010202BFE26024404B9FC100011FCFD0411FC950459FC51041C00E3FE4000 +937A:1020102229FA24244028BBFE10201040FCFC1184968458FC50841C84E0FC4084 +937B:100011FC290425FC4104B9FC108011FEFE2211229552590251FA1C02E0144008 +937C:2008200C500A4BFE82087A0822E8220AFA0A22EC2AACB2A862EA3A1AE2260442 +937D:1040102029FE25024102B9FE11001100FDFE11AA96AA5AFE54AA1CAAE0A24086 +937E:1008103C29E0242043FEB82011FC1124FDFC112495FC582051FC1C20E3FE4000 +937F:1052105228A425FE42A4BC5210521000FEFE1092949258FE50921E92F0FE4082 +9380:1090109E28A225544108BB5415621140FD4411589542594451181D02E10C4130 +9381:20002FDE54924C928494779424982494F7922492A49275DA2E943090C0900090 +9382:110410882BFE24204020B9FC10201020FDFE100094205BFE50201C50E0884306 +9383:2008241C52E04A80888C74B024A822AAF2AC24A8ACA874A824A43524C5320220 +9384:104010202BFE240041FCB90411041104FDFC10529494598852881CA4E0C24080 +9385:11FC1124292425FC4124B92411FC1050FC881104968A588850881C88E1084208 +9386:2108208850904BFE80007BC422542254FBD422542A54B3D462543A44E25402C8 +9387:100011FC2924252441FCB900117C1144FD44117C9544597C51441E44E27C4444 +9388:10841044284825FE4020B8FC102011FEFC40108094FE591052101C10E1FE4000 +9389:100011FC290425FC4104B9FC100013DEFC421252954A58C6535A1C42E14A4084 +938A:1020101029FE24844048B9FE11021224FC1011FE9440587C50441C84E0944108 +938B:2040202053FE4A02842479FC202021FCF82023FE2820B1FC61043904E1FC0104 +938C:10881050280025FE4050B9FC105413FEFC5411FC945058D851541E52E0504050 +938D:2020202053FE482083FE7A42248C21F0F82020442BFEB02261283A24E4A40040 +938E:2100210051FC4A0085F8780023F82088FAA821C82BF8B08A61CA3AAAE0860082 +938F:204017FE8090490813FCE1502252244E010006C01830EFEE01003FF80920FFFE +9390:1008103C2BC024044244B92811FC1220FC2013FE9420592451241D24E1FC4004 +9391:1020102028FC24204020B9FE10401084FDFE100295FC595451541D54E3FE4000 +9392:100011FE2900257E4100B9FE11541148FD641142950459FE51441E24E204440C +9393:2090208851044A42848879FC20042000FBDE20422A52B14A62523842E14A0084 +9394:104010202BFE26024050B88811241050FC88110496FA588850881C88E0F84088 +9395:1020101029FE2510417CB91411FE1114FD7C1110957C594451441E44E27C4444 +9396:1020112428A8242041FCB904110411FCFD0411FC9504590451FC1C00E0884104 +9397:102010202850244840A4B9FE128410FCFC8410FC948058FC51441D44E27C4044 +9398:200023FE500049FC8104790421FC2000FBFE228A2A52B3FE62223A22E22A0204 +9399:2440225E5292481287D2791E25522552FD5227DE2952B11262123A22E42A0844 +939A:10101220297C25444044B87C13401140FD7C11449544597C51441E80E47E4000 +939B:102810242BFE242041FCB92411FC1124FDFC112494085BFE50881C48E0484018 +939C:10003E782A482248FE862B7842484A30854806C41830EFEE01003FF80920FFFE +939D:108810882BFE24884020B85010881104FEFA1000940059FC51041D04E1FC4104 +939E:1020104029FC25044154B92411541104FDFC1000951259D451181D52E192410E +939F:21F820885070498C80007BDE2252218CFA5220202BFEB07060A83924E6220020 +93A0:200023FE52524A5283FE7800200023FEF8202020293CB12061203920E7FE0000 +93A1:2084204450484BFE808478842108214AFA52239C2884B10861083A52E3DE0042 +93A2:1040108029FC25044104B9FC110011FEFD0011FE94025AAA52AA1C02E0144008 +93A3:08202AA44D28145022887FFE410286C41830EFEE01003FF809200540FFFE0000 +93A4:100011FC290425FC4104B9FC10201124FCA8102097FE589050901D12E212440E +93A5:108011F822886870AB8E282029FC28A8216406C01830EFEE01003FF80920FFFE +93A6:204023BE52124A9282527AAA23242040FBFE22222A22B3FE62223A22E3FE0202 +93A7:102011242924252441FCB80013FE1000FDFC1104950459FC50881C50E3FE4000 +93A8:10A0109029FE272041FCB92011FC1120FDFE110094205BFE50201C20E0204020 +93A9:2000245C529449148294745421262100F7DC2114A594755429483108C5140222 +93AA:10A0112C2924252441ACB924112411FCFC2011FC9488585050201C50E0884306 +93AB:1020104029FC25044154B92411541104FC881144967A588851501C20E0D84706 +93AC:1020101029FE240040FCB88410FC1000FDFE1102957A594A517A1D02E10A4104 +93AD:111811E0290224FE4000B97C1144117CFD44117C9544597C51001DFEE0884104 +93AE:102010202BFE242041FCB90411FC1104FDFC110495FC590453FE1C88E1044202 +93AF:2100209E53D24A5282547BD422582254FBD222122A92B25A62D43B50E2100010 +93B0:10881050280025FC4000B85010881104FC0011FC9554595451541D54E3FE4000 +93B1:1020102029FC242043FEB80011FC1104FD0411FC9452589451881EA4E0C24080 +93B2:1020112428A8242043FEBA02100011FCFD04110495FC585050501C92E112420E +93B3:1020104029FC250441FCB90411FC1104FDFC102095FE587050A81D24E2224020 +93B4:1020104029FC250441FCB90411FC1104FDFC1040942058A4528A1E8AE4784000 +93B5:2040202053FE4A02800079FC204020A2FB3420582894B33460523890E3500020 +93B6:100013FE280825E84128B9E8100013FEFC0811E89528592851E81C08E0284010 +93B7:200021FE512049FC812079FC21202120F9FE20022AAAB2AA62AA3A02E0140008 +93B8:20A0209051FE4B2085FC792021FC2120F9FE21002BFCB088609E3902E20A0404 +93B9:102210122914248040BEB808100811BEFC8810889494589250A21D40E23E4000 +93BA:22002100513C482487A478A4213C2124FBA42564293CB12461243924E17E0100 +93BB:109211242A4825244092B80011FC1104FDFC110495FC590451FC1C88E1044202 +93BC:1020103C282025FE4122B93811E2111EFD0411789510597C51101EFEE2104430 +93BD:2020222253FE488081F87A882070238EF82021FC2820B1FC60203BFEE0200020 +93BE:100010F82888248840F8B888108810F8FC0011FC9554595451541D54E3FE4000 +93BF:10201050288825744202B8F8108810F8FC0C11F0942059FC50201DFEE0204060 +93C0:20202020503E482080207BFE22022326FA8A22522B26B252628A3B26E3FE0202 +93C1:112412482924240041FCB92411FC1124FDFC102097FE587050A81D24E6224020 +93C2:200023FE52004A7C82447A44227C2200FAEE22AA2AAAB2AA62EE3A00E3FE0000 +93C3:2220212051204FBE82407A2023BC22D0FA9022902AFEB29064A83DA8E8441082 +93C4:102013FE282025FC4124B9FC112411FCFC2213FE94085BFE51081C88E0284010 +93C5:2120213C214452A88A1076A82AC622BCFAA422BC2AA4B2BC62243A24E224022C +93C6:100011FC292427FE4124B9FC100011FCFD0411FC950459FC51041DFCE0884104 +93C7:22102110211057BE8A40720023BE228AFA8822A82AAEB2A864A83DA8E85E1080 +93C8:2010201052FE4910817C7854207C2354F97C211029FEB11061103A90E47E0000 +93C9:2108210857C84908811E77D225642540F7C82108A388754829543114C1240142 +93CA:08207F20083E7E440884FF2820103E28434486C21830EFEE01003FF80920FFFE +93CB:2088208853FE4888808878F8202023FEFA2223322AAAB37662223A22E22A0224 +93CC:108810882BFE24884000B9FC110411FCFD0411FC94205BFE50501C88E1044202 +93CD:100011FC292425FC4124B9FC10401088FDF0102094445BFE50221D24E2224060 +93CE:200021FC512449FC812479FC20A820A8FBFE20A828A8B1FC60203BFEE0200020 +93CF:208823DE508849DC80887BDE20882000FBFC20042804B1FC60043804E3FC0004 +93D0:200023DE50424A52814A7A52202820C4FB1220602988B03261C43818E0600380 +93D1:104010202BFE24884050BBFE122212FAFE2212FA968A5A8A52FA1E02E20A4204 +93D2:2040208851FC490882527BFE20502188FE2620C02B10B06463883830E0C00700 +93D3:1020104029FC2524417CB98C11541124FD5411FC9420581051541D42E14A4238 +93D4:104010202BFE26024000B9FC102011FCFD2411FC952459FC50001C88E1044202 +93D5:2040202053FE4A5082507BFE22522252FBFE22002A92B2D462983C92E4D2088E +93D6:00803FFE22203FFC22243FFC242027BC246227BE23182DF6204047FC42488FFE +93D7:200023DC52944BD482547BC822882294FBE220002820B1FC60203820E3FE0000 +93D8:20882288529E4AAA82947B88209020A4F88427BE2A84B2A462943A84E4940088 +93D9:102012222BFE24904088B9FE13101510FDFE1110951059FE51101D10E1FE4100 +93DA:200C200A50084BFE82087A48226A224AFBFA224C2A4CB2EC635A3C4AE4D60822 +93DB:1020112428A827FE4202B8F810881088FCF8102095FC592451241D34E1284020 +93DC:1020112428A827FE4202B8F810881088FCF81020942059FC50201C20E3FE4000 +93DD:100011F8290825F84108B9F8100013FCFE9413FC940059F850901C60E1984606 +93DE:101011FE2910257C4114B9FE1114117CFD10117C9554597C51541E7CE254444C +93DF:1020101029FE24004084B84811FE1110FD50117E95905910517E1E10E21044FE +93E0:2020247C52844948803078CE2610227CFA10227C2A10B2FE62103A10E5FE0800 +93E1:1040102029FC24884050BBFE100011FCFD0411FC950459FC50901C92E112460E +93E2:100013FE285025FC4154B95411FC1000FDFC100097FE582050A81D24E2A24040 +93E3:1040102029FE25004148B94811FE1148FD4811489578590052D41EAAE52A4800 +93E4:102011FC292427FE4124B9FC102011FCFD2411FC94405BFE50881DD0E070438C +93E5:102010102BFE26024080B8FE11101320FD7C11449544597C51441D44E17C4144 +93E6:112411242A2424A441547D4A9392150879081128952E592851281D58E14E4180 +93E7:08007F7808483E4800863E782A483E30414886C41830EFEE01003FF80920FFFE +93E8:08047F7808403E402A7E3E482A48FF48098806C01830EFEE01003FF80920FFFE +93E9:21002102511C4FD0811077D0255E27D4F55427D4A11477D421143124C1240144 +93EA:2090209057FE489083FC7A9423FC2294FBFC200029F8B10861F83908E1F80108 +93EB:2062238A208A57EA888A71CA22A2248AF8A420202BFEB07060A83924E2220020 +93EC:2040207C50404BFE82427A7823C4223CFA0822F02B24B2A865FE3C20E8A00040 +93ED:201C21E05020492480A87BFE207020A8F92422222840B02462A23A8AE4880078 +93EE:1020101029FE2510417CB91411FE1114FD7C11109592595451381E54E2924430 +93EF:2020202053FE482082AA792422AA2020FAAA21242AAAB05060503888E1040602 +93F0:2020222252224BFE80007BDE22522252FBDE22522A52B3DE62523A52E55A08A4 +93F1:102011FC2888245043FEB80011FC1104FDFC110495FC582053FE1C20E0204020 +93F2:202023FE504848F080207BFE22422090F9F820282920B1FC62203BFEE0200020 +93F3:2104208850004BFE82227AAA22722222FBFE200029FCB10461FC3904E1FC0104 +93F4:2010279054BC4CA484C477A821102128F14625C0A53C7524252435A4CE3C0024 +93F5:108813FE2888240041FCB8A810A813FEFCA810A895FC582053FE1C20E0204020 +93F6:10A0109029FE272041FCB92011FC1120FDFE110094205BFE50701CA8E3264020 +93F7:105012522954245043FEB888105013FEFC2011FC94205BFE50501C88E1044602 +93F8:2020202053FE482081FC792421FC2124F9FC20222BFEB04260243AA2E28A0478 +93F9:200023BE50A248A280BE7B882208223EFA2A23AA28AAB0BE6088388AE57E0202 +93FA:202423A8209255148A08740423BA20A8F8C623802A3CB38460A83890E2A80144 +93FB:2020212450A84BFE80A8792422222104F90421DE2A44B554609E3904E2040404 +93FC:2210221053DE4D2880A4782023FE2020FBFE22222A2AB27460A83924E6220020 +93FD:204023F850484FFE804873F820402554F75C2444A7FC7444275C3554C5540844 +93FE:2288228857C84A90829E77D4202427D4F45427D4A45477C824483454C46404C2 +93FF:2020212450A84BFE820278F820882088F8F820202BFEB07060A83924E2220020 +9400:102011FC292425FC4020BBFE100011FCFD0411FC950459FC51041DFCE0884104 +9401:22402242525C4FF082507BD0225E23D4FA5422542FF4B01462943C64E8240044 +9402:200023FE50504BDE82527A5223DE2050FBFE22222A22B3FE62223A22E3FE0202 +9403:2020202051FC482083FE7908239C2108F988263E2800B3FE60903890E112020E +9404:1088108829FC24884088BBFE102011FCFD2411FC952459FC50001C88E1044202 +9405:49202A3E7F4849485DA86B104928414406C01830EFEE01003FF811100920FFFE +9406:010878904BFC504049A4445855B4485241B046C01830EFEE01003FF80920FFFE +9407:103C13E0292424A843FEB8A811241202FDFC1124952459FC51241D24E1FC4104 +9408:101811E0284027FE4088B97412521070FC0011FC9504597451541D74E104410C +9409:100013DE2A5227DE4210BA5211CE1000FC8813FE9488588853FE1C88E1044202 +940A:2000277C55444D7C8544757C260025FEF540257EA5AA752A264A3492C42A0444 +940B:2000227C5144497C84447A7C220021FEF940227E2EAAB32A624A3A92E22A0044 +940C:208020F851084BFE8512792221FE2040F8A223542898B33460543892E3500020 +940D:11F81050282027FC40A4B92812A01040FDFC1154958C597451541D74E104410C +940E:1090108829FE25104310BDFE11101110FDFE1110951059FE51001EA4E2524452 +940F:108810502BFE245041FCB954118C1174FD0411FC94085BFE51081C88E0A84010 +9410:1020102029FC24204154B888110412FAFC8810F8948858F850201CA8E1244060 +9411:208820885108493E82487B88209C2100FA4023DC2814B05462B43A94E21C0014 +9412:208822AA22DC548889547222200023FEFA4224442BFCB04460443884E1140208 +9413:2108208853C8481083DE7A6423D42014FBD420542894B0E863883894E2940122 +9414:200023FE50504BFE82527BFE200021FCF90421FC2904B1FC60203BFEE0200020 +9415:200023DE50884AA883FE798822DA24A6F9F821082908B1F861083908E1F80108 +9416:2124212452AA4BAE81247AAA23AE2124FBFE21102914B114628A3A4AE2160422 +9417:23DE225253DE4A5283DE7A0222F22292FAF222922AF2B29262923B32E2020206 +9418:102011FC2888245043FEB80011FC1124FDFC112495FC582051FC1C20E3FE4000 +9419:101010D42848254A4284BC84117A1000FEFC108494FC580050841E48F1FE4000 +941A:100013FE285025DC4104B90411DC1050FC5013FE9440582050A41E8AE28A4478 +941B:100011FC290425FC4104B9FC102013FEFC0011FC950459FC50201D24E2224060 +941C:08207F20223E3E4400843E2804107E2809442EC21830EFEE01003FF80920FFFE +941D:200027FE54004E28854877EE24922484F6A026A8A7E8748824943514C9241242 +941E:100011FC280424FC4004B9FC100011DCFC9413DC94085BFE51081C88E0A84010 +941F:108810882BDE248847FEB88811541222FDFC1104950459FC51041D04E1FC4104 +9420:2108209053FC489082947998209027FEF80021F82908B10861F83908E10801F8 +9421:2094209253F2489087FE701023D22252F25223D4A454728C20EA370AC0160022 +9422:22882108FABE2008729CA92A2288210806C01830EFEE01003FF811100920FFFE +9423:112410A82BFE260240F8B88810F8100CFDF0102095FC582053FE1C20E0A04040 +9424:21F8210851F84D0A85FA750A25FA2402F79E2090A0907F9E24923492C4920892 +9425:108810502BFE242041FCB82013FE1124FCA813FE940059FC51041D04E1FC4104 +9426:200023DE52524BDE82527BDE220222FAFA5222522BFEB25262523A92E20A0204 +9427:200023DE52524BDE82527BDE220222FAFA8A22FA2A8AB2FA628A3A02E20A0204 +9428:109017FC289427FC4290BBFE111213FAFD0E11F8950859F851081DF8E0904108 +9429:104412242928247E4010B828134A111CFD28114C951A592A51481D10E2FE4400 +942A:1020103E282025FE4122B9FC1122117EFD54117C9554597C51101EFEE22244C6 +942B:20A0209051FE4B2081FC792021FC2120F9FE21002BDEB25262523A72E2020206 +942C:2020213C51204BFE8010781423FE2210FBF022542A54B2D463683C4AE8960322 +942D:2040208053FE4A2282AA7A2223FE2272FAAA22022820B3FE60503888E1040602 +942E:202023FE52884A5083FE7A5022FC2254FBFE22542AFCB25062D83D54E6520850 +942F:108810882BFE24A840227DFA902410287BFE104094FC598452FC1C84E0FC4084 +9430:10F81088288824F84000B9DC11541154FDDC102095FE587050A81D24E2224020 +9431:10201020285024884104BAFA10001000FDDC1154955459DC50881C88E1544222 +9432:100011FC2954255441FCB88011FC1244FDF41154955459F450441DF4E0144008 +9433:100011FC282027FE4222B9AC102011ACFC0011FC9524592451FC1D24E12441FC +9434:201023C8527E4A4082627BD42200223EFBC822482E7EB24862483BC8E2480008 +9435:208C23EA50884BFE80087BE8222A23EAF80A23EC288CB3EC608A38EAE3960022 +9436:100011FC2954255441FCB80013FE1000FDFC110495FC586250941D88E2A440C2 +9437:108813FE288824004148BBFE11481178FD0011FC94205BFE50701CA8E3264020 +9438:100011FC295425FC4020B9FC102013FEFC88105095FC582053FE1C20E0204020 +9439:2000227C514449748054785426FE2282FABA22AA2ABAB282628A3A84E50008FE +943A:1020112428A827FE4202B8F810881088FCF8100095FC592451FC1D24E1FC4104 +943B:2040207C50404BFE82427A7823C4223CFA0023FE2A40B3A462583DB4E45209B0 +943C:102011FC2820248843FEB88811FC1104FDFC110495FC590451FC1C88E1044202 +943D:10101210297C241040FEB844132811FEFD10117C951059FE51101D10E2FE4400 +943E:3E1022FE3E4420287EFEA2103EFC231006C01830EFEE01003FF811100920FFFE +943F:1040102029FC24884050BBFE100011FCFD0411FC950459FC50201E94E28A447A +9440:100E11F028A2245441FEB92210141152FD4A12389440587C50841D48E03041CE +9441:2020208852524B2682527A8A222223FEF88821442A7AB08861503820E0D80706 +9442:101C11E0282027FE4020B9FC11AC1174FDFC102095FC582053FE1C00E154422A +9443:100011DC2844255440CCB95410001048FCFE119096FC589050FC1C90E0FE4080 +9444:202023FE502049FC80007BFE200221FCF82023FE2800B3FE60043BBEE2A4038C +9445:208822AA22DC548889547222200023FEFA2220202BFEB07060A83924E6220020 +9446:2144214455544B64814E7BE42004222CF94423E42884B3E4608438E4E7140008 +9447:2040202053FE4888805277AC22AA22A8F5AC2000A10471FC210431FCC1040204 +9448:200027FC224854448FFE744426EC2554FEEC24442EECB55466EC3C44E4540408 +9449:108813FE2888242041FCB82013FE1040FC8811FC940059FC51541D54E7FE4000 +944A:108813FE28A8249041FEBB2011FC1120FDFC112095FE590053FC1C88E070438E +944B:1000FEFE10547CA854547C7C5410FEFE110006C01830EFEE01003FF80920FFFE +944C:2040202053FE4A0281FC7948225021FCFB0421FC2904B1FC610439FCE0880104 +944D:3EF822883EF822883EF822883EF81450238806C01830EFEE01003FF80920FFFE +944E:23FE222052FC4AA482FC7A2023FE2284FAFC22842AFCB28462FC3A48E28403FE +944F:104010202BFE26224154B94A123A1000FDFC115497FE580051FC1C20E0A04040 +9450:100011FC282027FE4222B9AC102011ACFC0013FE942059FC51541D54E154410C +9451:200823E852884BEE82287BF4228223E2F80021FC2954B15461543954E7FE0000 +9452:7E40487E7E9043087EFE48AA7EFE010006C01830EFEE01003FF811100920FFFE +9453:1010107C2A54257C4110B8FE1000137CFD44117C9540597C51441D7CE280447E +9454:2040202053FE4A02851479DE22522554FA8821742A02B1FC60203924E2220060 +9455:2042239C52104BDE82947A94242023FCFA0423FC2A04B3FC62043BFCE1080204 +9456:210827FE5108480083FC7A94229423FCF82823FE2A20B32462A83A92E42A08C6 +9457:10501190289E27EA408AB9D2128A10A4FC501088972658A850701CA8E1244060 +9458:23F8224852484BF88248724823F82000FFBE2AAAAAAA7FBE2AAA3AAACFBE08A2 +9459:2394211027BE51188BAA7546221823E0FA0421FC2800B3F862083BF8E20803F8 +945A:108811DC288825DE4088B954122211FCFD0411FC950459FC51041DFCE0884104 +945B:1020101029FE2528417CB92811FE1110FD7C1154957C5954517C1E00E2444482 +945C:112410A82BFE260240F8B88811FC1104FDFC110495FC590451FC1C00E0884104 +945D:208823FE50884820823C7944203820D6FB382110297CB110617E3910E31004FE +945E:212422485124480083FC7A9422642294FBFC22482B68B248636A3A4AE2460362 +945F:102013FE282025FC4000BBFE125213FEFD0411FC950459FC51041DFCE0884104 +9460:244424E458A84AAA8EEE74A42AAA2EEEF2422040AFFE70E021503248CC460040 +9461:20202120513C492087FE78902294236CFA0423FC2A94B294636C3A04E3FC0004 +9462:2020203C50204BFE82227AF8222422FCFAA422FC2AA4B2FC64203D54E94A023A +9463:2040202053FE4A5083FE7A5223FE2200FA9422D82A90B2D2628E3C00E5540A2A +9464:11FC110429FC250441FC7C8891FC10887BFE108895245AAA50701CA8E1244060 +9465:108011F82A0825FC4124B9FC112411FCFD54122A95FC590451FC1D04E1FC4104 +9466:27DE251227D254548FC8751427E22000FBFC22042BFCB20463FC3A04E3FC0108 +9467:102013FE2A8A25FC4088B9FC110411FCFD0411FC950459FC50901C94E112420E +9468:2110209053DE4810825E798223DE2010FBDE22502BDEB25063DE3A50E25202CE +9469:200023FE50204BAE82AA7AAA23AE2020FBFE20202BAEB2AA62AA3BAEE02003FE +946A:2040207C50404BFC82447BF0224422FCFAA822F82AA8B2F862003DFCE5540BFE +946B:010006C01830EFEE01001FF009203FF8101028287C7C92927C7C10105454FEFE +946C:13D012902BDE266843C4BA8413F81108FDF8110895F8590851F81C90E112460E +946D:23DE225253DE4A5283DE7A2222FA2222FAFA22AA2AFAB2AA62FA3A72E2AA0226 +946E:208823FE208854128AFE701024FE2292FAFE209229FEB29266043AFEE244022C +946F:2148214C52AA480883FE79482368214AFB6A214A2B6CB14C616A3B8AE0160022 +9470:10201050288825744202B9FC115411FCFC0011FC9554595451FC1D54E154410C +9471:21F0221057FC4A0483FC7A2423B82222F9FE22102FFCB24463FC38D0E14A063E +9472:102013FE280025DC4154B9DC108813FEFC8813FE94885BFE50941D88E2A440C2 +9473:204027FE54924BFC80907BFC209027FEF90823FC2D0AB1F862403A7CE54008FE +9474:222223FE209051FE8B1075FE211021FEF91021FE2900B3FE628A3B76E2520276 +9475:208823FE50884BDE82527BDE20A02090F9FE21202BFCB52061FC3920E1FE0100 +9476:2090209057FE4894800A71FE250827E8F14A21EAAF2A75EA254C39EAC2160462 +9477:23FC210851F8490881F8790E27F82008FFFE22942B9CB294639C3AD6E7BC0084 +9478:27FC244457FC4C4487FC70002FBE2AAAFFBE2AAAAFBE7040204037FCC0400FFE +9479:204027FE5492490880807B1C2204239CFA0423FC2A48B36862483B6AE2460362 +947A:23DE225253DE4A5283DE7A5223DE2090F9FE21102BFEB51061FE3910E1FE0100 +947B:22A8224857BE4AA8875C7AAA22882FFEF21825E4A84273F8204037FCC04000C0 +947C:200023FE52524A5283FE71082154225EF7B4211EA25477DE20143554C55E0010 +947D:252827BE294857BE8B1875AA294623FCFA0423FC2A04B3FC62043BFCE1080204 +947E:21084FD2F03C23884812FBBE0280ABAA010006C01830EFEE01003FF80920FFFE +947F:55781448FF4822867F7808486B2849107F2806C41830EFEE01003FF80920FFFE +9480:210821EC510A4FEA89287BC8293E2FE8F9482BE8AA287B682AA83BF4CAB412A2 +9481:23DE225253DE4A5283DE78A021FE2320FDFC212029FEB00061FC3888E070078E +9482:2248215057FC4C0481F0711027FC2554F4E427FCA04077FC20403FFEC2A40452 +9483:23FE220253FE4A9282547A9222FE22AAFAFE23222AFAB2AA62FA3A22E5FA0004 +9484:208823FE50884BDE82527BDE225223DEFA2223FE2AAAB2FA62223A72E2AA0224 +9485:100010001E00200020007C0090001000FE001000100012001400180010000000 +9486:108010801E80208020807C8090801080FE8010801080128414841884107C0000 +9487:100010003DFC20084010BC2010401040FC801080110011041504190410FC0000 +9488:102010201E20202020207C2093FE1020FE201020102012201420182010200020 +9489:100010003DFE20204020BC2010201020FC201020102010201420182010A00040 +948A:100410041E04204420447C4490441044FE441044104412041404180410140008 +948B:104010401E40204020407C6090501048FE441044104012401440184010400040 +948C:100011FC1E04200820107C2090201020FE201020102012201420182010A00040 +948D:102010203C2020204020BC2011FC1020FC201020102010201420182013FE0000 +948E:1008103C3DE020204020BC20102013FEFC201020102010201420182010200020 +948F:110411243D2421244124BD2411241124FD2411241124112415241A2412040404 +9490:100810081E10202020407C8890081010FE201044108412081410182010C00300 +9491:100013FC3C8420884088BC90109C1084FD4411441128112816101A2814440182 +9492:100011F03D1021104110BD1011901150FD5011101110111215121A12120E0400 +9493:104010403C8020FC4104BE0410041104FC841044104410041404180410280010 +9494:108010403C5E21024102BD0211021102FD0211021102110215021902110A0104 +9495:104010403C40204043FEBC8810881088FC881108109010501420185010880304 +9496:100011F83C1020204040BC8011FC1054FC541094112410241444188411280010 +9497:100013FC3D0421444124BCA810881088FC501050102010201450188811040602 +9498:100011FC3C8820884088BC88108813FEFC881088108810881488190811080208 +9499:100013FE3C2020204120BD3E11201120FD2011FE100210021402180210140008 +949A:100010003DFE20104010BC2010201068FCA41122122210201420182010200020 +949B:102010201E20202020207DFE90201020FE20105010501250148818C811240202 +949C:100011FE3D0021004100BDFC11041104FD04110411FC11001500190011FE0000 +949D:20402040384027FC40407A48A2482248FA4823F82048204028423042203E0000 +949E:102010203C2020A840A4BCA211221120FE241024102810081410182010C00300 +949F:102010203C20202041FCBD2411241124FD2411FC112410201420182010200020 +94A0:102010203C2021FE4122BD2211221122FD52114A118A110215021902110A0104 +94A1:100011FC3D0421044124BD2411241124FD241124112410501448188411020602 +94A2:100011FC3D0421044194BD5411541124FD241154115411941504190411140108 +94A3:1008101C3DE021004100BDFC11441144FD4411281128111015101A2812440482 +94A4:102010203C5020504088BD4412221020FC0011FC100410081408181010100020 +94A5:100010FC3C8420844084BCFC10841084FC8410FC108410841504190412140408 +94A6:104010403C40207C4084BC8811201020FC201050105010501488188811040202 +94A7:104010403C8020FC4104BE0410841044FC441014102410441584180410280010 +94A8:102010403CFC20844084BC8410941088FC8010FE1002100215FA180210140008 +94A9:108010803C8020FC4104BD0412441044FC8410A4111411F41414180410280010 +94AA:104010203C0021FC4000BC0010F01090FC9010901090109214921912110E0200 +94AB:104010203C2023FE4080BC80108010FCFC841084108410841504190412280410 +94AC:102010201E20202420A47CA490A81120FE201050105012501488188811040202 +94AD:101011103C9020904010BD1010901090FC10101E13F010101410181010100010 +94AE:100011F83C4820484048BC48104811F8FC881088108810881488188813FE0000 +94AF:100011FC3D2421244124BD24112411FCFD041100110011001502190210FE0000 +94B0:100010003DFC20204020BC2010201020FDFC1020102810241424182013FE0000 +94B1:105010483C40205C41E0BC40105E11E0FC441048103010221452188A13060002 +94B2:100010003DFE20104010BC1010901090FC9E1090109010901490189013FE0000 +94B3:108810883C88208843FEBC8810881088FC8810F8108810881488188810F80088 +94B4:102010203C20202043FEBC2010201020FDFC1104110411041504190411FC0104 +94B5:102010203C20202041FEBC7010A810A8FD241124122210F81420182010200020 +94B6:100010003DFE20084008BDE811281128FD28112811E811281408180810280010 +94B7:100011FE3D002100417CBD4411441144FD441144117C11441500190011FE0000 +94B8:20402040384023FE408078A0A12021FCFB242524212421242934312820200020 +94B9:105010483C48204043FEBC80108010FCFD4411441128112816101A2814440182 +94BA:202820243824202043FE7A20A2242224FA242228222822902B12322A20460082 +94BB:102010203C202020403EBC2010201020FDFC1104110411041504190411FC0104 +94BC:100011FC3D0421044104BDFC11041104FD0411FC110411041504190411FC0104 +94BD:100010003DFC21044104BD0411FC1104FD04110411FC11041400180013FE0000 +94BE:100011FC3D2421244124BDFC11241124FD2411FC112410201420182010200020 +94BF:100010003DFC21244124BD2411241124FDFC1124112411241524192411FC0104 +94C0:102010203C20202041FCBD2411241124FD2411FC112411241524192411FC0104 +94C1:102010203D20212041FCBD2012201020FDFE1020105010501488188811040202 +94C2:102010203C4021FC4104BD0411041104FDFC1104110411041504190411FC0104 +94C3:2040204038A020A041107A48A4262020FBF820082010211028A0304020200020 +94C4:2008203C3BC0220042207A20A22023FEF8202020212821242A22342220A00040 +94C5:100010F83C8820884088BC8811061200FC0011FC110411041504190411FC0104 +94C6:200020803B1E225242527A52A2522252FA5222D2235A22542890309021100210 +94C7:108010803DFC21044204BDF411141114FD1411F4110411281512190210FE0000 +94C8:104010203C0023FE4020BC2011FC1124FD241124112411241534192810200020 +94C9:102010103C1021FE4020BC2010441084FDF8101010201044148219FE10820000 +94CA:102010103C1021FE4102BE0410801088FC9010A010C0108214821882107E0000 +94CB:104010203C2820084008BC4810541152FD5211601260104414C41944123C0000 +94CC:100011FC3D0421044104BDFC11001140FD4411481170114015421A42123E0400 +94CD:101010103C1021FE4112BD14111011FCFD4411441128112815101A2812440482 +94CE:100013FC3D0420884050BC2010D81326FC2011FC1020102017FE182010200020 +94CF:200427C43A84229442947A94A29427D4FA942294229422942A84348424940888 +94D0:104010443DF420484050BDFE10401080FDFE1240148010FC1404180410280010 +94D1:104010403C4421F44048BC5013FE1040FC801184129810E014821882107E0000 +94D2:100011FE3C8820884088BCF810881088FCF810881088109E15E8180810080008 +94D3:104810483DFE20484048BC20101011FEFC801080108010801480188010FC0000 +94D4:200023FC3890209040907892A4922294FA942298209020902890309027FE0000 +94D5:102010203DFE20404040BCFC10841184FEFC1084108410FC1484188410940088 +94D6:202820243824202043FE7A20A2242224FBA422A822A822902A9235AA24460882 +94D7:102010203C2021FC4020BD2410A410A8FC2013FE105010501488188811040202 +94D8:200027DE3892449244947C94A7D82094F992219222922A9A3494289002900110 +94D9:2080208038BC23C040507824A0D4230CF80023FE2090209029123112220E0400 +94DA:100011FE3C2020404088BD0411FE1022FC20102011FE10201420182013FE0000 +94DB:102011243CA420A440A8BC2013FC1004FC04100411FC10041404180413FC0004 +94DC:200023FC3A04220442F47A04A20422F4FA942294229422F42A04320422140208 +94DD:100010FC3C8420844084BC8410FC1000FC0011FE110211021502190211FE0102 +94DE:200021FC3904210441FC7820A02023FEFA222222222222222A2A322420200020 +94DF:200023FE3A02222242227A22A3FE2222FA222252224A228A2B02320223FE0202 +94E0:102011243D24212441FCBC0011FC1004FC0411FC110011001502190210FE0000 +94E1:200223E23A22222A42AA7AAAA2AA22AAFAAA22AA22AA208229423122220A0404 +94E2:20202120392021FC41207A20A02023FEF87020A820A821242924322220200020 +94E3:102011203D2021FC4120BE20102013FEFC90109010901090151219121212040E +94E4:200020063BB8208840887908A13E2388F88822882288213E29003280247E0800 +94E5:1008103C3DE020204020BDFC10201020FC2013FE102010401488190413FE0102 +94E6:1008103C3DE020204020BDFE10201020FC2011FC110411041504190411FC0104 +94E7:109010943D1421184310BD321152110EFD20102013FE10201420182010200020 +94E8:2040204038A0211042087C06A3F82040F840204023F820402840304027FE0000 +94E9:100411883C5020204050BC8811241020FFFE102010A810A415221A2210A00040 +94EA:2040204038A0211042087C06A3F82000F80023F8220822082A08320823F80208 +94EB:105010503C50215240D4BC5810501058FCD4115212501050149218921112020E +94EC:104010403C7820884150BC2010501088FD0610F8108810881488188810F80088 +94ED:104010403CFC21044288BC5010201040FC8011FC128410841484188410FC0084 +94EE:2080208039F8220840107BFCA0242024FBFE2024202423FC2824302020A00040 +94EF:108010803CF821084210BDFC11241124FD2411FC110011001502190210FE0000 +94F0:104010203C2021FE4000BC8811041202FC881088105010501420185010880306 +94F1:104010203C2023FE4040BC4010A010A2FDA4129814901088148418A210C00080 +94F2:204020203BFC200041087890A3FE2200FA002200220022002A00340024000800 +94F3:104010203C2023FE4040BC88110413FEFC9210901090109015121912120E0400 +94F4:2200217C3904240842107A20A07E212AF92A222A264A22522A923322224A0084 +94F5:20402020382023FE42027C44A04023FEF8882088210820D02820305020880304 +94F6:100011F83D08210841F8BD08110811F8FD441148113011201510194811860100 +94F7:210021003900211E47D27A52A2522252FA522492229221122A92325E24520800 +94F8:102010203DFC202040FCBC2011FE1048FC4810FE1088114815281A0810280010 +94F9:208820883BFE208840007BFEA2022444F84023FC204420842884310422280410 +94FA:204820443BFE204040407BFCA2442244FBFC2244224423FC2A44324422540208 +94FB:100013FE3C40204041FCBC84108413FEFC00100011FC11041504190411FC0104 +94FC:20202020382023FE40207924A0A420A8FBFE207020A820A82924322224200020 +94FD:201020143812201043FE7810A0902050F8482008208822A82A9A32AA24660002 +94FE:201022103910217E40207828A748217EF908210821FE210829083288247E0000 +94FF:208022FC3AA422A442A87A90A2A820C6F820202021FC20202820302023FE0000 +9500:102011243CA420A84020BDFC11041104FDFC1104110411FC1504190411140108 +9501:102011243CA420A84020BDFC11041124FD241124112411241450188811040202 +9502:100011FC3D24212441FCBD24112411FCFC20102011FC10201420182013FE0000 +9503:100011FC3D0421044104BDFC10001000FDFE1020102011FC1420182013FE0000 +9504:200820083BC82248425E7A4AA3CA224AFA4A23CA224A224A2A6A33D226120026 +9505:200021FC39042104410479FCA0202020FBFE22222252228A2B0A3202220A0204 +9506:20202120392021FC41207A20A02023FEF800200021FC21042904310421FC0104 +9507:201020D83B94209440907BFEA0902094F89420D82398209028AA30CA22860102 +9508:101C11E03C20202043FEBCA811241222FDF81088109010BE1502190212140408 +9509:102010203D2421244124BD2412AA1472FC20102011FC10201420182013FE0000 +950A:1004101E3DE020224112BC9410801008FDFE1008108810481448180810280010 +950B:104010403CFC20884150BC2010D81326FCF8102010F8102017FE182010200020 +950C:104010203DFC20004088BC5013FE1020FC20102011FC10201420182010200020 +950D:204020203BFC204040907908A3FC2004F9502150215021502A5032522452080E +950E:210020BE3A82220242FA7A52A2522252FBFE2252225222922B123202220A0204 +950F:210020BE3A82220242027AFAA28A228AFAFA228A228A22FA2A023202220A0204 +9510:220821083910402043F87A08A2082208FBF820A020A0292031242224041C0800 +9511:21082088389023FC40247824A3FC2220FA2023FE206220A2292A322424200020 +9512:104010203DFC21044104BDFC11041104FDFC1120112211141508194411820100 +9513:100011FC3C0420FC4004BDFC100013FEFE0211F8108810881450182010D80306 +9514:200023F83A08420843F87A00A20023FCFA0422F422942A9434F4240408280010 +9515:2000277E3D04250445747D54A6542554FD542554257425542E04340424140408 +9516:202020203BFE202041FC7820A3FE2000F9FC210421FC210429FC310421140108 +9517:2020202239FA202440287BFEA0202040F8FC2184228420FC2884308420FC0084 +9518:208820883BFE208840A87820A3FE2040F88020FC218422842884308420FC0084 +9519:21102110391027FC41107910AFFE2000FBF82208220823F82A08320823F80208 +951A:208820883BFE208840887800A1FC2124F924212421FC21242924312421FC0104 +951B:202020203BFE205040A87924A2FA2020F8A8208823FE20882888308821080208 +951C:102010203DFC20504088BD0413FE1008FDE81128112811E81528180810280010 +951D:100011FC3D0421FC4104BDFC100011FEFC0813FE100811081488180810280010 +951E:100011FC3D24212441FCBD24112411FCFC2013FE107010A815241A2210200020 +951F:100011FC3D04210441FCBD04110411FCFC00111211D41118151019521192010E +9520:10FC10843C8420FC4084BC8410FC1000FDFE1102110211FE1502190211FE0102 +9521:100011F83D08210841F8BD08110811F8FC8011FC1254109415241A4410940108 +9522:100011FC3D0421244124BDFC11241124FD741154115411741504190411FC0104 +9523:200023FE3A52225242527BFEA0202040F8FC2104228820502820304021800600 +9524:2008203C39E0202040207BFEA1242124FBFE2124212423FE2820302023FE0000 +9525:105010483C8020FE4190BE9010FC1090FC9010FC10901090149018FE10800080 +9526:102010403DFC210441FCBD0411FC1020FC2013FE12221222162A1A2410200020 +9527:101C11E03D10211041FEBD101110117CFD4411541154115415541A2812440482 +9528:201020503B90221E42127A24A3C82288FA882288228822942A94349424940822 +9529:102011243CA8202041FCBC4013FE1088FD0412FA1488108814A818921082007E +952A:2080208038FC2154425478A4A1242244F8942108204020A42AAA328A24780000 +952B:104010203DFC20004108BC90100013FEFC00100011FC11041504190411FC0104 +952C:204022443A44244840A07910A6082044F84022482248245028A0311022080C06 +952D:204020203BFE220244047800A3FE2020F8202120213C21202AA03260243E0800 +952E:201020103B7C211441FE7A14A27C2710F97C251025FE22102A10350028FE0000 +952F:200023FC3A04220443FC7A20A22023FEFA20222022FC22842A84348424FC0884 +9530:200021FC3808201040207BFEA02020A0F84021FC215421542954315427FE0000 +9531:109210923D2422484124BC9210921000FDFE1122112211FE1522192211FE0102 +9532:2100213C3BD4211443947914A7D42124F94C204027FE204028A0311022080C06 +9533:208820883BFE208840A87820A1FC2124F924212427FE20202850308821040202 +9534:111011123DD421184152BD92112E1040FDFC1104110411FC1504190411FC0104 +9535:109010903C9E22A241D4BC88109410A4FDFE128414A410941494188410940088 +9536:200021FC3924212441FC7924A12421FCF8002040202422A22A8A348820780000 +9537:200023DE3A52225243DE7800A1FC2000FBFE2080210021FC2804300420280010 +9538:1008103C3DE020204020BDFE102010A0FD2C1124112411AC1524192411FC0104 +9539:200820C83B082108412A792AA3AC2148F9082388255421142914312421240142 +953A:1008103C3DE0202043FEBC2011FC1124FDFC112411FC102015FC182013FE0000 +953B:208023383A28222843A87A46A200227CFBA42224222823A82E10322822440282 +953C:10A0112C3D24212441ACBD24112411FCFC2011FC108810501420185010880306 +953D:102010403CFC208440FCBC8410FC1000FDFE1020102010FC1420182011FE0000 +953E:101E13E03C4421244088BDFC10401040FDFE108010FC114415281A1010680186 +953F:204020203BFE200041FC7904A1042104F9FC2052209421882A8834A420C20080 +9540:204020203BFE224842487BFEA2482278FA0022FC224422482A28341024680986 +9541:210420883BFE2020402079FCA0202020FBFE2000202023FE2820305020880306 +9542:102011243CA8202043FEBCA811241202FC4013FE108811081590186011980604 +9543:20842044384823FE40847884A108214AFA52239C208421082908325223DE0042 +9544:209027FC389423FC42907BFEA1122216FDFC2104212421242924305020880304 +9545:200023FC3A24422443FC7A00A2FC2284FA8422FC22842AFC3484248408FC1084 +9546:208820883BFE2088400079FCA10421FCF90421FC202023FE2850308821040202 +9547:202020203BFE402041FC7904A1FC2104F9FC210421FC290437FE208801040202 +9548:202820243BFE202041FC7924A1FC2124F9FC2124200823FE2888304820480018 +9549:200023FE380021FC41047904A1FC2000FBFE228A225223FE2A223222222A0204 +954A:200023FC390821F8410879F8A10E27F8F80827BC20A422A42928329024A80846 +954B:2020212438A8202043FE7A02A00021FCF904210421FC2050285030922112020E +954C:20A0209039FE232045FC7920A1FC2120F9FE210023FC2088289E3102220A0404 +954D:204020803BF8220843F87A08A3F82208FBF8204027FE20E02950324824460040 +954E:102010503C8821744202BCF8108810F8FC0C11F0102011FC14201BFE10200060 +954F:204023BE3A12229242527AAAA3242040FBFE2222222223FE2A22322223FE0202 +9550:204020203BFE200041FC7904A1FC2000FBFE220222FA228A2AFA3202220A0204 +9551:204020203BFC210840907BFEA2022444F82023FC208020F82888310821280210 +9552:210420843888200043FE7800A0882104FA0221FC215421542954315427FE0000 +9553:204020203BFE2202400079FCA04020A2FB342058209423342852309023500020 +9554:204020203BFE2202441479E0A1002100F9FC2110211027FE2800309021080204 +9555:204020203BFE220240507888A1242050F888210422FA20882888308820F80088 +9556:100013FE3C5021FC4154BD5411FC1000FDFC100013FE102014A8192412A20040 +9557:2020212438A823FE420278F8A0882088F8F82020202021FC2820302023FE0000 +9558:200021F8390821F8410879F8A00023FCFA9423FC200021F82890306021980606 +9559:100011FC3D2421FC4124BDFC10401088FDF01020104413FE1422192412220060 +955A:202022223A2223FE40007BDEA2522252FBDE2252225223DE2A523252255A08A4 +955B:202027FE3C2025FC442477FEA42425FCFC2025FC252425FC2D2439FC2924112C +955C:208020403BF8211040A077FEA00023F8FA0823F8220823F82920312222220C1E +955D:204020203BFE208840507BFEA22222FAFA2222FA228A228A2AFA3202220A0204 +955E:22202120392047BE42407A20A3BC22D0FA90229022FE2A9034A825A808441082 +955F:22102110391047BE42407A00A3BE228AFA8822A822AE2AA834A825A8085E1080 +9560:200023DE38422252414A7A52A02820C4FB1220602188203229C4301820600380 +9561:200023FE385023FE42527BFEA00021FCF90421FC210421FC282033FE20200020 +9562:20002FFE38004A2849487BEEA8922884FAA02AA82BE828883894291409241242 +9563:202020203BFE2050428A7904A3FE2504F9FC210421FC20202924322224A20040 +9564:20A024A43AA820A047FC7910A0A027FCF84023F8204027FC28A0311022080C06 +9565:208020F8391023FC452479FCA12421FCF80023FE200021FC290431FC210401FC +9566:210820883BC8201043DE7A64A3D42014FBD42054209420E82B88309422940122 +9567:2200217C3D04244445F47C44A5F42554FD7425D4255425F42CE435542444044C +9568:210820903BFC209042947998A09027FEF80021F82108210829F83108210801F8 +9569:204020203BFE228A41247A22A1FC2124F9FC202023FE22222BFE322220200020 +956A:200023BE38A220A240BE7B88A208223EFA2A23AA20AA20BE2888308A257E0202 +956B:202027A438A8229241147A08A5F42802FBF82208220823F82A0831102FFE0000 +956C:208823FE38A8209041FE7B20A1FC2120F9FC212021FE21002BFC30882070038E +956D:100011FC3C2023FE4222BDAC102011ACFC0011FC1124112415FC1924112401FC +956E:200023FC3A94229443FC7800A7FE2000FBFC220423FC20A2291433082D440182 +956F:200023F83AA822A843F87900A3FC2484FBE422A422A423E4289437F420140008 +9570:202023FE3A88225043FE7A50A2FC2254FBFE225422FC22502AD8355426520850 +9571:2040202039FC208840507BFEA00021FCF90421FC210421FC28203294228A047A +9572:2080204037FE44024A2473BCA4A42AA8F51022E8240423F828403248244400C0 +9573:204020203BFE225043FE7A52A3FE2200FA9422D8229022D22A8E340025540A2A +9574:212422483924200043FC7A94A2642294FBFC2248236822482B6A324A22460362 +9575:21F022103BFC260443FC7A24A3B82222F9FE221027FC22442BFC30D0214A063E +9576:204027FC380023B842A87BB8A11027FCF91027FC211027FE2928331025480186 +9577:00000FF808000FF008000FF00800FFFE1200111010A010401220141818061000 +9578:00000FF8080008000FF0080008000FF008000800FFFE0400082010103FF81008 +9579:00403E40204020783C8820883C8821102010FE10102820284448FE4402840102 +957A:00083E3C21E020203C2020203DFE20202020FE50105020504488FE8803040202 +957B:00203E2020A020A03CFC20A03D20202021FEFE20103020504448FE8803040202 +957C:00003EFE208220FE3C8820AA3CAA20AA20BEFE8810AA20AA44AAFEAA02BE0102 +957D:00203E2021FC20203D5420883D0422FA2088FEF8108820F84420FEA803240060 +957E:00003BFE21243A2227FE3A22237622AAFB76222223764AAAFB764A22022A0204 +957F:0800081008200840088009000800FFFE0A0009000880084009200A180C060800 +9580:00003E7C224422443E7C224422443E7C20042004200420042004200420142008 +9581:00007CF844887CF844887CF84008408840884108410842084408480840284010 +9582:00007C7C44447C7C44447C7C4004400440045FF4400440044004400440144008 +9583:00007C7C44447C7C44447C7C4004410441044104428442444424480440144008 +9584:0010771055105510771055105510771041104128412841284128414445444282 +9585:00007C7C44447C7C44447C7C40045FF441044104410441044104450442144008 +9586:00007C7C44447C7C44447C7C40045FF440044FE440045FF44004400440144008 +9587:00007C7C44447C7C44447C7C40045FF442044284424442244204420442144008 +9588:00007C7C44447C7C44447C7C40044FE4410441045FF441044104410441144008 +9589:00007C7C44447C7C44447C7C408440844FF44184428444844884428441144008 +958A:00007C7C44447C7C44447C7C4104410449244924492449244FE4400440144008 +958B:00007CF844887CF844887CF840084FC8448844885FE844884488488850A84010 +958C:7C7C44447C7C44447C7C420441045FF4400447C444444444485450344004400C +958D:00007C7C44447C7C44447C7C420441047FFC440447E444244824514460944008 +958E:7C7C44447C7C44447C7C410441045FF44204448444844904522467F44214400C +958F:00007C7C44447C7C44447C7C40045FF441044FE4410441045FF4400440144008 +9590:7C7C44447C7C44447C7C400441C45E0443C45E0443E45E04422441E440144008 +9591:7C7C44447C7C44447D7C410441045FF441044384454449245114410441144008 +9592:7C7C44447C7C44447C7C400447E4442447E4442447E4442448A4504440144008 +9593:00007CF844887CF844887CF840084FC848484FC848484FC84848400840284010 +9594:7C7C44447C7C44447C7C420441045FF440444444428441044284444448544008 +9595:00007C7C44447C7C44447C7C40044FE4408448844FF442844484588441944008 +9596:7C7C44447C7C44447C7C410441045D1445A44544492449145114650442144008 +9597:00007C7C44447C7C44447C7C4084448442844884448440F45F84408440944088 +9598:7C7C44447C7C44447C7C40044FE449244FE449244FE449244104410440144008 +9599:00007C7C44447C7C44447C7C420441045FF441044FE4492449A4494441144108 +959A:00007C7C44447C7C44447C7C420441044FE44444424442845FF4400440144008 +959B:7C7C44447C7C44447C7C40045FF44104492445445FF441044104410441144008 +959C:00007CF844887CF844887CF840085FE840484F4849484F484048414840A84010 +959D:7C7C44447C7C44447D7C4104428444444A24511C6FE440244044428441144088 +959E:7C7C44447C7C44447C7C440448245FF4445444445FF444444444444448544008 +959F:00007C7C44447C7C44447C7C4204414444845524561464544C4473C440144008 +95A0:00007C7C44447C7C44447C7C40045FF441044FE4410441445FF4400440144008 +95A1:7C7C44447C7C44447E7C41045FF4420444444F8441244644588443444C344008 +95A2:7C7C44447C7C44447C7C4004444442844FE441045FF44104428444444824400C +95A3:7C7C44447C7C44447C7C420447E44824544443844C64701C47C44444445447C8 +95A4:7C7C44447C7C44447C7C4104428444445BB4400447C44444444447C444544008 +95A5:7C7C44447C7C44447C7C40044544492459F46F244944488449544A344814400C +95A6:00007C7C44447C7C44447D7C4284444458344444444444444AA4511440144008 +95A7:7C7C44447C7C44447C7C400444445FF4444444447FFC4004444444244824400C +95A8:7C7C44447C7C44447C7C41044FE441045FF441044FE441045FF4400440144008 +95A9:7C7C44447C7C44447C7C410441044FE4492449244FE441145FF440144004400C +95AA:7C7C44447C7C44447C7C40045FF442844FE44AA44AA44CE448244FE44824400C +95AB:7C7C44447C7C44447C7C40045FF4511451145FF453945554593451145FF4400C +95AC:7C7C44447C7C44447E7C41044FE448244FE448244FE4491448A44A444C24481C +95AD:7C7C44447C7C44447C7C40044FE448244FE440045FF450145FF4400440144008 +95AE:7C7C44447C7C44447C7C40345DC4444448445DF44444544449F4560461F4400C +95AF:00007C7C44447C7C44447C7C5084488462A452944C8470245044518456144008 +95B0:7C7C44447C7C44447C7C400442044CE4482448244EE4482448244FE44004400C +95B1:7C7C44447C7C44447C7C444448245FF4682C48244FE44284428444944874500C +95B2:7C7C44447C7C44447C7C444442844FE448244FE442844284449458744004400C +95B3:7C7C44447C7C44447D7C41045FF441044FE449244FE449244FE441045FF4410C +95B4:7C7C44447C7C44447C7C40044FE448244FE448244FE448244FE444444824400C +95B5:7C7C44447C7C44447C7C450444844FF459046FE449044FE449044FF44804400C +95B6:7C7C44447C7C44447FFC48244FE448244FE440045FF450145FF450145FF44008 +95B7:08008BDE525223DE52528BDE22022222FA222222B252AA4A2A8A2202A20A4204 +95B8:7C7C44447C7C44447C7C40045FF442844EE4482448244EE4428442845FF4400C +95B9:7C7C44447C7C44447D7C42045FF449245FF4692C4FE449244FE4411440F4400C +95BA:7C7C44447C7C44447C7C40044FE448244FE448244FE441045FF4444443845C6C +95BB:7C7C44447C7C44447E7C420447E4482452444CE4482448244EE4482448244FEC +95BC:7C7C44447C7C44447C7C480444445E4448A44F144A4C4A244A8452446624400C +95BD:7C7C44447C7C44447C7C40645F8451045FE4509458744FE448244FE448244FEC +95BE:7C7C44447C7C44447C7C408440A45FF440844EA44AA44EA4405446B45914420C +95BF:7C7C44447C7C44447C7C40E45F2449445FF4501447C440444684410442844C4C +95C0:7C7C44447C7C44447C7C44445FF444447FFC482457D4644C47C4442443E4400C +95C1:7C7C44447C7C44447C7C40044EE44AA44EE44AA44EE44824482448244864400C +95C2:7C7C44447C7C44447C7C492445445FF442047FFC482457D4644C44C4442443EC +95C3:7C7C44447C7C44447C7C4FE448244FE448244FE448244FE441445FF44284444C +95C4:7C7C44447C7C44447C7C40045FF442844FE44AA44FE442045FF4444443845C6C +95C5:7C7C44447C7C44447FFC48244FE448244FE4420443F442045FE4444443845C6C +95C6:7C7C44447C7C44447C7C400447C4444447C440044EE44AA44AA44EE440144008 +95C7:7C7C44447C7C44447E7C41044FE4444442845FF440044FE448244FE448244FEC +95C8:7C7C44447C7C44447C7C42044FC444445FF448244FE441044FE451045FF44108 +95C9:7C7C44447C7C44447C7C40045FF442845FF452945FF441044FE441045FF4400C +95CA:7C7C44447C7C44447C7C4004483445C4404453FC484441F4451449F450144008 +95CB:7C7C44447C7C44447C7C40944EA4424C5454482457D4410C4FE442844444582C +95CC:7C7C44447C7C44447C7C41045FF441045FF4555453945FF4454449245114410C +95CD:7C7C44447C7C44447C7C41144FE441445FF442044FE4742447E4442447E4400C +95CE:7C7C44447C7C44447D7C42044FE448244FE448244FE441145DA445444924531C +95CF:FC7E8442FC7E8442FC7E8002BFE2A022AFA2A222AFA2AAAAAFAAA25ADFCA8046 +95D0:7C7C44447C7C44447D7C4FE441044FE448244FE448244FE448247FFC4444482C +95D1:7C7C44447D7C46447FFC48244FE448244FE448244FE441045FF445444924410C +95D2:7C7C44447C7C44447C7C47C4444447C4444447C440044EE44AA446644AA4466C +95D3:7C7C44447C7C44447D7C49244FE440045FF440044FE448244FE444445FF4400C +95D4:7C7C44447C7C44447C7C41044FE441045FF444444FE440044FE44AA45FF4400C +95D5:7C7C44447C7C44447C7C51444A445F744494552455445F44444448A449145208 +95D6:7C7C44447C7C44447C7C40044FF449044FE449044FE449044FF440145554402C +95D7:7C7C44447C7C44447C7C4844484452945CE4484452945EF440044AA45154400C +95D8:00007C7C44447C7C44447C7C40245E2440F45E2452A45E6452244F2478B45048 +95D9:7C7C44447C7C44447C7C480444445E7C52945E9451545E246A544E8C4004400C +95DA:7C7C44447C7C44447C7C480449E45D2449E449247DE4492449E454C45154623C +95DB:7C7C44447C7C44447C7C492445445FF4501447C4444447C441044FE441045FEC +95DC:7C7C44447C7C44447C7C484452945CE44A545EF4428452945EF4428444944888 +95DD:7C7C44447C7C44447C7C40245F24517C5F9451145F5451245F244A545194400C +95DE:7C7C44447C7C44447C7C40045C44447C7F5452945E1452545E2453A47E544298 +95DF:7C7C44447C7C44447D7C46C4583447C4444447C440044EE44AA446644AA4466C +95E0:7C7C44447C7C44447D7C4FE449244FE441047FFC48244FE448244FE44444482C +95E1:7C7C44447C7C44447EFC4AA44EE440044FE449244FE449244FE441045FF44108 +95E2:7C7C44447C7C44447C7C40845E4453F45EA450445EF46A444AE44E444A544008 +95E3:7C7C44447C7C44447C7C492445445FF4501447C444444FE449244FE449244FEC +95E4:7C7C44447C7C44447FFC4AA44FE440045FF440044FC448444FC445244CC4562C +95E5:7C7C44447C7C44447C7C50844BE4408447F459444BE448844FF44884488457EC +95E6:7C7C44447C7C44447C7C42844FE44AA44FE44AA45FF4444447C4444442844FEC +95E7:7C7C44447C7C44447C7C408463E4508447F4722453E45154532455146FF4400C +95E8:200013FC10044004400440044004400440044004400440044004400440144008 +95E9:200017FC000440044004400440045FF440044004400440044004400440144008 +95EA:200017FC00044004410441044104410442844244442448244004400440144008 +95EB:200017FC000440045FF44004400440044FE44004400440045FF4400440144008 +95EC:200017FC000440044FE44104410441045FF44104410441044104410440144008 +95ED:200017FC0004408440845FF44084418442844484488450844284410440144008 +95EE:200017FC00044004400447C44444444444444444444447C44444400440144008 +95EF:200013FC100440045F844084488448844FE4402440245FA44024414440944008 +95F0:200013FC1004400440045FF4410441044FE44104410441045FF4400440144008 +95F1:200017FC010441045FF4410441044FE4410441045FF44114411441544124400C +95F2:200017FC00044104410441045FF4410443844544492451144104410440144008 +95F3:200017FC0204420442045FF444044484488449045144522467F4421440144008 +95F4:200013FC1004400447C444444444444447C444444444444447C4400440144008 +95F5:200017FC0004420441045FF44044444442844104428444444844400440144008 +95F6:200017FC0004420441045FF44004400447C44444444444544834500440144008 +95F7:200017FC00044204410441044404542454146454444443C44004400440144008 +95F8:200017FC000440044FE4492449244FE4492449244FE449244104410441144008 +95F9:200017FC0004420441045FF4410441044FE44924492449A44944410441144008 +95FA:200017FC000441044FE4410441045FF4400441044FE4410441045FF44004400C +95FB:200017FC000440045FF4444447C4444447C4444444745FC44044404440544008 +95FC:200017FC00044844444445F440445C4444A4449445144A0451F4400440144008 +95FD:200017FC0004410441044FE44924492449244FE44904412441F45E144804400C +95FE:200017FC0004400447C44444444447C440044FE4482448244FE4400440144008 +95FF:200017FC0104492449244FE440044FE4402440244FE44804481447F44004400C +9600:200017FC000445444524490459F46F044924492448C4489449544A3448144008 +9601:200017FC0204420447E44C445284410442844C6477DC4444444447C440144008 +9602:200017FC0004420441045FF4420444444F8441244644588443444C244004400C +9603:200017FC000440045FF4511451145FF4511453945554593451145FF44004400C +9604:200017FC0004440447C4488451046FE449244FE449244FE44114411440F4400C +9605:200017FC00044444428440044FE4482448244FE4428442844484489450744008 +9606:200017FC020441044FE448244FE448244FE4491448A44A444C2448144004400C +9607:200017FC010441144FE441445FF442044FE4742447E4442447E4442440144008 +9608:200017FC008440A440945FF440844EA44AA44EA440C4465458B441144204400C +9609:200017FC000442045FF444444924711C4FE449244FE449244FE4411440F44008 +960A:200017FC00044FE448244FE448244FE440045FF450145FF450145FF44004400C +960B:200017FC000442044CE448244EE448244FE4428442844494449448745004400C +960C:200017FC000440E45F044A2445445FF4501447C440444684410442844444482C +960D:200017FC000440645F8451045FF450845C5450344FE448244FE448244FE4482C +960E:200017FC0204420447E4482452444CE4482448244EE4482448244FE440144008 +960F:200017FC0004484444445EA448A449144E0C4A444A244A044A8452445624600C +9610:200017FC0004444442844FE449244FE449244FE441045FF44104410440144008 +9611:200017FC010441045FF441045FF45114555453945FF44544492451244104410C +9612:200017FC00044FE448244FE448244FE448244FE441445FF4410442844444482C +9613:200017FC01044FE449244FE441047FFC40044FE448244924492442844444482C +9614:200017FC0004483445C46444504451F44444484479F44914491449F44004400C +9615:200017FC000440845E9442A44A4C4454482457D4610C4FE4410442844444582C +9616:200013FC11044FE441045FF4420444444FE440044FE44AA44AA45FF440144008 +9617:200017FC01045FF441044FE448244FE448244FE448244FE448247FFC4444482C +9618:200017FC00044FE448244FE448244FE440045EF4421452944A5452944A54442C +9619:200017FC000451444A445F744494552455445F44444448A44914520440144008 +961A:200017FC00045C44447C7F5452945E1452545E2453A47E544294430440144008 +961B:200017FC00045FF452945FF440047FFC40044FE448244FE445144CA47444462C +961C:020004003FF020103FF020003FF8200820083FF801000100FFFE010001000100 +961D:00007C0044004800480050004800480044004400440068005000400040004000 +961E:00407C40444048404BFC50444844484444444484448468845104410442284410 +961F:00407C4044404840484050404840484044A044A044A069105110420844044802 +9620:00007DF04490489048905090489049F04490449044906892508A408A40864082 +9621:00087C3C45E048204820502048204BFE44204420442068205020402040204020 +9622:00007C0047FC48904890509048904890449044904490689251124112420E4400 +9623:00407C40448048FE4900520048FC480844104420444068805102410240FE4000 +9624:00207C2044204920492C513449644BA445244534452869225122410240FE4000 +9625:0040784048405044506867705160495049504A486A4854444842404041404080 +9626:00407C40444048404944514449484A50444044A044A068905110410842044402 +9627:00107D104490489048105110489048904410441E45F068105010401040104010 +9628:00007DFE450049004978514849484948454845684550694251424142423E4400 +9629:00087C68478848884888508848884BFE44884488448868885108410842084408 +962A:00087C1C45E04900490051FC4944494445444528452869105110422842444482 +962B:00007C0045FE4810481050204820486844A44522462268205020402040204020 +962C:00807C4044404BFC4800500049F04910451045104510691251124212420E4400 +962D:00407C4044804888490453FE48024890449044904490689051124112420E4400 +962E:00007DFC44004800480053FE48904890449044904490689251124112420E4400 +962F:00207C204420492049205120493C492045204520452069205120412047FE4000 +9630:00107D10451049124912511449D84910451045104510691251524192410E4000 +9631:00887C88448848884BFE508848884888448847FE448868885088410841084208 +9632:00407C2044204BFE48805080488048FC44844484448468845104410442284410 +9633:00007C0045FC4904490451044904490445FC4504450469045104410441FC4104 +9634:00007DFC45044904490451FC49044904450445FC450469045204420444144808 +9635:00407C4044404BFE488050A0492049FC4420442044206BFE5020402040204020 +9636:00207C2044504850488851044A02488844884488448868885088410841084208 +9637:00007C0045FE48204820502049204920453C4520452069205120412047FE4000 +9638:00407C2045FC4904490451FC49004900457C45084510692051424282427E4400 +9639:00207C20442049FC4820502048204BFE4420444044406888510443FE41024000 +963A:00047C1E45F0491049105110491049FE4510451045106908510A414A41A64112 +963B:00007DF845084908490851F849084908450845F8450869085108410847FE4000 +963C:00807C80448048FE494051404A40487C444044404440687E5040404040404040 +963D:00207C2044204820483E50204820482045FC4504450469045104410441FC4104 +963E:00207C2044504850488851244A12481045FC4404440868885050402040104010 +963F:00007DFE4408480849E85128492849284528452845E869285008400840284010 +9640:00407C20442049FE49025204490049084510452045C069045104410440FC4000 +9641:00807C8044FE49004A205120492C497447A44524453469285122410240FE4000 +9642:00207820482053FE5222622452204BFC4A844A886A4852504220445044884906 +9643:00007DFE44204820482051FE492249224552454A458A690251024102410A4104 +9644:00887C8844884908497E53084D08494845284528450869085108410841284110 +9645:000079FC48005000500063FE50204820492849246A2452224422402040A04040 +9646:00207C20442049FC4820502048204BFE44204420452469245124412441FC4004 +9647:00907C88448848804BFE50A048A048A444A445284528693252224262449E4800 +9648:00407840484057FE5080612051204A204BFC4820692851244222442240A04040 +9649:00007DFC440848104830504848844B02440045FC442068205020402043FE4000 +964A:00207C20447C488449485030482048484590443E444269A45018401040604180 +964B:00007BFE4820502052FC62A452A44AA44AD44A846A8452944288420043FE4000 +964C:00007DFE44204820484051FC49044904450445FC450469045104410441FC4104 +964D:00807C8044FC49084A90506049984E26442045FC44206A2053FE402040204020 +964E:00207D20452049FC4920522048204BFE447044A844A869245124422240204020 +964F:00207C2045FE4840484050FC4884498446FC4484448468FC5084408440944088 +9650:00007BF84A08520853F8620852084BF84A444A486A3052204210428843064200 +9651:00007DFE44204820484051FE49524952455245524552695251524142410A4104 +9652:00407C4044FC49044A0851FE4900497C454445444554694851424242423E4400 +9653:002078204BFE48505088510462FA50004BFE4840488069FC5004400440284010 +9654:00407820482057FE5040608451084BF048224844698856104020405041884604 +9655:00407840484057FC50406248515048404FFE48A068A051104110420844044802 +9656:00407C40448849044BFE500248884944464244F845886A505020405041884606 +9657:00207D2444A448A8482051FC4904490445FC4504450469FC5104410441144108 +9658:00007BFC48005124524864905248492448004BFC684050404040404047FE4000 +9659:00007DFE45004900497C5100490049FE45504552455469485148424442524460 +965A:001078184BD45014501067FE5010489048904AD06A905290428A42EA47064202 +965B:02207A244A2853B05220622252A24B1E484048406BFC50404040404047FE4000 +965C:00207C2044204BFE4820502049244924452446AA442068505050408841044202 +965D:00407840484057FE5040645052484A484D5448A268A051104110420844044802 +965E:00287DC8448848884BFE5088488849084628442045FC68205020402043FE4000 +965F:002078204920513C5120612057FE480048204924692452284410402040C04700 +9660:00287C2445FE4820482051FC4924492445FC4524452469FC512441244124410C +9661:00207C2045FC4820482050204BFE482044204520453C692052A04260443E4800 +9662:004078204BFE5202540461F8500048004BFE48906890509041124112420E4400 +9663:00207C2045FE482049FC5124492449FC4524452445FC682053FE402040204020 +9664:00007840484050A05110620855F6484048404BFC684051504248444441444080 +9665:00407C40447C488449085210493E492245224522453E692251224122413E4122 +9666:00207C2047FE482049FC50404BFE4848448844FE450869485228440840284010 +9667:00007DFC4504490449FC5104490449FC4420442045FC68205020402043FE4000 +9668:00007CF84488488848F8500049FC490445244524452469245050404840844304 +9669:0040784048A050A05110620855F64800488848486A4851504110402047FE4000 +966A:00407C2045FC48004908509048004BFE4400440045FC69045104410441FC4104 +966B:00907C9044904B9E4890509048904B9C4490449044906B9E5090409040904090 +966C:00007FE04A5E5252525263D252524A544BD44A546A4852E84754405440624040 +966D:00207C2045FC4850488851044BFE480845E84528452869E85128400840284010 +966E:00A07C90448049FE491053104DFC4910451045FC45106910511041FE41004100 +966F:00207C2044504888490452FA480049FC4554455445FC6954515441544104410C +9670:00207C20445048884944522249F84808441045FC44006BFE5040408841FC4084 +9671:00807C8044FE49024A42524A4952484247FE444244E26952524A404240544008 +9672:0008783C49E05020502063FE512449244FFE4924692453FE4020402043FE4000 +9673:004078404FFC504053F8624853F84A484BF8484068E0515042484C4640404040 +9674:004078804BFC5224522463FC52244A444BFC4890691057FE4010401040104010 +9675:0020782049FC5020502063FE508849444A4248F8698852504020405041884606 +9676:0100790049FC5204550461E4528448844FF448846AA452A443E4400440284010 +9677:0080788048F851085210640050404B9C4A044A046B9C52044204420443FC4204 +9678:00207C2045FC4820482053FE488849044622442045FC68205020402043FE4000 +9679:00287DC8448848884BFE508848884908460045FC4504690451FC4104410441FC +967A:00207C2044504888490452FA4820482045FC4524452469FC5050408841044202 +967B:00007BFE4850505053FE625252524A524BFE4820682053FE4020402047FE4000 +967C:00207C2245FA4824482853FE4820484044FC4584468468FC5084408440FC4084 +967D:00007CFC448448FC488450FC480049FE448044FE452A6A4A5092412240544088 +967E:00007BFE4820504051FC6154515449544954492C682053FE4050408841044202 +967F:00007DFE4510491049FC51104954495445BA4510452869245142418041FE4000 +9680:00087C3C45E048204BFE502049FC492445FC452445FC682051FC402043FE4000 +9681:00007BFE4A0052FC528462FC52844AFC4A204BFE6A4852C842304248428443FE +9682:00207C50448849044AFE508048F8488044F8448047FE68405088410443FE4002 +9683:004078A04910520855F6600053C44A544A544BD46A54525443D44244425442C8 +9684:00007DFC4504490449FC5104490449FC440047FE44206920513C412042A0447E +9685:01FC7924492449FC5124512461FC502048204BFE4A226A2A52FA420A42024206 +9686:008079F84A08551050E063185C064BF848404A406BFC544043F840404FFE4000 +9687:000C780A48084BFE520853F8624A524A4BEA4AAC4AAC6A4C52AA430A42164422 +9688:00007BF84A484A4853F85248624853F848004FFE4A406A445228429043084206 +9689:00407D9C4504490449DC5104490449FC4400440045FC68205020402043FE4000 +968A:01047888480053FE504060C251224A54489849386A5450944112461040504020 +968B:004078404BFE508051FC622055FE480049FC490469FC510441FC410441144108 +968C:00407C2045FE4800488450484BFE480044FC4484448468FC5084408440FC4084 +968D:00207C4045FC490449FC510449FC480047FE4420442069FC5020402043FE4000 +968E:01107D1245D4491849525192492E484045FC4504450469FC5104410441FC4104 +968F:0010781049FE5420524060FC514448444E7C4A446A7C524442544248450048FE +9690:0080788049F84A08541053FC600451FC48044BFC480468405124452A450A48F8 +9691:00207D244524492449FC50004BFE480045FC4504450469FC5088405043FE4000 +9692:00887C50440049FE485051FC48544BFE445445FC445068D85154425240504050 +9693:00207C2045FE484048FC51104AFE4800442045FE444068FC5110421041FE4000 +9694:00007BFE480051FC5104610451FC48004BFE4A8A6A5253FE42224222422A4204 +9695:00007CFC4484488448FC500049FE490245FE450245FE690251FE404840844102 +9696:00407C8045FC4904490451FC490049FE450045FE44026AAA52AA440240144008 +9697:002078404BFC4A24522453FC622452444BFC484048A868B4513C41224222441E +9698:020879084910480057FC5000611052084C044BF84AA86AA852A842A84FFE4000 +9699:00207CA845244A22480051FC490449FC450445FC442068A85124422240A04040 +969A:00207D2444A84BFE4A0250F84888488844F84420442069FC5020402043FE4000 +969B:010079104BDC52545554628851084AF44C0248006BFC50404150424845444080 +969C:00207DFC448848504BFE500049FC490445FC450445FC682053FE402040204020 +969D:00407C8045FC490449FC510449FC490045FE450045FE680252AA42AA4202400C +969E:01087908490857D0511E679451244FD44A144BD46A545248424844D444244842 +969F:01247A484924500051FC612451FC492449FC48206BFE507040A8412446224020 +96A0:00087C3C45C04844492450A849FC480444FC440445FC684050A442AA428A4478 +96A1:004078204BFC50005108609053FE4A204AA04AFC6B20522042FC4420442049FE +96A2:00207C2045FC48204BFE51084B9C49084588463E44006BFE509040904112420E +96A3:0020792448A853FE50A8612452224904490449DE6A445554409E410442044404 +96A4:00207DFC452449FC482053FE480049FC450445FC450469FC510441FC40884104 +96A5:00107BD248545148508A610452FA4C0049FC4904690451FC4104408847FE4000 +96A6:00107BC84A7E5240526263D452004A3E4BC84A486E7E5248424843C842484008 +96A7:00887C484A5050FC5020605056944A384A504A986A3452544290422045FE4800 +96A8:002079FE4C404AFC511052FE600056FC4A844AFC4A846AFC5284428C450048FE +96A9:004078804BFE522252AA622253FE4A724AAA4A02682053FE4050408841044602 +96AA:00207C2044504888490452FA4800480045DC4554455469DC5088408841544222 +96AB:00207DFC442048884BFE508849FC490445FC450445FC690451FC408841044202 +96AC:00007BFE49244A2257FE5222637652AA4B764A224B766AAA53764222422A4204 +96AD:000079FC48204BFE522251AC602051AC48004BFE482069FC515441544154410C +96AE:004078204BFE4888505257AC62AA52A84DAC4800490469FC510441FC41044204 +96AF:00207BFE482049FC500053FE600251FC48204BFE48006BFE500443BE42A4438C +96B0:00007BFE4A024BFE520253FE610852524B9C49084A526BDE500042A442524452 +96B1:003E7FC04A44492853F8504067FC50004BF848084BF8680853F84544452A48FA +96B2:00207CA845244A2A483050C04BFE492045FC452045FC692051FE400242AA4004 +96B3:00407BFC488051F84A204DFC688850F8418846C01930E10E1190214845240200 +96B4:011078904BDE4810525E518263DE50104BDE4A504BDE6A5053DE4250425242CE +96B5:0108F1EC910AA7E8A528C5DEA72894EA940A97EAD40CA7EC8A2A8BEA915687E2 +96B6:010001003FF801080108FFFE010801083FF821081190056009203118C5060200 +96B7:10201020FCFC102411FE7C2400FC7C200124FCA8107054A85324922210A03040 +96B8:10201020FEFC382455FE922410FC7C200124FEA8107054A85324922250A02040 +96B9:0900088008801FFC108030805FF8908010801FF81080108010801FFC10001000 +96BA:020002007FFC450408801FFC308050809FF8108010801FF8108010801FFC1000 +96BB:090008801FFC30805FF890801FF810801FFC10003FF00820044003801C70E00E +96BC:090008801FFC30805FF890801FF810801FFC11000100FFFE0100010001000100 +96BD:090008801FFC30805FF890801FF810801FFC10003FE00420047C08043014C008 +96BE:00A00090FC8005FE05104B102DFC2910111011FC29102510451081FE01000100 +96BF:28502448248020FE3D90E29020FC2090209020FC20902090149014FE0C800480 +96C0:010011101108212440C003000C803040DFFC10801FF810801FF810801FFC1000 +96C1:00003FFE20002250224824FE24902D9036FE2490249024FE2490449044FE8480 +96C2:08500848148014FE2390529088FC089000907EFC02900490049008FE08800080 +96C3:00507E48248024FE2590269024FCFF90249024FC24902490249024FE44808480 +96C4:0850084808807EFE1190129020FC2890489048FC9090149022907EFE22800080 +96C5:00507E48048024FE2590269044FC7F900C9014FC14902490449084FE14800880 +96C6:090008801FFC30805FF890801FF810801FFC1100FFFE054009203118C1060100 +96C7:010000803FFC20043FFC2280224027FC2C4037F8244027F84440444087FC0400 +96C8:0440FC7E0440010008801FFC108030805FF8908010801FF8108010801FFC1000 +96C9:20A0209020807DFE5110931015FCFD10111011FC11102910251045FE41008100 +96CA:2050204820807EFE439082907AFC4A904A904AFC4A907A904A9002FE14800880 +96CB:090008801FFC30805FF890801FF810801FFC10003E7C2244224423C420142008 +96CC:14501448148054FE55905E9054FC5490549054FC549054905D9076FEC4800080 +96CD:02000100FFFE1050104824FE45907A9010FC2490449078FC0890109020FEC080 +96CE:00507C48448044FE45907E9044FC44907C9044FC449044904E90F0FE00800080 +96CF:205020483E8042FE85900A90FEFC029002907EFC029002900290FEFE02800080 +96D0:010001F801003FFE210221F02F0422FC224027FE2C4037FC244047FC444087FE +96D1:20502048F88028FE29902A9046FC90901090FEFC10903490529092FE50802080 +96D2:205020483C8044FEC5902A9010FC2890449082FC7C904490449044FE7C804480 +96D3:10501048288044FE83907E9010FC1090FE9010FC54905290929010FE50802080 +96D4:1428122420403F7E64C8A5483F7E244824483F7E2448244824483F7E20402040 +96D5:00287F244940497E5DC849487F7E41485D48557E55485D484148417E45408240 +96D6:00507C48448044FE7D90129010FCFE90929092FCFE901090149012FEFE800280 +96D7:10401040107EFE8011507C4844FE7D9046907CFC1090FEFC1090109010FE1080 +96D8:00443DFE2454244834FE2D9024FE2490FEFE249024FE248025FE244444388DC6 +96D9:081024483F7E64C8BF7E24483F7E24483F7E20401FF00820044003801C70E00E +96DA:0820FFFE08203EF822883EF8090008801FFC30805FF890801FF810801FFC1000 +96DB:202820247F40917E55C87D48217E4A48A4487F7E914855487D48217E4A408440 +96DC:10500848FE8000FE259026905AFC91901090FEFC10905490929012FE50802080 +96DD:492892244940007E7CC845487C7E0048FE48927E9248FE488148817E7F400040 +96DE:0E50F048228092FE4590229044FCF890109024FCFE901090FE9028FE44808280 +96DF:010042047FFC08803440CFFC18802FF848800FFE08003FFC24242BD4224423CC +96E0:30182A1441207D3ED06853287D3E512851287D3E5128516851A87D3E40204020 +96E1:0028EE242240AA7E66C8AB48187E66488948307EC4481948E2480C7E3040C040 +96E2:102808247F40147E49C85548417E7F4808487F7E514855485D48417E45404240 +96E3:22282224FF40227E3EC809487F7E49487F48087E7F480848FF48147E22404140 +96E4:3AB821083AB82288393822887FFE48829FFC30805FF890801FF810801FFC1000 +96E5:08801FFC30805FF890801FF810801FFC24483F7E64C8BF7E24483F7E24483F7E +96E6:318C294A22107BDE56B4D2947BDE529452947BDE5294529452947BDE42104210 +96E7:08801FFC3080DFF810801FFC14283F7E64C8BF7E24483F7E0100FFFE0920711C +96E8:0000FFFE0100010001007FFC4104410449444524410449444524410441144008 +96E9:3FF801007FFE41029D7401001D7000003FF80000FFFE04000FF0001000A00040 +96EA:3FF801007FFE41029D7401001D7000003FF8000800081FF8000800083FF80008 +96EB:00003FF801007FFE41029D7401001D700000FFFE020002400220021002000200 +96EC:00003FF801007FFE41029D7401001D70000001007FFC038005601918E1060100 +96ED:3FF801007FFE41029D7401001D7000003FE008400CF81210112020C043309C0E +96EE:00003FF801007FFE41029D7401001D70000001F03E0003F03E0003FA7E0201FE +96EF:3FF801007FFE41029D7401001D70020001007FFC08200440038004401830E00E +96F0:3FF801007FFE41029D7401001D70044008203018DFE604200420082010A02040 +96F1:3FF801007FFE41029D7401001D70020001007FFC040007F00410081010A06040 +96F2:3FF801007FFE41029D7401001D7000003FF800000000FFFE082010103FF80008 +96F3:3FF801007FFE41029D7401001D7000003FFC200021002FF82108420844509820 +96F4:00003FF801007FFE41029D7401001D70020001003FF8000008200440FFFE0000 +96F5:3FF801007FFE41029D7401001D70000001001FF011101110FFFE02801C70E00E +96F6:3FF801007FFE41029D7401001D7002800C603218C1061FE00020064001800040 +96F7:00003FF801007FFE41029D7401001D7000003FF8210821083FF8210821083FF8 +96F8:00003FF801007FFE41029D7401001D70000008207FFC08200FE008200FE00820 +96F9:3FF801007FFE41029D7401001D7008001FF020105F9010901FD0102010040FFC +96FA:3FF801007FFE41029D7401001D7000001FF0022001407FFC0484188862800100 +96FB:3FF801007FFE41029D7401001D7000003FF821083FF821083FF80102010200FE +96FC:3FF801007FFE41029D7401001D7000007FFC040008001FF82808C8080FF80808 +96FD:3FF801007FFE41029D7401001D70000000F87F0011100920FFFE010005000200 +96FE:3FF801007FFE41029D7401001D7004000FE0144003801C70E20E0FE004201860 +96FF:3FF801007FFE41029D7401001D700000244814500C601450644808421042603E +9700:00003FF801007FFE41029D7401001D700000FFFE02003FF82488248824A82010 +9701:3FF801007FFE41029D7401001D7000807FFC082007C01830E44E044008401040 +9702:00003FF801007FFE41029D7401001D702040104087FE50E02150E24824442842 +9703:3FF801007FFE41029D7401001D70204013FC824454A810A0E1222222241E2800 +9704:3FF801007FFE41029D7401001D70111009203FF820083FF820083FF820082018 +9705:3FF801007FFE41029D74000001007FFC00003FF800003FF800003FF820083FF8 +9706:3FF801007FFE41029D7401001D7000087C3C09E010203DFC44202BFE10006FFE +9707:3FF801007FFE41029D7401001D7000003FFC20002FF820003FFC24484430860E +9708:00003FF801007FFE41029D7401001D70204017FC40402BF80A48724812581040 +9709:3FF801007FFE41029D7401001D7010001FFC20005FF01210FFFE20903FFC0030 +970A:3FF801007FFE41029D7401001D7000001FF000007FFC044024481450FFFE0000 +970B:3FF801007FFE41029D7402001FF002107FFC02101FF004007FFC082007C07838 +970C:3FF801007FFE41029D7400003FF8210827C821082FE8200827C8444847C88018 +970D:3FF801007FFE41029D7401001D7008801FFC30805FF890801FF810801FFC1000 +970E:3FF801007FFE41029D7401001D7002003FF808207FFC0200FFFE082007C07838 +970F:00003FF801007FFE41029D7401001D7004407C7C04403C7804407C7C04400440 +9710:3FF801007FFE41029D7401001D70000027881088878854102790E0A422BE2102 +9711:3FF801007FFE41029D7401001D7020001040807C48400BF81208E20823F82208 +9712:00107F100810FFA888A86B4408A26B1000107E7C0004FF04100822087F100110 +9713:3FF801007FFE41029D7401001D70060038F820083CF820083FF808421042E03E +9714:3FF801007FFE41029D7401001D702080104087FC4040104023F8E040204027FC +9715:00107F10087EFF9088906B5408546B5400547F7C0014FF90101222127F12210E +9716:3FF801007FFE41029D7401001D70082008207EFC08301C682AA4C92208200820 +9717:3FF801007FFE41029D7401001D70204010A00158462629F0081070A010401020 +9718:3FF801007FFE41029D7401001D70200013FC020442F42A040AF4729412F4120C +9719:3FF801007FFE41029D7401001D700820FFFE09201FF01110FFFE02801C70E00E +971A:00003FF801007FFE41029D7401001D7000207E20247E18A4FF2829104A2898C6 +971B:3FF801007FFE41029D7401001D7000007BDE08427BDE42107BDE0842294A1084 +971C:3FF801007FFE41029D7401001D70000008FC7E8418FC2C844AFC888408FC0884 +971D:00003FF801007FFE41029D7401001D7000007BBC4AA44AA44AA44AA47BBC4AA4 +971E:3FF801007FFE41029D7401001D7000003EF822083EF820003EF820483E3020CC +971F:3FF801007FFE41029D7401001D701090089043FC2090089017FE709011081204 +9720:3FF801007FFE41029D7401001D7020201050FC8849444A2210F81E08F0104020 +9721:3FF801007FFE41029D7401001D7000203C1024E03C2225B43CA8252426A24C40 +9722:3FF801007FFE41029D7401001D70000C7DF045087D7045447D68455055488A66 +9723:3FF801007FFE492284140FE008203FF820083FF820083FF820083FF808201010 +9724:3FF801007FFE41029D74040079FC40444844545462883FF821083FF821083FF8 +9725:3FF801007FFE41029D7400007FFE40029FF406003B0804B019C062A00C987306 +9726:3FF801007FFE41029D7401001D7022042208F7B022047708AAB2224422182260 +9727:3FF801007FFE41029D74000000407EFC15440838FE441AA22CFC4844A8941108 +9728:3FF801007FFE41029D7400003F0821083F7E20082F4820285F88440895282C90 +9729:3FF801007FFE41029D740000087C7F4422483E5000483E4404647F5808401840 +972A:3FF801007FFE41029D7401001D70203C17C08244412817FC2040EFFE204027FC +972B:3FF801007FFE41029D7400007EFC22441A3462C404001FF010101FF010101FF0 +972C:3FF801007FFE492284143FF821083FF821083FF804403FF80440FFFE08201010 +972D:3FF801007FFE4922841423F8120803F8720813F8110013FC14441AA413F4000C +972E:3FF801007FFE49228414211017FC911041F0411011F02110E7FC2250228823FC +972F:3FF801007FFE41029D74000000907EA004442BA810102FE8C8260FE004407FFC +9730:3FF801007FFE41029D74000012203F20123E7F4400A43F2421283F1021282346 +9731:3FF801007FFE49229FF402207FFC04887A8001003FF8282837D8244827C82018 +9732:3FF801007FFE41029D7401001D7000407CF845487C3011CE5C0050F85C88E0F8 +9733:3FF801007FFE41029D74008079F84A884870538E492049FC6A2050F8402043FE +9734:00207C2010FCFE2493FE542410FC542001247CA80070FEA821244822FCA00440 +9735:3FF801007FFE41029D7400003E2822243E240020FFFE22243E282392FE2A0246 +9736:3FF801007FFE41029D74008047FC21100FFE884257FC1100E1F8220822282410 +9737:3FF801007FFE4922841401F8790849F849084BFE79004BFC4CA449247A544888 +9738:3FF801007FFE41029D7422007F7C22443E44087C7F4449447F7C0844FF540888 +9739:3FF801007FFE41029D7401001D7000107EFE42447E2840FE7E10627CBE102210 +973A:3FF801007FFE41029D7401001D702010455097DE20246FD4A014278824D428A2 +973B:3FF801007FFE41029D7404403FF824483FF824487FFC10101FF00820FFFE0000 +973C:00807C8010FCFF0092F8540011F8544801687CC801F8FE4A20EA495AFC460442 +973D:3FF801007FFE49228514FFFE02887D7025484D6690101FF010101FF010102010 +973E:3FF801007FFE41029D743000CBFC2D2431FCC92415FC64200DFC3420C5FE1800 +973F:3FF801007FFE41029D7400807DF8068828701088FD0634F8508890F8508820F8 +9740:3FF801007FFE41029D7408207FFC08207FFE40029FF40600192006C038A00318 +9741:3FF801007FFE492284143FF821083FF821083FF80000FEFE9292FEFE9292FEFE +9742:3FF801007FFE492284147FFE40005F3C44107F7E4E345552609044F84480BFFE +9743:3FF801007FFE41029D7401001D70081024483F7E64C8BF7E24483F7E24483F7E +9744:3FF801007FFE4922A41411FCFD0401FC790401FC788001FE7A224D5279FA4806 +9745:00287CFE102AFEFE92A854FE104A54FE00827CFE0082FEFE208248FEFC440482 +9746:00107E10117CFE1492FE5414137C559201547D380154FF9221304900FEFE0400 +9747:3FF801007FFE41029D74000008407F7C1440FF7C22043E7C22403E7C2242263E +9748:3FF801007FFE41029D7401001D7000003BB82AA83BB800007FFC11102928FFFE +9749:000E7DF010A2FE5493FE552210145552014A7E380040FE7C20844948FC3004CE +974A:3FF801007FFE41029D74000049245D7449247FFC00003FF808200FE004407FFC +974B:3FF801007FFE41029D74200017FE840047DC148827FEE5CC26AA293C292013FE +974C:3FF801007FFE492285147FFC40843CF809283CB009287FF011101FF008201010 +974D:3FF801007FFE41029D74284024FC7E8448FCFE8448FE7E8048FE48027EAA4004 +974E:3FF801007FFE41029D74084014FC22845CFC88843EFE08804AFE28020EAA7004 +974F:3FF801007FFE41029D7410407EFC528428FC3E8468FEBE8028FE3E0228AA3E04 +9750:3FF801007FFE49229FF411101FF000007C7C1010FEFE929254547C7C54547C7C +9751:010001007FFC01003FF80100FFFE00001FF0111011101FF01010101010501020 +9752:010001007FFC01003FF80100FFFE00001FF010101FF010101FF0101010501020 +9753:100010FCFE8410847CA410A4FEA400A47CA444A47C5044507C5044925492490E +9754:10401040FE7E10807D00107CFE0000007CF844087C0844087C0A440A54064802 +9755:00200020FDFE102010FC102051FE5C0050FC508450FC50845CFCF08400940088 +9756:2020102013FEFC2001FC08208BFE880049FC490451FC51041DFCE10441140108 +9757:10201020FD2410A47CA81020FDFE00507C5044507C5044507C924492550E4A00 +9758:10401040FCFC10887D1010FCFEA400A47CA444FC7C8044807C824482447E4C00 +9759:10401040FE7810887C1011FCFE2400247DFE44247C2445FC7C24442054A04840 +975A:100011FCFF0411047DFC1104FF0401FC7D0445047DFC44507C90449255124A0E +975B:10201010FEFE10827D041000FEFE00107C1044907C9E44907C9044D0553E4A00 +975C:101E11E0FE92104C7C0010FCFE2400247DFE44247C2444FC7C24442054A04840 +975D:10801080FCFC11007EF81000FDF800487D6844C87DF8444A7CEA475A54464842 +975E:044004400440FC7E0440044004407C7C0440044004400440FC7E044004400440 +975F:044004407C7C04403C7804407C7C044000F03F0001F03F0001F87F02010200FE +9760:11001FF02100FFFE00001FF010101FF004407C7C04403C7804407C7C04400440 +9761:00803FFE24103F7C26382D543412212021203F3E21202F3C21205F3E41208120 +9762:0000FFFE0200020004003FF82448244827C82448244827C8244824483FF82008 +9763:0000FFFE0200020004003FF82008200827C82448244827C8200820083FF82008 +9764:0040FE4010FC2084FF04AAF4AA94BA94AAF4AA84BA94AA88AA82FE82827E0000 +9765:3FFC20903FFC21402630380C27F020802FF82A282BE82A284BE84A288FF80808 +9766:0000FEFC10842084FEFCAA84AA84BAFCAA84AA84BAFCAA50AA50FE528292010E +9767:0010FEFE109220FEFE10ABFEAA00BAFEAA82AAFEBA82AAFEAA82FEFE82440082 +9768:3FFE28882F8A20082FBE28882F88289429A23FFE20802FFC292449E449248FFC +9769:082008207FFC082008200FE001003FF8210821083FF80100FFFE010001000100 +976A:22002200FF7E22083E0808087F08490849087F080808FF880808080808280810 +976B:280029F8FE8828C838A810A87C88545054507C501020FE201050108811041202 +976C:2200227CFF1022103E1008107F1049FE49107F100810FF900810081008100810 +976D:22002200FF7E22123E1208527F52495249527F920812FFA20822084208940908 +976E:22202220FF20227E3E4208827F02498249427F220822FF820802080208140808 +976F:22102210FF1022103E10087C7F10491049107F100810FF90081008FE08000800 +9770:28002800FDFC2890389010907C90549054907C901090FC9210921092110E1200 +9771:28002800FDFC2844384411447CC4544454647C54104CFC861084110412281410 +9772:28202820FE202850385010887D44562254207CF81008FE081010101010201020 +9773:2204220EFF7022403E4008407F7E494849487F480848FFC80848088808880908 +9774:28502850FE502892389211947E98549054B07CD01090FE9010921092108E1080 +9775:280029F8FE482848384810487C4855F854887C881088FE881088108813FE1000 +9776:280029FCFD242924392411247D2455FC55047D001100FD001102110210FE1000 +9777:280429E4FE242824382411E47D04550455047DE41024FE241024102411441084 +9778:28002BFCFC842888388810907C9C548455447D441128FD281210122814441182 +9779:28202820FE2029FE392211227D22552255527D4A118AFF0211021102110A1104 +977A:28202820FC202BFE382010207C2055FC54707CA810A8FD241124122210201020 +977B:280028F8FE882888388810F87C88548854887CF81088FE881088108813FE1000 +977C:28002800FEFC2884388410847CFC548454847C8410FCFE841000100011FE1000 +977D:28202820FD2428A438A810207DFC542054207C2013FEFC201020102010201020 +977E:282828A8FEA828A838A813FE7CA854A854A87CA810B8FE801080108010FE1000 +977F:50105090F8905110717E2252FB92A892A912F9122252FBD220622022204A2084 +9780:280029FCFE442844384410447C94548855007CFC1084FE841084108410FC1084 +9781:28102810FE1029FE391211147D1055FC55447D441128FF281110122812441482 +9782:2808283CFDE02820382010207DFE542054707C6810A8FCA41122102010201020 +9783:280829C8FE482848384811C87D08550855107DD01054FE541052105E12821100 +9784:28402840FEFC2884390412F47C94549454F47C841094FE8810821082107E1000 +9785:28202820FE2029FC392411247D24552455247FFE1020FE501050108811041202 +9786:280029FEFC202820382011FE7D22552255527D4A118AFD0211021102110A1104 +9787:280029FCFD042924392411247DFC552455247D54114CFD8C1104110411FC1104 +9788:28202820FE502848388411027CFC540054007CFC1084FE841084108410FC1084 +9789:28502850FE50295238D410587C50545854D47D521050FE50109210921112120E +978A:28202820FC202BFE382010207DFC540054007DFC1104FD041104110411FC1104 +978B:28202820FEFC2820382010207DFE540054207C2010FCFE201020102011FE1000 +978C:01007FFC44043FF8082007C0783804407FFC044007C001001FF01110FFFE0100 +978D:28402820FC202BFE3A0214447C4057FE54887C881108FCD01020105010881304 +978E:280028FCFE84288438FC10847C8454FC54A27CA41098FE90108810A410C21080 +978F:7CF8108810CA1D2AF20608207FFC08200FE001003FF821083FF80100FFFE0100 +9790:28202820FE3E2820382011FE7C00540055FE7C201028FE241022102010201020 +9791:28102910FC902890387E10107D90549054987CA810A4FCC410801140123E1000 +9792:2808281CFEE02820382011FE7C50548855047E8A1088FE881088108810881108 +9793:280028FCFE842884388410FC7C00540055FE7C201020FEFC1020102011FE1000 +9794:28802880FCF829083A1011FC7D24552455247DFC1050FC50109010921112120E +9795:280029FEFC20282039FC11247D2455FC55247D2411FCFD2010A0104010B0130E +9796:2804281EFDE02822391210947C80542055FE7C441084FDC81030102810C41302 +9797:108011F8128820702B8E68886BFEA88828F8282029FC292429FC202023FE2020 +9798:28102892FE522854381010FE7C82548254FE7C821082FEFE10821082108A1084 +9799:280028F8FE88288838F810007DFC550455047DFC1104FF0411FC110411141108 +979A:28202810FE1029FE390212547C88550454007CFC1020FE201020102011FE1000 +979B:28202810FEFC2800388810507C0055FE54007C0010FCFE841084108410FC1084 +979C:28202822FDB428A838A811247EA2544055FC7D041104FDFC1104110411FC1104 +979D:28202924FCA428A8382011FC7D04550455747D541154FD541174110411141108 +979E:28202840FCFE2892389210FE7C9254A254FE7C481088FDFE1008100810081008 +979F:28202810FDFE280038FC10847CFC540054FC7C081010FDFE1010101010501020 +97A0:28802880FEFE29023A2210AA7C72542255FE7C221072FEAA11221022100A1004 +97A1:28902888FC8828BE3BC010827CA254E254927D921294FC941084108812BE1100 +97A2:28482948FD482BFE394811487D78550055FE7C2013FEFC7010A8112416221020 +97A3:280029FCFC4828303BFE10527C94551056307C2013FEFC7010A8112416221020 +97A4:08087F0808FEFF0808487F2808080F28F01004407FFC04401FF01110FFFE0100 +97A5:28202830FE482884397A10007CFC548454847CFC1048FE4811FE104810881108 +97A6:500850C8FB085108712A212AFBACA948A908FB882554F9142114212421242142 +97A7:28882848FC502BFE385010507DFC555455547D8C1104FDFC1104110411FC1104 +97A8:280029FCFD0429FC390411FC7C8055FE56227D221152FD0211FA100210141008 +97A9:50825082FAA251CA708A23EAFA2AAA2AABEAFA2A222AFBEA2222222222AA2244 +97AA:7E20243E1848FFA829104A28984604407FFC044007C001001FF01110FFFE0100 +97AB:28802880FCFE29023A4211FA7C0255F254027DF21002FDF2111211F210141008 +97AC:50105010F87C571471FE2114FA7CAA10AF7CF91021FEFD102210230024FE2800 +97AD:288028FEFE90297C395413547D7C555455547D7C1190FF501120113011481186 +97AE:280028FCFE84288438FC10847C8454FC54007DFE1020FEA010BC10A01160123E +97AF:28482848FDFE2848382011FE7C40544054BC7D841288FCBE1088108810A81090 +97B0:280028F8FE88288838F810887C8854F854007DFC1154FF541154115413FE1000 +97B1:281E28E0FE222892385410407C2054CE54827C8210EEFE821082108210FE1082 +97B2:50885088FBFE508871FC2088FBFEA820A9FCF92421FCF92423FE210421142108 +97B3:28882888FDFE2888382010507C88550456FA7C001000FDFC1104110411FC1104 +97B4:50885088FBFE5088708827FEF880A9FCAB24FDFC2124F9FC212421242124210C +97B5:281E2BE0FD222894384010887DF0542054C47DFE1022FC2013FE105010881306 +97B6:08783E48228E2A007EF822482A3046CC7FFC044007C001001FF01110FFFE0100 +97B7:7FFC08200FE000003FF824482FE82108211804407FFC04401FF01110FFFE0100 +97B8:280029FCFD2429FC392411FC7CA854A857FE7CA810A8FDFC102013FE10201020 +97B9:5100509EFBD2501273D42254FBD8A814ABD2F8522092F8DA2394209022902110 +97BA:28202924FCA82BFE3A0210F87C88548854F87C201020FDFC1020102013FE1000 +97BB:282029FCFD242BFE392411FC7C2055FC55247DFC1040FDFE108811D01070138C +97BC:282029FCFD2429FC382013FE7C0055FC55047DFC1104FDFC110411FC10881104 +97BD:281829E0FC402BFE388811747E52547054007DFC1104FD74115411741104110C +97BE:28882BFEFC88280039FC10A87CA857FE54A87CA811FCFC2013FE102010201020 +97BF:51245124FAAA53AE712422AAFBAEA924AFFEF9102114F914228A224A22162422 +97C0:50405020FBFE525073FE2252FBFEAA80AAFEFA8022FEFA02255625562A022006 +97C1:28002BFEFC0029FC392411FC7D2457FE54007DFC1124FDFC112411FC100013FE +97C2:288028F8FD082BFE394411927DFE5500557C7D00117CFD00117C1244127C1444 +97C3:28102A10FD7C281038FE10447F2855FE55107D7C1110FDFE1110111012FE1400 +97C4:28882BFEFCA8289039FE13207DFC552055FC7D2011FEFD0013FC10881070138E +97C5:280029FCFD0429FC390411FC7C88555455DC7C881154FDDC100011A811541254 +97C6:500050FEFC2852FE72AA20FEF810A9FEAE44FAFE2344FA7C2242223E250028FE +97C7:28202BFEFC2029FC380013FE7E5257FE55047DFC1104FDFC110411FC10881104 +97C8:284829FEFC48280039FE114A7D4A55FE54147DFE1110FD92114C114A11161222 +97C9:508853FEF888502073FE2250FBFEAA52ABFEFA8022FEFA8022FE24022AAA2004 +97CA:508853FEF88853DE725223DEFA52ABDEAA22FBFE22AAFAFA2222227222AA2224 +97CB:020002003FF00410FFFE00001FF010101FF001003FF8010021003FFC01000100 +97CC:100010007EFE2212FF1200527E5242527E9208127E12082248227E42088A0904 +97CD:102810247E242220FF7E00207E20423C7E3408547E54085448887E8809140822 +97CE:101010107E1022FEFF1000107E10427C7E1008387E38085448547E9208100810 +97CF:111009207FFC0400FFFE12102FE8C4263FF810101FF001001FF021003FF80100 +97D0:102010207C502450FE8801047EFA44007C0010F87C88108850887C8810F81088 +97D1:102011FC944455FE580011FCFD0429FC282029FC2820292029FC4820482287FE +97D2:101010927E522254FF1000FE7E8242827EFE08827E8208FE48827E82088A0884 +97D3:1020102010FCFE4411FE7C0044FC7C8444FC7C1010FCFE10109010FE10101010 +97D4:1000107C7E402278FF4000787E4043FE7EA008A47E98089048887EA408C20880 +97D5:102010107EFE2200FF7C00447E7C42007E7C08087E1008FE48107E1008500820 +97D6:100010FC7C482430FEFE00527C9445507C2010107DFE103850547C9211101010 +97D7:100011FE7D022420FEFC00207DFC45247DFC11247DFC102053FE7C2010201020 +97D8:101410547E5422FEFF5400547E5C42407E7E08107EFE081048387E5408920810 +97D9:00103E7C22243EFE22003E7C0044FF7C0810083C2F50287E281058104FFE8000 +97DA:108810887DFE2488FEF800207DFC45247D2411FC7C2013FE50207C2010201020 +97DB:104410447DFE2444FE4401FE7C4044FE7D9212FE7C9210FE50927C9210921086 +97DC:101E11E07C222512FE9400807C2045CE7D0211027DCE110251027D0211FE1102 +97DD:104810487DFE2448FEFC00487DFE44107CFC10947CFC109451FE7C8410941088 +97DE:100010F87C882488FEF800887C8844F87C0011FC7D54115451547D5413FE1000 +97DF:101010207E7C2244FF7C00447E7C42107EFE08287E540892487C7E1008100810 +97E0:100010FE7E9222FEFF9200FE7E5442547EFE08547E5408FE48107EFE08100810 +97E1:104410FE7E442200FFFE00547E5442FE7E5408547EFE081048FE7E1008100810 +97E2:101010107DFE2410FEFC00947CFC44947CFC10127DFE102250147D52114A1238 +97E3:100011FC7D542554FFFC00807DFC46447DF411547D5411F450447DF410141008 +97E4:104811FE7C482400FFFE014A7D4A45FE7C1411FE7D101192514C7D4A11161222 +97E5:101010FE7E10227CFF0000FE7EAA42FE7E44087C7E44087C48447E7C08280844 +97E6:0100010001007FFE010001003FF8010001007FFC010401040104012801100100 +97E7:2000200021FCFC24202420A4F8A420A42124FC24242424443444288421142208 +97E8:205020482048FC4021FE2040F840207C20A4FCA424A8252835102A2820442082 +97E9:102010201020FEFE10207C2044FC7C2044207DFE1022FE22102A102410201020 +97EA:00203E2022FC3E2022203EF80020FF2008FC08242F242834282858204FFE8000 +97EB:200020F82088FC8820F82088F88820F82000FDFC255425543554295423FE2000 +97EC:201E21E02022FD1220942080F82021CE2102FD0225CE25023502290221FE2102 +97ED:044004407C7C0440044004407C7C0440044004407C7C044004400440FFFE0000 +97EE:08200820FFFE0820082004407C7C044004407C7C044004407C7C04400440FFFE +97EF:082008287F240820FFFE0020122473A4122473A812287390121217AAF8464082 +97F0:08000F7C28447F28A110162838C6C2807EFC02803EF802807EFC0280FFFE0000 +97F1:112011282AA444640020FFFE122073A4122473A812287390121217AAF8464082 +97F2:0100FFFE02847D78255025484D6402807EFC02803EF802807EFC0280FFFE0000 +97F3:020001003FF8000008200440FFFE00001FF0101010101FF0101010101FF01010 +97F4:200013FE7C200020442029FCFF2401247D24452445247D34452844207C204420 +97F5:204010407C8000FC45042A04FE8400447C44441444247C44458444047C284410 +97F6:200011FC7C44004444442844FE9400887D0044FC44847C84448444847CFC4484 +97F7:201010107C92009244922892FEFE00107C10449244927C92449244927CFE4402 +97F8:204010407CFC008845502820FED803267CF8442044F87C2047FE44207C204420 +97F9:202010407CFC008444FC2884FEFC00007DFE442044207CFC442044207DFE4400 +97FA:208810887DFC008844A82820FEF800A87CA844A844A87DFC442044507C884504 +97FB:2000107C7C440044447C2800FEFE00827CFE448244FE7C8244FE44287C444482 +97FC:20201220797C00A4481830E6FB10017E7910497C491079FE491049107AFE4C00 +97FD:1020281044FE92007C440828FEFE2800FE7CAA44CE44827CFE448244FE7C8244 +97FE:08007F7808483E4800863E782A483E30414EBFFC0440FFFE10101FF010101FF0 +97FF:110023DE7A5213D42A527BDA1294235001003FF80440FFFE10101FF010101FF0 +9800:204411FE7C54004844FE2990FEFE00907CFE449044FE7C8045FE44447C3845C6 +9801:00007FFE020004001FF8100810081FF810081FF8100810081FF8081010082004 +9802:000001FEFE20104011FC1104110411FC110411FC1104110411FC108851042202 +9803:000021FE2020204021FC3D04210421FC210425FC2904310421FC008801040202 +9804:200020FE20102020FCFC2484248424FC248424FC2584268444FC404880840102 +9805:000001FE0020FC4011FC1104110411FC110411FC11041D04E1FC408801040202 +9806:040045FE5420544055FC5504550455FC550455FC5504550455FC548885040602 +9807:00007CFE1010102010FC10841084FEFC108410FC1084108410FC104810841102 +9808:080009FE1020204041FC8904090411FC210445FC8504090411FC208841048202 +9809:080009FE0810082048FC4E84488448FC488448FC48844E8458FCE04800840102 +980A:000001FE7C20104011FC11047D0411FC110411FC11041D04E1FC408801040202 +980B:00007EFE401040205EFC5284528452FC5A8454FC5084528454FC584850848102 +980C:000028FE2410242042FC5284908410FC208420FC48844484FCFC444800840102 +980D:100011FE1020FE4011FC1104FD0405FC050449FC2904110429FC448881040202 +980E:08001DFE6020404041FC41047F0449FC490449FC4904490449FC488889040A02 +980F:100008FE0810FF2000FC00843C8424FC248424FC2484258446FC444880840102 +9810:00007CFE0410282010FC0884FE8412FC148410FC1084108410FC104850842102 +9811:00007CFE0010002000FCFE84288428FC288428FC28842A844CFC484880840102 +9812:000028FE2410242042FC428480847CFC248424FC2484248444FC444894840902 +9813:100011FE1020FE4011FC5504550455FC55047DFC1104110415FC188811040202 +9814:100011FE10207C4055FC5504550455FC7D0455FC5504550455FC7C8845040202 +9815:100010FE10101E2010FC1084108410FC7E8442FC4284428442FC7E4842840102 +9816:100011FE9420584011FC7D04110411FCFF0411FC1104110421FC208841048202 +9817:080008FE08107F20497C4A4448447F7C4144527C4A4444444A7C910021280044 +9818:100011FE2820244043FC9104090401FCFD0405FC0904510421FC108811040202 +9819:000001FEFC20104011FC110451045DFC510451FC510451045DFCF08801040202 +981A:00007CFE0410682010FC2884448492FC10847CFC108410841EFCF04840840102 +981B:100010FE1010FE2010FC7C841084FEFC308438FC5484548490FC104810841102 +981C:100011FE2820244043FC81047D0401FC01047DFC4504450445FC7C8845040202 +981D:200010FE0010FE2000FC2884448482FC048444FC2884108428FC444884840102 +981E:100008FE7E10422094FC10841084FEFC248424FC4884288410FC284844848102 +981F:200020FE3C104420C4FC2884108428FC448482FC7C84448444FC44487C844502 +9820:1000107E3F102120427CBFC420442F7C2944297C2D442A44287C4A004C288844 +9821:100010FE1010FE2010FC10847C8400FC00847CFC4484448444FC7C4844840102 +9822:08001DFE7020104011FCFD04110411FC7D0445FC4504450445FC7C8845040202 +9823:00007EFE4810482048FC7E84428442FC7E8448FC4884488448FC7E4800840102 +9824:00007DFE4820484049FC5D04550455FC55045DFC4904490449FC7E8801040202 +9825:40005F7E54105420547C5F445144517C51445F7C54445444547C54005F284044 +9826:100008FE0810FF2008FC108422847CFC098412FC2484C88414FC2248C0840102 +9827:080011FE7C20444045FC45047D0441FC41047DFC4504450445FC7C8845040202 +9828:0000EEFE22102220AAFC6684228422FC26846AFCB284228422FC2248AA844502 +9829:420024FE00107E2024FC2484248424FCFF8424FC2484248424FC444844848502 +982A:080008FE4A102A202CFC0884FE8418FC1C842AFC2A84488488FC084808840902 +982B:280028FE28102820AAFC6C84288428FC6C84AAFC288428842AFC4C4848848102 +982C:080008FE08107E2008FC4A842A842CFC0884FEFC0884148412FC224840848102 +982D:0000FEFE002000407CFC4484448444FC7C8400FC448428842EFCF00040480084 +982E:0800097EEA102C204A7C4944A844107C2444247CFF442444247C440044288444 +982F:100010FE3E10622094FC48843084C0FC248424FCFF84248424FC444844848502 +9830:080008FE0810FFA0087C2A442A442A7C5D4488FC08441444127C210041288044 +9831:04001EFEE010222092FC5484408404FCFF8404FC4484248424FC044814840902 +9832:000001BE76081210123E222227A2723E1222523E522227A2203E50008F940022 +9833:100010FE10107C2010FC1084FE8428FC28846CFCAA84288428FC484848849902 +9834:40004CFE7010422042FC3E8400847CFC0084FEFC1084548452FC924850842102 +9835:00007EFE12101220FF7C124412447E7C2044207C7E446244A27C22003E282244 +9836:080028FE28103E2048FC0884FF8400FC00843EFC2284228422FC3E4822840102 +9837:080008FE1410222051FC88847E8402FC048408FC7E84428442FC7E4842840102 +9838:0000FEFE54105420A8FC5484548400FCFE8410FC108410841EFCF04840840102 +9839:0C0070FE1010FE2010FC3884548492FC008428FC288428842AFC4C4848848102 +983A:0C0070FE1010FE2010FC3884548492FC7C8424FC28842E8422FC42484A848502 +983B:080008FE28102E2028FC2884FF8400FC08842AFC2A844C8484FC08483084C102 +983C:100010FEFE10102010FCFE84928492FCFE8410FC3884548492FC104810841102 +983D:0C0070FE1010FE2010FC3884548492FC008438FC288428842AFC4C4848848102 +983E:0BFE104061FC090411FC610405FC090431FCC088090428802E9828E22E82F07E +983F:060018FE62100C20737C0C44F444147C55445E7C54445544557C5D00F3280044 +9840:140012FE20103F20647CA4443F44247C24443F7C24442444247C3F0020282044 +9841:1000087E7F104120827C00447F44087C0844287C2E442844287C58004F288044 +9842:100010FE1010FE2010FC5484548454FCBA8410FC3884548492FC104810841102 +9843:100052FE5410902028FC4484828410FC108452FC5484908428FC244842848102 +9844:00007F7E02100420497C6B445D44497C5D446B7C49446944517C470079280044 +9845:100008FE7E10422042FC7E8440845EFC52845EFC52845E8452FC524892841702 +9846:00007F7E491049207F7C494449447F7C0844FF7C1C442A44497C880008280844 +9847:100008FE00107F20007C22442244557C88C4087CFF440844087C080008280844 +9848:40004CFE7010422042FC3E84208444FC788410FC2484FE8410FC544892843102 +9849:100010FE2810242042FCBC84108410FCFE8410FC9484588450FC1E48F0844102 +984A:100020FE7E1042207EFC40847E8442FC7E8410FC1084FE8410FC104810841102 +984B:00007F7E491049207F7C494449447F7C0844047C154450C450FC52808E280044 +984C:00003EFE22103E20227C3E44007CFF44087C08442F7C2828284458824FFE8000 +984D:200010FEFE10822020FC3C844484A8FC108428FC4484FE8444FC44487C844502 +984E:0000EEFEAA10AA20EEFC00847C8400FCFE8420FC40847C8404FC044828841102 +984F:100008FE7F1022201CFC22847F8444FC488472FC4484488471FC42488C847102 +9850:0000FEFE92101020FEFC10847C8454FC7C8454FC7C841084FEFC104810841102 +9851:020002BE02087F90423E42225E2242BE42A25EBE56A255225D7E414042D48462 +9852:00007CFE541054207CFC548454847CFC1084FEFC92849684BEFC82488A848502 +9853:100092FE92109220FEFC0084FE8410FC2084FEFCAA84AA84AAFCAA48AA848702 +9854:100008FE7F102220147C7F444444487C5244447C48445144427C440088283044 +9855:00007CFE441044207CFC448444847CFC288428FCAA846C8428FC2E48F0844102 +9856:0800107E7F104120557C49445544417C7F44087C054454C450FC92000E280044 +9857:0800497E49107F20007CFF4400447F7C4144417C7F444244247C0F00F0284044 +9858:00007F7E441048205F7C51445F44517C5F44447C56445544657C450094280844 +9859:00007EFE22101C20227C77445544227C5544087C7F441C442A7C490088280844 +985A:4600787E40903FA0007C5F4451445F7C51445F7C51445F44407C7F8022284144 +985B:100010FEFE1010207CFC44847C8444FC7C8444FC7C844484FEFC284844848302 +985C:2200223EFF8822107F3E2222FFA2083E7F22493E7F224922FFBE410045144222 +985D:00007CFE4410742054FCFE8482847CFC44847CFC44847C8444FC444854844902 +985E:100092FE5410FE2030FC5484928400FC148412FCFE84108428FC244844848102 +985F:0000777E11105520337C55440C44337CC4C4187C62440CC4717C06001828E044 +9860:0000FEFE2810FE20AAFCAA84FE8400FC7C8400FCFE84108454FC924850842102 +9861:100008FE7F102220147CFF441044297CCE44147C2644CD44157C2400D4280844 +9862:2200223EFF882210223E3E220822FFBE88A2CCBEAAA2DDA288BE88808A948922 +9863:0200029E02047FC8421E4A124E124A9E7E924A9E4A925D126B5E49405ACC8452 +9864:100010FE7C101020FEFC4484EE8444FC6484DEFC0084FE8428FC2A484C848902 +9865:00007CFE44107C2044FC7C841084FEFC00847CFC44847C8410FC544892843102 +9866:280024FE7E10C82048FC7E84488448FC7E8448FC48847E8440FCAA48AA840102 +9867:100008FE7F104120417C7F445444527C7F44547C5F4454445F7C54009F281044 +9868:FEFE10207EFC42847EFC42847EFC42847EFC244842840000FFFE082010202020 +9869:080008FE14102220417CBE440044007C7744557C55447744227C220055288844 +986A:040027BE2408FFD0023E02A27FE2423E7E224ABE4AA25AA26D3E894012D46462 +986B:1000FEFE0010FE2082FCBA84AA84FEFC00847CFC44847C8444FC7C480084FF02 +986C:00007F3E0808FF9088BE6B2208226B3E0022FFBE08227F22553E550055144322 +986D:2200FFBE22087F10553E55227F22003EFFA290BE3E222222523E0C001814E022 +986E:1000087EFF9080A07F7C524494447F7CC1447F7C41447F44417C7F0022284144 +986F:0000FEFE8210FE2082FCFE844484AAFCEE8444FCAA84EE8400FCAA48AA840102 +9870:087E2E10287EFF422A7E4C42327EC4243FFA21083FF822083FF80880FFFE0080 +9871:08000FBE08087F9048BE7E2248A25FBE55225F3E55225F22403EBF802A947FE2 +9872:29004A7E14106220097C2A445444227C4844FF7C00447F44417C5D0055287F44 +9873:7F80213E3F0821103F3E21E2FF22013EFFE252BE73A252A273BE5AC0F79410A2 +9874:2200227EFF902220777C55447744127C3F44647CBF4424443F7C24003F282044 +9875:00007FFC020004001FF010101110111011101110111012900240042018106008 +9876:000001FEFE20104011FC11041124112411241124112411441050508821040202 +9877:000021FE2020204021FC3D042124212421242524292431442050008801040202 +9878:000079FE1020104011FC11041124FD2411241124112411441050108811041202 +9879:000001FE0020FC4011FC1104112411241124112411241D44E050408801040202 +987A:040045FE5420544055FC55045524552455245524552455445450548885040602 +987B:080009FE1020204041FC89040924112421244524852409441050208841048202 +987C:000001FE7C20104011FC11047D2411241124112411241D44E050408801040202 +987D:00007CFE0020004000FCFE84289428942894289428942AA44C30484880840302 +987E:00007EFE402040405EFC5284529452945A945494509452A45430584850848302 +987F:100011FE1020FE4011FC55045524552455247D24112411441450188811040202 +9880:08001CFE6020404040FC40847E94489448944894489448A44830484888840B02 +9881:000029FE2820244045FC450481247D2425242524252425442450448855048A02 +9882:000028FE2420244042FC52849094109420942094489444A4FC30444800840302 +9883:100008FE0820FF4000FC00843C94249424942494249425A44630444880840302 +9884:0000F9FE0820504021FC1104FD242524292421242124214420502088A1044202 +9885:100010FE1E20104010FC7C844494449444947C94449440A44030404880840302 +9886:100011FE2820244043FC910409240124FD240524092451442050108811040202 +9887:080008FE08107F20497C4A4448547F54415452544A5444544A28912421420082 +9888:00007EFE04100820187C24444254815400547E540854085408280E24F0424082 +9889:100010FE1020FE4010FC10847C94009400947C94449444A444307C4844840302 +988A:080008FE08207E4008FC4A842A942C940894FE94089414A41230224840848302 +988B:0000037EEC102420247C44444F54E4542454A454A4544F544020A0281F440082 +988C:100010FE2820244042FC80847C94009400947C94449444A444307C4844840302 +988D:200024FE3820224022FC1E84009408940A94EC9428942CA44A304A48A8841302 +988E:400044FE7820424042FC3E840094109452945294549490A42830244844848302 +988F:100008FE0820FF4008FC108422947C94099412942494C8A414302248C0840302 +9890:00007DFE4820484049FC5D045524552455245D244924494448507E8801040202 +9891:100011FE50205C4051FC5104FF2401241124552455245544845008883104C202 +9892:080009FEEA102C204A7C4944A854105424542454FF5424542428442444428482 +9893:0C0071FE1020FE4011FC39045524932401243924292429442A504C8849048202 +9894:080008FE14102220517C88447E540254045408547E54425442287E2442420082 +9895:40004CFE7020424042FC3E8400947C940094FE94109454A45230924850842302 +9896:40004DFE7020444045FC3D0401240D2471241124FF2411443850548891041202 +9897:00007F7E491049207F7C494449547F540854FF541C542A544920882808440882 +9898:00003EFE22103E20227C3E440054FF54085408542F282844288258004FFE8000 +9899:00003EFE2A102A203E7C2A442A543E5408547F5449544B545F28412445424282 +989A:0000EEFEAA10AA20EE7C0044FE540054FF5440547E5402540228022414420882 +989B:0800497E491049207F7C0044FFD4085410547F54555455545520552855444382 +989C:100008FE7F102220147C7F444454485452544454485451544228442488423082 +989D:100008FE7F104120107C1E44225454540854145422547F54A22822243E422282 +989E:00007F7E22103E20227C3E4423D4FE540254F754115455542220552889441082 +989F:240024FEFF102420007CFF4424542454FF54A554A554DB549128812485428282 +98A0:080008FE7F1008203E7C22443E5422543E5422543E5422547F28142422424182 +98A1:00007EFE22101C20227C774455542254555408547F541C542A28492488420882 +98A2:00007F7E41107F20417C7F440854FFD400547F5441547F540820492888C41882 +98A3:920054FEFE103020547C924420544454785410542454FE541028542492423082 +98A4:0800FF7E0010FF20817CBD44A554FF5400547E5442547E5442207E280044FE82 +98A5:00007F7E0810FFA088FC6B4408546B540054FFD408547F545520552855444382 +98A6:08002EFE2820FF7C2A544C543228C4443FF821083FF822083FF80880FFFE0080 +98A7:2200227EFF902220777C5544775412543F546454BF5424543F2024283F442082 +98A8:00003FF8200820E82F0821082FE8292829282FE82908214A21EA5E2A48068002 +98A9:00027FC2404443485C5244425F44554855505F42444445485F504922801E0000 +98AA:00007FFC01000160011001001FF010D01710111017D0155027CA212A4FE68022 +98AB:00087FC84048435C5C4844485F7E554855485F54445245625F404922801E0000 +98AC:00007FDE404443545C5444645F7E5544554C5F54446445545F484922801E0000 +98AD:00087FC84048434E5C4844485F48555C55545F544454455C5F544922801E0000 +98AE:00407F40417C4D84717451547D5455747D48514255427D3E44804042803E0000 +98AF:80004FF848080868EB880888A888ABE8AAA8AAA84BE8388AC8AA10EA17262002 +98B0:00087FCA4048437E5C4844505F5E5552556A5F44444A45525F404922801E0000 +98B1:00087FC8404843525C5E44425F40555E55525F52445E45525F404922801E0000 +98B2:00027DF244824C8A748A55EA552A7D2A56AA7C4A544A5482530A7D044482807E +98B3:00047FD8404843485C7E44485F48555C55545F544454455C5F404922801E0000 +98B4:00207F20413E4D407180517E7D1255507D5C515055507DBE44804042803E0000 +98B5:00107F5441384D10717C51447D7C55447D7C514455447D4C44804042803E0000 +98B6:00007F7C41444D7C7144517C7D44557C7D4451FE55007D2844C44042803E0000 +98B7:00107F5241944D28714451847D1055127D5451A855247D4444804042803E0000 +98B8:00007F7C41544D7C7154517C7D0055247D12516055A47D1C44804042803E0000 +98B9:00107F7C41244DFE7100517C7D44557C7D10513C55507D7E44904052803E0000 +98BA:007C7F44417C4D44717C51007DFE55407D7E51AA55527D2A44844042803E0000 +98BB:0E00F1FC2304933445C421443DF451541154FFF41144555455F45D1662060402 +98BC:00A07D2C45244DAC752455FC54207DFC54047CC85430544853847D004482807E +98BD:100055FC550455347DC401447DF401547D5445F47D44455429F41D16E2064402 +98BE:00007DF844A84C887450542054D87F2654F87CA854F8542453FC7D044482807E +98BF:00007DFC51047D3451C47D4451F451547D5405F45544555455F4851616060C02 +98C0:00407DBC45144D5475A4552C54407DFC55247DFC552455FC52007D004482807E +98C1:0000FDFC2504B5346DC4B54425F411547D5445F445447D5445F445167E064402 +98C2:00007DDC44444D5474CC555454207C5054A87D5454A0544852907D2044C2807E +98C3:00007DFC44504DFC755455FC54007CF854007DFC54A8552452607D004482807E +98C4:0000FEF82888FE98AAE8AAA8FEF800A87CF800A8FEA810BA54CA928A51062202 +98C5:00007DFE44504DDC755455DC54507DFC55247DFC552455FC52007D004482807E +98C6:140011FCFF04293445C4834425F437542554FFF4254455544BF4891612060402 +98C7:00287C2045FC4C507488550454487C6C54487DFE544854A852947D1244A2807E +98C8:00207CA444A44D287450548855047C8856AA7DDC5488555452227D004482807E +98C9:00207C2045FC4D54748855FC568A7CF854887CF854A8552452607D004482807E +98CA:08002AF82C88489814E822A841F824A82DF8B6A864A824BA54CA4A8A91060202 +98CB:00007DDE44844DCE748455DE54207C1854487CD45562544853B87D004482807E +98CC:4400FEF844880098EEE8AAA8EEF824A87EF8C8A87EA848BA7ECA488A7F064202 +98CD:1FF010D01710111017D0155027CA212A4FE680227CF854A87CF854AA7DFE8202 +98CE:00003FF02010201028502450229022902110211022902292244A484A40068002 +98CF:00007DF84410442044C04DFC6C545494552454446C8445284410420241FE8000 +98D0:00103F10211E21102510357C294429442944297C3544250020824062401E8000 +98D1:00407C4044FC450446F44C946CF454845494548A6C82447E4400420241FE8000 +98D2:200013F81208FE0803280AA88AA88A484A484AA852A8532A1C0AE40A48061002 +98D3:00007CF8448844F844884CF86C8854F8548855FC6C0044504488420241FE8000 +98D4:00007DFC452445FC45244DFC6C205414555255426E4844384400420241FE8000 +98D5:00A07D2C452445AC45244DFC6C2055FC540454C86C3044484584420241FE8000 +98D6:0E00F0F822889288448820983CD850A810A8FEA810D8548A548A5D0A65060202 +98D7:00407DBC4514455445A44D2C6C4055FC552455FC6D2445FC4400420241FE8000 +98D8:0000FEF82888FE88AA88AA98FED800A87CA800A8FED8108A548A930A51062202 +98D9:000014F81088FE882888449882D824A836A824A8FFD8248A548A4B0A89061202 +98DA:00207CA444A4452844504C886D04548856AA55DC6C8845544622420241FE8000 +98DB:00007FE000240A28722412201212120AFFC6124812501248224022244214820C +98DC:08001DFAF00C544A3988FEAA34A652A281F87CAA54AC54AA7CA854AA54A67D22 +98DD:00047FE808247212120EFFD0122A221EFDF82448D5AA56ACFDFA54A855AA9326 +98DE:0000FFC000400044004800500060005000480044002000200012000A00060002 +98DF:0100028004400A203118DFF610101FF010101FF0100811901060121014081804 +98E0:080008001400120029007E00A2003E0022003E002000280024002A0032002000 +98E1:0040404020A0211002880C460BF8120813F8E20823F822442228229023080204 +98E2:080008781448124829487E48A2483E4822483E482048284A244A2A8A32862100 +98E3:0800080014FE121029107E10A2103E1022103E102010281024102A1032502020 +98E4:082008201420122029207E20A2203E2022503E502050285024482A8832842102 +98E5:0808081C14E0122029207E20A2203E3E22E03E202020282224222A22321E2000 +98E6:0800087C1410121029107E10A2103EFE22103E102010281024102A1032102010 +98E7:2020202020503C4824A445FA4688A4F8148808F808A21094108820A440C48080 +98E8:102010201050244824A479FA0A8810F824887CF804A20894088810A420C44080 +98E9:10201020282025FC5220FCA844A87CA844A87CA840F8502248225422641E4000 +98EA:08000808141C127029107E10A2103E1022FE3E102010281024102A10327C2000 +98EB:1008103C29E024205220FC2045FE7C2044207C50405050504888548865044202 +98EC:0100111009203FF802007FFC082011102FE8C8260FE008200FE808D00A300C08 +98ED:10401040284024FE5280FD2044207DFC44247C24404450444844548464A84110 +98EE:082008201420127E28424484BE1022103E1022103E2820283E4820443E842102 +98EF:1004100E28F024805280FCFC44A47CA444A47CA840A850904910552866444082 +98F0:082008101410120029FE7E20A2203E3022283E282024282424202A2032202020 +98F1:00200020FC50208821443E2245FC450465FC950409FC09221114214841848102 +98F2:104010402840247C5284FC8845207C2044207C50405050504888548865044202 +98F3:10201010280024FE5210FC1044107C1044FE7C10401050104810541065FE4000 +98F4:10201020282024405248FC8445FE7C8244007CFC408450844884548464FC4084 +98F5:084008401440127E29A07EA0A3203E3C22203E202020283E24202A2032202020 +98F6:10401020282824085208FC4844547D5245527D604260504448C45544663C4000 +98F7:0800087C1444124429447E7CA2443E4422443E7C2044284424442A4432FE2000 +98F8:00207C204450444844A47DFA0288FEF8208840F87CA20494048804A428C41080 +98F9:100010802B1E26525252FA524A527A524A527AD2435A52544890589069104210 +98FA:088028882EF028842E84F17C02800D603FF8C8260FE008200FE808D00A300C08 +98FB:10201020285024885304FE1244207C4045887C10402050444988541064604380 +98FC:080008FE1402120229FA7E02A2023EFA228A3E8A20FA288A24022A0232142008 +98FD:0840084014FC128429047EF4A2943E9422F43E842094288824822A82327E2000 +98FE:10801080288024FE5320FE2044207DFC45247D24412451244934552864204020 +98FF:081008101492129229927E92A2FE3E1022103E922092289224922A9232FE2002 +9900:1088108829FE24885288FC0045047D0444887C88405050204850548865044202 +9901:10401044284E24B85288FD8846887C8844FE7C88408850884888548864BE4080 +9902:1008103C29E024205220FDFE44207C2044207DFC410451044904550465FC4104 +9903:10401020282025FE5200FC8845047E0244887C88405050504820545064884306 +9904:081008101428122829447E82A27C3E0022003E7C2044284424442A44327C2044 +9905:08840848140012FC29487E48A2483E4823FE3E482048284824482A8832882108 +9906:105010502850255252D4FC5844507C5844D47D5240505050489254926512420E +9907:080008FE1482128229BA7E82A2823EBA22AA3EAA20AA28BA24822A82328A2084 +9908:410021FC0A441440E0B0210822842D603FF8C8260FE008200FE808D00A300C08 +9909:08100810142012FE29827E82A2BA3EAA22AA3EAA20AA28BA24822A82328A2084 +990A:082004407FFC01003FF80400FFFE11102FE8C8260FE008200FE808D00A300C08 +990B:111009207FFC0400FFFE111022C8CD363FE8C8240FE008200FE808D00A300C08 +990C:080008FE1444124429447E7CA2443E44227C3E442044284E24F42A0432042004 +990D:00003FFE21083FFC2410288833642C9837F6241027F0241027F4446845188604 +990E:084008401478128829507E20A2503E8823063EF82088288824882A8832F82088 +990F:10401020282025FE5240FC4044A07CA245A47E9844905088488854A464C24080 +9910:08000F7828087F28A11017283AC4CD603FF8C8260FE008200FE808D00A300C08 +9911:1020102029FE24205220FDFE45027E0444F87C10402051FE4820542064A04040 +9912:1004101E29E024225312FC9444807C2045FE7C44408451C84830542864C44302 +9913:101010D82B9424945090FBFE48907894489478D84398509048AA58CA6A864102 +9914:102810242BFE24205220FDFC45247D2445FC7D24412451FC492455246524410C +9915:081008101420124429FE7E28A2443EA2223C3E44204428A824102A2832442082 +9916:100011FE2800240052FCFC8444847C8444FC7C00408450444848540065FE4000 +9917:102010202BFE24205220FDFC45247D2445FC7C20407050A84924562264204020 +9918:081008101428122829447EBAA2103E1022FE3E102058285424922B1232502020 +9919:10C21034281824645382FC2045FE7C5044907DFE42925092489A549464104010 +991A:11841068283024C85324FC2047FE7C4044FC7D8442FC508448FC548464944088 +991B:100011FC2904250453FCFD0445047DFC44007D1241D45118491055526592410E +991C:100011FC2924252453FCFD2445247DFC44207DFE407050A84924562264204020 +991D:1084108429FE248452A4FC1045FE7C4044407C7C404450444844548464944108 +991E:10481044285E25E05228FC12446A7D9644487C5E41E0502448285412646A4186 +991F:100013DE2842254A5084F94A4A527C2048007BDE40525152489459486A544422 +9920:10441044288825DC5288FC8844887C8845DE7C88408850884888548864884108 +9921:10401040287C24845308FE0044207DCE45027D0241CE51024902550265FE4102 +9922:08200810147C120029447E24A2283EFE22003E00207C284424442A44327C2044 +9923:102010202BFE24505288FD2446227DFC45247DFC412451FC48225422641E4000 +9924:102010A228A225245250FC8847047C2244207CA440A451284850548865044202 +9925:04407C7C04403C7804407D7C06C00D603FF8C8260FE008200FE808D00A300C08 +9926:100010FC288024F85280FCF844807FFE45407D24412851104908554465824100 +9927:103810E0282025FC5270FCA845247C2044407DFE404850884850542064504188 +9928:0820081014FE128229047E7CA2443E44227C3E402040287E24422A42327E2042 +9929:082008201450128829267E10A3FE3E2022443EF82012286425882A1832642182 +992A:100013FE2820244053FCFD5445547D5445547D2C402053FE4850548865044202 +992B:100013FE2A22242053FEFC2045FC7D2445FC7D2441FC50204BFE542064204020 +992C:1080109E289225D25292FC9E44927DD245527D5E4152515249D25422642A4044 +992D:1020104028FC248452FCFC8444FC7C0045FE7C20402050FC4820542065FE4000 +992E:7F2010501E882346549009241048619006601FF8E8160FF008100FF408680C1C +992F:1040107C288424F85208FDFE44407CA445387C58409451344854549265504020 +9930:1080108E2920261054C0F8AE49047B144D247964412451244924590469144108 +9931:108010BC2884250851FEFB204D20797C4990791041FE51104928592869444182 +9932:080008FC148412FC29847EFCA2403EFE23123E9220AA288224FA2A0232142008 +9933:0800087C1444127C29447E7CA2003EFE22403E7E20AA292A244A2A92322A2044 +9934:102010202BFE245050A8F9244AFA782048A8788843FE50884888588869084208 +9935:100010FC28A424A452FCFCA444A47CFC44007DFE40905094488854A864C44082 +9936:100010FC288424F45294FDFE45027CFC44847CFC408450FC4884548464944088 +9937:0810081014FE123829547E92A2003E7C22443E7C2044287C24442A0032FE2000 +9938:102210122914248052BEFC0844087DBE44887C884094509248A25540663E4000 +9939:0820081014FE129029BC7E94A2FE3E9422BC3E9020BC28A424A42AA432BC2124 +993A:102810242BFE242053FCFD2445FC7D2445FC7D24400853FE4888544864484018 +993B:084408241428120029FE7E10A2103E7C22103E1020FE280024AA2AAA32AA2000 +993C:1080108028FC250052F8FC0045F87C4845687CC841F8504A48EA555A64464042 +993D:1020104029FC25245324FDFC45247D4445FC7C4040B050A4493C55226622441E +993E:104013BE2A1226925252FAAA4B2478404BFE7A22422253FE4A225A226BFE4202 +993F:10A0112C2924252453ACFD2445247DFC44207DFC408850504820545064884306 +9940:101E11E0282225125294FC8044207DCE45027D0241CE51024902550265FE4102 +9941:1020102028FC24205220FDFE44407C8445FE7C0241FC51544954555467FE4000 +9942:100010F82888248852F8FC8844887CF844007DFC415451544954555467FE4000 +9943:108810882BFE24885200FDFC45047DFC45047DFC402053FE4850548865044202 +9944:1020112428A827FE5202FCF844887C8844F87C20402051FC4820542067FE4000 +9945:087C0844147C1244297C7E00A2FE3EAA22FE3E0020FC284424282A1032682186 +9946:100011FC292425FC5324FDFC44A87CA847FE7CA840A851FC482057FE64204020 +9947:100013FE2A00267C5244FA444A7C7A004AEE7AAA42AA52AA4AEE5A006BFE4000 +9948:1084104829FE241052FCFC2045FE7C40447C7CA4412450FC4844544465FE4000 +9949:108810882BFE248852F8FC2045FC7D2445FC7C2043FE502049FC542067FE4000 +994A:114811482BE82550515EFBE448147BD44A547BD4425453C84A485A546A5442E2 +994B:102011FC292425FC5220FFFE44007DFC45047DFC410451FC490455FC64884104 +994C:100013DE2A5227DE5210FA5249CE780048887BFE408850884BFE588869044202 +994D:108810502BFE242051FCF8204BFE792448A87BFE400051FC4904590469FC4104 +994E:102013FE282025FC5200FDFC45047DFC44887FFE400051FC4904550465FC4104 +994F:3C20043EFF4422A83E1023287E44038006601FF8E8160FF008100FF408680C1C +9950:102013FE282025FC5000FBFE4A0279FC480079FC410451FC490458886BFE4000 +9951:112411242AAA27AE5124FAAA4BAE79244FFE7910411451144A8A5A4A6A164422 +9952:1020102029FC242053FEF9084B9C790849887E3E400053FE489058906912420E +9953:1020112428A827FE5202FCF844887C8844F87C2043FE507048A8552466224020 +9954:0100FFFE10A025FE7B2015FC792011FEE6601FF8E8160FF008100FF408680C1C +9955:7C1C4410FEFE20927CF8049428BC11AA06661FF8E8160FF008100FF408680C1C +9956:1020113C292027FE5010F8144BFE7A104BF07A54425452D44B68544A68964322 +9957:110023DE7A5213D42A527BDA129423D006601FF8E8160FF008100FF408680C1C +9958:101011FE280025FE5302FD7A454A7DFE44007CFC408450FC488454FC640041FE +9959:102011FC2820248853FEFC8845FC7D0445FC7D0441FC510449FC548865044202 +995A:108813FE2888242053FCFC2047FE7C4044887DFC400051FC4954555467FE4000 +995B:108813FE288827FE5202F9FC48007BFE484078A2435450B84B5458926B504020 +995C:3FFE28882F8A20082FBE28882F8828D429A223F826162BF0221043F44268831C +995D:104010202BFE264853FEFA484AEC7B5A4A487BFE4220527C4AC45344647C4844 +995E:11F012102BFC260453FCFA244BB87A2249FE7A1047FC52444BFC58D0694A423E +995F:102013FE280025DC5154F9DC48887BFE48887BFE408853FE489459886AA440C2 +9960:100013FE2A52265253FEF90849547A5E4FB4791E425457DE48145554655E4010 +9961:152817BE294827BE5318FDAA49467BFC4A047BFC420453FC4A045BFC69084204 +9962:104017FC2A4827F85040FFFE4AAA7BB849107BFC411057FE492853106D484186 +9963:2000200020003E00440048008000100010001000100012001400180010000000 +9964:2000200020FE3E10441048108010101010101010101012101410181010500020 +9965:200021F021103D1045104910A1102110211021102110211229123212220E0400 +9966:2010207823C03C40444048408040207E27C020402040244228423042203E0000 +9967:200021F820103C2044404880A1FE209220922092211221222A22344220940108 +9968:2040204020403BFC4840524882482248224823F82048204028423042203E0000 +9969:2080208020FC3D00460048F88000200021F8200820082408280A300A20060002 +996A:2008203C21E03C2044204820802023FE20202020202024202820302021FC0000 +996B:2008203C21E03C204420482083FE202020202050205024502888308821040202 +996C:20802080210039FE4A005440804023FC20442044208420842904310422280410 +996D:2008201C21E03D00450049FCA144214421442128212821102910322822440482 +996E:2040204020403E7C448448888120102010201050105012501488188811040202 +996F:2050204820403C5C45E04840A05E23E020442048203020222852308A23060002 +9970:2080208020803CFE45204A20802021FC21242124212425242934312820200020 +9971:2080208021FC39044A0455F481142114211421F4210421282912310220FE0000 +9972:200023FC20043C0447F44804A00423E422242224222423E42804300420140008 +9973:2020202021243D244524492481FC202020202124212425242924312421FC0004 +9974:2020202020403C8845044BFE8002200021FC2104210425042904310421FC0104 +9975:200023FE21083D08450849F8A108210821F821082108211E2BE8300820080008 +9976:2080208020BC3BC04850502480D4230C200027FE2090209029123112220E0400 +9977:2040204020803BFC4A04520482F4229422942294229422F42A04320422140208 +9978:2020202020503C8845044A0281FC2000200021FC210425042904310421FC0104 +9979:2080208020F839084B1054A0804020A02118220625F821082908310821F80108 +997A:2040202020203DFE44004888A104220220882088205020502820305020880306 +997B:2040202020203BFE4840504080A020A221A4229824902088288430A220C00080 +997C:21042084208838004BFE508880882088208827FE208820882908310822080408 +997D:2020202023FE3C2044204BFEA202240421F82010202023FE2820302020A00040 +997E:200023FC20003C0045F849088108210821F82000210824882890300027FE0000 +997F:201020D823943C9444904BFEA0902094209420D82398209028AA30CA22860102 +9980:2020202020503C8845044AFAA020202023FE2020212821242A22342220A00040 +9981:2008203C23C038444A2451288100204023FE2088210823902860305021880604 +9982:2040204020883D0447FE4802A0882144224220F8218822502820305021880606 +9983:200021FC21243D2445FC4924812421FC202023FE207024A82924322220200020 +9984:200021FC21043D0445FC4904A10421FC2000211221D42118291031522192010E +9985:2080208020F839084A1054008040239C22042204239C22042A04320423FC0204 +9986:2040202023FE3A024C0451F88108210821F82100210021FC2904310421FC0104 +9987:2040204027FC38E049505248844623F8220823F8220823F82A08300027FE0000 +9988:2020202021FC3D2445FC482083FE200021FC2104212425242924305020880304 +9989:200021FC21043DE445244BFE820221FC210421FC210425FC2904310421140108 +998A:20A0232E22223E2247AE4A22A22223FE202023FE210420882850302020D80706 +998B:210021F022103C204BFC5244824423FC20A02122261E20C02830318020600010 +998C:2020202021FC3C2044204BFEA080210423FE200223FC22942A94329427FE0000 +998D:2110211027FC3910480053F8820823F8220823F8204023FC28A0311022080406 +998E:2028202423FE3C2045FC4924A1FC212421FC2124200823FE2888304820480018 +998F:204023BE22123A924A5252AA8324204023FE2222222223FE2A22322223FE0202 +9990:2208211027FC38404BF8508087FC210023F82488288823F82908310827FE0000 +9991:2088208823FE3C8844F84820A1FC212421FC202023FE202029FC302023FE0000 +9992:23F8220823F83A084BF8500087FC24A424A427FC200023F8291030E023180C06 +9993:2288228827C83A904A9E57D4802427D4245427D4245427C82C483454246404C2 +9994:200023DE22523BDE4A10525281CE2000208823FE208820882BFE308821040202 +9995:204027FC22483BF848405FFE8AAA23B8211027FC21102FFE292833102D480186 +9996:10100820FFFE020004003FF8200820083FF8200820083FF8200820083FF82008 +9997:211020A0200023FCFC8025F8250825F8250825F8250825FA250A440243FE8000 +9998:441424122810FDFE101020107DD2455245527D5445D47C0844CA471A7C264442 +9999:00701F8001000100FFFE054009203118DFF6101010101FF0101010101FF01010 +999A:041078501050FE5010883888550492FA7C48444844487C48448844887D284610 +999B:045078481048FE4011FE38405440907C7CA444A444A87D28451046287C444482 +999C:040078FC1084FE84108438FC548090A07CA444A844B07CA044A245227D1E4600 +999D:044078201028FE0810083848545491527D52456046607C4444C445447E3C4400 +999E:0420782011FEFE20102039FE550292047CF8441044207DFE442044207CA04440 +999F:0408783C11C0FE04114438A8540091F87C10442047FE7C20442044207CA04440 +99A0:042078201050FE8811443A2254F890087C10442045FC7D04450445047DFC4504 +99A1:044878481048FDCE10483848544891CE7C48444844487DCE444844487C484448 +99A2:04487844105EFDE010283812546A91967C48445E45E07C24442844127C6A4586 +99A3:0420782011FEFE5010A8392654F890A87CA844F844A87CA844F844AA7C22441E +99A4:040079FC1104FDFC110439FC548091FE7E22452245527D0245FA44027C144408 +99A5:0440784010FEFE8011FC3A8454FC90847CFC4440447C7CC4452844107C684586 +99A6:048878501000FDFE105039FC545493FE7C5445FC44507CD8455446527C504450 +99A7:040078F81088FE8810F83888548890F87C0045FC45547D54455445547FFE4400 +99A8:0878FF4808863E782A483E3040489FE401007FFC09203FF8C8260FE008200FE0 +99A9:042079FC1020FC8813FE388855FC91047DFC450445FC7D0445FC44887D044602 +99AA:0420781011FEFF0210FC38A8553090FC7D8444FC44847CFC448444FC7C484484 +99AB:1FE001007FFC09203FF8C8260FE008247FF81010FEFE545492927C7C44447C7C +99AC:00003FF821003FF021003FF0210021003FF80008124849284928800800500020 +99AD:00007F00487C7F2448247F24482448287FA800A8AA90AA90AAA880A805440282 +99AE:000043FC224023F802400BF80A40124013FCE004255425542554240420280010 +99AF:00007F7C48107F1048107F104810487E7F900090AA90AA90AA90809005100210 +99B0:00107F1048107F3C48247F44480448247F940094AA84AA84AA84808405280210 +99B1:00107F1048107F10487E7F10481048107F9000A8AAA8AAA8AAA880C405440282 +99B2:00087F1C48707F1048107F104810481E7FF00090AA90AA92AA928092050E0200 +99B3:00207E2048207EA048AC7EB448E449A47EA402B4AAA8AAA2AAA28282147E0800 +99B4:00027F22482A7F2A482A7F2A482A482A7FAA00AAAAAAAAAAAAAA80AA05420282 +99B5:3FF821003FF021003FF021003FFC4924849408280820FFFE0820102020204020 +99B6:00107E1048107EFE48107E1048FC48447E440244AA28AA28AA10822814440882 +99B7:00087F0848087F3E48087F08483E482A7FAA00AAAAAAAAAAAAAE808805080208 +99B8:00007F0C48307F2048207F20483E48247FA400A4AAA4AAA4AAA480A405440284 +99B9:00007F3E48227F2248227F224822483E7FA200A2AAA2AAA2AAA280BE05220200 +99BA:00007EFC48447E4848487E50485C48447E440244AA68AAA8AA90829815240842 +99BB:00107F1048207F2848447F7C480448287FA800A8AAA8AAA8AAAA80CA05460280 +99BC:00207E1048107EFE48447E44484448447E440228AA28AA10AA10822814440882 +99BD:3FF821003FF021003FF021003FFC4924849401083FF8210821083FF801000100 +99BE:00107E1048107E1048FE7E92489248107E280228AA28AA28AA48824A148A0906 +99BF:00107F0848007F3E48227F224822483E7FA200A0AAA0AAA0AAA080A005400280 +99C0:00487E4448447E4049FE7E50485048507E500250AA50AA52AA528292148E0900 +99C1:00027F2248147F0848147F22484248007FA200A2AA94AA94AA88809405240242 +99C2:400049FC5120612045FC45203DFC1120112011FEFC0212AA12AA120210141008 +99C3:00107F1048107F10487C7F14481448147F9400FEAA90AA90AAA880A805440282 +99C4:00207E2048207E2048FE7E20482048307E500250AA48AA48AAC882A415240A02 +99C5:00007E7C48447E4448447E44487C48547E500250AA48AA48AA48828414840902 +99C6:00007DFE51007D0451447D28512851107D100528552855445584850015FE0800 +99C7:00107F1048107F20483E7F4448A448247FA800A8AA90AA90AAA880A805440282 +99C8:00087E1C48607E4048407E404840487E7E480248AA48AA48AA48824815FE0800 +99C9:00007EFE48827E8248827EBA48AA48AA7EAA02AAAABAAAAAAA828282148A0884 +99CA:00107E1048107EFE48927E94489048FC7EA402A4AAA8AAA8AA90832815440A82 +99CB:00007F7E48127F1248127F22482A48447F8000BEAAA2AAA2AAA280A2053E0222 +99CC:10003EF84288A2AA1492187EE0001FF011001FF011001FF011001FFC2A44492C +99CD:00007F7C48107F1048547F34483848107FFE0090AA90AA90AA90809005100210 +99CE:00087F0848087F08483E7F2A482A482A7FAA00BEAAAAAAAAAAAA80AA053E0222 +99CF:00007F3E48207F2048207F3E482248227FA200A2AABEAAA0AAA080A0053E0200 +99D0:00107F0848007F3E48087F08480848087FBE0088AA88AA88AA888088057E0200 +99D1:08007F7C114432280C10122861461FF011001FF011001FF011001FFC2A44492C +99D2:00207F2048207F7E48427F82483A482A7FAA00AAAABAAAAAAA82808205140208 +99D3:00007F3E48087F0848087F18481C482A7FAA00CAAA88AA88AA888080053E0200 +99D4:00007F3C48247F2448247F3C482448247FA400BCAAA4AAA4AAA480A4057E0200 +99D5:100010007E7C124422442A7C44009FF011001FF011001FF011001FFC2A44492C +99D6:00107F1048287F2848447F92480848007FBC0084AA88AAA8AA90808805040200 +99D7:00107F1048287F2848447F92482048407F880090AAA0AA84AA88809005200240 +99D8:00087F0848107F1048247F7E482248007FBC00A4AAA4AAA4AAA480A4053C0224 +99D9:00487E4848487E8848FE7E88498848887EC802A8AAA8AA88AA88828814A80890 +99DA:00207C2050207DFC51247D24512451247D2407FE542054505450848815040A02 +99DB:00087F0848087F3E482A7F2A482A482A7FBE0088AAC8AAA8AA90809805240242 +99DC:00107E0848087E0248227E24482448A87EAC02B2AB32AA20AA6282A2151E0800 +99DD:00107F0848087F7E48427F42482048247FA800B0AAA0AAA2AAA280A2051E0200 +99DE:00407C40507E7C8051207CA050AC50B47DE404A454B454A854A28482147E0800 +99DF:00007E0048FE7EAA48AA7EAA48AA48AA7EAA02AAAAAEAAC2AA82828214FE0882 +99E0:00007E2048CE7EAA48AA7EAA48AA48AA7EAA02AAAAEAAAACAA28824814480888 +99E1:00003EF822883EF800001FF811001FF011001FF011001FFC0004292444940008 +99E2:00847E4848007EFC48487E48484848487FFE0248AA48AA48AA48828814880908 +99E3:00507E5048507F5248D47E58485048587ED40352AA50AA50AA92829215120A0E +99E4:00007F7E48107F1048247F22487E480A7F880088AABEAA88AA888088057E0200 +99E5:00147E1248127E1048FE7E10485248527E5202F4AA54AA54AA8A828A15160822 +99E6:111009207FFC0200FFFE08203018DFF611001FF011001FF011001FFC2A44492C +99E7:00007EFE48827E8248BA7E82488248BA7EAA02AAAAAAAABAAA828282148A0884 +99E8:00107F1048107F3E48227F42483A482A7FAA00BAAAAAAAAAAABA808205140208 +99E9:00087F0848147F1448227F40483E48087F880088AABEAA88AA888088057E0200 +99EA:00107E5048507E7C48907E10481048FE7E280228AA28AA28AA4A824A14860900 +99EB:00207E2049247EA448A87E2049FE48507E500250AA50AA52AA528292148E0900 +99EC:00007F7E48247F2448247F3C482448247FBC00A4AAA4AAAEAAF4808405040204 +99ED:00207C1050107DFE50207C24504450F87C120422544455885410842814440982 +99EE:00207E1048107EFE48007E44488249007E440244AA28AA28AA10822814440982 +99EF:00107E5048507E7C48907E10481048FE7E100238AA38AA54AA54829214100810 +99F0:00007EFE48827E9248927E9248FE48927E9202AAAAA6AAC6AA82828214FE0882 +99F1:00407E4048787E8849507E20485048887F0602F8AA88AA88AA88828814F80888 +99F2:00827C9250927C9250927C9252DA52B67C920492549254925492851215020A02 +99F3:0004F80EA3B8F888A088F928A12EA3A8F8A80AA8AAA8A93EA9008A800C7E3800 +99F4:0010F814A012F810A3FEF810A150A154FFF40954A954A948AA4A8A5A0C263042 +99F5:00007EFE48287E2848287EEE48AA48AA7EAA02AAAAEEAA28AA28822814480888 +99F6:00007EFC48847E8448FC7E8048FE48827EBA02AAAAAAAABAAA82828214940908 +99F7:00107E1048FE7E1048107EFE489248927EFE0210AA38AA54AA92831014100810 +99F8:00007EFC48047E7C48047EFC480049FE7F0202FCAA44AA44AA28821014680986 +99F9:00487E4448407EFE48507E54485848527E540258AA52AA54AA9A8292152E0A40 +99FA:00207E1048FC7E8448847EFC488448847EFC02A2AAA4AA98AA90828814C40882 +99FB:00007F3E48227F3E48227F3E480048007FBE0088AA88AAFEAA88808805080208 +99FC:00107E1048287E2848447EBA481048107EFE0210AA58AA54AA92831214500820 +99FD:00007F3E48227F22483E7F00483E48227FA200BEAAA2AABEAAA280A2052A0224 +99FE:00847E4448487E0048FC7E84488448847EFC0248AA48AA48AA48828A148A0906 +99FF:00107E1048207E4448FE7E28484448A27E3C0244AA44AAA8AA10822814440882 +9A00:0010F8D8A394F894A090FBFEA090A094F89408D8AB98A890A8AA88CA0A863102 +9A01:00107E1048FC7E9448FC7E9448FC48007FFE0240AA80AAFCAA04820414280810 +9A02:00207F1048107F7C48007F28481048FE7F900090AAFCAA90AA90809005100210 +9A03:00107E2048447E8248FE7E004840487E7E900210AAFEAA10AA28824414820900 +9A04:00007EFC48047E04487C7E04480448FE7E100292AA54AA38AA54829214500820 +9A05:00507E4848807EFE49907E9048FC48907E9002FCAA90AA90AA9082FE14800880 +9A06:00007EFE48927E9248BA7E9248FE48827EBA02AAAAAAAABAAA828282148A0904 +9A07:0020F820A050F888A104FAFAA020A020FBFE0820A820A9FCA904890409FC3104 +9A08:00227E2248447EEE48447E44484448447EEE0244AA44AA44AA44824414440884 +9A09:00007EFC48847E8448FC7E84488448FC7E000290AA92AAF4AA98829214D2088E +9A0A:00407E4048FE7E8249427E7A48A248227EFA0222AAAAAAAAAAFA820214140808 +9A0B:00107E1048107EFE48107E54485448547EBA0210AA38AA54AA92821014100810 +9A0C:00207E1048FE7E8248007E7C480048007EFE0210AA10AA54AA52829214500820 +9A0D:00007E7C48547E54487C7E544854487C7E1002FEAA10AA38AA54829214100810 +9A0E:00207E2049FC7E2048507E8849FE48087EE802A8AAA8AAE8AAA8820814280810 +9A0F:00247F24487E7F2448247F3C482448247FBC00A4AAA4AAFEAA8080A405220242 +9A10:0020F820A050F888A144FA22A1F8A008F8500820A8A4AA82AA8A8A8A0C783000 +9A11:00287E2848287EEE48287E28482848EE7E280228AA28AAEEAA28822814280828 +9A12:00007EFC48447E2848107E68499648107EFE0292AA92AAFEAA10821415FE0882 +9A13:00107E2848447E82487C7E10481048FE7E920292AAFEAA10AA28822814440882 +9A14:00007EFC48847EFC48847EFC484048FE7F120292AAAAAA82AAFA820214140808 +9A15:00007EFE48287E2848FE7EAA48AA48FE7E1003FEAA24AA44AA68821814640982 +9A16:7E20243E1848FFA829104A2898461FF011001FF011001FF011001FFC2A44492C +9A17:1000087C7E50427C42507E7C425040507F7C550455547F54D554558455144308 +9A18:00407E40487E7EAA496A7E5A489649227E4A0284AA20AA94AB428244143C0800 +9A19:00407C2051FE7D0251027DFE510051007DFE05AA56AA56FE54AA84AA14A20886 +9A1A:00847C4450487DFE50007DE2512A512A7DEA052A552A55EA552A8522152A0964 +9A1B:00007DFA500C7C4A51887CAA50A650A27DF804AA54AC54AA54A8852A15260A22 +9A1C:00107E20487C7E44487C7E44487C48007EFE0210AA10AA7CAA10821014FE0800 +9A1D:0010F810A03CFB94A0FEF894A13CA110FBBC0890A8FEAA90A91089800A7E3400 +9A1E:00107E1048FE7E1048FC7E1048FE48107EFE0220AA40AAFCAB448244147C0844 +9A1F:00207C5050887D0452FA7C0051E2512A7D2A05EA552A552A55EA8522152A0964 +9A20:00007EFC48847E8448FC7E84488448FC7E0003FEAA20AAA0AABC82A015600A3E +9A21:00107E2048FE7E8248FE7E8248FE48107E1202D4AA58AA54AA94829215500820 +9A22:00007DDC51447D4451447DDC510051007DDC0514551455D45508850815140922 +9A23:00287E9248AA7E8248FE7E28484448A27E3C0244AA44AAA8AA10822814440882 +9A24:00107ED448487F4A48847E84490248F87E200220ABFCAA20AA50824814840904 +9A25:00007CFC50487C3051FE7C52509451107E30042055FE547054A8852416220820 +9A26:00007DFC51247D2451FC7D24512451FC7C200410545455425542854A16380800 +9A27:00007E7C48447E4448747E54485448FE7E8202BAAAAAAAAAAABA8282148A0884 +9A28:02427D2450007DFC51247D2451FC51247D2405FC5420542057FE842014200820 +9A29:00107E2048FE7E9248927EFE489248927EFE0220AA24AA5AAA5E82901492090E +9A2A:00507E9648927E9248D67E92489248FE7E1002FCAA44AA44AA288210142808C6 +9A2B:01007FFE44429FF404403FF80440FFFE09201FF02908CFE609000FF800081558 +9A2C:001CF9E0A020FBFEA0A8F8AAA3ACA0AAF9AA0AA6A870A8A8A9248A220C203020 +9A2D:0020793C492053FE48A46B285070438000003FF821003FF821003FFE29224496 +9A2E:00207EDE488A7ECA48AA7ED248A648007EFE0292AA92AAFEAA92829214FE0882 +9A2F:00207E1048FE7E0048447E2848FE48A27E1002FEAA20AA3CAA24824414540888 +9A30:012478A849FC48404BFE79084BFC4D2249FC792049FC492049FE48024AAA9804 +9A31:000E7EF048227E9248447E20484448F87E100224AAFEAA10AAFE822814440882 +9A32:00887C8853FE7C8850007DFC510451FC7D0405FC5524542057FE842014200820 +9A33:00007EFE48907EFC48907EFC489048907EFE0202AAAAAAAAAAAA828214140808 +9A34:00007E7C48447E7C48447E7C481048FE7E820220AAFEAA44AA68821014280844 +9A35:00007EFE48887E9048BE7EA248BE48A27EBE0288AAACAAAAAACA828A15280A10 +9A36:00407E4048FE7F2248AA7EFA484248947F4802FEAB22AAAAAAFA824214940908 +9A37:00007DFC50A47C8850507C2050D853267C2005FC5524552455FC842217FE0802 +9A38:00207C1051FE7D0251027DFE510051EE7D2205AA55665522556686AA16220C66 +9A39:00887C8853FE7C8850F87C2051FC51247DFC042055FC542055FC842017FE0800 +9A3A:08207E2008F8FF2814287F6A082AFF5608823FF821003FF821003FFE29224496 +9A3B:00107E1048FE7E1048BA7E5448BA48107EBA0254AABAAA10AA28822814440882 +9A3C:00207E1048FE7EA848A87EFE48AA48AA7EFE0280AACAAAECAB48824A146A0846 +9A3D:00007DDE50427D5250CA7D52504250207CFC0484548454FC5484848414FC0884 +9A3E:00007DFC51247DFC51247DFC504050887DF00420544457FE5422852416220860 +9A3F:00107EFE48447E2848FE7E00487C48447E7C0244AA7CAA10AAFE821014100810 +9A40:0820FFFE08201FF010101FF01010FFFE08203FF8D1061FF011001FFC2A44452C +9A41:08207F20087E7E4408A4FF2810101E2822447FFAA1003FF821003FFE29224496 +9A42:00107E2048447EFE48447EAA48EE48107E280254AAAAAA50AA24824814100860 +9A43:00007EFE48287EFE48AA7EAA48FE48007E7C0200AAFEAA10AA54829214500820 +9A44:00207C4051FC7D24517C7D8C515451247D5405FC5420541055548542154A0A38 +9A45:0000FBFEA200FA7CA244FA44A27CA200FAEE0AAAAAAAAAAAAAEE8A000BFE3000 +9A46:00007EFE48927EFE48927EFE485448547EFE0254AA54AAFEAA1082FE14100810 +9A47:08203E2008F87F282A685D2A08563E8200003FF821003FF821003FFE29224496 +9A48:00FC7E2848107FFE48527E94495048207EFE02AAAAC6AABAAAAA82BA14820886 +9A49:00207C3C50207DFE51227D3851E4511C7D00052855AA556C5528862814FE0800 +9A4A:00447EFE48447E0048FE7E54485448FE7E540254AAFEAA10AAFE821014100810 +9A4B:0024FBA8A092FD14A208FC04A3BAA0A8F8C60B80AA3CAB84A8A888900AA83144 +9A4C:0020F9FCA024FBFEA024F9FCA020A2AAFBAE0A22ABFEAA22ABAE8AAA0AAA3422 +9A4D:0020F820A1FCF820A3FEF908A39CA108F9880E3EA800ABFEA89088900912320E +9A4E:0020F924A0A8FBFEA0A8F924A222A104F90409DEAA44AD54A89E89040A043404 +9A4F:03FEFA02A3FEFA00A2FCFA08A3FEA210FA300BCEAA42AA84ACEE8F840884318C +9A50:0108F888A3C8F810A3DEFA64A3D4A014FBD40854A894A8E8AB8888940A943122 +9A51:00007EFE48287EEE48AA7EAA48EE48287EFE0292AA92AAFEAA92829214FE0882 +9A52:00007EEE48AA7EAA48EE7E0048FE48927EFE0292AAFEAA10ABFE821014100810 +9A53:00447E2448287EFE48927ED648BA48927EFE0200AA7CAA44AA7C8244147C0844 +9A54:00007EFE48287EFE48AA7EFE4800487C7E44027CAA44AA7CAA1082FE14100810 +9A55:0018F9E0A040FBFEA088F974A252A070F80009FCA904A974A95489740904310C +9A56:008CFBEAA088FBFEA008FBE8A22AA3EAF80A0BECA88CABECA88A88EA0B963022 +9A57:00207C2050507C8851047EFA500050007DDC0554555455DC5488848815540A22 +9A58:0100FFFE20003FF800003FF820083FF8000077DC551477D4551C77D65056B562 +9A59:00107EFE48007EFE48827EBA48AA48FE7E00027CAA44AA7CAA44827C140008FE +9A5A:2420FF20247E7EC482287A104A287AC604003FF821003FF821003FFE29224496 +9A5B:00007DFC51547DFC50207DFC502053FE7C88045055FC542057FE842014200820 +9A5C:00507D5250D47C5051FE7C88505051FE7C2004FC542055FE54A8852416220820 +9A5D:00107EFE48107E7C48007EFE4882487C7E20027CAAC4AB7CAA1082FE14540992 +9A5E:0040F820A3FEFA02A1FCF948A250A1FCFB0409FCA904A9FCA90489FC08883104 +9A5F:03F07D2E51E27D2A51E47D3453EA50327C1E07E054A25534546884A417220820 +9A60:0110F910A7FCF910A1F0FA08A2EAA6ACFAA80AAAAEEAAA06A8008AA40A523452 +9A61:10407E7C2440FF7C42047E7C42407E7842423FFE21003FF821003FFE29224496 +9A62:0040F87CA040FBFCA244FBF0A244A2FCFAA80AF8AAA8AAF8AA008DFC095433FE +9A63:01247CA851FC7C4053FE7D0853FC55227DFC052055FC552055FE840216AA0804 +9A64:00107EFE48007EEE48AA7EEE484448FE7E4402FEAA44AAFEAA5082CA15640842 +9A65:0094FB98A092F98EA280F9FCA124A1FCF92409FCA888A9FCA8888BFE08883104 +9A66:01FCF820A3FEFA22A1ACF820A1ACA000F89E0BF2A89EA9D2AABE8C92089E3092 +9A67:0290FA90A7D0FABEA3CAF92EA7DAA54AFD7E0FCAA91EAFEAA90A8902090A3104 +9A68:0222FBFEA090F9FEA310FDFEA110A1FEF91009FEA900ABFEAA8A8B760A523276 +9A69:0088FBFEA088FBDEA252FBDEA0A0A090F9FE0920ABFCAD20A9FC892009FE3100 +9A6A:03DEF800A3DEFA52A35AFA52A020A3FEFA500BFEAA52ABFEAA928ADC0A9234CE +9A6B:7FF842007FF042007FFC5244892C7E7E48487E7E48487E7E48487E7E02029696 +9A6C:00007FE0002000201020102010201FFC000400040004FFE40004000400280010 +9A6D:00007C0005FC24842484248424883E88025002501A20E2204250028815040A02 +9A6E:00207C2004202420242025FE24203E20022002501A50E2504288028815040A02 +9A6F:0104F924092449244924492449247D24052405241D24E524452406242A041404 +9A70:0020F82008204920492C493449647FA4052405341D28E5224522050228FE1000 +9A71:0000F9FE090049044944492849287D10051005281D28E5444584050029FE1000 +9A72:00007CFC048424842484248424843EFC028402841A84E2844284028414FC0884 +9A73:0008F888085048204850488849007C08048804881C50E4504420045028881306 +9A74:0040F820082048FC4884488448847CFC048404801C80E4804480050029001200 +9A75:0000F8F808884888488848F848887C88048804F81C88E488448804882BFE1000 +9A76:0020F820082049FC4924492449247D2405FC04201CA0E4604460049029081206 +9A77:0000F9FC095449544954495449547D540594058C1D04E504450405FC29041000 +9A78:0088F88808884908497E4B084D087D48052805281D08E5084508050829281110 +9A79:0080F880090049FC4A044C0449E47D24052405241DE4E5244404040428281010 +9A7A:0080F88008F849084A104C204BFC7C04040404041DFCE404440404042BFC1004 +9A7B:0040F82008004BFE4820482048207C2005FC04201C20E420442004202BFE1000 +9A7C:0020F810081049FE49024A0448807C88049004A01CC0E48244820482287E1000 +9A7D:08007F7C114432280C10122861461FE00020082008200FFC00047FC400140008 +9A7E:080008007F7C11441144257C42001FE00020082008200FFC00047FC400140008 +9A7F:0000FBFC090448884850482048D87F26042005FC1C20E42047FE042028201020 +9A80:0020F8200840488849044BFE48027C0005FC05041D04E5044504050429FC1104 +9A81:0080F88008BC4BC04850482448D47F0C040007FE1C90E490451205122A0E1400 +9A82:00007CF8448844887CF800003FE00020082008200FFC00047FE4000400280010 +9A83:0000F9FC090449244924492449FC7D24052405541D4CE58C4504050429FC1104 +9A84:0008F83C09E0482048204BFE48507C880504068A1C88E4884488050829081208 +9A85:0090F894091449184B104D3249527D0E052004201FFEE4204420042028201020 +9A86:0080F88008F849084B104CA048407CA0051806061DF8E5084508050829F81108 +9A87:0020F810081049FE4820482448447CF8041204221C44E5884410042828441182 +9A88:0084F8440848480049FE484848487C48044807FE1C48E4484448044828881108 +9A89:3FF0001010101FFC00047FE400280010FCFC040444447E7E0202F2F20A0A0404 +9A8A:0000F3FE1000500053DE525252527A520B5A0AD63A52CA520A520A522A5212D6 +9A8B:0020F82009FC492449FC492449FC7C0007FE04801D00E5FC4404040428281010 +9A8C:0020F82008504850488849044AFA7C00044404241D24E4A8448804102BFE1000 +9A8D:0040F82009FC4800488848504BFE7C20042004201DFCE4204420042028201020 +9A8E:0000F8FC0804487C480448FC48007DFE050204FC1C44E4444428041028681186 +9A8F:0040F840088849044BFE480248887D44064204F81D88E6504420045029881606 +9A90:0088F8880BFE4888488848F848887C8804F804881C88E7FE4400048828841104 +9A91:0020F82009FC4850488849044BFE7C0805E805281D28E5E84528040828281010 +9A92:0000F9FC0924492449FC492449247DFC042007FE1C70E4A84524062228201020 +9A93:0050F848088048FE49904A9048FC7C90049004FC1C90E490449004FE28801080 +9A94:0040F8200BFE4A024C0448F848007C0005FE04201CA8E4A44522062228A01040 +9A95:0020F82009FC48244BFE482449FC7C20052405241D74E5AC452405242A241424 +9A96:0040F848088449FE48204BFE48887D24064205881C10E4624584041828601380 +9A97:0040F82009FE4902490249FE49007D0005FE05AA1EAAE6FE44AA04AA28A21086 +9A98:0020793C492053FE48A46B28507043801FE0002008200FFC00047FC400140008 +9A99:0010FBD408584A52498C488849047EFA042004201DFEE4204450048829041202 +9A9A:0000F9FC08A448884850482048D87F26042005FC1D24E52445FC04222BFE1002 +9A9B:7E20243E1848FFA829104A28984600001FE0002008200FFC00047FC400140008 +9A9C:08207F20087E7E4408A4FF2810101E2822445FE2802008200FFC00047FD40008 +9A9D:0040F9BC09144994495449A4494C7C0005FC05241D24E5FC4524052429FC1104 +9A9E:01007FFE44429FF404403FF80440FFFE08201FD02048C8460FF800087FA80010 +9A9F:0020F81009FE4902490249FE49007DEE052205AA1D66E522456606AA2A221466 +9AA0:0000FBFE085049FC4954495449FC7C0005FC04001FFEE42044A805242AA21040 +9AA1:0000F9FC092449FC492449FC48407C8805F004201C44E7FE442205242A221060 +9AA2:0020F84009FC4924497C498C49547D24055405FC1C20E41045540542294A1238 +9AA3:03FEF20213FE520052FC520853FE7A100A300BCE3A42CA840CEE0F842884118C +9AA4:07E0F25C13C4525453C8526857D47864083C0FC03944CA6808D009482E461040 +9AA5:0094FB980892498E4A8049FC49247DFC052405FC1C88E5FC448807FE28881104 +9AA6:01FCF8200BFE4A2249AC482049AC7C00049E07F21C9EE5D246BE0492289E1092 +9AA7:0020F3FE100051DC515451DC50887BFE08880BFE3888CBFE089409882AA410C2 +9AA8:1FF010101F90109010907FFE40029FF410101FF010101FF01010101010501020 +9AA9:00407C404440744055F8FE4882487C4844487C4844487C4A448A448A55064A00 +9AAA:00007C0044F074905490FE9082907CD044B07C9044907C9244924512550E4A00 +9AAB:00407C40444075F85448FE4882487D4844C87C4844A87CA8448A450A55064A02 +9AAC:00007CFC442074205420FE2082207DFE44207C2044207C204420442054A04840 +9AAD:00007CFC442074205420FE2082207DFE44207C2044207C204420442054204820 +9AAE:3F1021143D12251225107F9640B8BF1021103F1021103F10210A210A25062202 +9AAF:00407C20440075FC5400FE0082F07C9044907C9044907C9244924512550E4A00 +9AB0:00007CF8448874885488FF0682007DFC44847C8444487C504420445054884B06 +9AB1:00207C20442074505450FE8883067C4844487C4844487C484448448854884908 +9AB2:00407C4044FC74845504FEF482947C9444F47C8444947C8844824482547E4800 +9AB3:00107C10441074FE5492FE9482907CFC44A47CA444A87CA84490452855444A82 +9AB4:00087C284428742854A8FEAA82BC7CA844A87CA844A87CA844AA44BA54EA4986 +9AB5:00207C204420742055FEFE7082A87CA845247D2446227CF84420442054204820 +9AB6:00047C1E44F074905490FE9082907CFE44907C9044907C88448A44AA54D6488A +9AB7:00207C204420742055FEFE2082207C2044FC7C8444847C844484448454FC4884 +9AB8:00207C10441075FE5420FE2482447CF844127C2244447D884410442854444982 +9AB9:00207C10441074FE5400FE4482827D0044447C4444287C284410442854444882 +9ABA:00087C1C44E074805480FEFE82807C8044BC7CA444A47CA444A4453C55244A00 +9ABB:00207C2045FC74505488FF0482FA7C0047FE7C4044807DFC4404440454284810 +9ABC:00407C40447874885550FE2082507C8845067CF844887C884488448854F84888 +9ABD:00047C1E45E074225512FE9482807C2045FE7C4444847DC84430442854C44B02 +9ABE:00007DFE4420742055FCFF2483247DFC45247D2445FC7D2044A0444054B04B0E +9ABF:00847C48440074FC5448FE4882487C4845FE7C4844487C484448448854884908 +9AC0:00207C4044FE74925492FEFE82927CA244FE7C4844887DFE4408440854084808 +9AC1:00007CF844A874A854F8FEA882A87CF844207DFC44207C7044A8452654204820 +9AC2:00407C2045FC75045440FE7882887D5044207CD847067CF84488448854F84888 +9AC3:00FC7CA444A474FC54A4FEA482FC7C2044207DFE45227D2A45FA450A55024906 +9AC4:00087C0844FE751054A0FE7E82A27C2245BE7CA244BE7CA244AA44A455404A3E +9AC5:00207D2444A8742055FEFE6882A47D0244207DFE44487C8844D04430544C4982 +9AC6:00147C1245FE741054FEFE9282FE7C9244FE7C9244047DFE444444245424480C +9AC7:00207C1045FE740054FCFE8482FC7C0045FE7D02457A7D4A457A4502550A4904 +9AC8:00207C1044FE74005444FE2882FE7CA244107CFE44207C3C4424444454544888 +9AC9:00207C2045FE75525448FEFE82907D9044FE7C9044907CFE4490449054FE4880 +9ACA:00847C44444875FE5420FEFC82207DFE44407C8044FE7D104610441055FE4800 +9ACB:00207C1045FE75025448FEFC82487C0044FC7C8444A47CA444A4445054924B0E +9ACC:00407C2045FE75025418FEE082807CFC44907C9044907DFE4400448855044A02 +9ACD:00207C1045FE75485548FF4883FE7D4845487DEC455A7D684548454856484848 +9ACE:00007CEE442274AA5466FEAA82107C2844447D9244207CC8443244C4541848E0 +9ACF:00207DFC452477FE5524FFFC82207DFC45247DFC44407DFE448845D054704B8C +9AD0:00207C2044FC742055FEFE8883DC7C8844C87DBC44007DFE445044505494490C +9AD1:00007CFE44AA74AA54FEFE4082FE7D2244FA7CAA44AA7CFA442244FA540A4804 +9AD2:00487DFE4448740055FEFE8882EA7D2C44CA7C8645487DFE4448444854884908 +9AD3:00107C7E452074BC54C8FEBE82007DBC44A47CBC44A47CBC44A444AC55404A3E +9AD4:00507DFC455475FC5554FFFC82007DFC44007DFC45047DFC4488445057FE4800 +9AD5:00207C1045FE750254FCFEA883307CFC45847CFC44847CFC448444FC54484884 +9AD6:00207DFE454A74FC5448FEFC82847CFC44847CFC44847CFC445044545492490E +9AD7:00207C3E442075FE5522FFF883227D7E45547D7C45547D7C450046FE54AA49FE +9AD8:02000100FFFE00000FE0082008200FE000007FFC40044FE4482448244FE4400C +9AD9:020001007FFC10101FF010101FF010107FFC40044FE4482448244FE44004400C +9ADA:20201010FE1001FE7C0044007C780048FE488248BA48AA4AAA4ABA8A82868700 +9ADB:200010FCFE8400847CFC44A07CA000A0FEF882A8BAA8AAA8AAA8BAAA834A8686 +9ADC:2000107EFE42007E7C42447E7C000014FE648224BA24AAFEAA24BA2482448684 +9ADD:2048116AFEDC00487CB445227DFE0102FE208220BAFCAA24AA44BA4482948708 +9ADE:207C1044FE44007C7C0044EE7CAA00AAFEEE8210BAFEAA38AA54BA9283108610 +9ADF:3F04200420083E10202020443E0420082010FF22104224044208FF10412000C0 +9AE0:3E0420183E6020043E182062FF0422187F6000000FE00820082010222022C01E +9AE1:3E0420183E6020043E182062FF0422187F6000007FFC0440044008423042C03E +9AE2:3E0420183E6020043E182062FF0422187F60013011D01F107152112210020FFE +9AE3:3E0420183E6020043E182062FF0422187F6002007FFC040007F0081010A06040 +9AE4:3E0420183E6020043E182062FF0422187F6001007FFC0380054009203118C106 +9AE5:3F0820303EC42018FF62220C7F7000000FF008107FFE08107FFE081008500820 +9AE6:3E0420183E6020043E182062FF0422187F6001F03E0003F03E0003FA7E0201FE +9AE7:3E0420183E6020043E182062FF0422187F6001007FFC4104028004821882E07E +9AE8:3E0420183E6020043E182062FF0422187F6000003FF80000FFFE04401842E03E +9AE9:3F0820303EC42018FF62220C7F700000FFFE010021FC21043FFC000400280010 +9AEA:3E0420183E6020043E182062FF0422187F600100FFFE04000FF0122061C00E3C +9AEB:3E0420183E6020043E182062FF0422187F6000007FF8080810303FF8D0081FF8 +9AEC:3E0420183E6020043E182062FF0422187F6000007FFC03000D70710C0100FFFE +9AED:3E0420183E6020043E182062FF0422187F60088008882E9028E028842E84F07C +9AEE:3E0420183E6020043E182062FF0422187F600110FFFE04000FF0122061C00E3C +9AEF:3F0820303EC42018FF62220C7F7001003FF821083FF82108FFFE200820282010 +9AF0:3E0420183E6020043E182062FF0422187F6000001220FFFE122013E010001FFC +9AF1:3F0820303EC42018FF62220C7F7008001FF020105F9010901FD0102010040FFC +9AF2:3E0420183E6020043E182062FF0422187F6000803FFC208427F0222041C09E3C +9AF3:3E0420183E6020043E182062FF0422187F6000003FE00440FFFC04841888E180 +9AF4:3F0820303EC42018FF62220C7F7004407FF804483FF824403FFC084410542048 +9AF5:3E0420183E6020043E182062FF0422187F600000FFFE02003FF8248824A82010 +9AF6:3F0820303EC42018FF62220C7F7000003FF808200FE008200FE0083EFFE00020 +9AF7:3E0420183E6020043E182062FF0422187F6004403FF824483FF824483FF82008 +9AF8:3E0420183E6020043E182062FF0422187F6004403FF80440FFFE082010102008 +9AF9:3E0420183E6020043E182062FF0422187F600840104037FCD0E013581C461040 +9AFA:3F0820303EC42018FF62220C7F70000000F83F000100FFFE01001FF010101FF0 +9AFB:3F0820303EC42018FF62220C7F700100FFFE01003FF800003FF820083FF82008 +9AFC:3F042018FF62220C7F7008001FF0282007C01830E10E1FF001007FFC01000100 +9AFD:3E0420183E6020043E182062FF0422187F6011101110292845443FF80100FFFE +9AFE:3F0820303EC42018FF62220C7F70111009203FF820083FF820083FF820082018 +9AFF:3E0420183E6020043E182062FF0422187F60102048A825240A227028103017C0 +9B00:3F042018FF62220C7F70082004407FF801083FF821003FFC0304051419086100 +9B01:3E0420183E6020043E182062FF0422187F6000083E4808487F481C482A084918 +9B02:3F0820303EC42018FF62220C7F7000201FC010001FF810801080FFFE10202010 +9B03:3F0820303EC42018FF62220C7F7001007FFC40041FF000007FFC111025084204 +9B04:3F0820303EC42018FF62220C7F7000001FF010101FF010101FFC644408943308 +9B05:3F0820303EC42018FF62220C7F7000003E7C22443E7C22443E7C22444A948508 +9B06:3E0420183E6020043E182062FF0422187F6010101088FD443242589095F81008 +9B07:3F042018FF62220C7F7008001FF020205FF80108FFFE01081FF8010805000200 +9B08:3F042018FF62220C7F70111009207FFC0400FFFE10102FE8C82608A0084807F8 +9B09:3F0820303EC42018FF62220C7F700440238824483FF814102FE8144003807C78 +9B0A:3F042018FF62220C7F7001007FFC01003FF80200FFFE08201FF02828CFE60820 +9B0B:3F042018FF62220C7F7010100820FFFE00003E0822483E4822483E4822082618 +9B0C:3F042018FF62220C7F7004007FFC08801FFC28104FF088100FF0081008500820 +9B0D:3E0420183E6020043E182062FF0422187F60107CFF44107C7E44427C7E44428C +9B0E:3F0820303EC42018FF62220C7F7004047FC404243FA424A43FA4150424944408 +9B0F:3E0420183E6020043E182062FF0422187F6000007C101052FE94382854449282 +9B10:3F042018FF62220C7F7001081FD001207FFC06201C4463FC00001FF811081FF8 +9B11:3F042018FF62220C7F7008407FFC04803FF00490FFFE04903FF00CA03498C486 +9B12:3F042018FF62220C7F7001007FFC01001FF0101011101110FFFE082010102008 +9B13:3F042018FF62220C7F70020001007FFE40229FC410001FF81080FFFE10202010 +9B14:3F042018FF62220C7F70210013F0151000E0775C11F0104013FC284047FE0000 +9B15:3F042018FF62220C7F700820FFFE08201FF010101FF01010FFFE08203018C006 +9B16:3F042018FF62220C7F7008201FF0102025487EFC044018B0E30E0C6003801C00 +9B17:3F042018FF62220C7F7008207FFC08200FE001007FFC5144492455546184410C +9B18:3F042018FF62220C7F7000001FF010101FF010107FFC44447FFC082007C0F83E +9B19:3F042018FF62220C7F7008207FFC511449247FFC00001FF010101FF010101FF0 +9B1A:3F042018FF62220C7F7000000BFE104061FC090411FC610405FC090431FCC088 +9B1B:3F042018FF62220C7F7002003FF82448238824483FF829482528294A25263182 +9B1C:3F042018FF62220C7F7000007C7C44447C7C47C47C7C47C4444447C4444448CC +9B1D:3F042018FF62220C7F7C44447C7C44447C7C40044FE448244FE448244FE4400C +9B1E:3F042018FF62220C7F7002401FF812481FF812483FFC20003FFC28884A708C0E +9B1F:3F0820303EC42018FF62220C7F7001003FF82448FFFE10101FF00C883470C60E +9B20:3F0820303EC42018FF62220C7F7002800C603FF8D55613901FF00A2009200FE0 +9B21:3F042018FF62220C7F7001007FFC4204A92847E400003FF82448FFFE01000300 +9B22:3F042018FF62220C7F7001007FFE40029FF4092011C00FF818886FF804100808 +9B23:3F042018FF62220C7F701084210810843FF82448238824483FF8294A25263182 +9B24:3F042018FF62220C7F700100FFFE22883EF804403FF80440FFFE04901C60671C +9B25:00005E7A44225E7A44225E7A40024002400240024002400240024002400A4004 +9B26:00005E7A44225E7A44225E7A4082448242824882448240F25F824082408A4084 +9B27:00005E7A44225E7A44225E7A420241025FF241024FE2492249A24942410A4104 +9B28:00005E7A44225E7A44225E7A4002444244424FE2444244425FF24442482A4004 +9B29:00005E7A44225E7A44225E7A42024CE248224EE248224FE242824492587A4004 +9B2A:BEFA8822BEFA8822BEFA8002BF1280129EFE921292929E5292128F12B8529026 +9B2B:BEFA8822BEFA8822BEFA80029C42847ABF5292929E1292529E2293A2FE528296 +9B2C:BEFA8822BEFA8822BEFA8806B3BAAAA2BBA28A3EBBAAA0AABBAA8A2A8BAABC46 +9B2D:BEFA8822BEFA8822BEFA8006BBBAAAA2BBA28A3EBBAAA0AABBAA8A2A8BAABC46 +9B2E:BEFA8822BEFA8822BEFA8102BFF2A012BCF28482B4F29492FCF29482B49283F6 +9B2F:09202448228829282288244829283FF81000103811C01E04100410040FFC0000 +9B30:2288F93E2288729CA92A228800007FFE4A12A4A42AC83F9010241F4810101F20 +9B31:2208F3BC2508739CAD6A27C800007FFE4A12A4A42AC83F9010241F4810101F20 +9B32:0000FFFE00001FF0101010101FF000007FFC482444445FF44104410441144008 +9B33:01FC01003FFE210221F02F0420FC20003FFE220823F820002FFE29124BFA8842 +9B34:0014FE1200FE7C1044107CFE0092FE9282FEAA929292FEFE9292929292928686 +9B35:3E7C48907EFC142A66C60400FFFE00001FF010101FF000007FFC44444FE4410C +9B36:10F87CA810A8FE52288E4500FFFE00001FF010101FF000007FFC44444FE4410C +9B37:0028FE9200AA7C8244FE7C280044FEA2823CAA449244FEA89210922892448682 +9B38:0020FEDE008A7CCA44AA7CD200A6FE0082FEAA929292FEFE9292929292FE8682 +9B39:08F83E8808F87E8808F81452228E4100FFFE10101FF000007FFC44444FE4410C +9B3A:0040FE7E00807D7C44447C7C0044FE7C8200AAFE9240FEFE932A924A92928626 +9B3B:711C1544711C47D0739C1544310C0000FFFE10101FF000007FFC44444FE4410C +9B3C:020004003FF8210821083FF8220822083FF8051009200948117C2102410280FE +9B3D:080410047F08491049247F04490849107F2210021A042C882F904820480287FE +9B3E:081010107F7E491049107F10497C49047F4410281A102CA82FC44884480287FE +9B3F:0808101C7F60494049407F7E494849487F4810481A482C882F884800480287FE +9B40:081010107F28492849447F82492849287F2810281A282CA82FA84848480287FE +9B41:080810487F28492849087F48492849287F0E10F81A082C882F884808480287FE +9B42:002000407DFC0124012401FCFF24212421FC2040486844B2FCBE45200122021E +9B43:102820247C2055FE54207C20547C54447C5410882A942D244F40480287FE0000 +9B44:1020104021FC7D24452445FC45247D2445FC4440446844B27CBE45200122021E +9B45:081010107F10497C49107F1049FE49107F3810541A922C902F904810480287FE +9B46:101420127C1054FE54907C94549454887C8A10DA2AA62D424F00480287FE0000 +9B47:3FFC20903FFC21402630388C21002FF828882FF828882FF8415042FA8C8A307E +9B48:081010547F384910497C7F444944497C7F4410441A7C2CC42FC4484C480287FE +9B49:100021FC7C50545055FC7D54555455547DAC11042B042D144F08480287FE0000 +9B4A:101020147C1257FE54107DD4555455D47C1810CA2B162D224F40480287FE0000 +9B4B:082810247F40497E49C87F48497E49487F48107E1A482CC82FFE4840480287FE +9B4C:082410247F7E492449247F3C4924493C7F2410241A7E2C802FA84844480287FE +9B4D:100021FC7D04558C55547DFC554455247DFC11442B742D044F0C480287FE0000 +9B4E:23FE4020F820ABFEAA22FB32AAAAAB76FA66222256225A2A5E0450024FFE8000 +9B4F:0C20704011FCFF24392455FC9324012411FCFC40246844B228BE11202922C61E +9B50:108820507DFE545055FC7C5457FE54547DFC10502AD82D544F52485287FE0000 +9B51:104020207DFC545055247D5455FC54207DFC11442B542D744F0C480287FE0000 +9B52:100021FC7C5055FC55547DFC540054F87C0011FC2AA82D244F60480287FE0000 +9B53:11FC21247DFC552455FC7CA855FC54A87CA811FC2A202DFC4F20482287FE0000 +9B54:00803FFE24103F7C26382D5435122FF828882FF828882FF8215042F84C8AB07E +9B55:109421187DDE5494555A7DDE549455FE7C9010D42AAA2D164F20480287FE0000 +9B56:1020203E7C2055FE55227D3C55E2551E7D2811AA2A6C2D284F7C480287FE0000 +9B57:1020FE4010FC7C940094FEFC02A47CA410FCFE200044FF6A026EFFA0AAA2E71E +9B58:3FFE28882F8A20082FBE28882F88289429A227F8248827F8248847F842528C3E +9B59:42043FD88A904F9E2A945FD482241FF011101FF012101FF004A808BA3082C07E +9B5A:040004000FE0102020407FF8A10821083FF8210821083FF80000488844448444 +9B5B:200020007CFE442288227E22522252227E22522252227E420042AA82AA940108 +9B5C:202020207C20442088207E20522052207E50525052507E500048AA88AA840102 +9B5D:100410043E04422484247F24492449247F24492449247F24000455044A948A88 +9B5E:208020407C20442088107E10521052287E28522852287E480044AA44AA840102 +9B5F:200020007C7C441088107E10521052107E10521052107E100010AA10AAFE0000 +9B60:2008203C79E0482090207C205420543E7DE0542054207C220022AA22AA1E0000 +9B61:204020407C40447C88847E84530452447E24522452047E040004AA04AA280010 +9B62:200020007CFC440488047E04520452FC7E84528052807E800082AA82AA7E0000 +9B63:200021F87C08445088207E1053FE52227E24522052207E200020AA20AAA00040 +9B64:205020507850489290927D94569854907CB054D054907C900092AA92AA8E0080 +9B65:200020FC7C44444888487E50525C52447E44524452687EA80090AA98AB240042 +9B66:201020107C10441088547E52525252907E10521452047E080008AA10AA2000C0 +9B67:202020107C1044FE88007E00527852487E48524852487E4A004AAA8AAA860100 +9B68:202020207C2045FC88207EA852A852A87EA852A852F87E220022AA22AA1E0000 +9B69:204020407C40447E88AA7F2A522A524A7E4A529253127E220022AA42AA940008 +9B6A:201020107C10442888287E44528252487E48524852487E480048AA88AA880108 +9B6B:201020107C10441088FE7E92529252107E28522852287E280048AA4AAA8A0106 +9B6C:2008201C79E0490091007DFC554455447D44552855287D100110AA28AA440482 +9B6D:200020FC7C00440088007EFE525052507E50525052507E520052AA92AA8E0100 +9B6E:201020907C90449288927E9452F452987E90529052907E9200B2AAD2AA8E0000 +9B6F:08001FE020207FF8A1083FF821083FF8444482221FF010101FF010101FF01010 +9B70:204020207C2045FE88887E88528852887E88525052507E200020AA50AA880106 +9B71:200021FE7C20442088207E3C524452447E44528452FC7E080008AA08ABFE0000 +9B72:202020107C10447E88427E425242527E7E42524052407E400040AA80AA800100 +9B73:200023FE7820482090207DFC552455247D24552455247D340128AA20AA200020 +9B74:202020107C1045FE88407E405240527C7E44524452447E440044AA44AAA80110 +9B75:200820287C28442888447E445282537C7E24522452247E240044AA44AA940108 +9B76:201020107C1044FE88927E92529252AA7EAA52CA52827E820082AA82AA8A0084 +9B77:204820447844484091FE7C50545054507C50545054507C520052AA92AA8E0100 +9B78:201020907890489090907CFE548054807C8054F854887C880088AA88AA880108 +9B79:2008201C7CE0442088207E3C52E052207E20523E53E07E200022AA22AA22001E +9B7A:200020007DFE440488047EF4529452947E94529452F47E940004AA04AA140008 +9B7B:200021FC7924492491247DFC552455247D2455FC55247C200020AA20AA200020 +9B7C:20202020782049FC90207C20542055FE7C20542054407C480084ABFEAA820000 +9B7D:204420447C44444488FE7E44524452447E44527C52447E440044AA44AA7C0044 +9B7E:200021FE7C10441088207E20526852A47F22522252207E200020AA00ABFE0000 +9B7F:202020207850485090887D24561254107DFC540454087C880050AA20AA100010 +9B80:202020107C1044FE88827E84524052447E48525052607E420042AA42AA3E0000 +9B81:205020487848484091FE7C405440547C7CA454A454A87D280110AA28AA440082 +9B82:200020FE7C82449288927E92529252927E9252AA52A67EC60082AA82AAFE0082 +9B83:200021FC7C20442089247EA452A852207FFE522052207E200020AA20AA200020 +9B84:20502050785049FC90547C5455FC55507D5055FE54527C52005AAA94AA900110 +9B85:201020087C08440288227E24522452A87EAC52B253327E200062AAA2AB1E0000 +9B86:088028882EF028842E84F07C08000FE010403FF051101FF011101FF024884244 +9B87:20202020782049FC90207C20542057FE7C7054A854A87D240124AA22AA200020 +9B88:204020407C4044FC88847F0452F452947E94529452947EF40094AA04AA280010 +9B89:200021FC7C44444488447E44529452887F0052FC52847E840084AA84AAFC0084 +9B8A:201020107C2044FE88827E82528252827EFE528252827E820082AA82AAFE0082 +9B8B:201020107C10441088FE7E92529252927E9252FE52927E920092AA92AAFE0082 +9B8C:201020087C0844FE88107E10522052427EFC524852107E200044AAFEAA420000 +9B8D:20102010781049FE91127D14551055FC7D44554455287D280110AA28AA440482 +9B8E:201020107C104410881E7E10521052107EFE528252827E820082AA82AAFE0082 +9B8F:202020207920492091FC7D20562054207C2055FC54207C200020AA20ABFE0000 +9B90:202020207C20444088487E8453FE52827E0052FC52847E840084AA84AAFC0084 +9B91:204020407CFC448489047EF4529452947EF4528452947E880082AA82AA7E0000 +9B92:204420447844488490BE7D84568454A47C94549454847C840084AA84AA940088 +9B93:204020407C40447E88A07EA05320523C7E20522052207E3E0020AA20AA200020 +9B94:200020FE7C80448088807EFC528452847E84528452FC7E800080AA80AAFE0000 +9B95:201020107C10441088FE7E10521052107E7C524452447E440044AA44AA7C0044 +9B96:200020007DFE441088107E205220527C7E4452C453447E440044AA44AA7C0044 +9B97:20402040787C488491887E50542054507C88570654607C100008AAC0AA200010 +9B98:205020547852489290907D9655F856907C90549054907C90008AAA8AAA860082 +9B99:200020EE7C22442288AA7E66522252227E26526A52B27E220022AA22AAAA0044 +9B9A:201020107C1044FE88107E10527C52007E00527C52447E440044AA44AA7C0044 +9B9B:202020207820483C90207C2055FE54007C20542054A87CA40122AA22AAA00040 +9B9C:2008201C79E0490091007DFE550055007D7C554455447D440144AA7CAA440400 +9B9D:111009207FFC0200FFFE08203418CFE610403FF051101FF011101FF024884244 +9B9E:200020FE7C10441088207EFE52AA52AA7EAA52AA52AA7EAA00AAAAA2AA8A0084 +9B9F:2040202078204BFE92027C44544057FE7C88548855087CD00020AA50AA880304 +9BA0:2040204078FC490492087DFE5500557C7D44554455547D480142AA42AA3E0400 +9BA1:205020507850495290D47C58545054587CD4555254507C500092AA92AB12020E +9BA2:20202120792049FC91207E20542057FE7C7054A854A87D240124AA22AA200020 +9BA3:20002040799E491291127D1255D255127D125512555A7D940110AA10AA100010 +9BA4:7F8408241F24212456241804E4140FE810403FF051101FF011101FF024884244 +9BA5:204020407C78448889507E20525052887F0652F852887E880088AA88AAF80088 +9BA6:200020FE7C82448288BA7E82528252BA7EAA52AA52AA7EBA0082AA82AA8A0084 +9BA7:202020207BFE482091FC7C2455FC55207DFE5422542A7C540050AA88AB040202 +9BA8:20802084789848E090827C82547E54007CFC548454847CFC0084AA84AAFC0084 +9BA9:208420487C0044FC88487E48524852487FFE524852487E480048AA88AA880108 +9BAA:2020202079FE484090407CFC548455847EFC548454847CFC0084AA84AA940088 +9BAB:20402020782049FC90007C88550456027C88548854507C500020AA50AA880104 +9BAC:201020107CFE442888447E82527C52007EFE522052407E7C0004AA04AA280010 +9BAD:201020107C7C441088107E1052FE52007E105210527C7E100010AA10AAFE0000 +9BAE:208420447848480091FE7C20542054FC7C20542055FE7C200020AA20AA200020 +9BAF:202020207850485090887D0456FA54007C0054F854887C880088AA88AAF80088 +9BB0:200020007CFE448288827EBA52AA52AA7EAA52AA52BA7E820082AAFEAA820000 +9BB1:20402040784449F490487C5057FE54407C80558456987CE00082AA82AA7E0000 +9BB2:205020547852489290907DBE569054907C9054A854A87CA800A8AAA4AAA400C2 +9BB3:2040204479F4484890507DFE544054807DFE564054807CFC0004AA04AA280010 +9BB4:204820487848488890FE7D885688549C7C9C54AA54AA7CC80088AA88AA880088 +9BB5:208420447C48440088FC7E84528452847EFC524852487E480048AA8AAA8A0106 +9BB6:200020FC7C24442489FE7E24522452FC7E40524052FC7EC40144AA44AA7C0044 +9BB7:20882048785049FC90247C2455FC55207D2055FE54227C22006AAAA4AB200020 +9BB8:2080208078F8490892107DFC552455247D2455FC54507C500090AA92AB12020E +9BB9:201020927C52445488107EFE528252827EFE528252827EFE0082AA82AA8A0084 +9BBA:04407FFC01003FF80400FFFE14002FE0D0403FF051101FF011101FF024884244 +9BBB:201020107C20444488FE7E28524452A27E3C524452447EA80010AA28AA440082 +9BBC:200020FC7804487C90047CFC540055FE7D0254FC54447C440028AA10AA680186 +9BBD:201020107C28442888447EBA521052107EFE521052587E540092AB12AA500020 +9BBE:2004201E79E0482291127C94548054207DFE544454847DC80030AA28AAC40302 +9BBF:200023FE7920492891287DE8552855287D2855E855287D2A013AABEAAA260020 +9BC0:200C21F07820484490887DF0542054447DFE542254207CA80124AA22AAA00040 +9BC1:200021FE7820482091FC7D24552455FC7D24552455FC7D2000A0AA40AAB0030E +9BC2:200021FE7C28442888FE7EAA52AA52AA7EC6528252827EFE0082AA82AAFE0082 +9BC3:200021FE7820482090FC7C44544455FE7C00540054FC7C840084AA84AAFC0084 +9BC4:202820247824482091FE7C20552054B27CB4546854A87D240222AA20AAA00040 +9BC5:2004200E7BB8488890887D28552E57A87CA856A856A87D3E0100AA80AA7E0000 +9BC6:201420127CFE441088107EFE529252927EFE529252927EFE0092AA92AA920086 +9BC7:2020201079FE490292047CF8540054007DFE545054507C500092AA92AB0E0200 +9BC8:108011F8128820702B8E688068F8A9102BFC2D2429FC292429FC20002154222A +9BC9:200021FC7924492491FC7D24552455FC7C20542055FC7C200020AA20ABFE0000 +9BCA:20401248444420140860738028000FE010403FF051101FF011101FF024884244 +9BCB:2008210878884808912C7CAA54AA54487C48548A558A7C840084AA88AA900060 +9BCC:201020507C50447C88507E90521052FE7E005200527C7E440044AA44AA7C0044 +9BCD:2020201079FE482090487C8455FE54027CA854A854A87CA800A8AAAAAB2A0206 +9BCE:201020147812481091FC7D10551055D47D54555455547D48014AAA9AAA260442 +9BCF:2002203278C2484A904A7C4A55FA544A7CCA54EA555A7D420242AA42AA4A0044 +9BD0:201020107C7C441088107E1052FE52107E105250525C7E500070AA90AA8E0100 +9BD1:20C220347818486491827C2055FE54507C9055FE56927C92009AAA94AA100010 +9BD2:200020FC7C04446888107EFE529252927EFE529252927EFE0092AA92AA920086 +9BD3:2020204078F8488890F87C8854F8548A7C8C55F854187C280048AA88AB280010 +9BD4:200020927C92452489247E92529252007EFE529252927EFE0092AA92AAFE0082 +9BD5:2088208879FC488890887CF8548854887CF8548854887DFE0000AA50AA880104 +9BD6:2020202079FE482090FC7C2055FE54007CFC548454FC7C8400FCAA84AA940088 +9BD7:04407FFC01003FF80400FFFE14102FE8D0463FF051101FF011101FF024884244 +9BD8:201C21E07820482093FE7CA8552456427C4057FE54887D0800D0AA30AA480184 +9BD9:2020201079FE480090FC7C8454FC54007CFC540854107DFE0010AA10AA500020 +9BDA:201C20E0782049FE90707CA8552456227CF8541054207DFE0020AA20AAA00040 +9BDB:200020FE7C92449288BA7E9252FE52827EBA52AA52AA7EBA0082AA82AA8A0104 +9BDC:202020107CFE440088447E2853FE52207E2053FE52447EC40028AA18AA640182 +9BDD:200020FE7C82449288927EFE529252927EBA52AA52AA7EBA0082AA82AAFE0082 +9BDE:200020FC7804487C90047CFC540055FE7D22542054FC7CA400A4AAB4AAA80020 +9BDF:201020107CFE441088107EFE529252FE7E9252FE52107E380054AA92AA100010 +9BE0:201020107C1044FE88107E54525452547EBA521052387E540092AA10AA100010 +9BE1:2050205078504BDE90507C50545055DC7C50545054507C5003DEAA50AA500050 +9BE2:200020207CCE448288827EEE528252827EFE522852287E280048AA4AAA8A0106 +9BE3:200020FC7C84448488FC7E84528452FC7E4052FE532A7E4A0092AB22AA4A0084 +9BE4:200020FC7884488490FC7C84548454FC7C00549054927CF40098AA92AAD2008E +9BE5:2020202078FC482090207DFE544854847D22542054FC7C200020AA20ABFE0000 +9BE6:2088208878E8492C912A7EA8544854A07D1E560054FC7C840084AA84AAFC0084 +9BE7:207C20447C44447C88447E44527C52007EFE528252827EFE0082AA82AAFE0082 +9BE8:204020207DFE440088007EF8528852887E8852F852207EA80124AA22AAA00040 +9BE9:201020107C28444488827F7C520052FE7EAA52AA52FE7EAA00AAAAAAAA820086 +9BEA:2020202078FC482090207DFE544854847D22547854887D480050AA20AA50018C +9BEB:200023E0795C495491547DD4555455547DD4555455487D6803C8AA54AA540062 +9BEC:0640387C08947E241C442A9448080FE010403FF051101FF011101FF024884244 +9BED:200020FC7C08441088FE7E10521052507E2052FE52AA7EAA00AAAAAAABFE0000 +9BEE:202020107CFE448288007E7C520052007EFE521052107E540052AA92AA500020 +9BEF:20822082728293EA248AF88AAFFAA88AFBEAAAAAAAAAFAAA02A2AAE2A88A0084 +9BF0:201020107C28444488A27F1052FC52047E08522052107E0400A2AAA2AAAA0118 +9BF1:201020107C1E441088FE7E92529852F07E92528E52807EB800A8AAAAAB4A0286 +9BF2:2088204878084BF491147D22550055E87D24552455207D300128AA24AAA40440 +9BF3:2040202073FE9200221CFAF0AA90AA90FAFEAA90AA90FA9002AAAACAACA60812 +9BF4:200021FC7804483491C47C44544455F47D54555455F47C440054AA76AB960002 +9BF5:20402048788449FE90207DFE548855247E42558854107C2200C4AA18AA600180 +9BF6:200020FE7C92441088FE7E10527C52547E7C5254527C7E1000FEAA10AA100010 +9BF7:2000207C7C44447C88447E7C520053FE7E105210525E7E500050AAB0AA9E0100 +9BF8:2040205C7C44448488BE7E905390529E7EA8528852BE7E880088AA94AA9400A2 +9BF9:200021FC790449FC91047DFC542055207DFE562054207DFC0020AA20ABFE0000 +9BFA:2020202479F4482890287DFE542054407CFC558456847CFC0084AA84AAFC0084 +9BFB:2082208273E29082208AFBEAAAAAAAAAFBEAA88AA9CAFAAA04A2A882A88A0084 +9BFC:202820927CAA448288FE7E28524452A27E3C524452447EA80010AA28AA440082 +9BFD:200020EE7CAA44AA88AA7EEA52AA52AA7EEA528A52CA7EAE00D8AA88AA080008 +9BFE:2040207E784848BE90AA7DAA56BE54AA7CAA54BE54C87CA80090AA98AAA400C2 +9BFF:2020201079FE490291027DFE550055007DFE55AA56AA7CFE00AAAAAAAAAA0086 +9C00:201E23E07844492490887DFC544054407DFE548054FC7D440128AA10AA680186 +9C01:201020207CFE448288FE7E8252FE52107E1252D452587E540094AA92AB500020 +9C02:200221E27922492A91EA7D2A552A55EA7D2A552A55EA7C0200C2AAA2AB2A0204 +9C03:200020FC78A448A490FC7CA454A454FC7C0055FE54907C940088AAA8AAC40082 +9C04:200C200A700893FE2208FBF8AA4AAA4AFBEAAAACAAACFA4C02AAAB0AAA160422 +9C05:2000207C7C544454887C7E545254527C7E1052FE52927E9600BEAA82AA8A0084 +9C06:2020202079FE482090FC7C4055FE54887D0456FA54887C8800F8AA88AA8800F8 +9C07:200020FC7848483091FE7C52549455107E30542055FE7C7000A8AB24AA220020 +9C08:201420547C5444FE88547E54525C52407E7E521052FE7E100038AA54AA920010 +9C09:201020207C7C4444887C7E44527C52007EFE521052107E7C0010AA10AAFE0000 +9C0A:202020207BFE482091FC7D2455AC55747D2455FC54207C7000A8AB24AA220020 +9C0B:200021FE7900497E91427D7E5542557E7D1055FE55247D640118AB24AB4201FE +9C0C:204420247C2844FE88287E2852FE52AA7EAA52C652827EFE0082AA82AAFE0082 +9C0D:200820687988488890AA7CAC55E854A87C8855C856A87C880094AA94AA9400A2 +9C0E:20102010783C4B9490FE7C94553C55107FBC549054FE7E900190AAC0AABE0100 +9C0F:200020FE7C00447C88447E44527C52007EFE529252927EFE0092AA92AAFE0082 +9C10:200021DC7954495491DC7C0055FC54007DFE548054FC7C040004AA04AA280010 +9C11:200020FC788448FC90847CFC540055FE7C8054FE552A7E4A0092AB22AA540088 +9C12:204020407CFE448089FC7E8452FC52847EFC5240527C7EC40128AA10AA680186 +9C13:200021FC7924492491FC7D24552455FC7C20541054547D420142AB4AAA380000 +9C14:2008200C700A93FE2208FA08AAE8AA0AFA0AAAECAAACFAA802EAAA1AAA260442 +9C15:200021DC7944494491447DDC550055007DDC551455147DD40108AB08AB140122 +9C16:2020202079FE484090FE7D1056FE54007CFE548254FE7C8200FEAA82AA8A0084 +9C17:2080209E78924BF290927C9E549255D27D52555E55527D5201D2AA22AA2A0044 +9C18:2040202079FE490292047DFC544054887DFC542454207DFC0020AA20ABFE0000 +9C19:2084208479FE488490A47C2055FE54407C8054FC55847E840084AA84AAFC0084 +9C1A:2020201079FE490292047CFC540054FC7C8454FC54847CFC0084AA00AAFE0000 +9C1B:200020F87888488890F87C88548854F87C0055FC55547D540154AB54ABFE0000 +9C1C:20882050780049FE90507DFC545457FE7C5455FC54507CD80154AA52AA500050 +9C1D:202020107CFE4400887C7E44527C52007EFE528252BA7EAA00BAAA82AA8A0084 +9C1E:202020407CFC448488847EFC528052FE7E8052FE52027EAA00AAAA02AA140008 +9C1F:202020107CFE440088447E2852FE52A27E1052FE52207E3C0024AA44AA540088 +9C20:200021FC78A4488890507C2054D857267C2055FC55247D2401FCAA22ABFE0002 +9C21:202020DE7C8A44CA88AA7ED252A652007EFE529252927EFE0092AA92AAFE0082 +9C22:200020FE789048FC90907CFC549054907CFE540254AA7CAA00AAAA82AA140008 +9C23:2008200879C8497E91487D48557E55C47D44557E55447D6401D4AA04AA140008 +9C24:2100227E7388928822BEFAAAABAAAA2AFA2AABAAAAAAFAAE0288AB88AA880008 +9C25:200020FE7CAA44AA88AA7EFE521052547E52529252107E540052AA92AA100010 +9C26:2084204478484BFE90847C845508554A7E52579C54847D080108AA52ABDE0042 +9C27:012478A849FC48404BFE79084A844CFA49107BFC4D2449FC492449FC48009954 +9C28:200021F8790849F891087DF8540054007DDC544455547CCC0154AA44AA5400C8 +9C29:2004201E79E0480291227C9454FE55107C1055FE54107C920092AA92AAFE0002 +9C2A:201020107C7E441088107EFE522052427EFE520052FE7EAA00AAAAAAABFE0000 +9C2B:2040202079FE490290507C88552454507C88550456FA7C880088AA88AAF80088 +9C2C:2020203C782049FE91227D3855E4551C7D20551055FE7D440128AA10AA2804C6 +9C2D:2020202478F4482891FE7C20547854C27D3E560054FC7C8400FCAA84AAFC0084 +9C2E:200020F878A848A890D87C8854F854007C0055FC55547D540154AB54ABFE0000 +9C2F:200021DC7844484491DC7D10551055DC7C44555454CC7CCC0154AA44AA5400C8 +9C30:220821087908483E93AA7CAA54BE552A7DAA576A553E7D2A0108AB08AB080108 +9C31:201020107AFE4910917C7C54547C57547D7C551055FE7D100110AA90AA7E0000 +9C32:08207E20087EFEC410281E102A284FE690403FF051101FF011101FF024884244 +9C33:2148214873E8914821DEF88AABEAAAAAFAAAABEAA88AFBEA0092A892A8AA00C4 +9C34:11101550255047D0903E17A422546394A49427D42D5427C8254827D420142AA2 +9C35:20203F20403EBE482AA8FF284A107FE810463FF051101FF011101FF024884244 +9C36:2080208879EE492A92AA7D445484557A7E00540055FE7C2000A8AB24AAA20040 +9C37:2110211E712292542208FE94AAE2AA88FA88AABEAA88FAAC022AAA4AAA280210 +9C38:200023FE7200927C2244FA44AA7CAA00FAEEAAAAAAAAFAAA02EEAA00ABFE0000 +9C39:200021EE794A49EA912A7DE45544554A7DF0540054107CFE0010AA10ABFE0000 +9C3A:201020207C4444FE88447EAA52EE52107E28525452AA7E500024AA48AA100060 +9C3B:207C20447C7C4444887C7E0052FE52AA7EFE520052FC7E440028AA10AA680186 +9C3C:200021DE7842495290CA7D52544254207CFC548454847CFC0084AA84AAFC0084 +9C3D:2050205079FE485091FC7D5455FC55547DFC540054F87C8800F8AA88AAF80088 +9C3E:200023FE785049FC91547D5455FC54007DFC540057FE7C2000A8AB24AAA20040 +9C3F:201021FE781048FC90107DFE540054FC7C8454FC54847CFC0084AAFCAA480084 +9C40:7DFC44207D2045FE7C50485254926FEE10403FF051101FF011101FF024884244 +9C41:2000213E78884890902A7C4A571C552C7D4A551A552A7D480128AA90AA7E0000 +9C42:20482148795E496A91547DC8545054647FC4557E55447D640154AB44AA540448 +9C43:2084204879FE481090FC7C2055FE54407C7C54A455247CFC0044AA44ABFE0000 +9C44:202023FE782049FC91247DFC552455FC7C2255FE54087DFE0108AA88AA280010 +9C45:201021FE7910497C91147DFE5514557C7D10557C55547D7C0154AA7CAA54044C +9C46:201020FE7C44442888FE7E00527C52447E7C5244527C7E1000FEAA10AA100010 +9C47:2020201079FE4910917C7D1455FE55147D7C551055927D540138AA54AA920430 +9C48:200021FC78204BFE92227DAC542055AC7C0055FC54047DFC0004AA04ABFC0004 +9C49:49202A3E7F4849485DA86B1049284FE610403FF051101FF011101FF024884244 +9C4A:20FC2028781049FE90527C94555054207CFE54AA54C67CBA00AAAABAAA820086 +9C4B:2020203C782049FE91227D3855E4551C7D00552855AA7D6C0128AA28AAFE0000 +9C4C:208020F0791049FC93247D2455FC54407CA4555854987D340054AA92AB500020 +9C4D:201221D478484A8A91047E0255DC54547C6255C0551E7DC20054AA48AB5400A2 +9C4E:201821E078404BFE90887D74565254707C0055FC55047D740154AB74AB04010C +9C4F:200020FE7C2844FE88AA7EFE5200527C7E44527C52447E7C0010AAFEAA100010 +9C50:202021FC702493FE2024F9FCA820AAAAFBAEAA22ABFEFA2203AEAAAAAAAA0422 +9C51:2048204878FC484890487DFE542054FC7CA454FC54A47CFC0000AA48AA840102 +9C52:2088205079FE485091FC7D54559C55047DFC550455FC7C0801FEAA88AA480018 +9C53:200021DC7954495491DC7C0055FC55247DFC552455FC7C2003FEAA20AA200020 +9C54:2044202879FE481090FE7C1055FE54927C5455FE54007CFE0082AA82AAFE0082 +9C55:201C21E078A4486891FE7CA8552456027CFC54A454A47CFC00A4AAA4AAFC0084 +9C56:200023FE7200931422A4FBF6AA4AAA42FB50AB54ABF4FA44024AAA8AAC920920 +9C57:201020927854481091FE7C54549255107C8454EE55247CB4005EAA44AA840104 +9C58:200021FE780249FE90027DFE540055DE7C9257DE54047DFE0084AA44AA540008 +9C59:2020202078FC482091FE7C8855DC54887CC855BC54007DFE0050AA50AA94010C +9C5A:201020107CFE4410887C7E00527C52447E7C522852FE7E00007CAA44AA7C0044 +9C5B:204420247C2844FE88927ED652BA52927EFE5200527C7E44007CAA44AA7C0044 +9C5C:2280224E74EA95AA29AAFEEAAAACACAAFDEAAF8AAA8AFAAA04ACACE8A8A80008 +9C5D:202021FC7820488893FE7C8855FC55047DFC550455FC7D0401FCAA88AB040202 +9C5E:200021FC7954495491FC7C0057FE54007DFC550455FC7C620094AB88AAA400C2 +9C5F:0A803138228839382288FFFE88020FE010403FF051101FF011101FF024884244 +9C60:202020507888497492027DFC552455AC7D2455FC54007CF80088AAF8AA8800F8 +9C61:2008200C738A92FE2288FBA8AAA8AAAAFBFAAAAAAAACFBAC002AAAAAAC560022 +9C62:20F82088788848F890007DDC555455547DDC542057FE7C7000A8AB24AA220020 +9C63:201021FE780049FE91027D7A554A55FE7C0054FC54847CFC0084AAFCAA0001FE +9C64:2014201273FE921022F0FA14AAF4AAB8FAEAAA16AC42F82402A2AA8AAC780000 +9C65:2020213879204BFE90107C1455FE55107DF0555455547DD40168AA4AAA960122 +9C66:200021FC7954495491DC7C5055DC55547D5455DC55547D5401DCAB50AA52003E +9C67:205021FC795449FC91547DFC540055FC7C0055FC55047DFC0088AA50ABFE0000 +9C68:212420A87BFE4A8A90F87D0C55F055027CFE540055FC7D0401FCAB04ABFC0104 +9C69:200021FC78204BFE92227DAC542055AC7C0055FC55247D2401FCAB24AB2401FC +9C6A:21FC210479FC490491FC7C2255FC54287FFE544055FC7E8400FCAA84AAFC0084 +9C6B:200E21F078A2485491FE7D22541455527D4A563854407C7C0084AB48AA3001CE +9C6C:200021FC78204BFE92227DAC542055AC7C0057FE54207DFC0154AB54AB54010C +9C6D:2040202073FE90882052FFACAAAAAAA8FDACA800A904F9FC0104A9FCA9040204 +9C6E:20A0212C7934492491AC7D34555455DC7D54555457FE7C000048AA44AA820102 +9C6F:204421FE7854484890FE7D9054FE54907CFE549054FE7C8001FEAA44AA3801C6 +9C70:200023FE7A524A5293FE7C2455FC54287FFE542054FC7D8402FCAA84AAFC0084 +9C71:200021FE792849FE91287D7C5554557C7D54557C55107DFE0192AABAAA8A0484 +9C72:212422487124900023FCFA94AA64AA94FBFCAA48AB68FA48036AAA4AAA460362 +9C73:21242174725892DA23FEF954AADAABFEF8A2A820ABFEF87000A8A924AA220020 +9C74:204421FE7C44440088FE7EAA52AA52FE7E1452FE52907ED200ACAAAAAA960122 +9C75:2110211071DE92A82454F812ABFEAA10FAF4AA14AAF4FAA802AAAAFAAA160422 +9C76:208823FE782049FC90407FFE548855247EFA548854F87C8800FAAA94AAA800C4 +9C77:200023FE702093AE22AAFAAAABAEA820FBFEA820ABAEFAAA02AAABAEA82003FE +9C78:2020203E782049FE91227DF85522557E7D54557C55547D7C0100AAFEAAAA05FE +9C79:208823FE7888480091DC7D5455DC54887DFE569054FC7C9000FCAA90AAFE0080 +9C7A:20EE20007CEE44AA88EE7EAA521052FE7EA852FE52AA7EFE00AAAABCAAAA0136 +9C7B:0FE010403FF051101FF011101FF024A85E3424507EFC2A543E7C2A54BE7C95AA +9C7C:040004000FE0102020407FF8A10821083FF8210821083FF800000000FFFE0000 +9C7D:200020007DFC444488447C44544454447C44544454447C8400841D04E1284210 +9C7E:100010001EF8220824087E08AA082AF83E882A802A803E8000820E82707E2000 +9C7F:204020507C48444888407DFE545054507C50545054907C9000921D12E10E4200 +9C80:202020207C2045FE88207D24552455247D2455FC54247C2000221C22E01E4000 +9C81:08001FE020207FF8A1083FF821083FF80000FFFE00001FF010101FF010101FF0 +9C82:102010101E1023FE24407E40AA402A7C3E442A442A443E4400840E8471282210 +9C83:200020007DFC452489247D24552455247DFC550055007D0001021D02E0FE4000 +9C84:200020007DFE440888087DE8552855287D28552855E87D2800081C08E0284010 +9C85:205020487C48444089FE7C405440547C7CA454A454A87D2801101E28E0444082 +9C86:200020007DFC442088207D2454A454A87C2057FE54207C2000201C20E0204020 +9C87:101010101E102210241E7E10AA102A103EFC2A842A843E8400840E8470FC2084 +9C88:101010101E1E221024107EFEAA822A823E822AFE2A823E8000800F0071002200 +9C89:202020207C20442089FC7D24552455247D2455FC55247D2401241D24E1FC4104 +9C8A:104010401E40227E24A07EA0AB202A3E3E202A202A203E3E00200E2070202020 +9C8B:204420447C44448488BE7D84568454A47C94549454847C8400841C84E0944088 +9C8C:101010101E2022FC24847E84AA842A843EFC2A842A843E8400840E8470FC2084 +9C8D:204020407CFC448489047EF4549454947CF4548454947C8800821C82E07E4000 +9C8E:2208111000207FFC440484080FC010403FF051101FF011101FF00000FFFE0000 +9C8F:201020107C1045FE89127D14551055FC7D44554455287D2801101E28E2444482 +9C90:102010201E20224024487E84ABFE2A823E002AFC2A843E8400840E8470FC2084 +9C91:202020207DFC442088207C2057FE54007C20542055FC7C2000201C20E3FE4000 +9C92:202020207C2047FE88207C2055FC54007C0055FC55047D0401041D04E1FC4104 +9C93:204020447DF4444888507DFE544054807DFE564054807CFC00041C04E0284010 +9C94:202020207DFE444088407CFC548455847EFC548454847CFC00841C84E0944088 +9C95:200021FE7C20442088407DFC555455547D54555455547D5401541D54E104410C +9C96:200021FC7D04450489747D04550455747D54555455547D7401041D04E1144108 +9C97:400243E27A228A2A12AAFAAAAAAAAAAAFAAAAAAAAAAAF88201421922E20A4404 +9C98:2008201C7DE0450089007DFE550055007D7C554455447D4401441E7CE2444400 +9C99:202020207C50448889047E0254F854007C0057FE54207C4000881D04E3FE4102 +9C9A:204020207DFE448888507C20545054887D06548854887C8800881D08E1084208 +9C9B:204020207C2045FE88007C88550456027C88548854507C5000201C50E0884306 +9C9C:108210441E2822FE24107E10AA102A7C3E102A102A103EFE00100E1070102010 +9C9D:04407FFC01003FF80400FFFE14002FC0D0403FF051101FF011101FF00000FFFE +9C9E:111009207FFC0200FFFE08203418CFC610403FF051101FF011101FF00000FFFE +9C9F:200021FC7C04440488FC7C04540455FC7C08540855FE7C8800481C48E0084018 +9CA0:200021FE7C20442089FC7D24552455FC7D24552455FC7D2000A01C40E0B0430E +9CA1:400043FE7800880013DEFA52AA52AA52FB5AAAD6AA52FA5202521A52E25242D6 +9CA2:401042107910897E1020F828AF48A97EF908A908A9FEF90801081A88E47E4000 +9CA3:2040217E7D52455289547D48555454627C10541054FE7C1000101C10E1FE4000 +9CA4:200021FC7D24452489FC7D24552455FC7C20542055FC7C2000201C20E3FE4000 +9CA5:400440047BC48A44127EFA44AA44ABE4FA54AA54AA44FA4403C41A44E0144008 +9CA6:204020407CF8448889507C2054D857267C2055FC54207D2801241E24E0A04040 +9CA7:200C21F07C20444488887DF0542054447DFE542254207CA801241E22E0A04040 +9CA8:20401248444420140860738028000FC010403FF051101FF011101FF00000FFFE +9CA9:202020107DFE45028A047CF8540054007DFE545054507C5000921C92E10E4200 +9CAA:100010FC1E24222425FE7E24AA242AFC3E402A402AFC3EC401440E44707C2044 +9CAB:400043DE7A528A521252FBD2AA52AA52FA52ABD2AA1AFA9402501AB0E3104010 +9CAC:200021F87C0844D088207DFC552455247DFC552455247DFC01241D24E124410C +9CAD:202020207DFE442088FC7C2055FE54007CFC548454FC7C8400FC1C84E0944088 +9CAE:202020207CFC442088207DFE544854847D22547854887D4800501C20E050418C +9CAF:208820887DFC448888887CF8548854887CF8548854887DFE00001C88E1044202 +9CB0:200023E07D5C455489547DD4555455547DD4555455487D6803C81C54E0544062 +9CB1:205020507C5047DE88507C50545055DC7C50545054507C5003DE1C50E0504050 +9CB2:200021FC7D04450489FC7D04550455FC7C00551255D47D1801101D52E192410E +9CB3:20FC20847C8444FC88847C8454FC54007DFE550255027DFE01021D02E1FE4102 +9CB4:200021FC7D04452489247DFC552455247D74555455547D7401041D04E1FC4104 +9CB5:200020407D9C450489047DDC550455047DFC545054507C5000901C92E112420E +9CB6:40204020785088881144FA22A9F8A808F850A820A8A4FA82028A1A8AE4784000 +9CB7:200021FC7D24452489747D2455FC55047D74555455547D7401041E04E2144408 +9CB8:204020207DFE440088007CF8548854887C8854F854207CA801241E22E0A04040 +9CB9:204020487C8445FE88207FFE548855247E42558854107C6201841C18E0604380 +9CBA:200021FC7C04443489C47C44544455F47D54555455F47C4400541C76E1964002 +9CBB:209220927D24464889247C92549254007DFE552255227DFE01221D22E1FE4102 +9CBC:202021FC7C2044888BFE7C88540055FC7D04552455247D2401241C50E0884304 +9CBD:4048414879488BFE1148F948A978A900F9FEA820ABFEF87000A81924E6224020 +9CBE:100010FE1E00227C24447E44AA7C2A003EFE2A922A923EFE00920E9270FE2082 +9CBF:202021247CA8442089FE7D02540054F87C00540055FE7C2000401C88E1FC4084 +9CC0:100010FC1E84228424FC7E84AA842AFC3E002BFE2A203EA000BC0EA07160223E +9CC1:200020F87C88448888F87C88548854F87C0055FC55547D5401541D54E3FE4000 +9CC2:200021FC7D24452489FC7D24552455FC7C0057FE55207D2201141D48E1844102 +9CC3:200021FC7D24452489FC7D24552455FC7C20541054547D4201421D4AE2384000 +9CC4:200021DC7D54455489DC7C0055FC54007DFE548054FC7C0400041C04E0284010 +9CC5:400840C87B088908112AF92AABACA948F908AB88AD54F91401141924E1244142 +9CC6:204020407CFE448089FC7E8454FC54847CFC5440547C7CC401281C10E0684186 +9CC7:202020407DFC450489FC7D0455FC54007FFE542054207DFC00201C20E3FE4000 +9CC8:204020807DFC450489FC7D0455FC54207C3257B454A87D2801241E24E4A24040 +9CC9:209020907C9E46A289D47C88549454A47DFE568454A47C9400941C84E0944088 +9CCA:202020107DFE450289027DFE550055007DFE55AA56AA7CFE00AA1CAAE0AA4086 +9CCB:200021FC7CA4448888507C2054D857267C2055FC55247D2401FC1C22E3FE4002 +9CCC:08207E20087EFEC410281E1022284FC690403FF051101FF011101FF00000FFFE +9CCD:204020447DF844508BFE7C4054F855827E7E540055FC7D0401FC1D04E1FC4104 +9CCE:200020FC7C8444FC88847CFC540054007DDC544455547CCC01541C44E1544088 +9CCF:200021FC7D54455489547DFC542054A87CA4552454207CA800A41D24E0204020 +9CD0:2004201E7DE0440289227C9454FE55107C1055FE54107C9200921C92E0FE4002 +9CD1:202020107DFE448488487DFE550256247C1055FE54407C7C00441C84E0944108 +9CD2:208820507C0045FE88507DFC545457FE7C5455FC54507CD801541E52E0504050 +9CD3:414841487BE8894811DEF88AABEAAAAAFAAAABEAA88AFBEA00921892E0AA40C4 +9CD4:200023FE7C5045FC89547D5455FC54007DFC540057FE7C2000A81D24E2A24040 +9CD5:200021FC7C2047FE8A227DAC542055AC7C0055FC54047DFC00041C04E1FC4004 +9CD6:49202A3E7F4849485DA86B1049284FC610403FF051101FF011101FF00000FFFE +9CD7:400041F8790889F81108F9F8A800ABFCFA94ABFCA800F9F800901860E1984606 +9CD8:20203F20407EBEA82A28FF104A287FC610403FF051101FF011101FF00000FFFE +9CD9:201021FE7D10457C89147DFE5514557C7D10557C55547D7C01541E7CE254444C +9CDA:400443E47A248A2413EEFA04AAE4AA04FA0CABF4AA44FA6405541D44EA5440C8 +9CDB:200021DE7C42455288CA7D52544254207CFC548454847CFC00841C84E0FC4084 +9CDC:400043FE7A008B1412A4FBF6AA4AAA42FB50AB54ABF4FA44024A1A8AE4924920 +9CDD:408840507BFE882011FCF820ABFEA924F8A8ABFEA800F9FC01041904E1FC4104 +9CDE:4020412478A88BFE10A8F924AA22A904F904A9DEAA44FD54009E1904E2044404 +9CDF:208820507DFE445089FC7D54559C55047DFC550455FC7C0801FE1C88E0484018 +9CE0:208823FE7CA8449089FE7F2055FC55207DFC552055FE7D0003FC1C88E070438E +9CE1:401440127BFE8A1012F0FA14AAF4AAB8FAEAAA16AC42F82402A21A8AE4784000 +9CE2:205021FC7D5445FC89547DFC540055FC7C0055FC55047DFC00881C50E3FE4000 +9CE3:201021FE7C0045FE89027D7A554A55FE7C0054FC54847CFC00841CFCE00041FE +9CE4:210821087DEE469488427C1055FE55027CF8548854F87C8000FC1C84E0FC4084 +9CE5:020004001FF010101FF010101FF010001FFC10001FFC09242494249440280010 +9CE6:100020007F3E41027F0441047F0840087F9040107FA000A2AAA2AAA2811E0600 +9CE7:08003FE020203FE020203FE020003FF820003FF8524889281FD810422042C03E +9CE8:101020107F1041107F7E41127F1240127F9240127F920092AAA2AAA2814A0684 +9CE9:2040208021FC2104F9FC290429FC290029FE29002BFE2C024AAA42AA8202000C +9CEA:2040208021FC210421FC290425FC250025FE210021FE200222AA22AA2202200C +9CEB:00003FFE2100220027F0241027F0241027F0240027FC240027FC40044AA48AAC +9CEC:04001FF010101FF010101FF010001FFC10001FFC00040F94088808821082607E +9CED:00400080F9FC290429FC290429FC290029FE290029FE28024AAA4AAA9A02000C +9CEE:0040008001FCFD0405FC050449FC290011FE110029FE240246AA82AA0202000C +9CEF:00007FF844085FC850485FC850485FC850085FE850085FEA402AAAAAAAA60042 +9CF0:0040008081FC410421FC210411FC110029FE290025FE240242AA42AA8202000C +9CF1:00407C8011FC110411FC110411FCFF0011FE110011FE100212AA12AA1202100C +9CF2:004000803DFC250425FC25043DFC250021FE210021FE200222AA42AA4202800C +9CF3:3FF820082FE822082FE828282FE828282FE828082FF828082FFA401A55568032 +9CF4:0040008079FC490449FC490449FC490049FE490049FE78024AAA02AA0202000C +9CF5:0040F88049FC490449FC490449FCF90049FE490049FE48024AAA4AAA4602420C +9CF6:04200210013EFFC002221FFA10161FF010101FF010001FFC10001FFC2A44452C +9CF7:1040108011FCFF0411FC1104FDFC050005FE490029FE10022AAA46AA8202000C +9CF8:01007FFC40047FFC42005FF050105FF050105FF050005FFC50005FFCAA44452C +9CF9:1040108029FC290445FCA50411FC110001FEFD0005FE08020AAA12AA1202000C +9CFA:1040108011FC7D0411FC110411FCFD0011FE110011FE280226AA42AA8202000C +9CFB:0020284024FC248442FC428480FC7C8024FE248024FE240244AA44AA9502080C +9CFC:0040208011FC0104FDFC090409FC490029FE110011FE28022AAA4AAA8202000C +9CFD:00407C8029FC290429FC290429FCFF0029FE290029FE28022AAA2AAA4A02880C +9CFE:0040FE8011FC11047DFC550455FC550055FE550055FE5C0212AA12AA1202100C +9CFF:004000807DFC110411FC11047DFC110011FE110011FE1C02E2AA42AA0202000C +9D00:0040FC8011FC110421FC310469FC6500A5FE210021FE200222AA22AA2202200C +9D01:00400C8071FC110411FC1104FDFC110011FE110029FE280242AA42AA8202000C +9D02:2040208021FCF90429FC290429FC2900FDFE210021FE200232AA4AAA4A02800C +9D03:101020107F1041107F7C41147F1440147F94407E7F900090AAA8AAA881440682 +9D04:00200040FEFCA884A8FCA884A8FCA880AAFEAA80A6FEC00282AAFAAA0202000C +9D05:0040788049FC490469FC590449FCFD0049FE490049FE48024AAA4AAA4A02980C +9D06:1040108011FC7D0455FC910411FC290029FE290029FE2C024AAA42AA8202000C +9D07:4040488051FC610445FC45043DFC110011FE1100FDFE100212AA12AA1202100C +9D08:00007FFE444045FC490449FC590469FC490049FE490049FE48024AAA8AAA0804 +9D09:0040FC8009FC490449FC490489FCFF0019FE190029FE28024AAA8AAA2A02100C +9D0A:00400080FDFC110411FC110451FC5D0051FE510051FE50025EAAF2AA0202000C +9D0B:2020104000FCFE8420FC20843CFC248024FE248024FE240244AA54AA8902000C +9D0C:00003FF801007FFC04401830E20E1FF010101FF010101FFC10001FFC0004492C +9D0D:020001007FFC082007C01830E20E1FF010101FF010101FFC10001FFC0004492C +9D0E:0040FC8081FC8904C9FCA90491FC9100A9FEA900C9FE800282AAFEAA0202000C +9D0F:105020547C5244927C90459E7DF042907E9040907E900290AA8AAA8A82860C82 +9D10:10007E7812482678C2001FF010101FF010101FF010001FFC10001FFC2A44452C +9D11:08007E7812480C3032CEDFF010101FF010101FF010001FFC10001FFC2A44452C +9D12:1040108029FC250443FC910409FC0100FDFE050009FE500222AA12AA1202000C +9D13:2020104014FC048424FC2484AAFCAA80A8FE308032FE220222AA5EAA8102000C +9D14:08401C80E1FC010421FC1104FDFC050009FE090011FE200242AAA2AA1E02000C +9D15:101020087F08417E7F4241427F2040247FA840307FA000A2AAA2AAA2811E0600 +9D16:00207E4042FC42847EFC488448FC48807EFE488048FE48024AAA4AAA6702420C +9D17:2040108011FCFD0401FC090489FC890049FE490051FE50021EAAE2AA4202000C +9D18:1040108021FC4904FDFC050429FC290029FEFD0029FE28022AAA4AAA4A02880C +9D19:2040208021FC7D0451FC910411FC1100FDFE110011FE280226AA42AA8202000C +9D1A:100020007DFE44047C0444F47C9440947E9440947EF40294AA04AA0482140C08 +9D1B:20F83E88449AA882127E3FF0D0101FF010101FF010001FFC10001FFC2A44452C +9D1C:08442F7828422F3EF2001FF010101FF010101FF010001FFC10001FFC2A44452C +9D1D:2020204020FC7E8442FC82847AFC4A804AFE4A807AFE4A0202AA02AA1502080C +9D1E:0040788049FC490449FC790401FCFD0021FE410079FE08020AAA0AAA5202200C +9D1F:04400E80F1FC910491FC9104FDFC910091FE910091FE88028AAAC6AA9202080C +9D20:004000807DFC450445FC7D0445FC45007DFE010001FE1C02E2AA42AA0202000C +9D21:0040788049FC490449FC790449FC490079FE490049FE48024EAAF2AA0202000C +9D22:04082410243C44245FBC94A4E4BC24A044BE44A094BEF48218AA08AA1282210C +9D23:1020104010FC1084FEFC108410FC10807CFE448044FE440244AA7CAA4502000C +9D24:102020207F3C41447F6841A87F1040287FC440827FA00090AA88AAA081100608 +9D25:102020107C1044FE7C8245047C0040287E2840287E280228AA44AA4482440C82 +9D26:01001FF01110FFFE02801C70E20E1FF010101FF010101FFC10001FFC0004492C +9D27:2020104010FCFE8482FC848400FC788048FE488048FE4A024EAA4AAA8202000C +9D28:00407C8055FC550455FC7D0455FC550055FE7D0055FE100212AA12AA1202100C +9D29:1040108051FC51047DFC910411FC1100FDFE110011FE280226AA42AA8202000C +9D2A:2020104010FCFE8482FC828428FC288024FE248044FE400242AA82AA0202000C +9D2B:00400080F9FCA904A9FCA904A9FCF900A9FEA900A9FEA802FAAA8AAA0202000C +9D2C:2208111000207FFE42029FF410101FF010101FF010001FFC10001FFC2A44452C +9D2D:1040208079FC490449FC490479FC410041FE790049FE48024AAA7AAA4A02000C +9D2E:10201040FEFC288444FC82847CFC0080FEFE208040FE7C0204AA04AA2902100C +9D2F:0020FE4010FC108420FCFE84AAFCAA80AAFEAA80AAFEAA02AAAAA2AA8B02840C +9D30:08201C4070FC108410FCFC8410FC10807CFE448044FE440244AA7CAA4502000C +9D31:28402880FDFC290429FC010405FC450029FE290011FE10022AAA2AAA4A02800C +9D32:80208840B0FCC08484FC84847CFC0080F8FE888088FEF8028AAA8AAAFA02880C +9D33:102008407EFC428494FC108410FCFE8024FE248048FE280212AA2AAA4602800C +9D34:10101020277C4044907C10442FFC6240A27E2240227E220222AA22AA2B02240C +9D35:2820284028FC2884AAFC6C8428FC28806CFEAA8028FE28022AAA4CAA4902800C +9D36:1020104010FCFE8410FC10847CFC008000FE7C8044FE440244AA7CAA4502000C +9D37:7F0408441E44224454440844320CDFF010101FF010101FFC10001FFC0004492C +9D38:1040508051FC7D0491FC110411FCFF0031FE390055FE540292AA12AA1202100C +9D39:4440248029FCFF0411FC11047DFC110011FEFF0011FE100222AA22AA4202800C +9D3A:10201040FEFC10847CFC14847CFC50807EFE128012FE160228AA24AA4502800C +9D3B:0020804040FC1F8484FC448444FC048024FE4480C4FE47025CAA48AA4102000C +9D3C:101020107F3C41247F4441287F1040287FC640007FBC00A4AAA4AAA4813C0624 +9D3D:1000FE7C22441C7CE2001FF010101FF010101FF010001FFC10001FFC2A44452C +9D3E:1040108021FC4904FDFC450411FC51007DFE910011FEFC0212AA12AA1202100C +9D3F:2040208051FC490485FC0104F9FC010001FEF90089FE88028AAAFAAA8A02000C +9D40:081813E0304057FC904013F802001FF010101FF010101FFC10001FFC0004492C +9D41:2040108001FCFD0401FC290445FC830009FE490029FE10022AAA4AAA8202000C +9D42:12081210123C22242FBC6224A63C27202ABE2AA0323E2202222A222A2202220C +9D43:1040208079FC490469FC590449FCF90049FE490069FE58024AAA4AAA4A02980C +9D44:0040FE8021FC290445FCFD0415FC110011FE7D0011FE10021EAAE2AA4202000C +9D45:2040208039FC490449FCA90411FC290045FE850079FE48024AAA4AAA7A02480C +9D46:11001200279C44808780148027BE6408A7C8240827C820482548254828682190 +9D47:202020403EFC288448FC08843CFC288028FE2880FEFE08020AAA0AAA0A02080C +9D48:0040FC8049FC490479FC490449FC790049FE49004DFE7802CAAA0AAA0A02080C +9D49:02000100FFFE04401450244842041FF010101FF010101FFC10001FFC0004492C +9D4A:10201040FEFC108410FC548454FC5480BAFE118010FE280228AA44AA8502000C +9D4B:00107E20027C02447E7C4044417C41403F7E1040087E2902A2AAA2AA1F02000C +9D4C:101020107C2844287C4444BA7C1040107EFE40107E580254AA92AB1282500C20 +9D4D:20201040FEFC828400FC7C8400FC0080FEFE288028FE280228AA4AAA4D02800C +9D4E:04201E40E0FC228492FC548448FC1080FCFE248044FE280210AA28AA4502800C +9D4F:1020144010FCFE8410FC7C8454FC54807CFE548054FE7C0254AA54AA55024C0C +9D50:002000407CFC108410FC548454FC5480BAFE108010FE1C02E2AA42AA0202000C +9D51:0040F88089FC8904F9FC0104F9FC890089FEF90089FE8802FAAA8AAA8A02980C +9D52:0040488045FC950411FC290445FC810079FE490049FE48024AAA7AAA4A02000C +9D53:10201040FEFC108410FCFE8482FC048078FE088010FE1E02F0AA10AA5102200C +9D54:101020107C2044447CFE44287C4440A27E3C40447E4402A8AA10AA2882440C82 +9D55:1020104020FC4484FEFC288444FCA2803CFE448044FEA80212AA2AAA4602800C +9D56:004000807DFC450445FC7D0445FC45007DFE410051FE480256AA62AA4202000C +9D57:42102420187C2444527C1044FF7C2040287E7E40AA7E2A022AAA2EAA0902080C +9D58:00107E20127C1244FF7C1244127C7E40207E20407E7E6202A2AA22AA3F02220C +9D59:0040788049FC490479FC490449FC790049FE490079FE000252AA4AAA8A02000C +9D5A:0C20704010FCFE8410FC388454FC928000FE388028FE28022AAA4CAA4902800C +9D5B:0020FE4054FC5484A8FC548454FC0080FEFE108010FE10021EAAF2AA4202000C +9D5C:4420244028FCFC8414FC1484FCFC908090FEFE8032FE320252AA96AA1102100C +9D5D:04103620E57C2544247CFFC4247C2540257E3640E67E24022AAA32AAA1C2408C +9D5E:02403C500848FFFE08480E50782408541A8C1FF010101FF010101FFC5244892C +9D5F:280011FC682014F82420D5FC0A001FF010101FF010101FFC10001FFC0004492C +9D60:1020504050FC7C8490FC1084FEFC008000FE7C8044FE440244AA7CAA4502000C +9D61:04100620757C0544047CFF44047C1440147E5C40547E5402552A5D2AE342410C +9D62:1040208079FC490479FC490479FC490049FEF90019FE28024AAA8AAA2A02100C +9D63:10201040FEFC108410FC7C8454FC548054FE7C8010FE380256AA92AA1202100C +9D64:202020403CFC448448FCBE842AFC2A803EFE2A802AFE3E022AAA2AAA2B02440C +9D65:49042A247F240824FFA4080C02001FF010101FF010101FFC10001FFC0004492C +9D66:100020FC7C0444047C7C44047C0440FE7E1040927E540238AA54AA9282500C20 +9D67:4440288001FC7D0429FC290429FC2900FDFE290029FE28022AAA4AAA4A02880C +9D68:1020104028FC248442FCB88410FC1080FEFE108010FE7C0244AA44AA7D02440C +9D69:0008779054BC54A454BC75A4543C57A054BE74A056BE5502552A56AA5482B40C +9D6A:10201040FEFC288454FC92847CFC54807CFE54807CFE100216AA1AAA1202000C +9D6B:102010401EFC10847CFC44847CFC44807CFE548010FEFE0212AA12AA1202100C +9D6C:00107720557C5544557C7744557C5540557E7740557E5502552AB52A8942130C +9D6D:1020104028FC248442FCBC8410FC1080FEFE108094FE580252AA1EAAF202400C +9D6E:102010403EFC228444FC808410FC668042FE428066FE420242AA7EAA4302000C +9D6F:104020807DFC550455FC7D0455FC55007DFE210051FEFC0212AA12AA1202100C +9D70:00107F20497C49445D7C49447F7C41405D7E5540557E5D02412A412A4542820C +9D71:102010407CFC108410FCFE8400FC448092FE10807CFE100212AA1EAAE202400C +9D72:2820284028FCFC8428FC2884FEFC00807CFE448044FE7C0244AA44AA7D02440C +9D73:102008407EFC428442FC7E8440FC5E8052FE5E8052FE5E0252AA52AA9302160C +9D74:402040407EFC828422FCAA8472FC2280FEFE228072FEAA0222AA22AA0B02040C +9D75:202020403CFC448488FC7E8452FC52807EFE10802CFE2A0228AA4AAA4B02860C +9D76:0020FE4028FC288428FCEE8482FC828082FEEE8028FE28022EAAF0AA4102000C +9D77:10100820FF7C8144407C7744557C5540557EB540977E1402242A252A4642840C +9D78:10201040FEFC108428FC4484FEFC048074FE548054FE740254AA04AA1502080C +9D79:0640387C08947E241C442A944A081FF010101FF010101FFC10001FFC0004492C +9D7A:20201040FEFC288428FC4E8452FCDA8056FE628054FE4C0248AA54AA6502400C +9D7B:105020487C8044FE7D9046907CFC40907E9040FC7E900290AA90AAFE82800C80 +9D7C:20201040FEFC828428FC448482FC00807CFE108010FE10021EAAF2AA4202000C +9D7D:0010F720117C5544227C5544897C1040007EF740117E5502222A552A8942100C +9D7E:0020FC4084FC8484FCFC848484FCFC8000FE8880EEFE880288AAAAAACD02880C +9D7F:100020FE7C8244FE7C8244FE7C0040147EE440447E4403FEAA44AA4482840D04 +9D80:102420247F7E41247F24413C7F2440247FBC40247FA400FEAA80AAA481220642 +9D81:20201040FEFC008400FC7C8444FC44807CFE108054FE520292AA10AA5102200C +9D82:2020CE4082FC8284EEFC828482FCFE8028FE288028FE28024AAA4CAA8902000C +9D83:100020207CCE44827C8244EE7C8240827EFE40287E280228AA48AA4A828A0D06 +9D84:10201040FEFC10847CFC1084FEFC00807CFE44807CFE44027CAA44AA5502480C +9D85:0040548055FCA904A9FC550455FC0100F9FEA900A9FEF802AAAAAAAAFA02880C +9D86:1040108011FC7D0411FC550455FC5500BBFE110039FE540292AA12AA1202100C +9D87:10201040FEFC10847CFC54847CFC54807CFE108038FE540292AA12AA1202100C +9D88:10201040FEFC10847CFC1484FEFC14807CFE1080FCFE240244AA28AA3102C80C +9D89:20201040FEFC00847CFC44847CFC00807CFE048008FE1E02F2AA12AA5202200C +9D8A:101008207F7C48445E7C4A444A7C7F404A7E4A405E7E4802542A922A2242400C +9D8B:00207E4042FC42847EFC488448FC7E8048FE48805CFE540254AA54AA5D02940C +9D8C:00107F20417C41447F7C4444557C5540557E5F40447E5502552A572A9D42000C +9D8D:00207C4044FC7C8444FC44847CFC20807EFEAA802AFE4A0292AA22AA4B02040C +9D8E:20201040FEFC828400FC7C8400FC0080FEFE108010FE540252AA92AA5102200C +9D8F:0E20F04022FC928444FC108410FC7C8010FE1080FCFE10022AAA26AA4202800C +9D90:08208C404AFC48843EFC0884C8FC5C806AFE488048FE48024AAA62AA9A02000C +9D91:2AA42CA84920145022885FF410101FF010101FF010001FFC10001FFC2A44452C +9D92:22082210FA3C222427BCFAA4AABCAAA0FABE22A072BEAA822AAA24AA2482298C +9D93:50405080F9FC510451FC0104F9FCA900A9FEA900F9FEA802AAAAAAAAFA02880C +9D94:00107E20247C18447F7C29444A7CA840107E0840FF7E1C022A2A492A8842080C +9D95:2040108079FC010449FC3104FDFC010079FE490049FE78024AAA4AAA7A02480C +9D96:0610381008527E5408901C282A2848440A821FF010101FF010101FFC5244892C +9D97:00407CFC44847CFC44847CFC0080FEFE108010FE5E0252AA52AAB0049FFE0000 +9D98:20102720257C7544257C2744257C7540557E5740557E5502752A492A0942130C +9D99:20201040FEFC008444FC2884FEFC828010FE7C8054FE540254AA5CAA1102100C +9D9A:0020EE40AAFCAA84EEFC008478FC0080FCFE208040FE78020AAA0AAA2A02100C +9D9B:48204A406CFC48844AFC6A8456FC20807EFE428042FE7E0242AA42AA7F02420C +9D9C:4420FE4044FC00847CFC048428FC1080FEFE328054FE900212AA12AA5202200C +9D9D:0020FE4000FC7C8444FC44847CFC0080FEFE928092FEFE0292AA92AAFF02820C +9D9E:021007203C7C2444247C3F44247C2F40297E2F40297E2F02292A492A4F42890C +9D9F:20201040FEFC828428FC448492FC148012FEFE8010FE10022AAA26AA4202800C +9DA0:0010FFA0807CBF44A17CBF44A17CBF40887EFFC0927EB2028CAA92AAA102FF8C +9DA1:00207C4044FC7C8444FC7C8420FC7E8092FE52806AFE42027AAA02AA1502080C +9DA2:0E20F04022FC928454FC48847CFC1080FEFE20803EFE420254AA88AA1502620C +9DA3:101008207E7C4244427C7E44427C40407F7E5540557E7F02D52A552A5542430C +9DA4:0020FE4092FC1084FEFC10847CFC54807CFE54807CFE1002FEAA12AA1202100C +9DA5:00107F20497C49447F7C40445F7C5140517E5F40517E5F02512A512A9F42110C +9DA6:107CFF44107C7E44427C7E44028C1FF010101FF010101FFC10001FFC0004492C +9DA7:221022207F7C22442A7C08443E7C2A402A7E2A40FF7E0802142A122A2242400C +9DA8:20203C4044FC788408FCFE8420FC52809CFE2C804AFE98022AAA4AAAAA02100C +9DA9:00207E20247E18A4FF2829104A2898C602001FF010101FF010101FFC5244892C +9DAA:00207E4042FC7E8442FC7E8442FC7E8014FE1280FEFE10022AAA26AA4202800C +9DAB:10201040FEFC1084FEFC9284D6FCBA8092FEFE8010FE380254AA92AA1102100C +9DAC:08100C20127C294444FCBF44217C3F40217E3F40207E3F02512A512A9F42110C +9DAD:20204410F9FE1040247CFE840084551482081FF010101FF010101FFC5244892C +9DAE:20201040FEFC00847CFC44847CFC0080FEFE8280BAFEAA02BAAA82AA8B02840C +9DAF:08202AA44D28145022887FFE42029FF410101FF010101FFC10001FFC0004492C +9DB0:00207C4044FC44847CFC0084FEFC8280FEFE8280FEFE8202FEAA28AA4502840C +9DB1:01007FFE44429FF404403FF80440FFFE0A201FF02828CFE608200FF800081558 +9DB2:2820444092FC208448FCFC8404FC0080EEFE2280AAFE6602AAAA22AAAB02440C +9DB3:2100427EF3889288F2BE92AAF3AA822AFA2A83AAFAAA0AAEAA88AB888A883008 +9DB4:081008207F7C5544127C3F44647CA4403F7E2440247E3F0224AA24AA3F02200C +9DB5:201020207F7C9144557C7D44217C4A40A47E7F40917E55027D2A212A4A42840C +9DB6:101008207F7C48445E7C4A447F7C4A405E7E48405E7E520252AA52AA5F02920C +9DB7:20201040FEFC828410FC7C8410FC7C8010FEFE8010FE7C0244AA44AA7D02440C +9DB8:0020EE4022FC2284EEFC888488FCEE8022FEAA8066FE6602AAAA22AAAB02440C +9DB9:2020DE408AFCCA84AAFCD284A6FC0080FEFE928092FEFE0292AA92AAFF02820C +9DBA:1020924054FCAA8444FC82847CFC448044FE7C8044FE44027CAA44AA45024C0C +9DBB:00207C4044FC748454FCFE8482FC7C8044FE7C8044FE7C0244AA44AA5502480C +9DBC:22101420007C7FC4147C7F44157CFFC0157E7F40147E3602552A94AA1442140C +9DBD:282024407EFCC8847EFC48847EFC48807EFE508010FEFE0212AA12AA1202100C +9DBE:108010FE1140FEFC10847CFC44847CFC44807CFE1080FEFE100212AA12AA1004 +9DBF:082004407FFC12483CF0082014503EF802001FF010101FF010101FFC5244892C +9DC0:21081110123CFFE4213C2124423C52A094BEE720213E4202422A94AAF782108C +9DC1:22101420007C7F44007C1444227C4140007E7F40557E5502552A57AAFC42000C +9DC2:0E20F04022FC928444FC20843CFC508010FEFE8010FE540254AA5CAA6502000C +9DC3:00107E20427C7E44427C7E44087CFF40817E1040FF7E220264AA18AA2502C20C +9DC4:0E20F04022FC928444FC208444FCF88010FE2480FEFE1002FEAA28AA4502820C +9DC5:0020FE4028FC2884FEFCAA84AAFCFE8010FE1080FEFE380254AA92AA1102100C +9DC6:4610782040FC3FC4007C5F44517C5F40517E5F40517E5F02402A7FAA2242410C +9DC7:1000FE7810487C480048FE8692007CFC44447C4444287E2840107F280144AB82 +9DC8:2004401EF3F0921EF21092FEF2928298FAF2828EFA800AB8AAA8ACAA8D4A3A86 +9DC9:03107C20477C44445F7C5544567C5C40557E5340507E5702552A552AA9C2000C +9DCA:0020FE4000FC7C8444FC7C8400FCFE8082FEAA8092FEFE0292AA92AA9302860C +9DCB:22082210FFBC22242A3C1424223C5D2088BE08207F3E08022A2A492AA882100C +9DCC:100020FE7C9044FC7C9044FC7C9040907EFE40027EAA02AAAAAAAA8282140C08 +9DCD:104020807DFC45047DFC45047DFC45007DFE1100FDFE10023AAA56AA9202100C +9DCE:102020407CFC44847CFC44847CFC1080FEFE288054FE92027CAA10AA1102100C +9DCF:10201040FEFC10847CFC44847CFC44807CFE44807CFE4402FEAA28AA4502820C +9DD0:00107E20427C7E44427C7E44007C7F40407E5E40407E7F02552A522A5942910C +9DD1:44104420777CAA44117C2044107CFF40007E0440447E240228AA0EAAF102400C +9DD2:10201040FEFC10847CFC54847CFC54807CFE1280FEFE0802FEAA48AA2902180C +9DD3:101008207F7C4044527C52447F7C5240527E5E40407E5502552A552A8042000C +9DD4:08207F20087E7E4408A4FF2810101E2822445FF290101FF010101FFC5244892C +9DD5:009079FE4B204DFC492049FC792001FE02001FF010101FF010101FFC5244892C +9DD6:7F7848485F4C64805F784A4851307F4C02001FF010101FF010101FFC5244892C +9DD7:0020FE4080FC8084BCFCA484A4FCBC8080FEEE80AAFEAA02EEAA80AAFF02000C +9DD8:0820FFA0083E7F4449A87F102A28494682001FF010101FF010101FFC5244892C +9DD9:08207E2008F8FF2814287F6A082AFF560A821FF010101FF010101FFC5244892C +9DDA:0020EE4022FCAA8466FCAA8410FC288044FE928020FEC80232AAC4AA1902E00C +9DDB:02083FD0223C2FA422BC3FE422BC2FA0223E2FA02ABE2F824AAA4FAA8A82098C +9DDC:08107F20497CFFC4497C7F44087C7F40497E7F40107EFF02212A722A0C42F30C +9DDD:0020FE4092FCFE8492FCFE8454FC5480FEFE548054FEFE0210AAFEAA1102100C +9DDE:10201040FEFC1084BAFC5484BAFC1080BAFE5480BAFE10022AAA26AA4202800C +9DDF:208010FCFD4020F83D2024FC445055888A041FF010101FF010101FFC5244892C +9DE0:2040208079FC490491FC7D0455FC55007DFE550055FE7C0202AAAAAAAA02000C +9DE1:200820107FBCD524553C5524FFBC5520553E5520FFBE00026A2A552A9502000C +9DE2:3FFE289025103FDE22222A882F88229425222FF0241027F0241047FC40048AAC +9DE3:0020FE4028FCFE84AAFCFE8400FC7C8044FE7C8044FE7C0210AAFEAA1102100C +9DE4:0020EE40AAFCAA84EEFC00847CFC54807CFE54807CFE1002FEAA12AA1202100C +9DE5:1020244878F014287EFC002054A8556402001FF010101FF010101FFC5244892C +9DE6:282024407EFCC88448FC7E8448FC48807EFE488048FE7E0240AAAAAAAB02000C +9DE7:1020FE4010FC7C8400FCFE8482FC7C8000FE7C8044FE7C0244AA28AA0F02F00C +9DE8:44204440FEFC448400FCFE8454FC5480FEFE548054FEFE0210AAFEAA1102100C +9DE9:49202A3E7F4849485DA86B104928414602001FF010101FF010101FFC5244892C +9DEA:00003EF822883EF822883EF822887FFE42029FF410101FF010101FFC5244892C +9DEB:08087F10093CFFA4093C7F24083CAAA0EBBE88A0FFBE8882EBAAAAAAAA82088C +9DEC:282028407CFC288428FCFE8410FC7C8054FE7C8054FE7C0200AA28AA4502820C +9DED:0E20F04092FC5484FEFC388454FC82807CFE548054FE7C0254AA54AA7D02440C +9DEE:06107820107CFFC4227C5D4494FC1C40007E7F40417E5D02552A5D2A4142430C +9DEF:081008207F7C0844557C2244417CBEC0227E3E40227E3E0208AA2AAA4902180C +9DF0:0440FFFE044017D2F01C17D03452D7CE02001FF010101FF010101FFC5244892C +9DF1:2020FE4082FCFE8482FCFE8482FCFE8010FE928054FE920210AAFEAA1102100C +9DF2:08287F2400FE3E2022503E504952988E02001FF010101FF010101FFC5244892C +9DF3:EE20AA40EEFCAA84EEFC8284BAFCAA80BAFEAA80BAFEAA02AAAADAAA8302860C +9DF4:0020EE40AAFCEE84AAFCEE8492FC9280FEFE9280BAFED60292AA92AA8B02840C +9DF5:00107F20417C41447F7C48445D7C4A407F7E48405E7E72025EAA52AA5F02920C +9DF6:0020FE40AAFCAA84FEFC00847CFC44807CFE44807CFE44027CAA00AA2902440C +9DF7:22101420FF7C14447F7C5544637C5D40417E7F40047EFF0244AA24AA25020C0C +9DF8:7E101420087CFF44297C4A44A87C10407F7E5540637E5D02552A5D2A4142430C +9DF9:00803FFE225024FC2D9036FC249024FC210027F0241027F0441047FC80040AAC +9DFA:00403EFC23483E3009CE2E7828487E7802001FF010101FF010101FFC5244892C +9DFB:21084088F3C89010F3DE9264F3D48014FBD48054F89408E8AB88A8948A943122 +9DFC:0020EE40AAFCEE84AAFCEE8482FCBA80AAFEBA80AAFEBA02AAAA82AA8B02840C +9DFD:0A803138228838382288393822887FFE42029FF410101FF010101FFC5244892C +9DFE:1020FE4044FC2884FEFC00847CFC44807CFE44807CFE10020AAAA9AAA5021C0C +9DFF:3E1022FE3E4420287EFEA2103EFC221002001FF010101FF010101FFC5244892C +9E00:00107F20557C55447F7C20447F7C91407D7E5540557E7D02112A7D2A0542020C +9E01:0100FFFE20003FF800003FF820083FF80200779C54947794549C77D65056B562 +9E02:0310BC2044FC1144847C49445E7C0440297E5F40C47E5F0244AA4AAA5102208C +9E03:21044088F3FE9020F1FC9020F3FE8054F9928090FBFE0890A8D4AB8A889631A2 +9E04:10207E204A7E7EC41028FF1020283EC642001FF010101FF010101FFC5244892C +9E05:00107F20557C7F44087C7F44087CFFC0227E14407F7E0802FFAA08AA0902080C +9E06:08100F20087C7F44497C7C44497C5F40527E5E40407E5E02482A7F2A5242A10C +9E07:1020FE4000FCFE8482FCBA84AAFCFE8000FE7C8044FE7C0244AA7CAA0102FE0C +9E08:14105520367C1444FF7C2244147C7F40087E7F40087EFF021CAA2AAA4902080C +9E09:11FC1104FDFC310459FC948011FE125202AA1FF410101FF010101FFC5244892C +9E0A:02087910493C4BA4483C7AA4413C47E0793E6920ABBEA902292A392A2902010C +9E0B:0810FF20917C4A44A57C1C44007C7F40557EFFC0007E7F0208AA08AA2902100C +9E0C:104421FE7C5444487CFE45907CFE40907EFE40907EFE0280ABFEAA4482380DC6 +9E0D:0008FF90493C88A4FFFC88A4DDBCAAA0DDBE88A0DDBEAA82DDAA88AA8A82810C +9E0E:3EF822883EF822883EF822883EF8145022881FF010101FF010101FFC5244892C +9E0F:2410FF20247CFF44817C7E44007CFF40107E28C0D57E2E02D5AA24AAD502080C +9E10:0010EE20227CAA44667CAA44007C24407F7EC8407E7E48027EAA48AA7F02400C +9E11:510C278A500897BE30085788949457A422021FF010101FF010101FFC5244892C +9E12:1A3823883A38238838B82288FFFE10102208DFF610101FF010101FFC5244892C +9E13:00087F10493C7F24493C7F24413C0020FFBEAAA0AABEFF82AAAAAAAAFF82888C +9E14:21FC4104F9FC8904F9FC8888F9FC8088FDFE8088FD2406AA547054A885241860 +9E15:08080F90083C7FA448BC7E2448BC5FA0553E5F20553E5F02402ABFAA2A827FCC +9E16:7F080810FFBC88A46B3C08246B3C24207FBEC8207F3E48027F2A482A7F82400C +9E17:08403E7C1440FF7822083E782242263E02001FF010101FF010101FFC5244892C +9E18:FE201040FEFC928454FC108454FC00802EFEFA802EFE7A02AEAA2AAA2F022A0C +9E19:1020284044FCBA8400FCFE84AAFCFE8000FEFE80AAFEAA02FEAAAAAAAB02860C +9E1A:00107720557C7744557C7744557C7740227E5540107EFF0222AA64AA1D02E30C +9E1B:4420FE4044FC0084EEFCAA84EEFC24807EFEC8807EFE48027EAA48AA7F02400C +9E1C:77105520777C5544777C5544777C22407FFEA4403F7E24023F2A242A3FC2200C +9E1D:77100020777C5544777C5544087C7F40547E7F40557E7F02552A5E2A55429B0C +9E1E:21084FD2F03C23884812FBBE0280ABAA02001FF010101FF010101FFC5244892C +9E1F:010002001FF01010121011101150102010001FFC000400047FE4000400280010 +9E20:2020204020FC2084FCA4248424942488248024FE2502260245FA400280140008 +9E21:0020004000FCFC8404A4048448942888108010FE2802240245FA800200140008 +9E22:04200410023EFFC00080004202321FEE1420126010001FF800087F8800280010 +9E23:0020004079FC4904494449244924490C490049FE7802480203FA000200140008 +9E24:002000403EFC228422A422843E942288208020FE2002200221FA400240148008 +9E25:00207E4040FC448464A4548448944888548054FE6402400241FA7E0200140008 +9E26:00207E4004FC248424A4248444947F880C8014FE1402240245FA840214140808 +9E27:08100820147C124421644054BE44224C2240227E2A022402217A21021F0A0004 +9E28:4020484050FC608444A444843C941088108010FEFE02100211FA100210141008 +9E29:08100820087C7F44496408540844144C1440147E14022502267A4402800A0004 +9E2A:1020104010FC1084FEA41084109410887C8044FE4402440245FA7C0244140008 +9E2B:10101020107CFF44206428544844484C7E40087E2C022A02497A8902280A1004 +9E2C:102010401EFC108410A47C844494448844807CFE4402400241FA400280140008 +9E2D:0020FE4092FC928492A4FE84929492889280FEFE9202100211FA100210141008 +9E2E:00207E4042FC428442A47E840094FF88208040FE7E02020203FA020214140808 +9E2F:01001FF011101110FFFE02801C70E20E04001FE0122011601FFC00047FD40008 +9E30:1020104028FC248442A4918408940888FE8002FE4402280211FA080208140008 +9E31:011007A07C7C44444464445444447F4C4440447E4402420242FA5282698A4484 +9E32:2020204040FC7E8482A402847A944A884A804AFE7A024A0203FA020214140808 +9E33:10003EF84288A2AA1492187EE2001FE01420126010001FF800087F8800280010 +9E34:2208111000207FFE410282041FF010101210115010201FFC000400047FD40008 +9E35:102020107C1044FE548245045440484840507E6002400242FA420242143E0800 +9E36:1020244878F010207EFC0000FFFE020004001FE0122011601FFC00047FD40008 +9E37:10801080FBF010901990F0941154520C24041FE0122011601FFC00047FD40008 +9E38:00107F20087C084410647F545544554C5540557E55025502557A5102450A4204 +9E39:04200E4038FC088408A4FF84089408883E8022FE2202220223FA3E0222140008 +9E3A:12081210123E22222FB2622AA62227262AA02ABE32022202227A2202220A2204 +9E3B:10101020277C4044906410542FC4624CA240227E22022202227A22022A0A2404 +9E3C:082010403EFC228432A42A842A94FE88228032FE2A022A0223FA42024A148408 +9E3D:1020104028FC248442A480847C94008800807CFE4402440245FA7C0244140008 +9E3E:02000100FFFE04401450244842041FE01420126010001FF800087F8800280010 +9E3F:00108020407C1F44846444544444044C2440447EC40247025C7A4802400A0004 +9E40:001000207F7C084408642A542A442A4C5D40497E880208020F7AF002400A0004 +9E41:10201040FEFC108410A4FE8482940488788008FE10021E02F1FA100250142008 +9E42:0008FF90003E0022F7B294AA94A294A6D6A0B5BE9482948294FA9482948AB584 +9E43:00103E20227C22443E6400547F44414C41407F7E410241027F7A4102450A4204 +9E44:08104820487C7F44886408540844FF4C0040007E7E024202427A42027E0A4204 +9E45:04103620E57C25442464FFD42444254C2540367EE60224022AFA3282A18A4084 +9E46:2820244042FC928410A42884449482887C8044FE4402440245FA7C0244140008 +9E47:40102F20017C4944496449547F44494C5D406B7E49024902497A4102450A4204 +9E48:4420244028FCFC8414A41484FC9490889080FEFE3202320253FA960210141008 +9E49:04100620757C05440464FF540444144C14405C7E54025402557A5D02E30A4104 +9E4A:24102420247CFF4424642454FFC4004C7E40427E42027E02427A42027E0A4204 +9E4B:22082210FFBE22222232002A7F2249264920493E7F024902497A49027F0A4104 +9E4C:08080810FFBE14222232492A88A27F2649207F3E49027F02087A0A020C0A0804 +9E4D:00107E20427C42447E64425442447E4C0040447E77024402447A5502660A4404 +9E4E:101020207F7C494449647F544944514C7F40247E4402FF82047A0402040A0404 +9E4F:00107720557C5544556477545544554C5540777E55025502557AB502890A1304 +9E50:102010403EFC228444A4808410946688428042FE6602420243FA7E0242140008 +9E51:10100820FF7C00447E6442547E44004C7E40047E08020F02F87A0802280A1004 +9E52:101008207F7C48445E644A544A447F4C4A404A7E5E024802547A9202220A4004 +9E53:10100820FF7C8144406477545544554C5540B57E97021402247A2502460A8404 +9E54:081008207F7C0944FFE409547F44084C4940497E5D026B02497A4902890A0904 +9E55:2008279024BEFCA224B227AA24A274A654A057BE5482548274FA08820A8A1104 +9E56:00107E20427C7E4442647E5420447F4C8940497E550241027D7A01020A0A0404 +9E57:00107720557C5544776400547F44004CFFC0207E3F020102017A01020A0A0404 +9E58:00207C4044FC748454A4FE9482947C8C44807CFE44027C0245FA440254144808 +9E59:0620382008A47EA819202C504A881FE41420126010001FF800087F8800280010 +9E5A:21081110123EFFE22132212A422252A694A0E73E21024202427A9482F78A1084 +9E5B:00107F20497C49447F6440545F44514C51405F7E51025F02517A51029F0A1104 +9E5C:00207E20247E18A4FF2829104A289AC604001FE0122011601FFC00047FD40008 +9E5D:0020FE4000FC7C8444A47C840094FE888280AAFE9202FE0293FA920292148608 +9E5E:0E20F04022FC928444A420843C9450881080FEFE1002540255FA5C0264140008 +9E5F:2820444092FC208448A4FC8404940088EE8022FEAA026602ABFA2202AA144408 +9E60:2020DE408AFCCA84AAA4D284A6940088FE8092FE9202FE0293FA9202FE148208 +9E61:1020924054FCAA8444A482847C94448844807CFE440244027DFA440244144C08 +9E62:22101420007C7F44006414542244414C00407F7E55025502557A5782FC0A0004 +9E63:22101420007C7FC414647F541544FFCC15407F7E14023602557A9482140A1404 +9E64:081008207F7C554412643F546444A44C3F40247E24023F02247A24023F0A2004 +9E65:7F7848485F4C64805F784A4851307F4C04001FE0122011601FFC00047FD40008 +9E66:00107720557C5544556455542244554C0840FF7E12022202347A0C02320AC104 +9E67:101008207F7C4044526452547F44524C52405E7E40025502557A5502800A0004 +9E68:00107720117C5544336455540C44334CC4C0187E62020C82717A0602180AE004 +9E69:081008207F7C0844556422544144BECC22403E7E22023E02087A2A02490A1804 +9E6A:282024407EFCC88448A47E84489448887E8048FE48027E0241FAAA02AA140008 +9E6B:08287F2400FE3E2022503E5049529A8E04001FE0122011601FFC00047FD40008 +9E6C:7E101420087CFF4429644A54A844104C7F40557E63025D02557A5D02410A4304 +9E6D:00403EFC23483E3009CE2E7828487E7804001FE0122011601FFC00047FD40008 +9E6E:0020FE40AAFCAA84FEA40084FE9400887C8044FE7C022A0265FAA20231142008 +9E6F:1020FE4000FCFE8482A4BA84AA94FE8800807CFE44027C0245FA7C020014FE08 +9E70:00803FFE225024FC2D9036FC249024FC210027F02490242047FC40049FD40008 +9E71:104421FE7C54444864FE559044FE4C9040FE7C9004FE0480F5FE0444143809C6 +9E72:2410FF20247CFF4481647E540044FF4C104028FED5022E02D57A2482D40A0804 +9E73:2208FF90223EF7A294B2F7AA282224267FA0483EFF0248027F7A48027F8A4004 +9E74:7F1008207F7C49442A6408542A44004C2740FD7E27027502AF7A2502270A2504 +9E75:0100010001FE010001003FF8200829282448228829282288244829283FF82008 +9E76:102010201E2010501050FE889344C622AA20D6F8AA08C6089210FE1082200020 +9E77:102010201E5010501088FF249212C610ABFCD604AA08C6889250FE2082100010 +9E78:101010281E441082107CFE109210C6FEAA92D692AAFEC6109228FE2882440082 +9E79:100C100A1E0810FE1088FE8892FAC68AAA8AD6ECAAACC6AC92EAFE8A82960122 +9E7A:104410241E2810FE1010FE7C9210C6FEAA20D620AA7CC6509290FF1082FE0000 +9E7B:108810501E0011FE1050FEFC9254C7FEAA54D6FCAA50C6D89354FE5282500050 +9E7C:101010101E2810441082FE7C9200C6EEAAAAD6AAAAEEC6449244FEAA82AA0112 +9E7D:0100F9FEA220A43EF8208BFE8AAAFA52A326A252A2AAFBFE00003FF82448FFFE +9E7E:208420443C4821FE2020FCFC842095FED440A480D4FE95108610FC1085FE0000 +9E7F:010000803FFE222022203FFC222422243FFC284028442F58486048448B440C3C +9E80:010000803FFE22203FFC22243FFC28402F7828422F3E200028784F82480287FE +9E81:010002000FF0706003801D00E0803FFC22403FF822483FF828442F7848428F3E +9E82:010000803FFE22203FFC22243FFC28402F7828422F3E200023F042104412980E +9E83:010000803FFE22203FFC22243FFC28442F4828742B442C3C40004A4889241124 +9E84:044008203018DFF60410095010A03FFC22403FF822483FF828442F7848428F3E +9E85:00803FFE22203FFC22243FFC242227BE24002FF830082FC828684FD0480287FE +9E86:00803FFE22203FFC22243FFC242227BE200027F8240827F8240847F84408BFFE +9E87:00803FFE22203FFC22243FFC242027BC2422279E200823F020404FFE41508E4E +9E88:00803FFE22203FFC22243FFC242027BC2422279E20802FFE204047FC40409FFE +9E89:00007C7C10101010FEFE111010903FFC22403FF822483FF828442F7848428F3E +9E8A:111009207FFC05401930610C00803FFC22403FF822483FF828442F7848428F3E +9E8B:00803FFE22203FFC22243FFC242027BC2422279E224821502FFE415042488C46 +9E8C:00803FFE22203FFC22243FFC200027F0241027F020002FF820805FFC42209C1C +9E8D:00803FFE22203FFC22243FFC242227BE20403FFE220024082FFC44944892908E +9E8E:00803FFE22203FFC22243FFC242227BE20002FFC28002BFC28004FFE4A28939E +9E8F:00803FFE22203FFC22243FFC20002FFC21043FFE21042FFC220047FC4A0493FC +9E90:00803FFE22203FFC22243FFC242227BE20402FFE211020E02F1E43F8420883F8 +9E91:00803FFE22203FFC22243FFC242227BE21002E7828082F7828084FF842229C1E +9E92:08447F4455FE54447F44557C55447F44547C54445E4455FE54005C2856448082 +9E93:082008207EFC1C702AA8C92608A03FFC22403FF822483FF828442F7848428F3E +9E94:00803FFE22203FFC22243FFC222027B02D2832242DFE300027F84408440887F8 +9E95:00803FFE22203FFC22243FFC20002FFC28242BC428842FF42AA44C944FFC8804 +9E96:00803FFE22203FFC22243FFC20803FFE20002FF828082FF82080488852848100 +9E97:3F7E00003E7C224432642B5400803FFC22403FF822483FF828442F7848428F3E +9E98:00803FFE22203FFC22243FFC20102FE020803FFC24902FF8341647F0441087F0 +9E99:00803FFE22203FFC22243FFC200020282FFE28202BA428282BAC4A944BAC9044 +9E9A:00803FFE22203FFC22243FFC20002F7C29042F7C28002F7C28444F28483088CE +9E9B:00803FFE22203FFC22243FFC20002F7E21242F3C28242F3C2126417C45048204 +9E9C:00803FFE22203FFC22243FFC20002FFE211027FC251427FC20404FFE4150864C +9E9D:00803FFE22203FFC22243FFC242027BC24222F9E29082F7E29485F2845089B18 +9E9E:00803FFE22203FFC22243FFC204027FC21102FFE220823F822084FFE40408040 +9E9F:08107F54543854FE7F10553855567F90548454EE5EA454B4555E5C4456848104 +9EA0:00803FFE22203FFC22243FFC28882FF828883FFE20002FF828884FF84888BFFE +9EA1:00803FFE22203FFC22243FFC20402FFE20A02F5E255425542B5A440847F88808 +9EA2:00803FFE22203FFC22243FFC200027FC20402FFE2842235820004EEE4AAA8EEE +9EA3:13DEFE52ABDEA800FFFEAA00AAC8FE4EABEAAAB2BEEAAAAAAAEABAB4ADE4002A +9EA4:00803FFE22203FFC22243FFC4810FF7E54487F7E554A7F7E52645B7652A49B36 +9EA5:01007FFC0920092015502388054009203218C7E6082013400080014006203800 +9EA6:010001007FFC010001003FF801000100FFFE08001FF02820444003801C70E00E +9EA7:08200820FF402A7E2A805D00887C1C042A0850101E20224054420842143E6000 +9EA8:08100810FF102A102A545D5288521C902A1050141E04220854080810142060C0 +9EA9:10201020FE20542055FCBA201020382055FEA2203C504450A88810882904C202 +9EAA:100011FEFE20542054A0BABC10A438A454A4A2FC3C044404A80410042828C010 +9EAB:080008FEFF102A102A505D5E88501C502A50507E1E0222025402080214146008 +9EAC:10101010FE1054FE5492BA94109038FC54A4A2A43CA844A8A89011282944C282 +9EAD:10401040FEFC54845504BAF41094389454F4A2843C944488A8821082287EC000 +9EAE:08100810FF102A7E2A105D1088101CFE2A1050101E202228544408FE14426000 +9EAF:10501050FE50545055FCBB54115439545554A3FC3D544554A954115429FCC104 +9EB0:10201020FE48548455FEBA121090389054FEA3103C1045FEA81010102810C010 +9EB1:10141012FEFE54105410BAFE1092389254FEA2923C9244FEA89210922892C086 +9EB2:080008FCFF842A842AFC5D8488841CFC2A8450841EFC2250545008521492610E +9EB3:08100810FF102AFE2A105D5488541C542ABA50101E3822545492081014106010 +9EB4:10801080FEFE55025622BAAA1072382255FEA2223C7244AAA9221022280AC004 +9EB5:080008FEFF102A202AFE5DAA88AA1CBA2AAA50AA1EBA22AA54AA08AA14FE6082 +9EB6:10201010FEFE54285492BAAA108238FE5410A2FE3CA244AAA8BA1082288AC084 +9EB7:10A811FCFEAA57FE56AABBFE12AA3BFE5400A3FE3C0045FCA90411FC2888C3FE +9EB8:10201020FE2010207DFC1020FE2020203DFE44204850A8501088288841048202 +9EB9:10801080FEFE11027E2210AAFE7220223DFE44224872A8AA11222822400A8004 +9EBA:100011FEFE2010407DFC1154FF5421743D5445544974A9541154295441FC8104 +9EBB:010000803FFE2210221022103FBE2210261027382AB42A545292421082100210 +9EBC:010000803FFE221022102FBC231826B42A522100221027E040C043088FFC0004 +9EBD:010000803FFE221022102FBC231826B42A522100224024804910420887FC0004 +9EBE:010000803FFE22102F7C26382B54329220782F8020F82F8020FC5F824082807E +9EBF:00803FFE24103F7C26382D543412200027F8240827F820002FFC480448048FFC +9EC0:010000803FFE22102F7C26382B5432923F80297C2F2429242F2849905F288146 +9EC1:00803FFE24103F7C26382D5434122FE020803FFC24902FF8341647F0441087F0 +9EC2:00803FFE24103F7C26382D5434922FF822A02FFC22202FF828884FF844108808 +9EC3:08207FFC08200FE00000FFFE01001FF0111011101FF0111011101FF008201010 +9EC4:044004403FF804400440FFFE01001FF011101FF011101FF0000008201010600C +9EC5:221022107F1022282228FFC408447FA249107F10497C7F040008220821104110 +9EC6:221022107F10221022FEFF9208927F1049287F2849287F280048224A218A4106 +9EC7:221022107F102210221EFF9008107F10497C7F4449447F4400442244217C4144 +9EC8:222022107F0022FE2210FF9008107F10497C7F1049107F100010221021FE4100 +9EC9:110808907FFE44429FF404407FFC01001FF011101FF011101FF0044008201010 +9ECA:282028207CF828202820FE2011FC7C00542054207CF8542054207C2029FC4400 +9ECB:1088108895FC5488588813FEFC2029FC292429FC292429FC288849044A0287FE +9ECC:0A803138228839382288FFFE84423FF80440FFFE11101FF011101FF008201010 +9ECD:00F83F0001007FFC092011102288C44409203118CB2605C01930610805000200 +9ECE:0640387C08947E241C442A94490802800C603118C92605400920111025080200 +9ECF:0C2070201020FE20383E54209020282055FC9104550439045504930451FC2104 +9ED0:0C40702011FCFE5039245554910429FC542091FC554439545574930451142108 +9ED1:00003FF82108292825483FF8010001003FF801000100FFFE0000488844448444 +9ED2:00003FF821083FF821083FF801003FF801000100FFFE00002488224442448004 +9ED3:00287F2449246B205D2E49F07F2008207F2008200FA0F0100012550A4A868002 +9ED4:0020FE209220D650BA509288FF441222FE2010F81E08E0080210AA10A8208020 +9ED5:0010FE109210D610BAFE9292FE921010FE2810281E28E0280248AA4AA88A8106 +9ED6:0000FEFE9210D610BA909290FE9010FEFE1010101E28E0280248AA4AA88A8106 +9ED7:0020FE209220D7FCBA2092A8FEA810A8FEA810A81EF8E0220222AA22A81E8000 +9ED8:0020FE289224D624BA2093FEFE201020FE2010501E50E0500288AA88A9048202 +9ED9:00107F1449127F10497E7F1008287F2808440F44F08200002488224442448004 +9EDA:0044FE449244D644BAFE9244FE441044FE44107C1E44E0440244AA44A87C8044 +9EDB:08901088307ED7C01022101A00063FF8292825483FF801007FFC0100FFFE4444 +9EDC:0010FE109292D692BA929292FEFE1010FE1010921E92E0920292AA92A8FE8002 +9EDD:0010FE509250D690BAFC9354FFD41094FE9411141F54E1D40254AA24A8348048 +9EDE:0010FE109210D610BA1E9210FE101010FEFE10821E82E0820282AA82A8FE8082 +9EDF:0020FE20927CD684BB489230FE201048FE90103E1E42E0A40218AA10A82080C0 +9EE0:0020FE209220D7FEBA209220FEFC1000FE0010FC1E84E0840284AA84A8FC8084 +9EE1:3FFC20903FFC21402630380C2FF82AA829C82FF820802FF840805FFC8A481124 +9EE2:0010FE109220D644BAFE9228FE4410A2FE3C10441E44E0A80210AA28A8448082 +9EE3:0040FE40927ED680BB7C9244FE641054FEFE10441EA4E09402FEAA04A8288010 +9EE4:0020FE2093FED650BAA89326FEF810A8FEA810F81EA8E0A802F8AAAAA822801E +9EE5:0020FE1092FED600BA00927CFE441044FE7C10101E54E0520292AA10A8508020 +9EE6:0020FE1092FED682BA40924EFE6A10AAFEAA10AA1F6CE028024AAA4AA88A8106 +9EE7:0640387C08947E241C442A9448083FF8292825483FF801007FFC0100FFFE4444 +9EE8:111009207FFE40029FF410103FF8292825483FF801003FF80100FFFE24484224 +9EE9:0010FE1092FCD610BA1093FEFE021054FE3010901E50E1FE0228AA44A8828102 +9EEA:0020FE289244D6FEBA2093FEFE881114FE2210481E10E02202C4AA18A8608180 +9EEB:0000FEFE9228D628BAFE92AAFEAA10AAFEFE10101E10E0FE0210AA10A9FE8000 +9EEC:000CFE0A9208D6FEBA889288FEFA108AFE8A10EC1EACE0AC02EAAA8AA8968122 +9EED:0020FE309248D684BB7A9200FEFC1084FE8410FC1E48E04803FEAA48A8888108 +9EEE:0048FE4893FCD648BA789248FE781048FE4811FE1E80E0A802C4AA80A8FE8000 +9EEF:0020FE1092FED600BA449228FEFE1000FE7C10441E44E07C0244AA44A87C8044 +9EF0:0010FE1092FED610BA7C9244FE7C1044FE7C10441E7CE04402FEAA28A8448082 +9EF1:012478A849FC48404BFE79084BFC4DAE497479FC482049FC48204BFE49549A2A +9EF2:0010FE209244D6FEBA4492AAFEEE1010FE2810541EAAE0500224AA48A8108060 +9EF3:7F7848485E8664785F484A307F4C00003FF8292825483FF80100FFFE24484224 +9EF4:11101550255047D0903E17A420546FD4A9542DD42B542FC821082FD420142AA2 +9EF5:0040FE7C9284D7FEBAA292C8FEFE1080FEBE10801EBEE08002BEAAA2A8BE8122 +9EF6:3FFE28882F8A20082FBE28882F88289429A220002FFE29522FFE40405FFE8924 +9EF7:0010FEFE9210D67CBA0092FEFEAA10FEFE44107C1E44E07C0244AA7CA8288044 +9EF8:0040F87CA840ABFCFA44ABF0FA4422FCFAA822F83AA8E2F80A00A5FCA5540BFE +9EF9:0440244814500440FFFE0100111009203FF82108254825282928210821282110 +9EFA:1408552836281428FF4449442A827F7C492449245D246B244944494449944B08 +9EFB:1428552436241420FF7E49202A207F3C493449545D546B544988498849144B22 +9EFC:14145512367E1410FF10497E2A527F52497E49525D526B7E4952495249524B46 +9EFD:00003FF8228822883EF802803EF8228822883EF8228822883EF8228A028201FE +9EFE:1FF0101010101FF001003FF8210821083FF8210821083FF8210A0102010200FE +9EFF:1FF00000FFFE0844303CDFF012901EF002803EF822883EF822883EFA028201FE +9F00:01003FF80100FFFE10103FF852941EF002803EF822883EF822883EFA028201FE +9F01:01003FF80100FFFE04201FF000001FF012903EF822883EF822883EF8028201FE +9F02:00001FF010101FF01010FFFE00001FF012903EF822883EF822883EF8028201FE +9F03:01003FF80100FFFE01003FF80100FFFE12903EF822883EF822883EF8028201FE +9F04:09000FF011007FFC05401930E10E1FF012903EF822883EF822883EF8028201FE +9F05:20003F7C4844FFC4147C224441001FF012903EF822883EF822883EF8028201FE +9F06:0000FDFC8554015479DC485079DC4954795421DC1154FD5401DC51504852883E +9F07:08207E20087EFEC410281E1022285FF692903EF822883EF822883EF8028201FE +9F08:49202A3E7F4849485DA86B1049285FF612903EF822883EF822883EF8028201FE +9F09:00003EF822883FF811101FF01110FFFE12903EF822883EF822883EF8028201FE +9F0A:00107E7C42287EFE40107E7CA2103FF012903EF822883EF822883EF8028201FE +9F0B:1FF00000FFFE0844303CDFF010101FF001003FF821083FF821083FFA010200FE +9F0C:00001FF010101FF01010FFFE00001FF010103FF821083FF821083FFA010200FE +9F0D:00003EF822883FF811101FF01110FFFE01003FF821083FF821083FFA010200FE +9F0E:0FE008200FE048244FE448244FE440047C7C04400440FC7C2444244444448444 +9F0F:7FFE40028FE408200FE008204FE448244FE440047C7C0440FC7C244444448444 +9F10:7FF81008101E2FE2482A8FE408204FE448244FE440047C7C0440FC7C24444444 +9F11:010001FC01001FF010101FF010105FF450145FF440047C7C0440FC7C24444444 +9F12:00807FFC048019806FE008200FE048244FE448244FE47C7C0440FC7C2444C444 +9F13:08100810FF1008FE08107E1000FC7E44424442447E28422824100F28F0444082 +9F14:08100810FF10081E08107E1000FC7E44424442447E28422824100F28F0444082 +9F15:0810FF7E08107E7C42047E4824381E44E8001FF0282007C01830E18E0C400300 +9F16:01007FFC0920FFFE08200810FF1008FE7E1000FC7E4442487E2824101E28E0C6 +9F17:249014A024940884707C0810FF1008FE7E1000FC7E4442487E2824101E28E0C6 +9F18:0810FF7E08107E7C42447E282418FEE624483C7820083FF820083C7824484448 +9F19:0810FF7E08107F7C41447F2822101F28FFF611101FF012101FF004407FFC0040 +9F1A:0810FF7E08107E7C42047E4824381E44EFF008000FF00800FFFE111014E0181C +9F1B:0810FF7E08107E7C42447E3824447EA222385424082037FEC0001FF010101FF0 +9F1C:0810FF7E08107E7C42447E3824447FF2092007C0F93E1FF011101FF001087FFC +9F1D:24A414A487BC440417FC24044FBC90A40810FF7E08107E7C42447E282418FEE6 +9F1E:0810FF7E08107E7C42447E282418FEE611107FFE48228FE401001FF001007FFC +9F1F:0810FF7E08107E7C42447E3824D47EA204442BA810102FE8C8260FE004407FFC +9F20:060038F820083EF8200820083FF800002948252821082948252A210A2D663182 +9F21:22081108111000003FF8210821083FF8210821083FF82108210A410A41068002 +9F22:2008CE288228EE2882448244FE82017C92249224DA249224DA4492449394D908 +9F23:2010CE148212EE12821082FEFE10001092109228DA289228DA2892449344D982 +9F24:2020CE108210EEFE82448244FE44004492449228DA289210DA1092289344D982 +9F25:2028CE248224EE2082FE8220FE20003C92349254DA549254DA8892889314D922 +9F26:2000CEFC8224EE2482248224FE5400489280927CDA449244DA449244937CD944 +9F27:2020CE108210EEFE82828284FE40004492489250DA609242DA429242933ED900 +9F28:2020CE20823EEE4282C48328FE10002892449382DA309208DA0492609310D908 +9F29:2040CE408240EEFC82848304FEF4009492949294DA9492F4DA9492049328D910 +9F2A:2010CE108250EE50827C8250FE9000109210927CDA109210DA10921093FED900 +9F2B:2000CE0082FEEE1082108220FE20007C924492C4DB449244DA449244937CD944 +9F2C:2010CE108210EE1082FE8292FE920092929292FEDA929292DA92929293FED982 +9F2D:2010CE108210EE7C82108210FEFE0008920892FEDA089248DA2892089328D910 +9F2E:2000CC0685D8EC4884488488FC9E01C8A848F948A948F89EA880A940FA3EA400 +9F2F:2000CEFE8210EE10827C8224FE2400FE92009200DA7C9244DA449244937CD944 +9F30:2000CE7C8244EE44827C8244FE44007C92449244DA7C9200DA2892249342D982 +9F31:2010CE1082FEEE10827C8210FEFE0000927C9244DA7C9244DA7C92449354D948 +9F32:2000CEFE8292EE1082FE8210FE7C0054927C9254DA7C9210DAFE92109310D910 +9F33:2000CEFE8282EEFE828282FEFE8200FE92149212DAFE9210DA2892289344D982 +9F34:2000CDFE8500ED7E8542857EFD42017EA910F9FEA924F964A918A924FB42A5FE +9F35:2020CE1082FEEE8282448292FE14001292FE9210DA289228DA2892449344D982 +9F36:2008CC3C85D0ED1C8510857CFD540158A970F954A94CF940AA78A8A8FA2AA446 +9F37:200ECEF08222EE9282448220FE4400F892109224DAFE9210DAFE92289344D982 +9F38:2088CC508400EDFE845085FCFC5403FEA854F9FCA850F8D8A954AA52FA50A450 +9F39:2000CE7C8244EE7C8244827CFE1000FE92829210DAFE9224DA6892109328D944 +9F3A:2000CDFC8524EDFC852485FCFD040000ABFEFAAAAAAAFBFEAAAAAAAAFBFEA622 +9F3B:02001FF010101FF010101FF000003FF821083FF821083FF80000FFFE08201020 +9F3C:10043E0422443E4422443E4400447F4449447F4C49747F440004FF8422044204 +9F3D:10203E2022203E2022F83E2800287F2849287F2849287F2A002AFFCA22464280 +9F3E:10003E00227C3E1022103E1000107F1049FE7F1049107F100010FF9022104210 +9F3F:10003E00227C3E2822283E2800287F2849287F2849287F2A002AFFAA22464280 +9F40:10003E7C22203E2022203E3800287F2849587F4849487F48005AFFEA224A4206 +9F41:10403E4022403EFC22843F0400747F5449547F5449747F540004FF8422284210 +9F42:20207C2044FC7C2445FE7C2400FCFE209324FEA89270FEA80124FE2244A08440 +9F43:20007CFC44847CFC44847CFC0040FEFE9312FE9292AAFE8200FAFE0244148408 +9F44:10103E1022FE3E3822543E9200007F7C49447F7C49447F7C0044FF8022FE4200 +9F45:20207C4044FC7C8444FC7C8400FCFE8492FCFE289224FEFE0020FE5044888506 +9F46:20927D2444927C00447C7C44007CFE0092FEFE929292FEFE0080FE824482847E +9F47:20207C3C44207CFE44A27CB800E4FE9C9280FEBC92A4FEBC00A4FEBC44A4857E +9F48:20287CFE44AA7CFE44AA7CFE0000FEFE9280FEBE9280FEFE00A8FEAA44A48532 +9F49:2020FBFE8924F9FC8820FBFE0356F9DCA888FBFEA888FBFE0094F98852A490C2 +9F4A:020001007FFC0440028C7D702550255045488D6610101FF010101FF010102010 +9F4B:0100FFFE02847D78255025484D6420083FF820083FF821082548252849288108 +9F4C:0100FFFE02847D78255025484D6420083FF820083FF820082528294842888C48 +9F4D:0100FFFE02847D78255025484D6420083FF820083FF840083FF824482448FFFE +9F4E:0100FFFE02847D78255025484D6420083FF820082FE828282FE828284FE88448 +9F4F:0100FFFE02887D7025484D66A0083FF822882EE822882EE822884EE842888FE8 +9F50:020001007FFC0820044003800C603018C8260820082008200820102010202020 +9F51:020001007FFC0820044003801C70E28E2EE822882EE822882EE822885FF88008 +9F52:0100110011F811001100FFFE044024482AA831183FF824482AA831183FF80008 +9F53:082028202F202820FF20142055206B2041207F20552055226B224F22711E0100 +9F54:082028202F202820FF22142455286B3041207F6055A055226B224F22711E0100 +9F55:082028202F20287EFF401480553C6B0441087F10552055406B424F42713E0100 +9F56:100050FC5C085048FE482848AA88D6FE8218FE28AA28AA48D6889F08E2280210 +9F57:0800280C2F702840FF401440557E6B4841487F48554855486B484F4871480188 +9F58:081028102F102828FF28144455AA6B2841287F28552855286B284F4871480188 +9F59:104050405CFC5084FF042AF4AA94D69482F4FE84AA94AA88D6829E82E27E0200 +9F5A:082028202F20283EFF50145055906B1E41107F105510551E6B104F1071100110 +9F5B:102850A85CA850A8FEA829FEAAA8D6A882A8FEA8AAB8AA80D6809E80E2FE0200 +9F5C:100850285C285028FEA828AAAABCD6A882A8FEA8AAA8AAA8D6AA9EBAE2EA0386 +9F5D:102050205C205040FE482884ABFED6828200FEFCAA84AA84D6849E84E2FC0284 +9F5E:080028002F7C2844FF44144455446B44417C7F44550055286B244F4471420182 +9F5F:0800287C2F442844FF44147C55446B4441447F7C554455446B444F4471FE0100 +9F60:080028FC2F242824FF24142455546B4841807F7C554455446B444F44717C0144 +9F61:081028102F102828FF281454558A6B08417C7F04550855286B104F1071080108 +9F62:081028102E1028282828FF54008A49086B7C49047F085D286B104F1079080008 +9F63:082028202F20287CFF44148455746B5441547F54557455546B044F0471280110 +9F64:111009207FFC0400FFFE111029E8C9067FFC04402AA83FF824482AA83FF80008 +9F65:102050205CFC50A4FEA428FCAAA4D6A482FCFE20AA24AA18D6129E6AE3860202 +9F66:0800087C2F442844FF7C144455446B7C41507F52555455486B5441667F420000 +9F67:08007F7C08243E2408447F5409E809007FFC04402AA83FF824482AA83FF80008 +9F68:080028202F4C2844FF44144455446B6C41447F44554455446B444F7C71440100 +9F69:102050105C1050FEFE002844AA82D7008244FE44AA28AA28D6109E28E2440282 +9F6A:0800287C2F442844FF441444557C6B1041107F50555E55506B504F70719E0100 +9F6B:100050FE5C925092FE9228FEAA92D6B282BAFED6AA92AA92D6929E82E2FE0282 +9F6C:080028FC2F102810FF7C142455246BFE41007F00557C55446B444F44717C0144 +9F6D:100050325CCC5088FE8828E8AAAED6AA82AAFEEAAA8AAA8AD68A9E8AE3120222 +9F6E:102050205DFC5020FE502888ABFED60882E8FEA8AAA8AAE8D6A89E08E2280210 +9F6F:100050205CCE5082FE8228EEAA82D68282FEFE28AA28AA28D6489E4AE28A0306 +9F70:104850485C4851FEFE482848ABFED60082FCFE84AA84AAFCD6849E84E2FC0284 +9F71:100051F05CAE50AAFEEA28AAAAAAD6EA82AAFEAAAAB4ABE4D6249E2AE22A0230 +9F72:100E51F05C1050FEFE922892AAFED61082FEFE92AA9AAA96D6FE9E82E28A0284 +9F73:100050FE5C925010FEFE2810AA7CD654827CFE54AA7CAA10D6FE9E10E2100210 +9F74:102050105CFE5044FE2828FEAA88D69082A4FE88AA90AAA2D6849E88E3100260 +9F75:1000507C5C545054FE7C2854AA54D67C8210FEFEAA92AA96D6BE9E82E28A0284 +9F76:100050EE5CAA50AAFEEE2800AA7CD60082FEFE20AA40AA7CD6049E04E2280210 +9F77:100050FE5C825082FEFE2880AABED6908294FEBEAA8AAA88D6BE9E88E308027E +9F78:104450285C0050FEFE002828AA44D6828200FEFEAAAAAAAAD6AA9EAAE3FE0200 +9F79:082004407FFC0100FFFE04001FF8E0801FFC010009F009007FFC24482AA83FF8 +9F7A:104050405CFE5122FEAA28FAAA42D6948348FEFEAB22AAAAD6FA9E42E2940308 +9F7B:101050105CFE5010FE7C2844AA7CD644827CFE44AA7CAA44D6FE9E28E2440282 +9F7C:108850885DFE5088FEDC29AAAA88D60083FEFE22AAA0AABCD6A09F60E23E0200 +9F7D:104450445DEE5044FEEE2954AA44D600827CFE00AAFEAA10D6549E92E2500220 +9F7E:0F1408127F10497E7E1049287F2852449EFA04807FFE04402AA431143FFC0004 +9F7F:0100010011F8110011001100FFFE00002108210822882448282820083FF80008 +9F80:0820082028202F2228222824FF2800304920496055A0632241224722791E0100 +9F81:0820082028202F7E28402880FF3C0004490849105520634041424742793E0100 +9F82:0800080C28702F4028402840FF7E004849484948554863484148474879480188 +9F83:0800087C28442F442844287CFF4400444944497C554463444144474479FE0100 +9F84:1020102050505E5050885124FE12001093FC9204AA08C68882508E20F2100210 +9F85:10401040507C5E84508451F4FE940094929492F4AA84C6A882928E82F27E0200 +9F86:080008FE28222F2228222822FF4A00444980497E5542634241424742797E0142 +9F87:1008102850285E2850A850AAFEBC00A892A892A8AAA8C6A882AA8EBAF2EA0386 +9F88:100010FC50845E8450FC5084FE8400FC92A292A4AA98C69082888EA4F2C20280 +9F89:100011FC50205E2050FC5044FE4401FE92009200AAFCC68482848E84F2FC0284 +9F8A:0800087C28442F4428442844FF7C001049104950555E635041504770799E0100 +9F8B:100E11F050105EFE50925092FEFE001092FE9292AA9AC69682FE8E82F28A0284 +9F8C:100010FE50825E8250FE5080FEFE009092A492FEAA92C69082FC8E90F31002FE +9F8D:104008407E7E2440187EFF02007E7E40427E7E40427E7E40427E42404A42443E +9F8E:00003FFE22202FBC2520223C3F84203C2FA028BC2FA028BC2FA048BC48A2899E +9F8F:08407F7C1440FF7C22043E7C22403E782242263E08200820FFFE082010202020 +9F90:00807FFE42205FBC4920463C7F84403C5FA050BC5FA050BC5FA050BC52A2911E +9F91:08407F7C1440FF7C22043E7C22403E782242263E00003FF80200FFFE0860701C +9F92:08407F7C1440FF7C22043E7C22403E7C2242263E00003FF80000FFFE11102308 +9F93:21102090FBDE2010425E79824BDEC8107BDE4A504BDE7A504BDE4A504A525ACE +9F94:08407F7C1440FF7C22043E7C22403E782242263E04403FF80440FFFE08201010 +9F95:010006C01830EFEE00001FF010101FF008403E7C1440FF7822083E782242263E +9F96:88884E4EF8F8A8A84E4EF2F20E0EE8E8AEAEA8A8EEEEA8A8EEEEA8A8AAAAA6A6 +9F97:3FF801007FFE492284143BB82AA83BB808403E7C1440FF7822083E782242263E +9F98:08403E7C1440FF7822083E782242487EE8E8AEAEF8F80E0EE2E2AEAEE8E8AEAE +9F99:0420041004100400FFFE048004880488049008A008C0108211822282447E8000 +9F9A:042004107FFC092009C4170420FCC44004403FF804400440FFFE082010102008 +9F9B:010006C01830EFEE00001FF010101FF004400420FFFE0910116021844F0480FC +9F9C:04003FF820083EF802807A800AFCFE940AD47AA402A47AD40A94FEFC0A8279FE +9F9D:1080E7FC240427BC20A0FEBE22A237B66AAA66AAA0B626A222BE27A022A2267E +9F9E:49202A3E7F485DA86B10456E3FF820083EF802807AF80AD8FEA80AD87A8A01FE +9F9F:040004000FE0102020407FF8A10821083FF8210821083FF821080102010200FE +9FA0:010002800C603018DFF600003BB82AA83BB800003FF824883FF8248824A82010 +9FA1:08100810141022105D3E80A27F4455907F1000107F1055287F28552455444382 +9FA2:0808081C14F022105D1080907F7C55107F3800347F5455547F92551055104310 +9FA3:080008FC140422045D7C80847F0455FE7F1000927F5455387F54559255504320 +9FA4:0848084A146C22485D4A80EA7F5655207F7E00427F42557E7F425542557E4342 +9FA5:0800087E140822105D7C80C47F44557C7F44007C7F4455447F7C552855444382 +9FA6:112410A410A813FE16025AFA508890F8102011FC112429242524452C40208020 +9FA7:01FC010479FC490449FC484479F848504FFF48804BFC7D0449FC010401FC0104 +9FA8:00003FFC228024402FFC3440244027F8244027F82440244027FC24003FFC0000 +9FA9:04200420FFFF0420240CFF7024403C40087F7E484A487E480848FF8808880908 +9FAA:0820082008207E2008200820FF20085008500E502848288828845B02480087FF +9FAB:10101010FF1010287E445282537C7E10521052107EFE1010FF10101010101010 +9FAC:100013FE1A02268A22527FFE924212227FFE128216825A8232FA1E02E20A0204 +9FAD:7DFE51227DFE512251227DFE504850487EFC0248564853FE8200024814840902 +9FAE:7FDE514A7CC6514A52527CFC50A450FC7EA402FC564852FE824803FE14840902 +9FAF:10281024282025FE4120B920112411247D28111815105910312A1E2AF2464482 +9FB0:0000000000000100010001000100010011F011001100110011002D00430080FC +9FB1:00007FFC4004402448244424424441444084414442244414581440047FFC4004 +9FB2:1020101029FE251041FEBD10117C11547D7C1154157C591031FE1E10E2104410 +9FB3:101010107EFC10101010FEFE2448529410107E7C1010101010101E10E1FE0000 +9FB4:00000000000000007FFC00080010032000C00020001000000000000000000000 +9FB5:00F87F0001003FF80100FFFE0200040008003000C00000000000000000000000 +9FB6:010001007FFC01003FF80100FFFE000000000000000000000000000000000000 +9FB7:082008207FFC08200820FFFE0000000000000000000000000000000000000000 +9FB8:01001110092001007FFE40048008000000000000000000000000000000000000 +9FB9:1110092001003FFC010002007FFE082010102008C00600000000000000000000 +9FBA:10001000FE0010007C00440044007C0044007C0054001000FE00100010001000 +9FBB:208827E84812F3DC20084BD2F83E03C0AA52ABD2000000000000000000000000 +9FBC:0040207C204027FE240223FCFA642492210823FC250A21F83908C1F8010801F8 +9FBD:1080108010FC1108561055FC5524992411FC1124112429FC24004554412A822A +9FBE:08400840087E7F424AA248AA48727EFE4222627254AA4D2288229402220A4004 +9FBF:08200820FFFE0820044008400BF81040304057FC904013F81040104017FE1000 +9FC0:0420FFFE04207F7850485E8665784A487F3000C8FFFE04403FF824482BA83FF8 +9FC1:209010900090FC9003FC78900090789000907BFE48004800489079084A040404 +9FC2:10201040FEFC10847CFC54847CFC548054FE7C8054FE1002FEAA10AE1152100C +9FC3:00400040F7FC90409250F148914892D4F460904090A090A0F110920804040802 +9FC4:10000BF840882288098850C82108222825100100FFFE05400920111C61080100 +9FC5:21FC102003FEFA2209AC1020118C382054509188162611F8100810D010201010 +9FC6:404020400040FBFE0880108020F830886948A150215022202220245028882104 +9FC7:088008F81110122035FC5044904417FE1044104413FC10441040104011401080 +9FC8:080009FC11042104490409FC1124312051209110111011101208120814041802 +9FC9:08000BFE104020404840084013F8304850489088108810881088108817FE1000 +9FCA:08200820FFFE082008204000202090204120293C11201120E1202120212027FE +9FCB:204017FE0040FBFC08001BF816083BF855109FFE100013F81208120813F81208 +9FCC:008040402FFE2000800043F84A080BF8120813F8E04022482244244229420080 +9FCD:2080208020FC21082290F86021982626202021FC3C20E22043FE002000200020 +9FCE:00100010FA102110217E401078104F28C92849244944494279024A80447E0000 +9FCF:102010203DFE202041FCBC20102013FEFC40107C108411481450182010D80706 +9FD0:200024FE72285228A0FE74AA52AA53AA79AE52C256827AFE0282AA82AAFE0082 +9FD1:000047FE2040204000400840084013FC1040E040204820442044204027FE0000 +9FD2:08200820FFFE08207FFC02001FF0101011101110111012100280046018106008 +9FD3:08200820FFFE08207FFC04001FF010101FF010101FF010101FF0082010102008 +9FD4:200023FE3C0821E841287DE8900013FEFC0811E81128112815E8180810280010 +9FD5:200020FC7C84448488A47C94549454847FFE548454847C8401041D04E2144408 +9FD6:010001000280044008203018CFE600001FF01010101010101FF010100000FFFE +9FD7:01000280044008203018C8060BF0089017FE309053F09080110012000000FFFE +9FD8:10101F101528252825447F44A5BA250025002F7C2544244424442844287C3044 +9FD9:10101F1015FE2510257C7FC4A5442544257C2F28252824282448284A288A3306 +9FDA:20503E502A5C4A544AF4FF484A484A744AD45F624A5C485448545054505C6054 +9FDB:040084FE5E54449205FE3E924AD651BA68D6CE9252D66ABA44D64C92529A2184 +9FDC:480044FE44544092FFFE409272D652BA52D6CA924AD64ABA44D644925F9AC084 +9FDD:40005FFE55545592F5FE5F9248D6C4BAFFD6C8924ED64ABA4AD652925A9A6484 +9FDE:0200E2FE42544A926BFEAA92AAD6AABAEAD6AA922AD62ABA42D642924A9A8484 +9FDF:11203920E120253E25422544FD902510655475546D52A592A192211025502220 +9FE0:120032FEE2542A922BFE2A92FAD62ABA6AD67A926AD6AABAA2D622922A9A2484 +9FE1:0000FEFEAA54AA92FFFE24922AD65FBADAD62F925AD6FFBA0AD6AA92AF9A8884 +9FE2:0010FF10552855287544564456BA75005500557C55447D44D6441444147C1444 +9FE3:0010FF1055FE5510757C564456447544557C552855287D28D648144A148A1506 +9FE4:0050FF50555C555475F456485648757455D45562555C7D54D6541454145C1454 +9FE5:40002EFEEA54AA92ABFEEC92ACD6AABAEAD69A92EAD6AABA9CD6B892D89A8884 +9FE6:51445154FA54525425FEF91AAA0AAAFAAE0AFAEA22AA22A452B44AAA4B0A820A +9FE7:0400EEFEAA54BA92A4FECA92D1D6AEBAA4D6A492BFD6C4BA8ED684929F9A8084 +9FE8:00007EFE1054FE9291FE569210D6D6BA00D67E924AD64ABA7ED64A924A9A7E84 +9FE9:20003CFE24547E92D3FE7E9252D67EBA2AD6D5927ED642BA7ED642927E9A4284 +9FEA:211010A017FC0080F14816D0116816A8112416A4284047FE0000244422224222 +9FEB:20003FFC40009FF000007FF008107FD055504E507FD04E52554AFFEA0A06F1E2 +9FEC:000000007DFF1111111121113D1165FFA5112511251125113DFF210100000000 +9FED:104010401C7F208121127A1090101054FC521092109111111410181010500020 +9FEE:00803FFE200024442FFE244427FC200027FE284223FC2244424C424080400040 +9FEF:000050807EFE50AA952A384AD11212860C603118C92605407FFC03800D60711C +9FF0:01082108110817DF810847C8545E17C8244827DFC10947C9410D410A41080108 +9FF1:00000000FDFC11241124112411247DFC11041100110011001D02E10240FE0000 +9FF2:0044FDFF004400007CFF4511441044FE7C120012441228222E42F08441080000 +9FF3:204420823DE2452F49297DAAD56855E97D2A55AC55687D295529B2292AA70040 +9FF4:102010201E7E228225447E28AA182A243E422A812A303E0800040E6070102008 +9FF5:202020203C2045FE48207C20D42055FC7C00542054127D5101451A45E03C4000 +9FF6:204020203DF8450849087DF8D50855087DF8554455487D3001101D48E1864100 +9FF7:102010101E7C220024443E286AFE2A003E7C2A442A443E7C00440E44707C2044 +9FF8:204420823DE2452F49297DAAD56855E97D2A55AC55687D2901291E29E2A74040 +9FF9:202020103CFF4481494A7C28D55256657CC4553C54107C9200921C92E0FE4002 +9FFA:081008207F7C08443E6408547F44104C1E40227E24025402087A1402200A4004 +9FFB:2010CE108210EEFE82208248FE48008892FF92C9DB499249DA4D924A9308D908 +9FFC:2040CE408240EE4782F58255FE55005592559255DA559255DA9592D793A5D900 +9FFD:00007FFE73866DBE718E7DBE73BE7FFE7FFE618E6FB663B66FB66F8E7FFE0000 +9FFE:00007FFE73866DBE718E7DBE73BE7FFE7FFE61866FBE638E6FBE6F867FFE0000 +9FFF:00007FFE73866DBE718E7DBE73BE7FFE7FFE61866FBE638E6FBE6FBE7FFE0000 +A000:000000000000000010101FF010101010101010107C101010082007C000000000 +A001:000003800440000010101FF010107C10121012107C101010082007C000000000 +A002:000000000000000010101FF010107C10121012107C101010082007C000000000 +A003:000000000000000000600050004800403BC004400A400A4004403BC000000000 +A004:0000000000000000139014500C6007C0044004400E4004400440038000000000 +A005:0000038004400000018001600100038004400440038001000D00030000000000 +A006:0000000000000000018001600100038004400440038001000D00030000000000 +A007:0000000000000000071008F009900A800A800A800A80099008F0071000000000 +A008:000000000000000000080008018831680D180300010001000100010000000000 +A009:000003800440000001A0016001200D2003200120012001200D20032000000000 +A00A:000000000000000001A0016001200D2003200120012001200D20032000000000 +A00B:0000000000300040034002C002401A3006000200020002001A00060000000000 +A00C:0000038004400000101011101110111010101FF0101011101110111000000000 +A00D:0000000000000000101011101110111010101FF0101011101110111000000000 +A00E:00000000000004200A500A50042004200420042004200420042003C000000000 +A00F:00000000000000000FE0111011100FE001000700080007000800070000000000 +A010:00000380044000000C700A880988088808A808A808A848882888187000000000 +A011:00000000000000000C700A880988088808A808A808A848882888187000000000 +A012:00000000000000000C700A880988088808880888088848882888187000000000 +A013:000003800440000000603858044008401FC0084004403840034000C000000000 +A014:000000000000000000603858044008401FC0084004403840034000C000000000 +A015:00000000000000001110111011100EE000000000044004400440044000000000 +A016:0000000000000000038004400440055004E004E0055004400440038000000000 +A017:000003800440000010F011001200120012001FF012001200110010F000000000 +A018:000000000000000010F011001200120012001FF012001200110010F000000000 +A019:0000000000000000062005A00460040004F0050007F0050004F0040000000000 +A01A:00000000000000001C18222022402240224023F82240224022201C1800000000 +A01B:000003800440000007D00820105010901110111012101410082007C000000000 +A01C:000000000000000007D00820105010901110111012101410082007C000000000 +A01D:00000000000000000700089008880888089008E0089008880888071000000000 +A01E:0000000000000000082008200FE0082008200380044004400440038000000000 +A01F:0000038004400000082008200FE00820082000001110111011100EE000000000 +A020:0000000000000000082008200FE00820082000001110111011100EE000000000 +A021:0000000000000000082008200FE0082008200000000004400820101000000000 +A022:000003800440000003E0041009D00090009001D000100E100990086000000000 +A023:000000000000000003E0041009D00090009001D000100E100990086000000000 +A024:00000000000000000FE0010001000100010001000100010001000FE000000000 +A025:000000000000000000F01700090014801070148009001700010000F000000000 +A026:000003800440000007C0082008200BA0092009200BA00820082007C000000000 +A027:000000000000000007C0082008200BA0092009200BA00820082007C000000000 +A028:00000000000000001FF0010001001FF0000000001FF0010001001FF000000000 +A029:00000380044000000EE01110111001000100000011101110082007C000000000 +A02A:00000000000000000EE01110111001000100000011101110082007C000000000 +A02B:00000000000000000FE0010009200540038003800540092001000FE000000000 +A02C:00000000000000000FE01010101010100FE00100012001200100010000000000 +A02D:0000038004400000010001000100010001200120012001200D20030000000000 +A02E:0000000000000000010001000100010001200120012001200D20030000000000 +A02F:000000000000000001E0020004E0050005000500050004E0020001E000000000 +A030:00000380044000000860088008800BE008800BE0088008800880070000000000 +A031:00000000000000000860088008800BE008800BE0088008800880070000000000 +A032:0000000000000000030002C00200039002500220022002501B90060000000000 +A033:0000038004400000018001600100016001800160011001600D80036000000000 +A034:0000000000000000018001600100016001800160011001600D80036000000000 +A035:00000000000000000CC00AA00990088008801C800880088022801C8000000000 +A036:00000380044000000030002800241FE022204AA042204AA022201FE000000000 +A037:00000000000000000030002800241FE022204AA042204AA022201FE000000000 +A038:00000000000000000060005000480FC010403FC020403FC010400FC000000000 +A039:000003800440000001C002201220122012E017201A200220022001C000000000 +A03A:000000000000000001C002201220122012E017201A200220022001C000000000 +A03B:00000000000000000000110011000A500A5004500A500A501100110000000000 +A03C:00000380044000000E0011001100115011501F501150115011000E0000000000 +A03D:00000000000000000E0011001100115011501F501150115011000E0000000000 +A03E:000000000000000007C0082011101110082007C00100111011100EE000000000 +A03F:0000000000000000000010101010101010101FF0101010101010101000000000 +A040:00000380044000001110111011101FF01110111011101110092007C000000000 +A041:00000000000000001110111011101FF01110111011101110092007C000000000 +A042:0000000000000000088008900890089008F00890089008900880070000000000 +A043:000003800440000007F008000FF0080007F000800AA00AA00AA0008000000000 +A044:000000000000000007F008000FF0080007F000800AA00AA00AA0008000000000 +A045:000000000000000007F009100FF0091007F0001008100810042003C000000000 +A046:0000000000000000070008A0089008901CA008C01CA008900890072000000000 +A047:00000380044000000920092009200540038000000FE0000000000FE000000000 +A048:00000000000000000920092009200540038000000FE0000000000FE000000000 +A049:000000000000000007F008000FF0080007F0008007F0008007F0008000000000 +A04A:0000000000000000062005A004600400040004000400046005A0062000000000 +A04B:00000380044000000FE0102010200FE0102010200FE0102010200FE000000000 +A04C:000000000000000007F00810081007F00810081007F00810081007F000000000 +A04D:00000000000000C000B0078008800A800A800880078000800680018000000000 +A04E:00000380044000000E0011001150155015F015501150110011000E0000000000 +A04F:00000000000000000E0011001150155015F015501150110011000E0000000000 +A050:000000000000000000C000A00090078008801080108010800880078000000000 +A051:0000038004400000000030182828244822A8212822A824482828301800000000 +A052:0000000000000000000030182828244822A8212822A824482828301800000000 +A053:00000000000000000CC00AA0099008801CA008A008A008A022801C8000000000 +A054:000003800440000008C008A00890008007800890109010900880078000000000 +A055:000000000000000008C008A00890008007800890109010900880078000000000 +A056:00000000000000000380044007C0044007C004400380111011100EE000000000 +A057:0000038004400000010011100920054003800380054009201110010000000000 +A058:0000000000000000010011100920054003800380054009201110010000000000 +A059:000000000000000037D80820145012901290129012901450082037D800000000 +A05A:000000000000000007C008200820082007C011100EE000000100010001000000 +A05B:00000380044000000000007800800D180B200978092009186880187800000000 +A05C:0000000000000000003C0040008C069005BC0490048C0440343C0C0000000000 +A05D:0000000000000000181804200240024002400FF0024002400420181800000000 +A05E:00000000000000000000300C0FF00420024003C0024004200FF0300C00000000 +A05F:000003800440000000000406020A47122AA212422AA24712020A040600000000 +A060:000000000000000000000406020A47122AA212422AA24712020A040600000000 +A061:00000000000000001110111011100EE0000000000FE0000000001FF000000000 +A062:00000380044000000CA00AA009A000200FA000200FA0002001A0006000000000 +A063:00000000000000000CA00AA009A000200FA000200FA0002001A0006000000000 +A064:0000000000000000038014501450145004400440145014501450038000000000 +A065:0000000000000000008000800790089010901090089007900080008000000000 +A066:000003800440000001000920054003800540092001000FE001000FE000000000 +A067:000000000000000001000920054003800540092001000FE001000FE000000000 +A068:00000000000000000EE01110010007C00820111011100100082007C000000000 +A069:00000380044000000640054034D02C10231020D0203007800000078000000000 +A06A:0000000000000000032002A01A68160811881068101803C0000003C000000000 +A06B:0000000000000000314029442548235000603F4000400240014000C000000000 +A06C:0000000000000000304C08500850304C034002C0320C0A100A10320C00000000 +A06D:00000380044000000010019001500D300B000920092029201900010000000000 +A06E:0000000000000000000800C800A8069805800490049014900C80008000000000 +A06F:000000000000000000C018B01688118000900090189016801180100000000000 +A070:0000038004400000002000201820162011A0106001C0022002A002A000000000 +A071:0000000000000000002000201820162011A0106001C0022002A002A000000000 +A072:0000000000000000066005D0044005400540044007C0044015400CC000000000 +A073:0000038004400000019001700110010001000100010011001D00130000000000 +A074:0000000000000000019001700110010001000100010011001D00130000000000 +A075:0000000000000000018001600D00030001000100018001600D00030000000000 +A076:000000000000000003000AC00A300A0002A002A00BE00AA00AA0020000000000 +A077:000003800440000007C009200FE0092007C0010001400150011000E000000000 +A078:000000000000000007C009200FE0092007C0010001400150011000E000000000 +A079:00000000000000001860165011C81040104011F0104011F01040104000000000 +A07A:00000700088000001FC00220021002001FC0020002001FC00200020000000000 +A07B:00000000000000001FC00220021002001FC0020002001FC00200020000000000 +A07C:0000000000000000010001000FE001000100010001000FE00100010000000000 +A07D:00000000000000000E0011141114208420FC20842094249424801B0000000000 +A07E:00000380044000000000044004401FF00280010002801FF00440044000000000 +A07F:00000000000000000000044004401FF00280010002801FF00440044000000000 +A080:0000000000001010145014501290129011101290129014501450101000000000 +A081:0000000000000000038802680E18124022402240224002180268038800000000 +A082:038004400000111011100EE000000100010007C00100010010100FE000000000 +A083:000000000000111011100EE000000100010007C00100010010100FE000000000 +A084:00000000000000001110111011100EE0000001000100111010100FE000000000 +A085:000000000000000003D005300910090009F0090009000910052003C000000000 +A086:000003800440000009C00A2002200E20122012200E2002200A2009C000000000 +A087:000000000000000009C00A2002200E20122012200E2002200A2009C000000000 +A088:0000000000000000010007C009201110115011501110092007C0010000000000 +A089:00000380044000003838454445444444444447C4444444444544393800000000 +A08A:00000000000000003838454445444444444447C4444444444544393800000000 +A08B:0000000000000770088009A00AA00A800BE00A800AA009A00880077000000000 +A08C:000003800440000011501150111011501F50111011501150092007C000000000 +A08D:000000000000000011501150111011501F50111011501150092007C000000000 +A08E:00000000000000006360145813461440634000400C400B4008C0080000000000 +A08F:000003800440000031182928254823883FF82388254829283118010000000000 +A090:000000000000010031182928254823883FF82388254829283118010000000000 +A091:0000000000000000018001600100092009200920092001000D00030000000000 +A092:00000380044000001110092007C001001FF0010007C009201110111000000000 +A093:00000000000011101110092007C001001FF0010007C009201110111000000000 +A094:000000000000000007C00920111012901290129013901450082007C000000000 +A095:0000038004400000155015501110092007C001000100110011000E0000000000 +A096:0000000000000000155015501110092007C001000100110011000E0000000000 +A097:0000000000000000001001900150013001000920092009200100010000000000 +A098:00000000000000000600058004000400058004200710048034480C4800000000 +A099:0000038004400000001030102C10231020D02038204400440044003800000000 +A09A:0000000000000000001030102C10231020D02038204400440044003800000000 +A09B:000000000000000000C030B0088C048004803F80048004800880308000000000 +A09C:00000380044000000240024012480A50046000400C400B4008C0080000000000 +A09D:00000000000000000240024012480A50046000400C400B4008C0080000000000 +A09E:000000000000000009800960091809000180016031182D002300200000000000 +A09F:000000000000000000600050004807C00840124015401240084007C000000000 +A0A0:000003800440000001801160111801000F8811482520250011000F0000000000 +A0A1:000000000000000001801160111801000F8811482520250011000F0000000000 +A0A2:000000000000000003C004200400020001800040012002A0092007C000000000 +A0A3:0000000000000FE008200440028002A0012002A00280044008200FE000000000 +A0A4:00000380044000000020092009200020092009200020062001A0006000000000 +A0A5:00000000000000000020092009200020092009200020062001A0006000000000 +A0A6:000000000000000007C00920155015501110111015501550092007C000000000 +A0A7:0000038004400000111011101010082007C00000082008200820082000000000 +A0A8:0000000000000000111011101010082007C00000082008200820082000000000 +A0A9:000003800440000001000100012009200920090001C001200D10031000000000 +A0AA:000000000000000001000100012009200920090001C001200D10031000000000 +A0AB:00000000000008500850001008500850001008500850031002D0023000000000 +A0AC:000003800440000007C009200FE0092007C001000540155011100EE000000000 +A0AD:000000000000000007C009200FE0092007C001000540155011100EE000000000 +A0AE:000000000000000007C0082016D01290111017D010101390082007C000000000 +A0AF:0000038004400000031002D002300200023002C0030012C00A30060000000000 +A0B0:0000000000000000031002D002300200023002C0030012C00A30060000000000 +A0B1:00000000000000C800A8009800800FF800800FF8008018800680018000000000 +A0B2:000003800440000007C00820145022882128212822881450082007C000000000 +A0B3:000000000000000007C00820145022882128212822881450082007C000000000 +A0B4:0000000000000000000800C800A8109810801090009018900680018000000000 +A0B5:00000000000000001860175012C81240124012401FC012401240124000000000 +A0B6:0000038004400000038004400440044004401FF0044004400440038000000000 +A0B7:0000000000000000038004400440044004401FF0044004400440038000000000 +A0B8:00000000000000001110111011100EE00000010007C0010007C0010000000000 +A0B9:000000000000121011101090121011101090121011101090082007C000000000 +A0BA:000003800440000000C006B0058004C004B014800CC000B00680018000000000 +A0BB:000000000000000000C006B0058004C004B014800CC000B00680018000000000 +A0BC:00000000000000000638054404C404541F5404541F54044434440C3800000000 +A0BD:000000000000000000C000A00090008007800880128012800880078000000000 +A0BE:000003800440000001800160011801C0012001C0010007C00920092000000000 +A0BF:000000000000000001800160011801C0012001C0010007C00920092000000000 +A0C0:000000000000000003C00420081000100010001000100E100990086000000000 +A0C1:000003800440000001000118012401240FE40124012431180D00030000000000 +A0C2:000000000000000001000118012401240FE40124012431180D00030000000000 +A0C3:0000000000000000009000880A880A900AE00090008818880690018000000000 +A0C4:0000038004400000042004200420042007E004200420242014200C2000000000 +A0C5:0000000000000000021002100210021003F00210021012100A10061000000000 +A0C6:00000000000000000388045003E0004001F0024801F018400640018000000000 +A0C7:00000380044000000080008008F008800880008000F018800680018000000000 +A0C8:00000000000000000080008008F008800880008000F018800680018000000000 +A0C9:00000000000000000C200B2008E008000F700880094008800F70080000000000 +A0CA:0000038004400000101010101010082007C00000082008200820082000000000 +A0CB:0000000000000000101010101010082007C00000082008200820082000000000 +A0CC:0000000000000000020002200220022002000FF0020002200220022000000000 +A0CD:00000000000000000380044004401EF008201EF008200920092006C000000000 +A0CE:000003800440000000C000B00480078004800080008000800680018000000000 +A0CF:0000000000000000018000B00480078004800080008000800680018000000000 +A0D0:000000000000000000C000B008800F800880008000800E800980080000000000 +A0D1:00000000000009200AB00AAC092008200FE0082009200AA06AA0192000000000 +A0D2:000003800440000018081608118810681018014009480948041003E000000000 +A0D3:000000000000000018081608118810681018014009480948041003E000000000 +A0D4:00000000000000001808160811881068101802200AA80888041003E000000000 +A0D5:0000038004400000012000A018E0052002200220052018E000A0012000000000 +A0D6:0000000000000000009000500C7002900110011002900C700050009000000000 +A0D7:0000000000000000092005200720090011F01100092007200520090000000000 +A0D8:0000000000000000030012C01230120002200220122012001200020000000000 +A0D9:00000380044000000820282828282828183008200FE008200820082000000000 +A0DA:00000000000000000820282828282828183008200FE008200820082000000000 +A0DB:0000000000000000000002400240181016601180166018100240024000000000 +A0DC:0000038004400000000801883968051823002300050039000100010000000000 +A0DD:0000000000000000000801883968051823002300050039000100010000000000 +A0DE:0000000000000000009000A000C0009000A000C0188016801180100000000000 +A0DF:0000038004400000111011101510092017C0010031002D002300200000000000 +A0E0:0000000000000000111011101510092017C0010031002D002300200000000000 +A0E1:000000000000000010101010082007C00100012031402D802300200000000000 +A0E2:000000000000000011101110082007C001001900150013001000000000000000 +A0E3:0000038004400000001800200040064005C004400440044034200C1800000000 +A0E4:0000000000000000001800200040064005C004400440044034200C1800000000 +A0E5:00000000000000001C1013901170010001C009200920092001C0010000000000 +A0E6:000000000000000011101110111011100110012001C031000D00030000000000 +A0E7:000003800440000009200540139013900540092001000FE001000FE000000000 +A0E8:000000000000000009200540139013900540092001000FE001000FE000000000 +A0E9:00000000000000003FF80100010009C00920092009C0010001003FF800000000 +A0EA:000000000000000007C0082010101FF0101010101FF01010082007C000000000 +A0EB:0000038004400000101010101390145008201450139010101010101000000000 +A0EC:0000000000000000101010101390145008201450139010101010101000000000 +A0ED:0000000000000000030002C0020032380EC803080EC832381A00060000000000 +A0EE:0000000000000000024002401A48164813C81268125802400240018000000000 +A0EF:000003800440000000800C88129012A012C00C80008018800680018000000000 +A0F0:000000000000000000800C88129012A012C00C80008018800680018000000000 +A0F1:000000000000002401A41F74212C212011000F001100210021001F0000000000 +A0F2:000003800440000001E000100C10102011C010200C100010001001E000000000 +A0F3:000000000000000001E000100C10102011C010200C100010001001E000000000 +A0F4:0000000000000000003000280224142008A015202220052008A0004000000000 +A0F5:0380044000001C700380044008203E2008203E200820044003801C7000000000 +A0F6:0000000000001C700380044008203E2008203E200820044003801C7000000000 +A0F7:000000000000008000400FE00820044002800100028004400920111000000000 +A0F8:000003800440000000200020002001E002201F2004201F20022001E000000000 +A0F9:000000000000000000200020002001E002201F2004201F20022001E000000000 +A0FA:000000000000018001402128210811104FE441044FE411102108210800000000 +A0FB:000003800440000010101010082007C000000820082009200100010000000000 +A0FC:000000000000000010101010082007C000000820082009200100010000000000 +A0FD:000000000000000001802148210811100FE401040FE411102508230800000000 +A0FE:000003800440000011101110092007C01110111001001FF001001FF000000000 +A0FF:000000000000000011101110092007C01110111001001FF001001FF000000000 +A100:0000000000000000008832842A84268800F0008832842A842688008000000000 +A101:000003800440000000C004A0029012800C800080188016801180100000000000 +A102:000000000000000000C004A0029012800C800080188016801180100000000000 +A103:000000000100020001000080111011100EE00440054005400440038000000000 +A104:0000038004400000001C0020004C065005D004500450044C34200C1C00000000 +A105:0000000000000000001C0020004C065005D004500450044C34200C1C00000000 +A106:00000000000000000420042072424E4241824272424E04200420042000000000 +A107:0000000000000000110011201120112011001FF81100112011200E2000000000 +A108:0000000003800440000010180828044812881108128804480828101800000000 +A109:0000000000000000000010180828044812881108128804480828101800000000 +A10A:00000000000000000000080C04141A2415441084514432240414080C00000000 +A10B:0000038004400000002000A000A008A00EA009A00020062001A0006000000000 +A10C:0000000000000000002000A000A008A00EA009A00020062001A0006000000000 +A10D:00000000000000000100010007C009200920082008200820082007C000000000 +A10E:000003800440000001800160011801001FF0010031002D002300200000000000 +A10F:000000000000000001800160011801001FF0010031002D002300200000000000 +A110:000000000000000001800160011801001FF00100010031000D00030000000000 +A111:03800440000001C00130010007C0054003800380054007C00100190007000000 +A112:0000000001C00130010007C0054003800380054007C001001900070000000000 +A113:000000000000000018081608118810E81098008003E004900888088800000000 +A114:0000000000000000041008900910071009100890041000100190007000000000 +A115:00000380044000001E20212021C01E8000F0088008F008800088007000000000 +A116:00000000000000001E20212021C01E8000F0088008F008800088007000000000 +A117:00000000000000000FE01010101010100FE0010001F00100010000F000000000 +A118:000003800440000001800160011801001FF00100050005000500010000000000 +A119:000000000000000001800160011801001FF00100050005000500010000000000 +A11A:000000000FE0000001800160011801001FF00100010031000D00030000000000 +A11B:00000380044000000080008027F02080208027F0008018800680018000000000 +A11C:00000000000000000040004013F81040104013F800400C40034000C000000000 +A11D:00000000000000000008018801680118010001001FF001000100010000000000 +A11E:000003800440000008C004B024801880008007F0008000800680018000000000 +A11F:000000000000000008C004B024801880008007F0008000800680018000000000 +A120:00000000000000000850085007900010079008500850031000D0003000000000 +A121:00000000000000000FE0001003900410041004100410039000100FE000000000 +A122:00000380044000000820082000001FE0001000101FE000000840084000000000 +A123:00000000000000000820082000001FE0001000101FE000000840084000000000 +A124:0000000000000FE0001000100F9000100F9000100F90001000100FE000000000 +A125:0000000000000000711C092009201010600C1010092009200920701C00000000 +A126:03800440000000100FF000100FF000100FF00010031002D00230020000000000 +A127:00000000000000100FF000100FF000100FF00010031002D00230020000000000 +A128:000000000000000008040AC40AB4088C0A800A8008804A802A80188000000000 +A129:0000000000000000018001600100018001600100018001600D00030000000000 +A12A:000003800440000001801160111811800160011831802D602318200000000000 +A12B:000000000000000001801160111811800160011831802D602318200000000000 +A12C:00000000000000003C78410441043C78410441043C78410441043C7800000000 +A12D:000003800440000012480A88070807080A8812480F8802080788007800000000 +A12E:000000000000000012480A88070807080A8812480F8802080788007800000000 +A12F:0000000000000000030002C00230030002C0023002000F801240124000000000 +A130:00000000000000000E00117011801100112011201100118011700E0000000000 +A131:000003800440000007C00820101010101010101010101010082007C000000000 +A132:000000000000000007C00820101010101010101010101010082007C000000000 +A133:000000000000000007F008080808080807F000401650155014D0040000000000 +A134:000003800440000001800D600B000928092829F8192801280D00030000000000 +A135:000000000000000001800D600B000928092829F8192801280D00030000000000 +A136:000000000000000018081608118810E810980080049004900490008000000000 +A137:000003800440000010C008B00480108008800480008000800680018000000000 +A138:000000000000000010C008B00480108008800480008000800680018000000000 +A139:000000000000000018881688118810E8109800800FF8008000800FF800000000 +A13A:0000038004400000210821083FF82108210801000FE0010001000FE000000000 +A13B:0000000000000000210821083FF82108210801000FE0010001000FE000000000 +A13C:0000000000000000010021083FF82108010007C0092011101110111000000000 +A13D:00000000000000001FF0010007C0092009200920092007C001001FF000000000 +A13E:0380044000001FF00100311C0D6403840D64311C01001FF001001FF000000000 +A13F:0000000000001FF00100311C0D6403840D64311C01001FF001001FF000000000 +A140:000000000FE001000FE001003908270821C8213801000FE001000FE000000000 +A141:00000380044000000FE001000380054009200920092009200540038000000000 +A142:00000000000000000FE001000380054009200920092009200540038000000000 +A143:00000000000000000FE001000FE0082004400280010002800440082000000000 +A144:000000000000000001800140012001000100092007C000000920092000000000 +A145:0000038004400000111011101FF011101110092007C000000920092000000000 +A146:0000000000000000111011101FF011101110092007C000000920092000000000 +A147:000000000000031002D002300F800200020010400F8000001240124000000000 +A148:00000380044000000EE0010002800440054005400440028001000EE000000000 +A149:00000000000000000EE0010002800440054005400440028001000EE000000000 +A14A:000000000000000008600FD02848184003C0044008400840044003C000000000 +A14B:0000000000001FC0104008800510051003F005100510088010401FC000000000 +A14C:0000038004400000111011101110092007C00100110011001100010000000000 +A14D:0000000000000000111011101110092007C00100110011001100010000000000 +A14E:00000000000000000F8010801088088807F808881088108010800F8000000000 +A14F:000003800440000011101110111011101110111011101110092007C000000000 +A150:000000000000000011101110111011101110111011101110092007C000000000 +A151:0000000000000000008000801808160811881068101800000490049000000000 +A152:0000038004400000002008200FE008200020002008200E2009A0006000000000 +A153:0000000000000000002008200FE008200020002008200E2009A0006000000000 +A154:000000000000000003800440044009200920082008200920092006C000000000 +A155:000003800440000001800160210817D0111017D0210801000D00030000000000 +A156:000000000000000001800160210817D0111017D0210801000D00030000000000 +A157:00000000000000000C60125013C812400C4000400C400B4008C0080000000000 +A158:00000380044000000C60125012480C4000401FF80040074004C0040000000000 +A159:00000000000000000C60125012480C4000401FF80040074004C0040000000000 +A15A:0000000000000000188824A824A824A818A800F000A018A006A0018000000000 +A15B:0000000000000000004007F008400FF0084007F000400E4009C0080000000000 +A15C:0380044000000400099012501250125011900810031002D00230020000000000 +A15D:0000000000000400099012501250125011900810031002D00230020000000000 +A15E:0000000004000800101014501450111011100810031002D00230020000000000 +A15F:0000038004400000183024282424242019E0022004200420022001E000000000 +A160:0000000000000000183024282424242019E0022004200420022001E000000000 +A161:00000000000000000660095829402940264010400FC00040034000C000000000 +A162:00000000000000000000088008800520052003E0052005200880088000000000 +A163:00000380044000000120012001200120012001C00100111011100FE000000000 +A164:00000000000000000120012001200120012001C00100111011100FE000000000 +A165:00000000000000000FE01010101010100FE001001FF001001FF0010000000000 +A166:00000380044000000FE01010101010100FE001001F2001201F20010000000000 +A167:00000000000000000FE01010101010100FE001001F2001201F20010000000000 +A168:0000000000000000098011601118090001001FF001001FF00100010000000000 +A169:0000038004400000018001600118010001001FF001001FF00100010000000000 +A16A:0000000000000000018001600118010001001FF001001FF00100010000000000 +A16B:0000000000000000018001402128210811100FE001000FE01110210821080000 +A16C:000000000000000001800140012001001FF001000FE010102108210800000000 +A16D:000003800440000011101110092007C001001900150013401040018000000000 +A16E:000000000000000011101110092007C001001900150013401040018000000000 +A16F:000000000000046025582546044064401C4000400C400B4008C0080000000000 +A170:00000000000000000010031002D0023002001FC802081FC80200020000000000 +A171:000003800440000000080188016801180D000B80296019180100010000000000 +A172:000000000000000000080188016801180D000B80296019180100010000000000 +A173:00000000000000000FE008200440038004400820018001400500030000000000 +A174:000003800440000003800540054035482F4825E8255805400540038000000000 +A175:000000000000000003800540054035482F4825E8255805400540038000000000 +A176:0000000000000000223055285524222008201420142009A00160010000000000 +A177:000003800440000000C022B0228C088008800080188016801180100000000000 +A178:000000000000000000C022B0228C088008800080188016801180100000000000 +A179:03800440000001800540030000000EE00100028001000EE00000018005400300 +A17A:000001800540030000000EE00100028001000EE0000001800540030000000000 +A17B:0000000000000000000020C412A8118808100FF0081010C812A8218400000000 +A17C:00000000000003600458334640403340044003401840164011C0100000000000 +A17D:0000000000000000006000500048004023C8244808400840244823C800000000 +A17E:000003800440000000900A900A900A9000F00E90009004900290019000000000 +A17F:000000000000000000900A900A900A9000F00E90009004900290019000000000 +A180:000000000000000000C000A00090008007A008C0118012800C80078000000000 +A181:000003800440000000E0011001100710059015500D300110011000E000000000 +A182:000000000000000000E0011001100710059015500D300110011000E000000000 +A183:00000000000000000600058004000798046005C00640078034000C0000000000 +A184:0380044000000660055014C80C600050004001F00C400B4008C0080000000000 +A185:0000000000000660055014C80C600050004001F00C400B4008C0080000000000 +A186:000000000000000001800160011817C0110017C001000D000B00080000000000 +A187:00000380044000001D8003600118010003001D00010031000D00030000000000 +A188:00000000000000001D8003600118010003001D00010031000D00030000000000 +A189:000000000000000008E00910091009500950095009500910091008E000000000 +A18A:00000000000000000700089008900FF0089008900FF008900890070000000000 +A18B:0380044000003E60415808463E40084041403E4000400E4009C0080000000000 +A18C:0000000000003E60415808463E40084041403E4000400E4009C0080000000000 +A18D:000000000000000024C018B0008C248018800080188016801180100000000000 +A18E:0000038004400000018001600D00030001000D00030001000D00030000000000 +A18F:0000000000000000018001600D00030001000D00030001000D00030000000000 +A190:000000000000000031800D60031831000D00030031002D002300200000000000 +A191:000000000000000000C000B000800A800A800A80008000800680018000000000 +A192:03800440000012C00CB0008012800C80008012800C8000801C80038000000000 +A193:00000000000012C00CB0008012800C80008012800C8000801C80038000000000 +A194:000000000000000000600A580A400A40004011400E400040034000C000000000 +A195:000003800440000000C014B01480148000E01C90009000900680018000000000 +A196:000000000000000000C014B01480148000E01C90009000900680018000000000 +A197:000000000410041003E018881688118810E81098008003E00490049000000000 +A198:0380044000000820082007C001100FF0110011000FF0010007C0082008200000 +A199:000000000820082007C001100FF0110011000FF0010007C00820082000000000 +A19A:000000000000000017D0082017D0101010101010082007C010100FE000000000 +A19B:038004400000038004400440038031102D10231021D021300380054005400000 +A19C:0000000001C00220022001C018881688118810E8109801C002A002A000000000 +A19D:0000000000000000089007100010031002D00230020007000A800A8000000000 +A19E:000000000000000007000880088008800B900AD00AB008800880070000000000 +A19F:0000038004400000008007900890108010901090108008900790008000000000 +A1A0:0000000000000000008007900890108010901090108008900790008000000000 +A1A1:000000000000000007800840102000A800A800A800701C20132010C000000000 +A1A2:0380044000000EE001000280044004400FE0044005400540028001000EE00000 +A1A3:000000000EE001000280044004400FE0044005400540028001000EE000000000 +A1A4:000000000000000027C828281010183017D0101011101110082007C000000000 +A1A5:000003800440000001000124012401F801200124012431F80D20032000000000 +A1A6:000000000000000001000124012401F801200124012431F80D20032000000000 +A1A7:000000000000000027C828281010183017D0101010101010082007C000000000 +A1A8:03800440000007C0082010101E1011D0103011D01E101010082007C000000000 +A1A9:00000000000007C0082010101E1011D0103011D01E101010082007C000000000 +A1AA:000000000000000007C008201010101010101FF010101010082007C000000000 +A1AB:00000000000001800160011801001FF001001FF001001D001300100000000000 +A1AC:000003800440000004F00900090004800070048009000900090004F000000000 +A1AD:000000000000000004F00900090004800070048009000900090004F000000000 +A1AE:00000000000000000FE0101010100FE00100090008E00100090008E000000000 +A1AF:000003800440000007C00820101010101010101010101450082017D020080000 +A1B0:000000000000000007C00820101010101010101010101450082017D020080000 +A1B1:00000000000000000110011000E00040034002C0020007000880088000000000 +A1B2:0000038004400000111011101110092007C00100390027002100210000000000 +A1B3:0000000000000000088808880888049003E000801C8013801080108000000000 +A1B4:000000000000000001C0022006300528042004200420042014A00C6000000000 +A1B5:000003800440000002C01AB0168C538032800280188016801180100000000000 +A1B6:000000000000000002C01AB0168C538032800280188016801180100000000000 +A1B7:0000000000000000001001900170010031482D4823C821780140010000000000 +A1B8:000003800440000000400440044004400440044000400C40034000C000000000 +A1B9:000000000000000000400440044004400440044000400C40034000C000000000 +A1BA:000000000000000007C009201110111011101FF011101110092007C000000000 +A1BB:00000000000000000020022002200AA008A008A00020062001A0006000000000 +A1BC:00000380044000000040044004400440004004400A400A400640098000000000 +A1BD:00000000000000000040044004400440004004400A400A400640098000000000 +A1BE:00000000000000000020062009200920092006200020062001A0006000000000 +A1BF:0000000000000000102010281028102010281FE8102010281028102000000000 +A1C0:00000380044000000C200A2009200820082008200820092008A0086000000000 +A1C1:00000000000000000C200A2009200820082008200820092008A0086000000000 +A1C2:00000000000000C000B0188C23E0188023E0188000800E800980080000000000 +A1C3:000005500550001003D00430081008000800080008000810042003C000000000 +A1C4:000003800440000001800160011803800540054013901110092007C000000000 +A1C5:000000000000000001800160011803800540054013901110092007C000000000 +A1C6:0000000000000000044004400FE01450244824480FE014502448238800000000 +A1C7:0000000000000000145015501110082007C001000FE001000900060000000000 +A1C8:000003800440000001800160010007C00920092007C001000D00030000000000 +A1C9:000000000000000001800160010007C00920092007C001000D00030000000000 +A1CA:000000000000000003800540054009200FE009200FE00920092006C000000000 +A1CB:0000038004400000042009200920082004200020062005A00460040000000000 +A1CC:0000000000000000042009200920082004200020062005A00460040000000000 +A1CD:00000000000000001808170810E81018010001000000111011100EE000000000 +A1CE:000000000000000007C00820129012901010101011101110082007C000000000 +A1CF:00000380044000001110111011100EE004400440054005400440038000000000 +A1D0:00000000000000001110111011100EE004400440054005400440038000000000 +A1D1:000000000000100408081C10222049404880494022201C100808100400000000 +A1D2:0000038004402008111009200440028001000280044009201110200800000000 +A1D3:0000000000002008111009200440028001000280044009201110200800000000 +A1D4:000000000000000010841084088807F000800C800B8008806A801A8000000000 +A1D5:000003800440000018081608118810E81098008000800000041003E000000000 +A1D6:000000000000000018081608118810E81098008000800000041003E000000000 +A1D7:000000000000000018081608118810E810980080008006800580040000000000 +A1D8:000003C00420000003C00420040004000200018000400020042003C000000000 +A1D9:000000000000000003C00420040004000200018000400020042003C000000000 +A1DA:00000000000000000F0010802048004800480078004838482648218000000000 +A1DB:000007C00820000003C00420081001100110011000100E100990086000000000 +A1DC:000000000000000003C00420081001100110011000100E100990086000000000 +A1DD:00000000000000000008018801680118010007C02108210810100FE000000000 +A1DE:000000000000000007C0092011101110010007C011101110092007C000000000 +A1DF:0000038004400000145014501390082007C00100010001000900060000000000 +A1E0:0000000000000000145014501390082007C00100010001000900060000000000 +A1E1:000000000000000001880168011801001FF001002548254810100FE000000000 +A1E2:000000000000000014501390082007C00000000007C008201390145000000000 +A1E3:000003800440000010101010082007C00000000007C008201010101000000000 +A1E4:000000000000000010101010082007C00000000007C008201010101000000000 +A1E5:00000000000007C008201010145013901010139014501010082007C000000000 +A1E6:00000000000000000000406020A0112C0A3004300A30113020AC406000000000 +A1E7:00000380044000000000406C20B011300A2C04200A2C113020B0406C00000000 +A1E8:00000000000000000000406C20B011300A2C04200A2C113020B0406C00000000 +A1E9:00000000000007C008201290129010101FF0101011101110082007C000000000 +A1EA:000000000000000044444444444444443BB811101550155011100EE000000000 +A1EB:000003800440000031000D08011031200D400180010031000D00030000000000 +A1EC:000000000000000031000D08011031200D400180010031000D00030000000000 +A1ED:0000000000000000000008200820082000001FF0000001000100010000000000 +A1EE:00000000000000000180016001180100011001F031102D002300200000000000 +A1EF:0000038004400000018001600100090009000900010001000D00030000000000 +A1F0:0000000000000000018001600100090009000900010001000D00030000000000 +A1F1:000000000000000001800960091809000100010031002D002300200000000000 +A1F2:00000000000000E0191005500350031003F0031003500550191000E000000000 +A1F3:0000038004400000101010101FF010101010101010101010082007C000000000 +A1F4:0000000000000000101010101FF010101010101010101010082007C000000000 +A1F5:000000000000000007C008201010145017D0145014501390082007C000000000 +A1F6:0000038004400000101010101FF010101010101010101450082017D020080000 +A1F7:0000000000000000101010101FF010101010101010101450082017D020080000 +A1F8:0000000000000000040005E0040005E0040005E0040004600580060000000000 +A1F9:000003800440000001C00220022004101F100410041004900490036000000000 +A1FA:000000000000000001C00220022004100F100410041004900490036000000000 +A1FB:0000000000001FF01010092005400280010002800540092010101FF000000000 +A1FC:0000038004400000000801880168011831002D08238821682118010000000000 +A1FD:0000000000000000000801880168011831002D08238821682118010000000000 +A1FE:0000000000000000010031182928254823882388254829283118010000000000 +A1FF:0000000000000000038002601218124012401E40124012181260038000000000 +A200:0000000003800440000010180828044802881FF8028804480828101800000000 +A201:0000000000000000000010180828044802881FF8028804480828101800000000 +A202:00000000000000000180096009180900011001F031102D002300200000000000 +A203:000003800440000000601158114011400440047004480048034800C000000000 +A204:000000000000000000601158114011400440047004480048034800C000000000 +A205:0000000001800160010003800540038001000D00030007C00820082000000000 +A206:0000000000000000031002D01E300200020003C002001E000200020000000000 +A207:038004400000180006C000B018800680008018E0069000900690018000000000 +A208:000000000000180006C000B018800680008018E0069000900690018000000000 +A209:000000000000030002C0023002000FF01200120012000FF00200020000000000 +A20A:0000000000000000044004401390111011100EE0044004400440038000000000 +A20B:0000038004400000082008200820082000000000010001000100010000000000 +A20C:0000000000000000082008200820082000000000010001000100010000000000 +A20D:0000000000000000101010101010082007C00000111011101110111000000000 +A20E:0000000000000000111011101110092007C0010001001FF00100010000000000 +A20F:000003800440000000101A5016501250135012D00010031000D0003000000000 +A210:00000000000002101A5016501250135012D002100010031000D0003000000000 +A211:000000000000000003E004900490008000800080188016801180100000000000 +A212:03800440000000400640054004401F40044014400C400040034000C000000000 +A213:0000000000000020032002A002200FA002200A200620002001A0006000000000 +A214:00000000000007C008201010101010100C601010111011100D60010000000000 +A215:0000038004400000002008A005200520052008A00020062001A0006000000000 +A216:0000000000000000002008A005200520052008A00020062001A0006000000000 +A217:00000380044000000F6010D01648094016401040164009401640004000000000 +A218:00000000000000000F6010D01648094016401040164009401640004000000000 +A219:00000000000000000400040004001C0816081188106810380020002000000000 +A21A:0000000000000000020802080208020803F8020802081A081608100800000000 +A21B:03800440000007E00810080007E00010081007E0008007F0008007F000800000 +A21C:00000000000007E00810080007E00010081007E0008007F0008007F000800000 +A21D:000000000000000021382140218021800180014031382D002300200000000000 +A21E:000000000000000008400840084000400C40034000C001E00210021000000000 +A21F:00000380044000001830244804400440044004400FE014502448238800000000 +A220:00000000000000001830244804400440044004400FE014502448238800000000 +A221:000000000FE010101110111010100FE001001FF001001FF00500030000000000 +A222:00000000000000000180016031082D0823882168211801000D00030000000000 +A223:000003800440000000200020002000200020082008200E2009A0086000000000 +A224:000000000000000000200020002000200020082008200E2009A0086000000000 +A225:00000000000000000840084008400840004000400C400B4008C0080000000000 +A226:00000000000000000AC00AB000801F8000800A800A8000800680018000000000 +A227:0000038004400000111011101010101011101110101010101110111000000000 +A228:0000000000000000111011101010101011101110101010101110111000000000 +A229:000000000000000019602558244027C02440254025401840034000C000000000 +A22A:0000000000000000000809881568151815000F00050009001100010000000000 +A22B:038004400000183006D0011006D018300000183006D0011006D0183000000000 +A22C:000000000000183006D0011006D018300000183006D0011006D0183000000000 +A22D:0000000000000000183006D0011006D01830010001001FF00100010000000000 +A22E:0380044000000FE01010101010100FE000000FE01010101010100FE000000000 +A22F:0000000000000FE01010101010100FE000000FE01010101010100FE000000000 +A230:000003800440000006183D944472441024101C102410441044103C1000000000 +A231:000000000000000006183D944472441024101C102410441044103C1000000000 +A232:000000000000000003E00410041007F00410051006100C10141003E000000000 +A233:0000038004400000186016581040104010401FC0124012401240124000000000 +A234:0000000000000000186016581040104010401FC0124012401240124000000000 +A235:0000000000000000010C01100120012001E0012031202D10230C200000000000 +A236:0380044001000FE0111011100FE0210821080FE0111011100FE0010000000000 +A237:0000000001000FE0111011100FE0210821080FE0111011100FE0010000000000 +A238:0000000000000000000007C008200820082007C0010007C00920092000000000 +A239:0000000000000000000007C009200FE0092007C0010007C00920092000000000 +A23A:03800440000003E004100410041003E00080038002000F801240124000000000 +A23B:00000000000003E004100410041003E00080038002000F801240124000000000 +A23C:000000000000000000780080038004401E380440038000800080007800000000 +A23D:0380044000000070008000900790088012701200127008800790009000800070 +A23E:0000007000800090079008801270120012700880079000900080007000000000 +A23F:00000000000000000FB8104020A020A020B820A020A020A010400FB800000000 +A240:000000000000000008202AA81AB0193018301AB01AB02928082007C000000000 +A241:0000000003800440000006E0010002C002000FE0020002C0010006E000000000 +A242:0000000000000000000006E0010002C002000FE0020002C0010006E000000000 +A243:00000000000000000410041003E0008007F0008007F0108010800F0000000000 +A244:00000380044000001410141014101590169014901090109008A007C000000000 +A245:00000000000000001410141014101590169014901090109008A007C000000000 +A246:000000000000000000000E1009900870000000000E1009900870000000000000 +A247:0380044000000100311829282448228821082288244829283118010000000000 +A248:0000000000000100311829282448228821082288244829283118010000000000 +A249:0000000000001FF0004007C008400840084007C008400840084007C000000000 +A24A:0000000000000000004009400940094000400F4000400C40034000C000000000 +A24B:0000038004400000003000400090039002F00280028002401A30060000000000 +A24C:0000000000000000003000400090039002F00280028002401A30060000000000 +A24D:0000000000000000070008A008A0088008F0088008A008A00880070000000000 +A24E:000000000000000010C020B0248C22801180008007E008800880070000000000 +A24F:000003800440000010C020B0248C228011800080008018800680018000000000 +A250:000000000000000010C020B0248C228011800080008018800680018000000000 +A251:000000000000000012C022B0248C228011800280028018800680018000000000 +A252:00000000000000002288228822881C7000000820082008200440038000000000 +A253:000003800440000001E00200040004000400040004000400020001E000000000 +A254:000000000000000001E00200040004000400040004000400020001E000000000 +A255:00000000000000001110111011100EE000000380044004400440038000000000 +A256:00000000000000000FC0002007A00820072000A00F20002000200FC000000000 +A257:0000038004400000018001600900050003000100010001000D00030000000000 +A258:0000000000000000018001600900050003000100010001000D00030000000000 +A259:0000000000000000000030182828244822882108228824482828301800000000 +A25A:0380044000000920092007C00FE01110111011100FE007C00920092000000000 +A25B:0000000000000920092007C00FE01110111011100FE007C00920092000000000 +A25C:0000000000000000018031602D1823002100010031002D002300210000000000 +A25D:00000380044000000180056005180500014009400540131011100FE000000000 +A25E:00000000000000000180056005180500014009400540131011100FE000000000 +A25F:000000000000000001800160110811087D3E1108110801000D00030000000000 +A260:0000000000000000202020203828262821A820702020202010400F8000000000 +A261:000003800440000018881688118810E810980080008006800580040000000000 +A262:000000000000000018881688118810E810980080008006800580040000000000 +A263:0000000000000000008008E008903E8808880888009018E00680018000000000 +A264:00000000000000000FE0101024482288010001002288244810100FE000000000 +A265:0380044000000380044005400540044007C00440028001000280044000000000 +A266:0000000000000380044005400540044007C00440028001000280044000000000 +A267:00000000000000001C70028001000100010001000100010002801C7000000000 +A268:0000038004400000038004400440044007C0082009200920082007C000000000 +A269:0000000000000000038004400440044007C0082009200920082007C000000000 +A26A:00000000000000000088029002A002C012E00C900090189006E0018000000000 +A26B:00000380044000000020022002200FA0022002200020062001A0006000000000 +A26C:00000000000000000020022002200FA0022002200020062001A0006000000000 +A26D:00000000000000000E00110011001F2011501FD011501F2011000E0000000000 +A26E:0000000000000000098011601118090007000900110011000900010000000000 +A26F:0000038004400000118011600918070009001100110001000D00030000000000 +A270:0000000000000000118011600918070009001100110001000D00030000000000 +A271:00000000000000000050035002D002700240024002000F801240124000000000 +A272:000003800440000001C002A003E002A031C02C8023C002200490049000000000 +A273:000000000000000000E0015001F0015018E0164011E001100248024800000000 +A274:000000000000000000E001100110011018E0164011E001100248024800000000 +A275:0000000000000000098015601518090001001FF001001FF00100010000000000 +A276:000003800440000001801960051813002B002B00130005001900010000000000 +A277:000000000000000001801960051813002B002B00130005001900010000000000 +A278:000000000000000001001FE00910151009101FE0010007C00920092000000000 +A279:00000000000000000F00103810400880078008801040103810000F0000000000 +A27A:000003800440000007C00820139014501450145014501390082007C000000000 +A27B:000000000000000007C00820139014501450145014501390082007C000000000 +A27C:0000000000000000000020201040089005280228052808901040202000000000 +A27D:00000380044000000C300B2808E4082008201C202A202A202A20082000000000 +A27E:00000000000000000C300B2808E4082008201C202A202A202A20082000000000 +A27F:0000000000000000038004400E4004400E400440038004400920092000000000 +A280:0000000000000000022002200E240BA42A741A2C02A002A0022001C000000000 +A281:000003800440000018081608118810681018000007E00000000007E000000000 +A282:000000000000000018081608118810681018000007E00000000007E000000000 +A283:0000000000000000180816081188106810180000042004200420042000000000 +A284:00000380044000000E70018001800250025002500180058002400D3000000000 +A285:00000000000000000E70018001800250025002500180058002400D3000000000 +A286:00000000000001C001300F8001400F4001400F80010003800540054000000000 +A287:00000380044000000710089008A007C0008003E000800BE00880070000000000 +A288:00000000000000000710089008A007C0008003E000800BE00880070000000000 +A289:0000000000000000000004400440028002A001200AA006800640054000000000 +A28A:038004400000180006C000B01888068000801880068003E00490049000000000 +A28B:00000000180006C000B018880680008018800680008003E00490049000000000 +A28C:0000000000000000018001600118014001401D10139011700100010000000000 +A28D:00000000000011101110092007C00100150015001F0015001500010000000000 +A28E:00000380044000000440044004401390111011100EE004400AA00AA000000000 +A28F:00000000000000000440044004401390111011100EE004400AA00AA000000000 +A290:000000000000000003D00430081009000900090009000810042003C000000000 +A291:00000380044000001440144014401FF814401440144001F0004001F000000000 +A292:00000000000000001440144014401FF814401440144001F0004001F000000000 +A293:000000000000000001801560151815001FE01500150001000100010000000000 +A294:000000000000000801881D6803180B000B7003801DA001A00180017000000000 +A295:0000038004400000007807800880107814801480107808800780007800000000 +A296:0000000000000000007807800880107814801480107808800780007800000000 +A297:00000000000000000440044004401390111011100EE0000000000EE000000000 +A298:00000380044000000380044004400E40044004400E4004400440038000000000 +A299:00000000000000000380044004400E40044004400E4004400440038000000000 +A29A:0000000000000000010001180124013C012401FC012431180D00030000000000 +A29B:000000000000000001000280044008200FE001000280044008200FE000000000 +A29C:00000380044000000804087408AC09200A200C200A20692058A0406000000000 +A29D:00000000000000000804087408AC09200A200C200A20692058A0406000000000 +A29E:00000000000000000FE0101010100FE0101010100FE0101010100FE000000000 +A29F:0000038004400000018001600118010017D01110111017D00100010000000000 +A2A0:0000000000000000018001600118010017D01110111017D00100010000000000 +A2A1:00000000000000400C400B4008C008000BE00A20094008800940022000000000 +A2A2:0000000000000000070008A008A008C0088008A008A008C00880070000000000 +A2A3:00000000038004400000064001C0064001C00000064001C0064001C000000000 +A2A4:00000000000000000000064001C0064001C00000064001C0064001C000000000 +A2A5:000000000000000007C00820111011100000000007C008201110111000000000 +A2A6:0000000003800440000060305054489405180210051408941058203000000000 +A2A7:0000000000000000000060305054489405180210051408941058203000000000 +A2A8:0000000000000248015000E001500248034012C00A8007000A80124000000000 +A2A9:000000000380044000000440044002800280010002800A800840074000000000 +A2AA:000000000000000000000440044002800280010002800A800840074000000000 +A2AB:000000000000000000F00900090000F00900090000F00900090000F000000000 +A2AC:000003800440000003C0240C2410022021E022200410240C240003C000000000 +A2AD:000000000000000003C0240C2410022021E022200410240C240003C000000000 +A2AE:00000000000000001860165011C8104012401240124010401040104000000000 +A2AF:0000038004400000030002C002300200020002001FC002000200020000000000 +A2B0:0000000000000000030002C002300200020002001FC002000200020000000000 +A2B1:0000000000000FE00820044002800280010002800280044008200FE000000000 +A2B2:0000000000001E0811CC103A1188114811081108110815085308300000000000 +A2B3:0000038004400000038004400450045004500460044004400440038000000000 +A2B4:0000000000000000038004400450045004500460044004400440038000000000 +A2B5:0000000000000000030002C00230020002000F8010401FC010400F8000000000 +A2B6:000000000000000007C00820109016901190109016901190082007C000000000 +A2B7:000003800440000007C00820101011901150111015101310082007C000000000 +A2B8:000000000000000007C00820101011901150111015101310082007C000000000 +A2B9:000000000000000007800840132802A802280A3006201C20132010C000000000 +A2BA:03800440000001C00130010001C0012007C00900070001001900070000000000 +A2BB:00000000000001C00130010001C0012007C00900070001001900070000000000 +A2BC:00000000000000000C6002800100028002800440044009200920092000000000 +A2BD:000000000000000002200220022802280F282AE81A380228022801C000000000 +A2BE:000003800440000001C00220022802280F282AE81A380228022801C000000000 +A2BF:000000000000000001C00220022802280F282AE81A380228022801C000000000 +A2C0:0000000000000000071008900890089008901FF0089008900890071000000000 +A2C1:000003800440000007C00820139010501390105013901010082007C000000000 +A2C2:000000000000000007C00820139010501390105013901010082007C000000000 +A2C3:00000000000000001110111011100EE0000004401550155011100EE000000000 +A2C4:000000000000000011C42224222412240E3C122422242224122401C400000000 +A2C5:00000000038004400000406020A011244A24443C4A24112420A0406000000000 +A2C6:00000000000000000000406020A011244A24443C4A24112420A0406000000000 +A2C7:000000000000000010C013B01080088007800080188016801180100000000000 +A2C8:0000038004400000070008900890089008F00890089008900880070000000000 +A2C9:0000000000000000070008900890089008F00890089008900880070000000000 +A2CA:000000000000000008200420022001200CA00A60090008800840082000000000 +A2CB:0000000003800440000004400440028002A0012002A002800440044000000000 +A2CC:0000000000000000000004400440028002A0012002A002800440044000000000 +A2CD:0000000000000000018001600100010001000100010001000D00030000000000 +A2CE:0000038004400000183006C0010006C018300100010007C00100010000000000 +A2CF:0000000000000000183006C0010006C018300100010007C00100010000000000 +A2D0:000000000000000018081608158814681458044007C004400440044000000000 +A2D1:0000038004401000086024501048084003C0044008400840044003C000000000 +A2D2:0000000000001000086024501048084003C0044008400840044003C000000000 +A2D3:00000000000000000020062005A0046004000520052004000520052000000000 +A2D4:0000000000000FE0010011400920051011400920051011400920051000000000 +A2D5:000003800440000007C00820101017D001000100054005400540010000000000 +A2D6:000000000000000007C00820101017D001000100054005400540010000000000 +A2D7:0000000000000000180816081188106811180100010004400440044000000000 +A2D8:00000000000000001FC00200020012680AA807380AA8126802001FC000000000 +A2D9:00000000038004400000110011000A500A5004000A500A501100110000000000 +A2DA:00000000000000000000110011000A500A5004000A500A501100110000000000 +A2DB:00000000000000000000110011000A500A5004000A700A001100110000000000 +A2DC:038004400010031002D002300F8002000F800200070008800880070000000000 +A2DD:000000000010031002D002300F8002000F800200070008800880070000000000 +A2DE:00000000000000000100010007C011101110092007C004400820082000000000 +A2DF:000003800440000007C008200FE008200FE0082007C00100011000E000000000 +A2E0:000000000000000007C008200FE008200FE0082007C00100011000E000000000 +A2E1:00000000000000000F00114011400F40114011000F000110011000E000000000 +A2E2:0000038004400000030002C002300200070008800880070010400F8000000000 +A2E3:0000000000000000030002C002300200070008800880070010400F8000000000 +A2E4:000000000180016001000F28112811F811280F28010001000D00030000000000 +A2E5:0000038004400000060005800460040004A004A007E004A004A0040000000000 +A2E6:0000000000000000060005800460040004A004A007E004A004A0040000000000 +A2E7:0000000000000000000004400820101004400820101004400820101000000000 +A2E8:0380044000000010031002D0023002000A6006A0032006A00A60020000000000 +A2E9:0000000000000010031002D0023002000A6006A0032006A00A60020000000000 +A2EA:000000000000000001E0022004200420022001E0006009A00E20082000000000 +A2EB:000003800440000003800440044004400FC01440144014401440044000000000 +A2EC:000000000000000001C002200220022007E00A200A200A200A20022000000000 +A2ED:000000000000000007F0008001C0013001000120012001200D00030000000000 +A2EE:0000000003800440000004400440044000000FE0000004400440044000000000 +A2EF:0000000000000000000004400440044000000FE0000004400440044000000000 +A2F0:0000000000000000012009100910092001C00120091009100920010000000000 +A2F1:000003800440000011201510151011201FC011201510151011200E0000000000 +A2F2:000000000000000011201510151011201FC011201510151011200E0000000000 +A2F3:0000000000000000112011101110112011C011201110111011200E0000000000 +A2F4:0000000000000000010007C00100000001800160010001000D00030000000000 +A2F5:000003800440010007C00100000001800160010007C001000D00030000000000 +A2F6:000000000000010007C00100000001800160010007C001000D00030000000000 +A2F7:0000000000000000098011601118090007480948110011480948010000000000 +A2F8:0000038004400000044004400380111013900D6001000D6003800D6000000000 +A2F9:0000000000000000044004400380111013900D6001000D6003800D6000000000 +A2FA:00000380044000000010031002D0023002000F801240124012400F8000000000 +A2FB:00000000000000000010031002D0023002000F801240124012400F8000000000 +A2FC:0000038004400000008003E00080060005800460040004400440040000000000 +A2FD:0000000000000000008003E00080060005800460040004400440040000000000 +A2FE:0000038004400000010007C00100111011100EE00000010007C0010000000000 +A2FF:0000000000000000010007C00100111011100EE00000010007C0010000000000 +A300:00000000010007C041044C64345804400380010007C0010007C0010000000000 +A301:0000038004400000101010101FF011101110111011101110092007C000000000 +A302:0000000000000000101010101FF011101110111011101110092007C000000000 +A303:0000000000000000000009F012101210091000F009101210121009F000000000 +A304:000003800440000002400280030003C00220022003C003000280024000000000 +A305:000000000000000002400280030003C00220022003C003000280024000000000 +A306:000000000000000007C0082014501FF0145014501FF01450082007C000000000 +A307:000003800440000010101450145014501010111011101110082007C000000000 +A308:000000000000000010101450145014501010111011101110082007C000000000 +A309:000000000000000000880088008800880C8810F8208824882288118800000000 +A30A:000003800440000007C008201FF010101FF0082007C008201110111000000000 +A30B:000000000000000007C008201FF010101FF0082007C008201110111000000000 +A30C:0000000000000000030012C01230120002000200120012001200020000000000 +A30D:000003800440000004440444024801F018402040404048404640218000000000 +A30E:000000000000000004440444024801F018402040404048404640218000000000 +A30F:000000000000000011101110092007C001000100078009400640004000000000 +A310:000000000000000000B808C008C008B8088000B800C018C006B8018000000000 +A311:00000380044000000080089008F0089008800080009018F00690018000000000 +A312:00000000000000000080089008F0089008800080009018F00690018000000000 +A313:00000F901050001003D00430081008000800080008000810042003C000000000 +A314:0000038004400000060005800460040005200520052005200400040000000000 +A315:0000000000000000060005800460040005200520052005200400040000000000 +A316:00000000000000000C000B0008C008000A200940088009400A20080000000000 +A317:00000000000003C004200500048002000180004002200120042003C000000000 +A318:0000038004400000118009600500110009400520011001400D20031000000000 +A319:0000000000000000118009600500110009400520011001400D20031000000000 +A31A:00000000000007C008200A800A80080007C0002002A002A0082007C000000000 +A31B:000003800440000008C008A00090078008800880078000800880088000000000 +A31C:000000000000000008C008A00090078008800880078000800880088000000000 +A31D:0000000000000000004010501050135002C00200121012101210020000000000 +A31E:0000000000000820082007C00000111011100EE0000007C00820082000000000 +A31F:0000038004400000024002400240020003E00200024002401A40060000000000 +A320:0000000000000000012001200120010001F00100012001200D20030000000000 +A321:000000000000000003C00420081008103E10081008100810042003C000000000 +A322:00000380044000000100092009201D20090009F0010001200D20032000000000 +A323:00000000000000000100092009201D20090009F0010001200D20032000000000 +A324:00000000000000001010101010101010082007C00000010007C0010000000000 +A325:00000380044000001010101010101010082007C00100110011000E0000000000 +A326:00000000000000001010101010101010082007C00100110011000E0000000000 +A327:0000000000000000008007F00080008007F00080188016801180100000000000 +A328:0000038004400000101010101010082007C00000010001000100010000000000 +A329:0000000000000000101010101010082007C00000010001000100010000000000 +A32A:0000000000000000000811881F6811180100011011101F101110010000000000 +A32B:00000380044000000020062005A0046004000440044005F00440044000000000 +A32C:00000000000000000020062005A0046004000440044005F00440044000000000 +A32D:0000000000000000001003101ED002300200022002201EF80220022000000000 +A32E:000003800440000018081608118811681518054001400540051000E000000000 +A32F:000000000000000018081608118811681518054001400540051000E000000000 +A330:000000000000000018081608118810E81098008002A002A0008007F000000000 +A331:00000000000000001110111013900D60010005401550155011100EE000000000 +A332:00000380044000000FE0101010100FE0210821080FE0101010100FE000000000 +A333:00000000000000000FE0101010100FE0210821080FE0101010100FE000000000 +A334:0000000000000FE0101010100FE001001FF001000FE0101010100FE000000000 +A335:0000000000000000000811881F681118110011001F0011000100010000000000 +A336:000003800440000007C00820101010101FF0111011101110092007C000000000 +A337:000000000000000007C00820101010101FF0111011101110092007C000000000 +A338:00000000000000001860165011C0104012401540154015401240104000000000 +A339:00000380044000000180016001000100010001C0012001200D20030000000000 +A33A:00000000000000000180016001000100010001C0012001200D20030000000000 +A33B:000000000000000007C00820119011501110119015501350082007C000000000 +A33C:000000000000000000401FF800400440047800400C400B4008C0080000000000 +A33D:00000380044000001C60135010C002400FC002400C400B4008C0080000000000 +A33E:00000000000000001C60135010C002400FC002400C400B4008C0080000000000 +A33F:000000000000049003E00080049003E01880168013E014100490049000000000 +A340:0000000000000000112015101510112015C01520111015101510112000000000 +A341:00000380044000000180016007D8090009C0090037C02D002300200000000000 +A342:00000000000000000180016007D8090009C0090037C02D002300200000000000 +A343:00000000000000000F001088224802400FC80248024038482648218000000000 +A344:0380044000000EE0111011101110010001000FE0000009200920092000000000 +A345:0000000000000EE0111011101110010001000FE0000009200920092000000000 +A346:0000000000700E8011A011A01180157015001570118011A011A00E8000700000 +A347:03800440010001000440044018101610111010D0103004400540010000000000 +A348:00000000010001000440044018101610111010D0103004400540010000000000 +A349:000000000000000003883A680618120012001200120006183A68038800000000 +A34A:00000380044000000580056025181900010001003FF801000100010000000000 +A34B:00000000000000000580056025181900010001003FF801000100010000000000 +A34C:000000000000000007E008200820082007E0002001200920082007C000000000 +A34D:000000000000000005800560251819000100010007C009201110111000000000 +A34E:00000380044000001860165011C010401240124010401FC01040104000000000 +A34F:00000000000000001860165011C010401240124010401FC01040104000000000 +A350:000000000000000001000540044002801E90111012F002800440054001000000 +A351:00000000000000000008018801680118010005402548210811100FE000000000 +A352:00000380044000000100010001000100054005402548210811100FE000000000 +A353:00000000000000000100010001000100054005402548210811100FE000000000 +A354:000000000000000015501550155011101550155015501110092007C000000000 +A355:00000000000000000638054404C40444044404440444245414540C3800100000 +A356:000003800440000001900F6811281128091007000900110011000F0000000000 +A357:000000000000000001900F6811281128091007000900110011000F0000000000 +A358:000000000000000000000100028002800100000004400AA00AA0044000000000 +A359:0000038004400000031002E81A28062802101A00060002001A00060000000000 +A35A:0000000000000000031002E81A28062802101A00060002001A00060000000000 +A35B:00000000000007C00820080007C00020082007C000000FE000000FE000000000 +A35C:000003800440000011101110092007C00110011007C009201110111000000000 +A35D:000000000000000011101110092007C00110011007C009201110111000000000 +A35E:0000000000000E100990087000000E100990087000000E100990087000000000 +A35F:0000038004400000038002601218120013E01200120012180260038000000000 +A360:0000000000000000038002601218120013E01200120012180260038000000000 +A361:00000000000000000180016001000FE009200540038003800540092000000000 +A362:000003800440000001800160010007C0092007C0010007C00920092000000000 +A363:000000000000000001800160010007C0092007C0010007C00920092000000000 +A364:0000000000000100038005400440054003800100038005400920092000000000 +A365:000000000000000030C02CA8239820882480248020803F802080208000000000 +A366:00000380044000000C300A280820282018A00C600A20082028A0186000000000 +A367:00000000000000000C300A280820282018A00C600A20082028A0186000000000 +A368:000000000000000000002230125008900510021C051008901250223000000000 +A369:000000000000000018181514111210101FF01010111091105050303000000000 +A36A:03800440000018081608118810E81098008018881688118810E8109800000000 +A36B:00000000000018081608118810E81098008018881688118810E8109800000000 +A36C:00000000000000000C300B2C082008200FE008200820082069A0186000000000 +A36D:00000000000000001FF011100920054013901110139005400920111000000000 +A36E:00000380044000001FF011100920054003801FF0028004400920111000000000 +A36F:00000000000000001FF011100920054003801FF0028004400920111000000000 +A370:00000000000000001FF01110092005403B8827C822B804400920111000000000 +A371:00000380044000000E001128112815F8152815F81528112811000E0000000000 +A372:00000000000000000E001128112815F8152815F81528112811000E0000000000 +A373:0000000000000000072008A008800AF00A800A800AF0088008A0072000000000 +A374:00000380044000000C040B34082C082008203E200820082C6834180400000000 +A375:00000000000000000C040B34082C082008203E200820082C6834180400000000 +A376:000000001C1001C805A8059801800E8000800FF8008018800680018000000000 +A377:000003800440000018081608118810E81098008001C00220022001C000000000 +A378:000000000000000018081608118810E81098008001C00220022001C000000000 +A379:000000000000000005500550011007D00110055004500C100390007000000000 +A37A:0380044000001C0803880B680B1803001D0001001FF001001FF0010000000000 +A37B:0000000000001C0803880B680B1803001D0001001FF001001FF0010000000000 +A37C:0000038004400000033012E812243A2012201220022002201A20062000000000 +A37D:0000000000000000033012E812243A2012201220022002201A20062000000000 +A37E:0000038004400000010001200920150015F01500092001200D00030000000000 +A37F:0000000000000000010001200920150015F01500092001200D00030000000000 +A380:0000000000000000014811481130110011F80100013031480D48030000000000 +A381:00000380044000000380044007C008200FE0082008200920092006C000000000 +A382:00000000000000000380044007C008200FE0082008200920092006C000000000 +A383:00000000000007C008201010045004500110011000100E100990086000000000 +A384:0000000000000000000801880168011801003FF8010011007D00110000000000 +A385:00000380044000000FC00020002000200FE000200020002000200FC000000000 +A386:00000000000000000FC00020002000200FE000200020002000200FC000000000 +A387:000000000000000018081608118810E81098008003E008800880070000000000 +A388:0000000000000000181014101210101011101110101010901050103000000000 +A389:0000038004400000082014501450145008200540028002800280010000000000 +A38A:0000000000000000082014501450145008200540028002800280010000000000 +A38B:000000000000000036D808201450145014503FF814501450082036D800000000 +A38C:0000038004400000018000400620082009200920082006200040018000000000 +A38D:0000000000000000018000400620082009200920082006200040018000000000 +A38E:0000000000000000008000A800A800A800F800A818A816A81180100000000000 +A38F:00000380044000000040004000400040004000500C500B5008D0080000000000 +A390:00000000000000000040004000400040004000500C500B5008D0080000000000 +A391:000000000000000000C007A00890088004A003A004A008800880078000000000 +A392:0000038004400000080809881D6809180900010007C009201110111000000000 +A393:0000000000000000080809881D6809180900010007C009201110111000000000 +A394:00000000000007C008201110111010101FF0101011101110082007C000000000 +A395:000003800440000003801450145004400FE00440145014500440038000000000 +A396:000000000000000003801450145004400FE00440145014500440038000000000 +A397:0000000000000000024002500260024002400240024006400A40024000000000 +A398:000003800440000003C004200910011007D0011001100E100990086000000000 +A399:000000000000000003C004200910011007D0011001100E100990086000000000 +A39A:000000000220022003E006300A3001D00010001000100E100990086000000000 +A39B:0000000000000000000801880168011801001FF0010009200920010000000000 +A39C:000003800440000004040434042C0420042007E0042034202C20202000000000 +A39D:000000000000000004040434042C0420042007E0042034202C20202000000000 +A39E:000000000000000000C000A00090008007B008C010F010C008B0078000000000 +A39F:0000000000000000070008800BA00AE0088008800BA00AE00880070000000000 +A3A0:000003800440100028C02FB0288C10800080108028802F802880108000000000 +A3A1:000000000000100028C02FB0288C10800080108028802F802880108000000000 +A3A2:000000000000082008200440139011107D7C111011100D000B00080000000000 +A3A3:00000380044000000FE01010101010100FE001000100110011000E0000000000 +A3A4:00000000000000000FE01010101010100FE001000100110011000E0000000000 +A3A5:000000000000000009300550039003900550093001000D000B00080000000000 +A3A6:00000380044000000810081008100FF008100A100C1018102810081000000000 +A3A7:00000000000000000810081008100FF008100A100C1018102810081000000000 +A3A8:00000000000000000080088008800F80088008800080008000800FF800000000 +A3A9:0000038004400000030002C00200020003E00210024802A81AA0064000000000 +A3AA:0000000000000000030002C00200020003E00210024802A81AA0064000000000 +A3AB:0000000000000000000010180828044802880108028804480828101800000000 +A3AC:0000038004400000018001602918290029003F00290029002900010000000000 +A3AD:0000000000000000018001602918290029003F00290029002900010000000000 +A3AE:0000000000000000093009280FE40920092009200FE049202920192000000000 +A3AF:00000380044000000FE001000FE0010009200540038003800540092000000000 +A3B0:00000000000000000FE001000FE0010009200540038003800540092000000000 +A3B1:000000000000000018081608118810E81098008002A001C001C002A000000000 +A3B2:000000000000000009C01130110009200720092011201100093001C000000000 +A3B3:0380044000000540054004401390111011100EE0054005400440038000000000 +A3B4:0000000000000540054004401390111011100EE0054005400440038000000000 +A3B5:00000000000000000000190C251422241D4400841D4422242514190C00000000 +A3B6:0000000000000000008002A002A002A01880168011C012200490049000000000 +A3B7:000003800440100011801F601118114001401950171011D01130010000000000 +A3B8:000000000000100011801F601118114001401950171011D01130010000000000 +A3B9:0000000000001C0003800B600B1803401D4001401910171011D0113000000000 +A3BA:0000000000000000010009200540038009200540038009200540038000000000 +A3BB:0000038004400000012801280128012801280128013031E00D20032000000000 +A3BC:0000000000000000012801280128012801280128013031E00D20032000000000 +A3BD:000000000000000007E008100810081007E00080068009000680008000000000 +A3BE:000003800440000007900860086007A00020002007A008600860079000000000 +A3BF:000000000000000007900860086007A00020002007A008600860079000000000 +A3C0:0000000000000000022002201A28162813A81268123802200220022000000000 +A3C1:000003800440000003E004000400020001E0020004000400040003E000000000 +A3C2:000000000000000003E004000400020001E0020004000400040003E000000000 +A3C3:0000000000000490049002A001C0008000801880168011801000100000000000 +A3C4:000003800440100011E012000400140017E0140004001400120011E000000000 +A3C5:000000000000080008F0090002000A000BF00A0002000A00090008F000000000 +A3C6:000000000000018001600118010007C00920111017D011101110010000000000 +A3C7:00000380044000000E0011481148113011F811301148114811000E0000000000 +A3C8:00000000000000000E0011481148113011F811301148114811000E0000000000 +A3C9:00000000000000000760088009800A800A800A800A8009800880076000000000 +A3CA:00000380044000000C200A20082009200AA00AA00920082008A0086000000000 +A3CB:00000000000000000C200A20082009200AA00AA00920082008A0086000000000 +A3CC:000000000000000010001210112010C01FF010C0112012101000100000000000 +A3CD:0000000000000440028001002288145008201450228801000280044000000000 +A3CE:00000380044000000700088009C00AA00AA00AA00AA009C00880070000000000 +A3CF:00000000000000000700088009C00AA00AA00AA00AA009C00880070000000000 +A3D0:000000000000000000000440044012902AA829282AA812900440044000000000 +A3D1:0000038004400000038004400440038009300550039003900550093000000000 +A3D2:0000000000000000038004400440038009300550039003900550093000000000 +A3D3:000000000000000001E00210021012D00B5006500B5012D0021001E000000000 +A3D4:000000000920054003800380054009200540054001000FE001000FE000000000 +A3D5:000003800440000007C031102D10231021D02130010005400540010000000000 +A3D6:000000000000000003E018881688118810E81098008002A002A0008000000000 +A3D7:00000000000000001E00010009300550039003900550093001001E0000000000 +A3D8:0000038004400000092005400380038005400920010005400540010000000000 +A3D9:0000000000000000092005400380038005400920010005400540010000000000 +A3DA:000000000000000002480248015000E0034002C007000A801240124000000000 +A3DB:0000038004400000062005A004600400052007F00520052007F0052000000000 +A3DC:0000000000000000062005A004600400052007F00520052007F0052000000000 +A3DD:000000000000000000300028262415200CA03FA00620052004A0006000000000 +A3DE:0000038004400000007818800480027802800280027804801880007800000000 +A3DF:0000000000000000007818800480027802800280027804801880007800000000 +A3E0:000000000000000007C0082001000D200B2009A009600100082007C000000000 +A3E1:00000380044000000100010031102C10231020D0203001000100010000000000 +A3E2:0000000000000000008000801888160811881068101800800080008000000000 +A3E3:000000001FF8002000A000A0062005A0046004000480048004001FF800000000 +A3E4:000000000000073004E8042435A00C60042035A00C60042035A00C6000000000 +A3E5:000003800440000008040934092C08200FE00820092069205820402000000000 +A3E6:000000000000000008040934092C08200FE00820092069205820402000000000 +A3E7:00000000000000000EF0010002800FE0028002800FE0028001000EF000000000 +A3E8:00000000101017D0082017D0101011101110101017D0082017D0101000000000 +A3E9:0000038004400000044004401390111011100EE0000001000100010000000000 +A3EA:0000000000000000044004401390111011100EE0000001000100010000000000 +A3EB:00000000000000000F801058136012C0124012401A40166010580F8000000000 +A3EC:00000000000000001110111011100EE000000100010007C00100010000000000 +A3ED:00000380044000001110111011100EE000000100010009000900060000000000 +A3EE:00000000000000001110111011100EE000000100010009000900060000000000 +A3EF:000000000000044004400380111011100EE000000100110011000E0000000000 +A3F0:00000000000007C0082011901150111017D0111015101310082007C000000000 +A3F1:000003800440000001E00200044004A004A004A004A00440020001E000000000 +A3F2:000000000000000001E00200044004A004A004A004A00440020001E000000000 +A3F3:000000000000000003D0043009100A800A800A800A800910042003C000000000 +A3F4:000003800440000010101190115011101110111015101310082007C000000000 +A3F5:000000000000000010101190115011101110111015101310082007C000000000 +A3F6:00000000000000000180016009181100110017C0110011000900010000000000 +A3F7:00000380044000000380026002000A000A000A000A000A000260038000000000 +A3F8:00000000000000000380026002000A000A000A000A000A000260038000000000 +A3F9:0000000000000E0009C00800088008800BE008800880080009C00E0000000000 +A3FA:0000038004400000000801880968111811001700110011000900010000000000 +A3FB:0000000000000000000801880968111811001700110011000900010000000000 +A3FC:0000000000000000003000280024102023E024201CA024A0242013E000000000 +A3FD:000000000380044000000440044002800AA009200AA002800440044000000000 +A3FE:000000000000000000000440044002800AA009200AA002800440044000000000 +A3FF:000000000000000007C00820101010101110111010101010082007C000000000 +A400:000000000000000000003F8020A411240A1807F80A18112420A43F8000000000 +A401:00000380044000000400048804880450042007F80420245014880C8800000000 +A402:00000000000000000400048804880450042007F80420245014880C8800000000 +A403:000000000000000000001100114811480A3007F80A3011481148110000000000 +A404:000000000000000003F00410041003F0001003F000100BF0081007E000000000 +A405:000003800440000010101010101011F010101F101010101011F0101000000000 +A406:000000000000000010101010101011F010101F101010101011F0101000000000 +A407:00000000000000001010101011F010101F10101011F01010082007C000000000 +A408:0000000000000000010011001100111001100110111011001100010000000000 +A409:00000380044000000E00190015001120115017D01150152019000E0000000000 +A40A:00000000000000000E00190015001120115017D01150152019000E0000000000 +A40B:000000000000000007C00920111010101010101012901450082007C000000000 +A40C:00000000000000000700088008F0088008F0088008F008800880070000000000 +A40D:000003800440000007C00820101010101010101010101110092007C000000000 +A40E:000000000000000007C00820101010101010101010101110092007C000000000 +A40F:000000000000000000100810101010900E90109010100B1000D0003000000000 +A410:000003800440000007C008201010101010101010101012900AA007C000000000 +A411:000000000000000007C008201010101010101010101012900AA007C000000000 +A412:0000000000000000010011180928054803880388054809281118010000000000 +A413:0000038004400000082008200440038001000D000B0008000800080000000000 +A414:0000000000000000082008200440038001000D000B0008000800080000000000 +A415:00000000000009200AA009200440038001000D000B0008000800080000000000 +A416:0380044000001830145013901390155019300100092005400380054009200000 +A417:0000000018301450139013901550193001000920054003800540092000000000 +A418:0000000000000000082008200440038009200920038004400820082000000000 +A419:0000038004400000044004401FF004400440044004401FF00440044000000000 +A41A:0000000000000000044004401FF004400440044004401FF00440044000000000 +A41B:000000000000180004C01FA00490188000800F801080108010800F8000000000 +A41C:00000000000000000820082004400380010005400540110011000E0000000000 +A41D:0000038004400000183024480440044003800FE0010001000900060000000000 +A41E:0000000000000000183024480440044003800FE0010001000900060000000000 +A41F:0000000000000000092009200440038001000920092009200100010000000000 +A420:0380044000001830044012901290129004401830038004400920092000000000 +A421:0000000000001830044012901290129004401830038004400920092000000000 +A422:000000000000000002080208011008E01400140008E001100208020800000000 +A423:00000000000000000C040AC409B41C8C2A802A8008801C802A802A8000000000 +A424:000003800440000018C016B0118C10807C8010807C8010801080108000000000 +A425:000000000000000018C016B0118C10807C8010807C8010801080108000000000 +A426:0000000000001830044002800280028004401830038004400820082000000000 +A427:00000000000000000FE01010101010100FE0010007000800082007C000000000 +A428:038004400000001007F008800FF0088007F0010001C002A00490049000000000 +A429:000000000000001007F008800FF0088007F0008001C002A00490049000000000 +A42A:0000000000000000000007C0082009200920044009200920082007C000000000 +A42B:0000038004400000008007F00880088007F0008001C002A00490049000000000 +A42C:0000000000000000008007F00880088007F0008001C002A00490049000000000 +A42D:00000000000000003808260821C82538050001403948270821C8203800000000 +A42E:00000380044000000EE00440044004400380010007C001000900060000000000 +A42F:00000000000000000EE00440044004400380010007C001000900060000000000 +A430:000000000AC00AA00F900A800A8000800A800A800F800A800A80008000000000 +A431:00000000000000000FF01080108010800FF00080008008800880070000000000 +A432:000003800440000011101110092007C0010001000100110011000E0000000000 +A433:000000000000000011101110092007C0010001000100110011000E0000000000 +A434:0000000000000000202020203FF82024202420382020202010400F8000000000 +A435:00000000000000001110111011100EE0000009200920092000000FE000000000 +A436:03800440000003800440054005401E50155014F0054005400440038000000000 +A437:00000000000003800440054005401E50155014F0054005400440038000000000 +A438:00000000000007C00820082007C001000FE001000540155010100FE000000000 +A439:0000038004400000066005D00440044007C004400000111011100EE000000000 +A43A:0000000000000000066005D00440044007C004400000111011100EE000000000 +A43B:0000000000000000000060305054489445104214451448905054603400000000 +A43C:000000000380044000006030505448924512421C451248925054603000000000 +A43D:000000000000000000006030505448924512421C451248925054603000000000 +A43E:00000000000000000EE00100028002800EA00BA00AE0028001000EE000000000 +A43F:03800440000001E0020004400440040007E0040004400440020001E000000000 +A440:00000000000001E0020004400440040007E0040004400440020001E000000000 +A441:000000000000000003C00400082008100F90081008200800040003C000000000 +A442:000003800440000000600058004003F8184020404C404B4008C0080000000000 +A443:00000000000000000030002C002001FC0C201020262025A00460040000000000 +A444:00000000000000000F2010D010501020080006000100008010800F0000000000 +A445:038004400000049002A001C001C002A004900080188016801180100000000000 +A446:000000000000049002A001C001C002A004900080188016801180100000000000 +A447:0000000000000000082008200180014001200100010009000500030000000000 +A448:03800440000002C01AA0069002801A8006800080188016801180100000000000 +A449:00000000000002C01AA0069002801A8006800080188016801180100000000000 +A44A:000000000000111011100FE001000FE01110111001000D000B00080000000000 +A44B:000003800440000001800160011801001FF001001FF001001FF0010000000000 +A44C:000000000000000001800160011801001FF001001FF001001FF0010000000000 +A44D:00000000000000000C000B0008C0080008400840084008400800080000000000 +A44E:0000000000000000600612480A50099008100FF0081009901248624600000000 +A44F:0000038004400000088608880890081008100FF0081049902A481A4600000000 +A450:0000000000000000088608880890081008100FF0081049902A481A4600000000 +A451:0000000000000000610C11100920082008200FE0082009201110610C00000000 +A452:03800440000003800440092009200440038000000FF00060018006000FF00000 +A453:0000000003800440092009200440038000000FF00060018006000FF000000000 +A454:00000000082028282448238810100FE0210821083FF821082108010000000000 +A455:0000000000000000311809200540054005400540054005400920311800000000 +A456:00000380044000000D200BA0096001000D200BA0096001001900070000000000 +A457:00000180016001000D200BA0096001000D200BA0096001001900070000000000 +A458:000000000000000003800440044008200820082008200920092006C000000000 +A459:000000000000000007C00820111011101FF0111011101010082007C000000000 +A45A:0000038004400000088008800E8009C008B00880089008900890088000000000 +A45B:0000000000000000088008800E8009C008B00880089008900890088000000000 +A45C:0000000000000000008007F008800880088007F0008000900090009000000000 +A45D:00000000000000001110111011100EE000000440028001000280044000000000 +A45E:00000000038004400000110811080A080A0804680A580A401140114000000000 +A45F:00000000000000000000110811080A080A0804680A580A401140114000000000 +A460:00000000000006200920062000200620092006200020062001A0006000000000 +A461:00000000000000001110111011100EE004400540038001000900060000000000 +A462:00000380044000001110111011100EE004400440044015401540088000000000 +A463:00000000000000001110111011100EE004400440044015401540088000000000 +A464:000000000000000000002208220814681458084014E0144022E0224000000000 +A465:00000380044000000920092004400380044008200FE008200440038000000000 +A466:00000000000000000920092004400380044008200FE008200440038000000000 +A467:000000000000111011100EE0000004400380000014501390082007C000000000 +A468:00000380044000000660055004C804400E40154015400E400440044000000000 +A469:00000000000000000660055004C804400E40154015400E400440044000000000 +A46A:00000000000000001860165811C6104096405A4032405A409640104000000000 +A46B:000000000000000004400440038001000D200BA00960010001000FE000000000 +A46C:00000380044000000100010031102D10231021D0213001000100010000000000 +A46D:00000000000000000080008018881688118810E8109800800080008000000000 +A46E:00000000000000000220022001C018881688118810E810980080008000000000 +A46F:0000038004400000111011101110092007C031102D10231021D0213000000000 +A470:0000000000000000088808880888049003E018881688118810E8109800000000 +A471:0000000000000000000800C800A8009800801F8024803F8024801F8000000000 +A472:000003800440000028F029083A04280428040004000403840264021800000000 +A473:000000000000000028F029083A04280428040004000403840264021800000000 +A474:0000000000000180016001000920054003800540092001000D00030000000000 +A475:0000000000000000000400640054004C0FC038E01540154038E007C000000000 +A476:00000380044000000010031002D0023002001FC002001FC00200020000000000 +A477:00000000000000000010031002D0023002001FC002001FC00200020000000000 +A478:000001C00130010007C00920155013901550092007C001001900070000000000 +A479:000000000000000012C012B00C8000C00CB0128012C000B00680018000000000 +A47A:00000380044000000CC012B012801E80128012E00C9000900690018000000000 +A47B:00000000000000000CC012B012801E80128012E00C9000900690018000000000 +A47C:00000000000002000FA0022000200FA0106010001F00102010400F8000000000 +A47D:00000000000000000CC012B012800080128012800C8000800680018000000000 +A47E:000003800440000003D00430081008000F80080008000810042003C000000000 +A47F:000000000000000003D00430081008000F80080008000810042003C000000000 +A480:000000000000000008200820044003800120014001800110011000E000000000 +A481:000000000180016001000D200BA00960010007C001000D000B00080000000000 +A482:0380044000001110111017D011101110082007C00100111011100EE000000000 +A483:0000000000001110111017D011101110082007C00100111011100EE000000000 +A484:00000000000000000020092009200FE0092009200020062001A0006000000000 +A485:0380044000000180016001000D200BA00960010007C001000D00030000000000 +A486:0000000000000180016001000D200BA00960010007C001000D00030000000000 +A487:000000000000092009200440038000000FE00000038004400920092000000000 +A488:00000380044000000040004003C0044008400840044003C00040004000000000 +A489:00000000000000000040004003C0044008400840044003C00040004000000000 +A48A:000000000000000000F00700090010801070108009000700010000F000000000 +A48B:038004400000393805400540393801001FF00100393805400540393800000000 +A48C:000000000000393805400540393801001FF00100393805400540393800000000 +A48D:00007FFE61B66DB661866DF66DF67FFE7FFE738E6DB673B66DB6738E7FFE0000 +A48E:00007FFE61B66DB661866DF66DF67FFE7FFE73866DBE738E6DBE73867FFE0000 +A48F:00007FFE61B66DB661866DF66DF67FFE7FFE73866DBE738E6DBE73BE7FFE0000 +A490:0000000000000000010001000100010001000100010001000100010000000000 +A491:000000000000000000400040004000400040004000400C40034000C000000000 +A492:0000000000000000040004000400040004000400040004600580060000000000 +A493:0000000000000000060005800460040004000400040004000400040000000000 +A494:0000000000000000018001600100010001000100010001000D00030000000000 +A495:00000000000000000020062005A0046004000400040004000400040000000000 +A496:00000000000000000040004000400040004000400C400B4008C0080000000000 +A497:000000000000000001800160011801000100010031002D002300200000000000 +A498:000000000000000000C800A80098008000800080008018800680018000000000 +A499:0000000000000000180816081188106810180000000000000000000000000000 +A49A:000000000000000003C00420040004000200018000400020042003C000000000 +A49B:0000000000000000004000400040034002C00200020002000200020000000000 +A49C:000000000000000003C00420081000100010001000100E100990086000000000 +A49D:000000000000000003D00430081008000800080008000810042003C000000000 +A49E:00000000000000000E2009A008600800080008000800086009A00E2000000000 +A49F:000000000000000001E00200040004000400040004000400020001E000000000 +A4A0:00000000000000000FC0002000200020002000200020002000200FC000000000 +A4A1:0000000000000000082008200440038000000000000000000000000000000000 +A4A2:0000000000000000000000000000000000000000038004400820082000000000 +A4A3:0000000000000000180806080188006800180000000000000000000000000000 +A4A4:000000000000000010101010101010101010101010101010082007C000000000 +A4A5:0000000000000000086008800880088008800880088008800880070000000000 +A4A6:0000000000000000183024480440044004400440044004400440038000000000 +A4A7:000000000000000003800440044008200820082008200920092006C000000000 +A4A8:000000000000000007C00820101010101010101010101010082007C000000000 +A4A9:0000000000000000038004400440044004400440044004400440038000000000 +A4AA:00000000000000000FE01010101010100FE00000000000000000000000000000 +A4AB:000000000000000001000280044008200FE00000000000000000000000000000 +A4AC:000000000000000000C000A00090008007800880108010800880078000000000 +A4AD:000000000000000000C000A00090008007C008A0109010800880078000000000 +A4AE:0000000000000000000800C800A8009807800880108010800880078000000000 +A4AF:0000000000000000002000200020002001E0022004200420022001E000000000 +A4B0:000000000000000003C004000400020001C0020004000400040003C000000000 +A4B1:0000000000000000078000400040008007000080004000400040078000000000 +A4B2:000000000000000003E00400040003E00400040003E00400040003E000000000 +A4B3:00000000000000001110111011100EE000000000000000000000000000000000 +A4B4:0000000000000000444444444C64345804400440038000000000000000000000 +A4B5:00000000000000001C7008200820044003800000000000000000000000000000 +A4B6:00000000000000004444444444443BB800000000000000000000000000000000 +A4B7:0000000000000000183024480440044003800000000000000000000000000000 +A4B8:00000000000000000710089008A007C000800080008000800C80030000000000 +A4B9:00000000000000000E20112011400F800100010001000120012000C000000000 +A4BA:000000000000000007900860086007A00020002007A008600860079000000000 +A4BB:000000000000000000200020002000200020022005200520032004C000000000 +A4BC:0000000000000000000004400440028002800100028002800440044000000000 +A4BD:00000000000000000C6002800100028002800440044008200820082000000000 +A4BE:0000000000000FE00820044002800280010002800280044008200FE000000000 +A4BF:0000000000000000000030182828244822882108228824482828301800000000 +A4C0:0000000000000000000010180828044802880108028804480828101800000000 +A4C1:0000000000000000000030182828244802880108028804480828101800000000 +A4C2:00000000000000000000190C251422241D4400841D4422242514190C00000000 +A4C3:0000000000000FE0082004400440028002800100028002800440044000000000 +A4C4:00000000000000000FE001000100010001000100010001000100010000000000 +A4C5:00000000000000001FC002200210020002000200020002000200020000000000 +A4C6:0000000000000000000004400440044000000000000000000000000000000000 +A4C7:00007FFE61B66DB661866DF66DF67FFE7FFE71866FF66FEE6FDE71DE7FFE0000 +A4C8:00007FFE61B66DB661866DF66DF67FFE7FFE71CE6FB66FCE6FB671CE7FFE0000 +A4C9:00007FFE61B66DB661866DF66DF67FFE7FFE71CE6FB66FC66FF671CE7FFE0000 +A4CA:00007FFE61B66DB661866DF66DF67FFE7FFE71866FB66F866FB671B67FFE0000 +A4CB:00007FFE61B66DB661866DF66DF67FFE7FFE718E6FB66F8E6FB6718E7FFE0000 +A4CC:00007FFE61B66DB661866DF66DF67FFE7FFE71C66FBE6FBE6FBE71C67FFE0000 +A4CD:00007FFE61B66DB661866DF66DF67FFE7FFE718E6FB66FB66FB6718E7FFE0000 +A4CE:00007FFE61B66DB661866DF66DF67FFE7FFE71866FBE6F8E6FBE71867FFE0000 +A4CF:00007FFE61B66DB661866DF66DF67FFE7FFE71866FBE6F8E6FBE71BE7FFE0000 +A4D0:000000007C4242427C424242427C0000 +A4D1:000000007C4242427C40404040400000 +A4D2:0000000002020202023E4242423E0000 +A4D3:00000000784442424242424244780000 +A4D4:000000007F0808080808080808080000 +A4D5:000000000808080808080808087F0000 +A4D6:000000003C424240404E4242463A0000 +A4D7:00000000424448506060504844420000 +A4D8:000000004222120A06060A1222420000 +A4D9:00000000040404040404044444380000 +A4DA:000000003C42424040404042423C0000 +A4DB:000000003C42420202020242423C0000 +A4DC:000000007E02020408102040407E0000 +A4DD:000000007E4040407C40404040400000 +A4DE:0000000002020202023E0202027E0000 +A4DF:00000000424266665A5A424242420000 +A4E0:0000000042626252524A4A4646420000 +A4E1:000000004040404040404040407E0000 +A4E2:000000003C424240300C0242423C0000 +A4E3:000000007C4242427C48444442420000 +A4E4:0000000042422222123E4242423E0000 +A4E5:00000000080814142222224141410000 +A4E6:00000000414141222222141408080000 +A4E7:00000000424242427E42424242420000 +A4E8:000000005C62424272020242423C0000 +A4E9:00000000384444404040404040400000 +A4EA:00000000424242425A5A666642420000 +A4EB:00000000424224241818242442420000 +A4EC:00000000414122221408080808080000 +A4ED:000000003E424242423E4242423E0000 +A4EE:0000000018242442427E424242420000 +A4EF:00000000424242427E42422424180000 +A4F0:000000007E4040407C404040407E0000 +A4F1:000000007E0202023E020202027E0000 +A4F2:00000000080808080808080808080000 +A4F3:000000003C42424242424242423C0000 +A4F4:000000004242424242424242423C0000 +A4F5:000000003C4242424242424242420000 +A4F6:000000007E0202020202020202020000 +A4F7:000000001E22424242424242221E0000 +A4F8:00000000000000000000000018180000 +A4F9:00000000000000000000000018080810 +A4FA:00000000000000000000000066660000 +A4FB:00000000000000000000000066620204 +A4FC:00000000000018180000001808081000 +A4FD:00000000000018180000001818000000 +A4FE:00000000000000000070000006060000 +A4FF:000000000000007E0000007E00000000 +A500:0000000000000FE00100010001001930254825481930010001000FE000000000 +A501:0000000000000FE001000FE0010019302548193001000FE001000FE000000000 +A502:000000000000242024401A800100010002000200022001480090016000000000 +A503:0000000000003E0008000800046003A0012001E000200020002000F800000000 +A504:0000000000003E0008003E00046003A0012001E0002000F8002000F800000000 +A505:0000000000003838444447C44544393801000380044004400440038000000000 +A506:0000000000000380044004400440139001003938454447C44444383800000000 +A507:00000000000004200860086004A003200020002000200020002000F800000000 +A508:00000000000004200860086004A003200020002000A80020002000F800000000 +A509:0000000000001FF0010001000540010001000100010001000100010000000000 +A50A:0000000000001FF0010001000540010001000FE0010001000100010000000000 +A50B:0000000000001FF0010001000100010001000100010001000100010000000000 +A50C:000000000000038004400440044003800100010001000100010007C000000000 +A50D:0000000000000380044004400440038001000100010007C0010007C000000000 +A50E:000000000000124012400DC00040004000400078004000400040007800000000 +A50F:000000000000124012400DF80040004000400078004000400040007800000000 +A510:00000000000049004900370001000150015403A8050009000900060000000000 +A511:00000000000049004900372001000150015403A8050009200900060000000000 +A512:000000000000124012400DC00040004000480078004800400040004000000000 +A513:000000000000124012400DC0004000480078004800400040071008E000000000 +A514:00000000000006180A2812482288020802080208020802080208020800000000 +A515:0000000000001F800080008000800080008007F8088808880888070800000000 +A516:0000000000000920092009200920092009200920092009200920092000000000 +A517:00000000000009200920092009200920092009200920092000000FE000000000 +A518:0000000000001010101010100000010001000100000010101010101000000000 +A519:00000000000010101FF010100000010001000100000010101FF0101000000000 +A51A:000000000000000000001C703EF83EF83EF83EF83EF81C70482437D800000000 +A51B:000000000000000000001C70228822882288228822881450482437D800000000 +A51C:00000000000000002000204020003FE020083FE0200020402000000000000000 +A51D:000000000000000020002000204020003FE82000204020002000000000000000 +A51E:000000000000A00AA00AA00AA44AAAAAAAAAAAAAA44AFBBEA00AA00A00000000 +A51F:0000000000002008200820082C68329821082288228822882108200800000000 +A520:000000000000042004200420042004203FFC0420042004200420042000000000 +A521:000000000000062009600A6004A0032000200020002000200020007800000000 +A522:0000000000000810142822440990024002400240024002400240018000000000 +A523:000000000000082000001C70228822882288228822881450482437D800000000 +A524:000000000000124012400DC0004000480078004800400040004001F000000000 +A525:000000000000124012400DC000500044007C004400500040004001F000000000 +A526:000000000000124012400DC00040044407FC044400400040004001F000000000 +A527:000000000000000003800440004001800240024001800200022001C000000000 +A528:000000000000124012400DC00040124012400DC0007000C80548023001000000 +A529:000000000000124012400DC00040124012400DC0007000CA0532020C01000000 +A52A:0000000000000E000F800FE00F800E000C000E000F800FE00F800E0000000000 +A52B:000000000000308C49523E3C0410041004100410041004100808100400000000 +A52C:0000000000000E001100110011100A100FF00A101110110011000E0000000000 +A52D:0000000000000E001100110011500A100FF00A101150110011000E0000000000 +A52E:00000000000003800D6011101390244824482388145018300C60038000000000 +A52F:0000000000003FF801000100054001000FE00100054001000100010000000000 +A530:000000000000010001000100054001003FF80100054001000100010000000000 +A531:0000000000001110111011101EE01000100010001110111011100EE000000000 +A532:00000000000000C00100111011101EE01000111011100EE00080030000000000 +A533:000000000000121012200DC00080008001100100012401040088007000000000 +A534:000000000000121012200DC00088008001100100012401040088007000000000 +A535:00000000000008000800080009E00A500C900860080008000800080000000000 +A536:00000000000008000A00080009E00A500C9008600A0008000800080000000000 +A537:00000000000000000000018003C007E007E003C0018000000000000000000000 +A538:00000000000000000000018003C007E007E003C001800000071008E000000000 +A539:00000000000000000000018003C007E017E803C0018000000000000000000000 +A53A:00000000000001000200010044A245223BDC0100008001000200010000000000 +A53B:0000000000001C0022002200222814281FE814282228220022001C0000000000 +A53C:0000000000001C002200220022A814281FE8142822A8220022001C0000000000 +A53D:0000000000000060018006000180186024101860018006000180006000000000 +A53E:0000000000000060018006000180186024141860018006000180006000000000 +A53F:00000000000003E004000FC008000800080009800A400C400440038000000000 +A540:00000000000000000000000004404C6433980000000000000000000000000000 +A541:0000000000000000000004400000000004404C64339800000000000000000000 +A542:00000000000000000100000004404C6433980000000001000000000000000000 +A543:00000000000001000200040004000800080009C00A200C20042003C000000000 +A544:00000000000001000200040004000800080009C00A200CA0042003C000000000 +A545:000000000000248024801B80008000A8008801F8028804A80480030000000000 +A546:0000000000000738084010801080210021002100108010800840073800000000 +A547:00000000000007E0001007E00400043005D00610001003F0040003F000000000 +A548:00000000000000800080008000800080008007F8088808880888070800000000 +A549:0000000000000380044004400440038001000540010005400100010000000000 +A54A:00000000000000000380044004400440044004402288210812900C6000000000 +A54B:00000000000000000380044004400444044004402288210812900C6400000000 +A54C:000000000000442244224E7235AC042004200420042004200420042000000000 +A54D:00000000000000000100444444444EE437D80440044005400440044000000000 +A54E:000000000000121012200DC00080008001000100010401040088007000000000 +A54F:000000000000248024801B8000800080008000B000C8008000B000C800000000 +A550:000000000000222022201DE00020002000A80020002000200020002000000000 +A551:000000000000380E44104220424032400FF0024C024204420822701C00000000 +A552:0000000000003FE020202020203C202422242024203C202020203FE000000000 +A553:00000000000000003FF02088208824B0208020803FF000080008003000000000 +A554:00000000000001000100028002800440044008200820101010101FF000000000 +A555:0000000003800C6018301450228821082288145018300C600380000000000000 +A556:00000000000001000100028012900440044008200820101010101FF000000000 +A557:0000000000000FC008200810081008200FC008200810081008200FC000000000 +A558:00000000000003C00420082001C001000100010001C00820042003C000000000 +A559:00000000000010F011081208107010401FC0104010701208110810F000000000 +A55A:0000000000001110111013900D60010001000100010001000100010000000000 +A55B:00000000000017D0111013900D6001000100010001000100010007C000000000 +A55C:0000000000000008010800081108110812980C68000801080008000800000000 +A55D:00000000000000140214001422142214253418D4001402140014001400000000 +A55E:0000000000000A000A000A000BF00A000A000BF00A000A000A000A0000000000 +A55F:0000000000000A000A000A000BF00A000A000BF00A000200071008E000000000 +A560:0000000000000030000800083FF02220222022202220222022203FE000000000 +A561:0000000000000030008800083FF02220222422202220222022203FE000000000 +A562:0000000000000EE01110111011100FE003800440044004400380000000000000 +A563:0000000000000EE01110111011100FE003800440044014500380000000000000 +A564:000000000000000000000EE0111011100FE0111011100EE00000000000000000 +A565:000000000000010000000EE0111011104FE4111011100EE00000010000000000 +A566:000000000000003001C006401880010007001930014801880088007000000000 +A567:0000000000001FF0038003800540054009200920111011102108210800000000 +A568:0000000000000EE0111011101FF0038005400540092009201110111000000000 +A569:000000000000121012200DC00080488049003700010401040088007000000000 +A56A:00000000000004000800086004A0032000200020002000200020002000000000 +A56B:0000000000000E00110011000100010002000C3810443FC40044003800000000 +A56C:0000000000001FF022882288228822881FF022882288228822881FF000000000 +A56D:000000000000442244224E7235AC042004200420442244224A52318C00000000 +A56E:0000000000003018482444443FF8044004400440044008200820101000000000 +A56F:0000000000000FE00100010001000100010001000100010001000FE000000000 +A570:000000000000444044403BC000400040007C0044004400440044007C00000000 +A571:00000000000010001F8010800080008800F8008800800080008001C000000000 +A572:00000000000010001F80108000A0008800F8008800A00080008001C000000000 +A573:00000000000010001F801080008008880FF8088800800080008001C000000000 +A574:0000000000001C0008000800080008080FF8008800800080008001C000000000 +A575:0000000000001C0008000800082008080FF8008800A00080008001C000000000 +A576:0000000000000390045008300810040003800040002008200C400B8000000000 +A577:0000000000000390045009300810040003800040002009200C400B8000000000 +A578:0000000000000000006001900610186010001200106011901610186000000000 +A579:000000000000000000000000381C7C3E7FFE7C3C381C00000000000000000000 +A57A:0000000000000100028002800440044008200440044002800280010000000000 +A57B:0000000000000100028002800440044028280440044002800280010000000000 +A57C:000000000000002000200FE0082008200820082008200FE00020002000000000 +A57D:0000000000002108210823881D70010001000FE0010001000100010000000000 +A57E:0000000000002108210823881D70010001000FE001000FE00100010000000000 +A57F:00000000000000E011000200020002001200020002000200110000E000000000 +A580:00000000000000E011000200020002001220020002000200110000E000000000 +A581:000000000000442244224E7235AC0420042004200420042004200E7000000000 +A582:000000000000442244224E7235AC0420042004A00420042004200E7000000000 +A583:000000000000248024801B80009800A800C80188028004800480030000000000 +A584:000000000000248024981BA800C8018802800480048003001C40238000000000 +A585:0000000000000FE001004104410441047FFC41044104410401000FE000000000 +A586:000000000000248024801B800080008000F001A802A804900480030000000000 +A587:000000000000222022202220222022203FE0002000200020002000F800000000 +A588:000000000000222022202220222022203FE00020002000A8002000F800000000 +A589:0000000000000380044004400440028001000280044004400440038000000000 +A58A:0000000000000380044014500440028001000280044014500440038000000000 +A58B:0000000000000100010001000920010001000100092001000100010000000000 +A58C:0000000000000100010001000100010009200100010001000100010000000000 +A58D:0000000000001040104010401040104012481040104010401040104000000000 +A58E:0000000000000400040004000480040004000400048004000400040000000000 +A58F:0000000000003018482444443FF80440044004400440082008201FF000000000 +A590:0000000000003018482444443FF8044004400440082008281FF8000800000000 +A591:0000000000003F800080008007F8008800880088008800880008000800000000 +A592:00000000000000000000010038387C7C7FFC7C7C383801000000000000000000 +A593:0000000000004900490037200100017801840324050809000900060000000000 +A594:0000000000000FE00100010009200100010001000920010001000FE000000000 +A595:0000000000002108210823881D700100010005F4001000100010001000000000 +A596:0000000000004210421047103AE0020002000BE8002000F8002000F800000000 +A597:0000000000004210421047103AE00200020003E000200020002000F800000000 +A598:00000000000003800C6010101390244824482288911292924C64339800000000 +A599:0000000000002108210823881D700100010001F0001000100010001000000000 +A59A:0000000000004210421047103AE00200020003E0002000F8002000F800000000 +A59B:0000000000000420042004203FFC0420042004203FFC04200420042000000000 +A59C:0000000000003838444444444444383800000380044004400440038000000000 +A59D:0000000000000E001100110011000A0007F00A081108111011000E0000000000 +A59E:0000000000000E001100110011400A0007F00A081148111011000E0000000000 +A59F:000000000000100029082B881D700100010001000100010001000FE000000000 +A5A0:000000000000100029082B881D700100010001000540010001000FE000000000 +A5A1:000000000000101029282BA81D700100010001000100010001000FE000000000 +A5A2:0000000000000060008001003938454447C445443938010002000C0000000000 +A5A3:000000000000001800200040385C446247E246623A5C024004801B0000000000 +A5A4:000000000000070008800880088007000240020003E002000240020000000000 +A5A5:0000000000000E001100110011000E0004A0042007E0042004A0040000000000 +A5A6:0000000000001130115011501190119011101310131015101510191000000000 +A5A7:0000000000001130115011501190119051141310131015101510191000000000 +A5A8:000000000000000000001000100010001FF01008100810080030000000000000 +A5A9:0000000000001000100010001FF010081008100800300000071008E000000000 +A5AA:000000000000000000001000120010001FF01008120810080030000000000000 +A5AB:000000000000000000001000100010001FF01008100810480070004000000000 +A5AC:0000000000000C30145004100410041000000080008000800080008000000000 +A5AD:0000000000000C30145004100410041000000080008002A00080008000000000 +A5AE:0000000000000C3014500410041004100000008000800080008003E000000000 +A5AF:0000000000000C30145004100410041000000080008002A0008003E000000000 +A5B0:000000000000000000001100150011001FF01108150811080030000000000000 +A5B1:000000000000000000001100110011001FF01108110811080030000000000000 +A5B2:000000000000000000001500150015001FF01508150815080030000000000000 +A5B3:000000000000000000001400150014001FF01408150814080030000000000000 +A5B4:00000000000003800C6010101010200821082008101010100C60038000000000 +A5B5:000000000000038004400540044003800100010005400100010007C000000000 +A5B6:000000000000038004400540044003800100010001000100010007C000000000 +A5B7:00000000000004000860086004A0032004200420042004200420042000000000 +A5B8:0000000000001FF0111011101110111011F011101110111011101FF000000000 +A5B9:0000000000000820082008200920082008200920082008200440038000000000 +A5BA:000000000000111011101EE01000111011101EE01000111011100EE000000000 +A5BB:0000000000003838044002800280028022900280028002800440383800000000 +A5BC:0000000000003938044002800280028002800280028002800440393800000000 +A5BD:00000000000022301DD022301DD022301DD00010001000100010007C00000000 +A5BE:0000000000007C7C044004400440044007C004400440044004407C7C00000000 +A5BF:000000000000111011100EE00000111011100EE00000111011100EE000000000 +A5C0:00000000000022301DD022301DD022301DD000100010007C0010007C00000000 +A5C1:000000000000000000000000381C442247E246623A5C024004801B0000000000 +A5C2:00000000000000D8012002403A5C466247E246623A5C024004801B0000000000 +A5C3:0000000000000030004800880110020007000F801FC00F800700020000000000 +A5C4:0000000000000030004800880110124007000F801FC00F800700020000000000 +A5C5:000000000000221022301DD00010221022301DD0001000100010007C00000000 +A5C6:000000000000221022301DD00010221022301DD0001000540010007C00000000 +A5C7:0000000000000FE002800280044004400820482430181FF00820044000000000 +A5C8:00000000000007C0000007C001000280044028285FF428281450082000000000 +A5C9:000000000000000003C004200FF0042003C004200420042003C0000000000000 +A5CA:000000000000000003C004200FF0042003C004200FF0042003C0000000000000 +A5CB:0000000000001FF010001000100010001FF010001000100010001FF000000000 +A5CC:000000000000124012400DC000480050006000C0014002400240018000000000 +A5CD:0000000000001FF010001080100010001FF010001080100010001FF000000000 +A5CE:000000000000124012400DC000480050006004C8014002400240018000000000 +A5CF:000000000000000003C004200400040003C004200420042003C0000000000000 +A5D0:00000000000003C004200400040003C00420042003C00000071008E000000000 +A5D1:0000000000000C6012902108228802800280010001000100010007C000000000 +A5D2:0000000000000C6012902108228802800280010001000540010007C000000000 +A5D3:00000000000000E001300230020002E0033002300200020002000F8000000000 +A5D4:00000000000000E001300230020002E00B3402300200020002000F8000000000 +A5D5:00000000000000E001300230020002E00330023002000F8002000F8000000000 +A5D6:00000000000000E001300230020002E00B34023002000F8002000F8000000000 +A5D7:00000000000003E00210021003E00210021003E002000A8002000F8000000000 +A5D8:00000000000007F00508050805F00508050805F00500050005001FC000000000 +A5D9:00000000000007F00508050805F00508050805F00500154005001FC000000000 +A5DA:000000000000000003E004100490041003E004100490041003E0000000000000 +A5DB:00000000000001E006100860080009C00E2008C0080008F00B080C3000000000 +A5DC:00000000000000000000044040044444644C5BB4400444200000000000000000 +A5DD:0000000000000000010000000380044008200820082004400380101000000000 +A5DE:0000000000001FF00000038004400820082008200440038000001FF000000000 +A5DF:00000000000003D00450087008500400038000400A200A200E400B8000000000 +A5E0:0000000000003870448842840204020407F808101020204059B266CC00000000 +A5E1:000000000000044004A004A004A004C807500C20145014501450082000000000 +A5E2:000000000000000000020002309248924C924B6E300200020002000000000000 +A5E3:0000000000003E100808083408C00B000C000B0008C0083408083E1000000000 +A5E4:000000000000084014A014A014A008C8155026200A500A500A50042000000000 +A5E5:000000000000084014A014A014A048CA155026200A500A500A50042000000000 +A5E6:0000000000000C6012902108228802800280010001000120012000C000000000 +A5E7:0000000000000C6012902108228802800280010001000128013000C000000000 +A5E8:00000000000000C003000C00030000C0002000C003000C00030000C000000000 +A5E9:00000000000000C003000C00030000C0082400C003000C00030000C000000000 +A5EA:00000000000010E011001200120012001200120012001200110010E000000000 +A5EB:0000000000001070148011001100110011001100110011001480107000000000 +A5EC:000000000000000000000000381C442247E24422381C00000000000000000000 +A5ED:000000000000000000000000381C442247E24422381C00000240000000000000 +A5EE:0000000000000000000001003838444447C44444383801000000000000000000 +A5EF:000000000000000C0014002470444C8443844264441C48005000600000000000 +A5F0:000000000000000C0114002470444C8443844264441C48005100600000000000 +A5F1:00000000000000F0030804300800080008000800080008F00B080C3000000000 +A5F2:00000000000000F0030806300A000A000A000A000A000AF00B080C3000000000 +A5F3:000000000000038004400440428441047FFC4104428404400440038000000000 +A5F4:000000000000038004400440529441047FFC4104529404400440038000000000 +A5F5:000000000000000003C014281FF8142803C014281FF8142803C0000000000000 +A5F6:000000000000000003C044227FFE442213C844227FFE442203C0000000000000 +A5F7:0000000000001010101010101010101000000100010001000100010000000000 +A5F8:000000000000101010101010101001000100010001000000071008E000000000 +A5F9:0000000000001010101010101010101000000100010009200100010000000000 +A5FA:0000000000000100010001001110101010101010111001000100010000000000 +A5FB:0000000000000100010001000100454445443BB8010001000100010000000000 +A5FC:0000000000000100010001000100454445443BB8010011100100010000000000 +A5FD:0000000000000100010011100100454445443BB8010011100100010000000000 +A5FE:00000000000007C0010011100100454405443BB801001110010007C000000000 +A5FF:0000000000000F00108020800700040007F804000700208010800F0000000000 +A600:0000000000000F00108020800720040007E804000720208010800F0000000000 +A601:0000000000000F00108020800728040807F804080728208010800F0000000000 +A602:0000000000000F00108020880708040807F804080708208810800F0000000000 +A603:0000000000002108210813900D6001000100010001000100010007C000000000 +A604:0000000000002108210813900D6001000100010005400100010007C000000000 +A605:0000000000002108210813900D60010001000540010007C0010007C000000000 +A606:0000000000002108210813900D6001000100010007C00100010007C000000000 +A607:0000000000002108210813900D60010001000100010009200FE0082000000000 +A608:0000000000001248124812481248124812481248124812481248124800000000 +A609:0000000000001EF00100028002800280028002800280028001001EF000000000 +A60A:0000000000002108210813900D600100010001F0015001F0015001F000000000 +A60B:000000000000121012200DC00080008001000138014401440088007000000000 +A60C:0000000000000000000000003FFC0000000000003FFC00000000000000000000 +A60D:0000000000000000000000000000000001000100028002800440044000000000 +A60E:000000000000000000000420024001800FF00180024004200000000000000000 +A60F:0000000000000000000000000000000000003A884694438452C422B800000000 +A610:00000000000001C002200410641064161C1E04100410041002D601CE00000000 +A611:000000000000111011100EE004400440044004400440155015500EE000000000 +A612:000000000000060C183060C01830060C01FE060C183060C01830060C00000000 +A613:00000000000003C004200400040004000380040004000400042003C000000000 +A614:000000000000222022601DA00020002000E40138002000200020002000000000 +A615:0000000000000014071408940894089445144214251418FC0014001400000000 +A616:0000000000000FE00820092008200820092008200820092008200FE000000000 +A617:0000000000000218022802480288020802080208220812080A08060800000000 +A618:00000000000003700D983118010001700198011801000100010007C000000000 +A619:0000000000000FE001000100010001F0010801080130010001000FE000000000 +A61A:0000000000001110000019982220222022202220222019980000111000000000 +A61B:000000000000121012200DC0008000800100010001FC01040088007000000000 +A61C:0000000000003FF8210811101110092009200540054003800380010000000000 +A61D:0000000000000FF008900C900B600800080008000800080008003E0000000000 +A61E:000000000000442044603BA000240020003E0020002400200020002000000000 +A61F:0000000000001C00220022001C6008900510031004E004000200018000000000 +A620:000000000000111011100EE0000007C00820101010101010082007C000000000 +A621:0000000000000080008000800080008000800080008000800080008000000000 +A622:0000000000000380044004400380010005400100054001000164019800000000 +A623:0000000000003800440047804440384003800040004003800200020000000000 +A624:0000000000000C000A00090008000900090009000FE001200120012000000000 +A625:0000000000000C000A00090008000800080009C00A200C100C10082000000000 +A626:00000000000001C002001F8004000400040004C005200620022001C000000000 +A627:0000000000000CC01340004000400040004000E001100110011000E000000000 +A628:00000000000004200000000004200420042003C004200420042003C000000000 +A629:0000000000000070008800880C701220114011800E4000400080030000000000 +A62A:0000000000003018482444443FF8044004400440044048242828101000000000 +A62B:000000000000038004400440044003800100010001000110011000E000000000 +A62C:00007FFE61CE6DBE618E6DB66DCE7FFE7FFE61C67DBE61BE6FBE61C67FFE0000 +A62D:00007FFE61CE6DBE618E6DB66DCE7FFE7FFE618E7DB661B66FB6618E7FFE0000 +A62E:00007FFE61CE6DBE618E6DB66DCE7FFE7FFE61867DBE618E6FBE61867FFE0000 +A62F:00007FFE61CE6DBE618E6DB66DCE7FFE7FFE61867DBE618E6FBE61BE7FFE0000 +A630:00007FFE61CE6DBE618E6DB66DCE7FFE7FFE63CE7DB671B67DB663CE7FFE0000 +A631:00007FFE61CE6DBE618E6DB66DCE7FFE7FFE63EE7DCE71EE7DEE63C67FFE0000 +A632:00007FFE61CE6DBE618E6DB66DCE7FFE7FFE63867DF671867DBE63867FFE0000 +A633:00007FFE61CE6DBE618E6DB66DCE7FFE7FFE638E7DF671C67DF6638E7FFE0000 +A634:00007FFE61CE6DBE618E6DB66DCE7FFE7FFE63B67DB671867DF663F67FFE0000 +A635:00007FFE61CE6DBE618E6DB66DCE7FFE7FFE63867DBE71867DF663867FFE0000 +A636:00007FFE61CE6DBE618E6DB66DCE7FFE7FFE63CE7DBE718E7DB663CE7FFE0000 +A637:00007FFE61CE6DBE618E6DB66DCE7FFE7FFE63867DF671EE7DDE63DE7FFE0000 +A638:00007FFE61CE6DBE618E6DB66DCE7FFE7FFE63CE7DB671CE7DB663CE7FFE0000 +A639:00007FFE61CE6DBE618E6DB66DCE7FFE7FFE63CE7DB671C67DF663CE7FFE0000 +A63A:00007FFE61CE6DBE618E6DB66DCE7FFE7FFE63867DB671867DB663B67FFE0000 +A63B:00007FFE61CE6DBE618E6DB66DCE7FFE7FFE638E7DB6718E7DB6638E7FFE0000 +A63C:00007FFE61CE6DBE618E6DB66DCE7FFE7FFE63C67DBE71BE7DBE63C67FFE0000 +A63D:00007FFE61CE6DBE618E6DB66DCE7FFE7FFE638E7DB671B67DB6638E7FFE0000 +A63E:00007FFE61CE6DBE618E6DB66DCE7FFE7FFE63867DBE718E7DBE63867FFE0000 +A63F:00007FFE61CE6DBE618E6DB66DCE7FFE7FFE63867DBE718E7DBE63BE7FFE0000 +A640:000000007E02020408102040407E3A44 +A641:0000000000007E0204081020407E3A44 +A642:000000007E020204087C2040407E3A44 +A643:0000000000007E02047E1020407E3A44 +A644:000000003C4242020C304042423C0000 +A645:0000000000003C42020C3040423C0000 +A646:00000000202020202020202024180000 +A647:00000000000020202020202024180000 +A648:00000000103810103844828282820000 +A649:00000000000010381038444444440000 +A64A:000000000000424224183C4A524A423C +A64B:00000000020244442810282828100000 +A64C:00000000000000003C78428442844004400440044004410442843C7800000000 +A64D:00000000000000000000000030184004400440044004410442843C7800000000 +A64E:00000000205050101E111111111E0000 +A64F:0000000000002050501E1111111E0000 +A650:00000000E2222222322A2A2A2A320000 +A651:000000000000E22222322A2A2A320000 +A652:00000000507E50505C525252525C0000 +A653:000000000000507E50505C52525C0000 +A654:00000000324A4A4A4E4A4A4A4A320000 +A655:000000000000324A4A4E4A4A4A320000 +A656:000000008894A2A2FEA2A2A2A2A20000 +A657:0000000000004C42424E7252524E0000 +A658:0000000008081414223E2241417F0000 +A659:000000000000081414223E41417F0000 +A65A:000000003E222214081C227F49490000 +A65B:0000000000003E22143E417F49490000 +A65C:0000000048485454527E6241417F0000 +A65D:000000000000444A4A517F51515F0000 +A65E:0000000000000100038005400540092009202910111001000100010000000000 +A65F:0000000000081C2A2AA9490808080000 +A660:000000002121212121212121217F4040 +A661:000000000000222222222222227E4040 +A662:000000000000000003FC048004800480088008800880108010803FC020402040 +A663:00000000000000000000000007F80480088008801080108010801FC010400000 +A664:00000000000000000FFC08800880088008800880088010801080208000000000 +A665:0000000000000000000000000FF8088008800880088010801080208000000000 +A666:000000000000000021FC2100330033002D002D00210021002100210000000000 +A667:00000000000000000000000021F8330033002D002D0021002100210000000000 +A668:000000003C4242425A5A4242423C0000 +A669:0000000000003C42425A5A42423C0000 +A66A:000000007C82828282AA8282827C0000 +A66B:0000000000003E4141415541413E0000 +A66C:00000000000000001E782184218421842DB42DB42184218421841E7800000000 +A66D:0000000000000000000000001E78218421842DB42DB4218421841E7800000000 +A66E:0E70118815A811880E7039CE463156B5463139CE0E70118815A811880E700000 +A66F:007E4200000000000000000000000000 +A670:0000028001002AA8101028280000A0144008A014000000002828129029280280 +A671:007E420000000000000000000000427E +A672:0100010007C0010001000000F01E00000000F01E00000000F01E054005400540 +A673:1028EE824482EE281000000000000000 +A674:001C2238221C00000000000000000000 +A675:0022262A322200000000000000000000 +A676:00140008080800000000000000000000 +A677:00221408102000000000000000000000 +A678:0030101C121C00000000000000000000 +A679:004242724A7200000000000000000000 +A67A:00202038243800000000000000000000 +A67B:00545454280000000000000000000000 +A67C:00242418000000000000000000000000 +A67D:000A0A06020000000000000000000000 +A67E:00242418000000000000000000000000 +A67F:000A0A06020000000000000000000000 +A680:001010101E1212122222224242FF8181 +A681:0000000010101E1222224242427F4100 +A682:000000003C424240201008040242423C +A683:00000000182424201010080804242418 +A684:00000000000000003C464248024802503FE004600250024842443C4200000000 +A685:0000000000000000000000003C46424802503FE00450024842443C4200000000 +A686:0000000092929292926E020202020000 +A687:000000000000929292926E0202020000 +A688:000000001C1414142424244649FA8186 +A689:0000000000001C1424244446497A4106 +A68A:00000000FE1010101619111111110502 +A68B:000000000000FE101016191111110502 +A68C:00000000FE10101010101010120C0000 +A68D:000000000000FE1010101010120C0000 +A68E:0000000042424242424242427E39413E +A68F:0000000000004242424242427E39413E +A690:000000007F0808080808080808384030 +A691:0000000000007F080808080808384030 +A692:00000000FA22222222261A0202020000 +A693:000000000000FA222222261A02020000 +A694:00000000304840405864424242420000 +A695:00000000000030484040586444440000 +A696:000000009292929292929292FE39413E +A697:000000000000929292929292FE39413E +A698:00000000000000001E78218421842184218421842184218421841E7800000000 +A699:0000000000000000000000001E782184218421842184218421841E7800000000 +A69A:000000007C929292FE929292927C0000 +A69B:0000000000003E49497F4949493E0000 +A69C:0070501C121C00000000000000000000 +A69D:00202038243800000000000000000000 +A69E:081C2A2A2A1C08000000000000000000 +A69F:004C507C504C00000000000000000000 +A6A0:00000000080C0A080808084848300000 +A6A1:000000004246464A4A52526262420000 +A6A2:0000007C007C00384482828244380000 +A6A3:00000000043448485250202040400000 +A6A4:000000000020000020242262528C0000 +A6A5:00000000404040404048407C00080000 +A6A6:000000000020007C02027C0020000000 +A6A7:000000007C0408081010303048460000 +A6A8:000000007E0204040408080808040000 +A6A9:00000000408C92A2A284780000100000 +A6AA:000000001C2222A47820242024200000 +A6AB:00000000103054901050102020200000 +A6AC:00000000401C22222A2A242020200000 +A6AD:0000000002020202027E2212227E0000 +A6AE:00000000405040780404784050400000 +A6AF:00000000001860004860504840400000 +A6B0:00000000704C424C7040404040400000 +A6B1:00000000404040407C40404040400000 +A6B2:00000000928244442828101010100000 +A6B3:000000004444444444444440407E0000 +A6B4:000000008888888A888E505220200000 +A6B5:00000000828282443810101010100000 +A6B6:00000000484848484A48484A48784800 +A6B7:0000000002002C3464A6202820200000 +A6B8:00000000304080988442320204180000 +A6B9:00000000201008041210101010100000 +A6BA:00000000601218244444241810600000 +A6BB:000000004000007848484E4040400000 +A6BC:000000000010C0300C020C30C0100000 +A6BD:00000002040818240202024244380000 +A6BE:00000000505050507C14141414140000 +A6BF:00000000182442422272020204040000 +A6C0:00000000182442427E02020204040000 +A6C1:00000000182442424202020204040000 +A6C2:00000000405E405E4040404040400000 +A6C3:00000000000202020204545428280000 +A6C4:00000000465A62625A46404040400000 +A6C5:0000000008084A485868484840400000 +A6C6:0000000002020202027A0606067A0000 +A6C7:00000002040810204220100804020000 +A6C8:00000000384492925410101010100000 +A6C9:000000007C04080810102020407C0000 +A6CA:0000000010101010242A22524C800000 +A6CB:000000003E1828480808080808080000 +A6CC:00000000100038441804443800100000 +A6CD:0000000070080404083020F820200000 +A6CE:00000000102828284444444482820000 +A6CF:00000000380082C6AAAA920010100000 +A6D0:000000003E4040403E00080808080000 +A6D1:00000000320804040404080810600000 +A6D2:00000000384402020204042810080000 +A6D3:000000001C2222A47820242424240000 +A6D4:00000000101210103854929292920000 +A6D5:00000000605048444040444850600000 +A6D6:00000000404040407848484848440000 +A6D7:00000000385492929280808080800000 +A6D8:00000000C2A29286864A4A5252220000 +A6D9:0000000018284A0C1828480808080000 +A6DA:000000004040404040404840407E0000 +A6DB:000000007E4242424242424242420000 +A6DC:00000000100018244454542404040000 +A6DD:000000003048888A4838080808100000 +A6DE:000000007E0202027E40404040400000 +A6DF:00000000828244444444282828100000 +A6E0:000000003028242224283060A0200000 +A6E1:00000000006294888A7400007E000000 +A6E2:000000201008102020404040221C0000 +A6E3:00000000407C44040404040404040000 +A6E4:000000046211090A0808101020C00000 +A6E5:000000000E1070504E40404040400000 +A6E6:000000003E0808780402020204080000 +A6E7:00000000380808780402020204080000 +A6E8:000000007050501010101010107C0000 +A6E9:00000000080808780402020204080000 +A6EA:00000000182848083C02020204080000 +A6EB:00000000700804040830202020200000 +A6EC:000000001018141210101010107C0000 +A6ED:00000000700804044830282420200000 +A6EE:000000001E1212121212121212720000 +A6EF:000000003844422204182042423C0000 +A6F0:00102844000000000000000000000000 +A6F1:003E0000000000000000000000000000 +A6F2:00000000200008040402020244380000 +A6F3:00000000040408081010242040400000 +A6F4:00000000222222224455448888880000 +A6F5:00000000000000003E08101020200000 +A6F6:0000000000000000F424484A90900000 +A6F7:00000000101010109254381000100000 +A6F8:00007FFE61CE6DBE618E6DB66DCE7FFE7FFE61CE6FB663CE6FB66FCE7FFE0000 +A6F9:00007FFE61CE6DBE618E6DB66DCE7FFE7FFE61CE6FB663C66FF66FCE7FFE0000 +A6FA:00007FFE61CE6DBE618E6DB66DCE7FFE7FFE61866FB663866FB66FB67FFE0000 +A6FB:00007FFE61CE6DBE618E6DB66DCE7FFE7FFE618E6FB6638E6FB66F8E7FFE0000 +A6FC:00007FFE61CE6DBE618E6DB66DCE7FFE7FFE61C66FBE63BE6FBE6FC67FFE0000 +A6FD:00007FFE61CE6DBE618E6DB66DCE7FFE7FFE618E6FB663B66FB66F8E7FFE0000 +A6FE:00007FFE61CE6DBE618E6DB66DCE7FFE7FFE61866FBE638E6FBE6F867FFE0000 +A6FF:00007FFE61CE6DBE618E6DB66DCE7FFE7FFE61866FBE638E6FBE6FBE7FFE0000 +A700:0000000000000000001C20201C000000 +A701:0000000000000000001C20201C003C00 +A702:000000001C20201C0000000000000000 +A703:000000001C20201C003C000000000000 +A704:00000000380404380000000000000000 +A705:0000000038040438003C000000000000 +A706:00000000000000000038040438000000 +A707:00000000000000000038040438003C00 +A708:00000000501010101010101010100000 +A709:00000000101050101010101010100000 +A70A:00000000101010105010101010100000 +A70B:00000000101010101010105010100000 +A70C:00000000101010101010101010500000 +A70D:00000000141010101010101010100000 +A70E:00000000101014101010101010100000 +A70F:00000000101010101410101010100000 +A710:00000000101010101010101410100000 +A711:00000000101010101010101010140000 +A712:000000001E1010101010101010100000 +A713:0000000010101E101010101010100000 +A714:00000000101010101E10101010100000 +A715:00000000101010101010101E10100000 +A716:000000001010101010101010101E0000 +A717:00000000101050101000000000000000 +A718:00000000001204081000000000000000 +A719:00000000000010007C00000000000000 +A71A:00000000000004047C00000000000000 +A71B:0000000010387C101010000000000000 +A71C:000000001010107C3810000000000000 +A71D:00000000101010100010000000000000 +A71E:00000000100010101010000000000000 +A71F:00000000000000001000101010100000 +A720:007E5050000000000000000000000000 +A721:00000000000000000000000050507E00 +A722:00007078040438000070780404380000 +A723:00000030380404180030380404180000 +A724:00000000387C604040403C0000000000 +A725:000000000000387C604040403C000000 +A726:00000000424242427E4242424242120C +A727:0000004040405C62424242424242120C +A728:00000000000000003F800400040007F8041004200440047004080008010800F0 +A729:00000000000000000800080008003FFC08080810082008380804060400840078 +A72A:000000003C424850304C4040423C0000 +A72B:000000001C22202018202020221C0000 +A72C:00000000040C1424447C040424180000 +A72D:000000000000040C14247C0404042418 +A72E:000000000818284888FE08084B310102 +A72F:00000000000008182848FE080B094932 +A730:0000000000007C404078404040400000 +A731:0000000000003C4240300C02423C0000 +A732:00000000000000000C6012901290210821083FF8210821082108210800000000 +A733:0000000000000000000000001EF0210801081FF82108210823181DE800000000 +A734:00000000000000000CF013081308210821083F0821082108210820F000000000 +A735:0000000000000000000000001EF0210801081F082108210823081CF000000000 +A736:00000000000000000C0812081208210821083F0821082108210820F000000000 +A737:0000000000000000000000001E08210801081F082108210823181CE800000000 +A738:00000000000000000E0812081208211021103F1020A020A02040204000000000 +A739:0000000000000000000000001E08210801081F902190219022601C6000000000 +A73A:00000000000000000E0812081208211021103FF820A020A02040204000000000 +A73B:0000000000000000000000001E08210801081FFC2190219022601C6000000000 +A73C:00000000000000000E0812081208211021103F1020A020A02040204004800300 +A73D:0000000000000000000000001E08210801081F902190219022601C60012000C0 +A73E:000000003C4242021A1A0242423C0000 +A73F:0000000000003C42021A1A02423C0000 +A740:0000000042E448506060504844420000 +A741:00000040F04044485060504844420000 +A742:00000000424448506060544854420000 +A743:00000040404044485060544854420000 +A744:0000000042E448506060544854420000 +A745:00000040F04044485060544854420000 +A746:000000004040404040202020203E0000 +A747:000000301010101008080808083E0000 +A748:0000000040F0404040404040407E0000 +A749:0000001808081C0808080808083E0000 +A74A:000000003C424242FF424242423C0000 +A74B:0000000000003C4242FF4242423C0000 +A74C:0000000275898E888888888888700000 +A74D:00000000000275898E88888888700000 +A74E:00000000000000001EF0210821082108210821082108210821081EF000000000 +A74F:0000000000000000000000001EF02108210821082108210821081EF000000000 +A750:000000007C4242427C404040F0400000 +A751:0000000000005C6242424242625CF040 +A752:000000001E1111117E90909050100000 +A753:00000000000016191111111179969050 +A754:000000004EA929291E08080808080000 +A755:0000000000004AAD292929291D0A0808 +A756:000000003C4242424242425A643D0205 +A757:0000000000003A4642424242463A0702 +A758:00000000000000000F00108010901088108810881090169019200F4000800140 +A759:0000000000000000000000000E901188108810881090109011A00EC001800280 +A75A:000000003C4242020408080404020000 +A75B:0000000000003C4202021C1008040000 +A75C:00000000788404040810224284FE0408 +A75D:000000000000384404081222447E0408 +A75E:00000000494949323222545488880000 +A75F:0000000000004A4A5234646498980000 +A760:00000000424242425A5A66664242020C +A761:00000000000041494949494949370106 +A762:0000003C4040403E0408101C0202423C +A763:00000000003040403C08102038044438 +A764:00005060C07844424244784040400000 +A765:000000506040DC6242424242625C4040 +A766:000000404078444242447840F0400000 +A767:0000004040405C6242424242625CF040 +A768:00000000444444484850506040400000 +A769:00000000000022222424283020200000 +A76A:00000000384404041804040404380000 +A76B:00000000000038440404180404040438 +A76C:0000000C1212127C1010101050200000 +A76D:0000000C1212127C1010101010105020 +A76E:00000000182442424A32020204380000 +A76F:000000000000182442424A3202020438 +A770:00001824424A32020438000000000000 +A771:0000000000000100010001001D002300210021082108211023241DF800400080 +A772:00000000000018000800080008000800080008100810082008483FF000800100 +A773:000000000000000000000000760049004900490849084910492449F800400080 +A774:0000000000000000000000005C0062004200421042104220424843F000800100 +A775:00000000002000200040009017E0190012001000100010001000100000000000 +A776:0000000000000000000000007C00420042007C1050104820444843F000800100 +A777:00000000000000201020104010907FE0110012001000100010000C0000000000 +A778:0000000038444444381C224202FC0000 +A779:00000000FC22424242424242423C0000 +A77A:000040300804023E42424242423C0000 +A77B:000000005C6240404040407840404040 +A77C:0000000000002C322020202038202020 +A77D:000000007E0408101008384444443800 +A77E:000000001C2222221C10080810207E00 +A77F:0000000000003C42423C10080810207E +A780:000000007E0202020202020202020000 +A781:00000000003E0808080808080808080C +A782:000000005C6242424242414040400000 +A783:00000000000058644444424040404040 +A784:000000002E3020202020202020202020 +A785:0000000000002E302020202020202020 +A786:000000007E10204040404040221C0000 +A787:0000000000007E1020404040221C0000 +A788:00000000000000000000000000182442 +A789:00000000000000181800001818000000 +A78A:00000000000000003C00003C00000000 +A78B:00000000080808080808080000000000 +A78C:00000000080808080800000000000000 +A78D:00000000424242427E02020202020000 +A78E:00000018080838483E08080808080600 +A78F:0000000000183C3C1800000000000000 +A790:0000000044646454544C4C4444460202 +A791:00000000000058644444444444460202 +A792:000000001C22222070202022221C0000 +A793:0000000000001C2220702020221C0000 +A794:0000000000003C4240404040423E020C +A795:0000004040405C624242424242430106 +A796:000000001C1212123C525252121C0000 +A797:00000000101010101C325252525C4030 +A798:000000001E1010107C10101010101060 +A799:0000000C1010107C107C101010100000 +A79A:000000003A46422212224242463A0000 +A79B:0000000000003A4642322242463A0000 +A79C:00000000384442221222424244380000 +A79D:00000000000038444232224244380000 +A79E:000000004242422212224242463A0000 +A79F:000000000000424242322242463A0000 +A7A0:000000003D424648506642C2463A0000 +A7A1:0000000000023A477CC438203C42423C +A7A2:000000004244485062645868C4420000 +A7A3:000000404040444850605678C4420000 +A7A4:00000000426263565A6ACA4646420000 +A7A5:0000000000005C634E72C24242420000 +A7A6:000000007C475AE27C48444442420000 +A7A7:0000000000005C6242506040C0400000 +A7A8:000000003C42404C30CC0242423C0000 +A7A9:0000000000001E2026186601211E0000 +A7AA:0000000062A2A2223E22222222220000 +A7AB:000000003C4202021C020202423C0000 +A7AC:000000003C424242424242464A320478 +A7AD:000000001010103050543810101E0000 +A7AE:000000007F49490808080849497F0000 +A7AF:0000000000003C424242425A663C0300 +A7B0:000000004222120A06060A1222420000 +A7B1:000000000808080808080808087F0000 +A7B2:000000001F040404040424544C380400 +A7B3:00000000424224241818182424424200 +A7B4:000000007C4242427C424242427C4040 +A7B5:000000003844444858444242524C4040 +A7B6:00000000225541414141494949360000 +A7B7:00000000000022554141494949360000 +A7B8:0000000042424342464A526242BC0000 +A7B9:0000000000004342464A526246BA0000 +A7BA:0000006028541422223E222222220000 +A7BB:0000180810003C42023E4242463A0000 +A7BC:000000603E48080808080808083E0000 +A7BD:000018081000180808080808083E0000 +A7BE:000000C062A2222222222222221C0000 +A7BF:000018081000424242424242463A0000 +A7C0:00007FFE61866DF661EE6DDE6DDE7FFE7FFE71CE6FB66FB66FB671CE7FFE0000 +A7C1:00007FFE61866DF661EE6DDE6DDE7FFE7FFE71EE6FCE6FEE6FEE71C67FFE0000 +A7C2:0000000000800100417041884108220822702208150815080888087000000000 +A7C3:00000000000000000100020042F0430842082670250825081888187000000000 +A7C4:000000003C42424040404042463A020C +A7C5:000000003C424240300C0242625C4030 +A7C6:000000007E02020408102040427E020C +A7C7:00000000784442427E42424244780000 +A7C8:0000000202023A46427E4242463A0000 +A7C9:000000003C424220107E0442423C0000 +A7CA:0000000000003C42307E0C02423C0000 +A7CB:00007FFE61866DF661EE6DDE6DDE7FFE7FFE718E6FB66F8E6FB6718E7FFE0000 +A7CC:00007FFE61866DF661EE6DDE6DDE7FFE7FFE71C66FBE6FBE6FBE71C67FFE0000 +A7CD:00007FFE61866DF661EE6DDE6DDE7FFE7FFE718E6FB66FB66FB6718E7FFE0000 +A7CE:00007FFE61866DF661EE6DDE6DDE7FFE7FFE71866FBE6F8E6FBE71867FFE0000 +A7CF:00007FFE61866DF661EE6DDE6DDE7FFE7FFE71866FBE6F8E6FBE71BE7FFE0000 +A7D0:00007FFE61866DF661EE6DDE6DDE7FFE7FFE63CE6DB66DB66DB663CE7FFE0000 +A7D1:00007FFE61866DF661EE6DDE6DDE7FFE7FFE63EE6DCE6DEE6DEE63C67FFE0000 +A7D2:00007FFE61866DF661EE6DDE6DDE7FFE7FFE63866DF66D866DBE63867FFE0000 +A7D3:00007FFE61866DF661EE6DDE6DDE7FFE7FFE638E6DF66DC66DF6638E7FFE0000 +A7D4:00007FFE61866DF661EE6DDE6DDE7FFE7FFE63B66DB66D866DF663F67FFE0000 +A7D5:00007FFE61866DF661EE6DDE6DDE7FFE7FFE63866DBE6D866DF663867FFE0000 +A7D6:00007FFE61866DF661EE6DDE6DDE7FFE7FFE63CE6DBE6D8E6DB663CE7FFE0000 +A7D7:00007FFE61866DF661EE6DDE6DDE7FFE7FFE63866DF66DEE6DDE63DE7FFE0000 +A7D8:00007FFE61866DF661EE6DDE6DDE7FFE7FFE63CE6DB66DCE6DB663CE7FFE0000 +A7D9:00007FFE61866DF661EE6DDE6DDE7FFE7FFE63CE6DB66DC66DF663CE7FFE0000 +A7DA:00007FFE61866DF661EE6DDE6DDE7FFE7FFE63866DB66D866DB663B67FFE0000 +A7DB:00007FFE61866DF661EE6DDE6DDE7FFE7FFE638E6DB66D8E6DB6638E7FFE0000 +A7DC:00007FFE61866DF661EE6DDE6DDE7FFE7FFE63C66DBE6DBE6DBE63C67FFE0000 +A7DD:00007FFE61866DF661EE6DDE6DDE7FFE7FFE638E6DB66DB66DB6638E7FFE0000 +A7DE:00007FFE61866DF661EE6DDE6DDE7FFE7FFE63866DBE6D8E6DBE63867FFE0000 +A7DF:00007FFE61866DF661EE6DDE6DDE7FFE7FFE63866DBE6D8E6DBE63BE7FFE0000 +A7E0:00007FFE61866DF661EE6DDE6DDE7FFE7FFE61CE6FB663B66FB661CE7FFE0000 +A7E1:00007FFE61866DF661EE6DDE6DDE7FFE7FFE61EE6FCE63EE6FEE61C67FFE0000 +A7E2:00007FFE61866DF661EE6DDE6DDE7FFE7FFE61866FF663866FBE61867FFE0000 +A7E3:00007FFE61866DF661EE6DDE6DDE7FFE7FFE618E6FF663C66FF6618E7FFE0000 +A7E4:00007FFE61866DF661EE6DDE6DDE7FFE7FFE61B66FB663866FF661F67FFE0000 +A7E5:00007FFE61866DF661EE6DDE6DDE7FFE7FFE61866FBE63866FF661867FFE0000 +A7E6:00007FFE61866DF661EE6DDE6DDE7FFE7FFE61CE6FBE638E6FB661CE7FFE0000 +A7E7:00007FFE61866DF661EE6DDE6DDE7FFE7FFE61866FF663EE6FDE61DE7FFE0000 +A7E8:00007FFE61866DF661EE6DDE6DDE7FFE7FFE61CE6FB663CE6FB661CE7FFE0000 +A7E9:00007FFE61866DF661EE6DDE6DDE7FFE7FFE61CE6FB663C66FF661CE7FFE0000 +A7EA:00007FFE61866DF661EE6DDE6DDE7FFE7FFE61866FB663866FB661B67FFE0000 +A7EB:00007FFE61866DF661EE6DDE6DDE7FFE7FFE618E6FB6638E6FB6618E7FFE0000 +A7EC:00007FFE61866DF661EE6DDE6DDE7FFE7FFE61C66FBE63BE6FBE61C67FFE0000 +A7ED:00007FFE61866DF661EE6DDE6DDE7FFE7FFE618E6FB663B66FB6618E7FFE0000 +A7EE:00007FFE61866DF661EE6DDE6DDE7FFE7FFE61866FBE638E6FBE61867FFE0000 +A7EF:00007FFE61866DF661EE6DDE6DDE7FFE7FFE61866FBE638E6FBE61BE7FFE0000 +A7F0:00007FFE61866DF661EE6DDE6DDE7FFE7FFE61CE6FB663B66FB66FCE7FFE0000 +A7F1:00007FFE61866DF661EE6DDE6DDE7FFE7FFE61EE6FCE63EE6FEE6FC67FFE0000 +A7F2:00007FFE61866DF661EE6DDE6DDE7FFE7FFE61866FF663866FBE6F867FFE0000 +A7F3:00007FFE61866DF661EE6DDE6DDE7FFE7FFE618E6FF663C66FF66F8E7FFE0000 +A7F4:00007FFE61866DF661EE6DDE6DDE7FFE7FFE61B66FB663866FF66FF67FFE0000 +A7F5:00000000040404043C04040404040000 +A7F6:0000000000000404043C040404040000 +A7F7:0000000000000000427E420000000000 +A7F8:00000042FF427E424242000000000000 +A7F9:000000000036494F4837000000000000 +A7FA:000000000000494949494949497F0000 +A7FB:000000007E0202023E02020202020000 +A7FC:000000003E4242423E02020202020000 +A7FD:00000000424242425A5A666642420000 +A7FE:00003E080808080808080808083E0000 +A7FF:000000000000000010411041104128A228A228A2451445148208820800000000 +A800:000000000000FFFF003000500090011002100410081010106008000000000000 +A801:000000000000FFFF040005000680048001000600010000800040000000000000 +A802:0480024001200000000000000000000000000000000000000000000000000000 +A803:000000000000FFFF080011E02210241020E02110201010200FC0000000000000 +A804:0E0001000080FFFF10801080108011001E001000100010000800000000000000 +A805:000000000000FFFF0040034004C00840084004C0034018401840000000000000 +A806:004000A001100000000000000000000000000000000000000000000000000000 +A807:000000000000FFFF226022A023202E2032200220022002200110000000000000 +A808:000000000000FFFF26602AA03320222000200020002000200010000000000000 +A809:000000000000FFFF0840084004400C4014401440084000400020000000000000 +A80A:000000000000FFFF00C003400440034000C003400440034000E0000000000000 +A80B:0030004800300000000000000000000000000000000000000000000000000000 +A80C:000000000000FFFF004000C00140024004400840064001C00020000000000000 +A80D:000000000000FFFF100011801280148019E00290046008000800000000000000 +A80E:000000000000FFFF0820102021E0212011200E20002000200010000000000000 +A80F:000000000000FFFF200026002A28322802480248029002900320000000000000 +A810:000000000000FFFF0700088008400480010002400420082007C0000000000000 +A811:000000000000FFFF080008000B000C800880088009000A000C00000000000000 +A812:000000000000FFFF010001000960119011101010102008400780000000000000 +A813:000000000000FFFF0800080009800A400A400880088009000600000000000000 +A814:000000000000FFFF0040004018C01F4008400840084010402020000000000000 +A815:000000000000FFFF0020026006A02B2012200020002000200010000000000000 +A816:000000000000FFFF100011801280148018800080008000400030000000000000 +A817:000000000000FFFF2010203013500D9001100010001000100008000000000000 +A818:000000000000FFFF006000A00120022005200520052002200010000000000000 +A819:000000000000FFFF206020A02120222024202820302020200010000000000000 +A81A:000000000000FFFF40C041704248445048605050604840400020000000000000 +A81B:000000000000FFFF00400040074008C008C00740004000400020000000000000 +A81C:000000000000FFFF01E0022004201E2025200220002000200010000000000000 +A81D:000000000000FFFF406020A011200A2004200A200A2004200010000000000000 +A81E:000000000000FFFF006000A0012012200C200020002000200010000000000000 +A81F:000000000000FFFF006000A0012012200C2000A0012002200190000000000000 +A820:000000000000FFFF010001000160019001100010002000400780000000000000 +A821:000000000000FFFF00100E301150119002100510009000900008000000000000 +A822:000000000000FFFF206020A021202220242028A0312022200190000000000000 +A823:000000000000000F000200020002000200020002000200020001000000000000 +A824:000C00120002000F000200020002000200020002000200020001000000000000 +A825:0000000000000000000000000000000000000000000000080008001001E00000 +A826:0200010000800000000000000000000000000000000000000000000000000000 +A827:000800040002000F000200020002000200020002000200020001000000000000 +A828:00000000000030484830000000000000 +A829:00000000304848300030484830000000 +A82A:0000000000000000301848244824301800000180024002400180000000000000 +A82B:00000000000000000C60129012900C6000000C60129012900C60000000000000 +A82C:0000000000000000000000000000000000000000000000000000018000400020 +A82D:00007FFE61CE6DB661CE6DB66DCE7FFE7FFE618E7DB661B66FB6618E7FFE0000 +A82E:00007FFE61CE6DB661CE6DB66DCE7FFE7FFE61867DBE618E6FBE61867FFE0000 +A82F:00007FFE61CE6DB661CE6DB66DCE7FFE7FFE61867DBE618E6FBE61BE7FFE0000 +A830:0000000000000080008000800080008000800080008000800080000000000000 +A831:0000000000000120012001200120012001200120012001200120012000000000 +A832:0000000000000920092009200920092009200920092009200920092000000000 +A833:00000000000000000000000000000000007003801C0000000000000000000000 +A834:000000000000000000000000007003801C000000007003801C00000000000000 +A835:0000000000000000007003801C00007003801C00007003801C00000000000000 +A836:00000000000001C002200220022001C000000000000000000000000000000000 +A837:0000000000000000004000800100020004000E001100110011000E0000000000 +A838:000000000000001000100010001000100010001000100010002001C000000000 +A839:00000000000000700080008000800040004000400040004001800E0000000000 +A83A:00007FFE61CE6DB661CE6DB66DCE7FFE7FFE63867DB671867DB663B67FFE0000 +A83B:00007FFE61CE6DB661CE6DB66DCE7FFE7FFE638E7DB6718E7DB6638E7FFE0000 +A83C:00007FFE61CE6DB661CE6DB66DCE7FFE7FFE63C67DBE71BE7DBE63C67FFE0000 +A83D:00007FFE61CE6DB661CE6DB66DCE7FFE7FFE638E7DB671B67DB6638E7FFE0000 +A83E:00007FFE61CE6DB661CE6DB66DCE7FFE7FFE63867DBE718E7DBE63867FFE0000 +A83F:00007FFE61CE6DB661CE6DB66DCE7FFE7FFE63867DBE718E7DBE63BE7FFE0000 +A840:0000000000007FFF400040007FFE400040007FFE408040804080000000000000 +A841:0000000000004FF84808480848087808480848084FF840007FFE000000000000 +A842:0000000000007FFF40004FF84808480878084808480848084FF8000000000000 +A843:0000000000007F044104410441044104410441044104410441FC000000000000 +A844:0000000000007FFC4104410441044104410441044104410441FC000000000000 +A845:00000000000041FC41044104410441047F0441044104410441FC000000000000 +A846:0000000000004104410441044104410441044104410441047FFC000000000000 +A847:0000000000007FFC4100408040404020401C4000400040004000000000000000 +A848:000000000000407440884100410040C07FFC4000400040007FFE000000000000 +A849:0000000000007FFF41044104410471C449244514430C430C4104000000000000 +A84A:0000000000004060408041004100710049004500430043004100000000000000 +A84B:0000000000007FF0406040804100428044404440444044404380000000000000 +A84C:0000000000007FFC0004000400047F04410441044104410441FC000000000000 +A84D:0000000000007FFC0004000400047E04010401040104010400F8000000000000 +A84E:0000000000007FFC4004400440047F04410441044104410441FC000000000000 +A84F:0000000000007FF0006000807F00428044404440444044404380000000000000 +A850:0000000000007FFF4080408041E042107E0842484188401047E0000000000000 +A851:0000000000007FFF40404080410043E0401040084008401043E0000000000000 +A852:0000000000007FFF40024002400241FE410241027F0241024102000000000000 +A853:0000000000004000443044D047107C10471044D0443040007FFF000000000000 +A854:0000000000007C1F43604080414042204220422041C040007FFE000000000000 +A855:0000000000007FFC410441044104410441044104410441044104000000000000 +A856:0000000000007F04410441044104410441FC4000400040004000000000000000 +A857:0000000000001FF80010002000401FE000100008000800101FE0000000000000 +A858:0000000000000410041004100410041007F00410041004100410000000000000 +A859:0000000000007FFC000400047F044104410441FC400040007FFC000000000000 +A85A:0000000000007FFC40004000400041FC41044104410441047F04000000000000 +A85B:0000000000007FFF003000C023002C0030002800244022802100000000000000 +A85C:00000000000041E242144408440042004100608051004A004400000000000000 +A85D:0000000000007FF8003000C023002C0030F02B08240800087FF0000000000000 +A85E:0000000000007FF0418042004400484048204820482044404380000000000000 +A85F:000000000000400041E0421044087C08440843884008401040E0000000000000 +A860:0000000000007FFF410041004100410041104120414041804100000000000000 +A861:0000000000004008403043C04C00700070004C0043C040304008000000000000 +A862:0000000000007FF0401040107810471040F04000400040007FFF000000000000 +A863:0000000000007FFF41044104410471C449244514430C40007FFF000000000000 +A864:00000000000043CF44314411440942094105608551034A034401000000000000 +A865:0000000000007FFF40004000400040F047107810401040107FF0000000000000 +A866:0000000000004003400440084008401040104010401040107FF0000000000000 +A867:0000000000001FFC08040404020401040084004400240014000C000000000000 +A868:0000000000000804040404040208020802080410041008203FC0000000000000 +A869:0000000000007FFE4000400040007FFC40C04100410040884074000000000000 +A86A:0000000000004104430C430C4514492471C44104410441047FFF000000000000 +A86B:0000000000004100430043004500490071004100410040804060000000000000 +A86C:0000000000004380444044404440444042804100408040607FF0000000000000 +A86D:0000000000007FFE000600180860068001FC00020002000201FC060008000000 +A86E:0000000000007FFC40004000400041FC41044104460458046004000000000000 +A86F:00000000000041E042104408440442004100608051004A004400000000000000 +A870:000000000000403F43514491440942094105608551034A034401000000000000 +A871:0000000000007FFF000600180060008001000100020002000200000000000000 +A872:000000000000080008000800080008000FE00800080008000800000000000000 +A873:00000000000000000040002006101F183F181F18061000200040000000000000 +A874:0000000000007FFF400140014101410141017F01000100017FFF000000000000 +A875:000000007FFF400141017F0100017FFF400141017F0100017FFF000000000000 +A876:0000000000000080008000800080008000800080008000800080000000000000 +A877:0000000000000220022002200220022002200220022002200220000000000000 +A878:00007FFE61CE6DB661CE6DB66DCE7FFE7FFE61CE7DB67BCE77B677CE7FFE0000 +A879:00007FFE61CE6DB661CE6DB66DCE7FFE7FFE61CE7DB67BC677F677CE7FFE0000 +A87A:00007FFE61CE6DB661CE6DB66DCE7FFE7FFE61867DB67B8677B677B67FFE0000 +A87B:00007FFE61CE6DB661CE6DB66DCE7FFE7FFE618E7DB67B8E77B6778E7FFE0000 +A87C:00007FFE61CE6DB661CE6DB66DCE7FFE7FFE61C67DBE7BBE77BE77C67FFE0000 +A87D:00007FFE61CE6DB661CE6DB66DCE7FFE7FFE618E7DB67BB677B6778E7FFE0000 +A87E:00007FFE61CE6DB661CE6DB66DCE7FFE7FFE61867DBE7B8E77BE77867FFE0000 +A87F:00007FFE61CE6DB661CE6DB66DCE7FFE7FFE61867DBE7B8E77BE77BE7FFE0000 +A880:000000000000000000000004000A000A00040000000000000000000000000000 +A881:00000000000000000004000A000A000400000004000A000A0004000000000000 +A882:000000000000000036004900490002007C008000808081007E00000000000000 +A883:000000000000000036004900490002007C008100808081407E00000000000000 +A884:000000000000000063009480A400820061008100810082007C00000000000000 +A885:000000000000000063009480A700820061008100810082007C00000000000000 +A886:0000000000000000CF00308029004C0092008200820084007800000000000000 +A887:0000000000000000CE00310028804C8092808280828084807880000000000000 +A888:00000000000000004C8092809280628004807880808081007E00000000000000 +A889:00000000000000004C0092009200620004007900808081407E00000000000000 +A88A:000000000000000077008880888080808080BE80848088804700000000000000 +A88B:000000000000000077008880888080808080BE80848088804700060021001E00 +A88C:00000000000000003F00408080009300948094808F0044003800000000000000 +A88D:00000000000000003F0040808080A480AA80AA809C8048803080000000000000 +A88E:00000000000000003F0040808000A900AA80AA80970042003C00000000000000 +A88F:00000000000000003F0040809E00A10091008600990041003E00000000000000 +A890:00000000000000003F0040809C80A280928084809A8042803C80000000000000 +A891:00000000000000003F0040809000A9008A80B2808F8049803180000000000000 +A892:0000000000000000270058805080288008800880088008800880000000000000 +A893:000000000000000084404AA027C02440484049209220922061C0000000000000 +A894:0000000000000000670088808880888088808880888088807300000000000000 +A895:000000000000000062009500A500820065008500888088807300000000000000 +A896:00000000000000007F0080808080B8804480B880808080804300000000000000 +A897:00000000000000006100928050801080F8804100810082007C00000000000000 +A898:000000000000000063009480A280808070808100810082007C00000000000000 +A899:00000000000000007700888088808080A080D080908094806300000000000000 +A89A:0000000000000000770088809480A280A2809480888094804900000000000000 +A89B:00000000000000003C0042008900950095008F80910092004C00000000000000 +A89C:0000000000000000FF8040003800060071008880908081007E00000000000000 +A89D:00000000000000003E0041008080808080808080808041003E00000000000000 +A89E:00000000000000007F8001002200470088808080808041003E00000000000000 +A89F:0000000000000000020085004480258052804080408021001E00000000000000 +A8A0:00000000000000003E0041008C8092809280BA80828044803900000000000000 +A8A1:00000000000000003E0041008080808080808080808040803080000000000000 +A8A2:0000000000000000330048801080210042003400080014000800000000000000 +A8A3:0000000000000000780084008400480010006200810083007C80000000000000 +A8A4:000000000000000063009480A080808060808080808081007E00000000000000 +A8A5:00000000000000003D004280830082008200A200520052002200000000000000 +A8A6:00000000000000004300A0801080110021002200420044003800000000000000 +A8A7:0000000000000000180025804380420084009480888041003E00000000000000 +A8A8:0000000000000000B600B900610002007C008100808080807F00000000000000 +A8A9:00000000000000004D8092409240904090409040904090406180000000000000 +A8AA:00000000000000006C80928092804480188060808080B8804700000000000000 +A8AB:00000000000000004300A0805080110021002200420044003800000000000000 +A8AC:0000000000000000F780140012002200210041004080F880C700000000000000 +A8AD:0000000000000000770088808880808080808080808080806300000000000000 +A8AE:0000000000000000E30080804100220014000800140014000800000000000000 +A8AF:00000000000000003900448084809480A8809480848084806300000000000000 +A8B0:000000000000000061009280D280A10082808280848044803900000000000000 +A8B1:00000000000000004880B5009900910088808880848084808300000000000000 +A8B2:0000000000000000FF00100020007100A8809080808041003E00000000000000 +A8B3:00000000000000006B0094809480808080808080808081006600000000000000 +A8B4:00000000000000000012001200120012000E0002000200020002000000000000 +A8B5:0000000000000000002E0012001400040008000800100010000C000000000000 +A8B6:003C004200240000000000000000000000000000000000000000000000000000 +A8B7:00700088000800080008000800080008000800080008000A0004000000000000 +A8B8:00000000000000000044002A003A003400100028002800280010000000000000 +A8B9:000000000000000800500034003A003400100028002800280010000000000000 +A8BA:0000000000000000001C002A00240020001C000200020022001C000000000000 +A8BB:0000000000000000001C002A00240020001C000200020022001C0040003C0002 +A8BC:000000000000000000DC0122012201220126012A012A012A00A4000000000000 +A8BD:000000000000000000DC0122012201220126012A012A012A00A4020001F00008 +A8BE:0000000000000000000C001200120016000A0002000200040008000000000000 +A8BF:0000000000000000003E0022001400040008000800120012000C000000000000 +A8C0:0000000000000000001800240026001A00020002000A0016000C000000000000 +A8C1:0000000000000000003E002200120004003800080008000A0004000000000000 +A8C2:0000000000000000007E0046002A000A0072000A000A000A0004000000000000 +A8C3:000000000000000000E4009A001A001C001800180038005A0024000000000000 +A8C4:0000000000000000000000000000000000000000000000000000002000100008 +A8C5:00000004000A000A00040011000E000000000000000000000000000000000000 +A8C6:00007FFE61CE6DB661CE6DB66DCE7FFE7FFE71CE6FBE6F8E6FB671CE7FFE0000 +A8C7:00007FFE61CE6DB661CE6DB66DCE7FFE7FFE71866FF66FEE6FDE71DE7FFE0000 +A8C8:00007FFE61CE6DB661CE6DB66DCE7FFE7FFE71CE6FB66FCE6FB671CE7FFE0000 +A8C9:00007FFE61CE6DB661CE6DB66DCE7FFE7FFE71CE6FB66FC66FF671CE7FFE0000 +A8CA:00007FFE61CE6DB661CE6DB66DCE7FFE7FFE71866FB66F866FB671B67FFE0000 +A8CB:00007FFE61CE6DB661CE6DB66DCE7FFE7FFE718E6FB66F8E6FB6718E7FFE0000 +A8CC:00007FFE61CE6DB661CE6DB66DCE7FFE7FFE71C66FBE6FBE6FBE71C67FFE0000 +A8CD:00007FFE61CE6DB661CE6DB66DCE7FFE7FFE718E6FB66FB66FB6718E7FFE0000 +A8CE:0000000000000000008000800080008000800080008000800080000000000000 +A8CF:0000000000000000024002400240024002400240024002400240000000000000 +A8D0:000000000000000003C0042008100810081008100810042003C0000000000000 +A8D1:000000000000000001C00220022001C000400080008000800060000000000000 +A8D2:000000000000000007C008200020022001C00100008000400030000000000000 +A8D3:0000000000000000038004400040018000400040084008400780000000000000 +A8D4:00000000000000000140022002200140008001400220022001C0000000000000 +A8D5:0000000000000000062008200840087007880088010801080110000000000000 +A8D6:000000000000000003C004200400030002000400040002400180000000000000 +A8D7:0000000000000000024004A004A0046004200220024001400080000000000000 +A8D8:0000000000000000010002800240044004200620052005200240000000000000 +A8D9:00000000000000000800040004000440088009400820042003C0000000000000 +A8DA:00007FFE61CE6DB661CE6DB66DCE7FFE7FFE63866DB66D866DB663B67FFE0000 +A8DB:00007FFE61CE6DB661CE6DB66DCE7FFE7FFE638E6DB66D8E6DB6638E7FFE0000 +A8DC:00007FFE61CE6DB661CE6DB66DCE7FFE7FFE63C66DBE6DBE6DBE63C67FFE0000 +A8DD:00007FFE61CE6DB661CE6DB66DCE7FFE7FFE638E6DB66DB66DB6638E7FFE0000 +A8DE:00007FFE61CE6DB661CE6DB66DCE7FFE7FFE63866DBE6D8E6DBE63867FFE0000 +A8DF:00007FFE61CE6DB661CE6DB66DCE7FFE7FFE63866DBE6D8E6DBE63BE7FFE0000 +A8E0:0000018002400240018000000000000000000000000000000000000000000000 +A8E1:0180024001800300008000400000000000000000000000000000000000000000 +A8E2:0180024000800100008000400000000000000000000000000000000000000000 +A8E3:0180004001800040018000400020000000000000000000000000000000000000 +A8E4:0000044002800100028001000000000000000000000000000000000000000000 +A8E5:01000100012000E0002000100010000800080000000000000000000000000000 +A8E6:00C0010000C0010000E000200010000000000000000000000000000000000000 +A8E7:044004A00460022001C000000000000000000000000000000000000000000000 +A8E8:004000800100012000C000000000000000000000000000000000000000000000 +A8E9:00C0012000C00040002000200000000000000000000000000000000000000000 +A8EA:1CE002400C4023C01C4000000000000000000000000000000000000000000000 +A8EB:07E0004004800240018000000000000000000000000000000000000000000000 +A8EC:0FF00080038004E0039000900000000000000000000000000000000000000000 +A8ED:07E0004003C00440004000400040000000000000000000000000000000000000 +A8EE:0FC0048004800380008000800000000000000000000000000000000000000000 +A8EF:07E0008001800100008000400000000000000000000000000000000000000000 +A8F0:030004000FE004C0054004C00440000000000000000000000000000000000000 +A8F1:007000800040012000C000000000000000000000000000000000000000000000 +A8F2:000000000000000008900410031000E000000000000000000000000000000000 +A8F3:000000000000000008900410031000E0000000E0001000080008000800000000 +A8F4:00000000000000000450031000E000000450031000E000000060001000080008 +A8F5:000000000000000008900410031000E0000000E0001000100060001000080000 +A8F6:000000000000000008900410031000E0000000E0001000E0001000E000400020 +A8F7:000000000000000008900410031000E0000000E0010000800240018000000000 +A8F8:00000000000000000718082408240714080C08040808041003E0000000000000 +A8F9:00000000000000000038004400040004070408040808041003E0000000000000 +A8FA:0000000002200140008000000000000000000000000000000000000000000000 +A8FB:000000000000FFFF000000000000000000000000000000000000000000000000 +A8FC:0000000000000000000000000078008C60E618E60C06060C03F801F000000000 +A8FD:0000253811640E6400601FE0006000601FE01860186008600060406030600F80 +A8FE:13E0081007F8FFFF0C300C300C300C300C600400020001800060001000180018 +A8FF:13E0081007F80000000000000000000000000000000000000000000000000000 +A900:00000000000000001FF820042004200420042004200420041FF8000000000000 +A901:00000000000000003FFC000400041FFC20042000203C20441FF8000000000000 +A902:0000000000000000101010100820082004400440028002800100000000000000 +A903:00000000000000000FF8081008200040008001180228044807F0000000000000 +A904:0000000000000000107011901610181010101010001000100060000000000000 +A905:00000000000000001FF810001000100010001000100010001C00000000000000 +A906:0000000000000000101810681188160818081038104810481030000000000000 +A907:0000000000000000003800081008100810081008100810080FF0000000000000 +A908:0000000000000000100010001000100010001000100810081FF8000000000000 +A909:00000000000000001C0010001000100410041004100410040FF8000000000000 +A90A:00000000000000003C780488050806080C081408240824083808000000000000 +A90B:00000000000000001FF82004200420043FFC0004000420041FF8000000000000 +A90C:000000000000000011F01210141018101FF01010101010101010000000000000 +A90D:00000000000000001FF820042004200020002000200420041FF8000000000000 +A90E:00000000000000000FF0100810080B0804880B08100820083E08000000000000 +A90F:00000000000000001FF800080008038802480228022802180C08000000000000 +A910:0000000000000000106011901610182010401020101010701000000000000000 +A911:00000000000000001FF820040004000420043FF8200020041FF8000000000000 +A912:00000000000000000C000B0008C0083009800A400CC009400880000000000000 +A913:0000000000000000000800080008103810081008100810080FF0000000000000 +A914:00000000000000000FF010080F0000F0180810081FF010000F80000000000000 +A915:00000000000000001FF820042018206021802600380420041FF8000000000000 +A916:00000000000000000FC010201020100013E01420182010201010000000000000 +A917:0000000000000000200820082008210822882448282830181FF0000000000000 +A918:00000000000000000FF8001000200040008001180228044807F0000000000000 +A919:000000000000000008F009100A100C1008100870089008900860000000000000 +A91A:000000000000000008F009100A100C1008100810081008100810001000100060 +A91B:000000000000000020F021082108210821082108210821081E08000000000000 +A91C:000000000000000020F021082108210821081E08000820081FF0000000000000 +A91D:00000000000000001000100010001C0810081008100810080FF0000000000000 +A91E:00000000000000001FF820042000200020041FFC000420041FF8000000000000 +A91F:00000000000000000E1012101410183010501F90001000100060000000000000 +A920:0000000000000000600C583446C4410400040004400440043FF8000000000000 +A921:00000000000000000FF010081008000818081608118810681018000000000000 +A922:00000000000000001FF82004200420001E002000200420041FF8000000000000 +A923:000000000000000010081008100810081018102810C813081C08000000000000 +A924:00000000000000001FF8200C20340044018402040C0430041FF8000000000000 +A925:00000000000000001FF82004300C2C3423C42004200420041FF8000000000000 +A926:0000010000000000000000000000000000000000000000000000000000000000 +A927:0C00030000C00000000000000000000000000000000000000000000000000000 +A928:010006C018300000000000000000000000000000000000000000000000000000 +A929:0820082007C00000000000000000000000000000000000000000000000000000 +A92A:0920082007C00000000000000000000000000000000000000000000000000000 +A92B:0000000000000000000000000000000000000000000000000000000001000000 +A92C:0000000000000000000000000000000000000000000000000000080010200FC0 +A92D:0000000000000000000000000000000000000000000000000000090010200FC0 +A92E:000000000000000000000000000003C00C301008000000000000000000000000 +A92F:0000000000000000008000800080008000800080008000800080000000000000 +A930:0000000000000000010002800240052004800800080010001000000000000000 +A931:0000000000000000010002800240042004000800080010001000000000000000 +A932:000000000000000004440A880A881110111022A022A044404440000000000000 +A933:0000000000000000010002800240062005400880080010001000000000000000 +A934:00000000000000000180024002200610054008A0080010001000000000000000 +A935:0000000000000000030C05140514092409241144114421842184000000000000 +A936:0000000000000000001000100020002000400840048002800100000000000000 +A937:0000000000000000001000200040008001000200040008001000000000000000 +A938:000000000000000004400440028002800100210812900AA00440000000000000 +A939:0000000000000000008001400120029002480620051008A00840000000000000 +A93A:000000000000000004200A500948148412802100200040004000000000000000 +A93B:000000000000000004440AA80AA8111010002000200040004000000000000000 +A93C:00000000000000000210052804E4084008401080108021002100000000000000 +A93D:00000000000000000210052804E4084008401080188025002300000000000000 +A93E:0000000000000000018802880290049004A008A008C010C01080000000000000 +A93F:00000000000000004004400420082008101011100AA00AA00440000000000000 +A940:00000000000000000210052004E0084008401080108021002100000000000000 +A941:0000000000000000004000A0009001080100220012000C000400000000000000 +A942:00000000000000000108021002100420042008400C4012801180000000000000 +A943:0000000000000080014002200220041004900948094812241224000000000000 +A944:00000000000000000D4415441484148815481548262826282410000000000000 +A945:000000000000000004440AA80AA811101100220032004C004400000000000000 +A946:0000000000000000011002A002A0044006000A00090011001000000000000000 +A947:0000000000000000000000000000000000008000000000000000000000000000 +A948:0000000000000000000000000000000000000000000000000000800000000000 +A949:0000000000000000000000000000800080008000800000000000000000000000 +A94A:0008001400220000000000000000000000000000000000000000000000000000 +A94B:0000000000000000000000000000800080008000800000000000000080000000 +A94C:0000000000000000000000000000000000000000000000000000800080006000 +A94D:0000000000000000000000000000000000000000000000000000A000A000A000 +A94E:0000000000000000000000000000000000000000000000000000000A000A000A +A94F:0002000400000000000000000000000000000000000000000000000000000000 +A950:0012002400000000000000000000000000000000000000000000000000000000 +A951:0022001400080000000000000000000000000000000000000000000000000000 +A952:0000000000000000000000000000000000000000000000000000000200000002 +A953:0004000A00040000000000000000000000000000000000000000000000000000 +A954:00007FFE61CE6DB661C66DF66DCE7FFE7FFE61B66FB661867DF661F67FFE0000 +A955:00007FFE61CE6DB661C66DF66DCE7FFE7FFE61866FBE61867DF661867FFE0000 +A956:00007FFE61CE6DB661C66DF66DCE7FFE7FFE61CE6FBE618E7DB661CE7FFE0000 +A957:00007FFE61CE6DB661C66DF66DCE7FFE7FFE61866FF661EE7DDE61DE7FFE0000 +A958:00007FFE61CE6DB661C66DF66DCE7FFE7FFE61CE6FB661CE7DB661CE7FFE0000 +A959:00007FFE61CE6DB661C66DF66DCE7FFE7FFE61CE6FB661C67DF661CE7FFE0000 +A95A:00007FFE61CE6DB661C66DF66DCE7FFE7FFE61866FB661867DB661B67FFE0000 +A95B:00007FFE61CE6DB661C66DF66DCE7FFE7FFE618E6FB6618E7DB6618E7FFE0000 +A95C:00007FFE61CE6DB661C66DF66DCE7FFE7FFE61C66FBE61BE7DBE61C67FFE0000 +A95D:00007FFE61CE6DB661C66DF66DCE7FFE7FFE618E6FB661B67DB6618E7FFE0000 +A95E:00007FFE61CE6DB661C66DF66DCE7FFE7FFE61866FBE618E7DBE61867FFE0000 +A95F:0000000000000000008009300940058012700E4801A002900C90010000000000 +A960:00003E7C2044204420443E7C0000000000000000000000000000000000000000 +A961:00003E442044207C20443E7C0000000000000000000000000000000000000000 +A962:00003E102010201020283E440000000000000000000000000000000000000000 +A963:00003E7C2008201020283E440000000000000000000000000000000000000000 +A964:00007CF804087C0840087C080000000000000000000000000000000000000000 +A965:00003DDC04443C4420443C440000000000000000000000000000000000000000 +A966:00003E7C02403E4020403E7C0000000000000000000000000000000000000000 +A967:00003DDC05103D1021103DDC0000000000000000000000000000000000000000 +A968:00003E7C02443E4420443E7C0000000000000000000000000000000000000000 +A969:00003E4402443E7C20443E7C0000000000000000000000000000000000000000 +A96A:00003D5405543DDC21543DDC0000000000000000000000000000000000000000 +A96B:00443E7C02443E7C20383E440038000000000000000000000000000000000000 +A96C:00003E1002103E1020283E440000000000000000000000000000000000000000 +A96D:00003E7C02083E1020283E440000000000000000000000000000000000000000 +A96E:00003E7C02043E7C20043E040000000000000000000000000000000000000000 +A96F:00003E7C2204220422043E040000000000000000000000000000000000000000 +A970:00003E7C2240224022403E7C0000000000000000000000000000000000000000 +A971:00003E102210221022283E440000000000000000000000000000000000000000 +A972:0000293C2920393C2AA03C7C0000000000000000000000000000000000000000 +A973:0000227C22043E7C22043E040000000000000000000000000000000000000000 +A974:0000223022FC3E3022483E300000000000000000000000000000000000000000 +A975:000008920892089E1552223E0000000000000000000000000000000000000000 +A976:00000E3E1102113E11200E3E0000000000000000000000000000000000000000 +A977:00001C3022FC223022481C300000000000000000000000000000000000000000 +A978:00003FEC047F088C1552222C0000000000000000000000000000000000000000 +A979:00003E7C20403E7C20403E7C0000000000000000000000000000000000000000 +A97A:00003E3014FC143014483E300000000000000000000000000000000000000000 +A97B:00000C103F100C1012280C440000000000000000000000000000000000000000 +A97C:00003EFC00000C3012480C300000000000000000000000000000000000000000 +A97D:00007FFE61CE6DB661C66DF66DCE7FFE7FFE618E7DB67BB677B6778E7FFE0000 +A97E:00007FFE61CE6DB661C66DF66DCE7FFE7FFE61867DBE7B8E77BE77867FFE0000 +A97F:00007FFE61CE6DB661C66DF66DCE7FFE7FFE61867DBE7B8E77BE77BE7FFE0000 +A980:11880A5007E00000000000000000000000000000000000000000000000000000 +A981:0240038000000000000000000000000000000000000000000000000000000000 +A982:0040008001000200000000000000000000000000000000000000000000000000 +A983:0000000000000000000600090009000500020006000100010001000100010002 +A984:0000000000000000300040008000B03C88A4B0FE882489A47264000000000000 +A985:000000000000000038D845244524440444044404450424842784018002600010 +A986:0000000000000000228855545554505450545054545452545E74060009800040 +A987:0000000000000000228855545554505450545054545458545B74040002000C00 +A988:000000000000000038D845244524440444044404450424842788003000460078 +A989:000000000000000030C049204920492049204920492049204E2004000F000080 +A98A:000000000000000031B04A484A4848084A08491C4F2800480788080809880670 +A98B:000000000000000031B04A484A4848084A0C491A4F2A004C078A080A098C0670 +A98C:000000000000000000000000000007800A401180100010700F88000000000000 +A98D:000003000400038000400180000007800A401180100010700F88000000000000 +A98E:000000000000000039C0492090909090909090904F2000400380043809C00E00 +A98F:00000000000000002388545454545454545454545E5455545574020000000000 +A990:00000000000000002388545454545454545454545E5455545574060009800040 +A991:00000000000000002384544854505450545054505E5055505560020000000000 +A992:000000000000000031104AA84AA84AA84AA82AA80AA80AA80EE8000000000000 +A993:0000000000000000231855145514551455145514555455545CA0000000000000 +A994:000000000000000038D8452445244404440444044484244427C4000000000000 +A995:0000000000000000387044484448444844484E485548554848C8000000000000 +A996:000000000000000010002200452049524A55529654A5552A2210000000000000 +A997:000000000000000038784484451C45E045C04530450824882780000000000000 +A998:000000000000000038784484451C45E045C04530450824882780018002600010 +A999:000800140014000E31454AA54AA648244A2449244F2400440784080808C80730 +A99A:0000000000008000457EAADAAADAA0DAA8DAA4DABCDA00000000000000000000 +A99B:000000000000000031B04A484A484808480848084B084C884708084008400780 +A99C:000000000000000031B04A484A4848084808480849884A484F88000000000000 +A99D:000000000000000038F048909050905090509050925092504D90000000000000 +A99E:0000000000000000398048409040904090409040924092404D80000000000000 +A99F:0000000000000000224855B455B455B455B435B415B415B41DB4000000000000 +A9A0:000000000000000027CC543454345434533450B450B450B45F34000000000000 +A9A1:000000000000000038F048909050905090509250955091504F90010001400080 +A9A2:000000000000000039E04A109210921092109210939096504990000000000000 +A9A3:000000000000000038F048909050905090509050925092504D90000000000000 +A9A4:000000000000000039E04A109210921092109F10929092905110000000000000 +A9A5:0000000000000000387044484448444844484448444844482388000000000000 +A9A6:0000000000000000386048909090905090209030924892484D90000000000000 +A9A7:0000000000000000629C95549554905490549054945492545F64000000000000 +A9A8:00000000000000003C782448244804404F4074E00258014400C0000000000000 +A9A9:00000000000000003F18482448244824472448244824482427C4000000000000 +A9AA:000000000000000039CE494A494A494A494A494A494A494A2E32000000000000 +A9AB:00000000000000003C78228412840284048408841C8402840184000000000000 +A9AC:000C0012000E000264929B6A9B6A9B6A5B6A1B6A1B6A1B6A1B6E000000000000 +A9AD:000000000000000039DC4A549254925492549254925492544E64000000000000 +A9AE:00000000000000001CF024884848484848484848484848482788000000000000 +A9AF:0000000000000000233054C854C854C855C836C817FC14CA1CC8000000000000 +A9B0:00000000000000003878484890489148924893FC904A90484F88000000000000 +A9B1:00000000000000003C3C44248424842484248E249524952448C4000000000000 +A9B2:000000000000000039FC49649164916491649164916491644E64000000000000 +A9B3:0000024001802424181800000000000000000000000000000000000000000000 +A9B4:0000000000000000000600090009000100020002000400050007000000000000 +A9B5:0000000000000000000000040004000200020001000900060000000000000000 +A9B6:01E0021004100410047003900000000000000000000000000000000000000000 +A9B7:01E00210053004D0047003900000000000000000000000000000000000000000 +A9B8:000000000000000000000000000000050005000500050005000500050019003E +A9B9:000000000000000000000004000F00140014000E00050005000500050019003E +A9BA:00000000000000004800B400B400B400B400B400B400B4003400040004000300 +A9BB:1800200010000800300000004800B400B400B400B400B4003400040004000300 +A9BC:0780084008200610000000000000000000000000000000000000000000000000 +A9BD:0000000000000000000000000000000100060002000100010001003200340058 +A9BE:000E000A000A000A000A000A000A000A000A002A002A00CA030A040A04CA0331 +A9BF:180020004000800080008000800080008000800080048008401C2002180207FC +A9C0:000E000A000A000A000A000A000A000A000A000A000A030A048A040A04CA0331 +A9C1:00000006060A04080408020861E04004206A1F8400100612042203C2000A000C +A9C2:00003000500043C044204860080021F856042002078610401020102050606000 +A9C3:2800D586C586C586D586F58601861D8621862F86A5E6999F818781C741D73EA9 +A9C4:6800D586C586C586D586F58681869D86A186AF86A5E6999F818781C741D73EA9 +A9C5:30004006E806D586C586F58681869D86A186AF86A5E6999F818781C741D73EA9 +A9C6:0000000000000000000001C0022002200220022001C000000000000000000000 +A9C7:0000000000000000000000000240038000000000024003800000000000000000 +A9C8:00000000000000001800040002000100008000800040034000C0000000000000 +A9C9:0000000000000000330008800440022001100110008806E80198000000000000 +A9CA:00000000000000000600010001000100010001000100010001000100010000C0 +A9CB:0000000000000000198004400440044004400440044004400440044004400330 +A9CC:0000001000200140010000C006000100010001000100010001000100010000C0 +A9CD:0000018000400040004000400040004000400040003001800040014002000400 +A9CE:00007FFE61CE6DB661C66DF66DCE7FFE7FFE71866FBE6F8E6FBE71867FFE0000 +A9CF:0000000000000000000000000820072002C00200010001000100000000000000 +A9D0:0000000000000000000001C0022002200220022001C000000000000000000000 +A9D1:000000000000000031104AA84AA84AA84AA82AA80AA80AA80EE8000000000000 +A9D2:000000000000000031B04A484A4848084A08491C4F2800480788080809880670 +A9D3:00000000000000002367549554955015541552255E4500850F05100511850E79 +A9D4:000000000000000000C00100020002C0022002C00220022001C0000000000000 +A9D5:00000000000000000380044008200B2008A00B2008A008A00720002000200018 +A9D6:000000000000000000000000000007800A401180100010700F88000000000000 +A9D7:000000000000000039DC4A549254925492549254925492544E64000000000000 +A9D8:0000000000000000386048909090905090209030924892484D90000000000000 +A9D9:000000000000000039CE494A494A494A494A494A494A494A2E32000000000000 +A9DA:00007FFE61CE6DB661C66DF66DCE7FFE7FFE63866DB66D866DB663B67FFE0000 +A9DB:00007FFE61CE6DB661C66DF66DCE7FFE7FFE638E6DB66D8E6DB6638E7FFE0000 +A9DC:00007FFE61CE6DB661C66DF66DCE7FFE7FFE63C66DBE6DBE6DBE63C67FFE0000 +A9DD:00007FFE61CE6DB661C66DF66DCE7FFE7FFE638E6DB66DB66DB6638E7FFE0000 +A9DE:000000000000000000800140022002200220022001C000000000000000000000 +A9DF:00000000000000001C7022882288228822882288228822882388000000000000 +A9E0:0000000000000000000000F801440082000200F2008C00780000000000000000 +A9E1:00000000000000000000018C024203A1002100210252018C0000000000000000 +A9E2:00000000000000000000018C024A0029002500230252018C0000000000000000 +A9E3:00000000000000000000018C02D20120002001FC0252018C0000000000000000 +A9E4:0000000000000000000000C60108021002100216012900C60000000000000000 +A9E5:0070008800800070008800000000000000000000000000000000000000000000 +A9E6:0000000000900120024004800000000000000000000000000000000000000000 +A9E7:00000000000000000000018C02520421042102210122062C0020002000200038 +A9E8:0000000000180020002001AC0232042104210421027201AC00200020002000E0 +A9E9:00000000000000000000018C02520421042D04210242000C0000000000000000 +A9EA:00000000000000000000018C02120421042D04210242018C0000000000000000 +A9EB:00000000000000000000018C02520421042D04210212018C0000000000000000 +A9EC:00000000000000000000000001020201022502510251018E0000000000000000 +A9ED:00000000000000000000018C0252042105AD04210242018C0000000000000000 +A9EE:00000000000000000000018C0252042105AD04210252018C0000000000000000 +A9EF:0000000000000000000000380244028201CA00A2004400000000000000000000 +A9F0:000003C00420081008100810081008100810081008100810042003C000000000 +A9F1:000003C004200E1009100620000003C004200E10091006200040007000000000 +A9F2:0000081008100810042003D0001003D00420080008000800042003C000000000 +A9F3:000003E0041000100010061005E0040005E0061000100010041003E000000000 +A9F4:000007C0082008000800086007A0002007A0086008000800082007C000000000 +A9F5:000003C0042008100800080008000BC00C200810081008100420024000000000 +A9F6:0000000002400420081008100810043003D00010001000100810042003C00000 +A9F7:000000000780084010201C2012200C2000200020002000200020003800000000 +A9F8:000003C00420080008000800040003C00420081008100810042003C000000000 +A9F9:000000000000000000000070008841044104410422881C700000000000000000 +A9FA:00000000000000000000018C0242042105A104210212018C0000000000000000 +A9FB:00000000000000000000018C02520421042D04210242018C0000000000000000 +A9FC:00000000000000000000018C02520421042D04210252018C0000000000000000 +A9FD:0000000000000000000000480084010201320102008400780000000000000000 +A9FE:0000000000180020002001AC02320421042D04210252018C0000000000000000 +A9FF:00007FFE61CE6DB661C66DF66DCE7FFE7FFE61866FBE638E6FBE6FBE7FFE0000 +AA00:00000000000000000E0611C9222929323480188013C004A00300000000000000 +AA01:00000000000000000CC013201020282050400780082008500790000000000000 +AA02:0000000000000000038004400820082004400180020002400180000000000000 +AA03:00380044004400480E20111011080928025804300420024001E0000000000000 +AA04:00000000000000000E70118818081408083000C00110011000E0000000000000 +AA05:00000000000000000380044008201C200AC0042000F0012800C0000000000000 +AA06:00000000000000000EE011101110102008000800080008001000000000000000 +AA07:00000000000000001B0C24922452206411C01280148015002200000000000000 +AA08:000000000000000007700888108810101000100011000A800700000000000000 +AA09:0000000000000000186C24922492148404800880090006000200000000000000 +AA0A:00000000000000001C2822502230161001100120014003800400000000000000 +AA0B:00000000000000001C2822502230161001100120014003800430044804900300 +AA0C:00000000000000001C3022482248114001800F00120012000C00000000000000 +AA0D:00000000000000001886254925491544064C1C94248828901060000000000000 +AA0E:000000000000000038D8452445242C8802800280028007000800000000000000 +AA0F:0000000000000000031804A404A404A8052013902B5027301CE0000000000000 +AA10:00000000000000001986264940314022406040A02920152028C0000000000000 +AA11:00000000000000001986264940314022406040A02920152028C4004A00480030 +AA12:00000000000000001986264940314022406040A02920152029C4024A01480230 +AA13:0000000000000000077008880888101010001600190009000600000000000000 +AA14:00000000000000000E0C111211120928025804300420024001C0000000000000 +AA15:00000000000000001C7022882288165001400140014003800400000000000000 +AA16:00000000000000000C70128812880A5002400440048003000100000000000000 +AA17:00000000000000001C0C22122212110801080F08129012600C40000000000000 +AA18:00000000000000001C0C22122212110801080F08129012600C48009400900060 +AA19:00000000000000001C0C22122212110801080F08129012600C0008C009200600 +AA1A:0000000000000000077008880888040004002400540048003000000000000000 +AA1B:00000000000000001C1822242224162801200120014003800400000000000000 +AA1C:00000000000000000E0C1112111209080A284A58AA30911060E0000000000000 +AA1D:0000000000000000183024482448085010401040104008400780000000000000 +AA1E:0000000000000000306C48924892108020802080208010800F00000000000000 +AA1F:0000000000000000306C4892489228840A80110012800C800400000000000000 +AA20:0000000000000000183824442444144805400880094006400248009400900060 +AA21:0000000000000000183824442444144805400880095006200250005000200000 +AA22:0000000000000000306C48924892248404400240024002800700000000000000 +AA23:000000000000000000F001080108009000800680098009000600000000000000 +AA24:0000000000000000073808C4080410041008101012000D000600000000000000 +AA25:00000000000000001838244424441448044008D0092006500250002000000000 +AA26:00000000000000000C1C12222A22522402200440048003000100000000000000 +AA27:0000000000000000073808C408040408020012002A0024001800000000000000 +AA28:00000000000000000770088808980428021412002A0024001800000000000000 +AA29:0038004400480020001800040004000000000000000000000000000000000000 +AA2A:001C00220041004D003200040000000000000000000000000000000000000000 +AA2B:001C002200490041004D00320004000000000000000000000000000000000000 +AA2C:00380045008E009A006400080000000000000000000000000000000000000000 +AA2D:00000000000000000000000000000000000000000000000000000002001C0020 +AA2E:00000011000E0000000000000000000000000000000000000000000000000000 +AA2F:0000000000000000000000006000900090008000A0005000A000000000000000 +AA30:0000000000000000000000006000900090008000A00050002000080070008000 +AA31:0002001C00200024001800100020000000000000000000000000000000000000 +AA32:0000000000000000000000000000000000000000000000000000000C00040008 +AA33:0000000000000000000000000000000600090009000800040032000A0012003C +AA34:5800A8008800100020004000800080008000800080008000800082004A003400 +AA35:000000000000000000000000000000000000000000000000000000040008000C +AA36:0000000000000000000000000000000000000008000500020005000500050002 +AA37:00007FFE61866DB661866DB66DB67FFE7FFE63867DF671EE7DDE63DE7FFE0000 +AA38:00007FFE61866DB661866DB66DB67FFE7FFE63CE7DB671CE7DB663CE7FFE0000 +AA39:00007FFE61866DB661866DB66DB67FFE7FFE63CE7DB671C67DF663CE7FFE0000 +AA3A:00007FFE61866DB661866DB66DB67FFE7FFE63867DB671867DB663B67FFE0000 +AA3B:00007FFE61866DB661866DB66DB67FFE7FFE638E7DB6718E7DB6638E7FFE0000 +AA3C:00007FFE61866DB661866DB66DB67FFE7FFE63C67DBE71BE7DBE63C67FFE0000 +AA3D:00007FFE61866DB661866DB66DB67FFE7FFE638E7DB671B67DB6638E7FFE0000 +AA3E:00007FFE61866DB661866DB66DB67FFE7FFE63867DBE718E7DBE63867FFE0000 +AA3F:00007FFE61866DB661866DB66DB67FFE7FFE63867DBE718E7DBE63BE7FFE0000 +AA40:00000000000000000EE011101110101008100820082008401080000000000000 +AA41:00000000000000000EE01110111020102010202020202C401C80000000000000 +AA42:00000000000000001C2022502250163001180124014403880410000000000000 +AA43:0004000800300000000000000000000000000000000000000000000000000000 +AA44:00000000000000001C3822442244114401840F08120812100C20000000000000 +AA45:0000000000000000077008880888100810081610191009200640000000000000 +AA46:0000000000000000381C44224422221202121E14252424C81890000000000000 +AA47:00000000000000000770088808880408020812102A1024201840000000000000 +AA48:0000000000000000306C48924892248204420244024402880710000000000000 +AA49:000000000000000000F801040104008400840688098809100620000000000000 +AA4A:00000000000000000E701188100820082008201024102A201C40000000000000 +AA4B:00000000000000001C7812842A84524402440448048803100120000000000000 +AA4C:0000002000000000000000000000000000000000000000000000000000000000 +AA4D:0000000000000000000000000006000900050001000200040004000000000000 +AA4E:00007FFE61866DB661866DB66DB67FFE7FFE6D866DBE618E7DBE7D867FFE0000 +AA4F:00007FFE61866DB661866DB66DB67FFE7FFE6D866DBE618E7DBE7DBE7FFE0000 +AA50:000000000000000003C0042008100810081008100810042003C0000000000000 +AA51:00000000000000000FE0101010103C200CC00100010001000100000000000000 +AA52:000203840478080013B824442444280429042A88270810100FE0000000000000 +AA53:00000000000000000E7011881008200820102024244A2A4A1C30000000000000 +AA54:0000000000000000000406080908109020507C20220022001C00000000000000 +AA55:00000000000000000F0010801080090002800040034004800340000000000000 +AA56:000000000000000000F001080108009000800680098009000600000000000000 +AA57:000000000000000000F801040104008400840688098809100660008800940060 +AA58:00000000000000001C3822442244114401840F08120812100C60008800940060 +AA59:0000000000000000183824442444084410841088108809100660008800940060 +AA5A:00007FFE61866DB661866DB66DB67FFE7FFE61866FB661867DB661B67FFE0000 +AA5B:00007FFE61866DB661866DB66DB67FFE7FFE618E6FB6618E7DB6618E7FFE0000 +AA5C:0000000000000000000001C00220041024101310082007C00000000000000000 +AA5D:0000000000000000008000800080008000800080008000800080000000000000 +AA5E:0000000000000000024002400240024002400240024000400040000000000000 +AA5F:0000000000000000049004900490049004900090009000100010000000000000 +AA60:00000000000000000000018C0252042304250429024A000C0000000000000000 +AA61:00000000000000000000018C02520421042102210152060C0000000000000000 +AA62:000000000000000000000118010401020102014201A401180000000000000000 +AA63:00000000000000000000018C025204A104A104A10252060C0000000000000000 +AA64:00000000000000000000000C02520421042104210252018C0000000000000000 +AA65:00000000000000000000010C0212042104210421026201AC00200020002000E0 +AA66:00000000000000000000018C0252042105A104210242018C0000000000000000 +AA67:00000000000000000000018C0252042105A104210252018C0000000000000000 +AA68:00000000000000000000018C0252042305A50429024A018C0000000000000000 +AA69:00000000000000000000018C0252042105B904250252018C0000000000000000 +AA6A:00000000000000000000018C02520421043904250252018C0000000000000000 +AA6B:0000000000000000000000380244028201C200A2004400000000000000000000 +AA6C:0000000000000000000000000102020102310249024901860000000000000000 +AA6D:00000000000000000000000C005200A1006100210022002C00200020012000C0 +AA6E:00000000000000000000018C02420621052104A10292018C0000000000000000 +AA6F:00000000000000000000011801A4014201420142012401180000000000000000 +AA70:000003E00410000003E004100000000000000000000000000000000000000000 +AA71:00000000000000000000018C02520521052105210242000C0000000000000000 +AA72:00000000000000000000004C00B2011101110711052A030C0000000000000000 +AA73:00000000000000000000010C01820181014101210112010C0000000000000000 +AA74:00300048004000200010040808C810A810A810A808C807880088038804C80330 +AA75:0018002400200010000818C42524421442142214142460C40084038404E40318 +AA76:000C001200100008000438E24512020A020A020A020A02320222326242B23C4C +AA77:000006000900080004000FF0109020502050205010500F5C0040004000400070 +AA78:000000000000000C001208A02720102010401040274008C00000000000000000 +AA79:0000000000000000000007800840102010201020082007A00020002000200038 +AA7A:00000000002007C00800098C0A420C210C210C210A12099C08100810081007E0 +AA7B:0000000000000000000000000000000000000100028003000200010000000000 +AA7C:00000000000001FE000000000000000000000000000000000000000000000000 +AA7D:0000000000000000000000000000000007E00000000000000000000000000000 +AA7E:0000000000000000000000710089000501E501150089007900090009000D001A +AA7F:00000000000000000000011102A90045074504C502AD011500050005000D001A +AA80:00000000000000001830085008900890091009100A100C100000000000000000 +AA81:000000000000000003E00410082808480888090806101E200000000000000000 +AA82:0000000000000E04110820882088208820882088110809F00008000800880070 +AA83:000000000000661C222222422242224222422242224C1D82000200020022001C +AA84:0000000000000E0811102090209020907110291C293210CC0000000000000000 +AA85:00000000000008F00508020802080208000800080030000800080208010800F0 +AA86:000000000000038004400820082008201C200A200A2004200020002004400380 +AA87:000000000000038004400820082008200820046003A000200020002004400380 +AA88:00060008000EDB094C86488848884888488849EA4A95310A0000000000000000 +AA89:02000400080013C0142014101010101010100810042003C00000000000000000 +AA8A:000000300048008000801880248004800480048004E003D00060000000000000 +AA8B:0000000000000210052804F0042004200420042004200820002000200012000C +AA8C:0000003C0042008000803060488008800880088008C0092006C0000000000000 +AA8D:0000003C00420080008030604880088008800880088008800700008000800300 +AA8E:0000000000003008081004200240018001802240142008180000000000000000 +AA8F:0007000800100E1011102090209020907110291C293210CC0000000000000000 +AA90:00000000000066D823242224222422242224222422241C240004000400840078 +AA91:0000000000000770088810881008780814080C080008000800080008010800F0 +AA92:000000000000000003E00410080808080808080804101E200000000000000000 +AA93:00000000000060E021102210221022102210239026501990001000100012000C +AA94:0000000000000770088810881008780814080C10000000000000000000000000 +AA95:0000000000003040484008400840084008400840084807B00000000000000000 +AA96:0000000000000E00110020802080208070802880288010800080008800880070 +AA97:0000000000000C1004100410041004100410043004500390001000100012000C +AA98:000200040008DB084C88488848884888488849EA4A95310A0000000000000000 +AA99:000000000000000018202440048004800480048004E003D00060000000000000 +AA9A:0000002000400080008018802480048004800480048003000000000000000000 +AA9B:000400080008000832481248124812481248124812480DB00000000000000000 +AA9C:0018002400403040084008400840084008400840048003000000000000000000 +AA9D:000800100010001031101110111011101110111011100EE00000000000000000 +AA9E:0000003C004200800080606014801A801080108010C011200EC0000000000000 +AA9F:000400080008010862882288228822882288228822881C700008000800300000 +AAA0:0000042004401B80308008800900090009000960089007600000000000000000 +AAA1:0000001C00220020632025202520292029203138316420980000000000000000 +AAA2:0000000000016D822644244424442444244224E22552188C0000000000000000 +AAA3:0000000000043808441004100410041004080E08150808F00000000000000000 +AAA4:020C02120DA03820442004200420042004200420024001800000000000000000 +AAA5:020802100DA03820442004200420042004200420024001800000000000000000 +AAA6:0000000000002300148008400840084008400840102420180000000000000000 +AAA7:0000000000002300148008400840084008400858103420380010000800000000 +AAA8:000000000000CDC046204420442044204420442044203820002000200012000C +AAA9:0000000000000780084008400090012000C000800D0002000000000000000000 +AAAA:000000000000DB704C884884488448844884488448A430980000000000000000 +AAAB:00000000000003C0042004100010001000100810042003C00000000000000000 +AAAC:000000000000CCC055204E104410441044104422442438180000000000000000 +AAAD:00000000000030E0111012081208120814081408144808300000000000000000 +AAAE:00000000000003C0042004100250019000100410042003C00000000000000000 +AAAF:000003C004200410021001F800140414042403C4000400040004000400880070 +AAB0:0000042008400880070000000000000000000000000000000000000000000000 +AAB1:0000000000000780044000400040004000400040004000400000000000000000 +AAB2:00000100010006C0000000000000000000000000000000000000000000000000 +AAB3:080014E017100800100008000000000000000000000000000000000000000000 +AAB4:0000000000000000000000000000000000000000000C0012000E0022001C0000 +AAB5:000000000000042008401080108010801080108010800C600000000000000000 +AAB6:000001E002100400040004000400040004000400040003000000000000000000 +AAB7:0010002000400280010000000000000000000000000000000000000000000000 +AAB8:001000A0004002A0010000000000000000000000000000000000000000000000 +AAB9:0000000000000080010002000200020002000200020001800000000000000000 +AABA:0000000000E0010002000200010000C0010001C002A004400000000000000000 +AABB:00000600090008800880049003E0008000800080008003000000000000000000 +AABC:00000000000001C00220040004000400020001C0008001000200020004000600 +AABD:0000002000400080009031E04A8008800880088008C0092006C0000000000000 +AABE:038802700E2009C0388027000000000000000000000000000000000000000000 +AABF:0040004000400080008000800000000000000000000000000000000000000000 +AAC0:0000000000000180024004400440048007000420044003800000000000000000 +AAC1:0000003006400980030004000000000000000000000000000000000000000000 +AAC2:0000000000000780044000400040004000400040004000400040008001000200 +AAC3:00007FFE61866DB661866DB66DB67FFE7FFE718E6FF66FC66FF6718E7FFE0000 +AAC4:00007FFE61866DB661866DB66DB67FFE7FFE71B66FB66F866FF671F67FFE0000 +AAC5:00007FFE61866DB661866DB66DB67FFE7FFE71866FBE6F866FF671867FFE0000 +AAC6:00007FFE61866DB661866DB66DB67FFE7FFE71CE6FBE6F8E6FB671CE7FFE0000 +AAC7:00007FFE61866DB661866DB66DB67FFE7FFE71866FF66FEE6FDE71DE7FFE0000 +AAC8:00007FFE61866DB661866DB66DB67FFE7FFE71CE6FB66FCE6FB671CE7FFE0000 +AAC9:00007FFE61866DB661866DB66DB67FFE7FFE71CE6FB66FC66FF671CE7FFE0000 +AACA:00007FFE61866DB661866DB66DB67FFE7FFE71866FB66F866FB671B67FFE0000 +AACB:00007FFE61866DB661866DB66DB67FFE7FFE718E6FB66F8E6FB6718E7FFE0000 +AACC:00007FFE61866DB661866DB66DB67FFE7FFE71C66FBE6FBE6FBE71C67FFE0000 +AACD:00007FFE61866DB661866DB66DB67FFE7FFE718E6FB66FB66FB6718E7FFE0000 +AACE:00007FFE61866DB661866DB66DB67FFE7FFE71866FBE6F8E6FBE71867FFE0000 +AACF:00007FFE61866DB661866DB66DB67FFE7FFE71866FBE6F8E6FBE71BE7FFE0000 +AAD0:00007FFE61866DB661866DB66DB67FFE7FFE63CE6DB66DB66DB663CE7FFE0000 +AAD1:00007FFE61866DB661866DB66DB67FFE7FFE63EE6DCE6DEE6DEE63C67FFE0000 +AAD2:00007FFE61866DB661866DB66DB67FFE7FFE63866DF66D866DBE63867FFE0000 +AAD3:00007FFE61866DB661866DB66DB67FFE7FFE638E6DF66DC66DF6638E7FFE0000 +AAD4:00007FFE61866DB661866DB66DB67FFE7FFE63B66DB66D866DF663F67FFE0000 +AAD5:00007FFE61866DB661866DB66DB67FFE7FFE63866DBE6D866DF663867FFE0000 +AAD6:00007FFE61866DB661866DB66DB67FFE7FFE63CE6DBE6D8E6DB663CE7FFE0000 +AAD7:00007FFE61866DB661866DB66DB67FFE7FFE63866DF66DEE6DDE63DE7FFE0000 +AAD8:00007FFE61866DB661866DB66DB67FFE7FFE63CE6DB66DCE6DB663CE7FFE0000 +AAD9:00007FFE61866DB661866DB66DB67FFE7FFE63CE6DB66DC66DF663CE7FFE0000 +AADA:00007FFE61866DB661866DB66DB67FFE7FFE63866DB66D866DB663B67FFE0000 +AADB:0007000800100E12110C208420B823C87D08291C292A10CC0000000000000000 +AADC:0007000800100E12110C2084208820887108291C292A10CC0000000000000000 +AADD:02000400080008000B8004400A20092008E01C500A480A480430000000000000 +AADE:1F7C21844508105001020A0405545AAC4AA44AA464980000145041043EF80000 +AADF:0000007000800100012000C00040008000801FE0209007E0088011C00EA000C0 +AAE0:000000000000000001C002200410081008100010001013900C70000000000000 +AAE1:00000000000000001FF008000800080008100810082004400380000000000000 +AAE2:00000000000000001CE0249017A0102010200840084008403030000000000000 +AAE3:000000000000000001900190016002000200020034004C004C00000000000000 +AAE4:0000000000000000070C089210A2204250A28912850A48923062000000000000 +AAE5:00000000000000001FF00100010001000FE009200FE009200FE0000000000000 +AAE6:00000000000000000700088018C0252042104010202020201040000000000000 +AAE7:0000000000000000183024482288210822882448282824482388000000000000 +AAE8:00000000000000003FF0100013F0101010201040104010801080000000000000 +AAE9:00000000000000007FFC22881450082014502288228814500820000000000000 +AAEA:000000000000000007C00820082008200FE00820082008200FE0000000000000 +AAEB:00006000900090007C0020002000200020002000200020002000000000000000 +AAEC:0000000000000000000000000000000000000000000000000490049003600000 +AAED:008000400020006000A000400000000000000000000000000000000000000000 +AAEE:0000600090007000200020003800200020002000200020002000000000000000 +AAEF:0000000C0012001C000800080038000800080008000800080008000000000000 +AAF0:0000000000000000008000800080008000800080008000800080000000000000 +AAF1:000000000000000010100C600380000003800C60101000000000000000000000 +AAF2:00000080022001C0000001C002200020004001800200022001C0000000000000 +AAF3:000000000000000007C008200820044002800100028004400820000000000000 +AAF4:0000000000000000038000400020002000400080010000800060000000000000 +AAF5:000000000000000000000004000A000A00040004000400000000000000000000 +AAF6:0000000000000000000000000000000000000000000000000000008001C00080 +AAF7:00007FFE61866DB661866DB66DB67FFE7FFE61866FF663EE6FDE6FDE7FFE0000 +AAF8:00007FFE61866DB661866DB66DB67FFE7FFE61CE6FB663CE6FB66FCE7FFE0000 +AAF9:00007FFE61866DB661866DB66DB67FFE7FFE61CE6FB663C66FF66FCE7FFE0000 +AAFA:00007FFE61866DB661866DB66DB67FFE7FFE61866FB663866FB66FB67FFE0000 +AAFB:00007FFE61866DB661866DB66DB67FFE7FFE618E6FB6638E6FB66F8E7FFE0000 +AAFC:00007FFE61866DB661866DB66DB67FFE7FFE61C66FBE63BE6FBE6FC67FFE0000 +AAFD:00007FFE61866DB661866DB66DB67FFE7FFE618E6FB663B66FB66F8E7FFE0000 +AAFE:00007FFE61866DB661866DB66DB67FFE7FFE61866FBE638E6FBE6F867FFE0000 +AAFF:00007FFE61866DB661866DB66DB67FFE7FFE61866FBE638E6FBE6FBE7FFE0000 +AB00:00007FFE618E6DB6618E6DB66D8E7FFE7FFE73CE6DB66DB66DB673CE7FFE0000 +AB01:000000000600060007000F8018C018C01FC01FFC18CC18C018C018C000000000 +AB02:000000000600060007000F8018C018C01FC01FC018C018C018CC18FC00000000 +AB03:000000000180018001C003E00630063007F007F0063000300030003000000000 +AB04:000000000600060007000F8018C018C01FC01FC018C018F818CC18F800000000 +AB05:000000000300038001C003E00630063007F007F0063006300630063000000000 +AB06:000000000180018001C003E00630063007F007F0063006000600060000000000 +AB07:00007FFE618E6DB6618E6DB66D8E7FFE7FFE73866DF66DEE6DDE73DE7FFE0000 +AB08:00007FFE618E6DB6618E6DB66D8E7FFE7FFE73CE6DB66DCE6DB673CE7FFE0000 +AB09:0600060007000F8018801F8018800D0006001FC030C030FC018C018000000000 +AB0A:0600060007000F8018801F8018800D0006001FC030C030C0019801F800000000 +AB0B:03000300038007C00C400FC00C40068003000FF00C300C300030003000000000 +AB0C:0600060007000F8018801F8018800D0006000600060003F03F9830F000000000 +AB0D:0600060007000F8018801FF818980D0006000600060003003FF0303000000000 +AB0E:0300038007C00C400FC00C400680030007F00C30180018001800180000000000 +AB0F:00007FFE618E6DB6618E6DB66D8E7FFE7FFE73866DBE6D8E6DBE73BE7FFE0000 +AB10:00007FFE618E6DB6618E6DB66D8E7FFE7FFE7BCE73B67BB67BB671CE7FFE0000 +AB11:60307FF0401018C018C018C018C01FC01FC018FC18CC18CC18C018C000000000 +AB12:60307FF0401018C018C018C018C01FC01FC018C018C018C018CC18FC00000000 +AB13:30183FF820080C600C600C600C600FE00FE00C600C6000600060006000000000 +AB14:60307FF0401018C018C018C018C01FC01FC018C018C018F818CC18F800000000 +AB15:30183FF8200800001C3036303630063007F007F0063006300630063000000000 +AB16:30183FF820080C600C600C600C600FE00FE00C600C600C000C000C0000000000 +AB17:00007FFE618E6DB6618E6DB66D8E7FFE7FFE7B8673F67BEE7BDE71DE7FFE0000 +AB18:00007FFE618E6DB6618E6DB66D8E7FFE7FFE7BCE73B67BCE7BB671CE7FFE0000 +AB19:00007FFE618E6DB6618E6DB66D8E7FFE7FFE7BCE73B67BC67BF671CE7FFE0000 +AB1A:00007FFE618E6DB6618E6DB66D8E7FFE7FFE7B8673B67B867BB671B67FFE0000 +AB1B:00007FFE618E6DB6618E6DB66D8E7FFE7FFE7B8E73B67B8E7BB6718E7FFE0000 +AB1C:00007FFE618E6DB6618E6DB66D8E7FFE7FFE7BC673BE7BBE7BBE71C67FFE0000 +AB1D:00007FFE618E6DB6618E6DB66D8E7FFE7FFE7B8E73B67BB67BB6718E7FFE0000 +AB1E:00007FFE618E6DB6618E6DB66D8E7FFE7FFE7B8673BE7B8E7BBE71867FFE0000 +AB1F:00007FFE618E6DB6618E6DB66D8E7FFE7FFE7B8673BE7B8E7BBE71BE7FFE0000 +AB20:60307FF0401000001F803FC06260C230C230C230F338DAB6CAB2FBBE00000000 +AB21:60307FF0401000001F803FC06260C230C23FC233F338DAB4CAB2FBBE00000000 +AB22:60307FF0401000001F803FC06260C230C230C230F330DAB0CAB3FBBF00000000 +AB23:30183FF820080FE01FF031186118799865587DD8001800340032003E00000000 +AB24:60307FF0401000001F803FC06260C23FC239C237F330DABCCAB2FBBE00000000 +AB25:60307FF040101FC07FE0C630E6389724F33C030003800340032003E000000000 +AB26:30183FF820080FE01FF01A183218231862946252739C680064007C0000000000 +AB27:00007FFE618E6DB6618E6DB66D8E7FFE7FFE61867DF661EE6FDE61DE7FFE0000 +AB28:000018181FF81008018003C00660066003C007E00E700C300C300C3000000000 +AB29:000060607FE0402006000F00198019800F001F8039C030FC30CC30C000000000 +AB2A:000060607FE0402006000F00198019800F001F8039C030C030CC30FC00000000 +AB2B:30303FF02010030007800CC00CC007800FC01CC018E018600060006000000000 +AB2C:000030603FE02020030007800CC00CC007800FC01CE01878186C187800000000 +AB2D:000030603FE0202006000F0019F819980F001F8039C030C030C030C000000000 +AB2E:30603FE02020030007800CC00CC007800FC01CE0186018601800180000000000 +AB2F:00007FFE618E6DB6618E6DB66D8E7FFE7FFE61867DBE618E6FBE61BE7FFE0000 +AB30:000000000000344C44FE44444C340000 +AB31:0000000000007C9210709E92927C0000 +AB32:00000000000018244244485224180000 +AB33:0000000000003C42427E40FE403E0000 +AB34:0000000000001C22227EA0A0A21C0000 +AB35:0000000C1010107C1010101010000000 +AB36:0000000000003A4642423E02122A1C08 +AB37:00000000301014127C905010107C0000 +AB38:000000003010127C90127C90107C0000 +AB39:000000003010103854543810107C0000 +AB3A:0000000000006C52525252575A540000 +AB3B:0000000000005C62424242474A440000 +AB3C:0000000000005C6242424244444E1408 +AB3D:00000000000010284444444428100000 +AB3E:00000000000014284C54546428500000 +AB3F:0000000000023C460A0A1212623C4000 +AB40:0000000000006C9290909E92926C0000 +AB41:0000000000025CA6262AEAB2B25C0000 +AB42:0000000000006C921212FE92926C0000 +AB43:0000000000004C9292929292926C0000 +AB44:0000000000429CA6A6AAAAB2A25C0000 +AB45:00000000000010101038444444440000 +AB46:0000000000007C42427C505048480906 +AB47:00000000000028302020202020200000 +AB48:000000000000546A4A40404040400000 +AB49:0000000000002C3222202070A0A04000 +AB4A:0000000000002A3525202070A0A04000 +AB4B:000000000000665A4202020202020000 +AB4C:000000000000CCB48406050505020000 +AB4D:0000000C101010101010101010600000 +AB4E:000000000000404040424242463A0000 +AB4F:000000000000404040FE44444C340000 +AB50:000000000000928282929292926E0000 +AB51:000000000000EC929292928282920000 +AB52:00000000000042A2A2222222261A0000 +AB53:00000000000042422424181824244242 +AB54:0000000000008484484830304C4A8A84 +AB55:00000000000042422424181824A4C282 +AB56:00000000000084844830304A85850200 +AB57:0000000000002121120C0C1221418000 +AB58:000000000000424224181A2545820000 +AB59:0000000000002121120C0C1221A1C080 +AB5A:0000000000004040424242261A02023C +AB5B:00000000000044380038440000000000 +AB5C:00000020203824242424040800000000 +AB5D:0000007014127C9050107C0000000000 +AB5E:0000003808083A4C08083E0000000000 +AB5F:000000000042A222261A000000000000 +AB60:0000000000007050505C5252525C0000 +AB61:0000000000004C52527E5050524C0000 +AB62:0000000000006C92121E1010926C0000 +AB63:0000000000008C9292929292926C0000 +AB64:000000000000324A46424242463A0000 +AB65:0000000000007C828282442828EE0000 +AB66:0000000000000200020002003BF84608421042204240428047083BF800080006 +AB67:00000000000000001000100010F07F08110010C01030100813080DF0010000C0 +AB68:00000000000004051E2404444C340000 +AB69:00000000002236554949000000000000 +AB6A:0000000000000404047C040404000000 +AB6B:0000000000004040407C404040000000 +AB6C:00007FFE618E6DB6618E6DB66D8E7FFE7FFE73C66FBE63BE6DBE73C67FFE0000 +AB6D:00007FFE618E6DB6618E6DB66D8E7FFE7FFE738E6FB663B66DB6738E7FFE0000 +AB6E:00007FFE618E6DB6618E6DB66D8E7FFE7FFE73866FBE638E6DBE73867FFE0000 +AB6F:00007FFE618E6DB6618E6DB66D8E7FFE7FFE73866FBE638E6DBE73BE7FFE0000 +AB70:00000000000078444242424244780000 +AB71:0000000000007C42427C504844430000 +AB72:0000000000007F080808080808080000 +AB73:0000000000001C081412215155260000 +AB74:00000000000030484B494E4848300000 +AB75:00000000000008080008080808080000 +AB76:0000000000003C42207F0442423C0000 +AB77:0000000000001C0222525262423C0000 +AB78:000000000000404C5476404040400000 +AB79:00000000000042424242261A023C0000 +AB7A:000000000000182442427E4242420000 +AB7B:00000000000004040404044444380000 +AB7C:0000000000007E40407C4040407E0000 +AB7D:000000000000080848A8BB490A0C0000 +AB7E:0000000000003C0202427C4040400000 +AB7F:0000000000001C22223E2222AACC0000 +AB80:0000000000002020203E202020200000 +AB81:0000000000007E424040404040400000 +AB82:0000000000003048484830B7B4480000 +AB83:0000000000004242425A5A6666420000 +AB84:00000000000006090838444444380000 +AB85:0000000000003C42524C404040400000 +AB86:0000000000001E2040505C5244380000 +AB87:0000000000004266665A5A4242420000 +AB88:00000000000038440202721E02020000 +AB89:000000000000180A15203C52520C0000 +AB8A:000000000000324A4A4E4A4A4A320000 +AB8B:0000000000004242427E424242420000 +AB8C:000000000000381038440202423C0000 +AB8D:000000000000474242261A02E2443800 +AB8E:0000000000003C4242427E42423C0000 +AB8F:0000000000004040F040404E443C0418 +AB90:000000000000788480809E8484780000 +AB91:0000000000000C12121222A2A2420000 +AB92:0000000000004040405C624242420000 +AB93:0000000000007E0204081020407E0000 +AB94:0000000000003844E404E4443C040400 +AB95:0000000000003048484A4D4948300000 +AB96:000000000000FE101010101010FE0000 +AB97:0000000000000C1202424A4A4A340000 +AB98:0000000000006619292A484848300000 +AB99:000000000000F1A12222242428100000 +AB9A:0000000000001C22029AA2A2A25C0000 +AB9B:0000000000003C42403C4042423C0000 +AB9C:000000000000424242427E42423C0000 +AB9D:0000000000001C2222021AD2B26C0000 +AB9E:000000000000040C1424447E04040000 +AB9F:000000000000404040407C42427C0000 +ABA0:0000000000000808080B5D6808080000 +ABA1:000000000000649AE240988484780000 +ABA2:0000000000007C42425C484442420000 +ABA3:000000000000202020202022221C0000 +ABA4:000000000000AAAA92B2CACA86820000 +ABA5:0000000000003C4247201F44423C0000 +ABA6:000000000000F09010101211110E0000 +ABA7:000000000000040404040C1424440000 +ABA8:0000000000007C0404040C1424440000 +ABA9:00000000000082824444282810100000 +ABAA:0000000000003C4240300C02423C0000 +ABAB:00000000000036494260504848300000 +ABAC:00000000000018241824225555220000 +ABAD:0000000000001C2242404040407E0000 +ABAE:000000000000404040404040407E0000 +ABAF:0000000000003C4240404040423C0000 +ABB0:0000000000000444A47E242424180000 +ABB1:00000000000066999A28444444380000 +ABB2:0000000000007C42427C404040400000 +ABB3:0000000000003C4247404042423C0000 +ABB4:000000000000F1911212141418100000 +ABB5:0000000000404040434D744444440000 +ABB6:00000000000044485060605048440000 +ABB7:0000000000000202023E4242423C0000 +ABB8:000000000000304A454040454A300000 +ABB9:00000000000038444440404E443B0000 +ABBA:00000000000022555351311995620000 +ABBB:0000000000003C4272525E42423C0000 +ABBC:000000000000324949714141221C0000 +ABBD:0000000000000C12120A064244380000 +ABBE:0000000000003C4240407C42423C0000 +ABBF:0000000000001E2101015D4949360000 +ABC0:00000000000000007FF824B024D02590269024902C9034903FF0000000000000 +ABC1:0000000000000000063009481084100410040808080804100220000000000000 +ABC2:00000000000000001FF80020002007A008601000100008400780000000000000 +ABC3:00000000000000007FF82400240024003FE024C02500251024E0000000000000 +ABC4:00000000000000007FF844882490249014A014A014A054A86498000000000000 +ABC5:00000000000000001FFC041008100820104010080810042003C0000000000000 +ABC6:00000000000000003FF020101020102008400FC0084028503030000000000000 +ABC7:00000000008001001FF011080890086004000400240024001800000000000000 +ABC8:00000000000000001FF8100008C0052006280410040004001800000000000000 +ABC9:000000000000000007F004900490049064909490149024907FF0000000000000 +ABCA:00000000000000001FFC00800080008008881084108409480630000000000000 +ABCB:00000000000000003FF8200810101010092008A0086008203018000000000000 +ABCC:00000000000000007FFF0808100413640D580240042008241018000000000000 +ABCD:00000000000000007FFC000001800240042008200920112060C0000000000000 +ABCE:00000000000000003FFC10001070089007E00010088815481230000000000000 +ABCF:00000000000000001FF8100008000600058004600410051018E0000000000000 +ABD0:00000000000000001FF01000102010401F801000101010201FC0000000000000 +ABD1:00000000000000003FF8124012401240124012400A480A5007E0000000000000 +ABD2:00000000000000001FF009200924092409180900090009000900000000000000 +ABD3:00000000000000000FF800100020004000800100020004300FC0004000300000 +ABD4:00000000000000000E70118810881F8010801080108010801F80000000000000 +ABD5:00000000000000000FE004400280010002800440082004400380000000000000 +ABD6:00000000000000001FF0001000E0030004000820082004400380000000000000 +ABD7:00000000000000000FFC04480288011002900450083004480384000000000000 +ABD8:00000000000000001FF004000400040004001FC0248024901860000000000000 +ABD9:00000000000000001FFC0040004000400840104010C009400640000000000000 +ABDA:00000000000000001FF00220022012200C200020002000200020000000000000 +ABDB:00000000000000003FF812481248124012401240124012401FC0000000000000 +ABDC:00000000000000000FF80010001000100010071000D000300010000000000000 +ABDD:00000000000000003FF8108010801FE010801080108010801080000000000000 +ABDE:00000000000000003FF821081110111009200920092029283118000000000000 +ABDF:00000000000000003FF8049009201200122011C00808081007E0000000000000 +ABE0:000000000000000020402080210022003F800240024002400180000000000000 +ABE1:00000000000000001FF009200920092009200920092009200FE0000000000000 +ABE2:00000000000000001FF01000080007C0042004100910092010C0000000000000 +ABE3:00180004001C0024002400180000000000000000000000000000000000000000 +ABE4:0000000600090009003E00080008000800080008000800080008000000000000 +ABE5:0040002000100000000000000000000000000000000000000000000000000000 +ABE6:0000000000000000000000000006000900090006000000000000000000000000 +ABE7:00020015000E0004000C00000000000000000000000000000000000000000000 +ABE8:0000000000000000000000000000000000000000000000000360049004100220 +ABE9:000200250015000E000400000000000000000000000000000000000000000000 +ABEA:0002000500050003000100020004000000000000000000000000000000000000 +ABEB:0000000000000000044004400440044004400440044004400440000000000000 +ABEC:0000000000000000000000000000000000000000000000060006000000000000 +ABED:000000000000000000000000000000000000000000000000000000007FFE0000 +ABEE:00007FFE618E6DB6618E6DB66D8E7FFE7FFE61866FBE638E6FBE61867FFE0000 +ABEF:00007FFE618E6DB6618E6DB66D8E7FFE7FFE61866FBE638E6FBE61BE7FFE0000 +ABF0:0000000003000CC01020102020102010102010200CC003000000000000000000 +ABF1:000000000000000003800440082008C004000300008004400380000000000000 +ABF2:000000000000000003800440082008C004000360049004500390000000000000 +ABF3:000000000000000003800440082008CC0412036A04A804A80310000000000000 +ABF4:00000000000000000380044000800300040008C0082004400380000000000000 +ABF5:00000000000000000FC010202210251015000E00040004000400000000000000 +ABF6:00000000000000000FC010202210252015000E00048005000600040000000000 +ABF7:00000000000000000C3011480950012003D00508088809100620000000000000 +ABF8:00000000000000000FC010202210252015000E00040014000C00040000000000 +ABF9:00000000000000000FC010202210252015000E0004001F802400180000000000 +ABFA:00007FFE618E6DB6618E6DB66D8E7FFE7FFE61866FB663866FB66FB67FFE0000 +ABFB:00007FFE618E6DB6618E6DB66D8E7FFE7FFE618E6FB6638E6FB66F8E7FFE0000 +ABFC:00007FFE618E6DB6618E6DB66D8E7FFE7FFE61C66FBE63BE6FBE6FC67FFE0000 +ABFD:00007FFE618E6DB6618E6DB66D8E7FFE7FFE618E6FB663B66FB66F8E7FFE0000 +ABFE:00007FFE618E6DB6618E6DB66D8E7FFE7FFE61866FBE638E6FBE6F867FFE0000 +ABFF:00007FFE618E6DB6618E6DB66D8E7FFE7FFE61866FBE638E6FBE6FBE7FFE0000 +AC00:00000000001000101F9000900090009E01100110021004101810001000100000 +AC01:000000083E0802080208040E080830080008000007F800080008000800080000 +AC02:000000083E0802080208040E080830080008000000003EF80208020802080000 +AC03:000000083E0802080208040E080830080008000000001F080108011401620000 +AC04:000000083E0802080208040E080830080008000808000800080008000FF80000 +AC05:000000083E0802080208040E0808300800080000000010F8101010301ECC0000 +AC06:000000083E0802080208040E08083008000800000808087F081C08220F9C0000 +AC07:000000083E0802080208040E080830080008000003F802000200020003F80000 +AC08:000000083E0802080208040E080830080008000007F8000807F8040007F80000 +AC09:000000083E0802080208040E08083008000800003EF802083E0820083E080000 +AC0A:000000083E0802080208040E08083008000800003EF802883E8820883EF80000 +AC0B:000000083E0802080208040E08083008000800003E8802883EF820883EF80000 +AC0C:000000083E0802080208040E08083008000800001F0801081F0810141F620000 +AC0D:000000083E0802080208040E08083008000800003EF802803EF820803EF80000 +AC0E:000000083E0802080208040E08083008000800003EFC02483E4820483EFC0000 +AC0F:000000083E0802080208040E08083008000800001F08017F1F1C10221F1C0000 +AC10:000000083E0802080208040E080830080008000003F802080208020803F80000 +AC11:000000083E0802080208040E08083008000800000208020803F8020803F80000 +AC12:000000083E0802080208040E0808300800080000110811081F0811141F620000 +AC13:000000083E0802080208040E0808300800080000001000100010006801840000 +AC14:000000083E0802080208040E08083008000800000048004800A8011406620000 +AC15:000000083E0802080208040E0808300800080000000003F00408040803F00000 +AC16:000000083E0802080208040E080830080008000003F80020002000D003080000 +AC17:000000083E0802080208040E0808300800080000004003F8004000A003180000 +AC18:000000083E0802080208040E080830080008000003F8000803F8000800080000 +AC19:000000083E0802080208040E080830080008000003F8020003F8020003F80000 +AC1A:000000083E0802080208040E080830080008000000000FF8022002200FF80000 +AC1B:000000083E0802080208040E080830080008000000800FF803E0041003E00000 +AC1C:00000000001200121F9200920092009E01120112021204121812001200120000 +AC1D:000000283E28022802280438082830280028000007F800080008000800080000 +AC1E:000000283E28022802280438082830280028000000003EF80208020802080000 +AC1F:000000283E28022802280438082830280028000000003E100210022802C40000 +AC20:000000283E28022802280438082830280028002808000800080008000FF80000 +AC21:000000283E280228022804380828302800280000000020F8201020303ECC0000 +AC22:000000283E280228022804380828302800280000202021FC207020883E700000 +AC23:000000283E28022802280438082830280028000003F802000200020003F80000 +AC24:000000283E28022802280438082830280028000007F8000807F8040007F80000 +AC25:000000283E2802280228043808283028002800003EF802083E0820083E080000 +AC26:000000283E2802280228043808283028002800003EF802883E8820883EF80000 +AC27:000000283E2802280228043808283028002800003E8802883EF820883EF80000 +AC28:000000283E2802280228043808283028002800001F0801081F0810141F620000 +AC29:000000283E2802280228043808283028002800003EF802803EF820803EF80000 +AC2A:000000283E2802280228043808283028002800003EFC02483E4820483EFC0000 +AC2B:000000283E2802280228043808283028002800003E1002FE3E3820443E380000 +AC2C:000000283E28022802280438082830280028000003F802080208020803F80000 +AC2D:000000283E2802280228043808283028002800000208020803F8020803F80000 +AC2E:000000283E280228022804380828302800280000110811081F0811141F620000 +AC2F:000000283E280228022804380828302800280000000800080008003400C20000 +AC30:000000283E2802280228043808283028002800000048004800A8011406620000 +AC31:000000283E280228022804380828302800280000000001F00208020801F00000 +AC32:000000283E28022802280438082830280028000003F80020002000D003080000 +AC33:000000283E280228022804380828302800280000004003F8004000A003180000 +AC34:000000283E28022802280438082830280028000003F8000803F8000800080000 +AC35:000000283E28022802280438082830280028000003F8020003F8020003F80000 +AC36:000000283E28022802280438082830280028000000000FF8022002200FF80000 +AC37:000000283E28022802280438082830280028000000800FF803E0041003E00000 +AC38:00000000001000101F900090009E00900110011E021004101810001000100000 +AC39:000000083E080208020E0408080E30080008000007F800080008000800080000 +AC3A:000000083E080208020E0408080E30080008000000003EF80208020802080000 +AC3B:000000083E080208020E0408080E30080008000000001F080108011401620000 +AC3C:000000083E080208020E0408080E30080008000008000800080008000FF80000 +AC3D:000000083E080208020E0408080E300800080000000010F8101010301ECC0000 +AC3E:000000083E080208020E0408080E3008000800000808087F081C08220F9C0000 +AC3F:000000083E080208020E0408080E30080008000003F802000200020003F80000 +AC40:000000083E080208020E0408080E30080008000007F8000807F8040007F80000 +AC41:000000083E080208020E0408080E3008000800003EF802083E0820083E080000 +AC42:000000083E080208020E0408080E3008000800003EF802883E8820883EF80000 +AC43:000000083E080208020E0408080E3008000800003E8802883EF820883EF80000 +AC44:000000083E080208020E0408080E3008000800001F0801081F0810141F620000 +AC45:000000083E080208020E0408080E3008000800003EF802803EF820803EF80000 +AC46:000000083E080208020E0408080E3008000800003EFC02483E4820483EFC0000 +AC47:000000083E080208020E0408080E3008000800001F08017F1F1C10221F1C0000 +AC48:000000083E080208020E0408080E30080008000003F802080208020803F80000 +AC49:000000083E080208020E0408080E3008000800000208020803F8020803F80000 +AC4A:000000083E080208020E0408080E300800080000110811081F0811141F620000 +AC4B:000000083E080208020E0408080E300800080000001000100010006801840000 +AC4C:000000083E080208020E0408080E3008000800000048004800A8011406620000 +AC4D:000000083E080208020E0408080E300800080000000003F00408040803F00000 +AC4E:000000083E080208020E0408080E30080008000003F80020002000D003080000 +AC4F:000000083E080208020E0408080E300800080000004003F8004000A003180000 +AC50:000000083E080208020E0408080E30080008000003F8000803F8000800080000 +AC51:000000083E080208020E0408080E30080008000003F8020003F8020003F80000 +AC52:000000083E080208020E0408080E30080008000000000FF8022002200FF80000 +AC53:000000083E080208020E0408080E30080008000000800FF803E0041003E00000 +AC54:00000000001200121F920092009E00920112011E021204121812001200120000 +AC55:000000283E28022802380428083830280028000007F800080008000800080000 +AC56:000000283E28022802380428083830280028000000003EF80208020802080000 +AC57:000000283E28022802380428083830280028000000003E100210022802C40000 +AC58:000000283E28022802380428083830280028002808000800080008000FF80000 +AC59:000000283E280228023804280838302800280000000020F8201020303ECC0000 +AC5A:000000283E280228023804280838302800280000202021FC207020883E700000 +AC5B:000000283E28022802380428083830280028000003F802000200020003F80000 +AC5C:000000283E28022802380428083830280028000007F8000807F8040007F80000 +AC5D:000000283E2802280238042808383028002800003EF802083E0820083E080000 +AC5E:000000283E2802280238042808383028002800003EF802883E8820883EF80000 +AC5F:000000283E2802280238042808383028002800003E8802883EF820883EF80000 +AC60:000000283E2802280238042808383028002800001F0801081F0810141F620000 +AC61:000000283E2802280238042808383028002800003EF802803EF820803EF80000 +AC62:000000283E2802280238042808383028002800003EFC02483E4820483EFC0000 +AC63:000000283E2802280238042808383028002800003E1002FE3E3820443E380000 +AC64:000000283E28022802380428083830280028000003F802080208020803F80000 +AC65:000000283E2802280238042808383028002800000208020803F8020803F80000 +AC66:000000283E280228023804280838302800280000110811081F0811141F620000 +AC67:000000283E280228023804280838302800280000000800080008003400C20000 +AC68:000000283E2802280238042808383028002800000048004800A8011406620000 +AC69:000000283E280228023804280838302800280000000001F00208020801F00000 +AC6A:000000283E28022802380428083830280028000003F80020002000D003080000 +AC6B:000000283E280228023804280838302800280000004003F8004000A003180000 +AC6C:000000283E28022802380428083830280028000003F8000803F8000800080000 +AC6D:000000283E28022802380428083830280028000003F8020003F8020003F80000 +AC6E:000000283E28022802380428083830280028000000000FF8022002200FF80000 +AC6F:000000283E28022802380428083830280028000000800FF803E0041003E00000 +AC70:00000000000200021F8200820082009E01020102020204021802000200020000 +AC71:000000083E080208020804380808300800080000000007F80008000800080000 +AC72:000000083E08020802080438080830080008000000003EF80208020802080000 +AC73:000000083E08020802080438080830080008000000001F080108011401620000 +AC74:000000083E08020802080438080830080008000000001000100010001FF80000 +AC75:000000083E080208020804380808300800080000000020F8201020303ECC0000 +AC76:000000083E080208020804380808300800080000202021FC207020883E700000 +AC77:000000083E08020802080438080830080008000003F802000200020003F80000 +AC78:000000083E08020802080438080830080008000007F8000807F8040007F80000 +AC79:000000083E0802080208043808083008000800003EF802083E0820083E080000 +AC7A:000000083E0802080208043808083008000800003EF802883E8820883EF80000 +AC7B:000000083E0802080208043808083008000800003E8802883EF820883EF80000 +AC7C:000000083E0802080208043808083008000800000F8800880F8808140FA20000 +AC7D:000000083E0802080208043808083008000800003EF802803EF820803EF80000 +AC7E:000000083E0802080208043808083008000800003EFC02483E4820483EFC0000 +AC7F:000000083E0802080208043808083008000800003E1002FE3E3820443E380000 +AC80:000000083E08020802080438080830080008000003F802080208020803F80000 +AC81:000000083E0802080208043808083008000800000208020803F8020803F80000 +AC82:000000083E080208020804380808300800080000210821083F0821143F620000 +AC83:000000083E080208020804380808300800080000001000100010006801840000 +AC84:000000083E0802080208043808083008000800000048004800A8011406620000 +AC85:000000083E080208020804380808300800080000000003F00408040803F00000 +AC86:000000083E08020802080438080830080008000003F80020002000D003080000 +AC87:000000083E080208020804380808300800080000004003F8004000A003180000 +AC88:000000083E08020802080438080830080008000003F8000803F8000800080000 +AC89:000000083E08020802080438080830080008000003F8020003F8020003F80000 +AC8A:000000083E08020802080438080830080008000000000FF8022002200FF80000 +AC8B:000000083E08020802080438080830080008000000800FF803E0041003E00000 +AC8C:00000000000A000A1F8A008A008A00BA010A010A020A040A180A000A000A0000 +AC8D:000000283E280228022804E8082830280028000007F800080008000800080000 +AC8E:000000283E280228022804E8082830280028000000003EF80208020802080000 +AC8F:000000283E280228022804E8082830280028000000003E100210022802C40000 +AC90:000000283E280228022804E8082830280028000008000800080008000FF80000 +AC91:000000283E280228022804E80828302800280000000020F8201020303ECC0000 +AC92:000000283E280228022804E80828302800280000202021FC207020883E700000 +AC93:000000283E280228022804E8082830280028000003F802000200020003F80000 +AC94:000000283E280228022804E8082830280028000007F8000807F8040007F80000 +AC95:000000283E280228022804E808283028002800003EF802083E0820083E080000 +AC96:000000283E280228022804E808283028002800003EF802883E8820883EF80000 +AC97:000000283E280228022804E808283028002800003E8802883EF820883EF80000 +AC98:000000283E280228022804E808283028002800001F0801081F0810141F620000 +AC99:000000283E280228022804E808283028002800003EF802803EF820803EF80000 +AC9A:000000283E280228022804E808283028002800003EFC02483E4820483EFC0000 +AC9B:000000283E280228022804E808283028002800003E1002FE3E3820443E380000 +AC9C:000000283E280228022804E8082830280028000003F802080208020803F80000 +AC9D:000000283E280228022804E808283028002800000208020803F8020803F80000 +AC9E:000000283E280228022804E80828302800280000110811081F0811141F620000 +AC9F:000000283E280228022804E80828302800280000000800080008003400C20000 +ACA0:000000283E280228022804E808283028002800000048004800A8011406620000 +ACA1:000000283E280228022804E80828302800280000000001F00208020801F00000 +ACA2:000000283E280228022804E8082830280028000003F80020002000D003080000 +ACA3:000000283E280228022804E80828302800280000004003F8004000A003180000 +ACA4:000000283E280228022804E8082830280028000003F8000803F8000800080000 +ACA5:000000283E280228022804E8082830280028000003F8020003F8020003F80000 +ACA6:000000283E280228022804E8082830280028000000000FF8022002200FF80000 +ACA7:000000283E280228022804E8082830280028000000800FF803E0041003E00000 +ACA8:00000000000200021F820082009E00820102011E020204021802000200020000 +ACA9:000000083E080208023804080838300800080000000007F80008000800080000 +ACAA:000000083E08020802380408083830080008000000003EF80208020802080000 +ACAB:000000083E08020802380408083830080008000000001F080108011401620000 +ACAC:000000083E08020802380408083830080008000800001000100010001FF80000 +ACAD:000000083E080208023804080838300800080000000020F8201020303ECC0000 +ACAE:000000083E080208023804080838300800080000202021FC207020883E700000 +ACAF:000000083E08020802380408083830080008000003F802000200020003F80000 +ACB0:000000083E08020802380408083830080008000007F8000807F8040007F80000 +ACB1:000000083E0802080238040808383008000800003EF802083E0820083E080000 +ACB2:000000083E0802080238040808383008000800003EF802883E8820883EF80000 +ACB3:000000083E0802080238040808383008000800003E8802883EF820883EF80000 +ACB4:000000083E0802080238040808383008000800000F8800880F8808140FA20000 +ACB5:000000083E0802080238040808383008000800003EF802803EF820803EF80000 +ACB6:000000083E0802080238040808383008000800003EFC02483E4820483EFC0000 +ACB7:000000083E0802080238040808383008000800003E1002FE3E3820443E380000 +ACB8:000000083E08020802380408083830080008000003F802080208020803F80000 +ACB9:000000083E0802080238040808383008000800000208020803F8020803F80000 +ACBA:000000083E080208023804080838300800080000210821083F0821143F620000 +ACBB:000000083E080208023804080838300800080000001000100010006801840000 +ACBC:000000083E0802080238040808383008000800000048004800A8011406620000 +ACBD:000000083E080208023804080838300800080000000003F00408040803F00000 +ACBE:000000083E08020802380408083830080008000003F80020002000D003080000 +ACBF:000000083E080208023804080838300800080000004003F8004000A003180000 +ACC0:000000083E08020802380408083830080008000003F8000803F8000800080000 +ACC1:000000083E08020802380408083830080008000003F8020003F8020003F80000 +ACC2:000000083E08020802380408083830080008000000000FF8022002200FF80000 +ACC3:000000083E08020802380408083830080008000000800FF803E0041003E00000 +ACC4:00000000000A000A1F8A008A00BA008A010A013A020A040A180A000A000A0000 +ACC5:000000283E28022802E8042808E830280028000007F800080008000800080000 +ACC6:000000283E28022802E8042808E830280028000000003EF80208020802080000 +ACC7:000000283E28022802E8042808E830280028000000003E100210022802C40000 +ACC8:000000283E28022802E8042808E830280028002808000800080008000FF80000 +ACC9:000000283E28022802E8042808E8302800280000000020F8201020303ECC0000 +ACCA:000000283E28022802E8042808E8302800280000202021FC207020883E700000 +ACCB:000000283E28022802E8042808E830280028000003F802000200020003F80000 +ACCC:000000283E28022802E8042808E830280028000007F8000807F8040007F80000 +ACCD:000000283E28022802E8042808E83028002800003EF802083E0820083E080000 +ACCE:000000283E28022802E8042808E83028002800003EF802883E8820883EF80000 +ACCF:000000283E28022802E8042808E83028002800003E8802883EF820883EF80000 +ACD0:000000283E28022802E8042808E83028002800001F0801081F0810141F620000 +ACD1:000000283E28022802E8042808E83028002800003EF802803EF820803EF80000 +ACD2:000000283E28022802E8042808E83028002800003EFC02483E4820483EFC0000 +ACD3:000000283E28022802E8042808E83028002800003E1002FE3E3820443E380000 +ACD4:000000283E28022802E8042808E830280028000003F802080208020803F80000 +ACD5:000000283E28022802E8042808E83028002800000208020803F8020803F80000 +ACD6:000000283E28022802E8042808E8302800280000110811081F0811141F620000 +ACD7:000000283E28022802E8042808E8302800280000000800080008003400C20000 +ACD8:000000283E28022802E8042808E83028002800000048004800A8011406620000 +ACD9:000000283E28022802E8042808E8302800280000000001F00208020801F00000 +ACDA:000000283E28022802E8042808E830280028000003F80020002000D003080000 +ACDB:000000283E28022802E8042808E8302800280000004003F8004000A003180000 +ACDC:000000283E28022802E8042808E830280028000003F8000803F8000800080000 +ACDD:000000283E28022802E8042808E830280028000003F8020003F8020003F80000 +ACDE:000000283E28022802E8042808E830280028000000000FF8022002200FF80000 +ACDF:000000283E28022802E8042808E830280028000000800FF803E0041003E00000 +ACE0:00000000000000003FF0001000100010001002100200020002007FFC00000000 +ACE1:000000001FF0001000100010011001007FFC00001FF000100010001000100000 +ACE2:000000001FF0001000100010011001007FFC000000003EF80208020802080000 +ACE3:000000001FF0001000100010011001007FFC000000001E100210022802C40000 +ACE4:000000001FF0001000100010011001007FFC000000001000100010001FF00000 +ACE5:000000001FF0001000100010011001007FFC0000000020F8201020303ECC0000 +ACE6:000000001FF0001000100010011001007FFC0000202021FC207020883E700000 +ACE7:000000001FF0001000100010011001007FFC00001FF01000100010001FF00000 +ACE8:000000001FF0001000100010011001007FFC00001FF000101FF010001FF00000 +ACE9:000000001FF0001000100010011001007FFC00003EF802083E0820083E080000 +ACEA:000000001FF0001000100010011001007FFC00003EF802883E8820883EF80000 +ACEB:000000001FF0001000100010011001007FFC00003E8802883EF820883EF80000 +ACEC:000000001FF0001000100010011001007FFC00003E1002103E1020283EC40000 +ACED:000000001FF0001000100010011001007FFC00003EF802803EF820803EF80000 +ACEE:000000001FF0001000100010011001007FFC00003EFC02483E4820483EFC0000 +ACEF:000000001FF0001000100010011001007FFC00003E2003FC3E7020883E700000 +ACF0:000000001FF0001000100010011001007FFC00001FF01010101010101FF00000 +ACF1:000000001FF0001000100010011001007FFC0000101010101FF010101FF00000 +ACF2:000000001FF0001000100010011001007FFC0000222022203E2022503E880000 +ACF3:000000001FF0001000100010011001007FFC000000000100010002800C400000 +ACF4:000000001FF0001000100010011001007FFC00000000024002400DA033100000 +ACF5:000000001FF0001000100010011001007FFC0000000007C00820082007C00000 +ACF6:000000001FF0001000100010011001007FFC0000000007E00080014006200000 +ACF7:000000001FF0001000100010011001007FFC0000008007E00080014006200000 +ACF8:000000001FF0001000100010011001007FFC00001FF000101FF0001000100000 +ACF9:000000001FF0001000100010011001007FFC00001FF010001FF010001FF00000 +ACFA:000000001FF0001000100010011001007FFC000000001FF0044004401FF00000 +ACFB:000000001FF0001000100010011001007FFC000001001FF007C0082007C00000 +ACFC:00000000001000103FD000500050005E0450041004107FD00010001000100000 +ACFD:000000081F880088008E0088048804087FE8000007F800080008000800080000 +ACFE:000000081F880088008E0088048804087FE8000000003EF80208020802080000 +ACFF:000000081F880088008E0088048804087FE8000000001F080108011401620000 +AD00:000000081F880088008E0088048804087FE8000008000800080008000FF80000 +AD01:000000081F880088008E0088048804087FE80000000010F8101010301ECC0000 +AD02:000000081F880088008E0088048804087FE800000808087F081C08220F9C0000 +AD03:000000081F880088008E0088048804087FE8000003F802000200020003F80000 +AD04:000000081F880088008E0088048804087FE8000007F8000807F8040007F80000 +AD05:000000081F880088008E0088048804087FE800003EF802083E0820083E080000 +AD06:000000081F880088008E0088048804087FE800003EF802883E8820883EF80000 +AD07:000000081F880088008E0088048804087FE800003E8802883EF820883EF80000 +AD08:000000081F880088008E0088048804087FE800001F0801081F0810141F620000 +AD09:000000081F880088008E0088048804087FE800003EF802803EF820803EF80000 +AD0A:000000081F880088008E0088048804087FE800003EFC02483E4820483EFC0000 +AD0B:000000081F880088008E0088048804087FE800001F08017F1F1C10221F1C0000 +AD0C:000000081F880088008E0088048804087FE8000003F802080208020803F80000 +AD0D:000000081F880088008E0088048804087FE800000208020803F8020803F80000 +AD0E:000000081F880088008E0088048804087FE80000110811081F0811141F620000 +AD0F:000000081F880088008E0088048804087FE80000001000100010006801840000 +AD10:000000081F880088008E0088048804087FE800000048004800A8011406620000 +AD11:000000081F880088008E0088048804087FE80000000003F00408040803F00000 +AD12:000000081F880088008E0088048804087FE8000003F80020002000D003080000 +AD13:000000081F880088008E0088048804087FE80000004003F8004000A003180000 +AD14:000000081F880088008E0088048804087FE8000003F8000803F8000800080000 +AD15:000000081F880088008E0088048804087FE8000003F8020003F8020003F80000 +AD16:000000081F880088008E0088048804087FE8000000000FF8022002200FF80000 +AD17:000000081F880088008E0088048804087FE8000000800FF803E0041003E00000 +AD18:00000000001200123FD200520052005E0452041204127FD20012001200120000 +AD19:000000281FA800A800B800A804A804287FA8000007F800080008000800080000 +AD1A:000000281FA800A800B800A804A804287FA8000000003EF80208020802080000 +AD1B:000000281FA800A800B800A804A804287FA8000000001F080108011401620000 +AD1C:000000281FA800A800B800A804A804287FA8000008000800080008000FF80000 +AD1D:000000281FA800A800B800A804A804287FA80000000010F8101010301ECC0000 +AD1E:000000281FA800A800B800A804A804287FA800000808087F081C08220F9C0000 +AD1F:000000281FA800A800B800A804A804287FA8000003F802000200020003F80000 +AD20:000000281FA800A800B800A804A804287FA8000007F8000807F8040007F80000 +AD21:000000281FA800A800B800A804A804287FA800003EF802083E0820083E080000 +AD22:000000281FA800A800B800A804A804287FA800003EF802883E8820883EF80000 +AD23:000000281FA800A800B800A804A804287FA800003E8802883EF820883EF80000 +AD24:000000281FA800A800B800A804A804287FA800001F0801081F0810141F620000 +AD25:000000281FA800A800B800A804A804287FA800003EF802803EF820803EF80000 +AD26:000000281FA800A800B800A804A804287FA800003EFC02483E4820483EFC0000 +AD27:000000281FA800A800B800A804A804287FA800001F08017F1F1C10221F1C0000 +AD28:000000281FA800A800B800A804A804287FA8000003F802080208020803F80000 +AD29:000000281FA800A800B800A804A804287FA800000208020803F8020803F80000 +AD2A:000000281FA800A800B800A804A804287FA80000110811081F0811141F620000 +AD2B:000000281FA800A800B800A804A804287FA80000001000100010006801840000 +AD2C:000000281FA800A800B800A804A804287FA800000048004800A8011406620000 +AD2D:000000281FA800A800B800A804A804287FA80000000003F00408040803F00000 +AD2E:000000281FA800A800B800A804A804287FA8000003F80020002000D003080000 +AD2F:000000281FA800A800B800A804A804287FA80000004003F8004000A003180000 +AD30:000000281FA800A800B800A804A804287FA8000003F8000803F8000800080000 +AD31:000000281FA800A800B800A804A804287FA8000003F8020003F8020003F80000 +AD32:000000281FA800A800B800A804A804287FA8000000000FF8022002200FF80000 +AD33:000000281FA800A800B800A804A804287FA8000000800FF803E0041003E00000 +AD34:00000000000400043FC40044004400440444040404047FF40004000400040000 +AD35:000000081F88008800880088048804087FE8000007F800080008000800080000 +AD36:000000081F88008800880088048804087FE8000000003EF80208020802080000 +AD37:000000081F88008800880088048804087FE8000000001F080108011401620000 +AD38:000000081F88008800880088048804087FE8000008000800080008000FF80000 +AD39:000000081F88008800880088048804087FE80000000010F8101010301ECC0000 +AD3A:000000081F88008800880088048804087FE800000808087F081C08220F9C0000 +AD3B:000000081F88008800880088048804087FE8000003F802000200020003F80000 +AD3C:000000081F88008800880088048804087FE8000007F8000807F8040007F80000 +AD3D:000000081F88008800880088048804087FE800003EF802083E0820083E080000 +AD3E:000000081F88008800880088048804087FE800003EF802883E8820883EF80000 +AD3F:000000081F88008800880088048804087FE800003E8802883EF820883EF80000 +AD40:000000081F88008800880088048804087FE800001F0801081F0810141F620000 +AD41:000000081F88008800880088048804087FE800003EF802803EF820803EF80000 +AD42:000000081F88008800880088048804087FE800003EFC02483E4820483EFC0000 +AD43:000000081F88008800880088048804087FE800001F08017F1F1C10221F1C0000 +AD44:000000081F88008800880088048804087FE8000003F802080208020803F80000 +AD45:000000081F88008800880088048804087FE800000208020803F8020803F80000 +AD46:000000081F88008800880088048804087FE80000110811081F0811141F620000 +AD47:000000081F88008800880088048804087FE80000001000100010006801840000 +AD48:000000081F88008800880088048804087FE800000048004800A8011406620000 +AD49:000000081F88008800880088048804087FE80000000003F00408040803F00000 +AD4A:000000081F88008800880088048804087FE8000003F80020002000D003080000 +AD4B:000000081F88008800880088048804087FE80000004003F8004000A003180000 +AD4C:000000081F88008800880088048804087FE8000003F8000803F8000800080000 +AD4D:000000081F88008800880088048804087FE8000003F8020003F8020003F80000 +AD4E:000000081F88008800880088048804087FE8000000000FF8022002200FF80000 +AD4F:000000081F88008800880088048804087FE8000000800FF803E0041003E00000 +AD50:00000000000000003FF0001000100010001008900880088008807FFC00000000 +AD51:000000001FF0001000100010049004807FFC00001FF000100010001000100000 +AD52:000000001FF0001000100010049004807FFC000000003EF80208020802080000 +AD53:000000001FF0001000100010049004807FFC000000001E100210022802C40000 +AD54:000000001FF0001000100010049004807FFC000000001000100010001FF00000 +AD55:000000001FF0001000100010049004807FFC0000000020F8201020303ECC0000 +AD56:000000001FF0001000100010049004807FFC0000202021FC207020883E700000 +AD57:000000001FF0001000100010049004807FFC00001FF01000100010001FF00000 +AD58:000000001FF0001000100010049004807FFC00001FF000101FF010001FF00000 +AD59:000000001FF0001000100010049004807FFC00003EF802083E0820083E080000 +AD5A:000000001FF0001000100010049004807FFC00003EF802883E8820883EF80000 +AD5B:000000001FF0001000100010049004807FFC00003E8802883EF820883EF80000 +AD5C:000000001FF0001000100010049004807FFC00003E1002103E1020283EC40000 +AD5D:000000001FF0001000100010049004807FFC00003EF802803EF820803EF80000 +AD5E:000000001FF0001000100010049004807FFC00003EFC02483E4820483EFC0000 +AD5F:000000001FF0001000100010049004807FFC00003E2003FC3E7020883E700000 +AD60:000000001FF0001000100010049004807FFC00001FF01010101010101FF00000 +AD61:000000001FF0001000100010049004807FFC0000101010101FF010101FF00000 +AD62:000000001FF0001000100010049004807FFC0000222022203E2022503E880000 +AD63:000000001FF0001000100010049004807FFC000000000100010002800C400000 +AD64:000000001FF0001000100010049004807FFC00000000024002400DA033100000 +AD65:000000001FF0001000100010049004807FFC0000000007C00820082007C00000 +AD66:000000001FF0001000100010049004807FFC0000000007E00080014006200000 +AD67:000000001FF0001000100010049004807FFC0000008007E00080014006200000 +AD68:000000001FF0001000100010049004807FFC00001FF000101FF0001000100000 +AD69:000000001FF0001000100010049004807FFC00001FF010001FF010001FF00000 +AD6A:000000001FF0001000100010049004807FFC000000001FF0044004401FF00000 +AD6B:000000001FF0001000100010049004807FFC000001001FF007C0082007C00000 +AD6C:0000000000003FE00020002000200020002000003FF801000100010001000000 +AD6D:000000001FF000100010001000007FFC010001001FF000100010001000100000 +AD6E:000000001FF000100010001000007FFC0100010000003EF80208020802080000 +AD6F:000000001FF000100010001000007FFC0100010000001E100210022802C40000 +AD70:000000001FF0001000100010000000007FFC010001001100100010001FF00000 +AD71:000000001FF000100010001000007FFC01000100000020F8201020303ECC0000 +AD72:000000001FF000100010001000007FFC01000100202021FC207020883E700000 +AD73:000000001FF000100010001000007FFC010001001FF01000100010001FF00000 +AD74:000000001FF000100010001000007FFC010001001FF000101FF010001FF00000 +AD75:000000001FF000100010001000007FFC010001003EF802083E0820083E080000 +AD76:000000001FF000100010001000007FFC010001003EF802883E8820883EF80000 +AD77:000000001FF000100010001000007FFC010001003E8802883EF820883EF80000 +AD78:000000001FF000100010001000007FFC010001003E1002103E1020283EC40000 +AD79:000000001FF000100010001000007FFC010001003EF802803EF820803EF80000 +AD7A:000000001FF000100010001000007FFC010001003EFC02483E4820483EFC0000 +AD7B:000000001FF000100010001000007FFC010001003E2003FC3E7020883E700000 +AD7C:000000001FF000100010001000007FFC010001001FF01010101010101FF00000 +AD7D:000000001FF000100010001000007FFC01000100101010101FF010101FF00000 +AD7E:000000001FF000100010001000007FFC01000100222022203E2022503E880000 +AD7F:000000001FF000100010001000007FFC0100010000000100010002800C400000 +AD80:000000001FF000100010001000007FFC010001000000024002400DA033100000 +AD81:000000001FF000100010001000007FFC01000100000007C00820082007C00000 +AD82:000000001FF000100010001000007FFC01000100000007E00080014006200000 +AD83:000000001FF000100010001000007FFC01000100008007E00080014006200000 +AD84:000000001FF000100010001000007FFC010001001FF000101FF0001000100000 +AD85:000000001FF000100010001000007FFC010001001FF010001FF010001FF00000 +AD86:000000001FF000100010001000007FFC0100010000001FF0044004401FF00000 +AD87:000000001FF000100010001000007FFC0100010001001FF007C0082007C00000 +AD88:00000008000800083FE8002800280028002800087FE8040804F8040804080000 +AD89:000800083F080108010801087FE8027802080000000007F80008000800080000 +AD8A:000800083F080108010801087FE802780208000000003EF80208020802080000 +AD8B:000800083F080108010801087FE802780208000000001F080108011401620000 +AD8C:000800083F0801080108010800087FE80278020802081000100010001FF80000 +AD8D:000800083F080108010801087FE8027802080000000020F8201020303ECC0000 +AD8E:000800083F080108010801087FE8027802080000202021FC207020883E700000 +AD8F:000800083F080108010801087FE802780208000003F802000200020003F80000 +AD90:000800083F080108010801087FE802780208000007F8000807F8040007F80000 +AD91:000800083F080108010801087FE80278020800003EF802083E0820083E080000 +AD92:000800083F080108010801087FE80278020800003EF802883E8820883EF80000 +AD93:000800083F080108010801087FE80278020800003E8802883EF820883EF80000 +AD94:000800083F080108010801087FE80278020800000F8800880F8808140FA20000 +AD95:000800083F080108010801087FE80278020800003EF802803EF820803EF80000 +AD96:000800083F080108010801087FE80278020800003EFC02483E4820483EFC0000 +AD97:000800083F080108010801087FE80278020800003E1002FE3E3820443E380000 +AD98:000800083F080108010801087FE802780208000003F802080208020803F80000 +AD99:000800083F080108010801087FE80278020800000208020803F8020803F80000 +AD9A:000800083F080108010801087FE8027802080000210821083F0821143F620000 +AD9B:000800083F080108010801087FE8027802080000001000100010006801840000 +AD9C:000800083F080108010801087FE80278020800000048004800A8011406620000 +AD9D:000800083F080108010801087FE8027802080000000003F00408040803F00000 +AD9E:000800083F080108010801087FE802780208000003F80020002000D003080000 +AD9F:000800083F080108010801087FE8027802080000004003F8004000A003180000 +ADA0:000800083F080108010801087FE802780208000003F8000803F8000800080000 +ADA1:000800083F080108010801087FE802780208000003F8020003F8020003F80000 +ADA2:000800083F080108010801087FE802780208000000000FF8022002200FF80000 +ADA3:000800083F080108010801087FE802780208000000800FF803E0041003E00000 +ADA4:0000000A000A000A3FEA002A002A002A002A000A7FEA040A047A040A040A0000 +ADA5:002800283F280128012801287FA805E804280000000007F80008000800080000 +ADA6:002800283F280128012801287FA805E80428000000003EF80208020802080000 +ADA7:002800283F280128012801287FA805E80428000000001F080108011401620000 +ADA8:002800283F2801280128012800287FA8042805E804281428100010001FF80000 +ADA9:002800283F280128012801287FA805E804280000000020F8201020303ECC0000 +ADAA:002800283F280128012801287FA805E804280000202021FC207020883E700000 +ADAB:002800283F280128012801287FA805E80428000003F802000200020003F80000 +ADAC:002800283F280128012801287FA805E80428000007F8000807F8040007F80000 +ADAD:002800283F280128012801287FA805E8042800003EF802083E0820083E080000 +ADAE:002800283F280128012801287FA805E8042800003EF802883E8820883EF80000 +ADAF:002800283F280128012801287FA805E8042800003E8802883EF820883EF80000 +ADB0:002800283F280128012801287FA805E8042800000F8800880F8808140FA20000 +ADB1:002800283F280128012801287FA805E8042800003EF802803EF820803EF80000 +ADB2:002800283F280128012801287FA805E8042800003EFC02483E4820483EFC0000 +ADB3:002800283F280128012801287FA805E8042800003E1002FE3E3820443E380000 +ADB4:002800283F280128012801287FA805E80428000003F802080208020803F80000 +ADB5:002800283F280128012801287FA805E8042800000208020803F8020803F80000 +ADB6:002800283F280128012801287FA805E804280000210821083F0821143F620000 +ADB7:002800283F280128012801287FA805E804280000001000100010006801840000 +ADB8:002800283F280128012801287FA805E8042800000048004800A8011406620000 +ADB9:002800283F280128012801287FA805E804280000000003F00408040803F00000 +ADBA:002800283F280128012801287FA805E80428000003F80020002000D003080000 +ADBB:002800283F280128012801287FA805E804280000004003F8004000A003180000 +ADBC:002800283F280128012801287FA805E80428000003F8000803F8000800080000 +ADBD:002800283F280128012801287FA805E80428000003F8020003F8020003F80000 +ADBE:002800283F280128012801287FA805E80428000000000FF8022002200FF80000 +ADBF:002800283F280128012801287FA805E80428000000800FF803E0041003E00000 +ADC0:00000008000800083FE8002800280028002800087FE804080408040804080000 +ADC1:000800083F080108010801087FE8020802000000000007F80008000800080000 +ADC2:000800083F080108010801087FE802080200000000003EF80208020802080000 +ADC3:000800083F080108010801087FE802080200000000001F080108011401620000 +ADC4:000800083F0801080108010800087FE80208020802081008100010001FF80000 +ADC5:000800083F080108010801087FE8020802000000000020F8201020303ECC0000 +ADC6:000800083F080108010801087FE8020802000000202021FC207020883E700000 +ADC7:000800083F080108010801087FE802080200000003F802000200020003F80000 +ADC8:000800083F080108010801087FE802080200000007F8000807F8040007F80000 +ADC9:000800083F080108010801087FE80208020000003EF802083E0820083E080000 +ADCA:000800083F080108010801087FE80208020000003EF802883E8820883EF80000 +ADCB:000800083F080108010801087FE80208020000003E8802883EF820883EF80000 +ADCC:000800083F080108010801087FE80208020000000F8800880F8808140FA20000 +ADCD:000800083F080108010801087FE80208020000003EF802803EF820803EF80000 +ADCE:000800083F080108010801087FE80208020000003EFC02483E4820483EFC0000 +ADCF:000800083F080108010801087FE80208020000003E1002FE3E3820443E380000 +ADD0:000800083F080108010801087FE802080200000003F802080208020803F80000 +ADD1:000800083F080108010801087FE80208020000000208020803F8020803F80000 +ADD2:000800083F080108010801087FE8020802000000210821083F0821143F620000 +ADD3:000800083F080108010801087FE8020802000000001000100010006801840000 +ADD4:000800083F080108010801087FE80208020000000048004800A8011406620000 +ADD5:000800083F080108010801087FE8020802000000000003F00408040803F00000 +ADD6:000800083F080108010801087FE802080200000003F80020002000D003080000 +ADD7:000800083F080108010801087FE8020802000000004003F8004000A003180000 +ADD8:000800083F080108010801087FE802080200000003F8000803F8000800080000 +ADD9:000800083F080108010801087FE802080200000003F8020003F8020003F80000 +ADDA:000800083F080108010801087FE802080200000000000FF8022002200FF80000 +ADDB:000800083F080108010801087FE802080200000000800FF803E0041003E00000 +ADDC:0000000000003FE00020002000200020002000007FFC04400440044004400000 +ADDD:000000001FF000100010001000007FFC044004401FF000100010001000100000 +ADDE:000000001FF000100010001000007FFC0440044000003EF80208020802080000 +ADDF:000000001FF000100010001000007FFC0440044000001E100210022802C40000 +ADE0:000000001FF0001000100010000000007FFC044004401440100010001FF00000 +ADE1:000000001FF000100010001000007FFC04400440000020F8201020303ECC0000 +ADE2:000000001FF000100010001000007FFC04400440202021FC207020883E700000 +ADE3:000000001FF000100010001000007FFC044004401FF01000100010001FF00000 +ADE4:000000001FF000100010001000007FFC044004401FF000101FF010001FF00000 +ADE5:000000001FF000100010001000007FFC044004403EF802083E0820083E080000 +ADE6:000000001FF000100010001000007FFC044004403EF802883E8820883EF80000 +ADE7:000000001FF000100010001000007FFC044004403E8802883EF820883EF80000 +ADE8:000000001FF000100010001000007FFC044004403E1002103E1020283EC40000 +ADE9:000000001FF000100010001000007FFC044004403EF802803EF820803EF80000 +ADEA:000000001FF000100010001000007FFC044004403EFC02483E4820483EFC0000 +ADEB:000000001FF000100010001000007FFC044004403E2003FC3E7020883E700000 +ADEC:000000001FF000100010001000007FFC044004401FF01010101010101FF00000 +ADED:000000001FF000100010001000007FFC04400440101010101FF010101FF00000 +ADEE:000000001FF000100010001000007FFC04400440222022203E2022503E880000 +ADEF:000000001FF000100010001000007FFC0440044000000100010002800C400000 +ADF0:000000001FF000100010001000007FFC044004400000024002400DA033100000 +ADF1:000000001FF000100010001000007FFC04400440000007C00820082007C00000 +ADF2:000000001FF000100010001000007FFC04400440000007E00080014006200000 +ADF3:000000001FF000100010001000007FFC04400440008007E00080014006200000 +ADF4:000000001FF000100010001000007FFC044004401FF000101FF0001000100000 +ADF5:000000001FF000100010001000007FFC044004401FF010001FF010001FF00000 +ADF6:000000001FF000100010001000007FFC0440044000001FF0044004401FF00000 +ADF7:000000001FF000100010001000007FFC0440044001001FF007C0082007C00000 +ADF8:00000000000000003FF00010001000100010001000007FFC0000000000000000 +ADF9:000000001FF0001000100010001000007FFC00001FF000100010001000100000 +ADFA:000000001FF0001000100010001000007FFC000000003EF80208020802080000 +ADFB:000000001FF0001000100010001000007FFC000000001E100210022802C40000 +ADFC:000000001FF0001000100010001000007FFC000000001000100010001FF00000 +ADFD:000000001FF0001000100010001000007FFC0000000020F8201020303ECC0000 +ADFE:000000001FF0001000100010001000007FFC0000202021FC207020883E700000 +ADFF:000000001FF0001000100010001000007FFC00001FF01000100010001FF00000 +AE00:000000001FF0001000100010001000007FFC00001FF000101FF010001FF00000 +AE01:000000001FF0001000100010001000007FFC00003EF802083E0820083E080000 +AE02:000000001FF0001000100010001000007FFC00003EF802883E8820883EF80000 +AE03:000000001FF0001000100010001000007FFC00003E8802883EF820883EF80000 +AE04:000000001FF0001000100010001000007FFC00003E1002103E1020283EC40000 +AE05:000000001FF0001000100010001000007FFC00003EF802803EF820803EF80000 +AE06:000000001FF0001000100010001000007FFC00003EFC02483E4820483EFC0000 +AE07:000000001FF0001000100010001000007FFC00003E2003FC3E7020883E700000 +AE08:000000001FF0001000100010001000007FFC00001FF01010101010101FF00000 +AE09:000000001FF0001000100010001000007FFC0000101010101FF010101FF00000 +AE0A:000000001FF0001000100010001000007FFC0000222022203E2022503E880000 +AE0B:000000001FF0001000100010001000007FFC000000000100010002800C400000 +AE0C:000000001FF0001000100010001000007FFC00000000024002400DA033100000 +AE0D:000000001FF0001000100010001000007FFC0000000007C00820082007C00000 +AE0E:000000001FF0001000100010001000007FFC0000000007E00080014006200000 +AE0F:000000001FF0001000100010001000007FFC0000008007E00080014006200000 +AE10:000000001FF0001000100010001000007FFC00001FF000101FF0001000100000 +AE11:000000001FF0001000100010001000007FFC00001FF010001FF010001FF00000 +AE12:000000001FF0001000100010001000007FFC000000001FF0044004401FF00000 +AE13:000000001FF0001000100010001000007FFC000001001FF007C0082007C00000 +AE14:00000000000800083FC80048004800480048000800087FE80008000800080000 +AE15:000000081F88008800880088008800087FE8000007F800080008000800080000 +AE16:000000081F88008800880088008800087FE8000000003EF80208020802080000 +AE17:000000081F88008800880088008800087FE8000000001F080108011401620000 +AE18:000000081F88008800880088008800087FE8000008000800080008000FF80000 +AE19:000000081F88008800880088008800087FE80000000010F8101010301ECC0000 +AE1A:000000081F88008800880088008800087FE800000808087F081C08220F9C0000 +AE1B:000000081F88008800880088008800087FE8000003F802000200020003F80000 +AE1C:000000081F88008800880088008800087FE8000007F8000807F8040007F80000 +AE1D:000000081F88008800880088008800087FE800003EF802083E0820083E080000 +AE1E:000000081F88008800880088008800087FE800003EF802883E8820883EF80000 +AE1F:000000081F88008800880088008800087FE800003E8802883EF820883EF80000 +AE20:000000081F88008800880088008800087FE800001F0801081F0810141F620000 +AE21:000000081F88008800880088008800087FE800003EF802803EF820803EF80000 +AE22:000000081F88008800880088008800087FE800003EFC02483E4820483EFC0000 +AE23:000000081F88008800880088008800087FE800001F08017F1F1C10221F1C0000 +AE24:000000081F88008800880088008800087FE8000003F802080208020803F80000 +AE25:000000081F88008800880088008800087FE800000208020803F8020803F80000 +AE26:000000081F88008800880088008800087FE80000110811081F0811141F620000 +AE27:000000081F88008800880088008800087FE80000001000100010006801840000 +AE28:000000081F88008800880088008800087FE800000048004800A8011406620000 +AE29:000000081F88008800880088008800087FE80000000003F00408040803F00000 +AE2A:000000081F88008800880088008800087FE8000003F80020002000D003080000 +AE2B:000000081F88008800880088008800087FE80000004003F8004000A003180000 +AE2C:000000081F88008800880088008800087FE8000003F8000803F8000800080000 +AE2D:000000081F88008800880088008800087FE8000003F8020003F8020003F80000 +AE2E:000000081F88008800880088008800087FE8000000000FF8022002200FF80000 +AE2F:000000081F88008800880088008800087FE8000000800FF803E0041003E00000 +AE30:00000000000800081F8800880088008801080108020804081808000800080000 +AE31:000000083E080208020804080808300800080000000007F80008000800080000 +AE32:000000083E08020802080408080830080008000000003EF80208020802080000 +AE33:000000083E08020802080408080830080008000000001F080108011401620000 +AE34:000000083E08020802080408080830080008000800001000100010001FF80000 +AE35:000000083E080208020804080808300800080000000020F8201020303ECC0000 +AE36:000000083E080208020804080808300800080000202021FC207020883E700000 +AE37:000000083E08020802080408080830080008000003F802000200020003F80000 +AE38:000000083E08020802080408080830080008000007F8000807F8040007F80000 +AE39:000000083E0802080208040808083008000800003EF802083E0820083E080000 +AE3A:000000083E0802080208040808083008000800003EF802883E8820883EF80000 +AE3B:000000083E0802080208040808083008000800003E8802883EF820883EF80000 +AE3C:000000083E0802080208040808083008000800000F8800880F8808140FA20000 +AE3D:000000083E0802080208040808083008000800003EF802803EF820803EF80000 +AE3E:000000083E0802080208040808083008000800003EFC02483E4820483EFC0000 +AE3F:000000083E0802080208040808083008000800003E1002FE3E3820443E380000 +AE40:000000083E08020802080408080830080008000003F802080208020803F80000 +AE41:000000083E0802080208040808083008000800000208020803F8020803F80000 +AE42:000000083E080208020804080808300800080000210821083F0821143F620000 +AE43:000000083E080208020804080808300800080000001000100010006801840000 +AE44:000000083E0802080208040808083008000800000048004800A8011406620000 +AE45:000000083E080208020804080808300800080000000003F00408040803F00000 +AE46:000000083E08020802080408080830080008000003F80020002000D003080000 +AE47:000000083E080208020804080808300800080000004003F8004000A003180000 +AE48:000000083E08020802080408080830080008000003F8000803F8000800080000 +AE49:000000083E08020802080408080830080008000003F8020003F8020003F80000 +AE4A:000000083E08020802080408080830080008000000000FF8022002200FF80000 +AE4B:000000083E08020802080408080830080008000000800FF803E0041003E00000 +AE4C:00000000001000107B9008900890089E11101110221044100810001000100000 +AE4D:00000008F78810881088108E2108C6080008000007F800080008000800080000 +AE4E:00000008F78810881088108E2108C6080008000000003EF80208020802080000 +AE4F:00000008F78810881088108E2108C6080008000000001F080108011401620000 +AE50:00000008F78810881088108E2108C6080008000808000800080008000FF80000 +AE51:00000008F78810881088108E2108C60800080000000010F8101010301ECC0000 +AE52:00000008F78810881088108E2108C608000800000808087F081C08220F9C0000 +AE53:00000008F78810881088108E2108C6080008000003F802000200020003F80000 +AE54:00000008F78810881088108E2108C6080008000007F8000807F8040007F80000 +AE55:00000008F78810881088108E2108C608000800003EF802083E0820083E080000 +AE56:00000008F78810881088108E2108C608000800003EF802883E8820883EF80000 +AE57:00000008F78810881088108E2108C608000800003E8802883EF820883EF80000 +AE58:00000008F78810881088108E2108C608000800001F0801081F0810141F620000 +AE59:00000008F78810881088108E2108C608000800003EF802803EF820803EF80000 +AE5A:00000008F78810881088108E2108C608000800003EFC02483E4820483EFC0000 +AE5B:00000008F78810881088108E2108C608000800001F08017F1F1C10221F1C0000 +AE5C:00000008F78810881088108E2108C6080008000003F802080208020803F80000 +AE5D:00000008F78810881088108E2108C608000800000208020803F8020803F80000 +AE5E:00000008F78810881088108E2108C60800080000110811081F0811141F620000 +AE5F:00000008F78810881088108E2108C60800080000001000100010006801840000 +AE60:00000008F78810881088108E2108C608000800000048004800A8011406620000 +AE61:00000008F78810881088108E2108C60800080000000003F00408040803F00000 +AE62:00000008F78810881088108E2108C6080008000003F80020002000D003080000 +AE63:00000008F78810881088108E2108C60800080000004003F8004000A003180000 +AE64:00000008F78810881088108E2108C6080008000003F8000803F8000800080000 +AE65:00000008F78810881088108E2108C6080008000003F8020003F8020003F80000 +AE66:00000008F78810881088108E2108C6080008000000000FF8022002200FF80000 +AE67:00000008F78810881088108E2108C6080008000000800FF803E0041003E00000 +AE68:00000000001200127B9208920892089E11121112221244120812001200120000 +AE69:00000028F7A810A810A810B82128C6280028000007F800080008000800080000 +AE6A:00000028F7A810A810A810B82128C6280028000000003EF80208020802080000 +AE6B:00000028F7A810A810A810B82128C6280028000000003E100210022802C40000 +AE6C:00000028F7A810A810A810B82128C6280028002808000800080008000FF80000 +AE6D:00000028F7A810A810A810B82128C62800280000000020F8201020303ECC0000 +AE6E:00000028F7A810A810A810B82128C62800280000202021FC207020883E700000 +AE6F:00000028F7A810A810A810B82128C6280028000003F802000200020003F80000 +AE70:00000028F7A810A810A810B82128C6280028000007F8000807F8040007F80000 +AE71:00000028F7A810A810A810B82128C628002800003EF802083E0820083E080000 +AE72:00000028F7A810A810A810B82128C628002800003EF802883E8820883EF80000 +AE73:00000028F7A810A810A810B82128C628002800003E8802883EF820883EF80000 +AE74:00000028F7A810A810A810B82128C628002800001F0801081F0810141F620000 +AE75:00000028F7A810A810A810B82128C628002800003EF802803EF820803EF80000 +AE76:00000028F7A810A810A810B82128C628002800003EFC02483E4820483EFC0000 +AE77:00000028F7A810A810A810B82128C628002800003E1002FE3E3820443E380000 +AE78:00000028F7A810A810A810B82128C6280028000003F802080208020803F80000 +AE79:00000028F7A810A810A810B82128C628002800000208020803F8020803F80000 +AE7A:00000028F7A810A810A810B82128C62800280000110811081F0811141F620000 +AE7B:00000028F7A810A810A810B82128C62800280000000800080008003400C20000 +AE7C:00000028F7A810A810A810B82128C628002800000048004800A8011406620000 +AE7D:00000028F7A810A810A810B82128C62800280000000001F00208020801F00000 +AE7E:00000028F7A810A810A810B82128C6280028000003F80020002000D003080000 +AE7F:00000028F7A810A810A810B82128C62800280000004003F8004000A003180000 +AE80:00000028F7A810A810A810B82128C6280028000003F8000803F8000800080000 +AE81:00000028F7A810A810A810B82128C6280028000003F8020003F8020003F80000 +AE82:00000028F7A810A810A810B82128C6280028000000000FF8022002200FF80000 +AE83:00000028F7A810A810A810B82128C6280028000000800FF803E0041003E00000 +AE84:00000000001000107B900890089E08901110111E221044100810001000100000 +AE85:00000008F7881088108E1088210EC6080008000007F800080008000800080000 +AE86:00000008F7881088108E1088210EC6080008000000003EF80208020802080000 +AE87:00000008F7881088108E1088210EC6080008000000001F080108011401620000 +AE88:00000008F7881088108E1088210EC6080008000008000800080008000FF80000 +AE89:00000008F7881088108E1088210EC60800080000000010F8101010301ECC0000 +AE8A:00000008F7881088108E1088210EC608000800000808087F081C08220F9C0000 +AE8B:00000008F7881088108E1088210EC6080008000003F802000200020003F80000 +AE8C:00000008F7881088108E1088210EC6080008000007F8000807F8040007F80000 +AE8D:00000008F7881088108E1088210EC608000800003EF802083E0820083E080000 +AE8E:00000008F7881088108E1088210EC608000800003EF802883E8820883EF80000 +AE8F:00000008F7881088108E1088210EC608000800003E8802883EF820883EF80000 +AE90:00000008F7881088108E1088210EC608000800001F0801081F0810141F620000 +AE91:00000008F7881088108E1088210EC608000800003EF802803EF820803EF80000 +AE92:00000008F7881088108E1088210EC608000800003EFC02483E4820483EFC0000 +AE93:00000008F7881088108E1088210EC608000800001F08017F1F1C10221F1C0000 +AE94:00000008F7881088108E1088210EC6080008000003F802080208020803F80000 +AE95:00000008F7881088108E1088210EC608000800000208020803F8020803F80000 +AE96:00000008F7881088108E1088210EC60800080000110811081F0811141F620000 +AE97:00000008F7881088108E1088210EC60800080000001000100010006801840000 +AE98:00000008F7881088108E1088210EC608000800000048004800A8011406620000 +AE99:00000008F7881088108E1088210EC60800080000000003F00408040803F00000 +AE9A:00000008F7881088108E1088210EC6080008000003F80020002000D003080000 +AE9B:00000008F7881088108E1088210EC60800080000004003F8004000A003180000 +AE9C:00000008F7881088108E1088210EC6080008000003F8000803F8000800080000 +AE9D:00000008F7881088108E1088210EC6080008000003F8020003F8020003F80000 +AE9E:00000008F7881088108E1088210EC6080008000000000FF8022002200FF80000 +AE9F:00000008F7881088108E1088210EC6080008000000800FF803E0041003E00000 +AEA0:00000000001200127B920892089E08921112111E221244120812001200120000 +AEA1:00000028F7A810A810B810A82138C6280028000007F800080008000800080000 +AEA2:00000028F7A810A810B810A82138C6280028000000003EF80208020802080000 +AEA3:00000028F7A810A810B810A82138C6280028000000003E100210022802C40000 +AEA4:00000028F7A810A810B810A82138C6280028002808000800080008000FF80000 +AEA5:00000028F7A810A810B810A82138C62800280000000020F8201020303ECC0000 +AEA6:00000028F7A810A810B810A82138C62800280000202021FC207020883E700000 +AEA7:00000028F7A810A810B810A82138C6280028000003F802000200020003F80000 +AEA8:00000028F7A810A810B810A82138C6280028000007F8000807F8040007F80000 +AEA9:00000028F7A810A810B810A82138C628002800003EF802083E0820083E080000 +AEAA:00000028F7A810A810B810A82138C628002800003EF802883E8820883EF80000 +AEAB:00000028F7A810A810B810A82138C628002800003E8802883EF820883EF80000 +AEAC:00000028F7A810A810B810A82138C628002800001F0801081F0810141F620000 +AEAD:00000028F7A810A810B810A82138C628002800003EF802803EF820803EF80000 +AEAE:00000028F7A810A810B810A82138C628002800003EFC02483E4820483EFC0000 +AEAF:00000028F7A810A810B810A82138C628002800003E1002FE3E3820443E380000 +AEB0:00000028F7A810A810B810A82138C6280028000003F802080208020803F80000 +AEB1:00000028F7A810A810B810A82138C628002800000208020803F8020803F80000 +AEB2:00000028F7A810A810B810A82138C62800280000110811081F0811141F620000 +AEB3:00000028F7A810A810B810A82138C62800280000000800080008003400C20000 +AEB4:00000028F7A810A810B810A82138C628002800000048004800A8011406620000 +AEB5:00000028F7A810A810B810A82138C62800280000000001F00208020801F00000 +AEB6:00000028F7A810A810B810A82138C6280028000003F80020002000D003080000 +AEB7:00000028F7A810A810B810A82138C62800280000004003F8004000A003180000 +AEB8:00000028F7A810A810B810A82138C6280028000003F8000803F8000800080000 +AEB9:00000028F7A810A810B810A82138C6280028000003F8020003F8020003F80000 +AEBA:00000028F7A810A810B810A82138C6280028000000000FF8022002200FF80000 +AEBB:00000028F7A810A810B810A82138C6280028000000800FF803E0041003E00000 +AEBC:00000000000200027B8208820882089E11021102220244020802000200020000 +AEBD:00000008F7881088108810B82108C60800080000000007F80008000800080000 +AEBE:00000008F7881088108810B82108C6080008000000003EF80208020802080000 +AEBF:00000008F7881088108810B82108C6080008000000001F080108011401620000 +AEC0:00000008F7881088108810B82108C6080008000000001000100010001FF80000 +AEC1:00000008F7881088108810B82108C60800080000000020F8201020303ECC0000 +AEC2:00000008F7881088108810B82108C60800080000202021FC207020883E700000 +AEC3:00000008F7881088108810B82108C6080008000003F802000200020003F80000 +AEC4:00000008F7881088108810B82108C6080008000007F8000807F8040007F80000 +AEC5:00000008F7881088108810B82108C608000800003EF802083E0820083E080000 +AEC6:00000008F7881088108810B82108C608000800003EF802883E8820883EF80000 +AEC7:00000008F7881088108810B82108C608000800003E8802883EF820883EF80000 +AEC8:00000008F7881088108810B82108C608000800000F8800880F8808140FA20000 +AEC9:00000008F7881088108810B82108C608000800003EF802803EF820803EF80000 +AECA:00000008F7881088108810B82108C608000800003EFC02483E4820483EFC0000 +AECB:00000008F7881088108810B82108C608000800003E1002FE3E3820443E380000 +AECC:00000008F7881088108810B82108C6080008000003F802080208020803F80000 +AECD:00000008F7881088108810B82108C608000800000208020803F8020803F80000 +AECE:00000008F7881088108810B82108C60800080000210821083F0821143F620000 +AECF:00000008F7881088108810B82108C60800080000001000100010006801840000 +AED0:00000008F7881088108810B82108C608000800000048004800A8011406620000 +AED1:00000008F7881088108810B82108C60800080000000003F00408040803F00000 +AED2:00000008F7881088108810B82108C6080008000003F80020002000D003080000 +AED3:00000008F7881088108810B82108C60800080000004003F8004000A003180000 +AED4:00000008F7881088108810B82108C6080008000003F8000803F8000800080000 +AED5:00000008F7881088108810B82108C6080008000003F8020003F8020003F80000 +AED6:00000008F7881088108810B82108C6080008000000000FF8022002200FF80000 +AED7:00000008F7881088108810B82108C6080008000000800FF803E0041003E00000 +AED8:00000000000A000A7B8A088A088A08BA110A110A220A440A080A000A000A0000 +AED9:00000028F7A810A810A810E82128C6280028000007F800080008000800080000 +AEDA:00000028F7A810A810A810E82128C6280028000000003EF80208020802080000 +AEDB:00000028F7A810A810A810E82128C6280028000000003E100210022802C40000 +AEDC:00000028F7A810A810A810E82128C6280028000008000800080008000FF80000 +AEDD:00000028F7A810A810A810E82128C62800280000000020F8201020303ECC0000 +AEDE:00000028F7A810A810A810E82128C62800280000202021FC207020883E700000 +AEDF:00000028F7A810A810A810E82128C6280028000003F802000200020003F80000 +AEE0:00000028F7A810A810A810E82128C6280028000007F8000807F8040007F80000 +AEE1:00000028F7A810A810A810E82128C628002800003EF802083E0820083E080000 +AEE2:00000028F7A810A810A810E82128C628002800003EF802883E8820883EF80000 +AEE3:00000028F7A810A810A810E82128C628002800003E8802883EF820883EF80000 +AEE4:00000028F7A810A810A810E82128C628002800001F0801081F0810141F620000 +AEE5:00000028F7A810A810A810E82128C628002800003EF802803EF820803EF80000 +AEE6:00000028F7A810A810A810E82128C628002800003EFC02483E4820483EFC0000 +AEE7:00000028F7A810A810A810E82128C628002800003E1002FE3E3820443E380000 +AEE8:00000028F7A810A810A810E82128C6280028000003F802080208020803F80000 +AEE9:00000028F7A810A810A810E82128C628002800000208020803F8020803F80000 +AEEA:00000028F7A810A810A810E82128C62800280000110811081F0811141F620000 +AEEB:00000028F7A810A810A810E82128C62800280000000800080008003400C20000 +AEEC:00000028F7A810A810A810E82128C628002800000048004800A8011406620000 +AEED:00000028F7A810A810A810E82128C62800280000000001F00208020801F00000 +AEEE:00000028F7A810A810A810E82128C6280028000003F80020002000D003080000 +AEEF:00000028F7A810A810A810E82128C62800280000004003F8004000A003180000 +AEF0:00000028F7A810A810A810E82128C6280028000003F8000803F8000800080000 +AEF1:00000028F7A810A810A810E82128C6280028000003F8020003F8020003F80000 +AEF2:00000028F7A810A810A810E82128C6280028000000000FF8022002200FF80000 +AEF3:00000028F7A810A810A810E82128C6280028000000800FF803E0041003E00000 +AEF4:00000000000200027B820882089E08821102111E220244020802000200020000 +AEF5:00000008F788108810B810882138C60800080000000007F80008000800080000 +AEF6:00000008F788108810B810882138C6080008000000003EF80208020802080000 +AEF7:00000008F788108810B810882138C6080008000000001F080108011401620000 +AEF8:00000008F788108810B810882138C6080008000800001000100010001FF80000 +AEF9:00000008F788108810B810882138C60800080000000020F8201020303ECC0000 +AEFA:00000008F788108810B810882138C60800080000202021FC207020883E700000 +AEFB:00000008F788108810B810882138C6080008000003F802000200020003F80000 +AEFC:00000008F788108810B810882138C6080008000007F8000807F8040007F80000 +AEFD:00000008F788108810B810882138C608000800003EF802083E0820083E080000 +AEFE:00000008F788108810B810882138C608000800003EF802883E8820883EF80000 +AEFF:00000008F788108810B810882138C608000800003E8802883EF820883EF80000 +AF00:00000008F788108810B810882138C608000800000F8800880F8808140FA20000 +AF01:00000008F788108810B810882138C608000800003EF802803EF820803EF80000 +AF02:00000008F788108810B810882138C608000800003EFC02483E4820483EFC0000 +AF03:00000008F788108810B810882138C608000800003E1002FE3E3820443E380000 +AF04:00000008F788108810B810882138C6080008000003F802080208020803F80000 +AF05:00000008F788108810B810882138C608000800000208020803F8020803F80000 +AF06:00000008F788108810B810882138C60800080000210821083F0821143F620000 +AF07:00000008F788108810B810882138C60800080000001000100010006801840000 +AF08:00000008F788108810B810882138C608000800000048004800A8011406620000 +AF09:00000008F788108810B810882138C60800080000000003F00408040803F00000 +AF0A:00000008F788108810B810882138C6080008000003F80020002000D003080000 +AF0B:00000008F788108810B810882138C60800080000004003F8004000A003180000 +AF0C:00000008F788108810B810882138C6080008000003F8000803F8000800080000 +AF0D:00000008F788108810B810882138C6080008000003F8020003F8020003F80000 +AF0E:00000008F788108810B810882138C6080008000000000FF8022002200FF80000 +AF0F:00000008F788108810B810882138C6080008000000800FF803E0041003E00000 +AF10:00000000000A000A7B8A088A08BA088A110A113A220A440A080A000A000A0000 +AF11:00000028F7A810A810E810A821E8C6280028000007F800080008000800080000 +AF12:00000028F7A810A810E810A821E8C6280028000000003EF80208020802080000 +AF13:00000028F7A810A810E810A821E8C6280028000000003E100210022802C40000 +AF14:00000028F7A810A810E810A821E8C6280028002808000800080008000FF80000 +AF15:00000028F7A810A810E810A821E8C62800280000000020F8201020303ECC0000 +AF16:00000028F7A810A810E810A821E8C62800280000202021FC207020883E700000 +AF17:00000028F7A810A810E810A821E8C6280028000003F802000200020003F80000 +AF18:00000028F7A810A810E810A821E8C6280028000007F8000807F8040007F80000 +AF19:00000028F7A810A810E810A821E8C628002800003EF802083E0820083E080000 +AF1A:00000028F7A810A810E810A821E8C628002800003EF802883E8820883EF80000 +AF1B:00000028F7A810A810E810A821E8C628002800003E8802883EF820883EF80000 +AF1C:00000028F7A810A810E810A821E8C628002800001F0801081F0810141F620000 +AF1D:00000028F7A810A810E810A821E8C628002800003EF802803EF820803EF80000 +AF1E:00000028F7A810A810E810A821E8C628002800003EFC02483E4820483EFC0000 +AF1F:00000028F7A810A810E810A821E8C628002800003E1002FE3E3820443E380000 +AF20:00000028F7A810A810E810A821E8C6280028000003F802080208020803F80000 +AF21:00000028F7A810A810E810A821E8C628002800000208020803F8020803F80000 +AF22:00000028F7A810A810E810A821E8C62800280000110811081F0811141F620000 +AF23:00000028F7A810A810E810A821E8C62800280000000800080008003400C20000 +AF24:00000028F7A810A810E810A821E8C628002800000048004800A8011406620000 +AF25:00000028F7A810A810E810A821E8C62800280000000001F00208020801F00000 +AF26:00000028F7A810A810E810A821E8C6280028000003F80020002000D003080000 +AF27:00000028F7A810A810E810A821E8C62800280000004003F8004000A003180000 +AF28:00000028F7A810A810E810A821E8C6280028000003F8000803F8000800080000 +AF29:00000028F7A810A810E810A821E8C6280028000003F8020003F8020003F80000 +AF2A:00000028F7A810A810E810A821E8C6280028000000000FF8022002200FF80000 +AF2B:00000028F7A810A810E810A821E8C6280028000000800FF803E0041003E00000 +AF2C:00000000000000003EF8020802080208020800000100010001007FFC00000000 +AF2D:000000003EF8020802080208010001007FFC00001FF000100010001000100000 +AF2E:000000003EF8020802080208010001007FFC000000003EF80208020802080000 +AF2F:000000003EF8020802080208010001007FFC000000001E100210022802C40000 +AF30:000000003EF8020802080208010001007FFC000000001000100010001FF00000 +AF31:000000003EF8020802080208010001007FFC0000000020F8201020303ECC0000 +AF32:000000003EF8020802080208010001007FFC0000202021FC207020883E700000 +AF33:000000003EF8020802080208010001007FFC00001FF01000100010001FF00000 +AF34:000000003EF8020802080208010001007FFC00001FF000101FF010001FF00000 +AF35:000000003EF8020802080208010001007FFC00003EF802083E0820083E080000 +AF36:000000003EF8020802080208010001007FFC00003EF802883E8820883EF80000 +AF37:000000003EF8020802080208010001007FFC00003E8802883EF820883EF80000 +AF38:000000003EF8020802080208010001007FFC00003E1002103E1020283EC40000 +AF39:000000003EF8020802080208010001007FFC00003EF802803EF820803EF80000 +AF3A:000000003EF8020802080208010001007FFC00003EFC02483E4820483EFC0000 +AF3B:000000003EF8020802080208010001007FFC00003E2003FC3E7020883E700000 +AF3C:000000003EF8020802080208010001007FFC00001FF01010101010101FF00000 +AF3D:000000003EF8020802080208010001007FFC0000101010101FF010101FF00000 +AF3E:000000003EF8020802080208010001007FFC0000222022203E2022503E880000 +AF3F:000000003EF8020802080208010001007FFC000000000100010002800C400000 +AF40:000000003EF8020802080208010001007FFC00000000024002400DA033100000 +AF41:000000003EF8020802080208010001007FFC0000000007C00820082007C00000 +AF42:000000003EF8020802080208010001007FFC0000000007E00080014006200000 +AF43:000000003EF8020802080208010001007FFC0000008007E00080014006200000 +AF44:000000003EF8020802080208010001007FFC00001FF000101FF0001000100000 +AF45:000000003EF8020802080208010001007FFC00001FF010001FF010001FF00000 +AF46:000000003EF8020802080208010001007FFC000000001FF0044004401FF00000 +AF47:000000003EF8020802080208010001007FFC000001001FF007C0082007C00000 +AF48:00000010001000107BD008500850085E08500010041004107FD0001000100000 +AF49:00000008F7881088108E1088148804087FE8000007F800080008000800080000 +AF4A:00000008F7881088108E1088148804087FE8000000003EF80208020802080000 +AF4B:00000008F7881088108E1088148804087FE8000000001F080108011401620000 +AF4C:00000008F7881088108E1088148804087FE8000008000800080008000FF80000 +AF4D:00000008F7881088108E1088148804087FE80000000010F8101010301ECC0000 +AF4E:00000008F7881088108E1088148804087FE800000808087F081C08220F9C0000 +AF4F:00000008F7881088108E1088148804087FE8000003F802000200020003F80000 +AF50:00000008F7881088108E1088148804087FE8000007F8000807F8040007F80000 +AF51:00000008F7881088108E1088148804087FE800003EF802083E0820083E080000 +AF52:00000008F7881088108E1088148804087FE800003EF802883E8820883EF80000 +AF53:00000008F7881088108E1088148804087FE800003E8802883EF820883EF80000 +AF54:00000008F7881088108E1088148804087FE800001F0801081F0810141F620000 +AF55:00000008F7881088108E1088148804087FE800003EF802803EF820803EF80000 +AF56:00000008F7881088108E1088148804087FE800003EFC02483E4820483EFC0000 +AF57:00000008F7881088108E1088148804087FE800001F08017F1F1C10221F1C0000 +AF58:00000008F7881088108E1088148804087FE8000003F802080208020803F80000 +AF59:00000008F7881088108E1088148804087FE800000208020803F8020803F80000 +AF5A:00000008F7881088108E1088148804087FE80000110811081F0811141F620000 +AF5B:00000008F7881088108E1088148804087FE80000001000100010006801840000 +AF5C:00000008F7881088108E1088148804087FE800000048004800A8011406620000 +AF5D:00000008F7881088108E1088148804087FE80000000003F00408040803F00000 +AF5E:00000008F7881088108E1088148804087FE8000003F80020002000D003080000 +AF5F:00000008F7881088108E1088148804087FE80000004003F8004000A003180000 +AF60:00000008F7881088108E1088148804087FE8000003F8000803F8000800080000 +AF61:00000008F7881088108E1088148804087FE8000003F8020003F8020003F80000 +AF62:00000008F7881088108E1088148804087FE8000000000FF8022002200FF80000 +AF63:00000008F7881088108E1088148804087FE8000000800FF803E0041003E00000 +AF64:00000012001200127BD208520852085E08520012041204127FD2001200120000 +AF65:00000028F7A810A810B810A814A804287FA8000007F800080008000800080000 +AF66:00000028F7A810A810B810A814A804287FA8000000003EF80208020802080000 +AF67:00000028F7A810A810B810A814A804287FA8000000001F080108011401620000 +AF68:00000028F7A810A810B810A814A804287FA8000008000800080008000FF80000 +AF69:00000028F7A810A810B810A814A804287FA80000000010F8101010301ECC0000 +AF6A:00000028F7A810A810B810A814A804287FA800000808087F081C08220F9C0000 +AF6B:00000028F7A810A810B810A814A804287FA8000003F802000200020003F80000 +AF6C:00000028F7A810A810B810A814A804287FA8000007F8000807F8040007F80000 +AF6D:00000028F7A810A810B810A814A804287FA800003EF802083E0820083E080000 +AF6E:00000028F7A810A810B810A814A804287FA800003EF802883E8820883EF80000 +AF6F:00000028F7A810A810B810A814A804287FA800003E8802883EF820883EF80000 +AF70:00000028F7A810A810B810A814A804287FA800001F0801081F0810141F620000 +AF71:00000028F7A810A810B810A814A804287FA800003EF802803EF820803EF80000 +AF72:00000028F7A810A810B810A814A804287FA800003EFC02483E4820483EFC0000 +AF73:00000028F7A810A810B810A814A804287FA800001F08017F1F1C10221F1C0000 +AF74:00000028F7A810A810B810A814A804287FA8000003F802080208020803F80000 +AF75:00000028F7A810A810B810A814A804287FA800000208020803F8020803F80000 +AF76:00000028F7A810A810B810A814A804287FA80000110811081F0811141F620000 +AF77:00000028F7A810A810B810A814A804287FA80000001000100010006801840000 +AF78:00000028F7A810A810B810A814A804287FA800000048004800A8011406620000 +AF79:00000028F7A810A810B810A814A804287FA80000000003F00408040803F00000 +AF7A:00000028F7A810A810B810A814A804287FA8000003F80020002000D003080000 +AF7B:00000028F7A810A810B810A814A804287FA80000004003F8004000A003180000 +AF7C:00000028F7A810A810B810A814A804287FA8000003F8000803F8000800080000 +AF7D:00000028F7A810A810B810A814A804287FA8000003F8020003F8020003F80000 +AF7E:00000028F7A810A810B810A814A804287FA8000000000FF8022002200FF80000 +AF7F:00000028F7A810A810B810A814A804287FA8000000800FF803E0041003E00000 +AF80:00000008000800087BC808480848084808480008040804087FE8000800080000 +AF81:00000008F788108810881088148804087FE8000007F800080008000800080000 +AF82:00000008F788108810881088148804087FE8000000003EF80208020802080000 +AF83:00000008F788108810881088148804087FE8000000001F080108011401620000 +AF84:00000008F788108810881088148804087FE8000008000800080008000FF80000 +AF85:00000008F788108810881088148804087FE80000000010F8101010301ECC0000 +AF86:00000008F788108810881088148804087FE800000808087F081C08220F9C0000 +AF87:00000008F788108810881088148804087FE8000003F802000200020003F80000 +AF88:00000008F788108810881088148804087FE8000007F8000807F8040007F80000 +AF89:00000008F788108810881088148804087FE800003EF802083E0820083E080000 +AF8A:00000008F788108810881088148804087FE800003EF802883E8820883EF80000 +AF8B:00000008F788108810881088148804087FE800003E8802883EF820883EF80000 +AF8C:00000008F788108810881088148804087FE800001F0801081F0810141F620000 +AF8D:00000008F788108810881088148804087FE800003EF802803EF820803EF80000 +AF8E:00000008F788108810881088148804087FE800003EFC02483E4820483EFC0000 +AF8F:00000008F788108810881088148804087FE800001F08017F1F1C10221F1C0000 +AF90:00000008F788108810881088148804087FE8000003F802080208020803F80000 +AF91:00000008F788108810881088148804087FE800000208020803F8020803F80000 +AF92:00000008F788108810881088148804087FE80000110811081F0811141F620000 +AF93:00000008F788108810881088148804087FE80000001000100010006801840000 +AF94:00000008F788108810881088148804087FE800000048004800A8011406620000 +AF95:00000008F788108810881088148804087FE80000000003F00408040803F00000 +AF96:00000008F788108810881088148804087FE8000003F80020002000D003080000 +AF97:00000008F788108810881088148804087FE80000004003F8004000A003180000 +AF98:00000008F788108810881088148804087FE8000003F8000803F8000800080000 +AF99:00000008F788108810881088148804087FE8000003F8020003F8020003F80000 +AF9A:00000008F788108810881088148804087FE8000000000FF8022002200FF80000 +AF9B:00000008F788108810881088148804087FE8000000800FF803E0041003E00000 +AF9C:00000000000000003EF8020802080208020804400440044004407FFC00000000 +AF9D:000000003EF8020802080208044004407FFC00001FF000100010001000100000 +AF9E:000000003EF8020802080208044004407FFC000000003EF80208020802080000 +AF9F:000000003EF8020802080208044004407FFC000000001E100210022802C40000 +AFA0:000000003EF8020802080208044004407FFC000000001000100010001FF00000 +AFA1:000000003EF8020802080208044004407FFC0000000020F8201020303ECC0000 +AFA2:000000003EF8020802080208044004407FFC0000202021FC207020883E700000 +AFA3:000000003EF8020802080208044004407FFC00001FF01000100010001FF00000 +AFA4:000000003EF8020802080208044004407FFC00001FF000101FF010001FF00000 +AFA5:000000003EF8020802080208044004407FFC00003EF802083E0820083E080000 +AFA6:000000003EF8020802080208044004407FFC00003EF802883E8820883EF80000 +AFA7:000000003EF8020802080208044004407FFC00003E8802883EF820883EF80000 +AFA8:000000003EF8020802080208044004407FFC00003E1002103E1020283EC40000 +AFA9:000000003EF8020802080208044004407FFC00003EF802803EF820803EF80000 +AFAA:000000003EF8020802080208044004407FFC00003EFC02483E4820483EFC0000 +AFAB:000000003EF8020802080208044004407FFC00003E2003FC3E7020883E700000 +AFAC:000000003EF8020802080208044004407FFC00001FF01010101010101FF00000 +AFAD:000000003EF8020802080208044004407FFC0000101010101FF010101FF00000 +AFAE:000000003EF8020802080208044004407FFC0000222022203E2022503E880000 +AFAF:000000003EF8020802080208044004407FFC000000000100010002800C400000 +AFB0:000000003EF8020802080208044004407FFC00000000024002400DA033100000 +AFB1:000000003EF8020802080208044004407FFC0000000007C00820082007C00000 +AFB2:000000003EF8020802080208044004407FFC0000000007E00080014006200000 +AFB3:000000003EF8020802080208044004407FFC0000008007E00080014006200000 +AFB4:000000003EF8020802080208044004407FFC00001FF000101FF0001000100000 +AFB5:000000003EF8020802080208044004407FFC00001FF010001FF010001FF00000 +AFB6:000000003EF8020802080208044004407FFC000000001FF0044004401FF00000 +AFB7:000000003EF8020802080208044004407FFC000001001FF007C0082007C00000 +AFB8:00000000000000007DF0041004100410041000003FF801000100010001000000 +AFB9:000000003EF802080208020800007FFC010001001FF000100010001000100000 +AFBA:000000003EF802080208020800007FFC0100010000003EF80208020802080000 +AFBB:000000003EF802080208020800007FFC0100010000001E100210022802C40000 +AFBC:000000003EF8020802080208000000007FFC010001001100100010001FF00000 +AFBD:000000003EF802080208020800007FFC01000100000020F8201020303ECC0000 +AFBE:000000003EF802080208020800007FFC01000100202021FC207020883E700000 +AFBF:000000003EF802080208020800007FFC010001001FF01000100010001FF00000 +AFC0:000000003EF802080208020800007FFC010001001FF000101FF010001FF00000 +AFC1:000000003EF802080208020800007FFC010001003EF802083E0820083E080000 +AFC2:000000003EF802080208020800007FFC010001003EF802883E8820883EF80000 +AFC3:000000003EF802080208020800007FFC010001003E8802883EF820883EF80000 +AFC4:000000003EF802080208020800007FFC010001003E1002103E1020283EC40000 +AFC5:000000003EF802080208020800007FFC010001003EF802803EF820803EF80000 +AFC6:000000003EF802080208020800007FFC010001003EFC02483E4820483EFC0000 +AFC7:000000003EF802080208020800007FFC010001003E2003FC3E7020883E700000 +AFC8:000000003EF802080208020800007FFC010001001FF01010101010101FF00000 +AFC9:000000003EF802080208020800007FFC01000100101010101FF010101FF00000 +AFCA:000000003EF802080208020800007FFC01000100222022203E2022503E880000 +AFCB:000000003EF802080208020800007FFC0100010000000100010002800C400000 +AFCC:000000003EF802080208020800007FFC010001000000024002400DA033100000 +AFCD:000000003EF802080208020800007FFC01000100000007C00820082007C00000 +AFCE:000000003EF802080208020800007FFC01000100000007E00080014006200000 +AFCF:000000003EF802080208020800007FFC01000100008007E00080014006200000 +AFD0:000000003EF802080208020800007FFC010001001FF000101FF0001000100000 +AFD1:000000003EF802080208020800007FFC010001001FF010001FF010001FF00000 +AFD2:000000003EF802080208020800007FFC0100010000001FF0044004401FF00000 +AFD3:000000003EF802080208020800007FFC0100010001001FF007C0082007C00000 +AFD4:00000008000800087BC8084808480848000800087FE8040804F8040804080000 +AFD5:00080008F7881088108810887FE8027802080000000007F80008000800080000 +AFD6:00080008F7881088108810887FE802780208000000003EF80208020802080000 +AFD7:00080008F7881088108810887FE802780208000000001F080108011401620000 +AFD8:00080008F78810881088108800087FE80278020802081000100010001FF80000 +AFD9:00080008F7881088108810887FE8027802080000000020F8201020303ECC0000 +AFDA:00080008F7881088108810887FE8027802080000202021FC207020883E700000 +AFDB:00080008F7881088108810887FE802780208000003F802000200020003F80000 +AFDC:00080008F7881088108810887FE802780208000007F8000807F8040007F80000 +AFDD:00080008F7881088108810887FE80278020800003EF802083E0820083E080000 +AFDE:00080008F7881088108810887FE80278020800003EF802883E8820883EF80000 +AFDF:00080008F7881088108810887FE80278020800003E8802883EF820883EF80000 +AFE0:00080008F7881088108810887FE80278020800000F8800880F8808140FA20000 +AFE1:00080008F7881088108810887FE80278020800003EF802803EF820803EF80000 +AFE2:00080008F7881088108810887FE80278020800003EFC02483E4820483EFC0000 +AFE3:00080008F7881088108810887FE80278020800003E1002FE3E3820443E380000 +AFE4:00080008F7881088108810887FE802780208000003F802080208020803F80000 +AFE5:00080008F7881088108810887FE80278020800000208020803F8020803F80000 +AFE6:00080008F7881088108810887FE8027802080000210821083F0821143F620000 +AFE7:00080008F7881088108810887FE8027802080000001000100010006801840000 +AFE8:00080008F7881088108810887FE80278020800000048004800A8011406620000 +AFE9:00080008F7881088108810887FE8027802080000000003F00408040803F00000 +AFEA:00080008F7881088108810887FE802780208000003F80020002000D003080000 +AFEB:00080008F7881088108810887FE8027802080000004003F8004000A003180000 +AFEC:00080008F7881088108810887FE802780208000003F8000803F8000800080000 +AFED:00080008F7881088108810887FE802780208000003F8020003F8020003F80000 +AFEE:00080008F7881088108810887FE802780208000000000FF8022002200FF80000 +AFEF:00080008F7881088108810887FE802780208000000800FF803E0041003E00000 +AFF0:0000000A000A000A7BCA084A084A084A000A000A7FEA040A047A040A040A0000 +AFF1:00280028F7A810A810A810A87FA805E804280000000007F80008000800080000 +AFF2:00280028F7A810A810A810A87FA805E80428000000003EF80208020802080000 +AFF3:00280028F7A810A810A810A87FA805E80428000000001F080108011401620000 +AFF4:00280028F7A810A810A810A800287FA8042805E804281428100010001FF80000 +AFF5:00280028F7A810A810A810A87FA805E804280000000020F8201020303ECC0000 +AFF6:00280028F7A810A810A810A87FA805E804280000202021FC207020883E700000 +AFF7:00280028F7A810A810A810A87FA805E80428000003F802000200020003F80000 +AFF8:00280028F7A810A810A810A87FA805E80428000007F8000807F8040007F80000 +AFF9:00280028F7A810A810A810A87FA805E8042800003EF802083E0820083E080000 +AFFA:00280028F7A810A810A810A87FA805E8042800003EF802883E8820883EF80000 +AFFB:00280028F7A810A810A810A87FA805E8042800003E8802883EF820883EF80000 +AFFC:00280028F7A810A810A810A87FA805E8042800000F8800880F8808140FA20000 +AFFD:00280028F7A810A810A810A87FA805E8042800003EF802803EF820803EF80000 +AFFE:00280028F7A810A810A810A87FA805E8042800003EFC02483E4820483EFC0000 +AFFF:00280028F7A810A810A810A87FA805E8042800003E1002FE3E3820443E380000 +B000:00280028F7A810A810A810A87FA805E80428000003F802080208020803F80000 +B001:00280028F7A810A810A810A87FA805E8042800000208020803F8020803F80000 +B002:00280028F7A810A810A810A87FA805E804280000210821083F0821143F620000 +B003:00280028F7A810A810A810A87FA805E804280000001000100010006801840000 +B004:00280028F7A810A810A810A87FA805E8042800000048004800A8011406620000 +B005:00280028F7A810A810A810A87FA805E804280000000003F00408040803F00000 +B006:00280028F7A810A810A810A87FA805E80428000003F80020002000D003080000 +B007:00280028F7A810A810A810A87FA805E804280000004003F8004000A003180000 +B008:00280028F7A810A810A810A87FA805E80428000003F8000803F8000800080000 +B009:00280028F7A810A810A810A87FA805E80428000003F8020003F8020003F80000 +B00A:00280028F7A810A810A810A87FA805E80428000000000FF8022002200FF80000 +B00B:00280028F7A810A810A810A87FA805E80428000000800FF803E0041003E00000 +B00C:00000008000800087BC8084808480848000800087FE804080408040804080000 +B00D:00080008F7881088108810887FE8020802000000000007F80008000800080000 +B00E:00080008F7881088108810887FE802080200000000003EF80208020802080000 +B00F:00080008F7881088108810887FE802080200000000001F080108011401620000 +B010:00080008F78810881088108800087FE80208020802081008100010001FF80000 +B011:00080008F7881088108810887FE8020802000000000020F8201020303ECC0000 +B012:00080008F7881088108810887FE8020802000000202021FC207020883E700000 +B013:00080008F7881088108810887FE802080200000003F802000200020003F80000 +B014:00080008F7881088108810887FE802080200000007F8000807F8040007F80000 +B015:00080008F7881088108810887FE80208020000003EF802083E0820083E080000 +B016:00080008F7881088108810887FE80208020000003EF802883E8820883EF80000 +B017:00080008F7881088108810887FE80208020000003E8802883EF820883EF80000 +B018:00080008F7881088108810887FE80208020000000F8800880F8808140FA20000 +B019:00080008F7881088108810887FE80208020000003EF802803EF820803EF80000 +B01A:00080008F7881088108810887FE80208020000003EFC02483E4820483EFC0000 +B01B:00080008F7881088108810887FE80208020000003E1002FE3E3820443E380000 +B01C:00080008F7881088108810887FE802080200000003F802080208020803F80000 +B01D:00080008F7881088108810887FE80208020000000208020803F8020803F80000 +B01E:00080008F7881088108810887FE8020802000000210821083F0821143F620000 +B01F:00080008F7881088108810887FE8020802000000001000100010006801840000 +B020:00080008F7881088108810887FE80208020000000048004800A8011406620000 +B021:00080008F7881088108810887FE8020802000000000003F00408040803F00000 +B022:00080008F7881088108810887FE802080200000003F80020002000D003080000 +B023:00080008F7881088108810887FE8020802000000004003F8004000A003180000 +B024:00080008F7881088108810887FE802080200000003F8000803F8000800080000 +B025:00080008F7881088108810887FE802080200000003F8020003F8020003F80000 +B026:00080008F7881088108810887FE802080200000000000FF8022002200FF80000 +B027:00080008F7881088108810887FE802080200000000800FF803E0041003E00000 +B028:00000000000000007DF0041004100410041000007FFC04400440044004400000 +B029:000000003EF802080208020800007FFC044004401FF000100010001000100000 +B02A:000000003EF802080208020800007FFC0440044000003EF80208020802080000 +B02B:000000003EF802080208020800007FFC0440044000001E100210022802C40000 +B02C:000000003EF8020802080208000000007FFC044004401440100010001FF00000 +B02D:000000003EF802080208020800007FFC04400440000020F8201020303ECC0000 +B02E:000000003EF802080208020800007FFC04400440202021FC207020883E700000 +B02F:000000003EF802080208020800007FFC044004401FF01000100010001FF00000 +B030:000000003EF802080208020800007FFC044004401FF000101FF010001FF00000 +B031:000000003EF802080208020800007FFC044004403EF802083E0820083E080000 +B032:000000003EF802080208020800007FFC044004403EF802883E8820883EF80000 +B033:000000003EF802080208020800007FFC044004403E8802883EF820883EF80000 +B034:000000003EF802080208020800007FFC044004403E1002103E1020283EC40000 +B035:000000003EF802080208020800007FFC044004403EF802803EF820803EF80000 +B036:000000003EF802080208020800007FFC044004403EFC02483E4820483EFC0000 +B037:000000003EF802080208020800007FFC044004403E2003FC3E7020883E700000 +B038:000000003EF802080208020800007FFC044004401FF01010101010101FF00000 +B039:000000003EF802080208020800007FFC04400440101010101FF010101FF00000 +B03A:000000003EF802080208020800007FFC04400440222022203E2022503E880000 +B03B:000000003EF802080208020800007FFC0440044000000100010002800C400000 +B03C:000000003EF802080208020800007FFC044004400000024002400DA033100000 +B03D:000000003EF802080208020800007FFC04400440000007C00820082007C00000 +B03E:000000003EF802080208020800007FFC04400440000007E00080014006200000 +B03F:000000003EF802080208020800007FFC04400440008007E00080014006200000 +B040:000000003EF802080208020800007FFC044004401FF000101FF0001000100000 +B041:000000003EF802080208020800007FFC044004401FF010001FF010001FF00000 +B042:000000003EF802080208020800007FFC0440044000001FF0044004401FF00000 +B043:000000003EF802080208020800007FFC0440044001001FF007C0082007C00000 +B044:00000000000000003EF80208020802080208000000007FFC0000000000000000 +B045:000000003EF8020802080208000000007FFC00001FF000100010001000100000 +B046:000000003EF8020802080208000000007FFC000000003EF80208020802080000 +B047:000000003EF8020802080208000000007FFC000000001E100210022802C40000 +B048:000000003EF8020802080208000000007FFC000000001000100010001FF00000 +B049:000000003EF8020802080208000000007FFC0000000020F8201020303ECC0000 +B04A:000000003EF8020802080208000000007FFC0000202021FC207020883E700000 +B04B:000000003EF8020802080208000000007FFC00001FF01000100010001FF00000 +B04C:000000003EF8020802080208000000007FFC00001FF000101FF010001FF00000 +B04D:000000003EF8020802080208000000007FFC00003EF802083E0820083E080000 +B04E:000000003EF8020802080208000000007FFC00003EF802883E8820883EF80000 +B04F:000000003EF8020802080208000000007FFC00003E8802883EF820883EF80000 +B050:000000003EF8020802080208000000007FFC00003E1002103E1020283EC40000 +B051:000000003EF8020802080208000000007FFC00003EF802803EF820803EF80000 +B052:000000003EF8020802080208000000007FFC00003EFC02483E4820483EFC0000 +B053:000000003EF8020802080208000000007FFC00003E2003FC3E7020883E700000 +B054:000000003EF8020802080208000000007FFC00001FF01010101010101FF00000 +B055:000000003EF8020802080208000000007FFC0000101010101FF010101FF00000 +B056:000000003EF8020802080208000000007FFC0000222022203E2022503E880000 +B057:000000003EF8020802080208000000007FFC000000000100010002800C400000 +B058:000000003EF8020802080208000000007FFC00000000024002400DA033100000 +B059:000000003EF8020802080208000000007FFC0000000007C00820082007C00000 +B05A:000000003EF8020802080208000000007FFC0000000007E00080014006200000 +B05B:000000003EF8020802080208000000007FFC0000008007E00080014006200000 +B05C:000000003EF8020802080208000000007FFC00001FF000101FF0001000100000 +B05D:000000003EF8020802080208000000007FFC00001FF010001FF010001FF00000 +B05E:000000003EF8020802080208000000007FFC000000001FF0044004401FF00000 +B05F:000000003EF8020802080208000000007FFC000001001FF007C0082007C00000 +B060:00000008000800087BC80848084808480848000800087FE80008000800080000 +B061:00000008F788108810881088108800087FE8000007F800080008000800080000 +B062:00000008F788108810881088108800087FE8000000003EF80208020802080000 +B063:00000008F788108810881088108800087FE8000000001F080108011401620000 +B064:00000008F788108810881088108800087FE8000008000800080008000FF80000 +B065:00000008F788108810881088108800087FE80000000010F8101010301ECC0000 +B066:00000008F788108810881088108800087FE800000808087F081C08220F9C0000 +B067:00000008F788108810881088108800087FE8000003F802000200020003F80000 +B068:00000008F788108810881088108800087FE8000007F8000807F8040007F80000 +B069:00000008F788108810881088108800087FE800003EF802083E0820083E080000 +B06A:00000008F788108810881088108800087FE800003EF802883E8820883EF80000 +B06B:00000008F788108810881088108800087FE800003E8802883EF820883EF80000 +B06C:00000008F788108810881088108800087FE800001F0801081F0810141F620000 +B06D:00000008F788108810881088108800087FE800003EF802803EF820803EF80000 +B06E:00000008F788108810881088108800087FE800003EFC02483E4820483EFC0000 +B06F:00000008F788108810881088108800087FE800001F08017F1F1C10221F1C0000 +B070:00000008F788108810881088108800087FE8000003F802080208020803F80000 +B071:00000008F788108810881088108800087FE800000208020803F8020803F80000 +B072:00000008F788108810881088108800087FE80000110811081F0811141F620000 +B073:00000008F788108810881088108800087FE80000001000100010006801840000 +B074:00000008F788108810881088108800087FE800000048004800A8011406620000 +B075:00000008F788108810881088108800087FE80000000003F00408040803F00000 +B076:00000008F788108810881088108800087FE8000003F80020002000D003080000 +B077:00000008F788108810881088108800087FE80000004003F8004000A003180000 +B078:00000008F788108810881088108800087FE8000003F8000803F8000800080000 +B079:00000008F788108810881088108800087FE8000003F8020003F8020003F80000 +B07A:00000008F788108810881088108800087FE8000000000FF8022002200FF80000 +B07B:00000008F788108810881088108800087FE8000000800FF803E0041003E00000 +B07C:00000000000800087B8808880888088811081108220844080808000800080000 +B07D:00000008F7881088108810882108C60800080000000007F80008000800080000 +B07E:00000008F7881088108810882108C6080008000000003EF80208020802080000 +B07F:00000008F7881088108810882108C6080008000000001F080108011401620000 +B080:00000008F7881088108810882108C6080008000800001000100010001FF80000 +B081:00000008F7881088108810882108C60800080000000020F8201020303ECC0000 +B082:00000008F7881088108810882108C60800080000202021FC207020883E700000 +B083:00000008F7881088108810882108C6080008000003F802000200020003F80000 +B084:00000008F7881088108810882108C6080008000007F8000807F8040007F80000 +B085:00000008F7881088108810882108C608000800003EF802083E0820083E080000 +B086:00000008F7881088108810882108C608000800003EF802883E8820883EF80000 +B087:00000008F7881088108810882108C608000800003E8802883EF820883EF80000 +B088:00000008F7881088108810882108C608000800000F8800880F8808140FA20000 +B089:00000008F7881088108810882108C608000800003EF802803EF820803EF80000 +B08A:00000008F7881088108810882108C608000800003EFC02483E4820483EFC0000 +B08B:00000008F7881088108810882108C608000800003E1002FE3E3820443E380000 +B08C:00000008F7881088108810882108C6080008000003F802080208020803F80000 +B08D:00000008F7881088108810882108C608000800000208020803F8020803F80000 +B08E:00000008F7881088108810882108C60800080000210821083F0821143F620000 +B08F:00000008F7881088108810882108C60800080000001000100010006801840000 +B090:00000008F7881088108810882108C608000800000048004800A8011406620000 +B091:00000008F7881088108810882108C60800080000000003F00408040803F00000 +B092:00000008F7881088108810882108C6080008000003F80020002000D003080000 +B093:00000008F7881088108810882108C60800080000004003F8004000A003180000 +B094:00000008F7881088108810882108C6080008000003F8000803F8000800080000 +B095:00000008F7881088108810882108C6080008000003F8020003F8020003F80000 +B096:00000008F7881088108810882108C6080008000000000FF8022002200FF80000 +B097:00000008F7881088108810882108C6080008000000800FF803E0041003E00000 +B098:0000000000100010001040104010401E4010401040107F900010001000100000 +B099:00000008000800084008400E400840087E08000007F800080008000800080000 +B09A:00000008000800084008400E400840087E08000000003EF80208020802080000 +B09B:00000008000800084008400E400840087E08000000001F080108011401620000 +B09C:00000008000800084008400E400840087E08000808000800080008000FF80000 +B09D:00000008000800084008400E400840087E080000000010F8101010301ECC0000 +B09E:00000008000800084008400E400840087E0800000808087F081C08220F9C0000 +B09F:00000008000800084008400E400840087E08000003F802000200020003F80000 +B0A0:00000008000800084008400E400840087E08000007F8000807F8040007F80000 +B0A1:00000008000800084008400E400840087E0800003EF802083E0820083E080000 +B0A2:00000008000800084008400E400840087E0800003EF802883E8820883EF80000 +B0A3:00000008000800084008400E400840087E0800003E8802883EF820883EF80000 +B0A4:00000008000800084008400E400840087E0800001F0801081F0810141F620000 +B0A5:00000008000800084008400E400840087E0800003EF802803EF820803EF80000 +B0A6:00000008000800084008400E400840087E0800003EFC02483E4820483EFC0000 +B0A7:00000008000800084008400E400840087E0800001F08017F1F1C10221F1C0000 +B0A8:00000008000800084008400E400840087E08000003F802080208020803F80000 +B0A9:00000008000800084008400E400840087E0800000208020803F8020803F80000 +B0AA:00000008000800084008400E400840087E080000110811081F0811141F620000 +B0AB:00000008000800084008400E400840087E080000001000100010006801840000 +B0AC:00000008000800084008400E400840087E0800000048004800A8011406620000 +B0AD:00000008000800084008400E400840087E080000000003F00408040803F00000 +B0AE:00000008000800084008400E400840087E08000003F80020002000D003080000 +B0AF:00000008000800084008400E400840087E080000004003F8004000A003180000 +B0B0:00000008000800084008400E400840087E08000003F8000803F8000800080000 +B0B1:00000008000800084008400E400840087E08000003F8020003F8020003F80000 +B0B2:00000008000800084008400E400840087E08000000000FF8022002200FF80000 +B0B3:00000008000800084008400E400840087E08000000800FF803E0041003E00000 +B0B4:0000000000120012001240124012401E4012401240127F920012001200120000 +B0B5:000000280028002840284038402840287E28000007F800080008000800080000 +B0B6:000000280028002840284038402840287E28000000003EF80208020802080000 +B0B7:000000280028002840284038402840287E28000000003E100210022802C40000 +B0B8:000000280028002840284038402840287E28002808000800080008000FF80000 +B0B9:000000280028002840284038402840287E280000000020F8201020303ECC0000 +B0BA:000000280028002840284038402840287E280000202021FC207020883E700000 +B0BB:000000280028002840284038402840287E28000003F802000200020003F80000 +B0BC:000000280028002840284038402840287E28000007F8000807F8040007F80000 +B0BD:000000280028002840284038402840287E2800003EF802083E0820083E080000 +B0BE:000000280028002840284038402840287E2800003EF802883E8820883EF80000 +B0BF:000000280028002840284038402840287E2800003E8802883EF820883EF80000 +B0C0:000000280028002840284038402840287E2800001F0801081F0810141F620000 +B0C1:000000280028002840284038402840287E2800003EF802803EF820803EF80000 +B0C2:000000280028002840284038402840287E2800003EFC02483E4820483EFC0000 +B0C3:000000280028002840284038402840287E2800003E1002FE3E3820443E380000 +B0C4:000000280028002840284038402840287E28000003F802080208020803F80000 +B0C5:000000280028002840284038402840287E2800000208020803F8020803F80000 +B0C6:000000280028002840284038402840287E280000110811081F0811141F620000 +B0C7:000000280028002840284038402840287E280000000800080008003400C20000 +B0C8:000000280028002840284038402840287E2800000048004800A8011406620000 +B0C9:000000280028002840284038402840287E280000000001F00208020801F00000 +B0CA:000000280028002840284038402840287E28000003F80020002000D003080000 +B0CB:000000280028002840284038402840287E280000004003F8004000A003180000 +B0CC:000000280028002840284038402840287E28000003F8000803F8000800080000 +B0CD:000000280028002840284038402840287E28000003F8020003F8020003F80000 +B0CE:000000280028002840284038402840287E28000000000FF8022002200FF80000 +B0CF:000000280028002840284038402840287E28000000800FF803E0041003E00000 +B0D0:000000000010001000104010401E40104010401E40107F900010001000100000 +B0D1:0000000800080008400E4008400E40087E08000007F800080008000800080000 +B0D2:0000000800080008400E4008400E40087E08000000003EF80208020802080000 +B0D3:0000000800080008400E4008400E40087E08000000001F080108011401620000 +B0D4:0000000800080008400E4008400E40087E08000008000800080008000FF80000 +B0D5:0000000800080008400E4008400E40087E080000000010F8101010301ECC0000 +B0D6:0000000800080008400E4008400E40087E0800000808087F081C08220F9C0000 +B0D7:0000000800080008400E4008400E40087E08000003F802000200020003F80000 +B0D8:0000000800080008400E4008400E40087E08000007F8000807F8040007F80000 +B0D9:0000000800080008400E4008400E40087E0800003EF802083E0820083E080000 +B0DA:0000000800080008400E4008400E40087E0800003EF802883E8820883EF80000 +B0DB:0000000800080008400E4008400E40087E0800003E8802883EF820883EF80000 +B0DC:0000000800080008400E4008400E40087E0800001F0801081F0810141F620000 +B0DD:0000000800080008400E4008400E40087E0800003EF802803EF820803EF80000 +B0DE:0000000800080008400E4008400E40087E0800003EFC02483E4820483EFC0000 +B0DF:0000000800080008400E4008400E40087E0800001F08017F1F1C10221F1C0000 +B0E0:0000000800080008400E4008400E40087E08000003F802080208020803F80000 +B0E1:0000000800080008400E4008400E40087E0800000208020803F8020803F80000 +B0E2:0000000800080008400E4008400E40087E080000110811081F0811141F620000 +B0E3:0000000800080008400E4008400E40087E080000001000100010006801840000 +B0E4:0000000800080008400E4008400E40087E0800000048004800A8011406620000 +B0E5:0000000800080008400E4008400E40087E080000000003F00408040803F00000 +B0E6:0000000800080008400E4008400E40087E08000003F80020002000D003080000 +B0E7:0000000800080008400E4008400E40087E080000004003F8004000A003180000 +B0E8:0000000800080008400E4008400E40087E08000003F8000803F8000800080000 +B0E9:0000000800080008400E4008400E40087E08000003F8020003F8020003F80000 +B0EA:0000000800080008400E4008400E40087E08000000000FF8022002200FF80000 +B0EB:0000000800080008400E4008400E40087E08000000800FF803E0041003E00000 +B0EC:000000000012001200124012401E40124012401E40127F920012001200120000 +B0ED:000000280028002840384028403840287E28000007F800080008000800080000 +B0EE:000000280028002840384028403840287E28000000003EF80208020802080000 +B0EF:000000280028002840384028403840287E28000000003E100210022802C40000 +B0F0:000000280028002840384028403840287E28002808000800080008000FF80000 +B0F1:000000280028002840384028403840287E280000000020F8201020303ECC0000 +B0F2:000000280028002840384028403840287E280000202021FC207020883E700000 +B0F3:000000280028002840384028403840287E28000003F802000200020003F80000 +B0F4:000000280028002840384028403840287E28000007F8000807F8040007F80000 +B0F5:000000280028002840384028403840287E2800003EF802083E0820083E080000 +B0F6:000000280028002840384028403840287E2800003EF802883E8820883EF80000 +B0F7:000000280028002840384028403840287E2800003E8802883EF820883EF80000 +B0F8:000000280028002840384028403840287E2800001F0801081F0810141F620000 +B0F9:000000280028002840384028403840287E2800003EF802803EF820803EF80000 +B0FA:000000280028002840384028403840287E2800003EFC02483E4820483EFC0000 +B0FB:000000280028002840384028403840287E2800003E1002FE3E3820443E380000 +B0FC:000000280028002840384028403840287E28000003F802080208020803F80000 +B0FD:000000280028002840384028403840287E2800000208020803F8020803F80000 +B0FE:000000280028002840384028403840287E280000110811081F0811141F620000 +B0FF:000000280028002840384028403840287E280000000800080008003400C20000 +B100:000000280028002840384028403840287E2800000048004800A8011406620000 +B101:000000280028002840384028403840287E280000000001F00208020801F00000 +B102:000000280028002840384028403840287E28000003F80020002000D003080000 +B103:000000280028002840384028403840287E280000004003F8004000A003180000 +B104:000000280028002840384028403840287E28000003F8000803F8000800080000 +B105:000000280028002840384028403840287E28000003F8020003F8020003F80000 +B106:000000280028002840384028403840287E28000000000FF8022002200FF80000 +B107:000000280028002840384028403840287E28000000800FF803E0041003E00000 +B108:0000000000020002000240024002401E4002400240027F820002000200020000 +B109:000000080008000840084038400840087E080000000007F80008000800080000 +B10A:000000080008000840084038400840087E08000000003EF80208020802080000 +B10B:000000080008000840084038400840087E08000000001F080108011401620000 +B10C:000000080008000840084038400840087E08000000001000100010001FF80000 +B10D:000000080008000840084038400840087E080000000020F8201020303ECC0000 +B10E:000000080008000840084038400840087E080000202021FC207020883E700000 +B10F:000000080008000840084038400840087E08000003F802000200020003F80000 +B110:000000080008000840084038400840087E08000007F8000807F8040007F80000 +B111:000000080008000840084038400840087E0800003EF802083E0820083E080000 +B112:000000080008000840084038400840087E0800003EF802883E8820883EF80000 +B113:000000080008000840084038400840087E0800003E8802883EF820883EF80000 +B114:000000080008000840084038400840087E0800000F8800880F8808140FA20000 +B115:000000080008000840084038400840087E0800003EF802803EF820803EF80000 +B116:000000080008000840084038400840087E0800003EFC02483E4820483EFC0000 +B117:000000080008000840084038400840087E0800003E1002FE3E3820443E380000 +B118:000000080008000840084038400840087E08000003F802080208020803F80000 +B119:000000080008000840084038400840087E0800000208020803F8020803F80000 +B11A:000000080008000840084038400840087E080000210821083F0821143F620000 +B11B:000000080008000840084038400840087E080000001000100010006801840000 +B11C:000000080008000840084038400840087E0800000048004800A8011406620000 +B11D:000000080008000840084038400840087E080000000003F00408040803F00000 +B11E:000000080008000840084038400840087E08000003F80020002000D003080000 +B11F:000000080008000840084038400840087E080000004003F8004000A003180000 +B120:000000080008000840084038400840087E08000003F8000803F8000800080000 +B121:000000080008000840084038400840087E08000003F8020003F8020003F80000 +B122:000000080008000840084038400840087E08000000000FF8022002200FF80000 +B123:000000080008000840084038400840087E08000000800FF803E0041003E00000 +B124:00000000000A000A000A400A400A403A400A400A400A7F8A000A000A000A0000 +B125:0000002800280028402840E8402840287E28000007F800080008000800080000 +B126:0000002800280028402840E8402840287E28000000003EF80208020802080000 +B127:0000002800280028402840E8402840287E28000000003E100210022802C40000 +B128:0000002800280028402840E8402840287E28000008000800080008000FF80000 +B129:0000002800280028402840E8402840287E280000000020F8201020303ECC0000 +B12A:0000002800280028402840E8402840287E280000202021FC207020883E700000 +B12B:0000002800280028402840E8402840287E28000003F802000200020003F80000 +B12C:0000002800280028402840E8402840287E28000007F8000807F8040007F80000 +B12D:0000002800280028402840E8402840287E2800003EF802083E0820083E080000 +B12E:0000002800280028402840E8402840287E2800003EF802883E8820883EF80000 +B12F:0000002800280028402840E8402840287E2800003E8802883EF820883EF80000 +B130:0000002800280028402840E8402840287E2800001F0801081F0810141F620000 +B131:0000002800280028402840E8402840287E2800003EF802803EF820803EF80000 +B132:0000002800280028402840E8402840287E2800003EFC02483E4820483EFC0000 +B133:0000002800280028402840E8402840287E2800003E1002FE3E3820443E380000 +B134:0000002800280028402840E8402840287E28000003F802080208020803F80000 +B135:0000002800280028402840E8402840287E2800000208020803F8020803F80000 +B136:0000002800280028402840E8402840287E280000110811081F0811141F620000 +B137:0000002800280028402840E8402840287E280000000800080008003400C20000 +B138:0000002800280028402840E8402840287E2800000048004800A8011406620000 +B139:0000002800280028402840E8402840287E280000000001F00208020801F00000 +B13A:0000002800280028402840E8402840287E28000003F80020002000D003080000 +B13B:0000002800280028402840E8402840287E280000004003F8004000A003180000 +B13C:0000002800280028402840E8402840287E28000003F8000803F8000800080000 +B13D:0000002800280028402840E8402840287E28000003F8020003F8020003F80000 +B13E:0000002800280028402840E8402840287E28000000000FF8022002200FF80000 +B13F:0000002800280028402840E8402840287E28000000800FF803E0041003E00000 +B140:000000000002000200024002401E40024002401E40027F820002000200020000 +B141:000000080008000840384008403840087E080000000007F80008000800080000 +B142:000000080008000840384008403840087E08000000003EF80208020802080000 +B143:000000080008000840384008403840087E08000000001F080108011401620000 +B144:000000080008000840384008403840087E08000800001000100010001FF80000 +B145:000000080008000840384008403840087E080000000020F8201020303ECC0000 +B146:000000080008000840384008403840087E080000202021FC207020883E700000 +B147:000000080008000840384008403840087E08000003F802000200020003F80000 +B148:000000080008000840384008403840087E08000007F8000807F8040007F80000 +B149:000000080008000840384008403840087E0800003EF802083E0820083E080000 +B14A:000000080008000840384008403840087E0800003EF802883E8820883EF80000 +B14B:000000080008000840384008403840087E0800003E8802883EF820883EF80000 +B14C:000000080008000840384008403840087E0800000F8800880F8808140FA20000 +B14D:000000080008000840384008403840087E0800003EF802803EF820803EF80000 +B14E:000000080008000840384008403840087E0800003EFC02483E4820483EFC0000 +B14F:000000080008000840384008403840087E0800003E1002FE3E3820443E380000 +B150:000000080008000840384008403840087E08000003F802080208020803F80000 +B151:000000080008000840384008403840087E0800000208020803F8020803F80000 +B152:000000080008000840384008403840087E080000210821083F0821143F620000 +B153:000000080008000840384008403840087E080000001000100010006801840000 +B154:000000080008000840384008403840087E0800000048004800A8011406620000 +B155:000000080008000840384008403840087E080000000003F00408040803F00000 +B156:000000080008000840384008403840087E08000003F80020002000D003080000 +B157:000000080008000840384008403840087E080000004003F8004000A003180000 +B158:000000080008000840384008403840087E08000003F8000803F8000800080000 +B159:000000080008000840384008403840087E08000003F8020003F8020003F80000 +B15A:000000080008000840384008403840087E08000000000FF8022002200FF80000 +B15B:000000080008000840384008403840087E08000000800FF803E0041003E00000 +B15C:00000000000A000A000A400A403A400A400A403A400A7F8A000A000A000A0000 +B15D:000000280028002840E8402840E840287E28000007F800080008000800080000 +B15E:000000280028002840E8402840E840287E28000000003EF80208020802080000 +B15F:000000280028002840E8402840E840287E28000000003E100210022802C40000 +B160:000000280028002840E8402840E840287E28002808000800080008000FF80000 +B161:000000280028002840E8402840E840287E280000000020F8201020303ECC0000 +B162:000000280028002840E8402840E840287E280000202021FC207020883E700000 +B163:000000280028002840E8402840E840287E28000003F802000200020003F80000 +B164:000000280028002840E8402840E840287E28000007F8000807F8040007F80000 +B165:000000280028002840E8402840E840287E2800003EF802083E0820083E080000 +B166:000000280028002840E8402840E840287E2800003EF802883E8820883EF80000 +B167:000000280028002840E8402840E840287E2800003E8802883EF820883EF80000 +B168:000000280028002840E8402840E840287E2800001F0801081F0810141F620000 +B169:000000280028002840E8402840E840287E2800003EF802803EF820803EF80000 +B16A:000000280028002840E8402840E840287E2800003EFC02483E4820483EFC0000 +B16B:000000280028002840E8402840E840287E2800003E1002FE3E3820443E380000 +B16C:000000280028002840E8402840E840287E28000003F802080208020803F80000 +B16D:000000280028002840E8402840E840287E2800000208020803F8020803F80000 +B16E:000000280028002840E8402840E840287E280000110811081F0811141F620000 +B16F:000000280028002840E8402840E840287E280000000800080008003400C20000 +B170:000000280028002840E8402840E840287E2800000048004800A8011406620000 +B171:000000280028002840E8402840E840287E280000000001F00208020801F00000 +B172:000000280028002840E8402840E840287E28000003F80020002000D003080000 +B173:000000280028002840E8402840E840287E280000004003F8004000A003180000 +B174:000000280028002840E8402840E840287E28000003F8000803F8000800080000 +B175:000000280028002840E8402840E840287E28000003F8020003F8020003F80000 +B176:000000280028002840E8402840E840287E28000000000FF8022002200FF80000 +B177:000000280028002840E8402840E840287E28000000800FF803E0041003E00000 +B178:00000000200020002000200020003FF8000000000100010001007FFC00000000 +B179:000000001000100010001FF0010001007FFC00001FF000100010001000100000 +B17A:000000001000100010001FF0010001007FFC000000003EF80208020802080000 +B17B:000000001000100010001FF0010001007FFC000000001E100210022802C40000 +B17C:000000001000100010001FF0010001007FFC000000001000100010001FF00000 +B17D:000000001000100010001FF0010001007FFC0000000020F8201020303ECC0000 +B17E:000000001000100010001FF0010001007FFC0000202021FC207020883E700000 +B17F:000000001000100010001FF0010001007FFC00001FF01000100010001FF00000 +B180:000000001000100010001FF0010001007FFC00001FF000101FF010001FF00000 +B181:000000001000100010001FF0010001007FFC00003EF802083E0820083E080000 +B182:000000001000100010001FF0010001007FFC00003EF802883E8820883EF80000 +B183:000000001000100010001FF0010001007FFC00003E8802883EF820883EF80000 +B184:000000001000100010001FF0010001007FFC00003E1002103E1020283EC40000 +B185:000000001000100010001FF0010001007FFC00003EF802803EF820803EF80000 +B186:000000001000100010001FF0010001007FFC00003EFC02483E4820483EFC0000 +B187:000000001000100010001FF0010001007FFC00003E2003FC3E7020883E700000 +B188:000000001000100010001FF0010001007FFC00001FF01010101010101FF00000 +B189:000000001000100010001FF0010001007FFC0000101010101FF010101FF00000 +B18A:000000001000100010001FF0010001007FFC0000222022203E2022503E880000 +B18B:000000001000100010001FF0010001007FFC000000000100010002800C400000 +B18C:000000001000100010001FF0010001007FFC00000000024002400DA033100000 +B18D:000000001000100010001FF0010001007FFC0000000007C00820082007C00000 +B18E:000000001000100010001FF0010001007FFC0000000007E00080014006200000 +B18F:000000001000100010001FF0010001007FFC0000008007E00080014006200000 +B190:000000001000100010001FF0010001007FFC00001FF000101FF0001000100000 +B191:000000001000100010001FF0010001007FFC00001FF010001FF010001FF00000 +B192:000000001000100010001FF0010001007FFC000000001FF0044004401FF00000 +B193:000000001000100010001FF0010001007FFC000001001FF007C0082007C00000 +B194:0000001000104010401040104010401E7F900010041004107FD0001000100000 +B195:0000000820082008200E20083F8804087FE8000007F800080008000800080000 +B196:0000000820082008200E20083F8804087FE8000000003EF80208020802080000 +B197:0000000820082008200E20083F8804087FE8000000001F080108011401620000 +B198:0000000820082008200E20083F8804087FE8000008000800080008000FF80000 +B199:0000000820082008200E20083F8804087FE80000000010F8101010301ECC0000 +B19A:0000000820082008200E20083F8804087FE800000808087F081C08220F9C0000 +B19B:0000000820082008200E20083F8804087FE8000003F802000200020003F80000 +B19C:0000000820082008200E20083F8804087FE8000007F8000807F8040007F80000 +B19D:0000000820082008200E20083F8804087FE800003EF802083E0820083E080000 +B19E:0000000820082008200E20083F8804087FE800003EF802883E8820883EF80000 +B19F:0000000820082008200E20083F8804087FE800003E8802883EF820883EF80000 +B1A0:0000000820082008200E20083F8804087FE800001F0801081F0810141F620000 +B1A1:0000000820082008200E20083F8804087FE800003EF802803EF820803EF80000 +B1A2:0000000820082008200E20083F8804087FE800003EFC02483E4820483EFC0000 +B1A3:0000000820082008200E20083F8804087FE800001F08017F1F1C10221F1C0000 +B1A4:0000000820082008200E20083F8804087FE8000003F802080208020803F80000 +B1A5:0000000820082008200E20083F8804087FE800000208020803F8020803F80000 +B1A6:0000000820082008200E20083F8804087FE80000110811081F0811141F620000 +B1A7:0000000820082008200E20083F8804087FE80000001000100010006801840000 +B1A8:0000000820082008200E20083F8804087FE800000048004800A8011406620000 +B1A9:0000000820082008200E20083F8804087FE80000000003F00408040803F00000 +B1AA:0000000820082008200E20083F8804087FE8000003F80020002000D003080000 +B1AB:0000000820082008200E20083F8804087FE80000004003F8004000A003180000 +B1AC:0000000820082008200E20083F8804087FE8000003F8000803F8000800080000 +B1AD:0000000820082008200E20083F8804087FE8000003F8020003F8020003F80000 +B1AE:0000000820082008200E20083F8804087FE8000000000FF8022002200FF80000 +B1AF:0000000820082008200E20083F8804087FE8000000800FF803E0041003E00000 +B1B0:0000001200124012401240124012401E7F920012041204127FD2001200120000 +B1B1:0000002820282028203820283FA804287FA8000007F800080008000800080000 +B1B2:0000002820282028203820283FA804287FA8000000003EF80208020802080000 +B1B3:0000002820282028203820283FA804287FA8000000001F080108011401620000 +B1B4:0000002820282028203820283FA804287FA8000008000800080008000FF80000 +B1B5:0000002820282028203820283FA804287FA80000000010F8101010301ECC0000 +B1B6:0000002820282028203820283FA804287FA800000808087F081C08220F9C0000 +B1B7:0000002820282028203820283FA804287FA8000003F802000200020003F80000 +B1B8:0000002820282028203820283FA804287FA8000007F8000807F8040007F80000 +B1B9:0000002820282028203820283FA804287FA800003EF802083E0820083E080000 +B1BA:0000002820282028203820283FA804287FA800003EF802883E8820883EF80000 +B1BB:0000002820282028203820283FA804287FA800003E8802883EF820883EF80000 +B1BC:0000002820282028203820283FA804287FA800001F0801081F0810141F620000 +B1BD:0000002820282028203820283FA804287FA800003EF802803EF820803EF80000 +B1BE:0000002820282028203820283FA804287FA800003EFC02483E4820483EFC0000 +B1BF:0000002820282028203820283FA804287FA800001F08017F1F1C10221F1C0000 +B1C0:0000002820282028203820283FA804287FA8000003F802080208020803F80000 +B1C1:0000002820282028203820283FA804287FA800000208020803F8020803F80000 +B1C2:0000002820282028203820283FA804287FA80000110811081F0811141F620000 +B1C3:0000002820282028203820283FA804287FA80000001000100010006801840000 +B1C4:0000002820282028203820283FA804287FA800000048004800A8011406620000 +B1C5:0000002820282028203820283FA804287FA80000000003F00408040803F00000 +B1C6:0000002820282028203820283FA804287FA8000003F80020002000D003080000 +B1C7:0000002820282028203820283FA804287FA80000004003F8004000A003180000 +B1C8:0000002820282028203820283FA804287FA8000003F8000803F8000800080000 +B1C9:0000002820282028203820283FA804287FA8000003F8020003F8020003F80000 +B1CA:0000002820282028203820283FA804287FA8000000000FF8022002200FF80000 +B1CB:0000002820282028203820283FA804287FA8000000800FF803E0041003E00000 +B1CC:000000080008400840084008400840087F880008040804087FE8000800080000 +B1CD:0000000820082008200820083F8804087FE8000007F800080008000800080000 +B1CE:0000000820082008200820083F8804087FE8000000003EF80208020802080000 +B1CF:0000000820082008200820083F8804087FE8000000001F080108011401620000 +B1D0:0000000820082008200820083F8804087FE8000008000800080008000FF80000 +B1D1:0000000820082008200820083F8804087FE80000000010F8101010301ECC0000 +B1D2:0000000820082008200820083F8804087FE800000808087F081C08220F9C0000 +B1D3:0000000820082008200820083F8804087FE8000003F802000200020003F80000 +B1D4:0000000820082008200820083F8804087FE8000007F8000807F8040007F80000 +B1D5:0000000820082008200820083F8804087FE800003EF802083E0820083E080000 +B1D6:0000000820082008200820083F8804087FE800003EF802883E8820883EF80000 +B1D7:0000000820082008200820083F8804087FE800003E8802883EF820883EF80000 +B1D8:0000000820082008200820083F8804087FE800001F0801081F0810141F620000 +B1D9:0000000820082008200820083F8804087FE800003EF802803EF820803EF80000 +B1DA:0000000820082008200820083F8804087FE800003EFC02483E4820483EFC0000 +B1DB:0000000820082008200820083F8804087FE800001F08017F1F1C10221F1C0000 +B1DC:0000000820082008200820083F8804087FE8000003F802080208020803F80000 +B1DD:0000000820082008200820083F8804087FE800000208020803F8020803F80000 +B1DE:0000000820082008200820083F8804087FE80000110811081F0811141F620000 +B1DF:0000000820082008200820083F8804087FE80000001000100010006801840000 +B1E0:0000000820082008200820083F8804087FE800000048004800A8011406620000 +B1E1:0000000820082008200820083F8804087FE80000000003F00408040803F00000 +B1E2:0000000820082008200820083F8804087FE8000003F80020002000D003080000 +B1E3:0000000820082008200820083F8804087FE80000004003F8004000A003180000 +B1E4:0000000820082008200820083F8804087FE8000003F8000803F8000800080000 +B1E5:0000000820082008200820083F8804087FE8000003F8020003F8020003F80000 +B1E6:0000000820082008200820083F8804087FE8000000000FF8022002200FF80000 +B1E7:0000000820082008200820083F8804087FE8000000800FF803E0041003E00000 +B1E8:00000000200020002000200020003FF8000004400440044004407FFC00000000 +B1E9:000000001000100010001FF0044004407FFC00001FF000100010001000100000 +B1EA:000000001000100010001FF0044004407FFC000000003EF80208020802080000 +B1EB:000000001000100010001FF0044004407FFC000000001E100210022802C40000 +B1EC:000000001000100010001FF0044004407FFC000000001000100010001FF00000 +B1ED:000000001000100010001FF0044004407FFC0000000020F8201020303ECC0000 +B1EE:000000001000100010001FF0044004407FFC0000202021FC207020883E700000 +B1EF:000000001000100010001FF0044004407FFC00001FF01000100010001FF00000 +B1F0:000000001000100010001FF0044004407FFC00001FF000101FF010001FF00000 +B1F1:000000001000100010001FF0044004407FFC00003EF802083E0820083E080000 +B1F2:000000001000100010001FF0044004407FFC00003EF802883E8820883EF80000 +B1F3:000000001000100010001FF0044004407FFC00003E8802883EF820883EF80000 +B1F4:000000001000100010001FF0044004407FFC00003E1002103E1020283EC40000 +B1F5:000000001000100010001FF0044004407FFC00003EF802803EF820803EF80000 +B1F6:000000001000100010001FF0044004407FFC00003EFC02483E4820483EFC0000 +B1F7:000000001000100010001FF0044004407FFC00003E2003FC3E7020883E700000 +B1F8:000000001000100010001FF0044004407FFC00001FF01010101010101FF00000 +B1F9:000000001000100010001FF0044004407FFC0000101010101FF010101FF00000 +B1FA:000000001000100010001FF0044004407FFC0000222022203E2022503E880000 +B1FB:000000001000100010001FF0044004407FFC000000000100010002800C400000 +B1FC:000000001000100010001FF0044004407FFC00000000024002400DA033100000 +B1FD:000000001000100010001FF0044004407FFC0000000007C00820082007C00000 +B1FE:000000001000100010001FF0044004407FFC0000000007E00080014006200000 +B1FF:000000001000100010001FF0044004407FFC0000008007E00080014006200000 +B200:000000001000100010001FF0044004407FFC00001FF000101FF0001000100000 +B201:000000001000100010001FF0044004407FFC00001FF010001FF010001FF00000 +B202:000000001000100010001FF0044004407FFC000000001FF0044004401FF00000 +B203:000000001000100010001FF0044004407FFC000001001FF007C0082007C00000 +B204:00000000200020002000200020003FF8000000003FF801000100010001000000 +B205:000000001000100010001FF000007FFC010001001FF000100010001000100000 +B206:000000001000100010001FF000007FFC0100010000003EF80208020802080000 +B207:000000001000100010001FF000007FFC0100010000001E100210022802C40000 +B208:000000001000100010001FF0000000007FFC010001001100100010001FF00000 +B209:000000001000100010001FF000007FFC01000100000020F8201020303ECC0000 +B20A:000000001000100010001FF000007FFC01000100202021FC207020883E700000 +B20B:000000001000100010001FF000007FFC010001001FF01000100010001FF00000 +B20C:000000001000100010001FF000007FFC010001001FF000101FF010001FF00000 +B20D:000000001000100010001FF000007FFC010001003EF802083E0820083E080000 +B20E:000000001000100010001FF000007FFC010001003EF802883E8820883EF80000 +B20F:000000001000100010001FF000007FFC010001003E8802883EF820883EF80000 +B210:000000001000100010001FF000007FFC010001003E1002103E1020283EC40000 +B211:000000001000100010001FF000007FFC010001003EF802803EF820803EF80000 +B212:000000001000100010001FF000007FFC010001003EFC02483E4820483EFC0000 +B213:000000001000100010001FF000007FFC010001003E2003FC3E7020883E700000 +B214:000000001000100010001FF000007FFC010001001FF01010101010101FF00000 +B215:000000001000100010001FF000007FFC01000100101010101FF010101FF00000 +B216:000000001000100010001FF000007FFC01000100222022203E2022503E880000 +B217:000000001000100010001FF000007FFC0100010000000100010002800C400000 +B218:000000001000100010001FF000007FFC010001000000024002400DA033100000 +B219:000000001000100010001FF000007FFC01000100000007C00820082007C00000 +B21A:000000001000100010001FF000007FFC01000100000007E00080014006200000 +B21B:000000001000100010001FF000007FFC01000100008007E00080014006200000 +B21C:000000001000100010001FF000007FFC010001001FF000101FF0001000100000 +B21D:000000001000100010001FF000007FFC010001001FF010001FF010001FF00000 +B21E:000000001000100010001FF000007FFC0100010000001FF0044004401FF00000 +B21F:000000001000100010001FF000007FFC0100010001001FF007C0082007C00000 +B220:00000008000840084008400840087F88000800087FE8040804F8040804080000 +B221:00082008200820083F8800087FE8027802080000000007F80008000800080000 +B222:00082008200820083F8800087FE802780208000000003EF80208020802080000 +B223:00082008200820083F8800087FE802780208000000001F080108011401620000 +B224:00082008200820083F88000800087FE80278020802081000100010001FF80000 +B225:00082008200820083F8800087FE8027802080000000020F8201020303ECC0000 +B226:00082008200820083F8800087FE8027802080000202021FC207020883E700000 +B227:00082008200820083F8800087FE802780208000003F802000200020003F80000 +B228:00082008200820083F8800087FE802780208000007F8000807F8040007F80000 +B229:00082008200820083F8800087FE80278020800003EF802083E0820083E080000 +B22A:00082008200820083F8800087FE80278020800003EF802883E8820883EF80000 +B22B:00082008200820083F8800087FE80278020800003E8802883EF820883EF80000 +B22C:00082008200820083F8800087FE80278020800000F8800880F8808140FA20000 +B22D:00082008200820083F8800087FE80278020800003EF802803EF820803EF80000 +B22E:00082008200820083F8800087FE80278020800003EFC02483E4820483EFC0000 +B22F:00082008200820083F8800087FE80278020800003E1002FE3E3820443E380000 +B230:00082008200820083F8800087FE802780208000003F802080208020803F80000 +B231:00082008200820083F8800087FE80278020800000208020803F8020803F80000 +B232:00082008200820083F8800087FE8027802080000210821083F0821143F620000 +B233:00082008200820083F8800087FE8027802080000001000100010006801840000 +B234:00082008200820083F8800087FE80278020800000048004800A8011406620000 +B235:00082008200820083F8800087FE8027802080000000003F00408040803F00000 +B236:00082008200820083F8800087FE802780208000003F80020002000D003080000 +B237:00082008200820083F8800087FE8027802080000004003F8004000A003180000 +B238:00082008200820083F8800087FE802780208000003F8000803F8000800080000 +B239:00082008200820083F8800087FE802780208000003F8020003F8020003F80000 +B23A:00082008200820083F8800087FE802780208000000000FF8022002200FF80000 +B23B:00082008200820083F8800087FE802780208000000800FF803E0041003E00000 +B23C:0000000A000A400A400A400A400A7F8A000A000A7FEA040A047A040A040A0000 +B23D:00282028202820283FA800287FA805E804280000000007F80008000800080000 +B23E:00282028202820283FA800287FA805E80428000000003EF80208020802080000 +B23F:00282028202820283FA800287FA805E80428000000001F080108011401620000 +B240:00282028202820283FA8002800287FA8042805E804281428100010001FF80000 +B241:00282028202820283FA800287FA805E804280000000020F8201020303ECC0000 +B242:00282028202820283FA800287FA805E804280000202021FC207020883E700000 +B243:00282028202820283FA800287FA805E80428000003F802000200020003F80000 +B244:00282028202820283FA800287FA805E80428000007F8000807F8040007F80000 +B245:00282028202820283FA800287FA805E8042800003EF802083E0820083E080000 +B246:00282028202820283FA800287FA805E8042800003EF802883E8820883EF80000 +B247:00282028202820283FA800287FA805E8042800003E8802883EF820883EF80000 +B248:00282028202820283FA800287FA805E8042800000F8800880F8808140FA20000 +B249:00282028202820283FA800287FA805E8042800003EF802803EF820803EF80000 +B24A:00282028202820283FA800287FA805E8042800003EFC02483E4820483EFC0000 +B24B:00282028202820283FA800287FA805E8042800003E1002FE3E3820443E380000 +B24C:00282028202820283FA800287FA805E80428000003F802080208020803F80000 +B24D:00282028202820283FA800287FA805E8042800000208020803F8020803F80000 +B24E:00282028202820283FA800287FA805E804280000210821083F0821143F620000 +B24F:00282028202820283FA800287FA805E804280000001000100010006801840000 +B250:00282028202820283FA800287FA805E8042800000048004800A8011406620000 +B251:00282028202820283FA800287FA805E804280000000003F00408040803F00000 +B252:00282028202820283FA800287FA805E80428000003F80020002000D003080000 +B253:00282028202820283FA800287FA805E804280000004003F8004000A003180000 +B254:00282028202820283FA800287FA805E80428000003F8000803F8000800080000 +B255:00282028202820283FA800287FA805E80428000003F8020003F8020003F80000 +B256:00282028202820283FA800287FA805E80428000000000FF8022002200FF80000 +B257:00282028202820283FA800287FA805E80428000000800FF803E0041003E00000 +B258:00000008000840084008400840087F88000800087FE804080408040804080000 +B259:00082008200820083F8800087FE8020802000000000007F80008000800080000 +B25A:00082008200820083F8800087FE802080200000000003EF80208020802080000 +B25B:00082008200820083F8800087FE802080200000000001F080108011401620000 +B25C:00082008200820083F88000800087FE80208020802081008100010001FF80000 +B25D:00082008200820083F8800087FE8020802000000000020F8201020303ECC0000 +B25E:00082008200820083F8800087FE8020802000000202021FC207020883E700000 +B25F:00082008200820083F8800087FE802080200000003F802000200020003F80000 +B260:00082008200820083F8800087FE802080200000007F8000807F8040007F80000 +B261:00082008200820083F8800087FE80208020000003EF802083E0820083E080000 +B262:00082008200820083F8800087FE80208020000003EF802883E8820883EF80000 +B263:00082008200820083F8800087FE80208020000003E8802883EF820883EF80000 +B264:00082008200820083F8800087FE80208020000000F8800880F8808140FA20000 +B265:00082008200820083F8800087FE80208020000003EF802803EF820803EF80000 +B266:00082008200820083F8800087FE80208020000003EFC02483E4820483EFC0000 +B267:00082008200820083F8800087FE80208020000003E1002FE3E3820443E380000 +B268:00082008200820083F8800087FE802080200000003F802080208020803F80000 +B269:00082008200820083F8800087FE80208020000000208020803F8020803F80000 +B26A:00082008200820083F8800087FE8020802000000210821083F0821143F620000 +B26B:00082008200820083F8800087FE8020802000000001000100010006801840000 +B26C:00082008200820083F8800087FE80208020000000048004800A8011406620000 +B26D:00082008200820083F8800087FE8020802000000000003F00408040803F00000 +B26E:00082008200820083F8800087FE802080200000003F80020002000D003080000 +B26F:00082008200820083F8800087FE8020802000000004003F8004000A003180000 +B270:00082008200820083F8800087FE802080200000003F8000803F8000800080000 +B271:00082008200820083F8800087FE802080200000003F8020003F8020003F80000 +B272:00082008200820083F8800087FE802080200000000000FF8022002200FF80000 +B273:00082008200820083F8800087FE802080200000000800FF803E0041003E00000 +B274:00000000200020002000200020003FF8000000007FFC04400440044004400000 +B275:000000001000100010001FF000007FFC044004401FF000100010001000100000 +B276:000000001000100010001FF000007FFC0440044000003EF80208020802080000 +B277:000000001000100010001FF000007FFC0440044000001E100210022802C40000 +B278:000000001000100010001FF0000000007FFC044004401440100010001FF00000 +B279:000000001000100010001FF000007FFC04400440000020F8201020303ECC0000 +B27A:000000001000100010001FF000007FFC04400440202021FC207020883E700000 +B27B:000000001000100010001FF000007FFC044004401FF01000100010001FF00000 +B27C:000000001000100010001FF000007FFC044004401FF000101FF010001FF00000 +B27D:000000001000100010001FF000007FFC044004403EF802083E0820083E080000 +B27E:000000001000100010001FF000007FFC044004403EF802883E8820883EF80000 +B27F:000000001000100010001FF000007FFC044004403E8802883EF820883EF80000 +B280:000000001000100010001FF000007FFC044004403E1002103E1020283EC40000 +B281:000000001000100010001FF000007FFC044004403EF802803EF820803EF80000 +B282:000000001000100010001FF000007FFC044004403EFC02483E4820483EFC0000 +B283:000000001000100010001FF000007FFC044004403E2003FC3E7020883E700000 +B284:000000001000100010001FF000007FFC044004401FF01010101010101FF00000 +B285:000000001000100010001FF000007FFC04400440101010101FF010101FF00000 +B286:000000001000100010001FF000007FFC04400440222022203E2022503E880000 +B287:000000001000100010001FF000007FFC0440044000000100010002800C400000 +B288:000000001000100010001FF000007FFC044004400000024002400DA033100000 +B289:000000001000100010001FF000007FFC04400440000007C00820082007C00000 +B28A:000000001000100010001FF000007FFC04400440000007E00080014006200000 +B28B:000000001000100010001FF000007FFC04400440008007E00080014006200000 +B28C:000000001000100010001FF000007FFC044004401FF000101FF0001000100000 +B28D:000000001000100010001FF000007FFC044004401FF010001FF010001FF00000 +B28E:000000001000100010001FF000007FFC0440044000001FF0044004401FF00000 +B28F:000000001000100010001FF000007FFC0440044001001FF007C0082007C00000 +B290:00000000200020002000200020003FF80000000000007FFC0000000000000000 +B291:000000001000100010001FF0000000007FFC00001FF000100010001000100000 +B292:000000001000100010001FF0000000007FFC000000003EF80208020802080000 +B293:000000001000100010001FF0000000007FFC000000001E100210022802C40000 +B294:000000001000100010001FF0000000007FFC000000001000100010001FF00000 +B295:000000001000100010001FF0000000007FFC0000000020F8201020303ECC0000 +B296:000000001000100010001FF0000000007FFC0000202021FC207020883E700000 +B297:000000001000100010001FF0000000007FFC00001FF01000100010001FF00000 +B298:000000001000100010001FF0000000007FFC00001FF000101FF010001FF00000 +B299:000000001000100010001FF0000000007FFC00003EF802083E0820083E080000 +B29A:000000001000100010001FF0000000007FFC00003EF802883E8820883EF80000 +B29B:000000001000100010001FF0000000007FFC00003E8802883EF820883EF80000 +B29C:000000001000100010001FF0000000007FFC00003E1002103E1020283EC40000 +B29D:000000001000100010001FF0000000007FFC00003EF802803EF820803EF80000 +B29E:000000001000100010001FF0000000007FFC00003EFC02483E4820483EFC0000 +B29F:000000001000100010001FF0000000007FFC00003E2003FC3E7020883E700000 +B2A0:000000001000100010001FF0000000007FFC00001FF01010101010101FF00000 +B2A1:000000001000100010001FF0000000007FFC0000101010101FF010101FF00000 +B2A2:000000001000100010001FF0000000007FFC0000222022203E2022503E880000 +B2A3:000000001000100010001FF0000000007FFC000000000100010002800C400000 +B2A4:000000001000100010001FF0000000007FFC00000000024002400DA033100000 +B2A5:000000001000100010001FF0000000007FFC0000000007C00820082007C00000 +B2A6:000000001000100010001FF0000000007FFC0000000007E00080014006200000 +B2A7:000000001000100010001FF0000000007FFC0000008007E00080014006200000 +B2A8:000000001000100010001FF0000000007FFC00001FF000101FF0001000100000 +B2A9:000000001000100010001FF0000000007FFC00001FF010001FF010001FF00000 +B2AA:000000001000100010001FF0000000007FFC000000001FF0044004401FF00000 +B2AB:000000001000100010001FF0000000007FFC000001001FF007C0082007C00000 +B2AC:000000080008400840084008400840087F88000800087FE80008000800080000 +B2AD:0000000820082008200820083F8800087FE8000007F800080008000800080000 +B2AE:0000000820082008200820083F8800087FE8000000003EF80208020802080000 +B2AF:0000000820082008200820083F8800087FE8000000001F080108011401620000 +B2B0:0000000820082008200820083F8800087FE8000008000800080008000FF80000 +B2B1:0000000820082008200820083F8800087FE80000000010F8101010301ECC0000 +B2B2:0000000820082008200820083F8800087FE800000808087F081C08220F9C0000 +B2B3:0000000820082008200820083F8800087FE8000003F802000200020003F80000 +B2B4:0000000820082008200820083F8800087FE8000007F8000807F8040007F80000 +B2B5:0000000820082008200820083F8800087FE800003EF802083E0820083E080000 +B2B6:0000000820082008200820083F8800087FE800003EF802883E8820883EF80000 +B2B7:0000000820082008200820083F8800087FE800003E8802883EF820883EF80000 +B2B8:0000000820082008200820083F8800087FE800001F0801081F0810141F620000 +B2B9:0000000820082008200820083F8800087FE800003EF802803EF820803EF80000 +B2BA:0000000820082008200820083F8800087FE800003EFC02483E4820483EFC0000 +B2BB:0000000820082008200820083F8800087FE800001F08017F1F1C10221F1C0000 +B2BC:0000000820082008200820083F8800087FE8000003F802080208020803F80000 +B2BD:0000000820082008200820083F8800087FE800000208020803F8020803F80000 +B2BE:0000000820082008200820083F8800087FE80000110811081F0811141F620000 +B2BF:0000000820082008200820083F8800087FE80000001000100010006801840000 +B2C0:0000000820082008200820083F8800087FE800000048004800A8011406620000 +B2C1:0000000820082008200820083F8800087FE80000000003F00408040803F00000 +B2C2:0000000820082008200820083F8800087FE8000003F80020002000D003080000 +B2C3:0000000820082008200820083F8800087FE80000004003F8004000A003180000 +B2C4:0000000820082008200820083F8800087FE8000003F8000803F8000800080000 +B2C5:0000000820082008200820083F8800087FE8000003F8020003F8020003F80000 +B2C6:0000000820082008200820083F8800087FE8000000000FF8022002200FF80000 +B2C7:0000000820082008200820083F8800087FE8000000800FF803E0041003E00000 +B2C8:000000000008000800084008400840084008400840087F880008000800080000 +B2C9:000000080008000840084008400840087E080000000007F80008000800080000 +B2CA:000000080008000840084008400840087E08000000003EF80208020802080000 +B2CB:000000080008000840084008400840087E08000000001F080108011401620000 +B2CC:000000080008000840084008400840087E08000800001000100010001FF80000 +B2CD:000000080008000840084008400840087E080000000020F8201020303ECC0000 +B2CE:000000080008000840084008400840087E080000202021FC207020883E700000 +B2CF:000000080008000840084008400840087E08000003F802000200020003F80000 +B2D0:000000080008000840084008400840087E08000007F8000807F8040007F80000 +B2D1:000000080008000840084008400840087E0800003EF802083E0820083E080000 +B2D2:000000080008000840084008400840087E0800003EF802883E8820883EF80000 +B2D3:000000080008000840084008400840087E0800003E8802883EF820883EF80000 +B2D4:000000080008000840084008400840087E0800000F8800880F8808140FA20000 +B2D5:000000080008000840084008400840087E0800003EF802803EF820803EF80000 +B2D6:000000080008000840084008400840087E0800003EFC02483E4820483EFC0000 +B2D7:000000080008000840084008400840087E0800003E1002FE3E3820443E380000 +B2D8:000000080008000840084008400840087E08000003F802080208020803F80000 +B2D9:000000080008000840084008400840087E0800000208020803F8020803F80000 +B2DA:000000080008000840084008400840087E080000210821083F0821143F620000 +B2DB:000000080008000840084008400840087E080000001000100010006801840000 +B2DC:000000080008000840084008400840087E0800000048004800A8011406620000 +B2DD:000000080008000840084008400840087E080000000003F00408040803F00000 +B2DE:000000080008000840084008400840087E08000003F80020002000D003080000 +B2DF:000000080008000840084008400840087E080000004003F8004000A003180000 +B2E0:000000080008000840084008400840087E08000003F8000803F8000800080000 +B2E1:000000080008000840084008400840087E08000003F8020003F8020003F80000 +B2E2:000000080008000840084008400840087E08000000000FF8022002200FF80000 +B2E3:000000080008000840084008400840087E08000000800FF803E0041003E00000 +B2E4:00000000001000107F9040104010401E401040107F9000100010001000100000 +B2E5:0000000800087E084008400E40087E080008000007F800080008000800080000 +B2E6:0000000800087E084008400E40087E080008000000003EF80208020802080000 +B2E7:0000000800087E084008400E40087E080008000000001F080108011401620000 +B2E8:0000000800087E084008400E40087E080008000808000800080008000FF80000 +B2E9:0000000800087E084008400E40087E0800080000000010F8101010301ECC0000 +B2EA:0000000800087E084008400E40087E08000800000808087F081C08220F9C0000 +B2EB:0000000800087E084008400E40087E080008000003F802000200020003F80000 +B2EC:0000000800087E084008400E40087E080008000007F8000807F8040007F80000 +B2ED:0000000800087E084008400E40087E08000800003EF802083E0820083E080000 +B2EE:0000000800087E084008400E40087E08000800003EF802883E8820883EF80000 +B2EF:0000000800087E084008400E40087E08000800003E8802883EF820883EF80000 +B2F0:0000000800087E084008400E40087E08000800001F0801081F0810141F620000 +B2F1:0000000800087E084008400E40087E08000800003EF802803EF820803EF80000 +B2F2:0000000800087E084008400E40087E08000800003EFC02483E4820483EFC0000 +B2F3:0000000800087E084008400E40087E08000800001F08017F1F1C10221F1C0000 +B2F4:0000000800087E084008400E40087E080008000003F802080208020803F80000 +B2F5:0000000800087E084008400E40087E08000800000208020803F8020803F80000 +B2F6:0000000800087E084008400E40087E0800080000110811081F0811141F620000 +B2F7:0000000800087E084008400E40087E0800080000001000100010006801840000 +B2F8:0000000800087E084008400E40087E08000800000048004800A8011406620000 +B2F9:0000000800087E084008400E40087E0800080000000003F00408040803F00000 +B2FA:0000000800087E084008400E40087E080008000003F80020002000D003080000 +B2FB:0000000800087E084008400E40087E0800080000004003F8004000A003180000 +B2FC:0000000800087E084008400E40087E080008000003F8000803F8000800080000 +B2FD:0000000800087E084008400E40087E080008000003F8020003F8020003F80000 +B2FE:0000000800087E084008400E40087E080008000000000FF8022002200FF80000 +B2FF:0000000800087E084008400E40087E080008000000800FF803E0041003E00000 +B300:00000000001200127F9240124012401E401240127F9200120012001200120000 +B301:0000002800287E284028403840287E280028000007F800080008000800080000 +B302:0000002800287E284028403840287E280028000000003EF80208020802080000 +B303:0000002800287E284028403840287E280028000000003E100210022802C40000 +B304:0000002800287E284028403840287E280028002808000800080008000FF80000 +B305:0000002800287E284028403840287E2800280000000020F8201020303ECC0000 +B306:0000002800287E284028403840287E2800280000202021FC207020883E700000 +B307:0000002800287E284028403840287E280028000003F802000200020003F80000 +B308:0000002800287E284028403840287E280028000007F8000807F8040007F80000 +B309:0000002800287E284028403840287E28002800003EF802083E0820083E080000 +B30A:0000002800287E284028403840287E28002800003EF802883E8820883EF80000 +B30B:0000002800287E284028403840287E28002800003E8802883EF820883EF80000 +B30C:0000002800287E284028403840287E28002800001F0801081F0810141F620000 +B30D:0000002800287E284028403840287E28002800003EF802803EF820803EF80000 +B30E:0000002800287E284028403840287E28002800003EFC02483E4820483EFC0000 +B30F:0000002800287E284028403840287E28002800003E1002FE3E3820443E380000 +B310:0000002800287E284028403840287E280028000003F802080208020803F80000 +B311:0000002800287E284028403840287E28002800000208020803F8020803F80000 +B312:0000002800287E284028403840287E2800280000110811081F0811141F620000 +B313:0000002800287E284028403840287E2800280000000800080008003400C20000 +B314:0000002800287E284028403840287E28002800000048004800A8011406620000 +B315:0000002800287E284028403840287E2800280000000001F00208020801F00000 +B316:0000002800287E284028403840287E280028000003F80020002000D003080000 +B317:0000002800287E284028403840287E2800280000004003F8004000A003180000 +B318:0000002800287E284028403840287E280028000003F8000803F8000800080000 +B319:0000002800287E284028403840287E280028000003F8020003F8020003F80000 +B31A:0000002800287E284028403840287E280028000000000FF8022002200FF80000 +B31B:0000002800287E284028403840287E280028000000800FF803E0041003E00000 +B31C:00000000001000107F904010401E40104010401E7F9000100010001000100000 +B31D:0000000800087E08400E4008400E7E080008000007F800080008000800080000 +B31E:0000000800087E08400E4008400E7E080008000000003EF80208020802080000 +B31F:0000000800087E08400E4008400E7E080008000000001F080108011401620000 +B320:0000000800087E08400E4008400E7E080008000008000800080008000FF80000 +B321:0000000800087E08400E4008400E7E0800080000000010F8101010301ECC0000 +B322:0000000800087E08400E4008400E7E08000800000808087F081C08220F9C0000 +B323:0000000800087E08400E4008400E7E080008000003F802000200020003F80000 +B324:0000000800087E08400E4008400E7E080008000007F8000807F8040007F80000 +B325:0000000800087E08400E4008400E7E08000800003EF802083E0820083E080000 +B326:0000000800087E08400E4008400E7E08000800003EF802883E8820883EF80000 +B327:0000000800087E08400E4008400E7E08000800003E8802883EF820883EF80000 +B328:0000000800087E08400E4008400E7E08000800001F0801081F0810141F620000 +B329:0000000800087E08400E4008400E7E08000800003EF802803EF820803EF80000 +B32A:0000000800087E08400E4008400E7E08000800003EFC02483E4820483EFC0000 +B32B:0000000800087E08400E4008400E7E08000800001F08017F1F1C10221F1C0000 +B32C:0000000800087E08400E4008400E7E080008000003F802080208020803F80000 +B32D:0000000800087E08400E4008400E7E08000800000208020803F8020803F80000 +B32E:0000000800087E08400E4008400E7E0800080000110811081F0811141F620000 +B32F:0000000800087E08400E4008400E7E0800080000001000100010006801840000 +B330:0000000800087E08400E4008400E7E08000800000048004800A8011406620000 +B331:0000000800087E08400E4008400E7E0800080000000003F00408040803F00000 +B332:0000000800087E08400E4008400E7E080008000003F80020002000D003080000 +B333:0000000800087E08400E4008400E7E0800080000004003F8004000A003180000 +B334:0000000800087E08400E4008400E7E080008000003F8000803F8000800080000 +B335:0000000800087E08400E4008400E7E080008000003F8020003F8020003F80000 +B336:0000000800087E08400E4008400E7E080008000000000FF8022002200FF80000 +B337:0000000800087E08400E4008400E7E080008000000800FF803E0041003E00000 +B338:00000000001200127F924012401E40124012401E7F9200120012001200120000 +B339:0000002800287E284038402840387E280028000007F800080008000800080000 +B33A:0000002800287E284038402840387E280028000000003EF80208020802080000 +B33B:0000002800287E284038402840387E280028000000003E100210022802C40000 +B33C:0000002800287E284038402840387E280028002808000800080008000FF80000 +B33D:0000002800287E284038402840387E2800280000000020F8201020303ECC0000 +B33E:0000002800287E284038402840387E2800280000202021FC207020883E700000 +B33F:0000002800287E284038402840387E280028000003F802000200020003F80000 +B340:0000002800287E284038402840387E280028000007F8000807F8040007F80000 +B341:0000002800287E284038402840387E28002800003EF802083E0820083E080000 +B342:0000002800287E284038402840387E28002800003EF802883E8820883EF80000 +B343:0000002800287E284038402840387E28002800003E8802883EF820883EF80000 +B344:0000002800287E284038402840387E28002800001F0801081F0810141F620000 +B345:0000002800287E284038402840387E28002800003EF802803EF820803EF80000 +B346:0000002800287E284038402840387E28002800003EFC02483E4820483EFC0000 +B347:0000002800287E284038402840387E28002800003E1002FE3E3820443E380000 +B348:0000002800287E284038402840387E280028000003F802080208020803F80000 +B349:0000002800287E284038402840387E28002800000208020803F8020803F80000 +B34A:0000002800287E284038402840387E2800280000110811081F0811141F620000 +B34B:0000002800287E284038402840387E2800280000000800080008003400C20000 +B34C:0000002800287E284038402840387E28002800000048004800A8011406620000 +B34D:0000002800287E284038402840387E2800280000000001F00208020801F00000 +B34E:0000002800287E284038402840387E280028000003F80020002000D003080000 +B34F:0000002800287E284038402840387E2800280000004003F8004000A003180000 +B350:0000002800287E284038402840387E280028000003F8000803F8000800080000 +B351:0000002800287E284038402840387E280028000003F8020003F8020003F80000 +B352:0000002800287E284038402840387E280028000000000FF8022002200FF80000 +B353:0000002800287E284038402840387E280028000000800FF803E0041003E00000 +B354:00000000000200027F8240024002401E400240027F8200020002000200020000 +B355:0000000800087E084008403840087E0800080000000007F80008000800080000 +B356:0000000800087E084008403840087E080008000000003EF80208020802080000 +B357:0000000800087E084008403840087E080008000000001F080108011401620000 +B358:0000000800087E084008403840087E080008000000001000100010001FF80000 +B359:0000000800087E084008403840087E0800080000000020F8201020303ECC0000 +B35A:0000000800087E084008403840087E0800080000202021FC207020883E700000 +B35B:0000000800087E084008403840087E080008000003F802000200020003F80000 +B35C:0000000800087E084008403840087E080008000007F8000807F8040007F80000 +B35D:0000000800087E084008403840087E08000800003EF802083E0820083E080000 +B35E:0000000800087E084008403840087E08000800003EF802883E8820883EF80000 +B35F:0000000800087E084008403840087E08000800003E8802883EF820883EF80000 +B360:0000000800087E084008403840087E08000800000F8800880F8808140FA20000 +B361:0000000800087E084008403840087E08000800003EF802803EF820803EF80000 +B362:0000000800087E084008403840087E08000800003EFC02483E4820483EFC0000 +B363:0000000800087E084008403840087E08000800003E1002FE3E3820443E380000 +B364:0000000800087E084008403840087E080008000003F802080208020803F80000 +B365:0000000800087E084008403840087E08000800000208020803F8020803F80000 +B366:0000000800087E084008403840087E0800080000210821083F0821143F620000 +B367:0000000800087E084008403840087E0800080000001000100010006801840000 +B368:0000000800087E084008403840087E08000800000048004800A8011406620000 +B369:0000000800087E084008403840087E0800080000000003F00408040803F00000 +B36A:0000000800087E084008403840087E080008000003F80020002000D003080000 +B36B:0000000800087E084008403840087E0800080000004003F8004000A003180000 +B36C:0000000800087E084008403840087E080008000003F8000803F8000800080000 +B36D:0000000800087E084008403840087E080008000003F8020003F8020003F80000 +B36E:0000000800087E084008403840087E080008000000000FF8022002200FF80000 +B36F:0000000800087E084008403840087E080008000000800FF803E0041003E00000 +B370:00000000000A000A7F8A400A400A403A400A400A7F8A000A000A000A000A0000 +B371:0000002800287E28402840E840287E280028000007F800080008000800080000 +B372:0000002800287E28402840E840287E280028000000003EF80208020802080000 +B373:0000002800287E28402840E840287E280028000000003E100210022802C40000 +B374:0000002800287E28402840E840287E280028000008000800080008000FF80000 +B375:0000002800287E28402840E840287E2800280000000020F8201020303ECC0000 +B376:0000002800287E28402840E840287E2800280000202021FC207020883E700000 +B377:0000002800287E28402840E840287E280028000003F802000200020003F80000 +B378:0000002800287E28402840E840287E280028000007F8000807F8040007F80000 +B379:0000002800287E28402840E840287E28002800003EF802083E0820083E080000 +B37A:0000002800287E28402840E840287E28002800003EF802883E8820883EF80000 +B37B:0000002800287E28402840E840287E28002800003E8802883EF820883EF80000 +B37C:0000002800287E28402840E840287E28002800001F0801081F0810141F620000 +B37D:0000002800287E28402840E840287E28002800003EF802803EF820803EF80000 +B37E:0000002800287E28402840E840287E28002800003EFC02483E4820483EFC0000 +B37F:0000002800287E28402840E840287E28002800003E1002FE3E3820443E380000 +B380:0000002800287E28402840E840287E280028000003F802080208020803F80000 +B381:0000002800287E28402840E840287E28002800000208020803F8020803F80000 +B382:0000002800287E28402840E840287E2800280000110811081F0811141F620000 +B383:0000002800287E28402840E840287E2800280000000800080008003400C20000 +B384:0000002800287E28402840E840287E28002800000048004800A8011406620000 +B385:0000002800287E28402840E840287E2800280000000001F00208020801F00000 +B386:0000002800287E28402840E840287E280028000003F80020002000D003080000 +B387:0000002800287E28402840E840287E2800280000004003F8004000A003180000 +B388:0000002800287E28402840E840287E280028000003F8000803F8000800080000 +B389:0000002800287E28402840E840287E280028000003F8020003F8020003F80000 +B38A:0000002800287E28402840E840287E280028000000000FF8022002200FF80000 +B38B:0000002800287E28402840E840287E280028000000800FF803E0041003E00000 +B38C:00000000000200027F824002401E40024002401E7F8200020002000200020000 +B38D:0000000800087E084038400840387E0800080000000007F80008000800080000 +B38E:0000000800087E084038400840387E080008000000003EF80208020802080000 +B38F:0000000800087E084038400840387E080008000000001F080108011401620000 +B390:0000000800087E084038400840387E080008000800001000100010001FF80000 +B391:0000000800087E084038400840387E0800080000000020F8201020303ECC0000 +B392:0000000800087E084038400840387E0800080000202021FC207020883E700000 +B393:0000000800087E084038400840387E080008000003F802000200020003F80000 +B394:0000000800087E084038400840387E080008000007F8000807F8040007F80000 +B395:0000000800087E084038400840387E08000800003EF802083E0820083E080000 +B396:0000000800087E084038400840387E08000800003EF802883E8820883EF80000 +B397:0000000800087E084038400840387E08000800003E8802883EF820883EF80000 +B398:0000000800087E084038400840387E08000800000F8800880F8808140FA20000 +B399:0000000800087E084038400840387E08000800003EF802803EF820803EF80000 +B39A:0000000800087E084038400840387E08000800003EFC02483E4820483EFC0000 +B39B:0000000800087E084038400840387E08000800003E1002FE3E3820443E380000 +B39C:0000000800087E084038400840387E080008000003F802080208020803F80000 +B39D:0000000800087E084038400840387E08000800000208020803F8020803F80000 +B39E:0000000800087E084038400840387E0800080000210821083F0821143F620000 +B39F:0000000800087E084038400840387E0800080000001000100010006801840000 +B3A0:0000000800087E084038400840387E08000800000048004800A8011406620000 +B3A1:0000000800087E084038400840387E0800080000000003F00408040803F00000 +B3A2:0000000800087E084038400840387E080008000003F80020002000D003080000 +B3A3:0000000800087E084038400840387E0800080000004003F8004000A003180000 +B3A4:0000000800087E084038400840387E080008000003F8000803F8000800080000 +B3A5:0000000800087E084038400840387E080008000003F8020003F8020003F80000 +B3A6:0000000800087E084038400840387E080008000000000FF8022002200FF80000 +B3A7:0000000800087E084038400840387E080008000000800FF803E0041003E00000 +B3A8:00000000000A000A7F8A400A403A400A400A403A7F8A000A000A000A000A0000 +B3A9:0000002800287E2840E8402840E87E280028000007F800080008000800080000 +B3AA:0000002800287E2840E8402840E87E280028000000003EF80208020802080000 +B3AB:0000002800287E2840E8402840E87E280028000000003E100210022802C40000 +B3AC:0000002800287E2840E8402840E87E280028002808000800080008000FF80000 +B3AD:0000002800287E2840E8402840E87E2800280000000020F8201020303ECC0000 +B3AE:0000002800287E2840E8402840E87E2800280000202021FC207020883E700000 +B3AF:0000002800287E2840E8402840E87E280028000003F802000200020003F80000 +B3B0:0000002800287E2840E8402840E87E280028000007F8000807F8040007F80000 +B3B1:0000002800287E2840E8402840E87E28002800003EF802083E0820083E080000 +B3B2:0000002800287E2840E8402840E87E28002800003EF802883E8820883EF80000 +B3B3:0000002800287E2840E8402840E87E28002800003E8802883EF820883EF80000 +B3B4:0000002800287E2840E8402840E87E28002800001F0801081F0810141F620000 +B3B5:0000002800287E2840E8402840E87E28002800003EF802803EF820803EF80000 +B3B6:0000002800287E2840E8402840E87E28002800003EFC02483E4820483EFC0000 +B3B7:0000002800287E2840E8402840E87E28002800003E1002FE3E3820443E380000 +B3B8:0000002800287E2840E8402840E87E280028000003F802080208020803F80000 +B3B9:0000002800287E2840E8402840E87E28002800000208020803F8020803F80000 +B3BA:0000002800287E2840E8402840E87E2800280000110811081F0811141F620000 +B3BB:0000002800287E2840E8402840E87E2800280000000800080008003400C20000 +B3BC:0000002800287E2840E8402840E87E28002800000048004800A8011406620000 +B3BD:0000002800287E2840E8402840E87E2800280000000001F00208020801F00000 +B3BE:0000002800287E2840E8402840E87E280028000003F80020002000D003080000 +B3BF:0000002800287E2840E8402840E87E2800280000004003F8004000A003180000 +B3C0:0000002800287E2840E8402840E87E280028000003F8000803F8000800080000 +B3C1:0000002800287E2840E8402840E87E280028000003F8020003F8020003F80000 +B3C2:0000002800287E2840E8402840E87E280028000000000FF8022002200FF80000 +B3C3:0000002800287E2840E8402840E87E280028000000800FF803E0041003E00000 +B3C4:000000003FF820002000200020003FF8000000000100010001007FFC00000000 +B3C5:000000001FF0100010001FF0010001007FFC00001FF000100010001000100000 +B3C6:000000001FF0100010001FF0010001007FFC000000003EF80208020802080000 +B3C7:000000001FF0100010001FF0010001007FFC000000001E100210022802C40000 +B3C8:000000001FF0100010001FF0010001007FFC000000001000100010001FF00000 +B3C9:000000001FF0100010001FF0010001007FFC0000000020F8201020303ECC0000 +B3CA:000000001FF0100010001FF0010001007FFC0000202021FC207020883E700000 +B3CB:000000001FF0100010001FF0010001007FFC00001FF01000100010001FF00000 +B3CC:000000001FF0100010001FF0010001007FFC00001FF000101FF010001FF00000 +B3CD:000000001FF0100010001FF0010001007FFC00003EF802083E0820083E080000 +B3CE:000000001FF0100010001FF0010001007FFC00003EF802883E8820883EF80000 +B3CF:000000001FF0100010001FF0010001007FFC00003E8802883EF820883EF80000 +B3D0:000000001FF0100010001FF0010001007FFC00003E1002103E1020283EC40000 +B3D1:000000001FF0100010001FF0010001007FFC00003EF802803EF820803EF80000 +B3D2:000000001FF0100010001FF0010001007FFC00003EFC02483E4820483EFC0000 +B3D3:000000001FF0100010001FF0010001007FFC00003E2003FC3E7020883E700000 +B3D4:000000001FF0100010001FF0010001007FFC00001FF01010101010101FF00000 +B3D5:000000001FF0100010001FF0010001007FFC0000101010101FF010101FF00000 +B3D6:000000001FF0100010001FF0010001007FFC0000222022203E2022503E880000 +B3D7:000000001FF0100010001FF0010001007FFC000000000100010002800C400000 +B3D8:000000001FF0100010001FF0010001007FFC00000000024002400DA033100000 +B3D9:000000001FF0100010001FF0010001007FFC0000000007C00820082007C00000 +B3DA:000000001FF0100010001FF0010001007FFC0000000007E00080014006200000 +B3DB:000000001FF0100010001FF0010001007FFC0000008007E00080014006200000 +B3DC:000000001FF0100010001FF0010001007FFC00001FF000101FF0001000100000 +B3DD:000000001FF0100010001FF0010001007FFC00001FF010001FF010001FF00000 +B3DE:000000001FF0100010001FF0010001007FFC000000001FF0044004401FF00000 +B3DF:000000001FF0100010001FF0010001007FFC000001001FF007C0082007C00000 +B3E0:0000001000107F904010401040107F9E00100010041004107FD0001000100000 +B3E1:000000083F882008200E3F88040804087FE8000007F800080008000800080000 +B3E2:000000083F882008200E3F88040804087FE8000000003EF80208020802080000 +B3E3:000000083F882008200E3F88040804087FE8000000001F080108011401620000 +B3E4:000000083F882008200E3F88040804087FE8000008000800080008000FF80000 +B3E5:000000083F882008200E3F88040804087FE80000000010F8101010301ECC0000 +B3E6:000000083F882008200E3F88040804087FE800000808087F081C08220F9C0000 +B3E7:000000083F882008200E3F88040804087FE8000003F802000200020003F80000 +B3E8:000000083F882008200E3F88040804087FE8000007F8000807F8040007F80000 +B3E9:000000083F882008200E3F88040804087FE800003EF802083E0820083E080000 +B3EA:000000083F882008200E3F88040804087FE800003EF802883E8820883EF80000 +B3EB:000000083F882008200E3F88040804087FE800003E8802883EF820883EF80000 +B3EC:000000083F882008200E3F88040804087FE800001F0801081F0810141F620000 +B3ED:000000083F882008200E3F88040804087FE800003EF802803EF820803EF80000 +B3EE:000000083F882008200E3F88040804087FE800003EFC02483E4820483EFC0000 +B3EF:000000083F882008200E3F88040804087FE800001F08017F1F1C10221F1C0000 +B3F0:000000083F882008200E3F88040804087FE8000003F802080208020803F80000 +B3F1:000000083F882008200E3F88040804087FE800000208020803F8020803F80000 +B3F2:000000083F882008200E3F88040804087FE80000110811081F0811141F620000 +B3F3:000000083F882008200E3F88040804087FE80000001000100010006801840000 +B3F4:000000083F882008200E3F88040804087FE800000048004800A8011406620000 +B3F5:000000083F882008200E3F88040804087FE80000000003F00408040803F00000 +B3F6:000000083F882008200E3F88040804087FE8000003F80020002000D003080000 +B3F7:000000083F882008200E3F88040804087FE80000004003F8004000A003180000 +B3F8:000000083F882008200E3F88040804087FE8000003F8000803F8000800080000 +B3F9:000000083F882008200E3F88040804087FE8000003F8020003F8020003F80000 +B3FA:000000083F882008200E3F88040804087FE8000000000FF8022002200FF80000 +B3FB:000000083F882008200E3F88040804087FE8000000800FF803E0041003E00000 +B3FC:0000001200127F924012401240127F9E00120012041204127FD2001200120000 +B3FD:000000283FA8202820383FA8042804287FA8000007F800080008000800080000 +B3FE:000000283FA8202820383FA8042804287FA8000000003EF80208020802080000 +B3FF:000000283FA8202820383FA8042804287FA8000000001F080108011401620000 +B400:000000283FA8202820383FA8042804287FA8000008000800080008000FF80000 +B401:000000283FA8202820383FA8042804287FA80000000010F8101010301ECC0000 +B402:000000283FA8202820383FA8042804287FA800000808087F081C08220F9C0000 +B403:000000283FA8202820383FA8042804287FA8000003F802000200020003F80000 +B404:000000283FA8202820383FA8042804287FA8000007F8000807F8040007F80000 +B405:000000283FA8202820383FA8042804287FA800003EF802083E0820083E080000 +B406:000000283FA8202820383FA8042804287FA800003EF802883E8820883EF80000 +B407:000000283FA8202820383FA8042804287FA800003E8802883EF820883EF80000 +B408:000000283FA8202820383FA8042804287FA800001F0801081F0810141F620000 +B409:000000283FA8202820383FA8042804287FA800003EF802803EF820803EF80000 +B40A:000000283FA8202820383FA8042804287FA800003EFC02483E4820483EFC0000 +B40B:000000283FA8202820383FA8042804287FA800001F08017F1F1C10221F1C0000 +B40C:000000283FA8202820383FA8042804287FA8000003F802080208020803F80000 +B40D:000000283FA8202820383FA8042804287FA800000208020803F8020803F80000 +B40E:000000283FA8202820383FA8042804287FA80000110811081F0811141F620000 +B40F:000000283FA8202820383FA8042804287FA80000001000100010006801840000 +B410:000000283FA8202820383FA8042804287FA800000048004800A8011406620000 +B411:000000283FA8202820383FA8042804287FA80000000003F00408040803F00000 +B412:000000283FA8202820383FA8042804287FA8000003F80020002000D003080000 +B413:000000283FA8202820383FA8042804287FA80000004003F8004000A003180000 +B414:000000283FA8202820383FA8042804287FA8000003F8000803F8000800080000 +B415:000000283FA8202820383FA8042804287FA8000003F8020003F8020003F80000 +B416:000000283FA8202820383FA8042804287FA8000000000FF8022002200FF80000 +B417:000000283FA8202820383FA8042804287FA8000000800FF803E0041003E00000 +B418:0000000800087F884008400840087F8800080008040804087FE8000800080000 +B419:000000083F88200820083F88040804087FE8000007F800080008000800080000 +B41A:000000083F88200820083F88040804087FE8000000003EF80208020802080000 +B41B:000000083F88200820083F88040804087FE8000000001F080108011401620000 +B41C:000000083F88200820083F88040804087FE8000008000800080008000FF80000 +B41D:000000083F88200820083F88040804087FE80000000010F8101010301ECC0000 +B41E:000000083F88200820083F88040804087FE800000808087F081C08220F9C0000 +B41F:000000083F88200820083F88040804087FE8000003F802000200020003F80000 +B420:000000083F88200820083F88040804087FE8000007F8000807F8040007F80000 +B421:000000083F88200820083F88040804087FE800003EF802083E0820083E080000 +B422:000000083F88200820083F88040804087FE800003EF802883E8820883EF80000 +B423:000000083F88200820083F88040804087FE800003E8802883EF820883EF80000 +B424:000000083F88200820083F88040804087FE800001F0801081F0810141F620000 +B425:000000083F88200820083F88040804087FE800003EF802803EF820803EF80000 +B426:000000083F88200820083F88040804087FE800003EFC02483E4820483EFC0000 +B427:000000083F88200820083F88040804087FE800001F08017F1F1C10221F1C0000 +B428:000000083F88200820083F88040804087FE8000003F802080208020803F80000 +B429:000000083F88200820083F88040804087FE800000208020803F8020803F80000 +B42A:000000083F88200820083F88040804087FE80000110811081F0811141F620000 +B42B:000000083F88200820083F88040804087FE80000001000100010006801840000 +B42C:000000083F88200820083F88040804087FE800000048004800A8011406620000 +B42D:000000083F88200820083F88040804087FE80000000003F00408040803F00000 +B42E:000000083F88200820083F88040804087FE8000003F80020002000D003080000 +B42F:000000083F88200820083F88040804087FE80000004003F8004000A003180000 +B430:000000083F88200820083F88040804087FE8000003F8000803F8000800080000 +B431:000000083F88200820083F88040804087FE8000003F8020003F8020003F80000 +B432:000000083F88200820083F88040804087FE8000000000FF8022002200FF80000 +B433:000000083F88200820083F88040804087FE8000000800FF803E0041003E00000 +B434:000000003FF820002000200020003FF8000004400440044004407FFC00000000 +B435:000000001FF0100010001FF0044004407FFC00001FF000100010001000100000 +B436:000000001FF0100010001FF0044004407FFC000000003EF80208020802080000 +B437:000000001FF0100010001FF0044004407FFC000000001E100210022802C40000 +B438:000000001FF0100010001FF0044004407FFC000000001000100010001FF00000 +B439:000000001FF0100010001FF0044004407FFC0000000020F8201020303ECC0000 +B43A:000000001FF0100010001FF0044004407FFC0000202021FC207020883E700000 +B43B:000000001FF0100010001FF0044004407FFC00001FF01000100010001FF00000 +B43C:000000001FF0100010001FF0044004407FFC00001FF000101FF010001FF00000 +B43D:000000001FF0100010001FF0044004407FFC00003EF802083E0820083E080000 +B43E:000000001FF0100010001FF0044004407FFC00003EF802883E8820883EF80000 +B43F:000000001FF0100010001FF0044004407FFC00003E8802883EF820883EF80000 +B440:000000001FF0100010001FF0044004407FFC00003E1002103E1020283EC40000 +B441:000000001FF0100010001FF0044004407FFC00003EF802803EF820803EF80000 +B442:000000001FF0100010001FF0044004407FFC00003EFC02483E4820483EFC0000 +B443:000000001FF0100010001FF0044004407FFC00003E2003FC3E7020883E700000 +B444:000000001FF0100010001FF0044004407FFC00001FF01010101010101FF00000 +B445:000000001FF0100010001FF0044004407FFC0000101010101FF010101FF00000 +B446:000000001FF0100010001FF0044004407FFC0000222022203E2022503E880000 +B447:000000001FF0100010001FF0044004407FFC000000000100010002800C400000 +B448:000000001FF0100010001FF0044004407FFC00000000024002400DA033100000 +B449:000000001FF0100010001FF0044004407FFC0000000007C00820082007C00000 +B44A:000000001FF0100010001FF0044004407FFC0000000007E00080014006200000 +B44B:000000001FF0100010001FF0044004407FFC0000008007E00080014006200000 +B44C:000000001FF0100010001FF0044004407FFC00001FF000101FF0001000100000 +B44D:000000001FF0100010001FF0044004407FFC00001FF010001FF010001FF00000 +B44E:000000001FF0100010001FF0044004407FFC000000001FF0044004401FF00000 +B44F:000000001FF0100010001FF0044004407FFC000001001FF007C0082007C00000 +B450:000000003FF820002000200020003FF8000000003FF801000100010001000000 +B451:000000001FF0100010001FF000007FFC010001001FF000100010001000100000 +B452:000000001FF0100010001FF000007FFC0100010000003EF80208020802080000 +B453:000000001FF0100010001FF000007FFC0100010000001E100210022802C40000 +B454:000000001FF0100010001FF0000000007FFC010001001100100010001FF00000 +B455:000000001FF0100010001FF000007FFC01000100000020F8201020303ECC0000 +B456:000000001FF0100010001FF000007FFC01000100202021FC207020883E700000 +B457:000000001FF0100010001FF000007FFC010001001FF01000100010001FF00000 +B458:000000001FF0100010001FF000007FFC010001001FF000101FF010001FF00000 +B459:000000001FF0100010001FF000007FFC010001003EF802083E0820083E080000 +B45A:000000001FF0100010001FF000007FFC010001003EF802883E8820883EF80000 +B45B:000000001FF0100010001FF000007FFC010001003E8802883EF820883EF80000 +B45C:000000001FF0100010001FF000007FFC010001003E1002103E1020283EC40000 +B45D:000000001FF0100010001FF000007FFC010001003EF802803EF820803EF80000 +B45E:000000001FF0100010001FF000007FFC010001003EFC02483E4820483EFC0000 +B45F:000000001FF0100010001FF000007FFC010001003E2003FC3E7020883E700000 +B460:000000001FF0100010001FF000007FFC010001001FF01010101010101FF00000 +B461:000000001FF0100010001FF000007FFC01000100101010101FF010101FF00000 +B462:000000001FF0100010001FF000007FFC01000100222022203E2022503E880000 +B463:000000001FF0100010001FF000007FFC0100010000000100010002800C400000 +B464:000000001FF0100010001FF000007FFC010001000000024002400DA033100000 +B465:000000001FF0100010001FF000007FFC01000100000007C00820082007C00000 +B466:000000001FF0100010001FF000007FFC01000100000007E00080014006200000 +B467:000000001FF0100010001FF000007FFC01000100008007E00080014006200000 +B468:000000001FF0100010001FF000007FFC010001001FF000101FF0001000100000 +B469:000000001FF0100010001FF000007FFC010001001FF010001FF010001FF00000 +B46A:000000001FF0100010001FF000007FFC0100010000001FF0044004401FF00000 +B46B:000000001FF0100010001FF000007FFC0100010001001FF007C0082007C00000 +B46C:0000000800087FC84008400840087FC8000800087FE8040804F8040804080000 +B46D:00083F88200820083F8800087FE8027802080000000007F80008000800080000 +B46E:00083F88200820083F8800087FE802780208000000003EF80208020802080000 +B46F:00083F88200820083F8800087FE802780208000000001F080108011401620000 +B470:00083F88200820083F88000800087FE80278020802081000100010001FF80000 +B471:00083F88200820083F8800087FE8027802080000000020F8201020303ECC0000 +B472:00083F88200820083F8800087FE8027802080000202021FC207020883E700000 +B473:00083F88200820083F8800087FE802780208000003F802000200020003F80000 +B474:00083F88200820083F8800087FE802780208000007F8000807F8040007F80000 +B475:00083F88200820083F8800087FE80278020800003EF802083E0820083E080000 +B476:00083F88200820083F8800087FE80278020800003EF802883E8820883EF80000 +B477:00083F88200820083F8800087FE80278020800003E8802883EF820883EF80000 +B478:00083F88200820083F8800087FE80278020800000F8800880F8808140FA20000 +B479:00083F88200820083F8800087FE80278020800003EF802803EF820803EF80000 +B47A:00083F88200820083F8800087FE80278020800003EFC02483E4820483EFC0000 +B47B:00083F88200820083F8800087FE80278020800003E1002FE3E3820443E380000 +B47C:00083F88200820083F8800087FE802780208000003F802080208020803F80000 +B47D:00083F88200820083F8800087FE80278020800000208020803F8020803F80000 +B47E:00083F88200820083F8800087FE8027802080000210821083F0821143F620000 +B47F:00083F88200820083F8800087FE8027802080000001000100010006801840000 +B480:00083F88200820083F8800087FE80278020800000048004800A8011406620000 +B481:00083F88200820083F8800087FE8027802080000000003F00408040803F00000 +B482:00083F88200820083F8800087FE802780208000003F80020002000D003080000 +B483:00083F88200820083F8800087FE8027802080000004003F8004000A003180000 +B484:00083F88200820083F8800087FE802780208000003F8000803F8000800080000 +B485:00083F88200820083F8800087FE802780208000003F8020003F8020003F80000 +B486:00083F88200820083F8800087FE802780208000000000FF8022002200FF80000 +B487:00083F88200820083F8800087FE802780208000000800FF803E0041003E00000 +B488:0000000A000A7FCA400A400A400A7FCA000A000A7FEA040A047A040A040A0000 +B489:00283FA8202820283FA800287FA805E804280000000007F80008000800080000 +B48A:00283FA8202820283FA800287FA805E80428000000003EF80208020802080000 +B48B:00283FA8202820283FA800287FA805E80428000000001F080108011401620000 +B48C:00283FA8202820283FA8002800287FA8042805E804281428100010001FF80000 +B48D:00283FA8202820283FA800287FA805E804280000000020F8201020303ECC0000 +B48E:00283FA8202820283FA800287FA805E804280000202021FC207020883E700000 +B48F:00283FA8202820283FA800287FA805E80428000003F802000200020003F80000 +B490:00283FA8202820283FA800287FA805E80428000007F8000807F8040007F80000 +B491:00283FA8202820283FA800287FA805E8042800003EF802083E0820083E080000 +B492:00283FA8202820283FA800287FA805E8042800003EF802883E8820883EF80000 +B493:00283FA8202820283FA800287FA805E8042800003E8802883EF820883EF80000 +B494:00283FA8202820283FA800287FA805E8042800000F8800880F8808140FA20000 +B495:00283FA8202820283FA800287FA805E8042800003EF802803EF820803EF80000 +B496:00283FA8202820283FA800287FA805E8042800003EFC02483E4820483EFC0000 +B497:00283FA8202820283FA800287FA805E8042800003E1002FE3E3820443E380000 +B498:00283FA8202820283FA800287FA805E80428000003F802080208020803F80000 +B499:00283FA8202820283FA800287FA805E8042800000208020803F8020803F80000 +B49A:00283FA8202820283FA800287FA805E804280000210821083F0821143F620000 +B49B:00283FA8202820283FA800287FA805E804280000001000100010006801840000 +B49C:00283FA8202820283FA800287FA805E8042800000048004800A8011406620000 +B49D:00283FA8202820283FA800287FA805E804280000000003F00408040803F00000 +B49E:00283FA8202820283FA800287FA805E80428000003F80020002000D003080000 +B49F:00283FA8202820283FA800287FA805E804280000004003F8004000A003180000 +B4A0:00283FA8202820283FA800287FA805E80428000003F8000803F8000800080000 +B4A1:00283FA8202820283FA800287FA805E80428000003F8020003F8020003F80000 +B4A2:00283FA8202820283FA800287FA805E80428000000000FF8022002200FF80000 +B4A3:00283FA8202820283FA800287FA805E80428000000800FF803E0041003E00000 +B4A4:0000000800087FC84008400840087FC8000800087FE804080408040804080000 +B4A5:00083F88200820083F8800087FE8020802000000000007F80008000800080000 +B4A6:00083F88200820083F8800087FE802080200000000003EF80208020802080000 +B4A7:00083F88200820083F8800087FE802080200000000001F080108011401620000 +B4A8:00083F88200820083F88000800087FE80208020802081008100010001FF80000 +B4A9:00083F88200820083F8800087FE8020802000000000020F8201020303ECC0000 +B4AA:00083F88200820083F8800087FE8020802000000202021FC207020883E700000 +B4AB:00083F88200820083F8800087FE802080200000003F802000200020003F80000 +B4AC:00083F88200820083F8800087FE802080200000007F8000807F8040007F80000 +B4AD:00083F88200820083F8800087FE80208020000003EF802083E0820083E080000 +B4AE:00083F88200820083F8800087FE80208020000003EF802883E8820883EF80000 +B4AF:00083F88200820083F8800087FE80208020000003E8802883EF820883EF80000 +B4B0:00083F88200820083F8800087FE80208020000000F8800880F8808140FA20000 +B4B1:00083F88200820083F8800087FE80208020000003EF802803EF820803EF80000 +B4B2:00083F88200820083F8800087FE80208020000003EFC02483E4820483EFC0000 +B4B3:00083F88200820083F8800087FE80208020000003E1002FE3E3820443E380000 +B4B4:00083F88200820083F8800087FE802080200000003F802080208020803F80000 +B4B5:00083F88200820083F8800087FE80208020000000208020803F8020803F80000 +B4B6:00083F88200820083F8800087FE8020802000000210821083F0821143F620000 +B4B7:00083F88200820083F8800087FE8020802000000001000100010006801840000 +B4B8:00083F88200820083F8800087FE80208020000000048004800A8011406620000 +B4B9:00083F88200820083F8800087FE8020802000000000003F00408040803F00000 +B4BA:00083F88200820083F8800087FE802080200000003F80020002000D003080000 +B4BB:00083F88200820083F8800087FE8020802000000004003F8004000A003180000 +B4BC:00083F88200820083F8800087FE802080200000003F8000803F8000800080000 +B4BD:00083F88200820083F8800087FE802080200000003F8020003F8020003F80000 +B4BE:00083F88200820083F8800087FE802080200000000000FF8022002200FF80000 +B4BF:00083F88200820083F8800087FE802080200000000800FF803E0041003E00000 +B4C0:000000003FF820002000200020003FF8000000007FFC04400440044004400000 +B4C1:000000001FF0100010001FF000007FFC044004401FF000100010001000100000 +B4C2:000000001FF0100010001FF000007FFC0440044000003EF80208020802080000 +B4C3:000000001FF0100010001FF000007FFC0440044000001E100210022802C40000 +B4C4:000000001FF0100010001FF0000000007FFC044004401440100010001FF00000 +B4C5:000000001FF0100010001FF000007FFC04400440000020F8201020303ECC0000 +B4C6:000000001FF0100010001FF000007FFC04400440202021FC207020883E700000 +B4C7:000000001FF0100010001FF000007FFC044004401FF01000100010001FF00000 +B4C8:000000001FF0100010001FF000007FFC044004401FF000101FF010001FF00000 +B4C9:000000001FF0100010001FF000007FFC044004403EF802083E0820083E080000 +B4CA:000000001FF0100010001FF000007FFC044004403EF802883E8820883EF80000 +B4CB:000000001FF0100010001FF000007FFC044004403E8802883EF820883EF80000 +B4CC:000000001FF0100010001FF000007FFC044004403E1002103E1020283EC40000 +B4CD:000000001FF0100010001FF000007FFC044004403EF802803EF820803EF80000 +B4CE:000000001FF0100010001FF000007FFC044004403EFC02483E4820483EFC0000 +B4CF:000000001FF0100010001FF000007FFC044004403E2003FC3E7020883E700000 +B4D0:000000001FF0100010001FF000007FFC044004401FF01010101010101FF00000 +B4D1:000000001FF0100010001FF000007FFC04400440101010101FF010101FF00000 +B4D2:000000001FF0100010001FF000007FFC04400440222022203E2022503E880000 +B4D3:000000001FF0100010001FF000007FFC0440044000000100010002800C400000 +B4D4:000000001FF0100010001FF000007FFC044004400000024002400DA033100000 +B4D5:000000001FF0100010001FF000007FFC04400440000007C00820082007C00000 +B4D6:000000001FF0100010001FF000007FFC04400440000007E00080014006200000 +B4D7:000000001FF0100010001FF000007FFC04400440008007E00080014006200000 +B4D8:000000001FF0100010001FF000007FFC044004401FF000101FF0001000100000 +B4D9:000000001FF0100010001FF000007FFC044004401FF010001FF010001FF00000 +B4DA:000000001FF0100010001FF000007FFC0440044000001FF0044004401FF00000 +B4DB:000000001FF0100010001FF000007FFC0440044001001FF007C0082007C00000 +B4DC:000000003FF820002000200020003FF80000000000007FFC0000000000000000 +B4DD:000000001FF0100010001FF0000000007FFC00001FF000100010001000100000 +B4DE:000000001FF0100010001FF0000000007FFC000000003EF80208020802080000 +B4DF:000000001FF0100010001FF0000000007FFC000000001E100210022802C40000 +B4E0:000000001FF0100010001FF0000000007FFC000000001000100010001FF00000 +B4E1:000000001FF0100010001FF0000000007FFC0000000020F8201020303ECC0000 +B4E2:000000001FF0100010001FF0000000007FFC0000202021FC207020883E700000 +B4E3:000000001FF0100010001FF0000000007FFC00001FF01000100010001FF00000 +B4E4:000000001FF0100010001FF0000000007FFC00001FF000101FF010001FF00000 +B4E5:000000001FF0100010001FF0000000007FFC00003EF802083E0820083E080000 +B4E6:000000001FF0100010001FF0000000007FFC00003EF802883E8820883EF80000 +B4E7:000000001FF0100010001FF0000000007FFC00003E8802883EF820883EF80000 +B4E8:000000001FF0100010001FF0000000007FFC00003E1002103E1020283EC40000 +B4E9:000000001FF0100010001FF0000000007FFC00003EF802803EF820803EF80000 +B4EA:000000001FF0100010001FF0000000007FFC00003EFC02483E4820483EFC0000 +B4EB:000000001FF0100010001FF0000000007FFC00003E2003FC3E7020883E700000 +B4EC:000000001FF0100010001FF0000000007FFC00001FF01010101010101FF00000 +B4ED:000000001FF0100010001FF0000000007FFC0000101010101FF010101FF00000 +B4EE:000000001FF0100010001FF0000000007FFC0000222022203E2022503E880000 +B4EF:000000001FF0100010001FF0000000007FFC000000000100010002800C400000 +B4F0:000000001FF0100010001FF0000000007FFC00000000024002400DA033100000 +B4F1:000000001FF0100010001FF0000000007FFC0000000007C00820082007C00000 +B4F2:000000001FF0100010001FF0000000007FFC0000000007E00080014006200000 +B4F3:000000001FF0100010001FF0000000007FFC0000008007E00080014006200000 +B4F4:000000001FF0100010001FF0000000007FFC00001FF000101FF0001000100000 +B4F5:000000001FF0100010001FF0000000007FFC00001FF010001FF010001FF00000 +B4F6:000000001FF0100010001FF0000000007FFC000000001FF0044004401FF00000 +B4F7:000000001FF0100010001FF0000000007FFC000001001FF007C0082007C00000 +B4F8:0000000800087F884008400840087F880008000800087FE80008000800080000 +B4F9:000000083F88200820083F88000800087FE8000007F800080008000800080000 +B4FA:000000083F88200820083F88000800087FE8000000003EF80208020802080000 +B4FB:000000083F88200820083F88000800087FE8000000001F080108011401620000 +B4FC:000000083F88200820083F88000800087FE8000008000800080008000FF80000 +B4FD:000000083F88200820083F88000800087FE80000000010F8101010301ECC0000 +B4FE:000000083F88200820083F88000800087FE800000808087F081C08220F9C0000 +B4FF:000000083F88200820083F88000800087FE8000003F802000200020003F80000 +B500:000000083F88200820083F88000800087FE8000007F8000807F8040007F80000 +B501:000000083F88200820083F88000800087FE800003EF802083E0820083E080000 +B502:000000083F88200820083F88000800087FE800003EF802883E8820883EF80000 +B503:000000083F88200820083F88000800087FE800003E8802883EF820883EF80000 +B504:000000083F88200820083F88000800087FE800001F0801081F0810141F620000 +B505:000000083F88200820083F88000800087FE800003EF802803EF820803EF80000 +B506:000000083F88200820083F88000800087FE800003EFC02483E4820483EFC0000 +B507:000000083F88200820083F88000800087FE800001F08017F1F1C10221F1C0000 +B508:000000083F88200820083F88000800087FE8000003F802080208020803F80000 +B509:000000083F88200820083F88000800087FE800000208020803F8020803F80000 +B50A:000000083F88200820083F88000800087FE80000110811081F0811141F620000 +B50B:000000083F88200820083F88000800087FE80000001000100010006801840000 +B50C:000000083F88200820083F88000800087FE800000048004800A8011406620000 +B50D:000000083F88200820083F88000800087FE80000000003F00408040803F00000 +B50E:000000083F88200820083F88000800087FE8000003F80020002000D003080000 +B50F:000000083F88200820083F88000800087FE80000004003F8004000A003180000 +B510:000000083F88200820083F88000800087FE8000003F8000803F8000800080000 +B511:000000083F88200820083F88000800087FE8000003F8020003F8020003F80000 +B512:000000083F88200820083F88000800087FE8000000000FF8022002200FF80000 +B513:000000083F88200820083F88000800087FE8000000800FF803E0041003E00000 +B514:00000000000800087F88400840084008400840087F8800080008000800080000 +B515:0000000800087E084008400840087E0800080000000007F80008000800080000 +B516:0000000800087E084008400840087E080008000000003EF80208020802080000 +B517:0000000800087E084008400840087E080008000000001F080108011401620000 +B518:0000000800087E084008400840087E080008000800001000100010001FF80000 +B519:0000000800087E084008400840087E0800080000000020F8201020303ECC0000 +B51A:0000000800087E084008400840087E0800080000202021FC207020883E700000 +B51B:0000000800087E084008400840087E080008000003F802000200020003F80000 +B51C:0000000800087E084008400840087E080008000007F8000807F8040007F80000 +B51D:0000000800087E084008400840087E08000800003EF802083E0820083E080000 +B51E:0000000800087E084008400840087E08000800003EF802883E8820883EF80000 +B51F:0000000800087E084008400840087E08000800003E8802883EF820883EF80000 +B520:0000000800087E084008400840087E08000800000F8800880F8808140FA20000 +B521:0000000800087E084008400840087E08000800003EF802803EF820803EF80000 +B522:0000000800087E084008400840087E08000800003EFC02483E4820483EFC0000 +B523:0000000800087E084008400840087E08000800003E1002FE3E3820443E380000 +B524:0000000800087E084008400840087E080008000003F802080208020803F80000 +B525:0000000800087E084008400840087E08000800000208020803F8020803F80000 +B526:0000000800087E084008400840087E0800080000210821083F0821143F620000 +B527:0000000800087E084008400840087E0800080000001000100010006801840000 +B528:0000000800087E084008400840087E08000800000048004800A8011406620000 +B529:0000000800087E084008400840087E0800080000000003F00408040803F00000 +B52A:0000000800087E084008400840087E080008000003F80020002000D003080000 +B52B:0000000800087E084008400840087E0800080000004003F8004000A003180000 +B52C:0000000800087E084008400840087E080008000003F8000803F8000800080000 +B52D:0000000800087E084008400840087E080008000003F8020003F8020003F80000 +B52E:0000000800087E084008400840087E080008000000000FF8022002200FF80000 +B52F:0000000800087E084008400840087E080008000000800FF803E0041003E00000 +B530:00000000001000107BD042104210421E421042107BD000100010001000100000 +B531:00000008000877084408440E440877080008000007F800080008000800080000 +B532:00000008000877084408440E440877080008000000003EF80208020802080000 +B533:00000008000877084408440E440877080008000000001F080108011401620000 +B534:00000008000877084408440E440877080008000808000800080008000FF80000 +B535:00000008000877084408440E4408770800080000000010F8101010301ECC0000 +B536:00000008000877084408440E44087708000800000808087F081C08220F9C0000 +B537:00000008000877084408440E440877080008000003F802000200020003F80000 +B538:00000008000877084408440E440877080008000007F8000807F8040007F80000 +B539:00000008000877084408440E44087708000800003EF802083E0820083E080000 +B53A:00000008000877084408440E44087708000800003EF802883E8820883EF80000 +B53B:00000008000877084408440E44087708000800003E8802883EF820883EF80000 +B53C:00000008000877084408440E44087708000800001F0801081F0810141F620000 +B53D:00000008000877084408440E44087708000800003EF802803EF820803EF80000 +B53E:00000008000877084408440E44087708000800003EFC02483E4820483EFC0000 +B53F:00000008000877084408440E44087708000800001F08017F1F1C10221F1C0000 +B540:00000008000877084408440E440877080008000003F802080208020803F80000 +B541:00000008000877084408440E44087708000800000208020803F8020803F80000 +B542:00000008000877084408440E4408770800080000110811081F0811141F620000 +B543:00000008000877084408440E4408770800080000001000100010006801840000 +B544:00000008000877084408440E44087708000800000048004800A8011406620000 +B545:00000008000877084408440E4408770800080000000003F00408040803F00000 +B546:00000008000877084408440E440877080008000003F80020002000D003080000 +B547:00000008000877084408440E4408770800080000004003F8004000A003180000 +B548:00000008000877084408440E440877080008000003F8000803F8000800080000 +B549:00000008000877084408440E440877080008000003F8020003F8020003F80000 +B54A:00000008000877084408440E440877080008000000000FF8022002200FF80000 +B54B:00000008000877084408440E440877080008000000800FF803E0041003E00000 +B54C:00000000001200127BD242124212421E421242127BD200120012001200120000 +B54D:000000280028772844284438442877280028000007F800080008000800080000 +B54E:000000280028772844284438442877280028000000003EF80208020802080000 +B54F:000000280028772844284438442877280028000000003E100210022802C40000 +B550:000000280028772844284438442877280028002808000800080008000FF80000 +B551:0000002800287728442844384428772800280000000020F8201020303ECC0000 +B552:0000002800287728442844384428772800280000202021FC207020883E700000 +B553:000000280028772844284438442877280028000003F802000200020003F80000 +B554:000000280028772844284438442877280028000007F8000807F8040007F80000 +B555:00000028002877284428443844287728002800003EF802083E0820083E080000 +B556:00000028002877284428443844287728002800003EF802883E8820883EF80000 +B557:00000028002877284428443844287728002800003E8802883EF820883EF80000 +B558:00000028002877284428443844287728002800001F0801081F0810141F620000 +B559:00000028002877284428443844287728002800003EF802803EF820803EF80000 +B55A:00000028002877284428443844287728002800003EFC02483E4820483EFC0000 +B55B:00000028002877284428443844287728002800003E1002FE3E3820443E380000 +B55C:000000280028772844284438442877280028000003F802080208020803F80000 +B55D:00000028002877284428443844287728002800000208020803F8020803F80000 +B55E:0000002800287728442844384428772800280000110811081F0811141F620000 +B55F:0000002800287728442844384428772800280000000800080008003400C20000 +B560:00000028002877284428443844287728002800000048004800A8011406620000 +B561:0000002800287728442844384428772800280000000001F00208020801F00000 +B562:000000280028772844284438442877280028000003F80020002000D003080000 +B563:0000002800287728442844384428772800280000004003F8004000A003180000 +B564:000000280028772844284438442877280028000003F8000803F8000800080000 +B565:000000280028772844284438442877280028000003F8020003F8020003F80000 +B566:000000280028772844284438442877280028000000000FF8022002200FF80000 +B567:000000280028772844284438442877280028000000800FF803E0041003E00000 +B568:00000000001000107BD04210421E42104210421E7BD000100010001000100000 +B569:0000000800087708440E4408440E77080008000007F800080008000800080000 +B56A:0000000800087708440E4408440E77080008000000003EF80208020802080000 +B56B:0000000800087708440E4408440E77080008000000001F080108011401620000 +B56C:0000000800087708440E4408440E77080008000008000800080008000FF80000 +B56D:0000000800087708440E4408440E770800080000000010F8101010301ECC0000 +B56E:0000000800087708440E4408440E7708000800000808087F081C08220F9C0000 +B56F:0000000800087708440E4408440E77080008000003F802000200020003F80000 +B570:0000000800087708440E4408440E77080008000007F8000807F8040007F80000 +B571:0000000800087708440E4408440E7708000800003EF802083E0820083E080000 +B572:0000000800087708440E4408440E7708000800003EF802883E8820883EF80000 +B573:0000000800087708440E4408440E7708000800003E8802883EF820883EF80000 +B574:0000000800087708440E4408440E7708000800001F0801081F0810141F620000 +B575:0000000800087708440E4408440E7708000800003EF802803EF820803EF80000 +B576:0000000800087708440E4408440E7708000800003EFC02483E4820483EFC0000 +B577:0000000800087708440E4408440E7708000800001F08017F1F1C10221F1C0000 +B578:0000000800087708440E4408440E77080008000003F802080208020803F80000 +B579:0000000800087708440E4408440E7708000800000208020803F8020803F80000 +B57A:0000000800087708440E4408440E770800080000110811081F0811141F620000 +B57B:0000000800087708440E4408440E770800080000001000100010006801840000 +B57C:0000000800087708440E4408440E7708000800000048004800A8011406620000 +B57D:0000000800087708440E4408440E770800080000000003F00408040803F00000 +B57E:0000000800087708440E4408440E77080008000003F80020002000D003080000 +B57F:0000000800087708440E4408440E770800080000004003F8004000A003180000 +B580:0000000800087708440E4408440E77080008000003F8000803F8000800080000 +B581:0000000800087708440E4408440E77080008000003F8020003F8020003F80000 +B582:0000000800087708440E4408440E77080008000000000FF8022002200FF80000 +B583:0000000800087708440E4408440E77080008000000800FF803E0041003E00000 +B584:00000000001200127BD24212421E42124212421E7BD200120012001200120000 +B585:000000280028772844384428443877280028000007F800080008000800080000 +B586:000000280028772844384428443877280028000000003EF80208020802080000 +B587:000000280028772844384428443877280028000000003E100210022802C40000 +B588:000000280028772844384428443877280028002808000800080008000FF80000 +B589:0000002800287728443844284438772800280000000020F8201020303ECC0000 +B58A:0000002800287728443844284438772800280000202021FC207020883E700000 +B58B:000000280028772844384428443877280028000003F802000200020003F80000 +B58C:000000280028772844384428443877280028000007F8000807F8040007F80000 +B58D:00000028002877284438442844387728002800003EF802083E0820083E080000 +B58E:00000028002877284438442844387728002800003EF802883E8820883EF80000 +B58F:00000028002877284438442844387728002800003E8802883EF820883EF80000 +B590:00000028002877284438442844387728002800001F0801081F0810141F620000 +B591:00000028002877284438442844387728002800003EF802803EF820803EF80000 +B592:00000028002877284438442844387728002800003EFC02483E4820483EFC0000 +B593:00000028002877284438442844387728002800003E1002FE3E3820443E380000 +B594:000000280028772844384428443877280028000003F802080208020803F80000 +B595:00000028002877284438442844387728002800000208020803F8020803F80000 +B596:0000002800287728443844284438772800280000110811081F0811141F620000 +B597:0000002800287728443844284438772800280000000800080008003400C20000 +B598:00000028002877284438442844387728002800000048004800A8011406620000 +B599:0000002800287728443844284438772800280000000001F00208020801F00000 +B59A:000000280028772844384428443877280028000003F80020002000D003080000 +B59B:0000002800287728443844284438772800280000004003F8004000A003180000 +B59C:000000280028772844384428443877280028000003F8000803F8000800080000 +B59D:000000280028772844384428443877280028000003F8020003F8020003F80000 +B59E:000000280028772844384428443877280028000000000FF8022002200FF80000 +B59F:000000280028772844384428443877280028000000800FF803E0041003E00000 +B5A0:00000000000200027BC242024202421E420242027BC200020002000200020000 +B5A1:0000000800087708440844384408770800080000000007F80008000800080000 +B5A2:000000080008770844084438440877080008000000003EF80208020802080000 +B5A3:000000080008770844084438440877080008000000001F080108011401620000 +B5A4:000000080008770844084438440877080008000000001000100010001FF80000 +B5A5:0000000800087708440844384408770800080000000020F8201020303ECC0000 +B5A6:0000000800087708440844384408770800080000202021FC207020883E700000 +B5A7:000000080008770844084438440877080008000003F802000200020003F80000 +B5A8:000000080008770844084438440877080008000007F8000807F8040007F80000 +B5A9:00000008000877084408443844087708000800003EF802083E0820083E080000 +B5AA:00000008000877084408443844087708000800003EF802883E8820883EF80000 +B5AB:00000008000877084408443844087708000800003E8802883EF820883EF80000 +B5AC:00000008000877084408443844087708000800000F8800880F8808140FA20000 +B5AD:00000008000877084408443844087708000800003EF802803EF820803EF80000 +B5AE:00000008000877084408443844087708000800003EFC02483E4820483EFC0000 +B5AF:00000008000877084408443844087708000800003E1002FE3E3820443E380000 +B5B0:000000080008770844084438440877080008000003F802080208020803F80000 +B5B1:00000008000877084408443844087708000800000208020803F8020803F80000 +B5B2:0000000800087708440844384408770800080000210821083F0821143F620000 +B5B3:0000000800087708440844384408770800080000001000100010006801840000 +B5B4:00000008000877084408443844087708000800000048004800A8011406620000 +B5B5:0000000800087708440844384408770800080000000003F00408040803F00000 +B5B6:000000080008770844084438440877080008000003F80020002000D003080000 +B5B7:0000000800087708440844384408770800080000004003F8004000A003180000 +B5B8:000000080008770844084438440877080008000003F8000803F8000800080000 +B5B9:000000080008770844084438440877080008000003F8020003F8020003F80000 +B5BA:000000080008770844084438440877080008000000000FF8022002200FF80000 +B5BB:000000080008770844084438440877080008000000800FF803E0041003E00000 +B5BC:00000000000A000A7BCA420A420A423A420A420A7BCA000A000A000A000A0000 +B5BD:0000002800287728442844E8442877280028000007F800080008000800080000 +B5BE:0000002800287728442844E8442877280028000000003EF80208020802080000 +B5BF:0000002800287728442844E8442877280028000000003E100210022802C40000 +B5C0:0000002800287728442844E8442877280028000008000800080008000FF80000 +B5C1:0000002800287728442844E84428772800280000000020F8201020303ECC0000 +B5C2:0000002800287728442844E84428772800280000202021FC207020883E700000 +B5C3:0000002800287728442844E8442877280028000003F802000200020003F80000 +B5C4:0000002800287728442844E8442877280028000007F8000807F8040007F80000 +B5C5:0000002800287728442844E844287728002800003EF802083E0820083E080000 +B5C6:0000002800287728442844E844287728002800003EF802883E8820883EF80000 +B5C7:0000002800287728442844E844287728002800003E8802883EF820883EF80000 +B5C8:0000002800287728442844E844287728002800001F0801081F0810141F620000 +B5C9:0000002800287728442844E844287728002800003EF802803EF820803EF80000 +B5CA:0000002800287728442844E844287728002800003EFC02483E4820483EFC0000 +B5CB:0000002800287728442844E844287728002800003E1002FE3E3820443E380000 +B5CC:0000002800287728442844E8442877280028000003F802080208020803F80000 +B5CD:0000002800287728442844E844287728002800000208020803F8020803F80000 +B5CE:0000002800287728442844E84428772800280000110811081F0811141F620000 +B5CF:0000002800287728442844E84428772800280000000800080008003400C20000 +B5D0:0000002800287728442844E844287728002800000048004800A8011406620000 +B5D1:0000002800287728442844E84428772800280000000001F00208020801F00000 +B5D2:0000002800287728442844E8442877280028000003F80020002000D003080000 +B5D3:0000002800287728442844E84428772800280000004003F8004000A003180000 +B5D4:0000002800287728442844E8442877280028000003F8000803F8000800080000 +B5D5:0000002800287728442844E8442877280028000003F8020003F8020003F80000 +B5D6:0000002800287728442844E8442877280028000000000FF8022002200FF80000 +B5D7:0000002800287728442844E8442877280028000000800FF803E0041003E00000 +B5D8:00000000000200027BC24202421E42024202421E7BC200020002000200020000 +B5D9:0000000800087708443844084438770800080000000007F80008000800080000 +B5DA:000000080008770844384408443877080008000000003EF80208020802080000 +B5DB:000000080008770844384408443877080008000000001F080108011401620000 +B5DC:000000080008770844384408443877080008000800001000100010001FF80000 +B5DD:0000000800087708443844084438770800080000000020F8201020303ECC0000 +B5DE:0000000800087708443844084438770800080000202021FC207020883E700000 +B5DF:000000080008770844384408443877080008000003F802000200020003F80000 +B5E0:000000080008770844384408443877080008000007F8000807F8040007F80000 +B5E1:00000008000877084438440844387708000800003EF802083E0820083E080000 +B5E2:00000008000877084438440844387708000800003EF802883E8820883EF80000 +B5E3:00000008000877084438440844387708000800003E8802883EF820883EF80000 +B5E4:00000008000877084438440844387708000800000F8800880F8808140FA20000 +B5E5:00000008000877084438440844387708000800003EF802803EF820803EF80000 +B5E6:00000008000877084438440844387708000800003EFC02483E4820483EFC0000 +B5E7:00000008000877084438440844387708000800003E1002FE3E3820443E380000 +B5E8:000000080008770844384408443877080008000003F802080208020803F80000 +B5E9:00000008000877084438440844387708000800000208020803F8020803F80000 +B5EA:0000000800087708443844084438770800080000210821083F0821143F620000 +B5EB:0000000800087708443844084438770800080000001000100010006801840000 +B5EC:00000008000877084438440844387708000800000048004800A8011406620000 +B5ED:0000000800087708443844084438770800080000000003F00408040803F00000 +B5EE:000000080008770844384408443877080008000003F80020002000D003080000 +B5EF:0000000800087708443844084438770800080000004003F8004000A003180000 +B5F0:000000080008770844384408443877080008000003F8000803F8000800080000 +B5F1:000000080008770844384408443877080008000003F8020003F8020003F80000 +B5F2:000000080008770844384408443877080008000000000FF8022002200FF80000 +B5F3:000000080008770844384408443877080008000000800FF803E0041003E00000 +B5F4:00000000000A000A7BCA420A423A420A420A423A7BCA000A000A000A000A0000 +B5F5:000000280028772844E8442844E877280028000007F800080008000800080000 +B5F6:000000280028772844E8442844E877280028000000003EF80208020802080000 +B5F7:000000280028772844E8442844E877280028000000003E100210022802C40000 +B5F8:000000280028772844E8442844E877280028002808000800080008000FF80000 +B5F9:000000280028772844E8442844E8772800280000000020F8201020303ECC0000 +B5FA:000000280028772844E8442844E8772800280000202021FC207020883E700000 +B5FB:000000280028772844E8442844E877280028000003F802000200020003F80000 +B5FC:000000280028772844E8442844E877280028000007F8000807F8040007F80000 +B5FD:000000280028772844E8442844E87728002800003EF802083E0820083E080000 +B5FE:000000280028772844E8442844E87728002800003EF802883E8820883EF80000 +B5FF:000000280028772844E8442844E87728002800003E8802883EF820883EF80000 +B600:000000280028772844E8442844E87728002800001F0801081F0810141F620000 +B601:000000280028772844E8442844E87728002800003EF802803EF820803EF80000 +B602:000000280028772844E8442844E87728002800003EFC02483E4820483EFC0000 +B603:000000280028772844E8442844E87728002800003E1002FE3E3820443E380000 +B604:000000280028772844E8442844E877280028000003F802080208020803F80000 +B605:000000280028772844E8442844E87728002800000208020803F8020803F80000 +B606:000000280028772844E8442844E8772800280000110811081F0811141F620000 +B607:000000280028772844E8442844E8772800280000000800080008003400C20000 +B608:000000280028772844E8442844E87728002800000048004800A8011406620000 +B609:000000280028772844E8442844E8772800280000000001F00208020801F00000 +B60A:000000280028772844E8442844E877280028000003F80020002000D003080000 +B60B:000000280028772844E8442844E8772800280000004003F8004000A003180000 +B60C:000000280028772844E8442844E877280028000003F8000803F8000800080000 +B60D:000000280028772844E8442844E877280028000003F8020003F8020003F80000 +B60E:000000280028772844E8442844E877280028000000000FF8022002200FF80000 +B60F:000000280028772844E8442844E877280028000000800FF803E0041003E00000 +B610:000000003EF820802080208020803EF8000000000100010001007FFC00000000 +B611:000000001EF0108010801EF0010001007FFC00001FF000100010001000100000 +B612:000000001EF0108010801EF0010001007FFC000000003EF80208020802080000 +B613:000000001EF0108010801EF0010001007FFC000000001E100210022802C40000 +B614:000000001EF0108010801EF0010001007FFC000000001000100010001FF00000 +B615:000000001EF0108010801EF0010001007FFC0000000020F8201020303ECC0000 +B616:000000001EF0108010801EF0010001007FFC0000202021FC207020883E700000 +B617:000000001EF0108010801EF0010001007FFC00001FF01000100010001FF00000 +B618:000000001EF0108010801EF0010001007FFC00001FF000101FF010001FF00000 +B619:000000001EF0108010801EF0010001007FFC00003EF802083E0820083E080000 +B61A:000000001EF0108010801EF0010001007FFC00003EF802883E8820883EF80000 +B61B:000000001EF0108010801EF0010001007FFC00003E8802883EF820883EF80000 +B61C:000000001EF0108010801EF0010001007FFC00003E1002103E1020283EC40000 +B61D:000000001EF0108010801EF0010001007FFC00003EF802803EF820803EF80000 +B61E:000000001EF0108010801EF0010001007FFC00003EFC02483E4820483EFC0000 +B61F:000000001EF0108010801EF0010001007FFC00003E2003FC3E7020883E700000 +B620:000000001EF0108010801EF0010001007FFC00001FF01010101010101FF00000 +B621:000000001EF0108010801EF0010001007FFC0000101010101FF010101FF00000 +B622:000000001EF0108010801EF0010001007FFC0000222022203E2022503E880000 +B623:000000001EF0108010801EF0010001007FFC000000000100010002800C400000 +B624:000000001EF0108010801EF0010001007FFC00000000024002400DA033100000 +B625:000000001EF0108010801EF0010001007FFC0000000007C00820082007C00000 +B626:000000001EF0108010801EF0010001007FFC0000000007E00080014006200000 +B627:000000001EF0108010801EF0010001007FFC0000008007E00080014006200000 +B628:000000001EF0108010801EF0010001007FFC00001FF000101FF0001000100000 +B629:000000001EF0108010801EF0010001007FFC00001FF010001FF010001FF00000 +B62A:000000001EF0108010801EF0010001007FFC000000001FF0044004401FF00000 +B62B:000000001EF0108010801EF0010001007FFC000001001FF007C0082007C00000 +B62C:0000001000107BD0421042104210421E7BD00010041004107FD0001000100000 +B62D:000000083B882208220E3B88040804087FE8000007F800080008000800080000 +B62E:000000083B882208220E3B88040804087FE8000000003EF80208020802080000 +B62F:000000083B882208220E3B88040804087FE8000000001F080108011401620000 +B630:000000083B882208220E3B88040804087FE8000008000800080008000FF80000 +B631:000000083B882208220E3B88040804087FE80000000010F8101010301ECC0000 +B632:000000083B882208220E3B88040804087FE800000808087F081C08220F9C0000 +B633:000000083B882208220E3B88040804087FE8000003F802000200020003F80000 +B634:000000083B882208220E3B88040804087FE8000007F8000807F8040007F80000 +B635:000000083B882208220E3B88040804087FE800003EF802083E0820083E080000 +B636:000000083B882208220E3B88040804087FE800003EF802883E8820883EF80000 +B637:000000083B882208220E3B88040804087FE800003E8802883EF820883EF80000 +B638:000000083B882208220E3B88040804087FE800001F0801081F0810141F620000 +B639:000000083B882208220E3B88040804087FE800003EF802803EF820803EF80000 +B63A:000000083B882208220E3B88040804087FE800003EFC02483E4820483EFC0000 +B63B:000000083B882208220E3B88040804087FE800001F08017F1F1C10221F1C0000 +B63C:000000083B882208220E3B88040804087FE8000003F802080208020803F80000 +B63D:000000083B882208220E3B88040804087FE800000208020803F8020803F80000 +B63E:000000083B882208220E3B88040804087FE80000110811081F0811141F620000 +B63F:000000083B882208220E3B88040804087FE80000001000100010006801840000 +B640:000000083B882208220E3B88040804087FE800000048004800A8011406620000 +B641:000000083B882208220E3B88040804087FE80000000003F00408040803F00000 +B642:000000083B882208220E3B88040804087FE8000003F80020002000D003080000 +B643:000000083B882208220E3B88040804087FE80000004003F8004000A003180000 +B644:000000083B882208220E3B88040804087FE8000003F8000803F8000800080000 +B645:000000083B882208220E3B88040804087FE8000003F8020003F8020003F80000 +B646:000000083B882208220E3B88040804087FE8000000000FF8022002200FF80000 +B647:000000083B882208220E3B88040804087FE8000000800FF803E0041003E00000 +B648:0000001200127BD2421242124212421E7BD20012041204127FD2001200120000 +B649:000000283BA8222822383BA8042804287FA8000007F800080008000800080000 +B64A:000000283BA8222822383BA8042804287FA8000000003EF80208020802080000 +B64B:000000283BA8222822383BA8042804287FA8000000001F080108011401620000 +B64C:000000283BA8222822383BA8042804287FA8000008000800080008000FF80000 +B64D:000000283BA8222822383BA8042804287FA80000000010F8101010301ECC0000 +B64E:000000283BA8222822383BA8042804287FA800000808087F081C08220F9C0000 +B64F:000000283BA8222822383BA8042804287FA8000003F802000200020003F80000 +B650:000000283BA8222822383BA8042804287FA8000007F8000807F8040007F80000 +B651:000000283BA8222822383BA8042804287FA800003EF802083E0820083E080000 +B652:000000283BA8222822383BA8042804287FA800003EF802883E8820883EF80000 +B653:000000283BA8222822383BA8042804287FA800003E8802883EF820883EF80000 +B654:000000283BA8222822383BA8042804287FA800001F0801081F0810141F620000 +B655:000000283BA8222822383BA8042804287FA800003EF802803EF820803EF80000 +B656:000000283BA8222822383BA8042804287FA800003EFC02483E4820483EFC0000 +B657:000000283BA8222822383BA8042804287FA800001F08017F1F1C10221F1C0000 +B658:000000283BA8222822383BA8042804287FA8000003F802080208020803F80000 +B659:000000283BA8222822383BA8042804287FA800000208020803F8020803F80000 +B65A:000000283BA8222822383BA8042804287FA80000110811081F0811141F620000 +B65B:000000283BA8222822383BA8042804287FA80000001000100010006801840000 +B65C:000000283BA8222822383BA8042804287FA800000048004800A8011406620000 +B65D:000000283BA8222822383BA8042804287FA80000000003F00408040803F00000 +B65E:000000283BA8222822383BA8042804287FA8000003F80020002000D003080000 +B65F:000000283BA8222822383BA8042804287FA80000004003F8004000A003180000 +B660:000000283BA8222822383BA8042804287FA8000003F8000803F8000800080000 +B661:000000283BA8222822383BA8042804287FA8000003F8020003F8020003F80000 +B662:000000283BA8222822383BA8042804287FA8000000000FF8022002200FF80000 +B663:000000283BA8222822383BA8042804287FA8000000800FF803E0041003E00000 +B664:0000000800087BC842084208420842087BC80008040804087FE8000800080000 +B665:000000083B88220822083B88040804087FE8000007F800080008000800080000 +B666:000000083B88220822083B88040804087FE8000000003EF80208020802080000 +B667:000000083B88220822083B88040804087FE8000000001F080108011401620000 +B668:000000083B88220822083B88040804087FE8000008000800080008000FF80000 +B669:000000083B88220822083B88040804087FE80000000010F8101010301ECC0000 +B66A:000000083B88220822083B88040804087FE800000808087F081C08220F9C0000 +B66B:000000083B88220822083B88040804087FE8000003F802000200020003F80000 +B66C:000000083B88220822083B88040804087FE8000007F8000807F8040007F80000 +B66D:000000083B88220822083B88040804087FE800003EF802083E0820083E080000 +B66E:000000083B88220822083B88040804087FE800003EF802883E8820883EF80000 +B66F:000000083B88220822083B88040804087FE800003E8802883EF820883EF80000 +B670:000000083B88220822083B88040804087FE800001F0801081F0810141F620000 +B671:000000083B88220822083B88040804087FE800003EF802803EF820803EF80000 +B672:000000083B88220822083B88040804087FE800003EFC02483E4820483EFC0000 +B673:000000083B88220822083B88040804087FE800001F08017F1F1C10221F1C0000 +B674:000000083B88220822083B88040804087FE8000003F802080208020803F80000 +B675:000000083B88220822083B88040804087FE800000208020803F8020803F80000 +B676:000000083B88220822083B88040804087FE80000110811081F0811141F620000 +B677:000000083B88220822083B88040804087FE80000001000100010006801840000 +B678:000000083B88220822083B88040804087FE800000048004800A8011406620000 +B679:000000083B88220822083B88040804087FE80000000003F00408040803F00000 +B67A:000000083B88220822083B88040804087FE8000003F80020002000D003080000 +B67B:000000083B88220822083B88040804087FE80000004003F8004000A003180000 +B67C:000000083B88220822083B88040804087FE8000003F8000803F8000800080000 +B67D:000000083B88220822083B88040804087FE8000003F8020003F8020003F80000 +B67E:000000083B88220822083B88040804087FE8000000000FF8022002200FF80000 +B67F:000000083B88220822083B88040804087FE8000000800FF803E0041003E00000 +B680:000000003EF820802080208020803EF8000004400440044004407FFC00000000 +B681:000000001EF0108010801EF0044004407FFC00001FF000100010001000100000 +B682:000000001EF0108010801EF0044004407FFC000000003EF80208020802080000 +B683:000000001EF0108010801EF0044004407FFC000000001E100210022802C40000 +B684:000000001EF0108010801EF0044004407FFC000000001000100010001FF00000 +B685:000000001EF0108010801EF0044004407FFC0000000020F8201020303ECC0000 +B686:000000001EF0108010801EF0044004407FFC0000202021FC207020883E700000 +B687:000000001EF0108010801EF0044004407FFC00001FF01000100010001FF00000 +B688:000000001EF0108010801EF0044004407FFC00001FF000101FF010001FF00000 +B689:000000001EF0108010801EF0044004407FFC00003EF802083E0820083E080000 +B68A:000000001EF0108010801EF0044004407FFC00003EF802883E8820883EF80000 +B68B:000000001EF0108010801EF0044004407FFC00003E8802883EF820883EF80000 +B68C:000000001EF0108010801EF0044004407FFC00003E1002103E1020283EC40000 +B68D:000000001EF0108010801EF0044004407FFC00003EF802803EF820803EF80000 +B68E:000000001EF0108010801EF0044004407FFC00003EFC02483E4820483EFC0000 +B68F:000000001EF0108010801EF0044004407FFC00003E2003FC3E7020883E700000 +B690:000000001EF0108010801EF0044004407FFC00001FF01010101010101FF00000 +B691:000000001EF0108010801EF0044004407FFC0000101010101FF010101FF00000 +B692:000000001EF0108010801EF0044004407FFC0000222022203E2022503E880000 +B693:000000001EF0108010801EF0044004407FFC000000000100010002800C400000 +B694:000000001EF0108010801EF0044004407FFC00000000024002400DA033100000 +B695:000000001EF0108010801EF0044004407FFC0000000007C00820082007C00000 +B696:000000001EF0108010801EF0044004407FFC0000000007E00080014006200000 +B697:000000001EF0108010801EF0044004407FFC0000008007E00080014006200000 +B698:000000001EF0108010801EF0044004407FFC00001FF000101FF0001000100000 +B699:000000001EF0108010801EF0044004407FFC00001FF010001FF010001FF00000 +B69A:000000001EF0108010801EF0044004407FFC000000001FF0044004401FF00000 +B69B:000000001EF0108010801EF0044004407FFC000001001FF007C0082007C00000 +B69C:000000003EF820802080208020803EF8000000003FF801000100010001000000 +B69D:000000001EF0108010801EF000007FFC010001001FF000100010001000100000 +B69E:000000001EF0108010801EF000007FFC0100010000003EF80208020802080000 +B69F:000000001EF0108010801EF000007FFC0100010000001E100210022802C40000 +B6A0:000000001EF0108010801EF0000000007FFC010001001100100010001FF00000 +B6A1:000000001EF0108010801EF000007FFC01000100000020F8201020303ECC0000 +B6A2:000000001EF0108010801EF000007FFC01000100202021FC207020883E700000 +B6A3:000000001EF0108010801EF000007FFC010001001FF01000100010001FF00000 +B6A4:000000001EF0108010801EF000007FFC010001001FF000101FF010001FF00000 +B6A5:000000001EF0108010801EF000007FFC010001003EF802083E0820083E080000 +B6A6:000000001EF0108010801EF000007FFC010001003EF802883E8820883EF80000 +B6A7:000000001EF0108010801EF000007FFC010001003E8802883EF820883EF80000 +B6A8:000000001EF0108010801EF000007FFC010001003E1002103E1020283EC40000 +B6A9:000000001EF0108010801EF000007FFC010001003EF802803EF820803EF80000 +B6AA:000000001EF0108010801EF000007FFC010001003EFC02483E4820483EFC0000 +B6AB:000000001EF0108010801EF000007FFC010001003E2003FC3E7020883E700000 +B6AC:000000001EF0108010801EF000007FFC010001001FF01010101010101FF00000 +B6AD:000000001EF0108010801EF000007FFC01000100101010101FF010101FF00000 +B6AE:000000001EF0108010801EF000007FFC01000100222022203E2022503E880000 +B6AF:000000001EF0108010801EF000007FFC0100010000000100010002800C400000 +B6B0:000000001EF0108010801EF000007FFC010001000000024002400DA033100000 +B6B1:000000001EF0108010801EF000007FFC01000100000007C00820082007C00000 +B6B2:000000001EF0108010801EF000007FFC01000100000007E00080014006200000 +B6B3:000000001EF0108010801EF000007FFC01000100008007E00080014006200000 +B6B4:000000001EF0108010801EF000007FFC010001001FF000101FF0001000100000 +B6B5:000000001EF0108010801EF000007FFC010001001FF010001FF010001FF00000 +B6B6:000000001EF0108010801EF000007FFC0100010000001FF0044004401FF00000 +B6B7:000000001EF0108010801EF000007FFC0100010001001FF007C0082007C00000 +B6B8:000000087BC842084208420842087BC8000800087FE8040804F8040804080000 +B6B9:0008770844084408770800087FE8027802080000000007F80008000800080000 +B6BA:0008770844084408770800087FE802780208000000003EF80208020802080000 +B6BB:0008770844084408770800087FE802780208000000001F080108011401620000 +B6BC:00087708440844087708000800087FE80278020802081000100010001FF80000 +B6BD:0008770844084408770800087FE8027802080000000020F8201020303ECC0000 +B6BE:0008770844084408770800087FE8027802080000202021FC207020883E700000 +B6BF:0008770844084408770800087FE802780208000003F802000200020003F80000 +B6C0:0008770844084408770800087FE802780208000007F8000807F8040007F80000 +B6C1:0008770844084408770800087FE80278020800003EF802083E0820083E080000 +B6C2:0008770844084408770800087FE80278020800003EF802883E8820883EF80000 +B6C3:0008770844084408770800087FE80278020800003E8802883EF820883EF80000 +B6C4:0008770844084408770800087FE80278020800000F8800880F8808140FA20000 +B6C5:0008770844084408770800087FE80278020800003EF802803EF820803EF80000 +B6C6:0008770844084408770800087FE80278020800003EFC02483E4820483EFC0000 +B6C7:0008770844084408770800087FE80278020800003E1002FE3E3820443E380000 +B6C8:0008770844084408770800087FE802780208000003F802080208020803F80000 +B6C9:0008770844084408770800087FE80278020800000208020803F8020803F80000 +B6CA:0008770844084408770800087FE8027802080000210821083F0821143F620000 +B6CB:0008770844084408770800087FE8027802080000001000100010006801840000 +B6CC:0008770844084408770800087FE80278020800000048004800A8011406620000 +B6CD:0008770844084408770800087FE8027802080000000003F00408040803F00000 +B6CE:0008770844084408770800087FE802780208000003F80020002000D003080000 +B6CF:0008770844084408770800087FE8027802080000004003F8004000A003180000 +B6D0:0008770844084408770800087FE802780208000003F8000803F8000800080000 +B6D1:0008770844084408770800087FE802780208000003F8020003F8020003F80000 +B6D2:0008770844084408770800087FE802780208000000000FF8022002200FF80000 +B6D3:0008770844084408770800087FE802780208000000800FF803E0041003E00000 +B6D4:0000000A7BCA420A420A420A420A7BCA000A000A7FEA040A047A040A040A0000 +B6D5:0028772844284428772800287FA805E804280000000007F80008000800080000 +B6D6:0028772844284428772800287FA805E80428000000003EF80208020802080000 +B6D7:0028772844284428772800287FA805E80428000000001F080108011401620000 +B6D8:00287728442844287728002800287FA8042805E804281428100010001FF80000 +B6D9:0028772844284428772800287FA805E804280000000020F8201020303ECC0000 +B6DA:0028772844284428772800287FA805E804280000202021FC207020883E700000 +B6DB:0028772844284428772800287FA805E80428000003F802000200020003F80000 +B6DC:0028772844284428772800287FA805E80428000007F8000807F8040007F80000 +B6DD:0028772844284428772800287FA805E8042800003EF802083E0820083E080000 +B6DE:0028772844284428772800287FA805E8042800003EF802883E8820883EF80000 +B6DF:0028772844284428772800287FA805E8042800003E8802883EF820883EF80000 +B6E0:0028772844284428772800287FA805E8042800000F8800880F8808140FA20000 +B6E1:0028772844284428772800287FA805E8042800003EF802803EF820803EF80000 +B6E2:0028772844284428772800287FA805E8042800003EFC02483E4820483EFC0000 +B6E3:0028772844284428772800287FA805E8042800003E1002FE3E3820443E380000 +B6E4:0028772844284428772800287FA805E80428000003F802080208020803F80000 +B6E5:0028772844284428772800287FA805E8042800000208020803F8020803F80000 +B6E6:0028772844284428772800287FA805E804280000210821083F0821143F620000 +B6E7:0028772844284428772800287FA805E804280000001000100010006801840000 +B6E8:0028772844284428772800287FA805E8042800000048004800A8011406620000 +B6E9:0028772844284428772800287FA805E804280000000003F00408040803F00000 +B6EA:0028772844284428772800287FA805E80428000003F80020002000D003080000 +B6EB:0028772844284428772800287FA805E804280000004003F8004000A003180000 +B6EC:0028772844284428772800287FA805E80428000003F8000803F8000800080000 +B6ED:0028772844284428772800287FA805E80428000003F8020003F8020003F80000 +B6EE:0028772844284428772800287FA805E80428000000000FF8022002200FF80000 +B6EF:0028772844284428772800287FA805E80428000000800FF803E0041003E00000 +B6F0:000000087BC842084208420842087BC8000800087FE804080408040804080000 +B6F1:0008770844084408770800087FE8020802000000000007F80008000800080000 +B6F2:0008770844084408770800087FE802080200000000003EF80208020802080000 +B6F3:0008770844084408770800087FE802080200000000001F080108011401620000 +B6F4:00087708440844087708000800087FE80208020802081008100010001FF80000 +B6F5:0008770844084408770800087FE8020802000000000020F8201020303ECC0000 +B6F6:0008770844084408770800087FE8020802000000202021FC207020883E700000 +B6F7:0008770844084408770800087FE802080200000003F802000200020003F80000 +B6F8:0008770844084408770800087FE802080200000007F8000807F8040007F80000 +B6F9:0008770844084408770800087FE80208020000003EF802083E0820083E080000 +B6FA:0008770844084408770800087FE80208020000003EF802883E8820883EF80000 +B6FB:0008770844084408770800087FE80208020000003E8802883EF820883EF80000 +B6FC:0008770844084408770800087FE80208020000000F8800880F8808140FA20000 +B6FD:0008770844084408770800087FE80208020000003EF802803EF820803EF80000 +B6FE:0008770844084408770800087FE80208020000003EFC02483E4820483EFC0000 +B6FF:0008770844084408770800087FE80208020000003E1002FE3E3820443E380000 +B700:0008770844084408770800087FE802080200000003F802080208020803F80000 +B701:0008770844084408770800087FE80208020000000208020803F8020803F80000 +B702:0008770844084408770800087FE8020802000000210821083F0821143F620000 +B703:0008770844084408770800087FE8020802000000001000100010006801840000 +B704:0008770844084408770800087FE80208020000000048004800A8011406620000 +B705:0008770844084408770800087FE8020802000000000003F00408040803F00000 +B706:0008770844084408770800087FE802080200000003F80020002000D003080000 +B707:0008770844084408770800087FE8020802000000004003F8004000A003180000 +B708:0008770844084408770800087FE802080200000003F8000803F8000800080000 +B709:0008770844084408770800087FE802080200000003F8020003F8020003F80000 +B70A:0008770844084408770800087FE802080200000000000FF8022002200FF80000 +B70B:0008770844084408770800087FE802080200000000800FF803E0041003E00000 +B70C:000000003EF820802080208020803EF8000000007FFC04400440044004400000 +B70D:000000001EF0108010801EF000007FFC044004401FF000100010001000100000 +B70E:000000001EF0108010801EF000007FFC0440044000003EF80208020802080000 +B70F:000000001EF0108010801EF000007FFC0440044000001E100210022802C40000 +B710:000000001EF0108010801EF0000000007FFC044004401440100010001FF00000 +B711:000000001EF0108010801EF000007FFC04400440000020F8201020303ECC0000 +B712:000000001EF0108010801EF000007FFC04400440202021FC207020883E700000 +B713:000000001EF0108010801EF000007FFC044004401FF01000100010001FF00000 +B714:000000001EF0108010801EF000007FFC044004401FF000101FF010001FF00000 +B715:000000001EF0108010801EF000007FFC044004403EF802083E0820083E080000 +B716:000000001EF0108010801EF000007FFC044004403EF802883E8820883EF80000 +B717:000000001EF0108010801EF000007FFC044004403E8802883EF820883EF80000 +B718:000000001EF0108010801EF000007FFC044004403E1002103E1020283EC40000 +B719:000000001EF0108010801EF000007FFC044004403EF802803EF820803EF80000 +B71A:000000001EF0108010801EF000007FFC044004403EFC02483E4820483EFC0000 +B71B:000000001EF0108010801EF000007FFC044004403E2003FC3E7020883E700000 +B71C:000000001EF0108010801EF000007FFC044004401FF01010101010101FF00000 +B71D:000000001EF0108010801EF000007FFC04400440101010101FF010101FF00000 +B71E:000000001EF0108010801EF000007FFC04400440222022203E2022503E880000 +B71F:000000001EF0108010801EF000007FFC0440044000000100010002800C400000 +B720:000000001EF0108010801EF000007FFC044004400000024002400DA033100000 +B721:000000001EF0108010801EF000007FFC04400440000007C00820082007C00000 +B722:000000001EF0108010801EF000007FFC04400440000007E00080014006200000 +B723:000000001EF0108010801EF000007FFC04400440008007E00080014006200000 +B724:000000001EF0108010801EF000007FFC044004401FF000101FF0001000100000 +B725:000000001EF0108010801EF000007FFC044004401FF010001FF010001FF00000 +B726:000000001EF0108010801EF000007FFC0440044000001FF0044004401FF00000 +B727:000000001EF0108010801EF000007FFC0440044001001FF007C0082007C00000 +B728:000000003EF820802080208020803EF80000000000007FFC0000000000000000 +B729:000000001EF0108010801EF0000000007FFC00001FF000100010001000100000 +B72A:000000001EF0108010801EF0000000007FFC000000003EF80208020802080000 +B72B:000000001EF0108010801EF0000000007FFC000000001E100210022802C40000 +B72C:000000001EF0108010801EF0000000007FFC000000001000100010001FF00000 +B72D:000000001EF0108010801EF0000000007FFC0000000020F8201020303ECC0000 +B72E:000000001EF0108010801EF0000000007FFC0000202021FC207020883E700000 +B72F:000000001EF0108010801EF0000000007FFC00001FF01000100010001FF00000 +B730:000000001EF0108010801EF0000000007FFC00001FF000101FF010001FF00000 +B731:000000001EF0108010801EF0000000007FFC00003EF802083E0820083E080000 +B732:000000001EF0108010801EF0000000007FFC00003EF802883E8820883EF80000 +B733:000000001EF0108010801EF0000000007FFC00003E8802883EF820883EF80000 +B734:000000001EF0108010801EF0000000007FFC00003E1002103E1020283EC40000 +B735:000000001EF0108010801EF0000000007FFC00003EF802803EF820803EF80000 +B736:000000001EF0108010801EF0000000007FFC00003EFC02483E4820483EFC0000 +B737:000000001EF0108010801EF0000000007FFC00003E2003FC3E7020883E700000 +B738:000000001EF0108010801EF0000000007FFC00001FF01010101010101FF00000 +B739:000000001EF0108010801EF0000000007FFC0000101010101FF010101FF00000 +B73A:000000001EF0108010801EF0000000007FFC0000222022203E2022503E880000 +B73B:000000001EF0108010801EF0000000007FFC000000000100010002800C400000 +B73C:000000001EF0108010801EF0000000007FFC00000000024002400DA033100000 +B73D:000000001EF0108010801EF0000000007FFC0000000007C00820082007C00000 +B73E:000000001EF0108010801EF0000000007FFC0000000007E00080014006200000 +B73F:000000001EF0108010801EF0000000007FFC0000008007E00080014006200000 +B740:000000001EF0108010801EF0000000007FFC00001FF000101FF0001000100000 +B741:000000001EF0108010801EF0000000007FFC00001FF010001FF010001FF00000 +B742:000000001EF0108010801EF0000000007FFC000000001FF0044004401FF00000 +B743:000000001EF0108010801EF0000000007FFC000001001FF007C0082007C00000 +B744:0000000800087BC842084208420842087BC8000800087FE80008000800080000 +B745:000000083B88220822083B88000800087FE8000007F800080008000800080000 +B746:000000083B88220822083B88000800087FE8000000003EF80208020802080000 +B747:000000083B88220822083B88000800087FE8000000001F080108011401620000 +B748:000000083B88220822083B88000800087FE8000008000800080008000FF80000 +B749:000000083B88220822083B88000800087FE80000000010F8101010301ECC0000 +B74A:000000083B88220822083B88000800087FE800000808087F081C08220F9C0000 +B74B:000000083B88220822083B88000800087FE8000003F802000200020003F80000 +B74C:000000083B88220822083B88000800087FE8000007F8000807F8040007F80000 +B74D:000000083B88220822083B88000800087FE800003EF802083E0820083E080000 +B74E:000000083B88220822083B88000800087FE800003EF802883E8820883EF80000 +B74F:000000083B88220822083B88000800087FE800003E8802883EF820883EF80000 +B750:000000083B88220822083B88000800087FE800001F0801081F0810141F620000 +B751:000000083B88220822083B88000800087FE800003EF802803EF820803EF80000 +B752:000000083B88220822083B88000800087FE800003EFC02483E4820483EFC0000 +B753:000000083B88220822083B88000800087FE800001F08017F1F1C10221F1C0000 +B754:000000083B88220822083B88000800087FE8000003F802080208020803F80000 +B755:000000083B88220822083B88000800087FE800000208020803F8020803F80000 +B756:000000083B88220822083B88000800087FE80000110811081F0811141F620000 +B757:000000083B88220822083B88000800087FE80000001000100010006801840000 +B758:000000083B88220822083B88000800087FE800000048004800A8011406620000 +B759:000000083B88220822083B88000800087FE80000000003F00408040803F00000 +B75A:000000083B88220822083B88000800087FE8000003F80020002000D003080000 +B75B:000000083B88220822083B88000800087FE80000004003F8004000A003180000 +B75C:000000083B88220822083B88000800087FE8000003F8000803F8000800080000 +B75D:000000083B88220822083B88000800087FE8000003F8020003F8020003F80000 +B75E:000000083B88220822083B88000800087FE8000000000FF8022002200FF80000 +B75F:000000083B88220822083B88000800087FE8000000800FF803E0041003E00000 +B760:00000000000800087BC8420842084208420842087BC800080008000800080000 +B761:0000000800087708440844084408770800080000000007F80008000800080000 +B762:000000080008770844084408440877080008000000003EF80208020802080000 +B763:000000080008770844084408440877080008000000001F080108011401620000 +B764:000000080008770844084408440877080008000800001000100010001FF80000 +B765:0000000800087708440844084408770800080000000020F8201020303ECC0000 +B766:0000000800087708440844084408770800080000202021FC207020883E700000 +B767:000000080008770844084408440877080008000003F802000200020003F80000 +B768:000000080008770844084408440877080008000007F8000807F8040007F80000 +B769:00000008000877084408440844087708000800003EF802083E0820083E080000 +B76A:00000008000877084408440844087708000800003EF802883E8820883EF80000 +B76B:00000008000877084408440844087708000800003E8802883EF820883EF80000 +B76C:00000008000877084408440844087708000800000F8800880F8808140FA20000 +B76D:00000008000877084408440844087708000800003EF802803EF820803EF80000 +B76E:00000008000877084408440844087708000800003EFC02483E4820483EFC0000 +B76F:00000008000877084408440844087708000800003E1002FE3E3820443E380000 +B770:000000080008770844084408440877080008000003F802080208020803F80000 +B771:00000008000877084408440844087708000800000208020803F8020803F80000 +B772:0000000800087708440844084408770800080000210821083F0821143F620000 +B773:0000000800087708440844084408770800080000001000100010006801840000 +B774:00000008000877084408440844087708000800000048004800A8011406620000 +B775:0000000800087708440844084408770800080000000003F00408040803F00000 +B776:000000080008770844084408440877080008000003F80020002000D003080000 +B777:0000000800087708440844084408770800080000004003F8004000A003180000 +B778:000000080008770844084408440877080008000003F8000803F8000800080000 +B779:000000080008770844084408440877080008000003F8020003F8020003F80000 +B77A:000000080008770844084408440877080008000000000FF8022002200FF80000 +B77B:000000080008770844084408440877080008000000800FF803E0041003E00000 +B77C:00000000001000103F90009000903F9E2010201020103F900010001000100000 +B77D:0000000800083F0801083F0E20083F080008000007F800080008000800080000 +B77E:0000000800083F0801083F0E20083F080008000000003EF80208020802080000 +B77F:0000000800083F0801083F0E20083F080008000000001F080108011401620000 +B780:0000000800083F0801083F0E20083F080008000808000800080008000FF80000 +B781:0000000800083F0801083F0E20083F0800080000000010F8101010301ECC0000 +B782:0000000800083F0801083F0E20083F08000800000808087F081C08220F9C0000 +B783:0000000800083F0801083F0E20083F080008000003F802000200020003F80000 +B784:0000000800083F0801083F0E20083F080008000007F8000807F8040007F80000 +B785:0000000800083F0801083F0E20083F08000800003EF802083E0820083E080000 +B786:0000000800083F0801083F0E20083F08000800003EF802883E8820883EF80000 +B787:0000000800083F0801083F0E20083F08000800003E8802883EF820883EF80000 +B788:0000000800083F0801083F0E20083F08000800001F0801081F0810141F620000 +B789:0000000800083F0801083F0E20083F08000800003EF802803EF820803EF80000 +B78A:0000000800083F0801083F0E20083F08000800003EFC02483E4820483EFC0000 +B78B:0000000800083F0801083F0E20083F08000800001F08017F1F1C10221F1C0000 +B78C:0000000800083F0801083F0E20083F080008000003F802080208020803F80000 +B78D:0000000800083F0801083F0E20083F08000800000208020803F8020803F80000 +B78E:0000000800083F0801083F0E20083F0800080000110811081F0811141F620000 +B78F:0000000800083F0801083F0E20083F0800080000001000100010006801840000 +B790:0000000800083F0801083F0E20083F08000800000048004800A8011406620000 +B791:0000000800083F0801083F0E20083F0800080000000003F00408040803F00000 +B792:0000000800083F0801083F0E20083F080008000003F80020002000D003080000 +B793:0000000800083F0801083F0E20083F0800080000004003F8004000A003180000 +B794:0000000800083F0801083F0E20083F080008000003F8000803F8000800080000 +B795:0000000800083F0801083F0E20083F080008000003F8020003F8020003F80000 +B796:0000000800083F0801083F0E20083F080008000000000FF8022002200FF80000 +B797:0000000800083F0801083F0E20083F080008000000800FF803E0041003E00000 +B798:00000000001200123F92009200923F9E2012201220123F920012001200120000 +B799:0000002800283F2801283F3820283F280028000007F800080008000800080000 +B79A:0000002800283F2801283F3820283F280028000000003EF80208020802080000 +B79B:0000002800283F2801283F3820283F280028000000003E100210022802C40000 +B79C:0000002800283F2801283F3820283F280028002808000800080008000FF80000 +B79D:0000002800283F2801283F3820283F2800280000000020F8201020303ECC0000 +B79E:0000002800283F2801283F3820283F2800280000202021FC207020883E700000 +B79F:0000002800283F2801283F3820283F280028000003F802000200020003F80000 +B7A0:0000002800283F2801283F3820283F280028000007F8000807F8040007F80000 +B7A1:0000002800283F2801283F3820283F28002800003EF802083E0820083E080000 +B7A2:0000002800283F2801283F3820283F28002800003EF802883E8820883EF80000 +B7A3:0000002800283F2801283F3820283F28002800003E8802883EF820883EF80000 +B7A4:0000002800283F2801283F3820283F28002800001F0801081F0810141F620000 +B7A5:0000002800283F2801283F3820283F28002800003EF802803EF820803EF80000 +B7A6:0000002800283F2801283F3820283F28002800003EFC02483E4820483EFC0000 +B7A7:0000002800283F2801283F3820283F28002800003E1002FE3E3820443E380000 +B7A8:0000002800283F2801283F3820283F280028000003F802080208020803F80000 +B7A9:0000002800283F2801283F3820283F28002800000208020803F8020803F80000 +B7AA:0000002800283F2801283F3820283F2800280000110811081F0811141F620000 +B7AB:0000002800283F2801283F3820283F2800280000000800080008003400C20000 +B7AC:0000002800283F2801283F3820283F28002800000048004800A8011406620000 +B7AD:0000002800283F2801283F3820283F2800280000000001F00208020801F00000 +B7AE:0000002800283F2801283F3820283F280028000003F80020002000D003080000 +B7AF:0000002800283F2801283F3820283F2800280000004003F8004000A003180000 +B7B0:0000002800283F2801283F3820283F280028000003F8000803F8000800080000 +B7B1:0000002800283F2801283F3820283F280028000003F8020003F8020003F80000 +B7B2:0000002800283F2801283F3820283F280028000000000FF8022002200FF80000 +B7B3:0000002800283F2801283F3820283F280028000000800FF803E0041003E00000 +B7B4:00000000001000103F900090009E3F902010201E20103F900010001000100000 +B7B5:0000000800083F08010E3F08200E3F080008000007F800080008000800080000 +B7B6:0000000800083F08010E3F08200E3F080008000000003EF80208020802080000 +B7B7:0000000800083F08010E3F08200E3F080008000000001F080108011401620000 +B7B8:0000000800083F08010E3F08200E3F080008000008000800080008000FF80000 +B7B9:0000000800083F08010E3F08200E3F0800080000000010F8101010301ECC0000 +B7BA:0000000800083F08010E3F08200E3F08000800000808087F081C08220F9C0000 +B7BB:0000000800083F08010E3F08200E3F080008000003F802000200020003F80000 +B7BC:0000000800083F08010E3F08200E3F080008000007F8000807F8040007F80000 +B7BD:0000000800083F08010E3F08200E3F08000800003EF802083E0820083E080000 +B7BE:0000000800083F08010E3F08200E3F08000800003EF802883E8820883EF80000 +B7BF:0000000800083F08010E3F08200E3F08000800003E8802883EF820883EF80000 +B7C0:0000000800083F08010E3F08200E3F08000800001F0801081F0810141F620000 +B7C1:0000000800083F08010E3F08200E3F08000800003EF802803EF820803EF80000 +B7C2:0000000800083F08010E3F08200E3F08000800003EFC02483E4820483EFC0000 +B7C3:0000000800083F08010E3F08200E3F08000800001F08017F1F1C10221F1C0000 +B7C4:0000000800083F08010E3F08200E3F080008000003F802080208020803F80000 +B7C5:0000000800083F08010E3F08200E3F08000800000208020803F8020803F80000 +B7C6:0000000800083F08010E3F08200E3F0800080000110811081F0811141F620000 +B7C7:0000000800083F08010E3F08200E3F0800080000001000100010006801840000 +B7C8:0000000800083F08010E3F08200E3F08000800000048004800A8011406620000 +B7C9:0000000800083F08010E3F08200E3F0800080000000003F00408040803F00000 +B7CA:0000000800083F08010E3F08200E3F080008000003F80020002000D003080000 +B7CB:0000000800083F08010E3F08200E3F0800080000004003F8004000A003180000 +B7CC:0000000800083F08010E3F08200E3F080008000003F8000803F8000800080000 +B7CD:0000000800083F08010E3F08200E3F080008000003F8020003F8020003F80000 +B7CE:0000000800083F08010E3F08200E3F080008000000000FF8022002200FF80000 +B7CF:0000000800083F08010E3F08200E3F080008000000800FF803E0041003E00000 +B7D0:00000000001200123F920092009E3F922012201E20123F920012001200120000 +B7D1:0000002800283F2801383F2820383F280028000007F800080008000800080000 +B7D2:0000002800283F2801383F2820383F280028000000003EF80208020802080000 +B7D3:0000002800283F2801383F2820383F280028000000003E100210022802C40000 +B7D4:0000002800283F2801383F2820383F280028002808000800080008000FF80000 +B7D5:0000002800283F2801383F2820383F2800280000000020F8201020303ECC0000 +B7D6:0000002800283F2801383F2820383F2800280000202021FC207020883E700000 +B7D7:0000002800283F2801383F2820383F280028000003F802000200020003F80000 +B7D8:0000002800283F2801383F2820383F280028000007F8000807F8040007F80000 +B7D9:0000002800283F2801383F2820383F28002800003EF802083E0820083E080000 +B7DA:0000002800283F2801383F2820383F28002800003EF802883E8820883EF80000 +B7DB:0000002800283F2801383F2820383F28002800003E8802883EF820883EF80000 +B7DC:0000002800283F2801383F2820383F28002800001F0801081F0810141F620000 +B7DD:0000002800283F2801383F2820383F28002800003EF802803EF820803EF80000 +B7DE:0000002800283F2801383F2820383F28002800003EFC02483E4820483EFC0000 +B7DF:0000002800283F2801383F2820383F28002800003E1002FE3E3820443E380000 +B7E0:0000002800283F2801383F2820383F280028000003F802080208020803F80000 +B7E1:0000002800283F2801383F2820383F28002800000208020803F8020803F80000 +B7E2:0000002800283F2801383F2820383F2800280000110811081F0811141F620000 +B7E3:0000002800283F2801383F2820383F2800280000000800080008003400C20000 +B7E4:0000002800283F2801383F2820383F28002800000048004800A8011406620000 +B7E5:0000002800283F2801383F2820383F2800280000000001F00208020801F00000 +B7E6:0000002800283F2801383F2820383F280028000003F80020002000D003080000 +B7E7:0000002800283F2801383F2820383F2800280000004003F8004000A003180000 +B7E8:0000002800283F2801383F2820383F280028000003F8000803F8000800080000 +B7E9:0000002800283F2801383F2820383F280028000003F8020003F8020003F80000 +B7EA:0000002800283F2801383F2820383F280028000000000FF8022002200FF80000 +B7EB:0000002800283F2801383F2820383F280028000000800FF803E0041003E00000 +B7EC:00000000000200023F82008200823F9E2002200220023F820002000200020000 +B7ED:0000000800083F0801083F3820083F0800080000000007F80008000800080000 +B7EE:0000000800083F0801083F3820083F080008000000003EF80208020802080000 +B7EF:0000000800083F0801083F3820083F080008000000001F080108011401620000 +B7F0:0000000800083F0801083F3820083F080008000000001000100010001FF80000 +B7F1:0000000800083F0801083F3820083F0800080000000020F8201020303ECC0000 +B7F2:0000000800083F0801083F3820083F0800080000202021FC207020883E700000 +B7F3:0000000800083F0801083F3820083F080008000003F802000200020003F80000 +B7F4:0000000800083F0801083F3820083F080008000007F8000807F8040007F80000 +B7F5:0000000800083F0801083F3820083F08000800003EF802083E0820083E080000 +B7F6:0000000800083F0801083F3820083F08000800003EF802883E8820883EF80000 +B7F7:0000000800083F0801083F3820083F08000800003E8802883EF820883EF80000 +B7F8:0000000800083F0801083F3820083F08000800000F8800880F8808140FA20000 +B7F9:0000000800083F0801083F3820083F08000800003EF802803EF820803EF80000 +B7FA:0000000800083F0801083F3820083F08000800003EFC02483E4820483EFC0000 +B7FB:0000000800083F0801083F3820083F08000800003E1002FE3E3820443E380000 +B7FC:0000000800083F0801083F3820083F080008000003F802080208020803F80000 +B7FD:0000000800083F0801083F3820083F08000800000208020803F8020803F80000 +B7FE:0000000800083F0801083F3820083F0800080000210821083F0821143F620000 +B7FF:0000000800083F0801083F3820083F0800080000001000100010006801840000 +B800:0000000800083F0801083F3820083F08000800000048004800A8011406620000 +B801:0000000800083F0801083F3820083F0800080000000003F00408040803F00000 +B802:0000000800083F0801083F3820083F080008000003F80020002000D003080000 +B803:0000000800083F0801083F3820083F0800080000004003F8004000A003180000 +B804:0000000800083F0801083F3820083F080008000003F8000803F8000800080000 +B805:0000000800083F0801083F3820083F080008000003F8020003F8020003F80000 +B806:0000000800083F0801083F3820083F080008000000000FF8022002200FF80000 +B807:0000000800083F0801083F3820083F080008000000800FF803E0041003E00000 +B808:00000000000A000A3F8A008A008A3FBA200A200A200A3F8A000A000A000A0000 +B809:0000002800283F2801283FE820283F280028000007F800080008000800080000 +B80A:0000002800283F2801283FE820283F280028000000003EF80208020802080000 +B80B:0000002800283F2801283FE820283F280028000000003E100210022802C40000 +B80C:0000002800283F2801283FE820283F280028000008000800080008000FF80000 +B80D:0000002800283F2801283FE820283F2800280000000020F8201020303ECC0000 +B80E:0000002800283F2801283FE820283F2800280000202021FC207020883E700000 +B80F:0000002800283F2801283FE820283F280028000003F802000200020003F80000 +B810:0000002800283F2801283FE820283F280028000007F8000807F8040007F80000 +B811:0000002800283F2801283FE820283F28002800003EF802083E0820083E080000 +B812:0000002800283F2801283FE820283F28002800003EF802883E8820883EF80000 +B813:0000002800283F2801283FE820283F28002800003E8802883EF820883EF80000 +B814:0000002800283F2801283FE820283F28002800001F0801081F0810141F620000 +B815:0000002800283F2801283FE820283F28002800003EF802803EF820803EF80000 +B816:0000002800283F2801283FE820283F28002800003EFC02483E4820483EFC0000 +B817:0000002800283F2801283FE820283F28002800003E1002FE3E3820443E380000 +B818:0000002800283F2801283FE820283F280028000003F802080208020803F80000 +B819:0000002800283F2801283FE820283F28002800000208020803F8020803F80000 +B81A:0000002800283F2801283FE820283F2800280000110811081F0811141F620000 +B81B:0000002800283F2801283FE820283F2800280000000800080008003400C20000 +B81C:0000002800283F2801283FE820283F28002800000048004800A8011406620000 +B81D:0000002800283F2801283FE820283F2800280000000001F00208020801F00000 +B81E:0000002800283F2801283FE820283F280028000003F80020002000D003080000 +B81F:0000002800283F2801283FE820283F2800280000004003F8004000A003180000 +B820:0000002800283F2801283FE820283F280028000003F8000803F8000800080000 +B821:0000002800283F2801283FE820283F280028000003F8020003F8020003F80000 +B822:0000002800283F2801283FE820283F280028000000000FF8022002200FF80000 +B823:0000002800283F2801283FE820283F280028000000800FF803E0041003E00000 +B824:00000000000200023F820082009E3F822002201E20023F820002000200020000 +B825:0000000800083F0801383F0820383F0800080000000007F80008000800080000 +B826:0000000800083F0801383F0820383F080008000000003EF80208020802080000 +B827:0000000800083F0801383F0820383F080008000000001F080108011401620000 +B828:0000000800083F0801383F0820383F080008000800001000100010001FF80000 +B829:0000000800083F0801383F0820383F0800080000000020F8201020303ECC0000 +B82A:0000000800083F0801383F0820383F0800080000202021FC207020883E700000 +B82B:0000000800083F0801383F0820383F080008000003F802000200020003F80000 +B82C:0000000800083F0801383F0820383F080008000007F8000807F8040007F80000 +B82D:0000000800083F0801383F0820383F08000800003EF802083E0820083E080000 +B82E:0000000800083F0801383F0820383F08000800003EF802883E8820883EF80000 +B82F:0000000800083F0801383F0820383F08000800003E8802883EF820883EF80000 +B830:0000000800083F0801383F0820383F08000800000F8800880F8808140FA20000 +B831:0000000800083F0801383F0820383F08000800003EF802803EF820803EF80000 +B832:0000000800083F0801383F0820383F08000800003EFC02483E4820483EFC0000 +B833:0000000800083F0801383F0820383F08000800003E1002FE3E3820443E380000 +B834:0000000800083F0801383F0820383F080008000003F802080208020803F80000 +B835:0000000800083F0801383F0820383F08000800000208020803F8020803F80000 +B836:0000000800083F0801383F0820383F0800080000210821083F0821143F620000 +B837:0000000800083F0801383F0820383F0800080000001000100010006801840000 +B838:0000000800083F0801383F0820383F08000800000048004800A8011406620000 +B839:0000000800083F0801383F0820383F0800080000000003F00408040803F00000 +B83A:0000000800083F0801383F0820383F080008000003F80020002000D003080000 +B83B:0000000800083F0801383F0820383F0800080000004003F8004000A003180000 +B83C:0000000800083F0801383F0820383F080008000003F8000803F8000800080000 +B83D:0000000800083F0801383F0820383F080008000003F8020003F8020003F80000 +B83E:0000000800083F0801383F0820383F080008000000000FF8022002200FF80000 +B83F:0000000800083F0801383F0820383F080008000000800FF803E0041003E00000 +B840:00000000000A000A3F8A008A00BA3F8A200A203A200A3F8A000A000A000A0000 +B841:0000002800283F2801E83F2820E83F280028000007F800080008000800080000 +B842:0000002800283F2801E83F2820E83F280028000000003EF80208020802080000 +B843:0000002800283F2801E83F2820E83F280028000000003E100210022802C40000 +B844:0000002800283F2801E83F2820E83F280028002808000800080008000FF80000 +B845:0000002800283F2801E83F2820E83F2800280000000020F8201020303ECC0000 +B846:0000002800283F2801E83F2820E83F2800280000202021FC207020883E700000 +B847:0000002800283F2801E83F2820E83F280028000003F802000200020003F80000 +B848:0000002800283F2801E83F2820E83F280028000007F8000807F8040007F80000 +B849:0000002800283F2801E83F2820E83F28002800003EF802083E0820083E080000 +B84A:0000002800283F2801E83F2820E83F28002800003EF802883E8820883EF80000 +B84B:0000002800283F2801E83F2820E83F28002800003E8802883EF820883EF80000 +B84C:0000002800283F2801E83F2820E83F28002800001F0801081F0810141F620000 +B84D:0000002800283F2801E83F2820E83F28002800003EF802803EF820803EF80000 +B84E:0000002800283F2801E83F2820E83F28002800003EFC02483E4820483EFC0000 +B84F:0000002800283F2801E83F2820E83F28002800003E1002FE3E3820443E380000 +B850:0000002800283F2801E83F2820E83F280028000003F802080208020803F80000 +B851:0000002800283F2801E83F2820E83F28002800000208020803F8020803F80000 +B852:0000002800283F2801E83F2820E83F2800280000110811081F0811141F620000 +B853:0000002800283F2801E83F2820E83F2800280000000800080008003400C20000 +B854:0000002800283F2801E83F2820E83F28002800000048004800A8011406620000 +B855:0000002800283F2801E83F2820E83F2800280000000001F00208020801F00000 +B856:0000002800283F2801E83F2820E83F280028000003F80020002000D003080000 +B857:0000002800283F2801E83F2820E83F2800280000004003F8004000A003180000 +B858:0000002800283F2801E83F2820E83F280028000003F8000803F8000800080000 +B859:0000002800283F2801E83F2820E83F280028000003F8020003F8020003F80000 +B85A:0000002800283F2801E83F2820E83F280028000000000FF8022002200FF80000 +B85B:0000002800283F2801E83F2820E83F280028000000800FF803E0041003E00000 +B85C:000000001FF0001000101FF0100010001FF000000100010001007FFC00000000 +B85D:00001FF000101FF010001FF0010001007FFC00001FF000100010001000100000 +B85E:00001FF000101FF010001FF0010001007FFC000000003EF80208020802080000 +B85F:00001FF000101FF010001FF0010001007FFC000000001E100210022802C40000 +B860:00001FF000101FF010001FF0010001007FFC000000001000100010001FF00000 +B861:00001FF000101FF010001FF0010001007FFC0000000020F8201020303ECC0000 +B862:00001FF000101FF010001FF0010001007FFC0000202021FC207020883E700000 +B863:00001FF000101FF010001FF0010001007FFC00001FF01000100010001FF00000 +B864:00001FF000101FF010001FF0010001007FFC00001FF000101FF010001FF00000 +B865:00001FF000101FF010001FF0010001007FFC00003EF802083E0820083E080000 +B866:00001FF000101FF010001FF0010001007FFC00003EF802883E8820883EF80000 +B867:00001FF000101FF010001FF0010001007FFC00003E8802883EF820883EF80000 +B868:00001FF000101FF010001FF0010001007FFC00003E1002103E1020283EC40000 +B869:00001FF000101FF010001FF0010001007FFC00003EF802803EF820803EF80000 +B86A:00001FF000101FF010001FF0010001007FFC00003EFC02483E4820483EFC0000 +B86B:00001FF000101FF010001FF0010001007FFC00003E2003FC3E7020883E700000 +B86C:00001FF000101FF010001FF0010001007FFC00001FF01010101010101FF00000 +B86D:00001FF000101FF010001FF0010001007FFC0000101010101FF010101FF00000 +B86E:00001FF000101FF010001FF0010001007FFC0000222022203E2022503E880000 +B86F:00001FF000101FF010001FF0010001007FFC000000000100010002800C400000 +B870:00001FF000101FF010001FF0010001007FFC00000000024002400DA033100000 +B871:00001FF000101FF010001FF0010001007FFC0000000007C00820082007C00000 +B872:00001FF000101FF010001FF0010001007FFC0000000007E00080014006200000 +B873:00001FF000101FF010001FF0010001007FFC0000008007E00080014006200000 +B874:00001FF000101FF010001FF0010001007FFC00001FF000101FF0001000100000 +B875:00001FF000101FF010001FF0010001007FFC00001FF010001FF010001FF00000 +B876:00001FF000101FF010001FF0010001007FFC000000001FF0044004401FF00000 +B877:00001FF000101FF010001FF0010001007FFC000001001FF007C0082007C00000 +B878:0000001000103F90009000903F90201E20103F90041004107FD0001000100000 +B879:000000083F8800883F8E20083F8804087FE8000007F800080008000800080000 +B87A:000000083F8800883F8E20083F8804087FE8000000003EF80208020802080000 +B87B:000000083F8800883F8E20083F8804087FE8000000001F080108011401620000 +B87C:000000083F8800883F8E20083F8804087FE8000008000800080008000FF80000 +B87D:000000083F8800883F8E20083F8804087FE80000000010F8101010301ECC0000 +B87E:000000083F8800883F8E20083F8804087FE800000808087F081C08220F9C0000 +B87F:000000083F8800883F8E20083F8804087FE8000003F802000200020003F80000 +B880:000000083F8800883F8E20083F8804087FE8000007F8000807F8040007F80000 +B881:000000083F8800883F8E20083F8804087FE800003EF802083E0820083E080000 +B882:000000083F8800883F8E20083F8804087FE800003EF802883E8820883EF80000 +B883:000000083F8800883F8E20083F8804087FE800003E8802883EF820883EF80000 +B884:000000083F8800883F8E20083F8804087FE800001F0801081F0810141F620000 +B885:000000083F8800883F8E20083F8804087FE800003EF802803EF820803EF80000 +B886:000000083F8800883F8E20083F8804087FE800003EFC02483E4820483EFC0000 +B887:000000083F8800883F8E20083F8804087FE800001F08017F1F1C10221F1C0000 +B888:000000083F8800883F8E20083F8804087FE8000003F802080208020803F80000 +B889:000000083F8800883F8E20083F8804087FE800000208020803F8020803F80000 +B88A:000000083F8800883F8E20083F8804087FE80000110811081F0811141F620000 +B88B:000000083F8800883F8E20083F8804087FE80000001000100010006801840000 +B88C:000000083F8800883F8E20083F8804087FE800000048004800A8011406620000 +B88D:000000083F8800883F8E20083F8804087FE80000000003F00408040803F00000 +B88E:000000083F8800883F8E20083F8804087FE8000003F80020002000D003080000 +B88F:000000083F8800883F8E20083F8804087FE80000004003F8004000A003180000 +B890:000000083F8800883F8E20083F8804087FE8000003F8000803F8000800080000 +B891:000000083F8800883F8E20083F8804087FE8000003F8020003F8020003F80000 +B892:000000083F8800883F8E20083F8804087FE8000000000FF8022002200FF80000 +B893:000000083F8800883F8E20083F8804087FE8000000800FF803E0041003E00000 +B894:0000001200123F92009200923F92201E20123F92041204127FD2001200120000 +B895:000000283FA800A83FB820283FA804287FA8000007F800080008000800080000 +B896:000000283FA800A83FB820283FA804287FA8000000003EF80208020802080000 +B897:000000283FA800A83FB820283FA804287FA8000000001F080108011401620000 +B898:000000283FA800A83FB820283FA804287FA8000008000800080008000FF80000 +B899:000000283FA800A83FB820283FA804287FA80000000010F8101010301ECC0000 +B89A:000000283FA800A83FB820283FA804287FA800000808087F081C08220F9C0000 +B89B:000000283FA800A83FB820283FA804287FA8000003F802000200020003F80000 +B89C:000000283FA800A83FB820283FA804287FA8000007F8000807F8040007F80000 +B89D:000000283FA800A83FB820283FA804287FA800003EF802083E0820083E080000 +B89E:000000283FA800A83FB820283FA804287FA800003EF802883E8820883EF80000 +B89F:000000283FA800A83FB820283FA804287FA800003E8802883EF820883EF80000 +B8A0:000000283FA800A83FB820283FA804287FA800001F0801081F0810141F620000 +B8A1:000000283FA800A83FB820283FA804287FA800003EF802803EF820803EF80000 +B8A2:000000283FA800A83FB820283FA804287FA800003EFC02483E4820483EFC0000 +B8A3:000000283FA800A83FB820283FA804287FA800001F08017F1F1C10221F1C0000 +B8A4:000000283FA800A83FB820283FA804287FA8000003F802080208020803F80000 +B8A5:000000283FA800A83FB820283FA804287FA800000208020803F8020803F80000 +B8A6:000000283FA800A83FB820283FA804287FA80000110811081F0811141F620000 +B8A7:000000283FA800A83FB820283FA804287FA80000001000100010006801840000 +B8A8:000000283FA800A83FB820283FA804287FA800000048004800A8011406620000 +B8A9:000000283FA800A83FB820283FA804287FA80000000003F00408040803F00000 +B8AA:000000283FA800A83FB820283FA804287FA8000003F80020002000D003080000 +B8AB:000000283FA800A83FB820283FA804287FA80000004003F8004000A003180000 +B8AC:000000283FA800A83FB820283FA804287FA8000003F8000803F8000800080000 +B8AD:000000283FA800A83FB820283FA804287FA8000003F8020003F8020003F80000 +B8AE:000000283FA800A83FB820283FA804287FA8000000000FF8022002200FF80000 +B8AF:000000283FA800A83FB820283FA804287FA8000000800FF803E0041003E00000 +B8B0:0000000800083F88008800883F88200820083F88040804087FE8000800080000 +B8B1:000000083F8800883F8820083F8804087FE8000007F800080008000800080000 +B8B2:000000083F8800883F8820083F8804087FE8000000003EF80208020802080000 +B8B3:000000083F8800883F8820083F8804087FE8000000001F080108011401620000 +B8B4:000000083F8800883F8820083F8804087FE8000008000800080008000FF80000 +B8B5:000000083F8800883F8820083F8804087FE80000000010F8101010301ECC0000 +B8B6:000000083F8800883F8820083F8804087FE800000808087F081C08220F9C0000 +B8B7:000000083F8800883F8820083F8804087FE8000003F802000200020003F80000 +B8B8:000000083F8800883F8820083F8804087FE8000007F8000807F8040007F80000 +B8B9:000000083F8800883F8820083F8804087FE800003EF802083E0820083E080000 +B8BA:000000083F8800883F8820083F8804087FE800003EF802883E8820883EF80000 +B8BB:000000083F8800883F8820083F8804087FE800003E8802883EF820883EF80000 +B8BC:000000083F8800883F8820083F8804087FE800001F0801081F0810141F620000 +B8BD:000000083F8800883F8820083F8804087FE800003EF802803EF820803EF80000 +B8BE:000000083F8800883F8820083F8804087FE800003EFC02483E4820483EFC0000 +B8BF:000000083F8800883F8820083F8804087FE800001F08017F1F1C10221F1C0000 +B8C0:000000083F8800883F8820083F8804087FE8000003F802080208020803F80000 +B8C1:000000083F8800883F8820083F8804087FE800000208020803F8020803F80000 +B8C2:000000083F8800883F8820083F8804087FE80000110811081F0811141F620000 +B8C3:000000083F8800883F8820083F8804087FE80000001000100010006801840000 +B8C4:000000083F8800883F8820083F8804087FE800000048004800A8011406620000 +B8C5:000000083F8800883F8820083F8804087FE80000000003F00408040803F00000 +B8C6:000000083F8800883F8820083F8804087FE8000003F80020002000D003080000 +B8C7:000000083F8800883F8820083F8804087FE80000004003F8004000A003180000 +B8C8:000000083F8800883F8820083F8804087FE8000003F8000803F8000800080000 +B8C9:000000083F8800883F8820083F8804087FE8000003F8020003F8020003F80000 +B8CA:000000083F8800883F8820083F8804087FE8000000000FF8022002200FF80000 +B8CB:000000083F8800883F8820083F8804087FE8000000800FF803E0041003E00000 +B8CC:000000001FF0001000101FF0100010001FF004400440044004407FFC00000000 +B8CD:00001FF000101FF010001FF0044004407FFC00001FF000100010001000100000 +B8CE:00001FF000101FF010001FF0044004407FFC000000003EF80208020802080000 +B8CF:00001FF000101FF010001FF0044004407FFC000000001E100210022802C40000 +B8D0:00001FF000101FF010001FF0044004407FFC000000001000100010001FF00000 +B8D1:00001FF000101FF010001FF0044004407FFC0000000020F8201020303ECC0000 +B8D2:00001FF000101FF010001FF0044004407FFC0000202021FC207020883E700000 +B8D3:00001FF000101FF010001FF0044004407FFC00001FF01000100010001FF00000 +B8D4:00001FF000101FF010001FF0044004407FFC00001FF000101FF010001FF00000 +B8D5:00001FF000101FF010001FF0044004407FFC00003EF802083E0820083E080000 +B8D6:00001FF000101FF010001FF0044004407FFC00003EF802883E8820883EF80000 +B8D7:00001FF000101FF010001FF0044004407FFC00003E8802883EF820883EF80000 +B8D8:00001FF000101FF010001FF0044004407FFC00003E1002103E1020283EC40000 +B8D9:00001FF000101FF010001FF0044004407FFC00003EF802803EF820803EF80000 +B8DA:00001FF000101FF010001FF0044004407FFC00003EFC02483E4820483EFC0000 +B8DB:00001FF000101FF010001FF0044004407FFC00003E2003FC3E7020883E700000 +B8DC:00001FF000101FF010001FF0044004407FFC00001FF01010101010101FF00000 +B8DD:00001FF000101FF010001FF0044004407FFC0000101010101FF010101FF00000 +B8DE:00001FF000101FF010001FF0044004407FFC0000222022203E2022503E880000 +B8DF:00001FF000101FF010001FF0044004407FFC000000000100010002800C400000 +B8E0:00001FF000101FF010001FF0044004407FFC00000000024002400DA033100000 +B8E1:00001FF000101FF010001FF0044004407FFC0000000007C00820082007C00000 +B8E2:00001FF000101FF010001FF0044004407FFC0000000007E00080014006200000 +B8E3:00001FF000101FF010001FF0044004407FFC0000008007E00080014006200000 +B8E4:00001FF000101FF010001FF0044004407FFC00001FF000101FF0001000100000 +B8E5:00001FF000101FF010001FF0044004407FFC00001FF010001FF010001FF00000 +B8E6:00001FF000101FF010001FF0044004407FFC000000001FF0044004401FF00000 +B8E7:00001FF000101FF010001FF0044004407FFC000001001FF007C0082007C00000 +B8E8:000000001FF0001000101FF0100010001FF000003FF801000100010001000000 +B8E9:00001FF000101FF010001FF000007FFC010001001FF000100010001000100000 +B8EA:00001FF000101FF010001FF000007FFC0100010000003EF80208020802080000 +B8EB:00001FF000101FF010001FF000007FFC0100010000001E100210022802C40000 +B8EC:00001FF000101FF010001FF0000000007FFC010001001100100010001FF00000 +B8ED:00001FF000101FF010001FF000007FFC01000100000020F8201020303ECC0000 +B8EE:00001FF000101FF010001FF000007FFC01000100202021FC207020883E700000 +B8EF:00001FF000101FF010001FF000007FFC010001001FF01000100010001FF00000 +B8F0:00001FF000101FF010001FF000007FFC010001001FF000101FF010001FF00000 +B8F1:00001FF000101FF010001FF000007FFC010001003EF802083E0820083E080000 +B8F2:00001FF000101FF010001FF000007FFC010001003EF802883E8820883EF80000 +B8F3:00001FF000101FF010001FF000007FFC010001003E8802883EF820883EF80000 +B8F4:00001FF000101FF010001FF000007FFC010001003E1002103E1020283EC40000 +B8F5:00001FF000101FF010001FF000007FFC010001003EF802803EF820803EF80000 +B8F6:00001FF000101FF010001FF000007FFC010001003EFC02483E4820483EFC0000 +B8F7:00001FF000101FF010001FF000007FFC010001003E2003FC3E7020883E700000 +B8F8:00001FF000101FF010001FF000007FFC010001001FF01010101010101FF00000 +B8F9:00001FF000101FF010001FF000007FFC01000100101010101FF010101FF00000 +B8FA:00001FF000101FF010001FF000007FFC01000100222022203E2022503E880000 +B8FB:00001FF000101FF010001FF000007FFC0100010000000100010002800C400000 +B8FC:00001FF000101FF010001FF000007FFC010001000000024002400DA033100000 +B8FD:00001FF000101FF010001FF000007FFC01000100000007C00820082007C00000 +B8FE:00001FF000101FF010001FF000007FFC01000100000007E00080014006200000 +B8FF:00001FF000101FF010001FF000007FFC01000100008007E00080014006200000 +B900:00001FF000101FF010001FF000007FFC010001001FF000101FF0001000100000 +B901:00001FF000101FF010001FF000007FFC010001001FF010001FF010001FF00000 +B902:00001FF000101FF010001FF000007FFC0100010000001FF0044004401FF00000 +B903:00001FF000101FF010001FF000007FFC0100010001001FF007C0082007C00000 +B904:000000083FC8004800483FC8200820083FC800087FE8040804F8040804080000 +B905:7F8800887F8840087F8800087FE8027802080000000007F80008000800080000 +B906:7F8800887F8840087F8800087FE802780208000000003EF80208020802080000 +B907:7F8800887F8840087F8800087FE802780208000000001F080108011401620000 +B908:7F8800887F8840087F88000800087FE80278020802081000100010001FF80000 +B909:7F8800887F8840087F8800087FE8027802080000000020F8201020303ECC0000 +B90A:7F8800887F8840087F8800087FE8027802080000202021FC207020883E700000 +B90B:7F8800887F8840087F8800087FE802780208000003F802000200020003F80000 +B90C:7F8800887F8840087F8800087FE802780208000007F8000807F8040007F80000 +B90D:7F8800887F8840087F8800087FE80278020800003EF802083E0820083E080000 +B90E:7F8800887F8840087F8800087FE80278020800003EF802883E8820883EF80000 +B90F:7F8800887F8840087F8800087FE80278020800003E8802883EF820883EF80000 +B910:7F8800887F8840087F8800087FE80278020800000F8800880F8808140FA20000 +B911:7F8800887F8840087F8800087FE80278020800003EF802803EF820803EF80000 +B912:7F8800887F8840087F8800087FE80278020800003EFC02483E4820483EFC0000 +B913:7F8800887F8840087F8800087FE80278020800003E1002FE3E3820443E380000 +B914:7F8800887F8840087F8800087FE802780208000003F802080208020803F80000 +B915:7F8800887F8840087F8800087FE80278020800000208020803F8020803F80000 +B916:7F8800887F8840087F8800087FE8027802080000210821083F0821143F620000 +B917:7F8800887F8840087F8800087FE8027802080000001000100010006801840000 +B918:7F8800887F8840087F8800087FE80278020800000048004800A8011406620000 +B919:7F8800887F8840087F8800087FE8027802080000000003F00408040803F00000 +B91A:7F8800887F8840087F8800087FE802780208000003F80020002000D003080000 +B91B:7F8800887F8840087F8800087FE8027802080000004003F8004000A003180000 +B91C:7F8800887F8840087F8800087FE802780208000003F8000803F8000800080000 +B91D:7F8800887F8840087F8800087FE802780208000003F8020003F8020003F80000 +B91E:7F8800887F8840087F8800087FE802780208000000000FF8022002200FF80000 +B91F:7F8800887F8840087F8800087FE802780208000000800FF803E0041003E00000 +B920:0000000A3FCA004A004A3FCA200A200A3FCA000A7FEA040A047A040A040A0000 +B921:7FA800A87FA840287FA800287FA805E804280000000007F80008000800080000 +B922:7FA800A87FA840287FA800287FA805E80428000000003EF80208020802080000 +B923:7FA800A87FA840287FA800287FA805E80428000000001F080108011401620000 +B924:7FA800A87FA840287FA8002800287FA8042805E804281428100010001FF80000 +B925:7FA800A87FA840287FA800287FA805E804280000000020F8201020303ECC0000 +B926:7FA800A87FA840287FA800287FA805E804280000202021FC207020883E700000 +B927:7FA800A87FA840287FA800287FA805E80428000003F802000200020003F80000 +B928:7FA800A87FA840287FA800287FA805E80428000007F8000807F8040007F80000 +B929:7FA800A87FA840287FA800287FA805E8042800003EF802083E0820083E080000 +B92A:7FA800A87FA840287FA800287FA805E8042800003EF802883E8820883EF80000 +B92B:7FA800A87FA840287FA800287FA805E8042800003E8802883EF820883EF80000 +B92C:7FA800A87FA840287FA800287FA805E8042800000F8800880F8808140FA20000 +B92D:7FA800A87FA840287FA800287FA805E8042800003EF802803EF820803EF80000 +B92E:7FA800A87FA840287FA800287FA805E8042800003EFC02483E4820483EFC0000 +B92F:7FA800A87FA840287FA800287FA805E8042800003E1002FE3E3820443E380000 +B930:7FA800A87FA840287FA800287FA805E80428000003F802080208020803F80000 +B931:7FA800A87FA840287FA800287FA805E8042800000208020803F8020803F80000 +B932:7FA800A87FA840287FA800287FA805E804280000210821083F0821143F620000 +B933:7FA800A87FA840287FA800287FA805E804280000001000100010006801840000 +B934:7FA800A87FA840287FA800287FA805E8042800000048004800A8011406620000 +B935:7FA800A87FA840287FA800287FA805E804280000000003F00408040803F00000 +B936:7FA800A87FA840287FA800287FA805E80428000003F80020002000D003080000 +B937:7FA800A87FA840287FA800287FA805E804280000004003F8004000A003180000 +B938:7FA800A87FA840287FA800287FA805E80428000003F8000803F8000800080000 +B939:7FA800A87FA840287FA800287FA805E80428000003F8020003F8020003F80000 +B93A:7FA800A87FA840287FA800287FA805E80428000000000FF8022002200FF80000 +B93B:7FA800A87FA840287FA800287FA805E80428000000800FF803E0041003E00000 +B93C:000000083FC8004800483FC8200820083FC800087FE804080408040804080000 +B93D:7F8800887F8840087F8800087FE8020802000000000007F80008000800080000 +B93E:7F8800887F8840087F8800087FE802080200000000003EF80208020802080000 +B93F:7F8800887F8840087F8800087FE802080200000000001F080108011401620000 +B940:7F8800887F8840087F88000800087FE80208020802081008100010001FF80000 +B941:7F8800887F8840087F8800087FE8020802000000000020F8201020303ECC0000 +B942:7F8800887F8840087F8800087FE8020802000000202021FC207020883E700000 +B943:7F8800887F8840087F8800087FE802080200000003F802000200020003F80000 +B944:7F8800887F8840087F8800087FE802080200000007F8000807F8040007F80000 +B945:7F8800887F8840087F8800087FE80208020000003EF802083E0820083E080000 +B946:7F8800887F8840087F8800087FE80208020000003EF802883E8820883EF80000 +B947:7F8800887F8840087F8800087FE80208020000003E8802883EF820883EF80000 +B948:7F8800887F8840087F8800087FE80208020000000F8800880F8808140FA20000 +B949:7F8800887F8840087F8800087FE80208020000003EF802803EF820803EF80000 +B94A:7F8800887F8840087F8800087FE80208020000003EFC02483E4820483EFC0000 +B94B:7F8800887F8840087F8800087FE80208020000003E1002FE3E3820443E380000 +B94C:7F8800887F8840087F8800087FE802080200000003F802080208020803F80000 +B94D:7F8800887F8840087F8800087FE80208020000000208020803F8020803F80000 +B94E:7F8800887F8840087F8800087FE8020802000000210821083F0821143F620000 +B94F:7F8800887F8840087F8800087FE8020802000000001000100010006801840000 +B950:7F8800887F8840087F8800087FE80208020000000048004800A8011406620000 +B951:7F8800887F8840087F8800087FE8020802000000000003F00408040803F00000 +B952:7F8800887F8840087F8800087FE802080200000003F80020002000D003080000 +B953:7F8800887F8840087F8800087FE8020802000000004003F8004000A003180000 +B954:7F8800887F8840087F8800087FE802080200000003F8000803F8000800080000 +B955:7F8800887F8840087F8800087FE802080200000003F8020003F8020003F80000 +B956:7F8800887F8840087F8800087FE802080200000000000FF8022002200FF80000 +B957:7F8800887F8840087F8800087FE802080200000000800FF803E0041003E00000 +B958:000000001FF0001000101FF0100010001FF000007FFC04400440044004400000 +B959:00001FF000101FF010001FF000007FFC044004401FF000100010001000100000 +B95A:00001FF000101FF010001FF000007FFC0440044000003EF80208020802080000 +B95B:00001FF000101FF010001FF000007FFC0440044000001E100210022802C40000 +B95C:00001FF000101FF010001FF0000000007FFC044004401440100010001FF00000 +B95D:00001FF000101FF010001FF000007FFC04400440000020F8201020303ECC0000 +B95E:00001FF000101FF010001FF000007FFC04400440202021FC207020883E700000 +B95F:00001FF000101FF010001FF000007FFC044004401FF01000100010001FF00000 +B960:00001FF000101FF010001FF000007FFC044004401FF000101FF010001FF00000 +B961:00001FF000101FF010001FF000007FFC044004403EF802083E0820083E080000 +B962:00001FF000101FF010001FF000007FFC044004403EF802883E8820883EF80000 +B963:00001FF000101FF010001FF000007FFC044004403E8802883EF820883EF80000 +B964:00001FF000101FF010001FF000007FFC044004403E1002103E1020283EC40000 +B965:00001FF000101FF010001FF000007FFC044004403EF802803EF820803EF80000 +B966:00001FF000101FF010001FF000007FFC044004403EFC02483E4820483EFC0000 +B967:00001FF000101FF010001FF000007FFC044004403E2003FC3E7020883E700000 +B968:00001FF000101FF010001FF000007FFC044004401FF01010101010101FF00000 +B969:00001FF000101FF010001FF000007FFC04400440101010101FF010101FF00000 +B96A:00001FF000101FF010001FF000007FFC04400440222022203E2022503E880000 +B96B:00001FF000101FF010001FF000007FFC0440044000000100010002800C400000 +B96C:00001FF000101FF010001FF000007FFC044004400000024002400DA033100000 +B96D:00001FF000101FF010001FF000007FFC04400440000007C00820082007C00000 +B96E:00001FF000101FF010001FF000007FFC04400440000007E00080014006200000 +B96F:00001FF000101FF010001FF000007FFC04400440008007E00080014006200000 +B970:00001FF000101FF010001FF000007FFC044004401FF000101FF0001000100000 +B971:00001FF000101FF010001FF000007FFC044004401FF010001FF010001FF00000 +B972:00001FF000101FF010001FF000007FFC0440044000001FF0044004401FF00000 +B973:00001FF000101FF010001FF000007FFC0440044001001FF007C0082007C00000 +B974:000000001FF0001000101FF0100010001FF0000000007FFC0000000000000000 +B975:00001FF000101FF010001FF0000000007FFC00001FF000100010001000100000 +B976:00001FF000101FF010001FF0000000007FFC000000003EF80208020802080000 +B977:00001FF000101FF010001FF0000000007FFC000000001E100210022802C40000 +B978:00001FF000101FF010001FF0000000007FFC000000001000100010001FF00000 +B979:00001FF000101FF010001FF0000000007FFC0000000020F8201020303ECC0000 +B97A:00001FF000101FF010001FF0000000007FFC0000202021FC207020883E700000 +B97B:00001FF000101FF010001FF0000000007FFC00001FF01000100010001FF00000 +B97C:00001FF000101FF010001FF0000000007FFC00001FF000101FF010001FF00000 +B97D:00001FF000101FF010001FF0000000007FFC00003EF802083E0820083E080000 +B97E:00001FF000101FF010001FF0000000007FFC00003EF802883E8820883EF80000 +B97F:00001FF000101FF010001FF0000000007FFC00003E8802883EF820883EF80000 +B980:00001FF000101FF010001FF0000000007FFC00003E1002103E1020283EC40000 +B981:00001FF000101FF010001FF0000000007FFC00003EF802803EF820803EF80000 +B982:00001FF000101FF010001FF0000000007FFC00003EFC02483E4820483EFC0000 +B983:00001FF000101FF010001FF0000000007FFC00003E2003FC3E7020883E700000 +B984:00001FF000101FF010001FF0000000007FFC00001FF01010101010101FF00000 +B985:00001FF000101FF010001FF0000000007FFC0000101010101FF010101FF00000 +B986:00001FF000101FF010001FF0000000007FFC0000222022203E2022503E880000 +B987:00001FF000101FF010001FF0000000007FFC000000000100010002800C400000 +B988:00001FF000101FF010001FF0000000007FFC00000000024002400DA033100000 +B989:00001FF000101FF010001FF0000000007FFC0000000007C00820082007C00000 +B98A:00001FF000101FF010001FF0000000007FFC0000000007E00080014006200000 +B98B:00001FF000101FF010001FF0000000007FFC0000008007E00080014006200000 +B98C:00001FF000101FF010001FF0000000007FFC00001FF000101FF0001000100000 +B98D:00001FF000101FF010001FF0000000007FFC00001FF010001FF010001FF00000 +B98E:00001FF000101FF010001FF0000000007FFC000000001FF0044004401FF00000 +B98F:00001FF000101FF010001FF0000000007FFC000001001FF007C0082007C00000 +B990:0000000800083F88008800883F88200820083F8800087FE80008000800080000 +B991:000000083F8800883F8820083F8800087FE8000007F800080008000800080000 +B992:000000083F8800883F8820083F8800087FE8000000003EF80208020802080000 +B993:000000083F8800883F8820083F8800087FE8000000001F080108011401620000 +B994:000000083F8800883F8820083F8800087FE8000008000800080008000FF80000 +B995:000000083F8800883F8820083F8800087FE80000000010F8101010301ECC0000 +B996:000000083F8800883F8820083F8800087FE800000808087F081C08220F9C0000 +B997:000000083F8800883F8820083F8800087FE8000003F802000200020003F80000 +B998:000000083F8800883F8820083F8800087FE8000007F8000807F8040007F80000 +B999:000000083F8800883F8820083F8800087FE800003EF802083E0820083E080000 +B99A:000000083F8800883F8820083F8800087FE800003EF802883E8820883EF80000 +B99B:000000083F8800883F8820083F8800087FE800003E8802883EF820883EF80000 +B99C:000000083F8800883F8820083F8800087FE800001F0801081F0810141F620000 +B99D:000000083F8800883F8820083F8800087FE800003EF802803EF820803EF80000 +B99E:000000083F8800883F8820083F8800087FE800003EFC02483E4820483EFC0000 +B99F:000000083F8800883F8820083F8800087FE800001F08017F1F1C10221F1C0000 +B9A0:000000083F8800883F8820083F8800087FE8000003F802080208020803F80000 +B9A1:000000083F8800883F8820083F8800087FE800000208020803F8020803F80000 +B9A2:000000083F8800883F8820083F8800087FE80000110811081F0811141F620000 +B9A3:000000083F8800883F8820083F8800087FE80000001000100010006801840000 +B9A4:000000083F8800883F8820083F8800087FE800000048004800A8011406620000 +B9A5:000000083F8800883F8820083F8800087FE80000000003F00408040803F00000 +B9A6:000000083F8800883F8820083F8800087FE8000003F80020002000D003080000 +B9A7:000000083F8800883F8820083F8800087FE80000004003F8004000A003180000 +B9A8:000000083F8800883F8820083F8800087FE8000003F8000803F8000800080000 +B9A9:000000083F8800883F8820083F8800087FE8000003F8020003F8020003F80000 +B9AA:000000083F8800883F8820083F8800087FE8000000000FF8022002200FF80000 +B9AB:000000083F8800883F8820083F8800087FE8000000800FF803E0041003E00000 +B9AC:00000000000800083F88008800883F882008200820083F880008000800080000 +B9AD:0000000800083F0801083F0820083F0800080000000007F80008000800080000 +B9AE:0000000800083F0801083F0820083F080008000000003EF80208020802080000 +B9AF:0000000800083F0801083F0820083F080008000000001F080108011401620000 +B9B0:0000000800083F0801083F0820083F080008000800001000100010001FF80000 +B9B1:0000000800083F0801083F0820083F0800080000000020F8201020303ECC0000 +B9B2:0000000800083F0801083F0820083F0800080000202021FC207020883E700000 +B9B3:0000000800083F0801083F0820083F080008000003F802000200020003F80000 +B9B4:0000000800083F0801083F0820083F080008000007F8000807F8040007F80000 +B9B5:0000000800083F0801083F0820083F08000800003EF802083E0820083E080000 +B9B6:0000000800083F0801083F0820083F08000800003EF802883E8820883EF80000 +B9B7:0000000800083F0801083F0820083F08000800003E8802883EF820883EF80000 +B9B8:0000000800083F0801083F0820083F08000800000F8800880F8808140FA20000 +B9B9:0000000800083F0801083F0820083F08000800003EF802803EF820803EF80000 +B9BA:0000000800083F0801083F0820083F08000800003EFC02483E4820483EFC0000 +B9BB:0000000800083F0801083F0820083F08000800003E1002FE3E3820443E380000 +B9BC:0000000800083F0801083F0820083F080008000003F802080208020803F80000 +B9BD:0000000800083F0801083F0820083F08000800000208020803F8020803F80000 +B9BE:0000000800083F0801083F0820083F0800080000210821083F0821143F620000 +B9BF:0000000800083F0801083F0820083F0800080000001000100010006801840000 +B9C0:0000000800083F0801083F0820083F08000800000048004800A8011406620000 +B9C1:0000000800083F0801083F0820083F0800080000000003F00408040803F00000 +B9C2:0000000800083F0801083F0820083F080008000003F80020002000D003080000 +B9C3:0000000800083F0801083F0820083F0800080000004003F8004000A003180000 +B9C4:0000000800083F0801083F0820083F080008000003F8000803F8000800080000 +B9C5:0000000800083F0801083F0820083F080008000003F8020003F8020003F80000 +B9C6:0000000800083F0801083F0820083F080008000000000FF8022002200FF80000 +B9C7:0000000800083F0801083F0820083F080008000000800FF803E0041003E00000 +B9C8:00000000001000107F9040904090409E4090409040907F900010001000100000 +B9C9:000000087E0842084208420E42087E080008000007F800080008000800080000 +B9CA:000000087E0842084208420E42087E080008000000003EF80208020802080000 +B9CB:000000087E0842084208420E42087E080008000000001F080108011401620000 +B9CC:000000087E0842084208420E42087E080008000808000800080008000FF80000 +B9CD:000000087E0842084208420E42087E0800080000000010F8101010301ECC0000 +B9CE:000000087E0842084208420E42087E08000800000808087F081C08220F9C0000 +B9CF:000000087E0842084208420E42087E080008000003F802000200020003F80000 +B9D0:000000087E0842084208420E42087E080008000007F8000807F8040007F80000 +B9D1:000000087E0842084208420E42087E08000800003EF802083E0820083E080000 +B9D2:000000087E0842084208420E42087E08000800003EF802883E8820883EF80000 +B9D3:000000087E0842084208420E42087E08000800003E8802883EF820883EF80000 +B9D4:000000087E0842084208420E42087E08000800001F0801081F0810141F620000 +B9D5:000000087E0842084208420E42087E08000800003EF802803EF820803EF80000 +B9D6:000000087E0842084208420E42087E08000800003EFC02483E4820483EFC0000 +B9D7:000000087E0842084208420E42087E08000800001F08017F1F1C10221F1C0000 +B9D8:000000087E0842084208420E42087E080008000003F802080208020803F80000 +B9D9:000000087E0842084208420E42087E08000800000208020803F8020803F80000 +B9DA:000000087E0842084208420E42087E0800080000110811081F0811141F620000 +B9DB:000000087E0842084208420E42087E0800080000001000100010006801840000 +B9DC:000000087E0842084208420E42087E08000800000048004800A8011406620000 +B9DD:000000087E0842084208420E42087E0800080000000003F00408040803F00000 +B9DE:000000087E0842084208420E42087E080008000003F80020002000D003080000 +B9DF:000000087E0842084208420E42087E0800080000004003F8004000A003180000 +B9E0:000000087E0842084208420E42087E080008000003F8000803F8000800080000 +B9E1:000000087E0842084208420E42087E080008000003F8020003F8020003F80000 +B9E2:000000087E0842084208420E42087E080008000000000FF8022002200FF80000 +B9E3:000000087E0842084208420E42087E080008000000800FF803E0041003E00000 +B9E4:00000000001200127F9240924092409E4092409240927F920012001200120000 +B9E5:000000287E2842284228423842287E280028000007F800080008000800080000 +B9E6:000000287E2842284228423842287E280028000000003EF80208020802080000 +B9E7:000000287E2842284228423842287E280028000000003E100210022802C40000 +B9E8:000000287E2842284228423842287E280028002808000800080008000FF80000 +B9E9:000000287E2842284228423842287E2800280000000020F8201020303ECC0000 +B9EA:000000287E2842284228423842287E2800280000202021FC207020883E700000 +B9EB:000000287E2842284228423842287E280028000003F802000200020003F80000 +B9EC:000000287E2842284228423842287E280028000007F8000807F8040007F80000 +B9ED:000000287E2842284228423842287E28002800003EF802083E0820083E080000 +B9EE:000000287E2842284228423842287E28002800003EF802883E8820883EF80000 +B9EF:000000287E2842284228423842287E28002800003E8802883EF820883EF80000 +B9F0:000000287E2842284228423842287E28002800001F0801081F0810141F620000 +B9F1:000000287E2842284228423842287E28002800003EF802803EF820803EF80000 +B9F2:000000287E2842284228423842287E28002800003EFC02483E4820483EFC0000 +B9F3:000000287E2842284228423842287E28002800003E1002FE3E3820443E380000 +B9F4:000000287E2842284228423842287E280028000003F802080208020803F80000 +B9F5:000000287E2842284228423842287E28002800000208020803F8020803F80000 +B9F6:000000287E2842284228423842287E2800280000110811081F0811141F620000 +B9F7:000000287E2842284228423842287E2800280000000800080008003400C20000 +B9F8:000000287E2842284228423842287E28002800000048004800A8011406620000 +B9F9:000000287E2842284228423842287E2800280000000001F00208020801F00000 +B9FA:000000287E2842284228423842287E280028000003F80020002000D003080000 +B9FB:000000287E2842284228423842287E2800280000004003F8004000A003180000 +B9FC:000000287E2842284228423842287E280028000003F8000803F8000800080000 +B9FD:000000287E2842284228423842287E280028000003F8020003F8020003F80000 +B9FE:000000287E2842284228423842287E280028000000000FF8022002200FF80000 +B9FF:000000287E2842284228423842287E280028000000800FF803E0041003E00000 +BA00:00000000001000107F904090409E40904090409E40907F900010001000100000 +BA01:000000087E084208420E4208420E7E080008000007F800080008000800080000 +BA02:000000087E084208420E4208420E7E080008000000003EF80208020802080000 +BA03:000000087E084208420E4208420E7E080008000000001F080108011401620000 +BA04:000000087E084208420E4208420E7E080008000008000800080008000FF80000 +BA05:000000087E084208420E4208420E7E0800080000000010F8101010301ECC0000 +BA06:000000087E084208420E4208420E7E08000800000808087F081C08220F9C0000 +BA07:000000087E084208420E4208420E7E080008000003F802000200020003F80000 +BA08:000000087E084208420E4208420E7E080008000007F8000807F8040007F80000 +BA09:000000087E084208420E4208420E7E08000800003EF802083E0820083E080000 +BA0A:000000087E084208420E4208420E7E08000800003EF802883E8820883EF80000 +BA0B:000000087E084208420E4208420E7E08000800003E8802883EF820883EF80000 +BA0C:000000087E084208420E4208420E7E08000800001F0801081F0810141F620000 +BA0D:000000087E084208420E4208420E7E08000800003EF802803EF820803EF80000 +BA0E:000000087E084208420E4208420E7E08000800003EFC02483E4820483EFC0000 +BA0F:000000087E084208420E4208420E7E08000800001F08017F1F1C10221F1C0000 +BA10:000000087E084208420E4208420E7E080008000003F802080208020803F80000 +BA11:000000087E084208420E4208420E7E08000800000208020803F8020803F80000 +BA12:000000087E084208420E4208420E7E0800080000110811081F0811141F620000 +BA13:000000087E084208420E4208420E7E0800080000001000100010006801840000 +BA14:000000087E084208420E4208420E7E08000800000048004800A8011406620000 +BA15:000000087E084208420E4208420E7E0800080000000003F00408040803F00000 +BA16:000000087E084208420E4208420E7E080008000003F80020002000D003080000 +BA17:000000087E084208420E4208420E7E0800080000004003F8004000A003180000 +BA18:000000087E084208420E4208420E7E080008000003F8000803F8000800080000 +BA19:000000087E084208420E4208420E7E080008000003F8020003F8020003F80000 +BA1A:000000087E084208420E4208420E7E080008000000000FF8022002200FF80000 +BA1B:000000087E084208420E4208420E7E080008000000800FF803E0041003E00000 +BA1C:00000000001200127F924092409E40924092409E40927F920012001200120000 +BA1D:000000287E2842284238422842387E280028000007F800080008000800080000 +BA1E:000000287E2842284238422842387E280028000000003EF80208020802080000 +BA1F:000000287E2842284238422842387E280028000000003E100210022802C40000 +BA20:000000287E2842284238422842387E280028002808000800080008000FF80000 +BA21:000000287E2842284238422842387E2800280000000020F8201020303ECC0000 +BA22:000000287E2842284238422842387E2800280000202021FC207020883E700000 +BA23:000000287E2842284238422842387E280028000003F802000200020003F80000 +BA24:000000287E2842284238422842387E280028000007F8000807F8040007F80000 +BA25:000000287E2842284238422842387E28002800003EF802083E0820083E080000 +BA26:000000287E2842284238422842387E28002800003EF802883E8820883EF80000 +BA27:000000287E2842284238422842387E28002800003E8802883EF820883EF80000 +BA28:000000287E2842284238422842387E28002800001F0801081F0810141F620000 +BA29:000000287E2842284238422842387E28002800003EF802803EF820803EF80000 +BA2A:000000287E2842284238422842387E28002800003EFC02483E4820483EFC0000 +BA2B:000000287E2842284238422842387E28002800003E1002FE3E3820443E380000 +BA2C:000000287E2842284238422842387E280028000003F802080208020803F80000 +BA2D:000000287E2842284238422842387E28002800000208020803F8020803F80000 +BA2E:000000287E2842284238422842387E2800280000110811081F0811141F620000 +BA2F:000000287E2842284238422842387E2800280000000800080008003400C20000 +BA30:000000287E2842284238422842387E28002800000048004800A8011406620000 +BA31:000000287E2842284238422842387E2800280000000001F00208020801F00000 +BA32:000000287E2842284238422842387E280028000003F80020002000D003080000 +BA33:000000287E2842284238422842387E2800280000004003F8004000A003180000 +BA34:000000287E2842284238422842387E280028000003F8000803F8000800080000 +BA35:000000287E2842284238422842387E280028000003F8020003F8020003F80000 +BA36:000000287E2842284238422842387E280028000000000FF8022002200FF80000 +BA37:000000287E2842284238422842387E280028000000800FF803E0041003E00000 +BA38:00000000000200027F8240824082409E4082408240827F820002000200020000 +BA39:000000087E0842084208423842087E0800080000000007F80008000800080000 +BA3A:000000087E0842084208423842087E080008000000003EF80208020802080000 +BA3B:000000087E0842084208423842087E080008000000001F080108011401620000 +BA3C:000000087E0842084208423842087E080008000000001000100010001FF80000 +BA3D:000000087E0842084208423842087E0800080000000020F8201020303ECC0000 +BA3E:000000087E0842084208423842087E0800080000202021FC207020883E700000 +BA3F:000000087E0842084208423842087E080008000003F802000200020003F80000 +BA40:000000087E0842084208423842087E080008000007F8000807F8040007F80000 +BA41:000000087E0842084208423842087E08000800003EF802083E0820083E080000 +BA42:000000087E0842084208423842087E08000800003EF802883E8820883EF80000 +BA43:000000087E0842084208423842087E08000800003E8802883EF820883EF80000 +BA44:000000087E0842084208423842087E08000800000F8800880F8808140FA20000 +BA45:000000087E0842084208423842087E08000800003EF802803EF820803EF80000 +BA46:000000087E0842084208423842087E08000800003EFC02483E4820483EFC0000 +BA47:000000087E0842084208423842087E08000800003E1002FE3E3820443E380000 +BA48:000000087E0842084208423842087E080008000003F802080208020803F80000 +BA49:000000087E0842084208423842087E08000800000208020803F8020803F80000 +BA4A:000000087E0842084208423842087E0800080000210821083F0821143F620000 +BA4B:000000087E0842084208423842087E0800080000001000100010006801840000 +BA4C:000000087E0842084208423842087E08000800000048004800A8011406620000 +BA4D:000000087E0842084208423842087E0800080000000003F00408040803F00000 +BA4E:000000087E0842084208423842087E080008000003F80020002000D003080000 +BA4F:000000087E0842084208423842087E0800080000004003F8004000A003180000 +BA50:000000087E0842084208423842087E080008000003F8000803F8000800080000 +BA51:000000087E0842084208423842087E080008000003F8020003F8020003F80000 +BA52:000000087E0842084208423842087E080008000000000FF8022002200FF80000 +BA53:000000087E0842084208423842087E080008000000800FF803E0041003E00000 +BA54:00000000000A000A7F8A408A408A40BA408A408A408A7F8A000A000A000A0000 +BA55:000000287E284228422842E842287E280028000007F800080008000800080000 +BA56:000000287E284228422842E842287E280028000000003EF80208020802080000 +BA57:000000287E284228422842E842287E280028000000003E100210022802C40000 +BA58:000000287E284228422842E842287E280028000008000800080008000FF80000 +BA59:000000287E284228422842E842287E2800280000000020F8201020303ECC0000 +BA5A:000000287E284228422842E842287E2800280000202021FC207020883E700000 +BA5B:000000287E284228422842E842287E280028000003F802000200020003F80000 +BA5C:000000287E284228422842E842287E280028000007F8000807F8040007F80000 +BA5D:000000287E284228422842E842287E28002800003EF802083E0820083E080000 +BA5E:000000287E284228422842E842287E28002800003EF802883E8820883EF80000 +BA5F:000000287E284228422842E842287E28002800003E8802883EF820883EF80000 +BA60:000000287E284228422842E842287E28002800001F0801081F0810141F620000 +BA61:000000287E284228422842E842287E28002800003EF802803EF820803EF80000 +BA62:000000287E284228422842E842287E28002800003EFC02483E4820483EFC0000 +BA63:000000287E284228422842E842287E28002800003E1002FE3E3820443E380000 +BA64:000000287E284228422842E842287E280028000003F802080208020803F80000 +BA65:000000287E284228422842E842287E28002800000208020803F8020803F80000 +BA66:000000287E284228422842E842287E2800280000110811081F0811141F620000 +BA67:000000287E284228422842E842287E2800280000000800080008003400C20000 +BA68:000000287E284228422842E842287E28002800000048004800A8011406620000 +BA69:000000287E284228422842E842287E2800280000000001F00208020801F00000 +BA6A:000000287E284228422842E842287E280028000003F80020002000D003080000 +BA6B:000000287E284228422842E842287E2800280000004003F8004000A003180000 +BA6C:000000287E284228422842E842287E280028000003F8000803F8000800080000 +BA6D:000000287E284228422842E842287E280028000003F8020003F8020003F80000 +BA6E:000000287E284228422842E842287E280028000000000FF8022002200FF80000 +BA6F:000000287E284228422842E842287E280028000000800FF803E0041003E00000 +BA70:00000000000200027F824082409E40824082409E40827F820002000200020000 +BA71:000000087E0842084238420842387E0800080000000007F80008000800080000 +BA72:000000087E0842084238420842387E080008000000003EF80208020802080000 +BA73:000000087E0842084238420842387E080008000000001F080108011401620000 +BA74:000000087E0842084238420842387E080008000800001000100010001FF80000 +BA75:000000087E0842084238420842387E0800080000000020F8201020303ECC0000 +BA76:000000087E0842084238420842387E0800080000202021FC207020883E700000 +BA77:000000087E0842084238420842387E080008000003F802000200020003F80000 +BA78:000000087E0842084238420842387E080008000007F8000807F8040007F80000 +BA79:000000087E0842084238420842387E08000800003EF802083E0820083E080000 +BA7A:000000087E0842084238420842387E08000800003EF802883E8820883EF80000 +BA7B:000000087E0842084238420842387E08000800003E8802883EF820883EF80000 +BA7C:000000087E0842084238420842387E08000800000F8800880F8808140FA20000 +BA7D:000000087E0842084238420842387E08000800003EF802803EF820803EF80000 +BA7E:000000087E0842084238420842387E08000800003EFC02483E4820483EFC0000 +BA7F:000000087E0842084238420842387E08000800003E1002FE3E3820443E380000 +BA80:000000087E0842084238420842387E080008000003F802080208020803F80000 +BA81:000000087E0842084238420842387E08000800000208020803F8020803F80000 +BA82:000000087E0842084238420842387E0800080000210821083F0821143F620000 +BA83:000000087E0842084238420842387E0800080000001000100010006801840000 +BA84:000000087E0842084238420842387E08000800000048004800A8011406620000 +BA85:000000087E0842084238420842387E0800080000000003F00408040803F00000 +BA86:000000087E0842084238420842387E080008000003F80020002000D003080000 +BA87:000000087E0842084238420842387E0800080000004003F8004000A003180000 +BA88:000000087E0842084238420842387E080008000003F8000803F8000800080000 +BA89:000000087E0842084238420842387E080008000003F8020003F8020003F80000 +BA8A:000000087E0842084238420842387E080008000000000FF8022002200FF80000 +BA8B:000000087E0842084238420842387E080008000000800FF803E0041003E00000 +BA8C:00000000000A000A7F8A408A40BA408A408A40BA408A7F8A000A000A000A0000 +BA8D:000000287E28422842E8422842E87E280028000007F800080008000800080000 +BA8E:000000287E28422842E8422842E87E280028000000003EF80208020802080000 +BA8F:000000287E28422842E8422842E87E280028000000003E100210022802C40000 +BA90:000000287E28422842E8422842E87E280028002808000800080008000FF80000 +BA91:000000287E28422842E8422842E87E2800280000000020F8201020303ECC0000 +BA92:000000287E28422842E8422842E87E2800280000202021FC207020883E700000 +BA93:000000287E28422842E8422842E87E280028000003F802000200020003F80000 +BA94:000000287E28422842E8422842E87E280028000007F8000807F8040007F80000 +BA95:000000287E28422842E8422842E87E28002800003EF802083E0820083E080000 +BA96:000000287E28422842E8422842E87E28002800003EF802883E8820883EF80000 +BA97:000000287E28422842E8422842E87E28002800003E8802883EF820883EF80000 +BA98:000000287E28422842E8422842E87E28002800001F0801081F0810141F620000 +BA99:000000287E28422842E8422842E87E28002800003EF802803EF820803EF80000 +BA9A:000000287E28422842E8422842E87E28002800003EFC02483E4820483EFC0000 +BA9B:000000287E28422842E8422842E87E28002800003E1002FE3E3820443E380000 +BA9C:000000287E28422842E8422842E87E280028000003F802080208020803F80000 +BA9D:000000287E28422842E8422842E87E28002800000208020803F8020803F80000 +BA9E:000000287E28422842E8422842E87E2800280000110811081F0811141F620000 +BA9F:000000287E28422842E8422842E87E2800280000000800080008003400C20000 +BAA0:000000287E28422842E8422842E87E28002800000048004800A8011406620000 +BAA1:000000287E28422842E8422842E87E2800280000000001F00208020801F00000 +BAA2:000000287E28422842E8422842E87E280028000003F80020002000D003080000 +BAA3:000000287E28422842E8422842E87E2800280000004003F8004000A003180000 +BAA4:000000287E28422842E8422842E87E280028000003F8000803F8000800080000 +BAA5:000000287E28422842E8422842E87E280028000003F8020003F8020003F80000 +BAA6:000000287E28422842E8422842E87E280028000000000FF8022002200FF80000 +BAA7:000000287E28422842E8422842E87E280028000000800FF803E0041003E00000 +BAA8:000000003FF820082008200820083FF8000000000100010001007FFC00000000 +BAA9:00001FF01010101010101FF0010001007FFC00001FF000100010001000100000 +BAAA:00001FF01010101010101FF0010001007FFC000000003EF80208020802080000 +BAAB:00001FF01010101010101FF0010001007FFC000000001E100210022802C40000 +BAAC:00001FF01010101010101FF0010001007FFC000000001000100010001FF00000 +BAAD:00001FF01010101010101FF0010001007FFC0000000020F8201020303ECC0000 +BAAE:00001FF01010101010101FF0010001007FFC0000202021FC207020883E700000 +BAAF:00001FF01010101010101FF0010001007FFC00001FF01000100010001FF00000 +BAB0:00001FF01010101010101FF0010001007FFC00001FF000101FF010001FF00000 +BAB1:00001FF01010101010101FF0010001007FFC00003EF802083E0820083E080000 +BAB2:00001FF01010101010101FF0010001007FFC00003EF802883E8820883EF80000 +BAB3:00001FF01010101010101FF0010001007FFC00003E8802883EF820883EF80000 +BAB4:00001FF01010101010101FF0010001007FFC00003E1002103E1020283EC40000 +BAB5:00001FF01010101010101FF0010001007FFC00003EF802803EF820803EF80000 +BAB6:00001FF01010101010101FF0010001007FFC00003EFC02483E4820483EFC0000 +BAB7:00001FF01010101010101FF0010001007FFC00003E2003FC3E7020883E700000 +BAB8:00001FF01010101010101FF0010001007FFC00001FF01010101010101FF00000 +BAB9:00001FF01010101010101FF0010001007FFC0000101010101FF010101FF00000 +BABA:00001FF01010101010101FF0010001007FFC0000222022203E2022503E880000 +BABB:00001FF01010101010101FF0010001007FFC000000000100010002800C400000 +BABC:00001FF01010101010101FF0010001007FFC00000000024002400DA033100000 +BABD:00001FF01010101010101FF0010001007FFC0000000007C00820082007C00000 +BABE:00001FF01010101010101FF0010001007FFC0000000007E00080014006200000 +BABF:00001FF01010101010101FF0010001007FFC0000008007E00080014006200000 +BAC0:00001FF01010101010101FF0010001007FFC00001FF000101FF0001000100000 +BAC1:00001FF01010101010101FF0010001007FFC00001FF010001FF010001FF00000 +BAC2:00001FF01010101010101FF0010001007FFC000000001FF0044004401FF00000 +BAC3:00001FF01010101010101FF0010001007FFC000001001FF007C0082007C00000 +BAC4:0000001000103F90209020902090209E20903F90041004107FD0001000100000 +BAC5:000000083F882088208E20883F8804087FE8000007F800080008000800080000 +BAC6:000000083F882088208E20883F8804087FE8000000003EF80208020802080000 +BAC7:000000083F882088208E20883F8804087FE8000000001F080108011401620000 +BAC8:000000083F882088208E20883F8804087FE8000008000800080008000FF80000 +BAC9:000000083F882088208E20883F8804087FE80000000010F8101010301ECC0000 +BACA:000000083F882088208E20883F8804087FE800000808087F081C08220F9C0000 +BACB:000000083F882088208E20883F8804087FE8000003F802000200020003F80000 +BACC:000000083F882088208E20883F8804087FE8000007F8000807F8040007F80000 +BACD:000000083F882088208E20883F8804087FE800003EF802083E0820083E080000 +BACE:000000083F882088208E20883F8804087FE800003EF802883E8820883EF80000 +BACF:000000083F882088208E20883F8804087FE800003E8802883EF820883EF80000 +BAD0:000000083F882088208E20883F8804087FE800001F0801081F0810141F620000 +BAD1:000000083F882088208E20883F8804087FE800003EF802803EF820803EF80000 +BAD2:000000083F882088208E20883F8804087FE800003EFC02483E4820483EFC0000 +BAD3:000000083F882088208E20883F8804087FE800001F08017F1F1C10221F1C0000 +BAD4:000000083F882088208E20883F8804087FE8000003F802080208020803F80000 +BAD5:000000083F882088208E20883F8804087FE800000208020803F8020803F80000 +BAD6:000000083F882088208E20883F8804087FE80000110811081F0811141F620000 +BAD7:000000083F882088208E20883F8804087FE80000001000100010006801840000 +BAD8:000000083F882088208E20883F8804087FE800000048004800A8011406620000 +BAD9:000000083F882088208E20883F8804087FE80000000003F00408040803F00000 +BADA:000000083F882088208E20883F8804087FE8000003F80020002000D003080000 +BADB:000000083F882088208E20883F8804087FE80000004003F8004000A003180000 +BADC:000000083F882088208E20883F8804087FE8000003F8000803F8000800080000 +BADD:000000083F882088208E20883F8804087FE8000003F8020003F8020003F80000 +BADE:000000083F882088208E20883F8804087FE8000000000FF8022002200FF80000 +BADF:000000083F882088208E20883F8804087FE8000000800FF803E0041003E00000 +BAE0:0000001200123F92209220922092209E20923F92041204127FD2001200120000 +BAE1:000000283FA820A820B820A83FA804287FA8000007F800080008000800080000 +BAE2:000000283FA820A820B820A83FA804287FA8000000003EF80208020802080000 +BAE3:000000283FA820A820B820A83FA804287FA8000000001F080108011401620000 +BAE4:000000283FA820A820B820A83FA804287FA8000008000800080008000FF80000 +BAE5:000000283FA820A820B820A83FA804287FA80000000010F8101010301ECC0000 +BAE6:000000283FA820A820B820A83FA804287FA800000808087F081C08220F9C0000 +BAE7:000000283FA820A820B820A83FA804287FA8000003F802000200020003F80000 +BAE8:000000283FA820A820B820A83FA804287FA8000007F8000807F8040007F80000 +BAE9:000000283FA820A820B820A83FA804287FA800003EF802083E0820083E080000 +BAEA:000000283FA820A820B820A83FA804287FA800003EF802883E8820883EF80000 +BAEB:000000283FA820A820B820A83FA804287FA800003E8802883EF820883EF80000 +BAEC:000000283FA820A820B820A83FA804287FA800001F0801081F0810141F620000 +BAED:000000283FA820A820B820A83FA804287FA800003EF802803EF820803EF80000 +BAEE:000000283FA820A820B820A83FA804287FA800003EFC02483E4820483EFC0000 +BAEF:000000283FA820A820B820A83FA804287FA800001F08017F1F1C10221F1C0000 +BAF0:000000283FA820A820B820A83FA804287FA8000003F802080208020803F80000 +BAF1:000000283FA820A820B820A83FA804287FA800000208020803F8020803F80000 +BAF2:000000283FA820A820B820A83FA804287FA80000110811081F0811141F620000 +BAF3:000000283FA820A820B820A83FA804287FA80000001000100010006801840000 +BAF4:000000283FA820A820B820A83FA804287FA800000048004800A8011406620000 +BAF5:000000283FA820A820B820A83FA804287FA80000000003F00408040803F00000 +BAF6:000000283FA820A820B820A83FA804287FA8000003F80020002000D003080000 +BAF7:000000283FA820A820B820A83FA804287FA80000004003F8004000A003180000 +BAF8:000000283FA820A820B820A83FA804287FA8000003F8000803F8000800080000 +BAF9:000000283FA820A820B820A83FA804287FA8000003F8020003F8020003F80000 +BAFA:000000283FA820A820B820A83FA804287FA8000000000FF8022002200FF80000 +BAFB:000000283FA820A820B820A83FA804287FA8000000800FF803E0041003E00000 +BAFC:0000000800083F88208820882088208820883F88040804087FE8000800080000 +BAFD:000000083F882088208820883F8804087FE8000007F800080008000800080000 +BAFE:000000083F882088208820883F8804087FE8000000003EF80208020802080000 +BAFF:000000083F882088208820883F8804087FE8000000001F080108011401620000 +BB00:000000083F882088208820883F8804087FE8000008000800080008000FF80000 +BB01:000000083F882088208820883F8804087FE80000000010F8101010301ECC0000 +BB02:000000083F882088208820883F8804087FE800000808087F081C08220F9C0000 +BB03:000000083F882088208820883F8804087FE8000003F802000200020003F80000 +BB04:000000083F882088208820883F8804087FE8000007F8000807F8040007F80000 +BB05:000000083F882088208820883F8804087FE800003EF802083E0820083E080000 +BB06:000000083F882088208820883F8804087FE800003EF802883E8820883EF80000 +BB07:000000083F882088208820883F8804087FE800003E8802883EF820883EF80000 +BB08:000000083F882088208820883F8804087FE800001F0801081F0810141F620000 +BB09:000000083F882088208820883F8804087FE800003EF802803EF820803EF80000 +BB0A:000000083F882088208820883F8804087FE800003EFC02483E4820483EFC0000 +BB0B:000000083F882088208820883F8804087FE800001F08017F1F1C10221F1C0000 +BB0C:000000083F882088208820883F8804087FE8000003F802080208020803F80000 +BB0D:000000083F882088208820883F8804087FE800000208020803F8020803F80000 +BB0E:000000083F882088208820883F8804087FE80000110811081F0811141F620000 +BB0F:000000083F882088208820883F8804087FE80000001000100010006801840000 +BB10:000000083F882088208820883F8804087FE800000048004800A8011406620000 +BB11:000000083F882088208820883F8804087FE80000000003F00408040803F00000 +BB12:000000083F882088208820883F8804087FE8000003F80020002000D003080000 +BB13:000000083F882088208820883F8804087FE80000004003F8004000A003180000 +BB14:000000083F882088208820883F8804087FE8000003F8000803F8000800080000 +BB15:000000083F882088208820883F8804087FE8000003F8020003F8020003F80000 +BB16:000000083F882088208820883F8804087FE8000000000FF8022002200FF80000 +BB17:000000083F882088208820883F8804087FE8000000800FF803E0041003E00000 +BB18:000000003FF820082008200820083FF8000004400440044004407FFC00000000 +BB19:00001FF01010101010101FF0044004407FFC00001FF000100010001000100000 +BB1A:00001FF01010101010101FF0044004407FFC000000003EF80208020802080000 +BB1B:00001FF01010101010101FF0044004407FFC000000001E100210022802C40000 +BB1C:00001FF01010101010101FF0044004407FFC000000001000100010001FF00000 +BB1D:00001FF01010101010101FF0044004407FFC0000000020F8201020303ECC0000 +BB1E:00001FF01010101010101FF0044004407FFC0000202021FC207020883E700000 +BB1F:00001FF01010101010101FF0044004407FFC00001FF01000100010001FF00000 +BB20:00001FF01010101010101FF0044004407FFC00001FF000101FF010001FF00000 +BB21:00001FF01010101010101FF0044004407FFC00003EF802083E0820083E080000 +BB22:00001FF01010101010101FF0044004407FFC00003EF802883E8820883EF80000 +BB23:00001FF01010101010101FF0044004407FFC00003E8802883EF820883EF80000 +BB24:00001FF01010101010101FF0044004407FFC00003E1002103E1020283EC40000 +BB25:00001FF01010101010101FF0044004407FFC00003EF802803EF820803EF80000 +BB26:00001FF01010101010101FF0044004407FFC00003EFC02483E4820483EFC0000 +BB27:00001FF01010101010101FF0044004407FFC00003E2003FC3E7020883E700000 +BB28:00001FF01010101010101FF0044004407FFC00001FF01010101010101FF00000 +BB29:00001FF01010101010101FF0044004407FFC0000101010101FF010101FF00000 +BB2A:00001FF01010101010101FF0044004407FFC0000222022203E2022503E880000 +BB2B:00001FF01010101010101FF0044004407FFC000000000100010002800C400000 +BB2C:00001FF01010101010101FF0044004407FFC00000000024002400DA033100000 +BB2D:00001FF01010101010101FF0044004407FFC0000000007C00820082007C00000 +BB2E:00001FF01010101010101FF0044004407FFC0000000007E00080014006200000 +BB2F:00001FF01010101010101FF0044004407FFC0000008007E00080014006200000 +BB30:00001FF01010101010101FF0044004407FFC00001FF000101FF0001000100000 +BB31:00001FF01010101010101FF0044004407FFC00001FF010001FF010001FF00000 +BB32:00001FF01010101010101FF0044004407FFC000000001FF0044004401FF00000 +BB33:00001FF01010101010101FF0044004407FFC000001001FF007C0082007C00000 +BB34:000000003FF8200820082008200820083FF800003FF801000100010001000000 +BB35:00001FF01010101010101FF000007FFC010001001FF000100010001000100000 +BB36:00001FF01010101010101FF000007FFC0100010000003EF80208020802080000 +BB37:00001FF01010101010101FF000007FFC0100010000001E100210022802C40000 +BB38:00001FF01010101010101FF0000000007FFC010001001100100010001FF00000 +BB39:00001FF01010101010101FF000007FFC01000100000020F8201020303ECC0000 +BB3A:00001FF01010101010101FF000007FFC01000100202021FC207020883E700000 +BB3B:00001FF01010101010101FF000007FFC010001001FF01000100010001FF00000 +BB3C:00001FF01010101010101FF000007FFC010001001FF000101FF010001FF00000 +BB3D:00001FF01010101010101FF000007FFC010001003EF802083E0820083E080000 +BB3E:00001FF01010101010101FF000007FFC010001003EF802883E8820883EF80000 +BB3F:00001FF01010101010101FF000007FFC010001003E8802883EF820883EF80000 +BB40:00001FF01010101010101FF000007FFC010001003E1002103E1020283EC40000 +BB41:00001FF01010101010101FF000007FFC010001003EF802803EF820803EF80000 +BB42:00001FF01010101010101FF000007FFC010001003EFC02483E4820483EFC0000 +BB43:00001FF01010101010101FF000007FFC010001003E2003FC3E7020883E700000 +BB44:00001FF01010101010101FF000007FFC010001001FF01010101010101FF00000 +BB45:00001FF01010101010101FF000007FFC01000100101010101FF010101FF00000 +BB46:00001FF01010101010101FF000007FFC01000100222022203E2022503E880000 +BB47:00001FF01010101010101FF000007FFC0100010000000100010002800C400000 +BB48:00001FF01010101010101FF000007FFC010001000000024002400DA033100000 +BB49:00001FF01010101010101FF000007FFC01000100000007C00820082007C00000 +BB4A:00001FF01010101010101FF000007FFC01000100000007E00080014006200000 +BB4B:00001FF01010101010101FF000007FFC01000100008007E00080014006200000 +BB4C:00001FF01010101010101FF000007FFC010001001FF000101FF0001000100000 +BB4D:00001FF01010101010101FF000007FFC010001001FF010001FF010001FF00000 +BB4E:00001FF01010101010101FF000007FFC0100010000001FF0044004401FF00000 +BB4F:00001FF01010101010101FF000007FFC0100010001001FF007C0082007C00000 +BB50:000000083FC8204820482048204820483FC800087FE8040804F8040804080000 +BB51:00083F88208820883F8800087FE8027802080000000007F80008000800080000 +BB52:00083F88208820883F8800087FE802780208000000003EF80208020802080000 +BB53:00083F88208820883F8800087FE802780208000000001F080108011401620000 +BB54:00083F88208820883F88000800087FE80278020802081000100010001FF80000 +BB55:00083F88208820883F8800087FE8027802080000000020F8201020303ECC0000 +BB56:00083F88208820883F8800087FE8027802080000202021FC207020883E700000 +BB57:00083F88208820883F8800087FE802780208000003F802000200020003F80000 +BB58:00083F88208820883F8800087FE802780208000007F8000807F8040007F80000 +BB59:00083F88208820883F8800087FE80278020800003EF802083E0820083E080000 +BB5A:00083F88208820883F8800087FE80278020800003EF802883E8820883EF80000 +BB5B:00083F88208820883F8800087FE80278020800003E8802883EF820883EF80000 +BB5C:00083F88208820883F8800087FE80278020800000F8800880F8808140FA20000 +BB5D:00083F88208820883F8800087FE80278020800003EF802803EF820803EF80000 +BB5E:00083F88208820883F8800087FE80278020800003EFC02483E4820483EFC0000 +BB5F:00083F88208820883F8800087FE80278020800003E1002FE3E3820443E380000 +BB60:00083F88208820883F8800087FE802780208000003F802080208020803F80000 +BB61:00083F88208820883F8800087FE80278020800000208020803F8020803F80000 +BB62:00083F88208820883F8800087FE8027802080000210821083F0821143F620000 +BB63:00083F88208820883F8800087FE8027802080000001000100010006801840000 +BB64:00083F88208820883F8800087FE80278020800000048004800A8011406620000 +BB65:00083F88208820883F8800087FE8027802080000000003F00408040803F00000 +BB66:00083F88208820883F8800087FE802780208000003F80020002000D003080000 +BB67:00083F88208820883F8800087FE8027802080000004003F8004000A003180000 +BB68:00083F88208820883F8800087FE802780208000003F8000803F8000800080000 +BB69:00083F88208820883F8800087FE802780208000003F8020003F8020003F80000 +BB6A:00083F88208820883F8800087FE802780208000000000FF8022002200FF80000 +BB6B:00083F88208820883F8800087FE802780208000000800FF803E0041003E00000 +BB6C:0000000A3FCA204A204A204A204A204A3FCA000A7FEA040A047A040A040A0000 +BB6D:00283FA820A820A83FA800287FA805E804280000000007F80008000800080000 +BB6E:00283FA820A820A83FA800287FA805E80428000000003EF80208020802080000 +BB6F:00283FA820A820A83FA800287FA805E80428000000001F080108011401620000 +BB70:00283FA820A820A83FA8002800287FA8042805E804281428100010001FF80000 +BB71:00283FA820A820A83FA800287FA805E804280000000020F8201020303ECC0000 +BB72:00283FA820A820A83FA800287FA805E804280000202021FC207020883E700000 +BB73:00283FA820A820A83FA800287FA805E80428000003F802000200020003F80000 +BB74:00283FA820A820A83FA800287FA805E80428000007F8000807F8040007F80000 +BB75:00283FA820A820A83FA800287FA805E8042800003EF802083E0820083E080000 +BB76:00283FA820A820A83FA800287FA805E8042800003EF802883E8820883EF80000 +BB77:00283FA820A820A83FA800287FA805E8042800003E8802883EF820883EF80000 +BB78:00283FA820A820A83FA800287FA805E8042800000F8800880F8808140FA20000 +BB79:00283FA820A820A83FA800287FA805E8042800003EF802803EF820803EF80000 +BB7A:00283FA820A820A83FA800287FA805E8042800003EFC02483E4820483EFC0000 +BB7B:00283FA820A820A83FA800287FA805E8042800003E1002FE3E3820443E380000 +BB7C:00283FA820A820A83FA800287FA805E80428000003F802080208020803F80000 +BB7D:00283FA820A820A83FA800287FA805E8042800000208020803F8020803F80000 +BB7E:00283FA820A820A83FA800287FA805E804280000210821083F0821143F620000 +BB7F:00283FA820A820A83FA800287FA805E804280000001000100010006801840000 +BB80:00283FA820A820A83FA800287FA805E8042800000048004800A8011406620000 +BB81:00283FA820A820A83FA800287FA805E804280000000003F00408040803F00000 +BB82:00283FA820A820A83FA800287FA805E80428000003F80020002000D003080000 +BB83:00283FA820A820A83FA800287FA805E804280000004003F8004000A003180000 +BB84:00283FA820A820A83FA800287FA805E80428000003F8000803F8000800080000 +BB85:00283FA820A820A83FA800287FA805E80428000003F8020003F8020003F80000 +BB86:00283FA820A820A83FA800287FA805E80428000000000FF8022002200FF80000 +BB87:00283FA820A820A83FA800287FA805E80428000000800FF803E0041003E00000 +BB88:000000083FC8204820482048204820483FC800087FE804080408040804080000 +BB89:00083F88208820883F8800087FE8020802000000000007F80008000800080000 +BB8A:00083F88208820883F8800087FE802080200000000003EF80208020802080000 +BB8B:00083F88208820883F8800087FE802080200000000001F080108011401620000 +BB8C:00083F88208820883F88000800087FE80208020802081008100010001FF80000 +BB8D:00083F88208820883F8800087FE8020802000000000020F8201020303ECC0000 +BB8E:00083F88208820883F8800087FE8020802000000202021FC207020883E700000 +BB8F:00083F88208820883F8800087FE802080200000003F802000200020003F80000 +BB90:00083F88208820883F8800087FE802080200000007F8000807F8040007F80000 +BB91:00083F88208820883F8800087FE80208020000003EF802083E0820083E080000 +BB92:00083F88208820883F8800087FE80208020000003EF802883E8820883EF80000 +BB93:00083F88208820883F8800087FE80208020000003E8802883EF820883EF80000 +BB94:00083F88208820883F8800087FE80208020000000F8800880F8808140FA20000 +BB95:00083F88208820883F8800087FE80208020000003EF802803EF820803EF80000 +BB96:00083F88208820883F8800087FE80208020000003EFC02483E4820483EFC0000 +BB97:00083F88208820883F8800087FE80208020000003E1002FE3E3820443E380000 +BB98:00083F88208820883F8800087FE802080200000003F802080208020803F80000 +BB99:00083F88208820883F8800087FE80208020000000208020803F8020803F80000 +BB9A:00083F88208820883F8800087FE8020802000000210821083F0821143F620000 +BB9B:00083F88208820883F8800087FE8020802000000001000100010006801840000 +BB9C:00083F88208820883F8800087FE80208020000000048004800A8011406620000 +BB9D:00083F88208820883F8800087FE8020802000000000003F00408040803F00000 +BB9E:00083F88208820883F8800087FE802080200000003F80020002000D003080000 +BB9F:00083F88208820883F8800087FE8020802000000004003F8004000A003180000 +BBA0:00083F88208820883F8800087FE802080200000003F8000803F8000800080000 +BBA1:00083F88208820883F8800087FE802080200000003F8020003F8020003F80000 +BBA2:00083F88208820883F8800087FE802080200000000000FF8022002200FF80000 +BBA3:00083F88208820883F8800087FE802080200000000800FF803E0041003E00000 +BBA4:000000003FF8200820082008200820083FF800007FFC04400440044004400000 +BBA5:00001FF01010101010101FF000007FFC044004401FF000100010001000100000 +BBA6:00001FF01010101010101FF000007FFC0440044000003EF80208020802080000 +BBA7:00001FF01010101010101FF000007FFC0440044000001E100210022802C40000 +BBA8:00001FF01010101010101FF0000000007FFC044004401440100010001FF00000 +BBA9:00001FF01010101010101FF000007FFC04400440000020F8201020303ECC0000 +BBAA:00001FF01010101010101FF000007FFC04400440202021FC207020883E700000 +BBAB:00001FF01010101010101FF000007FFC044004401FF01000100010001FF00000 +BBAC:00001FF01010101010101FF000007FFC044004401FF000101FF010001FF00000 +BBAD:00001FF01010101010101FF000007FFC044004403EF802083E0820083E080000 +BBAE:00001FF01010101010101FF000007FFC044004403EF802883E8820883EF80000 +BBAF:00001FF01010101010101FF000007FFC044004403E8802883EF820883EF80000 +BBB0:00001FF01010101010101FF000007FFC044004403E1002103E1020283EC40000 +BBB1:00001FF01010101010101FF000007FFC044004403EF802803EF820803EF80000 +BBB2:00001FF01010101010101FF000007FFC044004403EFC02483E4820483EFC0000 +BBB3:00001FF01010101010101FF000007FFC044004403E2003FC3E7020883E700000 +BBB4:00001FF01010101010101FF000007FFC044004401FF01010101010101FF00000 +BBB5:00001FF01010101010101FF000007FFC04400440101010101FF010101FF00000 +BBB6:00001FF01010101010101FF000007FFC04400440222022203E2022503E880000 +BBB7:00001FF01010101010101FF000007FFC0440044000000100010002800C400000 +BBB8:00001FF01010101010101FF000007FFC044004400000024002400DA033100000 +BBB9:00001FF01010101010101FF000007FFC04400440000007C00820082007C00000 +BBBA:00001FF01010101010101FF000007FFC04400440000007E00080014006200000 +BBBB:00001FF01010101010101FF000007FFC04400440008007E00080014006200000 +BBBC:00001FF01010101010101FF000007FFC044004401FF000101FF0001000100000 +BBBD:00001FF01010101010101FF000007FFC044004401FF010001FF010001FF00000 +BBBE:00001FF01010101010101FF000007FFC0440044000001FF0044004401FF00000 +BBBF:00001FF01010101010101FF000007FFC0440044001001FF007C0082007C00000 +BBC0:000000003FF820082008200820083FF80000000000007FFC0000000000000000 +BBC1:00001FF01010101010101FF0000000007FFC00001FF000100010001000100000 +BBC2:00001FF01010101010101FF0000000007FFC000000003EF80208020802080000 +BBC3:00001FF01010101010101FF0000000007FFC000000001E100210022802C40000 +BBC4:00001FF01010101010101FF0000000007FFC000000001000100010001FF00000 +BBC5:00001FF01010101010101FF0000000007FFC0000000020F8201020303ECC0000 +BBC6:00001FF01010101010101FF0000000007FFC0000202021FC207020883E700000 +BBC7:00001FF01010101010101FF0000000007FFC00001FF01000100010001FF00000 +BBC8:00001FF01010101010101FF0000000007FFC00001FF000101FF010001FF00000 +BBC9:00001FF01010101010101FF0000000007FFC00003EF802083E0820083E080000 +BBCA:00001FF01010101010101FF0000000007FFC00003EF802883E8820883EF80000 +BBCB:00001FF01010101010101FF0000000007FFC00003E8802883EF820883EF80000 +BBCC:00001FF01010101010101FF0000000007FFC00003E1002103E1020283EC40000 +BBCD:00001FF01010101010101FF0000000007FFC00003EF802803EF820803EF80000 +BBCE:00001FF01010101010101FF0000000007FFC00003EFC02483E4820483EFC0000 +BBCF:00001FF01010101010101FF0000000007FFC00003E2003FC3E7020883E700000 +BBD0:00001FF01010101010101FF0000000007FFC00001FF01010101010101FF00000 +BBD1:00001FF01010101010101FF0000000007FFC0000101010101FF010101FF00000 +BBD2:00001FF01010101010101FF0000000007FFC0000222022203E2022503E880000 +BBD3:00001FF01010101010101FF0000000007FFC000000000100010002800C400000 +BBD4:00001FF01010101010101FF0000000007FFC00000000024002400DA033100000 +BBD5:00001FF01010101010101FF0000000007FFC0000000007C00820082007C00000 +BBD6:00001FF01010101010101FF0000000007FFC0000000007E00080014006200000 +BBD7:00001FF01010101010101FF0000000007FFC0000008007E00080014006200000 +BBD8:00001FF01010101010101FF0000000007FFC00001FF000101FF0001000100000 +BBD9:00001FF01010101010101FF0000000007FFC00001FF010001FF010001FF00000 +BBDA:00001FF01010101010101FF0000000007FFC000000001FF0044004401FF00000 +BBDB:00001FF01010101010101FF0000000007FFC000001001FF007C0082007C00000 +BBDC:0000000800083F88208820882088208820883F8800087FE80008000800080000 +BBDD:000000083F882088208820883F8800087FE8000007F800080008000800080000 +BBDE:000000083F882088208820883F8800087FE8000000003EF80208020802080000 +BBDF:000000083F882088208820883F8800087FE8000000001F080108011401620000 +BBE0:000000083F882088208820883F8800087FE8000008000800080008000FF80000 +BBE1:000000083F882088208820883F8800087FE80000000010F8101010301ECC0000 +BBE2:000000083F882088208820883F8800087FE800000808087F081C08220F9C0000 +BBE3:000000083F882088208820883F8800087FE8000003F802000200020003F80000 +BBE4:000000083F882088208820883F8800087FE8000007F8000807F8040007F80000 +BBE5:000000083F882088208820883F8800087FE800003EF802083E0820083E080000 +BBE6:000000083F882088208820883F8800087FE800003EF802883E8820883EF80000 +BBE7:000000083F882088208820883F8800087FE800003E8802883EF820883EF80000 +BBE8:000000083F882088208820883F8800087FE800001F0801081F0810141F620000 +BBE9:000000083F882088208820883F8800087FE800003EF802803EF820803EF80000 +BBEA:000000083F882088208820883F8800087FE800003EFC02483E4820483EFC0000 +BBEB:000000083F882088208820883F8800087FE800001F08017F1F1C10221F1C0000 +BBEC:000000083F882088208820883F8800087FE8000003F802080208020803F80000 +BBED:000000083F882088208820883F8800087FE800000208020803F8020803F80000 +BBEE:000000083F882088208820883F8800087FE80000110811081F0811141F620000 +BBEF:000000083F882088208820883F8800087FE80000001000100010006801840000 +BBF0:000000083F882088208820883F8800087FE800000048004800A8011406620000 +BBF1:000000083F882088208820883F8800087FE80000000003F00408040803F00000 +BBF2:000000083F882088208820883F8800087FE8000003F80020002000D003080000 +BBF3:000000083F882088208820883F8800087FE80000004003F8004000A003180000 +BBF4:000000083F882088208820883F8800087FE8000003F8000803F8000800080000 +BBF5:000000083F882088208820883F8800087FE8000003F8020003F8020003F80000 +BBF6:000000083F882088208820883F8800087FE8000000000FF8022002200FF80000 +BBF7:000000083F882088208820883F8800087FE8000000800FF803E0041003E00000 +BBF8:00000000000800087F884088408840884088408840887F880008000800080000 +BBF9:000000087E0842084208420842087E0800080000000007F80008000800080000 +BBFA:000000087E0842084208420842087E080008000000003EF80208020802080000 +BBFB:000000087E0842084208420842087E080008000000001F080108011401620000 +BBFC:000000087E0842084208420842087E080008000800001000100010001FF80000 +BBFD:000000087E0842084208420842087E0800080000000020F8201020303ECC0000 +BBFE:000000087E0842084208420842087E0800080000202021FC207020883E700000 +BBFF:000000087E0842084208420842087E080008000003F802000200020003F80000 +BC00:000000087E0842084208420842087E080008000007F8000807F8040007F80000 +BC01:000000087E0842084208420842087E08000800003EF802083E0820083E080000 +BC02:000000087E0842084208420842087E08000800003EF802883E8820883EF80000 +BC03:000000087E0842084208420842087E08000800003E8802883EF820883EF80000 +BC04:000000087E0842084208420842087E08000800000F8800880F8808140FA20000 +BC05:000000087E0842084208420842087E08000800003EF802803EF820803EF80000 +BC06:000000087E0842084208420842087E08000800003EFC02483E4820483EFC0000 +BC07:000000087E0842084208420842087E08000800003E1002FE3E3820443E380000 +BC08:000000087E0842084208420842087E080008000003F802080208020803F80000 +BC09:000000087E0842084208420842087E08000800000208020803F8020803F80000 +BC0A:000000087E0842084208420842087E0800080000210821083F0821143F620000 +BC0B:000000087E0842084208420842087E0800080000001000100010006801840000 +BC0C:000000087E0842084208420842087E08000800000048004800A8011406620000 +BC0D:000000087E0842084208420842087E0800080000000003F00408040803F00000 +BC0E:000000087E0842084208420842087E080008000003F80020002000D003080000 +BC0F:000000087E0842084208420842087E0800080000004003F8004000A003180000 +BC10:000000087E0842084208420842087E080008000003F8000803F8000800080000 +BC11:000000087E0842084208420842087E080008000003F8020003F8020003F80000 +BC12:000000087E0842084208420842087E080008000000000FF8022002200FF80000 +BC13:000000087E0842084208420842087E080008000000800FF803E0041003E00000 +BC14:00000000001000102090209020903F9E2090209020903F900010001000100000 +BC15:000000080008420842087E0E42087E080008000007F800080008000800080000 +BC16:000000080008420842087E0E42087E080008000000003EF80208020802080000 +BC17:000000080008420842087E0E42087E080008000000001F080108011401620000 +BC18:000000080008420842087E0E42087E080008000808000800080008000FF80000 +BC19:000000080008420842087E0E42087E0800080000000010F8101010301ECC0000 +BC1A:000000080008420842087E0E42087E08000800000808087F081C08220F9C0000 +BC1B:000000080008420842087E0E42087E080008000003F802000200020003F80000 +BC1C:000000080008420842087E0E42087E080008000007F8000807F8040007F80000 +BC1D:000000080008420842087E0E42087E08000800003EF802083E0820083E080000 +BC1E:000000080008420842087E0E42087E08000800003EF802883E8820883EF80000 +BC1F:000000080008420842087E0E42087E08000800003E8802883EF820883EF80000 +BC20:000000080008420842087E0E42087E08000800001F0801081F0810141F620000 +BC21:000000080008420842087E0E42087E08000800003EF802803EF820803EF80000 +BC22:000000080008420842087E0E42087E08000800003EFC02483E4820483EFC0000 +BC23:000000080008420842087E0E42087E08000800001F08017F1F1C10221F1C0000 +BC24:000000080008420842087E0E42087E080008000003F802080208020803F80000 +BC25:000000080008420842087E0E42087E08000800000208020803F8020803F80000 +BC26:000000080008420842087E0E42087E0800080000110811081F0811141F620000 +BC27:000000080008420842087E0E42087E0800080000001000100010006801840000 +BC28:000000080008420842087E0E42087E08000800000048004800A8011406620000 +BC29:000000080008420842087E0E42087E0800080000000003F00408040803F00000 +BC2A:000000080008420842087E0E42087E080008000003F80020002000D003080000 +BC2B:000000080008420842087E0E42087E0800080000004003F8004000A003180000 +BC2C:000000080008420842087E0E42087E080008000003F8000803F8000800080000 +BC2D:000000080008420842087E0E42087E080008000003F8020003F8020003F80000 +BC2E:000000080008420842087E0E42087E080008000000000FF8022002200FF80000 +BC2F:000000080008420842087E0E42087E080008000000800FF803E0041003E00000 +BC30:00000000001200122092209220923F9E2092209220923F920012001200120000 +BC31:000000280028422842287E3842287E280028000007F800080008000800080000 +BC32:000000280028422842287E3842287E280028000000003EF80208020802080000 +BC33:000000280028422842287E3842287E280028000000003E100210022802C40000 +BC34:000000280028422842287E3842287E280028002808000800080008000FF80000 +BC35:000000280028422842287E3842287E2800280000000020F8201020303ECC0000 +BC36:000000280028422842287E3842287E2800280000202021FC207020883E700000 +BC37:000000280028422842287E3842287E280028000003F802000200020003F80000 +BC38:000000280028422842287E3842287E280028000007F8000807F8040007F80000 +BC39:000000280028422842287E3842287E28002800003EF802083E0820083E080000 +BC3A:000000280028422842287E3842287E28002800003EF802883E8820883EF80000 +BC3B:000000280028422842287E3842287E28002800003E8802883EF820883EF80000 +BC3C:000000280028422842287E3842287E28002800001F0801081F0810141F620000 +BC3D:000000280028422842287E3842287E28002800003EF802803EF820803EF80000 +BC3E:000000280028422842287E3842287E28002800003EFC02483E4820483EFC0000 +BC3F:000000280028422842287E3842287E28002800003E1002FE3E3820443E380000 +BC40:000000280028422842287E3842287E280028000003F802080208020803F80000 +BC41:000000280028422842287E3842287E28002800000208020803F8020803F80000 +BC42:000000280028422842287E3842287E2800280000110811081F0811141F620000 +BC43:000000280028422842287E3842287E2800280000000800080008003400C20000 +BC44:000000280028422842287E3842287E28002800000048004800A8011406620000 +BC45:000000280028422842287E3842287E2800280000000001F00208020801F00000 +BC46:000000280028422842287E3842287E280028000003F80020002000D003080000 +BC47:000000280028422842287E3842287E2800280000004003F8004000A003180000 +BC48:000000280028422842287E3842287E280028000003F8000803F8000800080000 +BC49:000000280028422842287E3842287E280028000003F8020003F8020003F80000 +BC4A:000000280028422842287E3842287E280028000000000FF8022002200FF80000 +BC4B:000000280028422842287E3842287E280028000000800FF803E0041003E00000 +BC4C:000000000010001020902090209E3F902090209E20903F900010001000100000 +BC4D:0000000800084208420E7E08420E7E080008000007F800080008000800080000 +BC4E:0000000800084208420E7E08420E7E080008000000003EF80208020802080000 +BC4F:0000000800084208420E7E08420E7E080008000000001F080108011401620000 +BC50:0000000800084208420E7E08420E7E080008000008000800080008000FF80000 +BC51:0000000800084208420E7E08420E7E0800080000000010F8101010301ECC0000 +BC52:0000000800084208420E7E08420E7E08000800000808087F081C08220F9C0000 +BC53:0000000800084208420E7E08420E7E080008000003F802000200020003F80000 +BC54:0000000800084208420E7E08420E7E080008000007F8000807F8040007F80000 +BC55:0000000800084208420E7E08420E7E08000800003EF802083E0820083E080000 +BC56:0000000800084208420E7E08420E7E08000800003EF802883E8820883EF80000 +BC57:0000000800084208420E7E08420E7E08000800003E8802883EF820883EF80000 +BC58:0000000800084208420E7E08420E7E08000800001F0801081F0810141F620000 +BC59:0000000800084208420E7E08420E7E08000800003EF802803EF820803EF80000 +BC5A:0000000800084208420E7E08420E7E08000800003EFC02483E4820483EFC0000 +BC5B:0000000800084208420E7E08420E7E08000800001F08017F1F1C10221F1C0000 +BC5C:0000000800084208420E7E08420E7E080008000003F802080208020803F80000 +BC5D:0000000800084208420E7E08420E7E08000800000208020803F8020803F80000 +BC5E:0000000800084208420E7E08420E7E0800080000110811081F0811141F620000 +BC5F:0000000800084208420E7E08420E7E0800080000001000100010006801840000 +BC60:0000000800084208420E7E08420E7E08000800000048004800A8011406620000 +BC61:0000000800084208420E7E08420E7E0800080000000003F00408040803F00000 +BC62:0000000800084208420E7E08420E7E080008000003F80020002000D003080000 +BC63:0000000800084208420E7E08420E7E0800080000004003F8004000A003180000 +BC64:0000000800084208420E7E08420E7E080008000003F8000803F8000800080000 +BC65:0000000800084208420E7E08420E7E080008000003F8020003F8020003F80000 +BC66:0000000800084208420E7E08420E7E080008000000000FF8022002200FF80000 +BC67:0000000800084208420E7E08420E7E080008000000800FF803E0041003E00000 +BC68:000000000012001220922092209E3F922092209E20923F920012001200120000 +BC69:000000280028422842387E2842387E280028000007F800080008000800080000 +BC6A:000000280028422842387E2842387E280028000000003EF80208020802080000 +BC6B:000000280028422842387E2842387E280028000000003E100210022802C40000 +BC6C:000000280028422842387E2842387E280028002808000800080008000FF80000 +BC6D:000000280028422842387E2842387E2800280000000020F8201020303ECC0000 +BC6E:000000280028422842387E2842387E2800280000202021FC207020883E700000 +BC6F:000000280028422842387E2842387E280028000003F802000200020003F80000 +BC70:000000280028422842387E2842387E280028000007F8000807F8040007F80000 +BC71:000000280028422842387E2842387E28002800003EF802083E0820083E080000 +BC72:000000280028422842387E2842387E28002800003EF802883E8820883EF80000 +BC73:000000280028422842387E2842387E28002800003E8802883EF820883EF80000 +BC74:000000280028422842387E2842387E28002800001F0801081F0810141F620000 +BC75:000000280028422842387E2842387E28002800003EF802803EF820803EF80000 +BC76:000000280028422842387E2842387E28002800003EFC02483E4820483EFC0000 +BC77:000000280028422842387E2842387E28002800003E1002FE3E3820443E380000 +BC78:000000280028422842387E2842387E280028000003F802080208020803F80000 +BC79:000000280028422842387E2842387E28002800000208020803F8020803F80000 +BC7A:000000280028422842387E2842387E2800280000110811081F0811141F620000 +BC7B:000000280028422842387E2842387E2800280000000800080008003400C20000 +BC7C:000000280028422842387E2842387E28002800000048004800A8011406620000 +BC7D:000000280028422842387E2842387E2800280000000001F00208020801F00000 +BC7E:000000280028422842387E2842387E280028000003F80020002000D003080000 +BC7F:000000280028422842387E2842387E2800280000004003F8004000A003180000 +BC80:000000280028422842387E2842387E280028000003F8000803F8000800080000 +BC81:000000280028422842387E2842387E280028000003F8020003F8020003F80000 +BC82:000000280028422842387E2842387E280028000000000FF8022002200FF80000 +BC83:000000280028422842387E2842387E280028000000800FF803E0041003E00000 +BC84:00000000000200022082208220823F9E2082208220823F820002000200020000 +BC85:000000080008420842087E3842087E0800080000000007F80008000800080000 +BC86:000000080008420842087E3842087E080008000000003EF80208020802080000 +BC87:000000080008420842087E3842087E080008000000001F080108011401620000 +BC88:000000080008420842087E3842087E080008000000001000100010001FF80000 +BC89:000000080008420842087E3842087E0800080000000020F8201020303ECC0000 +BC8A:000000080008420842087E3842087E0800080000202021FC207020883E700000 +BC8B:000000080008420842087E3842087E080008000003F802000200020003F80000 +BC8C:000000080008420842087E3842087E080008000007F8000807F8040007F80000 +BC8D:000000080008420842087E3842087E08000800003EF802083E0820083E080000 +BC8E:000000080008420842087E3842087E08000800003EF802883E8820883EF80000 +BC8F:000000080008420842087E3842087E08000800003E8802883EF820883EF80000 +BC90:000000080008420842087E3842087E08000800000F8800880F8808140FA20000 +BC91:000000080008420842087E3842087E08000800003EF802803EF820803EF80000 +BC92:000000080008420842087E3842087E08000800003EFC02483E4820483EFC0000 +BC93:000000080008420842087E3842087E08000800003E1002FE3E3820443E380000 +BC94:000000080008420842087E3842087E080008000003F802080208020803F80000 +BC95:000000080008420842087E3842087E08000800000208020803F8020803F80000 +BC96:000000080008420842087E3842087E0800080000210821083F0821143F620000 +BC97:000000080008420842087E3842087E0800080000001000100010006801840000 +BC98:000000080008420842087E3842087E08000800000048004800A8011406620000 +BC99:000000080008420842087E3842087E0800080000000003F00408040803F00000 +BC9A:000000080008420842087E3842087E080008000003F80020002000D003080000 +BC9B:000000080008420842087E3842087E0800080000004003F8004000A003180000 +BC9C:000000080008420842087E3842087E080008000003F8000803F8000800080000 +BC9D:000000080008420842087E3842087E080008000003F8020003F8020003F80000 +BC9E:000000080008420842087E3842087E080008000000000FF8022002200FF80000 +BC9F:000000080008420842087E3842087E080008000000800FF803E0041003E00000 +BCA0:00000000000A000A208A208A208A3FBA208A208A208A3F8A000A000A000A0000 +BCA1:000000280028422842287EE842287E280028000007F800080008000800080000 +BCA2:000000280028422842287EE842287E280028000000003EF80208020802080000 +BCA3:000000280028422842287EE842287E280028000000003E100210022802C40000 +BCA4:000000280028422842287EE842287E280028000008000800080008000FF80000 +BCA5:000000280028422842287EE842287E2800280000000020F8201020303ECC0000 +BCA6:000000280028422842287EE842287E2800280000202021FC207020883E700000 +BCA7:000000280028422842287EE842287E280028000003F802000200020003F80000 +BCA8:000000280028422842287EE842287E280028000007F8000807F8040007F80000 +BCA9:000000280028422842287EE842287E28002800003EF802083E0820083E080000 +BCAA:000000280028422842287EE842287E28002800003EF802883E8820883EF80000 +BCAB:000000280028422842287EE842287E28002800003E8802883EF820883EF80000 +BCAC:000000280028422842287EE842287E28002800001F0801081F0810141F620000 +BCAD:000000280028422842287EE842287E28002800003EF802803EF820803EF80000 +BCAE:000000280028422842287EE842287E28002800003EFC02483E4820483EFC0000 +BCAF:000000280028422842287EE842287E28002800003E1002FE3E3820443E380000 +BCB0:000000280028422842287EE842287E280028000003F802080208020803F80000 +BCB1:000000280028422842287EE842287E28002800000208020803F8020803F80000 +BCB2:000000280028422842287EE842287E2800280000110811081F0811141F620000 +BCB3:000000280028422842287EE842287E2800280000000800080008003400C20000 +BCB4:000000280028422842287EE842287E28002800000048004800A8011406620000 +BCB5:000000280028422842287EE842287E2800280000000001F00208020801F00000 +BCB6:000000280028422842287EE842287E280028000003F80020002000D003080000 +BCB7:000000280028422842287EE842287E2800280000004003F8004000A003180000 +BCB8:000000280028422842287EE842287E280028000003F8000803F8000800080000 +BCB9:000000280028422842287EE842287E280028000003F8020003F8020003F80000 +BCBA:000000280028422842287EE842287E280028000000000FF8022002200FF80000 +BCBB:000000280028422842287EE842287E280028000000800FF803E0041003E00000 +BCBC:000000000002000220822082209E3F822082209E20823F820002000200020000 +BCBD:000000080008420842387E0842387E0800080000000007F80008000800080000 +BCBE:000000080008420842387E0842387E080008000000003EF80208020802080000 +BCBF:000000080008420842387E0842387E080008000000001F080108011401620000 +BCC0:000000080008420842387E0842387E080008000800001000100010001FF80000 +BCC1:000000080008420842387E0842387E0800080000000020F8201020303ECC0000 +BCC2:000000080008420842387E0842387E0800080000202021FC207020883E700000 +BCC3:000000080008420842387E0842387E080008000003F802000200020003F80000 +BCC4:000000080008420842387E0842387E080008000007F8000807F8040007F80000 +BCC5:000000080008420842387E0842387E08000800003EF802083E0820083E080000 +BCC6:000000080008420842387E0842387E08000800003EF802883E8820883EF80000 +BCC7:000000080008420842387E0842387E08000800003E8802883EF820883EF80000 +BCC8:000000080008420842387E0842387E08000800000F8800880F8808140FA20000 +BCC9:000000080008420842387E0842387E08000800003EF802803EF820803EF80000 +BCCA:000000080008420842387E0842387E08000800003EFC02483E4820483EFC0000 +BCCB:000000080008420842387E0842387E08000800003E1002FE3E3820443E380000 +BCCC:000000080008420842387E0842387E080008000003F802080208020803F80000 +BCCD:000000080008420842387E0842387E08000800000208020803F8020803F80000 +BCCE:000000080008420842387E0842387E0800080000210821083F0821143F620000 +BCCF:000000080008420842387E0842387E0800080000001000100010006801840000 +BCD0:000000080008420842387E0842387E08000800000048004800A8011406620000 +BCD1:000000080008420842387E0842387E0800080000000003F00408040803F00000 +BCD2:000000080008420842387E0842387E080008000003F80020002000D003080000 +BCD3:000000080008420842387E0842387E0800080000004003F8004000A003180000 +BCD4:000000080008420842387E0842387E080008000003F8000803F8000800080000 +BCD5:000000080008420842387E0842387E080008000003F8020003F8020003F80000 +BCD6:000000080008420842387E0842387E080008000000000FF8022002200FF80000 +BCD7:000000080008420842387E0842387E080008000000800FF803E0041003E00000 +BCD8:00000000000A000A208A208A20BA3F8A208A20BA208A3F8A000A000A000A0000 +BCD9:000000280028422842E87E2842E87E280028000007F800080008000800080000 +BCDA:000000280028422842E87E2842E87E280028000000003EF80208020802080000 +BCDB:000000280028422842E87E2842E87E280028000000003E100210022802C40000 +BCDC:000000280028422842E87E2842E87E280028002808000800080008000FF80000 +BCDD:000000280028422842E87E2842E87E2800280000000020F8201020303ECC0000 +BCDE:000000280028422842E87E2842E87E2800280000202021FC207020883E700000 +BCDF:000000280028422842E87E2842E87E280028000003F802000200020003F80000 +BCE0:000000280028422842E87E2842E87E280028000007F8000807F8040007F80000 +BCE1:000000280028422842E87E2842E87E28002800003EF802083E0820083E080000 +BCE2:000000280028422842E87E2842E87E28002800003EF802883E8820883EF80000 +BCE3:000000280028422842E87E2842E87E28002800003E8802883EF820883EF80000 +BCE4:000000280028422842E87E2842E87E28002800001F0801081F0810141F620000 +BCE5:000000280028422842E87E2842E87E28002800003EF802803EF820803EF80000 +BCE6:000000280028422842E87E2842E87E28002800003EFC02483E4820483EFC0000 +BCE7:000000280028422842E87E2842E87E28002800003E1002FE3E3820443E380000 +BCE8:000000280028422842E87E2842E87E280028000003F802080208020803F80000 +BCE9:000000280028422842E87E2842E87E28002800000208020803F8020803F80000 +BCEA:000000280028422842E87E2842E87E2800280000110811081F0811141F620000 +BCEB:000000280028422842E87E2842E87E2800280000000800080008003400C20000 +BCEC:000000280028422842E87E2842E87E28002800000048004800A8011406620000 +BCED:000000280028422842E87E2842E87E2800280000000001F00208020801F00000 +BCEE:000000280028422842E87E2842E87E280028000003F80020002000D003080000 +BCEF:000000280028422842E87E2842E87E2800280000004003F8004000A003180000 +BCF0:000000280028422842E87E2842E87E280028000003F8000803F8000800080000 +BCF1:000000280028422842E87E2842E87E280028000003F8020003F8020003F80000 +BCF2:000000280028422842E87E2842E87E280028000000000FF8022002200FF80000 +BCF3:000000280028422842E87E2842E87E280028000000800FF803E0041003E00000 +BCF4:000000001010101010101FF0101010101FF000000100010001007FFC00000000 +BCF5:0000101010101FF010101FF0010001007FFC00001FF000100010001000100000 +BCF6:0000101010101FF010101FF0010001007FFC000000003EF80208020802080000 +BCF7:0000101010101FF010101FF0010001007FFC000000001E100210022802C40000 +BCF8:0000101010101FF010101FF0010001007FFC000000001000100010001FF00000 +BCF9:0000101010101FF010101FF0010001007FFC0000000020F8201020303ECC0000 +BCFA:0000101010101FF010101FF0010001007FFC0000202021FC207020883E700000 +BCFB:0000101010101FF010101FF0010001007FFC00001FF01000100010001FF00000 +BCFC:0000101010101FF010101FF0010001007FFC00001FF000101FF010001FF00000 +BCFD:0000101010101FF010101FF0010001007FFC00003EF802083E0820083E080000 +BCFE:0000101010101FF010101FF0010001007FFC00003EF802883E8820883EF80000 +BCFF:0000101010101FF010101FF0010001007FFC00003E8802883EF820883EF80000 +BD00:0000101010101FF010101FF0010001007FFC00003E1002103E1020283EC40000 +BD01:0000101010101FF010101FF0010001007FFC00003EF802803EF820803EF80000 +BD02:0000101010101FF010101FF0010001007FFC00003EFC02483E4820483EFC0000 +BD03:0000101010101FF010101FF0010001007FFC00003E2003FC3E7020883E700000 +BD04:0000101010101FF010101FF0010001007FFC00001FF01010101010101FF00000 +BD05:0000101010101FF010101FF0010001007FFC0000101010101FF010101FF00000 +BD06:0000101010101FF010101FF0010001007FFC0000222022203E2022503E880000 +BD07:0000101010101FF010101FF0010001007FFC000000000100010002800C400000 +BD08:0000101010101FF010101FF0010001007FFC00000000024002400DA033100000 +BD09:0000101010101FF010101FF0010001007FFC0000000007C00820082007C00000 +BD0A:0000101010101FF010101FF0010001007FFC0000000007E00080014006200000 +BD0B:0000101010101FF010101FF0010001007FFC0000008007E00080014006200000 +BD0C:0000101010101FF010101FF0010001007FFC00001FF000101FF0001000100000 +BD0D:0000101010101FF010101FF0010001007FFC00001FF010001FF010001FF00000 +BD0E:0000101010101FF010101FF0010001007FFC000000001FF0044004401FF00000 +BD0F:0000101010101FF010101FF0010001007FFC000001001FF007C0082007C00000 +BD10:0000001000102090209020903F90209E20903F90041004107FD0001000100000 +BD11:00000008208820883F8E20883F8804087FE8000007F800080008000800080000 +BD12:00000008208820883F8E20883F8804087FE8000000003EF80208020802080000 +BD13:00000008208820883F8E20883F8804087FE8000000001F080108011401620000 +BD14:00000008208820883F8E20883F8804087FE8000008000800080008000FF80000 +BD15:00000008208820883F8E20883F8804087FE80000000010F8101010301ECC0000 +BD16:00000008208820883F8E20883F8804087FE800000808087F081C08220F9C0000 +BD17:00000008208820883F8E20883F8804087FE8000003F802000200020003F80000 +BD18:00000008208820883F8E20883F8804087FE8000007F8000807F8040007F80000 +BD19:00000008208820883F8E20883F8804087FE800003EF802083E0820083E080000 +BD1A:00000008208820883F8E20883F8804087FE800003EF802883E8820883EF80000 +BD1B:00000008208820883F8E20883F8804087FE800003E8802883EF820883EF80000 +BD1C:00000008208820883F8E20883F8804087FE800001F0801081F0810141F620000 +BD1D:00000008208820883F8E20883F8804087FE800003EF802803EF820803EF80000 +BD1E:00000008208820883F8E20883F8804087FE800003EFC02483E4820483EFC0000 +BD1F:00000008208820883F8E20883F8804087FE800001F08017F1F1C10221F1C0000 +BD20:00000008208820883F8E20883F8804087FE8000003F802080208020803F80000 +BD21:00000008208820883F8E20883F8804087FE800000208020803F8020803F80000 +BD22:00000008208820883F8E20883F8804087FE80000110811081F0811141F620000 +BD23:00000008208820883F8E20883F8804087FE80000001000100010006801840000 +BD24:00000008208820883F8E20883F8804087FE800000048004800A8011406620000 +BD25:00000008208820883F8E20883F8804087FE80000000003F00408040803F00000 +BD26:00000008208820883F8E20883F8804087FE8000003F80020002000D003080000 +BD27:00000008208820883F8E20883F8804087FE80000004003F8004000A003180000 +BD28:00000008208820883F8E20883F8804087FE8000003F8000803F8000800080000 +BD29:00000008208820883F8E20883F8804087FE8000003F8020003F8020003F80000 +BD2A:00000008208820883F8E20883F8804087FE8000000000FF8022002200FF80000 +BD2B:00000008208820883F8E20883F8804087FE8000000800FF803E0041003E00000 +BD2C:0000001200122092209220923F92209E20923F92041204127FD2001200120000 +BD2D:0000002820A820A83FB820A83FA804287FA8000007F800080008000800080000 +BD2E:0000002820A820A83FB820A83FA804287FA8000000003EF80208020802080000 +BD2F:0000002820A820A83FB820A83FA804287FA8000000001F080108011401620000 +BD30:0000002820A820A83FB820A83FA804287FA8000008000800080008000FF80000 +BD31:0000002820A820A83FB820A83FA804287FA80000000010F8101010301ECC0000 +BD32:0000002820A820A83FB820A83FA804287FA800000808087F081C08220F9C0000 +BD33:0000002820A820A83FB820A83FA804287FA8000003F802000200020003F80000 +BD34:0000002820A820A83FB820A83FA804287FA8000007F8000807F8040007F80000 +BD35:0000002820A820A83FB820A83FA804287FA800003EF802083E0820083E080000 +BD36:0000002820A820A83FB820A83FA804287FA800003EF802883E8820883EF80000 +BD37:0000002820A820A83FB820A83FA804287FA800003E8802883EF820883EF80000 +BD38:0000002820A820A83FB820A83FA804287FA800001F0801081F0810141F620000 +BD39:0000002820A820A83FB820A83FA804287FA800003EF802803EF820803EF80000 +BD3A:0000002820A820A83FB820A83FA804287FA800003EFC02483E4820483EFC0000 +BD3B:0000002820A820A83FB820A83FA804287FA800001F08017F1F1C10221F1C0000 +BD3C:0000002820A820A83FB820A83FA804287FA8000003F802080208020803F80000 +BD3D:0000002820A820A83FB820A83FA804287FA800000208020803F8020803F80000 +BD3E:0000002820A820A83FB820A83FA804287FA80000110811081F0811141F620000 +BD3F:0000002820A820A83FB820A83FA804287FA80000001000100010006801840000 +BD40:0000002820A820A83FB820A83FA804287FA800000048004800A8011406620000 +BD41:0000002820A820A83FB820A83FA804287FA80000000003F00408040803F00000 +BD42:0000002820A820A83FB820A83FA804287FA8000003F80020002000D003080000 +BD43:0000002820A820A83FB820A83FA804287FA80000004003F8004000A003180000 +BD44:0000002820A820A83FB820A83FA804287FA8000003F8000803F8000800080000 +BD45:0000002820A820A83FB820A83FA804287FA8000003F8020003F8020003F80000 +BD46:0000002820A820A83FB820A83FA804287FA8000000000FF8022002200FF80000 +BD47:0000002820A820A83FB820A83FA804287FA8000000800FF803E0041003E00000 +BD48:0000000800082088208820883F88208820883F88040804087FE8000800080000 +BD49:00000008208820883F8820883F8804087FE8000007F800080008000800080000 +BD4A:00000008208820883F8820883F8804087FE8000000003EF80208020802080000 +BD4B:00000008208820883F8820883F8804087FE8000000001F080108011401620000 +BD4C:00000008208820883F8820883F8804087FE8000008000800080008000FF80000 +BD4D:00000008208820883F8820883F8804087FE80000000010F8101010301ECC0000 +BD4E:00000008208820883F8820883F8804087FE800000808087F081C08220F9C0000 +BD4F:00000008208820883F8820883F8804087FE8000003F802000200020003F80000 +BD50:00000008208820883F8820883F8804087FE8000007F8000807F8040007F80000 +BD51:00000008208820883F8820883F8804087FE800003EF802083E0820083E080000 +BD52:00000008208820883F8820883F8804087FE800003EF802883E8820883EF80000 +BD53:00000008208820883F8820883F8804087FE800003E8802883EF820883EF80000 +BD54:00000008208820883F8820883F8804087FE800001F0801081F0810141F620000 +BD55:00000008208820883F8820883F8804087FE800003EF802803EF820803EF80000 +BD56:00000008208820883F8820883F8804087FE800003EFC02483E4820483EFC0000 +BD57:00000008208820883F8820883F8804087FE800001F08017F1F1C10221F1C0000 +BD58:00000008208820883F8820883F8804087FE8000003F802080208020803F80000 +BD59:00000008208820883F8820883F8804087FE800000208020803F8020803F80000 +BD5A:00000008208820883F8820883F8804087FE80000110811081F0811141F620000 +BD5B:00000008208820883F8820883F8804087FE80000001000100010006801840000 +BD5C:00000008208820883F8820883F8804087FE800000048004800A8011406620000 +BD5D:00000008208820883F8820883F8804087FE80000000003F00408040803F00000 +BD5E:00000008208820883F8820883F8804087FE8000003F80020002000D003080000 +BD5F:00000008208820883F8820883F8804087FE80000004003F8004000A003180000 +BD60:00000008208820883F8820883F8804087FE8000003F8000803F8000800080000 +BD61:00000008208820883F8820883F8804087FE8000003F8020003F8020003F80000 +BD62:00000008208820883F8820883F8804087FE8000000000FF8022002200FF80000 +BD63:00000008208820883F8820883F8804087FE8000000800FF803E0041003E00000 +BD64:000000001010101010101FF0101010101FF004400440044004407FFC00000000 +BD65:0000101010101FF010101FF0044004407FFC00001FF000100010001000100000 +BD66:0000101010101FF010101FF0044004407FFC000000003EF80208020802080000 +BD67:0000101010101FF010101FF0044004407FFC000000001E100210022802C40000 +BD68:0000101010101FF010101FF0044004407FFC000000001000100010001FF00000 +BD69:0000101010101FF010101FF0044004407FFC0000000020F8201020303ECC0000 +BD6A:0000101010101FF010101FF0044004407FFC0000202021FC207020883E700000 +BD6B:0000101010101FF010101FF0044004407FFC00001FF01000100010001FF00000 +BD6C:0000101010101FF010101FF0044004407FFC00001FF000101FF010001FF00000 +BD6D:0000101010101FF010101FF0044004407FFC00003EF802083E0820083E080000 +BD6E:0000101010101FF010101FF0044004407FFC00003EF802883E8820883EF80000 +BD6F:0000101010101FF010101FF0044004407FFC00003E8802883EF820883EF80000 +BD70:0000101010101FF010101FF0044004407FFC00003E1002103E1020283EC40000 +BD71:0000101010101FF010101FF0044004407FFC00003EF802803EF820803EF80000 +BD72:0000101010101FF010101FF0044004407FFC00003EFC02483E4820483EFC0000 +BD73:0000101010101FF010101FF0044004407FFC00003E2003FC3E7020883E700000 +BD74:0000101010101FF010101FF0044004407FFC00001FF01010101010101FF00000 +BD75:0000101010101FF010101FF0044004407FFC0000101010101FF010101FF00000 +BD76:0000101010101FF010101FF0044004407FFC0000222022203E2022503E880000 +BD77:0000101010101FF010101FF0044004407FFC000000000100010002800C400000 +BD78:0000101010101FF010101FF0044004407FFC00000000024002400DA033100000 +BD79:0000101010101FF010101FF0044004407FFC0000000007C00820082007C00000 +BD7A:0000101010101FF010101FF0044004407FFC0000000007E00080014006200000 +BD7B:0000101010101FF010101FF0044004407FFC0000008007E00080014006200000 +BD7C:0000101010101FF010101FF0044004407FFC00001FF000101FF0001000100000 +BD7D:0000101010101FF010101FF0044004407FFC00001FF010001FF010001FF00000 +BD7E:0000101010101FF010101FF0044004407FFC000000001FF0044004401FF00000 +BD7F:0000101010101FF010101FF0044004407FFC000001001FF007C0082007C00000 +BD80:000000001010101010101FF0101010101FF000003FF801000100010001000000 +BD81:0000101010101FF010101FF000007FFC010001001FF000100010001000100000 +BD82:0000101010101FF010101FF000007FFC0100010000003EF80208020802080000 +BD83:0000101010101FF010101FF000007FFC0100010000001E100210022802C40000 +BD84:0000101010101FF010101FF0000000007FFC010001001100100010001FF00000 +BD85:0000101010101FF010101FF000007FFC01000100000020F8201020303ECC0000 +BD86:0000101010101FF010101FF000007FFC01000100202021FC207020883E700000 +BD87:0000101010101FF010101FF000007FFC010001001FF01000100010001FF00000 +BD88:0000101010101FF010101FF000007FFC010001001FF000101FF010001FF00000 +BD89:0000101010101FF010101FF000007FFC010001003EF802083E0820083E080000 +BD8A:0000101010101FF010101FF000007FFC010001003EF802883E8820883EF80000 +BD8B:0000101010101FF010101FF000007FFC010001003E8802883EF820883EF80000 +BD8C:0000101010101FF010101FF000007FFC010001003E1002103E1020283EC40000 +BD8D:0000101010101FF010101FF000007FFC010001003EF802803EF820803EF80000 +BD8E:0000101010101FF010101FF000007FFC010001003EFC02483E4820483EFC0000 +BD8F:0000101010101FF010101FF000007FFC010001003E2003FC3E7020883E700000 +BD90:0000101010101FF010101FF000007FFC010001001FF01010101010101FF00000 +BD91:0000101010101FF010101FF000007FFC01000100101010101FF010101FF00000 +BD92:0000101010101FF010101FF000007FFC01000100222022203E2022503E880000 +BD93:0000101010101FF010101FF000007FFC0100010000000100010002800C400000 +BD94:0000101010101FF010101FF000007FFC010001000000024002400DA033100000 +BD95:0000101010101FF010101FF000007FFC01000100000007C00820082007C00000 +BD96:0000101010101FF010101FF000007FFC01000100000007E00080014006200000 +BD97:0000101010101FF010101FF000007FFC01000100008007E00080014006200000 +BD98:0000101010101FF010101FF000007FFC010001001FF000101FF0001000100000 +BD99:0000101010101FF010101FF000007FFC010001001FF010001FF010001FF00000 +BD9A:0000101010101FF010101FF000007FFC0100010000001FF0044004401FF00000 +BD9B:0000101010101FF010101FF000007FFC0100010001001FF007C0082007C00000 +BD9C:000000082088208820883F88208820883F8800087FE8040804F8040804080000 +BD9D:208820883F8820883F8800087FE8027802080000000007F80008000800080000 +BD9E:208820883F8820883F8800087FE802780208000000003EF80208020802080000 +BD9F:208820883F8820883F8800087FE802780208000000001F080108011401620000 +BDA0:208820883F8820883F88000800087FE80278020802081000100010001FF80000 +BDA1:208820883F8820883F8800087FE8027802080000000020F8201020303ECC0000 +BDA2:208820883F8820883F8800087FE8027802080000202021FC207020883E700000 +BDA3:208820883F8820883F8800087FE802780208000003F802000200020003F80000 +BDA4:208820883F8820883F8800087FE802780208000007F8000807F8040007F80000 +BDA5:208820883F8820883F8800087FE80278020800003EF802083E0820083E080000 +BDA6:208820883F8820883F8800087FE80278020800003EF802883E8820883EF80000 +BDA7:208820883F8820883F8800087FE80278020800003E8802883EF820883EF80000 +BDA8:208820883F8820883F8800087FE80278020800000F8800880F8808140FA20000 +BDA9:208820883F8820883F8800087FE80278020800003EF802803EF820803EF80000 +BDAA:208820883F8820883F8800087FE80278020800003EFC02483E4820483EFC0000 +BDAB:208820883F8820883F8800087FE80278020800003E1002FE3E3820443E380000 +BDAC:208820883F8820883F8800087FE802780208000003F802080208020803F80000 +BDAD:208820883F8820883F8800087FE80278020800000208020803F8020803F80000 +BDAE:208820883F8820883F8800087FE8027802080000210821083F0821143F620000 +BDAF:208820883F8820883F8800087FE8027802080000001000100010006801840000 +BDB0:208820883F8820883F8800087FE80278020800000048004800A8011406620000 +BDB1:208820883F8820883F8800087FE8027802080000000003F00408040803F00000 +BDB2:208820883F8820883F8800087FE802780208000003F80020002000D003080000 +BDB3:208820883F8820883F8800087FE8027802080000004003F8004000A003180000 +BDB4:208820883F8820883F8800087FE802780208000003F8000803F8000800080000 +BDB5:208820883F8820883F8800087FE802780208000003F8020003F8020003F80000 +BDB6:208820883F8820883F8800087FE802780208000000000FF8022002200FF80000 +BDB7:208820883F8820883F8800087FE802780208000000800FF803E0041003E00000 +BDB8:0000000A208A208A208A3F8A208A208A3F8A000A7FEA040A047A040A040A0000 +BDB9:20A820A83FA820A83FA800287FA805E804280000000007F80008000800080000 +BDBA:20A820A83FA820A83FA800287FA805E80428000000003EF80208020802080000 +BDBB:20A820A83FA820A83FA800287FA805E80428000000001F080108011401620000 +BDBC:20A820A83FA820A83FA8002800287FA8042805E804281428100010001FF80000 +BDBD:20A820A83FA820A83FA800287FA805E804280000000020F8201020303ECC0000 +BDBE:20A820A83FA820A83FA800287FA805E804280000202021FC207020883E700000 +BDBF:20A820A83FA820A83FA800287FA805E80428000003F802000200020003F80000 +BDC0:20A820A83FA820A83FA800287FA805E80428000007F8000807F8040007F80000 +BDC1:20A820A83FA820A83FA800287FA805E8042800003EF802083E0820083E080000 +BDC2:20A820A83FA820A83FA800287FA805E8042800003EF802883E8820883EF80000 +BDC3:20A820A83FA820A83FA800287FA805E8042800003E8802883EF820883EF80000 +BDC4:20A820A83FA820A83FA800287FA805E8042800000F8800880F8808140FA20000 +BDC5:20A820A83FA820A83FA800287FA805E8042800003EF802803EF820803EF80000 +BDC6:20A820A83FA820A83FA800287FA805E8042800003EFC02483E4820483EFC0000 +BDC7:20A820A83FA820A83FA800287FA805E8042800003E1002FE3E3820443E380000 +BDC8:20A820A83FA820A83FA800287FA805E80428000003F802080208020803F80000 +BDC9:20A820A83FA820A83FA800287FA805E8042800000208020803F8020803F80000 +BDCA:20A820A83FA820A83FA800287FA805E804280000210821083F0821143F620000 +BDCB:20A820A83FA820A83FA800287FA805E804280000001000100010006801840000 +BDCC:20A820A83FA820A83FA800287FA805E8042800000048004800A8011406620000 +BDCD:20A820A83FA820A83FA800287FA805E804280000000003F00408040803F00000 +BDCE:20A820A83FA820A83FA800287FA805E80428000003F80020002000D003080000 +BDCF:20A820A83FA820A83FA800287FA805E804280000004003F8004000A003180000 +BDD0:20A820A83FA820A83FA800287FA805E80428000003F8000803F8000800080000 +BDD1:20A820A83FA820A83FA800287FA805E80428000003F8020003F8020003F80000 +BDD2:20A820A83FA820A83FA800287FA805E80428000000000FF8022002200FF80000 +BDD3:20A820A83FA820A83FA800287FA805E80428000000800FF803E0041003E00000 +BDD4:000000082088208820883F88208820883F8800087FE804080408040804080000 +BDD5:208820883F8820883F8800087FE8020802000000000007F80008000800080000 +BDD6:208820883F8820883F8800087FE802080200000000003EF80208020802080000 +BDD7:208820883F8820883F8800087FE802080200000000001F080108011401620000 +BDD8:208820883F8820883F88000800087FE80208020802081008100010001FF80000 +BDD9:208820883F8820883F8800087FE8020802000000000020F8201020303ECC0000 +BDDA:208820883F8820883F8800087FE8020802000000202021FC207020883E700000 +BDDB:208820883F8820883F8800087FE802080200000003F802000200020003F80000 +BDDC:208820883F8820883F8800087FE802080200000007F8000807F8040007F80000 +BDDD:208820883F8820883F8800087FE80208020000003EF802083E0820083E080000 +BDDE:208820883F8820883F8800087FE80208020000003EF802883E8820883EF80000 +BDDF:208820883F8820883F8800087FE80208020000003E8802883EF820883EF80000 +BDE0:208820883F8820883F8800087FE80208020000000F8800880F8808140FA20000 +BDE1:208820883F8820883F8800087FE80208020000003EF802803EF820803EF80000 +BDE2:208820883F8820883F8800087FE80208020000003EFC02483E4820483EFC0000 +BDE3:208820883F8820883F8800087FE80208020000003E1002FE3E3820443E380000 +BDE4:208820883F8820883F8800087FE802080200000003F802080208020803F80000 +BDE5:208820883F8820883F8800087FE80208020000000208020803F8020803F80000 +BDE6:208820883F8820883F8800087FE8020802000000210821083F0821143F620000 +BDE7:208820883F8820883F8800087FE8020802000000001000100010006801840000 +BDE8:208820883F8820883F8800087FE80208020000000048004800A8011406620000 +BDE9:208820883F8820883F8800087FE8020802000000000003F00408040803F00000 +BDEA:208820883F8820883F8800087FE802080200000003F80020002000D003080000 +BDEB:208820883F8820883F8800087FE8020802000000004003F8004000A003180000 +BDEC:208820883F8820883F8800087FE802080200000003F8000803F8000800080000 +BDED:208820883F8820883F8800087FE802080200000003F8020003F8020003F80000 +BDEE:208820883F8820883F8800087FE802080200000000000FF8022002200FF80000 +BDEF:208820883F8820883F8800087FE802080200000000800FF803E0041003E00000 +BDF0:000000001010101010101FF0101010101FF000007FFC04400440044004400000 +BDF1:0000101010101FF010101FF000007FFC044004401FF000100010001000100000 +BDF2:0000101010101FF010101FF000007FFC0440044000003EF80208020802080000 +BDF3:0000101010101FF010101FF000007FFC0440044000001E100210022802C40000 +BDF4:0000101010101FF010101FF0000000007FFC044004401440100010001FF00000 +BDF5:0000101010101FF010101FF000007FFC04400440000020F8201020303ECC0000 +BDF6:0000101010101FF010101FF000007FFC04400440202021FC207020883E700000 +BDF7:0000101010101FF010101FF000007FFC044004401FF01000100010001FF00000 +BDF8:0000101010101FF010101FF000007FFC044004401FF000101FF010001FF00000 +BDF9:0000101010101FF010101FF000007FFC044004403EF802083E0820083E080000 +BDFA:0000101010101FF010101FF000007FFC044004403EF802883E8820883EF80000 +BDFB:0000101010101FF010101FF000007FFC044004403E8802883EF820883EF80000 +BDFC:0000101010101FF010101FF000007FFC044004403E1002103E1020283EC40000 +BDFD:0000101010101FF010101FF000007FFC044004403EF802803EF820803EF80000 +BDFE:0000101010101FF010101FF000007FFC044004403EFC02483E4820483EFC0000 +BDFF:0000101010101FF010101FF000007FFC044004403E2003FC3E7020883E700000 +BE00:0000101010101FF010101FF000007FFC044004401FF01010101010101FF00000 +BE01:0000101010101FF010101FF000007FFC04400440101010101FF010101FF00000 +BE02:0000101010101FF010101FF000007FFC04400440222022203E2022503E880000 +BE03:0000101010101FF010101FF000007FFC0440044000000100010002800C400000 +BE04:0000101010101FF010101FF000007FFC044004400000024002400DA033100000 +BE05:0000101010101FF010101FF000007FFC04400440000007C00820082007C00000 +BE06:0000101010101FF010101FF000007FFC04400440000007E00080014006200000 +BE07:0000101010101FF010101FF000007FFC04400440008007E00080014006200000 +BE08:0000101010101FF010101FF000007FFC044004401FF000101FF0001000100000 +BE09:0000101010101FF010101FF000007FFC044004401FF010001FF010001FF00000 +BE0A:0000101010101FF010101FF000007FFC0440044000001FF0044004401FF00000 +BE0B:0000101010101FF010101FF000007FFC0440044001001FF007C0082007C00000 +BE0C:000000001010101010101FF0101010101FF0000000007FFC0000000000000000 +BE0D:0000101010101FF010101FF0000000007FFC00001FF000100010001000100000 +BE0E:0000101010101FF010101FF0000000007FFC000000003EF80208020802080000 +BE0F:0000101010101FF010101FF0000000007FFC000000001E100210022802C40000 +BE10:0000101010101FF010101FF0000000007FFC000000001000100010001FF00000 +BE11:0000101010101FF010101FF0000000007FFC0000000020F8201020303ECC0000 +BE12:0000101010101FF010101FF0000000007FFC0000202021FC207020883E700000 +BE13:0000101010101FF010101FF0000000007FFC00001FF01000100010001FF00000 +BE14:0000101010101FF010101FF0000000007FFC00001FF000101FF010001FF00000 +BE15:0000101010101FF010101FF0000000007FFC00003EF802083E0820083E080000 +BE16:0000101010101FF010101FF0000000007FFC00003EF802883E8820883EF80000 +BE17:0000101010101FF010101FF0000000007FFC00003E8802883EF820883EF80000 +BE18:0000101010101FF010101FF0000000007FFC00003E1002103E1020283EC40000 +BE19:0000101010101FF010101FF0000000007FFC00003EF802803EF820803EF80000 +BE1A:0000101010101FF010101FF0000000007FFC00003EFC02483E4820483EFC0000 +BE1B:0000101010101FF010101FF0000000007FFC00003E2003FC3E7020883E700000 +BE1C:0000101010101FF010101FF0000000007FFC00001FF01010101010101FF00000 +BE1D:0000101010101FF010101FF0000000007FFC0000101010101FF010101FF00000 +BE1E:0000101010101FF010101FF0000000007FFC0000222022203E2022503E880000 +BE1F:0000101010101FF010101FF0000000007FFC000000000100010002800C400000 +BE20:0000101010101FF010101FF0000000007FFC00000000024002400DA033100000 +BE21:0000101010101FF010101FF0000000007FFC0000000007C00820082007C00000 +BE22:0000101010101FF010101FF0000000007FFC0000000007E00080014006200000 +BE23:0000101010101FF010101FF0000000007FFC0000008007E00080014006200000 +BE24:0000101010101FF010101FF0000000007FFC00001FF000101FF0001000100000 +BE25:0000101010101FF010101FF0000000007FFC00001FF010001FF010001FF00000 +BE26:0000101010101FF010101FF0000000007FFC000000001FF0044004401FF00000 +BE27:0000101010101FF010101FF0000000007FFC000001001FF007C0082007C00000 +BE28:0000000800082088208820883F88208820883F8800087FE80008000800080000 +BE29:00000008208820883F8820883F8800087FE8000007F800080008000800080000 +BE2A:00000008208820883F8820883F8800087FE8000000003EF80208020802080000 +BE2B:00000008208820883F8820883F8800087FE8000000001F080108011401620000 +BE2C:00000008208820883F8820883F8800087FE8000008000800080008000FF80000 +BE2D:00000008208820883F8820883F8800087FE80000000010F8101010301ECC0000 +BE2E:00000008208820883F8820883F8800087FE800000808087F081C08220F9C0000 +BE2F:00000008208820883F8820883F8800087FE8000003F802000200020003F80000 +BE30:00000008208820883F8820883F8800087FE8000007F8000807F8040007F80000 +BE31:00000008208820883F8820883F8800087FE800003EF802083E0820083E080000 +BE32:00000008208820883F8820883F8800087FE800003EF802883E8820883EF80000 +BE33:00000008208820883F8820883F8800087FE800003E8802883EF820883EF80000 +BE34:00000008208820883F8820883F8800087FE800001F0801081F0810141F620000 +BE35:00000008208820883F8820883F8800087FE800003EF802803EF820803EF80000 +BE36:00000008208820883F8820883F8800087FE800003EFC02483E4820483EFC0000 +BE37:00000008208820883F8820883F8800087FE800001F08017F1F1C10221F1C0000 +BE38:00000008208820883F8820883F8800087FE8000003F802080208020803F80000 +BE39:00000008208820883F8820883F8800087FE800000208020803F8020803F80000 +BE3A:00000008208820883F8820883F8800087FE80000110811081F0811141F620000 +BE3B:00000008208820883F8820883F8800087FE80000001000100010006801840000 +BE3C:00000008208820883F8820883F8800087FE800000048004800A8011406620000 +BE3D:00000008208820883F8820883F8800087FE80000000003F00408040803F00000 +BE3E:00000008208820883F8820883F8800087FE8000003F80020002000D003080000 +BE3F:00000008208820883F8820883F8800087FE80000004003F8004000A003180000 +BE40:00000008208820883F8820883F8800087FE8000003F8000803F8000800080000 +BE41:00000008208820883F8820883F8800087FE8000003F8020003F8020003F80000 +BE42:00000008208820883F8820883F8800087FE8000000000FF8022002200FF80000 +BE43:00000008208820883F8820883F8800087FE8000000800FF803E0041003E00000 +BE44:00000000000800082088208820883F882088208820883F880008000800080000 +BE45:000000080008420842087E0842087E0800080000000007F80008000800080000 +BE46:000000080008420842087E0842087E080008000000003EF80208020802080000 +BE47:000000080008420842087E0842087E080008000000001F080108011401620000 +BE48:000000080008420842087E0842087E080008000800001000100010001FF80000 +BE49:000000080008420842087E0842087E0800080000000020F8201020303ECC0000 +BE4A:000000080008420842087E0842087E0800080000202021FC207020883E700000 +BE4B:000000080008420842087E0842087E080008000003F802000200020003F80000 +BE4C:000000080008420842087E0842087E080008000007F8000807F8040007F80000 +BE4D:000000080008420842087E0842087E08000800003EF802083E0820083E080000 +BE4E:000000080008420842087E0842087E08000800003EF802883E8820883EF80000 +BE4F:000000080008420842087E0842087E08000800003E8802883EF820883EF80000 +BE50:000000080008420842087E0842087E08000800000F8800880F8808140FA20000 +BE51:000000080008420842087E0842087E08000800003EF802803EF820803EF80000 +BE52:000000080008420842087E0842087E08000800003EFC02483E4820483EFC0000 +BE53:000000080008420842087E0842087E08000800003E1002FE3E3820443E380000 +BE54:000000080008420842087E0842087E080008000003F802080208020803F80000 +BE55:000000080008420842087E0842087E08000800000208020803F8020803F80000 +BE56:000000080008420842087E0842087E0800080000210821083F0821143F620000 +BE57:000000080008420842087E0842087E0800080000001000100010006801840000 +BE58:000000080008420842087E0842087E08000800000048004800A8011406620000 +BE59:000000080008420842087E0842087E0800080000000003F00408040803F00000 +BE5A:000000080008420842087E0842087E080008000003F80020002000D003080000 +BE5B:000000080008420842087E0842087E0800080000004003F8004000A003180000 +BE5C:000000080008420842087E0842087E080008000003F8000803F8000800080000 +BE5D:000000080008420842087E0842087E080008000003F8020003F8020003F80000 +BE5E:000000080008420842087E0842087E080008000000000FF8022002200FF80000 +BE5F:000000080008420842087E0842087E080008000000800FF803E0041003E00000 +BE60:00000000001000102490249024903F9E249024903F9000100010001000100000 +BE61:000000084908490849087F0E49087F080008000007F800080008000800080000 +BE62:000000084908490849087F0E49087F080008000000003EF80208020802080000 +BE63:000000084908490849087F0E49087F080008000000001F080108011401620000 +BE64:000000084908490849087F0E49087F080008000808000800080008000FF80000 +BE65:000000084908490849087F0E49087F0800080000000010F8101010301ECC0000 +BE66:000000084908490849087F0E49087F08000800000808087F081C08220F9C0000 +BE67:000000084908490849087F0E49087F080008000003F802000200020003F80000 +BE68:000000084908490849087F0E49087F080008000007F8000807F8040007F80000 +BE69:000000084908490849087F0E49087F08000800003EF802083E0820083E080000 +BE6A:000000084908490849087F0E49087F08000800003EF802883E8820883EF80000 +BE6B:000000084908490849087F0E49087F08000800003E8802883EF820883EF80000 +BE6C:000000084908490849087F0E49087F08000800001F0801081F0810141F620000 +BE6D:000000084908490849087F0E49087F08000800003EF802803EF820803EF80000 +BE6E:000000084908490849087F0E49087F08000800003EFC02483E4820483EFC0000 +BE6F:000000084908490849087F0E49087F08000800001F08017F1F1C10221F1C0000 +BE70:000000084908490849087F0E49087F080008000003F802080208020803F80000 +BE71:000000084908490849087F0E49087F08000800000208020803F8020803F80000 +BE72:000000084908490849087F0E49087F0800080000110811081F0811141F620000 +BE73:000000084908490849087F0E49087F0800080000001000100010006801840000 +BE74:000000084908490849087F0E49087F08000800000048004800A8011406620000 +BE75:000000084908490849087F0E49087F0800080000000003F00408040803F00000 +BE76:000000084908490849087F0E49087F080008000003F80020002000D003080000 +BE77:000000084908490849087F0E49087F0800080000004003F8004000A003180000 +BE78:000000084908490849087F0E49087F080008000003F8000803F8000800080000 +BE79:000000084908490849087F0E49087F080008000003F8020003F8020003F80000 +BE7A:000000084908490849087F0E49087F080008000000000FF8022002200FF80000 +BE7B:000000084908490849087F0E49087F080008000000800FF803E0041003E00000 +BE7C:00000000001200122492249224923F9E249224923F9200120012001200120000 +BE7D:000000284928492849287F3849287F280028000007F800080008000800080000 +BE7E:000000284928492849287F3849287F280028000000003EF80208020802080000 +BE7F:000000284928492849287F3849287F280028000000003E100210022802C40000 +BE80:000000284928492849287F3849287F280028002808000800080008000FF80000 +BE81:000000284928492849287F3849287F2800280000000020F8201020303ECC0000 +BE82:000000284928492849287F3849287F2800280000202021FC207020883E700000 +BE83:000000284928492849287F3849287F280028000003F802000200020003F80000 +BE84:000000284928492849287F3849287F280028000007F8000807F8040007F80000 +BE85:000000284928492849287F3849287F28002800003EF802083E0820083E080000 +BE86:000000284928492849287F3849287F28002800003EF802883E8820883EF80000 +BE87:000000284928492849287F3849287F28002800003E8802883EF820883EF80000 +BE88:000000284928492849287F3849287F28002800001F0801081F0810141F620000 +BE89:000000284928492849287F3849287F28002800003EF802803EF820803EF80000 +BE8A:000000284928492849287F3849287F28002800003EFC02483E4820483EFC0000 +BE8B:000000284928492849287F3849287F28002800003E1002FE3E3820443E380000 +BE8C:000000284928492849287F3849287F280028000003F802080208020803F80000 +BE8D:000000284928492849287F3849287F28002800000208020803F8020803F80000 +BE8E:000000284928492849287F3849287F2800280000110811081F0811141F620000 +BE8F:000000284928492849287F3849287F2800280000000800080008003400C20000 +BE90:000000284928492849287F3849287F28002800000048004800A8011406620000 +BE91:000000284928492849287F3849287F2800280000000001F00208020801F00000 +BE92:000000284928492849287F3849287F280028000003F80020002000D003080000 +BE93:000000284928492849287F3849287F2800280000004003F8004000A003180000 +BE94:000000284928492849287F3849287F280028000003F8000803F8000800080000 +BE95:000000284928492849287F3849287F280028000003F8020003F8020003F80000 +BE96:000000284928492849287F3849287F280028000000000FF8022002200FF80000 +BE97:000000284928492849287F3849287F280028000000800FF803E0041003E00000 +BE98:000000000010001024902490249E3F902490249E3F9000100010001000100000 +BE99:0000000849084908490E7F08490E7F080008000007F800080008000800080000 +BE9A:0000000849084908490E7F08490E7F080008000000003EF80208020802080000 +BE9B:0000000849084908490E7F08490E7F080008000000001F080108011401620000 +BE9C:0000000849084908490E7F08490E7F080008000008000800080008000FF80000 +BE9D:0000000849084908490E7F08490E7F0800080000000010F8101010301ECC0000 +BE9E:0000000849084908490E7F08490E7F08000800000808087F081C08220F9C0000 +BE9F:0000000849084908490E7F08490E7F080008000003F802000200020003F80000 +BEA0:0000000849084908490E7F08490E7F080008000007F8000807F8040007F80000 +BEA1:0000000849084908490E7F08490E7F08000800003EF802083E0820083E080000 +BEA2:0000000849084908490E7F08490E7F08000800003EF802883E8820883EF80000 +BEA3:0000000849084908490E7F08490E7F08000800003E8802883EF820883EF80000 +BEA4:0000000849084908490E7F08490E7F08000800001F0801081F0810141F620000 +BEA5:0000000849084908490E7F08490E7F08000800003EF802803EF820803EF80000 +BEA6:0000000849084908490E7F08490E7F08000800003EFC02483E4820483EFC0000 +BEA7:0000000849084908490E7F08490E7F08000800001F08017F1F1C10221F1C0000 +BEA8:0000000849084908490E7F08490E7F080008000003F802080208020803F80000 +BEA9:0000000849084908490E7F08490E7F08000800000208020803F8020803F80000 +BEAA:0000000849084908490E7F08490E7F0800080000110811081F0811141F620000 +BEAB:0000000849084908490E7F08490E7F0800080000001000100010006801840000 +BEAC:0000000849084908490E7F08490E7F08000800000048004800A8011406620000 +BEAD:0000000849084908490E7F08490E7F0800080000000003F00408040803F00000 +BEAE:0000000849084908490E7F08490E7F080008000003F80020002000D003080000 +BEAF:0000000849084908490E7F08490E7F0800080000004003F8004000A003180000 +BEB0:0000000849084908490E7F08490E7F080008000003F8000803F8000800080000 +BEB1:0000000849084908490E7F08490E7F080008000003F8020003F8020003F80000 +BEB2:0000000849084908490E7F08490E7F080008000000000FF8022002200FF80000 +BEB3:0000000849084908490E7F08490E7F080008000000800FF803E0041003E00000 +BEB4:000000000012001224922492249E3F922492249E3F9200120012001200120000 +BEB5:000000284928492849387F2849387F280028000007F800080008000800080000 +BEB6:000000284928492849387F2849387F280028000000003EF80208020802080000 +BEB7:000000284928492849387F2849387F280028000000003E100210022802C40000 +BEB8:000000284928492849387F2849387F280028002808000800080008000FF80000 +BEB9:000000284928492849387F2849387F2800280000000020F8201020303ECC0000 +BEBA:000000284928492849387F2849387F2800280000202021FC207020883E700000 +BEBB:000000284928492849387F2849387F280028000003F802000200020003F80000 +BEBC:000000284928492849387F2849387F280028000007F8000807F8040007F80000 +BEBD:000000284928492849387F2849387F28002800003EF802083E0820083E080000 +BEBE:000000284928492849387F2849387F28002800003EF802883E8820883EF80000 +BEBF:000000284928492849387F2849387F28002800003E8802883EF820883EF80000 +BEC0:000000284928492849387F2849387F28002800001F0801081F0810141F620000 +BEC1:000000284928492849387F2849387F28002800003EF802803EF820803EF80000 +BEC2:000000284928492849387F2849387F28002800003EFC02483E4820483EFC0000 +BEC3:000000284928492849387F2849387F28002800003E1002FE3E3820443E380000 +BEC4:000000284928492849387F2849387F280028000003F802080208020803F80000 +BEC5:000000284928492849387F2849387F28002800000208020803F8020803F80000 +BEC6:000000284928492849387F2849387F2800280000110811081F0811141F620000 +BEC7:000000284928492849387F2849387F2800280000000800080008003400C20000 +BEC8:000000284928492849387F2849387F28002800000048004800A8011406620000 +BEC9:000000284928492849387F2849387F2800280000000001F00208020801F00000 +BECA:000000284928492849387F2849387F280028000003F80020002000D003080000 +BECB:000000284928492849387F2849387F2800280000004003F8004000A003180000 +BECC:000000284928492849387F2849387F280028000003F8000803F8000800080000 +BECD:000000284928492849387F2849387F280028000003F8020003F8020003F80000 +BECE:000000284928492849387F2849387F280028000000000FF8022002200FF80000 +BECF:000000284928492849387F2849387F280028000000800FF803E0041003E00000 +BED0:00000000000200022482248224823F9E248224823F8200020002000200020000 +BED1:000000084908490849087F3849087F0800080000000007F80008000800080000 +BED2:000000084908490849087F3849087F080008000000003EF80208020802080000 +BED3:000000084908490849087F3849087F080008000000001F080108011401620000 +BED4:000000084908490849087F3849087F080008000000001000100010001FF80000 +BED5:000000084908490849087F3849087F0800080000000020F8201020303ECC0000 +BED6:000000084908490849087F3849087F0800080000202021FC207020883E700000 +BED7:000000084908490849087F3849087F080008000003F802000200020003F80000 +BED8:000000084908490849087F3849087F080008000007F8000807F8040007F80000 +BED9:000000084908490849087F3849087F08000800003EF802083E0820083E080000 +BEDA:000000084908490849087F3849087F08000800003EF802883E8820883EF80000 +BEDB:000000084908490849087F3849087F08000800003E8802883EF820883EF80000 +BEDC:000000084908490849087F3849087F08000800000F8800880F8808140FA20000 +BEDD:000000084908490849087F3849087F08000800003EF802803EF820803EF80000 +BEDE:000000084908490849087F3849087F08000800003EFC02483E4820483EFC0000 +BEDF:000000084908490849087F3849087F08000800003E1002FE3E3820443E380000 +BEE0:000000084908490849087F3849087F080008000003F802080208020803F80000 +BEE1:000000084908490849087F3849087F08000800000208020803F8020803F80000 +BEE2:000000084908490849087F3849087F0800080000210821083F0821143F620000 +BEE3:000000084908490849087F3849087F0800080000001000100010006801840000 +BEE4:000000084908490849087F3849087F08000800000048004800A8011406620000 +BEE5:000000084908490849087F3849087F0800080000000003F00408040803F00000 +BEE6:000000084908490849087F3849087F080008000003F80020002000D003080000 +BEE7:000000084908490849087F3849087F0800080000004003F8004000A003180000 +BEE8:000000084908490849087F3849087F080008000003F8000803F8000800080000 +BEE9:000000084908490849087F3849087F080008000003F8020003F8020003F80000 +BEEA:000000084908490849087F3849087F080008000000000FF8022002200FF80000 +BEEB:000000084908490849087F3849087F080008000000800FF803E0041003E00000 +BEEC:00000000000A000A248A248A248A3FBA248A248A3F8A000A000A000A000A0000 +BEED:000000284928492849287FE849287F280028000007F800080008000800080000 +BEEE:000000284928492849287FE849287F280028000000003EF80208020802080000 +BEEF:000000284928492849287FE849287F280028000000003E100210022802C40000 +BEF0:000000284928492849287FE849287F280028000008000800080008000FF80000 +BEF1:000000284928492849287FE849287F2800280000000020F8201020303ECC0000 +BEF2:000000284928492849287FE849287F2800280000202021FC207020883E700000 +BEF3:000000284928492849287FE849287F280028000003F802000200020003F80000 +BEF4:000000284928492849287FE849287F280028000007F8000807F8040007F80000 +BEF5:000000284928492849287FE849287F28002800003EF802083E0820083E080000 +BEF6:000000284928492849287FE849287F28002800003EF802883E8820883EF80000 +BEF7:000000284928492849287FE849287F28002800003E8802883EF820883EF80000 +BEF8:000000284928492849287FE849287F28002800001F0801081F0810141F620000 +BEF9:000000284928492849287FE849287F28002800003EF802803EF820803EF80000 +BEFA:000000284928492849287FE849287F28002800003EFC02483E4820483EFC0000 +BEFB:000000284928492849287FE849287F28002800003E1002FE3E3820443E380000 +BEFC:000000284928492849287FE849287F280028000003F802080208020803F80000 +BEFD:000000284928492849287FE849287F28002800000208020803F8020803F80000 +BEFE:000000284928492849287FE849287F2800280000110811081F0811141F620000 +BEFF:000000284928492849287FE849287F2800280000000800080008003400C20000 +BF00:000000284928492849287FE849287F28002800000048004800A8011406620000 +BF01:000000284928492849287FE849287F2800280000000001F00208020801F00000 +BF02:000000284928492849287FE849287F280028000003F80020002000D003080000 +BF03:000000284928492849287FE849287F2800280000004003F8004000A003180000 +BF04:000000284928492849287FE849287F280028000003F8000803F8000800080000 +BF05:000000284928492849287FE849287F280028000003F8020003F8020003F80000 +BF06:000000284928492849287FE849287F280028000000000FF8022002200FF80000 +BF07:000000284928492849287FE849287F280028000000800FF803E0041003E00000 +BF08:000000000002000224822482249E3F822482249E3F8200020002000200020000 +BF09:000000084908490849387F0849387F0800080000000007F80008000800080000 +BF0A:000000084908490849387F0849387F080008000000003EF80208020802080000 +BF0B:000000084908490849387F0849387F080008000000001F080108011401620000 +BF0C:000000084908490849387F0849387F080008000800001000100010001FF80000 +BF0D:000000084908490849387F0849387F0800080000000020F8201020303ECC0000 +BF0E:000000084908490849387F0849387F0800080000202021FC207020883E700000 +BF0F:000000084908490849387F0849387F080008000003F802000200020003F80000 +BF10:000000084908490849387F0849387F080008000007F8000807F8040007F80000 +BF11:000000084908490849387F0849387F08000800003EF802083E0820083E080000 +BF12:000000084908490849387F0849387F08000800003EF802883E8820883EF80000 +BF13:000000084908490849387F0849387F08000800003E8802883EF820883EF80000 +BF14:000000084908490849387F0849387F08000800000F8800880F8808140FA20000 +BF15:000000084908490849387F0849387F08000800003EF802803EF820803EF80000 +BF16:000000084908490849387F0849387F08000800003EFC02483E4820483EFC0000 +BF17:000000084908490849387F0849387F08000800003E1002FE3E3820443E380000 +BF18:000000084908490849387F0849387F080008000003F802080208020803F80000 +BF19:000000084908490849387F0849387F08000800000208020803F8020803F80000 +BF1A:000000084908490849387F0849387F0800080000210821083F0821143F620000 +BF1B:000000084908490849387F0849387F0800080000001000100010006801840000 +BF1C:000000084908490849387F0849387F08000800000048004800A8011406620000 +BF1D:000000084908490849387F0849387F0800080000000003F00408040803F00000 +BF1E:000000084908490849387F0849387F080008000003F80020002000D003080000 +BF1F:000000084908490849387F0849387F0800080000004003F8004000A003180000 +BF20:000000084908490849387F0849387F080008000003F8000803F8000800080000 +BF21:000000084908490849387F0849387F080008000003F8020003F8020003F80000 +BF22:000000084908490849387F0849387F080008000000000FF8022002200FF80000 +BF23:000000084908490849387F0849387F080008000000800FF803E0041003E00000 +BF24:00000000000A000A248A248A24BA3F8A248A24BA3F8A000A000A000A000A0000 +BF25:000000284928492849E87F2849E87F280028000007F800080008000800080000 +BF26:000000284928492849E87F2849E87F280028000000003EF80208020802080000 +BF27:000000284928492849E87F2849E87F280028000000003E100210022802C40000 +BF28:000000284928492849E87F2849E87F280028002808000800080008000FF80000 +BF29:000000284928492849E87F2849E87F2800280000000020F8201020303ECC0000 +BF2A:000000284928492849E87F2849E87F2800280000202021FC207020883E700000 +BF2B:000000284928492849E87F2849E87F280028000003F802000200020003F80000 +BF2C:000000284928492849E87F2849E87F280028000007F8000807F8040007F80000 +BF2D:000000284928492849E87F2849E87F28002800003EF802083E0820083E080000 +BF2E:000000284928492849E87F2849E87F28002800003EF802883E8820883EF80000 +BF2F:000000284928492849E87F2849E87F28002800003E8802883EF820883EF80000 +BF30:000000284928492849E87F2849E87F28002800001F0801081F0810141F620000 +BF31:000000284928492849E87F2849E87F28002800003EF802803EF820803EF80000 +BF32:000000284928492849E87F2849E87F28002800003EFC02483E4820483EFC0000 +BF33:000000284928492849E87F2849E87F28002800003E1002FE3E3820443E380000 +BF34:000000284928492849E87F2849E87F280028000003F802080208020803F80000 +BF35:000000284928492849E87F2849E87F28002800000208020803F8020803F80000 +BF36:000000284928492849E87F2849E87F2800280000110811081F0811141F620000 +BF37:000000284928492849E87F2849E87F2800280000000800080008003400C20000 +BF38:000000284928492849E87F2849E87F28002800000048004800A8011406620000 +BF39:000000284928492849E87F2849E87F2800280000000001F00208020801F00000 +BF3A:000000284928492849E87F2849E87F280028000003F80020002000D003080000 +BF3B:000000284928492849E87F2849E87F2800280000004003F8004000A003180000 +BF3C:000000284928492849E87F2849E87F280028000003F8000803F8000800080000 +BF3D:000000284928492849E87F2849E87F280028000003F8020003F8020003F80000 +BF3E:000000284928492849E87F2849E87F280028000000000FF8022002200FF80000 +BF3F:000000284928492849E87F2849E87F280028000000800FF803E0041003E00000 +BF40:000000002108210821083FF8210821083FF800000100010001007FFC00000000 +BF41:0000210821083FF821083FF8010001007FFC00001FF000100010001000100000 +BF42:0000210821083FF821083FF8010001007FFC000000003EF80208020802080000 +BF43:0000210821083FF821083FF8010001007FFC000000001E100210022802C40000 +BF44:0000210821083FF821083FF8010001007FFC000000001000100010001FF00000 +BF45:0000210821083FF821083FF8010001007FFC0000000020F8201020303ECC0000 +BF46:0000210821083FF821083FF8010001007FFC0000202021FC207020883E700000 +BF47:0000210821083FF821083FF8010001007FFC00001FF01000100010001FF00000 +BF48:0000210821083FF821083FF8010001007FFC00001FF000101FF010001FF00000 +BF49:0000210821083FF821083FF8010001007FFC00003EF802083E0820083E080000 +BF4A:0000210821083FF821083FF8010001007FFC00003EF802883E8820883EF80000 +BF4B:0000210821083FF821083FF8010001007FFC00003E8802883EF820883EF80000 +BF4C:0000210821083FF821083FF8010001007FFC00003E1002103E1020283EC40000 +BF4D:0000210821083FF821083FF8010001007FFC00003EF802803EF820803EF80000 +BF4E:0000210821083FF821083FF8010001007FFC00003EFC02483E4820483EFC0000 +BF4F:0000210821083FF821083FF8010001007FFC00003E2003FC3E7020883E700000 +BF50:0000210821083FF821083FF8010001007FFC00001FF01010101010101FF00000 +BF51:0000210821083FF821083FF8010001007FFC0000101010101FF010101FF00000 +BF52:0000210821083FF821083FF8010001007FFC0000222022203E2022503E880000 +BF53:0000210821083FF821083FF8010001007FFC000000000100010002800C400000 +BF54:0000210821083FF821083FF8010001007FFC00000000024002400DA033100000 +BF55:0000210821083FF821083FF8010001007FFC0000000007C00820082007C00000 +BF56:0000210821083FF821083FF8010001007FFC0000000007E00080014006200000 +BF57:0000210821083FF821083FF8010001007FFC0000008007E00080014006200000 +BF58:0000210821083FF821083FF8010001007FFC00001FF000101FF0001000100000 +BF59:0000210821083FF821083FF8010001007FFC00001FF010001FF010001FF00000 +BF5A:0000210821083FF821083FF8010001007FFC000000001FF0044004401FF00000 +BF5B:0000210821083FF821083FF8010001007FFC000001001FF007C0082007C00000 +BF5C:0000001000104450445044507FD0445E44507FD0041004107FD0001000100000 +BF5D:0000248824883F88248E3F88040804087FE8000007F800080008000800080000 +BF5E:0000248824883F88248E3F88040804087FE8000000003EF80208020802080000 +BF5F:0000248824883F88248E3F88040804087FE8000000001F080108011401620000 +BF60:0000248824883F88248E3F88040804087FE8000008000800080008000FF80000 +BF61:0000248824883F88248E3F88040804087FE80000000010F8101010301ECC0000 +BF62:0000248824883F88248E3F88040804087FE800000808087F081C08220F9C0000 +BF63:0000248824883F88248E3F88040804087FE8000003F802000200020003F80000 +BF64:0000248824883F88248E3F88040804087FE8000007F8000807F8040007F80000 +BF65:0000248824883F88248E3F88040804087FE800003EF802083E0820083E080000 +BF66:0000248824883F88248E3F88040804087FE800003EF802883E8820883EF80000 +BF67:0000248824883F88248E3F88040804087FE800003E8802883EF820883EF80000 +BF68:0000248824883F88248E3F88040804087FE800001F0801081F0810141F620000 +BF69:0000248824883F88248E3F88040804087FE800003EF802803EF820803EF80000 +BF6A:0000248824883F88248E3F88040804087FE800003EFC02483E4820483EFC0000 +BF6B:0000248824883F88248E3F88040804087FE800001F08017F1F1C10221F1C0000 +BF6C:0000248824883F88248E3F88040804087FE8000003F802080208020803F80000 +BF6D:0000248824883F88248E3F88040804087FE800000208020803F8020803F80000 +BF6E:0000248824883F88248E3F88040804087FE80000110811081F0811141F620000 +BF6F:0000248824883F88248E3F88040804087FE80000001000100010006801840000 +BF70:0000248824883F88248E3F88040804087FE800000048004800A8011406620000 +BF71:0000248824883F88248E3F88040804087FE80000000003F00408040803F00000 +BF72:0000248824883F88248E3F88040804087FE8000003F80020002000D003080000 +BF73:0000248824883F88248E3F88040804087FE80000004003F8004000A003180000 +BF74:0000248824883F88248E3F88040804087FE8000003F8000803F8000800080000 +BF75:0000248824883F88248E3F88040804087FE8000003F8020003F8020003F80000 +BF76:0000248824883F88248E3F88040804087FE8000000000FF8022002200FF80000 +BF77:0000248824883F88248E3F88040804087FE8000000800FF803E0041003E00000 +BF78:0000001200124452445244527FD2445E44527FD2041204127FD2001200120000 +BF79:000024A824A83FA824B83FA8042804287FA8000007F800080008000800080000 +BF7A:000024A824A83FA824B83FA8042804287FA8000000003EF80208020802080000 +BF7B:000024A824A83FA824B83FA8042804287FA8000000001F080108011401620000 +BF7C:000024A824A83FA824B83FA8042804287FA8000008000800080008000FF80000 +BF7D:000024A824A83FA824B83FA8042804287FA80000000010F8101010301ECC0000 +BF7E:000024A824A83FA824B83FA8042804287FA800000808087F081C08220F9C0000 +BF7F:000024A824A83FA824B83FA8042804287FA8000003F802000200020003F80000 +BF80:000024A824A83FA824B83FA8042804287FA8000007F8000807F8040007F80000 +BF81:000024A824A83FA824B83FA8042804287FA800003EF802083E0820083E080000 +BF82:000024A824A83FA824B83FA8042804287FA800003EF802883E8820883EF80000 +BF83:000024A824A83FA824B83FA8042804287FA800003E8802883EF820883EF80000 +BF84:000024A824A83FA824B83FA8042804287FA800001F0801081F0810141F620000 +BF85:000024A824A83FA824B83FA8042804287FA800003EF802803EF820803EF80000 +BF86:000024A824A83FA824B83FA8042804287FA800003EFC02483E4820483EFC0000 +BF87:000024A824A83FA824B83FA8042804287FA800001F08017F1F1C10221F1C0000 +BF88:000024A824A83FA824B83FA8042804287FA8000003F802080208020803F80000 +BF89:000024A824A83FA824B83FA8042804287FA800000208020803F8020803F80000 +BF8A:000024A824A83FA824B83FA8042804287FA80000110811081F0811141F620000 +BF8B:000024A824A83FA824B83FA8042804287FA80000001000100010006801840000 +BF8C:000024A824A83FA824B83FA8042804287FA800000048004800A8011406620000 +BF8D:000024A824A83FA824B83FA8042804287FA80000000003F00408040803F00000 +BF8E:000024A824A83FA824B83FA8042804287FA8000003F80020002000D003080000 +BF8F:000024A824A83FA824B83FA8042804287FA80000004003F8004000A003180000 +BF90:000024A824A83FA824B83FA8042804287FA8000003F8000803F8000800080000 +BF91:000024A824A83FA824B83FA8042804287FA8000003F8020003F8020003F80000 +BF92:000024A824A83FA824B83FA8042804287FA8000000000FF8022002200FF80000 +BF93:000024A824A83FA824B83FA8042804287FA8000000800FF803E0041003E00000 +BF94:0000000800084448444844487FC8444844487FC8040804087FE8000800080000 +BF95:0000248824883F8824883F88040804087FE8000007F800080008000800080000 +BF96:0000248824883F8824883F88040804087FE8000000003EF80208020802080000 +BF97:0000248824883F8824883F88040804087FE8000000001F080108011401620000 +BF98:0000248824883F8824883F88040804087FE8000008000800080008000FF80000 +BF99:0000248824883F8824883F88040804087FE80000000010F8101010301ECC0000 +BF9A:0000248824883F8824883F88040804087FE800000808087F081C08220F9C0000 +BF9B:0000248824883F8824883F88040804087FE8000003F802000200020003F80000 +BF9C:0000248824883F8824883F88040804087FE8000007F8000807F8040007F80000 +BF9D:0000248824883F8824883F88040804087FE800003EF802083E0820083E080000 +BF9E:0000248824883F8824883F88040804087FE800003EF802883E8820883EF80000 +BF9F:0000248824883F8824883F88040804087FE800003E8802883EF820883EF80000 +BFA0:0000248824883F8824883F88040804087FE800001F0801081F0810141F620000 +BFA1:0000248824883F8824883F88040804087FE800003EF802803EF820803EF80000 +BFA2:0000248824883F8824883F88040804087FE800003EFC02483E4820483EFC0000 +BFA3:0000248824883F8824883F88040804087FE800001F08017F1F1C10221F1C0000 +BFA4:0000248824883F8824883F88040804087FE8000003F802080208020803F80000 +BFA5:0000248824883F8824883F88040804087FE800000208020803F8020803F80000 +BFA6:0000248824883F8824883F88040804087FE80000110811081F0811141F620000 +BFA7:0000248824883F8824883F88040804087FE80000001000100010006801840000 +BFA8:0000248824883F8824883F88040804087FE800000048004800A8011406620000 +BFA9:0000248824883F8824883F88040804087FE80000000003F00408040803F00000 +BFAA:0000248824883F8824883F88040804087FE8000003F80020002000D003080000 +BFAB:0000248824883F8824883F88040804087FE80000004003F8004000A003180000 +BFAC:0000248824883F8824883F88040804087FE8000003F8000803F8000800080000 +BFAD:0000248824883F8824883F88040804087FE8000003F8020003F8020003F80000 +BFAE:0000248824883F8824883F88040804087FE8000000000FF8022002200FF80000 +BFAF:0000248824883F8824883F88040804087FE8000000800FF803E0041003E00000 +BFB0:000000002108210821083FF8210821083FF804400440044004407FFC00000000 +BFB1:0000210821083FF821083FF8044004407FFC00001FF000100010001000100000 +BFB2:0000210821083FF821083FF8044004407FFC000000003EF80208020802080000 +BFB3:0000210821083FF821083FF8044004407FFC000000001E100210022802C40000 +BFB4:0000210821083FF821083FF8044004407FFC000000001000100010001FF00000 +BFB5:0000210821083FF821083FF8044004407FFC0000000020F8201020303ECC0000 +BFB6:0000210821083FF821083FF8044004407FFC0000202021FC207020883E700000 +BFB7:0000210821083FF821083FF8044004407FFC00001FF01000100010001FF00000 +BFB8:0000210821083FF821083FF8044004407FFC00001FF000101FF010001FF00000 +BFB9:0000210821083FF821083FF8044004407FFC00003EF802083E0820083E080000 +BFBA:0000210821083FF821083FF8044004407FFC00003EF802883E8820883EF80000 +BFBB:0000210821083FF821083FF8044004407FFC00003E8802883EF820883EF80000 +BFBC:0000210821083FF821083FF8044004407FFC00003E1002103E1020283EC40000 +BFBD:0000210821083FF821083FF8044004407FFC00003EF802803EF820803EF80000 +BFBE:0000210821083FF821083FF8044004407FFC00003EFC02483E4820483EFC0000 +BFBF:0000210821083FF821083FF8044004407FFC00003E2003FC3E7020883E700000 +BFC0:0000210821083FF821083FF8044004407FFC00001FF01010101010101FF00000 +BFC1:0000210821083FF821083FF8044004407FFC0000101010101FF010101FF00000 +BFC2:0000210821083FF821083FF8044004407FFC0000222022203E2022503E880000 +BFC3:0000210821083FF821083FF8044004407FFC000000000100010002800C400000 +BFC4:0000210821083FF821083FF8044004407FFC00000000024002400DA033100000 +BFC5:0000210821083FF821083FF8044004407FFC0000000007C00820082007C00000 +BFC6:0000210821083FF821083FF8044004407FFC0000000007E00080014006200000 +BFC7:0000210821083FF821083FF8044004407FFC0000008007E00080014006200000 +BFC8:0000210821083FF821083FF8044004407FFC00001FF000101FF0001000100000 +BFC9:0000210821083FF821083FF8044004407FFC00001FF010001FF010001FF00000 +BFCA:0000210821083FF821083FF8044004407FFC000000001FF0044004401FF00000 +BFCB:0000210821083FF821083FF8044004407FFC000001001FF007C0082007C00000 +BFCC:000000002108210821083FF8210821083FF800003FF801000100010001000000 +BFCD:0000210821083FF821083FF800007FFC010001001FF000100010001000100000 +BFCE:0000210821083FF821083FF800007FFC0100010000003EF80208020802080000 +BFCF:0000210821083FF821083FF800007FFC0100010000001E100210022802C40000 +BFD0:0000210821083FF821083FF8000000007FFC010001001100100010001FF00000 +BFD1:0000210821083FF821083FF800007FFC01000100000020F8201020303ECC0000 +BFD2:0000210821083FF821083FF800007FFC01000100202021FC207020883E700000 +BFD3:0000210821083FF821083FF800007FFC010001001FF01000100010001FF00000 +BFD4:0000210821083FF821083FF800007FFC010001001FF000101FF010001FF00000 +BFD5:0000210821083FF821083FF800007FFC010001003EF802083E0820083E080000 +BFD6:0000210821083FF821083FF800007FFC010001003EF802883E8820883EF80000 +BFD7:0000210821083FF821083FF800007FFC010001003E8802883EF820883EF80000 +BFD8:0000210821083FF821083FF800007FFC010001003E1002103E1020283EC40000 +BFD9:0000210821083FF821083FF800007FFC010001003EF802803EF820803EF80000 +BFDA:0000210821083FF821083FF800007FFC010001003EFC02483E4820483EFC0000 +BFDB:0000210821083FF821083FF800007FFC010001003E2003FC3E7020883E700000 +BFDC:0000210821083FF821083FF800007FFC010001001FF01010101010101FF00000 +BFDD:0000210821083FF821083FF800007FFC01000100101010101FF010101FF00000 +BFDE:0000210821083FF821083FF800007FFC01000100222022203E2022503E880000 +BFDF:0000210821083FF821083FF800007FFC0100010000000100010002800C400000 +BFE0:0000210821083FF821083FF800007FFC010001000000024002400DA033100000 +BFE1:0000210821083FF821083FF800007FFC01000100000007C00820082007C00000 +BFE2:0000210821083FF821083FF800007FFC01000100000007E00080014006200000 +BFE3:0000210821083FF821083FF800007FFC01000100008007E00080014006200000 +BFE4:0000210821083FF821083FF800007FFC010001001FF000101FF0001000100000 +BFE5:0000210821083FF821083FF800007FFC010001001FF010001FF010001FF00000 +BFE6:0000210821083FF821083FF800007FFC0100010000001FF0044004401FF00000 +BFE7:0000210821083FF821083FF800007FFC0100010001001FF007C0082007C00000 +BFE8:000000084448444844487FC8444844487FC800087FE8040804F8040804080000 +BFE9:248824883F8824883F8800087FE8027802080000000007F80008000800080000 +BFEA:248824883F8824883F8800087FE802780208000000003EF80208020802080000 +BFEB:248824883F8824883F8800087FE802780208000000001F080108011401620000 +BFEC:248824883F8824883F88000800087FE80278020802081000100010001FF80000 +BFED:248824883F8824883F8800087FE8027802080000000020F8201020303ECC0000 +BFEE:248824883F8824883F8800087FE8027802080000202021FC207020883E700000 +BFEF:248824883F8824883F8800087FE802780208000003F802000200020003F80000 +BFF0:248824883F8824883F8800087FE802780208000007F8000807F8040007F80000 +BFF1:248824883F8824883F8800087FE80278020800003EF802083E0820083E080000 +BFF2:248824883F8824883F8800087FE80278020800003EF802883E8820883EF80000 +BFF3:248824883F8824883F8800087FE80278020800003E8802883EF820883EF80000 +BFF4:248824883F8824883F8800087FE80278020800000F8800880F8808140FA20000 +BFF5:248824883F8824883F8800087FE80278020800003EF802803EF820803EF80000 +BFF6:248824883F8824883F8800087FE80278020800003EFC02483E4820483EFC0000 +BFF7:248824883F8824883F8800087FE80278020800003E1002FE3E3820443E380000 +BFF8:248824883F8824883F8800087FE802780208000003F802080208020803F80000 +BFF9:248824883F8824883F8800087FE80278020800000208020803F8020803F80000 +BFFA:248824883F8824883F8800087FE8027802080000210821083F0821143F620000 +BFFB:248824883F8824883F8800087FE8027802080000001000100010006801840000 +BFFC:248824883F8824883F8800087FE80278020800000048004800A8011406620000 +BFFD:248824883F8824883F8800087FE8027802080000000003F00408040803F00000 +BFFE:248824883F8824883F8800087FE802780208000003F80020002000D003080000 +BFFF:248824883F8824883F8800087FE8027802080000004003F8004000A003180000 +C000:248824883F8824883F8800087FE802780208000003F8000803F8000800080000 +C001:248824883F8824883F8800087FE802780208000003F8020003F8020003F80000 +C002:248824883F8824883F8800087FE802780208000000000FF8022002200FF80000 +C003:248824883F8824883F8800087FE802780208000000800FF803E0041003E00000 +C004:0000000A444A444A444A7FCA444A444A7FCA000A7FEA040A047A040A040A0000 +C005:24A824A83FA824A83FA800287FA805E804280000000007F80008000800080000 +C006:24A824A83FA824A83FA800287FA805E80428000000003EF80208020802080000 +C007:24A824A83FA824A83FA800287FA805E80428000000001F080108011401620000 +C008:24A824A83FA824A83FA8002800287FA8042805E804281428100010001FF80000 +C009:24A824A83FA824A83FA800287FA805E804280000000020F8201020303ECC0000 +C00A:24A824A83FA824A83FA800287FA805E804280000202021FC207020883E700000 +C00B:24A824A83FA824A83FA800287FA805E80428000003F802000200020003F80000 +C00C:24A824A83FA824A83FA800287FA805E80428000007F8000807F8040007F80000 +C00D:24A824A83FA824A83FA800287FA805E8042800003EF802083E0820083E080000 +C00E:24A824A83FA824A83FA800287FA805E8042800003EF802883E8820883EF80000 +C00F:24A824A83FA824A83FA800287FA805E8042800003E8802883EF820883EF80000 +C010:24A824A83FA824A83FA800287FA805E8042800000F8800880F8808140FA20000 +C011:24A824A83FA824A83FA800287FA805E8042800003EF802803EF820803EF80000 +C012:24A824A83FA824A83FA800287FA805E8042800003EFC02483E4820483EFC0000 +C013:24A824A83FA824A83FA800287FA805E8042800003E1002FE3E3820443E380000 +C014:24A824A83FA824A83FA800287FA805E80428000003F802080208020803F80000 +C015:24A824A83FA824A83FA800287FA805E8042800000208020803F8020803F80000 +C016:24A824A83FA824A83FA800287FA805E804280000210821083F0821143F620000 +C017:24A824A83FA824A83FA800287FA805E804280000001000100010006801840000 +C018:24A824A83FA824A83FA800287FA805E8042800000048004800A8011406620000 +C019:24A824A83FA824A83FA800287FA805E804280000000003F00408040803F00000 +C01A:24A824A83FA824A83FA800287FA805E80428000003F80020002000D003080000 +C01B:24A824A83FA824A83FA800287FA805E804280000004003F8004000A003180000 +C01C:24A824A83FA824A83FA800287FA805E80428000003F8000803F8000800080000 +C01D:24A824A83FA824A83FA800287FA805E80428000003F8020003F8020003F80000 +C01E:24A824A83FA824A83FA800287FA805E80428000000000FF8022002200FF80000 +C01F:24A824A83FA824A83FA800287FA805E80428000000800FF803E0041003E00000 +C020:000000084448444844487FC8444844487FC800087FE804080408040804080000 +C021:248824883F8824883F8800087FE8020802000000000007F80008000800080000 +C022:248824883F8824883F8800087FE802080200000000003EF80208020802080000 +C023:248824883F8824883F8800087FE802080200000000001F080108011401620000 +C024:248824883F8824883F88000800087FE80208020802081008100010001FF80000 +C025:248824883F8824883F8800087FE8020802000000000020F8201020303ECC0000 +C026:248824883F8824883F8800087FE8020802000000202021FC207020883E700000 +C027:248824883F8824883F8800087FE802080200000003F802000200020003F80000 +C028:248824883F8824883F8800087FE802080200000007F8000807F8040007F80000 +C029:248824883F8824883F8800087FE80208020000003EF802083E0820083E080000 +C02A:248824883F8824883F8800087FE80208020000003EF802883E8820883EF80000 +C02B:248824883F8824883F8800087FE80208020000003E8802883EF820883EF80000 +C02C:248824883F8824883F8800087FE80208020000000F8800880F8808140FA20000 +C02D:248824883F8824883F8800087FE80208020000003EF802803EF820803EF80000 +C02E:248824883F8824883F8800087FE80208020000003EFC02483E4820483EFC0000 +C02F:248824883F8824883F8800087FE80208020000003E1002FE3E3820443E380000 +C030:248824883F8824883F8800087FE802080200000003F802080208020803F80000 +C031:248824883F8824883F8800087FE80208020000000208020803F8020803F80000 +C032:248824883F8824883F8800087FE8020802000000210821083F0821143F620000 +C033:248824883F8824883F8800087FE8020802000000001000100010006801840000 +C034:248824883F8824883F8800087FE80208020000000048004800A8011406620000 +C035:248824883F8824883F8800087FE8020802000000000003F00408040803F00000 +C036:248824883F8824883F8800087FE802080200000003F80020002000D003080000 +C037:248824883F8824883F8800087FE8020802000000004003F8004000A003180000 +C038:248824883F8824883F8800087FE802080200000003F8000803F8000800080000 +C039:248824883F8824883F8800087FE802080200000003F8020003F8020003F80000 +C03A:248824883F8824883F8800087FE802080200000000000FF8022002200FF80000 +C03B:248824883F8824883F8800087FE802080200000000800FF803E0041003E00000 +C03C:000000002108210821083FF8210821083FF800007FFC04400440044004400000 +C03D:0000210821083FF821083FF800007FFC044004401FF000100010001000100000 +C03E:0000210821083FF821083FF800007FFC0440044000003EF80208020802080000 +C03F:0000210821083FF821083FF800007FFC0440044000001E100210022802C40000 +C040:0000210821083FF821083FF8000000007FFC044004401440100010001FF00000 +C041:0000210821083FF821083FF800007FFC04400440000020F8201020303ECC0000 +C042:0000210821083FF821083FF800007FFC04400440202021FC207020883E700000 +C043:0000210821083FF821083FF800007FFC044004401FF01000100010001FF00000 +C044:0000210821083FF821083FF800007FFC044004401FF000101FF010001FF00000 +C045:0000210821083FF821083FF800007FFC044004403EF802083E0820083E080000 +C046:0000210821083FF821083FF800007FFC044004403EF802883E8820883EF80000 +C047:0000210821083FF821083FF800007FFC044004403E8802883EF820883EF80000 +C048:0000210821083FF821083FF800007FFC044004403E1002103E1020283EC40000 +C049:0000210821083FF821083FF800007FFC044004403EF802803EF820803EF80000 +C04A:0000210821083FF821083FF800007FFC044004403EFC02483E4820483EFC0000 +C04B:0000210821083FF821083FF800007FFC044004403E2003FC3E7020883E700000 +C04C:0000210821083FF821083FF800007FFC044004401FF01010101010101FF00000 +C04D:0000210821083FF821083FF800007FFC04400440101010101FF010101FF00000 +C04E:0000210821083FF821083FF800007FFC04400440222022203E2022503E880000 +C04F:0000210821083FF821083FF800007FFC0440044000000100010002800C400000 +C050:0000210821083FF821083FF800007FFC044004400000024002400DA033100000 +C051:0000210821083FF821083FF800007FFC04400440000007C00820082007C00000 +C052:0000210821083FF821083FF800007FFC04400440000007E00080014006200000 +C053:0000210821083FF821083FF800007FFC04400440008007E00080014006200000 +C054:0000210821083FF821083FF800007FFC044004401FF000101FF0001000100000 +C055:0000210821083FF821083FF800007FFC044004401FF010001FF010001FF00000 +C056:0000210821083FF821083FF800007FFC0440044000001FF0044004401FF00000 +C057:0000210821083FF821083FF800007FFC0440044001001FF007C0082007C00000 +C058:000000002108210821083FF8210821083FF8000000007FFC0000000000000000 +C059:0000210821083FF821083FF8000000007FFC00001FF000100010001000100000 +C05A:0000210821083FF821083FF8000000007FFC000000003EF80208020802080000 +C05B:0000210821083FF821083FF8000000007FFC000000001E100210022802C40000 +C05C:0000210821083FF821083FF8000000007FFC000000001000100010001FF00000 +C05D:0000210821083FF821083FF8000000007FFC0000000020F8201020303ECC0000 +C05E:0000210821083FF821083FF8000000007FFC0000202021FC207020883E700000 +C05F:0000210821083FF821083FF8000000007FFC00001FF01000100010001FF00000 +C060:0000210821083FF821083FF8000000007FFC00001FF000101FF010001FF00000 +C061:0000210821083FF821083FF8000000007FFC00003EF802083E0820083E080000 +C062:0000210821083FF821083FF8000000007FFC00003EF802883E8820883EF80000 +C063:0000210821083FF821083FF8000000007FFC00003E8802883EF820883EF80000 +C064:0000210821083FF821083FF8000000007FFC00003E1002103E1020283EC40000 +C065:0000210821083FF821083FF8000000007FFC00003EF802803EF820803EF80000 +C066:0000210821083FF821083FF8000000007FFC00003EFC02483E4820483EFC0000 +C067:0000210821083FF821083FF8000000007FFC00003E2003FC3E7020883E700000 +C068:0000210821083FF821083FF8000000007FFC00001FF01010101010101FF00000 +C069:0000210821083FF821083FF8000000007FFC0000101010101FF010101FF00000 +C06A:0000210821083FF821083FF8000000007FFC0000222022203E2022503E880000 +C06B:0000210821083FF821083FF8000000007FFC000000000100010002800C400000 +C06C:0000210821083FF821083FF8000000007FFC00000000024002400DA033100000 +C06D:0000210821083FF821083FF8000000007FFC0000000007C00820082007C00000 +C06E:0000210821083FF821083FF8000000007FFC0000000007E00080014006200000 +C06F:0000210821083FF821083FF8000000007FFC0000008007E00080014006200000 +C070:0000210821083FF821083FF8000000007FFC00001FF000101FF0001000100000 +C071:0000210821083FF821083FF8000000007FFC00001FF010001FF010001FF00000 +C072:0000210821083FF821083FF8000000007FFC000000001FF0044004401FF00000 +C073:0000210821083FF821083FF8000000007FFC000001001FF007C0082007C00000 +C074:0000000800084448444844487FC8444844487FC800087FE80008000800080000 +C075:0000248824883F8824883F88000800087FE8000007F800080008000800080000 +C076:0000248824883F8824883F88000800087FE8000000003EF80208020802080000 +C077:0000248824883F8824883F88000800087FE8000000001F080108011401620000 +C078:0000248824883F8824883F88000800087FE8000008000800080008000FF80000 +C079:0000248824883F8824883F88000800087FE80000000010F8101010301ECC0000 +C07A:0000248824883F8824883F88000800087FE800000808087F081C08220F9C0000 +C07B:0000248824883F8824883F88000800087FE8000003F802000200020003F80000 +C07C:0000248824883F8824883F88000800087FE8000007F8000807F8040007F80000 +C07D:0000248824883F8824883F88000800087FE800003EF802083E0820083E080000 +C07E:0000248824883F8824883F88000800087FE800003EF802883E8820883EF80000 +C07F:0000248824883F8824883F88000800087FE800003E8802883EF820883EF80000 +C080:0000248824883F8824883F88000800087FE800001F0801081F0810141F620000 +C081:0000248824883F8824883F88000800087FE800003EF802803EF820803EF80000 +C082:0000248824883F8824883F88000800087FE800003EFC02483E4820483EFC0000 +C083:0000248824883F8824883F88000800087FE800001F08017F1F1C10221F1C0000 +C084:0000248824883F8824883F88000800087FE8000003F802080208020803F80000 +C085:0000248824883F8824883F88000800087FE800000208020803F8020803F80000 +C086:0000248824883F8824883F88000800087FE80000110811081F0811141F620000 +C087:0000248824883F8824883F88000800087FE80000001000100010006801840000 +C088:0000248824883F8824883F88000800087FE800000048004800A8011406620000 +C089:0000248824883F8824883F88000800087FE80000000003F00408040803F00000 +C08A:0000248824883F8824883F88000800087FE8000003F80020002000D003080000 +C08B:0000248824883F8824883F88000800087FE80000004003F8004000A003180000 +C08C:0000248824883F8824883F88000800087FE8000003F8000803F8000800080000 +C08D:0000248824883F8824883F88000800087FE8000003F8020003F8020003F80000 +C08E:0000248824883F8824883F88000800087FE8000000000FF8022002200FF80000 +C08F:0000248824883F8824883F88000800087FE8000000800FF803E0041003E00000 +C090:00000000000800082488248824883F88248824883F8800080008000800080000 +C091:000000084908490849087F0849087F0800080000000007F80008000800080000 +C092:000000084908490849087F0849087F080008000000003EF80208020802080000 +C093:000000084908490849087F0849087F080008000000001F080108011401620000 +C094:000000084908490849087F0849087F080008000800001000100010001FF80000 +C095:000000084908490849087F0849087F0800080000000020F8201020303ECC0000 +C096:000000084908490849087F0849087F0800080000202021FC207020883E700000 +C097:000000084908490849087F0849087F080008000003F802000200020003F80000 +C098:000000084908490849087F0849087F080008000007F8000807F8040007F80000 +C099:000000084908490849087F0849087F08000800003EF802083E0820083E080000 +C09A:000000084908490849087F0849087F08000800003EF802883E8820883EF80000 +C09B:000000084908490849087F0849087F08000800003E8802883EF820883EF80000 +C09C:000000084908490849087F0849087F08000800000F8800880F8808140FA20000 +C09D:000000084908490849087F0849087F08000800003EF802803EF820803EF80000 +C09E:000000084908490849087F0849087F08000800003EFC02483E4820483EFC0000 +C09F:000000084908490849087F0849087F08000800003E1002FE3E3820443E380000 +C0A0:000000084908490849087F0849087F080008000003F802080208020803F80000 +C0A1:000000084908490849087F0849087F08000800000208020803F8020803F80000 +C0A2:000000084908490849087F0849087F0800080000210821083F0821143F620000 +C0A3:000000084908490849087F0849087F0800080000001000100010006801840000 +C0A4:000000084908490849087F0849087F08000800000048004800A8011406620000 +C0A5:000000084908490849087F0849087F0800080000000003F00408040803F00000 +C0A6:000000084908490849087F0849087F080008000003F80020002000D003080000 +C0A7:000000084908490849087F0849087F0800080000004003F8004000A003180000 +C0A8:000000084908490849087F0849087F080008000003F8000803F8000800080000 +C0A9:000000084908490849087F0849087F080008000003F8020003F8020003F80000 +C0AA:000000084908490849087F0849087F080008000000000FF8022002200FF80000 +C0AB:000000084908490849087F0849087F080008000000800FF803E0041003E00000 +C0AC:0000000000100010021002100410041E0A101110609000100010001000100000 +C0AD:000000080008040804080C0E120861080008000007F800080008000800080000 +C0AE:000000080008040804080C0E120861080008000000003EF80208020802080000 +C0AF:000000080008040804080C0E120861080008000000001F080108011401620000 +C0B0:000000080008040804080C0E120861080008000808000800080008000FF80000 +C0B1:000000080008040804080C0E1208610800080000000010F8101010301ECC0000 +C0B2:000000080008040804080C0E12086108000800000808087F081C08220F9C0000 +C0B3:000000080008040804080C0E120861080008000003F802000200020003F80000 +C0B4:000000080008040804080C0E120861080008000007F8000807F8040007F80000 +C0B5:000000080008040804080C0E12086108000800003EF802083E0820083E080000 +C0B6:000000080008040804080C0E12086108000800003EF802883E8820883EF80000 +C0B7:000000080008040804080C0E12086108000800003E8802883EF820883EF80000 +C0B8:000000080008040804080C0E12086108000800001F0801081F0810141F620000 +C0B9:000000080008040804080C0E12086108000800003EF802803EF820803EF80000 +C0BA:000000080008040804080C0E12086108000800003EFC02483E4820483EFC0000 +C0BB:000000080008040804080C0E12086108000800001F08017F1F1C10221F1C0000 +C0BC:000000080008040804080C0E120861080008000003F802080208020803F80000 +C0BD:000000080008040804080C0E12086108000800000208020803F8020803F80000 +C0BE:000000080008040804080C0E1208610800080000110811081F0811141F620000 +C0BF:000000080008040804080C0E1208610800080000001000100010006801840000 +C0C0:000000080008040804080C0E12086108000800000048004800A8011406620000 +C0C1:000000080008040804080C0E1208610800080000000003F00408040803F00000 +C0C2:000000080008040804080C0E120861080008000003F80020002000D003080000 +C0C3:000000080008040804080C0E1208610800080000004003F8004000A003180000 +C0C4:000000080008040804080C0E120861080008000003F8000803F8000800080000 +C0C5:000000080008040804080C0E120861080008000003F8020003F8020003F80000 +C0C6:000000080008040804080C0E120861080008000000000FF8022002200FF80000 +C0C7:000000080008040804080C0E120861080008000000800FF803E0041003E00000 +C0C8:0000000000120012021202120412041E0A121112609200120012001200120000 +C0C9:000000280028042804280C38122861280028000007F800080008000800080000 +C0CA:000000280028042804280C38122861280028000000003EF80208020802080000 +C0CB:000000280028042804280C38122861280028000000003E100210022802C40000 +C0CC:000000280028042804280C38122861280028002808000800080008000FF80000 +C0CD:000000280028042804280C381228612800280000000020F8201020303ECC0000 +C0CE:000000280028042804280C381228612800280000202021FC207020883E700000 +C0CF:000000280028042804280C38122861280028000003F802000200020003F80000 +C0D0:000000280028042804280C38122861280028000007F8000807F8040007F80000 +C0D1:000000280028042804280C3812286128002800003EF802083E0820083E080000 +C0D2:000000280028042804280C3812286128002800003EF802883E8820883EF80000 +C0D3:000000280028042804280C3812286128002800003E8802883EF820883EF80000 +C0D4:000000280028042804280C3812286128002800001F0801081F0810141F620000 +C0D5:000000280028042804280C3812286128002800003EF802803EF820803EF80000 +C0D6:000000280028042804280C3812286128002800003EFC02483E4820483EFC0000 +C0D7:000000280028042804280C3812286128002800003E1002FE3E3820443E380000 +C0D8:000000280028042804280C38122861280028000003F802080208020803F80000 +C0D9:000000280028042804280C3812286128002800000208020803F8020803F80000 +C0DA:000000280028042804280C381228612800280000110811081F0811141F620000 +C0DB:000000280028042804280C381228612800280000000800080008003400C20000 +C0DC:000000280028042804280C3812286128002800000048004800A8011406620000 +C0DD:000000280028042804280C381228612800280000000001F00208020801F00000 +C0DE:000000280028042804280C38122861280028000003F80020002000D003080000 +C0DF:000000280028042804280C381228612800280000004003F8004000A003180000 +C0E0:000000280028042804280C38122861280028000003F8000803F8000800080000 +C0E1:000000280028042804280C38122861280028000003F8020003F8020003F80000 +C0E2:000000280028042804280C38122861280028000000000FF8022002200FF80000 +C0E3:000000280028042804280C38122861280028000000800FF803E0041003E00000 +C0E4:000000000010001002100210041E04100A10111E609000100010001000100000 +C0E5:0000000800080408040E0C08120E61080008000007F800080008000800080000 +C0E6:0000000800080408040E0C08120E61080008000000003EF80208020802080000 +C0E7:0000000800080408040E0C08120E61080008000000001F080108011401620000 +C0E8:0000000800080408040E0C08120E61080008000008000800080008000FF80000 +C0E9:0000000800080408040E0C08120E610800080000000010F8101010301ECC0000 +C0EA:0000000800080408040E0C08120E6108000800000808087F081C08220F9C0000 +C0EB:0000000800080408040E0C08120E61080008000003F802000200020003F80000 +C0EC:0000000800080408040E0C08120E61080008000007F8000807F8040007F80000 +C0ED:0000000800080408040E0C08120E6108000800003EF802083E0820083E080000 +C0EE:0000000800080408040E0C08120E6108000800003EF802883E8820883EF80000 +C0EF:0000000800080408040E0C08120E6108000800003E8802883EF820883EF80000 +C0F0:0000000800080408040E0C08120E6108000800001F0801081F0810141F620000 +C0F1:0000000800080408040E0C08120E6108000800003EF802803EF820803EF80000 +C0F2:0000000800080408040E0C08120E6108000800003EFC02483E4820483EFC0000 +C0F3:0000000800080408040E0C08120E6108000800001F08017F1F1C10221F1C0000 +C0F4:0000000800080408040E0C08120E61080008000003F802080208020803F80000 +C0F5:0000000800080408040E0C08120E6108000800000208020803F8020803F80000 +C0F6:0000000800080408040E0C08120E610800080000110811081F0811141F620000 +C0F7:0000000800080408040E0C08120E610800080000001000100010006801840000 +C0F8:0000000800080408040E0C08120E6108000800000048004800A8011406620000 +C0F9:0000000800080408040E0C08120E610800080000000003F00408040803F00000 +C0FA:0000000800080408040E0C08120E61080008000003F80020002000D003080000 +C0FB:0000000800080408040E0C08120E610800080000004003F8004000A003180000 +C0FC:0000000800080408040E0C08120E61080008000003F8000803F8000800080000 +C0FD:0000000800080408040E0C08120E61080008000003F8020003F8020003F80000 +C0FE:0000000800080408040E0C08120E61080008000000000FF8022002200FF80000 +C0FF:0000000800080408040E0C08120E61080008000000800FF803E0041003E00000 +C100:000000000012001202120212041E04120A12111E609200120012001200120000 +C101:000000280028042804380C28123861280028000007F800080008000800080000 +C102:000000280028042804380C28123861280028000000003EF80208020802080000 +C103:000000280028042804380C28123861280028000000003E100210022802C40000 +C104:000000280028042804380C28123861280028002808000800080008000FF80000 +C105:000000280028042804380C281238612800280000000020F8201020303ECC0000 +C106:000000280028042804380C281238612800280000202021FC207020883E700000 +C107:000000280028042804380C28123861280028000003F802000200020003F80000 +C108:000000280028042804380C28123861280028000007F8000807F8040007F80000 +C109:000000280028042804380C2812386128002800003EF802083E0820083E080000 +C10A:000000280028042804380C2812386128002800003EF802883E8820883EF80000 +C10B:000000280028042804380C2812386128002800003E8802883EF820883EF80000 +C10C:000000280028042804380C2812386128002800001F0801081F0810141F620000 +C10D:000000280028042804380C2812386128002800003EF802803EF820803EF80000 +C10E:000000280028042804380C2812386128002800003EFC02483E4820483EFC0000 +C10F:000000280028042804380C2812386128002800003E1002FE3E3820443E380000 +C110:000000280028042804380C28123861280028000003F802080208020803F80000 +C111:000000280028042804380C2812386128002800000208020803F8020803F80000 +C112:000000280028042804380C281238612800280000110811081F0811141F620000 +C113:000000280028042804380C281238612800280000000800080008003400C20000 +C114:000000280028042804380C2812386128002800000048004800A8011406620000 +C115:000000280028042804380C281238612800280000000001F00208020801F00000 +C116:000000280028042804380C28123861280028000003F80020002000D003080000 +C117:000000280028042804380C281238612800280000004003F8004000A003180000 +C118:000000280028042804380C28123861280028000003F8000803F8000800080000 +C119:000000280028042804380C28123861280028000003F8020003F8020003F80000 +C11A:000000280028042804380C28123861280028000000000FF8022002200FF80000 +C11B:000000280028042804380C28123861280028000000800FF803E0041003E00000 +C11C:0000000000020002020202020402041E0A021102608200020002000200020000 +C11D:000000080008040804080C381208610800080000000007F80008000800080000 +C11E:000000080008040804080C38120861080008000000003EF80208020802080000 +C11F:000000080008040804080C38120861080008000000001F080108011401620000 +C120:000000080008040804080C38120861080008000000001000100010001FF80000 +C121:000000080008040804080C381208610800080000000020F8201020303ECC0000 +C122:000000080008040804080C381208610800080000202021FC207020883E700000 +C123:000000080008040804080C38120861080008000003F802000200020003F80000 +C124:000000080008040804080C38120861080008000007F8000807F8040007F80000 +C125:000000080008040804080C3812086108000800003EF802083E0820083E080000 +C126:000000080008040804080C3812086108000800003EF802883E8820883EF80000 +C127:000000080008040804080C3812086108000800003E8802883EF820883EF80000 +C128:000000080008040804080C3812086108000800000F8800880F8808140FA20000 +C129:000000080008040804080C3812086108000800003EF802803EF820803EF80000 +C12A:000000080008040804080C3812086108000800003EFC02483E4820483EFC0000 +C12B:000000080008040804080C3812086108000800003E1002FE3E3820443E380000 +C12C:000000080008040804080C38120861080008000003F802080208020803F80000 +C12D:000000080008040804080C3812086108000800000208020803F8020803F80000 +C12E:000000080008040804080C381208610800080000210821083F0821143F620000 +C12F:000000080008040804080C381208610800080000001000100010006801840000 +C130:000000080008040804080C3812086108000800000048004800A8011406620000 +C131:000000080008040804080C381208610800080000000003F00408040803F00000 +C132:000000080008040804080C38120861080008000003F80020002000D003080000 +C133:000000080008040804080C381208610800080000004003F8004000A003180000 +C134:000000080008040804080C38120861080008000003F8000803F8000800080000 +C135:000000080008040804080C38120861080008000003F8020003F8020003F80000 +C136:000000080008040804080C38120861080008000000000FF8022002200FF80000 +C137:000000080008040804080C38120861080008000000800FF803E0041003E00000 +C138:00000000000A000A020A020A040A043A0A0A110A608A000A000A000A000A0000 +C139:000000280028042804280CE8122861280028000007F800080008000800080000 +C13A:000000280028042804280CE8122861280028000000003EF80208020802080000 +C13B:000000280028042804280CE8122861280028000000003E100210022802C40000 +C13C:000000280028042804280CE8122861280028000008000800080008000FF80000 +C13D:000000280028042804280CE81228612800280000000020F8201020303ECC0000 +C13E:000000280028042804280CE81228612800280000202021FC207020883E700000 +C13F:000000280028042804280CE8122861280028000003F802000200020003F80000 +C140:000000280028042804280CE8122861280028000007F8000807F8040007F80000 +C141:000000280028042804280CE812286128002800003EF802083E0820083E080000 +C142:000000280028042804280CE812286128002800003EF802883E8820883EF80000 +C143:000000280028042804280CE812286128002800003E8802883EF820883EF80000 +C144:000000280028042804280CE812286128002800001F0801081F0810141F620000 +C145:000000280028042804280CE812286128002800003EF802803EF820803EF80000 +C146:000000280028042804280CE812286128002800003EFC02483E4820483EFC0000 +C147:000000280028042804280CE812286128002800003E1002FE3E3820443E380000 +C148:000000280028042804280CE8122861280028000003F802080208020803F80000 +C149:000000280028042804280CE812286128002800000208020803F8020803F80000 +C14A:000000280028042804280CE81228612800280000110811081F0811141F620000 +C14B:000000280028042804280CE81228612800280000000800080008003400C20000 +C14C:000000280028042804280CE812286128002800000048004800A8011406620000 +C14D:000000280028042804280CE81228612800280000000001F00208020801F00000 +C14E:000000280028042804280CE8122861280028000003F80020002000D003080000 +C14F:000000280028042804280CE81228612800280000004003F8004000A003180000 +C150:000000280028042804280CE8122861280028000003F8000803F8000800080000 +C151:000000280028042804280CE8122861280028000003F8020003F8020003F80000 +C152:000000280028042804280CE8122861280028000000000FF8022002200FF80000 +C153:000000280028042804280CE8122861280028000000800FF803E0041003E00000 +C154:000000000002000202020202041E04020A02111E608200020002000200020000 +C155:000000080008040804380C081238610800080000000007F80008000800080000 +C156:000000080008040804380C08123861080008000000003EF80208020802080000 +C157:000000080008040804380C08123861080008000000001F080108011401620000 +C158:000000080008040804380C08123861080008000800001000100010001FF80000 +C159:000000080008040804380C081238610800080000000020F8201020303ECC0000 +C15A:000000080008040804380C081238610800080000202021FC207020883E700000 +C15B:000000080008040804380C08123861080008000003F802000200020003F80000 +C15C:000000080008040804380C08123861080008000007F8000807F8040007F80000 +C15D:000000080008040804380C0812386108000800003EF802083E0820083E080000 +C15E:000000080008040804380C0812386108000800003EF802883E8820883EF80000 +C15F:000000080008040804380C0812386108000800003E8802883EF820883EF80000 +C160:000000080008040804380C0812386108000800000F8800880F8808140FA20000 +C161:000000080008040804380C0812386108000800003EF802803EF820803EF80000 +C162:000000080008040804380C0812386108000800003EFC02483E4820483EFC0000 +C163:000000080008040804380C0812386108000800003E1002FE3E3820443E380000 +C164:000000080008040804380C08123861080008000003F802080208020803F80000 +C165:000000080008040804380C0812386108000800000208020803F8020803F80000 +C166:000000080008040804380C081238610800080000210821083F0821143F620000 +C167:000000080008040804380C081238610800080000001000100010006801840000 +C168:000000080008040804380C0812386108000800000048004800A8011406620000 +C169:000000080008040804380C081238610800080000000003F00408040803F00000 +C16A:000000080008040804380C08123861080008000003F80020002000D003080000 +C16B:000000080008040804380C081238610800080000004003F8004000A003180000 +C16C:000000080008040804380C08123861080008000003F8000803F8000800080000 +C16D:000000080008040804380C08123861080008000003F8020003F8020003F80000 +C16E:000000080008040804380C08123861080008000000000FF8022002200FF80000 +C16F:000000080008040804380C08123861080008000000800FF803E0041003E00000 +C170:00000000000A000A020A020A043A040A0A0A113A608A000A000A000A000A0000 +C171:000000280028042804E80C2812E861280028000007F800080008000800080000 +C172:000000280028042804E80C2812E861280028000000003EF80208020802080000 +C173:000000280028042804E80C2812E861280028000000003E100210022802C40000 +C174:000000280028042804E80C2812E861280028002808000800080008000FF80000 +C175:000000280028042804E80C2812E8612800280000000020F8201020303ECC0000 +C176:000000280028042804E80C2812E8612800280000202021FC207020883E700000 +C177:000000280028042804E80C2812E861280028000003F802000200020003F80000 +C178:000000280028042804E80C2812E861280028000007F8000807F8040007F80000 +C179:000000280028042804E80C2812E86128002800003EF802083E0820083E080000 +C17A:000000280028042804E80C2812E86128002800003EF802883E8820883EF80000 +C17B:000000280028042804E80C2812E86128002800003E8802883EF820883EF80000 +C17C:000000280028042804E80C2812E86128002800001F0801081F0810141F620000 +C17D:000000280028042804E80C2812E86128002800003EF802803EF820803EF80000 +C17E:000000280028042804E80C2812E86128002800003EFC02483E4820483EFC0000 +C17F:000000280028042804E80C2812E86128002800003E1002FE3E3820443E380000 +C180:000000280028042804E80C2812E861280028000003F802080208020803F80000 +C181:000000280028042804E80C2812E86128002800000208020803F8020803F80000 +C182:000000280028042804E80C2812E8612800280000110811081F0811141F620000 +C183:000000280028042804E80C2812E8612800280000000800080008003400C20000 +C184:000000280028042804E80C2812E86128002800000048004800A8011406620000 +C185:000000280028042804E80C2812E8612800280000000001F00208020801F00000 +C186:000000280028042804E80C2812E861280028000003F80020002000D003080000 +C187:000000280028042804E80C2812E8612800280000004003F8004000A003180000 +C188:000000280028042804E80C2812E861280028000003F8000803F8000800080000 +C189:000000280028042804E80C2812E861280028000003F8020003F8020003F80000 +C18A:000000280028042804E80C2812E861280028000000000FF8022002200FF80000 +C18B:000000280028042804E80C2812E861280028000000800FF803E0041003E00000 +C18C:00000000008000800100010002800440182000000100010001007FFC00000000 +C18D:000000800080018002400C20010001007FFC00001FF000100010001000100000 +C18E:000000800080018002400C20010001007FFC000000003EF80208020802080000 +C18F:000000800080018002400C20010001007FFC000000001E100210022802C40000 +C190:000000800080018002400C20010001007FFC000000001000100010001FF00000 +C191:000000800080018002400C20010001007FFC0000000020F8201020303ECC0000 +C192:000000800080018002400C20010001007FFC0000202021FC207020883E700000 +C193:000000800080018002400C20010001007FFC00001FF01000100010001FF00000 +C194:000000800080018002400C20010001007FFC00001FF000101FF010001FF00000 +C195:000000800080018002400C20010001007FFC00003EF802083E0820083E080000 +C196:000000800080018002400C20010001007FFC00003EF802883E8820883EF80000 +C197:000000800080018002400C20010001007FFC00003E8802883EF820883EF80000 +C198:000000800080018002400C20010001007FFC00003E1002103E1020283EC40000 +C199:000000800080018002400C20010001007FFC00003EF802803EF820803EF80000 +C19A:000000800080018002400C20010001007FFC00003EFC02483E4820483EFC0000 +C19B:000000800080018002400C20010001007FFC00003E2003FC3E7020883E700000 +C19C:000000800080018002400C20010001007FFC00001FF01010101010101FF00000 +C19D:000000800080018002400C20010001007FFC0000101010101FF010101FF00000 +C19E:000000800080018002400C20010001007FFC0000222022203E2022503E880000 +C19F:000000800080018002400C20010001007FFC000000000100010002800C400000 +C1A0:000000800080018002400C20010001007FFC00000000024002400DA033100000 +C1A1:000000800080018002400C20010001007FFC0000000007C00820082007C00000 +C1A2:000000800080018002400C20010001007FFC0000000007E00080014006200000 +C1A3:000000800080018002400C20010001007FFC0000008007E00080014006200000 +C1A4:000000800080018002400C20010001007FFC00001FF000101FF0001000100000 +C1A5:000000800080018002400C20010001007FFC00001FF010001FF010001FF00000 +C1A6:000000800080018002400C20010001007FFC000000001FF0044004401FF00000 +C1A7:000000800080018002400C20010001007FFC000001001FF007C0082007C00000 +C1A8:00000010001002100210041004100A1E11106090041004107FD0001000100000 +C1A9:0000020802080608090E3088040804087FE8000007F800080008000800080000 +C1AA:0000020802080608090E3088040804087FE8000000003EF80208020802080000 +C1AB:0000020802080608090E3088040804087FE8000000001F080108011401620000 +C1AC:0000020802080608090E3088040804087FE8000008000800080008000FF80000 +C1AD:0000020802080608090E3088040804087FE80000000010F8101010301ECC0000 +C1AE:0000020802080608090E3088040804087FE800000808087F081C08220F9C0000 +C1AF:0000020802080608090E3088040804087FE8000003F802000200020003F80000 +C1B0:0000020802080608090E3088040804087FE8000007F8000807F8040007F80000 +C1B1:0000020802080608090E3088040804087FE800003EF802083E0820083E080000 +C1B2:0000020802080608090E3088040804087FE800003EF802883E8820883EF80000 +C1B3:0000020802080608090E3088040804087FE800003E8802883EF820883EF80000 +C1B4:0000020802080608090E3088040804087FE800001F0801081F0810141F620000 +C1B5:0000020802080608090E3088040804087FE800003EF802803EF820803EF80000 +C1B6:0000020802080608090E3088040804087FE800003EFC02483E4820483EFC0000 +C1B7:0000020802080608090E3088040804087FE800001F08017F1F1C10221F1C0000 +C1B8:0000020802080608090E3088040804087FE8000003F802080208020803F80000 +C1B9:0000020802080608090E3088040804087FE800000208020803F8020803F80000 +C1BA:0000020802080608090E3088040804087FE80000110811081F0811141F620000 +C1BB:0000020802080608090E3088040804087FE80000001000100010006801840000 +C1BC:0000020802080608090E3088040804087FE800000048004800A8011406620000 +C1BD:0000020802080608090E3088040804087FE80000000003F00408040803F00000 +C1BE:0000020802080608090E3088040804087FE8000003F80020002000D003080000 +C1BF:0000020802080608090E3088040804087FE80000004003F8004000A003180000 +C1C0:0000020802080608090E3088040804087FE8000003F8000803F8000800080000 +C1C1:0000020802080608090E3088040804087FE8000003F8020003F8020003F80000 +C1C2:0000020802080608090E3088040804087FE8000000000FF8022002200FF80000 +C1C3:0000020802080608090E3088040804087FE8000000800FF803E0041003E00000 +C1C4:00000012001202120212041204120A1E11126092041204127FD2001200120000 +C1C5:0000022802280628093830A8042804287FA8000007F800080008000800080000 +C1C6:0000022802280628093830A8042804287FA8000000003EF80208020802080000 +C1C7:0000022802280628093830A8042804287FA8000000001F080108011401620000 +C1C8:0000022802280628093830A8042804287FA8000008000800080008000FF80000 +C1C9:0000022802280628093830A8042804287FA80000000010F8101010301ECC0000 +C1CA:0000022802280628093830A8042804287FA800000808087F081C08220F9C0000 +C1CB:0000022802280628093830A8042804287FA8000003F802000200020003F80000 +C1CC:0000022802280628093830A8042804287FA8000007F8000807F8040007F80000 +C1CD:0000022802280628093830A8042804287FA800003EF802083E0820083E080000 +C1CE:0000022802280628093830A8042804287FA800003EF802883E8820883EF80000 +C1CF:0000022802280628093830A8042804287FA800003E8802883EF820883EF80000 +C1D0:0000022802280628093830A8042804287FA800001F0801081F0810141F620000 +C1D1:0000022802280628093830A8042804287FA800003EF802803EF820803EF80000 +C1D2:0000022802280628093830A8042804287FA800003EFC02483E4820483EFC0000 +C1D3:0000022802280628093830A8042804287FA800001F08017F1F1C10221F1C0000 +C1D4:0000022802280628093830A8042804287FA8000003F802080208020803F80000 +C1D5:0000022802280628093830A8042804287FA800000208020803F8020803F80000 +C1D6:0000022802280628093830A8042804287FA80000110811081F0811141F620000 +C1D7:0000022802280628093830A8042804287FA80000001000100010006801840000 +C1D8:0000022802280628093830A8042804287FA800000048004800A8011406620000 +C1D9:0000022802280628093830A8042804287FA80000000003F00408040803F00000 +C1DA:0000022802280628093830A8042804287FA8000003F80020002000D003080000 +C1DB:0000022802280628093830A8042804287FA80000004003F8004000A003180000 +C1DC:0000022802280628093830A8042804287FA8000003F8000803F8000800080000 +C1DD:0000022802280628093830A8042804287FA8000003F8020003F8020003F80000 +C1DE:0000022802280628093830A8042804287FA8000000000FF8022002200FF80000 +C1DF:0000022802280628093830A8042804287FA8000000800FF803E0041003E00000 +C1E0:00000008000802080208040804080A0811086088040804087FE8000800080000 +C1E1:000002080208060809083088040804087FE8000007F800080008000800080000 +C1E2:000002080208060809083088040804087FE8000000003EF80208020802080000 +C1E3:000002080208060809083088040804087FE8000000001F080108011401620000 +C1E4:000002080208060809083088040804087FE8000008000800080008000FF80000 +C1E5:000002080208060809083088040804087FE80000000010F8101010301ECC0000 +C1E6:000002080208060809083088040804087FE800000808087F081C08220F9C0000 +C1E7:000002080208060809083088040804087FE8000003F802000200020003F80000 +C1E8:000002080208060809083088040804087FE8000007F8000807F8040007F80000 +C1E9:000002080208060809083088040804087FE800003EF802083E0820083E080000 +C1EA:000002080208060809083088040804087FE800003EF802883E8820883EF80000 +C1EB:000002080208060809083088040804087FE800003E8802883EF820883EF80000 +C1EC:000002080208060809083088040804087FE800001F0801081F0810141F620000 +C1ED:000002080208060809083088040804087FE800003EF802803EF820803EF80000 +C1EE:000002080208060809083088040804087FE800003EFC02483E4820483EFC0000 +C1EF:000002080208060809083088040804087FE800001F08017F1F1C10221F1C0000 +C1F0:000002080208060809083088040804087FE8000003F802080208020803F80000 +C1F1:000002080208060809083088040804087FE800000208020803F8020803F80000 +C1F2:000002080208060809083088040804087FE80000110811081F0811141F620000 +C1F3:000002080208060809083088040804087FE80000001000100010006801840000 +C1F4:000002080208060809083088040804087FE800000048004800A8011406620000 +C1F5:000002080208060809083088040804087FE80000000003F00408040803F00000 +C1F6:000002080208060809083088040804087FE8000003F80020002000D003080000 +C1F7:000002080208060809083088040804087FE80000004003F8004000A003180000 +C1F8:000002080208060809083088040804087FE8000003F8000803F8000800080000 +C1F9:000002080208060809083088040804087FE8000003F8020003F8020003F80000 +C1FA:000002080208060809083088040804087FE8000000000FF8022002200FF80000 +C1FB:000002080208060809083088040804087FE8000000800FF803E0041003E00000 +C1FC:00000000008000800100010002800440182004400440044004407FFC00000000 +C1FD:000000800080018002400C20044004407FFC00001FF000100010001000100000 +C1FE:000000800080018002400C20044004407FFC000000003EF80208020802080000 +C1FF:000000800080018002400C20044004407FFC000000001E100210022802C40000 +C200:000000800080018002400C20044004407FFC000000001000100010001FF00000 +C201:000000800080018002400C20044004407FFC0000000020F8201020303ECC0000 +C202:000000800080018002400C20044004407FFC0000202021FC207020883E700000 +C203:000000800080018002400C20044004407FFC00001FF01000100010001FF00000 +C204:000000800080018002400C20044004407FFC00001FF000101FF010001FF00000 +C205:000000800080018002400C20044004407FFC00003EF802083E0820083E080000 +C206:000000800080018002400C20044004407FFC00003EF802883E8820883EF80000 +C207:000000800080018002400C20044004407FFC00003E8802883EF820883EF80000 +C208:000000800080018002400C20044004407FFC00003E1002103E1020283EC40000 +C209:000000800080018002400C20044004407FFC00003EF802803EF820803EF80000 +C20A:000000800080018002400C20044004407FFC00003EFC02483E4820483EFC0000 +C20B:000000800080018002400C20044004407FFC00003E2003FC3E7020883E700000 +C20C:000000800080018002400C20044004407FFC00001FF01010101010101FF00000 +C20D:000000800080018002400C20044004407FFC0000101010101FF010101FF00000 +C20E:000000800080018002400C20044004407FFC0000222022203E2022503E880000 +C20F:000000800080018002400C20044004407FFC000000000100010002800C400000 +C210:000000800080018002400C20044004407FFC00000000024002400DA033100000 +C211:000000800080018002400C20044004407FFC0000000007C00820082007C00000 +C212:000000800080018002400C20044004407FFC0000000007E00080014006200000 +C213:000000800080018002400C20044004407FFC0000008007E00080014006200000 +C214:000000800080018002400C20044004407FFC00001FF000101FF0001000100000 +C215:000000800080018002400C20044004407FFC00001FF010001FF010001FF00000 +C216:000000800080018002400C20044004407FFC000000001FF0044004401FF00000 +C217:000000800080018002400C20044004407FFC000001001FF007C0082007C00000 +C218:00000000008000800100010002800440182000003FF801000100010001000000 +C219:000000800080018002400C2000007FFC010001001FF000100010001000100000 +C21A:000000800080018002400C2000007FFC0100010000003EF80208020802080000 +C21B:000000800080018002400C2000007FFC0100010000001E100210022802C40000 +C21C:000000800080018002400C20000000007FFC010001001100100010001FF00000 +C21D:000000800080018002400C2000007FFC01000100000020F8201020303ECC0000 +C21E:000000800080018002400C2000007FFC01000100202021FC207020883E700000 +C21F:000000800080018002400C2000007FFC010001001FF01000100010001FF00000 +C220:000000800080018002400C2000007FFC010001001FF000101FF010001FF00000 +C221:000000800080018002400C2000007FFC010001003EF802083E0820083E080000 +C222:000000800080018002400C2000007FFC010001003EF802883E8820883EF80000 +C223:000000800080018002400C2000007FFC010001003E8802883EF820883EF80000 +C224:000000800080018002400C2000007FFC010001003E1002103E1020283EC40000 +C225:000000800080018002400C2000007FFC010001003EF802803EF820803EF80000 +C226:000000800080018002400C2000007FFC010001003EFC02483E4820483EFC0000 +C227:000000800080018002400C2000007FFC010001003E2003FC3E7020883E700000 +C228:000000800080018002400C2000007FFC010001001FF01010101010101FF00000 +C229:000000800080018002400C2000007FFC01000100101010101FF010101FF00000 +C22A:000000800080018002400C2000007FFC01000100222022203E2022503E880000 +C22B:000000800080018002400C2000007FFC0100010000000100010002800C400000 +C22C:000000800080018002400C2000007FFC010001000000024002400DA033100000 +C22D:000000800080018002400C2000007FFC01000100000007C00820082007C00000 +C22E:000000800080018002400C2000007FFC01000100000007E00080014006200000 +C22F:000000800080018002400C2000007FFC01000100008007E00080014006200000 +C230:000000800080018002400C2000007FFC010001001FF000101FF0001000100000 +C231:000000800080018002400C2000007FFC010001001FF010001FF010001FF00000 +C232:000000800080018002400C2000007FFC0100010000001FF0044004401FF00000 +C233:000000800080018002400C2000007FFC0100010001001FF007C0082007C00000 +C234:0000000802080208040804080A081108608800087FE8040804F8040804080000 +C235:0208020806080908308800087FE8027802080000000007F80008000800080000 +C236:0208020806080908308800087FE802780208000000003EF80208020802080000 +C237:0208020806080908308800087FE802780208000000001F080108011401620000 +C238:02080208060809083088000800087FE80278020802081000100010001FF80000 +C239:0208020806080908308800087FE8027802080000000020F8201020303ECC0000 +C23A:0208020806080908308800087FE8027802080000202021FC207020883E700000 +C23B:0208020806080908308800087FE802780208000003F802000200020003F80000 +C23C:0208020806080908308800087FE802780208000007F8000807F8040007F80000 +C23D:0208020806080908308800087FE80278020800003EF802083E0820083E080000 +C23E:0208020806080908308800087FE80278020800003EF802883E8820883EF80000 +C23F:0208020806080908308800087FE80278020800003E8802883EF820883EF80000 +C240:0208020806080908308800087FE80278020800000F8800880F8808140FA20000 +C241:0208020806080908308800087FE80278020800003EF802803EF820803EF80000 +C242:0208020806080908308800087FE80278020800003EFC02483E4820483EFC0000 +C243:0208020806080908308800087FE80278020800003E1002FE3E3820443E380000 +C244:0208020806080908308800087FE802780208000003F802080208020803F80000 +C245:0208020806080908308800087FE80278020800000208020803F8020803F80000 +C246:0208020806080908308800087FE8027802080000210821083F0821143F620000 +C247:0208020806080908308800087FE8027802080000001000100010006801840000 +C248:0208020806080908308800087FE80278020800000048004800A8011406620000 +C249:0208020806080908308800087FE8027802080000000003F00408040803F00000 +C24A:0208020806080908308800087FE802780208000003F80020002000D003080000 +C24B:0208020806080908308800087FE8027802080000004003F8004000A003180000 +C24C:0208020806080908308800087FE802780208000003F8000803F8000800080000 +C24D:0208020806080908308800087FE802780208000003F8020003F8020003F80000 +C24E:0208020806080908308800087FE802780208000000000FF8022002200FF80000 +C24F:0208020806080908308800087FE802780208000000800FF803E0041003E00000 +C250:0000000A020A020A040A040A0A0A110A608A000A7FEA040A047A040A040A0000 +C251:022802280628092830A800287FA805E804280000000007F80008000800080000 +C252:022802280628092830A800287FA805E80428000000003EF80208020802080000 +C253:022802280628092830A800287FA805E80428000000001F080108011401620000 +C254:022802280628092830A8002800287FA8042805E804281428100010001FF80000 +C255:022802280628092830A800287FA805E804280000000020F8201020303ECC0000 +C256:022802280628092830A800287FA805E804280000202021FC207020883E700000 +C257:022802280628092830A800287FA805E80428000003F802000200020003F80000 +C258:022802280628092830A800287FA805E80428000007F8000807F8040007F80000 +C259:022802280628092830A800287FA805E8042800003EF802083E0820083E080000 +C25A:022802280628092830A800287FA805E8042800003EF802883E8820883EF80000 +C25B:022802280628092830A800287FA805E8042800003E8802883EF820883EF80000 +C25C:022802280628092830A800287FA805E8042800000F8800880F8808140FA20000 +C25D:022802280628092830A800287FA805E8042800003EF802803EF820803EF80000 +C25E:022802280628092830A800287FA805E8042800003EFC02483E4820483EFC0000 +C25F:022802280628092830A800287FA805E8042800003E1002FE3E3820443E380000 +C260:022802280628092830A800287FA805E80428000003F802080208020803F80000 +C261:022802280628092830A800287FA805E8042800000208020803F8020803F80000 +C262:022802280628092830A800287FA805E804280000210821083F0821143F620000 +C263:022802280628092830A800287FA805E804280000001000100010006801840000 +C264:022802280628092830A800287FA805E8042800000048004800A8011406620000 +C265:022802280628092830A800287FA805E804280000000003F00408040803F00000 +C266:022802280628092830A800287FA805E80428000003F80020002000D003080000 +C267:022802280628092830A800287FA805E804280000004003F8004000A003180000 +C268:022802280628092830A800287FA805E80428000003F8000803F8000800080000 +C269:022802280628092830A800287FA805E80428000003F8020003F8020003F80000 +C26A:022802280628092830A800287FA805E80428000000000FF8022002200FF80000 +C26B:022802280628092830A800287FA805E80428000000800FF803E0041003E00000 +C26C:0000000802080208040804080A081108608800087FE804080408040804080000 +C26D:0208020806080908308800087FE8020802000000000007F80008000800080000 +C26E:0208020806080908308800087FE802080200000000003EF80208020802080000 +C26F:0208020806080908308800087FE802080200000000001F080108011401620000 +C270:02080208060809083088000800087FE80208020802081008100010001FF80000 +C271:0208020806080908308800087FE8020802000000000020F8201020303ECC0000 +C272:0208020806080908308800087FE8020802000000202021FC207020883E700000 +C273:0208020806080908308800087FE802080200000003F802000200020003F80000 +C274:0208020806080908308800087FE802080200000007F8000807F8040007F80000 +C275:0208020806080908308800087FE80208020000003EF802083E0820083E080000 +C276:0208020806080908308800087FE80208020000003EF802883E8820883EF80000 +C277:0208020806080908308800087FE80208020000003E8802883EF820883EF80000 +C278:0208020806080908308800087FE80208020000000F8800880F8808140FA20000 +C279:0208020806080908308800087FE80208020000003EF802803EF820803EF80000 +C27A:0208020806080908308800087FE80208020000003EFC02483E4820483EFC0000 +C27B:0208020806080908308800087FE80208020000003E1002FE3E3820443E380000 +C27C:0208020806080908308800087FE802080200000003F802080208020803F80000 +C27D:0208020806080908308800087FE80208020000000208020803F8020803F80000 +C27E:0208020806080908308800087FE8020802000000210821083F0821143F620000 +C27F:0208020806080908308800087FE8020802000000001000100010006801840000 +C280:0208020806080908308800087FE80208020000000048004800A8011406620000 +C281:0208020806080908308800087FE8020802000000000003F00408040803F00000 +C282:0208020806080908308800087FE802080200000003F80020002000D003080000 +C283:0208020806080908308800087FE8020802000000004003F8004000A003180000 +C284:0208020806080908308800087FE802080200000003F8000803F8000800080000 +C285:0208020806080908308800087FE802080200000003F8020003F8020003F80000 +C286:0208020806080908308800087FE802080200000000000FF8022002200FF80000 +C287:0208020806080908308800087FE802080200000000800FF803E0041003E00000 +C288:00000000008000800100010002800440182000007FFC04400440044004400000 +C289:000000800080018002400C2000007FFC044004401FF000100010001000100000 +C28A:000000800080018002400C2000007FFC0440044000003EF80208020802080000 +C28B:000000800080018002400C2000007FFC0440044000001E100210022802C40000 +C28C:000000800080018002400C20000000007FFC044004401440100010001FF00000 +C28D:000000800080018002400C2000007FFC04400440000020F8201020303ECC0000 +C28E:000000800080018002400C2000007FFC04400440202021FC207020883E700000 +C28F:000000800080018002400C2000007FFC044004401FF01000100010001FF00000 +C290:000000800080018002400C2000007FFC044004401FF000101FF010001FF00000 +C291:000000800080018002400C2000007FFC044004403EF802083E0820083E080000 +C292:000000800080018002400C2000007FFC044004403EF802883E8820883EF80000 +C293:000000800080018002400C2000007FFC044004403E8802883EF820883EF80000 +C294:000000800080018002400C2000007FFC044004403E1002103E1020283EC40000 +C295:000000800080018002400C2000007FFC044004403EF802803EF820803EF80000 +C296:000000800080018002400C2000007FFC044004403EFC02483E4820483EFC0000 +C297:000000800080018002400C2000007FFC044004403E2003FC3E7020883E700000 +C298:000000800080018002400C2000007FFC044004401FF01010101010101FF00000 +C299:000000800080018002400C2000007FFC04400440101010101FF010101FF00000 +C29A:000000800080018002400C2000007FFC04400440222022203E2022503E880000 +C29B:000000800080018002400C2000007FFC0440044000000100010002800C400000 +C29C:000000800080018002400C2000007FFC044004400000024002400DA033100000 +C29D:000000800080018002400C2000007FFC04400440000007C00820082007C00000 +C29E:000000800080018002400C2000007FFC04400440000007E00080014006200000 +C29F:000000800080018002400C2000007FFC04400440008007E00080014006200000 +C2A0:000000800080018002400C2000007FFC044004401FF000101FF0001000100000 +C2A1:000000800080018002400C2000007FFC044004401FF010001FF010001FF00000 +C2A2:000000800080018002400C2000007FFC0440044000001FF0044004401FF00000 +C2A3:000000800080018002400C2000007FFC0440044001001FF007C0082007C00000 +C2A4:000000000080008001000100028004401820000000007FFC0000000000000000 +C2A5:000000800080018002400C20000000007FFC00001FF000100010001000100000 +C2A6:000000800080018002400C20000000007FFC000000003EF80208020802080000 +C2A7:000000800080018002400C20000000007FFC000000001E100210022802C40000 +C2A8:000000800080018002400C20000000007FFC000000001000100010001FF00000 +C2A9:000000800080018002400C20000000007FFC0000000020F8201020303ECC0000 +C2AA:000000800080018002400C20000000007FFC0000202021FC207020883E700000 +C2AB:000000800080018002400C20000000007FFC00001FF01000100010001FF00000 +C2AC:000000800080018002400C20000000007FFC00001FF000101FF010001FF00000 +C2AD:000000800080018002400C20000000007FFC00003EF802083E0820083E080000 +C2AE:000000800080018002400C20000000007FFC00003EF802883E8820883EF80000 +C2AF:000000800080018002400C20000000007FFC00003E8802883EF820883EF80000 +C2B0:000000800080018002400C20000000007FFC00003E1002103E1020283EC40000 +C2B1:000000800080018002400C20000000007FFC00003EF802803EF820803EF80000 +C2B2:000000800080018002400C20000000007FFC00003EFC02483E4820483EFC0000 +C2B3:000000800080018002400C20000000007FFC00003E2003FC3E7020883E700000 +C2B4:000000800080018002400C20000000007FFC00001FF01010101010101FF00000 +C2B5:000000800080018002400C20000000007FFC0000101010101FF010101FF00000 +C2B6:000000800080018002400C20000000007FFC0000222022203E2022503E880000 +C2B7:000000800080018002400C20000000007FFC000000000100010002800C400000 +C2B8:000000800080018002400C20000000007FFC00000000024002400DA033100000 +C2B9:000000800080018002400C20000000007FFC0000000007C00820082007C00000 +C2BA:000000800080018002400C20000000007FFC0000000007E00080014006200000 +C2BB:000000800080018002400C20000000007FFC0000008007E00080014006200000 +C2BC:000000800080018002400C20000000007FFC00001FF000101FF0001000100000 +C2BD:000000800080018002400C20000000007FFC00001FF010001FF010001FF00000 +C2BE:000000800080018002400C20000000007FFC000000001FF0044004401FF00000 +C2BF:000000800080018002400C20000000007FFC000001001FF007C0082007C00000 +C2C0:00000008000802080208040804080A081108608800087FE80008000800080000 +C2C1:000002080208060809083088000800087FE8000007F800080008000800080000 +C2C2:000002080208060809083088000800087FE8000000003EF80208020802080000 +C2C3:000002080208060809083088000800087FE8000000001F080108011401620000 +C2C4:000002080208060809083088000800087FE8000008000800080008000FF80000 +C2C5:000002080208060809083088000800087FE80000000010F8101010301ECC0000 +C2C6:000002080208060809083088000800087FE800000808087F081C08220F9C0000 +C2C7:000002080208060809083088000800087FE8000003F802000200020003F80000 +C2C8:000002080208060809083088000800087FE8000007F8000807F8040007F80000 +C2C9:000002080208060809083088000800087FE800003EF802083E0820083E080000 +C2CA:000002080208060809083088000800087FE800003EF802883E8820883EF80000 +C2CB:000002080208060809083088000800087FE800003E8802883EF820883EF80000 +C2CC:000002080208060809083088000800087FE800001F0801081F0810141F620000 +C2CD:000002080208060809083088000800087FE800003EF802803EF820803EF80000 +C2CE:000002080208060809083088000800087FE800003EFC02483E4820483EFC0000 +C2CF:000002080208060809083088000800087FE800001F08017F1F1C10221F1C0000 +C2D0:000002080208060809083088000800087FE8000003F802080208020803F80000 +C2D1:000002080208060809083088000800087FE800000208020803F8020803F80000 +C2D2:000002080208060809083088000800087FE80000110811081F0811141F620000 +C2D3:000002080208060809083088000800087FE80000001000100010006801840000 +C2D4:000002080208060809083088000800087FE800000048004800A8011406620000 +C2D5:000002080208060809083088000800087FE80000000003F00408040803F00000 +C2D6:000002080208060809083088000800087FE8000003F80020002000D003080000 +C2D7:000002080208060809083088000800087FE80000004003F8004000A003180000 +C2D8:000002080208060809083088000800087FE8000003F8000803F8000800080000 +C2D9:000002080208060809083088000800087FE8000003F8020003F8020003F80000 +C2DA:000002080208060809083088000800087FE8000000000FF8022002200FF80000 +C2DB:000002080208060809083088000800087FE8000000800FF803E0041003E00000 +C2DC:000000000008000802080208040804080A081108608800080008000800080000 +C2DD:000000080008040804080C081208610800080000000007F80008000800080000 +C2DE:000000080008040804080C08120861080008000000003EF80208020802080000 +C2DF:000000080008040804080C08120861080008000000001F080108011401620000 +C2E0:000000080008040804080C08120861080008000800001000100010001FF80000 +C2E1:000000080008040804080C081208610800080000000020F8201020303ECC0000 +C2E2:000000080008040804080C081208610800080000202021FC207020883E700000 +C2E3:000000080008040804080C08120861080008000003F802000200020003F80000 +C2E4:000000080008040804080C08120861080008000007F8000807F8040007F80000 +C2E5:000000080008040804080C0812086108000800003EF802083E0820083E080000 +C2E6:000000080008040804080C0812086108000800003EF802883E8820883EF80000 +C2E7:000000080008040804080C0812086108000800003E8802883EF820883EF80000 +C2E8:000000080008040804080C0812086108000800000F8800880F8808140FA20000 +C2E9:000000080008040804080C0812086108000800003EF802803EF820803EF80000 +C2EA:000000080008040804080C0812086108000800003EFC02483E4820483EFC0000 +C2EB:000000080008040804080C0812086108000800003E1002FE3E3820443E380000 +C2EC:000000080008040804080C08120861080008000003F802080208020803F80000 +C2ED:000000080008040804080C0812086108000800000208020803F8020803F80000 +C2EE:000000080008040804080C081208610800080000210821083F0821143F620000 +C2EF:000000080008040804080C081208610800080000001000100010006801840000 +C2F0:000000080008040804080C0812086108000800000048004800A8011406620000 +C2F1:000000080008040804080C081208610800080000000003F00408040803F00000 +C2F2:000000080008040804080C08120861080008000003F80020002000D003080000 +C2F3:000000080008040804080C081208610800080000004003F8004000A003180000 +C2F4:000000080008040804080C08120861080008000003F8000803F8000800080000 +C2F5:000000080008040804080C08120861080008000003F8020003F8020003F80000 +C2F6:000000080008040804080C08120861080008000000000FF8022002200FF80000 +C2F7:000000080008040804080C08120861080008000000800FF803E0041003E00000 +C2F8:0000000000100010089008900890191E15102290CC5000100010001000100000 +C2F9:00000008000812081208340E2A0849080008000007F800080008000800080000 +C2FA:00000008000812081208340E2A0849080008000000003EF80208020802080000 +C2FB:00000008000812081208340E2A0849080008000000001F080108011401620000 +C2FC:00000008000812081208340E2A0849080008000808000800080008000FF80000 +C2FD:00000008000812081208340E2A08490800080000000010F8101010301ECC0000 +C2FE:00000008000812081208340E2A084908000800000808087F081C08220F9C0000 +C2FF:00000008000812081208340E2A0849080008000003F802000200020003F80000 +C300:00000008000812081208340E2A0849080008000007F8000807F8040007F80000 +C301:00000008000812081208340E2A084908000800003EF802083E0820083E080000 +C302:00000008000812081208340E2A084908000800003EF802883E8820883EF80000 +C303:00000008000812081208340E2A084908000800003E8802883EF820883EF80000 +C304:00000008000812081208340E2A084908000800001F0801081F0810141F620000 +C305:00000008000812081208340E2A084908000800003EF802803EF820803EF80000 +C306:00000008000812081208340E2A084908000800003EFC02483E4820483EFC0000 +C307:00000008000812081208340E2A084908000800001F08017F1F1C10221F1C0000 +C308:00000008000812081208340E2A0849080008000003F802080208020803F80000 +C309:00000008000812081208340E2A084908000800000208020803F8020803F80000 +C30A:00000008000812081208340E2A08490800080000110811081F0811141F620000 +C30B:00000008000812081208340E2A08490800080000001000100010006801840000 +C30C:00000008000812081208340E2A084908000800000048004800A8011406620000 +C30D:00000008000812081208340E2A08490800080000000003F00408040803F00000 +C30E:00000008000812081208340E2A0849080008000003F80020002000D003080000 +C30F:00000008000812081208340E2A08490800080000004003F8004000A003180000 +C310:00000008000812081208340E2A0849080008000003F8000803F8000800080000 +C311:00000008000812081208340E2A0849080008000003F8020003F8020003F80000 +C312:00000008000812081208340E2A0849080008000000000FF8022002200FF80000 +C313:00000008000812081208340E2A0849080008000000800FF803E0041003E00000 +C314:0000000000120012089208920892191E15122292CC5200120012001200120000 +C315:0000002800281228122834382A2849280028000007F800080008000800080000 +C316:0000002800281228122834382A2849280028000000003EF80208020802080000 +C317:0000002800281228122834382A2849280028000000003E100210022802C40000 +C318:0000002800281228122834382A2849280028002808000800080008000FF80000 +C319:0000002800281228122834382A28492800280000000020F8201020303ECC0000 +C31A:0000002800281228122834382A28492800280000202021FC207020883E700000 +C31B:0000002800281228122834382A2849280028000003F802000200020003F80000 +C31C:0000002800281228122834382A2849280028000007F8000807F8040007F80000 +C31D:0000002800281228122834382A284928002800003EF802083E0820083E080000 +C31E:0000002800281228122834382A284928002800003EF802883E8820883EF80000 +C31F:0000002800281228122834382A284928002800003E8802883EF820883EF80000 +C320:0000002800281228122834382A284928002800001F0801081F0810141F620000 +C321:0000002800281228122834382A284928002800003EF802803EF820803EF80000 +C322:0000002800281228122834382A284928002800003EFC02483E4820483EFC0000 +C323:0000002800281228122834382A284928002800003E1002FE3E3820443E380000 +C324:0000002800281228122834382A2849280028000003F802080208020803F80000 +C325:0000002800281228122834382A284928002800000208020803F8020803F80000 +C326:0000002800281228122834382A28492800280000110811081F0811141F620000 +C327:0000002800281228122834382A28492800280000000800080008003400C20000 +C328:0000002800281228122834382A284928002800000048004800A8011406620000 +C329:0000002800281228122834382A28492800280000000001F00208020801F00000 +C32A:0000002800281228122834382A2849280028000003F80020002000D003080000 +C32B:0000002800281228122834382A28492800280000004003F8004000A003180000 +C32C:0000002800281228122834382A2849280028000003F8000803F8000800080000 +C32D:0000002800281228122834382A2849280028000003F8020003F8020003F80000 +C32E:0000002800281228122834382A2849280028000000000FF8022002200FF80000 +C32F:0000002800281228122834382A2849280028000000800FF803E0041003E00000 +C330:000000000010001008900890089E19101510229ECC5000100010001000100000 +C331:0000000800081208120E34082A0E49080008000007F800080008000800080000 +C332:0000000800081208120E34082A0E49080008000000003EF80208020802080000 +C333:0000000800081208120E34082A0E49080008000000001F080108011401620000 +C334:0000000800081208120E34082A0E49080008000008000800080008000FF80000 +C335:0000000800081208120E34082A0E490800080000000010F8101010301ECC0000 +C336:0000000800081208120E34082A0E4908000800000808087F081C08220F9C0000 +C337:0000000800081208120E34082A0E49080008000003F802000200020003F80000 +C338:0000000800081208120E34082A0E49080008000007F8000807F8040007F80000 +C339:0000000800081208120E34082A0E4908000800003EF802083E0820083E080000 +C33A:0000000800081208120E34082A0E4908000800003EF802883E8820883EF80000 +C33B:0000000800081208120E34082A0E4908000800003E8802883EF820883EF80000 +C33C:0000000800081208120E34082A0E4908000800001F0801081F0810141F620000 +C33D:0000000800081208120E34082A0E4908000800003EF802803EF820803EF80000 +C33E:0000000800081208120E34082A0E4908000800003EFC02483E4820483EFC0000 +C33F:0000000800081208120E34082A0E4908000800001F08017F1F1C10221F1C0000 +C340:0000000800081208120E34082A0E49080008000003F802080208020803F80000 +C341:0000000800081208120E34082A0E4908000800000208020803F8020803F80000 +C342:0000000800081208120E34082A0E490800080000110811081F0811141F620000 +C343:0000000800081208120E34082A0E490800080000001000100010006801840000 +C344:0000000800081208120E34082A0E4908000800000048004800A8011406620000 +C345:0000000800081208120E34082A0E490800080000000003F00408040803F00000 +C346:0000000800081208120E34082A0E49080008000003F80020002000D003080000 +C347:0000000800081208120E34082A0E490800080000004003F8004000A003180000 +C348:0000000800081208120E34082A0E49080008000003F8000803F8000800080000 +C349:0000000800081208120E34082A0E49080008000003F8020003F8020003F80000 +C34A:0000000800081208120E34082A0E49080008000000000FF8022002200FF80000 +C34B:0000000800081208120E34082A0E49080008000000800FF803E0041003E00000 +C34C:000000000012001208920892089E19121512229ECC5200120012001200120000 +C34D:0000002800281228123834282A3849280028000007F800080008000800080000 +C34E:0000002800281228123834282A3849280028000000003EF80208020802080000 +C34F:0000002800281228123834282A3849280028000000003E100210022802C40000 +C350:0000002800281228123834282A3849280028002808000800080008000FF80000 +C351:0000002800281228123834282A38492800280000000020F8201020303ECC0000 +C352:0000002800281228123834282A38492800280000202021FC207020883E700000 +C353:0000002800281228123834282A3849280028000003F802000200020003F80000 +C354:0000002800281228123834282A3849280028000007F8000807F8040007F80000 +C355:0000002800281228123834282A384928002800003EF802083E0820083E080000 +C356:0000002800281228123834282A384928002800003EF802883E8820883EF80000 +C357:0000002800281228123834282A384928002800003E8802883EF820883EF80000 +C358:0000002800281228123834282A384928002800001F0801081F0810141F620000 +C359:0000002800281228123834282A384928002800003EF802803EF820803EF80000 +C35A:0000002800281228123834282A384928002800003EFC02483E4820483EFC0000 +C35B:0000002800281228123834282A384928002800003E1002FE3E3820443E380000 +C35C:0000002800281228123834282A3849280028000003F802080208020803F80000 +C35D:0000002800281228123834282A384928002800000208020803F8020803F80000 +C35E:0000002800281228123834282A38492800280000110811081F0811141F620000 +C35F:0000002800281228123834282A38492800280000000800080008003400C20000 +C360:0000002800281228123834282A384928002800000048004800A8011406620000 +C361:0000002800281228123834282A38492800280000000001F00208020801F00000 +C362:0000002800281228123834282A3849280028000003F80020002000D003080000 +C363:0000002800281228123834282A38492800280000004003F8004000A003180000 +C364:0000002800281228123834282A3849280028000003F8000803F8000800080000 +C365:0000002800281228123834282A3849280028000003F8020003F8020003F80000 +C366:0000002800281228123834282A3849280028000000000FF8022002200FF80000 +C367:0000002800281228123834282A3849280028000000800FF803E0041003E00000 +C368:0000000000020002088208820882191E15022282CC4200020002000200020000 +C369:0000000800081208120834382A08490800080000000007F80008000800080000 +C36A:0000000800081208120834382A0849080008000000003EF80208020802080000 +C36B:0000000800081208120834382A0849080008000000001F080108011401620000 +C36C:0000000800081208120834382A0849080008000000001000100010001FF80000 +C36D:0000000800081208120834382A08490800080000000020F8201020303ECC0000 +C36E:0000000800081208120834382A08490800080000202021FC207020883E700000 +C36F:0000000800081208120834382A0849080008000003F802000200020003F80000 +C370:0000000800081208120834382A0849080008000007F8000807F8040007F80000 +C371:0000000800081208120834382A084908000800003EF802083E0820083E080000 +C372:0000000800081208120834382A084908000800003EF802883E8820883EF80000 +C373:0000000800081208120834382A084908000800003E8802883EF820883EF80000 +C374:0000000800081208120834382A084908000800000F8800880F8808140FA20000 +C375:0000000800081208120834382A084908000800003EF802803EF820803EF80000 +C376:0000000800081208120834382A084908000800003EFC02483E4820483EFC0000 +C377:0000000800081208120834382A084908000800003E1002FE3E3820443E380000 +C378:0000000800081208120834382A0849080008000003F802080208020803F80000 +C379:0000000800081208120834382A084908000800000208020803F8020803F80000 +C37A:0000000800081208120834382A08490800080000210821083F0821143F620000 +C37B:0000000800081208120834382A08490800080000001000100010006801840000 +C37C:0000000800081208120834382A084908000800000048004800A8011406620000 +C37D:0000000800081208120834382A08490800080000000003F00408040803F00000 +C37E:0000000800081208120834382A0849080008000003F80020002000D003080000 +C37F:0000000800081208120834382A08490800080000004003F8004000A003180000 +C380:0000000800081208120834382A0849080008000003F8000803F8000800080000 +C381:0000000800081208120834382A0849080008000003F8020003F8020003F80000 +C382:0000000800081208120834382A0849080008000000000FF8022002200FF80000 +C383:0000000800081208120834382A0849080008000000800FF803E0041003E00000 +C384:00000000000A000A088A088A088A193A150A228ACC4A000A000A000A000A0000 +C385:0000002800281228122834E82A2849280028000007F800080008000800080000 +C386:0000002800281228122834E82A2849280028000000003EF80208020802080000 +C387:0000002800281228122834E82A2849280028000000003E100210022802C40000 +C388:0000002800281228122834E82A2849280028000008000800080008000FF80000 +C389:0000002800281228122834E82A28492800280000000020F8201020303ECC0000 +C38A:0000002800281228122834E82A28492800280000202021FC207020883E700000 +C38B:0000002800281228122834E82A2849280028000003F802000200020003F80000 +C38C:0000002800281228122834E82A2849280028000007F8000807F8040007F80000 +C38D:0000002800281228122834E82A284928002800003EF802083E0820083E080000 +C38E:0000002800281228122834E82A284928002800003EF802883E8820883EF80000 +C38F:0000002800281228122834E82A284928002800003E8802883EF820883EF80000 +C390:0000002800281228122834E82A284928002800001F0801081F0810141F620000 +C391:0000002800281228122834E82A284928002800003EF802803EF820803EF80000 +C392:0000002800281228122834E82A284928002800003EFC02483E4820483EFC0000 +C393:0000002800281228122834E82A284928002800003E1002FE3E3820443E380000 +C394:0000002800281228122834E82A2849280028000003F802080208020803F80000 +C395:0000002800281228122834E82A284928002800000208020803F8020803F80000 +C396:0000002800281228122834E82A28492800280000110811081F0811141F620000 +C397:0000002800281228122834E82A28492800280000000800080008003400C20000 +C398:0000002800281228122834E82A284928002800000048004800A8011406620000 +C399:0000002800281228122834E82A28492800280000000001F00208020801F00000 +C39A:0000002800281228122834E82A2849280028000003F80020002000D003080000 +C39B:0000002800281228122834E82A28492800280000004003F8004000A003180000 +C39C:0000002800281228122834E82A2849280028000003F8000803F8000800080000 +C39D:0000002800281228122834E82A2849280028000003F8020003F8020003F80000 +C39E:0000002800281228122834E82A2849280028000000000FF8022002200FF80000 +C39F:0000002800281228122834E82A2849280028000000800FF803E0041003E00000 +C3A0:000000000002000208820882089E19021502229ECC4200020002000200020000 +C3A1:0000000800081208123834082A38490800080000000007F80008000800080000 +C3A2:0000000800081208123834082A3849080008000000003EF80208020802080000 +C3A3:0000000800081208123834082A3849080008000000001F080108011401620000 +C3A4:0000000800081208123834082A3849080008000800001000100010001FF80000 +C3A5:0000000800081208123834082A38490800080000000020F8201020303ECC0000 +C3A6:0000000800081208123834082A38490800080000202021FC207020883E700000 +C3A7:0000000800081208123834082A3849080008000003F802000200020003F80000 +C3A8:0000000800081208123834082A3849080008000007F8000807F8040007F80000 +C3A9:0000000800081208123834082A384908000800003EF802083E0820083E080000 +C3AA:0000000800081208123834082A384908000800003EF802883E8820883EF80000 +C3AB:0000000800081208123834082A384908000800003E8802883EF820883EF80000 +C3AC:0000000800081208123834082A384908000800000F8800880F8808140FA20000 +C3AD:0000000800081208123834082A384908000800003EF802803EF820803EF80000 +C3AE:0000000800081208123834082A384908000800003EFC02483E4820483EFC0000 +C3AF:0000000800081208123834082A384908000800003E1002FE3E3820443E380000 +C3B0:0000000800081208123834082A3849080008000003F802080208020803F80000 +C3B1:0000000800081208123834082A384908000800000208020803F8020803F80000 +C3B2:0000000800081208123834082A38490800080000210821083F0821143F620000 +C3B3:0000000800081208123834082A38490800080000001000100010006801840000 +C3B4:0000000800081208123834082A384908000800000048004800A8011406620000 +C3B5:0000000800081208123834082A38490800080000000003F00408040803F00000 +C3B6:0000000800081208123834082A3849080008000003F80020002000D003080000 +C3B7:0000000800081208123834082A38490800080000004003F8004000A003180000 +C3B8:0000000800081208123834082A3849080008000003F8000803F8000800080000 +C3B9:0000000800081208123834082A3849080008000003F8020003F8020003F80000 +C3BA:0000000800081208123834082A3849080008000000000FF8022002200FF80000 +C3BB:0000000800081208123834082A3849080008000000800FF803E0041003E00000 +C3BC:00000000000A000A088A088A08BA190A150A22BACC4A000A000A000A000A0000 +C3BD:000000280028122812E834282AE849280028000007F800080008000800080000 +C3BE:000000280028122812E834282AE849280028000000003EF80208020802080000 +C3BF:000000280028122812E834282AE849280028000000003E100210022802C40000 +C3C0:000000280028122812E834282AE849280028002808000800080008000FF80000 +C3C1:000000280028122812E834282AE8492800280000000020F8201020303ECC0000 +C3C2:000000280028122812E834282AE8492800280000202021FC207020883E700000 +C3C3:000000280028122812E834282AE849280028000003F802000200020003F80000 +C3C4:000000280028122812E834282AE849280028000007F8000807F8040007F80000 +C3C5:000000280028122812E834282AE84928002800003EF802083E0820083E080000 +C3C6:000000280028122812E834282AE84928002800003EF802883E8820883EF80000 +C3C7:000000280028122812E834282AE84928002800003E8802883EF820883EF80000 +C3C8:000000280028122812E834282AE84928002800001F0801081F0810141F620000 +C3C9:000000280028122812E834282AE84928002800003EF802803EF820803EF80000 +C3CA:000000280028122812E834282AE84928002800003EFC02483E4820483EFC0000 +C3CB:000000280028122812E834282AE84928002800003E1002FE3E3820443E380000 +C3CC:000000280028122812E834282AE849280028000003F802080208020803F80000 +C3CD:000000280028122812E834282AE84928002800000208020803F8020803F80000 +C3CE:000000280028122812E834282AE8492800280000110811081F0811141F620000 +C3CF:000000280028122812E834282AE8492800280000000800080008003400C20000 +C3D0:000000280028122812E834282AE84928002800000048004800A8011406620000 +C3D1:000000280028122812E834282AE8492800280000000001F00208020801F00000 +C3D2:000000280028122812E834282AE849280028000003F80020002000D003080000 +C3D3:000000280028122812E834282AE8492800280000004003F8004000A003180000 +C3D4:000000280028122812E834282AE849280028000003F8000803F8000800080000 +C3D5:000000280028122812E834282AE849280028000003F8020003F8020003F80000 +C3D6:000000280028122812E834282AE849280028000000000FF8022002200FF80000 +C3D7:000000280028122812E834282AE849280028000000800FF803E0041003E00000 +C3D8:0000000000000220022002200640054008A033100100010001007FFC00000000 +C3D9:000000000220022004400AA0111001007FFC00001FF000100010001000100000 +C3DA:000000000220022004400AA0111001007FFC000000003EF80208020802080000 +C3DB:000000000220022004400AA0111001007FFC000000001E100210022802C40000 +C3DC:000000000220022004400AA0111001007FFC000000001000100010001FF00000 +C3DD:000000000220022004400AA0111001007FFC0000000020F8201020303ECC0000 +C3DE:000000000220022004400AA0111001007FFC0000202021FC207020883E700000 +C3DF:000000000220022004400AA0111001007FFC00001FF01000100010001FF00000 +C3E0:000000000220022004400AA0111001007FFC00001FF000101FF010001FF00000 +C3E1:000000000220022004400AA0111001007FFC00003EF802083E0820083E080000 +C3E2:000000000220022004400AA0111001007FFC00003EF802883E8820883EF80000 +C3E3:000000000220022004400AA0111001007FFC00003E8802883EF820883EF80000 +C3E4:000000000220022004400AA0111001007FFC00003E1002103E1020283EC40000 +C3E5:000000000220022004400AA0111001007FFC00003EF802803EF820803EF80000 +C3E6:000000000220022004400AA0111001007FFC00003EFC02483E4820483EFC0000 +C3E7:000000000220022004400AA0111001007FFC00003E2003FC3E7020883E700000 +C3E8:000000000220022004400AA0111001007FFC00001FF01010101010101FF00000 +C3E9:000000000220022004400AA0111001007FFC0000101010101FF010101FF00000 +C3EA:000000000220022004400AA0111001007FFC0000222022203E2022503E880000 +C3EB:000000000220022004400AA0111001007FFC000000000100010002800C400000 +C3EC:000000000220022004400AA0111001007FFC00000000024002400DA033100000 +C3ED:000000000220022004400AA0111001007FFC0000000007C00820082007C00000 +C3EE:000000000220022004400AA0111001007FFC0000000007E00080014006200000 +C3EF:000000000220022004400AA0111001007FFC0000008007E00080014006200000 +C3F0:000000000220022004400AA0111001007FFC00001FF000101FF0001000100000 +C3F1:000000000220022004400AA0111001007FFC00001FF010001FF010001FF00000 +C3F2:000000000220022004400AA0111001007FFC000000001FF0044004401FF00000 +C3F3:000000000220022004400AA0111001007FFC000001001FF007C0082007C00000 +C3F4:0000001000100890089008901910151E2290CC50041004107FD0001000100000 +C3F5:00000888088811082A8E4448040804087FE8000007F800080008000800080000 +C3F6:00000888088811082A8E4448040804087FE8000000003EF80208020802080000 +C3F7:00000888088811082A8E4448040804087FE8000000001F080108011401620000 +C3F8:00000888088811082A8E4448040804087FE8000008000800080008000FF80000 +C3F9:00000888088811082A8E4448040804087FE80000000010F8101010301ECC0000 +C3FA:00000888088811082A8E4448040804087FE800000808087F081C08220F9C0000 +C3FB:00000888088811082A8E4448040804087FE8000003F802000200020003F80000 +C3FC:00000888088811082A8E4448040804087FE8000007F8000807F8040007F80000 +C3FD:00000888088811082A8E4448040804087FE800003EF802083E0820083E080000 +C3FE:00000888088811082A8E4448040804087FE800003EF802883E8820883EF80000 +C3FF:00000888088811082A8E4448040804087FE800003E8802883EF820883EF80000 +C400:00000888088811082A8E4448040804087FE800001F0801081F0810141F620000 +C401:00000888088811082A8E4448040804087FE800003EF802803EF820803EF80000 +C402:00000888088811082A8E4448040804087FE800003EFC02483E4820483EFC0000 +C403:00000888088811082A8E4448040804087FE800001F08017F1F1C10221F1C0000 +C404:00000888088811082A8E4448040804087FE8000003F802080208020803F80000 +C405:00000888088811082A8E4448040804087FE800000208020803F8020803F80000 +C406:00000888088811082A8E4448040804087FE80000110811081F0811141F620000 +C407:00000888088811082A8E4448040804087FE80000001000100010006801840000 +C408:00000888088811082A8E4448040804087FE800000048004800A8011406620000 +C409:00000888088811082A8E4448040804087FE80000000003F00408040803F00000 +C40A:00000888088811082A8E4448040804087FE8000003F80020002000D003080000 +C40B:00000888088811082A8E4448040804087FE80000004003F8004000A003180000 +C40C:00000888088811082A8E4448040804087FE8000003F8000803F8000800080000 +C40D:00000888088811082A8E4448040804087FE8000003F8020003F8020003F80000 +C40E:00000888088811082A8E4448040804087FE8000000000FF8022002200FF80000 +C40F:00000888088811082A8E4448040804087FE8000000800FF803E0041003E00000 +C410:0000001200120892089208921912151E2292CC52041204127FD2001200120000 +C411:000008A808A811282AB84468042804287FA8000007F800080008000800080000 +C412:000008A808A811282AB84468042804287FA8000000003EF80208020802080000 +C413:000008A808A811282AB84468042804287FA8000000001F080108011401620000 +C414:000008A808A811282AB84468042804287FA8000008000800080008000FF80000 +C415:000008A808A811282AB84468042804287FA80000000010F8101010301ECC0000 +C416:000008A808A811282AB84468042804287FA800000808087F081C08220F9C0000 +C417:000008A808A811282AB84468042804287FA8000003F802000200020003F80000 +C418:000008A808A811282AB84468042804287FA8000007F8000807F8040007F80000 +C419:000008A808A811282AB84468042804287FA800003EF802083E0820083E080000 +C41A:000008A808A811282AB84468042804287FA800003EF802883E8820883EF80000 +C41B:000008A808A811282AB84468042804287FA800003E8802883EF820883EF80000 +C41C:000008A808A811282AB84468042804287FA800001F0801081F0810141F620000 +C41D:000008A808A811282AB84468042804287FA800003EF802803EF820803EF80000 +C41E:000008A808A811282AB84468042804287FA800003EFC02483E4820483EFC0000 +C41F:000008A808A811282AB84468042804287FA800001F08017F1F1C10221F1C0000 +C420:000008A808A811282AB84468042804287FA8000003F802080208020803F80000 +C421:000008A808A811282AB84468042804287FA800000208020803F8020803F80000 +C422:000008A808A811282AB84468042804287FA80000110811081F0811141F620000 +C423:000008A808A811282AB84468042804287FA80000001000100010006801840000 +C424:000008A808A811282AB84468042804287FA800000048004800A8011406620000 +C425:000008A808A811282AB84468042804287FA80000000003F00408040803F00000 +C426:000008A808A811282AB84468042804287FA8000003F80020002000D003080000 +C427:000008A808A811282AB84468042804287FA80000004003F8004000A003180000 +C428:000008A808A811282AB84468042804287FA8000003F8000803F8000800080000 +C429:000008A808A811282AB84468042804287FA8000003F8020003F8020003F80000 +C42A:000008A808A811282AB84468042804287FA8000000000FF8022002200FF80000 +C42B:000008A808A811282AB84468042804287FA8000000800FF803E0041003E00000 +C42C:000000080008088808880888190815082288CC48040804087FE8000800080000 +C42D:00000888088811082A884448040804087FE8000007F800080008000800080000 +C42E:00000888088811082A884448040804087FE8000000003EF80208020802080000 +C42F:00000888088811082A884448040804087FE8000000001F080108011401620000 +C430:00000888088811082A884448040804087FE8000008000800080008000FF80000 +C431:00000888088811082A884448040804087FE80000000010F8101010301ECC0000 +C432:00000888088811082A884448040804087FE800000808087F081C08220F9C0000 +C433:00000888088811082A884448040804087FE8000003F802000200020003F80000 +C434:00000888088811082A884448040804087FE8000007F8000807F8040007F80000 +C435:00000888088811082A884448040804087FE800003EF802083E0820083E080000 +C436:00000888088811082A884448040804087FE800003EF802883E8820883EF80000 +C437:00000888088811082A884448040804087FE800003E8802883EF820883EF80000 +C438:00000888088811082A884448040804087FE800001F0801081F0810141F620000 +C439:00000888088811082A884448040804087FE800003EF802803EF820803EF80000 +C43A:00000888088811082A884448040804087FE800003EFC02483E4820483EFC0000 +C43B:00000888088811082A884448040804087FE800001F08017F1F1C10221F1C0000 +C43C:00000888088811082A884448040804087FE8000003F802080208020803F80000 +C43D:00000888088811082A884448040804087FE800000208020803F8020803F80000 +C43E:00000888088811082A884448040804087FE80000110811081F0811141F620000 +C43F:00000888088811082A884448040804087FE80000001000100010006801840000 +C440:00000888088811082A884448040804087FE800000048004800A8011406620000 +C441:00000888088811082A884448040804087FE80000000003F00408040803F00000 +C442:00000888088811082A884448040804087FE8000003F80020002000D003080000 +C443:00000888088811082A884448040804087FE80000004003F8004000A003180000 +C444:00000888088811082A884448040804087FE8000003F8000803F8000800080000 +C445:00000888088811082A884448040804087FE8000003F8020003F8020003F80000 +C446:00000888088811082A884448040804087FE8000000000FF8022002200FF80000 +C447:00000888088811082A884448040804087FE8000000800FF803E0041003E00000 +C448:0000000000000220022002200640054008A037500440044004407FFC00000000 +C449:000000000220022004400AA0155004407FFC00001FF000100010001000100000 +C44A:000000000220022004400AA0155004407FFC000000003EF80208020802080000 +C44B:000000000220022004400AA0155004407FFC000000001E100210022802C40000 +C44C:000000000220022004400AA0155004407FFC000000001000100010001FF00000 +C44D:000000000220022004400AA0155004407FFC0000000020F8201020303ECC0000 +C44E:000000000220022004400AA0155004407FFC0000202021FC207020883E700000 +C44F:000000000220022004400AA0155004407FFC00001FF01000100010001FF00000 +C450:000000000220022004400AA0155004407FFC00001FF000101FF010001FF00000 +C451:000000000220022004400AA0155004407FFC00003EF802083E0820083E080000 +C452:000000000220022004400AA0155004407FFC00003EF802883E8820883EF80000 +C453:000000000220022004400AA0155004407FFC00003E8802883EF820883EF80000 +C454:000000000220022004400AA0155004407FFC00003E1002103E1020283EC40000 +C455:000000000220022004400AA0155004407FFC00003EF802803EF820803EF80000 +C456:000000000220022004400AA0155004407FFC00003EFC02483E4820483EFC0000 +C457:000000000220022004400AA0155004407FFC00003E2003FC3E7020883E700000 +C458:000000000220022004400AA0155004407FFC00001FF01010101010101FF00000 +C459:000000000220022004400AA0155004407FFC0000101010101FF010101FF00000 +C45A:000000000220022004400AA0155004407FFC0000222022203E2022503E880000 +C45B:000000000220022004400AA0155004407FFC000000000100010002800C400000 +C45C:000000000220022004400AA0155004407FFC00000000024002400DA033100000 +C45D:000000000220022004400AA0155004407FFC0000000007C00820082007C00000 +C45E:000000000220022004400AA0155004407FFC0000000007E00080014006200000 +C45F:000000000220022004400AA0155004407FFC0000008007E00080014006200000 +C460:000000000220022004400AA0155004407FFC00001FF000101FF0001000100000 +C461:000000000220022004400AA0155004407FFC00001FF010001FF010001FF00000 +C462:000000000220022004400AA0155004407FFC000000001FF0044004401FF00000 +C463:000000000220022004400AA0155004407FFC000001001FF007C0082007C00000 +C464:000000000220022002200640054008A0331000003FF801000100010001000000 +C465:000000000220022004400AA011107FFC010001001FF000100010001000100000 +C466:000000000220022004400AA011107FFC0100010000003EF80208020802080000 +C467:000000000220022004400AA011107FFC0100010000001E100210022802C40000 +C468:000000000220022004400AA0111000007FFC010001001100100010001FF00000 +C469:000000000220022004400AA011107FFC01000100000020F8201020303ECC0000 +C46A:000000000220022004400AA011107FFC01000100202021FC207020883E700000 +C46B:000000000220022004400AA011107FFC010001001FF01000100010001FF00000 +C46C:000000000220022004400AA011107FFC010001001FF000101FF010001FF00000 +C46D:000000000220022004400AA011107FFC010001003EF802083E0820083E080000 +C46E:000000000220022004400AA011107FFC010001003EF802883E8820883EF80000 +C46F:000000000220022004400AA011107FFC010001003E8802883EF820883EF80000 +C470:000000000220022004400AA011107FFC010001003E1002103E1020283EC40000 +C471:000000000220022004400AA011107FFC010001003EF802803EF820803EF80000 +C472:000000000220022004400AA011107FFC010001003EFC02483E4820483EFC0000 +C473:000000000220022004400AA011107FFC010001003E2003FC3E7020883E700000 +C474:000000000220022004400AA011107FFC010001001FF01010101010101FF00000 +C475:000000000220022004400AA011107FFC01000100101010101FF010101FF00000 +C476:000000000220022004400AA011107FFC01000100222022203E2022503E880000 +C477:000000000220022004400AA011107FFC0100010000000100010002800C400000 +C478:000000000220022004400AA011107FFC010001000000024002400DA033100000 +C479:000000000220022004400AA011107FFC01000100000007C00820082007C00000 +C47A:000000000220022004400AA011107FFC01000100000007E00080014006200000 +C47B:000000000220022004400AA011107FFC01000100008007E00080014006200000 +C47C:000000000220022004400AA011107FFC010001001FF000101FF0001000100000 +C47D:000000000220022004400AA011107FFC010001001FF010001FF010001FF00000 +C47E:000000000220022004400AA011107FFC0100010000001FF0044004401FF00000 +C47F:000000000220022004400AA011107FFC0100010001001FF007C0082007C00000 +C480:00000008088808880888190815082288CC4800087FE8040804F8040804080000 +C481:00080888088811082A8844487FE8027802080000000007F80008000800080000 +C482:00080888088811082A8844487FE802780208000000003EF80208020802080000 +C483:00080888088811082A8844487FE802780208000000001F080108011401620000 +C484:00080888088811082A88444800087FE80278020802081000100010001FF80000 +C485:00080888088811082A8844487FE8027802080000000020F8201020303ECC0000 +C486:00080888088811082A8844487FE8027802080000202021FC207020883E700000 +C487:00080888088811082A8844487FE802780208000003F802000200020003F80000 +C488:00080888088811082A8844487FE802780208000007F8000807F8040007F80000 +C489:00080888088811082A8844487FE80278020800003EF802083E0820083E080000 +C48A:00080888088811082A8844487FE80278020800003EF802883E8820883EF80000 +C48B:00080888088811082A8844487FE80278020800003E8802883EF820883EF80000 +C48C:00080888088811082A8844487FE80278020800000F8800880F8808140FA20000 +C48D:00080888088811082A8844487FE80278020800003EF802803EF820803EF80000 +C48E:00080888088811082A8844487FE80278020800003EFC02483E4820483EFC0000 +C48F:00080888088811082A8844487FE80278020800003E1002FE3E3820443E380000 +C490:00080888088811082A8844487FE802780208000003F802080208020803F80000 +C491:00080888088811082A8844487FE80278020800000208020803F8020803F80000 +C492:00080888088811082A8844487FE8027802080000210821083F0821143F620000 +C493:00080888088811082A8844487FE8027802080000001000100010006801840000 +C494:00080888088811082A8844487FE80278020800000048004800A8011406620000 +C495:00080888088811082A8844487FE8027802080000000003F00408040803F00000 +C496:00080888088811082A8844487FE802780208000003F80020002000D003080000 +C497:00080888088811082A8844487FE8027802080000004003F8004000A003180000 +C498:00080888088811082A8844487FE802780208000003F8000803F8000800080000 +C499:00080888088811082A8844487FE802780208000003F8020003F8020003F80000 +C49A:00080888088811082A8844487FE802780208000000000FF8022002200FF80000 +C49B:00080888088811082A8844487FE802780208000000800FF803E0041003E00000 +C49C:0000000A088A088A088A190A150A228ACC4A000A7FEA040A047A040A040A0000 +C49D:002808A808A811282AA844687FA805E804280000000007F80008000800080000 +C49E:002808A808A811282AA844687FA805E80428000000003EF80208020802080000 +C49F:002808A808A811282AA844687FA805E80428000000001F080108011401620000 +C4A0:002808A808A811282AA8446800287FA8042805E804281428100010001FF80000 +C4A1:002808A808A811282AA844687FA805E804280000000020F8201020303ECC0000 +C4A2:002808A808A811282AA844687FA805E804280000202021FC207020883E700000 +C4A3:002808A808A811282AA844687FA805E80428000003F802000200020003F80000 +C4A4:002808A808A811282AA844687FA805E80428000007F8000807F8040007F80000 +C4A5:002808A808A811282AA844687FA805E8042800003EF802083E0820083E080000 +C4A6:002808A808A811282AA844687FA805E8042800003EF802883E8820883EF80000 +C4A7:002808A808A811282AA844687FA805E8042800003E8802883EF820883EF80000 +C4A8:002808A808A811282AA844687FA805E8042800000F8800880F8808140FA20000 +C4A9:002808A808A811282AA844687FA805E8042800003EF802803EF820803EF80000 +C4AA:002808A808A811282AA844687FA805E8042800003EFC02483E4820483EFC0000 +C4AB:002808A808A811282AA844687FA805E8042800003E1002FE3E3820443E380000 +C4AC:002808A808A811282AA844687FA805E80428000003F802080208020803F80000 +C4AD:002808A808A811282AA844687FA805E8042800000208020803F8020803F80000 +C4AE:002808A808A811282AA844687FA805E804280000210821083F0821143F620000 +C4AF:002808A808A811282AA844687FA805E804280000001000100010006801840000 +C4B0:002808A808A811282AA844687FA805E8042800000048004800A8011406620000 +C4B1:002808A808A811282AA844687FA805E804280000000003F00408040803F00000 +C4B2:002808A808A811282AA844687FA805E80428000003F80020002000D003080000 +C4B3:002808A808A811282AA844687FA805E804280000004003F8004000A003180000 +C4B4:002808A808A811282AA844687FA805E80428000003F8000803F8000800080000 +C4B5:002808A808A811282AA844687FA805E80428000003F8020003F8020003F80000 +C4B6:002808A808A811282AA844687FA805E80428000000000FF8022002200FF80000 +C4B7:002808A808A811282AA844687FA805E80428000000800FF803E0041003E00000 +C4B8:00000008088808880888190815082288CC4800087FE804080408040804080000 +C4B9:00080888088811082A8844487FE8020802000000000007F80008000800080000 +C4BA:00080888088811082A8844487FE802080200000000003EF80208020802080000 +C4BB:00080888088811082A8844487FE802080200000000001F080108011401620000 +C4BC:00080888088811082A88444800087FE80208020802081008100010001FF80000 +C4BD:00080888088811082A8844487FE8020802000000000020F8201020303ECC0000 +C4BE:00080888088811082A8844487FE8020802000000202021FC207020883E700000 +C4BF:00080888088811082A8844487FE802080200000003F802000200020003F80000 +C4C0:00080888088811082A8844487FE802080200000007F8000807F8040007F80000 +C4C1:00080888088811082A8844487FE80208020000003EF802083E0820083E080000 +C4C2:00080888088811082A8844487FE80208020000003EF802883E8820883EF80000 +C4C3:00080888088811082A8844487FE80208020000003E8802883EF820883EF80000 +C4C4:00080888088811082A8844487FE80208020000000F8800880F8808140FA20000 +C4C5:00080888088811082A8844487FE80208020000003EF802803EF820803EF80000 +C4C6:00080888088811082A8844487FE80208020000003EFC02483E4820483EFC0000 +C4C7:00080888088811082A8844487FE80208020000003E1002FE3E3820443E380000 +C4C8:00080888088811082A8844487FE802080200000003F802080208020803F80000 +C4C9:00080888088811082A8844487FE80208020000000208020803F8020803F80000 +C4CA:00080888088811082A8844487FE8020802000000210821083F0821143F620000 +C4CB:00080888088811082A8844487FE8020802000000001000100010006801840000 +C4CC:00080888088811082A8844487FE80208020000000048004800A8011406620000 +C4CD:00080888088811082A8844487FE8020802000000000003F00408040803F00000 +C4CE:00080888088811082A8844487FE802080200000003F80020002000D003080000 +C4CF:00080888088811082A8844487FE8020802000000004003F8004000A003180000 +C4D0:00080888088811082A8844487FE802080200000003F8000803F8000800080000 +C4D1:00080888088811082A8844487FE802080200000003F8020003F8020003F80000 +C4D2:00080888088811082A8844487FE802080200000000000FF8022002200FF80000 +C4D3:00080888088811082A8844487FE802080200000000800FF803E0041003E00000 +C4D4:000000000220022002200640054008A0331000007FFC04400440044004400000 +C4D5:000000000220022004400AA011107FFC044004401FF000100010001000100000 +C4D6:000000000220022004400AA011107FFC0440044000003EF80208020802080000 +C4D7:000000000220022004400AA011107FFC0440044000001E100210022802C40000 +C4D8:000000000220022004400AA0111000007FFC044004401440100010001FF00000 +C4D9:000000000220022004400AA011107FFC04400440000020F8201020303ECC0000 +C4DA:000000000220022004400AA011107FFC04400440202021FC207020883E700000 +C4DB:000000000220022004400AA011107FFC044004401FF01000100010001FF00000 +C4DC:000000000220022004400AA011107FFC044004401FF000101FF010001FF00000 +C4DD:000000000220022004400AA011107FFC044004403EF802083E0820083E080000 +C4DE:000000000220022004400AA011107FFC044004403EF802883E8820883EF80000 +C4DF:000000000220022004400AA011107FFC044004403E8802883EF820883EF80000 +C4E0:000000000220022004400AA011107FFC044004403E1002103E1020283EC40000 +C4E1:000000000220022004400AA011107FFC044004403EF802803EF820803EF80000 +C4E2:000000000220022004400AA011107FFC044004403EFC02483E4820483EFC0000 +C4E3:000000000220022004400AA011107FFC044004403E2003FC3E7020883E700000 +C4E4:000000000220022004400AA011107FFC044004401FF01010101010101FF00000 +C4E5:000000000220022004400AA011107FFC04400440101010101FF010101FF00000 +C4E6:000000000220022004400AA011107FFC04400440222022203E2022503E880000 +C4E7:000000000220022004400AA011107FFC0440044000000100010002800C400000 +C4E8:000000000220022004400AA011107FFC044004400000024002400DA033100000 +C4E9:000000000220022004400AA011107FFC04400440000007C00820082007C00000 +C4EA:000000000220022004400AA011107FFC04400440000007E00080014006200000 +C4EB:000000000220022004400AA011107FFC04400440008007E00080014006200000 +C4EC:000000000220022004400AA011107FFC044004401FF000101FF0001000100000 +C4ED:000000000220022004400AA011107FFC044004401FF010001FF010001FF00000 +C4EE:000000000220022004400AA011107FFC0440044000001FF0044004401FF00000 +C4EF:000000000220022004400AA011107FFC0440044001001FF007C0082007C00000 +C4F0:0000000000000220022002200640054008A0331000007FFC0000000000000000 +C4F1:000000000220022004400AA0111000007FFC00001FF000100010001000100000 +C4F2:000000000220022004400AA0111000007FFC000000003EF80208020802080000 +C4F3:000000000220022004400AA0111000007FFC000000001E100210022802C40000 +C4F4:000000000220022004400AA0111000007FFC000000001000100010001FF00000 +C4F5:000000000220022004400AA0111000007FFC0000000020F8201020303ECC0000 +C4F6:000000000220022004400AA0111000007FFC0000202021FC207020883E700000 +C4F7:000000000220022004400AA0111000007FFC00001FF01000100010001FF00000 +C4F8:000000000220022004400AA0111000007FFC00001FF000101FF010001FF00000 +C4F9:000000000220022004400AA0111000007FFC00003EF802083E0820083E080000 +C4FA:000000000220022004400AA0111000007FFC00003EF802883E8820883EF80000 +C4FB:000000000220022004400AA0111000007FFC00003E8802883EF820883EF80000 +C4FC:000000000220022004400AA0111000007FFC00003E1002103E1020283EC40000 +C4FD:000000000220022004400AA0111000007FFC00003EF802803EF820803EF80000 +C4FE:000000000220022004400AA0111000007FFC00003EFC02483E4820483EFC0000 +C4FF:000000000220022004400AA0111000007FFC00003E2003FC3E7020883E700000 +C500:000000000220022004400AA0111000007FFC00001FF01010101010101FF00000 +C501:000000000220022004400AA0111000007FFC0000101010101FF010101FF00000 +C502:000000000220022004400AA0111000007FFC0000222022203E2022503E880000 +C503:000000000220022004400AA0111000007FFC000000000100010002800C400000 +C504:000000000220022004400AA0111000007FFC00000000024002400DA033100000 +C505:000000000220022004400AA0111000007FFC0000000007C00820082007C00000 +C506:000000000220022004400AA0111000007FFC0000000007E00080014006200000 +C507:000000000220022004400AA0111000007FFC0000008007E00080014006200000 +C508:000000000220022004400AA0111000007FFC00001FF000101FF0001000100000 +C509:000000000220022004400AA0111000007FFC00001FF010001FF010001FF00000 +C50A:000000000220022004400AA0111000007FFC000000001FF0044004401FF00000 +C50B:000000000220022004400AA0111000007FFC000001001FF007C0082007C00000 +C50C:000000080008088808880888190815082288CC4800087FE80008000800080000 +C50D:00000888088811082A884448000800087FE8000007F800080008000800080000 +C50E:00000888088811082A884448000800087FE8000000003EF80208020802080000 +C50F:00000888088811082A884448000800087FE8000000001F080108011401620000 +C510:00000888088811082A884448000800087FE8000008000800080008000FF80000 +C511:00000888088811082A884448000800087FE80000000010F8101010301ECC0000 +C512:00000888088811082A884448000800087FE800000808087F081C08220F9C0000 +C513:00000888088811082A884448000800087FE8000003F802000200020003F80000 +C514:00000888088811082A884448000800087FE8000007F8000807F8040007F80000 +C515:00000888088811082A884448000800087FE800003EF802083E0820083E080000 +C516:00000888088811082A884448000800087FE800003EF802883E8820883EF80000 +C517:00000888088811082A884448000800087FE800003E8802883EF820883EF80000 +C518:00000888088811082A884448000800087FE800001F0801081F0810141F620000 +C519:00000888088811082A884448000800087FE800003EF802803EF820803EF80000 +C51A:00000888088811082A884448000800087FE800003EFC02483E4820483EFC0000 +C51B:00000888088811082A884448000800087FE800001F08017F1F1C10221F1C0000 +C51C:00000888088811082A884448000800087FE8000003F802080208020803F80000 +C51D:00000888088811082A884448000800087FE800000208020803F8020803F80000 +C51E:00000888088811082A884448000800087FE80000110811081F0811141F620000 +C51F:00000888088811082A884448000800087FE80000001000100010006801840000 +C520:00000888088811082A884448000800087FE800000048004800A8011406620000 +C521:00000888088811082A884448000800087FE80000000003F00408040803F00000 +C522:00000888088811082A884448000800087FE8000003F80020002000D003080000 +C523:00000888088811082A884448000800087FE80000004003F8004000A003180000 +C524:00000888088811082A884448000800087FE8000003F8000803F8000800080000 +C525:00000888088811082A884448000800087FE8000003F8020003F8020003F80000 +C526:00000888088811082A884448000800087FE8000000000FF8022002200FF80000 +C527:00000888088811082A884448000800087FE8000000800FF803E0041003E00000 +C528:0000000000080008088808880888190815082288CC4800080008000800080000 +C529:0000000800081208120834082A08490800080000000007F80008000800080000 +C52A:0000000800081208120834082A0849080008000000003EF80208020802080000 +C52B:0000000800081208120834082A0849080008000000001F080108011401620000 +C52C:0000000800081208120834082A0849080008000800001000100010001FF80000 +C52D:0000000800081208120834082A08490800080000000020F8201020303ECC0000 +C52E:0000000800081208120834082A08490800080000202021FC207020883E700000 +C52F:0000000800081208120834082A0849080008000003F802000200020003F80000 +C530:0000000800081208120834082A0849080008000007F8000807F8040007F80000 +C531:0000000800081208120834082A084908000800003EF802083E0820083E080000 +C532:0000000800081208120834082A084908000800003EF802883E8820883EF80000 +C533:0000000800081208120834082A084908000800003E8802883EF820883EF80000 +C534:0000000800081208120834082A084908000800000F8800880F8808140FA20000 +C535:0000000800081208120834082A084908000800003EF802803EF820803EF80000 +C536:0000000800081208120834082A084908000800003EFC02483E4820483EFC0000 +C537:0000000800081208120834082A084908000800003E1002FE3E3820443E380000 +C538:0000000800081208120834082A0849080008000003F802080208020803F80000 +C539:0000000800081208120834082A084908000800000208020803F8020803F80000 +C53A:0000000800081208120834082A08490800080000210821083F0821143F620000 +C53B:0000000800081208120834082A08490800080000001000100010006801840000 +C53C:0000000800081208120834082A084908000800000048004800A8011406620000 +C53D:0000000800081208120834082A08490800080000000003F00408040803F00000 +C53E:0000000800081208120834082A0849080008000003F80020002000D003080000 +C53F:0000000800081208120834082A08490800080000004003F8004000A003180000 +C540:0000000800081208120834082A0849080008000003F8000803F8000800080000 +C541:0000000800081208120834082A0849080008000003F8020003F8020003F80000 +C542:0000000800081208120834082A0849080008000000000FF8022002200FF80000 +C543:0000000800081208120834082A0849080008000000800FF803E0041003E00000 +C544:00000000001000101E1021104090409E409021101E1000100010001000100000 +C545:000000081E0821082108210E21081E080008000007F800080008000800080000 +C546:000000081E0821082108210E21081E080008000000003EF80208020802080000 +C547:000000081E0821082108210E21081E080008000000001F080108011401620000 +C548:000000081E0821082108210E21081E080008000808000800080008000FF80000 +C549:000000081E0821082108210E21081E0800080000000010F8101010301ECC0000 +C54A:000000081E0821082108210E21081E08000800000808087F081C08220F9C0000 +C54B:000000081E0821082108210E21081E080008000003F802000200020003F80000 +C54C:000000081E0821082108210E21081E080008000007F8000807F8040007F80000 +C54D:000000081E0821082108210E21081E08000800003EF802083E0820083E080000 +C54E:000000081E0821082108210E21081E08000800003EF802883E8820883EF80000 +C54F:000000081E0821082108210E21081E08000800003E8802883EF820883EF80000 +C550:000000081E0821082108210E21081E08000800001F0801081F0810141F620000 +C551:000000081E0821082108210E21081E08000800003EF802803EF820803EF80000 +C552:000000081E0821082108210E21081E08000800003EFC02483E4820483EFC0000 +C553:000000081E0821082108210E21081E08000800001F08017F1F1C10221F1C0000 +C554:000000081E0821082108210E21081E080008000003F802080208020803F80000 +C555:000000081E0821082108210E21081E08000800000208020803F8020803F80000 +C556:000000081E0821082108210E21081E0800080000110811081F0811141F620000 +C557:000000081E0821082108210E21081E0800080000001000100010006801840000 +C558:000000081E0821082108210E21081E08000800000048004800A8011406620000 +C559:000000081E0821082108210E21081E0800080000000003F00408040803F00000 +C55A:000000081E0821082108210E21081E080008000003F80020002000D003080000 +C55B:000000081E0821082108210E21081E0800080000004003F8004000A003180000 +C55C:000000081E0821082108210E21081E080008000003F8000803F8000800080000 +C55D:000000081E0821082108210E21081E080008000003F8020003F8020003F80000 +C55E:000000081E0821082108210E21081E080008000000000FF8022002200FF80000 +C55F:000000081E0821082108210E21081E080008000000800FF803E0041003E00000 +C560:00000000001200121E1221124092409E409221121E1200120012001200120000 +C561:000000281E2821282128213821281E280028000007F800080008000800080000 +C562:000000281E2821282128213821281E280028000000003EF80208020802080000 +C563:000000281E2821282128213821281E280028000000003E100210022802C40000 +C564:000000281E2821282128213821281E280028002808000800080008000FF80000 +C565:000000281E2821282128213821281E2800280000000020F8201020303ECC0000 +C566:000000281E2821282128213821281E2800280000202021FC207020883E700000 +C567:000000281E2821282128213821281E280028000003F802000200020003F80000 +C568:000000281E2821282128213821281E280028000007F8000807F8040007F80000 +C569:000000281E2821282128213821281E28002800003EF802083E0820083E080000 +C56A:000000281E2821282128213821281E28002800003EF802883E8820883EF80000 +C56B:000000281E2821282128213821281E28002800003E8802883EF820883EF80000 +C56C:000000281E2821282128213821281E28002800001F0801081F0810141F620000 +C56D:000000281E2821282128213821281E28002800003EF802803EF820803EF80000 +C56E:000000281E2821282128213821281E28002800003EFC02483E4820483EFC0000 +C56F:000000281E2821282128213821281E28002800003E1002FE3E3820443E380000 +C570:000000281E2821282128213821281E280028000003F802080208020803F80000 +C571:000000281E2821282128213821281E28002800000208020803F8020803F80000 +C572:000000281E2821282128213821281E2800280000110811081F0811141F620000 +C573:000000281E2821282128213821281E2800280000000800080008003400C20000 +C574:000000281E2821282128213821281E28002800000048004800A8011406620000 +C575:000000281E2821282128213821281E2800280000000001F00208020801F00000 +C576:000000281E2821282128213821281E280028000003F80020002000D003080000 +C577:000000281E2821282128213821281E2800280000004003F8004000A003180000 +C578:000000281E2821282128213821281E280028000003F8000803F8000800080000 +C579:000000281E2821282128213821281E280028000003F8020003F8020003F80000 +C57A:000000281E2821282128213821281E280028000000000FF8022002200FF80000 +C57B:000000281E2821282128213821281E280028000000800FF803E0041003E00000 +C57C:00000000001000101E102110409E40904090211E1E1000100010001000100000 +C57D:000000081E082108210E2108210E1E080008000007F800080008000800080000 +C57E:000000081E082108210E2108210E1E080008000000003EF80208020802080000 +C57F:000000081E082108210E2108210E1E080008000000001F080108011401620000 +C580:000000081E082108210E2108210E1E080008000008000800080008000FF80000 +C581:000000081E082108210E2108210E1E0800080000000010F8101010301ECC0000 +C582:000000081E082108210E2108210E1E08000800000808087F081C08220F9C0000 +C583:000000081E082108210E2108210E1E080008000003F802000200020003F80000 +C584:000000081E082108210E2108210E1E080008000007F8000807F8040007F80000 +C585:000000081E082108210E2108210E1E08000800003EF802083E0820083E080000 +C586:000000081E082108210E2108210E1E08000800003EF802883E8820883EF80000 +C587:000000081E082108210E2108210E1E08000800003E8802883EF820883EF80000 +C588:000000081E082108210E2108210E1E08000800001F0801081F0810141F620000 +C589:000000081E082108210E2108210E1E08000800003EF802803EF820803EF80000 +C58A:000000081E082108210E2108210E1E08000800003EFC02483E4820483EFC0000 +C58B:000000081E082108210E2108210E1E08000800001F08017F1F1C10221F1C0000 +C58C:000000081E082108210E2108210E1E080008000003F802080208020803F80000 +C58D:000000081E082108210E2108210E1E08000800000208020803F8020803F80000 +C58E:000000081E082108210E2108210E1E0800080000110811081F0811141F620000 +C58F:000000081E082108210E2108210E1E0800080000001000100010006801840000 +C590:000000081E082108210E2108210E1E08000800000048004800A8011406620000 +C591:000000081E082108210E2108210E1E0800080000000003F00408040803F00000 +C592:000000081E082108210E2108210E1E080008000003F80020002000D003080000 +C593:000000081E082108210E2108210E1E0800080000004003F8004000A003180000 +C594:000000081E082108210E2108210E1E080008000003F8000803F8000800080000 +C595:000000081E082108210E2108210E1E080008000003F8020003F8020003F80000 +C596:000000081E082108210E2108210E1E080008000000000FF8022002200FF80000 +C597:000000081E082108210E2108210E1E080008000000800FF803E0041003E00000 +C598:00000000001200121E122112409E40924092211E1E1200120012001200120000 +C599:000000281E2821282138212821381E280028000007F800080008000800080000 +C59A:000000281E2821282138212821381E280028000000003EF80208020802080000 +C59B:000000281E2821282138212821381E280028000000003E100210022802C40000 +C59C:000000281E2821282138212821381E280028002808000800080008000FF80000 +C59D:000000281E2821282138212821381E2800280000000020F8201020303ECC0000 +C59E:000000281E2821282138212821381E2800280000202021FC207020883E700000 +C59F:000000281E2821282138212821381E280028000003F802000200020003F80000 +C5A0:000000281E2821282138212821381E280028000007F8000807F8040007F80000 +C5A1:000000281E2821282138212821381E28002800003EF802083E0820083E080000 +C5A2:000000281E2821282138212821381E28002800003EF802883E8820883EF80000 +C5A3:000000281E2821282138212821381E28002800003E8802883EF820883EF80000 +C5A4:000000281E2821282138212821381E28002800001F0801081F0810141F620000 +C5A5:000000281E2821282138212821381E28002800003EF802803EF820803EF80000 +C5A6:000000281E2821282138212821381E28002800003EFC02483E4820483EFC0000 +C5A7:000000281E2821282138212821381E28002800003E1002FE3E3820443E380000 +C5A8:000000281E2821282138212821381E280028000003F802080208020803F80000 +C5A9:000000281E2821282138212821381E28002800000208020803F8020803F80000 +C5AA:000000281E2821282138212821381E2800280000110811081F0811141F620000 +C5AB:000000281E2821282138212821381E2800280000000800080008003400C20000 +C5AC:000000281E2821282138212821381E28002800000048004800A8011406620000 +C5AD:000000281E2821282138212821381E2800280000000001F00208020801F00000 +C5AE:000000281E2821282138212821381E280028000003F80020002000D003080000 +C5AF:000000281E2821282138212821381E2800280000004003F8004000A003180000 +C5B0:000000281E2821282138212821381E280028000003F8000803F8000800080000 +C5B1:000000281E2821282138212821381E280028000003F8020003F8020003F80000 +C5B2:000000281E2821282138212821381E280028000000000FF8022002200FF80000 +C5B3:000000281E2821282138212821381E280028000000800FF803E0041003E00000 +C5B4:00000000000200021E0221024082409E408221021E0200020002000200020000 +C5B5:000000081E0821082108213821081E0800080000000007F80008000800080000 +C5B6:000000081E0821082108213821081E080008000000003EF80208020802080000 +C5B7:000000081E0821082108213821081E080008000000001F080108011401620000 +C5B8:000000081E0821082108213821081E080008000000001000100010001FF80000 +C5B9:000000081E0821082108213821081E0800080000000020F8201020303ECC0000 +C5BA:000000081E0821082108213821081E0800080000202021FC207020883E700000 +C5BB:000000081E0821082108213821081E080008000003F802000200020003F80000 +C5BC:000000081E0821082108213821081E080008000007F8000807F8040007F80000 +C5BD:000000081E0821082108213821081E08000800003EF802083E0820083E080000 +C5BE:000000081E0821082108213821081E08000800003EF802883E8820883EF80000 +C5BF:000000081E0821082108213821081E08000800003E8802883EF820883EF80000 +C5C0:000000081E0821082108213821081E08000800000F8800880F8808140FA20000 +C5C1:000000081E0821082108213821081E08000800003EF802803EF820803EF80000 +C5C2:000000081E0821082108213821081E08000800003EFC02483E4820483EFC0000 +C5C3:000000081E0821082108213821081E08000800003E1002FE3E3820443E380000 +C5C4:000000081E0821082108213821081E080008000003F802080208020803F80000 +C5C5:000000081E0821082108213821081E08000800000208020803F8020803F80000 +C5C6:000000081E0821082108213821081E0800080000210821083F0821143F620000 +C5C7:000000081E0821082108213821081E0800080000001000100010006801840000 +C5C8:000000081E0821082108213821081E08000800000048004800A8011406620000 +C5C9:000000081E0821082108213821081E0800080000000003F00408040803F00000 +C5CA:000000081E0821082108213821081E080008000003F80020002000D003080000 +C5CB:000000081E0821082108213821081E0800080000004003F8004000A003180000 +C5CC:000000081E0821082108213821081E080008000003F8000803F8000800080000 +C5CD:000000081E0821082108213821081E080008000003F8020003F8020003F80000 +C5CE:000000081E0821082108213821081E080008000000000FF8022002200FF80000 +C5CF:000000081E0821082108213821081E080008000000800FF803E0041003E00000 +C5D0:00000000000A000A1E0A210A408A40BA408A210A1E0A000A000A000A000A0000 +C5D1:000000281E282128212821E821281E280028000007F800080008000800080000 +C5D2:000000281E282128212821E821281E280028000000003EF80208020802080000 +C5D3:000000281E282128212821E821281E280028000000003E100210022802C40000 +C5D4:000000281E282128212821E821281E280028000008000800080008000FF80000 +C5D5:000000281E282128212821E821281E2800280000000020F8201020303ECC0000 +C5D6:000000281E282128212821E821281E2800280000202021FC207020883E700000 +C5D7:000000281E282128212821E821281E280028000003F802000200020003F80000 +C5D8:000000281E282128212821E821281E280028000007F8000807F8040007F80000 +C5D9:000000281E282128212821E821281E28002800003EF802083E0820083E080000 +C5DA:000000281E282128212821E821281E28002800003EF802883E8820883EF80000 +C5DB:000000281E282128212821E821281E28002800003E8802883EF820883EF80000 +C5DC:000000281E282128212821E821281E28002800001F0801081F0810141F620000 +C5DD:000000281E282128212821E821281E28002800003EF802803EF820803EF80000 +C5DE:000000281E282128212821E821281E28002800003EFC02483E4820483EFC0000 +C5DF:000000281E282128212821E821281E28002800003E1002FE3E3820443E380000 +C5E0:000000281E282128212821E821281E280028000003F802080208020803F80000 +C5E1:000000281E282128212821E821281E28002800000208020803F8020803F80000 +C5E2:000000281E282128212821E821281E2800280000110811081F0811141F620000 +C5E3:000000281E282128212821E821281E2800280000000800080008003400C20000 +C5E4:000000281E282128212821E821281E28002800000048004800A8011406620000 +C5E5:000000281E282128212821E821281E2800280000000001F00208020801F00000 +C5E6:000000281E282128212821E821281E280028000003F80020002000D003080000 +C5E7:000000281E282128212821E821281E2800280000004003F8004000A003180000 +C5E8:000000281E282128212821E821281E280028000003F8000803F8000800080000 +C5E9:000000281E282128212821E821281E280028000003F8020003F8020003F80000 +C5EA:000000281E282128212821E821281E280028000000000FF8022002200FF80000 +C5EB:000000281E282128212821E821281E280028000000800FF803E0041003E00000 +C5EC:00000000000200021E022102409E40824082211E1E0200020002000200020000 +C5ED:000000081E0821082138210821381E0800080000000007F80008000800080000 +C5EE:000000081E0821082138210821381E080008000000003EF80208020802080000 +C5EF:000000081E0821082138210821381E080008000000001F080108011401620000 +C5F0:000000081E0821082138210821381E080008000800001000100010001FF80000 +C5F1:000000081E0821082138210821381E0800080000000020F8201020303ECC0000 +C5F2:000000081E0821082138210821381E0800080000202021FC207020883E700000 +C5F3:000000081E0821082138210821381E080008000003F802000200020003F80000 +C5F4:000000081E0821082138210821381E080008000007F8000807F8040007F80000 +C5F5:000000081E0821082138210821381E08000800003EF802083E0820083E080000 +C5F6:000000081E0821082138210821381E08000800003EF802883E8820883EF80000 +C5F7:000000081E0821082138210821381E08000800003E8802883EF820883EF80000 +C5F8:000000081E0821082138210821381E08000800000F8800880F8808140FA20000 +C5F9:000000081E0821082138210821381E08000800003EF802803EF820803EF80000 +C5FA:000000081E0821082138210821381E08000800003EFC02483E4820483EFC0000 +C5FB:000000081E0821082138210821381E08000800003E1002FE3E3820443E380000 +C5FC:000000081E0821082138210821381E080008000003F802080208020803F80000 +C5FD:000000081E0821082138210821381E08000800000208020803F8020803F80000 +C5FE:000000081E0821082138210821381E0800080000210821083F0821143F620000 +C5FF:000000081E0821082138210821381E0800080000001000100010006801840000 +C600:000000081E0821082138210821381E08000800000048004800A8011406620000 +C601:000000081E0821082138210821381E0800080000000003F00408040803F00000 +C602:000000081E0821082138210821381E080008000003F80020002000D003080000 +C603:000000081E0821082138210821381E0800080000004003F8004000A003180000 +C604:000000081E0821082138210821381E080008000003F8000803F8000800080000 +C605:000000081E0821082138210821381E080008000003F8020003F8020003F80000 +C606:000000081E0821082138210821381E080008000000000FF8022002200FF80000 +C607:000000081E0821082138210821381E080008000000800FF803E0041003E00000 +C608:00000000000A000A1E0A210A40BA408A408A213A1E0A000A000A000A000A0000 +C609:000000281E28212821E8212821E81E280028000007F800080008000800080000 +C60A:000000281E28212821E8212821E81E280028000000003EF80208020802080000 +C60B:000000281E28212821E8212821E81E280028000000003E100210022802C40000 +C60C:000000281E28212821E8212821E81E280028002808000800080008000FF80000 +C60D:000000281E28212821E8212821E81E2800280000000020F8201020303ECC0000 +C60E:000000281E28212821E8212821E81E2800280000202021FC207020883E700000 +C60F:000000281E28212821E8212821E81E280028000003F802000200020003F80000 +C610:000000281E28212821E8212821E81E280028000007F8000807F8040007F80000 +C611:000000281E28212821E8212821E81E28002800003EF802083E0820083E080000 +C612:000000281E28212821E8212821E81E28002800003EF802883E8820883EF80000 +C613:000000281E28212821E8212821E81E28002800003E8802883EF820883EF80000 +C614:000000281E28212821E8212821E81E28002800001F0801081F0810141F620000 +C615:000000281E28212821E8212821E81E28002800003EF802803EF820803EF80000 +C616:000000281E28212821E8212821E81E28002800003EFC02483E4820483EFC0000 +C617:000000281E28212821E8212821E81E28002800003E1002FE3E3820443E380000 +C618:000000281E28212821E8212821E81E280028000003F802080208020803F80000 +C619:000000281E28212821E8212821E81E28002800000208020803F8020803F80000 +C61A:000000281E28212821E8212821E81E2800280000110811081F0811141F620000 +C61B:000000281E28212821E8212821E81E2800280000000800080008003400C20000 +C61C:000000281E28212821E8212821E81E28002800000048004800A8011406620000 +C61D:000000281E28212821E8212821E81E2800280000000001F00208020801F00000 +C61E:000000281E28212821E8212821E81E280028000003F80020002000D003080000 +C61F:000000281E28212821E8212821E81E2800280000004003F8004000A003180000 +C620:000000281E28212821E8212821E81E280028000003F8000803F8000800080000 +C621:000000281E28212821E8212821E81E280028000003F8020003F8020003F80000 +C622:000000281E28212821E8212821E81E280028000000000FF8022002200FF80000 +C623:000000281E28212821E8212821E81E280028000000800FF803E0041003E00000 +C624:000007C00820101010101010082007C0000000000100010001007FFC00000000 +C625:000007C008200820082007C0010001007FFC00001FF000100010001000100000 +C626:000007C008200820082007C0010001007FFC000000003EF80208020802080000 +C627:000007C008200820082007C0010001007FFC000000001E100210022802C40000 +C628:000007C008200820082007C0010001007FFC000000001000100010001FF00000 +C629:000007C008200820082007C0010001007FFC0000000020F8201020303ECC0000 +C62A:000007C008200820082007C0010001007FFC0000202021FC207020883E700000 +C62B:000007C008200820082007C0010001007FFC00001FF01000100010001FF00000 +C62C:000007C008200820082007C0010001007FFC00001FF000101FF010001FF00000 +C62D:000007C008200820082007C0010001007FFC00003EF802083E0820083E080000 +C62E:000007C008200820082007C0010001007FFC00003EF802883E8820883EF80000 +C62F:000007C008200820082007C0010001007FFC00003E8802883EF820883EF80000 +C630:000007C008200820082007C0010001007FFC00003E1002103E1020283EC40000 +C631:000007C008200820082007C0010001007FFC00003EF802803EF820803EF80000 +C632:000007C008200820082007C0010001007FFC00003EFC02483E4820483EFC0000 +C633:000007C008200820082007C0010001007FFC00003E2003FC3E7020883E700000 +C634:000007C008200820082007C0010001007FFC00001FF01010101010101FF00000 +C635:000007C008200820082007C0010001007FFC0000101010101FF010101FF00000 +C636:000007C008200820082007C0010001007FFC0000222022203E2022503E880000 +C637:000007C008200820082007C0010001007FFC000000000100010002800C400000 +C638:000007C008200820082007C0010001007FFC00000000024002400DA033100000 +C639:000007C008200820082007C0010001007FFC0000000007C00820082007C00000 +C63A:000007C008200820082007C0010001007FFC0000000007E00080014006200000 +C63B:000007C008200820082007C0010001007FFC0000008007E00080014006200000 +C63C:000007C008200820082007C0010001007FFC00001FF000101FF0001000100000 +C63D:000007C008200820082007C0010001007FFC00001FF010001FF010001FF00000 +C63E:000007C008200820082007C0010001007FFC000000001FF0044004401FF00000 +C63F:000007C008200820082007C0010001007FFC000001001FF007C0082007C00000 +C640:0000001000101F10209040504050405E20901F10041004107FD0001000100000 +C641:000000081F082088208E20881F0804087FE8000007F800080008000800080000 +C642:000000081F082088208E20881F0804087FE8000000003EF80208020802080000 +C643:000000081F082088208E20881F0804087FE8000000001F080108011401620000 +C644:000000081F082088208E20881F0804087FE8000008000800080008000FF80000 +C645:000000081F082088208E20881F0804087FE80000000010F8101010301ECC0000 +C646:000000081F082088208E20881F0804087FE800000808087F081C08220F9C0000 +C647:000000081F082088208E20881F0804087FE8000003F802000200020003F80000 +C648:000000081F082088208E20881F0804087FE8000007F8000807F8040007F80000 +C649:000000081F082088208E20881F0804087FE800003EF802083E0820083E080000 +C64A:000000081F082088208E20881F0804087FE800003EF802883E8820883EF80000 +C64B:000000081F082088208E20881F0804087FE800003E8802883EF820883EF80000 +C64C:000000081F082088208E20881F0804087FE800001F0801081F0810141F620000 +C64D:000000081F082088208E20881F0804087FE800003EF802803EF820803EF80000 +C64E:000000081F082088208E20881F0804087FE800003EFC02483E4820483EFC0000 +C64F:000000081F082088208E20881F0804087FE800001F08017F1F1C10221F1C0000 +C650:000000081F082088208E20881F0804087FE8000003F802080208020803F80000 +C651:000000081F082088208E20881F0804087FE800000208020803F8020803F80000 +C652:000000081F082088208E20881F0804087FE80000110811081F0811141F620000 +C653:000000081F082088208E20881F0804087FE80000001000100010006801840000 +C654:000000081F082088208E20881F0804087FE800000048004800A8011406620000 +C655:000000081F082088208E20881F0804087FE80000000003F00408040803F00000 +C656:000000081F082088208E20881F0804087FE8000003F80020002000D003080000 +C657:000000081F082088208E20881F0804087FE80000004003F8004000A003180000 +C658:000000081F082088208E20881F0804087FE8000003F8000803F8000800080000 +C659:000000081F082088208E20881F0804087FE8000003F8020003F8020003F80000 +C65A:000000081F082088208E20881F0804087FE8000000000FF8022002200FF80000 +C65B:000000081F082088208E20881F0804087FE8000000800FF803E0041003E00000 +C65C:0000001200121F12209240524052405E20921F12041204127FD2001200120000 +C65D:000000281F2820A820B820A81F2804287FA8000007F800080008000800080000 +C65E:000000281F2820A820B820A81F2804287FA8000000003EF80208020802080000 +C65F:000000281F2820A820B820A81F2804287FA8000000001F080108011401620000 +C660:000000281F2820A820B820A81F2804287FA8000008000800080008000FF80000 +C661:000000281F2820A820B820A81F2804287FA80000000010F8101010301ECC0000 +C662:000000281F2820A820B820A81F2804287FA800000808087F081C08220F9C0000 +C663:000000281F2820A820B820A81F2804287FA8000003F802000200020003F80000 +C664:000000281F2820A820B820A81F2804287FA8000007F8000807F8040007F80000 +C665:000000281F2820A820B820A81F2804287FA800003EF802083E0820083E080000 +C666:000000281F2820A820B820A81F2804287FA800003EF802883E8820883EF80000 +C667:000000281F2820A820B820A81F2804287FA800003E8802883EF820883EF80000 +C668:000000281F2820A820B820A81F2804287FA800001F0801081F0810141F620000 +C669:000000281F2820A820B820A81F2804287FA800003EF802803EF820803EF80000 +C66A:000000281F2820A820B820A81F2804287FA800003EFC02483E4820483EFC0000 +C66B:000000281F2820A820B820A81F2804287FA800001F08017F1F1C10221F1C0000 +C66C:000000281F2820A820B820A81F2804287FA8000003F802080208020803F80000 +C66D:000000281F2820A820B820A81F2804287FA800000208020803F8020803F80000 +C66E:000000281F2820A820B820A81F2804287FA80000110811081F0811141F620000 +C66F:000000281F2820A820B820A81F2804287FA80000001000100010006801840000 +C670:000000281F2820A820B820A81F2804287FA800000048004800A8011406620000 +C671:000000281F2820A820B820A81F2804287FA80000000003F00408040803F00000 +C672:000000281F2820A820B820A81F2804287FA8000003F80020002000D003080000 +C673:000000281F2820A820B820A81F2804287FA80000004003F8004000A003180000 +C674:000000281F2820A820B820A81F2804287FA8000003F8000803F8000800080000 +C675:000000281F2820A820B820A81F2804287FA8000003F8020003F8020003F80000 +C676:000000281F2820A820B820A81F2804287FA8000000000FF8022002200FF80000 +C677:000000281F2820A820B820A81F2804287FA8000000800FF803E0041003E00000 +C678:0000000800081F08208840484048404820881F08040804087FE8000800080000 +C679:000000081F082088208820881F0804087FE8000007F800080008000800080000 +C67A:000000081F082088208820881F0804087FE8000000003EF80208020802080000 +C67B:000000081F082088208820881F0804087FE8000000001F080108011401620000 +C67C:000000081F082088208820881F0804087FE8000008000800080008000FF80000 +C67D:000000081F082088208820881F0804087FE80000000010F8101010301ECC0000 +C67E:000000081F082088208820881F0804087FE800000808087F081C08220F9C0000 +C67F:000000081F082088208820881F0804087FE8000003F802000200020003F80000 +C680:000000081F082088208820881F0804087FE8000007F8000807F8040007F80000 +C681:000000081F082088208820881F0804087FE800003EF802083E0820083E080000 +C682:000000081F082088208820881F0804087FE800003EF802883E8820883EF80000 +C683:000000081F082088208820881F0804087FE800003E8802883EF820883EF80000 +C684:000000081F082088208820881F0804087FE800001F0801081F0810141F620000 +C685:000000081F082088208820881F0804087FE800003EF802803EF820803EF80000 +C686:000000081F082088208820881F0804087FE800003EFC02483E4820483EFC0000 +C687:000000081F082088208820881F0804087FE800001F08017F1F1C10221F1C0000 +C688:000000081F082088208820881F0804087FE8000003F802080208020803F80000 +C689:000000081F082088208820881F0804087FE800000208020803F8020803F80000 +C68A:000000081F082088208820881F0804087FE80000110811081F0811141F620000 +C68B:000000081F082088208820881F0804087FE80000001000100010006801840000 +C68C:000000081F082088208820881F0804087FE800000048004800A8011406620000 +C68D:000000081F082088208820881F0804087FE80000000003F00408040803F00000 +C68E:000000081F082088208820881F0804087FE8000003F80020002000D003080000 +C68F:000000081F082088208820881F0804087FE80000004003F8004000A003180000 +C690:000000081F082088208820881F0804087FE8000003F8000803F8000800080000 +C691:000000081F082088208820881F0804087FE8000003F8020003F8020003F80000 +C692:000000081F082088208820881F0804087FE8000000000FF8022002200FF80000 +C693:000000081F082088208820881F0804087FE8000000800FF803E0041003E00000 +C694:000007C00820101010101010082007C0000004400440044004407FFC00000000 +C695:000007C008200820082007C0044004407FFC00001FF000100010001000100000 +C696:000007C008200820082007C0044004407FFC000000003EF80208020802080000 +C697:000007C008200820082007C0044004407FFC000000001E100210022802C40000 +C698:000007C008200820082007C0044004407FFC000000001000100010001FF00000 +C699:000007C008200820082007C0044004407FFC0000000020F8201020303ECC0000 +C69A:000007C008200820082007C0044004407FFC0000202021FC207020883E700000 +C69B:000007C008200820082007C0044004407FFC00001FF01000100010001FF00000 +C69C:000007C008200820082007C0044004407FFC00001FF000101FF010001FF00000 +C69D:000007C008200820082007C0044004407FFC00003EF802083E0820083E080000 +C69E:000007C008200820082007C0044004407FFC00003EF802883E8820883EF80000 +C69F:000007C008200820082007C0044004407FFC00003E8802883EF820883EF80000 +C6A0:000007C008200820082007C0044004407FFC00003E1002103E1020283EC40000 +C6A1:000007C008200820082007C0044004407FFC00003EF802803EF820803EF80000 +C6A2:000007C008200820082007C0044004407FFC00003EFC02483E4820483EFC0000 +C6A3:000007C008200820082007C0044004407FFC00003E2003FC3E7020883E700000 +C6A4:000007C008200820082007C0044004407FFC00001FF01010101010101FF00000 +C6A5:000007C008200820082007C0044004407FFC0000101010101FF010101FF00000 +C6A6:000007C008200820082007C0044004407FFC0000222022203E2022503E880000 +C6A7:000007C008200820082007C0044004407FFC000000000100010002800C400000 +C6A8:000007C008200820082007C0044004407FFC00000000024002400DA033100000 +C6A9:000007C008200820082007C0044004407FFC0000000007C00820082007C00000 +C6AA:000007C008200820082007C0044004407FFC0000000007E00080014006200000 +C6AB:000007C008200820082007C0044004407FFC0000008007E00080014006200000 +C6AC:000007C008200820082007C0044004407FFC00001FF000101FF0001000100000 +C6AD:000007C008200820082007C0044004407FFC00001FF010001FF010001FF00000 +C6AE:000007C008200820082007C0044004407FFC000000001FF0044004401FF00000 +C6AF:000007C008200820082007C0044004407FFC000001001FF007C0082007C00000 +C6B0:0000000007C00820101010101010082007C000003FF801000100010001000000 +C6B1:000007C008200820082007C000007FFC010001001FF000100010001000100000 +C6B2:000007C008200820082007C000007FFC0100010000003EF80208020802080000 +C6B3:000007C008200820082007C000007FFC0100010000001E100210022802C40000 +C6B4:000007C008200820082007C0000000007FFC010001001100100010001FF00000 +C6B5:000007C008200820082007C000007FFC01000100000020F8201020303ECC0000 +C6B6:000007C008200820082007C000007FFC01000100202021FC207020883E700000 +C6B7:000007C008200820082007C000007FFC010001001FF01000100010001FF00000 +C6B8:000007C008200820082007C000007FFC010001001FF000101FF010001FF00000 +C6B9:000007C008200820082007C000007FFC010001003EF802083E0820083E080000 +C6BA:000007C008200820082007C000007FFC010001003EF802883E8820883EF80000 +C6BB:000007C008200820082007C000007FFC010001003E8802883EF820883EF80000 +C6BC:000007C008200820082007C000007FFC010001003E1002103E1020283EC40000 +C6BD:000007C008200820082007C000007FFC010001003EF802803EF820803EF80000 +C6BE:000007C008200820082007C000007FFC010001003EFC02483E4820483EFC0000 +C6BF:000007C008200820082007C000007FFC010001003E2003FC3E7020883E700000 +C6C0:000007C008200820082007C000007FFC010001001FF01010101010101FF00000 +C6C1:000007C008200820082007C000007FFC01000100101010101FF010101FF00000 +C6C2:000007C008200820082007C000007FFC01000100222022203E2022503E880000 +C6C3:000007C008200820082007C000007FFC0100010000000100010002800C400000 +C6C4:000007C008200820082007C000007FFC010001000000024002400DA033100000 +C6C5:000007C008200820082007C000007FFC01000100000007C00820082007C00000 +C6C6:000007C008200820082007C000007FFC01000100000007E00080014006200000 +C6C7:000007C008200820082007C000007FFC01000100008007E00080014006200000 +C6C8:000007C008200820082007C000007FFC010001001FF000101FF0001000100000 +C6C9:000007C008200820082007C000007FFC010001001FF010001FF010001FF00000 +C6CA:000007C008200820082007C000007FFC0100010000001FF0044004401FF00000 +C6CB:000007C008200820082007C000007FFC0100010001001FF007C0082007C00000 +C6CC:000000081F08208840484048404820881F0800087FE8040804F8040804080000 +C6CD:1F082088208820881F0800087FE8027802080000000007F80008000800080000 +C6CE:1F082088208820881F0800087FE802780208000000003EF80208020802080000 +C6CF:1F082088208820881F0800087FE802780208000000001F080108011401620000 +C6D0:1F082088208820881F08000800087FE80278020802081000100010001FF80000 +C6D1:1F082088208820881F0800087FE8027802080000000020F8201020303ECC0000 +C6D2:1F082088208820881F0800087FE8027802080000202021FC207020883E700000 +C6D3:1F082088208820881F0800087FE802780208000003F802000200020003F80000 +C6D4:1F082088208820881F0800087FE802780208000007F8000807F8040007F80000 +C6D5:1F082088208820881F0800087FE80278020800003EF802083E0820083E080000 +C6D6:1F082088208820881F0800087FE80278020800003EF802883E8820883EF80000 +C6D7:1F082088208820881F0800087FE80278020800003E8802883EF820883EF80000 +C6D8:1F082088208820881F0800087FE80278020800000F8800880F8808140FA20000 +C6D9:1F082088208820881F0800087FE80278020800003EF802803EF820803EF80000 +C6DA:1F082088208820881F0800087FE80278020800003EFC02483E4820483EFC0000 +C6DB:1F082088208820881F0800087FE80278020800003E1002FE3E3820443E380000 +C6DC:1F082088208820881F0800087FE802780208000003F802080208020803F80000 +C6DD:1F082088208820881F0800087FE80278020800000208020803F8020803F80000 +C6DE:1F082088208820881F0800087FE8027802080000210821083F0821143F620000 +C6DF:1F082088208820881F0800087FE8027802080000001000100010006801840000 +C6E0:1F082088208820881F0800087FE80278020800000048004800A8011406620000 +C6E1:1F082088208820881F0800087FE8027802080000000003F00408040803F00000 +C6E2:1F082088208820881F0800087FE802780208000003F80020002000D003080000 +C6E3:1F082088208820881F0800087FE8027802080000004003F8004000A003180000 +C6E4:1F082088208820881F0800087FE802780208000003F8000803F8000800080000 +C6E5:1F082088208820881F0800087FE802780208000003F8020003F8020003F80000 +C6E6:1F082088208820881F0800087FE802780208000000000FF8022002200FF80000 +C6E7:1F082088208820881F0800087FE802780208000000800FF803E0041003E00000 +C6E8:0000000A1F0A208A404A404A404A208A1F0A000A7FEA040A047A040A040A0000 +C6E9:1F2820A820A820A81F2800287FA805E804280000000007F80008000800080000 +C6EA:1F2820A820A820A81F2800287FA805E80428000000003EF80208020802080000 +C6EB:1F2820A820A820A81F2800287FA805E80428000000001F080108011401620000 +C6EC:1F2820A820A820A81F28002800287FA8042805E804281428100010001FF80000 +C6ED:1F2820A820A820A81F2800287FA805E804280000000020F8201020303ECC0000 +C6EE:1F2820A820A820A81F2800287FA805E804280000202021FC207020883E700000 +C6EF:1F2820A820A820A81F2800287FA805E80428000003F802000200020003F80000 +C6F0:1F2820A820A820A81F2800287FA805E80428000007F8000807F8040007F80000 +C6F1:1F2820A820A820A81F2800287FA805E8042800003EF802083E0820083E080000 +C6F2:1F2820A820A820A81F2800287FA805E8042800003EF802883E8820883EF80000 +C6F3:1F2820A820A820A81F2800287FA805E8042800003E8802883EF820883EF80000 +C6F4:1F2820A820A820A81F2800287FA805E8042800000F8800880F8808140FA20000 +C6F5:1F2820A820A820A81F2800287FA805E8042800003EF802803EF820803EF80000 +C6F6:1F2820A820A820A81F2800287FA805E8042800003EFC02483E4820483EFC0000 +C6F7:1F2820A820A820A81F2800287FA805E8042800003E1002FE3E3820443E380000 +C6F8:1F2820A820A820A81F2800287FA805E80428000003F802080208020803F80000 +C6F9:1F2820A820A820A81F2800287FA805E8042800000208020803F8020803F80000 +C6FA:1F2820A820A820A81F2800287FA805E804280000210821083F0821143F620000 +C6FB:1F2820A820A820A81F2800287FA805E804280000001000100010006801840000 +C6FC:1F2820A820A820A81F2800287FA805E8042800000048004800A8011406620000 +C6FD:1F2820A820A820A81F2800287FA805E804280000000003F00408040803F00000 +C6FE:1F2820A820A820A81F2800287FA805E80428000003F80020002000D003080000 +C6FF:1F2820A820A820A81F2800287FA805E804280000004003F8004000A003180000 +C700:1F2820A820A820A81F2800287FA805E80428000003F8000803F8000800080000 +C701:1F2820A820A820A81F2800287FA805E80428000003F8020003F8020003F80000 +C702:1F2820A820A820A81F2800287FA805E80428000000000FF8022002200FF80000 +C703:1F2820A820A820A81F2800287FA805E80428000000800FF803E0041003E00000 +C704:000000081F08208840484048404820881F0800087FE804080408040804080000 +C705:1F082088208820881F0800087FE8020802000000000007F80008000800080000 +C706:1F082088208820881F0800087FE802080200000000003EF80208020802080000 +C707:1F082088208820881F0800087FE802080200000000001F080108011401620000 +C708:1F082088208820881F08000800087FE80208020802081008100010001FF80000 +C709:1F082088208820881F0800087FE8020802000000000020F8201020303ECC0000 +C70A:1F082088208820881F0800087FE8020802000000202021FC207020883E700000 +C70B:1F082088208820881F0800087FE802080200000003F802000200020003F80000 +C70C:1F082088208820881F0800087FE802080200000007F8000807F8040007F80000 +C70D:1F082088208820881F0800087FE80208020000003EF802083E0820083E080000 +C70E:1F082088208820881F0800087FE80208020000003EF802883E8820883EF80000 +C70F:1F082088208820881F0800087FE80208020000003E8802883EF820883EF80000 +C710:1F082088208820881F0800087FE80208020000000F8800880F8808140FA20000 +C711:1F082088208820881F0800087FE80208020000003EF802803EF820803EF80000 +C712:1F082088208820881F0800087FE80208020000003EFC02483E4820483EFC0000 +C713:1F082088208820881F0800087FE80208020000003E1002FE3E3820443E380000 +C714:1F082088208820881F0800087FE802080200000003F802080208020803F80000 +C715:1F082088208820881F0800087FE80208020000000208020803F8020803F80000 +C716:1F082088208820881F0800087FE8020802000000210821083F0821143F620000 +C717:1F082088208820881F0800087FE8020802000000001000100010006801840000 +C718:1F082088208820881F0800087FE80208020000000048004800A8011406620000 +C719:1F082088208820881F0800087FE8020802000000000003F00408040803F00000 +C71A:1F082088208820881F0800087FE802080200000003F80020002000D003080000 +C71B:1F082088208820881F0800087FE8020802000000004003F8004000A003180000 +C71C:1F082088208820881F0800087FE802080200000003F8000803F8000800080000 +C71D:1F082088208820881F0800087FE802080200000003F8020003F8020003F80000 +C71E:1F082088208820881F0800087FE802080200000000000FF8022002200FF80000 +C71F:1F082088208820881F0800087FE802080200000000800FF803E0041003E00000 +C720:0000000007C00820101010101010082007C000007FFC04400440044004400000 +C721:000007C008200820082007C000007FFC044004401FF000100010001000100000 +C722:000007C008200820082007C000007FFC0440044000003EF80208020802080000 +C723:000007C008200820082007C000007FFC0440044000001E100210022802C40000 +C724:000007C008200820082007C0000000007FFC044004401440100010001FF00000 +C725:000007C008200820082007C000007FFC04400440000020F8201020303ECC0000 +C726:000007C008200820082007C000007FFC04400440202021FC207020883E700000 +C727:000007C008200820082007C000007FFC044004401FF01000100010001FF00000 +C728:000007C008200820082007C000007FFC044004401FF000101FF010001FF00000 +C729:000007C008200820082007C000007FFC044004403EF802083E0820083E080000 +C72A:000007C008200820082007C000007FFC044004403EF802883E8820883EF80000 +C72B:000007C008200820082007C000007FFC044004403E8802883EF820883EF80000 +C72C:000007C008200820082007C000007FFC044004403E1002103E1020283EC40000 +C72D:000007C008200820082007C000007FFC044004403EF802803EF820803EF80000 +C72E:000007C008200820082007C000007FFC044004403EFC02483E4820483EFC0000 +C72F:000007C008200820082007C000007FFC044004403E2003FC3E7020883E700000 +C730:000007C008200820082007C000007FFC044004401FF01010101010101FF00000 +C731:000007C008200820082007C000007FFC04400440101010101FF010101FF00000 +C732:000007C008200820082007C000007FFC04400440222022203E2022503E880000 +C733:000007C008200820082007C000007FFC0440044000000100010002800C400000 +C734:000007C008200820082007C000007FFC044004400000024002400DA033100000 +C735:000007C008200820082007C000007FFC04400440000007C00820082007C00000 +C736:000007C008200820082007C000007FFC04400440000007E00080014006200000 +C737:000007C008200820082007C000007FFC04400440008007E00080014006200000 +C738:000007C008200820082007C000007FFC044004401FF000101FF0001000100000 +C739:000007C008200820082007C000007FFC044004401FF010001FF010001FF00000 +C73A:000007C008200820082007C000007FFC0440044000001FF0044004401FF00000 +C73B:000007C008200820082007C000007FFC0440044001001FF007C0082007C00000 +C73C:000007C00820101010101010082007C00000000000007FFC0000000000000000 +C73D:000007C008200820082007C0000000007FFC00001FF000100010001000100000 +C73E:000007C008200820082007C0000000007FFC000000003EF80208020802080000 +C73F:000007C008200820082007C0000000007FFC000000001E100210022802C40000 +C740:000007C008200820082007C0000000007FFC000000001000100010001FF00000 +C741:000007C008200820082007C0000000007FFC0000000020F8201020303ECC0000 +C742:000007C008200820082007C0000000007FFC0000202021FC207020883E700000 +C743:000007C008200820082007C0000000007FFC00001FF01000100010001FF00000 +C744:000007C008200820082007C0000000007FFC00001FF000101FF010001FF00000 +C745:000007C008200820082007C0000000007FFC00003EF802083E0820083E080000 +C746:000007C008200820082007C0000000007FFC00003EF802883E8820883EF80000 +C747:000007C008200820082007C0000000007FFC00003E8802883EF820883EF80000 +C748:000007C008200820082007C0000000007FFC00003E1002103E1020283EC40000 +C749:000007C008200820082007C0000000007FFC00003EF802803EF820803EF80000 +C74A:000007C008200820082007C0000000007FFC00003EFC02483E4820483EFC0000 +C74B:000007C008200820082007C0000000007FFC00003E2003FC3E7020883E700000 +C74C:000007C008200820082007C0000000007FFC00001FF01010101010101FF00000 +C74D:000007C008200820082007C0000000007FFC0000101010101FF010101FF00000 +C74E:000007C008200820082007C0000000007FFC0000222022203E2022503E880000 +C74F:000007C008200820082007C0000000007FFC000000000100010002800C400000 +C750:000007C008200820082007C0000000007FFC00000000024002400DA033100000 +C751:000007C008200820082007C0000000007FFC0000000007C00820082007C00000 +C752:000007C008200820082007C0000000007FFC0000000007E00080014006200000 +C753:000007C008200820082007C0000000007FFC0000008007E00080014006200000 +C754:000007C008200820082007C0000000007FFC00001FF000101FF0001000100000 +C755:000007C008200820082007C0000000007FFC00001FF010001FF010001FF00000 +C756:000007C008200820082007C0000000007FFC000000001FF0044004401FF00000 +C757:000007C008200820082007C0000000007FFC000001001FF007C0082007C00000 +C758:0000000800081F08208840484048404820881F0800087FE80008000800080000 +C759:000000081F082088208820881F0800087FE8000007F800080008000800080000 +C75A:000000081F082088208820881F0800087FE8000000003EF80208020802080000 +C75B:000000081F082088208820881F0800087FE8000000001F080108011401620000 +C75C:000000081F082088208820881F0800087FE8000008000800080008000FF80000 +C75D:000000081F082088208820881F0800087FE80000000010F8101010301ECC0000 +C75E:000000081F082088208820881F0800087FE800000808087F081C08220F9C0000 +C75F:000000081F082088208820881F0800087FE8000003F802000200020003F80000 +C760:000000081F082088208820881F0800087FE8000007F8000807F8040007F80000 +C761:000000081F082088208820881F0800087FE800003EF802083E0820083E080000 +C762:000000081F082088208820881F0800087FE800003EF802883E8820883EF80000 +C763:000000081F082088208820881F0800087FE800003E8802883EF820883EF80000 +C764:000000081F082088208820881F0800087FE800001F0801081F0810141F620000 +C765:000000081F082088208820881F0800087FE800003EF802803EF820803EF80000 +C766:000000081F082088208820881F0800087FE800003EFC02483E4820483EFC0000 +C767:000000081F082088208820881F0800087FE800001F08017F1F1C10221F1C0000 +C768:000000081F082088208820881F0800087FE8000003F802080208020803F80000 +C769:000000081F082088208820881F0800087FE800000208020803F8020803F80000 +C76A:000000081F082088208820881F0800087FE80000110811081F0811141F620000 +C76B:000000081F082088208820881F0800087FE80000001000100010006801840000 +C76C:000000081F082088208820881F0800087FE800000048004800A8011406620000 +C76D:000000081F082088208820881F0800087FE80000000003F00408040803F00000 +C76E:000000081F082088208820881F0800087FE8000003F80020002000D003080000 +C76F:000000081F082088208820881F0800087FE80000004003F8004000A003180000 +C770:000000081F082088208820881F0800087FE8000003F8000803F8000800080000 +C771:000000081F082088208820881F0800087FE8000003F8020003F8020003F80000 +C772:000000081F082088208820881F0800087FE8000000000FF8022002200FF80000 +C773:000000081F082088208820881F0800087FE8000000800FF803E0041003E00000 +C774:00000000000800081E08210840884088408821081E0800080008000800080000 +C775:000000081E0821082108210821081E0800080000000007F80008000800080000 +C776:000000081E0821082108210821081E080008000000003EF80208020802080000 +C777:000000081E0821082108210821081E080008000000001F080108011401620000 +C778:000000081E0821082108210821081E080008000800001000100010001FF80000 +C779:000000081E0821082108210821081E0800080000000020F8201020303ECC0000 +C77A:000000081E0821082108210821081E0800080000202021FC207020883E700000 +C77B:000000081E0821082108210821081E080008000003F802000200020003F80000 +C77C:000000081E0821082108210821081E080008000007F8000807F8040007F80000 +C77D:000000081E0821082108210821081E08000800003EF802083E0820083E080000 +C77E:000000081E0821082108210821081E08000800003EF802883E8820883EF80000 +C77F:000000081E0821082108210821081E08000800003E8802883EF820883EF80000 +C780:000000081E0821082108210821081E08000800000F8800880F8808140FA20000 +C781:000000081E0821082108210821081E08000800003EF802803EF820803EF80000 +C782:000000081E0821082108210821081E08000800003EFC02483E4820483EFC0000 +C783:000000081E0821082108210821081E08000800003E1002FE3E3820443E380000 +C784:000000081E0821082108210821081E080008000003F802080208020803F80000 +C785:000000081E0821082108210821081E08000800000208020803F8020803F80000 +C786:000000081E0821082108210821081E0800080000210821083F0821143F620000 +C787:000000081E0821082108210821081E0800080000001000100010006801840000 +C788:000000081E0821082108210821081E08000800000048004800A8011406620000 +C789:000000081E0821082108210821081E0800080000000003F00408040803F00000 +C78A:000000081E0821082108210821081E080008000003F80020002000D003080000 +C78B:000000081E0821082108210821081E0800080000004003F8004000A003180000 +C78C:000000081E0821082108210821081E080008000003F8000803F8000800080000 +C78D:000000081E0821082108210821081E080008000003F8020003F8020003F80000 +C78E:000000081E0821082108210821081E080008000000000FF8022002200FF80000 +C78F:000000081E0821082108210821081E080008000000800FF803E0041003E00000 +C790:00000000001000103F9001100110021E06100910309000100010001000100000 +C791:0000000800087E080408040E1A0861080008000007F800080008000800080000 +C792:0000000800087E080408040E1A0861080008000000003EF80208020802080000 +C793:0000000800087E080408040E1A0861080008000000001F080108011401620000 +C794:0000000800087E080408040E1A0861080008000808000800080008000FF80000 +C795:0000000800087E080408040E1A08610800080000000010F8101010301ECC0000 +C796:0000000800087E080408040E1A086108000800000808087F081C08220F9C0000 +C797:0000000800087E080408040E1A0861080008000003F802000200020003F80000 +C798:0000000800087E080408040E1A0861080008000007F8000807F8040007F80000 +C799:0000000800087E080408040E1A086108000800003EF802083E0820083E080000 +C79A:0000000800087E080408040E1A086108000800003EF802883E8820883EF80000 +C79B:0000000800087E080408040E1A086108000800003E8802883EF820883EF80000 +C79C:0000000800087E080408040E1A086108000800001F0801081F0810141F620000 +C79D:0000000800087E080408040E1A086108000800003EF802803EF820803EF80000 +C79E:0000000800087E080408040E1A086108000800003EFC02483E4820483EFC0000 +C79F:0000000800087E080408040E1A086108000800001F08017F1F1C10221F1C0000 +C7A0:0000000800087E080408040E1A0861080008000003F802080208020803F80000 +C7A1:0000000800087E080408040E1A086108000800000208020803F8020803F80000 +C7A2:0000000800087E080408040E1A08610800080000110811081F0811141F620000 +C7A3:0000000800087E080408040E1A08610800080000001000100010006801840000 +C7A4:0000000800087E080408040E1A086108000800000048004800A8011406620000 +C7A5:0000000800087E080408040E1A08610800080000000003F00408040803F00000 +C7A6:0000000800087E080408040E1A0861080008000003F80020002000D003080000 +C7A7:0000000800087E080408040E1A08610800080000004003F8004000A003180000 +C7A8:0000000800087E080408040E1A0861080008000003F8000803F8000800080000 +C7A9:0000000800087E080408040E1A0861080008000003F8020003F8020003F80000 +C7AA:0000000800087E080408040E1A0861080008000000000FF8022002200FF80000 +C7AB:0000000800087E080408040E1A0861080008000000800FF803E0041003E00000 +C7AC:00000000001200123F9201120112021E06120912309200120012001200120000 +C7AD:0000002800287E28042804381A2861280028000007F800080008000800080000 +C7AE:0000002800287E28042804381A2861280028000000003EF80208020802080000 +C7AF:0000002800287E28042804381A2861280028000000003E100210022802C40000 +C7B0:0000002800287E28042804381A2861280028002808000800080008000FF80000 +C7B1:0000002800287E28042804381A28612800280000000020F8201020303ECC0000 +C7B2:0000002800287E28042804381A28612800280000202021FC207020883E700000 +C7B3:0000002800287E28042804381A2861280028000003F802000200020003F80000 +C7B4:0000002800287E28042804381A2861280028000007F8000807F8040007F80000 +C7B5:0000002800287E28042804381A286128002800003EF802083E0820083E080000 +C7B6:0000002800287E28042804381A286128002800003EF802883E8820883EF80000 +C7B7:0000002800287E28042804381A286128002800003E8802883EF820883EF80000 +C7B8:0000002800287E28042804381A286128002800001F0801081F0810141F620000 +C7B9:0000002800287E28042804381A286128002800003EF802803EF820803EF80000 +C7BA:0000002800287E28042804381A286128002800003EFC02483E4820483EFC0000 +C7BB:0000002800287E28042804381A286128002800003E1002FE3E3820443E380000 +C7BC:0000002800287E28042804381A2861280028000003F802080208020803F80000 +C7BD:0000002800287E28042804381A286128002800000208020803F8020803F80000 +C7BE:0000002800287E28042804381A28612800280000110811081F0811141F620000 +C7BF:0000002800287E28042804381A28612800280000000800080008003400C20000 +C7C0:0000002800287E28042804381A286128002800000048004800A8011406620000 +C7C1:0000002800287E28042804381A28612800280000000001F00208020801F00000 +C7C2:0000002800287E28042804381A2861280028000003F80020002000D003080000 +C7C3:0000002800287E28042804381A28612800280000004003F8004000A003180000 +C7C4:0000002800287E28042804381A2861280028000003F8000803F8000800080000 +C7C5:0000002800287E28042804381A2861280028000003F8020003F8020003F80000 +C7C6:0000002800287E28042804381A2861280028000000000FF8022002200FF80000 +C7C7:0000002800287E28042804381A2861280028000000800FF803E0041003E00000 +C7C8:00000000001000103F900110011E02100610091E309000100010001000100000 +C7C9:0000000800087E08040E04081A0E61080008000007F800080008000800080000 +C7CA:0000000800087E08040E04081A0E61080008000000003EF80208020802080000 +C7CB:0000000800087E08040E04081A0E61080008000000001F080108011401620000 +C7CC:0000000800087E08040E04081A0E61080008000008000800080008000FF80000 +C7CD:0000000800087E08040E04081A0E610800080000000010F8101010301ECC0000 +C7CE:0000000800087E08040E04081A0E6108000800000808087F081C08220F9C0000 +C7CF:0000000800087E08040E04081A0E61080008000003F802000200020003F80000 +C7D0:0000000800087E08040E04081A0E61080008000007F8000807F8040007F80000 +C7D1:0000000800087E08040E04081A0E6108000800003EF802083E0820083E080000 +C7D2:0000000800087E08040E04081A0E6108000800003EF802883E8820883EF80000 +C7D3:0000000800087E08040E04081A0E6108000800003E8802883EF820883EF80000 +C7D4:0000000800087E08040E04081A0E6108000800001F0801081F0810141F620000 +C7D5:0000000800087E08040E04081A0E6108000800003EF802803EF820803EF80000 +C7D6:0000000800087E08040E04081A0E6108000800003EFC02483E4820483EFC0000 +C7D7:0000000800087E08040E04081A0E6108000800001F08017F1F1C10221F1C0000 +C7D8:0000000800087E08040E04081A0E61080008000003F802080208020803F80000 +C7D9:0000000800087E08040E04081A0E6108000800000208020803F8020803F80000 +C7DA:0000000800087E08040E04081A0E610800080000110811081F0811141F620000 +C7DB:0000000800087E08040E04081A0E610800080000001000100010006801840000 +C7DC:0000000800087E08040E04081A0E6108000800000048004800A8011406620000 +C7DD:0000000800087E08040E04081A0E610800080000000003F00408040803F00000 +C7DE:0000000800087E08040E04081A0E61080008000003F80020002000D003080000 +C7DF:0000000800087E08040E04081A0E610800080000004003F8004000A003180000 +C7E0:0000000800087E08040E04081A0E61080008000003F8000803F8000800080000 +C7E1:0000000800087E08040E04081A0E61080008000003F8020003F8020003F80000 +C7E2:0000000800087E08040E04081A0E61080008000000000FF8022002200FF80000 +C7E3:0000000800087E08040E04081A0E61080008000000800FF803E0041003E00000 +C7E4:00000000001200123F920112011E02120612091E309200120012001200120000 +C7E5:0000002800287E28043804281A3861280028000007F800080008000800080000 +C7E6:0000002800287E28043804281A3861280028000000003EF80208020802080000 +C7E7:0000002800287E28043804281A3861280028000000003E100210022802C40000 +C7E8:0000002800287E28043804281A3861280028002808000800080008000FF80000 +C7E9:0000002800287E28043804281A38612800280000000020F8201020303ECC0000 +C7EA:0000002800287E28043804281A38612800280000202021FC207020883E700000 +C7EB:0000002800287E28043804281A3861280028000003F802000200020003F80000 +C7EC:0000002800287E28043804281A3861280028000007F8000807F8040007F80000 +C7ED:0000002800287E28043804281A386128002800003EF802083E0820083E080000 +C7EE:0000002800287E28043804281A386128002800003EF802883E8820883EF80000 +C7EF:0000002800287E28043804281A386128002800003E8802883EF820883EF80000 +C7F0:0000002800287E28043804281A386128002800001F0801081F0810141F620000 +C7F1:0000002800287E28043804281A386128002800003EF802803EF820803EF80000 +C7F2:0000002800287E28043804281A386128002800003EFC02483E4820483EFC0000 +C7F3:0000002800287E28043804281A386128002800003E1002FE3E3820443E380000 +C7F4:0000002800287E28043804281A3861280028000003F802080208020803F80000 +C7F5:0000002800287E28043804281A386128002800000208020803F8020803F80000 +C7F6:0000002800287E28043804281A38612800280000110811081F0811141F620000 +C7F7:0000002800287E28043804281A38612800280000000800080008003400C20000 +C7F8:0000002800287E28043804281A386128002800000048004800A8011406620000 +C7F9:0000002800287E28043804281A38612800280000000001F00208020801F00000 +C7FA:0000002800287E28043804281A3861280028000003F80020002000D003080000 +C7FB:0000002800287E28043804281A38612800280000004003F8004000A003180000 +C7FC:0000002800287E28043804281A3861280028000003F8000803F8000800080000 +C7FD:0000002800287E28043804281A3861280028000003F8020003F8020003F80000 +C7FE:0000002800287E28043804281A3861280028000000000FF8022002200FF80000 +C7FF:0000002800287E28043804281A3861280028000000800FF803E0041003E00000 +C800:00000000000200023F8201020102021E06020902308200020002000200020000 +C801:0000000800087E08040804381A08610800080000000007F80008000800080000 +C802:0000000800087E08040804381A0861080008000000003EF80208020802080000 +C803:0000000800087E08040804381A0861080008000000001F080108011401620000 +C804:0000000800087E08040804381A0861080008000000001000100010001FF80000 +C805:0000000800087E08040804381A08610800080000000020F8201020303ECC0000 +C806:0000000800087E08040804381A08610800080000202021FC207020883E700000 +C807:0000000800087E08040804381A0861080008000003F802000200020003F80000 +C808:0000000800087E08040804381A0861080008000007F8000807F8040007F80000 +C809:0000000800087E08040804381A086108000800003EF802083E0820083E080000 +C80A:0000000800087E08040804381A086108000800003EF802883E8820883EF80000 +C80B:0000000800087E08040804381A086108000800003E8802883EF820883EF80000 +C80C:0000000800087E08040804381A086108000800000F8800880F8808140FA20000 +C80D:0000000800087E08040804381A086108000800003EF802803EF820803EF80000 +C80E:0000000800087E08040804381A086108000800003EFC02483E4820483EFC0000 +C80F:0000000800087E08040804381A086108000800003E1002FE3E3820443E380000 +C810:0000000800087E08040804381A0861080008000003F802080208020803F80000 +C811:0000000800087E08040804381A086108000800000208020803F8020803F80000 +C812:0000000800087E08040804381A08610800080000210821083F0821143F620000 +C813:0000000800087E08040804381A08610800080000001000100010006801840000 +C814:0000000800087E08040804381A086108000800000048004800A8011406620000 +C815:0000000800087E08040804381A08610800080000000003F00408040803F00000 +C816:0000000800087E08040804381A0861080008000003F80020002000D003080000 +C817:0000000800087E08040804381A08610800080000004003F8004000A003180000 +C818:0000000800087E08040804381A0861080008000003F8000803F8000800080000 +C819:0000000800087E08040804381A0861080008000003F8020003F8020003F80000 +C81A:0000000800087E08040804381A0861080008000000000FF8022002200FF80000 +C81B:0000000800087E08040804381A0861080008000000800FF803E0041003E00000 +C81C:00000000000A000A3F8A010A010A023A060A090A308A000A000A000A000A0000 +C81D:0000002800287E28042804E81A2861280028000007F800080008000800080000 +C81E:0000002800287E28042804E81A2861280028000000003EF80208020802080000 +C81F:0000002800287E28042804E81A2861280028000000003E100210022802C40000 +C820:0000002800287E28042804E81A2861280028000008000800080008000FF80000 +C821:0000002800287E28042804E81A28612800280000000020F8201020303ECC0000 +C822:0000002800287E28042804E81A28612800280000202021FC207020883E700000 +C823:0000002800287E28042804E81A2861280028000003F802000200020003F80000 +C824:0000002800287E28042804E81A2861280028000007F8000807F8040007F80000 +C825:0000002800287E28042804E81A286128002800003EF802083E0820083E080000 +C826:0000002800287E28042804E81A286128002800003EF802883E8820883EF80000 +C827:0000002800287E28042804E81A286128002800003E8802883EF820883EF80000 +C828:0000002800287E28042804E81A286128002800001F0801081F0810141F620000 +C829:0000002800287E28042804E81A286128002800003EF802803EF820803EF80000 +C82A:0000002800287E28042804E81A286128002800003EFC02483E4820483EFC0000 +C82B:0000002800287E28042804E81A286128002800003E1002FE3E3820443E380000 +C82C:0000002800287E28042804E81A2861280028000003F802080208020803F80000 +C82D:0000002800287E28042804E81A286128002800000208020803F8020803F80000 +C82E:0000002800287E28042804E81A28612800280000110811081F0811141F620000 +C82F:0000002800287E28042804E81A28612800280000000800080008003400C20000 +C830:0000002800287E28042804E81A286128002800000048004800A8011406620000 +C831:0000002800287E28042804E81A28612800280000000001F00208020801F00000 +C832:0000002800287E28042804E81A2861280028000003F80020002000D003080000 +C833:0000002800287E28042804E81A28612800280000004003F8004000A003180000 +C834:0000002800287E28042804E81A2861280028000003F8000803F8000800080000 +C835:0000002800287E28042804E81A2861280028000003F8020003F8020003F80000 +C836:0000002800287E28042804E81A2861280028000000000FF8022002200FF80000 +C837:0000002800287E28042804E81A2861280028000000800FF803E0041003E00000 +C838:00000000000200023F820102011E02020602091E308200020002000200020000 +C839:0000000800087E08043804081A38610800080000000007F80008000800080000 +C83A:0000000800087E08043804081A3861080008000000003EF80208020802080000 +C83B:0000000800087E08043804081A3861080008000000001F080108011401620000 +C83C:0000000800087E08043804081A3861080008000800001000100010001FF80000 +C83D:0000000800087E08043804081A38610800080000000020F8201020303ECC0000 +C83E:0000000800087E08043804081A38610800080000202021FC207020883E700000 +C83F:0000000800087E08043804081A3861080008000003F802000200020003F80000 +C840:0000000800087E08043804081A3861080008000007F8000807F8040007F80000 +C841:0000000800087E08043804081A386108000800003EF802083E0820083E080000 +C842:0000000800087E08043804081A386108000800003EF802883E8820883EF80000 +C843:0000000800087E08043804081A386108000800003E8802883EF820883EF80000 +C844:0000000800087E08043804081A386108000800000F8800880F8808140FA20000 +C845:0000000800087E08043804081A386108000800003EF802803EF820803EF80000 +C846:0000000800087E08043804081A386108000800003EFC02483E4820483EFC0000 +C847:0000000800087E08043804081A386108000800003E1002FE3E3820443E380000 +C848:0000000800087E08043804081A3861080008000003F802080208020803F80000 +C849:0000000800087E08043804081A386108000800000208020803F8020803F80000 +C84A:0000000800087E08043804081A38610800080000210821083F0821143F620000 +C84B:0000000800087E08043804081A38610800080000001000100010006801840000 +C84C:0000000800087E08043804081A386108000800000048004800A8011406620000 +C84D:0000000800087E08043804081A38610800080000000003F00408040803F00000 +C84E:0000000800087E08043804081A3861080008000003F80020002000D003080000 +C84F:0000000800087E08043804081A38610800080000004003F8004000A003180000 +C850:0000000800087E08043804081A3861080008000003F8000803F8000800080000 +C851:0000000800087E08043804081A3861080008000003F8020003F8020003F80000 +C852:0000000800087E08043804081A3861080008000000000FF8022002200FF80000 +C853:0000000800087E08043804081A3861080008000000800FF803E0041003E00000 +C854:00000000000A000A3F8A010A013A020A060A093A308A000A000A000A000A0000 +C855:0000002800287E2804E804281AE861280028000007F800080008000800080000 +C856:0000002800287E2804E804281AE861280028000000003EF80208020802080000 +C857:0000002800287E2804E804281AE861280028000000003E100210022802C40000 +C858:0000002800287E2804E804281AE861280028002808000800080008000FF80000 +C859:0000002800287E2804E804281AE8612800280000000020F8201020303ECC0000 +C85A:0000002800287E2804E804281AE8612800280000202021FC207020883E700000 +C85B:0000002800287E2804E804281AE861280028000003F802000200020003F80000 +C85C:0000002800287E2804E804281AE861280028000007F8000807F8040007F80000 +C85D:0000002800287E2804E804281AE86128002800003EF802083E0820083E080000 +C85E:0000002800287E2804E804281AE86128002800003EF802883E8820883EF80000 +C85F:0000002800287E2804E804281AE86128002800003E8802883EF820883EF80000 +C860:0000002800287E2804E804281AE86128002800001F0801081F0810141F620000 +C861:0000002800287E2804E804281AE86128002800003EF802803EF820803EF80000 +C862:0000002800287E2804E804281AE86128002800003EFC02483E4820483EFC0000 +C863:0000002800287E2804E804281AE86128002800003E1002FE3E3820443E380000 +C864:0000002800287E2804E804281AE861280028000003F802080208020803F80000 +C865:0000002800287E2804E804281AE86128002800000208020803F8020803F80000 +C866:0000002800287E2804E804281AE8612800280000110811081F0811141F620000 +C867:0000002800287E2804E804281AE8612800280000000800080008003400C20000 +C868:0000002800287E2804E804281AE86128002800000048004800A8011406620000 +C869:0000002800287E2804E804281AE8612800280000000001F00208020801F00000 +C86A:0000002800287E2804E804281AE861280028000003F80020002000D003080000 +C86B:0000002800287E2804E804281AE8612800280000004003F8004000A003180000 +C86C:0000002800287E2804E804281AE861280028000003F8000803F8000800080000 +C86D:0000002800287E2804E804281AE861280028000003F8020003F8020003F80000 +C86E:0000002800287E2804E804281AE861280028000000000FF8022002200FF80000 +C86F:0000002800287E2804E804281AE861280028000000800FF803E0041003E00000 +C870:000000000FE0004000400080018002400C2000000100010001007FFC00000000 +C871:00000FC0008003400C200000010001007FFC00001FF000100010001000100000 +C872:00000FC0008003400C200000010001007FFC000000003EF80208020802080000 +C873:00000FC0008003400C200000010001007FFC000000001E100210022802C40000 +C874:00000FC0008003400C200000010001007FFC000000001000100010001FF00000 +C875:00000FC0008003400C200000010001007FFC0000000020F8201020303ECC0000 +C876:00000FC0008003400C200000010001007FFC0000202021FC207020883E700000 +C877:00000FC0008003400C200000010001007FFC00001FF01000100010001FF00000 +C878:00000FC0008003400C200000010001007FFC00001FF000101FF010001FF00000 +C879:00000FC0008003400C200000010001007FFC00003EF802083E0820083E080000 +C87A:00000FC0008003400C200000010001007FFC00003EF802883E8820883EF80000 +C87B:00000FC0008003400C200000010001007FFC00003E8802883EF820883EF80000 +C87C:00000FC0008003400C200000010001007FFC00003E1002103E1020283EC40000 +C87D:00000FC0008003400C200000010001007FFC00003EF802803EF820803EF80000 +C87E:00000FC0008003400C200000010001007FFC00003EFC02483E4820483EFC0000 +C87F:00000FC0008003400C200000010001007FFC00003E2003FC3E7020883E700000 +C880:00000FC0008003400C200000010001007FFC00001FF01010101010101FF00000 +C881:00000FC0008003400C200000010001007FFC0000101010101FF010101FF00000 +C882:00000FC0008003400C200000010001007FFC0000222022203E2022503E880000 +C883:00000FC0008003400C200000010001007FFC000000000100010002800C400000 +C884:00000FC0008003400C200000010001007FFC00000000024002400DA033100000 +C885:00000FC0008003400C200000010001007FFC0000000007C00820082007C00000 +C886:00000FC0008003400C200000010001007FFC0000000007E00080014006200000 +C887:00000FC0008003400C200000010001007FFC0000008007E00080014006200000 +C888:00000FC0008003400C200000010001007FFC00001FF000101FF0001000100000 +C889:00000FC0008003400C200000010001007FFC00001FF010001FF010001FF00000 +C88A:00000FC0008003400C200000010001007FFC000000001FF0044004401FF00000 +C88B:00000FC0008003400C200000010001007FFC000001001FF007C0082007C00000 +C88C:0000001000103F90011001100210061E09103090041004107FD0001000100000 +C88D:000000083F0802080D0E3088040804087FE8000007F800080008000800080000 +C88E:000000083F0802080D0E3088040804087FE8000000003EF80208020802080000 +C88F:000000083F0802080D0E3088040804087FE8000000001F080108011401620000 +C890:000000083F0802080D0E3088040804087FE8000008000800080008000FF80000 +C891:000000083F0802080D0E3088040804087FE80000000010F8101010301ECC0000 +C892:000000083F0802080D0E3088040804087FE800000808087F081C08220F9C0000 +C893:000000083F0802080D0E3088040804087FE8000003F802000200020003F80000 +C894:000000083F0802080D0E3088040804087FE8000007F8000807F8040007F80000 +C895:000000083F0802080D0E3088040804087FE800003EF802083E0820083E080000 +C896:000000083F0802080D0E3088040804087FE800003EF802883E8820883EF80000 +C897:000000083F0802080D0E3088040804087FE800003E8802883EF820883EF80000 +C898:000000083F0802080D0E3088040804087FE800001F0801081F0810141F620000 +C899:000000083F0802080D0E3088040804087FE800003EF802803EF820803EF80000 +C89A:000000083F0802080D0E3088040804087FE800003EFC02483E4820483EFC0000 +C89B:000000083F0802080D0E3088040804087FE800001F08017F1F1C10221F1C0000 +C89C:000000083F0802080D0E3088040804087FE8000003F802080208020803F80000 +C89D:000000083F0802080D0E3088040804087FE800000208020803F8020803F80000 +C89E:000000083F0802080D0E3088040804087FE80000110811081F0811141F620000 +C89F:000000083F0802080D0E3088040804087FE80000001000100010006801840000 +C8A0:000000083F0802080D0E3088040804087FE800000048004800A8011406620000 +C8A1:000000083F0802080D0E3088040804087FE80000000003F00408040803F00000 +C8A2:000000083F0802080D0E3088040804087FE8000003F80020002000D003080000 +C8A3:000000083F0802080D0E3088040804087FE80000004003F8004000A003180000 +C8A4:000000083F0802080D0E3088040804087FE8000003F8000803F8000800080000 +C8A5:000000083F0802080D0E3088040804087FE8000003F8020003F8020003F80000 +C8A6:000000083F0802080D0E3088040804087FE8000000000FF8022002200FF80000 +C8A7:000000083F0802080D0E3088040804087FE8000000800FF803E0041003E00000 +C8A8:0000001200123F92011201120212061E09123092041204127FD2001200120000 +C8A9:000000283F2802280D3830A8042804287FA8000007F800080008000800080000 +C8AA:000000283F2802280D3830A8042804287FA8000000003EF80208020802080000 +C8AB:000000283F2802280D3830A8042804287FA8000000001F080108011401620000 +C8AC:000000283F2802280D3830A8042804287FA8000008000800080008000FF80000 +C8AD:000000283F2802280D3830A8042804287FA80000000010F8101010301ECC0000 +C8AE:000000283F2802280D3830A8042804287FA800000808087F081C08220F9C0000 +C8AF:000000283F2802280D3830A8042804287FA8000003F802000200020003F80000 +C8B0:000000283F2802280D3830A8042804287FA8000007F8000807F8040007F80000 +C8B1:000000283F2802280D3830A8042804287FA800003EF802083E0820083E080000 +C8B2:000000283F2802280D3830A8042804287FA800003EF802883E8820883EF80000 +C8B3:000000283F2802280D3830A8042804287FA800003E8802883EF820883EF80000 +C8B4:000000283F2802280D3830A8042804287FA800001F0801081F0810141F620000 +C8B5:000000283F2802280D3830A8042804287FA800003EF802803EF820803EF80000 +C8B6:000000283F2802280D3830A8042804287FA800003EFC02483E4820483EFC0000 +C8B7:000000283F2802280D3830A8042804287FA800001F08017F1F1C10221F1C0000 +C8B8:000000283F2802280D3830A8042804287FA8000003F802080208020803F80000 +C8B9:000000283F2802280D3830A8042804287FA800000208020803F8020803F80000 +C8BA:000000283F2802280D3830A8042804287FA80000110811081F0811141F620000 +C8BB:000000283F2802280D3830A8042804287FA80000001000100010006801840000 +C8BC:000000283F2802280D3830A8042804287FA800000048004800A8011406620000 +C8BD:000000283F2802280D3830A8042804287FA80000000003F00408040803F00000 +C8BE:000000283F2802280D3830A8042804287FA8000003F80020002000D003080000 +C8BF:000000283F2802280D3830A8042804287FA80000004003F8004000A003180000 +C8C0:000000283F2802280D3830A8042804287FA8000003F8000803F8000800080000 +C8C1:000000283F2802280D3830A8042804287FA8000003F8020003F8020003F80000 +C8C2:000000283F2802280D3830A8042804287FA8000000000FF8022002200FF80000 +C8C3:000000283F2802280D3830A8042804287FA8000000800FF803E0041003E00000 +C8C4:0000000800083F88010801080208060809083088040804087FE8000800080000 +C8C5:000000083F0802080D083088040804087FE8000007F800080008000800080000 +C8C6:000000083F0802080D083088040804087FE8000000003EF80208020802080000 +C8C7:000000083F0802080D083088040804087FE8000000001F080108011401620000 +C8C8:000000083F0802080D083088040804087FE8000008000800080008000FF80000 +C8C9:000000083F0802080D083088040804087FE80000000010F8101010301ECC0000 +C8CA:000000083F0802080D083088040804087FE800000808087F081C08220F9C0000 +C8CB:000000083F0802080D083088040804087FE8000003F802000200020003F80000 +C8CC:000000083F0802080D083088040804087FE8000007F8000807F8040007F80000 +C8CD:000000083F0802080D083088040804087FE800003EF802083E0820083E080000 +C8CE:000000083F0802080D083088040804087FE800003EF802883E8820883EF80000 +C8CF:000000083F0802080D083088040804087FE800003E8802883EF820883EF80000 +C8D0:000000083F0802080D083088040804087FE800001F0801081F0810141F620000 +C8D1:000000083F0802080D083088040804087FE800003EF802803EF820803EF80000 +C8D2:000000083F0802080D083088040804087FE800003EFC02483E4820483EFC0000 +C8D3:000000083F0802080D083088040804087FE800001F08017F1F1C10221F1C0000 +C8D4:000000083F0802080D083088040804087FE8000003F802080208020803F80000 +C8D5:000000083F0802080D083088040804087FE800000208020803F8020803F80000 +C8D6:000000083F0802080D083088040804087FE80000110811081F0811141F620000 +C8D7:000000083F0802080D083088040804087FE80000001000100010006801840000 +C8D8:000000083F0802080D083088040804087FE800000048004800A8011406620000 +C8D9:000000083F0802080D083088040804087FE80000000003F00408040803F00000 +C8DA:000000083F0802080D083088040804087FE8000003F80020002000D003080000 +C8DB:000000083F0802080D083088040804087FE80000004003F8004000A003180000 +C8DC:000000083F0802080D083088040804087FE8000003F8000803F8000800080000 +C8DD:000000083F0802080D083088040804087FE8000003F8020003F8020003F80000 +C8DE:000000083F0802080D083088040804087FE8000000000FF8022002200FF80000 +C8DF:000000083F0802080D083088040804087FE8000000800FF803E0041003E00000 +C8E0:000000000FE0004000400080018002400C2004400440044004407FFC00000000 +C8E1:00000FC0008003400C200000044004407FFC00001FF000100010001000100000 +C8E2:00000FC0008003400C200000044004407FFC000000003EF80208020802080000 +C8E3:00000FC0008003400C200000044004407FFC000000001E100210022802C40000 +C8E4:00000FC0008003400C200000044004407FFC000000001000100010001FF00000 +C8E5:00000FC0008003400C200000044004407FFC0000000020F8201020303ECC0000 +C8E6:00000FC0008003400C200000044004407FFC0000202021FC207020883E700000 +C8E7:00000FC0008003400C200000044004407FFC00001FF01000100010001FF00000 +C8E8:00000FC0008003400C200000044004407FFC00001FF000101FF010001FF00000 +C8E9:00000FC0008003400C200000044004407FFC00003EF802083E0820083E080000 +C8EA:00000FC0008003400C200000044004407FFC00003EF802883E8820883EF80000 +C8EB:00000FC0008003400C200000044004407FFC00003E8802883EF820883EF80000 +C8EC:00000FC0008003400C200000044004407FFC00003E1002103E1020283EC40000 +C8ED:00000FC0008003400C200000044004407FFC00003EF802803EF820803EF80000 +C8EE:00000FC0008003400C200000044004407FFC00003EFC02483E4820483EFC0000 +C8EF:00000FC0008003400C200000044004407FFC00003E2003FC3E7020883E700000 +C8F0:00000FC0008003400C200000044004407FFC00001FF01010101010101FF00000 +C8F1:00000FC0008003400C200000044004407FFC0000101010101FF010101FF00000 +C8F2:00000FC0008003400C200000044004407FFC0000222022203E2022503E880000 +C8F3:00000FC0008003400C200000044004407FFC000000000100010002800C400000 +C8F4:00000FC0008003400C200000044004407FFC00000000024002400DA033100000 +C8F5:00000FC0008003400C200000044004407FFC0000000007C00820082007C00000 +C8F6:00000FC0008003400C200000044004407FFC0000000007E00080014006200000 +C8F7:00000FC0008003400C200000044004407FFC0000008007E00080014006200000 +C8F8:00000FC0008003400C200000044004407FFC00001FF000101FF0001000100000 +C8F9:00000FC0008003400C200000044004407FFC00001FF010001FF010001FF00000 +C8FA:00000FC0008003400C200000044004407FFC000000001FF0044004401FF00000 +C8FB:00000FC0008003400C200000044004407FFC000001001FF007C0082007C00000 +C8FC:000000000FE0004000400080018002400C2000003FF801000100010001000000 +C8FD:00000FC00080008003400C2000007FFC010001001FF000100010001000100000 +C8FE:00000FC00080008003400C2000007FFC0100010000003EF80208020802080000 +C8FF:00000FC00080008003400C2000007FFC0100010000001E100210022802C40000 +C900:00000FC00080008003400C20000000007FFC010001001100100010001FF00000 +C901:00000FC00080008003400C2000007FFC01000100000020F8201020303ECC0000 +C902:00000FC00080008003400C2000007FFC01000100202021FC207020883E700000 +C903:00000FC00080008003400C2000007FFC010001001FF01000100010001FF00000 +C904:00000FC00080008003400C2000007FFC010001001FF000101FF010001FF00000 +C905:00000FC00080008003400C2000007FFC010001003EF802083E0820083E080000 +C906:00000FC00080008003400C2000007FFC010001003EF802883E8820883EF80000 +C907:00000FC00080008003400C2000007FFC010001003E8802883EF820883EF80000 +C908:00000FC00080008003400C2000007FFC010001003E1002103E1020283EC40000 +C909:00000FC00080008003400C2000007FFC010001003EF802803EF820803EF80000 +C90A:00000FC00080008003400C2000007FFC010001003EFC02483E4820483EFC0000 +C90B:00000FC00080008003400C2000007FFC010001003E2003FC3E7020883E700000 +C90C:00000FC00080008003400C2000007FFC010001001FF01010101010101FF00000 +C90D:00000FC00080008003400C2000007FFC01000100101010101FF010101FF00000 +C90E:00000FC00080008003400C2000007FFC01000100222022203E2022503E880000 +C90F:00000FC00080008003400C2000007FFC0100010000000100010002800C400000 +C910:00000FC00080008003400C2000007FFC010001000000024002400DA033100000 +C911:00000FC00080008003400C2000007FFC01000100000007C00820082007C00000 +C912:00000FC00080008003400C2000007FFC01000100000007E00080014006200000 +C913:00000FC00080008003400C2000007FFC01000100008007E00080014006200000 +C914:00000FC00080008003400C2000007FFC010001001FF000101FF0001000100000 +C915:00000FC00080008003400C2000007FFC010001001FF010001FF010001FF00000 +C916:00000FC00080008003400C2000007FFC0100010000001FF0044004401FF00000 +C917:00000FC00080008003400C2000007FFC0100010001001FF007C0082007C00000 +C918:000000083F8801080108020806080908308800087FE8040804F8040804080000 +C919:3F08020802080D08308800087FE8027802080000000007F80008000800080000 +C91A:3F08020802080D08308800087FE802780208000000003EF80208020802080000 +C91B:3F08020802080D08308800087FE802780208000000001F080108011401620000 +C91C:3F08020802080D083088000800087FE80278020802081000100010001FF80000 +C91D:3F08020802080D08308800087FE8027802080000000020F8201020303ECC0000 +C91E:3F08020802080D08308800087FE8027802080000202021FC207020883E700000 +C91F:3F08020802080D08308800087FE802780208000003F802000200020003F80000 +C920:3F08020802080D08308800087FE802780208000007F8000807F8040007F80000 +C921:3F08020802080D08308800087FE80278020800003EF802083E0820083E080000 +C922:3F08020802080D08308800087FE80278020800003EF802883E8820883EF80000 +C923:3F08020802080D08308800087FE80278020800003E8802883EF820883EF80000 +C924:3F08020802080D08308800087FE80278020800000F8800880F8808140FA20000 +C925:3F08020802080D08308800087FE80278020800003EF802803EF820803EF80000 +C926:3F08020802080D08308800087FE80278020800003EFC02483E4820483EFC0000 +C927:3F08020802080D08308800087FE80278020800003E1002FE3E3820443E380000 +C928:3F08020802080D08308800087FE802780208000003F802080208020803F80000 +C929:3F08020802080D08308800087FE80278020800000208020803F8020803F80000 +C92A:3F08020802080D08308800087FE8027802080000210821083F0821143F620000 +C92B:3F08020802080D08308800087FE8027802080000001000100010006801840000 +C92C:3F08020802080D08308800087FE80278020800000048004800A8011406620000 +C92D:3F08020802080D08308800087FE8027802080000000003F00408040803F00000 +C92E:3F08020802080D08308800087FE802780208000003F80020002000D003080000 +C92F:3F08020802080D08308800087FE8027802080000004003F8004000A003180000 +C930:3F08020802080D08308800087FE802780208000003F8000803F8000800080000 +C931:3F08020802080D08308800087FE802780208000003F8020003F8020003F80000 +C932:3F08020802080D08308800087FE802780208000000000FF8022002200FF80000 +C933:3F08020802080D08308800087FE802780208000000800FF803E0041003E00000 +C934:0000000A3F8A010A010A020A060A090A308A000A7FEA040A047A040A040A0000 +C935:3F28022802280D2830A800287FA805E804280000000007F80008000800080000 +C936:3F28022802280D2830A800287FA805E80428000000003EF80208020802080000 +C937:3F28022802280D2830A800287FA805E80428000000001F080108011401620000 +C938:3F28022802280D2830A8002800287FA8042805E804281428100010001FF80000 +C939:3F28022802280D2830A800287FA805E804280000000020F8201020303ECC0000 +C93A:3F28022802280D2830A800287FA805E804280000202021FC207020883E700000 +C93B:3F28022802280D2830A800287FA805E80428000003F802000200020003F80000 +C93C:3F28022802280D2830A800287FA805E80428000007F8000807F8040007F80000 +C93D:3F28022802280D2830A800287FA805E8042800003EF802083E0820083E080000 +C93E:3F28022802280D2830A800287FA805E8042800003EF802883E8820883EF80000 +C93F:3F28022802280D2830A800287FA805E8042800003E8802883EF820883EF80000 +C940:3F28022802280D2830A800287FA805E8042800000F8800880F8808140FA20000 +C941:3F28022802280D2830A800287FA805E8042800003EF802803EF820803EF80000 +C942:3F28022802280D2830A800287FA805E8042800003EFC02483E4820483EFC0000 +C943:3F28022802280D2830A800287FA805E8042800003E1002FE3E3820443E380000 +C944:3F28022802280D2830A800287FA805E80428000003F802080208020803F80000 +C945:3F28022802280D2830A800287FA805E8042800000208020803F8020803F80000 +C946:3F28022802280D2830A800287FA805E804280000210821083F0821143F620000 +C947:3F28022802280D2830A800287FA805E804280000001000100010006801840000 +C948:3F28022802280D2830A800287FA805E8042800000048004800A8011406620000 +C949:3F28022802280D2830A800287FA805E804280000000003F00408040803F00000 +C94A:3F28022802280D2830A800287FA805E80428000003F80020002000D003080000 +C94B:3F28022802280D2830A800287FA805E804280000004003F8004000A003180000 +C94C:3F28022802280D2830A800287FA805E80428000003F8000803F8000800080000 +C94D:3F28022802280D2830A800287FA805E80428000003F8020003F8020003F80000 +C94E:3F28022802280D2830A800287FA805E80428000000000FF8022002200FF80000 +C94F:3F28022802280D2830A800287FA805E80428000000800FF803E0041003E00000 +C950:000000083F8801080108020806080908308800087FE804080408040804080000 +C951:3F08020802080D08308800087FE8020802000000000007F80008000800080000 +C952:3F08020802080D08308800087FE802080200000000003EF80208020802080000 +C953:3F08020802080D08308800087FE802080200000000001F080108011401620000 +C954:3F08020802080D083088000800087FE80208020802081008100010001FF80000 +C955:3F08020802080D08308800087FE8020802000000000020F8201020303ECC0000 +C956:3F08020802080D08308800087FE8020802000000202021FC207020883E700000 +C957:3F08020802080D08308800087FE802080200000003F802000200020003F80000 +C958:3F08020802080D08308800087FE802080200000007F8000807F8040007F80000 +C959:3F08020802080D08308800087FE80208020000003EF802083E0820083E080000 +C95A:3F08020802080D08308800087FE80208020000003EF802883E8820883EF80000 +C95B:3F08020802080D08308800087FE80208020000003E8802883EF820883EF80000 +C95C:3F08020802080D08308800087FE80208020000000F8800880F8808140FA20000 +C95D:3F08020802080D08308800087FE80208020000003EF802803EF820803EF80000 +C95E:3F08020802080D08308800087FE80208020000003EFC02483E4820483EFC0000 +C95F:3F08020802080D08308800087FE80208020000003E1002FE3E3820443E380000 +C960:3F08020802080D08308800087FE802080200000003F802080208020803F80000 +C961:3F08020802080D08308800087FE80208020000000208020803F8020803F80000 +C962:3F08020802080D08308800087FE8020802000000210821083F0821143F620000 +C963:3F08020802080D08308800087FE8020802000000001000100010006801840000 +C964:3F08020802080D08308800087FE80208020000000048004800A8011406620000 +C965:3F08020802080D08308800087FE8020802000000000003F00408040803F00000 +C966:3F08020802080D08308800087FE802080200000003F80020002000D003080000 +C967:3F08020802080D08308800087FE8020802000000004003F8004000A003180000 +C968:3F08020802080D08308800087FE802080200000003F8000803F8000800080000 +C969:3F08020802080D08308800087FE802080200000003F8020003F8020003F80000 +C96A:3F08020802080D08308800087FE802080200000000000FF8022002200FF80000 +C96B:3F08020802080D08308800087FE802080200000000800FF803E0041003E00000 +C96C:000000000FE0004000400080018002400C2000007FFC04400440044004400000 +C96D:00000FC00080008003400C2000007FFC044004401FF000100010001000100000 +C96E:00000FC00080008003400C2000007FFC0440044000003EF80208020802080000 +C96F:00000FC00080008003400C2000007FFC0440044000001E100210022802C40000 +C970:00000FC00080008003400C20000000007FFC044004401440100010001FF00000 +C971:00000FC00080008003400C2000007FFC04400440000020F8201020303ECC0000 +C972:00000FC00080008003400C2000007FFC04400440202021FC207020883E700000 +C973:00000FC00080008003400C2000007FFC044004401FF01000100010001FF00000 +C974:00000FC00080008003400C2000007FFC044004401FF000101FF010001FF00000 +C975:00000FC00080008003400C2000007FFC044004403EF802083E0820083E080000 +C976:00000FC00080008003400C2000007FFC044004403EF802883E8820883EF80000 +C977:00000FC00080008003400C2000007FFC044004403E8802883EF820883EF80000 +C978:00000FC00080008003400C2000007FFC044004403E1002103E1020283EC40000 +C979:00000FC00080008003400C2000007FFC044004403EF802803EF820803EF80000 +C97A:00000FC00080008003400C2000007FFC044004403EFC02483E4820483EFC0000 +C97B:00000FC00080008003400C2000007FFC044004403E2003FC3E7020883E700000 +C97C:00000FC00080008003400C2000007FFC044004401FF01010101010101FF00000 +C97D:00000FC00080008003400C2000007FFC04400440101010101FF010101FF00000 +C97E:00000FC00080008003400C2000007FFC04400440222022203E2022503E880000 +C97F:00000FC00080008003400C2000007FFC0440044000000100010002800C400000 +C980:00000FC00080008003400C2000007FFC044004400000024002400DA033100000 +C981:00000FC00080008003400C2000007FFC04400440000007C00820082007C00000 +C982:00000FC00080008003400C2000007FFC04400440000007E00080014006200000 +C983:00000FC00080008003400C2000007FFC04400440008007E00080014006200000 +C984:00000FC00080008003400C2000007FFC044004401FF000101FF0001000100000 +C985:00000FC00080008003400C2000007FFC044004401FF010001FF010001FF00000 +C986:00000FC00080008003400C2000007FFC0440044000001FF0044004401FF00000 +C987:00000FC00080008003400C2000007FFC0440044001001FF007C0082007C00000 +C988:000000000FE0004000400080018002400C20000000007FFC0000000000000000 +C989:00000FC0008003400C200000000000007FFC00001FF000100010001000100000 +C98A:00000FC0008003400C200000000000007FFC000000003EF80208020802080000 +C98B:00000FC0008003400C200000000000007FFC000000001E100210022802C40000 +C98C:00000FC0008003400C200000000000007FFC000000001000100010001FF00000 +C98D:00000FC0008003400C200000000000007FFC0000000020F8201020303ECC0000 +C98E:00000FC0008003400C200000000000007FFC0000202021FC207020883E700000 +C98F:00000FC0008003400C200000000000007FFC00001FF01000100010001FF00000 +C990:00000FC0008003400C200000000000007FFC00001FF000101FF010001FF00000 +C991:00000FC0008003400C200000000000007FFC00003EF802083E0820083E080000 +C992:00000FC0008003400C200000000000007FFC00003EF802883E8820883EF80000 +C993:00000FC0008003400C200000000000007FFC00003E8802883EF820883EF80000 +C994:00000FC0008003400C200000000000007FFC00003E1002103E1020283EC40000 +C995:00000FC0008003400C200000000000007FFC00003EF802803EF820803EF80000 +C996:00000FC0008003400C200000000000007FFC00003EFC02483E4820483EFC0000 +C997:00000FC0008003400C200000000000007FFC00003E2003FC3E7020883E700000 +C998:00000FC0008003400C200000000000007FFC00001FF01010101010101FF00000 +C999:00000FC0008003400C200000000000007FFC0000101010101FF010101FF00000 +C99A:00000FC0008003400C200000000000007FFC0000222022203E2022503E880000 +C99B:00000FC0008003400C200000000000007FFC000000000100010002800C400000 +C99C:00000FC0008003400C200000000000007FFC00000000024002400DA033100000 +C99D:00000FC0008003400C200000000000007FFC0000000007C00820082007C00000 +C99E:00000FC0008003400C200000000000007FFC0000000007E00080014006200000 +C99F:00000FC0008003400C200000000000007FFC0000008007E00080014006200000 +C9A0:00000FC0008003400C200000000000007FFC00001FF000101FF0001000100000 +C9A1:00000FC0008003400C200000000000007FFC00001FF010001FF010001FF00000 +C9A2:00000FC0008003400C200000000000007FFC000000001FF0044004401FF00000 +C9A3:00000FC0008003400C200000000000007FFC000001001FF007C0082007C00000 +C9A4:0000000800083F8801080108020806080908308800087FE80008000800080000 +C9A5:000000083F0802080D083088000800087FE8000007F800080008000800080000 +C9A6:000000083F0802080D083088000800087FE8000000003EF80208020802080000 +C9A7:000000083F0802080D083088000800087FE8000000001F080108011401620000 +C9A8:000000083F0802080D083088000800087FE8000008000800080008000FF80000 +C9A9:000000083F0802080D083088000800087FE80000000010F8101010301ECC0000 +C9AA:000000083F0802080D083088000800087FE800000808087F081C08220F9C0000 +C9AB:000000083F0802080D083088000800087FE8000003F802000200020003F80000 +C9AC:000000083F0802080D083088000800087FE8000007F8000807F8040007F80000 +C9AD:000000083F0802080D083088000800087FE800003EF802083E0820083E080000 +C9AE:000000083F0802080D083088000800087FE800003EF802883E8820883EF80000 +C9AF:000000083F0802080D083088000800087FE800003E8802883EF820883EF80000 +C9B0:000000083F0802080D083088000800087FE800001F0801081F0810141F620000 +C9B1:000000083F0802080D083088000800087FE800003EF802803EF820803EF80000 +C9B2:000000083F0802080D083088000800087FE800003EFC02483E4820483EFC0000 +C9B3:000000083F0802080D083088000800087FE800001F08017F1F1C10221F1C0000 +C9B4:000000083F0802080D083088000800087FE8000003F802080208020803F80000 +C9B5:000000083F0802080D083088000800087FE800000208020803F8020803F80000 +C9B6:000000083F0802080D083088000800087FE80000110811081F0811141F620000 +C9B7:000000083F0802080D083088000800087FE80000001000100010006801840000 +C9B8:000000083F0802080D083088000800087FE800000048004800A8011406620000 +C9B9:000000083F0802080D083088000800087FE80000000003F00408040803F00000 +C9BA:000000083F0802080D083088000800087FE8000003F80020002000D003080000 +C9BB:000000083F0802080D083088000800087FE80000004003F8004000A003180000 +C9BC:000000083F0802080D083088000800087FE8000003F8000803F8000800080000 +C9BD:000000083F0802080D083088000800087FE8000003F8020003F8020003F80000 +C9BE:000000083F0802080D083088000800087FE8000000000FF8022002200FF80000 +C9BF:000000083F0802080D083088000800087FE8000000800FF803E0041003E00000 +C9C0:00000000000800083F8801080108020806080908308800080008000800080000 +C9C1:0000000800087E08040804081A08610800080000000007F80008000800080000 +C9C2:0000000800087E08040804081A0861080008000000003EF80208020802080000 +C9C3:0000000800087E08040804081A0861080008000000001F080108011401620000 +C9C4:0000000800087E08040804081A0861080008000800001000100010001FF80000 +C9C5:0000000800087E08040804081A08610800080000000020F8201020303ECC0000 +C9C6:0000000800087E08040804081A08610800080000202021FC207020883E700000 +C9C7:0000000800087E08040804081A0861080008000003F802000200020003F80000 +C9C8:0000000800087E08040804081A0861080008000007F8000807F8040007F80000 +C9C9:0000000800087E08040804081A086108000800003EF802083E0820083E080000 +C9CA:0000000800087E08040804081A086108000800003EF802883E8820883EF80000 +C9CB:0000000800087E08040804081A086108000800003E8802883EF820883EF80000 +C9CC:0000000800087E08040804081A086108000800000F8800880F8808140FA20000 +C9CD:0000000800087E08040804081A086108000800003EF802803EF820803EF80000 +C9CE:0000000800087E08040804081A086108000800003EFC02483E4820483EFC0000 +C9CF:0000000800087E08040804081A086108000800003E1002FE3E3820443E380000 +C9D0:0000000800087E08040804081A0861080008000003F802080208020803F80000 +C9D1:0000000800087E08040804081A086108000800000208020803F8020803F80000 +C9D2:0000000800087E08040804081A08610800080000210821083F0821143F620000 +C9D3:0000000800087E08040804081A08610800080000001000100010006801840000 +C9D4:0000000800087E08040804081A086108000800000048004800A8011406620000 +C9D5:0000000800087E08040804081A08610800080000000003F00408040803F00000 +C9D6:0000000800087E08040804081A0861080008000003F80020002000D003080000 +C9D7:0000000800087E08040804081A08610800080000004003F8004000A003180000 +C9D8:0000000800087E08040804081A0861080008000003F8000803F8000800080000 +C9D9:0000000800087E08040804081A0861080008000003F8020003F8020003F80000 +C9DA:0000000800087E08040804081A0861080008000000000FF8022002200FF80000 +C9DB:0000000800087E08040804081A0861080008000000800FF803E0041003E00000 +C9DC:00000000001000107B9008900890191E15102290CC5000100010001000100000 +C9DD:00000008000877082208220E550888880008000007F800080008000800080000 +C9DE:00000008000877082208220E550888880008000000003EF80208020802080000 +C9DF:00000008000877082208220E550888880008000000001F080108011401620000 +C9E0:00000008000877082208220E550888880008000808000800080008000FF80000 +C9E1:00000008000877082208220E5508888800080000000010F8101010301ECC0000 +C9E2:00000008000877082208220E55088888000800000808087F081C08220F9C0000 +C9E3:00000008000877082208220E550888880008000003F802000200020003F80000 +C9E4:00000008000877082208220E550888880008000007F8000807F8040007F80000 +C9E5:00000008000877082208220E55088888000800003EF802083E0820083E080000 +C9E6:00000008000877082208220E55088888000800003EF802883E8820883EF80000 +C9E7:00000008000877082208220E55088888000800003E8802883EF820883EF80000 +C9E8:00000008000877082208220E55088888000800001F0801081F0810141F620000 +C9E9:00000008000877082208220E55088888000800003EF802803EF820803EF80000 +C9EA:00000008000877082208220E55088888000800003EFC02483E4820483EFC0000 +C9EB:00000008000877082208220E55088888000800001F08017F1F1C10221F1C0000 +C9EC:00000008000877082208220E550888880008000003F802080208020803F80000 +C9ED:00000008000877082208220E55088888000800000208020803F8020803F80000 +C9EE:00000008000877082208220E5508888800080000110811081F0811141F620000 +C9EF:00000008000877082208220E5508888800080000001000100010006801840000 +C9F0:00000008000877082208220E55088888000800000048004800A8011406620000 +C9F1:00000008000877082208220E5508888800080000000003F00408040803F00000 +C9F2:00000008000877082208220E550888880008000003F80020002000D003080000 +C9F3:00000008000877082208220E5508888800080000004003F8004000A003180000 +C9F4:00000008000877082208220E550888880008000003F8000803F8000800080000 +C9F5:00000008000877082208220E550888880008000003F8020003F8020003F80000 +C9F6:00000008000877082208220E550888880008000000000FF8022002200FF80000 +C9F7:00000008000877082208220E550888880008000000800FF803E0041003E00000 +C9F8:00000000001200127B9208920892191E15122292CC5200120012001200120000 +C9F9:000000280028772822282238552888A80028000007F800080008000800080000 +C9FA:000000280028772822282238552888A80028000000003EF80208020802080000 +C9FB:000000280028772822282238552888A80028000000003E100210022802C40000 +C9FC:000000280028772822282238552888A80028002808000800080008000FF80000 +C9FD:000000280028772822282238552888A800280000000020F8201020303ECC0000 +C9FE:000000280028772822282238552888A800280000202021FC207020883E700000 +C9FF:000000280028772822282238552888A80028000003F802000200020003F80000 +CA00:000000280028772822282238552888A80028000007F8000807F8040007F80000 +CA01:000000280028772822282238552888A8002800003EF802083E0820083E080000 +CA02:000000280028772822282238552888A8002800003EF802883E8820883EF80000 +CA03:000000280028772822282238552888A8002800003E8802883EF820883EF80000 +CA04:000000280028772822282238552888A8002800001F0801081F0810141F620000 +CA05:000000280028772822282238552888A8002800003EF802803EF820803EF80000 +CA06:000000280028772822282238552888A8002800003EFC02483E4820483EFC0000 +CA07:000000280028772822282238552888A8002800003E1002FE3E3820443E380000 +CA08:000000280028772822282238552888A80028000003F802080208020803F80000 +CA09:000000280028772822282238552888A8002800000208020803F8020803F80000 +CA0A:000000280028772822282238552888A800280000110811081F0811141F620000 +CA0B:000000280028772822282238552888A800280000000800080008003400C20000 +CA0C:000000280028772822282238552888A8002800000048004800A8011406620000 +CA0D:000000280028772822282238552888A800280000000001F00208020801F00000 +CA0E:000000280028772822282238552888A80028000003F80020002000D003080000 +CA0F:000000280028772822282238552888A800280000004003F8004000A003180000 +CA10:000000280028772822282238552888A80028000003F8000803F8000800080000 +CA11:000000280028772822282238552888A80028000003F8020003F8020003F80000 +CA12:000000280028772822282238552888A80028000000000FF8022002200FF80000 +CA13:000000280028772822282238552888A80028000000800FF803E0041003E00000 +CA14:00000000001000107B900890089E19101510229ECC5000100010001000100000 +CA15:0000000800087708220E2208550E88880008000007F800080008000800080000 +CA16:0000000800087708220E2208550E88880008000000003EF80208020802080000 +CA17:0000000800087708220E2208550E88880008000000001F080108011401620000 +CA18:0000000800087708220E2208550E88880008000008000800080008000FF80000 +CA19:0000000800087708220E2208550E888800080000000010F8101010301ECC0000 +CA1A:0000000800087708220E2208550E8888000800000808087F081C08220F9C0000 +CA1B:0000000800087708220E2208550E88880008000003F802000200020003F80000 +CA1C:0000000800087708220E2208550E88880008000007F8000807F8040007F80000 +CA1D:0000000800087708220E2208550E8888000800003EF802083E0820083E080000 +CA1E:0000000800087708220E2208550E8888000800003EF802883E8820883EF80000 +CA1F:0000000800087708220E2208550E8888000800003E8802883EF820883EF80000 +CA20:0000000800087708220E2208550E8888000800001F0801081F0810141F620000 +CA21:0000000800087708220E2208550E8888000800003EF802803EF820803EF80000 +CA22:0000000800087708220E2208550E8888000800003EFC02483E4820483EFC0000 +CA23:0000000800087708220E2208550E8888000800001F08017F1F1C10221F1C0000 +CA24:0000000800087708220E2208550E88880008000003F802080208020803F80000 +CA25:0000000800087708220E2208550E8888000800000208020803F8020803F80000 +CA26:0000000800087708220E2208550E888800080000110811081F0811141F620000 +CA27:0000000800087708220E2208550E888800080000001000100010006801840000 +CA28:0000000800087708220E2208550E8888000800000048004800A8011406620000 +CA29:0000000800087708220E2208550E888800080000000003F00408040803F00000 +CA2A:0000000800087708220E2208550E88880008000003F80020002000D003080000 +CA2B:0000000800087708220E2208550E888800080000004003F8004000A003180000 +CA2C:0000000800087708220E2208550E88880008000003F8000803F8000800080000 +CA2D:0000000800087708220E2208550E88880008000003F8020003F8020003F80000 +CA2E:0000000800087708220E2208550E88880008000000000FF8022002200FF80000 +CA2F:0000000800087708220E2208550E88880008000000800FF803E0041003E00000 +CA30:00000000001200127B920892089E19121512229ECC5200120012001200120000 +CA31:000000280028772822382228553888A80028000007F800080008000800080000 +CA32:000000280028772822382228553888A80028000000003EF80208020802080000 +CA33:000000280028772822382228553888A80028000000003E100210022802C40000 +CA34:000000280028772822382228553888A80028002808000800080008000FF80000 +CA35:000000280028772822382228553888A800280000000020F8201020303ECC0000 +CA36:000000280028772822382228553888A800280000202021FC207020883E700000 +CA37:000000280028772822382228553888A80028000003F802000200020003F80000 +CA38:000000280028772822382228553888A80028000007F8000807F8040007F80000 +CA39:000000280028772822382228553888A8002800003EF802083E0820083E080000 +CA3A:000000280028772822382228553888A8002800003EF802883E8820883EF80000 +CA3B:000000280028772822382228553888A8002800003E8802883EF820883EF80000 +CA3C:000000280028772822382228553888A8002800001F0801081F0810141F620000 +CA3D:000000280028772822382228553888A8002800003EF802803EF820803EF80000 +CA3E:000000280028772822382228553888A8002800003EFC02483E4820483EFC0000 +CA3F:000000280028772822382228553888A8002800003E1002FE3E3820443E380000 +CA40:000000280028772822382228553888A80028000003F802080208020803F80000 +CA41:000000280028772822382228553888A8002800000208020803F8020803F80000 +CA42:000000280028772822382228553888A800280000110811081F0811141F620000 +CA43:000000280028772822382228553888A800280000000800080008003400C20000 +CA44:000000280028772822382228553888A8002800000048004800A8011406620000 +CA45:000000280028772822382228553888A800280000000001F00208020801F00000 +CA46:000000280028772822382228553888A80028000003F80020002000D003080000 +CA47:000000280028772822382228553888A800280000004003F8004000A003180000 +CA48:000000280028772822382228553888A80028000003F8000803F8000800080000 +CA49:000000280028772822382228553888A80028000003F8020003F8020003F80000 +CA4A:000000280028772822382228553888A80028000000000FF8022002200FF80000 +CA4B:000000280028772822382228553888A80028000000800FF803E0041003E00000 +CA4C:00000000000200027B8208820882191E15022282CC4200020002000200020000 +CA4D:0000000800087708220822385508888800080000000007F80008000800080000 +CA4E:000000080008770822082238550888880008000000003EF80208020802080000 +CA4F:000000080008770822082238550888880008000000001F080108011401620000 +CA50:000000080008770822082238550888880008000000001000100010001FF80000 +CA51:0000000800087708220822385508888800080000000020F8201020303ECC0000 +CA52:0000000800087708220822385508888800080000202021FC207020883E700000 +CA53:000000080008770822082238550888880008000003F802000200020003F80000 +CA54:000000080008770822082238550888880008000007F8000807F8040007F80000 +CA55:00000008000877082208223855088888000800003EF802083E0820083E080000 +CA56:00000008000877082208223855088888000800003EF802883E8820883EF80000 +CA57:00000008000877082208223855088888000800003E8802883EF820883EF80000 +CA58:00000008000877082208223855088888000800000F8800880F8808140FA20000 +CA59:00000008000877082208223855088888000800003EF802803EF820803EF80000 +CA5A:00000008000877082208223855088888000800003EFC02483E4820483EFC0000 +CA5B:00000008000877082208223855088888000800003E1002FE3E3820443E380000 +CA5C:000000080008770822082238550888880008000003F802080208020803F80000 +CA5D:00000008000877082208223855088888000800000208020803F8020803F80000 +CA5E:0000000800087708220822385508888800080000210821083F0821143F620000 +CA5F:0000000800087708220822385508888800080000001000100010006801840000 +CA60:00000008000877082208223855088888000800000048004800A8011406620000 +CA61:0000000800087708220822385508888800080000000003F00408040803F00000 +CA62:000000080008770822082238550888880008000003F80020002000D003080000 +CA63:0000000800087708220822385508888800080000004003F8004000A003180000 +CA64:000000080008770822082238550888880008000003F8000803F8000800080000 +CA65:000000080008770822082238550888880008000003F8020003F8020003F80000 +CA66:000000080008770822082238550888880008000000000FF8022002200FF80000 +CA67:000000080008770822082238550888880008000000800FF803E0041003E00000 +CA68:00000000000A000A7B8A088A088A193A150A228ACC4A000A000A000A000A0000 +CA69:0000002800287728222822E8552888A80028000007F800080008000800080000 +CA6A:0000002800287728222822E8552888A80028000000003EF80208020802080000 +CA6B:0000002800287728222822E8552888A80028000000003E100210022802C40000 +CA6C:0000002800287728222822E8552888A80028000008000800080008000FF80000 +CA6D:0000002800287728222822E8552888A800280000000020F8201020303ECC0000 +CA6E:0000002800287728222822E8552888A800280000202021FC207020883E700000 +CA6F:0000002800287728222822E8552888A80028000003F802000200020003F80000 +CA70:0000002800287728222822E8552888A80028000007F8000807F8040007F80000 +CA71:0000002800287728222822E8552888A8002800003EF802083E0820083E080000 +CA72:0000002800287728222822E8552888A8002800003EF802883E8820883EF80000 +CA73:0000002800287728222822E8552888A8002800003E8802883EF820883EF80000 +CA74:0000002800287728222822E8552888A8002800001F0801081F0810141F620000 +CA75:0000002800287728222822E8552888A8002800003EF802803EF820803EF80000 +CA76:0000002800287728222822E8552888A8002800003EFC02483E4820483EFC0000 +CA77:0000002800287728222822E8552888A8002800003E1002FE3E3820443E380000 +CA78:0000002800287728222822E8552888A80028000003F802080208020803F80000 +CA79:0000002800287728222822E8552888A8002800000208020803F8020803F80000 +CA7A:0000002800287728222822E8552888A800280000110811081F0811141F620000 +CA7B:0000002800287728222822E8552888A800280000000800080008003400C20000 +CA7C:0000002800287728222822E8552888A8002800000048004800A8011406620000 +CA7D:0000002800287728222822E8552888A800280000000001F00208020801F00000 +CA7E:0000002800287728222822E8552888A80028000003F80020002000D003080000 +CA7F:0000002800287728222822E8552888A800280000004003F8004000A003180000 +CA80:0000002800287728222822E8552888A80028000003F8000803F8000800080000 +CA81:0000002800287728222822E8552888A80028000003F8020003F8020003F80000 +CA82:0000002800287728222822E8552888A80028000000000FF8022002200FF80000 +CA83:0000002800287728222822E8552888A80028000000800FF803E0041003E00000 +CA84:00000000000200027B820882089E19021502229ECC4200020002000200020000 +CA85:0000000800087708223822085538888800080000000007F80008000800080000 +CA86:000000080008770822382208553888880008000000003EF80208020802080000 +CA87:000000080008770822382208553888880008000000001F080108011401620000 +CA88:000000080008770822382208553888880008000800001000100010001FF80000 +CA89:0000000800087708223822085538888800080000000020F8201020303ECC0000 +CA8A:0000000800087708223822085538888800080000202021FC207020883E700000 +CA8B:000000080008770822382208553888880008000003F802000200020003F80000 +CA8C:000000080008770822382208553888880008000007F8000807F8040007F80000 +CA8D:00000008000877082238220855388888000800003EF802083E0820083E080000 +CA8E:00000008000877082238220855388888000800003EF802883E8820883EF80000 +CA8F:00000008000877082238220855388888000800003E8802883EF820883EF80000 +CA90:00000008000877082238220855388888000800000F8800880F8808140FA20000 +CA91:00000008000877082238220855388888000800003EF802803EF820803EF80000 +CA92:00000008000877082238220855388888000800003EFC02483E4820483EFC0000 +CA93:00000008000877082238220855388888000800003E1002FE3E3820443E380000 +CA94:000000080008770822382208553888880008000003F802080208020803F80000 +CA95:00000008000877082238220855388888000800000208020803F8020803F80000 +CA96:0000000800087708223822085538888800080000210821083F0821143F620000 +CA97:0000000800087708223822085538888800080000001000100010006801840000 +CA98:00000008000877082238220855388888000800000048004800A8011406620000 +CA99:0000000800087708223822085538888800080000000003F00408040803F00000 +CA9A:000000080008770822382208553888880008000003F80020002000D003080000 +CA9B:0000000800087708223822085538888800080000004003F8004000A003180000 +CA9C:000000080008770822382208553888880008000003F8000803F8000800080000 +CA9D:000000080008770822382208553888880008000003F8020003F8020003F80000 +CA9E:000000080008770822382208553888880008000000000FF8022002200FF80000 +CA9F:000000080008770822382208553888880008000000800FF803E0041003E00000 +CAA0:00000000000A000A7B8A088A08BA190A150A22BACC4A000A000A000A000A0000 +CAA1:000000280028772822E8222855E888A80028000007F800080008000800080000 +CAA2:000000280028772822E8222855E888A80028000000003EF80208020802080000 +CAA3:000000280028772822E8222855E888A80028000000003E100210022802C40000 +CAA4:000000280028772822E8222855E888A80028002808000800080008000FF80000 +CAA5:000000280028772822E8222855E888A800280000000020F8201020303ECC0000 +CAA6:000000280028772822E8222855E888A800280000202021FC207020883E700000 +CAA7:000000280028772822E8222855E888A80028000003F802000200020003F80000 +CAA8:000000280028772822E8222855E888A80028000007F8000807F8040007F80000 +CAA9:000000280028772822E8222855E888A8002800003EF802083E0820083E080000 +CAAA:000000280028772822E8222855E888A8002800003EF802883E8820883EF80000 +CAAB:000000280028772822E8222855E888A8002800003E8802883EF820883EF80000 +CAAC:000000280028772822E8222855E888A8002800001F0801081F0810141F620000 +CAAD:000000280028772822E8222855E888A8002800003EF802803EF820803EF80000 +CAAE:000000280028772822E8222855E888A8002800003EFC02483E4820483EFC0000 +CAAF:000000280028772822E8222855E888A8002800003E1002FE3E3820443E380000 +CAB0:000000280028772822E8222855E888A80028000003F802080208020803F80000 +CAB1:000000280028772822E8222855E888A8002800000208020803F8020803F80000 +CAB2:000000280028772822E8222855E888A800280000110811081F0811141F620000 +CAB3:000000280028772822E8222855E888A800280000000800080008003400C20000 +CAB4:000000280028772822E8222855E888A8002800000048004800A8011406620000 +CAB5:000000280028772822E8222855E888A800280000000001F00208020801F00000 +CAB6:000000280028772822E8222855E888A80028000003F80020002000D003080000 +CAB7:000000280028772822E8222855E888A800280000004003F8004000A003180000 +CAB8:000000280028772822E8222855E888A80028000003F8000803F8000800080000 +CAB9:000000280028772822E8222855E888A80028000003F8020003F8020003F80000 +CABA:000000280028772822E8222855E888A80028000000000FF8022002200FF80000 +CABB:000000280028772822E8222855E888A80028000000800FF803E0041003E00000 +CABC:0000000000001EE0022002200640054008A033100100010001007FFC00000000 +CABD:00003DE00440088015402220010001007FFC00001FF000100010001000100000 +CABE:00003DE00440088015402220010001007FFC000000003EF80208020802080000 +CABF:00003DE00440088015402220010001007FFC000000001E100210022802C40000 +CAC0:00003DE00440088015402220010001007FFC000000001000100010001FF00000 +CAC1:00003DE00440088015402220010001007FFC0000000020F8201020303ECC0000 +CAC2:00003DE00440088015402220010001007FFC0000202021FC207020883E700000 +CAC3:00003DE00440088015402220010001007FFC00001FF01000100010001FF00000 +CAC4:00003DE00440088015402220010001007FFC00001FF000101FF010001FF00000 +CAC5:00003DE00440088015402220010001007FFC00003EF802083E0820083E080000 +CAC6:00003DE00440088015402220010001007FFC00003EF802883E8820883EF80000 +CAC7:00003DE00440088015402220010001007FFC00003E8802883EF820883EF80000 +CAC8:00003DE00440088015402220010001007FFC00003E1002103E1020283EC40000 +CAC9:00003DE00440088015402220010001007FFC00003EF802803EF820803EF80000 +CACA:00003DE00440088015402220010001007FFC00003EFC02483E4820483EFC0000 +CACB:00003DE00440088015402220010001007FFC00003E2003FC3E7020883E700000 +CACC:00003DE00440088015402220010001007FFC00001FF01010101010101FF00000 +CACD:00003DE00440088015402220010001007FFC0000101010101FF010101FF00000 +CACE:00003DE00440088015402220010001007FFC0000222022203E2022503E880000 +CACF:00003DE00440088015402220010001007FFC000000000100010002800C400000 +CAD0:00003DE00440088015402220010001007FFC00000000024002400DA033100000 +CAD1:00003DE00440088015402220010001007FFC0000000007C00820082007C00000 +CAD2:00003DE00440088015402220010001007FFC0000000007E00080014006200000 +CAD3:00003DE00440088015402220010001007FFC0000008007E00080014006200000 +CAD4:00003DE00440088015402220010001007FFC00001FF000101FF0001000100000 +CAD5:00003DE00440088015402220010001007FFC00001FF010001FF010001FF00000 +CAD6:00003DE00440088015402220010001007FFC000000001FF0044004401FF00000 +CAD7:00003DE00440088015402220010001007FFC000001001FF007C0082007C00000 +CAD8:0000001000107B90089008901910151E2290CC50041004107FD0001000100000 +CAD9:00007BC8088811082A8E4448040804087FE8000007F800080008000800080000 +CADA:00007BC8088811082A8E4448040804087FE8000000003EF80208020802080000 +CADB:00007BC8088811082A8E4448040804087FE8000000001F080108011401620000 +CADC:00007BC8088811082A8E4448040804087FE8000008000800080008000FF80000 +CADD:00007BC8088811082A8E4448040804087FE80000000010F8101010301ECC0000 +CADE:00007BC8088811082A8E4448040804087FE800000808087F081C08220F9C0000 +CADF:00007BC8088811082A8E4448040804087FE8000003F802000200020003F80000 +CAE0:00007BC8088811082A8E4448040804087FE8000007F8000807F8040007F80000 +CAE1:00007BC8088811082A8E4448040804087FE800003EF802083E0820083E080000 +CAE2:00007BC8088811082A8E4448040804087FE800003EF802883E8820883EF80000 +CAE3:00007BC8088811082A8E4448040804087FE800003E8802883EF820883EF80000 +CAE4:00007BC8088811082A8E4448040804087FE800001F0801081F0810141F620000 +CAE5:00007BC8088811082A8E4448040804087FE800003EF802803EF820803EF80000 +CAE6:00007BC8088811082A8E4448040804087FE800003EFC02483E4820483EFC0000 +CAE7:00007BC8088811082A8E4448040804087FE800001F08017F1F1C10221F1C0000 +CAE8:00007BC8088811082A8E4448040804087FE8000003F802080208020803F80000 +CAE9:00007BC8088811082A8E4448040804087FE800000208020803F8020803F80000 +CAEA:00007BC8088811082A8E4448040804087FE80000110811081F0811141F620000 +CAEB:00007BC8088811082A8E4448040804087FE80000001000100010006801840000 +CAEC:00007BC8088811082A8E4448040804087FE800000048004800A8011406620000 +CAED:00007BC8088811082A8E4448040804087FE80000000003F00408040803F00000 +CAEE:00007BC8088811082A8E4448040804087FE8000003F80020002000D003080000 +CAEF:00007BC8088811082A8E4448040804087FE80000004003F8004000A003180000 +CAF0:00007BC8088811082A8E4448040804087FE8000003F8000803F8000800080000 +CAF1:00007BC8088811082A8E4448040804087FE8000003F8020003F8020003F80000 +CAF2:00007BC8088811082A8E4448040804087FE8000000000FF8022002200FF80000 +CAF3:00007BC8088811082A8E4448040804087FE8000000800FF803E0041003E00000 +CAF4:0000001200127B92089208921912151E2292CC52041204127FD2001200120000 +CAF5:00007BE808A811282AB84468042804287FA8000007F800080008000800080000 +CAF6:00007BE808A811282AB84468042804287FA8000000003EF80208020802080000 +CAF7:00007BE808A811282AB84468042804287FA8000000001F080108011401620000 +CAF8:00007BE808A811282AB84468042804287FA8000008000800080008000FF80000 +CAF9:00007BE808A811282AB84468042804287FA80000000010F8101010301ECC0000 +CAFA:00007BE808A811282AB84468042804287FA800000808087F081C08220F9C0000 +CAFB:00007BE808A811282AB84468042804287FA8000003F802000200020003F80000 +CAFC:00007BE808A811282AB84468042804287FA8000007F8000807F8040007F80000 +CAFD:00007BE808A811282AB84468042804287FA800003EF802083E0820083E080000 +CAFE:00007BE808A811282AB84468042804287FA800003EF802883E8820883EF80000 +CAFF:00007BE808A811282AB84468042804287FA800003E8802883EF820883EF80000 +CB00:00007BE808A811282AB84468042804287FA800001F0801081F0810141F620000 +CB01:00007BE808A811282AB84468042804287FA800003EF802803EF820803EF80000 +CB02:00007BE808A811282AB84468042804287FA800003EFC02483E4820483EFC0000 +CB03:00007BE808A811282AB84468042804287FA800001F08017F1F1C10221F1C0000 +CB04:00007BE808A811282AB84468042804287FA8000003F802080208020803F80000 +CB05:00007BE808A811282AB84468042804287FA800000208020803F8020803F80000 +CB06:00007BE808A811282AB84468042804287FA80000110811081F0811141F620000 +CB07:00007BE808A811282AB84468042804287FA80000001000100010006801840000 +CB08:00007BE808A811282AB84468042804287FA800000048004800A8011406620000 +CB09:00007BE808A811282AB84468042804287FA80000000003F00408040803F00000 +CB0A:00007BE808A811282AB84468042804287FA8000003F80020002000D003080000 +CB0B:00007BE808A811282AB84468042804287FA80000004003F8004000A003180000 +CB0C:00007BE808A811282AB84468042804287FA8000003F8000803F8000800080000 +CB0D:00007BE808A811282AB84468042804287FA8000003F8020003F8020003F80000 +CB0E:00007BE808A811282AB84468042804287FA8000000000FF8022002200FF80000 +CB0F:00007BE808A811282AB84468042804287FA8000000800FF803E0041003E00000 +CB10:0000000800087B8808880888190815082288CC48040804087FE8000800080000 +CB11:00007BC8088811082A884448040804087FE8000007F800080008000800080000 +CB12:00007BC8088811082A884448040804087FE8000000003EF80208020802080000 +CB13:00007BC8088811082A884448040804087FE8000000001F080108011401620000 +CB14:00007BC8088811082A884448040804087FE8000008000800080008000FF80000 +CB15:00007BC8088811082A884448040804087FE80000000010F8101010301ECC0000 +CB16:00007BC8088811082A884448040804087FE800000808087F081C08220F9C0000 +CB17:00007BC8088811082A884448040804087FE8000003F802000200020003F80000 +CB18:00007BC8088811082A884448040804087FE8000007F8000807F8040007F80000 +CB19:00007BC8088811082A884448040804087FE800003EF802083E0820083E080000 +CB1A:00007BC8088811082A884448040804087FE800003EF802883E8820883EF80000 +CB1B:00007BC8088811082A884448040804087FE800003E8802883EF820883EF80000 +CB1C:00007BC8088811082A884448040804087FE800001F0801081F0810141F620000 +CB1D:00007BC8088811082A884448040804087FE800003EF802803EF820803EF80000 +CB1E:00007BC8088811082A884448040804087FE800003EFC02483E4820483EFC0000 +CB1F:00007BC8088811082A884448040804087FE800001F08017F1F1C10221F1C0000 +CB20:00007BC8088811082A884448040804087FE8000003F802080208020803F80000 +CB21:00007BC8088811082A884448040804087FE800000208020803F8020803F80000 +CB22:00007BC8088811082A884448040804087FE80000110811081F0811141F620000 +CB23:00007BC8088811082A884448040804087FE80000001000100010006801840000 +CB24:00007BC8088811082A884448040804087FE800000048004800A8011406620000 +CB25:00007BC8088811082A884448040804087FE80000000003F00408040803F00000 +CB26:00007BC8088811082A884448040804087FE8000003F80020002000D003080000 +CB27:00007BC8088811082A884448040804087FE80000004003F8004000A003180000 +CB28:00007BC8088811082A884448040804087FE8000003F8000803F8000800080000 +CB29:00007BC8088811082A884448040804087FE8000003F8020003F8020003F80000 +CB2A:00007BC8088811082A884448040804087FE8000000000FF8022002200FF80000 +CB2B:00007BC8088811082A884448040804087FE8000000800FF803E0041003E00000 +CB2C:0000000000001EE0022002200640054008A037500440044004407FFC00000000 +CB2D:00003DE00440088015402220044004407FFC00001FF000100010001000100000 +CB2E:00003DE00440088015402220044004407FFC000000003EF80208020802080000 +CB2F:00003DE00440088015402220044004407FFC000000001E100210022802C40000 +CB30:00003DE00440088015402220044004407FFC000000001000100010001FF00000 +CB31:00003DE00440088015402220044004407FFC0000000020F8201020303ECC0000 +CB32:00003DE00440088015402220044004407FFC0000202021FC207020883E700000 +CB33:00003DE00440088015402220044004407FFC00001FF01000100010001FF00000 +CB34:00003DE00440088015402220044004407FFC00001FF000101FF010001FF00000 +CB35:00003DE00440088015402220044004407FFC00003EF802083E0820083E080000 +CB36:00003DE00440088015402220044004407FFC00003EF802883E8820883EF80000 +CB37:00003DE00440088015402220044004407FFC00003E8802883EF820883EF80000 +CB38:00003DE00440088015402220044004407FFC00003E1002103E1020283EC40000 +CB39:00003DE00440088015402220044004407FFC00003EF802803EF820803EF80000 +CB3A:00003DE00440088015402220044004407FFC00003EFC02483E4820483EFC0000 +CB3B:00003DE00440088015402220044004407FFC00003E2003FC3E7020883E700000 +CB3C:00003DE00440088015402220044004407FFC00001FF01010101010101FF00000 +CB3D:00003DE00440088015402220044004407FFC0000101010101FF010101FF00000 +CB3E:00003DE00440088015402220044004407FFC0000222022203E2022503E880000 +CB3F:00003DE00440088015402220044004407FFC000000000100010002800C400000 +CB40:00003DE00440088015402220044004407FFC00000000024002400DA033100000 +CB41:00003DE00440088015402220044004407FFC0000000007C00820082007C00000 +CB42:00003DE00440088015402220044004407FFC0000000007E00080014006200000 +CB43:00003DE00440088015402220044004407FFC0000008007E00080014006200000 +CB44:00003DE00440088015402220044004407FFC00001FF000101FF0001000100000 +CB45:00003DE00440088015402220044004407FFC00001FF010001FF010001FF00000 +CB46:00003DE00440088015402220044004407FFC000000001FF0044004401FF00000 +CB47:00003DE00440088015402220044004407FFC000001001FF007C0082007C00000 +CB48:000000001EE0022002200640054008A0331000003FF801000100010001000000 +CB49:00003DE0044008801540222000007FFC010001001FF000100010001000100000 +CB4A:00003DE0044008801540222000007FFC0100010000003EF80208020802080000 +CB4B:00003DE0044008801540222000007FFC0100010000001E100210022802C40000 +CB4C:00003DE00440088015402220000000007FFC010001001100100010001FF00000 +CB4D:00003DE0044008801540222000007FFC01000100000020F8201020303ECC0000 +CB4E:00003DE0044008801540222000007FFC01000100202021FC207020883E700000 +CB4F:00003DE0044008801540222000007FFC010001001FF01000100010001FF00000 +CB50:00003DE0044008801540222000007FFC010001001FF000101FF010001FF00000 +CB51:00003DE0044008801540222000007FFC010001003EF802083E0820083E080000 +CB52:00003DE0044008801540222000007FFC010001003EF802883E8820883EF80000 +CB53:00003DE0044008801540222000007FFC010001003E8802883EF820883EF80000 +CB54:00003DE0044008801540222000007FFC010001003E1002103E1020283EC40000 +CB55:00003DE0044008801540222000007FFC010001003EF802803EF820803EF80000 +CB56:00003DE0044008801540222000007FFC010001003EFC02483E4820483EFC0000 +CB57:00003DE0044008801540222000007FFC010001003E2003FC3E7020883E700000 +CB58:00003DE0044008801540222000007FFC010001001FF01010101010101FF00000 +CB59:00003DE0044008801540222000007FFC01000100101010101FF010101FF00000 +CB5A:00003DE0044008801540222000007FFC01000100222022203E2022503E880000 +CB5B:00003DE0044008801540222000007FFC0100010000000100010002800C400000 +CB5C:00003DE0044008801540222000007FFC010001000000024002400DA033100000 +CB5D:00003DE0044008801540222000007FFC01000100000007C00820082007C00000 +CB5E:00003DE0044008801540222000007FFC01000100000007E00080014006200000 +CB5F:00003DE0044008801540222000007FFC01000100008007E00080014006200000 +CB60:00003DE0044008801540222000007FFC010001001FF000101FF0001000100000 +CB61:00003DE0044008801540222000007FFC010001001FF010001FF010001FF00000 +CB62:00003DE0044008801540222000007FFC0100010000001FF0044004401FF00000 +CB63:00003DE0044008801540222000007FFC0100010001001FF007C0082007C00000 +CB64:000000087B8808880888190815082288CC4800087FE8040804F8040804080000 +CB65:7BC8088811082A88444800087FE8027802080000000007F80008000800080000 +CB66:7BC8088811082A88444800087FE802780208000000003EF80208020802080000 +CB67:7BC8088811082A88444800087FE802780208000000001F080108011401620000 +CB68:7BC8088811082A884448000800087FE80278020802081000100010001FF80000 +CB69:7BC8088811082A88444800087FE8027802080000000020F8201020303ECC0000 +CB6A:7BC8088811082A88444800087FE8027802080000202021FC207020883E700000 +CB6B:7BC8088811082A88444800087FE802780208000003F802000200020003F80000 +CB6C:7BC8088811082A88444800087FE802780208000007F8000807F8040007F80000 +CB6D:7BC8088811082A88444800087FE80278020800003EF802083E0820083E080000 +CB6E:7BC8088811082A88444800087FE80278020800003EF802883E8820883EF80000 +CB6F:7BC8088811082A88444800087FE80278020800003E8802883EF820883EF80000 +CB70:7BC8088811082A88444800087FE80278020800000F8800880F8808140FA20000 +CB71:7BC8088811082A88444800087FE80278020800003EF802803EF820803EF80000 +CB72:7BC8088811082A88444800087FE80278020800003EFC02483E4820483EFC0000 +CB73:7BC8088811082A88444800087FE80278020800003E1002FE3E3820443E380000 +CB74:7BC8088811082A88444800087FE802780208000003F802080208020803F80000 +CB75:7BC8088811082A88444800087FE80278020800000208020803F8020803F80000 +CB76:7BC8088811082A88444800087FE8027802080000210821083F0821143F620000 +CB77:7BC8088811082A88444800087FE8027802080000001000100010006801840000 +CB78:7BC8088811082A88444800087FE80278020800000048004800A8011406620000 +CB79:7BC8088811082A88444800087FE8027802080000000003F00408040803F00000 +CB7A:7BC8088811082A88444800087FE802780208000003F80020002000D003080000 +CB7B:7BC8088811082A88444800087FE8027802080000004003F8004000A003180000 +CB7C:7BC8088811082A88444800087FE802780208000003F8000803F8000800080000 +CB7D:7BC8088811082A88444800087FE802780208000003F8020003F8020003F80000 +CB7E:7BC8088811082A88444800087FE802780208000000000FF8022002200FF80000 +CB7F:7BC8088811082A88444800087FE802780208000000800FF803E0041003E00000 +CB80:0000000A7B8A088A088A190A150A228ACC4A000A7FEA040A047A040A040A0000 +CB81:7BE808A811282AA8446800287FA805E804280000000007F80008000800080000 +CB82:7BE808A811282AA8446800287FA805E80428000000003EF80208020802080000 +CB83:7BE808A811282AA8446800287FA805E80428000000001F080108011401620000 +CB84:7BE808A811282AA84468002800287FA8042805E804281428100010001FF80000 +CB85:7BE808A811282AA8446800287FA805E804280000000020F8201020303ECC0000 +CB86:7BE808A811282AA8446800287FA805E804280000202021FC207020883E700000 +CB87:7BE808A811282AA8446800287FA805E80428000003F802000200020003F80000 +CB88:7BE808A811282AA8446800287FA805E80428000007F8000807F8040007F80000 +CB89:7BE808A811282AA8446800287FA805E8042800003EF802083E0820083E080000 +CB8A:7BE808A811282AA8446800287FA805E8042800003EF802883E8820883EF80000 +CB8B:7BE808A811282AA8446800287FA805E8042800003E8802883EF820883EF80000 +CB8C:7BE808A811282AA8446800287FA805E8042800000F8800880F8808140FA20000 +CB8D:7BE808A811282AA8446800287FA805E8042800003EF802803EF820803EF80000 +CB8E:7BE808A811282AA8446800287FA805E8042800003EFC02483E4820483EFC0000 +CB8F:7BE808A811282AA8446800287FA805E8042800003E1002FE3E3820443E380000 +CB90:7BE808A811282AA8446800287FA805E80428000003F802080208020803F80000 +CB91:7BE808A811282AA8446800287FA805E8042800000208020803F8020803F80000 +CB92:7BE808A811282AA8446800287FA805E804280000210821083F0821143F620000 +CB93:7BE808A811282AA8446800287FA805E804280000001000100010006801840000 +CB94:7BE808A811282AA8446800287FA805E8042800000048004800A8011406620000 +CB95:7BE808A811282AA8446800287FA805E804280000000003F00408040803F00000 +CB96:7BE808A811282AA8446800287FA805E80428000003F80020002000D003080000 +CB97:7BE808A811282AA8446800287FA805E804280000004003F8004000A003180000 +CB98:7BE808A811282AA8446800287FA805E80428000003F8000803F8000800080000 +CB99:7BE808A811282AA8446800287FA805E80428000003F8020003F8020003F80000 +CB9A:7BE808A811282AA8446800287FA805E80428000000000FF8022002200FF80000 +CB9B:7BE808A811282AA8446800287FA805E80428000000800FF803E0041003E00000 +CB9C:000000087B8808880888190815082288CC4800087FE804080408040804080000 +CB9D:7BC8088811082A88444800087FE8020802000000000007F80008000800080000 +CB9E:7BC8088811082A88444800087FE802080200000000003EF80208020802080000 +CB9F:7BC8088811082A88444800087FE802080200000000001F080108011401620000 +CBA0:7BC8088811082A884448000800087FE80208020802081008100010001FF80000 +CBA1:7BC8088811082A88444800087FE8020802000000000020F8201020303ECC0000 +CBA2:7BC8088811082A88444800087FE8020802000000202021FC207020883E700000 +CBA3:7BC8088811082A88444800087FE802080200000003F802000200020003F80000 +CBA4:7BC8088811082A88444800087FE802080200000007F8000807F8040007F80000 +CBA5:7BC8088811082A88444800087FE80208020000003EF802083E0820083E080000 +CBA6:7BC8088811082A88444800087FE80208020000003EF802883E8820883EF80000 +CBA7:7BC8088811082A88444800087FE80208020000003E8802883EF820883EF80000 +CBA8:7BC8088811082A88444800087FE80208020000000F8800880F8808140FA20000 +CBA9:7BC8088811082A88444800087FE80208020000003EF802803EF820803EF80000 +CBAA:7BC8088811082A88444800087FE80208020000003EFC02483E4820483EFC0000 +CBAB:7BC8088811082A88444800087FE80208020000003E1002FE3E3820443E380000 +CBAC:7BC8088811082A88444800087FE802080200000003F802080208020803F80000 +CBAD:7BC8088811082A88444800087FE80208020000000208020803F8020803F80000 +CBAE:7BC8088811082A88444800087FE8020802000000210821083F0821143F620000 +CBAF:7BC8088811082A88444800087FE8020802000000001000100010006801840000 +CBB0:7BC8088811082A88444800087FE80208020000000048004800A8011406620000 +CBB1:7BC8088811082A88444800087FE8020802000000000003F00408040803F00000 +CBB2:7BC8088811082A88444800087FE802080200000003F80020002000D003080000 +CBB3:7BC8088811082A88444800087FE8020802000000004003F8004000A003180000 +CBB4:7BC8088811082A88444800087FE802080200000003F8000803F8000800080000 +CBB5:7BC8088811082A88444800087FE802080200000003F8020003F8020003F80000 +CBB6:7BC8088811082A88444800087FE802080200000000000FF8022002200FF80000 +CBB7:7BC8088811082A88444800087FE802080200000000800FF803E0041003E00000 +CBB8:000000001EE0022002200640054008A0331000007FFC04400440044004400000 +CBB9:00003DE0044008801540222000007FFC044004401FF000100010001000100000 +CBBA:00003DE0044008801540222000007FFC0440044000003EF80208020802080000 +CBBB:00003DE0044008801540222000007FFC0440044000001E100210022802C40000 +CBBC:00003DE00440088015402220000000007FFC044004401440100010001FF00000 +CBBD:00003DE0044008801540222000007FFC04400440000020F8201020303ECC0000 +CBBE:00003DE0044008801540222000007FFC04400440202021FC207020883E700000 +CBBF:00003DE0044008801540222000007FFC044004401FF01000100010001FF00000 +CBC0:00003DE0044008801540222000007FFC044004401FF000101FF010001FF00000 +CBC1:00003DE0044008801540222000007FFC044004403EF802083E0820083E080000 +CBC2:00003DE0044008801540222000007FFC044004403EF802883E8820883EF80000 +CBC3:00003DE0044008801540222000007FFC044004403E8802883EF820883EF80000 +CBC4:00003DE0044008801540222000007FFC044004403E1002103E1020283EC40000 +CBC5:00003DE0044008801540222000007FFC044004403EF802803EF820803EF80000 +CBC6:00003DE0044008801540222000007FFC044004403EFC02483E4820483EFC0000 +CBC7:00003DE0044008801540222000007FFC044004403E2003FC3E7020883E700000 +CBC8:00003DE0044008801540222000007FFC044004401FF01010101010101FF00000 +CBC9:00003DE0044008801540222000007FFC04400440101010101FF010101FF00000 +CBCA:00003DE0044008801540222000007FFC04400440222022203E2022503E880000 +CBCB:00003DE0044008801540222000007FFC0440044000000100010002800C400000 +CBCC:00003DE0044008801540222000007FFC044004400000024002400DA033100000 +CBCD:00003DE0044008801540222000007FFC04400440000007C00820082007C00000 +CBCE:00003DE0044008801540222000007FFC04400440000007E00080014006200000 +CBCF:00003DE0044008801540222000007FFC04400440008007E00080014006200000 +CBD0:00003DE0044008801540222000007FFC044004401FF000101FF0001000100000 +CBD1:00003DE0044008801540222000007FFC044004401FF010001FF010001FF00000 +CBD2:00003DE0044008801540222000007FFC0440044000001FF0044004401FF00000 +CBD3:00003DE0044008801540222000007FFC0440044001001FF007C0082007C00000 +CBD4:0000000000001EE0022002200640054008A0331000007FFC0000000000000000 +CBD5:00003DE00440088015402220000000007FFC00001FF000100010001000100000 +CBD6:00003DE00440088015402220000000007FFC000000003EF80208020802080000 +CBD7:00003DE00440088015402220000000007FFC000000001E100210022802C40000 +CBD8:00003DE00440088015402220000000007FFC000000001000100010001FF00000 +CBD9:00003DE00440088015402220000000007FFC0000000020F8201020303ECC0000 +CBDA:00003DE00440088015402220000000007FFC0000202021FC207020883E700000 +CBDB:00003DE00440088015402220000000007FFC00001FF01000100010001FF00000 +CBDC:00003DE00440088015402220000000007FFC00001FF000101FF010001FF00000 +CBDD:00003DE00440088015402220000000007FFC00003EF802083E0820083E080000 +CBDE:00003DE00440088015402220000000007FFC00003EF802883E8820883EF80000 +CBDF:00003DE00440088015402220000000007FFC00003E8802883EF820883EF80000 +CBE0:00003DE00440088015402220000000007FFC00003E1002103E1020283EC40000 +CBE1:00003DE00440088015402220000000007FFC00003EF802803EF820803EF80000 +CBE2:00003DE00440088015402220000000007FFC00003EFC02483E4820483EFC0000 +CBE3:00003DE00440088015402220000000007FFC00003E2003FC3E7020883E700000 +CBE4:00003DE00440088015402220000000007FFC00001FF01010101010101FF00000 +CBE5:00003DE00440088015402220000000007FFC0000101010101FF010101FF00000 +CBE6:00003DE00440088015402220000000007FFC0000222022203E2022503E880000 +CBE7:00003DE00440088015402220000000007FFC000000000100010002800C400000 +CBE8:00003DE00440088015402220000000007FFC00000000024002400DA033100000 +CBE9:00003DE00440088015402220000000007FFC0000000007C00820082007C00000 +CBEA:00003DE00440088015402220000000007FFC0000000007E00080014006200000 +CBEB:00003DE00440088015402220000000007FFC0000008007E00080014006200000 +CBEC:00003DE00440088015402220000000007FFC00001FF000101FF0001000100000 +CBED:00003DE00440088015402220000000007FFC00001FF010001FF010001FF00000 +CBEE:00003DE00440088015402220000000007FFC000000001FF0044004401FF00000 +CBEF:00003DE00440088015402220000000007FFC000001001FF007C0082007C00000 +CBF0:0000000800087B8808880888190815082288CC4800087FE80008000800080000 +CBF1:00007BC8088811082A884448000800087FE8000007F800080008000800080000 +CBF2:00007BC8088811082A884448000800087FE8000000003EF80208020802080000 +CBF3:00007BC8088811082A884448000800087FE8000000001F080108011401620000 +CBF4:00007BC8088811082A884448000800087FE8000008000800080008000FF80000 +CBF5:00007BC8088811082A884448000800087FE80000000010F8101010301ECC0000 +CBF6:00007BC8088811082A884448000800087FE800000808087F081C08220F9C0000 +CBF7:00007BC8088811082A884448000800087FE8000003F802000200020003F80000 +CBF8:00007BC8088811082A884448000800087FE8000007F8000807F8040007F80000 +CBF9:00007BC8088811082A884448000800087FE800003EF802083E0820083E080000 +CBFA:00007BC8088811082A884448000800087FE800003EF802883E8820883EF80000 +CBFB:00007BC8088811082A884448000800087FE800003E8802883EF820883EF80000 +CBFC:00007BC8088811082A884448000800087FE800001F0801081F0810141F620000 +CBFD:00007BC8088811082A884448000800087FE800003EF802803EF820803EF80000 +CBFE:00007BC8088811082A884448000800087FE800003EFC02483E4820483EFC0000 +CBFF:00007BC8088811082A884448000800087FE800001F08017F1F1C10221F1C0000 +CC00:00007BC8088811082A884448000800087FE8000003F802080208020803F80000 +CC01:00007BC8088811082A884448000800087FE800000208020803F8020803F80000 +CC02:00007BC8088811082A884448000800087FE80000110811081F0811141F620000 +CC03:00007BC8088811082A884448000800087FE80000001000100010006801840000 +CC04:00007BC8088811082A884448000800087FE800000048004800A8011406620000 +CC05:00007BC8088811082A884448000800087FE80000000003F00408040803F00000 +CC06:00007BC8088811082A884448000800087FE8000003F80020002000D003080000 +CC07:00007BC8088811082A884448000800087FE80000004003F8004000A003180000 +CC08:00007BC8088811082A884448000800087FE8000003F8000803F8000800080000 +CC09:00007BC8088811082A884448000800087FE8000003F8020003F8020003F80000 +CC0A:00007BC8088811082A884448000800087FE8000000000FF8022002200FF80000 +CC0B:00007BC8088811082A884448000800087FE8000000800FF803E0041003E00000 +CC0C:00000000000800087B8808880888190815082288CC4800080008000800080000 +CC0D:0000000800087708220822085508888800080000000007F80008000800080000 +CC0E:000000080008770822082208550888880008000000003EF80208020802080000 +CC0F:000000080008770822082208550888880008000000001F080108011401620000 +CC10:000000080008770822082208550888880008000800001000100010001FF80000 +CC11:0000000800087708220822085508888800080000000020F8201020303ECC0000 +CC12:0000000800087708220822085508888800080000202021FC207020883E700000 +CC13:000000080008770822082208550888880008000003F802000200020003F80000 +CC14:000000080008770822082208550888880008000007F8000807F8040007F80000 +CC15:00000008000877082208220855088888000800003EF802083E0820083E080000 +CC16:00000008000877082208220855088888000800003EF802883E8820883EF80000 +CC17:00000008000877082208220855088888000800003E8802883EF820883EF80000 +CC18:00000008000877082208220855088888000800000F8800880F8808140FA20000 +CC19:00000008000877082208220855088888000800003EF802803EF820803EF80000 +CC1A:00000008000877082208220855088888000800003EFC02483E4820483EFC0000 +CC1B:00000008000877082208220855088888000800003E1002FE3E3820443E380000 +CC1C:000000080008770822082208550888880008000003F802080208020803F80000 +CC1D:00000008000877082208220855088888000800000208020803F8020803F80000 +CC1E:0000000800087708220822085508888800080000210821083F0821143F620000 +CC1F:0000000800087708220822085508888800080000001000100010006801840000 +CC20:00000008000877082208220855088888000800000048004800A8011406620000 +CC21:0000000800087708220822085508888800080000000003F00408040803F00000 +CC22:000000080008770822082208550888880008000003F80020002000D003080000 +CC23:0000000800087708220822085508888800080000004003F8004000A003180000 +CC24:000000080008770822082208550888880008000003F8000803F8000800080000 +CC25:000000080008770822082208550888880008000003F8020003F8020003F80000 +CC26:000000080008770822082208550888880008000000000FF8022002200FF80000 +CC27:000000080008770822082208550888880008000000800FF803E0041003E00000 +CC28:000000000010041004103F900110021E06100910309000100010001000100000 +CC29:00000008000808087E08080E140862080008000007F800080008000800080000 +CC2A:00000008000808087E08080E140862080008000000003EF80208020802080000 +CC2B:00000008000808087E08080E140862080008000000001F080108011401620000 +CC2C:00000008000808087E08080E140862080008000808000800080008000FF80000 +CC2D:00000008000808087E08080E1408620800080000000010F8101010301ECC0000 +CC2E:00000008000808087E08080E14086208000800000808087F081C08220F9C0000 +CC2F:00000008000808087E08080E140862080008000003F802000200020003F80000 +CC30:00000008000808087E08080E140862080008000007F8000807F8040007F80000 +CC31:00000008000808087E08080E14086208000800003EF802083E0820083E080000 +CC32:00000008000808087E08080E14086208000800003EF802883E8820883EF80000 +CC33:00000008000808087E08080E14086208000800003E8802883EF820883EF80000 +CC34:00000008000808087E08080E14086208000800001F0801081F0810141F620000 +CC35:00000008000808087E08080E14086208000800003EF802803EF820803EF80000 +CC36:00000008000808087E08080E14086208000800003EFC02483E4820483EFC0000 +CC37:00000008000808087E08080E14086208000800001F08017F1F1C10221F1C0000 +CC38:00000008000808087E08080E140862080008000003F802080208020803F80000 +CC39:00000008000808087E08080E14086208000800000208020803F8020803F80000 +CC3A:00000008000808087E08080E1408620800080000110811081F0811141F620000 +CC3B:00000008000808087E08080E1408620800080000001000100010006801840000 +CC3C:00000008000808087E08080E14086208000800000048004800A8011406620000 +CC3D:00000008000808087E08080E1408620800080000000003F00408040803F00000 +CC3E:00000008000808087E08080E140862080008000003F80020002000D003080000 +CC3F:00000008000808087E08080E1408620800080000004003F8004000A003180000 +CC40:00000008000808087E08080E140862080008000003F8000803F8000800080000 +CC41:00000008000808087E08080E140862080008000003F8020003F8020003F80000 +CC42:00000008000808087E08080E140862080008000000000FF8022002200FF80000 +CC43:00000008000808087E08080E140862080008000000800FF803E0041003E00000 +CC44:000000000012041204123F920112021E06120912309200120012001200120000 +CC45:00000028002808287E280838142862280028000007F800080008000800080000 +CC46:00000028002808287E280838142862280028000000003EF80208020802080000 +CC47:00000028002808287E280838142862280028000000003E100210022802C40000 +CC48:00000028002808287E280838142862280028002808000800080008000FF80000 +CC49:00000028002808287E2808381428622800280000000020F8201020303ECC0000 +CC4A:00000028002808287E2808381428622800280000202021FC207020883E700000 +CC4B:00000028002808287E280838142862280028000003F802000200020003F80000 +CC4C:00000028002808287E280838142862280028000007F8000807F8040007F80000 +CC4D:00000028002808287E28083814286228002800003EF802083E0820083E080000 +CC4E:00000028002808287E28083814286228002800003EF802883E8820883EF80000 +CC4F:00000028002808287E28083814286228002800003E8802883EF820883EF80000 +CC50:00000028002808287E28083814286228002800001F0801081F0810141F620000 +CC51:00000028002808287E28083814286228002800003EF802803EF820803EF80000 +CC52:00000028002808287E28083814286228002800003EFC02483E4820483EFC0000 +CC53:00000028002808287E28083814286228002800003E1002FE3E3820443E380000 +CC54:00000028002808287E280838142862280028000003F802080208020803F80000 +CC55:00000028002808287E28083814286228002800000208020803F8020803F80000 +CC56:00000028002808287E2808381428622800280000110811081F0811141F620000 +CC57:00000028002808287E2808381428622800280000000800080008003400C20000 +CC58:00000028002808287E28083814286228002800000048004800A8011406620000 +CC59:00000028002808287E2808381428622800280000000001F00208020801F00000 +CC5A:00000028002808287E280838142862280028000003F80020002000D003080000 +CC5B:00000028002808287E2808381428622800280000004003F8004000A003180000 +CC5C:00000028002808287E280838142862280028000003F8000803F8000800080000 +CC5D:00000028002808287E280838142862280028000003F8020003F8020003F80000 +CC5E:00000028002808287E280838142862280028000000000FF8022002200FF80000 +CC5F:00000028002808287E280838142862280028000000800FF803E0041003E00000 +CC60:000000000010041004103F90011E02100610091E309000100010001000100000 +CC61:00000008000808087E0E0808140E62080008000007F800080008000800080000 +CC62:00000008000808087E0E0808140E62080008000000003EF80208020802080000 +CC63:00000008000808087E0E0808140E62080008000000001F080108011401620000 +CC64:00000008000808087E0E0808140E62080008000008000800080008000FF80000 +CC65:00000008000808087E0E0808140E620800080000000010F8101010301ECC0000 +CC66:00000008000808087E0E0808140E6208000800000808087F081C08220F9C0000 +CC67:00000008000808087E0E0808140E62080008000003F802000200020003F80000 +CC68:00000008000808087E0E0808140E62080008000007F8000807F8040007F80000 +CC69:00000008000808087E0E0808140E6208000800003EF802083E0820083E080000 +CC6A:00000008000808087E0E0808140E6208000800003EF802883E8820883EF80000 +CC6B:00000008000808087E0E0808140E6208000800003E8802883EF820883EF80000 +CC6C:00000008000808087E0E0808140E6208000800001F0801081F0810141F620000 +CC6D:00000008000808087E0E0808140E6208000800003EF802803EF820803EF80000 +CC6E:00000008000808087E0E0808140E6208000800003EFC02483E4820483EFC0000 +CC6F:00000008000808087E0E0808140E6208000800001F08017F1F1C10221F1C0000 +CC70:00000008000808087E0E0808140E62080008000003F802080208020803F80000 +CC71:00000008000808087E0E0808140E6208000800000208020803F8020803F80000 +CC72:00000008000808087E0E0808140E620800080000110811081F0811141F620000 +CC73:00000008000808087E0E0808140E620800080000001000100010006801840000 +CC74:00000008000808087E0E0808140E6208000800000048004800A8011406620000 +CC75:00000008000808087E0E0808140E620800080000000003F00408040803F00000 +CC76:00000008000808087E0E0808140E62080008000003F80020002000D003080000 +CC77:00000008000808087E0E0808140E620800080000004003F8004000A003180000 +CC78:00000008000808087E0E0808140E62080008000003F8000803F8000800080000 +CC79:00000008000808087E0E0808140E62080008000003F8020003F8020003F80000 +CC7A:00000008000808087E0E0808140E62080008000000000FF8022002200FF80000 +CC7B:00000008000808087E0E0808140E62080008000000800FF803E0041003E00000 +CC7C:000000000012041204123F92011E02120612091E309200120012001200120000 +CC7D:00000028002808287E380828143862280028000007F800080008000800080000 +CC7E:00000028002808287E380828143862280028000000003EF80208020802080000 +CC7F:00000028002808287E380828143862280028000000003E100210022802C40000 +CC80:00000028002808287E380828143862280028002808000800080008000FF80000 +CC81:00000028002808287E3808281438622800280000000020F8201020303ECC0000 +CC82:00000028002808287E3808281438622800280000202021FC207020883E700000 +CC83:00000028002808287E380828143862280028000003F802000200020003F80000 +CC84:00000028002808287E380828143862280028000007F8000807F8040007F80000 +CC85:00000028002808287E38082814386228002800003EF802083E0820083E080000 +CC86:00000028002808287E38082814386228002800003EF802883E8820883EF80000 +CC87:00000028002808287E38082814386228002800003E8802883EF820883EF80000 +CC88:00000028002808287E38082814386228002800001F0801081F0810141F620000 +CC89:00000028002808287E38082814386228002800003EF802803EF820803EF80000 +CC8A:00000028002808287E38082814386228002800003EFC02483E4820483EFC0000 +CC8B:00000028002808287E38082814386228002800003E1002FE3E3820443E380000 +CC8C:00000028002808287E380828143862280028000003F802080208020803F80000 +CC8D:00000028002808287E38082814386228002800000208020803F8020803F80000 +CC8E:00000028002808287E3808281438622800280000110811081F0811141F620000 +CC8F:00000028002808287E3808281438622800280000000800080008003400C20000 +CC90:00000028002808287E38082814386228002800000048004800A8011406620000 +CC91:00000028002808287E3808281438622800280000000001F00208020801F00000 +CC92:00000028002808287E380828143862280028000003F80020002000D003080000 +CC93:00000028002808287E3808281438622800280000004003F8004000A003180000 +CC94:00000028002808287E380828143862280028000003F8000803F8000800080000 +CC95:00000028002808287E380828143862280028000003F8020003F8020003F80000 +CC96:00000028002808287E380828143862280028000000000FF8022002200FF80000 +CC97:00000028002808287E380828143862280028000000800FF803E0041003E00000 +CC98:000000000002040204023F820102021E06020902308200020002000200020000 +CC99:00000008000808087E0808381408620800080000000007F80008000800080000 +CC9A:00000008000808087E080838140862080008000000003EF80208020802080000 +CC9B:00000008000808087E080838140862080008000000001F080108011401620000 +CC9C:00000008000808087E080838140862080008000000001000100010001FF80000 +CC9D:00000008000808087E0808381408620800080000000020F8201020303ECC0000 +CC9E:00000008000808087E0808381408620800080000202021FC207020883E700000 +CC9F:00000008000808087E080838140862080008000003F802000200020003F80000 +CCA0:00000008000808087E080838140862080008000007F8000807F8040007F80000 +CCA1:00000008000808087E08083814086208000800003EF802083E0820083E080000 +CCA2:00000008000808087E08083814086208000800003EF802883E8820883EF80000 +CCA3:00000008000808087E08083814086208000800003E8802883EF820883EF80000 +CCA4:00000008000808087E08083814086208000800000F8800880F8808140FA20000 +CCA5:00000008000808087E08083814086208000800003EF802803EF820803EF80000 +CCA6:00000008000808087E08083814086208000800003EFC02483E4820483EFC0000 +CCA7:00000008000808087E08083814086208000800003E1002FE3E3820443E380000 +CCA8:00000008000808087E080838140862080008000003F802080208020803F80000 +CCA9:00000008000808087E08083814086208000800000208020803F8020803F80000 +CCAA:00000008000808087E0808381408620800080000210821083F0821143F620000 +CCAB:00000008000808087E0808381408620800080000001000100010006801840000 +CCAC:00000008000808087E08083814086208000800000048004800A8011406620000 +CCAD:00000008000808087E0808381408620800080000000003F00408040803F00000 +CCAE:00000008000808087E080838140862080008000003F80020002000D003080000 +CCAF:00000008000808087E0808381408620800080000004003F8004000A003180000 +CCB0:00000008000808087E080838140862080008000003F8000803F8000800080000 +CCB1:00000008000808087E080838140862080008000003F8020003F8020003F80000 +CCB2:00000008000808087E080838140862080008000000000FF8022002200FF80000 +CCB3:00000008000808087E080838140862080008000000800FF803E0041003E00000 +CCB4:00000000000A040A040A3F8A010A023A060A090A308A000A000A000A000A0000 +CCB5:00000028002808287E2808E8142862280028000007F800080008000800080000 +CCB6:00000028002808287E2808E8142862280028000000003EF80208020802080000 +CCB7:00000028002808287E2808E8142862280028000000003E100210022802C40000 +CCB8:00000028002808287E2808E8142862280028000008000800080008000FF80000 +CCB9:00000028002808287E2808E81428622800280000000020F8201020303ECC0000 +CCBA:00000028002808287E2808E81428622800280000202021FC207020883E700000 +CCBB:00000028002808287E2808E8142862280028000003F802000200020003F80000 +CCBC:00000028002808287E2808E8142862280028000007F8000807F8040007F80000 +CCBD:00000028002808287E2808E814286228002800003EF802083E0820083E080000 +CCBE:00000028002808287E2808E814286228002800003EF802883E8820883EF80000 +CCBF:00000028002808287E2808E814286228002800003E8802883EF820883EF80000 +CCC0:00000028002808287E2808E814286228002800001F0801081F0810141F620000 +CCC1:00000028002808287E2808E814286228002800003EF802803EF820803EF80000 +CCC2:00000028002808287E2808E814286228002800003EFC02483E4820483EFC0000 +CCC3:00000028002808287E2808E814286228002800003E1002FE3E3820443E380000 +CCC4:00000028002808287E2808E8142862280028000003F802080208020803F80000 +CCC5:00000028002808287E2808E814286228002800000208020803F8020803F80000 +CCC6:00000028002808287E2808E81428622800280000110811081F0811141F620000 +CCC7:00000028002808287E2808E81428622800280000000800080008003400C20000 +CCC8:00000028002808287E2808E814286228002800000048004800A8011406620000 +CCC9:00000028002808287E2808E81428622800280000000001F00208020801F00000 +CCCA:00000028002808287E2808E8142862280028000003F80020002000D003080000 +CCCB:00000028002808287E2808E81428622800280000004003F8004000A003180000 +CCCC:00000028002808287E2808E8142862280028000003F8000803F8000800080000 +CCCD:00000028002808287E2808E8142862280028000003F8020003F8020003F80000 +CCCE:00000028002808287E2808E8142862280028000000000FF8022002200FF80000 +CCCF:00000028002808287E2808E8142862280028000000800FF803E0041003E00000 +CCD0:000000000002040204023F82011E02020602091E308200020002000200020000 +CCD1:00000008000808087E3808081438620800080000000007F80008000800080000 +CCD2:00000008000808087E380808143862080008000000003EF80208020802080000 +CCD3:00000008000808087E380808143862080008000000001F080108011401620000 +CCD4:00000008000808087E380808143862080008000800001000100010001FF80000 +CCD5:00000008000808087E3808081438620800080000000020F8201020303ECC0000 +CCD6:00000008000808087E3808081438620800080000202021FC207020883E700000 +CCD7:00000008000808087E380808143862080008000003F802000200020003F80000 +CCD8:00000008000808087E380808143862080008000007F8000807F8040007F80000 +CCD9:00000008000808087E38080814386208000800003EF802083E0820083E080000 +CCDA:00000008000808087E38080814386208000800003EF802883E8820883EF80000 +CCDB:00000008000808087E38080814386208000800003E8802883EF820883EF80000 +CCDC:00000008000808087E38080814386208000800000F8800880F8808140FA20000 +CCDD:00000008000808087E38080814386208000800003EF802803EF820803EF80000 +CCDE:00000008000808087E38080814386208000800003EFC02483E4820483EFC0000 +CCDF:00000008000808087E38080814386208000800003E1002FE3E3820443E380000 +CCE0:00000008000808087E380808143862080008000003F802080208020803F80000 +CCE1:00000008000808087E38080814386208000800000208020803F8020803F80000 +CCE2:00000008000808087E3808081438620800080000210821083F0821143F620000 +CCE3:00000008000808087E3808081438620800080000001000100010006801840000 +CCE4:00000008000808087E38080814386208000800000048004800A8011406620000 +CCE5:00000008000808087E3808081438620800080000000003F00408040803F00000 +CCE6:00000008000808087E380808143862080008000003F80020002000D003080000 +CCE7:00000008000808087E3808081438620800080000004003F8004000A003180000 +CCE8:00000008000808087E380808143862080008000003F8000803F8000800080000 +CCE9:00000008000808087E380808143862080008000003F8020003F8020003F80000 +CCEA:00000008000808087E380808143862080008000000000FF8022002200FF80000 +CCEB:00000008000808087E380808143862080008000000800FF803E0041003E00000 +CCEC:00000000000A040A040A3F8A013A020A060A093A308A000A000A000A000A0000 +CCED:00000028002808287EE8082814E862280028000007F800080008000800080000 +CCEE:00000028002808287EE8082814E862280028000000003EF80208020802080000 +CCEF:00000028002808287EE8082814E862280028000000003E100210022802C40000 +CCF0:00000028002808287EE8082814E862280028002808000800080008000FF80000 +CCF1:00000028002808287EE8082814E8622800280000000020F8201020303ECC0000 +CCF2:00000028002808287EE8082814E8622800280000202021FC207020883E700000 +CCF3:00000028002808287EE8082814E862280028000003F802000200020003F80000 +CCF4:00000028002808287EE8082814E862280028000007F8000807F8040007F80000 +CCF5:00000028002808287EE8082814E86228002800003EF802083E0820083E080000 +CCF6:00000028002808287EE8082814E86228002800003EF802883E8820883EF80000 +CCF7:00000028002808287EE8082814E86228002800003E8802883EF820883EF80000 +CCF8:00000028002808287EE8082814E86228002800001F0801081F0810141F620000 +CCF9:00000028002808287EE8082814E86228002800003EF802803EF820803EF80000 +CCFA:00000028002808287EE8082814E86228002800003EFC02483E4820483EFC0000 +CCFB:00000028002808287EE8082814E86228002800003E1002FE3E3820443E380000 +CCFC:00000028002808287EE8082814E862280028000003F802080208020803F80000 +CCFD:00000028002808287EE8082814E86228002800000208020803F8020803F80000 +CCFE:00000028002808287EE8082814E8622800280000110811081F0811141F620000 +CCFF:00000028002808287EE8082814E8622800280000000800080008003400C20000 +CD00:00000028002808287EE8082814E86228002800000048004800A8011406620000 +CD01:00000028002808287EE8082814E8622800280000000001F00208020801F00000 +CD02:00000028002808287EE8082814E862280028000003F80020002000D003080000 +CD03:00000028002808287EE8082814E8622800280000004003F8004000A003180000 +CD04:00000028002808287EE8082814E862280028000003F8000803F8000800080000 +CD05:00000028002808287EE8082814E862280028000003F8020003F8020003F80000 +CD06:00000028002808287EE8082814E862280028000000000FF8022002200FF80000 +CD07:00000028002808287EE8082814E862280028000000800FF803E0041003E00000 +CD08:0000010001000FE000400080018002400C2000000100010001007FFC00000000 +CD09:000001000FC0010002800C40010001007FFC00001FF000100010001000100000 +CD0A:000001000FC0010002800C40010001007FFC000000003EF80208020802080000 +CD0B:000001000FC0010002800C40010001007FFC000000001E100210022802C40000 +CD0C:000001000FC0010002800C40010001007FFC000000001000100010001FF00000 +CD0D:000001000FC0010002800C40010001007FFC0000000020F8201020303ECC0000 +CD0E:000001000FC0010002800C40010001007FFC0000202021FC207020883E700000 +CD0F:000001000FC0010002800C40010001007FFC00001FF01000100010001FF00000 +CD10:000001000FC0010002800C40010001007FFC00001FF000101FF010001FF00000 +CD11:000001000FC0010002800C40010001007FFC00003EF802083E0820083E080000 +CD12:000001000FC0010002800C40010001007FFC00003EF802883E8820883EF80000 +CD13:000001000FC0010002800C40010001007FFC00003E8802883EF820883EF80000 +CD14:000001000FC0010002800C40010001007FFC00003E1002103E1020283EC40000 +CD15:000001000FC0010002800C40010001007FFC00003EF802803EF820803EF80000 +CD16:000001000FC0010002800C40010001007FFC00003EFC02483E4820483EFC0000 +CD17:000001000FC0010002800C40010001007FFC00003E2003FC3E7020883E700000 +CD18:000001000FC0010002800C40010001007FFC00001FF01010101010101FF00000 +CD19:000001000FC0010002800C40010001007FFC0000101010101FF010101FF00000 +CD1A:000001000FC0010002800C40010001007FFC0000222022203E2022503E880000 +CD1B:000001000FC0010002800C40010001007FFC000000000100010002800C400000 +CD1C:000001000FC0010002800C40010001007FFC00000000024002400DA033100000 +CD1D:000001000FC0010002800C40010001007FFC0000000007C00820082007C00000 +CD1E:000001000FC0010002800C40010001007FFC0000000007E00080014006200000 +CD1F:000001000FC0010002800C40010001007FFC0000008007E00080014006200000 +CD20:000001000FC0010002800C40010001007FFC00001FF000101FF0001000100000 +CD21:000001000FC0010002800C40010001007FFC00001FF010001FF010001FF00000 +CD22:000001000FC0010002800C40010001007FFC000000001FF0044004401FF00000 +CD23:000001000FC0010002800C40010001007FFC000001001FF007C0082007C00000 +CD24:00000010041004103F9001100210061E09103090041004107FD0001000100000 +CD25:000002081F880208050E1888040804087FE8000007F800080008000800080000 +CD26:000002081F880208050E1888040804087FE8000000003EF80208020802080000 +CD27:000002081F880208050E1888040804087FE8000000001F080108011401620000 +CD28:000002081F880208050E1888040804087FE8000008000800080008000FF80000 +CD29:000002081F880208050E1888040804087FE80000000010F8101010301ECC0000 +CD2A:000002081F880208050E1888040804087FE800000808087F081C08220F9C0000 +CD2B:000002081F880208050E1888040804087FE8000003F802000200020003F80000 +CD2C:000002081F880208050E1888040804087FE8000007F8000807F8040007F80000 +CD2D:000002081F880208050E1888040804087FE800003EF802083E0820083E080000 +CD2E:000002081F880208050E1888040804087FE800003EF802883E8820883EF80000 +CD2F:000002081F880208050E1888040804087FE800003E8802883EF820883EF80000 +CD30:000002081F880208050E1888040804087FE800001F0801081F0810141F620000 +CD31:000002081F880208050E1888040804087FE800003EF802803EF820803EF80000 +CD32:000002081F880208050E1888040804087FE800003EFC02483E4820483EFC0000 +CD33:000002081F880208050E1888040804087FE800001F08017F1F1C10221F1C0000 +CD34:000002081F880208050E1888040804087FE8000003F802080208020803F80000 +CD35:000002081F880208050E1888040804087FE800000208020803F8020803F80000 +CD36:000002081F880208050E1888040804087FE80000110811081F0811141F620000 +CD37:000002081F880208050E1888040804087FE80000001000100010006801840000 +CD38:000002081F880208050E1888040804087FE800000048004800A8011406620000 +CD39:000002081F880208050E1888040804087FE80000000003F00408040803F00000 +CD3A:000002081F880208050E1888040804087FE8000003F80020002000D003080000 +CD3B:000002081F880208050E1888040804087FE80000004003F8004000A003180000 +CD3C:000002081F880208050E1888040804087FE8000003F8000803F8000800080000 +CD3D:000002081F880208050E1888040804087FE8000003F8020003F8020003F80000 +CD3E:000002081F880208050E1888040804087FE8000000000FF8022002200FF80000 +CD3F:000002081F880208050E1888040804087FE8000000800FF803E0041003E00000 +CD40:00000012041204123F9201120212061E09123092041204127FD2001200120000 +CD41:000002281FA80228053818A8042804287FA8000007F800080008000800080000 +CD42:000002281FA80228053818A8042804287FA8000000003EF80208020802080000 +CD43:000002281FA80228053818A8042804287FA8000000001F080108011401620000 +CD44:000002281FA80228053818A8042804287FA8000008000800080008000FF80000 +CD45:000002281FA80228053818A8042804287FA80000000010F8101010301ECC0000 +CD46:000002281FA80228053818A8042804287FA800000808087F081C08220F9C0000 +CD47:000002281FA80228053818A8042804287FA8000003F802000200020003F80000 +CD48:000002281FA80228053818A8042804287FA8000007F8000807F8040007F80000 +CD49:000002281FA80228053818A8042804287FA800003EF802083E0820083E080000 +CD4A:000002281FA80228053818A8042804287FA800003EF802883E8820883EF80000 +CD4B:000002281FA80228053818A8042804287FA800003E8802883EF820883EF80000 +CD4C:000002281FA80228053818A8042804287FA800001F0801081F0810141F620000 +CD4D:000002281FA80228053818A8042804287FA800003EF802803EF820803EF80000 +CD4E:000002281FA80228053818A8042804287FA800003EFC02483E4820483EFC0000 +CD4F:000002281FA80228053818A8042804287FA800001F08017F1F1C10221F1C0000 +CD50:000002281FA80228053818A8042804287FA8000003F802080208020803F80000 +CD51:000002281FA80228053818A8042804287FA800000208020803F8020803F80000 +CD52:000002281FA80228053818A8042804287FA80000110811081F0811141F620000 +CD53:000002281FA80228053818A8042804287FA80000001000100010006801840000 +CD54:000002281FA80228053818A8042804287FA800000048004800A8011406620000 +CD55:000002281FA80228053818A8042804287FA80000000003F00408040803F00000 +CD56:000002281FA80228053818A8042804287FA8000003F80020002000D003080000 +CD57:000002281FA80228053818A8042804287FA80000004003F8004000A003180000 +CD58:000002281FA80228053818A8042804287FA8000003F8000803F8000800080000 +CD59:000002281FA80228053818A8042804287FA8000003F8020003F8020003F80000 +CD5A:000002281FA80228053818A8042804287FA8000000000FF8022002200FF80000 +CD5B:000002281FA80228053818A8042804287FA8000000800FF803E0041003E00000 +CD5C:00000008040804083F8801080208060809083088040804087FE8000800080000 +CD5D:000002081F88020805081888040804087FE8000007F800080008000800080000 +CD5E:000002081F88020805081888040804087FE8000000003EF80208020802080000 +CD5F:000002081F88020805081888040804087FE8000000001F080108011401620000 +CD60:000002081F88020805081888040804087FE8000008000800080008000FF80000 +CD61:000002081F88020805081888040804087FE80000000010F8101010301ECC0000 +CD62:000002081F88020805081888040804087FE800000808087F081C08220F9C0000 +CD63:000002081F88020805081888040804087FE8000003F802000200020003F80000 +CD64:000002081F88020805081888040804087FE8000007F8000807F8040007F80000 +CD65:000002081F88020805081888040804087FE800003EF802083E0820083E080000 +CD66:000002081F88020805081888040804087FE800003EF802883E8820883EF80000 +CD67:000002081F88020805081888040804087FE800003E8802883EF820883EF80000 +CD68:000002081F88020805081888040804087FE800001F0801081F0810141F620000 +CD69:000002081F88020805081888040804087FE800003EF802803EF820803EF80000 +CD6A:000002081F88020805081888040804087FE800003EFC02483E4820483EFC0000 +CD6B:000002081F88020805081888040804087FE800001F08017F1F1C10221F1C0000 +CD6C:000002081F88020805081888040804087FE8000003F802080208020803F80000 +CD6D:000002081F88020805081888040804087FE800000208020803F8020803F80000 +CD6E:000002081F88020805081888040804087FE80000110811081F0811141F620000 +CD6F:000002081F88020805081888040804087FE80000001000100010006801840000 +CD70:000002081F88020805081888040804087FE800000048004800A8011406620000 +CD71:000002081F88020805081888040804087FE80000000003F00408040803F00000 +CD72:000002081F88020805081888040804087FE8000003F80020002000D003080000 +CD73:000002081F88020805081888040804087FE80000004003F8004000A003180000 +CD74:000002081F88020805081888040804087FE8000003F8000803F8000800080000 +CD75:000002081F88020805081888040804087FE8000003F8020003F8020003F80000 +CD76:000002081F88020805081888040804087FE8000000000FF8022002200FF80000 +CD77:000002081F88020805081888040804087FE8000000800FF803E0041003E00000 +CD78:0000010001000FE000400080018002400C2004400440044004407FFC00000000 +CD79:000001000FC0010002800C40044004407FFC00001FF000100010001000100000 +CD7A:000001000FC0010002800C40044004407FFC000000003EF80208020802080000 +CD7B:000001000FC0010002800C40044004407FFC000000001E100210022802C40000 +CD7C:000001000FC0010002800C40044004407FFC000000001000100010001FF00000 +CD7D:000001000FC0010002800C40044004407FFC0000000020F8201020303ECC0000 +CD7E:000001000FC0010002800C40044004407FFC0000202021FC207020883E700000 +CD7F:000001000FC0010002800C40044004407FFC00001FF01000100010001FF00000 +CD80:000001000FC0010002800C40044004407FFC00001FF000101FF010001FF00000 +CD81:000001000FC0010002800C40044004407FFC00003EF802083E0820083E080000 +CD82:000001000FC0010002800C40044004407FFC00003EF802883E8820883EF80000 +CD83:000001000FC0010002800C40044004407FFC00003E8802883EF820883EF80000 +CD84:000001000FC0010002800C40044004407FFC00003E1002103E1020283EC40000 +CD85:000001000FC0010002800C40044004407FFC00003EF802803EF820803EF80000 +CD86:000001000FC0010002800C40044004407FFC00003EFC02483E4820483EFC0000 +CD87:000001000FC0010002800C40044004407FFC00003E2003FC3E7020883E700000 +CD88:000001000FC0010002800C40044004407FFC00001FF01010101010101FF00000 +CD89:000001000FC0010002800C40044004407FFC0000101010101FF010101FF00000 +CD8A:000001000FC0010002800C40044004407FFC0000222022203E2022503E880000 +CD8B:000001000FC0010002800C40044004407FFC000000000100010002800C400000 +CD8C:000001000FC0010002800C40044004407FFC00000000024002400DA033100000 +CD8D:000001000FC0010002800C40044004407FFC0000000007C00820082007C00000 +CD8E:000001000FC0010002800C40044004407FFC0000000007E00080014006200000 +CD8F:000001000FC0010002800C40044004407FFC0000008007E00080014006200000 +CD90:000001000FC0010002800C40044004407FFC00001FF000101FF0001000100000 +CD91:000001000FC0010002800C40044004407FFC00001FF010001FF010001FF00000 +CD92:000001000FC0010002800C40044004407FFC000000001FF0044004401FF00000 +CD93:000001000FC0010002800C40044004407FFC000001001FF007C0082007C00000 +CD94:00000080008007F00020004000C00120061000003FF801000100010001000000 +CD95:000001000FC0010002800C4000007FFC010001001FF000100010001000100000 +CD96:000001000FC0010002800C4000007FFC0100010000003EF80208020802080000 +CD97:000001000FC0010002800C4000007FFC0100010000001E100210022802C40000 +CD98:000001000FC0010002800C40000000007FFC010001001100100010001FF00000 +CD99:000001000FC0010002800C4000007FFC01000100000020F8201020303ECC0000 +CD9A:000001000FC0010002800C4000007FFC01000100202021FC207020883E700000 +CD9B:000001000FC0010002800C4000007FFC010001001FF01000100010001FF00000 +CD9C:000001000FC0010002800C4000007FFC010001001FF000101FF010001FF00000 +CD9D:000001000FC0010002800C4000007FFC010001003EF802083E0820083E080000 +CD9E:000001000FC0010002800C4000007FFC010001003EF802883E8820883EF80000 +CD9F:000001000FC0010002800C4000007FFC010001003E8802883EF820883EF80000 +CDA0:000001000FC0010002800C4000007FFC010001003E1002103E1020283EC40000 +CDA1:000001000FC0010002800C4000007FFC010001003EF802803EF820803EF80000 +CDA2:000001000FC0010002800C4000007FFC010001003EFC02483E4820483EFC0000 +CDA3:000001000FC0010002800C4000007FFC010001003E2003FC3E7020883E700000 +CDA4:000001000FC0010002800C4000007FFC010001001FF01010101010101FF00000 +CDA5:000001000FC0010002800C4000007FFC01000100101010101FF010101FF00000 +CDA6:000001000FC0010002800C4000007FFC01000100222022203E2022503E880000 +CDA7:000001000FC0010002800C4000007FFC0100010000000100010002800C400000 +CDA8:000001000FC0010002800C4000007FFC010001000000024002400DA033100000 +CDA9:000001000FC0010002800C4000007FFC01000100000007C00820082007C00000 +CDAA:000001000FC0010002800C4000007FFC01000100000007E00080014006200000 +CDAB:000001000FC0010002800C4000007FFC01000100008007E00080014006200000 +CDAC:000001000FC0010002800C4000007FFC010001001FF000101FF0001000100000 +CDAD:000001000FC0010002800C4000007FFC010001001FF010001FF010001FF00000 +CDAE:000001000FC0010002800C4000007FFC0100010000001FF0044004401FF00000 +CDAF:000001000FC0010002800C4000007FFC0100010001001FF007C0082007C00000 +CDB0:0000040804083F880108020806080908308800087FE8040804F8040804080000 +CDB1:04083F0804080A08310800087FE8027802080000000007F80008000800080000 +CDB2:04083F0804080A08310800087FE802780208000000003EF80208020802080000 +CDB3:04083F0804080A08310800087FE802780208000000001F080108011401620000 +CDB4:04083F0804080A083108000800087FE80278020802081000100010001FF80000 +CDB5:04083F0804080A08310800087FE8027802080000000020F8201020303ECC0000 +CDB6:04083F0804080A08310800087FE8027802080000202021FC207020883E700000 +CDB7:04083F0804080A08310800087FE802780208000003F802000200020003F80000 +CDB8:04083F0804080A08310800087FE802780208000007F8000807F8040007F80000 +CDB9:04083F0804080A08310800087FE80278020800003EF802083E0820083E080000 +CDBA:04083F0804080A08310800087FE80278020800003EF802883E8820883EF80000 +CDBB:04083F0804080A08310800087FE80278020800003E8802883EF820883EF80000 +CDBC:04083F0804080A08310800087FE80278020800000F8800880F8808140FA20000 +CDBD:04083F0804080A08310800087FE80278020800003EF802803EF820803EF80000 +CDBE:04083F0804080A08310800087FE80278020800003EFC02483E4820483EFC0000 +CDBF:04083F0804080A08310800087FE80278020800003E1002FE3E3820443E380000 +CDC0:04083F0804080A08310800087FE802780208000003F802080208020803F80000 +CDC1:04083F0804080A08310800087FE80278020800000208020803F8020803F80000 +CDC2:04083F0804080A08310800087FE8027802080000210821083F0821143F620000 +CDC3:04083F0804080A08310800087FE8027802080000001000100010006801840000 +CDC4:04083F0804080A08310800087FE80278020800000048004800A8011406620000 +CDC5:04083F0804080A08310800087FE8027802080000000003F00408040803F00000 +CDC6:04083F0804080A08310800087FE802780208000003F80020002000D003080000 +CDC7:04083F0804080A08310800087FE8027802080000004003F8004000A003180000 +CDC8:04083F0804080A08310800087FE802780208000003F8000803F8000800080000 +CDC9:04083F0804080A08310800087FE802780208000003F8020003F8020003F80000 +CDCA:04083F0804080A08310800087FE802780208000000000FF8022002200FF80000 +CDCB:04083F0804080A08310800087FE802780208000000800FF803E0041003E00000 +CDCC:0000040A040A3F8A010A020A060A090A308A000A7FEA040A047A040A040A0000 +CDCD:04283F2804280A28312800287FA805E804280000000007F80008000800080000 +CDCE:04283F2804280A28312800287FA805E80428000000003EF80208020802080000 +CDCF:04283F2804280A28312800287FA805E80428000000001F080108011401620000 +CDD0:04283F2804280A283128002800287FA8042805E804281428100010001FF80000 +CDD1:04283F2804280A28312800287FA805E804280000000020F8201020303ECC0000 +CDD2:04283F2804280A28312800287FA805E804280000202021FC207020883E700000 +CDD3:04283F2804280A28312800287FA805E80428000003F802000200020003F80000 +CDD4:04283F2804280A28312800287FA805E80428000007F8000807F8040007F80000 +CDD5:04283F2804280A28312800287FA805E8042800003EF802083E0820083E080000 +CDD6:04283F2804280A28312800287FA805E8042800003EF802883E8820883EF80000 +CDD7:04283F2804280A28312800287FA805E8042800003E8802883EF820883EF80000 +CDD8:04283F2804280A28312800287FA805E8042800000F8800880F8808140FA20000 +CDD9:04283F2804280A28312800287FA805E8042800003EF802803EF820803EF80000 +CDDA:04283F2804280A28312800287FA805E8042800003EFC02483E4820483EFC0000 +CDDB:04283F2804280A28312800287FA805E8042800003E1002FE3E3820443E380000 +CDDC:04283F2804280A28312800287FA805E80428000003F802080208020803F80000 +CDDD:04283F2804280A28312800287FA805E8042800000208020803F8020803F80000 +CDDE:04283F2804280A28312800287FA805E804280000210821083F0821143F620000 +CDDF:04283F2804280A28312800287FA805E804280000001000100010006801840000 +CDE0:04283F2804280A28312800287FA805E8042800000048004800A8011406620000 +CDE1:04283F2804280A28312800287FA805E804280000000003F00408040803F00000 +CDE2:04283F2804280A28312800287FA805E80428000003F80020002000D003080000 +CDE3:04283F2804280A28312800287FA805E804280000004003F8004000A003180000 +CDE4:04283F2804280A28312800287FA805E80428000003F8000803F8000800080000 +CDE5:04283F2804280A28312800287FA805E80428000003F8020003F8020003F80000 +CDE6:04283F2804280A28312800287FA805E80428000000000FF8022002200FF80000 +CDE7:04283F2804280A28312800287FA805E80428000000800FF803E0041003E00000 +CDE8:0000040804083F880108020806080908308800087FE804080408040804080000 +CDE9:04083F0804080A08310800087FE8020802000000000007F80008000800080000 +CDEA:04083F0804080A08310800087FE802080200000000003EF80208020802080000 +CDEB:04083F0804080A08310800087FE802080200000000001F080108011401620000 +CDEC:04083F0804080A083108000800087FE80208020802081008100010001FF80000 +CDED:04083F0804080A08310800087FE8020802000000000020F8201020303ECC0000 +CDEE:04083F0804080A08310800087FE8020802000000202021FC207020883E700000 +CDEF:04083F0804080A08310800087FE802080200000003F802000200020003F80000 +CDF0:04083F0804080A08310800087FE802080200000007F8000807F8040007F80000 +CDF1:04083F0804080A08310800087FE80208020000003EF802083E0820083E080000 +CDF2:04083F0804080A08310800087FE80208020000003EF802883E8820883EF80000 +CDF3:04083F0804080A08310800087FE80208020000003E8802883EF820883EF80000 +CDF4:04083F0804080A08310800087FE80208020000000F8800880F8808140FA20000 +CDF5:04083F0804080A08310800087FE80208020000003EF802803EF820803EF80000 +CDF6:04083F0804080A08310800087FE80208020000003EFC02483E4820483EFC0000 +CDF7:04083F0804080A08310800087FE80208020000003E1002FE3E3820443E380000 +CDF8:04083F0804080A08310800087FE802080200000003F802080208020803F80000 +CDF9:04083F0804080A08310800087FE80208020000000208020803F8020803F80000 +CDFA:04083F0804080A08310800087FE8020802000000210821083F0821143F620000 +CDFB:04083F0804080A08310800087FE8020802000000001000100010006801840000 +CDFC:04083F0804080A08310800087FE80208020000000048004800A8011406620000 +CDFD:04083F0804080A08310800087FE8020802000000000003F00408040803F00000 +CDFE:04083F0804080A08310800087FE802080200000003F80020002000D003080000 +CDFF:04083F0804080A08310800087FE8020802000000004003F8004000A003180000 +CE00:04083F0804080A08310800087FE802080200000003F8000803F8000800080000 +CE01:04083F0804080A08310800087FE802080200000003F8020003F8020003F80000 +CE02:04083F0804080A08310800087FE802080200000000000FF8022002200FF80000 +CE03:04083F0804080A08310800087FE802080200000000800FF803E0041003E00000 +CE04:00000080008007F00020004000C00120061000007FFC04400440044004400000 +CE05:000001000FC0010002800C4000007FFC044004401FF000100010001000100000 +CE06:000001000FC0010002800C4000007FFC0440044000003EF80208020802080000 +CE07:000001000FC0010002800C4000007FFC0440044000001E100210022802C40000 +CE08:000001000FC0010002800C40000000007FFC044004401440100010001FF00000 +CE09:000001000FC0010002800C4000007FFC04400440000020F8201020303ECC0000 +CE0A:000001000FC0010002800C4000007FFC04400440202021FC207020883E700000 +CE0B:000001000FC0010002800C4000007FFC044004401FF01000100010001FF00000 +CE0C:000001000FC0010002800C4000007FFC044004401FF000101FF010001FF00000 +CE0D:000001000FC0010002800C4000007FFC044004403EF802083E0820083E080000 +CE0E:000001000FC0010002800C4000007FFC044004403EF802883E8820883EF80000 +CE0F:000001000FC0010002800C4000007FFC044004403E8802883EF820883EF80000 +CE10:000001000FC0010002800C4000007FFC044004403E1002103E1020283EC40000 +CE11:000001000FC0010002800C4000007FFC044004403EF802803EF820803EF80000 +CE12:000001000FC0010002800C4000007FFC044004403EFC02483E4820483EFC0000 +CE13:000001000FC0010002800C4000007FFC044004403E2003FC3E7020883E700000 +CE14:000001000FC0010002800C4000007FFC044004401FF01010101010101FF00000 +CE15:000001000FC0010002800C4000007FFC04400440101010101FF010101FF00000 +CE16:000001000FC0010002800C4000007FFC04400440222022203E2022503E880000 +CE17:000001000FC0010002800C4000007FFC0440044000000100010002800C400000 +CE18:000001000FC0010002800C4000007FFC044004400000024002400DA033100000 +CE19:000001000FC0010002800C4000007FFC04400440000007C00820082007C00000 +CE1A:000001000FC0010002800C4000007FFC04400440000007E00080014006200000 +CE1B:000001000FC0010002800C4000007FFC04400440008007E00080014006200000 +CE1C:000001000FC0010002800C4000007FFC044004401FF000101FF0001000100000 +CE1D:000001000FC0010002800C4000007FFC044004401FF010001FF010001FF00000 +CE1E:000001000FC0010002800C4000007FFC0440044000001FF0044004401FF00000 +CE1F:000001000FC0010002800C4000007FFC0440044001001FF007C0082007C00000 +CE20:0000010001000FE000400080018002400C20000000007FFC0000000000000000 +CE21:000001000FC0010002800C40000000007FFC00001FF000100010001000100000 +CE22:000001000FC0010002800C40000000007FFC000000003EF80208020802080000 +CE23:000001000FC0010002800C40000000007FFC000000001E100210022802C40000 +CE24:000001000FC0010002800C40000000007FFC000000001000100010001FF00000 +CE25:000001000FC0010002800C40000000007FFC0000000020F8201020303ECC0000 +CE26:000001000FC0010002800C40000000007FFC0000202021FC207020883E700000 +CE27:000001000FC0010002800C40000000007FFC00001FF01000100010001FF00000 +CE28:000001000FC0010002800C40000000007FFC00001FF000101FF010001FF00000 +CE29:000001000FC0010002800C40000000007FFC00003EF802083E0820083E080000 +CE2A:000001000FC0010002800C40000000007FFC00003EF802883E8820883EF80000 +CE2B:000001000FC0010002800C40000000007FFC00003E8802883EF820883EF80000 +CE2C:000001000FC0010002800C40000000007FFC00003E1002103E1020283EC40000 +CE2D:000001000FC0010002800C40000000007FFC00003EF802803EF820803EF80000 +CE2E:000001000FC0010002800C40000000007FFC00003EFC02483E4820483EFC0000 +CE2F:000001000FC0010002800C40000000007FFC00003E2003FC3E7020883E700000 +CE30:000001000FC0010002800C40000000007FFC00001FF01010101010101FF00000 +CE31:000001000FC0010002800C40000000007FFC0000101010101FF010101FF00000 +CE32:000001000FC0010002800C40000000007FFC0000222022203E2022503E880000 +CE33:000001000FC0010002800C40000000007FFC000000000100010002800C400000 +CE34:000001000FC0010002800C40000000007FFC00000000024002400DA033100000 +CE35:000001000FC0010002800C40000000007FFC0000000007C00820082007C00000 +CE36:000001000FC0010002800C40000000007FFC0000000007E00080014006200000 +CE37:000001000FC0010002800C40000000007FFC0000008007E00080014006200000 +CE38:000001000FC0010002800C40000000007FFC00001FF000101FF0001000100000 +CE39:000001000FC0010002800C40000000007FFC00001FF010001FF010001FF00000 +CE3A:000001000FC0010002800C40000000007FFC000000001FF0044004401FF00000 +CE3B:000001000FC0010002800C40000000007FFC000001001FF007C0082007C00000 +CE3C:00000008040804083F880108020806080908308800087FE80008000800080000 +CE3D:000002081F88020805081888000800087FE8000007F800080008000800080000 +CE3E:000002081F88020805081888000800087FE8000000003EF80208020802080000 +CE3F:000002081F88020805081888000800087FE8000000001F080108011401620000 +CE40:000002081F88020805081888000800087FE8000008000800080008000FF80000 +CE41:000002081F88020805081888000800087FE80000000010F8101010301ECC0000 +CE42:000002081F88020805081888000800087FE800000808087F081C08220F9C0000 +CE43:000002081F88020805081888000800087FE8000003F802000200020003F80000 +CE44:000002081F88020805081888000800087FE8000007F8000807F8040007F80000 +CE45:000002081F88020805081888000800087FE800003EF802083E0820083E080000 +CE46:000002081F88020805081888000800087FE800003EF802883E8820883EF80000 +CE47:000002081F88020805081888000800087FE800003E8802883EF820883EF80000 +CE48:000002081F88020805081888000800087FE800001F0801081F0810141F620000 +CE49:000002081F88020805081888000800087FE800003EF802803EF820803EF80000 +CE4A:000002081F88020805081888000800087FE800003EFC02483E4820483EFC0000 +CE4B:000002081F88020805081888000800087FE800001F08017F1F1C10221F1C0000 +CE4C:000002081F88020805081888000800087FE8000003F802080208020803F80000 +CE4D:000002081F88020805081888000800087FE800000208020803F8020803F80000 +CE4E:000002081F88020805081888000800087FE80000110811081F0811141F620000 +CE4F:000002081F88020805081888000800087FE80000001000100010006801840000 +CE50:000002081F88020805081888000800087FE800000048004800A8011406620000 +CE51:000002081F88020805081888000800087FE80000000003F00408040803F00000 +CE52:000002081F88020805081888000800087FE8000003F80020002000D003080000 +CE53:000002081F88020805081888000800087FE80000004003F8004000A003180000 +CE54:000002081F88020805081888000800087FE8000003F8000803F8000800080000 +CE55:000002081F88020805081888000800087FE8000003F8020003F8020003F80000 +CE56:000002081F88020805081888000800087FE8000000000FF8022002200FF80000 +CE57:000002081F88020805081888000800087FE8000000800FF803E0041003E00000 +CE58:000000000008040804083F880108020806080908308800080008000800080000 +CE59:00000008000808087E0808081408620800080000000007F80008000800080000 +CE5A:00000008000808087E080808140862080008000000003EF80208020802080000 +CE5B:00000008000808087E080808140862080008000000001F080108011401620000 +CE5C:00000008000808087E080808140862080008000800001000100010001FF80000 +CE5D:00000008000808087E0808081408620800080000000020F8201020303ECC0000 +CE5E:00000008000808087E0808081408620800080000202021FC207020883E700000 +CE5F:00000008000808087E080808140862080008000003F802000200020003F80000 +CE60:00000008000808087E080808140862080008000007F8000807F8040007F80000 +CE61:00000008000808087E08080814086208000800003EF802083E0820083E080000 +CE62:00000008000808087E08080814086208000800003EF802883E8820883EF80000 +CE63:00000008000808087E08080814086208000800003E8802883EF820883EF80000 +CE64:00000008000808087E08080814086208000800000F8800880F8808140FA20000 +CE65:00000008000808087E08080814086208000800003EF802803EF820803EF80000 +CE66:00000008000808087E08080814086208000800003EFC02483E4820483EFC0000 +CE67:00000008000808087E08080814086208000800003E1002FE3E3820443E380000 +CE68:00000008000808087E080808140862080008000003F802080208020803F80000 +CE69:00000008000808087E08080814086208000800000208020803F8020803F80000 +CE6A:00000008000808087E0808081408620800080000210821083F0821143F620000 +CE6B:00000008000808087E0808081408620800080000001000100010006801840000 +CE6C:00000008000808087E08080814086208000800000048004800A8011406620000 +CE6D:00000008000808087E0808081408620800080000000003F00408040803F00000 +CE6E:00000008000808087E080808140862080008000003F80020002000D003080000 +CE6F:00000008000808087E0808081408620800080000004003F8004000A003180000 +CE70:00000008000808087E080808140862080008000003F8000803F8000800080000 +CE71:00000008000808087E080808140862080008000003F8020003F8020003F80000 +CE72:00000008000808087E080808140862080008000000000FF8022002200FF80000 +CE73:00000008000808087E080808140862080008000000800FF803E0041003E00000 +CE74:00000000001000101F9000900090009E1F100110021004101810001000100000 +CE75:000000087E08020802087E0E040818086008000007F800080008000800080000 +CE76:000000087E08020802087E0E040818086008000000003EF80208020802080000 +CE77:000000087E08020802087E0E040818086008000000001F080108011401620000 +CE78:000000087E08020802087E0E040818086008000808000800080008000FF80000 +CE79:000000087E08020802087E0E0408180860080000000010F8101010301ECC0000 +CE7A:000000087E08020802087E0E04081808600800000808087F081C08220F9C0000 +CE7B:000000087E08020802087E0E040818086008000003F802000200020003F80000 +CE7C:000000087E08020802087E0E040818086008000007F8000807F8040007F80000 +CE7D:000000087E08020802087E0E04081808600800003EF802083E0820083E080000 +CE7E:000000087E08020802087E0E04081808600800003EF802883E8820883EF80000 +CE7F:000000087E08020802087E0E04081808600800003E8802883EF820883EF80000 +CE80:000000087E08020802087E0E04081808600800001F0801081F0810141F620000 +CE81:000000087E08020802087E0E04081808600800003EF802803EF820803EF80000 +CE82:000000087E08020802087E0E04081808600800003EFC02483E4820483EFC0000 +CE83:000000087E08020802087E0E04081808600800001F08017F1F1C10221F1C0000 +CE84:000000087E08020802087E0E040818086008000003F802080208020803F80000 +CE85:000000087E08020802087E0E04081808600800000208020803F8020803F80000 +CE86:000000087E08020802087E0E0408180860080000110811081F0811141F620000 +CE87:000000087E08020802087E0E0408180860080000001000100010006801840000 +CE88:000000087E08020802087E0E04081808600800000048004800A8011406620000 +CE89:000000087E08020802087E0E0408180860080000000003F00408040803F00000 +CE8A:000000087E08020802087E0E040818086008000003F80020002000D003080000 +CE8B:000000087E08020802087E0E0408180860080000004003F8004000A003180000 +CE8C:000000087E08020802087E0E040818086008000003F8000803F8000800080000 +CE8D:000000087E08020802087E0E040818086008000003F8020003F8020003F80000 +CE8E:000000087E08020802087E0E040818086008000000000FF8022002200FF80000 +CE8F:000000087E08020802087E0E040818086008000000800FF803E0041003E00000 +CE90:00000000001200121F9200920092009E1F120112021204121812001200120000 +CE91:000000287E28022802287E38042818286028000007F800080008000800080000 +CE92:000000287E28022802287E38042818286028000000003EF80208020802080000 +CE93:000000287E28022802287E38042818286028000000003E100210022802C40000 +CE94:000000287E28022802287E38042818286028002808000800080008000FF80000 +CE95:000000287E28022802287E380428182860280000000020F8201020303ECC0000 +CE96:000000287E28022802287E380428182860280000202021FC207020883E700000 +CE97:000000287E28022802287E38042818286028000003F802000200020003F80000 +CE98:000000287E28022802287E38042818286028000007F8000807F8040007F80000 +CE99:000000287E28022802287E3804281828602800003EF802083E0820083E080000 +CE9A:000000287E28022802287E3804281828602800003EF802883E8820883EF80000 +CE9B:000000287E28022802287E3804281828602800003E8802883EF820883EF80000 +CE9C:000000287E28022802287E3804281828602800001F0801081F0810141F620000 +CE9D:000000287E28022802287E3804281828602800003EF802803EF820803EF80000 +CE9E:000000287E28022802287E3804281828602800003EFC02483E4820483EFC0000 +CE9F:000000287E28022802287E3804281828602800003E1002FE3E3820443E380000 +CEA0:000000287E28022802287E38042818286028000003F802080208020803F80000 +CEA1:000000287E28022802287E3804281828602800000208020803F8020803F80000 +CEA2:000000287E28022802287E380428182860280000110811081F0811141F620000 +CEA3:000000287E28022802287E380428182860280000000800080008003400C20000 +CEA4:000000287E28022802287E3804281828602800000048004800A8011406620000 +CEA5:000000287E28022802287E380428182860280000000001F00208020801F00000 +CEA6:000000287E28022802287E38042818286028000003F80020002000D003080000 +CEA7:000000287E28022802287E380428182860280000004003F8004000A003180000 +CEA8:000000287E28022802287E38042818286028000003F8000803F8000800080000 +CEA9:000000287E28022802287E38042818286028000003F8020003F8020003F80000 +CEAA:000000287E28022802287E38042818286028000000000FF8022002200FF80000 +CEAB:000000287E28022802287E38042818286028000000800FF803E0041003E00000 +CEAC:00000000001000101F900090009E00901F10011E021004101810001000100000 +CEAD:000000087E080208020E7E08040E18086008000007F800080008000800080000 +CEAE:000000087E080208020E7E08040E18086008000000003EF80208020802080000 +CEAF:000000087E080208020E7E08040E18086008000000001F080108011401620000 +CEB0:000000087E080208020E7E08040E18086008000008000800080008000FF80000 +CEB1:000000087E080208020E7E08040E180860080000000010F8101010301ECC0000 +CEB2:000000087E080208020E7E08040E1808600800000808087F081C08220F9C0000 +CEB3:000000087E080208020E7E08040E18086008000003F802000200020003F80000 +CEB4:000000087E080208020E7E08040E18086008000007F8000807F8040007F80000 +CEB5:000000087E080208020E7E08040E1808600800003EF802083E0820083E080000 +CEB6:000000087E080208020E7E08040E1808600800003EF802883E8820883EF80000 +CEB7:000000087E080208020E7E08040E1808600800003E8802883EF820883EF80000 +CEB8:000000087E080208020E7E08040E1808600800001F0801081F0810141F620000 +CEB9:000000087E080208020E7E08040E1808600800003EF802803EF820803EF80000 +CEBA:000000087E080208020E7E08040E1808600800003EFC02483E4820483EFC0000 +CEBB:000000087E080208020E7E08040E1808600800001F08017F1F1C10221F1C0000 +CEBC:000000087E080208020E7E08040E18086008000003F802080208020803F80000 +CEBD:000000087E080208020E7E08040E1808600800000208020803F8020803F80000 +CEBE:000000087E080208020E7E08040E180860080000110811081F0811141F620000 +CEBF:000000087E080208020E7E08040E180860080000001000100010006801840000 +CEC0:000000087E080208020E7E08040E1808600800000048004800A8011406620000 +CEC1:000000087E080208020E7E08040E180860080000000003F00408040803F00000 +CEC2:000000087E080208020E7E08040E18086008000003F80020002000D003080000 +CEC3:000000087E080208020E7E08040E180860080000004003F8004000A003180000 +CEC4:000000087E080208020E7E08040E18086008000003F8000803F8000800080000 +CEC5:000000087E080208020E7E08040E18086008000003F8020003F8020003F80000 +CEC6:000000087E080208020E7E08040E18086008000000000FF8022002200FF80000 +CEC7:000000087E080208020E7E08040E18086008000000800FF803E0041003E00000 +CEC8:00000000001200121F920092009E00921F12011E021204121812001200120000 +CEC9:000000287E28022802387E28043818286028000007F800080008000800080000 +CECA:000000287E28022802387E28043818286028000000003EF80208020802080000 +CECB:000000287E28022802387E28043818286028000000003E100210022802C40000 +CECC:000000287E28022802387E28043818286028002808000800080008000FF80000 +CECD:000000287E28022802387E280438182860280000000020F8201020303ECC0000 +CECE:000000287E28022802387E280438182860280000202021FC207020883E700000 +CECF:000000287E28022802387E28043818286028000003F802000200020003F80000 +CED0:000000287E28022802387E28043818286028000007F8000807F8040007F80000 +CED1:000000287E28022802387E2804381828602800003EF802083E0820083E080000 +CED2:000000287E28022802387E2804381828602800003EF802883E8820883EF80000 +CED3:000000287E28022802387E2804381828602800003E8802883EF820883EF80000 +CED4:000000287E28022802387E2804381828602800001F0801081F0810141F620000 +CED5:000000287E28022802387E2804381828602800003EF802803EF820803EF80000 +CED6:000000287E28022802387E2804381828602800003EFC02483E4820483EFC0000 +CED7:000000287E28022802387E2804381828602800003E1002FE3E3820443E380000 +CED8:000000287E28022802387E28043818286028000003F802080208020803F80000 +CED9:000000287E28022802387E2804381828602800000208020803F8020803F80000 +CEDA:000000287E28022802387E280438182860280000110811081F0811141F620000 +CEDB:000000287E28022802387E280438182860280000000800080008003400C20000 +CEDC:000000287E28022802387E2804381828602800000048004800A8011406620000 +CEDD:000000287E28022802387E280438182860280000000001F00208020801F00000 +CEDE:000000287E28022802387E28043818286028000003F80020002000D003080000 +CEDF:000000287E28022802387E280438182860280000004003F8004000A003180000 +CEE0:000000287E28022802387E28043818286028000003F8000803F8000800080000 +CEE1:000000287E28022802387E28043818286028000003F8020003F8020003F80000 +CEE2:000000287E28022802387E28043818286028000000000FF8022002200FF80000 +CEE3:000000287E28022802387E28043818286028000000800FF803E0041003E00000 +CEE4:00000000000200021F8200820082009E1F020102020204021802000200020000 +CEE5:000000087E08020802087E380408180860080000000007F80008000800080000 +CEE6:000000087E08020802087E38040818086008000000003EF80208020802080000 +CEE7:000000087E08020802087E38040818086008000000001F080108011401620000 +CEE8:000000087E08020802087E38040818086008000000001000100010001FF80000 +CEE9:000000087E08020802087E380408180860080000000020F8201020303ECC0000 +CEEA:000000087E08020802087E380408180860080000202021FC207020883E700000 +CEEB:000000087E08020802087E38040818086008000003F802000200020003F80000 +CEEC:000000087E08020802087E38040818086008000007F8000807F8040007F80000 +CEED:000000087E08020802087E3804081808600800003EF802083E0820083E080000 +CEEE:000000087E08020802087E3804081808600800003EF802883E8820883EF80000 +CEEF:000000087E08020802087E3804081808600800003E8802883EF820883EF80000 +CEF0:000000087E08020802087E3804081808600800000F8800880F8808140FA20000 +CEF1:000000087E08020802087E3804081808600800003EF802803EF820803EF80000 +CEF2:000000087E08020802087E3804081808600800003EFC02483E4820483EFC0000 +CEF3:000000087E08020802087E3804081808600800003E1002FE3E3820443E380000 +CEF4:000000087E08020802087E38040818086008000003F802080208020803F80000 +CEF5:000000087E08020802087E3804081808600800000208020803F8020803F80000 +CEF6:000000087E08020802087E380408180860080000210821083F0821143F620000 +CEF7:000000087E08020802087E380408180860080000001000100010006801840000 +CEF8:000000087E08020802087E3804081808600800000048004800A8011406620000 +CEF9:000000087E08020802087E380408180860080000000003F00408040803F00000 +CEFA:000000087E08020802087E38040818086008000003F80020002000D003080000 +CEFB:000000087E08020802087E380408180860080000004003F8004000A003180000 +CEFC:000000087E08020802087E38040818086008000003F8000803F8000800080000 +CEFD:000000087E08020802087E38040818086008000003F8020003F8020003F80000 +CEFE:000000087E08020802087E38040818086008000000000FF8022002200FF80000 +CEFF:000000087E08020802087E38040818086008000000800FF803E0041003E00000 +CF00:00000000000A000A1F8A008A008A00BA1F0A010A020A040A180A000A000A0000 +CF01:000000287E28022802287EE8042818286028000007F800080008000800080000 +CF02:000000287E28022802287EE8042818286028000000003EF80208020802080000 +CF03:000000287E28022802287EE8042818286028000000003E100210022802C40000 +CF04:000000287E28022802287EE8042818286028000008000800080008000FF80000 +CF05:000000287E28022802287EE80428182860280000000020F8201020303ECC0000 +CF06:000000287E28022802287EE80428182860280000202021FC207020883E700000 +CF07:000000287E28022802287EE8042818286028000003F802000200020003F80000 +CF08:000000287E28022802287EE8042818286028000007F8000807F8040007F80000 +CF09:000000287E28022802287EE804281828602800003EF802083E0820083E080000 +CF0A:000000287E28022802287EE804281828602800003EF802883E8820883EF80000 +CF0B:000000287E28022802287EE804281828602800003E8802883EF820883EF80000 +CF0C:000000287E28022802287EE804281828602800001F0801081F0810141F620000 +CF0D:000000287E28022802287EE804281828602800003EF802803EF820803EF80000 +CF0E:000000287E28022802287EE804281828602800003EFC02483E4820483EFC0000 +CF0F:000000287E28022802287EE804281828602800003E1002FE3E3820443E380000 +CF10:000000287E28022802287EE8042818286028000003F802080208020803F80000 +CF11:000000287E28022802287EE804281828602800000208020803F8020803F80000 +CF12:000000287E28022802287EE80428182860280000110811081F0811141F620000 +CF13:000000287E28022802287EE80428182860280000000800080008003400C20000 +CF14:000000287E28022802287EE804281828602800000048004800A8011406620000 +CF15:000000287E28022802287EE80428182860280000000001F00208020801F00000 +CF16:000000287E28022802287EE8042818286028000003F80020002000D003080000 +CF17:000000287E28022802287EE80428182860280000004003F8004000A003180000 +CF18:000000287E28022802287EE8042818286028000003F8000803F8000800080000 +CF19:000000287E28022802287EE8042818286028000003F8020003F8020003F80000 +CF1A:000000287E28022802287EE8042818286028000000000FF8022002200FF80000 +CF1B:000000287E28022802287EE8042818286028000000800FF803E0041003E00000 +CF1C:00000000000200021F820082009E00821F02011E020204021802000200020000 +CF1D:000000087E08020802387E080438180860080000000007F80008000800080000 +CF1E:000000087E08020802387E08043818086008000000003EF80208020802080000 +CF1F:000000087E08020802387E08043818086008000000001F080108011401620000 +CF20:000000087E08020802387E08043818086008000800001000100010001FF80000 +CF21:000000087E08020802387E080438180860080000000020F8201020303ECC0000 +CF22:000000087E08020802387E080438180860080000202021FC207020883E700000 +CF23:000000087E08020802387E08043818086008000003F802000200020003F80000 +CF24:000000087E08020802387E08043818086008000007F8000807F8040007F80000 +CF25:000000087E08020802387E0804381808600800003EF802083E0820083E080000 +CF26:000000087E08020802387E0804381808600800003EF802883E8820883EF80000 +CF27:000000087E08020802387E0804381808600800003E8802883EF820883EF80000 +CF28:000000087E08020802387E0804381808600800000F8800880F8808140FA20000 +CF29:000000087E08020802387E0804381808600800003EF802803EF820803EF80000 +CF2A:000000087E08020802387E0804381808600800003EFC02483E4820483EFC0000 +CF2B:000000087E08020802387E0804381808600800003E1002FE3E3820443E380000 +CF2C:000000087E08020802387E08043818086008000003F802080208020803F80000 +CF2D:000000087E08020802387E0804381808600800000208020803F8020803F80000 +CF2E:000000087E08020802387E080438180860080000210821083F0821143F620000 +CF2F:000000087E08020802387E080438180860080000001000100010006801840000 +CF30:000000087E08020802387E0804381808600800000048004800A8011406620000 +CF31:000000087E08020802387E080438180860080000000003F00408040803F00000 +CF32:000000087E08020802387E08043818086008000003F80020002000D003080000 +CF33:000000087E08020802387E080438180860080000004003F8004000A003180000 +CF34:000000087E08020802387E08043818086008000003F8000803F8000800080000 +CF35:000000087E08020802387E08043818086008000003F8020003F8020003F80000 +CF36:000000087E08020802387E08043818086008000000000FF8022002200FF80000 +CF37:000000087E08020802387E08043818086008000000800FF803E0041003E00000 +CF38:00000000000A000A1F8A008A00BA008A1F0A013A020A040A180A000A000A0000 +CF39:000000287E28022802E87E2804E818286028000007F800080008000800080000 +CF3A:000000287E28022802E87E2804E818286028000000003EF80208020802080000 +CF3B:000000287E28022802E87E2804E818286028000000003E100210022802C40000 +CF3C:000000287E28022802E87E2804E818286028002808000800080008000FF80000 +CF3D:000000287E28022802E87E2804E8182860280000000020F8201020303ECC0000 +CF3E:000000287E28022802E87E2804E8182860280000202021FC207020883E700000 +CF3F:000000287E28022802E87E2804E818286028000003F802000200020003F80000 +CF40:000000287E28022802E87E2804E818286028000007F8000807F8040007F80000 +CF41:000000287E28022802E87E2804E81828602800003EF802083E0820083E080000 +CF42:000000287E28022802E87E2804E81828602800003EF802883E8820883EF80000 +CF43:000000287E28022802E87E2804E81828602800003E8802883EF820883EF80000 +CF44:000000287E28022802E87E2804E81828602800001F0801081F0810141F620000 +CF45:000000287E28022802E87E2804E81828602800003EF802803EF820803EF80000 +CF46:000000287E28022802E87E2804E81828602800003EFC02483E4820483EFC0000 +CF47:000000287E28022802E87E2804E81828602800003E1002FE3E3820443E380000 +CF48:000000287E28022802E87E2804E818286028000003F802080208020803F80000 +CF49:000000287E28022802E87E2804E81828602800000208020803F8020803F80000 +CF4A:000000287E28022802E87E2804E8182860280000110811081F0811141F620000 +CF4B:000000287E28022802E87E2804E8182860280000000800080008003400C20000 +CF4C:000000287E28022802E87E2804E81828602800000048004800A8011406620000 +CF4D:000000287E28022802E87E2804E8182860280000000001F00208020801F00000 +CF4E:000000287E28022802E87E2804E818286028000003F80020002000D003080000 +CF4F:000000287E28022802E87E2804E8182860280000004003F8004000A003180000 +CF50:000000287E28022802E87E2804E818286028000003F8000803F8000800080000 +CF51:000000287E28022802E87E2804E818286028000003F8020003F8020003F80000 +CF52:000000287E28022802E87E2804E818286028000000000FF8022002200FF80000 +CF53:000000287E28022802E87E2804E818286028000000800FF803E0041003E00000 +CF54:00000000000000003FF8000800083FF8000802080208020002007FFC00000000 +CF55:000000001FF000101FF00010011001007FFC00001FF000100010001000100000 +CF56:000000001FF000101FF00010011001007FFC000000003EF80208020802080000 +CF57:000000001FF000101FF00010011001007FFC000000001E100210022802C40000 +CF58:000000001FF000101FF00010011001007FFC000000001000100010001FF00000 +CF59:000000001FF000101FF00010011001007FFC0000000020F8201020303ECC0000 +CF5A:000000001FF000101FF00010011001007FFC0000202021FC207020883E700000 +CF5B:000000001FF000101FF00010011001007FFC00001FF01000100010001FF00000 +CF5C:000000001FF000101FF00010011001007FFC00001FF000101FF010001FF00000 +CF5D:000000001FF000101FF00010011001007FFC00003EF802083E0820083E080000 +CF5E:000000001FF000101FF00010011001007FFC00003EF802883E8820883EF80000 +CF5F:000000001FF000101FF00010011001007FFC00003E8802883EF820883EF80000 +CF60:000000001FF000101FF00010011001007FFC00003E1002103E1020283EC40000 +CF61:000000001FF000101FF00010011001007FFC00003EF802803EF820803EF80000 +CF62:000000001FF000101FF00010011001007FFC00003EFC02483E4820483EFC0000 +CF63:000000001FF000101FF00010011001007FFC00003E2003FC3E7020883E700000 +CF64:000000001FF000101FF00010011001007FFC00001FF01010101010101FF00000 +CF65:000000001FF000101FF00010011001007FFC0000101010101FF010101FF00000 +CF66:000000001FF000101FF00010011001007FFC0000222022203E2022503E880000 +CF67:000000001FF000101FF00010011001007FFC000000000100010002800C400000 +CF68:000000001FF000101FF00010011001007FFC00000000024002400DA033100000 +CF69:000000001FF000101FF00010011001007FFC0000000007C00820082007C00000 +CF6A:000000001FF000101FF00010011001007FFC0000000007E00080014006200000 +CF6B:000000001FF000101FF00010011001007FFC0000008007E00080014006200000 +CF6C:000000001FF000101FF00010011001007FFC00001FF000101FF0001000100000 +CF6D:000000001FF000101FF00010011001007FFC00001FF010001FF010001FF00000 +CF6E:000000001FF000101FF00010011001007FFC000000001FF0044004401FF00000 +CF6F:000000001FF000101FF00010011001007FFC000001001FF007C0082007C00000 +CF70:00000000001000103FD0005000503FDE0450045004107FD00010001000100000 +CF71:000000083F8800883F8E0088048804087FE8000007F800080008000800080000 +CF72:000000083F8800883F8E0088048804087FE8000000003EF80208020802080000 +CF73:000000083F8800883F8E0088048804087FE8000000001F080108011401620000 +CF74:000000083F8800883F8E0088048804087FE8000008000800080008000FF80000 +CF75:000000083F8800883F8E0088048804087FE80000000010F8101010301ECC0000 +CF76:000000083F8800883F8E0088048804087FE800000808087F081C08220F9C0000 +CF77:000000083F8800883F8E0088048804087FE8000003F802000200020003F80000 +CF78:000000083F8800883F8E0088048804087FE8000007F8000807F8040007F80000 +CF79:000000083F8800883F8E0088048804087FE800003EF802083E0820083E080000 +CF7A:000000083F8800883F8E0088048804087FE800003EF802883E8820883EF80000 +CF7B:000000083F8800883F8E0088048804087FE800003E8802883EF820883EF80000 +CF7C:000000083F8800883F8E0088048804087FE800001F0801081F0810141F620000 +CF7D:000000083F8800883F8E0088048804087FE800003EF802803EF820803EF80000 +CF7E:000000083F8800883F8E0088048804087FE800003EFC02483E4820483EFC0000 +CF7F:000000083F8800883F8E0088048804087FE800001F08017F1F1C10221F1C0000 +CF80:000000083F8800883F8E0088048804087FE8000003F802080208020803F80000 +CF81:000000083F8800883F8E0088048804087FE800000208020803F8020803F80000 +CF82:000000083F8800883F8E0088048804087FE80000110811081F0811141F620000 +CF83:000000083F8800883F8E0088048804087FE80000001000100010006801840000 +CF84:000000083F8800883F8E0088048804087FE800000048004800A8011406620000 +CF85:000000083F8800883F8E0088048804087FE80000000003F00408040803F00000 +CF86:000000083F8800883F8E0088048804087FE8000003F80020002000D003080000 +CF87:000000083F8800883F8E0088048804087FE80000004003F8004000A003180000 +CF88:000000083F8800883F8E0088048804087FE8000003F8000803F8000800080000 +CF89:000000083F8800883F8E0088048804087FE8000003F8020003F8020003F80000 +CF8A:000000083F8800883F8E0088048804087FE8000000000FF8022002200FF80000 +CF8B:000000083F8800883F8E0088048804087FE8000000800FF803E0041003E00000 +CF8C:00000000001200123FD2005200523FDE0452045204127FD20012001200120000 +CF8D:000000283FA800A83FB800A804A804287FA8000007F800080008000800080000 +CF8E:000000283FA800A83FB800A804A804287FA8000000003EF80208020802080000 +CF8F:000000283FA800A83FB800A804A804287FA8000000001F080108011401620000 +CF90:000000283FA800A83FB800A804A804287FA8000008000800080008000FF80000 +CF91:000000283FA800A83FB800A804A804287FA80000000010F8101010301ECC0000 +CF92:000000283FA800A83FB800A804A804287FA800000808087F081C08220F9C0000 +CF93:000000283FA800A83FB800A804A804287FA8000003F802000200020003F80000 +CF94:000000283FA800A83FB800A804A804287FA8000007F8000807F8040007F80000 +CF95:000000283FA800A83FB800A804A804287FA800003EF802083E0820083E080000 +CF96:000000283FA800A83FB800A804A804287FA800003EF802883E8820883EF80000 +CF97:000000283FA800A83FB800A804A804287FA800003E8802883EF820883EF80000 +CF98:000000283FA800A83FB800A804A804287FA800001F0801081F0810141F620000 +CF99:000000283FA800A83FB800A804A804287FA800003EF802803EF820803EF80000 +CF9A:000000283FA800A83FB800A804A804287FA800003EFC02483E4820483EFC0000 +CF9B:000000283FA800A83FB800A804A804287FA800001F08017F1F1C10221F1C0000 +CF9C:000000283FA800A83FB800A804A804287FA8000003F802080208020803F80000 +CF9D:000000283FA800A83FB800A804A804287FA800000208020803F8020803F80000 +CF9E:000000283FA800A83FB800A804A804287FA80000110811081F0811141F620000 +CF9F:000000283FA800A83FB800A804A804287FA80000001000100010006801840000 +CFA0:000000283FA800A83FB800A804A804287FA800000048004800A8011406620000 +CFA1:000000283FA800A83FB800A804A804287FA80000000003F00408040803F00000 +CFA2:000000283FA800A83FB800A804A804287FA8000003F80020002000D003080000 +CFA3:000000283FA800A83FB800A804A804287FA80000004003F8004000A003180000 +CFA4:000000283FA800A83FB800A804A804287FA8000003F8000803F8000800080000 +CFA5:000000283FA800A83FB800A804A804287FA8000003F8020003F8020003F80000 +CFA6:000000283FA800A83FB800A804A804287FA8000000000FF8022002200FF80000 +CFA7:000000283FA800A83FB800A804A804287FA8000000800FF803E0041003E00000 +CFA8:00000000000400043FC4004400443FC40444044404047FF40004000400040000 +CFA9:000000083F8800883F880088048804087FE8000007F800080008000800080000 +CFAA:000000083F8800883F880088048804087FE8000000003EF80208020802080000 +CFAB:000000083F8800883F880088048804087FE8000000001F080108011401620000 +CFAC:000000083F8800883F880088048804087FE8000008000800080008000FF80000 +CFAD:000000083F8800883F880088048804087FE80000000010F8101010301ECC0000 +CFAE:000000083F8800883F880088048804087FE800000808087F081C08220F9C0000 +CFAF:000000083F8800883F880088048804087FE8000003F802000200020003F80000 +CFB0:000000083F8800883F880088048804087FE8000007F8000807F8040007F80000 +CFB1:000000083F8800883F880088048804087FE800003EF802083E0820083E080000 +CFB2:000000083F8800883F880088048804087FE800003EF802883E8820883EF80000 +CFB3:000000083F8800883F880088048804087FE800003E8802883EF820883EF80000 +CFB4:000000083F8800883F880088048804087FE800001F0801081F0810141F620000 +CFB5:000000083F8800883F880088048804087FE800003EF802803EF820803EF80000 +CFB6:000000083F8800883F880088048804087FE800003EFC02483E4820483EFC0000 +CFB7:000000083F8800883F880088048804087FE800001F08017F1F1C10221F1C0000 +CFB8:000000083F8800883F880088048804087FE8000003F802080208020803F80000 +CFB9:000000083F8800883F880088048804087FE800000208020803F8020803F80000 +CFBA:000000083F8800883F880088048804087FE80000110811081F0811141F620000 +CFBB:000000083F8800883F880088048804087FE80000001000100010006801840000 +CFBC:000000083F8800883F880088048804087FE800000048004800A8011406620000 +CFBD:000000083F8800883F880088048804087FE80000000003F00408040803F00000 +CFBE:000000083F8800883F880088048804087FE8000003F80020002000D003080000 +CFBF:000000083F8800883F880088048804087FE80000004003F8004000A003180000 +CFC0:000000083F8800883F880088048804087FE8000003F8000803F8000800080000 +CFC1:000000083F8800883F880088048804087FE8000003F8020003F8020003F80000 +CFC2:000000083F8800883F880088048804087FE8000000000FF8022002200FF80000 +CFC3:000000083F8800883F880088048804087FE8000000800FF803E0041003E00000 +CFC4:00000000000000003FF8000800083FF8000808880888088008807FFC00000000 +CFC5:000000001FF000101FF00010049004807FFC00001FF000100010001000100000 +CFC6:000000001FF000101FF00010049004807FFC000000003EF80208020802080000 +CFC7:000000001FF000101FF00010049004807FFC000000001E100210022802C40000 +CFC8:000000001FF000101FF00010049004807FFC000000001000100010001FF00000 +CFC9:000000001FF000101FF00010049004807FFC0000000020F8201020303ECC0000 +CFCA:000000001FF000101FF00010049004807FFC0000202021FC207020883E700000 +CFCB:000000001FF000101FF00010049004807FFC00001FF01000100010001FF00000 +CFCC:000000001FF000101FF00010049004807FFC00001FF000101FF010001FF00000 +CFCD:000000001FF000101FF00010049004807FFC00003EF802083E0820083E080000 +CFCE:000000001FF000101FF00010049004807FFC00003EF802883E8820883EF80000 +CFCF:000000001FF000101FF00010049004807FFC00003E8802883EF820883EF80000 +CFD0:000000001FF000101FF00010049004807FFC00003E1002103E1020283EC40000 +CFD1:000000001FF000101FF00010049004807FFC00003EF802803EF820803EF80000 +CFD2:000000001FF000101FF00010049004807FFC00003EFC02483E4820483EFC0000 +CFD3:000000001FF000101FF00010049004807FFC00003E2003FC3E7020883E700000 +CFD4:000000001FF000101FF00010049004807FFC00001FF01010101010101FF00000 +CFD5:000000001FF000101FF00010049004807FFC0000101010101FF010101FF00000 +CFD6:000000001FF000101FF00010049004807FFC0000222022203E2022503E880000 +CFD7:000000001FF000101FF00010049004807FFC000000000100010002800C400000 +CFD8:000000001FF000101FF00010049004807FFC00000000024002400DA033100000 +CFD9:000000001FF000101FF00010049004807FFC0000000007C00820082007C00000 +CFDA:000000001FF000101FF00010049004807FFC0000000007E00080014006200000 +CFDB:000000001FF000101FF00010049004807FFC0000008007E00080014006200000 +CFDC:000000001FF000101FF00010049004807FFC00001FF000101FF0001000100000 +CFDD:000000001FF000101FF00010049004807FFC00001FF010001FF010001FF00000 +CFDE:000000001FF000101FF00010049004807FFC000000001FF0044004401FF00000 +CFDF:000000001FF000101FF00010049004807FFC000001001FF007C0082007C00000 +CFE0:0000000000003FF8000800083FF80008000800003FF801000100010001000000 +CFE1:000000001FF000101FF0001000107FFC010001001FF000100010001000100000 +CFE2:000000001FF000101FF0001000107FFC0100010000003EF80208020802080000 +CFE3:000000001FF000101FF0001000107FFC0100010000001E100210022802C40000 +CFE4:000000001FF000101FF00010001000007FFC010001001100100010001FF00000 +CFE5:000000001FF000101FF0001000107FFC01000100000020F8201020303ECC0000 +CFE6:000000001FF000101FF0001000107FFC01000100202021FC207020883E700000 +CFE7:000000001FF000101FF0001000107FFC010001001FF01000100010001FF00000 +CFE8:000000001FF000101FF0001000107FFC010001001FF000101FF010001FF00000 +CFE9:000000001FF000101FF0001000107FFC010001003EF802083E0820083E080000 +CFEA:000000001FF000101FF0001000107FFC010001003EF802883E8820883EF80000 +CFEB:000000001FF000101FF0001000107FFC010001003E8802883EF820883EF80000 +CFEC:000000001FF000101FF0001000107FFC010001003E1002103E1020283EC40000 +CFED:000000001FF000101FF0001000107FFC010001003EF802803EF820803EF80000 +CFEE:000000001FF000101FF0001000107FFC010001003EFC02483E4820483EFC0000 +CFEF:000000001FF000101FF0001000107FFC010001003E2003FC3E7020883E700000 +CFF0:000000001FF000101FF0001000107FFC010001001FF01010101010101FF00000 +CFF1:000000001FF000101FF0001000107FFC01000100101010101FF010101FF00000 +CFF2:000000001FF000101FF0001000107FFC01000100222022203E2022503E880000 +CFF3:000000001FF000101FF0001000107FFC0100010000000100010002800C400000 +CFF4:000000001FF000101FF0001000107FFC010001000000024002400DA033100000 +CFF5:000000001FF000101FF0001000107FFC01000100000007C00820082007C00000 +CFF6:000000001FF000101FF0001000107FFC01000100000007E00080014006200000 +CFF7:000000001FF000101FF0001000107FFC01000100008007E00080014006200000 +CFF8:000000001FF000101FF0001000107FFC010001001FF000101FF0001000100000 +CFF9:000000001FF000101FF0001000107FFC010001001FF010001FF010001FF00000 +CFFA:000000001FF000101FF0001000107FFC0100010000001FF0044004401FF00000 +CFFB:000000001FF000101FF0001000107FFC0100010001001FF007C0082007C00000 +CFFC:0000000800083FC8004800483FC80048004800087FE8040804F8040804080000 +CFFD:00083F8800883F88008800887FE8027802080000000007F80008000800080000 +CFFE:00083F8800883F88008800887FE802780208000000003EF80208020802080000 +CFFF:00083F8800883F88008800887FE802780208000000001F080108011401620000 +D000:00083F8800883F880088008800087FE80278020802081000100010001FF80000 +D001:00083F8800883F88008800887FE8027802080000000020F8201020303ECC0000 +D002:00083F8800883F88008800887FE8027802080000202021FC207020883E700000 +D003:00083F8800883F88008800887FE802780208000003F802000200020003F80000 +D004:00083F8800883F88008800887FE802780208000007F8000807F8040007F80000 +D005:00083F8800883F88008800887FE80278020800003EF802083E0820083E080000 +D006:00083F8800883F88008800887FE80278020800003EF802883E8820883EF80000 +D007:00083F8800883F88008800887FE80278020800003E8802883EF820883EF80000 +D008:00083F8800883F88008800887FE80278020800000F8800880F8808140FA20000 +D009:00083F8800883F88008800887FE80278020800003EF802803EF820803EF80000 +D00A:00083F8800883F88008800887FE80278020800003EFC02483E4820483EFC0000 +D00B:00083F8800883F88008800887FE80278020800003E1002FE3E3820443E380000 +D00C:00083F8800883F88008800887FE802780208000003F802080208020803F80000 +D00D:00083F8800883F88008800887FE80278020800000208020803F8020803F80000 +D00E:00083F8800883F88008800887FE8027802080000210821083F0821143F620000 +D00F:00083F8800883F88008800887FE8027802080000001000100010006801840000 +D010:00083F8800883F88008800887FE80278020800000048004800A8011406620000 +D011:00083F8800883F88008800887FE8027802080000000003F00408040803F00000 +D012:00083F8800883F88008800887FE802780208000003F80020002000D003080000 +D013:00083F8800883F88008800887FE8027802080000004003F8004000A003180000 +D014:00083F8800883F88008800887FE802780208000003F8000803F8000800080000 +D015:00083F8800883F88008800887FE802780208000003F8020003F8020003F80000 +D016:00083F8800883F88008800887FE802780208000000000FF8022002200FF80000 +D017:00083F8800883F88008800887FE802780208000000800FF803E0041003E00000 +D018:0000000A000A3FCA004A004A3FCA004A004A000A7FEA040A047A040A040A0000 +D019:00283FA800A83FA800A800A87FA805E804280000000007F80008000800080000 +D01A:00283FA800A83FA800A800A87FA805E80428000000003EF80208020802080000 +D01B:00283FA800A83FA800A800A87FA805E80428000000001F080108011401620000 +D01C:00283FA800A83FA800A800A800287FA8042805E804281428100010001FF80000 +D01D:00283FA800A83FA800A800A87FA805E804280000000020F8201020303ECC0000 +D01E:00283FA800A83FA800A800A87FA805E804280000202021FC207020883E700000 +D01F:00283FA800A83FA800A800A87FA805E80428000003F802000200020003F80000 +D020:00283FA800A83FA800A800A87FA805E80428000007F8000807F8040007F80000 +D021:00283FA800A83FA800A800A87FA805E8042800003EF802083E0820083E080000 +D022:00283FA800A83FA800A800A87FA805E8042800003EF802883E8820883EF80000 +D023:00283FA800A83FA800A800A87FA805E8042800003E8802883EF820883EF80000 +D024:00283FA800A83FA800A800A87FA805E8042800000F8800880F8808140FA20000 +D025:00283FA800A83FA800A800A87FA805E8042800003EF802803EF820803EF80000 +D026:00283FA800A83FA800A800A87FA805E8042800003EFC02483E4820483EFC0000 +D027:00283FA800A83FA800A800A87FA805E8042800003E1002FE3E3820443E380000 +D028:00283FA800A83FA800A800A87FA805E80428000003F802080208020803F80000 +D029:00283FA800A83FA800A800A87FA805E8042800000208020803F8020803F80000 +D02A:00283FA800A83FA800A800A87FA805E804280000210821083F0821143F620000 +D02B:00283FA800A83FA800A800A87FA805E804280000001000100010006801840000 +D02C:00283FA800A83FA800A800A87FA805E8042800000048004800A8011406620000 +D02D:00283FA800A83FA800A800A87FA805E804280000000003F00408040803F00000 +D02E:00283FA800A83FA800A800A87FA805E80428000003F80020002000D003080000 +D02F:00283FA800A83FA800A800A87FA805E804280000004003F8004000A003180000 +D030:00283FA800A83FA800A800A87FA805E80428000003F8000803F8000800080000 +D031:00283FA800A83FA800A800A87FA805E80428000003F8020003F8020003F80000 +D032:00283FA800A83FA800A800A87FA805E80428000000000FF8022002200FF80000 +D033:00283FA800A83FA800A800A87FA805E80428000000800FF803E0041003E00000 +D034:0000000800083FC8004800483FC80048004800087FE804080408040804080000 +D035:00083F8800883F88008800887FE8020802000000000007F80008000800080000 +D036:00083F8800883F88008800887FE802080200000000003EF80208020802080000 +D037:00083F8800883F88008800887FE802080200000000001F080108011401620000 +D038:00083F8800883F880088008800087FE80208020802081008100010001FF80000 +D039:00083F8800883F88008800887FE8020802000000000020F8201020303ECC0000 +D03A:00083F8800883F88008800887FE8020802000000202021FC207020883E700000 +D03B:00083F8800883F88008800887FE802080200000003F802000200020003F80000 +D03C:00083F8800883F88008800887FE802080200000007F8000807F8040007F80000 +D03D:00083F8800883F88008800887FE80208020000003EF802083E0820083E080000 +D03E:00083F8800883F88008800887FE80208020000003EF802883E8820883EF80000 +D03F:00083F8800883F88008800887FE80208020000003E8802883EF820883EF80000 +D040:00083F8800883F88008800887FE80208020000000F8800880F8808140FA20000 +D041:00083F8800883F88008800887FE80208020000003EF802803EF820803EF80000 +D042:00083F8800883F88008800887FE80208020000003EFC02483E4820483EFC0000 +D043:00083F8800883F88008800887FE80208020000003E1002FE3E3820443E380000 +D044:00083F8800883F88008800887FE802080200000003F802080208020803F80000 +D045:00083F8800883F88008800887FE80208020000000208020803F8020803F80000 +D046:00083F8800883F88008800887FE8020802000000210821083F0821143F620000 +D047:00083F8800883F88008800887FE8020802000000001000100010006801840000 +D048:00083F8800883F88008800887FE80208020000000048004800A8011406620000 +D049:00083F8800883F88008800887FE8020802000000000003F00408040803F00000 +D04A:00083F8800883F88008800887FE802080200000003F80020002000D003080000 +D04B:00083F8800883F88008800887FE8020802000000004003F8004000A003180000 +D04C:00083F8800883F88008800887FE802080200000003F8000803F8000800080000 +D04D:00083F8800883F88008800887FE802080200000003F8020003F8020003F80000 +D04E:00083F8800883F88008800887FE802080200000000000FF8022002200FF80000 +D04F:00083F8800883F88008800887FE802080200000000800FF803E0041003E00000 +D050:0000000000003FF8000800083FF80008000800007FFC04400440044004400000 +D051:000000001FF000101FF0001000107FFC044004401FF000100010001000100000 +D052:000000001FF000101FF0001000107FFC0440044000003EF80208020802080000 +D053:000000001FF000101FF0001000107FFC0440044000001E100210022802C40000 +D054:000000001FF000101FF00010001000007FFC044004401440100010001FF00000 +D055:000000001FF000101FF0001000107FFC04400440000020F8201020303ECC0000 +D056:000000001FF000101FF0001000107FFC04400440202021FC207020883E700000 +D057:000000001FF000101FF0001000107FFC044004401FF01000100010001FF00000 +D058:000000001FF000101FF0001000107FFC044004401FF000101FF010001FF00000 +D059:000000001FF000101FF0001000107FFC044004403EF802083E0820083E080000 +D05A:000000001FF000101FF0001000107FFC044004403EF802883E8820883EF80000 +D05B:000000001FF000101FF0001000107FFC044004403E8802883EF820883EF80000 +D05C:000000001FF000101FF0001000107FFC044004403E1002103E1020283EC40000 +D05D:000000001FF000101FF0001000107FFC044004403EF802803EF820803EF80000 +D05E:000000001FF000101FF0001000107FFC044004403EFC02483E4820483EFC0000 +D05F:000000001FF000101FF0001000107FFC044004403E2003FC3E7020883E700000 +D060:000000001FF000101FF0001000107FFC044004401FF01010101010101FF00000 +D061:000000001FF000101FF0001000107FFC04400440101010101FF010101FF00000 +D062:000000001FF000101FF0001000107FFC04400440222022203E2022503E880000 +D063:000000001FF000101FF0001000107FFC0440044000000100010002800C400000 +D064:000000001FF000101FF0001000107FFC044004400000024002400DA033100000 +D065:000000001FF000101FF0001000107FFC04400440000007C00820082007C00000 +D066:000000001FF000101FF0001000107FFC04400440000007E00080014006200000 +D067:000000001FF000101FF0001000107FFC04400440008007E00080014006200000 +D068:000000001FF000101FF0001000107FFC044004401FF000101FF0001000100000 +D069:000000001FF000101FF0001000107FFC044004401FF010001FF010001FF00000 +D06A:000000001FF000101FF0001000107FFC0440044000001FF0044004401FF00000 +D06B:000000001FF000101FF0001000107FFC0440044001001FF007C0082007C00000 +D06C:00000000000000003FF8000800083FF80008000800087FFC0000000000000000 +D06D:000000001FF000101FF00010001000007FFC00001FF000100010001000100000 +D06E:000000001FF000101FF00010001000007FFC000000003EF80208020802080000 +D06F:000000001FF000101FF00010001000007FFC000000001E100210022802C40000 +D070:000000001FF000101FF00010001000007FFC000000001000100010001FF00000 +D071:000000001FF000101FF00010001000007FFC0000000020F8201020303ECC0000 +D072:000000001FF000101FF00010001000007FFC0000202021FC207020883E700000 +D073:000000001FF000101FF00010001000007FFC00001FF01000100010001FF00000 +D074:000000001FF000101FF00010001000007FFC00001FF000101FF010001FF00000 +D075:000000001FF000101FF00010001000007FFC00003EF802083E0820083E080000 +D076:000000001FF000101FF00010001000007FFC00003EF802883E8820883EF80000 +D077:000000001FF000101FF00010001000007FFC00003E8802883EF820883EF80000 +D078:000000001FF000101FF00010001000007FFC00003E1002103E1020283EC40000 +D079:000000001FF000101FF00010001000007FFC00003EF802803EF820803EF80000 +D07A:000000001FF000101FF00010001000007FFC00003EFC02483E4820483EFC0000 +D07B:000000001FF000101FF00010001000007FFC00003E2003FC3E7020883E700000 +D07C:000000001FF000101FF00010001000007FFC00001FF01010101010101FF00000 +D07D:000000001FF000101FF00010001000007FFC0000101010101FF010101FF00000 +D07E:000000001FF000101FF00010001000007FFC0000222022203E2022503E880000 +D07F:000000001FF000101FF00010001000007FFC000000000100010002800C400000 +D080:000000001FF000101FF00010001000007FFC00000000024002400DA033100000 +D081:000000001FF000101FF00010001000007FFC0000000007C00820082007C00000 +D082:000000001FF000101FF00010001000007FFC0000000007E00080014006200000 +D083:000000001FF000101FF00010001000007FFC0000008007E00080014006200000 +D084:000000001FF000101FF00010001000007FFC00001FF000101FF0001000100000 +D085:000000001FF000101FF00010001000007FFC00001FF010001FF010001FF00000 +D086:000000001FF000101FF00010001000007FFC000000001FF0044004401FF00000 +D087:000000001FF000101FF00010001000007FFC000001001FF007C0082007C00000 +D088:00000000000800083FC8004800483FC80048004800087FE80008000800080000 +D089:000000083F8800883F880088008800087FE8000007F800080008000800080000 +D08A:000000083F8800883F880088008800087FE8000000003EF80208020802080000 +D08B:000000083F8800883F880088008800087FE8000000001F080108011401620000 +D08C:000000083F8800883F880088008800087FE8000008000800080008000FF80000 +D08D:000000083F8800883F880088008800087FE80000000010F8101010301ECC0000 +D08E:000000083F8800883F880088008800087FE800000808087F081C08220F9C0000 +D08F:000000083F8800883F880088008800087FE8000003F802000200020003F80000 +D090:000000083F8800883F880088008800087FE8000007F8000807F8040007F80000 +D091:000000083F8800883F880088008800087FE800003EF802083E0820083E080000 +D092:000000083F8800883F880088008800087FE800003EF802883E8820883EF80000 +D093:000000083F8800883F880088008800087FE800003E8802883EF820883EF80000 +D094:000000083F8800883F880088008800087FE800001F0801081F0810141F620000 +D095:000000083F8800883F880088008800087FE800003EF802803EF820803EF80000 +D096:000000083F8800883F880088008800087FE800003EFC02483E4820483EFC0000 +D097:000000083F8800883F880088008800087FE800001F08017F1F1C10221F1C0000 +D098:000000083F8800883F880088008800087FE8000003F802080208020803F80000 +D099:000000083F8800883F880088008800087FE800000208020803F8020803F80000 +D09A:000000083F8800883F880088008800087FE80000110811081F0811141F620000 +D09B:000000083F8800883F880088008800087FE80000001000100010006801840000 +D09C:000000083F8800883F880088008800087FE800000048004800A8011406620000 +D09D:000000083F8800883F880088008800087FE80000000003F00408040803F00000 +D09E:000000083F8800883F880088008800087FE8000003F80020002000D003080000 +D09F:000000083F8800883F880088008800087FE80000004003F8004000A003180000 +D0A0:000000083F8800883F880088008800087FE8000003F8000803F8000800080000 +D0A1:000000083F8800883F880088008800087FE8000003F8020003F8020003F80000 +D0A2:000000083F8800883F880088008800087FE8000000000FF8022002200FF80000 +D0A3:000000083F8800883F880088008800087FE8000000800FF803E0041003E00000 +D0A4:00000000000800081F880088008800881F080108020804081808000800080000 +D0A5:000000087E08020802087E080408180860080000000007F80008000800080000 +D0A6:000000087E08020802087E08040818086008000000003EF80208020802080000 +D0A7:000000087E08020802087E08040818086008000000001F080108011401620000 +D0A8:000000087E08020802087E08040818086008000800001000100010001FF80000 +D0A9:000000087E08020802087E080408180860080000000020F8201020303ECC0000 +D0AA:000000087E08020802087E080408180860080000202021FC207020883E700000 +D0AB:000000087E08020802087E08040818086008000003F802000200020003F80000 +D0AC:000000087E08020802087E08040818086008000007F8000807F8040007F80000 +D0AD:000000087E08020802087E0804081808600800003EF802083E0820083E080000 +D0AE:000000087E08020802087E0804081808600800003EF802883E8820883EF80000 +D0AF:000000087E08020802087E0804081808600800003E8802883EF820883EF80000 +D0B0:000000087E08020802087E0804081808600800000F8800880F8808140FA20000 +D0B1:000000087E08020802087E0804081808600800003EF802803EF820803EF80000 +D0B2:000000087E08020802087E0804081808600800003EFC02483E4820483EFC0000 +D0B3:000000087E08020802087E0804081808600800003E1002FE3E3820443E380000 +D0B4:000000087E08020802087E08040818086008000003F802080208020803F80000 +D0B5:000000087E08020802087E0804081808600800000208020803F8020803F80000 +D0B6:000000087E08020802087E080408180860080000210821083F0821143F620000 +D0B7:000000087E08020802087E080408180860080000001000100010006801840000 +D0B8:000000087E08020802087E0804081808600800000048004800A8011406620000 +D0B9:000000087E08020802087E080408180860080000000003F00408040803F00000 +D0BA:000000087E08020802087E08040818086008000003F80020002000D003080000 +D0BB:000000087E08020802087E080408180860080000004003F8004000A003180000 +D0BC:000000087E08020802087E08040818086008000003F8000803F8000800080000 +D0BD:000000087E08020802087E08040818086008000003F8020003F8020003F80000 +D0BE:000000087E08020802087E08040818086008000000000FF8022002200FF80000 +D0BF:000000087E08020802087E08040818086008000000800FF803E0041003E00000 +D0C0:00000000001000103F90201020103F9E201020103F9000100010001000100000 +D0C1:0000000800087E0840087E0E40087E080008000007F800080008000800080000 +D0C2:0000000800087E0840087E0E40087E080008000000003EF80208020802080000 +D0C3:0000000800087E0840087E0E40087E080008000000001F080108011401620000 +D0C4:0000000800087E0840087E0E40087E080008000808000800080008000FF80000 +D0C5:0000000800087E0840087E0E40087E0800080000000010F8101010301ECC0000 +D0C6:0000000800087E0840087E0E40087E08000800000808087F081C08220F9C0000 +D0C7:0000000800087E0840087E0E40087E080008000003F802000200020003F80000 +D0C8:0000000800087E0840087E0E40087E080008000007F8000807F8040007F80000 +D0C9:0000000800087E0840087E0E40087E08000800003EF802083E0820083E080000 +D0CA:0000000800087E0840087E0E40087E08000800003EF802883E8820883EF80000 +D0CB:0000000800087E0840087E0E40087E08000800003E8802883EF820883EF80000 +D0CC:0000000800087E0840087E0E40087E08000800001F0801081F0810141F620000 +D0CD:0000000800087E0840087E0E40087E08000800003EF802803EF820803EF80000 +D0CE:0000000800087E0840087E0E40087E08000800003EFC02483E4820483EFC0000 +D0CF:0000000800087E0840087E0E40087E08000800001F08017F1F1C10221F1C0000 +D0D0:0000000800087E0840087E0E40087E080008000003F802080208020803F80000 +D0D1:0000000800087E0840087E0E40087E08000800000208020803F8020803F80000 +D0D2:0000000800087E0840087E0E40087E0800080000110811081F0811141F620000 +D0D3:0000000800087E0840087E0E40087E0800080000001000100010006801840000 +D0D4:0000000800087E0840087E0E40087E08000800000048004800A8011406620000 +D0D5:0000000800087E0840087E0E40087E0800080000000003F00408040803F00000 +D0D6:0000000800087E0840087E0E40087E080008000003F80020002000D003080000 +D0D7:0000000800087E0840087E0E40087E0800080000004003F8004000A003180000 +D0D8:0000000800087E0840087E0E40087E080008000003F8000803F8000800080000 +D0D9:0000000800087E0840087E0E40087E080008000003F8020003F8020003F80000 +D0DA:0000000800087E0840087E0E40087E080008000000000FF8022002200FF80000 +D0DB:0000000800087E0840087E0E40087E080008000000800FF803E0041003E00000 +D0DC:00000000001200123F92201220123F9E201220123F9200120012001200120000 +D0DD:0000002800287E2840287E3840287E280028000007F800080008000800080000 +D0DE:0000002800287E2840287E3840287E280028000000003EF80208020802080000 +D0DF:0000002800287E2840287E3840287E280028000000003E100210022802C40000 +D0E0:0000002800287E2840287E3840287E280028002808000800080008000FF80000 +D0E1:0000002800287E2840287E3840287E2800280000000020F8201020303ECC0000 +D0E2:0000002800287E2840287E3840287E2800280000202021FC207020883E700000 +D0E3:0000002800287E2840287E3840287E280028000003F802000200020003F80000 +D0E4:0000002800287E2840287E3840287E280028000007F8000807F8040007F80000 +D0E5:0000002800287E2840287E3840287E28002800003EF802083E0820083E080000 +D0E6:0000002800287E2840287E3840287E28002800003EF802883E8820883EF80000 +D0E7:0000002800287E2840287E3840287E28002800003E8802883EF820883EF80000 +D0E8:0000002800287E2840287E3840287E28002800001F0801081F0810141F620000 +D0E9:0000002800287E2840287E3840287E28002800003EF802803EF820803EF80000 +D0EA:0000002800287E2840287E3840287E28002800003EFC02483E4820483EFC0000 +D0EB:0000002800287E2840287E3840287E28002800003E1002FE3E3820443E380000 +D0EC:0000002800287E2840287E3840287E280028000003F802080208020803F80000 +D0ED:0000002800287E2840287E3840287E28002800000208020803F8020803F80000 +D0EE:0000002800287E2840287E3840287E2800280000110811081F0811141F620000 +D0EF:0000002800287E2840287E3840287E2800280000000800080008003400C20000 +D0F0:0000002800287E2840287E3840287E28002800000048004800A8011406620000 +D0F1:0000002800287E2840287E3840287E2800280000000001F00208020801F00000 +D0F2:0000002800287E2840287E3840287E280028000003F80020002000D003080000 +D0F3:0000002800287E2840287E3840287E2800280000004003F8004000A003180000 +D0F4:0000002800287E2840287E3840287E280028000003F8000803F8000800080000 +D0F5:0000002800287E2840287E3840287E280028000003F8020003F8020003F80000 +D0F6:0000002800287E2840287E3840287E280028000000000FF8022002200FF80000 +D0F7:0000002800287E2840287E3840287E280028000000800FF803E0041003E00000 +D0F8:00000000001000103F902010201E3F902010201E3F9000100010001000100000 +D0F9:0000000800087E08400E7E08400E7E080008000007F800080008000800080000 +D0FA:0000000800087E08400E7E08400E7E080008000000003EF80208020802080000 +D0FB:0000000800087E08400E7E08400E7E080008000000001F080108011401620000 +D0FC:0000000800087E08400E7E08400E7E080008000008000800080008000FF80000 +D0FD:0000000800087E08400E7E08400E7E0800080000000010F8101010301ECC0000 +D0FE:0000000800087E08400E7E08400E7E08000800000808087F081C08220F9C0000 +D0FF:0000000800087E08400E7E08400E7E080008000003F802000200020003F80000 +D100:0000000800087E08400E7E08400E7E080008000007F8000807F8040007F80000 +D101:0000000800087E08400E7E08400E7E08000800003EF802083E0820083E080000 +D102:0000000800087E08400E7E08400E7E08000800003EF802883E8820883EF80000 +D103:0000000800087E08400E7E08400E7E08000800003E8802883EF820883EF80000 +D104:0000000800087E08400E7E08400E7E08000800001F0801081F0810141F620000 +D105:0000000800087E08400E7E08400E7E08000800003EF802803EF820803EF80000 +D106:0000000800087E08400E7E08400E7E08000800003EFC02483E4820483EFC0000 +D107:0000000800087E08400E7E08400E7E08000800001F08017F1F1C10221F1C0000 +D108:0000000800087E08400E7E08400E7E080008000003F802080208020803F80000 +D109:0000000800087E08400E7E08400E7E08000800000208020803F8020803F80000 +D10A:0000000800087E08400E7E08400E7E0800080000110811081F0811141F620000 +D10B:0000000800087E08400E7E08400E7E0800080000001000100010006801840000 +D10C:0000000800087E08400E7E08400E7E08000800000048004800A8011406620000 +D10D:0000000800087E08400E7E08400E7E0800080000000003F00408040803F00000 +D10E:0000000800087E08400E7E08400E7E080008000003F80020002000D003080000 +D10F:0000000800087E08400E7E08400E7E0800080000004003F8004000A003180000 +D110:0000000800087E08400E7E08400E7E080008000003F8000803F8000800080000 +D111:0000000800087E08400E7E08400E7E080008000003F8020003F8020003F80000 +D112:0000000800087E08400E7E08400E7E080008000000000FF8022002200FF80000 +D113:0000000800087E08400E7E08400E7E080008000000800FF803E0041003E00000 +D114:00000000001200123F922012201E3F922012201E3F9200120012001200120000 +D115:0000002800287E2840387E2840387E280028000007F800080008000800080000 +D116:0000002800287E2840387E2840387E280028000000003EF80208020802080000 +D117:0000002800287E2840387E2840387E280028000000003E100210022802C40000 +D118:0000002800287E2840387E2840387E280028002808000800080008000FF80000 +D119:0000002800287E2840387E2840387E2800280000000020F8201020303ECC0000 +D11A:0000002800287E2840387E2840387E2800280000202021FC207020883E700000 +D11B:0000002800287E2840387E2840387E280028000003F802000200020003F80000 +D11C:0000002800287E2840387E2840387E280028000007F8000807F8040007F80000 +D11D:0000002800287E2840387E2840387E28002800003EF802083E0820083E080000 +D11E:0000002800287E2840387E2840387E28002800003EF802883E8820883EF80000 +D11F:0000002800287E2840387E2840387E28002800003E8802883EF820883EF80000 +D120:0000002800287E2840387E2840387E28002800001F0801081F0810141F620000 +D121:0000002800287E2840387E2840387E28002800003EF802803EF820803EF80000 +D122:0000002800287E2840387E2840387E28002800003EFC02483E4820483EFC0000 +D123:0000002800287E2840387E2840387E28002800003E1002FE3E3820443E380000 +D124:0000002800287E2840387E2840387E280028000003F802080208020803F80000 +D125:0000002800287E2840387E2840387E28002800000208020803F8020803F80000 +D126:0000002800287E2840387E2840387E2800280000110811081F0811141F620000 +D127:0000002800287E2840387E2840387E2800280000000800080008003400C20000 +D128:0000002800287E2840387E2840387E28002800000048004800A8011406620000 +D129:0000002800287E2840387E2840387E2800280000000001F00208020801F00000 +D12A:0000002800287E2840387E2840387E280028000003F80020002000D003080000 +D12B:0000002800287E2840387E2840387E2800280000004003F8004000A003180000 +D12C:0000002800287E2840387E2840387E280028000003F8000803F8000800080000 +D12D:0000002800287E2840387E2840387E280028000003F8020003F8020003F80000 +D12E:0000002800287E2840387E2840387E280028000000000FF8022002200FF80000 +D12F:0000002800287E2840387E2840387E280028000000800FF803E0041003E00000 +D130:00000000000200023F82200220023F9E200220023F8200020002000200020000 +D131:0000000800087E0840087E3840087E0800080000000007F80008000800080000 +D132:0000000800087E0840087E3840087E080008000000003EF80208020802080000 +D133:0000000800087E0840087E3840087E080008000000001F080108011401620000 +D134:0000000800087E0840087E3840087E080008000000001000100010001FF80000 +D135:0000000800087E0840087E3840087E0800080000000020F8201020303ECC0000 +D136:0000000800087E0840087E3840087E0800080000202021FC207020883E700000 +D137:0000000800087E0840087E3840087E080008000003F802000200020003F80000 +D138:0000000800087E0840087E3840087E080008000007F8000807F8040007F80000 +D139:0000000800087E0840087E3840087E08000800003EF802083E0820083E080000 +D13A:0000000800087E0840087E3840087E08000800003EF802883E8820883EF80000 +D13B:0000000800087E0840087E3840087E08000800003E8802883EF820883EF80000 +D13C:0000000800087E0840087E3840087E08000800000F8800880F8808140FA20000 +D13D:0000000800087E0840087E3840087E08000800003EF802803EF820803EF80000 +D13E:0000000800087E0840087E3840087E08000800003EFC02483E4820483EFC0000 +D13F:0000000800087E0840087E3840087E08000800003E1002FE3E3820443E380000 +D140:0000000800087E0840087E3840087E080008000003F802080208020803F80000 +D141:0000000800087E0840087E3840087E08000800000208020803F8020803F80000 +D142:0000000800087E0840087E3840087E0800080000210821083F0821143F620000 +D143:0000000800087E0840087E3840087E0800080000001000100010006801840000 +D144:0000000800087E0840087E3840087E08000800000048004800A8011406620000 +D145:0000000800087E0840087E3840087E0800080000000003F00408040803F00000 +D146:0000000800087E0840087E3840087E080008000003F80020002000D003080000 +D147:0000000800087E0840087E3840087E0800080000004003F8004000A003180000 +D148:0000000800087E0840087E3840087E080008000003F8000803F8000800080000 +D149:0000000800087E0840087E3840087E080008000003F8020003F8020003F80000 +D14A:0000000800087E0840087E3840087E080008000000000FF8022002200FF80000 +D14B:0000000800087E0840087E3840087E080008000000800FF803E0041003E00000 +D14C:00000000000A000A3F8A200A200A3FBA200A200A3F8A000A000A000A000A0000 +D14D:0000002800287E2840287EE840287E280028000007F800080008000800080000 +D14E:0000002800287E2840287EE840287E280028000000003EF80208020802080000 +D14F:0000002800287E2840287EE840287E280028000000003E100210022802C40000 +D150:0000002800287E2840287EE840287E280028000008000800080008000FF80000 +D151:0000002800287E2840287EE840287E2800280000000020F8201020303ECC0000 +D152:0000002800287E2840287EE840287E2800280000202021FC207020883E700000 +D153:0000002800287E2840287EE840287E280028000003F802000200020003F80000 +D154:0000002800287E2840287EE840287E280028000007F8000807F8040007F80000 +D155:0000002800287E2840287EE840287E28002800003EF802083E0820083E080000 +D156:0000002800287E2840287EE840287E28002800003EF802883E8820883EF80000 +D157:0000002800287E2840287EE840287E28002800003E8802883EF820883EF80000 +D158:0000002800287E2840287EE840287E28002800001F0801081F0810141F620000 +D159:0000002800287E2840287EE840287E28002800003EF802803EF820803EF80000 +D15A:0000002800287E2840287EE840287E28002800003EFC02483E4820483EFC0000 +D15B:0000002800287E2840287EE840287E28002800003E1002FE3E3820443E380000 +D15C:0000002800287E2840287EE840287E280028000003F802080208020803F80000 +D15D:0000002800287E2840287EE840287E28002800000208020803F8020803F80000 +D15E:0000002800287E2840287EE840287E2800280000110811081F0811141F620000 +D15F:0000002800287E2840287EE840287E2800280000000800080008003400C20000 +D160:0000002800287E2840287EE840287E28002800000048004800A8011406620000 +D161:0000002800287E2840287EE840287E2800280000000001F00208020801F00000 +D162:0000002800287E2840287EE840287E280028000003F80020002000D003080000 +D163:0000002800287E2840287EE840287E2800280000004003F8004000A003180000 +D164:0000002800287E2840287EE840287E280028000003F8000803F8000800080000 +D165:0000002800287E2840287EE840287E280028000003F8020003F8020003F80000 +D166:0000002800287E2840287EE840287E280028000000000FF8022002200FF80000 +D167:0000002800287E2840287EE840287E280028000000800FF803E0041003E00000 +D168:00000000000200023F822002201E3F822002201E3F8200020002000200020000 +D169:0000000800087E0840387E0840387E0800080000000007F80008000800080000 +D16A:0000000800087E0840387E0840387E080008000000003EF80208020802080000 +D16B:0000000800087E0840387E0840387E080008000000001F080108011401620000 +D16C:0000000800087E0840387E0840387E080008000800001000100010001FF80000 +D16D:0000000800087E0840387E0840387E0800080000000020F8201020303ECC0000 +D16E:0000000800087E0840387E0840387E0800080000202021FC207020883E700000 +D16F:0000000800087E0840387E0840387E080008000003F802000200020003F80000 +D170:0000000800087E0840387E0840387E080008000007F8000807F8040007F80000 +D171:0000000800087E0840387E0840387E08000800003EF802083E0820083E080000 +D172:0000000800087E0840387E0840387E08000800003EF802883E8820883EF80000 +D173:0000000800087E0840387E0840387E08000800003E8802883EF820883EF80000 +D174:0000000800087E0840387E0840387E08000800000F8800880F8808140FA20000 +D175:0000000800087E0840387E0840387E08000800003EF802803EF820803EF80000 +D176:0000000800087E0840387E0840387E08000800003EFC02483E4820483EFC0000 +D177:0000000800087E0840387E0840387E08000800003E1002FE3E3820443E380000 +D178:0000000800087E0840387E0840387E080008000003F802080208020803F80000 +D179:0000000800087E0840387E0840387E08000800000208020803F8020803F80000 +D17A:0000000800087E0840387E0840387E0800080000210821083F0821143F620000 +D17B:0000000800087E0840387E0840387E0800080000001000100010006801840000 +D17C:0000000800087E0840387E0840387E08000800000048004800A8011406620000 +D17D:0000000800087E0840387E0840387E0800080000000003F00408040803F00000 +D17E:0000000800087E0840387E0840387E080008000003F80020002000D003080000 +D17F:0000000800087E0840387E0840387E0800080000004003F8004000A003180000 +D180:0000000800087E0840387E0840387E080008000003F8000803F8000800080000 +D181:0000000800087E0840387E0840387E080008000003F8020003F8020003F80000 +D182:0000000800087E0840387E0840387E080008000000000FF8022002200FF80000 +D183:0000000800087E0840387E0840387E080008000000800FF803E0041003E00000 +D184:00000000000A000A3F8A200A203A3F8A200A203A3F8A000A000A000A000A0000 +D185:0000002800287E2840E87E2840E87E280028000007F800080008000800080000 +D186:0000002800287E2840E87E2840E87E280028000000003EF80208020802080000 +D187:0000002800287E2840E87E2840E87E280028000000003E100210022802C40000 +D188:0000002800287E2840E87E2840E87E280028002808000800080008000FF80000 +D189:0000002800287E2840E87E2840E87E2800280000000020F8201020303ECC0000 +D18A:0000002800287E2840E87E2840E87E2800280000202021FC207020883E700000 +D18B:0000002800287E2840E87E2840E87E280028000003F802000200020003F80000 +D18C:0000002800287E2840E87E2840E87E280028000007F8000807F8040007F80000 +D18D:0000002800287E2840E87E2840E87E28002800003EF802083E0820083E080000 +D18E:0000002800287E2840E87E2840E87E28002800003EF802883E8820883EF80000 +D18F:0000002800287E2840E87E2840E87E28002800003E8802883EF820883EF80000 +D190:0000002800287E2840E87E2840E87E28002800001F0801081F0810141F620000 +D191:0000002800287E2840E87E2840E87E28002800003EF802803EF820803EF80000 +D192:0000002800287E2840E87E2840E87E28002800003EFC02483E4820483EFC0000 +D193:0000002800287E2840E87E2840E87E28002800003E1002FE3E3820443E380000 +D194:0000002800287E2840E87E2840E87E280028000003F802080208020803F80000 +D195:0000002800287E2840E87E2840E87E28002800000208020803F8020803F80000 +D196:0000002800287E2840E87E2840E87E2800280000110811081F0811141F620000 +D197:0000002800287E2840E87E2840E87E2800280000000800080008003400C20000 +D198:0000002800287E2840E87E2840E87E28002800000048004800A8011406620000 +D199:0000002800287E2840E87E2840E87E2800280000000001F00208020801F00000 +D19A:0000002800287E2840E87E2840E87E280028000003F80020002000D003080000 +D19B:0000002800287E2840E87E2840E87E2800280000004003F8004000A003180000 +D19C:0000002800287E2840E87E2840E87E280028000003F8000803F8000800080000 +D19D:0000002800287E2840E87E2840E87E280028000003F8020003F8020003F80000 +D19E:0000002800287E2840E87E2840E87E280028000000000FF8022002200FF80000 +D19F:0000002800287E2840E87E2840E87E280028000000800FF803E0041003E00000 +D1A0:00003FF8200020003FF8200020003FF8000000000100010001007FFC00000000 +D1A1:00001FF010001FF010001FF0010001007FFC00001FF000100010001000100000 +D1A2:00001FF010001FF010001FF0010001007FFC000000003EF80208020802080000 +D1A3:00001FF010001FF010001FF0010001007FFC000000001E100210022802C40000 +D1A4:00001FF010001FF010001FF0010001007FFC000000001000100010001FF00000 +D1A5:00001FF010001FF010001FF0010001007FFC0000000020F8201020303ECC0000 +D1A6:00001FF010001FF010001FF0010001007FFC0000202021FC207020883E700000 +D1A7:00001FF010001FF010001FF0010001007FFC00001FF01000100010001FF00000 +D1A8:00001FF010001FF010001FF0010001007FFC00001FF000101FF010001FF00000 +D1A9:00001FF010001FF010001FF0010001007FFC00003EF802083E0820083E080000 +D1AA:00001FF010001FF010001FF0010001007FFC00003EF802883E8820883EF80000 +D1AB:00001FF010001FF010001FF0010001007FFC00003E8802883EF820883EF80000 +D1AC:00001FF010001FF010001FF0010001007FFC00003E1002103E1020283EC40000 +D1AD:00001FF010001FF010001FF0010001007FFC00003EF802803EF820803EF80000 +D1AE:00001FF010001FF010001FF0010001007FFC00003EFC02483E4820483EFC0000 +D1AF:00001FF010001FF010001FF0010001007FFC00003E2003FC3E7020883E700000 +D1B0:00001FF010001FF010001FF0010001007FFC00001FF01010101010101FF00000 +D1B1:00001FF010001FF010001FF0010001007FFC0000101010101FF010101FF00000 +D1B2:00001FF010001FF010001FF0010001007FFC0000222022203E2022503E880000 +D1B3:00001FF010001FF010001FF0010001007FFC000000000100010002800C400000 +D1B4:00001FF010001FF010001FF0010001007FFC00000000024002400DA033100000 +D1B5:00001FF010001FF010001FF0010001007FFC0000000007C00820082007C00000 +D1B6:00001FF010001FF010001FF0010001007FFC0000000007E00080014006200000 +D1B7:00001FF010001FF010001FF0010001007FFC0000008007E00080014006200000 +D1B8:00001FF010001FF010001FF0010001007FFC00001FF000101FF0001000100000 +D1B9:00001FF010001FF010001FF0010001007FFC00001FF010001FF010001FF00000 +D1BA:00001FF010001FF010001FF0010001007FFC000000001FF0044004401FF00000 +D1BB:00001FF010001FF010001FF0010001007FFC000001001FF007C0082007C00000 +D1BC:000000103FD0201020103FD02010201E3FD00010041004107FD0001000100000 +D1BD:000000087F0840087F0E40087F0804087FE8000007F800080008000800080000 +D1BE:000000087F0840087F0E40087F0804087FE8000000003EF80208020802080000 +D1BF:000000087F0840087F0E40087F0804087FE8000000001F080108011401620000 +D1C0:000000087F0840087F0E40087F0804087FE8000008000800080008000FF80000 +D1C1:000000087F0840087F0E40087F0804087FE80000000010F8101010301ECC0000 +D1C2:000000087F0840087F0E40087F0804087FE800000808087F081C08220F9C0000 +D1C3:000000087F0840087F0E40087F0804087FE8000003F802000200020003F80000 +D1C4:000000087F0840087F0E40087F0804087FE8000007F8000807F8040007F80000 +D1C5:000000087F0840087F0E40087F0804087FE800003EF802083E0820083E080000 +D1C6:000000087F0840087F0E40087F0804087FE800003EF802883E8820883EF80000 +D1C7:000000087F0840087F0E40087F0804087FE800003E8802883EF820883EF80000 +D1C8:000000087F0840087F0E40087F0804087FE800001F0801081F0810141F620000 +D1C9:000000087F0840087F0E40087F0804087FE800003EF802803EF820803EF80000 +D1CA:000000087F0840087F0E40087F0804087FE800003EFC02483E4820483EFC0000 +D1CB:000000087F0840087F0E40087F0804087FE800001F08017F1F1C10221F1C0000 +D1CC:000000087F0840087F0E40087F0804087FE8000003F802080208020803F80000 +D1CD:000000087F0840087F0E40087F0804087FE800000208020803F8020803F80000 +D1CE:000000087F0840087F0E40087F0804087FE80000110811081F0811141F620000 +D1CF:000000087F0840087F0E40087F0804087FE80000001000100010006801840000 +D1D0:000000087F0840087F0E40087F0804087FE800000048004800A8011406620000 +D1D1:000000087F0840087F0E40087F0804087FE80000000003F00408040803F00000 +D1D2:000000087F0840087F0E40087F0804087FE8000003F80020002000D003080000 +D1D3:000000087F0840087F0E40087F0804087FE80000004003F8004000A003180000 +D1D4:000000087F0840087F0E40087F0804087FE8000003F8000803F8000800080000 +D1D5:000000087F0840087F0E40087F0804087FE8000003F8020003F8020003F80000 +D1D6:000000087F0840087F0E40087F0804087FE8000000000FF8022002200FF80000 +D1D7:000000087F0840087F0E40087F0804087FE8000000800FF803E0041003E00000 +D1D8:000000123FD2201220123FD22012201E3FD20012041204127FD2001200120000 +D1D9:000000287F2840287F3840287F2804287FA8000007F800080008000800080000 +D1DA:000000287F2840287F3840287F2804287FA8000000003EF80208020802080000 +D1DB:000000287F2840287F3840287F2804287FA8000000001F080108011401620000 +D1DC:000000287F2840287F3840287F2804287FA8000008000800080008000FF80000 +D1DD:000000287F2840287F3840287F2804287FA80000000010F8101010301ECC0000 +D1DE:000000287F2840287F3840287F2804287FA800000808087F081C08220F9C0000 +D1DF:000000287F2840287F3840287F2804287FA8000003F802000200020003F80000 +D1E0:000000287F2840287F3840287F2804287FA8000007F8000807F8040007F80000 +D1E1:000000287F2840287F3840287F2804287FA800003EF802083E0820083E080000 +D1E2:000000287F2840287F3840287F2804287FA800003EF802883E8820883EF80000 +D1E3:000000287F2840287F3840287F2804287FA800003E8802883EF820883EF80000 +D1E4:000000287F2840287F3840287F2804287FA800001F0801081F0810141F620000 +D1E5:000000287F2840287F3840287F2804287FA800003EF802803EF820803EF80000 +D1E6:000000287F2840287F3840287F2804287FA800003EFC02483E4820483EFC0000 +D1E7:000000287F2840287F3840287F2804287FA800001F08017F1F1C10221F1C0000 +D1E8:000000287F2840287F3840287F2804287FA8000003F802080208020803F80000 +D1E9:000000287F2840287F3840287F2804287FA800000208020803F8020803F80000 +D1EA:000000287F2840287F3840287F2804287FA80000110811081F0811141F620000 +D1EB:000000287F2840287F3840287F2804287FA80000001000100010006801840000 +D1EC:000000287F2840287F3840287F2804287FA800000048004800A8011406620000 +D1ED:000000287F2840287F3840287F2804287FA80000000003F00408040803F00000 +D1EE:000000287F2840287F3840287F2804287FA8000003F80020002000D003080000 +D1EF:000000287F2840287F3840287F2804287FA80000004003F8004000A003180000 +D1F0:000000287F2840287F3840287F2804287FA8000003F8000803F8000800080000 +D1F1:000000287F2840287F3840287F2804287FA8000003F8020003F8020003F80000 +D1F2:000000287F2840287F3840287F2804287FA8000000000FF8022002200FF80000 +D1F3:000000287F2840287F3840287F2804287FA8000000800FF803E0041003E00000 +D1F4:000000083FC8200820083FC8200820083FC80008040804087FE8000800080000 +D1F5:000000087F0840087F0840087F0804087FE8000007F800080008000800080000 +D1F6:000000087F0840087F0840087F0804087FE8000000003EF80208020802080000 +D1F7:000000087F0840087F0840087F0804087FE8000000001F080108011401620000 +D1F8:000000087F0840087F0840087F0804087FE8000008000800080008000FF80000 +D1F9:000000087F0840087F0840087F0804087FE80000000010F8101010301ECC0000 +D1FA:000000087F0840087F0840087F0804087FE800000808087F081C08220F9C0000 +D1FB:000000087F0840087F0840087F0804087FE8000003F802000200020003F80000 +D1FC:000000087F0840087F0840087F0804087FE8000007F8000807F8040007F80000 +D1FD:000000087F0840087F0840087F0804087FE800003EF802083E0820083E080000 +D1FE:000000087F0840087F0840087F0804087FE800003EF802883E8820883EF80000 +D1FF:000000087F0840087F0840087F0804087FE800003E8802883EF820883EF80000 +D200:000000087F0840087F0840087F0804087FE800001F0801081F0810141F620000 +D201:000000087F0840087F0840087F0804087FE800003EF802803EF820803EF80000 +D202:000000087F0840087F0840087F0804087FE800003EFC02483E4820483EFC0000 +D203:000000087F0840087F0840087F0804087FE800001F08017F1F1C10221F1C0000 +D204:000000087F0840087F0840087F0804087FE8000003F802080208020803F80000 +D205:000000087F0840087F0840087F0804087FE800000208020803F8020803F80000 +D206:000000087F0840087F0840087F0804087FE80000110811081F0811141F620000 +D207:000000087F0840087F0840087F0804087FE80000001000100010006801840000 +D208:000000087F0840087F0840087F0804087FE800000048004800A8011406620000 +D209:000000087F0840087F0840087F0804087FE80000000003F00408040803F00000 +D20A:000000087F0840087F0840087F0804087FE8000003F80020002000D003080000 +D20B:000000087F0840087F0840087F0804087FE80000004003F8004000A003180000 +D20C:000000087F0840087F0840087F0804087FE8000003F8000803F8000800080000 +D20D:000000087F0840087F0840087F0804087FE8000003F8020003F8020003F80000 +D20E:000000087F0840087F0840087F0804087FE8000000000FF8022002200FF80000 +D20F:000000087F0840087F0840087F0804087FE8000000800FF803E0041003E00000 +D210:00003FF8200020003FF8200020003FF8000004400440044004407FFC00000000 +D211:00001FF010001FF010001FF0044004407FFC00001FF000100010001000100000 +D212:00001FF010001FF010001FF0044004407FFC000000003EF80208020802080000 +D213:00001FF010001FF010001FF0044004407FFC000000001E100210022802C40000 +D214:00001FF010001FF010001FF0044004407FFC000000001000100010001FF00000 +D215:00001FF010001FF010001FF0044004407FFC0000000020F8201020303ECC0000 +D216:00001FF010001FF010001FF0044004407FFC0000202021FC207020883E700000 +D217:00001FF010001FF010001FF0044004407FFC00001FF01000100010001FF00000 +D218:00001FF010001FF010001FF0044004407FFC00001FF000101FF010001FF00000 +D219:00001FF010001FF010001FF0044004407FFC00003EF802083E0820083E080000 +D21A:00001FF010001FF010001FF0044004407FFC00003EF802883E8820883EF80000 +D21B:00001FF010001FF010001FF0044004407FFC00003E8802883EF820883EF80000 +D21C:00001FF010001FF010001FF0044004407FFC00003E1002103E1020283EC40000 +D21D:00001FF010001FF010001FF0044004407FFC00003EF802803EF820803EF80000 +D21E:00001FF010001FF010001FF0044004407FFC00003EFC02483E4820483EFC0000 +D21F:00001FF010001FF010001FF0044004407FFC00003E2003FC3E7020883E700000 +D220:00001FF010001FF010001FF0044004407FFC00001FF01010101010101FF00000 +D221:00001FF010001FF010001FF0044004407FFC0000101010101FF010101FF00000 +D222:00001FF010001FF010001FF0044004407FFC0000222022203E2022503E880000 +D223:00001FF010001FF010001FF0044004407FFC000000000100010002800C400000 +D224:00001FF010001FF010001FF0044004407FFC00000000024002400DA033100000 +D225:00001FF010001FF010001FF0044004407FFC0000000007C00820082007C00000 +D226:00001FF010001FF010001FF0044004407FFC0000000007E00080014006200000 +D227:00001FF010001FF010001FF0044004407FFC0000008007E00080014006200000 +D228:00001FF010001FF010001FF0044004407FFC00001FF000101FF0001000100000 +D229:00001FF010001FF010001FF0044004407FFC00001FF010001FF010001FF00000 +D22A:00001FF010001FF010001FF0044004407FFC000000001FF0044004401FF00000 +D22B:00001FF010001FF010001FF0044004407FFC000001001FF007C0082007C00000 +D22C:000000003FF8200020003FF8200020003FF800003FF801000100010001000000 +D22D:00001FF010001FF010001FF000007FFC010001001FF000100010001000100000 +D22E:00001FF010001FF010001FF000007FFC0100010000003EF80208020802080000 +D22F:00001FF010001FF010001FF000007FFC0100010000001E100210022802C40000 +D230:00001FF010001FF010001FF0000000007FFC010001001100100010001FF00000 +D231:00001FF010001FF010001FF000007FFC01000100000020F8201020303ECC0000 +D232:00001FF010001FF010001FF000007FFC01000100202021FC207020883E700000 +D233:00001FF010001FF010001FF000007FFC010001001FF01000100010001FF00000 +D234:00001FF010001FF010001FF000007FFC010001001FF000101FF010001FF00000 +D235:00001FF010001FF010001FF000007FFC010001003EF802083E0820083E080000 +D236:00001FF010001FF010001FF000007FFC010001003EF802883E8820883EF80000 +D237:00001FF010001FF010001FF000007FFC010001003E8802883EF820883EF80000 +D238:00001FF010001FF010001FF000007FFC010001003E1002103E1020283EC40000 +D239:00001FF010001FF010001FF000007FFC010001003EF802803EF820803EF80000 +D23A:00001FF010001FF010001FF000007FFC010001003EFC02483E4820483EFC0000 +D23B:00001FF010001FF010001FF000007FFC010001003E2003FC3E7020883E700000 +D23C:00001FF010001FF010001FF000007FFC010001001FF01010101010101FF00000 +D23D:00001FF010001FF010001FF000007FFC01000100101010101FF010101FF00000 +D23E:00001FF010001FF010001FF000007FFC01000100222022203E2022503E880000 +D23F:00001FF010001FF010001FF000007FFC0100010000000100010002800C400000 +D240:00001FF010001FF010001FF000007FFC010001000000024002400DA033100000 +D241:00001FF010001FF010001FF000007FFC01000100000007C00820082007C00000 +D242:00001FF010001FF010001FF000007FFC01000100000007E00080014006200000 +D243:00001FF010001FF010001FF000007FFC01000100008007E00080014006200000 +D244:00001FF010001FF010001FF000007FFC010001001FF000101FF0001000100000 +D245:00001FF010001FF010001FF000007FFC010001001FF010001FF010001FF00000 +D246:00001FF010001FF010001FF000007FFC0100010000001FF0044004401FF00000 +D247:00001FF010001FF010001FF000007FFC0100010001001FF007C0082007C00000 +D248:000000083FC8200820083FC8200820083FC800087FE8040804F8040804080000 +D249:7F8840087F8840087F8800087FE8027802080000000007F80008000800080000 +D24A:7F8840087F8840087F8800087FE802780208000000003EF80208020802080000 +D24B:7F8840087F8840087F8800087FE802780208000000001F080108011401620000 +D24C:7F8840087F8840087F88000800087FE80278020802081000100010001FF80000 +D24D:7F8840087F8840087F8800087FE8027802080000000020F8201020303ECC0000 +D24E:7F8840087F8840087F8800087FE8027802080000202021FC207020883E700000 +D24F:7F8840087F8840087F8800087FE802780208000003F802000200020003F80000 +D250:7F8840087F8840087F8800087FE802780208000007F8000807F8040007F80000 +D251:7F8840087F8840087F8800087FE80278020800003EF802083E0820083E080000 +D252:7F8840087F8840087F8800087FE80278020800003EF802883E8820883EF80000 +D253:7F8840087F8840087F8800087FE80278020800003E8802883EF820883EF80000 +D254:7F8840087F8840087F8800087FE80278020800000F8800880F8808140FA20000 +D255:7F8840087F8840087F8800087FE80278020800003EF802803EF820803EF80000 +D256:7F8840087F8840087F8800087FE80278020800003EFC02483E4820483EFC0000 +D257:7F8840087F8840087F8800087FE80278020800003E1002FE3E3820443E380000 +D258:7F8840087F8840087F8800087FE802780208000003F802080208020803F80000 +D259:7F8840087F8840087F8800087FE80278020800000208020803F8020803F80000 +D25A:7F8840087F8840087F8800087FE8027802080000210821083F0821143F620000 +D25B:7F8840087F8840087F8800087FE8027802080000001000100010006801840000 +D25C:7F8840087F8840087F8800087FE80278020800000048004800A8011406620000 +D25D:7F8840087F8840087F8800087FE8027802080000000003F00408040803F00000 +D25E:7F8840087F8840087F8800087FE802780208000003F80020002000D003080000 +D25F:7F8840087F8840087F8800087FE8027802080000004003F8004000A003180000 +D260:7F8840087F8840087F8800087FE802780208000003F8000803F8000800080000 +D261:7F8840087F8840087F8800087FE802780208000003F8020003F8020003F80000 +D262:7F8840087F8840087F8800087FE802780208000000000FF8022002200FF80000 +D263:7F8840087F8840087F8800087FE802780208000000800FF803E0041003E00000 +D264:0000000A3FCA200A200A3FCA200A200A3FCA000A7FEA040A047A040A040A0000 +D265:7FA840287FA840287FA800287FA805E804280000000007F80008000800080000 +D266:7FA840287FA840287FA800287FA805E80428000000003EF80208020802080000 +D267:7FA840287FA840287FA800287FA805E80428000000001F080108011401620000 +D268:7FA840287FA840287FA8002800287FA8042805E804281428100010001FF80000 +D269:7FA840287FA840287FA800287FA805E804280000000020F8201020303ECC0000 +D26A:7FA840287FA840287FA800287FA805E804280000202021FC207020883E700000 +D26B:7FA840287FA840287FA800287FA805E80428000003F802000200020003F80000 +D26C:7FA840287FA840287FA800287FA805E80428000007F8000807F8040007F80000 +D26D:7FA840287FA840287FA800287FA805E8042800003EF802083E0820083E080000 +D26E:7FA840287FA840287FA800287FA805E8042800003EF802883E8820883EF80000 +D26F:7FA840287FA840287FA800287FA805E8042800003E8802883EF820883EF80000 +D270:7FA840287FA840287FA800287FA805E8042800000F8800880F8808140FA20000 +D271:7FA840287FA840287FA800287FA805E8042800003EF802803EF820803EF80000 +D272:7FA840287FA840287FA800287FA805E8042800003EFC02483E4820483EFC0000 +D273:7FA840287FA840287FA800287FA805E8042800003E1002FE3E3820443E380000 +D274:7FA840287FA840287FA800287FA805E80428000003F802080208020803F80000 +D275:7FA840287FA840287FA800287FA805E8042800000208020803F8020803F80000 +D276:7FA840287FA840287FA800287FA805E804280000210821083F0821143F620000 +D277:7FA840287FA840287FA800287FA805E804280000001000100010006801840000 +D278:7FA840287FA840287FA800287FA805E8042800000048004800A8011406620000 +D279:7FA840287FA840287FA800287FA805E804280000000003F00408040803F00000 +D27A:7FA840287FA840287FA800287FA805E80428000003F80020002000D003080000 +D27B:7FA840287FA840287FA800287FA805E804280000004003F8004000A003180000 +D27C:7FA840287FA840287FA800287FA805E80428000003F8000803F8000800080000 +D27D:7FA840287FA840287FA800287FA805E80428000003F8020003F8020003F80000 +D27E:7FA840287FA840287FA800287FA805E80428000000000FF8022002200FF80000 +D27F:7FA840287FA840287FA800287FA805E80428000000800FF803E0041003E00000 +D280:000000083FC8200820083FC8200820083FC800087FE804080408040804080000 +D281:7F8840087F8840087F8800087FE8020802000000000007F80008000800080000 +D282:7F8840087F8840087F8800087FE802080200000000003EF80208020802080000 +D283:7F8840087F8840087F8800087FE802080200000000001F080108011401620000 +D284:7F8840087F8840087F88000800087FE80208020802081008100010001FF80000 +D285:7F8840087F8840087F8800087FE8020802000000000020F8201020303ECC0000 +D286:7F8840087F8840087F8800087FE8020802000000202021FC207020883E700000 +D287:7F8840087F8840087F8800087FE802080200000003F802000200020003F80000 +D288:7F8840087F8840087F8800087FE802080200000007F8000807F8040007F80000 +D289:7F8840087F8840087F8800087FE80208020000003EF802083E0820083E080000 +D28A:7F8840087F8840087F8800087FE80208020000003EF802883E8820883EF80000 +D28B:7F8840087F8840087F8800087FE80208020000003E8802883EF820883EF80000 +D28C:7F8840087F8840087F8800087FE80208020000000F8800880F8808140FA20000 +D28D:7F8840087F8840087F8800087FE80208020000003EF802803EF820803EF80000 +D28E:7F8840087F8840087F8800087FE80208020000003EFC02483E4820483EFC0000 +D28F:7F8840087F8840087F8800087FE80208020000003E1002FE3E3820443E380000 +D290:7F8840087F8840087F8800087FE802080200000003F802080208020803F80000 +D291:7F8840087F8840087F8800087FE80208020000000208020803F8020803F80000 +D292:7F8840087F8840087F8800087FE8020802000000210821083F0821143F620000 +D293:7F8840087F8840087F8800087FE8020802000000001000100010006801840000 +D294:7F8840087F8840087F8800087FE80208020000000048004800A8011406620000 +D295:7F8840087F8840087F8800087FE8020802000000000003F00408040803F00000 +D296:7F8840087F8840087F8800087FE802080200000003F80020002000D003080000 +D297:7F8840087F8840087F8800087FE8020802000000004003F8004000A003180000 +D298:7F8840087F8840087F8800087FE802080200000003F8000803F8000800080000 +D299:7F8840087F8840087F8800087FE802080200000003F8020003F8020003F80000 +D29A:7F8840087F8840087F8800087FE802080200000000000FF8022002200FF80000 +D29B:7F8840087F8840087F8800087FE802080200000000800FF803E0041003E00000 +D29C:000000003FF8200020003FF8200020003FF800007FFC04400440044004400000 +D29D:00001FF010001FF010001FF000007FFC044004401FF000100010001000100000 +D29E:00001FF010001FF010001FF000007FFC0440044000003EF80208020802080000 +D29F:00001FF010001FF010001FF000007FFC0440044000001E100210022802C40000 +D2A0:00001FF010001FF010001FF0000000007FFC044004401440100010001FF00000 +D2A1:00001FF010001FF010001FF000007FFC04400440000020F8201020303ECC0000 +D2A2:00001FF010001FF010001FF000007FFC04400440202021FC207020883E700000 +D2A3:00001FF010001FF010001FF000007FFC044004401FF01000100010001FF00000 +D2A4:00001FF010001FF010001FF000007FFC044004401FF000101FF010001FF00000 +D2A5:00001FF010001FF010001FF000007FFC044004403EF802083E0820083E080000 +D2A6:00001FF010001FF010001FF000007FFC044004403EF802883E8820883EF80000 +D2A7:00001FF010001FF010001FF000007FFC044004403E8802883EF820883EF80000 +D2A8:00001FF010001FF010001FF000007FFC044004403E1002103E1020283EC40000 +D2A9:00001FF010001FF010001FF000007FFC044004403EF802803EF820803EF80000 +D2AA:00001FF010001FF010001FF000007FFC044004403EFC02483E4820483EFC0000 +D2AB:00001FF010001FF010001FF000007FFC044004403E2003FC3E7020883E700000 +D2AC:00001FF010001FF010001FF000007FFC044004401FF01010101010101FF00000 +D2AD:00001FF010001FF010001FF000007FFC04400440101010101FF010101FF00000 +D2AE:00001FF010001FF010001FF000007FFC04400440222022203E2022503E880000 +D2AF:00001FF010001FF010001FF000007FFC0440044000000100010002800C400000 +D2B0:00001FF010001FF010001FF000007FFC044004400000024002400DA033100000 +D2B1:00001FF010001FF010001FF000007FFC04400440000007C00820082007C00000 +D2B2:00001FF010001FF010001FF000007FFC04400440000007E00080014006200000 +D2B3:00001FF010001FF010001FF000007FFC04400440008007E00080014006200000 +D2B4:00001FF010001FF010001FF000007FFC044004401FF000101FF0001000100000 +D2B5:00001FF010001FF010001FF000007FFC044004401FF010001FF010001FF00000 +D2B6:00001FF010001FF010001FF000007FFC0440044000001FF0044004401FF00000 +D2B7:00001FF010001FF010001FF000007FFC0440044001001FF007C0082007C00000 +D2B8:00003FF8200020003FF8200020003FF80000000000007FFC0000000000000000 +D2B9:00001FF010001FF010001FF0000000007FFC00001FF000100010001000100000 +D2BA:00001FF010001FF010001FF0000000007FFC000000003EF80208020802080000 +D2BB:00001FF010001FF010001FF0000000007FFC000000001E100210022802C40000 +D2BC:00001FF010001FF010001FF0000000007FFC000000001000100010001FF00000 +D2BD:00001FF010001FF010001FF0000000007FFC0000000020F8201020303ECC0000 +D2BE:00001FF010001FF010001FF0000000007FFC0000202021FC207020883E700000 +D2BF:00001FF010001FF010001FF0000000007FFC00001FF01000100010001FF00000 +D2C0:00001FF010001FF010001FF0000000007FFC00001FF000101FF010001FF00000 +D2C1:00001FF010001FF010001FF0000000007FFC00003EF802083E0820083E080000 +D2C2:00001FF010001FF010001FF0000000007FFC00003EF802883E8820883EF80000 +D2C3:00001FF010001FF010001FF0000000007FFC00003E8802883EF820883EF80000 +D2C4:00001FF010001FF010001FF0000000007FFC00003E1002103E1020283EC40000 +D2C5:00001FF010001FF010001FF0000000007FFC00003EF802803EF820803EF80000 +D2C6:00001FF010001FF010001FF0000000007FFC00003EFC02483E4820483EFC0000 +D2C7:00001FF010001FF010001FF0000000007FFC00003E2003FC3E7020883E700000 +D2C8:00001FF010001FF010001FF0000000007FFC00001FF01010101010101FF00000 +D2C9:00001FF010001FF010001FF0000000007FFC0000101010101FF010101FF00000 +D2CA:00001FF010001FF010001FF0000000007FFC0000222022203E2022503E880000 +D2CB:00001FF010001FF010001FF0000000007FFC000000000100010002800C400000 +D2CC:00001FF010001FF010001FF0000000007FFC00000000024002400DA033100000 +D2CD:00001FF010001FF010001FF0000000007FFC0000000007C00820082007C00000 +D2CE:00001FF010001FF010001FF0000000007FFC0000000007E00080014006200000 +D2CF:00001FF010001FF010001FF0000000007FFC0000008007E00080014006200000 +D2D0:00001FF010001FF010001FF0000000007FFC00001FF000101FF0001000100000 +D2D1:00001FF010001FF010001FF0000000007FFC00001FF010001FF010001FF00000 +D2D2:00001FF010001FF010001FF0000000007FFC000000001FF0044004401FF00000 +D2D3:00001FF010001FF010001FF0000000007FFC000001001FF007C0082007C00000 +D2D4:000000083FC8200820083FC8200820083FC8000800087FE80008000800080000 +D2D5:000000087F0840087F0840087F0800087FE8000007F800080008000800080000 +D2D6:000000087F0840087F0840087F0800087FE8000000003EF80208020802080000 +D2D7:000000087F0840087F0840087F0800087FE8000000001F080108011401620000 +D2D8:000000087F0840087F0840087F0800087FE8000008000800080008000FF80000 +D2D9:000000087F0840087F0840087F0800087FE80000000010F8101010301ECC0000 +D2DA:000000087F0840087F0840087F0800087FE800000808087F081C08220F9C0000 +D2DB:000000087F0840087F0840087F0800087FE8000003F802000200020003F80000 +D2DC:000000087F0840087F0840087F0800087FE8000007F8000807F8040007F80000 +D2DD:000000087F0840087F0840087F0800087FE800003EF802083E0820083E080000 +D2DE:000000087F0840087F0840087F0800087FE800003EF802883E8820883EF80000 +D2DF:000000087F0840087F0840087F0800087FE800003E8802883EF820883EF80000 +D2E0:000000087F0840087F0840087F0800087FE800001F0801081F0810141F620000 +D2E1:000000087F0840087F0840087F0800087FE800003EF802803EF820803EF80000 +D2E2:000000087F0840087F0840087F0800087FE800003EFC02483E4820483EFC0000 +D2E3:000000087F0840087F0840087F0800087FE800001F08017F1F1C10221F1C0000 +D2E4:000000087F0840087F0840087F0800087FE8000003F802080208020803F80000 +D2E5:000000087F0840087F0840087F0800087FE800000208020803F8020803F80000 +D2E6:000000087F0840087F0840087F0800087FE80000110811081F0811141F620000 +D2E7:000000087F0840087F0840087F0800087FE80000001000100010006801840000 +D2E8:000000087F0840087F0840087F0800087FE800000048004800A8011406620000 +D2E9:000000087F0840087F0840087F0800087FE80000000003F00408040803F00000 +D2EA:000000087F0840087F0840087F0800087FE8000003F80020002000D003080000 +D2EB:000000087F0840087F0840087F0800087FE80000004003F8004000A003180000 +D2EC:000000087F0840087F0840087F0800087FE8000003F8000803F8000800080000 +D2ED:000000087F0840087F0840087F0800087FE8000003F8020003F8020003F80000 +D2EE:000000087F0840087F0840087F0800087FE8000000000FF8022002200FF80000 +D2EF:000000087F0840087F0840087F0800087FE8000000800FF803E0041003E00000 +D2F0:00000000000800083F88200820083F88200820083F8800080008000800080000 +D2F1:0000000800087E0840087E0840087E0800080000000007F80008000800080000 +D2F2:0000000800087E0840087E0840087E080008000000003EF80208020802080000 +D2F3:0000000800087E0840087E0840087E080008000000001F080108011401620000 +D2F4:0000000800087E0840087E0840087E080008000800001000100010001FF80000 +D2F5:0000000800087E0840087E0840087E0800080000000020F8201020303ECC0000 +D2F6:0000000800087E0840087E0840087E0800080000202021FC207020883E700000 +D2F7:0000000800087E0840087E0840087E080008000003F802000200020003F80000 +D2F8:0000000800087E0840087E0840087E080008000007F8000807F8040007F80000 +D2F9:0000000800087E0840087E0840087E08000800003EF802083E0820083E080000 +D2FA:0000000800087E0840087E0840087E08000800003EF802883E8820883EF80000 +D2FB:0000000800087E0840087E0840087E08000800003E8802883EF820883EF80000 +D2FC:0000000800087E0840087E0840087E08000800000F8800880F8808140FA20000 +D2FD:0000000800087E0840087E0840087E08000800003EF802803EF820803EF80000 +D2FE:0000000800087E0840087E0840087E08000800003EFC02483E4820483EFC0000 +D2FF:0000000800087E0840087E0840087E08000800003E1002FE3E3820443E380000 +D300:0000000800087E0840087E0840087E080008000003F802080208020803F80000 +D301:0000000800087E0840087E0840087E08000800000208020803F8020803F80000 +D302:0000000800087E0840087E0840087E0800080000210821083F0821143F620000 +D303:0000000800087E0840087E0840087E0800080000001000100010006801840000 +D304:0000000800087E0840087E0840087E08000800000048004800A8011406620000 +D305:0000000800087E0840087E0840087E0800080000000003F00408040803F00000 +D306:0000000800087E0840087E0840087E080008000003F80020002000D003080000 +D307:0000000800087E0840087E0840087E0800080000004003F8004000A003180000 +D308:0000000800087E0840087E0840087E080008000003F8000803F8000800080000 +D309:0000000800087E0840087E0840087E080008000003F8020003F8020003F80000 +D30A:0000000800087E0840087E0840087E080008000000000FF8022002200FF80000 +D30B:0000000800087E0840087E0840087E080008000000800FF803E0041003E00000 +D30C:00000000001000107FD011101110111E111011107FD000100010001000100000 +D30D:0000000800087F881208120E12087F880008000007F800080008000800080000 +D30E:0000000800087F881208120E12087F880008000000003EF80208020802080000 +D30F:0000000800087F881208120E12087F880008000000001F080108011401620000 +D310:0000000800087F881208120E12087F880008000808000800080008000FF80000 +D311:0000000800087F881208120E12087F8800080000000010F8101010301ECC0000 +D312:0000000800087F881208120E12087F88000800000808087F081C08220F9C0000 +D313:0000000800087F881208120E12087F880008000003F802000200020003F80000 +D314:0000000800087F881208120E12087F880008000007F8000807F8040007F80000 +D315:0000000800087F881208120E12087F88000800003EF802083E0820083E080000 +D316:0000000800087F881208120E12087F88000800003EF802883E8820883EF80000 +D317:0000000800087F881208120E12087F88000800003E8802883EF820883EF80000 +D318:0000000800087F881208120E12087F88000800001F0801081F0810141F620000 +D319:0000000800087F881208120E12087F88000800003EF802803EF820803EF80000 +D31A:0000000800087F881208120E12087F88000800003EFC02483E4820483EFC0000 +D31B:0000000800087F881208120E12087F88000800001F08017F1F1C10221F1C0000 +D31C:0000000800087F881208120E12087F880008000003F802080208020803F80000 +D31D:0000000800087F881208120E12087F88000800000208020803F8020803F80000 +D31E:0000000800087F881208120E12087F8800080000110811081F0811141F620000 +D31F:0000000800087F881208120E12087F8800080000001000100010006801840000 +D320:0000000800087F881208120E12087F88000800000048004800A8011406620000 +D321:0000000800087F881208120E12087F8800080000000003F00408040803F00000 +D322:0000000800087F881208120E12087F880008000003F80020002000D003080000 +D323:0000000800087F881208120E12087F8800080000004003F8004000A003180000 +D324:0000000800087F881208120E12087F880008000003F8000803F8000800080000 +D325:0000000800087F881208120E12087F880008000003F8020003F8020003F80000 +D326:0000000800087F881208120E12087F880008000000000FF8022002200FF80000 +D327:0000000800087F881208120E12087F880008000000800FF803E0041003E00000 +D328:00000000001200127FD211121112111E111211127FD200120012001200120000 +D329:0000002800287FA81228123812287FA80028000007F800080008000800080000 +D32A:0000002800287FA81228123812287FA80028000000003EF80208020802080000 +D32B:0000002800287FA81228123812287FA80028000000003E100210022802C40000 +D32C:0000002800287FA81228123812287FA80028002808000800080008000FF80000 +D32D:0000002800287FA81228123812287FA800280000000020F8201020303ECC0000 +D32E:0000002800287FA81228123812287FA800280000202021FC207020883E700000 +D32F:0000002800287FA81228123812287FA80028000003F802000200020003F80000 +D330:0000002800287FA81228123812287FA80028000007F8000807F8040007F80000 +D331:0000002800287FA81228123812287FA8002800003EF802083E0820083E080000 +D332:0000002800287FA81228123812287FA8002800003EF802883E8820883EF80000 +D333:0000002800287FA81228123812287FA8002800003E8802883EF820883EF80000 +D334:0000002800287FA81228123812287FA8002800001F0801081F0810141F620000 +D335:0000002800287FA81228123812287FA8002800003EF802803EF820803EF80000 +D336:0000002800287FA81228123812287FA8002800003EFC02483E4820483EFC0000 +D337:0000002800287FA81228123812287FA8002800003E1002FE3E3820443E380000 +D338:0000002800287FA81228123812287FA80028000003F802080208020803F80000 +D339:0000002800287FA81228123812287FA8002800000208020803F8020803F80000 +D33A:0000002800287FA81228123812287FA800280000110811081F0811141F620000 +D33B:0000002800287FA81228123812287FA800280000000800080008003400C20000 +D33C:0000002800287FA81228123812287FA8002800000048004800A8011406620000 +D33D:0000002800287FA81228123812287FA800280000000001F00208020801F00000 +D33E:0000002800287FA81228123812287FA80028000003F80020002000D003080000 +D33F:0000002800287FA81228123812287FA800280000004003F8004000A003180000 +D340:0000002800287FA81228123812287FA80028000003F8000803F8000800080000 +D341:0000002800287FA81228123812287FA80028000003F8020003F8020003F80000 +D342:0000002800287FA81228123812287FA80028000000000FF8022002200FF80000 +D343:0000002800287FA81228123812287FA80028000000800FF803E0041003E00000 +D344:00000000001000107FD01110111E11101110111E7FD000100010001000100000 +D345:0000000800087F88120E1208120E7F880008000007F800080008000800080000 +D346:0000000800087F88120E1208120E7F880008000000003EF80208020802080000 +D347:0000000800087F88120E1208120E7F880008000000001F080108011401620000 +D348:0000000800087F88120E1208120E7F880008000008000800080008000FF80000 +D349:0000000800087F88120E1208120E7F8800080000000010F8101010301ECC0000 +D34A:0000000800087F88120E1208120E7F88000800000808087F081C08220F9C0000 +D34B:0000000800087F88120E1208120E7F880008000003F802000200020003F80000 +D34C:0000000800087F88120E1208120E7F880008000007F8000807F8040007F80000 +D34D:0000000800087F88120E1208120E7F88000800003EF802083E0820083E080000 +D34E:0000000800087F88120E1208120E7F88000800003EF802883E8820883EF80000 +D34F:0000000800087F88120E1208120E7F88000800003E8802883EF820883EF80000 +D350:0000000800087F88120E1208120E7F88000800001F0801081F0810141F620000 +D351:0000000800087F88120E1208120E7F88000800003EF802803EF820803EF80000 +D352:0000000800087F88120E1208120E7F88000800003EFC02483E4820483EFC0000 +D353:0000000800087F88120E1208120E7F88000800001F08017F1F1C10221F1C0000 +D354:0000000800087F88120E1208120E7F880008000003F802080208020803F80000 +D355:0000000800087F88120E1208120E7F88000800000208020803F8020803F80000 +D356:0000000800087F88120E1208120E7F8800080000110811081F0811141F620000 +D357:0000000800087F88120E1208120E7F8800080000001000100010006801840000 +D358:0000000800087F88120E1208120E7F88000800000048004800A8011406620000 +D359:0000000800087F88120E1208120E7F8800080000000003F00408040803F00000 +D35A:0000000800087F88120E1208120E7F880008000003F80020002000D003080000 +D35B:0000000800087F88120E1208120E7F8800080000004003F8004000A003180000 +D35C:0000000800087F88120E1208120E7F880008000003F8000803F8000800080000 +D35D:0000000800087F88120E1208120E7F880008000003F8020003F8020003F80000 +D35E:0000000800087F88120E1208120E7F880008000000000FF8022002200FF80000 +D35F:0000000800087F88120E1208120E7F880008000000800FF803E0041003E00000 +D360:00000000001200127FD21112111E11121112111E7FD200120012001200120000 +D361:0000002800287FA81238122812387FA80028000007F800080008000800080000 +D362:0000002800287FA81238122812387FA80028000000003EF80208020802080000 +D363:0000002800287FA81238122812387FA80028000000003E100210022802C40000 +D364:0000002800287FA81238122812387FA80028002808000800080008000FF80000 +D365:0000002800287FA81238122812387FA800280000000020F8201020303ECC0000 +D366:0000002800287FA81238122812387FA800280000202021FC207020883E700000 +D367:0000002800287FA81238122812387FA80028000003F802000200020003F80000 +D368:0000002800287FA81238122812387FA80028000007F8000807F8040007F80000 +D369:0000002800287FA81238122812387FA8002800003EF802083E0820083E080000 +D36A:0000002800287FA81238122812387FA8002800003EF802883E8820883EF80000 +D36B:0000002800287FA81238122812387FA8002800003E8802883EF820883EF80000 +D36C:0000002800287FA81238122812387FA8002800001F0801081F0810141F620000 +D36D:0000002800287FA81238122812387FA8002800003EF802803EF820803EF80000 +D36E:0000002800287FA81238122812387FA8002800003EFC02483E4820483EFC0000 +D36F:0000002800287FA81238122812387FA8002800003E1002FE3E3820443E380000 +D370:0000002800287FA81238122812387FA80028000003F802080208020803F80000 +D371:0000002800287FA81238122812387FA8002800000208020803F8020803F80000 +D372:0000002800287FA81238122812387FA800280000110811081F0811141F620000 +D373:0000002800287FA81238122812387FA800280000000800080008003400C20000 +D374:0000002800287FA81238122812387FA8002800000048004800A8011406620000 +D375:0000002800287FA81238122812387FA800280000000001F00208020801F00000 +D376:0000002800287FA81238122812387FA80028000003F80020002000D003080000 +D377:0000002800287FA81238122812387FA800280000004003F8004000A003180000 +D378:0000002800287FA81238122812387FA80028000003F8000803F8000800080000 +D379:0000002800287FA81238122812387FA80028000003F8020003F8020003F80000 +D37A:0000002800287FA81238122812387FA80028000000000FF8022002200FF80000 +D37B:0000002800287FA81238122812387FA80028000000800FF803E0041003E00000 +D37C:00000000000200027FC211021102111E110211027FC200020002000200020000 +D37D:0000000800087F881208123812087F8800080000000007F80008000800080000 +D37E:0000000800087F881208123812087F880008000000003EF80208020802080000 +D37F:0000000800087F881208123812087F880008000000001F080108011401620000 +D380:0000000800087F881208123812087F880008000000001000100010001FF80000 +D381:0000000800087F881208123812087F8800080000000020F8201020303ECC0000 +D382:0000000800087F881208123812087F8800080000202021FC207020883E700000 +D383:0000000800087F881208123812087F880008000003F802000200020003F80000 +D384:0000000800087F881208123812087F880008000007F8000807F8040007F80000 +D385:0000000800087F881208123812087F88000800003EF802083E0820083E080000 +D386:0000000800087F881208123812087F88000800003EF802883E8820883EF80000 +D387:0000000800087F881208123812087F88000800003E8802883EF820883EF80000 +D388:0000000800087F881208123812087F88000800000F8800880F8808140FA20000 +D389:0000000800087F881208123812087F88000800003EF802803EF820803EF80000 +D38A:0000000800087F881208123812087F88000800003EFC02483E4820483EFC0000 +D38B:0000000800087F881208123812087F88000800003E1002FE3E3820443E380000 +D38C:0000000800087F881208123812087F880008000003F802080208020803F80000 +D38D:0000000800087F881208123812087F88000800000208020803F8020803F80000 +D38E:0000000800087F881208123812087F8800080000210821083F0821143F620000 +D38F:0000000800087F881208123812087F8800080000001000100010006801840000 +D390:0000000800087F881208123812087F88000800000048004800A8011406620000 +D391:0000000800087F881208123812087F8800080000000003F00408040803F00000 +D392:0000000800087F881208123812087F880008000003F80020002000D003080000 +D393:0000000800087F881208123812087F8800080000004003F8004000A003180000 +D394:0000000800087F881208123812087F880008000003F8000803F8000800080000 +D395:0000000800087F881208123812087F880008000003F8020003F8020003F80000 +D396:0000000800087F881208123812087F880008000000000FF8022002200FF80000 +D397:0000000800087F881208123812087F880008000000800FF803E0041003E00000 +D398:00000000000A000A7FCA110A110A113A110A110A7FCA000A000A000A000A0000 +D399:0000002800287FA8122812E812287FA80028000007F800080008000800080000 +D39A:0000002800287FA8122812E812287FA80028000000003EF80208020802080000 +D39B:0000002800287FA8122812E812287FA80028000000003E100210022802C40000 +D39C:0000002800287FA8122812E812287FA80028000008000800080008000FF80000 +D39D:0000002800287FA8122812E812287FA800280000000020F8201020303ECC0000 +D39E:0000002800287FA8122812E812287FA800280000202021FC207020883E700000 +D39F:0000002800287FA8122812E812287FA80028000003F802000200020003F80000 +D3A0:0000002800287FA8122812E812287FA80028000007F8000807F8040007F80000 +D3A1:0000002800287FA8122812E812287FA8002800003EF802083E0820083E080000 +D3A2:0000002800287FA8122812E812287FA8002800003EF802883E8820883EF80000 +D3A3:0000002800287FA8122812E812287FA8002800003E8802883EF820883EF80000 +D3A4:0000002800287FA8122812E812287FA8002800001F0801081F0810141F620000 +D3A5:0000002800287FA8122812E812287FA8002800003EF802803EF820803EF80000 +D3A6:0000002800287FA8122812E812287FA8002800003EFC02483E4820483EFC0000 +D3A7:0000002800287FA8122812E812287FA8002800003E1002FE3E3820443E380000 +D3A8:0000002800287FA8122812E812287FA80028000003F802080208020803F80000 +D3A9:0000002800287FA8122812E812287FA8002800000208020803F8020803F80000 +D3AA:0000002800287FA8122812E812287FA800280000110811081F0811141F620000 +D3AB:0000002800287FA8122812E812287FA800280000000800080008003400C20000 +D3AC:0000002800287FA8122812E812287FA8002800000048004800A8011406620000 +D3AD:0000002800287FA8122812E812287FA800280000000001F00208020801F00000 +D3AE:0000002800287FA8122812E812287FA80028000003F80020002000D003080000 +D3AF:0000002800287FA8122812E812287FA800280000004003F8004000A003180000 +D3B0:0000002800287FA8122812E812287FA80028000003F8000803F8000800080000 +D3B1:0000002800287FA8122812E812287FA80028000003F8020003F8020003F80000 +D3B2:0000002800287FA8122812E812287FA80028000000000FF8022002200FF80000 +D3B3:0000002800287FA8122812E812287FA80028000000800FF803E0041003E00000 +D3B4:00000000000200027FC21102111E11021102111E7FC200020002000200020000 +D3B5:0000000800087F881238120812387F8800080000000007F80008000800080000 +D3B6:0000000800087F881238120812387F880008000000003EF80208020802080000 +D3B7:0000000800087F881238120812387F880008000000001F080108011401620000 +D3B8:0000000800087F881238120812387F880008000800001000100010001FF80000 +D3B9:0000000800087F881238120812387F8800080000000020F8201020303ECC0000 +D3BA:0000000800087F881238120812387F8800080000202021FC207020883E700000 +D3BB:0000000800087F881238120812387F880008000003F802000200020003F80000 +D3BC:0000000800087F881238120812387F880008000007F8000807F8040007F80000 +D3BD:0000000800087F881238120812387F88000800003EF802083E0820083E080000 +D3BE:0000000800087F881238120812387F88000800003EF802883E8820883EF80000 +D3BF:0000000800087F881238120812387F88000800003E8802883EF820883EF80000 +D3C0:0000000800087F881238120812387F88000800000F8800880F8808140FA20000 +D3C1:0000000800087F881238120812387F88000800003EF802803EF820803EF80000 +D3C2:0000000800087F881238120812387F88000800003EFC02483E4820483EFC0000 +D3C3:0000000800087F881238120812387F88000800003E1002FE3E3820443E380000 +D3C4:0000000800087F881238120812387F880008000003F802080208020803F80000 +D3C5:0000000800087F881238120812387F88000800000208020803F8020803F80000 +D3C6:0000000800087F881238120812387F8800080000210821083F0821143F620000 +D3C7:0000000800087F881238120812387F8800080000001000100010006801840000 +D3C8:0000000800087F881238120812387F88000800000048004800A8011406620000 +D3C9:0000000800087F881238120812387F8800080000000003F00408040803F00000 +D3CA:0000000800087F881238120812387F880008000003F80020002000D003080000 +D3CB:0000000800087F881238120812387F8800080000004003F8004000A003180000 +D3CC:0000000800087F881238120812387F880008000003F8000803F8000800080000 +D3CD:0000000800087F881238120812387F880008000003F8020003F8020003F80000 +D3CE:0000000800087F881238120812387F880008000000000FF8022002200FF80000 +D3CF:0000000800087F881238120812387F880008000000800FF803E0041003E00000 +D3D0:00000000000A000A7FCA110A113A110A110A113A7FCA000A000A000A000A0000 +D3D1:0000002800287FA812E8122812E87FA80028000007F800080008000800080000 +D3D2:0000002800287FA812E8122812E87FA80028000000003EF80208020802080000 +D3D3:0000002800287FA812E8122812E87FA80028000000003E100210022802C40000 +D3D4:0000002800287FA812E8122812E87FA80028002808000800080008000FF80000 +D3D5:0000002800287FA812E8122812E87FA800280000000020F8201020303ECC0000 +D3D6:0000002800287FA812E8122812E87FA800280000202021FC207020883E700000 +D3D7:0000002800287FA812E8122812E87FA80028000003F802000200020003F80000 +D3D8:0000002800287FA812E8122812E87FA80028000007F8000807F8040007F80000 +D3D9:0000002800287FA812E8122812E87FA8002800003EF802083E0820083E080000 +D3DA:0000002800287FA812E8122812E87FA8002800003EF802883E8820883EF80000 +D3DB:0000002800287FA812E8122812E87FA8002800003E8802883EF820883EF80000 +D3DC:0000002800287FA812E8122812E87FA8002800001F0801081F0810141F620000 +D3DD:0000002800287FA812E8122812E87FA8002800003EF802803EF820803EF80000 +D3DE:0000002800287FA812E8122812E87FA8002800003EFC02483E4820483EFC0000 +D3DF:0000002800287FA812E8122812E87FA8002800003E1002FE3E3820443E380000 +D3E0:0000002800287FA812E8122812E87FA80028000003F802080208020803F80000 +D3E1:0000002800287FA812E8122812E87FA8002800000208020803F8020803F80000 +D3E2:0000002800287FA812E8122812E87FA800280000110811081F0811141F620000 +D3E3:0000002800287FA812E8122812E87FA800280000000800080008003400C20000 +D3E4:0000002800287FA812E8122812E87FA8002800000048004800A8011406620000 +D3E5:0000002800287FA812E8122812E87FA800280000000001F00208020801F00000 +D3E6:0000002800287FA812E8122812E87FA80028000003F80020002000D003080000 +D3E7:0000002800287FA812E8122812E87FA800280000004003F8004000A003180000 +D3E8:0000002800287FA812E8122812E87FA80028000003F8000803F8000800080000 +D3E9:0000002800287FA812E8122812E87FA80028000003F8020003F8020003F80000 +D3EA:0000002800287FA812E8122812E87FA80028000000000FF8022002200FF80000 +D3EB:0000002800287FA812E8122812E87FA80028000000800FF803E0041003E00000 +D3EC:000000003FF808200820082008203FF8000000000100010001007FFC00000000 +D3ED:00001FF00440044004401FF0010001007FFC00001FF000100010001000100000 +D3EE:00001FF00440044004401FF0010001007FFC000000003EF80208020802080000 +D3EF:00001FF00440044004401FF0010001007FFC000000001E100210022802C40000 +D3F0:00001FF00440044004401FF0010001007FFC000000001000100010001FF00000 +D3F1:00001FF00440044004401FF0010001007FFC0000000020F8201020303ECC0000 +D3F2:00001FF00440044004401FF0010001007FFC0000202021FC207020883E700000 +D3F3:00001FF00440044004401FF0010001007FFC00001FF01000100010001FF00000 +D3F4:00001FF00440044004401FF0010001007FFC00001FF000101FF010001FF00000 +D3F5:00001FF00440044004401FF0010001007FFC00003EF802083E0820083E080000 +D3F6:00001FF00440044004401FF0010001007FFC00003EF802883E8820883EF80000 +D3F7:00001FF00440044004401FF0010001007FFC00003E8802883EF820883EF80000 +D3F8:00001FF00440044004401FF0010001007FFC00003E1002103E1020283EC40000 +D3F9:00001FF00440044004401FF0010001007FFC00003EF802803EF820803EF80000 +D3FA:00001FF00440044004401FF0010001007FFC00003EFC02483E4820483EFC0000 +D3FB:00001FF00440044004401FF0010001007FFC00003E2003FC3E7020883E700000 +D3FC:00001FF00440044004401FF0010001007FFC00001FF01010101010101FF00000 +D3FD:00001FF00440044004401FF0010001007FFC0000101010101FF010101FF00000 +D3FE:00001FF00440044004401FF0010001007FFC0000222022203E2022503E880000 +D3FF:00001FF00440044004401FF0010001007FFC000000000100010002800C400000 +D400:00001FF00440044004401FF0010001007FFC00000000024002400DA033100000 +D401:00001FF00440044004401FF0010001007FFC0000000007C00820082007C00000 +D402:00001FF00440044004401FF0010001007FFC0000000007E00080014006200000 +D403:00001FF00440044004401FF0010001007FFC0000008007E00080014006200000 +D404:00001FF00440044004401FF0010001007FFC00001FF000101FF0001000100000 +D405:00001FF00440044004401FF0010001007FFC00001FF010001FF010001FF00000 +D406:00001FF00440044004401FF0010001007FFC000000001FF0044004401FF00000 +D407:00001FF00440044004401FF0010001007FFC000001001FF007C0082007C00000 +D408:00000010001000107FD011101110111E11107FD0041004107FD0001000100000 +D409:000000083F881108110E3F88040804087FE8000007F800080008000800080000 +D40A:000000083F881108110E3F88040804087FE8000000003EF80208020802080000 +D40B:000000083F881108110E3F88040804087FE8000000001F080108011401620000 +D40C:000000083F881108110E3F88040804087FE8000008000800080008000FF80000 +D40D:000000083F881108110E3F88040804087FE80000000010F8101010301ECC0000 +D40E:000000083F881108110E3F88040804087FE800000808087F081C08220F9C0000 +D40F:000000083F881108110E3F88040804087FE8000003F802000200020003F80000 +D410:000000083F881108110E3F88040804087FE8000007F8000807F8040007F80000 +D411:000000083F881108110E3F88040804087FE800003EF802083E0820083E080000 +D412:000000083F881108110E3F88040804087FE800003EF802883E8820883EF80000 +D413:000000083F881108110E3F88040804087FE800003E8802883EF820883EF80000 +D414:000000083F881108110E3F88040804087FE800001F0801081F0810141F620000 +D415:000000083F881108110E3F88040804087FE800003EF802803EF820803EF80000 +D416:000000083F881108110E3F88040804087FE800003EFC02483E4820483EFC0000 +D417:000000083F881108110E3F88040804087FE800001F08017F1F1C10221F1C0000 +D418:000000083F881108110E3F88040804087FE8000003F802080208020803F80000 +D419:000000083F881108110E3F88040804087FE800000208020803F8020803F80000 +D41A:000000083F881108110E3F88040804087FE80000110811081F0811141F620000 +D41B:000000083F881108110E3F88040804087FE80000001000100010006801840000 +D41C:000000083F881108110E3F88040804087FE800000048004800A8011406620000 +D41D:000000083F881108110E3F88040804087FE80000000003F00408040803F00000 +D41E:000000083F881108110E3F88040804087FE8000003F80020002000D003080000 +D41F:000000083F881108110E3F88040804087FE80000004003F8004000A003180000 +D420:000000083F881108110E3F88040804087FE8000003F8000803F8000800080000 +D421:000000083F881108110E3F88040804087FE8000003F8020003F8020003F80000 +D422:000000083F881108110E3F88040804087FE8000000000FF8022002200FF80000 +D423:000000083F881108110E3F88040804087FE8000000800FF803E0041003E00000 +D424:00000012001200127FD211121112111E11127FD2041204127FD2001200120000 +D425:000000283FA8112811383FA8042804287FA8000007F800080008000800080000 +D426:000000283FA8112811383FA8042804287FA8000000003EF80208020802080000 +D427:000000283FA8112811383FA8042804287FA8000000001F080108011401620000 +D428:000000283FA8112811383FA8042804287FA8000008000800080008000FF80000 +D429:000000283FA8112811383FA8042804287FA80000000010F8101010301ECC0000 +D42A:000000283FA8112811383FA8042804287FA800000808087F081C08220F9C0000 +D42B:000000283FA8112811383FA8042804287FA8000003F802000200020003F80000 +D42C:000000283FA8112811383FA8042804287FA8000007F8000807F8040007F80000 +D42D:000000283FA8112811383FA8042804287FA800003EF802083E0820083E080000 +D42E:000000283FA8112811383FA8042804287FA800003EF802883E8820883EF80000 +D42F:000000283FA8112811383FA8042804287FA800003E8802883EF820883EF80000 +D430:000000283FA8112811383FA8042804287FA800001F0801081F0810141F620000 +D431:000000283FA8112811383FA8042804287FA800003EF802803EF820803EF80000 +D432:000000283FA8112811383FA8042804287FA800003EFC02483E4820483EFC0000 +D433:000000283FA8112811383FA8042804287FA800001F08017F1F1C10221F1C0000 +D434:000000283FA8112811383FA8042804287FA8000003F802080208020803F80000 +D435:000000283FA8112811383FA8042804287FA800000208020803F8020803F80000 +D436:000000283FA8112811383FA8042804287FA80000110811081F0811141F620000 +D437:000000283FA8112811383FA8042804287FA80000001000100010006801840000 +D438:000000283FA8112811383FA8042804287FA800000048004800A8011406620000 +D439:000000283FA8112811383FA8042804287FA80000000003F00408040803F00000 +D43A:000000283FA8112811383FA8042804287FA8000003F80020002000D003080000 +D43B:000000283FA8112811383FA8042804287FA80000004003F8004000A003180000 +D43C:000000283FA8112811383FA8042804287FA8000003F8000803F8000800080000 +D43D:000000283FA8112811383FA8042804287FA8000003F8020003F8020003F80000 +D43E:000000283FA8112811383FA8042804287FA8000000000FF8022002200FF80000 +D43F:000000283FA8112811383FA8042804287FA8000000800FF803E0041003E00000 +D440:00000008000800087FC811081108110811087FC8040804087FE8000800080000 +D441:000000083F88110811083F88040804087FE8000007F800080008000800080000 +D442:000000083F88110811083F88040804087FE8000000003EF80208020802080000 +D443:000000083F88110811083F88040804087FE8000000001F080108011401620000 +D444:000000083F88110811083F88040804087FE8000008000800080008000FF80000 +D445:000000083F88110811083F88040804087FE80000000010F8101010301ECC0000 +D446:000000083F88110811083F88040804087FE800000808087F081C08220F9C0000 +D447:000000083F88110811083F88040804087FE8000003F802000200020003F80000 +D448:000000083F88110811083F88040804087FE8000007F8000807F8040007F80000 +D449:000000083F88110811083F88040804087FE800003EF802083E0820083E080000 +D44A:000000083F88110811083F88040804087FE800003EF802883E8820883EF80000 +D44B:000000083F88110811083F88040804087FE800003E8802883EF820883EF80000 +D44C:000000083F88110811083F88040804087FE800001F0801081F0810141F620000 +D44D:000000083F88110811083F88040804087FE800003EF802803EF820803EF80000 +D44E:000000083F88110811083F88040804087FE800003EFC02483E4820483EFC0000 +D44F:000000083F88110811083F88040804087FE800001F08017F1F1C10221F1C0000 +D450:000000083F88110811083F88040804087FE8000003F802080208020803F80000 +D451:000000083F88110811083F88040804087FE800000208020803F8020803F80000 +D452:000000083F88110811083F88040804087FE80000110811081F0811141F620000 +D453:000000083F88110811083F88040804087FE80000001000100010006801840000 +D454:000000083F88110811083F88040804087FE800000048004800A8011406620000 +D455:000000083F88110811083F88040804087FE80000000003F00408040803F00000 +D456:000000083F88110811083F88040804087FE8000003F80020002000D003080000 +D457:000000083F88110811083F88040804087FE80000004003F8004000A003180000 +D458:000000083F88110811083F88040804087FE8000003F8000803F8000800080000 +D459:000000083F88110811083F88040804087FE8000003F8020003F8020003F80000 +D45A:000000083F88110811083F88040804087FE8000000000FF8022002200FF80000 +D45B:000000083F88110811083F88040804087FE8000000800FF803E0041003E00000 +D45C:000000003FF808200820082008203FF8000004400440044004407FFC00000000 +D45D:00001FF00440044004401FF0044004407FFC00001FF000100010001000100000 +D45E:00001FF00440044004401FF0044004407FFC000000003EF80208020802080000 +D45F:00001FF00440044004401FF0044004407FFC000000001E100210022802C40000 +D460:00001FF00440044004401FF0044004407FFC000000001000100010001FF00000 +D461:00001FF00440044004401FF0044004407FFC0000000020F8201020303ECC0000 +D462:00001FF00440044004401FF0044004407FFC0000202021FC207020883E700000 +D463:00001FF00440044004401FF0044004407FFC00001FF01000100010001FF00000 +D464:00001FF00440044004401FF0044004407FFC00001FF000101FF010001FF00000 +D465:00001FF00440044004401FF0044004407FFC00003EF802083E0820083E080000 +D466:00001FF00440044004401FF0044004407FFC00003EF802883E8820883EF80000 +D467:00001FF00440044004401FF0044004407FFC00003E8802883EF820883EF80000 +D468:00001FF00440044004401FF0044004407FFC00003E1002103E1020283EC40000 +D469:00001FF00440044004401FF0044004407FFC00003EF802803EF820803EF80000 +D46A:00001FF00440044004401FF0044004407FFC00003EFC02483E4820483EFC0000 +D46B:00001FF00440044004401FF0044004407FFC00003E2003FC3E7020883E700000 +D46C:00001FF00440044004401FF0044004407FFC00001FF01010101010101FF00000 +D46D:00001FF00440044004401FF0044004407FFC0000101010101FF010101FF00000 +D46E:00001FF00440044004401FF0044004407FFC0000222022203E2022503E880000 +D46F:00001FF00440044004401FF0044004407FFC000000000100010002800C400000 +D470:00001FF00440044004401FF0044004407FFC00000000024002400DA033100000 +D471:00001FF00440044004401FF0044004407FFC0000000007C00820082007C00000 +D472:00001FF00440044004401FF0044004407FFC0000000007E00080014006200000 +D473:00001FF00440044004401FF0044004407FFC0000008007E00080014006200000 +D474:00001FF00440044004401FF0044004407FFC00001FF000101FF0001000100000 +D475:00001FF00440044004401FF0044004407FFC00001FF010001FF010001FF00000 +D476:00001FF00440044004401FF0044004407FFC000000001FF0044004401FF00000 +D477:00001FF00440044004401FF0044004407FFC000001001FF007C0082007C00000 +D478:000000003FF808200820082008203FF8000000003FF801000100010001000000 +D479:00001FF00440044004401FF000007FFC010001001FF000100010001000100000 +D47A:00001FF00440044004401FF000007FFC0100010000003EF80208020802080000 +D47B:00001FF00440044004401FF000007FFC0100010000001E100210022802C40000 +D47C:00001FF00440044004401FF0000000007FFC010001001100100010001FF00000 +D47D:00001FF00440044004401FF000007FFC01000100000020F8201020303ECC0000 +D47E:00001FF00440044004401FF000007FFC01000100202021FC207020883E700000 +D47F:00001FF00440044004401FF000007FFC010001001FF01000100010001FF00000 +D480:00001FF00440044004401FF000007FFC010001001FF000101FF010001FF00000 +D481:00001FF00440044004401FF000007FFC010001003EF802083E0820083E080000 +D482:00001FF00440044004401FF000007FFC010001003EF802883E8820883EF80000 +D483:00001FF00440044004401FF000007FFC010001003E8802883EF820883EF80000 +D484:00001FF00440044004401FF000007FFC010001003E1002103E1020283EC40000 +D485:00001FF00440044004401FF000007FFC010001003EF802803EF820803EF80000 +D486:00001FF00440044004401FF000007FFC010001003EFC02483E4820483EFC0000 +D487:00001FF00440044004401FF000007FFC010001003E2003FC3E7020883E700000 +D488:00001FF00440044004401FF000007FFC010001001FF01010101010101FF00000 +D489:00001FF00440044004401FF000007FFC01000100101010101FF010101FF00000 +D48A:00001FF00440044004401FF000007FFC01000100222022203E2022503E880000 +D48B:00001FF00440044004401FF000007FFC0100010000000100010002800C400000 +D48C:00001FF00440044004401FF000007FFC010001000000024002400DA033100000 +D48D:00001FF00440044004401FF000007FFC01000100000007C00820082007C00000 +D48E:00001FF00440044004401FF000007FFC01000100000007E00080014006200000 +D48F:00001FF00440044004401FF000007FFC01000100008007E00080014006200000 +D490:00001FF00440044004401FF000007FFC010001001FF000101FF0001000100000 +D491:00001FF00440044004401FF000007FFC010001001FF010001FF010001FF00000 +D492:00001FF00440044004401FF000007FFC0100010000001FF0044004401FF00000 +D493:00001FF00440044004401FF000007FFC0100010001001FF007C0082007C00000 +D494:0000000800087FC811081108110811087FC800087FE8040804F8040804080000 +D495:00083F88110811083F8800087FE8027802080000000007F80008000800080000 +D496:00083F88110811083F8800087FE802780208000000003EF80208020802080000 +D497:00083F88110811083F8800087FE802780208000000001F080108011401620000 +D498:00083F88110811083F88000800087FE80278020802081000100010001FF80000 +D499:00083F88110811083F8800087FE8027802080000000020F8201020303ECC0000 +D49A:00083F88110811083F8800087FE8027802080000202021FC207020883E700000 +D49B:00083F88110811083F8800087FE802780208000003F802000200020003F80000 +D49C:00083F88110811083F8800087FE802780208000007F8000807F8040007F80000 +D49D:00083F88110811083F8800087FE80278020800003EF802083E0820083E080000 +D49E:00083F88110811083F8800087FE80278020800003EF802883E8820883EF80000 +D49F:00083F88110811083F8800087FE80278020800003E8802883EF820883EF80000 +D4A0:00083F88110811083F8800087FE80278020800000F8800880F8808140FA20000 +D4A1:00083F88110811083F8800087FE80278020800003EF802803EF820803EF80000 +D4A2:00083F88110811083F8800087FE80278020800003EFC02483E4820483EFC0000 +D4A3:00083F88110811083F8800087FE80278020800003E1002FE3E3820443E380000 +D4A4:00083F88110811083F8800087FE802780208000003F802080208020803F80000 +D4A5:00083F88110811083F8800087FE80278020800000208020803F8020803F80000 +D4A6:00083F88110811083F8800087FE8027802080000210821083F0821143F620000 +D4A7:00083F88110811083F8800087FE8027802080000001000100010006801840000 +D4A8:00083F88110811083F8800087FE80278020800000048004800A8011406620000 +D4A9:00083F88110811083F8800087FE8027802080000000003F00408040803F00000 +D4AA:00083F88110811083F8800087FE802780208000003F80020002000D003080000 +D4AB:00083F88110811083F8800087FE8027802080000004003F8004000A003180000 +D4AC:00083F88110811083F8800087FE802780208000003F8000803F8000800080000 +D4AD:00083F88110811083F8800087FE802780208000003F8020003F8020003F80000 +D4AE:00083F88110811083F8800087FE802780208000000000FF8022002200FF80000 +D4AF:00083F88110811083F8800087FE802780208000000800FF803E0041003E00000 +D4B0:0000000A000A7FCA110A110A110A110A7FCA000A7FEA040A047A040A040A0000 +D4B1:00283FA8112811283FA800287FA805E804280000000007F80008000800080000 +D4B2:00283FA8112811283FA800287FA805E80428000000003EF80208020802080000 +D4B3:00283FA8112811283FA800287FA805E80428000000001F080108011401620000 +D4B4:00283FA8112811283FA8002800287FA8042805E804281428100010001FF80000 +D4B5:00283FA8112811283FA800287FA805E804280000000020F8201020303ECC0000 +D4B6:00283FA8112811283FA800287FA805E804280000202021FC207020883E700000 +D4B7:00283FA8112811283FA800287FA805E80428000003F802000200020003F80000 +D4B8:00283FA8112811283FA800287FA805E80428000007F8000807F8040007F80000 +D4B9:00283FA8112811283FA800287FA805E8042800003EF802083E0820083E080000 +D4BA:00283FA8112811283FA800287FA805E8042800003EF802883E8820883EF80000 +D4BB:00283FA8112811283FA800287FA805E8042800003E8802883EF820883EF80000 +D4BC:00283FA8112811283FA800287FA805E8042800000F8800880F8808140FA20000 +D4BD:00283FA8112811283FA800287FA805E8042800003EF802803EF820803EF80000 +D4BE:00283FA8112811283FA800287FA805E8042800003EFC02483E4820483EFC0000 +D4BF:00283FA8112811283FA800287FA805E8042800003E1002FE3E3820443E380000 +D4C0:00283FA8112811283FA800287FA805E80428000003F802080208020803F80000 +D4C1:00283FA8112811283FA800287FA805E8042800000208020803F8020803F80000 +D4C2:00283FA8112811283FA800287FA805E804280000210821083F0821143F620000 +D4C3:00283FA8112811283FA800287FA805E804280000001000100010006801840000 +D4C4:00283FA8112811283FA800287FA805E8042800000048004800A8011406620000 +D4C5:00283FA8112811283FA800287FA805E804280000000003F00408040803F00000 +D4C6:00283FA8112811283FA800287FA805E80428000003F80020002000D003080000 +D4C7:00283FA8112811283FA800287FA805E804280000004003F8004000A003180000 +D4C8:00283FA8112811283FA800287FA805E80428000003F8000803F8000800080000 +D4C9:00283FA8112811283FA800287FA805E80428000003F8020003F8020003F80000 +D4CA:00283FA8112811283FA800287FA805E80428000000000FF8022002200FF80000 +D4CB:00283FA8112811283FA800287FA805E80428000000800FF803E0041003E00000 +D4CC:0000000800087FC811081108110811087FC800087FE804080408040804080000 +D4CD:00083F88110811083F8800087FE8020802000000000007F80008000800080000 +D4CE:00083F88110811083F8800087FE802080200000000003EF80208020802080000 +D4CF:00083F88110811083F8800087FE802080200000000001F080108011401620000 +D4D0:00083F88110811083F88000800087FE80208020802081008100010001FF80000 +D4D1:00083F88110811083F8800087FE8020802000000000020F8201020303ECC0000 +D4D2:00083F88110811083F8800087FE8020802000000202021FC207020883E700000 +D4D3:00083F88110811083F8800087FE802080200000003F802000200020003F80000 +D4D4:00083F88110811083F8800087FE802080200000007F8000807F8040007F80000 +D4D5:00083F88110811083F8800087FE80208020000003EF802083E0820083E080000 +D4D6:00083F88110811083F8800087FE80208020000003EF802883E8820883EF80000 +D4D7:00083F88110811083F8800087FE80208020000003E8802883EF820883EF80000 +D4D8:00083F88110811083F8800087FE80208020000000F8800880F8808140FA20000 +D4D9:00083F88110811083F8800087FE80208020000003EF802803EF820803EF80000 +D4DA:00083F88110811083F8800087FE80208020000003EFC02483E4820483EFC0000 +D4DB:00083F88110811083F8800087FE80208020000003E1002FE3E3820443E380000 +D4DC:00083F88110811083F8800087FE802080200000003F802080208020803F80000 +D4DD:00083F88110811083F8800087FE80208020000000208020803F8020803F80000 +D4DE:00083F88110811083F8800087FE8020802000000210821083F0821143F620000 +D4DF:00083F88110811083F8800087FE8020802000000001000100010006801840000 +D4E0:00083F88110811083F8800087FE80208020000000048004800A8011406620000 +D4E1:00083F88110811083F8800087FE8020802000000000003F00408040803F00000 +D4E2:00083F88110811083F8800087FE802080200000003F80020002000D003080000 +D4E3:00083F88110811083F8800087FE8020802000000004003F8004000A003180000 +D4E4:00083F88110811083F8800087FE802080200000003F8000803F8000800080000 +D4E5:00083F88110811083F8800087FE802080200000003F8020003F8020003F80000 +D4E6:00083F88110811083F8800087FE802080200000000000FF8022002200FF80000 +D4E7:00083F88110811083F8800087FE802080200000000800FF803E0041003E00000 +D4E8:000000003FF808200820082008203FF8000000007FFC04400440044004400000 +D4E9:00001FF00440044004401FF000007FFC044004401FF000100010001000100000 +D4EA:00001FF00440044004401FF000007FFC0440044000003EF80208020802080000 +D4EB:00001FF00440044004401FF000007FFC0440044000001E100210022802C40000 +D4EC:00001FF00440044004401FF0000000007FFC044004401440100010001FF00000 +D4ED:00001FF00440044004401FF000007FFC04400440000020F8201020303ECC0000 +D4EE:00001FF00440044004401FF000007FFC04400440202021FC207020883E700000 +D4EF:00001FF00440044004401FF000007FFC044004401FF01000100010001FF00000 +D4F0:00001FF00440044004401FF000007FFC044004401FF000101FF010001FF00000 +D4F1:00001FF00440044004401FF000007FFC044004403EF802083E0820083E080000 +D4F2:00001FF00440044004401FF000007FFC044004403EF802883E8820883EF80000 +D4F3:00001FF00440044004401FF000007FFC044004403E8802883EF820883EF80000 +D4F4:00001FF00440044004401FF000007FFC044004403E1002103E1020283EC40000 +D4F5:00001FF00440044004401FF000007FFC044004403EF802803EF820803EF80000 +D4F6:00001FF00440044004401FF000007FFC044004403EFC02483E4820483EFC0000 +D4F7:00001FF00440044004401FF000007FFC044004403E2003FC3E7020883E700000 +D4F8:00001FF00440044004401FF000007FFC044004401FF01010101010101FF00000 +D4F9:00001FF00440044004401FF000007FFC04400440101010101FF010101FF00000 +D4FA:00001FF00440044004401FF000007FFC04400440222022203E2022503E880000 +D4FB:00001FF00440044004401FF000007FFC0440044000000100010002800C400000 +D4FC:00001FF00440044004401FF000007FFC044004400000024002400DA033100000 +D4FD:00001FF00440044004401FF000007FFC04400440000007C00820082007C00000 +D4FE:00001FF00440044004401FF000007FFC04400440000007E00080014006200000 +D4FF:00001FF00440044004401FF000007FFC04400440008007E00080014006200000 +D500:00001FF00440044004401FF000007FFC044004401FF000101FF0001000100000 +D501:00001FF00440044004401FF000007FFC044004401FF010001FF010001FF00000 +D502:00001FF00440044004401FF000007FFC0440044000001FF0044004401FF00000 +D503:00001FF00440044004401FF000007FFC0440044001001FF007C0082007C00000 +D504:000000003FF808200820082008203FF80000000000007FFC0000000000000000 +D505:00001FF00440044004401FF0000000007FFC00001FF000100010001000100000 +D506:00001FF00440044004401FF0000000007FFC000000003EF80208020802080000 +D507:00001FF00440044004401FF0000000007FFC000000001E100210022802C40000 +D508:00001FF00440044004401FF0000000007FFC000000001000100010001FF00000 +D509:00001FF00440044004401FF0000000007FFC0000000020F8201020303ECC0000 +D50A:00001FF00440044004401FF0000000007FFC0000202021FC207020883E700000 +D50B:00001FF00440044004401FF0000000007FFC00001FF01000100010001FF00000 +D50C:00001FF00440044004401FF0000000007FFC00001FF000101FF010001FF00000 +D50D:00001FF00440044004401FF0000000007FFC00003EF802083E0820083E080000 +D50E:00001FF00440044004401FF0000000007FFC00003EF802883E8820883EF80000 +D50F:00001FF00440044004401FF0000000007FFC00003E8802883EF820883EF80000 +D510:00001FF00440044004401FF0000000007FFC00003E1002103E1020283EC40000 +D511:00001FF00440044004401FF0000000007FFC00003EF802803EF820803EF80000 +D512:00001FF00440044004401FF0000000007FFC00003EFC02483E4820483EFC0000 +D513:00001FF00440044004401FF0000000007FFC00003E2003FC3E7020883E700000 +D514:00001FF00440044004401FF0000000007FFC00001FF01010101010101FF00000 +D515:00001FF00440044004401FF0000000007FFC0000101010101FF010101FF00000 +D516:00001FF00440044004401FF0000000007FFC0000222022203E2022503E880000 +D517:00001FF00440044004401FF0000000007FFC000000000100010002800C400000 +D518:00001FF00440044004401FF0000000007FFC00000000024002400DA033100000 +D519:00001FF00440044004401FF0000000007FFC0000000007C00820082007C00000 +D51A:00001FF00440044004401FF0000000007FFC0000000007E00080014006200000 +D51B:00001FF00440044004401FF0000000007FFC0000008007E00080014006200000 +D51C:00001FF00440044004401FF0000000007FFC00001FF000101FF0001000100000 +D51D:00001FF00440044004401FF0000000007FFC00001FF010001FF010001FF00000 +D51E:00001FF00440044004401FF0000000007FFC000000001FF0044004401FF00000 +D51F:00001FF00440044004401FF0000000007FFC000001001FF007C0082007C00000 +D520:00000008000800087FC811081108110811087FC800087FE80008000800080000 +D521:000000083F88110811083F88000800087FE8000007F800080008000800080000 +D522:000000083F88110811083F88000800087FE8000000003EF80208020802080000 +D523:000000083F88110811083F88000800087FE8000000001F080108011401620000 +D524:000000083F88110811083F88000800087FE8000008000800080008000FF80000 +D525:000000083F88110811083F88000800087FE80000000010F8101010301ECC0000 +D526:000000083F88110811083F88000800087FE800000808087F081C08220F9C0000 +D527:000000083F88110811083F88000800087FE8000003F802000200020003F80000 +D528:000000083F88110811083F88000800087FE8000007F8000807F8040007F80000 +D529:000000083F88110811083F88000800087FE800003EF802083E0820083E080000 +D52A:000000083F88110811083F88000800087FE800003EF802883E8820883EF80000 +D52B:000000083F88110811083F88000800087FE800003E8802883EF820883EF80000 +D52C:000000083F88110811083F88000800087FE800001F0801081F0810141F620000 +D52D:000000083F88110811083F88000800087FE800003EF802803EF820803EF80000 +D52E:000000083F88110811083F88000800087FE800003EFC02483E4820483EFC0000 +D52F:000000083F88110811083F88000800087FE800001F08017F1F1C10221F1C0000 +D530:000000083F88110811083F88000800087FE8000003F802080208020803F80000 +D531:000000083F88110811083F88000800087FE800000208020803F8020803F80000 +D532:000000083F88110811083F88000800087FE80000110811081F0811141F620000 +D533:000000083F88110811083F88000800087FE80000001000100010006801840000 +D534:000000083F88110811083F88000800087FE800000048004800A8011406620000 +D535:000000083F88110811083F88000800087FE80000000003F00408040803F00000 +D536:000000083F88110811083F88000800087FE8000003F80020002000D003080000 +D537:000000083F88110811083F88000800087FE80000004003F8004000A003180000 +D538:000000083F88110811083F88000800087FE8000003F8000803F8000800080000 +D539:000000083F88110811083F88000800087FE8000003F8020003F8020003F80000 +D53A:000000083F88110811083F88000800087FE8000000000FF8022002200FF80000 +D53B:000000083F88110811083F88000800087FE8000000800FF803E0041003E00000 +D53C:00000000000800087FC8110811081108110811087FC800080008000800080000 +D53D:0000000800087F881208120812087F8800080000000007F80008000800080000 +D53E:0000000800087F881208120812087F880008000000003EF80208020802080000 +D53F:0000000800087F881208120812087F880008000000001F080108011401620000 +D540:0000000800087F881208120812087F880008000800001000100010001FF80000 +D541:0000000800087F881208120812087F8800080000000020F8201020303ECC0000 +D542:0000000800087F881208120812087F8800080000202021FC207020883E700000 +D543:0000000800087F881208120812087F880008000003F802000200020003F80000 +D544:0000000800087F881208120812087F880008000007F8000807F8040007F80000 +D545:0000000800087F881208120812087F88000800003EF802083E0820083E080000 +D546:0000000800087F881208120812087F88000800003EF802883E8820883EF80000 +D547:0000000800087F881208120812087F88000800003E8802883EF820883EF80000 +D548:0000000800087F881208120812087F88000800000F8800880F8808140FA20000 +D549:0000000800087F881208120812087F88000800003EF802803EF820803EF80000 +D54A:0000000800087F881208120812087F88000800003EFC02483E4820483EFC0000 +D54B:0000000800087F881208120812087F88000800003E1002FE3E3820443E380000 +D54C:0000000800087F881208120812087F880008000003F802080208020803F80000 +D54D:0000000800087F881208120812087F88000800000208020803F8020803F80000 +D54E:0000000800087F881208120812087F8800080000210821083F0821143F620000 +D54F:0000000800087F881208120812087F8800080000001000100010006801840000 +D550:0000000800087F881208120812087F88000800000048004800A8011406620000 +D551:0000000800087F881208120812087F8800080000000003F00408040803F00000 +D552:0000000800087F881208120812087F880008000003F80020002000D003080000 +D553:0000000800087F881208120812087F8800080000004003F8004000A003180000 +D554:0000000800087F881208120812087F880008000003F8000803F8000800080000 +D555:0000000800087F881208120812087F880008000003F8020003F8020003F80000 +D556:0000000800087F881208120812087F880008000000000FF8022002200FF80000 +D557:0000000800087F881208120812087F880008000000800FF803E0041003E00000 +D558:00000000041004103F900E101110209E2090209011100E100010001000100000 +D559:000008087F081C082208220E22081C080008000007F800080008000800080000 +D55A:000008087F081C082208220E22081C080008000000003EF80208020802080000 +D55B:000008087F081C082208220E22081C080008000000001F080108011401620000 +D55C:000008087F081C082208220E22081C080008000808000800080008000FF80000 +D55D:000008087F081C082208220E22081C0800080000000010F8101010301ECC0000 +D55E:000008087F081C082208220E22081C08000800000808087F081C08220F9C0000 +D55F:000008087F081C082208220E22081C080008000003F802000200020003F80000 +D560:000008087F081C082208220E22081C080008000007F8000807F8040007F80000 +D561:000008087F081C082208220E22081C08000800003EF802083E0820083E080000 +D562:000008087F081C082208220E22081C08000800003EF802883E8820883EF80000 +D563:000008087F081C082208220E22081C08000800003E8802883EF820883EF80000 +D564:000008087F081C082208220E22081C08000800001F0801081F0810141F620000 +D565:000008087F081C082208220E22081C08000800003EF802803EF820803EF80000 +D566:000008087F081C082208220E22081C08000800003EFC02483E4820483EFC0000 +D567:000008087F081C082208220E22081C08000800001F08017F1F1C10221F1C0000 +D568:000008087F081C082208220E22081C080008000003F802080208020803F80000 +D569:000008087F081C082208220E22081C08000800000208020803F8020803F80000 +D56A:000008087F081C082208220E22081C0800080000110811081F0811141F620000 +D56B:000008087F081C082208220E22081C0800080000001000100010006801840000 +D56C:000008087F081C082208220E22081C08000800000048004800A8011406620000 +D56D:000008087F081C082208220E22081C0800080000000003F00408040803F00000 +D56E:000008087F081C082208220E22081C080008000003F80020002000D003080000 +D56F:000008087F081C082208220E22081C0800080000004003F8004000A003180000 +D570:000008087F081C082208220E22081C080008000003F8000803F8000800080000 +D571:000008087F081C082208220E22081C080008000003F8020003F8020003F80000 +D572:000008087F081C082208220E22081C080008000000000FF8022002200FF80000 +D573:000008087F081C082208220E22081C080008000000800FF803E0041003E00000 +D574:00000000041204123F920E121112209E2092209211120E120012001200120000 +D575:000008287F281C282228223822281C280028000007F800080008000800080000 +D576:000008287F281C282228223822281C280028000000003EF80208020802080000 +D577:000008287F281C282228223822281C280028000000003E100210022802C40000 +D578:000008287F281C282228223822281C280028002808000800080008000FF80000 +D579:000008287F281C282228223822281C2800280000000020F8201020303ECC0000 +D57A:000008287F281C282228223822281C2800280000202021FC207020883E700000 +D57B:000008287F281C282228223822281C280028000003F802000200020003F80000 +D57C:000008287F281C282228223822281C280028000007F8000807F8040007F80000 +D57D:000008287F281C282228223822281C28002800003EF802083E0820083E080000 +D57E:000008287F281C282228223822281C28002800003EF802883E8820883EF80000 +D57F:000008287F281C282228223822281C28002800003E8802883EF820883EF80000 +D580:000008287F281C282228223822281C28002800001F0801081F0810141F620000 +D581:000008287F281C282228223822281C28002800003EF802803EF820803EF80000 +D582:000008287F281C282228223822281C28002800003EFC02483E4820483EFC0000 +D583:000008287F281C282228223822281C28002800003E1002FE3E3820443E380000 +D584:000008287F281C282228223822281C280028000003F802080208020803F80000 +D585:000008287F281C282228223822281C28002800000208020803F8020803F80000 +D586:000008287F281C282228223822281C2800280000110811081F0811141F620000 +D587:000008287F281C282228223822281C2800280000000800080008003400C20000 +D588:000008287F281C282228223822281C28002800000048004800A8011406620000 +D589:000008287F281C282228223822281C2800280000000001F00208020801F00000 +D58A:000008287F281C282228223822281C280028000003F80020002000D003080000 +D58B:000008287F281C282228223822281C2800280000004003F8004000A003180000 +D58C:000008287F281C282228223822281C280028000003F8000803F8000800080000 +D58D:000008287F281C282228223822281C280028000003F8020003F8020003F80000 +D58E:000008287F281C282228223822281C280028000000000FF8022002200FF80000 +D58F:000008287F281C282228223822281C280028000000800FF803E0041003E00000 +D590:00000000041004103F900E10111E20902090209E11100E100010001000100000 +D591:000008087F081C08220E2208220E1C080008000007F800080008000800080000 +D592:000008087F081C08220E2208220E1C080008000000003EF80208020802080000 +D593:000008087F081C08220E2208220E1C080008000000001F080108011401620000 +D594:000008087F081C08220E2208220E1C080008000008000800080008000FF80000 +D595:000008087F081C08220E2208220E1C0800080000000010F8101010301ECC0000 +D596:000008087F081C08220E2208220E1C08000800000808087F081C08220F9C0000 +D597:000008087F081C08220E2208220E1C080008000003F802000200020003F80000 +D598:000008087F081C08220E2208220E1C080008000007F8000807F8040007F80000 +D599:000008087F081C08220E2208220E1C08000800003EF802083E0820083E080000 +D59A:000008087F081C08220E2208220E1C08000800003EF802883E8820883EF80000 +D59B:000008087F081C08220E2208220E1C08000800003E8802883EF820883EF80000 +D59C:000008087F081C08220E2208220E1C08000800001F0801081F0810141F620000 +D59D:000008087F081C08220E2208220E1C08000800003EF802803EF820803EF80000 +D59E:000008087F081C08220E2208220E1C08000800003EFC02483E4820483EFC0000 +D59F:000008087F081C08220E2208220E1C08000800001F08017F1F1C10221F1C0000 +D5A0:000008087F081C08220E2208220E1C080008000003F802080208020803F80000 +D5A1:000008087F081C08220E2208220E1C08000800000208020803F8020803F80000 +D5A2:000008087F081C08220E2208220E1C0800080000110811081F0811141F620000 +D5A3:000008087F081C08220E2208220E1C0800080000001000100010006801840000 +D5A4:000008087F081C08220E2208220E1C08000800000048004800A8011406620000 +D5A5:000008087F081C08220E2208220E1C0800080000000003F00408040803F00000 +D5A6:000008087F081C08220E2208220E1C080008000003F80020002000D003080000 +D5A7:000008087F081C08220E2208220E1C0800080000004003F8004000A003180000 +D5A8:000008087F081C08220E2208220E1C080008000003F8000803F8000800080000 +D5A9:000008087F081C08220E2208220E1C080008000003F8020003F8020003F80000 +D5AA:000008087F081C08220E2208220E1C080008000000000FF8022002200FF80000 +D5AB:000008087F081C08220E2208220E1C080008000000800FF803E0041003E00000 +D5AC:00000000041204123F920E12111E20922092209E11120E120012001200120000 +D5AD:000008287F281C282238222822381C280028000007F800080008000800080000 +D5AE:000008287F281C282238222822381C280028000000003EF80208020802080000 +D5AF:000008287F281C282238222822381C280028000000003E100210022802C40000 +D5B0:000008287F281C282238222822381C280028002808000800080008000FF80000 +D5B1:000008287F281C282238222822381C2800280000000020F8201020303ECC0000 +D5B2:000008287F281C282238222822381C2800280000202021FC207020883E700000 +D5B3:000008287F281C282238222822381C280028000003F802000200020003F80000 +D5B4:000008287F281C282238222822381C280028000007F8000807F8040007F80000 +D5B5:000008287F281C282238222822381C28002800003EF802083E0820083E080000 +D5B6:000008287F281C282238222822381C28002800003EF802883E8820883EF80000 +D5B7:000008287F281C282238222822381C28002800003E8802883EF820883EF80000 +D5B8:000008287F281C282238222822381C28002800001F0801081F0810141F620000 +D5B9:000008287F281C282238222822381C28002800003EF802803EF820803EF80000 +D5BA:000008287F281C282238222822381C28002800003EFC02483E4820483EFC0000 +D5BB:000008287F281C282238222822381C28002800003E1002FE3E3820443E380000 +D5BC:000008287F281C282238222822381C280028000003F802080208020803F80000 +D5BD:000008287F281C282238222822381C28002800000208020803F8020803F80000 +D5BE:000008287F281C282238222822381C2800280000110811081F0811141F620000 +D5BF:000008287F281C282238222822381C2800280000000800080008003400C20000 +D5C0:000008287F281C282238222822381C28002800000048004800A8011406620000 +D5C1:000008287F281C282238222822381C2800280000000001F00208020801F00000 +D5C2:000008287F281C282238222822381C280028000003F80020002000D003080000 +D5C3:000008287F281C282238222822381C2800280000004003F8004000A003180000 +D5C4:000008287F281C282238222822381C280028000003F8000803F8000800080000 +D5C5:000008287F281C282238222822381C280028000003F8020003F8020003F80000 +D5C6:000008287F281C282238222822381C280028000000000FF8022002200FF80000 +D5C7:000008287F281C282238222822381C280028000000800FF803E0041003E00000 +D5C8:00000000040204023F820E021102209E2082208211020E020002000200020000 +D5C9:000008087F081C082208223822081C0800080000000007F80008000800080000 +D5CA:000008087F081C082208223822081C080008000000003EF80208020802080000 +D5CB:000008087F081C082208223822081C080008000000001F080108011401620000 +D5CC:000008087F081C082208223822081C080008000000001000100010001FF80000 +D5CD:000008087F081C082208223822081C0800080000000020F8201020303ECC0000 +D5CE:000008087F081C082208223822081C0800080000202021FC207020883E700000 +D5CF:000008087F081C082208223822081C080008000003F802000200020003F80000 +D5D0:000008087F081C082208223822081C080008000007F8000807F8040007F80000 +D5D1:000008087F081C082208223822081C08000800003EF802083E0820083E080000 +D5D2:000008087F081C082208223822081C08000800003EF802883E8820883EF80000 +D5D3:000008087F081C082208223822081C08000800003E8802883EF820883EF80000 +D5D4:000008087F081C082208223822081C08000800000F8800880F8808140FA20000 +D5D5:000008087F081C082208223822081C08000800003EF802803EF820803EF80000 +D5D6:000008087F081C082208223822081C08000800003EFC02483E4820483EFC0000 +D5D7:000008087F081C082208223822081C08000800003E1002FE3E3820443E380000 +D5D8:000008087F081C082208223822081C080008000003F802080208020803F80000 +D5D9:000008087F081C082208223822081C08000800000208020803F8020803F80000 +D5DA:000008087F081C082208223822081C0800080000210821083F0821143F620000 +D5DB:000008087F081C082208223822081C0800080000001000100010006801840000 +D5DC:000008087F081C082208223822081C08000800000048004800A8011406620000 +D5DD:000008087F081C082208223822081C0800080000000003F00408040803F00000 +D5DE:000008087F081C082208223822081C080008000003F80020002000D003080000 +D5DF:000008087F081C082208223822081C0800080000004003F8004000A003180000 +D5E0:000008087F081C082208223822081C080008000003F8000803F8000800080000 +D5E1:000008087F081C082208223822081C080008000003F8020003F8020003F80000 +D5E2:000008087F081C082208223822081C080008000000000FF8022002200FF80000 +D5E3:000008087F081C082208223822081C080008000000800FF803E0041003E00000 +D5E4:00000000040A040A3F8A0E0A110A20BA208A208A110A0E0A000A000A000A0000 +D5E5:000008287F281C28222822E822281C280028000007F800080008000800080000 +D5E6:000008287F281C28222822E822281C280028000000003EF80208020802080000 +D5E7:000008287F281C28222822E822281C280028000000003E100210022802C40000 +D5E8:000008287F281C28222822E822281C280028000008000800080008000FF80000 +D5E9:000008287F281C28222822E822281C2800280000000020F8201020303ECC0000 +D5EA:000008287F281C28222822E822281C2800280000202021FC207020883E700000 +D5EB:000008287F281C28222822E822281C280028000003F802000200020003F80000 +D5EC:000008287F281C28222822E822281C280028000007F8000807F8040007F80000 +D5ED:000008287F281C28222822E822281C28002800003EF802083E0820083E080000 +D5EE:000008287F281C28222822E822281C28002800003EF802883E8820883EF80000 +D5EF:000008287F281C28222822E822281C28002800003E8802883EF820883EF80000 +D5F0:000008287F281C28222822E822281C28002800001F0801081F0810141F620000 +D5F1:000008287F281C28222822E822281C28002800003EF802803EF820803EF80000 +D5F2:000008287F281C28222822E822281C28002800003EFC02483E4820483EFC0000 +D5F3:000008287F281C28222822E822281C28002800003E1002FE3E3820443E380000 +D5F4:000008287F281C28222822E822281C280028000003F802080208020803F80000 +D5F5:000008287F281C28222822E822281C28002800000208020803F8020803F80000 +D5F6:000008287F281C28222822E822281C2800280000110811081F0811141F620000 +D5F7:000008287F281C28222822E822281C2800280000000800080008003400C20000 +D5F8:000008287F281C28222822E822281C28002800000048004800A8011406620000 +D5F9:000008287F281C28222822E822281C2800280000000001F00208020801F00000 +D5FA:000008287F281C28222822E822281C280028000003F80020002000D003080000 +D5FB:000008287F281C28222822E822281C2800280000004003F8004000A003180000 +D5FC:000008287F281C28222822E822281C280028000003F8000803F8000800080000 +D5FD:000008287F281C28222822E822281C280028000003F8020003F8020003F80000 +D5FE:000008287F281C28222822E822281C280028000000000FF8022002200FF80000 +D5FF:000008287F281C28222822E822281C280028000000800FF803E0041003E00000 +D600:00000000040204023F820E02111E20822082209E11020E020002000200020000 +D601:000008087F081C082238220822381C0800080000000007F80008000800080000 +D602:000008087F081C082238220822381C080008000000003EF80208020802080000 +D603:000008087F081C082238220822381C080008000000001F080108011401620000 +D604:000008087F081C082238220822381C080008000800001000100010001FF80000 +D605:000008087F081C082238220822381C0800080000000020F8201020303ECC0000 +D606:000008087F081C082238220822381C0800080000202021FC207020883E700000 +D607:000008087F081C082238220822381C080008000003F802000200020003F80000 +D608:000008087F081C082238220822381C080008000007F8000807F8040007F80000 +D609:000008087F081C082238220822381C08000800003EF802083E0820083E080000 +D60A:000008087F081C082238220822381C08000800003EF802883E8820883EF80000 +D60B:000008087F081C082238220822381C08000800003E8802883EF820883EF80000 +D60C:000008087F081C082238220822381C08000800000F8800880F8808140FA20000 +D60D:000008087F081C082238220822381C08000800003EF802803EF820803EF80000 +D60E:000008087F081C082238220822381C08000800003EFC02483E4820483EFC0000 +D60F:000008087F081C082238220822381C08000800003E1002FE3E3820443E380000 +D610:000008087F081C082238220822381C080008000003F802080208020803F80000 +D611:000008087F081C082238220822381C08000800000208020803F8020803F80000 +D612:000008087F081C082238220822381C0800080000210821083F0821143F620000 +D613:000008087F081C082238220822381C0800080000001000100010006801840000 +D614:000008087F081C082238220822381C08000800000048004800A8011406620000 +D615:000008087F081C082238220822381C0800080000000003F00408040803F00000 +D616:000008087F081C082238220822381C080008000003F80020002000D003080000 +D617:000008087F081C082238220822381C0800080000004003F8004000A003180000 +D618:000008087F081C082238220822381C080008000003F8000803F8000800080000 +D619:000008087F081C082238220822381C080008000003F8020003F8020003F80000 +D61A:000008087F081C082238220822381C080008000000000FF8022002200FF80000 +D61B:000008087F081C082238220822381C080008000000800FF803E0041003E00000 +D61C:00000000040A040A3F8A0E0A113A208A208A20BA110A0E0A000A000A000A0000 +D61D:000008287F281C2822E8222822E81C280028000007F800080008000800080000 +D61E:000008287F281C2822E8222822E81C280028000000003EF80208020802080000 +D61F:000008287F281C2822E8222822E81C280028000000003E100210022802C40000 +D620:000008287F281C2822E8222822E81C280028002808000800080008000FF80000 +D621:000008287F281C2822E8222822E81C2800280000000020F8201020303ECC0000 +D622:000008287F281C2822E8222822E81C2800280000202021FC207020883E700000 +D623:000008287F281C2822E8222822E81C280028000003F802000200020003F80000 +D624:000008287F281C2822E8222822E81C280028000007F8000807F8040007F80000 +D625:000008287F281C2822E8222822E81C28002800003EF802083E0820083E080000 +D626:000008287F281C2822E8222822E81C28002800003EF802883E8820883EF80000 +D627:000008287F281C2822E8222822E81C28002800003E8802883EF820883EF80000 +D628:000008287F281C2822E8222822E81C28002800001F0801081F0810141F620000 +D629:000008287F281C2822E8222822E81C28002800003EF802803EF820803EF80000 +D62A:000008287F281C2822E8222822E81C28002800003EFC02483E4820483EFC0000 +D62B:000008287F281C2822E8222822E81C28002800003E1002FE3E3820443E380000 +D62C:000008287F281C2822E8222822E81C280028000003F802080208020803F80000 +D62D:000008287F281C2822E8222822E81C28002800000208020803F8020803F80000 +D62E:000008287F281C2822E8222822E81C2800280000110811081F0811141F620000 +D62F:000008287F281C2822E8222822E81C2800280000000800080008003400C20000 +D630:000008287F281C2822E8222822E81C28002800000048004800A8011406620000 +D631:000008287F281C2822E8222822E81C2800280000000001F00208020801F00000 +D632:000008287F281C2822E8222822E81C280028000003F80020002000D003080000 +D633:000008287F281C2822E8222822E81C2800280000004003F8004000A003180000 +D634:000008287F281C2822E8222822E81C280028000003F8000803F8000800080000 +D635:000008287F281C2822E8222822E81C280028000003F8020003F8020003F80000 +D636:000008287F281C2822E8222822E81C280028000000000FF8022002200FF80000 +D637:000008287F281C2822E8222822E81C280028000000800FF803E0041003E00000 +D638:0000010001000FE0000007C00820082007C000000100010001007FFC00000000 +D639:01000FE007C00820082007C0010001007FFC00001FF000100010001000100000 +D63A:01000FE007C00820082007C0010001007FFC000000003EF80208020802080000 +D63B:01000FE007C00820082007C0010001007FFC000000001E100210022802C40000 +D63C:01000FE007C00820082007C0010001007FFC000000001000100010001FF00000 +D63D:01000FE007C00820082007C0010001007FFC0000000020F8201020303ECC0000 +D63E:01000FE007C00820082007C0010001007FFC0000202021FC207020883E700000 +D63F:01000FE007C00820082007C0010001007FFC00001FF01000100010001FF00000 +D640:01000FE007C00820082007C0010001007FFC00001FF000101FF010001FF00000 +D641:01000FE007C00820082007C0010001007FFC00003EF802083E0820083E080000 +D642:01000FE007C00820082007C0010001007FFC00003EF802883E8820883EF80000 +D643:01000FE007C00820082007C0010001007FFC00003E8802883EF820883EF80000 +D644:01000FE007C00820082007C0010001007FFC00003E1002103E1020283EC40000 +D645:01000FE007C00820082007C0010001007FFC00003EF802803EF820803EF80000 +D646:01000FE007C00820082007C0010001007FFC00003EFC02483E4820483EFC0000 +D647:01000FE007C00820082007C0010001007FFC00003E2003FC3E7020883E700000 +D648:01000FE007C00820082007C0010001007FFC00001FF01010101010101FF00000 +D649:01000FE007C00820082007C0010001007FFC0000101010101FF010101FF00000 +D64A:01000FE007C00820082007C0010001007FFC0000222022203E2022503E880000 +D64B:01000FE007C00820082007C0010001007FFC000000000100010002800C400000 +D64C:01000FE007C00820082007C0010001007FFC00000000024002400DA033100000 +D64D:01000FE007C00820082007C0010001007FFC0000000007C00820082007C00000 +D64E:01000FE007C00820082007C0010001007FFC0000000007E00080014006200000 +D64F:01000FE007C00820082007C0010001007FFC0000008007E00080014006200000 +D650:01000FE007C00820082007C0010001007FFC00001FF000101FF0001000100000 +D651:01000FE007C00820082007C0010001007FFC00001FF010001FF010001FF00000 +D652:01000FE007C00820082007C0010001007FFC000000001FF0044004401FF00000 +D653:01000FE007C00820082007C0010001007FFC000001001FF007C0082007C00000 +D654:00000010041004103F9000101F10209E20901F10041004107FD0001000100000 +D655:000004083F880E08110E11080E0804087FE8000007F800080008000800080000 +D656:000004083F880E08110E11080E0804087FE8000000003EF80208020802080000 +D657:000004083F880E08110E11080E0804087FE8000000001F080108011401620000 +D658:000004083F880E08110E11080E0804087FE8000008000800080008000FF80000 +D659:000004083F880E08110E11080E0804087FE80000000010F8101010301ECC0000 +D65A:000004083F880E08110E11080E0804087FE800000808087F081C08220F9C0000 +D65B:000004083F880E08110E11080E0804087FE8000003F802000200020003F80000 +D65C:000004083F880E08110E11080E0804087FE8000007F8000807F8040007F80000 +D65D:000004083F880E08110E11080E0804087FE800003EF802083E0820083E080000 +D65E:000004083F880E08110E11080E0804087FE800003EF802883E8820883EF80000 +D65F:000004083F880E08110E11080E0804087FE800003E8802883EF820883EF80000 +D660:000004083F880E08110E11080E0804087FE800001F0801081F0810141F620000 +D661:000004083F880E08110E11080E0804087FE800003EF802803EF820803EF80000 +D662:000004083F880E08110E11080E0804087FE800003EFC02483E4820483EFC0000 +D663:000004083F880E08110E11080E0804087FE800001F08017F1F1C10221F1C0000 +D664:000004083F880E08110E11080E0804087FE8000003F802080208020803F80000 +D665:000004083F880E08110E11080E0804087FE800000208020803F8020803F80000 +D666:000004083F880E08110E11080E0804087FE80000110811081F0811141F620000 +D667:000004083F880E08110E11080E0804087FE80000001000100010006801840000 +D668:000004083F880E08110E11080E0804087FE800000048004800A8011406620000 +D669:000004083F880E08110E11080E0804087FE80000000003F00408040803F00000 +D66A:000004083F880E08110E11080E0804087FE8000003F80020002000D003080000 +D66B:000004083F880E08110E11080E0804087FE80000004003F8004000A003180000 +D66C:000004083F880E08110E11080E0804087FE8000003F8000803F8000800080000 +D66D:000004083F880E08110E11080E0804087FE8000003F8020003F8020003F80000 +D66E:000004083F880E08110E11080E0804087FE8000000000FF8022002200FF80000 +D66F:000004083F880E08110E11080E0804087FE8000000800FF803E0041003E00000 +D670:00000012041204123F9200121F12209E20921F12041204127FD2001200120000 +D671:000004283FA80E28113811280E2804287FA8000007F800080008000800080000 +D672:000004283FA80E28113811280E2804287FA8000000003EF80208020802080000 +D673:000004283FA80E28113811280E2804287FA8000000001F080108011401620000 +D674:000004283FA80E28113811280E2804287FA8000008000800080008000FF80000 +D675:000004283FA80E28113811280E2804287FA80000000010F8101010301ECC0000 +D676:000004283FA80E28113811280E2804287FA800000808087F081C08220F9C0000 +D677:000004283FA80E28113811280E2804287FA8000003F802000200020003F80000 +D678:000004283FA80E28113811280E2804287FA8000007F8000807F8040007F80000 +D679:000004283FA80E28113811280E2804287FA800003EF802083E0820083E080000 +D67A:000004283FA80E28113811280E2804287FA800003EF802883E8820883EF80000 +D67B:000004283FA80E28113811280E2804287FA800003E8802883EF820883EF80000 +D67C:000004283FA80E28113811280E2804287FA800001F0801081F0810141F620000 +D67D:000004283FA80E28113811280E2804287FA800003EF802803EF820803EF80000 +D67E:000004283FA80E28113811280E2804287FA800003EFC02483E4820483EFC0000 +D67F:000004283FA80E28113811280E2804287FA800001F08017F1F1C10221F1C0000 +D680:000004283FA80E28113811280E2804287FA8000003F802080208020803F80000 +D681:000004283FA80E28113811280E2804287FA800000208020803F8020803F80000 +D682:000004283FA80E28113811280E2804287FA80000110811081F0811141F620000 +D683:000004283FA80E28113811280E2804287FA80000001000100010006801840000 +D684:000004283FA80E28113811280E2804287FA800000048004800A8011406620000 +D685:000004283FA80E28113811280E2804287FA80000000003F00408040803F00000 +D686:000004283FA80E28113811280E2804287FA8000003F80020002000D003080000 +D687:000004283FA80E28113811280E2804287FA80000004003F8004000A003180000 +D688:000004283FA80E28113811280E2804287FA8000003F8000803F8000800080000 +D689:000004283FA80E28113811280E2804287FA8000003F8020003F8020003F80000 +D68A:000004283FA80E28113811280E2804287FA8000000000FF8022002200FF80000 +D68B:000004283FA80E28113811280E2804287FA8000000800FF803E0041003E00000 +D68C:00000008040804083F8800081F08208820881F08040804087FE8000800080000 +D68D:000004083F880E08110811080E0804087FE8000007F800080008000800080000 +D68E:000004083F880E08110811080E0804087FE8000000003EF80208020802080000 +D68F:000004083F880E08110811080E0804087FE8000000001F080108011401620000 +D690:000004083F880E08110811080E0804087FE8000008000800080008000FF80000 +D691:000004083F880E08110811080E0804087FE80000000010F8101010301ECC0000 +D692:000004083F880E08110811080E0804087FE800000808087F081C08220F9C0000 +D693:000004083F880E08110811080E0804087FE8000003F802000200020003F80000 +D694:000004083F880E08110811080E0804087FE8000007F8000807F8040007F80000 +D695:000004083F880E08110811080E0804087FE800003EF802083E0820083E080000 +D696:000004083F880E08110811080E0804087FE800003EF802883E8820883EF80000 +D697:000004083F880E08110811080E0804087FE800003E8802883EF820883EF80000 +D698:000004083F880E08110811080E0804087FE800001F0801081F0810141F620000 +D699:000004083F880E08110811080E0804087FE800003EF802803EF820803EF80000 +D69A:000004083F880E08110811080E0804087FE800003EFC02483E4820483EFC0000 +D69B:000004083F880E08110811080E0804087FE800001F08017F1F1C10221F1C0000 +D69C:000004083F880E08110811080E0804087FE8000003F802080208020803F80000 +D69D:000004083F880E08110811080E0804087FE800000208020803F8020803F80000 +D69E:000004083F880E08110811080E0804087FE80000110811081F0811141F620000 +D69F:000004083F880E08110811080E0804087FE80000001000100010006801840000 +D6A0:000004083F880E08110811080E0804087FE800000048004800A8011406620000 +D6A1:000004083F880E08110811080E0804087FE80000000003F00408040803F00000 +D6A2:000004083F880E08110811080E0804087FE8000003F80020002000D003080000 +D6A3:000004083F880E08110811080E0804087FE80000004003F8004000A003180000 +D6A4:000004083F880E08110811080E0804087FE8000003F8000803F8000800080000 +D6A5:000004083F880E08110811080E0804087FE8000003F8020003F8020003F80000 +D6A6:000004083F880E08110811080E0804087FE8000000000FF8022002200FF80000 +D6A7:000004083F880E08110811080E0804087FE8000000800FF803E0041003E00000 +D6A8:0000010001000FE0000007C00820082007C004400440044004407FFC00000000 +D6A9:01000FE007C00820082007C0044004407FFC00001FF000100010001000100000 +D6AA:01000FE007C00820082007C0044004407FFC000000003EF80208020802080000 +D6AB:01000FE007C00820082007C0044004407FFC000000001E100210022802C40000 +D6AC:01000FE007C00820082007C0044004407FFC000000001000100010001FF00000 +D6AD:01000FE007C00820082007C0044004407FFC0000000020F8201020303ECC0000 +D6AE:01000FE007C00820082007C0044004407FFC0000202021FC207020883E700000 +D6AF:01000FE007C00820082007C0044004407FFC00001FF01000100010001FF00000 +D6B0:01000FE007C00820082007C0044004407FFC00001FF000101FF010001FF00000 +D6B1:01000FE007C00820082007C0044004407FFC00003EF802083E0820083E080000 +D6B2:01000FE007C00820082007C0044004407FFC00003EF802883E8820883EF80000 +D6B3:01000FE007C00820082007C0044004407FFC00003E8802883EF820883EF80000 +D6B4:01000FE007C00820082007C0044004407FFC00003E1002103E1020283EC40000 +D6B5:01000FE007C00820082007C0044004407FFC00003EF802803EF820803EF80000 +D6B6:01000FE007C00820082007C0044004407FFC00003EFC02483E4820483EFC0000 +D6B7:01000FE007C00820082007C0044004407FFC00003E2003FC3E7020883E700000 +D6B8:01000FE007C00820082007C0044004407FFC00001FF01010101010101FF00000 +D6B9:01000FE007C00820082007C0044004407FFC0000101010101FF010101FF00000 +D6BA:01000FE007C00820082007C0044004407FFC0000222022203E2022503E880000 +D6BB:01000FE007C00820082007C0044004407FFC000000000100010002800C400000 +D6BC:01000FE007C00820082007C0044004407FFC00000000024002400DA033100000 +D6BD:01000FE007C00820082007C0044004407FFC0000000007C00820082007C00000 +D6BE:01000FE007C00820082007C0044004407FFC0000000007E00080014006200000 +D6BF:01000FE007C00820082007C0044004407FFC0000008007E00080014006200000 +D6C0:01000FE007C00820082007C0044004407FFC00001FF000101FF0001000100000 +D6C1:01000FE007C00820082007C0044004407FFC00001FF010001FF010001FF00000 +D6C2:01000FE007C00820082007C0044004407FFC000000001FF0044004401FF00000 +D6C3:01000FE007C00820082007C0044004407FFC000001001FF007C0082007C00000 +D6C4:0000010001000FE0000007C00820082007C000003FF801000100010001000000 +D6C5:01000FE007C00820082007C000007FFC010001001FF000100010001000100000 +D6C6:01000FE007C00820082007C000007FFC0100010000003EF80208020802080000 +D6C7:01000FE007C00820082007C000007FFC0100010000001E100210022802C40000 +D6C8:01000FE007C00820082007C0000000007FFC010001001100100010001FF00000 +D6C9:01000FE007C00820082007C000007FFC01000100000020F8201020303ECC0000 +D6CA:01000FE007C00820082007C000007FFC01000100202021FC207020883E700000 +D6CB:01000FE007C00820082007C000007FFC010001001FF01000100010001FF00000 +D6CC:01000FE007C00820082007C000007FFC010001001FF000101FF010001FF00000 +D6CD:01000FE007C00820082007C000007FFC010001003EF802083E0820083E080000 +D6CE:01000FE007C00820082007C000007FFC010001003EF802883E8820883EF80000 +D6CF:01000FE007C00820082007C000007FFC010001003E8802883EF820883EF80000 +D6D0:01000FE007C00820082007C000007FFC010001003E1002103E1020283EC40000 +D6D1:01000FE007C00820082007C000007FFC010001003EF802803EF820803EF80000 +D6D2:01000FE007C00820082007C000007FFC010001003EFC02483E4820483EFC0000 +D6D3:01000FE007C00820082007C000007FFC010001003E2003FC3E7020883E700000 +D6D4:01000FE007C00820082007C000007FFC010001001FF01010101010101FF00000 +D6D5:01000FE007C00820082007C000007FFC01000100101010101FF010101FF00000 +D6D6:01000FE007C00820082007C000007FFC01000100222022203E2022503E880000 +D6D7:01000FE007C00820082007C000007FFC0100010000000100010002800C400000 +D6D8:01000FE007C00820082007C000007FFC010001000000024002400DA033100000 +D6D9:01000FE007C00820082007C000007FFC01000100000007C00820082007C00000 +D6DA:01000FE007C00820082007C000007FFC01000100000007E00080014006200000 +D6DB:01000FE007C00820082007C000007FFC01000100008007E00080014006200000 +D6DC:01000FE007C00820082007C000007FFC010001001FF000101FF0001000100000 +D6DD:01000FE007C00820082007C000007FFC010001001FF010001FF010001FF00000 +D6DE:01000FE007C00820082007C000007FFC0100010000001FF0044004401FF00000 +D6DF:01000FE007C00820082007C000007FFC0100010001001FF007C0082007C00000 +D6E0:0000040804083F8800081F08208820881F0800087FE8040804F8040804080000 +D6E1:04083F880E0811080E0800087FE8027802080000000007F80008000800080000 +D6E2:04083F880E0811080E0800087FE802780208000000003EF80208020802080000 +D6E3:04083F880E0811080E0800087FE802780208000000001F080108011401620000 +D6E4:04083F880E0811080E08000800087FE80278020802081000100010001FF80000 +D6E5:04083F880E0811080E0800087FE8027802080000000020F8201020303ECC0000 +D6E6:04083F880E0811080E0800087FE8027802080000202021FC207020883E700000 +D6E7:04083F880E0811080E0800087FE802780208000003F802000200020003F80000 +D6E8:04083F880E0811080E0800087FE802780208000007F8000807F8040007F80000 +D6E9:04083F880E0811080E0800087FE80278020800003EF802083E0820083E080000 +D6EA:04083F880E0811080E0800087FE80278020800003EF802883E8820883EF80000 +D6EB:04083F880E0811080E0800087FE80278020800003E8802883EF820883EF80000 +D6EC:04083F880E0811080E0800087FE80278020800000F8800880F8808140FA20000 +D6ED:04083F880E0811080E0800087FE80278020800003EF802803EF820803EF80000 +D6EE:04083F880E0811080E0800087FE80278020800003EFC02483E4820483EFC0000 +D6EF:04083F880E0811080E0800087FE80278020800003E1002FE3E3820443E380000 +D6F0:04083F880E0811080E0800087FE802780208000003F802080208020803F80000 +D6F1:04083F880E0811080E0800087FE80278020800000208020803F8020803F80000 +D6F2:04083F880E0811080E0800087FE8027802080000210821083F0821143F620000 +D6F3:04083F880E0811080E0800087FE8027802080000001000100010006801840000 +D6F4:04083F880E0811080E0800087FE80278020800000048004800A8011406620000 +D6F5:04083F880E0811080E0800087FE8027802080000000003F00408040803F00000 +D6F6:04083F880E0811080E0800087FE802780208000003F80020002000D003080000 +D6F7:04083F880E0811080E0800087FE8027802080000004003F8004000A003180000 +D6F8:04083F880E0811080E0800087FE802780208000003F8000803F8000800080000 +D6F9:04083F880E0811080E0800087FE802780208000003F8020003F8020003F80000 +D6FA:04083F880E0811080E0800087FE802780208000000000FF8022002200FF80000 +D6FB:04083F880E0811080E0800087FE802780208000000800FF803E0041003E00000 +D6FC:0000040A040A3F8A000A1F0A208A208A1F0A000A7FEA040A047A040A040A0000 +D6FD:04283FA80E2811280E2800287FA805E804280000000007F80008000800080000 +D6FE:04283FA80E2811280E2800287FA805E80428000000003EF80208020802080000 +D6FF:04283FA80E2811280E2800287FA805E80428000000001F080108011401620000 +D700:04283FA80E2811280E28002800287FA8042805E804281428100010001FF80000 +D701:04283FA80E2811280E2800287FA805E804280000000020F8201020303ECC0000 +D702:04283FA80E2811280E2800287FA805E804280000202021FC207020883E700000 +D703:04283FA80E2811280E2800287FA805E80428000003F802000200020003F80000 +D704:04283FA80E2811280E2800287FA805E80428000007F8000807F8040007F80000 +D705:04283FA80E2811280E2800287FA805E8042800003EF802083E0820083E080000 +D706:04283FA80E2811280E2800287FA805E8042800003EF802883E8820883EF80000 +D707:04283FA80E2811280E2800287FA805E8042800003E8802883EF820883EF80000 +D708:04283FA80E2811280E2800287FA805E8042800000F8800880F8808140FA20000 +D709:04283FA80E2811280E2800287FA805E8042800003EF802803EF820803EF80000 +D70A:04283FA80E2811280E2800287FA805E8042800003EFC02483E4820483EFC0000 +D70B:04283FA80E2811280E2800287FA805E8042800003E1002FE3E3820443E380000 +D70C:04283FA80E2811280E2800287FA805E80428000003F802080208020803F80000 +D70D:04283FA80E2811280E2800287FA805E8042800000208020803F8020803F80000 +D70E:04283FA80E2811280E2800287FA805E804280000210821083F0821143F620000 +D70F:04283FA80E2811280E2800287FA805E804280000001000100010006801840000 +D710:04283FA80E2811280E2800287FA805E8042800000048004800A8011406620000 +D711:04283FA80E2811280E2800287FA805E804280000000003F00408040803F00000 +D712:04283FA80E2811280E2800287FA805E80428000003F80020002000D003080000 +D713:04283FA80E2811280E2800287FA805E804280000004003F8004000A003180000 +D714:04283FA80E2811280E2800287FA805E80428000003F8000803F8000800080000 +D715:04283FA80E2811280E2800287FA805E80428000003F8020003F8020003F80000 +D716:04283FA80E2811280E2800287FA805E80428000000000FF8022002200FF80000 +D717:04283FA80E2811280E2800287FA805E80428000000800FF803E0041003E00000 +D718:0000040804083F8800081F08208820881F0800087FE804080408040804080000 +D719:04083F880E0811080E0800087FE8020802000000000007F80008000800080000 +D71A:04083F880E0811080E0800087FE802080200000000003EF80208020802080000 +D71B:04083F880E0811080E0800087FE802080200000000001F080108011401620000 +D71C:04083F880E0811080E08000800087FE80208020802081008100010001FF80000 +D71D:04083F880E0811080E0800087FE8020802000000000020F8201020303ECC0000 +D71E:04083F880E0811080E0800087FE8020802000000202021FC207020883E700000 +D71F:04083F880E0811080E0800087FE802080200000003F802000200020003F80000 +D720:04083F880E0811080E0800087FE802080200000007F8000807F8040007F80000 +D721:04083F880E0811080E0800087FE80208020000003EF802083E0820083E080000 +D722:04083F880E0811080E0800087FE80208020000003EF802883E8820883EF80000 +D723:04083F880E0811080E0800087FE80208020000003E8802883EF820883EF80000 +D724:04083F880E0811080E0800087FE80208020000000F8800880F8808140FA20000 +D725:04083F880E0811080E0800087FE80208020000003EF802803EF820803EF80000 +D726:04083F880E0811080E0800087FE80208020000003EFC02483E4820483EFC0000 +D727:04083F880E0811080E0800087FE80208020000003E1002FE3E3820443E380000 +D728:04083F880E0811080E0800087FE802080200000003F802080208020803F80000 +D729:04083F880E0811080E0800087FE80208020000000208020803F8020803F80000 +D72A:04083F880E0811080E0800087FE8020802000000210821083F0821143F620000 +D72B:04083F880E0811080E0800087FE8020802000000001000100010006801840000 +D72C:04083F880E0811080E0800087FE80208020000000048004800A8011406620000 +D72D:04083F880E0811080E0800087FE8020802000000000003F00408040803F00000 +D72E:04083F880E0811080E0800087FE802080200000003F80020002000D003080000 +D72F:04083F880E0811080E0800087FE8020802000000004003F8004000A003180000 +D730:04083F880E0811080E0800087FE802080200000003F8000803F8000800080000 +D731:04083F880E0811080E0800087FE802080200000003F8020003F8020003F80000 +D732:04083F880E0811080E0800087FE802080200000000000FF8022002200FF80000 +D733:04083F880E0811080E0800087FE802080200000000800FF803E0041003E00000 +D734:0000010001000FE0000007C00820082007C000007FFC04400440044004400000 +D735:01000FE007C00820082007C000007FFC044004401FF000100010001000100000 +D736:01000FE007C00820082007C000007FFC0440044000003EF80208020802080000 +D737:01000FE007C00820082007C000007FFC0440044000001E100210022802C40000 +D738:01000FE007C00820082007C0000000007FFC044004401440100010001FF00000 +D739:01000FE007C00820082007C000007FFC04400440000020F8201020303ECC0000 +D73A:01000FE007C00820082007C000007FFC04400440202021FC207020883E700000 +D73B:01000FE007C00820082007C000007FFC044004401FF01000100010001FF00000 +D73C:01000FE007C00820082007C000007FFC044004401FF000101FF010001FF00000 +D73D:01000FE007C00820082007C000007FFC044004403EF802083E0820083E080000 +D73E:01000FE007C00820082007C000007FFC044004403EF802883E8820883EF80000 +D73F:01000FE007C00820082007C000007FFC044004403E8802883EF820883EF80000 +D740:01000FE007C00820082007C000007FFC044004403E1002103E1020283EC40000 +D741:01000FE007C00820082007C000007FFC044004403EF802803EF820803EF80000 +D742:01000FE007C00820082007C000007FFC044004403EFC02483E4820483EFC0000 +D743:01000FE007C00820082007C000007FFC044004403E2003FC3E7020883E700000 +D744:01000FE007C00820082007C000007FFC044004401FF01010101010101FF00000 +D745:01000FE007C00820082007C000007FFC04400440101010101FF010101FF00000 +D746:01000FE007C00820082007C000007FFC04400440222022203E2022503E880000 +D747:01000FE007C00820082007C000007FFC0440044000000100010002800C400000 +D748:01000FE007C00820082007C000007FFC044004400000024002400DA033100000 +D749:01000FE007C00820082007C000007FFC04400440000007C00820082007C00000 +D74A:01000FE007C00820082007C000007FFC04400440000007E00080014006200000 +D74B:01000FE007C00820082007C000007FFC04400440008007E00080014006200000 +D74C:01000FE007C00820082007C000007FFC044004401FF000101FF0001000100000 +D74D:01000FE007C00820082007C000007FFC044004401FF010001FF010001FF00000 +D74E:01000FE007C00820082007C000007FFC0440044000001FF0044004401FF00000 +D74F:01000FE007C00820082007C000007FFC0440044001001FF007C0082007C00000 +D750:0000010001000FE0000007C00820082007C0000000007FFC0000000000000000 +D751:01000FE007C00820082007C0000000007FFC00001FF000100010001000100000 +D752:01000FE007C00820082007C0000000007FFC000000003EF80208020802080000 +D753:01000FE007C00820082007C0000000007FFC000000001E100210022802C40000 +D754:01000FE007C00820082007C0000000007FFC000000001000100010001FF00000 +D755:01000FE007C00820082007C0000000007FFC0000000020F8201020303ECC0000 +D756:01000FE007C00820082007C0000000007FFC0000202021FC207020883E700000 +D757:01000FE007C00820082007C0000000007FFC00001FF01000100010001FF00000 +D758:01000FE007C00820082007C0000000007FFC00001FF000101FF010001FF00000 +D759:01000FE007C00820082007C0000000007FFC00003EF802083E0820083E080000 +D75A:01000FE007C00820082007C0000000007FFC00003EF802883E8820883EF80000 +D75B:01000FE007C00820082007C0000000007FFC00003E8802883EF820883EF80000 +D75C:01000FE007C00820082007C0000000007FFC00003E1002103E1020283EC40000 +D75D:01000FE007C00820082007C0000000007FFC00003EF802803EF820803EF80000 +D75E:01000FE007C00820082007C0000000007FFC00003EFC02483E4820483EFC0000 +D75F:01000FE007C00820082007C0000000007FFC00003E2003FC3E7020883E700000 +D760:01000FE007C00820082007C0000000007FFC00001FF01010101010101FF00000 +D761:01000FE007C00820082007C0000000007FFC0000101010101FF010101FF00000 +D762:01000FE007C00820082007C0000000007FFC0000222022203E2022503E880000 +D763:01000FE007C00820082007C0000000007FFC000000000100010002800C400000 +D764:01000FE007C00820082007C0000000007FFC00000000024002400DA033100000 +D765:01000FE007C00820082007C0000000007FFC0000000007C00820082007C00000 +D766:01000FE007C00820082007C0000000007FFC0000000007E00080014006200000 +D767:01000FE007C00820082007C0000000007FFC0000008007E00080014006200000 +D768:01000FE007C00820082007C0000000007FFC00001FF000101FF0001000100000 +D769:01000FE007C00820082007C0000000007FFC00001FF010001FF010001FF00000 +D76A:01000FE007C00820082007C0000000007FFC000000001FF0044004401FF00000 +D76B:01000FE007C00820082007C0000000007FFC000001001FF007C0082007C00000 +D76C:00000008040804083F8800081F08208820881F0800087FE80008000800080000 +D76D:000004083F880E08110811080E0800087FE8000007F800080008000800080000 +D76E:000004083F880E08110811080E0800087FE8000000003EF80208020802080000 +D76F:000004083F880E08110811080E0800087FE8000000001F080108011401620000 +D770:000004083F880E08110811080E0800087FE8000008000800080008000FF80000 +D771:000004083F880E08110811080E0800087FE80000000010F8101010301ECC0000 +D772:000004083F880E08110811080E0800087FE800000808087F081C08220F9C0000 +D773:000004083F880E08110811080E0800087FE8000003F802000200020003F80000 +D774:000004083F880E08110811080E0800087FE8000007F8000807F8040007F80000 +D775:000004083F880E08110811080E0800087FE800003EF802083E0820083E080000 +D776:000004083F880E08110811080E0800087FE800003EF802883E8820883EF80000 +D777:000004083F880E08110811080E0800087FE800003E8802883EF820883EF80000 +D778:000004083F880E08110811080E0800087FE800001F0801081F0810141F620000 +D779:000004083F880E08110811080E0800087FE800003EF802803EF820803EF80000 +D77A:000004083F880E08110811080E0800087FE800003EFC02483E4820483EFC0000 +D77B:000004083F880E08110811080E0800087FE800001F08017F1F1C10221F1C0000 +D77C:000004083F880E08110811080E0800087FE8000003F802080208020803F80000 +D77D:000004083F880E08110811080E0800087FE800000208020803F8020803F80000 +D77E:000004083F880E08110811080E0800087FE80000110811081F0811141F620000 +D77F:000004083F880E08110811080E0800087FE80000001000100010006801840000 +D780:000004083F880E08110811080E0800087FE800000048004800A8011406620000 +D781:000004083F880E08110811080E0800087FE80000000003F00408040803F00000 +D782:000004083F880E08110811080E0800087FE8000003F80020002000D003080000 +D783:000004083F880E08110811080E0800087FE80000004003F8004000A003180000 +D784:000004083F880E08110811080E0800087FE8000003F8000803F8000800080000 +D785:000004083F880E08110811080E0800087FE8000003F8020003F8020003F80000 +D786:000004083F880E08110811080E0800087FE8000000000FF8022002200FF80000 +D787:000004083F880E08110811080E0800087FE8000000800FF803E0041003E00000 +D788:00000000040804083F880E08110820882088208811080E080008000800080000 +D789:000008087F081C082208220822081C0800080000000007F80008000800080000 +D78A:000008087F081C082208220822081C080008000000003EF80208020802080000 +D78B:000008087F081C082208220822081C080008000000001F080108011401620000 +D78C:000008087F081C082208220822081C080008000800001000100010001FF80000 +D78D:000008087F081C082208220822081C0800080000000020F8201020303ECC0000 +D78E:000008087F081C082208220822081C0800080000202021FC207020883E700000 +D78F:000008087F081C082208220822081C080008000003F802000200020003F80000 +D790:000008087F081C082208220822081C080008000007F8000807F8040007F80000 +D791:000008087F081C082208220822081C08000800003EF802083E0820083E080000 +D792:000008087F081C082208220822081C08000800003EF802883E8820883EF80000 +D793:000008087F081C082208220822081C08000800003E8802883EF820883EF80000 +D794:000008087F081C082208220822081C08000800000F8800880F8808140FA20000 +D795:000008087F081C082208220822081C08000800003EF802803EF820803EF80000 +D796:000008087F081C082208220822081C08000800003EFC02483E4820483EFC0000 +D797:000008087F081C082208220822081C08000800003E1002FE3E3820443E380000 +D798:000008087F081C082208220822081C080008000003F802080208020803F80000 +D799:000008087F081C082208220822081C08000800000208020803F8020803F80000 +D79A:000008087F081C082208220822081C0800080000210821083F0821143F620000 +D79B:000008087F081C082208220822081C0800080000001000100010006801840000 +D79C:000008087F081C082208220822081C08000800000048004800A8011406620000 +D79D:000008087F081C082208220822081C0800080000000003F00408040803F00000 +D79E:000008087F081C082208220822081C080008000003F80020002000D003080000 +D79F:000008087F081C082208220822081C0800080000004003F8004000A003180000 +D7A0:000008087F081C082208220822081C080008000003F8000803F8000800080000 +D7A1:000008087F081C082208220822081C080008000003F8020003F8020003F80000 +D7A2:000008087F081C082208220822081C080008000000000FF8022002200FF80000 +D7A3:000008087F081C082208220822081C080008000000800FF803E0041003E00000 +D7A4:00007FFE63866DF66DEE6DDE63DE7FFE7FFE61B66DB661866DF66DF67FFE0000 +D7A5:00007FFE63866DF66DEE6DDE63DE7FFE7FFE61866DBE61866DF66D867FFE0000 +D7A6:00007FFE63866DF66DEE6DDE63DE7FFE7FFE61CE6DBE618E6DB66DCE7FFE0000 +D7A7:00007FFE63866DF66DEE6DDE63DE7FFE7FFE61866DF661EE6DDE6DDE7FFE0000 +D7A8:00007FFE63866DF66DEE6DDE63DE7FFE7FFE61CE6DB661CE6DB66DCE7FFE0000 +D7A9:00007FFE63866DF66DEE6DDE63DE7FFE7FFE61CE6DB661C66DF66DCE7FFE0000 +D7AA:00007FFE63866DF66DEE6DDE63DE7FFE7FFE61866DB661866DB66DB67FFE0000 +D7AB:00007FFE63866DF66DEE6DDE63DE7FFE7FFE618E6DB6618E6DB66D8E7FFE0000 +D7AC:00007FFE63866DF66DEE6DDE63DE7FFE7FFE61C66DBE61BE6DBE6DC67FFE0000 +D7AD:00007FFE63866DF66DEE6DDE63DE7FFE7FFE618E6DB661B66DB66D8E7FFE0000 +D7AE:00007FFE63866DF66DEE6DDE63DE7FFE7FFE61866DBE618E6DBE6D867FFE0000 +D7AF:00007FFE63866DF66DEE6DDE63DE7FFE7FFE61866DBE618E6DBE6DBE7FFE0000 +D7B0:0040003000100010001003F00110001003F0011000100C1004D0071078100000 +D7B1:00000000000000000000000000000000030001001FF001003FF8000003000100 +D7B2:004000300010001000100010001000100010001001900C9C04F0071078100000 +D7B3:0048003600120012001200120012001200120012031E191209F20F1278020000 +D7B4:00080006000200020002000200020002001E00020302193209C20F0278020000 +D7B5:0008000600020002000200020002000200023FF20202021E0202021E00020000 +D7B6:0010008C006400240024002400240024002400247FE404240424042400040000 +D7B7:00480036001200120012001200120012001E00127FF211121112111200020000 +D7B8:00000000000000000000000000000000000000003FF808200BA000803FFC0000 +D7B9:00800060002000200020002000200020003C00200020002000E0072078200000 +D7BA:00080006000200020002000200020002001E00020002000200E2070278020000 +D7BB:00480036001200120012001200120012007200120012001200D2071278020000 +D7BC:00000000000000000000000000000000000000003FF80000038000803FFC0000 +D7BD:00000040013000D000500050005C00500050005C005000500E1002003FFC0000 +D7BE:0090046C03240124013C01240124013C01240124012401240024000400000000 +D7BF:011000CC00440044005C00440044005C00440044004400440044000400000000 +D7C0:0410034C01340114011401740114011401740114011401140114001400040000 +D7C1:000000200018000800080008000800080008070801003FF80000070001000100 +D7C2:00000020001800080008000800080008000839C808403FF80000000000000000 +D7C3:000000200018000800080008000800080008000800003FF80840084000000000 +D7C4:0048003600120012001200120012001200120012001200120012001200020000 +D7C5:00800060002000200020002000200020003C0020302038200820002000200000 +D7C6:0010008C00640024002400240024002401E40024302438240824002400040000 +D7C7:00007FFE63866DF66DEE6DDE63DE7FFE7FFE71866FF66FEE6FDE71DE7FFE0000 +D7C8:00007FFE63866DF66DEE6DDE63DE7FFE7FFE71CE6FB66FCE6FB671CE7FFE0000 +D7C9:00007FFE63866DF66DEE6DDE63DE7FFE7FFE71CE6FB66FC66FF671CE7FFE0000 +D7CA:00007FFE63866DF66DEE6DDE63DE7FFE7FFE71866FB66F866FB671B67FFE0000 +D7CB:0000000000000000000000000000000060FE2002200220FE2080268038FE0000 +D7CC:000000000000000000000078C00043FE402040304C4871840000000000000000 +D7CD:000000000000000000000000000000000000FDF8208020802080268018780000 +D7CE:00000000000000000000000000000000FFB62212221E22122212265E19920000 +D7CF:00000000000000000000000000000000FD98208820F82088208826F818880000 +D7D0:0000000000000000000000000000000000007C38200820082018262438C20000 +D7D1:00000000000000000000000000000000000078EE2022202220622492390A0000 +D7D2:0000000000000000000000000000000000007C7E200820082018262438C20000 +D7D3:00000000000000000000000000000000003C7C00207E20082018262438C20000 +D7D4:00000000000000000000000000000000000000007EFC1040107C13400C3C0000 +D7D5:00000000000000000000000000000000000000003DDC04443C4420443C440000 +D7D6:0000000000000000000000000000001C3DC0047E04483C5C206220623C5C0000 +D7D7:00000000000000000000000000000000000000007BDC08447BDC42047BC40000 +D7D8:0000000000000000000000000000001C7BC00A7E0A487A5C426243E27A1C0000 +D7D9:000000000000000000000000000004807A5E0A480BC87A48424843C87A4E0000 +D7DA:0000000000000000000000000000049E7A440A420BD27A4A424243C47A5E0000 +D7DB:000000000000000000000000000000083C08041C04223C22202220223C1C0000 +D7DC:0000000000000000000000000000000EF780101F1304F48E84918491F30E0000 +D7DD:000000000000000000001FF800081FF810001FF8000003E00410041003E00000 +D7DE:0000000000000000000000000000000000007DC044404440444044407C3E4000 +D7DF:0000000000000000000000000000000000007B30491049104910491078CC4000 +D7E0:00000000000000000000000000000000000000003E7C2244224422443E7C2040 +D7E1:0000000000000000000000000000000000000480F4889784948C9492F7A18000 +D7E2:00000000000000000000000000000000000000003EFC2220223022483E842000 +D7E3:000000000000000000000000000000004400227C22203E20222022203E3C0000 +D7E4:0000000000000000000000000000000049DE244424523DCA250225043DDE0000 +D7E5:000000000000000000000000000000004400227C22443E44224422443E7C0040 +D7E6:000000000000000000000000000000004488224422443E7C224422443E7C0000 +D7E7:000000000000000000000000000000009000485E4848788849484A287A2E0000 +D7E8:000000000000000000000000000000004400220022FC3E20223022483E840000 +D7E9:000000000000000000000000000000004478220022FC3E20223022483E840000 +D7EA:0000000000000000000000000000000000000800047C04440C441244617C0040 +D7EB:00000000000000000000000000000044007C0844047C04000C38124461380000 +D7EC:000000000000000000000000000000000000123C0904090419042684CC440000 +D7ED:000000000000000000000000000000000000123E0910091019102690CC5E0000 +D7EE:00000000000000000000000000000000000010200810082818442482C2FE0000 +D7EF:000000000000000000000000000000000000000010FC082018302448C2840000 +D7F0:000000000000000000000000000000000078100008FC082018302448C2840000 +D7F1:000000000000000000000000000000000000100008FC0840187C2440C23C0000 +D7F2:000000000000000000000000000000380000107C0810083818442444C2380000 +D7F3:0000000000000000000000000000000001102088108828F844888288FEF80000 +D7F4:0000000000000000000000000210010801F8210811F8287044888270FE000000 +D7F5:000000000000000000000000000000000800087C1C442244224422441C7C0040 +D7F6:000000000000000000000000000000380800087C1C102238224422441C380000 +D7F7:00000000000000000000000000000000000000003F4404440C7C1244217C0040 +D7F8:000000000000000000000000000000000000000001297D2911EF292945EF0108 +D7F9:00000000000000000000000000000000000000007EFC08201830244842840000 +D7FA:000000000000000000000000000000007800104048202820086010907B080000 +D7FB:0000000000000000000000000000000078FC10404840287C08401040783C0000 +D7FC:00007FFE63866DF66DEE6DDE63DE7FFE7FFE61C66FBE63BE6FBE6FC67FFE0000 +D7FD:00007FFE63866DF66DEE6DDE63DE7FFE7FFE618E6FB663B66FB66F8E7FFE0000 +D7FE:00007FFE63866DF66DEE6DDE63DE7FFE7FFE61866FBE638E6FBE6F867FFE0000 +D7FF:00007FFE63866DF66DEE6DDE63DE7FFE7FFE61866FBE638E6FBE6FBE7FFE0000 +F900:0080108810881FF8100800007FFE00000FF008100FF00810042002447FFE0000 +F901:00047FFE008010841FFE10841FFC10841FFC10840880050003000CC0703E0000 +F902:010001047FFE010011081FFC11081FF811081FF8110801047FFE010001000000 +F903:FFFE04403FF824483FF800001FF010101FF010101FF010101FF00C60F01E0000 +F904:410821FC21080978894857FE540421F82108C1F8410841F8C108C13841100000 +F905:010001083FFC210821083FF8210801047FFE410441047FFC4104010001000000 +F906:0800080008041FFE200440041FC41044104410441FC410440044003800100000 +F907:08400FE0084010807FFC11447F7C05447F6C05547D6C05447F7E05027CFC0000 +F908:08400FE0084010807FFC11447F7C05447F6C05547D6C05447F7E05027CFC0000 +F909:080008027F7E08127F1208127F22084E098401007FFE020002C00C30700E0000 +F90A:0080018002400420081010086FF6010001083FFC01001118091009247FFE0000 +F90B:01029142FFE29112911297D29552955297D29552F39295420922111E01040000 +F90C:020002047FFE02400420181867E6000000083FFC00801890108C238441040000 +F90D:2214221E2FD42224B27EAFA2AABEAAA22FBE2222233E26A22A94222222422000 +F90E:010010841FFE92205FBC52481FBE12A232BEDFA2923E232226BE4A9492220000 +F90F:3FFC224422443FFC0844109024FE79900A9014FC7E9000FC34902A904AFE0000 +F910:04207FFE04201FF812481FF808A012903DFE0A9014FC7E9028FC549054FE0000 +F911:110411FE112455FC7F2455FC544455F87C2455FE109214101A94E37242220000 +F912:41FC21242924FDFC092411FC2524282073FEAC20247020A82126222220200000 +F913:07FE4492349217FE024804FE1748FAFE17C8107E15481AFE3040C80087FE0000 +F914:2108210847D05454E7F824485454FFFE45500104FFFE05200910310EC1040000 +F915:2100110811FC010842902C9028601198160661F821082108610861F821080000 +F916:1080108810FC108855505920523050C8930610FC18842484248440FC80840000 +F917:00800888FCFC1108129010601060FD98120611F815081908E10841F801080000 +F918:04407FFE0440244011F8150845902A600890110817FE6108210821F861080000 +F919:0420FE24283E2824FE44AAA8AA10AA28CE4482FEFE4482448244FE7C82440000 +F91A:44407E48487C48887F4848307E3048487E8643FC02845684AA84AAFC0C840000 +F91B:0720F92091204A20FF201420FFA092A0BDA080A0BEA094A28CA292A2A39E0000 +F91C:02002744387E224432442A542A54224C224426443A44225C0448084070400000 +F91D:13DE125213DEFE5213DE12223BFE562253FE92AA93FE1222127212AA13260000 +F91E:13DE125213DE125257DE5A2253FE522293FE12AA1BFE262222B2432E82240000 +F91F:04207FFE04207EFC42847EFC42847EFC41045FF44AA44FE441044544593C0000 +F920:1208110827D0783C2792783E2BA852940FE008200FF808000FFE292244940000 +F921:0080208420843FFC00003FF820282FC821082FE829282FEA410A41269FD20000 +F922:47D02510251407DE845057D85524252427C0C00047FC44A4C4A4C4A44FFE0000 +F923:04207FFE04203F0024243F3E21403F9024083F8800001FF8124812487FFE0000 +F924:43E822882A88FFCE0A5013E826842A8473E0A80027F822A822A822A827FE0000 +F925:100010401020FC2413FE1000140C1908F1085090109010909020702427FE0000 +F926:49247E484A4849244BFC7AA44A544BFC48407B684AD84B684ADABB6692420000 +F927:212422482248A924FFFCAAA4AA54ABFCF800AB6822D82B6836DAE26643420000 +F928:010020843FFE240022BE2FE428A42FA828A82FA428A229322BAC4CA088200000 +F929:10444A7E7F44424442447E7C424442447E444A7C44444A4452A4E11C42080000 +F92A:2080124813FC020842082BF82A08120813F86244224822306290670822060000 +F92B:00404C20292411FE310449FC890419FC294249448928091049483B8611020000 +F92C:1024093E3FA4212421283F28212821243F242122242222322D2C712020200000 +F92D:010001047FFE010011101110111029284384054009201110210C410401000000 +F92E:0040804060A02890090812461422282023FCC0084010402041C0402000100000 +F92F:04101554165824900A2811443FFE200241043FF8010802080488087030200000 +F930:107C124013FEFE4413FA124216FE1AA4F3FE52A412FC122095FE7842239C0000 +F931:109010F81110FFFC112411FC392455FC5554924A91FC110411FC110411FC0000 +F932:107C124013FE124457FA5A4252FE52A892F812A81AF8240025FC495497FE0000 +F933:011001F821003FFE21042FF8210223FE224823F822482FFC292449249FFE0000 +F934:01000100010C3FE8011001247FFE0080010006300CC017046404040603FC0000 +F935:04207FFE04A010F81FFE11041FF8110213FE124813F8124817F825285FFE0000 +F936:01F801003FFE21042FF0210227FE24483FFE244827F820802FFC41048E380000 +F937:00407C44447E448445487C305448108651025CFC508450845C84F0FC40840000 +F938:1FF841027FFE81043D7801403E7822483ED02B30084E2EF828887EF820880000 +F939:04400FE010883FFC51081FF811081FF8244422224FF208100FF008100FF00000 +F93A:3E7C22443EB808442EFA28887FF810101FF010101FFC10001FFE292244940000 +F93B:0044047CFE88108811F020103FFE6420A52224B4246827A43D2224E200400000 +F93C:208410FC1088FD0805F0081013FE3020592C94A8147010A8172612E210400000 +F93D:108810FC2088250845F0F81013FE2820FD2C44A8007028A8552656E280400000 +F93E:042004207FFE042003E0022007E000447FFE108808D006A00890738E21040000 +F93F:1044187C1444228840F8FC1011FE1020FF2694B4586851A81E26F0E240400000 +F940:010020843FFE222022243FFE22243FFC280428202FA4283829A25E22883E0000 +F941:202010201050FC88010602FA780003FE7A5202527BFE4A524A527A524A460000 +F942:087E7F40147C7F04227C3E40227C3E40227E2E42243E00801FF800847FFE0000 +F943:7FFC010001103FF8010001047FFE082008247FFE082008201020202040200000 +F944:10401F7E289045483F7E2240147C7F04227C3E40227C3E40227C2242263E0000 +F945:08807EFC14807FFC22043EFC22803EFE22827FFE08100FF008107FFE00100000 +F946:010020843FFE2004490809100FF81100210001047FFE01000100010001000000 +F947:00047FFE020007F00C10141067F002047F7E10201E3C326452A41E3C12240000 +F948:44807E8444FE44847D48463044487C86450244FC7C844484288444FC84840000 +F949:1FF841027FFE81043D7801003D78010020083FFC21083FF821083FF820080000 +F94A:1FF011101FF011101FF01010FEFE9292FEFE9292FEFE01103FF80104FFFE0000 +F94B:3FFC200420043FFC24883FFE24882FFC28842FFC21003FFE222041609F9E0000 +F94C:102011FC112413FEFD2411FC182035FC552451FC904097FE1090107017CE0000 +F94D:2080124413FE020442042BFC2A041228122463FE222024506488690632020000 +F94E:440427FE240407FC840057FE542027FE2622C73246AA4B32CAAAD2AA62260000 +F94F:1FFC10841FFC10841FFC1104022004601F8002083FFC108404A01B9861060000 +F950:1020102021FC252447FEF92413FE2A22FFFE442003FE288855905460839E0000 +F951:8804F9FE88109090A2FEA292929292928AAA8AC6CA82B29E8284820083FE0000 +F952:22202220FFA022243EFE08247F24492449247F240844FF44088408BC09080000 +F953:24203E202420242425FE3C242424242424243C242444244424A45D1C88080000 +F954:00408FFE60002BFC0A9412F4120423FC2000C3F840404FFE4248444408420000 +F955:0040804863FC2840084417FE11082204248AC1FC430844904860419E0E040000 +F956:04200E28F1FC102015FEFE481086194236785088914812301050118E16040000 +F957:102011FC2020242447FEF88811042A82FCF84508028828505460559886060000 +F958:042004207FFE05201FF801007FFE04201A1863F604201A4001800670780E0000 +F959:8848FBFC88409044A7FEA090910C928488F88988CA90B4A0806081988E060000 +F95A:202013FEFC2001FC00007BFE025203FE790401FC790449FC490479FC4B060000 +F95B:080408FE7F44122824101A2811C660381FC000881FFC00807FFE008007800000 +F95C:2108210847D05454E7F824485454FFFE45500104FFFE05200910310EC1040000 +F95D:2088108813FEFC8800A80020782403FE784000FC79844A844C8478FC48840000 +F95E:00100FF80810081009100890089008107FFE0810081010101090207040200000 +F95F:010020843FFE250454A827E400001FF812487FFE00003FFC0080078001000000 +F960:080008040BFE7E44124424481C300A48118660020500248824A6242243F00000 +F961:010000847FFE01042248179001001A5067EC452401007FFE0100010001000000 +F962:10081FFC11081FF811081FF8144804403FFC044004447FFE0420181860060000 +F963:088008800880088C0888F89008E008800880088008801884E8844886087C0000 +F964:000E09F0FC26212420A823FE3CA86524A62225FE252225FE3D2225FE21020000 +F965:100417FE1040244427FE244467FCA44427FC244422402140208021402E3E0000 +F966:190411FE220045FC990411FC210461FCA08021FC230824902060219826060000 +F967:00047FFE008000800100030005200910110C2106410201000100010001000000 +F968:20001040102404244488288828881290129464A224A220C061846284247E0000 +F969:08407F404940FFC4497E7FC808487F4849487F481028FF90222C1C46F3820000 +F96A:01083FFC010021043FFE210442281FC0011002083FF4008404A01B9861060000 +F96B:0100022007D0101024247B7E018202407CBC03001C4001981E6001801E000000 +F96C:010020823FFE42241FFC02201FFC02207FFE0490088817F6208200847FFE0000 +F96D:01000D10090811662142408001080FFC18086FF808080FF808080FF808080000 +F96E:04207FFE042009107FFE091009F008000FFC00807FFE02C004A0189860860000 +F96F:210810881090FE2001FC0104FD040104FDFC0154FC5084508492FD12860E0000 +F970:028842FC248818882688410E140012FCFF84104838485430922810C613020000 +F971:10041FFE1000101017F8100010041FFE124012481250222022904F0884060000 +F972:204010401040024443FE2A442C48104010406040204020A061226222241E0000 +F973:1040104010A0FD101208100615FA1800F10851FC11081108910871F821080000 +F974:042004207FFE04200420010001047FFE020004080FFC1408640807F804080000 +F975:104010201024FFFE100011FC15041904F1FC5124102011A8912472E224420000 +F976:008044847EFE54845548543054487C86550254FC54847C84448400FC00840000 +F977:020001047FFE00000FF008100FF000003FFE200247C4044004421842603E0000 +F978:00047FFE010001047FFE41045144492449245554659441044124411C40080000 +F979:00808040604427FE080013FC1204220423FCC22440204230452848E410440000 +F97A:10080BFC4048254C094A0A4A30B8131010847FFE02C004A00890108E60840000 +F97B:11FC110495FC550459FC1000FDFE112419FC352455FC902011FC102013FE0000 +F97C:010008900FF8081008100FF0081008100FF00900088C08700B203C1810060000 +F97D:204010201024FFFE000001FC7D0401047DFC01247CA844A445227EE244400000 +F97E:1FF010101FF010101FF000047FFE11101FF011101FF001003FF801007FFE0000 +F97F:7FD049107FD049125FFE52525FD252525FD242125FD2525253D29C6E90C40000 +F980:08100FF80810081008100FF00910010012081FFC1008100810081FF810080000 +F981:020003000200020002047FFE042004200820082010400E8001800670780E0000 +F982:21043FFE208020F828802FFE28842FF82A4A2BFE2A482FF82D285528AFFE0000 +F983:104008400844FEFE2080251C3EE024A624A424982490249024A85DC688820000 +F984:4048207C244007FE844457FA544225FE2524C5FC452445FCCA94CA8A44FA0000 +F985:03FE0A48FFFE224822FC22947AFCCA944AFC4A104AFE4A927AFA4C8608820000 +F986:7E7E42427E7E42427E7E400247E2442247E241024FF248124FF2481E40040000 +F987:89DCFC0093FE92AAFEAA9020FDFE9150FDFC855405FC5594AED8A49218EE0000 +F988:3E7C00003E7C2A542B5400803FFC22403FF822483FF828522F6248429F3E0000 +F989:0E407842087E7E920C221A42299E4A4404A01898649603E004903B8C11040000 +F98A:01000100010001083FFC01080108010801080208020804080888107060200000 +F98B:3FFE21082E7022143FFE221027382AD4329227F8240827F8240847F884080000 +F98C:20043FFE20842F7822103FFE221027382AD6321220402440247C44409FFE0000 +F98D:21242124FD7422DAFB74A954FAFAAF56F820A82423FEFEB02128222624220000 +F98E:0C0008080FFC1080208048880FFC0880088008847FFE00800080008000800000 +F98F:124C1148115017FE58D055485246920813BE14881AA8117E1108120814080000 +F990:1204110427C8701C23C84812FBFE5254AA6AABAA040025042492241243F80000 +F991:1210121413D2FA9012FE159012901990F12852461C8210009324749228920000 +F992:4020282427FE042081FC512455FC2F2425FCC42047FE4420C420DA2051FE0000 +F993:1020102413FE102057FE5A22532652AA93FE1222187024A82526422280200000 +F994:00101410FAFE2210207E2052207EFF52217E2152211039FEE1104690047E0000 +F995:002000F03F000104FFFE054009203118C0761F800108FFFC0100010001000000 +F996:102413FE202027FE4622FB2612AA2BFEFA224420007028A85526562280200000 +F997:0488FE88255227BC3C88255427DC3C22255427542D54F5DC4454049005100000 +F998:08103F7C08107F7E142822C440823FFE08880FF808880FF800807FFE00800000 +F999:04207FFE0420204017FC104003F8024873F8124813F8104017FC684047FE0000 +F99A:0040404437FE104003FC024413FCFA4413FC1244104017FE3040C84087FE0000 +F99B:1020182415FE222041FEFD2211A6116AFFFE9522587050A81F26F22240200000 +F99C:01027F820822082209220FA21122312249220A22042204020812100E60040000 +F99D:0100010019181106211A402001C00680188467FE0084010402240C1C30080000 +F99E:020293FEFA229222922293FA9222922292629252F28A930A020203FE02020000 +F99F:01047F84082408240FA41124312449240A04041C780800002444222242220000 +F9A0:01047FA408241F2431240A243D1C00887FFE028004480C50742007180C060000 +F9A1:210810881090FE2001FC0104FD040104FDFC0154FC5084508492FD12860E0000 +F9A2:21043FFE222021442FFE21402FF821483FFE21482FF8214023604550994C0000 +F9A3:01000280044008201110608C00000FE000200140048024842412441203F80000 +F9A4:102010201050FC881126121215FC1808F010501012C412A2928A7488207C0000 +F9A5:0420FE202050208825763E0225DC6554955415DC0800088810882156C2220000 +F9A6:10401F7E28907FFE24202FFC22402FF822483FFE22482FF826504A48B2460000 +F9A7:01244E482A48112433FC4A548AA41BFC28404B688AD80B6A4A5A3B6612420000 +F9A8:008001800240042009101088208640121FF8001000200640018000C000400000 +F9A9:20043FFE2104218422442524389C20042FF420442384208420843FFC20040000 +F9AA:010020843FFE250454A827E400001FF812487FFE00003FFC0080078001000000 +F9AB:108410841FFC00000BFE142022FC498404FC7F8402FC048438FC044805860000 +F9AC:1040104010A011105A0854465422902013FC1008101010A01060103010100000 +F9AD:00200860FC501088110412421022FC20100811FC14081810E0E0401000100000 +F9AE:08102A542C584890142822447FFE40043FF8010001001FF8012001147FFE0000 +F9AF:442024202850FE50108810A67D12101010FCFE04100810D02020401080100000 +F9B0:0220FF20245024503C88254626223C20240025FC2E08F4484430041004100000 +F9B1:10201820145022884106FE4210201020FE0495FE580850501E20F01040100000 +F9B2:1FF841027FFE81043D7801003D7806C01930E08E0FF000200040038000600000 +F9B3:1FF841027FFE81043D7801007BDE4A527BDE00007FFC091019302548FFFE0000 +F9B4:080409FE082014FC2284498484FC04847FFC0284248418FC0884085803860000 +F9B5:080008420FE21212125233F25452965219521092109211121102121E14040000 +F9B6:205011FC1154FDFC055409FC100033FE580095FC150411FC1088105013FE0000 +F9B7:0428FEFE28AA28FEFEAAAAFEAA00ABFECE0082FCFE8482FC8284FE4883FE0000 +F9B8:10201024FFFE18243424D3FE10247DFC0124FEA210B4586897A4B12210620000 +F9B9:00047FFE02403E7C200420043E7C02407FFE0000048024442452241243F80000 +F9BA:00083FFC00080010002000C00080008000800080008000800880078001000000 +F9BB:084008440FFE10A2151433F8560C9BFA120813F810401248144419C210420000 +F9BC:010020843FFE21045FFC24281FF028184FF608100FF000800CB0138C21040000 +F9BD:10041FFE100410041FFC104410401F4C1268125012502448244649C240800000 +F9BE:0808490849482A2828280A08FF4808280C281A0E2A3849C88888080808080000 +F9BF:2108210847D05454E7F824485454FFFE45500104FFFE05200910310EC1040000 +F9C0:1040104017FE14A2531455F85B0C55FA910811F818202528262444E288420000 +F9C1:008010441FFE90405FFE551413F8120C37FADA0893F82040225045C888860000 +F9C2:04207FFE042000007EFC12240E1C326403800C60771E00600F9800603F800000 +F9C3:0040404437FE1294010803FC150AF9F8110811F81128122634E2C84087FE0000 +F9C4:104008447F7E2240147C7F04007C3E40227C3E40227C3E40227E2E42243E0000 +F9C5:10101FF810101FF050127FFE81047FFC11101FF011101FF001007FFE01000000 +F9C6:44087DFC44004800500453FE48904890449044906490591242124412480E0000 +F9C7:180267C242524A525A5265929E122112DED204127F922492150217DE7C040000 +F9C8:100813FC10881088FC881088188837F854885088908890881088108817FE0000 +F9C9:104010D2131E1252FE5212521A523652525253D2925290561092111012100000 +F9CA:2080104417FE0040409029082BFC1004124862482248224A624A644A28460000 +F9CB:408025FE2612041284925562564E24842000C7FC444447FCC444C7FC44040000 +F9CC:00400824FDFE10201040108811FCFC041128112815281928E22A442A08260000 +F9CD:0200270438FE204422447D5C20881FF8108810881FF8108810881FF810080000 +F9CE:00400424FFFE1040108823FC3C846400A4A824A824A824A83D2A222A04260000 +F9CF:1000100423FE24444444F84410442844FDFC4484008428845484548487FE0000 +F9D0:49042AFE2A10087C7F441C442A7C49440A7C09447F44087C1444222842C60000 +F9D1:020001000180008000047FFE0000000004200420081008101008200640020000 +F9D2:F720112855243320552699F808201422E3A2082472280D12722A0C46F1820000 +F9D3:8840F8488BFC9040A044A7FE9090910C8A448840C848B3FC804080448FFE0000 +F9D4:0840086008901108121635FA500097FE1492149217FE14921492149214860000 +F9D5:0100210821083FF8210802800C60F7DE00003FF824483FF82448244824180000 +F9D6:204010C010A0011042082DF6280017FC14A464A427FC24A464A464BC24080000 +F9D7:10201020FE5010887D0656FA54007DFC55547D5455FC1154FF541154110C0000 +F9D8:184813FC204840489FFE104823F86048A04023FC2040204427FE204020400000 +F9D9:100417FE109013FE5A92569253FE9202102417FE102011B01128122614220000 +F9DA:00047FFE02401FF8124812481FF8108800847FFE02C004A00890108E60840000 +F9DB:010000847FFE01042248179001001A5067EC452401007FFE0100010001000000 +F9DC:8908FDFC8A089090A060A198960691F888008928CBFCB42081FC802087FE0000 +F9DD:010207827C1204120492FFD204120E1215122492449284020412040E04040000 +F9DE:008000847FFE008010841FFE108410841FFC108408800480030004C0783E0000 +F9DF:3FFC20043FFC208024FE298432FC228424FC2C40347C24C82530444885860000 +F9E0:08100FF808100FF008100FF0081004040FFE1124222444440884113802100000 +F9E1:010001047FFE05400920111861060FF0004000847FFE00800480038001000000 +F9E2:03043C2404247FA40C241624251C448800847FFE02C004A00890108E20840000 +F9E3:220413FE1204020443FC2A042A40124C124862502260244064426842303E0000 +F9E4:010409FEFD24112411FC11241124FDFC11241020142019FCE020402407FE0000 +F9E5:010010841FFE908051C25712111217D23112D192935225522902411E81040000 +F9E6:3FFC224422443FFC2044112011FE5B20552091FC112011FC1120112411FE0000 +F9E7:01047FFE00000FF808880FF808883FFC00807FFE028804501CA0651806060000 +F9E8:410421FE2924FD2409FC1124252429FC7124AC20242021FC2020202427FE0000 +F9E9:10081FFC110811081FF8110811081FF81108010001083FFC010001047FFE0000 +F9EA:10500848FFC8557E494849C8557E7F4808487F48497E55487B48417E47400000 +F9EB:40047FFE422042205FFC42A041045FFE420047F84A08520843F842087FFE0000 +F9EC:408227BE20820082879E5492541027BE28A2C4924186469AD8E2C71C42080000 +F9ED:010000847FFE08100420024001800E70700E1FF81008100810081FF810080000 +F9EE:1222112410A813FE54A859245222510891DE124819A824BE2508420884080000 +F9EF:02221124F8A823FE20A821242222FA0823BE228826A839FEE108420804080000 +F9F0:04207FFE04203E7C22443E7C22443E7C27E42C8437E4248427E4249C27E80000 +F9F1:8A4CF948895097FEA150A2489C4692088BBE8C88CAA8B13E8208840888080000 +F9F2:21243D2424A84BFCFCA8552456227D0855FE55487F4844E854BEAB08AA080000 +F9F3:08A444647F2854FE7F28556455A27F0454EE54A45D2456B4545E5D8497040000 +F9F4:08200820082008247FFE082008201CB02AA8292849244A240C22082208200000 +F9F5:42102210221002948FFE52105310229026B8CA5452525212C210C21042100000 +F9F6:8480FE8490FE910092F8FC88848884F88400FFDE925292529252FFDE82520000 +F9F7:02000100008000883FFC000008100810042004200240024000847FFE00000000 +F9F8:102010201F3E285044880100008000883FFC042004200240024000847FFE0000 +F9F9:104092209220540455FE1000FE84108418883448524852509010901013FE0000 +F9FA:044024502448244824403FFE045004507C502450244824482484450686020000 +F9FB:0200021007F80C203240088007000C807098089008A0114002200C1830060000 +F9FC:2110109013F4FD52015200907BFE00107BD202527BD44A484BCA7A5648220000 +F9FD:08400840084010401040304057FE904010401040104010401040104010400000 +F9FE:042004207FFE0420058002400420189860861FF8008004A00890108E60840000 +F9FF:08020882FFD208128892FFD2889288928B9288921C122A024992888E08040000 +FA00:2000200423FE204424442E44F044204422442444284430842144023804100000 +FA01:010020843FFE222022243FFE222023E0200027F82210212020C043309C0E0000 +FA02:1000100413FEFC4010401040148419FEF284548410841084908470FC20840000 +FA03:1040112495FE552059FC1124FDFE112419FC352055FC9284128414FC18840000 +FA04:020041087FFC4008809001C07E000410043807C0FC0004040404040603FC0000 +FA05:220413FE1204020446F42A042A0412F41294629422F422946204621C22080000 +FA06:1FF010101FF010101FF004403FFC04407FFE11102928474405C01930630C0000 +FA07:11FE1000FEFC10847C8454FC7C0055FE7D22552211FEFF22112211FE11020000 +FA08:180811FC200040000C040BFE1010301050109010101010101090107010200000 +FA09:44887CFC44884950502050504B8E482045FC44A065245BFE4020402040200000 +FA0A:00201FF0102010201FE0102010201FE0102010201FE014A408843086C07C0000 +FA0B:20843FFE22003FDE20122F9428942F9820143FD22112221A2F9442108E100000 +FA0C:0008FFFC08800880088008800880088008801080108420844086807C00000000 +FA0D:0848087C7F4808483F48008E7F0082FE3E4400443E28221022283E4622820000 +FA0E:10500848FEFE459026FC189008FC149024FEC0803FF00820044003800C60F01C +FA0F:2090208821042240F84020A020902108220425FA21083908C108010801F80108 +FA10:120213FE1404100013FEFC401086174412A811301EE8E0A84124062200C00000 +FA11:204020202BFEA800A908A890AFFEA808ABC8AA48AA48BBC8CA48000800280010 +FA12:00204BFE7C2049FC48204FFE780049FC490449FC490479FC4904011C01080000 +FA13:1088108813FE1088FC8810443884357E51045324951411141104110411141108 +FA14:12441124108813FEFC9011083A1434E2502051F8902013FC1020102010A01040 +FA15:8BD46A9E2A940A941BD42A5C2A54CBD04A92529263EE00002444222242220000 +FA16:00404C40284611F4304848508BFE184029FC4B04890409FC490439FC11040000 +FA17:08300420024002447FFE04200810100C60041FF812481248124812487FFE0000 +FA18:00403E40004000407F4008402A402A402A402A404A404A4008420842083E0000 +FA19:202010201124FDFE0524092411FC31245924952415FC11241020102010200000 +FA1A:210C10881050FFFE04200820102031FC58209420142413FE1020102010200000 +FA1B:200413FE1000FCF80488088810F8300059FC952415FC1124112411FC11040000 +FA1C:202023FE102011FCFC2003FE440045FC290429FC11041DFCE104411C01080000 +FA1D:102413FE922054FC542011FEFE0010FC188434FC528492FC1084109C10880000 +FA1E:02047FFE0E1C121422244244060C0A14122422444284020412240E1C04080000 +FA1F:0440FFFE044004403EFC228422FC3E8422FC22403EFE232222D2428A4AF2840C +FA20:0820FFFE08A01CF0F11012F810A8FCF810A831FC392455FC552491FC1022101E +FA21:202021202120F9FCAA20AC20A820A820A9FCF820A820202028203820CBFE0000 +FA22:204010401044FDF4004800507BFE004079FC0284788448FC488478FC48840000 +FA23:100810481028FE08108810481008FE0E11F810085C085008500870088C0083FE +FA24:000023FC10880888409020BC10840084F0C411481128121014282844448283FE +FA25:011041F83110122407FE02441244FBFC106010A811261622301EC80087FE0000 +FA26:082408BE3EA409240A287FE8042809241FA431225F221132112C1F2011200000 +FA27:1020102029FE4424B82813FE10207C4010FC1308541039FE10101C10E0500020 +FA28:1020102029FC4420B82017FE11047C8811FC102054203BFE10201C20E0200020 +FA29:00407C8045F8490849F8510851F8490045FE450045FC5884449447F440044018 +FA2A:1008189C14E02A804884BEFE22A43EA422A83EA820A8249026A87B4622820000 +FA2B:100019FE14022A0248FABE0222F23E9222923E9220F2249226027A1E20040000 +FA2C:1020181014922AFE4904BEF822883E8822F83E8020FC248426847AFC20840000 +FA2D:1030102092FCFE84A2FC28847EFC4880FEFE48807EFE480248AA7F5641540000 +FA2E:0800087C7E44424842487E50424842487E4451444A4444684450524062404040 +FA2F:10201020FCFC102411FE7C2400FC7C200124FCA8107054A85324922210A03040 +FA30:090009040BFE140013F83288524892081FFE12881248120817FE100810700000 +FA31:09080890081013FE1222332652AA93FE100011FC110411FC110411FC11040000 +FA32:080008801FC0108021107FF8A210221022103FF02290048408843086C07C0000 +FA33:202022203F20222444FEFF24492449247F24494408441884291A480287FE0000 +FA34:2220FFA022203E2408FE7F2449247F240824FFA408447F4408A40F9CF1080000 +FA35:010022083FFC208820883FF821083FF82288048008847FFE0080008000800000 +FA36:020893FCFA0893F8920893F89288910293FE9622FA229252028A03F2001C0000 +FA37:011097FEF91091F0904097FC944497FC904097FCF0409FFE00A003180C060000 +FA38:22443F7E224422443E7C012002147FFE081012087F7E224422443E7C22440000 +FA39:11FE1102110211FEFD44112811FE1148154819FEE24842480488090800000000 +FA3A:10081FFC14A812A81FF800801FFC00807FFE144812A620821FF800847FFE0000 +FA3B:3FFC200420043FFC222421402FFC2A9429242FFC240827F8440847F884080000 +FA3C:010001000100210421042104210421043FFC21040100010002000C0070000000 +FA3D:1200120413FE14005BF85288524892481FFE12881248124817FE100810700000 +FA3E:200424BE278824A8B4A8AFA8A4A827FE24102518249825A82E4A248A210E0000 +FA3F:110C1088109013FE5A22572652AA93FE120211FC110411FC110411FC11040000 +FA40:0110355027D4405E97B4201467D4A10827D421262FC204842452241243F80000 +FA41:202021203FA02024407E3EC82A482A48FFC852284A304A107FA802460C820000 +FA42:44047EFE441044507C50449044947DFE4410401048304C505492E112420E0000 +FA43:0FF008100FF008100FF409081FF001207FFE008007F87C0807F8040807F80000 +FA44:1100110413FE1000FDFC11441924352457FE52889248924817FE100810700000 +FA45:4200220423FE0C008BF85288524822482FFEC48844484448C7FEC01040E00000 +FA46:00402040104403F8405028642FFE108011FC23046DFC2104210421FC21040000 +FA47:41102FFE211001F0804057FC544427FC2040C7FC40404FFEC080C3304C0E0000 +FA48:01000FEC010801107FFE008007F00C1017F0641007F004102444222242220000 +FA49:001000F83F00010C108808900820000000000000000000000000000000000000 +FA4A:00040BFEFC401080114C124812B07D2012B0106814A81924E222452008C00000 +FA4B:012405FEFF24112411FC21243D2465FCA5442490251427FE3C10241000100000 +FA4C:202010201020FC200420082811FC302058209420142010201020102413FE0000 +FA4D:202010201020FC2005200924113E312059209520152011201120112417FE0000 +FA4E:2008109C10E0FC800480088410FE308858889488148811081108120814080000 +FA4F:204010401044FDFE044008401080308459FE968414841084108410FC10840000 +FA50:210811FC1108FD080508090811F831085908950815F811081108110817FE0000 +FA51:210411FE1104FD040504090411FC3154585094501450105210921112120E0000 +FA52:208810FC1088FC8804B808A810A833FE5A0296F2129212F21292120E12040000 +FA53:20201024103EFC2005FC090411FC310459FC950415FC11041050108813060000 +FA54:0848FFFC08487F4800487F8E81003EFC00487E4808487F302A30494889860000 +FA55:010020843FFE200444481830614C012001047FFE0100028004401830600E0000 +FA56:104010401F7E289045083E7C22443E4422443E44224424442E5C734821400000 +FA57:102413FE202027FE4622FB2612AA2BFEFA224420007028A85526562280200000 +FA58:100413FE208824884552FBDE10002BFEFC0045FC010429FC550455FC81040000 +FA59:20203FBE55443FA415181FA6014202101FE002107FFC208400A01B9861060000 +FA5A:3FFC224422443FFC21041FE801107FFE008007F80C0837F8040807F804080000 +FA5B:020002083FC802100224FFFE010002100FF818102810CFF008100FF008100000 +FA5C:09100FF808100FF008100FF008100FF0082000947FFE014002200C1E70040000 +FA5D:000000000000042004207FFE0420042000000000000000000000000000000000 +FA5E:000000000000042004207FFE0420042000000000000000000000000000000000 +FA5F:042004207FFE052001081FD001207FFE010007F81C0867F8040807F804080000 +FA60:41FC210429FCFD0409FC1124244028FE7122AF222552218A210221F2200C0000 +FA61:21FC1104110405FC7F04090411FC3904550495FC1154105010521092170E0000 +FA62:210411FE1104FDFC010401FC794000FE792203227952498A490279F2480C0000 +FA63:2088108813FEFC8800F8002079FC012479FC00207BFE482049FC78204BFE0000 +FA64:21043FFE20045FF40510092031400FF078100FF008100FF008100FF0381C0000 +FA65:890CFC8888508BFEFA228B268AAAFBFE880089FCF90489FC510489FC89040000 +FA66:400030001000000000001000F80010001000100010003000C80087FE00000000 +FA67:011041F83110122407FE02441244FBFC106010A811261622301EC80087FE0000 +FA68:22A0FF9022903EFE09907E904A907EFC08907E9008FCFF90149422FE42800000 +FA69:111E27D27A5413D82A567A92135C60901FF804447FFE08100FF008100FF00000 +FA6A:080409FE28202EFC28842884FFFC088428FC288449848AFC0484185861860000 +FA6B:01300108FFFE01003FF8210821083FF8210821083FF80100258C24966632C3E0 +FA6C:00007F7E480248027F02417E41407F40484248427F7E00002488224442448004 +FA6D:102038202DFE67024102FCF810881088FEF8008000807CFC4484448444847CFC +FA6E:00007FFE61866FB663866FB66FB67FFE7FFE73866FBE638E6DBE73867FFE0000 +FA6F:00007FFE61866FB663866FB66FB67FFE7FFE73866FBE638E6DBE73BE7FFE0000 +FA70:1010082004407FFC0440044004404444244414481450044004400440FFFE0000 +FA71:47F8240824080408040817F811202120E1202120222022222422281E10000000 +FA72:0100010002800440082010102FE8C106010001001FF00100010001007FFC0000 +FA73:10041FC414842494249464946494AFD424942494249424942484288428943088 +FA74:02000100FFFE04000400082010103FF80448044004400440084408441044603C +FA75:04447C7804421C3EE4003FF821083FF821083FF804403FF80440FFFE10102008 +FA76:3FF0066001803FF821083FF821083FF82108220802007FF80408080810506020 +FA77:0800080010001FF8200840088008040802080108010800080008000800500020 +FA78:03F87A084BF84A084BF849004BFC4C444A447AA44A0403F40004002800100000 +FA79:0100010079FC4A044D0449E44A8448844FF448847AA44AA403E4000400280010 +FA7A:010001F8F20893F0901097FE90809144966890B0F128966800A4012206A00040 +FA7B:01F87908490849F84908490849F848004BFC7A944A940294029407FE00000000 +FA7C:200027FE2402280427FEF8802184224426A821303AF0E4A8412802240CA20040 +FA7D:102011FC1020108813FEFC8811FC110411FC110411FC1D04E1FC408801040202 +FA7E:020002007FFC044009203118DFF6111011101FF0111011101FF40104010400FC +FA7F:020002007FFC044009203118CFE60100092008207FFC08200820102010202020 +FA80:1040108011FC1124FD2425FC2524254425FC4890291013FE2810441084100010 +FA81:2108209023FE2108F9084A524B9C49088A524BDE304010A42AAA4A8A84780000 +FA82:010000803FFE22102F90221E2FA422243FD4241427942488448848948AA41142 +FA83:010000803FFE200027FC244427FC244427FC211027FC21102FFE400042088404 +FA84:010007847804088844902522200204047F880C10162215022484440884100460 +FA85:0808083C13C020044A44092811FC3220502093FE102011241124112411FC1004 +FA86:100013FE1202128A1A5257FE5242522293FE12821282128212FA1202120A1204 +FA87:2040204027FC204033F8AA08A3F8A208A3F8220823F822082FFE211022082404 +FA88:010002800C6037D8C0063E0822483E4822483E482208261801004884481287F2 +FA89:11041088100013FE1A2256AA5272522293FE100011FC110411FC110411FC1104 +FA8A:21082108210827D0311EAF94A124AFD4A21423D422542248224824D424242842 +FA8B:22204AA08ABE1FC420A46F24A0282FA822102FA822442F8201004884481287F2 +FA8C:08207F280824FFFE00207F2049247F2449247F2822287F102212FFAA22464182 +FA8D:204020A021102208FDF6200023C42A543254E3D42254225423D42244A25442C8 +FA8E:10A0112C11241124FDAC1124112415FC182031FCD08810501020105050882306 +FA8F:200023FC22042204FBFC220022842A4832FCE248224823FE24482448A8885108 +FA90:0820082008207F3E08443E440844FFA410281E281210121022282A4844848102 +FA91:002000207BFE482049FC48204BFE780049FC490449FC490479FC490401140108 +FA92:1000087C7E44424442447E7C424442447E44407C484444445A84628441140208 +FA93:1000087CFF44207C2044267C3844209401087FFC010001003FF801000100FFFE +FA94:1010101010101010FDFE10103010391055105490909010501020105011881606 +FA95:FFFE02000200040007F8080810102410422001400080010002000C0070000000 +FA96:040044782848104828484486920010FCFE441044582854289210122850442182 +FA97:0080204017FE10808110420847FC100410002248E24822482248224A244A0846 +FA98:0004203E17C0124481244128420013FC14402040EFFE20402444244427FC0004 +FA99:01082088109017FE810841084210129414A42738E1082210221024A427BC0084 +FA9A:0110211017FE111081F040404BF80A4813F81040E7FC20402FFE20A02110060C +FA9B:022042202FB822480F90827C4F9450141FFE2894EF9428FC2F9428902A900930 +FA9C:020002083FD00220FFFE01000FF03810CFF0081008100FF00000488844448444 +FA9D:00A0009079FE49104B107DFE4910491079FE4910491049FE79004AA402520452 +FA9E:00FC7F00220811107FFC44447FFC00087E0842FE7E0842487E28480874284210 +FA9F:440029F81108290849088908090819282910490089020902090250FE20000000 +FAA0:0040884453F42048505097FE1040108031F85308950811F811081108A1F84108 +FAA1:00200020FBFE202021FC210421FCF90421FC210421FC3904E3FE408801040202 +FAA2:082004407FFC12483CF0082014503EF800007FFC08000FE0092010A41624181C +FAA3:FFFE000000004FE4492449244FE44924492449244FE4400440047FFC00040000 +FAA4:008000401FFE100097FC54A454A417FC30405150924814442150224844448040 +FAA5:010000803FFE200027F8A40867F8240827F86000AFFC2924292449247FFE8000 +FAA6:101008200000FFFE000008201010200840043FF82448244824482448FFFE0000 +FAA7:009000883FFC208020883E48225022244A54448C81043FF824482448FFFE0000 +FAA8:010001007FFC01001FF0101010101FF010101FF010101FF010101010FFFE0000 +FAA9:00FC7C84448444FC7C0045FE45027D0245FE450245027DFE4502010A01040000 +FAAA:082004407FFC01003FF80200FFFE04000FF018102FF0C8100FF008100FF00810 +FAAB:00200020FBFE202021FC410479FC4904C9FC490449FC49047BFE488801040202 +FAAC:020001007FFE4822909411F822886870ABAE282029FC282028A8292422A42040 +FAAD:104010403F7E4890850800007E7C42447E4442447E44484444545A4862404040 +FAAE:01001110092001007FFC05400920111060080100FFFE0280044008203018C006 +FAAF:108010F811082290206065986646A48825F02420244825FC2020212422A22040 +FAB0:1020102023FE242045FCF92411AC21744924FDFC0420007054A8552482220020 +FAB1:208420483C0050FC90481048FE48104811FE5448544854485C48648804880108 +FAB2:020002083FD002200240FFFE010002000FF0181028104FF0881008100FF00810 +FAB3:08200820FFFE0A200100FFFE100010001FF8000011101110111021124112810E +FAB4:04400440FFFE04407FFC11101110FFFE111011107FFC0100FFFE010001000100 +FAB5:100010F810887C8854F85488548854F87C0051FC115415541D54E55443FE0000 +FAB6:200013BE00A2F0A210BE238822086A3EB22A2BAA20AA20BE2088208A257E2202 +FAB7:FFFE04403FF824483FF8120027FC42088BF8120833F8510093F8151010E0171E +FAB8:200011FC1104F90409FC1104110439FC5504950411FC1050109010921112120E +FAB9:200011FC0124FD240174792401FC7904017479544954497449047A044A140408 +FABA:2020102201FAFC2400287BFE0020784000FC79844A8448FC4884788448FC0084 +FABB:2020102003FEFC2001FC782003FE780001FC790449FC490449FC790449140108 +FABC:200011FC1104FDFC01047DFC00807DFE02227D224552450245FA7C0244140008 +FABD:2088108803FEFC8800A8782003FE7840008078FC49844A844884788448FC0084 +FABE:204010A00110FA0805F6780003C47A5402547BD44A544A544BD47A444A5402C8 +FABF:2088108803FEFC8800F8782001FC792401FC78204BFE482049FC78204BFE0000 +FAC0:210447C88812F3BC20084B92F83E0380AAAAABAA08001FF8282007C01830E00E +FAC1:0104788848004BFE7A224AAA4A727A224BFE480079FC010451FC490489FC0104 +FAC2:204020A02110FA0825F6F800ABC4FA54AA54FBD42254FA5423D42244225422C8 +FAC3:07FC440427FC242004A80470E4A8250424A024FC252024202BFE282050208FFE +FAC4:0050FE9628922892FED6AA92AA92AAFEAE10C2FC8244FE4482288210FE2882C6 +FAC5:100213E22942254A414AB94A114A13EAFD4A114A954A594A51421E42E24A4444 +FAC6:00207C2245FA4824482853FE4820484044FC4584468468FC5084408440FC4084 +FAC7:22282224FF40227E3EC809487F7E49487F48087E7F480848FF48147E22404140 +FAC8:2020102013FEFC2001FC08208BFE880049FC490451FC51041DFCE10441140108 +FAC9:104410447DFE2444FE4401FE7C4044FE7D9212FE7C9210FE50927C9210921086 +FACA:110023DE7A5213D42A527BDA1294235001003FF80440FFFE10101FF010101FF0 +FACB:7EFE401040205EFC5284528452FC5A8454FC5084528454FC5848508481020000 +FACC:080008FE28102E2028FC2884FF8400FC08842AFC2A844C8484FC08483084C102 +FACD:3F042018FF62220C7F7001007FFC01001FF0101011101110FFFE082010102008 +FACE:04003FF820083EF802807A800AFCFE940AD47AA402A47AD40A94FEFC0A8279FE +FACF:20CC273021103110AFFEA110A2A824282844210222902A482A543214221021F0 +FAD0:20CC273021103110AFFEA110A2A82428284423FA220823F82208220823F82208 +FAD1:10281024102013FEFC2010A838A834A850A850A89128112A122A142610201020 +FAD2:2000229E22522252F5522112229272526C32A3D2A25A22542250225023D02250 +FAD3:03FC789048904890789048904FFE789048904890489079104910021004100000 +FAD4:0020002078204BFE482078204924492479244AAA482048507850488801040202 +FAD5:02200220F47C94449DA8F510952895D6F51095FE95109538F454949204100410 +FAD6:10401F7E28904508BEF822883EF822883EF820082EE824482EE8244828482018 +FAD7:1044108813DEFC881088108813DEFC88108810885C885108520870008C0083FE +FAD8:20007CFC44847CFC44847CFC0040FEFE9312FE9292AAFE8200FAFE0244148408 +FAD9:3FFE22202FBC2520223C3F84203C2FA028BC2FA028BC2FA048BC48A2899E0000 +FADA:00007FFE61866FB663866FB66FB67FFE7FFE63866DB66D866DB663B67FFE0000 +FADB:00007FFE61866FB663866FB66FB67FFE7FFE638E6DB66D8E6DB6638E7FFE0000 +FADC:00007FFE61866FB663866FB66FB67FFE7FFE63C66DBE6DBE6DBE63C67FFE0000 +FADD:00007FFE61866FB663866FB66FB67FFE7FFE638E6DB66DB66DB6638E7FFE0000 +FADE:00007FFE61866FB663866FB66FB67FFE7FFE63866DBE6D8E6DBE63867FFE0000 +FADF:00007FFE61866FB663866FB66FB67FFE7FFE63866DBE6D8E6DBE63BE7FFE0000 +FAE0:00007FFE61866FB663866FB66FB67FFE7FFE61CE6FB663B66FB661CE7FFE0000 +FAE1:00007FFE61866FB663866FB66FB67FFE7FFE61EE6FCE63EE6FEE61C67FFE0000 +FAE2:00007FFE61866FB663866FB66FB67FFE7FFE61866FF663866FBE61867FFE0000 +FAE3:00007FFE61866FB663866FB66FB67FFE7FFE618E6FF663C66FF6618E7FFE0000 +FAE4:00007FFE61866FB663866FB66FB67FFE7FFE61B66FB663866FF661F67FFE0000 +FAE5:00007FFE61866FB663866FB66FB67FFE7FFE61866FBE63866FF661867FFE0000 +FAE6:00007FFE61866FB663866FB66FB67FFE7FFE61CE6FBE638E6FB661CE7FFE0000 +FAE7:00007FFE61866FB663866FB66FB67FFE7FFE61866FF663EE6FDE61DE7FFE0000 +FAE8:00007FFE61866FB663866FB66FB67FFE7FFE61CE6FB663CE6FB661CE7FFE0000 +FAE9:00007FFE61866FB663866FB66FB67FFE7FFE61CE6FB663C66FF661CE7FFE0000 +FAEA:00007FFE61866FB663866FB66FB67FFE7FFE61866FB663866FB661B67FFE0000 +FAEB:00007FFE61866FB663866FB66FB67FFE7FFE618E6FB6638E6FB6618E7FFE0000 +FAEC:00007FFE61866FB663866FB66FB67FFE7FFE61C66FBE63BE6FBE61C67FFE0000 +FAED:00007FFE61866FB663866FB66FB67FFE7FFE618E6FB663B66FB6618E7FFE0000 +FAEE:00007FFE61866FB663866FB66FB67FFE7FFE61866FBE638E6FBE61867FFE0000 +FAEF:00007FFE61866FB663866FB66FB67FFE7FFE61866FBE638E6FBE61BE7FFE0000 +FAF0:00007FFE61866FB663866FB66FB67FFE7FFE61CE6FB663B66FB66FCE7FFE0000 +FAF1:00007FFE61866FB663866FB66FB67FFE7FFE61EE6FCE63EE6FEE6FC67FFE0000 +FAF2:00007FFE61866FB663866FB66FB67FFE7FFE61866FF663866FBE6F867FFE0000 +FAF3:00007FFE61866FB663866FB66FB67FFE7FFE618E6FF663C66FF66F8E7FFE0000 +FAF4:00007FFE61866FB663866FB66FB67FFE7FFE61B66FB663866FF66FF67FFE0000 +FAF5:00007FFE61866FB663866FB66FB67FFE7FFE61866FBE63866FF66F867FFE0000 +FAF6:00007FFE61866FB663866FB66FB67FFE7FFE61CE6FBE638E6FB66FCE7FFE0000 +FAF7:00007FFE61866FB663866FB66FB67FFE7FFE61866FF663EE6FDE6FDE7FFE0000 +FAF8:00007FFE61866FB663866FB66FB67FFE7FFE61CE6FB663CE6FB66FCE7FFE0000 +FAF9:00007FFE61866FB663866FB66FB67FFE7FFE61CE6FB663C66FF66FCE7FFE0000 +FAFA:00007FFE61866FB663866FB66FB67FFE7FFE61866FB663866FB66FB67FFE0000 +FAFB:00007FFE61866FB663866FB66FB67FFE7FFE618E6FB6638E6FB66F8E7FFE0000 +FAFC:00007FFE61866FB663866FB66FB67FFE7FFE61C66FBE63BE6FBE6FC67FFE0000 +FAFD:00007FFE61866FB663866FB66FB67FFE7FFE618E6FB663B66FB66F8E7FFE0000 +FAFE:00007FFE61866FB663866FB66FB67FFE7FFE61866FBE638E6FBE6F867FFE0000 +FAFF:00007FFE61866FB663866FB66FB67FFE7FFE61866FBE638E6FBE6FBE7FFE0000 +FB00:0000001B2424247E2424242424240000 +FB01:0000001A2220207E2222222222220000 +FB02:0000001E2222227A2222222222220000 +FB03:000000162A28287E2A2A2A2A2A2A0000 +FB04:0000001E2A2A2A7E2A2A2A2A2A2A0000 +FB05:000000384848485E4848484848460000 +FB06:0000001C242424364444241414620000 +FB07:00007FFE618E6FB6638E6FB66F8E7FFE7FFE73866DF66DEE6DDE73DE7FFE0000 +FB08:00007FFE618E6FB6638E6FB66F8E7FFE7FFE73CE6DB66DCE6DB673CE7FFE0000 +FB09:00007FFE618E6FB6638E6FB66F8E7FFE7FFE73CE6DB66DC66DF673CE7FFE0000 +FB0A:00007FFE618E6FB6638E6FB66F8E7FFE7FFE73866DB66D866DB673B67FFE0000 +FB0B:00007FFE618E6FB6638E6FB66F8E7FFE7FFE738E6DB66D8E6DB6738E7FFE0000 +FB0C:00007FFE618E6FB6638E6FB66F8E7FFE7FFE73C66DBE6DBE6DBE73C67FFE0000 +FB0D:00007FFE618E6FB6638E6FB66F8E7FFE7FFE738E6DB66DB66DB6738E7FFE0000 +FB0E:00007FFE618E6FB6638E6FB66F8E7FFE7FFE73866DBE6D8E6DBE73867FFE0000 +FB0F:00007FFE618E6FB6638E6FB66F8E7FFE7FFE73866DBE6D8E6DBE73BE7FFE0000 +FB10:00007FFE618E6FB6638E6FB66F8E7FFE7FFE7BCE73B67BB67BB671CE7FFE0000 +FB11:00007FFE618E6FB6638E6FB66F8E7FFE7FFE7BEE73CE7BEE7BEE71C67FFE0000 +FB12:00007FFE618E6FB6638E6FB66F8E7FFE7FFE7B8673F67B867BBE71867FFE0000 +FB13:000000000814305D5555555555330000 +FB14:000000000C1414575454555555360000 +FB15:000000000C1414565555555555350404 +FB16:00000000503C1455555555555533101C +FB17:00000000182828ADADADADADAD6A0808 +FB18:00007FFE618E6FB6638E6FB66F8E7FFE7FFE7BCE73B67BCE7BB671CE7FFE0000 +FB19:00007FFE618E6FB6638E6FB66F8E7FFE7FFE7BCE73B67BC67BF671CE7FFE0000 +FB1A:00007FFE618E6FB6638E6FB66F8E7FFE7FFE7B8673B67B867BB671B67FFE0000 +FB1B:00007FFE618E6FB6638E6FB66F8E7FFE7FFE7B8E73B67B8E7BB6718E7FFE0000 +FB1C:00007FFE618E6FB6638E6FB66F8E7FFE7FFE7BC673BE7BBE7BBE71C67FFE0000 +FB1D:00000000001C04040400040000000000 +FB1E:0042423C000000000000000000000000 +FB1F:000000000077111111003E0000000000 +FB20:00000000001212121212121212FE0000 +FB21:00000000000000000000300C300C0C0C030C0CF030C03030300C300C00000000 +FB22:000000000000000000003FFC0030003000300030003000300030003000000000 +FB23:000000000000000000003FFC000C000C0C0C0C0C0C0C0C0C0C0C0C0C00000000 +FB24:000000000000000000003FFC000C000C000C000C000C000C000C3FF000000000 +FB25:0000000000000C000C000FFC000C000C000C000C0030003000C00F0000000000 +FB26:00000000000000000000FFFC0C0C0C0C0C0C0C0C0C0C0C0C0C0C0FFC00000000 +FB27:000000000000000000003FFC000C000C000C000C000C000C000C000C00000000 +FB28:000000000000000000000FFC0C0C0C0C0C0C0C0C0C0C0C0C0C0C3C0C00000000 +FB29:00000000000000080808087F00000000 +FB2A:000000010049494949494949497F0000 +FB2B:000000400049494949494949497F0000 +FB2C:0000000100494949494D4949497F0000 +FB2D:0000004000494949494D4949497F0000 +FB2E:0000000000464222122C484442411C00 +FB2F:0000000000464222122C484442411C08 +FB30:0000000000424222122C484442410800 +FB31:00000000007C040404240404047F0000 +FB32:000000000030080808440C1422420000 +FB33:00000000007E04040424040404040000 +FB34:00000000007E0202222A222222220000 +FB35:00000000003808080828080808080000 +FB36:0000000000300C0A0828080808080000 +FB37:00007FFE618E6FB6638E6FB66F8E7FFE7FFE63867DF671EE7DDE63DE7FFE0000 +FB38:0000000000464A4242524242427E0000 +FB39:00000000003808080820000000000000 +FB3A:00000000007E02020212020202020202 +FB3B:00000000007E020202120202027C0000 +FB3C:00000020203E02020212040408300000 +FB3D:00007FFE618E6FB6638E6FB66F8E7FFE7FFE638E7DB671B67DB6638E7FFE0000 +FB3E:00000000004E31214149414141470000 +FB3F:00007FFE618E6FB6638E6FB66F8E7FFE7FFE63867DBE718E7DBE63BE7FFE0000 +FB40:00000000001C040404240404043C0000 +FB41:00000000007E42424252424244780000 +FB42:00007FFE618E6FB6638E6FB66F8E7FFE7FFE6D866DF661867DBE7D867FFE0000 +FB43:00000000007E42424272020212020202 +FB44:00000000007E424242720212027E0000 +FB45:00007FFE618E6FB6638E6FB66F8E7FFE7FFE6D866DBE61867DF67D867FFE0000 +FB46:000000000042422418084402027E0000 +FB47:00000000007E222A2224282020202020 +FB48:00000000007E02020212020202020000 +FB49:0000000000494949494D4949497F0000 +FB4A:00000000003E2222222A222222620000 +FB4B:00000020003808080808080808080000 +FB4C:00000070007C040404040404047F0000 +FB4D:00000070007E020202020202027C0000 +FB4E:00000070007E424242720202027E0000 +FB4F:0000602020464222122C484442420000 +FB50:040A1E20080808080808080000000000 +FB51:102878802020202020201F0000000000 +FB52:000000000000000422423C0008000800 +FB53:000000000000000422423F0008000800 +FB54:00000000000000080404F80008000800 +FB55:00000000000000080404FF0008000800 +FB56:000000000000000422423C0014000800 +FB57:000000000000000422423F0014000800 +FB58:00000000000000080404F80014000800 +FB59:00000000000000080404FF0014000800 +FB5A:000000000000000422423C0014001400 +FB5B:000000000000000422423F0014001400 +FB5C:00000000000000080404F80014001400 +FB5D:00000000000000080404FF0014001400 +FB5E:000008000800000422423C0000000000 +FB5F:000008000800000422423F0000000000 +FB60:00000800080000080404F80000000000 +FB61:00000800080000080404FF0000000000 +FB62:000014001400000422423C0000000000 +FB63:000014001400000422423F0000000000 +FB64:00001400140000080404F80000000000 +FB65:00001400140000080404FF0000000000 +FB66:000020203838000422423C0000000000 +FB67:000020203838000422423F0000000000 +FB68:000010101C1C00080404F80000000000 +FB69:000010101C1C00080404FF0000000000 +FB6A:0008001200060A0642423C0000000000 +FB6B:0008001200060A0642423F0000000000 +FB6C:0010002400003824140CF80000000000 +FB6D:0010002400003824140CFB0000000000 +FB6E:000A000A00060A0642423C0000000000 +FB6F:000A000A00060A0642423F0000000000 +FB70:0028002800003824140CF80000000000 +FB71:0028002800003824140CFB0000000000 +FB72:00000000000000007E1020484048221C +FB73:00000000000000007E1423484048211E +FB74:0000000000000000700CFC0020002000 +FB75:0000000000000000700CFF0020002000 +FB76:00000000000000007E1020405440221C +FB77:00000000000000007E1423405440211E +FB78:0000000000000000700CFC0050000000 +FB79:0000000000000000700CFF0050000000 +FB7A:00000000000000007E2040544048221C +FB7B:00000000000000007E2241544048211E +FB7C:0000000000000000700CFC0028001000 +FB7D:0000000000000000700CFF0028001000 +FB7E:00000000000000007E2040544054221C +FB7F:00000000000000007E2443544054211E +FB80:0000000000000000700CFC0050005000 +FB81:0000000000000000700CFF0050005000 +FB82:000000000000080402427C0028000000 +FB83:000000000000080402427F0028000000 +FB84:000000280000080402427C0000000000 +FB85:000000280000080402427F0000000000 +FB86:000010002800080402427C0000000000 +FB87:000010002800080402427F0000000000 +FB88:002020383800080402427C0000000000 +FB89:002020383800080402427F0000000000 +FB8A:00000008001400000402020204483000 +FB8B:00000008001400000402030204483000 +FB8C:00000008080E0E000402020204483000 +FB8D:00000008080E0E000402030204483000 +FB8E:00000004081020403C827E0000000000 +FB8F:00000004081020403C827F0000000000 +FB90:00000004081020403C02FE0000000000 +FB91:00000004081020403C02FF0000000000 +FB92:00081024481020403C827E0000000000 +FB93:00081024481020403C827F0000000000 +FB94:00081024481020403C02FE0000000000 +FB95:00081024481020403C02FF0000000000 +FB96:00081024481020403C827E0010001000 +FB97:00081024481020403C827F0010001000 +FB98:00081024481020403C02FE0010001000 +FB99:00081024481020403C02FF0010001000 +FB9A:00500618620C30403C827E0000000000 +FB9B:00500618620C30403C827F0000000000 +FB9C:00500618620C30403C02FE0000000000 +FB9D:00500618620C30403C02FF0000000000 +FB9E:00000000000000000422424244380000 +FB9F:00000000000000000422434244380000 +FBA0:000010101C1C00000422424244380000 +FBA1:000010101C1C00000422434244380000 +FBA2:000010101C1C00080404F80000000000 +FBA3:000010101C1C00080404FB0000000000 +FBA4:001820182000101824243C0000000000 +FBA5:1820182004040C14243C070000000000 +FBA6:000000000000101824243C0000000000 +FBA7:000000000000000000102F4000000000 +FBA8:00000000000000000010F01010140800 +FBA9:00000000000000000010F31414140808 +FBAA:000000000000102C2A1A244000000000 +FBAB:000000000000102C2A1A274000000000 +FBAC:000000000000102C2A1AE40000000000 +FBAD:000000000000102C2A1AE70000000000 +FBAE:00000000000000000008141020407F00 +FBAF:000000000000000000000F1020407F00 +FBB0:00000000003040304008141020407F00 +FBB1:000000000030403040000F1020407F00 +FBB2:00001818000000000000000000000000 +FBB3:00000000000000000000000000001818 +FBB4:00000C6C600000000000000000000000 +FBB5:000000000000000000000000000C6C60 +FBB6:003030006C6C00000000000000000000 +FBB7:00000000000000000000003030006C6C +FBB8:006C6C00181800000000000000000000 +FBB9:00000000000000000000006C6C001818 +FBBA:000C6C60031B18000000000000000000 +FBBB:000000000000000000000C6C60031B18 +FBBC:00000000000000000000000024241212 +FBBD:003030000C0C00000000000000000000 +FBBE:000000000000000000003030000C0C00 +FBBF:00000000000000000000000814242810 +FBC0:0010101C1C0000000000000000000000 +FBC1:00000000000000000000000010101C1C +FBC2:00007FFE618E6FB6638E6FB66F8E7FFE7FFE71866FF66F866FBE71867FFE0000 +FBC3:00007FFE618E6FB6638E6FB66F8E7FFE7FFE718E6FF66FC66FF6718E7FFE0000 +FBC4:00007FFE618E6FB6638E6FB66F8E7FFE7FFE71B66FB66F866FF671F67FFE0000 +FBC5:00007FFE618E6FB6638E6FB66F8E7FFE7FFE71866FBE6F866FF671867FFE0000 +FBC6:00007FFE618E6FB6638E6FB66F8E7FFE7FFE71CE6FBE6F8E6FB671CE7FFE0000 +FBC7:00007FFE618E6FB6638E6FB66F8E7FFE7FFE71866FF66FEE6FDE71DE7FFE0000 +FBC8:00007FFE618E6FB6638E6FB66F8E7FFE7FFE71CE6FB66FCE6FB671CE7FFE0000 +FBC9:00007FFE618E6FB6638E6FB66F8E7FFE7FFE71CE6FB66FC66FF671CE7FFE0000 +FBCA:00007FFE618E6FB6638E6FB66F8E7FFE7FFE71866FB66F866FB671B67FFE0000 +FBCB:00007FFE618E6FB6638E6FB66F8E7FFE7FFE718E6FB66F8E6FB6718E7FFE0000 +FBCC:00007FFE618E6FB6638E6FB66F8E7FFE7FFE71C66FBE6FBE6FBE71C67FFE0000 +FBCD:00007FFE618E6FB6638E6FB66F8E7FFE7FFE718E6FB66FB66FB6718E7FFE0000 +FBCE:00007FFE618E6FB6638E6FB66F8E7FFE7FFE71866FBE6F8E6FBE71867FFE0000 +FBCF:00007FFE618E6FB6638E6FB66F8E7FFE7FFE71866FBE6F8E6FBE71BE7FFE0000 +FBD0:00007FFE618E6FB6638E6FB66F8E7FFE7FFE63CE6DB66DB66DB663CE7FFE0000 +FBD1:00007FFE618E6FB6638E6FB66F8E7FFE7FFE63EE6DCE6DEE6DEE63C67FFE0000 +FBD2:00007FFE618E6FB6638E6FB66F8E7FFE7FFE63866DF66D866DBE63867FFE0000 +FBD3:100028020A120A2242423C0000000000 +FBD4:100028020A120A2242423F0000000000 +FBD5:20005004081020403C02FE0000000000 +FBD6:20005004081020403C02FF0000000000 +FBD7:000018180810200C12121E0204483000 +FBD8:000018180810200C12121F0204483000 +FBD9:000000221408000C12121E0204483000 +FBDA:000000221408000C12121F0204483000 +FBDB:000000080404000C12121E0204483000 +FBDC:000000080404000C12121F0204483000 +FBDD:000033341324400C12121E0204483000 +FBDE:000008001200000C12121E0204483000 +FBDF:000008001200000C12121F0204483000 +FBE0:000000000000000C12121E021C483000 +FBE1:000000000000000C12121F021C483000 +FBE2:000000081422000C12121E0204483000 +FBE3:000000081422000C12121F0204483000 +FBE4:000000000000000C5248443800100010 +FBE5:00000000000000004C52493000100010 +FBE6:00000000000000080804F80008000800 +FBE7:00000000000000080804FB0008000800 +FBE8:00000000000000080804F80000000000 +FBE9:00000000000000080804FB0000000000 +FBEA:0000004C504C50404444380000000000 +FBEB:0000004C504C504044443B0000000000 +FBEC:000000060806080002122C4000000000 +FBED:000000060806080002122D4000000000 +FBEE:00000003040304102A2A3C0808106000 +FBEF:00000003040304102A2A3D0808106000 +FBF0:00003033142344102A2A3C0808106000 +FBF1:00003033142344102A2A3D0808106000 +FBF2:00008853242304102A2A3C0808106000 +FBF3:00008853242304102A2A3D0808106000 +FBF4:00000023141304102A2A3C0808106000 +FBF5:00000023141304102A2A3D0808106000 +FBF6:000C100C1004040C5048443800100010 +FBF7:00000C100C1000044C52493000100010 +FBF8:00000608060800222212EC0020002000 +FBF9:00000608060802020206484442423C00 +FBFA:00000608060800020205484442423C00 +FBFB:00000608060800222212EC0000000000 +FBFC:0000000000000000044A484442423C00 +FBFD:00000000000000000000434442423C00 +FBFE:00000000000000080804F80028000000 +FBFF:00000000000000080804FB0028000000 +FC00:0000006080608C30407E20404840221C +FC01:0000006080608C30407E20404040221C +FC02:000000182018230408083C4040404040 +FC03:000000304030440202224446221C0000 +FC04:000000304030440202224446221C0014 +FC05:0000000000000C30407E20424840221C +FC06:0000000000000C30407E20424040221C +FC07:0000000020000C30407E20424040221C +FC08:000000000000030408083C4140404040 +FC09:000000000000040202224446221C0100 +FC0A:000000000000040202224446221C0114 +FC0B:0000000028000C30407E20424040221C +FC0C:0000000028000C30407E20404040221C +FC0D:0000000028008C30407E20404040221C +FC0E:000000050000030408083C4040404040 +FC0F:000000001400040202224446221C0000 +FC10:000000001400040202224446221C0014 +FC11:0000004000A00C30407E20404840221C +FC12:000000100028030408083C4040404040 +FC13:000000200050040202224446221C0000 +FC14:000000200050040202224446221C0014 +FC15:000000700C020C30407822404040221C +FC16:000000300C02030408083C4140404040 +FC17:000000700C020C30407E20424040221C +FC18:000000300C02030408083C4040404040 +FC19:000004700C020C30407E20404840221C +FC1A:000004700C020C30407E20404040221C +FC1B:000000310C02030408083C4040404040 +FC1C:000000000000255A407E20424040221C +FC1D:000000000000255A407E20404040221C +FC1E:000000004000255A407E20404040221C +FC1F:00000000000000000000000001940268040004001E0020002000200020002000 +FC20:0000000006091E28407E20404040221C +FC21:00000000000000000038004401F80240040004001E0020002000200020002000 +FC22:0000000026091E28407E20404840221C +FC23:0000000026091E28407E20404040221C +FC24:0000000026891E28407E20404040221C +FC25:00000000000000000138004401F80240040004001E0020002000200020002000 +FC26:000000202C323C20407E20404040221C +FC27:0000000808080E0916103C4040404040 +FC28:000000080A080E0916103C4040404040 +FC29:0000003040381020407E20404840221C +FC2A:000000000C100F0408083C4040404040 +FC2B:0000803040381020407E20404840221C +FC2C:000008000C100F0408083C4040404040 +FC2D:00008020503010207E1020404840211E +FC2E:00008020503010207E1020404040211E +FC2F:00008020503090207E1020404040211E +FC30:00000040102818081020103840404040 +FC31:00000400000C0A0602464844423C0000 +FC32:00000400000C0A0602464844423C0028 +FC33:0000005000205030407E20404840221C +FC34:00002800102818081020103840404040 +FC35:00001400000C0A0602464844423C0000 +FC36:00001400000C0A0602464844423C0028 +FC37:000000048890A0C0BC827C0000000000 +FC38:0000000008102010207E20404840221C +FC39:0000000008102010207E20404040221C +FC3A:0000000008102090207E20404040221C +FC3B:000000101012141814121C9090909060 +FC3C:000000040810201008103C4040404040 +FC3D:0000000000000010002000400080008000400880110011800880070000000000 +FC3E:0000000000000010002000400080008000400880110011800880070000000500 +FC3F:00001010101010207E1020404840211E +FC40:00001010101010207E1020404040211E +FC41:00001010105010207E1020404040211E +FC42:000000080808080808083C4040404040 +FC43:00000002020202020206484442423C00 +FC44:000000020202020202064844423C0028 +FC45:0000000000000C30407E20404840221C +FC46:0000000000000C30407E20404040221C +FC47:0000000000200C30407E20404040221C +FC48:000000000000030408083C4040404040 +FC49:000000000000020204084442423C0000 +FC4A:000000000000020204084442423C0028 +FC4B:0000000008000C30407E20404840221C +FC4C:0000000008000C30407E20404040221C +FC4D:0000000008200C30407E20404040221C +FC4E:000000020000030408083C4040404040 +FC4F:000000000800040202224446221C0000 +FC50:000000000800040202224446221C0014 +FC51:000000103854523C407E20404840221C +FC52:000000201834543808103C4040404040 +FC53:00000000060D150E02224446221C0000 +FC54:00000000060D150E02224446221C0014 +FC55:0000000000000C30407E204A4048221C +FC56:0000000000000C30407E204A4040221C +FC57:0000000000200C30407E204A4040221C +FC58:000000000000030408083C4144404040 +FC59:0000000000000402224446221C010400 +FC5A:0000000000000402224446221C010450 +FC5B:101010002000080402427C0000000000 +FC5C:00000008080808000402020204483000 +FC5D:0000000010101000040A4844423C0000 +FC5E:00046A241800547C0000000000000000 +FC5F:0054547C061866186000000000000000 +FC60:000006186000547C0000000000000000 +FC61:00040A047A00547C0000000000000000 +FC62:0054547C000618600000000000000000 +FC63:000008080800547C0000000000000000 +FC64:000018201822060A120A090808106000 +FC65:000018209822060A120A090808106000 +FC66:000000182018230408083C4040404040 +FC67:00000018209802060A2A454448300000 +FC68:000000000C100C1000064944423C0000 +FC69:000000000C100C1000064944423C0028 +FC6A:000000000002060A120A090808126000 +FC6B:000000000012060A120A090808126000 +FC6C:000000000000030408083D4040404040 +FC6D:00000000001002060A2A454448320000 +FC6E:000000000000000000064944423C0100 +FC6F:000000000000000000064944423C0128 +FC70:000005000002060A120A090808106000 +FC71:000005002002060A120A090808106000 +FC72:00000000000014000C12394040404040 +FC73:00000005001002060A2A454448300000 +FC74:000000000000050000064944423C0000 +FC75:000000000000050000064944423C0028 +FC76:000200050002060A120A090808106000 +FC77:000200050022060A120A090808106000 +FC78:00000000080014000C12394040404040 +FC79:00000200050012060A2A454448300000 +FC7A:000000000002000500064944423C0000 +FC7B:000000000002000500064944423C0028 +FC7C:000000000008000C0A46898C44380000 +FC7D:000000000008000C0A46898C44380028 +FC7E:000000000A00040A07224446221C0000 +FC7F:000000000A00040A07224446221C0014 +FC80:00002122242830282C12010000000000 +FC81:00002122242830A8ACB2410000000000 +FC82:00010204081008040A11081C20202020 +FC83:00000102040810080446898C44380000 +FC84:00000102040810080446898C44380028 +FC85:000000000002020202020F080C101010 +FC86:00000000000202020242858844380000 +FC87:00000000000202020242858844380028 +FC88:0000404040404040402027180E000000 +FC89:0000000000000000000047B8AE808080 +FC8A:000000020002060A120A090808106000 +FC8B:000000021002060A120A090808106000 +FC8C:00000000020002060A12798080808080 +FC8D:00000002100002060A2A454448300000 +FC8E:000000000000020000064944423C0000 +FC8F:000000000000020000064944423C0028 +FC90:000000000010101000064944423C0000 +FC91:000000000002060A120A090808106500 +FC92:000000002002060A120A090808106500 +FC93:000000000000030408083C404A404040 +FC94:00000000001002060A2A454448300500 +FC95:000000000000000000064944423C0104 +FC96:000000000000000000064944423C0154 +FC97:02040608000C1420780CF00010000000 +FC98:02040608000C1420780CF00000000000 +FC99:02040608004C1420780CF00000000000 +FC9A:00020406080006081010F80000000000 +FC9B:00000004080C10002669E82824140C00 +FC9C:00000000000C1420780CF00004200000 +FC9D:00000000000C1420780CF00004000000 +FC9E:00000000200C1420780CF00004000000 +FC9F:00000000000006081010F80004000000 +FCA0:00000000000000002669E82825140C00 +FCA1:00000A00000C1420780CF00000200000 +FCA2:00000A00000C1420780CF00000000000 +FCA3:00000A00200C1420780CF00000000000 +FCA4:0000000A000006081010F80000000000 +FCA5:00000000000A00002669E82824140C00 +FCA6:0004000A000006081010F80000000000 +FCA7:006058041E20407E1862800000000000 +FCA8:0000000000001C021F28D80008000000 +FCA9:006058041E20407E1860801000000000 +FCAA:0000000000001C031F28D80000000000 +FCAB:086058041E20407E1860801000000000 +FCAC:0000000800001C031F28D80000000000 +FCAD:00000000000000001F94209440687E0018006000800010000000000000000000 +FCAE:00000000000000001F94209440687E0018006000800000000000000000000000 +FCAF:00000000000040001F94209440687E0018006000800000000000000000000000 +FCB0:00000000000115153E40E00000000000 +FCB1:0000000804140A24114820F040407E0018006000800000000000000000000000 +FCB2:0000000844140A24114820F040407E0018006000800000000000000000000000 +FCB3:00000000000000200050009011202FC021004000E00000000000000000000000 +FCB4:0080000804140A24114820F040407E0018006000800008000000000000000000 +FCB5:0080000804140A24114820F040407E0018006000800000000000000000000000 +FCB6:0080000844140A24114820F040407E0018006000800000000000000000000000 +FCB7:00000000000004200050009011202FC021004000E00000000000000000000000 +FCB8:101016191E2078061860800000000000 +FCB9:00000000121016193E40F04830000000 +FCBA:000030424C30407E1860801000000000 +FCBB:000000000030404C3040F04830000000 +FCBC:200030424C30407E1860801000000000 +FCBD:000000200030404C3040F04830000000 +FCBE:401028380810203E0C30C00800000000 +FCBF:401028380810203E0C30C00000000000 +FCC0:00401028388810203E0CF00000000000 +FCC1:00100010283808102020F02810000000 +FCC2:28001028380810203E0CF00008000000 +FCC3:00280010283808102020F02810000000 +FCC4:020408103008107E1860800800000000 +FCC5:020408103008107E1860800000000000 +FCC6:020408103088107E1860800000000000 +FCC7:00024448506078444424D80000000000 +FCC8:00040810204020101020F02810000000 +FCC9:0000101010101020780CF00000200000 +FCCA:0000101010101020780CF00000000000 +FCCB:0000101050101020780CF00000000000 +FCCC:00000008080808080808FC0200000000 +FCCD:000004040404041C2A3AF60000000000 +FCCE:00000000040A1C20780CF00000200000 +FCCF:00000000040A1C20780CF00000000000 +FCD0:00000000240A1C20780CF00000000000 +FCD1:0000000000040A1E2020F00000000000 +FCD2:00000400000C1420780CF00000200000 +FCD3:00000400000C1420780CF00000000000 +FCD4:00000400200C1420780CF00000000000 +FCD5:00000004000006081010F80000000000 +FCD6:0000000000000400266AE82824140C00 +FCD7:003C1229293E407E1860801000000000 +FCD8:003C1229291E08102040E05020000000 +FCD9:202000782452523C2040800000000000 +FCDA:00000000000C1420780CF0000A200000 +FCDB:00000000000C1420780CF0000A000000 +FCDC:00000000200C1420780CF0000A000000 +FCDD:00000000000006081010F8000A000000 +FCDE:000000000000000C1250D55048281800 +FCDF:00000C100C3000102824D30000000000 +FCE0:0000000608061800246AE92824140C00 +FCE1:00000000000000102824D30008000000 +FCE2:0000000000000000246AE92825140C00 +FCE3:00000000001400102824D30000000000 +FCE4:0000000000140000246AE92824140C00 +FCE5:00000008001400102824D30000000000 +FCE6:0000000800140000246AE92824140C00 +FCE7:0000000000000000000000000000180024122212D1ED00000000000000000000 +FCE8:0000000000000000000000000000000026126912E8ED2800240014000C000000 +FCE9:0000000000000010000000280000180024122212D1ED00000000000000000000 +FCEA:0000000000000010000000280000000024126A12E9ED2800240014000C000000 +FCEB:00024448506070484C4AB10000000000 +FCEC:00040810204020101824F32810000000 +FCED:00000808080808081824F32810000000 +FCEE:00000000100000102824D30000000000 +FCEF:000000000800000C1252D15048281800 +FCF0:00000000000000102824D3000A000000 +FCF1:00000000000000000856D150482B1800 +FCF2:000C30022A1400000000FF0000000000 +FCF3:040A040A30022A140000FF0000000000 +FCF4:000A54200C3000000000FF0000000000 +FCF5:000000000808080E090E4844423C0000 +FCF6:000000000808080E090E4844423C0028 +FCF7:000000000000000608064844423C0000 +FCF8:000000000000000608064844423C0028 +FCF9:000000000008000608064844423C0000 +FCFA:000000000008000608064844423C0028 +FCFB:00000000000000000000000000000612091208EC4800440042003C0000000000 +FCFC:00000000000000000000000000000612091208EC4800440042003C0000002800 +FCFD:00000000001000000028000000000612091208EC4800440042003C0000000000 +FCFE:00000000001000000028000000000612091208EC4800440042003C0000002800 +FCFF:000000006058040E10380844423C0000 +FD00:000000006058040E38080844423C0028 +FD01:000000006058040E38090844423C0000 +FD02:000000006058040E38090844423C0028 +FD03:000000046058040E38080844423C0000 +FD04:000000026058040E38080844423C0028 +FD05:000000000205051E14100844423C0000 +FD06:000000000205051E14100844423C0028 +FD07:000000080205051E14100844423C0000 +FD08:000000080205051E14100844423C0028 +FD09:000004000A00255A407E20404840221C +FD0A:000004000A00255A407E20404040221C +FD0B:000004000A80255A407E20404040221C +FD0C:000004000A00255A40603C4040404040 +FD0D:00000004000A00152A20202020408000 +FD0E:00000000000000152A20202020408000 +FD0F:0000000002050D162424202020408000 +FD10:0000000802050D162424202020408000 +FD11:000000000808080E090E4944423C0000 +FD12:000000000808080E090E4944423C0028 +FD13:000000000000000205064944423C0000 +FD14:000000000000000205064944423C0028 +FD15:000000000004000205064944423C0000 +FD16:000000000004000205064944423C0028 +FD17:000000000000000000000000000000000612091248ED440042003C0000000000 +FD18:000000000000000000000000000000000612091248ED440042003C0000002800 +FD19:000000000000001000000028000000000612091248ED440042003C0000000000 +FD1A:000000000000001000000028000000000612091248ED440042003C0000002800 +FD1B:000000000000000000000000000000000670090C08FF440042003C0000000000 +FD1C:000000000000000000000000000000000670090C08FF440042003C0000002800 +FD1D:000000000000000000000000000000000670090C08FF440042203C0000000000 +FD1E:000000000000000000000000000000000670090C08FF440042203C0000002800 +FD1F:000000000000000000000000004000000670090C08FF440042003C0000000000 +FD20:000000000000000000000000002000000670090C08FF440042003C0000002800 +FD21:0000000000040A0A3E29209088700000 +FD22:0000000000040A0A3E29209088700050 +FD23:0000000010040A0A3E29209088700000 +FD24:0000000010040A0A3E29209088700050 +FD25:000000001000280054AA81FC40904438 +FD26:000000001000280054AA81FC40804438 +FD27:000000001000A80054AA81FC40804438 +FD28:00000000080014004AB580C070808080 +FD29:00000000000004000A00152A20204080 +FD2A:00000000000000000000152A20204080 +FD2B:0000000000000002050D162424408000 +FD2C:0000000000000012050D162424408000 +FD2D:00200000005004000A2411D820007F8018006000800008000000000000000000 +FD2E:00200000005004000A2411D820007F8018006000800000000000000000000000 +FD2F:00200000005024000A2411D820007F8018006000800000000000000000000000 +FD30:0000000000200000005004000A2411D820007000880000000000000000000000 +FD31:0000000000000000000000000000002423D86400E8002800240014000C000000 +FD32:0000000000000020000000500000002423D86400E8002800240014000C000000 +FD33:00000010101016191E20D02000000000 +FD34:0000000000000000000000000000100028920492FFED00001000000000000000 +FD35:0000000000000000000000000000100028920492FFED00000000000000000000 +FD36:0000000000000000000010000000100028920492FFED00000000000000000000 +FD37:0000000000000000001000000028100028920492FFED00001000000000000000 +FD38:0000000000000000001000000028100028920492FFED00000000000000000000 +FD39:0000000000000000001010000028100028920492FFED00000000000000000000 +FD3A:00000010101016191E22D12000000000 +FD3B:00000010121016191E22D12000000000 +FD3C:010204111214101010100F0000000000 +FD3D:01020411121410101010100000000000 +FD3E:0000007E018C023004C00F000A0035806AC035800A000F0004C00230018C007E +FD3F:00007E0031800C40032000F0005001AC035601AC005000F003200C4031807E00 +FD40:00007FFE618E6FB663B66FB66F8E7FFE7FFE6DCE6DB661B67DB67DCE7FFE0000 +FD41:00007FFE618E6FB663B66FB66F8E7FFE7FFE6DEE6DCE61EE7DEE7DC67FFE0000 +FD42:00007FFE618E6FB663B66FB66F8E7FFE7FFE6D866DF661867DBE7D867FFE0000 +FD43:00007FFE618E6FB663B66FB66F8E7FFE7FFE6D8E6DF661C67DF67D8E7FFE0000 +FD44:00007FFE618E6FB663B66FB66F8E7FFE7FFE6DB66DB661867DF67DF67FFE0000 +FD45:00007FFE618E6FB663B66FB66F8E7FFE7FFE6D866DBE61867DF67D867FFE0000 +FD46:00007FFE618E6FB663B66FB66F8E7FFE7FFE6DCE6DBE618E7DB67DCE7FFE0000 +FD47:00007FFE618E6FB663B66FB66F8E7FFE7FFE6D866DF661EE7DDE7DDE7FFE0000 +FD48:00007FFE618E6FB663B66FB66F8E7FFE7FFE6DCE6DB661CE7DB67DCE7FFE0000 +FD49:00007FFE618E6FB663B66FB66F8E7FFE7FFE6DCE6DB661C67DF67DCE7FFE0000 +FD4A:00007FFE618E6FB663B66FB66F8E7FFE7FFE6D866DB661867DB67DB67FFE0000 +FD4B:00007FFE618E6FB663B66FB66F8E7FFE7FFE6D8E6DB6618E7DB67D8E7FFE0000 +FD4C:00007FFE618E6FB663B66FB66F8E7FFE7FFE6DC66DBE61BE7DBE7DC67FFE0000 +FD4D:00007FFE618E6FB663B66FB66F8E7FFE7FFE6D8E6DB661B67DB67D8E7FFE0000 +FD4E:00007FFE618E6FB663B66FB66F8E7FFE7FFE6D866DBE618E7DBE7D867FFE0000 +FD4F:00007FFE618E6FB663B66FB66F8E7FFE7FFE6D866DBE618E7DBE7DBE7FFE0000 +FD50:0000000000000000000000000028020005040084FFFC50002100000000000000 +FD51:00000000000000000000000000141080294204220BFF10002400200012000C00 +FD52:0000000000000000000000000028210052840844FFFC00002000000000000000 +FD53:0000000000000000000000000028020005040084FFFC50002000000000000000 +FD54:0000000000000000000002000028020005040084FFFC28001000000000000000 +FD55:0000000000000000000000000028200050040804FFFC02802100000000000000 +FD56:0000000000000000000000000028200050040804FFFC02800100000000000000 +FD57:0000000000000000000000000028200050040804FFFC02802100000000000000 +FD58:000000000000000000000000000020085014080217FF21404088400024001800 +FD59:0000000000000000000000000000201050280804FFFC02800110000000000000 +FD5A:000000000000000000000000000000084814540253FF48A04440380000002800 +FD5B:000000000000000000000000000000084814540253FF48A04440380000000000 +FD5C:0000000000000000000000000000210052950855FFFF00002000000000000000 +FD5D:0000000000000000000000000000210052950855FFFF00000100000000000000 +FD5E:000000000000000000000000000001009295A855A7FF90008900700000000000 +FD5F:00000000000000000000000000004000A02A102A2FFF45008200800048003000 +FD60:00000000000000000000000000002000502A082AFFFE02800100000000000000 +FD61:00000000000000000000000000002000502A082AFFFE02802100000000000000 +FD62:00000000000000000000000000002000502A082A7FFF42804100400040000000 +FD63:00000000000000000000000000000000002A002AFFFE2A801100000000000000 +FD64:00000000000000000000000000004204A52A10AA2FD740008000800048003000 +FD65:0000000000000000000000000000210252950855FFEE00000000000000000000 +FD66:00000000000000000000000000002004502A082A7FD742804100400040000000 +FD67:00000000000000000008000000144200A52A10AAFFFF80008000800080000000 +FD68:00000000000000000008000000140200052A00AAFFFE28001000000000000000 +FD69:000000000000000000040000000A01009295A855A7FF90008900700000005000 +FD6A:00000000000000000008200000142000502A082A17FF22804100400024001800 +FD6B:00000000000000000008200000142000502A082AFFFE02800100000000000000 +FD6C:00000000000000000008000000142000502A082A7FFF42804100400040000000 +FD6D:00000000000000000008000000140000002A002AFFFE2A801100000000000000 +FD6E:000000000000000000000002000001029295A855A7EB90008800700000000000 +FD6F:00000000000000000000000400004204A52A10AAFFD780008000800080000000 +FD70:00000000000000000000020400000204052A00AAFFD428001000000000000000 +FD71:00000000000000000000002000202020502C083217FF22804100400024001800 +FD72:00000000000000000000002000202020502C0832FFFC02800100000000000000 +FD73:00000000000000000000002000200020002C0032FFFC2A801100000000000000 +FD74:00000000000000000000002000200020902CA832A7FF92808900700000005000 +FD75:0000000000000000000000000000211E5292084C7FF340004100400040000000 +FD76:0000000000000000000000000000101E2812040C3FF321402080200020000000 +FD77:00000000000000000000000000000000000C0010FFFE52802100000000000000 +FD78:0000000000000000000000000000001E9012A80CA7F391408880700000000000 +FD79:0000000000000000000000080000101E2812040C3FF321402080200020000000 +FD7A:0000000000000000000000080000001E9012A80CA7F391408880700000005000 +FD7B:0000000000000000000000080000001E9012A80CA7F391408880700000000000 +FD7C:00000000000000000000010800002108529408547FEF40004000400040000000 +FD7D:00000000000000000008010000080114028C0044FFFC28001000000000000000 +FD7E:00000000000000000000000A00002004500A080A17F721404080400024001800 +FD7F:00000000000000000000001400002008501408147FEF42804100400040000000 +FD80:0000000000000000000000020002084214A202121FFD10001000100010000000 +FD81:0000000000000000000000020002004224A22A1229FD240022001C0000001400 +FD82:0000000000000000000000020002004224A22A1229FD240022001C0000000000 +FD83:0000000000000000000000080008210852880848FFF000002100000000000000 +FD84:000000000000000000000002000220825142082217FD20004880400024001800 +FD85:00000000000000000000008200022082514208227FFD40004000400040000000 +FD86:0000000000000000000001040004010402840044FFF828001000000000000000 +FD87:00000000000000000000000200021002280204020BFD10A02040200012000C00 +FD88:0000000000000000000000080008200850080808FFF002800100000000000000 +FD89:0000000000000000000000000000210052800848FFF400142008000000000000 +FD8A:0000000000000000000000000000020005000088FFF450142008000000000000 +FD8B:000000000000000000000000000001009280A840A7FF90148808700000005000 +FD8C:0000000000000000000000000000210052800848FFF400140108000000000000 +FD8D:0000000000000000000000000000010002800048FFF428141108000000000000 +FD8E:0000000000000000000001000000210052800848FFF400142008000000000000 +FD8F:0000000000000000000001000000010002800048FFF428141008000000000000 +FD90:00007FFE618E6FB663B66FB66F8E7FFE7FFE73CE6DB671B67DB673CE7FFE0000 +FD91:00007FFE618E6FB663B66FB66F8E7FFE7FFE73EE6DCE71EE7DEE73C67FFE0000 +FD92:0000000000000000000020000000210052800848FFF400140108000000000000 +FD93:00000000000000000000001800042012502A082AFFDC02802100000000000000 +FD94:00000000000000000000001800040012002A002AFFDC2A801100000000000000 +FD95:0000000000000000000000000008010002880048FFF028001000000000000000 +FD96:000000000000000000000000000400804944542453FB48004400380000000000 +FD97:00000000000000000000000000042080514408247FFB40004080400040000000 +FD98:0000000000000000000000000008010002880048FFF028001100000000000000 +FD99:000000000000000000000000000400809144A824A7FB90008880700000000000 +FD9A:000000000000000000000000000400004804540453FB48A04440380000002800 +FD9B:000000000000000000000000000400004804540453FB48A04440380000000000 +FD9C:00000000000000000000000000000800140402041FFB10A0104A100010000000 +FD9D:0000000000000000000000000000000000020002FFFC29401094000000000000 +FD9E:000000000000000000000080000000809142A822A7FD90008804700000005000 +FD9F:000000000000000000000000000A00809142A822A7FD90008840700000005000 +FDA0:000000000000000000000000000A00809142A822A7FD90008880700000000000 +FDA1:000000000000000000000080000A00809142A822A7FD90008800700000005000 +FDA2:000000000000000000000080000A00809142A822A7FD90008800700000000000 +FDA3:000000000000000000000000000A00004802540253FD48A04440380000002800 +FDA4:000000000000000000000000000A00004802540253FD48A04440380000000000 +FDA5:000000000000000000000000000000089014A802A7FF91408888700000005000 +FDA6:000000000000000000000000000001089294A842A7FF90008808700000000000 +FDA7:000000000000000000000000000000089014A802A7FF91408888700000000000 +FDA8:000000000000000000000100000001009295A855A7FF90008800700000000000 +FDA9:000000000000000000000000000001029295A855A7EF90008800700000005000 +FDAA:000000000000000000040000000A01009295A855A7FF90008800700000005000 +FDAB:000000000000000000000002000001029295A855A7FF90008800700000005000 +FDAC:000000000000000000000004000400844944542453FB48004480380000002800 +FDAD:000000000000000000000004000400044804540453FB48A04440380000002800 +FDAE:000000000000000000000000000000804944542453FB4800440A380000002800 +FDAF:000000000000000000000000000000804944542453FB4800448A380000002800 +FDB0:000000000000000000000000000000004804540453FB48A0444A380000002800 +FDB1:000000000000000000000000000000004800540053FF48AA4444380000002800 +FDB2:00000000000000000000000A00000004480A540A53F748A04440380000002800 +FDB3:000000000000000000000000000400804944542453FB48004400380000002800 +FDB4:00000000000000000014000000082014500C0804FFFC02800100000000000000 +FDB5:0000000000000000000000080008010802880048FFF828001000000000000000 +FDB6:0000000000000000000000000000001E9012A80CA7F391408880700000005000 +FDB7:000000000000000000000006001800209018A80EA7F192808900700000005000 +FDB8:0000000000000000000000000008210052880848FFF800000100000000000000 +FDB9:000000000000000000000080000000809140A820A7FF900A8804700000005000 +FDBA:0000000000000000000000080008010802880048FFF828001100000000000000 +FDBB:000000000000000000000006001820205018080E7FF142804100400040000000 +FDBC:00000000000000000000000400042084514408247FFB40004080400040000000 +FDBD:0000000000000000000000000002104028A204120BFD10002040200012000C00 +FDBE:000000000000000000000000000001089294A842A7FF90008808700000005000 +FDBF:000000000000000000000000000001089294A842A7FF90008900700000005000 +FDC0:000000000000000000000000000000809140A820A7FF900A8844700000005000 +FDC1:00000000000000000000000400000004480A540A53F748A04440380000002800 +FDC2:000000000000000000000000000000809142A822A7FF90008804700000005000 +FDC3:000000000000000000000003000C001000080004FFF829401080000000000000 +FDC4:0000000000000000000000000000010002860048FFFF28001100000000000000 +FDC5:00000000000000000000000000000004002A002AFFDC55002200000000000000 +FDC6:000000000000000000000100000001009295A855A7FF90008800700000005000 +FDC7:000000000000000000000000000400809144A824A7FB90008880700000005000 +FDC8:00007FFE618E6FB663B66FB66F8E7FFE7FFE71CE6FB66FCE6FB671CE7FFE0000 +FDC9:00007FFE618E6FB663B66FB66F8E7FFE7FFE71CE6FB66FC66FF671CE7FFE0000 +FDCA:00007FFE618E6FB663B66FB66F8E7FFE7FFE71866FB66F866FB671B67FFE0000 +FDCB:00007FFE618E6FB663B66FB66F8E7FFE7FFE718E6FB66F8E6FB6718E7FFE0000 +FDCC:00007FFE618E6FB663B66FB66F8E7FFE7FFE71C66FBE6FBE6FBE71C67FFE0000 +FDCD:00007FFE618E6FB663B66FB66F8E7FFE7FFE718E6FB66FB66FB6718E7FFE0000 +FDCE:00007FFE618E6FB663B66FB66F8E7FFE7FFE71866FBE6F8E6FBE71867FFE0000 +FDCF:00007FFE618E6FB663B66FB66F8E7FFE7FFE71866FBE6F8E6FBE71BE7FFE0000 +FDD0:FFFFFFFFE18FEFB7E3B7EFB7EF8FFFFFFFFFE3CFEDB7EDB7EDB7E3CFFFFFFFFF +FDD1:FFFFFFFFE18FEFB7E3B7EFB7EF8FFFFFFFFFE3DFED9FEDDFEDDFE38FFFFFFFFF +FDD2:FFFFFFFFE18FEFB7E3B7EFB7EF8FFFFFFFFFE387EDF7ED87EDBFE387FFFFFFFF +FDD3:FFFFFFFFE18FEFB7E3B7EFB7EF8FFFFFFFFFE38FEDF7EDC7EDF7E38FFFFFFFFF +FDD4:FFFFFFFFE18FEFB7E3B7EFB7EF8FFFFFFFFFE3AFEDAFED87EDEFE3EFFFFFFFFF +FDD5:FFFFFFFFE18FEFB7E3B7EFB7EF8FFFFFFFFFE387EDBFED87EDF7E387FFFFFFFF +FDD6:FFFFFFFFE18FEFB7E3B7EFB7EF8FFFFFFFFFE3CFEDBFED8FEDB7E3CFFFFFFFFF +FDD7:FFFFFFFFE18FEFB7E3B7EFB7EF8FFFFFFFFFE387EDF7EDEFEDDFE3DFFFFFFFFF +FDD8:FFFFFFFFE18FEFB7E3B7EFB7EF8FFFFFFFFFE3CFEDB7EDCFEDB7E3CFFFFFFFFF +FDD9:FFFFFFFFE18FEFB7E3B7EFB7EF8FFFFFFFFFE3CFEDB7EDC7EDF7E3CFFFFFFFFF +FDDA:FFFFFFFFE18FEFB7E3B7EFB7EF8FFFFFFFFFE3CFEDB7ED87EDB7E3B7FFFFFFFF +FDDB:FFFFFFFFE18FEFB7E3B7EFB7EF8FFFFFFFFFE38FEDB7ED8FEDB7E38FFFFFFFFF +FDDC:FFFFFFFFE18FEFB7E3B7EFB7EF8FFFFFFFFFE3CFEDB7EDBFEDB7E3CFFFFFFFFF +FDDD:FFFFFFFFE18FEFB7E3B7EFB7EF8FFFFFFFFFE38FEDB7EDB7EDB7E38FFFFFFFFF +FDDE:FFFFFFFFE18FEFB7E3B7EFB7EF8FFFFFFFFFE387EDBFED8FEDBFE387FFFFFFFF +FDDF:FFFFFFFFE18FEFB7E3B7EFB7EF8FFFFFFFFFE387EDBFED8FEDBFE3BFFFFFFFFF +FDE0:FFFFFFFFE18FEFB7E3B7EFB7EF8FFFFFFFFFE1CFEFB7E3B7EFB7E1CFFFFFFFFF +FDE1:FFFFFFFFE18FEFB7E3B7EFB7EF8FFFFFFFFFE1DFEF9FE3DFEFDFE18FFFFFFFFF +FDE2:FFFFFFFFE18FEFB7E3B7EFB7EF8FFFFFFFFFE187EFF7E387EFBFE187FFFFFFFF +FDE3:FFFFFFFFE18FEFB7E3B7EFB7EF8FFFFFFFFFE18FEFF7E3C7EFF7E18FFFFFFFFF +FDE4:FFFFFFFFE18FEFB7E3B7EFB7EF8FFFFFFFFFE1AFEFAFE387EFEFE1EFFFFFFFFF +FDE5:FFFFFFFFE18FEFB7E3B7EFB7EF8FFFFFFFFFE187EFBFE387EFF7E187FFFFFFFF +FDE6:FFFFFFFFE18FEFB7E3B7EFB7EF8FFFFFFFFFE1CFEFBFE38FEFB7E1CFFFFFFFFF +FDE7:FFFFFFFFE18FEFB7E3B7EFB7EF8FFFFFFFFFE187EFF7E3EFEFDFE1DFFFFFFFFF +FDE8:FFFFFFFFE18FEFB7E3B7EFB7EF8FFFFFFFFFE1CFEFB7E3CFEFB7E1CFFFFFFFFF +FDE9:FFFFFFFFE18FEFB7E3B7EFB7EF8FFFFFFFFFE1CFEFB7E3C7EFF7E1CFFFFFFFFF +FDEA:FFFFFFFFE18FEFB7E3B7EFB7EF8FFFFFFFFFE1CFEFB7E387EFB7E1B7FFFFFFFF +FDEB:FFFFFFFFE18FEFB7E3B7EFB7EF8FFFFFFFFFE18FEFB7E38FEFB7E18FFFFFFFFF +FDEC:FFFFFFFFE18FEFB7E3B7EFB7EF8FFFFFFFFFE1CFEFB7E3BFEFB7E1CFFFFFFFFF +FDED:FFFFFFFFE18FEFB7E3B7EFB7EF8FFFFFFFFFE18FEFB7E3B7EFB7E18FFFFFFFFF +FDEE:FFFFFFFFE18FEFB7E3B7EFB7EF8FFFFFFFFFE187EFBFE38FEFBFE187FFFFFFFF +FDEF:FFFFFFFFE18FEFB7E3B7EFB7EF8FFFFFFFFFE187EFBFE38FEFBFE1BFFFFFFFFF +FDF0:00000000040004000400040C049204A20B7C3020400040003FF0000000000000 +FDF1:0000000002500200022002500230021005E01800200020001FF8000000000000 +FDF2:020002000240014205820602009208921892289218920F600000000000000000 +FDF3:0000000C003000C40104010400C412241E14121411E424004000000000000000 +FDF4:06081814010815140A60000001880614003808C0090005FC24181A6001800060 +FDF5:00000000040004000400240C549234A22B7C4020380014002800200020000000 +FDF6:0000000010001000100010009254955563A901020E1C00000000000000000000 +FDF7:000000000020002010203020502633280CDE0000050000000000000000000000 +FDF8:00000000100010001000100012A412AA2D464002300428185000400040000000 +FDF9:00000000040004000400040C049204A20B7C082050004C004200240018000000 +FDFA:2AA06AA0AAAA6A2D145680C480287FC82029602ABFD7440204553D035351A0A6 +FDFB:000008000804480A480137FF000002A412A032A452AA32210CDF000000040000 +FDFC:0000028002800280028002A002A0224222021CA2000C00000000000000000000 +FDFD:70A95FFF7000C5D5145515D5557D75C0C03B50295FFF7000758554957F9DC030 +FDFE:00007FFE618E6FB663B66FB66F8E7FFE7FFE61866FBE638E6FBE6F867FFE0000 +FDFF:00007FFE618E6FB663B66FB66F8E7FFE7FFE61866FBE638E6FBE6FBE7FFE0000 +FE00:AAAA00018000223DA2402239940408798000008181800281808003E180005555 +FE01:AAAA00018000223DA2402239940408798000038180400181820003C180005555 +FE02:AAAA00018000223DA24022399404087980000381804001818040038180005555 +FE03:AAAA00018000223DA24022399404087980000241824003C18040004180005555 +FE04:AAAA00018000223DA240223994040879800003C1820003818040038180005555 +FE05:AAAA00018000223DA240223994040879800001C1820003818240018180005555 +FE06:AAAA00018000223DA240223994040879800003C1804000818100010180005555 +FE07:AAAA00018000223DA24022399404087980000181824001818240018180005555 +FE08:AAAA00018000223DA24022399404087980000181824001C18040038180005555 +FE09:AAAA00018000223DA240223994040879800008319848284988483E3180005555 +FE0A:AAAA00018000223DA240223994040879800008119830285188103E7D80005555 +FE0B:AAAA00018000223DA240223994040879800008719808283188403E7980005555 +FE0C:AAAA00018000223DA240223994040879800008719808283188083E7180005555 +FE0D:AAAA00018000223DA240223994040879800008499848287988083E0980005555 +FE0E:AAAA00018000223DA240223994040879800008799840287188083E7180005555 +FE0F:AAAA00018000223DA240223994040879800008399840287188483E3180005555 +FE10:00000000000C0004000400080000000000000000000000000000000000000000 +FE11:0000000000200010000800080000000000000000000000000000000000000000 +FE12:0000000000000018002400240018000000000000000000000000000000000000 +FE13:00000000000C000C000000000000000C000C0000000000000000000000000000 +FE14:00000000000C000C000000000000000C00040004000800000000000000000000 +FE15:0000000000040004000400040004000400040000000400040000000000000000 +FE16:0000000000780084008400040008001000100000001000100000000000000000 +FE17:00000000000000000000000000007FFE400247E2581A60064002000000000000 +FE18:00000000000040026006581A47E240027FFE0000000000000000000000000000 +FE19:0000000001800180000000000000018001800000000000000180018000000000 +FE1A:00007FFE61866FBE638E6FBE6F867FFE7FFE7B8673B67B867BB671B67FFE0000 +FE1B:00007FFE61866FBE638E6FBE6F867FFE7FFE7B8E73B67B8E7BB6718E7FFE0000 +FE1C:00007FFE61866FBE638E6FBE6F867FFE7FFE7BC673BE7BBE7BBE71C67FFE0000 +FE1D:00007FFE61866FBE638E6FBE6F867FFE7FFE7B8E73B67BB67BB6718E7FFE0000 +FE1E:00007FFE61866FBE638E6FBE6F867FFE7FFE7B8673BE7B8E7BBE71867FFE0000 +FE1F:00007FFE61866FBE638E6FBE6F867FFE7FFE7B8673BE7B8E7BBE71BE7FFE0000 +FE20:000F3040000000000000000000000000 +FE21:00F00C02000000000000000000000000 +FE22:001E2140000000000000000000000000 +FE23:00028478000000000000000000000000 +FE24:00001F00000000000000000000000000 +FE25:0000F800000000000000000000000000 +FE26:0000FF00000000000000000000000000 +FE27:0000000000000000000000000040300F +FE28:00000000000000000000000000020CF0 +FE29:00000000000000000000000000000F30 +FE2A:00000000000000000000000000000CF0 +FE2B:0000000000000000000000000000001F +FE2C:000000000000000000000000000000F8 +FE2D:000000000000000000000000000000FF +FE2E:001F1800000000000000000000000000 +FE2F:0018F800000000000000000000000000 +FE30:0000000000000000018001800000000000000000018001800000000000000000 +FE31:0000000000800080008000800080008000800080008000800080008000000000 +FE32:0000000000000000008000800080008000800080008000800000000000000000 +FE33:0000400040004000400040004000400040004000400040004000400040000000 +FE34:2000400040002000100010002000400040002000100010002000400040002000 +FE35:0000000000000000000000000000000000000FF0100820044002000000000000 +FE36:0000000000004002200410080FF0000000000000000000000000000000000000 +FE37:000000000000000000000000000000000000000001803E7C4002000000000000 +FE38:00000000000040023E7C01800000000000000000000000000000000000000000 +FE39:00000000000000000000000000000000000000001FF820044002000000000000 +FE3A:000000000000400220041FF80000000000000000000000000000000000000000 +FE3B:000000000000000000000000000000007FFE7FFE781E60064002000000000000 +FE3C:00000000000040026006781E7FFE7FFE00000000000000000000000000000000 +FE3D:0000000000000000000000000180066018186186066018186006000000000000 +FE3E:0000000000006006181806606186181806600180000000000000000000000000 +FE3F:0000000000000000000000000000000000000180066018186006000000000000 +FE40:0000000000006006181806600180000000000000000000000000000000000000 +FE41:000000000000000000000000000000000FFE0002000200020002000000000000 +FE42:00000000000040004000400040007FF000000000000000000000000000000000 +FE43:00000000000000000000000000000FFE08020FFA000A000A000E000000000000 +FE44:0000000000007000500050005FF040107FF00000000000000000000000000000 +FE45:0000000000700038001800180000000000000000000000000000000000000000 +FE46:00000000007800240014000C0000000000000000000000000000000000000000 +FE47:000000000000000000000000000000007FFE4002400240024002000000000000 +FE48:00000000000040024002400240027FFE00000000000000000000000000000000 +FE49:000039CE00000000000000000000000000000000000000000000000000000000 +FE4A:00007DBE00000000000000000000000000000000000000000000000000000000 +FE4B:0C30924961860000000000000000000000000000000000000000000000000000 +FE4C:0C30924961860C30924961860000000000000000000000000000000000000000 +FE4D:0000000000000000000000000000000000000000000000000000000039CE0000 +FE4E:000000000000000000000000000000000000000000000000000000007DBE0000 +FE4F:00000000000000000000000000000000000000000000000000000C3092496186 +FE50:0000000000000000000000000000000000000000000000000180010002000000 +FE51:0000000000000000000000000000000000000000000000000200010001800000 +FE52:0000000000000000000000000000000000000000000000000180018000000000 +FE53:00007FFE61866FBE638E6FBE6F867FFE7FFE618E6FF661C67DF6618E7FFE0000 +FE54:0000000000000000000000000000000000000180018000000180010002000000 +FE55:0000000000000000000000000000000000000180018000000180018000000000 +FE56:0000000000000000000000000000000001000280008001000000010000000000 +FE57:0000000000000000000000000000000000800080008000800000008000000000 +FE58:0000000000000000000000000000000000000000000007C00000000000000000 +FE59:0000000000000000000000000000000000800100010001000100008000000000 +FE5A:0000000000000000000000000000000001000080008000800080010000000000 +FE5B:0000000000000000000000000000000000400080018000800080004000000000 +FE5C:0000000000000000000000000000000002000100018001000100020000000000 +FE5D:0000000000000000000000000000000001C0010001000100010001C000000000 +FE5E:0000000000000000000000000000000003800080008000800080038000000000 +FE5F:000000000000000000000000000000000000028007C0028007C0028000000000 +FE60:0000000000000000000000000000000000000100028001000280014000000000 +FE61:0000000000000000000000000000000000000280010003800100028000000000 +FE62:0000000000000000000000000000000000000100010007C00100010000000000 +FE63:0000000000000000000000000000000000000000000003C00000000000000000 +FE64:0000000000000000000000000000000000000040008001000080004000000000 +FE65:0000000000000000000000000000000000000200010000800100020000000000 +FE66:000000000000000000000000000000000000000003C0000003C0000000000000 +FE67:00007FFE61866FBE638E6FBE6F867FFE7FFE73866FF663EE6DDE73DE7FFE0000 +FE68:0000000000000000000000000000000000000200010000800040000000000000 +FE69:0000000000000000000000000000000000000380050003800140038000000000 +FE6A:0000000000000000000000000000000002000240008001000240004000000000 +FE6B:000000000000000000000000000000000180024002C002C00200018000000000 +FE6C:00007FFE61866FBE638E6FBE6F867FFE7FFE73C66FBE63BE6DBE73C67FFE0000 +FE6D:00007FFE61866FBE638E6FBE6F867FFE7FFE738E6FB663B66DB6738E7FFE0000 +FE6E:00007FFE61866FBE638E6FBE6F867FFE7FFE73866FBE638E6DBE73867FFE0000 +FE6F:00007FFE61866FBE638E6FBE6F867FFE7FFE73866FBE638E6DBE73BE7FFE0000 +FE70:000C300C300000000000000000000000 +FE71:000C300C300000000000FF0000000000 +FE72:0C0C6428700000000000000000000000 +FE73:00000000000000000000020404040300 +FE74:000000000000000000000C300C300000 +FE75:00007FFE61866FBE638E6FBE6F867FFE7FFE61867DBE7B8677F677867FFE0000 +FE76:0000000C300000000000000000000000 +FE77:0000000C300000000000FF0000000000 +FE78:0C0E0810200000000000000000000000 +FE79:0C0E0810200000000000FF0000000000 +FE7A:00000000000000000000000000000C30 +FE7B:00000000000000000000FF0000000C30 +FE7C:00000004145860000000000000000000 +FE7D:00000004145860000000FF0000000000 +FE7E:00000018242418000000000000000000 +FE7F:00000018242418000000FF0000000000 +FE80:000000000000001C203C102000000000 +FE81:00013E40080808080808080000000000 +FE82:000870802020202020201F0000000000 +FE83:18201820080808080808080000000000 +FE84:304030402020202020201F0000000000 +FE85:00000C100C10000C12121E0204483000 +FE86:00000C100C10000C12121F0204483000 +FE87:0000000008080808080808000C100C10 +FE88:000000002020202020201F0030403040 +FE89:00000000304030400046484846423C00 +FE8A:000000003040304000404342423C0000 +FE8B:0000000C100C10000404F80000000000 +FE8C:0000000C100C10000404FB0000000000 +FE8D:00000008080808080808080000000000 +FE8E:000000202020202020201F0000000000 +FE8F:000000000000000422423C0000080000 +FE90:000000000000000422423F0000080000 +FE91:00000000000000080404FC0000100000 +FE92:00000000000000080404FF0000100000 +FE93:000000002400101824243C0000000000 +FE94:0000001200040C14243C070000000000 +FE95:000000001400000422423C0000000000 +FE96:000000001400000422423F0000000000 +FE97:00000000280000080404F80000000000 +FE98:00000000280000080404FF0000000000 +FE99:000010002400000422423C0000000000 +FE9A:000010002400000422423F0000000000 +FE9B:00002000480000080404F80000000000 +FE9C:00002000480000080404FF0000000000 +FE9D:00000000000000007E1020404840221C +FE9E:00000000000000007E1423404840211E +FE9F:00000000000000003806FE0010000000 +FEA0:00000000000000003806FF0010000000 +FEA1:00000000000000007E1020404040221C +FEA2:00000000000000007E1423404040211E +FEA3:0000000000000000700CFC0000000000 +FEA4:0000000000000000700CFF0000000000 +FEA5:00000000001000007E1020404040221C +FEA6:00000000001000007E1423404040211E +FEA7:0000000000200000700CFC0000000000 +FEA8:0000000000200000700CFF0000000000 +FEA9:000000000000080402427C0000000000 +FEAA:000000000000080402427F0000000000 +FEAB:000000002000080402427C0000000000 +FEAC:000000002000080402427F0000000000 +FEAD:00000000000000000402020204483000 +FEAE:00000000000000000402030204483000 +FEAF:00000000001000000402020204483000 +FEB0:00000000001000000402030204483000 +FEB1:000000000000000115155E4848300000 +FEB2:000000000000000115155F4848300000 +FEB3:00000000000000022A2AFC0000000000 +FEB4:00000000000000022A2AFF0000000000 +FEB5:00000008001200000115155E48483000 +FEB6:000000080012000115155F4848300000 +FEB7:00000010002400022A2AFC0000000000 +FEB8:00000010002400022A2AFF0000000000 +FEB9:000000000000000006194E4848300000 +FEBA:000000000000000006194F4848300000 +FEBB:00000000000000000C52FC0000000000 +FEBC:00000000000000000C52FF0000000000 +FEBD:000000000004000006194E4848300000 +FEBE:000000000004000006194F4848300000 +FEBF:00000000000800000C52FC0000000000 +FEC0:00000000000800000C52FF0000000000 +FEC1:000000202020202C32227C0000000000 +FEC2:000000202020202C32227F0000000000 +FEC3:000000202020202C3222FC0000000000 +FEC4:000000202020202C3222FF0000000000 +FEC5:000000202420202C32227C0000000000 +FEC6:000000202420202C32227F0000000000 +FEC7:000000202420202C3222FC0000000000 +FEC8:000000202420202C3222FF0000000000 +FEC9:000000000000001824201C204040423C +FECA:000000000000000030301F204040423C +FECB:00000000000000182420FE0000000000 +FECC:00000000000000181808F70000000000 +FECD:000000000800001824201C204040423C +FECE:000000000010000030301F204040423C +FECF:00000000080000182420FE0000000000 +FED0:00000000080000181808F70000000000 +FED1:0000000800060A0642423C0000000000 +FED2:0000000800060A0642423F0000000000 +FED3:0000001000003824140CF80000000000 +FED4:0000001000003824140CFB0000000000 +FED5:000000002400001C120A264244380000 +FED6:000000002400001C120A274244380000 +FED7:0000004800003824140CF80000000000 +FED8:0000004800003824140CFB0000000000 +FED9:000000020A120A2242423C0000000000 +FEDA:000000020A120A2242423F0000000000 +FEDB:00000004081020403C02FE0000000000 +FEDC:00000004081020403C02FF0000000000 +FEDD:000000020202020202224242443C0000 +FEDE:000000020202020202234242443C0000 +FEDF:00000004040404040404F80000000000 +FEE0:00000004040404040404FB0000000000 +FEE1:00000000000000001C061E2020202020 +FEE2:00000000000000001C061F2020202020 +FEE3:00000000000000081432EE0000000000 +FEE4:00000000000000081432EF0000000000 +FEE5:00000000001000000422424244380000 +FEE6:00000000001000000422434244380000 +FEE7:00000000100000080404F80000000000 +FEE8:00000000100000080404FB0000000000 +FEE9:000000000000101824243C0000000000 +FEEA:0000000004040C14243C070000000000 +FEEB:000000000010083C2A3AF60000000000 +FEEC:000000000000000C1414FF140C000000 +FEED:000000000000000C12121E0204483000 +FEEE:000000000000000C12121F0204483000 +FEEF:0000000000000000044A484442423C00 +FEF0:00000000000000000000434442423C00 +FEF1:0000000000000000044A4844423C0028 +FEF2:000000000000000000004344423C0028 +FEF3:00000000000000080804F80028000000 +FEF4:00000000000000080804FB0028000000 +FEF5:000008728222120A040C141C00000000 +FEF6:000008728222120A0E0A136000000000 +FEF7:000030423242120A040C141C00000000 +FEF8:000030423242120A0E0A136000000000 +FEF9:0000020222120A040C141C000C100C10 +FEFA:000000020222120A0E0A13600C100C10 +FEFB:000000020222120A040C141C00000000 +FEFC:000000020222120A0E0A136000000000 +FEFD:00007FFE61866FBE638E6FBE6F867FFE7FFE618E6FB663B66FB66F8E7FFE0000 +FEFE:00007FFE61866FBE638E6FBE6F867FFE7FFE61866FBE638E6FBE6F867FFE0000 +FEFF:AAAA0001F4511458A55546D2F4510001F1DE4A10F19E4851F390000180005555 +FF00:00007FFE61866FBE638E6FBE6FBE7FFE7FFE73CE6DB66DB66DB673CE7FFE0000 +FF01:0000000000000000018001800180018001800180018000000180018000000000 +FF02:000000000C300C300C300C300000000000000000000000000000000000000000 +FF03:0000000000000000030C030C030C3FFC0C300C303FFC30C030C030C000000000 +FF04:000000000000000001801FF8618661801F8001F8018661861FF8018000000000 +FF05:00000000000000001E06619861981E6001800180067819861986607800000000 +FF06:000000000000000007E018181818181807E01F866066601860781F8600000000 +FF07:0000000001800180018001800000000000000000000000000000000000000000 +FF08:000000000000003000C000C003000300030003000300030000C000C000300000 +FF09:0000000000000C000300030000C000C000C000C000C000C0030003000C000000 +FF0A:00000000000000000000000001806186199807E0199861860180000000000000 +FF0B:0000000000000000000000000180018001807FFE018001800180000000000000 +FF0C:00000000000000000000000000000000000000000000000003C000C000C00300 +FF0D:0000000000000000000000000000000000003FFC000000000000000000000000 +FF0E:00000000000000000000000000000000000000000000000003C003C000000000 +FF0F:0000000000000000000C000C003000C000C0030003000C003000300000000000 +FF10:000000000000000003C00C30300C303C30CC330C3C0C300C0C3003C000000000 +FF11:00000000000000000180078019800180018001800180018001801FF800000000 +FF12:00000000000000000FF0300C300C000C00F003000C00300030003FFC00000000 +FF13:00000000000000000FF0300C300C000C03F0000C000C300C300C0FF000000000 +FF14:0000000000000000003000F003300C30303030303FFC00300030003000000000 +FF15:00000000000000003FFC3000300030003FF0000C000C000C300C0FF000000000 +FF16:000000000000000003F00C00300030003FF0300C300C300C300C0FF000000000 +FF17:00000000000000003FFC000C000C00300030003000C000C000C000C000000000 +FF18:00000000000000000FF0300C300C300C0FF0300C300C300C300C0FF000000000 +FF19:00000000000000000FF0300C300C300C0FFC000C000C000C00300FC000000000 +FF1A:00000000000000000000000003C003C000000000000003C003C0000000000000 +FF1B:00000000000000000000000003C003C000000000000003C000C000C003000000 +FF1C:0000000000000000000000180060018006001800060001800060001800000000 +FF1D:00000000000000000000000000003FFC0000000000003FFC0000000000000000 +FF1E:0000000000000000000018000600018000600018006001800600180000000000 +FF1F:00000000000000000FF0300C300C000C003000C000C0000000C000C000000000 +FF20:000000000000000003F00C0C30CC333C330C330C330C30FC0C0003FC00000000 +FF21:000000000000000003C00C300C30300C300C3FFC300C300C300C300C00000000 +FF22:00000000000000003FF0300C300C300C3FF0300C300C300C300C3FF000000000 +FF23:00000000000000000FF0300C300C3000300030003000300C300C0FF000000000 +FF24:00000000000000003FC03030300C300C300C300C300C300C30303FC000000000 +FF25:00000000000000003FFC3000300030003FF030003000300030003FFC00000000 +FF26:00000000000000003FFC3000300030003FF03000300030003000300000000000 +FF27:00000000000000000FF0300C300C3000300030FC300C300C303C0FCC00000000 +FF28:0000000000000000300C300C300C300C3FFC300C300C300C300C300C00000000 +FF29:00000000000000001FF8018001800180018001800180018001801FF800000000 +FF2A:000000000000000007FE006000600060006000600060606060601F8000000000 +FF2B:0000000000000000300C303030C033003C003C00330030C03030300C00000000 +FF2C:00000000000000003000300030003000300030003000300030003FFC00000000 +FF2D:0000000000000000300C300C3C3C3C3C33CC33CC300C300C300C300C00000000 +FF2E:0000000000000000300C3C0C3C0C330C330C30CC30CC303C303C300C00000000 +FF2F:00000000000000000FF0300C300C300C300C300C300C300C300C0FF000000000 +FF30:00000000000000003FF0300C300C300C3FF03000300030003000300000000000 +FF31:00000000000000000FF0300C300C300C300C300C300C33CC3C3C0FF0000F0000 +FF32:00000000000000003FF0300C300C300C3FF030C030303030300C300C00000000 +FF33:00000000000000000FF0300C300C30000F0000F0000C300C300C0FF000000000 +FF34:00000000000000007FFE01800180018001800180018001800180018000000000 +FF35:0000000000000000300C300C300C300C300C300C300C300C300C0FF000000000 +FF36:0000000000000000600660066006181818181818066006600180018000000000 +FF37:0000000000000000300C300C300C300C33CC33CC3C3C3C3C300C300C00000000 +FF38:0000000000000000300C300C0C300C3003C003C00C300C30300C300C00000000 +FF39:0000000000000000600660061818181806600180018001800180018000000000 +FF3A:00000000000000003FFC000C000C003000C003000C00300030003FFC00000000 +FF3B:00000000000003F0030003000300030003000300030003000300030003F00000 +FF3C:0000000000000000300030000C000300030000C000C00030000C000C00000000 +FF3D:0000000000000FC000C000C000C000C000C000C000C000C000C000C00FC00000 +FF3E:0000000003C00C30300C00000000000000000000000000000000000000000000 +FF3F:000000000000000000000000000000000000000000000000000000007FFE0000 +FF40:0000060001800060000000000000000000000000000000000000000000000000 +FF41:0000000000000000000000000FF0300C000C0FFC300C300C303C0FCC00000000 +FF42:00000000000030003000300033F03C0C300C300C300C300C3C0C33F000000000 +FF43:0000000000000000000000000FF0300C3000300030003000300C0FF000000000 +FF44:000000000000000C000C000C0FCC303C300C300C300C300C303C0FCC00000000 +FF45:0000000000000000000000000FF0300C300C3FFC30003000300C0FF000000000 +FF46:00000000000000780180018001801FF801800180018001800180018000000000 +FF47:00000000000000000000000C0FCC3030303030300FC00C000FF0300C300C0FF0 +FF48:00000000000030003000300033F03C0C300C300C300C300C300C300C00000000 +FF49:00000000000001800180000007800180018001800180018001801FF800000000 +FF4A:00000000000000300030000000F0003000300030003000300030003030C00F00 +FF4B:000000000000300030003000303030C033003C00330030C03030300C00000000 +FF4C:00000000000007800180018001800180018001800180018001801FF800000000 +FF4D:0000000000000000000000007E78618661866186618661866186618600000000 +FF4E:00000000000000000000000033F03C0C300C300C300C300C300C300C00000000 +FF4F:0000000000000000000000000FF0300C300C300C300C300C300C0FF000000000 +FF50:00000000000000000000000033F03C0C300C300C300C300C3C0C33F030003000 +FF51:0000000000000000000000000FCC303C300C300C300C300C303C0FCC000C000C +FF52:00000000000000000000000033F03C0C300C3000300030003000300000000000 +FF53:0000000000000000000000000FF0300C30000F0000F0000C300C0FF000000000 +FF54:00000000000000000180018001801FF801800180018001800180007800000000 +FF55:000000000000000000000000300C300C300C300C300C300C303C0FCC00000000 +FF56:000000000000000000000000300C300C300C0C300C300C3003C003C000000000 +FF57:00000000000000000000000060066186618661866186618661861E7800000000 +FF58:000000000000000000000000300C300C0C3003C003C00C30300C300C00000000 +FF59:000000000000000000000000300C300C300C300C300C0C3C03CC000C000C0FF0 +FF5A:0000000000000000000000003FFC000C003000C003000C0030003FFC00000000 +FF5B:00000000000000F00300030000C000C003000C00030000C000C00300030000F0 +FF5C:0000000001800180018001800180018001800180018001800180018001800180 +FF5D:0000000000000F0000C000C00300030000C0003000C00300030000C000C00F00 +FF5E:0000000000001E06618660780000000000000000000000000000000000000000 +FF5F:0000000000000186061806181860186018601860186018600618061801860000 +FF60:0000000000006180186018600618061806180618061806181860186061800000 +FF61:00000000000000000000000030484830 +FF62:3E202020202020202020200000000000 +FF63:0000000000020202020202020202023E +FF64:00000000000000000000000000402010 +FF65:00000000000000181800000000000000 +FF66:00007E0202027E020202040408106000 +FF67:00000000007E02041408080810102000 +FF68:00000000000204081868080808080800 +FF69:000000000808087F4141010202041800 +FF6A:000000000000003E0808080808087F00 +FF6B:000000000004047F040C142444040C00 +FF6C:000000002020207F1112100808080800 +FF6D:000000000000003C040404047F000000 +FF6E:0000000000007E02027E02027E000000 +FF6F:00000000000000292929020204083000 +FF70:000000000000403F0000000000000000 +FF71:00007F01090A0A080808081010202000 +FF72:000101010202040C1464040404040400 +FF73:000808087F4141410101010202041800 +FF74:0000003E0808080808080808087F0000 +FF75:0004047F040C0C141414242444040C00 +FF76:000808087F0909090911111222224400 +FF77:001010101E7008080F78080804040400 +FF78:0008080F111121410202040408106000 +FF79:002020203F2424440404040808102000 +FF7A:0000007E0202020202020202027E0000 +FF7B:001212127F1212121204040408081000 +FF7C:00003800000071010102020408106000 +FF7D:0000007E020404040808141222214100 +FF7E:00101010101779111212101010080700 +FF7F:00014141210102020204040808102000 +FF80:0008080F111129450202040408106000 +FF81:00020C384808087F0808080810106000 +FF82:00005252524202040404080810204000 +FF83:00003E0000007F080808080810102000 +FF84:00202020202038242220202020202000 +FF85:00080808087F08080808081010204000 +FF86:0000003E0000000000000000007F0000 +FF87:00007F010101221A04060A0911214000 +FF88:000808087F0204040A19294808080800 +FF89:00000202020202040404080810204000 +FF8A:00001212121212111121212121414000 +FF8B:00404040404046784040404040201E00 +FF8C:00007F01010102020204040808102000 +FF8D:00001028284444040202020101010000 +FF8E:000808087F08082A2A2A494949080800 +FF8F:00007E02020204242418181008080800 +FF90:000038060100300C0200700C02010000 +FF91:00080808080810101012222127394100 +FF92:0001010102320A04060A091111204000 +FF93:00003E080808087F0808080808080700 +FF94:00202020277921121210100808080800 +FF95:000000003C04040404040404047F0000 +FF96:0000007E020202027E02020202027E00 +FF97:00003C0000007E020202040408102000 +FF98:00022222222222220204040408081000 +FF99:000008282828282929292A2A4C4C4800 +FF9A:00004040404040424242444448506000 +FF9B:0000007E42424242424242427E420000 +FF9C:00007E42424242020404040808102000 +FF9D:00006010000101010102020408106000 +FF9E:00001048241000000000000000000000 +FF9F:00003048483000000000000000000000 +FFA0:00000000000000000000000000000000 +FFA1:0000000000000000007E020202020000 +FFA2:0000000000000000006C242424240000 +FFA3:00000000000000007414141A11000000 +FFA4:000000000000000000404040407E0000 +FFA5:0000000000000000002424242A390000 +FFA6:000000000000000000222722253A0000 +FFA7:0000000000000000007E4040407E0000 +FFA8:0000000000000000006C4848486C0000 +FFA9:0000000000000000003C043C203C0000 +FFAA:00000000000000000076127242720000 +FFAB:000000000000000000EE2AEA8AEE0000 +FFAC:000000000000000000EA2AEE8AEE0000 +FFAD:000000000000000000E424E48AEA0000 +FFAE:000000000000000000EE28EE88EE0000 +FFAF:000000000000000000FF2AEA8AFF0000 +FFB0:000000000000000000E42EE48AE40000 +FFB1:0000000000000000007C4444447C0000 +FFB2:00000000000000000042427E427E0000 +FFB3:000000000000000000AAAAEEAAEE0000 +FFB4:0000000000000000005454745A710000 +FFB5:00000000000000000010101028440000 +FFB6:0000000000000000002424245A910000 +FFB7:00000000000000101038444444380000 +FFB8:0000000000000000007C101028440000 +FFB9:0000000000000000007E24245A910000 +FFBA:000000000000000038007C1028440000 +FFBB:0000000000000000007E027E02020000 +FFBC:0000000000000000007E407E407E0000 +FFBD:0000000000000000007E2424247E0000 +FFBE:00000000000000000038FE3844380000 +FFBF:00007FFE61866FBE638E6FBE6FBE7FFE7FFE63866DBE638E6DBE63BE7FFE0000 +FFC0:00007FFE61866FBE638E6FBE6FBE7FFE7FFE71CE6FB66FB66FB671CE7FFE0000 +FFC1:00007FFE61866FBE638E6FBE6FBE7FFE7FFE71EE6FCE6FEE6FEE71C67FFE0000 +FFC2:00000000000000000020203820200000 +FFC3:00000000000000000028283828280000 +FFC4:00000000000000000020382038200000 +FFC5:00000000000000000028382838280000 +FFC6:00000000000000000008083808080000 +FFC7:00000000000000000014147414140000 +FFC8:00007FFE61866FBE638E6FBE6FBE7FFE7FFE71CE6FB66FCE6FB671CE7FFE0000 +FFC9:00007FFE61866FBE638E6FBE6FBE7FFE7FFE71CE6FB66FC66FF671CE7FFE0000 +FFCA:00000000000000000008380838080000 +FFCB:00000000000000000014741474140000 +FFCC:000000000000000000101010107C0000 +FFCD:000000000000000000040414147E0000 +FFCE:0000000000000000000A0A2A2AFE0000 +FFCF:000000000000000000040414147C0000 +FFD0:00007FFE61866FBE638E6FBE6FBE7FFE7FFE63CE6DB66DB66DB663CE7FFE0000 +FFD1:00007FFE61866FBE638E6FBE6FBE7FFE7FFE63EE6DCE6DEE6DEE63C67FFE0000 +FFD2:000000000000000000282828287C0000 +FFD3:0000000000000000007C101010100000 +FFD4:0000000000000004043C141C14140000 +FFD5:000000000000000A0A7A2A3A2A2A0000 +FFD6:0000000000000004043C141414140000 +FFD7:0000000000000000007C282828280000 +FFD8:00007FFE61866FBE638E6FBE6FBE7FFE7FFE63CE6DB66DCE6DB663CE7FFE0000 +FFD9:00007FFE61866FBE638E6FBE6FBE7FFE7FFE63CE6DB66DC66DF663CE7FFE0000 +FFDA:00000000000000000000007E00000000 +FFDB:00000000000000000008081828080000 +FFDC:00000000000000000008080808080000 +FFDD:00007FFE61866FBE638E6FBE6FBE7FFE7FFE638E6DB66DB66DB6638E7FFE0000 +FFDE:00007FFE61866FBE638E6FBE6FBE7FFE7FFE63866DBE6D8E6DBE63867FFE0000 +FFDF:00007FFE61866FBE638E6FBE6FBE7FFE7FFE63866DBE6D8E6DBE63BE7FFE0000 +FFE0:0000000000000000018001801FF861866180618061861FF80180018000000000 +FFE1:000000000000000001F80600060006007FE00600060006001FF8780600000000 +FFE2:00000000000000000000000000000000000000003FFC000C000C000C00000000 +FFE3:000000003FFC0000000000000000000000000000000000000000000000000000 +FFE4:0000000000000000018001800180018000000000018001800180018000000000 +FFE5:000000000000000060061818066001807FFE01807FFE01800180018000000000 +FFE6:00000000000000001818181818187FFE19987FFE1E781E781818181800000000 +FFE7:00007FFE61866FBE638E6FBE6FBE7FFE7FFE61866FF663EE6FDE61DE7FFE0000 +FFE8:08080808080808080808080808080808 +FFE9:000000000010207E2010000000000000 +FFEA:0000000000081C2A0808080000000000 +FFEB:00000000000008047E04080000000000 +FFEC:00000000000808082A1C080000000000 +FFED:000000000000007E7E7E7E7E7E000000 +FFEE:00000000000018244242241800000000 +FFEF:00007FFE61866FBE638E6FBE6FBE7FFE7FFE61866FBE638E6FBE61BE7FFE0000 +FFF0:00007FFE61866FBE638E6FBE6FBE7FFE7FFE61CE6FB663B66FB66FCE7FFE0000 +FFF1:00007FFE61866FBE638E6FBE6FBE7FFE7FFE61EE6FCE63EE6FEE6FC67FFE0000 +FFF2:00007FFE61866FBE638E6FBE6FBE7FFE7FFE61866FF663866FBE6F867FFE0000 +FFF3:00007FFE61866FBE638E6FBE6FBE7FFE7FFE618E6FF663C66FF66F8E7FFE0000 +FFF4:00007FFE61866FBE638E6FBE6FBE7FFE7FFE61B66FB663866FF66FF67FFE0000 +FFF5:00007FFE61866FBE638E6FBE6FBE7FFE7FFE61866FBE63866FF66F867FFE0000 +FFF6:00007FFE61866FBE638E6FBE6FBE7FFE7FFE61CE6FBE638E6FB66FCE7FFE0000 +FFF7:00007FFE61866FBE638E6FBE6FBE7FFE7FFE61866FF663EE6FDE6FDE7FFE0000 +FFF8:00007FFE61866FBE638E6FBE6FBE7FFE7FFE61CE6FB663CE6FB66FCE7FFE0000 +FFF9:AAAA000180003E118828083988443E4580000081814001C18220022180005555 +FFFA:AAAA000180003E118828083988443E45800001E1820001C1802003C180005555 +FFFB:AAAA000180003E118828083988443E45800003E1808000818080008180005555 +FFFC:5555800000018000000180001185A9442985A94411998000000180000001AAAA +FFFD:0000007E665A5A7A76767E76767E0000 diff --git a/libs/SDL2/x86_64-w64-mingw32/bin/SDL2.dll b/libs/SDL2/x86_64-w64-mingw32/bin/SDL2.dll index 0edb386ee..2a4ba89d8 100755 Binary files a/libs/SDL2/x86_64-w64-mingw32/bin/SDL2.dll and b/libs/SDL2/x86_64-w64-mingw32/bin/SDL2.dll differ diff --git a/libs/SDL2/x86_64-w64-mingw32/bin/sdl2-config b/libs/SDL2/x86_64-w64-mingw32/bin/sdl2-config index 0b03712c7..42e872490 100755 --- a/libs/SDL2/x86_64-w64-mingw32/bin/sdl2-config +++ b/libs/SDL2/x86_64-w64-mingw32/bin/sdl2-config @@ -39,7 +39,7 @@ while test $# -gt 0; do echo $exec_prefix ;; --version) - echo 2.0.10 + echo 2.0.20 ;; --cflags) echo -I${prefix}/include/SDL2 -Dmain=SDL_main @@ -49,7 +49,7 @@ while test $# -gt 0; do ;; --static-libs) # --libs|--static-libs) - echo -L${exec_prefix}/lib -lmingw32 -lSDL2main -lSDL2 -mwindows -Wl,--no-undefined -Wl,--dynamicbase -Wl,--nxcompat -Wl,--high-entropy-va -lm -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion -luuid -static-libgcc + echo -L${exec_prefix}/lib -lmingw32 -lSDL2main -lSDL2 -mwindows -Wl,--dynamicbase -Wl,--nxcompat -Wl,--high-entropy-va -lm -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion -luuid ;; *) echo "${usage}" 1>&2 diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL.h index 88dce0c03..7cdd3243d 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -42,11 +42,13 @@ #include "SDL_filesystem.h" #include "SDL_gamecontroller.h" #include "SDL_haptic.h" +#include "SDL_hidapi.h" #include "SDL_hints.h" #include "SDL_joystick.h" #include "SDL_loadso.h" #include "SDL_log.h" #include "SDL_messagebox.h" +#include "SDL_metal.h" #include "SDL_mutex.h" #include "SDL_power.h" #include "SDL_render.h" @@ -58,6 +60,8 @@ #include "SDL_timer.h" #include "SDL_version.h" #include "SDL_video.h" +#include "SDL_locale.h" +#include "SDL_misc.h" #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ @@ -90,37 +94,130 @@ extern "C" { /* @} */ /** - * This function initializes the subsystems specified by \c flags + * Initialize the SDL library. + * + * SDL_Init() simply forwards to calling SDL_InitSubSystem(). Therefore, the + * two may be used interchangeably. Though for readability of your code + * SDL_InitSubSystem() might be preferred. + * + * The file I/O (for example: SDL_RWFromFile) and threading (SDL_CreateThread) + * subsystems are initialized by default. Message boxes + * (SDL_ShowSimpleMessageBox) also attempt to work without initializing the + * video subsystem, in hopes of being useful in showing an error dialog when + * SDL_Init fails. You must specifically initialize other subsystems if you + * use them in your application. + * + * Logging (such as SDL_Log) works without initialization, too. + * + * `flags` may be any of the following OR'd together: + * + * - `SDL_INIT_TIMER`: timer subsystem + * - `SDL_INIT_AUDIO`: audio subsystem + * - `SDL_INIT_VIDEO`: video subsystem; automatically initializes the events + * subsystem + * - `SDL_INIT_JOYSTICK`: joystick subsystem; automatically initializes the + * events subsystem + * - `SDL_INIT_HAPTIC`: haptic (force feedback) subsystem + * - `SDL_INIT_GAMECONTROLLER`: controller subsystem; automatically + * initializes the joystick subsystem + * - `SDL_INIT_EVENTS`: events subsystem + * - `SDL_INIT_EVERYTHING`: all of the above subsystems + * - `SDL_INIT_NOPARACHUTE`: compatibility; this flag is ignored + * + * Subsystem initialization is ref-counted, you must call SDL_QuitSubSystem() + * for each SDL_InitSubSystem() to correctly shutdown a subsystem manually (or + * call SDL_Quit() to force shutdown). If a subsystem is already loaded then + * this call will increase the ref-count and return. + * + * \param flags subsystem initialization flags + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_InitSubSystem + * \sa SDL_Quit + * \sa SDL_SetMainReady + * \sa SDL_WasInit */ extern DECLSPEC int SDLCALL SDL_Init(Uint32 flags); /** - * This function initializes specific SDL subsystems + * Compatibility function to initialize the SDL library. * - * Subsystem initialization is ref-counted, you must call - * SDL_QuitSubSystem() for each SDL_InitSubSystem() to correctly - * shutdown a subsystem manually (or call SDL_Quit() to force shutdown). - * If a subsystem is already loaded then this call will - * increase the ref-count and return. + * In SDL2, this function and SDL_Init() are interchangeable. + * + * \param flags any of the flags used by SDL_Init(); see SDL_Init for details. + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Init + * \sa SDL_Quit + * \sa SDL_QuitSubSystem */ extern DECLSPEC int SDLCALL SDL_InitSubSystem(Uint32 flags); /** - * This function cleans up specific SDL subsystems + * Shut down specific SDL subsystems. + * + * If you start a subsystem using a call to that subsystem's init function + * (for example SDL_VideoInit()) instead of SDL_Init() or SDL_InitSubSystem(), + * SDL_QuitSubSystem() and SDL_WasInit() will not work. You will need to use + * that subsystem's quit function (SDL_VideoQuit()) directly instead. But + * generally, you should not be using those functions directly anyhow; use + * SDL_Init() instead. + * + * You still need to call SDL_Quit() even if you close all open subsystems + * with SDL_QuitSubSystem(). + * + * \param flags any of the flags used by SDL_Init(); see SDL_Init for details. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_InitSubSystem + * \sa SDL_Quit */ extern DECLSPEC void SDLCALL SDL_QuitSubSystem(Uint32 flags); /** - * This function returns a mask of the specified subsystems which have - * previously been initialized. + * Get a mask of the specified subsystems which are currently initialized. * - * If \c flags is 0, it returns a mask of all initialized subsystems. + * \param flags any of the flags used by SDL_Init(); see SDL_Init for details. + * \returns a mask of all initialized subsystems if `flags` is 0, otherwise it + * returns the initialization status of the specified subsystems. + * + * The return value does not include SDL_INIT_NOPARACHUTE. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Init + * \sa SDL_InitSubSystem */ extern DECLSPEC Uint32 SDLCALL SDL_WasInit(Uint32 flags); /** - * This function cleans up all initialized subsystems. You should - * call it upon all exit conditions. + * Clean up all initialized subsystems. + * + * You should call this function even if you have already shutdown each + * initialized subsystem with SDL_QuitSubSystem(). It is safe to call this + * function even in the case of errors in initialization. + * + * If you start a subsystem using a call to that subsystem's init function + * (for example SDL_VideoInit()) instead of SDL_Init() or SDL_InitSubSystem(), + * then you must use that subsystem's quit function (SDL_VideoQuit()) to shut + * it down before calling SDL_Quit(). But generally, you should not be using + * those functions directly anyhow; use SDL_Init() instead. + * + * You can use this function with atexit() to ensure that it is run when your + * application is shutdown, but it is not wise to do this from a library or + * other dynamically loaded code. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Init + * \sa SDL_QuitSubSystem */ extern DECLSPEC void SDLCALL SDL_Quit(void); diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_assert.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_assert.h index 8baecb63e..defadf137 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_assert.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_assert.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -53,6 +53,10 @@ assert can have unique static variables associated with it. #define SDL_TriggerBreakpoint() __debugbreak() #elif ( (!defined(__NACL__)) && ((defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__))) ) #define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "int $3\n\t" ) +#elif ( defined(__APPLE__) && (defined(__arm64__) || defined(__aarch64__)) ) /* this might work on other ARM targets, but this is a known quantity... */ + #define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "brk #22\n\t" ) +#elif defined(__APPLE__) && defined(__arm__) + #define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "bkpt #22\n\t" ) #elif defined(__386__) && defined(__WATCOMC__) #define SDL_TriggerBreakpoint() { _asm { int 0x03 } } #elif defined(HAVE_SIGNAL_H) && !defined(__WATCOMC__) @@ -185,92 +189,121 @@ extern DECLSPEC SDL_AssertState SDLCALL SDL_ReportAssertion(SDL_AssertData *, #define SDL_assert_always(condition) SDL_enabled_assert(condition) +/** + * A callback that fires when an SDL assertion fails. + * + * \param data a pointer to the SDL_AssertData structure corresponding to the + * current assertion + * \param userdata what was passed as `userdata` to SDL_SetAssertionHandler() + * \returns an SDL_AssertState value indicating how to handle the failure. + */ typedef SDL_AssertState (SDLCALL *SDL_AssertionHandler)( const SDL_AssertData* data, void* userdata); /** - * \brief Set an application-defined assertion handler. + * Set an application-defined assertion handler. * - * This allows an app to show its own assertion UI and/or force the - * response to an assertion failure. If the app doesn't provide this, SDL - * will try to do the right thing, popping up a system-specific GUI dialog, - * and probably minimizing any fullscreen windows. + * This function allows an application to show its own assertion UI and/or + * force the response to an assertion failure. If the application doesn't + * provide this, SDL will try to do the right thing, popping up a + * system-specific GUI dialog, and probably minimizing any fullscreen windows. * - * This callback may fire from any thread, but it runs wrapped in a mutex, so - * it will only fire from one thread at a time. + * This callback may fire from any thread, but it runs wrapped in a mutex, so + * it will only fire from one thread at a time. * - * Setting the callback to NULL restores SDL's original internal handler. + * This callback is NOT reset to SDL's internal handler upon SDL_Quit()! * - * This callback is NOT reset to SDL's internal handler upon SDL_Quit()! + * \param handler the SDL_AssertionHandler function to call when an assertion + * fails or NULL for the default handler + * \param userdata a pointer that is passed to `handler` * - * Return SDL_AssertState value of how to handle the assertion failure. + * \since This function is available since SDL 2.0.0. * - * \param handler Callback function, called when an assertion fails. - * \param userdata A pointer passed to the callback as-is. + * \sa SDL_GetAssertionHandler */ extern DECLSPEC void SDLCALL SDL_SetAssertionHandler( SDL_AssertionHandler handler, void *userdata); /** - * \brief Get the default assertion handler. + * Get the default assertion handler. * - * This returns the function pointer that is called by default when an - * assertion is triggered. This is an internal function provided by SDL, - * that is used for assertions when SDL_SetAssertionHandler() hasn't been - * used to provide a different function. + * This returns the function pointer that is called by default when an + * assertion is triggered. This is an internal function provided by SDL, that + * is used for assertions when SDL_SetAssertionHandler() hasn't been used to + * provide a different function. * - * \return The default SDL_AssertionHandler that is called when an assert triggers. + * \returns the default SDL_AssertionHandler that is called when an assert + * triggers. + * + * \since This function is available since SDL 2.0.2. + * + * \sa SDL_GetAssertionHandler */ extern DECLSPEC SDL_AssertionHandler SDLCALL SDL_GetDefaultAssertionHandler(void); /** - * \brief Get the current assertion handler. + * Get the current assertion handler. * - * This returns the function pointer that is called when an assertion is - * triggered. This is either the value last passed to - * SDL_SetAssertionHandler(), or if no application-specified function is - * set, is equivalent to calling SDL_GetDefaultAssertionHandler(). + * This returns the function pointer that is called when an assertion is + * triggered. This is either the value last passed to + * SDL_SetAssertionHandler(), or if no application-specified function is set, + * is equivalent to calling SDL_GetDefaultAssertionHandler(). * - * \param puserdata Pointer to a void*, which will store the "userdata" - * pointer that was passed to SDL_SetAssertionHandler(). - * This value will always be NULL for the default handler. - * If you don't care about this data, it is safe to pass - * a NULL pointer to this function to ignore it. - * \return The SDL_AssertionHandler that is called when an assert triggers. + * The parameter `puserdata` is a pointer to a void*, which will store the + * "userdata" pointer that was passed to SDL_SetAssertionHandler(). This value + * will always be NULL for the default handler. If you don't care about this + * data, it is safe to pass a NULL pointer to this function to ignore it. + * + * \param puserdata pointer which is filled with the "userdata" pointer that + * was passed to SDL_SetAssertionHandler() + * \returns the SDL_AssertionHandler that is called when an assert triggers. + * + * \since This function is available since SDL 2.0.2. + * + * \sa SDL_SetAssertionHandler */ extern DECLSPEC SDL_AssertionHandler SDLCALL SDL_GetAssertionHandler(void **puserdata); /** - * \brief Get a list of all assertion failures. + * Get a list of all assertion failures. * - * Get all assertions triggered since last call to SDL_ResetAssertionReport(), - * or the start of the program. + * This function gets all assertions triggered since the last call to + * SDL_ResetAssertionReport(), or the start of the program. * - * The proper way to examine this data looks something like this: + * The proper way to examine this data looks something like this: * - * - * const SDL_AssertData *item = SDL_GetAssertionReport(); - * while (item) { - * printf("'%s', %s (%s:%d), triggered %u times, always ignore: %s.\\n", - * item->condition, item->function, item->filename, - * item->linenum, item->trigger_count, - * item->always_ignore ? "yes" : "no"); - * item = item->next; - * } - * + * ```c + * const SDL_AssertData *item = SDL_GetAssertionReport(); + * while (item) { + * printf("'%s', %s (%s:%d), triggered %u times, always ignore: %s.\\n", + * item->condition, item->function, item->filename, + * item->linenum, item->trigger_count, + * item->always_ignore ? "yes" : "no"); + * item = item->next; + * } + * ``` * - * \return List of all assertions. - * \sa SDL_ResetAssertionReport + * \returns a list of all failed assertions or NULL if the list is empty. This + * memory should not be modified or freed by the application. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ResetAssertionReport */ extern DECLSPEC const SDL_AssertData * SDLCALL SDL_GetAssertionReport(void); /** - * \brief Reset the list of all assertion failures. + * Clear the list of all assertion failures. * - * Reset list of all assertions triggered. + * This function will clear the list of all assertions triggered up to that + * point. Immediately following this call, SDL_GetAssertionReport will return + * no items. In addition, any previously-triggered assertions will be reset to + * a trigger_count of zero, and their always_ignore state will be false. * - * \sa SDL_GetAssertionReport + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetAssertionReport */ extern DECLSPEC void SDLCALL SDL_ResetAssertionReport(void); diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_atomic.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_atomic.h index deee35f91..b29ceeac2 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_atomic.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_atomic.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -89,25 +89,51 @@ extern "C" { typedef int SDL_SpinLock; /** - * \brief Try to lock a spin lock by setting it to a non-zero value. + * Try to lock a spin lock by setting it to a non-zero value. * - * \param lock Points to the lock. + * ***Please note that spinlocks are dangerous if you don't know what you're + * doing. Please be careful using any sort of spinlock!*** * - * \return SDL_TRUE if the lock succeeded, SDL_FALSE if the lock is already held. + * \param lock a pointer to a lock variable + * \returns SDL_TRUE if the lock succeeded, SDL_FALSE if the lock is already + * held. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AtomicLock + * \sa SDL_AtomicUnlock */ extern DECLSPEC SDL_bool SDLCALL SDL_AtomicTryLock(SDL_SpinLock *lock); /** - * \brief Lock a spin lock by setting it to a non-zero value. + * Lock a spin lock by setting it to a non-zero value. * - * \param lock Points to the lock. + * ***Please note that spinlocks are dangerous if you don't know what you're + * doing. Please be careful using any sort of spinlock!*** + * + * \param lock a pointer to a lock variable + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AtomicTryLock + * \sa SDL_AtomicUnlock */ extern DECLSPEC void SDLCALL SDL_AtomicLock(SDL_SpinLock *lock); /** - * \brief Unlock a spin lock by setting it to 0. Always returns immediately + * Unlock a spin lock by setting it to 0. * - * \param lock Points to the lock. + * Always returns immediately. + * + * ***Please note that spinlocks are dangerous if you don't know what you're + * doing. Please be careful using any sort of spinlock!*** + * + * \param lock a pointer to a lock variable + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AtomicLock + * \sa SDL_AtomicTryLock */ extern DECLSPEC void SDLCALL SDL_AtomicUnlock(SDL_SpinLock *lock); @@ -126,7 +152,7 @@ void _ReadWriteBarrier(void); /* This is correct for all CPUs when using GCC or Solaris Studio 12.1+. */ #define SDL_CompilerBarrier() __asm__ __volatile__ ("" : : : "memory") #elif defined(__WATCOMC__) -extern _inline void SDL_CompilerBarrier (void); +extern __inline void SDL_CompilerBarrier(void); #pragma aux SDL_CompilerBarrier = "" parm [] modify exact []; #else #define SDL_CompilerBarrier() \ @@ -137,20 +163,22 @@ extern _inline void SDL_CompilerBarrier (void); * Memory barriers are designed to prevent reads and writes from being * reordered by the compiler and being seen out of order on multi-core CPUs. * - * A typical pattern would be for thread A to write some data and a flag, - * and for thread B to read the flag and get the data. In this case you - * would insert a release barrier between writing the data and the flag, + * A typical pattern would be for thread A to write some data and a flag, and + * for thread B to read the flag and get the data. In this case you would + * insert a release barrier between writing the data and the flag, * guaranteeing that the data write completes no later than the flag is - * written, and you would insert an acquire barrier between reading the - * flag and reading the data, to ensure that all the reads associated - * with the flag have completed. + * written, and you would insert an acquire barrier between reading the flag + * and reading the data, to ensure that all the reads associated with the flag + * have completed. * - * In this pattern you should always see a release barrier paired with - * an acquire barrier and you should gate the data reads/writes with a - * single flag variable. + * In this pattern you should always see a release barrier paired with an + * acquire barrier and you should gate the data reads/writes with a single + * flag variable. * * For more information on these semantics, take a look at the blog post: * http://preshing.com/20120913/acquire-and-release-semantics + * + * \since This function is available since SDL 2.0.6. */ extern DECLSPEC void SDLCALL SDL_MemoryBarrierReleaseFunction(void); extern DECLSPEC void SDLCALL SDL_MemoryBarrierAcquireFunction(void); @@ -216,32 +244,73 @@ typedef void (*SDL_KernelMemoryBarrierFunc)(); typedef struct { int value; } SDL_atomic_t; /** - * \brief Set an atomic variable to a new value if it is currently an old value. + * Set an atomic variable to a new value if it is currently an old value. * - * \return SDL_TRUE if the atomic variable was set, SDL_FALSE otherwise. + * ***Note: If you don't know what this function is for, you shouldn't use + * it!*** * - * \note If you don't know what this function is for, you shouldn't use it! -*/ + * \param a a pointer to an SDL_atomic_t variable to be modified + * \param oldval the old value + * \param newval the new value + * \returns SDL_TRUE if the atomic variable was set, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AtomicCASPtr + * \sa SDL_AtomicGet + * \sa SDL_AtomicSet + */ extern DECLSPEC SDL_bool SDLCALL SDL_AtomicCAS(SDL_atomic_t *a, int oldval, int newval); /** - * \brief Set an atomic variable to a value. + * Set an atomic variable to a value. * - * \return The previous value of the atomic variable. + * This function also acts as a full memory barrier. + * + * ***Note: If you don't know what this function is for, you shouldn't use + * it!*** + * + * \param a a pointer to an SDL_atomic_t variable to be modified + * \param v the desired value + * \returns the previous value of the atomic variable. + * + * \since This function is available since SDL 2.0.2. + * + * \sa SDL_AtomicGet */ extern DECLSPEC int SDLCALL SDL_AtomicSet(SDL_atomic_t *a, int v); /** - * \brief Get the value of an atomic variable + * Get the value of an atomic variable. + * + * ***Note: If you don't know what this function is for, you shouldn't use + * it!*** + * + * \param a a pointer to an SDL_atomic_t variable + * \returns the current value of an atomic variable. + * + * \since This function is available since SDL 2.0.2. + * + * \sa SDL_AtomicSet */ extern DECLSPEC int SDLCALL SDL_AtomicGet(SDL_atomic_t *a); /** - * \brief Add to an atomic variable. + * Add to an atomic variable. * - * \return The previous value of the atomic variable. + * This function also acts as a full memory barrier. * - * \note This same style can be used for any number operation + * ***Note: If you don't know what this function is for, you shouldn't use + * it!*** + * + * \param a a pointer to an SDL_atomic_t variable to be modified + * \param v the desired value to add + * \returns the previous value of the atomic variable. + * + * \since This function is available since SDL 2.0.2. + * + * \sa SDL_AtomicDecRef + * \sa SDL_AtomicIncRef */ extern DECLSPEC int SDLCALL SDL_AtomicAdd(SDL_atomic_t *a, int v); @@ -263,23 +332,54 @@ extern DECLSPEC int SDLCALL SDL_AtomicAdd(SDL_atomic_t *a, int v); #endif /** - * \brief Set a pointer to a new value if it is currently an old value. + * Set a pointer to a new value if it is currently an old value. * - * \return SDL_TRUE if the pointer was set, SDL_FALSE otherwise. + * ***Note: If you don't know what this function is for, you shouldn't use + * it!*** * - * \note If you don't know what this function is for, you shouldn't use it! -*/ + * \param a a pointer to a pointer + * \param oldval the old pointer value + * \param newval the new pointer value + * \returns SDL_TRUE if the pointer was set, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AtomicCAS + * \sa SDL_AtomicGetPtr + * \sa SDL_AtomicSetPtr + */ extern DECLSPEC SDL_bool SDLCALL SDL_AtomicCASPtr(void **a, void *oldval, void *newval); /** - * \brief Set a pointer to a value atomically. + * Set a pointer to a value atomically. * - * \return The previous value of the pointer. + * ***Note: If you don't know what this function is for, you shouldn't use + * it!*** + * + * \param a a pointer to a pointer + * \param v the desired pointer value + * \returns the previous value of the pointer. + * + * \since This function is available since SDL 2.0.2. + * + * \sa SDL_AtomicCASPtr + * \sa SDL_AtomicGetPtr */ extern DECLSPEC void* SDLCALL SDL_AtomicSetPtr(void **a, void* v); /** - * \brief Get the value of a pointer atomically. + * Get the value of a pointer atomically. + * + * ***Note: If you don't know what this function is for, you shouldn't use + * it!*** + * + * \param a a pointer to a pointer + * \returns the current value of a pointer. + * + * \since This function is available since SDL 2.0.2. + * + * \sa SDL_AtomicCASPtr + * \sa SDL_AtomicSetPtr */ extern DECLSPEC void* SDLCALL SDL_AtomicGetPtr(void **a); diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_audio.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_audio.h index 305c01a9d..181f66c57 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_audio.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_audio.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -19,6 +19,8 @@ 3. This notice may not be removed or altered from any source distribution. */ +/* !!! FIXME: several functions in here need Doxygen comments. */ + /** * \file SDL_audio.h * @@ -212,9 +214,12 @@ typedef void (SDLCALL * SDL_AudioFilter) (struct SDL_AudioCVT * cvt, * set both its (buf) field to a pointer that is aligned to 16 bytes, and its * (len) field to something that's a multiple of 16, if possible. */ -#ifdef __GNUC__ +#if defined(__GNUC__) && !defined(__CHERI_PURE_CAPABILITY__) /* This structure is 84 bytes on 32-bit architectures, make sure GCC doesn't pad it out to 88 bytes to guarantee ABI compatibility between compilers. + This is not a concern on CHERI architectures, where pointers must be stored + at aligned locations otherwise they will become invalid, and thus structs + containing pointers cannot be packed without giving a warning or error. vvv The next time we rev the ABI, make sure to size the ints and add padding. */ @@ -248,7 +253,48 @@ typedef struct SDL_AudioCVT * order that they are normally initialized by default. */ /* @{ */ + +/** + * Use this function to get the number of built-in audio drivers. + * + * This function returns a hardcoded number. This never returns a negative + * value; if there are no drivers compiled into this build of SDL, this + * function returns zero. The presence of a driver in this list does not mean + * it will function, it just means SDL is capable of interacting with that + * interface. For example, a build of SDL might have esound support, but if + * there's no esound server available, SDL's esound driver would fail if used. + * + * By default, SDL tries all drivers, in its preferred order, until one is + * found to be usable. + * + * \returns the number of built-in audio drivers. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetAudioDriver + */ extern DECLSPEC int SDLCALL SDL_GetNumAudioDrivers(void); + +/** + * Use this function to get the name of a built in audio driver. + * + * The list of audio drivers is given in the order that they are normally + * initialized by default; the drivers that seem more reasonable to choose + * first (as far as the SDL developers believe) are earlier in the list. + * + * The names of drivers are all simple, low-ASCII identifiers, like "alsa", + * "coreaudio" or "xaudio2". These never have Unicode characters, and are not + * meant to be proper names. + * + * \param index the index of the audio driver; the value ranges from 0 to + * SDL_GetNumAudioDrivers() - 1 + * \returns the name of the audio driver at the requested index, or NULL if an + * invalid index was specified. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetNumAudioDrivers + */ extern DECLSPEC const char *SDLCALL SDL_GetAudioDriver(int index); /* @} */ @@ -260,60 +306,103 @@ extern DECLSPEC const char *SDLCALL SDL_GetAudioDriver(int index); * use. You should normally use SDL_Init() or SDL_InitSubSystem(). */ /* @{ */ + +/** + * Use this function to initialize a particular audio driver. + * + * This function is used internally, and should not be used unless you have a + * specific need to designate the audio driver you want to use. You should + * normally use SDL_Init() or SDL_InitSubSystem(). + * + * \param driver_name the name of the desired audio driver + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AudioQuit + */ extern DECLSPEC int SDLCALL SDL_AudioInit(const char *driver_name); + +/** + * Use this function to shut down audio if you initialized it with + * SDL_AudioInit(). + * + * This function is used internally, and should not be used unless you have a + * specific need to specify the audio driver you want to use. You should + * normally use SDL_Quit() or SDL_QuitSubSystem(). + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AudioInit + */ extern DECLSPEC void SDLCALL SDL_AudioQuit(void); /* @} */ /** - * This function returns the name of the current audio driver, or NULL - * if no driver has been initialized. + * Get the name of the current audio driver. + * + * The returned string points to internal static memory and thus never becomes + * invalid, even if you quit the audio subsystem and initialize a new driver + * (although such a case would return a different static string from another + * call to this function, of course). As such, you should not modify or free + * the returned string. + * + * \returns the name of the current audio driver or NULL if no driver has been + * initialized. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AudioInit */ extern DECLSPEC const char *SDLCALL SDL_GetCurrentAudioDriver(void); /** - * This function opens the audio device with the desired parameters, and - * returns 0 if successful, placing the actual hardware parameters in the - * structure pointed to by \c obtained. If \c obtained is NULL, the audio - * data passed to the callback function will be guaranteed to be in the - * requested format, and will be automatically converted to the hardware - * audio format if necessary. This function returns -1 if it failed - * to open the audio device, or couldn't set up the audio thread. + * This function is a legacy means of opening the audio device. * - * When filling in the desired audio spec structure, - * - \c desired->freq should be the desired audio frequency in samples-per- - * second. - * - \c desired->format should be the desired audio format. - * - \c desired->samples is the desired size of the audio buffer, in - * samples. This number should be a power of two, and may be adjusted by - * the audio driver to a value more suitable for the hardware. Good values - * seem to range between 512 and 8096 inclusive, depending on the - * application and CPU speed. Smaller values yield faster response time, - * but can lead to underflow if the application is doing heavy processing - * and cannot fill the audio buffer in time. A stereo sample consists of - * both right and left channels in LR ordering. - * Note that the number of samples is directly related to time by the - * following formula: \code ms = (samples*1000)/freq \endcode - * - \c desired->size is the size in bytes of the audio buffer, and is - * calculated by SDL_OpenAudio(). - * - \c desired->silence is the value used to set the buffer to silence, - * and is calculated by SDL_OpenAudio(). - * - \c desired->callback should be set to a function that will be called - * when the audio device is ready for more data. It is passed a pointer - * to the audio buffer, and the length in bytes of the audio buffer. - * This function usually runs in a separate thread, and so you should - * protect data structures that it accesses by calling SDL_LockAudio() - * and SDL_UnlockAudio() in your code. Alternately, you may pass a NULL - * pointer here, and call SDL_QueueAudio() with some frequency, to queue - * more audio samples to be played (or for capture devices, call - * SDL_DequeueAudio() with some frequency, to obtain audio samples). - * - \c desired->userdata is passed as the first parameter to your callback - * function. If you passed a NULL callback, this value is ignored. + * This function remains for compatibility with SDL 1.2, but also because it's + * slightly easier to use than the new functions in SDL 2.0. The new, more + * powerful, and preferred way to do this is SDL_OpenAudioDevice(). * - * The audio device starts out playing silence when it's opened, and should - * be enabled for playing by calling \c SDL_PauseAudio(0) when you are ready - * for your audio callback function to be called. Since the audio driver - * may modify the requested size of the audio buffer, you should allocate - * any local mixing buffers after you open the audio device. + * This function is roughly equivalent to: + * + * ```c + * SDL_OpenAudioDevice(NULL, 0, desired, obtained, SDL_AUDIO_ALLOW_ANY_CHANGE); + * ``` + * + * With two notable exceptions: + * + * - If `obtained` is NULL, we use `desired` (and allow no changes), which + * means desired will be modified to have the correct values for silence, + * etc, and SDL will convert any differences between your app's specific + * request and the hardware behind the scenes. + * - The return value is always success or failure, and not a device ID, which + * means you can only have one device open at a time with this function. + * + * \param desired an SDL_AudioSpec structure representing the desired output + * format. Please refer to the SDL_OpenAudioDevice + * documentation for details on how to prepare this structure. + * \param obtained an SDL_AudioSpec structure filled in with the actual + * parameters, or NULL. + * \returns 0 if successful, placing the actual hardware parameters in the + * structure pointed to by `obtained`. + * + * If `obtained` is NULL, the audio data passed to the callback + * function will be guaranteed to be in the requested format, and + * will be automatically converted to the actual hardware audio + * format if necessary. If `obtained` is NULL, `desired` will have + * fields modified. + * + * This function returns a negative error code on failure to open the + * audio device or failure to set up the audio thread; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CloseAudio + * \sa SDL_LockAudio + * \sa SDL_PauseAudio + * \sa SDL_UnlockAudio */ extern DECLSPEC int SDLCALL SDL_OpenAudio(SDL_AudioSpec * desired, SDL_AudioSpec * obtained); @@ -330,59 +419,223 @@ extern DECLSPEC int SDLCALL SDL_OpenAudio(SDL_AudioSpec * desired, typedef Uint32 SDL_AudioDeviceID; /** - * Get the number of available devices exposed by the current driver. - * Only valid after a successfully initializing the audio subsystem. - * Returns -1 if an explicit list of devices can't be determined; this is - * not an error. For example, if SDL is set up to talk to a remote audio - * server, it can't list every one available on the Internet, but it will - * still allow a specific host to be specified to SDL_OpenAudioDevice(). + * Get the number of built-in audio devices. * - * In many common cases, when this function returns a value <= 0, it can still - * successfully open the default device (NULL for first argument of - * SDL_OpenAudioDevice()). + * This function is only valid after successfully initializing the audio + * subsystem. + * + * Note that audio capture support is not implemented as of SDL 2.0.4, so the + * `iscapture` parameter is for future expansion and should always be zero for + * now. + * + * This function will return -1 if an explicit list of devices can't be + * determined. Returning -1 is not an error. For example, if SDL is set up to + * talk to a remote audio server, it can't list every one available on the + * Internet, but it will still allow a specific host to be specified in + * SDL_OpenAudioDevice(). + * + * In many common cases, when this function returns a value <= 0, it can still + * successfully open the default device (NULL for first argument of + * SDL_OpenAudioDevice()). + * + * This function may trigger a complete redetect of available hardware. It + * should not be called for each iteration of a loop, but rather once at the + * start of a loop: + * + * ```c + * // Don't do this: + * for (int i = 0; i < SDL_GetNumAudioDevices(0); i++) + * + * // do this instead: + * const int count = SDL_GetNumAudioDevices(0); + * for (int i = 0; i < count; ++i) { do_something_here(); } + * ``` + * + * \param iscapture zero to request playback devices, non-zero to request + * recording devices + * \returns the number of available devices exposed by the current driver or + * -1 if an explicit list of devices can't be determined. A return + * value of -1 does not necessarily mean an error condition. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetAudioDeviceName + * \sa SDL_OpenAudioDevice */ extern DECLSPEC int SDLCALL SDL_GetNumAudioDevices(int iscapture); /** - * Get the human-readable name of a specific audio device. - * Must be a value between 0 and (number of audio devices-1). - * Only valid after a successfully initializing the audio subsystem. - * The values returned by this function reflect the latest call to - * SDL_GetNumAudioDevices(); recall that function to redetect available - * hardware. + * Get the human-readable name of a specific audio device. * - * The string returned by this function is UTF-8 encoded, read-only, and - * managed internally. You are not to free it. If you need to keep the - * string for any length of time, you should make your own copy of it, as it - * will be invalid next time any of several other SDL functions is called. + * This function is only valid after successfully initializing the audio + * subsystem. The values returned by this function reflect the latest call to + * SDL_GetNumAudioDevices(); re-call that function to redetect available + * hardware. + * + * The string returned by this function is UTF-8 encoded, read-only, and + * managed internally. You are not to free it. If you need to keep the string + * for any length of time, you should make your own copy of it, as it will be + * invalid next time any of several other SDL functions are called. + * + * \param index the index of the audio device; valid values range from 0 to + * SDL_GetNumAudioDevices() - 1 + * \param iscapture non-zero to query the list of recording devices, zero to + * query the list of output devices. + * \returns the name of the audio device at the requested index, or NULL on + * error. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetNumAudioDevices */ extern DECLSPEC const char *SDLCALL SDL_GetAudioDeviceName(int index, int iscapture); +/** + * Get the preferred audio format of a specific audio device. + * + * This function is only valid after a successfully initializing the audio + * subsystem. The values returned by this function reflect the latest call to + * SDL_GetNumAudioDevices(); re-call that function to redetect available + * hardware. + * + * `spec` will be filled with the sample rate, sample format, and channel + * count. All other values in the structure are filled with 0. When the + * supported struct members are 0, SDL was unable to get the property from the + * backend. + * + * \param index the index of the audio device; valid values range from 0 to + * SDL_GetNumAudioDevices() - 1 + * \param iscapture non-zero to query the list of recording devices, zero to + * query the list of output devices. + * \param spec The SDL_AudioSpec to be initialized by this function. + * \returns 0 on success, nonzero on error + * + * \since This function is available since SDL 2.0.16. + * + * \sa SDL_GetNumAudioDevices + */ +extern DECLSPEC int SDLCALL SDL_GetAudioDeviceSpec(int index, + int iscapture, + SDL_AudioSpec *spec); + /** - * Open a specific audio device. Passing in a device name of NULL requests - * the most reasonable default (and is equivalent to calling SDL_OpenAudio()). + * Open a specific audio device. * - * The device name is a UTF-8 string reported by SDL_GetAudioDeviceName(), but - * some drivers allow arbitrary and driver-specific strings, such as a - * hostname/IP address for a remote audio server, or a filename in the - * diskaudio driver. + * SDL_OpenAudio(), unlike this function, always acts on device ID 1. As such, + * this function will never return a 1 so as not to conflict with the legacy + * function. * - * \return 0 on error, a valid device ID that is >= 2 on success. + * Please note that SDL 2.0 before 2.0.5 did not support recording; as such, + * this function would fail if `iscapture` was not zero. Starting with SDL + * 2.0.5, recording is implemented and this value can be non-zero. * - * SDL_OpenAudio(), unlike this function, always acts on device ID 1. + * Passing in a `device` name of NULL requests the most reasonable default + * (and is equivalent to what SDL_OpenAudio() does to choose a device). The + * `device` name is a UTF-8 string reported by SDL_GetAudioDeviceName(), but + * some drivers allow arbitrary and driver-specific strings, such as a + * hostname/IP address for a remote audio server, or a filename in the + * diskaudio driver. + * + * An opened audio device starts out paused, and should be enabled for playing + * by calling SDL_PauseAudioDevice(devid, 0) when you are ready for your audio + * callback function to be called. Since the audio driver may modify the + * requested size of the audio buffer, you should allocate any local mixing + * buffers after you open the audio device. + * + * The audio callback runs in a separate thread in most cases; you can prevent + * race conditions between your callback and other threads without fully + * pausing playback with SDL_LockAudioDevice(). For more information about the + * callback, see SDL_AudioSpec. + * + * Managing the audio spec via 'desired' and 'obtained': + * + * When filling in the desired audio spec structure: + * + * - `desired->freq` should be the frequency in sample-frames-per-second (Hz). + * - `desired->format` should be the audio format (`AUDIO_S16SYS`, etc). + * - `desired->samples` is the desired size of the audio buffer, in _sample + * frames_ (with stereo output, two samples--left and right--would make a + * single sample frame). This number should be a power of two, and may be + * adjusted by the audio driver to a value more suitable for the hardware. + * Good values seem to range between 512 and 8096 inclusive, depending on + * the application and CPU speed. Smaller values reduce latency, but can + * lead to underflow if the application is doing heavy processing and cannot + * fill the audio buffer in time. Note that the number of sample frames is + * directly related to time by the following formula: `ms = + * (sampleframes*1000)/freq` + * - `desired->size` is the size in _bytes_ of the audio buffer, and is + * calculated by SDL_OpenAudioDevice(). You don't initialize this. + * - `desired->silence` is the value used to set the buffer to silence, and is + * calculated by SDL_OpenAudioDevice(). You don't initialize this. + * - `desired->callback` should be set to a function that will be called when + * the audio device is ready for more data. It is passed a pointer to the + * audio buffer, and the length in bytes of the audio buffer. This function + * usually runs in a separate thread, and so you should protect data + * structures that it accesses by calling SDL_LockAudioDevice() and + * SDL_UnlockAudioDevice() in your code. Alternately, you may pass a NULL + * pointer here, and call SDL_QueueAudio() with some frequency, to queue + * more audio samples to be played (or for capture devices, call + * SDL_DequeueAudio() with some frequency, to obtain audio samples). + * - `desired->userdata` is passed as the first parameter to your callback + * function. If you passed a NULL callback, this value is ignored. + * + * `allowed_changes` can have the following flags OR'd together: + * + * - `SDL_AUDIO_ALLOW_FREQUENCY_CHANGE` + * - `SDL_AUDIO_ALLOW_FORMAT_CHANGE` + * - `SDL_AUDIO_ALLOW_CHANNELS_CHANGE` + * - `SDL_AUDIO_ALLOW_ANY_CHANGE` + * + * These flags specify how SDL should behave when a device cannot offer a + * specific feature. If the application requests a feature that the hardware + * doesn't offer, SDL will always try to get the closest equivalent. + * + * For example, if you ask for float32 audio format, but the sound card only + * supports int16, SDL will set the hardware to int16. If you had set + * SDL_AUDIO_ALLOW_FORMAT_CHANGE, SDL will change the format in the `obtained` + * structure. If that flag was *not* set, SDL will prepare to convert your + * callback's float32 audio to int16 before feeding it to the hardware and + * will keep the originally requested format in the `obtained` structure. + * + * The resulting audio specs, varying depending on hardware and on what + * changes were allowed, will then be written back to `obtained`. + * + * If your application can only handle one specific data format, pass a zero + * for `allowed_changes` and let SDL transparently handle any differences. + * + * \param device a UTF-8 string reported by SDL_GetAudioDeviceName() or a + * driver-specific name as appropriate. NULL requests the most + * reasonable default device. + * \param iscapture non-zero to specify a device should be opened for + * recording, not playback + * \param desired an SDL_AudioSpec structure representing the desired output + * format; see SDL_OpenAudio() for more information + * \param obtained an SDL_AudioSpec structure filled in with the actual output + * format; see SDL_OpenAudio() for more information + * \param allowed_changes 0, or one or more flags OR'd together + * \returns a valid device ID that is > 0 on success or 0 on failure; call + * SDL_GetError() for more information. + * + * For compatibility with SDL 1.2, this will never return 1, since + * SDL reserves that ID for the legacy SDL_OpenAudio() function. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CloseAudioDevice + * \sa SDL_GetAudioDeviceName + * \sa SDL_LockAudioDevice + * \sa SDL_OpenAudio + * \sa SDL_PauseAudioDevice + * \sa SDL_UnlockAudioDevice */ -extern DECLSPEC SDL_AudioDeviceID SDLCALL SDL_OpenAudioDevice(const char - *device, - int iscapture, - const - SDL_AudioSpec * - desired, - SDL_AudioSpec * - obtained, - int - allowed_changes); +extern DECLSPEC SDL_AudioDeviceID SDLCALL SDL_OpenAudioDevice( + const char *device, + int iscapture, + const SDL_AudioSpec *desired, + SDL_AudioSpec *obtained, + int allowed_changes); @@ -398,10 +651,39 @@ typedef enum SDL_AUDIO_PLAYING, SDL_AUDIO_PAUSED } SDL_AudioStatus; + +/** + * This function is a legacy means of querying the audio device. + * + * New programs might want to use SDL_GetAudioDeviceStatus() instead. This + * function is equivalent to calling... + * + * ```c + * SDL_GetAudioDeviceStatus(1); + * ``` + * + * ...and is only useful if you used the legacy SDL_OpenAudio() function. + * + * \returns the SDL_AudioStatus of the audio device opened by SDL_OpenAudio(). + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetAudioDeviceStatus + */ extern DECLSPEC SDL_AudioStatus SDLCALL SDL_GetAudioStatus(void); -extern DECLSPEC SDL_AudioStatus SDLCALL -SDL_GetAudioDeviceStatus(SDL_AudioDeviceID dev); +/** + * Use this function to get the current audio state of an audio device. + * + * \param dev the ID of an audio device previously opened with + * SDL_OpenAudioDevice() + * \returns the SDL_AudioStatus of the specified audio device. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_PauseAudioDevice + */ +extern DECLSPEC SDL_AudioStatus SDLCALL SDL_GetAudioDeviceStatus(SDL_AudioDeviceID dev); /* @} *//* Audio State */ /** @@ -414,62 +696,140 @@ SDL_GetAudioDeviceStatus(SDL_AudioDeviceID dev); * Silence will be written to the audio device during the pause. */ /* @{ */ + +/** + * This function is a legacy means of pausing the audio device. + * + * New programs might want to use SDL_PauseAudioDevice() instead. This + * function is equivalent to calling... + * + * ```c + * SDL_PauseAudioDevice(1, pause_on); + * ``` + * + * ...and is only useful if you used the legacy SDL_OpenAudio() function. + * + * \param pause_on non-zero to pause, 0 to unpause + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetAudioStatus + * \sa SDL_PauseAudioDevice + */ extern DECLSPEC void SDLCALL SDL_PauseAudio(int pause_on); + +/** + * Use this function to pause and unpause audio playback on a specified + * device. + * + * This function pauses and unpauses the audio callback processing for a given + * device. Newly-opened audio devices start in the paused state, so you must + * call this function with **pause_on**=0 after opening the specified audio + * device to start playing sound. This allows you to safely initialize data + * for your callback function after opening the audio device. Silence will be + * written to the audio device while paused, and the audio callback is + * guaranteed to not be called. Pausing one device does not prevent other + * unpaused devices from running their callbacks. + * + * Pausing state does not stack; even if you pause a device several times, a + * single unpause will start the device playing again, and vice versa. This is + * different from how SDL_LockAudioDevice() works. + * + * If you just need to protect a few variables from race conditions vs your + * callback, you shouldn't pause the audio device, as it will lead to dropouts + * in the audio playback. Instead, you should use SDL_LockAudioDevice(). + * + * \param dev a device opened by SDL_OpenAudioDevice() + * \param pause_on non-zero to pause, 0 to unpause + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LockAudioDevice + */ extern DECLSPEC void SDLCALL SDL_PauseAudioDevice(SDL_AudioDeviceID dev, int pause_on); /* @} *//* Pause audio functions */ /** - * \brief Load the audio data of a WAVE file into memory + * Load the audio data of a WAVE file into memory. * - * Loading a WAVE file requires \c src, \c spec, \c audio_buf and \c audio_len - * to be valid pointers. The entire data portion of the file is then loaded - * into memory and decoded if necessary. + * Loading a WAVE file requires `src`, `spec`, `audio_buf` and `audio_len` to + * be valid pointers. The entire data portion of the file is then loaded into + * memory and decoded if necessary. * - * If \c freesrc is non-zero, the data source gets automatically closed and - * freed before the function returns. + * If `freesrc` is non-zero, the data source gets automatically closed and + * freed before the function returns. * - * Supported are RIFF WAVE files with the formats PCM (8, 16, 24, and 32 bits), - * IEEE Float (32 bits), Microsoft ADPCM and IMA ADPCM (4 bits), and A-law and - * µ-law (8 bits). Other formats are currently unsupported and cause an error. + * Supported formats are RIFF WAVE files with the formats PCM (8, 16, 24, and + * 32 bits), IEEE Float (32 bits), Microsoft ADPCM and IMA ADPCM (4 bits), and + * A-law and mu-law (8 bits). Other formats are currently unsupported and + * cause an error. * - * If this function succeeds, the pointer returned by it is equal to \c spec - * and the pointer to the audio data allocated by the function is written to - * \c audio_buf and its length in bytes to \c audio_len. The \ref SDL_AudioSpec - * members \c freq, \c channels, and \c format are set to the values of the - * audio data in the buffer. The \c samples member is set to a sane default and - * all others are set to zero. + * If this function succeeds, the pointer returned by it is equal to `spec` + * and the pointer to the audio data allocated by the function is written to + * `audio_buf` and its length in bytes to `audio_len`. The SDL_AudioSpec + * members `freq`, `channels`, and `format` are set to the values of the audio + * data in the buffer. The `samples` member is set to a sane default and all + * others are set to zero. * - * It's necessary to use SDL_FreeWAV() to free the audio data returned in - * \c audio_buf when it is no longer used. + * It's necessary to use SDL_FreeWAV() to free the audio data returned in + * `audio_buf` when it is no longer used. * - * Because of the underspecification of the Waveform format, there are many - * problematic files in the wild that cause issues with strict decoders. To - * provide compatibility with these files, this decoder is lenient in regards - * to the truncation of the file, the fact chunk, and the size of the RIFF - * chunk. The hints SDL_HINT_WAVE_RIFF_CHUNK_SIZE, SDL_HINT_WAVE_TRUNCATION, - * and SDL_HINT_WAVE_FACT_CHUNK can be used to tune the behavior of the - * loading process. + * Because of the underspecification of the .WAV format, there are many + * problematic files in the wild that cause issues with strict decoders. To + * provide compatibility with these files, this decoder is lenient in regards + * to the truncation of the file, the fact chunk, and the size of the RIFF + * chunk. The hints `SDL_HINT_WAVE_RIFF_CHUNK_SIZE`, + * `SDL_HINT_WAVE_TRUNCATION`, and `SDL_HINT_WAVE_FACT_CHUNK` can be used to + * tune the behavior of the loading process. * - * Any file that is invalid (due to truncation, corruption, or wrong values in - * the headers), too big, or unsupported causes an error. Additionally, any - * critical I/O error from the data source will terminate the loading process - * with an error. The function returns NULL on error and in all cases (with the - * exception of \c src being NULL), an appropriate error message will be set. + * Any file that is invalid (due to truncation, corruption, or wrong values in + * the headers), too big, or unsupported causes an error. Additionally, any + * critical I/O error from the data source will terminate the loading process + * with an error. The function returns NULL on error and in all cases (with + * the exception of `src` being NULL), an appropriate error message will be + * set. * - * It is required that the data source supports seeking. + * It is required that the data source supports seeking. * - * Example: - * \code - * SDL_LoadWAV_RW(SDL_RWFromFile("sample.wav", "rb"), 1, ...); - * \endcode + * Example: * - * \param src The data source with the WAVE data - * \param freesrc A integer value that makes the function close the data source if non-zero - * \param spec A pointer filled with the audio format of the audio data - * \param audio_buf A pointer filled with the audio data allocated by the function - * \param audio_len A pointer filled with the length of the audio data buffer in bytes - * \return NULL on error, or non-NULL on success. + * ```c + * SDL_LoadWAV_RW(SDL_RWFromFile("sample.wav", "rb"), 1, &spec, &buf, &len); + * ``` + * + * Note that the SDL_LoadWAV macro does this same thing for you, but in a less + * messy way: + * + * ```c + * SDL_LoadWAV("sample.wav", &spec, &buf, &len); + * ``` + * + * \param src The data source for the WAVE data + * \param freesrc If non-zero, SDL will _always_ free the data source + * \param spec An SDL_AudioSpec that will be filled in with the wave file's + * format details + * \param audio_buf A pointer filled with the audio data, allocated by the + * function. + * \param audio_len A pointer filled with the length of the audio data buffer + * in bytes + * \returns This function, if successfully called, returns `spec`, which will + * be filled with the audio data format of the wave source data. + * `audio_buf` will be filled with a pointer to an allocated buffer + * containing the audio data, and `audio_len` is filled with the + * length of that audio buffer in bytes. + * + * This function returns NULL if the .WAV file cannot be opened, uses + * an unknown data format, or is corrupt; call SDL_GetError() for + * more information. + * + * When the application is done with the data returned in + * `audio_buf`, it should call SDL_FreeWAV() to dispose of it. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_FreeWAV + * \sa SDL_LoadWAV */ extern DECLSPEC SDL_AudioSpec *SDLCALL SDL_LoadWAV_RW(SDL_RWops * src, int freesrc, @@ -485,18 +845,53 @@ extern DECLSPEC SDL_AudioSpec *SDLCALL SDL_LoadWAV_RW(SDL_RWops * src, SDL_LoadWAV_RW(SDL_RWFromFile(file, "rb"),1, spec,audio_buf,audio_len) /** - * This function frees data previously allocated with SDL_LoadWAV_RW() + * Free data previously allocated with SDL_LoadWAV() or SDL_LoadWAV_RW(). + * + * After a WAVE file has been opened with SDL_LoadWAV() or SDL_LoadWAV_RW() + * its data can eventually be freed with SDL_FreeWAV(). It is safe to call + * this function with a NULL pointer. + * + * \param audio_buf a pointer to the buffer created by SDL_LoadWAV() or + * SDL_LoadWAV_RW() + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LoadWAV + * \sa SDL_LoadWAV_RW */ extern DECLSPEC void SDLCALL SDL_FreeWAV(Uint8 * audio_buf); /** - * This function takes a source format and rate and a destination format - * and rate, and initializes the \c cvt structure with information needed - * by SDL_ConvertAudio() to convert a buffer of audio data from one format - * to the other. An unsupported format causes an error and -1 will be returned. + * Initialize an SDL_AudioCVT structure for conversion. * - * \return 0 if no conversion is needed, 1 if the audio filter is set up, - * or -1 on error. + * Before an SDL_AudioCVT structure can be used to convert audio data it must + * be initialized with source and destination information. + * + * This function will zero out every field of the SDL_AudioCVT, so it must be + * called before the application fills in the final buffer information. + * + * Once this function has returned successfully, and reported that a + * conversion is necessary, the application fills in the rest of the fields in + * SDL_AudioCVT, now that it knows how large a buffer it needs to allocate, + * and then can call SDL_ConvertAudio() to complete the conversion. + * + * \param cvt an SDL_AudioCVT structure filled in with audio conversion + * information + * \param src_format the source format of the audio data; for more info see + * SDL_AudioFormat + * \param src_channels the number of channels in the source + * \param src_rate the frequency (sample-frames-per-second) of the source + * \param dst_format the destination format of the audio data; for more info + * see SDL_AudioFormat + * \param dst_channels the number of channels in the destination + * \param dst_rate the frequency (sample-frames-per-second) of the destination + * \returns 1 if the audio filter is prepared, 0 if no conversion is needed, + * or a negative error code on failure; call SDL_GetError() for more + * information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ConvertAudio */ extern DECLSPEC int SDLCALL SDL_BuildAudioCVT(SDL_AudioCVT * cvt, SDL_AudioFormat src_format, @@ -507,16 +902,42 @@ extern DECLSPEC int SDLCALL SDL_BuildAudioCVT(SDL_AudioCVT * cvt, int dst_rate); /** - * Once you have initialized the \c cvt structure using SDL_BuildAudioCVT(), - * created an audio buffer \c cvt->buf, and filled it with \c cvt->len bytes of - * audio data in the source format, this function will convert it in-place - * to the desired format. + * Convert audio data to a desired audio format. * - * The data conversion may expand the size of the audio data, so the buffer - * \c cvt->buf should be allocated after the \c cvt structure is initialized by - * SDL_BuildAudioCVT(), and should be \c cvt->len*cvt->len_mult bytes long. + * This function does the actual audio data conversion, after the application + * has called SDL_BuildAudioCVT() to prepare the conversion information and + * then filled in the buffer details. * - * \return 0 on success or -1 if \c cvt->buf is NULL. + * Once the application has initialized the `cvt` structure using + * SDL_BuildAudioCVT(), allocated an audio buffer and filled it with audio + * data in the source format, this function will convert the buffer, in-place, + * to the desired format. + * + * The data conversion may go through several passes; any given pass may + * possibly temporarily increase the size of the data. For example, SDL might + * expand 16-bit data to 32 bits before resampling to a lower frequency, + * shrinking the data size after having grown it briefly. Since the supplied + * buffer will be both the source and destination, converting as necessary + * in-place, the application must allocate a buffer that will fully contain + * the data during its largest conversion pass. After SDL_BuildAudioCVT() + * returns, the application should set the `cvt->len` field to the size, in + * bytes, of the source data, and allocate a buffer that is `cvt->len * + * cvt->len_mult` bytes long for the `buf` field. + * + * The source data should be copied into this buffer before the call to + * SDL_ConvertAudio(). Upon successful return, this buffer will contain the + * converted audio, and `cvt->len_cvt` will be the size of the converted data, + * in bytes. Any bytes in the buffer past `cvt->len_cvt` are undefined once + * this function returns. + * + * \param cvt an SDL_AudioCVT structure that was previously set up by + * SDL_BuildAudioCVT(). + * \returns 0 if the conversion was completed successfully or a negative error + * code on failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_BuildAudioCVT */ extern DECLSPEC int SDLCALL SDL_ConvertAudio(SDL_AudioCVT * cvt); @@ -532,22 +953,24 @@ struct _SDL_AudioStream; typedef struct _SDL_AudioStream SDL_AudioStream; /** - * Create a new audio stream + * Create a new audio stream. * - * \param src_format The format of the source audio - * \param src_channels The number of channels of the source audio - * \param src_rate The sampling rate of the source audio - * \param dst_format The format of the desired audio output - * \param dst_channels The number of channels of the desired audio output - * \param dst_rate The sampling rate of the desired audio output - * \return 0 on success, or -1 on error. + * \param src_format The format of the source audio + * \param src_channels The number of channels of the source audio + * \param src_rate The sampling rate of the source audio + * \param dst_format The format of the desired audio output + * \param dst_channels The number of channels of the desired audio output + * \param dst_rate The sampling rate of the desired audio output + * \returns 0 on success, or -1 on error. * - * \sa SDL_AudioStreamPut - * \sa SDL_AudioStreamGet - * \sa SDL_AudioStreamAvailable - * \sa SDL_AudioStreamFlush - * \sa SDL_AudioStreamClear - * \sa SDL_FreeAudioStream + * \since This function is available since SDL 2.0.7. + * + * \sa SDL_AudioStreamPut + * \sa SDL_AudioStreamGet + * \sa SDL_AudioStreamAvailable + * \sa SDL_AudioStreamFlush + * \sa SDL_AudioStreamClear + * \sa SDL_FreeAudioStream */ extern DECLSPEC SDL_AudioStream * SDLCALL SDL_NewAudioStream(const SDL_AudioFormat src_format, const Uint8 src_channels, @@ -557,110 +980,164 @@ extern DECLSPEC SDL_AudioStream * SDLCALL SDL_NewAudioStream(const SDL_AudioForm const int dst_rate); /** - * Add data to be converted/resampled to the stream + * Add data to be converted/resampled to the stream. * - * \param stream The stream the audio data is being added to - * \param buf A pointer to the audio data to add - * \param len The number of bytes to write to the stream - * \return 0 on success, or -1 on error. + * \param stream The stream the audio data is being added to + * \param buf A pointer to the audio data to add + * \param len The number of bytes to write to the stream + * \returns 0 on success, or -1 on error. * - * \sa SDL_NewAudioStream - * \sa SDL_AudioStreamGet - * \sa SDL_AudioStreamAvailable - * \sa SDL_AudioStreamFlush - * \sa SDL_AudioStreamClear - * \sa SDL_FreeAudioStream + * \since This function is available since SDL 2.0.7. + * + * \sa SDL_NewAudioStream + * \sa SDL_AudioStreamGet + * \sa SDL_AudioStreamAvailable + * \sa SDL_AudioStreamFlush + * \sa SDL_AudioStreamClear + * \sa SDL_FreeAudioStream */ extern DECLSPEC int SDLCALL SDL_AudioStreamPut(SDL_AudioStream *stream, const void *buf, int len); /** - * Get converted/resampled data from the stream + * Get converted/resampled data from the stream * - * \param stream The stream the audio is being requested from - * \param buf A buffer to fill with audio data - * \param len The maximum number of bytes to fill - * \return The number of bytes read from the stream, or -1 on error + * \param stream The stream the audio is being requested from + * \param buf A buffer to fill with audio data + * \param len The maximum number of bytes to fill + * \returns the number of bytes read from the stream, or -1 on error * - * \sa SDL_NewAudioStream - * \sa SDL_AudioStreamPut - * \sa SDL_AudioStreamAvailable - * \sa SDL_AudioStreamFlush - * \sa SDL_AudioStreamClear - * \sa SDL_FreeAudioStream + * \since This function is available since SDL 2.0.7. + * + * \sa SDL_NewAudioStream + * \sa SDL_AudioStreamPut + * \sa SDL_AudioStreamAvailable + * \sa SDL_AudioStreamFlush + * \sa SDL_AudioStreamClear + * \sa SDL_FreeAudioStream */ extern DECLSPEC int SDLCALL SDL_AudioStreamGet(SDL_AudioStream *stream, void *buf, int len); /** - * Get the number of converted/resampled bytes available. The stream may be - * buffering data behind the scenes until it has enough to resample - * correctly, so this number might be lower than what you expect, or even - * be zero. Add more data or flush the stream if you need the data now. + * Get the number of converted/resampled bytes available. * - * \sa SDL_NewAudioStream - * \sa SDL_AudioStreamPut - * \sa SDL_AudioStreamGet - * \sa SDL_AudioStreamFlush - * \sa SDL_AudioStreamClear - * \sa SDL_FreeAudioStream + * The stream may be buffering data behind the scenes until it has enough to + * resample correctly, so this number might be lower than what you expect, or + * even be zero. Add more data or flush the stream if you need the data now. + * + * \since This function is available since SDL 2.0.7. + * + * \sa SDL_NewAudioStream + * \sa SDL_AudioStreamPut + * \sa SDL_AudioStreamGet + * \sa SDL_AudioStreamFlush + * \sa SDL_AudioStreamClear + * \sa SDL_FreeAudioStream */ extern DECLSPEC int SDLCALL SDL_AudioStreamAvailable(SDL_AudioStream *stream); /** * Tell the stream that you're done sending data, and anything being buffered - * should be converted/resampled and made available immediately. + * should be converted/resampled and made available immediately. * - * It is legal to add more data to a stream after flushing, but there will - * be audio gaps in the output. Generally this is intended to signal the - * end of input, so the complete output becomes available. + * It is legal to add more data to a stream after flushing, but there will be + * audio gaps in the output. Generally this is intended to signal the end of + * input, so the complete output becomes available. * - * \sa SDL_NewAudioStream - * \sa SDL_AudioStreamPut - * \sa SDL_AudioStreamGet - * \sa SDL_AudioStreamAvailable - * \sa SDL_AudioStreamClear - * \sa SDL_FreeAudioStream + * \since This function is available since SDL 2.0.7. + * + * \sa SDL_NewAudioStream + * \sa SDL_AudioStreamPut + * \sa SDL_AudioStreamGet + * \sa SDL_AudioStreamAvailable + * \sa SDL_AudioStreamClear + * \sa SDL_FreeAudioStream */ extern DECLSPEC int SDLCALL SDL_AudioStreamFlush(SDL_AudioStream *stream); /** - * Clear any pending data in the stream without converting it + * Clear any pending data in the stream without converting it * - * \sa SDL_NewAudioStream - * \sa SDL_AudioStreamPut - * \sa SDL_AudioStreamGet - * \sa SDL_AudioStreamAvailable - * \sa SDL_AudioStreamFlush - * \sa SDL_FreeAudioStream + * \since This function is available since SDL 2.0.7. + * + * \sa SDL_NewAudioStream + * \sa SDL_AudioStreamPut + * \sa SDL_AudioStreamGet + * \sa SDL_AudioStreamAvailable + * \sa SDL_AudioStreamFlush + * \sa SDL_FreeAudioStream */ extern DECLSPEC void SDLCALL SDL_AudioStreamClear(SDL_AudioStream *stream); /** * Free an audio stream * - * \sa SDL_NewAudioStream - * \sa SDL_AudioStreamPut - * \sa SDL_AudioStreamGet - * \sa SDL_AudioStreamAvailable - * \sa SDL_AudioStreamFlush - * \sa SDL_AudioStreamClear + * \since This function is available since SDL 2.0.7. + * + * \sa SDL_NewAudioStream + * \sa SDL_AudioStreamPut + * \sa SDL_AudioStreamGet + * \sa SDL_AudioStreamAvailable + * \sa SDL_AudioStreamFlush + * \sa SDL_AudioStreamClear */ extern DECLSPEC void SDLCALL SDL_FreeAudioStream(SDL_AudioStream *stream); #define SDL_MIX_MAXVOLUME 128 + /** - * This takes two audio buffers of the playing audio format and mixes - * them, performing addition, volume adjustment, and overflow clipping. - * The volume ranges from 0 - 128, and should be set to ::SDL_MIX_MAXVOLUME - * for full audio volume. Note this does not change hardware volume. - * This is provided for convenience -- you can mix your own audio data. + * This function is a legacy means of mixing audio. + * + * This function is equivalent to calling... + * + * ```c + * SDL_MixAudioFormat(dst, src, format, len, volume); + * ``` + * + * ...where `format` is the obtained format of the audio device from the + * legacy SDL_OpenAudio() function. + * + * \param dst the destination for the mixed audio + * \param src the source audio buffer to be mixed + * \param len the length of the audio buffer in bytes + * \param volume ranges from 0 - 128, and should be set to SDL_MIX_MAXVOLUME + * for full audio volume + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_MixAudioFormat */ extern DECLSPEC void SDLCALL SDL_MixAudio(Uint8 * dst, const Uint8 * src, Uint32 len, int volume); /** - * This works like SDL_MixAudio(), but you specify the audio format instead of - * using the format of audio device 1. Thus it can be used when no audio - * device is open at all. + * Mix audio data in a specified format. + * + * This takes an audio buffer `src` of `len` bytes of `format` data and mixes + * it into `dst`, performing addition, volume adjustment, and overflow + * clipping. The buffer pointed to by `dst` must also be `len` bytes of + * `format` data. + * + * This is provided for convenience -- you can mix your own audio data. + * + * Do not use this function for mixing together more than two streams of + * sample data. The output from repeated application of this function may be + * distorted by clipping, because there is no accumulator with greater range + * than the input (not to mention this being an inefficient way of doing it). + * + * It is a common misconception that this function is required to write audio + * data to an output stream in an audio callback. While you can do that, + * SDL_MixAudioFormat() is really only needed when you're mixing a single + * audio stream with a volume adjustment. + * + * \param dst the destination for the mixed audio + * \param src the source audio buffer to be mixed + * \param format the SDL_AudioFormat structure representing the desired audio + * format + * \param len the length of the audio buffer in bytes + * \param volume ranges from 0 - 128, and should be set to SDL_MIX_MAXVOLUME + * for full audio volume + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC void SDLCALL SDL_MixAudioFormat(Uint8 * dst, const Uint8 * src, @@ -668,161 +1145,166 @@ extern DECLSPEC void SDLCALL SDL_MixAudioFormat(Uint8 * dst, Uint32 len, int volume); /** - * Queue more audio on non-callback devices. + * Queue more audio on non-callback devices. * - * (If you are looking to retrieve queued audio from a non-callback capture - * device, you want SDL_DequeueAudio() instead. This will return -1 to - * signify an error if you use it with capture devices.) + * If you are looking to retrieve queued audio from a non-callback capture + * device, you want SDL_DequeueAudio() instead. SDL_QueueAudio() will return + * -1 to signify an error if you use it with capture devices. * - * SDL offers two ways to feed audio to the device: you can either supply a - * callback that SDL triggers with some frequency to obtain more audio - * (pull method), or you can supply no callback, and then SDL will expect - * you to supply data at regular intervals (push method) with this function. + * SDL offers two ways to feed audio to the device: you can either supply a + * callback that SDL triggers with some frequency to obtain more audio (pull + * method), or you can supply no callback, and then SDL will expect you to + * supply data at regular intervals (push method) with this function. * - * There are no limits on the amount of data you can queue, short of - * exhaustion of address space. Queued data will drain to the device as - * necessary without further intervention from you. If the device needs - * audio but there is not enough queued, it will play silence to make up - * the difference. This means you will have skips in your audio playback - * if you aren't routinely queueing sufficient data. + * There are no limits on the amount of data you can queue, short of + * exhaustion of address space. Queued data will drain to the device as + * necessary without further intervention from you. If the device needs audio + * but there is not enough queued, it will play silence to make up the + * difference. This means you will have skips in your audio playback if you + * aren't routinely queueing sufficient data. * - * This function copies the supplied data, so you are safe to free it when - * the function returns. This function is thread-safe, but queueing to the - * same device from two threads at once does not promise which buffer will - * be queued first. + * This function copies the supplied data, so you are safe to free it when the + * function returns. This function is thread-safe, but queueing to the same + * device from two threads at once does not promise which buffer will be + * queued first. * - * You may not queue audio on a device that is using an application-supplied - * callback; doing so returns an error. You have to use the audio callback - * or queue audio with this function, but not both. + * You may not queue audio on a device that is using an application-supplied + * callback; doing so returns an error. You have to use the audio callback or + * queue audio with this function, but not both. * - * You should not call SDL_LockAudio() on the device before queueing; SDL - * handles locking internally for this function. + * You should not call SDL_LockAudio() on the device before queueing; SDL + * handles locking internally for this function. * - * \param dev The device ID to which we will queue audio. - * \param data The data to queue to the device for later playback. - * \param len The number of bytes (not samples!) to which (data) points. - * \return 0 on success, or -1 on error. + * Note that SDL2 does not support planar audio. You will need to resample + * from planar audio formats into a non-planar one (see SDL_AudioFormat) + * before queuing audio. * - * \sa SDL_GetQueuedAudioSize - * \sa SDL_ClearQueuedAudio + * \param dev the device ID to which we will queue audio + * \param data the data to queue to the device for later playback + * \param len the number of bytes (not samples!) to which `data` points + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.4. + * + * \sa SDL_ClearQueuedAudio + * \sa SDL_GetQueuedAudioSize */ extern DECLSPEC int SDLCALL SDL_QueueAudio(SDL_AudioDeviceID dev, const void *data, Uint32 len); /** - * Dequeue more audio on non-callback devices. + * Dequeue more audio on non-callback devices. * - * (If you are looking to queue audio for output on a non-callback playback - * device, you want SDL_QueueAudio() instead. This will always return 0 - * if you use it with playback devices.) + * If you are looking to queue audio for output on a non-callback playback + * device, you want SDL_QueueAudio() instead. SDL_DequeueAudio() will always + * return 0 if you use it with playback devices. * - * SDL offers two ways to retrieve audio from a capture device: you can - * either supply a callback that SDL triggers with some frequency as the - * device records more audio data, (push method), or you can supply no - * callback, and then SDL will expect you to retrieve data at regular - * intervals (pull method) with this function. + * SDL offers two ways to retrieve audio from a capture device: you can either + * supply a callback that SDL triggers with some frequency as the device + * records more audio data, (push method), or you can supply no callback, and + * then SDL will expect you to retrieve data at regular intervals (pull + * method) with this function. * - * There are no limits on the amount of data you can queue, short of - * exhaustion of address space. Data from the device will keep queuing as - * necessary without further intervention from you. This means you will - * eventually run out of memory if you aren't routinely dequeueing data. + * There are no limits on the amount of data you can queue, short of + * exhaustion of address space. Data from the device will keep queuing as + * necessary without further intervention from you. This means you will + * eventually run out of memory if you aren't routinely dequeueing data. * - * Capture devices will not queue data when paused; if you are expecting - * to not need captured audio for some length of time, use - * SDL_PauseAudioDevice() to stop the capture device from queueing more - * data. This can be useful during, say, level loading times. When - * unpaused, capture devices will start queueing data from that point, - * having flushed any capturable data available while paused. + * Capture devices will not queue data when paused; if you are expecting to + * not need captured audio for some length of time, use SDL_PauseAudioDevice() + * to stop the capture device from queueing more data. This can be useful + * during, say, level loading times. When unpaused, capture devices will start + * queueing data from that point, having flushed any capturable data available + * while paused. * - * This function is thread-safe, but dequeueing from the same device from - * two threads at once does not promise which thread will dequeued data - * first. + * This function is thread-safe, but dequeueing from the same device from two + * threads at once does not promise which thread will dequeue data first. * - * You may not dequeue audio from a device that is using an - * application-supplied callback; doing so returns an error. You have to use - * the audio callback, or dequeue audio with this function, but not both. + * You may not dequeue audio from a device that is using an + * application-supplied callback; doing so returns an error. You have to use + * the audio callback, or dequeue audio with this function, but not both. * - * You should not call SDL_LockAudio() on the device before queueing; SDL - * handles locking internally for this function. + * You should not call SDL_LockAudio() on the device before dequeueing; SDL + * handles locking internally for this function. * - * \param dev The device ID from which we will dequeue audio. - * \param data A pointer into where audio data should be copied. - * \param len The number of bytes (not samples!) to which (data) points. - * \return number of bytes dequeued, which could be less than requested. + * \param dev the device ID from which we will dequeue audio + * \param data a pointer into where audio data should be copied + * \param len the number of bytes (not samples!) to which (data) points + * \returns the number of bytes dequeued, which could be less than requested; + * call SDL_GetError() for more information. * - * \sa SDL_GetQueuedAudioSize - * \sa SDL_ClearQueuedAudio + * \since This function is available since SDL 2.0.5. + * + * \sa SDL_ClearQueuedAudio + * \sa SDL_GetQueuedAudioSize */ extern DECLSPEC Uint32 SDLCALL SDL_DequeueAudio(SDL_AudioDeviceID dev, void *data, Uint32 len); /** - * Get the number of bytes of still-queued audio. + * Get the number of bytes of still-queued audio. * - * For playback device: + * For playback devices: this is the number of bytes that have been queued for + * playback with SDL_QueueAudio(), but have not yet been sent to the hardware. * - * This is the number of bytes that have been queued for playback with - * SDL_QueueAudio(), but have not yet been sent to the hardware. This - * number may shrink at any time, so this only informs of pending data. + * Once we've sent it to the hardware, this function can not decide the exact + * byte boundary of what has been played. It's possible that we just gave the + * hardware several kilobytes right before you called this function, but it + * hasn't played any of it yet, or maybe half of it, etc. * - * Once we've sent it to the hardware, this function can not decide the - * exact byte boundary of what has been played. It's possible that we just - * gave the hardware several kilobytes right before you called this - * function, but it hasn't played any of it yet, or maybe half of it, etc. + * For capture devices, this is the number of bytes that have been captured by + * the device and are waiting for you to dequeue. This number may grow at any + * time, so this only informs of the lower-bound of available data. * - * For capture devices: + * You may not queue or dequeue audio on a device that is using an + * application-supplied callback; calling this function on such a device + * always returns 0. You have to use the audio callback or queue audio, but + * not both. * - * This is the number of bytes that have been captured by the device and - * are waiting for you to dequeue. This number may grow at any time, so - * this only informs of the lower-bound of available data. + * You should not call SDL_LockAudio() on the device before querying; SDL + * handles locking internally for this function. * - * You may not queue audio on a device that is using an application-supplied - * callback; calling this function on such a device always returns 0. - * You have to queue audio with SDL_QueueAudio()/SDL_DequeueAudio(), or use - * the audio callback, but not both. + * \param dev the device ID of which we will query queued audio size + * \returns the number of bytes (not samples!) of queued audio. * - * You should not call SDL_LockAudio() on the device before querying; SDL - * handles locking internally for this function. + * \since This function is available since SDL 2.0.4. * - * \param dev The device ID of which we will query queued audio size. - * \return Number of bytes (not samples!) of queued audio. - * - * \sa SDL_QueueAudio - * \sa SDL_ClearQueuedAudio + * \sa SDL_ClearQueuedAudio + * \sa SDL_QueueAudio + * \sa SDL_DequeueAudio */ extern DECLSPEC Uint32 SDLCALL SDL_GetQueuedAudioSize(SDL_AudioDeviceID dev); /** - * Drop any queued audio data. For playback devices, this is any queued data - * still waiting to be submitted to the hardware. For capture devices, this - * is any data that was queued by the device that hasn't yet been dequeued by - * the application. + * Drop any queued audio data waiting to be sent to the hardware. * - * Immediately after this call, SDL_GetQueuedAudioSize() will return 0. For - * playback devices, the hardware will start playing silence if more audio - * isn't queued. Unpaused capture devices will start filling the queue again - * as soon as they have more data available (which, depending on the state - * of the hardware and the thread, could be before this function call - * returns!). + * Immediately after this call, SDL_GetQueuedAudioSize() will return 0. For + * output devices, the hardware will start playing silence if more audio isn't + * queued. For capture devices, the hardware will start filling the empty + * queue with new data if the capture device isn't paused. * - * This will not prevent playback of queued audio that's already been sent - * to the hardware, as we can not undo that, so expect there to be some - * fraction of a second of audio that might still be heard. This can be - * useful if you want to, say, drop any pending music during a level change - * in your game. + * This will not prevent playback of queued audio that's already been sent to + * the hardware, as we can not undo that, so expect there to be some fraction + * of a second of audio that might still be heard. This can be useful if you + * want to, say, drop any pending music or any unprocessed microphone input + * during a level change in your game. * - * You may not queue audio on a device that is using an application-supplied - * callback; calling this function on such a device is always a no-op. - * You have to queue audio with SDL_QueueAudio()/SDL_DequeueAudio(), or use - * the audio callback, but not both. + * You may not queue or dequeue audio on a device that is using an + * application-supplied callback; calling this function on such a device + * always returns 0. You have to use the audio callback or queue audio, but + * not both. * - * You should not call SDL_LockAudio() on the device before clearing the - * queue; SDL handles locking internally for this function. + * You should not call SDL_LockAudio() on the device before clearing the + * queue; SDL handles locking internally for this function. * - * This function always succeeds and thus returns void. + * This function always succeeds and thus returns void. * - * \param dev The device ID of which to clear the audio queue. + * \param dev the device ID of which to clear the audio queue * - * \sa SDL_QueueAudio - * \sa SDL_GetQueuedAudioSize + * \since This function is available since SDL 2.0.4. + * + * \sa SDL_GetQueuedAudioSize + * \sa SDL_QueueAudio + * \sa SDL_DequeueAudio */ extern DECLSPEC void SDLCALL SDL_ClearQueuedAudio(SDL_AudioDeviceID dev); @@ -836,16 +1318,139 @@ extern DECLSPEC void SDLCALL SDL_ClearQueuedAudio(SDL_AudioDeviceID dev); * function or you will cause deadlock. */ /* @{ */ + +/** + * This function is a legacy means of locking the audio device. + * + * New programs might want to use SDL_LockAudioDevice() instead. This function + * is equivalent to calling... + * + * ```c + * SDL_LockAudioDevice(1); + * ``` + * + * ...and is only useful if you used the legacy SDL_OpenAudio() function. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LockAudioDevice + * \sa SDL_UnlockAudio + * \sa SDL_UnlockAudioDevice + */ extern DECLSPEC void SDLCALL SDL_LockAudio(void); + +/** + * Use this function to lock out the audio callback function for a specified + * device. + * + * The lock manipulated by these functions protects the audio callback + * function specified in SDL_OpenAudioDevice(). During a + * SDL_LockAudioDevice()/SDL_UnlockAudioDevice() pair, you can be guaranteed + * that the callback function for that device is not running, even if the + * device is not paused. While a device is locked, any other unpaused, + * unlocked devices may still run their callbacks. + * + * Calling this function from inside your audio callback is unnecessary. SDL + * obtains this lock before calling your function, and releases it when the + * function returns. + * + * You should not hold the lock longer than absolutely necessary. If you hold + * it too long, you'll experience dropouts in your audio playback. Ideally, + * your application locks the device, sets a few variables and unlocks again. + * Do not do heavy work while holding the lock for a device. + * + * It is safe to lock the audio device multiple times, as long as you unlock + * it an equivalent number of times. The callback will not run until the + * device has been unlocked completely in this way. If your application fails + * to unlock the device appropriately, your callback will never run, you might + * hear repeating bursts of audio, and SDL_CloseAudioDevice() will probably + * deadlock. + * + * Internally, the audio device lock is a mutex; if you lock from two threads + * at once, not only will you block the audio callback, you'll block the other + * thread. + * + * \param dev the ID of the device to be locked + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_UnlockAudioDevice + */ extern DECLSPEC void SDLCALL SDL_LockAudioDevice(SDL_AudioDeviceID dev); + +/** + * This function is a legacy means of unlocking the audio device. + * + * New programs might want to use SDL_UnlockAudioDevice() instead. This + * function is equivalent to calling... + * + * ```c + * SDL_UnlockAudioDevice(1); + * ``` + * + * ...and is only useful if you used the legacy SDL_OpenAudio() function. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LockAudio + * \sa SDL_UnlockAudioDevice + */ extern DECLSPEC void SDLCALL SDL_UnlockAudio(void); + +/** + * Use this function to unlock the audio callback function for a specified + * device. + * + * This function should be paired with a previous SDL_LockAudioDevice() call. + * + * \param dev the ID of the device to be unlocked + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LockAudioDevice + */ extern DECLSPEC void SDLCALL SDL_UnlockAudioDevice(SDL_AudioDeviceID dev); /* @} *//* Audio lock functions */ /** - * This function shuts down audio processing and closes the audio device. + * This function is a legacy means of closing the audio device. + * + * This function is equivalent to calling... + * + * ```c + * SDL_CloseAudioDevice(1); + * ``` + * + * ...and is only useful if you used the legacy SDL_OpenAudio() function. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_OpenAudio */ extern DECLSPEC void SDLCALL SDL_CloseAudio(void); + +/** + * Use this function to shut down audio processing and close the audio device. + * + * The application should close open audio devices once they are no longer + * needed. Calling this function will wait until the device's audio callback + * is not running, release the audio hardware and then clean up internal + * state. No further audio will play from this device once this function + * returns. + * + * This function may block briefly while pending audio data is played by the + * hardware, so that applications don't drop the last buffer of data they + * supplied. + * + * The device ID is invalid as soon as the device is closed, and is eligible + * for reuse in a new SDL_OpenAudioDevice() call immediately. + * + * \param dev an audio device previously opened with SDL_OpenAudioDevice() + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_OpenAudioDevice + */ extern DECLSPEC void SDLCALL SDL_CloseAudioDevice(SDL_AudioDeviceID dev); /* Ends C function definitions when using C++ */ diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_bits.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_bits.h index b116cc8d0..22cb85314 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_bits.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_bits.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -45,13 +45,12 @@ extern "C" { * with 0. This operation can also be stated as "count leading zeroes" and * "log base 2". * - * \return Index of the most significant bit, or -1 if the value is 0. + * \return the index of the most significant bit, or -1 if the value is 0. */ #if defined(__WATCOMC__) && defined(__386__) -extern _inline int _SDL_clz_watcom (Uint32); -#pragma aux _SDL_clz_watcom = \ +extern __inline int _SDL_bsr_watcom(Uint32); +#pragma aux _SDL_bsr_watcom = \ "bsr eax, eax" \ - "xor eax, 31" \ parm [eax] nomemory \ value [eax] \ modify exact [eax] nomemory; @@ -72,7 +71,13 @@ SDL_MostSignificantBitIndex32(Uint32 x) if (x == 0) { return -1; } - return 31 - _SDL_clz_watcom(x); + return _SDL_bsr_watcom(x); +#elif defined(_MSC_VER) + unsigned long index; + if (_BitScanReverse(&index, x)) { + return index; + } + return -1; #else /* Based off of Bit Twiddling Hacks by Sean Eron Anderson * , released in the public domain. diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_blendmode.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_blendmode.h index 6f0a22b99..b6d140dbb 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_blendmode.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_blendmode.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -50,6 +50,9 @@ typedef enum SDL_BLENDMODE_MOD = 0x00000004, /**< color modulate dstRGB = srcRGB * dstRGB dstA = dstA */ + SDL_BLENDMODE_MUL = 0x00000008, /**< color multiply + dstRGB = (srcRGB * dstRGB) + (dstRGB * (1-srcA)) + dstA = (srcA * dstA) + (dstA * (1-srcA)) */ SDL_BLENDMODE_INVALID = 0x7FFFFFFF /* Additional custom blend modes can be returned by SDL_ComposeCustomBlendMode() */ @@ -88,19 +91,96 @@ typedef enum } SDL_BlendFactor; /** - * \brief Create a custom blend mode, which may or may not be supported by a given renderer + * Compose a custom blend mode for renderers. * - * \param srcColorFactor source color factor - * \param dstColorFactor destination color factor - * \param colorOperation color operation - * \param srcAlphaFactor source alpha factor - * \param dstAlphaFactor destination alpha factor - * \param alphaOperation alpha operation + * The functions SDL_SetRenderDrawBlendMode and SDL_SetTextureBlendMode accept + * the SDL_BlendMode returned by this function if the renderer supports it. * - * The result of the blend mode operation will be: - * dstRGB = dstRGB * dstColorFactor colorOperation srcRGB * srcColorFactor - * and - * dstA = dstA * dstAlphaFactor alphaOperation srcA * srcAlphaFactor + * A blend mode controls how the pixels from a drawing operation (source) get + * combined with the pixels from the render target (destination). First, the + * components of the source and destination pixels get multiplied with their + * blend factors. Then, the blend operation takes the two products and + * calculates the result that will get stored in the render target. + * + * Expressed in pseudocode, it would look like this: + * + * ```c + * dstRGB = colorOperation(srcRGB * srcColorFactor, dstRGB * dstColorFactor); + * dstA = alphaOperation(srcA * srcAlphaFactor, dstA * dstAlphaFactor); + * ``` + * + * Where the functions `colorOperation(src, dst)` and `alphaOperation(src, + * dst)` can return one of the following: + * + * - `src + dst` + * - `src - dst` + * - `dst - src` + * - `min(src, dst)` + * - `max(src, dst)` + * + * The red, green, and blue components are always multiplied with the first, + * second, and third components of the SDL_BlendFactor, respectively. The + * fourth component is not used. + * + * The alpha component is always multiplied with the fourth component of the + * SDL_BlendFactor. The other components are not used in the alpha + * calculation. + * + * Support for these blend modes varies for each renderer. To check if a + * specific SDL_BlendMode is supported, create a renderer and pass it to + * either SDL_SetRenderDrawBlendMode or SDL_SetTextureBlendMode. They will + * return with an error if the blend mode is not supported. + * + * This list describes the support of custom blend modes for each renderer in + * SDL 2.0.6. All renderers support the four blend modes listed in the + * SDL_BlendMode enumeration. + * + * - **direct3d**: Supports `SDL_BLENDOPERATION_ADD` with all factors. + * - **direct3d11**: Supports all operations with all factors. However, some + * factors produce unexpected results with `SDL_BLENDOPERATION_MINIMUM` and + * `SDL_BLENDOPERATION_MAXIMUM`. + * - **opengl**: Supports the `SDL_BLENDOPERATION_ADD` operation with all + * factors. OpenGL versions 1.1, 1.2, and 1.3 do not work correctly with SDL + * 2.0.6. + * - **opengles**: Supports the `SDL_BLENDOPERATION_ADD` operation with all + * factors. Color and alpha factors need to be the same. OpenGL ES 1 + * implementation specific: May also support `SDL_BLENDOPERATION_SUBTRACT` + * and `SDL_BLENDOPERATION_REV_SUBTRACT`. May support color and alpha + * operations being different from each other. May support color and alpha + * factors being different from each other. + * - **opengles2**: Supports the `SDL_BLENDOPERATION_ADD`, + * `SDL_BLENDOPERATION_SUBTRACT`, `SDL_BLENDOPERATION_REV_SUBTRACT` + * operations with all factors. + * - **psp**: No custom blend mode support. + * - **software**: No custom blend mode support. + * + * Some renderers do not provide an alpha component for the default render + * target. The `SDL_BLENDFACTOR_DST_ALPHA` and + * `SDL_BLENDFACTOR_ONE_MINUS_DST_ALPHA` factors do not have an effect in this + * case. + * + * \param srcColorFactor the SDL_BlendFactor applied to the red, green, and + * blue components of the source pixels + * \param dstColorFactor the SDL_BlendFactor applied to the red, green, and + * blue components of the destination pixels + * \param colorOperation the SDL_BlendOperation used to combine the red, + * green, and blue components of the source and + * destination pixels + * \param srcAlphaFactor the SDL_BlendFactor applied to the alpha component of + * the source pixels + * \param dstAlphaFactor the SDL_BlendFactor applied to the alpha component of + * the destination pixels + * \param alphaOperation the SDL_BlendOperation used to combine the alpha + * component of the source and destination pixels + * \returns an SDL_BlendMode that represents the chosen factors and + * operations. + * + * \since This function is available since SDL 2.0.6. + * + * \sa SDL_SetRenderDrawBlendMode + * \sa SDL_GetRenderDrawBlendMode + * \sa SDL_SetTextureBlendMode + * \sa SDL_GetTextureBlendMode */ extern DECLSPEC SDL_BlendMode SDLCALL SDL_ComposeCustomBlendMode(SDL_BlendFactor srcColorFactor, SDL_BlendFactor dstColorFactor, diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_clipboard.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_clipboard.h index c4f8766ce..935136305 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_clipboard.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_clipboard.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -39,23 +39,46 @@ extern "C" { /* Function prototypes */ /** - * \brief Put UTF-8 text into the clipboard + * Put UTF-8 text into the clipboard. * - * \sa SDL_GetClipboardText() + * \param text the text to store in the clipboard + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetClipboardText + * \sa SDL_HasClipboardText */ extern DECLSPEC int SDLCALL SDL_SetClipboardText(const char *text); /** - * \brief Get UTF-8 text from the clipboard, which must be freed with SDL_free() + * Get UTF-8 text from the clipboard, which must be freed with SDL_free(). * - * \sa SDL_SetClipboardText() + * This functions returns empty string if there was not enough memory left for + * a copy of the clipboard's content. + * + * \returns the clipboard text on success or an empty string on failure; call + * SDL_GetError() for more information. Caller must call SDL_free() + * on the returned pointer when done with it (even if there was an + * error). + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HasClipboardText + * \sa SDL_SetClipboardText */ extern DECLSPEC char * SDLCALL SDL_GetClipboardText(void); /** - * \brief Returns a flag indicating whether the clipboard exists and contains a text string that is non-empty + * Query whether the clipboard exists and contains a non-empty text string. * - * \sa SDL_GetClipboardText() + * \returns SDL_TRUE if the clipboard has text, or SDL_FALSE if it does not. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetClipboardText + * \sa SDL_SetClipboardText */ extern DECLSPEC SDL_bool SDLCALL SDL_HasClipboardText(void); diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_config.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_config.h index 395ad7c26..c9ed1cfea 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_config.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_config.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -25,10 +25,23 @@ #include "SDL_platform.h" +/* winsdkver.h defines _WIN32_MAXVER for SDK version detection. It is present since at least the Windows 7 SDK, + * but out of caution we'll only use it if the compiler supports __has_include() to confirm its presence. + * If your compiler doesn't support __has_include() but you have winsdkver.h, define HAVE_WINSDKVER_H. */ +#if !defined(HAVE_WINSDKVER_H) && defined(__has_include) +#if __has_include() +#define HAVE_WINSDKVER_H 1 +#endif +#endif + +#ifdef HAVE_WINSDKVER_H +#include +#endif + /* This is a set of defines to configure the SDL features */ #if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H) -#if defined(__GNUC__) || defined(__DMC__) || defined(__WATCOMC__) +#if defined(__GNUC__) || defined(__DMC__) || defined(__WATCOMC__) || defined(__clang__) || defined(__BORLANDC__) || defined(__CODEGEARC__) #define HAVE_STDINT_H 1 #elif defined(_MSC_VER) typedef signed __int8 int8_t; @@ -82,9 +95,23 @@ typedef unsigned int uintptr_t; #define HAVE_DSOUND_H 1 #define HAVE_DXGI_H 1 #define HAVE_XINPUT_H 1 +#if defined(_WIN32_MAXVER) && _WIN32_MAXVER >= 0x0A00 /* Windows 10 SDK */ +#define HAVE_WINDOWS_GAMING_INPUT_H 1 +#endif +#if defined(_WIN32_MAXVER) && _WIN32_MAXVER >= 0x0602 /* Windows 8 SDK */ +#define HAVE_D3D11_H 1 +#endif #define HAVE_MMDEVICEAPI_H 1 #define HAVE_AUDIOCLIENT_H 1 -#define HAVE_ENDPOINTVOLUME_H 1 +#define HAVE_TPCSHRD_H 1 +#define HAVE_SENSORSAPI_H 1 +#if (defined(_M_IX86) || defined(_M_X64) || defined(_M_AMD64)) && (defined(_MSC_VER) && _MSC_VER >= 1600) +#define HAVE_IMMINTRIN_H 1 +#elif defined(__has_include) && (defined(__i386__) || defined(__x86_64)) +# if __has_include() +# define HAVE_IMMINTRIN_H 1 +# endif +#endif /* This is disabled by default to avoid C runtime dependencies and manifest requirements */ #ifdef HAVE_LIBC @@ -118,6 +145,7 @@ typedef unsigned int uintptr_t; #define HAVE_STRCHR 1 #define HAVE_STRRCHR 1 #define HAVE_STRSTR 1 +/* #undef HAVE_STRTOK_R */ /* These functions have security warnings, so we won't use them */ /* #undef HAVE__LTOA */ /* #undef HAVE__ULTOA */ @@ -130,6 +158,9 @@ typedef unsigned int uintptr_t; #define HAVE_STRNCMP 1 #define HAVE__STRICMP 1 #define HAVE__STRNICMP 1 +#define HAVE__WCSICMP 1 +#define HAVE__WCSNICMP 1 +#define HAVE__WCSDUP 1 #define HAVE_ACOS 1 #define HAVE_ACOSF 1 #define HAVE_ASIN 1 @@ -139,7 +170,7 @@ typedef unsigned int uintptr_t; #define HAVE_ATAN2 1 #define HAVE_ATAN2F 1 #define HAVE_CEILF 1 -#define HAVE__COPYSIGN 1 +#define HAVE__COPYSIGN 1 #define HAVE_COS 1 #define HAVE_COSF 1 #define HAVE_EXP 1 @@ -166,9 +197,16 @@ typedef unsigned int uintptr_t; /* These functions were added with the VC++ 2013 C runtime library */ #if _MSC_VER >= 1800 #define HAVE_STRTOLL 1 +#define HAVE_STRTOULL 1 #define HAVE_VSSCANF 1 +#define HAVE_LROUND 1 +#define HAVE_LROUNDF 1 +#define HAVE_ROUND 1 +#define HAVE_ROUNDF 1 #define HAVE_SCALBN 1 -#define HAVE_SCALBNF 1 +#define HAVE_SCALBNF 1 +#define HAVE_TRUNC 1 +#define HAVE_TRUNCF 1 #endif /* This function is available with at least the VC++ 2008 C runtime library */ #if _MSC_VER >= 1400 @@ -192,18 +230,26 @@ typedef unsigned int uintptr_t; /* Enable various input drivers */ #define SDL_JOYSTICK_DINPUT 1 -#define SDL_JOYSTICK_XINPUT 1 #define SDL_JOYSTICK_HIDAPI 1 +#ifndef __WINRT__ +#define SDL_JOYSTICK_RAWINPUT 1 +#endif +#define SDL_JOYSTICK_VIRTUAL 1 +#ifdef HAVE_WINDOWS_GAMING_INPUT_H +#define SDL_JOYSTICK_WGI 1 +#endif +#define SDL_JOYSTICK_XINPUT 1 #define SDL_HAPTIC_DINPUT 1 #define SDL_HAPTIC_XINPUT 1 -/* Enable the dummy sensor driver */ -#define SDL_SENSOR_DUMMY 1 +/* Enable the sensor driver */ +#define SDL_SENSOR_WINDOWS 1 /* Enable various shared object loading systems */ #define SDL_LOADSO_WINDOWS 1 /* Enable various threading systems */ +#define SDL_THREAD_GENERIC_COND_SUFFIX 1 #define SDL_THREAD_WINDOWS 1 /* Enable various timer systems */ @@ -216,8 +262,8 @@ typedef unsigned int uintptr_t; #ifndef SDL_VIDEO_RENDER_D3D #define SDL_VIDEO_RENDER_D3D 1 #endif -#ifndef SDL_VIDEO_RENDER_D3D11 -#define SDL_VIDEO_RENDER_D3D11 0 +#if !defined(SDL_VIDEO_RENDER_D3D11) && defined(HAVE_D3D11_H) +#define SDL_VIDEO_RENDER_D3D11 1 #endif /* Enable OpenGL support */ @@ -255,3 +301,5 @@ typedef unsigned int uintptr_t; #endif #endif /* SDL_config_windows_h_ */ + +/* vi: set ts=4 sw=4 expandtab: */ diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_cpuinfo.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_cpuinfo.h index 296df01aa..1fc40991d 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_cpuinfo.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_cpuinfo.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -34,11 +34,20 @@ /* Visual Studio 2005 has a bug where intrin.h conflicts with winnt.h */ #if defined(_MSC_VER) && (_MSC_VER >= 1500) && (defined(_M_IX86) || defined(_M_X64)) #ifdef __clang__ -/* Many of the intrinsics SDL uses are not implemented by clang with Visual Studio */ -#undef __MMX__ -#undef __SSE__ -#undef __SSE2__ -#else +/* As of Clang 11, '_m_prefetchw' is conflicting with the winnt.h's version, + so we define the needed '_m_prefetch' here as a pseudo-header, until the issue is fixed. */ + +#ifndef __PRFCHWINTRIN_H +#define __PRFCHWINTRIN_H + +static __inline__ void __attribute__((__always_inline__, __nodebug__)) +_m_prefetch(void *__P) +{ + __builtin_prefetch (__P, 0, 3 /* _MM_HINT_T0 */); +} + +#endif /* __PRFCHWINTRIN_H */ +#endif /* __clang__ */ #include #ifndef _WIN64 #ifndef __MMX__ @@ -54,9 +63,14 @@ #ifndef __SSE2__ #define __SSE2__ #endif -#endif /* __clang__ */ +#ifndef __SSE3__ +#define __SSE3__ +#endif #elif defined(__MINGW64_VERSION_MAJOR) #include +#if !defined(SDL_DISABLE_ARM_NEON_H) && defined(__ARM_NEON) +# include +#endif #else /* altivec.h redefining bool causes a number of problems, see bugs 3993 and 4392, so you need to explicitly define SDL_ENABLE_ALTIVEC_H to have it included. */ #if defined(HAVE_ALTIVEC_H) && defined(__ALTIVEC__) && !defined(__APPLE_ALTIVEC__) && defined(SDL_ENABLE_ALTIVEC_H) @@ -73,12 +87,14 @@ # define __ARM_NEON 1 /* Set __ARM_NEON so that it can be used elsewhere, at compile time */ # endif # if defined (_M_ARM64) -# include -# include +# include +# include # define __ARM_NEON 1 /* Set __ARM_NEON so that it can be used elsewhere, at compile time */ # endif # endif #endif +#endif /* compiler version */ + #if defined(__3dNOW__) && !defined(SDL_DISABLE_MM3DNOW_H) #include #endif @@ -98,7 +114,6 @@ #include #endif #endif /* HAVE_IMMINTRIN_H */ -#endif /* compiler version */ #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ @@ -114,151 +129,425 @@ extern "C" { #define SDL_CACHELINE_SIZE 128 /** - * This function returns the number of CPU cores available. + * Get the number of CPU cores available. + * + * \returns the total number of logical CPU cores. On CPUs that include + * technologies such as hyperthreading, the number of logical cores + * may be more than the number of physical cores. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC int SDLCALL SDL_GetCPUCount(void); /** - * This function returns the L1 cache line size of the CPU + * Determine the L1 cache line size of the CPU. * - * This is useful for determining multi-threaded structure padding - * or SIMD prefetch sizes. + * This is useful for determining multi-threaded structure padding or SIMD + * prefetch sizes. + * + * \returns the L1 cache line size of the CPU, in bytes. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC int SDLCALL SDL_GetCPUCacheLineSize(void); /** - * This function returns true if the CPU has the RDTSC instruction. + * Determine whether the CPU has the RDTSC instruction. + * + * This always returns false on CPUs that aren't using Intel instruction sets. + * + * \returns SDL_TRUE if the CPU has the RDTSC instruction or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Has3DNow + * \sa SDL_HasAltiVec + * \sa SDL_HasAVX + * \sa SDL_HasAVX2 + * \sa SDL_HasMMX + * \sa SDL_HasSSE + * \sa SDL_HasSSE2 + * \sa SDL_HasSSE3 + * \sa SDL_HasSSE41 + * \sa SDL_HasSSE42 */ extern DECLSPEC SDL_bool SDLCALL SDL_HasRDTSC(void); /** - * This function returns true if the CPU has AltiVec features. + * Determine whether the CPU has AltiVec features. + * + * This always returns false on CPUs that aren't using PowerPC instruction + * sets. + * + * \returns SDL_TRUE if the CPU has AltiVec features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Has3DNow + * \sa SDL_HasAVX + * \sa SDL_HasAVX2 + * \sa SDL_HasMMX + * \sa SDL_HasRDTSC + * \sa SDL_HasSSE + * \sa SDL_HasSSE2 + * \sa SDL_HasSSE3 + * \sa SDL_HasSSE41 + * \sa SDL_HasSSE42 */ extern DECLSPEC SDL_bool SDLCALL SDL_HasAltiVec(void); /** - * This function returns true if the CPU has MMX features. + * Determine whether the CPU has MMX features. + * + * This always returns false on CPUs that aren't using Intel instruction sets. + * + * \returns SDL_TRUE if the CPU has MMX features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Has3DNow + * \sa SDL_HasAltiVec + * \sa SDL_HasAVX + * \sa SDL_HasAVX2 + * \sa SDL_HasRDTSC + * \sa SDL_HasSSE + * \sa SDL_HasSSE2 + * \sa SDL_HasSSE3 + * \sa SDL_HasSSE41 + * \sa SDL_HasSSE42 */ extern DECLSPEC SDL_bool SDLCALL SDL_HasMMX(void); /** - * This function returns true if the CPU has 3DNow! features. + * Determine whether the CPU has 3DNow! features. + * + * This always returns false on CPUs that aren't using AMD instruction sets. + * + * \returns SDL_TRUE if the CPU has 3DNow! features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HasAltiVec + * \sa SDL_HasAVX + * \sa SDL_HasAVX2 + * \sa SDL_HasMMX + * \sa SDL_HasRDTSC + * \sa SDL_HasSSE + * \sa SDL_HasSSE2 + * \sa SDL_HasSSE3 + * \sa SDL_HasSSE41 + * \sa SDL_HasSSE42 */ extern DECLSPEC SDL_bool SDLCALL SDL_Has3DNow(void); /** - * This function returns true if the CPU has SSE features. + * Determine whether the CPU has SSE features. + * + * This always returns false on CPUs that aren't using Intel instruction sets. + * + * \returns SDL_TRUE if the CPU has SSE features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Has3DNow + * \sa SDL_HasAltiVec + * \sa SDL_HasAVX + * \sa SDL_HasAVX2 + * \sa SDL_HasMMX + * \sa SDL_HasRDTSC + * \sa SDL_HasSSE2 + * \sa SDL_HasSSE3 + * \sa SDL_HasSSE41 + * \sa SDL_HasSSE42 */ extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE(void); /** - * This function returns true if the CPU has SSE2 features. + * Determine whether the CPU has SSE2 features. + * + * This always returns false on CPUs that aren't using Intel instruction sets. + * + * \returns SDL_TRUE if the CPU has SSE2 features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Has3DNow + * \sa SDL_HasAltiVec + * \sa SDL_HasAVX + * \sa SDL_HasAVX2 + * \sa SDL_HasMMX + * \sa SDL_HasRDTSC + * \sa SDL_HasSSE + * \sa SDL_HasSSE3 + * \sa SDL_HasSSE41 + * \sa SDL_HasSSE42 */ extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE2(void); /** - * This function returns true if the CPU has SSE3 features. + * Determine whether the CPU has SSE3 features. + * + * This always returns false on CPUs that aren't using Intel instruction sets. + * + * \returns SDL_TRUE if the CPU has SSE3 features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Has3DNow + * \sa SDL_HasAltiVec + * \sa SDL_HasAVX + * \sa SDL_HasAVX2 + * \sa SDL_HasMMX + * \sa SDL_HasRDTSC + * \sa SDL_HasSSE + * \sa SDL_HasSSE2 + * \sa SDL_HasSSE41 + * \sa SDL_HasSSE42 */ extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE3(void); /** - * This function returns true if the CPU has SSE4.1 features. + * Determine whether the CPU has SSE4.1 features. + * + * This always returns false on CPUs that aren't using Intel instruction sets. + * + * \returns SDL_TRUE if the CPU has SSE4.1 features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Has3DNow + * \sa SDL_HasAltiVec + * \sa SDL_HasAVX + * \sa SDL_HasAVX2 + * \sa SDL_HasMMX + * \sa SDL_HasRDTSC + * \sa SDL_HasSSE + * \sa SDL_HasSSE2 + * \sa SDL_HasSSE3 + * \sa SDL_HasSSE42 */ extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE41(void); /** - * This function returns true if the CPU has SSE4.2 features. + * Determine whether the CPU has SSE4.2 features. + * + * This always returns false on CPUs that aren't using Intel instruction sets. + * + * \returns SDL_TRUE if the CPU has SSE4.2 features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Has3DNow + * \sa SDL_HasAltiVec + * \sa SDL_HasAVX + * \sa SDL_HasAVX2 + * \sa SDL_HasMMX + * \sa SDL_HasRDTSC + * \sa SDL_HasSSE + * \sa SDL_HasSSE2 + * \sa SDL_HasSSE3 + * \sa SDL_HasSSE41 */ extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE42(void); /** - * This function returns true if the CPU has AVX features. + * Determine whether the CPU has AVX features. + * + * This always returns false on CPUs that aren't using Intel instruction sets. + * + * \returns SDL_TRUE if the CPU has AVX features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.2. + * + * \sa SDL_Has3DNow + * \sa SDL_HasAltiVec + * \sa SDL_HasAVX2 + * \sa SDL_HasMMX + * \sa SDL_HasRDTSC + * \sa SDL_HasSSE + * \sa SDL_HasSSE2 + * \sa SDL_HasSSE3 + * \sa SDL_HasSSE41 + * \sa SDL_HasSSE42 */ extern DECLSPEC SDL_bool SDLCALL SDL_HasAVX(void); /** - * This function returns true if the CPU has AVX2 features. + * Determine whether the CPU has AVX2 features. + * + * This always returns false on CPUs that aren't using Intel instruction sets. + * + * \returns SDL_TRUE if the CPU has AVX2 features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.4. + * + * \sa SDL_Has3DNow + * \sa SDL_HasAltiVec + * \sa SDL_HasAVX + * \sa SDL_HasMMX + * \sa SDL_HasRDTSC + * \sa SDL_HasSSE + * \sa SDL_HasSSE2 + * \sa SDL_HasSSE3 + * \sa SDL_HasSSE41 + * \sa SDL_HasSSE42 */ extern DECLSPEC SDL_bool SDLCALL SDL_HasAVX2(void); /** - * This function returns true if the CPU has AVX-512F (foundation) features. + * Determine whether the CPU has AVX-512F (foundation) features. + * + * This always returns false on CPUs that aren't using Intel instruction sets. + * + * \returns SDL_TRUE if the CPU has AVX-512F features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.9. + * + * \sa SDL_HasAVX */ extern DECLSPEC SDL_bool SDLCALL SDL_HasAVX512F(void); /** - * This function returns true if the CPU has NEON (ARM SIMD) features. + * Determine whether the CPU has ARM SIMD (ARMv6) features. + * + * This is different from ARM NEON, which is a different instruction set. + * + * This always returns false on CPUs that aren't using ARM instruction sets. + * + * \returns SDL_TRUE if the CPU has ARM SIMD features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.12. + * + * \sa SDL_HasNEON + */ +extern DECLSPEC SDL_bool SDLCALL SDL_HasARMSIMD(void); + +/** + * Determine whether the CPU has NEON (ARM SIMD) features. + * + * This always returns false on CPUs that aren't using ARM instruction sets. + * + * \returns SDL_TRUE if the CPU has ARM NEON features or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.6. */ extern DECLSPEC SDL_bool SDLCALL SDL_HasNEON(void); /** - * This function returns the amount of RAM configured in the system, in MB. + * Get the amount of RAM configured in the system. + * + * \returns the amount of RAM configured in the system in MB. + * + * \since This function is available since SDL 2.0.1. */ extern DECLSPEC int SDLCALL SDL_GetSystemRAM(void); /** - * \brief Report the alignment this system needs for SIMD allocations. + * Report the alignment this system needs for SIMD allocations. * * This will return the minimum number of bytes to which a pointer must be - * aligned to be compatible with SIMD instructions on the current machine. - * For example, if the machine supports SSE only, it will return 16, but if - * it supports AVX-512F, it'll return 64 (etc). This only reports values for - * instruction sets SDL knows about, so if your SDL build doesn't have - * SDL_HasAVX512F(), then it might return 16 for the SSE support it sees and - * not 64 for the AVX-512 instructions that exist but SDL doesn't know about. - * Plan accordingly. + * aligned to be compatible with SIMD instructions on the current machine. For + * example, if the machine supports SSE only, it will return 16, but if it + * supports AVX-512F, it'll return 64 (etc). This only reports values for + * instruction sets SDL knows about, so if your SDL build doesn't have + * SDL_HasAVX512F(), then it might return 16 for the SSE support it sees and + * not 64 for the AVX-512 instructions that exist but SDL doesn't know about. + * Plan accordingly. + * + * \returns the alignment in bytes needed for available, known SIMD + * instructions. + * + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC size_t SDLCALL SDL_SIMDGetAlignment(void); /** - * \brief Allocate memory in a SIMD-friendly way. + * Allocate memory in a SIMD-friendly way. * * This will allocate a block of memory that is suitable for use with SIMD - * instructions. Specifically, it will be properly aligned and padded for - * the system's supported vector instructions. + * instructions. Specifically, it will be properly aligned and padded for the + * system's supported vector instructions. * - * The memory returned will be padded such that it is safe to read or write - * an incomplete vector at the end of the memory block. This can be useful - * so you don't have to drop back to a scalar fallback at the end of your - * SIMD processing loop to deal with the final elements without overflowing - * the allocated buffer. + * The memory returned will be padded such that it is safe to read or write an + * incomplete vector at the end of the memory block. This can be useful so you + * don't have to drop back to a scalar fallback at the end of your SIMD + * processing loop to deal with the final elements without overflowing the + * allocated buffer. * - * You must free this memory with SDL_FreeSIMD(), not free() or SDL_free() - * or delete[], etc. + * You must free this memory with SDL_FreeSIMD(), not free() or SDL_free() or + * delete[], etc. * - * Note that SDL will only deal with SIMD instruction sets it is aware of; - * for example, SDL 2.0.8 knows that SSE wants 16-byte vectors - * (SDL_HasSSE()), and AVX2 wants 32 bytes (SDL_HasAVX2()), but doesn't - * know that AVX-512 wants 64. To be clear: if you can't decide to use an - * instruction set with an SDL_Has*() function, don't use that instruction - * set with memory allocated through here. + * Note that SDL will only deal with SIMD instruction sets it is aware of; for + * example, SDL 2.0.8 knows that SSE wants 16-byte vectors (SDL_HasSSE()), and + * AVX2 wants 32 bytes (SDL_HasAVX2()), but doesn't know that AVX-512 wants + * 64. To be clear: if you can't decide to use an instruction set with an + * SDL_Has*() function, don't use that instruction set with memory allocated + * through here. * * SDL_AllocSIMD(0) will return a non-NULL pointer, assuming the system isn't - * out of memory. + * out of memory, but you are not allowed to dereference it (because you only + * own zero bytes of that buffer). * - * \param len The length, in bytes, of the block to allocated. The actual - * allocated block might be larger due to padding, etc. - * \return Pointer to newly-allocated block, NULL if out of memory. + * \param len The length, in bytes, of the block to allocate. The actual + * allocated block might be larger due to padding, etc. + * \returns a pointer to the newly-allocated block, NULL if out of memory. + * + * \since This function is available since SDL 2.0.10. * * \sa SDL_SIMDAlignment + * \sa SDL_SIMDRealloc * \sa SDL_SIMDFree */ extern DECLSPEC void * SDLCALL SDL_SIMDAlloc(const size_t len); /** - * \brief Deallocate memory obtained from SDL_SIMDAlloc + * Reallocate memory obtained from SDL_SIMDAlloc * * It is not valid to use this function on a pointer from anything but - * SDL_SIMDAlloc(). It can't be used on pointers from malloc, realloc, - * SDL_malloc, memalign, new[], etc. + * SDL_SIMDAlloc(). It can't be used on pointers from malloc, realloc, + * SDL_malloc, memalign, new[], etc. + * + * \param mem The pointer obtained from SDL_SIMDAlloc. This function also + * accepts NULL, at which point this function is the same as + * calling SDL_SIMDAlloc with a NULL pointer. + * \param len The length, in bytes, of the block to allocated. The actual + * allocated block might be larger due to padding, etc. Passing 0 + * will return a non-NULL pointer, assuming the system isn't out of + * memory. + * \returns a pointer to the newly-reallocated block, NULL if out of memory. + * + * \since This function is available since SDL 2.0.14. + * + * \sa SDL_SIMDAlignment + * \sa SDL_SIMDAlloc + * \sa SDL_SIMDFree + */ +extern DECLSPEC void * SDLCALL SDL_SIMDRealloc(void *mem, const size_t len); + +/** + * Deallocate memory obtained from SDL_SIMDAlloc + * + * It is not valid to use this function on a pointer from anything but + * SDL_SIMDAlloc() or SDL_SIMDRealloc(). It can't be used on pointers from + * malloc, realloc, SDL_malloc, memalign, new[], etc. * * However, SDL_SIMDFree(NULL) is a legal no-op. * + * The memory pointed to by `ptr` is no longer valid for access upon return, + * and may be returned to the system or reused by a future allocation. The + * pointer passed to this function is no longer safe to dereference once this + * function returns, and should be discarded. + * + * \param ptr The pointer, returned from SDL_SIMDAlloc or SDL_SIMDRealloc, to + * deallocate. NULL is a legal no-op. + * + * \since This function is available since SDL 2.0.10. + * * \sa SDL_SIMDAlloc + * \sa SDL_SIMDRealloc */ extern DECLSPEC void SDLCALL SDL_SIMDFree(void *ptr); -/* vi: set ts=4 sw=4 expandtab: */ /* Ends C function definitions when using C++ */ #ifdef __cplusplus } diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_egl.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_egl.h index f50fa5c9b..f90e27b26 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_egl.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_egl.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -24,7 +24,11 @@ * * This is a simple file to encapsulate the EGL API headers. */ -#if !defined(_MSC_VER) && !defined(__ANDROID__) +#if !defined(_MSC_VER) && !defined(__ANDROID__) && !defined(SDL_USE_BUILTIN_OPENGL_DEFINITIONS) + +#if defined(__vita__) || defined(__psp2__) +#include +#endif #include #include @@ -37,7 +41,7 @@ #define __khrplatform_h_ /* -** Copyright (c) 2008-2009 The Khronos Group Inc. +** Copyright (c) 2008-2018 The Khronos Group Inc. ** ** Permission is hereby granted, free of charge, to any person obtaining a ** copy of this software and/or associated documentation files (the @@ -60,104 +64,112 @@ */ /* Khronos platform-specific types and definitions. -* -* $Revision: 23298 $ on $Date: 2013-09-30 17:07:13 -0700 (Mon, 30 Sep 2013) $ -* -* Adopters may modify this file to suit their platform. Adopters are -* encouraged to submit platform specific modifications to the Khronos -* group so that they can be included in future versions of this file. -* Please submit changes by sending them to the public Khronos Bugzilla -* (http://khronos.org/bugzilla) by filing a bug against product -* "Khronos (general)" component "Registry". -* -* A predefined template which fills in some of the bug fields can be -* reached using http://tinyurl.com/khrplatform-h-bugreport, but you -* must create a Bugzilla login first. -* -* -* See the Implementer's Guidelines for information about where this file -* should be located on your system and for more details of its use: -* http://www.khronos.org/registry/implementers_guide.pdf -* -* This file should be included as -* #include -* by Khronos client API header files that use its types and defines. -* -* The types in khrplatform.h should only be used to define API-specific types. -* -* Types defined in khrplatform.h: -* khronos_int8_t signed 8 bit -* khronos_uint8_t unsigned 8 bit -* khronos_int16_t signed 16 bit -* khronos_uint16_t unsigned 16 bit -* khronos_int32_t signed 32 bit -* khronos_uint32_t unsigned 32 bit -* khronos_int64_t signed 64 bit -* khronos_uint64_t unsigned 64 bit -* khronos_intptr_t signed same number of bits as a pointer -* khronos_uintptr_t unsigned same number of bits as a pointer -* khronos_ssize_t signed size -* khronos_usize_t unsigned size -* khronos_float_t signed 32 bit floating point -* khronos_time_ns_t unsigned 64 bit time in nanoseconds -* khronos_utime_nanoseconds_t unsigned time interval or absolute time in -* nanoseconds -* khronos_stime_nanoseconds_t signed time interval in nanoseconds -* khronos_boolean_enum_t enumerated boolean type. This should -* only be used as a base type when a client API's boolean type is -* an enum. Client APIs which use an integer or other type for -* booleans cannot use this as the base type for their boolean. -* -* Tokens defined in khrplatform.h: -* -* KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values. -* -* KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0. -* KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0. -* -* Calling convention macros defined in this file: -* KHRONOS_APICALL -* KHRONOS_APIENTRY -* KHRONOS_APIATTRIBUTES -* -* These may be used in function prototypes as: -* -* KHRONOS_APICALL void KHRONOS_APIENTRY funcname( -* int arg1, -* int arg2) KHRONOS_APIATTRIBUTES; -*/ + * + * The master copy of khrplatform.h is maintained in the Khronos EGL + * Registry repository at https://github.com/KhronosGroup/EGL-Registry + * The last semantic modification to khrplatform.h was at commit ID: + * 67a3e0864c2d75ea5287b9f3d2eb74a745936692 + * + * Adopters may modify this file to suit their platform. Adopters are + * encouraged to submit platform specific modifications to the Khronos + * group so that they can be included in future versions of this file. + * Please submit changes by filing pull requests or issues on + * the EGL Registry repository linked above. + * + * + * See the Implementer's Guidelines for information about where this file + * should be located on your system and for more details of its use: + * http://www.khronos.org/registry/implementers_guide.pdf + * + * This file should be included as + * #include + * by Khronos client API header files that use its types and defines. + * + * The types in khrplatform.h should only be used to define API-specific types. + * + * Types defined in khrplatform.h: + * khronos_int8_t signed 8 bit + * khronos_uint8_t unsigned 8 bit + * khronos_int16_t signed 16 bit + * khronos_uint16_t unsigned 16 bit + * khronos_int32_t signed 32 bit + * khronos_uint32_t unsigned 32 bit + * khronos_int64_t signed 64 bit + * khronos_uint64_t unsigned 64 bit + * khronos_intptr_t signed same number of bits as a pointer + * khronos_uintptr_t unsigned same number of bits as a pointer + * khronos_ssize_t signed size + * khronos_usize_t unsigned size + * khronos_float_t signed 32 bit floating point + * khronos_time_ns_t unsigned 64 bit time in nanoseconds + * khronos_utime_nanoseconds_t unsigned time interval or absolute time in + * nanoseconds + * khronos_stime_nanoseconds_t signed time interval in nanoseconds + * khronos_boolean_enum_t enumerated boolean type. This should + * only be used as a base type when a client API's boolean type is + * an enum. Client APIs which use an integer or other type for + * booleans cannot use this as the base type for their boolean. + * + * Tokens defined in khrplatform.h: + * + * KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values. + * + * KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0. + * KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0. + * + * Calling convention macros defined in this file: + * KHRONOS_APICALL + * KHRONOS_APIENTRY + * KHRONOS_APIATTRIBUTES + * + * These may be used in function prototypes as: + * + * KHRONOS_APICALL void KHRONOS_APIENTRY funcname( + * int arg1, + * int arg2) KHRONOS_APIATTRIBUTES; + */ + +#if defined(__SCITECH_SNAP__) && !defined(KHRONOS_STATIC) +# define KHRONOS_STATIC 1 +#endif /*------------------------------------------------------------------------- -* Definition of KHRONOS_APICALL -*------------------------------------------------------------------------- -* This precedes the return type of the function in the function prototype. -*/ -#if defined(_WIN32) && !defined(__SCITECH_SNAP__) && !defined(SDL_VIDEO_STATIC_ANGLE) + * Definition of KHRONOS_APICALL + *------------------------------------------------------------------------- + * This precedes the return type of the function in the function prototype. + */ +#if defined(KHRONOS_STATIC) + /* If the preprocessor constant KHRONOS_STATIC is defined, make the + * header compatible with static linking. */ +# define KHRONOS_APICALL +#elif defined(_WIN32) # define KHRONOS_APICALL __declspec(dllimport) #elif defined (__SYMBIAN32__) # define KHRONOS_APICALL IMPORT_C +#elif defined(__ANDROID__) +# define KHRONOS_APICALL __attribute__((visibility("default"))) #else # define KHRONOS_APICALL #endif /*------------------------------------------------------------------------- -* Definition of KHRONOS_APIENTRY -*------------------------------------------------------------------------- -* This follows the return type of the function and precedes the function -* name in the function prototype. -*/ + * Definition of KHRONOS_APIENTRY + *------------------------------------------------------------------------- + * This follows the return type of the function and precedes the function + * name in the function prototype. + */ #if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__) -/* Win32 but not WinCE */ + /* Win32 but not WinCE */ # define KHRONOS_APIENTRY __stdcall #else # define KHRONOS_APIENTRY #endif /*------------------------------------------------------------------------- -* Definition of KHRONOS_APIATTRIBUTES -*------------------------------------------------------------------------- -* This follows the closing parenthesis of the function prototype arguments. -*/ + * Definition of KHRONOS_APIATTRIBUTES + *------------------------------------------------------------------------- + * This follows the closing parenthesis of the function prototype arguments. + */ #if defined (__ARMCC_2__) #define KHRONOS_APIATTRIBUTES __softfp #else @@ -165,14 +177,14 @@ #endif /*------------------------------------------------------------------------- -* basic type definitions -*-----------------------------------------------------------------------*/ + * basic type definitions + *-----------------------------------------------------------------------*/ #if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC__) || defined(__SCO__) || defined(__USLC__) /* -* Using -*/ + * Using + */ #include typedef int32_t khronos_int32_t; typedef uint32_t khronos_uint32_t; @@ -184,8 +196,8 @@ typedef uint64_t khronos_uint64_t; #elif defined(__VMS ) || defined(__sgi) /* -* Using -*/ + * Using + */ #include typedef int32_t khronos_int32_t; typedef uint32_t khronos_uint32_t; @@ -197,8 +209,8 @@ typedef uint64_t khronos_uint64_t; #elif defined(_WIN32) && !defined(__SCITECH_SNAP__) /* -* Win32 -*/ + * Win32 + */ typedef __int32 khronos_int32_t; typedef unsigned __int32 khronos_uint32_t; typedef __int64 khronos_int64_t; @@ -209,8 +221,8 @@ typedef unsigned __int64 khronos_uint64_t; #elif defined(__sun__) || defined(__digital__) /* -* Sun or Digital -*/ + * Sun or Digital + */ typedef int khronos_int32_t; typedef unsigned int khronos_uint32_t; #if defined(__arch64__) || defined(_LP64) @@ -226,8 +238,8 @@ typedef unsigned long long int khronos_uint64_t; #elif 0 /* -* Hypothetical platform with no float or int64 support -*/ + * Hypothetical platform with no float or int64 support + */ typedef int khronos_int32_t; typedef unsigned int khronos_uint32_t; #define KHRONOS_SUPPORT_INT64 0 @@ -236,8 +248,8 @@ typedef unsigned int khronos_uint32_t; #else /* -* Generic fallback -*/ + * Generic fallback + */ #include typedef int32_t khronos_int32_t; typedef uint32_t khronos_uint32_t; @@ -250,18 +262,18 @@ typedef uint64_t khronos_uint64_t; /* -* Types that are (so far) the same on all platforms -*/ + * Types that are (so far) the same on all platforms + */ typedef signed char khronos_int8_t; typedef unsigned char khronos_uint8_t; typedef signed short int khronos_int16_t; typedef unsigned short int khronos_uint16_t; /* -* Types that differ between LLP64 and LP64 architectures - in LLP64, -* pointers are 64 bits, but 'long' is still 32 bits. Win64 appears -* to be the only LLP64 architecture in current use. -*/ + * Types that differ between LLP64 and LP64 architectures - in LLP64, + * pointers are 64 bits, but 'long' is still 32 bits. Win64 appears + * to be the only LLP64 architecture in current use. + */ #ifdef _WIN64 typedef signed long long int khronos_intptr_t; typedef unsigned long long int khronos_uintptr_t; @@ -276,41 +288,41 @@ typedef unsigned long int khronos_usize_t; #if KHRONOS_SUPPORT_FLOAT /* -* Float type -*/ + * Float type + */ typedef float khronos_float_t; #endif #if KHRONOS_SUPPORT_INT64 /* Time types -* -* These types can be used to represent a time interval in nanoseconds or -* an absolute Unadjusted System Time. Unadjusted System Time is the number -* of nanoseconds since some arbitrary system event (e.g. since the last -* time the system booted). The Unadjusted System Time is an unsigned -* 64 bit value that wraps back to 0 every 584 years. Time intervals -* may be either signed or unsigned. -*/ + * + * These types can be used to represent a time interval in nanoseconds or + * an absolute Unadjusted System Time. Unadjusted System Time is the number + * of nanoseconds since some arbitrary system event (e.g. since the last + * time the system booted). The Unadjusted System Time is an unsigned + * 64 bit value that wraps back to 0 every 584 years. Time intervals + * may be either signed or unsigned. + */ typedef khronos_uint64_t khronos_utime_nanoseconds_t; typedef khronos_int64_t khronos_stime_nanoseconds_t; #endif /* -* Dummy value used to pad enum types to 32 bits. -*/ + * Dummy value used to pad enum types to 32 bits. + */ #ifndef KHRONOS_MAX_ENUM #define KHRONOS_MAX_ENUM 0x7FFFFFFF #endif /* -* Enumerated boolean type -* -* Values other than zero should be considered to be true. Therefore -* comparisons should not be made against KHRONOS_TRUE. -*/ + * Enumerated boolean type + * + * Values other than zero should be considered to be true. Therefore + * comparisons should not be made against KHRONOS_TRUE. + */ typedef enum { KHRONOS_FALSE = 0, - KHRONOS_TRUE = 1, + KHRONOS_TRUE = 1, KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM } khronos_boolean_enum_t; @@ -321,49 +333,30 @@ typedef enum { #define __eglplatform_h_ /* -** Copyright (c) 2007-2009 The Khronos Group Inc. -** -** Permission is hereby granted, free of charge, to any person obtaining a -** copy of this software and/or associated documentation files (the -** "Materials"), to deal in the Materials without restriction, including -** without limitation the rights to use, copy, modify, merge, publish, -** distribute, sublicense, and/or sell copies of the Materials, and to -** permit persons to whom the Materials are furnished to do so, subject to -** the following conditions: -** -** The above copyright notice and this permission notice shall be included -** in all copies or substantial portions of the Materials. -** -** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. +** Copyright 2007-2020 The Khronos Group Inc. +** SPDX-License-Identifier: Apache-2.0 */ /* Platform-specific types and definitions for egl.h -* $Revision: 12306 $ on $Date: 2010-08-25 09:51:28 -0700 (Wed, 25 Aug 2010) $ -* -* Adopters may modify khrplatform.h and this file to suit their platform. -* You are encouraged to submit all modifications to the Khronos group so that -* they can be included in future versions of this file. Please submit changes -* by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla) -* by filing a bug against product "EGL" component "Registry". -*/ + * + * Adopters may modify khrplatform.h and this file to suit their platform. + * You are encouraged to submit all modifications to the Khronos group so that + * they can be included in future versions of this file. Please submit changes + * by filing an issue or pull request on the public Khronos EGL Registry, at + * https://www.github.com/KhronosGroup/EGL-Registry/ + */ /*#include */ /* Macros used in EGL function prototype declarations. -* -* EGL functions should be prototyped as: -* -* EGLAPI return-type EGLAPIENTRY eglFunction(arguments); -* typedef return-type (EXPAPIENTRYP PFNEGLFUNCTIONPROC) (arguments); -* -* KHRONOS_APICALL and KHRONOS_APIENTRY are defined in KHR/khrplatform.h -*/ + * + * EGL functions should be prototyped as: + * + * EGLAPI return-type EGLAPIENTRY eglFunction(arguments); + * typedef return-type (EXPAPIENTRYP PFNEGLFUNCTIONPROC) (arguments); + * + * KHRONOS_APICALL and KHRONOS_APIENTRY are defined in KHR/khrplatform.h + */ #ifndef EGLAPI #define EGLAPI KHRONOS_APICALL @@ -375,39 +368,44 @@ typedef enum { #define EGLAPIENTRYP EGLAPIENTRY* /* The types NativeDisplayType, NativeWindowType, and NativePixmapType -* are aliases of window-system-dependent types, such as X Display * or -* Windows Device Context. They must be defined in platform-specific -* code below. The EGL-prefixed versions of Native*Type are the same -* types, renamed in EGL 1.3 so all types in the API start with "EGL". -* -* Khronos STRONGLY RECOMMENDS that you use the default definitions -* provided below, since these changes affect both binary and source -* portability of applications using EGL running on different EGL -* implementations. -*/ + * are aliases of window-system-dependent types, such as X Display * or + * Windows Device Context. They must be defined in platform-specific + * code below. The EGL-prefixed versions of Native*Type are the same + * types, renamed in EGL 1.3 so all types in the API start with "EGL". + * + * Khronos STRONGLY RECOMMENDS that you use the default definitions + * provided below, since these changes affect both binary and source + * portability of applications using EGL running on different EGL + * implementations. + */ -#if defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */ +#if defined(EGL_NO_PLATFORM_SPECIFIC_TYPES) + +typedef void *EGLNativeDisplayType; +typedef void *EGLNativePixmapType; +typedef void *EGLNativeWindowType; + +#elif defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */ #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN 1 #endif #include -#if __WINRT__ -#include -typedef IUnknown * EGLNativeWindowType; -typedef IUnknown * EGLNativePixmapType; -typedef IUnknown * EGLNativeDisplayType; -#else typedef HDC EGLNativeDisplayType; typedef HBITMAP EGLNativePixmapType; typedef HWND EGLNativeWindowType; -#endif + +#elif defined(__EMSCRIPTEN__) + +typedef int EGLNativeDisplayType; +typedef int EGLNativePixmapType; +typedef int EGLNativeWindowType; #elif defined(__WINSCW__) || defined(__SYMBIAN32__) /* Symbian */ typedef int EGLNativeDisplayType; -typedef void *EGLNativeWindowType; typedef void *EGLNativePixmapType; +typedef void *EGLNativeWindowType; #elif defined(WL_EGL_PLATFORM) @@ -421,31 +419,22 @@ typedef struct gbm_device *EGLNativeDisplayType; typedef struct gbm_bo *EGLNativePixmapType; typedef void *EGLNativeWindowType; -#elif defined(__ANDROID__) /* Android */ +#elif defined(__ANDROID__) || defined(ANDROID) struct ANativeWindow; struct egl_native_pixmap_t; -typedef struct ANativeWindow *EGLNativeWindowType; -typedef struct egl_native_pixmap_t *EGLNativePixmapType; -typedef void *EGLNativeDisplayType; +typedef void* EGLNativeDisplayType; +typedef struct egl_native_pixmap_t* EGLNativePixmapType; +typedef struct ANativeWindow* EGLNativeWindowType; -#elif defined(MIR_EGL_PLATFORM) +#elif defined(USE_OZONE) -#include -typedef MirEGLNativeDisplayType EGLNativeDisplayType; -typedef void *EGLNativePixmapType; -typedef MirEGLNativeWindowType EGLNativeWindowType; +typedef intptr_t EGLNativeDisplayType; +typedef intptr_t EGLNativePixmapType; +typedef intptr_t EGLNativeWindowType; -#elif defined(__unix__) - -#ifdef MESA_EGL_NO_X11_HEADERS - -typedef void *EGLNativeDisplayType; -typedef khronos_uintptr_t EGLNativePixmapType; -typedef khronos_uintptr_t EGLNativeWindowType; - -#else +#elif defined(USE_X11) /* X11 (tentative) */ #include @@ -455,7 +444,31 @@ typedef Display *EGLNativeDisplayType; typedef Pixmap EGLNativePixmapType; typedef Window EGLNativeWindowType; -#endif /* MESA_EGL_NO_X11_HEADERS */ +#elif defined(__unix__) + +typedef void *EGLNativeDisplayType; +typedef khronos_uintptr_t EGLNativePixmapType; +typedef khronos_uintptr_t EGLNativeWindowType; + +#elif defined(__APPLE__) + +typedef int EGLNativeDisplayType; +typedef void *EGLNativePixmapType; +typedef void *EGLNativeWindowType; + +#elif defined(__HAIKU__) + +#include + +typedef void *EGLNativeDisplayType; +typedef khronos_uintptr_t EGLNativePixmapType; +typedef khronos_uintptr_t EGLNativeWindowType; + +#elif defined(__Fuchsia__) + +typedef void *EGLNativeDisplayType; +typedef khronos_uintptr_t EGLNativePixmapType; +typedef khronos_uintptr_t EGLNativeWindowType; #else #error "Platform not recognized" @@ -468,16 +481,25 @@ typedef EGLNativeWindowType NativeWindowType; /* Define EGLint. This must be a signed integral type large enough to contain -* all legal attribute names and values passed into and out of EGL, whether -* their type is boolean, bitmask, enumerant (symbolic constant), integer, -* handle, or other. While in general a 32-bit integer will suffice, if -* handles are 64 bit types, then EGLint should be defined as a signed 64-bit -* integer type. -*/ + * all legal attribute names and values passed into and out of EGL, whether + * their type is boolean, bitmask, enumerant (symbolic constant), integer, + * handle, or other. While in general a 32-bit integer will suffice, if + * handles are 64 bit types, then EGLint should be defined as a signed 64-bit + * integer type. + */ typedef khronos_int32_t EGLint; + +/* C++ / C typecast macros for special EGL handle values */ +#if defined(__cplusplus) +#define EGL_CAST(type, value) (static_cast(value)) +#else +#define EGL_CAST(type, value) ((type) (value)) +#endif + #endif /* __eglplatform_h */ + #ifndef __egl_h_ #define __egl_h_ 1 @@ -486,39 +508,24 @@ extern "C" { #endif /* -** Copyright (c) 2013-2015 The Khronos Group Inc. +** Copyright 2013-2020 The Khronos Group Inc. +** SPDX-License-Identifier: Apache-2.0 ** -** Permission is hereby granted, free of charge, to any person obtaining a -** copy of this software and/or associated documentation files (the -** "Materials"), to deal in the Materials without restriction, including -** without limitation the rights to use, copy, modify, merge, publish, -** distribute, sublicense, and/or sell copies of the Materials, and to -** permit persons to whom the Materials are furnished to do so, subject to -** the following conditions: -** -** The above copyright notice and this permission notice shall be included -** in all copies or substantial portions of the Materials. -** -** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ -/* -** This header is generated from the Khronos OpenGL / OpenGL ES XML -** API Registry. The current version of the Registry, generator scripts +** This header is generated from the Khronos EGL XML API Registry. +** The current version of the Registry, generator scripts ** used to make the header, and the header can be found at -** http://www.opengl.org/registry/ +** http://www.khronos.org/registry/egl ** -** Khronos $Revision: 31566 $ on $Date: 2015-06-23 08:48:48 -0700 (Tue, 23 Jun 2015) $ +** Khronos $Git commit SHA1: b35e89ca9a $ on $Git commit date: 2021-09-01 09:34:00 +0530 $ */ /*#include */ -/* Generated on date 20150623 */ +#ifndef EGL_EGL_PROTOTYPES +#define EGL_EGL_PROTOTYPES 1 +#endif + +/* Generated on date 20210901 */ /* Generated C header for: * API: egl @@ -533,6 +540,8 @@ extern "C" { #define EGL_VERSION_1_0 1 typedef unsigned int EGLBoolean; typedef void *EGLDisplay; +/*#include */ +/*#include */ typedef void *EGLConfig; typedef void *EGLSurface; typedef void *EGLContext; @@ -556,7 +565,7 @@ typedef void (*__eglMustCastToProperFunctionPointerType)(void); #define EGL_CONFIG_ID 0x3028 #define EGL_CORE_NATIVE_ENGINE 0x305B #define EGL_DEPTH_SIZE 0x3025 -#define EGL_DONT_CARE ((EGLint)-1) +#define EGL_DONT_CARE EGL_CAST(EGLint,-1) #define EGL_DRAW 0x3059 #define EGL_EXTENSIONS 0x3055 #define EGL_FALSE 0 @@ -573,9 +582,9 @@ typedef void (*__eglMustCastToProperFunctionPointerType)(void); #define EGL_NONE 0x3038 #define EGL_NON_CONFORMANT_CONFIG 0x3051 #define EGL_NOT_INITIALIZED 0x3001 -#define EGL_NO_CONTEXT ((EGLContext)0) -#define EGL_NO_DISPLAY ((EGLDisplay)0) -#define EGL_NO_SURFACE ((EGLSurface)0) +#define EGL_NO_CONTEXT EGL_CAST(EGLContext,0) +#define EGL_NO_DISPLAY EGL_CAST(EGLDisplay,0) +#define EGL_NO_SURFACE EGL_CAST(EGLSurface,0) #define EGL_PBUFFER_BIT 0x0001 #define EGL_PIXMAP_BIT 0x0002 #define EGL_READ 0x305A @@ -596,6 +605,31 @@ typedef void (*__eglMustCastToProperFunctionPointerType)(void); #define EGL_VERSION 0x3054 #define EGL_WIDTH 0x3057 #define EGL_WINDOW_BIT 0x0004 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLCHOOSECONFIGPROC) (EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLCOPYBUFFERSPROC) (EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target); +typedef EGLContext (EGLAPIENTRYP PFNEGLCREATECONTEXTPROC) (EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list); +typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPBUFFERSURFACEPROC) (EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list); +typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPIXMAPSURFACEPROC) (EGLDisplay dpy, EGLConfig config, EGLNativePixmapType pixmap, const EGLint *attrib_list); +typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEWINDOWSURFACEPROC) (EGLDisplay dpy, EGLConfig config, EGLNativeWindowType win, const EGLint *attrib_list); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYCONTEXTPROC) (EGLDisplay dpy, EGLContext ctx); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYSURFACEPROC) (EGLDisplay dpy, EGLSurface surface); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETCONFIGATTRIBPROC) (EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint *value); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETCONFIGSPROC) (EGLDisplay dpy, EGLConfig *configs, EGLint config_size, EGLint *num_config); +typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETCURRENTDISPLAYPROC) (void); +typedef EGLSurface (EGLAPIENTRYP PFNEGLGETCURRENTSURFACEPROC) (EGLint readdraw); +typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETDISPLAYPROC) (EGLNativeDisplayType display_id); +typedef EGLint (EGLAPIENTRYP PFNEGLGETERRORPROC) (void); +typedef __eglMustCastToProperFunctionPointerType (EGLAPIENTRYP PFNEGLGETPROCADDRESSPROC) (const char *procname); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLINITIALIZEPROC) (EGLDisplay dpy, EGLint *major, EGLint *minor); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLMAKECURRENTPROC) (EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYCONTEXTPROC) (EGLDisplay dpy, EGLContext ctx, EGLint attribute, EGLint *value); +typedef const char *(EGLAPIENTRYP PFNEGLQUERYSTRINGPROC) (EGLDisplay dpy, EGLint name); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSURFACEPROC) (EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint *value); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSPROC) (EGLDisplay dpy, EGLSurface surface); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLTERMINATEPROC) (EGLDisplay dpy); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLWAITGLPROC) (void); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLWAITNATIVEPROC) (EGLint engine); +#if EGL_EGL_PROTOTYPES EGLAPI EGLBoolean EGLAPIENTRY eglChooseConfig (EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config); EGLAPI EGLBoolean EGLAPIENTRY eglCopyBuffers (EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target); EGLAPI EGLContext EGLAPIENTRY eglCreateContext (EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list); @@ -620,6 +654,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffers (EGLDisplay dpy, EGLSurface surface EGLAPI EGLBoolean EGLAPIENTRY eglTerminate (EGLDisplay dpy); EGLAPI EGLBoolean EGLAPIENTRY eglWaitGL (void); EGLAPI EGLBoolean EGLAPIENTRY eglWaitNative (EGLint engine); +#endif #endif /* EGL_VERSION_1_0 */ #ifndef EGL_VERSION_1_1 @@ -638,10 +673,16 @@ EGLAPI EGLBoolean EGLAPIENTRY eglWaitNative (EGLint engine); #define EGL_TEXTURE_RGB 0x305D #define EGL_TEXTURE_RGBA 0x305E #define EGL_TEXTURE_TARGET 0x3081 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLBINDTEXIMAGEPROC) (EGLDisplay dpy, EGLSurface surface, EGLint buffer); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLRELEASETEXIMAGEPROC) (EGLDisplay dpy, EGLSurface surface, EGLint buffer); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSURFACEATTRIBPROC) (EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPINTERVALPROC) (EGLDisplay dpy, EGLint interval); +#if EGL_EGL_PROTOTYPES EGLAPI EGLBoolean EGLAPIENTRY eglBindTexImage (EGLDisplay dpy, EGLSurface surface, EGLint buffer); EGLAPI EGLBoolean EGLAPIENTRY eglReleaseTexImage (EGLDisplay dpy, EGLSurface surface, EGLint buffer); EGLAPI EGLBoolean EGLAPIENTRY eglSurfaceAttrib (EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value); EGLAPI EGLBoolean EGLAPIENTRY eglSwapInterval (EGLDisplay dpy, EGLint interval); +#endif #endif /* EGL_VERSION_1_1 */ #ifndef EGL_VERSION_1_2 @@ -675,13 +716,20 @@ typedef void *EGLClientBuffer; #define EGL_RGB_BUFFER 0x308E #define EGL_SINGLE_BUFFER 0x3085 #define EGL_SWAP_BEHAVIOR 0x3093 -#define EGL_UNKNOWN ((EGLint)-1) +#define EGL_UNKNOWN EGL_CAST(EGLint,-1) #define EGL_VERTICAL_RESOLUTION 0x3091 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLBINDAPIPROC) (EGLenum api); +typedef EGLenum (EGLAPIENTRYP PFNEGLQUERYAPIPROC) (void); +typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPBUFFERFROMCLIENTBUFFERPROC) (EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer, EGLConfig config, const EGLint *attrib_list); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLRELEASETHREADPROC) (void); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLWAITCLIENTPROC) (void); +#if EGL_EGL_PROTOTYPES EGLAPI EGLBoolean EGLAPIENTRY eglBindAPI (EGLenum api); EGLAPI EGLenum EGLAPIENTRY eglQueryAPI (void); EGLAPI EGLSurface EGLAPIENTRY eglCreatePbufferFromClientBuffer (EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer, EGLConfig config, const EGLint *attrib_list); EGLAPI EGLBoolean EGLAPIENTRY eglReleaseThread (void); EGLAPI EGLBoolean EGLAPIENTRY eglWaitClient (void); +#endif #endif /* EGL_VERSION_1_2 */ #ifndef EGL_VERSION_1_3 @@ -702,7 +750,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglWaitClient (void); #ifndef EGL_VERSION_1_4 #define EGL_VERSION_1_4 1 -#define EGL_DEFAULT_DISPLAY ((EGLNativeDisplayType)0) +#define EGL_DEFAULT_DISPLAY EGL_CAST(EGLNativeDisplayType,0) #define EGL_MULTISAMPLE_RESOLVE_BOX_BIT 0x0200 #define EGL_MULTISAMPLE_RESOLVE 0x3099 #define EGL_MULTISAMPLE_RESOLVE_DEFAULT 0x309A @@ -710,7 +758,10 @@ EGLAPI EGLBoolean EGLAPIENTRY eglWaitClient (void); #define EGL_OPENGL_API 0x30A2 #define EGL_OPENGL_BIT 0x0008 #define EGL_SWAP_BEHAVIOR_PRESERVED_BIT 0x0400 +typedef EGLContext (EGLAPIENTRYP PFNEGLGETCURRENTCONTEXTPROC) (void); +#if EGL_EGL_PROTOTYPES EGLAPI EGLContext EGLAPIENTRY eglGetCurrentContext (void); +#endif #endif /* EGL_VERSION_1_4 */ #ifndef EGL_VERSION_1_5 @@ -744,7 +795,7 @@ typedef void *EGLImage; #define EGL_FOREVER 0xFFFFFFFFFFFFFFFFull #define EGL_TIMEOUT_EXPIRED 0x30F5 #define EGL_CONDITION_SATISFIED 0x30F6 -#define EGL_NO_SYNC ((EGLSync)0) +#define EGL_NO_SYNC EGL_CAST(EGLSync,0) #define EGL_SYNC_FENCE 0x30F9 #define EGL_GL_COLORSPACE 0x309D #define EGL_GL_COLORSPACE_SRGB 0x3089 @@ -761,7 +812,18 @@ typedef void *EGLImage; #define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x30B7 #define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x30B8 #define EGL_IMAGE_PRESERVED 0x30D2 -#define EGL_NO_IMAGE ((EGLImage)0) +#define EGL_NO_IMAGE EGL_CAST(EGLImage,0) +typedef EGLSync (EGLAPIENTRYP PFNEGLCREATESYNCPROC) (EGLDisplay dpy, EGLenum type, const EGLAttrib *attrib_list); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYSYNCPROC) (EGLDisplay dpy, EGLSync sync); +typedef EGLint (EGLAPIENTRYP PFNEGLCLIENTWAITSYNCPROC) (EGLDisplay dpy, EGLSync sync, EGLint flags, EGLTime timeout); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBPROC) (EGLDisplay dpy, EGLSync sync, EGLint attribute, EGLAttrib *value); +typedef EGLImage (EGLAPIENTRYP PFNEGLCREATEIMAGEPROC) (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLAttrib *attrib_list); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYIMAGEPROC) (EGLDisplay dpy, EGLImage image); +typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETPLATFORMDISPLAYPROC) (EGLenum platform, void *native_display, const EGLAttrib *attrib_list); +typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPLATFORMWINDOWSURFACEPROC) (EGLDisplay dpy, EGLConfig config, void *native_window, const EGLAttrib *attrib_list); +typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPLATFORMPIXMAPSURFACEPROC) (EGLDisplay dpy, EGLConfig config, void *native_pixmap, const EGLAttrib *attrib_list); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLWAITSYNCPROC) (EGLDisplay dpy, EGLSync sync, EGLint flags); +#if EGL_EGL_PROTOTYPES EGLAPI EGLSync EGLAPIENTRY eglCreateSync (EGLDisplay dpy, EGLenum type, const EGLAttrib *attrib_list); EGLAPI EGLBoolean EGLAPIENTRY eglDestroySync (EGLDisplay dpy, EGLSync sync); EGLAPI EGLint EGLAPIENTRY eglClientWaitSync (EGLDisplay dpy, EGLSync sync, EGLint flags, EGLTime timeout); @@ -772,6 +834,7 @@ EGLAPI EGLDisplay EGLAPIENTRY eglGetPlatformDisplay (EGLenum platform, void *nat EGLAPI EGLSurface EGLAPIENTRY eglCreatePlatformWindowSurface (EGLDisplay dpy, EGLConfig config, void *native_window, const EGLAttrib *attrib_list); EGLAPI EGLSurface EGLAPIENTRY eglCreatePlatformPixmapSurface (EGLDisplay dpy, EGLConfig config, void *native_pixmap, const EGLAttrib *attrib_list); EGLAPI EGLBoolean EGLAPIENTRY eglWaitSync (EGLDisplay dpy, EGLSync sync, EGLint flags); +#endif #endif /* EGL_VERSION_1_5 */ #ifdef __cplusplus @@ -781,7 +844,6 @@ EGLAPI EGLBoolean EGLAPIENTRY eglWaitSync (EGLDisplay dpy, EGLSync sync, EGLint #endif /* __egl_h_ */ - #ifndef __eglext_h_ #define __eglext_h_ 1 @@ -790,39 +852,20 @@ extern "C" { #endif /* -** Copyright (c) 2013-2015 The Khronos Group Inc. +** Copyright 2013-2020 The Khronos Group Inc. +** SPDX-License-Identifier: Apache-2.0 ** -** Permission is hereby granted, free of charge, to any person obtaining a -** copy of this software and/or associated documentation files (the -** "Materials"), to deal in the Materials without restriction, including -** without limitation the rights to use, copy, modify, merge, publish, -** distribute, sublicense, and/or sell copies of the Materials, and to -** permit persons to whom the Materials are furnished to do so, subject to -** the following conditions: -** -** The above copyright notice and this permission notice shall be included -** in all copies or substantial portions of the Materials. -** -** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ -/* -** This header is generated from the Khronos OpenGL / OpenGL ES XML -** API Registry. The current version of the Registry, generator scripts +** This header is generated from the Khronos EGL XML API Registry. +** The current version of the Registry, generator scripts ** used to make the header, and the header can be found at -** http://www.opengl.org/registry/ +** http://www.khronos.org/registry/egl ** -** Khronos $Revision: 31566 $ on $Date: 2015-06-23 08:48:48 -0700 (Tue, 23 Jun 2015) $ +** Khronos $Git commit SHA1: b35e89ca9a $ on $Git commit date: 2021-09-01 09:34:00 +0530 $ */ /*#include */ -#define EGL_EGLEXT_VERSION 20150623 +#define EGL_EGLEXT_VERSION 20210901 /* Generated C header for: * API: egl @@ -861,6 +904,13 @@ EGLAPI EGLSyncKHR EGLAPIENTRY eglCreateSync64KHR (EGLDisplay dpy, EGLenum type, #define EGL_VG_ALPHA_FORMAT_PRE_BIT_KHR 0x0040 #endif /* EGL_KHR_config_attribs */ +#ifndef EGL_KHR_context_flush_control +#define EGL_KHR_context_flush_control 1 +#define EGL_CONTEXT_RELEASE_BEHAVIOR_NONE_KHR 0 +#define EGL_CONTEXT_RELEASE_BEHAVIOR_KHR 0x2097 +#define EGL_CONTEXT_RELEASE_BEHAVIOR_FLUSH_KHR 0x2098 +#endif /* EGL_KHR_context_flush_control */ + #ifndef EGL_KHR_create_context #define EGL_KHR_create_context 1 #define EGL_CONTEXT_MAJOR_VERSION_KHR 0x3098 @@ -883,6 +933,42 @@ EGLAPI EGLSyncKHR EGLAPIENTRY eglCreateSync64KHR (EGLDisplay dpy, EGLenum type, #define EGL_CONTEXT_OPENGL_NO_ERROR_KHR 0x31B3 #endif /* EGL_KHR_create_context_no_error */ +#ifndef EGL_KHR_debug +#define EGL_KHR_debug 1 +typedef void *EGLLabelKHR; +typedef void *EGLObjectKHR; +typedef void (EGLAPIENTRY *EGLDEBUGPROCKHR)(EGLenum error,const char *command,EGLint messageType,EGLLabelKHR threadLabel,EGLLabelKHR objectLabel,const char* message); +#define EGL_OBJECT_THREAD_KHR 0x33B0 +#define EGL_OBJECT_DISPLAY_KHR 0x33B1 +#define EGL_OBJECT_CONTEXT_KHR 0x33B2 +#define EGL_OBJECT_SURFACE_KHR 0x33B3 +#define EGL_OBJECT_IMAGE_KHR 0x33B4 +#define EGL_OBJECT_SYNC_KHR 0x33B5 +#define EGL_OBJECT_STREAM_KHR 0x33B6 +#define EGL_DEBUG_MSG_CRITICAL_KHR 0x33B9 +#define EGL_DEBUG_MSG_ERROR_KHR 0x33BA +#define EGL_DEBUG_MSG_WARN_KHR 0x33BB +#define EGL_DEBUG_MSG_INFO_KHR 0x33BC +#define EGL_DEBUG_CALLBACK_KHR 0x33B8 +typedef EGLint (EGLAPIENTRYP PFNEGLDEBUGMESSAGECONTROLKHRPROC) (EGLDEBUGPROCKHR callback, const EGLAttrib *attrib_list); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYDEBUGKHRPROC) (EGLint attribute, EGLAttrib *value); +typedef EGLint (EGLAPIENTRYP PFNEGLLABELOBJECTKHRPROC) (EGLDisplay display, EGLenum objectType, EGLObjectKHR object, EGLLabelKHR label); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLint EGLAPIENTRY eglDebugMessageControlKHR (EGLDEBUGPROCKHR callback, const EGLAttrib *attrib_list); +EGLAPI EGLBoolean EGLAPIENTRY eglQueryDebugKHR (EGLint attribute, EGLAttrib *value); +EGLAPI EGLint EGLAPIENTRY eglLabelObjectKHR (EGLDisplay display, EGLenum objectType, EGLObjectKHR object, EGLLabelKHR label); +#endif +#endif /* EGL_KHR_debug */ + +#ifndef EGL_KHR_display_reference +#define EGL_KHR_display_reference 1 +#define EGL_TRACK_REFERENCES_KHR 0x3352 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYDISPLAYATTRIBKHRPROC) (EGLDisplay dpy, EGLint name, EGLAttrib *value); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglQueryDisplayAttribKHR (EGLDisplay dpy, EGLint name, EGLAttrib *value); +#endif +#endif /* EGL_KHR_display_reference */ + #ifndef EGL_KHR_fence_sync #define EGL_KHR_fence_sync 1 typedef khronos_utime_nanoseconds_t EGLTimeKHR; @@ -945,7 +1031,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglGetSyncAttribKHR (EGLDisplay dpy, EGLSyncKHR sy #define EGL_KHR_image 1 typedef void *EGLImageKHR; #define EGL_NATIVE_PIXMAP_KHR 0x30B0 -#define EGL_NO_IMAGE_KHR ((EGLImageKHR)0) +#define EGL_NO_IMAGE_KHR EGL_CAST(EGLImageKHR,0) typedef EGLImageKHR (EGLAPIENTRYP PFNEGLCREATEIMAGEKHRPROC) (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list); typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYIMAGEKHRPROC) (EGLDisplay dpy, EGLImageKHR image); #ifdef EGL_EGLEXT_PROTOTYPES @@ -1007,6 +1093,16 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQuerySurface64KHR (EGLDisplay dpy, EGLSurface s #endif #endif /* EGL_KHR_lock_surface3 */ +#ifndef EGL_KHR_mutable_render_buffer +#define EGL_KHR_mutable_render_buffer 1 +#define EGL_MUTABLE_RENDER_BUFFER_BIT_KHR 0x1000 +#endif /* EGL_KHR_mutable_render_buffer */ + +#ifndef EGL_KHR_no_config_context +#define EGL_KHR_no_config_context 1 +#define EGL_NO_CONFIG_KHR EGL_CAST(EGLConfig,0) +#endif /* EGL_KHR_no_config_context */ + #ifndef EGL_KHR_partial_update #define EGL_KHR_partial_update 1 #define EGL_BUFFER_AGE_KHR 0x313D @@ -1049,7 +1145,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSetDamageRegionKHR (EGLDisplay dpy, EGLSurface #define EGL_SYNC_REUSABLE_KHR 0x30FA #define EGL_SYNC_FLUSH_COMMANDS_BIT_KHR 0x0001 #define EGL_FOREVER_KHR 0xFFFFFFFFFFFFFFFFull -#define EGL_NO_SYNC_KHR ((EGLSyncKHR)0) +#define EGL_NO_SYNC_KHR EGL_CAST(EGLSyncKHR,0) typedef EGLBoolean (EGLAPIENTRYP PFNEGLSIGNALSYNCKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLenum mode); #ifdef EGL_EGLEXT_PROTOTYPES EGLAPI EGLBoolean EGLAPIENTRY eglSignalSyncKHR (EGLDisplay dpy, EGLSyncKHR sync, EGLenum mode); @@ -1062,7 +1158,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSignalSyncKHR (EGLDisplay dpy, EGLSyncKHR sync, typedef void *EGLStreamKHR; typedef khronos_uint64_t EGLuint64KHR; #ifdef KHRONOS_SUPPORT_INT64 -#define EGL_NO_STREAM_KHR ((EGLStreamKHR)0) +#define EGL_NO_STREAM_KHR EGL_CAST(EGLStreamKHR,0) #define EGL_CONSUMER_LATENCY_USEC_KHR 0x3210 #define EGL_PRODUCER_FRAME_KHR 0x3212 #define EGL_CONSUMER_FRAME_KHR 0x3213 @@ -1090,6 +1186,24 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQueryStreamu64KHR (EGLDisplay dpy, EGLStreamKHR #endif /* KHRONOS_SUPPORT_INT64 */ #endif /* EGL_KHR_stream */ +#ifndef EGL_KHR_stream_attrib +#define EGL_KHR_stream_attrib 1 +#ifdef KHRONOS_SUPPORT_INT64 +typedef EGLStreamKHR (EGLAPIENTRYP PFNEGLCREATESTREAMATTRIBKHRPROC) (EGLDisplay dpy, const EGLAttrib *attrib_list); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSETSTREAMATTRIBKHRPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLAttrib value); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSTREAMATTRIBKHRPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLAttrib *value); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMCONSUMERACQUIREATTRIBKHRPROC) (EGLDisplay dpy, EGLStreamKHR stream, const EGLAttrib *attrib_list); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMCONSUMERRELEASEATTRIBKHRPROC) (EGLDisplay dpy, EGLStreamKHR stream, const EGLAttrib *attrib_list); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLStreamKHR EGLAPIENTRY eglCreateStreamAttribKHR (EGLDisplay dpy, const EGLAttrib *attrib_list); +EGLAPI EGLBoolean EGLAPIENTRY eglSetStreamAttribKHR (EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLAttrib value); +EGLAPI EGLBoolean EGLAPIENTRY eglQueryStreamAttribKHR (EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLAttrib *value); +EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerAcquireAttribKHR (EGLDisplay dpy, EGLStreamKHR stream, const EGLAttrib *attrib_list); +EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerReleaseAttribKHR (EGLDisplay dpy, EGLStreamKHR stream, const EGLAttrib *attrib_list); +#endif +#endif /* KHRONOS_SUPPORT_INT64 */ +#endif /* EGL_KHR_stream_attrib */ + #ifndef EGL_KHR_stream_consumer_gltexture #define EGL_KHR_stream_consumer_gltexture 1 #ifdef EGL_KHR_stream @@ -1109,7 +1223,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerReleaseKHR (EGLDisplay dpy, EGLSt #define EGL_KHR_stream_cross_process_fd 1 typedef int EGLNativeFileDescriptorKHR; #ifdef EGL_KHR_stream -#define EGL_NO_FILE_DESCRIPTOR_KHR ((EGLNativeFileDescriptorKHR)(-1)) +#define EGL_NO_FILE_DESCRIPTOR_KHR EGL_CAST(EGLNativeFileDescriptorKHR,-1) typedef EGLNativeFileDescriptorKHR (EGLAPIENTRYP PFNEGLGETSTREAMFILEDESCRIPTORKHRPROC) (EGLDisplay dpy, EGLStreamKHR stream); typedef EGLStreamKHR (EGLAPIENTRYP PFNEGLCREATESTREAMFROMFILEDESCRIPTORKHRPROC) (EGLDisplay dpy, EGLNativeFileDescriptorKHR file_descriptor); #ifdef EGL_EGLEXT_PROTOTYPES @@ -1156,9 +1270,9 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreateStreamProducerSurfaceKHR (EGLDisplay dpy, #ifndef EGL_KHR_swap_buffers_with_damage #define EGL_KHR_swap_buffers_with_damage 1 -typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSWITHDAMAGEKHRPROC) (EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSWITHDAMAGEKHRPROC) (EGLDisplay dpy, EGLSurface surface, const EGLint *rects, EGLint n_rects); #ifdef EGL_EGLEXT_PROTOTYPES -EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffersWithDamageKHR (EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects); +EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffersWithDamageKHR (EGLDisplay dpy, EGLSurface surface, const EGLint *rects, EGLint n_rects); #endif #endif /* EGL_KHR_swap_buffers_with_damage */ @@ -1175,6 +1289,10 @@ EGLAPI EGLint EGLAPIENTRY eglWaitSyncKHR (EGLDisplay dpy, EGLSyncKHR sync, EGLin #endif #endif /* EGL_KHR_wait_sync */ +#ifndef EGL_ANDROID_GLES_layers +#define EGL_ANDROID_GLES_layers 1 +#endif /* EGL_ANDROID_GLES_layers */ + #ifndef EGL_ANDROID_blob_cache #define EGL_ANDROID_blob_cache 1 typedef khronos_ssize_t EGLsizeiANDROID; @@ -1186,11 +1304,69 @@ EGLAPI void EGLAPIENTRY eglSetBlobCacheFuncsANDROID (EGLDisplay dpy, EGLSetBlobF #endif #endif /* EGL_ANDROID_blob_cache */ +#ifndef EGL_ANDROID_create_native_client_buffer +#define EGL_ANDROID_create_native_client_buffer 1 +#define EGL_NATIVE_BUFFER_USAGE_ANDROID 0x3143 +#define EGL_NATIVE_BUFFER_USAGE_PROTECTED_BIT_ANDROID 0x00000001 +#define EGL_NATIVE_BUFFER_USAGE_RENDERBUFFER_BIT_ANDROID 0x00000002 +#define EGL_NATIVE_BUFFER_USAGE_TEXTURE_BIT_ANDROID 0x00000004 +typedef EGLClientBuffer (EGLAPIENTRYP PFNEGLCREATENATIVECLIENTBUFFERANDROIDPROC) (const EGLint *attrib_list); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLClientBuffer EGLAPIENTRY eglCreateNativeClientBufferANDROID (const EGLint *attrib_list); +#endif +#endif /* EGL_ANDROID_create_native_client_buffer */ + #ifndef EGL_ANDROID_framebuffer_target #define EGL_ANDROID_framebuffer_target 1 #define EGL_FRAMEBUFFER_TARGET_ANDROID 0x3147 #endif /* EGL_ANDROID_framebuffer_target */ +#ifndef EGL_ANDROID_front_buffer_auto_refresh +#define EGL_ANDROID_front_buffer_auto_refresh 1 +#define EGL_FRONT_BUFFER_AUTO_REFRESH_ANDROID 0x314C +#endif /* EGL_ANDROID_front_buffer_auto_refresh */ + +#ifndef EGL_ANDROID_get_frame_timestamps +#define EGL_ANDROID_get_frame_timestamps 1 +typedef khronos_stime_nanoseconds_t EGLnsecsANDROID; +#define EGL_TIMESTAMP_PENDING_ANDROID EGL_CAST(EGLnsecsANDROID,-2) +#define EGL_TIMESTAMP_INVALID_ANDROID EGL_CAST(EGLnsecsANDROID,-1) +#define EGL_TIMESTAMPS_ANDROID 0x3430 +#define EGL_COMPOSITE_DEADLINE_ANDROID 0x3431 +#define EGL_COMPOSITE_INTERVAL_ANDROID 0x3432 +#define EGL_COMPOSITE_TO_PRESENT_LATENCY_ANDROID 0x3433 +#define EGL_REQUESTED_PRESENT_TIME_ANDROID 0x3434 +#define EGL_RENDERING_COMPLETE_TIME_ANDROID 0x3435 +#define EGL_COMPOSITION_LATCH_TIME_ANDROID 0x3436 +#define EGL_FIRST_COMPOSITION_START_TIME_ANDROID 0x3437 +#define EGL_LAST_COMPOSITION_START_TIME_ANDROID 0x3438 +#define EGL_FIRST_COMPOSITION_GPU_FINISHED_TIME_ANDROID 0x3439 +#define EGL_DISPLAY_PRESENT_TIME_ANDROID 0x343A +#define EGL_DEQUEUE_READY_TIME_ANDROID 0x343B +#define EGL_READS_DONE_TIME_ANDROID 0x343C +typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETCOMPOSITORTIMINGSUPPORTEDANDROIDPROC) (EGLDisplay dpy, EGLSurface surface, EGLint name); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETCOMPOSITORTIMINGANDROIDPROC) (EGLDisplay dpy, EGLSurface surface, EGLint numTimestamps, const EGLint *names, EGLnsecsANDROID *values); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETNEXTFRAMEIDANDROIDPROC) (EGLDisplay dpy, EGLSurface surface, EGLuint64KHR *frameId); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETFRAMETIMESTAMPSUPPORTEDANDROIDPROC) (EGLDisplay dpy, EGLSurface surface, EGLint timestamp); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETFRAMETIMESTAMPSANDROIDPROC) (EGLDisplay dpy, EGLSurface surface, EGLuint64KHR frameId, EGLint numTimestamps, const EGLint *timestamps, EGLnsecsANDROID *values); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglGetCompositorTimingSupportedANDROID (EGLDisplay dpy, EGLSurface surface, EGLint name); +EGLAPI EGLBoolean EGLAPIENTRY eglGetCompositorTimingANDROID (EGLDisplay dpy, EGLSurface surface, EGLint numTimestamps, const EGLint *names, EGLnsecsANDROID *values); +EGLAPI EGLBoolean EGLAPIENTRY eglGetNextFrameIdANDROID (EGLDisplay dpy, EGLSurface surface, EGLuint64KHR *frameId); +EGLAPI EGLBoolean EGLAPIENTRY eglGetFrameTimestampSupportedANDROID (EGLDisplay dpy, EGLSurface surface, EGLint timestamp); +EGLAPI EGLBoolean EGLAPIENTRY eglGetFrameTimestampsANDROID (EGLDisplay dpy, EGLSurface surface, EGLuint64KHR frameId, EGLint numTimestamps, const EGLint *timestamps, EGLnsecsANDROID *values); +#endif +#endif /* EGL_ANDROID_get_frame_timestamps */ + +#ifndef EGL_ANDROID_get_native_client_buffer +#define EGL_ANDROID_get_native_client_buffer 1 +struct AHardwareBuffer; +typedef EGLClientBuffer (EGLAPIENTRYP PFNEGLGETNATIVECLIENTBUFFERANDROIDPROC) (const struct AHardwareBuffer *buffer); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLClientBuffer EGLAPIENTRY eglGetNativeClientBufferANDROID (const struct AHardwareBuffer *buffer); +#endif +#endif /* EGL_ANDROID_get_native_client_buffer */ + #ifndef EGL_ANDROID_image_native_buffer #define EGL_ANDROID_image_native_buffer 1 #define EGL_NATIVE_BUFFER_ANDROID 0x3140 @@ -1208,6 +1384,14 @@ EGLAPI EGLint EGLAPIENTRY eglDupNativeFenceFDANDROID (EGLDisplay dpy, EGLSyncKHR #endif #endif /* EGL_ANDROID_native_fence_sync */ +#ifndef EGL_ANDROID_presentation_time +#define EGL_ANDROID_presentation_time 1 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLPRESENTATIONTIMEANDROIDPROC) (EGLDisplay dpy, EGLSurface surface, EGLnsecsANDROID time); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglPresentationTimeANDROID (EGLDisplay dpy, EGLSurface surface, EGLnsecsANDROID time); +#endif +#endif /* EGL_ANDROID_presentation_time */ + #ifndef EGL_ANDROID_recordable #define EGL_ANDROID_recordable 1 #define EGL_RECORDABLE_ANDROID 0x3142 @@ -1236,16 +1420,40 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQuerySurfacePointerANGLE (EGLDisplay dpy, EGLSu #define EGL_ANGLE_surface_d3d_texture_2d_share_handle 1 #endif /* EGL_ANGLE_surface_d3d_texture_2d_share_handle */ +#ifndef EGL_ANGLE_sync_control_rate +#define EGL_ANGLE_sync_control_rate 1 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETMSCRATEANGLEPROC) (EGLDisplay dpy, EGLSurface surface, EGLint *numerator, EGLint *denominator); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglGetMscRateANGLE (EGLDisplay dpy, EGLSurface surface, EGLint *numerator, EGLint *denominator); +#endif +#endif /* EGL_ANGLE_sync_control_rate */ + #ifndef EGL_ANGLE_window_fixed_size #define EGL_ANGLE_window_fixed_size 1 #define EGL_FIXED_SIZE_ANGLE 0x3201 #endif /* EGL_ANGLE_window_fixed_size */ +#ifndef EGL_ARM_image_format +#define EGL_ARM_image_format 1 +#define EGL_COLOR_COMPONENT_TYPE_UNSIGNED_INTEGER_ARM 0x3287 +#define EGL_COLOR_COMPONENT_TYPE_INTEGER_ARM 0x3288 +#endif /* EGL_ARM_image_format */ + +#ifndef EGL_ARM_implicit_external_sync +#define EGL_ARM_implicit_external_sync 1 +#define EGL_SYNC_PRIOR_COMMANDS_IMPLICIT_EXTERNAL_ARM 0x328A +#endif /* EGL_ARM_implicit_external_sync */ + #ifndef EGL_ARM_pixmap_multisample_discard #define EGL_ARM_pixmap_multisample_discard 1 #define EGL_DISCARD_SAMPLES_ARM 0x3286 #endif /* EGL_ARM_pixmap_multisample_discard */ +#ifndef EGL_EXT_bind_to_front +#define EGL_EXT_bind_to_front 1 +#define EGL_FRONT_BUFFER_EXT 0x3464 +#endif /* EGL_EXT_bind_to_front */ + #ifndef EGL_EXT_buffer_age #define EGL_EXT_buffer_age 1 #define EGL_BUFFER_AGE_EXT 0x313D @@ -1255,6 +1463,45 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQuerySurfacePointerANGLE (EGLDisplay dpy, EGLSu #define EGL_EXT_client_extensions 1 #endif /* EGL_EXT_client_extensions */ +#ifndef EGL_EXT_client_sync +#define EGL_EXT_client_sync 1 +#define EGL_SYNC_CLIENT_EXT 0x3364 +#define EGL_SYNC_CLIENT_SIGNAL_EXT 0x3365 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLCLIENTSIGNALSYNCEXTPROC) (EGLDisplay dpy, EGLSync sync, const EGLAttrib *attrib_list); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglClientSignalSyncEXT (EGLDisplay dpy, EGLSync sync, const EGLAttrib *attrib_list); +#endif +#endif /* EGL_EXT_client_sync */ + +#ifndef EGL_EXT_compositor +#define EGL_EXT_compositor 1 +#define EGL_PRIMARY_COMPOSITOR_CONTEXT_EXT 0x3460 +#define EGL_EXTERNAL_REF_ID_EXT 0x3461 +#define EGL_COMPOSITOR_DROP_NEWEST_FRAME_EXT 0x3462 +#define EGL_COMPOSITOR_KEEP_NEWEST_FRAME_EXT 0x3463 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLCOMPOSITORSETCONTEXTLISTEXTPROC) (const EGLint *external_ref_ids, EGLint num_entries); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLCOMPOSITORSETCONTEXTATTRIBUTESEXTPROC) (EGLint external_ref_id, const EGLint *context_attributes, EGLint num_entries); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLCOMPOSITORSETWINDOWLISTEXTPROC) (EGLint external_ref_id, const EGLint *external_win_ids, EGLint num_entries); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLCOMPOSITORSETWINDOWATTRIBUTESEXTPROC) (EGLint external_win_id, const EGLint *window_attributes, EGLint num_entries); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLCOMPOSITORBINDTEXWINDOWEXTPROC) (EGLint external_win_id); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLCOMPOSITORSETSIZEEXTPROC) (EGLint external_win_id, EGLint width, EGLint height); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLCOMPOSITORSWAPPOLICYEXTPROC) (EGLint external_win_id, EGLint policy); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglCompositorSetContextListEXT (const EGLint *external_ref_ids, EGLint num_entries); +EGLAPI EGLBoolean EGLAPIENTRY eglCompositorSetContextAttributesEXT (EGLint external_ref_id, const EGLint *context_attributes, EGLint num_entries); +EGLAPI EGLBoolean EGLAPIENTRY eglCompositorSetWindowListEXT (EGLint external_ref_id, const EGLint *external_win_ids, EGLint num_entries); +EGLAPI EGLBoolean EGLAPIENTRY eglCompositorSetWindowAttributesEXT (EGLint external_win_id, const EGLint *window_attributes, EGLint num_entries); +EGLAPI EGLBoolean EGLAPIENTRY eglCompositorBindTexWindowEXT (EGLint external_win_id); +EGLAPI EGLBoolean EGLAPIENTRY eglCompositorSetSizeEXT (EGLint external_win_id, EGLint width, EGLint height); +EGLAPI EGLBoolean EGLAPIENTRY eglCompositorSwapPolicyEXT (EGLint external_win_id, EGLint policy); +#endif +#endif /* EGL_EXT_compositor */ + +#ifndef EGL_EXT_config_select_group +#define EGL_EXT_config_select_group 1 +#define EGL_CONFIG_SELECT_GROUP_EXT 0x34C0 +#endif /* EGL_EXT_config_select_group */ + #ifndef EGL_EXT_create_context_robustness #define EGL_EXT_create_context_robustness 1 #define EGL_CONTEXT_OPENGL_ROBUST_ACCESS_EXT 0x30BF @@ -1266,7 +1513,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQuerySurfacePointerANGLE (EGLDisplay dpy, EGLSu #ifndef EGL_EXT_device_base #define EGL_EXT_device_base 1 typedef void *EGLDeviceEXT; -#define EGL_NO_DEVICE_EXT ((EGLDeviceEXT)(0)) +#define EGL_NO_DEVICE_EXT EGL_CAST(EGLDeviceEXT,0) #define EGL_BAD_DEVICE_EXT 0x322B #define EGL_DEVICE_EXT 0x322C typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYDEVICEATTRIBEXTPROC) (EGLDeviceEXT device, EGLint attribute, EGLAttrib *value); @@ -1284,8 +1531,14 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQueryDisplayAttribEXT (EGLDisplay dpy, EGLint a #ifndef EGL_EXT_device_drm #define EGL_EXT_device_drm 1 #define EGL_DRM_DEVICE_FILE_EXT 0x3233 +#define EGL_DRM_MASTER_FD_EXT 0x333C #endif /* EGL_EXT_device_drm */ +#ifndef EGL_EXT_device_drm_render_node +#define EGL_EXT_device_drm_render_node 1 +#define EGL_DRM_RENDER_NODE_FILE_EXT 0x3377 +#endif /* EGL_EXT_device_drm_render_node */ + #ifndef EGL_EXT_device_enumeration #define EGL_EXT_device_enumeration 1 #endif /* EGL_EXT_device_enumeration */ @@ -1293,12 +1546,64 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQueryDisplayAttribEXT (EGLDisplay dpy, EGLint a #ifndef EGL_EXT_device_openwf #define EGL_EXT_device_openwf 1 #define EGL_OPENWF_DEVICE_ID_EXT 0x3237 +#define EGL_OPENWF_DEVICE_EXT 0x333D #endif /* EGL_EXT_device_openwf */ +#ifndef EGL_EXT_device_persistent_id +#define EGL_EXT_device_persistent_id 1 +#define EGL_DEVICE_UUID_EXT 0x335C +#define EGL_DRIVER_UUID_EXT 0x335D +#define EGL_DRIVER_NAME_EXT 0x335E +typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYDEVICEBINARYEXTPROC) (EGLDeviceEXT device, EGLint name, EGLint max_size, void *value, EGLint *size); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglQueryDeviceBinaryEXT (EGLDeviceEXT device, EGLint name, EGLint max_size, void *value, EGLint *size); +#endif +#endif /* EGL_EXT_device_persistent_id */ + #ifndef EGL_EXT_device_query #define EGL_EXT_device_query 1 #endif /* EGL_EXT_device_query */ +#ifndef EGL_EXT_device_query_name +#define EGL_EXT_device_query_name 1 +#define EGL_RENDERER_EXT 0x335F +#endif /* EGL_EXT_device_query_name */ + +#ifndef EGL_EXT_gl_colorspace_bt2020_linear +#define EGL_EXT_gl_colorspace_bt2020_linear 1 +#define EGL_GL_COLORSPACE_BT2020_LINEAR_EXT 0x333F +#endif /* EGL_EXT_gl_colorspace_bt2020_linear */ + +#ifndef EGL_EXT_gl_colorspace_bt2020_pq +#define EGL_EXT_gl_colorspace_bt2020_pq 1 +#define EGL_GL_COLORSPACE_BT2020_PQ_EXT 0x3340 +#endif /* EGL_EXT_gl_colorspace_bt2020_pq */ + +#ifndef EGL_EXT_gl_colorspace_display_p3 +#define EGL_EXT_gl_colorspace_display_p3 1 +#define EGL_GL_COLORSPACE_DISPLAY_P3_EXT 0x3363 +#endif /* EGL_EXT_gl_colorspace_display_p3 */ + +#ifndef EGL_EXT_gl_colorspace_display_p3_linear +#define EGL_EXT_gl_colorspace_display_p3_linear 1 +#define EGL_GL_COLORSPACE_DISPLAY_P3_LINEAR_EXT 0x3362 +#endif /* EGL_EXT_gl_colorspace_display_p3_linear */ + +#ifndef EGL_EXT_gl_colorspace_display_p3_passthrough +#define EGL_EXT_gl_colorspace_display_p3_passthrough 1 +#define EGL_GL_COLORSPACE_DISPLAY_P3_PASSTHROUGH_EXT 0x3490 +#endif /* EGL_EXT_gl_colorspace_display_p3_passthrough */ + +#ifndef EGL_EXT_gl_colorspace_scrgb +#define EGL_EXT_gl_colorspace_scrgb 1 +#define EGL_GL_COLORSPACE_SCRGB_EXT 0x3351 +#endif /* EGL_EXT_gl_colorspace_scrgb */ + +#ifndef EGL_EXT_gl_colorspace_scrgb_linear +#define EGL_EXT_gl_colorspace_scrgb_linear 1 +#define EGL_GL_COLORSPACE_SCRGB_LINEAR_EXT 0x3350 +#endif /* EGL_EXT_gl_colorspace_scrgb_linear */ + #ifndef EGL_EXT_image_dma_buf_import #define EGL_EXT_image_dma_buf_import 1 #define EGL_LINUX_DMA_BUF_EXT 0x3270 @@ -1325,6 +1630,39 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQueryDisplayAttribEXT (EGLDisplay dpy, EGLint a #define EGL_YUV_CHROMA_SITING_0_5_EXT 0x3285 #endif /* EGL_EXT_image_dma_buf_import */ +#ifndef EGL_EXT_image_dma_buf_import_modifiers +#define EGL_EXT_image_dma_buf_import_modifiers 1 +#define EGL_DMA_BUF_PLANE3_FD_EXT 0x3440 +#define EGL_DMA_BUF_PLANE3_OFFSET_EXT 0x3441 +#define EGL_DMA_BUF_PLANE3_PITCH_EXT 0x3442 +#define EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT 0x3443 +#define EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT 0x3444 +#define EGL_DMA_BUF_PLANE1_MODIFIER_LO_EXT 0x3445 +#define EGL_DMA_BUF_PLANE1_MODIFIER_HI_EXT 0x3446 +#define EGL_DMA_BUF_PLANE2_MODIFIER_LO_EXT 0x3447 +#define EGL_DMA_BUF_PLANE2_MODIFIER_HI_EXT 0x3448 +#define EGL_DMA_BUF_PLANE3_MODIFIER_LO_EXT 0x3449 +#define EGL_DMA_BUF_PLANE3_MODIFIER_HI_EXT 0x344A +typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYDMABUFFORMATSEXTPROC) (EGLDisplay dpy, EGLint max_formats, EGLint *formats, EGLint *num_formats); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYDMABUFMODIFIERSEXTPROC) (EGLDisplay dpy, EGLint format, EGLint max_modifiers, EGLuint64KHR *modifiers, EGLBoolean *external_only, EGLint *num_modifiers); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglQueryDmaBufFormatsEXT (EGLDisplay dpy, EGLint max_formats, EGLint *formats, EGLint *num_formats); +EGLAPI EGLBoolean EGLAPIENTRY eglQueryDmaBufModifiersEXT (EGLDisplay dpy, EGLint format, EGLint max_modifiers, EGLuint64KHR *modifiers, EGLBoolean *external_only, EGLint *num_modifiers); +#endif +#endif /* EGL_EXT_image_dma_buf_import_modifiers */ + +#ifndef EGL_EXT_image_gl_colorspace +#define EGL_EXT_image_gl_colorspace 1 +#define EGL_GL_COLORSPACE_DEFAULT_EXT 0x314D +#endif /* EGL_EXT_image_gl_colorspace */ + +#ifndef EGL_EXT_image_implicit_sync_control +#define EGL_EXT_image_implicit_sync_control 1 +#define EGL_IMPORT_SYNC_TYPE_EXT 0x3470 +#define EGL_IMPORT_IMPLICIT_SYNC_EXT 0x3471 +#define EGL_IMPORT_EXPLICIT_SYNC_EXT 0x3472 +#endif /* EGL_EXT_image_implicit_sync_control */ + #ifndef EGL_EXT_multiview_window #define EGL_EXT_multiview_window 1 #define EGL_MULTIVIEW_VIEW_COUNT_EXT 0x3134 @@ -1334,8 +1672,8 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQueryDisplayAttribEXT (EGLDisplay dpy, EGLint a #define EGL_EXT_output_base 1 typedef void *EGLOutputLayerEXT; typedef void *EGLOutputPortEXT; -#define EGL_NO_OUTPUT_LAYER_EXT ((EGLOutputLayerEXT)0) -#define EGL_NO_OUTPUT_PORT_EXT ((EGLOutputPortEXT)0) +#define EGL_NO_OUTPUT_LAYER_EXT EGL_CAST(EGLOutputLayerEXT,0) +#define EGL_NO_OUTPUT_PORT_EXT EGL_CAST(EGLOutputPortEXT,0) #define EGL_BAD_OUTPUT_LAYER_EXT 0x322D #define EGL_BAD_OUTPUT_PORT_EXT 0x322E #define EGL_SWAP_INTERVAL_EXT 0x322F @@ -1372,6 +1710,13 @@ EGLAPI const char *EGLAPIENTRY eglQueryOutputPortStringEXT (EGLDisplay dpy, EGLO #define EGL_OPENWF_PORT_ID_EXT 0x3239 #endif /* EGL_EXT_output_openwf */ +#ifndef EGL_EXT_pixel_format_float +#define EGL_EXT_pixel_format_float 1 +#define EGL_COLOR_COMPONENT_TYPE_EXT 0x3339 +#define EGL_COLOR_COMPONENT_TYPE_FIXED_EXT 0x333A +#define EGL_COLOR_COMPONENT_TYPE_FLOAT_EXT 0x333B +#endif /* EGL_EXT_pixel_format_float */ + #ifndef EGL_EXT_platform_base #define EGL_EXT_platform_base 1 typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETPLATFORMDISPLAYEXTPROC) (EGLenum platform, void *native_display, const EGLint *attrib_list); @@ -1400,9 +1745,24 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreatePlatformPixmapSurfaceEXT (EGLDisplay dpy, #define EGL_PLATFORM_X11_SCREEN_EXT 0x31D6 #endif /* EGL_EXT_platform_x11 */ +#ifndef EGL_EXT_platform_xcb +#define EGL_EXT_platform_xcb 1 +#define EGL_PLATFORM_XCB_EXT 0x31DC +#define EGL_PLATFORM_XCB_SCREEN_EXT 0x31DE +#endif /* EGL_EXT_platform_xcb */ + +#ifndef EGL_EXT_present_opaque +#define EGL_EXT_present_opaque 1 +#define EGL_PRESENT_OPAQUE_EXT 0x31DF +#endif /* EGL_EXT_present_opaque */ + +#ifndef EGL_EXT_protected_content +#define EGL_EXT_protected_content 1 +#define EGL_PROTECTED_CONTENT_EXT 0x32C0 +#endif /* EGL_EXT_protected_content */ + #ifndef EGL_EXT_protected_surface #define EGL_EXT_protected_surface 1 -#define EGL_PROTECTED_CONTENT_EXT 0x32C0 #endif /* EGL_EXT_protected_surface */ #ifndef EGL_EXT_stream_consumer_egloutput @@ -1413,14 +1773,43 @@ EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerOutputEXT (EGLDisplay dpy, EGLStr #endif #endif /* EGL_EXT_stream_consumer_egloutput */ +#ifndef EGL_EXT_surface_CTA861_3_metadata +#define EGL_EXT_surface_CTA861_3_metadata 1 +#define EGL_CTA861_3_MAX_CONTENT_LIGHT_LEVEL_EXT 0x3360 +#define EGL_CTA861_3_MAX_FRAME_AVERAGE_LEVEL_EXT 0x3361 +#endif /* EGL_EXT_surface_CTA861_3_metadata */ + +#ifndef EGL_EXT_surface_SMPTE2086_metadata +#define EGL_EXT_surface_SMPTE2086_metadata 1 +#define EGL_SMPTE2086_DISPLAY_PRIMARY_RX_EXT 0x3341 +#define EGL_SMPTE2086_DISPLAY_PRIMARY_RY_EXT 0x3342 +#define EGL_SMPTE2086_DISPLAY_PRIMARY_GX_EXT 0x3343 +#define EGL_SMPTE2086_DISPLAY_PRIMARY_GY_EXT 0x3344 +#define EGL_SMPTE2086_DISPLAY_PRIMARY_BX_EXT 0x3345 +#define EGL_SMPTE2086_DISPLAY_PRIMARY_BY_EXT 0x3346 +#define EGL_SMPTE2086_WHITE_POINT_X_EXT 0x3347 +#define EGL_SMPTE2086_WHITE_POINT_Y_EXT 0x3348 +#define EGL_SMPTE2086_MAX_LUMINANCE_EXT 0x3349 +#define EGL_SMPTE2086_MIN_LUMINANCE_EXT 0x334A +#define EGL_METADATA_SCALING_EXT 50000 +#endif /* EGL_EXT_surface_SMPTE2086_metadata */ + #ifndef EGL_EXT_swap_buffers_with_damage #define EGL_EXT_swap_buffers_with_damage 1 -typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSWITHDAMAGEEXTPROC) (EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSWITHDAMAGEEXTPROC) (EGLDisplay dpy, EGLSurface surface, const EGLint *rects, EGLint n_rects); #ifdef EGL_EGLEXT_PROTOTYPES -EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffersWithDamageEXT (EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects); +EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffersWithDamageEXT (EGLDisplay dpy, EGLSurface surface, const EGLint *rects, EGLint n_rects); #endif #endif /* EGL_EXT_swap_buffers_with_damage */ +#ifndef EGL_EXT_sync_reuse +#define EGL_EXT_sync_reuse 1 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLUNSIGNALSYNCEXTPROC) (EGLDisplay dpy, EGLSync sync, const EGLAttrib *attrib_list); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglUnsignalSyncEXT (EGLDisplay dpy, EGLSync sync, const EGLAttrib *attrib_list); +#endif +#endif /* EGL_EXT_sync_reuse */ + #ifndef EGL_EXT_yuv_surface #define EGL_EXT_yuv_surface 1 #define EGL_YUV_ORDER_EXT 0x3301 @@ -1481,6 +1870,12 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreatePixmapSurfaceHI (EGLDisplay dpy, EGLConfi #define EGL_CONTEXT_PRIORITY_LOW_IMG 0x3103 #endif /* EGL_IMG_context_priority */ +#ifndef EGL_IMG_image_plane_attribs +#define EGL_IMG_image_plane_attribs 1 +#define EGL_NATIVE_BUFFER_MULTIPLANE_SEPARATE_IMG 0x3105 +#define EGL_NATIVE_BUFFER_PLANE_OFFSET_IMG 0x3106 +#endif /* EGL_IMG_image_plane_attribs */ + #ifndef EGL_MESA_drm_image #define EGL_MESA_drm_image 1 #define EGL_DRM_BUFFER_FORMAT_MESA 0x31D0 @@ -1490,6 +1885,7 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreatePixmapSurfaceHI (EGLDisplay dpy, EGLConfi #define EGL_DRM_BUFFER_STRIDE_MESA 0x31D4 #define EGL_DRM_BUFFER_USE_SCANOUT_MESA 0x00000001 #define EGL_DRM_BUFFER_USE_SHARE_MESA 0x00000002 +#define EGL_DRM_BUFFER_USE_CURSOR_MESA 0x00000004 typedef EGLImageKHR (EGLAPIENTRYP PFNEGLCREATEDRMIMAGEMESAPROC) (EGLDisplay dpy, const EGLint *attrib_list); typedef EGLBoolean (EGLAPIENTRYP PFNEGLEXPORTDRMIMAGEMESAPROC) (EGLDisplay dpy, EGLImageKHR image, EGLint *name, EGLint *handle, EGLint *stride); #ifdef EGL_EGLEXT_PROTOTYPES @@ -1513,6 +1909,21 @@ EGLAPI EGLBoolean EGLAPIENTRY eglExportDMABUFImageMESA (EGLDisplay dpy, EGLImage #define EGL_PLATFORM_GBM_MESA 0x31D7 #endif /* EGL_MESA_platform_gbm */ +#ifndef EGL_MESA_platform_surfaceless +#define EGL_MESA_platform_surfaceless 1 +#define EGL_PLATFORM_SURFACELESS_MESA 0x31DD +#endif /* EGL_MESA_platform_surfaceless */ + +#ifndef EGL_MESA_query_driver +#define EGL_MESA_query_driver 1 +typedef char *(EGLAPIENTRYP PFNEGLGETDISPLAYDRIVERCONFIGPROC) (EGLDisplay dpy); +typedef const char *(EGLAPIENTRYP PFNEGLGETDISPLAYDRIVERNAMEPROC) (EGLDisplay dpy); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI char *EGLAPIENTRY eglGetDisplayDriverConfig (EGLDisplay dpy); +EGLAPI const char *EGLAPIENTRY eglGetDisplayDriverName (EGLDisplay dpy); +#endif +#endif /* EGL_MESA_query_driver */ + #ifndef EGL_NOK_swap_region #define EGL_NOK_swap_region 1 typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSREGIONNOKPROC) (EGLDisplay dpy, EGLSurface surface, EGLint numRects, const EGLint *rects); @@ -1539,6 +1950,11 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffersRegion2NOK (EGLDisplay dpy, EGLSurfa #define EGL_AUTO_STEREO_NV 0x3136 #endif /* EGL_NV_3dvision_surface */ +#ifndef EGL_NV_context_priority_realtime +#define EGL_NV_context_priority_realtime 1 +#define EGL_CONTEXT_PRIORITY_REALTIME_NV 0x3357 +#endif /* EGL_NV_context_priority_realtime */ + #ifndef EGL_NV_coverage_sample #define EGL_NV_coverage_sample 1 #define EGL_COVERAGE_BUFFERS_NV 0x30E0 @@ -1596,6 +2012,181 @@ EGLAPI EGLBoolean EGLAPIENTRY eglPostSubBufferNV (EGLDisplay dpy, EGLSurface sur #endif #endif /* EGL_NV_post_sub_buffer */ +#ifndef EGL_NV_quadruple_buffer +#define EGL_NV_quadruple_buffer 1 +#define EGL_QUADRUPLE_BUFFER_NV 0x3231 +#endif /* EGL_NV_quadruple_buffer */ + +#ifndef EGL_NV_robustness_video_memory_purge +#define EGL_NV_robustness_video_memory_purge 1 +#define EGL_GENERATE_RESET_ON_VIDEO_MEMORY_PURGE_NV 0x334C +#endif /* EGL_NV_robustness_video_memory_purge */ + +#ifndef EGL_NV_stream_consumer_eglimage +#define EGL_NV_stream_consumer_eglimage 1 +#define EGL_STREAM_CONSUMER_IMAGE_NV 0x3373 +#define EGL_STREAM_IMAGE_ADD_NV 0x3374 +#define EGL_STREAM_IMAGE_REMOVE_NV 0x3375 +#define EGL_STREAM_IMAGE_AVAILABLE_NV 0x3376 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMIMAGECONSUMERCONNECTNVPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLint num_modifiers, EGLuint64KHR *modifiers, EGLAttrib *attrib_list); +typedef EGLint (EGLAPIENTRYP PFNEGLQUERYSTREAMCONSUMEREVENTNVPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLTime timeout, EGLenum *event, EGLAttrib *aux); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMACQUIREIMAGENVPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLImage *pImage, EGLSync sync); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMRELEASEIMAGENVPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLImage image, EGLSync sync); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglStreamImageConsumerConnectNV (EGLDisplay dpy, EGLStreamKHR stream, EGLint num_modifiers, EGLuint64KHR *modifiers, EGLAttrib *attrib_list); +EGLAPI EGLint EGLAPIENTRY eglQueryStreamConsumerEventNV (EGLDisplay dpy, EGLStreamKHR stream, EGLTime timeout, EGLenum *event, EGLAttrib *aux); +EGLAPI EGLBoolean EGLAPIENTRY eglStreamAcquireImageNV (EGLDisplay dpy, EGLStreamKHR stream, EGLImage *pImage, EGLSync sync); +EGLAPI EGLBoolean EGLAPIENTRY eglStreamReleaseImageNV (EGLDisplay dpy, EGLStreamKHR stream, EGLImage image, EGLSync sync); +#endif +#endif /* EGL_NV_stream_consumer_eglimage */ + +#ifndef EGL_NV_stream_consumer_gltexture_yuv +#define EGL_NV_stream_consumer_gltexture_yuv 1 +#define EGL_YUV_PLANE0_TEXTURE_UNIT_NV 0x332C +#define EGL_YUV_PLANE1_TEXTURE_UNIT_NV 0x332D +#define EGL_YUV_PLANE2_TEXTURE_UNIT_NV 0x332E +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMCONSUMERGLTEXTUREEXTERNALATTRIBSNVPROC) (EGLDisplay dpy, EGLStreamKHR stream, const EGLAttrib *attrib_list); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerGLTextureExternalAttribsNV (EGLDisplay dpy, EGLStreamKHR stream, const EGLAttrib *attrib_list); +#endif +#endif /* EGL_NV_stream_consumer_gltexture_yuv */ + +#ifndef EGL_NV_stream_cross_display +#define EGL_NV_stream_cross_display 1 +#define EGL_STREAM_CROSS_DISPLAY_NV 0x334E +#endif /* EGL_NV_stream_cross_display */ + +#ifndef EGL_NV_stream_cross_object +#define EGL_NV_stream_cross_object 1 +#define EGL_STREAM_CROSS_OBJECT_NV 0x334D +#endif /* EGL_NV_stream_cross_object */ + +#ifndef EGL_NV_stream_cross_partition +#define EGL_NV_stream_cross_partition 1 +#define EGL_STREAM_CROSS_PARTITION_NV 0x323F +#endif /* EGL_NV_stream_cross_partition */ + +#ifndef EGL_NV_stream_cross_process +#define EGL_NV_stream_cross_process 1 +#define EGL_STREAM_CROSS_PROCESS_NV 0x3245 +#endif /* EGL_NV_stream_cross_process */ + +#ifndef EGL_NV_stream_cross_system +#define EGL_NV_stream_cross_system 1 +#define EGL_STREAM_CROSS_SYSTEM_NV 0x334F +#endif /* EGL_NV_stream_cross_system */ + +#ifndef EGL_NV_stream_dma +#define EGL_NV_stream_dma 1 +#define EGL_STREAM_DMA_NV 0x3371 +#define EGL_STREAM_DMA_SERVER_NV 0x3372 +#endif /* EGL_NV_stream_dma */ + +#ifndef EGL_NV_stream_fifo_next +#define EGL_NV_stream_fifo_next 1 +#define EGL_PENDING_FRAME_NV 0x3329 +#define EGL_STREAM_TIME_PENDING_NV 0x332A +#endif /* EGL_NV_stream_fifo_next */ + +#ifndef EGL_NV_stream_fifo_synchronous +#define EGL_NV_stream_fifo_synchronous 1 +#define EGL_STREAM_FIFO_SYNCHRONOUS_NV 0x3336 +#endif /* EGL_NV_stream_fifo_synchronous */ + +#ifndef EGL_NV_stream_flush +#define EGL_NV_stream_flush 1 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMFLUSHNVPROC) (EGLDisplay dpy, EGLStreamKHR stream); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglStreamFlushNV (EGLDisplay dpy, EGLStreamKHR stream); +#endif +#endif /* EGL_NV_stream_flush */ + +#ifndef EGL_NV_stream_frame_limits +#define EGL_NV_stream_frame_limits 1 +#define EGL_PRODUCER_MAX_FRAME_HINT_NV 0x3337 +#define EGL_CONSUMER_MAX_FRAME_HINT_NV 0x3338 +#endif /* EGL_NV_stream_frame_limits */ + +#ifndef EGL_NV_stream_metadata +#define EGL_NV_stream_metadata 1 +#define EGL_MAX_STREAM_METADATA_BLOCKS_NV 0x3250 +#define EGL_MAX_STREAM_METADATA_BLOCK_SIZE_NV 0x3251 +#define EGL_MAX_STREAM_METADATA_TOTAL_SIZE_NV 0x3252 +#define EGL_PRODUCER_METADATA_NV 0x3253 +#define EGL_CONSUMER_METADATA_NV 0x3254 +#define EGL_PENDING_METADATA_NV 0x3328 +#define EGL_METADATA0_SIZE_NV 0x3255 +#define EGL_METADATA1_SIZE_NV 0x3256 +#define EGL_METADATA2_SIZE_NV 0x3257 +#define EGL_METADATA3_SIZE_NV 0x3258 +#define EGL_METADATA0_TYPE_NV 0x3259 +#define EGL_METADATA1_TYPE_NV 0x325A +#define EGL_METADATA2_TYPE_NV 0x325B +#define EGL_METADATA3_TYPE_NV 0x325C +typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYDISPLAYATTRIBNVPROC) (EGLDisplay dpy, EGLint attribute, EGLAttrib *value); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLSETSTREAMMETADATANVPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLint n, EGLint offset, EGLint size, const void *data); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSTREAMMETADATANVPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLenum name, EGLint n, EGLint offset, EGLint size, void *data); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglQueryDisplayAttribNV (EGLDisplay dpy, EGLint attribute, EGLAttrib *value); +EGLAPI EGLBoolean EGLAPIENTRY eglSetStreamMetadataNV (EGLDisplay dpy, EGLStreamKHR stream, EGLint n, EGLint offset, EGLint size, const void *data); +EGLAPI EGLBoolean EGLAPIENTRY eglQueryStreamMetadataNV (EGLDisplay dpy, EGLStreamKHR stream, EGLenum name, EGLint n, EGLint offset, EGLint size, void *data); +#endif +#endif /* EGL_NV_stream_metadata */ + +#ifndef EGL_NV_stream_origin +#define EGL_NV_stream_origin 1 +#define EGL_STREAM_FRAME_ORIGIN_X_NV 0x3366 +#define EGL_STREAM_FRAME_ORIGIN_Y_NV 0x3367 +#define EGL_STREAM_FRAME_MAJOR_AXIS_NV 0x3368 +#define EGL_CONSUMER_AUTO_ORIENTATION_NV 0x3369 +#define EGL_PRODUCER_AUTO_ORIENTATION_NV 0x336A +#define EGL_LEFT_NV 0x336B +#define EGL_RIGHT_NV 0x336C +#define EGL_TOP_NV 0x336D +#define EGL_BOTTOM_NV 0x336E +#define EGL_X_AXIS_NV 0x336F +#define EGL_Y_AXIS_NV 0x3370 +#endif /* EGL_NV_stream_origin */ + +#ifndef EGL_NV_stream_remote +#define EGL_NV_stream_remote 1 +#define EGL_STREAM_STATE_INITIALIZING_NV 0x3240 +#define EGL_STREAM_TYPE_NV 0x3241 +#define EGL_STREAM_PROTOCOL_NV 0x3242 +#define EGL_STREAM_ENDPOINT_NV 0x3243 +#define EGL_STREAM_LOCAL_NV 0x3244 +#define EGL_STREAM_PRODUCER_NV 0x3247 +#define EGL_STREAM_CONSUMER_NV 0x3248 +#define EGL_STREAM_PROTOCOL_FD_NV 0x3246 +#endif /* EGL_NV_stream_remote */ + +#ifndef EGL_NV_stream_reset +#define EGL_NV_stream_reset 1 +#define EGL_SUPPORT_RESET_NV 0x3334 +#define EGL_SUPPORT_REUSE_NV 0x3335 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLRESETSTREAMNVPROC) (EGLDisplay dpy, EGLStreamKHR stream); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglResetStreamNV (EGLDisplay dpy, EGLStreamKHR stream); +#endif +#endif /* EGL_NV_stream_reset */ + +#ifndef EGL_NV_stream_socket +#define EGL_NV_stream_socket 1 +#define EGL_STREAM_PROTOCOL_SOCKET_NV 0x324B +#define EGL_SOCKET_HANDLE_NV 0x324C +#define EGL_SOCKET_TYPE_NV 0x324D +#endif /* EGL_NV_stream_socket */ + +#ifndef EGL_NV_stream_socket_inet +#define EGL_NV_stream_socket_inet 1 +#define EGL_SOCKET_TYPE_INET_NV 0x324F +#endif /* EGL_NV_stream_socket_inet */ + +#ifndef EGL_NV_stream_socket_unix +#define EGL_NV_stream_socket_unix 1 +#define EGL_SOCKET_TYPE_UNIX_NV 0x324E +#endif /* EGL_NV_stream_socket_unix */ + #ifndef EGL_NV_stream_sync #define EGL_NV_stream_sync 1 #define EGL_SYNC_NEW_FRAME_NV 0x321F @@ -1622,7 +2213,7 @@ typedef khronos_utime_nanoseconds_t EGLTimeNV; #define EGL_SYNC_TYPE_NV 0x30ED #define EGL_SYNC_CONDITION_NV 0x30EE #define EGL_SYNC_FENCE_NV 0x30EF -#define EGL_NO_SYNC_NV ((EGLSyncNV)0) +#define EGL_NO_SYNC_NV EGL_CAST(EGLSyncNV,0) typedef EGLSyncNV (EGLAPIENTRYP PFNEGLCREATEFENCESYNCNVPROC) (EGLDisplay dpy, EGLenum condition, const EGLint *attrib_list); typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYSYNCNVPROC) (EGLSyncNV sync); typedef EGLBoolean (EGLAPIENTRYP PFNEGLFENCENVPROC) (EGLSyncNV sync); @@ -1653,6 +2244,11 @@ EGLAPI EGLuint64NV EGLAPIENTRY eglGetSystemTimeNV (void); #endif /* KHRONOS_SUPPORT_INT64 */ #endif /* EGL_NV_system_time */ +#ifndef EGL_NV_triple_buffer +#define EGL_NV_triple_buffer 1 +#define EGL_TRIPLE_BUFFER_NV 0x3230 +#endif /* EGL_NV_triple_buffer */ + #ifndef EGL_TIZEN_image_native_buffer #define EGL_TIZEN_image_native_buffer 1 #define EGL_NATIVE_BUFFER_TIZEN 0x32A0 @@ -1663,11 +2259,44 @@ EGLAPI EGLuint64NV EGLAPIENTRY eglGetSystemTimeNV (void); #define EGL_NATIVE_SURFACE_TIZEN 0x32A1 #endif /* EGL_TIZEN_image_native_surface */ +#ifndef EGL_WL_bind_wayland_display +#define EGL_WL_bind_wayland_display 1 +#define PFNEGLBINDWAYLANDDISPLAYWL PFNEGLBINDWAYLANDDISPLAYWLPROC +#define PFNEGLUNBINDWAYLANDDISPLAYWL PFNEGLUNBINDWAYLANDDISPLAYWLPROC +#define PFNEGLQUERYWAYLANDBUFFERWL PFNEGLQUERYWAYLANDBUFFERWLPROC +struct wl_display; +struct wl_resource; +#define EGL_WAYLAND_BUFFER_WL 0x31D5 +#define EGL_WAYLAND_PLANE_WL 0x31D6 +#define EGL_TEXTURE_Y_U_V_WL 0x31D7 +#define EGL_TEXTURE_Y_UV_WL 0x31D8 +#define EGL_TEXTURE_Y_XUXV_WL 0x31D9 +#define EGL_TEXTURE_EXTERNAL_WL 0x31DA +#define EGL_WAYLAND_Y_INVERTED_WL 0x31DB +typedef EGLBoolean (EGLAPIENTRYP PFNEGLBINDWAYLANDDISPLAYWLPROC) (EGLDisplay dpy, struct wl_display *display); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLUNBINDWAYLANDDISPLAYWLPROC) (EGLDisplay dpy, struct wl_display *display); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYWAYLANDBUFFERWLPROC) (EGLDisplay dpy, struct wl_resource *buffer, EGLint attribute, EGLint *value); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglBindWaylandDisplayWL (EGLDisplay dpy, struct wl_display *display); +EGLAPI EGLBoolean EGLAPIENTRY eglUnbindWaylandDisplayWL (EGLDisplay dpy, struct wl_display *display); +EGLAPI EGLBoolean EGLAPIENTRY eglQueryWaylandBufferWL (EGLDisplay dpy, struct wl_resource *buffer, EGLint attribute, EGLint *value); +#endif +#endif /* EGL_WL_bind_wayland_display */ + +#ifndef EGL_WL_create_wayland_buffer_from_image +#define EGL_WL_create_wayland_buffer_from_image 1 +#define PFNEGLCREATEWAYLANDBUFFERFROMIMAGEWL PFNEGLCREATEWAYLANDBUFFERFROMIMAGEWLPROC +struct wl_buffer; +typedef struct wl_buffer *(EGLAPIENTRYP PFNEGLCREATEWAYLANDBUFFERFROMIMAGEWLPROC) (EGLDisplay dpy, EGLImageKHR image); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI struct wl_buffer *EGLAPIENTRY eglCreateWaylandBufferFromImageWL (EGLDisplay dpy, EGLImageKHR image); +#endif +#endif /* EGL_WL_create_wayland_buffer_from_image */ + #ifdef __cplusplus } #endif #endif /* __eglext_h_ */ - #endif /* _MSC_VER */ diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_endian.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_endian.h index 54d5d486d..46c296253 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_endian.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_endian.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -30,6 +30,23 @@ #include "SDL_stdinc.h" +#if defined(_MSC_VER) && (_MSC_VER >= 1400) +/* As of Clang 11, '_m_prefetchw' is conflicting with the winnt.h's version, + so we define the needed '_m_prefetch' here as a pseudo-header, until the issue is fixed. */ +#ifdef __clang__ +#ifndef __PRFCHWINTRIN_H +#define __PRFCHWINTRIN_H +static __inline__ void __attribute__((__always_inline__, __nodebug__)) +_m_prefetch(void *__P) +{ + __builtin_prefetch (__P, 0, 3 /* _MM_HINT_T0 */); +} +#endif /* __PRFCHWINTRIN_H */ +#endif /* __clang__ */ + +#include +#endif + /** * \name The two types of endianness */ @@ -42,10 +59,16 @@ #ifdef __linux__ #include #define SDL_BYTEORDER __BYTE_ORDER -#else /* __linux__ */ +#elif defined(__OpenBSD__) +#include +#define SDL_BYTEORDER BYTE_ORDER +#elif defined(__FreeBSD__) || defined(__NetBSD__) +#include +#define SDL_BYTEORDER BYTE_ORDER +#else #if defined(__hppa__) || \ defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || \ - (defined(__MIPS__) && defined(__MISPEB__)) || \ + (defined(__MIPS__) && defined(__MIPSEB__)) || \ defined(__ppc__) || defined(__POWERPC__) || defined(_M_PPC) || \ defined(__sparc__) #define SDL_BYTEORDER SDL_BIG_ENDIAN @@ -65,22 +88,45 @@ extern "C" { /** * \file SDL_endian.h */ -#if defined(__GNUC__) && defined(__i386__) && \ - !(__GNUC__ == 2 && __GNUC_MINOR__ == 95 /* broken gcc version */) + +/* various modern compilers may have builtin swap */ +#if defined(__GNUC__) || defined(__clang__) +# define HAS_BUILTIN_BSWAP16 (_SDL_HAS_BUILTIN(__builtin_bswap16)) || \ + (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)) +# define HAS_BUILTIN_BSWAP32 (_SDL_HAS_BUILTIN(__builtin_bswap32)) || \ + (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) +# define HAS_BUILTIN_BSWAP64 (_SDL_HAS_BUILTIN(__builtin_bswap64)) || \ + (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) + + /* this one is broken */ +# define HAS_BROKEN_BSWAP (__GNUC__ == 2 && __GNUC_MINOR__ <= 95) +#else +# define HAS_BUILTIN_BSWAP16 0 +# define HAS_BUILTIN_BSWAP32 0 +# define HAS_BUILTIN_BSWAP64 0 +# define HAS_BROKEN_BSWAP 0 +#endif + +#if HAS_BUILTIN_BSWAP16 +#define SDL_Swap16(x) __builtin_bswap16(x) +#elif defined(_MSC_VER) && (_MSC_VER >= 1400) +#pragma intrinsic(_byteswap_ushort) +#define SDL_Swap16(x) _byteswap_ushort(x) +#elif defined(__i386__) && !HAS_BROKEN_BSWAP SDL_FORCE_INLINE Uint16 SDL_Swap16(Uint16 x) { __asm__("xchgb %b0,%h0": "=q"(x):"0"(x)); return x; } -#elif defined(__GNUC__) && defined(__x86_64__) +#elif defined(__x86_64__) SDL_FORCE_INLINE Uint16 SDL_Swap16(Uint16 x) { __asm__("xchgb %b0,%h0": "=Q"(x):"0"(x)); return x; } -#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__)) +#elif (defined(__powerpc__) || defined(__ppc__)) SDL_FORCE_INLINE Uint16 SDL_Swap16(Uint16 x) { @@ -89,7 +135,7 @@ SDL_Swap16(Uint16 x) __asm__("rlwimi %0,%2,8,16,23": "=&r"(result):"0"(x >> 8), "r"(x)); return (Uint16)result; } -#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__) +#elif (defined(__m68k__) && !defined(__mcoldfire__)) SDL_FORCE_INLINE Uint16 SDL_Swap16(Uint16 x) { @@ -97,7 +143,7 @@ SDL_Swap16(Uint16 x) return x; } #elif defined(__WATCOMC__) && defined(__386__) -extern _inline Uint16 SDL_Swap16(Uint16); +extern __inline Uint16 SDL_Swap16(Uint16); #pragma aux SDL_Swap16 = \ "xchg al, ah" \ parm [ax] \ @@ -110,32 +156,37 @@ SDL_Swap16(Uint16 x) } #endif -#if defined(__GNUC__) && defined(__i386__) +#if HAS_BUILTIN_BSWAP32 +#define SDL_Swap32(x) __builtin_bswap32(x) +#elif defined(_MSC_VER) && (_MSC_VER >= 1400) +#pragma intrinsic(_byteswap_ulong) +#define SDL_Swap32(x) _byteswap_ulong(x) +#elif defined(__i386__) && !HAS_BROKEN_BSWAP SDL_FORCE_INLINE Uint32 SDL_Swap32(Uint32 x) { __asm__("bswap %0": "=r"(x):"0"(x)); return x; } -#elif defined(__GNUC__) && defined(__x86_64__) +#elif defined(__x86_64__) SDL_FORCE_INLINE Uint32 SDL_Swap32(Uint32 x) { __asm__("bswapl %0": "=r"(x):"0"(x)); return x; } -#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__)) +#elif (defined(__powerpc__) || defined(__ppc__)) SDL_FORCE_INLINE Uint32 SDL_Swap32(Uint32 x) { Uint32 result; - __asm__("rlwimi %0,%2,24,16,23": "=&r"(result):"0"(x >> 24), "r"(x)); - __asm__("rlwimi %0,%2,8,8,15": "=&r"(result):"0"(result), "r"(x)); - __asm__("rlwimi %0,%2,24,0,7": "=&r"(result):"0"(result), "r"(x)); + __asm__("rlwimi %0,%2,24,16,23": "=&r"(result): "0" (x>>24), "r"(x)); + __asm__("rlwimi %0,%2,8,8,15" : "=&r"(result): "0" (result), "r"(x)); + __asm__("rlwimi %0,%2,24,0,7" : "=&r"(result): "0" (result), "r"(x)); return result; } -#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__) +#elif (defined(__m68k__) && !defined(__mcoldfire__)) SDL_FORCE_INLINE Uint32 SDL_Swap32(Uint32 x) { @@ -143,20 +194,11 @@ SDL_Swap32(Uint32 x) return x; } #elif defined(__WATCOMC__) && defined(__386__) -extern _inline Uint32 SDL_Swap32(Uint32); -#ifndef __SW_3 /* 486+ */ +extern __inline Uint32 SDL_Swap32(Uint32); #pragma aux SDL_Swap32 = \ "bswap eax" \ parm [eax] \ modify [eax]; -#else /* 386-only */ -#pragma aux SDL_Swap32 = \ - "xchg al, ah" \ - "ror eax, 16" \ - "xchg al, ah" \ - parm [eax] \ - modify [eax]; -#endif #else SDL_FORCE_INLINE Uint32 SDL_Swap32(Uint32 x) @@ -166,31 +208,42 @@ SDL_Swap32(Uint32 x) } #endif -#if defined(__GNUC__) && defined(__i386__) +#if HAS_BUILTIN_BSWAP64 +#define SDL_Swap64(x) __builtin_bswap64(x) +#elif defined(_MSC_VER) && (_MSC_VER >= 1400) +#pragma intrinsic(_byteswap_uint64) +#define SDL_Swap64(x) _byteswap_uint64(x) +#elif defined(__i386__) && !HAS_BROKEN_BSWAP SDL_FORCE_INLINE Uint64 SDL_Swap64(Uint64 x) { - union - { - struct - { + union { + struct { Uint32 a, b; } s; Uint64 u; } v; v.u = x; - __asm__("bswapl %0 ; bswapl %1 ; xchgl %0,%1": "=r"(v.s.a), "=r"(v.s.b):"0"(v.s.a), - "1"(v.s. - b)); + __asm__("bswapl %0 ; bswapl %1 ; xchgl %0,%1" + : "=r"(v.s.a), "=r"(v.s.b) + : "0" (v.s.a), "1"(v.s.b)); return v.u; } -#elif defined(__GNUC__) && defined(__x86_64__) +#elif defined(__x86_64__) SDL_FORCE_INLINE Uint64 SDL_Swap64(Uint64 x) { __asm__("bswapq %0": "=r"(x):"0"(x)); return x; } +#elif defined(__WATCOMC__) && defined(__386__) +extern __inline Uint64 SDL_Swap64(Uint64); +#pragma aux SDL_Swap64 = \ + "bswap eax" \ + "bswap edx" \ + "xchg eax,edx" \ + parm [eax edx] \ + modify [eax edx]; #else SDL_FORCE_INLINE Uint64 SDL_Swap64(Uint64 x) @@ -212,8 +265,7 @@ SDL_Swap64(Uint64 x) SDL_FORCE_INLINE float SDL_SwapFloat(float x) { - union - { + union { float f; Uint32 ui32; } swapper; @@ -222,6 +274,11 @@ SDL_SwapFloat(float x) return swapper.f; } +/* remove extra macros */ +#undef HAS_BROKEN_BSWAP +#undef HAS_BUILTIN_BSWAP16 +#undef HAS_BUILTIN_BSWAP32 +#undef HAS_BUILTIN_BSWAP64 /** * \name Swap to native @@ -229,22 +286,22 @@ SDL_SwapFloat(float x) */ /* @{ */ #if SDL_BYTEORDER == SDL_LIL_ENDIAN -#define SDL_SwapLE16(X) (X) -#define SDL_SwapLE32(X) (X) -#define SDL_SwapLE64(X) (X) +#define SDL_SwapLE16(X) (X) +#define SDL_SwapLE32(X) (X) +#define SDL_SwapLE64(X) (X) #define SDL_SwapFloatLE(X) (X) -#define SDL_SwapBE16(X) SDL_Swap16(X) -#define SDL_SwapBE32(X) SDL_Swap32(X) -#define SDL_SwapBE64(X) SDL_Swap64(X) +#define SDL_SwapBE16(X) SDL_Swap16(X) +#define SDL_SwapBE32(X) SDL_Swap32(X) +#define SDL_SwapBE64(X) SDL_Swap64(X) #define SDL_SwapFloatBE(X) SDL_SwapFloat(X) #else -#define SDL_SwapLE16(X) SDL_Swap16(X) -#define SDL_SwapLE32(X) SDL_Swap32(X) -#define SDL_SwapLE64(X) SDL_Swap64(X) +#define SDL_SwapLE16(X) SDL_Swap16(X) +#define SDL_SwapLE32(X) SDL_Swap32(X) +#define SDL_SwapLE64(X) SDL_Swap64(X) #define SDL_SwapFloatLE(X) SDL_SwapFloat(X) -#define SDL_SwapBE16(X) (X) -#define SDL_SwapBE32(X) (X) -#define SDL_SwapBE64(X) (X) +#define SDL_SwapBE16(X) (X) +#define SDL_SwapBE32(X) (X) +#define SDL_SwapBE64(X) (X) #define SDL_SwapFloatBE(X) (X) #endif /* @} *//* Swap to native */ diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_error.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_error.h index 24416e693..5c961e428 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_error.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_error.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -37,9 +37,96 @@ extern "C" { #endif /* Public functions */ -/* SDL_SetError() unconditionally returns -1. */ + + +/** + * Set the SDL error message for the current thread. + * + * Calling this function will replace any previous error message that was set. + * + * This function always returns -1, since SDL frequently uses -1 to signify an + * failing result, leading to this idiom: + * + * ```c + * if (error_code) { + * return SDL_SetError("This operation has failed: %d", error_code); + * } + * ``` + * + * \param fmt a printf()-style message format string + * \param ... additional parameters matching % tokens in the `fmt` string, if + * any + * \returns always -1. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ClearError + * \sa SDL_GetError + */ extern DECLSPEC int SDLCALL SDL_SetError(SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(1); + +/** + * Retrieve a message about the last error that occurred on the current + * thread. + * + * It is possible for multiple errors to occur before calling SDL_GetError(). + * Only the last error is returned. + * + * The message is only applicable when an SDL function has signaled an error. + * You must check the return values of SDL function calls to determine when to + * appropriately call SDL_GetError(). You should *not* use the results of + * SDL_GetError() to decide if an error has occurred! Sometimes SDL will set + * an error string even when reporting success. + * + * SDL will *not* clear the error string for successful API calls. You *must* + * check return values for failure cases before you can assume the error + * string applies. + * + * Error strings are set per-thread, so an error set in a different thread + * will not interfere with the current thread's operation. + * + * The returned string is internally allocated and must not be freed by the + * application. + * + * \returns a message with information about the specific error that occurred, + * or an empty string if there hasn't been an error message set since + * the last call to SDL_ClearError(). The message is only applicable + * when an SDL function has signaled an error. You must check the + * return values of SDL function calls to determine when to + * appropriately call SDL_GetError(). + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ClearError + * \sa SDL_SetError + */ extern DECLSPEC const char *SDLCALL SDL_GetError(void); + +/** + * Get the last error message that was set for the current thread. + * + * This allows the caller to copy the error string into a provided buffer, but + * otherwise operates exactly the same as SDL_GetError(). + * + * \param errstr A buffer to fill with the last error message that was set for + * the current thread + * \param maxlen The size of the buffer pointed to by the errstr parameter + * \returns the pointer passed in as the `errstr` parameter. + * + * \since This function is available since SDL 2.0.14. + * + * \sa SDL_GetError + */ +extern DECLSPEC char * SDLCALL SDL_GetErrorMsg(char *errstr, int maxlen); + +/** + * Clear any previous error message for this thread. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetError + * \sa SDL_SetError + */ extern DECLSPEC void SDLCALL SDL_ClearError(void); /** diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_events.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_events.h index 282b9fb76..3722a6311 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_events.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_events.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -50,7 +50,7 @@ extern "C" { #define SDL_PRESSED 1 /** - * \brief The types of events that can be delivered. + * The types of events that can be delivered. */ typedef enum { @@ -85,6 +85,8 @@ typedef enum Called on Android in onResume() */ + SDL_LOCALECHANGED, /**< The user's locale preferences have changed. */ + /* Display events */ SDL_DISPLAYEVENT = 0x150, /**< Display state change */ @@ -123,6 +125,10 @@ typedef enum SDL_CONTROLLERDEVICEADDED, /**< A new Game controller has been inserted into the system */ SDL_CONTROLLERDEVICEREMOVED, /**< An opened Game controller has been removed */ SDL_CONTROLLERDEVICEREMAPPED, /**< The controller mapping was updated */ + SDL_CONTROLLERTOUCHPADDOWN, /**< Game controller touchpad was touched */ + SDL_CONTROLLERTOUCHPADMOTION, /**< Game controller touchpad finger was moved */ + SDL_CONTROLLERTOUCHPADUP, /**< Game controller touchpad finger was lifted */ + SDL_CONTROLLERSENSORUPDATE, /**< Game controller sensor was updated */ /* Touch events */ SDL_FINGERDOWN = 0x700, @@ -154,6 +160,9 @@ typedef enum SDL_RENDER_TARGETS_RESET = 0x2000, /**< The render targets have been reset and their contents need to be updated */ SDL_RENDER_DEVICE_RESET, /**< The device has been reset and all textures need to be recreated */ + /* Internal events */ + SDL_POLLSENTINEL = 0x7F00, /**< Signals the end of an event poll cycle */ + /** Events ::SDL_USEREVENT through ::SDL_LASTEVENT are for your use, * and should be allocated with SDL_RegisterEvents() */ @@ -292,6 +301,8 @@ typedef struct SDL_MouseWheelEvent Sint32 x; /**< The amount scrolled horizontally, positive to the right and negative to the left */ Sint32 y; /**< The amount scrolled vertically, positive away from the user and negative toward the user */ Uint32 direction; /**< Set to one of the SDL_MOUSEWHEEL_* defines. When FLIPPED the values in X and Y will be opposite. Multiply by -1 to change them back */ + float preciseX; /**< The amount scrolled horizontally, positive to the right and negative to the left, with float precision (added in 2.0.18) */ + float preciseY; /**< The amount scrolled vertically, positive away from the user and negative toward the user, with float precision (added in 2.0.18) */ } SDL_MouseWheelEvent; /** @@ -413,6 +424,33 @@ typedef struct SDL_ControllerDeviceEvent Sint32 which; /**< The joystick device index for the ADDED event, instance id for the REMOVED or REMAPPED event */ } SDL_ControllerDeviceEvent; +/** + * \brief Game controller touchpad event structure (event.ctouchpad.*) + */ +typedef struct SDL_ControllerTouchpadEvent +{ + Uint32 type; /**< ::SDL_CONTROLLERTOUCHPADDOWN or ::SDL_CONTROLLERTOUCHPADMOTION or ::SDL_CONTROLLERTOUCHPADUP */ + Uint32 timestamp; /**< In milliseconds, populated using SDL_GetTicks() */ + SDL_JoystickID which; /**< The joystick instance id */ + Sint32 touchpad; /**< The index of the touchpad */ + Sint32 finger; /**< The index of the finger on the touchpad */ + float x; /**< Normalized in the range 0...1 with 0 being on the left */ + float y; /**< Normalized in the range 0...1 with 0 being at the top */ + float pressure; /**< Normalized in the range 0...1 */ +} SDL_ControllerTouchpadEvent; + +/** + * \brief Game controller sensor event structure (event.csensor.*) + */ +typedef struct SDL_ControllerSensorEvent +{ + Uint32 type; /**< ::SDL_CONTROLLERSENSORUPDATE */ + Uint32 timestamp; /**< In milliseconds, populated using SDL_GetTicks() */ + SDL_JoystickID which; /**< The joystick instance id */ + Sint32 sensor; /**< The type of the sensor, one of the values of ::SDL_SensorType */ + float data[3]; /**< Up to 3 values from the sensor, as defined in SDL_sensor.h */ +} SDL_ControllerSensorEvent; + /** * \brief Audio device event structure (event.adevice.*) */ @@ -442,6 +480,7 @@ typedef struct SDL_TouchFingerEvent float dx; /**< Normalized in the range -1...1 */ float dy; /**< Normalized in the range -1...1 */ float pressure; /**< Normalized in the range 0...1 */ + Uint32 windowID; /**< The window underneath the finger, if any */ } SDL_TouchFingerEvent; @@ -556,56 +595,79 @@ typedef struct SDL_SysWMEvent */ typedef union SDL_Event { - Uint32 type; /**< Event type, shared with all events */ - SDL_CommonEvent common; /**< Common event data */ - SDL_DisplayEvent display; /**< Window event data */ - SDL_WindowEvent window; /**< Window event data */ - SDL_KeyboardEvent key; /**< Keyboard event data */ - SDL_TextEditingEvent edit; /**< Text editing event data */ - SDL_TextInputEvent text; /**< Text input event data */ - SDL_MouseMotionEvent motion; /**< Mouse motion event data */ - SDL_MouseButtonEvent button; /**< Mouse button event data */ - SDL_MouseWheelEvent wheel; /**< Mouse wheel event data */ - SDL_JoyAxisEvent jaxis; /**< Joystick axis event data */ - SDL_JoyBallEvent jball; /**< Joystick ball event data */ - SDL_JoyHatEvent jhat; /**< Joystick hat event data */ - SDL_JoyButtonEvent jbutton; /**< Joystick button event data */ - SDL_JoyDeviceEvent jdevice; /**< Joystick device change event data */ - SDL_ControllerAxisEvent caxis; /**< Game Controller axis event data */ - SDL_ControllerButtonEvent cbutton; /**< Game Controller button event data */ - SDL_ControllerDeviceEvent cdevice; /**< Game Controller device event data */ - SDL_AudioDeviceEvent adevice; /**< Audio device event data */ - SDL_SensorEvent sensor; /**< Sensor event data */ - SDL_QuitEvent quit; /**< Quit request event data */ - SDL_UserEvent user; /**< Custom event data */ - SDL_SysWMEvent syswm; /**< System dependent window event data */ - SDL_TouchFingerEvent tfinger; /**< Touch finger event data */ - SDL_MultiGestureEvent mgesture; /**< Gesture event data */ - SDL_DollarGestureEvent dgesture; /**< Gesture event data */ - SDL_DropEvent drop; /**< Drag and drop event data */ + Uint32 type; /**< Event type, shared with all events */ + SDL_CommonEvent common; /**< Common event data */ + SDL_DisplayEvent display; /**< Display event data */ + SDL_WindowEvent window; /**< Window event data */ + SDL_KeyboardEvent key; /**< Keyboard event data */ + SDL_TextEditingEvent edit; /**< Text editing event data */ + SDL_TextInputEvent text; /**< Text input event data */ + SDL_MouseMotionEvent motion; /**< Mouse motion event data */ + SDL_MouseButtonEvent button; /**< Mouse button event data */ + SDL_MouseWheelEvent wheel; /**< Mouse wheel event data */ + SDL_JoyAxisEvent jaxis; /**< Joystick axis event data */ + SDL_JoyBallEvent jball; /**< Joystick ball event data */ + SDL_JoyHatEvent jhat; /**< Joystick hat event data */ + SDL_JoyButtonEvent jbutton; /**< Joystick button event data */ + SDL_JoyDeviceEvent jdevice; /**< Joystick device change event data */ + SDL_ControllerAxisEvent caxis; /**< Game Controller axis event data */ + SDL_ControllerButtonEvent cbutton; /**< Game Controller button event data */ + SDL_ControllerDeviceEvent cdevice; /**< Game Controller device event data */ + SDL_ControllerTouchpadEvent ctouchpad; /**< Game Controller touchpad event data */ + SDL_ControllerSensorEvent csensor; /**< Game Controller sensor event data */ + SDL_AudioDeviceEvent adevice; /**< Audio device event data */ + SDL_SensorEvent sensor; /**< Sensor event data */ + SDL_QuitEvent quit; /**< Quit request event data */ + SDL_UserEvent user; /**< Custom event data */ + SDL_SysWMEvent syswm; /**< System dependent window event data */ + SDL_TouchFingerEvent tfinger; /**< Touch finger event data */ + SDL_MultiGestureEvent mgesture; /**< Gesture event data */ + SDL_DollarGestureEvent dgesture; /**< Gesture event data */ + SDL_DropEvent drop; /**< Drag and drop event data */ - /* This is necessary for ABI compatibility between Visual C++ and GCC - Visual C++ will respect the push pack pragma and use 52 bytes for - this structure, and GCC will use the alignment of the largest datatype - within the union, which is 8 bytes. + /* This is necessary for ABI compatibility between Visual C++ and GCC. + Visual C++ will respect the push pack pragma and use 52 bytes (size of + SDL_TextEditingEvent, the largest structure for 32-bit and 64-bit + architectures) for this union, and GCC will use the alignment of the + largest datatype within the union, which is 8 bytes on 64-bit + architectures. So... we'll add padding to force the size to be 56 bytes for both. + + On architectures where pointers are 16 bytes, this needs rounding up to + the next multiple of 16, 64, and on architectures where pointers are + even larger the size of SDL_UserEvent will dominate as being 3 pointers. */ - Uint8 padding[56]; + Uint8 padding[sizeof(void *) <= 8 ? 56 : sizeof(void *) == 16 ? 64 : 3 * sizeof(void *)]; } SDL_Event; /* Make sure we haven't broken binary compatibility */ -SDL_COMPILE_TIME_ASSERT(SDL_Event, sizeof(SDL_Event) == 56); +SDL_COMPILE_TIME_ASSERT(SDL_Event, sizeof(SDL_Event) == sizeof(((SDL_Event *)NULL)->padding)); /* Function prototypes */ /** - * Pumps the event loop, gathering events from the input devices. + * Pump the event loop, gathering events from the input devices. * - * This function updates the event queue and internal input device state. + * This function updates the event queue and internal input device state. * - * This should only be run in the thread that sets the video mode. + * **WARNING**: This should only be run in the thread that initialized the + * video subsystem, and for extra safety, you should consider only doing those + * things on the main thread in any case. + * + * SDL_PumpEvents() gathers all the pending input information from devices and + * places it in the event queue. Without calls to SDL_PumpEvents() no events + * would ever be placed on the queue. Often the need for calls to + * SDL_PumpEvents() is hidden from the user since SDL_PollEvent() and + * SDL_WaitEvent() implicitly call SDL_PumpEvents(). However, if you are not + * polling or waiting for events (e.g. you are filtering them), then you must + * call SDL_PumpEvents() to force an event queue update. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_PollEvent + * \sa SDL_WaitEvent */ extern DECLSPEC void SDLCALL SDL_PumpEvents(void); @@ -618,22 +680,42 @@ typedef enum } SDL_eventaction; /** - * Checks the event queue for messages and optionally returns them. + * Check the event queue for messages and optionally return them. * - * If \c action is ::SDL_ADDEVENT, up to \c numevents events will be added to - * the back of the event queue. + * `action` may be any of the following: * - * If \c action is ::SDL_PEEKEVENT, up to \c numevents events at the front - * of the event queue, within the specified minimum and maximum type, - * will be returned and will not be removed from the queue. + * - `SDL_ADDEVENT`: up to `numevents` events will be added to the back of the + * event queue. + * - `SDL_PEEKEVENT`: `numevents` events at the front of the event queue, + * within the specified minimum and maximum type, will be returned to the + * caller and will _not_ be removed from the queue. + * - `SDL_GETEVENT`: up to `numevents` events at the front of the event queue, + * within the specified minimum and maximum type, will be returned to the + * caller and will be removed from the queue. * - * If \c action is ::SDL_GETEVENT, up to \c numevents events at the front - * of the event queue, within the specified minimum and maximum type, - * will be returned and will be removed from the queue. + * You may have to call SDL_PumpEvents() before calling this function. + * Otherwise, the events may not be ready to be filtered when you call + * SDL_PeepEvents(). * - * \return The number of events actually stored, or -1 if there was an error. + * This function is thread-safe. * - * This function is thread-safe. + * \param events destination buffer for the retrieved events + * \param numevents if action is SDL_ADDEVENT, the number of events to add + * back to the event queue; if action is SDL_PEEKEVENT or + * SDL_GETEVENT, the maximum number of events to retrieve + * \param action action to take; see [[#action|Remarks]] for details + * \param minType minimum value of the event type to be considered; + * SDL_FIRSTEVENT is a safe choice + * \param maxType maximum value of the event type to be considered; + * SDL_LASTEVENT is a safe choice + * \returns the number of events actually stored or a negative error code on + * failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_PollEvent + * \sa SDL_PumpEvents + * \sa SDL_PushEvent */ extern DECLSPEC int SDLCALL SDL_PeepEvents(SDL_Event * events, int numevents, SDL_eventaction action, @@ -641,113 +723,354 @@ extern DECLSPEC int SDLCALL SDL_PeepEvents(SDL_Event * events, int numevents, /* @} */ /** - * Checks to see if certain event types are in the event queue. + * Check for the existence of a certain event type in the event queue. + * + * If you need to check for a range of event types, use SDL_HasEvents() + * instead. + * + * \param type the type of event to be queried; see SDL_EventType for details + * \returns SDL_TRUE if events matching `type` are present, or SDL_FALSE if + * events matching `type` are not present. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HasEvents */ extern DECLSPEC SDL_bool SDLCALL SDL_HasEvent(Uint32 type); + + +/** + * Check for the existence of certain event types in the event queue. + * + * If you need to check for a single event type, use SDL_HasEvent() instead. + * + * \param minType the low end of event type to be queried, inclusive; see + * SDL_EventType for details + * \param maxType the high end of event type to be queried, inclusive; see + * SDL_EventType for details + * \returns SDL_TRUE if events with type >= `minType` and <= `maxType` are + * present, or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HasEvents + */ extern DECLSPEC SDL_bool SDLCALL SDL_HasEvents(Uint32 minType, Uint32 maxType); /** - * This function clears events from the event queue - * This function only affects currently queued events. If you want to make - * sure that all pending OS events are flushed, you can call SDL_PumpEvents() - * on the main thread immediately before the flush call. + * Clear events of a specific type from the event queue. + * + * This will unconditionally remove any events from the queue that match + * `type`. If you need to remove a range of event types, use SDL_FlushEvents() + * instead. + * + * It's also normal to just ignore events you don't care about in your event + * loop without calling this function. + * + * This function only affects currently queued events. If you want to make + * sure that all pending OS events are flushed, you can call SDL_PumpEvents() + * on the main thread immediately before the flush call. + * + * \param type the type of event to be cleared; see SDL_EventType for details + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_FlushEvents */ extern DECLSPEC void SDLCALL SDL_FlushEvent(Uint32 type); + +/** + * Clear events of a range of types from the event queue. + * + * This will unconditionally remove any events from the queue that are in the + * range of `minType` to `maxType`, inclusive. If you need to remove a single + * event type, use SDL_FlushEvent() instead. + * + * It's also normal to just ignore events you don't care about in your event + * loop without calling this function. + * + * This function only affects currently queued events. If you want to make + * sure that all pending OS events are flushed, you can call SDL_PumpEvents() + * on the main thread immediately before the flush call. + * + * \param minType the low end of event type to be cleared, inclusive; see + * SDL_EventType for details + * \param maxType the high end of event type to be cleared, inclusive; see + * SDL_EventType for details + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_FlushEvent + */ extern DECLSPEC void SDLCALL SDL_FlushEvents(Uint32 minType, Uint32 maxType); /** - * \brief Polls for currently pending events. + * Poll for currently pending events. * - * \return 1 if there are any pending events, or 0 if there are none available. + * If `event` is not NULL, the next event is removed from the queue and stored + * in the SDL_Event structure pointed to by `event`. The 1 returned refers to + * this event, immediately stored in the SDL Event structure -- not an event + * to follow. * - * \param event If not NULL, the next event is removed from the queue and - * stored in that area. + * If `event` is NULL, it simply returns 1 if there is an event in the queue, + * but will not remove it from the queue. + * + * As this function may implicitly call SDL_PumpEvents(), you can only call + * this function in the thread that set the video mode. + * + * SDL_PollEvent() is the favored way of receiving system events since it can + * be done from the main loop and does not suspend the main loop while waiting + * on an event to be posted. + * + * The common practice is to fully process the event queue once every frame, + * usually as a first step before updating the game's state: + * + * ```c + * while (game_is_still_running) { + * SDL_Event event; + * while (SDL_PollEvent(&event)) { // poll until all events are handled! + * // decide what to do with this event. + * } + * + * // update game state, draw the current frame + * } + * ``` + * + * \param event the SDL_Event structure to be filled with the next event from + * the queue, or NULL + * \returns 1 if there is a pending event or 0 if there are none available. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetEventFilter + * \sa SDL_PeepEvents + * \sa SDL_PushEvent + * \sa SDL_SetEventFilter + * \sa SDL_WaitEvent + * \sa SDL_WaitEventTimeout */ extern DECLSPEC int SDLCALL SDL_PollEvent(SDL_Event * event); /** - * \brief Waits indefinitely for the next available event. + * Wait indefinitely for the next available event. * - * \return 1, or 0 if there was an error while waiting for events. + * If `event` is not NULL, the next event is removed from the queue and stored + * in the SDL_Event structure pointed to by `event`. * - * \param event If not NULL, the next event is removed from the queue and - * stored in that area. + * As this function may implicitly call SDL_PumpEvents(), you can only call + * this function in the thread that initialized the video subsystem. + * + * \param event the SDL_Event structure to be filled in with the next event + * from the queue, or NULL + * \returns 1 on success or 0 if there was an error while waiting for events; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_PollEvent + * \sa SDL_PumpEvents + * \sa SDL_WaitEventTimeout */ extern DECLSPEC int SDLCALL SDL_WaitEvent(SDL_Event * event); /** - * \brief Waits until the specified timeout (in milliseconds) for the next - * available event. + * Wait until the specified timeout (in milliseconds) for the next available + * event. * - * \return 1, or 0 if there was an error while waiting for events. + * If `event` is not NULL, the next event is removed from the queue and stored + * in the SDL_Event structure pointed to by `event`. * - * \param event If not NULL, the next event is removed from the queue and - * stored in that area. - * \param timeout The timeout (in milliseconds) to wait for next event. + * As this function may implicitly call SDL_PumpEvents(), you can only call + * this function in the thread that initialized the video subsystem. + * + * \param event the SDL_Event structure to be filled in with the next event + * from the queue, or NULL + * \param timeout the maximum number of milliseconds to wait for the next + * available event + * \returns 1 on success or 0 if there was an error while waiting for events; + * call SDL_GetError() for more information. This also returns 0 if + * the timeout elapsed without an event arriving. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_PollEvent + * \sa SDL_PumpEvents + * \sa SDL_WaitEvent */ extern DECLSPEC int SDLCALL SDL_WaitEventTimeout(SDL_Event * event, int timeout); /** - * \brief Add an event to the event queue. + * Add an event to the event queue. * - * \return 1 on success, 0 if the event was filtered, or -1 if the event queue - * was full or there was some other error. + * The event queue can actually be used as a two way communication channel. + * Not only can events be read from the queue, but the user can also push + * their own events onto it. `event` is a pointer to the event structure you + * wish to push onto the queue. The event is copied into the queue, and the + * caller may dispose of the memory pointed to after SDL_PushEvent() returns. + * + * Note: Pushing device input events onto the queue doesn't modify the state + * of the device within SDL. + * + * This function is thread-safe, and can be called from other threads safely. + * + * Note: Events pushed onto the queue with SDL_PushEvent() get passed through + * the event filter but events added with SDL_PeepEvents() do not. + * + * For pushing application-specific events, please use SDL_RegisterEvents() to + * get an event type that does not conflict with other code that also wants + * its own custom event types. + * + * \param event the SDL_Event to be added to the queue + * \returns 1 on success, 0 if the event was filtered, or a negative error + * code on failure; call SDL_GetError() for more information. A + * common reason for error is the event queue being full. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_PeepEvents + * \sa SDL_PollEvent + * \sa SDL_RegisterEvents */ extern DECLSPEC int SDLCALL SDL_PushEvent(SDL_Event * event); +/** + * A function pointer used for callbacks that watch the event queue. + * + * \param userdata what was passed as `userdata` to SDL_SetEventFilter() + * or SDL_AddEventWatch, etc + * \param event the event that triggered the callback + * \returns 1 to permit event to be added to the queue, and 0 to disallow + * it. When used with SDL_AddEventWatch, the return value is ignored. + * + * \sa SDL_SetEventFilter + * \sa SDL_AddEventWatch + */ typedef int (SDLCALL * SDL_EventFilter) (void *userdata, SDL_Event * event); /** - * Sets up a filter to process all events before they change internal state and - * are posted to the internal event queue. + * Set up a filter to process all events before they change internal state and + * are posted to the internal event queue. * - * The filter is prototyped as: - * \code - * int SDL_EventFilter(void *userdata, SDL_Event * event); - * \endcode + * If the filter function returns 1 when called, then the event will be added + * to the internal queue. If it returns 0, then the event will be dropped from + * the queue, but the internal state will still be updated. This allows + * selective filtering of dynamically arriving events. * - * If the filter returns 1, then the event will be added to the internal queue. - * If it returns 0, then the event will be dropped from the queue, but the - * internal state will still be updated. This allows selective filtering of - * dynamically arriving events. + * **WARNING**: Be very careful of what you do in the event filter function, + * as it may run in a different thread! * - * \warning Be very careful of what you do in the event filter function, as - * it may run in a different thread! + * On platforms that support it, if the quit event is generated by an + * interrupt signal (e.g. pressing Ctrl-C), it will be delivered to the + * application at the next event poll. * - * There is one caveat when dealing with the ::SDL_QuitEvent event type. The - * event filter is only called when the window manager desires to close the - * application window. If the event filter returns 1, then the window will - * be closed, otherwise the window will remain open if possible. + * There is one caveat when dealing with the ::SDL_QuitEvent event type. The + * event filter is only called when the window manager desires to close the + * application window. If the event filter returns 1, then the window will be + * closed, otherwise the window will remain open if possible. * - * If the quit event is generated by an interrupt signal, it will bypass the - * internal queue and be delivered to the application at the next event poll. + * Note: Disabled events never make it to the event filter function; see + * SDL_EventState(). + * + * Note: If you just want to inspect events without filtering, you should use + * SDL_AddEventWatch() instead. + * + * Note: Events pushed onto the queue with SDL_PushEvent() get passed through + * the event filter, but events pushed onto the queue with SDL_PeepEvents() do + * not. + * + * \param filter An SDL_EventFilter function to call when an event happens + * \param userdata a pointer that is passed to `filter` + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AddEventWatch + * \sa SDL_EventState + * \sa SDL_GetEventFilter + * \sa SDL_PeepEvents + * \sa SDL_PushEvent */ extern DECLSPEC void SDLCALL SDL_SetEventFilter(SDL_EventFilter filter, void *userdata); /** - * Return the current event filter - can be used to "chain" filters. - * If there is no event filter set, this function returns SDL_FALSE. + * Query the current event filter. + * + * This function can be used to "chain" filters, by saving the existing filter + * before replacing it with a function that will call that saved filter. + * + * \param filter the current callback function will be stored here + * \param userdata the pointer that is passed to the current event filter will + * be stored here + * \returns SDL_TRUE on success or SDL_FALSE if there is no event filter set. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetEventFilter */ extern DECLSPEC SDL_bool SDLCALL SDL_GetEventFilter(SDL_EventFilter * filter, void **userdata); /** - * Add a function which is called when an event is added to the queue. + * Add a callback to be triggered when an event is added to the event queue. + * + * `filter` will be called when an event happens, and its return value is + * ignored. + * + * **WARNING**: Be very careful of what you do in the event filter function, + * as it may run in a different thread! + * + * If the quit event is generated by a signal (e.g. SIGINT), it will bypass + * the internal queue and be delivered to the watch callback immediately, and + * arrive at the next event poll. + * + * Note: the callback is called for events posted by the user through + * SDL_PushEvent(), but not for disabled events, nor for events by a filter + * callback set with SDL_SetEventFilter(), nor for events posted by the user + * through SDL_PeepEvents(). + * + * \param filter an SDL_EventFilter function to call when an event happens. + * \param userdata a pointer that is passed to `filter` + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_DelEventWatch + * \sa SDL_SetEventFilter */ extern DECLSPEC void SDLCALL SDL_AddEventWatch(SDL_EventFilter filter, void *userdata); /** - * Remove an event watch function added with SDL_AddEventWatch() + * Remove an event watch callback added with SDL_AddEventWatch(). + * + * This function takes the same input as SDL_AddEventWatch() to identify and + * delete the corresponding callback. + * + * \param filter the function originally passed to SDL_AddEventWatch() + * \param userdata the pointer originally passed to SDL_AddEventWatch() + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AddEventWatch */ extern DECLSPEC void SDLCALL SDL_DelEventWatch(SDL_EventFilter filter, void *userdata); /** - * Run the filter function on the current event queue, removing any - * events for which the filter returns 0. + * Run a specific filter function on the current event queue, removing any + * events for which the filter returns 0. + * + * See SDL_SetEventFilter() for more information. Unlike SDL_SetEventFilter(), + * this function does not change the filter permanently, it only uses the + * supplied filter until this function returns. + * + * \param filter the SDL_EventFilter function to call when an event happens + * \param userdata a pointer that is passed to `filter` + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetEventFilter + * \sa SDL_SetEventFilter */ extern DECLSPEC void SDLCALL SDL_FilterEvents(SDL_EventFilter filter, void *userdata); @@ -759,24 +1082,45 @@ extern DECLSPEC void SDLCALL SDL_FilterEvents(SDL_EventFilter filter, #define SDL_ENABLE 1 /** - * This function allows you to set the state of processing certain events. - * - If \c state is set to ::SDL_IGNORE, that event will be automatically - * dropped from the event queue and will not be filtered. - * - If \c state is set to ::SDL_ENABLE, that event will be processed - * normally. - * - If \c state is set to ::SDL_QUERY, SDL_EventState() will return the - * current processing state of the specified event. + * Set the state of processing events by type. + * + * `state` may be any of the following: + * + * - `SDL_QUERY`: returns the current processing state of the specified event + * - `SDL_IGNORE` (aka `SDL_DISABLE`): the event will automatically be dropped + * from the event queue and will not be filtered + * - `SDL_ENABLE`: the event will be processed normally + * + * \param type the type of event; see SDL_EventType for details + * \param state how to process the event + * \returns `SDL_DISABLE` or `SDL_ENABLE`, representing the processing state + * of the event before this function makes any changes to it. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetEventState */ extern DECLSPEC Uint8 SDLCALL SDL_EventState(Uint32 type, int state); /* @} */ #define SDL_GetEventState(type) SDL_EventState(type, SDL_QUERY) /** - * This function allocates a set of user-defined events, and returns - * the beginning event number for that set of events. + * Allocate a set of user-defined events, and return the beginning event + * number for that set of events. * - * If there aren't enough user-defined events left, this function - * returns (Uint32)-1 + * Calling this function with `numevents` <= 0 is an error and will return + * (Uint32)-1. + * + * Note, (Uint32)-1 means the maximum unsigned 32-bit integer value (or + * 0xFFFFFFFF), but is clearer to write. + * + * \param numevents the number of events to be allocated + * \returns the beginning event number, or (Uint32)-1 if there are not enough + * user-defined events left. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_PushEvent */ extern DECLSPEC Uint32 SDLCALL SDL_RegisterEvents(int numevents); diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_filesystem.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_filesystem.h index 6d97e5896..16f02e287 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_filesystem.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_filesystem.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -38,88 +38,97 @@ extern "C" { #endif /** - * \brief Get the path where the application resides. + * Get the directory where the application was run from. * - * Get the "base path". This is the directory where the application was run - * from, which is probably the installation directory, and may or may not - * be the process's current working directory. + * This is not necessarily a fast call, so you should call this once near + * startup and save the string if you need it. * - * This returns an absolute path in UTF-8 encoding, and is guaranteed to - * end with a path separator ('\\' on Windows, '/' most other places). + * **Mac OS X and iOS Specific Functionality**: If the application is in a + * ".app" bundle, this function returns the Resource directory (e.g. + * MyApp.app/Contents/Resources/). This behaviour can be overridden by adding + * a property to the Info.plist file. Adding a string key with the name + * SDL_FILESYSTEM_BASE_DIR_TYPE with a supported value will change the + * behaviour. * - * The pointer returned by this function is owned by you. Please call - * SDL_free() on the pointer when you are done with it, or it will be a - * memory leak. This is not necessarily a fast call, though, so you should - * call this once near startup and save the string if you need it. + * Supported values for the SDL_FILESYSTEM_BASE_DIR_TYPE property (Given an + * application in /Applications/SDLApp/MyApp.app): * - * Some platforms can't determine the application's path, and on other - * platforms, this might be meaningless. In such cases, this function will - * return NULL. + * - `resource`: bundle resource directory (the default). For example: + * `/Applications/SDLApp/MyApp.app/Contents/Resources` + * - `bundle`: the Bundle directory. For example: + * `/Applications/SDLApp/MyApp.app/` + * - `parent`: the containing directory of the bundle. For example: + * `/Applications/SDLApp/` * - * \return String of base dir in UTF-8 encoding, or NULL on error. + * The returned path is guaranteed to end with a path separator ('\' on + * Windows, '/' on most other platforms). + * + * The pointer returned is owned by the caller. Please call SDL_free() on the + * pointer when done with it. + * + * \returns an absolute path in UTF-8 encoding to the application data + * directory. NULL will be returned on error or when the platform + * doesn't implement this functionality, call SDL_GetError() for more + * information. + * + * \since This function is available since SDL 2.0.1. * * \sa SDL_GetPrefPath */ extern DECLSPEC char *SDLCALL SDL_GetBasePath(void); /** - * \brief Get the user-and-app-specific path where files can be written. + * Get the user-and-app-specific path where files can be written. * * Get the "pref dir". This is meant to be where users can write personal - * files (preferences and save games, etc) that are specific to your - * application. This directory is unique per user, per application. + * files (preferences and save games, etc) that are specific to your + * application. This directory is unique per user, per application. * - * This function will decide the appropriate location in the native filesystem, - * create the directory if necessary, and return a string of the absolute - * path to the directory in UTF-8 encoding. + * This function will decide the appropriate location in the native + * filesystem, create the directory if necessary, and return a string of the + * absolute path to the directory in UTF-8 encoding. * * On Windows, the string might look like: - * "C:\\Users\\bob\\AppData\\Roaming\\My Company\\My Program Name\\" * - * On Linux, the string might look like: - * "/home/bob/.local/share/My Program Name/" + * `C:\\Users\\bob\\AppData\\Roaming\\My Company\\My Program Name\\` + * + * On Linux, the string might look like" + * + * `/home/bob/.local/share/My Program Name/` * * On Mac OS X, the string might look like: - * "/Users/bob/Library/Application Support/My Program Name/" * - * (etc.) + * `/Users/bob/Library/Application Support/My Program Name/` * - * You specify the name of your organization (if it's not a real organization, - * your name or an Internet domain you own might do) and the name of your - * application. These should be untranslated proper names. + * You should assume the path returned by this function is the only safe place + * to write files (and that SDL_GetBasePath(), while it might be writable, or + * even the parent of the returned path, isn't where you should be writing + * things). * - * Both the org and app strings may become part of a directory name, so - * please follow these rules: + * Both the org and app strings may become part of a directory name, so please + * follow these rules: * - * - Try to use the same org string (including case-sensitivity) for - * all your applications that use this function. - * - Always use a unique app string for each one, and make sure it never - * changes for an app once you've decided on it. - * - Unicode characters are legal, as long as it's UTF-8 encoded, but... - * - ...only use letters, numbers, and spaces. Avoid punctuation like - * "Game Name 2: Bad Guy's Revenge!" ... "Game Name 2" is sufficient. + * - Try to use the same org string (_including case-sensitivity_) for all + * your applications that use this function. + * - Always use a unique app string for each one, and make sure it never + * changes for an app once you've decided on it. + * - Unicode characters are legal, as long as it's UTF-8 encoded, but... + * - ...only use letters, numbers, and spaces. Avoid punctuation like "Game + * Name 2: Bad Guy's Revenge!" ... "Game Name 2" is sufficient. * - * This returns an absolute path in UTF-8 encoding, and is guaranteed to - * end with a path separator ('\\' on Windows, '/' most other places). + * The returned path is guaranteed to end with a path separator ('\' on + * Windows, '/' on most other platforms). * - * The pointer returned by this function is owned by you. Please call - * SDL_free() on the pointer when you are done with it, or it will be a - * memory leak. This is not necessarily a fast call, though, so you should - * call this once near startup and save the string if you need it. + * The pointer returned is owned by the caller. Please call SDL_free() on the + * pointer when done with it. * - * You should assume the path returned by this function is the only safe - * place to write files (and that SDL_GetBasePath(), while it might be - * writable, or even the parent of the returned path, aren't where you - * should be writing things). + * \param org the name of your organization + * \param app the name of your application + * \returns a UTF-8 string of the user directory in platform-dependent + * notation. NULL if there's a problem (creating directory failed, + * etc.). * - * Some platforms can't determine the pref path, and on other - * platforms, this might be meaningless. In such cases, this function will - * return NULL. - * - * \param org The name of your organization. - * \param app The name of your application. - * \return UTF-8 string of user dir in platform-dependent notation. NULL - * if there's a problem (creating directory failed, etc). + * \since This function is available since SDL 2.0.1. * * \sa SDL_GetBasePath */ diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_gamecontroller.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_gamecontroller.h index ebde38715..bdd9b8993 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_gamecontroller.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_gamecontroller.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -31,6 +31,7 @@ #include "SDL_stdinc.h" #include "SDL_error.h" #include "SDL_rwops.h" +#include "SDL_sensor.h" #include "SDL_joystick.h" #include "begin_code.h" @@ -57,6 +58,19 @@ extern "C" { struct _SDL_GameController; typedef struct _SDL_GameController SDL_GameController; +typedef enum +{ + SDL_CONTROLLER_TYPE_UNKNOWN = 0, + SDL_CONTROLLER_TYPE_XBOX360, + SDL_CONTROLLER_TYPE_XBOXONE, + SDL_CONTROLLER_TYPE_PS3, + SDL_CONTROLLER_TYPE_PS4, + SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_PRO, + SDL_CONTROLLER_TYPE_VIRTUAL, + SDL_CONTROLLER_TYPE_PS5, + SDL_CONTROLLER_TYPE_AMAZON_LUNA, + SDL_CONTROLLER_TYPE_GOOGLE_STADIA +} SDL_GameControllerType; typedef enum { @@ -87,6 +101,8 @@ typedef struct SDL_GameControllerButtonBind /** * To count the number of game controllers in the system for the following: + * + * ```c * int nJoysticks = SDL_NumJoysticks(); * int nGameControllers = 0; * for (int i = 0; i < nJoysticks; i++) { @@ -94,6 +110,7 @@ typedef struct SDL_GameControllerButtonBind * nGameControllers++; * } * } + * ``` * * Using the SDL_HINT_GAMECONTROLLERCONFIG hint or the SDL_GameControllerAddMapping() you can add support for controllers SDL is unaware of or cause an existing controller to have a different binding. The format is: * guid,name,mappings @@ -107,17 +124,39 @@ typedef struct SDL_GameControllerButtonBind * Buttons can be used as a controller axis and vice versa. * * This string shows an example of a valid mapping for a controller - * "03000000341a00003608000000000000,PS3 Controller,a:b1,b:b2,y:b3,x:b0,start:b9,guide:b12,back:b8,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftshoulder:b4,rightshoulder:b5,leftstick:b10,rightstick:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7", * + * ```c + * "03000000341a00003608000000000000,PS3 Controller,a:b1,b:b2,y:b3,x:b0,start:b9,guide:b12,back:b8,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftshoulder:b4,rightshoulder:b5,leftstick:b10,rightstick:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7", + * ``` */ /** - * Load a set of mappings from a seekable SDL data stream (memory or file), filtered by the current SDL_GetPlatform() - * A community sourced database of controllers is available at https://raw.github.com/gabomdq/SDL_GameControllerDB/master/gamecontrollerdb.txt + * Load a set of Game Controller mappings from a seekable SDL data stream. * - * If \c freerw is non-zero, the stream will be closed after being read. - * - * \return number of mappings added, -1 on error + * You can call this function several times, if needed, to load different + * database files. + * + * If a new mapping is loaded for an already known controller GUID, the later + * version will overwrite the one currently loaded. + * + * Mappings not belonging to the current platform or with no platform field + * specified will be ignored (i.e. mappings for Linux will be ignored in + * Windows, etc). + * + * This function will load the text database entirely in memory before + * processing it, so take this into consideration if you are in a memory + * constrained environment. + * + * \param rw the data stream for the mappings to be added + * \param freerw non-zero to close the stream after being read + * \returns the number of mappings added or -1 on error; call SDL_GetError() + * for more information. + * + * \since This function is available since SDL 2.0.2. + * + * \sa SDL_GameControllerAddMapping + * \sa SDL_GameControllerAddMappingsFromFile + * \sa SDL_GameControllerMappingForGUID */ extern DECLSPEC int SDLCALL SDL_GameControllerAddMappingsFromRW(SDL_RWops * rw, int freerw); @@ -129,133 +168,372 @@ extern DECLSPEC int SDLCALL SDL_GameControllerAddMappingsFromRW(SDL_RWops * rw, #define SDL_GameControllerAddMappingsFromFile(file) SDL_GameControllerAddMappingsFromRW(SDL_RWFromFile(file, "rb"), 1) /** - * Add or update an existing mapping configuration + * Add support for controllers that SDL is unaware of or to cause an existing + * controller to have a different binding. * - * \return 1 if mapping is added, 0 if updated, -1 on error + * The mapping string has the format "GUID,name,mapping", where GUID is the + * string value from SDL_JoystickGetGUIDString(), name is the human readable + * string for the device and mappings are controller mappings to joystick + * ones. Under Windows there is a reserved GUID of "xinput" that covers all + * XInput devices. The mapping format for joystick is: {| |bX |a joystick + * button, index X |- |hX.Y |hat X with value Y |- |aX |axis X of the joystick + * |} Buttons can be used as a controller axes and vice versa. + * + * This string shows an example of a valid mapping for a controller: + * + * ```c + * "341a3608000000000000504944564944,Afterglow PS3 Controller,a:b1,b:b2,y:b3,x:b0,start:b9,guide:b12,back:b8,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftshoulder:b4,rightshoulder:b5,leftstick:b10,rightstick:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7" + * ``` + * + * \param mappingString the mapping string + * \returns 1 if a new mapping is added, 0 if an existing mapping is updated, + * -1 on error; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerMapping + * \sa SDL_GameControllerMappingForGUID */ extern DECLSPEC int SDLCALL SDL_GameControllerAddMapping(const char* mappingString); /** - * Get the number of mappings installed + * Get the number of mappings installed. * - * \return the number of mappings + * \returns the number of mappings. + * + * \since This function is available since SDL 2.0.6. */ extern DECLSPEC int SDLCALL SDL_GameControllerNumMappings(void); /** - * Get the mapping at a particular index. + * Get the mapping at a particular index. * - * \return the mapping string. Must be freed with SDL_free(). Returns NULL if the index is out of range. + * \returns the mapping string. Must be freed with SDL_free(). Returns NULL if + * the index is out of range. + * + * \since This function is available since SDL 2.0.6. */ extern DECLSPEC char * SDLCALL SDL_GameControllerMappingForIndex(int mapping_index); /** - * Get a mapping string for a GUID + * Get the game controller mapping string for a given GUID. * - * \return the mapping string. Must be freed with SDL_free(). Returns NULL if no mapping is available + * The returned string must be freed with SDL_free(). + * + * \param guid a structure containing the GUID for which a mapping is desired + * \returns a mapping string or NULL on error; call SDL_GetError() for more + * information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickGetDeviceGUID + * \sa SDL_JoystickGetGUID */ extern DECLSPEC char * SDLCALL SDL_GameControllerMappingForGUID(SDL_JoystickGUID guid); /** - * Get a mapping string for an open GameController + * Get the current mapping of a Game Controller. * - * \return the mapping string. Must be freed with SDL_free(). Returns NULL if no mapping is available + * The returned string must be freed with SDL_free(). + * + * Details about mappings are discussed with SDL_GameControllerAddMapping(). + * + * \param gamecontroller the game controller you want to get the current + * mapping for + * \returns a string that has the controller's mapping or NULL if no mapping + * is available; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerAddMapping + * \sa SDL_GameControllerMappingForGUID */ -extern DECLSPEC char * SDLCALL SDL_GameControllerMapping(SDL_GameController * gamecontroller); +extern DECLSPEC char * SDLCALL SDL_GameControllerMapping(SDL_GameController *gamecontroller); /** - * Is the joystick on this index supported by the game controller interface? + * Check if the given joystick is supported by the game controller interface. + * + * `joystick_index` is the same as the `device_index` passed to + * SDL_JoystickOpen(). + * + * \param joystick_index the device_index of a device, up to + * SDL_NumJoysticks() + * \returns SDL_TRUE if the given joystick is supported by the game controller + * interface, SDL_FALSE if it isn't or it's an invalid index. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerNameForIndex + * \sa SDL_GameControllerOpen */ extern DECLSPEC SDL_bool SDLCALL SDL_IsGameController(int joystick_index); /** - * Get the implementation dependent name of a game controller. - * This can be called before any controllers are opened. - * If no name can be found, this function returns NULL. + * Get the implementation dependent name for the game controller. + * + * This function can be called before any controllers are opened. + * + * `joystick_index` is the same as the `device_index` passed to + * SDL_JoystickOpen(). + * + * \param joystick_index the device_index of a device, from zero to + * SDL_NumJoysticks()-1 + * \returns the implementation-dependent name for the game controller, or NULL + * if there is no name or the index is invalid. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerName + * \sa SDL_GameControllerOpen + * \sa SDL_IsGameController */ extern DECLSPEC const char *SDLCALL SDL_GameControllerNameForIndex(int joystick_index); /** - * Get the mapping of a game controller. - * This can be called before any controllers are opened. + * Get the type of a game controller. * - * \return the mapping string. Must be freed with SDL_free(). Returns NULL if no mapping is available + * This can be called before any controllers are opened. + * + * \param joystick_index the device_index of a device, from zero to + * SDL_NumJoysticks()-1 + * \returns the controller type. + * + * \since This function is available since SDL 2.0.12. + */ +extern DECLSPEC SDL_GameControllerType SDLCALL SDL_GameControllerTypeForIndex(int joystick_index); + +/** + * Get the mapping of a game controller. + * + * This can be called before any controllers are opened. + * + * \param joystick_index the device_index of a device, from zero to + * SDL_NumJoysticks()-1 + * \returns the mapping string. Must be freed with SDL_free(). Returns NULL if + * no mapping is available. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC char *SDLCALL SDL_GameControllerMappingForDeviceIndex(int joystick_index); /** - * Open a game controller for use. - * The index passed as an argument refers to the N'th game controller on the system. - * This index is not the value which will identify this controller in future - * controller events. The joystick's instance id (::SDL_JoystickID) will be - * used there instead. + * Open a game controller for use. * - * \return A controller identifier, or NULL if an error occurred. + * `joystick_index` is the same as the `device_index` passed to + * SDL_JoystickOpen(). + * + * The index passed as an argument refers to the N'th game controller on the + * system. This index is not the value which will identify this controller in + * future controller events. The joystick's instance id (SDL_JoystickID) will + * be used there instead. + * + * \param joystick_index the device_index of a device, up to + * SDL_NumJoysticks() + * \returns a gamecontroller identifier or NULL if an error occurred; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerClose + * \sa SDL_GameControllerNameForIndex + * \sa SDL_IsGameController */ extern DECLSPEC SDL_GameController *SDLCALL SDL_GameControllerOpen(int joystick_index); /** - * Return the SDL_GameController associated with an instance id. + * Get the SDL_GameController associated with an instance id. + * + * \param joyid the instance id to get the SDL_GameController for + * \returns an SDL_GameController on success or NULL on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.4. */ extern DECLSPEC SDL_GameController *SDLCALL SDL_GameControllerFromInstanceID(SDL_JoystickID joyid); /** - * Return the name for this currently opened controller + * Get the SDL_GameController associated with a player index. + * + * Please note that the player index is _not_ the device index, nor is it the + * instance id! + * + * \param player_index the player index, which is not the device index or the + * instance id! + * \returns the SDL_GameController associated with a player index. + * + * \since This function is available since SDL 2.0.12. + * + * \sa SDL_GameControllerGetPlayerIndex + * \sa SDL_GameControllerSetPlayerIndex + */ +extern DECLSPEC SDL_GameController *SDLCALL SDL_GameControllerFromPlayerIndex(int player_index); + +/** + * Get the implementation-dependent name for an opened game controller. + * + * This is the same name as returned by SDL_GameControllerNameForIndex(), but + * it takes a controller identifier instead of the (unstable) device index. + * + * \param gamecontroller a game controller identifier previously returned by + * SDL_GameControllerOpen() + * \returns the implementation dependent name for the game controller, or NULL + * if there is no name or the identifier passed is invalid. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerNameForIndex + * \sa SDL_GameControllerOpen */ extern DECLSPEC const char *SDLCALL SDL_GameControllerName(SDL_GameController *gamecontroller); /** - * Get the player index of an opened game controller, or -1 if it's not available + * Get the type of this currently opened controller * - * For XInput controllers this returns the XInput user index. + * This is the same name as returned by SDL_GameControllerTypeForIndex(), but + * it takes a controller identifier instead of the (unstable) device index. + * + * \param gamecontroller the game controller object to query. + * \returns the controller type. + * + * \since This function is available since SDL 2.0.12. + */ +extern DECLSPEC SDL_GameControllerType SDLCALL SDL_GameControllerGetType(SDL_GameController *gamecontroller); + +/** + * Get the player index of an opened game controller. + * + * For XInput controllers this returns the XInput user index. + * + * \param gamecontroller the game controller object to query. + * \returns the player index for controller, or -1 if it's not available. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC int SDLCALL SDL_GameControllerGetPlayerIndex(SDL_GameController *gamecontroller); /** - * Get the USB vendor ID of an opened controller, if available. - * If the vendor ID isn't available this function returns 0. + * Set the player index of an opened game controller. + * + * \param gamecontroller the game controller object to adjust. + * \param player_index Player index to assign to this controller. + * + * \since This function is available since SDL 2.0.12. */ -extern DECLSPEC Uint16 SDLCALL SDL_GameControllerGetVendor(SDL_GameController * gamecontroller); +extern DECLSPEC void SDLCALL SDL_GameControllerSetPlayerIndex(SDL_GameController *gamecontroller, int player_index); /** - * Get the USB product ID of an opened controller, if available. - * If the product ID isn't available this function returns 0. + * Get the USB vendor ID of an opened controller, if available. + * + * If the vendor ID isn't available this function returns 0. + * + * \param gamecontroller the game controller object to query. + * \return the USB vendor ID, or zero if unavailable. + * + * \since This function is available since SDL 2.0.6. */ -extern DECLSPEC Uint16 SDLCALL SDL_GameControllerGetProduct(SDL_GameController * gamecontroller); +extern DECLSPEC Uint16 SDLCALL SDL_GameControllerGetVendor(SDL_GameController *gamecontroller); /** - * Get the product version of an opened controller, if available. - * If the product version isn't available this function returns 0. + * Get the USB product ID of an opened controller, if available. + * + * If the product ID isn't available this function returns 0. + * + * \param gamecontroller the game controller object to query. + * \return the USB product ID, or zero if unavailable. + * + * \since This function is available since SDL 2.0.6. */ -extern DECLSPEC Uint16 SDLCALL SDL_GameControllerGetProductVersion(SDL_GameController * gamecontroller); +extern DECLSPEC Uint16 SDLCALL SDL_GameControllerGetProduct(SDL_GameController *gamecontroller); /** - * Returns SDL_TRUE if the controller has been opened and currently connected, - * or SDL_FALSE if it has not. + * Get the product version of an opened controller, if available. + * + * If the product version isn't available this function returns 0. + * + * \param gamecontroller the game controller object to query. + * \return the USB product version, or zero if unavailable. + * + * \since This function is available since SDL 2.0.6. + */ +extern DECLSPEC Uint16 SDLCALL SDL_GameControllerGetProductVersion(SDL_GameController *gamecontroller); + +/** + * Get the serial number of an opened controller, if available. + * + * Returns the serial number of the controller, or NULL if it is not + * available. + * + * \param gamecontroller the game controller object to query. + * \return the serial number, or NULL if unavailable. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC const char * SDLCALL SDL_GameControllerGetSerial(SDL_GameController *gamecontroller); + +/** + * Check if a controller has been opened and is currently connected. + * + * \param gamecontroller a game controller identifier previously returned by + * SDL_GameControllerOpen() + * \returns SDL_TRUE if the controller has been opened and is currently + * connected, or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerClose + * \sa SDL_GameControllerOpen */ extern DECLSPEC SDL_bool SDLCALL SDL_GameControllerGetAttached(SDL_GameController *gamecontroller); /** - * Get the underlying joystick object used by a controller + * Get the Joystick ID from a Game Controller. + * + * This function will give you a SDL_Joystick object, which allows you to use + * the SDL_Joystick functions with a SDL_GameController object. This would be + * useful for getting a joystick's position at any given time, even if it + * hasn't moved (moving it would produce an event, which would have the axis' + * value). + * + * The pointer returned is owned by the SDL_GameController. You should not + * call SDL_JoystickClose() on it, for example, since doing so will likely + * cause SDL to crash. + * + * \param gamecontroller the game controller object that you want to get a + * joystick from + * \returns a SDL_Joystick object; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC SDL_Joystick *SDLCALL SDL_GameControllerGetJoystick(SDL_GameController *gamecontroller); /** - * Enable/disable controller event polling. + * Query or change current state of Game Controller events. * - * If controller events are disabled, you must call SDL_GameControllerUpdate() - * yourself and check the state of the controller when you want controller - * information. + * If controller events are disabled, you must call SDL_GameControllerUpdate() + * yourself and check the state of the controller when you want controller + * information. * - * The state can be one of ::SDL_QUERY, ::SDL_ENABLE or ::SDL_IGNORE. + * Any number can be passed to SDL_GameControllerEventState(), but only -1, 0, + * and 1 will have any effect. Other numbers will just be returned. + * + * \param state can be one of `SDL_QUERY`, `SDL_IGNORE`, or `SDL_ENABLE` + * \returns the same value passed to the function, with exception to -1 + * (SDL_QUERY), which will return the current state. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickEventState */ extern DECLSPEC int SDLCALL SDL_GameControllerEventState(int state); /** - * Update the current state of the open game controllers. + * Manually pump game controller updates if not using the loop. * - * This is called automatically by the event loop if any game controller - * events are enabled. + * This function is called automatically by the event loop if events are + * enabled. Under such circumstances, it will not be necessary to call this + * function. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC void SDLCALL SDL_GameControllerUpdate(void); @@ -282,33 +560,94 @@ typedef enum } SDL_GameControllerAxis; /** - * turn this string into a axis mapping + * Convert a string into SDL_GameControllerAxis enum. + * + * This function is called internally to translate SDL_GameController mapping + * strings for the underlying joystick device into the consistent + * SDL_GameController mapping. You do not normally need to call this function + * unless you are parsing SDL_GameController mappings in your own code. + * + * Note specially that "righttrigger" and "lefttrigger" map to + * `SDL_CONTROLLER_AXIS_TRIGGERRIGHT` and `SDL_CONTROLLER_AXIS_TRIGGERLEFT`, + * respectively. + * + * \param str string representing a SDL_GameController axis + * \returns the SDL_GameControllerAxis enum corresponding to the input string, + * or `SDL_CONTROLLER_AXIS_INVALID` if no match was found. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerGetStringForAxis */ -extern DECLSPEC SDL_GameControllerAxis SDLCALL SDL_GameControllerGetAxisFromString(const char *pchString); +extern DECLSPEC SDL_GameControllerAxis SDLCALL SDL_GameControllerGetAxisFromString(const char *str); /** - * turn this axis enum into a string mapping + * Convert from an SDL_GameControllerAxis enum to a string. + * + * The caller should not SDL_free() the returned string. + * + * \param axis an enum value for a given SDL_GameControllerAxis + * \returns a string for the given axis, or NULL if an invalid axis is + * specified. The string returned is of the format used by + * SDL_GameController mapping strings. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerGetAxisFromString */ extern DECLSPEC const char* SDLCALL SDL_GameControllerGetStringForAxis(SDL_GameControllerAxis axis); /** - * Get the SDL joystick layer binding for this controller button mapping + * Get the SDL joystick layer binding for a controller axis mapping. + * + * \param gamecontroller a game controller + * \param axis an axis enum value (one of the SDL_GameControllerAxis values) + * \returns a SDL_GameControllerButtonBind describing the bind. On failure + * (like the given Controller axis doesn't exist on the device), its + * `.bindType` will be `SDL_CONTROLLER_BINDTYPE_NONE`. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerGetBindForButton */ extern DECLSPEC SDL_GameControllerButtonBind SDLCALL SDL_GameControllerGetBindForAxis(SDL_GameController *gamecontroller, SDL_GameControllerAxis axis); /** - * Get the current state of an axis control on a game controller. + * Query whether a game controller has a given axis. * - * The state is a value ranging from -32768 to 32767 (except for the triggers, - * which range from 0 to 32767). + * This merely reports whether the controller's mapping defined this axis, as + * that is all the information SDL has about the physical device. * - * The axis indices start at index 0. + * \param gamecontroller a game controller + * \param axis an axis enum value (an SDL_GameControllerAxis value) + * \returns SDL_TRUE if the controller has this axis, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC SDL_bool SDLCALL +SDL_GameControllerHasAxis(SDL_GameController *gamecontroller, SDL_GameControllerAxis axis); + +/** + * Get the current state of an axis control on a game controller. + * + * The axis indices start at index 0. + * + * The state is a value ranging from -32768 to 32767. Triggers, however, range + * from 0 to 32767 (they never return a negative value). + * + * \param gamecontroller a game controller + * \param axis an axis index (one of the SDL_GameControllerAxis values) + * \returns axis state (including 0) on success or 0 (also) on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerGetButton */ extern DECLSPEC Sint16 SDLCALL -SDL_GameControllerGetAxis(SDL_GameController *gamecontroller, - SDL_GameControllerAxis axis); +SDL_GameControllerGetAxis(SDL_GameController *gamecontroller, SDL_GameControllerAxis axis); /** * The list of buttons available from a controller @@ -331,53 +670,325 @@ typedef enum SDL_CONTROLLER_BUTTON_DPAD_DOWN, SDL_CONTROLLER_BUTTON_DPAD_LEFT, SDL_CONTROLLER_BUTTON_DPAD_RIGHT, + SDL_CONTROLLER_BUTTON_MISC1, /* Xbox Series X share button, PS5 microphone button, Nintendo Switch Pro capture button, Amazon Luna microphone button */ + SDL_CONTROLLER_BUTTON_PADDLE1, /* Xbox Elite paddle P1 */ + SDL_CONTROLLER_BUTTON_PADDLE2, /* Xbox Elite paddle P3 */ + SDL_CONTROLLER_BUTTON_PADDLE3, /* Xbox Elite paddle P2 */ + SDL_CONTROLLER_BUTTON_PADDLE4, /* Xbox Elite paddle P4 */ + SDL_CONTROLLER_BUTTON_TOUCHPAD, /* PS4/PS5 touchpad button */ SDL_CONTROLLER_BUTTON_MAX } SDL_GameControllerButton; /** - * turn this string into a button mapping + * Convert a string into an SDL_GameControllerButton enum. + * + * This function is called internally to translate SDL_GameController mapping + * strings for the underlying joystick device into the consistent + * SDL_GameController mapping. You do not normally need to call this function + * unless you are parsing SDL_GameController mappings in your own code. + * + * \param str string representing a SDL_GameController axis + * \returns the SDL_GameControllerButton enum corresponding to the input + * string, or `SDL_CONTROLLER_AXIS_INVALID` if no match was found. + * + * \since This function is available since SDL 2.0.0. */ -extern DECLSPEC SDL_GameControllerButton SDLCALL SDL_GameControllerGetButtonFromString(const char *pchString); +extern DECLSPEC SDL_GameControllerButton SDLCALL SDL_GameControllerGetButtonFromString(const char *str); /** - * turn this button enum into a string mapping + * Convert from an SDL_GameControllerButton enum to a string. + * + * The caller should not SDL_free() the returned string. + * + * \param button an enum value for a given SDL_GameControllerButton + * \returns a string for the given button, or NULL if an invalid axis is + * specified. The string returned is of the format used by + * SDL_GameController mapping strings. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerGetButtonFromString */ extern DECLSPEC const char* SDLCALL SDL_GameControllerGetStringForButton(SDL_GameControllerButton button); /** - * Get the SDL joystick layer binding for this controller button mapping + * Get the SDL joystick layer binding for a controller button mapping. + * + * \param gamecontroller a game controller + * \param button an button enum value (an SDL_GameControllerButton value) + * \returns a SDL_GameControllerButtonBind describing the bind. On failure + * (like the given Controller button doesn't exist on the device), + * its `.bindType` will be `SDL_CONTROLLER_BINDTYPE_NONE`. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerGetBindForAxis */ extern DECLSPEC SDL_GameControllerButtonBind SDLCALL SDL_GameControllerGetBindForButton(SDL_GameController *gamecontroller, SDL_GameControllerButton button); +/** + * Query whether a game controller has a given button. + * + * This merely reports whether the controller's mapping defined this button, + * as that is all the information SDL has about the physical device. + * + * \param gamecontroller a game controller + * \param button a button enum value (an SDL_GameControllerButton value) + * \returns SDL_TRUE if the controller has this button, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC SDL_bool SDLCALL SDL_GameControllerHasButton(SDL_GameController *gamecontroller, + SDL_GameControllerButton button); /** - * Get the current state of a button on a game controller. + * Get the current state of a button on a game controller. * - * The button indices start at index 0. + * \param gamecontroller a game controller + * \param button a button index (one of the SDL_GameControllerButton values) + * \returns 1 for pressed state or 0 for not pressed state or error; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerGetAxis */ extern DECLSPEC Uint8 SDLCALL SDL_GameControllerGetButton(SDL_GameController *gamecontroller, SDL_GameControllerButton button); /** - * Trigger a rumble effect - * Each call to this function cancels any previous rumble effect, and calling it with 0 intensity stops any rumbling. + * Get the number of touchpads on a game controller. * - * \param gamecontroller The controller to vibrate - * \param low_frequency_rumble The intensity of the low frequency (left) rumble motor, from 0 to 0xFFFF - * \param high_frequency_rumble The intensity of the high frequency (right) rumble motor, from 0 to 0xFFFF - * \param duration_ms The duration of the rumble effect, in milliseconds + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC int SDLCALL SDL_GameControllerGetNumTouchpads(SDL_GameController *gamecontroller); + +/** + * Get the number of supported simultaneous fingers on a touchpad on a game + * controller. * - * \return 0, or -1 if rumble isn't supported on this joystick + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC int SDLCALL SDL_GameControllerGetNumTouchpadFingers(SDL_GameController *gamecontroller, int touchpad); + +/** + * Get the current state of a finger on a touchpad on a game controller. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC int SDLCALL SDL_GameControllerGetTouchpadFinger(SDL_GameController *gamecontroller, int touchpad, int finger, Uint8 *state, float *x, float *y, float *pressure); + +/** + * Return whether a game controller has a particular sensor. + * + * \param gamecontroller The controller to query + * \param type The type of sensor to query + * \returns SDL_TRUE if the sensor exists, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC SDL_bool SDLCALL SDL_GameControllerHasSensor(SDL_GameController *gamecontroller, SDL_SensorType type); + +/** + * Set whether data reporting for a game controller sensor is enabled. + * + * \param gamecontroller The controller to update + * \param type The type of sensor to enable/disable + * \param enabled Whether data reporting should be enabled + * \returns 0 or -1 if an error occurred. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC int SDLCALL SDL_GameControllerSetSensorEnabled(SDL_GameController *gamecontroller, SDL_SensorType type, SDL_bool enabled); + +/** + * Query whether sensor data reporting is enabled for a game controller. + * + * \param gamecontroller The controller to query + * \param type The type of sensor to query + * \returns SDL_TRUE if the sensor is enabled, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC SDL_bool SDLCALL SDL_GameControllerIsSensorEnabled(SDL_GameController *gamecontroller, SDL_SensorType type); + +/** + * Get the data rate (number of events per second) of a game controller + * sensor. + * + * \param gamecontroller The controller to query + * \param type The type of sensor to query + * \return the data rate, or 0.0f if the data rate is not available. + * + * \since This function is available since SDL 2.0.16. + */ +extern DECLSPEC float SDLCALL SDL_GameControllerGetSensorDataRate(SDL_GameController *gamecontroller, SDL_SensorType type); + +/** + * Get the current state of a game controller sensor. + * + * The number of values and interpretation of the data is sensor dependent. + * See SDL_sensor.h for the details for each type of sensor. + * + * \param gamecontroller The controller to query + * \param type The type of sensor to query + * \param data A pointer filled with the current sensor state + * \param num_values The number of values to write to data + * \return 0 or -1 if an error occurred. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC int SDLCALL SDL_GameControllerGetSensorData(SDL_GameController *gamecontroller, SDL_SensorType type, float *data, int num_values); + +/** + * Start a rumble effect on a game controller. + * + * Each call to this function cancels any previous rumble effect, and calling + * it with 0 intensity stops any rumbling. + * + * \param gamecontroller The controller to vibrate + * \param low_frequency_rumble The intensity of the low frequency (left) + * rumble motor, from 0 to 0xFFFF + * \param high_frequency_rumble The intensity of the high frequency (right) + * rumble motor, from 0 to 0xFFFF + * \param duration_ms The duration of the rumble effect, in milliseconds + * \returns 0, or -1 if rumble isn't supported on this controller + * + * \since This function is available since SDL 2.0.9. + * + * \sa SDL_GameControllerHasRumble */ extern DECLSPEC int SDLCALL SDL_GameControllerRumble(SDL_GameController *gamecontroller, Uint16 low_frequency_rumble, Uint16 high_frequency_rumble, Uint32 duration_ms); /** - * Close a controller previously opened with SDL_GameControllerOpen(). + * Start a rumble effect in the game controller's triggers. + * + * Each call to this function cancels any previous trigger rumble effect, and + * calling it with 0 intensity stops any rumbling. + * + * Note that this is rumbling of the _triggers_ and not the game controller as + * a whole. The first controller to offer this feature was the PlayStation 5's + * DualShock 5. + * + * \param gamecontroller The controller to vibrate + * \param left_rumble The intensity of the left trigger rumble motor, from 0 + * to 0xFFFF + * \param right_rumble The intensity of the right trigger rumble motor, from 0 + * to 0xFFFF + * \param duration_ms The duration of the rumble effect, in milliseconds + * \returns 0, or -1 if trigger rumble isn't supported on this controller + * + * \since This function is available since SDL 2.0.14. + * + * \sa SDL_GameControllerHasRumbleTriggers + */ +extern DECLSPEC int SDLCALL SDL_GameControllerRumbleTriggers(SDL_GameController *gamecontroller, Uint16 left_rumble, Uint16 right_rumble, Uint32 duration_ms); + +/** + * Query whether a game controller has an LED. + * + * \param gamecontroller The controller to query + * \returns SDL_TRUE, or SDL_FALSE if this controller does not have a + * modifiable LED + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC SDL_bool SDLCALL SDL_GameControllerHasLED(SDL_GameController *gamecontroller); + +/** + * Query whether a game controller has rumble support. + * + * \param gamecontroller The controller to query + * \returns SDL_TRUE, or SDL_FALSE if this controller does not have rumble + * support + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_GameControllerRumble + */ +extern DECLSPEC SDL_bool SDLCALL SDL_GameControllerHasRumble(SDL_GameController *gamecontroller); + +/** + * Query whether a game controller has rumble support on triggers. + * + * \param gamecontroller The controller to query + * \returns SDL_TRUE, or SDL_FALSE if this controller does not have trigger + * rumble support + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_GameControllerRumbleTriggers + */ +extern DECLSPEC SDL_bool SDLCALL SDL_GameControllerHasRumbleTriggers(SDL_GameController *gamecontroller); + +/** + * Update a game controller's LED color. + * + * \param gamecontroller The controller to update + * \param red The intensity of the red LED + * \param green The intensity of the green LED + * \param blue The intensity of the blue LED + * \returns 0, or -1 if this controller does not have a modifiable LED + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC int SDLCALL SDL_GameControllerSetLED(SDL_GameController *gamecontroller, Uint8 red, Uint8 green, Uint8 blue); + +/** + * Send a controller specific effect packet + * + * \param gamecontroller The controller to affect + * \param data The data to send to the controller + * \param size The size of the data to send to the controller + * \returns 0, or -1 if this controller or driver doesn't support effect + * packets + * + * \since This function is available since SDL 2.0.16. + */ +extern DECLSPEC int SDLCALL SDL_GameControllerSendEffect(SDL_GameController *gamecontroller, const void *data, int size); + +/** + * Close a game controller previously opened with SDL_GameControllerOpen(). + * + * \param gamecontroller a game controller identifier previously returned by + * SDL_GameControllerOpen() + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerOpen */ extern DECLSPEC void SDLCALL SDL_GameControllerClose(SDL_GameController *gamecontroller); +/** + * Return the sfSymbolsName for a given button on a game controller on Apple + * platforms. + * + * \param gamecontroller the controller to query + * \param button a button on the game controller + * \returns the sfSymbolsName or NULL if the name can't be found + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_GameControllerGetAppleSFSymbolsNameForAxis + */ +extern DECLSPEC const char* SDLCALL SDL_GameControllerGetAppleSFSymbolsNameForButton(SDL_GameController *gamecontroller, SDL_GameControllerButton button); + +/** + * Return the sfSymbolsName for a given axis on a game controller on Apple + * platforms. + * + * \param gamecontroller the controller to query + * \param axis an axis on the game controller + * \returns the sfSymbolsName or NULL if the name can't be found + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_GameControllerGetAppleSFSymbolsNameForButton + */ +extern DECLSPEC const char* SDLCALL SDL_GameControllerGetAppleSFSymbolsNameForAxis(SDL_GameController *gamecontroller, SDL_GameControllerAxis axis); + /* Ends C function definitions when using C++ */ #ifdef __cplusplus diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_gesture.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_gesture.h index 9d25e9c1d..e2caea2a9 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_gesture.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_gesture.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -46,36 +46,66 @@ typedef Sint64 SDL_GestureID; /* Function prototypes */ /** - * \brief Begin Recording a gesture on the specified touch, or all touches (-1) + * Begin recording a gesture on a specified touch device or all touch devices. * + * If the parameter `touchId` is -1 (i.e., all devices), this function will + * always return 1, regardless of whether there actually are any devices. * + * \param touchId the touch device id, or -1 for all touch devices + * \returns 1 on success or 0 if the specified device could not be found. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetTouchDevice */ extern DECLSPEC int SDLCALL SDL_RecordGesture(SDL_TouchID touchId); /** - * \brief Save all currently loaded Dollar Gesture templates + * Save all currently loaded Dollar Gesture templates. * + * \param dst a SDL_RWops to save to + * \returns the number of saved templates on success or 0 on failure; call + * SDL_GetError() for more information. * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LoadDollarTemplates + * \sa SDL_SaveDollarTemplate */ extern DECLSPEC int SDLCALL SDL_SaveAllDollarTemplates(SDL_RWops *dst); /** - * \brief Save a currently loaded Dollar Gesture template + * Save a currently loaded Dollar Gesture template. * + * \param gestureId a gesture id + * \param dst a SDL_RWops to save to + * \returns 1 on success or 0 on failure; call SDL_GetError() for more + * information. * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LoadDollarTemplates + * \sa SDL_SaveAllDollarTemplates */ extern DECLSPEC int SDLCALL SDL_SaveDollarTemplate(SDL_GestureID gestureId,SDL_RWops *dst); /** - * \brief Load Dollar Gesture templates from a file + * Load Dollar Gesture templates from a file. * + * \param touchId a touch id + * \param src a SDL_RWops to load from + * \returns the number of loaded templates on success or a negative error code + * (or 0) on failure; call SDL_GetError() for more information. * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SaveAllDollarTemplates + * \sa SDL_SaveDollarTemplate */ extern DECLSPEC int SDLCALL SDL_LoadDollarTemplates(SDL_TouchID touchId, SDL_RWops *src); - /* Ends C function definitions when using C++ */ #ifdef __cplusplus } diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_haptic.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_haptic.h index 075627685..f240ae927 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_haptic.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_haptic.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -76,7 +76,7 @@ * } * * // Create the effect - * memset( &effect, 0, sizeof(SDL_HapticEffect) ); // 0 is safe default + * SDL_memset( &effect, 0, sizeof(SDL_HapticEffect) ); // 0 is safe default * effect.type = SDL_HAPTIC_SINE; * effect.periodic.direction.type = SDL_HAPTIC_POLAR; // Polar coordinates * effect.periodic.direction.dir[0] = 18000; // Force comes from south @@ -336,6 +336,14 @@ typedef struct _SDL_Haptic SDL_Haptic; */ #define SDL_HAPTIC_SPHERICAL 2 +/** + * \brief Use this value to play an effect on the steering wheel axis. This + * provides better compatibility across platforms and devices as SDL will guess + * the correct axis. + * \sa SDL_HapticDirection + */ +#define SDL_HAPTIC_STEERING_AXIS 3 + /* @} *//* Direction encodings */ /* @} *//* Haptic features */ @@ -444,6 +452,7 @@ typedef struct _SDL_Haptic SDL_Haptic; * \sa SDL_HAPTIC_POLAR * \sa SDL_HAPTIC_CARTESIAN * \sa SDL_HAPTIC_SPHERICAL + * \sa SDL_HAPTIC_STEERING_AXIS * \sa SDL_HapticEffect * \sa SDL_HapticNumAxes */ @@ -811,419 +820,513 @@ typedef union SDL_HapticEffect /* Function prototypes */ + /** - * \brief Count the number of haptic devices attached to the system. + * Count the number of haptic devices attached to the system. * - * \return Number of haptic devices detected on the system. + * \returns the number of haptic devices detected on the system or a negative + * error code on failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticName */ extern DECLSPEC int SDLCALL SDL_NumHaptics(void); /** - * \brief Get the implementation dependent name of a haptic device. + * Get the implementation dependent name of a haptic device. * - * This can be called before any joysticks are opened. - * If no name can be found, this function returns NULL. + * This can be called before any joysticks are opened. If no name can be + * found, this function returns NULL. * - * \param device_index Index of the device to get its name. - * \return Name of the device or NULL on error. + * \param device_index index of the device to query. + * \returns the name of the device or NULL on failure; call SDL_GetError() for + * more information. * - * \sa SDL_NumHaptics + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_NumHaptics */ extern DECLSPEC const char *SDLCALL SDL_HapticName(int device_index); /** - * \brief Opens a haptic device for use. + * Open a haptic device for use. * - * The index passed as an argument refers to the N'th haptic device on this - * system. + * The index passed as an argument refers to the N'th haptic device on this + * system. * - * When opening a haptic device, its gain will be set to maximum and - * autocenter will be disabled. To modify these values use - * SDL_HapticSetGain() and SDL_HapticSetAutocenter(). + * When opening a haptic device, its gain will be set to maximum and + * autocenter will be disabled. To modify these values use SDL_HapticSetGain() + * and SDL_HapticSetAutocenter(). * - * \param device_index Index of the device to open. - * \return Device identifier or NULL on error. + * \param device_index index of the device to open + * \returns the device identifier or NULL on failure; call SDL_GetError() for + * more information. * - * \sa SDL_HapticIndex - * \sa SDL_HapticOpenFromMouse - * \sa SDL_HapticOpenFromJoystick - * \sa SDL_HapticClose - * \sa SDL_HapticSetGain - * \sa SDL_HapticSetAutocenter - * \sa SDL_HapticPause - * \sa SDL_HapticStopAll + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticClose + * \sa SDL_HapticIndex + * \sa SDL_HapticOpenFromJoystick + * \sa SDL_HapticOpenFromMouse + * \sa SDL_HapticPause + * \sa SDL_HapticSetAutocenter + * \sa SDL_HapticSetGain + * \sa SDL_HapticStopAll */ extern DECLSPEC SDL_Haptic *SDLCALL SDL_HapticOpen(int device_index); /** - * \brief Checks if the haptic device at index has been opened. + * Check if the haptic device at the designated index has been opened. * - * \param device_index Index to check to see if it has been opened. - * \return 1 if it has been opened or 0 if it hasn't. + * \param device_index the index of the device to query + * \returns 1 if it has been opened, 0 if it hasn't or on failure; call + * SDL_GetError() for more information. * - * \sa SDL_HapticOpen - * \sa SDL_HapticIndex + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticIndex + * \sa SDL_HapticOpen */ extern DECLSPEC int SDLCALL SDL_HapticOpened(int device_index); /** - * \brief Gets the index of a haptic device. + * Get the index of a haptic device. * - * \param haptic Haptic device to get the index of. - * \return The index of the haptic device or -1 on error. + * \param haptic the SDL_Haptic device to query + * \returns the index of the specified haptic device or a negative error code + * on failure; call SDL_GetError() for more information. * - * \sa SDL_HapticOpen - * \sa SDL_HapticOpened + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticOpen + * \sa SDL_HapticOpened */ extern DECLSPEC int SDLCALL SDL_HapticIndex(SDL_Haptic * haptic); /** - * \brief Gets whether or not the current mouse has haptic capabilities. + * Query whether or not the current mouse has haptic capabilities. * - * \return SDL_TRUE if the mouse is haptic, SDL_FALSE if it isn't. + * \returns SDL_TRUE if the mouse is haptic or SDL_FALSE if it isn't. * - * \sa SDL_HapticOpenFromMouse + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticOpenFromMouse */ extern DECLSPEC int SDLCALL SDL_MouseIsHaptic(void); /** - * \brief Tries to open a haptic device from the current mouse. + * Try to open a haptic device from the current mouse. * - * \return The haptic device identifier or NULL on error. + * \returns the haptic device identifier or NULL on failure; call + * SDL_GetError() for more information. * - * \sa SDL_MouseIsHaptic - * \sa SDL_HapticOpen + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticOpen + * \sa SDL_MouseIsHaptic */ extern DECLSPEC SDL_Haptic *SDLCALL SDL_HapticOpenFromMouse(void); /** - * \brief Checks to see if a joystick has haptic features. + * Query if a joystick has haptic features. * - * \param joystick Joystick to test for haptic capabilities. - * \return SDL_TRUE if the joystick is haptic, SDL_FALSE if it isn't - * or -1 if an error occurred. + * \param joystick the SDL_Joystick to test for haptic capabilities + * \returns SDL_TRUE if the joystick is haptic, SDL_FALSE if it isn't, or a + * negative error code on failure; call SDL_GetError() for more + * information. * - * \sa SDL_HapticOpenFromJoystick + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticOpenFromJoystick */ extern DECLSPEC int SDLCALL SDL_JoystickIsHaptic(SDL_Joystick * joystick); /** - * \brief Opens a haptic device for use from a joystick device. + * Open a haptic device for use from a joystick device. * - * You must still close the haptic device separately. It will not be closed - * with the joystick. + * You must still close the haptic device separately. It will not be closed + * with the joystick. * - * When opening from a joystick you should first close the haptic device before - * closing the joystick device. If not, on some implementations the haptic - * device will also get unallocated and you'll be unable to use force feedback - * on that device. + * When opened from a joystick you should first close the haptic device before + * closing the joystick device. If not, on some implementations the haptic + * device will also get unallocated and you'll be unable to use force feedback + * on that device. * - * \param joystick Joystick to create a haptic device from. - * \return A valid haptic device identifier on success or NULL on error. + * \param joystick the SDL_Joystick to create a haptic device from + * \returns a valid haptic device identifier on success or NULL on failure; + * call SDL_GetError() for more information. * - * \sa SDL_HapticOpen - * \sa SDL_HapticClose + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticClose + * \sa SDL_HapticOpen + * \sa SDL_JoystickIsHaptic */ extern DECLSPEC SDL_Haptic *SDLCALL SDL_HapticOpenFromJoystick(SDL_Joystick * joystick); /** - * \brief Closes a haptic device previously opened with SDL_HapticOpen(). + * Close a haptic device previously opened with SDL_HapticOpen(). * - * \param haptic Haptic device to close. + * \param haptic the SDL_Haptic device to close + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticOpen */ extern DECLSPEC void SDLCALL SDL_HapticClose(SDL_Haptic * haptic); /** - * \brief Returns the number of effects a haptic device can store. + * Get the number of effects a haptic device can store. * - * On some platforms this isn't fully supported, and therefore is an - * approximation. Always check to see if your created effect was actually - * created and do not rely solely on SDL_HapticNumEffects(). + * On some platforms this isn't fully supported, and therefore is an + * approximation. Always check to see if your created effect was actually + * created and do not rely solely on SDL_HapticNumEffects(). * - * \param haptic The haptic device to query effect max. - * \return The number of effects the haptic device can store or - * -1 on error. + * \param haptic the SDL_Haptic device to query + * \returns the number of effects the haptic device can store or a negative + * error code on failure; call SDL_GetError() for more information. * - * \sa SDL_HapticNumEffectsPlaying - * \sa SDL_HapticQuery + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticNumEffectsPlaying + * \sa SDL_HapticQuery */ extern DECLSPEC int SDLCALL SDL_HapticNumEffects(SDL_Haptic * haptic); /** - * \brief Returns the number of effects a haptic device can play at the same - * time. + * Get the number of effects a haptic device can play at the same time. * - * This is not supported on all platforms, but will always return a value. - * Added here for the sake of completeness. + * This is not supported on all platforms, but will always return a value. * - * \param haptic The haptic device to query maximum playing effects. - * \return The number of effects the haptic device can play at the same time - * or -1 on error. + * \param haptic the SDL_Haptic device to query maximum playing effects + * \returns the number of effects the haptic device can play at the same time + * or a negative error code on failure; call SDL_GetError() for more + * information. * - * \sa SDL_HapticNumEffects - * \sa SDL_HapticQuery + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticNumEffects + * \sa SDL_HapticQuery */ extern DECLSPEC int SDLCALL SDL_HapticNumEffectsPlaying(SDL_Haptic * haptic); /** - * \brief Gets the haptic device's supported features in bitwise manner. + * Get the haptic device's supported features in bitwise manner. * - * Example: - * \code - * if (SDL_HapticQuery(haptic) & SDL_HAPTIC_CONSTANT) { - * printf("We have constant haptic effect!\n"); - * } - * \endcode + * \param haptic the SDL_Haptic device to query + * \returns a list of supported haptic features in bitwise manner (OR'd), or 0 + * on failure; call SDL_GetError() for more information. * - * \param haptic The haptic device to query. - * \return Haptic features in bitwise manner (OR'd). + * \since This function is available since SDL 2.0.0. * - * \sa SDL_HapticNumEffects - * \sa SDL_HapticEffectSupported + * \sa SDL_HapticEffectSupported + * \sa SDL_HapticNumEffects */ extern DECLSPEC unsigned int SDLCALL SDL_HapticQuery(SDL_Haptic * haptic); /** - * \brief Gets the number of haptic axes the device has. + * Get the number of haptic axes the device has. * - * \sa SDL_HapticDirection + * The number of haptic axes might be useful if working with the + * SDL_HapticDirection effect. + * + * \param haptic the SDL_Haptic device to query + * \returns the number of axes on success or a negative error code on failure; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC int SDLCALL SDL_HapticNumAxes(SDL_Haptic * haptic); /** - * \brief Checks to see if effect is supported by haptic. + * Check to see if an effect is supported by a haptic device. * - * \param haptic Haptic device to check on. - * \param effect Effect to check to see if it is supported. - * \return SDL_TRUE if effect is supported, SDL_FALSE if it isn't or -1 on error. + * \param haptic the SDL_Haptic device to query + * \param effect the desired effect to query + * \returns SDL_TRUE if effect is supported, SDL_FALSE if it isn't, or a + * negative error code on failure; call SDL_GetError() for more + * information. * - * \sa SDL_HapticQuery - * \sa SDL_HapticNewEffect + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticNewEffect + * \sa SDL_HapticQuery */ extern DECLSPEC int SDLCALL SDL_HapticEffectSupported(SDL_Haptic * haptic, SDL_HapticEffect * effect); /** - * \brief Creates a new haptic effect on the device. + * Create a new haptic effect on a specified device. * - * \param haptic Haptic device to create the effect on. - * \param effect Properties of the effect to create. - * \return The identifier of the effect on success or -1 on error. + * \param haptic an SDL_Haptic device to create the effect on + * \param effect an SDL_HapticEffect structure containing the properties of + * the effect to create + * \returns the ID of the effect on success or a negative error code on + * failure; call SDL_GetError() for more information. * - * \sa SDL_HapticUpdateEffect - * \sa SDL_HapticRunEffect - * \sa SDL_HapticDestroyEffect + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticDestroyEffect + * \sa SDL_HapticRunEffect + * \sa SDL_HapticUpdateEffect */ extern DECLSPEC int SDLCALL SDL_HapticNewEffect(SDL_Haptic * haptic, SDL_HapticEffect * effect); /** - * \brief Updates the properties of an effect. + * Update the properties of an effect. * - * Can be used dynamically, although behavior when dynamically changing - * direction may be strange. Specifically the effect may reupload itself - * and start playing from the start. You cannot change the type either when - * running SDL_HapticUpdateEffect(). + * Can be used dynamically, although behavior when dynamically changing + * direction may be strange. Specifically the effect may re-upload itself and + * start playing from the start. You also cannot change the type either when + * running SDL_HapticUpdateEffect(). * - * \param haptic Haptic device that has the effect. - * \param effect Identifier of the effect to update. - * \param data New effect properties to use. - * \return 0 on success or -1 on error. + * \param haptic the SDL_Haptic device that has the effect + * \param effect the identifier of the effect to update + * \param data an SDL_HapticEffect structure containing the new effect + * properties to use + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_HapticNewEffect - * \sa SDL_HapticRunEffect - * \sa SDL_HapticDestroyEffect + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticDestroyEffect + * \sa SDL_HapticNewEffect + * \sa SDL_HapticRunEffect */ extern DECLSPEC int SDLCALL SDL_HapticUpdateEffect(SDL_Haptic * haptic, int effect, SDL_HapticEffect * data); /** - * \brief Runs the haptic effect on its associated haptic device. + * Run the haptic effect on its associated haptic device. * - * If iterations are ::SDL_HAPTIC_INFINITY, it'll run the effect over and over - * repeating the envelope (attack and fade) every time. If you only want the - * effect to last forever, set ::SDL_HAPTIC_INFINITY in the effect's length - * parameter. + * To repeat the effect over and over indefinitely, set `iterations` to + * `SDL_HAPTIC_INFINITY`. (Repeats the envelope - attack and fade.) To make + * one instance of the effect last indefinitely (so the effect does not fade), + * set the effect's `length` in its structure/union to `SDL_HAPTIC_INFINITY` + * instead. * - * \param haptic Haptic device to run the effect on. - * \param effect Identifier of the haptic effect to run. - * \param iterations Number of iterations to run the effect. Use - * ::SDL_HAPTIC_INFINITY for infinity. - * \return 0 on success or -1 on error. + * \param haptic the SDL_Haptic device to run the effect on + * \param effect the ID of the haptic effect to run + * \param iterations the number of iterations to run the effect; use + * `SDL_HAPTIC_INFINITY` to repeat forever + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_HapticStopEffect - * \sa SDL_HapticDestroyEffect - * \sa SDL_HapticGetEffectStatus + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticDestroyEffect + * \sa SDL_HapticGetEffectStatus + * \sa SDL_HapticStopEffect */ extern DECLSPEC int SDLCALL SDL_HapticRunEffect(SDL_Haptic * haptic, int effect, Uint32 iterations); /** - * \brief Stops the haptic effect on its associated haptic device. + * Stop the haptic effect on its associated haptic device. * - * \param haptic Haptic device to stop the effect on. - * \param effect Identifier of the effect to stop. - * \return 0 on success or -1 on error. + * * * - * \sa SDL_HapticRunEffect - * \sa SDL_HapticDestroyEffect + * \param haptic the SDL_Haptic device to stop the effect on + * \param effect the ID of the haptic effect to stop + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticDestroyEffect + * \sa SDL_HapticRunEffect */ extern DECLSPEC int SDLCALL SDL_HapticStopEffect(SDL_Haptic * haptic, int effect); /** - * \brief Destroys a haptic effect on the device. + * Destroy a haptic effect on the device. * - * This will stop the effect if it's running. Effects are automatically - * destroyed when the device is closed. + * This will stop the effect if it's running. Effects are automatically + * destroyed when the device is closed. * - * \param haptic Device to destroy the effect on. - * \param effect Identifier of the effect to destroy. + * \param haptic the SDL_Haptic device to destroy the effect on + * \param effect the ID of the haptic effect to destroy * - * \sa SDL_HapticNewEffect + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticNewEffect */ extern DECLSPEC void SDLCALL SDL_HapticDestroyEffect(SDL_Haptic * haptic, int effect); /** - * \brief Gets the status of the current effect on the haptic device. + * Get the status of the current effect on the specified haptic device. * - * Device must support the ::SDL_HAPTIC_STATUS feature. + * Device must support the SDL_HAPTIC_STATUS feature. * - * \param haptic Haptic device to query the effect status on. - * \param effect Identifier of the effect to query its status. - * \return 0 if it isn't playing, 1 if it is playing or -1 on error. + * \param haptic the SDL_Haptic device to query for the effect status on + * \param effect the ID of the haptic effect to query its status + * \returns 0 if it isn't playing, 1 if it is playing, or a negative error + * code on failure; call SDL_GetError() for more information. * - * \sa SDL_HapticRunEffect - * \sa SDL_HapticStopEffect + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticRunEffect + * \sa SDL_HapticStopEffect */ extern DECLSPEC int SDLCALL SDL_HapticGetEffectStatus(SDL_Haptic * haptic, int effect); /** - * \brief Sets the global gain of the device. + * Set the global gain of the specified haptic device. * - * Device must support the ::SDL_HAPTIC_GAIN feature. + * Device must support the SDL_HAPTIC_GAIN feature. * - * The user may specify the maximum gain by setting the environment variable - * SDL_HAPTIC_GAIN_MAX which should be between 0 and 100. All calls to - * SDL_HapticSetGain() will scale linearly using SDL_HAPTIC_GAIN_MAX as the - * maximum. + * The user may specify the maximum gain by setting the environment variable + * `SDL_HAPTIC_GAIN_MAX` which should be between 0 and 100. All calls to + * SDL_HapticSetGain() will scale linearly using `SDL_HAPTIC_GAIN_MAX` as the + * maximum. * - * \param haptic Haptic device to set the gain on. - * \param gain Value to set the gain to, should be between 0 and 100. - * \return 0 on success or -1 on error. + * \param haptic the SDL_Haptic device to set the gain on + * \param gain value to set the gain to, should be between 0 and 100 (0 - 100) + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_HapticQuery + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticQuery */ extern DECLSPEC int SDLCALL SDL_HapticSetGain(SDL_Haptic * haptic, int gain); /** - * \brief Sets the global autocenter of the device. + * Set the global autocenter of the device. * - * Autocenter should be between 0 and 100. Setting it to 0 will disable - * autocentering. + * Autocenter should be between 0 and 100. Setting it to 0 will disable + * autocentering. * - * Device must support the ::SDL_HAPTIC_AUTOCENTER feature. + * Device must support the SDL_HAPTIC_AUTOCENTER feature. * - * \param haptic Haptic device to set autocentering on. - * \param autocenter Value to set autocenter to, 0 disables autocentering. - * \return 0 on success or -1 on error. + * \param haptic the SDL_Haptic device to set autocentering on + * \param autocenter value to set autocenter to (0-100) + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_HapticQuery + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticQuery */ extern DECLSPEC int SDLCALL SDL_HapticSetAutocenter(SDL_Haptic * haptic, int autocenter); /** - * \brief Pauses a haptic device. + * Pause a haptic device. * - * Device must support the ::SDL_HAPTIC_PAUSE feature. Call - * SDL_HapticUnpause() to resume playback. + * Device must support the `SDL_HAPTIC_PAUSE` feature. Call + * SDL_HapticUnpause() to resume playback. * - * Do not modify the effects nor add new ones while the device is paused. - * That can cause all sorts of weird errors. + * Do not modify the effects nor add new ones while the device is paused. That + * can cause all sorts of weird errors. * - * \param haptic Haptic device to pause. - * \return 0 on success or -1 on error. + * \param haptic the SDL_Haptic device to pause + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_HapticUnpause + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticUnpause */ extern DECLSPEC int SDLCALL SDL_HapticPause(SDL_Haptic * haptic); /** - * \brief Unpauses a haptic device. + * Unpause a haptic device. * - * Call to unpause after SDL_HapticPause(). + * Call to unpause after SDL_HapticPause(). * - * \param haptic Haptic device to unpause. - * \return 0 on success or -1 on error. + * \param haptic the SDL_Haptic device to unpause + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_HapticPause + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticPause */ extern DECLSPEC int SDLCALL SDL_HapticUnpause(SDL_Haptic * haptic); /** - * \brief Stops all the currently playing effects on a haptic device. + * Stop all the currently playing effects on a haptic device. * - * \param haptic Haptic device to stop. - * \return 0 on success or -1 on error. + * \param haptic the SDL_Haptic device to stop + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC int SDLCALL SDL_HapticStopAll(SDL_Haptic * haptic); /** - * \brief Checks to see if rumble is supported on a haptic device. + * Check whether rumble is supported on a haptic device. * - * \param haptic Haptic device to check to see if it supports rumble. - * \return SDL_TRUE if effect is supported, SDL_FALSE if it isn't or -1 on error. + * \param haptic haptic device to check for rumble support + * \returns SDL_TRUE if effect is supported, SDL_FALSE if it isn't, or a + * negative error code on failure; call SDL_GetError() for more + * information. * - * \sa SDL_HapticRumbleInit - * \sa SDL_HapticRumblePlay - * \sa SDL_HapticRumbleStop + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticRumbleInit + * \sa SDL_HapticRumblePlay + * \sa SDL_HapticRumbleStop */ extern DECLSPEC int SDLCALL SDL_HapticRumbleSupported(SDL_Haptic * haptic); /** - * \brief Initializes the haptic device for simple rumble playback. + * Initialize a haptic device for simple rumble playback. * - * \param haptic Haptic device to initialize for simple rumble playback. - * \return 0 on success or -1 on error. + * \param haptic the haptic device to initialize for simple rumble playback + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_HapticOpen - * \sa SDL_HapticRumbleSupported - * \sa SDL_HapticRumblePlay - * \sa SDL_HapticRumbleStop + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticOpen + * \sa SDL_HapticRumblePlay + * \sa SDL_HapticRumbleStop + * \sa SDL_HapticRumbleSupported */ extern DECLSPEC int SDLCALL SDL_HapticRumbleInit(SDL_Haptic * haptic); /** - * \brief Runs simple rumble on a haptic device + * Run a simple rumble effect on a haptic device. * - * \param haptic Haptic device to play rumble effect on. - * \param strength Strength of the rumble to play as a 0-1 float value. - * \param length Length of the rumble to play in milliseconds. - * \return 0 on success or -1 on error. + * \param haptic the haptic device to play the rumble effect on + * \param strength strength of the rumble to play as a 0-1 float value + * \param length length of the rumble to play in milliseconds + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_HapticRumbleSupported - * \sa SDL_HapticRumbleInit - * \sa SDL_HapticRumbleStop + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticRumbleInit + * \sa SDL_HapticRumbleStop + * \sa SDL_HapticRumbleSupported */ extern DECLSPEC int SDLCALL SDL_HapticRumblePlay(SDL_Haptic * haptic, float strength, Uint32 length ); /** - * \brief Stops the simple rumble on a haptic device. + * Stop the simple rumble on a haptic device. * - * \param haptic Haptic to stop the rumble on. - * \return 0 on success or -1 on error. + * \param haptic the haptic device to stop the rumble effect on + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_HapticRumbleSupported - * \sa SDL_HapticRumbleInit - * \sa SDL_HapticRumblePlay + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HapticRumbleInit + * \sa SDL_HapticRumblePlay + * \sa SDL_HapticRumbleSupported */ extern DECLSPEC int SDLCALL SDL_HapticRumbleStop(SDL_Haptic * haptic); diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_hidapi.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_hidapi.h new file mode 100644 index 000000000..354af5c52 --- /dev/null +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_hidapi.h @@ -0,0 +1,451 @@ +/* + Simple DirectMedia Layer + Copyright (C) 1997-2022 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ + +/** + * \file SDL_hidapi.h + * + * Header file for SDL HIDAPI functions. + * + * This is an adaptation of the original HIDAPI interface by Alan Ott, + * and includes source code licensed under the following BSD license: + * + Copyright (c) 2010, Alan Ott, Signal 11 Software + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of Signal 11 Software nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + * + * If you would like a version of SDL without this code, you can build SDL + * with SDL_HIDAPI_DISABLED defined to 1. You might want to do this for example + * on iOS or tvOS to avoid a dependency on the CoreBluetooth framework. + */ + +#ifndef SDL_hidapi_h_ +#define SDL_hidapi_h_ + +#include "SDL_stdinc.h" + +#include "begin_code.h" +/* Set up for C function definitions, even when using C++ */ +#ifdef __cplusplus +extern "C" { +#endif + +/** + * \brief A handle representing an open HID device + */ +struct SDL_hid_device_; +typedef struct SDL_hid_device_ SDL_hid_device; /**< opaque hidapi structure */ + +/** hidapi info structure */ +/** + * \brief Information about a connected HID device + */ +typedef struct SDL_hid_device_info +{ + /** Platform-specific device path */ + char *path; + /** Device Vendor ID */ + unsigned short vendor_id; + /** Device Product ID */ + unsigned short product_id; + /** Serial Number */ + wchar_t *serial_number; + /** Device Release Number in binary-coded decimal, + also known as Device Version Number */ + unsigned short release_number; + /** Manufacturer String */ + wchar_t *manufacturer_string; + /** Product string */ + wchar_t *product_string; + /** Usage Page for this Device/Interface + (Windows/Mac only). */ + unsigned short usage_page; + /** Usage for this Device/Interface + (Windows/Mac only).*/ + unsigned short usage; + /** The USB interface which this logical device + represents. + + * Valid on both Linux implementations in all cases. + * Valid on the Windows implementation only if the device + contains more than one interface. */ + int interface_number; + + /** Additional information about the USB interface. + Valid on libusb and Android implementations. */ + int interface_class; + int interface_subclass; + int interface_protocol; + + /** Pointer to the next device */ + struct SDL_hid_device_info *next; +} SDL_hid_device_info; + + +/** + * Initialize the HIDAPI library. + * + * This function initializes the HIDAPI library. Calling it is not strictly + * necessary, as it will be called automatically by SDL_hid_enumerate() and + * any of the SDL_hid_open_*() functions if it is needed. This function should + * be called at the beginning of execution however, if there is a chance of + * HIDAPI handles being opened by different threads simultaneously. + * + * Each call to this function should have a matching call to SDL_hid_exit() + * + * \returns 0 on success and -1 on error. + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_hid_exit + */ +extern DECLSPEC int SDLCALL SDL_hid_init(void); + +/** + * Finalize the HIDAPI library. + * + * This function frees all of the static data associated with HIDAPI. It + * should be called at the end of execution to avoid memory leaks. + * + * \returns 0 on success and -1 on error. + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_hid_init + */ +extern DECLSPEC int SDLCALL SDL_hid_exit(void); + +/** + * Check to see if devices may have been added or removed. + * + * Enumerating the HID devices is an expensive operation, so you can call this + * to see if there have been any system device changes since the last call to + * this function. A change in the counter returned doesn't necessarily mean + * that anything has changed, but you can call SDL_hid_enumerate() to get an + * updated device list. + * + * Calling this function for the first time may cause a thread or other system + * resource to be allocated to track device change notifications. + * + * \returns a change counter that is incremented with each potential device + * change, or 0 if device change detection isn't available. + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_hid_enumerate + */ +extern DECLSPEC Uint32 SDLCALL SDL_hid_device_change_count(void); + +/** + * Enumerate the HID Devices. + * + * This function returns a linked list of all the HID devices attached to the + * system which match vendor_id and product_id. If `vendor_id` is set to 0 + * then any vendor matches. If `product_id` is set to 0 then any product + * matches. If `vendor_id` and `product_id` are both set to 0, then all HID + * devices will be returned. + * + * \param vendor_id The Vendor ID (VID) of the types of device to open. + * \param product_id The Product ID (PID) of the types of device to open. + * \returns a pointer to a linked list of type SDL_hid_device_info, containing + * information about the HID devices attached to the system, or NULL + * in the case of failure. Free this linked list by calling + * SDL_hid_free_enumeration(). + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_hid_device_change_count + */ +extern DECLSPEC SDL_hid_device_info * SDLCALL SDL_hid_enumerate(unsigned short vendor_id, unsigned short product_id); + +/** + * Free an enumeration Linked List + * + * This function frees a linked list created by SDL_hid_enumerate(). + * + * \param devs Pointer to a list of struct_device returned from + * SDL_hid_enumerate(). + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC void SDLCALL SDL_hid_free_enumeration(SDL_hid_device_info *devs); + +/** + * Open a HID device using a Vendor ID (VID), Product ID (PID) and optionally + * a serial number. + * + * If `serial_number` is NULL, the first device with the specified VID and PID + * is opened. + * + * \param vendor_id The Vendor ID (VID) of the device to open. + * \param product_id The Product ID (PID) of the device to open. + * \param serial_number The Serial Number of the device to open (Optionally + * NULL). + * \returns a pointer to a SDL_hid_device object on success or NULL on + * failure. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC SDL_hid_device * SDLCALL SDL_hid_open(unsigned short vendor_id, unsigned short product_id, const wchar_t *serial_number); + +/** + * Open a HID device by its path name. + * + * The path name be determined by calling SDL_hid_enumerate(), or a + * platform-specific path name can be used (eg: /dev/hidraw0 on Linux). + * + * \param path The path name of the device to open + * \returns a pointer to a SDL_hid_device object on success or NULL on + * failure. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC SDL_hid_device * SDLCALL SDL_hid_open_path(const char *path, int bExclusive /* = false */); + +/** + * Write an Output report to a HID device. + * + * The first byte of `data` must contain the Report ID. For devices which only + * support a single report, this must be set to 0x0. The remaining bytes + * contain the report data. Since the Report ID is mandatory, calls to + * SDL_hid_write() will always contain one more byte than the report contains. + * For example, if a hid report is 16 bytes long, 17 bytes must be passed to + * SDL_hid_write(), the Report ID (or 0x0, for devices with a single report), + * followed by the report data (16 bytes). In this example, the length passed + * in would be 17. + * + * SDL_hid_write() will send the data on the first OUT endpoint, if one + * exists. If it does not, it will send the data through the Control Endpoint + * (Endpoint 0). + * + * \param dev A device handle returned from SDL_hid_open(). + * \param data The data to send, including the report number as the first + * byte. + * \param length The length in bytes of the data to send. + * \returns the actual number of bytes written and -1 on error. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_hid_write(SDL_hid_device *dev, const unsigned char *data, size_t length); + +/** + * Read an Input report from a HID device with timeout. + * + * Input reports are returned to the host through the INTERRUPT IN endpoint. + * The first byte will contain the Report number if the device uses numbered + * reports. + * + * \param dev A device handle returned from SDL_hid_open(). + * \param data A buffer to put the read data into. + * \param length The number of bytes to read. For devices with multiple + * reports, make sure to read an extra byte for the report + * number. + * \param milliseconds timeout in milliseconds or -1 for blocking wait. + * \returns the actual number of bytes read and -1 on error. If no packet was + * available to be read within the timeout period, this function + * returns 0. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_hid_read_timeout(SDL_hid_device *dev, unsigned char *data, size_t length, int milliseconds); + +/** + * Read an Input report from a HID device. + * + * Input reports are returned to the host through the INTERRUPT IN endpoint. + * The first byte will contain the Report number if the device uses numbered + * reports. + * + * \param dev A device handle returned from SDL_hid_open(). + * \param data A buffer to put the read data into. + * \param length The number of bytes to read. For devices with multiple + * reports, make sure to read an extra byte for the report + * number. + * \returns the actual number of bytes read and -1 on error. If no packet was + * available to be read and the handle is in non-blocking mode, this + * function returns 0. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_hid_read(SDL_hid_device *dev, unsigned char *data, size_t length); + +/** + * Set the device handle to be non-blocking. + * + * In non-blocking mode calls to SDL_hid_read() will return immediately with a + * value of 0 if there is no data to be read. In blocking mode, SDL_hid_read() + * will wait (block) until there is data to read before returning. + * + * Nonblocking can be turned on and off at any time. + * + * \param dev A device handle returned from SDL_hid_open(). + * \param nonblock enable or not the nonblocking reads - 1 to enable + * nonblocking - 0 to disable nonblocking. + * \returns 0 on success and -1 on error. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_hid_set_nonblocking(SDL_hid_device *dev, int nonblock); + +/** + * Send a Feature report to the device. + * + * Feature reports are sent over the Control endpoint as a Set_Report + * transfer. The first byte of `data` must contain the Report ID. For devices + * which only support a single report, this must be set to 0x0. The remaining + * bytes contain the report data. Since the Report ID is mandatory, calls to + * SDL_hid_send_feature_report() will always contain one more byte than the + * report contains. For example, if a hid report is 16 bytes long, 17 bytes + * must be passed to SDL_hid_send_feature_report(): the Report ID (or 0x0, for + * devices which do not use numbered reports), followed by the report data (16 + * bytes). In this example, the length passed in would be 17. + * + * \param dev A device handle returned from SDL_hid_open(). + * \param data The data to send, including the report number as the first + * byte. + * \param length The length in bytes of the data to send, including the report + * number. + * \returns the actual number of bytes written and -1 on error. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_hid_send_feature_report(SDL_hid_device *dev, const unsigned char *data, size_t length); + +/** + * Get a feature report from a HID device. + * + * Set the first byte of `data` to the Report ID of the report to be read. + * Make sure to allow space for this extra byte in `data`. Upon return, the + * first byte will still contain the Report ID, and the report data will start + * in data[1]. + * + * \param dev A device handle returned from SDL_hid_open(). + * \param data A buffer to put the read data into, including the Report ID. + * Set the first byte of `data` to the Report ID of the report to + * be read, or set it to zero if your device does not use numbered + * reports. + * \param length The number of bytes to read, including an extra byte for the + * report ID. The buffer can be longer than the actual report. + * \returns the number of bytes read plus one for the report ID (which is + * still in the first byte), or -1 on error. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_hid_get_feature_report(SDL_hid_device *dev, unsigned char *data, size_t length); + +/** + * Close a HID device. + * + * \param dev A device handle returned from SDL_hid_open(). + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC void SDLCALL SDL_hid_close(SDL_hid_device *dev); + +/** + * Get The Manufacturer String from a HID device. + * + * \param dev A device handle returned from SDL_hid_open(). + * \param string A wide string buffer to put the data into. + * \param maxlen The length of the buffer in multiples of wchar_t. + * \returns 0 on success and -1 on error. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_hid_get_manufacturer_string(SDL_hid_device *dev, wchar_t *string, size_t maxlen); + +/** + * Get The Product String from a HID device. + * + * \param dev A device handle returned from SDL_hid_open(). + * \param string A wide string buffer to put the data into. + * \param maxlen The length of the buffer in multiples of wchar_t. + * \returns 0 on success and -1 on error. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_hid_get_product_string(SDL_hid_device *dev, wchar_t *string, size_t maxlen); + +/** + * Get The Serial Number String from a HID device. + * + * \param dev A device handle returned from SDL_hid_open(). + * \param string A wide string buffer to put the data into. + * \param maxlen The length of the buffer in multiples of wchar_t. + * \returns 0 on success and -1 on error. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_hid_get_serial_number_string(SDL_hid_device *dev, wchar_t *string, size_t maxlen); + +/** + * Get a string from a HID device, based on its string index. + * + * \param dev A device handle returned from SDL_hid_open(). + * \param string_index The index of the string to get. + * \param string A wide string buffer to put the data into. + * \param maxlen The length of the buffer in multiples of wchar_t. + * \returns 0 on success and -1 on error. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_hid_get_indexed_string(SDL_hid_device *dev, int string_index, wchar_t *string, size_t maxlen); + +/** + * Start or stop a BLE scan on iOS and tvOS to pair Steam Controllers + * + * \param active SDL_TRUE to start the scan, SDL_FALSE to stop the scan + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC void SDLCALL SDL_hid_ble_scan(SDL_bool active); + +/* Ends C function definitions when using C++ */ +#ifdef __cplusplus +} +#endif +#include "close_code.h" + +#endif /* SDL_hidapi_h_ */ + +/* vi: set sts=4 ts=4 sw=4 expandtab: */ diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_hints.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_hints.h index 8fa0dd660..1185f4222 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_hints.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_hints.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -48,316 +48,122 @@ extern "C" { #endif /** - * \brief A variable controlling how 3D acceleration is used to accelerate the SDL screen surface. - * - * SDL can try to accelerate the SDL screen surface by using streaming - * textures with a 3D rendering engine. This variable controls whether and - * how this is done. + * \brief A variable controlling whether the Android / iOS built-in + * accelerometer should be listed as a joystick device. * * This variable can be set to the following values: - * "0" - Disable 3D acceleration - * "1" - Enable 3D acceleration, using the default renderer. - * "X" - Enable 3D acceleration, using X where X is one of the valid rendering drivers. (e.g. "direct3d", "opengl", etc.) - * - * By default SDL tries to make a best guess for each platform whether - * to use acceleration or not. + * "0" - The accelerometer is not listed as a joystick + * "1" - The accelerometer is available as a 3 axis joystick (the default). */ -#define SDL_HINT_FRAMEBUFFER_ACCELERATION "SDL_FRAMEBUFFER_ACCELERATION" +#define SDL_HINT_ACCELEROMETER_AS_JOYSTICK "SDL_ACCELEROMETER_AS_JOYSTICK" /** - * \brief A variable specifying which render driver to use. + * \brief Specify the behavior of Alt+Tab while the keyboard is grabbed. * - * If the application doesn't pick a specific renderer to use, this variable - * specifies the name of the preferred renderer. If the preferred renderer - * can't be initialized, the normal default renderer is used. + * By default, SDL emulates Alt+Tab functionality while the keyboard is grabbed + * and your window is full-screen. This prevents the user from getting stuck in + * your application if you've enabled keyboard grab. * - * This variable is case insensitive and can be set to the following values: - * "direct3d" - * "opengl" - * "opengles2" - * "opengles" - * "metal" - * "software" - * - * The default varies by platform, but it's the first one in the list that - * is available on the current platform. - */ -#define SDL_HINT_RENDER_DRIVER "SDL_RENDER_DRIVER" + * The variable can be set to the following values: + * "0" - SDL will not handle Alt+Tab. Your application is responsible + for handling Alt+Tab while the keyboard is grabbed. + * "1" - SDL will minimize your window when Alt+Tab is pressed (default) +*/ +#define SDL_HINT_ALLOW_ALT_TAB_WHILE_GRABBED "SDL_ALLOW_ALT_TAB_WHILE_GRABBED" /** - * \brief A variable controlling whether the OpenGL render driver uses shaders if they are available. + * \brief If set to "0" then never set the top most bit on a SDL Window, even if the video mode expects it. + * This is a debugging aid for developers and not expected to be used by end users. The default is "1" * * This variable can be set to the following values: - * "0" - Disable shaders - * "1" - Enable shaders - * - * By default shaders are used if OpenGL supports them. + * "0" - don't allow topmost + * "1" - allow topmost */ -#define SDL_HINT_RENDER_OPENGL_SHADERS "SDL_RENDER_OPENGL_SHADERS" +#define SDL_HINT_ALLOW_TOPMOST "SDL_ALLOW_TOPMOST" /** - * \brief A variable controlling whether the Direct3D device is initialized for thread-safe operations. + * \brief Android APK expansion main file version. Should be a string number like "1", "2" etc. * - * This variable can be set to the following values: - * "0" - Thread-safety is not enabled (faster) - * "1" - Thread-safety is enabled + * Must be set together with SDL_HINT_ANDROID_APK_EXPANSION_PATCH_FILE_VERSION. * - * By default the Direct3D device is created with thread-safety disabled. + * If both hints were set then SDL_RWFromFile() will look into expansion files + * after a given relative path was not found in the internal storage and assets. + * + * By default this hint is not set and the APK expansion files are not searched. */ -#define SDL_HINT_RENDER_DIRECT3D_THREADSAFE "SDL_RENDER_DIRECT3D_THREADSAFE" +#define SDL_HINT_ANDROID_APK_EXPANSION_MAIN_FILE_VERSION "SDL_ANDROID_APK_EXPANSION_MAIN_FILE_VERSION" + +/** + * \brief Android APK expansion patch file version. Should be a string number like "1", "2" etc. + * + * Must be set together with SDL_HINT_ANDROID_APK_EXPANSION_MAIN_FILE_VERSION. + * + * If both hints were set then SDL_RWFromFile() will look into expansion files + * after a given relative path was not found in the internal storage and assets. + * + * By default this hint is not set and the APK expansion files are not searched. + */ +#define SDL_HINT_ANDROID_APK_EXPANSION_PATCH_FILE_VERSION "SDL_ANDROID_APK_EXPANSION_PATCH_FILE_VERSION" /** - * \brief A variable controlling whether to enable Direct3D 11+'s Debug Layer. + * \brief A variable to control whether the event loop will block itself when the app is paused. * - * This variable does not have any effect on the Direct3D 9 based renderer. + * The variable can be set to the following values: + * "0" - Non blocking. + * "1" - Blocking. (default) * - * This variable can be set to the following values: - * "0" - Disable Debug Layer use - * "1" - Enable Debug Layer use - * - * By default, SDL does not use Direct3D Debug Layer. + * The value should be set before SDL is initialized. */ -#define SDL_HINT_RENDER_DIRECT3D11_DEBUG "SDL_RENDER_DIRECT3D11_DEBUG" +#define SDL_HINT_ANDROID_BLOCK_ON_PAUSE "SDL_ANDROID_BLOCK_ON_PAUSE" /** - * \brief A variable controlling the scaling policy for SDL_RenderSetLogicalSize. + * \brief A variable to control whether SDL will pause audio in background + * (Requires SDL_ANDROID_BLOCK_ON_PAUSE as "Non blocking") * - * This variable can be set to the following values: - * "0" or "letterbox" - Uses letterbox/sidebars to fit the entire rendering on screen - * "1" or "overscan" - Will zoom the rendering so it fills the entire screen, allowing edges to be drawn offscreen + * The variable can be set to the following values: + * "0" - Non paused. + * "1" - Paused. (default) * - * By default letterbox is used + * The value should be set before SDL is initialized. */ -#define SDL_HINT_RENDER_LOGICAL_SIZE_MODE "SDL_RENDER_LOGICAL_SIZE_MODE" +#define SDL_HINT_ANDROID_BLOCK_ON_PAUSE_PAUSEAUDIO "SDL_ANDROID_BLOCK_ON_PAUSE_PAUSEAUDIO" /** - * \brief A variable controlling the scaling quality + * \brief A variable to control whether we trap the Android back button to handle it manually. + * This is necessary for the right mouse button to work on some Android devices, or + * to be able to trap the back button for use in your code reliably. If set to true, + * the back button will show up as an SDL_KEYDOWN / SDL_KEYUP pair with a keycode of + * SDL_SCANCODE_AC_BACK. * - * This variable can be set to the following values: - * "0" or "nearest" - Nearest pixel sampling - * "1" or "linear" - Linear filtering (supported by OpenGL and Direct3D) - * "2" or "best" - Currently this is the same as "linear" + * The variable can be set to the following values: + * "0" - Back button will be handled as usual for system. (default) + * "1" - Back button will be trapped, allowing you to handle the key press + * manually. (This will also let right mouse click work on systems + * where the right mouse button functions as back.) * - * By default nearest pixel sampling is used + * The value of this hint is used at runtime, so it can be changed at any time. */ -#define SDL_HINT_RENDER_SCALE_QUALITY "SDL_RENDER_SCALE_QUALITY" +#define SDL_HINT_ANDROID_TRAP_BACK_BUTTON "SDL_ANDROID_TRAP_BACK_BUTTON" /** - * \brief A variable controlling whether updates to the SDL screen surface should be synchronized with the vertical refresh, to avoid tearing. - * - * This variable can be set to the following values: - * "0" - Disable vsync - * "1" - Enable vsync - * - * By default SDL does not sync screen surface updates with vertical refresh. - */ -#define SDL_HINT_RENDER_VSYNC "SDL_RENDER_VSYNC" - -/** - * \brief A variable controlling whether the screensaver is enabled. - * - * This variable can be set to the following values: - * "0" - Disable screensaver - * "1" - Enable screensaver - * - * By default SDL will disable the screensaver. - */ -#define SDL_HINT_VIDEO_ALLOW_SCREENSAVER "SDL_VIDEO_ALLOW_SCREENSAVER" - -/** - * \brief A variable controlling whether the X11 VidMode extension should be used. - * - * This variable can be set to the following values: - * "0" - Disable XVidMode - * "1" - Enable XVidMode - * - * By default SDL will use XVidMode if it is available. - */ -#define SDL_HINT_VIDEO_X11_XVIDMODE "SDL_VIDEO_X11_XVIDMODE" - -/** - * \brief A variable controlling whether the X11 Xinerama extension should be used. - * - * This variable can be set to the following values: - * "0" - Disable Xinerama - * "1" - Enable Xinerama - * - * By default SDL will use Xinerama if it is available. - */ -#define SDL_HINT_VIDEO_X11_XINERAMA "SDL_VIDEO_X11_XINERAMA" - -/** - * \brief A variable controlling whether the X11 XRandR extension should be used. - * - * This variable can be set to the following values: - * "0" - Disable XRandR - * "1" - Enable XRandR - * - * By default SDL will not use XRandR because of window manager issues. - */ -#define SDL_HINT_VIDEO_X11_XRANDR "SDL_VIDEO_X11_XRANDR" - -/** - * \brief A variable controlling whether the X11 _NET_WM_PING protocol should be supported. - * - * This variable can be set to the following values: - * "0" - Disable _NET_WM_PING - * "1" - Enable _NET_WM_PING - * - * By default SDL will use _NET_WM_PING, but for applications that know they - * will not always be able to respond to ping requests in a timely manner they can - * turn it off to avoid the window manager thinking the app is hung. - * The hint is checked in CreateWindow. - */ -#define SDL_HINT_VIDEO_X11_NET_WM_PING "SDL_VIDEO_X11_NET_WM_PING" - -/** - * \brief A variable controlling whether the X11 _NET_WM_BYPASS_COMPOSITOR hint should be used. - * - * This variable can be set to the following values: - * "0" - Disable _NET_WM_BYPASS_COMPOSITOR - * "1" - Enable _NET_WM_BYPASS_COMPOSITOR - * - * By default SDL will use _NET_WM_BYPASS_COMPOSITOR + * \brief Specify an application name. * + * This hint lets you specify the application name sent to the OS when + * required. For example, this will often appear in volume control applets for + * audio streams, and in lists of applications which are inhibiting the + * screensaver. You should use a string that describes your program ("My Game + * 2: The Revenge") + * + * Setting this to "" or leaving it unset will have SDL use a reasonable + * default: probably the application's name or "SDL Application" if SDL + * doesn't have any better information. + * + * Note that, for audio streams, this can be overridden with + * SDL_HINT_AUDIO_DEVICE_APP_NAME. + * + * On targets where this is not supported, this hint does nothing. */ -#define SDL_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR "SDL_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR" - -/** - * \brief A variable controlling whether the window frame and title bar are interactive when the cursor is hidden - * - * This variable can be set to the following values: - * "0" - The window frame is not interactive when the cursor is hidden (no move, resize, etc) - * "1" - The window frame is interactive when the cursor is hidden - * - * By default SDL will allow interaction with the window frame when the cursor is hidden - */ -#define SDL_HINT_WINDOW_FRAME_USABLE_WHILE_CURSOR_HIDDEN "SDL_WINDOW_FRAME_USABLE_WHILE_CURSOR_HIDDEN" - -/** - * \brief A variable to specify custom icon resource id from RC file on Windows platform - */ -#define SDL_HINT_WINDOWS_INTRESOURCE_ICON "SDL_WINDOWS_INTRESOURCE_ICON" -#define SDL_HINT_WINDOWS_INTRESOURCE_ICON_SMALL "SDL_WINDOWS_INTRESOURCE_ICON_SMALL" - -/** - * \brief A variable controlling whether the windows message loop is processed by SDL - * - * This variable can be set to the following values: - * "0" - The window message loop is not run - * "1" - The window message loop is processed in SDL_PumpEvents() - * - * By default SDL will process the windows message loop - */ -#define SDL_HINT_WINDOWS_ENABLE_MESSAGELOOP "SDL_WINDOWS_ENABLE_MESSAGELOOP" - -/** - * \brief A variable controlling whether grabbing input grabs the keyboard - * - * This variable can be set to the following values: - * "0" - Grab will affect only the mouse - * "1" - Grab will affect mouse and keyboard - * - * By default SDL will not grab the keyboard so system shortcuts still work. - */ -#define SDL_HINT_GRAB_KEYBOARD "SDL_GRAB_KEYBOARD" - -/** - * \brief A variable setting the double click time, in milliseconds. - */ -#define SDL_HINT_MOUSE_DOUBLE_CLICK_TIME "SDL_MOUSE_DOUBLE_CLICK_TIME" - -/** - * \brief A variable setting the double click radius, in pixels. - */ -#define SDL_HINT_MOUSE_DOUBLE_CLICK_RADIUS "SDL_MOUSE_DOUBLE_CLICK_RADIUS" - -/** - * \brief A variable setting the speed scale for mouse motion, in floating point, when the mouse is not in relative mode - */ -#define SDL_HINT_MOUSE_NORMAL_SPEED_SCALE "SDL_MOUSE_NORMAL_SPEED_SCALE" - -/** - * \brief A variable setting the scale for mouse motion, in floating point, when the mouse is in relative mode - */ -#define SDL_HINT_MOUSE_RELATIVE_SPEED_SCALE "SDL_MOUSE_RELATIVE_SPEED_SCALE" - -/** - * \brief A variable controlling whether relative mouse mode is implemented using mouse warping - * - * This variable can be set to the following values: - * "0" - Relative mouse mode uses raw input - * "1" - Relative mouse mode uses mouse warping - * - * By default SDL will use raw input for relative mouse mode - */ -#define SDL_HINT_MOUSE_RELATIVE_MODE_WARP "SDL_MOUSE_RELATIVE_MODE_WARP" - -/** - * \brief Allow mouse click events when clicking to focus an SDL window - * - * This variable can be set to the following values: - * "0" - Ignore mouse clicks that activate a window - * "1" - Generate events for mouse clicks that activate a window - * - * By default SDL will ignore mouse clicks that activate a window - */ -#define SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH "SDL_MOUSE_FOCUS_CLICKTHROUGH" - -/** - * \brief A variable controlling whether touch events should generate synthetic mouse events - * - * This variable can be set to the following values: - * "0" - Touch events will not generate mouse events - * "1" - Touch events will generate mouse events - * - * By default SDL will generate mouse events for touch events - */ -#define SDL_HINT_TOUCH_MOUSE_EVENTS "SDL_TOUCH_MOUSE_EVENTS" - -/** - * \brief A variable controlling whether mouse events should generate synthetic touch events - * - * This variable can be set to the following values: - * "0" - Mouse events will not generate touch events (default for desktop platforms) - * "1" - Mouse events will generate touch events (default for mobile platforms, such as Android and iOS) - */ - -#define SDL_HINT_MOUSE_TOUCH_EVENTS "SDL_MOUSE_TOUCH_EVENTS" - -/** - * \brief Minimize your SDL_Window if it loses key focus when in fullscreen mode. Defaults to true. - * - */ -#define SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS "SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS" - -/** - * \brief A variable controlling whether the idle timer is disabled on iOS. - * - * When an iOS app does not receive touches for some time, the screen is - * dimmed automatically. For games where the accelerometer is the only input - * this is problematic. This functionality can be disabled by setting this - * hint. - * - * As of SDL 2.0.4, SDL_EnableScreenSaver() and SDL_DisableScreenSaver() - * accomplish the same thing on iOS. They should be preferred over this hint. - * - * This variable can be set to the following values: - * "0" - Enable idle timer - * "1" - Disable idle timer - */ -#define SDL_HINT_IDLE_TIMER_DISABLED "SDL_IOS_IDLE_TIMER_DISABLED" - -/** - * \brief A variable controlling which orientations are allowed on iOS/Android. - * - * In some circumstances it is necessary to be able to explicitly control - * which UI orientations are allowed. - * - * This variable is a space delimited list of the following values: - * "LandscapeLeft", "LandscapeRight", "Portrait" "PortraitUpsideDown" - */ -#define SDL_HINT_ORIENTATIONS "SDL_IOS_ORIENTATIONS" +#define SDL_HINT_APP_NAME "SDL_APP_NAME" /** * \brief A variable controlling whether controllers used with the Apple TV @@ -388,53 +194,240 @@ extern "C" { #define SDL_HINT_APPLE_TV_REMOTE_ALLOW_ROTATION "SDL_APPLE_TV_REMOTE_ALLOW_ROTATION" /** - * \brief A variable controlling whether the home indicator bar on iPhone X - * should be hidden. + * \brief A variable controlling the audio category on iOS and Mac OS X * * This variable can be set to the following values: - * "0" - The indicator bar is not hidden (default for windowed applications) - * "1" - The indicator bar is hidden and is shown when the screen is touched (useful for movie playback applications) - * "2" - The indicator bar is dim and the first swipe makes it visible and the second swipe performs the "home" action (default for fullscreen applications) + * + * "ambient" - Use the AVAudioSessionCategoryAmbient audio category, will be muted by the phone mute switch (default) + * "playback" - Use the AVAudioSessionCategoryPlayback category + * + * For more information, see Apple's documentation: + * https://developer.apple.com/library/content/documentation/Audio/Conceptual/AudioSessionProgrammingGuide/AudioSessionCategoriesandModes/AudioSessionCategoriesandModes.html */ -#define SDL_HINT_IOS_HIDE_HOME_INDICATOR "SDL_IOS_HIDE_HOME_INDICATOR" +#define SDL_HINT_AUDIO_CATEGORY "SDL_AUDIO_CATEGORY" /** - * \brief A variable controlling whether the Android / iOS built-in - * accelerometer should be listed as a joystick device. + * \brief Specify an application name for an audio device. + * + * Some audio backends (such as PulseAudio) allow you to describe your audio + * stream. Among other things, this description might show up in a system + * control panel that lets the user adjust the volume on specific audio + * streams instead of using one giant master volume slider. + * + * This hints lets you transmit that information to the OS. The contents of + * this hint are used while opening an audio device. You should use a string + * that describes your program ("My Game 2: The Revenge") + * + * Setting this to "" or leaving it unset will have SDL use a reasonable + * default: this will be the name set with SDL_HINT_APP_NAME, if that hint is + * set. Otherwise, it'll probably the application's name or "SDL Application" + * if SDL doesn't have any better information. + * + * On targets where this is not supported, this hint does nothing. + */ +#define SDL_HINT_AUDIO_DEVICE_APP_NAME "SDL_AUDIO_DEVICE_APP_NAME" + +/** + * \brief Specify an application name for an audio device. + * + * Some audio backends (such as PulseAudio) allow you to describe your audio + * stream. Among other things, this description might show up in a system + * control panel that lets the user adjust the volume on specific audio + * streams instead of using one giant master volume slider. + * + * This hints lets you transmit that information to the OS. The contents of + * this hint are used while opening an audio device. You should use a string + * that describes your what your program is playing ("audio stream" is + * probably sufficient in many cases, but this could be useful for something + * like "team chat" if you have a headset playing VoIP audio separately). + * + * Setting this to "" or leaving it unset will have SDL use a reasonable + * default: "audio stream" or something similar. + * + * On targets where this is not supported, this hint does nothing. + */ +#define SDL_HINT_AUDIO_DEVICE_STREAM_NAME "SDL_AUDIO_DEVICE_STREAM_NAME" + +/** + * \brief Specify an application role for an audio device. + * + * Some audio backends (such as Pipewire) allow you to describe the role of + * your audio stream. Among other things, this description might show up in + * a system control panel or software for displaying and manipulating media + * playback/capture graphs. + * + * This hints lets you transmit that information to the OS. The contents of + * this hint are used while opening an audio device. You should use a string + * that describes your what your program is playing (Game, Music, Movie, + * etc...). + * + * Setting this to "" or leaving it unset will have SDL use a reasonable + * default: "Game" or something similar. + * + * On targets where this is not supported, this hint does nothing. + */ +#define SDL_HINT_AUDIO_DEVICE_STREAM_ROLE "SDL_AUDIO_DEVICE_STREAM_ROLE" + +/** + * \brief A variable controlling speed/quality tradeoff of audio resampling. + * + * If available, SDL can use libsamplerate ( http://www.mega-nerd.com/SRC/ ) + * to handle audio resampling. There are different resampling modes available + * that produce different levels of quality, using more CPU. + * + * If this hint isn't specified to a valid setting, or libsamplerate isn't + * available, SDL will use the default, internal resampling algorithm. + * + * Note that this is currently only applicable to resampling audio that is + * being written to a device for playback or audio being read from a device + * for capture. SDL_AudioCVT always uses the default resampler (although this + * might change for SDL 2.1). + * + * This hint is currently only checked at audio subsystem initialization. * * This variable can be set to the following values: - * "0" - The accelerometer is not listed as a joystick - * "1" - The accelerometer is available as a 3 axis joystick (the default). + * + * "0" or "default" - Use SDL's internal resampling (Default when not set - low quality, fast) + * "1" or "fast" - Use fast, slightly higher quality resampling, if available + * "2" or "medium" - Use medium quality resampling, if available + * "3" or "best" - Use high quality resampling, if available */ -#define SDL_HINT_ACCELEROMETER_AS_JOYSTICK "SDL_ACCELEROMETER_AS_JOYSTICK" +#define SDL_HINT_AUDIO_RESAMPLING_MODE "SDL_AUDIO_RESAMPLING_MODE" /** - * \brief A variable controlling whether the Android / tvOS remotes - * should be listed as joystick devices, instead of sending keyboard events. + * \brief A variable controlling whether SDL updates joystick state when getting input events * * This variable can be set to the following values: - * "0" - Remotes send enter/escape/arrow key events - * "1" - Remotes are available as 2 axis, 2 button joysticks (the default). + * + * "0" - You'll call SDL_JoystickUpdate() manually + * "1" - SDL will automatically call SDL_JoystickUpdate() (default) + * + * This hint can be toggled on and off at runtime. */ -#define SDL_HINT_TV_REMOTE_AS_JOYSTICK "SDL_TV_REMOTE_AS_JOYSTICK" +#define SDL_HINT_AUTO_UPDATE_JOYSTICKS "SDL_AUTO_UPDATE_JOYSTICKS" /** - * \brief A variable that lets you disable the detection and use of Xinput gamepad devices + * \brief A variable controlling whether SDL updates sensor state when getting input events + * + * This variable can be set to the following values: + * + * "0" - You'll call SDL_SensorUpdate() manually + * "1" - SDL will automatically call SDL_SensorUpdate() (default) + * + * This hint can be toggled on and off at runtime. + */ +#define SDL_HINT_AUTO_UPDATE_SENSORS "SDL_AUTO_UPDATE_SENSORS" + +/** + * \brief Prevent SDL from using version 4 of the bitmap header when saving BMPs. + * + * The bitmap header version 4 is required for proper alpha channel support and + * SDL will use it when required. Should this not be desired, this hint can + * force the use of the 40 byte header version which is supported everywhere. + * + * The variable can be set to the following values: + * "0" - Surfaces with a colorkey or an alpha channel are saved to a + * 32-bit BMP file with an alpha mask. SDL will use the bitmap + * header version 4 and set the alpha mask accordingly. + * "1" - Surfaces with a colorkey or an alpha channel are saved to a + * 32-bit BMP file without an alpha mask. The alpha channel data + * will be in the file, but applications are going to ignore it. + * + * The default value is "0". + */ +#define SDL_HINT_BMP_SAVE_LEGACY_FORMAT "SDL_BMP_SAVE_LEGACY_FORMAT" + +/** + * \brief Override for SDL_GetDisplayUsableBounds() + * + * If set, this hint will override the expected results for + * SDL_GetDisplayUsableBounds() for display index 0. Generally you don't want + * to do this, but this allows an embedded system to request that some of the + * screen be reserved for other uses when paired with a well-behaved + * application. + * + * The contents of this hint must be 4 comma-separated integers, the first + * is the bounds x, then y, width and height, in that order. + */ +#define SDL_HINT_DISPLAY_USABLE_BOUNDS "SDL_DISPLAY_USABLE_BOUNDS" + +/** + * \brief Disable giving back control to the browser automatically + * when running with asyncify + * + * With -s ASYNCIFY, SDL2 calls emscripten_sleep during operations + * such as refreshing the screen or polling events. + * + * This hint only applies to the emscripten platform + * + * The variable can be set to the following values: + * "0" - Disable emscripten_sleep calls (if you give back browser control manually or use asyncify for other purposes) + * "1" - Enable emscripten_sleep calls (the default) + */ +#define SDL_HINT_EMSCRIPTEN_ASYNCIFY "SDL_EMSCRIPTEN_ASYNCIFY" + +/** + * \brief override the binding element for keyboard inputs for Emscripten builds + * + * This hint only applies to the emscripten platform + * + * The variable can be one of + * "#window" - The javascript window object (this is the default) + * "#document" - The javascript document object + * "#screen" - the javascript window.screen object + * "#canvas" - the WebGL canvas element + * any other string without a leading # sign applies to the element on the page with that ID. + */ +#define SDL_HINT_EMSCRIPTEN_KEYBOARD_ELEMENT "SDL_EMSCRIPTEN_KEYBOARD_ELEMENT" + +/** + * \brief A variable that controls whether Steam Controllers should be exposed using the SDL joystick and game controller APIs * * The variable can be set to the following values: - * "0" - Disable XInput detection (only uses direct input) - * "1" - Enable XInput detection (the default) + * "0" - Do not scan for Steam Controllers + * "1" - Scan for Steam Controllers (the default) + * + * The default value is "1". This hint must be set before initializing the joystick subsystem. */ -#define SDL_HINT_XINPUT_ENABLED "SDL_XINPUT_ENABLED" +#define SDL_HINT_ENABLE_STEAM_CONTROLLERS "SDL_ENABLE_STEAM_CONTROLLERS" /** - * \brief A variable that causes SDL to use the old axis and button mapping for XInput devices. + * \brief A variable controlling whether SDL logs all events pushed onto its internal queue. * - * This hint is for backwards compatibility only and will be removed in SDL 2.1 + * This variable can be set to the following values: * - * The default value is "0". This hint must be set before SDL_Init() + * "0" - Don't log any events (default) + * "1" - Log all events except mouse and finger motion, which are pretty spammy. + * "2" - Log all events. + * + * This is generally meant to be used to debug SDL itself, but can be useful + * for application developers that need better visibility into what is going + * on in the event queue. Logged events are sent through SDL_Log(), which + * means by default they appear on stdout on most platforms or maybe + * OutputDebugString() on Windows, and can be funneled by the app with + * SDL_LogSetOutputFunction(), etc. + * + * This hint can be toggled on and off at runtime, if you only need to log + * events for a small subset of program execution. */ -#define SDL_HINT_XINPUT_USE_OLD_JOYSTICK_MAPPING "SDL_XINPUT_USE_OLD_JOYSTICK_MAPPING" +#define SDL_HINT_EVENT_LOGGING "SDL_EVENT_LOGGING" + +/** + * \brief A variable controlling how 3D acceleration is used to accelerate the SDL screen surface. + * + * SDL can try to accelerate the SDL screen surface by using streaming + * textures with a 3D rendering engine. This variable controls whether and + * how this is done. + * + * This variable can be set to the following values: + * "0" - Disable 3D acceleration + * "1" - Enable 3D acceleration, using the default renderer. + * "X" - Enable 3D acceleration, using X where X is one of the valid rendering drivers. (e.g. "direct3d", "opengl", etc.) + * + * By default SDL tries to make a best guess for each platform whether + * to use acceleration or not. + */ +#define SDL_HINT_FRAMEBUFFER_ACCELERATION "SDL_FRAMEBUFFER_ACCELERATION" /** * \brief A variable that lets you manually hint extra gamecontroller db entries. @@ -456,6 +449,25 @@ extern "C" { */ #define SDL_HINT_GAMECONTROLLERCONFIG_FILE "SDL_GAMECONTROLLERCONFIG_FILE" +/** + * \brief A variable that overrides the automatic controller type detection + * + * The variable should be comma separated entries, in the form: VID/PID=type + * + * The VID and PID should be hexadecimal with exactly 4 digits, e.g. 0x00fd + * + * The type should be one of: + * Xbox360 + * XboxOne + * PS3 + * PS4 + * PS5 + * SwitchPro + * + * This hint affects what driver is used, and must be set before calling SDL_Init(SDL_INIT_GAMECONTROLLER) + */ +#define SDL_HINT_GAMECONTROLLERTYPE "SDL_GAMECONTROLLERTYPE" + /** * \brief A variable containing a list of devices to skip when scanning for game controllers. * @@ -482,6 +494,89 @@ extern "C" { */ #define SDL_HINT_GAMECONTROLLER_IGNORE_DEVICES_EXCEPT "SDL_GAMECONTROLLER_IGNORE_DEVICES_EXCEPT" +/** + * \brief If set, game controller face buttons report their values according to their labels instead of their positional layout. + * + * For example, on Nintendo Switch controllers, normally you'd get: + * + * (Y) + * (X) (B) + * (A) + * + * but if this hint is set, you'll get: + * + * (X) + * (Y) (A) + * (B) + * + * The variable can be set to the following values: + * "0" - Report the face buttons by position, as though they were on an Xbox controller. + * "1" - Report the face buttons by label instead of position + * + * The default value is "1". This hint may be set at any time. + */ +#define SDL_HINT_GAMECONTROLLER_USE_BUTTON_LABELS "SDL_GAMECONTROLLER_USE_BUTTON_LABELS" + +/** + * \brief A variable controlling whether grabbing input grabs the keyboard + * + * This variable can be set to the following values: + * "0" - Grab will affect only the mouse + * "1" - Grab will affect mouse and keyboard + * + * By default SDL will not grab the keyboard so system shortcuts still work. + */ +#define SDL_HINT_GRAB_KEYBOARD "SDL_GRAB_KEYBOARD" + +/** + * \brief A variable controlling whether the idle timer is disabled on iOS. + * + * When an iOS app does not receive touches for some time, the screen is + * dimmed automatically. For games where the accelerometer is the only input + * this is problematic. This functionality can be disabled by setting this + * hint. + * + * As of SDL 2.0.4, SDL_EnableScreenSaver() and SDL_DisableScreenSaver() + * accomplish the same thing on iOS. They should be preferred over this hint. + * + * This variable can be set to the following values: + * "0" - Enable idle timer + * "1" - Disable idle timer + */ +#define SDL_HINT_IDLE_TIMER_DISABLED "SDL_IOS_IDLE_TIMER_DISABLED" + +/** + * \brief A variable to control whether certain IMEs should handle text editing internally instead of sending SDL_TEXTEDITING events. + * + * The variable can be set to the following values: + * "0" - SDL_TEXTEDITING events are sent, and it is the application's + * responsibility to render the text from these events and + * differentiate it somehow from committed text. (default) + * "1" - If supported by the IME then SDL_TEXTEDITING events are not sent, + * and text that is being composed will be rendered in its own UI. + */ +#define SDL_HINT_IME_INTERNAL_EDITING "SDL_IME_INTERNAL_EDITING" + +/** + * \brief A variable to control whether certain IMEs should show native UI components (such as the Candidate List) instead of suppressing them. + * + * The variable can be set to the following values: + * "0" - Native UI components are not display. (default) + * "1" - Native UI components are displayed. + */ +#define SDL_HINT_IME_SHOW_UI "SDL_IME_SHOW_UI" + +/** + * \brief A variable controlling whether the home indicator bar on iPhone X + * should be hidden. + * + * This variable can be set to the following values: + * "0" - The indicator bar is not hidden (default for windowed applications) + * "1" - The indicator bar is hidden and is shown when the screen is touched (useful for movie playback applications) + * "2" - The indicator bar is dim and the first swipe makes it visible and the second swipe performs the "home" action (default for fullscreen applications) + */ +#define SDL_HINT_IOS_HIDE_HOME_INDICATOR "SDL_IOS_HIDE_HOME_INDICATOR" + /** * \brief A variable that lets you enable joystick (and gamecontroller) events even when your app is in the background. * @@ -506,6 +601,39 @@ extern "C" { */ #define SDL_HINT_JOYSTICK_HIDAPI "SDL_JOYSTICK_HIDAPI" +/** + * \brief A variable controlling whether the HIDAPI driver for Nintendo GameCube controllers should be used. + * + * This variable can be set to the following values: + * "0" - HIDAPI driver is not used + * "1" - HIDAPI driver is used + * + * The default is the value of SDL_HINT_JOYSTICK_HIDAPI + */ +#define SDL_HINT_JOYSTICK_HIDAPI_GAMECUBE "SDL_JOYSTICK_HIDAPI_GAMECUBE" + + /** + * \brief A variable controlling whether Switch Joy-Cons should be treated the same as Switch Pro Controllers when using the HIDAPI driver. + * + * This variable can be set to the following values: + * "0" - basic Joy-Con support with no analog input (the default) + * "1" - Joy-Cons treated as half full Pro Controllers with analog inputs and sensors + * + * This does not combine Joy-Cons into a single controller. That's up to the user. + */ +#define SDL_HINT_JOYSTICK_HIDAPI_JOY_CONS "SDL_JOYSTICK_HIDAPI_JOY_CONS" + + /** + * \brief A variable controlling whether the HIDAPI driver for Amazon Luna controllers connected via Bluetooth should be used. + * + * This variable can be set to the following values: + * "0" - HIDAPI driver is not used + * "1" - HIDAPI driver is used + * + * The default is the value of SDL_HINT_JOYSTICK_HIDAPI + */ +#define SDL_HINT_JOYSTICK_HIDAPI_LUNA "SDL_JOYSTICK_HIDAPI_LUNA" + /** * \brief A variable controlling whether the HIDAPI driver for PS4 controllers should be used. * @@ -529,11 +657,16 @@ extern "C" { * * Once extended reports are enabled, they can not be disabled without * power cycling the controller. + * + * For compatibility with applications written for versions of SDL prior + * to the introduction of PS5 controller support, this value will also + * control the state of extended reports on PS5 controllers when the + * SDL_HINT_JOYSTICK_HIDAPI_PS5_RUMBLE hint is not explicitly set. */ #define SDL_HINT_JOYSTICK_HIDAPI_PS4_RUMBLE "SDL_JOYSTICK_HIDAPI_PS4_RUMBLE" /** - * \brief A variable controlling whether the HIDAPI driver for Steam Controllers should be used. + * \brief A variable controlling whether the HIDAPI driver for PS5 controllers should be used. * * This variable can be set to the following values: * "0" - HIDAPI driver is not used @@ -541,6 +674,57 @@ extern "C" { * * The default is the value of SDL_HINT_JOYSTICK_HIDAPI */ +#define SDL_HINT_JOYSTICK_HIDAPI_PS5 "SDL_JOYSTICK_HIDAPI_PS5" + +/** + * \brief A variable controlling whether the player LEDs should be lit to indicate which player is associated with a PS5 controller. + * + * This variable can be set to the following values: + * "0" - player LEDs are not enabled + * "1" - player LEDs are enabled (the default) + */ +#define SDL_HINT_JOYSTICK_HIDAPI_PS5_PLAYER_LED "SDL_JOYSTICK_HIDAPI_PS5_PLAYER_LED" + +/** + * \brief A variable controlling whether extended input reports should be used for PS5 controllers when using the HIDAPI driver. + * + * This variable can be set to the following values: + * "0" - extended reports are not enabled (the default) + * "1" - extended reports + * + * Extended input reports allow rumble on Bluetooth PS5 controllers, but + * break DirectInput handling for applications that don't use SDL. + * + * Once extended reports are enabled, they can not be disabled without + * power cycling the controller. + * + * For compatibility with applications written for versions of SDL prior + * to the introduction of PS5 controller support, this value defaults to + * the value of SDL_HINT_JOYSTICK_HIDAPI_PS4_RUMBLE. + */ +#define SDL_HINT_JOYSTICK_HIDAPI_PS5_RUMBLE "SDL_JOYSTICK_HIDAPI_PS5_RUMBLE" + +/** + * \brief A variable controlling whether the HIDAPI driver for Google Stadia controllers should be used. + * + * This variable can be set to the following values: + * "0" - HIDAPI driver is not used + * "1" - HIDAPI driver is used + * + * The default is the value of SDL_HINT_JOYSTICK_HIDAPI + */ +#define SDL_HINT_JOYSTICK_HIDAPI_STADIA "SDL_JOYSTICK_HIDAPI_STADIA" + +/** + * \brief A variable controlling whether the HIDAPI driver for Steam Controllers should be used. + * + * This variable can be set to the following values: + * "0" - HIDAPI driver is not used + * "1" - HIDAPI driver is used for Steam Controllers, which requires Bluetooth access + * and may prompt the user for permission on iOS and Android. + * + * The default is "0" + */ #define SDL_HINT_JOYSTICK_HIDAPI_STEAM "SDL_JOYSTICK_HIDAPI_STEAM" /** @@ -554,6 +738,17 @@ extern "C" { */ #define SDL_HINT_JOYSTICK_HIDAPI_SWITCH "SDL_JOYSTICK_HIDAPI_SWITCH" +/** + * \brief A variable controlling whether the Home button LED should be turned on when a Nintendo Switch controller is opened + * + * This variable can be set to the following values: + * "0" - home button LED is turned off + * "1" - home button LED is turned on + * + * By default the Home button LED state is not changed. + */ +#define SDL_HINT_JOYSTICK_HIDAPI_SWITCH_HOME_LED "SDL_JOYSTICK_HIDAPI_SWITCH_HOME_LED" + /** * \brief A variable controlling whether the HIDAPI driver for XBox controllers should be used. * @@ -561,48 +756,256 @@ extern "C" { * "0" - HIDAPI driver is not used * "1" - HIDAPI driver is used * - * The default is the value of SDL_HINT_JOYSTICK_HIDAPI + * The default is "0" on Windows, otherwise the value of SDL_HINT_JOYSTICK_HIDAPI */ #define SDL_HINT_JOYSTICK_HIDAPI_XBOX "SDL_JOYSTICK_HIDAPI_XBOX" + /** + * \brief A variable controlling whether the RAWINPUT joystick drivers should be used for better handling XInput-capable devices. + * + * This variable can be set to the following values: + * "0" - RAWINPUT drivers are not used + * "1" - RAWINPUT drivers are used (the default) + * + */ +#define SDL_HINT_JOYSTICK_RAWINPUT "SDL_JOYSTICK_RAWINPUT" + + /** + * \brief A variable controlling whether the RAWINPUT driver should pull correlated data from XInput. + * + * This variable can be set to the following values: + * "0" - RAWINPUT driver will only use data from raw input APIs + * "1" - RAWINPUT driver will also pull data from XInput, providing + * better trigger axes, guide button presses, and rumble support + * for Xbox controllers + * + * The default is "1". This hint applies to any joysticks opened after setting the hint. + */ +#define SDL_HINT_JOYSTICK_RAWINPUT_CORRELATE_XINPUT "SDL_JOYSTICK_RAWINPUT_CORRELATE_XINPUT" + + /** + * \brief A variable controlling whether a separate thread should be used + * for handling joystick detection and raw input messages on Windows + * + * This variable can be set to the following values: + * "0" - A separate thread is not used (the default) + * "1" - A separate thread is used for handling raw input messages + * + */ +#define SDL_HINT_JOYSTICK_THREAD "SDL_JOYSTICK_THREAD" + /** - * \brief A variable that controls whether Steam Controllers should be exposed using the SDL joystick and game controller APIs + * \brief Determines whether SDL enforces that DRM master is required in order + * to initialize the KMSDRM video backend. * - * The variable can be set to the following values: - * "0" - Do not scan for Steam Controllers - * "1" - Scan for Steam Controllers (the default) + * The DRM subsystem has a concept of a "DRM master" which is a DRM client that + * has the ability to set planes, set cursor, etc. When SDL is DRM master, it + * can draw to the screen using the SDL rendering APIs. Without DRM master, SDL + * is still able to process input and query attributes of attached displays, + * but it cannot change display state or draw to the screen directly. * - * The default value is "1". This hint must be set before initializing the joystick subsystem. + * In some cases, it can be useful to have the KMSDRM backend even if it cannot + * be used for rendering. An app may want to use SDL for input processing while + * using another rendering API (such as an MMAL overlay on Raspberry Pi) or + * using its own code to render to DRM overlays that SDL doesn't support. + * + * This hint must be set before initializing the video subsystem. + * + * This variable can be set to the following values: + * "0" - SDL will allow usage of the KMSDRM backend without DRM master + * "1" - SDL Will require DRM master to use the KMSDRM backend (default) */ -#define SDL_HINT_ENABLE_STEAM_CONTROLLERS "SDL_ENABLE_STEAM_CONTROLLERS" +#define SDL_HINT_KMSDRM_REQUIRE_DRM_MASTER "SDL_KMSDRM_REQUIRE_DRM_MASTER" + /** + * \brief A comma separated list of devices to open as joysticks + * + * This variable is currently only used by the Linux joystick driver. + */ +#define SDL_HINT_JOYSTICK_DEVICE "SDL_JOYSTICK_DEVICE" + + /** + * \brief A variable controlling whether to use the classic /dev/input/js* joystick interface or the newer /dev/input/event* joystick interface on Linux + * + * This variable can be set to the following values: + * "0" - Use /dev/input/event* + * "1" - Use /dev/input/js* + * + * By default the /dev/input/event* interfaces are used + */ +#define SDL_HINT_LINUX_JOYSTICK_CLASSIC "SDL_LINUX_JOYSTICK_CLASSIC" + + /** + * \brief A variable controlling whether joysticks on Linux adhere to their HID-defined deadzones or return unfiltered values. + * + * This variable can be set to the following values: + * "0" - Return unfiltered joystick axis values (the default) + * "1" - Return axis values with deadzones taken into account + */ +#define SDL_HINT_LINUX_JOYSTICK_DEADZONES "SDL_LINUX_JOYSTICK_DEADZONES" /** - * \brief If set to "0" then never set the top most bit on a SDL Window, even if the video mode expects it. - * This is a debugging aid for developers and not expected to be used by end users. The default is "1" +* \brief When set don't force the SDL app to become a foreground process +* +* This hint only applies to Mac OS X. +* +*/ +#define SDL_HINT_MAC_BACKGROUND_APP "SDL_MAC_BACKGROUND_APP" + +/** + * \brief A variable that determines whether ctrl+click should generate a right-click event on Mac + * + * If present, holding ctrl while left clicking will generate a right click + * event when on Mac. + */ +#define SDL_HINT_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK "SDL_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK" + +/** + * \brief A variable setting the double click radius, in pixels. + */ +#define SDL_HINT_MOUSE_DOUBLE_CLICK_RADIUS "SDL_MOUSE_DOUBLE_CLICK_RADIUS" + +/** + * \brief A variable setting the double click time, in milliseconds. + */ +#define SDL_HINT_MOUSE_DOUBLE_CLICK_TIME "SDL_MOUSE_DOUBLE_CLICK_TIME" + +/** + * \brief Allow mouse click events when clicking to focus an SDL window * * This variable can be set to the following values: - * "0" - don't allow topmost - * "1" - allow topmost + * "0" - Ignore mouse clicks that activate a window + * "1" - Generate events for mouse clicks that activate a window + * + * By default SDL will ignore mouse clicks that activate a window */ -#define SDL_HINT_ALLOW_TOPMOST "SDL_ALLOW_TOPMOST" +#define SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH "SDL_MOUSE_FOCUS_CLICKTHROUGH" /** - * \brief A variable that controls the timer resolution, in milliseconds. - * - * The higher resolution the timer, the more frequently the CPU services - * timer interrupts, and the more precise delays are, but this takes up - * power and CPU time. This hint is only used on Windows 7 and earlier. - * - * See this blog post for more information: - * http://randomascii.wordpress.com/2013/07/08/windows-timer-resolution-megawatts-wasted/ - * - * If this variable is set to "0", the system timer resolution is not set. - * - * The default value is "1". This hint may be set at any time. + * \brief A variable setting the speed scale for mouse motion, in floating point, when the mouse is not in relative mode */ -#define SDL_HINT_TIMER_RESOLUTION "SDL_TIMER_RESOLUTION" +#define SDL_HINT_MOUSE_NORMAL_SPEED_SCALE "SDL_MOUSE_NORMAL_SPEED_SCALE" +/** + * \brief A variable controlling whether relative mouse mode is implemented using mouse warping + * + * This variable can be set to the following values: + * "0" - Relative mouse mode uses raw input + * "1" - Relative mouse mode uses mouse warping + * + * By default SDL will use raw input for relative mouse mode + */ +#define SDL_HINT_MOUSE_RELATIVE_MODE_WARP "SDL_MOUSE_RELATIVE_MODE_WARP" + +/** + * \brief A variable controlling whether relative mouse motion is affected by renderer scaling + * + * This variable can be set to the following values: + * "0" - Relative motion is unaffected by DPI or renderer's logical size + * "1" - Relative motion is scaled according to DPI scaling and logical size + * + * By default relative mouse deltas are affected by DPI and renderer scaling + */ +#define SDL_HINT_MOUSE_RELATIVE_SCALING "SDL_MOUSE_RELATIVE_SCALING" + +/** + * \brief A variable setting the scale for mouse motion, in floating point, when the mouse is in relative mode + */ +#define SDL_HINT_MOUSE_RELATIVE_SPEED_SCALE "SDL_MOUSE_RELATIVE_SPEED_SCALE" + +/** + * \brief A variable controlling whether mouse events should generate synthetic touch events + * + * This variable can be set to the following values: + * "0" - Mouse events will not generate touch events (default for desktop platforms) + * "1" - Mouse events will generate touch events (default for mobile platforms, such as Android and iOS) + */ +#define SDL_HINT_MOUSE_TOUCH_EVENTS "SDL_MOUSE_TOUCH_EVENTS" + +/** + * \brief Tell SDL not to catch the SIGINT or SIGTERM signals. + * + * This hint only applies to Unix-like platforms, and should set before + * any calls to SDL_Init() + * + * The variable can be set to the following values: + * "0" - SDL will install a SIGINT and SIGTERM handler, and when it + * catches a signal, convert it into an SDL_QUIT event. + * "1" - SDL will not install a signal handler at all. + */ +#define SDL_HINT_NO_SIGNAL_HANDLERS "SDL_NO_SIGNAL_HANDLERS" + +/** + * \brief A variable controlling what driver to use for OpenGL ES contexts. + * + * On some platforms, currently Windows and X11, OpenGL drivers may support + * creating contexts with an OpenGL ES profile. By default SDL uses these + * profiles, when available, otherwise it attempts to load an OpenGL ES + * library, e.g. that provided by the ANGLE project. This variable controls + * whether SDL follows this default behaviour or will always load an + * OpenGL ES library. + * + * Circumstances where this is useful include + * - Testing an app with a particular OpenGL ES implementation, e.g ANGLE, + * or emulator, e.g. those from ARM, Imagination or Qualcomm. + * - Resolving OpenGL ES function addresses at link time by linking with + * the OpenGL ES library instead of querying them at run time with + * SDL_GL_GetProcAddress(). + * + * Caution: for an application to work with the default behaviour across + * different OpenGL drivers it must query the OpenGL ES function + * addresses at run time using SDL_GL_GetProcAddress(). + * + * This variable is ignored on most platforms because OpenGL ES is native + * or not supported. + * + * This variable can be set to the following values: + * "0" - Use ES profile of OpenGL, if available. (Default when not set.) + * "1" - Load OpenGL ES library using the default library names. + * + */ +#define SDL_HINT_OPENGL_ES_DRIVER "SDL_OPENGL_ES_DRIVER" + +/** + * \brief A variable controlling which orientations are allowed on iOS/Android. + * + * In some circumstances it is necessary to be able to explicitly control + * which UI orientations are allowed. + * + * This variable is a space delimited list of the following values: + * "LandscapeLeft", "LandscapeRight", "Portrait" "PortraitUpsideDown" + */ +#define SDL_HINT_ORIENTATIONS "SDL_IOS_ORIENTATIONS" + +/** + * \brief A variable controlling the use of a sentinel event when polling the event queue + * + * This variable can be set to the following values: + * "0" - Disable poll sentinels + * "1" - Enable poll sentinels + * + * When polling for events, SDL_PumpEvents is used to gather new events from devices. + * If a device keeps producing new events between calls to SDL_PumpEvents, a poll loop will + * become stuck until the new events stop. + * This is most noticable when moving a high frequency mouse. + * + * By default, poll sentinels are enabled. + */ +#define SDL_HINT_POLL_SENTINEL "SDL_POLL_SENTINEL" + +/** + * \brief Override for SDL_GetPreferredLocales() + * + * If set, this will be favored over anything the OS might report for the + * user's preferred locales. Changing this hint at runtime will not generate + * a SDL_LOCALECHANGED event (but if you can change the hint, you can push + * your own event, if you want). + * + * The format of this hint is a comma-separated list of language and locale, + * combined with an underscore, as is a common format: "en_GB". Locale is + * optional: "en". So you might have a list like this: "en_GB,jp,es_PT" + */ +#define SDL_HINT_PREFERRED_LOCALES "SDL_PREFERRED_LOCALES" /** * \brief A variable describing the content orientation on QtWayland-based platforms. @@ -632,6 +1035,208 @@ extern "C" { */ #define SDL_HINT_QTWAYLAND_WINDOW_FLAGS "SDL_QTWAYLAND_WINDOW_FLAGS" +/** + * \brief A variable controlling whether the 2D render API is compatible or efficient. + * + * This variable can be set to the following values: + * + * "0" - Don't use batching to make rendering more efficient. + * "1" - Use batching, but might cause problems if app makes its own direct OpenGL calls. + * + * Up to SDL 2.0.9, the render API would draw immediately when requested. Now + * it batches up draw requests and sends them all to the GPU only when forced + * to (during SDL_RenderPresent, when changing render targets, by updating a + * texture that the batch needs, etc). This is significantly more efficient, + * but it can cause problems for apps that expect to render on top of the + * render API's output. As such, SDL will disable batching if a specific + * render backend is requested (since this might indicate that the app is + * planning to use the underlying graphics API directly). This hint can + * be used to explicitly request batching in this instance. It is a contract + * that you will either never use the underlying graphics API directly, or + * if you do, you will call SDL_RenderFlush() before you do so any current + * batch goes to the GPU before your work begins. Not following this contract + * will result in undefined behavior. + */ +#define SDL_HINT_RENDER_BATCHING "SDL_RENDER_BATCHING" + +/** + * \brief A variable controlling how the 2D render API renders lines + * + * This variable can be set to the following values: + * "0" - Use the default line drawing method (Bresenham's line algorithm as of SDL 2.0.20) + * "1" - Use the driver point API using Bresenham's line algorithm (correct, draws many points) + * "2" - Use the driver line API (occasionally misses line endpoints based on hardware driver quirks, was the default before 2.0.20) + * "3" - Use the driver geometry API (correct, draws thicker diagonal lines) + * + * This variable should be set when the renderer is created. + */ +#define SDL_HINT_RENDER_LINE_METHOD "SDL_RENDER_LINE_METHOD" + +/** + * \brief A variable controlling whether to enable Direct3D 11+'s Debug Layer. + * + * This variable does not have any effect on the Direct3D 9 based renderer. + * + * This variable can be set to the following values: + * "0" - Disable Debug Layer use + * "1" - Enable Debug Layer use + * + * By default, SDL does not use Direct3D Debug Layer. + */ +#define SDL_HINT_RENDER_DIRECT3D11_DEBUG "SDL_RENDER_DIRECT3D11_DEBUG" + +/** + * \brief A variable controlling whether the Direct3D device is initialized for thread-safe operations. + * + * This variable can be set to the following values: + * "0" - Thread-safety is not enabled (faster) + * "1" - Thread-safety is enabled + * + * By default the Direct3D device is created with thread-safety disabled. + */ +#define SDL_HINT_RENDER_DIRECT3D_THREADSAFE "SDL_RENDER_DIRECT3D_THREADSAFE" + +/** + * \brief A variable specifying which render driver to use. + * + * If the application doesn't pick a specific renderer to use, this variable + * specifies the name of the preferred renderer. If the preferred renderer + * can't be initialized, the normal default renderer is used. + * + * This variable is case insensitive and can be set to the following values: + * "direct3d" + * "opengl" + * "opengles2" + * "opengles" + * "metal" + * "software" + * + * The default varies by platform, but it's the first one in the list that + * is available on the current platform. + */ +#define SDL_HINT_RENDER_DRIVER "SDL_RENDER_DRIVER" + +/** + * \brief A variable controlling the scaling policy for SDL_RenderSetLogicalSize. + * + * This variable can be set to the following values: + * "0" or "letterbox" - Uses letterbox/sidebars to fit the entire rendering on screen + * "1" or "overscan" - Will zoom the rendering so it fills the entire screen, allowing edges to be drawn offscreen + * + * By default letterbox is used + */ +#define SDL_HINT_RENDER_LOGICAL_SIZE_MODE "SDL_RENDER_LOGICAL_SIZE_MODE" + +/** + * \brief A variable controlling whether the OpenGL render driver uses shaders if they are available. + * + * This variable can be set to the following values: + * "0" - Disable shaders + * "1" - Enable shaders + * + * By default shaders are used if OpenGL supports them. + */ +#define SDL_HINT_RENDER_OPENGL_SHADERS "SDL_RENDER_OPENGL_SHADERS" + +/** + * \brief A variable controlling the scaling quality + * + * This variable can be set to the following values: + * "0" or "nearest" - Nearest pixel sampling + * "1" or "linear" - Linear filtering (supported by OpenGL and Direct3D) + * "2" or "best" - Currently this is the same as "linear" + * + * By default nearest pixel sampling is used + */ +#define SDL_HINT_RENDER_SCALE_QUALITY "SDL_RENDER_SCALE_QUALITY" + +/** + * \brief A variable controlling whether updates to the SDL screen surface should be synchronized with the vertical refresh, to avoid tearing. + * + * This variable can be set to the following values: + * "0" - Disable vsync + * "1" - Enable vsync + * + * By default SDL does not sync screen surface updates with vertical refresh. + */ +#define SDL_HINT_RENDER_VSYNC "SDL_RENDER_VSYNC" + + /** + * \brief A variable to control whether the return key on the soft keyboard + * should hide the soft keyboard on Android and iOS. + * + * The variable can be set to the following values: + * "0" - The return key will be handled as a key event. This is the behaviour of SDL <= 2.0.3. (default) + * "1" - The return key will hide the keyboard. + * + * The value of this hint is used at runtime, so it can be changed at any time. + */ +#define SDL_HINT_RETURN_KEY_HIDES_IME "SDL_RETURN_KEY_HIDES_IME" + +/** + * \brief Tell SDL which Dispmanx layer to use on a Raspberry PI + * + * Also known as Z-order. The variable can take a negative or positive value. + * The default is 10000. + */ +#define SDL_HINT_RPI_VIDEO_LAYER "SDL_RPI_VIDEO_LAYER" + +/** + * \brief Specify an "activity name" for screensaver inhibition. + * + * Some platforms, notably Linux desktops, list the applications which are + * inhibiting the screensaver or other power-saving features. + * + * This hint lets you specify the "activity name" sent to the OS when + * SDL_DisableScreenSaver() is used (or the screensaver is automatically + * disabled). The contents of this hint are used when the screensaver is + * disabled. You should use a string that describes what your program is doing + * (and, therefore, why the screensaver is disabled). For example, "Playing a + * game" or "Watching a video". + * + * Setting this to "" or leaving it unset will have SDL use a reasonable + * default: "Playing a game" or something similar. + * + * On targets where this is not supported, this hint does nothing. + */ +#define SDL_HINT_SCREENSAVER_INHIBIT_ACTIVITY_NAME "SDL_SCREENSAVER_INHIBIT_ACTIVITY_NAME" + +/** + * \brief Specifies whether SDL_THREAD_PRIORITY_TIME_CRITICAL should be treated as realtime. + * + * On some platforms, like Linux, a realtime priority thread may be subject to restrictions + * that require special handling by the application. This hint exists to let SDL know that + * the app is prepared to handle said restrictions. + * + * On Linux, SDL will apply the following configuration to any thread that becomes realtime: + * * The SCHED_RESET_ON_FORK bit will be set on the scheduling policy, + * * An RLIMIT_RTTIME budget will be configured to the rtkit specified limit. + * * Exceeding this limit will result in the kernel sending SIGKILL to the app, + * * Refer to the man pages for more information. + * + * This variable can be set to the following values: + * "0" - default platform specific behaviour + * "1" - Force SDL_THREAD_PRIORITY_TIME_CRITICAL to a realtime scheduling policy + */ +#define SDL_HINT_THREAD_FORCE_REALTIME_TIME_CRITICAL "SDL_THREAD_FORCE_REALTIME_TIME_CRITICAL" + +/** +* \brief A string specifying additional information to use with SDL_SetThreadPriority. +* +* By default SDL_SetThreadPriority will make appropriate system changes in order to +* apply a thread priority. For example on systems using pthreads the scheduler policy +* is changed automatically to a policy that works well with a given priority. +* Code which has specific requirements can override SDL's default behavior with this hint. +* +* pthread hint values are "current", "other", "fifo" and "rr". +* Currently no other platform hint values are defined but may be in the future. +* +* \note On Linux, the kernel may send SIGKILL to realtime tasks which exceed the distro +* configured execution budget for rtkit. This budget can be queried through RLIMIT_RTTIME +* after calling SDL_SetThreadPriority(). +*/ +#define SDL_HINT_THREAD_PRIORITY_POLICY "SDL_THREAD_PRIORITY_POLICY" + /** * \brief A string specifying SDL's threads stack size in bytes or "0" for the backend's default size * @@ -646,34 +1251,141 @@ extern "C" { */ #define SDL_HINT_THREAD_STACK_SIZE "SDL_THREAD_STACK_SIZE" +/** + * \brief A variable that controls the timer resolution, in milliseconds. + * + * The higher resolution the timer, the more frequently the CPU services + * timer interrupts, and the more precise delays are, but this takes up + * power and CPU time. This hint is only used on Windows. + * + * See this blog post for more information: + * http://randomascii.wordpress.com/2013/07/08/windows-timer-resolution-megawatts-wasted/ + * + * If this variable is set to "0", the system timer resolution is not set. + * + * The default value is "1". This hint may be set at any time. + */ +#define SDL_HINT_TIMER_RESOLUTION "SDL_TIMER_RESOLUTION" + +/** + * \brief A variable controlling whether touch events should generate synthetic mouse events + * + * This variable can be set to the following values: + * "0" - Touch events will not generate mouse events + * "1" - Touch events will generate mouse events + * + * By default SDL will generate mouse events for touch events + */ +#define SDL_HINT_TOUCH_MOUSE_EVENTS "SDL_TOUCH_MOUSE_EVENTS" + +/** + * \brief A variable controlling whether the Android / tvOS remotes + * should be listed as joystick devices, instead of sending keyboard events. + * + * This variable can be set to the following values: + * "0" - Remotes send enter/escape/arrow key events + * "1" - Remotes are available as 2 axis, 2 button joysticks (the default). + */ +#define SDL_HINT_TV_REMOTE_AS_JOYSTICK "SDL_TV_REMOTE_AS_JOYSTICK" + +/** + * \brief A variable controlling whether the screensaver is enabled. + * + * This variable can be set to the following values: + * "0" - Disable screensaver + * "1" - Enable screensaver + * + * By default SDL will disable the screensaver. + */ +#define SDL_HINT_VIDEO_ALLOW_SCREENSAVER "SDL_VIDEO_ALLOW_SCREENSAVER" + +/** + * \brief Tell the video driver that we only want a double buffer. + * + * By default, most lowlevel 2D APIs will use a triple buffer scheme that + * wastes no CPU time on waiting for vsync after issuing a flip, but + * introduces a frame of latency. On the other hand, using a double buffer + * scheme instead is recommended for cases where low latency is an important + * factor because we save a whole frame of latency. + * We do so by waiting for vsync immediately after issuing a flip, usually just + * after eglSwapBuffers call in the backend's *_SwapWindow function. + * + * Since it's driver-specific, it's only supported where possible and + * implemented. Currently supported the following drivers: + * + * - KMSDRM (kmsdrm) + * - Raspberry Pi (raspberrypi) + */ +#define SDL_HINT_VIDEO_DOUBLE_BUFFER "SDL_VIDEO_DOUBLE_BUFFER" + +/** + * \brief A variable controlling whether the EGL window is allowed to be + * composited as transparent, rather than opaque. + * + * Most window systems will always render windows opaque, even if the surface + * format has an alpha channel. This is not always true, however, so by default + * SDL will try to enforce opaque composition. To override this behavior, you + * can set this hint to "1". + */ +#define SDL_HINT_VIDEO_EGL_ALLOW_TRANSPARENCY "SDL_VIDEO_EGL_ALLOW_TRANSPARENCY" + +/** + * \brief A variable controlling whether the graphics context is externally managed. + * + * This variable can be set to the following values: + * "0" - SDL will manage graphics contexts that are attached to windows. + * "1" - Disable graphics context management on windows. + * + * By default SDL will manage OpenGL contexts in certain situations. For example, on Android the + * context will be automatically saved and restored when pausing the application. Additionally, some + * platforms will assume usage of OpenGL if Vulkan isn't used. Setting this to "1" will prevent this + * behavior, which is desireable when the application manages the graphics context, such as + * an externally managed OpenGL context or attaching a Vulkan surface to the window. + */ +#define SDL_HINT_VIDEO_EXTERNAL_CONTEXT "SDL_VIDEO_EXTERNAL_CONTEXT" + /** * \brief If set to 1, then do not allow high-DPI windows. ("Retina" on Mac and iOS) */ #define SDL_HINT_VIDEO_HIGHDPI_DISABLED "SDL_VIDEO_HIGHDPI_DISABLED" /** - * \brief A variable that determines whether ctrl+click should generate a right-click event on Mac + * \brief A variable that dictates policy for fullscreen Spaces on Mac OS X. * - * If present, holding ctrl while left clicking will generate a right click - * event when on Mac. + * This hint only applies to Mac OS X. + * + * The variable can be set to the following values: + * "0" - Disable Spaces support (FULLSCREEN_DESKTOP won't use them and + * SDL_WINDOW_RESIZABLE windows won't offer the "fullscreen" + * button on their titlebars). + * "1" - Enable Spaces support (FULLSCREEN_DESKTOP will use them and + * SDL_WINDOW_RESIZABLE windows will offer the "fullscreen" + * button on their titlebars). + * + * The default value is "1". Spaces are disabled regardless of this hint if + * the OS isn't at least Mac OS X Lion (10.7). This hint must be set before + * any windows are created. */ -#define SDL_HINT_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK "SDL_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK" +#define SDL_HINT_VIDEO_MAC_FULLSCREEN_SPACES "SDL_VIDEO_MAC_FULLSCREEN_SPACES" /** -* \brief A variable specifying which shader compiler to preload when using the Chrome ANGLE binaries -* -* SDL has EGL and OpenGL ES2 support on Windows via the ANGLE project. It -* can use two different sets of binaries, those compiled by the user from source -* or those provided by the Chrome browser. In the later case, these binaries require -* that SDL loads a DLL providing the shader compiler. -* -* This variable can be set to the following values: -* "d3dcompiler_46.dll" - default, best for Vista or later. -* "d3dcompiler_43.dll" - for XP support. -* "none" - do not load any library, useful if you compiled ANGLE from source and included the compiler in your binaries. -* -*/ -#define SDL_HINT_VIDEO_WIN_D3DCOMPILER "SDL_VIDEO_WIN_D3DCOMPILER" + * \brief Minimize your SDL_Window if it loses key focus when in fullscreen mode. Defaults to false. + * \warning Before SDL 2.0.14, this defaulted to true! In 2.0.14, we're + * seeing if "true" causes more problems than it solves in modern times. + * + */ +#define SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS "SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS" + +/** + * \brief A variable controlling whether the libdecor Wayland backend is allowed to be used. + * + * This variable can be set to the following values: + * "0" - libdecor use is disabled. + * "1" - libdecor use is enabled (default). + * + * libdecor is used over xdg-shell when xdg-decoration protocol is unavailable. + */ +#define SDL_HINT_VIDEO_WAYLAND_ALLOW_LIBDECOR "SDL_VIDEO_WAYLAND_ALLOW_LIBDECOR" /** * \brief A variable that is the address of another SDL_Window* (as a hex string formatted with "%p"). @@ -695,51 +1407,274 @@ extern "C" { #define SDL_HINT_VIDEO_WINDOW_SHARE_PIXEL_FORMAT "SDL_VIDEO_WINDOW_SHARE_PIXEL_FORMAT" /** - * \brief A URL to a WinRT app's privacy policy - * - * All network-enabled WinRT apps must make a privacy policy available to its - * users. On Windows 8, 8.1, and RT, Microsoft mandates that this policy be - * be available in the Windows Settings charm, as accessed from within the app. - * SDL provides code to add a URL-based link there, which can point to the app's - * privacy policy. - * - * To setup a URL to an app's privacy policy, set SDL_HINT_WINRT_PRIVACY_POLICY_URL - * before calling any SDL_Init() functions. The contents of the hint should - * be a valid URL. For example, "http://www.example.com". - * - * The default value is "", which will prevent SDL from adding a privacy policy - * link to the Settings charm. This hint should only be set during app init. - * - * The label text of an app's "Privacy Policy" link may be customized via another - * hint, SDL_HINT_WINRT_PRIVACY_POLICY_LABEL. - * - * Please note that on Windows Phone, Microsoft does not provide standard UI - * for displaying a privacy policy link, and as such, SDL_HINT_WINRT_PRIVACY_POLICY_URL - * will not get used on that platform. Network-enabled phone apps should display - * their privacy policy through some other, in-app means. - */ -#define SDL_HINT_WINRT_PRIVACY_POLICY_URL "SDL_WINRT_PRIVACY_POLICY_URL" +* \brief A variable specifying which shader compiler to preload when using the Chrome ANGLE binaries +* +* SDL has EGL and OpenGL ES2 support on Windows via the ANGLE project. It +* can use two different sets of binaries, those compiled by the user from source +* or those provided by the Chrome browser. In the later case, these binaries require +* that SDL loads a DLL providing the shader compiler. +* +* This variable can be set to the following values: +* "d3dcompiler_46.dll" - default, best for Vista or later. +* "d3dcompiler_43.dll" - for XP support. +* "none" - do not load any library, useful if you compiled ANGLE from source and included the compiler in your binaries. +* +*/ +#define SDL_HINT_VIDEO_WIN_D3DCOMPILER "SDL_VIDEO_WIN_D3DCOMPILER" -/** \brief Label text for a WinRT app's privacy policy link +/** + * \brief A variable controlling whether X11 should use GLX or EGL by default * - * Network-enabled WinRT apps must include a privacy policy. On Windows 8, 8.1, and RT, - * Microsoft mandates that this policy be available via the Windows Settings charm. - * SDL provides code to add a link there, with its label text being set via the - * optional hint, SDL_HINT_WINRT_PRIVACY_POLICY_LABEL. + * This variable can be set to the following values: + * "0" - Use GLX + * "1" - Use EGL * - * Please note that a privacy policy's contents are not set via this hint. A separate - * hint, SDL_HINT_WINRT_PRIVACY_POLICY_URL, is used to link to the actual text of the - * policy. - * - * The contents of this hint should be encoded as a UTF8 string. - * - * The default value is "Privacy Policy". This hint should only be set during app - * initialization, preferably before any calls to SDL_Init(). - * - * For additional information on linking to a privacy policy, see the documentation for - * SDL_HINT_WINRT_PRIVACY_POLICY_URL. + * By default SDL will use GLX when both are present. */ -#define SDL_HINT_WINRT_PRIVACY_POLICY_LABEL "SDL_WINRT_PRIVACY_POLICY_LABEL" +#define SDL_HINT_VIDEO_X11_FORCE_EGL "SDL_VIDEO_X11_FORCE_EGL" + +/** + * \brief A variable controlling whether the X11 _NET_WM_BYPASS_COMPOSITOR hint should be used. + * + * This variable can be set to the following values: + * "0" - Disable _NET_WM_BYPASS_COMPOSITOR + * "1" - Enable _NET_WM_BYPASS_COMPOSITOR + * + * By default SDL will use _NET_WM_BYPASS_COMPOSITOR + * + */ +#define SDL_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR "SDL_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR" + +/** + * \brief A variable controlling whether the X11 _NET_WM_PING protocol should be supported. + * + * This variable can be set to the following values: + * "0" - Disable _NET_WM_PING + * "1" - Enable _NET_WM_PING + * + * By default SDL will use _NET_WM_PING, but for applications that know they + * will not always be able to respond to ping requests in a timely manner they can + * turn it off to avoid the window manager thinking the app is hung. + * The hint is checked in CreateWindow. + */ +#define SDL_HINT_VIDEO_X11_NET_WM_PING "SDL_VIDEO_X11_NET_WM_PING" + +/** + * \brief A variable forcing the visual ID chosen for new X11 windows + * + */ +#define SDL_HINT_VIDEO_X11_WINDOW_VISUALID "SDL_VIDEO_X11_WINDOW_VISUALID" + +/** + * \brief A variable controlling whether the X11 Xinerama extension should be used. + * + * This variable can be set to the following values: + * "0" - Disable Xinerama + * "1" - Enable Xinerama + * + * By default SDL will use Xinerama if it is available. + */ +#define SDL_HINT_VIDEO_X11_XINERAMA "SDL_VIDEO_X11_XINERAMA" + +/** + * \brief A variable controlling whether the X11 XRandR extension should be used. + * + * This variable can be set to the following values: + * "0" - Disable XRandR + * "1" - Enable XRandR + * + * By default SDL will not use XRandR because of window manager issues. + */ +#define SDL_HINT_VIDEO_X11_XRANDR "SDL_VIDEO_X11_XRANDR" + +/** + * \brief A variable controlling whether the X11 VidMode extension should be used. + * + * This variable can be set to the following values: + * "0" - Disable XVidMode + * "1" - Enable XVidMode + * + * By default SDL will use XVidMode if it is available. + */ +#define SDL_HINT_VIDEO_X11_XVIDMODE "SDL_VIDEO_X11_XVIDMODE" + +/** + * \brief Controls how the fact chunk affects the loading of a WAVE file. + * + * The fact chunk stores information about the number of samples of a WAVE + * file. The Standards Update from Microsoft notes that this value can be used + * to 'determine the length of the data in seconds'. This is especially useful + * for compressed formats (for which this is a mandatory chunk) if they produce + * multiple sample frames per block and truncating the block is not allowed. + * The fact chunk can exactly specify how many sample frames there should be + * in this case. + * + * Unfortunately, most application seem to ignore the fact chunk and so SDL + * ignores it by default as well. + * + * This variable can be set to the following values: + * + * "truncate" - Use the number of samples to truncate the wave data if + * the fact chunk is present and valid + * "strict" - Like "truncate", but raise an error if the fact chunk + * is invalid, not present for non-PCM formats, or if the + * data chunk doesn't have that many samples + * "ignorezero" - Like "truncate", but ignore fact chunk if the number of + * samples is zero + * "ignore" - Ignore fact chunk entirely (default) + */ +#define SDL_HINT_WAVE_FACT_CHUNK "SDL_WAVE_FACT_CHUNK" + +/** + * \brief Controls how the size of the RIFF chunk affects the loading of a WAVE file. + * + * The size of the RIFF chunk (which includes all the sub-chunks of the WAVE + * file) is not always reliable. In case the size is wrong, it's possible to + * just ignore it and step through the chunks until a fixed limit is reached. + * + * Note that files that have trailing data unrelated to the WAVE file or + * corrupt files may slow down the loading process without a reliable boundary. + * By default, SDL stops after 10000 chunks to prevent wasting time. Use the + * environment variable SDL_WAVE_CHUNK_LIMIT to adjust this value. + * + * This variable can be set to the following values: + * + * "force" - Always use the RIFF chunk size as a boundary for the chunk search + * "ignorezero" - Like "force", but a zero size searches up to 4 GiB (default) + * "ignore" - Ignore the RIFF chunk size and always search up to 4 GiB + * "maximum" - Search for chunks until the end of file (not recommended) + */ +#define SDL_HINT_WAVE_RIFF_CHUNK_SIZE "SDL_WAVE_RIFF_CHUNK_SIZE" + +/** + * \brief Controls how a truncated WAVE file is handled. + * + * A WAVE file is considered truncated if any of the chunks are incomplete or + * the data chunk size is not a multiple of the block size. By default, SDL + * decodes until the first incomplete block, as most applications seem to do. + * + * This variable can be set to the following values: + * + * "verystrict" - Raise an error if the file is truncated + * "strict" - Like "verystrict", but the size of the RIFF chunk is ignored + * "dropframe" - Decode until the first incomplete sample frame + * "dropblock" - Decode until the first incomplete block (default) + */ +#define SDL_HINT_WAVE_TRUNCATION "SDL_WAVE_TRUNCATION" + +/** + * \brief Tell SDL not to name threads on Windows with the 0x406D1388 Exception. + * The 0x406D1388 Exception is a trick used to inform Visual Studio of a + * thread's name, but it tends to cause problems with other debuggers, + * and the .NET runtime. Note that SDL 2.0.6 and later will still use + * the (safer) SetThreadDescription API, introduced in the Windows 10 + * Creators Update, if available. + * + * The variable can be set to the following values: + * "0" - SDL will raise the 0x406D1388 Exception to name threads. + * This is the default behavior of SDL <= 2.0.4. + * "1" - SDL will not raise this exception, and threads will be unnamed. (default) + * This is necessary with .NET languages or debuggers that aren't Visual Studio. + */ +#define SDL_HINT_WINDOWS_DISABLE_THREAD_NAMING "SDL_WINDOWS_DISABLE_THREAD_NAMING" + +/** + * \brief A variable controlling whether the windows message loop is processed by SDL + * + * This variable can be set to the following values: + * "0" - The window message loop is not run + * "1" - The window message loop is processed in SDL_PumpEvents() + * + * By default SDL will process the windows message loop + */ +#define SDL_HINT_WINDOWS_ENABLE_MESSAGELOOP "SDL_WINDOWS_ENABLE_MESSAGELOOP" + +/** + * \brief Force SDL to use Critical Sections for mutexes on Windows. + * On Windows 7 and newer, Slim Reader/Writer Locks are available. + * They offer better performance, allocate no kernel ressources and + * use less memory. SDL will fall back to Critical Sections on older + * OS versions or if forced to by this hint. + * + * This variable can be set to the following values: + * "0" - Use SRW Locks when available. If not, fall back to Critical Sections. (default) + * "1" - Force the use of Critical Sections in all cases. + * + */ +#define SDL_HINT_WINDOWS_FORCE_MUTEX_CRITICAL_SECTIONS "SDL_WINDOWS_FORCE_MUTEX_CRITICAL_SECTIONS" + +/** + * \brief Force SDL to use Kernel Semaphores on Windows. + * Kernel Semaphores are inter-process and require a context + * switch on every interaction. On Windows 8 and newer, the + * WaitOnAddress API is available. Using that and atomics to + * implement semaphores increases performance. + * SDL will fall back to Kernel Objects on older OS versions + * or if forced to by this hint. + * + * This variable can be set to the following values: + * "0" - Use Atomics and WaitOnAddress API when available. If not, fall back to Kernel Objects. (default) + * "1" - Force the use of Kernel Objects in all cases. + * + */ +#define SDL_HINT_WINDOWS_FORCE_SEMAPHORE_KERNEL "SDL_WINDOWS_FORCE_SEMAPHORE_KERNEL" + +/** + * \brief A variable to specify custom icon resource id from RC file on Windows platform + */ +#define SDL_HINT_WINDOWS_INTRESOURCE_ICON "SDL_WINDOWS_INTRESOURCE_ICON" +#define SDL_HINT_WINDOWS_INTRESOURCE_ICON_SMALL "SDL_WINDOWS_INTRESOURCE_ICON_SMALL" + +/** + * \brief Tell SDL not to generate window-close events for Alt+F4 on Windows. + * + * The variable can be set to the following values: + * "0" - SDL will generate a window-close event when it sees Alt+F4. + * "1" - SDL will only do normal key handling for Alt+F4. + */ +#define SDL_HINT_WINDOWS_NO_CLOSE_ON_ALT_F4 "SDL_WINDOWS_NO_CLOSE_ON_ALT_F4" + +/** + * \brief Use the D3D9Ex API introduced in Windows Vista, instead of normal D3D9. + * Direct3D 9Ex contains changes to state management that can eliminate device + * loss errors during scenarios like Alt+Tab or UAC prompts. D3D9Ex may require + * some changes to your application to cope with the new behavior, so this + * is disabled by default. + * + * This hint must be set before initializing the video subsystem. + * + * For more information on Direct3D 9Ex, see: + * - https://docs.microsoft.com/en-us/windows/win32/direct3darticles/graphics-apis-in-windows-vista#direct3d-9ex + * - https://docs.microsoft.com/en-us/windows/win32/direct3darticles/direct3d-9ex-improvements + * + * This variable can be set to the following values: + * "0" - Use the original Direct3D 9 API (default) + * "1" - Use the Direct3D 9Ex API on Vista and later (and fall back if D3D9Ex is unavailable) + * + */ +#define SDL_HINT_WINDOWS_USE_D3D9EX "SDL_WINDOWS_USE_D3D9EX" + +/** + * \brief A variable controlling whether the window frame and title bar are interactive when the cursor is hidden + * + * This variable can be set to the following values: + * "0" - The window frame is not interactive when the cursor is hidden (no move, resize, etc) + * "1" - The window frame is interactive when the cursor is hidden + * + * By default SDL will allow interaction with the window frame when the cursor is hidden + */ +#define SDL_HINT_WINDOW_FRAME_USABLE_WHILE_CURSOR_HIDDEN "SDL_WINDOW_FRAME_USABLE_WHILE_CURSOR_HIDDEN" + +/** +* \brief A variable controlling whether the window is activated when the SDL_ShowWindow function is called +* +* This variable can be set to the following values: +* "0" - The window is activated when the SDL_ShowWindow function is called +* "1" - The window is not activated when the SDL_ShowWindow function is called +* +* By default SDL will activate the window when the SDL_ShowWindow function is called +*/ +#define SDL_HINT_WINDOW_NO_ACTIVATION_WHEN_SHOWN "SDL_WINDOW_NO_ACTIVATION_WHEN_SHOWN" /** \brief Allows back-button-press events on Windows Phone to be marked as handled * @@ -793,386 +1728,102 @@ extern "C" { */ #define SDL_HINT_WINRT_HANDLE_BACK_BUTTON "SDL_WINRT_HANDLE_BACK_BUTTON" -/** - * \brief A variable that dictates policy for fullscreen Spaces on Mac OS X. +/** \brief Label text for a WinRT app's privacy policy link * - * This hint only applies to Mac OS X. + * Network-enabled WinRT apps must include a privacy policy. On Windows 8, 8.1, and RT, + * Microsoft mandates that this policy be available via the Windows Settings charm. + * SDL provides code to add a link there, with its label text being set via the + * optional hint, SDL_HINT_WINRT_PRIVACY_POLICY_LABEL. + * + * Please note that a privacy policy's contents are not set via this hint. A separate + * hint, SDL_HINT_WINRT_PRIVACY_POLICY_URL, is used to link to the actual text of the + * policy. + * + * The contents of this hint should be encoded as a UTF8 string. + * + * The default value is "Privacy Policy". This hint should only be set during app + * initialization, preferably before any calls to SDL_Init(). + * + * For additional information on linking to a privacy policy, see the documentation for + * SDL_HINT_WINRT_PRIVACY_POLICY_URL. + */ +#define SDL_HINT_WINRT_PRIVACY_POLICY_LABEL "SDL_WINRT_PRIVACY_POLICY_LABEL" + +/** + * \brief A URL to a WinRT app's privacy policy + * + * All network-enabled WinRT apps must make a privacy policy available to its + * users. On Windows 8, 8.1, and RT, Microsoft mandates that this policy be + * be available in the Windows Settings charm, as accessed from within the app. + * SDL provides code to add a URL-based link there, which can point to the app's + * privacy policy. + * + * To setup a URL to an app's privacy policy, set SDL_HINT_WINRT_PRIVACY_POLICY_URL + * before calling any SDL_Init() functions. The contents of the hint should + * be a valid URL. For example, "http://www.example.com". + * + * The default value is "", which will prevent SDL from adding a privacy policy + * link to the Settings charm. This hint should only be set during app init. + * + * The label text of an app's "Privacy Policy" link may be customized via another + * hint, SDL_HINT_WINRT_PRIVACY_POLICY_LABEL. + * + * Please note that on Windows Phone, Microsoft does not provide standard UI + * for displaying a privacy policy link, and as such, SDL_HINT_WINRT_PRIVACY_POLICY_URL + * will not get used on that platform. Network-enabled phone apps should display + * their privacy policy through some other, in-app means. + */ +#define SDL_HINT_WINRT_PRIVACY_POLICY_URL "SDL_WINRT_PRIVACY_POLICY_URL" + +/** + * \brief Mark X11 windows as override-redirect. + * + * If set, this _might_ increase framerate at the expense of the desktop + * not working as expected. Override-redirect windows aren't noticed by the + * window manager at all. + * + * You should probably only use this for fullscreen windows, and you probably + * shouldn't even use it for that. But it's here if you want to try! + */ +#define SDL_HINT_X11_FORCE_OVERRIDE_REDIRECT "SDL_X11_FORCE_OVERRIDE_REDIRECT" + +/** + * \brief A variable that lets you disable the detection and use of Xinput gamepad devices * * The variable can be set to the following values: - * "0" - Disable Spaces support (FULLSCREEN_DESKTOP won't use them and - * SDL_WINDOW_RESIZABLE windows won't offer the "fullscreen" - * button on their titlebars). - * "1" - Enable Spaces support (FULLSCREEN_DESKTOP will use them and - * SDL_WINDOW_RESIZABLE windows will offer the "fullscreen" - * button on their titlebars). - * - * The default value is "1". Spaces are disabled regardless of this hint if - * the OS isn't at least Mac OS X Lion (10.7). This hint must be set before - * any windows are created. + * "0" - Disable XInput detection (only uses direct input) + * "1" - Enable XInput detection (the default) */ -#define SDL_HINT_VIDEO_MAC_FULLSCREEN_SPACES "SDL_VIDEO_MAC_FULLSCREEN_SPACES" +#define SDL_HINT_XINPUT_ENABLED "SDL_XINPUT_ENABLED" /** -* \brief When set don't force the SDL app to become a foreground process -* -* This hint only applies to Mac OS X. -* -*/ -#define SDL_HINT_MAC_BACKGROUND_APP "SDL_MAC_BACKGROUND_APP" + * \brief A variable that causes SDL to use the old axis and button mapping for XInput devices. + * + * This hint is for backwards compatibility only and will be removed in SDL 2.1 + * + * The default value is "0". This hint must be set before SDL_Init() + */ +#define SDL_HINT_XINPUT_USE_OLD_JOYSTICK_MAPPING "SDL_XINPUT_USE_OLD_JOYSTICK_MAPPING" /** - * \brief Android APK expansion main file version. Should be a string number like "1", "2" etc. + * \brief A variable that causes SDL to not ignore audio "monitors" * - * Must be set together with SDL_HINT_ANDROID_APK_EXPANSION_PATCH_FILE_VERSION. + * This is currently only used for PulseAudio and ignored elsewhere. * - * If both hints were set then SDL_RWFromFile() will look into expansion files - * after a given relative path was not found in the internal storage and assets. + * By default, SDL ignores audio devices that aren't associated with physical + * hardware. Changing this hint to "1" will expose anything SDL sees that + * appears to be an audio source or sink. This will add "devices" to the list + * that the user probably doesn't want or need, but it can be useful in + * scenarios where you want to hook up SDL to some sort of virtual device, + * etc. * - * By default this hint is not set and the APK expansion files are not searched. + * The default value is "0". This hint must be set before SDL_Init(). + * + * This hint is available since SDL 2.0.16. Before then, virtual devices are + * always ignored. */ -#define SDL_HINT_ANDROID_APK_EXPANSION_MAIN_FILE_VERSION "SDL_ANDROID_APK_EXPANSION_MAIN_FILE_VERSION" - -/** - * \brief Android APK expansion patch file version. Should be a string number like "1", "2" etc. - * - * Must be set together with SDL_HINT_ANDROID_APK_EXPANSION_MAIN_FILE_VERSION. - * - * If both hints were set then SDL_RWFromFile() will look into expansion files - * after a given relative path was not found in the internal storage and assets. - * - * By default this hint is not set and the APK expansion files are not searched. - */ -#define SDL_HINT_ANDROID_APK_EXPANSION_PATCH_FILE_VERSION "SDL_ANDROID_APK_EXPANSION_PATCH_FILE_VERSION" +#define SDL_HINT_AUDIO_INCLUDE_MONITORS "SDL_AUDIO_INCLUDE_MONITORS" -/** - * \brief A variable to control whether certain IMEs should handle text editing internally instead of sending SDL_TEXTEDITING events. - * - * The variable can be set to the following values: - * "0" - SDL_TEXTEDITING events are sent, and it is the application's - * responsibility to render the text from these events and - * differentiate it somehow from committed text. (default) - * "1" - If supported by the IME then SDL_TEXTEDITING events are not sent, - * and text that is being composed will be rendered in its own UI. - */ -#define SDL_HINT_IME_INTERNAL_EDITING "SDL_IME_INTERNAL_EDITING" - -/** - * \brief A variable to control whether we trap the Android back button to handle it manually. - * This is necessary for the right mouse button to work on some Android devices, or - * to be able to trap the back button for use in your code reliably. If set to true, - * the back button will show up as an SDL_KEYDOWN / SDL_KEYUP pair with a keycode of - * SDL_SCANCODE_AC_BACK. - * - * The variable can be set to the following values: - * "0" - Back button will be handled as usual for system. (default) - * "1" - Back button will be trapped, allowing you to handle the key press - * manually. (This will also let right mouse click work on systems - * where the right mouse button functions as back.) - * - * The value of this hint is used at runtime, so it can be changed at any time. - */ -#define SDL_HINT_ANDROID_TRAP_BACK_BUTTON "SDL_ANDROID_TRAP_BACK_BUTTON" - -/** - * \brief A variable to control whether the event loop will block itself when the app is paused. - * - * The variable can be set to the following values: - * "0" - Non blocking. - * "1" - Blocking. (default) - * - * The value should be set before SDL is initialized. - */ -#define SDL_HINT_ANDROID_BLOCK_ON_PAUSE "SDL_ANDROID_BLOCK_ON_PAUSE" - - /** - * \brief A variable to control whether the return key on the soft keyboard - * should hide the soft keyboard on Android and iOS. - * - * The variable can be set to the following values: - * "0" - The return key will be handled as a key event. This is the behaviour of SDL <= 2.0.3. (default) - * "1" - The return key will hide the keyboard. - * - * The value of this hint is used at runtime, so it can be changed at any time. - */ -#define SDL_HINT_RETURN_KEY_HIDES_IME "SDL_RETURN_KEY_HIDES_IME" - -/** - * \brief override the binding element for keyboard inputs for Emscripten builds - * - * This hint only applies to the emscripten platform - * - * The variable can be one of - * "#window" - The javascript window object (this is the default) - * "#document" - The javascript document object - * "#screen" - the javascript window.screen object - * "#canvas" - the WebGL canvas element - * any other string without a leading # sign applies to the element on the page with that ID. - */ -#define SDL_HINT_EMSCRIPTEN_KEYBOARD_ELEMENT "SDL_EMSCRIPTEN_KEYBOARD_ELEMENT" - -/** - * \brief Tell SDL not to catch the SIGINT or SIGTERM signals. - * - * This hint only applies to Unix-like platforms. - * - * The variable can be set to the following values: - * "0" - SDL will install a SIGINT and SIGTERM handler, and when it - * catches a signal, convert it into an SDL_QUIT event. - * "1" - SDL will not install a signal handler at all. - */ -#define SDL_HINT_NO_SIGNAL_HANDLERS "SDL_NO_SIGNAL_HANDLERS" - -/** - * \brief Tell SDL not to generate window-close events for Alt+F4 on Windows. - * - * The variable can be set to the following values: - * "0" - SDL will generate a window-close event when it sees Alt+F4. - * "1" - SDL will only do normal key handling for Alt+F4. - */ -#define SDL_HINT_WINDOWS_NO_CLOSE_ON_ALT_F4 "SDL_WINDOWS_NO_CLOSE_ON_ALT_F4" - -/** - * \brief Prevent SDL from using version 4 of the bitmap header when saving BMPs. - * - * The bitmap header version 4 is required for proper alpha channel support and - * SDL will use it when required. Should this not be desired, this hint can - * force the use of the 40 byte header version which is supported everywhere. - * - * The variable can be set to the following values: - * "0" - Surfaces with a colorkey or an alpha channel are saved to a - * 32-bit BMP file with an alpha mask. SDL will use the bitmap - * header version 4 and set the alpha mask accordingly. - * "1" - Surfaces with a colorkey or an alpha channel are saved to a - * 32-bit BMP file without an alpha mask. The alpha channel data - * will be in the file, but applications are going to ignore it. - * - * The default value is "0". - */ -#define SDL_HINT_BMP_SAVE_LEGACY_FORMAT "SDL_BMP_SAVE_LEGACY_FORMAT" - -/** - * \brief Tell SDL not to name threads on Windows with the 0x406D1388 Exception. - * The 0x406D1388 Exception is a trick used to inform Visual Studio of a - * thread's name, but it tends to cause problems with other debuggers, - * and the .NET runtime. Note that SDL 2.0.6 and later will still use - * the (safer) SetThreadDescription API, introduced in the Windows 10 - * Creators Update, if available. - * - * The variable can be set to the following values: - * "0" - SDL will raise the 0x406D1388 Exception to name threads. - * This is the default behavior of SDL <= 2.0.4. - * "1" - SDL will not raise this exception, and threads will be unnamed. (default) - * This is necessary with .NET languages or debuggers that aren't Visual Studio. - */ -#define SDL_HINT_WINDOWS_DISABLE_THREAD_NAMING "SDL_WINDOWS_DISABLE_THREAD_NAMING" - -/** - * \brief Tell SDL which Dispmanx layer to use on a Raspberry PI - * - * Also known as Z-order. The variable can take a negative or positive value. - * The default is 10000. - */ -#define SDL_HINT_RPI_VIDEO_LAYER "SDL_RPI_VIDEO_LAYER" - -/** - * \brief Tell the video driver that we only want a double buffer. - * - * By default, most lowlevel 2D APIs will use a triple buffer scheme that - * wastes no CPU time on waiting for vsync after issuing a flip, but - * introduces a frame of latency. On the other hand, using a double buffer - * scheme instead is recommended for cases where low latency is an important - * factor because we save a whole frame of latency. - * We do so by waiting for vsync immediately after issuing a flip, usually just - * after eglSwapBuffers call in the backend's *_SwapWindow function. - * - * Since it's driver-specific, it's only supported where possible and - * implemented. Currently supported the following drivers: - * - KMSDRM (kmsdrm) - * - Raspberry Pi (raspberrypi) - */ -#define SDL_HINT_VIDEO_DOUBLE_BUFFER "SDL_VIDEO_DOUBLE_BUFFER" - -/** - * \brief A variable controlling what driver to use for OpenGL ES contexts. - * - * On some platforms, currently Windows and X11, OpenGL drivers may support - * creating contexts with an OpenGL ES profile. By default SDL uses these - * profiles, when available, otherwise it attempts to load an OpenGL ES - * library, e.g. that provided by the ANGLE project. This variable controls - * whether SDL follows this default behaviour or will always load an - * OpenGL ES library. - * - * Circumstances where this is useful include - * - Testing an app with a particular OpenGL ES implementation, e.g ANGLE, - * or emulator, e.g. those from ARM, Imagination or Qualcomm. - * - Resolving OpenGL ES function addresses at link time by linking with - * the OpenGL ES library instead of querying them at run time with - * SDL_GL_GetProcAddress(). - * - * Caution: for an application to work with the default behaviour across - * different OpenGL drivers it must query the OpenGL ES function - * addresses at run time using SDL_GL_GetProcAddress(). - * - * This variable is ignored on most platforms because OpenGL ES is native - * or not supported. - * - * This variable can be set to the following values: - * "0" - Use ES profile of OpenGL, if available. (Default when not set.) - * "1" - Load OpenGL ES library using the default library names. - * - */ -#define SDL_HINT_OPENGL_ES_DRIVER "SDL_OPENGL_ES_DRIVER" - -/** - * \brief A variable controlling speed/quality tradeoff of audio resampling. - * - * If available, SDL can use libsamplerate ( http://www.mega-nerd.com/SRC/ ) - * to handle audio resampling. There are different resampling modes available - * that produce different levels of quality, using more CPU. - * - * If this hint isn't specified to a valid setting, or libsamplerate isn't - * available, SDL will use the default, internal resampling algorithm. - * - * Note that this is currently only applicable to resampling audio that is - * being written to a device for playback or audio being read from a device - * for capture. SDL_AudioCVT always uses the default resampler (although this - * might change for SDL 2.1). - * - * This hint is currently only checked at audio subsystem initialization. - * - * This variable can be set to the following values: - * - * "0" or "default" - Use SDL's internal resampling (Default when not set - low quality, fast) - * "1" or "fast" - Use fast, slightly higher quality resampling, if available - * "2" or "medium" - Use medium quality resampling, if available - * "3" or "best" - Use high quality resampling, if available - */ -#define SDL_HINT_AUDIO_RESAMPLING_MODE "SDL_AUDIO_RESAMPLING_MODE" - -/** - * \brief A variable controlling the audio category on iOS and Mac OS X - * - * This variable can be set to the following values: - * - * "ambient" - Use the AVAudioSessionCategoryAmbient audio category, will be muted by the phone mute switch (default) - * "playback" - Use the AVAudioSessionCategoryPlayback category - * - * For more information, see Apple's documentation: - * https://developer.apple.com/library/content/documentation/Audio/Conceptual/AudioSessionProgrammingGuide/AudioSessionCategoriesandModes/AudioSessionCategoriesandModes.html - */ -#define SDL_HINT_AUDIO_CATEGORY "SDL_AUDIO_CATEGORY" - -/** - * \brief A variable controlling whether the 2D render API is compatible or efficient. - * - * This variable can be set to the following values: - * - * "0" - Don't use batching to make rendering more efficient. - * "1" - Use batching, but might cause problems if app makes its own direct OpenGL calls. - * - * Up to SDL 2.0.9, the render API would draw immediately when requested. Now - * it batches up draw requests and sends them all to the GPU only when forced - * to (during SDL_RenderPresent, when changing render targets, by updating a - * texture that the batch needs, etc). This is significantly more efficient, - * but it can cause problems for apps that expect to render on top of the - * render API's output. As such, SDL will disable batching if a specific - * render backend is requested (since this might indicate that the app is - * planning to use the underlying graphics API directly). This hint can - * be used to explicitly request batching in this instance. It is a contract - * that you will either never use the underlying graphics API directly, or - * if you do, you will call SDL_RenderFlush() before you do so any current - * batch goes to the GPU before your work begins. Not following this contract - * will result in undefined behavior. - */ -#define SDL_HINT_RENDER_BATCHING "SDL_RENDER_BATCHING" - - -/** - * \brief A variable controlling whether SDL logs all events pushed onto its internal queue. - * - * This variable can be set to the following values: - * - * "0" - Don't log any events (default) - * "1" - Log all events except mouse and finger motion, which are pretty spammy. - * "2" - Log all events. - * - * This is generally meant to be used to debug SDL itself, but can be useful - * for application developers that need better visibility into what is going - * on in the event queue. Logged events are sent through SDL_Log(), which - * means by default they appear on stdout on most platforms or maybe - * OutputDebugString() on Windows, and can be funneled by the app with - * SDL_LogSetOutputFunction(), etc. - * - * This hint can be toggled on and off at runtime, if you only need to log - * events for a small subset of program execution. - */ -#define SDL_HINT_EVENT_LOGGING "SDL_EVENT_LOGGING" - - - -/** - * \brief Controls how the size of the RIFF chunk affects the loading of a WAVE file. - * - * The size of the RIFF chunk (which includes all the sub-chunks of the WAVE - * file) is not always reliable. In case the size is wrong, it's possible to - * just ignore it and step through the chunks until a fixed limit is reached. - * - * Note that files that have trailing data unrelated to the WAVE file or - * corrupt files may slow down the loading process without a reliable boundary. - * By default, SDL stops after 10000 chunks to prevent wasting time. Use the - * environment variable SDL_WAVE_CHUNK_LIMIT to adjust this value. - * - * This variable can be set to the following values: - * - * "force" - Always use the RIFF chunk size as a boundary for the chunk search - * "ignorezero" - Like "force", but a zero size searches up to 4 GiB (default) - * "ignore" - Ignore the RIFF chunk size and always search up to 4 GiB - * "maximum" - Search for chunks until the end of file (not recommended) - */ -#define SDL_HINT_WAVE_RIFF_CHUNK_SIZE "SDL_WAVE_RIFF_CHUNK_SIZE" - -/** - * \brief Controls how a truncated WAVE file is handled. - * - * A WAVE file is considered truncated if any of the chunks are incomplete or - * the data chunk size is not a multiple of the block size. By default, SDL - * decodes until the first incomplete block, as most applications seem to do. - * - * This variable can be set to the following values: - * - * "verystrict" - Raise an error if the file is truncated - * "strict" - Like "verystrict", but the size of the RIFF chunk is ignored - * "dropframe" - Decode until the first incomplete sample frame - * "dropblock" - Decode until the first incomplete block (default) - */ -#define SDL_HINT_WAVE_TRUNCATION "SDL_WAVE_TRUNCATION" - -/** - * \brief Controls how the fact chunk affects the loading of a WAVE file. - * - * The fact chunk stores information about the number of samples of a WAVE - * file. The Standards Update from Microsoft notes that this value can be used - * to 'determine the length of the data in seconds'. This is especially useful - * for compressed formats (for which this is a mandatory chunk) if they produce - * multiple sample frames per block and truncating the block is not allowed. - * The fact chunk can exactly specify how many sample frames there should be - * in this case. - * - * Unfortunately, most application seem to ignore the fact chunk and so SDL - * ignores it by default as well. - * - * This variable can be set to the following values: - * - * "truncate" - Use the number of samples to truncate the wave data if - * the fact chunk is present and valid - * "strict" - Like "truncate", but raise an error if the fact chunk - * is invalid, not present for non-PCM formats, or if the - * data chunk doesn't have that many samples - * "ignorezero" - Like "truncate", but ignore fact chunk if the number of - * samples is zero - * "ignore" - Ignore fact chunk entirely (default) - */ -#define SDL_HINT_WAVE_FACT_CHUNK "SDL_WAVE_FACT_CHUNK" /** * \brief An enumeration of hint priorities @@ -1186,71 +1837,121 @@ typedef enum /** - * \brief Set a hint with a specific priority + * Set a hint with a specific priority. * - * The priority controls the behavior when setting a hint that already - * has a value. Hints will replace existing hints of their priority and - * lower. Environment variables are considered to have override priority. + * The priority controls the behavior when setting a hint that already has a + * value. Hints will replace existing hints of their priority and lower. + * Environment variables are considered to have override priority. * - * \return SDL_TRUE if the hint was set, SDL_FALSE otherwise + * \param name the hint to set + * \param value the value of the hint variable + * \param priority the SDL_HintPriority level for the hint + * \returns SDL_TRUE if the hint was set, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetHint + * \sa SDL_SetHint */ extern DECLSPEC SDL_bool SDLCALL SDL_SetHintWithPriority(const char *name, const char *value, SDL_HintPriority priority); /** - * \brief Set a hint with normal priority + * Set a hint with normal priority. * - * \return SDL_TRUE if the hint was set, SDL_FALSE otherwise + * Hints will not be set if there is an existing override hint or environment + * variable that takes precedence. You can use SDL_SetHintWithPriority() to + * set the hint with override priority instead. + * + * \param name the hint to set + * \param value the value of the hint variable + * \returns SDL_TRUE if the hint was set, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetHint + * \sa SDL_SetHintWithPriority */ extern DECLSPEC SDL_bool SDLCALL SDL_SetHint(const char *name, const char *value); /** - * \brief Get a hint + * Get the value of a hint. * - * \return The string value of a hint variable. + * \param name the hint to query + * \returns the string value of a hint or NULL if the hint isn't set. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetHint + * \sa SDL_SetHintWithPriority */ extern DECLSPEC const char * SDLCALL SDL_GetHint(const char *name); /** - * \brief Get a hint + * Get the boolean value of a hint variable. * - * \return The boolean value of a hint variable. + * \param name the name of the hint to get the boolean value from + * \param default_value the value to return if the hint does not exist + * \returns the boolean value of a hint or the provided default value if the + * hint does not exist. + * + * \since This function is available since SDL 2.0.5. + * + * \sa SDL_GetHint + * \sa SDL_SetHint */ extern DECLSPEC SDL_bool SDLCALL SDL_GetHintBoolean(const char *name, SDL_bool default_value); /** - * \brief type definition of the hint callback function. + * Type definition of the hint callback function. + * + * \param userdata what was passed as `userdata` to SDL_AddHintCallback() + * \param name what was passed as `name` to SDL_AddHintCallback() + * \param oldValue the previous hint value + * \param newValue the new value hint is to be set to */ typedef void (SDLCALL *SDL_HintCallback)(void *userdata, const char *name, const char *oldValue, const char *newValue); /** - * \brief Add a function to watch a particular hint + * Add a function to watch a particular hint. * - * \param name The hint to watch - * \param callback The function to call when the hint value changes - * \param userdata A pointer to pass to the callback function + * \param name the hint to watch + * \param callback An SDL_HintCallback function that will be called when the + * hint value changes + * \param userdata a pointer to pass to the callback function + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_DelHintCallback */ extern DECLSPEC void SDLCALL SDL_AddHintCallback(const char *name, SDL_HintCallback callback, void *userdata); /** - * \brief Remove a function watching a particular hint + * Remove a function watching a particular hint. * - * \param name The hint being watched - * \param callback The function being called when the hint value changes - * \param userdata A pointer being passed to the callback function + * \param name the hint being watched + * \param callback An SDL_HintCallback function that will be called when the + * hint value changes + * \param userdata a pointer being passed to the callback function + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AddHintCallback */ extern DECLSPEC void SDLCALL SDL_DelHintCallback(const char *name, SDL_HintCallback callback, void *userdata); /** - * \brief Clear all hints + * Clear all hints. * - * This function is called during SDL_Quit() to free stored hints. + * This function is automatically called during SDL_Quit(). + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC void SDLCALL SDL_ClearHints(void); diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_joystick.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_joystick.h index 3a4c5d177..e80c0057f 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_joystick.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_joystick.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -30,10 +30,12 @@ * The term "instance_id" is the current instantiation of a joystick device in the system, if the joystick is removed and then re-inserted * then it will get a new instance_id, instance_id's are monotonically increasing identifiers of a joystick plugged in. * + * The term "player_index" is the number assigned to a player on a specific + * controller. For XInput controllers this returns the XInput user index. + * Many joysticks will not be able to supply this information. + * * The term JoystickGUID is a stable 128-bit identifier for a joystick device that does not change over time, it identifies class of * the device (a X360 wired controller for example). This identifier is platform dependent. - * - * */ #ifndef SDL_joystick_h_ @@ -105,6 +107,12 @@ typedef enum SDL_JOYSTICK_POWER_MAX } SDL_JoystickPowerLevel; +/* Set max recognized G-force from accelerometer + See src/joystick/uikit/SDL_sysjoystick.m for notes on why this is needed + */ +#define SDL_IPHONE_MAX_GFORCE 5.0 + + /* Function prototypes */ /** @@ -116,210 +124,605 @@ typedef enum * In particular, you are guaranteed that the joystick list won't change, so * the API functions that take a joystick index will be valid, and joystick * and game controller events will not be delivered. + * + * \since This function is available since SDL 2.0.7. */ extern DECLSPEC void SDLCALL SDL_LockJoysticks(void); + + +/** + * Unlocking for multi-threaded access to the joystick API + * + * If you are using the joystick API or handling events from multiple threads + * you should use these locking functions to protect access to the joysticks. + * + * In particular, you are guaranteed that the joystick list won't change, so + * the API functions that take a joystick index will be valid, and joystick + * and game controller events will not be delivered. + * + * \since This function is available since SDL 2.0.7. + */ extern DECLSPEC void SDLCALL SDL_UnlockJoysticks(void); /** - * Count the number of joysticks attached to the system right now + * Count the number of joysticks attached to the system. + * + * \returns the number of attached joysticks on success or a negative error + * code on failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickName + * \sa SDL_JoystickOpen */ extern DECLSPEC int SDLCALL SDL_NumJoysticks(void); /** - * Get the implementation dependent name of a joystick. - * This can be called before any joysticks are opened. - * If no name can be found, this function returns NULL. + * Get the implementation dependent name of a joystick. + * + * This can be called before any joysticks are opened. + * + * \param device_index the index of the joystick to query (the N'th joystick + * on the system) + * \returns the name of the selected joystick. If no name can be found, this + * function returns NULL; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickName + * \sa SDL_JoystickOpen */ extern DECLSPEC const char *SDLCALL SDL_JoystickNameForIndex(int device_index); /** - * Get the player index of a joystick, or -1 if it's not available - * This can be called before any joysticks are opened. + * Get the player index of a joystick, or -1 if it's not available This can be + * called before any joysticks are opened. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC int SDLCALL SDL_JoystickGetDevicePlayerIndex(int device_index); /** - * Return the GUID for the joystick at this index - * This can be called before any joysticks are opened. + * Get the implementation-dependent GUID for the joystick at a given device + * index. + * + * This function can be called before any joysticks are opened. + * + * \param device_index the index of the joystick to query (the N'th joystick + * on the system + * \returns the GUID of the selected joystick. If called on an invalid index, + * this function returns a zero GUID + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickGetGUID + * \sa SDL_JoystickGetGUIDString */ extern DECLSPEC SDL_JoystickGUID SDLCALL SDL_JoystickGetDeviceGUID(int device_index); /** - * Get the USB vendor ID of a joystick, if available. - * This can be called before any joysticks are opened. - * If the vendor ID isn't available this function returns 0. + * Get the USB vendor ID of a joystick, if available. + * + * This can be called before any joysticks are opened. If the vendor ID isn't + * available this function returns 0. + * + * \param device_index the index of the joystick to query (the N'th joystick + * on the system + * \returns the USB vendor ID of the selected joystick. If called on an + * invalid index, this function returns zero + * + * \since This function is available since SDL 2.0.6. */ extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetDeviceVendor(int device_index); /** - * Get the USB product ID of a joystick, if available. - * This can be called before any joysticks are opened. - * If the product ID isn't available this function returns 0. + * Get the USB product ID of a joystick, if available. + * + * This can be called before any joysticks are opened. If the product ID isn't + * available this function returns 0. + * + * \param device_index the index of the joystick to query (the N'th joystick + * on the system + * \returns the USB product ID of the selected joystick. If called on an + * invalid index, this function returns zero + * + * \since This function is available since SDL 2.0.6. */ extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetDeviceProduct(int device_index); /** - * Get the product version of a joystick, if available. - * This can be called before any joysticks are opened. - * If the product version isn't available this function returns 0. + * Get the product version of a joystick, if available. + * + * This can be called before any joysticks are opened. If the product version + * isn't available this function returns 0. + * + * \param device_index the index of the joystick to query (the N'th joystick + * on the system + * \returns the product version of the selected joystick. If called on an + * invalid index, this function returns zero + * + * \since This function is available since SDL 2.0.6. */ extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetDeviceProductVersion(int device_index); /** - * Get the type of a joystick, if available. - * This can be called before any joysticks are opened. + * Get the type of a joystick, if available. + * + * This can be called before any joysticks are opened. + * + * \param device_index the index of the joystick to query (the N'th joystick + * on the system + * \returns the SDL_JoystickType of the selected joystick. If called on an + * invalid index, this function returns `SDL_JOYSTICK_TYPE_UNKNOWN` + * + * \since This function is available since SDL 2.0.6. */ extern DECLSPEC SDL_JoystickType SDLCALL SDL_JoystickGetDeviceType(int device_index); /** - * Get the instance ID of a joystick. - * This can be called before any joysticks are opened. - * If the index is out of range, this function will return -1. + * Get the instance ID of a joystick. + * + * This can be called before any joysticks are opened. If the index is out of + * range, this function will return -1. + * + * \param device_index the index of the joystick to query (the N'th joystick + * on the system + * \returns the instance id of the selected joystick. If called on an invalid + * index, this function returns zero + * + * \since This function is available since SDL 2.0.6. */ extern DECLSPEC SDL_JoystickID SDLCALL SDL_JoystickGetDeviceInstanceID(int device_index); /** - * Open a joystick for use. - * The index passed as an argument refers to the N'th joystick on the system. - * This index is not the value which will identify this joystick in future - * joystick events. The joystick's instance id (::SDL_JoystickID) will be used - * there instead. + * Open a joystick for use. * - * \return A joystick identifier, or NULL if an error occurred. + * The `device_index` argument refers to the N'th joystick presently + * recognized by SDL on the system. It is **NOT** the same as the instance ID + * used to identify the joystick in future events. See + * SDL_JoystickInstanceID() for more details about instance IDs. + * + * The joystick subsystem must be initialized before a joystick can be opened + * for use. + * + * \param device_index the index of the joystick to query + * \returns a joystick identifier or NULL if an error occurred; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickClose + * \sa SDL_JoystickInstanceID */ extern DECLSPEC SDL_Joystick *SDLCALL SDL_JoystickOpen(int device_index); /** - * Return the SDL_Joystick associated with an instance id. - */ -extern DECLSPEC SDL_Joystick *SDLCALL SDL_JoystickFromInstanceID(SDL_JoystickID joyid); - -/** - * Return the name for this currently opened joystick. - * If no name can be found, this function returns NULL. - */ -extern DECLSPEC const char *SDLCALL SDL_JoystickName(SDL_Joystick * joystick); - -/** - * Get the player index of an opened joystick, or -1 if it's not available + * Get the SDL_Joystick associated with an instance id. * - * For XInput controllers this returns the XInput user index. + * \param instance_id the instance id to get the SDL_Joystick for + * \returns an SDL_Joystick on success or NULL on failure; call SDL_GetError() + * for more information. + * + * \since This function is available since SDL 2.0.4. */ -extern DECLSPEC int SDLCALL SDL_JoystickGetPlayerIndex(SDL_Joystick * joystick); +extern DECLSPEC SDL_Joystick *SDLCALL SDL_JoystickFromInstanceID(SDL_JoystickID instance_id); /** - * Return the GUID for this opened joystick + * Get the SDL_Joystick associated with a player index. + * + * \param player_index the player index to get the SDL_Joystick for + * \returns an SDL_Joystick on success or NULL on failure; call SDL_GetError() + * for more information. + * + * \since This function is available since SDL 2.0.12. */ -extern DECLSPEC SDL_JoystickGUID SDLCALL SDL_JoystickGetGUID(SDL_Joystick * joystick); +extern DECLSPEC SDL_Joystick *SDLCALL SDL_JoystickFromPlayerIndex(int player_index); /** - * Get the USB vendor ID of an opened joystick, if available. - * If the vendor ID isn't available this function returns 0. + * Attach a new virtual joystick. + * + * \returns the joystick's device index, or -1 if an error occurred. + * + * \since This function is available since SDL 2.0.14. */ -extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetVendor(SDL_Joystick * joystick); +extern DECLSPEC int SDLCALL SDL_JoystickAttachVirtual(SDL_JoystickType type, + int naxes, + int nbuttons, + int nhats); /** - * Get the USB product ID of an opened joystick, if available. - * If the product ID isn't available this function returns 0. + * Detach a virtual joystick. + * + * \param device_index a value previously returned from + * SDL_JoystickAttachVirtual() + * \returns 0 on success, or -1 if an error occurred. + * + * \since This function is available since SDL 2.0.14. */ -extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetProduct(SDL_Joystick * joystick); +extern DECLSPEC int SDLCALL SDL_JoystickDetachVirtual(int device_index); /** - * Get the product version of an opened joystick, if available. - * If the product version isn't available this function returns 0. + * Query whether or not the joystick at a given device index is virtual. + * + * \param device_index a joystick device index. + * \returns SDL_TRUE if the joystick is virtual, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.14. */ -extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetProductVersion(SDL_Joystick * joystick); +extern DECLSPEC SDL_bool SDLCALL SDL_JoystickIsVirtual(int device_index); /** - * Get the type of an opened joystick. + * Set values on an opened, virtual-joystick's axis. + * + * Please note that values set here will not be applied until the next call to + * SDL_JoystickUpdate, which can either be called directly, or can be called + * indirectly through various other SDL APIs, including, but not limited to + * the following: SDL_PollEvent, SDL_PumpEvents, SDL_WaitEventTimeout, + * SDL_WaitEvent. + * + * \param joystick the virtual joystick on which to set state. + * \param axis the specific axis on the virtual joystick to set. + * \param value the new value for the specified axis. + * \returns 0 on success, -1 on error. + * + * \since This function is available since SDL 2.0.14. */ -extern DECLSPEC SDL_JoystickType SDLCALL SDL_JoystickGetType(SDL_Joystick * joystick); +extern DECLSPEC int SDLCALL SDL_JoystickSetVirtualAxis(SDL_Joystick *joystick, int axis, Sint16 value); /** - * Return a string representation for this guid. pszGUID must point to at least 33 bytes - * (32 for the string plus a NULL terminator). + * Set values on an opened, virtual-joystick's button. + * + * Please note that values set here will not be applied until the next call to + * SDL_JoystickUpdate, which can either be called directly, or can be called + * indirectly through various other SDL APIs, including, but not limited to + * the following: SDL_PollEvent, SDL_PumpEvents, SDL_WaitEventTimeout, + * SDL_WaitEvent. + * + * \param joystick the virtual joystick on which to set state. + * \param button the specific button on the virtual joystick to set. + * \param value the new value for the specified button. + * \returns 0 on success, -1 on error. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC int SDLCALL SDL_JoystickSetVirtualButton(SDL_Joystick *joystick, int button, Uint8 value); + +/** + * Set values on an opened, virtual-joystick's hat. + * + * Please note that values set here will not be applied until the next call to + * SDL_JoystickUpdate, which can either be called directly, or can be called + * indirectly through various other SDL APIs, including, but not limited to + * the following: SDL_PollEvent, SDL_PumpEvents, SDL_WaitEventTimeout, + * SDL_WaitEvent. + * + * \param joystick the virtual joystick on which to set state. + * \param hat the specific hat on the virtual joystick to set. + * \param value the new value for the specified hat. + * \returns 0 on success, -1 on error. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC int SDLCALL SDL_JoystickSetVirtualHat(SDL_Joystick *joystick, int hat, Uint8 value); + +/** + * Get the implementation dependent name of a joystick. + * + * \param joystick the SDL_Joystick obtained from SDL_JoystickOpen() + * \returns the name of the selected joystick. If no name can be found, this + * function returns NULL; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickNameForIndex + * \sa SDL_JoystickOpen + */ +extern DECLSPEC const char *SDLCALL SDL_JoystickName(SDL_Joystick *joystick); + +/** + * Get the player index of an opened joystick. + * + * For XInput controllers this returns the XInput user index. Many joysticks + * will not be able to supply this information. + * + * \param joystick the SDL_Joystick obtained from SDL_JoystickOpen() + * \returns the player index, or -1 if it's not available. + * + * \since This function is available since SDL 2.0.9. + */ +extern DECLSPEC int SDLCALL SDL_JoystickGetPlayerIndex(SDL_Joystick *joystick); + +/** + * Set the player index of an opened joystick. + * + * \param joystick the SDL_Joystick obtained from SDL_JoystickOpen() + * \param player_index the player index to set. + * + * \since This function is available since SDL 2.0.12. + */ +extern DECLSPEC void SDLCALL SDL_JoystickSetPlayerIndex(SDL_Joystick *joystick, int player_index); + +/** + * Get the implementation-dependent GUID for the joystick. + * + * This function requires an open joystick. + * + * \param joystick the SDL_Joystick obtained from SDL_JoystickOpen() + * \returns the GUID of the given joystick. If called on an invalid index, + * this function returns a zero GUID; call SDL_GetError() for more + * information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickGetDeviceGUID + * \sa SDL_JoystickGetGUIDString + */ +extern DECLSPEC SDL_JoystickGUID SDLCALL SDL_JoystickGetGUID(SDL_Joystick *joystick); + +/** + * Get the USB vendor ID of an opened joystick, if available. + * + * If the vendor ID isn't available this function returns 0. + * + * \param joystick the SDL_Joystick obtained from SDL_JoystickOpen() + * \returns the USB vendor ID of the selected joystick, or 0 if unavailable. + * + * \since This function is available since SDL 2.0.6. + */ +extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetVendor(SDL_Joystick *joystick); + +/** + * Get the USB product ID of an opened joystick, if available. + * + * If the product ID isn't available this function returns 0. + * + * \param joystick the SDL_Joystick obtained from SDL_JoystickOpen() + * \returns the USB product ID of the selected joystick, or 0 if unavailable. + * + * \since This function is available since SDL 2.0.6. + */ +extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetProduct(SDL_Joystick *joystick); + +/** + * Get the product version of an opened joystick, if available. + * + * If the product version isn't available this function returns 0. + * + * \param joystick the SDL_Joystick obtained from SDL_JoystickOpen() + * \returns the product version of the selected joystick, or 0 if unavailable. + * + * \since This function is available since SDL 2.0.6. + */ +extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetProductVersion(SDL_Joystick *joystick); + +/** + * Get the serial number of an opened joystick, if available. + * + * Returns the serial number of the joystick, or NULL if it is not available. + * + * \param joystick the SDL_Joystick obtained from SDL_JoystickOpen() + * \returns the serial number of the selected joystick, or NULL if + * unavailable. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC const char * SDLCALL SDL_JoystickGetSerial(SDL_Joystick *joystick); + +/** + * Get the type of an opened joystick. + * + * \param joystick the SDL_Joystick obtained from SDL_JoystickOpen() + * \returns the SDL_JoystickType of the selected joystick. + * + * \since This function is available since SDL 2.0.6. + */ +extern DECLSPEC SDL_JoystickType SDLCALL SDL_JoystickGetType(SDL_Joystick *joystick); + +/** + * Get an ASCII string representation for a given SDL_JoystickGUID. + * + * You should supply at least 33 bytes for pszGUID. + * + * \param guid the SDL_JoystickGUID you wish to convert to string + * \param pszGUID buffer in which to write the ASCII string + * \param cbGUID the size of pszGUID + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickGetDeviceGUID + * \sa SDL_JoystickGetGUID + * \sa SDL_JoystickGetGUIDFromString */ extern DECLSPEC void SDLCALL SDL_JoystickGetGUIDString(SDL_JoystickGUID guid, char *pszGUID, int cbGUID); /** - * Convert a string into a joystick guid + * Convert a GUID string into a SDL_JoystickGUID structure. + * + * Performs no error checking. If this function is given a string containing + * an invalid GUID, the function will silently succeed, but the GUID generated + * will not be useful. + * + * \param pchGUID string containing an ASCII representation of a GUID + * \returns a SDL_JoystickGUID structure. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickGetGUIDString */ extern DECLSPEC SDL_JoystickGUID SDLCALL SDL_JoystickGetGUIDFromString(const char *pchGUID); /** - * Returns SDL_TRUE if the joystick has been opened and currently connected, or SDL_FALSE if it has not. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_JoystickGetAttached(SDL_Joystick * joystick); - -/** - * Get the instance ID of an opened joystick or -1 if the joystick is invalid. - */ -extern DECLSPEC SDL_JoystickID SDLCALL SDL_JoystickInstanceID(SDL_Joystick * joystick); - -/** - * Get the number of general axis controls on a joystick. - */ -extern DECLSPEC int SDLCALL SDL_JoystickNumAxes(SDL_Joystick * joystick); - -/** - * Get the number of trackballs on a joystick. + * Get the status of a specified joystick. * - * Joystick trackballs have only relative motion events associated - * with them and their state cannot be polled. - */ -extern DECLSPEC int SDLCALL SDL_JoystickNumBalls(SDL_Joystick * joystick); - -/** - * Get the number of POV hats on a joystick. - */ -extern DECLSPEC int SDLCALL SDL_JoystickNumHats(SDL_Joystick * joystick); - -/** - * Get the number of buttons on a joystick. - */ -extern DECLSPEC int SDLCALL SDL_JoystickNumButtons(SDL_Joystick * joystick); - -/** - * Update the current state of the open joysticks. + * \param joystick the joystick to query + * \returns SDL_TRUE if the joystick has been opened, SDL_FALSE if it has not; + * call SDL_GetError() for more information. * - * This is called automatically by the event loop if any joystick - * events are enabled. + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickClose + * \sa SDL_JoystickOpen + */ +extern DECLSPEC SDL_bool SDLCALL SDL_JoystickGetAttached(SDL_Joystick *joystick); + +/** + * Get the instance ID of an opened joystick. + * + * \param joystick an SDL_Joystick structure containing joystick information + * \returns the instance ID of the specified joystick on success or a negative + * error code on failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickOpen + */ +extern DECLSPEC SDL_JoystickID SDLCALL SDL_JoystickInstanceID(SDL_Joystick *joystick); + +/** + * Get the number of general axis controls on a joystick. + * + * Often, the directional pad on a game controller will either look like 4 + * separate buttons or a POV hat, and not axes, but all of this is up to the + * device and platform. + * + * \param joystick an SDL_Joystick structure containing joystick information + * \returns the number of axis controls/number of axes on success or a + * negative error code on failure; call SDL_GetError() for more + * information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickGetAxis + * \sa SDL_JoystickOpen + */ +extern DECLSPEC int SDLCALL SDL_JoystickNumAxes(SDL_Joystick *joystick); + +/** + * Get the number of trackballs on a joystick. + * + * Joystick trackballs have only relative motion events associated with them + * and their state cannot be polled. + * + * Most joysticks do not have trackballs. + * + * \param joystick an SDL_Joystick structure containing joystick information + * \returns the number of trackballs on success or a negative error code on + * failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickGetBall + */ +extern DECLSPEC int SDLCALL SDL_JoystickNumBalls(SDL_Joystick *joystick); + +/** + * Get the number of POV hats on a joystick. + * + * \param joystick an SDL_Joystick structure containing joystick information + * \returns the number of POV hats on success or a negative error code on + * failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickGetHat + * \sa SDL_JoystickOpen + */ +extern DECLSPEC int SDLCALL SDL_JoystickNumHats(SDL_Joystick *joystick); + +/** + * Get the number of buttons on a joystick. + * + * \param joystick an SDL_Joystick structure containing joystick information + * \returns the number of buttons on success or a negative error code on + * failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickGetButton + * \sa SDL_JoystickOpen + */ +extern DECLSPEC int SDLCALL SDL_JoystickNumButtons(SDL_Joystick *joystick); + +/** + * Update the current state of the open joysticks. + * + * This is called automatically by the event loop if any joystick events are + * enabled. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickEventState */ extern DECLSPEC void SDLCALL SDL_JoystickUpdate(void); /** - * Enable/disable joystick event polling. + * Enable/disable joystick event polling. * - * If joystick events are disabled, you must call SDL_JoystickUpdate() - * yourself and check the state of the joystick when you want joystick - * information. + * If joystick events are disabled, you must call SDL_JoystickUpdate() + * yourself and manually check the state of the joystick when you want + * joystick information. * - * The state can be one of ::SDL_QUERY, ::SDL_ENABLE or ::SDL_IGNORE. + * It is recommended that you leave joystick event handling enabled. + * + * **WARNING**: Calling this function may delete all events currently in SDL's + * event queue. + * + * \param state can be one of `SDL_QUERY`, `SDL_IGNORE`, or `SDL_ENABLE` + * \returns 1 if enabled, 0 if disabled, or a negative error code on failure; + * call SDL_GetError() for more information. + * + * If `state` is `SDL_QUERY` then the current state is returned, + * otherwise the new processing state is returned. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GameControllerEventState */ extern DECLSPEC int SDLCALL SDL_JoystickEventState(int state); #define SDL_JOYSTICK_AXIS_MAX 32767 #define SDL_JOYSTICK_AXIS_MIN -32768 + /** - * Get the current state of an axis control on a joystick. + * Get the current state of an axis control on a joystick. * - * The state is a value ranging from -32768 to 32767. + * SDL makes no promises about what part of the joystick any given axis refers + * to. Your game should have some sort of configuration UI to let users + * specify what each axis should be bound to. Alternately, SDL's higher-level + * Game Controller API makes a great effort to apply order to this lower-level + * interface, so you know that a specific axis is the "left thumb stick," etc. * - * The axis indices start at index 0. + * The value returned by SDL_JoystickGetAxis() is a signed integer (-32768 to + * 32767) representing the current position of the axis. It may be necessary + * to impose certain tolerances on these values to account for jitter. + * + * \param joystick an SDL_Joystick structure containing joystick information + * \param axis the axis to query; the axis indices start at index 0 + * \returns a 16-bit signed integer representing the current position of the + * axis or 0 on failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickNumAxes */ -extern DECLSPEC Sint16 SDLCALL SDL_JoystickGetAxis(SDL_Joystick * joystick, +extern DECLSPEC Sint16 SDLCALL SDL_JoystickGetAxis(SDL_Joystick *joystick, int axis); /** - * Get the initial state of an axis control on a joystick. + * Get the initial state of an axis control on a joystick. * - * The state is a value ranging from -32768 to 32767. + * The state is a value ranging from -32768 to 32767. * - * The axis indices start at index 0. + * The axis indices start at index 0. * - * \return SDL_TRUE if this axis has any initial value, or SDL_FALSE if not. + * \param joystick an SDL_Joystick structure containing joystick information + * \param axis the axis to query; the axis indices start at index 0 + * \param state Upon return, the initial value is supplied here. + * \return SDL_TRUE if this axis has any initial value, or SDL_FALSE if not. + * + * \since This function is available since SDL 2.0.6. */ -extern DECLSPEC SDL_bool SDLCALL SDL_JoystickGetAxisInitialState(SDL_Joystick * joystick, +extern DECLSPEC SDL_bool SDLCALL SDL_JoystickGetAxisInitialState(SDL_Joystick *joystick, int axis, Sint16 *state); /** @@ -338,64 +741,199 @@ extern DECLSPEC SDL_bool SDLCALL SDL_JoystickGetAxisInitialState(SDL_Joystick * /* @} */ /** - * Get the current state of a POV hat on a joystick. + * Get the current state of a POV hat on a joystick. * - * The hat indices start at index 0. + * The returned value will be one of the following positions: * - * \return The return value is one of the following positions: - * - ::SDL_HAT_CENTERED - * - ::SDL_HAT_UP - * - ::SDL_HAT_RIGHT - * - ::SDL_HAT_DOWN - * - ::SDL_HAT_LEFT - * - ::SDL_HAT_RIGHTUP - * - ::SDL_HAT_RIGHTDOWN - * - ::SDL_HAT_LEFTUP - * - ::SDL_HAT_LEFTDOWN + * - `SDL_HAT_CENTERED` + * - `SDL_HAT_UP` + * - `SDL_HAT_RIGHT` + * - `SDL_HAT_DOWN` + * - `SDL_HAT_LEFT` + * - `SDL_HAT_RIGHTUP` + * - `SDL_HAT_RIGHTDOWN` + * - `SDL_HAT_LEFTUP` + * - `SDL_HAT_LEFTDOWN` + * + * \param joystick an SDL_Joystick structure containing joystick information + * \param hat the hat index to get the state from; indices start at index 0 + * \returns the current hat position. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickNumHats */ -extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetHat(SDL_Joystick * joystick, +extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetHat(SDL_Joystick *joystick, int hat); /** - * Get the ball axis change since the last poll. + * Get the ball axis change since the last poll. * - * \return 0, or -1 if you passed it invalid parameters. + * Trackballs can only return relative motion since the last call to + * SDL_JoystickGetBall(), these motion deltas are placed into `dx` and `dy`. * - * The ball indices start at index 0. + * Most joysticks do not have trackballs. + * + * \param joystick the SDL_Joystick to query + * \param ball the ball index to query; ball indices start at index 0 + * \param dx stores the difference in the x axis position since the last poll + * \param dy stores the difference in the y axis position since the last poll + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickNumBalls */ -extern DECLSPEC int SDLCALL SDL_JoystickGetBall(SDL_Joystick * joystick, +extern DECLSPEC int SDLCALL SDL_JoystickGetBall(SDL_Joystick *joystick, int ball, int *dx, int *dy); /** - * Get the current state of a button on a joystick. + * Get the current state of a button on a joystick. * - * The button indices start at index 0. + * \param joystick an SDL_Joystick structure containing joystick information + * \param button the button index to get the state from; indices start at + * index 0 + * \returns 1 if the specified button is pressed, 0 otherwise. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickNumButtons */ -extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetButton(SDL_Joystick * joystick, +extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetButton(SDL_Joystick *joystick, int button); /** - * Trigger a rumble effect - * Each call to this function cancels any previous rumble effect, and calling it with 0 intensity stops any rumbling. + * Start a rumble effect. * - * \param joystick The joystick to vibrate - * \param low_frequency_rumble The intensity of the low frequency (left) rumble motor, from 0 to 0xFFFF - * \param high_frequency_rumble The intensity of the high frequency (right) rumble motor, from 0 to 0xFFFF - * \param duration_ms The duration of the rumble effect, in milliseconds + * Each call to this function cancels any previous rumble effect, and calling + * it with 0 intensity stops any rumbling. * - * \return 0, or -1 if rumble isn't supported on this joystick + * \param joystick The joystick to vibrate + * \param low_frequency_rumble The intensity of the low frequency (left) + * rumble motor, from 0 to 0xFFFF + * \param high_frequency_rumble The intensity of the high frequency (right) + * rumble motor, from 0 to 0xFFFF + * \param duration_ms The duration of the rumble effect, in milliseconds + * \returns 0, or -1 if rumble isn't supported on this joystick + * + * \since This function is available since SDL 2.0.9. + * + * \sa SDL_JoystickHasRumble */ -extern DECLSPEC int SDLCALL SDL_JoystickRumble(SDL_Joystick * joystick, Uint16 low_frequency_rumble, Uint16 high_frequency_rumble, Uint32 duration_ms); +extern DECLSPEC int SDLCALL SDL_JoystickRumble(SDL_Joystick *joystick, Uint16 low_frequency_rumble, Uint16 high_frequency_rumble, Uint32 duration_ms); /** - * Close a joystick previously opened with SDL_JoystickOpen(). + * Start a rumble effect in the joystick's triggers + * + * Each call to this function cancels any previous trigger rumble effect, and + * calling it with 0 intensity stops any rumbling. + * + * Note that this function is for _trigger_ rumble; the first joystick to + * support this was the PlayStation 5's DualShock 5 controller. If you want + * the (more common) whole-controller rumble, use SDL_JoystickRumble() + * instead. + * + * \param joystick The joystick to vibrate + * \param left_rumble The intensity of the left trigger rumble motor, from 0 + * to 0xFFFF + * \param right_rumble The intensity of the right trigger rumble motor, from 0 + * to 0xFFFF + * \param duration_ms The duration of the rumble effect, in milliseconds + * \returns 0, or -1 if trigger rumble isn't supported on this joystick + * + * \since This function is available since SDL 2.0.14. + * + * \sa SDL_JoystickHasRumbleTriggers */ -extern DECLSPEC void SDLCALL SDL_JoystickClose(SDL_Joystick * joystick); +extern DECLSPEC int SDLCALL SDL_JoystickRumbleTriggers(SDL_Joystick *joystick, Uint16 left_rumble, Uint16 right_rumble, Uint32 duration_ms); /** - * Return the battery level of this joystick + * Query whether a joystick has an LED. + * + * An example of a joystick LED is the light on the back of a PlayStation 4's + * DualShock 4 controller. + * + * \param joystick The joystick to query + * \return SDL_TRUE if the joystick has a modifiable LED, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.14. */ -extern DECLSPEC SDL_JoystickPowerLevel SDLCALL SDL_JoystickCurrentPowerLevel(SDL_Joystick * joystick); +extern DECLSPEC SDL_bool SDLCALL SDL_JoystickHasLED(SDL_Joystick *joystick); + +/** + * Query whether a joystick has rumble support. + * + * \param joystick The joystick to query + * \return SDL_TRUE if the joystick has rumble, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_JoystickRumble + */ +extern DECLSPEC SDL_bool SDLCALL SDL_JoystickHasRumble(SDL_Joystick *joystick); + +/** + * Query whether a joystick has rumble support on triggers. + * + * \param joystick The joystick to query + * \return SDL_TRUE if the joystick has trigger rumble, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_JoystickRumbleTriggers + */ +extern DECLSPEC SDL_bool SDLCALL SDL_JoystickHasRumbleTriggers(SDL_Joystick *joystick); + +/** + * Update a joystick's LED color. + * + * An example of a joystick LED is the light on the back of a PlayStation 4's + * DualShock 4 controller. + * + * \param joystick The joystick to update + * \param red The intensity of the red LED + * \param green The intensity of the green LED + * \param blue The intensity of the blue LED + * \returns 0 on success, -1 if this joystick does not have a modifiable LED + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC int SDLCALL SDL_JoystickSetLED(SDL_Joystick *joystick, Uint8 red, Uint8 green, Uint8 blue); + +/** + * Send a joystick specific effect packet + * + * \param joystick The joystick to affect + * \param data The data to send to the joystick + * \param size The size of the data to send to the joystick + * \returns 0, or -1 if this joystick or driver doesn't support effect packets + * + * \since This function is available since SDL 2.0.16. + */ +extern DECLSPEC int SDLCALL SDL_JoystickSendEffect(SDL_Joystick *joystick, const void *data, int size); + +/** + * Close a joystick previously opened with SDL_JoystickOpen(). + * + * \param joystick The joystick device to close + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_JoystickOpen + */ +extern DECLSPEC void SDLCALL SDL_JoystickClose(SDL_Joystick *joystick); + +/** + * Get the battery level of a joystick as SDL_JoystickPowerLevel. + * + * \param joystick the SDL_Joystick to query + * \returns the current battery level as SDL_JoystickPowerLevel on success or + * `SDL_JOYSTICK_POWER_UNKNOWN` if it is unknown + * + * \since This function is available since SDL 2.0.4. + */ +extern DECLSPEC SDL_JoystickPowerLevel SDLCALL SDL_JoystickCurrentPowerLevel(SDL_Joystick *joystick); /* Ends C function definitions when using C++ */ #ifdef __cplusplus diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_keyboard.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_keyboard.h index 4b2a055d8..a53dde68e 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_keyboard.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_keyboard.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -55,154 +55,253 @@ typedef struct SDL_Keysym /* Function prototypes */ /** - * \brief Get the window which currently has keyboard focus. + * Query the window which currently has keyboard focus. + * + * \returns the window with keyboard focus. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC SDL_Window * SDLCALL SDL_GetKeyboardFocus(void); /** - * \brief Get a snapshot of the current state of the keyboard. + * Get a snapshot of the current state of the keyboard. * - * \param numkeys if non-NULL, receives the length of the returned array. + * The pointer returned is a pointer to an internal SDL array. It will be + * valid for the whole lifetime of the application and should not be freed by + * the caller. * - * \return An array of key states. Indexes into this array are obtained by using ::SDL_Scancode values. + * A array element with a value of 1 means that the key is pressed and a value + * of 0 means that it is not. Indexes into this array are obtained by using + * SDL_Scancode values. * - * \b Example: - * \code - * const Uint8 *state = SDL_GetKeyboardState(NULL); - * if ( state[SDL_SCANCODE_RETURN] ) { - * printf(" is pressed.\n"); - * } - * \endcode + * Use SDL_PumpEvents() to update the state array. + * + * This function gives you the current state after all events have been + * processed, so if a key or button has been pressed and released before you + * process events, then the pressed state will never show up in the + * SDL_GetKeyboardState() calls. + * + * Note: This function doesn't take into account whether shift has been + * pressed or not. + * + * \param numkeys if non-NULL, receives the length of the returned array + * \returns a pointer to an array of key states. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_PumpEvents */ extern DECLSPEC const Uint8 *SDLCALL SDL_GetKeyboardState(int *numkeys); /** - * \brief Get the current key modifier state for the keyboard. + * Get the current key modifier state for the keyboard. + * + * \returns an OR'd combination of the modifier keys for the keyboard. See + * SDL_Keymod for details. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetKeyboardState + * \sa SDL_SetModState */ extern DECLSPEC SDL_Keymod SDLCALL SDL_GetModState(void); /** - * \brief Set the current key modifier state for the keyboard. + * Set the current key modifier state for the keyboard. * - * \note This does not change the keyboard state, only the key modifier flags. + * The inverse of SDL_GetModState(), SDL_SetModState() allows you to impose + * modifier key states on your application. Simply pass your desired modifier + * states into `modstate`. This value may be a bitwise, OR'd combination of + * SDL_Keymod values. + * + * This does not change the keyboard state, only the key modifier flags that + * SDL reports. + * + * \param modstate the desired SDL_Keymod for the keyboard + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetModState */ extern DECLSPEC void SDLCALL SDL_SetModState(SDL_Keymod modstate); /** - * \brief Get the key code corresponding to the given scancode according - * to the current keyboard layout. + * Get the key code corresponding to the given scancode according to the + * current keyboard layout. * - * See ::SDL_Keycode for details. + * See SDL_Keycode for details. * - * \sa SDL_GetKeyName() + * \param scancode the desired SDL_Scancode to query + * \returns the SDL_Keycode that corresponds to the given SDL_Scancode. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetKeyName + * \sa SDL_GetScancodeFromKey */ extern DECLSPEC SDL_Keycode SDLCALL SDL_GetKeyFromScancode(SDL_Scancode scancode); /** - * \brief Get the scancode corresponding to the given key code according to the - * current keyboard layout. + * Get the scancode corresponding to the given key code according to the + * current keyboard layout. * - * See ::SDL_Scancode for details. + * See SDL_Scancode for details. * - * \sa SDL_GetScancodeName() + * \param key the desired SDL_Keycode to query + * \returns the SDL_Scancode that corresponds to the given SDL_Keycode. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetKeyFromScancode + * \sa SDL_GetScancodeName */ extern DECLSPEC SDL_Scancode SDLCALL SDL_GetScancodeFromKey(SDL_Keycode key); /** - * \brief Get a human-readable name for a scancode. + * Get a human-readable name for a scancode. * - * \return A pointer to the name for the scancode. - * If the scancode doesn't have a name, this function returns - * an empty string (""). + * See SDL_Scancode for details. * - * \sa SDL_Scancode + * **Warning**: The returned name is by design not stable across platforms, + * e.g. the name for `SDL_SCANCODE_LGUI` is "Left GUI" under Linux but "Left + * Windows" under Microsoft Windows, and some scancodes like + * `SDL_SCANCODE_NONUSBACKSLASH` don't have any name at all. There are even + * scancodes that share names, e.g. `SDL_SCANCODE_RETURN` and + * `SDL_SCANCODE_RETURN2` (both called "Return"). This function is therefore + * unsuitable for creating a stable cross-platform two-way mapping between + * strings and scancodes. + * + * \param scancode the desired SDL_Scancode to query + * \returns a pointer to the name for the scancode. If the scancode doesn't + * have a name this function returns an empty string (""). + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetScancodeFromKey + * \sa SDL_GetScancodeFromName */ extern DECLSPEC const char *SDLCALL SDL_GetScancodeName(SDL_Scancode scancode); /** - * \brief Get a scancode from a human-readable name + * Get a scancode from a human-readable name. * - * \return scancode, or SDL_SCANCODE_UNKNOWN if the name wasn't recognized + * \param name the human-readable scancode name + * \returns the SDL_Scancode, or `SDL_SCANCODE_UNKNOWN` if the name wasn't + * recognized; call SDL_GetError() for more information. * - * \sa SDL_Scancode + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetKeyFromName + * \sa SDL_GetScancodeFromKey + * \sa SDL_GetScancodeName */ extern DECLSPEC SDL_Scancode SDLCALL SDL_GetScancodeFromName(const char *name); /** - * \brief Get a human-readable name for a key. + * Get a human-readable name for a key. * - * \return A pointer to a UTF-8 string that stays valid at least until the next - * call to this function. If you need it around any longer, you must - * copy it. If the key doesn't have a name, this function returns an - * empty string (""). + * See SDL_Scancode and SDL_Keycode for details. * - * \sa SDL_Keycode + * \param key the desired SDL_Keycode to query + * \returns a pointer to a UTF-8 string that stays valid at least until the + * next call to this function. If you need it around any longer, you + * must copy it. If the key doesn't have a name, this function + * returns an empty string (""). + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetKeyFromName + * \sa SDL_GetKeyFromScancode + * \sa SDL_GetScancodeFromKey */ extern DECLSPEC const char *SDLCALL SDL_GetKeyName(SDL_Keycode key); /** - * \brief Get a key code from a human-readable name + * Get a key code from a human-readable name. * - * \return key code, or SDLK_UNKNOWN if the name wasn't recognized + * \param name the human-readable key name + * \returns key code, or `SDLK_UNKNOWN` if the name wasn't recognized; call + * SDL_GetError() for more information. * - * \sa SDL_Keycode + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetKeyFromScancode + * \sa SDL_GetKeyName + * \sa SDL_GetScancodeFromName */ extern DECLSPEC SDL_Keycode SDLCALL SDL_GetKeyFromName(const char *name); /** - * \brief Start accepting Unicode text input events. - * This function will show the on-screen keyboard if supported. + * Start accepting Unicode text input events. * - * \sa SDL_StopTextInput() - * \sa SDL_SetTextInputRect() - * \sa SDL_HasScreenKeyboardSupport() + * This function will start accepting Unicode text input events in the focused + * SDL window, and start emitting SDL_TextInputEvent (SDL_TEXTINPUT) and + * SDL_TextEditingEvent (SDL_TEXTEDITING) events. Please use this function in + * pair with SDL_StopTextInput(). + * + * On some platforms using this function activates the screen keyboard. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetTextInputRect + * \sa SDL_StopTextInput */ extern DECLSPEC void SDLCALL SDL_StartTextInput(void); /** - * \brief Return whether or not Unicode text input events are enabled. + * Check whether or not Unicode text input events are enabled. * - * \sa SDL_StartTextInput() - * \sa SDL_StopTextInput() + * \returns SDL_TRUE if text input events are enabled else SDL_FALSE. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_StartTextInput */ extern DECLSPEC SDL_bool SDLCALL SDL_IsTextInputActive(void); /** - * \brief Stop receiving any text input events. - * This function will hide the on-screen keyboard if supported. + * Stop receiving any text input events. * - * \sa SDL_StartTextInput() - * \sa SDL_HasScreenKeyboardSupport() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_StartTextInput */ extern DECLSPEC void SDLCALL SDL_StopTextInput(void); /** - * \brief Set the rectangle used to type Unicode text inputs. - * This is used as a hint for IME and on-screen keyboard placement. + * Set the rectangle used to type Unicode text inputs. * - * \sa SDL_StartTextInput() + * \param rect the SDL_Rect structure representing the rectangle to receive + * text (ignored if NULL) + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_StartTextInput */ extern DECLSPEC void SDLCALL SDL_SetTextInputRect(SDL_Rect *rect); /** - * \brief Returns whether the platform has some screen keyboard support. + * Check whether the platform has screen keyboard support. * - * \return SDL_TRUE if some keyboard support is available else SDL_FALSE. + * \returns SDL_TRUE if the platform has some screen keyboard support or + * SDL_FALSE if not. * - * \note Not all screen keyboard functions are supported on all platforms. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_IsScreenKeyboardShown() + * \sa SDL_StartTextInput + * \sa SDL_IsScreenKeyboardShown */ extern DECLSPEC SDL_bool SDLCALL SDL_HasScreenKeyboardSupport(void); /** - * \brief Returns whether the screen keyboard is shown for given window. + * Check whether the screen keyboard is shown for given window. * - * \param window The window for which screen keyboard should be queried. + * \param window the window for which screen keyboard should be queried + * \returns SDL_TRUE if screen keyboard is shown or SDL_FALSE if not. * - * \return SDL_TRUE if screen keyboard is shown else SDL_FALSE. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_HasScreenKeyboardSupport() + * \sa SDL_HasScreenKeyboardSupport */ extern DECLSPEC SDL_bool SDLCALL SDL_IsScreenKeyboardShown(SDL_Window *window); diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_keycode.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_keycode.h index 3bceb418a..35602541a 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_keycode.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_keycode.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -47,12 +47,12 @@ typedef Sint32 SDL_Keycode; #define SDLK_SCANCODE_MASK (1<<30) #define SDL_SCANCODE_TO_KEYCODE(X) (X | SDLK_SCANCODE_MASK) -enum +typedef enum { SDLK_UNKNOWN = 0, SDLK_RETURN = '\r', - SDLK_ESCAPE = '\033', + SDLK_ESCAPE = '\x1B', SDLK_BACKSPACE = '\b', SDLK_TAB = '\t', SDLK_SPACE = ' ', @@ -88,9 +88,11 @@ enum SDLK_GREATER = '>', SDLK_QUESTION = '?', SDLK_AT = '@', + /* Skip uppercase letters */ + SDLK_LEFTBRACKET = '[', SDLK_BACKSLASH = '\\', SDLK_RIGHTBRACKET = ']', @@ -145,7 +147,7 @@ enum SDLK_INSERT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_INSERT), SDLK_HOME = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_HOME), SDLK_PAGEUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAGEUP), - SDLK_DELETE = '\177', + SDLK_DELETE = '\x7F', SDLK_END = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_END), SDLK_PAGEDOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAGEDOWN), SDLK_RIGHT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RIGHT), @@ -317,7 +319,7 @@ enum SDLK_AUDIOREWIND = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOREWIND), SDLK_AUDIOFASTFORWARD = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOFASTFORWARD) -}; +} SDL_KeyCode; /** * \brief Enumeration of valid key mods (possibly OR'd together). @@ -336,13 +338,15 @@ typedef enum KMOD_NUM = 0x1000, KMOD_CAPS = 0x2000, KMOD_MODE = 0x4000, - KMOD_RESERVED = 0x8000 -} SDL_Keymod; + KMOD_SCROLL = 0x8000, -#define KMOD_CTRL (KMOD_LCTRL|KMOD_RCTRL) -#define KMOD_SHIFT (KMOD_LSHIFT|KMOD_RSHIFT) -#define KMOD_ALT (KMOD_LALT|KMOD_RALT) -#define KMOD_GUI (KMOD_LGUI|KMOD_RGUI) + KMOD_CTRL = KMOD_LCTRL | KMOD_RCTRL, + KMOD_SHIFT = KMOD_LSHIFT | KMOD_RSHIFT, + KMOD_ALT = KMOD_LALT | KMOD_RALT, + KMOD_GUI = KMOD_LGUI | KMOD_RGUI, + + KMOD_RESERVED = KMOD_SCROLL /* This is for source-level compatibility with SDL 2.0.0. */ +} SDL_Keymod; #endif /* SDL_keycode_h_ */ diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_loadso.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_loadso.h index 793ba5358..61857c813 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_loadso.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_loadso.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -51,22 +51,56 @@ extern "C" { #endif /** - * This function dynamically loads a shared object and returns a pointer - * to the object handle (or NULL if there was an error). - * The 'sofile' parameter is a system dependent name of the object file. + * Dynamically load a shared object. + * + * \param sofile a system-dependent name of the object file + * \returns an opaque pointer to the object handle or NULL if there was an + * error; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LoadFunction + * \sa SDL_UnloadObject */ extern DECLSPEC void *SDLCALL SDL_LoadObject(const char *sofile); /** - * Given an object handle, this function looks up the address of the - * named function in the shared object and returns it. This address - * is no longer valid after calling SDL_UnloadObject(). + * Look up the address of the named function in a shared object. + * + * This function pointer is no longer valid after calling SDL_UnloadObject(). + * + * This function can only look up C function names. Other languages may have + * name mangling and intrinsic language support that varies from compiler to + * compiler. + * + * Make sure you declare your function pointers with the same calling + * convention as the actual library function. Your code will crash + * mysteriously if you do not do this. + * + * If the requested function doesn't exist, NULL is returned. + * + * \param handle a valid shared object handle returned by SDL_LoadObject() + * \param name the name of the function to look up + * \returns a pointer to the function or NULL if there was an error; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LoadObject + * \sa SDL_UnloadObject */ extern DECLSPEC void *SDLCALL SDL_LoadFunction(void *handle, const char *name); /** - * Unload a shared object from memory. + * Unload a shared object from memory. + * + * \param handle a valid shared object handle returned by SDL_LoadObject() + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LoadFunction + * \sa SDL_LoadObject */ extern DECLSPEC void SDLCALL SDL_UnloadObject(void *handle); diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_locale.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_locale.h new file mode 100644 index 000000000..751577994 --- /dev/null +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_locale.h @@ -0,0 +1,103 @@ +/* + Simple DirectMedia Layer + Copyright (C) 1997-2022 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ + +/** + * \file SDL_locale.h + * + * Include file for SDL locale services + */ + +#ifndef _SDL_locale_h +#define _SDL_locale_h + +#include "SDL_stdinc.h" +#include "SDL_error.h" + +#include "begin_code.h" +/* Set up for C function definitions, even when using C++ */ +#ifdef __cplusplus +/* *INDENT-OFF* */ +extern "C" { +/* *INDENT-ON* */ +#endif + + +typedef struct SDL_Locale +{ + const char *language; /**< A language name, like "en" for English. */ + const char *country; /**< A country, like "US" for America. Can be NULL. */ +} SDL_Locale; + +/** + * Report the user's preferred locale. + * + * This returns an array of SDL_Locale structs, the final item zeroed out. + * When the caller is done with this array, it should call SDL_free() on the + * returned value; all the memory involved is allocated in a single block, so + * a single SDL_free() will suffice. + * + * Returned language strings are in the format xx, where 'xx' is an ISO-639 + * language specifier (such as "en" for English, "de" for German, etc). + * Country strings are in the format YY, where "YY" is an ISO-3166 country + * code (such as "US" for the United States, "CA" for Canada, etc). Country + * might be NULL if there's no specific guidance on them (so you might get { + * "en", "US" } for American English, but { "en", NULL } means "English + * language, generically"). Language strings are never NULL, except to + * terminate the array. + * + * Please note that not all of these strings are 2 characters; some are three + * or more. + * + * The returned list of locales are in the order of the user's preference. For + * example, a German citizen that is fluent in US English and knows enough + * Japanese to navigate around Tokyo might have a list like: { "de", "en_US", + * "jp", NULL }. Someone from England might prefer British English (where + * "color" is spelled "colour", etc), but will settle for anything like it: { + * "en_GB", "en", NULL }. + * + * This function returns NULL on error, including when the platform does not + * supply this information at all. + * + * This might be a "slow" call that has to query the operating system. It's + * best to ask for this once and save the results. However, this list can + * change, usually because the user has changed a system preference outside of + * your program; SDL will send an SDL_LOCALECHANGED event in this case, if + * possible, and you can call this function again to get an updated copy of + * preferred locales. + * + * \return array of locales, terminated with a locale with a NULL language + * field. Will return NULL on error. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC SDL_Locale * SDLCALL SDL_GetPreferredLocales(void); + +/* Ends C function definitions when using C++ */ +#ifdef __cplusplus +/* *INDENT-OFF* */ +} +/* *INDENT-ON* */ +#endif +#include "close_code.h" + +#endif /* _SDL_locale_h */ + +/* vi: set ts=4 sw=4 expandtab: */ diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_log.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_log.h index 40f768d57..dbbcb1e6f 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_log.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_log.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -61,7 +61,7 @@ extern "C" { * at the VERBOSE level and all other categories are enabled at the * CRITICAL level. */ -enum +typedef enum { SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_CATEGORY_ERROR, @@ -94,7 +94,7 @@ enum }; */ SDL_LOG_CATEGORY_CUSTOM -}; +} SDL_LogCategory; /** * \brief The predefined log priorities @@ -112,90 +112,283 @@ typedef enum /** - * \brief Set the priority of all log categories + * Set the priority of all log categories. + * + * \param priority the SDL_LogPriority to assign + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LogSetPriority */ extern DECLSPEC void SDLCALL SDL_LogSetAllPriority(SDL_LogPriority priority); /** - * \brief Set the priority of a particular log category + * Set the priority of a particular log category. + * + * \param category the category to assign a priority to + * \param priority the SDL_LogPriority to assign + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LogGetPriority + * \sa SDL_LogSetAllPriority */ extern DECLSPEC void SDLCALL SDL_LogSetPriority(int category, SDL_LogPriority priority); /** - * \brief Get the priority of a particular log category + * Get the priority of a particular log category. + * + * \param category the category to query + * \returns the SDL_LogPriority for the requested category + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LogSetPriority */ extern DECLSPEC SDL_LogPriority SDLCALL SDL_LogGetPriority(int category); /** - * \brief Reset all priorities to default. + * Reset all priorities to default. * - * \note This is called in SDL_Quit(). + * This is called by SDL_Quit(). + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LogSetAllPriority + * \sa SDL_LogSetPriority */ extern DECLSPEC void SDLCALL SDL_LogResetPriorities(void); /** - * \brief Log a message with SDL_LOG_CATEGORY_APPLICATION and SDL_LOG_PRIORITY_INFO + * Log a message with SDL_LOG_CATEGORY_APPLICATION and SDL_LOG_PRIORITY_INFO. + * + * = * \param fmt a printf() style message format string + * + * \param ... additional parameters matching % tokens in the `fmt` string, if + * any + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LogCritical + * \sa SDL_LogDebug + * \sa SDL_LogError + * \sa SDL_LogInfo + * \sa SDL_LogMessage + * \sa SDL_LogMessageV + * \sa SDL_LogVerbose + * \sa SDL_LogWarn */ extern DECLSPEC void SDLCALL SDL_Log(SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(1); /** - * \brief Log a message with SDL_LOG_PRIORITY_VERBOSE + * Log a message with SDL_LOG_PRIORITY_VERBOSE. + * + * \param category the category of the message + * \param fmt a printf() style message format string + * \param ... additional parameters matching % tokens in the **fmt** string, + * if any + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Log + * \sa SDL_LogCritical + * \sa SDL_LogDebug + * \sa SDL_LogError + * \sa SDL_LogInfo + * \sa SDL_LogMessage + * \sa SDL_LogMessageV + * \sa SDL_LogWarn */ extern DECLSPEC void SDLCALL SDL_LogVerbose(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(2); /** - * \brief Log a message with SDL_LOG_PRIORITY_DEBUG + * Log a message with SDL_LOG_PRIORITY_DEBUG. + * + * \param category the category of the message + * \param fmt a printf() style message format string + * \param ... additional parameters matching % tokens in the **fmt** string, + * if any + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Log + * \sa SDL_LogCritical + * \sa SDL_LogError + * \sa SDL_LogInfo + * \sa SDL_LogMessage + * \sa SDL_LogMessageV + * \sa SDL_LogVerbose + * \sa SDL_LogWarn */ extern DECLSPEC void SDLCALL SDL_LogDebug(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(2); /** - * \brief Log a message with SDL_LOG_PRIORITY_INFO + * Log a message with SDL_LOG_PRIORITY_INFO. + * + * \param category the category of the message + * \param fmt a printf() style message format string + * \param ... additional parameters matching % tokens in the **fmt** string, + * if any + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Log + * \sa SDL_LogCritical + * \sa SDL_LogDebug + * \sa SDL_LogError + * \sa SDL_LogMessage + * \sa SDL_LogMessageV + * \sa SDL_LogVerbose + * \sa SDL_LogWarn */ extern DECLSPEC void SDLCALL SDL_LogInfo(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(2); /** - * \brief Log a message with SDL_LOG_PRIORITY_WARN + * Log a message with SDL_LOG_PRIORITY_WARN. + * + * \param category the category of the message + * \param fmt a printf() style message format string + * \param ... additional parameters matching % tokens in the **fmt** string, + * if any + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Log + * \sa SDL_LogCritical + * \sa SDL_LogDebug + * \sa SDL_LogError + * \sa SDL_LogInfo + * \sa SDL_LogMessage + * \sa SDL_LogMessageV + * \sa SDL_LogVerbose */ extern DECLSPEC void SDLCALL SDL_LogWarn(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(2); /** - * \brief Log a message with SDL_LOG_PRIORITY_ERROR + * Log a message with SDL_LOG_PRIORITY_ERROR. + * + * \param category the category of the message + * \param fmt a printf() style message format string + * \param ... additional parameters matching % tokens in the **fmt** string, + * if any + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Log + * \sa SDL_LogCritical + * \sa SDL_LogDebug + * \sa SDL_LogInfo + * \sa SDL_LogMessage + * \sa SDL_LogMessageV + * \sa SDL_LogVerbose + * \sa SDL_LogWarn */ extern DECLSPEC void SDLCALL SDL_LogError(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(2); /** - * \brief Log a message with SDL_LOG_PRIORITY_CRITICAL + * Log a message with SDL_LOG_PRIORITY_CRITICAL. + * + * \param category the category of the message + * \param fmt a printf() style message format string + * \param ... additional parameters matching % tokens in the **fmt** string, + * if any + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Log + * \sa SDL_LogDebug + * \sa SDL_LogError + * \sa SDL_LogInfo + * \sa SDL_LogMessage + * \sa SDL_LogMessageV + * \sa SDL_LogVerbose + * \sa SDL_LogWarn */ extern DECLSPEC void SDLCALL SDL_LogCritical(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(2); /** - * \brief Log a message with the specified category and priority. + * Log a message with the specified category and priority. + * + * \param category the category of the message + * \param priority the priority of the message + * \param fmt a printf() style message format string + * \param ... additional parameters matching % tokens in the **fmt** string, + * if any + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Log + * \sa SDL_LogCritical + * \sa SDL_LogDebug + * \sa SDL_LogError + * \sa SDL_LogInfo + * \sa SDL_LogMessageV + * \sa SDL_LogVerbose + * \sa SDL_LogWarn */ extern DECLSPEC void SDLCALL SDL_LogMessage(int category, SDL_LogPriority priority, SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(3); /** - * \brief Log a message with the specified category and priority. + * Log a message with the specified category and priority. + * + * \param category the category of the message + * \param priority the priority of the message + * \param fmt a printf() style message format string + * \param ap a variable argument list + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Log + * \sa SDL_LogCritical + * \sa SDL_LogDebug + * \sa SDL_LogError + * \sa SDL_LogInfo + * \sa SDL_LogMessage + * \sa SDL_LogVerbose + * \sa SDL_LogWarn */ extern DECLSPEC void SDLCALL SDL_LogMessageV(int category, SDL_LogPriority priority, const char *fmt, va_list ap); /** - * \brief The prototype for the log output function + * The prototype for the log output callback function. + * + * This function is called by SDL when there is new text to be logged. + * + * \param userdata what was passed as `userdata` to SDL_LogSetOutputFunction() + * \param category the category of the message + * \param priority the priority of the message + * \param message the message being output */ typedef void (SDLCALL *SDL_LogOutputFunction)(void *userdata, int category, SDL_LogPriority priority, const char *message); /** - * \brief Get the current log output function. + * Get the current log output function. + * + * \param callback an SDL_LogOutputFunction filled in with the current log + * callback + * \param userdata a pointer filled in with the pointer that is passed to + * `callback` + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LogSetOutputFunction */ extern DECLSPEC void SDLCALL SDL_LogGetOutputFunction(SDL_LogOutputFunction *callback, void **userdata); /** - * \brief This function allows you to replace the default log output - * function with one of your own. + * Replace the default log output function with one of your own. + * + * \param callback an SDL_LogOutputFunction to call instead of the default + * \param userdata a pointer that is passed to `callback` + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LogGetOutputFunction */ extern DECLSPEC void SDLCALL SDL_LogSetOutputFunction(SDL_LogOutputFunction callback, void *userdata); diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_main.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_main.h index 623f2d005..b3fec15fe 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_main.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_main.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -83,6 +83,15 @@ */ #define SDL_MAIN_NEEDED +#elif defined(__PSP__) +/* On PSP SDL provides a main function that sets the module info, + activates the GPU and starts the thread required to be able to exit + the software. + + If you provide this yourself, you may define SDL_MAIN_HANDLED + */ +#define SDL_MAIN_AVAILABLE + #endif #endif /* SDL_MAIN_HANDLED */ @@ -122,20 +131,62 @@ extern SDLMAIN_DECLSPEC int SDL_main(int argc, char *argv[]); /** - * This is called by the real SDL main function to let the rest of the - * library know that initialization was done properly. + * Circumvent failure of SDL_Init() when not using SDL_main() as an entry + * point. * - * Calling this yourself without knowing what you're doing can cause - * crashes and hard to diagnose problems with your application. + * This function is defined in SDL_main.h, along with the preprocessor rule to + * redefine main() as SDL_main(). Thus to ensure that your main() function + * will not be changed it is necessary to define SDL_MAIN_HANDLED before + * including SDL.h. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_Init */ extern DECLSPEC void SDLCALL SDL_SetMainReady(void); #ifdef __WIN32__ /** - * This can be called to set the application class at startup + * Register a win32 window class for SDL's use. + * + * This can be called to set the application window class at startup. It is + * safe to call this multiple times, as long as every call is eventually + * paired with a call to SDL_UnregisterApp, but a second registration attempt + * while a previous registration is still active will be ignored, other than + * to increment a counter. + * + * Most applications do not need to, and should not, call this directly; SDL + * will call it when initializing the video subsystem. + * + * \param name the window class name, in UTF-8 encoding. If NULL, SDL + * currently uses "SDL_app" but this isn't guaranteed. + * \param style the value to use in WNDCLASSEX::style. If `name` is NULL, SDL + * currently uses `(CS_BYTEALIGNCLIENT | CS_OWNDC)` regardless of + * what is specified here. + * \param hInst the HINSTANCE to use in WNDCLASSEX::hInstance. If zero, SDL + * will use `GetModuleHandle(NULL)` instead. + * \returns 0 on success, -1 on error. SDL_GetError() may have details. + * + * \since This function is available since SDL 2.0.2. + */ +extern DECLSPEC int SDLCALL SDL_RegisterApp(const char *name, Uint32 style, void *hInst); + +/** + * Deregister the win32 window class from an SDL_RegisterApp call. + * + * This can be called to undo the effects of SDL_RegisterApp. + * + * Most applications do not need to, and should not, call this directly; SDL + * will call it when deinitializing the video subsystem. + * + * It is safe to call this multiple times, as long as every call is eventually + * paired with a prior call to SDL_RegisterApp. The window class will only be + * deregistered when the registration counter in SDL_RegisterApp decrements to + * zero through calls to this function. + * + * \since This function is available since SDL 2.0.2. */ -extern DECLSPEC int SDLCALL SDL_RegisterApp(char *name, Uint32 style, void *hInst); extern DECLSPEC void SDLCALL SDL_UnregisterApp(void); #endif /* __WIN32__ */ @@ -144,12 +195,14 @@ extern DECLSPEC void SDLCALL SDL_UnregisterApp(void); #ifdef __WINRT__ /** - * \brief Initializes and launches an SDL/WinRT application. + * Initialize and launch an SDL/WinRT application. * - * \param mainFunction The SDL app's C-style main(). - * \param reserved Reserved for future use; should be NULL - * \return 0 on success, -1 on failure. On failure, use SDL_GetError to retrieve more - * information on the failure. + * \param mainFunction the SDL app's C-style main(), an SDL_main_func + * \param reserved reserved for future use; should be NULL + * \returns 0 on success or -1 on failure; call SDL_GetError() to retrieve + * more information on the failure. + * + * \since This function is available since SDL 2.0.3. */ extern DECLSPEC int SDLCALL SDL_WinRTRunApp(SDL_main_func mainFunction, void * reserved); @@ -158,12 +211,14 @@ extern DECLSPEC int SDLCALL SDL_WinRTRunApp(SDL_main_func mainFunction, void * r #if defined(__IPHONEOS__) /** - * \brief Initializes and launches an SDL application. + * Initializes and launches an SDL application. * - * \param argc The argc parameter from the application's main() function - * \param argv The argv parameter from the application's main() function - * \param mainFunction The SDL app's C-style main(). - * \return the return value from mainFunction + * \param argc The argc parameter from the application's main() function + * \param argv The argv parameter from the application's main() function + * \param mainFunction The SDL app's C-style main(), an SDL_main_func + * \return the return value from mainFunction + * + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC int SDLCALL SDL_UIKitRunApp(int argc, char *argv[], SDL_main_func mainFunction); diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_messagebox.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_messagebox.h index e34b55477..d763534d2 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_messagebox.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_messagebox.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -32,17 +32,19 @@ extern "C" { #endif /** - * \brief SDL_MessageBox flags. If supported will display warning icon, etc. + * SDL_MessageBox flags. If supported will display warning icon, etc. */ typedef enum { - SDL_MESSAGEBOX_ERROR = 0x00000010, /**< error dialog */ - SDL_MESSAGEBOX_WARNING = 0x00000020, /**< warning dialog */ - SDL_MESSAGEBOX_INFORMATION = 0x00000040 /**< informational dialog */ + SDL_MESSAGEBOX_ERROR = 0x00000010, /**< error dialog */ + SDL_MESSAGEBOX_WARNING = 0x00000020, /**< warning dialog */ + SDL_MESSAGEBOX_INFORMATION = 0x00000040, /**< informational dialog */ + SDL_MESSAGEBOX_BUTTONS_LEFT_TO_RIGHT = 0x00000080, /**< buttons placed left to right */ + SDL_MESSAGEBOX_BUTTONS_RIGHT_TO_LEFT = 0x00000100 /**< buttons placed right to left */ } SDL_MessageBoxFlags; /** - * \brief Flags for SDL_MessageBoxButtonData. + * Flags for SDL_MessageBoxButtonData. */ typedef enum { @@ -51,7 +53,7 @@ typedef enum } SDL_MessageBoxButtonFlags; /** - * \brief Individual button data. + * Individual button data. */ typedef struct { @@ -61,7 +63,7 @@ typedef struct } SDL_MessageBoxButtonData; /** - * \brief RGB value used in a message box color scheme + * RGB value used in a message box color scheme */ typedef struct { @@ -79,7 +81,7 @@ typedef enum } SDL_MessageBoxColorType; /** - * \brief A set of colors to use for message box dialogs + * A set of colors to use for message box dialogs */ typedef struct { @@ -87,7 +89,7 @@ typedef struct } SDL_MessageBoxColorScheme; /** - * \brief MessageBox structure containing title, text, window, etc. + * MessageBox structure containing title, text, window, etc. */ typedef struct { @@ -103,32 +105,79 @@ typedef struct } SDL_MessageBoxData; /** - * \brief Create a modal message box. + * Create a modal message box. * - * \param messageboxdata The SDL_MessageBoxData structure with title, text, etc. - * \param buttonid The pointer to which user id of hit button should be copied. + * If your needs aren't complex, it might be easier to use + * SDL_ShowSimpleMessageBox. * - * \return -1 on error, otherwise 0 and buttonid contains user id of button - * hit or -1 if dialog was closed. + * This function should be called on the thread that created the parent + * window, or on the main thread if the messagebox has no parent. It will + * block execution of that thread until the user clicks a button or closes the + * messagebox. * - * \note This function should be called on the thread that created the parent - * window, or on the main thread if the messagebox has no parent. It will - * block execution of that thread until the user clicks a button or - * closes the messagebox. + * This function may be called at any time, even before SDL_Init(). This makes + * it useful for reporting errors like a failure to create a renderer or + * OpenGL context. + * + * On X11, SDL rolls its own dialog box with X11 primitives instead of a + * formal toolkit like GTK+ or Qt. + * + * Note that if SDL_Init() would fail because there isn't any available video + * target, this function is likely to fail for the same reasons. If this is a + * concern, check the return value from this function and fall back to writing + * to stderr if you can. + * + * \param messageboxdata the SDL_MessageBoxData structure with title, text and + * other options + * \param buttonid the pointer to which user id of hit button should be copied + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ShowSimpleMessageBox */ extern DECLSPEC int SDLCALL SDL_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid); /** - * \brief Create a simple modal message box + * Display a simple modal message box. * - * \param flags ::SDL_MessageBoxFlags - * \param title UTF-8 title text - * \param message UTF-8 message text - * \param window The parent window, or NULL for no parent + * If your needs aren't complex, this function is preferred over + * SDL_ShowMessageBox. * - * \return 0 on success, -1 on error + * `flags` may be any of the following: * - * \sa SDL_ShowMessageBox + * - `SDL_MESSAGEBOX_ERROR`: error dialog + * - `SDL_MESSAGEBOX_WARNING`: warning dialog + * - `SDL_MESSAGEBOX_INFORMATION`: informational dialog + * + * This function should be called on the thread that created the parent + * window, or on the main thread if the messagebox has no parent. It will + * block execution of that thread until the user clicks a button or closes the + * messagebox. + * + * This function may be called at any time, even before SDL_Init(). This makes + * it useful for reporting errors like a failure to create a renderer or + * OpenGL context. + * + * On X11, SDL rolls its own dialog box with X11 primitives instead of a + * formal toolkit like GTK+ or Qt. + * + * Note that if SDL_Init() would fail because there isn't any available video + * target, this function is likely to fail for the same reasons. If this is a + * concern, check the return value from this function and fall back to writing + * to stderr if you can. + * + * \param flags an SDL_MessageBoxFlags value + * \param title UTF-8 title text + * \param message UTF-8 message text + * \param window the parent window, or NULL for no parent + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ShowMessageBox */ extern DECLSPEC int SDLCALL SDL_ShowSimpleMessageBox(Uint32 flags, const char *title, const char *message, SDL_Window *window); diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_metal.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_metal.h new file mode 100644 index 000000000..9ecaa8151 --- /dev/null +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_metal.h @@ -0,0 +1,112 @@ +/* + Simple DirectMedia Layer + Copyright (C) 1997-2022 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ + +/** + * \file SDL_metal.h + * + * Header file for functions to creating Metal layers and views on SDL windows. + */ + +#ifndef SDL_metal_h_ +#define SDL_metal_h_ + +#include "SDL_video.h" + +#include "begin_code.h" +/* Set up for C function definitions, even when using C++ */ +#ifdef __cplusplus +extern "C" { +#endif + +/** + * \brief A handle to a CAMetalLayer-backed NSView (macOS) or UIView (iOS/tvOS). + * + * \note This can be cast directly to an NSView or UIView. + */ +typedef void *SDL_MetalView; + +/** + * \name Metal support functions + */ +/* @{ */ + +/** + * Create a CAMetalLayer-backed NSView/UIView and attach it to the specified + * window. + * + * On macOS, this does *not* associate a MTLDevice with the CAMetalLayer on + * its own. It is up to user code to do that. + * + * The returned handle can be casted directly to a NSView or UIView. To access + * the backing CAMetalLayer, call SDL_Metal_GetLayer(). + * + * \since This function is available since SDL 2.0.12. + * + * \sa SDL_Metal_DestroyView + * \sa SDL_Metal_GetLayer + */ +extern DECLSPEC SDL_MetalView SDLCALL SDL_Metal_CreateView(SDL_Window * window); + +/** + * Destroy an existing SDL_MetalView object. + * + * This should be called before SDL_DestroyWindow, if SDL_Metal_CreateView was + * called after SDL_CreateWindow. + * + * \since This function is available since SDL 2.0.12. + * + * \sa SDL_Metal_CreateView + */ +extern DECLSPEC void SDLCALL SDL_Metal_DestroyView(SDL_MetalView view); + +/** + * Get a pointer to the backing CAMetalLayer for the given view. + * + * \since This function is available since SDL 2.0.14. + * + * \sa SDL_MetalCreateView + */ +extern DECLSPEC void *SDLCALL SDL_Metal_GetLayer(SDL_MetalView view); + +/** + * Get the size of a window's underlying drawable in pixels (for use with + * setting viewport, scissor & etc). + * + * \param window SDL_Window from which the drawable size should be queried + * \param w Pointer to variable for storing the width in pixels, may be NULL + * + * \since This function is available since SDL 2.0.14. + * + * \sa SDL_GetWindowSize + * \sa SDL_CreateWindow + */ +extern DECLSPEC void SDLCALL SDL_Metal_GetDrawableSize(SDL_Window* window, int *w, + int *h); + +/* @} *//* Metal support functions */ + +/* Ends C function definitions when using C++ */ +#ifdef __cplusplus +} +#endif +#include "close_code.h" + +#endif /* SDL_metal_h_ */ diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_misc.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_misc.h new file mode 100644 index 000000000..261b6b871 --- /dev/null +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_misc.h @@ -0,0 +1,79 @@ +/* + Simple DirectMedia Layer + Copyright (C) 1997-2022 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ + +/** + * \file SDL_misc.h + * + * \brief Include file for SDL API functions that don't fit elsewhere. + */ + +#ifndef SDL_misc_h_ +#define SDL_misc_h_ + +#include "SDL_stdinc.h" + +#include "begin_code.h" + +/* Set up for C function definitions, even when using C++ */ +#ifdef __cplusplus +extern "C" { +#endif + +/** + * Open a URL/URI in the browser or other appropriate external application. + * + * Open a URL in a separate, system-provided application. How this works will + * vary wildly depending on the platform. This will likely launch what makes + * sense to handle a specific URL's protocol (a web browser for `http://`, + * etc), but it might also be able to launch file managers for directories and + * other things. + * + * What happens when you open a URL varies wildly as well: your game window + * may lose focus (and may or may not lose focus if your game was fullscreen + * or grabbing input at the time). On mobile devices, your app will likely + * move to the background or your process might be paused. Any given platform + * may or may not handle a given URL. + * + * If this is unimplemented (or simply unavailable) for a platform, this will + * fail with an error. A successful result does not mean the URL loaded, just + * that we launched _something_ to handle it (or at least believe we did). + * + * All this to say: this function can be useful, but you should definitely + * test it on every platform you target. + * + * \param url A valid URL/URI to open. Use `file:///full/path/to/file` for + * local files, if supported. + * \returns 0 on success, or -1 on error; call SDL_GetError() for more + * information. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC int SDLCALL SDL_OpenURL(const char *url); + +/* Ends C function definitions when using C++ */ +#ifdef __cplusplus +} +#endif +#include "close_code.h" + +#endif /* SDL_misc_h_ */ + +/* vi: set ts=4 sw=4 expandtab: */ diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_mouse.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_mouse.h index 277559d23..1d4a2db0d 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_mouse.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_mouse.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -72,150 +72,240 @@ typedef enum /* Function prototypes */ /** - * \brief Get the window which currently has mouse focus. + * Get the window which currently has mouse focus. + * + * \returns the window with mouse focus. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC SDL_Window * SDLCALL SDL_GetMouseFocus(void); /** - * \brief Retrieve the current state of the mouse. + * Retrieve the current state of the mouse. * - * The current button state is returned as a button bitmask, which can - * be tested using the SDL_BUTTON(X) macros, and x and y are set to the - * mouse cursor position relative to the focus window for the currently - * selected mouse. You can pass NULL for either x or y. + * The current button state is returned as a button bitmask, which can be + * tested using the `SDL_BUTTON(X)` macros (where `X` is generally 1 for the + * left, 2 for middle, 3 for the right button), and `x` and `y` are set to the + * mouse cursor position relative to the focus window. You can pass NULL for + * either `x` or `y`. + * + * \param x the x coordinate of the mouse cursor position relative to the + * focus window + * \param y the y coordinate of the mouse cursor position relative to the + * focus window + * \returns a 32-bit button bitmask of the current button state. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetGlobalMouseState + * \sa SDL_GetRelativeMouseState + * \sa SDL_PumpEvents */ extern DECLSPEC Uint32 SDLCALL SDL_GetMouseState(int *x, int *y); /** - * \brief Get the current state of the mouse, in relation to the desktop + * Get the current state of the mouse in relation to the desktop. * - * This works just like SDL_GetMouseState(), but the coordinates will be - * reported relative to the top-left of the desktop. This can be useful if - * you need to track the mouse outside of a specific window and - * SDL_CaptureMouse() doesn't fit your needs. For example, it could be - * useful if you need to track the mouse while dragging a window, where - * coordinates relative to a window might not be in sync at all times. + * This works similarly to SDL_GetMouseState(), but the coordinates will be + * reported relative to the top-left of the desktop. This can be useful if you + * need to track the mouse outside of a specific window and SDL_CaptureMouse() + * doesn't fit your needs. For example, it could be useful if you need to + * track the mouse while dragging a window, where coordinates relative to a + * window might not be in sync at all times. * - * \note SDL_GetMouseState() returns the mouse position as SDL understands - * it from the last pump of the event queue. This function, however, - * queries the OS for the current mouse position, and as such, might - * be a slightly less efficient function. Unless you know what you're - * doing and have a good reason to use this function, you probably want - * SDL_GetMouseState() instead. + * Note: SDL_GetMouseState() returns the mouse position as SDL understands it + * from the last pump of the event queue. This function, however, queries the + * OS for the current mouse position, and as such, might be a slightly less + * efficient function. Unless you know what you're doing and have a good + * reason to use this function, you probably want SDL_GetMouseState() instead. * - * \param x Returns the current X coord, relative to the desktop. Can be NULL. - * \param y Returns the current Y coord, relative to the desktop. Can be NULL. - * \return The current button state as a bitmask, which can be tested using the SDL_BUTTON(X) macros. + * \param x filled in with the current X coord relative to the desktop; can be + * NULL + * \param y filled in with the current Y coord relative to the desktop; can be + * NULL + * \returns the current button state as a bitmask which can be tested using + * the SDL_BUTTON(X) macros. * - * \sa SDL_GetMouseState + * \since This function is available since SDL 2.0.4. + * + * \sa SDL_CaptureMouse */ extern DECLSPEC Uint32 SDLCALL SDL_GetGlobalMouseState(int *x, int *y); /** - * \brief Retrieve the relative state of the mouse. + * Retrieve the relative state of the mouse. * - * The current button state is returned as a button bitmask, which can - * be tested using the SDL_BUTTON(X) macros, and x and y are set to the - * mouse deltas since the last call to SDL_GetRelativeMouseState(). + * The current button state is returned as a button bitmask, which can be + * tested using the `SDL_BUTTON(X)` macros (where `X` is generally 1 for the + * left, 2 for middle, 3 for the right button), and `x` and `y` are set to the + * mouse deltas since the last call to SDL_GetRelativeMouseState() or since + * event initialization. You can pass NULL for either `x` or `y`. + * + * \param x a pointer filled with the last recorded x coordinate of the mouse + * \param y a pointer filled with the last recorded y coordinate of the mouse + * \returns a 32-bit button bitmask of the relative button state. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetMouseState */ extern DECLSPEC Uint32 SDLCALL SDL_GetRelativeMouseState(int *x, int *y); /** - * \brief Moves the mouse to the given position within the window. + * Move the mouse cursor to the given position within the window. * - * \param window The window to move the mouse into, or NULL for the current mouse focus - * \param x The x coordinate within the window - * \param y The y coordinate within the window + * This function generates a mouse motion event. * - * \note This function generates a mouse motion event + * Note that this function will appear to succeed, but not actually move the + * mouse when used over Microsoft Remote Desktop. + * + * \param window the window to move the mouse into, or NULL for the current + * mouse focus + * \param x the x coordinate within the window + * \param y the y coordinate within the window + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_WarpMouseGlobal */ extern DECLSPEC void SDLCALL SDL_WarpMouseInWindow(SDL_Window * window, int x, int y); /** - * \brief Moves the mouse to the given position in global screen space. + * Move the mouse to the given position in global screen space. * - * \param x The x coordinate - * \param y The y coordinate - * \return 0 on success, -1 on error (usually: unsupported by a platform). + * This function generates a mouse motion event. * - * \note This function generates a mouse motion event + * A failure of this function usually means that it is unsupported by a + * platform. + * + * Note that this function will appear to succeed, but not actually move the + * mouse when used over Microsoft Remote Desktop. + * + * \param x the x coordinate + * \param y the y coordinate + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.4. + * + * \sa SDL_WarpMouseInWindow */ extern DECLSPEC int SDLCALL SDL_WarpMouseGlobal(int x, int y); /** - * \brief Set relative mouse mode. + * Set relative mouse mode. * - * \param enabled Whether or not to enable relative mode + * While the mouse is in relative mode, the cursor is hidden, and the driver + * will try to report continuous motion in the current window. Only relative + * motion events will be delivered, the mouse position will not change. * - * \return 0 on success, or -1 if relative mode is not supported. + * Note that this function will not be able to provide continuous relative + * motion when used over Microsoft Remote Desktop, instead motion is limited + * to the bounds of the screen. * - * While the mouse is in relative mode, the cursor is hidden, and the - * driver will try to report continuous motion in the current window. - * Only relative motion events will be delivered, the mouse position - * will not change. + * This function will flush any pending mouse motion. * - * \note This function will flush any pending mouse motion. + * \param enabled SDL_TRUE to enable relative mode, SDL_FALSE to disable. + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_GetRelativeMouseMode() + * If relative mode is not supported, this returns -1. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetRelativeMouseMode */ extern DECLSPEC int SDLCALL SDL_SetRelativeMouseMode(SDL_bool enabled); /** - * \brief Capture the mouse, to track input outside an SDL window. + * Capture the mouse and to track input outside an SDL window. * - * \param enabled Whether or not to enable capturing + * Capturing enables your app to obtain mouse events globally, instead of just + * within your window. Not all video targets support this function. When + * capturing is enabled, the current window will get all mouse events, but + * unlike relative mode, no change is made to the cursor and it is not + * restrained to your window. * - * Capturing enables your app to obtain mouse events globally, instead of - * just within your window. Not all video targets support this function. - * When capturing is enabled, the current window will get all mouse events, - * but unlike relative mode, no change is made to the cursor and it is - * not restrained to your window. + * This function may also deny mouse input to other windows--both those in + * your application and others on the system--so you should use this function + * sparingly, and in small bursts. For example, you might want to track the + * mouse while the user is dragging something, until the user releases a mouse + * button. It is not recommended that you capture the mouse for long periods + * of time, such as the entire time your app is running. For that, you should + * probably use SDL_SetRelativeMouseMode() or SDL_SetWindowGrab(), depending + * on your goals. * - * This function may also deny mouse input to other windows--both those in - * your application and others on the system--so you should use this - * function sparingly, and in small bursts. For example, you might want to - * track the mouse while the user is dragging something, until the user - * releases a mouse button. It is not recommended that you capture the mouse - * for long periods of time, such as the entire time your app is running. + * While captured, mouse events still report coordinates relative to the + * current (foreground) window, but those coordinates may be outside the + * bounds of the window (including negative values). Capturing is only allowed + * for the foreground window. If the window loses focus while capturing, the + * capture will be disabled automatically. * - * While captured, mouse events still report coordinates relative to the - * current (foreground) window, but those coordinates may be outside the - * bounds of the window (including negative values). Capturing is only - * allowed for the foreground window. If the window loses focus while - * capturing, the capture will be disabled automatically. + * While capturing is enabled, the current window will have the + * `SDL_WINDOW_MOUSE_CAPTURE` flag set. * - * While capturing is enabled, the current window will have the - * SDL_WINDOW_MOUSE_CAPTURE flag set. + * \param enabled SDL_TRUE to enable capturing, SDL_FALSE to disable. + * \returns 0 on success or -1 if not supported; call SDL_GetError() for more + * information. * - * \return 0 on success, or -1 if not supported. + * \since This function is available since SDL 2.0.4. + * + * \sa SDL_GetGlobalMouseState */ extern DECLSPEC int SDLCALL SDL_CaptureMouse(SDL_bool enabled); /** - * \brief Query whether relative mouse mode is enabled. + * Query whether relative mouse mode is enabled. * - * \sa SDL_SetRelativeMouseMode() + * \returns SDL_TRUE if relative mode is enabled or SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetRelativeMouseMode */ extern DECLSPEC SDL_bool SDLCALL SDL_GetRelativeMouseMode(void); /** - * \brief Create a cursor, using the specified bitmap data and - * mask (in MSB format). + * Create a cursor using the specified bitmap data and mask (in MSB format). * - * The cursor width must be a multiple of 8 bits. + * `mask` has to be in MSB (Most Significant Bit) format. * - * The cursor is created in black and white according to the following: - * - * - * - * - * - * - *
data mask resulting pixel on screen
0 1 White
1 1 Black
0 0 Transparent
1 0 Inverted color if possible, black - * if not.
+ * The cursor width (`w`) must be a multiple of 8 bits. * - * \sa SDL_FreeCursor() + * The cursor is created in black and white according to the following: + * + * - data=0, mask=1: white + * - data=1, mask=1: black + * - data=0, mask=0: transparent + * - data=1, mask=0: inverted color if possible, black if not. + * + * Cursors created with this function must be freed with SDL_FreeCursor(). + * + * If you want to have a color cursor, or create your cursor from an + * SDL_Surface, you should use SDL_CreateColorCursor(). Alternately, you can + * hide the cursor and draw your own as part of your game's rendering, but it + * will be bound to the framerate. + * + * Also, since SDL 2.0.0, SDL_CreateSystemCursor() is available, which + * provides twelve readily available system cursors to pick from. + * + * \param data the color value for each pixel of the cursor + * \param mask the mask value for each pixel of the cursor + * \param w the width of the cursor + * \param h the height of the cursor + * \param hot_x the X-axis location of the upper left corner of the cursor + * relative to the actual mouse position + * \param hot_y the Y-axis location of the upper left corner of the cursor + * relative to the actual mouse position + * \returns a new cursor with the specified parameters on success or NULL on + * failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_FreeCursor + * \sa SDL_SetCursor + * \sa SDL_ShowCursor */ extern DECLSPEC SDL_Cursor *SDLCALL SDL_CreateCursor(const Uint8 * data, const Uint8 * mask, @@ -223,60 +313,123 @@ extern DECLSPEC SDL_Cursor *SDLCALL SDL_CreateCursor(const Uint8 * data, int hot_y); /** - * \brief Create a color cursor. + * Create a color cursor. * - * \sa SDL_FreeCursor() + * \param surface an SDL_Surface structure representing the cursor image + * \param hot_x the x position of the cursor hot spot + * \param hot_y the y position of the cursor hot spot + * \returns the new cursor on success or NULL on failure; call SDL_GetError() + * for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateCursor + * \sa SDL_FreeCursor */ extern DECLSPEC SDL_Cursor *SDLCALL SDL_CreateColorCursor(SDL_Surface *surface, int hot_x, int hot_y); /** - * \brief Create a system cursor. + * Create a system cursor. * - * \sa SDL_FreeCursor() + * \param id an SDL_SystemCursor enum value + * \returns a cursor on success or NULL on failure; call SDL_GetError() for + * more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_FreeCursor */ extern DECLSPEC SDL_Cursor *SDLCALL SDL_CreateSystemCursor(SDL_SystemCursor id); /** - * \brief Set the active cursor. + * Set the active cursor. + * + * This function sets the currently active cursor to the specified one. If the + * cursor is currently visible, the change will be immediately represented on + * the display. SDL_SetCursor(NULL) can be used to force cursor redraw, if + * this is desired for any reason. + * + * \param cursor a cursor to make active + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateCursor + * \sa SDL_GetCursor + * \sa SDL_ShowCursor */ extern DECLSPEC void SDLCALL SDL_SetCursor(SDL_Cursor * cursor); /** - * \brief Return the active cursor. + * Get the active cursor. + * + * This function returns a pointer to the current cursor which is owned by the + * library. It is not necessary to free the cursor with SDL_FreeCursor(). + * + * \returns the active cursor or NULL if there is no mouse. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetCursor */ extern DECLSPEC SDL_Cursor *SDLCALL SDL_GetCursor(void); /** - * \brief Return the default cursor. + * Get the default cursor. + * + * \returns the default cursor on success or NULL on failure. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateSystemCursor */ extern DECLSPEC SDL_Cursor *SDLCALL SDL_GetDefaultCursor(void); /** - * \brief Frees a cursor created with SDL_CreateCursor() or similar functions. + * Free a previously-created cursor. * - * \sa SDL_CreateCursor() - * \sa SDL_CreateColorCursor() - * \sa SDL_CreateSystemCursor() + * Use this function to free cursor resources created with SDL_CreateCursor(), + * SDL_CreateColorCursor() or SDL_CreateSystemCursor(). + * + * \param cursor the cursor to free + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateColorCursor + * \sa SDL_CreateCursor + * \sa SDL_CreateSystemCursor */ extern DECLSPEC void SDLCALL SDL_FreeCursor(SDL_Cursor * cursor); /** - * \brief Toggle whether or not the cursor is shown. + * Toggle whether or not the cursor is shown. * - * \param toggle 1 to show the cursor, 0 to hide it, -1 to query the current - * state. + * The cursor starts off displayed but can be turned off. Passing `SDL_ENABLE` + * displays the cursor and passing `SDL_DISABLE` hides it. * - * \return 1 if the cursor is shown, or 0 if the cursor is hidden. + * The current state of the mouse cursor can be queried by passing + * `SDL_QUERY`; either `SDL_DISABLE` or `SDL_ENABLE` will be returned. + * + * \param toggle `SDL_ENABLE` to show the cursor, `SDL_DISABLE` to hide it, + * `SDL_QUERY` to query the current state without changing it. + * \returns `SDL_ENABLE` if the cursor is shown, or `SDL_DISABLE` if the + * cursor is hidden, or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateCursor + * \sa SDL_SetCursor */ extern DECLSPEC int SDLCALL SDL_ShowCursor(int toggle); /** - * Used as a mask when testing buttons in buttonstate. - * - Button 1: Left mouse button - * - Button 2: Middle mouse button - * - Button 3: Right mouse button + * Used as a mask when testing buttons in buttonstate. + * + * - Button 1: Left mouse button + * - Button 2: Middle mouse button + * - Button 3: Right mouse button */ #define SDL_BUTTON(X) (1 << ((X)-1)) #define SDL_BUTTON_LEFT 1 @@ -290,7 +443,6 @@ extern DECLSPEC int SDLCALL SDL_ShowCursor(int toggle); #define SDL_BUTTON_X1MASK SDL_BUTTON(SDL_BUTTON_X1) #define SDL_BUTTON_X2MASK SDL_BUTTON(SDL_BUTTON_X2) - /* Ends C function definitions when using C++ */ #ifdef __cplusplus } diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_mutex.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_mutex.h index 970e78713..173468f6a 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_mutex.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_mutex.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -59,38 +59,105 @@ struct SDL_mutex; typedef struct SDL_mutex SDL_mutex; /** - * Create a mutex, initialized unlocked. + * Create a new mutex. + * + * All newly-created mutexes begin in the _unlocked_ state. + * + * Calls to SDL_LockMutex() will not return while the mutex is locked by + * another thread. See SDL_TryLockMutex() to attempt to lock without blocking. + * + * SDL mutexes are reentrant. + * + * \returns the initialized and unlocked mutex or NULL on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_DestroyMutex + * \sa SDL_LockMutex + * \sa SDL_TryLockMutex + * \sa SDL_UnlockMutex */ extern DECLSPEC SDL_mutex *SDLCALL SDL_CreateMutex(void); /** - * Lock the mutex. + * Lock the mutex. * - * \return 0, or -1 on error. + * This will block until the mutex is available, which is to say it is in the + * unlocked state and the OS has chosen the caller as the next thread to lock + * it. Of all threads waiting to lock the mutex, only one may do so at a time. + * + * It is legal for the owning thread to lock an already-locked mutex. It must + * unlock it the same number of times before it is actually made available for + * other threads in the system (this is known as a "recursive mutex"). + * + * \param mutex the mutex to lock + * \return 0, or -1 on error. + * + * \since This function is available since SDL 2.0.0. */ -#define SDL_mutexP(m) SDL_LockMutex(m) extern DECLSPEC int SDLCALL SDL_LockMutex(SDL_mutex * mutex); +#define SDL_mutexP(m) SDL_LockMutex(m) /** - * Try to lock the mutex + * Try to lock a mutex without blocking. * - * \return 0, SDL_MUTEX_TIMEDOUT, or -1 on error + * This works just like SDL_LockMutex(), but if the mutex is not available, + * this function returns `SDL_MUTEX_TIMEOUT` immediately. + * + * This technique is useful if you need exclusive access to a resource but + * don't want to wait for it, and will return to it to try again later. + * + * \param mutex the mutex to try to lock + * \returns 0, `SDL_MUTEX_TIMEDOUT`, or -1 on error; call SDL_GetError() for + * more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateMutex + * \sa SDL_DestroyMutex + * \sa SDL_LockMutex + * \sa SDL_UnlockMutex */ extern DECLSPEC int SDLCALL SDL_TryLockMutex(SDL_mutex * mutex); /** - * Unlock the mutex. + * Unlock the mutex. * - * \return 0, or -1 on error. + * It is legal for the owning thread to lock an already-locked mutex. It must + * unlock it the same number of times before it is actually made available for + * other threads in the system (this is known as a "recursive mutex"). * - * \warning It is an error to unlock a mutex that has not been locked by - * the current thread, and doing so results in undefined behavior. + * It is an error to unlock a mutex that has not been locked by the current + * thread, and doing so results in undefined behavior. + * + * It is also an error to unlock a mutex that isn't locked at all. + * + * \param mutex the mutex to unlock. + * \returns 0, or -1 on error. + * + * \since This function is available since SDL 2.0.0. */ -#define SDL_mutexV(m) SDL_UnlockMutex(m) extern DECLSPEC int SDLCALL SDL_UnlockMutex(SDL_mutex * mutex); +#define SDL_mutexV(m) SDL_UnlockMutex(m) /** - * Destroy a mutex. + * Destroy a mutex created with SDL_CreateMutex(). + * + * This function must be called on any mutex that is no longer needed. Failure + * to destroy a mutex will result in a system memory or resource leak. While + * it is safe to destroy a mutex that is _unlocked_, it is not safe to attempt + * to destroy a locked mutex, and may result in undefined behavior depending + * on the platform. + * + * \param mutex the mutex to destroy + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateMutex + * \sa SDL_LockMutex + * \sa SDL_TryLockMutex + * \sa SDL_UnlockMutex */ extern DECLSPEC void SDLCALL SDL_DestroyMutex(SDL_mutex * mutex); @@ -107,50 +174,151 @@ struct SDL_semaphore; typedef struct SDL_semaphore SDL_sem; /** - * Create a semaphore, initialized with value, returns NULL on failure. + * Create a semaphore. + * + * This function creates a new semaphore and initializes it with the value + * `initial_value`. Each wait operation on the semaphore will atomically + * decrement the semaphore value and potentially block if the semaphore value + * is 0. Each post operation will atomically increment the semaphore value and + * wake waiting threads and allow them to retry the wait operation. + * + * \param initial_value the starting value of the semaphore + * \returns a new semaphore or NULL on failure; call SDL_GetError() for more + * information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_DestroySemaphore + * \sa SDL_SemPost + * \sa SDL_SemTryWait + * \sa SDL_SemValue + * \sa SDL_SemWait + * \sa SDL_SemWaitTimeout */ extern DECLSPEC SDL_sem *SDLCALL SDL_CreateSemaphore(Uint32 initial_value); /** - * Destroy a semaphore. + * Destroy a semaphore. + * + * It is not safe to destroy a semaphore if there are threads currently + * waiting on it. + * + * \param sem the semaphore to destroy + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateSemaphore + * \sa SDL_SemPost + * \sa SDL_SemTryWait + * \sa SDL_SemValue + * \sa SDL_SemWait + * \sa SDL_SemWaitTimeout */ extern DECLSPEC void SDLCALL SDL_DestroySemaphore(SDL_sem * sem); /** - * This function suspends the calling thread until the semaphore pointed - * to by \c sem has a positive count. It then atomically decreases the - * semaphore count. + * Wait until a semaphore has a positive value and then decrements it. + * + * This function suspends the calling thread until either the semaphore + * pointed to by `sem` has a positive value or the call is interrupted by a + * signal or error. If the call is successful it will atomically decrement the + * semaphore value. + * + * This function is the equivalent of calling SDL_SemWaitTimeout() with a time + * length of `SDL_MUTEX_MAXWAIT`. + * + * \param sem the semaphore wait on + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateSemaphore + * \sa SDL_DestroySemaphore + * \sa SDL_SemPost + * \sa SDL_SemTryWait + * \sa SDL_SemValue + * \sa SDL_SemWait + * \sa SDL_SemWaitTimeout */ extern DECLSPEC int SDLCALL SDL_SemWait(SDL_sem * sem); /** - * Non-blocking variant of SDL_SemWait(). + * See if a semaphore has a positive value and decrement it if it does. * - * \return 0 if the wait succeeds, ::SDL_MUTEX_TIMEDOUT if the wait would - * block, and -1 on error. + * This function checks to see if the semaphore pointed to by `sem` has a + * positive value and atomically decrements the semaphore value if it does. If + * the semaphore doesn't have a positive value, the function immediately + * returns SDL_MUTEX_TIMEDOUT. + * + * \param sem the semaphore to wait on + * \returns 0 if the wait succeeds, `SDL_MUTEX_TIMEDOUT` if the wait would + * block, or a negative error code on failure; call SDL_GetError() + * for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateSemaphore + * \sa SDL_DestroySemaphore + * \sa SDL_SemPost + * \sa SDL_SemValue + * \sa SDL_SemWait + * \sa SDL_SemWaitTimeout */ extern DECLSPEC int SDLCALL SDL_SemTryWait(SDL_sem * sem); /** - * Variant of SDL_SemWait() with a timeout in milliseconds. + * Wait until a semaphore has a positive value and then decrements it. * - * \return 0 if the wait succeeds, ::SDL_MUTEX_TIMEDOUT if the wait does not - * succeed in the allotted time, and -1 on error. + * This function suspends the calling thread until either the semaphore + * pointed to by `sem` has a positive value, the call is interrupted by a + * signal or error, or the specified time has elapsed. If the call is + * successful it will atomically decrement the semaphore value. * - * \warning On some platforms this function is implemented by looping with a - * delay of 1 ms, and so should be avoided if possible. + * \param sem the semaphore to wait on + * \param ms the length of the timeout, in milliseconds + * \returns 0 if the wait succeeds, `SDL_MUTEX_TIMEDOUT` if the wait does not + * succeed in the allotted time, or a negative error code on failure; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateSemaphore + * \sa SDL_DestroySemaphore + * \sa SDL_SemPost + * \sa SDL_SemTryWait + * \sa SDL_SemValue + * \sa SDL_SemWait */ extern DECLSPEC int SDLCALL SDL_SemWaitTimeout(SDL_sem * sem, Uint32 ms); /** - * Atomically increases the semaphore's count (not blocking). + * Atomically increment a semaphore's value and wake waiting threads. * - * \return 0, or -1 on error. + * \param sem the semaphore to increment + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateSemaphore + * \sa SDL_DestroySemaphore + * \sa SDL_SemTryWait + * \sa SDL_SemValue + * \sa SDL_SemWait + * \sa SDL_SemWaitTimeout */ extern DECLSPEC int SDLCALL SDL_SemPost(SDL_sem * sem); /** - * Returns the current count of the semaphore. + * Get the current value of a semaphore. + * + * \param sem the semaphore to query + * \returns the current value of the semaphore. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateSemaphore */ extern DECLSPEC Uint32 SDLCALL SDL_SemValue(SDL_sem * sem); @@ -167,72 +335,124 @@ struct SDL_cond; typedef struct SDL_cond SDL_cond; /** - * Create a condition variable. + * Create a condition variable. * - * Typical use of condition variables: + * \returns a new condition variable or NULL on failure; call SDL_GetError() + * for more information. * - * Thread A: - * SDL_LockMutex(lock); - * while ( ! condition ) { - * SDL_CondWait(cond, lock); - * } - * SDL_UnlockMutex(lock); + * \since This function is available since SDL 2.0.0. * - * Thread B: - * SDL_LockMutex(lock); - * ... - * condition = true; - * ... - * SDL_CondSignal(cond); - * SDL_UnlockMutex(lock); - * - * There is some discussion whether to signal the condition variable - * with the mutex locked or not. There is some potential performance - * benefit to unlocking first on some platforms, but there are some - * potential race conditions depending on how your code is structured. - * - * In general it's safer to signal the condition variable while the - * mutex is locked. + * \sa SDL_CondBroadcast + * \sa SDL_CondSignal + * \sa SDL_CondWait + * \sa SDL_CondWaitTimeout + * \sa SDL_DestroyCond */ extern DECLSPEC SDL_cond *SDLCALL SDL_CreateCond(void); /** - * Destroy a condition variable. + * Destroy a condition variable. + * + * \param cond the condition variable to destroy + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CondBroadcast + * \sa SDL_CondSignal + * \sa SDL_CondWait + * \sa SDL_CondWaitTimeout + * \sa SDL_CreateCond */ extern DECLSPEC void SDLCALL SDL_DestroyCond(SDL_cond * cond); /** - * Restart one of the threads that are waiting on the condition variable. + * Restart one of the threads that are waiting on the condition variable. * - * \return 0 or -1 on error. + * \param cond the condition variable to signal + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CondBroadcast + * \sa SDL_CondWait + * \sa SDL_CondWaitTimeout + * \sa SDL_CreateCond + * \sa SDL_DestroyCond */ extern DECLSPEC int SDLCALL SDL_CondSignal(SDL_cond * cond); /** - * Restart all threads that are waiting on the condition variable. + * Restart all threads that are waiting on the condition variable. * - * \return 0 or -1 on error. + * \param cond the condition variable to signal + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CondSignal + * \sa SDL_CondWait + * \sa SDL_CondWaitTimeout + * \sa SDL_CreateCond + * \sa SDL_DestroyCond */ extern DECLSPEC int SDLCALL SDL_CondBroadcast(SDL_cond * cond); /** - * Wait on the condition variable, unlocking the provided mutex. + * Wait until a condition variable is signaled. * - * \warning The mutex must be locked before entering this function! + * This function unlocks the specified `mutex` and waits for another thread to + * call SDL_CondSignal() or SDL_CondBroadcast() on the condition variable + * `cond`. Once the condition variable is signaled, the mutex is re-locked and + * the function returns. * - * The mutex is re-locked once the condition variable is signaled. + * The mutex must be locked before calling this function. * - * \return 0 when it is signaled, or -1 on error. + * This function is the equivalent of calling SDL_CondWaitTimeout() with a + * time length of `SDL_MUTEX_MAXWAIT`. + * + * \param cond the condition variable to wait on + * \param mutex the mutex used to coordinate thread access + * \returns 0 when it is signaled or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CondBroadcast + * \sa SDL_CondSignal + * \sa SDL_CondWaitTimeout + * \sa SDL_CreateCond + * \sa SDL_DestroyCond */ extern DECLSPEC int SDLCALL SDL_CondWait(SDL_cond * cond, SDL_mutex * mutex); /** - * Waits for at most \c ms milliseconds, and returns 0 if the condition - * variable is signaled, ::SDL_MUTEX_TIMEDOUT if the condition is not - * signaled in the allotted time, and -1 on error. + * Wait until a condition variable is signaled or a certain time has passed. * - * \warning On some platforms this function is implemented by looping with a - * delay of 1 ms, and so should be avoided if possible. + * This function unlocks the specified `mutex` and waits for another thread to + * call SDL_CondSignal() or SDL_CondBroadcast() on the condition variable + * `cond`, or for the specified time to elapse. Once the condition variable is + * signaled or the time elapsed, the mutex is re-locked and the function + * returns. + * + * The mutex must be locked before calling this function. + * + * \param cond the condition variable to wait on + * \param mutex the mutex used to coordinate thread access + * \param ms the maximum time to wait, in milliseconds, or `SDL_MUTEX_MAXWAIT` + * to wait indefinitely + * \returns 0 if the condition variable is signaled, `SDL_MUTEX_TIMEDOUT` if + * the condition is not signaled in the allotted time, or a negative + * error code on failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CondBroadcast + * \sa SDL_CondSignal + * \sa SDL_CondWait + * \sa SDL_CreateCond + * \sa SDL_DestroyCond */ extern DECLSPEC int SDLCALL SDL_CondWaitTimeout(SDL_cond * cond, SDL_mutex * mutex, Uint32 ms); diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_name.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_name.h index 690a8199b..6ff35b46e 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_name.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_name.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_opengl.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_opengl.h index 6685be73e..9aed5035a 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_opengl.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_opengl.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_opengl_glext.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_opengl_glext.h index cd3869fe7..6a402b15a 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_opengl_glext.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_opengl_glext.h @@ -40,6 +40,9 @@ extern "C" { #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN 1 #endif +#ifndef NOMINMAX /* don't define min() and max(). */ +#define NOMINMAX +#endif #include #endif diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_opengles.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_opengles.h index 1e0660c3d..8511b9607 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_opengles.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_opengles.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_opengles2.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_opengles2.h index df29d3840..172fcb3f4 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_opengles2.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_opengles2.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -26,7 +26,7 @@ */ #include "SDL_config.h" -#ifndef _MSC_VER +#if !defined(_MSC_VER) && !defined(SDL_USE_BUILTIN_OPENGL_DEFINITIONS) #ifdef __IPHONEOS__ #include diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_pixels.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_pixels.h index dcb7a980d..5d2c0c898 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_pixels.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_pixels.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -48,7 +48,7 @@ extern "C" { /* @} */ /** Pixel type. */ -enum +typedef enum { SDL_PIXELTYPE_UNKNOWN, SDL_PIXELTYPE_INDEX1, @@ -62,18 +62,18 @@ enum SDL_PIXELTYPE_ARRAYU32, SDL_PIXELTYPE_ARRAYF16, SDL_PIXELTYPE_ARRAYF32 -}; +} SDL_PixelType; /** Bitmap pixel order, high bit -> low bit. */ -enum +typedef enum { SDL_BITMAPORDER_NONE, SDL_BITMAPORDER_4321, SDL_BITMAPORDER_1234 -}; +} SDL_BitmapOrder; /** Packed component order, high bit -> low bit. */ -enum +typedef enum { SDL_PACKEDORDER_NONE, SDL_PACKEDORDER_XRGB, @@ -84,12 +84,12 @@ enum SDL_PACKEDORDER_BGRX, SDL_PACKEDORDER_ABGR, SDL_PACKEDORDER_BGRA -}; +} SDL_PackedOrder; /** Array component order, low byte -> high byte. */ /* !!! FIXME: in 2.1, make these not overlap differently with !!! FIXME: SDL_PACKEDORDER_*, so we can simplify SDL_ISPIXELFORMAT_ALPHA */ -enum +typedef enum { SDL_ARRAYORDER_NONE, SDL_ARRAYORDER_RGB, @@ -98,10 +98,10 @@ enum SDL_ARRAYORDER_BGR, SDL_ARRAYORDER_BGRA, SDL_ARRAYORDER_ABGR -}; +} SDL_ArrayOrder; /** Packed component layout. */ -enum +typedef enum { SDL_PACKEDLAYOUT_NONE, SDL_PACKEDLAYOUT_332, @@ -112,7 +112,7 @@ enum SDL_PACKEDLAYOUT_8888, SDL_PACKEDLAYOUT_2101010, SDL_PACKEDLAYOUT_1010102 -}; +} SDL_PackedLayout; #define SDL_DEFINE_PIXELFOURCC(A, B, C, D) SDL_FOURCC(A, B, C, D) @@ -188,15 +188,22 @@ typedef enum SDL_PIXELFORMAT_RGB332 = SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED8, SDL_PACKEDORDER_XRGB, SDL_PACKEDLAYOUT_332, 8, 1), - SDL_PIXELFORMAT_RGB444 = + SDL_PIXELFORMAT_XRGB4444 = SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XRGB, SDL_PACKEDLAYOUT_4444, 12, 2), - SDL_PIXELFORMAT_RGB555 = + SDL_PIXELFORMAT_RGB444 = SDL_PIXELFORMAT_XRGB4444, + SDL_PIXELFORMAT_XBGR4444 = + SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XBGR, + SDL_PACKEDLAYOUT_4444, 12, 2), + SDL_PIXELFORMAT_BGR444 = SDL_PIXELFORMAT_XBGR4444, + SDL_PIXELFORMAT_XRGB1555 = SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XRGB, SDL_PACKEDLAYOUT_1555, 15, 2), - SDL_PIXELFORMAT_BGR555 = + SDL_PIXELFORMAT_RGB555 = SDL_PIXELFORMAT_XRGB1555, + SDL_PIXELFORMAT_XBGR1555 = SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XBGR, SDL_PACKEDLAYOUT_1555, 15, 2), + SDL_PIXELFORMAT_BGR555 = SDL_PIXELFORMAT_XBGR1555, SDL_PIXELFORMAT_ARGB4444 = SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_ARGB, SDL_PACKEDLAYOUT_4444, 16, 2), @@ -233,15 +240,17 @@ typedef enum SDL_PIXELFORMAT_BGR24 = SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_ARRAYU8, SDL_ARRAYORDER_BGR, 0, 24, 3), - SDL_PIXELFORMAT_RGB888 = + SDL_PIXELFORMAT_XRGB8888 = SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_XRGB, SDL_PACKEDLAYOUT_8888, 24, 4), + SDL_PIXELFORMAT_RGB888 = SDL_PIXELFORMAT_XRGB8888, SDL_PIXELFORMAT_RGBX8888 = SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_RGBX, SDL_PACKEDLAYOUT_8888, 24, 4), - SDL_PIXELFORMAT_BGR888 = + SDL_PIXELFORMAT_XBGR8888 = SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_XBGR, SDL_PACKEDLAYOUT_8888, 24, 4), + SDL_PIXELFORMAT_BGR888 = SDL_PIXELFORMAT_XBGR8888, SDL_PIXELFORMAT_BGRX8888 = SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_BGRX, SDL_PACKEDLAYOUT_8888, 24, 4), @@ -292,6 +301,11 @@ typedef enum SDL_DEFINE_PIXELFOURCC('O', 'E', 'S', ' ') } SDL_PixelFormatEnum; +/** + * The bits of this structure can be directly reinterpreted as an integer-packed + * color which uses the SDL_PIXELFORMAT_RGBA32 format (SDL_PIXELFORMAT_ABGR8888 + * on little-endian systems and SDL_PIXELFORMAT_RGBA8888 on big-endian systems). + */ typedef struct SDL_Color { Uint8 r; @@ -336,16 +350,31 @@ typedef struct SDL_PixelFormat } SDL_PixelFormat; /** - * \brief Get the human readable name of a pixel format + * Get the human readable name of a pixel format. + * + * \param format the pixel format to query + * \returns the human readable name of the specified pixel format or + * `SDL_PIXELFORMAT_UNKNOWN` if the format isn't recognized. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC const char* SDLCALL SDL_GetPixelFormatName(Uint32 format); /** - * \brief Convert one of the enumerated pixel formats to a bpp and RGBA masks. + * Convert one of the enumerated pixel formats to a bpp value and RGBA masks. * - * \return SDL_TRUE, or SDL_FALSE if the conversion wasn't possible. + * \param format one of the SDL_PixelFormatEnum values + * \param bpp a bits per pixel value; usually 15, 16, or 32 + * \param Rmask a pointer filled in with the red mask for the format + * \param Gmask a pointer filled in with the green mask for the format + * \param Bmask a pointer filled in with the blue mask for the format + * \param Amask a pointer filled in with the alpha mask for the format + * \returns SDL_TRUE on success or SDL_FALSE if the conversion wasn't + * possible; call SDL_GetError() for more information. * - * \sa SDL_MasksToPixelFormatEnum() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_MasksToPixelFormatEnum */ extern DECLSPEC SDL_bool SDLCALL SDL_PixelFormatEnumToMasks(Uint32 format, int *bpp, @@ -355,12 +384,21 @@ extern DECLSPEC SDL_bool SDLCALL SDL_PixelFormatEnumToMasks(Uint32 format, Uint32 * Amask); /** - * \brief Convert a bpp and RGBA masks to an enumerated pixel format. + * Convert a bpp value and RGBA masks to an enumerated pixel format. * - * \return The pixel format, or ::SDL_PIXELFORMAT_UNKNOWN if the conversion - * wasn't possible. + * This will return `SDL_PIXELFORMAT_UNKNOWN` if the conversion wasn't + * possible. * - * \sa SDL_PixelFormatEnumToMasks() + * \param bpp a bits per pixel value; usually 15, 16, or 32 + * \param Rmask the red mask for the format + * \param Gmask the green mask for the format + * \param Bmask the blue mask for the format + * \param Amask the alpha mask for the format + * \returns one of the SDL_PixelFormatEnum values + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_PixelFormatEnumToMasks */ extern DECLSPEC Uint32 SDLCALL SDL_MasksToPixelFormatEnum(int bpp, Uint32 Rmask, @@ -369,84 +407,213 @@ extern DECLSPEC Uint32 SDLCALL SDL_MasksToPixelFormatEnum(int bpp, Uint32 Amask); /** - * \brief Create an SDL_PixelFormat structure from a pixel format enum. + * Create an SDL_PixelFormat structure corresponding to a pixel format. + * + * Returned structure may come from a shared global cache (i.e. not newly + * allocated), and hence should not be modified, especially the palette. Weird + * errors such as `Blit combination not supported` may occur. + * + * \param pixel_format one of the SDL_PixelFormatEnum values + * \returns the new SDL_PixelFormat structure or NULL on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_FreeFormat */ extern DECLSPEC SDL_PixelFormat * SDLCALL SDL_AllocFormat(Uint32 pixel_format); /** - * \brief Free an SDL_PixelFormat structure. + * Free an SDL_PixelFormat structure allocated by SDL_AllocFormat(). + * + * \param format the SDL_PixelFormat structure to free + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AllocFormat */ extern DECLSPEC void SDLCALL SDL_FreeFormat(SDL_PixelFormat *format); /** - * \brief Create a palette structure with the specified number of color - * entries. + * Create a palette structure with the specified number of color entries. * - * \return A new palette, or NULL if there wasn't enough memory. + * The palette entries are initialized to white. * - * \note The palette entries are initialized to white. + * \param ncolors represents the number of color entries in the color palette + * \returns a new SDL_Palette structure on success or NULL on failure (e.g. if + * there wasn't enough memory); call SDL_GetError() for more + * information. * - * \sa SDL_FreePalette() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_FreePalette */ extern DECLSPEC SDL_Palette *SDLCALL SDL_AllocPalette(int ncolors); /** - * \brief Set the palette for a pixel format structure. + * Set the palette for a pixel format structure. + * + * \param format the SDL_PixelFormat structure that will use the palette + * \param palette the SDL_Palette structure that will be used + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AllocPalette + * \sa SDL_FreePalette */ extern DECLSPEC int SDLCALL SDL_SetPixelFormatPalette(SDL_PixelFormat * format, SDL_Palette *palette); /** - * \brief Set a range of colors in a palette. + * Set a range of colors in a palette. * - * \param palette The palette to modify. - * \param colors An array of colors to copy into the palette. - * \param firstcolor The index of the first palette entry to modify. - * \param ncolors The number of entries to modify. + * \param palette the SDL_Palette structure to modify + * \param colors an array of SDL_Color structures to copy into the palette + * \param firstcolor the index of the first palette entry to modify + * \param ncolors the number of entries to modify + * \returns 0 on success or a negative error code if not all of the colors + * could be set; call SDL_GetError() for more information. * - * \return 0 on success, or -1 if not all of the colors could be set. + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AllocPalette + * \sa SDL_CreateRGBSurface */ extern DECLSPEC int SDLCALL SDL_SetPaletteColors(SDL_Palette * palette, const SDL_Color * colors, int firstcolor, int ncolors); /** - * \brief Free a palette created with SDL_AllocPalette(). + * Free a palette created with SDL_AllocPalette(). * - * \sa SDL_AllocPalette() + * \param palette the SDL_Palette structure to be freed + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AllocPalette */ extern DECLSPEC void SDLCALL SDL_FreePalette(SDL_Palette * palette); /** - * \brief Maps an RGB triple to an opaque pixel value for a given pixel format. + * Map an RGB triple to an opaque pixel value for a given pixel format. * - * \sa SDL_MapRGBA + * This function maps the RGB color value to the specified pixel format and + * returns the pixel value best approximating the given RGB color value for + * the given pixel format. + * + * If the format has a palette (8-bit) the index of the closest matching color + * in the palette will be returned. + * + * If the specified pixel format has an alpha component it will be returned as + * all 1 bits (fully opaque). + * + * If the pixel format bpp (color depth) is less than 32-bpp then the unused + * upper bits of the return value can safely be ignored (e.g., with a 16-bpp + * format the return value can be assigned to a Uint16, and similarly a Uint8 + * for an 8-bpp format). + * + * \param format an SDL_PixelFormat structure describing the pixel format + * \param r the red component of the pixel in the range 0-255 + * \param g the green component of the pixel in the range 0-255 + * \param b the blue component of the pixel in the range 0-255 + * \returns a pixel value + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetRGB + * \sa SDL_GetRGBA + * \sa SDL_MapRGBA */ extern DECLSPEC Uint32 SDLCALL SDL_MapRGB(const SDL_PixelFormat * format, Uint8 r, Uint8 g, Uint8 b); /** - * \brief Maps an RGBA quadruple to a pixel value for a given pixel format. + * Map an RGBA quadruple to a pixel value for a given pixel format. * - * \sa SDL_MapRGB + * This function maps the RGBA color value to the specified pixel format and + * returns the pixel value best approximating the given RGBA color value for + * the given pixel format. + * + * If the specified pixel format has no alpha component the alpha value will + * be ignored (as it will be in formats with a palette). + * + * If the format has a palette (8-bit) the index of the closest matching color + * in the palette will be returned. + * + * If the pixel format bpp (color depth) is less than 32-bpp then the unused + * upper bits of the return value can safely be ignored (e.g., with a 16-bpp + * format the return value can be assigned to a Uint16, and similarly a Uint8 + * for an 8-bpp format). + * + * \param format an SDL_PixelFormat structure describing the format of the + * pixel + * \param r the red component of the pixel in the range 0-255 + * \param g the green component of the pixel in the range 0-255 + * \param b the blue component of the pixel in the range 0-255 + * \param a the alpha component of the pixel in the range 0-255 + * \returns a pixel value + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetRGB + * \sa SDL_GetRGBA + * \sa SDL_MapRGB */ extern DECLSPEC Uint32 SDLCALL SDL_MapRGBA(const SDL_PixelFormat * format, Uint8 r, Uint8 g, Uint8 b, Uint8 a); /** - * \brief Get the RGB components from a pixel of the specified format. + * Get RGB values from a pixel in the specified format. * - * \sa SDL_GetRGBA + * This function uses the entire 8-bit [0..255] range when converting color + * components from pixel formats with less than 8-bits per RGB component + * (e.g., a completely white pixel in 16-bit RGB565 format would return [0xff, + * 0xff, 0xff] not [0xf8, 0xfc, 0xf8]). + * + * \param pixel a pixel value + * \param format an SDL_PixelFormat structure describing the format of the + * pixel + * \param r a pointer filled in with the red component + * \param g a pointer filled in with the green component + * \param b a pointer filled in with the blue component + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetRGBA + * \sa SDL_MapRGB + * \sa SDL_MapRGBA */ extern DECLSPEC void SDLCALL SDL_GetRGB(Uint32 pixel, const SDL_PixelFormat * format, Uint8 * r, Uint8 * g, Uint8 * b); /** - * \brief Get the RGBA components from a pixel of the specified format. + * Get RGBA values from a pixel in the specified format. * - * \sa SDL_GetRGB + * This function uses the entire 8-bit [0..255] range when converting color + * components from pixel formats with less than 8-bits per RGB component + * (e.g., a completely white pixel in 16-bit RGB565 format would return [0xff, + * 0xff, 0xff] not [0xf8, 0xfc, 0xf8]). + * + * If the surface has no alpha component, the alpha will be returned as 0xff + * (100% opaque). + * + * \param pixel a pixel value + * \param format an SDL_PixelFormat structure describing the format of the + * pixel + * \param r a pointer filled in with the red component + * \param g a pointer filled in with the green component + * \param b a pointer filled in with the blue component + * \param a a pointer filled in with the alpha component + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetRGB + * \sa SDL_MapRGB + * \sa SDL_MapRGBA */ extern DECLSPEC void SDLCALL SDL_GetRGBA(Uint32 pixel, const SDL_PixelFormat * format, @@ -454,7 +621,14 @@ extern DECLSPEC void SDLCALL SDL_GetRGBA(Uint32 pixel, Uint8 * a); /** - * \brief Calculate a 256 entry gamma ramp for a gamma value. + * Calculate a 256 entry gamma ramp for a gamma value. + * + * \param gamma a gamma value where 0.0 is black and 1.0 is identity + * \param ramp an array of 256 values filled in with the gamma ramp + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetWindowGammaRamp */ extern DECLSPEC void SDLCALL SDL_CalculateGammaRamp(float gamma, Uint16 * ramp); diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_platform.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_platform.h index c2cbc6b4e..79b8b6f45 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_platform.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_platform.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -70,6 +70,27 @@ /* lets us know what version of Mac OS X we're compiling on */ #include "AvailabilityMacros.h" #include "TargetConditionals.h" + +/* Fix building with older SDKs that don't define these + See this for more information: + https://stackoverflow.com/questions/12132933/preprocessor-macro-for-os-x-targets +*/ +#ifndef TARGET_OS_MACCATALYST +#define TARGET_OS_MACCATALYST 0 +#endif +#ifndef TARGET_OS_IOS +#define TARGET_OS_IOS 0 +#endif +#ifndef TARGET_OS_IPHONE +#define TARGET_OS_IPHONE 0 +#endif +#ifndef TARGET_OS_TV +#define TARGET_OS_TV 0 +#endif +#ifndef TARGET_OS_SIMULATOR +#define TARGET_OS_SIMULATOR 0 +#endif + #if TARGET_OS_TV #undef __TVOS__ #define __TVOS__ 1 @@ -175,6 +196,9 @@ #define __SDL_NOGETPROCADDR__ #endif +#if defined(__vita__) +#define __VITA__ 1 +#endif #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ @@ -183,7 +207,20 @@ extern "C" { #endif /** - * \brief Gets the name of the platform. + * Get the name of the platform. + * + * Here are the names returned for some (but not all) supported platforms: + * + * - "Windows" + * - "Mac OS X" + * - "Linux" + * - "iOS" + * - "Android" + * + * \returns the name of the platform. If the correct platform name is not + * available, returns a string beginning with the text "Unknown". + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC const char * SDLCALL SDL_GetPlatform (void); diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_power.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_power.h index 4831cb77e..ecb3f4b02 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_power.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_power.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -37,7 +37,7 @@ extern "C" { #endif /** - * \brief The basic state for the system's power supply. + * The basic state for the system's power supply. */ typedef enum { @@ -50,17 +50,30 @@ typedef enum /** - * \brief Get the current power supply details. + * Get the current power supply details. * - * \param secs Seconds of battery life left. You can pass a NULL here if - * you don't care. Will return -1 if we can't determine a - * value, or we're not running on a battery. + * You should never take a battery status as absolute truth. Batteries + * (especially failing batteries) are delicate hardware, and the values + * reported here are best estimates based on what that hardware reports. It's + * not uncommon for older batteries to lose stored power much faster than it + * reports, or completely drain when reporting it has 20 percent left, etc. * - * \param pct Percentage of battery life left, between 0 and 100. You can - * pass a NULL here if you don't care. Will return -1 if we - * can't determine a value, or we're not running on a battery. + * Battery status can change at any time; if you are concerned with power + * state, you should call this function frequently, and perhaps ignore changes + * until they seem to be stable for a few seconds. * - * \return The state of the battery (if any). + * It's possible a platform can only report battery percentage or time left + * but not both. + * + * \param secs seconds of battery life left, you can pass a NULL here if you + * don't care, will return -1 if we can't determine a value, or + * we're not running on a battery + * \param pct percentage of battery life left, between 0 and 100, you can pass + * a NULL here if you don't care, will return -1 if we can't + * determine a value, or we're not running on a battery + * \returns an SDL_PowerState enum representing the current battery state. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC SDL_PowerState SDLCALL SDL_GetPowerInfo(int *secs, int *pct); diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_quit.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_quit.h index c979983cb..4090f7f19 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_quit.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_quit.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_rect.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_rect.h index 71a411517..6616ba6a2 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_rect.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_rect.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -40,10 +40,10 @@ extern "C" { #endif /** - * \brief The structure that defines a point (integer) + * The structure that defines a point (integer) * - * \sa SDL_EnclosePoints - * \sa SDL_PointInRect + * \sa SDL_EnclosePoints + * \sa SDL_PointInRect */ typedef struct SDL_Point { @@ -52,10 +52,10 @@ typedef struct SDL_Point } SDL_Point; /** - * \brief The structure that defines a point (floating point) + * The structure that defines a point (floating point) * - * \sa SDL_EnclosePoints - * \sa SDL_PointInRect + * \sa SDL_EnclosePoints + * \sa SDL_PointInRect */ typedef struct SDL_FPoint { @@ -65,14 +65,14 @@ typedef struct SDL_FPoint /** - * \brief A rectangle, with the origin at the upper left (integer). + * A rectangle, with the origin at the upper left (integer). * - * \sa SDL_RectEmpty - * \sa SDL_RectEquals - * \sa SDL_HasIntersection - * \sa SDL_IntersectRect - * \sa SDL_UnionRect - * \sa SDL_EnclosePoints + * \sa SDL_RectEmpty + * \sa SDL_RectEquals + * \sa SDL_HasIntersection + * \sa SDL_IntersectRect + * \sa SDL_UnionRect + * \sa SDL_EnclosePoints */ typedef struct SDL_Rect { @@ -82,7 +82,7 @@ typedef struct SDL_Rect /** - * \brief A rectangle, with the origin at the upper left (floating point). + * A rectangle, with the origin at the upper left (floating point). */ typedef struct SDL_FRect { @@ -94,7 +94,7 @@ typedef struct SDL_FRect /** - * \brief Returns true if point resides inside a rectangle. + * Returns true if point resides inside a rectangle. */ SDL_FORCE_INLINE SDL_bool SDL_PointInRect(const SDL_Point *p, const SDL_Rect *r) { @@ -103,7 +103,7 @@ SDL_FORCE_INLINE SDL_bool SDL_PointInRect(const SDL_Point *p, const SDL_Rect *r) } /** - * \brief Returns true if the rectangle has no area. + * Returns true if the rectangle has no area. */ SDL_FORCE_INLINE SDL_bool SDL_RectEmpty(const SDL_Rect *r) { @@ -111,7 +111,7 @@ SDL_FORCE_INLINE SDL_bool SDL_RectEmpty(const SDL_Rect *r) } /** - * \brief Returns true if the two rectangles are equal. + * Returns true if the two rectangles are equal. */ SDL_FORCE_INLINE SDL_bool SDL_RectEquals(const SDL_Rect *a, const SDL_Rect *b) { @@ -120,33 +120,70 @@ SDL_FORCE_INLINE SDL_bool SDL_RectEquals(const SDL_Rect *a, const SDL_Rect *b) } /** - * \brief Determine whether two rectangles intersect. + * Determine whether two rectangles intersect. * - * \return SDL_TRUE if there is an intersection, SDL_FALSE otherwise. + * If either pointer is NULL the function will return SDL_FALSE. + * + * \param A an SDL_Rect structure representing the first rectangle + * \param B an SDL_Rect structure representing the second rectangle + * \returns SDL_TRUE if there is an intersection, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_IntersectRect */ extern DECLSPEC SDL_bool SDLCALL SDL_HasIntersection(const SDL_Rect * A, const SDL_Rect * B); /** - * \brief Calculate the intersection of two rectangles. + * Calculate the intersection of two rectangles. * - * \return SDL_TRUE if there is an intersection, SDL_FALSE otherwise. + * If `result` is NULL then this function will return SDL_FALSE. + * + * \param A an SDL_Rect structure representing the first rectangle + * \param B an SDL_Rect structure representing the second rectangle + * \param result an SDL_Rect structure filled in with the intersection of + * rectangles `A` and `B` + * \returns SDL_TRUE if there is an intersection, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HasIntersection */ extern DECLSPEC SDL_bool SDLCALL SDL_IntersectRect(const SDL_Rect * A, const SDL_Rect * B, SDL_Rect * result); /** - * \brief Calculate the union of two rectangles. + * Calculate the union of two rectangles. + * + * \param A an SDL_Rect structure representing the first rectangle + * \param B an SDL_Rect structure representing the second rectangle + * \param result an SDL_Rect structure filled in with the union of rectangles + * `A` and `B` + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC void SDLCALL SDL_UnionRect(const SDL_Rect * A, const SDL_Rect * B, SDL_Rect * result); /** - * \brief Calculate a minimal rectangle enclosing a set of points + * Calculate a minimal rectangle enclosing a set of points. * - * \return SDL_TRUE if any points were within the clipping rect + * If `clip` is not NULL then only points inside of the clipping rectangle are + * considered. + * + * \param points an array of SDL_Point structures representing points to be + * enclosed + * \param count the number of structures in the `points` array + * \param clip an SDL_Rect used for clipping or NULL to enclose all points + * \param result an SDL_Rect structure filled in with the minimal enclosing + * rectangle + * \returns SDL_TRUE if any points were enclosed or SDL_FALSE if all the + * points were outside of the clipping rectangle. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC SDL_bool SDLCALL SDL_EnclosePoints(const SDL_Point * points, int count, @@ -154,9 +191,22 @@ extern DECLSPEC SDL_bool SDLCALL SDL_EnclosePoints(const SDL_Point * points, SDL_Rect * result); /** - * \brief Calculate the intersection of a rectangle and line segment. + * Calculate the intersection of a rectangle and line segment. * - * \return SDL_TRUE if there is an intersection, SDL_FALSE otherwise. + * This function is used to clip a line segment to a rectangle. A line segment + * contained entirely within the rectangle or that does not intersect will + * remain unchanged. A line segment that crosses the rectangle at either or + * both ends will be clipped to the boundary of the rectangle and the new + * coordinates saved in `X1`, `Y1`, `X2`, and/or `Y2` as necessary. + * + * \param rect an SDL_Rect structure representing the rectangle to intersect + * \param X1 a pointer to the starting X-coordinate of the line + * \param Y1 a pointer to the starting Y-coordinate of the line + * \param X2 a pointer to the ending X-coordinate of the line + * \param Y2 a pointer to the ending Y-coordinate of the line + * \returns SDL_TRUE if there is an intersection, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC SDL_bool SDLCALL SDL_IntersectRectAndLine(const SDL_Rect * rect, int *X1, diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_render.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_render.h index 096b4a577..a7e4908a6 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_render.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_render.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -59,7 +59,7 @@ extern "C" { #endif /** - * \brief Flags used when creating a rendering context + * Flags used when creating a rendering context */ typedef enum { @@ -73,7 +73,7 @@ typedef enum } SDL_RendererFlags; /** - * \brief Information on the capabilities of a render driver or context. + * Information on the capabilities of a render driver or context. */ typedef struct SDL_RendererInfo { @@ -86,7 +86,27 @@ typedef struct SDL_RendererInfo } SDL_RendererInfo; /** - * \brief The access pattern allowed for a texture. + * Vertex structure + */ +typedef struct SDL_Vertex +{ + SDL_FPoint position; /**< Vertex position, in SDL_Renderer coordinates */ + SDL_Color color; /**< Vertex color */ + SDL_FPoint tex_coord; /**< Normalized texture coordinates, if needed */ +} SDL_Vertex; + +/** + * The scaling mode for a texture. + */ +typedef enum +{ + SDL_ScaleModeNearest, /**< nearest pixel sampling */ + SDL_ScaleModeLinear, /**< linear filtering */ + SDL_ScaleModeBest /**< anisotropic filtering */ +} SDL_ScaleMode; + +/** + * The access pattern allowed for a texture. */ typedef enum { @@ -96,7 +116,7 @@ typedef enum } SDL_TextureAccess; /** - * \brief The texture channel modulation used in SDL_RenderCopy(). + * The texture channel modulation used in SDL_RenderCopy(). */ typedef enum { @@ -106,7 +126,7 @@ typedef enum } SDL_TextureModulate; /** - * \brief Flip constants for SDL_RenderCopyEx + * Flip constants for SDL_RenderCopyEx */ typedef enum { @@ -116,58 +136,71 @@ typedef enum } SDL_RendererFlip; /** - * \brief A structure representing rendering state + * A structure representing rendering state */ struct SDL_Renderer; typedef struct SDL_Renderer SDL_Renderer; /** - * \brief An efficient driver-specific representation of pixel data + * An efficient driver-specific representation of pixel data */ struct SDL_Texture; typedef struct SDL_Texture SDL_Texture; - /* Function prototypes */ /** - * \brief Get the number of 2D rendering drivers available for the current - * display. + * Get the number of 2D rendering drivers available for the current display. * - * A render driver is a set of code that handles rendering and texture - * management on a particular display. Normally there is only one, but - * some drivers may have several available with different capabilities. + * A render driver is a set of code that handles rendering and texture + * management on a particular display. Normally there is only one, but some + * drivers may have several available with different capabilities. * - * \sa SDL_GetRenderDriverInfo() - * \sa SDL_CreateRenderer() + * There may be none if SDL was compiled without render support. + * + * \returns a number >= 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateRenderer + * \sa SDL_GetRenderDriverInfo */ extern DECLSPEC int SDLCALL SDL_GetNumRenderDrivers(void); /** - * \brief Get information about a specific 2D rendering driver for the current - * display. + * Get info about a specific 2D rendering driver for the current display. * - * \param index The index of the driver to query information about. - * \param info A pointer to an SDL_RendererInfo struct to be filled with - * information on the rendering driver. + * \param index the index of the driver to query information about + * \param info an SDL_RendererInfo structure to be filled with information on + * the rendering driver + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, -1 if the index was out of range. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_CreateRenderer() + * \sa SDL_CreateRenderer + * \sa SDL_GetNumRenderDrivers */ extern DECLSPEC int SDLCALL SDL_GetRenderDriverInfo(int index, SDL_RendererInfo * info); /** - * \brief Create a window and default renderer + * Create a window and default renderer. * - * \param width The width of the window - * \param height The height of the window - * \param window_flags The flags used to create the window - * \param window A pointer filled with the window, or NULL on error - * \param renderer A pointer filled with the renderer, or NULL on error + * \param width the width of the window + * \param height the height of the window + * \param window_flags the flags used to create the window (see + * SDL_CreateWindow()) + * \param window a pointer filled with the window, or NULL on error + * \param renderer a pointer filled with the renderer, or NULL on error + * \returns 0 on success, or -1 on error; call SDL_GetError() for more + * information. * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateRenderer + * \sa SDL_CreateWindow */ extern DECLSPEC int SDLCALL SDL_CreateWindowAndRenderer( int width, int height, Uint32 window_flags, @@ -175,69 +208,116 @@ extern DECLSPEC int SDLCALL SDL_CreateWindowAndRenderer( /** - * \brief Create a 2D rendering context for a window. + * Create a 2D rendering context for a window. * - * \param window The window where rendering is displayed. - * \param index The index of the rendering driver to initialize, or -1 to - * initialize the first one supporting the requested flags. - * \param flags ::SDL_RendererFlags. + * \param window the window where rendering is displayed + * \param index the index of the rendering driver to initialize, or -1 to + * initialize the first one supporting the requested flags + * \param flags 0, or one or more SDL_RendererFlags OR'd together + * \returns a valid rendering context or NULL if there was an error; call + * SDL_GetError() for more information. * - * \return A valid rendering context or NULL if there was an error. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_CreateSoftwareRenderer() - * \sa SDL_GetRendererInfo() - * \sa SDL_DestroyRenderer() + * \sa SDL_CreateSoftwareRenderer + * \sa SDL_DestroyRenderer + * \sa SDL_GetNumRenderDrivers + * \sa SDL_GetRendererInfo */ extern DECLSPEC SDL_Renderer * SDLCALL SDL_CreateRenderer(SDL_Window * window, int index, Uint32 flags); /** - * \brief Create a 2D software rendering context for a surface. + * Create a 2D software rendering context for a surface. * - * \param surface The surface where rendering is done. + * Two other API which can be used to create SDL_Renderer: + * SDL_CreateRenderer() and SDL_CreateWindowAndRenderer(). These can _also_ + * create a software renderer, but they are intended to be used with an + * SDL_Window as the final destination and not an SDL_Surface. * - * \return A valid rendering context or NULL if there was an error. + * \param surface the SDL_Surface structure representing the surface where + * rendering is done + * \returns a valid rendering context or NULL if there was an error; call + * SDL_GetError() for more information. * - * \sa SDL_CreateRenderer() - * \sa SDL_DestroyRenderer() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateRenderer + * \sa SDL_CreateWindowRenderer + * \sa SDL_DestroyRenderer */ extern DECLSPEC SDL_Renderer * SDLCALL SDL_CreateSoftwareRenderer(SDL_Surface * surface); /** - * \brief Get the renderer associated with a window. + * Get the renderer associated with a window. + * + * \param window the window to query + * \returns the rendering context on success or NULL on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateRenderer */ extern DECLSPEC SDL_Renderer * SDLCALL SDL_GetRenderer(SDL_Window * window); /** - * \brief Get information about a rendering context. + * Get information about a rendering context. + * + * \param renderer the rendering context + * \param info an SDL_RendererInfo structure filled with information about the + * current renderer + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateRenderer */ extern DECLSPEC int SDLCALL SDL_GetRendererInfo(SDL_Renderer * renderer, SDL_RendererInfo * info); /** - * \brief Get the output size in pixels of a rendering context. + * Get the output size in pixels of a rendering context. + * + * Due to high-dpi displays, you might end up with a rendering context that + * has more pixels than the window that contains it, so use this instead of + * SDL_GetWindowSize() to decide how much drawing area you have. + * + * \param renderer the rendering context + * \param w an int filled with the width + * \param h an int filled with the height + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetRenderer */ extern DECLSPEC int SDLCALL SDL_GetRendererOutputSize(SDL_Renderer * renderer, int *w, int *h); /** - * \brief Create a texture for a rendering context. + * Create a texture for a rendering context. * - * \param renderer The renderer. - * \param format The format of the texture. - * \param access One of the enumerated values in ::SDL_TextureAccess. - * \param w The width of the texture in pixels. - * \param h The height of the texture in pixels. + * You can set the texture scaling method by setting + * `SDL_HINT_RENDER_SCALE_QUALITY` before creating the texture. * - * \return The created texture is returned, or NULL if no rendering context was - * active, the format was unsupported, or the width or height were out - * of range. + * \param renderer the rendering context + * \param format one of the enumerated values in SDL_PixelFormatEnum + * \param access one of the enumerated values in SDL_TextureAccess + * \param w the width of the texture in pixels + * \param h the height of the texture in pixels + * \returns a pointer to the created texture or NULL if no rendering context + * was active, the format was unsupported, or the width or height + * were out of range; call SDL_GetError() for more information. * - * \note The contents of the texture are not defined at creation. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_QueryTexture() - * \sa SDL_UpdateTexture() - * \sa SDL_DestroyTexture() + * \sa SDL_CreateTextureFromSurface + * \sa SDL_DestroyTexture + * \sa SDL_QueryTexture + * \sa SDL_UpdateTexture */ extern DECLSPEC SDL_Texture * SDLCALL SDL_CreateTexture(SDL_Renderer * renderer, Uint32 format, @@ -245,165 +325,290 @@ extern DECLSPEC SDL_Texture * SDLCALL SDL_CreateTexture(SDL_Renderer * renderer, int h); /** - * \brief Create a texture from an existing surface. + * Create a texture from an existing surface. * - * \param renderer The renderer. - * \param surface The surface containing pixel data used to fill the texture. + * The surface is not modified or freed by this function. * - * \return The created texture is returned, or NULL on error. + * The SDL_TextureAccess hint for the created texture is + * `SDL_TEXTUREACCESS_STATIC`. * - * \note The surface is not modified or freed by this function. + * The pixel format of the created texture may be different from the pixel + * format of the surface. Use SDL_QueryTexture() to query the pixel format of + * the texture. * - * \sa SDL_QueryTexture() - * \sa SDL_DestroyTexture() + * \param renderer the rendering context + * \param surface the SDL_Surface structure containing pixel data used to fill + * the texture + * \returns the created texture or NULL on failure; call SDL_GetError() for + * more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateTexture + * \sa SDL_DestroyTexture + * \sa SDL_QueryTexture */ extern DECLSPEC SDL_Texture * SDLCALL SDL_CreateTextureFromSurface(SDL_Renderer * renderer, SDL_Surface * surface); /** - * \brief Query the attributes of a texture + * Query the attributes of a texture. * - * \param texture A texture to be queried. - * \param format A pointer filled in with the raw format of the texture. The - * actual format may differ, but pixel transfers will use this - * format. - * \param access A pointer filled in with the actual access to the texture. - * \param w A pointer filled in with the width of the texture in pixels. - * \param h A pointer filled in with the height of the texture in pixels. + * \param texture the texture to query + * \param format a pointer filled in with the raw format of the texture; the + * actual format may differ, but pixel transfers will use this + * format (one of the SDL_PixelFormatEnum values) + * \param access a pointer filled in with the actual access to the texture + * (one of the SDL_TextureAccess values) + * \param w a pointer filled in with the width of the texture in pixels + * \param h a pointer filled in with the height of the texture in pixels + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 if the texture is not valid. + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateTexture */ extern DECLSPEC int SDLCALL SDL_QueryTexture(SDL_Texture * texture, Uint32 * format, int *access, int *w, int *h); /** - * \brief Set an additional color value used in render copy operations. + * Set an additional color value multiplied into render copy operations. * - * \param texture The texture to update. - * \param r The red color value multiplied into copy operations. - * \param g The green color value multiplied into copy operations. - * \param b The blue color value multiplied into copy operations. + * When this texture is rendered, during the copy operation each source color + * channel is modulated by the appropriate color value according to the + * following formula: * - * \return 0 on success, or -1 if the texture is not valid or color modulation - * is not supported. + * `srcC = srcC * (color / 255)` * - * \sa SDL_GetTextureColorMod() + * Color modulation is not always supported by the renderer; it will return -1 + * if color modulation is not supported. + * + * \param texture the texture to update + * \param r the red color value multiplied into copy operations + * \param g the green color value multiplied into copy operations + * \param b the blue color value multiplied into copy operations + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetTextureColorMod + * \sa SDL_SetTextureAlphaMod */ extern DECLSPEC int SDLCALL SDL_SetTextureColorMod(SDL_Texture * texture, Uint8 r, Uint8 g, Uint8 b); /** - * \brief Get the additional color value used in render copy operations. + * Get the additional color value multiplied into render copy operations. * - * \param texture The texture to query. - * \param r A pointer filled in with the current red color value. - * \param g A pointer filled in with the current green color value. - * \param b A pointer filled in with the current blue color value. + * \param texture the texture to query + * \param r a pointer filled in with the current red color value + * \param g a pointer filled in with the current green color value + * \param b a pointer filled in with the current blue color value + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 if the texture is not valid. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_SetTextureColorMod() + * \sa SDL_GetTextureAlphaMod + * \sa SDL_SetTextureColorMod */ extern DECLSPEC int SDLCALL SDL_GetTextureColorMod(SDL_Texture * texture, Uint8 * r, Uint8 * g, Uint8 * b); /** - * \brief Set an additional alpha value used in render copy operations. + * Set an additional alpha value multiplied into render copy operations. * - * \param texture The texture to update. - * \param alpha The alpha value multiplied into copy operations. + * When this texture is rendered, during the copy operation the source alpha + * value is modulated by this alpha value according to the following formula: * - * \return 0 on success, or -1 if the texture is not valid or alpha modulation - * is not supported. + * `srcA = srcA * (alpha / 255)` * - * \sa SDL_GetTextureAlphaMod() + * Alpha modulation is not always supported by the renderer; it will return -1 + * if alpha modulation is not supported. + * + * \param texture the texture to update + * \param alpha the source alpha value multiplied into copy operations + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetTextureAlphaMod + * \sa SDL_SetTextureColorMod */ extern DECLSPEC int SDLCALL SDL_SetTextureAlphaMod(SDL_Texture * texture, Uint8 alpha); /** - * \brief Get the additional alpha value used in render copy operations. + * Get the additional alpha value multiplied into render copy operations. * - * \param texture The texture to query. - * \param alpha A pointer filled in with the current alpha value. + * \param texture the texture to query + * \param alpha a pointer filled in with the current alpha value + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 if the texture is not valid. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_SetTextureAlphaMod() + * \sa SDL_GetTextureColorMod + * \sa SDL_SetTextureAlphaMod */ extern DECLSPEC int SDLCALL SDL_GetTextureAlphaMod(SDL_Texture * texture, Uint8 * alpha); /** - * \brief Set the blend mode used for texture copy operations. + * Set the blend mode for a texture, used by SDL_RenderCopy(). * - * \param texture The texture to update. - * \param blendMode ::SDL_BlendMode to use for texture blending. + * If the blend mode is not supported, the closest supported mode is chosen + * and this function returns -1. * - * \return 0 on success, or -1 if the texture is not valid or the blend mode is - * not supported. + * \param texture the texture to update + * \param blendMode the SDL_BlendMode to use for texture blending + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \note If the blend mode is not supported, the closest supported mode is - * chosen. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_GetTextureBlendMode() + * \sa SDL_GetTextureBlendMode + * \sa SDL_RenderCopy */ extern DECLSPEC int SDLCALL SDL_SetTextureBlendMode(SDL_Texture * texture, SDL_BlendMode blendMode); /** - * \brief Get the blend mode used for texture copy operations. + * Get the blend mode used for texture copy operations. * - * \param texture The texture to query. - * \param blendMode A pointer filled in with the current blend mode. + * \param texture the texture to query + * \param blendMode a pointer filled in with the current SDL_BlendMode + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 if the texture is not valid. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_SetTextureBlendMode() + * \sa SDL_SetTextureBlendMode */ extern DECLSPEC int SDLCALL SDL_GetTextureBlendMode(SDL_Texture * texture, SDL_BlendMode *blendMode); /** - * \brief Update the given texture rectangle with new pixel data. + * Set the scale mode used for texture scale operations. * - * \param texture The texture to update - * \param rect A pointer to the rectangle of pixels to update, or NULL to - * update the entire texture. - * \param pixels The raw pixel data in the format of the texture. - * \param pitch The number of bytes in a row of pixel data, including padding between lines. + * If the scale mode is not supported, the closest supported mode is chosen. * - * The pixel data must be in the format of the texture. The pixel format can be - * queried with SDL_QueryTexture. + * \param texture The texture to update. + * \param scaleMode the SDL_ScaleMode to use for texture scaling. + * \returns 0 on success, or -1 if the texture is not valid. * - * \return 0 on success, or -1 if the texture is not valid. + * \since This function is available since SDL 2.0.12. * - * \note This is a fairly slow function. + * \sa SDL_GetTextureScaleMode + */ +extern DECLSPEC int SDLCALL SDL_SetTextureScaleMode(SDL_Texture * texture, + SDL_ScaleMode scaleMode); + +/** + * Get the scale mode used for texture scale operations. + * + * \param texture the texture to query. + * \param scaleMode a pointer filled in with the current scale mode. + * \return 0 on success, or -1 if the texture is not valid. + * + * \since This function is available since SDL 2.0.12. + * + * \sa SDL_SetTextureScaleMode + */ +extern DECLSPEC int SDLCALL SDL_GetTextureScaleMode(SDL_Texture * texture, + SDL_ScaleMode *scaleMode); + +/** + * Associate a user-specified pointer with a texture. + * + * \param texture the texture to update. + * \param userdata the pointer to associate with the texture. + * \returns 0 on success, or -1 if the texture is not valid. + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_GetTextureUserData + */ +extern DECLSPEC int SDLCALL SDL_SetTextureUserData(SDL_Texture * texture, + void *userdata); + +/** + * Get the user-specified pointer associated with a texture + * + * \param texture the texture to query. + * \return the pointer associated with the texture, or NULL if the texture is + * not valid. + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_SetTextureUserData + */ +extern DECLSPEC void * SDLCALL SDL_GetTextureUserData(SDL_Texture * texture); + +/** + * Update the given texture rectangle with new pixel data. + * + * The pixel data must be in the pixel format of the texture. Use + * SDL_QueryTexture() to query the pixel format of the texture. + * + * This is a fairly slow function, intended for use with static textures that + * do not change often. + * + * If the texture is intended to be updated often, it is preferred to create + * the texture as streaming and use the locking functions referenced below. + * While this function will work with streaming textures, for optimization + * reasons you may not get the pixels back if you lock the texture afterward. + * + * \param texture the texture to update + * \param rect an SDL_Rect structure representing the area to update, or NULL + * to update the entire texture + * \param pixels the raw pixel data in the format of the texture + * \param pitch the number of bytes in a row of pixel data, including padding + * between lines + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateTexture + * \sa SDL_LockTexture + * \sa SDL_UnlockTexture */ extern DECLSPEC int SDLCALL SDL_UpdateTexture(SDL_Texture * texture, const SDL_Rect * rect, const void *pixels, int pitch); /** - * \brief Update a rectangle within a planar YV12 or IYUV texture with new pixel data. + * Update a rectangle within a planar YV12 or IYUV texture with new pixel + * data. * - * \param texture The texture to update - * \param rect A pointer to the rectangle of pixels to update, or NULL to - * update the entire texture. - * \param Yplane The raw pixel data for the Y plane. - * \param Ypitch The number of bytes between rows of pixel data for the Y plane. - * \param Uplane The raw pixel data for the U plane. - * \param Upitch The number of bytes between rows of pixel data for the U plane. - * \param Vplane The raw pixel data for the V plane. - * \param Vpitch The number of bytes between rows of pixel data for the V plane. + * You can use SDL_UpdateTexture() as long as your pixel data is a contiguous + * block of Y and U/V planes in the proper order, but this function is + * available if your pixel data is not contiguous. * - * \return 0 on success, or -1 if the texture is not valid. + * \param texture the texture to update + * \param rect a pointer to the rectangle of pixels to update, or NULL to + * update the entire texture + * \param Yplane the raw pixel data for the Y plane + * \param Ypitch the number of bytes between rows of pixel data for the Y + * plane + * \param Uplane the raw pixel data for the U plane + * \param Upitch the number of bytes between rows of pixel data for the U + * plane + * \param Vplane the raw pixel data for the V plane + * \param Vpitch the number of bytes between rows of pixel data for the V + * plane + * \returns 0 on success or -1 if the texture is not valid; call + * SDL_GetError() for more information. * - * \note You can use SDL_UpdateTexture() as long as your pixel data is - * a contiguous block of Y and U/V planes in the proper order, but - * this function is available if your pixel data is not contiguous. + * \since This function is available since SDL 2.0.1. + * + * \sa SDL_UpdateTexture */ extern DECLSPEC int SDLCALL SDL_UpdateYUVTexture(SDL_Texture * texture, const SDL_Rect * rect, @@ -412,400 +617,771 @@ extern DECLSPEC int SDLCALL SDL_UpdateYUVTexture(SDL_Texture * texture, const Uint8 *Vplane, int Vpitch); /** - * \brief Lock a portion of the texture for write-only pixel access. + * Update a rectangle within a planar NV12 or NV21 texture with new pixels. * - * \param texture The texture to lock for access, which was created with - * ::SDL_TEXTUREACCESS_STREAMING. - * \param rect A pointer to the rectangle to lock for access. If the rect - * is NULL, the entire texture will be locked. - * \param pixels This is filled in with a pointer to the locked pixels, - * appropriately offset by the locked area. - * \param pitch This is filled in with the pitch of the locked pixels. + * You can use SDL_UpdateTexture() as long as your pixel data is a contiguous + * block of NV12/21 planes in the proper order, but this function is available + * if your pixel data is not contiguous. * - * \return 0 on success, or -1 if the texture is not valid or was not created with ::SDL_TEXTUREACCESS_STREAMING. + * \param texture the texture to update + * \param rect a pointer to the rectangle of pixels to update, or NULL to + * update the entire texture. + * \param Yplane the raw pixel data for the Y plane. + * \param Ypitch the number of bytes between rows of pixel data for the Y + * plane. + * \param UVplane the raw pixel data for the UV plane. + * \param UVpitch the number of bytes between rows of pixel data for the UV + * plane. + * \return 0 on success, or -1 if the texture is not valid. * - * \sa SDL_UnlockTexture() + * \since This function is available since SDL 2.0.16. + */ +extern DECLSPEC int SDLCALL SDL_UpdateNVTexture(SDL_Texture * texture, + const SDL_Rect * rect, + const Uint8 *Yplane, int Ypitch, + const Uint8 *UVplane, int UVpitch); + +/** + * Lock a portion of the texture for **write-only** pixel access. + * + * As an optimization, the pixels made available for editing don't necessarily + * contain the old texture data. This is a write-only operation, and if you + * need to keep a copy of the texture data you should do that at the + * application level. + * + * You must use SDL_UnlockTexture() to unlock the pixels and apply any + * changes. + * + * \param texture the texture to lock for access, which was created with + * `SDL_TEXTUREACCESS_STREAMING` + * \param rect an SDL_Rect structure representing the area to lock for access; + * NULL to lock the entire texture + * \param pixels this is filled in with a pointer to the locked pixels, + * appropriately offset by the locked area + * \param pitch this is filled in with the pitch of the locked pixels; the + * pitch is the length of one row in bytes + * \returns 0 on success or a negative error code if the texture is not valid + * or was not created with `SDL_TEXTUREACCESS_STREAMING`; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_UnlockTexture */ extern DECLSPEC int SDLCALL SDL_LockTexture(SDL_Texture * texture, const SDL_Rect * rect, void **pixels, int *pitch); /** - * \brief Unlock a texture, uploading the changes to video memory, if needed. + * Lock a portion of the texture for **write-only** pixel access, and expose + * it as a SDL surface. * - * \sa SDL_LockTexture() + * Besides providing an SDL_Surface instead of raw pixel data, this function + * operates like SDL_LockTexture. + * + * As an optimization, the pixels made available for editing don't necessarily + * contain the old texture data. This is a write-only operation, and if you + * need to keep a copy of the texture data you should do that at the + * application level. + * + * You must use SDL_UnlockTexture() to unlock the pixels and apply any + * changes. + * + * The returned surface is freed internally after calling SDL_UnlockTexture() + * or SDL_DestroyTexture(). The caller should not free it. + * + * \param texture the texture to lock for access, which was created with + * `SDL_TEXTUREACCESS_STREAMING` + * \param rect a pointer to the rectangle to lock for access. If the rect is + * NULL, the entire texture will be locked + * \param surface this is filled in with an SDL surface representing the + * locked area + * \returns 0 on success, or -1 if the texture is not valid or was not created + * with `SDL_TEXTUREACCESS_STREAMING` + * + * \since This function is available since SDL 2.0.12. + * + * \sa SDL_LockTexture + * \sa SDL_UnlockTexture + */ +extern DECLSPEC int SDLCALL SDL_LockTextureToSurface(SDL_Texture *texture, + const SDL_Rect *rect, + SDL_Surface **surface); + +/** + * Unlock a texture, uploading the changes to video memory, if needed. + * + * **Warning**: Please note that SDL_LockTexture() is intended to be + * write-only; it will not guarantee the previous contents of the texture will + * be provided. You must fully initialize any area of a texture that you lock + * before unlocking it, as the pixels might otherwise be uninitialized memory. + * + * Which is to say: locking and immediately unlocking a texture can result in + * corrupted textures, depending on the renderer in use. + * + * \param texture a texture locked by SDL_LockTexture() + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LockTexture */ extern DECLSPEC void SDLCALL SDL_UnlockTexture(SDL_Texture * texture); /** - * \brief Determines whether a window supports the use of render targets + * Determine whether a renderer supports the use of render targets. * - * \param renderer The renderer that will be checked + * \param renderer the renderer that will be checked + * \returns SDL_TRUE if supported or SDL_FALSE if not. * - * \return SDL_TRUE if supported, SDL_FALSE if not. + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetRenderTarget */ extern DECLSPEC SDL_bool SDLCALL SDL_RenderTargetSupported(SDL_Renderer *renderer); /** - * \brief Set a texture as the current rendering target. + * Set a texture as the current rendering target. * - * \param renderer The renderer. - * \param texture The targeted texture, which must be created with the SDL_TEXTUREACCESS_TARGET flag, or NULL for the default render target + * Before using this function, you should check the + * `SDL_RENDERER_TARGETTEXTURE` bit in the flags of SDL_RendererInfo to see if + * render targets are supported. * - * \return 0 on success, or -1 on error + * The default render target is the window for which the renderer was created. + * To stop rendering to a texture and render to the window again, call this + * function with a NULL `texture`. * - * \sa SDL_GetRenderTarget() + * \param renderer the rendering context + * \param texture the targeted texture, which must be created with the + * `SDL_TEXTUREACCESS_TARGET` flag, or NULL to render to the + * window instead of a texture. + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetRenderTarget */ extern DECLSPEC int SDLCALL SDL_SetRenderTarget(SDL_Renderer *renderer, SDL_Texture *texture); /** - * \brief Get the current render target or NULL for the default render target. + * Get the current render target. * - * \return The current render target + * The default render target is the window for which the renderer was created, + * and is reported a NULL here. * - * \sa SDL_SetRenderTarget() + * \param renderer the rendering context + * \returns the current render target or NULL for the default render target. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetRenderTarget */ extern DECLSPEC SDL_Texture * SDLCALL SDL_GetRenderTarget(SDL_Renderer *renderer); /** - * \brief Set device independent resolution for rendering + * Set a device independent resolution for rendering. * - * \param renderer The renderer for which resolution should be set. - * \param w The width of the logical resolution - * \param h The height of the logical resolution + * This function uses the viewport and scaling functionality to allow a fixed + * logical resolution for rendering, regardless of the actual output + * resolution. If the actual output resolution doesn't have the same aspect + * ratio the output rendering will be centered within the output display. * - * This function uses the viewport and scaling functionality to allow a fixed logical - * resolution for rendering, regardless of the actual output resolution. If the actual - * output resolution doesn't have the same aspect ratio the output rendering will be - * centered within the output display. + * If the output display is a window, mouse and touch events in the window + * will be filtered and scaled so they seem to arrive within the logical + * resolution. The SDL_HINT_MOUSE_RELATIVE_SCALING hint controls whether + * relative motion events are also scaled. * - * If the output display is a window, mouse events in the window will be filtered - * and scaled so they seem to arrive within the logical resolution. + * If this function results in scaling or subpixel drawing by the rendering + * backend, it will be handled using the appropriate quality hints. * - * \note If this function results in scaling or subpixel drawing by the - * rendering backend, it will be handled using the appropriate - * quality hints. + * \param renderer the renderer for which resolution should be set + * \param w the width of the logical resolution + * \param h the height of the logical resolution + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_RenderGetLogicalSize() - * \sa SDL_RenderSetScale() - * \sa SDL_RenderSetViewport() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderGetLogicalSize */ extern DECLSPEC int SDLCALL SDL_RenderSetLogicalSize(SDL_Renderer * renderer, int w, int h); /** - * \brief Get device independent resolution for rendering + * Get device independent resolution for rendering. * - * \param renderer The renderer from which resolution should be queried. - * \param w A pointer filled with the width of the logical resolution - * \param h A pointer filled with the height of the logical resolution + * This may return 0 for `w` and `h` if the SDL_Renderer has never had its + * logical size set by SDL_RenderSetLogicalSize() and never had a render + * target set. * - * \sa SDL_RenderSetLogicalSize() + * \param renderer a rendering context + * \param w an int to be filled with the width + * \param h an int to be filled with the height + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderSetLogicalSize */ extern DECLSPEC void SDLCALL SDL_RenderGetLogicalSize(SDL_Renderer * renderer, int *w, int *h); /** - * \brief Set whether to force integer scales for resolution-independent rendering + * Set whether to force integer scales for resolution-independent rendering. * - * \param renderer The renderer for which integer scaling should be set. - * \param enable Enable or disable integer scaling + * This function restricts the logical viewport to integer values - that is, + * when a resolution is between two multiples of a logical size, the viewport + * size is rounded down to the lower multiple. * - * This function restricts the logical viewport to integer values - that is, when - * a resolution is between two multiples of a logical size, the viewport size is - * rounded down to the lower multiple. + * \param renderer the renderer for which integer scaling should be set + * \param enable enable or disable the integer scaling for rendering + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_RenderSetLogicalSize() + * \since This function is available since SDL 2.0.5. + * + * \sa SDL_RenderGetIntegerScale + * \sa SDL_RenderSetLogicalSize */ extern DECLSPEC int SDLCALL SDL_RenderSetIntegerScale(SDL_Renderer * renderer, SDL_bool enable); /** - * \brief Get whether integer scales are forced for resolution-independent rendering + * Get whether integer scales are forced for resolution-independent rendering. * - * \param renderer The renderer from which integer scaling should be queried. + * \param renderer the renderer from which integer scaling should be queried + * \returns SDL_TRUE if integer scales are forced or SDL_FALSE if not and on + * failure; call SDL_GetError() for more information. * - * \sa SDL_RenderSetIntegerScale() + * \since This function is available since SDL 2.0.5. + * + * \sa SDL_RenderSetIntegerScale */ extern DECLSPEC SDL_bool SDLCALL SDL_RenderGetIntegerScale(SDL_Renderer * renderer); /** - * \brief Set the drawing area for rendering on the current target. + * Set the drawing area for rendering on the current target. * - * \param renderer The renderer for which the drawing area should be set. - * \param rect The rectangle representing the drawing area, or NULL to set the viewport to the entire target. + * When the window is resized, the viewport is reset to fill the entire new + * window size. * - * The x,y of the viewport rect represents the origin for rendering. + * \param renderer the rendering context + * \param rect the SDL_Rect structure representing the drawing area, or NULL + * to set the viewport to the entire target + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.0. * - * \note If the window associated with the renderer is resized, the viewport is automatically reset. - * - * \sa SDL_RenderGetViewport() - * \sa SDL_RenderSetLogicalSize() + * \sa SDL_RenderGetViewport */ extern DECLSPEC int SDLCALL SDL_RenderSetViewport(SDL_Renderer * renderer, const SDL_Rect * rect); /** - * \brief Get the drawing area for the current target. + * Get the drawing area for the current target. * - * \sa SDL_RenderSetViewport() + * \param renderer the rendering context + * \param rect an SDL_Rect structure filled in with the current drawing area + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderSetViewport */ extern DECLSPEC void SDLCALL SDL_RenderGetViewport(SDL_Renderer * renderer, SDL_Rect * rect); /** - * \brief Set the clip rectangle for the current target. + * Set the clip rectangle for rendering on the specified target. * - * \param renderer The renderer for which clip rectangle should be set. - * \param rect A pointer to the rectangle to set as the clip rectangle, or - * NULL to disable clipping. + * \param renderer the rendering context for which clip rectangle should be + * set + * \param rect an SDL_Rect structure representing the clip area, relative to + * the viewport, or NULL to disable clipping + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.0. * - * \sa SDL_RenderGetClipRect() + * \sa SDL_RenderGetClipRect + * \sa SDL_RenderIsClipEnabled */ extern DECLSPEC int SDLCALL SDL_RenderSetClipRect(SDL_Renderer * renderer, const SDL_Rect * rect); /** - * \brief Get the clip rectangle for the current target. + * Get the clip rectangle for the current target. * - * \param renderer The renderer from which clip rectangle should be queried. - * \param rect A pointer filled in with the current clip rectangle, or - * an empty rectangle if clipping is disabled. + * \param renderer the rendering context from which clip rectangle should be + * queried + * \param rect an SDL_Rect structure filled in with the current clipping area + * or an empty rectangle if clipping is disabled * - * \sa SDL_RenderSetClipRect() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderIsClipEnabled + * \sa SDL_RenderSetClipRect */ extern DECLSPEC void SDLCALL SDL_RenderGetClipRect(SDL_Renderer * renderer, SDL_Rect * rect); /** - * \brief Get whether clipping is enabled on the given renderer. + * Get whether clipping is enabled on the given renderer. * - * \param renderer The renderer from which clip state should be queried. + * \param renderer the renderer from which clip state should be queried + * \returns SDL_TRUE if clipping is enabled or SDL_FALSE if not; call + * SDL_GetError() for more information. * - * \sa SDL_RenderGetClipRect() + * \since This function is available since SDL 2.0.4. + * + * \sa SDL_RenderGetClipRect + * \sa SDL_RenderSetClipRect */ extern DECLSPEC SDL_bool SDLCALL SDL_RenderIsClipEnabled(SDL_Renderer * renderer); /** - * \brief Set the drawing scale for rendering on the current target. + * Set the drawing scale for rendering on the current target. * - * \param renderer The renderer for which the drawing scale should be set. - * \param scaleX The horizontal scaling factor - * \param scaleY The vertical scaling factor + * The drawing coordinates are scaled by the x/y scaling factors before they + * are used by the renderer. This allows resolution independent drawing with a + * single coordinate system. * - * The drawing coordinates are scaled by the x/y scaling factors - * before they are used by the renderer. This allows resolution - * independent drawing with a single coordinate system. + * If this results in scaling or subpixel drawing by the rendering backend, it + * will be handled using the appropriate quality hints. For best results use + * integer scaling factors. * - * \note If this results in scaling or subpixel drawing by the - * rendering backend, it will be handled using the appropriate - * quality hints. For best results use integer scaling factors. + * \param renderer a rendering context + * \param scaleX the horizontal scaling factor + * \param scaleY the vertical scaling factor + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_RenderGetScale() - * \sa SDL_RenderSetLogicalSize() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderGetScale + * \sa SDL_RenderSetLogicalSize */ extern DECLSPEC int SDLCALL SDL_RenderSetScale(SDL_Renderer * renderer, float scaleX, float scaleY); /** - * \brief Get the drawing scale for the current target. + * Get the drawing scale for the current target. * - * \param renderer The renderer from which drawing scale should be queried. - * \param scaleX A pointer filled in with the horizontal scaling factor - * \param scaleY A pointer filled in with the vertical scaling factor + * \param renderer the renderer from which drawing scale should be queried + * \param scaleX a pointer filled in with the horizontal scaling factor + * \param scaleY a pointer filled in with the vertical scaling factor * - * \sa SDL_RenderSetScale() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderSetScale */ extern DECLSPEC void SDLCALL SDL_RenderGetScale(SDL_Renderer * renderer, float *scaleX, float *scaleY); /** - * \brief Set the color used for drawing operations (Rect, Line and Clear). + * Get logical coordinates of point in renderer when given real coordinates of + * point in window. * - * \param renderer The renderer for which drawing color should be set. - * \param r The red value used to draw on the rendering target. - * \param g The green value used to draw on the rendering target. - * \param b The blue value used to draw on the rendering target. - * \param a The alpha value used to draw on the rendering target, usually - * ::SDL_ALPHA_OPAQUE (255). + * Logical coordinates will differ from real coordinates when render is scaled + * and logical renderer size set * - * \return 0 on success, or -1 on error + * \param renderer the renderer from which the logical coordinates should be + * calcualted + * \param windowX the real X coordinate in the window + * \param windowY the real Y coordinate in the window + * \param logicalX the pointer filled with the logical x coordinate + * \param logicalY the pointer filled with the logical y coordinate + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_RenderGetScale + * \sa SDL_RenderSetScale + * \sa SDL_RenderGetLogicalSize + * \sa SDL_RenderSetLogicalSize + */ +extern DECLSPEC void SDLCALL SDL_RenderWindowToLogical(SDL_Renderer * renderer, + int windowX, int windowY, + float *logicalX, float *logicalY); + + /** + * Get real coordinates of point in window when given logical coordinates of point in renderer. + * Logical coordinates will differ from real coordinates when render is scaled and logical renderer size set + * + * \param renderer the renderer from which the window coordinates should be calculated + * \param logicalX the logical x coordinate + * \param logicalY the logical y coordinate + * \param windowX the pointer filled with the real X coordinate in the window + * \param windowY the pointer filled with the real Y coordinate in the window + + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_RenderGetScale + * \sa SDL_RenderSetScale + * \sa SDL_RenderGetLogicalSize + * \sa SDL_RenderSetLogicalSize + */ +extern DECLSPEC void SDLCALL SDL_RenderLogicalToWindow(SDL_Renderer * renderer, + float logicalX, float logicalY, + int *windowX, int *windowY); + +/** + * Set the color used for drawing operations (Rect, Line and Clear). + * + * Set the color for drawing or filling rectangles, lines, and points, and for + * SDL_RenderClear(). + * + * \param renderer the rendering context + * \param r the red value used to draw on the rendering target + * \param g the green value used to draw on the rendering target + * \param b the blue value used to draw on the rendering target + * \param a the alpha value used to draw on the rendering target; usually + * `SDL_ALPHA_OPAQUE` (255). Use SDL_SetRenderDrawBlendMode to + * specify how the alpha channel is used + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetRenderDrawColor + * \sa SDL_RenderClear + * \sa SDL_RenderDrawLine + * \sa SDL_RenderDrawLines + * \sa SDL_RenderDrawPoint + * \sa SDL_RenderDrawPoints + * \sa SDL_RenderDrawRect + * \sa SDL_RenderDrawRects + * \sa SDL_RenderFillRect + * \sa SDL_RenderFillRects */ extern DECLSPEC int SDLCALL SDL_SetRenderDrawColor(SDL_Renderer * renderer, Uint8 r, Uint8 g, Uint8 b, Uint8 a); /** - * \brief Get the color used for drawing operations (Rect, Line and Clear). + * Get the color used for drawing operations (Rect, Line and Clear). * - * \param renderer The renderer from which drawing color should be queried. - * \param r A pointer to the red value used to draw on the rendering target. - * \param g A pointer to the green value used to draw on the rendering target. - * \param b A pointer to the blue value used to draw on the rendering target. - * \param a A pointer to the alpha value used to draw on the rendering target, - * usually ::SDL_ALPHA_OPAQUE (255). + * \param renderer the rendering context + * \param r a pointer filled in with the red value used to draw on the + * rendering target + * \param g a pointer filled in with the green value used to draw on the + * rendering target + * \param b a pointer filled in with the blue value used to draw on the + * rendering target + * \param a a pointer filled in with the alpha value used to draw on the + * rendering target; usually `SDL_ALPHA_OPAQUE` (255) + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetRenderDrawColor */ extern DECLSPEC int SDLCALL SDL_GetRenderDrawColor(SDL_Renderer * renderer, Uint8 * r, Uint8 * g, Uint8 * b, Uint8 * a); /** - * \brief Set the blend mode used for drawing operations (Fill and Line). + * Set the blend mode used for drawing operations (Fill and Line). * - * \param renderer The renderer for which blend mode should be set. - * \param blendMode ::SDL_BlendMode to use for blending. + * If the blend mode is not supported, the closest supported mode is chosen. * - * \return 0 on success, or -1 on error + * \param renderer the rendering context + * \param blendMode the SDL_BlendMode to use for blending + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \note If the blend mode is not supported, the closest supported mode is - * chosen. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_GetRenderDrawBlendMode() + * \sa SDL_GetRenderDrawBlendMode + * \sa SDL_RenderDrawLine + * \sa SDL_RenderDrawLines + * \sa SDL_RenderDrawPoint + * \sa SDL_RenderDrawPoints + * \sa SDL_RenderDrawRect + * \sa SDL_RenderDrawRects + * \sa SDL_RenderFillRect + * \sa SDL_RenderFillRects */ extern DECLSPEC int SDLCALL SDL_SetRenderDrawBlendMode(SDL_Renderer * renderer, SDL_BlendMode blendMode); /** - * \brief Get the blend mode used for drawing operations. + * Get the blend mode used for drawing operations. * - * \param renderer The renderer from which blend mode should be queried. - * \param blendMode A pointer filled in with the current blend mode. + * \param renderer the rendering context + * \param blendMode a pointer filled in with the current SDL_BlendMode + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.0. * - * \sa SDL_SetRenderDrawBlendMode() + * \sa SDL_SetRenderDrawBlendMode */ extern DECLSPEC int SDLCALL SDL_GetRenderDrawBlendMode(SDL_Renderer * renderer, SDL_BlendMode *blendMode); /** - * \brief Clear the current rendering target with the drawing color + * Clear the current rendering target with the drawing color. * - * This function clears the entire rendering target, ignoring the viewport and - * the clip rectangle. + * This function clears the entire rendering target, ignoring the viewport and + * the clip rectangle. * - * \return 0 on success, or -1 on error + * \param renderer the rendering context + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetRenderDrawColor */ extern DECLSPEC int SDLCALL SDL_RenderClear(SDL_Renderer * renderer); /** - * \brief Draw a point on the current rendering target. + * Draw a point on the current rendering target. * - * \param renderer The renderer which should draw a point. - * \param x The x coordinate of the point. - * \param y The y coordinate of the point. + * SDL_RenderDrawPoint() draws a single point. If you want to draw multiple, + * use SDL_RenderDrawPoints() instead. * - * \return 0 on success, or -1 on error + * \param renderer the rendering context + * \param x the x coordinate of the point + * \param y the y coordinate of the point + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderDrawLine + * \sa SDL_RenderDrawLines + * \sa SDL_RenderDrawPoints + * \sa SDL_RenderDrawRect + * \sa SDL_RenderDrawRects + * \sa SDL_RenderFillRect + * \sa SDL_RenderFillRects + * \sa SDL_RenderPresent + * \sa SDL_SetRenderDrawBlendMode + * \sa SDL_SetRenderDrawColor */ extern DECLSPEC int SDLCALL SDL_RenderDrawPoint(SDL_Renderer * renderer, int x, int y); /** - * \brief Draw multiple points on the current rendering target. + * Draw multiple points on the current rendering target. * - * \param renderer The renderer which should draw multiple points. - * \param points The points to draw - * \param count The number of points to draw + * \param renderer the rendering context + * \param points an array of SDL_Point structures that represent the points to + * draw + * \param count the number of points to draw + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderDrawLine + * \sa SDL_RenderDrawLines + * \sa SDL_RenderDrawPoint + * \sa SDL_RenderDrawRect + * \sa SDL_RenderDrawRects + * \sa SDL_RenderFillRect + * \sa SDL_RenderFillRects + * \sa SDL_RenderPresent + * \sa SDL_SetRenderDrawBlendMode + * \sa SDL_SetRenderDrawColor */ extern DECLSPEC int SDLCALL SDL_RenderDrawPoints(SDL_Renderer * renderer, const SDL_Point * points, int count); /** - * \brief Draw a line on the current rendering target. + * Draw a line on the current rendering target. * - * \param renderer The renderer which should draw a line. - * \param x1 The x coordinate of the start point. - * \param y1 The y coordinate of the start point. - * \param x2 The x coordinate of the end point. - * \param y2 The y coordinate of the end point. + * SDL_RenderDrawLine() draws the line to include both end points. If you want + * to draw multiple, connecting lines use SDL_RenderDrawLines() instead. * - * \return 0 on success, or -1 on error + * \param renderer the rendering context + * \param x1 the x coordinate of the start point + * \param y1 the y coordinate of the start point + * \param x2 the x coordinate of the end point + * \param y2 the y coordinate of the end point + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderDrawLines + * \sa SDL_RenderDrawPoint + * \sa SDL_RenderDrawPoints + * \sa SDL_RenderDrawRect + * \sa SDL_RenderDrawRects + * \sa SDL_RenderFillRect + * \sa SDL_RenderFillRects + * \sa SDL_RenderPresent + * \sa SDL_SetRenderDrawBlendMode + * \sa SDL_SetRenderDrawColor */ extern DECLSPEC int SDLCALL SDL_RenderDrawLine(SDL_Renderer * renderer, int x1, int y1, int x2, int y2); /** - * \brief Draw a series of connected lines on the current rendering target. + * Draw a series of connected lines on the current rendering target. * - * \param renderer The renderer which should draw multiple lines. - * \param points The points along the lines - * \param count The number of points, drawing count-1 lines + * \param renderer the rendering context + * \param points an array of SDL_Point structures representing points along + * the lines + * \param count the number of points, drawing count-1 lines + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderDrawLine + * \sa SDL_RenderDrawPoint + * \sa SDL_RenderDrawPoints + * \sa SDL_RenderDrawRect + * \sa SDL_RenderDrawRects + * \sa SDL_RenderFillRect + * \sa SDL_RenderFillRects + * \sa SDL_RenderPresent + * \sa SDL_SetRenderDrawBlendMode + * \sa SDL_SetRenderDrawColor */ extern DECLSPEC int SDLCALL SDL_RenderDrawLines(SDL_Renderer * renderer, const SDL_Point * points, int count); /** - * \brief Draw a rectangle on the current rendering target. + * Draw a rectangle on the current rendering target. * - * \param renderer The renderer which should draw a rectangle. - * \param rect A pointer to the destination rectangle, or NULL to outline the entire rendering target. + * \param renderer the rendering context + * \param rect an SDL_Rect structure representing the rectangle to draw, or + * NULL to outline the entire rendering target + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderDrawLine + * \sa SDL_RenderDrawLines + * \sa SDL_RenderDrawPoint + * \sa SDL_RenderDrawPoints + * \sa SDL_RenderDrawRects + * \sa SDL_RenderFillRect + * \sa SDL_RenderFillRects + * \sa SDL_RenderPresent + * \sa SDL_SetRenderDrawBlendMode + * \sa SDL_SetRenderDrawColor */ extern DECLSPEC int SDLCALL SDL_RenderDrawRect(SDL_Renderer * renderer, const SDL_Rect * rect); /** - * \brief Draw some number of rectangles on the current rendering target. + * Draw some number of rectangles on the current rendering target. * - * \param renderer The renderer which should draw multiple rectangles. - * \param rects A pointer to an array of destination rectangles. - * \param count The number of rectangles. + * \param renderer the rendering context + * \param rects an array of SDL_Rect structures representing the rectangles to + * be drawn + * \param count the number of rectangles + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderDrawLine + * \sa SDL_RenderDrawLines + * \sa SDL_RenderDrawPoint + * \sa SDL_RenderDrawPoints + * \sa SDL_RenderDrawRect + * \sa SDL_RenderFillRect + * \sa SDL_RenderFillRects + * \sa SDL_RenderPresent + * \sa SDL_SetRenderDrawBlendMode + * \sa SDL_SetRenderDrawColor */ extern DECLSPEC int SDLCALL SDL_RenderDrawRects(SDL_Renderer * renderer, const SDL_Rect * rects, int count); /** - * \brief Fill a rectangle on the current rendering target with the drawing color. + * Fill a rectangle on the current rendering target with the drawing color. * - * \param renderer The renderer which should fill a rectangle. - * \param rect A pointer to the destination rectangle, or NULL for the entire - * rendering target. + * The current drawing color is set by SDL_SetRenderDrawColor(), and the + * color's alpha value is ignored unless blending is enabled with the + * appropriate call to SDL_SetRenderDrawBlendMode(). * - * \return 0 on success, or -1 on error + * \param renderer the rendering context + * \param rect the SDL_Rect structure representing the rectangle to fill, or + * NULL for the entire rendering target + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderDrawLine + * \sa SDL_RenderDrawLines + * \sa SDL_RenderDrawPoint + * \sa SDL_RenderDrawPoints + * \sa SDL_RenderDrawRect + * \sa SDL_RenderDrawRects + * \sa SDL_RenderFillRects + * \sa SDL_RenderPresent + * \sa SDL_SetRenderDrawBlendMode + * \sa SDL_SetRenderDrawColor */ extern DECLSPEC int SDLCALL SDL_RenderFillRect(SDL_Renderer * renderer, const SDL_Rect * rect); /** - * \brief Fill some number of rectangles on the current rendering target with the drawing color. + * Fill some number of rectangles on the current rendering target with the + * drawing color. * - * \param renderer The renderer which should fill multiple rectangles. - * \param rects A pointer to an array of destination rectangles. - * \param count The number of rectangles. + * \param renderer the rendering context + * \param rects an array of SDL_Rect structures representing the rectangles to + * be filled + * \param count the number of rectangles + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderDrawLine + * \sa SDL_RenderDrawLines + * \sa SDL_RenderDrawPoint + * \sa SDL_RenderDrawPoints + * \sa SDL_RenderDrawRect + * \sa SDL_RenderDrawRects + * \sa SDL_RenderFillRect + * \sa SDL_RenderPresent */ extern DECLSPEC int SDLCALL SDL_RenderFillRects(SDL_Renderer * renderer, const SDL_Rect * rects, int count); /** - * \brief Copy a portion of the texture to the current rendering target. + * Copy a portion of the texture to the current rendering target. * - * \param renderer The renderer which should copy parts of a texture. - * \param texture The source texture. - * \param srcrect A pointer to the source rectangle, or NULL for the entire - * texture. - * \param dstrect A pointer to the destination rectangle, or NULL for the - * entire rendering target. + * The texture is blended with the destination based on its blend mode set + * with SDL_SetTextureBlendMode(). * - * \return 0 on success, or -1 on error + * The texture color is affected based on its color modulation set by + * SDL_SetTextureColorMod(). + * + * The texture alpha is affected based on its alpha modulation set by + * SDL_SetTextureAlphaMod(). + * + * \param renderer the rendering context + * \param texture the source texture + * \param srcrect the source SDL_Rect structure or NULL for the entire texture + * \param dstrect the destination SDL_Rect structure or NULL for the entire + * rendering target; the texture will be stretched to fill the + * given rectangle + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderCopyEx + * \sa SDL_SetTextureAlphaMod + * \sa SDL_SetTextureBlendMode + * \sa SDL_SetTextureColorMod */ extern DECLSPEC int SDLCALL SDL_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture, @@ -813,19 +1389,43 @@ extern DECLSPEC int SDLCALL SDL_RenderCopy(SDL_Renderer * renderer, const SDL_Rect * dstrect); /** - * \brief Copy a portion of the source texture to the current rendering target, rotating it by angle around the given center + * Copy a portion of the texture to the current rendering, with optional + * rotation and flipping. * - * \param renderer The renderer which should copy parts of a texture. - * \param texture The source texture. - * \param srcrect A pointer to the source rectangle, or NULL for the entire - * texture. - * \param dstrect A pointer to the destination rectangle, or NULL for the - * entire rendering target. - * \param angle An angle in degrees that indicates the rotation that will be applied to dstrect, rotating it in a clockwise direction - * \param center A pointer to a point indicating the point around which dstrect will be rotated (if NULL, rotation will be done around dstrect.w/2, dstrect.h/2). - * \param flip An SDL_RendererFlip value stating which flipping actions should be performed on the texture + * Copy a portion of the texture to the current rendering target, optionally + * rotating it by angle around the given center and also flipping it + * top-bottom and/or left-right. * - * \return 0 on success, or -1 on error + * The texture is blended with the destination based on its blend mode set + * with SDL_SetTextureBlendMode(). + * + * The texture color is affected based on its color modulation set by + * SDL_SetTextureColorMod(). + * + * The texture alpha is affected based on its alpha modulation set by + * SDL_SetTextureAlphaMod(). + * + * \param renderer the rendering context + * \param texture the source texture + * \param srcrect the source SDL_Rect structure or NULL for the entire texture + * \param dstrect the destination SDL_Rect structure or NULL for the entire + * rendering target + * \param angle an angle in degrees that indicates the rotation that will be + * applied to dstrect, rotating it in a clockwise direction + * \param center a pointer to a point indicating the point around which + * dstrect will be rotated (if NULL, rotation will be done + * around `dstrect.w / 2`, `dstrect.h / 2`) + * \param flip a SDL_RendererFlip value stating which flipping actions should + * be performed on the texture + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderCopy + * \sa SDL_SetTextureAlphaMod + * \sa SDL_SetTextureBlendMode + * \sa SDL_SetTextureColorMod */ extern DECLSPEC int SDLCALL SDL_RenderCopyEx(SDL_Renderer * renderer, SDL_Texture * texture, @@ -837,117 +1437,132 @@ extern DECLSPEC int SDLCALL SDL_RenderCopyEx(SDL_Renderer * renderer, /** - * \brief Draw a point on the current rendering target. + * Draw a point on the current rendering target at subpixel precision. * - * \param renderer The renderer which should draw a point. - * \param x The x coordinate of the point. - * \param y The y coordinate of the point. + * \param renderer The renderer which should draw a point. + * \param x The x coordinate of the point. + * \param y The y coordinate of the point. + * \return 0 on success, or -1 on error * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC int SDLCALL SDL_RenderDrawPointF(SDL_Renderer * renderer, float x, float y); /** - * \brief Draw multiple points on the current rendering target. + * Draw multiple points on the current rendering target at subpixel precision. * - * \param renderer The renderer which should draw multiple points. - * \param points The points to draw - * \param count The number of points to draw + * \param renderer The renderer which should draw multiple points. + * \param points The points to draw + * \param count The number of points to draw + * \return 0 on success, or -1 on error * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC int SDLCALL SDL_RenderDrawPointsF(SDL_Renderer * renderer, const SDL_FPoint * points, int count); /** - * \brief Draw a line on the current rendering target. + * Draw a line on the current rendering target at subpixel precision. * - * \param renderer The renderer which should draw a line. - * \param x1 The x coordinate of the start point. - * \param y1 The y coordinate of the start point. - * \param x2 The x coordinate of the end point. - * \param y2 The y coordinate of the end point. + * \param renderer The renderer which should draw a line. + * \param x1 The x coordinate of the start point. + * \param y1 The y coordinate of the start point. + * \param x2 The x coordinate of the end point. + * \param y2 The y coordinate of the end point. + * \return 0 on success, or -1 on error * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC int SDLCALL SDL_RenderDrawLineF(SDL_Renderer * renderer, float x1, float y1, float x2, float y2); /** - * \brief Draw a series of connected lines on the current rendering target. + * Draw a series of connected lines on the current rendering target at + * subpixel precision. * - * \param renderer The renderer which should draw multiple lines. - * \param points The points along the lines - * \param count The number of points, drawing count-1 lines + * \param renderer The renderer which should draw multiple lines. + * \param points The points along the lines + * \param count The number of points, drawing count-1 lines + * \return 0 on success, or -1 on error * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC int SDLCALL SDL_RenderDrawLinesF(SDL_Renderer * renderer, - const SDL_FPoint * points, - int count); + const SDL_FPoint * points, + int count); /** - * \brief Draw a rectangle on the current rendering target. + * Draw a rectangle on the current rendering target at subpixel precision. * - * \param renderer The renderer which should draw a rectangle. - * \param rect A pointer to the destination rectangle, or NULL to outline the entire rendering target. + * \param renderer The renderer which should draw a rectangle. + * \param rect A pointer to the destination rectangle, or NULL to outline the + * entire rendering target. + * \return 0 on success, or -1 on error * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC int SDLCALL SDL_RenderDrawRectF(SDL_Renderer * renderer, - const SDL_FRect * rect); + const SDL_FRect * rect); /** - * \brief Draw some number of rectangles on the current rendering target. + * Draw some number of rectangles on the current rendering target at subpixel + * precision. * - * \param renderer The renderer which should draw multiple rectangles. - * \param rects A pointer to an array of destination rectangles. - * \param count The number of rectangles. + * \param renderer The renderer which should draw multiple rectangles. + * \param rects A pointer to an array of destination rectangles. + * \param count The number of rectangles. + * \return 0 on success, or -1 on error * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC int SDLCALL SDL_RenderDrawRectsF(SDL_Renderer * renderer, const SDL_FRect * rects, int count); /** - * \brief Fill a rectangle on the current rendering target with the drawing color. + * Fill a rectangle on the current rendering target with the drawing color at + * subpixel precision. * - * \param renderer The renderer which should fill a rectangle. - * \param rect A pointer to the destination rectangle, or NULL for the entire - * rendering target. + * \param renderer The renderer which should fill a rectangle. + * \param rect A pointer to the destination rectangle, or NULL for the entire + * rendering target. + * \return 0 on success, or -1 on error * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC int SDLCALL SDL_RenderFillRectF(SDL_Renderer * renderer, const SDL_FRect * rect); /** - * \brief Fill some number of rectangles on the current rendering target with the drawing color. + * Fill some number of rectangles on the current rendering target with the + * drawing color at subpixel precision. * - * \param renderer The renderer which should fill multiple rectangles. - * \param rects A pointer to an array of destination rectangles. - * \param count The number of rectangles. + * \param renderer The renderer which should fill multiple rectangles. + * \param rects A pointer to an array of destination rectangles. + * \param count The number of rectangles. + * \return 0 on success, or -1 on error * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC int SDLCALL SDL_RenderFillRectsF(SDL_Renderer * renderer, const SDL_FRect * rects, int count); /** - * \brief Copy a portion of the texture to the current rendering target. + * Copy a portion of the texture to the current rendering target at subpixel + * precision. * - * \param renderer The renderer which should copy parts of a texture. - * \param texture The source texture. - * \param srcrect A pointer to the source rectangle, or NULL for the entire - * texture. - * \param dstrect A pointer to the destination rectangle, or NULL for the - * entire rendering target. + * \param renderer The renderer which should copy parts of a texture. + * \param texture The source texture. + * \param srcrect A pointer to the source rectangle, or NULL for the entire + * texture. + * \param dstrect A pointer to the destination rectangle, or NULL for the + * entire rendering target. + * \return 0 on success, or -1 on error * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC int SDLCALL SDL_RenderCopyF(SDL_Renderer * renderer, SDL_Texture * texture, @@ -955,19 +1570,25 @@ extern DECLSPEC int SDLCALL SDL_RenderCopyF(SDL_Renderer * renderer, const SDL_FRect * dstrect); /** - * \brief Copy a portion of the source texture to the current rendering target, rotating it by angle around the given center + * Copy a portion of the source texture to the current rendering target, with + * rotation and flipping, at subpixel precision. * - * \param renderer The renderer which should copy parts of a texture. - * \param texture The source texture. - * \param srcrect A pointer to the source rectangle, or NULL for the entire - * texture. - * \param dstrect A pointer to the destination rectangle, or NULL for the - * entire rendering target. - * \param angle An angle in degrees that indicates the rotation that will be applied to dstrect, rotating it in a clockwise direction - * \param center A pointer to a point indicating the point around which dstrect will be rotated (if NULL, rotation will be done around dstrect.w/2, dstrect.h/2). - * \param flip An SDL_RendererFlip value stating which flipping actions should be performed on the texture + * \param renderer The renderer which should copy parts of a texture. + * \param texture The source texture. + * \param srcrect A pointer to the source rectangle, or NULL for the entire + * texture. + * \param dstrect A pointer to the destination rectangle, or NULL for the + * entire rendering target. + * \param angle An angle in degrees that indicates the rotation that will be + * applied to dstrect, rotating it in a clockwise direction + * \param center A pointer to a point indicating the point around which + * dstrect will be rotated (if NULL, rotation will be done + * around dstrect.w/2, dstrect.h/2). + * \param flip An SDL_RendererFlip value stating which flipping actions should + * be performed on the texture + * \return 0 on success, or -1 on error * - * \return 0 on success, or -1 on error + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC int SDLCALL SDL_RenderCopyExF(SDL_Renderer * renderer, SDL_Texture * texture, @@ -978,19 +1599,85 @@ extern DECLSPEC int SDLCALL SDL_RenderCopyExF(SDL_Renderer * renderer, const SDL_RendererFlip flip); /** - * \brief Read pixels from the current rendering target. + * Render a list of triangles, optionally using a texture and indices into the + * vertex array Color and alpha modulation is done per vertex + * (SDL_SetTextureColorMod and SDL_SetTextureAlphaMod are ignored). * - * \param renderer The renderer from which pixels should be read. - * \param rect A pointer to the rectangle to read, or NULL for the entire - * render target. - * \param format The desired format of the pixel data, or 0 to use the format - * of the rendering target - * \param pixels A pointer to be filled in with the pixel data - * \param pitch The pitch of the pixels parameter. + * \param texture (optional) The SDL texture to use. + * \param vertices Vertices. + * \param num_vertices Number of vertices. + * \param indices (optional) An array of integer indices into the 'vertices' + * array, if NULL all vertices will be rendered in sequential + * order. + * \param num_indices Number of indices. + * \return 0 on success, or -1 if the operation is not supported * - * \return 0 on success, or -1 if pixel reading is not supported. + * \since This function is available since SDL 2.0.18. * - * \warning This is a very slow operation, and should not be used frequently. + * \sa SDL_RenderGeometryRaw + * \sa SDL_Vertex + */ +extern DECLSPEC int SDLCALL SDL_RenderGeometry(SDL_Renderer *renderer, + SDL_Texture *texture, + const SDL_Vertex *vertices, int num_vertices, + const int *indices, int num_indices); + +/** + * Render a list of triangles, optionally using a texture and indices into the + * vertex arrays Color and alpha modulation is done per vertex + * (SDL_SetTextureColorMod and SDL_SetTextureAlphaMod are ignored). + * + * \param texture (optional) The SDL texture to use. + * \param xy Vertex positions + * \param xy_stride Byte size to move from one element to the next element + * \param color Vertex colors (as SDL_Color) + * \param color_stride Byte size to move from one element to the next element + * \param uv Vertex normalized texture coordinates + * \param uv_stride Byte size to move from one element to the next element + * \param num_vertices Number of vertices. + * \param indices (optional) An array of indices into the 'vertices' arrays, + * if NULL all vertices will be rendered in sequential order. + * \param num_indices Number of indices. + * \param size_indices Index size: 1 (byte), 2 (short), 4 (int) + * \return 0 on success, or -1 if the operation is not supported + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_RenderGeometry + * \sa SDL_Vertex + */ +extern DECLSPEC int SDLCALL SDL_RenderGeometryRaw(SDL_Renderer *renderer, + SDL_Texture *texture, + const float *xy, int xy_stride, + const SDL_Color *color, int color_stride, + const float *uv, int uv_stride, + int num_vertices, + const void *indices, int num_indices, int size_indices); + +/** + * Read pixels from the current rendering target to an array of pixels. + * + * **WARNING**: This is a very slow operation, and should not be used + * frequently. + * + * `pitch` specifies the number of bytes between rows in the destination + * `pixels` data. This allows you to write to a subrectangle or have padded + * rows in the destination. Generally, `pitch` should equal the number of + * pixels per row in the `pixels` data times the number of bytes per pixel, + * but it might contain additional padding (for example, 24bit RGB Windows + * Bitmap data pads all rows to multiples of 4 bytes). + * + * \param renderer the rendering context + * \param rect an SDL_Rect structure representing the area to read, or NULL + * for the entire render target + * \param format an SDL_PixelFormatEnum value of the desired format of the + * pixel data, or 0 to use the format of the rendering target + * \param pixels a pointer to the pixel data to copy into + * \param pitch the pitch of the `pixels` parameter + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC int SDLCALL SDL_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect, @@ -998,95 +1685,200 @@ extern DECLSPEC int SDLCALL SDL_RenderReadPixels(SDL_Renderer * renderer, void *pixels, int pitch); /** - * \brief Update the screen with rendering performed. + * Update the screen with any rendering performed since the previous call. + * + * SDL's rendering functions operate on a backbuffer; that is, calling a + * rendering function such as SDL_RenderDrawLine() does not directly put a + * line on the screen, but rather updates the backbuffer. As such, you compose + * your entire scene and *present* the composed backbuffer to the screen as a + * complete picture. + * + * Therefore, when using SDL's rendering API, one does all drawing intended + * for the frame, and then calls this function once per frame to present the + * final drawing to the user. + * + * The backbuffer should be considered invalidated after each present; do not + * assume that previous contents will exist between frames. You are strongly + * encouraged to call SDL_RenderClear() to initialize the backbuffer before + * starting each new frame's drawing, even if you plan to overwrite every + * pixel. + * + * \param renderer the rendering context + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RenderClear + * \sa SDL_RenderDrawLine + * \sa SDL_RenderDrawLines + * \sa SDL_RenderDrawPoint + * \sa SDL_RenderDrawPoints + * \sa SDL_RenderDrawRect + * \sa SDL_RenderDrawRects + * \sa SDL_RenderFillRect + * \sa SDL_RenderFillRects + * \sa SDL_SetRenderDrawBlendMode + * \sa SDL_SetRenderDrawColor */ extern DECLSPEC void SDLCALL SDL_RenderPresent(SDL_Renderer * renderer); /** - * \brief Destroy the specified texture. + * Destroy the specified texture. * - * \sa SDL_CreateTexture() - * \sa SDL_CreateTextureFromSurface() + * Passing NULL or an otherwise invalid texture will set the SDL error message + * to "Invalid texture". + * + * \param texture the texture to destroy + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateTexture + * \sa SDL_CreateTextureFromSurface */ extern DECLSPEC void SDLCALL SDL_DestroyTexture(SDL_Texture * texture); /** - * \brief Destroy the rendering context for a window and free associated - * textures. + * Destroy the rendering context for a window and free associated textures. * - * \sa SDL_CreateRenderer() + * \param renderer the rendering context + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateRenderer */ extern DECLSPEC void SDLCALL SDL_DestroyRenderer(SDL_Renderer * renderer); /** - * \brief Force the rendering context to flush any pending commands to the - * underlying rendering API. + * Force the rendering context to flush any pending commands to the underlying + * rendering API. * - * You do not need to (and in fact, shouldn't) call this function unless - * you are planning to call into OpenGL/Direct3D/Metal/whatever directly - * in addition to using an SDL_Renderer. + * You do not need to (and in fact, shouldn't) call this function unless you + * are planning to call into OpenGL/Direct3D/Metal/whatever directly in + * addition to using an SDL_Renderer. * - * This is for a very-specific case: if you are using SDL's render API, - * you asked for a specific renderer backend (OpenGL, Direct3D, etc), - * you set SDL_HINT_RENDER_BATCHING to "1", and you plan to make - * OpenGL/D3D/whatever calls in addition to SDL render API calls. If all of - * this applies, you should call SDL_RenderFlush() between calls to SDL's - * render API and the low-level API you're using in cooperation. + * This is for a very-specific case: if you are using SDL's render API, you + * asked for a specific renderer backend (OpenGL, Direct3D, etc), you set + * SDL_HINT_RENDER_BATCHING to "1", and you plan to make OpenGL/D3D/whatever + * calls in addition to SDL render API calls. If all of this applies, you + * should call SDL_RenderFlush() between calls to SDL's render API and the + * low-level API you're using in cooperation. * - * In all other cases, you can ignore this function. This is only here to - * get maximum performance out of a specific situation. In all other cases, - * SDL will do the right thing, perhaps at a performance loss. + * In all other cases, you can ignore this function. This is only here to get + * maximum performance out of a specific situation. In all other cases, SDL + * will do the right thing, perhaps at a performance loss. * - * This function is first available in SDL 2.0.10, and is not needed in - * 2.0.9 and earlier, as earlier versions did not queue rendering commands - * at all, instead flushing them to the OS immediately. + * This function is first available in SDL 2.0.10, and is not needed in 2.0.9 + * and earlier, as earlier versions did not queue rendering commands at all, + * instead flushing them to the OS immediately. + * + * \param renderer the rendering context + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC int SDLCALL SDL_RenderFlush(SDL_Renderer * renderer); /** - * \brief Bind the texture to the current OpenGL/ES/ES2 context for use with - * OpenGL instructions. + * Bind an OpenGL/ES/ES2 texture to the current context. * - * \param texture The SDL texture to bind - * \param texw A pointer to a float that will be filled with the texture width - * \param texh A pointer to a float that will be filled with the texture height + * This is for use with OpenGL instructions when rendering OpenGL primitives + * directly. * - * \return 0 on success, or -1 if the operation is not supported + * If not NULL, `texw` and `texh` will be filled with the width and height + * values suitable for the provided texture. In most cases, both will be 1.0, + * however, on systems that support the GL_ARB_texture_rectangle extension, + * these values will actually be the pixel width and height used to create the + * texture, so this factor needs to be taken into account when providing + * texture coordinates to OpenGL. + * + * You need a renderer to create an SDL_Texture, therefore you can only use + * this function with an implicit OpenGL context from SDL_CreateRenderer(), + * not with your own OpenGL context. If you need control over your OpenGL + * context, you need to write your own texture-loading methods. + * + * Also note that SDL may upload RGB textures as BGR (or vice-versa), and + * re-order the color channels in the shaders phase, so the uploaded texture + * may have swapped color channels. + * + * \param texture the texture to bind to the current OpenGL/ES/ES2 context + * \param texw a pointer to a float value which will be filled with the + * texture width or NULL if you don't need that value + * \param texh a pointer to a float value which will be filled with the + * texture height or NULL if you don't need that value + * \returns 0 on success, or -1 if the operation is not supported; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_MakeCurrent + * \sa SDL_GL_UnbindTexture */ extern DECLSPEC int SDLCALL SDL_GL_BindTexture(SDL_Texture *texture, float *texw, float *texh); /** - * \brief Unbind a texture from the current OpenGL/ES/ES2 context. + * Unbind an OpenGL/ES/ES2 texture from the current context. * - * \param texture The SDL texture to unbind + * See SDL_GL_BindTexture() for examples on how to use these functions * - * \return 0 on success, or -1 if the operation is not supported + * \param texture the texture to unbind from the current OpenGL/ES/ES2 context + * \returns 0 on success, or -1 if the operation is not supported + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_BindTexture + * \sa SDL_GL_MakeCurrent */ extern DECLSPEC int SDLCALL SDL_GL_UnbindTexture(SDL_Texture *texture); /** - * \brief Get the CAMetalLayer associated with the given Metal renderer + * Get the CAMetalLayer associated with the given Metal renderer. * - * \param renderer The renderer to query + * This function returns `void *`, so SDL doesn't have to include Metal's + * headers, but it can be safely cast to a `CAMetalLayer *`. * - * \return CAMetalLayer* on success, or NULL if the renderer isn't a Metal renderer + * \param renderer The renderer to query + * \returns a `CAMetalLayer *` on success, or NULL if the renderer isn't a + * Metal renderer * - * \sa SDL_RenderGetMetalCommandEncoder() + * \since This function is available since SDL 2.0.8. + * + * \sa SDL_RenderGetMetalCommandEncoder */ extern DECLSPEC void *SDLCALL SDL_RenderGetMetalLayer(SDL_Renderer * renderer); /** - * \brief Get the Metal command encoder for the current frame + * Get the Metal command encoder for the current frame * - * \param renderer The renderer to query + * This function returns `void *`, so SDL doesn't have to include Metal's + * headers, but it can be safely cast to an `id`. * - * \return id on success, or NULL if the renderer isn't a Metal renderer + * Note that as of SDL 2.0.18, this will return NULL if Metal refuses to give + * SDL a drawable to render to, which might happen if the window is + * hidden/minimized/offscreen. This doesn't apply to command encoders for + * render targets, just the window's backbacker. Check your return values! * - * \sa SDL_RenderGetMetalLayer() + * \param renderer The renderer to query + * \returns an `id` on success, or NULL if the + * renderer isn't a Metal renderer or there was an error. + * + * \since This function is available since SDL 2.0.8. + * + * \sa SDL_RenderGetMetalLayer */ extern DECLSPEC void *SDLCALL SDL_RenderGetMetalCommandEncoder(SDL_Renderer * renderer); +/** + * Toggle VSync of the given renderer. + * + * \param renderer The renderer to toggle + * \param vsync 1 for on, 0 for off. All other values are reserved + * \returns a 0 int on success, or non-zero on failure + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_RenderSetVSync(SDL_Renderer* renderer, int vsync); + /* Ends C function definitions when using C++ */ #ifdef __cplusplus } diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_revision.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_revision.h index 3b3fc85ea..3253d6df0 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_revision.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_revision.h @@ -1,2 +1,2 @@ -#define SDL_REVISION "hg-12952:bc90ce38f1e2" -#define SDL_REVISION_NUMBER 12952 +#define SDL_REVISION "https://github.com/libsdl-org/SDL.git@b424665e0899769b200231ba943353a5fee1b6b6" +#define SDL_REVISION_NUMBER 0 diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_rwops.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_rwops.h index f66119fb0..71e5c8db8 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_rwops.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_rwops.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -45,6 +45,9 @@ extern "C" { #define SDL_RWOPS_JNIFILE 3U /**< Android asset */ #define SDL_RWOPS_MEMORY 4U /**< Memory stream */ #define SDL_RWOPS_MEMORY_RO 5U /**< Read-Only memory stream */ +#if defined(__VITA__) +#define SDL_RWOPS_VITAFILE 6U /**< Vita file */ +#endif /** * This is the read/write operation structure -- very basic. @@ -96,15 +99,7 @@ typedef struct SDL_RWops #if defined(__ANDROID__) struct { - void *fileNameRef; - void *inputStreamRef; - void *readableByteChannelRef; - void *readMethod; - void *assetFileDescriptorRef; - long position; - long size; - long offset; - int fd; + void *asset; } androidio; #elif defined(__WIN32__) struct @@ -118,6 +113,17 @@ typedef struct SDL_RWops size_t left; } buffer; } windowsio; +#elif defined(__VITA__) + struct + { + int h; + struct + { + void *data; + size_t size; + size_t left; + } buffer; + } vitaio; #endif #ifdef HAVE_STDIO_H @@ -150,25 +156,228 @@ typedef struct SDL_RWops */ /* @{ */ +/** + * Use this function to create a new SDL_RWops structure for reading from + * and/or writing to a named file. + * + * The `mode` string is treated roughly the same as in a call to the C + * library's fopen(), even if SDL doesn't happen to use fopen() behind the + * scenes. + * + * Available `mode` strings: + * + * - "r": Open a file for reading. The file must exist. + * - "w": Create an empty file for writing. If a file with the same name + * already exists its content is erased and the file is treated as a new + * empty file. + * - "a": Append to a file. Writing operations append data at the end of the + * file. The file is created if it does not exist. + * - "r+": Open a file for update both reading and writing. The file must + * exist. + * - "w+": Create an empty file for both reading and writing. If a file with + * the same name already exists its content is erased and the file is + * treated as a new empty file. + * - "a+": Open a file for reading and appending. All writing operations are + * performed at the end of the file, protecting the previous content to be + * overwritten. You can reposition (fseek, rewind) the internal pointer to + * anywhere in the file for reading, but writing operations will move it + * back to the end of file. The file is created if it does not exist. + * + * **NOTE**: In order to open a file as a binary file, a "b" character has to + * be included in the `mode` string. This additional "b" character can either + * be appended at the end of the string (thus making the following compound + * modes: "rb", "wb", "ab", "r+b", "w+b", "a+b") or be inserted between the + * letter and the "+" sign for the mixed modes ("rb+", "wb+", "ab+"). + * Additional characters may follow the sequence, although they should have no + * effect. For example, "t" is sometimes appended to make explicit the file is + * a text file. + * + * This function supports Unicode filenames, but they must be encoded in UTF-8 + * format, regardless of the underlying operating system. + * + * As a fallback, SDL_RWFromFile() will transparently open a matching filename + * in an Android app's `assets`. + * + * Closing the SDL_RWops will close the file handle SDL is holding internally. + * + * \param file a UTF-8 string representing the filename to open + * \param mode an ASCII string representing the mode to be used for opening + * the file. + * \returns a pointer to the SDL_RWops structure that is created, or NULL on + * failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RWclose + * \sa SDL_RWFromConstMem + * \sa SDL_RWFromFP + * \sa SDL_RWFromMem + * \sa SDL_RWread + * \sa SDL_RWseek + * \sa SDL_RWtell + * \sa SDL_RWwrite + */ extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromFile(const char *file, const char *mode); #ifdef HAVE_STDIO_H -extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromFP(FILE * fp, - SDL_bool autoclose); + +extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromFP(FILE * fp, SDL_bool autoclose); + #else + +/** + * Use this function to create an SDL_RWops structure from a standard I/O file + * pointer (stdio.h's `FILE*`). + * + * This function is not available on Windows, since files opened in an + * application on that platform cannot be used by a dynamically linked + * library. + * + * On some platforms, the first parameter is a `void*`, on others, it's a + * `FILE*`, depending on what system headers are available to SDL. It is + * always intended to be the `FILE*` type from the C runtime's stdio.h. + * + * \param fp the `FILE*` that feeds the SDL_RWops stream + * \param autoclose SDL_TRUE to close the `FILE*` when closing the SDL_RWops, + * SDL_FALSE to leave the `FILE*` open when the RWops is + * closed + * \returns a pointer to the SDL_RWops structure that is created, or NULL on + * failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RWclose + * \sa SDL_RWFromConstMem + * \sa SDL_RWFromFile + * \sa SDL_RWFromMem + * \sa SDL_RWread + * \sa SDL_RWseek + * \sa SDL_RWtell + * \sa SDL_RWwrite + */ extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromFP(void * fp, SDL_bool autoclose); #endif +/** + * Use this function to prepare a read-write memory buffer for use with + * SDL_RWops. + * + * This function sets up an SDL_RWops struct based on a memory area of a + * certain size, for both read and write access. + * + * This memory buffer is not copied by the RWops; the pointer you provide must + * remain valid until you close the stream. Closing the stream will not free + * the original buffer. + * + * If you need to make sure the RWops never writes to the memory buffer, you + * should use SDL_RWFromConstMem() with a read-only buffer of memory instead. + * + * \param mem a pointer to a buffer to feed an SDL_RWops stream + * \param size the buffer size, in bytes + * \returns a pointer to a new SDL_RWops structure, or NULL if it fails; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RWclose + * \sa SDL_RWFromConstMem + * \sa SDL_RWFromFile + * \sa SDL_RWFromFP + * \sa SDL_RWFromMem + * \sa SDL_RWread + * \sa SDL_RWseek + * \sa SDL_RWtell + * \sa SDL_RWwrite + */ extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromMem(void *mem, int size); + +/** + * Use this function to prepare a read-only memory buffer for use with RWops. + * + * This function sets up an SDL_RWops struct based on a memory area of a + * certain size. It assumes the memory area is not writable. + * + * Attempting to write to this RWops stream will report an error without + * writing to the memory buffer. + * + * This memory buffer is not copied by the RWops; the pointer you provide must + * remain valid until you close the stream. Closing the stream will not free + * the original buffer. + * + * If you need to write to a memory buffer, you should use SDL_RWFromMem() + * with a writable buffer of memory instead. + * + * \param mem a pointer to a read-only buffer to feed an SDL_RWops stream + * \param size the buffer size, in bytes + * \returns a pointer to a new SDL_RWops structure, or NULL if it fails; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RWclose + * \sa SDL_RWFromConstMem + * \sa SDL_RWFromFile + * \sa SDL_RWFromFP + * \sa SDL_RWFromMem + * \sa SDL_RWread + * \sa SDL_RWseek + * \sa SDL_RWtell + */ extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromConstMem(const void *mem, int size); /* @} *//* RWFrom functions */ +/** + * Use this function to allocate an empty, unpopulated SDL_RWops structure. + * + * Applications do not need to use this function unless they are providing + * their own SDL_RWops implementation. If you just need a SDL_RWops to + * read/write a common data source, you should use the built-in + * implementations in SDL, like SDL_RWFromFile() or SDL_RWFromMem(), etc. + * + * You must free the returned pointer with SDL_FreeRW(). Depending on your + * operating system and compiler, there may be a difference between the + * malloc() and free() your program uses and the versions SDL calls + * internally. Trying to mix the two can cause crashing such as segmentation + * faults. Since all SDL_RWops must free themselves when their **close** + * method is called, all SDL_RWops must be allocated through this function, so + * they can all be freed correctly with SDL_FreeRW(). + * + * \returns a pointer to the allocated memory on success, or NULL on failure; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_FreeRW + */ extern DECLSPEC SDL_RWops *SDLCALL SDL_AllocRW(void); + +/** + * Use this function to free an SDL_RWops structure allocated by + * SDL_AllocRW(). + * + * Applications do not need to use this function unless they are providing + * their own SDL_RWops implementation. If you just need a SDL_RWops to + * read/write a common data source, you should use the built-in + * implementations in SDL, like SDL_RWFromFile() or SDL_RWFromMem(), etc, and + * call the **close** method on those SDL_RWops pointers when you are done + * with them. + * + * Only use SDL_FreeRW() on pointers returned by SDL_AllocRW(). The pointer is + * invalid as soon as this function returns. Any extra memory allocated during + * creation of the SDL_RWops is not freed by SDL_FreeRW(); the programmer must + * be responsible for managing that memory in their **close** method. + * + * \param area the SDL_RWops structure to be freed + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AllocRW + */ extern DECLSPEC void SDLCALL SDL_FreeRW(SDL_RWops * area); #define RW_SEEK_SET 0 /**< Seek from the beginning of data */ @@ -176,77 +385,218 @@ extern DECLSPEC void SDLCALL SDL_FreeRW(SDL_RWops * area); #define RW_SEEK_END 2 /**< Seek relative to the end of data */ /** - * Return the size of the file in this rwops, or -1 if unknown + * Use this function to get the size of the data stream in an SDL_RWops. + * + * Prior to SDL 2.0.10, this function was a macro. + * + * \param context the SDL_RWops to get the size of the data stream from + * \returns the size of the data stream in the SDL_RWops on success, -1 if + * unknown or a negative error code on failure; call SDL_GetError() + * for more information. + * + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC Sint64 SDLCALL SDL_RWsize(SDL_RWops *context); /** - * Seek to \c offset relative to \c whence, one of stdio's whence values: - * RW_SEEK_SET, RW_SEEK_CUR, RW_SEEK_END + * Seek within an SDL_RWops data stream. * - * \return the final offset in the data stream, or -1 on error. + * This function seeks to byte `offset`, relative to `whence`. + * + * `whence` may be any of the following values: + * + * - `RW_SEEK_SET`: seek from the beginning of data + * - `RW_SEEK_CUR`: seek relative to current read point + * - `RW_SEEK_END`: seek relative to the end of data + * + * If this stream can not seek, it will return -1. + * + * SDL_RWseek() is actually a wrapper function that calls the SDL_RWops's + * `seek` method appropriately, to simplify application development. + * + * Prior to SDL 2.0.10, this function was a macro. + * + * \param context a pointer to an SDL_RWops structure + * \param offset an offset in bytes, relative to **whence** location; can be + * negative + * \param whence any of `RW_SEEK_SET`, `RW_SEEK_CUR`, `RW_SEEK_END` + * \returns the final offset in the data stream after the seek or -1 on error. + * + * \since This function is available since SDL 2.0.10. + * + * \sa SDL_RWclose + * \sa SDL_RWFromConstMem + * \sa SDL_RWFromFile + * \sa SDL_RWFromFP + * \sa SDL_RWFromMem + * \sa SDL_RWread + * \sa SDL_RWtell + * \sa SDL_RWwrite */ extern DECLSPEC Sint64 SDLCALL SDL_RWseek(SDL_RWops *context, Sint64 offset, int whence); /** - * Return the current offset in the data stream, or -1 on error. + * Determine the current read/write offset in an SDL_RWops data stream. + * + * SDL_RWtell is actually a wrapper function that calls the SDL_RWops's `seek` + * method, with an offset of 0 bytes from `RW_SEEK_CUR`, to simplify + * application development. + * + * Prior to SDL 2.0.10, this function was a macro. + * + * \param context a SDL_RWops data stream object from which to get the current + * offset + * \returns the current offset in the stream, or -1 if the information can not + * be determined. + * + * \since This function is available since SDL 2.0.10. + * + * \sa SDL_RWclose + * \sa SDL_RWFromConstMem + * \sa SDL_RWFromFile + * \sa SDL_RWFromFP + * \sa SDL_RWFromMem + * \sa SDL_RWread + * \sa SDL_RWseek + * \sa SDL_RWwrite */ extern DECLSPEC Sint64 SDLCALL SDL_RWtell(SDL_RWops *context); /** - * Read up to \c maxnum objects each of size \c size from the data - * stream to the area pointed at by \c ptr. + * Read from a data source. * - * \return the number of objects read, or 0 at error or end of file. + * This function reads up to `maxnum` objects each of size `size` from the + * data source to the area pointed at by `ptr`. This function may read less + * objects than requested. It will return zero when there has been an error or + * the data stream is completely read. + * + * SDL_RWread() is actually a function wrapper that calls the SDL_RWops's + * `read` method appropriately, to simplify application development. + * + * Prior to SDL 2.0.10, this function was a macro. + * + * \param context a pointer to an SDL_RWops structure + * \param ptr a pointer to a buffer to read data into + * \param size the size of each object to read, in bytes + * \param maxnum the maximum number of objects to be read + * \returns the number of objects read, or 0 at error or end of file; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.10. + * + * \sa SDL_RWclose + * \sa SDL_RWFromConstMem + * \sa SDL_RWFromFile + * \sa SDL_RWFromFP + * \sa SDL_RWFromMem + * \sa SDL_RWseek + * \sa SDL_RWwrite */ extern DECLSPEC size_t SDLCALL SDL_RWread(SDL_RWops *context, - void *ptr, size_t size, size_t maxnum); + void *ptr, size_t size, + size_t maxnum); /** - * Write exactly \c num objects each of size \c size from the area - * pointed at by \c ptr to data stream. + * Write to an SDL_RWops data stream. * - * \return the number of objects written, or 0 at error or end of file. + * This function writes exactly `num` objects each of size `size` from the + * area pointed at by `ptr` to the stream. If this fails for any reason, it'll + * return less than `num` to demonstrate how far the write progressed. On + * success, it returns `num`. + * + * SDL_RWwrite is actually a function wrapper that calls the SDL_RWops's + * `write` method appropriately, to simplify application development. + * + * Prior to SDL 2.0.10, this function was a macro. + * + * \param context a pointer to an SDL_RWops structure + * \param ptr a pointer to a buffer containing data to write + * \param size the size of an object to write, in bytes + * \param num the number of objects to write + * \returns the number of objects written, which will be less than **num** on + * error; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.10. + * + * \sa SDL_RWclose + * \sa SDL_RWFromConstMem + * \sa SDL_RWFromFile + * \sa SDL_RWFromFP + * \sa SDL_RWFromMem + * \sa SDL_RWread + * \sa SDL_RWseek */ extern DECLSPEC size_t SDLCALL SDL_RWwrite(SDL_RWops *context, - const void *ptr, size_t size, size_t num); + const void *ptr, size_t size, + size_t num); /** - * Close and free an allocated SDL_RWops structure. + * Close and free an allocated SDL_RWops structure. * - * \return 0 if successful or -1 on write error when flushing data. + * SDL_RWclose() closes and cleans up the SDL_RWops stream. It releases any + * resources used by the stream and frees the SDL_RWops itself with + * SDL_FreeRW(). This returns 0 on success, or -1 if the stream failed to + * flush to its output (e.g. to disk). + * + * Note that if this fails to flush the stream to disk, this function reports + * an error, but the SDL_RWops is still invalid once this function returns. + * + * Prior to SDL 2.0.10, this function was a macro. + * + * \param context SDL_RWops structure to close + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.10. + * + * \sa SDL_RWFromConstMem + * \sa SDL_RWFromFile + * \sa SDL_RWFromFP + * \sa SDL_RWFromMem + * \sa SDL_RWread + * \sa SDL_RWseek + * \sa SDL_RWwrite */ extern DECLSPEC int SDLCALL SDL_RWclose(SDL_RWops *context); /** - * Load all the data from an SDL data stream. + * Load all the data from an SDL data stream. * - * The data is allocated with a zero byte at the end (null terminated) + * The data is allocated with a zero byte at the end (null terminated) for + * convenience. This extra byte is not included in the value reported via + * `datasize`. * - * If \c datasize is not NULL, it is filled with the size of the data read. + * The data should be freed with SDL_free(). * - * If \c freesrc is non-zero, the stream will be closed after being read. + * \param src the SDL_RWops to read all available data from + * \param datasize if not NULL, will store the number of bytes read + * \param freesrc if non-zero, calls SDL_RWclose() on `src` before returning + * \returns the data, or NULL if there was an error. * - * The data should be freed with SDL_free(). - * - * \return the data, or NULL if there was an error. + * \since This function is available since SDL 2.0.6. */ -extern DECLSPEC void *SDLCALL SDL_LoadFile_RW(SDL_RWops * src, size_t *datasize, - int freesrc); +extern DECLSPEC void *SDLCALL SDL_LoadFile_RW(SDL_RWops *src, + size_t *datasize, + int freesrc); /** - * Load an entire file. + * Load all the data from a file path. * - * The data is allocated with a zero byte at the end (null terminated) + * The data is allocated with a zero byte at the end (null terminated) for + * convenience. This extra byte is not included in the value reported via + * `datasize`. * - * If \c datasize is not NULL, it is filled with the size of the data read. + * The data should be freed with SDL_free(). * - * If \c freesrc is non-zero, the stream will be closed after being read. + * Prior to SDL 2.0.10, this function was a macro wrapping around + * SDL_LoadFile_RW. * - * The data should be freed with SDL_free(). + * \param file the path to read all available data from + * \param datasize if not NULL, will store the number of bytes read + * \returns the data, or NULL if there was an error. * - * \return the data, or NULL if there was an error. + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC void *SDLCALL SDL_LoadFile(const char *file, size_t *datasize); @@ -256,12 +606,114 @@ extern DECLSPEC void *SDLCALL SDL_LoadFile(const char *file, size_t *datasize); * Read an item of the specified endianness and return in native format. */ /* @{ */ + +/** + * Use this function to read a byte from an SDL_RWops. + * + * \param src the SDL_RWops to read from + * \returns the read byte on success or 0 on failure; call SDL_GetError() for + * more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_WriteU8 + */ extern DECLSPEC Uint8 SDLCALL SDL_ReadU8(SDL_RWops * src); + +/** + * Use this function to read 16 bits of little-endian data from an SDL_RWops + * and return in native format. + * + * SDL byteswaps the data only if necessary, so the data returned will be in + * the native byte order. + * + * \param src the stream from which to read data + * \returns 16 bits of data in the native byte order of the platform. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ReadBE16 + */ extern DECLSPEC Uint16 SDLCALL SDL_ReadLE16(SDL_RWops * src); + +/** + * Use this function to read 16 bits of big-endian data from an SDL_RWops and + * return in native format. + * + * SDL byteswaps the data only if necessary, so the data returned will be in + * the native byte order. + * + * \param src the stream from which to read data + * \returns 16 bits of data in the native byte order of the platform. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ReadLE16 + */ extern DECLSPEC Uint16 SDLCALL SDL_ReadBE16(SDL_RWops * src); + +/** + * Use this function to read 32 bits of little-endian data from an SDL_RWops + * and return in native format. + * + * SDL byteswaps the data only if necessary, so the data returned will be in + * the native byte order. + * + * \param src the stream from which to read data + * \returns 32 bits of data in the native byte order of the platform. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ReadBE32 + */ extern DECLSPEC Uint32 SDLCALL SDL_ReadLE32(SDL_RWops * src); + +/** + * Use this function to read 32 bits of big-endian data from an SDL_RWops and + * return in native format. + * + * SDL byteswaps the data only if necessary, so the data returned will be in + * the native byte order. + * + * \param src the stream from which to read data + * \returns 32 bits of data in the native byte order of the platform. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ReadLE32 + */ extern DECLSPEC Uint32 SDLCALL SDL_ReadBE32(SDL_RWops * src); + +/** + * Use this function to read 64 bits of little-endian data from an SDL_RWops + * and return in native format. + * + * SDL byteswaps the data only if necessary, so the data returned will be in + * the native byte order. + * + * \param src the stream from which to read data + * \returns 64 bits of data in the native byte order of the platform. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ReadBE64 + */ extern DECLSPEC Uint64 SDLCALL SDL_ReadLE64(SDL_RWops * src); + +/** + * Use this function to read 64 bits of big-endian data from an SDL_RWops and + * return in native format. + * + * SDL byteswaps the data only if necessary, so the data returned will be in + * the native byte order. + * + * \param src the stream from which to read data + * \returns 64 bits of data in the native byte order of the platform. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ReadLE64 + */ extern DECLSPEC Uint64 SDLCALL SDL_ReadBE64(SDL_RWops * src); /* @} *//* Read endian functions */ @@ -271,12 +723,124 @@ extern DECLSPEC Uint64 SDLCALL SDL_ReadBE64(SDL_RWops * src); * Write an item of native format to the specified endianness. */ /* @{ */ + +/** + * Use this function to write a byte to an SDL_RWops. + * + * \param dst the SDL_RWops to write to + * \param value the byte value to write + * \returns 1 on success or 0 on failure; call SDL_GetError() for more + * information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ReadU8 + */ extern DECLSPEC size_t SDLCALL SDL_WriteU8(SDL_RWops * dst, Uint8 value); + +/** + * Use this function to write 16 bits in native format to a SDL_RWops as + * little-endian data. + * + * SDL byteswaps the data only if necessary, so the application always + * specifies native format, and the data written will be in little-endian + * format. + * + * \param dst the stream to which data will be written + * \param value the data to be written, in native format + * \returns 1 on successful write, 0 on error. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_WriteBE16 + */ extern DECLSPEC size_t SDLCALL SDL_WriteLE16(SDL_RWops * dst, Uint16 value); + +/** + * Use this function to write 16 bits in native format to a SDL_RWops as + * big-endian data. + * + * SDL byteswaps the data only if necessary, so the application always + * specifies native format, and the data written will be in big-endian format. + * + * \param dst the stream to which data will be written + * \param value the data to be written, in native format + * \returns 1 on successful write, 0 on error. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_WriteLE16 + */ extern DECLSPEC size_t SDLCALL SDL_WriteBE16(SDL_RWops * dst, Uint16 value); + +/** + * Use this function to write 32 bits in native format to a SDL_RWops as + * little-endian data. + * + * SDL byteswaps the data only if necessary, so the application always + * specifies native format, and the data written will be in little-endian + * format. + * + * \param dst the stream to which data will be written + * \param value the data to be written, in native format + * \returns 1 on successful write, 0 on error. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_WriteBE32 + */ extern DECLSPEC size_t SDLCALL SDL_WriteLE32(SDL_RWops * dst, Uint32 value); + +/** + * Use this function to write 32 bits in native format to a SDL_RWops as + * big-endian data. + * + * SDL byteswaps the data only if necessary, so the application always + * specifies native format, and the data written will be in big-endian format. + * + * \param dst the stream to which data will be written + * \param value the data to be written, in native format + * \returns 1 on successful write, 0 on error. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_WriteLE32 + */ extern DECLSPEC size_t SDLCALL SDL_WriteBE32(SDL_RWops * dst, Uint32 value); + +/** + * Use this function to write 64 bits in native format to a SDL_RWops as + * little-endian data. + * + * SDL byteswaps the data only if necessary, so the application always + * specifies native format, and the data written will be in little-endian + * format. + * + * \param dst the stream to which data will be written + * \param value the data to be written, in native format + * \returns 1 on successful write, 0 on error. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_WriteBE64 + */ extern DECLSPEC size_t SDLCALL SDL_WriteLE64(SDL_RWops * dst, Uint64 value); + +/** + * Use this function to write 64 bits in native format to a SDL_RWops as + * big-endian data. + * + * SDL byteswaps the data only if necessary, so the application always + * specifies native format, and the data written will be in big-endian format. + * + * \param dst the stream to which data will be written + * \param value the data to be written, in native format + * \returns 1 on successful write, 0 on error. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_WriteLE64 + */ extern DECLSPEC size_t SDLCALL SDL_WriteBE64(SDL_RWops * dst, Uint64 value); /* @} *//* Write endian functions */ diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_scancode.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_scancode.h index a50305f55..5b2c67c8f 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_scancode.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_scancode.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_sensor.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_sensor.h index 966adbf21..a2f30e0f8 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_sensor.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_sensor.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -78,14 +78,16 @@ typedef enum * Accelerometer sensor * * The accelerometer returns the current acceleration in SI meters per - * second squared. This includes gravity, so a device at rest will have - * an acceleration of SDL_STANDARD_GRAVITY straight down. + * second squared. This measurement includes the force of gravity, so + * a device at rest will have an value of SDL_STANDARD_GRAVITY away + * from the center of the earth. * * values[0]: Acceleration on the x axis * values[1]: Acceleration on the y axis * values[2]: Acceleration on the z axis * - * For phones held in portrait mode, the axes are defined as follows: + * For phones held in portrait mode and game controllers held in front of you, + * the axes are defined as follows: * -X ... +X : left ... right * -Y ... +Y : bottom ... top * -Z ... +Z : farther ... closer @@ -105,16 +107,17 @@ typedef enum * see positive rotation on that axis when it appeared to be rotating * counter-clockwise. * - * values[0]: Angular speed around the x axis - * values[1]: Angular speed around the y axis - * values[2]: Angular speed around the z axis + * values[0]: Angular speed around the x axis (pitch) + * values[1]: Angular speed around the y axis (yaw) + * values[2]: Angular speed around the z axis (roll) * - * For phones held in portrait mode, the axes are defined as follows: + * For phones held in portrait mode and game controllers held in front of you, + * the axes are defined as follows: * -X ... +X : left ... right * -Y ... +Y : bottom ... top * -Z ... +Z : farther ... closer * - * The axis data is not changed when the phone is rotated. + * The axis data is not changed when the phone or controller is rotated. * * \sa SDL_GetDisplayOrientation() */ @@ -122,118 +125,165 @@ typedef enum /* Function prototypes */ /** - * \brief Count the number of sensors attached to the system right now + * Locking for multi-threaded access to the sensor API + * + * If you are using the sensor API or handling events from multiple threads + * you should use these locking functions to protect access to the sensors. + * + * In particular, you are guaranteed that the sensor list won't change, so the + * API functions that take a sensor index will be valid, and sensor events + * will not be delivered. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC void SDLCALL SDL_LockSensors(void); +extern DECLSPEC void SDLCALL SDL_UnlockSensors(void); + +/** + * Count the number of sensors attached to the system right now. + * + * \returns the number of sensors detected. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC int SDLCALL SDL_NumSensors(void); /** - * \brief Get the implementation dependent name of a sensor. + * Get the implementation dependent name of a sensor. * - * This can be called before any sensors are opened. - * - * \return The sensor name, or NULL if device_index is out of range. + * \param device_index The sensor to obtain name from + * \returns the sensor name, or NULL if `device_index` is out of range. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC const char *SDLCALL SDL_SensorGetDeviceName(int device_index); /** - * \brief Get the type of a sensor. + * Get the type of a sensor. * - * This can be called before any sensors are opened. + * \param device_index The sensor to get the type from + * \returns the SDL_SensorType, or `SDL_SENSOR_INVALID` if `device_index` is + * out of range. * - * \return The sensor type, or SDL_SENSOR_INVALID if device_index is out of range. + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC SDL_SensorType SDLCALL SDL_SensorGetDeviceType(int device_index); /** - * \brief Get the platform dependent type of a sensor. + * Get the platform dependent type of a sensor. * - * This can be called before any sensors are opened. + * \param device_index The sensor to check + * \returns the sensor platform dependent type, or -1 if `device_index` is out + * of range. * - * \return The sensor platform dependent type, or -1 if device_index is out of range. + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC int SDLCALL SDL_SensorGetDeviceNonPortableType(int device_index); /** - * \brief Get the instance ID of a sensor. + * Get the instance ID of a sensor. * - * This can be called before any sensors are opened. + * \param device_index The sensor to get instance id from + * \returns the sensor instance ID, or -1 if `device_index` is out of range. * - * \return The sensor instance ID, or -1 if device_index is out of range. + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC SDL_SensorID SDLCALL SDL_SensorGetDeviceInstanceID(int device_index); /** - * \brief Open a sensor for use. + * Open a sensor for use. * - * The index passed as an argument refers to the N'th sensor on the system. + * \param device_index The sensor to open + * \returns an SDL_Sensor sensor object, or NULL if an error occurred. * - * \return A sensor identifier, or NULL if an error occurred. + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC SDL_Sensor *SDLCALL SDL_SensorOpen(int device_index); /** * Return the SDL_Sensor associated with an instance id. + * + * \param instance_id The sensor from instance id + * \returns an SDL_Sensor object. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC SDL_Sensor *SDLCALL SDL_SensorFromInstanceID(SDL_SensorID instance_id); /** - * \brief Get the implementation dependent name of a sensor. + * Get the implementation dependent name of a sensor * - * \return The sensor name, or NULL if the sensor is NULL. + * \param sensor The SDL_Sensor object + * \returns the sensor name, or NULL if `sensor` is NULL. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC const char *SDLCALL SDL_SensorGetName(SDL_Sensor *sensor); /** - * \brief Get the type of a sensor. + * Get the type of a sensor. * - * This can be called before any sensors are opened. + * \param sensor The SDL_Sensor object to inspect + * \returns the SDL_SensorType type, or `SDL_SENSOR_INVALID` if `sensor` is + * NULL. * - * \return The sensor type, or SDL_SENSOR_INVALID if the sensor is NULL. + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC SDL_SensorType SDLCALL SDL_SensorGetType(SDL_Sensor *sensor); /** - * \brief Get the platform dependent type of a sensor. + * Get the platform dependent type of a sensor. * - * This can be called before any sensors are opened. + * \param sensor The SDL_Sensor object to inspect + * \returns the sensor platform dependent type, or -1 if `sensor` is NULL. * - * \return The sensor platform dependent type, or -1 if the sensor is NULL. + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC int SDLCALL SDL_SensorGetNonPortableType(SDL_Sensor *sensor); /** - * \brief Get the instance ID of a sensor. + * Get the instance ID of a sensor. * - * This can be called before any sensors are opened. + * \param sensor The SDL_Sensor object to inspect + * \returns the sensor instance ID, or -1 if `sensor` is NULL. * - * \return The sensor instance ID, or -1 if the sensor is NULL. + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC SDL_SensorID SDLCALL SDL_SensorGetInstanceID(SDL_Sensor *sensor); /** - * Get the current state of an opened sensor. + * Get the current state of an opened sensor. * - * The number of values and interpretation of the data is sensor dependent. + * The number of values and interpretation of the data is sensor dependent. * - * \param sensor The sensor to query - * \param data A pointer filled with the current sensor state - * \param num_values The number of values to write to data + * \param sensor The SDL_Sensor object to query + * \param data A pointer filled with the current sensor state + * \param num_values The number of values to write to data + * \returns 0 or -1 if an error occurred. * - * \return 0 or -1 if an error occurred. + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC int SDLCALL SDL_SensorGetData(SDL_Sensor * sensor, float *data, int num_values); /** - * Close a sensor previously opened with SDL_SensorOpen() + * Close a sensor previously opened with SDL_SensorOpen(). + * + * \param sensor The SDL_Sensor object to close + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC void SDLCALL SDL_SensorClose(SDL_Sensor * sensor); /** - * Update the current state of the open sensors. + * Update the current state of the open sensors. * - * This is called automatically by the event loop if sensor events are enabled. + * This is called automatically by the event loop if sensor events are + * enabled. * - * This needs to be called from the thread that initialized the sensor subsystem. + * This needs to be called from the thread that initialized the sensor + * subsystem. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC void SDLCALL SDL_SensorUpdate(void); diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_shape.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_shape.h index 2ab43fcdc..1bca9270e 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_shape.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_shape.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -44,33 +44,38 @@ extern "C" { #define SDL_WINDOW_LACKS_SHAPE -3 /** - * \brief Create a window that can be shaped with the specified position, dimensions, and flags. + * Create a window that can be shaped with the specified position, dimensions, + * and flags. * - * \param title The title of the window, in UTF-8 encoding. - * \param x The x position of the window, ::SDL_WINDOWPOS_CENTERED, or - * ::SDL_WINDOWPOS_UNDEFINED. - * \param y The y position of the window, ::SDL_WINDOWPOS_CENTERED, or - * ::SDL_WINDOWPOS_UNDEFINED. - * \param w The width of the window. - * \param h The height of the window. - * \param flags The flags for the window, a mask of SDL_WINDOW_BORDERLESS with any of the following: - * ::SDL_WINDOW_OPENGL, ::SDL_WINDOW_INPUT_GRABBED, - * ::SDL_WINDOW_HIDDEN, ::SDL_WINDOW_RESIZABLE, - * ::SDL_WINDOW_MAXIMIZED, ::SDL_WINDOW_MINIMIZED, - * ::SDL_WINDOW_BORDERLESS is always set, and ::SDL_WINDOW_FULLSCREEN is always unset. + * \param title The title of the window, in UTF-8 encoding. + * \param x The x position of the window, ::SDL_WINDOWPOS_CENTERED, or + * ::SDL_WINDOWPOS_UNDEFINED. + * \param y The y position of the window, ::SDL_WINDOWPOS_CENTERED, or + * ::SDL_WINDOWPOS_UNDEFINED. + * \param w The width of the window. + * \param h The height of the window. + * \param flags The flags for the window, a mask of SDL_WINDOW_BORDERLESS with + * any of the following: ::SDL_WINDOW_OPENGL, + * ::SDL_WINDOW_INPUT_GRABBED, ::SDL_WINDOW_HIDDEN, + * ::SDL_WINDOW_RESIZABLE, ::SDL_WINDOW_MAXIMIZED, + * ::SDL_WINDOW_MINIMIZED, ::SDL_WINDOW_BORDERLESS is always set, + * and ::SDL_WINDOW_FULLSCREEN is always unset. + * \return the window created, or NULL if window creation failed. * - * \return The window created, or NULL if window creation failed. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_DestroyWindow() + * \sa SDL_DestroyWindow */ extern DECLSPEC SDL_Window * SDLCALL SDL_CreateShapedWindow(const char *title,unsigned int x,unsigned int y,unsigned int w,unsigned int h,Uint32 flags); /** - * \brief Return whether the given window is a shaped window. + * Return whether the given window is a shaped window. * * \param window The window to query for being shaped. + * \return SDL_TRUE if the window is a window that can be shaped, SDL_FALSE if + * the window is unshaped or NULL. * - * \return SDL_TRUE if the window is a window that can be shaped, SDL_FALSE if the window is unshaped or NULL. + * \since This function is available since SDL 2.0.0. * * \sa SDL_CreateShapedWindow */ @@ -106,29 +111,35 @@ typedef struct SDL_WindowShapeMode { } SDL_WindowShapeMode; /** - * \brief Set the shape and parameters of a shaped window. + * Set the shape and parameters of a shaped window. * * \param window The shaped window whose parameters should be set. * \param shape A surface encoding the desired shape for the window. * \param shape_mode The parameters to set for the shaped window. + * \return 0 on success, SDL_INVALID_SHAPE_ARGUMENT on an invalid shape + * argument, or SDL_NONSHAPEABLE_WINDOW if the SDL_Window given does + * not reference a valid shaped window. * - * \return 0 on success, SDL_INVALID_SHAPE_ARGUMENT on an invalid shape argument, or SDL_NONSHAPEABLE_WINDOW - * if the SDL_Window given does not reference a valid shaped window. + * \since This function is available since SDL 2.0.0. * * \sa SDL_WindowShapeMode - * \sa SDL_GetShapedWindowMode. + * \sa SDL_GetShapedWindowMode */ extern DECLSPEC int SDLCALL SDL_SetWindowShape(SDL_Window *window,SDL_Surface *shape,SDL_WindowShapeMode *shape_mode); /** - * \brief Get the shape parameters of a shaped window. + * Get the shape parameters of a shaped window. * * \param window The shaped window whose parameters should be retrieved. - * \param shape_mode An empty shape-mode structure to fill, or NULL to check whether the window has a shape. + * \param shape_mode An empty shape-mode structure to fill, or NULL to check + * whether the window has a shape. + * \return 0 if the window has a shape and, provided shape_mode was not NULL, + * shape_mode has been filled with the mode data, + * SDL_NONSHAPEABLE_WINDOW if the SDL_Window given is not a shaped + * window, or SDL_WINDOW_LACKS_SHAPE if the SDL_Window given is a + * shapeable window currently lacking a shape. * - * \return 0 if the window has a shape and, provided shape_mode was not NULL, shape_mode has been filled with the mode - * data, SDL_NONSHAPEABLE_WINDOW if the SDL_Window given is not a shaped window, or SDL_WINDOW_LACKS_SHAPE if - * the SDL_Window given is a shapeable window currently lacking a shape. + * \since This function is available since SDL 2.0.0. * * \sa SDL_WindowShapeMode * \sa SDL_SetWindowShape diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_stdinc.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_stdinc.h index 28bb7b961..c0d194c4a 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_stdinc.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_stdinc.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -30,6 +30,12 @@ #include "SDL_config.h" +#ifdef __APPLE__ +#ifndef _DARWIN_C_SOURCE +#define _DARWIN_C_SOURCE 1 /* for memset_pattern4() */ +#endif +#endif + #ifdef HAVE_SYS_TYPES_H #include #endif @@ -109,6 +115,17 @@ char *alloca(); # endif #endif +/** + * Check if the compiler supports a given builtin. + * Supported by virtually all clang versions and recent gcc. Use this + * instead of checking the clang version if possible. + */ +#ifdef __has_builtin +#define _SDL_HAS_BUILTIN(x) __has_builtin(x) +#else +#define _SDL_HAS_BUILTIN(x) 0 +#endif + /** * The number of elements in an array. */ @@ -217,7 +234,7 @@ typedef uint64_t Uint64; /* @} *//* Basic data types */ -/* Make sure we have macros for printing 64 bit values. +/* Make sure we have macros for printing width-based integers. * should define these but this is not true all platforms. * (for example win32) */ #ifndef SDL_PRIs64 @@ -264,6 +281,34 @@ typedef uint64_t Uint64; #define SDL_PRIX64 "llX" #endif #endif +#ifndef SDL_PRIs32 +#ifdef PRId32 +#define SDL_PRIs32 PRId32 +#else +#define SDL_PRIs32 "d" +#endif +#endif +#ifndef SDL_PRIu32 +#ifdef PRIu32 +#define SDL_PRIu32 PRIu32 +#else +#define SDL_PRIu32 "u" +#endif +#endif +#ifndef SDL_PRIx32 +#ifdef PRIx32 +#define SDL_PRIx32 PRIx32 +#else +#define SDL_PRIx32 "x" +#endif +#endif +#ifndef SDL_PRIX32 +#ifdef PRIX32 +#define SDL_PRIX32 PRIX32 +#else +#define SDL_PRIX32 "X" +#endif +#endif /* Annotations to help code analysis tools */ #ifdef SDL_DISABLE_ANALYZE_MACROS @@ -332,7 +377,7 @@ SDL_COMPILE_TIME_ASSERT(sint64, sizeof(Sint64) == 8); /** \cond */ #ifndef DOXYGEN_SHOULD_IGNORE_THIS -#if !defined(__ANDROID__) +#if !defined(__ANDROID__) && !defined(__VITA__) /* TODO: include/SDL_stdinc.h:174: error: size of array 'SDL_dummy_enum' is negative */ typedef enum { @@ -369,7 +414,9 @@ typedef void *(SDLCALL *SDL_realloc_func)(void *mem, size_t size); typedef void (SDLCALL *SDL_free_func)(void *mem); /** - * \brief Get the current set of SDL memory functions + * Get the current set of SDL memory functions + * + * \since This function is available since SDL 2.0.7. */ extern DECLSPEC void SDLCALL SDL_GetMemoryFunctions(SDL_malloc_func *malloc_func, SDL_calloc_func *calloc_func, @@ -377,12 +424,9 @@ extern DECLSPEC void SDLCALL SDL_GetMemoryFunctions(SDL_malloc_func *malloc_func SDL_free_func *free_func); /** - * \brief Replace SDL's memory allocation functions with a custom set + * Replace SDL's memory allocation functions with a custom set * - * \note If you are replacing SDL's memory functions, you should call - * SDL_GetNumAllocations() and be very careful if it returns non-zero. - * That means that your free function will be called with memory - * allocated by the previous memory allocation functions. + * \since This function is available since SDL 2.0.7. */ extern DECLSPEC int SDLCALL SDL_SetMemoryFunctions(SDL_malloc_func malloc_func, SDL_calloc_func calloc_func, @@ -390,7 +434,9 @@ extern DECLSPEC int SDLCALL SDL_SetMemoryFunctions(SDL_malloc_func malloc_func, SDL_free_func free_func); /** - * \brief Get the number of outstanding (unfreed) allocations + * Get the number of outstanding (unfreed) allocations + * + * \since This function is available since SDL 2.0.7. */ extern DECLSPEC int SDLCALL SDL_GetNumAllocations(void); @@ -401,25 +447,40 @@ extern DECLSPEC void SDLCALL SDL_qsort(void *base, size_t nmemb, size_t size, in extern DECLSPEC int SDLCALL SDL_abs(int x); -/* !!! FIXME: these have side effects. You probably shouldn't use them. */ -/* !!! FIXME: Maybe we do forceinline functions of SDL_mini, SDL_minf, etc? */ +/* NOTE: these double-evaluate their arguments, so you should never have side effects in the parameters */ #define SDL_min(x, y) (((x) < (y)) ? (x) : (y)) #define SDL_max(x, y) (((x) > (y)) ? (x) : (y)) +#define SDL_clamp(x, a, b) (((x) < (a)) ? (a) : (((x) > (b)) ? (b) : (x))) +extern DECLSPEC int SDLCALL SDL_isalpha(int x); +extern DECLSPEC int SDLCALL SDL_isalnum(int x); +extern DECLSPEC int SDLCALL SDL_isblank(int x); +extern DECLSPEC int SDLCALL SDL_iscntrl(int x); extern DECLSPEC int SDLCALL SDL_isdigit(int x); +extern DECLSPEC int SDLCALL SDL_isxdigit(int x); +extern DECLSPEC int SDLCALL SDL_ispunct(int x); extern DECLSPEC int SDLCALL SDL_isspace(int x); +extern DECLSPEC int SDLCALL SDL_isupper(int x); +extern DECLSPEC int SDLCALL SDL_islower(int x); +extern DECLSPEC int SDLCALL SDL_isprint(int x); +extern DECLSPEC int SDLCALL SDL_isgraph(int x); extern DECLSPEC int SDLCALL SDL_toupper(int x); extern DECLSPEC int SDLCALL SDL_tolower(int x); +extern DECLSPEC Uint32 SDLCALL SDL_crc32(Uint32 crc, const void *data, size_t len); + extern DECLSPEC void *SDLCALL SDL_memset(SDL_OUT_BYTECAP(len) void *dst, int c, size_t len); #define SDL_zero(x) SDL_memset(&(x), 0, sizeof((x))) #define SDL_zerop(x) SDL_memset((x), 0, sizeof(*(x))) +#define SDL_zeroa(x) SDL_memset((x), 0, sizeof((x))) /* Note that memset() is a byte assignment and this is a 32-bit assignment, so they're not directly equivalent. */ SDL_FORCE_INLINE void SDL_memset4(void *dst, Uint32 val, size_t dwords) { -#if defined(__GNUC__) && defined(i386) +#ifdef __APPLE__ + memset_pattern4(dst, &val, dwords * 4); +#elif defined(__GNUC__) && defined(__i386__) int u0, u1, u2; __asm__ __volatile__ ( "cld \n\t" @@ -432,14 +493,14 @@ SDL_FORCE_INLINE void SDL_memset4(void *dst, Uint32 val, size_t dwords) size_t _n = (dwords + 3) / 4; Uint32 *_p = SDL_static_cast(Uint32 *, dst); Uint32 _val = (val); - if (dwords == 0) + if (dwords == 0) { return; - switch (dwords % 4) - { - case 0: do { *_p++ = _val; /* fallthrough */ - case 3: *_p++ = _val; /* fallthrough */ - case 2: *_p++ = _val; /* fallthrough */ - case 1: *_p++ = _val; /* fallthrough */ + } + switch (dwords % 4) { + case 0: do { *_p++ = _val; SDL_FALLTHROUGH; + case 3: *_p++ = _val; SDL_FALLTHROUGH; + case 2: *_p++ = _val; SDL_FALLTHROUGH; + case 1: *_p++ = _val; } while ( --_n ); } #endif @@ -450,11 +511,16 @@ extern DECLSPEC void *SDLCALL SDL_memcpy(SDL_OUT_BYTECAP(len) void *dst, SDL_IN_ extern DECLSPEC void *SDLCALL SDL_memmove(SDL_OUT_BYTECAP(len) void *dst, SDL_IN_BYTECAP(len) const void *src, size_t len); extern DECLSPEC int SDLCALL SDL_memcmp(const void *s1, const void *s2, size_t len); -extern DECLSPEC wchar_t *SDLCALL SDL_wcsdup(const wchar_t *wstr); extern DECLSPEC size_t SDLCALL SDL_wcslen(const wchar_t *wstr); extern DECLSPEC size_t SDLCALL SDL_wcslcpy(SDL_OUT_Z_CAP(maxlen) wchar_t *dst, const wchar_t *src, size_t maxlen); extern DECLSPEC size_t SDLCALL SDL_wcslcat(SDL_INOUT_Z_CAP(maxlen) wchar_t *dst, const wchar_t *src, size_t maxlen); +extern DECLSPEC wchar_t *SDLCALL SDL_wcsdup(const wchar_t *wstr); +extern DECLSPEC wchar_t *SDLCALL SDL_wcsstr(const wchar_t *haystack, const wchar_t *needle); + extern DECLSPEC int SDLCALL SDL_wcscmp(const wchar_t *str1, const wchar_t *str2); +extern DECLSPEC int SDLCALL SDL_wcsncmp(const wchar_t *str1, const wchar_t *str2, size_t maxlen); +extern DECLSPEC int SDLCALL SDL_wcscasecmp(const wchar_t *str1, const wchar_t *str2); +extern DECLSPEC int SDLCALL SDL_wcsncasecmp(const wchar_t *str1, const wchar_t *str2, size_t len); extern DECLSPEC size_t SDLCALL SDL_strlen(const char *str); extern DECLSPEC size_t SDLCALL SDL_strlcpy(SDL_OUT_Z_CAP(maxlen) char *dst, const char *src, size_t maxlen); @@ -467,6 +533,7 @@ extern DECLSPEC char *SDLCALL SDL_strlwr(char *str); extern DECLSPEC char *SDLCALL SDL_strchr(const char *str, int c); extern DECLSPEC char *SDLCALL SDL_strrchr(const char *str, int c); extern DECLSPEC char *SDLCALL SDL_strstr(const char *haystack, const char *needle); +extern DECLSPEC char *SDLCALL SDL_strtokr(char *s1, const char *s2, char **saveptr); extern DECLSPEC size_t SDLCALL SDL_utf8strlen(const char *str); extern DECLSPEC char *SDLCALL SDL_itoa(int value, char *str, int radix); @@ -493,6 +560,8 @@ extern DECLSPEC int SDLCALL SDL_sscanf(const char *text, SDL_SCANF_FORMAT_STRING extern DECLSPEC int SDLCALL SDL_vsscanf(const char *text, const char *fmt, va_list ap); extern DECLSPEC int SDLCALL SDL_snprintf(SDL_OUT_Z_CAP(maxlen) char *text, size_t maxlen, SDL_PRINTF_FORMAT_STRING const char *fmt, ... ) SDL_PRINTF_VARARG_FUNC(3); extern DECLSPEC int SDLCALL SDL_vsnprintf(SDL_OUT_Z_CAP(maxlen) char *text, size_t maxlen, const char *fmt, va_list ap); +extern DECLSPEC int SDLCALL SDL_asprintf(char **strp, SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(2); +extern DECLSPEC int SDLCALL SDL_vasprintf(char **strp, const char *fmt, va_list ap); #ifndef HAVE_M_PI #ifndef M_PI @@ -500,14 +569,28 @@ extern DECLSPEC int SDLCALL SDL_vsnprintf(SDL_OUT_Z_CAP(maxlen) char *text, size #endif #endif +/** + * Use this function to compute arc cosine of `x`. + * + * The definition of `y = acos(x)` is `x = cos(y)`. + * + * Domain: `-1 <= x <= 1` + * + * Range: `0 <= y <= Pi` + * + * \param x floating point value, in radians. + * \returns arc cosine of `x`. + * + * \since This function is available since SDL 2.0.2. + */ extern DECLSPEC double SDLCALL SDL_acos(double x); extern DECLSPEC float SDLCALL SDL_acosf(float x); extern DECLSPEC double SDLCALL SDL_asin(double x); extern DECLSPEC float SDLCALL SDL_asinf(float x); extern DECLSPEC double SDLCALL SDL_atan(double x); extern DECLSPEC float SDLCALL SDL_atanf(float x); -extern DECLSPEC double SDLCALL SDL_atan2(double x, double y); -extern DECLSPEC float SDLCALL SDL_atan2f(float x, float y); +extern DECLSPEC double SDLCALL SDL_atan2(double y, double x); +extern DECLSPEC float SDLCALL SDL_atan2f(float y, float x); extern DECLSPEC double SDLCALL SDL_ceil(double x); extern DECLSPEC float SDLCALL SDL_ceilf(float x); extern DECLSPEC double SDLCALL SDL_copysign(double x, double y); @@ -520,6 +603,8 @@ extern DECLSPEC double SDLCALL SDL_fabs(double x); extern DECLSPEC float SDLCALL SDL_fabsf(float x); extern DECLSPEC double SDLCALL SDL_floor(double x); extern DECLSPEC float SDLCALL SDL_floorf(float x); +extern DECLSPEC double SDLCALL SDL_trunc(double x); +extern DECLSPEC float SDLCALL SDL_truncf(float x); extern DECLSPEC double SDLCALL SDL_fmod(double x, double y); extern DECLSPEC float SDLCALL SDL_fmodf(float x, float y); extern DECLSPEC double SDLCALL SDL_log(double x); @@ -528,6 +613,10 @@ extern DECLSPEC double SDLCALL SDL_log10(double x); extern DECLSPEC float SDLCALL SDL_log10f(float x); extern DECLSPEC double SDLCALL SDL_pow(double x, double y); extern DECLSPEC float SDLCALL SDL_powf(float x, float y); +extern DECLSPEC double SDLCALL SDL_round(double x); +extern DECLSPEC float SDLCALL SDL_roundf(float x); +extern DECLSPEC long SDLCALL SDL_lround(double x); +extern DECLSPEC long SDLCALL SDL_lroundf(float x); extern DECLSPEC double SDLCALL SDL_scalbn(double x, int n); extern DECLSPEC float SDLCALL SDL_scalbnf(float x, int n); extern DECLSPEC double SDLCALL SDL_sin(double x); @@ -551,9 +640,12 @@ extern DECLSPEC int SDLCALL SDL_iconv_close(SDL_iconv_t cd); extern DECLSPEC size_t SDLCALL SDL_iconv(SDL_iconv_t cd, const char **inbuf, size_t * inbytesleft, char **outbuf, size_t * outbytesleft); + /** - * This function converts a string between encodings in one pass, returning a - * string that must be freed with SDL_free() or NULL on error. + * This function converts a string between encodings in one pass, returning a + * string that must be freed with SDL_free() or NULL on error. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC char *SDLCALL SDL_iconv_string(const char *tocode, const char *fromcode, @@ -562,10 +654,22 @@ extern DECLSPEC char *SDLCALL SDL_iconv_string(const char *tocode, #define SDL_iconv_utf8_locale(S) SDL_iconv_string("", "UTF-8", S, SDL_strlen(S)+1) #define SDL_iconv_utf8_ucs2(S) (Uint16 *)SDL_iconv_string("UCS-2-INTERNAL", "UTF-8", S, SDL_strlen(S)+1) #define SDL_iconv_utf8_ucs4(S) (Uint32 *)SDL_iconv_string("UCS-4-INTERNAL", "UTF-8", S, SDL_strlen(S)+1) +#define SDL_iconv_wchar_utf8(S) SDL_iconv_string("UTF-8", "WCHAR_T", (char *)S, (SDL_wcslen(S)+1)*sizeof(wchar_t)) /* force builds using Clang's static analysis tools to use literal C runtime here, since there are possibly tests that are ineffective otherwise. */ #if defined(__clang_analyzer__) && !defined(SDL_DISABLE_ANALYZE_MACROS) + +/* The analyzer knows about strlcpy even when the system doesn't provide it */ +#ifndef HAVE_STRLCPY +size_t strlcpy(char* dst, const char* src, size_t size); +#endif + +/* The analyzer knows about strlcat even when the system doesn't provide it */ +#ifndef HAVE_STRLCAT +size_t strlcat(char* dst, const char* src, size_t size); +#endif + #define SDL_malloc malloc #define SDL_calloc calloc #define SDL_realloc realloc @@ -574,15 +678,23 @@ extern DECLSPEC char *SDLCALL SDL_iconv_string(const char *tocode, #define SDL_memcpy memcpy #define SDL_memmove memmove #define SDL_memcmp memcmp -#define SDL_strlen strlen #define SDL_strlcpy strlcpy #define SDL_strlcat strlcat +#define SDL_strlen strlen +#define SDL_wcslen wcslen +#define SDL_wcslcpy wcslcpy +#define SDL_wcslcat wcslcat #define SDL_strdup strdup +#define SDL_wcsdup wcsdup #define SDL_strchr strchr #define SDL_strrchr strrchr #define SDL_strstr strstr +#define SDL_wcsstr wcsstr +#define SDL_strtokr strtok_r #define SDL_strcmp strcmp +#define SDL_wcscmp wcscmp #define SDL_strncmp strncmp +#define SDL_wcsncmp wcsncmp #define SDL_strcasecmp strcasecmp #define SDL_strncasecmp strncasecmp #define SDL_sscanf sscanf diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_surface.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_surface.h index 51a128300..441237617 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_surface.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_surface.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -80,7 +80,9 @@ typedef struct SDL_Surface /** information needed for surfaces requiring locks */ int locked; /**< Read-only */ - void *lock_data; /**< Read-only */ + + /** list of BlitMap that hold a reference to this surface */ + void *list_blitmap; /**< Private */ /** clipping information */ SDL_Rect clip_rect; /**< Read-only */ @@ -110,31 +112,108 @@ typedef enum } SDL_YUV_CONVERSION_MODE; /** - * Allocate and free an RGB surface. + * Allocate a new RGB surface. * - * If the depth is 4 or 8 bits, an empty palette is allocated for the surface. - * If the depth is greater than 8 bits, the pixel format is set using the - * flags '[RGB]mask'. + * If `depth` is 4 or 8 bits, an empty palette is allocated for the surface. + * If `depth` is greater than 8 bits, the pixel format is set using the + * [RGBA]mask parameters. * - * If the function runs out of memory, it will return NULL. + * The [RGBA]mask parameters are the bitmasks used to extract that color from + * a pixel. For instance, `Rmask` being 0xFF000000 means the red data is + * stored in the most significant byte. Using zeros for the RGB masks sets a + * default value, based on the depth. For example: * - * \param flags The \c flags are obsolete and should be set to 0. - * \param width The width in pixels of the surface to create. - * \param height The height in pixels of the surface to create. - * \param depth The depth in bits of the surface to create. - * \param Rmask The red mask of the surface to create. - * \param Gmask The green mask of the surface to create. - * \param Bmask The blue mask of the surface to create. - * \param Amask The alpha mask of the surface to create. + * ```c++ + * SDL_CreateRGBSurface(0,w,h,32,0,0,0,0); + * ``` + * + * However, using zero for the Amask results in an Amask of 0. + * + * By default surfaces with an alpha mask are set up for blending as with: + * + * ```c++ + * SDL_SetSurfaceBlendMode(surface, SDL_BLENDMODE_BLEND) + * ``` + * + * You can change this by calling SDL_SetSurfaceBlendMode() and selecting a + * different `blendMode`. + * + * \param flags the flags are unused and should be set to 0 + * \param width the width of the surface + * \param height the height of the surface + * \param depth the depth of the surface in bits + * \param Rmask the red mask for the pixels + * \param Gmask the green mask for the pixels + * \param Bmask the blue mask for the pixels + * \param Amask the alpha mask for the pixels + * \returns the new SDL_Surface structure that is created or NULL if it fails; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateRGBSurfaceFrom + * \sa SDL_CreateRGBSurfaceWithFormat + * \sa SDL_FreeSurface */ extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurface (Uint32 flags, int width, int height, int depth, Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask); + /* !!! FIXME for 2.1: why does this ask for depth? Format provides that. */ + +/** + * Allocate a new RGB surface with a specific pixel format. + * + * This function operates mostly like SDL_CreateRGBSurface(), except instead + * of providing pixel color masks, you provide it with a predefined format + * from SDL_PixelFormatEnum. + * + * \param flags the flags are unused and should be set to 0 + * \param width the width of the surface + * \param height the height of the surface + * \param depth the depth of the surface in bits + * \param format the SDL_PixelFormatEnum for the new surface's pixel format. + * \returns the new SDL_Surface structure that is created or NULL if it fails; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.5. + * + * \sa SDL_CreateRGBSurface + * \sa SDL_CreateRGBSurfaceFrom + * \sa SDL_FreeSurface + */ extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurfaceWithFormat (Uint32 flags, int width, int height, int depth, Uint32 format); +/** + * Allocate a new RGB surface with existing pixel data. + * + * This function operates mostly like SDL_CreateRGBSurface(), except it does + * not allocate memory for the pixel data, instead the caller provides an + * existing buffer of data for the surface to use. + * + * No copy is made of the pixel data. Pixel data is not managed automatically; + * you must free the surface before you free the pixel data. + * + * \param pixels a pointer to existing pixel data + * \param width the width of the surface + * \param height the height of the surface + * \param depth the depth of the surface in bits + * \param pitch the pitch of the surface in bytes + * \param Rmask the red mask for the pixels + * \param Gmask the green mask for the pixels + * \param Bmask the blue mask for the pixels + * \param Amask the alpha mask for the pixels + * \returns the new SDL_Surface structure that is created or NULL if it fails; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateRGBSurface + * \sa SDL_CreateRGBSurfaceWithFormat + * \sa SDL_FreeSurface + */ extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurfaceFrom(void *pixels, int width, int height, @@ -144,74 +223,154 @@ extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurfaceFrom(void *pixels, Uint32 Gmask, Uint32 Bmask, Uint32 Amask); + +/* !!! FIXME for 2.1: why does this ask for depth? Format provides that. */ + +/** + * Allocate a new RGB surface with with a specific pixel format and existing + * pixel data. + * + * This function operates mostly like SDL_CreateRGBSurfaceFrom(), except + * instead of providing pixel color masks, you provide it with a predefined + * format from SDL_PixelFormatEnum. + * + * No copy is made of the pixel data. Pixel data is not managed automatically; + * you must free the surface before you free the pixel data. + * + * \param pixels a pointer to existing pixel data + * \param width the width of the surface + * \param height the height of the surface + * \param depth the depth of the surface in bits + * \param pitch the pitch of the surface in bytes + * \param format the SDL_PixelFormatEnum for the new surface's pixel format. + * \returns the new SDL_Surface structure that is created or NULL if it fails; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.5. + * + * \sa SDL_CreateRGBSurfaceFrom + * \sa SDL_CreateRGBSurfaceWithFormat + * \sa SDL_FreeSurface + */ extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurfaceWithFormatFrom (void *pixels, int width, int height, int depth, int pitch, Uint32 format); + +/** + * Free an RGB surface. + * + * It is safe to pass NULL to this function. + * + * \param surface the SDL_Surface to free. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateRGBSurface + * \sa SDL_CreateRGBSurfaceFrom + * \sa SDL_LoadBMP + * \sa SDL_LoadBMP_RW + */ extern DECLSPEC void SDLCALL SDL_FreeSurface(SDL_Surface * surface); /** - * \brief Set the palette used by a surface. + * Set the palette used by a surface. * - * \return 0, or -1 if the surface format doesn't use a palette. + * A single palette can be shared with many surfaces. * - * \note A single palette can be shared with many surfaces. + * \param surface the SDL_Surface structure to update + * \param palette the SDL_Palette structure to use + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC int SDLCALL SDL_SetSurfacePalette(SDL_Surface * surface, SDL_Palette * palette); /** - * \brief Sets up a surface for directly accessing the pixels. + * Set up a surface for directly accessing the pixels. * - * Between calls to SDL_LockSurface() / SDL_UnlockSurface(), you can write - * to and read from \c surface->pixels, using the pixel format stored in - * \c surface->format. Once you are done accessing the surface, you should - * use SDL_UnlockSurface() to release it. + * Between calls to SDL_LockSurface() / SDL_UnlockSurface(), you can write to + * and read from `surface->pixels`, using the pixel format stored in + * `surface->format`. Once you are done accessing the surface, you should use + * SDL_UnlockSurface() to release it. * - * Not all surfaces require locking. If SDL_MUSTLOCK(surface) evaluates - * to 0, then you can read and write to the surface at any time, and the - * pixel format of the surface will not change. + * Not all surfaces require locking. If `SDL_MUSTLOCK(surface)` evaluates to + * 0, then you can read and write to the surface at any time, and the pixel + * format of the surface will not change. * - * No operating system or library calls should be made between lock/unlock - * pairs, as critical system locks may be held during this time. + * \param surface the SDL_Surface structure to be locked + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * SDL_LockSurface() returns 0, or -1 if the surface couldn't be locked. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_UnlockSurface() + * \sa SDL_MUSTLOCK + * \sa SDL_UnlockSurface */ extern DECLSPEC int SDLCALL SDL_LockSurface(SDL_Surface * surface); -/** \sa SDL_LockSurface() */ + +/** + * Release a surface after directly accessing the pixels. + * + * \param surface the SDL_Surface structure to be unlocked + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LockSurface + */ extern DECLSPEC void SDLCALL SDL_UnlockSurface(SDL_Surface * surface); /** - * Load a surface from a seekable SDL data stream (memory or file). + * Load a BMP image from a seekable SDL data stream. * - * If \c freesrc is non-zero, the stream will be closed after being read. + * The new surface should be freed with SDL_FreeSurface(). Not doing so will + * result in a memory leak. * - * The new surface should be freed with SDL_FreeSurface(). + * src is an open SDL_RWops buffer, typically loaded with SDL_RWFromFile. + * Alternitavely, you might also use the macro SDL_LoadBMP to load a bitmap + * from a file, convert it to an SDL_Surface and then close the file. * - * \return the new surface, or NULL if there was an error. + * \param src the data stream for the surface + * \param freesrc non-zero to close the stream after being read + * \returns a pointer to a new SDL_Surface structure or NULL if there was an + * error; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_FreeSurface + * \sa SDL_RWFromFile + * \sa SDL_LoadBMP + * \sa SDL_SaveBMP_RW */ extern DECLSPEC SDL_Surface *SDLCALL SDL_LoadBMP_RW(SDL_RWops * src, int freesrc); /** - * Load a surface from a file. + * Load a surface from a file. * - * Convenience macro. + * Convenience macro. */ #define SDL_LoadBMP(file) SDL_LoadBMP_RW(SDL_RWFromFile(file, "rb"), 1) /** - * Save a surface to a seekable SDL data stream (memory or file). + * Save a surface to a seekable SDL data stream in BMP format. * - * Surfaces with a 24-bit, 32-bit and paletted 8-bit format get saved in the - * BMP directly. Other RGB formats with 8-bit or higher get converted to a - * 24-bit surface or, if they have an alpha mask or a colorkey, to a 32-bit - * surface before they are saved. YUV and paletted 1-bit and 4-bit formats are - * not supported. + * Surfaces with a 24-bit, 32-bit and paletted 8-bit format get saved in the + * BMP directly. Other RGB formats with 8-bit or higher get converted to a + * 24-bit surface or, if they have an alpha mask or a colorkey, to a 32-bit + * surface before they are saved. YUV and paletted 1-bit and 4-bit formats are + * not supported. * - * If \c freedst is non-zero, the stream will be closed after being written. + * \param surface the SDL_Surface structure containing the image to be saved + * \param dst a data stream to save to + * \param freedst non-zero to close the stream after being written + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 if successful or -1 if there was an error. + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_LoadBMP_RW + * \sa SDL_SaveBMP */ extern DECLSPEC int SDLCALL SDL_SaveBMP_RW (SDL_Surface * surface, SDL_RWops * dst, int freedst); @@ -225,183 +384,335 @@ extern DECLSPEC int SDLCALL SDL_SaveBMP_RW SDL_SaveBMP_RW(surface, SDL_RWFromFile(file, "wb"), 1) /** - * \brief Sets the RLE acceleration hint for a surface. + * Set the RLE acceleration hint for a surface. * - * \return 0 on success, or -1 if the surface is not valid + * If RLE is enabled, color key and alpha blending blits are much faster, but + * the surface must be locked before directly accessing the pixels. * - * \note If RLE is enabled, colorkey and alpha blending blits are much faster, - * but the surface must be locked before directly accessing the pixels. + * \param surface the SDL_Surface structure to optimize + * \param flag 0 to disable, non-zero to enable RLE acceleration + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_BlitSurface + * \sa SDL_LockSurface + * \sa SDL_UnlockSurface */ extern DECLSPEC int SDLCALL SDL_SetSurfaceRLE(SDL_Surface * surface, int flag); /** - * \brief Sets the color key (transparent pixel) in a blittable surface. + * Returns whether the surface is RLE enabled * - * \param surface The surface to update - * \param flag Non-zero to enable colorkey and 0 to disable colorkey - * \param key The transparent pixel in the native surface format + * It is safe to pass a NULL `surface` here; it will return SDL_FALSE. * - * \return 0 on success, or -1 if the surface is not valid + * \param surface the SDL_Surface structure to query + * \returns SDL_TRUE if the surface is RLE enabled, SDL_FALSE otherwise. * - * You can pass SDL_RLEACCEL to enable RLE accelerated blits. + * \since This function is available since SDL 2.0.14. + * + * \sa SDL_SetSurfaceRLE + */ +extern DECLSPEC SDL_bool SDLCALL SDL_HasSurfaceRLE(SDL_Surface * surface); + +/** + * Set the color key (transparent pixel) in a surface. + * + * The color key defines a pixel value that will be treated as transparent in + * a blit. For example, one can use this to specify that cyan pixels should be + * considered transparent, and therefore not rendered. + * + * It is a pixel of the format used by the surface, as generated by + * SDL_MapRGB(). + * + * RLE acceleration can substantially speed up blitting of images with large + * horizontal runs of transparent pixels. See SDL_SetSurfaceRLE() for details. + * + * \param surface the SDL_Surface structure to update + * \param flag SDL_TRUE to enable color key, SDL_FALSE to disable color key + * \param key the transparent pixel + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_BlitSurface + * \sa SDL_GetColorKey */ extern DECLSPEC int SDLCALL SDL_SetColorKey(SDL_Surface * surface, int flag, Uint32 key); /** - * \brief Returns whether the surface has a color key + * Returns whether the surface has a color key * - * \return SDL_TRUE if the surface has a color key, or SDL_FALSE if the surface is NULL or has no color key + * It is safe to pass a NULL `surface` here; it will return SDL_FALSE. + * + * \param surface the SDL_Surface structure to query + * \return SDL_TRUE if the surface has a color key, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.9. + * + * \sa SDL_SetColorKey + * \sa SDL_GetColorKey */ extern DECLSPEC SDL_bool SDLCALL SDL_HasColorKey(SDL_Surface * surface); /** - * \brief Gets the color key (transparent pixel) in a blittable surface. + * Get the color key (transparent pixel) for a surface. * - * \param surface The surface to update - * \param key A pointer filled in with the transparent pixel in the native - * surface format + * The color key is a pixel of the format used by the surface, as generated by + * SDL_MapRGB(). * - * \return 0 on success, or -1 if the surface is not valid or colorkey is not - * enabled. + * If the surface doesn't have color key enabled this function returns -1. + * + * \param surface the SDL_Surface structure to query + * \param key a pointer filled in with the transparent pixel + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_BlitSurface + * \sa SDL_SetColorKey */ extern DECLSPEC int SDLCALL SDL_GetColorKey(SDL_Surface * surface, Uint32 * key); /** - * \brief Set an additional color value used in blit operations. + * Set an additional color value multiplied into blit operations. * - * \param surface The surface to update. - * \param r The red color value multiplied into blit operations. - * \param g The green color value multiplied into blit operations. - * \param b The blue color value multiplied into blit operations. + * When this surface is blitted, during the blit operation each source color + * channel is modulated by the appropriate color value according to the + * following formula: * - * \return 0 on success, or -1 if the surface is not valid. + * `srcC = srcC * (color / 255)` * - * \sa SDL_GetSurfaceColorMod() + * \param surface the SDL_Surface structure to update + * \param r the red color value multiplied into blit operations + * \param g the green color value multiplied into blit operations + * \param b the blue color value multiplied into blit operations + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetSurfaceColorMod + * \sa SDL_SetSurfaceAlphaMod */ extern DECLSPEC int SDLCALL SDL_SetSurfaceColorMod(SDL_Surface * surface, Uint8 r, Uint8 g, Uint8 b); /** - * \brief Get the additional color value used in blit operations. + * Get the additional color value multiplied into blit operations. * - * \param surface The surface to query. - * \param r A pointer filled in with the current red color value. - * \param g A pointer filled in with the current green color value. - * \param b A pointer filled in with the current blue color value. + * \param surface the SDL_Surface structure to query + * \param r a pointer filled in with the current red color value + * \param g a pointer filled in with the current green color value + * \param b a pointer filled in with the current blue color value + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 if the surface is not valid. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_SetSurfaceColorMod() + * \sa SDL_GetSurfaceAlphaMod + * \sa SDL_SetSurfaceColorMod */ extern DECLSPEC int SDLCALL SDL_GetSurfaceColorMod(SDL_Surface * surface, Uint8 * r, Uint8 * g, Uint8 * b); /** - * \brief Set an additional alpha value used in blit operations. + * Set an additional alpha value used in blit operations. * - * \param surface The surface to update. - * \param alpha The alpha value multiplied into blit operations. + * When this surface is blitted, during the blit operation the source alpha + * value is modulated by this alpha value according to the following formula: * - * \return 0 on success, or -1 if the surface is not valid. + * `srcA = srcA * (alpha / 255)` * - * \sa SDL_GetSurfaceAlphaMod() + * \param surface the SDL_Surface structure to update + * \param alpha the alpha value multiplied into blit operations + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetSurfaceAlphaMod + * \sa SDL_SetSurfaceColorMod */ extern DECLSPEC int SDLCALL SDL_SetSurfaceAlphaMod(SDL_Surface * surface, Uint8 alpha); /** - * \brief Get the additional alpha value used in blit operations. + * Get the additional alpha value used in blit operations. * - * \param surface The surface to query. - * \param alpha A pointer filled in with the current alpha value. + * \param surface the SDL_Surface structure to query + * \param alpha a pointer filled in with the current alpha value + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 if the surface is not valid. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_SetSurfaceAlphaMod() + * \sa SDL_GetSurfaceColorMod + * \sa SDL_SetSurfaceAlphaMod */ extern DECLSPEC int SDLCALL SDL_GetSurfaceAlphaMod(SDL_Surface * surface, Uint8 * alpha); /** - * \brief Set the blend mode used for blit operations. + * Set the blend mode used for blit operations. * - * \param surface The surface to update. - * \param blendMode ::SDL_BlendMode to use for blit blending. + * To copy a surface to another surface (or texture) without blending with the + * existing data, the blendmode of the SOURCE surface should be set to + * `SDL_BLENDMODE_NONE`. * - * \return 0 on success, or -1 if the parameters are not valid. + * \param surface the SDL_Surface structure to update + * \param blendMode the SDL_BlendMode to use for blit blending + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_GetSurfaceBlendMode() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetSurfaceBlendMode */ extern DECLSPEC int SDLCALL SDL_SetSurfaceBlendMode(SDL_Surface * surface, SDL_BlendMode blendMode); /** - * \brief Get the blend mode used for blit operations. + * Get the blend mode used for blit operations. * - * \param surface The surface to query. - * \param blendMode A pointer filled in with the current blend mode. + * \param surface the SDL_Surface structure to query + * \param blendMode a pointer filled in with the current SDL_BlendMode + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 if the surface is not valid. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_SetSurfaceBlendMode() + * \sa SDL_SetSurfaceBlendMode */ extern DECLSPEC int SDLCALL SDL_GetSurfaceBlendMode(SDL_Surface * surface, SDL_BlendMode *blendMode); /** - * Sets the clipping rectangle for the destination surface in a blit. + * Set the clipping rectangle for a surface. * - * If the clip rectangle is NULL, clipping will be disabled. + * When `surface` is the destination of a blit, only the area within the clip + * rectangle is drawn into. * - * If the clip rectangle doesn't intersect the surface, the function will - * return SDL_FALSE and blits will be completely clipped. Otherwise the - * function returns SDL_TRUE and blits to the surface will be clipped to - * the intersection of the surface area and the clipping rectangle. + * Note that blits are automatically clipped to the edges of the source and + * destination surfaces. * - * Note that blits are automatically clipped to the edges of the source - * and destination surfaces. + * \param surface the SDL_Surface structure to be clipped + * \param rect the SDL_Rect structure representing the clipping rectangle, or + * NULL to disable clipping + * \returns SDL_TRUE if the rectangle intersects the surface, otherwise + * SDL_FALSE and blits will be completely clipped. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_BlitSurface + * \sa SDL_GetClipRect */ extern DECLSPEC SDL_bool SDLCALL SDL_SetClipRect(SDL_Surface * surface, const SDL_Rect * rect); /** - * Gets the clipping rectangle for the destination surface in a blit. + * Get the clipping rectangle for a surface. * - * \c rect must be a pointer to a valid rectangle which will be filled - * with the correct values. + * When `surface` is the destination of a blit, only the area within the clip + * rectangle is drawn into. + * + * \param surface the SDL_Surface structure representing the surface to be + * clipped + * \param rect an SDL_Rect structure filled in with the clipping rectangle for + * the surface + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_BlitSurface + * \sa SDL_SetClipRect */ extern DECLSPEC void SDLCALL SDL_GetClipRect(SDL_Surface * surface, SDL_Rect * rect); /* - * Creates a new surface identical to the existing surface + * Creates a new surface identical to the existing surface. + * + * The returned surface should be freed with SDL_FreeSurface(). + * + * \param surface the surface to duplicate. + * \returns a copy of the surface, or NULL on failure; call SDL_GetError() for + * more information. */ extern DECLSPEC SDL_Surface *SDLCALL SDL_DuplicateSurface(SDL_Surface * surface); /** - * Creates a new surface of the specified format, and then copies and maps - * the given surface to it so the blit of the converted surface will be as - * fast as possible. If this function fails, it returns NULL. + * Copy an existing surface to a new surface of the specified format. * - * The \c flags parameter is passed to SDL_CreateRGBSurface() and has those - * semantics. You can also pass ::SDL_RLEACCEL in the flags parameter and - * SDL will try to RLE accelerate colorkey and alpha blits in the resulting - * surface. + * This function is used to optimize images for faster *repeat* blitting. This + * is accomplished by converting the original and storing the result as a new + * surface. The new, optimized surface can then be used as the source for + * future blits, making them faster. + * + * \param src the existing SDL_Surface structure to convert + * \param fmt the SDL_PixelFormat structure that the new surface is optimized + * for + * \param flags the flags are unused and should be set to 0; this is a + * leftover from SDL 1.2's API + * \returns the new SDL_Surface structure that is created or NULL if it fails; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AllocFormat + * \sa SDL_ConvertSurfaceFormat + * \sa SDL_CreateRGBSurface */ extern DECLSPEC SDL_Surface *SDLCALL SDL_ConvertSurface (SDL_Surface * src, const SDL_PixelFormat * fmt, Uint32 flags); + +/** + * Copy an existing surface to a new surface of the specified format enum. + * + * This function operates just like SDL_ConvertSurface(), but accepts an + * SDL_PixelFormatEnum value instead of an SDL_PixelFormat structure. As such, + * it might be easier to call but it doesn't have access to palette + * information for the destination surface, in case that would be important. + * + * \param src the existing SDL_Surface structure to convert + * \param pixel_format the SDL_PixelFormatEnum that the new surface is + * optimized for + * \param flags the flags are unused and should be set to 0; this is a + * leftover from SDL 1.2's API + * \returns the new SDL_Surface structure that is created or NULL if it fails; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AllocFormat + * \sa SDL_ConvertSurface + * \sa SDL_CreateRGBSurface + */ extern DECLSPEC SDL_Surface *SDLCALL SDL_ConvertSurfaceFormat (SDL_Surface * src, Uint32 pixel_format, Uint32 flags); /** - * \brief Copy a block of pixels of one format to another format + * Copy a block of pixels of one format to another format. * - * \return 0 on success, or -1 if there was an error + * \param width the width of the block to copy, in pixels + * \param height the height of the block to copy, in pixels + * \param src_format an SDL_PixelFormatEnum value of the `src` pixels format + * \param src a pointer to the source pixels + * \param src_pitch the pitch of the source pixels, in bytes + * \param dst_format an SDL_PixelFormatEnum value of the `dst` pixels format + * \param dst a pointer to be filled in with new pixel data + * \param dst_pitch the pitch of the destination pixels, in bytes + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC int SDLCALL SDL_ConvertPixels(int width, int height, Uint32 src_format, @@ -410,20 +721,84 @@ extern DECLSPEC int SDLCALL SDL_ConvertPixels(int width, int height, void * dst, int dst_pitch); /** - * Performs a fast fill of the given rectangle with \c color. + * Premultiply the alpha on a block of pixels. * - * If \c rect is NULL, the whole surface will be filled with \c color. + * This is safe to use with src == dst, but not for other overlapping areas. * - * The color should be a pixel of the format used by the surface, and - * can be generated by the SDL_MapRGB() function. + * This function is currently only implemented for SDL_PIXELFORMAT_ARGB8888. * - * \return 0 on success, or -1 on error. + * \param width the width of the block to convert, in pixels + * \param height the height of the block to convert, in pixels + * \param src_format an SDL_PixelFormatEnum value of the `src` pixels format + * \param src a pointer to the source pixels + * \param src_pitch the pitch of the source pixels, in bytes + * \param dst_format an SDL_PixelFormatEnum value of the `dst` pixels format + * \param dst a pointer to be filled in with premultiplied pixel data + * \param dst_pitch the pitch of the destination pixels, in bytes + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_PremultiplyAlpha(int width, int height, + Uint32 src_format, + const void * src, int src_pitch, + Uint32 dst_format, + void * dst, int dst_pitch); + +/** + * Perform a fast fill of a rectangle with a specific color. + * + * `color` should be a pixel of the format used by the surface, and can be + * generated by SDL_MapRGB() or SDL_MapRGBA(). If the color value contains an + * alpha component then the destination is simply filled with that alpha + * information, no blending takes place. + * + * If there is a clip rectangle set on the destination (set via + * SDL_SetClipRect()), then this function will fill based on the intersection + * of the clip rectangle and `rect`. + * + * \param dst the SDL_Surface structure that is the drawing target + * \param rect the SDL_Rect structure representing the rectangle to fill, or + * NULL to fill the entire surface + * \param color the color to fill with + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_FillRects */ extern DECLSPEC int SDLCALL SDL_FillRect (SDL_Surface * dst, const SDL_Rect * rect, Uint32 color); + +/** + * Perform a fast fill of a set of rectangles with a specific color. + * + * `color` should be a pixel of the format used by the surface, and can be + * generated by SDL_MapRGB() or SDL_MapRGBA(). If the color value contains an + * alpha component then the destination is simply filled with that alpha + * information, no blending takes place. + * + * If there is a clip rectangle set on the destination (set via + * SDL_SetClipRect()), then this function will fill based on the intersection + * of the clip rectangle and `rect`. + * + * \param dst the SDL_Surface structure that is the drawing target + * \param rects an array of SDL_Rects representing the rectangles to fill. + * \param count the number of rectangles in the array + * \param color the color to fill with + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_FillRect + */ extern DECLSPEC int SDLCALL SDL_FillRects (SDL_Surface * dst, const SDL_Rect * rects, int count, Uint32 color); +/* !!! FIXME: merge this documentation with the wiki */ /** * Performs a fast blit from the source surface to the destination surface. * @@ -432,7 +807,7 @@ extern DECLSPEC int SDLCALL SDL_FillRects * surface (\c src or \c dst) is copied. The final blit rectangles are saved * in \c srcrect and \c dstrect after all clipping is performed. * - * \return If the blit is successful, it returns 0, otherwise it returns -1. + * \returns 0 if the blit is successful, otherwise it returns -1. * * The blit function should not be called on a locked surface. * @@ -484,62 +859,128 @@ extern DECLSPEC int SDLCALL SDL_FillRects #define SDL_BlitSurface SDL_UpperBlit /** - * This is the public blit function, SDL_BlitSurface(), and it performs - * rectangle validation and clipping before passing it to SDL_LowerBlit() + * Perform a fast blit from the source surface to the destination surface. + * + * SDL_UpperBlit() has been replaced by SDL_BlitSurface(), which is merely a + * macro for this function with a less confusing name. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_BlitSurface */ extern DECLSPEC int SDLCALL SDL_UpperBlit (SDL_Surface * src, const SDL_Rect * srcrect, SDL_Surface * dst, SDL_Rect * dstrect); /** - * This is a semi-private blit function and it performs low-level surface - * blitting only. + * Perform low-level surface blitting only. + * + * This is a semi-private blit function and it performs low-level surface + * blitting, assuming the input rectangles have already been clipped. + * + * Unless you know what you're doing, you should be using SDL_BlitSurface() + * instead. + * + * \param src the SDL_Surface structure to be copied from + * \param srcrect the SDL_Rect structure representing the rectangle to be + * copied, or NULL to copy the entire surface + * \param dst the SDL_Surface structure that is the blit target + * \param dstrect the SDL_Rect structure representing the rectangle that is + * copied into + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_BlitSurface */ extern DECLSPEC int SDLCALL SDL_LowerBlit (SDL_Surface * src, SDL_Rect * srcrect, SDL_Surface * dst, SDL_Rect * dstrect); + /** - * \brief Perform a fast, low quality, stretch blit between two surfaces of the - * same pixel format. + * Perform a fast, low quality, stretch blit between two surfaces of the same + * format. * - * \note This function uses a static buffer, and is not thread-safe. + * Please use SDL_BlitScaled() instead. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC int SDLCALL SDL_SoftStretch(SDL_Surface * src, const SDL_Rect * srcrect, SDL_Surface * dst, const SDL_Rect * dstrect); +/** + * Perform bilinear scaling between two surfaces of the same format, 32BPP. + * + * \since This function is available since SDL 2.0.16. + */ +extern DECLSPEC int SDLCALL SDL_SoftStretchLinear(SDL_Surface * src, + const SDL_Rect * srcrect, + SDL_Surface * dst, + const SDL_Rect * dstrect); + + #define SDL_BlitScaled SDL_UpperBlitScaled /** - * This is the public scaled blit function, SDL_BlitScaled(), and it performs - * rectangle validation and clipping before passing it to SDL_LowerBlitScaled() + * Perform a scaled surface copy to a destination surface. + * + * SDL_UpperBlitScaled() has been replaced by SDL_BlitScaled(), which is + * merely a macro for this function with a less confusing name. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_BlitScaled */ extern DECLSPEC int SDLCALL SDL_UpperBlitScaled (SDL_Surface * src, const SDL_Rect * srcrect, SDL_Surface * dst, SDL_Rect * dstrect); /** - * This is a semi-private blit function and it performs low-level surface - * scaled blitting only. + * Perform low-level surface scaled blitting only. + * + * This is a semi-private function and it performs low-level surface blitting, + * assuming the input rectangles have already been clipped. + * + * \param src the SDL_Surface structure to be copied from + * \param srcrect the SDL_Rect structure representing the rectangle to be + * copied + * \param dst the SDL_Surface structure that is the blit target + * \param dstrect the SDL_Rect structure representing the rectangle that is + * copied into + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_BlitScaled */ extern DECLSPEC int SDLCALL SDL_LowerBlitScaled (SDL_Surface * src, SDL_Rect * srcrect, SDL_Surface * dst, SDL_Rect * dstrect); /** - * \brief Set the YUV conversion mode + * Set the YUV conversion mode + * + * \since This function is available since SDL 2.0.8. */ extern DECLSPEC void SDLCALL SDL_SetYUVConversionMode(SDL_YUV_CONVERSION_MODE mode); /** - * \brief Get the YUV conversion mode + * Get the YUV conversion mode + * + * \since This function is available since SDL 2.0.8. */ extern DECLSPEC SDL_YUV_CONVERSION_MODE SDLCALL SDL_GetYUVConversionMode(void); /** - * \brief Get the YUV conversion mode, returning the correct mode for the resolution when the current conversion mode is SDL_YUV_CONVERSION_AUTOMATIC + * Get the YUV conversion mode, returning the correct mode for the resolution + * when the current conversion mode is SDL_YUV_CONVERSION_AUTOMATIC + * + * \since This function is available since SDL 2.0.8. */ extern DECLSPEC SDL_YUV_CONVERSION_MODE SDLCALL SDL_GetYUVConversionModeForResolution(int width, int height); diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_system.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_system.h index 3b0840769..e2fa7b5fe 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_system.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_system.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -43,33 +43,82 @@ extern "C" { /* Platform specific functions for Windows */ #ifdef __WIN32__ -/** - \brief Set a function that is called for every windows message, before TranslateMessage() -*/ typedef void (SDLCALL * SDL_WindowsMessageHook)(void *userdata, void *hWnd, unsigned int message, Uint64 wParam, Sint64 lParam); + +/** + * Set a callback for every Windows message, run before TranslateMessage(). + * + * \param callback The SDL_WindowsMessageHook function to call. + * \param userdata a pointer to pass to every iteration of `callback` + * + * \since This function is available since SDL 2.0.4. + */ extern DECLSPEC void SDLCALL SDL_SetWindowsMessageHook(SDL_WindowsMessageHook callback, void *userdata); /** - \brief Returns the D3D9 adapter index that matches the specified display index. - - This adapter index can be passed to IDirect3D9::CreateDevice and controls - on which monitor a full screen application will appear. -*/ + * Get the D3D9 adapter index that matches the specified display index. + * + * The returned adapter index can be passed to `IDirect3D9::CreateDevice` and + * controls on which monitor a full screen application will appear. + * + * \param displayIndex the display index for which to get the D3D9 adapter + * index + * \returns the D3D9 adapter index on success or a negative error code on + * failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.1. + */ extern DECLSPEC int SDLCALL SDL_Direct3D9GetAdapterIndex( int displayIndex ); typedef struct IDirect3DDevice9 IDirect3DDevice9; -/** - \brief Returns the D3D device associated with a renderer, or NULL if it's not a D3D renderer. - Once you are done using the device, you should release it to avoid a resource leak. +/** + * Get the D3D9 device associated with a renderer. + * + * Once you are done using the device, you should release it to avoid a + * resource leak. + * + * \param renderer the renderer from which to get the associated D3D device + * \returns the D3D9 device associated with given renderer or NULL if it is + * not a D3D9 renderer; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.1. */ extern DECLSPEC IDirect3DDevice9* SDLCALL SDL_RenderGetD3D9Device(SDL_Renderer * renderer); -/** - \brief Returns the DXGI Adapter and Output indices for the specified display index. +typedef struct ID3D11Device ID3D11Device; - These can be passed to EnumAdapters and EnumOutputs respectively to get the objects - required to create a DX10 or DX11 device and swap chain. +/** + * Get the D3D11 device associated with a renderer. + * + * Once you are done using the device, you should release it to avoid a + * resource leak. + * + * \param renderer the renderer from which to get the associated D3D11 device + * \returns the D3D11 device associated with given renderer or NULL if it is + * not a D3D11 renderer; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.16. + */ +extern DECLSPEC ID3D11Device* SDLCALL SDL_RenderGetD3D11Device(SDL_Renderer * renderer); + +/** + * Get the DXGI Adapter and Output indices for the specified display index. + * + * The DXGI Adapter and Output indices can be passed to `EnumAdapters` and + * `EnumOutputs` respectively to get the objects required to create a DX10 or + * DX11 device and swap chain. + * + * Before SDL 2.0.4 this function did not return a value. Since SDL 2.0.4 it + * returns an SDL_bool. + * + * \param displayIndex the display index for which to get both indices + * \param adapterIndex a pointer to be filled in with the adapter index + * \param outputIndex a pointer to be filled in with the output index + * \returns SDL_TRUE on success or SDL_FALSE on failure; call SDL_GetError() + * for more information. + * + * \since This function is available since SDL 2.0.2. */ extern DECLSPEC SDL_bool SDLCALL SDL_DXGIGetOutputInfo( int displayIndex, int *adapterIndex, int *outputIndex ); @@ -80,63 +129,202 @@ extern DECLSPEC SDL_bool SDLCALL SDL_DXGIGetOutputInfo( int displayIndex, int *a #ifdef __LINUX__ /** - \brief Sets the UNIX nice value for a thread, using setpriority() if possible, and RealtimeKit if available. - - \return 0 on success, or -1 on error. + * Sets the UNIX nice value for a thread. + * + * This uses setpriority() if possible, and RealtimeKit if available. + * + * \param threadID the Unix thread ID to change priority of. + * \param priority The new, Unix-specific, priority value. + * \returns 0 on success, or -1 on error. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC int SDLCALL SDL_LinuxSetThreadPriority(Sint64 threadID, int priority); + +/** + * Sets the priority (not nice level) and scheduling policy for a thread. + * + * This uses setpriority() if possible, and RealtimeKit if available. + * + * \param threadID The Unix thread ID to change priority of. + * \param sdlPriority The new SDL_ThreadPriority value. + * \param schedPolicy The new scheduling policy (SCHED_FIFO, SCHED_RR, + * SCHED_OTHER, etc...) + * \returns 0 on success, or -1 on error. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC int SDLCALL SDL_LinuxSetThreadPriorityAndPolicy(Sint64 threadID, int sdlPriority, int schedPolicy); #endif /* __LINUX__ */ /* Platform specific functions for iOS */ -#if defined(__IPHONEOS__) && __IPHONEOS__ +#ifdef __IPHONEOS__ #define SDL_iOSSetAnimationCallback(window, interval, callback, callbackParam) SDL_iPhoneSetAnimationCallback(window, interval, callback, callbackParam) + +/** + * Use this function to set the animation callback on Apple iOS. + * + * The function prototype for `callback` is: + * + * ```c + * void callback(void* callbackParam); + * ``` + * + * Where its parameter, `callbackParam`, is what was passed as `callbackParam` + * to SDL_iPhoneSetAnimationCallback(). + * + * This function is only available on Apple iOS. + * + * For more information see: + * [README-ios.md](https://hg.libsdl.org/SDL/file/default/docs/README-ios.md) + * + * This functions is also accessible using the macro + * SDL_iOSSetAnimationCallback() since SDL 2.0.4. + * + * \param window the window for which the animation callback should be set + * \param interval the number of frames after which **callback** will be + * called + * \param callback the function to call for every frame. + * \param callbackParam a pointer that is passed to `callback`. + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_iPhoneSetEventPump + */ extern DECLSPEC int SDLCALL SDL_iPhoneSetAnimationCallback(SDL_Window * window, int interval, void (*callback)(void*), void *callbackParam); #define SDL_iOSSetEventPump(enabled) SDL_iPhoneSetEventPump(enabled) + +/** + * Use this function to enable or disable the SDL event pump on Apple iOS. + * + * This function is only available on Apple iOS. + * + * This functions is also accessible using the macro SDL_iOSSetEventPump() + * since SDL 2.0.4. + * + * \param enabled SDL_TRUE to enable the event pump, SDL_FALSE to disable it + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_iPhoneSetAnimationCallback + */ extern DECLSPEC void SDLCALL SDL_iPhoneSetEventPump(SDL_bool enabled); #endif /* __IPHONEOS__ */ /* Platform specific functions for Android */ -#if defined(__ANDROID__) && __ANDROID__ +#ifdef __ANDROID__ /** - \brief Get the JNI environment for the current thread - - This returns JNIEnv*, but the prototype is void* so we don't need jni.h + * Get the Android Java Native Interface Environment of the current thread. + * + * This is the JNIEnv one needs to access the Java virtual machine from native + * code, and is needed for many Android APIs to be usable from C. + * + * The prototype of the function in SDL's code actually declare a void* return + * type, even if the implementation returns a pointer to a JNIEnv. The + * rationale being that the SDL headers can avoid including jni.h. + * + * \returns a pointer to Java native interface object (JNIEnv) to which the + * current thread is attached, or 0 on error. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AndroidGetActivity */ extern DECLSPEC void * SDLCALL SDL_AndroidGetJNIEnv(void); /** - \brief Get the SDL Activity object for the application - - This returns jobject, but the prototype is void* so we don't need jni.h - The jobject returned by SDL_AndroidGetActivity is a local reference. - It is the caller's responsibility to properly release it - (using env->Push/PopLocalFrame or manually with env->DeleteLocalRef) + * Retrieve the Java instance of the Android activity class. + * + * The prototype of the function in SDL's code actually declares a void* + * return type, even if the implementation returns a jobject. The rationale + * being that the SDL headers can avoid including jni.h. + * + * The jobject returned by the function is a local reference and must be + * released by the caller. See the PushLocalFrame() and PopLocalFrame() or + * DeleteLocalRef() functions of the Java native interface: + * + * https://docs.oracle.com/javase/1.5.0/docs/guide/jni/spec/functions.html + * + * \returns the jobject representing the instance of the Activity class of the + * Android application, or NULL on error. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AndroidGetJNIEnv */ extern DECLSPEC void * SDLCALL SDL_AndroidGetActivity(void); /** - \brief Return true if the application is running on Android TV + * Query Android API level of the current device. + * + * - API level 31: Android 12 + * - API level 30: Android 11 + * - API level 29: Android 10 + * - API level 28: Android 9 + * - API level 27: Android 8.1 + * - API level 26: Android 8.0 + * - API level 25: Android 7.1 + * - API level 24: Android 7.0 + * - API level 23: Android 6.0 + * - API level 22: Android 5.1 + * - API level 21: Android 5.0 + * - API level 20: Android 4.4W + * - API level 19: Android 4.4 + * - API level 18: Android 4.3 + * - API level 17: Android 4.2 + * - API level 16: Android 4.1 + * - API level 15: Android 4.0.3 + * - API level 14: Android 4.0 + * - API level 13: Android 3.2 + * - API level 12: Android 3.1 + * - API level 11: Android 3.0 + * - API level 10: Android 2.3.3 + * + * \returns the Android API level. + * + * \since This function is available since SDL 2.0.12. + */ +extern DECLSPEC int SDLCALL SDL_GetAndroidSDKVersion(void); + +/** + * Query if the application is running on Android TV. + * + * \returns SDL_TRUE if this is Android TV, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.8. */ extern DECLSPEC SDL_bool SDLCALL SDL_IsAndroidTV(void); /** - \brief Return true if the application is running on a Chromebook + * Query if the application is running on a Chromebook. + * + * \returns SDL_TRUE if this is a Chromebook, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC SDL_bool SDLCALL SDL_IsChromebook(void); /** - \brief Return true is the application is running on a Samsung DeX docking station + * Query if the application is running on a Samsung DeX docking station. + * + * \returns SDL_TRUE if this is a DeX docking station, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC SDL_bool SDLCALL SDL_IsDeXMode(void); /** - \brief Trigger the Android system back button behavior. + * Trigger the Android system back button behavior. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC void SDLCALL SDL_AndroidBackButton(void); @@ -148,34 +336,99 @@ extern DECLSPEC void SDLCALL SDL_AndroidBackButton(void); #define SDL_ANDROID_EXTERNAL_STORAGE_WRITE 0x02 /** - \brief Get the path used for internal storage for this application. - - This path is unique to your application and cannot be written to - by other applications. + * Get the path used for internal storage for this application. + * + * This path is unique to your application and cannot be written to by other + * applications. + * + * Your internal storage path is typically: + * `/data/data/your.app.package/files`. + * + * \returns the path used for internal storage or NULL on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AndroidGetExternalStorageState */ extern DECLSPEC const char * SDLCALL SDL_AndroidGetInternalStoragePath(void); /** - \brief Get the current state of external storage, a bitmask of these values: - SDL_ANDROID_EXTERNAL_STORAGE_READ - SDL_ANDROID_EXTERNAL_STORAGE_WRITE - - If external storage is currently unavailable, this will return 0. -*/ + * Get the current state of external storage. + * + * The current state of external storage, a bitmask of these values: + * `SDL_ANDROID_EXTERNAL_STORAGE_READ`, `SDL_ANDROID_EXTERNAL_STORAGE_WRITE`. + * + * If external storage is currently unavailable, this will return 0. + * + * \returns the current state of external storage on success or 0 on failure; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AndroidGetExternalStoragePath + */ extern DECLSPEC int SDLCALL SDL_AndroidGetExternalStorageState(void); /** - \brief Get the path used for external storage for this application. - - This path is unique to your application, but is public and can be - written to by other applications. + * Get the path used for external storage for this application. + * + * This path is unique to your application, but is public and can be written + * to by other applications. + * + * Your external storage path is typically: + * `/storage/sdcard0/Android/data/your.app.package/files`. + * + * \returns the path used for external storage for this application on success + * or NULL on failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AndroidGetExternalStorageState */ extern DECLSPEC const char * SDLCALL SDL_AndroidGetExternalStoragePath(void); +/** + * Request permissions at runtime. + * + * This blocks the calling thread until the permission is granted or denied. + * + * \param permission The permission to request. + * \returns SDL_TRUE if the permission was granted, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.14. + */ +extern DECLSPEC SDL_bool SDLCALL SDL_AndroidRequestPermission(const char *permission); + +/** + * Shows an Android toast notification. + * + * Toasts are a sort of lightweight notification that are unique to Android. + * + * https://developer.android.com/guide/topics/ui/notifiers/toasts + * + * Shows toast in UI thread. + * + * For the `gravity` parameter, choose a value from here, or -1 if you don't + * have a preference: + * + * https://developer.android.com/reference/android/view/Gravity + * + * \param message text message to be shown + * \param duration 0=short, 1=long + * \param gravity where the notification should appear on the screen. + * \param xoffset set this parameter only when gravity >=0 + * \param yoffset set this parameter only when gravity >=0 + * \returns 0 if success, -1 if any error occurs. + * + * \since This function is available since SDL 2.0.16. + */ +extern DECLSPEC int SDLCALL SDL_AndroidShowToast(const char* message, int duration, int gravity, int xoffset, int yoffset); + #endif /* __ANDROID__ */ /* Platform specific functions for WinRT */ -#if defined(__WINRT__) && __WINRT__ +#ifdef __WINRT__ /** * \brief WinRT / Windows Phone path types @@ -221,53 +474,84 @@ typedef enum /** - * \brief Retrieves a WinRT defined path on the local file system + * Retrieve a WinRT defined path on the local file system. * - * \note Documentation on most app-specific path types on WinRT - * can be found on MSDN, at the URL: - * http://msdn.microsoft.com/en-us/library/windows/apps/hh464917.aspx + * Not all paths are available on all versions of Windows. This is especially + * true on Windows Phone. Check the documentation for the given SDL_WinRT_Path + * for more information on which path types are supported where. * - * \param pathType The type of path to retrieve. - * \return A UCS-2 string (16-bit, wide-char) containing the path, or NULL - * if the path is not available for any reason. Not all paths are - * available on all versions of Windows. This is especially true on - * Windows Phone. Check the documentation for the given - * SDL_WinRT_Path for more information on which path types are - * supported where. + * Documentation on most app-specific path types on WinRT can be found on + * MSDN, at the URL: + * + * https://msdn.microsoft.com/en-us/library/windows/apps/hh464917.aspx + * + * \param pathType the type of path to retrieve, one of SDL_WinRT_Path + * \returns a UCS-2 string (16-bit, wide-char) containing the path, or NULL if + * the path is not available for any reason; call SDL_GetError() for + * more information. + * + * \since This function is available since SDL 2.0.3. + * + * \sa SDL_WinRTGetFSPathUTF8 */ extern DECLSPEC const wchar_t * SDLCALL SDL_WinRTGetFSPathUNICODE(SDL_WinRT_Path pathType); /** - * \brief Retrieves a WinRT defined path on the local file system + * Retrieve a WinRT defined path on the local file system. * - * \note Documentation on most app-specific path types on WinRT - * can be found on MSDN, at the URL: - * http://msdn.microsoft.com/en-us/library/windows/apps/hh464917.aspx + * Not all paths are available on all versions of Windows. This is especially + * true on Windows Phone. Check the documentation for the given SDL_WinRT_Path + * for more information on which path types are supported where. * - * \param pathType The type of path to retrieve. - * \return A UTF-8 string (8-bit, multi-byte) containing the path, or NULL - * if the path is not available for any reason. Not all paths are - * available on all versions of Windows. This is especially true on - * Windows Phone. Check the documentation for the given - * SDL_WinRT_Path for more information on which path types are - * supported where. + * Documentation on most app-specific path types on WinRT can be found on + * MSDN, at the URL: + * + * https://msdn.microsoft.com/en-us/library/windows/apps/hh464917.aspx + * + * \param pathType the type of path to retrieve, one of SDL_WinRT_Path + * \returns a UTF-8 string (8-bit, multi-byte) containing the path, or NULL if + * the path is not available for any reason; call SDL_GetError() for + * more information. + * + * \since This function is available since SDL 2.0.3. + * + * \sa SDL_WinRTGetFSPathUNICODE */ extern DECLSPEC const char * SDLCALL SDL_WinRTGetFSPathUTF8(SDL_WinRT_Path pathType); /** - * \brief Detects the device family of WinRT plattform on runtime + * Detects the device family of WinRT plattform at runtime. * - * \return Device family + * \returns a value from the SDL_WinRT_DeviceFamily enum. + * + * \since This function is available since SDL 2.0.8. */ extern DECLSPEC SDL_WinRT_DeviceFamily SDLCALL SDL_WinRTGetDeviceFamily(); #endif /* __WINRT__ */ /** - \brief Return true if the current device is a tablet. + * Query if the current device is a tablet. + * + * If SDL can't determine this, it will return SDL_FALSE. + * + * \returns SDL_TRUE if the device is a tablet, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.9. */ extern DECLSPEC SDL_bool SDLCALL SDL_IsTablet(void); +/* Functions used by iOS application delegates to notify SDL about state changes */ +extern DECLSPEC void SDLCALL SDL_OnApplicationWillTerminate(void); +extern DECLSPEC void SDLCALL SDL_OnApplicationDidReceiveMemoryWarning(void); +extern DECLSPEC void SDLCALL SDL_OnApplicationWillResignActive(void); +extern DECLSPEC void SDLCALL SDL_OnApplicationDidEnterBackground(void); +extern DECLSPEC void SDLCALL SDL_OnApplicationWillEnterForeground(void); +extern DECLSPEC void SDLCALL SDL_OnApplicationDidBecomeActive(void); +#ifdef __IPHONEOS__ +extern DECLSPEC void SDLCALL SDL_OnApplicationDidChangeStatusBarOrientation(void); +#endif + /* Ends C function definitions when using C++ */ #ifdef __cplusplus } diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_syswm.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_syswm.h index 7aa8c6869..f7cd670cd 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_syswm.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_syswm.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -49,6 +49,9 @@ struct SDL_SysWMinfo; #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif +#ifndef NOMINMAX /* don't define min() and max(). */ +#define NOMINMAX +#endif #include #endif @@ -95,6 +98,10 @@ typedef struct _UIViewController UIViewController; typedef Uint32 GLuint; #endif +#if defined(SDL_VIDEO_VULKAN) || defined(SDL_VIDEO_METAL) +#define SDL_METALVIEW_TAG 255 +#endif + #if defined(SDL_VIDEO_DRIVER_ANDROID) typedef struct ANativeWindow ANativeWindow; typedef void *EGLSurface; @@ -103,8 +110,17 @@ typedef void *EGLSurface; #if defined(SDL_VIDEO_DRIVER_VIVANTE) #include "SDL_egl.h" #endif + +#if defined(SDL_VIDEO_DRIVER_OS2) +#define INCL_WIN +#include +#endif #endif /* SDL_PROTOTYPES_ONLY */ +#if defined(SDL_VIDEO_DRIVER_KMSDRM) +struct gbm_device; +#endif + #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ @@ -129,7 +145,10 @@ typedef enum SDL_SYSWM_WINRT, SDL_SYSWM_ANDROID, SDL_SYSWM_VIVANTE, - SDL_SYSWM_OS2 + SDL_SYSWM_OS2, + SDL_SYSWM_HAIKU, + SDL_SYSWM_KMSDRM, + SDL_SYSWM_RISCOS } SDL_SYSWM_TYPE; /** @@ -182,6 +201,16 @@ struct SDL_SysWMmsg int dummy; /* No Vivante window events yet */ } vivante; +#endif +#if defined(SDL_VIDEO_DRIVER_OS2) + struct + { + BOOL fFrame; /**< TRUE if hwnd is a frame window */ + HWND hwnd; /**< The window receiving the message */ + ULONG msg; /**< The message identifier */ + MPARAM mp1; /**< The first first message parameter */ + MPARAM mp2; /**< The second first message parameter */ + } os2; #endif /* Can't have an empty union */ int dummy; @@ -232,8 +261,12 @@ struct SDL_SysWMinfo #if defined(SDL_VIDEO_DRIVER_COCOA) struct { -#if defined(__OBJC__) && defined(__has_feature) && __has_feature(objc_arc) +#if defined(__OBJC__) && defined(__has_feature) + #if __has_feature(objc_arc) NSWindow __unsafe_unretained *window; /**< The Cocoa window */ + #else + NSWindow *window; /**< The Cocoa window */ + #endif #else NSWindow *window; /**< The Cocoa window */ #endif @@ -242,8 +275,12 @@ struct SDL_SysWMinfo #if defined(SDL_VIDEO_DRIVER_UIKIT) struct { -#if defined(__OBJC__) && defined(__has_feature) && __has_feature(objc_arc) +#if defined(__OBJC__) && defined(__has_feature) + #if __has_feature(objc_arc) UIWindow __unsafe_unretained *window; /**< The UIKit window */ + #else + UIWindow *window; /**< The UIKit window */ + #endif #else UIWindow *window; /**< The UIKit window */ #endif @@ -255,9 +292,12 @@ struct SDL_SysWMinfo #if defined(SDL_VIDEO_DRIVER_WAYLAND) struct { - struct wl_display *display; /**< Wayland display */ - struct wl_surface *surface; /**< Wayland surface */ - struct wl_shell_surface *shell_surface; /**< Wayland shell_surface (window manager handle) */ + struct wl_display *display; /**< Wayland display */ + struct wl_surface *surface; /**< Wayland surface */ + void *shell_surface; /**< DEPRECATED Wayland shell_surface (window manager handle) */ + struct wl_egl_window *egl_window; /**< Wayland EGL window (native window) */ + struct xdg_surface *xdg_surface; /**< Wayland xdg surface (window manager handle) */ + struct xdg_toplevel *xdg_toplevel; /**< Wayland xdg toplevel role */ } wl; #endif #if defined(SDL_VIDEO_DRIVER_MIR) /* no longer available, left for API/ABI compatibility. Remove in 2.1! */ @@ -276,6 +316,14 @@ struct SDL_SysWMinfo } android; #endif +#if defined(SDL_VIDEO_DRIVER_OS2) + struct + { + HWND hwnd; /**< The window handle */ + HWND hwndFrame; /**< The frame window handle */ + } os2; +#endif + #if defined(SDL_VIDEO_DRIVER_VIVANTE) struct { @@ -284,6 +332,15 @@ struct SDL_SysWMinfo } vivante; #endif +#if defined(SDL_VIDEO_DRIVER_KMSDRM) + struct + { + int dev_index; /**< Device index (ex: the X in /dev/dri/cardX) */ + int drm_fd; /**< DRM FD (unavailable on Vulkan windows) */ + struct gbm_device *gbm_dev; /**< GBM device (unavailable on Vulkan windows) */ + } kmsdrm; +#endif + /* Make sure this union is always 64 bytes (8 64-bit pointers). */ /* Be careful not to overflow this if you add a new target! */ Uint8 dummy[64]; @@ -294,23 +351,23 @@ struct SDL_SysWMinfo typedef struct SDL_SysWMinfo SDL_SysWMinfo; -/* Function prototypes */ + /** - * \brief This function allows access to driver-dependent window information. + * Get driver-specific information about a window. * - * \param window The window about which information is being requested - * \param info This structure must be initialized with the SDL version, and is - * then filled in with information about the given window. + * You must include SDL_syswm.h for the declaration of SDL_SysWMinfo. * - * \return SDL_TRUE if the function is implemented and the version member of - * the \c info struct is valid, SDL_FALSE otherwise. + * The caller must initialize the `info` structure's version by using + * `SDL_VERSION(&info.version)`, and then this function will fill in the rest + * of the structure with information about the given window. * - * You typically use this function like this: - * \code - * SDL_SysWMinfo info; - * SDL_VERSION(&info.version); - * if ( SDL_GetWindowWMInfo(window, &info) ) { ... } - * \endcode + * \param window the window about which information is being requested + * \param info an SDL_SysWMinfo structure filled in with window information + * \returns SDL_TRUE if the function is implemented and the `version` member + * of the `info` struct is valid, or SDL_FALSE if the information + * could not be retrieved; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC SDL_bool SDLCALL SDL_GetWindowWMInfo(SDL_Window * window, SDL_SysWMinfo * info); diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test.h index 17a33dc2c..8cc9d616a 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_assert.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_assert.h index b3ebb62fb..734230529 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_assert.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_assert.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -66,7 +66,7 @@ void SDLTest_Assert(int assertCondition, SDL_PRINTF_FORMAT_STRING const char *as * \param assertCondition Evaluated condition or variable to assert; fail (==0) or pass (!=0). * \param assertDescription Message to log with the assert describing it. * - * \returns Returns the assertCondition so it can be used to externally to break execution flow if desired. + * \returns the assertCondition so it can be used to externally to break execution flow if desired. */ int SDLTest_AssertCheck(int assertCondition, SDL_PRINTF_FORMAT_STRING const char *assertDescription, ...) SDL_PRINTF_VARARG_FUNC(2); diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_common.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_common.h index c34d0d103..0f5096789 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_common.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_common.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -37,6 +37,9 @@ #if defined(__PSP__) #define DEFAULT_WINDOW_WIDTH 480 #define DEFAULT_WINDOW_HEIGHT 272 +#elif defined(__VITA__) +#define DEFAULT_WINDOW_WIDTH 960 +#define DEFAULT_WINDOW_HEIGHT 544 #else #define DEFAULT_WINDOW_WIDTH 640 #define DEFAULT_WINDOW_HEIGHT 480 @@ -61,6 +64,7 @@ typedef struct const char *window_title; const char *window_icon; Uint32 window_flags; + SDL_bool flash_on_focus_loss; int window_x; int window_y; int window_w; @@ -110,6 +114,10 @@ typedef struct int gl_minor_version; int gl_debug; int gl_profile_mask; + + /* Additional fields added in 2.0.18 */ + SDL_Rect confine; + } SDLTest_CommonState; #include "begin_code.h" @@ -126,7 +134,7 @@ extern "C" { * \param argv Array of command line parameters * \param flags Flags indicating which subsystem to initialize (i.e. SDL_INIT_VIDEO | SDL_INIT_AUDIO) * - * \returns Returns a newly allocated common state object. + * \returns a newly allocated common state object. */ SDLTest_CommonState *SDLTest_CommonCreateState(char **argv, Uint32 flags); @@ -136,7 +144,7 @@ SDLTest_CommonState *SDLTest_CommonCreateState(char **argv, Uint32 flags); * \param state The common state describing the test window to create. * \param index The index of the argument to process in argv[]. * - * \returns The number of arguments processed (i.e. 1 for --fullscreen, 2 for --video [videodriver], or -1 on error. + * \returns the number of arguments processed (i.e. 1 for --fullscreen, 2 for --video [videodriver], or -1 on error. */ int SDLTest_CommonArg(SDLTest_CommonState * state, int index); @@ -155,12 +163,25 @@ int SDLTest_CommonArg(SDLTest_CommonState * state, int index); */ void SDLTest_CommonLogUsage(SDLTest_CommonState * state, const char *argv0, const char **options); +/** + * \brief Returns common usage information + * + * You should (probably) be using SDLTest_CommonLogUsage() instead, but this + * function remains for binary compatibility. Strings returned from this + * function are valid until SDLTest_CommonQuit() is called, in which case + * those strings' memory is freed and can no longer be used. + * + * \param state The common state describing the test window to create. + * \returns a string with usage information + */ +const char *SDLTest_CommonUsage(SDLTest_CommonState * state); + /** * \brief Open test window. * * \param state The common state describing the test window to create. * - * \returns True if initialization succeeded, false otherwise + * \returns SDL_TRUE if initialization succeeded, false otherwise */ SDL_bool SDLTest_CommonInit(SDLTest_CommonState * state); @@ -171,7 +192,7 @@ SDL_bool SDLTest_CommonInit(SDLTest_CommonState * state); * \param argc argc, as supplied to SDL_main * \param argv argv, as supplied to SDL_main * - * \returns False if app should quit, true otherwise. + * \returns SDL_FALSE if app should quit, true otherwise. */ SDL_bool SDLTest_CommonDefaultArgs(SDLTest_CommonState * state, const int argc, char **argv); @@ -193,6 +214,15 @@ void SDLTest_CommonEvent(SDLTest_CommonState * state, SDL_Event * event, int *do */ void SDLTest_CommonQuit(SDLTest_CommonState * state); +/** + * \brief Draws various window information (position, size, etc.) to the renderer. + * + * \param renderer The renderer to draw to. + * \param window The window whose information should be displayed. + * \param usedHeight Returns the height used, so the caller can draw more below. + * + */ +void SDLTest_CommonDrawWindowInfo(SDL_Renderer * renderer, SDL_Window * window, int * usedHeight); /* Ends C function definitions when using C++ */ #ifdef __cplusplus diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_compare.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_compare.h index 1f751c8b9..8a7a07008 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_compare.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_compare.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_crc32.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_crc32.h index e615d8929..049da7406 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_crc32.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_crc32.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_font.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_font.h index 8fa078440..c5cbbbbd3 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_font.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_font.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -48,7 +48,7 @@ extern "C" { * \param y The Y coordinate of the upper left corner of the character. * \param c The character to draw. * - * \returns Returns 0 on success, -1 on failure. + * \returns 0 on success, -1 on failure. */ int SDLTest_DrawCharacter(SDL_Renderer *renderer, int x, int y, char c); @@ -60,7 +60,7 @@ int SDLTest_DrawCharacter(SDL_Renderer *renderer, int x, int y, char c); * \param y The Y coordinate of the upper left corner of the string. * \param s The string to draw. * - * \returns Returns 0 on success, -1 on failure. + * \returns 0 on success, -1 on failure. */ int SDLTest_DrawString(SDL_Renderer *renderer, int x, int y, const char *s); diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_fuzzer.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_fuzzer.h index 7259685a9..bbe8eb874 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_fuzzer.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_fuzzer.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -66,14 +66,14 @@ void SDLTest_FuzzerInit(Uint64 execKey); /** * Returns a random Uint8 * - * \returns Generated integer + * \returns a generated integer */ Uint8 SDLTest_RandomUint8(void); /** * Returns a random Sint8 * - * \returns Generated signed integer + * \returns a generated signed integer */ Sint8 SDLTest_RandomSint8(void); @@ -81,14 +81,14 @@ Sint8 SDLTest_RandomSint8(void); /** * Returns a random Uint16 * - * \returns Generated integer + * \returns a generated integer */ Uint16 SDLTest_RandomUint16(void); /** * Returns a random Sint16 * - * \returns Generated signed integer + * \returns a generated signed integer */ Sint16 SDLTest_RandomSint16(void); @@ -96,7 +96,7 @@ Sint16 SDLTest_RandomSint16(void); /** * Returns a random integer * - * \returns Generated integer + * \returns a generated integer */ Sint32 SDLTest_RandomSint32(void); @@ -104,14 +104,14 @@ Sint32 SDLTest_RandomSint32(void); /** * Returns a random positive integer * - * \returns Generated integer + * \returns a generated integer */ Uint32 SDLTest_RandomUint32(void); /** * Returns random Uint64. * - * \returns Generated integer + * \returns a generated integer */ Uint64 SDLTest_RandomUint64(void); @@ -119,28 +119,28 @@ Uint64 SDLTest_RandomUint64(void); /** * Returns random Sint64. * - * \returns Generated signed integer + * \returns a generated signed integer */ Sint64 SDLTest_RandomSint64(void); /** - * \returns random float in range [0.0 - 1.0[ + * \returns a random float in range [0.0 - 1.0] */ float SDLTest_RandomUnitFloat(void); /** - * \returns random double in range [0.0 - 1.0[ + * \returns a random double in range [0.0 - 1.0] */ double SDLTest_RandomUnitDouble(void); /** - * \returns random float. + * \returns a random float. * */ float SDLTest_RandomFloat(void); /** - * \returns random double. + * \returns a random double. * */ double SDLTest_RandomDouble(void); @@ -162,7 +162,7 @@ double SDLTest_RandomDouble(void); * \param boundary2 Upper boundary limit * \param validDomain Should the generated boundary be valid (=within the bounds) or not? * - * \returns Random boundary value for the given range and domain or 0 with error set + * \returns a random boundary value for the given range and domain or 0 with error set */ Uint8 SDLTest_RandomUint8BoundaryValue(Uint8 boundary1, Uint8 boundary2, SDL_bool validDomain); @@ -183,7 +183,7 @@ Uint8 SDLTest_RandomUint8BoundaryValue(Uint8 boundary1, Uint8 boundary2, SDL_boo * \param boundary2 Upper boundary limit * \param validDomain Should the generated boundary be valid (=within the bounds) or not? * - * \returns Random boundary value for the given range and domain or 0 with error set + * \returns a random boundary value for the given range and domain or 0 with error set */ Uint16 SDLTest_RandomUint16BoundaryValue(Uint16 boundary1, Uint16 boundary2, SDL_bool validDomain); @@ -204,7 +204,7 @@ Uint16 SDLTest_RandomUint16BoundaryValue(Uint16 boundary1, Uint16 boundary2, SDL * \param boundary2 Upper boundary limit * \param validDomain Should the generated boundary be valid (=within the bounds) or not? * - * \returns Random boundary value for the given range and domain or 0 with error set + * \returns a random boundary value for the given range and domain or 0 with error set */ Uint32 SDLTest_RandomUint32BoundaryValue(Uint32 boundary1, Uint32 boundary2, SDL_bool validDomain); @@ -225,7 +225,7 @@ Uint32 SDLTest_RandomUint32BoundaryValue(Uint32 boundary1, Uint32 boundary2, SDL * \param boundary2 Upper boundary limit * \param validDomain Should the generated boundary be valid (=within the bounds) or not? * - * \returns Random boundary value for the given range and domain or 0 with error set + * \returns a random boundary value for the given range and domain or 0 with error set */ Uint64 SDLTest_RandomUint64BoundaryValue(Uint64 boundary1, Uint64 boundary2, SDL_bool validDomain); @@ -246,7 +246,7 @@ Uint64 SDLTest_RandomUint64BoundaryValue(Uint64 boundary1, Uint64 boundary2, SDL * \param boundary2 Upper boundary limit * \param validDomain Should the generated boundary be valid (=within the bounds) or not? * - * \returns Random boundary value for the given range and domain or SINT8_MIN with error set + * \returns a random boundary value for the given range and domain or SINT8_MIN with error set */ Sint8 SDLTest_RandomSint8BoundaryValue(Sint8 boundary1, Sint8 boundary2, SDL_bool validDomain); @@ -268,7 +268,7 @@ Sint8 SDLTest_RandomSint8BoundaryValue(Sint8 boundary1, Sint8 boundary2, SDL_boo * \param boundary2 Upper boundary limit * \param validDomain Should the generated boundary be valid (=within the bounds) or not? * - * \returns Random boundary value for the given range and domain or SINT16_MIN with error set + * \returns a random boundary value for the given range and domain or SINT16_MIN with error set */ Sint16 SDLTest_RandomSint16BoundaryValue(Sint16 boundary1, Sint16 boundary2, SDL_bool validDomain); @@ -289,7 +289,7 @@ Sint16 SDLTest_RandomSint16BoundaryValue(Sint16 boundary1, Sint16 boundary2, SDL * \param boundary2 Upper boundary limit * \param validDomain Should the generated boundary be valid (=within the bounds) or not? * - * \returns Random boundary value for the given range and domain or SINT32_MIN with error set + * \returns a random boundary value for the given range and domain or SINT32_MIN with error set */ Sint32 SDLTest_RandomSint32BoundaryValue(Sint32 boundary1, Sint32 boundary2, SDL_bool validDomain); @@ -310,7 +310,7 @@ Sint32 SDLTest_RandomSint32BoundaryValue(Sint32 boundary1, Sint32 boundary2, SDL * \param boundary2 Upper boundary limit * \param validDomain Should the generated boundary be valid (=within the bounds) or not? * - * \returns Random boundary value for the given range and domain or SINT64_MIN with error set + * \returns a random boundary value for the given range and domain or SINT64_MIN with error set */ Sint64 SDLTest_RandomSint64BoundaryValue(Sint64 boundary1, Sint64 boundary2, SDL_bool validDomain); @@ -324,7 +324,7 @@ Sint64 SDLTest_RandomSint64BoundaryValue(Sint64 boundary1, Sint64 boundary2, SDL * \param min Minimum inclusive value of returned random number * \param max Maximum inclusive value of returned random number * - * \returns Generated random integer in range + * \returns a generated random integer in range */ Sint32 SDLTest_RandomIntegerInRange(Sint32 min, Sint32 max); @@ -336,7 +336,7 @@ Sint32 SDLTest_RandomIntegerInRange(Sint32 min, Sint32 max); * * Note: Returned string needs to be deallocated. * - * \returns Newly allocated random string; or NULL if length was invalid or string could not be allocated. + * \returns a newly allocated random string; or NULL if length was invalid or string could not be allocated. */ char * SDLTest_RandomAsciiString(void); @@ -350,7 +350,7 @@ char * SDLTest_RandomAsciiString(void); * * \param maxLength The maximum length of the generated string. * - * \returns Newly allocated random string; or NULL if maxLength was invalid or string could not be allocated. + * \returns a newly allocated random string; or NULL if maxLength was invalid or string could not be allocated. */ char * SDLTest_RandomAsciiStringWithMaximumLength(int maxLength); @@ -364,12 +364,14 @@ char * SDLTest_RandomAsciiStringWithMaximumLength(int maxLength); * * \param size The length of the generated string * - * \returns Newly allocated random string; or NULL if size was invalid or string could not be allocated. + * \returns a newly allocated random string; or NULL if size was invalid or string could not be allocated. */ char * SDLTest_RandomAsciiStringOfSize(int size); /** - * Returns the invocation count for the fuzzer since last ...FuzzerInit. + * Get the invocation count for the fuzzer since last ...FuzzerInit. + * + * \returns the invocation count. */ int SDLTest_GetFuzzerInvocationCount(void); diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_harness.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_harness.h index f5ae92ceb..1fd4236be 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_harness.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_harness.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -76,9 +76,9 @@ typedef struct SDLTest_TestCaseReference { /* !< Func2Stress */ SDLTest_TestCaseFp testCase; /* !< Short name (or function name) "Func2Stress" */ - char *name; + const char *name; /* !< Long name or full description "This test pushes func2() to the limit." */ - char *description; + const char *description; /* !< Set to TEST_ENABLED or TEST_DISABLED (test won't be run) */ int enabled; } SDLTest_TestCaseReference; @@ -88,7 +88,7 @@ typedef struct SDLTest_TestCaseReference { */ typedef struct SDLTest_TestSuiteReference { /* !< "PlatformSuite" */ - char *name; + const char *name; /* !< The function that is run before each test. NULL skips. */ SDLTest_TestCaseSetUpFp testSetUp; /* !< The test cases that are run as part of the suite. Last item should be NULL. */ @@ -105,7 +105,7 @@ typedef struct SDLTest_TestSuiteReference { * * \param length The length of the seed string to generate * - * \returns The generated seed string + * \returns the generated seed string */ char *SDLTest_GenerateRunSeed(const int length); @@ -118,7 +118,7 @@ char *SDLTest_GenerateRunSeed(const int length); * \param filter Filter specification. NULL disables. Case sensitive. * \param testIterations Number of iterations to run each test case. * - * \returns Test run result; 0 when all tests passed, 1 if any tests failed. + * \returns the test run result: 0 when all tests passed, 1 if any tests failed. */ int SDLTest_RunSuites(SDLTest_TestSuiteReference *testSuites[], const char *userRunSeed, Uint64 userExecKey, const char *filter, int testIterations); diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_images.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_images.h index b8934812f..e2bfc3600 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_images.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_images.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_log.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_log.h index 01d0fedac..e3d39ad27 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_log.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_log.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_md5.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_md5.h index 2bfd7dff9..17b1d2be7 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_md5.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_md5.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_memory.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_memory.h index 5d4d39ea5..cc2edc1b9 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_memory.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_memory.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_random.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_random.h index 71e9c70b6..b1d6060cb 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_random.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_test_random.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -98,7 +98,7 @@ extern "C" { * * \param rndContext pointer to context structure * - * \returns A random number (32bit unsigned integer) + * \returns a random number (32bit unsigned integer) * */ unsigned int SDLTest_Random(SDLTest_RandomContext *rndContext); diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_thread.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_thread.h index f78b1145d..35e680ddf 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_thread.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_thread.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -35,6 +35,17 @@ #include "SDL_atomic.h" #include "SDL_mutex.h" +#if defined(__WIN32__) +#include /* _beginthreadex() and _endthreadex() */ +#endif +#if defined(__OS2__) /* for _beginthread() and _endthread() */ +#ifndef __EMX__ +#include +#else +#include +#endif +#endif + #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ #ifdef __cplusplus @@ -54,6 +65,11 @@ typedef unsigned int SDL_TLSID; /** * The SDL thread priority. * + * SDL will make system changes as necessary in order to apply the thread priority. + * Code which attempts to control thread state related to priority should be aware + * that calling SDL_SetThreadPriority may alter such state. + * SDL_HINT_THREAD_PRIORITY_POLICY can be used to control aspects of this behavior. + * * \note On many systems you require special privileges to set high or time critical priority. */ typedef enum { @@ -64,12 +80,15 @@ typedef enum { } SDL_ThreadPriority; /** - * The function passed to SDL_CreateThread(). - * It is passed a void* user context parameter and returns an int. + * The function passed to SDL_CreateThread(). + * + * \param data what was passed as `data` to SDL_CreateThread() + * \returns a value that can be reported through SDL_WaitThread(). */ typedef int (SDLCALL * SDL_ThreadFunction) (void *data); -#if defined(__WIN32__) && !defined(HAVE_LIBC) + +#if defined(__WIN32__) /** * \file SDL_thread.h * @@ -91,16 +110,19 @@ typedef int (SDLCALL * SDL_ThreadFunction) (void *data); * library! */ #define SDL_PASSED_BEGINTHREAD_ENDTHREAD -#include /* _beginthreadex() and _endthreadex() */ -typedef uintptr_t(__cdecl * pfnSDL_CurrentBeginThread) +typedef uintptr_t (__cdecl * pfnSDL_CurrentBeginThread) (void *, unsigned, unsigned (__stdcall *func)(void *), void * /*arg*/, unsigned, unsigned * /* threadID */); typedef void (__cdecl * pfnSDL_CurrentEndThread) (unsigned code); -/** - * Create a thread. - */ +#ifndef SDL_beginthread +#define SDL_beginthread _beginthreadex +#endif +#ifndef SDL_endthread +#define SDL_endthread _endthreadex +#endif + extern DECLSPEC SDL_Thread *SDLCALL SDL_CreateThread(SDL_ThreadFunction fn, const char *name, void *data, pfnSDL_CurrentBeginThread pfnBeginThread, @@ -113,17 +135,14 @@ SDL_CreateThreadWithStackSize(int (SDLCALL * fn) (void *), pfnSDL_CurrentEndThread pfnEndThread); -/** - * Create a thread. - */ #if defined(SDL_CreateThread) && SDL_DYNAMIC_API #undef SDL_CreateThread -#define SDL_CreateThread(fn, name, data) SDL_CreateThread_REAL(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthreadex, (pfnSDL_CurrentEndThread)_endthreadex) +#define SDL_CreateThread(fn, name, data) SDL_CreateThread_REAL(fn, name, data, (pfnSDL_CurrentBeginThread)SDL_beginthread, (pfnSDL_CurrentEndThread)SDL_endthread) #undef SDL_CreateThreadWithStackSize -#define SDL_CreateThreadWithStackSize(fn, name, stacksize, data) SDL_CreateThreadWithStackSize_REAL(fn, name, stacksize, data, (pfnSDL_CurrentBeginThread)_beginthreadex, (pfnSDL_CurrentEndThread)_endthreadex) +#define SDL_CreateThreadWithStackSize(fn, name, stacksize, data) SDL_CreateThreadWithStackSize_REAL(fn, name, stacksize, data, (pfnSDL_CurrentBeginThread)SDL_beginthread, (pfnSDL_CurrentEndThread)SDL_endthread) #else -#define SDL_CreateThread(fn, name, data) SDL_CreateThread(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthreadex, (pfnSDL_CurrentEndThread)_endthreadex) -#define SDL_CreateThreadWithStackSize(fn, name, stacksize, data) SDL_CreateThreadWithStackSize(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthreadex, (pfnSDL_CurrentEndThread)_endthreadex) +#define SDL_CreateThread(fn, name, data) SDL_CreateThread(fn, name, data, (pfnSDL_CurrentBeginThread)SDL_beginthread, (pfnSDL_CurrentEndThread)SDL_endthread) +#define SDL_CreateThreadWithStackSize(fn, name, stacksize, data) SDL_CreateThreadWithStackSize(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthreadex, (pfnSDL_CurrentEndThread)SDL_endthread) #endif #elif defined(__OS2__) @@ -132,13 +151,17 @@ SDL_CreateThreadWithStackSize(int (SDLCALL * fn) (void *), * into a dll with Watcom's runtime statically linked. */ #define SDL_PASSED_BEGINTHREAD_ENDTHREAD -#ifndef __EMX__ -#include -#else -#include -#endif + typedef int (*pfnSDL_CurrentBeginThread)(void (*func)(void *), void *, unsigned, void * /*arg*/); typedef void (*pfnSDL_CurrentEndThread)(void); + +#ifndef SDL_beginthread +#define SDL_beginthread _beginthread +#endif +#ifndef SDL_endthread +#define SDL_endthread _endthread +#endif + extern DECLSPEC SDL_Thread *SDLCALL SDL_CreateThread(SDL_ThreadFunction fn, const char *name, void *data, pfnSDL_CurrentBeginThread pfnBeginThread, @@ -147,52 +170,85 @@ extern DECLSPEC SDL_Thread *SDLCALL SDL_CreateThreadWithStackSize(SDL_ThreadFunction fn, const char *name, const size_t stacksize, void *data, pfnSDL_CurrentBeginThread pfnBeginThread, pfnSDL_CurrentEndThread pfnEndThread); + #if defined(SDL_CreateThread) && SDL_DYNAMIC_API #undef SDL_CreateThread -#define SDL_CreateThread(fn, name, data) SDL_CreateThread_REAL(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthread, (pfnSDL_CurrentEndThread)_endthread) +#define SDL_CreateThread(fn, name, data) SDL_CreateThread_REAL(fn, name, data, (pfnSDL_CurrentBeginThread)SDL_beginthread, (pfnSDL_CurrentEndThread)SDL_endthread) #undef SDL_CreateThreadWithStackSize -#define SDL_CreateThreadWithStackSize(fn, name, stacksize, data) SDL_CreateThreadWithStackSize_REAL(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthread, (pfnSDL_CurrentEndThread)_endthread) +#define SDL_CreateThreadWithStackSize(fn, name, stacksize, data) SDL_CreateThreadWithStackSize_REAL(fn, name, data, (pfnSDL_CurrentBeginThread)SDL_beginthread, (pfnSDL_CurrentEndThread)SDL_endthread) #else -#define SDL_CreateThread(fn, name, data) SDL_CreateThread(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthread, (pfnSDL_CurrentEndThread)_endthread) -#define SDL_CreateThreadWithStackSize(fn, name, stacksize, data) SDL_CreateThreadWithStackSize(fn, name, stacksize, data, (pfnSDL_CurrentBeginThread)_beginthread, (pfnSDL_CurrentEndThread)_endthread) +#define SDL_CreateThread(fn, name, data) SDL_CreateThread(fn, name, data, (pfnSDL_CurrentBeginThread)SDL_beginthread, (pfnSDL_CurrentEndThread)SDL_endthread) +#define SDL_CreateThreadWithStackSize(fn, name, stacksize, data) SDL_CreateThreadWithStackSize(fn, name, stacksize, data, (pfnSDL_CurrentBeginThread)SDL_beginthread, (pfnSDL_CurrentEndThread)SDL_endthread) #endif #else /** - * Create a thread with a default stack size. + * Create a new thread with a default stack size. * - * This is equivalent to calling: - * SDL_CreateThreadWithStackSize(fn, name, 0, data); + * This is equivalent to calling: + * + * ```c + * SDL_CreateThreadWithStackSize(fn, name, 0, data); + * ``` + * + * \param fn the SDL_ThreadFunction function to call in the new thread + * \param name the name of the thread + * \param data a pointer that is passed to `fn` + * \returns an opaque pointer to the new thread object on success, NULL if the + * new thread could not be created; call SDL_GetError() for more + * information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateThreadWithStackSize + * \sa SDL_WaitThread */ extern DECLSPEC SDL_Thread *SDLCALL SDL_CreateThread(SDL_ThreadFunction fn, const char *name, void *data); /** - * Create a thread. + * Create a new thread with a specific stack size. * - * Thread naming is a little complicated: Most systems have very small - * limits for the string length (Haiku has 32 bytes, Linux currently has 16, - * Visual C++ 6.0 has nine!), and possibly other arbitrary rules. You'll - * have to see what happens with your system's debugger. The name should be - * UTF-8 (but using the naming limits of C identifiers is a better bet). - * There are no requirements for thread naming conventions, so long as the - * string is null-terminated UTF-8, but these guidelines are helpful in - * choosing a name: + * SDL makes an attempt to report `name` to the system, so that debuggers can + * display it. Not all platforms support this. * - * http://stackoverflow.com/questions/149932/naming-conventions-for-threads + * Thread naming is a little complicated: Most systems have very small limits + * for the string length (Haiku has 32 bytes, Linux currently has 16, Visual + * C++ 6.0 has _nine_!), and possibly other arbitrary rules. You'll have to + * see what happens with your system's debugger. The name should be UTF-8 (but + * using the naming limits of C identifiers is a better bet). There are no + * requirements for thread naming conventions, so long as the string is + * null-terminated UTF-8, but these guidelines are helpful in choosing a name: * - * If a system imposes requirements, SDL will try to munge the string for - * it (truncate, etc), but the original string contents will be available - * from SDL_GetThreadName(). + * https://stackoverflow.com/questions/149932/naming-conventions-for-threads * - * The size (in bytes) of the new stack can be specified. Zero means "use - * the system default" which might be wildly different between platforms - * (x86 Linux generally defaults to eight megabytes, an embedded device - * might be a few kilobytes instead). + * If a system imposes requirements, SDL will try to munge the string for it + * (truncate, etc), but the original string contents will be available from + * SDL_GetThreadName(). * - * In SDL 2.1, stacksize will be folded into the original SDL_CreateThread - * function. + * The size (in bytes) of the new stack can be specified. Zero means "use the + * system default" which might be wildly different between platforms. x86 + * Linux generally defaults to eight megabytes, an embedded device might be a + * few kilobytes instead. You generally need to specify a stack that is a + * multiple of the system's page size (in many cases, this is 4 kilobytes, but + * check your system documentation). + * + * In SDL 2.1, stack size will be folded into the original SDL_CreateThread + * function, but for backwards compatibility, this is currently a separate + * function. + * + * \param fn the SDL_ThreadFunction function to call in the new thread + * \param name the name of the thread + * \param stacksize the size, in bytes, to allocate for the new thread stack. + * \param data a pointer that is passed to `fn` + * \returns an opaque pointer to the new thread object on success, NULL if the + * new thread could not be created; call SDL_GetError() for more + * information. + * + * \since This function is available since SDL 2.0.9. + * + * \sa SDL_WaitThread */ extern DECLSPEC SDL_Thread *SDLCALL SDL_CreateThreadWithStackSize(SDL_ThreadFunction fn, const char *name, const size_t stacksize, void *data); @@ -200,137 +256,202 @@ SDL_CreateThreadWithStackSize(SDL_ThreadFunction fn, const char *name, const siz #endif /** - * Get the thread name, as it was specified in SDL_CreateThread(). - * This function returns a pointer to a UTF-8 string that names the - * specified thread, or NULL if it doesn't have a name. This is internal - * memory, not to be free()'d by the caller, and remains valid until the - * specified thread is cleaned up by SDL_WaitThread(). + * Get the thread name as it was specified in SDL_CreateThread(). + * + * This is internal memory, not to be freed by the caller, and remains valid + * until the specified thread is cleaned up by SDL_WaitThread(). + * + * \param thread the thread to query + * \returns a pointer to a UTF-8 string that names the specified thread, or + * NULL if it doesn't have a name. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateThread */ extern DECLSPEC const char *SDLCALL SDL_GetThreadName(SDL_Thread *thread); /** - * Get the thread identifier for the current thread. + * Get the thread identifier for the current thread. + * + * This thread identifier is as reported by the underlying operating system. + * If SDL is running on a platform that does not support threads the return + * value will always be zero. + * + * This function also returns a valid thread ID when called from the main + * thread. + * + * \returns the ID of the current thread. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetThreadID */ extern DECLSPEC SDL_threadID SDLCALL SDL_ThreadID(void); /** - * Get the thread identifier for the specified thread. + * Get the thread identifier for the specified thread. * - * Equivalent to SDL_ThreadID() if the specified thread is NULL. + * This thread identifier is as reported by the underlying operating system. + * If SDL is running on a platform that does not support threads the return + * value will always be zero. + * + * \param thread the thread to query + * \returns the ID of the specified thread, or the ID of the current thread if + * `thread` is NULL. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ThreadID */ extern DECLSPEC SDL_threadID SDLCALL SDL_GetThreadID(SDL_Thread * thread); /** - * Set the priority for the current thread + * Set the priority for the current thread. + * + * Note that some platforms will not let you alter the priority (or at least, + * promote the thread to a higher priority) at all, and some require you to be + * an administrator account. Be prepared for this to fail. + * + * \param priority the SDL_ThreadPriority to set + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC int SDLCALL SDL_SetThreadPriority(SDL_ThreadPriority priority); /** - * Wait for a thread to finish. Threads that haven't been detached will - * remain (as a "zombie") until this function cleans them up. Not doing so - * is a resource leak. + * Wait for a thread to finish. * - * Once a thread has been cleaned up through this function, the SDL_Thread - * that references it becomes invalid and should not be referenced again. - * As such, only one thread may call SDL_WaitThread() on another. + * Threads that haven't been detached will remain (as a "zombie") until this + * function cleans them up. Not doing so is a resource leak. * - * The return code for the thread function is placed in the area - * pointed to by \c status, if \c status is not NULL. + * Once a thread has been cleaned up through this function, the SDL_Thread + * that references it becomes invalid and should not be referenced again. As + * such, only one thread may call SDL_WaitThread() on another. * - * You may not wait on a thread that has been used in a call to - * SDL_DetachThread(). Use either that function or this one, but not - * both, or behavior is undefined. + * The return code for the thread function is placed in the area pointed to by + * `status`, if `status` is not NULL. * - * It is safe to pass NULL to this function; it is a no-op. + * You may not wait on a thread that has been used in a call to + * SDL_DetachThread(). Use either that function or this one, but not both, or + * behavior is undefined. + * + * It is safe to pass a NULL thread to this function; it is a no-op. + * + * Note that the thread pointer is freed by this function and is not valid + * afterward. + * + * \param thread the SDL_Thread pointer that was returned from the + * SDL_CreateThread() call that started this thread + * \param status pointer to an integer that will receive the value returned + * from the thread function by its 'return', or NULL to not + * receive such value back. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateThread + * \sa SDL_DetachThread */ extern DECLSPEC void SDLCALL SDL_WaitThread(SDL_Thread * thread, int *status); /** - * A thread may be "detached" to signify that it should not remain until - * another thread has called SDL_WaitThread() on it. Detaching a thread - * is useful for long-running threads that nothing needs to synchronize - * with or further manage. When a detached thread is done, it simply - * goes away. + * Let a thread clean up on exit without intervention. * - * There is no way to recover the return code of a detached thread. If you - * need this, don't detach the thread and instead use SDL_WaitThread(). + * A thread may be "detached" to signify that it should not remain until + * another thread has called SDL_WaitThread() on it. Detaching a thread is + * useful for long-running threads that nothing needs to synchronize with or + * further manage. When a detached thread is done, it simply goes away. * - * Once a thread is detached, you should usually assume the SDL_Thread isn't - * safe to reference again, as it will become invalid immediately upon - * the detached thread's exit, instead of remaining until someone has called - * SDL_WaitThread() to finally clean it up. As such, don't detach the same - * thread more than once. + * There is no way to recover the return code of a detached thread. If you + * need this, don't detach the thread and instead use SDL_WaitThread(). * - * If a thread has already exited when passed to SDL_DetachThread(), it will - * stop waiting for a call to SDL_WaitThread() and clean up immediately. - * It is not safe to detach a thread that might be used with SDL_WaitThread(). + * Once a thread is detached, you should usually assume the SDL_Thread isn't + * safe to reference again, as it will become invalid immediately upon the + * detached thread's exit, instead of remaining until someone has called + * SDL_WaitThread() to finally clean it up. As such, don't detach the same + * thread more than once. * - * You may not call SDL_WaitThread() on a thread that has been detached. - * Use either that function or this one, but not both, or behavior is - * undefined. + * If a thread has already exited when passed to SDL_DetachThread(), it will + * stop waiting for a call to SDL_WaitThread() and clean up immediately. It is + * not safe to detach a thread that might be used with SDL_WaitThread(). * - * It is safe to pass NULL to this function; it is a no-op. + * You may not call SDL_WaitThread() on a thread that has been detached. Use + * either that function or this one, but not both, or behavior is undefined. + * + * It is safe to pass NULL to this function; it is a no-op. + * + * \param thread the SDL_Thread pointer that was returned from the + * SDL_CreateThread() call that started this thread + * + * \since This function is available since SDL 2.0.2. + * + * \sa SDL_CreateThread + * \sa SDL_WaitThread */ extern DECLSPEC void SDLCALL SDL_DetachThread(SDL_Thread * thread); /** - * \brief Create an identifier that is globally visible to all threads but refers to data that is thread-specific. + * Create a piece of thread-local storage. * - * \return The newly created thread local storage identifier, or 0 on error + * This creates an identifier that is globally visible to all threads but + * refers to data that is thread-specific. * - * \code - * static SDL_SpinLock tls_lock; - * static SDL_TLSID thread_local_storage; - * - * void SetMyThreadData(void *value) - * { - * if (!thread_local_storage) { - * SDL_AtomicLock(&tls_lock); - * if (!thread_local_storage) { - * thread_local_storage = SDL_TLSCreate(); - * } - * SDL_AtomicUnlock(&tls_lock); - * } - * SDL_TLSSet(thread_local_storage, value, 0); - * } - * - * void *GetMyThreadData(void) - * { - * return SDL_TLSGet(thread_local_storage); - * } - * \endcode + * \returns the newly created thread local storage identifier or 0 on error. * - * \sa SDL_TLSGet() - * \sa SDL_TLSSet() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_TLSGet + * \sa SDL_TLSSet */ extern DECLSPEC SDL_TLSID SDLCALL SDL_TLSCreate(void); /** - * \brief Get the value associated with a thread local storage ID for the current thread. + * Get the current thread's value associated with a thread local storage ID. * - * \param id The thread local storage ID + * \param id the thread local storage ID + * \returns the value associated with the ID for the current thread or NULL if + * no value has been set; call SDL_GetError() for more information. * - * \return The value associated with the ID for the current thread, or NULL if no value has been set. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_TLSCreate() - * \sa SDL_TLSSet() + * \sa SDL_TLSCreate + * \sa SDL_TLSSet */ extern DECLSPEC void * SDLCALL SDL_TLSGet(SDL_TLSID id); /** - * \brief Set the value associated with a thread local storage ID for the current thread. + * Set the current thread's value associated with a thread local storage ID. * - * \param id The thread local storage ID - * \param value The value to associate with the ID for the current thread - * \param destructor A function called when the thread exits, to free the value. + * The function prototype for `destructor` is: * - * \return 0 on success, -1 on error + * ```c + * void destructor(void *value) + * ``` * - * \sa SDL_TLSCreate() - * \sa SDL_TLSGet() + * where its parameter `value` is what was passed as `value` to SDL_TLSSet(). + * + * \param id the thread local storage ID + * \param value the value to associate with the ID for the current thread + * \param destructor a function called when the thread exits, to free the + * value + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_TLSCreate + * \sa SDL_TLSGet */ extern DECLSPEC int SDLCALL SDL_TLSSet(SDL_TLSID id, const void *value, void (SDLCALL *destructor)(void*)); +/** + * Cleanup all TLS data for this thread. + * + * \since This function is available since SDL 2.0.16. + */ +extern DECLSPEC void SDLCALL SDL_TLSCleanup(void); /* Ends C function definitions when using C++ */ #ifdef __cplusplus diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_timer.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_timer.h index 2a47b043a..62f81d42d 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_timer.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_timer.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -38,45 +38,121 @@ extern "C" { #endif /** - * \brief Get the number of milliseconds since the SDL library initialization. + * Get the number of milliseconds since SDL library initialization. * - * \note This value wraps if the program runs for more than ~49 days. + * This value wraps if the program runs for more than ~49 days. + * + * This function is not recommended as of SDL 2.0.18; use SDL_GetTicks64() + * instead, where the value doesn't wrap every ~49 days. There are places in + * SDL where we provide a 32-bit timestamp that can not change without + * breaking binary compatibility, though, so this function isn't officially + * deprecated. + * + * \returns an unsigned 32-bit value representing the number of milliseconds + * since the SDL library initialized. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_TICKS_PASSED */ extern DECLSPEC Uint32 SDLCALL SDL_GetTicks(void); /** - * \brief Compare SDL ticks values, and return true if A has passed B + * Get the number of milliseconds since SDL library initialization. * - * e.g. if you want to wait 100 ms, you could do this: - * Uint32 timeout = SDL_GetTicks() + 100; - * while (!SDL_TICKS_PASSED(SDL_GetTicks(), timeout)) { - * ... do work until timeout has elapsed - * } + * Note that you should not use the SDL_TICKS_PASSED macro with values + * returned by this function, as that macro does clever math to compensate for + * the 32-bit overflow every ~49 days that SDL_GetTicks() suffers from. 64-bit + * values from this function can be safely compared directly. + * + * For example, if you want to wait 100 ms, you could do this: + * + * ```c + * const Uint64 timeout = SDL_GetTicks64() + 100; + * while (SDL_GetTicks64() < timeout) { + * // ... do work until timeout has elapsed + * } + * ``` + * + * \returns an unsigned 64-bit value representing the number of milliseconds + * since the SDL library initialized. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC Uint64 SDLCALL SDL_GetTicks64(void); + +/** + * Compare 32-bit SDL ticks values, and return true if `A` has passed `B`. + * + * This should be used with results from SDL_GetTicks(), as this macro + * attempts to deal with the 32-bit counter wrapping back to zero every ~49 + * days, but should _not_ be used with SDL_GetTicks64(), which does not have + * that problem. + * + * For example, with SDL_GetTicks(), if you want to wait 100 ms, you could + * do this: + * + * ```c + * const Uint32 timeout = SDL_GetTicks() + 100; + * while (!SDL_TICKS_PASSED(SDL_GetTicks(), timeout)) { + * // ... do work until timeout has elapsed + * } + * ``` + * + * Note that this does not handle tick differences greater + * than 2^31 so take care when using the above kind of code + * with large timeout delays (tens of days). */ #define SDL_TICKS_PASSED(A, B) ((Sint32)((B) - (A)) <= 0) /** - * \brief Get the current value of the high resolution counter + * Get the current value of the high resolution counter. + * + * This function is typically used for profiling. + * + * The counter values are only meaningful relative to each other. Differences + * between values can be converted to times by using + * SDL_GetPerformanceFrequency(). + * + * \returns the current counter value. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetPerformanceFrequency */ extern DECLSPEC Uint64 SDLCALL SDL_GetPerformanceCounter(void); /** - * \brief Get the count per second of the high resolution counter + * Get the count per second of the high resolution counter. + * + * \returns a platform-specific count per second. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetPerformanceCounter */ extern DECLSPEC Uint64 SDLCALL SDL_GetPerformanceFrequency(void); /** - * \brief Wait a specified number of milliseconds before returning. + * Wait a specified number of milliseconds before returning. + * + * This function waits a specified number of milliseconds before returning. It + * waits at least the specified time, but possibly longer due to OS + * scheduling. + * + * \param ms the number of milliseconds to delay + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC void SDLCALL SDL_Delay(Uint32 ms); /** - * Function prototype for the timer callback function. + * Function prototype for the timer callback function. * - * The callback function is passed the current timer interval and returns - * the next timer interval. If the returned value is the same as the one - * passed in, the periodic alarm continues, otherwise a new alarm is - * scheduled. If the callback returns 0, the periodic alarm is cancelled. + * The callback function is passed the current timer interval and returns + * the next timer interval. If the returned value is the same as the one + * passed in, the periodic alarm continues, otherwise a new alarm is + * scheduled. If the callback returns 0, the periodic alarm is cancelled. */ typedef Uint32 (SDLCALL * SDL_TimerCallback) (Uint32 interval, void *param); @@ -86,20 +162,51 @@ typedef Uint32 (SDLCALL * SDL_TimerCallback) (Uint32 interval, void *param); typedef int SDL_TimerID; /** - * \brief Add a new timer to the pool of timers already running. + * Call a callback function at a future time. * - * \return A timer ID, or 0 when an error occurs. + * If you use this function, you must pass `SDL_INIT_TIMER` to SDL_Init(). + * + * The callback function is passed the current timer interval and the user + * supplied parameter from the SDL_AddTimer() call and should return the next + * timer interval. If the value returned from the callback is 0, the timer is + * canceled. + * + * The callback is run on a separate thread. + * + * Timers take into account the amount of time it took to execute the + * callback. For example, if the callback took 250 ms to execute and returned + * 1000 (ms), the timer would only wait another 750 ms before its next + * iteration. + * + * Timing may be inexact due to OS scheduling. Be sure to note the current + * time with SDL_GetTicks() or SDL_GetPerformanceCounter() in case your + * callback needs to adjust for variances. + * + * \param interval the timer delay, in milliseconds, passed to `callback` + * \param callback the SDL_TimerCallback function to call when the specified + * `interval` elapses + * \param param a pointer that is passed to `callback` + * \returns a timer ID or 0 if an error occurs; call SDL_GetError() for more + * information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RemoveTimer */ extern DECLSPEC SDL_TimerID SDLCALL SDL_AddTimer(Uint32 interval, SDL_TimerCallback callback, void *param); /** - * \brief Remove a timer knowing its ID. + * Remove a timer created with SDL_AddTimer(). * - * \return A boolean value indicating success or failure. + * \param id the ID of the timer to remove + * \returns SDL_TRUE if the timer is removed or SDL_FALSE if the timer wasn't + * found. * - * \warning It is not safe to remove a timer multiple times. + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_AddTimer */ extern DECLSPEC SDL_bool SDLCALL SDL_RemoveTimer(SDL_TimerID id); diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_touch.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_touch.h index 99dbcb8c3..9b00716b2 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_touch.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_touch.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -64,30 +64,70 @@ typedef struct SDL_Finger #define SDL_MOUSE_TOUCHID ((Sint64)-1) -/* Function prototypes */ - /** - * \brief Get the number of registered touch devices. + * Get the number of registered touch devices. + * + * On some platforms SDL first sees the touch device if it was actually used. + * Therefore SDL_GetNumTouchDevices() may return 0 although devices are + * available. After using all devices at least once the number will be + * correct. + * + * This was fixed for Android in SDL 2.0.1. + * + * \returns the number of registered touch devices. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetTouchDevice */ extern DECLSPEC int SDLCALL SDL_GetNumTouchDevices(void); /** - * \brief Get the touch ID with the given index, or 0 if the index is invalid. + * Get the touch ID with the given index. + * + * \param index the touch device index + * \returns the touch ID with the given index on success or 0 if the index is + * invalid; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetNumTouchDevices */ extern DECLSPEC SDL_TouchID SDLCALL SDL_GetTouchDevice(int index); /** - * \brief Get the type of the given touch device. + * Get the type of the given touch device. + * + * \since This function is available since SDL 2.0.10. */ extern DECLSPEC SDL_TouchDeviceType SDLCALL SDL_GetTouchDeviceType(SDL_TouchID touchID); /** - * \brief Get the number of active fingers for a given touch device. + * Get the number of active fingers for a given touch device. + * + * \param touchID the ID of a touch device + * \returns the number of active fingers for a given touch device on success + * or 0 on failure; call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetTouchFinger */ extern DECLSPEC int SDLCALL SDL_GetNumTouchFingers(SDL_TouchID touchID); /** - * \brief Get the finger object of the given touch, with the given index. + * Get the finger object for specified touch device ID and finger index. + * + * The returned resource is owned by SDL and should not be deallocated. + * + * \param touchID the ID of the requested touch device + * \param index the index of the requested finger + * \returns a pointer to the SDL_Finger object or NULL if no object at the + * given ID and index could be found. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_RecordGesture */ extern DECLSPEC SDL_Finger * SDLCALL SDL_GetTouchFinger(SDL_TouchID touchID, int index); diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_types.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_types.h index 9c3e9896f..355fb501a 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_types.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_types.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_version.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_version.h index 6c7499d32..2716eba7b 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_version.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_version.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -37,16 +37,16 @@ extern "C" { #endif /** - * \brief Information the version of SDL in use. + * Information about the version of SDL in use. * - * Represents the library's version as three levels: major revision - * (increments with massive changes, additions, and enhancements), - * minor revision (increments with backwards-compatible changes to the - * major revision), and patchlevel (increments with fixes to the minor - * revision). + * Represents the library's version as three levels: major revision + * (increments with massive changes, additions, and enhancements), + * minor revision (increments with backwards-compatible changes to the + * major revision), and patchlevel (increments with fixes to the minor + * revision). * - * \sa SDL_VERSION - * \sa SDL_GetVersion + * \sa SDL_VERSION + * \sa SDL_GetVersion */ typedef struct SDL_version { @@ -59,22 +59,22 @@ typedef struct SDL_version */ #define SDL_MAJOR_VERSION 2 #define SDL_MINOR_VERSION 0 -#define SDL_PATCHLEVEL 10 +#define SDL_PATCHLEVEL 20 /** - * \brief Macro to determine SDL version program was compiled against. + * Macro to determine SDL version program was compiled against. * - * This macro fills in a SDL_version structure with the version of the - * library you compiled against. This is determined by what header the - * compiler uses. Note that if you dynamically linked the library, you might - * have a slightly newer or older version at runtime. That version can be - * determined with SDL_GetVersion(), which, unlike SDL_VERSION(), - * is not a macro. + * This macro fills in a SDL_version structure with the version of the + * library you compiled against. This is determined by what header the + * compiler uses. Note that if you dynamically linked the library, you might + * have a slightly newer or older version at runtime. That version can be + * determined with SDL_GetVersion(), which, unlike SDL_VERSION(), + * is not a macro. * - * \param x A pointer to a SDL_version struct to initialize. + * \param x A pointer to a SDL_version struct to initialize. * - * \sa SDL_version - * \sa SDL_GetVersion + * \sa SDL_version + * \sa SDL_GetVersion */ #define SDL_VERSION(x) \ { \ @@ -107,48 +107,74 @@ typedef struct SDL_version (SDL_COMPILEDVERSION >= SDL_VERSIONNUM(X, Y, Z)) /** - * \brief Get the version of SDL that is linked against your program. + * Get the version of SDL that is linked against your program. * - * If you are linking to SDL dynamically, then it is possible that the - * current version will be different than the version you compiled against. - * This function returns the current version, while SDL_VERSION() is a - * macro that tells you what version you compiled with. + * If you are linking to SDL dynamically, then it is possible that the current + * version will be different than the version you compiled against. This + * function returns the current version, while SDL_VERSION() is a macro that + * tells you what version you compiled with. * - * \code - * SDL_version compiled; - * SDL_version linked; + * This function may be called safely at any time, even before SDL_Init(). * - * SDL_VERSION(&compiled); - * SDL_GetVersion(&linked); - * printf("We compiled against SDL version %d.%d.%d ...\n", - * compiled.major, compiled.minor, compiled.patch); - * printf("But we linked against SDL version %d.%d.%d.\n", - * linked.major, linked.minor, linked.patch); - * \endcode + * \param ver the SDL_version structure that contains the version information * - * This function may be called safely at any time, even before SDL_Init(). + * \since This function is available since SDL 2.0.0. * - * \sa SDL_VERSION + * \sa SDL_GetRevision */ extern DECLSPEC void SDLCALL SDL_GetVersion(SDL_version * ver); /** - * \brief Get the code revision of SDL that is linked against your program. + * Get the code revision of SDL that is linked against your program. * - * Returns an arbitrary string (a hash value) uniquely identifying the - * exact revision of the SDL library in use, and is only useful in comparing - * against other revisions. It is NOT an incrementing number. + * This value is the revision of the code you are linked with and may be + * different from the code you are compiling with, which is found in the + * constant SDL_REVISION. + * + * The revision is arbitrary string (a hash value) uniquely identifying the + * exact revision of the SDL library in use, and is only useful in comparing + * against other revisions. It is NOT an incrementing number. + * + * If SDL wasn't built from a git repository with the appropriate tools, this + * will return an empty string. + * + * Prior to SDL 2.0.16, before development moved to GitHub, this returned a + * hash for a Mercurial repository. + * + * You shouldn't use this function for anything but logging it for debugging + * purposes. The string is not intended to be reliable in any way. + * + * \returns an arbitrary string, uniquely identifying the exact revision of + * the SDL library in use. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetVersion */ extern DECLSPEC const char *SDLCALL SDL_GetRevision(void); /** - * \brief Get the revision number of SDL that is linked against your program. + * Obsolete function, do not use. * - * Returns a number uniquely identifying the exact revision of the SDL - * library in use. It is an incrementing number based on commits to - * hg.libsdl.org. + * When SDL was hosted in a Mercurial repository, and was built carefully, + * this would return the revision number that the build was created from. This + * number was not reliable for several reasons, but more importantly, SDL is + * now hosted in a git repository, which does not offer numbers at all, only + * hashes. This function only ever returns zero now. Don't use it. + * + * Before SDL 2.0.16, this might have returned an unreliable, but non-zero + * number. + * + * \deprecated Use SDL_GetRevision() instead; if SDL was carefully built, it + * will return a git hash. + * + * \returns zero, always, in modern SDL releases. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetRevision */ -extern DECLSPEC int SDLCALL SDL_GetRevisionNumber(void); +extern SDL_DEPRECATED DECLSPEC int SDLCALL SDL_GetRevisionNumber(void); /* Ends C function definitions when using C++ */ diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_video.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_video.h index 352afd436..e43cb27ec 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_video.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_video.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -65,9 +65,12 @@ typedef struct * \sa SDL_CreateWindow() * \sa SDL_CreateWindowFrom() * \sa SDL_DestroyWindow() + * \sa SDL_FlashWindow() * \sa SDL_GetWindowData() * \sa SDL_GetWindowFlags() * \sa SDL_GetWindowGrab() + * \sa SDL_GetWindowKeyboardGrab() + * \sa SDL_GetWindowMouseGrab() * \sa SDL_GetWindowPosition() * \sa SDL_GetWindowSize() * \sa SDL_GetWindowTitle() @@ -79,6 +82,8 @@ typedef struct * \sa SDL_SetWindowData() * \sa SDL_SetWindowFullscreen() * \sa SDL_SetWindowGrab() + * \sa SDL_SetWindowKeyboardGrab() + * \sa SDL_SetWindowMouseGrab() * \sa SDL_SetWindowIcon() * \sa SDL_SetWindowPosition() * \sa SDL_SetWindowSize() @@ -96,7 +101,6 @@ typedef struct SDL_Window SDL_Window; */ typedef enum { - /* !!! FIXME: change this to name = (1<= 1 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetVideoDriver */ extern DECLSPEC int SDLCALL SDL_GetNumVideoDrivers(void); /** - * \brief Get the name of a built in video driver. + * Get the name of a built in video driver. * - * \note The video drivers are presented in the order in which they are - * normally checked during initialization. + * The video drivers are presented in the order in which they are normally + * checked during initialization. * - * \sa SDL_GetNumVideoDrivers() + * \param index the index of a video driver + * \returns the name of the video driver with the given **index**. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetNumVideoDrivers */ extern DECLSPEC const char *SDLCALL SDL_GetVideoDriver(int index); /** - * \brief Initialize the video subsystem, optionally specifying a video driver. + * Initialize the video subsystem, optionally specifying a video driver. * - * \param driver_name Initialize a specific driver by name, or NULL for the - * default video driver. + * This function initializes the video subsystem, setting up a connection to + * the window manager, etc, and determines the available display modes and + * pixel formats, but does not initialize a window or graphics mode. * - * \return 0 on success, -1 on error + * If you use this function and you haven't used the SDL_INIT_VIDEO flag with + * either SDL_Init() or SDL_InitSubSystem(), you should call SDL_VideoQuit() + * before calling SDL_Quit(). * - * This function initializes the video subsystem; setting up a connection - * to the window manager, etc, and determines the available display modes - * and pixel formats, but does not initialize a window or graphics mode. + * It is safe to call this function multiple times. SDL_VideoInit() will call + * SDL_VideoQuit() itself if the video subsystem has already been initialized. * - * \sa SDL_VideoQuit() + * You can use SDL_GetNumVideoDrivers() and SDL_GetVideoDriver() to find a + * specific `driver_name`. + * + * \param driver_name the name of a video driver to initialize, or NULL for + * the default driver + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetNumVideoDrivers + * \sa SDL_GetVideoDriver + * \sa SDL_InitSubSystem + * \sa SDL_VideoQuit */ extern DECLSPEC int SDLCALL SDL_VideoInit(const char *driver_name); /** - * \brief Shuts down the video subsystem. + * Shut down the video subsystem, if initialized with SDL_VideoInit(). * - * This function closes all windows, and restores the original video mode. + * This function closes all windows, and restores the original video mode. * - * \sa SDL_VideoInit() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_VideoInit */ extern DECLSPEC void SDLCALL SDL_VideoQuit(void); /** - * \brief Returns the name of the currently initialized video driver. + * Get the name of the currently initialized video driver. * - * \return The name of the current video driver or NULL if no driver - * has been initialized + * \returns the name of the current video driver or NULL if no driver has been + * initialized. * - * \sa SDL_GetNumVideoDrivers() - * \sa SDL_GetVideoDriver() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetNumVideoDrivers + * \sa SDL_GetVideoDriver */ extern DECLSPEC const char *SDLCALL SDL_GetCurrentVideoDriver(void); /** - * \brief Returns the number of available video displays. + * Get the number of available video displays. * - * \sa SDL_GetDisplayBounds() + * \returns a number >= 1 or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetDisplayBounds */ extern DECLSPEC int SDLCALL SDL_GetNumVideoDisplays(void); /** - * \brief Get the name of a display in UTF-8 encoding + * Get the name of a display in UTF-8 encoding. * - * \return The name of a display, or NULL for an invalid display index. + * \param displayIndex the index of display from which the name should be + * queried + * \returns the name of a display or NULL for an invalid display index or + * failure; call SDL_GetError() for more information. * - * \sa SDL_GetNumVideoDisplays() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetNumVideoDisplays */ extern DECLSPEC const char * SDLCALL SDL_GetDisplayName(int displayIndex); /** - * \brief Get the desktop area represented by a display, with the primary - * display located at 0,0 + * Get the desktop area represented by a display. * - * \return 0 on success, or -1 if the index is out of range. + * The primary display (`displayIndex` zero) is always located at 0,0. * - * \sa SDL_GetNumVideoDisplays() + * \param displayIndex the index of the display to query + * \param rect the SDL_Rect structure filled in with the display bounds + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetNumVideoDisplays */ extern DECLSPEC int SDLCALL SDL_GetDisplayBounds(int displayIndex, SDL_Rect * rect); /** - * \brief Get the usable desktop area represented by a display, with the - * primary display located at 0,0 + * Get the usable desktop area represented by a display. * - * This is the same area as SDL_GetDisplayBounds() reports, but with portions - * reserved by the system removed. For example, on Mac OS X, this subtracts - * the area occupied by the menu bar and dock. + * The primary display (`displayIndex` zero) is always located at 0,0. * - * Setting a window to be fullscreen generally bypasses these unusable areas, - * so these are good guidelines for the maximum space available to a - * non-fullscreen window. + * This is the same area as SDL_GetDisplayBounds() reports, but with portions + * reserved by the system removed. For example, on Apple's macOS, this + * subtracts the area occupied by the menu bar and dock. * - * \return 0 on success, or -1 if the index is out of range. + * Setting a window to be fullscreen generally bypasses these unusable areas, + * so these are good guidelines for the maximum space available to a + * non-fullscreen window. * - * \sa SDL_GetDisplayBounds() - * \sa SDL_GetNumVideoDisplays() + * The parameter `rect` is ignored if it is NULL. + * + * This function also returns -1 if the parameter `displayIndex` is out of + * range. + * + * \param displayIndex the index of the display to query the usable bounds + * from + * \param rect the SDL_Rect structure filled in with the display bounds + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.5. + * + * \sa SDL_GetDisplayBounds + * \sa SDL_GetNumVideoDisplays */ extern DECLSPEC int SDLCALL SDL_GetDisplayUsableBounds(int displayIndex, SDL_Rect * rect); /** - * \brief Get the dots/pixels-per-inch for a display + * Get the dots/pixels-per-inch for a display. * - * \note Diagonal, horizontal and vertical DPI can all be optionally - * returned if the parameter is non-NULL. + * Diagonal, horizontal and vertical DPI can all be optionally returned if the + * appropriate parameter is non-NULL. * - * \return 0 on success, or -1 if no DPI information is available or the index is out of range. + * A failure of this function usually means that either no DPI information is + * available or the `displayIndex` is out of range. * - * \sa SDL_GetNumVideoDisplays() + * \param displayIndex the index of the display from which DPI information + * should be queried + * \param ddpi a pointer filled in with the diagonal DPI of the display; may + * be NULL + * \param hdpi a pointer filled in with the horizontal DPI of the display; may + * be NULL + * \param vdpi a pointer filled in with the vertical DPI of the display; may + * be NULL + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.4. + * + * \sa SDL_GetNumVideoDisplays */ extern DECLSPEC int SDLCALL SDL_GetDisplayDPI(int displayIndex, float * ddpi, float * hdpi, float * vdpi); /** - * \brief Get the orientation of a display + * Get the orientation of a display. * - * \return The orientation of the display, or SDL_ORIENTATION_UNKNOWN if it isn't available. + * \param displayIndex the index of the display to query + * \returns The SDL_DisplayOrientation enum value of the display, or + * `SDL_ORIENTATION_UNKNOWN` if it isn't available. * - * \sa SDL_GetNumVideoDisplays() + * \since This function is available since SDL 2.0.9. + * + * \sa SDL_GetNumVideoDisplays */ extern DECLSPEC SDL_DisplayOrientation SDLCALL SDL_GetDisplayOrientation(int displayIndex); /** - * \brief Returns the number of available display modes. + * Get the number of available display modes. * - * \sa SDL_GetDisplayMode() + * The `displayIndex` needs to be in the range from 0 to + * SDL_GetNumVideoDisplays() - 1. + * + * \param displayIndex the index of the display to query + * \returns a number >= 1 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetDisplayMode + * \sa SDL_GetNumVideoDisplays */ extern DECLSPEC int SDLCALL SDL_GetNumDisplayModes(int displayIndex); /** - * \brief Fill in information about a specific display mode. + * Get information about a specific display mode. * - * \note The display modes are sorted in this priority: - * \li bits per pixel -> more colors to fewer colors - * \li width -> largest to smallest - * \li height -> largest to smallest - * \li refresh rate -> highest to lowest + * The display modes are sorted in this priority: * - * \sa SDL_GetNumDisplayModes() + * - width -> largest to smallest + * - height -> largest to smallest + * - bits per pixel -> more colors to fewer colors + * - packed pixel layout -> largest to smallest + * - refresh rate -> highest to lowest + * + * \param displayIndex the index of the display to query + * \param modeIndex the index of the display mode to query + * \param mode an SDL_DisplayMode structure filled in with the mode at + * `modeIndex` + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetNumDisplayModes */ extern DECLSPEC int SDLCALL SDL_GetDisplayMode(int displayIndex, int modeIndex, SDL_DisplayMode * mode); /** - * \brief Fill in information about the desktop display mode. + * Get information about the desktop's display mode. + * + * There's a difference between this function and SDL_GetCurrentDisplayMode() + * when SDL runs fullscreen and has changed the resolution. In that case this + * function will return the previous native display mode, and not the current + * display mode. + * + * \param displayIndex the index of the display to query + * \param mode an SDL_DisplayMode structure filled in with the current display + * mode + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetCurrentDisplayMode + * \sa SDL_GetDisplayMode + * \sa SDL_SetWindowDisplayMode */ extern DECLSPEC int SDLCALL SDL_GetDesktopDisplayMode(int displayIndex, SDL_DisplayMode * mode); /** - * \brief Fill in information about the current display mode. + * Get information about the current display mode. + * + * There's a difference between this function and SDL_GetDesktopDisplayMode() + * when SDL runs fullscreen and has changed the resolution. In that case this + * function will return the current display mode, and not the previous native + * display mode. + * + * \param displayIndex the index of the display to query + * \param mode an SDL_DisplayMode structure filled in with the current display + * mode + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetDesktopDisplayMode + * \sa SDL_GetDisplayMode + * \sa SDL_GetNumVideoDisplays + * \sa SDL_SetWindowDisplayMode */ extern DECLSPEC int SDLCALL SDL_GetCurrentDisplayMode(int displayIndex, SDL_DisplayMode * mode); /** - * \brief Get the closest match to the requested display mode. + * Get the closest match to the requested display mode. * - * \param displayIndex The index of display from which mode should be queried. - * \param mode The desired display mode - * \param closest A pointer to a display mode to be filled in with the closest - * match of the available display modes. + * The available display modes are scanned and `closest` is filled in with the + * closest mode matching the requested mode and returned. The mode format and + * refresh rate default to the desktop mode if they are set to 0. The modes + * are scanned with size being first priority, format being second priority, + * and finally checking the refresh rate. If all the available modes are too + * small, then NULL is returned. * - * \return The passed in value \c closest, or NULL if no matching video mode - * was available. + * \param displayIndex the index of the display to query + * \param mode an SDL_DisplayMode structure containing the desired display + * mode + * \param closest an SDL_DisplayMode structure filled in with the closest + * match of the available display modes + * \returns the passed in value `closest` or NULL if no matching video mode + * was available; call SDL_GetError() for more information. * - * The available display modes are scanned, and \c closest is filled in with the - * closest mode matching the requested mode and returned. The mode format and - * refresh_rate default to the desktop mode if they are 0. The modes are - * scanned with size being first priority, format being second priority, and - * finally checking the refresh_rate. If all the available modes are too - * small, then NULL is returned. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_GetNumDisplayModes() - * \sa SDL_GetDisplayMode() + * \sa SDL_GetDisplayMode + * \sa SDL_GetNumDisplayModes */ extern DECLSPEC SDL_DisplayMode * SDLCALL SDL_GetClosestDisplayMode(int displayIndex, const SDL_DisplayMode * mode, SDL_DisplayMode * closest); /** - * \brief Get the display index associated with a window. + * Get the index of the display associated with a window. * - * \return the display index of the display containing the center of the - * window, or -1 on error. + * \param window the window to query + * \returns the index of the display containing the center of the window on + * success or a negative error code on failure; call SDL_GetError() + * for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetDisplayBounds + * \sa SDL_GetNumVideoDisplays */ extern DECLSPEC int SDLCALL SDL_GetWindowDisplayIndex(SDL_Window * window); /** - * \brief Set the display mode used when a fullscreen window is visible. + * Set the display mode to use when a window is visible at fullscreen. * - * By default the window's dimensions and the desktop format and refresh rate - * are used. + * This only affects the display mode used when the window is fullscreen. To + * change the window size when the window is not fullscreen, use + * SDL_SetWindowSize(). * - * \param window The window for which the display mode should be set. - * \param mode The mode to use, or NULL for the default mode. + * \param window the window to affect + * \param mode the SDL_DisplayMode structure representing the mode to use, or + * NULL to use the window's dimensions and the desktop's format + * and refresh rate + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 if setting the display mode failed. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_GetWindowDisplayMode() - * \sa SDL_SetWindowFullscreen() + * \sa SDL_GetWindowDisplayMode + * \sa SDL_SetWindowFullscreen */ extern DECLSPEC int SDLCALL SDL_SetWindowDisplayMode(SDL_Window * window, - const SDL_DisplayMode - * mode); + const SDL_DisplayMode * mode); /** - * \brief Fill in information about the display mode used when a fullscreen - * window is visible. + * Query the display mode to use when a window is visible at fullscreen. * - * \sa SDL_SetWindowDisplayMode() - * \sa SDL_SetWindowFullscreen() + * \param window the window to query + * \param mode an SDL_DisplayMode structure filled in with the fullscreen + * display mode + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetWindowDisplayMode + * \sa SDL_SetWindowFullscreen */ extern DECLSPEC int SDLCALL SDL_GetWindowDisplayMode(SDL_Window * window, SDL_DisplayMode * mode); /** - * \brief Get the pixel format associated with the window. + * Get the raw ICC profile data for the screen the window is currently on. + * + * Data returned should be freed with SDL_free. + * + * \param window the window to query + * \param size the size of the ICC profile + * \returns the raw ICC profile data on success or NULL on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.18. + */ +extern DECLSPEC void* SDLCALL SDL_GetWindowICCProfile(SDL_Window * window, size_t* size); + +/** + * Get the pixel format associated with the window. + * + * \param window the window to query + * \returns the pixel format of the window on success or + * SDL_PIXELFORMAT_UNKNOWN on failure; call SDL_GetError() for more + * information. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC Uint32 SDLCALL SDL_GetWindowPixelFormat(SDL_Window * window); /** - * \brief Create a window with the specified position, dimensions, and flags. + * Create a window with the specified position, dimensions, and flags. * - * \param title The title of the window, in UTF-8 encoding. - * \param x The x position of the window, ::SDL_WINDOWPOS_CENTERED, or - * ::SDL_WINDOWPOS_UNDEFINED. - * \param y The y position of the window, ::SDL_WINDOWPOS_CENTERED, or - * ::SDL_WINDOWPOS_UNDEFINED. - * \param w The width of the window, in screen coordinates. - * \param h The height of the window, in screen coordinates. - * \param flags The flags for the window, a mask of any of the following: - * ::SDL_WINDOW_FULLSCREEN, ::SDL_WINDOW_OPENGL, - * ::SDL_WINDOW_HIDDEN, ::SDL_WINDOW_BORDERLESS, - * ::SDL_WINDOW_RESIZABLE, ::SDL_WINDOW_MAXIMIZED, - * ::SDL_WINDOW_MINIMIZED, ::SDL_WINDOW_INPUT_GRABBED, - * ::SDL_WINDOW_ALLOW_HIGHDPI, ::SDL_WINDOW_VULKAN. + * `flags` may be any of the following OR'd together: * - * \return The created window, or NULL if window creation failed. + * - `SDL_WINDOW_FULLSCREEN`: fullscreen window + * - `SDL_WINDOW_FULLSCREEN_DESKTOP`: fullscreen window at desktop resolution + * - `SDL_WINDOW_OPENGL`: window usable with an OpenGL context + * - `SDL_WINDOW_VULKAN`: window usable with a Vulkan instance + * - `SDL_WINDOW_METAL`: window usable with a Metal instance + * - `SDL_WINDOW_HIDDEN`: window is not visible + * - `SDL_WINDOW_BORDERLESS`: no window decoration + * - `SDL_WINDOW_RESIZABLE`: window can be resized + * - `SDL_WINDOW_MINIMIZED`: window is minimized + * - `SDL_WINDOW_MAXIMIZED`: window is maximized + * - `SDL_WINDOW_INPUT_GRABBED`: window has grabbed input focus + * - `SDL_WINDOW_ALLOW_HIGHDPI`: window should be created in high-DPI mode if + * supported (>= SDL 2.0.1) * - * If the window is created with the SDL_WINDOW_ALLOW_HIGHDPI flag, its size - * in pixels may differ from its size in screen coordinates on platforms with - * high-DPI support (e.g. iOS and Mac OS X). Use SDL_GetWindowSize() to query - * the client area's size in screen coordinates, and SDL_GL_GetDrawableSize(), - * SDL_Vulkan_GetDrawableSize(), or SDL_GetRendererOutputSize() to query the - * drawable size in pixels. + * `SDL_WINDOW_SHOWN` is ignored by SDL_CreateWindow(). The SDL_Window is + * implicitly shown if SDL_WINDOW_HIDDEN is not set. `SDL_WINDOW_SHOWN` may be + * queried later using SDL_GetWindowFlags(). * - * If the window is created with any of the SDL_WINDOW_OPENGL or - * SDL_WINDOW_VULKAN flags, then the corresponding LoadLibrary function - * (SDL_GL_LoadLibrary or SDL_Vulkan_LoadLibrary) is called and the - * corresponding UnloadLibrary function is called by SDL_DestroyWindow(). + * On Apple's macOS, you **must** set the NSHighResolutionCapable Info.plist + * property to YES, otherwise you will not receive a High-DPI OpenGL canvas. * - * If SDL_WINDOW_VULKAN is specified and there isn't a working Vulkan driver, - * SDL_CreateWindow() will fail because SDL_Vulkan_LoadLibrary() will fail. + * If the window is created with the `SDL_WINDOW_ALLOW_HIGHDPI` flag, its size + * in pixels may differ from its size in screen coordinates on platforms with + * high-DPI support (e.g. iOS and macOS). Use SDL_GetWindowSize() to query the + * client area's size in screen coordinates, and SDL_GL_GetDrawableSize() or + * SDL_GetRendererOutputSize() to query the drawable size in pixels. * - * \note On non-Apple devices, SDL requires you to either not link to the - * Vulkan loader or link to a dynamic library version. This limitation - * may be removed in a future version of SDL. + * If the window is set fullscreen, the width and height parameters `w` and + * `h` will not be used. However, invalid size parameters (e.g. too large) may + * still fail. Window size is actually limited to 16384 x 16384 for all + * platforms at window creation. * - * \sa SDL_DestroyWindow() - * \sa SDL_GL_LoadLibrary() - * \sa SDL_Vulkan_LoadLibrary() + * If the window is created with any of the SDL_WINDOW_OPENGL or + * SDL_WINDOW_VULKAN flags, then the corresponding LoadLibrary function + * (SDL_GL_LoadLibrary or SDL_Vulkan_LoadLibrary) is called and the + * corresponding UnloadLibrary function is called by SDL_DestroyWindow(). + * + * If SDL_WINDOW_VULKAN is specified and there isn't a working Vulkan driver, + * SDL_CreateWindow() will fail because SDL_Vulkan_LoadLibrary() will fail. + * + * If SDL_WINDOW_METAL is specified on an OS that does not support Metal, + * SDL_CreateWindow() will fail. + * + * On non-Apple devices, SDL requires you to either not link to the Vulkan + * loader or link to a dynamic library version. This limitation may be removed + * in a future version of SDL. + * + * \param title the title of the window, in UTF-8 encoding + * \param x the x position of the window, `SDL_WINDOWPOS_CENTERED`, or + * `SDL_WINDOWPOS_UNDEFINED` + * \param y the y position of the window, `SDL_WINDOWPOS_CENTERED`, or + * `SDL_WINDOWPOS_UNDEFINED` + * \param w the width of the window, in screen coordinates + * \param h the height of the window, in screen coordinates + * \param flags 0, or one or more SDL_WindowFlags OR'd together + * \returns the window that was created or NULL on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateWindowFrom + * \sa SDL_DestroyWindow */ extern DECLSPEC SDL_Window * SDLCALL SDL_CreateWindow(const char *title, int x, int y, int w, int h, Uint32 flags); /** - * \brief Create an SDL window from an existing native window. + * Create an SDL window from an existing native window. * - * \param data A pointer to driver-dependent window creation data + * In some cases (e.g. OpenGL) and on some platforms (e.g. Microsoft Windows) + * the hint `SDL_HINT_VIDEO_WINDOW_SHARE_PIXEL_FORMAT` needs to be configured + * before using SDL_CreateWindowFrom(). * - * \return The created window, or NULL if window creation failed. + * \param data a pointer to driver-dependent window creation data, typically + * your native window cast to a void* + * \returns the window that was created or NULL on failure; call + * SDL_GetError() for more information. * - * \sa SDL_DestroyWindow() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateWindow + * \sa SDL_DestroyWindow */ extern DECLSPEC SDL_Window * SDLCALL SDL_CreateWindowFrom(const void *data); /** - * \brief Get the numeric ID of a window, for logging purposes. + * Get the numeric ID of a window. + * + * The numeric ID is what SDL_WindowEvent references, and is necessary to map + * these events to specific SDL_Window objects. + * + * \param window the window to query + * \returns the ID of the window on success or 0 on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowFromID */ extern DECLSPEC Uint32 SDLCALL SDL_GetWindowID(SDL_Window * window); /** - * \brief Get a window from a stored ID, or NULL if it doesn't exist. + * Get a window from a stored ID. + * + * The numeric ID is what SDL_WindowEvent references, and is necessary to map + * these events to specific SDL_Window objects. + * + * \param id the ID of the window + * \returns the window associated with `id` or NULL if it doesn't exist; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowID */ extern DECLSPEC SDL_Window * SDLCALL SDL_GetWindowFromID(Uint32 id); /** - * \brief Get the window flags. + * Get the window flags. + * + * \param window the window to query + * \returns a mask of the SDL_WindowFlags associated with `window` + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateWindow + * \sa SDL_HideWindow + * \sa SDL_MaximizeWindow + * \sa SDL_MinimizeWindow + * \sa SDL_SetWindowFullscreen + * \sa SDL_SetWindowGrab + * \sa SDL_ShowWindow */ extern DECLSPEC Uint32 SDLCALL SDL_GetWindowFlags(SDL_Window * window); /** - * \brief Set the title of a window, in UTF-8 format. + * Set the title of a window. * - * \sa SDL_GetWindowTitle() + * This string is expected to be in UTF-8 encoding. + * + * \param window the window to change + * \param title the desired window title in UTF-8 format + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowTitle */ extern DECLSPEC void SDLCALL SDL_SetWindowTitle(SDL_Window * window, const char *title); /** - * \brief Get the title of a window, in UTF-8 format. + * Get the title of a window. * - * \sa SDL_SetWindowTitle() + * \param window the window to query + * \returns the title of the window in UTF-8 format or "" if there is no + * title. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetWindowTitle */ extern DECLSPEC const char *SDLCALL SDL_GetWindowTitle(SDL_Window * window); /** - * \brief Set the icon for a window. + * Set the icon for a window. * - * \param window The window for which the icon should be set. - * \param icon The icon for the window. + * \param window the window to change + * \param icon an SDL_Surface structure containing the icon for the window + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC void SDLCALL SDL_SetWindowIcon(SDL_Window * window, SDL_Surface * icon); /** - * \brief Associate an arbitrary named pointer with a window. + * Associate an arbitrary named pointer with a window. * - * \param window The window to associate with the pointer. - * \param name The name of the pointer. - * \param userdata The associated pointer. + * `name` is case-sensitive. * - * \return The previous value associated with 'name' + * \param window the window to associate with the pointer + * \param name the name of the pointer + * \param userdata the associated pointer + * \returns the previous value associated with `name`. * - * \note The name is case-sensitive. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_GetWindowData() + * \sa SDL_GetWindowData */ extern DECLSPEC void* SDLCALL SDL_SetWindowData(SDL_Window * window, const char *name, void *userdata); /** - * \brief Retrieve the data pointer associated with a window. + * Retrieve the data pointer associated with a window. * - * \param window The window to query. - * \param name The name of the pointer. + * \param window the window to query + * \param name the name of the pointer + * \returns the value associated with `name`. * - * \return The value associated with 'name' + * \since This function is available since SDL 2.0.0. * - * \sa SDL_SetWindowData() + * \sa SDL_SetWindowData */ extern DECLSPEC void *SDLCALL SDL_GetWindowData(SDL_Window * window, const char *name); /** - * \brief Set the position of a window. + * Set the position of a window. * - * \param window The window to reposition. - * \param x The x coordinate of the window in screen coordinates, or - * ::SDL_WINDOWPOS_CENTERED or ::SDL_WINDOWPOS_UNDEFINED. - * \param y The y coordinate of the window in screen coordinates, or - * ::SDL_WINDOWPOS_CENTERED or ::SDL_WINDOWPOS_UNDEFINED. + * The window coordinate origin is the upper left of the display. * - * \note The window coordinate origin is the upper left of the display. + * \param window the window to reposition + * \param x the x coordinate of the window in screen coordinates, or + * `SDL_WINDOWPOS_CENTERED` or `SDL_WINDOWPOS_UNDEFINED` + * \param y the y coordinate of the window in screen coordinates, or + * `SDL_WINDOWPOS_CENTERED` or `SDL_WINDOWPOS_UNDEFINED` * - * \sa SDL_GetWindowPosition() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowPosition */ extern DECLSPEC void SDLCALL SDL_SetWindowPosition(SDL_Window * window, int x, int y); /** - * \brief Get the position of a window. + * Get the position of a window. * - * \param window The window to query. - * \param x Pointer to variable for storing the x position, in screen - * coordinates. May be NULL. - * \param y Pointer to variable for storing the y position, in screen - * coordinates. May be NULL. + * If you do not need the value for one of the positions a NULL may be passed + * in the `x` or `y` parameter. * - * \sa SDL_SetWindowPosition() + * \param window the window to query + * \param x a pointer filled in with the x position of the window, in screen + * coordinates, may be NULL + * \param y a pointer filled in with the y position of the window, in screen + * coordinates, may be NULL + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetWindowPosition */ extern DECLSPEC void SDLCALL SDL_GetWindowPosition(SDL_Window * window, int *x, int *y); /** - * \brief Set the size of a window's client area. + * Set the size of a window's client area. * - * \param window The window to resize. - * \param w The width of the window, in screen coordinates. Must be >0. - * \param h The height of the window, in screen coordinates. Must be >0. + * The window size in screen coordinates may differ from the size in pixels, + * if the window was created with `SDL_WINDOW_ALLOW_HIGHDPI` on a platform + * with high-dpi support (e.g. iOS or macOS). Use SDL_GL_GetDrawableSize() or + * SDL_GetRendererOutputSize() to get the real client area size in pixels. * - * \note Fullscreen windows automatically match the size of the display mode, - * and you should use SDL_SetWindowDisplayMode() to change their size. + * Fullscreen windows automatically match the size of the display mode, and + * you should use SDL_SetWindowDisplayMode() to change their size. * - * The window size in screen coordinates may differ from the size in pixels, if - * the window was created with SDL_WINDOW_ALLOW_HIGHDPI on a platform with - * high-dpi support (e.g. iOS or OS X). Use SDL_GL_GetDrawableSize() or - * SDL_GetRendererOutputSize() to get the real client area size in pixels. + * \param window the window to change + * \param w the width of the window in pixels, in screen coordinates, must be + * > 0 + * \param h the height of the window in pixels, in screen coordinates, must be + * > 0 * - * \sa SDL_GetWindowSize() - * \sa SDL_SetWindowDisplayMode() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowSize + * \sa SDL_SetWindowDisplayMode */ extern DECLSPEC void SDLCALL SDL_SetWindowSize(SDL_Window * window, int w, int h); /** - * \brief Get the size of a window's client area. + * Get the size of a window's client area. * - * \param window The window to query. - * \param w Pointer to variable for storing the width, in screen - * coordinates. May be NULL. - * \param h Pointer to variable for storing the height, in screen - * coordinates. May be NULL. + * NULL can safely be passed as the `w` or `h` parameter if the width or + * height value is not desired. * - * The window size in screen coordinates may differ from the size in pixels, if - * the window was created with SDL_WINDOW_ALLOW_HIGHDPI on a platform with - * high-dpi support (e.g. iOS or OS X). Use SDL_GL_GetDrawableSize() or - * SDL_GetRendererOutputSize() to get the real client area size in pixels. + * The window size in screen coordinates may differ from the size in pixels, + * if the window was created with `SDL_WINDOW_ALLOW_HIGHDPI` on a platform + * with high-dpi support (e.g. iOS or macOS). Use SDL_GL_GetDrawableSize(), + * SDL_Vulkan_GetDrawableSize(), or SDL_GetRendererOutputSize() to get the + * real client area size in pixels. * - * \sa SDL_SetWindowSize() + * \param window the window to query the width and height from + * \param w a pointer filled in with the width of the window, in screen + * coordinates, may be NULL + * \param h a pointer filled in with the height of the window, in screen + * coordinates, may be NULL + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_GetDrawableSize + * \sa SDL_Vulkan_GetDrawableSize + * \sa SDL_SetWindowSize */ extern DECLSPEC void SDLCALL SDL_GetWindowSize(SDL_Window * window, int *w, int *h); /** - * \brief Get the size of a window's borders (decorations) around the client area. + * Get the size of a window's borders (decorations) around the client area. * - * \param window The window to query. - * \param top Pointer to variable for storing the size of the top border. NULL is permitted. - * \param left Pointer to variable for storing the size of the left border. NULL is permitted. - * \param bottom Pointer to variable for storing the size of the bottom border. NULL is permitted. - * \param right Pointer to variable for storing the size of the right border. NULL is permitted. + * Note: If this function fails (returns -1), the size values will be + * initialized to 0, 0, 0, 0 (if a non-NULL pointer is provided), as if the + * window in question was borderless. * - * \return 0 on success, or -1 if getting this information is not supported. + * Note: This function may fail on systems where the window has not yet been + * decorated by the display server (for example, immediately after calling + * SDL_CreateWindow). It is recommended that you wait at least until the + * window has been presented and composited, so that the window system has a + * chance to decorate the window and provide the border dimensions to SDL. * - * \note if this function fails (returns -1), the size values will be - * initialized to 0, 0, 0, 0 (if a non-NULL pointer is provided), as - * if the window in question was borderless. + * This function also returns -1 if getting the information is not supported. + * + * \param window the window to query the size values of the border + * (decorations) from + * \param top pointer to variable for storing the size of the top border; NULL + * is permitted + * \param left pointer to variable for storing the size of the left border; + * NULL is permitted + * \param bottom pointer to variable for storing the size of the bottom + * border; NULL is permitted + * \param right pointer to variable for storing the size of the right border; + * NULL is permitted + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.5. + * + * \sa SDL_GetWindowSize */ extern DECLSPEC int SDLCALL SDL_GetWindowBordersSize(SDL_Window * window, int *top, int *left, int *bottom, int *right); /** - * \brief Set the minimum size of a window's client area. + * Set the minimum size of a window's client area. * - * \param window The window to set a new minimum size. - * \param min_w The minimum width of the window, must be >0 - * \param min_h The minimum height of the window, must be >0 + * \param window the window to change + * \param min_w the minimum width of the window in pixels + * \param min_h the minimum height of the window in pixels * - * \note You can't change the minimum size of a fullscreen window, it - * automatically matches the size of the display mode. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_GetWindowMinimumSize() - * \sa SDL_SetWindowMaximumSize() + * \sa SDL_GetWindowMinimumSize + * \sa SDL_SetWindowMaximumSize */ extern DECLSPEC void SDLCALL SDL_SetWindowMinimumSize(SDL_Window * window, int min_w, int min_h); /** - * \brief Get the minimum size of a window's client area. + * Get the minimum size of a window's client area. * - * \param window The window to query. - * \param w Pointer to variable for storing the minimum width, may be NULL - * \param h Pointer to variable for storing the minimum height, may be NULL + * \param window the window to query + * \param w a pointer filled in with the minimum width of the window, may be + * NULL + * \param h a pointer filled in with the minimum height of the window, may be + * NULL * - * \sa SDL_GetWindowMaximumSize() - * \sa SDL_SetWindowMinimumSize() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowMaximumSize + * \sa SDL_SetWindowMinimumSize */ extern DECLSPEC void SDLCALL SDL_GetWindowMinimumSize(SDL_Window * window, int *w, int *h); /** - * \brief Set the maximum size of a window's client area. + * Set the maximum size of a window's client area. * - * \param window The window to set a new maximum size. - * \param max_w The maximum width of the window, must be >0 - * \param max_h The maximum height of the window, must be >0 + * \param window the window to change + * \param max_w the maximum width of the window in pixels + * \param max_h the maximum height of the window in pixels * - * \note You can't change the maximum size of a fullscreen window, it - * automatically matches the size of the display mode. + * \since This function is available since SDL 2.0.0. * - * \sa SDL_GetWindowMaximumSize() - * \sa SDL_SetWindowMinimumSize() + * \sa SDL_GetWindowMaximumSize + * \sa SDL_SetWindowMinimumSize */ extern DECLSPEC void SDLCALL SDL_SetWindowMaximumSize(SDL_Window * window, int max_w, int max_h); /** - * \brief Get the maximum size of a window's client area. + * Get the maximum size of a window's client area. * - * \param window The window to query. - * \param w Pointer to variable for storing the maximum width, may be NULL - * \param h Pointer to variable for storing the maximum height, may be NULL + * \param window the window to query + * \param w a pointer filled in with the maximum width of the window, may be + * NULL + * \param h a pointer filled in with the maximum height of the window, may be + * NULL * - * \sa SDL_GetWindowMinimumSize() - * \sa SDL_SetWindowMaximumSize() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowMinimumSize + * \sa SDL_SetWindowMaximumSize */ extern DECLSPEC void SDLCALL SDL_GetWindowMaximumSize(SDL_Window * window, int *w, int *h); /** - * \brief Set the border state of a window. + * Set the border state of a window. * - * This will add or remove the window's SDL_WINDOW_BORDERLESS flag and - * add or remove the border from the actual window. This is a no-op if the - * window's border already matches the requested state. + * This will add or remove the window's `SDL_WINDOW_BORDERLESS` flag and add + * or remove the border from the actual window. This is a no-op if the + * window's border already matches the requested state. * - * \param window The window of which to change the border state. - * \param bordered SDL_FALSE to remove border, SDL_TRUE to add border. + * You can't change the border state of a fullscreen window. * - * \note You can't change the border state of a fullscreen window. + * \param window the window of which to change the border state + * \param bordered SDL_FALSE to remove border, SDL_TRUE to add border * - * \sa SDL_GetWindowFlags() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowFlags */ extern DECLSPEC void SDLCALL SDL_SetWindowBordered(SDL_Window * window, SDL_bool bordered); /** - * \brief Set the user-resizable state of a window. + * Set the user-resizable state of a window. * - * This will add or remove the window's SDL_WINDOW_RESIZABLE flag and - * allow/disallow user resizing of the window. This is a no-op if the - * window's resizable state already matches the requested state. + * This will add or remove the window's `SDL_WINDOW_RESIZABLE` flag and + * allow/disallow user resizing of the window. This is a no-op if the window's + * resizable state already matches the requested state. * - * \param window The window of which to change the resizable state. - * \param resizable SDL_TRUE to allow resizing, SDL_FALSE to disallow. + * You can't change the resizable state of a fullscreen window. * - * \note You can't change the resizable state of a fullscreen window. + * \param window the window of which to change the resizable state + * \param resizable SDL_TRUE to allow resizing, SDL_FALSE to disallow * - * \sa SDL_GetWindowFlags() + * \since This function is available since SDL 2.0.5. + * + * \sa SDL_GetWindowFlags */ extern DECLSPEC void SDLCALL SDL_SetWindowResizable(SDL_Window * window, SDL_bool resizable); /** - * \brief Show a window. + * Set the window to always be above the others. * - * \sa SDL_HideWindow() + * This will add or remove the window's `SDL_WINDOW_ALWAYS_ON_TOP` flag. This + * will bring the window to the front and keep the window above the rest. + * + * \param window The window of which to change the always on top state + * \param on_top SDL_TRUE to set the window always on top, SDL_FALSE to + * disable + * + * \since This function is available since SDL 2.0.16. + * + * \sa SDL_GetWindowFlags + */ +extern DECLSPEC void SDLCALL SDL_SetWindowAlwaysOnTop(SDL_Window * window, + SDL_bool on_top); + +/** + * Show a window. + * + * \param window the window to show + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_HideWindow + * \sa SDL_RaiseWindow */ extern DECLSPEC void SDLCALL SDL_ShowWindow(SDL_Window * window); /** - * \brief Hide a window. + * Hide a window. * - * \sa SDL_ShowWindow() + * \param window the window to hide + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_ShowWindow */ extern DECLSPEC void SDLCALL SDL_HideWindow(SDL_Window * window); /** - * \brief Raise a window above other windows and set the input focus. + * Raise a window above other windows and set the input focus. + * + * \param window the window to raise + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC void SDLCALL SDL_RaiseWindow(SDL_Window * window); /** - * \brief Make a window as large as possible. + * Make a window as large as possible. * - * \sa SDL_RestoreWindow() + * \param window the window to maximize + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_MinimizeWindow + * \sa SDL_RestoreWindow */ extern DECLSPEC void SDLCALL SDL_MaximizeWindow(SDL_Window * window); /** - * \brief Minimize a window to an iconic representation. + * Minimize a window to an iconic representation. * - * \sa SDL_RestoreWindow() + * \param window the window to minimize + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_MaximizeWindow + * \sa SDL_RestoreWindow */ extern DECLSPEC void SDLCALL SDL_MinimizeWindow(SDL_Window * window); /** - * \brief Restore the size and position of a minimized or maximized window. + * Restore the size and position of a minimized or maximized window. * - * \sa SDL_MaximizeWindow() - * \sa SDL_MinimizeWindow() + * \param window the window to restore + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_MaximizeWindow + * \sa SDL_MinimizeWindow */ extern DECLSPEC void SDLCALL SDL_RestoreWindow(SDL_Window * window); /** - * \brief Set a window's fullscreen state. + * Set a window's fullscreen state. * - * \return 0 on success, or -1 if setting the display mode failed. + * `flags` may be `SDL_WINDOW_FULLSCREEN`, for "real" fullscreen with a + * videomode change; `SDL_WINDOW_FULLSCREEN_DESKTOP` for "fake" fullscreen + * that takes the size of the desktop; and 0 for windowed mode. * - * \sa SDL_SetWindowDisplayMode() - * \sa SDL_GetWindowDisplayMode() + * \param window the window to change + * \param flags `SDL_WINDOW_FULLSCREEN`, `SDL_WINDOW_FULLSCREEN_DESKTOP` or 0 + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowDisplayMode + * \sa SDL_SetWindowDisplayMode */ extern DECLSPEC int SDLCALL SDL_SetWindowFullscreen(SDL_Window * window, Uint32 flags); /** - * \brief Get the SDL surface associated with the window. + * Get the SDL surface associated with the window. * - * \return The window's framebuffer surface, or NULL on error. + * A new surface will be created with the optimal format for the window, if + * necessary. This surface will be freed when the window is destroyed. Do not + * free this surface. * - * A new surface will be created with the optimal format for the window, - * if necessary. This surface will be freed when the window is destroyed. + * This surface will be invalidated if the window is resized. After resizing a + * window this function must be called again to return a valid surface. * - * \note You may not combine this with 3D or the rendering API on this window. + * You may not combine this with 3D or the rendering API on this window. * - * \sa SDL_UpdateWindowSurface() - * \sa SDL_UpdateWindowSurfaceRects() + * This function is affected by `SDL_HINT_FRAMEBUFFER_ACCELERATION`. + * + * \param window the window to query + * \returns the surface associated with the window, or NULL on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_UpdateWindowSurface + * \sa SDL_UpdateWindowSurfaceRects */ extern DECLSPEC SDL_Surface * SDLCALL SDL_GetWindowSurface(SDL_Window * window); /** - * \brief Copy the window surface to the screen. + * Copy the window surface to the screen. * - * \return 0 on success, or -1 on error. + * This is the function you use to reflect any changes to the surface on the + * screen. * - * \sa SDL_GetWindowSurface() - * \sa SDL_UpdateWindowSurfaceRects() + * This function is equivalent to the SDL 1.2 API SDL_Flip(). + * + * \param window the window to update + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowSurface + * \sa SDL_UpdateWindowSurfaceRects */ extern DECLSPEC int SDLCALL SDL_UpdateWindowSurface(SDL_Window * window); /** - * \brief Copy a number of rectangles on the window surface to the screen. + * Copy areas of the window surface to the screen. * - * \return 0 on success, or -1 on error. + * This is the function you use to reflect changes to portions of the surface + * on the screen. * - * \sa SDL_GetWindowSurface() - * \sa SDL_UpdateWindowSurface() + * This function is equivalent to the SDL 1.2 API SDL_UpdateRects(). + * + * \param window the window to update + * \param rects an array of SDL_Rect structures representing areas of the + * surface to copy + * \param numrects the number of rectangles + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowSurface + * \sa SDL_UpdateWindowSurface */ extern DECLSPEC int SDLCALL SDL_UpdateWindowSurfaceRects(SDL_Window * window, const SDL_Rect * rects, int numrects); /** - * \brief Set a window's input grab mode. + * Set a window's input grab mode. * - * \param window The window for which the input grab mode should be set. - * \param grabbed This is SDL_TRUE to grab input, and SDL_FALSE to release input. + * When input is grabbed, the mouse is confined to the window. This function + * will also grab the keyboard if `SDL_HINT_GRAB_KEYBOARD` is set. To grab the + * keyboard without also grabbing the mouse, use SDL_SetWindowKeyboardGrab(). * - * If the caller enables a grab while another window is currently grabbed, - * the other window loses its grab in favor of the caller's window. + * If the caller enables a grab while another window is currently grabbed, the + * other window loses its grab in favor of the caller's window. * - * \sa SDL_GetWindowGrab() + * \param window the window for which the input grab mode should be set + * \param grabbed SDL_TRUE to grab input or SDL_FALSE to release input + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetGrabbedWindow + * \sa SDL_GetWindowGrab */ extern DECLSPEC void SDLCALL SDL_SetWindowGrab(SDL_Window * window, SDL_bool grabbed); /** - * \brief Get a window's input grab mode. + * Set a window's keyboard grab mode. * - * \return This returns SDL_TRUE if input is grabbed, and SDL_FALSE otherwise. + * Keyboard grab enables capture of system keyboard shortcuts like Alt+Tab or + * the Meta/Super key. Note that not all system keyboard shortcuts can be + * captured by applications (one example is Ctrl+Alt+Del on Windows). * - * \sa SDL_SetWindowGrab() + * This is primarily intended for specialized applications such as VNC clients + * or VM frontends. Normal games should not use keyboard grab. + * + * When keyboard grab is enabled, SDL will continue to handle Alt+Tab when the + * window is full-screen to ensure the user is not trapped in your + * application. If you have a custom keyboard shortcut to exit fullscreen + * mode, you may suppress this behavior with + * `SDL_HINT_ALLOW_ALT_TAB_WHILE_GRABBED`. + * + * If the caller enables a grab while another window is currently grabbed, the + * other window loses its grab in favor of the caller's window. + * + * \param window The window for which the keyboard grab mode should be set. + * \param grabbed This is SDL_TRUE to grab keyboard, and SDL_FALSE to release. + * + * \since This function is available since SDL 2.0.16. + * + * \sa SDL_GetWindowKeyboardGrab + * \sa SDL_SetWindowMouseGrab + * \sa SDL_SetWindowGrab + */ +extern DECLSPEC void SDLCALL SDL_SetWindowKeyboardGrab(SDL_Window * window, + SDL_bool grabbed); + +/** + * Set a window's mouse grab mode. + * + * Mouse grab confines the mouse cursor to the window. + * + * \param window The window for which the mouse grab mode should be set. + * + * \since This function is available since SDL 2.0.16. + * + * \sa SDL_GetWindowMouseGrab + * \sa SDL_SetWindowKeyboardGrab + * \sa SDL_SetWindowGrab + */ +extern DECLSPEC void SDLCALL SDL_SetWindowMouseGrab(SDL_Window * window, + SDL_bool grabbed); + +/** + * Get a window's input grab mode. + * + * \param window the window to query + * \returns SDL_TRUE if input is grabbed, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetWindowGrab */ extern DECLSPEC SDL_bool SDLCALL SDL_GetWindowGrab(SDL_Window * window); /** - * \brief Get the window that currently has an input grab enabled. + * Get a window's keyboard grab mode. * - * \return This returns the window if input is grabbed, and NULL otherwise. + * \param window the window to query + * \returns SDL_TRUE if keyboard is grabbed, and SDL_FALSE otherwise. * - * \sa SDL_SetWindowGrab() + * \since This function is available since SDL 2.0.16. + * + * \sa SDL_SetWindowKeyboardGrab + * \sa SDL_GetWindowGrab + */ +extern DECLSPEC SDL_bool SDLCALL SDL_GetWindowKeyboardGrab(SDL_Window * window); + +/** + * Get a window's mouse grab mode. + * + * \param window the window to query + * \returns SDL_TRUE if mouse is grabbed, and SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.16. + * + * \sa SDL_SetWindowKeyboardGrab + * \sa SDL_GetWindowGrab + */ +extern DECLSPEC SDL_bool SDLCALL SDL_GetWindowMouseGrab(SDL_Window * window); + +/** + * Get the window that currently has an input grab enabled. + * + * \returns the window if input is grabbed or NULL otherwise. + * + * \since This function is available since SDL 2.0.4. + * + * \sa SDL_GetWindowGrab + * \sa SDL_SetWindowGrab */ extern DECLSPEC SDL_Window * SDLCALL SDL_GetGrabbedWindow(void); /** - * \brief Set the brightness (gamma correction) for a window. + * Confines the cursor to the specified area of a window. * - * \return 0 on success, or -1 if setting the brightness isn't supported. + * Note that this does NOT grab the cursor, it only defines the area a cursor + * is restricted to when the window has mouse focus. * - * \sa SDL_GetWindowBrightness() - * \sa SDL_SetWindowGammaRamp() + * \param window The window that will be associated with the barrier. + * \param rect A rectangle area in window-relative coordinates. If NULL the + * barrier for the specified window will be destroyed. + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_GetWindowMouseRect + * \sa SDL_SetWindowMouseGrab + */ +extern DECLSPEC int SDLCALL SDL_SetWindowMouseRect(SDL_Window * window, const SDL_Rect * rect); + +/** + * Get the mouse confinement rectangle of a window. + * + * \param window The window to query + * \returns A pointer to the mouse confinement rectangle of a window, or NULL + * if there isn't one. + * + * \since This function is available since SDL 2.0.18. + * + * \sa SDL_SetWindowMouseRect + */ +extern DECLSPEC const SDL_Rect * SDLCALL SDL_GetWindowMouseRect(SDL_Window * window); + +/** + * Set the brightness (gamma multiplier) for a given window's display. + * + * Despite the name and signature, this method sets the brightness of the + * entire display, not an individual window. A window is considered to be + * owned by the display that contains the window's center pixel. (The index of + * this display can be retrieved using SDL_GetWindowDisplayIndex().) The + * brightness set will not follow the window if it is moved to another + * display. + * + * Many platforms will refuse to set the display brightness in modern times. + * You are better off using a shader to adjust gamma during rendering, or + * something similar. + * + * \param window the window used to select the display whose brightness will + * be changed + * \param brightness the brightness (gamma multiplier) value to set where 0.0 + * is completely dark and 1.0 is normal brightness + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowBrightness + * \sa SDL_SetWindowGammaRamp */ extern DECLSPEC int SDLCALL SDL_SetWindowBrightness(SDL_Window * window, float brightness); /** - * \brief Get the brightness (gamma correction) for a window. + * Get the brightness (gamma multiplier) for a given window's display. * - * \return The last brightness value passed to SDL_SetWindowBrightness() + * Despite the name and signature, this method retrieves the brightness of the + * entire display, not an individual window. A window is considered to be + * owned by the display that contains the window's center pixel. (The index of + * this display can be retrieved using SDL_GetWindowDisplayIndex().) * - * \sa SDL_SetWindowBrightness() + * \param window the window used to select the display whose brightness will + * be queried + * \returns the brightness for the display where 0.0 is completely dark and + * 1.0 is normal brightness. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetWindowBrightness */ extern DECLSPEC float SDLCALL SDL_GetWindowBrightness(SDL_Window * window); /** - * \brief Set the opacity for a window + * Set the opacity for a window. * - * \param window The window which will be made transparent or opaque - * \param opacity Opacity (0.0f - transparent, 1.0f - opaque) This will be - * clamped internally between 0.0f and 1.0f. + * The parameter `opacity` will be clamped internally between 0.0f + * (transparent) and 1.0f (opaque). * - * \return 0 on success, or -1 if setting the opacity isn't supported. + * This function also returns -1 if setting the opacity isn't supported. * - * \sa SDL_GetWindowOpacity() + * \param window the window which will be made transparent or opaque + * \param opacity the opacity value (0.0f - transparent, 1.0f - opaque) + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.5. + * + * \sa SDL_GetWindowOpacity */ extern DECLSPEC int SDLCALL SDL_SetWindowOpacity(SDL_Window * window, float opacity); /** - * \brief Get the opacity of a window. + * Get the opacity of a window. * - * If transparency isn't supported on this platform, opacity will be reported - * as 1.0f without error. + * If transparency isn't supported on this platform, opacity will be reported + * as 1.0f without error. * - * \param window The window in question. - * \param out_opacity Opacity (0.0f - transparent, 1.0f - opaque) + * The parameter `opacity` is ignored if it is NULL. * - * \return 0 on success, or -1 on error (invalid window, etc). + * This function also returns -1 if an invalid window was provided. * - * \sa SDL_SetWindowOpacity() + * \param window the window to get the current opacity value from + * \param out_opacity the float filled in (0.0f - transparent, 1.0f - opaque) + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.5. + * + * \sa SDL_SetWindowOpacity */ extern DECLSPEC int SDLCALL SDL_GetWindowOpacity(SDL_Window * window, float * out_opacity); /** - * \brief Sets the window as a modal for another window (TODO: reconsider this function and/or its name) + * Set the window as a modal for another window. * - * \param modal_window The window that should be modal - * \param parent_window The parent window + * \param modal_window the window that should be set modal + * \param parent_window the parent window for the modal window + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 otherwise. + * \since This function is available since SDL 2.0.5. */ extern DECLSPEC int SDLCALL SDL_SetWindowModalFor(SDL_Window * modal_window, SDL_Window * parent_window); /** - * \brief Explicitly sets input focus to the window. + * Explicitly set input focus to the window. * - * You almost certainly want SDL_RaiseWindow() instead of this function. Use - * this with caution, as you might give focus to a window that's completely - * obscured by other windows. + * You almost certainly want SDL_RaiseWindow() instead of this function. Use + * this with caution, as you might give focus to a window that is completely + * obscured by other windows. * - * \param window The window that should get the input focus + * \param window the window that should get the input focus + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \return 0 on success, or -1 otherwise. - * \sa SDL_RaiseWindow() + * \since This function is available since SDL 2.0.5. + * + * \sa SDL_RaiseWindow */ extern DECLSPEC int SDLCALL SDL_SetWindowInputFocus(SDL_Window * window); /** - * \brief Set the gamma ramp for a window. + * Set the gamma ramp for the display that owns a given window. * - * \param window The window for which the gamma ramp should be set. - * \param red The translation table for the red channel, or NULL. - * \param green The translation table for the green channel, or NULL. - * \param blue The translation table for the blue channel, or NULL. + * Set the gamma translation table for the red, green, and blue channels of + * the video hardware. Each table is an array of 256 16-bit quantities, + * representing a mapping between the input and output for that channel. The + * input is the index into the array, and the output is the 16-bit gamma value + * at that index, scaled to the output color precision. * - * \return 0 on success, or -1 if gamma ramps are unsupported. + * Despite the name and signature, this method sets the gamma ramp of the + * entire display, not an individual window. A window is considered to be + * owned by the display that contains the window's center pixel. (The index of + * this display can be retrieved using SDL_GetWindowDisplayIndex().) The gamma + * ramp set will not follow the window if it is moved to another display. * - * Set the gamma translation table for the red, green, and blue channels - * of the video hardware. Each table is an array of 256 16-bit quantities, - * representing a mapping between the input and output for that channel. - * The input is the index into the array, and the output is the 16-bit - * gamma value at that index, scaled to the output color precision. + * \param window the window used to select the display whose gamma ramp will + * be changed + * \param red a 256 element array of 16-bit quantities representing the + * translation table for the red channel, or NULL + * \param green a 256 element array of 16-bit quantities representing the + * translation table for the green channel, or NULL + * \param blue a 256 element array of 16-bit quantities representing the + * translation table for the blue channel, or NULL + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_GetWindowGammaRamp() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GetWindowGammaRamp */ extern DECLSPEC int SDLCALL SDL_SetWindowGammaRamp(SDL_Window * window, const Uint16 * red, @@ -993,19 +1581,27 @@ extern DECLSPEC int SDLCALL SDL_SetWindowGammaRamp(SDL_Window * window, const Uint16 * blue); /** - * \brief Get the gamma ramp for a window. + * Get the gamma ramp for a given window's display. * - * \param window The window from which the gamma ramp should be queried. - * \param red A pointer to a 256 element array of 16-bit quantities to hold - * the translation table for the red channel, or NULL. - * \param green A pointer to a 256 element array of 16-bit quantities to hold - * the translation table for the green channel, or NULL. - * \param blue A pointer to a 256 element array of 16-bit quantities to hold - * the translation table for the blue channel, or NULL. + * Despite the name and signature, this method retrieves the gamma ramp of the + * entire display, not an individual window. A window is considered to be + * owned by the display that contains the window's center pixel. (The index of + * this display can be retrieved using SDL_GetWindowDisplayIndex().) * - * \return 0 on success, or -1 if gamma ramps are unsupported. + * \param window the window used to select the display whose gamma ramp will + * be queried + * \param red a 256 element array of 16-bit quantities filled in with the + * translation table for the red channel, or NULL + * \param green a 256 element array of 16-bit quantities filled in with the + * translation table for the green channel, or NULL + * \param blue a 256 element array of 16-bit quantities filled in with the + * translation table for the blue channel, or NULL + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \sa SDL_SetWindowGammaRamp() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_SetWindowGammaRamp */ extern DECLSPEC int SDLCALL SDL_GetWindowGammaRamp(SDL_Window * window, Uint16 * red, @@ -1013,9 +1609,9 @@ extern DECLSPEC int SDLCALL SDL_GetWindowGammaRamp(SDL_Window * window, Uint16 * blue); /** - * \brief Possible return values from the SDL_HitTest callback. + * Possible return values from the SDL_HitTest callback. * - * \sa SDL_HitTest + * \sa SDL_HitTest */ typedef enum { @@ -1032,82 +1628,129 @@ typedef enum } SDL_HitTestResult; /** - * \brief Callback used for hit-testing. + * Callback used for hit-testing. * - * \sa SDL_SetWindowHitTest + * \param win the SDL_Window where hit-testing was set on + * \param area an SDL_Point which should be hit-tested + * \param data what was passed as `callback_data` to SDL_SetWindowHitTest() + * \return an SDL_HitTestResult value. + * + * \sa SDL_SetWindowHitTest */ typedef SDL_HitTestResult (SDLCALL *SDL_HitTest)(SDL_Window *win, const SDL_Point *area, void *data); /** - * \brief Provide a callback that decides if a window region has special properties. + * Provide a callback that decides if a window region has special properties. * - * Normally windows are dragged and resized by decorations provided by the - * system window manager (a title bar, borders, etc), but for some apps, it - * makes sense to drag them from somewhere else inside the window itself; for - * example, one might have a borderless window that wants to be draggable - * from any part, or simulate its own title bar, etc. + * Normally windows are dragged and resized by decorations provided by the + * system window manager (a title bar, borders, etc), but for some apps, it + * makes sense to drag them from somewhere else inside the window itself; for + * example, one might have a borderless window that wants to be draggable from + * any part, or simulate its own title bar, etc. * - * This function lets the app provide a callback that designates pieces of - * a given window as special. This callback is run during event processing - * if we need to tell the OS to treat a region of the window specially; the - * use of this callback is known as "hit testing." + * This function lets the app provide a callback that designates pieces of a + * given window as special. This callback is run during event processing if we + * need to tell the OS to treat a region of the window specially; the use of + * this callback is known as "hit testing." * - * Mouse input may not be delivered to your application if it is within - * a special area; the OS will often apply that input to moving the window or - * resizing the window and not deliver it to the application. + * Mouse input may not be delivered to your application if it is within a + * special area; the OS will often apply that input to moving the window or + * resizing the window and not deliver it to the application. * - * Specifying NULL for a callback disables hit-testing. Hit-testing is - * disabled by default. + * Specifying NULL for a callback disables hit-testing. Hit-testing is + * disabled by default. * - * Platforms that don't support this functionality will return -1 - * unconditionally, even if you're attempting to disable hit-testing. + * Platforms that don't support this functionality will return -1 + * unconditionally, even if you're attempting to disable hit-testing. * - * Your callback may fire at any time, and its firing does not indicate any - * specific behavior (for example, on Windows, this certainly might fire - * when the OS is deciding whether to drag your window, but it fires for lots - * of other reasons, too, some unrelated to anything you probably care about - * _and when the mouse isn't actually at the location it is testing_). - * Since this can fire at any time, you should try to keep your callback - * efficient, devoid of allocations, etc. + * Your callback may fire at any time, and its firing does not indicate any + * specific behavior (for example, on Windows, this certainly might fire when + * the OS is deciding whether to drag your window, but it fires for lots of + * other reasons, too, some unrelated to anything you probably care about _and + * when the mouse isn't actually at the location it is testing_). Since this + * can fire at any time, you should try to keep your callback efficient, + * devoid of allocations, etc. * - * \param window The window to set hit-testing on. - * \param callback The callback to call when doing a hit-test. - * \param callback_data An app-defined void pointer passed to the callback. - * \return 0 on success, -1 on error (including unsupported). + * \param window the window to set hit-testing on + * \param callback the function to call when doing a hit-test + * \param callback_data an app-defined void pointer passed to **callback** + * \returns 0 on success or -1 on error (including unsupported); call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.4. */ extern DECLSPEC int SDLCALL SDL_SetWindowHitTest(SDL_Window * window, SDL_HitTest callback, void *callback_data); /** - * \brief Destroy a window. + * Request a window to demand attention from the user. + * + * \param window the window to be flashed + * \param operation the flash operation + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.16. + */ +extern DECLSPEC int SDLCALL SDL_FlashWindow(SDL_Window * window, SDL_FlashOperation operation); + +/** + * Destroy a window. + * + * If `window` is NULL, this function will return immediately after setting + * the SDL error message to "Invalid window". See SDL_GetError(). + * + * \param window the window to destroy + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_CreateWindow + * \sa SDL_CreateWindowFrom */ extern DECLSPEC void SDLCALL SDL_DestroyWindow(SDL_Window * window); /** - * \brief Returns whether the screensaver is currently enabled (default off). + * Check whether the screensaver is currently enabled. * - * \sa SDL_EnableScreenSaver() - * \sa SDL_DisableScreenSaver() + * The screensaver is disabled by default since SDL 2.0.2. Before SDL 2.0.2 + * the screensaver was enabled by default. + * + * The default can also be changed using `SDL_HINT_VIDEO_ALLOW_SCREENSAVER`. + * + * \returns SDL_TRUE if the screensaver is enabled, SDL_FALSE if it is + * disabled. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_DisableScreenSaver + * \sa SDL_EnableScreenSaver */ extern DECLSPEC SDL_bool SDLCALL SDL_IsScreenSaverEnabled(void); /** - * \brief Allow the screen to be blanked by a screensaver + * Allow the screen to be blanked by a screen saver. * - * \sa SDL_IsScreenSaverEnabled() - * \sa SDL_DisableScreenSaver() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_DisableScreenSaver + * \sa SDL_IsScreenSaverEnabled */ extern DECLSPEC void SDLCALL SDL_EnableScreenSaver(void); /** - * \brief Prevent the screen from being blanked by a screensaver + * Prevent the screen from being blanked by a screen saver. * - * \sa SDL_IsScreenSaverEnabled() - * \sa SDL_EnableScreenSaver() + * If you disable the screensaver, it is automatically re-enabled when SDL + * quits. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_EnableScreenSaver + * \sa SDL_IsScreenSaverEnabled */ extern DECLSPEC void SDLCALL SDL_DisableScreenSaver(void); @@ -1118,147 +1761,316 @@ extern DECLSPEC void SDLCALL SDL_DisableScreenSaver(void); /* @{ */ /** - * \brief Dynamically load an OpenGL library. + * Dynamically load an OpenGL library. * - * \param path The platform dependent OpenGL library name, or NULL to open the - * default OpenGL library. + * This should be done after initializing the video driver, but before + * creating any OpenGL windows. If no OpenGL library is loaded, the default + * library will be loaded upon creation of the first OpenGL window. * - * \return 0 on success, or -1 if the library couldn't be loaded. + * If you do this, you need to retrieve all of the GL functions used in your + * program from the dynamic library using SDL_GL_GetProcAddress(). * - * This should be done after initializing the video driver, but before - * creating any OpenGL windows. If no OpenGL library is loaded, the default - * library will be loaded upon creation of the first OpenGL window. + * \param path the platform dependent OpenGL library name, or NULL to open the + * default OpenGL library + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. * - * \note If you do this, you need to retrieve all of the GL functions used in - * your program from the dynamic library using SDL_GL_GetProcAddress(). + * \since This function is available since SDL 2.0.0. * - * \sa SDL_GL_GetProcAddress() - * \sa SDL_GL_UnloadLibrary() + * \sa SDL_GL_GetProcAddress + * \sa SDL_GL_UnloadLibrary */ extern DECLSPEC int SDLCALL SDL_GL_LoadLibrary(const char *path); /** - * \brief Get the address of an OpenGL function. + * Get an OpenGL function by name. + * + * If the GL library is loaded at runtime with SDL_GL_LoadLibrary(), then all + * GL functions must be retrieved this way. Usually this is used to retrieve + * function pointers to OpenGL extensions. + * + * There are some quirks to looking up OpenGL functions that require some + * extra care from the application. If you code carefully, you can handle + * these quirks without any platform-specific code, though: + * + * - On Windows, function pointers are specific to the current GL context; + * this means you need to have created a GL context and made it current + * before calling SDL_GL_GetProcAddress(). If you recreate your context or + * create a second context, you should assume that any existing function + * pointers aren't valid to use with it. This is (currently) a + * Windows-specific limitation, and in practice lots of drivers don't suffer + * this limitation, but it is still the way the wgl API is documented to + * work and you should expect crashes if you don't respect it. Store a copy + * of the function pointers that comes and goes with context lifespan. + * - On X11, function pointers returned by this function are valid for any + * context, and can even be looked up before a context is created at all. + * This means that, for at least some common OpenGL implementations, if you + * look up a function that doesn't exist, you'll get a non-NULL result that + * is _NOT_ safe to call. You must always make sure the function is actually + * available for a given GL context before calling it, by checking for the + * existence of the appropriate extension with SDL_GL_ExtensionSupported(), + * or verifying that the version of OpenGL you're using offers the function + * as core functionality. + * - Some OpenGL drivers, on all platforms, *will* return NULL if a function + * isn't supported, but you can't count on this behavior. Check for + * extensions you use, and if you get a NULL anyway, act as if that + * extension wasn't available. This is probably a bug in the driver, but you + * can code defensively for this scenario anyhow. + * - Just because you're on Linux/Unix, don't assume you'll be using X11. + * Next-gen display servers are waiting to replace it, and may or may not + * make the same promises about function pointers. + * - OpenGL function pointers must be declared `APIENTRY` as in the example + * code. This will ensure the proper calling convention is followed on + * platforms where this matters (Win32) thereby avoiding stack corruption. + * + * \param proc the name of an OpenGL function + * \returns a pointer to the named OpenGL function. The returned pointer + * should be cast to the appropriate function signature. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_ExtensionSupported + * \sa SDL_GL_LoadLibrary + * \sa SDL_GL_UnloadLibrary */ extern DECLSPEC void *SDLCALL SDL_GL_GetProcAddress(const char *proc); /** - * \brief Unload the OpenGL library previously loaded by SDL_GL_LoadLibrary(). + * Unload the OpenGL library previously loaded by SDL_GL_LoadLibrary(). * - * \sa SDL_GL_LoadLibrary() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_LoadLibrary */ extern DECLSPEC void SDLCALL SDL_GL_UnloadLibrary(void); /** - * \brief Return true if an OpenGL extension is supported for the current - * context. + * Check if an OpenGL extension is supported for the current context. + * + * This function operates on the current GL context; you must have created a + * context and it must be current before calling this function. Do not assume + * that all contexts you create will have the same set of extensions + * available, or that recreating an existing context will offer the same + * extensions again. + * + * While it's probably not a massive overhead, this function is not an O(1) + * operation. Check the extensions you care about after creating the GL + * context and save that information somewhere instead of calling the function + * every time you need to know. + * + * \param extension the name of the extension to check + * \returns SDL_TRUE if the extension is supported, SDL_FALSE otherwise. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC SDL_bool SDLCALL SDL_GL_ExtensionSupported(const char *extension); /** - * \brief Reset all previously set OpenGL context attributes to their default values + * Reset all previously set OpenGL context attributes to their default values. + * + * \since This function is available since SDL 2.0.2. + * + * \sa SDL_GL_GetAttribute + * \sa SDL_GL_SetAttribute */ extern DECLSPEC void SDLCALL SDL_GL_ResetAttributes(void); /** - * \brief Set an OpenGL window attribute before window creation. + * Set an OpenGL window attribute before window creation. * - * \return 0 on success, or -1 if the attribute could not be set. + * This function sets the OpenGL attribute `attr` to `value`. The requested + * attributes should be set before creating an OpenGL window. You should use + * SDL_GL_GetAttribute() to check the values after creating the OpenGL + * context, since the values obtained can differ from the requested ones. + * + * \param attr an SDL_GLattr enum value specifying the OpenGL attribute to set + * \param value the desired value for the attribute + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_GetAttribute + * \sa SDL_GL_ResetAttributes */ extern DECLSPEC int SDLCALL SDL_GL_SetAttribute(SDL_GLattr attr, int value); /** - * \brief Get the actual value for an attribute from the current context. + * Get the actual value for an attribute from the current context. * - * \return 0 on success, or -1 if the attribute could not be retrieved. - * The integer at \c value will be modified in either case. + * \param attr an SDL_GLattr enum value specifying the OpenGL attribute to get + * \param value a pointer filled in with the current value of `attr` + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_ResetAttributes + * \sa SDL_GL_SetAttribute */ extern DECLSPEC int SDLCALL SDL_GL_GetAttribute(SDL_GLattr attr, int *value); /** - * \brief Create an OpenGL context for use with an OpenGL window, and make it - * current. + * Create an OpenGL context for an OpenGL window, and make it current. * - * \sa SDL_GL_DeleteContext() + * Windows users new to OpenGL should note that, for historical reasons, GL + * functions added after OpenGL version 1.1 are not available by default. + * Those functions must be loaded at run-time, either with an OpenGL + * extension-handling library or with SDL_GL_GetProcAddress() and its related + * functions. + * + * SDL_GLContext is an alias for `void *`. It's opaque to the application. + * + * \param window the window to associate with the context + * \returns the OpenGL context associated with `window` or NULL on error; call + * SDL_GetError() for more details. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_DeleteContext + * \sa SDL_GL_MakeCurrent */ extern DECLSPEC SDL_GLContext SDLCALL SDL_GL_CreateContext(SDL_Window * window); /** - * \brief Set up an OpenGL context for rendering into an OpenGL window. + * Set up an OpenGL context for rendering into an OpenGL window. * - * \note The context must have been created with a compatible window. + * The context must have been created with a compatible window. + * + * \param window the window to associate with the context + * \param context the OpenGL context to associate with the window + * \returns 0 on success or a negative error code on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_CreateContext */ extern DECLSPEC int SDLCALL SDL_GL_MakeCurrent(SDL_Window * window, SDL_GLContext context); /** - * \brief Get the currently active OpenGL window. + * Get the currently active OpenGL window. + * + * \returns the currently active OpenGL window on success or NULL on failure; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC SDL_Window* SDLCALL SDL_GL_GetCurrentWindow(void); /** - * \brief Get the currently active OpenGL context. + * Get the currently active OpenGL context. + * + * \returns the currently active OpenGL context or NULL on failure; call + * SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_MakeCurrent */ extern DECLSPEC SDL_GLContext SDLCALL SDL_GL_GetCurrentContext(void); /** - * \brief Get the size of a window's underlying drawable in pixels (for use - * with glViewport). + * Get the size of a window's underlying drawable in pixels. * - * \param window Window from which the drawable size should be queried - * \param w Pointer to variable for storing the width in pixels, may be NULL - * \param h Pointer to variable for storing the height in pixels, may be NULL + * This returns info useful for calling glViewport(). * * This may differ from SDL_GetWindowSize() if we're rendering to a high-DPI - * drawable, i.e. the window was created with SDL_WINDOW_ALLOW_HIGHDPI on a - * platform with high-DPI support (Apple calls this "Retina"), and not disabled - * by the SDL_HINT_VIDEO_HIGHDPI_DISABLED hint. + * drawable, i.e. the window was created with `SDL_WINDOW_ALLOW_HIGHDPI` on a + * platform with high-DPI support (Apple calls this "Retina"), and not + * disabled by the `SDL_HINT_VIDEO_HIGHDPI_DISABLED` hint. * - * \sa SDL_GetWindowSize() - * \sa SDL_CreateWindow() + * \param window the window from which the drawable size should be queried + * \param w a pointer to variable for storing the width in pixels, may be NULL + * \param h a pointer to variable for storing the height in pixels, may be + * NULL + * + * \since This function is available since SDL 2.0.1. + * + * \sa SDL_CreateWindow + * \sa SDL_GetWindowSize */ extern DECLSPEC void SDLCALL SDL_GL_GetDrawableSize(SDL_Window * window, int *w, int *h); /** - * \brief Set the swap interval for the current OpenGL context. + * Set the swap interval for the current OpenGL context. * - * \param interval 0 for immediate updates, 1 for updates synchronized with the - * vertical retrace. If the system supports it, you may - * specify -1 to allow late swaps to happen immediately - * instead of waiting for the next retrace. + * Some systems allow specifying -1 for the interval, to enable adaptive + * vsync. Adaptive vsync works the same as vsync, but if you've already missed + * the vertical retrace for a given frame, it swaps buffers immediately, which + * might be less jarring for the user during occasional framerate drops. If an + * application requests adaptive vsync and the system does not support it, + * this function will fail and return -1. In such a case, you should probably + * retry the call with 1 for the interval. * - * \return 0 on success, or -1 if setting the swap interval is not supported. + * Adaptive vsync is implemented for some glX drivers with + * GLX_EXT_swap_control_tear: * - * \sa SDL_GL_GetSwapInterval() + * https://www.opengl.org/registry/specs/EXT/glx_swap_control_tear.txt + * + * and for some Windows drivers with WGL_EXT_swap_control_tear: + * + * https://www.opengl.org/registry/specs/EXT/wgl_swap_control_tear.txt + * + * Read more on the Khronos wiki: + * https://www.khronos.org/opengl/wiki/Swap_Interval#Adaptive_Vsync + * + * \param interval 0 for immediate updates, 1 for updates synchronized with + * the vertical retrace, -1 for adaptive vsync + * \returns 0 on success or -1 if setting the swap interval is not supported; + * call SDL_GetError() for more information. + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_GetSwapInterval */ extern DECLSPEC int SDLCALL SDL_GL_SetSwapInterval(int interval); /** - * \brief Get the swap interval for the current OpenGL context. + * Get the swap interval for the current OpenGL context. * - * \return 0 if there is no vertical retrace synchronization, 1 if the buffer + * If the system can't determine the swap interval, or there isn't a valid + * current context, this function will return 0 as a safe default. + * + * \returns 0 if there is no vertical retrace synchronization, 1 if the buffer * swap is synchronized with the vertical retrace, and -1 if late - * swaps happen immediately instead of waiting for the next retrace. - * If the system can't determine the swap interval, or there isn't a - * valid current context, this will return 0 as a safe default. + * swaps happen immediately instead of waiting for the next retrace; + * call SDL_GetError() for more information. * - * \sa SDL_GL_SetSwapInterval() + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_SetSwapInterval */ extern DECLSPEC int SDLCALL SDL_GL_GetSwapInterval(void); /** - * \brief Swap the OpenGL buffers for a window, if double-buffering is - * supported. + * Update a window with OpenGL rendering. + * + * This is used with double-buffered OpenGL contexts, which are the default. + * + * On macOS, make sure you bind 0 to the draw framebuffer before swapping the + * window, otherwise nothing will happen. If you aren't using + * glBindFramebuffer(), this is the default and you won't have to do anything + * extra. + * + * \param window the window to change + * + * \since This function is available since SDL 2.0.0. */ extern DECLSPEC void SDLCALL SDL_GL_SwapWindow(SDL_Window * window); /** - * \brief Delete an OpenGL context. + * Delete an OpenGL context. * - * \sa SDL_GL_CreateContext() + * \param context the OpenGL context to be deleted + * + * \since This function is available since SDL 2.0.0. + * + * \sa SDL_GL_CreateContext */ extern DECLSPEC void SDLCALL SDL_GL_DeleteContext(SDL_GLContext context); diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_vulkan.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_vulkan.h index d69a436b3..ab86a0b86 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_vulkan.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/SDL_vulkan.h @@ -66,203 +66,140 @@ typedef VkSurfaceKHR SDL_vulkanSurface; /* for compatibility with Tizen */ /* @{ */ /** - * \brief Dynamically load a Vulkan loader library. + * Dynamically load the Vulkan loader library. * - * \param [in] path The platform dependent Vulkan loader library name, or - * \c NULL. + * This should be called after initializing the video driver, but before + * creating any Vulkan windows. If no Vulkan loader library is loaded, the + * default library will be loaded upon creation of the first Vulkan window. * - * \return \c 0 on success, or \c -1 if the library couldn't be loaded. + * It is fairly common for Vulkan applications to link with libvulkan instead + * of explicitly loading it at run time. This will work with SDL provided the + * application links to a dynamic library and both it and SDL use the same + * search path. * - * If \a path is NULL SDL will use the value of the environment variable - * \c SDL_VULKAN_LIBRARY, if set, otherwise it loads the default Vulkan - * loader library. + * If you specify a non-NULL `path`, an application should retrieve all of the + * Vulkan functions it uses from the dynamic library using + * SDL_Vulkan_GetVkGetInstanceProcAddr unless you can guarantee `path` points + * to the same vulkan loader library the application linked to. * - * This should be called after initializing the video driver, but before - * creating any Vulkan windows. If no Vulkan loader library is loaded, the - * default library will be loaded upon creation of the first Vulkan window. + * On Apple devices, if `path` is NULL, SDL will attempt to find the + * `vkGetInstanceProcAddr` address within all the Mach-O images of the current + * process. This is because it is fairly common for Vulkan applications to + * link with libvulkan (and historically MoltenVK was provided as a static + * library). If it is not found, on macOS, SDL will attempt to load + * `vulkan.framework/vulkan`, `libvulkan.1.dylib`, + * `MoltenVK.framework/MoltenVK`, and `libMoltenVK.dylib`, in that order. On + * iOS, SDL will attempt to load `libMoltenVK.dylib`. Applications using a + * dynamic framework or .dylib must ensure it is included in its application + * bundle. * - * \note It is fairly common for Vulkan applications to link with \a libvulkan - * instead of explicitly loading it at run time. This will work with - * SDL provided the application links to a dynamic library and both it - * and SDL use the same search path. + * On non-Apple devices, application linking with a static libvulkan is not + * supported. Either do not link to the Vulkan loader or link to a dynamic + * library version. * - * \note If you specify a non-NULL \c path, an application should retrieve all - * of the Vulkan functions it uses from the dynamic library using - * \c SDL_Vulkan_GetVkGetInstanceProcAddr() unless you can guarantee - * \c path points to the same vulkan loader library the application - * linked to. + * \param path The platform dependent Vulkan loader library name or NULL + * \returns 0 on success or -1 if the library couldn't be loaded; call + * SDL_GetError() for more information. * - * \note On Apple devices, if \a path is NULL, SDL will attempt to find - * the vkGetInstanceProcAddr address within all the mach-o images of - * the current process. This is because it is fairly common for Vulkan - * applications to link with libvulkan (and historically MoltenVK was - * provided as a static library). If it is not found then, on macOS, SDL - * will attempt to load \c vulkan.framework/vulkan, \c libvulkan.1.dylib, - * followed by \c libvulkan.dylib, in that order. - * On iOS SDL will attempt to load \c libvulkan.dylib only. Applications - * using a dynamic framework or .dylib must ensure it is included in its - * application bundle. + * \since This function is available since SDL 2.0.6. * - * \note On non-Apple devices, application linking with a static libvulkan is - * not supported. Either do not link to the Vulkan loader or link to a - * dynamic library version. - * - * \note This function will fail if there are no working Vulkan drivers - * installed. - * - * \sa SDL_Vulkan_GetVkGetInstanceProcAddr() - * \sa SDL_Vulkan_UnloadLibrary() + * \sa SDL_Vulkan_GetVkInstanceProcAddr + * \sa SDL_Vulkan_UnloadLibrary */ extern DECLSPEC int SDLCALL SDL_Vulkan_LoadLibrary(const char *path); /** - * \brief Get the address of the \c vkGetInstanceProcAddr function. + * Get the address of the `vkGetInstanceProcAddr` function. * - * \note This should be called after either calling SDL_Vulkan_LoadLibrary - * or creating an SDL_Window with the SDL_WINDOW_VULKAN flag. + * This should be called after either calling SDL_Vulkan_LoadLibrary() or + * creating an SDL_Window with the `SDL_WINDOW_VULKAN` flag. + * + * \returns the function pointer for `vkGetInstanceProcAddr` or NULL on error. + * + * \since This function is available since SDL 2.0.6. */ extern DECLSPEC void *SDLCALL SDL_Vulkan_GetVkGetInstanceProcAddr(void); /** - * \brief Unload the Vulkan loader library previously loaded by - * \c SDL_Vulkan_LoadLibrary(). + * Unload the Vulkan library previously loaded by SDL_Vulkan_LoadLibrary() * - * \sa SDL_Vulkan_LoadLibrary() + * \since This function is available since SDL 2.0.6. + * + * \sa SDL_Vulkan_LoadLibrary */ extern DECLSPEC void SDLCALL SDL_Vulkan_UnloadLibrary(void); /** - * \brief Get the names of the Vulkan instance extensions needed to create - * a surface with \c SDL_Vulkan_CreateSurface(). + * Get the names of the Vulkan instance extensions needed to create a surface + * with SDL_Vulkan_CreateSurface. * - * \param [in] \c NULL or window Window for which the required Vulkan instance - * extensions should be retrieved - * \param [in,out] pCount pointer to an \c unsigned related to the number of - * required Vulkan instance extensions - * \param [out] pNames \c NULL or a pointer to an array to be filled with the - * required Vulkan instance extensions + * If `pNames` is NULL, then the number of required Vulkan instance extensions + * is returned in `pCount`. Otherwise, `pCount` must point to a variable set + * to the number of elements in the `pNames` array, and on return the variable + * is overwritten with the number of names actually written to `pNames`. If + * `pCount` is less than the number of required extensions, at most `pCount` + * structures will be written. If `pCount` is smaller than the number of + * required extensions, SDL_FALSE will be returned instead of SDL_TRUE, to + * indicate that not all the required extensions were returned. * - * \return \c SDL_TRUE on success, \c SDL_FALSE on error. + * The `window` parameter is currently needed to be valid as of SDL 2.0.8, + * however, this parameter will likely be removed in future releases * - * If \a pNames is \c NULL, then the number of required Vulkan instance - * extensions is returned in pCount. Otherwise, \a pCount must point to a - * variable set to the number of elements in the \a pNames array, and on - * return the variable is overwritten with the number of names actually - * written to \a pNames. If \a pCount is less than the number of required - * extensions, at most \a pCount structures will be written. If \a pCount - * is smaller than the number of required extensions, \c SDL_FALSE will be - * returned instead of \c SDL_TRUE, to indicate that not all the required - * extensions were returned. + * \param window A window for which the required Vulkan instance extensions + * should be retrieved (will be deprecated in a future release) + * \param pCount A pointer to an unsigned int corresponding to the number of + * extensions to be returned + * \param pNames NULL or a pointer to an array to be filled with required + * Vulkan instance extensions + * \returns SDL_TRUE on success, SDL_FALSE on error. * - * \note If \c window is not NULL, it will be checked against its creation - * flags to ensure that the Vulkan flag is present. This parameter - * will be removed in a future major release. + * \since This function is available since SDL 2.0.6. * - * \note The returned list of extensions will contain \c VK_KHR_surface - * and zero or more platform specific extensions - * - * \note The extension names queried here must be enabled when calling - * VkCreateInstance, otherwise surface creation will fail. - * - * \note \c window should have been created with the \c SDL_WINDOW_VULKAN flag - * or be \c NULL - * - * \code - * unsigned int count; - * // get count of required extensions - * if(!SDL_Vulkan_GetInstanceExtensions(NULL, &count, NULL)) - * handle_error(); - * - * static const char *const additionalExtensions[] = - * { - * VK_EXT_DEBUG_REPORT_EXTENSION_NAME, // example additional extension - * }; - * size_t additionalExtensionsCount = sizeof(additionalExtensions) / sizeof(additionalExtensions[0]); - * size_t extensionCount = count + additionalExtensionsCount; - * const char **names = malloc(sizeof(const char *) * extensionCount); - * if(!names) - * handle_error(); - * - * // get names of required extensions - * if(!SDL_Vulkan_GetInstanceExtensions(NULL, &count, names)) - * handle_error(); - * - * // copy additional extensions after required extensions - * for(size_t i = 0; i < additionalExtensionsCount; i++) - * names[i + count] = additionalExtensions[i]; - * - * VkInstanceCreateInfo instanceCreateInfo = {}; - * instanceCreateInfo.enabledExtensionCount = extensionCount; - * instanceCreateInfo.ppEnabledExtensionNames = names; - * // fill in rest of instanceCreateInfo - * - * VkInstance instance; - * // create the Vulkan instance - * VkResult result = vkCreateInstance(&instanceCreateInfo, NULL, &instance); - * free(names); - * \endcode - * - * \sa SDL_Vulkan_CreateSurface() + * \sa SDL_Vulkan_CreateSurface */ -extern DECLSPEC SDL_bool SDLCALL SDL_Vulkan_GetInstanceExtensions( - SDL_Window *window, - unsigned int *pCount, - const char **pNames); +extern DECLSPEC SDL_bool SDLCALL SDL_Vulkan_GetInstanceExtensions(SDL_Window *window, + unsigned int *pCount, + const char **pNames); /** - * \brief Create a Vulkan rendering surface for a window. + * Create a Vulkan rendering surface for a window. * - * \param [in] window SDL_Window to which to attach the rendering surface. - * \param [in] instance handle to the Vulkan instance to use. - * \param [out] surface pointer to a VkSurfaceKHR handle to receive the - * handle of the newly created surface. + * The `window` must have been created with the `SDL_WINDOW_VULKAN` flag and + * `instance` must have been created with extensions returned by + * SDL_Vulkan_GetInstanceExtensions() enabled. * - * \return \c SDL_TRUE on success, \c SDL_FALSE on error. + * \param window The window to which to attach the Vulkan surface + * \param instance The Vulkan instance handle + * \param surface A pointer to a VkSurfaceKHR handle to output the newly + * created surface + * \returns SDL_TRUE on success, SDL_FALSE on error. * - * \code - * VkInstance instance; - * SDL_Window *window; + * \since This function is available since SDL 2.0.6. * - * // create instance and window - * - * // create the Vulkan surface - * VkSurfaceKHR surface; - * if(!SDL_Vulkan_CreateSurface(window, instance, &surface)) - * handle_error(); - * \endcode - * - * \note \a window should have been created with the \c SDL_WINDOW_VULKAN flag. - * - * \note \a instance should have been created with the extensions returned - * by \c SDL_Vulkan_CreateSurface() enabled. - * - * \sa SDL_Vulkan_GetInstanceExtensions() + * \sa SDL_Vulkan_GetInstanceExtensions + * \sa SDL_Vulkan_GetDrawableSize */ -extern DECLSPEC SDL_bool SDLCALL SDL_Vulkan_CreateSurface( - SDL_Window *window, - VkInstance instance, - VkSurfaceKHR* surface); +extern DECLSPEC SDL_bool SDLCALL SDL_Vulkan_CreateSurface(SDL_Window *window, + VkInstance instance, + VkSurfaceKHR* surface); /** - * \brief Get the size of a window's underlying drawable in pixels (for use - * with setting viewport, scissor & etc). - * - * \param window SDL_Window from which the drawable size should be queried - * \param w Pointer to variable for storing the width in pixels, - * may be NULL - * \param h Pointer to variable for storing the height in pixels, - * may be NULL + * Get the size of the window's underlying drawable dimensions in pixels. * * This may differ from SDL_GetWindowSize() if we're rendering to a high-DPI - * drawable, i.e. the window was created with SDL_WINDOW_ALLOW_HIGHDPI on a - * platform with high-DPI support (Apple calls this "Retina"), and not disabled - * by the \c SDL_HINT_VIDEO_HIGHDPI_DISABLED hint. + * drawable, i.e. the window was created with `SDL_WINDOW_ALLOW_HIGHDPI` on a + * platform with high-DPI support (Apple calls this "Retina"), and not + * disabled by the `SDL_HINT_VIDEO_HIGHDPI_DISABLED` hint. * - * \note On macOS high-DPI support must be enabled for an application by - * setting NSHighResolutionCapable to true in its Info.plist. + * \param window an SDL_Window for which the size is to be queried + * \param w Pointer to the variable to write the width to or NULL + * \param h Pointer to the variable to write the height to or NULL * - * \sa SDL_GetWindowSize() - * \sa SDL_CreateWindow() + * \since This function is available since SDL 2.0.6. + * + * \sa SDL_GetWindowSize + * \sa SDL_CreateWindow + * \sa SDL_Vulkan_CreateSurface */ extern DECLSPEC void SDLCALL SDL_Vulkan_GetDrawableSize(SDL_Window * window, int *w, int *h); diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/begin_code.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/begin_code.h index 22c997c41..63f064b6f 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/begin_code.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/begin_code.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -51,15 +51,11 @@ /* Some compilers use a special export keyword */ #ifndef DECLSPEC -# if defined(__WIN32__) || defined(__WINRT__) -# ifdef __BORLANDC__ -# ifdef BUILD_SDL -# define DECLSPEC -# else -# define DECLSPEC __declspec(dllimport) -# endif -# else +# if defined(__WIN32__) || defined(__WINRT__) || defined(__CYGWIN__) +# ifdef DLL_EXPORT # define DECLSPEC __declspec(dllexport) +# else +# define DECLSPEC # endif # elif defined(__OS2__) # ifdef BUILD_SDL @@ -168,3 +164,24 @@ #endif #endif /* NULL */ #endif /* ! Mac OS X - breaks precompiled headers */ + +#ifndef SDL_FALLTHROUGH +#if (defined(__cplusplus) && __cplusplus >= 201703L) || \ + (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202000L) +#define SDL_FALLTHROUGH [[fallthrough]] +#else +#if defined(__has_attribute) +#define _HAS_FALLTHROUGH __has_attribute(__fallthrough__) +#else +#define _HAS_FALLTHROUGH 0 +#endif /* __has_attribute */ +#if _HAS_FALLTHROUGH && \ + ((defined(__GNUC__) && __GNUC__ >= 7) || \ + (defined(__clang_major__) && __clang_major__ >= 10)) +#define SDL_FALLTHROUGH __attribute__((__fallthrough__)) +#else +#define SDL_FALLTHROUGH do {} while (0) /* fallthrough */ +#endif /* _HAS_FALLTHROUGH */ +#undef _HAS_FALLTHROUGH +#endif /* C++17 or C2x */ +#endif /* SDL_FALLTHROUGH not defined */ diff --git a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/close_code.h b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/close_code.h index 8e4cac3da..dc73432f6 100644 --- a/libs/SDL2/x86_64-w64-mingw32/include/SDL2/close_code.h +++ b/libs/SDL2/x86_64-w64-mingw32/include/SDL2/close_code.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2019 Sam Lantinga + Copyright (C) 1997-2022 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/libs/SDL2/x86_64-w64-mingw32/lib/cmake/SDL2/sdl2-config-version.cmake b/libs/SDL2/x86_64-w64-mingw32/lib/cmake/SDL2/sdl2-config-version.cmake new file mode 100644 index 000000000..56af5b766 --- /dev/null +++ b/libs/SDL2/x86_64-w64-mingw32/lib/cmake/SDL2/sdl2-config-version.cmake @@ -0,0 +1,11 @@ +set(PACKAGE_VERSION "2.0.20") + +if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) + set(PACKAGE_VERSION_COMPATIBLE FALSE) +else() + set(PACKAGE_VERSION_COMPATIBLE TRUE) + if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION) + set(PACKAGE_VERSION_EXACT TRUE) + endif() +endif() + diff --git a/libs/SDL2/x86_64-w64-mingw32/lib/cmake/SDL2/sdl2-config.cmake b/libs/SDL2/x86_64-w64-mingw32/lib/cmake/SDL2/sdl2-config.cmake index 455d8ed55..8ef6ad450 100644 --- a/libs/SDL2/x86_64-w64-mingw32/lib/cmake/SDL2/sdl2-config.cmake +++ b/libs/SDL2/x86_64-w64-mingw32/lib/cmake/SDL2/sdl2-config.cmake @@ -3,9 +3,79 @@ set(prefix "/opt/local/x86_64-w64-mingw32") set(exec_prefix "${prefix}") set(libdir "${exec_prefix}/lib") -set(SDL2_PREFIX "/opt/local/x86_64-w64-mingw32") -set(SDL2_EXEC_PREFIX "/opt/local/x86_64-w64-mingw32") -set(SDL2_LIBDIR "${exec_prefix}/lib") -set(SDL2_INCLUDE_DIRS "${prefix}/include/SDL2") +set(includedir "${prefix}/include") +set(SDL2_PREFIX "${prefix}") +set(SDL2_EXEC_PREFIX "${exec_prefix}") +set(SDL2_LIBDIR "${libdir}") +set(SDL2_INCLUDE_DIRS "${includedir}/SDL2") set(SDL2_LIBRARIES "-L${SDL2_LIBDIR} -lmingw32 -lSDL2main -lSDL2 -mwindows") string(STRIP "${SDL2_LIBRARIES}" SDL2_LIBRARIES) + +if(NOT TARGET SDL2::SDL2) + # provide SDL2::SDL2, SDL2::SDL2main and SDL2::SDL2-static targets, like SDL2Config.cmake does, for compatibility + + # Remove -lSDL2 as that is handled by CMake, note the space at the end so it does not replace e.g. -lSDL2main + # This may require "libdir" beeing set (from above) + string(REPLACE "-lSDL2 " "" SDL2_EXTRA_LINK_FLAGS " -lmingw32 -lSDL2main -lSDL2 -mwindows ") + # also get rid of -lSDL2main, if you want to link against that use both SDL2::SDL2main and SDL2::SDL2 (in that order) + # (SDL2Config.cmake has the same behavior) + string(REPLACE "-lSDL2main" "" SDL2_EXTRA_LINK_FLAGS ${SDL2_EXTRA_LINK_FLAGS}) + string(STRIP "${SDL2_EXTRA_LINK_FLAGS}" SDL2_EXTRA_LINK_FLAGS) + string(REPLACE "-lSDL2 " "" SDL2_EXTRA_LINK_FLAGS_STATIC " -Wl,--dynamicbase -Wl,--nxcompat -Wl,--high-entropy-va -lm -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion -luuid ") + string(STRIP "${SDL2_EXTRA_LINK_FLAGS_STATIC}" SDL2_EXTRA_LINK_FLAGS_STATIC) + +if(WIN32 AND NOT MSVC) + # MINGW needs very special handling, because the link order must be exactly -lmingw32 -lSDL2main -lSDL2 + # for it to work at all (and -mwindows somewhere); a normal SHARED IMPORTED or STATIC IMPORTED library always puts itself first + # so handle this like a header-only lib and put everything in INTERFACE_LINK_LIBRARIES + + add_library(SDL2::SDL2 INTERFACE IMPORTED) + set_target_properties(SDL2::SDL2 PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}" + INTERFACE_LINK_LIBRARIES "-L${SDL2_LIBDIR} -lSDL2") + + add_library(SDL2::SDL2main INTERFACE IMPORTED) + set_target_properties(SDL2::SDL2main PROPERTIES + INTERFACE_LINK_LIBRARIES "-L${SDL2_LIBDIR} -lmingw32 -lSDL2main -mwindows") + +else() # (not WIN32) or MSVC + + add_library(SDL2::SDL2 SHARED IMPORTED) + set_target_properties(SDL2::SDL2 PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}" + IMPORTED_LINK_INTERFACE_LANGUAGES "C" + IMPORTED_LOCATION "${SDL2_LIBDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}SDL2${CMAKE_SHARED_LIBRARY_SUFFIX}") + + if(MSVC) + # This file is generated when building SDL2 with autotools and MinGW, and MinGW/dlltool + # isn't able to generate .lib files that are usable by recent MSVC versions + # (something about "module unsafe for SAFESEH"; SAFESEH is enabled by default in MSVC). + # The .lib file for SDL2.dll *could* be generated with `gendef SDL2.dll` and then + # `lib.exe /machine:x86 /def:SDL2.def /out:SDL2.lib` (or /machine:amd64) + # but that requires lib.exe from a Visual Studio installation - and that still doesn't + # give you a static SDL2main.lib with SAFESEH support that you'll need (unless you don't use SDL2main) + # Note that when building SDL2 with CMake and MSVC, the result works with both MinGW and MSVC. + + message(FATAL_ERROR, "This build of libSDL2 only supports MinGW, not MSVC (Visual C++), because it lacks .lib files!") + # MSVC needs SDL2.lib set as IMPORTED_IMPLIB to link against (comment out message() call above if you added SDL2.lib yourself) + set_target_properties(SDL2::SDL2 PROPERTIES IMPORTED_IMPLIB "${SDL2_LIBDIR}/SDL2.lib") + else() + # this mustn't be set for MSVC, so do it here in an extra call here + set_target_properties(SDL2::SDL2 PROPERTIES INTERFACE_LINK_LIBRARIES "${SDL2_EXTRA_LINK_FLAGS}") + endif() + + add_library(SDL2::SDL2main STATIC IMPORTED) + set_target_properties(SDL2::SDL2main PROPERTIES + IMPORTED_LINK_INTERFACE_LANGUAGES "C" + IMPORTED_LOCATION "${SDL2_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2main${CMAKE_STATIC_LIBRARY_SUFFIX}") + +endif() # (not WIN32) or MSVC + + add_library(SDL2::SDL2-static STATIC IMPORTED) + set_target_properties(SDL2::SDL2-static PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}" + IMPORTED_LINK_INTERFACE_LANGUAGES "C" + IMPORTED_LOCATION "${SDL2_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2${CMAKE_STATIC_LIBRARY_SUFFIX}" + INTERFACE_LINK_LIBRARIES "${SDL2_EXTRA_LINK_FLAGS_STATIC}") + +endif() # NOT TARGET SDL2::SDL2 diff --git a/libs/SDL2/x86_64-w64-mingw32/lib/libSDL2.a b/libs/SDL2/x86_64-w64-mingw32/lib/libSDL2.a index 1a0479ba2..2731f5bf5 100644 Binary files a/libs/SDL2/x86_64-w64-mingw32/lib/libSDL2.a and b/libs/SDL2/x86_64-w64-mingw32/lib/libSDL2.a differ diff --git a/libs/SDL2/x86_64-w64-mingw32/lib/libSDL2.dll.a b/libs/SDL2/x86_64-w64-mingw32/lib/libSDL2.dll.a index f5d4d2bbb..08610cadf 100755 Binary files a/libs/SDL2/x86_64-w64-mingw32/lib/libSDL2.dll.a and b/libs/SDL2/x86_64-w64-mingw32/lib/libSDL2.dll.a differ diff --git a/libs/SDL2/x86_64-w64-mingw32/lib/libSDL2.la b/libs/SDL2/x86_64-w64-mingw32/lib/libSDL2.la index f6f05ab4c..9d5af777f 100644 --- a/libs/SDL2/x86_64-w64-mingw32/lib/libSDL2.la +++ b/libs/SDL2/x86_64-w64-mingw32/lib/libSDL2.la @@ -1,5 +1,5 @@ # libSDL2.la - a libtool library file -# Generated by libtool (GNU libtool) 2.4.2 +# Generated by libtool (GNU libtool) 2.4.6 # # Please DO NOT delete this file! # It is necessary for linking the library. @@ -13,7 +13,7 @@ library_names='libSDL2.dll.a' # The name of the static archive. old_library='libSDL2.a' -# Linker flags that can not go in dependency_libs. +# Linker flags that cannot go in dependency_libs. inherited_linker_flags='' # Libraries that this one depends upon. @@ -23,9 +23,9 @@ dependency_libs=' -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 - weak_library_names='' # Version information for libSDL2. -current=10 -age=10 -revision=0 +current=18 +age=18 +revision=2 # Is this an already installed library? installed=yes @@ -38,4 +38,4 @@ dlopen='' dlpreopen='' # Directory that this library needs to be installed in: -libdir='/Users/valve/release/SDL/SDL2-2.0.10/x86_64-w64-mingw32/lib' +libdir='/Users/valve/release/SDL/SDL2-2.0.20/x86_64-w64-mingw32/lib' diff --git a/libs/SDL2/x86_64-w64-mingw32/lib/libSDL2_test.a b/libs/SDL2/x86_64-w64-mingw32/lib/libSDL2_test.a index 7ac4da628..31eca4188 100644 Binary files a/libs/SDL2/x86_64-w64-mingw32/lib/libSDL2_test.a and b/libs/SDL2/x86_64-w64-mingw32/lib/libSDL2_test.a differ diff --git a/libs/SDL2/x86_64-w64-mingw32/lib/libSDL2_test.la b/libs/SDL2/x86_64-w64-mingw32/lib/libSDL2_test.la index e7a7872ea..4e2919115 100644 --- a/libs/SDL2/x86_64-w64-mingw32/lib/libSDL2_test.la +++ b/libs/SDL2/x86_64-w64-mingw32/lib/libSDL2_test.la @@ -1,5 +1,5 @@ # libSDL2_test.la - a libtool library file -# Generated by libtool (GNU libtool) 2.4.2 +# Generated by libtool (GNU libtool) 2.4.6 # # Please DO NOT delete this file! # It is necessary for linking the library. @@ -13,7 +13,7 @@ library_names='' # The name of the static archive. old_library='libSDL2_test.a' -# Linker flags that can not go in dependency_libs. +# Linker flags that cannot go in dependency_libs. inherited_linker_flags='' # Libraries that this one depends upon. @@ -38,4 +38,4 @@ dlopen='' dlpreopen='' # Directory that this library needs to be installed in: -libdir='/Users/valve/release/SDL/SDL2-2.0.10/x86_64-w64-mingw32/lib' +libdir='/Users/valve/release/SDL/SDL2-2.0.20/x86_64-w64-mingw32/lib' diff --git a/libs/SDL2/x86_64-w64-mingw32/lib/libSDL2main.a b/libs/SDL2/x86_64-w64-mingw32/lib/libSDL2main.a index ea1086e49..9a0a52bed 100644 Binary files a/libs/SDL2/x86_64-w64-mingw32/lib/libSDL2main.a and b/libs/SDL2/x86_64-w64-mingw32/lib/libSDL2main.a differ diff --git a/libs/SDL2/x86_64-w64-mingw32/lib/libSDL2main.la b/libs/SDL2/x86_64-w64-mingw32/lib/libSDL2main.la index 583786205..9c6c70094 100644 --- a/libs/SDL2/x86_64-w64-mingw32/lib/libSDL2main.la +++ b/libs/SDL2/x86_64-w64-mingw32/lib/libSDL2main.la @@ -1,5 +1,5 @@ # libSDL2main.la - a libtool library file -# Generated by libtool (GNU libtool) 2.4.2 +# Generated by libtool (GNU libtool) 2.4.6 # # Please DO NOT delete this file! # It is necessary for linking the library. @@ -13,7 +13,7 @@ library_names='' # The name of the static archive. old_library='libSDL2main.a' -# Linker flags that can not go in dependency_libs. +# Linker flags that cannot go in dependency_libs. inherited_linker_flags='' # Libraries that this one depends upon. @@ -38,4 +38,4 @@ dlopen='' dlpreopen='' # Directory that this library needs to be installed in: -libdir='/Users/valve/release/SDL/SDL2-2.0.10/x86_64-w64-mingw32/lib' +libdir='/Users/valve/release/SDL/SDL2-2.0.20/x86_64-w64-mingw32/lib' diff --git a/libs/SDL2/x86_64-w64-mingw32/lib/pkgconfig/sdl2.pc b/libs/SDL2/x86_64-w64-mingw32/lib/pkgconfig/sdl2.pc index ceb157f25..78725b07e 100644 --- a/libs/SDL2/x86_64-w64-mingw32/lib/pkgconfig/sdl2.pc +++ b/libs/SDL2/x86_64-w64-mingw32/lib/pkgconfig/sdl2.pc @@ -7,9 +7,9 @@ includedir=${prefix}/include Name: sdl2 Description: Simple DirectMedia Layer is a cross-platform multimedia library designed to provide low level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL, and 2D video framebuffer. -Version: 2.0.10 +Version: 2.0.20 Requires: Conflicts: -Libs: -L${libdir} -lmingw32 -lSDL2main -lSDL2 -mwindows -Libs.private: -lmingw32 -lSDL2main -lSDL2 -mwindows -Wl,--no-undefined -Wl,--dynamicbase -Wl,--nxcompat -Wl,--high-entropy-va -lm -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion -luuid -static-libgcc +Libs: -L${libdir} -lmingw32 -lSDL2main -lSDL2 -mwindows +Libs.private: -Wl,--dynamicbase -Wl,--nxcompat -Wl,--high-entropy-va -lm -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion -luuid Cflags: -I${includedir}/SDL2 -Dmain=SDL_main diff --git a/libs/SDL2/x86_64-w64-mingw32/share/aclocal/sdl2.m4 b/libs/SDL2/x86_64-w64-mingw32/share/aclocal/sdl2.m4 index 0a73bc7d4..710c2516e 100644 --- a/libs/SDL2/x86_64-w64-mingw32/share/aclocal/sdl2.m4 +++ b/libs/SDL2/x86_64-w64-mingw32/share/aclocal/sdl2.m4 @@ -7,14 +7,16 @@ # # Changelog: # * also look for SDL2.framework under Mac OS X +# * removed HP/UX 9 support. +# * updated for newer autoconf. -# serial 1 +# serial 2 dnl AM_PATH_SDL2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS dnl AC_DEFUN([AM_PATH_SDL2], -[dnl +[dnl dnl Get the cflags and libraries from the sdl2-config script dnl AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)], @@ -109,41 +111,19 @@ dnl Now check if the installed SDL is sufficiently new. (Also sanity dnl checks the results of sdl2-config to some extent dnl rm -f conf.sdltest - AC_TRY_RUN([ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include #include -#include #include "SDL.h" -char* -my_strdup (char *str) -{ - char *new_str; - - if (str) - { - new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); - strcpy (new_str, str); - } - else - new_str = NULL; - - return new_str; -} - int main (int argc, char *argv[]) { int major, minor, micro; - char *tmp_version; + FILE *fp = fopen("conf.sdltest", "w"); - /* This hangs on some systems (?) - system ("touch conf.sdltest"); - */ - { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); } + if (fp) fclose(fp); - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = my_strdup("$min_sdl_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + if (sscanf("$min_sdl_version", "%d.%d.%d", &major, &minor, µ) != 3) { printf("%s, bad version string\n", "$min_sdl_version"); exit(1); } @@ -166,7 +146,7 @@ int main (int argc, char *argv[]) } } -],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) +]])], [], [no_sdl=yes], [echo $ac_n "cross compiling; assumed OK... $ac_c"]) CFLAGS="$ac_save_CFLAGS" CXXFLAGS="$ac_save_CXXFLAGS" LIBS="$ac_save_LIBS" @@ -197,7 +177,7 @@ int main (int argc, char *argv[]) CFLAGS="$CFLAGS $SDL_CFLAGS" CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" LIBS="$LIBS $SDL_LIBS" - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include #include "SDL.h" @@ -205,7 +185,7 @@ int main(int argc, char *argv[]) { return 0; } #undef main #define main K_and_R_C_main -], [ return 0; ], +]], [[ return 0; ]])], [ echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding SDL or finding the wrong" echo "*** version of SDL. If it is not finding SDL, you'll need to set your" diff --git a/libs/dll-binaries/i686/Old/fmod.dll b/libs/dll-binaries/i686/Old/fmod.dll deleted file mode 100644 index 6b0e379d3..000000000 Binary files a/libs/dll-binaries/i686/Old/fmod.dll and /dev/null differ diff --git a/libs/dll-binaries/i686/Old/fmodexL.dll b/libs/dll-binaries/i686/Old/fmodexL.dll deleted file mode 100644 index 1ac9e21c9..000000000 Binary files a/libs/dll-binaries/i686/Old/fmodexL.dll and /dev/null differ diff --git a/libs/dll-binaries/i686/fmodex.dll b/libs/dll-binaries/i686/fmodex.dll deleted file mode 100644 index 875f8a267..000000000 Binary files a/libs/dll-binaries/i686/fmodex.dll and /dev/null differ diff --git a/libs/dll-binaries/x86_64/Old/fmod64.dll b/libs/dll-binaries/x86_64/Old/fmod64.dll deleted file mode 100644 index 2a8bab284..000000000 Binary files a/libs/dll-binaries/x86_64/Old/fmod64.dll and /dev/null differ diff --git a/libs/dll-binaries/x86_64/Old/fmodexL64.dll b/libs/dll-binaries/x86_64/Old/fmodexL64.dll deleted file mode 100644 index 463628c6e..000000000 Binary files a/libs/dll-binaries/x86_64/Old/fmodexL64.dll and /dev/null differ diff --git a/libs/dll-binaries/x86_64/fmodex64.dll b/libs/dll-binaries/x86_64/fmodex64.dll deleted file mode 100644 index f08c0033b..000000000 Binary files a/libs/dll-binaries/x86_64/fmodex64.dll and /dev/null differ diff --git a/libs/fmodex/inc/fmod.h b/libs/fmodex/inc/fmod.h deleted file mode 100644 index f3fbd853e..000000000 --- a/libs/fmodex/inc/fmod.h +++ /dev/null @@ -1,2462 +0,0 @@ - -/* ============================================================================================ */ -/* FMOD Ex - Main C/C++ header file. Copyright (c), Firelight Technologies Pty, Ltd. 2004-2011. */ -/* */ -/* This header is the base header for all other FMOD headers. If you are programming in C */ -/* use this exclusively, or if you are programming C++ use this in conjunction with FMOD.HPP */ -/* */ -/* ============================================================================================ */ - -#ifndef _FMOD_H -#define _FMOD_H - -/* - FMOD version number. Check this against FMOD::System::getVersion. - 0xaaaabbcc -> aaaa = major version number. bb = minor version number. cc = development version number. -*/ - -#define FMOD_VERSION 0x00044412 - -/* - Compiler specific settings. -*/ - -#if defined(__CYGWIN32__) - #define F_CDECL __cdecl - #define F_STDCALL __stdcall - #define F_DECLSPEC __declspec - #define F_DLLEXPORT ( dllexport ) -#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(_WIN64) - #define F_CDECL _cdecl - #define F_STDCALL _stdcall - #define F_DECLSPEC __declspec - #define F_DLLEXPORT ( dllexport ) -#elif defined(__MACH__) || defined(__ANDROID__) || defined(__linux__) || defined(__QNX__) - #define F_CDECL - #define F_STDCALL - #define F_DECLSPEC - #define F_DLLEXPORT __attribute__ ((visibility("default"))) -#else - #define F_CDECL - #define F_STDCALL - #define F_DECLSPEC - #define F_DLLEXPORT -#endif - -#ifdef DLL_EXPORTS - #if defined(__MACH__) || defined(__ANDROID__) || defined(__linux__) || defined(__QNX__) - #define F_API __attribute__ ((visibility("default"))) - #else - #define F_API __declspec(dllexport) F_STDCALL - #endif -#else - #define F_API F_STDCALL -#endif - -#define F_CALLBACK F_STDCALL - -/* - FMOD types. -*/ - -typedef int FMOD_BOOL; -typedef struct FMOD_SYSTEM FMOD_SYSTEM; -typedef struct FMOD_SOUND FMOD_SOUND; -typedef struct FMOD_CHANNEL FMOD_CHANNEL; -typedef struct FMOD_CHANNELGROUP FMOD_CHANNELGROUP; -typedef struct FMOD_SOUNDGROUP FMOD_SOUNDGROUP; -typedef struct FMOD_REVERB FMOD_REVERB; -typedef struct FMOD_DSP FMOD_DSP; -typedef struct FMOD_DSPCONNECTION FMOD_DSPCONNECTION; -typedef struct FMOD_POLYGON FMOD_POLYGON; -typedef struct FMOD_GEOMETRY FMOD_GEOMETRY; -typedef struct FMOD_SYNCPOINT FMOD_SYNCPOINT; -typedef unsigned int FMOD_MODE; -typedef unsigned int FMOD_TIMEUNIT; -typedef unsigned int FMOD_INITFLAGS; -typedef unsigned int FMOD_CAPS; -typedef unsigned int FMOD_DEBUGLEVEL; -typedef unsigned int FMOD_MEMORY_TYPE; - -/* -[ENUM] -[ - [DESCRIPTION] - error codes. Returned from every function. - - [REMARKS] - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] -] -*/ -typedef enum -{ - FMOD_OK, /* No errors. */ - FMOD_ERR_ALREADYLOCKED, /* Tried to call lock a second time before unlock was called. */ - FMOD_ERR_BADCOMMAND, /* Tried to call a function on a data type that does not allow this type of functionality (ie calling Sound::lock on a streaming sound). */ - FMOD_ERR_CDDA_DRIVERS, /* Neither NTSCSI nor ASPI could be initialised. */ - FMOD_ERR_CDDA_INIT, /* An error occurred while initialising the CDDA subsystem. */ - FMOD_ERR_CDDA_INVALID_DEVICE, /* Couldn't find the specified device. */ - FMOD_ERR_CDDA_NOAUDIO, /* No audio tracks on the specified disc. */ - FMOD_ERR_CDDA_NODEVICES, /* No CD/DVD devices were found. */ - FMOD_ERR_CDDA_NODISC, /* No disc present in the specified drive. */ - FMOD_ERR_CDDA_READ, /* A CDDA read error occurred. */ - FMOD_ERR_CHANNEL_ALLOC, /* Error trying to allocate a channel. */ - FMOD_ERR_CHANNEL_STOLEN, /* The specified channel has been reused to play another sound. */ - FMOD_ERR_COM, /* A Win32 COM related error occured. COM failed to initialize or a QueryInterface failed meaning a Windows codec or driver was not installed properly. */ - FMOD_ERR_DMA, /* DMA Failure. See debug output for more information. */ - FMOD_ERR_DSP_CONNECTION, /* DSP connection error. Connection possibly caused a cyclic dependancy. Or tried to connect a tree too many units deep (more than 128). */ - FMOD_ERR_DSP_FORMAT, /* DSP Format error. A DSP unit may have attempted to connect to this network with the wrong format. */ - FMOD_ERR_DSP_NOTFOUND, /* DSP connection error. Couldn't find the DSP unit specified. */ - FMOD_ERR_DSP_RUNNING, /* DSP error. Cannot perform this operation while the network is in the middle of running. This will most likely happen if a connection or disconnection is attempted in a DSP callback. */ - FMOD_ERR_DSP_TOOMANYCONNECTIONS,/* DSP connection error. The unit being connected to or disconnected should only have 1 input or output. */ - FMOD_ERR_FILE_BAD, /* Error loading file. */ - FMOD_ERR_FILE_COULDNOTSEEK, /* Couldn't perform seek operation. This is a limitation of the medium (ie netstreams) or the file format. */ - FMOD_ERR_FILE_DISKEJECTED, /* Media was ejected while reading. */ - FMOD_ERR_FILE_EOF, /* End of file unexpectedly reached while trying to read essential data (truncated data?). */ - FMOD_ERR_FILE_NOTFOUND, /* File not found. */ - FMOD_ERR_FILE_UNWANTED, /* Unwanted file access occured. */ - FMOD_ERR_FORMAT, /* Unsupported file or audio format. */ - FMOD_ERR_HTTP, /* A HTTP error occurred. This is a catch-all for HTTP errors not listed elsewhere. */ - FMOD_ERR_HTTP_ACCESS, /* The specified resource requires authentication or is forbidden. */ - FMOD_ERR_HTTP_PROXY_AUTH, /* Proxy authentication is required to access the specified resource. */ - FMOD_ERR_HTTP_SERVER_ERROR, /* A HTTP server error occurred. */ - FMOD_ERR_HTTP_TIMEOUT, /* The HTTP request timed out. */ - FMOD_ERR_INITIALIZATION, /* FMOD was not initialized correctly to support this function. */ - FMOD_ERR_INITIALIZED, /* Cannot call this command after System::init. */ - FMOD_ERR_INTERNAL, /* An error occured that wasn't supposed to. Contact support. */ - FMOD_ERR_INVALID_ADDRESS, /* On Xbox 360, this memory address passed to FMOD must be physical, (ie allocated with XPhysicalAlloc.) */ - FMOD_ERR_INVALID_FLOAT, /* Value passed in was a NaN, Inf or denormalized float. */ - FMOD_ERR_INVALID_HANDLE, /* An invalid object handle was used. */ - FMOD_ERR_INVALID_PARAM, /* An invalid parameter was passed to this function. */ - FMOD_ERR_INVALID_POSITION, /* An invalid seek position was passed to this function. */ - FMOD_ERR_INVALID_SPEAKER, /* An invalid speaker was passed to this function based on the current speaker mode. */ - FMOD_ERR_INVALID_SYNCPOINT, /* The syncpoint did not come from this sound handle. */ - FMOD_ERR_INVALID_VECTOR, /* The vectors passed in are not unit length, or perpendicular. */ - FMOD_ERR_MAXAUDIBLE, /* Reached maximum audible playback count for this sound's soundgroup. */ - FMOD_ERR_MEMORY, /* Not enough memory or resources. */ - FMOD_ERR_MEMORY_CANTPOINT, /* Can't use FMOD_OPENMEMORY_POINT on non PCM source data, or non mp3/xma/adpcm data if FMOD_CREATECOMPRESSEDSAMPLE was used. */ - FMOD_ERR_MEMORY_SRAM, /* Not enough memory or resources on console sound ram. */ - FMOD_ERR_NEEDS2D, /* Tried to call a command on a 3d sound when the command was meant for 2d sound. */ - FMOD_ERR_NEEDS3D, /* Tried to call a command on a 2d sound when the command was meant for 3d sound. */ - FMOD_ERR_NEEDSHARDWARE, /* Tried to use a feature that requires hardware support. (ie trying to play a GCADPCM compressed sound in software on Wii). */ - FMOD_ERR_NEEDSSOFTWARE, /* Tried to use a feature that requires the software engine. Software engine has either been turned off, or command was executed on a hardware channel which does not support this feature. */ - FMOD_ERR_NET_CONNECT, /* Couldn't connect to the specified host. */ - FMOD_ERR_NET_SOCKET_ERROR, /* A socket error occurred. This is a catch-all for socket-related errors not listed elsewhere. */ - FMOD_ERR_NET_URL, /* The specified URL couldn't be resolved. */ - FMOD_ERR_NET_WOULD_BLOCK, /* Operation on a non-blocking socket could not complete immediately. */ - FMOD_ERR_NOTREADY, /* Operation could not be performed because specified sound/DSP connection is not ready. */ - FMOD_ERR_OUTPUT_ALLOCATED, /* Error initializing output device, but more specifically, the output device is already in use and cannot be reused. */ - FMOD_ERR_OUTPUT_CREATEBUFFER, /* Error creating hardware sound buffer. */ - FMOD_ERR_OUTPUT_DRIVERCALL, /* A call to a standard soundcard driver failed, which could possibly mean a bug in the driver or resources were missing or exhausted. */ - FMOD_ERR_OUTPUT_ENUMERATION, /* Error enumerating the available driver list. List may be inconsistent due to a recent device addition or removal. */ - FMOD_ERR_OUTPUT_FORMAT, /* Soundcard does not support the minimum features needed for this soundsystem (16bit stereo output). */ - FMOD_ERR_OUTPUT_INIT, /* Error initializing output device. */ - FMOD_ERR_OUTPUT_NOHARDWARE, /* FMOD_HARDWARE was specified but the sound card does not have the resources necessary to play it. */ - FMOD_ERR_OUTPUT_NOSOFTWARE, /* Attempted to create a software sound but no software channels were specified in System::init. */ - FMOD_ERR_PAN, /* Panning only works with mono or stereo sound sources. */ - FMOD_ERR_PLUGIN, /* An unspecified error has been returned from a 3rd party plugin. */ - FMOD_ERR_PLUGIN_INSTANCES, /* The number of allowed instances of a plugin has been exceeded. */ - FMOD_ERR_PLUGIN_MISSING, /* A requested output, dsp unit type or codec was not available. */ - FMOD_ERR_PLUGIN_RESOURCE, /* A resource that the plugin requires cannot be found. (ie the DLS file for MIDI playback or other DLLs that it needs to load) */ - FMOD_ERR_PRELOADED, /* The specified sound is still in use by the event system, call EventSystem::unloadFSB before trying to release it. */ - FMOD_ERR_PROGRAMMERSOUND, /* The specified sound is still in use by the event system, wait for the event which is using it finish with it. */ - FMOD_ERR_RECORD, /* An error occured trying to initialize the recording device. */ - FMOD_ERR_REVERB_INSTANCE, /* Specified instance in FMOD_REVERB_PROPERTIES couldn't be set. Most likely because it is an invalid instance number or the reverb doesnt exist. */ - FMOD_ERR_SUBSOUND_ALLOCATED, /* This subsound is already being used by another sound, you cannot have more than one parent to a sound. Null out the other parent's entry first. */ - FMOD_ERR_SUBSOUND_CANTMOVE, /* Shared subsounds cannot be replaced or moved from their parent stream, such as when the parent stream is an FSB file. */ - FMOD_ERR_SUBSOUND_MODE, /* The subsound's mode bits do not match with the parent sound's mode bits. See documentation for function that it was called with. */ - FMOD_ERR_SUBSOUNDS, /* The error occured because the sound referenced contains subsounds when it shouldn't have, or it doesn't contain subsounds when it should have. The operation may also not be able to be performed on a parent sound, or a parent sound was played without setting up a sentence first. */ - FMOD_ERR_TAGNOTFOUND, /* The specified tag could not be found or there are no tags. */ - FMOD_ERR_TOOMANYCHANNELS, /* The sound created exceeds the allowable input channel count. This can be increased using the maxinputchannels parameter in System::setSoftwareFormat. */ - FMOD_ERR_UNIMPLEMENTED, /* Something in FMOD hasn't been implemented when it should be! contact support! */ - FMOD_ERR_UNINITIALIZED, /* This command failed because System::init or System::setDriver was not called. */ - FMOD_ERR_UNSUPPORTED, /* A command issued was not supported by this object. Possibly a plugin without certain callbacks specified. */ - FMOD_ERR_UPDATE, /* An error caused by System::update occured. */ - FMOD_ERR_VERSION, /* The version number of this file format is not supported. */ - - FMOD_ERR_EVENT_FAILED, /* An Event failed to be retrieved, most likely due to 'just fail' being specified as the max playbacks behavior. */ - FMOD_ERR_EVENT_INFOONLY, /* Can't execute this command on an EVENT_INFOONLY event. */ - FMOD_ERR_EVENT_INTERNAL, /* An error occured that wasn't supposed to. See debug log for reason. */ - FMOD_ERR_EVENT_MAXSTREAMS, /* Event failed because 'Max streams' was hit when FMOD_EVENT_INIT_FAIL_ON_MAXSTREAMS was specified. */ - FMOD_ERR_EVENT_MISMATCH, /* FSB mismatches the FEV it was compiled with, the stream/sample mode it was meant to be created with was different, or the FEV was built for a different platform. */ - FMOD_ERR_EVENT_NAMECONFLICT, /* A category with the same name already exists. */ - FMOD_ERR_EVENT_NOTFOUND, /* The requested event, event group, event category or event property could not be found. */ - FMOD_ERR_EVENT_NEEDSSIMPLE, /* Tried to call a function on a complex event that's only supported by simple events. */ - FMOD_ERR_EVENT_GUIDCONFLICT, /* An event with the same GUID already exists. */ - FMOD_ERR_EVENT_ALREADY_LOADED, /* The specified project or bank has already been loaded. Having multiple copies of the same project loaded simultaneously is forbidden. */ - - FMOD_ERR_MUSIC_UNINITIALIZED, /* Music system is not initialized probably because no music data is loaded. */ - FMOD_ERR_MUSIC_NOTFOUND, /* The requested music entity could not be found. */ - FMOD_ERR_MUSIC_NOCALLBACK, /* The music callback is required, but it has not been set. */ - - FMOD_RESULT_FORCEINT = 65536 /* Makes sure this enum is signed 32bit. */ -} FMOD_RESULT; - - -/* -[STRUCTURE] -[ - [DESCRIPTION] - Structure describing a point in 3D space. - - [REMARKS] - FMOD uses a left handed co-ordinate system by default. - To use a right handed co-ordinate system specify FMOD_INIT_3D_RIGHTHANDED from FMOD_INITFLAGS in System::init. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - System::set3DListenerAttributes - System::get3DListenerAttributes - Channel::set3DAttributes - Channel::get3DAttributes - Channel::set3DCustomRolloff - Channel::get3DCustomRolloff - Sound::set3DCustomRolloff - Sound::get3DCustomRolloff - Geometry::addPolygon - Geometry::setPolygonVertex - Geometry::getPolygonVertex - Geometry::setRotation - Geometry::getRotation - Geometry::setPosition - Geometry::getPosition - Geometry::setScale - Geometry::getScale - FMOD_INITFLAGS -] -*/ -typedef struct -{ - float x; /* X co-ordinate in 3D space. */ - float y; /* Y co-ordinate in 3D space. */ - float z; /* Z co-ordinate in 3D space. */ -} FMOD_VECTOR; - -/* -[STRUCTURE] -[ - [DESCRIPTION] - Structure describing a globally unique identifier. - - [REMARKS] - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - System::getDriverInfo -] -*/ -typedef struct -{ - unsigned int Data1; /* Specifies the first 8 hexadecimal digits of the GUID */ - unsigned short Data2; /* Specifies the first group of 4 hexadecimal digits. */ - unsigned short Data3; /* Specifies the second group of 4 hexadecimal digits. */ - unsigned char Data4[8]; /* Array of 8 bytes. The first 2 bytes contain the third group of 4 hexadecimal digits. The remaining 6 bytes contain the final 12 hexadecimal digits. */ -} FMOD_GUID; - -/* -[STRUCTURE] -[ - [DESCRIPTION] - Structure that is passed into FMOD_FILE_ASYNCREADCALLBACK. Use the information in this structure to perform - - [REMARKS] - Members marked with [r] mean the variable is modified by FMOD and is for reading purposes only. Do not change this value. - Members marked with [w] mean the variable can be written to. The user can set the value. - - Instructions: write to 'buffer', and 'bytesread' BEFORE setting 'result'. - As soon as result is set, FMOD will asynchronously continue internally using the data provided in this structure. - - Set 'result' to the result expected from a normal file read callback. - If the read was successful, set it to FMOD_OK. - If it read some data but hit the end of the file, set it to FMOD_ERR_FILE_EOF. - If a bad error occurred, return FMOD_ERR_FILE_BAD - If a disk was ejected, return FMOD_ERR_FILE_DISKEJECTED. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - FMOD_FILE_ASYNCREADCALLBACK - FMOD_FILE_ASYNCCANCELCALLBACK -] -*/ -typedef struct -{ - void *handle; /* [r] The file handle that was filled out in the open callback. */ - unsigned int offset; /* [r] Seek position, make sure you read from this file offset. */ - unsigned int sizebytes; /* [r] how many bytes requested for read. */ - int priority; /* [r] 0 = low importance. 100 = extremely important (ie 'must read now or stuttering may occur') */ - - void *buffer; /* [w] Buffer to read file data into. */ - unsigned int bytesread; /* [w] Fill this in before setting result code to tell FMOD how many bytes were read. */ - FMOD_RESULT result; /* [r/w] Result code, FMOD_OK tells the system it is ready to consume the data. Set this last! Default value = FMOD_ERR_NOTREADY. */ - - void *userdata; /* [r] User data pointer. */ -} FMOD_ASYNCREADINFO; - - -/* -[ENUM] -[ - [DESCRIPTION] - These output types are used with System::setOutput / System::getOutput, to choose which output method to use. - - [REMARKS] - To pass information to the driver when initializing fmod use the extradriverdata parameter in System::init for the following reasons. - - FMOD_OUTPUTTYPE_WAVWRITER - extradriverdata is a pointer to a char * filename that the wav writer will output to. - - FMOD_OUTPUTTYPE_WAVWRITER_NRT - extradriverdata is a pointer to a char * filename that the wav writer will output to. - - FMOD_OUTPUTTYPE_DSOUND - extradriverdata is a pointer to a HWND so that FMOD can set the focus on the audio for a particular window. - - FMOD_OUTPUTTYPE_PS3 - extradriverdata is a pointer to a FMOD_PS3_EXTRADRIVERDATA struct. This can be found in fmodps3.h. - - FMOD_OUTPUTTYPE_GC - extradriverdata is a pointer to a FMOD_GC_INFO struct. This can be found in fmodgc.h. - - FMOD_OUTPUTTYPE_WII - extradriverdata is a pointer to a FMOD_WII_INFO struct. This can be found in fmodwii.h. - - FMOD_OUTPUTTYPE_ALSA - extradriverdata is a pointer to a FMOD_LINUX_EXTRADRIVERDATA struct. This can be found in fmodlinux.h. - - Currently these are the only FMOD drivers that take extra information. Other unknown plugins may have different requirements. - - Note! If FMOD_OUTPUTTYPE_WAVWRITER_NRT or FMOD_OUTPUTTYPE_NOSOUND_NRT are used, and if the System::update function is being called - very quickly (ie for a non realtime decode) it may be being called too quickly for the FMOD streamer thread to respond to. - The result will be a skipping/stuttering output in the captured audio. - - To remedy this, disable the FMOD Ex streamer thread, and use FMOD_INIT_STREAM_FROM_UPDATE to avoid skipping in the output stream, - as it will lock the mixer and the streamer together in the same thread. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - System::setOutput - System::getOutput - System::setSoftwareFormat - System::getSoftwareFormat - System::init - System::update - FMOD_INITFLAGS -] -*/ -typedef enum -{ - FMOD_OUTPUTTYPE_AUTODETECT, /* Picks the best output mode for the platform. This is the default. */ - - FMOD_OUTPUTTYPE_UNKNOWN, /* All - 3rd party plugin, unknown. This is for use with System::getOutput only. */ - FMOD_OUTPUTTYPE_NOSOUND, /* All - All calls in this mode succeed but make no sound. */ - FMOD_OUTPUTTYPE_WAVWRITER, /* All - Writes output to fmodoutput.wav by default. Use the 'extradriverdata' parameter in System::init, by simply passing the filename as a string, to set the wav filename. */ - FMOD_OUTPUTTYPE_NOSOUND_NRT, /* All - Non-realtime version of FMOD_OUTPUTTYPE_NOSOUND. User can drive mixer with System::update at whatever rate they want. */ - FMOD_OUTPUTTYPE_WAVWRITER_NRT, /* All - Non-realtime version of FMOD_OUTPUTTYPE_WAVWRITER. User can drive mixer with System::update at whatever rate they want. */ - - FMOD_OUTPUTTYPE_DSOUND, /* Win32/Win64 - DirectSound output. (Default on Windows XP and below) */ - FMOD_OUTPUTTYPE_WINMM, /* Win32/Win64 - Windows Multimedia output. */ - FMOD_OUTPUTTYPE_WASAPI, /* Win32 - Windows Audio Session API. (Default on Windows Vista and above) */ - FMOD_OUTPUTTYPE_ASIO, /* Win32 - Low latency ASIO 2.0 driver. */ - FMOD_OUTPUTTYPE_OSS, /* Linux/Linux64 - Open Sound System output. (Default on Linux, third preference) */ - FMOD_OUTPUTTYPE_ALSA, /* Linux/Linux64 - Advanced Linux Sound Architecture output. (Default on Linux, second preference if available) */ - FMOD_OUTPUTTYPE_ESD, /* Linux/Linux64 - Enlightment Sound Daemon output. */ - FMOD_OUTPUTTYPE_PULSEAUDIO, /* Linux/Linux64 - PulseAudio output. (Default on Linux, first preference if available) */ - FMOD_OUTPUTTYPE_COREAUDIO, /* Mac - Macintosh CoreAudio output. (Default on Mac) */ - FMOD_OUTPUTTYPE_XBOX360, /* Xbox 360 - Native Xbox360 output. (Default on Xbox 360) */ - FMOD_OUTPUTTYPE_PSP, /* PSP - Native PSP output. (Default on PSP) */ - FMOD_OUTPUTTYPE_PS3, /* PS3 - Native PS3 output. (Default on PS3) */ - FMOD_OUTPUTTYPE_NGP, /* NGP - Native NGP output. (Default on NGP) */ - FMOD_OUTPUTTYPE_WII, /* Wii - Native Wii output. (Default on Wii) */ - FMOD_OUTPUTTYPE_3DS, /* 3DS - Native 3DS output (Default on 3DS) */ - FMOD_OUTPUTTYPE_AUDIOTRACK, /* Android - Java Audio Track output. (Default on Android 2.2 and below) */ - FMOD_OUTPUTTYPE_OPENSL, /* Android - OpenSL ES output. (Default on Android 2.3 and above) */ - FMOD_OUTPUTTYPE_NACL, /* Native Client - Native Client output. (Default on Native Client) */ - FMOD_OUTPUTTYPE_WIIU, /* Wii U - Native Wii U output. (Default on Wii U) */ - FMOD_OUTPUTTYPE_ASOUND, /* BlackBerry - Native BlackBerry asound output. (Default on BlackBerry) */ - - FMOD_OUTPUTTYPE_MAX, /* Maximum number of output types supported. */ - FMOD_OUTPUTTYPE_FORCEINT = 65536 /* Makes sure this enum is signed 32bit. */ -} FMOD_OUTPUTTYPE; - - -/* -[DEFINE] -[ - [NAME] - FMOD_CAPS - - [DESCRIPTION] - Bit fields to use with System::getDriverCaps to determine the capabilities of a card / output device. - - [REMARKS] - It is important to check FMOD_CAPS_HARDWARE_EMULATED on windows machines, to then adjust System::setDSPBufferSize to (1024, 10) to compensate for the higher latency. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - System::getDriverCaps - System::setDSPBufferSize -] -*/ -#define FMOD_CAPS_NONE 0x00000000 /* Device has no special capabilities. */ -#define FMOD_CAPS_HARDWARE 0x00000001 /* Device supports hardware mixing. */ -#define FMOD_CAPS_HARDWARE_EMULATED 0x00000002 /* User has device set to 'Hardware acceleration = off' in control panel, and now extra 200ms latency is incurred. */ -#define FMOD_CAPS_OUTPUT_MULTICHANNEL 0x00000004 /* Device can do multichannel output, ie greater than 2 channels. */ -#define FMOD_CAPS_OUTPUT_FORMAT_PCM8 0x00000008 /* Device can output to 8bit integer PCM. */ -#define FMOD_CAPS_OUTPUT_FORMAT_PCM16 0x00000010 /* Device can output to 16bit integer PCM. */ -#define FMOD_CAPS_OUTPUT_FORMAT_PCM24 0x00000020 /* Device can output to 24bit integer PCM. */ -#define FMOD_CAPS_OUTPUT_FORMAT_PCM32 0x00000040 /* Device can output to 32bit integer PCM. */ -#define FMOD_CAPS_OUTPUT_FORMAT_PCMFLOAT 0x00000080 /* Device can output to 32bit floating point PCM. */ -#define FMOD_CAPS_REVERB_LIMITED 0x00002000 /* Device supports some form of limited hardware reverb, maybe parameterless and only selectable by environment. */ -#define FMOD_CAPS_LOOPBACK 0x00004000 /* Device is a loopback recording device */ -/* [DEFINE_END] */ - -/* -[DEFINE] -[ - [NAME] - FMOD_DEBUGLEVEL - - [DESCRIPTION] - Bit fields to use with FMOD::Debug_SetLevel / FMOD::Debug_GetLevel to control the level of tty debug output with logging versions of FMOD (fmodL). - - [REMARKS] - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - Debug_SetLevel - Debug_GetLevel -] -*/ -#define FMOD_DEBUG_LEVEL_NONE 0x00000000 -#define FMOD_DEBUG_LEVEL_LOG 0x00000001 /* Will display generic logging messages. */ -#define FMOD_DEBUG_LEVEL_ERROR 0x00000002 /* Will display errors. */ -#define FMOD_DEBUG_LEVEL_WARNING 0x00000004 /* Will display warnings that are not fatal. */ -#define FMOD_DEBUG_LEVEL_HINT 0x00000008 /* Will hint to you if there is something possibly better you could be doing. */ -#define FMOD_DEBUG_LEVEL_ALL 0x000000FF -#define FMOD_DEBUG_TYPE_MEMORY 0x00000100 /* Show FMOD memory related logging messages. */ -#define FMOD_DEBUG_TYPE_THREAD 0x00000200 /* Show FMOD thread related logging messages. */ -#define FMOD_DEBUG_TYPE_FILE 0x00000400 /* Show FMOD file system related logging messages. */ -#define FMOD_DEBUG_TYPE_NET 0x00000800 /* Show FMOD network related logging messages. */ -#define FMOD_DEBUG_TYPE_EVENT 0x00001000 /* Show FMOD Event related logging messages. */ -#define FMOD_DEBUG_TYPE_ALL 0x0000FFFF -#define FMOD_DEBUG_DISPLAY_TIMESTAMPS 0x01000000 /* Display the timestamp of the log entry in milliseconds. */ -#define FMOD_DEBUG_DISPLAY_LINENUMBERS 0x02000000 /* Display the FMOD Ex source code line numbers, for debugging purposes. */ -#define FMOD_DEBUG_DISPLAY_COMPRESS 0x04000000 /* If a message is repeated more than 5 times it will stop displaying it and instead display the number of times the message was logged. */ -#define FMOD_DEBUG_DISPLAY_THREAD 0x08000000 /* Display the thread ID of the calling function that caused this log entry to appear. */ -#define FMOD_DEBUG_DISPLAY_ALL 0x0F000000 -#define FMOD_DEBUG_ALL 0xFFFFFFFF -/* [DEFINE_END] */ - - -/* -[DEFINE] -[ - [NAME] - FMOD_MEMORY_TYPE - - [DESCRIPTION] - Bit fields for memory allocation type being passed into FMOD memory callbacks. - - [REMARKS] - Remember this is a bitfield. You may get more than 1 bit set (ie physical + persistent) so do not simply switch on the types! You must check each bit individually or clear out the bits that you do not want within the callback. - Bits can be excluded if you want during Memory_Initialize so that you never get them. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - FMOD_MEMORY_ALLOCCALLBACK - FMOD_MEMORY_REALLOCCALLBACK - FMOD_MEMORY_FREECALLBACK - Memory_Initialize - -] -*/ -#define FMOD_MEMORY_NORMAL 0x00000000 /* Standard memory. */ -#define FMOD_MEMORY_STREAM_FILE 0x00000001 /* Stream file buffer, size controllable with System::setStreamBufferSize. */ -#define FMOD_MEMORY_STREAM_DECODE 0x00000002 /* Stream decode buffer, size controllable with FMOD_CREATESOUNDEXINFO::decodebuffersize. */ -#define FMOD_MEMORY_SAMPLEDATA 0x00000004 /* Sample data buffer. Raw audio data, usually PCM/MPEG/ADPCM/XMA data. */ -#define FMOD_MEMORY_DSP_OUTPUTBUFFER 0x00000008 /* DSP memory block allocated when more than 1 output exists on a DSP node. */ -#define FMOD_MEMORY_XBOX360_PHYSICAL 0x00100000 /* Requires XPhysicalAlloc / XPhysicalFree. */ -#define FMOD_MEMORY_PERSISTENT 0x00200000 /* Persistent memory. Memory will be freed when System::release is called. */ -#define FMOD_MEMORY_SECONDARY 0x00400000 /* Secondary memory. Allocation should be in secondary memory. For example RSX on the PS3. */ -#define FMOD_MEMORY_ALL 0xFFFFFFFF -/* [DEFINE_END] */ - - -/* -[ENUM] -[ - [DESCRIPTION] - These are speaker types defined for use with the System::setSpeakerMode or System::getSpeakerMode command. - - [REMARKS] - These are important notes on speaker modes in regards to sounds created with FMOD_SOFTWARE. - Note below the phrase 'sound channels' is used. These are the subchannels inside a sound, they are not related and - have nothing to do with the FMOD class "Channel". - For example a mono sound has 1 sound channel, a stereo sound has 2 sound channels, and an AC3 or 6 channel wav file have 6 "sound channels". - - FMOD_SPEAKERMODE_RAW - --------------------- - This mode is for output devices that are not specifically mono/stereo/quad/surround/5.1 or 7.1, but are multichannel. - Use System::setSoftwareFormat to specify the number of speakers you want to address, otherwise it will default to 2 (stereo). - Sound channels map to speakers sequentially, so a mono sound maps to output speaker 0, stereo sound maps to output speaker 0 & 1. - The user assumes knowledge of the speaker order. FMOD_SPEAKER enumerations may not apply, so raw channel indices should be used. - Multichannel sounds map input channels to output channels 1:1. - Channel::setPan and Channel::setSpeakerMix do not work. - Speaker levels must be manually set with Channel::setSpeakerLevels. - - FMOD_SPEAKERMODE_MONO - --------------------- - This mode is for a 1 speaker arrangement. - Panning does not work in this speaker mode. - Mono, stereo and multichannel sounds have each sound channel played on the one speaker unity. - Mix behavior for multichannel sounds can be set with Channel::setSpeakerLevels. - Channel::setSpeakerMix does not work. - - FMOD_SPEAKERMODE_STEREO - ----------------------- - This mode is for 2 speaker arrangements that have a left and right speaker. - - Mono sounds default to an even distribution between left and right. They can be panned with Channel::setPan. - - Stereo sounds default to the middle, or full left in the left speaker and full right in the right speaker. - - They can be cross faded with Channel::setPan. - - Multichannel sounds have each sound channel played on each speaker at unity. - - Mix behavior for multichannel sounds can be set with Channel::setSpeakerLevels. - - Channel::setSpeakerMix works but only front left and right parameters are used, the rest are ignored. - - FMOD_SPEAKERMODE_QUAD - ------------------------ - This mode is for 4 speaker arrangements that have a front left, front right, rear left and a rear right speaker. - - Mono sounds default to an even distribution between front left and front right. They can be panned with Channel::setPan. - - Stereo sounds default to the left sound channel played on the front left, and the right sound channel played on the front right. - - They can be cross faded with Channel::setPan. - - Multichannel sounds default to all of their sound channels being played on each speaker in order of input. - - Mix behavior for multichannel sounds can be set with Channel::setSpeakerLevels. - - Channel::setSpeakerMix works but side left, side right, center and lfe are ignored. - - FMOD_SPEAKERMODE_SURROUND - ------------------------ - This mode is for 5 speaker arrangements that have a left/right/center/rear left/rear right. - - Mono sounds default to the center speaker. They can be panned with Channel::setPan. - - Stereo sounds default to the left sound channel played on the front left, and the right sound channel played on the front right. - - They can be cross faded with Channel::setPan. - - Multichannel sounds default to all of their sound channels being played on each speaker in order of input. - - Mix behavior for multichannel sounds can be set with Channel::setSpeakerLevels. - - Channel::setSpeakerMix works but side left / side right are ignored. - - FMOD_SPEAKERMODE_5POINT1 - ------------------------ - This mode is for 5.1 speaker arrangements that have a left/right/center/rear left/rear right and a subwoofer speaker. - - Mono sounds default to the center speaker. They can be panned with Channel::setPan. - - Stereo sounds default to the left sound channel played on the front left, and the right sound channel played on the front right. - - They can be cross faded with Channel::setPan. - - Multichannel sounds default to all of their sound channels being played on each speaker in order of input. - - Mix behavior for multichannel sounds can be set with Channel::setSpeakerLevels. - - Channel::setSpeakerMix works but side left / side right are ignored. - - FMOD_SPEAKERMODE_7POINT1 - ------------------------ - This mode is for 7.1 speaker arrangements that have a left/right/center/rear left/rear right/side left/side right - and a subwoofer speaker. - - Mono sounds default to the center speaker. They can be panned with Channel::setPan. - - Stereo sounds default to the left sound channel played on the front left, and the right sound channel played on the front right. - - They can be cross faded with Channel::setPan. - - Multichannel sounds default to all of their sound channels being played on each speaker in order of input. - - Mix behavior for multichannel sounds can be set with Channel::setSpeakerLevels. - - Channel::setSpeakerMix works and every parameter is used to set the balance of a sound in any speaker. - - FMOD_SPEAKERMODE_SRS5_1_MATRIX - ------------------------------------------------------ - This mode is for mono, stereo, 5.1 and 6.1 speaker arrangements, as it is backwards and forwards compatible with - stereo, but to get a surround effect a SRS 5.1, Prologic or Prologic 2 hardware decoder / amplifier is needed or - a compatible SRS equipped device (e.g., laptop, TV, etc.) or accessory (e.g., headphone). - Pan behavior is the same as FMOD_SPEAKERMODE_5POINT1. - - If this function is called the numoutputchannels setting in System::setSoftwareFormat is overwritten. - - Output rate must be 44100, 48000 or 96000 for this to work otherwise FMOD_ERR_OUTPUT_INIT will be returned. - - FMOD_SPEAKERMODE_DOLBY5_1_MATRIX - ------------------------------------------------------ - This mode is for 5.1 speaker arrangements using a stereo signal, to get a surround effect a Dolby Pro Logic II - hardware decoder / amplifier is needed. - Pan behavior is the same as FMOD_SPEAKERMODE_5POINT1. - - If this function is called the numoutputchannels setting in System::setSoftwareFormat is overwritten. - - Output rate must be 32000, 44100 or 48000 for this to work otherwise FMOD_ERR_OUTPUT_INIT will be returned. - - FMOD_SPEAKERMODE_MYEARS - ------------------------------------------------------ - This mode is for headphones. This will attempt to load a MyEars profile (see myears.net.au) and use it to generate - surround sound on headphones using a personalized HRTF algorithm, for realistic 3d sound. - Pan behavior is the same as FMOD_SPEAKERMODE_7POINT1. - MyEars speaker mode will automatically be set if the speakermode is FMOD_SPEAKERMODE_STEREO and the MyEars profile exists. - If this mode is set explicitly, FMOD_INIT_DISABLE_MYEARS_AUTODETECT has no effect. - If this mode is set explicitly and the MyEars profile does not exist, FMOD_ERR_OUTPUT_DRIVERCALL will be returned. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - System::setSpeakerMode - System::getSpeakerMode - System::getDriverCaps - System::setSoftwareFormat - Channel::setSpeakerLevels -] -*/ -typedef enum -{ - FMOD_SPEAKERMODE_RAW, /* There is no specific speakermode. Sound channels are mapped in order of input to output. Use System::setSoftwareFormat to specify speaker count. See remarks for more information. */ - FMOD_SPEAKERMODE_MONO, /* The speakers are monaural. */ - FMOD_SPEAKERMODE_STEREO, /* The speakers are stereo (DEFAULT). */ - FMOD_SPEAKERMODE_QUAD, /* 4 speaker setup. This includes front left, front right, rear left, rear right. */ - FMOD_SPEAKERMODE_SURROUND, /* 5 speaker setup. This includes front left, front right, center, rear left, rear right. */ - FMOD_SPEAKERMODE_5POINT1, /* 5.1 speaker setup. This includes front left, front right, center, rear left, rear right and a subwoofer. */ - FMOD_SPEAKERMODE_7POINT1, /* 7.1 speaker setup. This includes front left, front right, center, rear left, rear right, side left, side right and a subwoofer. */ - - FMOD_SPEAKERMODE_SRS5_1_MATRIX, /* Stereo compatible output, embedded with surround information. SRS 5.1/Prologic/Prologic2 decoders will split the signal into a 5.1 speaker set-up or SRS virtual surround will decode into a 2-speaker/headphone setup. See remarks about limitations.*/ - FMOD_SPEAKERMODE_DOLBY5_1_MATRIX, /* Stereo compatible output, embedded with surround information. Dolby Pro Logic II decoders will split the signal into a 5.1 speaker set-up. */ - FMOD_SPEAKERMODE_MYEARS, /* Stereo output, but data is encoded using personalized HRTF algorithms. See myears.net.au */ - - FMOD_SPEAKERMODE_MAX, /* Maximum number of speaker modes supported. */ - FMOD_SPEAKERMODE_FORCEINT = 65536 /* Makes sure this enum is signed 32bit. */ -} FMOD_SPEAKERMODE; - - -/* -[ENUM] -[ - [DESCRIPTION] - These are speaker types defined for use with the Channel::setSpeakerLevels command. - It can also be used for speaker placement in the System::set3DSpeakerPosition command. - - [REMARKS] - If you are using FMOD_SPEAKERMODE_RAW and speaker assignments are meaningless, just cast a raw integer value to this type. - For example (FMOD_SPEAKER)7 would use the 7th speaker (also the same as FMOD_SPEAKER_SIDE_RIGHT). - Values higher than this can be used if an output system has more than 8 speaker types / output channels. 15 is the current maximum. - - NOTE: On Playstation 3 in 7.1, the extra 2 speakers are not side left/side right, they are 'surround back left'/'surround back right' which - locate the speakers behind the listener instead of to the sides like on PC. FMOD_SPEAKER_SBL/FMOD_SPEAKER_SBR are provided to make it - clearer what speaker is being addressed on that platform. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - FMOD_SPEAKERMODE - Channel::setSpeakerLevels - Channel::getSpeakerLevels - System::set3DSpeakerPosition - System::get3DSpeakerPosition -] -*/ -typedef enum -{ - FMOD_SPEAKER_FRONT_LEFT, - FMOD_SPEAKER_FRONT_RIGHT, - FMOD_SPEAKER_FRONT_CENTER, - FMOD_SPEAKER_LOW_FREQUENCY, - FMOD_SPEAKER_BACK_LEFT, - FMOD_SPEAKER_BACK_RIGHT, - FMOD_SPEAKER_SIDE_LEFT, - FMOD_SPEAKER_SIDE_RIGHT, - - FMOD_SPEAKER_MAX, /* Maximum number of speaker types supported. */ - FMOD_SPEAKER_MONO = FMOD_SPEAKER_FRONT_LEFT, /* For use with FMOD_SPEAKERMODE_MONO and Channel::SetSpeakerLevels. Mapped to same value as FMOD_SPEAKER_FRONT_LEFT. */ - FMOD_SPEAKER_NULL = 65535, /* A non speaker. Use this with ASIO mapping to ignore a speaker. */ - FMOD_SPEAKER_SBL = FMOD_SPEAKER_SIDE_LEFT, /* For use with FMOD_SPEAKERMODE_7POINT1 on PS3 where the extra speakers are surround back inside of side speakers. */ - FMOD_SPEAKER_SBR = FMOD_SPEAKER_SIDE_RIGHT, /* For use with FMOD_SPEAKERMODE_7POINT1 on PS3 where the extra speakers are surround back inside of side speakers. */ - FMOD_SPEAKER_FORCEINT = 65536 /* Makes sure this enum is signed 32bit. */ -} FMOD_SPEAKER; - - -/* -[ENUM] -[ - [DESCRIPTION] - These are plugin types defined for use with the System::getNumPlugins, - System::getPluginInfo and System::unloadPlugin functions. - - [REMARKS] - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - System::getNumPlugins - System::getPluginInfo - System::unloadPlugin -] -*/ -typedef enum -{ - FMOD_PLUGINTYPE_OUTPUT, /* The plugin type is an output module. FMOD mixed audio will play through one of these devices */ - FMOD_PLUGINTYPE_CODEC, /* The plugin type is a file format codec. FMOD will use these codecs to load file formats for playback. */ - FMOD_PLUGINTYPE_DSP, /* The plugin type is a DSP unit. FMOD will use these plugins as part of its DSP network to apply effects to output or generate sound in realtime. */ - - FMOD_PLUGINTYPE_MAX, /* Maximum number of plugin types supported. */ - FMOD_PLUGINTYPE_FORCEINT = 65536 /* Makes sure this enum is signed 32bit. */ -} FMOD_PLUGINTYPE; - - -/* -[DEFINE] -[ - [NAME] - FMOD_INITFLAGS - - [DESCRIPTION] - Initialization flags. Use them with System::init in the flags parameter to change various behavior. - - [REMARKS] - Use System::setAdvancedSettings to adjust settings for some of the features that are enabled by these flags. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - System::init - System::update - System::setAdvancedSettings - Channel::set3DOcclusion -] -*/ -#define FMOD_INIT_NORMAL 0x00000000 /* All platforms - Initialize normally */ -#define FMOD_INIT_STREAM_FROM_UPDATE 0x00000001 /* All platforms - No stream thread is created internally. Streams are driven from System::update. Mainly used with non-realtime outputs. */ -#define FMOD_INIT_3D_RIGHTHANDED 0x00000002 /* All platforms - FMOD will treat +X as right, +Y as up and +Z as backwards (towards you). */ -#define FMOD_INIT_SOFTWARE_DISABLE 0x00000004 /* All platforms - Disable software mixer to save memory. Anything created with FMOD_SOFTWARE will fail and DSP will not work. */ -#define FMOD_INIT_OCCLUSION_LOWPASS 0x00000008 /* All platforms - All FMOD_SOFTWARE (and FMOD_HARDWARE on 3DS and NGP) with FMOD_3D based voices will add a software lowpass filter effect into the DSP chain which is automatically used when Channel::set3DOcclusion is used or the geometry API. */ -#define FMOD_INIT_HRTF_LOWPASS 0x00000010 /* All platforms - All FMOD_SOFTWARE (and FMOD_HARDWARE on 3DS and NGP) with FMOD_3D based voices will add a software lowpass filter effect into the DSP chain which causes sounds to sound duller when the sound goes behind the listener. Use System::setAdvancedSettings to adjust cutoff frequency. */ -#define FMOD_INIT_DISTANCE_FILTERING 0x00000200 /* All platforms - All FMOD_SOFTWARE with FMOD_3D based voices will add a software lowpass and highpass filter effect into the DSP chain which will act as a distance-automated bandpass filter. Use System::setAdvancedSettings to adjust the center frequency. */ -#define FMOD_INIT_REVERB_PREALLOCBUFFERS 0x00000040 /* All platforms - FMOD Software reverb will preallocate enough buffers for reverb per channel, rather than allocating them and freeing them at runtime. */ -#define FMOD_INIT_ENABLE_PROFILE 0x00000020 /* All platforms - Enable TCP/IP based host which allows FMOD Designer or FMOD Profiler to connect to it, and view memory, CPU and the DSP network graph in real-time. */ -#define FMOD_INIT_VOL0_BECOMES_VIRTUAL 0x00000080 /* All platforms - Any sounds that are 0 volume will go virtual and not be processed except for having their positions updated virtually. Use System::setAdvancedSettings to adjust what volume besides zero to switch to virtual at. */ -#define FMOD_INIT_WASAPI_EXCLUSIVE 0x00000100 /* Win32 Vista only - for WASAPI output - Enable exclusive access to hardware, lower latency at the expense of excluding other applications from accessing the audio hardware. */ -#define FMOD_INIT_PS3_PREFERDTS 0x00800000 /* PS3 only - Prefer DTS over Dolby Digital if both are supported. Note: 8 and 6 channel LPCM is always preferred over both DTS and Dolby Digital. */ -#define FMOD_INIT_PS3_FORCE2CHLPCM 0x01000000 /* PS3 only - Force PS3 system output mode to 2 channel LPCM. */ -#define FMOD_INIT_DISABLEDOLBY 0x00100000 /* Wii / 3DS - Disable Dolby Pro Logic surround. Speakermode will be set to STEREO even if user has selected surround in the system settings. */ -#define FMOD_INIT_SYSTEM_MUSICMUTENOTPAUSE 0x00200000 /* Xbox 360 / PS3 - The "music" channelgroup which by default pauses when custom 360 dashboard / PS3 BGM music is played, can be changed to mute (therefore continues playing) instead of pausing, by using this flag. */ -#define FMOD_INIT_SYNCMIXERWITHUPDATE 0x00400000 /* Win32/Wii/PS3/Xbox/Xbox 360 - FMOD Mixer thread is woken up to do a mix when System::update is called rather than waking periodically on its own timer. */ -#define FMOD_INIT_GEOMETRY_USECLOSEST 0x04000000 /* All platforms - With the geometry engine, only process the closest polygon rather than accumulating all polygons the sound to listener line intersects. */ -#define FMOD_INIT_DISABLE_MYEARS_AUTODETECT 0x08000000 /* Win32 - Disables automatic setting of FMOD_SPEAKERMODE_STEREO to FMOD_SPEAKERMODE_MYEARS if the MyEars profile exists on the PC. MyEars is HRTF 7.1 downmixing through headphones. */ -#define FMOD_INIT_PS3_DISABLEDTS 0x10000000 /* PS3 only - Disable DTS output mode selection */ -#define FMOD_INIT_PS3_DISABLEDOLBYDIGITAL 0x20000000 /* PS3 only - Disable Dolby Digital output mode selection */ -/* [DEFINE_END] */ - - -/* -[ENUM] -[ - [DESCRIPTION] - These definitions describe the type of song being played. - - [REMARKS] - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - Sound::getFormat -] -*/ -typedef enum -{ - FMOD_SOUND_TYPE_UNKNOWN, /* 3rd party / unknown plugin format. */ - FMOD_SOUND_TYPE_AIFF, /* AIFF. */ - FMOD_SOUND_TYPE_ASF, /* Microsoft Advanced Systems Format (ie WMA/ASF/WMV). */ - FMOD_SOUND_TYPE_AT3, /* Sony ATRAC 3 format */ - FMOD_SOUND_TYPE_CDDA, /* Digital CD audio. */ - FMOD_SOUND_TYPE_DLS, /* Sound font / downloadable sound bank. */ - FMOD_SOUND_TYPE_FLAC, /* FLAC lossless codec. */ - FMOD_SOUND_TYPE_FSB, /* FMOD Sample Bank. */ - FMOD_SOUND_TYPE_GCADPCM, /* Nintendo GameCube/Wii ADPCM */ - FMOD_SOUND_TYPE_IT, /* Impulse Tracker. */ - FMOD_SOUND_TYPE_MIDI, /* MIDI. extracodecdata is a pointer to an FMOD_MIDI_EXTRACODECDATA structure. */ - FMOD_SOUND_TYPE_MOD, /* Protracker / Fasttracker MOD. */ - FMOD_SOUND_TYPE_MPEG, /* MP2/MP3 MPEG. */ - FMOD_SOUND_TYPE_OGGVORBIS, /* Ogg vorbis. */ - FMOD_SOUND_TYPE_PLAYLIST, /* Information only from ASX/PLS/M3U/WAX playlists */ - FMOD_SOUND_TYPE_RAW, /* Raw PCM data. */ - FMOD_SOUND_TYPE_S3M, /* ScreamTracker 3. */ - FMOD_SOUND_TYPE_SF2, /* Sound font 2 format. */ - FMOD_SOUND_TYPE_USER, /* User created sound. */ - FMOD_SOUND_TYPE_WAV, /* Microsoft WAV. */ - FMOD_SOUND_TYPE_XM, /* FastTracker 2 XM. */ - FMOD_SOUND_TYPE_XMA, /* Xbox360 XMA */ - FMOD_SOUND_TYPE_VAG, /* PlayStation Portable ADPCM VAG format. */ - FMOD_SOUND_TYPE_AUDIOQUEUE, /* iPhone hardware decoder, supports AAC, ALAC and MP3. extracodecdata is a pointer to an FMOD_AUDIOQUEUE_EXTRACODECDATA structure. */ - FMOD_SOUND_TYPE_XWMA, /* Xbox360 XWMA */ - FMOD_SOUND_TYPE_BCWAV, /* 3DS BCWAV container format for DSP ADPCM and PCM */ - FMOD_SOUND_TYPE_AT9, /* NGP ATRAC 9 format */ - FMOD_SOUND_TYPE_VORBIS, /* Raw vorbis */ - FMOD_SOUND_TYPE_MEDIA_FOUNDATION,/* Microsoft Media Foundation wrappers, supports ASF/WMA */ - - FMOD_SOUND_TYPE_MAX, /* Maximum number of sound types supported. */ - FMOD_SOUND_TYPE_FORCEINT = 65536 /* Makes sure this enum is signed 32bit. */ -} FMOD_SOUND_TYPE; - - -/* -[ENUM] -[ - [DESCRIPTION] - These definitions describe the native format of the hardware or software buffer that will be used. - - [REMARKS] - This is the format the native hardware or software buffer will be or is created in. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - System::createSound - Sound::getFormat -] -*/ -typedef enum -{ - FMOD_SOUND_FORMAT_NONE, /* Unitialized / unknown. */ - FMOD_SOUND_FORMAT_PCM8, /* 8bit integer PCM data. */ - FMOD_SOUND_FORMAT_PCM16, /* 16bit integer PCM data. */ - FMOD_SOUND_FORMAT_PCM24, /* 24bit integer PCM data. */ - FMOD_SOUND_FORMAT_PCM32, /* 32bit integer PCM data. */ - FMOD_SOUND_FORMAT_PCMFLOAT, /* 32bit floating point PCM data. */ - FMOD_SOUND_FORMAT_GCADPCM, /* Compressed Nintendo 3DS/Wii DSP data. */ - FMOD_SOUND_FORMAT_IMAADPCM, /* Compressed IMA ADPCM data. */ - FMOD_SOUND_FORMAT_VAG, /* Compressed PlayStation Portable ADPCM data. */ - FMOD_SOUND_FORMAT_HEVAG, /* Compressed PSVita ADPCM data. */ - FMOD_SOUND_FORMAT_XMA, /* Compressed Xbox360 XMA data. */ - FMOD_SOUND_FORMAT_MPEG, /* Compressed MPEG layer 2 or 3 data. */ - FMOD_SOUND_FORMAT_CELT, /* Compressed CELT data. */ - FMOD_SOUND_FORMAT_AT9, /* Compressed PSVita ATRAC9 data. */ - FMOD_SOUND_FORMAT_XWMA, /* Compressed Xbox360 xWMA data. */ - FMOD_SOUND_FORMAT_VORBIS, /* Compressed Vorbis data. */ - - FMOD_SOUND_FORMAT_MAX, /* Maximum number of sound formats supported. */ - FMOD_SOUND_FORMAT_FORCEINT = 65536 /* Makes sure this enum is signed 32bit. */ -} FMOD_SOUND_FORMAT; - - -/* -[DEFINE] -[ - [NAME] - FMOD_MODE - - [DESCRIPTION] - Sound description bitfields, bitwise OR them together for loading and describing sounds. - - [REMARKS] - By default a sound will open as a static sound that is decompressed fully into memory to PCM. (ie equivalent of FMOD_CREATESAMPLE) - To have a sound stream instead, use FMOD_CREATESTREAM, or use the wrapper function System::createStream. - Some opening modes (ie FMOD_OPENUSER, FMOD_OPENMEMORY, FMOD_OPENMEMORY_POINT, FMOD_OPENRAW) will need extra information. - This can be provided using the FMOD_CREATESOUNDEXINFO structure. - - Specifying FMOD_OPENMEMORY_POINT will POINT to your memory rather allocating its own sound buffers and duplicating it internally. - This means you cannot free the memory while FMOD is using it, until after Sound::release is called. - With FMOD_OPENMEMORY_POINT, for PCM formats, only WAV, FSB, and RAW are supported. For compressed formats, only those formats supported by FMOD_CREATECOMPRESSEDSAMPLE are supported. - With FMOD_OPENMEMORY_POINT and FMOD_OPENRAW or PCM, if using them together, note that you must pad the data on each side by 16 bytes. This is so fmod can modify the ends of the data for looping/interpolation/mixing purposes. If a wav file, you will need to insert silence, and then reset loop points to stop the playback from playing that silence. - With FMOD_OPENMEMORY_POINT, For Wii/PSP FMOD_HARDWARE supports this flag for the GCADPCM/VAG formats. On other platforms FMOD_SOFTWARE must be used. - - Xbox 360 memory On Xbox 360 Specifying FMOD_OPENMEMORY_POINT to a virtual memory address will cause FMOD_ERR_INVALID_ADDRESS - to be returned. Use physical memory only for this functionality. - - FMOD_LOWMEM is used on a sound if you want to minimize the memory overhead, by having FMOD not allocate memory for certain - features that are not likely to be used in a game environment. These are : - 1. Sound::getName functionality is removed. 256 bytes per sound is saved. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - System::createSound - System::createStream - Sound::setMode - Sound::getMode - Channel::setMode - Channel::getMode - Sound::set3DCustomRolloff - Channel::set3DCustomRolloff - Sound::getOpenState -] -*/ -#define FMOD_DEFAULT 0x00000000 /* Default for all modes listed below. FMOD_LOOP_OFF, FMOD_2D, FMOD_HARDWARE */ -#define FMOD_LOOP_OFF 0x00000001 /* For non looping sounds. (DEFAULT). Overrides FMOD_LOOP_NORMAL / FMOD_LOOP_BIDI. */ -#define FMOD_LOOP_NORMAL 0x00000002 /* For forward looping sounds. */ -#define FMOD_LOOP_BIDI 0x00000004 /* For bidirectional looping sounds. (only works on software mixed static sounds). */ -#define FMOD_2D 0x00000008 /* Ignores any 3d processing. (DEFAULT). */ -#define FMOD_3D 0x00000010 /* Makes the sound positionable in 3D. Overrides FMOD_2D. */ -#define FMOD_HARDWARE 0x00000020 /* Attempts to make sounds use hardware acceleration. (DEFAULT). Note on platforms that don't support FMOD_HARDWARE (only 3DS, PS Vita, PSP, Wii and Wii U support FMOD_HARDWARE), this will be internally treated as FMOD_SOFTWARE. */ -#define FMOD_SOFTWARE 0x00000040 /* Makes the sound be mixed by the FMOD CPU based software mixer. Overrides FMOD_HARDWARE. Use this for FFT, DSP, compressed sample support, 2D multi-speaker support and other software related features. */ -#define FMOD_CREATESTREAM 0x00000080 /* Decompress at runtime, streaming from the source provided (ie from disk). Overrides FMOD_CREATESAMPLE and FMOD_CREATECOMPRESSEDSAMPLE. Note a stream can only be played once at a time due to a stream only having 1 stream buffer and file handle. Open multiple streams to have them play concurrently. */ -#define FMOD_CREATESAMPLE 0x00000100 /* Decompress at loadtime, decompressing or decoding whole file into memory as the target sample format (ie PCM). Fastest for FMOD_SOFTWARE based playback and most flexible. */ -#define FMOD_CREATECOMPRESSEDSAMPLE 0x00000200 /* Load MP2, MP3, IMAADPCM or XMA into memory and leave it compressed. During playback the FMOD software mixer will decode it in realtime as a 'compressed sample'. Can only be used in combination with FMOD_SOFTWARE. Overrides FMOD_CREATESAMPLE. If the sound data is not ADPCM, MPEG or XMA it will behave as if it was created with FMOD_CREATESAMPLE and decode the sound into PCM. */ -#define FMOD_OPENUSER 0x00000400 /* Opens a user created static sample or stream. Use FMOD_CREATESOUNDEXINFO to specify format and/or read callbacks. If a user created 'sample' is created with no read callback, the sample will be empty. Use Sound::lock and Sound::unlock to place sound data into the sound if this is the case. */ -#define FMOD_OPENMEMORY 0x00000800 /* "name_or_data" will be interpreted as a pointer to memory instead of filename for creating sounds. Use FMOD_CREATESOUNDEXINFO to specify length. If used with FMOD_CREATESAMPLE or FMOD_CREATECOMPRESSEDSAMPLE, FMOD duplicates the memory into its own buffers. Your own buffer can be freed after open. If used with FMOD_CREATESTREAM, FMOD will stream out of the buffer whose pointer you passed in. In this case, your own buffer should not be freed until you have finished with and released the stream.*/ -#define FMOD_OPENMEMORY_POINT 0x10000000 /* "name_or_data" will be interpreted as a pointer to memory instead of filename for creating sounds. Use FMOD_CREATESOUNDEXINFO to specify length. This differs to FMOD_OPENMEMORY in that it uses the memory as is, without duplicating the memory into its own buffers. For Wii/PSP FMOD_HARDWARE supports this flag for the GCADPCM/VAG formats. On other platforms FMOD_SOFTWARE must be used, as sound hardware on the other platforms (ie PC) cannot access main ram. Cannot be freed after open, only after Sound::release. Will not work if the data is compressed and FMOD_CREATECOMPRESSEDSAMPLE is not used. */ -#define FMOD_OPENRAW 0x00001000 /* Will ignore file format and treat as raw pcm. Use FMOD_CREATESOUNDEXINFO to specify format. Requires at least defaultfrequency, numchannels and format to be specified before it will open. Must be little endian data. */ -#define FMOD_OPENONLY 0x00002000 /* Just open the file, dont prebuffer or read. Good for fast opens for info, or when sound::readData is to be used. */ -#define FMOD_ACCURATETIME 0x00004000 /* For System::createSound - for accurate Sound::getLength/Channel::setPosition on VBR MP3, and MOD/S3M/XM/IT/MIDI files. Scans file first, so takes longer to open. FMOD_OPENONLY does not affect this. */ -#define FMOD_MPEGSEARCH 0x00008000 /* For corrupted / bad MP3 files. This will search all the way through the file until it hits a valid MPEG header. Normally only searches for 4k. */ -#define FMOD_NONBLOCKING 0x00010000 /* For opening sounds and getting streamed subsounds (seeking) asyncronously. Use Sound::getOpenState to poll the state of the sound as it opens or retrieves the subsound in the background. */ -#define FMOD_UNIQUE 0x00020000 /* Unique sound, can only be played one at a time */ -#define FMOD_3D_HEADRELATIVE 0x00040000 /* Make the sound's position, velocity and orientation relative to the listener. */ -#define FMOD_3D_WORLDRELATIVE 0x00080000 /* Make the sound's position, velocity and orientation absolute (relative to the world). (DEFAULT) */ -#define FMOD_3D_INVERSEROLLOFF 0x00100000 /* This sound will follow the inverse rolloff model where mindistance = full volume, maxdistance = where sound stops attenuating, and rolloff is fixed according to the global rolloff factor. (DEFAULT) */ -#define FMOD_3D_LINEARROLLOFF 0x00200000 /* This sound will follow a linear rolloff model where mindistance = full volume, maxdistance = silence. Rolloffscale is ignored. */ -#define FMOD_3D_LINEARSQUAREROLLOFF 0x00400000 /* This sound will follow a linear-square rolloff model where mindistance = full volume, maxdistance = silence. Rolloffscale is ignored. */ -#define FMOD_3D_CUSTOMROLLOFF 0x04000000 /* This sound will follow a rolloff model defined by Sound::set3DCustomRolloff / Channel::set3DCustomRolloff. */ -#define FMOD_3D_IGNOREGEOMETRY 0x40000000 /* Is not affect by geometry occlusion. If not specified in Sound::setMode, or Channel::setMode, the flag is cleared and it is affected by geometry again. */ -#define FMOD_UNICODE 0x01000000 /* Filename is double-byte unicode. */ -#define FMOD_IGNORETAGS 0x02000000 /* Skips id3v2/asf/etc tag checks when opening a sound, to reduce seek/read overhead when opening files (helps with CD performance). */ -#define FMOD_LOWMEM 0x08000000 /* Removes some features from samples to give a lower memory overhead, like Sound::getName. See remarks. */ -#define FMOD_LOADSECONDARYRAM 0x20000000 /* Load sound into the secondary RAM of supported platform. On PS3, sounds will be loaded into RSX/VRAM. */ -#define FMOD_VIRTUAL_PLAYFROMSTART 0x80000000 /* For sounds that start virtual (due to being quiet or low importance), instead of swapping back to audible, and playing at the correct offset according to time, this flag makes the sound play from the start. */ - -/* [DEFINE_END] */ - - -/* -[ENUM] -[ - [DESCRIPTION] - These values describe what state a sound is in after FMOD_NONBLOCKING has been used to open it. - - [REMARKS] - With streams, if you are using FMOD_NONBLOCKING, note that if the user calls Sound::getSubSound, a stream will go into FMOD_OPENSTATE_SEEKING state and sound related commands will return FMOD_ERR_NOTREADY. - With streams, if you are using FMOD_NONBLOCKING, note that if the user calls Channel::getPosition, a stream will go into FMOD_OPENSTATE_SETPOSITION state and sound related commands will return FMOD_ERR_NOTREADY. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - Sound::getOpenState - FMOD_MODE -] -*/ -typedef enum -{ - FMOD_OPENSTATE_READY = 0, /* Opened and ready to play. */ - FMOD_OPENSTATE_LOADING, /* Initial load in progress. */ - FMOD_OPENSTATE_ERROR, /* Failed to open - file not found, out of memory etc. See return value of Sound::getOpenState for what happened. */ - FMOD_OPENSTATE_CONNECTING, /* Connecting to remote host (internet sounds only). */ - FMOD_OPENSTATE_BUFFERING, /* Buffering data. */ - FMOD_OPENSTATE_SEEKING, /* Seeking to subsound and re-flushing stream buffer. */ - FMOD_OPENSTATE_PLAYING, /* Ready and playing, but not possible to release at this time without stalling the main thread. */ - FMOD_OPENSTATE_SETPOSITION, /* Seeking within a stream to a different position. */ - - FMOD_OPENSTATE_MAX, /* Maximum number of open state types. */ - FMOD_OPENSTATE_FORCEINT = 65536 /* Makes sure this enum is signed 32bit. */ -} FMOD_OPENSTATE; - - -/* -[ENUM] -[ - [DESCRIPTION] - These flags are used with SoundGroup::setMaxAudibleBehavior to determine what happens when more sounds - are played than are specified with SoundGroup::setMaxAudible. - - [REMARKS] - When using FMOD_SOUNDGROUP_BEHAVIOR_MUTE, SoundGroup::setMuteFadeSpeed can be used to stop a sudden transition. - Instead, the time specified will be used to cross fade between the sounds that go silent and the ones that become audible. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - SoundGroup::setMaxAudibleBehavior - SoundGroup::getMaxAudibleBehavior - SoundGroup::setMaxAudible - SoundGroup::getMaxAudible - SoundGroup::setMuteFadeSpeed - SoundGroup::getMuteFadeSpeed -] -*/ -typedef enum -{ - FMOD_SOUNDGROUP_BEHAVIOR_FAIL, /* Any sound played that puts the sound count over the SoundGroup::setMaxAudible setting, will simply fail during System::playSound. */ - FMOD_SOUNDGROUP_BEHAVIOR_MUTE, /* Any sound played that puts the sound count over the SoundGroup::setMaxAudible setting, will be silent, then if another sound in the group stops the sound that was silent before becomes audible again. */ - FMOD_SOUNDGROUP_BEHAVIOR_STEALLOWEST, /* Any sound played that puts the sound count over the SoundGroup::setMaxAudible setting, will steal the quietest / least important sound playing in the group. */ - - FMOD_SOUNDGROUP_BEHAVIOR_MAX, /* Maximum number of open state types. */ - FMOD_SOUNDGROUP_BEHAVIOR_FORCEINT = 65536 /* Makes sure this enum is signed 32bit. */ -} FMOD_SOUNDGROUP_BEHAVIOR; - - -/* -[ENUM] -[ - [DESCRIPTION] - These callback types are used with Channel::setCallback. - - [REMARKS] - Each callback has commanddata parameters passed as int unique to the type of callback. - See reference to FMOD_CHANNEL_CALLBACK to determine what they might mean for each type of callback. - - Note! Currently the user must call System::update for these callbacks to trigger! - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - Channel::setCallback - FMOD_CHANNEL_CALLBACK - System::update -] -*/ -typedef enum -{ - FMOD_CHANNEL_CALLBACKTYPE_END, /* Called when a sound ends. */ - FMOD_CHANNEL_CALLBACKTYPE_VIRTUALVOICE, /* Called when a voice is swapped out or swapped in. */ - FMOD_CHANNEL_CALLBACKTYPE_SYNCPOINT, /* Called when a syncpoint is encountered. Can be from wav file markers. */ - FMOD_CHANNEL_CALLBACKTYPE_OCCLUSION, /* Called when the channel has its geometry occlusion value calculated. Can be used to clamp or change the value. */ - - FMOD_CHANNEL_CALLBACKTYPE_MAX, /* Maximum number of callback types supported. */ - FMOD_CHANNEL_CALLBACKTYPE_FORCEINT = 65536 /* Makes sure this enum is signed 32bit. */ -} FMOD_CHANNEL_CALLBACKTYPE; - - -/* -[ENUM] -[ - [DESCRIPTION] - These callback types are used with System::setCallback. - - [REMARKS] - Each callback has commanddata parameters passed as void* unique to the type of callback. - See reference to FMOD_SYSTEM_CALLBACK to determine what they might mean for each type of callback. - - Note! Using FMOD_SYSTEM_CALLBACKTYPE_DEVICELISTCHANGED (on Mac only) requires the application to be running an event loop which will allow external changes to device list to be detected by FMOD. - - Note! The 'system' object pointer will be null for FMOD_SYSTEM_CALLBACKTYPE_THREADCREATED and FMOD_SYSTEM_CALLBACKTYPE_MEMORYALLOCATIONFAILED callbacks. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - System::setCallback - FMOD_SYSTEM_CALLBACK - System::update - DSP::addInput -] -*/ -typedef enum -{ - FMOD_SYSTEM_CALLBACKTYPE_DEVICELISTCHANGED, /* Called from System::update when the enumerated list of devices has changed. */ - FMOD_SYSTEM_CALLBACKTYPE_DEVICELOST, /* Called from System::update when an output device has been lost due to control panel parameter changes and FMOD cannot automatically recover. */ - FMOD_SYSTEM_CALLBACKTYPE_MEMORYALLOCATIONFAILED, /* Called directly when a memory allocation fails somewhere in FMOD. (NOTE - 'system' will be NULL in this callback type.)*/ - FMOD_SYSTEM_CALLBACKTYPE_THREADCREATED, /* Called directly when a thread is created. (NOTE - 'system' will be NULL in this callback type.) */ - FMOD_SYSTEM_CALLBACKTYPE_BADDSPCONNECTION, /* Called when a bad connection was made with DSP::addInput. Usually called from mixer thread because that is where the connections are made. */ - FMOD_SYSTEM_CALLBACKTYPE_BADDSPLEVEL, /* Called when too many effects were added exceeding the maximum tree depth of 128. This is most likely caused by accidentally adding too many DSP effects. Usually called from mixer thread because that is where the connections are made. */ - - FMOD_SYSTEM_CALLBACKTYPE_MAX, /* Maximum number of callback types supported. */ - FMOD_SYSTEM_CALLBACKTYPE_FORCEINT = 65536 /* Makes sure this enum is signed 32bit. */ -} FMOD_SYSTEM_CALLBACKTYPE; - - -/* - FMOD Callbacks -*/ -typedef FMOD_RESULT (F_CALLBACK *FMOD_SYSTEM_CALLBACK) (FMOD_SYSTEM *system, FMOD_SYSTEM_CALLBACKTYPE type, void *commanddata1, void *commanddata2); - -typedef FMOD_RESULT (F_CALLBACK *FMOD_CHANNEL_CALLBACK) (FMOD_CHANNEL *channel, FMOD_CHANNEL_CALLBACKTYPE type, void *commanddata1, void *commanddata2); - -typedef FMOD_RESULT (F_CALLBACK *FMOD_SOUND_NONBLOCKCALLBACK)(FMOD_SOUND *sound, FMOD_RESULT result); -typedef FMOD_RESULT (F_CALLBACK *FMOD_SOUND_PCMREADCALLBACK)(FMOD_SOUND *sound, void *data, unsigned int datalen); -typedef FMOD_RESULT (F_CALLBACK *FMOD_SOUND_PCMSETPOSCALLBACK)(FMOD_SOUND *sound, int subsound, unsigned int position, FMOD_TIMEUNIT postype); - -typedef FMOD_RESULT (F_CALLBACK *FMOD_FILE_OPENCALLBACK) (const char *name, int unicode, unsigned int *filesize, void **handle, void **userdata); -typedef FMOD_RESULT (F_CALLBACK *FMOD_FILE_CLOSECALLBACK) (void *handle, void *userdata); -typedef FMOD_RESULT (F_CALLBACK *FMOD_FILE_READCALLBACK) (void *handle, void *buffer, unsigned int sizebytes, unsigned int *bytesread, void *userdata); -typedef FMOD_RESULT (F_CALLBACK *FMOD_FILE_SEEKCALLBACK) (void *handle, unsigned int pos, void *userdata); -typedef FMOD_RESULT (F_CALLBACK *FMOD_FILE_ASYNCREADCALLBACK)(FMOD_ASYNCREADINFO *info, void *userdata); -typedef FMOD_RESULT (F_CALLBACK *FMOD_FILE_ASYNCCANCELCALLBACK)(void *handle, void *userdata); - -typedef void * (F_CALLBACK *FMOD_MEMORY_ALLOCCALLBACK) (unsigned int size, FMOD_MEMORY_TYPE type, const char *sourcestr); -typedef void * (F_CALLBACK *FMOD_MEMORY_REALLOCCALLBACK)(void *ptr, unsigned int size, FMOD_MEMORY_TYPE type, const char *sourcestr); -typedef void (F_CALLBACK *FMOD_MEMORY_FREECALLBACK) (void *ptr, FMOD_MEMORY_TYPE type, const char *sourcestr); - -typedef float (F_CALLBACK *FMOD_3D_ROLLOFFCALLBACK) (FMOD_CHANNEL *channel, float distance); - - -/* -[ENUM] -[ - [DESCRIPTION] - List of windowing methods used in spectrum analysis to reduce leakage / transient signals intefering with the analysis. - This is a problem with analysis of continuous signals that only have a small portion of the signal sample (the fft window size). - Windowing the signal with a curve or triangle tapers the sides of the fft window to help alleviate this problem. - - [REMARKS] - Cyclic signals such as a sine wave that repeat their cycle in a multiple of the window size do not need windowing. - I.e. If the sine wave repeats every 1024, 512, 256 etc samples and the FMOD fft window is 1024, then the signal would not need windowing. - Not windowing is the same as FMOD_DSP_FFT_WINDOW_RECT, which is the default. - If the cycle of the signal (ie the sine wave) is not a multiple of the window size, it will cause frequency abnormalities, so a different windowing method is needed. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - System::getSpectrum - Channel::getSpectrum -] -*/ -typedef enum -{ - FMOD_DSP_FFT_WINDOW_RECT, /* w[n] = 1.0 */ - FMOD_DSP_FFT_WINDOW_TRIANGLE, /* w[n] = TRI(2n/N) */ - FMOD_DSP_FFT_WINDOW_HAMMING, /* w[n] = 0.54 - (0.46 * COS(n/N) ) */ - FMOD_DSP_FFT_WINDOW_HANNING, /* w[n] = 0.5 * (1.0 - COS(n/N) ) */ - FMOD_DSP_FFT_WINDOW_BLACKMAN, /* w[n] = 0.42 - (0.5 * COS(n/N) ) + (0.08 * COS(2.0 * n/N) ) */ - FMOD_DSP_FFT_WINDOW_BLACKMANHARRIS, /* w[n] = 0.35875 - (0.48829 * COS(1.0 * n/N)) + (0.14128 * COS(2.0 * n/N)) - (0.01168 * COS(3.0 * n/N)) */ - - FMOD_DSP_FFT_WINDOW_MAX, /* Maximum number of FFT window types supported. */ - FMOD_DSP_FFT_WINDOW_FORCEINT = 65536 /* Makes sure this enum is signed 32bit. */ -} FMOD_DSP_FFT_WINDOW; - - -/* -[ENUM] -[ - [DESCRIPTION] - List of interpolation types that the FMOD Ex software mixer supports. - - [REMARKS] - The default resampler type is FMOD_DSP_RESAMPLER_LINEAR. - Use System::setSoftwareFormat to tell FMOD the resampling quality you require for FMOD_SOFTWARE based sounds. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - System::setSoftwareFormat - System::getSoftwareFormat -] -*/ -typedef enum -{ - FMOD_DSP_RESAMPLER_NOINTERP, /* No interpolation. High frequency aliasing hiss will be audible depending on the sample rate of the sound. */ - FMOD_DSP_RESAMPLER_LINEAR, /* Linear interpolation (default method). Fast and good quality, causes very slight lowpass effect on low frequency sounds. */ - FMOD_DSP_RESAMPLER_CUBIC, /* Cubic interpolation. Slower than linear interpolation but better quality. */ - FMOD_DSP_RESAMPLER_SPLINE, /* 5 point spline interpolation. Slowest resampling method but best quality. */ - - FMOD_DSP_RESAMPLER_MAX, /* Maximum number of resample methods supported. */ - FMOD_DSP_RESAMPLER_FORCEINT = 65536 /* Makes sure this enum is signed 32bit. */ -} FMOD_DSP_RESAMPLER; - - -/* -[ENUM] -[ - [DESCRIPTION] - List of tag types that could be stored within a sound. These include id3 tags, metadata from netstreams and vorbis/asf data. - - [REMARKS] - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - Sound::getTag -] -*/ -typedef enum -{ - FMOD_TAGTYPE_UNKNOWN = 0, - FMOD_TAGTYPE_ID3V1, - FMOD_TAGTYPE_ID3V2, - FMOD_TAGTYPE_VORBISCOMMENT, - FMOD_TAGTYPE_SHOUTCAST, - FMOD_TAGTYPE_ICECAST, - FMOD_TAGTYPE_ASF, - FMOD_TAGTYPE_MIDI, - FMOD_TAGTYPE_PLAYLIST, - FMOD_TAGTYPE_FMOD, - FMOD_TAGTYPE_USER, - - FMOD_TAGTYPE_MAX, /* Maximum number of tag types supported. */ - FMOD_TAGTYPE_FORCEINT = 65536 /* Makes sure this enum is signed 32bit. */ -} FMOD_TAGTYPE; - - -/* -[ENUM] -[ - [DESCRIPTION] - List of data types that can be returned by Sound::getTag - - [REMARKS] - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - Sound::getTag -] -*/ -typedef enum -{ - FMOD_TAGDATATYPE_BINARY = 0, - FMOD_TAGDATATYPE_INT, - FMOD_TAGDATATYPE_FLOAT, - FMOD_TAGDATATYPE_STRING, - FMOD_TAGDATATYPE_STRING_UTF16, - FMOD_TAGDATATYPE_STRING_UTF16BE, - FMOD_TAGDATATYPE_STRING_UTF8, - FMOD_TAGDATATYPE_CDTOC, - - FMOD_TAGDATATYPE_MAX, /* Maximum number of tag datatypes supported. */ - FMOD_TAGDATATYPE_FORCEINT = 65536 /* Makes sure this enum is signed 32bit. */ -} FMOD_TAGDATATYPE; - - -/* -[ENUM] -[ - [DESCRIPTION] - Types of delay that can be used with Channel::setDelay / Channel::getDelay. - - [REMARKS] - If you haven't called Channel::setDelay yet, if you call Channel::getDelay with FMOD_DELAYTYPE_DSPCLOCK_START it will return the - equivalent global DSP clock value to determine when a channel started, so that you can use it for other channels to sync against. - - Use System::getDSPClock to also get the current dspclock time, a base for future calls to Channel::setDelay. - - Use FMOD_64BIT_ADD or FMOD_64BIT_SUB to add a hi/lo combination together and cope with wraparound. - - If FMOD_DELAYTYPE_END_MS is specified, the value is not treated as a 64 bit number, just the delayhi value is used and it is treated as milliseconds. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - Channel::setDelay - Channel::getDelay - System::getDSPClock -] -*/ -typedef enum -{ - FMOD_DELAYTYPE_END_MS, /* Delay at the end of the sound in milliseconds. Use delayhi only. Channel::isPlaying will remain true until this delay has passed even though the sound itself has stopped playing.*/ - FMOD_DELAYTYPE_DSPCLOCK_START, /* Time the sound started if Channel::getDelay is used, or if Channel::setDelay is used, the sound will delay playing until this exact tick. */ - FMOD_DELAYTYPE_DSPCLOCK_END, /* Time the sound should end. If this is non-zero, the channel will go silent at this exact tick. */ - FMOD_DELAYTYPE_DSPCLOCK_PAUSE, /* Time the sound should pause. If this is non-zero, the channel will pause at this exact tick. */ - - FMOD_DELAYTYPE_MAX, /* Maximum number of tag datatypes supported. */ - FMOD_DELAYTYPE_FORCEINT = 65536 /* Makes sure this enum is signed 32bit. */ -} FMOD_DELAYTYPE; - - -#define FMOD_64BIT_ADD(_hi1, _lo1, _hi2, _lo2) _hi1 += ((_hi2) + ((((_lo1) + (_lo2)) < (_lo1)) ? 1 : 0)); (_lo1) += (_lo2); -#define FMOD_64BIT_SUB(_hi1, _lo1, _hi2, _lo2) _hi1 -= ((_hi2) + ((((_lo1) - (_lo2)) > (_lo1)) ? 1 : 0)); (_lo1) -= (_lo2); - - -/* -[STRUCTURE] -[ - [DESCRIPTION] - Structure describing a piece of tag data. - - [REMARKS] - Members marked with [r] mean the variable is modified by FMOD and is for reading purposes only. Do not change this value. - Members marked with [w] mean the variable can be written to. The user can set the value. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - Sound::getTag - FMOD_TAGTYPE - FMOD_TAGDATATYPE -] -*/ -typedef struct FMOD_TAG -{ - FMOD_TAGTYPE type; /* [r] The type of this tag. */ - FMOD_TAGDATATYPE datatype; /* [r] The type of data that this tag contains */ - char *name; /* [r] The name of this tag i.e. "TITLE", "ARTIST" etc. */ - void *data; /* [r] Pointer to the tag data - its format is determined by the datatype member */ - unsigned int datalen; /* [r] Length of the data contained in this tag */ - FMOD_BOOL updated; /* [r] True if this tag has been updated since last being accessed with Sound::getTag */ -} FMOD_TAG; - - -/* -[STRUCTURE] -[ - [DESCRIPTION] - Structure describing a CD/DVD table of contents - - [REMARKS] - Members marked with [r] mean the variable is modified by FMOD and is for reading purposes only. Do not change this value. - Members marked with [w] mean the variable can be written to. The user can set the value. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - Sound::getTag -] -*/ -typedef struct FMOD_CDTOC -{ - int numtracks; /* [r] The number of tracks on the CD */ - int min[100]; /* [r] The start offset of each track in minutes */ - int sec[100]; /* [r] The start offset of each track in seconds */ - int frame[100]; /* [r] The start offset of each track in frames */ -} FMOD_CDTOC; - - -/* -[DEFINE] -[ - [NAME] - FMOD_TIMEUNIT - - [DESCRIPTION] - List of time types that can be returned by Sound::getLength and used with Channel::setPosition or Channel::getPosition. - - [REMARKS] - FMOD_TIMEUNIT_SENTENCE_MS, FMOD_TIMEUNIT_SENTENCE_PCM, FMOD_TIMEUNIT_SENTENCE_PCMBYTES, FMOD_TIMEUNIT_SENTENCE and FMOD_TIMEUNIT_SENTENCE_SUBSOUND are only supported by Channel functions. - Do not combine flags except FMOD_TIMEUNIT_BUFFERED. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - Sound::getLength - Channel::setPosition - Channel::getPosition -] -*/ -#define FMOD_TIMEUNIT_MS 0x00000001 /* Milliseconds. */ -#define FMOD_TIMEUNIT_PCM 0x00000002 /* PCM samples, related to milliseconds * samplerate / 1000. */ -#define FMOD_TIMEUNIT_PCMBYTES 0x00000004 /* Bytes, related to PCM samples * channels * datawidth (ie 16bit = 2 bytes). */ -#define FMOD_TIMEUNIT_RAWBYTES 0x00000008 /* Raw file bytes of (compressed) sound data (does not include headers). Only used by Sound::getLength and Channel::getPosition. */ -#define FMOD_TIMEUNIT_PCMFRACTION 0x00000010 /* Fractions of 1 PCM sample. Unsigned int range 0 to 0xFFFFFFFF. Used for sub-sample granularity for DSP purposes. */ -#define FMOD_TIMEUNIT_MODORDER 0x00000100 /* MOD/S3M/XM/IT. Order in a sequenced module format. Use Sound::getFormat to determine the PCM format being decoded to. */ -#define FMOD_TIMEUNIT_MODROW 0x00000200 /* MOD/S3M/XM/IT. Current row in a sequenced module format. Sound::getLength will return the number of rows in the currently playing or seeked to pattern. */ -#define FMOD_TIMEUNIT_MODPATTERN 0x00000400 /* MOD/S3M/XM/IT. Current pattern in a sequenced module format. Sound::getLength will return the number of patterns in the song and Channel::getPosition will return the currently playing pattern. */ -#define FMOD_TIMEUNIT_SENTENCE_MS 0x00010000 /* Currently playing subsound in a sentence time in milliseconds. */ -#define FMOD_TIMEUNIT_SENTENCE_PCM 0x00020000 /* Currently playing subsound in a sentence time in PCM Samples, related to milliseconds * samplerate / 1000. */ -#define FMOD_TIMEUNIT_SENTENCE_PCMBYTES 0x00040000 /* Currently playing subsound in a sentence time in bytes, related to PCM samples * channels * datawidth (ie 16bit = 2 bytes). */ -#define FMOD_TIMEUNIT_SENTENCE 0x00080000 /* Currently playing sentence index according to the channel. */ -#define FMOD_TIMEUNIT_SENTENCE_SUBSOUND 0x00100000 /* Currently playing subsound index in a sentence. */ -#define FMOD_TIMEUNIT_BUFFERED 0x10000000 /* Time value as seen by buffered stream. This is always ahead of audible time, and is only used for processing. */ -/* [DEFINE_END] */ - - -/* -[ENUM] -[ - [DESCRIPTION] - When creating a multichannel sound, FMOD will pan them to their default speaker locations, for example a 6 channel sound will default to one channel per 5.1 output speaker. - Another example is a stereo sound. It will default to left = front left, right = front right. - - This is for sounds that are not 'default'. For example you might have a sound that is 6 channels but actually made up of 3 stereo pairs, that should all be located in front left, front right only. - - [REMARKS] - For full flexibility of speaker assignments, use Channel::setSpeakerLevels. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - FMOD_CREATESOUNDEXINFO - Channel::setSpeakerLevels -] -*/ -typedef enum -{ - FMOD_SPEAKERMAPTYPE_DEFAULT, /* This is the default, and just means FMOD decides which speakers it puts the source channels. */ - FMOD_SPEAKERMAPTYPE_ALLMONO, /* This means the sound is made up of all mono sounds. All voices will be panned to the front center by default in this case. */ - FMOD_SPEAKERMAPTYPE_ALLSTEREO, /* This means the sound is made up of all stereo sounds. All voices will be panned to front left and front right alternating every second channel. */ - FMOD_SPEAKERMAPTYPE_51_PROTOOLS /* Map a 5.1 sound to use protools L C R Ls Rs LFE mapping. Will return an error if not a 6 channel sound. */ -} FMOD_SPEAKERMAPTYPE; - - -/* -[STRUCTURE] -[ - [DESCRIPTION] - Use this structure with System::createSound when more control is needed over loading. - The possible reasons to use this with System::createSound are: - - Loading a file from memory. - - Loading a file from within another larger (possibly wad/pak) file, by giving the loader an offset and length. - - To create a user created / non file based sound. - - To specify a starting subsound to seek to within a multi-sample sounds (ie FSB/DLS/SF2) when created as a stream. - - To specify which subsounds to load for multi-sample sounds (ie FSB/DLS/SF2) so that memory is saved and only a subset is actually loaded/read from disk. - - To specify 'piggyback' read and seek callbacks for capture of sound data as fmod reads and decodes it. Useful for ripping decoded PCM data from sounds as they are loaded / played. - - To specify a MIDI DLS/SF2 sample set file to load when opening a MIDI file. - See below on what members to fill for each of the above types of sound you want to create. - - [REMARKS] - This structure is optional! Specify 0 or NULL in System::createSound if you don't need it! - - Loading a file from memory. - - Create the sound using the FMOD_OPENMEMORY flag. - - Mandatory. Specify 'length' for the size of the memory block in bytes. - - Other flags are optional. - - - Loading a file from within another larger (possibly wad/pak) file, by giving the loader an offset and length. - - Mandatory. Specify 'fileoffset' and 'length'. - - Other flags are optional. - - - To create a user created / non file based sound. - - Create the sound using the FMOD_OPENUSER flag. - - Mandatory. Specify 'defaultfrequency, 'numchannels' and 'format'. - - Other flags are optional. - - - To specify a starting subsound to seek to and flush with, within a multi-sample stream (ie FSB/DLS/SF2). - - - Mandatory. Specify 'initialsubsound'. - - - To specify which subsounds to load for multi-sample sounds (ie FSB/DLS/SF2) so that memory is saved and only a subset is actually loaded/read from disk. - - - Mandatory. Specify 'inclusionlist' and 'inclusionlistnum'. - - - To specify 'piggyback' read and seek callbacks for capture of sound data as fmod reads and decodes it. Useful for ripping decoded PCM data from sounds as they are loaded / played. - - - Mandatory. Specify 'pcmreadcallback' and 'pcmseekcallback'. - - - To specify a MIDI DLS/SF2 sample set file to load when opening a MIDI file. - - - Mandatory. Specify 'dlsname'. - - - Setting the 'decodebuffersize' is for cpu intensive codecs that may be causing stuttering, not file intensive codecs (ie those from CD or netstreams) which are normally - altered with System::setStreamBufferSize. As an example of cpu intensive codecs, an mp3 file will take more cpu to decode than a PCM wav file. - If you have a stuttering effect, then it is using more cpu than the decode buffer playback rate can keep up with. Increasing the decode buffersize will most likely solve this problem. - - - FSB codec. If inclusionlist and numsubsounds are used together, this will trigger a special mode where subsounds are shuffled down to save memory. (useful for large FSB - files where you only want to load 1 sound). There will be no gaps, ie no null subsounds. As an example, if there are 10,000 subsounds and there is an inclusionlist with only 1 entry, - and numsubsounds = 1, then subsound 0 will be that entry, and there will only be the memory allocated for 1 subsound. Previously there would still be 10,000 subsound pointers and other - associated codec entries allocated along with it multiplied by 10,000. - - Members marked with [r] mean the variable is modified by FMOD and is for reading purposes only. Do not change this value. - Members marked with [w] mean the variable can be written to. The user can set the value. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - System::createSound - System::setStreamBufferSize - FMOD_MODE - FMOD_SOUND_FORMAT - FMOD_SOUND_TYPE - FMOD_SPEAKERMAPTYPE -] -*/ -typedef struct FMOD_CREATESOUNDEXINFO -{ - int cbsize; /* [w] Size of this structure. This is used so the structure can be expanded in the future and still work on older versions of FMOD Ex. */ - unsigned int length; /* [w] Optional. Specify 0 to ignore. Size in bytes of file to load, or sound to create (in this case only if FMOD_OPENUSER is used). Required if loading from memory. If 0 is specified, then it will use the size of the file (unless loading from memory then an error will be returned). */ - unsigned int fileoffset; /* [w] Optional. Specify 0 to ignore. Offset from start of the file to start loading from. This is useful for loading files from inside big data files. */ - int numchannels; /* [w] Optional. Specify 0 to ignore. Number of channels in a sound mandatory if FMOD_OPENUSER or FMOD_OPENRAW is used. */ - int defaultfrequency; /* [w] Optional. Specify 0 to ignore. Default frequency of sound in a sound mandatory if FMOD_OPENUSER or FMOD_OPENRAW is used. Other formats use the frequency determined by the file format. */ - FMOD_SOUND_FORMAT format; /* [w] Optional. Specify 0 or FMOD_SOUND_FORMAT_NONE to ignore. Format of the sound mandatory if FMOD_OPENUSER or FMOD_OPENRAW is used. Other formats use the format determined by the file format. */ - unsigned int decodebuffersize; /* [w] Optional. Specify 0 to ignore. For streams. This determines the size of the double buffer (in PCM samples) that a stream uses. Use this for user created streams if you want to determine the size of the callback buffer passed to you. Specify 0 to use FMOD's default size which is currently equivalent to 400ms of the sound format created/loaded. */ - int initialsubsound; /* [w] Optional. Specify 0 to ignore. In a multi-sample file format such as .FSB/.DLS/.SF2, specify the initial subsound to seek to, only if FMOD_CREATESTREAM is used. */ - int numsubsounds; /* [w] Optional. Specify 0 to ignore or have no subsounds. In a sound created with FMOD_OPENUSER, specify the number of subsounds that are accessable with Sound::getSubSound. If not created with FMOD_OPENUSER, this will limit the number of subsounds loaded within a multi-subsound file. If using FSB, then if FMOD_CREATESOUNDEXINFO::inclusionlist is used, this will shuffle subsounds down so that there are not any gaps. It will mean that the indices of the sounds will be different. */ - int *inclusionlist; /* [w] Optional. Specify 0 to ignore. In a multi-sample format such as .FSB/.DLS/.SF2 it may be desirable to specify only a subset of sounds to be loaded out of the whole file. This is an array of subsound indices to load into memory when created. */ - int inclusionlistnum; /* [w] Optional. Specify 0 to ignore. This is the number of integers contained within the inclusionlist array. */ - FMOD_SOUND_PCMREADCALLBACK pcmreadcallback; /* [w] Optional. Specify 0 to ignore. Callback to 'piggyback' on FMOD's read functions and accept or even write PCM data while FMOD is opening the sound. Used for user sounds created with FMOD_OPENUSER or for capturing decoded data as FMOD reads it. */ - FMOD_SOUND_PCMSETPOSCALLBACK pcmsetposcallback; /* [w] Optional. Specify 0 to ignore. Callback for when the user calls a seeking function such as Channel::setTime or Channel::setPosition within a multi-sample sound, and for when it is opened.*/ - FMOD_SOUND_NONBLOCKCALLBACK nonblockcallback; /* [w] Optional. Specify 0 to ignore. Callback for successful completion, or error while loading a sound that used the FMOD_NONBLOCKING flag.*/ - const char *dlsname; /* [w] Optional. Specify 0 to ignore. Filename for a DLS or SF2 sample set when loading a MIDI file. If not specified, on Windows it will attempt to open /windows/system32/drivers/gm.dls or /windows/system32/drivers/etc/gm.dls, on Mac it will attempt to load /System/Library/Components/CoreAudio.component/Contents/Resources/gs_instruments.dls, otherwise the MIDI will fail to open. Current DLS support is for level 1 of the specification. */ - const char *encryptionkey; /* [w] Optional. Specify 0 to ignore. Key for encrypted FSB file. Without this key an encrypted FSB file will not load. */ - int maxpolyphony; /* [w] Optional. Specify 0 to ignore. For sequenced formats with dynamic channel allocation such as .MID and .IT, this specifies the maximum voice count allowed while playing. .IT defaults to 64. .MID defaults to 32. */ - void *userdata; /* [w] Optional. Specify 0 to ignore. This is user data to be attached to the sound during creation. Access via Sound::getUserData. Note: This is not passed to FMOD_FILE_OPENCALLBACK, that is a different userdata that is file specific. */ - FMOD_SOUND_TYPE suggestedsoundtype; /* [w] Optional. Specify 0 or FMOD_SOUND_TYPE_UNKNOWN to ignore. Instead of scanning all codec types, use this to speed up loading by making it jump straight to this codec. */ - FMOD_FILE_OPENCALLBACK useropen; /* [w] Optional. Specify 0 to ignore. Callback for opening this file. */ - FMOD_FILE_CLOSECALLBACK userclose; /* [w] Optional. Specify 0 to ignore. Callback for closing this file. */ - FMOD_FILE_READCALLBACK userread; /* [w] Optional. Specify 0 to ignore. Callback for reading from this file. */ - FMOD_FILE_SEEKCALLBACK userseek; /* [w] Optional. Specify 0 to ignore. Callback for seeking within this file. */ - FMOD_FILE_ASYNCREADCALLBACK userasyncread; /* [w] Optional. Specify 0 to ignore. Callback for seeking within this file. */ - FMOD_FILE_ASYNCCANCELCALLBACK userasynccancel; /* [w] Optional. Specify 0 to ignore. Callback for seeking within this file. */ - FMOD_SPEAKERMAPTYPE speakermap; /* [w] Optional. Specify 0 to ignore. Use this to differ the way fmod maps multichannel sounds to speakers. See FMOD_SPEAKERMAPTYPE for more. */ - FMOD_SOUNDGROUP *initialsoundgroup; /* [w] Optional. Specify 0 to ignore. Specify a sound group if required, to put sound in as it is created. */ - unsigned int initialseekposition;/* [w] Optional. Specify 0 to ignore. For streams. Specify an initial position to seek the stream to. */ - FMOD_TIMEUNIT initialseekpostype; /* [w] Optional. Specify 0 to ignore. For streams. Specify the time unit for the position set in initialseekposition. */ - int ignoresetfilesystem;/* [w] Optional. Specify 0 to ignore. Set to 1 to use fmod's built in file system. Ignores setFileSystem callbacks and also FMOD_CREATESOUNEXINFO file callbacks. Useful for specific cases where you don't want to use your own file system but want to use fmod's file system (ie net streaming). */ - int cddaforceaspi; /* [w] Optional. Specify 0 to ignore. For CDDA sounds only - if non-zero use ASPI instead of NTSCSI to access the specified CD/DVD device. */ - unsigned int audioqueuepolicy; /* [w] Optional. Specify 0 or FMOD_AUDIOQUEUE_CODECPOLICY_DEFAULT to ignore. Policy used to determine whether hardware or software is used for decoding, see FMOD_AUDIOQUEUE_CODECPOLICY for options (iOS >= 3.0 required, otherwise only hardware is available) */ - unsigned int minmidigranularity; /* [w] Optional. Specify 0 to ignore. Allows you to set a minimum desired MIDI mixer granularity. Values smaller than 512 give greater than default accuracy at the cost of more CPU and vice versa. Specify 0 for default (512 samples). */ - int nonblockthreadid; /* [w] Optional. Specify 0 to ignore. Specifies a thread index to execute non blocking load on. Allows for up to 5 threads to be used for loading at once. This is to avoid one load blocking another. Maximum value = 4. */ -} FMOD_CREATESOUNDEXINFO; - - -/* -[STRUCTURE] -[ - [DESCRIPTION] - Structure defining a reverb environment. - - [REMARKS] - Note the default reverb properties are the same as the FMOD_PRESET_GENERIC preset. - Note that integer values that typically range from -10,000 to 1000 are represented in - decibels, and are of a logarithmic scale, not linear, wheras float values are always linear. - - The numerical values listed below are the maximum, minimum and default values for each variable respectively. - - SUPPORTED next to each parameter means the platform the parameter can be set on. Some platforms support all parameters and some don't. - WII means Nintendo Wii hardware reverb (must use FMOD_HARDWARE). - PSP means Playstation Portable hardware reverb (must use FMOD_HARDWARE). - SFX means FMOD SFX software reverb. This works on any platform that uses FMOD_SOFTWARE for loading sounds. - --- means unsupported/deprecated. Will either be removed or supported by SFX in the future. - - Nintendo Wii Notes: - This structure supports only limited parameters, and maps them to the Wii hardware reverb as follows. - DecayTime = 'time' - ReverbDelay = 'predelay' - ModulationDepth = 'damping' - Reflections = 'coloration' - EnvDiffusion = 'crosstalk' - Room = 'mix' - - Members marked with [r] mean the variable is modified by FMOD and is for reading purposes only. Do not change this value. - Members marked with [w] mean the variable can be written to. The user can set the value. - Members marked with [r/w] are either read or write depending on if you are using System::setReverbProperties (w) or System::getReverbProperties (r). - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - System::setReverbProperties - System::getReverbProperties - FMOD_REVERB_PRESETS - FMOD_REVERB_FLAGS -] -*/ -typedef struct FMOD_REVERB_PROPERTIES -{ /* MIN MAX DEFAULT DESCRIPTION */ - int Instance; /* [w] 0 3 0 Environment Instance. (SUPPORTED:SFX(4 instances) and Wii (3 instances)) */ - int Environment; /* [r/w] -1 25 -1 Sets all listener properties. -1 = OFF. (SUPPORTED:SFX(-1 only)/PSP) */ - float EnvDiffusion; /* [r/w] 0.0 1.0 1.0 Environment diffusion (SUPPORTED:WII) */ - int Room; /* [r/w] -10000 0 -1000 Room effect level (at mid frequencies) (SUPPORTED:SFX/WII/PSP) */ - int RoomHF; /* [r/w] -10000 0 -100 Relative room effect level at high frequencies (SUPPORTED:SFX) */ - int RoomLF; /* [r/w] -10000 0 0 Relative room effect level at low frequencies (SUPPORTED:SFX) */ - float DecayTime; /* [r/w] 0.1 20.0 1.49 Reverberation decay time at mid frequencies (SUPPORTED:SFX/WII) */ - float DecayHFRatio; /* [r/w] 0.1 2.0 0.83 High-frequency to mid-frequency decay time ratio (SUPPORTED:SFX) */ - float DecayLFRatio; /* [r/w] 0.1 2.0 1.0 Low-frequency to mid-frequency decay time ratio (SUPPORTED:---) */ - int Reflections; /* [r/w] -10000 1000 -2602 Early reflections level relative to room effect (SUPPORTED:SFX/WII) */ - float ReflectionsDelay; /* [r/w] 0.0 0.3 0.007 Initial reflection delay time (SUPPORTED:SFX) */ - int Reverb; /* [r/w] -10000 2000 200 Late reverberation level relative to room effect (SUPPORTED:SFX) */ - float ReverbDelay; /* [r/w] 0.0 0.1 0.011 Late reverberation delay time relative to initial reflection (SUPPORTED:SFX/WII) */ - float ModulationTime; /* [r/w] 0.04 4.0 0.25 Modulation time (SUPPORTED:---) */ - float ModulationDepth; /* [r/w] 0.0 1.0 0.0 Modulation depth (SUPPORTED:WII) */ - float HFReference; /* [r/w] 20.0 20000.0 5000.0 Reference high frequency (hz) (SUPPORTED:SFX) */ - float LFReference; /* [r/w] 20.0 1000.0 250.0 Reference low frequency (hz) (SUPPORTED:SFX) */ - float Diffusion; /* [r/w] 0.0 100.0 100.0 Value that controls the echo density in the late reverberation decay. (SUPPORTED:SFX) */ - float Density; /* [r/w] 0.0 100.0 100.0 Value that controls the modal density in the late reverberation decay (SUPPORTED:SFX) */ - unsigned int Flags; /* [r/w] FMOD_REVERB_FLAGS - modifies the behavior of above properties (SUPPORTED:WII) */ -} FMOD_REVERB_PROPERTIES; - - -/* -[DEFINE] -[ - [NAME] - FMOD_REVERB_FLAGS - - [DESCRIPTION] - Values for the Flags member of the FMOD_REVERB_PROPERTIES structure. - - [REMARKS] - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - FMOD_REVERB_PROPERTIES -] -*/ -#define FMOD_REVERB_FLAGS_HIGHQUALITYREVERB 0x00000400 /* Wii. Use high quality reverb */ -#define FMOD_REVERB_FLAGS_HIGHQUALITYDPL2REVERB 0x00000800 /* Wii. Use high quality DPL2 reverb */ -#define FMOD_REVERB_FLAGS_HARDWAREONLY 0x00001000 /* Don't create an SFX reverb for FMOD_SOFTWARE channels, hardware reverb only */ -#define FMOD_REVERB_FLAGS_DEFAULT 0x00000000 -/* [DEFINE_END] */ - - -/* -[DEFINE] -[ - [NAME] - FMOD_REVERB_PRESETS - - [DESCRIPTION] - A set of predefined environment PARAMETERS. - These are used to initialize an FMOD_REVERB_PROPERTIES structure statically. - i.e. - FMOD_REVERB_PROPERTIES prop = FMOD_PRESET_GENERIC; - - [REMARKS] - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - System::setReverbProperties -] -*/ -/* Inst Env Diffus Room RoomHF RmLF DecTm DecHF DecLF Refl RefDel Revb RevDel ModTm ModDp HFRef LFRef Diffus Densty FLAGS */ -#define FMOD_PRESET_OFF { 0, -1, 1.00f, -10000, -10000, 0, 1.00f, 1.00f, 1.0f, -2602, 0.007f, 200, 0.011f, 0.25f, 0.000f, 5000.0f, 250.0f, 0.0f, 0.0f, 0x33f } -#define FMOD_PRESET_GENERIC { 0, 0, 1.00f, -1000, -100, 0, 1.49f, 0.83f, 1.0f, -2602, 0.007f, 200, 0.011f, 0.25f, 0.000f, 5000.0f, 250.0f, 100.0f, 100.0f, 0x3f } -#define FMOD_PRESET_PADDEDCELL { 0, 1, 1.00f, -1000, -6000, 0, 0.17f, 0.10f, 1.0f, -1204, 0.001f, 207, 0.002f, 0.25f, 0.000f, 5000.0f, 250.0f, 100.0f, 100.0f, 0x3f } -#define FMOD_PRESET_ROOM { 0, 2, 1.00f, -1000, -454, 0, 0.40f, 0.83f, 1.0f, -1646, 0.002f, 53, 0.003f, 0.25f, 0.000f, 5000.0f, 250.0f, 100.0f, 100.0f, 0x3f } -#define FMOD_PRESET_BATHROOM { 0, 3, 1.00f, -1000, -1200, 0, 1.49f, 0.54f, 1.0f, -370, 0.007f, 1030, 0.011f, 0.25f, 0.000f, 5000.0f, 250.0f, 100.0f, 60.0f, 0x3f } -#define FMOD_PRESET_LIVINGROOM { 0, 4, 1.00f, -1000, -6000, 0, 0.50f, 0.10f, 1.0f, -1376, 0.003f, -1104, 0.004f, 0.25f, 0.000f, 5000.0f, 250.0f, 100.0f, 100.0f, 0x3f } -#define FMOD_PRESET_STONEROOM { 0, 5, 1.00f, -1000, -300, 0, 2.31f, 0.64f, 1.0f, -711, 0.012f, 83, 0.017f, 0.25f, 0.000f, 5000.0f, 250.0f, 100.0f, 100.0f, 0x3f } -#define FMOD_PRESET_AUDITORIUM { 0, 6, 1.00f, -1000, -476, 0, 4.32f, 0.59f, 1.0f, -789, 0.020f, -289, 0.030f, 0.25f, 0.000f, 5000.0f, 250.0f, 100.0f, 100.0f, 0x3f } -#define FMOD_PRESET_CONCERTHALL { 0, 7, 1.00f, -1000, -500, 0, 3.92f, 0.70f, 1.0f, -1230, 0.020f, -2, 0.029f, 0.25f, 0.000f, 5000.0f, 250.0f, 100.0f, 100.0f, 0x3f } -#define FMOD_PRESET_CAVE { 0, 8, 1.00f, -1000, 0, 0, 2.91f, 1.30f, 1.0f, -602, 0.015f, -302, 0.022f, 0.25f, 0.000f, 5000.0f, 250.0f, 100.0f, 100.0f, 0x1f } -#define FMOD_PRESET_ARENA { 0, 9, 1.00f, -1000, -698, 0, 7.24f, 0.33f, 1.0f, -1166, 0.020f, 16, 0.030f, 0.25f, 0.000f, 5000.0f, 250.0f, 100.0f, 100.0f, 0x3f } -#define FMOD_PRESET_HANGAR { 0, 10, 1.00f, -1000, -1000, 0, 10.05f, 0.23f, 1.0f, -602, 0.020f, 198, 0.030f, 0.25f, 0.000f, 5000.0f, 250.0f, 100.0f, 100.0f, 0x3f } -#define FMOD_PRESET_CARPETTEDHALLWAY { 0, 11, 1.00f, -1000, -4000, 0, 0.30f, 0.10f, 1.0f, -1831, 0.002f, -1630, 0.030f, 0.25f, 0.000f, 5000.0f, 250.0f, 100.0f, 100.0f, 0x3f } -#define FMOD_PRESET_HALLWAY { 0, 12, 1.00f, -1000, -300, 0, 1.49f, 0.59f, 1.0f, -1219, 0.007f, 441, 0.011f, 0.25f, 0.000f, 5000.0f, 250.0f, 100.0f, 100.0f, 0x3f } -#define FMOD_PRESET_STONECORRIDOR { 0, 13, 1.00f, -1000, -237, 0, 2.70f, 0.79f, 1.0f, -1214, 0.013f, 395, 0.020f, 0.25f, 0.000f, 5000.0f, 250.0f, 100.0f, 100.0f, 0x3f } -#define FMOD_PRESET_ALLEY { 0, 14, 0.30f, -1000, -270, 0, 1.49f, 0.86f, 1.0f, -1204, 0.007f, -4, 0.011f, 0.25f, 0.000f, 5000.0f, 250.0f, 100.0f, 100.0f, 0x3f } -#define FMOD_PRESET_FOREST { 0, 15, 0.30f, -1000, -3300, 0, 1.49f, 0.54f, 1.0f, -2560, 0.162f, -229, 0.088f, 0.25f, 0.000f, 5000.0f, 250.0f, 79.0f, 100.0f, 0x3f } -#define FMOD_PRESET_CITY { 0, 16, 0.50f, -1000, -800, 0, 1.49f, 0.67f, 1.0f, -2273, 0.007f, -1691, 0.011f, 0.25f, 0.000f, 5000.0f, 250.0f, 50.0f, 100.0f, 0x3f } -#define FMOD_PRESET_MOUNTAINS { 0, 17, 0.27f, -1000, -2500, 0, 1.49f, 0.21f, 1.0f, -2780, 0.300f, -1434, 0.100f, 0.25f, 0.000f, 5000.0f, 250.0f, 27.0f, 100.0f, 0x1f } -#define FMOD_PRESET_QUARRY { 0, 18, 1.00f, -1000, -1000, 0, 1.49f, 0.83f, 1.0f, -10000, 0.061f, 500, 0.025f, 0.25f, 0.000f, 5000.0f, 250.0f, 100.0f, 100.0f, 0x3f } -#define FMOD_PRESET_PLAIN { 0, 19, 0.21f, -1000, -2000, 0, 1.49f, 0.50f, 1.0f, -2466, 0.179f, -1926, 0.100f, 0.25f, 0.000f, 5000.0f, 250.0f, 21.0f, 100.0f, 0x3f } -#define FMOD_PRESET_PARKINGLOT { 0, 20, 1.00f, -1000, 0, 0, 1.65f, 1.50f, 1.0f, -1363, 0.008f, -1153, 0.012f, 0.25f, 0.000f, 5000.0f, 250.0f, 100.0f, 100.0f, 0x1f } -#define FMOD_PRESET_SEWERPIPE { 0, 21, 0.80f, -1000, -1000, 0, 2.81f, 0.14f, 1.0f, 429, 0.014f, 1023, 0.021f, 0.25f, 0.000f, 5000.0f, 250.0f, 80.0f, 60.0f, 0x3f } -#define FMOD_PRESET_UNDERWATER { 0, 22, 1.00f, -1000, -4000, 0, 1.49f, 0.10f, 1.0f, -449, 0.007f, 1700, 0.011f, 1.18f, 0.348f, 5000.0f, 250.0f, 100.0f, 100.0f, 0x3f } - -/* PlayStation Portable Only presets */ -#define FMOD_PRESET_PSP_ROOM { 0, 1, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0.000f, 0, 0.000f, 0.00f, 0.000f, 0000.0f, 0.0f, 0.0f, 0.0f, 0x31f } -#define FMOD_PRESET_PSP_STUDIO_A { 0, 2, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0.000f, 0, 0.000f, 0.00f, 0.000f, 0000.0f, 0.0f, 0.0f, 0.0f, 0x31f } -#define FMOD_PRESET_PSP_STUDIO_B { 0, 3, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0.000f, 0, 0.000f, 0.00f, 0.000f, 0000.0f, 0.0f, 0.0f, 0.0f, 0x31f } -#define FMOD_PRESET_PSP_STUDIO_C { 0, 4, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0.000f, 0, 0.000f, 0.00f, 0.000f, 0000.0f, 0.0f, 0.0f, 0.0f, 0x31f } -#define FMOD_PRESET_PSP_HALL { 0, 5, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0.000f, 0, 0.000f, 0.00f, 0.000f, 0000.0f, 0.0f, 0.0f, 0.0f, 0x31f } -#define FMOD_PRESET_PSP_SPACE { 0, 6, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0.000f, 0, 0.000f, 0.00f, 0.000f, 0000.0f, 0.0f, 0.0f, 0.0f, 0x31f } -#define FMOD_PRESET_PSP_ECHO { 0, 7, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0.000f, 0, 0.000f, 0.00f, 0.000f, 0000.0f, 0.0f, 0.0f, 0.0f, 0x31f } -#define FMOD_PRESET_PSP_DELAY { 0, 8, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0.000f, 0, 0.000f, 0.00f, 0.000f, 0000.0f, 0.0f, 0.0f, 0.0f, 0x31f } -#define FMOD_PRESET_PSP_PIPE { 0, 9, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0.000f, 0, 0.000f, 0.00f, 0.000f, 0000.0f, 0.0f, 0.0f, 0.0f, 0x31f } -/* [DEFINE_END] */ - - -/* -[STRUCTURE] -[ - [DESCRIPTION] - Structure defining the properties for a reverb source, related to a FMOD channel. - - Note the default reverb properties are the same as the FMOD_PRESET_GENERIC preset. - Note that integer values that typically range from -10,000 to 1000 are represented in - decibels, and are of a logarithmic scale, not linear, wheras float values are typically linear. - PORTABILITY: Each member has the platform it supports in braces ie (win32/wii). - - The numerical values listed below are the maximum, minimum and default values for each variable respectively. - - [REMARKS] - SUPPORTED next to each parameter means the platform the parameter can be set on. Some platforms support all parameters and some don't. - WII means Nintendo Wii hardware reverb (must use FMOD_HARDWARE). - PSP means Playstation Portable hardware reverb (must use FMOD_HARDWARE). - SFX means FMOD SFX software reverb. This works on any platform that uses FMOD_SOFTWARE for loading sounds. - --- means unsupported/deprecated. Will either be removed or supported by SFX in the future. - - - 'ConnectionPoint' Parameter. This parameter is for the FMOD software reverb only (known as SFX in the list above). - By default the dsp network connection for a channel and its reverb is between the 'SFX Reverb' unit, and the channel's wavetable/resampler/dspcodec/oscillator unit (the unit below the channel DSP head). NULL can be used for this parameter to make it use this default behaviour. - This parameter allows the user to connect the SFX reverb to somewhere else internally, for example the channel DSP head, or a related channelgroup. The event system uses this so that it can have the output of an event going to the reverb, instead of just the output of the event's channels (thereby ignoring event effects/submixes etc). - Do not use if you are unaware of DSP network connection issues. Leave it at the default of NULL instead. - - Members marked with [r] mean the variable is modified by FMOD and is for reading purposes only. Do not change this value. - Members marked with [w] mean the variable can be written to. The user can set the value. - Members marked with [r/w] are either read or write depending on if you are using Channel::setReverbProperties (w) or Channel::getReverbProperties (r). - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - Channel::setReverbProperties - Channel::getReverbProperties - FMOD_REVERB_CHANNELFLAGS -] -*/ -typedef struct FMOD_REVERB_CHANNELPROPERTIES -{ /* MIN MAX DEFAULT DESCRIPTION */ - int Direct; /* [r/w] -10000 1000 0 Direct path level (SUPPORTED:SFX) */ - int Room; /* [r/w] -10000 1000 0 Room effect level (SUPPORTED:SFX) */ - unsigned int Flags; /* [r/w] FMOD_REVERB_CHANNELFLAGS - modifies the behavior of properties (SUPPORTED:SFX) */ - FMOD_DSP *ConnectionPoint; /* [r/w] See remarks. DSP network location to connect reverb for this channel. (SUPPORTED:SFX).*/ -} FMOD_REVERB_CHANNELPROPERTIES; - - -/* -[DEFINE] -[ - [NAME] - FMOD_REVERB_CHANNELFLAGS - - [DESCRIPTION] - Values for the Flags member of the FMOD_REVERB_CHANNELPROPERTIES structure. - - [REMARKS] - For SFX Reverb, there is support for multiple reverb environments. - Use FMOD_REVERB_CHANNELFLAGS_ENVIRONMENT0 to FMOD_REVERB_CHANNELFLAGS_ENVIRONMENT3 in the flags member - of FMOD_REVERB_CHANNELPROPERTIES to specify which environment instance(s) to target. - - If you do not specify any instance the first reverb instance will be used. - - If you specify more than one instance with getReverbProperties, the first instance will be used. - - If you specify more than one instance with setReverbProperties, it will set more than 1 instance at once. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - FMOD_REVERB_CHANNELPROPERTIES -] -*/ -#define FMOD_REVERB_CHANNELFLAGS_INSTANCE0 0x00000010 /* SFX/Wii. Specify channel to target reverb instance 0. Default target. */ -#define FMOD_REVERB_CHANNELFLAGS_INSTANCE1 0x00000020 /* SFX/Wii. Specify channel to target reverb instance 1. */ -#define FMOD_REVERB_CHANNELFLAGS_INSTANCE2 0x00000040 /* SFX/Wii. Specify channel to target reverb instance 2. */ -#define FMOD_REVERB_CHANNELFLAGS_INSTANCE3 0x00000080 /* SFX. Specify channel to target reverb instance 3. */ - -#define FMOD_REVERB_CHANNELFLAGS_DEFAULT FMOD_REVERB_CHANNELFLAGS_INSTANCE0 -/* [DEFINE_END] */ - - -/* -[STRUCTURE] -[ - [DESCRIPTION] - Settings for advanced features like configuring memory and cpu usage for the FMOD_CREATECOMPRESSEDSAMPLE feature. - - [REMARKS] - maxMPEGcodecs / maxADPCMcodecs / maxXMAcodecs will determine the maximum cpu usage of playing realtime samples. Use this to lower potential excess cpu usage and also control memory usage. - - maxPCMcodecs is for use with PS3 only. It will determine the maximum number of PCM voices that can be played at once. This includes streams of any format and all sounds created - *without* the FMOD_CREATECOMPRESSEDSAMPLE flag. - - Memory will be allocated for codecs 'up front' (during System::init) if these values are specified as non zero. If any are zero, it allocates memory for the codec whenever a file of the type in question is loaded. So if maxMPEGcodecs is 0 for example, it will allocate memory for the mpeg codecs the first time an mp3 is loaded or an mp3 based .FSB file is loaded. - - Due to inefficient encoding techniques on certain .wav based ADPCM files, FMOD can can need an extra 29720 bytes per codec. This means for lowest memory consumption. Use FSB as it uses an optimal/small ADPCM block size. - - Members marked with [r] mean the variable is modified by FMOD and is for reading purposes only. Do not change this value. - Members marked with [w] mean the variable can be written to. The user can set the value. - Members marked with [r/w] are either read or write depending on if you are using System::setAdvancedSettings (w) or System::getAdvancedSettings (r). - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - System::setAdvancedSettings - System::getAdvancedSettings - System::init - FMOD_MODE -] -*/ -typedef struct FMOD_ADVANCEDSETTINGS -{ - int cbsize; /* [w] Size of this structure. Use sizeof(FMOD_ADVANCEDSETTINGS) NOTE: This must be set before calling System::getAdvancedSettings! */ - int maxMPEGcodecs; /* [r/w] Optional. Specify 0 to ignore. For use with FMOD_CREATECOMPRESSEDSAMPLE only. Mpeg codecs consume 21,684 bytes per instance and this number will determine how many mpeg channels can be played simultaneously. Default = 32. */ - int maxADPCMcodecs; /* [r/w] Optional. Specify 0 to ignore. For use with FMOD_CREATECOMPRESSEDSAMPLE only. ADPCM codecs consume 2,136 bytes per instance and this number will determine how many ADPCM channels can be played simultaneously. Default = 32. */ - int maxXMAcodecs; /* [r/w] Optional. Specify 0 to ignore. For use with FMOD_CREATECOMPRESSEDSAMPLE only. XMA codecs consume 14,836 bytes per instance and this number will determine how many XMA channels can be played simultaneously. Default = 32. */ - int maxCELTcodecs; /* [r/w] Optional. Specify 0 to ignore. For use with FMOD_CREATECOMPRESSEDSAMPLE only. CELT codecs consume 11,500 bytes per instance and this number will determine how many CELT channels can be played simultaneously. Default = 32. */ - int maxVORBIScodecs; /* [r/w] Optional. Specify 0 to ignore. For use with FMOD_CREATECOMPRESSEDSAMPLE only. Vorbis codecs consume 12,000 bytes per instance and this number will determine how many Vorbis channels can be played simultaneously. Default = 32. */ - int maxPCMcodecs; /* [r/w] Optional. Specify 0 to ignore. For use with PS3 only. PCM codecs consume 12,672 bytes per instance and this number will determine how many streams and PCM voices can be played simultaneously. Default = 16. */ - int ASIONumChannels; /* [r/w] Optional. Specify 0 to ignore. Number of channels available on the ASIO device. */ - char **ASIOChannelList; /* [r/w] Optional. Specify 0 to ignore. Pointer to an array of strings (number of entries defined by ASIONumChannels) with ASIO channel names. */ - FMOD_SPEAKER *ASIOSpeakerList; /* [r/w] Optional. Specify 0 to ignore. Pointer to a list of speakers that the ASIO channels map to. This can be called after System::init to remap ASIO output. */ - int max3DReverbDSPs; /* [r/w] Optional. Specify 0 to ignore. The max number of 3d reverb DSP's in the system. (NOTE: CURRENTLY DISABLED / UNUSED) */ - float HRTFMinAngle; /* [r/w] Optional. For use with FMOD_INIT_HRTF_LOWPASS. The angle range (0-360) of a 3D sound in relation to the listener, at which the HRTF function begins to have an effect. 0 = in front of the listener. 180 = from 90 degrees to the left of the listener to 90 degrees to the right. 360 = behind the listener. Default = 180.0. */ - float HRTFMaxAngle; /* [r/w] Optional. For use with FMOD_INIT_HRTF_LOWPASS. The angle range (0-360) of a 3D sound in relation to the listener, at which the HRTF function has maximum effect. 0 = front of the listener. 180 = from 90 degrees to the left of the listener to 90 degrees to the right. 360 = behind the listener. Default = 360.0. */ - float HRTFFreq; /* [r/w] Optional. Specify 0 to ignore. For use with FMOD_INIT_HRTF_LOWPASS. The cutoff frequency of the HRTF's lowpass filter function when at maximum effect. (i.e. at HRTFMaxAngle). Default = 4000.0. */ - float vol0virtualvol; /* [r/w] Optional. Specify 0 to ignore. For use with FMOD_INIT_VOL0_BECOMES_VIRTUAL. If this flag is used, and the volume is 0.0, then the sound will become virtual. Use this value to raise the threshold to a different point where a sound goes virtual. */ - int eventqueuesize; /* [r/w] Optional. Specify 0 to ignore. For use with FMOD Event system only. Specifies the number of slots available for simultaneous non blocking loads, across all threads. Default = 32. */ - unsigned int defaultDecodeBufferSize; /* [r/w] Optional. Specify 0 to ignore. For streams. This determines the default size of the double buffer (in milliseconds) that a stream uses. Default = 400ms */ - char *debugLogFilename; /* [r/w] Optional. Specify 0 to ignore. Gives fmod's logging system a path/filename. Normally the log is placed in the same directory as the executable and called fmod.log. When using System::getAdvancedSettings, provide at least 256 bytes of memory to copy into. */ - unsigned short profileport; /* [r/w] Optional. Specify 0 to ignore. For use with FMOD_INIT_ENABLE_PROFILE. Specify the port to listen on for connections by the profiler application. */ - unsigned int geometryMaxFadeTime; /* [r/w] Optional. Specify 0 to ignore. The maximum time in miliseconds it takes for a channel to fade to the new level when its occlusion changes. */ - unsigned int maxSpectrumWaveDataBuffers; /* [r/w] Optional. Specify 0 to ignore. Tells System::init to allocate a pool of wavedata/spectrum buffers to prevent memory fragmentation, any additional buffers will be allocated normally. */ - unsigned int musicSystemCacheDelay; /* [r/w] Optional. Specify 0 to ignore. The delay the music system should allow for loading a sample from disk (in milliseconds). Default = 400 ms. */ - float distanceFilterCenterFreq; /* [r/w] Optional. Specify 0 to ignore. For use with FMOD_INIT_DISTANCE_FILTERING. The default center frequency in Hz for the distance filtering effect. Default = 1500.0. */ - unsigned int stackSizeStream; /* [r/w] Optional. Specify 0 to ignore. Specify the stack size for the FMOD Stream thread in bytes. Useful for custom codecs that use excess stack. Default 49,152 (48kb) */ - unsigned int stackSizeNonBlocking; /* [r/w] Optional. Specify 0 to ignore. Specify the stack size for the FMOD_NONBLOCKING loading thread. Useful for custom codecs that use excess stack. Default 65,536 (64kb) */ - unsigned int stackSizeMixer; /* [r/w] Optional. Specify 0 to ignore. Specify the stack size for the FMOD mixer thread. Useful for custom dsps that use excess stack. Default 49,152 (48kb) */ -} FMOD_ADVANCEDSETTINGS; - - -/* -[ENUM] -[ - [DESCRIPTION] - Special channel index values for FMOD functions. - - [REMARKS] - To get 'all' of the channels, use System::getMasterChannelGroup. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - System::playSound - System::playDSP - System::getChannel - System::getMasterChannelGroup -] -*/ -typedef enum -{ - FMOD_CHANNEL_FREE = -1, /* For a channel index, FMOD chooses a free voice using the priority system. */ - FMOD_CHANNEL_REUSE = -2 /* For a channel index, re-use the channel handle that was passed in. */ -} FMOD_CHANNELINDEX; - -#include "fmod_codec.h" -#include "fmod_dsp.h" -#include "fmod_memoryinfo.h" - -/* ========================================================================================== */ -/* FUNCTION PROTOTYPES */ -/* ========================================================================================== */ - -#ifdef __cplusplus -extern "C" -{ -#endif - -/* - FMOD global system functions (optional). -*/ - -FMOD_RESULT F_API FMOD_Memory_Initialize (void *poolmem, int poollen, FMOD_MEMORY_ALLOCCALLBACK useralloc, FMOD_MEMORY_REALLOCCALLBACK userrealloc, FMOD_MEMORY_FREECALLBACK userfree, FMOD_MEMORY_TYPE memtypeflags); -FMOD_RESULT F_API FMOD_Memory_GetStats (int *currentalloced, int *maxalloced, FMOD_BOOL blocking); -FMOD_RESULT F_API FMOD_Debug_SetLevel (FMOD_DEBUGLEVEL level); -FMOD_RESULT F_API FMOD_Debug_GetLevel (FMOD_DEBUGLEVEL *level); -FMOD_RESULT F_API FMOD_File_SetDiskBusy (int busy); -FMOD_RESULT F_API FMOD_File_GetDiskBusy (int *busy); - -/* - FMOD System factory functions. Use this to create an FMOD System Instance. below you will see FMOD_System_Init/Close to get started. -*/ - -FMOD_RESULT F_API FMOD_System_Create (FMOD_SYSTEM **system); -FMOD_RESULT F_API FMOD_System_Release (FMOD_SYSTEM *system); - - -/* - 'System' API -*/ - -/* - Pre-init functions. -*/ - -FMOD_RESULT F_API FMOD_System_SetOutput (FMOD_SYSTEM *system, FMOD_OUTPUTTYPE output); -FMOD_RESULT F_API FMOD_System_GetOutput (FMOD_SYSTEM *system, FMOD_OUTPUTTYPE *output); -FMOD_RESULT F_API FMOD_System_GetNumDrivers (FMOD_SYSTEM *system, int *numdrivers); -FMOD_RESULT F_API FMOD_System_GetDriverInfo (FMOD_SYSTEM *system, int id, char *name, int namelen, FMOD_GUID *guid); -FMOD_RESULT F_API FMOD_System_GetDriverInfoW (FMOD_SYSTEM *system, int id, short *name, int namelen, FMOD_GUID *guid); -FMOD_RESULT F_API FMOD_System_GetDriverCaps (FMOD_SYSTEM *system, int id, FMOD_CAPS *caps, int *controlpaneloutputrate, FMOD_SPEAKERMODE *controlpanelspeakermode); -FMOD_RESULT F_API FMOD_System_SetDriver (FMOD_SYSTEM *system, int driver); -FMOD_RESULT F_API FMOD_System_GetDriver (FMOD_SYSTEM *system, int *driver); -FMOD_RESULT F_API FMOD_System_SetHardwareChannels (FMOD_SYSTEM *system, int numhardwarechannels); -FMOD_RESULT F_API FMOD_System_SetSoftwareChannels (FMOD_SYSTEM *system, int numsoftwarechannels); -FMOD_RESULT F_API FMOD_System_GetSoftwareChannels (FMOD_SYSTEM *system, int *numsoftwarechannels); -FMOD_RESULT F_API FMOD_System_SetSoftwareFormat (FMOD_SYSTEM *system, int samplerate, FMOD_SOUND_FORMAT format, int numoutputchannels, int maxinputchannels, FMOD_DSP_RESAMPLER resamplemethod); -FMOD_RESULT F_API FMOD_System_GetSoftwareFormat (FMOD_SYSTEM *system, int *samplerate, FMOD_SOUND_FORMAT *format, int *numoutputchannels, int *maxinputchannels, FMOD_DSP_RESAMPLER *resamplemethod, int *bits); -FMOD_RESULT F_API FMOD_System_SetDSPBufferSize (FMOD_SYSTEM *system, unsigned int bufferlength, int numbuffers); -FMOD_RESULT F_API FMOD_System_GetDSPBufferSize (FMOD_SYSTEM *system, unsigned int *bufferlength, int *numbuffers); -FMOD_RESULT F_API FMOD_System_SetFileSystem (FMOD_SYSTEM *system, FMOD_FILE_OPENCALLBACK useropen, FMOD_FILE_CLOSECALLBACK userclose, FMOD_FILE_READCALLBACK userread, FMOD_FILE_SEEKCALLBACK userseek, FMOD_FILE_ASYNCREADCALLBACK userasyncread, FMOD_FILE_ASYNCCANCELCALLBACK userasynccancel, int blockalign); -FMOD_RESULT F_API FMOD_System_AttachFileSystem (FMOD_SYSTEM *system, FMOD_FILE_OPENCALLBACK useropen, FMOD_FILE_CLOSECALLBACK userclose, FMOD_FILE_READCALLBACK userread, FMOD_FILE_SEEKCALLBACK userseek); -FMOD_RESULT F_API FMOD_System_SetAdvancedSettings (FMOD_SYSTEM *system, FMOD_ADVANCEDSETTINGS *settings); -FMOD_RESULT F_API FMOD_System_GetAdvancedSettings (FMOD_SYSTEM *system, FMOD_ADVANCEDSETTINGS *settings); -FMOD_RESULT F_API FMOD_System_SetSpeakerMode (FMOD_SYSTEM *system, FMOD_SPEAKERMODE speakermode); -FMOD_RESULT F_API FMOD_System_GetSpeakerMode (FMOD_SYSTEM *system, FMOD_SPEAKERMODE *speakermode); -FMOD_RESULT F_API FMOD_System_SetCallback (FMOD_SYSTEM *system, FMOD_SYSTEM_CALLBACK callback); - -/* - Plug-in support -*/ - -FMOD_RESULT F_API FMOD_System_SetPluginPath (FMOD_SYSTEM *system, const char *path); -FMOD_RESULT F_API FMOD_System_LoadPlugin (FMOD_SYSTEM *system, const char *filename, unsigned int *handle, unsigned int priority); -FMOD_RESULT F_API FMOD_System_UnloadPlugin (FMOD_SYSTEM *system, unsigned int handle); -FMOD_RESULT F_API FMOD_System_GetNumPlugins (FMOD_SYSTEM *system, FMOD_PLUGINTYPE plugintype, int *numplugins); -FMOD_RESULT F_API FMOD_System_GetPluginHandle (FMOD_SYSTEM *system, FMOD_PLUGINTYPE plugintype, int index, unsigned int *handle); -FMOD_RESULT F_API FMOD_System_GetPluginInfo (FMOD_SYSTEM *system, unsigned int handle, FMOD_PLUGINTYPE *plugintype, char *name, int namelen, unsigned int *version); -FMOD_RESULT F_API FMOD_System_SetOutputByPlugin (FMOD_SYSTEM *system, unsigned int handle); -FMOD_RESULT F_API FMOD_System_GetOutputByPlugin (FMOD_SYSTEM *system, unsigned int *handle); -FMOD_RESULT F_API FMOD_System_CreateDSPByPlugin (FMOD_SYSTEM *system, unsigned int handle, FMOD_DSP **dsp); -FMOD_RESULT F_API FMOD_System_RegisterCodec (FMOD_SYSTEM *system, FMOD_CODEC_DESCRIPTION *description, unsigned int *handle, unsigned int priority); -FMOD_RESULT F_API FMOD_System_RegisterDSP (FMOD_SYSTEM *system, FMOD_DSP_DESCRIPTION *description, unsigned int *handle); - -/* - Init/Close -*/ - -FMOD_RESULT F_API FMOD_System_Init (FMOD_SYSTEM *system, int maxchannels, FMOD_INITFLAGS flags, void *extradriverdata); -FMOD_RESULT F_API FMOD_System_Close (FMOD_SYSTEM *system); - -/* - General post-init system functions -*/ - -FMOD_RESULT F_API FMOD_System_Update (FMOD_SYSTEM *system); - -FMOD_RESULT F_API FMOD_System_Set3DSettings (FMOD_SYSTEM *system, float dopplerscale, float distancefactor, float rolloffscale); -FMOD_RESULT F_API FMOD_System_Get3DSettings (FMOD_SYSTEM *system, float *dopplerscale, float *distancefactor, float *rolloffscale); -FMOD_RESULT F_API FMOD_System_Set3DNumListeners (FMOD_SYSTEM *system, int numlisteners); -FMOD_RESULT F_API FMOD_System_Get3DNumListeners (FMOD_SYSTEM *system, int *numlisteners); -FMOD_RESULT F_API FMOD_System_Set3DListenerAttributes(FMOD_SYSTEM *system, int listener, const FMOD_VECTOR *pos, const FMOD_VECTOR *vel, const FMOD_VECTOR *forward, const FMOD_VECTOR *up); -FMOD_RESULT F_API FMOD_System_Get3DListenerAttributes(FMOD_SYSTEM *system, int listener, FMOD_VECTOR *pos, FMOD_VECTOR *vel, FMOD_VECTOR *forward, FMOD_VECTOR *up); -FMOD_RESULT F_API FMOD_System_Set3DRolloffCallback (FMOD_SYSTEM *system, FMOD_3D_ROLLOFFCALLBACK callback); -FMOD_RESULT F_API FMOD_System_Set3DSpeakerPosition (FMOD_SYSTEM *system, FMOD_SPEAKER speaker, float x, float y, FMOD_BOOL active); -FMOD_RESULT F_API FMOD_System_Get3DSpeakerPosition (FMOD_SYSTEM *system, FMOD_SPEAKER speaker, float *x, float *y, FMOD_BOOL *active); - -FMOD_RESULT F_API FMOD_System_SetStreamBufferSize (FMOD_SYSTEM *system, unsigned int filebuffersize, FMOD_TIMEUNIT filebuffersizetype); -FMOD_RESULT F_API FMOD_System_GetStreamBufferSize (FMOD_SYSTEM *system, unsigned int *filebuffersize, FMOD_TIMEUNIT *filebuffersizetype); - -/* - System information functions. -*/ - -FMOD_RESULT F_API FMOD_System_GetVersion (FMOD_SYSTEM *system, unsigned int *version); -FMOD_RESULT F_API FMOD_System_GetOutputHandle (FMOD_SYSTEM *system, void **handle); -FMOD_RESULT F_API FMOD_System_GetChannelsPlaying (FMOD_SYSTEM *system, int *channels); -FMOD_RESULT F_API FMOD_System_GetHardwareChannels (FMOD_SYSTEM *system, int *numhardwarechannels); -FMOD_RESULT F_API FMOD_System_GetCPUUsage (FMOD_SYSTEM *system, float *dsp, float *stream, float *geometry, float *update, float *total); -FMOD_RESULT F_API FMOD_System_GetSoundRAM (FMOD_SYSTEM *system, int *currentalloced, int *maxalloced, int *total); -FMOD_RESULT F_API FMOD_System_GetNumCDROMDrives (FMOD_SYSTEM *system, int *numdrives); -FMOD_RESULT F_API FMOD_System_GetCDROMDriveName (FMOD_SYSTEM *system, int drive, char *drivename, int drivenamelen, char *scsiname, int scsinamelen, char *devicename, int devicenamelen); -FMOD_RESULT F_API FMOD_System_GetSpectrum (FMOD_SYSTEM *system, float *spectrumarray, int numvalues, int channeloffset, FMOD_DSP_FFT_WINDOW windowtype); -FMOD_RESULT F_API FMOD_System_GetWaveData (FMOD_SYSTEM *system, float *wavearray, int numvalues, int channeloffset); - -/* - Sound/DSP/Channel/FX creation and retrieval. -*/ - -FMOD_RESULT F_API FMOD_System_CreateSound (FMOD_SYSTEM *system, const char *name_or_data, FMOD_MODE mode, FMOD_CREATESOUNDEXINFO *exinfo, FMOD_SOUND **sound); -FMOD_RESULT F_API FMOD_System_CreateStream (FMOD_SYSTEM *system, const char *name_or_data, FMOD_MODE mode, FMOD_CREATESOUNDEXINFO *exinfo, FMOD_SOUND **sound); -FMOD_RESULT F_API FMOD_System_CreateDSP (FMOD_SYSTEM *system, FMOD_DSP_DESCRIPTION *description, FMOD_DSP **dsp); -FMOD_RESULT F_API FMOD_System_CreateDSPByType (FMOD_SYSTEM *system, FMOD_DSP_TYPE type, FMOD_DSP **dsp); -FMOD_RESULT F_API FMOD_System_CreateChannelGroup (FMOD_SYSTEM *system, const char *name, FMOD_CHANNELGROUP **channelgroup); -FMOD_RESULT F_API FMOD_System_CreateSoundGroup (FMOD_SYSTEM *system, const char *name, FMOD_SOUNDGROUP **soundgroup); -FMOD_RESULT F_API FMOD_System_CreateReverb (FMOD_SYSTEM *system, FMOD_REVERB **reverb); - -FMOD_RESULT F_API FMOD_System_PlaySound (FMOD_SYSTEM *system, FMOD_CHANNELINDEX channelid, FMOD_SOUND *sound, FMOD_BOOL paused, FMOD_CHANNEL **channel); -FMOD_RESULT F_API FMOD_System_PlayDSP (FMOD_SYSTEM *system, FMOD_CHANNELINDEX channelid, FMOD_DSP *dsp, FMOD_BOOL paused, FMOD_CHANNEL **channel); -FMOD_RESULT F_API FMOD_System_GetChannel (FMOD_SYSTEM *system, int channelid, FMOD_CHANNEL **channel); -FMOD_RESULT F_API FMOD_System_GetMasterChannelGroup (FMOD_SYSTEM *system, FMOD_CHANNELGROUP **channelgroup); -FMOD_RESULT F_API FMOD_System_GetMasterSoundGroup (FMOD_SYSTEM *system, FMOD_SOUNDGROUP **soundgroup); - -/* - Reverb API -*/ - -FMOD_RESULT F_API FMOD_System_SetReverbProperties (FMOD_SYSTEM *system, const FMOD_REVERB_PROPERTIES *prop); -FMOD_RESULT F_API FMOD_System_GetReverbProperties (FMOD_SYSTEM *system, FMOD_REVERB_PROPERTIES *prop); -FMOD_RESULT F_API FMOD_System_SetReverbAmbientProperties(FMOD_SYSTEM *system, FMOD_REVERB_PROPERTIES *prop); -FMOD_RESULT F_API FMOD_System_GetReverbAmbientProperties(FMOD_SYSTEM *system, FMOD_REVERB_PROPERTIES *prop); - -/* - System level DSP access. -*/ - -FMOD_RESULT F_API FMOD_System_GetDSPHead (FMOD_SYSTEM *system, FMOD_DSP **dsp); -FMOD_RESULT F_API FMOD_System_AddDSP (FMOD_SYSTEM *system, FMOD_DSP *dsp, FMOD_DSPCONNECTION **connection); -FMOD_RESULT F_API FMOD_System_LockDSP (FMOD_SYSTEM *system); -FMOD_RESULT F_API FMOD_System_UnlockDSP (FMOD_SYSTEM *system); -FMOD_RESULT F_API FMOD_System_GetDSPClock (FMOD_SYSTEM *system, unsigned int *hi, unsigned int *lo); - -/* - Recording API. -*/ - -FMOD_RESULT F_API FMOD_System_GetRecordNumDrivers (FMOD_SYSTEM *system, int *numdrivers); -FMOD_RESULT F_API FMOD_System_GetRecordDriverInfo (FMOD_SYSTEM *system, int id, char *name, int namelen, FMOD_GUID *guid); -FMOD_RESULT F_API FMOD_System_GetRecordDriverInfoW (FMOD_SYSTEM *system, int id, short *name, int namelen, FMOD_GUID *guid); -FMOD_RESULT F_API FMOD_System_GetRecordDriverCaps (FMOD_SYSTEM *system, int id, FMOD_CAPS *caps, int *minfrequency, int *maxfrequency); -FMOD_RESULT F_API FMOD_System_GetRecordPosition (FMOD_SYSTEM *system, int id, unsigned int *position); - -FMOD_RESULT F_API FMOD_System_RecordStart (FMOD_SYSTEM *system, int id, FMOD_SOUND *sound, FMOD_BOOL loop); -FMOD_RESULT F_API FMOD_System_RecordStop (FMOD_SYSTEM *system, int id); -FMOD_RESULT F_API FMOD_System_IsRecording (FMOD_SYSTEM *system, int id, FMOD_BOOL *recording); - -/* - Geometry API. -*/ - -FMOD_RESULT F_API FMOD_System_CreateGeometry (FMOD_SYSTEM *system, int maxpolygons, int maxvertices, FMOD_GEOMETRY **geometry); -FMOD_RESULT F_API FMOD_System_SetGeometrySettings (FMOD_SYSTEM *system, float maxworldsize); -FMOD_RESULT F_API FMOD_System_GetGeometrySettings (FMOD_SYSTEM *system, float *maxworldsize); -FMOD_RESULT F_API FMOD_System_LoadGeometry (FMOD_SYSTEM *system, const void *data, int datasize, FMOD_GEOMETRY **geometry); -FMOD_RESULT F_API FMOD_System_GetGeometryOcclusion (FMOD_SYSTEM *system, const FMOD_VECTOR *listener, const FMOD_VECTOR *source, float *direct, float *reverb); - -/* - Network functions. -*/ - -FMOD_RESULT F_API FMOD_System_SetNetworkProxy (FMOD_SYSTEM *system, const char *proxy); -FMOD_RESULT F_API FMOD_System_GetNetworkProxy (FMOD_SYSTEM *system, char *proxy, int proxylen); -FMOD_RESULT F_API FMOD_System_SetNetworkTimeout (FMOD_SYSTEM *system, int timeout); -FMOD_RESULT F_API FMOD_System_GetNetworkTimeout (FMOD_SYSTEM *system, int *timeout); - -/* - Userdata set/get. -*/ - -FMOD_RESULT F_API FMOD_System_SetUserData (FMOD_SYSTEM *system, void *userdata); -FMOD_RESULT F_API FMOD_System_GetUserData (FMOD_SYSTEM *system, void **userdata); - -FMOD_RESULT F_API FMOD_System_GetMemoryInfo (FMOD_SYSTEM *system, unsigned int memorybits, unsigned int event_memorybits, unsigned int *memoryused, FMOD_MEMORY_USAGE_DETAILS *memoryused_details); - -/* - 'Sound' API -*/ - -FMOD_RESULT F_API FMOD_Sound_Release (FMOD_SOUND *sound); -FMOD_RESULT F_API FMOD_Sound_GetSystemObject (FMOD_SOUND *sound, FMOD_SYSTEM **system); - -/* - Standard sound manipulation functions. -*/ - -FMOD_RESULT F_API FMOD_Sound_Lock (FMOD_SOUND *sound, unsigned int offset, unsigned int length, void **ptr1, void **ptr2, unsigned int *len1, unsigned int *len2); -FMOD_RESULT F_API FMOD_Sound_Unlock (FMOD_SOUND *sound, void *ptr1, void *ptr2, unsigned int len1, unsigned int len2); -FMOD_RESULT F_API FMOD_Sound_SetDefaults (FMOD_SOUND *sound, float frequency, float volume, float pan, int priority); -FMOD_RESULT F_API FMOD_Sound_GetDefaults (FMOD_SOUND *sound, float *frequency, float *volume, float *pan, int *priority); -FMOD_RESULT F_API FMOD_Sound_SetVariations (FMOD_SOUND *sound, float frequencyvar, float volumevar, float panvar); -FMOD_RESULT F_API FMOD_Sound_GetVariations (FMOD_SOUND *sound, float *frequencyvar, float *volumevar, float *panvar); -FMOD_RESULT F_API FMOD_Sound_Set3DMinMaxDistance (FMOD_SOUND *sound, float min, float max); -FMOD_RESULT F_API FMOD_Sound_Get3DMinMaxDistance (FMOD_SOUND *sound, float *min, float *max); -FMOD_RESULT F_API FMOD_Sound_Set3DConeSettings (FMOD_SOUND *sound, float insideconeangle, float outsideconeangle, float outsidevolume); -FMOD_RESULT F_API FMOD_Sound_Get3DConeSettings (FMOD_SOUND *sound, float *insideconeangle, float *outsideconeangle, float *outsidevolume); -FMOD_RESULT F_API FMOD_Sound_Set3DCustomRolloff (FMOD_SOUND *sound, FMOD_VECTOR *points, int numpoints); -FMOD_RESULT F_API FMOD_Sound_Get3DCustomRolloff (FMOD_SOUND *sound, FMOD_VECTOR **points, int *numpoints); -FMOD_RESULT F_API FMOD_Sound_SetSubSound (FMOD_SOUND *sound, int index, FMOD_SOUND *subsound); -FMOD_RESULT F_API FMOD_Sound_GetSubSound (FMOD_SOUND *sound, int index, FMOD_SOUND **subsound); -FMOD_RESULT F_API FMOD_Sound_SetSubSoundSentence (FMOD_SOUND *sound, int *subsoundlist, int numsubsounds); -FMOD_RESULT F_API FMOD_Sound_GetName (FMOD_SOUND *sound, char *name, int namelen); -FMOD_RESULT F_API FMOD_Sound_GetLength (FMOD_SOUND *sound, unsigned int *length, FMOD_TIMEUNIT lengthtype); -FMOD_RESULT F_API FMOD_Sound_GetFormat (FMOD_SOUND *sound, FMOD_SOUND_TYPE *type, FMOD_SOUND_FORMAT *format, int *channels, int *bits); -FMOD_RESULT F_API FMOD_Sound_GetNumSubSounds (FMOD_SOUND *sound, int *numsubsounds); -FMOD_RESULT F_API FMOD_Sound_GetNumTags (FMOD_SOUND *sound, int *numtags, int *numtagsupdated); -FMOD_RESULT F_API FMOD_Sound_GetTag (FMOD_SOUND *sound, const char *name, int index, FMOD_TAG *tag); -FMOD_RESULT F_API FMOD_Sound_GetOpenState (FMOD_SOUND *sound, FMOD_OPENSTATE *openstate, unsigned int *percentbuffered, FMOD_BOOL *starving, FMOD_BOOL *diskbusy); -FMOD_RESULT F_API FMOD_Sound_ReadData (FMOD_SOUND *sound, void *buffer, unsigned int lenbytes, unsigned int *read); -FMOD_RESULT F_API FMOD_Sound_SeekData (FMOD_SOUND *sound, unsigned int pcm); - -FMOD_RESULT F_API FMOD_Sound_SetSoundGroup (FMOD_SOUND *sound, FMOD_SOUNDGROUP *soundgroup); -FMOD_RESULT F_API FMOD_Sound_GetSoundGroup (FMOD_SOUND *sound, FMOD_SOUNDGROUP **soundgroup); - -/* - Synchronization point API. These points can come from markers embedded in wav files, and can also generate channel callbacks. -*/ - -FMOD_RESULT F_API FMOD_Sound_GetNumSyncPoints (FMOD_SOUND *sound, int *numsyncpoints); -FMOD_RESULT F_API FMOD_Sound_GetSyncPoint (FMOD_SOUND *sound, int index, FMOD_SYNCPOINT **point); -FMOD_RESULT F_API FMOD_Sound_GetSyncPointInfo (FMOD_SOUND *sound, FMOD_SYNCPOINT *point, char *name, int namelen, unsigned int *offset, FMOD_TIMEUNIT offsettype); -FMOD_RESULT F_API FMOD_Sound_AddSyncPoint (FMOD_SOUND *sound, unsigned int offset, FMOD_TIMEUNIT offsettype, const char *name, FMOD_SYNCPOINT **point); -FMOD_RESULT F_API FMOD_Sound_DeleteSyncPoint (FMOD_SOUND *sound, FMOD_SYNCPOINT *point); - -/* - Functions also in Channel class but here they are the 'default' to save having to change it in Channel all the time. -*/ - -FMOD_RESULT F_API FMOD_Sound_SetMode (FMOD_SOUND *sound, FMOD_MODE mode); -FMOD_RESULT F_API FMOD_Sound_GetMode (FMOD_SOUND *sound, FMOD_MODE *mode); -FMOD_RESULT F_API FMOD_Sound_SetLoopCount (FMOD_SOUND *sound, int loopcount); -FMOD_RESULT F_API FMOD_Sound_GetLoopCount (FMOD_SOUND *sound, int *loopcount); -FMOD_RESULT F_API FMOD_Sound_SetLoopPoints (FMOD_SOUND *sound, unsigned int loopstart, FMOD_TIMEUNIT loopstarttype, unsigned int loopend, FMOD_TIMEUNIT loopendtype); -FMOD_RESULT F_API FMOD_Sound_GetLoopPoints (FMOD_SOUND *sound, unsigned int *loopstart, FMOD_TIMEUNIT loopstarttype, unsigned int *loopend, FMOD_TIMEUNIT loopendtype); - -/* - For MOD/S3M/XM/IT/MID sequenced formats only. -*/ - -FMOD_RESULT F_API FMOD_Sound_GetMusicNumChannels (FMOD_SOUND *sound, int *numchannels); -FMOD_RESULT F_API FMOD_Sound_SetMusicChannelVolume (FMOD_SOUND *sound, int channel, float volume); -FMOD_RESULT F_API FMOD_Sound_GetMusicChannelVolume (FMOD_SOUND *sound, int channel, float *volume); -FMOD_RESULT F_API FMOD_Sound_SetMusicSpeed (FMOD_SOUND *sound, float speed); -FMOD_RESULT F_API FMOD_Sound_GetMusicSpeed (FMOD_SOUND *sound, float *speed); - -/* - Userdata set/get. -*/ - -FMOD_RESULT F_API FMOD_Sound_SetUserData (FMOD_SOUND *sound, void *userdata); -FMOD_RESULT F_API FMOD_Sound_GetUserData (FMOD_SOUND *sound, void **userdata); - -FMOD_RESULT F_API FMOD_Sound_GetMemoryInfo (FMOD_SOUND *sound, unsigned int memorybits, unsigned int event_memorybits, unsigned int *memoryused, FMOD_MEMORY_USAGE_DETAILS *memoryused_details); - -/* - 'Channel' API -*/ - -FMOD_RESULT F_API FMOD_Channel_GetSystemObject (FMOD_CHANNEL *channel, FMOD_SYSTEM **system); - -FMOD_RESULT F_API FMOD_Channel_Stop (FMOD_CHANNEL *channel); -FMOD_RESULT F_API FMOD_Channel_SetPaused (FMOD_CHANNEL *channel, FMOD_BOOL paused); -FMOD_RESULT F_API FMOD_Channel_GetPaused (FMOD_CHANNEL *channel, FMOD_BOOL *paused); -FMOD_RESULT F_API FMOD_Channel_SetVolume (FMOD_CHANNEL *channel, float volume); -FMOD_RESULT F_API FMOD_Channel_GetVolume (FMOD_CHANNEL *channel, float *volume); -FMOD_RESULT F_API FMOD_Channel_SetFrequency (FMOD_CHANNEL *channel, float frequency); -FMOD_RESULT F_API FMOD_Channel_GetFrequency (FMOD_CHANNEL *channel, float *frequency); -FMOD_RESULT F_API FMOD_Channel_SetPan (FMOD_CHANNEL *channel, float pan); -FMOD_RESULT F_API FMOD_Channel_GetPan (FMOD_CHANNEL *channel, float *pan); -FMOD_RESULT F_API FMOD_Channel_SetDelay (FMOD_CHANNEL *channel, FMOD_DELAYTYPE delaytype, unsigned int delayhi, unsigned int delaylo); -FMOD_RESULT F_API FMOD_Channel_GetDelay (FMOD_CHANNEL *channel, FMOD_DELAYTYPE delaytype, unsigned int *delayhi, unsigned int *delaylo); -FMOD_RESULT F_API FMOD_Channel_SetSpeakerMix (FMOD_CHANNEL *channel, float frontleft, float frontright, float center, float lfe, float backleft, float backright, float sideleft, float sideright); -FMOD_RESULT F_API FMOD_Channel_GetSpeakerMix (FMOD_CHANNEL *channel, float *frontleft, float *frontright, float *center, float *lfe, float *backleft, float *backright, float *sideleft, float *sideright); -FMOD_RESULT F_API FMOD_Channel_SetSpeakerLevels (FMOD_CHANNEL *channel, FMOD_SPEAKER speaker, float *levels, int numlevels); -FMOD_RESULT F_API FMOD_Channel_GetSpeakerLevels (FMOD_CHANNEL *channel, FMOD_SPEAKER speaker, float *levels, int numlevels); -FMOD_RESULT F_API FMOD_Channel_SetInputChannelMix (FMOD_CHANNEL *channel, float *levels, int numlevels); -FMOD_RESULT F_API FMOD_Channel_GetInputChannelMix (FMOD_CHANNEL *channel, float *levels, int numlevels); -FMOD_RESULT F_API FMOD_Channel_SetMute (FMOD_CHANNEL *channel, FMOD_BOOL mute); -FMOD_RESULT F_API FMOD_Channel_GetMute (FMOD_CHANNEL *channel, FMOD_BOOL *mute); -FMOD_RESULT F_API FMOD_Channel_SetPriority (FMOD_CHANNEL *channel, int priority); -FMOD_RESULT F_API FMOD_Channel_GetPriority (FMOD_CHANNEL *channel, int *priority); -FMOD_RESULT F_API FMOD_Channel_SetPosition (FMOD_CHANNEL *channel, unsigned int position, FMOD_TIMEUNIT postype); -FMOD_RESULT F_API FMOD_Channel_GetPosition (FMOD_CHANNEL *channel, unsigned int *position, FMOD_TIMEUNIT postype); -FMOD_RESULT F_API FMOD_Channel_SetReverbProperties (FMOD_CHANNEL *channel, const FMOD_REVERB_CHANNELPROPERTIES *prop); -FMOD_RESULT F_API FMOD_Channel_GetReverbProperties (FMOD_CHANNEL *channel, FMOD_REVERB_CHANNELPROPERTIES *prop); -FMOD_RESULT F_API FMOD_Channel_SetLowPassGain (FMOD_CHANNEL *channel, float gain); -FMOD_RESULT F_API FMOD_Channel_GetLowPassGain (FMOD_CHANNEL *channel, float *gain); - -FMOD_RESULT F_API FMOD_Channel_SetChannelGroup (FMOD_CHANNEL *channel, FMOD_CHANNELGROUP *channelgroup); -FMOD_RESULT F_API FMOD_Channel_GetChannelGroup (FMOD_CHANNEL *channel, FMOD_CHANNELGROUP **channelgroup); -FMOD_RESULT F_API FMOD_Channel_SetCallback (FMOD_CHANNEL *channel, FMOD_CHANNEL_CALLBACK callback); - -/* - 3D functionality. -*/ - -FMOD_RESULT F_API FMOD_Channel_Set3DAttributes (FMOD_CHANNEL *channel, const FMOD_VECTOR *pos, const FMOD_VECTOR *vel); -FMOD_RESULT F_API FMOD_Channel_Get3DAttributes (FMOD_CHANNEL *channel, FMOD_VECTOR *pos, FMOD_VECTOR *vel); -FMOD_RESULT F_API FMOD_Channel_Set3DMinMaxDistance (FMOD_CHANNEL *channel, float mindistance, float maxdistance); -FMOD_RESULT F_API FMOD_Channel_Get3DMinMaxDistance (FMOD_CHANNEL *channel, float *mindistance, float *maxdistance); -FMOD_RESULT F_API FMOD_Channel_Set3DConeSettings (FMOD_CHANNEL *channel, float insideconeangle, float outsideconeangle, float outsidevolume); -FMOD_RESULT F_API FMOD_Channel_Get3DConeSettings (FMOD_CHANNEL *channel, float *insideconeangle, float *outsideconeangle, float *outsidevolume); -FMOD_RESULT F_API FMOD_Channel_Set3DConeOrientation (FMOD_CHANNEL *channel, FMOD_VECTOR *orientation); -FMOD_RESULT F_API FMOD_Channel_Get3DConeOrientation (FMOD_CHANNEL *channel, FMOD_VECTOR *orientation); -FMOD_RESULT F_API FMOD_Channel_Set3DCustomRolloff (FMOD_CHANNEL *channel, FMOD_VECTOR *points, int numpoints); -FMOD_RESULT F_API FMOD_Channel_Get3DCustomRolloff (FMOD_CHANNEL *channel, FMOD_VECTOR **points, int *numpoints); -FMOD_RESULT F_API FMOD_Channel_Set3DOcclusion (FMOD_CHANNEL *channel, float directocclusion, float reverbocclusion); -FMOD_RESULT F_API FMOD_Channel_Get3DOcclusion (FMOD_CHANNEL *channel, float *directocclusion, float *reverbocclusion); -FMOD_RESULT F_API FMOD_Channel_Set3DSpread (FMOD_CHANNEL *channel, float angle); -FMOD_RESULT F_API FMOD_Channel_Get3DSpread (FMOD_CHANNEL *channel, float *angle); -FMOD_RESULT F_API FMOD_Channel_Set3DPanLevel (FMOD_CHANNEL *channel, float level); -FMOD_RESULT F_API FMOD_Channel_Get3DPanLevel (FMOD_CHANNEL *channel, float *level); -FMOD_RESULT F_API FMOD_Channel_Set3DDopplerLevel (FMOD_CHANNEL *channel, float level); -FMOD_RESULT F_API FMOD_Channel_Get3DDopplerLevel (FMOD_CHANNEL *channel, float *level); -FMOD_RESULT F_API FMOD_Channel_Set3DDistanceFilter (FMOD_CHANNEL *channel, FMOD_BOOL custom, float customLevel, float centerFreq); -FMOD_RESULT F_API FMOD_Channel_Get3DDistanceFilter (FMOD_CHANNEL *channel, FMOD_BOOL *custom, float *customLevel, float *centerFreq); - -/* - DSP functionality only for channels playing sounds created with FMOD_SOFTWARE. -*/ - -FMOD_RESULT F_API FMOD_Channel_GetDSPHead (FMOD_CHANNEL *channel, FMOD_DSP **dsp); -FMOD_RESULT F_API FMOD_Channel_AddDSP (FMOD_CHANNEL *channel, FMOD_DSP *dsp, FMOD_DSPCONNECTION **connection); - -/* - Information only functions. -*/ - -FMOD_RESULT F_API FMOD_Channel_IsPlaying (FMOD_CHANNEL *channel, FMOD_BOOL *isplaying); -FMOD_RESULT F_API FMOD_Channel_IsVirtual (FMOD_CHANNEL *channel, FMOD_BOOL *isvirtual); -FMOD_RESULT F_API FMOD_Channel_GetAudibility (FMOD_CHANNEL *channel, float *audibility); -FMOD_RESULT F_API FMOD_Channel_GetCurrentSound (FMOD_CHANNEL *channel, FMOD_SOUND **sound); -FMOD_RESULT F_API FMOD_Channel_GetSpectrum (FMOD_CHANNEL *channel, float *spectrumarray, int numvalues, int channeloffset, FMOD_DSP_FFT_WINDOW windowtype); -FMOD_RESULT F_API FMOD_Channel_GetWaveData (FMOD_CHANNEL *channel, float *wavearray, int numvalues, int channeloffset); -FMOD_RESULT F_API FMOD_Channel_GetIndex (FMOD_CHANNEL *channel, int *index); - -/* - Functions also found in Sound class but here they can be set per channel. -*/ - -FMOD_RESULT F_API FMOD_Channel_SetMode (FMOD_CHANNEL *channel, FMOD_MODE mode); -FMOD_RESULT F_API FMOD_Channel_GetMode (FMOD_CHANNEL *channel, FMOD_MODE *mode); -FMOD_RESULT F_API FMOD_Channel_SetLoopCount (FMOD_CHANNEL *channel, int loopcount); -FMOD_RESULT F_API FMOD_Channel_GetLoopCount (FMOD_CHANNEL *channel, int *loopcount); -FMOD_RESULT F_API FMOD_Channel_SetLoopPoints (FMOD_CHANNEL *channel, unsigned int loopstart, FMOD_TIMEUNIT loopstarttype, unsigned int loopend, FMOD_TIMEUNIT loopendtype); -FMOD_RESULT F_API FMOD_Channel_GetLoopPoints (FMOD_CHANNEL *channel, unsigned int *loopstart, FMOD_TIMEUNIT loopstarttype, unsigned int *loopend, FMOD_TIMEUNIT loopendtype); - -/* - Userdata set/get. -*/ - -FMOD_RESULT F_API FMOD_Channel_SetUserData (FMOD_CHANNEL *channel, void *userdata); -FMOD_RESULT F_API FMOD_Channel_GetUserData (FMOD_CHANNEL *channel, void **userdata); - -FMOD_RESULT F_API FMOD_Channel_GetMemoryInfo (FMOD_CHANNEL *channel, unsigned int memorybits, unsigned int event_memorybits, unsigned int *memoryused, FMOD_MEMORY_USAGE_DETAILS *memoryused_details); - -/* - 'ChannelGroup' API -*/ - -FMOD_RESULT F_API FMOD_ChannelGroup_Release (FMOD_CHANNELGROUP *channelgroup); -FMOD_RESULT F_API FMOD_ChannelGroup_GetSystemObject (FMOD_CHANNELGROUP *channelgroup, FMOD_SYSTEM **system); - -/* - Channelgroup scale values. (changes attributes relative to the channels, doesn't overwrite them) -*/ - -FMOD_RESULT F_API FMOD_ChannelGroup_SetVolume (FMOD_CHANNELGROUP *channelgroup, float volume); -FMOD_RESULT F_API FMOD_ChannelGroup_GetVolume (FMOD_CHANNELGROUP *channelgroup, float *volume); -FMOD_RESULT F_API FMOD_ChannelGroup_SetPitch (FMOD_CHANNELGROUP *channelgroup, float pitch); -FMOD_RESULT F_API FMOD_ChannelGroup_GetPitch (FMOD_CHANNELGROUP *channelgroup, float *pitch); -FMOD_RESULT F_API FMOD_ChannelGroup_Set3DOcclusion (FMOD_CHANNELGROUP *channelgroup, float directocclusion, float reverbocclusion); -FMOD_RESULT F_API FMOD_ChannelGroup_Get3DOcclusion (FMOD_CHANNELGROUP *channelgroup, float *directocclusion, float *reverbocclusion); -FMOD_RESULT F_API FMOD_ChannelGroup_SetPaused (FMOD_CHANNELGROUP *channelgroup, FMOD_BOOL paused); -FMOD_RESULT F_API FMOD_ChannelGroup_GetPaused (FMOD_CHANNELGROUP *channelgroup, FMOD_BOOL *paused); -FMOD_RESULT F_API FMOD_ChannelGroup_SetMute (FMOD_CHANNELGROUP *channelgroup, FMOD_BOOL mute); -FMOD_RESULT F_API FMOD_ChannelGroup_GetMute (FMOD_CHANNELGROUP *channelgroup, FMOD_BOOL *mute); - -/* - Channelgroup override values. (recursively overwrites whatever settings the channels had) -*/ - -FMOD_RESULT F_API FMOD_ChannelGroup_Stop (FMOD_CHANNELGROUP *channelgroup); -FMOD_RESULT F_API FMOD_ChannelGroup_OverrideVolume (FMOD_CHANNELGROUP *channelgroup, float volume); -FMOD_RESULT F_API FMOD_ChannelGroup_OverrideFrequency(FMOD_CHANNELGROUP *channelgroup, float frequency); -FMOD_RESULT F_API FMOD_ChannelGroup_OverridePan (FMOD_CHANNELGROUP *channelgroup, float pan); -FMOD_RESULT F_API FMOD_ChannelGroup_OverrideReverbProperties(FMOD_CHANNELGROUP *channelgroup, const FMOD_REVERB_CHANNELPROPERTIES *prop); -FMOD_RESULT F_API FMOD_ChannelGroup_Override3DAttributes(FMOD_CHANNELGROUP *channelgroup, const FMOD_VECTOR *pos, const FMOD_VECTOR *vel); -FMOD_RESULT F_API FMOD_ChannelGroup_OverrideSpeakerMix(FMOD_CHANNELGROUP *channelgroup, float frontleft, float frontright, float center, float lfe, float backleft, float backright, float sideleft, float sideright); - -/* - Nested channel groups. -*/ - -FMOD_RESULT F_API FMOD_ChannelGroup_AddGroup (FMOD_CHANNELGROUP *channelgroup, FMOD_CHANNELGROUP *group); -FMOD_RESULT F_API FMOD_ChannelGroup_GetNumGroups (FMOD_CHANNELGROUP *channelgroup, int *numgroups); -FMOD_RESULT F_API FMOD_ChannelGroup_GetGroup (FMOD_CHANNELGROUP *channelgroup, int index, FMOD_CHANNELGROUP **group); -FMOD_RESULT F_API FMOD_ChannelGroup_GetParentGroup (FMOD_CHANNELGROUP *channelgroup, FMOD_CHANNELGROUP **group); - -/* - DSP functionality only for channel groups playing sounds created with FMOD_SOFTWARE. -*/ - -FMOD_RESULT F_API FMOD_ChannelGroup_GetDSPHead (FMOD_CHANNELGROUP *channelgroup, FMOD_DSP **dsp); -FMOD_RESULT F_API FMOD_ChannelGroup_AddDSP (FMOD_CHANNELGROUP *channelgroup, FMOD_DSP *dsp, FMOD_DSPCONNECTION **connection); - -/* - Information only functions. -*/ - -FMOD_RESULT F_API FMOD_ChannelGroup_GetName (FMOD_CHANNELGROUP *channelgroup, char *name, int namelen); -FMOD_RESULT F_API FMOD_ChannelGroup_GetNumChannels (FMOD_CHANNELGROUP *channelgroup, int *numchannels); -FMOD_RESULT F_API FMOD_ChannelGroup_GetChannel (FMOD_CHANNELGROUP *channelgroup, int index, FMOD_CHANNEL **channel); -FMOD_RESULT F_API FMOD_ChannelGroup_GetSpectrum (FMOD_CHANNELGROUP *channelgroup, float *spectrumarray, int numvalues, int channeloffset, FMOD_DSP_FFT_WINDOW windowtype); -FMOD_RESULT F_API FMOD_ChannelGroup_GetWaveData (FMOD_CHANNELGROUP *channelgroup, float *wavearray, int numvalues, int channeloffset); - -/* - Userdata set/get. -*/ - -FMOD_RESULT F_API FMOD_ChannelGroup_SetUserData (FMOD_CHANNELGROUP *channelgroup, void *userdata); -FMOD_RESULT F_API FMOD_ChannelGroup_GetUserData (FMOD_CHANNELGROUP *channelgroup, void **userdata); - -FMOD_RESULT F_API FMOD_ChannelGroup_GetMemoryInfo (FMOD_CHANNELGROUP *channelgroup, unsigned int memorybits, unsigned int event_memorybits, unsigned int *memoryused, FMOD_MEMORY_USAGE_DETAILS *memoryused_details); - -/* - 'SoundGroup' API -*/ - -FMOD_RESULT F_API FMOD_SoundGroup_Release (FMOD_SOUNDGROUP *soundgroup); -FMOD_RESULT F_API FMOD_SoundGroup_GetSystemObject (FMOD_SOUNDGROUP *soundgroup, FMOD_SYSTEM **system); - -/* - SoundGroup control functions. -*/ - -FMOD_RESULT F_API FMOD_SoundGroup_SetMaxAudible (FMOD_SOUNDGROUP *soundgroup, int maxaudible); -FMOD_RESULT F_API FMOD_SoundGroup_GetMaxAudible (FMOD_SOUNDGROUP *soundgroup, int *maxaudible); -FMOD_RESULT F_API FMOD_SoundGroup_SetMaxAudibleBehavior(FMOD_SOUNDGROUP *soundgroup, FMOD_SOUNDGROUP_BEHAVIOR behavior); -FMOD_RESULT F_API FMOD_SoundGroup_GetMaxAudibleBehavior(FMOD_SOUNDGROUP *soundgroup, FMOD_SOUNDGROUP_BEHAVIOR *behavior); -FMOD_RESULT F_API FMOD_SoundGroup_SetMuteFadeSpeed (FMOD_SOUNDGROUP *soundgroup, float speed); -FMOD_RESULT F_API FMOD_SoundGroup_GetMuteFadeSpeed (FMOD_SOUNDGROUP *soundgroup, float *speed); -FMOD_RESULT F_API FMOD_SoundGroup_SetVolume (FMOD_SOUNDGROUP *soundgroup, float volume); -FMOD_RESULT F_API FMOD_SoundGroup_GetVolume (FMOD_SOUNDGROUP *soundgroup, float *volume); -FMOD_RESULT F_API FMOD_SoundGroup_Stop (FMOD_SOUNDGROUP *soundgroup); - -/* - Information only functions. -*/ - -FMOD_RESULT F_API FMOD_SoundGroup_GetName (FMOD_SOUNDGROUP *soundgroup, char *name, int namelen); -FMOD_RESULT F_API FMOD_SoundGroup_GetNumSounds (FMOD_SOUNDGROUP *soundgroup, int *numsounds); -FMOD_RESULT F_API FMOD_SoundGroup_GetSound (FMOD_SOUNDGROUP *soundgroup, int index, FMOD_SOUND **sound); -FMOD_RESULT F_API FMOD_SoundGroup_GetNumPlaying (FMOD_SOUNDGROUP *soundgroup, int *numplaying); - -/* - Userdata set/get. -*/ - -FMOD_RESULT F_API FMOD_SoundGroup_SetUserData (FMOD_SOUNDGROUP *soundgroup, void *userdata); -FMOD_RESULT F_API FMOD_SoundGroup_GetUserData (FMOD_SOUNDGROUP *soundgroup, void **userdata); - -FMOD_RESULT F_API FMOD_SoundGroup_GetMemoryInfo (FMOD_SOUNDGROUP *soundgroup, unsigned int memorybits, unsigned int event_memorybits, unsigned int *memoryused, FMOD_MEMORY_USAGE_DETAILS *memoryused_details); - -/* - 'DSP' API -*/ - -FMOD_RESULT F_API FMOD_DSP_Release (FMOD_DSP *dsp); -FMOD_RESULT F_API FMOD_DSP_GetSystemObject (FMOD_DSP *dsp, FMOD_SYSTEM **system); - -/* - Connection / disconnection / input and output enumeration. -*/ - -FMOD_RESULT F_API FMOD_DSP_AddInput (FMOD_DSP *dsp, FMOD_DSP *target, FMOD_DSPCONNECTION **connection); -FMOD_RESULT F_API FMOD_DSP_DisconnectFrom (FMOD_DSP *dsp, FMOD_DSP *target); -FMOD_RESULT F_API FMOD_DSP_DisconnectAll (FMOD_DSP *dsp, FMOD_BOOL inputs, FMOD_BOOL outputs); -FMOD_RESULT F_API FMOD_DSP_Remove (FMOD_DSP *dsp); -FMOD_RESULT F_API FMOD_DSP_GetNumInputs (FMOD_DSP *dsp, int *numinputs); -FMOD_RESULT F_API FMOD_DSP_GetNumOutputs (FMOD_DSP *dsp, int *numoutputs); -FMOD_RESULT F_API FMOD_DSP_GetInput (FMOD_DSP *dsp, int index, FMOD_DSP **input, FMOD_DSPCONNECTION **inputconnection); -FMOD_RESULT F_API FMOD_DSP_GetOutput (FMOD_DSP *dsp, int index, FMOD_DSP **output, FMOD_DSPCONNECTION **outputconnection); - -/* - DSP unit control. -*/ - -FMOD_RESULT F_API FMOD_DSP_SetActive (FMOD_DSP *dsp, FMOD_BOOL active); -FMOD_RESULT F_API FMOD_DSP_GetActive (FMOD_DSP *dsp, FMOD_BOOL *active); -FMOD_RESULT F_API FMOD_DSP_SetBypass (FMOD_DSP *dsp, FMOD_BOOL bypass); -FMOD_RESULT F_API FMOD_DSP_GetBypass (FMOD_DSP *dsp, FMOD_BOOL *bypass); -FMOD_RESULT F_API FMOD_DSP_SetSpeakerActive (FMOD_DSP *dsp, FMOD_SPEAKER speaker, FMOD_BOOL active); -FMOD_RESULT F_API FMOD_DSP_GetSpeakerActive (FMOD_DSP *dsp, FMOD_SPEAKER speaker, FMOD_BOOL *active); -FMOD_RESULT F_API FMOD_DSP_Reset (FMOD_DSP *dsp); - -/* - DSP parameter control. -*/ - -FMOD_RESULT F_API FMOD_DSP_SetParameter (FMOD_DSP *dsp, int index, float value); -FMOD_RESULT F_API FMOD_DSP_GetParameter (FMOD_DSP *dsp, int index, float *value, char *valuestr, int valuestrlen); -FMOD_RESULT F_API FMOD_DSP_GetNumParameters (FMOD_DSP *dsp, int *numparams); -FMOD_RESULT F_API FMOD_DSP_GetParameterInfo (FMOD_DSP *dsp, int index, char *name, char *label, char *description, int descriptionlen, float *min, float *max); -FMOD_RESULT F_API FMOD_DSP_ShowConfigDialog (FMOD_DSP *dsp, void *hwnd, FMOD_BOOL show); - -/* - DSP attributes. -*/ - -FMOD_RESULT F_API FMOD_DSP_GetInfo (FMOD_DSP *dsp, char *name, unsigned int *version, int *channels, int *configwidth, int *configheight); -FMOD_RESULT F_API FMOD_DSP_GetType (FMOD_DSP *dsp, FMOD_DSP_TYPE *type); -FMOD_RESULT F_API FMOD_DSP_SetDefaults (FMOD_DSP *dsp, float frequency, float volume, float pan, int priority); -FMOD_RESULT F_API FMOD_DSP_GetDefaults (FMOD_DSP *dsp, float *frequency, float *volume, float *pan, int *priority); - -/* - Userdata set/get. -*/ - -FMOD_RESULT F_API FMOD_DSP_SetUserData (FMOD_DSP *dsp, void *userdata); -FMOD_RESULT F_API FMOD_DSP_GetUserData (FMOD_DSP *dsp, void **userdata); - -FMOD_RESULT F_API FMOD_DSP_GetMemoryInfo (FMOD_DSP *dsp, unsigned int memorybits, unsigned int event_memorybits, unsigned int *memoryused, FMOD_MEMORY_USAGE_DETAILS *memoryused_details); - -/* - 'DSPConnection' API -*/ - -FMOD_RESULT F_API FMOD_DSPConnection_GetInput (FMOD_DSPCONNECTION *dspconnection, FMOD_DSP **input); -FMOD_RESULT F_API FMOD_DSPConnection_GetOutput (FMOD_DSPCONNECTION *dspconnection, FMOD_DSP **output); -FMOD_RESULT F_API FMOD_DSPConnection_SetMix (FMOD_DSPCONNECTION *dspconnection, float volume); -FMOD_RESULT F_API FMOD_DSPConnection_GetMix (FMOD_DSPCONNECTION *dspconnection, float *volume); -FMOD_RESULT F_API FMOD_DSPConnection_SetLevels (FMOD_DSPCONNECTION *dspconnection, FMOD_SPEAKER speaker, float *levels, int numlevels); -FMOD_RESULT F_API FMOD_DSPConnection_GetLevels (FMOD_DSPCONNECTION *dspconnection, FMOD_SPEAKER speaker, float *levels, int numlevels); - -/* - Userdata set/get. -*/ - -FMOD_RESULT F_API FMOD_DSPConnection_SetUserData (FMOD_DSPCONNECTION *dspconnection, void *userdata); -FMOD_RESULT F_API FMOD_DSPConnection_GetUserData (FMOD_DSPCONNECTION *dspconnection, void **userdata); - -FMOD_RESULT F_API FMOD_DSPConnection_GetMemoryInfo (FMOD_DSPCONNECTION *dspconnection, unsigned int memorybits, unsigned int event_memorybits, unsigned int *memoryused, FMOD_MEMORY_USAGE_DETAILS *memoryused_details); - -/* - 'Geometry' API -*/ - -FMOD_RESULT F_API FMOD_Geometry_Release (FMOD_GEOMETRY *geometry); - -/* - Polygon manipulation. -*/ - -FMOD_RESULT F_API FMOD_Geometry_AddPolygon (FMOD_GEOMETRY *geometry, float directocclusion, float reverbocclusion, FMOD_BOOL doublesided, int numvertices, const FMOD_VECTOR *vertices, int *polygonindex); -FMOD_RESULT F_API FMOD_Geometry_GetNumPolygons (FMOD_GEOMETRY *geometry, int *numpolygons); -FMOD_RESULT F_API FMOD_Geometry_GetMaxPolygons (FMOD_GEOMETRY *geometry, int *maxpolygons, int *maxvertices); -FMOD_RESULT F_API FMOD_Geometry_GetPolygonNumVertices(FMOD_GEOMETRY *geometry, int index, int *numvertices); -FMOD_RESULT F_API FMOD_Geometry_SetPolygonVertex (FMOD_GEOMETRY *geometry, int index, int vertexindex, const FMOD_VECTOR *vertex); -FMOD_RESULT F_API FMOD_Geometry_GetPolygonVertex (FMOD_GEOMETRY *geometry, int index, int vertexindex, FMOD_VECTOR *vertex); -FMOD_RESULT F_API FMOD_Geometry_SetPolygonAttributes (FMOD_GEOMETRY *geometry, int index, float directocclusion, float reverbocclusion, FMOD_BOOL doublesided); -FMOD_RESULT F_API FMOD_Geometry_GetPolygonAttributes (FMOD_GEOMETRY *geometry, int index, float *directocclusion, float *reverbocclusion, FMOD_BOOL *doublesided); - -/* - Object manipulation. -*/ - -FMOD_RESULT F_API FMOD_Geometry_SetActive (FMOD_GEOMETRY *geometry, FMOD_BOOL active); -FMOD_RESULT F_API FMOD_Geometry_GetActive (FMOD_GEOMETRY *geometry, FMOD_BOOL *active); -FMOD_RESULT F_API FMOD_Geometry_SetRotation (FMOD_GEOMETRY *geometry, const FMOD_VECTOR *forward, const FMOD_VECTOR *up); -FMOD_RESULT F_API FMOD_Geometry_GetRotation (FMOD_GEOMETRY *geometry, FMOD_VECTOR *forward, FMOD_VECTOR *up); -FMOD_RESULT F_API FMOD_Geometry_SetPosition (FMOD_GEOMETRY *geometry, const FMOD_VECTOR *position); -FMOD_RESULT F_API FMOD_Geometry_GetPosition (FMOD_GEOMETRY *geometry, FMOD_VECTOR *position); -FMOD_RESULT F_API FMOD_Geometry_SetScale (FMOD_GEOMETRY *geometry, const FMOD_VECTOR *scale); -FMOD_RESULT F_API FMOD_Geometry_GetScale (FMOD_GEOMETRY *geometry, FMOD_VECTOR *scale); -FMOD_RESULT F_API FMOD_Geometry_Save (FMOD_GEOMETRY *geometry, void *data, int *datasize); - -/* - Userdata set/get. -*/ - -FMOD_RESULT F_API FMOD_Geometry_SetUserData (FMOD_GEOMETRY *geometry, void *userdata); -FMOD_RESULT F_API FMOD_Geometry_GetUserData (FMOD_GEOMETRY *geometry, void **userdata); - -FMOD_RESULT F_API FMOD_Geometry_GetMemoryInfo (FMOD_GEOMETRY *geometry, unsigned int memorybits, unsigned int event_memorybits, unsigned int *memoryused, FMOD_MEMORY_USAGE_DETAILS *memoryused_details); - -/* - 'Reverb' API -*/ - -FMOD_RESULT F_API FMOD_Reverb_Release (FMOD_REVERB *reverb); - -/* - Reverb manipulation. -*/ - -FMOD_RESULT F_API FMOD_Reverb_Set3DAttributes (FMOD_REVERB *reverb, const FMOD_VECTOR *position, float mindistance, float maxdistance); -FMOD_RESULT F_API FMOD_Reverb_Get3DAttributes (FMOD_REVERB *reverb, FMOD_VECTOR *position, float *mindistance, float *maxdistance); -FMOD_RESULT F_API FMOD_Reverb_SetProperties (FMOD_REVERB *reverb, const FMOD_REVERB_PROPERTIES *properties); -FMOD_RESULT F_API FMOD_Reverb_GetProperties (FMOD_REVERB *reverb, FMOD_REVERB_PROPERTIES *properties); -FMOD_RESULT F_API FMOD_Reverb_SetActive (FMOD_REVERB *reverb, FMOD_BOOL active); -FMOD_RESULT F_API FMOD_Reverb_GetActive (FMOD_REVERB *reverb, FMOD_BOOL *active); - -/* - Userdata set/get. -*/ - -FMOD_RESULT F_API FMOD_Reverb_SetUserData (FMOD_REVERB *reverb, void *userdata); -FMOD_RESULT F_API FMOD_Reverb_GetUserData (FMOD_REVERB *reverb, void **userdata); - -FMOD_RESULT F_API FMOD_Reverb_GetMemoryInfo (FMOD_REVERB *reverb, unsigned int memorybits, unsigned int event_memorybits, unsigned int *memoryused, FMOD_MEMORY_USAGE_DETAILS *memoryused_details); - -#ifdef __cplusplus -} -#endif - -#endif - diff --git a/libs/fmodex/inc/fmod_codec.h b/libs/fmodex/inc/fmod_codec.h deleted file mode 100644 index 2e13eb69d..000000000 --- a/libs/fmodex/inc/fmod_codec.h +++ /dev/null @@ -1,159 +0,0 @@ -/* ==================================================================================================== */ -/* FMOD Ex - codec development header file. Copyright (c), Firelight Technologies Pty, Ltd. 2004-2011. */ -/* */ -/* Use this header if you are wanting to develop your own file format plugin to use with */ -/* FMOD's codec system. With this header you can make your own fileformat plugin that FMOD */ -/* can register and use. See the documentation and examples on how to make a working plugin. */ -/* */ -/* ==================================================================================================== */ - -#ifndef _FMOD_CODEC_H -#define _FMOD_CODEC_H - -typedef struct FMOD_CODEC_STATE FMOD_CODEC_STATE; -typedef struct FMOD_CODEC_WAVEFORMAT FMOD_CODEC_WAVEFORMAT; - -/* - Codec callbacks -*/ -typedef FMOD_RESULT (F_CALLBACK *FMOD_CODEC_OPENCALLBACK) (FMOD_CODEC_STATE *codec_state, FMOD_MODE usermode, FMOD_CREATESOUNDEXINFO *userexinfo); -typedef FMOD_RESULT (F_CALLBACK *FMOD_CODEC_CLOSECALLBACK) (FMOD_CODEC_STATE *codec_state); -typedef FMOD_RESULT (F_CALLBACK *FMOD_CODEC_READCALLBACK) (FMOD_CODEC_STATE *codec_state, void *buffer, unsigned int sizebytes, unsigned int *bytesread); -typedef FMOD_RESULT (F_CALLBACK *FMOD_CODEC_GETLENGTHCALLBACK) (FMOD_CODEC_STATE *codec_state, unsigned int *length, FMOD_TIMEUNIT lengthtype); -typedef FMOD_RESULT (F_CALLBACK *FMOD_CODEC_SETPOSITIONCALLBACK) (FMOD_CODEC_STATE *codec_state, int subsound, unsigned int position, FMOD_TIMEUNIT postype); -typedef FMOD_RESULT (F_CALLBACK *FMOD_CODEC_GETPOSITIONCALLBACK) (FMOD_CODEC_STATE *codec_state, unsigned int *position, FMOD_TIMEUNIT postype); -typedef FMOD_RESULT (F_CALLBACK *FMOD_CODEC_SOUNDCREATECALLBACK) (FMOD_CODEC_STATE *codec_state, int subsound, FMOD_SOUND *sound); -typedef FMOD_RESULT (F_CALLBACK *FMOD_CODEC_METADATACALLBACK) (FMOD_CODEC_STATE *codec_state, FMOD_TAGTYPE tagtype, char *name, void *data, unsigned int datalen, FMOD_TAGDATATYPE datatype, int unique); -typedef FMOD_RESULT (F_CALLBACK *FMOD_CODEC_GETWAVEFORMAT) (FMOD_CODEC_STATE *codec_state, int index, FMOD_CODEC_WAVEFORMAT *waveformat); - - -/* -[STRUCTURE] -[ - [DESCRIPTION] - When creating a codec, declare one of these and provide the relevant callbacks and name for FMOD to use when it opens and reads a file. - - [REMARKS] - Members marked with [in] mean the variable can be written to. The user can set the value. - Members marked with [out] mean the variable is modified by FMOD and is for reading purposes only. Do not change this value. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - FMOD_CODEC_STATE -] -*/ -typedef struct FMOD_CODEC_DESCRIPTION -{ - const char *name; /* [in] Name of the codec. */ - unsigned int version; /* [in] Plugin writer's version number. */ - int defaultasstream; /* [in] Tells FMOD to open the file as a stream when calling System::createSound, and not a static sample. Should normally be 0 (FALSE), because generally the user wants to decode the file into memory when using System::createSound. Mainly used for formats that decode for a very long time, or could use large amounts of memory when decoded. Usually sequenced formats such as mod/s3m/xm/it/midi fall into this category. It is mainly to stop users that don't know what they're doing from getting FMOD_ERR_MEMORY returned from createSound when they should have in fact called System::createStream or used FMOD_CREATESTREAM in System::createSound. */ - FMOD_TIMEUNIT timeunits; /* [in] When setposition codec is called, only these time formats will be passed to the codec. Use bitwise OR to accumulate different types. */ - FMOD_CODEC_OPENCALLBACK open; /* [in] Open callback for the codec for when FMOD tries to open a sound using this codec. */ - FMOD_CODEC_CLOSECALLBACK close; /* [in] Close callback for the codec for when FMOD tries to close a sound using this codec. */ - FMOD_CODEC_READCALLBACK read; /* [in] Read callback for the codec for when FMOD tries to read some data from the file to the destination format (specified in the open callback). */ - FMOD_CODEC_GETLENGTHCALLBACK getlength; /* [in] Callback to return the length of the song in whatever format required when Sound::getLength is called. */ - FMOD_CODEC_SETPOSITIONCALLBACK setposition; /* [in] Seek callback for the codec for when FMOD tries to seek within the file with Channel::setPosition. */ - FMOD_CODEC_GETPOSITIONCALLBACK getposition; /* [in] Tell callback for the codec for when FMOD tries to get the current position within the with Channel::getPosition. */ - FMOD_CODEC_SOUNDCREATECALLBACK soundcreate; /* [in] Sound creation callback for the codec when FMOD finishes creating the sound. (So the codec can set more parameters for the related created sound, ie loop points/mode or 3D attributes etc). */ - FMOD_CODEC_GETWAVEFORMAT getwaveformat; /* [in] Callback to tell FMOD about the waveformat of a particular subsound. This is to save memory, rather than saving 1000 FMOD_CODEC_WAVEFORMAT structures in the codec, the codec might have a more optimal way of storing this information. */ -} FMOD_CODEC_DESCRIPTION; - - -/* -[STRUCTURE] -[ - [DESCRIPTION] - Set these values marked 'in' to tell fmod what sort of sound to create. - The format, channels and frequency tell FMOD what sort of hardware buffer to create when you initialize your code. So if you wrote an MP3 codec that decoded to stereo 16bit integer PCM, you would specify FMOD_SOUND_FORMAT_PCM16, and channels would be equal to 2. - Members marked as 'out' are set by fmod. Do not modify these. Simply specify 0 for these values when declaring the structure, FMOD will fill in the values for you after creation with the correct function pointers. - - [REMARKS] - Members marked with [in] mean the variable can be written to. The user can set the value. - Members marked with [out] mean the variable is modified by FMOD and is for reading purposes only. Do not change this value. - - An FMOD file might be from disk, memory or network, however the file may be opened by the user. - - 'numsubsounds' should be 0 if the file is a normal single sound stream or sound. Examples of this would be .WAV, .WMA, .MP3, .AIFF. - 'numsubsounds' should be 1+ if the file is a container format, and does not contain wav data itself. Examples of these types would be CDDA (multiple CD tracks), FSB (contains multiple sounds), MIDI/MOD/S3M/XM/IT (contain instruments). - The arrays of format, channel, frequency, length and blockalign should point to arrays of information based on how many subsounds are in the format. If the number of subsounds is 0 then it should point to 1 of each attribute, the same as if the number of subsounds was 1. If subsounds was 100 for example, each pointer should point to an array of 100 of each attribute. - When a sound has 1 or more subsounds, you must play the individual sounds specified by first obtaining the subsound with Sound::getSubSound. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - FMOD_SOUND_FORMAT - FMOD_FILE_READCALLBACK - FMOD_FILE_SEEKCALLBACK - FMOD_CODEC_METADATACALLBACK - Sound::getSubSound - Sound::getNumSubSounds -] -*/ -struct FMOD_CODEC_WAVEFORMAT -{ - char name[256]; /* [in] Name of sound.*/ - FMOD_SOUND_FORMAT format; /* [in] Format for (decompressed) codec output, ie FMOD_SOUND_FORMAT_PCM8, FMOD_SOUND_FORMAT_PCM16.*/ - int channels; /* [in] Number of channels used by codec, ie mono = 1, stereo = 2. */ - int frequency; /* [in] Default frequency in hz of the codec, ie 44100. */ - unsigned int lengthbytes; /* [in] Length in bytes of the source data. */ - unsigned int lengthpcm; /* [in] Length in decompressed, PCM samples of the file, ie length in seconds * frequency. Used for Sound::getLength and for memory allocation of static decompressed sample data. */ - int blockalign; /* [in] Blockalign in decompressed, PCM samples of the optimal decode chunk size for this format. The codec read callback will be called in multiples of this value. */ - int loopstart; /* [in] Loopstart in decompressed, PCM samples of file. */ - int loopend; /* [in] Loopend in decompressed, PCM samples of file. */ - FMOD_MODE mode; /* [in] Mode to determine whether the sound should by default load as looping, non looping, 2d or 3d. */ - unsigned int channelmask; /* [in] Microsoft speaker channel mask, as defined for WAVEFORMATEXTENSIBLE and is found in ksmedia.h. Leave at 0 to play in natural speaker order. */ -}; - - -/* -[STRUCTURE] -[ - [DESCRIPTION] - Codec plugin structure that is passed into each callback. - - Set these numsubsounds and waveformat members when called in FMOD_CODEC_OPENCALLBACK to tell fmod what sort of sound to create. - - The format, channels and frequency tell FMOD what sort of hardware buffer to create when you initialize your code. So if you wrote an MP3 codec that decoded to stereo 16bit integer PCM, you would specify FMOD_SOUND_FORMAT_PCM16, and channels would be equal to 2. - - [REMARKS] - Members marked with [in] mean the variable can be written to. The user can set the value. - Members marked with [out] mean the variable is modified by FMOD and is for reading purposes only. Do not change this value. - - An FMOD file might be from disk, memory or internet, however the file may be opened by the user. - - 'numsubsounds' should be 0 if the file is a normal single sound stream or sound. Examples of this would be .WAV, .WMA, .MP3, .AIFF. - 'numsubsounds' should be 1+ if the file is a container format, and does not contain wav data itself. Examples of these types would be CDDA (multiple CD tracks), FSB (contains multiple sounds), DLS (contain instruments). - The arrays of format, channel, frequency, length and blockalign should point to arrays of information based on how many subsounds are in the format. If the number of subsounds is 0 then it should point to 1 of each attribute, the same as if the number of subsounds was 1. If subsounds was 100 for example, each pointer should point to an array of 100 of each attribute. - When a sound has 1 or more subsounds, you must play the individual sounds specified by first obtaining the subsound with Sound::getSubSound. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - FMOD_SOUND_FORMAT - FMOD_FILE_READCALLBACK - FMOD_FILE_SEEKCALLBACK - FMOD_CODEC_METADATACALLBACK - Sound::getSubSound - Sound::getNumSubSounds -] -*/ -struct FMOD_CODEC_STATE -{ - int numsubsounds; /* [in] Number of 'subsounds' in this sound. Anything other than 0 makes it a 'container' format (ie CDDA/DLS/FSB etc which contain 1 or more su bsounds). For most normal, single sound codec such as WAV/AIFF/MP3, this should be 0 as they are not a container for subsounds, they are the sound by itself. */ - FMOD_CODEC_WAVEFORMAT *waveformat; /* [in] Pointer to an array of format structures containing information about each sample. Can be 0 or NULL if FMOD_CODEC_GETWAVEFORMAT callback is preferred. The number of entries here must equal the number of subsounds defined in the subsound parameter. If numsubsounds = 0 then there should be 1 instance of this structure. */ - void *plugindata; /* [in] Plugin writer created data the codec author wants to attach to this object. */ - - void *filehandle; /* [out] This will return an internal FMOD file handle to use with the callbacks provided. */ - unsigned int filesize; /* [out] This will contain the size of the file in bytes. */ - FMOD_FILE_READCALLBACK fileread; /* [out] This will return a callable FMOD file function to use from codec. */ - FMOD_FILE_SEEKCALLBACK fileseek; /* [out] This will return a callable FMOD file function to use from codec. */ - FMOD_CODEC_METADATACALLBACK metadata; /* [out] This will return a callable FMOD metadata function to use from codec. */ -}; - -#endif - - diff --git a/libs/fmodex/inc/fmod_dsp.h b/libs/fmodex/inc/fmod_dsp.h deleted file mode 100644 index 1c5e2a62b..000000000 --- a/libs/fmodex/inc/fmod_dsp.h +++ /dev/null @@ -1,743 +0,0 @@ -/* ========================================================================================== */ -/* FMOD Ex - DSP header file. Copyright (c), Firelight Technologies Pty, Ltd. 2004-2011. */ -/* */ -/* Use this header if you are interested in delving deeper into the FMOD software mixing / */ -/* DSP engine. In this header you can find parameter structures for FMOD system reigstered */ -/* DSP effects and generators. */ -/* Also use this header if you are wanting to develop your own DSP plugin to use with FMOD's */ -/* dsp system. With this header you can make your own DSP plugin that FMOD can */ -/* register and use. See the documentation and examples on how to make a working plugin. */ -/* */ -/* ========================================================================================== */ - -#ifndef _FMOD_DSP_H -#define _FMOD_DSP_H - -typedef struct FMOD_DSP_STATE FMOD_DSP_STATE; - -/* - DSP callbacks -*/ -typedef FMOD_RESULT (F_CALLBACK *FMOD_DSP_CREATECALLBACK) (FMOD_DSP_STATE *dsp_state); -typedef FMOD_RESULT (F_CALLBACK *FMOD_DSP_RELEASECALLBACK) (FMOD_DSP_STATE *dsp_state); -typedef FMOD_RESULT (F_CALLBACK *FMOD_DSP_RESETCALLBACK) (FMOD_DSP_STATE *dsp_state); -typedef FMOD_RESULT (F_CALLBACK *FMOD_DSP_READCALLBACK) (FMOD_DSP_STATE *dsp_state, float *inbuffer, float *outbuffer, unsigned int length, int inchannels, int outchannels); -typedef FMOD_RESULT (F_CALLBACK *FMOD_DSP_SETPOSITIONCALLBACK)(FMOD_DSP_STATE *dsp_state, unsigned int pos); -typedef FMOD_RESULT (F_CALLBACK *FMOD_DSP_SETPARAMCALLBACK) (FMOD_DSP_STATE *dsp_state, int index, float value); -typedef FMOD_RESULT (F_CALLBACK *FMOD_DSP_GETPARAMCALLBACK) (FMOD_DSP_STATE *dsp_state, int index, float *value, char *valuestr); -typedef FMOD_RESULT (F_CALLBACK *FMOD_DSP_DIALOGCALLBACK) (FMOD_DSP_STATE *dsp_state, void *hwnd, int show); - -/* -[ENUM] -[ - [DESCRIPTION] - These definitions can be used for creating FMOD defined special effects or DSP units. - - [REMARKS] - To get them to be active, first create the unit, then add it somewhere into the DSP network, either at the front of the network near the soundcard unit to affect the global output (by using System::getDSPHead), or on a single channel (using Channel::getDSPHead). - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - System::createDSPByType -] -*/ -typedef enum -{ - FMOD_DSP_TYPE_UNKNOWN, /* This unit was created via a non FMOD plugin so has an unknown purpose. */ - FMOD_DSP_TYPE_MIXER, /* This unit does nothing but take inputs and mix them together then feed the result to the soundcard unit. */ - FMOD_DSP_TYPE_OSCILLATOR, /* This unit generates sine/square/saw/triangle or noise tones. */ - FMOD_DSP_TYPE_LOWPASS, /* This unit filters sound using a high quality, resonant lowpass filter algorithm but consumes more CPU time. */ - FMOD_DSP_TYPE_ITLOWPASS, /* This unit filters sound using a resonant lowpass filter algorithm that is used in Impulse Tracker, but with limited cutoff range (0 to 8060hz). */ - FMOD_DSP_TYPE_HIGHPASS, /* This unit filters sound using a resonant highpass filter algorithm. */ - FMOD_DSP_TYPE_ECHO, /* This unit produces an echo on the sound and fades out at the desired rate. */ - FMOD_DSP_TYPE_FLANGE, /* This unit produces a flange effect on the sound. */ - FMOD_DSP_TYPE_DISTORTION, /* This unit distorts the sound. */ - FMOD_DSP_TYPE_NORMALIZE, /* This unit normalizes or amplifies the sound to a certain level. */ - FMOD_DSP_TYPE_PARAMEQ, /* This unit attenuates or amplifies a selected frequency range. */ - FMOD_DSP_TYPE_PITCHSHIFT, /* This unit bends the pitch of a sound without changing the speed of playback. */ - FMOD_DSP_TYPE_CHORUS, /* This unit produces a chorus effect on the sound. */ - FMOD_DSP_TYPE_VSTPLUGIN, /* This unit allows the use of Steinberg VST plugins */ - FMOD_DSP_TYPE_WINAMPPLUGIN, /* This unit allows the use of Nullsoft Winamp plugins */ - FMOD_DSP_TYPE_ITECHO, /* This unit produces an echo on the sound and fades out at the desired rate as is used in Impulse Tracker. */ - FMOD_DSP_TYPE_COMPRESSOR, /* This unit implements dynamic compression (linked multichannel, wideband) */ - FMOD_DSP_TYPE_SFXREVERB, /* This unit implements SFX reverb */ - FMOD_DSP_TYPE_LOWPASS_SIMPLE, /* This unit filters sound using a simple lowpass with no resonance, but has flexible cutoff and is fast. */ - FMOD_DSP_TYPE_DELAY, /* This unit produces different delays on individual channels of the sound. */ - FMOD_DSP_TYPE_TREMOLO, /* This unit produces a tremolo / chopper effect on the sound. */ - FMOD_DSP_TYPE_LADSPAPLUGIN, /* This unit allows the use of LADSPA standard plugins. */ - FMOD_DSP_TYPE_HIGHPASS_SIMPLE, /* This unit filters sound using a simple highpass with no resonance, but has flexible cutoff and is fast. */ - FMOD_DSP_TYPE_HARDWARE = 1000, /* Offset that platform specific FMOD_HARDWARE DSPs will start at. */ - FMOD_DSP_TYPE_FORCEINT = 65536 /* Makes sure this enum is signed 32bit. */ -} FMOD_DSP_TYPE; - - -/* -[STRUCTURE] -[ - [DESCRIPTION] - Structure to define a parameter for a DSP unit. - - [REMARKS] - Members marked with [r] mean the variable is modified by FMOD and is for reading purposes only. Do not change this value. - Members marked with [w] mean the variable can be written to. The user can set the value. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - System::createDSP - DSP::setParameter -] -*/ -typedef struct FMOD_DSP_PARAMETERDESC -{ - float min; /* [w] Minimum value of the parameter (ie 100.0). */ - float max; /* [w] Maximum value of the parameter (ie 22050.0). */ - float defaultval; /* [w] Default value of parameter. */ - char name[16]; /* [w] Name of the parameter to be displayed (ie "Cutoff frequency"). */ - char label[16]; /* [w] Short string to be put next to value to denote the unit type (ie "hz"). */ - const char *description; /* [w] Description of the parameter to be displayed as a help item / tooltip for this parameter. */ -} FMOD_DSP_PARAMETERDESC; - - -/* -[STRUCTURE] -[ - [DESCRIPTION] - When creating a DSP unit, declare one of these and provide the relevant callbacks and name for FMOD to use when it creates and uses a DSP unit of this type. - - [REMARKS] - Members marked with [r] mean the variable is modified by FMOD and is for reading purposes only. Do not change this value. - Members marked with [w] mean the variable can be written to. The user can set the value. - - There are 2 different ways to change a parameter in this architecture. - One is to use DSP::setParameter / DSP::getParameter. This is platform independant and is dynamic, so new unknown plugins can have their parameters enumerated and used. - The other is to use DSP::showConfigDialog. This is platform specific and requires a GUI, and will display a dialog box to configure the plugin. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - System::createDSP - FMOD_DSP_STATE -] -*/ -typedef struct FMOD_DSP_DESCRIPTION -{ - char name[32]; /* [w] Name of the unit to be displayed in the network. */ - unsigned int version; /* [w] Plugin writer's version number. */ - int channels; /* [w] Number of channels. Use 0 to process whatever number of channels is currently in the network. >0 would be mostly used if the unit is a unit that only generates sound. */ - FMOD_DSP_CREATECALLBACK create; /* [w] Create callback. This is called when DSP unit is created. Can be null. */ - FMOD_DSP_RELEASECALLBACK release; /* [w] Release callback. This is called just before the unit is freed so the user can do any cleanup needed for the unit. Can be null. */ - FMOD_DSP_RESETCALLBACK reset; /* [w] Reset callback. This is called by the user to reset any history buffers that may need resetting for a filter, when it is to be used or re-used for the first time to its initial clean state. Use to avoid clicks or artifacts. */ - FMOD_DSP_READCALLBACK read; /* [w] Read callback. Processing is done here. Can be null. */ - FMOD_DSP_SETPOSITIONCALLBACK setposition; /* [w] Set position callback. This is called if the unit wants to update its position info but not process data, or reset a cursor position internally if it is reading data from a certain source. Can be null. */ - - int numparameters; /* [w] Number of parameters used in this filter. The user finds this with DSP::getNumParameters */ - FMOD_DSP_PARAMETERDESC *paramdesc; /* [w] Variable number of parameter structures. */ - FMOD_DSP_SETPARAMCALLBACK setparameter; /* [w] This is called when the user calls DSP::setParameter. Can be null. */ - FMOD_DSP_GETPARAMCALLBACK getparameter; /* [w] This is called when the user calls DSP::getParameter. Can be null. */ - FMOD_DSP_DIALOGCALLBACK config; /* [w] This is called when the user calls DSP::showConfigDialog. Can be used to display a dialog to configure the filter. Can be null. */ - int configwidth; /* [w] Width of config dialog graphic if there is one. 0 otherwise.*/ - int configheight; /* [w] Height of config dialog graphic if there is one. 0 otherwise.*/ - void *userdata; /* [w] Optional. Specify 0 to ignore. This is user data to be attached to the DSP unit during creation. Access via DSP::getUserData. */ -} FMOD_DSP_DESCRIPTION; - - -/* -[STRUCTURE] -[ - [DESCRIPTION] - DSP plugin structure that is passed into each callback. - - [REMARKS] - Members marked with [r] mean the variable is modified by FMOD and is for reading purposes only. Do not change this value. - Members marked with [w] mean the variable can be written to. The user can set the value. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - FMOD_DSP_DESCRIPTION -] -*/ -struct FMOD_DSP_STATE -{ - FMOD_DSP *instance; /* [r] Handle to the DSP hand the user created. Not to be modified. C++ users cast to FMOD::DSP to use. */ - void *plugindata; /* [w] Plugin writer created data the output author wants to attach to this object. */ - unsigned short speakermask; /* [w] Specifies which speakers the DSP effect is active on */ -}; - - -/* - =================================================================================================== - - FMOD built in effect parameters. - Use DSP::setParameter with these enums for the 'index' parameter. - - =================================================================================================== -*/ - -/* -[ENUM] -[ - [DESCRIPTION] - Parameter types for the FMOD_DSP_TYPE_OSCILLATOR filter. - - [REMARKS] - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - DSP::setParameter - DSP::getParameter - FMOD_DSP_TYPE -] -*/ -typedef enum -{ - FMOD_DSP_OSCILLATOR_TYPE, /* Waveform type. 0 = sine. 1 = square. 2 = sawup. 3 = sawdown. 4 = triangle. 5 = noise. */ - FMOD_DSP_OSCILLATOR_RATE /* Frequency of the sinewave in hz. 1.0 to 22000.0. Default = 220.0. */ -} FMOD_DSP_OSCILLATOR; - - -/* -[ENUM] -[ - [DESCRIPTION] - Parameter types for the FMOD_DSP_TYPE_LOWPASS filter. - - [REMARKS] - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - DSP::setParameter - DSP::getParameter - FMOD_DSP_TYPE -] -*/ -typedef enum -{ - FMOD_DSP_LOWPASS_CUTOFF, /* Lowpass cutoff frequency in hz. 10.0 to 22000.0. Default = 5000.0. */ - FMOD_DSP_LOWPASS_RESONANCE /* Lowpass resonance Q value. 1.0 to 10.0. Default = 1.0. */ -} FMOD_DSP_LOWPASS; - - -/* -[ENUM] -[ - [DESCRIPTION] - Parameter types for the FMOD_DSP_TYPE_ITLOWPASS filter. - This is different to the default FMOD_DSP_TYPE_ITLOWPASS filter in that it uses a different quality algorithm and is - the filter used to produce the correct sounding playback in .IT files. - FMOD Ex's .IT playback uses this filter. - - [REMARKS] - Note! This filter actually has a limited cutoff frequency below the specified maximum, due to its limited design, - so for a more open range filter use FMOD_DSP_LOWPASS or if you don't mind not having resonance, - FMOD_DSP_LOWPASS_SIMPLE. - The effective maximum cutoff is about 8060hz. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - DSP::setParameter - DSP::getParameter - FMOD_DSP_TYPE -] -*/ -typedef enum -{ - FMOD_DSP_ITLOWPASS_CUTOFF, /* Lowpass cutoff frequency in hz. 1.0 to 22000.0. Default = 5000.0/ */ - FMOD_DSP_ITLOWPASS_RESONANCE /* Lowpass resonance Q value. 0.0 to 127.0. Default = 1.0. */ -} FMOD_DSP_ITLOWPASS; - - -/* -[ENUM] -[ - [DESCRIPTION] - Parameter types for the FMOD_DSP_TYPE_HIGHPASS filter. - - [REMARKS] - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - DSP::setParameter - DSP::getParameter - FMOD_DSP_TYPE -] -*/ -typedef enum -{ - FMOD_DSP_HIGHPASS_CUTOFF, /* Highpass cutoff frequency in hz. 1.0 to output 22000.0. Default = 5000.0. */ - FMOD_DSP_HIGHPASS_RESONANCE /* Highpass resonance Q value. 1.0 to 10.0. Default = 1.0. */ -} FMOD_DSP_HIGHPASS; - - -/* -[ENUM] -[ - [DESCRIPTION] - Parameter types for the FMOD_DSP_TYPE_ECHO filter. - - [REMARKS] - Note. Every time the delay is changed, the plugin re-allocates the echo buffer. This means the echo will dissapear at that time while it refills its new buffer. - Larger echo delays result in larger amounts of memory allocated. - - 'maxchannels' also dictates the amount of memory allocated. By default, the maxchannels value is 0. If FMOD is set to stereo, the echo unit will allocate enough memory for 2 channels. If it is 5.1, it will allocate enough memory for a 6 channel echo, etc. - If the echo effect is only ever applied to the global mix (ie it was added with System::addDSP), then 0 is the value to set as it will be enough to handle all speaker modes. - When the echo is added to a channel (ie Channel::addDSP) then the channel count that comes in could be anything from 1 to 8 possibly. It is only in this case where you might want to increase the channel count above the output's channel count. - If a channel echo is set to a lower number than the sound's channel count that is coming in, it will not echo the sound. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - DSP::setParameter - DSP::getParameter - FMOD_DSP_TYPE -] -*/ -typedef enum -{ - FMOD_DSP_ECHO_DELAY, /* Echo delay in ms. 10 to 5000. Default = 500. */ - FMOD_DSP_ECHO_DECAYRATIO, /* Echo decay per delay. 0 to 1. 1.0 = No decay, 0.0 = total decay (ie simple 1 line delay). Default = 0.5. */ - FMOD_DSP_ECHO_MAXCHANNELS, /* Maximum channels supported. 0 to 16. 0 = same as fmod's default output polyphony, 1 = mono, 2 = stereo etc. See remarks for more. Default = 0. It is suggested to leave at 0! */ - FMOD_DSP_ECHO_DRYMIX, /* Volume of original signal to pass to output. 0.0 to 1.0. Default = 1.0. */ - FMOD_DSP_ECHO_WETMIX /* Volume of echo signal to pass to output. 0.0 to 1.0. Default = 1.0. */ -} FMOD_DSP_ECHO; - - -/* -[ENUM] -[ - [DESCRIPTION] - Parameter types for the FMOD_DSP_TYPE_DELAY filter. - - [REMARKS] - Note. Every time MaxDelay is changed, the plugin re-allocates the delay buffer. This means the delay will dissapear at that time while it refills its new buffer. - A larger MaxDelay results in larger amounts of memory allocated. - Channel delays above MaxDelay will be clipped to MaxDelay and the delay buffer will not be resized. - - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - DSP::setParameter - DSP::getParameter - FMOD_DSP_TYPE -] -*/ -typedef enum -{ - FMOD_DSP_DELAY_CH0, /* Channel #0 Delay in ms. 0 to 10000. Default = 0. */ - FMOD_DSP_DELAY_CH1, /* Channel #1 Delay in ms. 0 to 10000. Default = 0. */ - FMOD_DSP_DELAY_CH2, /* Channel #2 Delay in ms. 0 to 10000. Default = 0. */ - FMOD_DSP_DELAY_CH3, /* Channel #3 Delay in ms. 0 to 10000. Default = 0. */ - FMOD_DSP_DELAY_CH4, /* Channel #4 Delay in ms. 0 to 10000. Default = 0. */ - FMOD_DSP_DELAY_CH5, /* Channel #5 Delay in ms. 0 to 10000. Default = 0. */ - FMOD_DSP_DELAY_CH6, /* Channel #6 Delay in ms. 0 to 10000. Default = 0. */ - FMOD_DSP_DELAY_CH7, /* Channel #7 Delay in ms. 0 to 10000. Default = 0. */ - FMOD_DSP_DELAY_CH8, /* Channel #8 Delay in ms. 0 to 10000. Default = 0. */ - FMOD_DSP_DELAY_CH9, /* Channel #9 Delay in ms. 0 to 10000. Default = 0. */ - FMOD_DSP_DELAY_CH10, /* Channel #10 Delay in ms. 0 to 10000. Default = 0. */ - FMOD_DSP_DELAY_CH11, /* Channel #11 Delay in ms. 0 to 10000. Default = 0. */ - FMOD_DSP_DELAY_CH12, /* Channel #12 Delay in ms. 0 to 10000. Default = 0. */ - FMOD_DSP_DELAY_CH13, /* Channel #13 Delay in ms. 0 to 10000. Default = 0. */ - FMOD_DSP_DELAY_CH14, /* Channel #14 Delay in ms. 0 to 10000. Default = 0. */ - FMOD_DSP_DELAY_CH15, /* Channel #15 Delay in ms. 0 to 10000. Default = 0. */ - FMOD_DSP_DELAY_MAXDELAY /* Maximum delay in ms. 0 to 10000. Default = 10. */ -} FMOD_DSP_DELAY; - - -/* -[ENUM] -[ - [DESCRIPTION] - Parameter types for the FMOD_DSP_TYPE_FLANGE filter. - - [REMARKS] - Flange is an effect where the signal is played twice at the same time, and one copy slides back and forth creating a whooshing or flanging effect. - As there are 2 copies of the same signal, by default each signal is given 50% mix, so that the total is not louder than the original unaffected signal. - - Flange depth is a percentage of a 10ms shift from the original signal. Anything above 10ms is not considered flange because to the ear it begins to 'echo' so 10ms is the highest value possible. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - DSP::setParameter - DSP::getParameter - FMOD_DSP_TYPE -] -*/ -typedef enum -{ - FMOD_DSP_FLANGE_DRYMIX, /* Volume of original signal to pass to output. 0.0 to 1.0. Default = 0.45. */ - FMOD_DSP_FLANGE_WETMIX, /* Volume of flange signal to pass to output. 0.0 to 1.0. Default = 0.55. */ - FMOD_DSP_FLANGE_DEPTH, /* Flange depth (percentage of 40ms delay). 0.01 to 1.0. Default = 1.0. */ - FMOD_DSP_FLANGE_RATE /* Flange speed in hz. 0.0 to 20.0. Default = 0.1. */ -} FMOD_DSP_FLANGE; - - -/* -[ENUM] -[ - [DESCRIPTION] - Parameter types for the FMOD_DSP_TYPE_TREMOLO filter. - - [REMARKS] - The tremolo effect varies the amplitude of a sound. Depending on the settings, this unit can produce a tremolo, chopper or auto-pan effect. - - The shape of the LFO (low freq. oscillator) can morphed between sine, triangle and sawtooth waves using the FMOD_DSP_TREMOLO_SHAPE and FMOD_DSP_TREMOLO_SKEW parameters. - FMOD_DSP_TREMOLO_DUTY and FMOD_DSP_TREMOLO_SQUARE are useful for a chopper-type effect where the first controls the on-time duration and second controls the flatness of the envelope. - FMOD_DSP_TREMOLO_SPREAD varies the LFO phase between channels to get an auto-pan effect. This works best with a sine shape LFO. - The LFO can be synchronized using the FMOD_DSP_TREMOLO_PHASE parameter which sets its instantaneous phase. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - DSP::setParameter - DSP::getParameter - FMOD_DSP_TYPE -] -*/ -typedef enum -{ - FMOD_DSP_TREMOLO_FREQUENCY, /* LFO frequency in Hz. 0.1 to 20. Default = 4. */ - FMOD_DSP_TREMOLO_DEPTH, /* Tremolo depth. 0 to 1. Default = 0. */ - FMOD_DSP_TREMOLO_SHAPE, /* LFO shape morph between triangle and sine. 0 to 1. Default = 0. */ - FMOD_DSP_TREMOLO_SKEW, /* Time-skewing of LFO cycle. -1 to 1. Default = 0. */ - FMOD_DSP_TREMOLO_DUTY, /* LFO on-time. 0 to 1. Default = 0.5. */ - FMOD_DSP_TREMOLO_SQUARE, /* Flatness of the LFO shape. 0 to 1. Default = 0. */ - FMOD_DSP_TREMOLO_PHASE, /* Instantaneous LFO phase. 0 to 1. Default = 0. */ - FMOD_DSP_TREMOLO_SPREAD /* Rotation / auto-pan effect. -1 to 1. Default = 0. */ -} FMOD_DSP_TREMOLO; - - -/* -[ENUM] -[ - [DESCRIPTION] - Parameter types for the FMOD_DSP_TYPE_DISTORTION filter. - - [REMARKS] - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - DSP::setParameter - DSP::getParameter - FMOD_DSP_TYPE -] -*/ -typedef enum -{ - FMOD_DSP_DISTORTION_LEVEL /* Distortion value. 0.0 to 1.0. Default = 0.5. */ -} FMOD_DSP_DISTORTION; - - -/* -[ENUM] -[ - [DESCRIPTION] - Parameter types for the FMOD_DSP_TYPE_NORMALIZE filter. - - [REMARKS] - Normalize amplifies the sound based on the maximum peaks within the signal. - For example if the maximum peaks in the signal were 50% of the bandwidth, it would scale the whole sound by 2. - The lower threshold value makes the normalizer ignores peaks below a certain point, to avoid over-amplification if a loud signal suddenly came in, and also to avoid amplifying to maximum things like background hiss. - - Because FMOD is a realtime audio processor, it doesn't have the luxury of knowing the peak for the whole sound (ie it can't see into the future), so it has to process data as it comes in. - To avoid very sudden changes in volume level based on small samples of new data, fmod fades towards the desired amplification which makes for smooth gain control. The fadetime parameter can control this. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - DSP::setParameter - DSP::getParameter - FMOD_DSP_TYPE -] -*/ -typedef enum -{ - FMOD_DSP_NORMALIZE_FADETIME, /* Time to ramp the silence to full in ms. 0.0 to 20000.0. Default = 5000.0. */ - FMOD_DSP_NORMALIZE_THRESHHOLD, /* Lower volume range threshold to ignore. 0.0 to 1.0. Default = 0.1. Raise higher to stop amplification of very quiet signals. */ - FMOD_DSP_NORMALIZE_MAXAMP /* Maximum amplification allowed. 1.0 to 100000.0. Default = 20.0. 1.0 = no amplifaction, higher values allow more boost. */ -} FMOD_DSP_NORMALIZE; - - -/* -[ENUM] -[ - [DESCRIPTION] - Parameter types for the FMOD_DSP_TYPE_PARAMEQ filter. - - [REMARKS] - Parametric EQ is a bandpass filter that attenuates or amplifies a selected frequency and its neighbouring frequencies. - - To create a multi-band EQ create multiple FMOD_DSP_TYPE_PARAMEQ units and set each unit to different frequencies, for example 1000hz, 2000hz, 4000hz, 8000hz, 16000hz with a range of 1 octave each. - - When a frequency has its gain set to 1.0, the sound will be unaffected and represents the original signal exactly. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - DSP::setParameter - DSP::getParameter - FMOD_DSP_TYPE -] -*/ -typedef enum -{ - FMOD_DSP_PARAMEQ_CENTER, /* Frequency center. 20.0 to 22000.0. Default = 8000.0. */ - FMOD_DSP_PARAMEQ_BANDWIDTH, /* Octave range around the center frequency to filter. 0.2 to 5.0. Default = 1.0. */ - FMOD_DSP_PARAMEQ_GAIN /* Frequency Gain. 0.05 to 3.0. Default = 1.0. */ -} FMOD_DSP_PARAMEQ; - - - -/* -[ENUM] -[ - [DESCRIPTION] - Parameter types for the FMOD_DSP_TYPE_PITCHSHIFT filter. - - [REMARKS] - This pitch shifting unit can be used to change the pitch of a sound without speeding it up or slowing it down. - It can also be used for time stretching or scaling, for example if the pitch was doubled, and the frequency of the sound was halved, the pitch of the sound would sound correct but it would be twice as slow. - - Warning! This filter is very computationally expensive! Similar to a vocoder, it requires several overlapping FFT and IFFT's to produce smooth output, and can require around 440mhz for 1 stereo 48khz signal using the default settings. - Reducing the signal to mono will half the cpu usage. - Reducing this will lower audio quality, but what settings to use are largely dependant on the sound being played. A noisy polyphonic signal will need higher fft size compared to a speaking voice for example. - - This pitch shifter is based on the pitch shifter code at http://www.dspdimension.com, written by Stephan M. Bernsee. - The original code is COPYRIGHT 1999-2003 Stephan M. Bernsee . - - 'maxchannels' dictates the amount of memory allocated. By default, the maxchannels value is 0. If FMOD is set to stereo, the pitch shift unit will allocate enough memory for 2 channels. If it is 5.1, it will allocate enough memory for a 6 channel pitch shift, etc. - If the pitch shift effect is only ever applied to the global mix (ie it was added with System::addDSP), then 0 is the value to set as it will be enough to handle all speaker modes. - When the pitch shift is added to a channel (ie Channel::addDSP) then the channel count that comes in could be anything from 1 to 8 possibly. It is only in this case where you might want to increase the channel count above the output's channel count. - If a channel pitch shift is set to a lower number than the sound's channel count that is coming in, it will not pitch shift the sound. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - DSP::setParameter - DSP::getParameter - FMOD_DSP_TYPE -] -*/ -typedef enum -{ - FMOD_DSP_PITCHSHIFT_PITCH, /* Pitch value. 0.5 to 2.0. Default = 1.0. 0.5 = one octave down, 2.0 = one octave up. 1.0 does not change the pitch. */ - FMOD_DSP_PITCHSHIFT_FFTSIZE, /* FFT window size. 256, 512, 1024, 2048, 4096. Default = 1024. Increase this to reduce 'smearing'. This effect is a warbling sound similar to when an mp3 is encoded at very low bitrates. */ - FMOD_DSP_PITCHSHIFT_OVERLAP, /* Removed. Do not use. FMOD now uses 4 overlaps and cannot be changed. */ - FMOD_DSP_PITCHSHIFT_MAXCHANNELS /* Maximum channels supported. 0 to 16. 0 = same as fmod's default output polyphony, 1 = mono, 2 = stereo etc. See remarks for more. Default = 0. It is suggested to leave at 0! */ -} FMOD_DSP_PITCHSHIFT; - - - -/* -[ENUM] -[ - [DESCRIPTION] - Parameter types for the FMOD_DSP_TYPE_CHORUS filter. - - [REMARKS] - Chrous is an effect where the sound is more 'spacious' due to 1 to 3 versions of the sound being played along side the original signal but with the pitch of each copy modulating on a sine wave. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - DSP::setParameter - DSP::getParameter - FMOD_DSP_TYPE -] -*/ -typedef enum -{ - FMOD_DSP_CHORUS_DRYMIX, /* Volume of original signal to pass to output. 0.0 to 1.0. Default = 0.5. */ - FMOD_DSP_CHORUS_WETMIX1, /* Volume of 1st chorus tap. 0.0 to 1.0. Default = 0.5. */ - FMOD_DSP_CHORUS_WETMIX2, /* Volume of 2nd chorus tap. This tap is 90 degrees out of phase of the first tap. 0.0 to 1.0. Default = 0.5. */ - FMOD_DSP_CHORUS_WETMIX3, /* Volume of 3rd chorus tap. This tap is 90 degrees out of phase of the second tap. 0.0 to 1.0. Default = 0.5. */ - FMOD_DSP_CHORUS_DELAY, /* Chorus delay in ms. 0.1 to 100.0. Default = 40.0 ms. */ - FMOD_DSP_CHORUS_RATE, /* Chorus modulation rate in hz. 0.0 to 20.0. Default = 0.8 hz. */ - FMOD_DSP_CHORUS_DEPTH /* Chorus modulation depth. 0.0 to 1.0. Default = 0.03. */ -} FMOD_DSP_CHORUS; - - -/* -[ENUM] -[ - [DESCRIPTION] - Parameter types for the FMOD_DSP_TYPE_ITECHO filter. - This is effectively a software based echo filter that emulates the DirectX DMO echo effect. Impulse tracker files can support this, and FMOD will produce the effect on ANY platform, not just those that support DirectX effects! - - [REMARKS] - Note. Every time the delay is changed, the plugin re-allocates the echo buffer. This means the echo will dissapear at that time while it refills its new buffer. - Larger echo delays result in larger amounts of memory allocated. - - As this is a stereo filter made mainly for IT playback, it is targeted for stereo signals. - With mono signals only the FMOD_DSP_ITECHO_LEFTDELAY is used. - For multichannel signals (>2) there will be no echo on those channels. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - DSP::SetParameter - DSP::GetParameter - FMOD_DSP_TYPE - System::addDSP -] -*/ -typedef enum -{ - FMOD_DSP_ITECHO_WETDRYMIX, /* Ratio of wet (processed) signal to dry (unprocessed) signal. Must be in the range from 0.0 through 100.0 (all wet). The default value is 50. */ - FMOD_DSP_ITECHO_FEEDBACK, /* Percentage of output fed back into input, in the range from 0.0 through 100.0. The default value is 50. */ - FMOD_DSP_ITECHO_LEFTDELAY, /* Delay for left channel, in milliseconds, in the range from 1.0 through 2000.0. The default value is 500 ms. */ - FMOD_DSP_ITECHO_RIGHTDELAY, /* Delay for right channel, in milliseconds, in the range from 1.0 through 2000.0. The default value is 500 ms. */ - FMOD_DSP_ITECHO_PANDELAY /* Value that specifies whether to swap left and right delays with each successive echo. The default value is zero, meaning no swap. Possible values are defined as 0.0 (equivalent to FALSE) and 1.0 (equivalent to TRUE). CURRENTLY NOT SUPPORTED. */ -} FMOD_DSP_ITECHO; - -/* -[ENUM] -[ - [DESCRIPTION] - Parameter types for the FMOD_DSP_TYPE_COMPRESSOR unit. - This is a simple linked multichannel software limiter that is uniform across the whole spectrum. - - [REMARKS] - The limiter is not guaranteed to catch every peak above the threshold level, - because it cannot apply gain reduction instantaneously - the time delay is - determined by the attack time. However setting the attack time too short will - distort the sound, so it is a compromise. High level peaks can be avoided by - using a short attack time - but not too short, and setting the threshold a few - decibels below the critical level. - - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - DSP::SetParameter - DSP::GetParameter - FMOD_DSP_TYPE - System::addDSP -] -*/ -typedef enum -{ - FMOD_DSP_COMPRESSOR_THRESHOLD, /* Threshold level (dB) in the range from -60 through 0. The default value is 0. */ - FMOD_DSP_COMPRESSOR_ATTACK, /* Gain reduction attack time (milliseconds), in the range from 10 through 200. The default value is 50. */ - FMOD_DSP_COMPRESSOR_RELEASE, /* Gain reduction release time (milliseconds), in the range from 20 through 1000. The default value is 50. */ - FMOD_DSP_COMPRESSOR_GAINMAKEUP /* Make-up gain (dB) applied after limiting, in the range from 0 through 30. The default value is 0. */ -} FMOD_DSP_COMPRESSOR; - -/* -[ENUM] -[ - [DESCRIPTION] - Parameter types for the FMOD_DSP_TYPE_SFXREVERB unit. - - [REMARKS] - This is a high quality I3DL2 based reverb. - On top of the I3DL2 property set, "Dry Level" is also included to allow the dry mix to be changed. - - These properties can be set with presets in FMOD_REVERB_PRESETS. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - DSP::SetParameter - DSP::GetParameter - FMOD_DSP_TYPE - System::addDSP - FMOD_REVERB_PRESETS -] -*/ -typedef enum -{ - FMOD_DSP_SFXREVERB_DRYLEVEL, /* Dry Level : Mix level of dry signal in output in mB. Ranges from -10000.0 to 0.0. Default is 0. */ - FMOD_DSP_SFXREVERB_ROOM, /* Room : Room effect level at low frequencies in mB. Ranges from -10000.0 to 0.0. Default is -10000.0. */ - FMOD_DSP_SFXREVERB_ROOMHF, /* Room HF : Room effect high-frequency level re. low frequency level in mB. Ranges from -10000.0 to 0.0. Default is 0.0. */ - FMOD_DSP_SFXREVERB_DECAYTIME, /* Decay Time : Reverberation decay time at low-frequencies in seconds. Ranges from 0.1 to 20.0. Default is 1.0. */ - FMOD_DSP_SFXREVERB_DECAYHFRATIO, /* Decay HF Ratio : High-frequency to low-frequency decay time ratio. Ranges from 0.1 to 2.0. Default is 0.5. */ - FMOD_DSP_SFXREVERB_REFLECTIONSLEVEL, /* Reflections : Early reflections level relative to room effect in mB. Ranges from -10000.0 to 1000.0. Default is -10000.0. */ - FMOD_DSP_SFXREVERB_REFLECTIONSDELAY, /* Reflect Delay : Delay time of first reflection in seconds. Ranges from 0.0 to 0.3. Default is 0.02. */ - FMOD_DSP_SFXREVERB_REVERBLEVEL, /* Reverb : Late reverberation level relative to room effect in mB. Ranges from -10000.0 to 2000.0. Default is 0.0. */ - FMOD_DSP_SFXREVERB_REVERBDELAY, /* Reverb Delay : Late reverberation delay time relative to first reflection in seconds. Ranges from 0.0 to 0.1. Default is 0.04. */ - FMOD_DSP_SFXREVERB_DIFFUSION, /* Diffusion : Reverberation diffusion (echo density) in percent. Ranges from 0.0 to 100.0. Default is 100.0. */ - FMOD_DSP_SFXREVERB_DENSITY, /* Density : Reverberation density (modal density) in percent. Ranges from 0.0 to 100.0. Default is 100.0. */ - FMOD_DSP_SFXREVERB_HFREFERENCE, /* HF Reference : Reference high frequency in Hz. Ranges from 20.0 to 20000.0. Default is 5000.0. */ - FMOD_DSP_SFXREVERB_ROOMLF, /* Room LF : Room effect low-frequency level in mB. Ranges from -10000.0 to 0.0. Default is 0.0. */ - FMOD_DSP_SFXREVERB_LFREFERENCE /* LF Reference : Reference low-frequency in Hz. Ranges from 20.0 to 1000.0. Default is 250.0. */ -} FMOD_DSP_SFXREVERB; - -/* -[ENUM] -[ - [DESCRIPTION] - Parameter types for the FMOD_DSP_TYPE_LOWPASS_SIMPLE filter. - This is a very simple low pass filter, based on two single-pole RC time-constant modules. - The emphasis is on speed rather than accuracy, so this should not be used for task requiring critical filtering. - - [REMARKS] - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - DSP::setParameter - DSP::getParameter - FMOD_DSP_TYPE -] -*/ -typedef enum -{ - FMOD_DSP_LOWPASS_SIMPLE_CUTOFF /* Lowpass cutoff frequency in hz. 10.0 to 22000.0. Default = 5000.0 */ -} FMOD_DSP_LOWPASS_SIMPLE; - -/* -[ENUM] -[ - [DESCRIPTION] - Parameter types for the FMOD_DSP_TYPE_HIGHPASS_SIMPLE filter. - This is a very simple single-order high pass filter. - The emphasis is on speed rather than accuracy, so this should not be used for task requiring critical filtering. - - [REMARKS] - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - DSP::setParameter - DSP::getParameter - FMOD_DSP_TYPE -] -*/ -typedef enum -{ - FMOD_DSP_HIGHPASS_SIMPLE_CUTOFF /* Highpass cutoff frequency in hz. 10.0 to 22000.0. Default = 1000.0 */ -} FMOD_DSP_HIGHPASS_SIMPLE; - -#endif - diff --git a/libs/fmodex/inc/fmod_errors.h b/libs/fmodex/inc/fmod_errors.h deleted file mode 100644 index fdb85984b..000000000 --- a/libs/fmodex/inc/fmod_errors.h +++ /dev/null @@ -1,123 +0,0 @@ - -/* ============================================================================================== */ -/* FMOD Ex - Error string header file. Copyright (c), Firelight Technologies Pty, Ltd. 2004-2011. */ -/* */ -/* Use this header if you want to store or display a string version / english explanation of */ -/* the FMOD error codes. */ -/* */ -/* ============================================================================================== */ - -#ifndef _FMOD_ERRORS_H -#define _FMOD_ERRORS_H - -#include "fmod.h" - -#ifdef __GNUC__ -static const char *FMOD_ErrorString(FMOD_RESULT errcode) __attribute__((unused)); -#endif - -static const char *FMOD_ErrorString(FMOD_RESULT errcode) -{ - switch (errcode) - { - case FMOD_ERR_ALREADYLOCKED: return "Tried to call lock a second time before unlock was called. "; - case FMOD_ERR_BADCOMMAND: return "Tried to call a function on a data type that does not allow this type of functionality (ie calling Sound::lock on a streaming sound). "; - case FMOD_ERR_CDDA_DRIVERS: return "Neither NTSCSI nor ASPI could be initialised. "; - case FMOD_ERR_CDDA_INIT: return "An error occurred while initialising the CDDA subsystem. "; - case FMOD_ERR_CDDA_INVALID_DEVICE: return "Couldn't find the specified device. "; - case FMOD_ERR_CDDA_NOAUDIO: return "No audio tracks on the specified disc. "; - case FMOD_ERR_CDDA_NODEVICES: return "No CD/DVD devices were found. "; - case FMOD_ERR_CDDA_NODISC: return "No disc present in the specified drive. "; - case FMOD_ERR_CDDA_READ: return "A CDDA read error occurred. "; - case FMOD_ERR_CHANNEL_ALLOC: return "Error trying to allocate a channel. "; - case FMOD_ERR_CHANNEL_STOLEN: return "The specified channel has been reused to play another sound. "; - case FMOD_ERR_COM: return "A Win32 COM related error occured. COM failed to initialize or a QueryInterface failed meaning a Windows codec or driver was not installed properly. "; - case FMOD_ERR_DMA: return "DMA Failure. See debug output for more information. "; - case FMOD_ERR_DSP_CONNECTION: return "DSP connection error. Connection possibly caused a cyclic dependancy. Or tried to connect a tree too many units deep (more than 128). "; - case FMOD_ERR_DSP_FORMAT: return "DSP Format error. A DSP unit may have attempted to connect to this network with the wrong format. "; - case FMOD_ERR_DSP_NOTFOUND: return "DSP connection error. Couldn't find the DSP unit specified. "; - case FMOD_ERR_DSP_RUNNING: return "DSP error. Cannot perform this operation while the network is in the middle of running. This will most likely happen if a connection or disconnection is attempted in a DSP callback. "; - case FMOD_ERR_DSP_TOOMANYCONNECTIONS: return "DSP connection error. The unit being connected to or disconnected should only have 1 input or output. "; - case FMOD_ERR_EVENT_ALREADY_LOADED: return "The specified project or bank has already been loaded. Having multiple copies of the same project loaded simultaneously is forbidden. "; - case FMOD_ERR_EVENT_FAILED: return "An Event failed to be retrieved, most likely due to 'just fail' being specified as the max playbacks behavior. "; - case FMOD_ERR_EVENT_GUIDCONFLICT: return "An event with the same GUID already exists. "; - case FMOD_ERR_EVENT_INFOONLY: return "Can't execute this command on an EVENT_INFOONLY event. "; - case FMOD_ERR_EVENT_INTERNAL: return "An error occured that wasn't supposed to. See debug log for reason. "; - case FMOD_ERR_EVENT_MAXSTREAMS: return "Event failed because 'Max streams' was hit when FMOD_EVENT_INIT_FAIL_ON_MAXSTREAMS was specified. "; - case FMOD_ERR_EVENT_MISMATCH: return "FSB mismatches the FEV it was compiled with, the stream/sample mode it was meant to be created with was different, or the FEV was built for a different platform. "; - case FMOD_ERR_EVENT_NAMECONFLICT: return "A category with the same name already exists. "; - case FMOD_ERR_EVENT_NEEDSSIMPLE: return "Tried to call a function on a complex event that's only supported by simple events. "; - case FMOD_ERR_EVENT_NOTFOUND: return "The requested event, event group, event category or event property could not be found. "; - case FMOD_ERR_FILE_BAD: return "Error loading file. "; - case FMOD_ERR_FILE_COULDNOTSEEK: return "Couldn't perform seek operation. This is a limitation of the medium (ie netstreams) or the file format. "; - case FMOD_ERR_FILE_DISKEJECTED: return "Media was ejected while reading. "; - case FMOD_ERR_FILE_EOF: return "End of file unexpectedly reached while trying to read essential data (truncated data?). "; - case FMOD_ERR_FILE_NOTFOUND: return "File not found. "; - case FMOD_ERR_FILE_UNWANTED: return "Unwanted file access occured. "; - case FMOD_ERR_FORMAT: return "Unsupported file or audio format. "; - case FMOD_ERR_HTTP: return "A HTTP error occurred. This is a catch-all for HTTP errors not listed elsewhere. "; - case FMOD_ERR_HTTP_ACCESS: return "The specified resource requires authentication or is forbidden. "; - case FMOD_ERR_HTTP_PROXY_AUTH: return "Proxy authentication is required to access the specified resource. "; - case FMOD_ERR_HTTP_SERVER_ERROR: return "A HTTP server error occurred. "; - case FMOD_ERR_HTTP_TIMEOUT: return "The HTTP request timed out. "; - case FMOD_ERR_INITIALIZATION: return "FMOD was not initialized correctly to support this function. "; - case FMOD_ERR_INITIALIZED: return "Cannot call this command after System::init. "; - case FMOD_ERR_INTERNAL: return "An error occured that wasn't supposed to. Contact support. "; - case FMOD_ERR_INVALID_ADDRESS: return "On Xbox 360, this memory address passed to FMOD must be physical, (ie allocated with XPhysicalAlloc.) "; - case FMOD_ERR_INVALID_FLOAT: return "Value passed in was a NaN, Inf or denormalized float. "; - case FMOD_ERR_INVALID_HANDLE: return "An invalid object handle was used. "; - case FMOD_ERR_INVALID_PARAM: return "An invalid parameter was passed to this function. "; - case FMOD_ERR_INVALID_POSITION: return "An invalid seek position was passed to this function. "; - case FMOD_ERR_INVALID_SPEAKER: return "An invalid speaker was passed to this function based on the current speaker mode. "; - case FMOD_ERR_INVALID_SYNCPOINT: return "The syncpoint did not come from this sound handle. "; - case FMOD_ERR_INVALID_VECTOR: return "The vectors passed in are not unit length, or perpendicular. "; - case FMOD_ERR_MAXAUDIBLE: return "Reached maximum audible playback count for this sound's soundgroup. "; - case FMOD_ERR_MEMORY: return "Not enough memory or resources. "; - case FMOD_ERR_MEMORY_CANTPOINT: return "Can't use FMOD_OPENMEMORY_POINT on non PCM source data, or non mp3/xma/adpcm data if FMOD_CREATECOMPRESSEDSAMPLE was used. "; - case FMOD_ERR_MEMORY_SRAM: return "Not enough memory or resources on console sound ram. "; - case FMOD_ERR_MUSIC_NOCALLBACK: return "The music callback is required, but it has not been set. "; - case FMOD_ERR_MUSIC_NOTFOUND: return "The requested music entity could not be found. "; - case FMOD_ERR_MUSIC_UNINITIALIZED: return "Music system is not initialized probably because no music data is loaded. "; - case FMOD_ERR_NEEDS2D: return "Tried to call a command on a 3d sound when the command was meant for 2d sound. "; - case FMOD_ERR_NEEDS3D: return "Tried to call a command on a 2d sound when the command was meant for 3d sound. "; - case FMOD_ERR_NEEDSHARDWARE: return "Tried to use a feature that requires hardware support. (ie trying to play a GCADPCM compressed sound in software on Wii). "; - case FMOD_ERR_NEEDSSOFTWARE: return "Tried to use a feature that requires the software engine. Software engine has either been turned off, or command was executed on a hardware channel which does not support this feature. "; - case FMOD_ERR_NET_CONNECT: return "Couldn't connect to the specified host. "; - case FMOD_ERR_NET_SOCKET_ERROR: return "A socket error occurred. This is a catch-all for socket-related errors not listed elsewhere. "; - case FMOD_ERR_NET_URL: return "The specified URL couldn't be resolved. "; - case FMOD_ERR_NET_WOULD_BLOCK: return "Operation on a non-blocking socket could not complete immediately. "; - case FMOD_ERR_NOTREADY: return "Operation could not be performed because specified sound/DSP connection is not ready. "; - case FMOD_ERR_OUTPUT_ALLOCATED: return "Error initializing output device, but more specifically, the output device is already in use and cannot be reused. "; - case FMOD_ERR_OUTPUT_CREATEBUFFER: return "Error creating hardware sound buffer. "; - case FMOD_ERR_OUTPUT_DRIVERCALL: return "A call to a standard soundcard driver failed, which could possibly mean a bug in the driver or resources were missing or exhausted. "; - case FMOD_ERR_OUTPUT_ENUMERATION: return "Error enumerating the available driver list. List may be inconsistent due to a recent device addition or removal. "; - case FMOD_ERR_OUTPUT_FORMAT: return "Soundcard does not support the minimum features needed for this soundsystem (16bit stereo output). "; - case FMOD_ERR_OUTPUT_INIT: return "Error initializing output device. "; - case FMOD_ERR_OUTPUT_NOHARDWARE: return "FMOD_HARDWARE was specified but the sound card does not have the resources necessary to play it. "; - case FMOD_ERR_OUTPUT_NOSOFTWARE: return "Attempted to create a software sound but no software channels were specified in System::init. "; - case FMOD_ERR_PAN: return "Panning only works with mono or stereo sound sources. "; - case FMOD_ERR_PLUGIN: return "An unspecified error has been returned from a 3rd party plugin. "; - case FMOD_ERR_PLUGIN_INSTANCES: return "The number of allowed instances of a plugin has been exceeded. "; - case FMOD_ERR_PLUGIN_MISSING: return "A requested output, dsp unit type or codec was not available. "; - case FMOD_ERR_PLUGIN_RESOURCE: return "A resource that the plugin requires cannot be found. (ie the DLS file for MIDI playback or other DLLs that it needs to load) "; - case FMOD_ERR_PRELOADED: return "The specified sound is still in use by the event system, call EventSystem::unloadFSB before trying to release it. "; - case FMOD_ERR_PROGRAMMERSOUND: return "The specified sound is still in use by the event system, wait for the event which is using it finish with it. "; - case FMOD_ERR_RECORD: return "An error occured trying to initialize the recording device. "; - case FMOD_ERR_REVERB_INSTANCE: return "Specified instance in FMOD_REVERB_PROPERTIES couldn't be set. Most likely because it is an invalid instance number or the reverb doesnt exist. "; - case FMOD_ERR_SUBSOUNDS: return "The error occured because the sound referenced contains subsounds when it shouldn't have, or it doesn't contain subsounds when it should have. The operation may also not be able to be performed on a parent sound, or a parent sound was played without setting up a sentence first. "; - case FMOD_ERR_SUBSOUND_ALLOCATED: return "This subsound is already being used by another sound, you cannot have more than one parent to a sound. Null out the other parent's entry first. "; - case FMOD_ERR_SUBSOUND_CANTMOVE: return "Shared subsounds cannot be replaced or moved from their parent stream, such as when the parent stream is an FSB file. "; - case FMOD_ERR_SUBSOUND_MODE: return "The subsound's mode bits do not match with the parent sound's mode bits. See documentation for function that it was called with. "; - case FMOD_ERR_TAGNOTFOUND: return "The specified tag could not be found or there are no tags. "; - case FMOD_ERR_TOOMANYCHANNELS: return "The sound created exceeds the allowable input channel count. This can be increased using the maxinputchannels parameter in System::setSoftwareFormat. "; - case FMOD_ERR_UNIMPLEMENTED: return "Something in FMOD hasn't been implemented when it should be! contact support! "; - case FMOD_ERR_UNINITIALIZED: return "This command failed because System::init or System::setDriver was not called. "; - case FMOD_ERR_UNSUPPORTED: return "A command issued was not supported by this object. Possibly a plugin without certain callbacks specified. "; - case FMOD_ERR_UPDATE: return "An error caused by System::update occured. "; - case FMOD_ERR_VERSION: return "The version number of this file format is not supported. "; - case FMOD_OK: return "No errors."; - default : return "Unknown error."; - }; -} - -#endif diff --git a/libs/fmodex/inc/fmod_memoryinfo.h b/libs/fmodex/inc/fmod_memoryinfo.h deleted file mode 100644 index 6db9de3b8..000000000 --- a/libs/fmodex/inc/fmod_memoryinfo.h +++ /dev/null @@ -1,201 +0,0 @@ -/* ============================================================================================= */ -/* FMOD Ex - Memory info header file. Copyright (c), Firelight Technologies Pty, Ltd. 2008-2011. */ -/* */ -/* Use this header if you are interested in getting detailed information on FMOD's memory */ -/* usage. See the documentation for more details. */ -/* */ -/* ============================================================================================= */ - -#ifndef _FMOD_MEMORYINFO_H -#define _FMOD_MEMORYINFO_H - -/* -[STRUCTURE] -[ - [DESCRIPTION] - Structure to be filled with detailed memory usage information of an FMOD object - - [REMARKS] - Every public FMOD class has a getMemoryInfo function which can be used to get detailed information on what memory resources are associated with the object in question. - On return from getMemoryInfo, each member of this structure will hold the amount of memory used for its type in bytes. - - Members marked with [in] mean the user sets the value before passing it to the function. - Members marked with [out] mean FMOD sets the value to be used after the function exits. - - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - System::getMemoryInfo - EventSystem::getMemoryInfo - FMOD_MEMBITS - FMOD_EVENT_MEMBITS -] -*/ -typedef struct FMOD_MEMORY_USAGE_DETAILS -{ - unsigned int other; /* [out] Memory not accounted for by other types */ - unsigned int string; /* [out] String data */ - unsigned int system; /* [out] System object and various internals */ - unsigned int plugins; /* [out] Plugin objects and internals */ - unsigned int output; /* [out] Output module object and internals */ - unsigned int channel; /* [out] Channel related memory */ - unsigned int channelgroup; /* [out] ChannelGroup objects and internals */ - unsigned int codec; /* [out] Codecs allocated for streaming */ - unsigned int file; /* [out] File buffers and structures */ - unsigned int sound; /* [out] Sound objects and internals */ - unsigned int secondaryram; /* [out] Sound data stored in secondary RAM */ - unsigned int soundgroup; /* [out] SoundGroup objects and internals */ - unsigned int streambuffer; /* [out] Stream buffer memory */ - unsigned int dspconnection; /* [out] DSPConnection objects and internals */ - unsigned int dsp; /* [out] DSP implementation objects */ - unsigned int dspcodec; /* [out] Realtime file format decoding DSP objects */ - unsigned int profile; /* [out] Profiler memory footprint. */ - unsigned int recordbuffer; /* [out] Buffer used to store recorded data from microphone */ - unsigned int reverb; /* [out] Reverb implementation objects */ - unsigned int reverbchannelprops; /* [out] Reverb channel properties structs */ - unsigned int geometry; /* [out] Geometry objects and internals */ - unsigned int syncpoint; /* [out] Sync point memory. */ - unsigned int eventsystem; /* [out] EventSystem and various internals */ - unsigned int musicsystem; /* [out] MusicSystem and various internals */ - unsigned int fev; /* [out] Definition of objects contained in all loaded projects e.g. events, groups, categories */ - unsigned int memoryfsb; /* [out] Data loaded with preloadFSB */ - unsigned int eventproject; /* [out] EventProject objects and internals */ - unsigned int eventgroupi; /* [out] EventGroup objects and internals */ - unsigned int soundbankclass; /* [out] Objects used to manage wave banks */ - unsigned int soundbanklist; /* [out] Data used to manage lists of wave bank usage */ - unsigned int streaminstance; /* [out] Stream objects and internals */ - unsigned int sounddefclass; /* [out] Sound definition objects */ - unsigned int sounddefdefclass; /* [out] Sound definition static data objects */ - unsigned int sounddefpool; /* [out] Sound definition pool data */ - unsigned int reverbdef; /* [out] Reverb definition objects */ - unsigned int eventreverb; /* [out] Reverb objects */ - unsigned int userproperty; /* [out] User property objects */ - unsigned int eventinstance; /* [out] Event instance base objects */ - unsigned int eventinstance_complex; /* [out] Complex event instance objects */ - unsigned int eventinstance_simple; /* [out] Simple event instance objects */ - unsigned int eventinstance_layer; /* [out] Event layer instance objects */ - unsigned int eventinstance_sound; /* [out] Event sound instance objects */ - unsigned int eventenvelope; /* [out] Event envelope objects */ - unsigned int eventenvelopedef; /* [out] Event envelope definition objects */ - unsigned int eventparameter; /* [out] Event parameter objects */ - unsigned int eventcategory; /* [out] Event category objects */ - unsigned int eventenvelopepoint; /* [out] Event envelope point objects */ - unsigned int eventinstancepool; /* [out] Event instance pool memory */ -} FMOD_MEMORY_USAGE_DETAILS; - - -/* -[DEFINE] -[ - [NAME] - FMOD_MEMBITS - - [DESCRIPTION] - Bitfield used to request specific memory usage information from the getMemoryInfo function of every public FMOD Ex class. - Use with the "memorybits" parameter of getMemoryInfo to get information on FMOD Ex memory usage. - - [REMARKS] - Every public FMOD class has a getMemoryInfo function which can be used to get detailed information on what memory resources are associated with the object in question. - The FMOD_MEMBITS defines can be OR'd together to specify precisely what memory usage you'd like to get information on. See System::getMemoryInfo for an example. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - FMOD_EVENT_MEMBITS - System::getMemoryInfo -] -*/ -#define FMOD_MEMBITS_OTHER 0x00000001 /* Memory not accounted for by other types */ -#define FMOD_MEMBITS_STRING 0x00000002 /* String data */ - -#define FMOD_MEMBITS_SYSTEM 0x00000004 /* System object and various internals */ -#define FMOD_MEMBITS_PLUGINS 0x00000008 /* Plugin objects and internals */ -#define FMOD_MEMBITS_OUTPUT 0x00000010 /* Output module object and internals */ -#define FMOD_MEMBITS_CHANNEL 0x00000020 /* Channel related memory */ -#define FMOD_MEMBITS_CHANNELGROUP 0x00000040 /* ChannelGroup objects and internals */ -#define FMOD_MEMBITS_CODEC 0x00000080 /* Codecs allocated for streaming */ -#define FMOD_MEMBITS_FILE 0x00000100 /* Codecs allocated for streaming */ -#define FMOD_MEMBITS_SOUND 0x00000200 /* Sound objects and internals */ -#define FMOD_MEMBITS_SOUND_SECONDARYRAM 0x00000400 /* Sound data stored in secondary RAM */ -#define FMOD_MEMBITS_SOUNDGROUP 0x00000800 /* SoundGroup objects and internals */ -#define FMOD_MEMBITS_STREAMBUFFER 0x00001000 /* Stream buffer memory */ -#define FMOD_MEMBITS_DSPCONNECTION 0x00002000 /* DSPConnection objects and internals */ -#define FMOD_MEMBITS_DSP 0x00004000 /* DSP implementation objects */ -#define FMOD_MEMBITS_DSPCODEC 0x00008000 /* Realtime file format decoding DSP objects */ -#define FMOD_MEMBITS_PROFILE 0x00010000 /* Profiler memory footprint. */ -#define FMOD_MEMBITS_RECORDBUFFER 0x00020000 /* Buffer used to store recorded data from microphone */ -#define FMOD_MEMBITS_REVERB 0x00040000 /* Reverb implementation objects */ -#define FMOD_MEMBITS_REVERBCHANNELPROPS 0x00080000 /* Reverb channel properties structs */ -#define FMOD_MEMBITS_GEOMETRY 0x00100000 /* Geometry objects and internals */ -#define FMOD_MEMBITS_SYNCPOINT 0x00200000 /* Sync point memory. */ -#define FMOD_MEMBITS_ALL 0xffffffff /* All memory used by FMOD Ex */ -/* [DEFINE_END] */ - - -/* -[DEFINE] -[ - [NAME] - FMOD_EVENT_MEMBITS - - [DESCRIPTION] - Bitfield used to request specific memory usage information from the getMemoryInfo function of every public FMOD Event System class. - Use with the "event_memorybits" parameter of getMemoryInfo to get information on FMOD Event System memory usage. - - [REMARKS] - Every public FMOD Event System class has a getMemoryInfo function which can be used to get detailed information on what memory resources are associated with the object in question. - The FMOD_EVENT_MEMBITS defines can be OR'd together to specify precisely what memory usage you'd like to get information on. See EventSystem::getMemoryInfo for an example. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - FMOD_MEMBITS - System::getMemoryInfo -] -*/ -#define FMOD_EVENT_MEMBITS_EVENTSYSTEM 0x00000001 /* EventSystem and various internals */ -#define FMOD_EVENT_MEMBITS_MUSICSYSTEM 0x00000002 /* MusicSystem and various internals */ -#define FMOD_EVENT_MEMBITS_FEV 0x00000004 /* Definition of objects contained in all loaded projects e.g. events, groups, categories */ -#define FMOD_EVENT_MEMBITS_MEMORYFSB 0x00000008 /* Data loaded with preloadFSB */ -#define FMOD_EVENT_MEMBITS_EVENTPROJECT 0x00000010 /* EventProject objects and internals */ -#define FMOD_EVENT_MEMBITS_EVENTGROUPI 0x00000020 /* EventGroup objects and internals */ -#define FMOD_EVENT_MEMBITS_SOUNDBANKCLASS 0x00000040 /* Objects used to manage wave banks */ -#define FMOD_EVENT_MEMBITS_SOUNDBANKLIST 0x00000080 /* Data used to manage lists of wave bank usage */ -#define FMOD_EVENT_MEMBITS_STREAMINSTANCE 0x00000100 /* Stream objects and internals */ -#define FMOD_EVENT_MEMBITS_SOUNDDEFCLASS 0x00000200 /* Sound definition objects */ -#define FMOD_EVENT_MEMBITS_SOUNDDEFDEFCLASS 0x00000400 /* Sound definition static data objects */ -#define FMOD_EVENT_MEMBITS_SOUNDDEFPOOL 0x00000800 /* Sound definition pool data */ -#define FMOD_EVENT_MEMBITS_REVERBDEF 0x00001000 /* Reverb definition objects */ -#define FMOD_EVENT_MEMBITS_EVENTREVERB 0x00002000 /* Reverb objects */ -#define FMOD_EVENT_MEMBITS_USERPROPERTY 0x00004000 /* User property objects */ -#define FMOD_EVENT_MEMBITS_EVENTINSTANCE 0x00008000 /* Event instance base objects */ -#define FMOD_EVENT_MEMBITS_EVENTINSTANCE_COMPLEX 0x00010000 /* Complex event instance objects */ -#define FMOD_EVENT_MEMBITS_EVENTINSTANCE_SIMPLE 0x00020000 /* Simple event instance objects */ -#define FMOD_EVENT_MEMBITS_EVENTINSTANCE_LAYER 0x00040000 /* Event layer instance objects */ -#define FMOD_EVENT_MEMBITS_EVENTINSTANCE_SOUND 0x00080000 /* Event sound instance objects */ -#define FMOD_EVENT_MEMBITS_EVENTENVELOPE 0x00100000 /* Event envelope objects */ -#define FMOD_EVENT_MEMBITS_EVENTENVELOPEDEF 0x00200000 /* Event envelope definition objects */ -#define FMOD_EVENT_MEMBITS_EVENTPARAMETER 0x00400000 /* Event parameter objects */ -#define FMOD_EVENT_MEMBITS_EVENTCATEGORY 0x00800000 /* Event category objects */ -#define FMOD_EVENT_MEMBITS_EVENTENVELOPEPOINT 0x01000000 /* Event envelope point object+s */ -#define FMOD_EVENT_MEMBITS_EVENTINSTANCEPOOL 0x02000000 /* Event instance pool data */ -#define FMOD_EVENT_MEMBITS_ALL 0xffffffff /* All memory used by FMOD Event System */ - -/* All event instance memory */ -#define FMOD_EVENT_MEMBITS_EVENTINSTANCE_GROUP (FMOD_EVENT_MEMBITS_EVENTINSTANCE | \ - FMOD_EVENT_MEMBITS_EVENTINSTANCE_COMPLEX | \ - FMOD_EVENT_MEMBITS_EVENTINSTANCE_SIMPLE | \ - FMOD_EVENT_MEMBITS_EVENTINSTANCE_LAYER | \ - FMOD_EVENT_MEMBITS_EVENTINSTANCE_SOUND) - -/* All sound definition memory */ -#define FMOD_EVENT_MEMBITS_SOUNDDEF_GROUP (FMOD_EVENT_MEMBITS_SOUNDDEFCLASS | \ - FMOD_EVENT_MEMBITS_SOUNDDEFDEFCLASS | \ - FMOD_EVENT_MEMBITS_SOUNDDEFPOOL) -/* [DEFINE_END] */ - -#endif diff --git a/libs/fmodex/inc/fmod_output.h b/libs/fmodex/inc/fmod_output.h deleted file mode 100644 index 2ffb867bd..000000000 --- a/libs/fmodex/inc/fmod_output.h +++ /dev/null @@ -1,93 +0,0 @@ -/* ==================================================================================================== */ -/* FMOD Ex - output development header file. Copyright (c), Firelight Technologies Pty, Ltd. 2004-2011. */ -/* */ -/* Use this header if you are wanting to develop your own output plugin to use with */ -/* FMOD's output system. With this header you can make your own output plugin that FMOD */ -/* can register and use. See the documentation and examples on how to make a working plugin. */ -/* */ -/* ==================================================================================================== */ - -#ifndef _FMOD_OUTPUT_H -#define _FMOD_OUTPUT_H - -#include "fmod.h" - -typedef struct FMOD_OUTPUT_STATE FMOD_OUTPUT_STATE; - -/* - Output callbacks -*/ -typedef FMOD_RESULT (F_CALLBACK *FMOD_OUTPUT_GETNUMDRIVERSCALLBACK)(FMOD_OUTPUT_STATE *output_state, int *numdrivers); -typedef FMOD_RESULT (F_CALLBACK *FMOD_OUTPUT_GETDRIVERNAMECALLBACK)(FMOD_OUTPUT_STATE *output_state, int id, char *name, int namelen); -typedef FMOD_RESULT (F_CALLBACK *FMOD_OUTPUT_GETDRIVERCAPSCALLBACK)(FMOD_OUTPUT_STATE *output_state, int id, FMOD_CAPS *caps); -typedef FMOD_RESULT (F_CALLBACK *FMOD_OUTPUT_INITCALLBACK) (FMOD_OUTPUT_STATE *output_state, int selecteddriver, FMOD_INITFLAGS flags, int *outputrate, int outputchannels, FMOD_SOUND_FORMAT *outputformat, int dspbufferlength, int dspnumbuffers, void *extradriverdata); -typedef FMOD_RESULT (F_CALLBACK *FMOD_OUTPUT_CLOSECALLBACK) (FMOD_OUTPUT_STATE *output_state); -typedef FMOD_RESULT (F_CALLBACK *FMOD_OUTPUT_UPDATECALLBACK) (FMOD_OUTPUT_STATE *output_state); -typedef FMOD_RESULT (F_CALLBACK *FMOD_OUTPUT_GETHANDLECALLBACK) (FMOD_OUTPUT_STATE *output_state, void **handle); -typedef FMOD_RESULT (F_CALLBACK *FMOD_OUTPUT_GETPOSITIONCALLBACK) (FMOD_OUTPUT_STATE *output_state, unsigned int *pcm); -typedef FMOD_RESULT (F_CALLBACK *FMOD_OUTPUT_LOCKCALLBACK) (FMOD_OUTPUT_STATE *output_state, unsigned int offset, unsigned int length, void **ptr1, void **ptr2, unsigned int *len1, unsigned int *len2); -typedef FMOD_RESULT (F_CALLBACK *FMOD_OUTPUT_UNLOCKCALLBACK) (FMOD_OUTPUT_STATE *output_state, void *ptr1, void *ptr2, unsigned int len1, unsigned int len2); -typedef FMOD_RESULT (F_CALLBACK *FMOD_OUTPUT_READFROMMIXER) (FMOD_OUTPUT_STATE *output_state, void *buffer, unsigned int length); - - -/* -[STRUCTURE] -[ - [DESCRIPTION] - When creating an output, declare one of these and provide the relevant callbacks and name for FMOD to use when it opens and reads a file of this type. - - [REMARKS] - Members marked with [in] mean the variable can be written to. The user can set the value. - Members marked with [out] mean the variable is modified by FMOD and is for reading purposes only. Do not change this value. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - FMOD_OUTPUT_STATE -] -*/ -typedef struct FMOD_OUTPUT_DESCRIPTION -{ - const char *name; /* [in] Name of the output. */ - unsigned int version; /* [in] Plugin writer's version number. */ - int polling; /* [in] If TRUE (non zero), this tells FMOD to start a thread and call getposition / lock / unlock for feeding data. If 0, the output is probably callback based, so all the plugin needs to do is call readfrommixer to the appropriate pointer. */ - FMOD_OUTPUT_GETNUMDRIVERSCALLBACK getnumdrivers; /* [in] For sound device enumeration. This callback is to give System::getNumDrivers somthing to return. */ - FMOD_OUTPUT_GETDRIVERNAMECALLBACK getdrivername; /* [in] For sound device enumeration. This callback is to give System::getDriverName somthing to return. */ - FMOD_OUTPUT_GETDRIVERCAPSCALLBACK getdrivercaps; /* [in] For sound device enumeration. This callback is to give System::getDriverCaps somthing to return. */ - FMOD_OUTPUT_INITCALLBACK init; /* [in] Initialization function for the output device. This is called from System::init. */ - FMOD_OUTPUT_CLOSECALLBACK close; /* [in] Cleanup / close down function for the output device. This is called from System::close. */ - FMOD_OUTPUT_UPDATECALLBACK update; /* [in] Update function that is called once a frame by the user. This is called from System::update. */ - FMOD_OUTPUT_GETHANDLECALLBACK gethandle; /* [in] This is called from System::getOutputHandle. This is just to return a pointer to the internal system device object that the system may be using.*/ - FMOD_OUTPUT_GETPOSITIONCALLBACK getposition; /* [in] This is called from the FMOD software mixer thread if 'polling' = true. This returns a position value in samples so that FMOD knows where and when to fill its buffer. */ - FMOD_OUTPUT_LOCKCALLBACK lock; /* [in] This is called from the FMOD software mixer thread if 'polling' = true. This function provides a pointer to data that FMOD can write to when software mixing. */ - FMOD_OUTPUT_UNLOCKCALLBACK unlock; /* [in] This is called from the FMOD software mixer thread if 'polling' = true. This optional function accepts the data that has been mixed and copies it or does whatever it needs to before sending it to the hardware. */ -} FMOD_OUTPUT_DESCRIPTION; - - -/* -[STRUCTURE] -[ - [DESCRIPTION] - Output plugin structure that is passed into each callback. - - [REMARKS] - Members marked with [in] mean the variable can be written to. The user can set the value. - Members marked with [out] mean the variable is modified by FMOD and is for reading purposes only. Do not change this value. - - [PLATFORMS] - Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation Portable, PlayStation 3, Wii, iPhone, 3GS, NGP, Android - - [SEE_ALSO] - FMOD_OUTPUT_DESCRIPTION -] -*/ -struct FMOD_OUTPUT_STATE -{ - void *plugindata; /* [in] Plugin writer created data the output author wants to attach to this object. */ - FMOD_OUTPUT_READFROMMIXER readfrommixer; /* [out] Function to update mixer and write the result to the provided pointer. Used from callback based output only. Polling based output uses lock/unlock/getposition. */ -}; - -#endif - - diff --git a/libs/fmodex/lib/fmodex64_vc.lib b/libs/fmodex/lib/fmodex64_vc.lib deleted file mode 100644 index 77a761d34..000000000 Binary files a/libs/fmodex/lib/fmodex64_vc.lib and /dev/null differ diff --git a/libs/fmodex/lib/fmodexL64_vc.lib b/libs/fmodex/lib/fmodexL64_vc.lib deleted file mode 100644 index 6c008895c..000000000 Binary files a/libs/fmodex/lib/fmodexL64_vc.lib and /dev/null differ diff --git a/libs/fmodex/lib/fmodexL_bc.lib b/libs/fmodex/lib/fmodexL_bc.lib deleted file mode 100644 index 0ae81171b..000000000 Binary files a/libs/fmodex/lib/fmodexL_bc.lib and /dev/null differ diff --git a/libs/fmodex/lib/fmodexL_lcc.lib b/libs/fmodex/lib/fmodexL_lcc.lib deleted file mode 100644 index 0c0e22918..000000000 Binary files a/libs/fmodex/lib/fmodexL_lcc.lib and /dev/null differ diff --git a/libs/fmodex/lib/fmodexL_vc.lib b/libs/fmodex/lib/fmodexL_vc.lib deleted file mode 100644 index 63b6ee4fa..000000000 Binary files a/libs/fmodex/lib/fmodexL_vc.lib and /dev/null differ diff --git a/libs/fmodex/lib/fmodex_bc.lib b/libs/fmodex/lib/fmodex_bc.lib deleted file mode 100644 index 1f5c98ca3..000000000 Binary files a/libs/fmodex/lib/fmodex_bc.lib and /dev/null differ diff --git a/libs/fmodex/lib/fmodex_lcc.lib b/libs/fmodex/lib/fmodex_lcc.lib deleted file mode 100644 index 235fe165c..000000000 Binary files a/libs/fmodex/lib/fmodex_lcc.lib and /dev/null differ diff --git a/libs/fmodex/lib/fmodex_vc.lib b/libs/fmodex/lib/fmodex_vc.lib deleted file mode 100644 index ec169885f..000000000 Binary files a/libs/fmodex/lib/fmodex_vc.lib and /dev/null differ diff --git a/libs/fmodex/lib/libfmodex.a b/libs/fmodex/lib/libfmodex.a deleted file mode 100644 index 6c49195aa..000000000 Binary files a/libs/fmodex/lib/libfmodex.a and /dev/null differ diff --git a/libs/fmodex/lib/libfmodexL.a b/libs/fmodex/lib/libfmodexL.a deleted file mode 100644 index fe253aaf6..000000000 Binary files a/libs/fmodex/lib/libfmodexL.a and /dev/null differ diff --git a/libs/fmodex/lib/which library do I use.txt b/libs/fmodex/lib/which library do I use.txt deleted file mode 100644 index 12738bed0..000000000 --- a/libs/fmodex/lib/which library do I use.txt +++ /dev/null @@ -1,28 +0,0 @@ -Which library do I link? ------------------------- - -If you want to use fmodex.dll: - -Visual Studio users - fmodex_vc.lib. -Metrowerks Codewarrior users - fmodex_vc.lib. -Borland users - fmodex_bc.lib. -LCC-Win32 users - fmodex_lcc.lib. -Dev-C++, MinGW and CygWin users - libfmodex.a. - -If you want to use fmodexL.dll: (same as fmodex.dll but with debug logging enabled) - -Visual Studio users - fmodexL_vc.lib. -Metrowerks Codewarrior users - fmodexL_vc.lib. -Borland users - fmodexL_bc.lib. -LCC-Win32 users - fmodexL_lcc.lib. -Dev-C++, MinGW and CygWin users - libfmodexL.a. - -If you want to use fmodex64.dll: (same as fmodex.dll but for 64bit machines) - -Visual Studio users - fmodex64_vc.lib. - -If you want to use fmodexL64.dll: (same as fmodex64.dll but with debug logging enabled) - -Visual Studio users - fmodexL64_vc.lib. - -No other compilers are supported for 64bit libraries. \ No newline at end of file diff --git a/libs/libpng-src/projects/visualc10/libpng.vcxproj b/libs/libpng-src/projects/visualc10/libpng.vcxproj index eaa3d4ffb..351b4317d 100644 --- a/libs/libpng-src/projects/visualc10/libpng.vcxproj +++ b/libs/libpng-src/projects/visualc10/libpng.vcxproj @@ -37,51 +37,51 @@ {72B01ACA-7A1A-4F7B-ACEF-2607299CF052} libpng - 10.0.16299.0 + 10.0 StaticLibrary false - v140 + v143 StaticLibrary false - v141 + v143 true StaticLibrary false - v140 + v143 StaticLibrary false - v141 + v143 true StaticLibrary false - v140 + v143 StaticLibrary false - v141 + v143 true StaticLibrary false - v140 + v143 StaticLibrary false - v141 + v143 true @@ -278,7 +278,7 @@ Disabled ..\..;..\..\..\zlib;%(AdditionalIncludeDirectories) WIN32;_DEBUG;DEBUG;PNG_DEBUG=1;PNG_USE_PNGVCRD;PNG_LIBPNG_SPECIALBUILD;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true + false EnableFastChecks MultiThreadedDebugDLL $(ProjectDir)$(Platform)\$(Configuration)\ @@ -288,7 +288,7 @@ true EditAndContinue CompileAsC - false + true _DEBUG;%(PreprocessorDefinitions) diff --git a/libs/zlib/projects/visualc10/zlib.vcxproj b/libs/zlib/projects/visualc10/zlib.vcxproj index de7b2aaab..5c00ea4a9 100644 --- a/libs/zlib/projects/visualc10/zlib.vcxproj +++ b/libs/zlib/projects/visualc10/zlib.vcxproj @@ -37,51 +37,51 @@ {73A5729C-7323-41D4-AB48-8A03C9F81603} zlib - 10.0.16299.0 + 10.0 StaticLibrary false - v140 + v143 StaticLibrary false - v141 + v143 true StaticLibrary false - v140 + v143 StaticLibrary false - v141 + v143 true StaticLibrary false - v140 + v143 true StaticLibrary false - v141 + v143 StaticLibrary false - v140 + v143 StaticLibrary false - v141 + v143 true @@ -144,7 +144,7 @@ Disabled WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - true + false Default MultiThreadedDebugDLL $(ProjectDir)$(Platform)\$(Configuration)\ @@ -154,7 +154,7 @@ true EditAndContinue CompileAsC - false + true _DEBUG;%(PreprocessorDefinitions) diff --git a/objs/.gitignore b/objs/.gitignore deleted file mode 100644 index 35ecd6def..000000000 --- a/objs/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -#All folders -SRB2.res -depend.dep -depend.ped -*.o -#VC9 folder only -/VC9/Win32 -/VC9/x64 diff --git a/objs/FreeBSD/SDL/Debug/.gitignore b/objs/FreeBSD/SDL/Debug/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/FreeBSD/SDL/Debug/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/FreeBSD/SDL/Release/.gitignore b/objs/FreeBSD/SDL/Release/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/FreeBSD/SDL/Release/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/Linux/SDL/Debug/.gitignore b/objs/Linux/SDL/Debug/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/Linux/SDL/Debug/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/Linux/SDL/Release/.gitignore b/objs/Linux/SDL/Release/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/Linux/SDL/Release/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/Linux64/SDL/Debug/.gitignore b/objs/Linux64/SDL/Debug/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/Linux64/SDL/Debug/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/Linux64/SDL/Release/.gitignore b/objs/Linux64/SDL/Release/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/Linux64/SDL/Release/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/MasterClient/.gitignore b/objs/MasterClient/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/MasterClient/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/MasterServer/.gitignore b/objs/MasterServer/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/MasterServer/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/Mingw/Debug/.gitignore b/objs/Mingw/Debug/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/Mingw/Debug/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/Mingw/Release/.gitignore b/objs/Mingw/Release/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/Mingw/Release/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/Mingw/SDL/Debug/.gitignore b/objs/Mingw/SDL/Debug/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/Mingw/SDL/Debug/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/Mingw/SDL/Release/.gitignore b/objs/Mingw/SDL/Release/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/Mingw/SDL/Release/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/Mingw64/Debug/.gitignore b/objs/Mingw64/Debug/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/Mingw64/Debug/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/Mingw64/Release/.gitignore b/objs/Mingw64/Release/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/Mingw64/Release/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/Mingw64/SDL/Debug/.gitignore b/objs/Mingw64/SDL/Debug/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/Mingw64/SDL/Debug/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/Mingw64/SDL/Release/.gitignore b/objs/Mingw64/SDL/Release/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/Mingw64/SDL/Release/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/SDL/Release/.gitignore b/objs/SDL/Release/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/SDL/Release/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/VC/.gitignore b/objs/VC/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/VC/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/VC9/.gitignore b/objs/VC9/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/VC9/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/cygwin/Debug/.gitignore b/objs/cygwin/Debug/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/cygwin/Debug/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/cygwin/Release/.gitignore b/objs/cygwin/Release/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/cygwin/Release/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/dummy/.gitignore b/objs/dummy/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/dummy/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/srb2-vc9.sln b/srb2-vc9.sln deleted file mode 100644 index bbfcf0e77..000000000 --- a/srb2-vc9.sln +++ /dev/null @@ -1,89 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual C++ Express 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Srb2win", "src\win32\Srb2win-vc9.vcproj", "{0F554F1D-ED49-4D65-A9A7-F63C57F277BE}" - ProjectSection(ProjectDependencies) = postProject - {73A5729C-7323-41D4-AB48-8A03C9F81603} = {73A5729C-7323-41D4-AB48-8A03C9F81603} - {72B01ACA-7A1A-4F7B-ACEF-2607299CF052} = {72B01ACA-7A1A-4F7B-ACEF-2607299CF052} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "libs\libpng-src\projects\visualc9\libpng.vcproj", "{72B01ACA-7A1A-4F7B-ACEF-2607299CF052}" - ProjectSection(ProjectDependencies) = postProject - {73A5729C-7323-41D4-AB48-8A03C9F81603} = {73A5729C-7323-41D4-AB48-8A03C9F81603} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "r_opengl", "src\hardware\r_opengl\r_opengl-vc9.vcproj", "{51137D5C-4E81-4955-AACF-EA3092006051}" - ProjectSection(ProjectDependencies) = postProject - {0F554F1D-ED49-4D65-A9A7-F63C57F277BE} = {0F554F1D-ED49-4D65-A9A7-F63C57F277BE} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "libs\zlib\projects\visualc9\zlib.vcproj", "{73A5729C-7323-41D4-AB48-8A03C9F81603}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "s_openal", "src\hardware\s_openal\s_openal-vc9.vcproj", "{E662D0B3-412D-4D55-A5EC-8CBD680DDCBE}" - ProjectSection(ProjectDependencies) = postProject - {0F554F1D-ED49-4D65-A9A7-F63C57F277BE} = {0F554F1D-ED49-4D65-A9A7-F63C57F277BE} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Srb2SDL", "src\sdl\Srb2SDL-vc9.vcproj", "{61BA7D3C-F77D-4D31-B718-1177FE482CF2}" - ProjectSection(ProjectDependencies) = postProject - {73A5729C-7323-41D4-AB48-8A03C9F81603} = {73A5729C-7323-41D4-AB48-8A03C9F81603} - {72B01ACA-7A1A-4F7B-ACEF-2607299CF052} = {72B01ACA-7A1A-4F7B-ACEF-2607299CF052} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0F554F1D-ED49-4D65-A9A7-F63C57F277BE}.Debug|Win32.ActiveCfg = Debug|Win32 - {0F554F1D-ED49-4D65-A9A7-F63C57F277BE}.Debug|Win32.Build.0 = Debug|Win32 - {0F554F1D-ED49-4D65-A9A7-F63C57F277BE}.Debug|x64.ActiveCfg = Debug|x64 - {0F554F1D-ED49-4D65-A9A7-F63C57F277BE}.Debug|x64.Build.0 = Debug|x64 - {0F554F1D-ED49-4D65-A9A7-F63C57F277BE}.Release|Win32.ActiveCfg = Release|Win32 - {0F554F1D-ED49-4D65-A9A7-F63C57F277BE}.Release|Win32.Build.0 = Release|Win32 - {0F554F1D-ED49-4D65-A9A7-F63C57F277BE}.Release|x64.ActiveCfg = Release|x64 - {0F554F1D-ED49-4D65-A9A7-F63C57F277BE}.Release|x64.Build.0 = Release|x64 - {72B01ACA-7A1A-4F7B-ACEF-2607299CF052}.Debug|Win32.ActiveCfg = Debug|Win32 - {72B01ACA-7A1A-4F7B-ACEF-2607299CF052}.Debug|Win32.Build.0 = Debug|Win32 - {72B01ACA-7A1A-4F7B-ACEF-2607299CF052}.Debug|x64.ActiveCfg = Debug|x64 - {72B01ACA-7A1A-4F7B-ACEF-2607299CF052}.Debug|x64.Build.0 = Debug|x64 - {72B01ACA-7A1A-4F7B-ACEF-2607299CF052}.Release|Win32.ActiveCfg = Release|Win32 - {72B01ACA-7A1A-4F7B-ACEF-2607299CF052}.Release|Win32.Build.0 = Release|Win32 - {72B01ACA-7A1A-4F7B-ACEF-2607299CF052}.Release|x64.ActiveCfg = Release|x64 - {72B01ACA-7A1A-4F7B-ACEF-2607299CF052}.Release|x64.Build.0 = Release|x64 - {51137D5C-4E81-4955-AACF-EA3092006051}.Debug|Win32.ActiveCfg = Debug|Win32 - {51137D5C-4E81-4955-AACF-EA3092006051}.Debug|Win32.Build.0 = Debug|Win32 - {51137D5C-4E81-4955-AACF-EA3092006051}.Debug|x64.ActiveCfg = Debug|x64 - {51137D5C-4E81-4955-AACF-EA3092006051}.Debug|x64.Build.0 = Debug|x64 - {51137D5C-4E81-4955-AACF-EA3092006051}.Release|Win32.ActiveCfg = Release|Win32 - {51137D5C-4E81-4955-AACF-EA3092006051}.Release|Win32.Build.0 = Release|Win32 - {51137D5C-4E81-4955-AACF-EA3092006051}.Release|x64.ActiveCfg = Release|x64 - {51137D5C-4E81-4955-AACF-EA3092006051}.Release|x64.Build.0 = Release|x64 - {73A5729C-7323-41D4-AB48-8A03C9F81603}.Debug|Win32.ActiveCfg = Debug|Win32 - {73A5729C-7323-41D4-AB48-8A03C9F81603}.Debug|Win32.Build.0 = Debug|Win32 - {73A5729C-7323-41D4-AB48-8A03C9F81603}.Debug|x64.ActiveCfg = Debug|x64 - {73A5729C-7323-41D4-AB48-8A03C9F81603}.Debug|x64.Build.0 = Debug|x64 - {73A5729C-7323-41D4-AB48-8A03C9F81603}.Release|Win32.ActiveCfg = Release|Win32 - {73A5729C-7323-41D4-AB48-8A03C9F81603}.Release|Win32.Build.0 = Release|Win32 - {73A5729C-7323-41D4-AB48-8A03C9F81603}.Release|x64.ActiveCfg = Release|x64 - {73A5729C-7323-41D4-AB48-8A03C9F81603}.Release|x64.Build.0 = Release|x64 - {E662D0B3-412D-4D55-A5EC-8CBD680DDCBE}.Debug|Win32.ActiveCfg = Debug|Win32 - {E662D0B3-412D-4D55-A5EC-8CBD680DDCBE}.Debug|x64.ActiveCfg = Debug|x64 - {E662D0B3-412D-4D55-A5EC-8CBD680DDCBE}.Release|Win32.ActiveCfg = Release|Win32 - {E662D0B3-412D-4D55-A5EC-8CBD680DDCBE}.Release|x64.ActiveCfg = Release|x64 - {61BA7D3C-F77D-4D31-B718-1177FE482CF2}.Debug|Win32.ActiveCfg = Debug|Win32 - {61BA7D3C-F77D-4D31-B718-1177FE482CF2}.Debug|Win32.Build.0 = Debug|Win32 - {61BA7D3C-F77D-4D31-B718-1177FE482CF2}.Debug|x64.ActiveCfg = Debug|x64 - {61BA7D3C-F77D-4D31-B718-1177FE482CF2}.Debug|x64.Build.0 = Debug|x64 - {61BA7D3C-F77D-4D31-B718-1177FE482CF2}.Release|Win32.ActiveCfg = Release|Win32 - {61BA7D3C-F77D-4D31-B718-1177FE482CF2}.Release|Win32.Build.0 = Release|Win32 - {61BA7D3C-F77D-4D31-B718-1177FE482CF2}.Release|x64.ActiveCfg = Release|x64 - {61BA7D3C-F77D-4D31-B718-1177FE482CF2}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 33898c9a1..2f4467a32 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,559 +1,82 @@ -# SRB2 Core +add_executable(SRB2SDL2 MACOSX_BUNDLE WIN32) + +if("${CMAKE_COMPILER_IS_GNUCC}" AND "${CMAKE_SYSTEM_NAME}" MATCHES "Windows" AND NOT "${SRB2_CONFIG_SYSTEM_LIBRARIES}" AND NOT "${SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES}") + # On MinGW with internal libraries, link the standard library statically + target_link_options(SRB2SDL2 PRIVATE "-static") +endif() # Core sources -set(SRB2_CORE_SOURCES - 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 - dehacked.c - deh_soc.c - deh_lua.c - deh_tables.c - f_finale.c - f_wipe.c - filesrch.c - g_demo.c - g_game.c - g_input.c - hu_stuff.c - i_tcp.c - info.c - lzf.c - m_aatree.c - m_anigif.c - m_argv.c - m_bbox.c - m_cheat.c - m_cond.c - m_easing.c - m_fixed.c - m_menu.c - m_misc.c - m_perfstats.c - m_queue.c - m_random.c - md5.c - mserv.c - http-mserv.c - s_sound.c - screen.c - sounds.c - st_stuff.c - #string.c - tables.c - v_video.c - w_wad.c - y_inter.c - z_zone.c -) +target_sourcefile(c) +target_sources(SRB2SDL2 PRIVATE comptime.c md5.c config.h.in) -set(SRB2_CORE_HEADERS - 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_think.h - d_ticcmd.h - dehacked.h - deh_soc.h - deh_lua.h - deh_tables.h - doomdata.h - doomdef.h - doomstat.h - doomtype.h - endian.h - f_finale.h - fastcmp.h - filesrch.h - g_demo.h - g_game.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_video.h - info.h - keys.h - libdivide.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_easing.h - m_fixed.h - m_menu.h - m_misc.h - m_perfstats.h - m_queue.h - m_random.h - m_swap.h - md5.h - mserv.h - p5prof.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.c - r_data.c - r_draw.c - r_main.c - r_plane.c - r_segs.c - r_skins.c - r_sky.c - r_splats.c - r_things.c - r_textures.c - r_patch.c - r_patchrotation.c - r_picformats.c - r_portal.c - - r_bsp.h - r_data.h - r_defs.h - r_draw.h - r_local.h - r_main.h - r_plane.h - r_segs.h - r_skins.h - r_sky.h - r_splats.h - r_state.h - r_things.h - r_textures.h - r_patch.h - r_patchrotation.h - r_picformats.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.c - 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 - taglist.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 - taglist.h -) - -if(NOT (CMAKE_CXX_COMPILER_ID MATCHES "Clang")) - set(SRB2_CORE_SOURCES ${SRB2_CORE_SOURCES} string.c) -endif() - -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}) - - -set(SRB2_ASM_SOURCES - ${CMAKE_CURRENT_SOURCE_DIR}/vid_copy.s -) - -set(SRB2_NASM_SOURCES - ${CMAKE_CURRENT_SOURCE_DIR}/tmap_mmx.nas - ${CMAKE_CURRENT_SOURCE_DIR}/tmap.nas -) - -if(MSVC) - list(APPEND SRB2_NASM_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/tmap_vc.nas) -endif() - -set(SRB2_NASM_OBJECTS - ${CMAKE_CURRENT_BINARY_DIR}/tmap_mmx.obj - ${CMAKE_CURRENT_BINARY_DIR}/tmap.obj -) - -if(MSVC) - list(APPEND SRB2_NASM_OBJECTS ${CMAKE_CURRENT_BINARY_DIR}/tmap_vc.obj) -endif() - -source_group("Assembly" FILES ${SRB2_ASM_SOURCES} ${SRB2_NASM_SOURCES}) +set(SRB2_ASM_SOURCES vid_copy.s) +set(SRB2_NASM_SOURCES tmap_mmx.nas tmap.nas) ### Configuration -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_CURL ON CACHE BOOL - "Enable curl support.") -set(SRB2_CONFIG_HAVE_THREADS ON CACHE BOOL - "Enable multithreading support.") -if(${CMAKE_SYSTEM} MATCHES Windows) - set(SRB2_CONFIG_HAVE_MIXERX ON CACHE BOOL - "Enable SDL Mixer X support.") -else() - set(SRB2_CONFIG_HAVE_MIXERX OFF) -endif() -set(SRB2_CONFIG_HWRENDER ON CACHE BOOL - "Enable hardware rendering through OpenGL.") set(SRB2_CONFIG_USEASM OFF CACHE BOOL "Enable NASM tmap implementation for software mode speedup.") set(SRB2_CONFIG_YASM OFF CACHE BOOL "Use YASM in place of NASM.") -set(SRB2_CONFIG_STATIC_OPENGL OFF CACHE BOOL - "Use statically linked OpenGL. NOT RECOMMENDED.") +set(SRB2_CONFIG_DEV_BUILD OFF CACHE BOOL + "Compile a development build of SRB2.") -### use internal libraries? -if(${CMAKE_SYSTEM} MATCHES "Windows") ###set on Windows only - set(SRB2_CONFIG_USE_INTERNAL_LIBRARIES OFF CACHE BOOL - "Use SRB2's internal copies of required dependencies (SDL2, PNG, zlib, GME, OpenMPT).") +add_subdirectory(blua) + +# OS macros +if (UNIX) + target_compile_definitions(SRB2SDL2 PRIVATE -DUNIXCOMMON) endif() -set(SRB2_LUA_SOURCES - lua_baselib.c - lua_blockmaplib.c - lua_consolelib.c - lua_hooklib.c - lua_hudlib.c - lua_infolib.c - lua_maplib.c - lua_taglib.c - lua_mathlib.c - lua_mobjlib.c - lua_playerlib.c - lua_polyobjlib.c - lua_script.c - lua_skinlib.c - lua_thinkerlib.c -) -set(SRB2_LUA_HEADERS - lua_hook.h - lua_hud.h - lua_libs.h - lua_script.h -) +if(CMAKE_COMPILER_IS_GNUCC) + find_program(OBJCOPY objcopy) +endif() -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/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}) - -if(${SRB2_CONFIG_HAVE_GME}) - if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES}) - set(GME_FOUND ON) - set(GME_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/gme/include) - if(${SRB2_SYSTEM_BITS} EQUAL 64) - set(GME_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/gme/win64 -lgme") - else() # 32-bit - set(GME_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/gme/win32 -lgme") - endif() - else() - find_package(GME) - endif() - if(${GME_FOUND}) - set(SRB2_HAVE_GME ON) - add_definitions(-DHAVE_LIBGME) - else() - message(WARNING "You have specified that GME is available but it was not found.") +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() -if(${SRB2_CONFIG_HAVE_OPENMPT}) - if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES}) - set(OPENMPT_FOUND ON) - set(OPENMPT_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/libopenmpt/inc) - if(${SRB2_SYSTEM_BITS} EQUAL 64) - set(OPENMPT_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/libopenmpt/lib/x86_64/mingw -lopenmpt") - else() # 32-bit - set(OPENMPT_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/libopenmpt/lib/x86/mingw -lopenmpt") - endif() - else() - find_package(OPENMPT) - endif() - if(${OPENMPT_FOUND}) - set(SRB2_HAVE_OPENMPT ON) - add_definitions(-DHAVE_OPENMPT) - else() - message(WARNING "You have specified that OpenMPT is available but it was not found.") - endif() +if("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin") + target_compile_definitions(SRB2SDL2 PRIVATE -DMACOSX) endif() -if(${SRB2_CONFIG_HAVE_MIXERX}) - if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES}) - set(MIXERX_FOUND ON) - set(MIXERX_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/SDLMixerX/i686-w64-mingw32/include/SDL2) - if(${SRB2_SYSTEM_BITS} EQUAL 64) - set(MIXERX_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/SDLMixerX/x86_64-w64-mingw32/lib -lSDL2_mixer_ext") - else() # 32-bit - set(MIXERX_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/SDLMixerX/i686-w64-mingw32/lib -lSDL2_mixer_ext") - endif() - else() - # No support for non-Windows (yet?) - #find_package(MIXERX) - message(WARNING "SDL Mixer X is not supported as an external library.") - set(MIXERX_FOUND OFF) - endif() - if(${MIXERX_FOUND}) - set(SRB2_HAVE_MIXERX ON) - set(SRB2_SDL2_SOUNDIMPL mixer_sound.c) - add_definitions(-DHAVE_MIXERX) - else() - message(WARNING "You have specified that SDL Mixer X is available but it was not found.") - endif() +target_link_libraries(SRB2SDL2 PRIVATE gme) +target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_GME) +if(NOT "${SRB2_CONFIG_SYSTEM_LIBRARIES}") + # this sucks but gme doesn't use modern cmake to delineate public headers + target_include_directories(SRB2SDL2 PRIVATE "${libgme_SOURCE_DIR}") endif() -if(${SRB2_CONFIG_HAVE_ZLIB}) - if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES}) - set(ZLIB_FOUND ON) - set(ZLIB_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/zlib) - if(${SRB2_SYSTEM_BITS} EQUAL 64) - set(ZLIB_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/zlib/win32 -lz64") - else() # 32-bit - set(ZLIB_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/zlib/win32 -lz32") - endif() - else() - find_package(ZLIB) - endif() - if(${ZLIB_FOUND}) - set(SRB2_HAVE_ZLIB ON) - add_definitions(-DHAVE_ZLIB) - else() - message(WARNING "You have specified that ZLIB is available but it was not found. SRB2 may not compile correctly.") - endif() -endif() +target_link_libraries(SRB2SDL2 PRIVATE openmpt) +target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_OPENMPT) -if(${SRB2_CONFIG_HAVE_PNG} AND ${SRB2_CONFIG_HAVE_ZLIB}) - if (${ZLIB_FOUND}) - if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES}) - set(PNG_FOUND ON) - set(PNG_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/libpng-src) - if(${SRB2_SYSTEM_BITS} EQUAL 64) - set(PNG_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/libpng-src/projects -lpng64") - else() # 32-bit - set(PNG_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/libpng-src/projects -lpng32") - endif() +target_link_libraries(SRB2SDL2 PRIVATE ZLIB::ZLIB PNG::PNG CURL::libcurl) +target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_ZLIB -DHAVE_PNG -DHAVE_CURL -D_LARGEFILE64_SOURCE) +target_sources(SRB2SDL2 PRIVATE apng.c) + +set(SRB2_HAVE_THREADS ON) +target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_THREADS) + +if("${SRB2_CONFIG_HWRENDER}") + target_compile_definitions(SRB2SDL2 PRIVATE -DHWRENDER) + add_subdirectory(hardware) + + if("${SRB2_CONFIG_STATIC_OPENGL}") + find_package(OpenGL) + if(${OPENGL_FOUND}) + target_compile_definitions(SRB2SDL2 PRIVATE -DSTATIC_OPENGL) else() - find_package(PNG) + message(WARNING "You have specified static opengl but opengl was not found. Not setting HWRENDER.") endif() - if(${PNG_FOUND}) - set(SRB2_HAVE_PNG ON) - add_definitions(-DHAVE_PNG) - add_definitions(-D_LARGEFILE64_SOURCE) - set(SRB2_PNG_SOURCES apng.c) - set(SRB2_PNG_HEADERS apng.h) - prepend_sources(SRB2_PNG_SOURCES) - prepend_sources(SRB2_PNG_HEADERS) - source_group("Main" FILES ${SRB2_CORE_SOURCES} ${SRB2_CORE_HEADERS} - ${SRB2_PNG_SOURCES} ${SRB2_PNG_HEADERS}) - else() - message(WARNING "You have specified that PNG is available but it was not found. SRB2 may not compile correctly.") - endif() - endif() -endif() - -if(${SRB2_CONFIG_HAVE_CURL}) - if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES}) - set(CURL_FOUND ON) - set(CURL_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/curl/include) - if(${SRB2_SYSTEM_BITS} EQUAL 64) - set(CURL_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/curl/lib64 -lcurl") - else() # 32-bit - set(CURL_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/curl/lib32 -lcurl") - 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. SRB2 may not compile correctly.") - endif() -endif() - -if(${SRB2_CONFIG_HAVE_THREADS}) - set(SRB2_HAVE_THREADS ON) - set(SRB2_CORE_HEADERS ${SRB2_CORE_HEADERS} ${CMAKE_CURRENT_SOURCE_DIR}/i_threads.h) - add_definitions(-DHAVE_THREADS) -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_bsp.c - ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_cache.c - ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_clip.c - ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_draw.c - ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_light.c - ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_main.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 - ) - - set (SRB2_HWRENDER_HEADERS - ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_batching.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_dll.h - ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_drv.h - ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_glob.h - ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_light.h - ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_main.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_USEASM}) #SRB2_ASM_FLAGS can be used to pass flags to either nasm or yasm. - if(${CMAKE_SYSTEM} MATCHES "Linux") + if("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") set(SRB2_ASM_FLAGS "-DLINUX ${SRB2_ASM_FLAGS}") endif() @@ -566,19 +89,23 @@ if(${SRB2_CONFIG_USEASM}) set(CMAKE_ASM_NASM_FLAGS "${SRB2_ASM_FLAGS}" CACHE STRING "Flags used by the assembler during all build types.") enable_language(ASM_NASM) endif() + set(SRB2_USEASM ON) - add_definitions(-DUSEASM) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse3 -mfpmath=sse") + target_compile_definitions(SRB2SDL2 PRIVATE -DUSEASM) + target_compile_options(SRB2SDL2 PRIVATE -msse3 -mfpmath=sse) + + target_sources(SRB2SDL2 PRIVATE ${SRB2_ASM_SOURCES} + ${SRB2_NASM_SOURCES}) else() set(SRB2_USEASM OFF) - add_definitions(-DNONX86 -DNORUSEASM) + target_compile_definitions(SRB2SDL2 PRIVATE -DNONX86 -DNORUSEASM) endif() # Targets # If using CCACHE, then force it. # https://github.com/Cockatrice/Cockatrice/pull/3052/files -if (${CMAKE_SYSTEM} MATCHES "Darwin") +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") @@ -600,30 +127,205 @@ endif() # Compatibility flag with later versions of GCC # We should really fix our code to not need this if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -mno-ms-bitfields) + if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|x64|amd64|AMD64|em64t|EM64T)") + target_compile_options(SRB2SDL2 PRIVATE -mno-ms-bitfields) + endif() endif() -if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") - set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -Wno-absolute-value) +# Compiler warnings configuration +target_compile_options(SRB2SDL2 PRIVATE + # Using generator expressions to handle per-language compile options + + # C, GNU + # This is a direct translation from versions.mk + $<$,$>: + -Wall + -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 + -Waggregate-return + -Wmissing-prototypes + -Wmissing-declarations + -Wmissing-noreturn + -Wnested-externs + -Winline + -Wformat-y2k + -Wformat-security + + $<$,2.9.5>: + -Wno-div-by-zero + -Wendif-labels + -Wdisabled-optimization + > + + $<$,4.0.0>: + -Wold-style-definition + -Wmissing-field-initializers + > + + $<$,4.1.0>: + -Wshadow + > + + $<$,4.3.0>: + -funit-at-a-time + -Wlogical-op + > + + $<$,4.5.0>: + -Wlogical-op + -Wno-error=array-bounds + > + + $<$,4.6.0>: + -Wno-suggest-attribute=noreturn + -Wno-error=suggest-attribute=noreturn + > + + $<$,5.4.0>: + -Wno-logical-op + -Wno-error=logical-op + > + + $<$,6.1.0>: + -Wno-tautological-compare + -Wno-error=tautological-compare + > + + $<$,7.1.0>: + -Wno-error=format-overflow=2 + -Wimplicit-fallthrough=4 + > + + $<$,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 + > + + $<$,9.1.0>: + -Wno-error=address-of-packed-member + > + > + + # C, Clang and Apple Clang + $<$,$,$>>: + -Wall + -Wno-absolute-value + -Wno-trigraphs + -Wno-error=non-literal-null-conversion + -Wno-error=constant-conversion + -Wno-error=unused-but-set-variable + > + + # C, MSVC + $<$,$>: + # All warnings at and before Visual Studio 2019 RTM + # https://learn.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warnings-by-compiler-version?view=msvc-170 + /Wv:19.20.27004.0 + > + + # C++, GNU, Clang and Apple Clang + $<$,$,$,$>>: + -Wall + > + + # C++, MSVC + $<$,$>: + /Wv:19.20.27004.0 + > +) +if(SRB2_CONFIG_ERRORMODE) + target_compile_options(SRB2SDL2 PRIVATE + $<$,$,$>: + -Werror + > + + $<$: + /WX + > + ) endif() -set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -Wno-trigraphs) +# Link warnings configuration +target_link_options(SRB2SDL2 PRIVATE + $<$: + # -Wl,--as-needed - Was controlled by NOLDWARNING + > +) -add_definitions(-DCMAKECONFIG) +if(${SRB2_CONFIG_DEV_BUILD}) + target_compile_definitions(SRB2SDL2 PRIVATE -DDEVELOP) +endif() +target_compile_definitions(SRB2SDL2 PRIVATE -DCMAKECONFIG) -#add_library(SRB2Core STATIC -# ${SRB2_CORE_SOURCES} -# ${SRB2_CORE_HEADERS} -# ${SRB2_CORE_RENDER_SOURCES} -# ${SRB2_CORE_GAME_SOURCES} -# ${SRB2_LUA_SOURCES} -# ${SRB2_LUA_HEADERS} -# ${SRB2_BLUA_SOURCES} -# ${SRB2_BLUA_HEADERS} -#) +# Misc. build options from Makefiles +if(SRB2_CONFIG_DEBUGMODE) + target_compile_definitions(SRB2SDL2 PRIVATE -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() add_subdirectory(sdl) -if(NOT ${SRB2_SDL2_AVAILABLE}) - message(FATAL_ERROR "There are no targets available to build an SRB2 executable. :(") +# strip debug symbols into separate file when using gcc. +# to be consistent with Makefile, don't generate for OS X. +if((CMAKE_COMPILER_IS_GNUCC) 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 ${OBJCOPY} ${OBJCOPY_ONLY_KEEP_DEBUG} $ $.debug + COMMAND ${OBJCOPY} --strip-debug $ + COMMAND ${OBJCOPY} --add-gnu-debuglink=$.debug $ + ) + 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) + # also copy implicitly linked system libraries + get_filename_component(MINGW_BIN_PATH ${CMAKE_CXX_COMPILER} PATH) + list(APPEND ADDITIONAL_DLLS + "libgcc_s_dw2-1.dll" + "libstdc++-6.dll" + "libwinpthread-1.dll" + ) + list(TRANSFORM ADDITIONAL_DLLS PREPEND "${MINGW_BIN_PATH}/") + endif() + add_custom_command(TARGET SRB2SDL2 POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_if_different + $ + ${ADDITIONAL_DLLS} + + $ + COMMAND_EXPAND_LISTS + COMMENT "Copying runtime DLLs" + ) endif() diff --git a/src/Makefile b/src/Makefile index 61afc1a2e..36b1a7efa 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,823 +1,416 @@ - -# GNU Make makefile for SRB2 -############################################################################# -# Copyright (C) 1998-2000 by DooM Legacy Team. -# Copyright (C) 2003-2021 by Sonic Team Junior. +# GNU Makefile for SRB2 +# the poly3 Makefile adapted over and over... +# +# Copyright 1998-2000 DooM Legacy Team. +# Copyright 2020-2023 James R. +# Copyright 2003-2023 Sonic Team Junior. # # This program is free software distributed under the # terms of the GNU General Public License, version 2. # See the 'LICENSE' file for more details. # -# -DLINUX -> use for the GNU/Linux specific -# -D_WINDOWS -> use for the Win32/DirectX specific -# -DHAVE_SDL -> use for the SDL interface +# Special targets: # -# Sets: -# Compile the SDL/Mingw version with 'make MINGW=1' -# Compile the SDL/Linux version with 'make LINUX=1' -# Compile the SDL/Solaris version with 'make SOLARIS=1' -# Compile the SDL/FreeBSD version with 'gmake FREEBSD=1' -# Compile the SDL/Cygwin version with 'make CYGWIN32=1' -# Compile the SDL/other version try with 'make SDL=1' +# clean - remove executables and objects for this build +# cleandep - remove dependency files for this build +# distclean - remove entire executable, object and +# dependency file directory structure. +# dump - disassemble executable +# info - print settings # -# 'Targets': -# clean -# Remove all object files -# cleandep -# Remove dependency files -# distclean -# Remove autogenerated files -# dll -# compile primary HW render DLL/SO -# all_dll -# compile all HW render and 3D sound DLLs for the set -# opengl_dll -# Pure Mingw only, compile OpenGL HW render DLL -# ds3d_dll -# Pure Mingw only, compile DirectX DirectSound HW sound DLL -# fmod_dll -# Pure Mingw only, compile FMOD HW sound DLL -# openal_dll -# Pure Mingw only, compile OpenAL HW sound DLL -# fmod_so -# Non-Mingw, compile FMOD HW sound SO -# openal_so -# Non-Mingw, compile OpenAL HW sound SO +# This Makefile can automatically detect the host system +# as well as the compiler version. If system or compiler +# version cannot be detected, you may need to set a flag +# manually. # +# On Windows machines, 32-bit Windows is always targetted. # -# Addon: -# To Cross-Compile, CC=gcc-version make * PREFIX= -# Compile with GCC 2.97 version, add 'GCC29=1' -# Compile with GCC 4.0x version, add 'GCC40=1' -# Compile with GCC 4.1x version, add 'GCC41=1' -# Compile with GCC 4.2x version, add 'GCC42=1' -# Compile with GCC 4.3x version, add 'GCC43=1' -# Compile with GCC 4.4x version, add 'GCC44=1' -# Compile with GCC 4.5x version, add 'GCC45=1' -# Compile with GCC 4.6x version, add 'GCC46=1' -# Compile a profile version, add 'PROFILEMODE=1' -# Compile a debug version, add 'DEBUGMODE=1' -# Compile with less warnings, add 'RELAXWARNINGS=1' -# Generate compiler errors for most compiler warnings, add 'ERRORMODE=1' -# Compile without NASM's tmap.nas, add 'NOASM=1' -# Compile without 3D hardware support, add 'NOHW=1' -# Compile with GDBstubs, add 'RDB=1' -# Compile without PNG, add 'NOPNG=1' -# Compile without zlib, add 'NOZLIB=1' +# Platform/system flags: # -# Addon for SDL: -# To Cross-Compile, add 'SDL_CONFIG=/usr/*/bin/sdl-config' -# Compile without SDL_Mixer, add 'NOMIXER=1' -# Compile without SDL_Mixer_X, add 'NOMIXERX=1' (Win32 only) -# Compile without GME, add 'NOGME=1' -# Compile without BSD API, add 'NONET=1' -# Compile without IPX/SPX, add 'NOIPX=1' -# Compile Mingw/SDL with S_DS3S, add 'DS3D=1' -# Compile without libopenmpt, add 'NOOPENMPT=1' -# Compile with S_FMOD3D, add 'FMOD=1' (WIP) -# Compile with S_OPENAL, add 'OPENAL=1' (WIP) -# To link with the whole SDL_Image lib to load Icons, add 'SDL_IMAGE=1' but it isn't not realy needed -# To link with SDLMain to hide console or make on a console-less binary, add 'SDLMAIN=1' +# LINUX=1, LINUX64=1 +# MINGW=1, MINGW64=1 - Windows (MinGW toolchain) +# UNIX=1 - Generic Unix like system +# FREEBSD=1 +# SDL=1 - Use SDL backend. SDL is the only implemented backend though. +# If disabled, a dummy backend will be used. # -############################################################################# +# A list of supported GCC versions can be found in +# Makefile.d/detect.mk -- search 'gcc_versions'. +# +# Feature flags: +# +# Safe to use online +# ------------------ +# NO_IPV6=1 - Disable IPv6 address support. +# NOHW=1 - Disable OpenGL renderer. +# ZDEBUG=1 - Enable more detailed memory debugging +# HAVE_MINIUPNPC=1 - Enable automated port forwarding. +# Already enabled by default for 32-bit +# Windows. +# NOASM=1 - Disable hand optimized assembly code for the +# Software renderer. +# NOPNG=1 - Disable PNG graphics support. (TODO: double +# check netplay compatible.) +# NOCURL=1 - Disable libcurl--HTTP capability. +# NOGME=1 - Disable game music emu, retro VGM support. +# NOOPENMPT=1 - Disable module (tracker) music support. +# NOMIXER=1 - Disable SDL Mixer (audio playback). +# NOMIXERX=1 - Forgo SDL Mixer X--revert to standard SDL +# Mixer. Mixer X is the default for Windows +# builds. +# HAVE_MIXERX=1 - Enable SDL Mixer X. Outside of Windows +# builds, SDL Mixer X is not the default. +# NOTHREADS=1 - Disable multithreading. +# +# Netplay incompatible +# -------------------- +# NONET=1 - Disable online capability. +# NOMD5=1 - Disable MD5 checksum (validation tool). +# NOPOSTPROCESSING=1 - ? +# MOBJCONSISTANCY=1 - ?? +# PACKETDROP=1 - ?? +# DEBUGMODE=1 - Enable various debugging capabilities. +# Also disables optimizations. +# NOZLIB=1 - Disable some compression capability. Implies +# NOPNG=1. +# +# Development flags: +# +# VALGRIND=1 - Enable Valgrind memory debugging support. +# PROFILEMODE=1 - Enable performance profiling (gprof). +# +# General flags for building: +# +# STATIC=1 - Use static linking. +# DISTCC=1 +# CCACHE=1 +# UPX= - UPX command to use for compressing final +# executable. +# WINDOWSHELL=1 - Use Windows commands. +# PREFIX= - Prefix to many commands, for cross compiling. +# YASM=1 - Use Yasm instead of NASM assembler. +# STABS=1 - ? +# ECHO=1 - Print out each command in the build process. +# NOECHOFILENAMES=1 - Don't print out each that is being +# worked on. +# SILENT=1 - Print absolutely nothing except errors. +# RELAXWARNINGS=1 - Use less compiler warnings/errors. +# ERRORMODE=1 - Treat most compiler warnings as errors. +# NOCASTALIGNWARN=1 - ? +# NOLDWARNING=1 - ? +# NOSDLMAIN=1 - ? +# SDLMAIN=1 - ? +# +# Library configuration flags: +# Everything here is an override. +# +# PNG_PKGCONFIG= - libpng-config command. +# PNG_CFLAGS=, PNG_LDFLAGS= +# +# CURLCONFIG= - curl-config command. +# CURL_CFLAGS=, CURL_LDFLAGS= +# +# VALGRIND_PKGCONFIG= - pkg-config package name. +# VALGRIND_CFLAGS=, VALGRIND_LDFLAGS= +# +# LIBGME_PKGCONFIG=, LIBGME_CFLAGS=, LIBGME_LDFLAGS= -,=, +# LIBOPENMPT_PKGCONFIG= +# LIBOPENMPT_CFLAGS=, LIBOPENMPT_LDFLAGS= +# +# ZLIB_PKGCONFIG=, ZLIB_CFLAGS=, ZLIB_LDFLAGS= +# +# SDL_PKGCONFIG= +# SDL_CONFIG= - sdl-config command. +# SDL_CFLAGS=, SDL_LDFLAGS= -ifeq (,$(filter-out cleandep clean distclean,$(or $(MAKECMDGOALS),all))) -CLEANONLY=1 -else ifndef SILENT -echo=@echo "$(1)" -ifndef MAKE_RESTARTS -print=$(info $(1)) -endif +clean_targets=cleandep clean distclean info + +.PHONY : $(clean_targets) all + +goals:=$(or $(MAKECMDGOALS),all) +cleanonly:=$(filter $(clean_targets),$(goals)) +destructive:=$(filter-out info,$(cleanonly)) + +ifndef cleanonly +include Makefile.d/old.mk endif -ALL_SYSTEMS=\ - PANDORA\ - LINUX64\ - MINGW64\ - HAIKU\ - DUMMY\ - MINGW\ - UNIX\ - LINUX\ - SOLARIS\ - FREEBSD\ - MACOSX\ - SDL\ +include Makefile.d/util.mk -# check for user specified system -ifeq (,$(filter $(ALL_SYSTEMS),$(.VARIABLES))) -ifeq ($(OS),Windows_NT) # all windows are Windows_NT... - - $(call print,Detected a Windows system$(,) compiling for 32-bit MinGW SDL2...) - - # go for a 32-bit sdl mingw exe by default - MINGW=1 - WINDOWSHELL=1 - -else # if you on the *nix - - system:=$(shell uname -s) - - ifeq ($(system),Linux) - new_system=LINUX - else - - $(error \ - Could not automatically detect your system,\ - try specifying a system manually) - - endif - - ifeq ($(shell getconf LONG_BIT),64) - system+=64-bit - new_system:=$(new_system)64 - endif - - $(call print,Detected $(system) ($(new_system))...) - $(new_system)=1 - -endif -endif - - -# SRB2 data files -D_DIR?=../bin/Resources -D_FILES=$(D_DIR)/srb2.pk3 \ - $(D_DIR)/player.dta \ - $(D_DIR)/zones.pk3 \ - $(D_DIR)/music.dta \ - -PKG_CONFIG?=pkg-config - -ifdef PANDORA -LINUX=1 -endif - -ifdef LINUX64 -LINUX=1 -NONX86=1 -# LINUX64 does not imply X86_64=1; could mean ARM64 or Itanium -endif - -ifdef MINGW64 -MINGW=1 -NONX86=1 -NOASM=1 -# MINGW64 should not necessarily imply X86_64=1, but we make that assumption elsewhere -# Once that changes, remove this -X86_64=1 -endif #ifdef MINGW64 - -ifdef HAIKU -SDL=1 -endif - -include Makefile.cfg - -ifdef DUMMY -NOPNG=1 -NOZLIB=1 -NONET=1 -NOHW=1 -NOASM=1 -NOIPX=1 -EXENAME?=srb2dummy -OBJS=$(OBJDIR)/i_video.o -LIBS=-lm -endif - -ifdef HAIKU -NOIPX=1 -NOASM=1 -ifndef NONET -LIBS=-lnetwork -endif -CFLAGS+=-DUNIXCOMMON -PNG_CFLAGS?= -PNG_LDFLAGS?=-lpng -endif - -ifdef PANDORA -NONX86=1 -NOHW=1 -endif - -ifndef NOOPENMPT -HAVE_OPENMPT=1 -endif - -ifdef MINGW -include win32/Makefile.cfg -endif #ifdef MINGW - -ifdef UNIX -UNIXCOMMON=1 -endif - -ifdef LINUX -UNIXCOMMON=1 -ifndef NOGME -HAVE_LIBGME=1 -endif -endif - -ifdef SOLARIS -UNIXCOMMON=1 -endif - -ifdef FREEBSD -UNIXCOMMON=1 -endif - -ifdef MACOSX -UNIXCOMMON=1 -endif - -ifdef SDL - include sdl/Makefile.cfg -endif #ifdef SDL - -ifdef DISTCC - CC:=distcc $(CC) -endif - -ifdef CCACHE - CC:=ccache $(CC) -endif - -MSGFMT?=msgfmt - -ifdef WINDOWSHELL - COMPTIME=-..\comptime.bat -else - COMPTIME=-../comptime.sh -endif - -ifndef ECHO - NASM:=@$(NASM) - REMOVE:=@$(REMOVE) - CC:=@$(CC) - CXX:=@$(CXX) - OBJCOPY:=@$(OBJCOPY) - OBJDUMP:=@$(OBJDUMP) - STRIP:=@$(STRIP) - WINDRES:=@$(WINDRES) - MKDIR:=@$(MKDIR) - GZIP:=@$(GZIP) - MSGFMT:=@$(MSGFMT) - UPX:=@$(UPX) - UPX_OPTS+=-q - COMPTIME:=@$(COMPTIME) -endif - -ifdef NONET - OPTS+=-DNONET - NOCURL=1 -else -ifdef NO_IPV6 - OPTS+=-DNO_IPV6 -endif -endif - -ifdef NOHW - OPTS+=-DNOHW -else - OPTS+=-DHWRENDER - OBJS+=$(OBJDIR)/hw_bsp.o $(OBJDIR)/hw_draw.o $(OBJDIR)/hw_light.o \ - $(OBJDIR)/hw_main.o $(OBJDIR)/hw_clip.o $(OBJDIR)/hw_md2.o $(OBJDIR)/hw_cache.o \ - $(OBJDIR)/hw_md2load.o $(OBJDIR)/hw_md3load.o $(OBJDIR)/hw_model.o $(OBJDIR)/u_list.o $(OBJDIR)/hw_batching.o -endif - -OPTS += -DCOMPVERSION - -ifndef NONX86 -ifndef GCC29 - ARCHOPTS?=-msse3 -mfpmath=sse -else - ARCHOPTS?=-mpentium -endif -else -ifdef X86_64 - ARCHOPTS?=-march=nocona -endif -endif - -ifndef NOASM -ifndef NONX86 - OBJS+=$(OBJDIR)/tmap.o $(OBJDIR)/tmap_mmx.o - OPTS+=-DUSEASM -endif -endif - -ifndef NOPNG -OPTS+=-DHAVE_PNG - -ifdef PNG_PKGCONFIG -PNG_CFLAGS?=$(shell $(PKG_CONFIG) $(PNG_PKGCONFIG) --cflags) -PNG_LDFLAGS?=$(shell $(PKG_CONFIG) $(PNG_PKGCONFIG) --libs) -else ifdef PREFIX -PNG_CONFIG?=$(PREFIX)-libpng-config +CC:=$(PREFIX)-gcc +endif + +OBJDUMP_OPTS?=--wide --source --line-numbers + +OBJCOPY:=$(call Prefix,objcopy) +OBJDUMP:=$(call Prefix,objdump) +WINDRES:=$(call Prefix,windres) + +ifdef YASM +NASM?=yasm else -PNG_CONFIG?=libpng-config +NASM?=nasm endif -ifdef PNG_STATIC -PNG_CFLAGS?=$(shell $(PNG_CONFIG) --static --cflags) -PNG_LDFLAGS?=$(shell $(PNG_CONFIG) --static --ldflags) -else -PNG_CFLAGS?=$(shell $(PNG_CONFIG) --cflags) -PNG_LDFLAGS?=$(shell $(PNG_CONFIG) --ldflags) -endif -endif - -ifdef LINUX -PNG_CFLAGS+=-D_LARGEFILE64_SOURCE -endif - -LIBS+=$(PNG_LDFLAGS) -CFLAGS+=$(PNG_CFLAGS) - -OBJS+=$(OBJDIR)/apng.o -endif - -ifdef HAVE_LIBGME -OPTS+=-DHAVE_LIBGME - -LIBGME_PKGCONFIG?=libgme -LIBGME_CFLAGS?=$(shell $(PKG_CONFIG) $(LIBGME_PKGCONFIG) --cflags) -LIBGME_LDFLAGS?=$(shell $(PKG_CONFIG) $(LIBGME_PKGCONFIG) --libs) - -LIBS+=$(LIBGME_LDFLAGS) -CFLAGS+=$(LIBGME_CFLAGS) -endif - -ifdef HAVE_OPENMPT -OPTS+=-DHAVE_OPENMPT - -LIBOPENMPT_PKGCONFIG?=libopenmpt -LIBOPENMPT_CFLAGS?=$(shell $(PKG_CONFIG) $(LIBOPENMPT_PKGCONFIG) --cflags) -LIBOPENMPT_LDFLAGS?=$(shell $(PKG_CONFIG) $(LIBOPENMPT_PKGCONFIG) --libs) - -LIBS+=$(LIBOPENMPT_LDFLAGS) -CFLAGS+=$(LIBOPENMPT_CFLAGS) -endif - -ifndef NOZLIB -OPTS+=-DHAVE_ZLIB -ZLIB_PKGCONFIG?=zlib -ZLIB_CFLAGS?=$(shell $(PKG_CONFIG) $(ZLIB_PKGCONFIG) --cflags) -ZLIB_LDFLAGS?=$(shell $(PKG_CONFIG) $(ZLIB_PKGCONFIG) --libs) - -LIBS+=$(ZLIB_LDFLAGS) -CFLAGS+=$(ZLIB_CFLAGS) -else -NOPNG=1 -endif - -ifndef NOCURL -OPTS+=-DHAVE_CURL -CURLCONFIG?=curl-config -CURL_CFLAGS?=$(shell $(CURLCONFIG) --cflags) -CURL_LDFLAGS?=$(shell $(CURLCONFIG) --libs) - -LIBS+=$(CURL_LDFLAGS) -CFLAGS+=$(CURL_CFLAGS) -endif - -ifdef STATIC -LIBS:=-static $(LIBS) -endif - -ifdef HAVE_MINIUPNPC -ifdef NONET -HAVE_MINIUPNPC='' -else -LIBS+=-lminiupnpc -ifdef MINGW -LIBS+=-lws2_32 -liphlpapi -endif -CFLAGS+=-DHAVE_MINIUPNPC -endif -endif - -include blua/Makefile.cfg - -ifdef NOMD5 - OPTS+=-DNOMD5 -else - OBJS:=$(OBJDIR)/md5.o $(OBJS) -endif - -ifdef NOPOSTPROCESSING - OPTS+=-DNOPOSTPROCESSING -endif - - OPTS:=-fno-exceptions $(OPTS) - -ifdef MOBJCONSISTANCY - OPTS+=-DMOBJCONSISTANCY -endif - -ifdef PACKETDROP - OPTS+=-DPACKETDROP -endif - -ifdef DEBUGMODE - - # build with debugging information - WINDRESFLAGS = -D_DEBUG -ifdef GCC48 - CFLAGS+=-Og -else - CFLAGS+=-O0 -endif - CFLAGS+= -Wall -DPARANOIA -DRANGECHECK -DPACKETDROP -else - - - # build a normal optimised version - WINDRESFLAGS = -DNDEBUG - CFLAGS+=-O3 -endif - CFLAGS+=-g $(OPTS) $(ARCHOPTS) $(WINDRESFLAGS) - ifdef YASM ifdef STABS - NASMOPTS?= -g stabs +NASMOPTS?=-g stabs else - NASMOPTS?= -g dwarf2 +NASMOPTS?=-g dwarf2 endif else - NASMOPTS?= -g +NASMOPTS?=-g endif -ifdef PROFILEMODE - # build with profiling information - CFLAGS+=-pg - LDFLAGS+=-pg +GZIP?=gzip +GZIP_OPTS?=-9 -f -n +ifdef WINDOWSHELL +GZIP_OPTS+=--rsyncable endif -ifdef ZDEBUG - CPPFLAGS+=-DZDEBUG +UPX_OPTS?=--best --preserve-build-id +ifndef ECHO +UPX_OPTS+=-qq endif -OPTS+=$(CPPFLAGS) +include Makefile.d/detect.mk -# default EXENAME if all else fails +# make would try to remove the implicitly made directories +.PRECIOUS : %/ comptime.c + +sources:= +makedir:=../make + +# -DCOMPVERSION: flag to use comptime.h +opts:=-DCOMPVERSION -g +libs:= + +nasm_format:= + +# This is a list of variables names, of which if defined, +# also defines the name as a macro to the compiler. +passthru_opts:= + +include Makefile.d/platform.mk +include Makefile.d/features.mk +include Makefile.d/versions.mk + +ifdef DEBUGMODE +makedir:=$(makedir)/debug +endif + +depdir:=$(makedir)/deps +objdir:=$(makedir)/objs + +# very sophisticated dependency +sources+=\ + $(call List,Sourcefile)\ + $(call List,blua/Sourcefile)\ + +depends:=$(basename $(filter %.c %.s,$(sources))) +objects:=$(basename $(filter %.c %.s %.nas,$(sources))) + +depends:=$(depends:%=$(depdir)/%.d) + +# comptime.o added directly to objects instead of thru +# sources because comptime.c includes comptime.h, but +# comptime.h may not exist yet. It's a headache so this is +# easier. +objects:=$(objects:=.o) comptime.o + +# windows resource file +rc_file:=$(basename $(filter %.rc,$(sources))) +ifdef rc_file +objects+=$(rc_file:=.res) +endif + +objects:=$(addprefix $(objdir)/,$(objects)) + +ifdef DEBUGMODE +bin:=../bin/debug +else +bin:=../bin +endif + +# default EXENAME (usually set by platform) EXENAME?=srb2 DBGNAME?=$(EXENAME).debug -# $(OBJDIR)/dstrings.o \ +exe:=$(bin)/$(EXENAME) +dbg:=$(bin)/$(DBGNAME) -# not too sophisticated dependency -OBJS:=$(i_main_o) \ - $(OBJDIR)/string.o \ - $(OBJDIR)/d_main.o \ - $(OBJDIR)/d_clisrv.o \ - $(OBJDIR)/d_net.o \ - $(OBJDIR)/d_netfil.o \ - $(OBJDIR)/d_netcmd.o \ - $(OBJDIR)/dehacked.o \ - $(OBJDIR)/deh_soc.o \ - $(OBJDIR)/deh_lua.o \ - $(OBJDIR)/deh_tables.o \ - $(OBJDIR)/z_zone.o \ - $(OBJDIR)/f_finale.o \ - $(OBJDIR)/f_wipe.o \ - $(OBJDIR)/g_demo.o \ - $(OBJDIR)/g_game.o \ - $(OBJDIR)/g_input.o \ - $(OBJDIR)/am_map.o \ - $(OBJDIR)/command.o \ - $(OBJDIR)/console.o \ - $(OBJDIR)/hu_stuff.o \ - $(OBJDIR)/y_inter.o \ - $(OBJDIR)/st_stuff.o \ - $(OBJDIR)/m_aatree.o \ - $(OBJDIR)/m_anigif.o \ - $(OBJDIR)/m_argv.o \ - $(OBJDIR)/m_bbox.o \ - $(OBJDIR)/m_cheat.o \ - $(OBJDIR)/m_cond.o \ - $(OBJDIR)/m_easing.o \ - $(OBJDIR)/m_fixed.o \ - $(OBJDIR)/m_menu.o \ - $(OBJDIR)/m_misc.o \ - $(OBJDIR)/m_perfstats.o \ - $(OBJDIR)/m_random.o \ - $(OBJDIR)/m_queue.o \ - $(OBJDIR)/info.o \ - $(OBJDIR)/p_ceilng.o \ - $(OBJDIR)/p_enemy.o \ - $(OBJDIR)/p_floor.o \ - $(OBJDIR)/p_inter.o \ - $(OBJDIR)/p_lights.o \ - $(OBJDIR)/p_map.o \ - $(OBJDIR)/p_maputl.o \ - $(OBJDIR)/p_mobj.o \ - $(OBJDIR)/p_polyobj.o\ - $(OBJDIR)/p_saveg.o \ - $(OBJDIR)/p_setup.o \ - $(OBJDIR)/p_sight.o \ - $(OBJDIR)/p_spec.o \ - $(OBJDIR)/p_telept.o \ - $(OBJDIR)/p_tick.o \ - $(OBJDIR)/p_user.o \ - $(OBJDIR)/p_slopes.o \ - $(OBJDIR)/tables.o \ - $(OBJDIR)/r_bsp.o \ - $(OBJDIR)/r_data.o \ - $(OBJDIR)/r_draw.o \ - $(OBJDIR)/r_main.o \ - $(OBJDIR)/r_plane.o \ - $(OBJDIR)/r_segs.o \ - $(OBJDIR)/r_skins.o \ - $(OBJDIR)/r_sky.o \ - $(OBJDIR)/r_splats.o \ - $(OBJDIR)/r_things.o \ - $(OBJDIR)/r_textures.o \ - $(OBJDIR)/r_patch.o \ - $(OBJDIR)/r_patchrotation.o \ - $(OBJDIR)/r_picformats.o \ - $(OBJDIR)/r_portal.o \ - $(OBJDIR)/nodebuilder.o \ - $(OBJDIR)/screen.o \ - $(OBJDIR)/taglist.o \ - $(OBJDIR)/v_video.o \ - $(OBJDIR)/s_sound.o \ - $(OBJDIR)/sounds.o \ - $(OBJDIR)/w_wad.o \ - $(OBJDIR)/filesrch.o \ - $(OBJDIR)/mserv.o \ - $(OBJDIR)/http-mserv.o\ - $(OBJDIR)/i_tcp.o \ - $(OBJDIR)/lzf.o \ - $(OBJDIR)/vid_copy.o \ - $(OBJDIR)/b_bot.o \ - $(i_net_o) \ - $(i_system_o) \ - $(i_sound_o) \ - $(OBJS) +build_done==== Build is done, look for \ + $( $@ + $(.)$(GZIP) $(GZIP_OPTS) $@ -ifdef SDL -all: $(BIN)/$(EXENAME) -endif - -ifdef DUMMY -all: $(BIN)/$(EXENAME) -endif - -cleandep: - $(REMOVE) $(DEPS) - $(REMOVE) comptime.h - -clean: - $(REMOVE) *~ *.flc - $(REMOVE) $(OBJDIR)/*.o - -distclean: clean cleandep - -ifdef MINGW - $(REMOVE) $(OBJDIR)/*.res -endif - -ifdef CYGWIN32 - $(REMOVE) $(OBJDIR)/*.res -endif - -#make a big srb2.s that is the disasm of the exe (dos only ?) -asm: - $(CC) $(LDFLAGS) $(OBJS) -o $(OBJDIR)/tmp.exe $(LIBS) - $(OBJDUMP) -d $(OBJDIR)/tmp.exe --no-show-raw-insn > srb2.s - $(REMOVE) $(OBJDIR)/tmp.exe - -# executable -$(BIN)/$(EXENAME): $(POS) $(OBJS) - -$(MKDIR) $(BIN) - $(call echo,Linking $(EXENAME)...) - $(LD) $(LDFLAGS) $(OBJS) -o $(BIN)/$(EXENAME) $(LIBS) -ifndef VALGRIND -ifndef NOOBJDUMP - $(call echo,Dumping debugging info) - $(OBJDUMP) $(OBJDUMP_OPTS) $(BIN)/$(EXENAME) > $(BIN)/$(DBGNAME).txt +# '::' means run unconditionally +# this really updates comptime.h +comptime.c :: ifdef WINDOWSHELL - -$(GZIP) $(GZIP_OPTS) $(BIN)/$(DBGNAME).txt + -$(.)..\comptime.bat . else - -$(GZIP) $(GZIP_OPT2) $(BIN)/$(DBGNAME).txt -endif + -$(.)../comptime.sh . endif -# mac os x lsdlsrb2 does not like objcopy -ifndef MACOSX - $(OBJCOPY) $(BIN)/$(EXENAME) $(BIN)/$(DBGNAME) - $(OBJCOPY) --strip-debug $(BIN)/$(EXENAME) - -$(OBJCOPY) --add-gnu-debuglink=$(BIN)/$(DBGNAME) $(BIN)/$(EXENAME) -endif -ifndef NOUPX - -$(UPX) $(UPX_OPTS) $(BIN)/$(EXENAME) -endif -endif - $(call echo,Build is done$(,) please look for $(EXENAME) in $(BIN)$(,) (checking for post steps)) +# I wish I could make dependencies out of rc files :( +$(objdir)/win32/Srb2win.res : \ + win32/afxres.h win32/resource.h -reobjdump: - $(call echo,Redumping debugging info) - $(OBJDUMP) $(OBJDUMP_OPTS) $(BIN)/$(DBGNAME) > $(BIN)/$(DBGNAME).txt -ifdef WINDOWSHELL - -$(GZIP) $(GZIP_OPTS) $(BIN)/$(DBGNAME).txt -else - -$(GZIP) $(GZIP_OPT2) $(BIN)/$(DBGNAME).txt -endif - -$(OBJDIR): - -$(MKDIR) $(OBJDIR) - -ifdef SDL -ifdef MINGW -$(OBJDIR)/r_opengl.o: hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h \ - doomdef.h doomtype.h g_state.h m_swap.h hardware/hw_drv.h screen.h \ - command.h hardware/hw_data.h hardware/hw_defs.h \ - hardware/hw_md2.h hardware/hw_glob.h hardware/hw_main.h hardware/hw_clip.h \ - hardware/hw_md2load.h hardware/hw_md3load.h hardware/hw_model.h hardware/u_list.h \ - am_map.h d_event.h d_player.h p_pspr.h m_fixed.h tables.h info.h d_think.h \ - p_mobj.h doomdata.h d_ticcmd.h r_defs.h hardware/hw_dll.h - $(echoName) - $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@ -else -$(OBJDIR)/r_opengl.o: hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h \ - doomdef.h doomtype.h g_state.h m_swap.h hardware/hw_drv.h screen.h \ - command.h hardware/hw_data.h hardware/hw_defs.h \ - hardware/hw_md2.h hardware/hw_glob.h hardware/hw_main.h hardware/hw_clip.h \ - hardware/hw_md2load.h hardware/hw_md3load.h hardware/hw_model.h hardware/u_list.h \ - am_map.h d_event.h d_player.h p_pspr.h m_fixed.h tables.h info.h d_think.h \ - p_mobj.h doomdata.h d_ticcmd.h r_defs.h hardware/hw_dll.h - $(echoName) - $(CC) $(CFLAGS) $(WFLAGS) -I/usr/X11R6/include -c $< -o $@ -endif -endif - -#dependecy made by gcc itself ! -ifndef DUMMY -ifndef CLEANONLY -$(call print,Checking dependency files...) --include $(DEPS) -endif -endif - -undefine deps_rule - -# windows makes it too hard ! +# dependency recipe template +# 1: source file suffix +# 2: extra flags to gcc +define _recipe = +$(depdir)/%.d : %.$(1) | $$$$(@D)/ ifndef WINDOWSHELL -ifdef echoName -define deps_rule = - @printf "%-20.20s\r" $< - -endef +ifdef Echo_name + @printf '%-20.20s\r' $$< endif endif - -define deps_rule += - $(CC) $(CFLAGS) -M -MF $@ -MT $(OBJDIR)/$(<:.c=.o) $< + $(.)$(cc) -MM -MF $$@ -MT $(objdir)/$$*.o $(2) $$< endef -$(DEPDIR)/%.d: %.c - $(deps_rule) +$(eval $(call _recipe,c)) +$(eval $(call _recipe,s,$(asflags))) -$(DEPDIR)/%.d: $(INTERFACE)/%.c - $(deps_rule) +# compiling recipe template +# 1: target file suffix +# 2: source file suffix +# 3: compile command +define _recipe = +$(objdir)/%.$(1) : %.$(2) | $$$$(@D)/ + $(call Echo_name,$$<) + $(.)$(3) +endef -$(DEPDIR)/%.d: hardware/%.c - $(deps_rule) +$(eval $(call _recipe,o,c,$(cc) -c -o $$@ $$<)) +$(eval $(call _recipe,o,nas,$(nasm) -o $$@ $$<)) +$(eval $(call _recipe,o,s,$(cc) $(asflags) -c -o $$@ $$<)) +$(eval $(call _recipe,res,rc,$(windres) -i $$< -o $$@)) -$(DEPDIR)/%.d: blua/%.c - $(deps_rule) +_rm=$(.)$(rmrf) $(call Windows_path,$(1)) -ifdef VALGRIND -$(OBJDIR)/z_zone.o: z_zone.c - $(echoName) - $(CC) $(CFLAGS) $(WFLAGS) -DHAVE_VALGRIND $(VALGRIND_CFLAGS) -c $< -o $@ -endif +cleandep : + $(call _rm,$(depends) comptime.h) -$(OBJDIR)/comptime.o:: -ifdef echoName - @echo -- comptime.c ... -endif - $(COMPTIME) . - $(CC) $(CFLAGS) $(WFLAGS) -c comptime.c -o $@ +clean : + $(call _rm,$(exe) $(dbg) $(dbg).txt $(objects)) -$(BIN)/%.mo: locale/%.po - -$(MKDIR) $(BIN) - $(echoName) - $(MSGFMT) -f -o $@ $< +distclean : + $(call _rm,../bin ../objs ../dep ../make comptime.h) -$(OBJDIR)/%.o: %.c - $(echoName) - $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@ - -$(OBJDIR)/%.o: $(INTERFACE)/%.c - $(echoName) - $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@ - -ifdef MACOSX -$(OBJDIR)/%.o: sdl/macosx/%.c - $(echoName) - $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@ -endif - -$(OBJDIR)/%.o: hardware/%.c - $(echoName) - $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@ - -$(OBJDIR)/%.o: blua/%.c - $(echoName) - $(CC) $(CFLAGS) $(LUA_CFLAGS) $(WFLAGS) -c $< -o $@ - -$(OBJDIR)/%.o: %.nas - $(echoName) - $(NASM) $(NASMOPTS) -o $@ -f $(NASMFORMAT) $< - -$(OBJDIR)/vid_copy.o: vid_copy.s asm_defs.inc - $(echoName) - $(CC) $(OPTS) $(ASFLAGS) -x assembler-with-cpp -c $< -o $@ - -$(OBJDIR)/%.o: %.s - $(echoName) - $(CC) $(OPTS) -x assembler-with-cpp -c $< -o $@ - -$(OBJDIR)/SRB2.res: win32/Srb2win.rc win32/afxres.h win32/resource.h - $(echoName) - $(WINDRES) -i $< -O rc $(WINDRESFLAGS) --include-dir=win32 -o $@ -O coff - - -ifdef SDL - -ifdef MINGW -$(OBJDIR)/win_dbg.o: win32/win_dbg.c - $(echoName) - $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@ -endif - -ifdef STATICHS -$(OBJDIR)/s_openal.o: hardware/s_openal/s_openal.c hardware/hw3dsdrv.h \ - hardware/hw_dll.h - $(echoName) - $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@ - -$(OBJDIR)/s_fmod.o: hardware/s_fmod/s_fmod.c hardware/hw3dsdrv.h \ - hardware/hw_dll.h - $(echoName) - $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@ - -ifdef MINGW -$(OBJDIR)/s_ds3d.o: hardware/s_ds3d/s_ds3d.c hardware/hw3dsdrv.h \ - hardware/hw_dll.h - $(echoName) - $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@ -endif +info: +ifdef WINDOWSHELL + @REM else - -$(OBJDIR)/s_fmod.o: hardware/s_fmod/s_fmod.c hardware/hw3dsdrv.h \ - hardware/hw_dll.h - $(echoName) - $(CC) $(ARCHOPTS) -Os -o $(OBJDIR)/s_fmod.o -DHW3SOUND -DUNIXCOMMON -shared -nostartfiles -c hardware/s_fmod/s_fmod.c - -$(OBJDIR)/s_openal.o: hardware/s_openal/s_openal.c hardware/hw3dsdrv.h \ - hardware/hw_dll.h - $(echoName) - $(CC) $(ARCHOPTS) -Os -o $(OBJDIR)/s_openal.o -DHW3SOUND -DUNIXCOMMON -shared -nostartfiles -c hardware/s_openal/s_openal.c + @: endif -endif - -############################################################# -# -############################################################# diff --git a/src/Makefile.cfg b/src/Makefile.cfg deleted file mode 100644 index 90dce0073..000000000 --- a/src/Makefile.cfg +++ /dev/null @@ -1,478 +0,0 @@ -# vim: ft=make -# -# Makefile.cfg for SRB2 -# - -# -# GNU compiler & tools' flags -# and other things -# - -# See the following variable don't start with 'GCC'. This is -# to avoid a false positive with the version detection... - -SUPPORTED_GCC_VERSIONS:=\ - 101 102\ - 91 92 93\ - 81 82 83 84\ - 71 72 73 74 75\ - 61 62 63 64\ - 51 52 53 54 55\ - 40 41 42 43 44 45 46 47 48 49 - -LATEST_GCC_VERSION=10.2 - -# gcc or g++ -ifdef PREFIX - CC=$(PREFIX)-gcc - CXX=$(PREFIX)-g++ - OBJCOPY=$(PREFIX)-objcopy - OBJDUMP=$(PREFIX)-objdump - STRIP=$(PREFIX)-strip - WINDRES=$(PREFIX)-windres -else - OBJCOPY=objcopy - OBJDUMP=objdump - STRIP=strip - WINDRES=windres -endif - -# because Apple screws with us on this -# need to get bintools from homebrew -ifdef MACOSX - CC=clang - CXX=clang - OBJCOPY=gobjcopy - OBJDUMP=gobjdump -endif - -# Automatically set version flag, but not if one was manually set -# And don't bother if this is a clean only run -ifeq (,$(filter GCC% CLEANONLY,$(.VARIABLES))) - version:=$(shell $(CC) --version) - # check if this is in fact GCC - ifneq (,$(or $(findstring gcc,$(version)),$(findstring GCC,$(version)))) - version:=$(shell $(CC) -dumpversion) - - # Turn version into words of major, minor - v:=$(subst ., ,$(version)) - # concat. major minor - v:=$(word 1,$(v))$(word 2,$(v)) - - # If this version is not in the list, default to the latest supported - ifeq (,$(filter $(v),$(SUPPORTED_GCC_VERSIONS))) - define line = - Your compiler version, GCC $(version), is not supported by the Makefile. - The Makefile will assume GCC $(LATEST_GCC_VERSION).)) - endef - $(call print,$(line)) - GCC$(subst .,,$(LATEST_GCC_VERSION))=1 - else - $(call print,Detected GCC $(version) (GCC$(v))) - GCC$(v)=1 - endif - endif -endif - -ifdef GCC102 -GCC101=1 -endif - -ifdef GCC101 -GCC93=1 -endif - -ifdef GCC93 -GCC92=1 -endif - -ifdef GCC92 -GCC91=1 -endif - -ifdef GCC91 -GCC84=1 -endif - -ifdef GCC84 -GCC83=1 -endif - -ifdef GCC83 -GCC82=1 -endif - -ifdef GCC82 -GCC81=1 -endif - -ifdef GCC81 -GCC75=1 -endif - -ifdef GCC75 -GCC74=1 -endif - -ifdef GCC74 -GCC73=1 -endif - -ifdef GCC73 -GCC72=1 -endif - -ifdef GCC72 -GCC71=1 -endif - -ifdef GCC71 -GCC64=1 -endif - -ifdef GCC64 -GCC63=1 -endif - -ifdef GCC63 -GCC62=1 -endif - -ifdef GCC62 -GCC61=1 -endif - -ifdef GCC61 -GCC55=1 -endif - -ifdef GCC55 -GCC54=1 -endif - -ifdef GCC54 -GCC53=1 -endif - -ifdef GCC53 -GCC52=1 -endif - -ifdef GCC52 -GCC51=1 -endif - -ifdef GCC51 -GCC49=1 -endif - -ifdef GCC49 -GCC48=1 -endif - -ifdef GCC48 -GCC47=1 -endif - -ifdef GCC47 -GCC46=1 -endif - -ifdef GCC46 -GCC45=1 -endif - -ifdef GCC45 -GCC44=1 -endif - -ifdef GCC44 -GCC43=1 -endif - -ifdef GCC43 -GCC42=1 -endif - -ifdef GCC42 -GCC41=1 -endif - -ifdef GCC41 -GCC40=1 -VCHELP=1 -endif - -ifdef GCC295 -GCC29=1 -endif - -OLDWFLAGS:=$(WFLAGS) -# -W -Wno-unused -WFLAGS=-Wall -Wno-trigraphs -ifndef GCC295 -#WFLAGS+=-Wno-packed -endif -ifndef RELAXWARNINGS - WFLAGS+=-W -#WFLAGS+=-Wno-sign-compare -ifndef GCC295 - WFLAGS+=-Wno-div-by-zero -endif -#WFLAGS+=-Wsystem-headers -WFLAGS+=-Wfloat-equal -#WFLAGS+=-Wtraditional -ifdef VCHELP - WFLAGS+=-Wdeclaration-after-statement - WFLAGS+=-Wno-error=declaration-after-statement -endif - WFLAGS+=-Wundef -ifndef GCC295 - WFLAGS+=-Wendif-labels -endif -ifdef GCC41 - WFLAGS+=-Wshadow -endif -#WFLAGS+=-Wlarger-than-%len% - WFLAGS+=-Wpointer-arith -Wbad-function-cast -ifdef GCC45 -#WFLAGS+=-Wc++-compat -endif - WFLAGS+=-Wcast-qual -ifndef NOCASTALIGNWARN - WFLAGS+=-Wcast-align -endif - WFLAGS+=-Wwrite-strings -ifndef ERRORMODE -#WFLAGS+=-Wconversion -ifdef GCC43 - #WFLAGS+=-Wno-sign-conversion -endif -endif - WFLAGS+=-Wsign-compare -ifdef GCC91 - WFLAGS+=-Wno-error=address-of-packed-member -endif -ifdef GCC45 - WFLAGS+=-Wlogical-op -endif - WFLAGS+=-Waggregate-return -ifdef HAIKU -ifdef GCC41 - #WFLAGS+=-Wno-attributes -endif -endif -#WFLAGS+=-Wstrict-prototypes -ifdef GCC40 - WFLAGS+=-Wold-style-definition -endif - WFLAGS+=-Wmissing-prototypes -Wmissing-declarations -ifdef GCC40 - WFLAGS+=-Wmissing-field-initializers -endif - WFLAGS+=-Wmissing-noreturn -#WFLAGS+=-Wmissing-format-attribute -#WFLAGS+=-Wno-multichar -#WFLAGS+=-Wno-deprecated-declarations -#WFLAGS+=-Wpacked -#WFLAGS+=-Wpadded -#WFLAGS+=-Wredundant-decls - WFLAGS+=-Wnested-externs -#WFLAGS+=-Wunreachable-code - WFLAGS+=-Winline -ifdef GCC43 - WFLAGS+=-funit-at-a-time - WFLAGS+=-Wlogical-op -endif -ifndef GCC295 - WFLAGS+=-Wdisabled-optimization -endif -endif -WFLAGS+=-Wformat-y2k -ifdef GCC71 -WFLAGS+=-Wno-error=format-overflow=2 -endif -WFLAGS+=-Wformat-security -ifndef GCC29 -#WFLAGS+=-Winit-self -endif -ifdef GCC46 -WFLAGS+=-Wno-suggest-attribute=noreturn -endif - -ifdef NOLDWARNING -LDFLAGS+=-Wl,--as-needed -endif - -ifdef ERRORMODE -WFLAGS+=-Werror -endif - -WFLAGS+=$(OLDWFLAGS) - -ifdef GCC43 - #WFLAGS+=-Wno-error=clobbered -endif -ifdef GCC44 - WFLAGS+=-Wno-error=array-bounds -endif -ifdef GCC46 - WFLAGS+=-Wno-error=suggest-attribute=noreturn -endif -ifdef GCC54 - WFLAGS+=-Wno-logical-op -Wno-error=logical-op -endif -ifdef GCC61 - WFLAGS+=-Wno-tautological-compare -Wno-error=tautological-compare -endif -ifdef GCC71 - WFLAGS+=-Wimplicit-fallthrough=4 -endif -ifdef GCC81 - WFLAGS+=-Wno-error=format-overflow - WFLAGS+=-Wno-error=stringop-truncation - WFLAGS+=-Wno-error=stringop-overflow - WFLAGS+=-Wno-format-overflow - WFLAGS+=-Wno-stringop-truncation - WFLAGS+=-Wno-stringop-overflow - WFLAGS+=-Wno-error=multistatement-macros -endif - - -#indicate platform and what interface use with -ifndef LINUX -ifndef FREEBSD -ifndef CYGWIN32 -ifndef MINGW -ifndef MINGW64 -ifndef SDL -ifndef DUMMY -$(error No interface or platform flag defined) -endif -endif -endif -endif -endif -endif -endif - -#determine the interface directory (where you put all i_*.c) -i_net_o=$(OBJDIR)/i_net.o -i_system_o=$(OBJDIR)/i_system.o -i_sound_o=$(OBJDIR)/i_sound.o -i_main_o=$(OBJDIR)/i_main.o -#set OBJDIR and BIN's starting place -OBJDIR=../objs -BIN=../bin -DEPDIR=../dep -#Nasm ASM and rm -ifdef YASM -NASM?=yasm -else -NASM?=nasm -endif -REMOVE?=rm -f -MKDIR?=mkdir -p -GZIP?=gzip -GZIP_OPTS?=-9 -f -n -GZIP_OPT2=$(GZIP_OPTS) --rsyncable -UPX?=upx -UPX_OPTS?=--best --preserve-build-id -ifndef ECHO -UPX_OPTS+=-q -endif - -#Interface Setup -ifdef DUMMY - INTERFACE=dummy - OBJDIR:=$(OBJDIR)/dummy - BIN:=$(BIN)/dummy - DEPDIR:=$(DEPDIR)/dummy -else -ifdef LINUX - NASMFORMAT=elf -DLINUX - SDL=1 -ifdef LINUX64 - OBJDIR:=$(OBJDIR)/Linux64 - BIN:=$(BIN)/Linux64 - DEPDIR:=$(DEPDIR)/Linux64 -else - OBJDIR:=$(OBJDIR)/Linux - BIN:=$(BIN)/Linux - DEPDIR:=$(DEPDIR)/Linux -endif -else -ifdef FREEBSD - INTERFACE=sdl - NASMFORMAT=elf -DLINUX - SDL=1 - - OBJDIR:=$(OBJDIR)/FreeBSD - BIN:=$(BIN)/FreeBSD - DEPDIR:=$(DEPDIR)/Linux -else -ifdef SOLARIS - INTERFACE=sdl - NASMFORMAT=elf -DLINUX - SDL=1 - - OBJDIR:=$(OBJDIR)/Solaris - BIN:=$(BIN)/Solaris - DEPDIR:=$(DEPDIR)/Solaris -else -ifdef CYGWIN32 - INTERFACE=sdl - NASMFORMAT=win32 - SDL=1 - - OBJDIR:=$(OBJDIR)/cygwin - BIN:=$(BIN)/Cygwin - DEPDIR:=$(DEPDIR)/Cygwin -else -ifdef MINGW64 - #NASMFORMAT=win64 - SDL=1 - OBJDIR:=$(OBJDIR)/Mingw64 - BIN:=$(BIN)/Mingw64 - DEPDIR:=$(DEPDIR)/Mingw64 -else -ifdef MINGW - NASMFORMAT=win32 - SDL=1 - OBJDIR:=$(OBJDIR)/Mingw - BIN:=$(BIN)/Mingw - DEPDIR:=$(DEPDIR)/Mingw -endif -endif -endif -endif -endif -endif -endif - -ifdef ARCHNAME - OBJDIR:=$(OBJDIR)/$(ARCHNAME) - BIN:=$(BIN)/$(ARCHNAME) - DEPDIR:=$(DEPDIR)/$(ARCHNAME) -endif - -OBJDUMP_OPTS?=--wide --source --line-numbers -LD=$(CC) - -ifdef SDL - INTERFACE=sdl - OBJDIR:=$(OBJDIR)/SDL - DEPDIR:=$(DEPDIR)/SDL -endif - -ifndef DUMMY -ifdef DEBUGMODE - OBJDIR:=$(OBJDIR)/Debug - BIN:=$(BIN)/Debug - DEPDIR:=$(DEPDIR)/Debug -else - OBJDIR:=$(OBJDIR)/Release - BIN:=$(BIN)/Release - DEPDIR:=$(DEPDIR)/Release -endif -endif diff --git a/src/Makefile.d/detect.mk b/src/Makefile.d/detect.mk new file mode 100644 index 000000000..aca498721 --- /dev/null +++ b/src/Makefile.d/detect.mk @@ -0,0 +1,106 @@ +# +# Detect the host system and compiler version. +# + +# Previously featured:\ + PANDORA\ + HAIKU\ + DUMMY\ + DJGPPDOS\ + SOLARIS\ + MACOSX\ + +all_systems:=\ + LINUX64\ + MINGW64\ + MINGW\ + UNIX\ + LINUX\ + FREEBSD\ + +# check for user specified system +ifeq (,$(filter $(all_systems),$(.VARIABLES))) +ifeq ($(OS),Windows_NT) # all windows are Windows_NT... + +_m=Detected a Windows system,\ + compiling for 32-bit MinGW SDL...) +$(call Print,$(_m)) + +# go for a 32-bit sdl mingw exe by default +MINGW:=1 + +else # if you on the *nix + +system:=$(shell uname -s) + +ifeq ($(system),Linux) +new_system:=LINUX +else + +$(error \ + Could not automatically detect your system,\ + try specifying a system manually) + +endif + +ifeq ($(shell getconf LONG_BIT),64) +system+=64-bit +new_system:=$(new_system)64 +endif + +$(call Print,Detected $(system) ($(new_system))...) +$(new_system):=1 + +endif +endif + +# This must have high to low order. +gcc_versions:=\ + 102 101\ + 93 92 91\ + 84 83 82 81\ + 75 74 73 72 71\ + 64 63 62 61\ + 55 54 53 52 51\ + 49 48 47 46 45 44 43 42 41 40 + +latest_gcc_version:=10.2 + +# Automatically set version flag, but not if one was +# manually set. And don't bother if this is a clean only +# run. +ifeq (,$(call Wildvar,GCC% destructive)) + +# can't use $(CC) --version here since that uses argv[0] to display the name +# also gcc outputs the information to stderr, so I had to do 2>&1 +# this program really doesn't like identifying itself +version:=$(shell $(CC) -v 2>&1) + +# check if this is in fact GCC +ifneq (,$(findstring gcc version,$(version))) + +# in stark contrast to the name, gcc will give me a nicely formatted version number for free +version:=$(shell $(CC) -dumpfullversion) + +# Turn version into words of major, minor +v:=$(subst ., ,$(version)) +# concat. major minor +v:=$(word 1,$(v))$(word 2,$(v)) + +# If this version is not in the list, +# default to the latest supported +ifeq (,$(filter $(v),$(gcc_versions))) +define line = +Your compiler version, GCC $(version), \ +is not supported by the Makefile. +The Makefile will assume GCC $(latest_gcc_version). +endef +$(call Print,$(line)) +GCC$(subst .,,$(latest_gcc_version)):=1 +else +$(call Print,Detected GCC $(version) (GCC$(v))) +GCC$(v):=1 +endif + +endif +endif diff --git a/src/Makefile.d/dummy.mk b/src/Makefile.d/dummy.mk new file mode 100644 index 000000000..6908de84a --- /dev/null +++ b/src/Makefile.d/dummy.mk @@ -0,0 +1,5 @@ +makedir:=$(makedir)/Dummy + +sources+=$(call List,dummy/Sourcefile) + +NOHW=1 diff --git a/src/Makefile.d/features.mk b/src/Makefile.d/features.mk new file mode 100644 index 000000000..8ba33383b --- /dev/null +++ b/src/Makefile.d/features.mk @@ -0,0 +1,75 @@ +# +# Makefile for feature flags. +# + +passthru_opts+=\ + NONET NO_IPV6 NOHW NOMD5 NOPOSTPROCESSING\ + MOBJCONSISTANCY PACKETDROP ZDEBUG\ + HAVE_MINIUPNPC\ + +# build with debugging information +ifdef DEBUGMODE +PACKETDROP=1 +opts+=-DPARANOIA -DRANGECHECK +endif + +ifndef NOHW +opts+=-DHWRENDER +sources+=$(call List,hardware/Sourcefile) +endif + +ifndef NOASM +ifndef NONX86 +sources+=tmap.nas tmap_mmx.nas +opts+=-DUSEASM +endif +endif + +ifndef NOMD5 +sources+=md5.c +endif + +ifndef NOZLIB +ifndef NOPNG +ifdef PNG_PKGCONFIG +$(eval $(call Use_pkg_config,PNG_PKGCONFIG)) +else +PNG_CONFIG?=$(call Prefix,libpng-config) +$(eval $(call Configure,PNG,$(PNG_CONFIG) \ + $(if $(PNG_STATIC),--static),,--ldflags)) +endif +ifdef LINUX +opts+=-D_LARGEFILE64_SOURCE +endif +opts+=-DHAVE_PNG +sources+=apng.c +endif +endif + +ifndef NONET +ifndef NOCURL +CURLCONFIG?=curl-config +$(eval $(call Configure,CURL,$(CURLCONFIG))) +opts+=-DHAVE_CURL +endif +endif + +ifdef HAVE_MINIUPNPC +libs+=-lminiupnpc +endif + +# (Valgrind is a memory debugger.) +ifdef VALGRIND +VALGRIND_PKGCONFIG?=valgrind +$(eval $(call Use_pkg_config,VALGRIND)) +ZDEBUG=1 +opts+=-DHAVE_VALGRIND +endif + +default_packages:=\ + GME/libgme/LIBGME\ + OPENMPT/libopenmpt/LIBOPENMPT\ + ZLIB/zlib\ + +$(foreach p,$(default_packages),\ + $(eval $(call Check_pkg_config,$(p)))) diff --git a/src/Makefile.d/nix.mk b/src/Makefile.d/nix.mk new file mode 100644 index 000000000..767b64c12 --- /dev/null +++ b/src/Makefile.d/nix.mk @@ -0,0 +1,42 @@ +# +# Makefile options for unices (linux, bsd...) +# + +EXENAME?=lsdl2srb2 + +opts+=-DUNIXCOMMON -DLUA_USE_POSIX +# Use -rdynamic so a backtrace log shows function names +# instead of addresses +libs+=-lm -rdynamic + +ifndef nasm_format +nasm_format:=elf -DLINUX +endif + +ifndef NOHW +opts+=-I/usr/X11R6/include +libs+=-L/usr/X11R6/lib +endif + +SDL?=1 + +# In common usage. +ifdef LINUX +libs+=-lrt +passthru_opts+=NOTERMIOS +endif + +# Tested by Steel, as of release 2.2.8. +ifdef FREEBSD +opts+=-I/usr/X11R6/include -DLINUX -DFREEBSD +libs+=-L/usr/X11R6/lib -lipx -lkvm +endif + +# FIXME: UNTESTED +#ifdef SOLARIS +#NOIPX=1 +#NOASM=1 +#opts+=-I/usr/local/include -I/opt/sfw/include \ +# -DSOLARIS -DINADDR_NONE=INADDR_ANY -DBSD_COMP +#libs+=-L/opt/sfw/lib -lsocket -lnsl +#endif diff --git a/src/Makefile.d/old.mk b/src/Makefile.d/old.mk new file mode 100644 index 000000000..ec9b6d776 --- /dev/null +++ b/src/Makefile.d/old.mk @@ -0,0 +1,16 @@ +# +# Warn about old build directories and offer to purge. +# + +_old:=$(wildcard $(addprefix ../bin/,FreeBSD Linux \ + Linux64 Mingw Mingw64 SDL dummy) ../objs ../dep) + +ifdef _old +$(foreach v,$(_old),$(info $(abspath $(v)))) +$(info ) +$(info These directories are no longer\ + required and should be removed.) +$(info You may remove them manually or\ + by using 'make distclean') +$(error ) +endif diff --git a/src/Makefile.d/platform.mk b/src/Makefile.d/platform.mk new file mode 100644 index 000000000..c5ac71a20 --- /dev/null +++ b/src/Makefile.d/platform.mk @@ -0,0 +1,71 @@ +# +# Platform specific options. +# + +PKG_CONFIG?=pkg-config + +ifdef WINDOWSHELL +rmrf=-2>NUL DEL /S /Q +mkdir=-2>NUL MD +cat=TYPE +else +rmrf=rm -rf +mkdir=mkdir -p +cat=cat +endif + +ifdef LINUX64 +LINUX=1 +endif + +ifdef MINGW64 +MINGW=1 +endif + +ifdef LINUX +UNIX=1 +ifdef LINUX64 +NONX86=1 +# LINUX64 does not imply X86_64=1; +# could mean ARM64 or Itanium +platform=linux/64 +else +platform=linux +endif +else ifdef FREEBSD +UNIX=1 +platform=freebsd +else ifdef SOLARIS # FIXME: UNTESTED +UNIX=1 +platform=solaris +else ifdef CYGWIN32 # FIXME: UNTESTED +nasm_format=win32 +platform=cygwin +else ifdef MINGW +ifdef MINGW64 +NONX86=1 +NOASM=1 +# MINGW64 should not necessarily imply X86_64=1, +# but we make that assumption elsewhere +# Once that changes, remove this +X86_64=1 +platform=mingw/64 +else +platform=mingw +endif +include Makefile.d/win32.mk +endif + +ifdef platform +makedir:=$(makedir)/$(platform) +endif + +ifdef UNIX +include Makefile.d/nix.mk +endif + +ifeq ($(SDL), 1) +include Makefile.d/sdl.mk +else +include Makefile.d/dummy.mk +endif diff --git a/src/Makefile.d/sdl.mk b/src/Makefile.d/sdl.mk new file mode 100644 index 000000000..99ca624e6 --- /dev/null +++ b/src/Makefile.d/sdl.mk @@ -0,0 +1,79 @@ +# +# Makefile options for SDL2 backend. +# + +# +# SDL...., *looks at Alam*, THIS IS A MESS! +# +# ...a little bird flexes its muscles... +# + +makedir:=$(makedir)/SDL + +sources+=$(call List,sdl/Sourcefile) +opts+=-DDIRECTFULLSCREEN -DHAVE_SDL + +# FIXME: UNTESTED +#ifdef PANDORA +#include sdl/SRB2Pandora/Makefile.cfg +#endif #ifdef PANDORA + +# FIXME: UNTESTED +#ifdef CYGWIN32 +#include sdl/MakeCYG.cfg +#endif #ifdef CYGWIN32 + +ifndef NOHW +sources+=sdl/ogl_sdl.c +endif + +ifdef NOMIXER +sources+=sdl/sdl_sound.c +else +opts+=-DHAVE_MIXER +sources+=sdl/mixer_sound.c + + ifdef HAVE_MIXERX + opts+=-DHAVE_MIXERX + libs+=-lSDL2_mixer_ext + else + libs+=-lSDL2_mixer + endif +endif + +ifndef NOTHREADS +opts+=-DHAVE_THREADS +sources+=sdl/i_threads.c +endif + +ifdef SDL_PKGCONFIG +$(eval $(call Use_pkg_config,SDL)) +else +SDL_CONFIG?=$(call Prefix,sdl2-config) +SDL_CFLAGS?=$(shell $(SDL_CONFIG) --cflags) +SDL_LDFLAGS?=$(shell $(SDL_CONFIG) \ + $(if $(STATIC),--static-libs,--libs)) +$(eval $(call Propogate_flags,SDL)) +endif + +# use the x86 asm code +ifndef CYGWIN32 +ifndef NOASM +USEASM=1 +endif +endif + +ifdef MINGW +ifndef NOSDLMAIN +SDLMAIN=1 +endif +endif + +ifdef SDLMAIN +opts+=-DSDLMAIN +else +ifdef MINGW +opts+=-Umain +libs+=-mconsole +endif +endif diff --git a/src/Makefile.d/util.mk b/src/Makefile.d/util.mk new file mode 100644 index 000000000..bda68df13 --- /dev/null +++ b/src/Makefile.d/util.mk @@ -0,0 +1,93 @@ +# +# Utility macros for the rest of the Makefiles. +# + +Ifnot=$(if $(1),$(3),$(2)) +Ifndef=$(call Ifnot,$($(1)),$(2),$(3)) + +# Match and expand a list of variables by pattern. +Wildvar=$(foreach v,$(filter $(1),$(.VARIABLES)),$($(v))) + +# Read a list of words from file and prepend each with the +# directory of the file. +_cat=$(shell $(cat) $(call Windows_path,$(1))) +List=$(addprefix $(dir $(1)),$(call _cat,$(1))) + +# Convert path separators to backslash on Windows. +Windows_path=$(if $(WINDOWSHELL),$(subst /,\,$(1)),$(1)) + +define Propogate_flags = +opts+=$$($(1)_CFLAGS) +libs+=$$($(1)_LDFLAGS) +endef + +# Set library's _CFLAGS and _LDFLAGS from some command. +# Automatically propogates the flags too. +# 1: variable prefix (e.g. CURL) +# 2: start of command (e.g. curl-config) +# --- optional ---- +# 3: CFLAGS command arguments, default '--cflags' +# 4: LDFLAGS command arguments, default '--libs' +# 5: common command arguments at the end of command +define Configure = +$(1)_CFLAGS?=$$(shell $(2) $(or $(3),--cflags) $(5)) +$(1)_LDFLAGS?=$$(shell $(2) $(or $(4),--libs) $(5)) +$(call Propogate_flags,$(1)) +endef + +# Configure library with pkg-config. The package name is +# taken from a _PKGCONFIG variable. +# 1: variable prefix +# +# LIBGME_PKGCONFIG=libgme +# $(eval $(call Use_pkg_config,LIBGME)) +define Use_pkg_config = +$(call Configure,$(1),$(PKG_CONFIG),,,$($(1)_PKGCONFIG)) +endef + +# Check disabling flag and configure package in one step +# according to delimited argument. +# (There is only one argument, but it split by slash.) +# 1/: short form library name (uppercase). This is +# prefixed with 'NO' and 'HAVE_'. E.g. NOGME, HAVE_GME +# /2: package name (e.g. libgme) +# /3: variable prefix +# +# The following example would check if NOGME is not +# defined before attempting to define LIBGME_CFLAGS and +# LIBGME_LDFLAGS as with Use_pkg_config. +# +# $(eval $(call Check_pkg_config,GME/libgme/LIBGME)) +define Check_pkg_config = +_p:=$(subst /, ,$(1)) +_v1:=$$(word 1,$$(_p)) +_v2:=$$(or $$(word 3,$$(_p)),$$(_v1)) +ifndef NO$$(_v1) +$$(_v2)_PKGCONFIG?=$$(word 2,$$(_p)) +$$(eval $$(call Use_pkg_config,$$(_v2))) +opts+=-DHAVE_$$(_v1) +endif +endef + +# $(call Prefix,gcc) +Prefix=$(if $(PREFIX),$(PREFIX)-)$(1) + +Echo= +Echo_name= +Print= + +ifndef SILENT +Echo=@echo $(1) +ifndef ECHO +ifndef NOECHOFILENAMES +Echo_name=$(call Echo,-- $(1) ...) +endif +endif +ifndef MAKE_RESTARTS +ifndef destructive +Print=$(info $(1)) +endif +endif +endif + +.=$(call Ifndef,ECHO,@) diff --git a/src/Makefile.d/versions.mk b/src/Makefile.d/versions.mk new file mode 100644 index 000000000..d2877b374 --- /dev/null +++ b/src/Makefile.d/versions.mk @@ -0,0 +1,175 @@ +# +# Flags to put a sock in GCC! +# + +# See the versions list in detect.mk +# This will define all version flags going backward. +# Yes, it's magic. +define _predecessor = +ifdef GCC$(firstword $(1)) +GCC$(lastword $(1)):=1 +endif +endef +_n:=$(words $(gcc_versions)) +$(foreach v,$(join $(wordlist 2,$(_n),- $(gcc_versions)),\ + $(addprefix =,$(wordlist 2,$(_n),$(gcc_versions)))),\ + $(and $(findstring =,$(v)),\ + $(eval $(call _predecessor,$(subst =, ,$(v)))))) + +# -W -Wno-unused +WFLAGS:=-Wall -Wno-trigraphs +ifndef GCC295 +#WFLAGS+=-Wno-packed +endif +ifndef RELAXWARNINGS + WFLAGS+=-W +#WFLAGS+=-Wno-sign-compare +ifndef GCC295 + WFLAGS+=-Wno-div-by-zero +endif +#WFLAGS+=-Wsystem-headers +WFLAGS+=-Wfloat-equal +#WFLAGS+=-Wtraditional + WFLAGS+=-Wundef +ifndef GCC295 + WFLAGS+=-Wendif-labels +endif +ifdef GCC41 + WFLAGS+=-Wshadow +endif +#WFLAGS+=-Wlarger-than-%len% + WFLAGS+=-Wpointer-arith -Wbad-function-cast +ifdef GCC45 +#WFLAGS+=-Wc++-compat +endif + WFLAGS+=-Wcast-qual +ifndef NOCASTALIGNWARN + WFLAGS+=-Wcast-align +endif + WFLAGS+=-Wwrite-strings +ifndef ERRORMODE +#WFLAGS+=-Wconversion +ifdef GCC43 + #WFLAGS+=-Wno-sign-conversion +endif +endif + WFLAGS+=-Wsign-compare +ifdef GCC91 + WFLAGS+=-Wno-error=address-of-packed-member +endif +ifdef GCC45 + WFLAGS+=-Wlogical-op +endif + WFLAGS+=-Waggregate-return +ifdef HAIKU +ifdef GCC41 + #WFLAGS+=-Wno-attributes +endif +endif +#WFLAGS+=-Wstrict-prototypes +ifdef GCC40 + WFLAGS+=-Wold-style-definition +endif + WFLAGS+=-Wmissing-prototypes -Wmissing-declarations +ifdef GCC40 + WFLAGS+=-Wmissing-field-initializers +endif + WFLAGS+=-Wmissing-noreturn +#WFLAGS+=-Wmissing-format-attribute +#WFLAGS+=-Wno-multichar +#WFLAGS+=-Wno-deprecated-declarations +#WFLAGS+=-Wpacked +#WFLAGS+=-Wpadded +#WFLAGS+=-Wredundant-decls + WFLAGS+=-Wnested-externs +#WFLAGS+=-Wunreachable-code + WFLAGS+=-Winline +ifdef GCC43 + WFLAGS+=-funit-at-a-time + WFLAGS+=-Wlogical-op +endif +ifndef GCC295 + WFLAGS+=-Wdisabled-optimization +endif +endif +WFLAGS+=-Wformat-y2k +ifdef GCC71 +WFLAGS+=-Wno-error=format-overflow=2 +endif +WFLAGS+=-Wformat-security +ifndef GCC29 +#WFLAGS+=-Winit-self +endif +ifdef GCC46 +WFLAGS+=-Wno-suggest-attribute=noreturn +endif + +ifdef NOLDWARNING +LDFLAGS+=-Wl,--as-needed +endif + +ifdef ERRORMODE +WFLAGS+=-Werror +endif + +ifdef GCC43 + #WFLAGS+=-Wno-error=clobbered +endif +ifdef GCC44 + WFLAGS+=-Wno-error=array-bounds +endif +ifdef GCC46 + WFLAGS+=-Wno-error=suggest-attribute=noreturn +endif +ifdef GCC54 + WFLAGS+=-Wno-logical-op -Wno-error=logical-op +endif +ifdef GCC61 + WFLAGS+=-Wno-tautological-compare -Wno-error=tautological-compare +endif +ifdef GCC71 + WFLAGS+=-Wimplicit-fallthrough=4 +endif +ifdef GCC81 + WFLAGS+=-Wno-error=format-overflow + WFLAGS+=-Wno-error=stringop-truncation + WFLAGS+=-Wno-error=stringop-overflow + WFLAGS+=-Wno-format-overflow + WFLAGS+=-Wno-stringop-truncation + WFLAGS+=-Wno-stringop-overflow + WFLAGS+=-Wno-error=multistatement-macros +endif + +ifdef NONX86 + ifdef X86_64 # yeah that SEEMS contradictory + opts+=-march=nocona + endif +else + ifndef GCC29 + opts+=-msse3 -mfpmath=sse + else + opts+=-mpentium + endif +endif + +ifdef DEBUGMODE +ifdef GCC48 +opts+=-Og +else +opts+=-O0 +endif +endif + +ifdef VALGRIND +ifdef GCC46 +WFLAGS+=-Wno-error=unused-but-set-variable +WFLAGS+=-Wno-unused-but-set-variable +endif +endif + +# Lua +ifdef GCC43 +ifndef GCC44 +WFLAGS+=-Wno-logical-op +endif +endif diff --git a/src/Makefile.d/win32.mk b/src/Makefile.d/win32.mk new file mode 100644 index 000000000..0e48ed683 --- /dev/null +++ b/src/Makefile.d/win32.mk @@ -0,0 +1,106 @@ +# +# Mingw, if you don't know, that's Win32/Win64 +# + +ifndef MINGW64 +EXENAME?=srb2win.exe +else +EXENAME?=srb2win64.exe +endif + +# disable dynamicbase if under msys2 +ifdef MSYSTEM +libs+=-Wl,--disable-dynamicbase +endif + +sources+=win32/Srb2win.rc +opts+=-DSTDC_HEADERS +libs+=-ladvapi32 -lkernel32 -lmsvcrt -luser32 + +nasm_format:=win32 + +SDL?=1 + +ifndef NOHW +opts+=-DUSE_WGL_SWAP +endif + +ifdef MINGW64 +libs+=-lws2_32 +else +ifdef NO_IPV6 +libs+=-lwsock32 +else +libs+=-lws2_32 +endif +endif + +ifndef NONET +ifndef MINGW64 # miniupnc is broken with MINGW64 +opts+=-I../libs -DSTATIC_MINIUPNPC +libs+=-L../libs/miniupnpc/mingw$(32) -lws2_32 -liphlpapi +endif +endif + +ifndef MINGW64 +32=32 +x86=x86 +i686=i686 +else +32=64 +x86=x86_64 +i686=x86_64 +endif + +mingw:=$(i686)-w64-mingw32 + +define _set = +$(1)_CFLAGS?=$($(1)_opts) +$(1)_LDFLAGS?=$($(1)_libs) +endef + +lib:=../libs/gme +LIBGME_opts:=-I$(lib)/include +LIBGME_libs:=-L$(lib)/win$(32) -lgme +$(eval $(call _set,LIBGME)) + +lib:=../libs/libopenmpt +LIBOPENMPT_opts:=-I$(lib)/inc +LIBOPENMPT_libs:=-L$(lib)/lib/$(x86)/mingw -lopenmpt +$(eval $(call _set,LIBOPENMPT)) + +ifndef NOMIXERX +HAVE_MIXERX=1 +lib:=../libs/SDLMixerX/$(mingw) +else +lib:=../libs/SDL2_mixer/$(mingw) +endif + +ifdef SDL +mixer_opts:=-I$(lib)/include/SDL2 +mixer_libs:=-L$(lib)/lib + +lib:=../libs/SDL2/$(mingw) +SDL_opts:=-I$(lib)/include/SDL2\ + $(mixer_opts) -Dmain=SDL_main +SDL_libs:=-L$(lib)/lib $(mixer_libs)\ + -lmingw32 -lSDL2main -lSDL2 -mwindows +$(eval $(call _set,SDL)) +endif + +lib:=../libs/zlib +ZLIB_opts:=-I$(lib) +ZLIB_libs:=-L$(lib)/win32 -lz$(32) +$(eval $(call _set,ZLIB)) + +ifndef PNG_CONFIG +lib:=../libs/libpng-src +PNG_opts:=-I$(lib) +PNG_libs:=-L$(lib)/projects -lpng$(32) +$(eval $(call _set,PNG)) +endif + +lib:=../libs/curl +CURL_opts:=-I$(lib)/include +CURL_libs:=-L$(lib)/lib$(32) -lcurl +$(eval $(call _set,CURL)) diff --git a/src/Sourcefile b/src/Sourcefile new file mode 100644 index 000000000..1350e2f8e --- /dev/null +++ b/src/Sourcefile @@ -0,0 +1,102 @@ +string.c +d_main.c +d_clisrv.c +d_net.c +d_netfil.c +d_netcmd.c +dehacked.c +deh_soc.c +deh_lua.c +deh_tables.c +z_zone.c +f_finale.c +f_wipe.c +g_demo.c +g_game.c +g_input.c +am_map.c +command.c +console.c +hu_stuff.c +i_time.c +y_inter.c +st_stuff.c +m_aatree.c +m_anigif.c +m_argv.c +m_bbox.c +m_cheat.c +m_cond.c +m_easing.c +m_fixed.c +m_menu.c +m_misc.c +m_perfstats.c +m_random.c +m_queue.c +info.c +p_ceilng.c +p_enemy.c +p_floor.c +p_inter.c +p_lights.c +p_map.c +p_maputl.c +p_mobj.c +p_polyobj.c +p_saveg.c +p_setup.c +p_sight.c +p_spec.c +p_telept.c +p_tick.c +p_user.c +p_slopes.c +tables.c +r_bsp.c +r_data.c +r_draw.c +r_fps.c +r_main.c +r_plane.c +r_segs.c +r_skins.c +r_sky.c +r_splats.c +r_things.c +r_textures.c +r_patch.c +r_patchrotation.c +r_picformats.c +r_portal.c +nodebuilder.c +screen.c +taglist.c +v_video.c +s_sound.c +sounds.c +w_wad.c +filesrch.c +mserv.c +http-mserv.c +i_tcp.c +lzf.c +vid_copy.s +b_bot.c +lua_script.c +lua_baselib.c +lua_mathlib.c +lua_hooklib.c +lua_consolelib.c +lua_infolib.c +lua_mobjlib.c +lua_playerlib.c +lua_skinlib.c +lua_thinkerlib.c +lua_maplib.c +lua_taglib.c +lua_polyobjlib.c +lua_blockmaplib.c +lua_hudlib.c +lua_hudlib_drawlist.c +lua_inputlib.c diff --git a/src/am_map.c b/src/am_map.c index ef0ebb88c..331d1a5e0 100644 --- a/src/am_map.c +++ b/src/am_map.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -458,7 +458,7 @@ boolean AM_Responder(event_t *ev) { if (!automapactive) { - if (ev->type == ev_keydown && ev->data1 == AM_TOGGLEKEY) + if (ev->type == ev_keydown && ev->key == AM_TOGGLEKEY) { //faB: prevent alt-tab in win32 version to activate automap just before // minimizing the app; doesn't do any harm to the DOS version @@ -473,7 +473,7 @@ boolean AM_Responder(event_t *ev) else if (ev->type == ev_keydown) { rc = true; - switch (ev->data1) + switch (ev->key) { case AM_PANRIGHTKEY: // pan right if (!followplayer) @@ -550,7 +550,7 @@ boolean AM_Responder(event_t *ev) else if (ev->type == ev_keyup) { rc = false; - switch (ev->data1) + switch (ev->key) { case AM_PANRIGHTKEY: if (!followplayer) diff --git a/src/am_map.h b/src/am_map.h index 022a7208b..a202bece1 100644 --- a/src/am_map.h +++ b/src/am_map.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/android/i_system.c b/src/android/i_system.c index 752e9f6c6..ff8b88de5 100644 --- a/src/android/i_system.c +++ b/src/android/i_system.c @@ -24,7 +24,7 @@ static INT64 start_time; // as microseconds since the epoch // I should probably return how much memory is remaining // for this process, considering Android's process memory limit. -UINT32 I_GetFreeMem(UINT32 *total) +size_t I_GetFreeMem(size_t *total) { // what the heck? sysinfo() is partially missing in bionic? /* struct sysinfo si; */ @@ -82,13 +82,17 @@ INT64 current_time_in_ps() { return (t.tv_sec * (INT64)1000000) + t.tv_usec; } -tic_t I_GetTime(void) +void I_Sleep(UINT32 ms){} + +precise_t I_GetPreciseTime(void) { - INT64 since_start = current_time_in_ps() - start_time; - return (since_start*TICRATE)/1000000; + return 0; } -void I_Sleep(void){} +UINT64 I_GetPrecisePrecision(void) +{ + return 1000000; +} void I_GetEvent(void){} diff --git a/src/apng.c b/src/apng.c index 36b205c60..11d3ab9f5 100644 --- a/src/apng.c +++ b/src/apng.c @@ -1,5 +1,5 @@ /* -Copyright 2019-2021, James R. +Copyright 2019-2023, James R. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/apng.h b/src/apng.h index 893b523cb..ed30549e2 100644 --- a/src/apng.h +++ b/src/apng.h @@ -1,5 +1,5 @@ /* -Copyright 2019-2021, James R. +Copyright 2019-2023, James R. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/asm_defs.inc b/src/asm_defs.inc index 9074f20f8..48f8da0d8 100644 --- a/src/asm_defs.inc +++ b/src/asm_defs.inc @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/b_bot.c b/src/b_bot.c index 5b4124627..d1465f891 100644 --- a/src/b_bot.c +++ b/src/b_bot.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 2007-2016 by John "JTE" Muniz. -// Copyright (C) 2011-2021 by Sonic Team Junior. +// Copyright (C) 2011-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -17,30 +17,45 @@ #include "p_local.h" #include "b_bot.h" #include "lua_hook.h" +#include "i_system.h" // I_BaseTiccmd -// If you want multiple bots, variables like this will -// have to be stuffed in something accessible through player_t. -static boolean lastForward = false; -static boolean lastBlocked = false; -static boolean blocked = false; - -static boolean jump_last = false; -static boolean spin_last = false; -static UINT8 anxiety = 0; -static boolean panic = false; -static UINT8 flymode = 0; -static boolean spinmode = false; -static boolean thinkfly = false; - -static inline void B_ResetAI(void) +void B_UpdateBotleader(player_t *player) { - jump_last = false; - spin_last = false; - anxiety = 0; - panic = false; - flymode = 0; - spinmode = false; - thinkfly = false; + UINT32 i; + fixed_t dist; + fixed_t neardist = INT32_MAX; + player_t *nearplayer = NULL; + //Find new botleader + for (i = 0; i < MAXPLAYERS; i++) + { + if (players[i].bot || players[i].playerstate != PST_LIVE || players[i].spectator || !players[i].mo) + continue; + + if (!player->botleader) + { + player->botleader = &players[i]; // set default + return; + } + + if (!player->mo) + return; + + //Update best candidate based on nearest distance + dist = R_PointToDist2(player->mo->x, player->mo->y, players[i].mo->x, players[i].mo->y); + if (neardist > dist) + { + neardist = dist; + nearplayer = &players[i]; + } + } + //Set botleader to best candidate (or null if none available) + player->botleader = nearplayer; +} + +static inline void B_ResetAI(botmem_t *mem) +{ + mem->thinkstate = AI_FOLLOW; + mem->catchup_tics = 0; } static void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd) @@ -49,39 +64,47 @@ static void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd) player_t *player = sonic->player, *bot = tails->player; ticcmd_t *pcmd = &player->cmd; - boolean water = tails->eflags & MFE_UNDERWATER; + botmem_t *mem = &bot->botmem; + boolean water = (tails->eflags & MFE_UNDERWATER); SINT8 flip = P_MobjFlip(tails); boolean _2d = (tails->flags2 & MF2_TWOD) || twodlevel; fixed_t scale = tails->scale; + boolean jump_last = (bot->lastbuttons & BT_JUMP); + boolean spin_last = (bot->lastbuttons & BT_SPIN); fixed_t dist = P_AproxDistance(sonic->x - tails->x, sonic->y - tails->y); fixed_t zdist = flip * (sonic->z - tails->z); angle_t ang = sonic->angle; fixed_t pmom = P_AproxDistance(sonic->momx, sonic->momy); fixed_t bmom = P_AproxDistance(tails->momx, tails->momy); - fixed_t followmax = 128 * 8 * scale; // Max follow distance before AI begins to enter "panic" state + fixed_t followmax = 128 * 8 * scale; // Max follow distance before AI begins to enter catchup state fixed_t followthres = 92 * scale; // Distance that AI will try to reach fixed_t followmin = 32 * scale; fixed_t comfortheight = 96 * scale; fixed_t touchdist = 24 * scale; boolean stalled = (bmom < scale >> 1) && dist > followthres; // Helps to see if the AI is having trouble catching up boolean samepos = (sonic->x == tails->x && sonic->y == tails->y); + boolean blocked = bot->blocked; if (!samepos) ang = R_PointToAngle2(tails->x, tails->y, sonic->x, sonic->y); - // We can't follow Sonic if he's not around! - if (!sonic || sonic->health <= 0) + // Lua can handle it! + if (LUA_HookBotAI(sonic, tails, cmd)) return; - // Lua can handle it! - if (LUAh_BotAI(sonic, tails, cmd)) + // We can't follow Sonic if he's not around! + if (!sonic || sonic->health <= 0) + { + mem->thinkstate = AI_STANDBY; return; + } + else if (mem->thinkstate == AI_STANDBY) + mem->thinkstate = AI_FOLLOW; if (tails->player->powers[pw_carry] == CR_MACESPIN || tails->player->powers[pw_carry] == CR_GENERIC) { boolean isrelevant = (sonic->player->powers[pw_carry] == CR_MACESPIN || sonic->player->powers[pw_carry] == CR_GENERIC); - dist = P_AproxDistance(tails->x-sonic->x, tails->y-sonic->y); if (sonic->player->cmd.buttons & BT_JUMP && (sonic->player->pflags & PF_JUMPED) && isrelevant) cmd->buttons |= BT_JUMP; if (isrelevant) @@ -95,7 +118,7 @@ static void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd) return; } - // Adapted from CobaltBW's tails_AI.wad + // Adapted from clairebun's tails_AI.wad // Check water if (water) @@ -103,56 +126,57 @@ static void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd) followmin = 0; followthres = 16*scale; followmax >>= 1; - thinkfly = false; + if (mem->thinkstate == AI_THINKFLY) + mem->thinkstate = AI_FOLLOW; } - // Check anxiety - if (spinmode) + // Update catchup_tics + if (mem->thinkstate == AI_SPINFOLLOW) { - anxiety = 0; - panic = false; + mem->catchup_tics = 0; } else if (dist > followmax || zdist > comfortheight || stalled) { - anxiety = min(anxiety + 2, 70); - if (anxiety >= 70) - panic = true; + mem->catchup_tics = min(mem->catchup_tics + 2, 70); + if (mem->catchup_tics >= 70) + mem->thinkstate = AI_CATCHUP; } else { - anxiety = max(anxiety - 1, 0); - panic = false; + mem->catchup_tics = max(mem->catchup_tics - 1, 0); + if (mem->thinkstate == AI_CATCHUP) + mem->thinkstate = AI_FOLLOW; } // Orientation + // cmd->angleturn won't be relative to player angle, since we're not going through G_BuildTiccmd. if (bot->pflags & (PF_SPINNING|PF_STARTDASH)) { - cmd->angleturn = (sonic->angle - tails->angle) >> 16; // NOT FRACBITS DAMNIT + cmd->angleturn = (sonic->angle) >> 16; // NOT FRACBITS DAMNIT } - else if (flymode == 2) + else if (mem->thinkstate == AI_FLYCARRY) { - cmd->angleturn = sonic->player->cmd.angleturn - (tails->angle >> 16); + cmd->angleturn = sonic->player->cmd.angleturn; } else { - cmd->angleturn = (ang - tails->angle) >> 16; // NOT FRACBITS DAMNIT + cmd->angleturn = (ang) >> 16; // NOT FRACBITS DAMNIT } // ******** // FLY MODE - // spinmode check - if (spinmode || player->exiting) - thinkfly = false; + // exiting check + if (player->exiting && mem->thinkstate == AI_THINKFLY) + mem->thinkstate = AI_FOLLOW; else { // Activate co-op flight - if (thinkfly && player->pflags & PF_JUMPED) + if (mem->thinkstate == AI_THINKFLY && player->pflags & PF_JUMPED) { if (!jump_last) { jump = true; - flymode = 1; - thinkfly = false; + mem->thinkstate = AI_FLYSTANDBY; bot->pflags |= PF_CANCARRY; } } @@ -164,21 +188,21 @@ static void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd) && !(pcmd->forwardmove || pcmd->sidemove || player->dashspeed) && P_IsObjectOnGround(sonic) && P_IsObjectOnGround(tails) && !(player->pflags & PF_STASIS) + && !(player->exiting) && bot->charability == CA_FLY) - thinkfly = true; - else - thinkfly = false; + mem->thinkstate = AI_THINKFLY; + else if (mem->thinkstate == AI_THINKFLY) + mem->thinkstate = AI_FOLLOW; // Set carried state if (player->powers[pw_carry] == CR_PLAYER && sonic->tracer == tails) { - flymode = 2; + mem->thinkstate = AI_FLYCARRY; } // Ready for takeoff - if (flymode == 1) + if (mem->thinkstate == AI_FLYSTANDBY) { - thinkfly = false; if (zdist < -64*scale || (flip * tails->momz) > scale) // Make sure we're not too high up spin = true; else if (!jump_last) @@ -186,10 +210,10 @@ static void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd) // Abort if the player moves away or spins if (dist > followthres || player->dashspeed) - flymode = 0; + mem->thinkstate = AI_FOLLOW; } // Read player inputs while carrying - else if (flymode == 2) + else if (mem->thinkstate == AI_FLYCARRY) { cmd->forwardmove = pcmd->forwardmove; cmd->sidemove = pcmd->sidemove; @@ -203,19 +227,19 @@ static void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd) // End flymode if (player->powers[pw_carry] != CR_PLAYER) { - flymode = 0; + mem->thinkstate = AI_FOLLOW; } } } - if (flymode && P_IsObjectOnGround(tails) && !(pcmd->buttons & BT_JUMP)) - flymode = 0; + if (P_IsObjectOnGround(tails) && !(pcmd->buttons & BT_JUMP) && (mem->thinkstate == AI_FLYSTANDBY || mem->thinkstate == AI_FLYCARRY)) + mem->thinkstate = AI_FOLLOW; // ******** // SPINNING - if (panic || flymode || !(player->pflags & PF_SPINNING) || (player->pflags & PF_JUMPED)) - spinmode = false; - else + if (!(player->pflags & (PF_SPINNING|PF_STARTDASH)) && mem->thinkstate == AI_SPINFOLLOW) + mem->thinkstate = AI_FOLLOW; + else if (mem->thinkstate == AI_FOLLOW || mem->thinkstate == AI_SPINFOLLOW) { if (!_2d) { @@ -224,21 +248,21 @@ static void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd) { if (dist < followthres && dist > touchdist) // Do positioning { - cmd->angleturn = (ang - tails->angle) >> 16; // NOT FRACBITS DAMNIT + cmd->angleturn = (ang) >> 16; // NOT FRACBITS DAMNIT cmd->forwardmove = 50; - spinmode = true; + mem->thinkstate = AI_SPINFOLLOW; } else if (dist < touchdist) { if (!bmom && (!(bot->pflags & PF_SPINNING) || (bot->dashspeed && bot->pflags & PF_SPINNING))) { - cmd->angleturn = (sonic->angle - tails->angle) >> 16; // NOT FRACBITS DAMNIT + cmd->angleturn = (sonic->angle) >> 16; // NOT FRACBITS DAMNIT spin = true; } - spinmode = true; + mem->thinkstate = AI_SPINFOLLOW; } else - spinmode = false; + mem->thinkstate = AI_FOLLOW; } // Spin else if (player->dashspeed == bot->dashspeed && player->pflags & PF_SPINNING) @@ -246,12 +270,12 @@ static void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd) if (bot->pflags & PF_SPINNING || !spin_last) { spin = true; - cmd->angleturn = (sonic->angle - tails->angle) >> 16; // NOT FRACBITS DAMNIT + cmd->angleturn = (sonic->angle) >> 16; // NOT FRACBITS DAMNIT cmd->forwardmove = MAXPLMOVE; - spinmode = true; + mem->thinkstate = AI_SPINFOLLOW; } else - spinmode = false; + mem->thinkstate = AI_FOLLOW; } } // 2D mode @@ -261,17 +285,19 @@ static void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd) && ((bot->pflags & PF_SPINNING) || !spin_last)) { spin = true; - spinmode = true; + mem->thinkstate = AI_SPINFOLLOW; } + else + mem->thinkstate = AI_FOLLOW; } } // ******** // FOLLOW - if (!(flymode || spinmode)) + if (mem->thinkstate == AI_FOLLOW || mem->thinkstate == AI_CATCHUP) { // Too far - if (panic || dist > followthres) + if (mem->thinkstate == AI_CATCHUP || dist > followthres) { if (!_2d) cmd->forwardmove = MAXPLMOVE; @@ -281,7 +307,7 @@ static void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd) cmd->sidemove = -MAXPLMOVE; } // Within threshold - else if (!panic && dist > followmin && abs(zdist) < 192*scale) + else if (dist > followmin && abs(zdist) < 192*scale) { if (!_2d) cmd->forwardmove = FixedHypot(pcmd->forwardmove, pcmd->sidemove); @@ -292,8 +318,7 @@ static void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd) else if (dist < followmin) { // Copy inputs - cmd->angleturn = (sonic->angle - tails->angle) >> 16; // NOT FRACBITS DAMNIT - bot->drawangle = ang; + cmd->angleturn = (sonic->angle) >> 16; // NOT FRACBITS DAMNIT cmd->forwardmove = 8 * pcmd->forwardmove / 10; cmd->sidemove = 8 * pcmd->sidemove / 10; } @@ -301,7 +326,7 @@ static void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd) // ******** // JUMP - if (!(flymode || spinmode)) + if (mem->thinkstate == AI_FOLLOW || mem->thinkstate == AI_CATCHUP || (mem->thinkstate == AI_SPINFOLLOW && player->pflags & PF_JUMPED)) { // Flying catch-up if (bot->pflags & PF_THOKKED) @@ -319,35 +344,36 @@ static void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd) // Start jump else if (!jump_last && !(bot->pflags & PF_JUMPED) //&& !(player->pflags & PF_SPINNING) && ((zdist > 32*scale && player->pflags & PF_JUMPED) // Following - || (zdist > 64*scale && panic) // Vertical catch-up - || (stalled && anxiety > 20 && bot->powers[pw_carry] == CR_NONE) + || (zdist > 64*scale && mem->thinkstate == AI_CATCHUP) // Vertical catch-up + || (stalled && mem->catchup_tics > 20 && bot->powers[pw_carry] == CR_NONE) //|| (bmom < scale>>3 && dist > followthres && !(bot->powers[pw_carry])) // Stopped & not in carry state || (bot->pflags & PF_SPINNING && !(bot->pflags & PF_JUMPED)))) // Spinning jump = true; // Hold jump - else if (bot->pflags & PF_JUMPED && jump_last && tails->momz*flip > 0 && (zdist > 0 || panic)) + else if (bot->pflags & PF_JUMPED && jump_last && tails->momz*flip > 0 && (zdist > 0 || mem->thinkstate == AI_CATCHUP)) jump = true; // Start flying - else if (bot->pflags & PF_JUMPED && panic && !jump_last && bot->charability == CA_FLY) + else if (bot->pflags & PF_JUMPED && mem->thinkstate == AI_CATCHUP && !jump_last && bot->charability == CA_FLY) jump = true; } // ******** // HISTORY - jump_last = jump; - spin_last = spin; + //jump_last = jump; + //spin_last = spin; // Turn the virtual keypresses into ticcmd_t. B_KeysToTiccmd(tails, cmd, forward, backward, left, right, false, false, jump, spin); // Update our status - lastForward = forward; - lastBlocked = blocked; - blocked = false; + mem->lastForward = forward; + mem->lastBlocked = blocked; } void B_BuildTiccmd(player_t *player, ticcmd_t *cmd) { + G_CopyTiccmd(cmd, I_BaseTiccmd(), 1); // empty, or external driver + // Can't build a ticcmd if we aren't spawned... if (!player->mo) return; @@ -363,25 +389,28 @@ void B_BuildTiccmd(player_t *player, ticcmd_t *cmd) CV_SetValue(&cv_analog[1], false); // Let Lua scripts build ticcmds - if (LUAh_BotTiccmd(player, cmd)) + if (LUA_HookTiccmd(player, cmd, HOOK(BotTiccmd))) return; - // We don't have any main character AI, sorry. D: - if (player-players == consoleplayer) + // Make sure we have a valid main character to follow + B_UpdateBotleader(player); + if (!player->botleader) return; - // Basic Tails AI - B_BuildTailsTiccmd(players[consoleplayer].mo, player->mo, cmd); + // Single Player Tails AI + //B_BuildTailsTiccmd(players[consoleplayer].mo, player->mo, cmd); + B_BuildTailsTiccmd(player->botleader->mo, player->mo, cmd); } void B_KeysToTiccmd(mobj_t *mo, ticcmd_t *cmd, boolean forward, boolean backward, boolean left, boolean right, boolean strafeleft, boolean straferight, boolean jump, boolean spin) { + player_t *player = mo->player; // don't try to do stuff if your sonic is in a minecart or something - if (players[consoleplayer].powers[pw_carry] && players[consoleplayer].powers[pw_carry] != CR_PLAYER) + if (player->botleader && player->botleader->powers[pw_carry] && player->botleader->powers[pw_carry] != CR_PLAYER) return; // Turn the virtual keypresses into ticcmd_t. if (twodlevel || mo->flags2 & MF2_TWOD) { - if (players[consoleplayer].climbing + if (player->botleader->climbing || mo->player->pflags & PF_GLIDING) { // Don't mess with bot inputs during these unhandled movement conditions. // The normal AI doesn't use abilities, so custom AI should be sending us exactly what it wants anyway. @@ -447,21 +476,26 @@ void B_KeysToTiccmd(mobj_t *mo, ticcmd_t *cmd, boolean forward, boolean backward void B_MoveBlocked(player_t *player) { (void)player; - blocked = true; + player->blocked = true; } boolean B_CheckRespawn(player_t *player) { - mobj_t *sonic = players[consoleplayer].mo; + mobj_t *sonic; mobj_t *tails = player->mo; + //We don't have a main player to spawn to! + if (!player->botleader) + return false; + + sonic = player->botleader->mo; // We can't follow Sonic if he's not around! if (!sonic || sonic->health <= 0) return false; // B_RespawnBot doesn't do anything if the condition above this isn't met { - UINT8 shouldForce = LUAh_BotRespawn(sonic, tails); + UINT8 shouldForce = LUA_Hook2Mobj(sonic, tails, MOBJ_HOOK(BotRespawn)); if (P_MobjWasRemoved(sonic) || P_MobjWasRemoved(tails)) return (shouldForce == 1); // mobj was removed @@ -505,15 +539,19 @@ void B_RespawnBot(INT32 playernum) { player_t *player = &players[playernum]; fixed_t x,y,z; - mobj_t *sonic = players[consoleplayer].mo; + mobj_t *sonic; mobj_t *tails; + if (!player->botleader) + return; + + sonic = player->botleader->mo; if (!sonic || sonic->health <= 0) return; - B_ResetAI(); + B_ResetAI(&player->botmem); - player->bot = 1; + player->bot = BOT_2PAI; P_SpawnPlayer(playernum); tails = player->mo; @@ -540,13 +578,9 @@ void B_RespawnBot(INT32 playernum) player->powers[pw_spacetime] = sonic->player->powers[pw_spacetime]; player->powers[pw_gravityboots] = sonic->player->powers[pw_gravityboots]; player->powers[pw_nocontrol] = sonic->player->powers[pw_nocontrol]; - player->acceleration = sonic->player->acceleration; - player->accelstart = sonic->player->accelstart; - player->thrustfactor = sonic->player->thrustfactor; - player->normalspeed = sonic->player->normalspeed; player->pflags |= PF_AUTOBRAKE|(sonic->player->pflags & PF_DIRECTIONCHAR); - P_TeleportMove(tails, x, y, z); + P_SetOrigin(tails, x, y, z); if (player->charability == CA_FLY) { P_SetPlayerMobjState(tails, S_PLAY_FLY); @@ -561,26 +595,44 @@ void B_RespawnBot(INT32 playernum) void B_HandleFlightIndicator(player_t *player) { mobj_t *tails = player->mo; + botmem_t *mem = &player->botmem; + boolean shouldExist; if (!tails) return; - if (thinkfly && player->bot == 1 && tails->health) + shouldExist = (mem->thinkstate == AI_THINKFLY) && player->botleader + && player->bot == BOT_2PAI && player->playerstate == PST_LIVE; + + // check whether the indicator doesn't exist + if (P_MobjWasRemoved(tails->hnext)) { - if (!tails->hnext) - { - P_SetTarget(&tails->hnext, P_SpawnMobjFromMobj(tails, 0, 0, 0, MT_OVERLAY)); - if (tails->hnext) - { - P_SetTarget(&tails->hnext->target, tails); - P_SetTarget(&tails->hnext->hprev, tails); - P_SetMobjState(tails->hnext, S_FLIGHTINDICATOR); - } - } + // if it shouldn't exist, everything is fine + if (!shouldExist) + return; + + // otherwise, spawn it + P_SetTarget(&tails->hnext, P_SpawnMobjFromMobj(tails, 0, 0, 0, MT_OVERLAY)); + P_SetTarget(&tails->hnext->target, tails); + P_SetTarget(&tails->hnext->hprev, tails); + P_SetMobjState(tails->hnext, S_FLIGHTINDICATOR); } - else if (tails->hnext && tails->hnext->type == MT_OVERLAY && tails->hnext->state == states+S_FLIGHTINDICATOR) + + // if the mobj isn't a flight indicator, let's not mess with it + if (tails->hnext->type != MT_OVERLAY || (tails->hnext->state != states+S_FLIGHTINDICATOR)) + return; + + // if it shouldn't exist, remove it + if (!shouldExist) { P_RemoveMobj(tails->hnext); P_SetTarget(&tails->hnext, NULL); + return; } + + // otherwise, update its visibility + if (P_IsLocalPlayer(player->botleader)) + tails->hnext->flags2 &= ~MF2_DONTDRAW; + else + tails->hnext->flags2 |= MF2_DONTDRAW; } diff --git a/src/b_bot.h b/src/b_bot.h index 9f55637d1..bbe0829be 100644 --- a/src/b_bot.h +++ b/src/b_bot.h @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 2007-2016 by John "JTE" Muniz. -// Copyright (C) 2012-2021 by Sonic Team Junior. +// Copyright (C) 2012-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -10,6 +10,7 @@ /// \file b_bot.h /// \brief Basic bot handling +void B_UpdateBotleader(player_t *player); void B_BuildTiccmd(player_t *player, ticcmd_t *cmd); void B_KeysToTiccmd(mobj_t *mo, ticcmd_t *cmd, boolean forward, boolean backward, boolean left, boolean right, boolean strafeleft, boolean straferight, boolean jump, boolean spin); boolean B_CheckRespawn(player_t *player); diff --git a/src/blua/CMakeLists.txt b/src/blua/CMakeLists.txt new file mode 100644 index 000000000..4e9c67d2f --- /dev/null +++ b/src/blua/CMakeLists.txt @@ -0,0 +1 @@ +target_sourcefile(c) diff --git a/src/blua/Makefile.cfg b/src/blua/Makefile.cfg deleted file mode 100644 index 3a2962e65..000000000 --- a/src/blua/Makefile.cfg +++ /dev/null @@ -1,53 +0,0 @@ -ifdef UNIXCOMMON -LUA_CFLAGS+=-DLUA_USE_POSIX -endif -ifdef LINUX -LUA_CFLAGS+=-DLUA_USE_POSIX -endif -ifdef GCC43 -ifndef GCC44 -WFLAGS+=-Wno-logical-op -endif -endif - -OBJS:=$(OBJS) \ - $(OBJDIR)/lapi.o \ - $(OBJDIR)/lbaselib.o \ - $(OBJDIR)/ldo.o \ - $(OBJDIR)/lfunc.o \ - $(OBJDIR)/linit.o \ - $(OBJDIR)/liolib.o \ - $(OBJDIR)/llex.o \ - $(OBJDIR)/lmem.o \ - $(OBJDIR)/lobject.o \ - $(OBJDIR)/lstate.o \ - $(OBJDIR)/lstrlib.o \ - $(OBJDIR)/ltablib.o \ - $(OBJDIR)/lundump.o \ - $(OBJDIR)/lzio.o \ - $(OBJDIR)/lauxlib.o \ - $(OBJDIR)/lcode.o \ - $(OBJDIR)/ldebug.o \ - $(OBJDIR)/ldump.o \ - $(OBJDIR)/lgc.o \ - $(OBJDIR)/lopcodes.o \ - $(OBJDIR)/lparser.o \ - $(OBJDIR)/lstring.o \ - $(OBJDIR)/ltable.o \ - $(OBJDIR)/ltm.o \ - $(OBJDIR)/lvm.o \ - $(OBJDIR)/lua_script.o \ - $(OBJDIR)/lua_baselib.o \ - $(OBJDIR)/lua_mathlib.o \ - $(OBJDIR)/lua_hooklib.o \ - $(OBJDIR)/lua_consolelib.o \ - $(OBJDIR)/lua_infolib.o \ - $(OBJDIR)/lua_mobjlib.o \ - $(OBJDIR)/lua_playerlib.o \ - $(OBJDIR)/lua_skinlib.o \ - $(OBJDIR)/lua_thinkerlib.o \ - $(OBJDIR)/lua_maplib.o \ - $(OBJDIR)/lua_taglib.o \ - $(OBJDIR)/lua_polyobjlib.o \ - $(OBJDIR)/lua_blockmaplib.o \ - $(OBJDIR)/lua_hudlib.o diff --git a/src/blua/Sourcefile b/src/blua/Sourcefile new file mode 100644 index 000000000..f99c89c8d --- /dev/null +++ b/src/blua/Sourcefile @@ -0,0 +1,25 @@ +lapi.c +lbaselib.c +ldo.c +lfunc.c +linit.c +liolib.c +llex.c +lmem.c +lobject.c +lstate.c +lstrlib.c +ltablib.c +lundump.c +lzio.c +lauxlib.c +lcode.c +ldebug.c +ldump.c +lgc.c +lopcodes.c +lparser.c +lstring.c +ltable.c +ltm.c +lvm.c diff --git a/src/blua/lbaselib.c b/src/blua/lbaselib.c index 644565c28..0fc222038 100644 --- a/src/blua/lbaselib.c +++ b/src/blua/lbaselib.c @@ -274,7 +274,7 @@ static int luaB_dofile (lua_State *L) { UINT16 lumpnum; int n = lua_gettop(L); - if (wadfiles[numwadfiles - 1]->type != RET_PK3) + if (!W_FileHasFolders(wadfiles[numwadfiles - 1])) luaL_error(L, "dofile() only works with PK3 files"); snprintf(fullfilename, sizeof(fullfilename), "Lua/%s", filename); diff --git a/src/blua/ldump.c b/src/blua/ldump.c index c9d3d4870..b69a12729 100644 --- a/src/blua/ldump.c +++ b/src/blua/ldump.c @@ -60,7 +60,7 @@ static void DumpVector(const void* b, int n, size_t size, DumpState* D) static void DumpString(const TString* s, DumpState* D) { - if (s==NULL || getstr(s)==NULL) + if (s==NULL) { size_t size=0; DumpVar(size,D); diff --git a/src/blua/liolib.c b/src/blua/liolib.c index 5eec97fb4..545f9c144 100644 --- a/src/blua/liolib.c +++ b/src/blua/liolib.c @@ -24,12 +24,14 @@ #include "../byteptr.h" #include "../lua_script.h" #include "../m_misc.h" +#include "../i_time.h" #define IO_INPUT 1 #define IO_OUTPUT 2 -#define FILELIMIT (1024 * 1024) // Size limit for reading/writing files +#define MAXBYTESPERMINUTE (10 * 1024 * 1024) // Rate limit for writing files +#define MAXOPENSPERMINUTE 50 // Rate limit for opening new files #define FMT_FILECALLBACKID "file_callback_%d" @@ -46,6 +48,10 @@ static const char *whitelist[] = { }; +static INT64 numwrittenbytes = 0; +static INT64 numopenedfiles = 0; + + static int pushresult (lua_State *L, int i, const char *filename) { int en = errno; /* calls to Lua API may change this value */ if (i) { @@ -252,6 +258,17 @@ static int io_openlocal (lua_State *L) { "Files can't be opened while being downloaded\n", filename); + // Reading not restricted + if (client && (strchr(mode, 'w') || strchr(mode, 'a') || strchr(mode, '+'))) + { + if (numopenedfiles >= (I_GetTime() / (60*TICRATE) + 1) * MAXOPENSPERMINUTE) + I_Error("Access denied to %s\n" + "File opening rate exceeded\n", + filename); + + numopenedfiles++; + } + MakePathDirs(realfilename); // Open and return the file @@ -527,9 +544,12 @@ static int g_write (lua_State *L, FILE *f, int arg) { else { size_t l; const char *s = luaL_checklstring(L, arg, &l); - if (ftell(f) + l > FILELIMIT) { - luaL_error(L,"write limit bypassed in file. Changes have been discarded."); - break; + if (client) { + if (numwrittenbytes + l > (I_GetTime() / (60*TICRATE) + 1) * MAXBYTESPERMINUTE) { + luaL_error(L,"file write rate limit exceeded; changes have been discarded"); + break; + } + numwrittenbytes += l; } status = status && (fwrite(s, sizeof(char), l, f) == l); } @@ -641,4 +661,3 @@ LUALIB_API int luaopen_io (lua_State *L) { lua_pop(L, 1); /* pop environment for default files */ return 1; } - diff --git a/src/blua/ltm.c b/src/blua/ltm.c index 031a2811e..570bded69 100644 --- a/src/blua/ltm.c +++ b/src/blua/ltm.c @@ -31,9 +31,9 @@ void luaT_init (lua_State *L) { static const char *const luaT_eventname[] = { /* ORDER TM */ "__index", "__newindex", "__usedindex", - "__gc", "__mode", "__eq", + "__gc", "__mode", "__len", "__eq", "__add", "__sub", "__mul", "__div", "__mod", - "__pow", "__unm", "__len", "__lt", "__le", + "__pow", "__unm", "__lt", "__le", "__concat", "__call" ,"__strhook" ,"__and", "__or", "__xor", "__shl", "__shr", "__not" diff --git a/src/blua/ltm.h b/src/blua/ltm.h index 3d4ac8c0e..3f2aa4a45 100644 --- a/src/blua/ltm.h +++ b/src/blua/ltm.h @@ -21,6 +21,7 @@ typedef enum { TM_USEDINDEX, TM_GC, TM_MODE, + TM_LEN, TM_EQ, /* last tag method with `fast' access */ TM_ADD, TM_SUB, @@ -29,7 +30,6 @@ typedef enum { TM_MOD, TM_POW, TM_UNM, - TM_LEN, TM_LT, TM_LE, TM_CONCAT, diff --git a/src/blua/lua.h b/src/blua/lua.h index 4e26c2a79..50e520690 100644 --- a/src/blua/lua.h +++ b/src/blua/lua.h @@ -12,6 +12,10 @@ #include #include +#ifdef _MSC_VER +#include +#endif + #include "luaconf.h" diff --git a/src/blua/luaconf.h b/src/blua/luaconf.h index 9e2948f41..223a85703 100644 --- a/src/blua/luaconf.h +++ b/src/blua/luaconf.h @@ -11,9 +11,7 @@ #include #include -#ifdef _MSC_VER -#define INT32 __int32 -#else +#ifndef _MSC_VER #include #define INT32 int32_t #endif @@ -147,7 +145,7 @@ ** CHANGE that if ptrdiff_t is not adequate on your machine. (On most ** machines, ptrdiff_t gives a good choice between int or long.) */ -#define LUA_INTEGER INT32 +#define LUA_INTEGER int32_t /* @@ -509,13 +507,13 @@ */ //#define LUA_NUMBER_DOUBLE -#define LUA_NUMBER INT32 +#define LUA_NUMBER int32_t /* @@ LUAI_UACNUMBER is the result of an 'usual argument conversion' @* over a number. */ -#define LUAI_UACNUMBER INT32 +#define LUAI_UACNUMBER int32_t /* @@ -778,6 +776,4 @@ union luai_Cast { double l_d; long l_l; }; ** without modifying the main part of the file. */ - - #endif diff --git a/src/blua/lvm.c b/src/blua/lvm.c index 46a015c1e..b74fef4ee 100644 --- a/src/blua/lvm.c +++ b/src/blua/lvm.c @@ -311,6 +311,33 @@ void luaV_concat (lua_State *L, int total, int last) { } +static void objlen (lua_State *L, StkId ra, TValue *rb) { + const TValue *tm; + switch (ttype(rb)) { + case LUA_TTABLE: { + Table *h = hvalue(rb); + tm = fasttm(L, h->metatable, TM_LEN); + if (tm) break; /* metamethod? break switch to call it */ + setnvalue(ra, cast_num(luaH_getn(h))); /* else primitive len */ + return; + } + case LUA_TSTRING: { + tm = fasttm(L, G(L)->mt[LUA_TSTRING], TM_LEN); + if (tm) break; /* metamethod? break switch to call it */ + setnvalue(ra, cast_num(tsvalue(rb)->len)); + return; + } + default: { /* try metamethod */ + tm = luaT_gettmbyobj(L, rb, TM_LEN); + if (ttisnil(tm)) /* no metamethod? */ + luaG_typeerror(L, rb, "get length of"); + break; + } + } + callTMres(L, ra, tm, rb, luaO_nilobject); +} + + static void Arith (lua_State *L, StkId ra, TValue *rb, TValue *rc, TMS op) { TValue tempb, tempc; @@ -568,23 +595,7 @@ void luaV_execute (lua_State *L, int nexeccalls) { continue; } case OP_LEN: { - TValue *rb = RB(i); - switch (ttype(rb)) { - case LUA_TTABLE: { - setnvalue(ra, cast_num(luaH_getn(hvalue(rb)))); - break; - } - case LUA_TSTRING: { - setnvalue(ra, cast_num(tsvalue(rb)->len)); - break; - } - default: { /* try metamethod */ - Protect( - if (!call_binTM(L, rb, luaO_nilobject, ra, TM_LEN)) - luaG_typeerror(L, rb, "get length of"); - ) - } - } + Protect(objlen(L, ra, RB(i))); continue; } case OP_CONCAT: { diff --git a/src/byteptr.h b/src/byteptr.h index 4c8414fae..8ab359c4c 100644 --- a/src/byteptr.h +++ b/src/byteptr.h @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -150,26 +150,78 @@ FUNCINLINE static ATTRINLINE UINT32 readulong(void *ptr) #undef DEALIGNED -#define WRITESTRINGN(p,s,n) do { size_t tmp_i = 0; for (; tmp_i < n && s[tmp_i] != '\0'; tmp_i++) WRITECHAR(p, s[tmp_i]); if (tmp_i < n) WRITECHAR(p, '\0');} while (0) -#define WRITESTRING(p,s) do { size_t tmp_i = 0; for (; s[tmp_i] != '\0'; tmp_i++) WRITECHAR(p, s[tmp_i]); WRITECHAR(p, '\0');} while (0) -#define WRITEMEM(p,s,n) do { memcpy(p, s, n); p += n; } while (0) +#define WRITESTRINGN(p, s, n) { \ + size_t tmp_i; \ + \ + for (tmp_i = 0; tmp_i < n && s[tmp_i] != '\0'; tmp_i++) \ + WRITECHAR(p, s[tmp_i]); \ + \ + if (tmp_i < n) \ + WRITECHAR(p, '\0'); \ +} -#define SKIPSTRING(p) while (READCHAR(p) != '\0') +#define WRITESTRINGL(p, s, n) { \ + size_t tmp_i; \ + \ + for (tmp_i = 0; tmp_i < n - 1 && s[tmp_i] != '\0'; tmp_i++) \ + WRITECHAR(p, s[tmp_i]); \ + \ + WRITECHAR(p, '\0'); \ +} -#define READSTRINGN(p,s,n) ({ size_t tmp_i = 0; for (; tmp_i < n && (s[tmp_i] = READCHAR(p)) != '\0'; tmp_i++); s[tmp_i] = '\0';}) -#define READSTRING(p,s) ({ size_t tmp_i = 0; for (; (s[tmp_i] = READCHAR(p)) != '\0'; tmp_i++); s[tmp_i] = '\0';}) -#define READMEM(p,s,n) ({ memcpy(s, p, n); p += n; }) +#define WRITESTRING(p, s) { \ + size_t tmp_i; \ + \ + for (tmp_i = 0; s[tmp_i] != '\0'; tmp_i++) \ + WRITECHAR(p, s[tmp_i]); \ + \ + WRITECHAR(p, '\0'); \ +} -#if 0 // old names -#define WRITEBYTE(p,b) WRITEUINT8(p,b) -#define WRITESHORT(p,b) WRITEINT16(p,b) -#define WRITEUSHORT(p,b) WRITEUINT16(p,b) -#define WRITELONG(p,b) WRITEINT32(p,b) -#define WRITEULONG(p,b) WRITEUINT32(p,b) +#define WRITEMEM(p, s, n) { \ + memcpy(p, s, n); \ + p += n; \ +} -#define READBYTE(p) READUINT8(p) -#define READSHORT(p) READINT16(p) -#define READUSHORT(p) READUINT16(p) -#define READLONG(p) READINT32(p) -#define READULONG(p) READUINT32(p) -#endif +#define SKIPSTRING(p) while (READCHAR(p) != '\0') + +#define SKIPSTRINGN(p, n) { \ + size_t tmp_i = 0; \ + \ + while (tmp_i < n && READCHAR(p) != '\0') \ + tmp_i++; \ +} + +#define SKIPSTRINGL(p, n) SKIPSTRINGN(p, n) + +#define READSTRINGN(p, s, n) { \ + size_t tmp_i = 0; \ + \ + while (tmp_i < n && (s[tmp_i] = READCHAR(p)) != '\0') \ + tmp_i++; \ + \ + s[tmp_i] = '\0'; \ +} + +#define READSTRINGL(p, s, n) { \ + size_t tmp_i = 0; \ + \ + while (tmp_i < n - 1 && (s[tmp_i] = READCHAR(p)) != '\0') \ + tmp_i++; \ + \ + s[tmp_i] = '\0'; \ +} + +#define READSTRING(p, s) { \ + size_t tmp_i = 0; \ + \ + while ((s[tmp_i] = READCHAR(p)) != '\0') \ + tmp_i++; \ + \ + s[tmp_i] = '\0'; \ +} + +#define READMEM(p, s, n) { \ + memcpy(s, p, n); \ + p += n; \ +} diff --git a/src/command.c b/src/command.c index 95b1fd67d..a34d9694a 100644 --- a/src/command.c +++ b/src/command.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -34,6 +34,7 @@ #include "lua_script.h" #include "d_netfil.h" // findfile #include "r_data.h" // Color_cons_t +#include "d_main.h" // D_IsPathAllowed //======== // protos. @@ -57,6 +58,7 @@ static boolean CV_FilterVarByVersion(consvar_t *v, const char *valstr); static boolean CV_Command(void); consvar_t *CV_FindVar(const char *name); static const char *CV_StringValue(const char *var_name); +static boolean CV_Immutable(const consvar_t *var); static consvar_t *consvar_vars; // list of registered console variables static UINT16 consvar_number_of_netids = 0; @@ -108,6 +110,7 @@ static cmdalias_t *com_alias; // aliases list // ========================================================================= static vsbuf_t com_text; // variable sized buffer +static com_flags_t com_flags = 0; /** Purges control characters out of some text. * @@ -140,7 +143,7 @@ COM_Purge (char *s, int *np) * \param ptext The text to add. * \sa COM_BufInsertTextEx */ -void COM_BufAddTextEx(const char *ptext, int flags) +void COM_BufAddTextEx(const char *ptext, com_flags_t flags) { int l; char *text; @@ -163,7 +166,7 @@ void COM_BufAddTextEx(const char *ptext, int flags) * \param ptext The text to execute. A newline is automatically added. * \sa COM_BufAddTextEx */ -void COM_BufInsertTextEx(const char *ptext, int flags) +void COM_BufInsertTextEx(const char *ptext, com_flags_t flags) { const INT32 old_wait = com_wait; @@ -264,6 +267,8 @@ void COM_BufExecute(void) break; } } + + com_flags = 0; } /** Executes a string immediately. Used for skirting around WAIT commands. @@ -308,6 +313,7 @@ typedef struct xcommand_s const char *name; struct xcommand_s *next; com_func_t function; + com_flags_t flags; } xcommand_t; static xcommand_t *com_commands = NULL; // current commands @@ -317,7 +323,6 @@ static size_t com_argc; static char *com_argv[MAX_ARGS]; static const char *com_null_string = ""; static char *com_args = NULL; // current command args or NULL -static int com_flags; static void Got_NetVar(UINT8 **p, INT32 playernum); @@ -329,16 +334,16 @@ void COM_Init(void) VS_Alloc(&com_text, COM_BUF_SIZE); // add standard commands - COM_AddCommand("alias", COM_Alias_f); - COM_AddCommand("echo", COM_Echo_f); - COM_AddCommand("cecho", COM_CEcho_f); - COM_AddCommand("cechoflags", COM_CEchoFlags_f); - COM_AddCommand("cechoduration", COM_CEchoDuration_f); - COM_AddCommand("exec", COM_Exec_f); - COM_AddCommand("wait", COM_Wait_f); - COM_AddCommand("help", COM_Help_f); - COM_AddCommand("toggle", COM_Toggle_f); - COM_AddCommand("add", COM_Add_f); + COM_AddCommand("alias", COM_Alias_f, 0); + COM_AddCommand("echo", COM_Echo_f, COM_LUA); + COM_AddCommand("cecho", COM_CEcho_f, COM_LUA); + COM_AddCommand("cechoflags", COM_CEchoFlags_f, COM_LUA); + COM_AddCommand("cechoduration", COM_CEchoDuration_f, COM_LUA); + COM_AddCommand("exec", COM_Exec_f, 0); + COM_AddCommand("wait", COM_Wait_f, 0); + COM_AddCommand("help", COM_Help_f, COM_LUA); + COM_AddCommand("toggle", COM_Toggle_f, COM_LUA); + COM_AddCommand("add", COM_Add_f, COM_LUA); RegisterNetXCmd(XD_NETVAR, Got_NetVar); } @@ -440,7 +445,6 @@ static void COM_TokenizeString(char *ptext) com_argc = 0; com_args = NULL; - com_flags = 0; while (com_argc < MAX_ARGS) { @@ -478,7 +482,7 @@ static void COM_TokenizeString(char *ptext) * \param name Name of the command. * \param func Function called when the command is run. */ -void COM_AddCommand(const char *name, com_func_t func) +void COM_AddCommand(const char *name, com_func_t func, com_flags_t flags) { xcommand_t *cmd; @@ -508,6 +512,7 @@ void COM_AddCommand(const char *name, com_func_t func) cmd = ZZ_Alloc(sizeof *cmd); cmd->name = name; cmd->function = func; + cmd->flags = flags; cmd->next = com_commands; com_commands = cmd; } @@ -540,6 +545,7 @@ int COM_AddLuaCommand(const char *name) cmd = ZZ_Alloc(sizeof *cmd); cmd->name = name; cmd->function = COM_Lua_f; + cmd->flags = COM_LUA; cmd->next = com_commands; com_commands = cmd; return 0; @@ -635,6 +641,12 @@ static void COM_ExecuteString(char *ptext) { if (!stricmp(com_argv[0], cmd->name)) //case insensitive now that we have lower and uppercase! { + if ((com_flags & COM_LUA) && !(cmd->flags & COM_LUA)) + { + CONS_Alert(CONS_WARNING, "Command '%s' cannot be run from Lua.\n", cmd->name); + return; + } + cmd->function(); return; } @@ -650,7 +662,7 @@ static void COM_ExecuteString(char *ptext) else { // Monster Iestyn: keep track of how many levels of recursion we're in recursion++; - COM_BufInsertText(a->value); + COM_BufInsertTextEx(a->value, com_flags); recursion--; } return; @@ -660,7 +672,7 @@ static void COM_ExecuteString(char *ptext) // check cvars // Hurdler: added at Ebola's request ;) // (don't flood the console in software mode with bad gl_xxx command) - if (!CV_Command() && con_destlines) + if (!CV_Command() && (con_destlines || dedicated)) CONS_Printf(M_GetText("Unknown command '%s'\n"), COM_Argv(0)); } @@ -770,6 +782,9 @@ static void COM_Exec_f(void) return; } + if (!D_CheckPathAllowed(COM_Argv(1), "tried to exec")) + return; + // load file // Try with Argv passed verbatim first, for back compat FIL_ReadFile(COM_Argv(1), &buf); @@ -794,8 +809,8 @@ static void COM_Exec_f(void) CONS_Printf(M_GetText("executing %s\n"), COM_Argv(1)); // insert text file into the command buffer - COM_BufAddText((char *)buf); - COM_BufAddText("\n"); + COM_BufAddTextEx((char *)buf, com_flags); + COM_BufAddTextEx("\n", com_flags); // free buffer Z_Free(buf); @@ -998,6 +1013,9 @@ static void COM_Toggle_f(void) return; } + if (CV_Immutable(cvar)) + return; + if (!(cvar->PossibleValue == CV_YesNo || cvar->PossibleValue == CV_OnOff)) { CONS_Alert(CONS_NOTICE, M_GetText("%s is not a boolean value\n"), COM_Argv(1)); @@ -1027,6 +1045,9 @@ static void COM_Add_f(void) return; } + if (CV_Immutable(cvar)) + return; + if (( cvar->flags & CV_FLOAT )) { float n =FIXED_TO_FLOAT (cvar->value) + atof(COM_Argv(2)); @@ -1116,7 +1137,7 @@ void VS_Write(vsbuf_t *buf, const void *data, size_t length) M_Memcpy(VS_GetSpace(buf, length), data, length); } -void VS_WriteEx(vsbuf_t *buf, const void *data, size_t length, int flags) +void VS_WriteEx(vsbuf_t *buf, const void *data, size_t length, com_flags_t flags) { char *p; p = VS_GetSpace(buf, 2 + length); @@ -1725,9 +1746,13 @@ void CV_SaveVars(UINT8 **p, boolean in_demo) if ((cvar->flags & CV_NETVAR) && !CV_IsSetToDefault(cvar)) { if (in_demo) + { WRITESTRING(*p, cvar->name); + } else + { WRITEUINT16(*p, cvar->netid); + } WRITESTRING(*p, cvar->string); WRITEUINT8(*p, false); ++count; @@ -1738,6 +1763,8 @@ void CV_SaveVars(UINT8 **p, boolean in_demo) static void CV_LoadVars(UINT8 **p, consvar_t *(*got)(UINT8 **p, char **ret_value, boolean *ret_stealth)) { + const boolean store = (client || demoplayback); + consvar_t *cvar; UINT16 count; @@ -1751,7 +1778,7 @@ static void CV_LoadVars(UINT8 **p, { if (cvar->flags & CV_NETVAR) { - if (client && cvar->revert.v.string == NULL) + if (store && cvar->revert.v.string == NULL) { cvar->revert.v.const_munge = cvar->string; cvar->revert.allocated = ( cvar->zstring != NULL ); @@ -2074,9 +2101,10 @@ void CV_AddValue(consvar_t *var, INT32 increment) { increment = 0; currentindice = max; + break; // The value we definitely want, stop here. } else if (var->PossibleValue[max].value == var->value) - currentindice = max; + currentindice = max; // The value we maybe want. } if (increment) @@ -2363,8 +2391,11 @@ static boolean CV_Command(void) if (!v) return false; - if (( com_flags & COM_SAFE ) && ( v->flags & CV_NOLUA )) - return false; + if (CV_Immutable(v)) + { + CONS_Alert(CONS_WARNING, "Variable '%s' cannot be changed from Lua.\n", v->name); + return true; + } // perform a variable print or set if (COM_Argc() == 1) @@ -2449,6 +2480,22 @@ void CV_SaveVariables(FILE *f) } } +// Returns true if this cvar cannot be modified in current context. +// Such as if the cvar does not have CV_ALLOWLUA. +static boolean CV_Immutable(const consvar_t *var) +{ + // Currently operating from Lua + if (com_flags & COM_LUA) + { + if (!(var->flags & CV_ALLOWLUA)) + { + return true; + } + } + + return false; +} + //============================================================================ // SCRIPT PARSE //============================================================================ diff --git a/src/command.h b/src/command.h index 34fd15963..69d1890d3 100644 --- a/src/command.h +++ b/src/command.h @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -20,23 +20,23 @@ // Command buffer & command execution //=================================== -/* Lua command registration flags. */ -enum +/* Command registration flags. */ +typedef enum { COM_ADMIN = 1, COM_SPLITSCREEN = 2, COM_LOCAL = 4, -}; -/* Command buffer flags. */ -enum -{ - COM_SAFE = 1, -}; + // COM_BufInsertText etc: can only access cvars + // with CV_ALLOWLUA set. + // COM_AddCommand: without this flag, the command + // CANNOT be run from Lua. + COM_LUA = 8, +} com_flags_t; typedef void (*com_func_t)(void); -void COM_AddCommand(const char *name, com_func_t func); +void COM_AddCommand(const char *name, com_func_t func, com_flags_t flags); int COM_AddLuaCommand(const char *name); size_t COM_Argc(void); @@ -53,11 +53,11 @@ const char *COM_CompleteAlias(const char *partial, INT32 skips); // insert at queu (at end of other command) #define COM_BufAddText(s) COM_BufAddTextEx(s, 0) -void COM_BufAddTextEx(const char *btext, int flags); +void COM_BufAddTextEx(const char *btext, com_flags_t flags); // insert in head (before other command) #define COM_BufInsertText(s) COM_BufInsertTextEx(s, 0) -void COM_BufInsertTextEx(const char *btext, int flags); +void COM_BufInsertTextEx(const char *btext, com_flags_t flags); // don't bother inserting, just do immediately void COM_ImmedExecute(const char *ptext); @@ -89,7 +89,7 @@ void VS_Free(vsbuf_t *buf); void VS_Clear(vsbuf_t *buf); void *VS_GetSpace(vsbuf_t *buf, size_t length); void VS_Write(vsbuf_t *buf, const void *data, size_t length); -void VS_WriteEx(vsbuf_t *buf, const void *data, size_t length, int flags); +void VS_WriteEx(vsbuf_t *buf, const void *data, size_t length, com_flags_t flags); void VS_Print(vsbuf_t *buf, const char *data); // strcats onto the sizebuf //================== @@ -120,7 +120,7 @@ typedef enum // can only be set when we have the pointer to it // used on menus CV_CHEAT = 2048, // Don't let this be used in multiplayer unless cheats are on. - CV_NOLUA = 4096,/* don't let this be called from Lua */ + CV_ALLOWLUA = 4096,/* Let this be called from Lua */ } cvflags_t; typedef struct CV_PossibleValue_s diff --git a/src/config.h.in b/src/config.h.in index db794cccc..3d6d98375 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -11,19 +11,10 @@ #ifdef CMAKECONFIG -#define ASSET_HASH_SRB2_PK3 "${SRB2_ASSET_srb2.pk3_HASH}" -#define ASSET_HASH_PLAYER_DTA "${SRB2_ASSET_player.dta_HASH}" -#define ASSET_HASH_ZONES_PK3 "${SRB2_ASSET_zones.pk3_HASH}" -#ifdef USE_PATCH_DTA -#define ASSET_HASH_PATCH_PK3 "${SRB2_ASSET_patch.pk3_HASH}" -#endif - #define SRB2_COMP_REVISION "${SRB2_COMP_REVISION}" #define SRB2_COMP_BRANCH "${SRB2_COMP_BRANCH}" -#define CMAKE_ASSETS_DIR "${CMAKE_SOURCE_DIR}/assets" - -#else +#endif /* Manually defined asset hashes for non-CMake builds * Last updated 2020 / 02 / 15 - v2.2.1 - main assets @@ -35,13 +26,14 @@ * Last updated 2020 / 09 / 27 - v2.2.7 - patch.pk3 * Last updated 2020 / 10 / 02 - v2.2.8 - patch.pk3 * Last updated 2021 / 05 / 06 - v2.2.9 - patch.pk3 & zones.pk3 + * Last updated 2022 / 03 / 06 - v2.2.10 - main assets + * Last updated 2023 / 05 / 02 - v2.2.11 - patch.pk3 & zones.pk3 */ -#define ASSET_HASH_SRB2_PK3 "0277c9416756627004e83cbb5b2e3e28" -#define ASSET_HASH_ZONES_PK3 "f8f3e2b5deacf40f14e36686a07d44bb" -#define ASSET_HASH_PLAYER_DTA "49dad7b24634c89728cc3e0b689e12bb" +#define ASSET_HASH_SRB2_PK3 "ad911f29a28a18968ee5b2d11c2acb39" +#define ASSET_HASH_ZONES_PK3 "1c8adf8d079ecb87d00081f158acf3c7" +#define ASSET_HASH_PLAYER_DTA "2e7aaae8a6b1b77d90ffe7606ceadb6c" #ifdef USE_PATCH_DTA -#define ASSET_HASH_PATCH_PK3 "7d467a883f7887b3c311798ee2f56b6a" +#define ASSET_HASH_PATCH_PK3 "2e69558bce3b9610624549a75e29e19b" #endif #endif -#endif diff --git a/src/console.c b/src/console.c index 9e65a97b1..6d273f620 100644 --- a/src/console.c +++ b/src/console.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -61,7 +61,7 @@ static boolean con_started = false; // console has been initialised static boolean con_forcepic = true; // at startup toggle console translucency when first off boolean con_recalc; // set true when screen size has changed -static tic_t con_tick; // console ticker for anim or blinking prompt cursor +static tic_t con_tick; // console ticker for blinking prompt cursor // con_scrollup should use time (currenttime - lasttime).. static boolean consoletoggle; // true when console key pushed, ticker will handle @@ -110,6 +110,7 @@ static void CON_RecalcSize(void); static void CON_ChangeHeight(void); static void CON_DrawBackpic(void); +static void CONS_height_Change(void); static void CONS_hudlines_Change(void); static void CONS_backcolor_Change(void); @@ -136,7 +137,7 @@ static CV_PossibleValue_t speed_cons_t[] = {{0, "MIN"}, {64, "MAX"}, {0, NULL}}; static consvar_t cons_speed = CVAR_INIT ("con_speed", "8", CV_SAVE, speed_cons_t, NULL); // percentage of screen height to use for console -static consvar_t cons_height = CVAR_INIT ("con_height", "50", CV_SAVE, CV_Unsigned, NULL); +static consvar_t cons_height = CVAR_INIT ("con_height", "50", CV_CALL|CV_SAVE, CV_Unsigned, CONS_height_Change); static CV_PossibleValue_t backpic_cons_t[] = {{0, "translucent"}, {1, "picture"}, {0, NULL}}; // whether to use console background picture, or translucent mode @@ -156,6 +157,18 @@ consvar_t cons_backcolor = CVAR_INIT ("con_backcolor", "Green", CV_CALL|CV_SAVE, static void CON_Print(char *msg); +// Change the console height on demand +// +static void CONS_height_Change(void) +{ + Lock_state(); + + if (con_destlines > 0 && !con_startup) // If the console is open (as in, not using "bind")... + CON_ChangeHeight(); // ...update its height now, not only when it's closed and re-opened + + Unlock_state(); +} + // // static void CONS_hudlines_Change(void) @@ -221,7 +234,7 @@ static void CONS_Bind_f(void) for (key = 0; key < NUMINPUTS; key++) if (bindtable[key]) { - CONS_Printf("%s : \"%s\"\n", G_KeynumToString(key), bindtable[key]); + CONS_Printf("%s : \"%s\"\n", G_KeyNumToName(key), bindtable[key]); na = 1; } if (!na) @@ -229,7 +242,7 @@ static void CONS_Bind_f(void) return; } - key = G_KeyStringtoNum(COM_Argv(1)); + key = G_KeyNameToNum(COM_Argv(1)); if (key <= 0 || key >= NUMINPUTS) { CONS_Alert(CONS_NOTICE, M_GetText("Invalid key name\n")); @@ -382,16 +395,16 @@ static void CON_SetupColormaps(void) // 0x1 0x3 0x9 0xF colset(magentamap, 177, 177, 178, 178, 178, 180, 180, 180, 182, 182, 182, 182, 184, 184, 184, 185); - colset(yellowmap, 82, 82, 73, 73, 73, 64, 64, 64, 66, 66, 66, 66, 67, 67, 67, 68); - colset(lgreenmap, 96, 96, 98, 98, 98, 101, 101, 101, 104, 104, 104, 104, 106, 106, 106, 107); - colset(bluemap, 146, 146, 147, 147, 147, 149, 149, 149, 152, 152, 152, 152, 155, 155, 155, 157); - colset(redmap, 32, 32, 33, 33, 33, 35, 35, 35, 39, 39, 39, 39, 42, 42, 42, 44); + colset(yellowmap, 82, 82, 73, 73, 73, 74, 74, 74, 66, 66, 66, 66, 67, 67, 67, 68); + colset(lgreenmap, 96, 96, 98, 98, 98, 100, 100, 100, 103, 103, 103, 103, 105, 105, 105, 107); + colset(bluemap, 146, 146, 147, 147, 147, 148, 148, 148, 149, 149, 149, 149, 150, 150, 150, 151); + colset(redmap, 32, 32, 33, 33, 33, 34, 34, 34, 35, 35, 35, 35, 37, 37, 37, 39); colset(graymap, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23); colset(orangemap, 50, 50, 52, 52, 52, 54, 54, 54, 56, 56, 56, 56, 59, 59, 59, 60); colset(skymap, 129, 129, 130, 130, 130, 131, 131, 131, 133, 133, 133, 133, 135, 135, 135, 136); colset(purplemap, 160, 160, 161, 161, 161, 162, 162, 162, 163, 163, 163, 163, 164, 164, 164, 165); colset(aquamap, 120, 120, 121, 121, 121, 122, 122, 122, 123, 123, 123, 123, 124, 124, 124, 125); - colset(peridotmap, 72, 72, 188, 188, 189, 189, 189, 189, 190, 190, 190, 190, 191, 191, 191, 94); + colset(peridotmap, 73, 73, 188, 188, 188, 189, 189, 189, 190, 190, 190, 190, 191, 191, 191, 94); colset(azuremap, 144, 144, 145, 145, 145, 146, 146, 146, 170, 170, 170, 170, 171, 171, 171, 172); colset(brownmap, 219, 219, 221, 221, 221, 222, 222, 222, 224, 224, 224, 224, 227, 227, 227, 229); colset(rosymap, 200, 200, 201, 201, 201, 202, 202, 202, 203, 203, 203, 203, 204, 204, 204, 205); @@ -443,7 +456,7 @@ void CON_Init(void) // register our commands // - COM_AddCommand("cls", CONS_Clear_f); + COM_AddCommand("cls", CONS_Clear_f, 0); //COM_AddCommand("english", CONS_English_f); // set console full screen for game startup MAKE SURE VID_Init() done !!! Lock_state(); @@ -470,7 +483,7 @@ void CON_Init(void) CV_RegisterVar(&cons_height); CV_RegisterVar(&cons_backpic); CV_RegisterVar(&cons_backcolor); - COM_AddCommand("bind", CONS_Bind_f); + COM_AddCommand("bind", CONS_Bind_f, 0); } else { @@ -484,6 +497,19 @@ void CON_Init(void) Unlock_state(); } } + +void CON_StartRefresh(void) +{ + if (con_startup) + con_refresh = true; +} + +void CON_StopRefresh(void) +{ + if (con_startup) + con_refresh = false; +} + // Console input initialization // static void CON_InputInit(void) @@ -630,33 +656,39 @@ static void CON_ChangeHeight(void) // static void CON_MoveConsole(void) { - fixed_t conspeed; + static fixed_t fracmovement = 0; Lock_state(); - conspeed = FixedDiv(cons_speed.value*vid.fdupy, FRACUNIT); - // instant if (!cons_speed.value) { con_curlines = con_destlines; + Unlock_state(); return; } - // up/down move to dest - if (con_curlines < con_destlines) + // Not instant - Increment fracmovement fractionally + fracmovement += FixedMul(cons_speed.value*vid.fdupy, renderdeltatics); + + if (con_curlines < con_destlines) // Move the console downwards { - con_curlines += FixedInt(conspeed); - if (con_curlines > con_destlines) - con_curlines = con_destlines; + con_curlines += FixedInt(fracmovement); // Move by fracmovement's integer value + if (con_curlines > con_destlines) // If we surpassed the destination... + con_curlines = con_destlines; // ...clamp to it! } - else if (con_curlines > con_destlines) + else // Move the console upwards { - con_curlines -= FixedInt(conspeed); + con_curlines -= FixedInt(fracmovement); if (con_curlines < con_destlines) con_curlines = con_destlines; + + if (con_destlines == 0) // If the console is being closed, not just moved up... + con_tick = 0; // ...don't show the blinking cursor } + fracmovement %= FRACUNIT; // Reset fracmovement's integer value, but keep the fraction + Unlock_state(); } @@ -739,10 +771,6 @@ void CON_Ticker(void) CON_ChangeHeight(); } - // console movement - if (con_destlines != con_curlines) - CON_MoveConsole(); - // clip the view, so that the part under the console is not drawn con_clipviewtop = -1; if (cons_backpic.value) // clip only when using an opaque background @@ -913,12 +941,12 @@ boolean CON_Responder(event_t *ev) // let go keyup events, don't eat them if (ev->type != ev_keydown && ev->type != ev_console) { - if (ev->data1 == gamecontrol[gc_console][0] || ev->data1 == gamecontrol[gc_console][1]) + if (ev->key == gamecontrol[GC_CONSOLE][0] || ev->key == gamecontrol[GC_CONSOLE][1]) consdown = false; return false; } - key = ev->data1; + key = ev->key; // check for console toggle key if (ev->type != ev_console) @@ -926,7 +954,7 @@ boolean CON_Responder(event_t *ev) if (modeattacking || metalrecording || marathonmode) return false; - if (key == gamecontrol[gc_console][0] || key == gamecontrol[gc_console][1]) + if (key == gamecontrol[GC_CONSOLE][0] || key == gamecontrol[GC_CONSOLE][1]) { if (consdown) // ignore repeat return true; @@ -1759,8 +1787,8 @@ static void CON_DrawBackpic(void) } // Draw the patch. - V_DrawCroppedPatch(x << FRACBITS, 0, FRACUNIT, V_NOSCALESTART, con_backpic, - 0, ( BASEVIDHEIGHT - h ), BASEVIDWIDTH, h); + V_DrawCroppedPatch(x << FRACBITS, 0, FRACUNIT, FRACUNIT, V_NOSCALESTART, con_backpic, NULL, + 0, (BASEVIDHEIGHT - h) << FRACBITS, BASEVIDWIDTH << FRACBITS, h << FRACBITS); // Unlock the cached patch. W_UnlockCachedPatch(con_backpic); @@ -1796,41 +1824,41 @@ static void CON_DrawConsole(void) } // draw console text lines from top to bottom - if (con_curlines < minheight) - return; - - i = con_cy - con_scrollup; - - // skip the last empty line due to the cursor being at the start of a new line - i--; - - i -= (con_curlines - minheight) / charheight; - - if (rendermode == render_none) return; - - for (y = (con_curlines-minheight) % charheight; y <= con_curlines-minheight; y += charheight, i++) + if (con_curlines >= minheight) { - INT32 x; - size_t c; + i = con_cy - con_scrollup; - p = (UINT8 *)&con_buffer[((i > 0 ? i : 0)%con_totallines)*con_width]; + // skip the last empty line due to the cursor being at the start of a new line + i--; - for (c = 0, x = charwidth; c < con_width; c++, x += charwidth, p++) + i -= (con_curlines - minheight) / charheight; + + if (rendermode == render_none) return; + + for (y = (con_curlines-minheight) % charheight; y <= con_curlines-minheight; y += charheight, i++) { - while (*p & 0x80) + INT32 x; + size_t c; + + p = (UINT8 *)&con_buffer[((i > 0 ? i : 0)%con_totallines)*con_width]; + + for (c = 0, x = charwidth; c < con_width; c++, x += charwidth, p++) { - charflags = (*p & 0x7f) << V_CHARCOLORSHIFT; - p++; - c++; + while (*p & 0x80) + { + charflags = (*p & 0x7f) << V_CHARCOLORSHIFT; + p++; + c++; + } + if (c >= con_width) + break; + V_DrawCharacter(x, y, (INT32)(*p) | charflags | cv_constextsize.value | V_NOSCALESTART, true); } - if (c >= con_width) - break; - V_DrawCharacter(x, y, (INT32)(*p) | charflags | cv_constextsize.value | V_NOSCALESTART, true); } } // draw prompt if enough place (not while game startup) - if ((con_curlines == con_destlines) && (con_curlines >= minheight) && !con_startup) + if ((con_curlines >= (minheight-charheight)) && !con_startup) CON_DrawInput(); } @@ -1853,6 +1881,10 @@ void CON_Drawer(void) CON_ClearHUD(); } + // console movement + if (con_curlines != con_destlines) + CON_MoveConsole(); + if (con_curlines > 0) CON_DrawConsole(); else if (gamestate == GS_LEVEL diff --git a/src/console.h b/src/console.h index 28f40d308..f22f8dcbc 100644 --- a/src/console.h +++ b/src/console.h @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -16,6 +16,9 @@ void CON_Init(void); +void CON_StartRefresh(void); +void CON_StopRefresh(void); + boolean CON_Responder(event_t *ev); #ifdef HAVE_THREADS diff --git a/src/d_clisrv.c b/src/d_clisrv.c old mode 100644 new mode 100755 index 64efd3b60..ca9f4a24e --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -15,6 +15,7 @@ #include //for unlink #endif +#include "i_time.h" #include "i_net.h" #include "i_system.h" #include "i_video.h" @@ -43,9 +44,13 @@ #include "lzf.h" #include "lua_script.h" #include "lua_hook.h" +#include "lua_libs.h" #include "md5.h" #include "m_perfstats.h" +// aaaaaa +#include "i_joy.h" + #ifndef NONET // cl loading screen #include "v_video.h" @@ -112,6 +117,9 @@ static INT16 consistancy[BACKUPTICS]; static UINT8 player_joining = false; UINT8 hu_redownloadinggamestate = 0; +// true when a player is connecting or disconnecting so that the gameplay has stopped in its tracks +boolean hu_stopped = false; + UINT8 adminpassmd5[16]; boolean adminpasswordset = false; @@ -127,10 +135,14 @@ static UINT8 localtextcmd[MAXTEXTCMD]; static UINT8 localtextcmd2[MAXTEXTCMD]; // splitscreen static tic_t neededtic; SINT8 servernode = 0; // the number of the server node + /// \brief do we accept new players? /// \todo WORK! boolean acceptnewnode = true; +static boolean serverisfull = false; //lets us be aware if the server was full after we check files, but before downloading, so we can ask if the user still wants to download or not +static tic_t firstconnectattempttime = 0; + // engine // Must be a power of two @@ -510,18 +522,24 @@ static INT16 Consistancy(void); typedef enum { CL_SEARCHING, + CL_CHECKFILES, CL_DOWNLOADFILES, CL_ASKJOIN, + CL_LOADFILES, CL_WAITJOINRESPONSE, CL_DOWNLOADSAVEGAME, CL_CONNECTED, - CL_ABORTED + CL_ABORTED, + CL_ASKFULLFILELIST, + CL_CONFIRMCONNECT } cl_mode_t; static void GetPackets(void); static cl_mode_t cl_mode = CL_SEARCHING; +static UINT16 cl_lastcheckedfilecount = 0; // used for full file list + #ifndef NONET #define SNAKE_SPEED 5 @@ -635,6 +653,22 @@ static UINT8 Snake_GetOppositeDir(UINT8 dir) return 12 + 5 - dir; } +event_t *snakejoyevents[MAXEVENTS]; +UINT16 joyeventcount = 0; + +// I'm screaming the hack is clean - ashi +static boolean Snake_Joy_Grabber(event_t *ev) +{ + if (ev->type == ev_joystick && ev->key == 0) + { + snakejoyevents[joyeventcount] = ev; + joyeventcount++; + return true; + } + else + return false; +} + static void Snake_FindFreeSlot(UINT8 *freex, UINT8 *freey, UINT8 headx, UINT8 heady) { UINT8 x, y; @@ -661,16 +695,19 @@ static void Snake_Handle(void) UINT8 x, y; UINT8 oldx, oldy; UINT16 i; + UINT16 j; + UINT16 joystate = 0; + static INT32 pjoyx = 0, pjoyy = 0; // Handle retry - if (snake->gameover && (PLAYER1INPUTDOWN(gc_jump) || gamekeydown[KEY_ENTER])) + if (snake->gameover && (PLAYER1INPUTDOWN(GC_JUMP) || gamekeydown[KEY_ENTER])) { Snake_Initialise(); snake->pausepressed = true; // Avoid accidental pause on respawn } // Handle pause - if (PLAYER1INPUTDOWN(gc_pause) || gamekeydown[KEY_ENTER]) + if (PLAYER1INPUTDOWN(GC_PAUSE) || gamekeydown[KEY_ENTER]) { if (!snake->pausepressed) snake->paused = !snake->paused; @@ -689,23 +726,58 @@ static void Snake_Handle(void) oldx = snake->snakex[1]; oldy = snake->snakey[1]; + // process the input events in here dear lord + for (j = 0; j < joyeventcount; j++) + { + event_t *ev = snakejoyevents[j]; + const INT32 jdeadzone = (JOYAXISRANGE * cv_digitaldeadzone.value) / FRACUNIT; + if (ev->y != INT32_MAX) + { + if (Joystick.bGamepadStyle || abs(ev->y) > jdeadzone) + { + if (ev->y < 0 && pjoyy >= 0) + joystate = 1; + else if (ev->y > 0 && pjoyy <= 0) + joystate = 2; + pjoyy = ev->y; + } + else + pjoyy = 0; + } + + if (ev->x != INT32_MAX) + { + if (Joystick.bGamepadStyle || abs(ev->x) > jdeadzone) + { + if (ev->x < 0 && pjoyx >= 0) + joystate = 3; + else if (ev->x > 0 && pjoyx <= 0) + joystate = 4; + pjoyx = ev->x; + } + else + pjoyx = 0; + } + } + joyeventcount = 0; + // Update direction - if (gamekeydown[KEY_LEFTARROW]) + if (PLAYER1INPUTDOWN(GC_STRAFELEFT) || gamekeydown[KEY_LEFTARROW] || joystate == 3) { if (snake->snakelength < 2 || x <= oldx) snake->snakedir[0] = 1; } - else if (gamekeydown[KEY_RIGHTARROW]) + else if (PLAYER1INPUTDOWN(GC_STRAFERIGHT) || gamekeydown[KEY_RIGHTARROW] || joystate == 4) { if (snake->snakelength < 2 || x >= oldx) snake->snakedir[0] = 2; } - else if (gamekeydown[KEY_UPARROW]) + else if (PLAYER1INPUTDOWN(GC_FORWARD) || gamekeydown[KEY_UPARROW] || joystate == 1) { if (snake->snakelength < 2 || y <= oldy) snake->snakedir[0] = 3; } - else if (gamekeydown[KEY_DOWNARROW]) + else if (PLAYER1INPUTDOWN(GC_BACKWARD) || gamekeydown[KEY_DOWNARROW] || joystate == 2) { if (snake->snakelength < 2 || y >= oldy) snake->snakedir[0] = 4; @@ -919,6 +991,8 @@ static void Snake_Draw(void) INT16 i; // Background + V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); + V_DrawFlatFill( SNAKE_LEFT_X + SNAKE_BORDER_SIZE, SNAKE_TOP_Y + SNAKE_BORDER_SIZE, @@ -1020,6 +1094,13 @@ static void Snake_Draw(void) ); } +static void CL_DrawConnectionStatusBox(void) +{ + M_DrawTextBox(BASEVIDWIDTH/2-128-8, BASEVIDHEIGHT-16-8, 32, 1); + if (cl_mode != CL_CONFIRMCONNECT) + V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-16-16, V_YELLOWMAP, "Press ESC to abort"); +} + // // CL_DrawConnectionStatus // @@ -1030,28 +1111,32 @@ static inline void CL_DrawConnectionStatus(void) INT32 ccstime = I_GetTime(); // Draw background fade - if (!menuactive) // menu already draws its own fade - V_DrawFadeScreen(0xFF00, 16); // force default + V_DrawFadeScreen(0xFF00, 16); // force default - // Draw the bottom box. - M_DrawTextBox(BASEVIDWIDTH/2-128-8, BASEVIDHEIGHT-16-8, 32, 1); - V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-16-16, V_YELLOWMAP, "Press ESC to abort"); - - if (cl_mode != CL_DOWNLOADFILES) + if (cl_mode != CL_DOWNLOADFILES && cl_mode != CL_LOADFILES) { INT32 i, animtime = ((ccstime / 4) & 15) + 16; - UINT8 palstart = (cl_mode == CL_SEARCHING) ? 32 : 96; - // 15 pal entries total. + UINT8 palstart; const char *cltext; + // Draw the bottom box. + CL_DrawConnectionStatusBox(); + + if (cl_mode == CL_SEARCHING) + palstart = 32; // Red + else if (cl_mode == CL_CONFIRMCONNECT) + palstart = 48; // Orange + else + palstart = 96; // Green + if (!(cl_mode == CL_DOWNLOADSAVEGAME && lastfilenum != -1)) - for (i = 0; i < 16; ++i) + for (i = 0; i < 16; ++i) // 15 pal entries total. V_DrawFill((BASEVIDWIDTH/2-128) + (i * 16), BASEVIDHEIGHT-16, 16, 8, palstart + ((animtime - i) & 15)); switch (cl_mode) { case CL_DOWNLOADSAVEGAME: - if (lastfilenum != -1) + if (fileneeded && lastfilenum != -1) { UINT32 currentsize = fileneeded[lastfilenum].currentsize; UINT32 totalsize = fileneeded[lastfilenum].totalsize; @@ -1075,9 +1160,22 @@ static inline void CL_DrawConnectionStatus(void) else cltext = M_GetText("Waiting to download game state..."); break; + case CL_ASKFULLFILELIST: + case CL_CHECKFILES: + cltext = M_GetText("Checking server addon list..."); + break; + case CL_CONFIRMCONNECT: + cltext = ""; + break; + case CL_LOADFILES: + cltext = M_GetText("Loading server addons..."); + break; case CL_ASKJOIN: case CL_WAITJOINRESPONSE: - cltext = M_GetText("Requesting to join..."); + if (serverisfull) + cltext = M_GetText("Server full, waiting for a slot..."); + else + cltext = M_GetText("Requesting to join..."); break; default: cltext = M_GetText("Connecting to server..."); @@ -1087,14 +1185,51 @@ static inline void CL_DrawConnectionStatus(void) } else { - if (lastfilenum != -1) + if (cl_mode == CL_LOADFILES) + { + INT32 totalfileslength; + INT32 loadcompletednum = 0; + INT32 i; + + V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-16-16, V_YELLOWMAP, "Press ESC to abort"); + + //ima just count files here + if (fileneeded) + { + for (i = 0; i < fileneedednum; i++) + if (fileneeded[i].status == FS_OPEN) + loadcompletednum++; + } + + // Loading progress + V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-16-24, V_YELLOWMAP, "Loading server addons..."); + totalfileslength = (INT32)((loadcompletednum/(double)(fileneedednum)) * 256); + M_DrawTextBox(BASEVIDWIDTH/2-128-8, BASEVIDHEIGHT-16-8, 32, 1); + V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-16, 256, 8, 111); + V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-16, totalfileslength, 8, 96); + V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-16, V_20TRANS|V_MONOSPACE, + va(" %2u/%2u Files",loadcompletednum,fileneedednum)); + } + else if (lastfilenum != -1) { INT32 dldlength; static char tempname[28]; - fileneeded_t *file = &fileneeded[lastfilenum]; - char *filename = file->filename; + fileneeded_t *file; + char *filename; - Snake_Draw(); + if (snake) + Snake_Draw(); + + // Draw the bottom box. + CL_DrawConnectionStatusBox(); + + if (fileneeded) + { + file = &fileneeded[lastfilenum]; + filename = file->filename; + } + else + return; Net_GetNetStat(); dldlength = (INT32)((file->currentsize/(double)file->totalsize) * 256); @@ -1127,20 +1262,32 @@ static inline void CL_DrawConnectionStatus(void) va("%3.1fK/s ", ((double)getbps)/1024)); } else + { + if (snake) + Snake_Draw(); + + CL_DrawConnectionStatusBox(); V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-16-24, V_YELLOWMAP, M_GetText("Waiting to download files...")); + } } } #endif +static boolean CL_AskFileList(INT32 firstfile) +{ + netbuffer->packettype = PT_TELLFILESNEEDED; + netbuffer->u.filesneedednum = firstfile; + + return HSendPacket(servernode, false, 0, sizeof (INT32)); +} + /** Sends a special packet to declare how many players in local * Used only in arbitratrenetstart() * Sends a PT_CLIENTJOIN packet to the server * * \return True if the packet was successfully sent * \todo Improve the description... - * Because to be honest, I have no idea what arbitratrenetstart is... - * Is it even used...? * */ static boolean CL_SendJoin(void) @@ -1150,15 +1297,14 @@ static boolean CL_SendJoin(void) CONS_Printf(M_GetText("Sending join request...\n")); netbuffer->packettype = PT_CLIENTJOIN; + netbuffer->u.clientcfg.modversion = MODVERSION; + strncpy(netbuffer->u.clientcfg.application, + SRB2APPLICATION, + sizeof netbuffer->u.clientcfg.application); + if (splitscreen || botingame) localplayers++; netbuffer->u.clientcfg.localplayers = localplayers; - netbuffer->u.clientcfg._255 = 255; - netbuffer->u.clientcfg.packetversion = PACKETVERSION; - netbuffer->u.clientcfg.version = VERSION; - netbuffer->u.clientcfg.subversion = SUBVERSION; - strncpy(netbuffer->u.clientcfg.application, SRB2APPLICATION, - sizeof netbuffer->u.clientcfg.application); CleanupPlayerName(consoleplayer, cv_playername.zstring); if (splitscreen) @@ -1172,9 +1318,9 @@ static boolean CL_SendJoin(void) static INT32 FindRejoinerNum(SINT8 node) { - char strippednodeaddress[64]; + char addressbuffer[64]; const char *nodeaddress; - char *port; + const char *strippednodeaddress; INT32 i; // Make sure there is no dead dress before proceeding to the stripping @@ -1185,10 +1331,8 @@ static INT32 FindRejoinerNum(SINT8 node) return -1; // Strip the address of its port - strcpy(strippednodeaddress, nodeaddress); - port = strchr(strippednodeaddress, ':'); - if (port) - *port = '\0'; + strcpy(addressbuffer, nodeaddress); + strippednodeaddress = I_NetSplitAddress(addressbuffer, NULL); // Check if any player matches the stripped address for (i = 0; i < MAXPLAYERS; i++) @@ -1201,6 +1345,21 @@ static INT32 FindRejoinerNum(SINT8 node) return -1; } +static UINT8 +GetRefuseReason (INT32 node) +{ + if (!node || FindRejoinerNum(node) != -1) + return 0; + else if (bannednode && bannednode[node]) + return REFUSE_BANNED; + else if (!cv_allownewplayer.value) + return REFUSE_JOINS_DISABLED; + else if (D_NumPlayers() >= cv_maxplayers.value) + return REFUSE_SLOTS_FULL; + else + return 0; +} + static void SV_SendServerInfo(INT32 node, tic_t servertime) { UINT8 *p; @@ -1216,23 +1375,17 @@ static void SV_SendServerInfo(INT32 node, tic_t servertime) netbuffer->u.serverinfo.time = (tic_t)LONG(servertime); netbuffer->u.serverinfo.leveltime = (tic_t)LONG(leveltime); - netbuffer->u.serverinfo.numberofplayer = (UINT8)D_NumPlayers(); - netbuffer->u.serverinfo.maxplayer = (UINT8)cv_maxplayers.value; + // Exclude bots from both counts + netbuffer->u.serverinfo.numberofplayer = (UINT8)(D_NumPlayers() - D_NumBots()); + netbuffer->u.serverinfo.maxplayer = (UINT8)(cv_maxplayers.value - D_NumBots()); - if (!node || FindRejoinerNum(node) != -1) - netbuffer->u.serverinfo.refusereason = 0; - else if (!cv_allownewplayer.value) - netbuffer->u.serverinfo.refusereason = 1; - else if (D_NumPlayers() >= cv_maxplayers.value) - netbuffer->u.serverinfo.refusereason = 2; - else - netbuffer->u.serverinfo.refusereason = 0; + netbuffer->u.serverinfo.refusereason = GetRefuseReason(node); strncpy(netbuffer->u.serverinfo.gametypename, Gametype_Names[gametype], sizeof netbuffer->u.serverinfo.gametypename); netbuffer->u.serverinfo.modifiedgame = (UINT8)modifiedgame; netbuffer->u.serverinfo.cheatsenabled = CV_CheatsEnabled(); - netbuffer->u.serverinfo.isdedicated = (UINT8)dedicated; + netbuffer->u.serverinfo.flags = (dedicated ? SV_DEDICATED : 0); strncpy(netbuffer->u.serverinfo.servername, cv_servername.string, MAXSERVERNAME); strncpy(netbuffer->u.serverinfo.mapname, G_BuildMapName(gamemap), 7); @@ -1267,7 +1420,7 @@ static void SV_SendServerInfo(INT32 node, tic_t servertime) if (mapheaderinfo[gamemap-1]) netbuffer->u.serverinfo.actnum = mapheaderinfo[gamemap-1]->actnum; - p = PutFileNeeded(); + p = PutFileNeeded(0); HSendPacket(node, false, 0, p - ((UINT8 *)&netbuffer->u)); } @@ -1344,9 +1497,6 @@ static boolean SV_SendServerConfig(INT32 node) netbuffer->packettype = PT_SERVERCFG; - netbuffer->u.servercfg.version = VERSION; - netbuffer->u.servercfg.subversion = SUBVERSION; - netbuffer->u.servercfg.serverplayer = (UINT8)serverplayer; netbuffer->u.servercfg.totalslotnum = (UINT8)(doomcom->numslots); netbuffer->u.servercfg.gametic = (tic_t)LONG(gametic); @@ -1354,6 +1504,7 @@ static boolean SV_SendServerConfig(INT32 node) netbuffer->u.servercfg.gamestate = (UINT8)gamestate; netbuffer->u.servercfg.gametype = (UINT8)gametype; netbuffer->u.servercfg.modifiedgame = (UINT8)modifiedgame; + netbuffer->u.servercfg.usedCheats = (UINT8)usedCheats; memcpy(netbuffer->u.servercfg.server_context, server_context, 8); @@ -1521,6 +1672,8 @@ static void CL_LoadReceivedSavegame(boolean reloading) size_t length, decompressedlen; char tmpsave[256]; + FreeFileNeeded(); + sprintf(tmpsave, "%s" PATHSEP TMPSAVENAME, srb2home); length = FIL_ReadFile(tmpsave, &savebuffer); @@ -1667,20 +1820,24 @@ static void SL_InsertServer(serverinfo_pak* info, SINT8 node) if (serverlistcount >= MAXSERVERLIST) return; // list full - if (info->_255 != 255) - return;/* old packet format */ + /* check it later if connecting to this one */ + if (node != servernode) + { + if (info->_255 != 255) + return;/* old packet format */ - if (info->packetversion != PACKETVERSION) - return;/* old new packet format */ + if (info->packetversion != PACKETVERSION) + return;/* old new packet format */ - if (info->version != VERSION) - return; // Not same version. + if (info->version != VERSION) + return; // Not same version. - if (info->subversion != SUBVERSION) - return; // Close, but no cigar. + if (info->subversion != SUBVERSION) + return; // Close, but no cigar. - if (strcmp(info->application, SRB2APPLICATION)) - return;/* that's a different mod */ + if (strcmp(info->application, SRB2APPLICATION)) + return;/* that's a different mod */ + } i = serverlistcount++; } @@ -1829,6 +1986,225 @@ void CL_UpdateServerList(boolean internetsearch, INT32 room) #endif // ifndef NONET +static void M_ConfirmConnect(event_t *ev) +{ +#ifndef NONET + if (ev->type == ev_keydown) + { + if (ev->key == ' ' || ev->key == 'y' || ev->key == KEY_ENTER || ev->key == KEY_JOY1) + { + if (totalfilesrequestednum > 0) + { + if (CL_SendFileRequest()) + { + cl_mode = CL_DOWNLOADFILES; + Snake_Initialise(); + } + } + else + cl_mode = CL_LOADFILES; + + M_ClearMenus(true); + } + else if (ev->key == 'n' || ev->key == KEY_ESCAPE || ev->key == KEY_JOY1 + 3) + { + cl_mode = CL_ABORTED; + M_ClearMenus(true); + } + } +#else + (void)ev; +#endif +} + +static boolean CL_FinishedFileList(void) +{ + INT32 i; + char *downloadsize = NULL; + + //CONS_Printf(M_GetText("Checking files...\n")); + i = CL_CheckFiles(); + if (i == 4) // still checking ... + { + return true; + } + else if (i == 3) // too many files + { + D_QuitNetGame(); + CL_Reset(); + D_StartTitle(); + M_StartMessage(M_GetText( + "You have too many WAD files loaded\n" + "to add ones the server is using.\n" + "Please restart SRB2 before connecting.\n\n" + "Press ESC\n" + ), NULL, MM_NOTHING); + return false; + } + else if (i == 2) // cannot join for some reason + { + D_QuitNetGame(); + CL_Reset(); + D_StartTitle(); + M_StartMessage(M_GetText( + "You have the wrong addons loaded.\n\n" + "To play on this server, restart\n" + "the game and don't load any addons.\n" + "SRB2 will automatically add\n" + "everything you need when you join.\n\n" + "Press ESC\n" + ), NULL, MM_NOTHING); + return false; + } + else if (i == 1) + { + if (serverisfull) + { + M_StartMessage(M_GetText( + "This server is full!\n" + "\n" + "You may load server addons (if any), and wait for a slot.\n" + "\n" + "Press ENTER to continue\nor ESC to cancel.\n\n" + ), M_ConfirmConnect, MM_EVENTHANDLER); + cl_mode = CL_CONFIRMCONNECT; + curfadevalue = 0; + } + else + cl_mode = CL_LOADFILES; + } + else + { + // must download something + // can we, though? + if (!CL_CheckDownloadable()) // nope! + { + D_QuitNetGame(); + CL_Reset(); + D_StartTitle(); + M_StartMessage(M_GetText( + "An error occured when trying to\n" + "download missing addons.\n" + "(This is almost always a problem\n" + "with the server, not your game.)\n\n" + "See the console or log file\n" + "for additional details.\n\n" + "Press ESC\n" + ), NULL, MM_NOTHING); + return false; + } + +#ifndef NONET + downloadcompletednum = 0; + downloadcompletedsize = 0; + totalfilesrequestednum = 0; + totalfilesrequestedsize = 0; + + if (fileneeded == NULL) + I_Error("CL_FinishedFileList: fileneeded == NULL"); + + for (i = 0; i < fileneedednum; i++) + if (fileneeded[i].status == FS_NOTFOUND || fileneeded[i].status == FS_MD5SUMBAD) + { + totalfilesrequestednum++; + totalfilesrequestedsize += fileneeded[i].totalsize; + } + + if (totalfilesrequestedsize>>20 >= 100) + downloadsize = Z_StrDup(va("%uM",totalfilesrequestedsize>>20)); + else + downloadsize = Z_StrDup(va("%uK",totalfilesrequestedsize>>10)); +#endif + + if (serverisfull) + M_StartMessage(va(M_GetText( + "This server is full!\n" + "Download of %s additional content\nis required to join.\n" + "\n" + "You may download, load server addons,\nand wait for a slot.\n" + "\n" + "Press ENTER to continue\nor ESC to cancel.\n" + ), downloadsize), M_ConfirmConnect, MM_EVENTHANDLER); + else + M_StartMessage(va(M_GetText( + "Download of %s additional content\nis required to join.\n" + "\n" + "Press ENTER to continue\nor ESC to cancel.\n" + ), downloadsize), M_ConfirmConnect, MM_EVENTHANDLER); + + Z_Free(downloadsize); + cl_mode = CL_CONFIRMCONNECT; + curfadevalue = 0; + } + return true; +} + +#ifndef NONET +static const char * InvalidServerReason (serverinfo_pak *info) +{ +#define EOT "\nPress ESC\n" + + /* magic number for new packet format */ + if (info->_255 != 255) + { + return + "Outdated server (version unknown).\n" EOT; + } + + if (strncmp(info->application, SRB2APPLICATION, sizeof + info->application)) + { + return va( + "%s cannot connect\n" + "to %s servers.\n" EOT, + SRB2APPLICATION, + info->application); + } + + if ( + info->packetversion != PACKETVERSION || + info->version != VERSION || + info->subversion != SUBVERSION + ){ + return va( + "Incompatible %s versions.\n" + "(server version %d.%d.%d)\n" EOT, + SRB2APPLICATION, + info->version / 100, + info->version % 100, + info->subversion); + } + + switch (info->refusereason) + { + case REFUSE_BANNED: + return + "You have been banned\n" + "from the server.\n" EOT; + case REFUSE_JOINS_DISABLED: + return + "The server is not accepting\n" + "joins for the moment.\n" EOT; + case REFUSE_SLOTS_FULL: + return va( + "Maximum players reached: %d\n" EOT, + info->maxplayer); + default: + if (info->refusereason) + { + return + "You can't join.\n" + "I don't know why,\n" + "but you can't join.\n" EOT; + } + } + + return NULL; + +#undef EOT +} +#endif // ifndef NONET + /** Called by CL_ServerConnectionTicker * * \param asksent The last time we asked the server to join. We re-ask every second in case our request got lost in transmit. @@ -1859,88 +2235,46 @@ static boolean CL_ServerConnectionSearchTicker(tic_t *asksent) return true; } - // Quit here rather than downloading files and being refused later. - if (serverlist[i].info.refusereason) - { - D_QuitNetGame(); - CL_Reset(); - D_StartTitle(); - if (serverlist[i].info.refusereason == 1) - M_StartMessage(M_GetText("The server is not accepting\njoins for the moment.\n\nPress ESC\n"), NULL, MM_NOTHING); - else if (serverlist[i].info.refusereason == 2) - M_StartMessage(va(M_GetText("Maximum players reached: %d\n\nPress ESC\n"), serverlist[i].info.maxplayer), NULL, MM_NOTHING); - else - M_StartMessage(M_GetText("You can't join.\nI don't know why,\nbut you can't join.\n\nPress ESC\n"), NULL, MM_NOTHING); - return false; - } - if (client) { - D_ParseFileneeded(serverlist[i].info.fileneedednum, - serverlist[i].info.fileneeded); - CONS_Printf(M_GetText("Checking files...\n")); - i = CL_CheckFiles(); - if (i == 3) // too many files - { - D_QuitNetGame(); - CL_Reset(); - D_StartTitle(); - M_StartMessage(M_GetText( - "You have too many WAD files loaded\n" - "to add ones the server is using.\n" - "Please restart SRB2 before connecting.\n\n" - "Press ESC\n" - ), NULL, MM_NOTHING); - return false; - } - else if (i == 2) // cannot join for some reason - { - D_QuitNetGame(); - CL_Reset(); - D_StartTitle(); - M_StartMessage(M_GetText( - "You have the wrong addons loaded.\n\n" - "To play on this server, restart\n" - "the game and don't load any addons.\n" - "SRB2 will automatically add\n" - "everything you need when you join.\n\n" - "Press ESC\n" - ), NULL, MM_NOTHING); - return false; - } - else if (i == 1) - cl_mode = CL_ASKJOIN; + serverinfo_pak *info = &serverlist[i].info; + + if (info->refusereason == REFUSE_SLOTS_FULL) + serverisfull = true; else { - // must download something - // can we, though? - if (!CL_CheckDownloadable()) // nope! + const char *reason = InvalidServerReason(info); + + // Quit here rather than downloading files + // and being refused later. + if (reason) { + char *message = Z_StrDup(reason); D_QuitNetGame(); CL_Reset(); D_StartTitle(); - M_StartMessage(M_GetText( - "You cannot connect to this server\n" - "because you cannot download the files\n" - "that you are missing from the server.\n\n" - "See the console or log file for\n" - "more details.\n\n" - "Press ESC\n" - ), NULL, MM_NOTHING); + M_StartMessage(message, NULL, MM_NOTHING); + Z_Free(message); return false; } - // no problem if can't send packet, we will retry later - if (CL_SendFileRequest()) - { - cl_mode = CL_DOWNLOADFILES; -#ifndef NONET - Snake_Initialise(); -#endif - } } + + D_ParseFileneeded(info->fileneedednum, info->fileneeded, 0); + + if (info->flags & SV_LOTSOFADDONS) + { + cl_mode = CL_ASKFULLFILELIST; + cl_lastcheckedfilecount = 0; + return true; + } + + cl_mode = CL_CHECKFILES; } else + { cl_mode = CL_ASKJOIN; // files need not be checked for the server. + *asksent = 0; + } return true; } @@ -1986,6 +2320,22 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic return false; break; + case CL_ASKFULLFILELIST: + if (cl_lastcheckedfilecount == UINT16_MAX) // All files retrieved + cl_mode = CL_CHECKFILES; + else if (fileneedednum != cl_lastcheckedfilecount || I_GetTime() >= *asksent) + { + if (CL_AskFileList(fileneedednum)) + { + cl_lastcheckedfilecount = fileneedednum; + *asksent = I_GetTime() + NEWTICRATE; + } + } + break; + case CL_CHECKFILES: + if (!CL_FinishedFileList()) + return false; + break; case CL_DOWNLOADFILES: waitmore = false; for (i = 0; i < fileneedednum; i++) @@ -2006,21 +2356,51 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic } #endif - cl_mode = CL_ASKJOIN; // don't break case continue to cljoin request now - /* FALLTHRU */ - + cl_mode = CL_LOADFILES; + break; + case CL_LOADFILES: + if (CL_LoadServerFiles()) + { + FreeFileNeeded(); + *asksent = 0; //This ensure the first join ask is right away + firstconnectattempttime = I_GetTime(); + cl_mode = CL_ASKJOIN; + } + break; case CL_ASKJOIN: - CL_LoadServerFiles(); + if (firstconnectattempttime + NEWTICRATE*300 < I_GetTime() && !server) + { + CONS_Printf(M_GetText("5 minute wait time exceeded.\n")); + CONS_Printf(M_GetText("Network game synchronization aborted.\n")); + D_QuitNetGame(); + CL_Reset(); + D_StartTitle(); + M_StartMessage(M_GetText( + "5 minute wait time exceeded.\n" + "You may retry connection.\n" + "\n" + "Press ESC\n" + ), NULL, MM_NOTHING); + return false; + } #ifndef NONET // prepare structures to save the file // WARNING: this can be useless in case of server not in GS_LEVEL // but since the network layer doesn't provide ordered packets... CL_PrepareDownloadSaveGame(tmpsave); #endif - if (CL_SendJoin()) + if (I_GetTime() >= *asksent && CL_SendJoin()) + { + *asksent = I_GetTime() + NEWTICRATE*3; cl_mode = CL_WAITJOINRESPONSE; + } + break; + case CL_WAITJOINRESPONSE: + if (I_GetTime() >= *asksent) + { + cl_mode = CL_ASKJOIN; + } break; - #ifndef NONET case CL_DOWNLOADSAVEGAME: // At this state, the first (and only) needed file is the gamestate @@ -2034,8 +2414,8 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic break; #endif - case CL_WAITJOINRESPONSE: case CL_CONNECTED: + case CL_CONFIRMCONNECT: //logic is handled by M_ConfirmConnect default: break; @@ -2043,7 +2423,6 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic case CL_ABORTED: cl_mode = CL_SEARCHING; return false; - } GetPackets(); @@ -2053,13 +2432,25 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic if (*oldtic != I_GetTime()) { I_OsPolling(); - for (; eventtail != eventhead; eventtail = (eventtail+1) & (MAXEVENTS-1)) - G_MapEventsToControls(&events[eventtail]); - if (gamekeydown[KEY_ESCAPE] || gamekeydown[KEY_JOY1+1]) + if (cl_mode == CL_CONFIRMCONNECT) + D_ProcessEvents(); //needed for menu system to receive inputs + else + { + // my hand has been forced and I am dearly sorry for this awful hack :vomit: + for (; eventtail != eventhead; eventtail = (eventtail+1) & (MAXEVENTS-1)) + { +#ifndef NONET + if (!Snake_Joy_Grabber(&events[eventtail])) +#endif + G_MapEventsToControls(&events[eventtail]); + } + } + + if (gamekeydown[KEY_ESCAPE] || gamekeydown[KEY_JOY1+1] || cl_mode == CL_ABORTED) { CONS_Printf(M_GetText("Network game synchronization aborted.\n")); -// M_StartMessage(M_GetText("Network game synchronization aborted.\n\nPress ESC\n"), NULL, MM_NOTHING); + M_StartMessage(M_GetText("Network game synchronization aborted.\n\nPress ESC\n"), NULL, MM_NOTHING); #ifndef NONET if (snake) @@ -2092,13 +2483,20 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic #ifndef NONET if (client && cl_mode != CL_CONNECTED && cl_mode != CL_ABORTED) { - if (cl_mode != CL_DOWNLOADFILES && cl_mode != CL_DOWNLOADSAVEGAME) + if (!snake) { - F_MenuPresTicker(true); // title sky + F_MenuPresTicker(); // title sky F_TitleScreenTicker(true); F_TitleScreenDrawer(); } CL_DrawConnectionStatus(); +#ifdef HAVE_THREADS + I_lock_mutex(&m_menu_mutex); +#endif + M_Drawer(); //Needed for drawing messageboxes on the connection screen +#ifdef HAVE_THREADS + I_unlock_mutex(m_menu_mutex); +#endif I_UpdateNoVsync(); // page flip or blit buffer if (moviemode) M_SaveFrame(); @@ -2111,7 +2509,10 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic #endif } else - I_Sleep(); + { + I_Sleep(cv_sleep.value); + I_UpdateTime(cv_timescale.value); + } return true; } @@ -2160,8 +2561,10 @@ static void CL_ConnectToServer(void) ClearAdminPlayers(); pnumnodes = 1; oldtic = I_GetTime() - 1; + #ifndef NONET asksent = (tic_t) - TICRATE; + firstconnectattempttime = I_GetTime(); i = SL_SearchServer(servernode); @@ -2463,7 +2866,7 @@ void CL_ClearPlayer(INT32 playernum) // // Removes a player from the current game // -static void CL_RemovePlayer(INT32 playernum, kickreason_t reason) +void CL_RemovePlayer(INT32 playernum, kickreason_t reason) { // Sanity check: exceptional cases (i.e. c-fails) can cause multiple // kick commands to be issued for the same player. @@ -2536,14 +2939,14 @@ static void CL_RemovePlayer(INT32 playernum, kickreason_t reason) } } - LUAh_PlayerQuit(&players[playernum], reason); // Lua hook for player quitting + LUA_HookPlayerQuit(&players[playernum], reason); // Lua hook for player quitting // don't look through someone's view who isn't there if (playernum == displayplayer) { // Call ViewpointSwitch hooks here. // The viewpoint was forcibly changed. - LUAh_ViewpointSwitch(&players[consoleplayer], &players[consoleplayer], true); + LUA_HookViewpointSwitch(&players[consoleplayer], &players[consoleplayer], true); displayplayer = consoleplayer; } @@ -2599,11 +3002,18 @@ void CL_Reset(void) doomcom->numslots = 1; SV_StopServer(); SV_ResetServer(); - CV_RevertNetVars(); // make sure we don't leave any fileneeded gunk over from a failed join + FreeFileNeeded(); fileneedednum = 0; - memset(fileneeded, 0, sizeof(fileneeded)); + +#ifndef NONET + totalfilesrequestednum = 0; + totalfilesrequestedsize = 0; +#endif + firstconnectattempttime = 0; + serverisfull = false; + connectiontimeout = (tic_t)cv_nettimeout.value; //reset this temporary hack // D_StartTitle should get done now, but the calling function will handle it } @@ -2858,6 +3268,34 @@ static void Command_Kick(void) else CONS_Printf(M_GetText("Only the server or a remote admin can use this.\n")); } + +static void Command_ResendGamestate(void) +{ + SINT8 playernum; + + if (COM_Argc() == 1) + { + CONS_Printf(M_GetText("resendgamestate : resend the game state to a player\n")); + return; + } + else if (client) + { + CONS_Printf(M_GetText("Only the server can use this.\n")); + return; + } + + playernum = nametonum(COM_Argv(1)); + if (playernum == -1 || playernum == 0) + return; + + // Send a PT_WILLRESENDGAMESTATE packet to the client so they know what's going on + netbuffer->packettype = PT_WILLRESENDGAMESTATE; + if (!HSendPacket(playernode[playernum], true, 0, 0)) + { + CONS_Alert(CONS_ERROR, M_GetText("A problem occured, please try again.\n")); + return; + } +} #endif static void Got_KickCmd(UINT8 **p, INT32 playernum) @@ -3023,7 +3461,7 @@ static void Got_KickCmd(UINT8 **p, INT32 playernum) if (pnum == consoleplayer) { - LUAh_GameQuit(false); + LUA_HookBool(false, HOOK(GameQuit)); #ifdef DUMPCONSISTENCY if (msg == KICK_MSG_CON_FAIL) SV_SavedGame(); #endif @@ -3065,41 +3503,13 @@ static void Got_KickCmd(UINT8 **p, INT32 playernum) CL_RemovePlayer(pnum, kickreason); } -static void Command_ResendGamestate(void) -{ - SINT8 playernum; - - if (COM_Argc() == 1) - { - CONS_Printf(M_GetText("resendgamestate : resend the game state to a player\n")); - return; - } - else if (client) - { - CONS_Printf(M_GetText("Only the server can use this.\n")); - return; - } - - playernum = nametonum(COM_Argv(1)); - if (playernum == -1 || playernum == 0) - return; - - // Send a PT_WILLRESENDGAMESTATE packet to the client so they know what's going on - netbuffer->packettype = PT_WILLRESENDGAMESTATE; - if (!HSendPacket(playernode[playernum], true, 0, 0)) - { - CONS_Alert(CONS_ERROR, M_GetText("A problem occured, please try again.\n")); - return; - } -} - static CV_PossibleValue_t netticbuffer_cons_t[] = {{0, "MIN"}, {3, "MAX"}, {0, NULL}}; consvar_t cv_netticbuffer = CVAR_INIT ("netticbuffer", "1", CV_SAVE, netticbuffer_cons_t, NULL); -consvar_t cv_allownewplayer = CVAR_INIT ("allowjoin", "On", CV_SAVE|CV_NETVAR, CV_OnOff, NULL); +consvar_t cv_allownewplayer = CVAR_INIT ("allowjoin", "On", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_OnOff, NULL); consvar_t cv_joinnextround = CVAR_INIT ("joinnextround", "Off", CV_SAVE|CV_NETVAR, CV_OnOff, NULL); /// \todo not done static CV_PossibleValue_t maxplayers_cons_t[] = {{2, "MIN"}, {32, "MAX"}, {0, NULL}}; -consvar_t cv_maxplayers = CVAR_INIT ("maxplayers", "8", CV_SAVE|CV_NETVAR, maxplayers_cons_t, NULL); +consvar_t cv_maxplayers = CVAR_INIT ("maxplayers", "8", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, maxplayers_cons_t, NULL); static CV_PossibleValue_t joindelay_cons_t[] = {{1, "MIN"}, {3600, "MAX"}, {0, "Off"}, {0, NULL}}; consvar_t cv_joindelay = CVAR_INIT ("joindelay", "10", CV_SAVE|CV_NETVAR, joindelay_cons_t, NULL); static CV_PossibleValue_t rejointimeout_cons_t[] = {{1, "MIN"}, {60 * FRACUNIT, "MAX"}, {0, "Off"}, {0, NULL}}; @@ -3110,12 +3520,12 @@ consvar_t cv_resynchattempts = CVAR_INIT ("resynchattempts", "10", CV_SAVE|CV_NE consvar_t cv_blamecfail = CVAR_INIT ("blamecfail", "Off", CV_SAVE|CV_NETVAR, CV_OnOff, NULL); // max file size to send to a player (in kilobytes) -static CV_PossibleValue_t maxsend_cons_t[] = {{0, "MIN"}, {51200, "MAX"}, {0, NULL}}; +static CV_PossibleValue_t maxsend_cons_t[] = {{0, "MIN"}, {204800, "MAX"}, {0, NULL}}; consvar_t cv_maxsend = CVAR_INIT ("maxsend", "4096", CV_SAVE|CV_NETVAR, maxsend_cons_t, NULL); consvar_t cv_noticedownload = CVAR_INIT ("noticedownload", "Off", CV_SAVE|CV_NETVAR, CV_OnOff, NULL); // Speed of file downloading (in packets per tic) -static CV_PossibleValue_t downloadspeed_cons_t[] = {{0, "MIN"}, {32, "MAX"}, {0, NULL}}; +static CV_PossibleValue_t downloadspeed_cons_t[] = {{1, "MIN"}, {300, "MAX"}, {0, NULL}}; consvar_t cv_downloadspeed = CVAR_INIT ("downloadspeed", "16", CV_SAVE|CV_NETVAR, downloadspeed_cons_t, NULL); static void Got_AddPlayer(UINT8 **p, INT32 playernum); @@ -3127,22 +3537,22 @@ void D_ClientServerInit(void) VERSION/100, VERSION%100, SUBVERSION)); #ifndef NONET - COM_AddCommand("getplayernum", Command_GetPlayerNum); - COM_AddCommand("kick", Command_Kick); - COM_AddCommand("ban", Command_Ban); - COM_AddCommand("banip", Command_BanIP); - COM_AddCommand("clearbans", Command_ClearBans); - COM_AddCommand("showbanlist", Command_ShowBan); - COM_AddCommand("reloadbans", Command_ReloadBan); - COM_AddCommand("connect", Command_connect); - COM_AddCommand("nodes", Command_Nodes); - COM_AddCommand("resendgamestate", Command_ResendGamestate); + COM_AddCommand("getplayernum", Command_GetPlayerNum, COM_LUA); + COM_AddCommand("kick", Command_Kick, COM_LUA); + COM_AddCommand("ban", Command_Ban, COM_LUA); + COM_AddCommand("banip", Command_BanIP, COM_LUA); + COM_AddCommand("clearbans", Command_ClearBans, COM_LUA); + COM_AddCommand("showbanlist", Command_ShowBan, COM_LUA); + COM_AddCommand("reloadbans", Command_ReloadBan, COM_LUA); + COM_AddCommand("connect", Command_connect, COM_LUA); + COM_AddCommand("nodes", Command_Nodes, COM_LUA); + COM_AddCommand("resendgamestate", Command_ResendGamestate, COM_LUA); #ifdef PACKETDROP - COM_AddCommand("drop", Command_Drop); - COM_AddCommand("droprate", Command_Droprate); + COM_AddCommand("drop", Command_Drop, COM_LUA); + COM_AddCommand("droprate", Command_Droprate, COM_LUA); #endif #ifdef _DEBUG - COM_AddCommand("numnodes", Command_Numnodes); + COM_AddCommand("numnodes", Command_Numnodes, COM_LUA); #endif #endif @@ -3231,6 +3641,11 @@ void SV_ResetServer(void) // clear server_context memset(server_context, '-', 8); + CV_RevertNetVars(); + + // Ensure synched when creating a new server + M_CopyGameData(serverGamedata, clientGamedata); + DEBFILE("\n-=-=-=-=-=-=-= Server Reset =-=-=-=-=-=-=-\n\n"); } @@ -3256,6 +3671,9 @@ static inline void SV_GenContext(void) // void D_QuitNetGame(void) { + mousegrabbedbylua = true; + I_UpdateMouseGrab(); + if (!netgame || !netbuffer) return; @@ -3351,14 +3769,13 @@ static void Got_AddPlayer(UINT8 **p, INT32 playernum) if (server && I_GetNodeAddress) { + char addressbuffer[64]; const char *address = I_GetNodeAddress(node); - char *port = NULL; if (address) // MI: fix msvcrt.dll!_mbscat crash? { - strcpy(playeraddress[newplayernum], address); - port = strchr(playeraddress[newplayernum], ':'); - if (port) - *port = '\0'; + strcpy(addressbuffer, address); + strcpy(playeraddress[newplayernum], + I_NetSplitAddress(addressbuffer, NULL)); } } } @@ -3443,7 +3860,7 @@ static void Got_AddPlayer(UINT8 **p, INT32 playernum) COM_BufAddText(va("sayto %d %s\n", newplayernum, motd)); if (!rejoined) - LUAh_PlayerJoin(newplayernum); + LUA_HookInt(newplayernum, HOOK(PlayerJoin)); } static boolean SV_AddWaitingPlayers(const char *name, const char *name2) @@ -3620,6 +4037,78 @@ static size_t TotalTextCmdPerTic(tic_t tic) return total; } +static const char * +ConnectionRefused (SINT8 node, INT32 rejoinernum) +{ + clientconfig_pak *cc = &netbuffer->u.clientcfg; + + boolean rejoining = (rejoinernum != -1); + + if (!node)/* server connecting to itself */ + return NULL; + + if ( + cc->modversion != MODVERSION || + strncmp(cc->application, SRB2APPLICATION, + sizeof cc->application) + ){ + return/* this is probably client's fault */ + "Incompatible."; + } + else if (bannednode && bannednode[node]) + { + return + "You have been banned\n" + "from the server."; + } + else if (cc->localplayers != 1) + { + return + "Wrong player count."; + } + + if (!rejoining) + { + if (!cv_allownewplayer.value) + { + return + "The server is not accepting\n" + "joins for the moment."; + } + else if (D_NumPlayers() >= cv_maxplayers.value) + { + return va( + "Maximum players reached: %d", + cv_maxplayers.value - D_NumBots()); + } + } + + if (luafiletransfers) + { + return + "The serveris broadcasting a file\n" + "requested by a Lua script.\n" + "Please wait a bit and then\n" + "try rejoining."; + } + + if (netgame) + { + const tic_t th = 2 * cv_joindelay.value * TICRATE; + + if (joindelay > th) + { + return va( + "Too many people are connecting.\n" + "Please wait %d seconds and then\n" + "try rejoining.", + (joindelay - th) / TICRATE); + } + } + + return NULL; +} + /** Called when a PT_CLIENTJOIN packet is received * * \param node The packet sender @@ -3630,33 +4119,14 @@ static void HandleConnect(SINT8 node) char names[MAXSPLITSCREENPLAYERS][MAXPLAYERNAME + 1]; INT32 rejoinernum; INT32 i; + const char *refuse; rejoinernum = FindRejoinerNum(node); - if (bannednode && bannednode[node]) - SV_SendRefuse(node, M_GetText("You have been banned\nfrom the server.")); - else if (netbuffer->u.clientcfg._255 != 255 || - netbuffer->u.clientcfg.packetversion != PACKETVERSION) - SV_SendRefuse(node, "Incompatible packet formats."); - else if (strncmp(netbuffer->u.clientcfg.application, SRB2APPLICATION, - sizeof netbuffer->u.clientcfg.application)) - SV_SendRefuse(node, "Different SRB2 modifications\nare not compatible."); - else if (netbuffer->u.clientcfg.version != VERSION - || netbuffer->u.clientcfg.subversion != SUBVERSION) - SV_SendRefuse(node, va(M_GetText("Different SRB2 versions cannot\nplay a netgame!\n(server version %d.%d.%d)"), VERSION/100, VERSION%100, SUBVERSION)); - else if (!cv_allownewplayer.value && node && rejoinernum == -1) - SV_SendRefuse(node, M_GetText("The server is not accepting\njoins for the moment.")); - else if (D_NumPlayers() >= cv_maxplayers.value && rejoinernum == -1) - SV_SendRefuse(node, va(M_GetText("Maximum players reached: %d"), cv_maxplayers.value)); - else if (netgame && netbuffer->u.clientcfg.localplayers > 1) // Hacked client? - SV_SendRefuse(node, M_GetText("Too many players from\nthis node.")); - else if (netgame && !netbuffer->u.clientcfg.localplayers) // Stealth join? - SV_SendRefuse(node, M_GetText("No players from\nthis node.")); - else if (luafiletransfers) - SV_SendRefuse(node, M_GetText("The server is broadcasting a file\nrequested by a Lua script.\nPlease wait a bit and then\ntry rejoining.")); - else if (netgame && joindelay > 2 * (tic_t)cv_joindelay.value * TICRATE) - SV_SendRefuse(node, va(M_GetText("Too many people are connecting.\nPlease wait %d seconds and then\ntry rejoining."), - (joindelay - 2 * cv_joindelay.value * TICRATE) / TICRATE)); + refuse = ConnectionRefused(node, rejoinernum); + + if (refuse) + SV_SendRefuse(node, refuse); else { #ifndef NONET @@ -3723,7 +4193,7 @@ static void HandleConnect(SINT8 node) static void HandleShutdown(SINT8 node) { (void)node; - LUAh_GameQuit(false); + LUA_HookBool(false, HOOK(GameQuit)); D_QuitNetGame(); CL_Reset(); D_StartTitle(); @@ -3738,7 +4208,7 @@ static void HandleShutdown(SINT8 node) static void HandleTimeout(SINT8 node) { (void)node; - LUAh_GameQuit(false); + LUA_HookBool(false, HOOK(GameQuit)); D_QuitNetGame(); CL_Reset(); D_StartTitle(); @@ -3771,6 +4241,7 @@ static void HandleServerInfo(SINT8 node) static void PT_WillResendGamestate(void) { +#ifndef NONET char tmpsave[256]; if (server || cl_redownloadinggamestate) @@ -3793,10 +4264,12 @@ static void PT_WillResendGamestate(void) CL_PrepareDownloadSaveGame(tmpsave); cl_redownloadinggamestate = true; +#endif } static void PT_CanReceiveGamestate(SINT8 node) { +#ifndef NONET if (client || sendingsavegame[node]) return; @@ -3804,6 +4277,9 @@ static void PT_CanReceiveGamestate(SINT8 node) SV_SendSaveGame(node, true); // Resend a complete game state resendingsavegame[node] = true; +#else + (void)node; +#endif } /** Handles a packet received from a node that isn't in game @@ -3830,31 +4306,40 @@ static void HandlePacketFromAwayNode(SINT8 node) switch (netbuffer->packettype) { case PT_ASKINFOVIAMS: -#if 0 + Net_CloseConnection(node); + break; + + case PT_TELLFILESNEEDED: if (server && serverrunning) { - INT32 clientnode; - if (ms_RoomId < 0) // ignore if we're not actually on the MS right now - { - Net_CloseConnection(node); // and yes, close connection - return; - } - clientnode = I_NetMakeNode(netbuffer->u.msaskinfo.clientaddr); - if (clientnode != -1) - { - SV_SendServerInfo(clientnode, (tic_t)LONG(netbuffer->u.msaskinfo.time)); - SV_SendPlayerInfo(clientnode); // Send extra info - Net_CloseConnection(clientnode); - // Don't close connection to MS... - } - else - Net_CloseConnection(node); // ...unless the IP address is not valid + UINT8 *p; + INT32 firstfile = netbuffer->u.filesneedednum; + + netbuffer->packettype = PT_MOREFILESNEEDED; + netbuffer->u.filesneededcfg.first = firstfile; + netbuffer->u.filesneededcfg.more = 0; + + p = PutFileNeeded(firstfile); + + HSendPacket(node, false, 0, p - ((UINT8 *)&netbuffer->u)); + } + else // Shouldn't get this if you aren't the server...? + Net_CloseConnection(node); + break; + + case PT_MOREFILESNEEDED: + if (server && serverrunning) + { // But wait I thought I'm the server? + Net_CloseConnection(node); + break; + } + SERVERONLY + if (cl_mode == CL_ASKFULLFILELIST && netbuffer->u.filesneededcfg.first == fileneedednum) + { + D_ParseFileneeded(netbuffer->u.filesneededcfg.num, netbuffer->u.filesneededcfg.files, netbuffer->u.filesneededcfg.first); + if (!netbuffer->u.filesneededcfg.more) + cl_lastcheckedfilecount = UINT16_MAX; // Got the whole file list } - else - Net_CloseConnection(node); // you're not supposed to get it, so ignore it -#else - Net_CloseConnection(node); -#endif break; case PT_ASKINFO: @@ -3880,13 +4365,24 @@ static void HandlePacketFromAwayNode(SINT8 node) if (!reason) I_Error("Out of memory!\n"); - D_QuitNetGame(); - CL_Reset(); - D_StartTitle(); + if (strstr(reason, "Maximum players reached")) + { + serverisfull = true; + //Special timeout for when refusing due to player cap. The client will wait 3 seconds between join requests when waiting for a slot, so we need this to be much longer + //We set it back to the value of cv_nettimeout.value in CL_Reset + connectiontimeout = NEWTICRATE*7; + cl_mode = CL_ASKJOIN; + free(reason); + break; + } M_StartMessage(va(M_GetText("Server refuses connection\n\nReason:\n%s"), reason), NULL, MM_NOTHING); + D_QuitNetGame(); + CL_Reset(); + D_StartTitle(); + free(reason); // Will be reset by caller. Signals refusal. @@ -3911,6 +4407,8 @@ static void HandlePacketFromAwayNode(SINT8 node) maketic = gametic = neededtic = (tic_t)LONG(netbuffer->u.servercfg.gametic); G_SetGametype(netbuffer->u.servercfg.gametype); modifiedgame = netbuffer->u.servercfg.modifiedgame; + if (netbuffer->u.servercfg.usedCheats) + G_SetUsedCheats(true); memcpy(server_context, netbuffer->u.servercfg.server_context, 8); } @@ -4090,8 +4588,10 @@ static void HandlePacketFromPlayer(SINT8 node) // Check player consistancy during the level if (realstart <= gametic && realstart + BACKUPTICS - 1 > gametic && gamestate == GS_LEVEL && consistancy[realstart%BACKUPTICS] != SHORT(netbuffer->u.clientpak.consistancy) - && !resendingsavegame[node] && savegameresendcooldown[node] <= I_GetTime() - && !SV_ResendingSavegameToAnyone()) +#ifndef NONET + && !SV_ResendingSavegameToAnyone() +#endif + && !resendingsavegame[node] && savegameresendcooldown[node] <= I_GetTime()) { if (cv_resynchattempts.value) { @@ -4781,8 +5281,10 @@ static void SV_Maketic(void) maketic++; } -void TryRunTics(tic_t realtics) +boolean TryRunTics(tic_t realtics) { + boolean ticking; + // the machine has lagged but it is not so bad if (realtics > TICRATE/7) // FIXME: consistency failure!! { @@ -4806,7 +5308,7 @@ void TryRunTics(tic_t realtics) if (demoplayback) { - neededtic = gametic + (realtics * cv_playbackspeed.value); + neededtic = gametic + realtics; // start a game after a demo maketic += realtics; firstticstosend = maketic; @@ -4826,10 +5328,22 @@ void TryRunTics(tic_t realtics) } #endif - if (player_joining) - return; + ticking = neededtic > gametic; - if (neededtic > gametic) + if (ticking) + { + if (realtics) + hu_stopped = false; + } + + if (player_joining) + { + if (realtics) + hu_stopped = true; + return false; + } + + if (ticking) { if (advancedemo) { @@ -4842,22 +5356,36 @@ void TryRunTics(tic_t realtics) // run the count * tics while (neededtic > gametic) { + boolean update_stats = !(paused || P_AutoPause()); + DEBFILE(va("============ Running tic %d (local %d)\n", gametic, localgametic)); - ps_tictime = I_GetPreciseTime(); + if (update_stats) + PS_START_TIMING(ps_tictime); G_Ticker((gametic % NEWTICRATERATIO) == 0); ExtraDataTicker(); gametic++; consistancy[gametic%BACKUPTICS] = Consistancy(); - ps_tictime = I_GetPreciseTime() - ps_tictime; + if (update_stats) + { + PS_STOP_TIMING(ps_tictime); + PS_UpdateTickStats(); + } // Leave a certain amount of tics present in the net buffer as long as we've ran at least one tic this frame. if (client && gamestate == GS_LEVEL && leveltime > 3 && neededtic <= gametic + cv_netticbuffer.value) break; } } + else + { + if (realtics) + hu_stopped = true; + } + + return ticking; } /* @@ -4995,9 +5523,11 @@ void NetUpdate(void) if (client) { +#ifndef NONET // If the client just finished redownloading the game state, load it if (cl_redownloadinggamestate && fileneeded[0].status == FS_FOUND) CL_ReloadReceivedSavegame(); +#endif CL_SendClientCmd(); // Send tic cmd hu_redownloadinggamestate = cl_redownloadinggamestate; @@ -5083,6 +5613,19 @@ INT32 D_NumPlayers(void) return num; } +/** Similar to the above, but counts only bots. + * Purpose is to remove bots from both the player count and the + * max player count on the server view +*/ +INT32 D_NumBots(void) +{ + INT32 num = 0, ix; + for (ix = 0; ix < MAXPLAYERS; ix++) + if (playeringame[ix] && players[ix].bot) + num++; + return num; +} + tic_t GetLag(INT32 node) { return gametic - nettics[node]; diff --git a/src/d_clisrv.h b/src/d_clisrv.h index f3eb52423..04a7b5ba2 100644 --- a/src/d_clisrv.h +++ b/src/d_clisrv.h @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -22,11 +22,15 @@ #include "mserv.h" /* -The 'packet version' is used to distinguish packet formats. -This version is independent of VERSION and SUBVERSION. Different -applications may follow different packet versions. +The 'packet version' is used to distinguish packet +formats. This version is independent of VERSION and +SUBVERSION. Different applications may follow different +packet versions. + +If you change the struct or the meaning of a field +therein, increment this number. */ -#define PACKETVERSION 3 +#define PACKETVERSION 4 // Network play related stuff. // There is a data struct that stores network @@ -90,6 +94,9 @@ typedef enum PT_LOGIN, // Login attempt from the client. + PT_TELLFILESNEEDED, // Client, to server: "what other files do I need starting from this number?" + PT_MOREFILESNEEDED, // Server, to client: "you need these (+ more on top of those)" + PT_PING, // Packet sent to tell clients the other client's latency to server. NUMPACKETTYPE } packettype_t; @@ -141,9 +148,6 @@ typedef struct typedef struct { - UINT8 version; // Different versions don't work - UINT8 subversion; // Contains build version - // Server launch stuffs UINT8 serverplayer; UINT8 totalslotnum; // "Slots": highest player number in use plus one. @@ -154,6 +158,7 @@ typedef struct UINT8 gametype; UINT8 modifiedgame; + UINT8 usedCheats; char server_context[8]; // Unique context id, generated at server startup. } ATTRPACK serverconfig_pak; @@ -190,16 +195,22 @@ typedef struct typedef struct { - UINT8 _255;/* see serverinfo_pak */ - UINT8 packetversion; + UINT8 modversion; char application[MAXAPPLICATION]; - UINT8 version; // Different versions don't work - UINT8 subversion; // Contains build version UINT8 localplayers; UINT8 mode; char names[MAXSPLITSCREENPLAYERS][MAXPLAYERNAME]; } ATTRPACK clientconfig_pak; +#define SV_DEDICATED 0x40 // server is dedicated +#define SV_LOTSOFADDONS 0x20 // flag used to ask for full file list in d_netfil + +enum { + REFUSE_JOINS_DISABLED = 1, + REFUSE_SLOTS_FULL, + REFUSE_BANNED, +}; + #define MAXSERVERNAME 32 #define MAXFILENEEDED 915 // This packet is too large @@ -217,11 +228,11 @@ typedef struct UINT8 subversion; UINT8 numberofplayer; UINT8 maxplayer; - UINT8 refusereason; // 0: joinable, 1: joins disabled, 2: full + UINT8 refusereason; // 0: joinable, REFUSE enum char gametypename[24]; UINT8 modifiedgame; UINT8 cheatsenabled; - UINT8 isdedicated; + UINT8 flags; UINT8 fileneedednum; tic_t time; tic_t leveltime; @@ -275,6 +286,14 @@ typedef struct UINT8 ctfteam; } ATTRPACK plrconfig; +typedef struct +{ + INT32 first; + UINT8 num; + UINT8 more; + UINT8 files[MAXFILENEEDED]; // is filled with writexxx (byteptr.h) +} ATTRPACK filesneededconfig_pak; + // // Network packet data // @@ -304,6 +323,8 @@ typedef struct msaskinfo_pak msaskinfo; // 22 bytes plrinfo playerinfo[MAXPLAYERS]; // 576 bytes(?) plrconfig playerconfig[MAXPLAYERS]; // (up to) 528 bytes(?) + INT32 filesneedednum; // 4 bytes + filesneededconfig_pak filesneededcfg; // ??? bytes UINT32 pingtable[MAXPLAYERS+1]; // 68 bytes } u; // This is needed to pack diff packet types data together } ATTRPACK doomdata_t; @@ -401,6 +422,7 @@ void CL_Reset(void); void CL_ClearPlayer(INT32 playernum); void CL_QueryServerList(msg_server_t *list); void CL_UpdateServerList(boolean internetsearch, INT32 room); +void CL_RemovePlayer(INT32 playernum, kickreason_t reason); // Is there a game running boolean Playing(void); @@ -409,7 +431,7 @@ boolean Playing(void); void D_QuitNetGame(void); //? How many ticks to run? -void TryRunTics(tic_t realtic); +boolean TryRunTics(tic_t realtic); // extra data for lmps // these functions scare me. they contain magic. @@ -426,6 +448,7 @@ extern char motd[254], server_context[8]; extern UINT8 playernode[MAXPLAYERS]; INT32 D_NumPlayers(void); +INT32 D_NumBots(void); void D_ResetTiccmds(void); tic_t GetLag(INT32 node); @@ -437,4 +460,7 @@ extern UINT8 hu_redownloadinggamestate; extern UINT8 adminpassmd5[16]; extern boolean adminpasswordset; + +extern boolean hu_stopped; + #endif diff --git a/src/d_event.h b/src/d_event.h index 1fd2e3824..5aa435060 100644 --- a/src/d_event.h +++ b/src/d_event.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -33,9 +33,10 @@ typedef enum typedef struct { evtype_t type; - INT32 data1; // keys / mouse/joystick buttons - INT32 data2; // mouse/joystick x move - INT32 data3; // mouse/joystick y move + INT32 key; // keys/mouse/joystick buttons + INT32 x; // mouse/joystick x move + INT32 y; // mouse/joystick y move + boolean repeated; // key repeat } event_t; // diff --git a/src/d_main.c b/src/d_main.c index 900390864..5861f9886 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -40,6 +40,7 @@ #include "hu_stuff.h" #include "i_sound.h" #include "i_system.h" +#include "i_time.h" #include "i_threads.h" #include "i_video.h" #include "m_argv.h" @@ -64,8 +65,9 @@ #include "deh_tables.h" // Dehacked list test #include "m_cond.h" // condition initialization #include "fastcmp.h" +#include "r_fps.h" // Frame interpolation/uncapped #include "keys.h" -#include "filesrch.h" // refreshdirmenu, mainwadstally +#include "filesrch.h" // refreshdirmenu #include "g_input.h" // tutorial mode control scheming #include "m_perfstats.h" @@ -96,11 +98,8 @@ int SUBVERSION; // platform independant focus loss UINT8 window_notinfocus = false; -// -// DEMO LOOP -// -static char *startupwadfiles[MAX_WADFILES]; -static char *startuppwads[MAX_WADFILES]; +static addfilelist_t startupwadfiles; +static addfilelist_t startuppwads; boolean devparm = false; // started game with -devparm @@ -119,6 +118,9 @@ boolean midi_disabled = false; boolean sound_disabled = false; boolean digital_disabled = false; +// +// DEMO LOOP +// boolean advancedemo; #ifdef DEBUGFILE INT32 debugload = 0; @@ -175,10 +177,53 @@ void D_ProcessEvents(void) boolean eaten; + // Reset possibly stale mouse info + G_SetMouseDeltas(0, 0, 1); + G_SetMouseDeltas(0, 0, 2); + mouse.buttons &= ~(MB_SCROLLUP|MB_SCROLLDOWN); + mouse2.buttons &= ~(MB_SCROLLUP|MB_SCROLLDOWN); + for (; eventtail != eventhead; eventtail = (eventtail+1) & (MAXEVENTS-1)) { + boolean hooked = false; + ev = &events[eventtail]; + // Set mouse buttons early in case event is eaten later + if (ev->type == ev_keydown || ev->type == ev_keyup) + { + // Mouse buttons + if ((UINT32)(ev->key - KEY_MOUSE1) < MOUSEBUTTONS) + { + if (ev->type == ev_keydown) + mouse.buttons |= 1 << (ev->key - KEY_MOUSE1); + else + mouse.buttons &= ~(1 << (ev->key - KEY_MOUSE1)); + } + else if ((UINT32)(ev->key - KEY_2MOUSE1) < MOUSEBUTTONS) + { + if (ev->type == ev_keydown) + mouse2.buttons |= 1 << (ev->key - KEY_2MOUSE1); + else + mouse2.buttons &= ~(1 << (ev->key - KEY_2MOUSE1)); + } + // Scroll (has no keyup event) + else switch (ev->key) { + case KEY_MOUSEWHEELUP: + mouse.buttons |= MB_SCROLLUP; + break; + case KEY_MOUSEWHEELDOWN: + mouse.buttons |= MB_SCROLLDOWN; + break; + case KEY_2MOUSEWHEELUP: + mouse2.buttons |= MB_SCROLLUP; + break; + case KEY_2MOUSEWHEELDOWN: + mouse2.buttons |= MB_SCROLLDOWN; + break; + } + } + // Screenshots over everything so that they can be taken anywhere. if (M_ScreenshotResponder(ev)) continue; // ate the event @@ -189,6 +234,12 @@ void D_ProcessEvents(void) continue; } + if (!CON_Ready() && !menuactive) { + if (G_LuaResponder(ev)) + continue; + hooked = true; + } + // Menu input #ifdef HAVE_THREADS I_lock_mutex(&m_menu_mutex); @@ -203,6 +254,12 @@ void D_ProcessEvents(void) if (eaten) continue; // menu ate the event + if (!hooked && !CON_Ready()) { + if (G_LuaResponder(ev)) + continue; + hooked = true; + } + // console input #ifdef HAVE_THREADS I_lock_mutex(&con_mutex); @@ -217,8 +274,16 @@ void D_ProcessEvents(void) if (eaten) continue; // ate the event + if (!hooked && !CON_Ready() && G_LuaResponder(ev)) + continue; + G_Responder(ev); } + + if (mouse.rdx || mouse.rdy) + G_SetMouseDeltas(mouse.rdx, mouse.rdy, 1); + if (mouse2.rdx || mouse2.rdy) + G_SetMouseDeltas(mouse2.rdx, mouse2.rdy, 2); } // @@ -413,7 +478,8 @@ static void D_Display(void) if (!automapactive && !dedicated && cv_renderview.value) { - ps_rendercalltime = I_GetPreciseTime(); + R_ApplyLevelInterpolators(R_UsingFrameInterpolation() ? rendertimefrac : FRACUNIT); + PS_START_TIMING(ps_rendercalltime); if (players[displayplayer].mo || players[displayplayer].playerstate == PST_DEAD) { topleft = screens[0] + viewwindowy*vid.width + viewwindowx; @@ -460,7 +526,8 @@ static void D_Display(void) if (postimgtype2) V_DoPostProcessor(1, postimgtype2, postimgparam2); } - ps_rendercalltime = I_GetPreciseTime() - ps_rendercalltime; + PS_STOP_TIMING(ps_rendercalltime); + R_RestoreLevelInterpolators(); } if (lastdraw) @@ -474,7 +541,7 @@ static void D_Display(void) lastdraw = false; } - ps_uitime = I_GetPreciseTime(); + PS_START_TIMING(ps_uitime); if (gamestate == GS_LEVEL) { @@ -487,7 +554,7 @@ static void D_Display(void) } else { - ps_uitime = I_GetPreciseTime(); + PS_START_TIMING(ps_uitime); } } @@ -529,7 +596,7 @@ static void D_Display(void) CON_Drawer(); - ps_uitime = I_GetPreciseTime() - ps_uitime; + PS_STOP_TIMING(ps_uitime); // // wipe update @@ -615,9 +682,9 @@ static void D_Display(void) M_DrawPerfStats(); } - ps_swaptime = I_GetPreciseTime(); + PS_START_TIMING(ps_swaptime); I_FinishUpdate(); // page flip or blit buffer - ps_swaptime = I_GetPreciseTime() - ps_swaptime; + PS_STOP_TIMING(ps_swaptime); } } @@ -629,9 +696,14 @@ tic_t rendergametic; void D_SRB2Loop(void) { - tic_t oldentertics = 0, entertic = 0, realtics = 0, rendertimeout = INFTICS; + tic_t entertic = 0, oldentertics = 0, realtics = 0, rendertimeout = INFTICS; + double deltatics = 0.0; + double deltasecs = 0.0; static lumpnum_t gstartuplumpnum; + boolean interp = false; + boolean doDisplay = false; + if (dedicated) server = true; @@ -642,6 +714,7 @@ void D_SRB2Loop(void) I_DoStartupMouse(); #endif + I_UpdateTime(cv_timescale.value); oldentertics = I_GetTime(); // end of loading screen: CONS_Printf() will no more call FinishUpdate() @@ -682,6 +755,19 @@ void D_SRB2Loop(void) for (;;) { + // capbudget is the minimum precise_t duration of a single loop iteration + precise_t capbudget; + precise_t enterprecise = I_GetPreciseTime(); + precise_t finishprecise = enterprecise; + + { + // Casting the return value of a function is bad practice (apparently) + double budget = round((1.0 / R_GetFramerateCap()) * I_GetPrecisePrecision()); + capbudget = (precise_t) budget; + } + + I_UpdateTime(cv_timescale.value); + if (lastwipetic) { oldentertics = lastwipetic; @@ -693,7 +779,11 @@ void D_SRB2Loop(void) realtics = entertic - oldentertics; oldentertics = entertic; - refreshdirmenu = 0; // not sure where to put this, here as good as any? + if (demoplayback && gamestate == GS_LEVEL) + { + // Nicer place to put this. + realtics = realtics * cv_playbackspeed.value; + } #ifdef DEBUGFILE if (!realtics) @@ -701,64 +791,123 @@ void D_SRB2Loop(void) debugload--; #endif - if (!realtics && !singletics) - { - I_Sleep(); - continue; - } + interp = R_UsingFrameInterpolation() && !dedicated; + doDisplay = false; #ifdef HW3SOUND HW3S_BeginFrameUpdate(); #endif - // don't skip more than 10 frames at a time - // (fadein / fadeout cause massive frame skip!) - if (realtics > 8) - realtics = 1; + refreshdirmenu = 0; // not sure where to put this, here as good as any? - // process tics (but maybe not if realtic == 0) - TryRunTics(realtics); - - if (lastdraw || singletics || gametic > rendergametic) + if (realtics > 0 || singletics) { - rendergametic = gametic; - rendertimeout = entertic+TICRATE/17; + // don't skip more than 10 frames at a time + // (fadein / fadeout cause massive frame skip!) + if (realtics > 8) + realtics = 1; - // Update display, next frame, with current state. - D_Display(); + // process tics (but maybe not if realtic == 0) + TryRunTics(realtics); - if (moviemode) - M_SaveFrame(); - if (takescreenshot) // Only take screenshots after drawing. - M_DoScreenShot(); - } - else if (rendertimeout < entertic) // in case the server hang or netsplit - { - // Lagless camera! Yay! - if (gamestate == GS_LEVEL && netgame) + if (lastdraw || singletics || gametic > rendergametic) { - if (splitscreen && camera2.chase) - P_MoveChaseCamera(&players[secondarydisplayplayer], &camera2, false); - if (camera.chase) - P_MoveChaseCamera(&players[displayplayer], &camera, false); - } - D_Display(); + rendergametic = gametic; + rendertimeout = entertic + TICRATE/17; - if (moviemode) - M_SaveFrame(); - if (takescreenshot) // Only take screenshots after drawing. - M_DoScreenShot(); + doDisplay = true; + } + else if (rendertimeout < entertic) // in case the server hang or netsplit + { + // Lagless camera! Yay! + if (gamestate == GS_LEVEL && netgame) + { + // Evaluate the chase cam once for every local realtic + // This might actually be better suited inside G_Ticker or TryRunTics + for (tic_t chasecamtics = 0; chasecamtics < realtics; chasecamtics++) + { + if (splitscreen && camera2.chase) + P_MoveChaseCamera(&players[secondarydisplayplayer], &camera2, false); + if (camera.chase) + P_MoveChaseCamera(&players[displayplayer], &camera, false); + } + R_UpdateViewInterpolation(); + } + + doDisplay = true; + } + + renderisnewtic = true; + } + else + { + renderisnewtic = false; } - // consoleplayer -> displayplayer (hear sounds from viewpoint) + if (interp) + { + // I looked at the possibility of putting in a float drawer for + // perfstats and it's very complicated, so we'll just do this instead... + ps_interp_frac.value.p = (precise_t)((FIXED_TO_FLOAT(g_time.timefrac)) * 1000.0f); + ps_interp_lag.value.p = (precise_t)((deltasecs) * 1000.0f); + + renderdeltatics = FLOAT_TO_FIXED(deltatics); + + if (!(paused || P_AutoPause()) && deltatics < 1.0 && !hu_stopped) + { + rendertimefrac = g_time.timefrac; + } + else + { + rendertimefrac = FRACUNIT; + } + } + else + { + renderdeltatics = realtics * FRACUNIT; + rendertimefrac = FRACUNIT; + } + + if (interp || doDisplay) + { + D_Display(); + } + + // Only take screenshots after drawing. + if (moviemode) + M_SaveFrame(); + if (takescreenshot) + M_DoScreenShot(); + + // consoleplayer -> displayplayers (hear sounds from viewpoint) S_UpdateSounds(); // move positional sounds - S_UpdateClosedCaptions(); + if (realtics > 0 || singletics) + S_UpdateClosedCaptions(); #ifdef HW3SOUND HW3S_EndFrameUpdate(); #endif LUA_Step(); + + // Fully completed frame made. + finishprecise = I_GetPreciseTime(); + if (!singletics) + { + INT64 elapsed = (INT64)(finishprecise - enterprecise); + + // in the case of "match refresh rate" + vsync, don't sleep at all + const boolean vsync_with_match_refresh = cv_vidwait.value && cv_fpscap.value == 0; + + if (elapsed > 0 && (INT64)capbudget > elapsed && !vsync_with_match_refresh) + { + I_SleepDuration(capbudget - (finishprecise - enterprecise)); + } + } + // Capture the time once more to get the real delta time. + finishprecise = I_GetPreciseTime(); + deltasecs = (double)((INT64)(finishprecise - enterprecise)) / I_GetPrecisePrecision(); + deltatics = deltasecs * NEWTICRATE; } } @@ -860,35 +1009,68 @@ void D_StartTitle(void) tutorialmode = false; } -// -// D_AddFile -// -static void D_AddFile(char **list, const char *file) -{ - size_t pnumwadfiles; - char *newfile; +#define REALLOC_FILE_LIST \ + if (list->files == NULL) \ + { \ + list->files = calloc(sizeof(list->files), 2); \ + list->numfiles = 1; \ + } \ + else \ + { \ + index = list->numfiles; \ + list->files = realloc(list->files, sizeof(list->files) * ((++list->numfiles) + 1)); \ + if (list->files == NULL) \ + I_Error("%s: No more free memory to add file %s", __FUNCTION__, file); \ + } - for (pnumwadfiles = 0; list[pnumwadfiles]; pnumwadfiles++) - ; +static void D_AddFile(addfilelist_t *list, const char *file) +{ + char *newfile; + size_t index = 0; + + REALLOC_FILE_LIST newfile = malloc(strlen(file) + 1); if (!newfile) - { - I_Error("No more free memory to AddFile %s",file); - } - strcpy(newfile, file); + I_Error("D_AddFile: No more free memory to add file %s", file); - list[pnumwadfiles] = newfile; + strcpy(newfile, file); + list->files[index] = newfile; } -static inline void D_CleanFile(char **list) +static void D_AddFolder(addfilelist_t *list, const char *file) { - size_t pnumwadfiles; - for (pnumwadfiles = 0; list[pnumwadfiles]; pnumwadfiles++) + char *newfile; + size_t index = 0; + + REALLOC_FILE_LIST + + newfile = malloc(strlen(file) + 2); // Path delimiter + NULL terminator + if (!newfile) + I_Error("D_AddFolder: No more free memory to add folder %s", file); + + strcpy(newfile, file); + strcat(newfile, PATHSEP); + + list->files[index] = newfile; +} + +#undef REALLOC_FILE_LIST + +static inline void D_CleanFile(addfilelist_t *list) +{ + if (list->files) { - free(list[pnumwadfiles]); - list[pnumwadfiles] = NULL; + size_t pnumwadfiles = 0; + + for (; pnumwadfiles < list->numfiles; pnumwadfiles++) + free(list->files[pnumwadfiles]); + + free(list->files); + list->files = NULL; } + + list->numfiles = 0; } ///\brief Checks if a netgame URL is being handled, and changes working directory to the EXE's if so. @@ -972,7 +1154,7 @@ static void IdentifyVersion(void) // Load the IWAD if (srb2wad != NULL && FIL_ReadFileOK(srb2wad)) - D_AddFile(startupwadfiles, srb2wad); + D_AddFile(&startupwadfiles, srb2wad); else I_Error("srb2.pk3 not found! Expected in %s, ss file: %s\n", srb2waddir, srb2wad); @@ -983,14 +1165,14 @@ static void IdentifyVersion(void) // checking in D_SRB2Main // Add the maps - D_AddFile(startupwadfiles, va(pandf,srb2waddir,"zones.pk3")); + D_AddFile(&startupwadfiles, va(pandf,srb2waddir, "zones.pk3")); // Add the players - D_AddFile(startupwadfiles, va(pandf,srb2waddir, "player.dta")); + D_AddFile(&startupwadfiles, va(pandf,srb2waddir, "player.dta")); #ifdef USE_PATCH_DTA // Add our crappy patches to fix our bugs - D_AddFile(startupwadfiles, va(pandf,srb2waddir,"patch.pk3")); + D_AddFile(&startupwadfiles, va(pandf,srb2waddir, "patch.pk3")); #endif #if !defined (HAVE_SDL) || defined (HAVE_MIXER) @@ -1000,16 +1182,13 @@ static void IdentifyVersion(void) const char *musicpath = va(pandf,srb2waddir,str);\ int ms = W_VerifyNMUSlumps(musicpath, false); \ if (ms == 1) \ - D_AddFile(startupwadfiles, musicpath); \ + D_AddFile(&startupwadfiles, musicpath); \ else if (ms == 0) \ I_Error("File "str" has been modified with non-music/sound lumps"); \ } MUSICTEST("music.dta") - MUSICTEST("patch_music.pk3") -#ifdef DEVELOP // remove when music_new.dta is merged into music.dta - MUSICTEST("music_new.dta") -#endif + //MUSICTEST("patch_music.pk3") } #endif } @@ -1045,7 +1224,7 @@ void D_SRB2Main(void) // Print GPL notice for our console users (Linux) CONS_Printf( "\n\nSonic Robo Blast 2\n" - "Copyright (C) 1998-2021 by Sonic Team Junior\n\n" + "Copyright (C) 1998-2023 by Sonic Team Junior\n\n" "This program comes with ABSOLUTELY NO WARRANTY.\n\n" "This is free software, and you are welcome to redistribute it\n" "and/or modify it under the terms of the GNU General Public License\n" @@ -1171,24 +1350,31 @@ void D_SRB2Main(void) CONS_Printf("Z_Init(): Init zone memory allocation daemon. \n"); Z_Init(); + clientGamedata = M_NewGameDataStruct(); + serverGamedata = M_NewGameDataStruct(); + // Do this up here so that WADs loaded through the command line can use ExecCfg COM_Init(); - // add any files specified on the command line with -file wadfile - // to the wad list + // Add any files specified on the command line with + // "-file " or "-folder " to the add-on list if (!((M_GetUrlProtocolArg() || M_CheckParm("-connect")) && !M_CheckParm("-server"))) { - if (M_CheckParm("-file")) - { - // the parms after p are wadfile/lump names, - // until end of parms or another - preceded parm - while (M_IsNextParm()) - { - const char *s = M_GetNextParm(); + INT32 addontype = 0; + INT32 i; - if (s) // Check for NULL? - D_AddFile(startuppwads, s); - } + for (i = 1; i < myargc; i++) + { + if (!strcasecmp(myargv[i], "-file")) + addontype = 1; + else if (!strcasecmp(myargv[i], "-folder")) + addontype = 2; + else if (myargv[i][0] == '-' || myargv[i][0] == '+') + addontype = 0; + else if (addontype == 1) + D_AddFile(&startuppwads, myargv[i]); + else if (addontype == 2) + D_AddFolder(&startuppwads, myargv[i]); } } @@ -1210,8 +1396,8 @@ void D_SRB2Main(void) //---------------------------------------------------- READY TIME // we need to check for dedicated before initialization of some subsystems - CONS_Printf("I_StartupTimer()...\n"); - I_StartupTimer(); + CONS_Printf("I_InitializeTime()...\n"); + I_InitializeTime(); // Make backups of some SOCcable tables. P_BackupTables(); @@ -1227,8 +1413,8 @@ void D_SRB2Main(void) // load wad, including the main wad file CONS_Printf("W_InitMultipleFiles(): Adding IWAD and main PWADs.\n"); - W_InitMultipleFiles(startupwadfiles); - D_CleanFile(startupwadfiles); + W_InitMultipleFiles(&startupwadfiles); + D_CleanFile(&startupwadfiles); #ifndef DEVELOP // md5s last updated 22/02/20 (ddmmyy) @@ -1243,8 +1429,6 @@ void D_SRB2Main(void) // ...except it does if they slip maps in there, and that's what W_VerifyNMUSlumps is for. #endif //ifndef DEVELOP - mainwadstally = packetsizetally; // technically not accurate atm, remember to port the two-stage -file process from kart in 2.2.x - cht_Init(); //---------------------------------------------------- READY SCREEN @@ -1275,9 +1459,16 @@ void D_SRB2Main(void) I_RegisterSysCommands(); - CONS_Printf("W_InitMultipleFiles(): Adding extra PWADs.\n"); - W_InitMultipleFiles(startuppwads); - D_CleanFile(startuppwads); + CON_StopRefresh(); // Temporarily stop refreshing the screen for wad loading + + if (startuppwads.numfiles) + { + CONS_Printf("W_InitMultipleFiles(): Adding extra PWADs.\n"); + W_InitMultipleFiles(&startuppwads); + D_CleanFile(&startuppwads); + } + + CON_StartRefresh(); // Restart the refresh! CONS_Printf("HU_LoadGraphics()...\n"); HU_LoadGraphics(); @@ -1285,7 +1476,15 @@ void D_SRB2Main(void) //--------------------------------------------------------- CONFIG.CFG M_FirstLoadConfig(); // WARNING : this do a "COM_BufExecute()" - G_LoadGameData(); + if (M_CheckParm("-gamedata") && M_IsNextParm()) + { + // Moved from G_LoadGameData itself, as it would cause some crazy + // confusion issues when loading mods. + strlcpy(gamedatafilename, M_GetNextParm(), sizeof gamedatafilename); + } + + G_LoadGameData(clientGamedata); + M_CopyGameData(serverGamedata, clientGamedata); #if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL) VID_PrepareModeList(); // Regenerate Modelist according to cv_fullscreen @@ -1312,7 +1511,7 @@ void D_SRB2Main(void) else { if (!M_CheckParm("-server")) - G_SetGameModified(true); + G_SetUsedCheats(true); autostart = true; } } @@ -1481,6 +1680,8 @@ void D_SRB2Main(void) // as having been modified for the first game. M_PushSpecialParameters(); // push all "+" parameter at the command buffer + COM_BufExecute(); // ensure the command buffer gets executed before the map starts (+skin) + if (M_CheckParm("-gametype") && M_IsNextParm()) { // from Command_Map_f @@ -1514,7 +1715,7 @@ void D_SRB2Main(void) // ... unless you're in a dedicated server. Yes, technically this means you can view any level by // running a dedicated server and joining it yourself, but that's better than making dedicated server's // lives hell. - else if (!dedicated && M_MapLocked(pstartmap)) + else if (!dedicated && M_MapLocked(pstartmap, serverGamedata)) I_Error("You need to unlock this level before you can warp to it!\n"); else { @@ -1587,3 +1788,85 @@ const char *D_Home(void) if (usehome) return userhome; else return NULL; } + +static boolean check_top_dir(const char **path, const char *top) +{ + // empty string does NOT match + if (!strcmp(top, "")) + return false; + + if (!startswith(*path, top)) + return false; + + *path += strlen(top); + + // if it doesn't already end with a path separator, + // check if a separator follows + if (!endswith(top, PATHSEP)) + { + if (startswith(*path, PATHSEP)) + *path += strlen(PATHSEP); + else + return false; + } + + return true; +} + +static int cmp_strlen_desc(const void *a, const void *b) +{ + return ((int)strlen(*(const char*const*)b) - (int)strlen(*(const char*const*)a)); +} + +boolean D_IsPathAllowed(const char *path) +{ + const char *paths[] = { + srb2home, + srb2path, + cv_addons_folder.string + }; + + const size_t n_paths = sizeof paths / sizeof *paths; + + size_t i; + + // Sort folder paths by longest to shortest so + // overlapping paths work. E.g.: + // Path 1: /home/james/.srb2/addons + // Path 2: /home/james/.srb2 + qsort(paths, n_paths, sizeof *paths, cmp_strlen_desc); + + // These paths are allowed to be absolute + // path is offset so ".." can be checked only in the + // rest of the path + for (i = 0; i < n_paths; ++i) + { + if (check_top_dir(&path, paths[i])) + break; + } + + // Only if none of the presets matched + if (i == n_paths) + { + // Cannot be an absolute path + if (M_IsPathAbsolute(path)) + return false; + } + + // Cannot traverse upwards + if (strstr(path, "..")) + return false; + + return true; +} + +boolean D_CheckPathAllowed(const char *path, const char *why) +{ + if (!D_IsPathAllowed(path)) + { + CONS_Alert(CONS_WARNING, "%s: %s, location is not allowed\n", why, path); + return false; + } + + return true; +} diff --git a/src/d_main.h b/src/d_main.h index e282906d9..0a29f929b 100644 --- a/src/d_main.h +++ b/src/d_main.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -44,6 +44,9 @@ void D_ProcessEvents(void); const char *D_Home(void); +boolean D_IsPathAllowed(const char *path); +boolean D_CheckPathAllowed(const char *path, const char *why); + // // BASE LEVEL // diff --git a/src/d_net.c b/src/d_net.c index 9e5abe24a..768c9ac7e 100644 --- a/src/d_net.c +++ b/src/d_net.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -18,6 +18,7 @@ #include "doomdef.h" #include "g_game.h" +#include "i_time.h" #include "i_net.h" #include "i_system.h" #include "m_argv.h" @@ -614,7 +615,10 @@ void Net_WaitAllAckReceived(UINT32 timeout) while (timeout > I_GetTime() && !Net_AllAcksReceived()) { while (tictac == I_GetTime()) - I_Sleep(); + { + I_Sleep(cv_sleep.value); + I_UpdateTime(cv_timescale.value); + } tictac = I_GetTime(); HGetPacket(); Net_AckTicker(); @@ -815,6 +819,8 @@ static const char *packettypename[NUMPACKETTYPE] = "CLIENTJOIN", "NODETIMEOUT", "LOGIN", + "TELLFILESNEEDED", + "MOREFILESNEEDED", "PING" }; @@ -1142,8 +1148,9 @@ boolean HGetPacket(void) if (netbuffer->checksum != NetbufferChecksum()) { DEBFILE("Bad packet checksum\n"); - //Net_CloseConnection(nodejustjoined ? (doomcom->remotenode | FORCECLOSE) : doomcom->remotenode); - Net_CloseConnection(doomcom->remotenode); + // Do not disconnect or anything, just ignore the packet. + // Bad checksums with UDP tend to happen very scarcely + // so they are not normally an issue. continue; } @@ -1200,26 +1207,32 @@ static void Internal_FreeNodenum(INT32 nodenum) (void)nodenum; } +char *I_NetSplitAddress(char *host, char **port) +{ + boolean v4 = (strchr(host, '.') != NULL); + + host = strtok(host, v4 ? ":" : "[]"); + + if (port) + *port = strtok(NULL, ":"); + + return host; +} + SINT8 I_NetMakeNode(const char *hostname) { SINT8 newnode = -1; if (I_NetMakeNodewPort) { char *localhostname = strdup(hostname); - char *t = localhostname; - const char *port; + char *port; if (!localhostname) return newnode; + // retrieve portnum from address! - strtok(localhostname, ":"); - port = strtok(NULL, ":"); + hostname = I_NetSplitAddress(localhostname, &port); - // remove the port in the hostname as we've it already - while ((*t != ':') && (*t != '\0')) - t++; - *t = '\0'; - - newnode = I_NetMakeNodewPort(localhostname, port); + newnode = I_NetMakeNodewPort(hostname, port); free(localhostname); } return newnode; diff --git a/src/d_net.h b/src/d_net.h index dbc6d8ba5..ddedbef4a 100644 --- a/src/d_net.h +++ b/src/d_net.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 68deb8b34..af44e53d6 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -16,6 +16,7 @@ #include "console.h" #include "command.h" +#include "i_time.h" #include "i_system.h" #include "g_game.h" #include "hu_stuff.h" @@ -47,6 +48,8 @@ #include "m_cond.h" #include "m_anigif.h" #include "md5.h" +#include "m_perfstats.h" +#include "hardware/u_list.h" // TODO: this should be a standard utility class #ifdef NETGAME_DEVMODE #define CV_RESTRICT CV_NETVAR @@ -63,7 +66,9 @@ static void Got_WeaponPref(UINT8 **cp, INT32 playernum); static void Got_Mapcmd(UINT8 **cp, INT32 playernum); static void Got_ExitLevelcmd(UINT8 **cp, INT32 playernum); static void Got_RequestAddfilecmd(UINT8 **cp, INT32 playernum); +static void Got_RequestAddfoldercmd(UINT8 **cp, INT32 playernum); static void Got_Addfilecmd(UINT8 **cp, INT32 playernum); +static void Got_Addfoldercmd(UINT8 **cp, INT32 playernum); static void Got_Pause(UINT8 **cp, INT32 playernum); static void Got_Suicide(UINT8 **cp, INT32 playernum); static void Got_RandomSeed(UINT8 **cp, INT32 playernum); @@ -115,6 +120,7 @@ static void Command_Map_f(void); static void Command_ResetCamera_f(void); static void Command_Addfile(void); +static void Command_Addfolder(void); static void Command_ListWADS_f(void); static void Command_RunSOC(void); static void Command_Pause(void); @@ -187,7 +193,7 @@ static CV_PossibleValue_t joyport_cons_t[] = {{1, "/dev/js0"}, {2, "/dev/js1"}, static CV_PossibleValue_t teamscramble_cons_t[] = {{0, "Off"}, {1, "Random"}, {2, "Points"}, {0, NULL}}; static CV_PossibleValue_t startingliveslimit_cons_t[] = {{1, "MIN"}, {99, "MAX"}, {0, NULL}}; -static CV_PossibleValue_t sleeping_cons_t[] = {{-1, "MIN"}, {1000/TICRATE, "MAX"}, {0, NULL}}; +static CV_PossibleValue_t sleeping_cons_t[] = {{0, "MIN"}, {1000/TICRATE, "MAX"}, {0, NULL}}; static CV_PossibleValue_t competitionboxes_cons_t[] = {{0, "Normal"}, {1, "Mystery"}, //{2, "Teleport"}, {3, "None"}, {0, NULL}}; @@ -197,37 +203,37 @@ static CV_PossibleValue_t matchboxes_cons_t[] = {{0, "Normal"}, {1, "Mystery"}, static CV_PossibleValue_t chances_cons_t[] = {{0, "MIN"}, {9, "MAX"}, {0, NULL}}; static CV_PossibleValue_t pause_cons_t[] = {{0, "Server"}, {1, "All"}, {0, NULL}}; -consvar_t cv_showinputjoy = CVAR_INIT ("showinputjoy", "Off", 0, CV_OnOff, NULL); +consvar_t cv_showinputjoy = CVAR_INIT ("showinputjoy", "Off", CV_ALLOWLUA, CV_OnOff, NULL); #ifdef NETGAME_DEVMODE static consvar_t cv_fishcake = CVAR_INIT ("fishcake", "Off", CV_CALL|CV_NOSHOWHELP|CV_RESTRICT, CV_OnOff, Fishcake_OnChange); #endif static consvar_t cv_dummyconsvar = CVAR_INIT ("dummyconsvar", "Off", CV_CALL|CV_NOSHOWHELP, CV_OnOff, DummyConsvar_OnChange); -consvar_t cv_restrictskinchange = CVAR_INIT ("restrictskinchange", "Yes", CV_SAVE|CV_NETVAR|CV_CHEAT, CV_YesNo, NULL); -consvar_t cv_allowteamchange = CVAR_INIT ("allowteamchange", "Yes", CV_SAVE|CV_NETVAR, CV_YesNo, NULL); +consvar_t cv_restrictskinchange = CVAR_INIT ("restrictskinchange", "Yes", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, CV_YesNo, NULL); +consvar_t cv_allowteamchange = CVAR_INIT ("allowteamchange", "Yes", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_YesNo, NULL); -consvar_t cv_startinglives = CVAR_INIT ("startinglives", "3", CV_SAVE|CV_NETVAR|CV_CHEAT, startingliveslimit_cons_t, NULL); +consvar_t cv_startinglives = CVAR_INIT ("startinglives", "3", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, startingliveslimit_cons_t, NULL); static CV_PossibleValue_t respawntime_cons_t[] = {{1, "MIN"}, {30, "MAX"}, {0, "Off"}, {0, NULL}}; -consvar_t cv_respawntime = CVAR_INIT ("respawndelay", "3", CV_SAVE|CV_NETVAR|CV_CHEAT, respawntime_cons_t, NULL); +consvar_t cv_respawntime = CVAR_INIT ("respawndelay", "3", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, respawntime_cons_t, NULL); -consvar_t cv_competitionboxes = CVAR_INIT ("competitionboxes", "Mystery", CV_SAVE|CV_NETVAR|CV_CHEAT, competitionboxes_cons_t, NULL); +consvar_t cv_competitionboxes = CVAR_INIT ("competitionboxes", "Mystery", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, competitionboxes_cons_t, NULL); static CV_PossibleValue_t seenames_cons_t[] = {{0, "Off"}, {1, "Colorless"}, {2, "Team"}, {3, "Ally/Foe"}, {0, NULL}}; -consvar_t cv_seenames = CVAR_INIT ("seenames", "Ally/Foe", CV_SAVE, seenames_cons_t, 0); -consvar_t cv_allowseenames = CVAR_INIT ("allowseenames", "Yes", CV_SAVE|CV_NETVAR, CV_YesNo, NULL); +consvar_t cv_seenames = CVAR_INIT ("seenames", "Ally/Foe", CV_SAVE|CV_ALLOWLUA, seenames_cons_t, 0); +consvar_t cv_allowseenames = CVAR_INIT ("allowseenames", "Yes", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_YesNo, NULL); // names consvar_t cv_playername = CVAR_INIT ("name", "Sonic", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Name_OnChange); consvar_t cv_playername2 = CVAR_INIT ("name2", "Tails", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Name2_OnChange); // player colors UINT16 lastgoodcolor = SKINCOLOR_BLUE, lastgoodcolor2 = SKINCOLOR_BLUE; -consvar_t cv_playercolor = CVAR_INIT ("color", "Blue", CV_CALL|CV_NOINIT, Color_cons_t, Color_OnChange); -consvar_t cv_playercolor2 = CVAR_INIT ("color2", "Orange", CV_CALL|CV_NOINIT, Color_cons_t, Color2_OnChange); +consvar_t cv_playercolor = CVAR_INIT ("color", "Blue", CV_CALL|CV_NOINIT|CV_ALLOWLUA, Color_cons_t, Color_OnChange); +consvar_t cv_playercolor2 = CVAR_INIT ("color2", "Orange", CV_CALL|CV_NOINIT|CV_ALLOWLUA, Color_cons_t, Color2_OnChange); // player's skin, saved for commodity, when using a favorite skins wad.. -consvar_t cv_skin = CVAR_INIT ("skin", DEFAULTSKIN, CV_CALL|CV_NOINIT, NULL, Skin_OnChange); -consvar_t cv_skin2 = CVAR_INIT ("skin2", DEFAULTSKIN2, CV_CALL|CV_NOINIT, NULL, Skin2_OnChange); +consvar_t cv_skin = CVAR_INIT ("skin", DEFAULTSKIN, CV_CALL|CV_NOINIT|CV_ALLOWLUA, NULL, Skin_OnChange); +consvar_t cv_skin2 = CVAR_INIT ("skin2", DEFAULTSKIN2, CV_CALL|CV_NOINIT|CV_ALLOWLUA, NULL, Skin2_OnChange); // saved versions of the above six consvar_t cv_defaultplayercolor = CVAR_INIT ("defaultcolor", "Blue", CV_SAVE, Color_cons_t, NULL); @@ -262,43 +268,43 @@ consvar_t cv_mouse2opt = CVAR_INIT ("mouse2opt", "0", CV_SAVE, NULL, NULL); consvar_t cv_mouse2port = CVAR_INIT ("mouse2port", "COM2", CV_SAVE, mouse2port_cons_t, NULL); #endif -consvar_t cv_matchboxes = CVAR_INIT ("matchboxes", "Normal", CV_SAVE|CV_NETVAR|CV_CHEAT, matchboxes_cons_t, NULL); -consvar_t cv_specialrings = CVAR_INIT ("specialrings", "On", CV_SAVE|CV_NETVAR, CV_OnOff, NULL); -consvar_t cv_powerstones = CVAR_INIT ("powerstones", "On", CV_SAVE|CV_NETVAR, CV_OnOff, NULL); +consvar_t cv_matchboxes = CVAR_INIT ("matchboxes", "Normal", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, matchboxes_cons_t, NULL); +consvar_t cv_specialrings = CVAR_INIT ("specialrings", "On", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_OnOff, NULL); +consvar_t cv_powerstones = CVAR_INIT ("powerstones", "On", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_OnOff, NULL); -consvar_t cv_recycler = CVAR_INIT ("tv_recycler", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL); -consvar_t cv_teleporters = CVAR_INIT ("tv_teleporter", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL); -consvar_t cv_superring = CVAR_INIT ("tv_superring", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL); -consvar_t cv_supersneakers = CVAR_INIT ("tv_supersneaker", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL); -consvar_t cv_invincibility = CVAR_INIT ("tv_invincibility", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL); -consvar_t cv_jumpshield = CVAR_INIT ("tv_jumpshield", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL); -consvar_t cv_watershield = CVAR_INIT ("tv_watershield", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL); -consvar_t cv_ringshield = CVAR_INIT ("tv_ringshield", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL); -consvar_t cv_forceshield = CVAR_INIT ("tv_forceshield", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL); -consvar_t cv_bombshield = CVAR_INIT ("tv_bombshield", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL); -consvar_t cv_1up = CVAR_INIT ("tv_1up", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL); -consvar_t cv_eggmanbox = CVAR_INIT ("tv_eggman", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL); +consvar_t cv_recycler = CVAR_INIT ("tv_recycler", "5", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL); +consvar_t cv_teleporters = CVAR_INIT ("tv_teleporter", "5", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL); +consvar_t cv_superring = CVAR_INIT ("tv_superring", "5", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL); +consvar_t cv_supersneakers = CVAR_INIT ("tv_supersneaker", "5", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL); +consvar_t cv_invincibility = CVAR_INIT ("tv_invincibility", "5", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL); +consvar_t cv_jumpshield = CVAR_INIT ("tv_jumpshield", "5", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL); +consvar_t cv_watershield = CVAR_INIT ("tv_watershield", "5", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL); +consvar_t cv_ringshield = CVAR_INIT ("tv_ringshield", "5", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL); +consvar_t cv_forceshield = CVAR_INIT ("tv_forceshield", "5", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL); +consvar_t cv_bombshield = CVAR_INIT ("tv_bombshield", "5", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL); +consvar_t cv_1up = CVAR_INIT ("tv_1up", "5", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL); +consvar_t cv_eggmanbox = CVAR_INIT ("tv_eggman", "5", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, chances_cons_t, NULL); -consvar_t cv_ringslinger = CVAR_INIT ("ringslinger", "No", CV_NETVAR|CV_NOSHOWHELP|CV_CALL|CV_CHEAT, CV_YesNo, Ringslinger_OnChange); -consvar_t cv_gravity = CVAR_INIT ("gravity", "0.5", CV_RESTRICT|CV_FLOAT|CV_CALL, NULL, Gravity_OnChange); +consvar_t cv_ringslinger = CVAR_INIT ("ringslinger", "No", CV_NETVAR|CV_NOSHOWHELP|CV_CALL|CV_CHEAT|CV_ALLOWLUA, CV_YesNo, Ringslinger_OnChange); +consvar_t cv_gravity = CVAR_INIT ("gravity", "0.5", CV_RESTRICT|CV_FLOAT|CV_CALL|CV_ALLOWLUA, NULL, Gravity_OnChange); consvar_t cv_soundtest = CVAR_INIT ("soundtest", "0", CV_CALL, NULL, SoundTest_OnChange); -static CV_PossibleValue_t minitimelimit_cons_t[] = {{15, "MIN"}, {9999, "MAX"}, {0, NULL}}; -consvar_t cv_countdowntime = CVAR_INIT ("countdowntime", "60", CV_SAVE|CV_NETVAR|CV_CHEAT, minitimelimit_cons_t, NULL); +static CV_PossibleValue_t minitimelimit_cons_t[] = {{1, "MIN"}, {9999, "MAX"}, {0, NULL}}; +consvar_t cv_countdowntime = CVAR_INIT ("countdowntime", "60", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, minitimelimit_cons_t, NULL); -consvar_t cv_touchtag = CVAR_INIT ("touchtag", "Off", CV_SAVE|CV_NETVAR, CV_OnOff, NULL); -consvar_t cv_hidetime = CVAR_INIT ("hidetime", "30", CV_SAVE|CV_NETVAR|CV_CALL, minitimelimit_cons_t, Hidetime_OnChange); +consvar_t cv_touchtag = CVAR_INIT ("touchtag", "Off", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_OnOff, NULL); +consvar_t cv_hidetime = CVAR_INIT ("hidetime", "30", CV_SAVE|CV_NETVAR|CV_CALL|CV_ALLOWLUA, minitimelimit_cons_t, Hidetime_OnChange); -consvar_t cv_autobalance = CVAR_INIT ("autobalance", "Off", CV_SAVE|CV_NETVAR|CV_CALL, CV_OnOff, AutoBalance_OnChange); -consvar_t cv_teamscramble = CVAR_INIT ("teamscramble", "Off", CV_SAVE|CV_NETVAR|CV_CALL|CV_NOINIT, teamscramble_cons_t, TeamScramble_OnChange); -consvar_t cv_scrambleonchange = CVAR_INIT ("scrambleonchange", "Off", CV_SAVE|CV_NETVAR, teamscramble_cons_t, NULL); +consvar_t cv_autobalance = CVAR_INIT ("autobalance", "Off", CV_SAVE|CV_NETVAR|CV_CALL|CV_ALLOWLUA, CV_OnOff, AutoBalance_OnChange); +consvar_t cv_teamscramble = CVAR_INIT ("teamscramble", "Off", CV_SAVE|CV_NETVAR|CV_CALL|CV_NOINIT|CV_ALLOWLUA, teamscramble_cons_t, TeamScramble_OnChange); +consvar_t cv_scrambleonchange = CVAR_INIT ("scrambleonchange", "Off", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, teamscramble_cons_t, NULL); -consvar_t cv_friendlyfire = CVAR_INIT ("friendlyfire", "Off", CV_SAVE|CV_NETVAR, CV_OnOff, NULL); -consvar_t cv_itemfinder = CVAR_INIT ("itemfinder", "Off", CV_CALL, CV_OnOff, ItemFinder_OnChange); +consvar_t cv_friendlyfire = CVAR_INIT ("friendlyfire", "Off", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_OnOff, NULL); +consvar_t cv_itemfinder = CVAR_INIT ("itemfinder", "Off", CV_CALL|CV_ALLOWLUA, CV_OnOff, ItemFinder_OnChange); // Scoring type options -consvar_t cv_overtime = CVAR_INIT ("overtime", "Yes", CV_SAVE|CV_NETVAR, CV_YesNo, NULL); +consvar_t cv_overtime = CVAR_INIT ("overtime", "Yes", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_YesNo, NULL); consvar_t cv_rollingdemos = CVAR_INIT ("rollingdemos", "On", CV_SAVE, CV_OnOff, NULL); @@ -309,13 +315,13 @@ static CV_PossibleValue_t powerupdisplay_cons_t[] = {{0, "Never"}, {1, "First-pe consvar_t cv_powerupdisplay = CVAR_INIT ("powerupdisplay", "First-person only", CV_SAVE, powerupdisplay_cons_t, NULL); static CV_PossibleValue_t pointlimit_cons_t[] = {{1, "MIN"}, {MAXSCORE, "MAX"}, {0, "None"}, {0, NULL}}; -consvar_t cv_pointlimit = CVAR_INIT ("pointlimit", "None", CV_SAVE|CV_NETVAR|CV_CALL|CV_NOINIT, pointlimit_cons_t, PointLimit_OnChange); +consvar_t cv_pointlimit = CVAR_INIT ("pointlimit", "None", CV_SAVE|CV_NETVAR|CV_CALL|CV_NOINIT|CV_ALLOWLUA, pointlimit_cons_t, PointLimit_OnChange); static CV_PossibleValue_t timelimit_cons_t[] = {{1, "MIN"}, {30, "MAX"}, {0, "None"}, {0, NULL}}; -consvar_t cv_timelimit = CVAR_INIT ("timelimit", "None", CV_SAVE|CV_NETVAR|CV_CALL|CV_NOINIT, timelimit_cons_t, TimeLimit_OnChange); +consvar_t cv_timelimit = CVAR_INIT ("timelimit", "None", CV_SAVE|CV_NETVAR|CV_CALL|CV_NOINIT|CV_ALLOWLUA, timelimit_cons_t, TimeLimit_OnChange); static CV_PossibleValue_t numlaps_cons_t[] = {{1, "MIN"}, {50, "MAX"}, {0, NULL}}; -consvar_t cv_numlaps = CVAR_INIT ("numlaps", "4", CV_NETVAR|CV_CALL|CV_NOINIT, numlaps_cons_t, NumLaps_OnChange); +consvar_t cv_numlaps = CVAR_INIT ("numlaps", "4", CV_NETVAR|CV_CALL|CV_NOINIT|CV_ALLOWLUA, numlaps_cons_t, NumLaps_OnChange); static CV_PossibleValue_t basenumlaps_cons_t[] = {{1, "MIN"}, {50, "MAX"}, {0, "Map default"}, {0, NULL}}; -consvar_t cv_basenumlaps = CVAR_INIT ("basenumlaps", "Map default", CV_SAVE|CV_NETVAR|CV_CALL|CV_CHEAT, basenumlaps_cons_t, BaseNumLaps_OnChange); +consvar_t cv_basenumlaps = CVAR_INIT ("basenumlaps", "Map default", CV_SAVE|CV_NETVAR|CV_CALL|CV_CHEAT|CV_ALLOWLUA, basenumlaps_cons_t, BaseNumLaps_OnChange); // Point and time limits for every gametype INT32 pointlimits[NUMGAMETYPES]; @@ -324,11 +330,11 @@ INT32 timelimits[NUMGAMETYPES]; // log elemental hazards -- not a netvar, is local to current player consvar_t cv_hazardlog = CVAR_INIT ("hazardlog", "Yes", 0, CV_YesNo, NULL); -consvar_t cv_forceskin = CVAR_INIT ("forceskin", "None", CV_NETVAR|CV_CALL|CV_CHEAT, NULL, ForceSkin_OnChange); +consvar_t cv_forceskin = CVAR_INIT ("forceskin", "None", CV_NETVAR|CV_CALL|CV_CHEAT|CV_ALLOWLUA, NULL, ForceSkin_OnChange); consvar_t cv_downloading = CVAR_INIT ("downloading", "On", 0, CV_OnOff, NULL); -consvar_t cv_allowexitlevel = CVAR_INIT ("allowexitlevel", "No", CV_SAVE|CV_NETVAR, CV_YesNo, NULL); +consvar_t cv_allowexitlevel = CVAR_INIT ("allowexitlevel", "No", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_YesNo, NULL); -consvar_t cv_killingdead = CVAR_INIT ("killingdead", "Off", CV_NETVAR, CV_OnOff, NULL); +consvar_t cv_killingdead = CVAR_INIT ("killingdead", "Off", CV_NETVAR|CV_ALLOWLUA, CV_OnOff, NULL); consvar_t cv_netstat = CVAR_INIT ("netstat", "Off", 0, CV_OnOff, NULL); // show bandwidth statistics static CV_PossibleValue_t nettimeout_cons_t[] = {{TICRATE/7, "MIN"}, {60*TICRATE, "MAX"}, {0, NULL}}; @@ -346,32 +352,39 @@ consvar_t cv_showping = CVAR_INIT ("showping", "Warning", CV_SAVE, showping_cons // Intermission time Tails 04-19-2002 static CV_PossibleValue_t inttime_cons_t[] = {{0, "MIN"}, {3600, "MAX"}, {0, NULL}}; -consvar_t cv_inttime = CVAR_INIT ("inttime", "10", CV_SAVE|CV_NETVAR, inttime_cons_t, NULL); +consvar_t cv_inttime = CVAR_INIT ("inttime", "10", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, inttime_cons_t, NULL); static CV_PossibleValue_t coopstarposts_cons_t[] = {{0, "Per-player"}, {1, "Shared"}, {2, "Teamwork"}, {0, NULL}}; -consvar_t cv_coopstarposts = CVAR_INIT ("coopstarposts", "Per-player", CV_SAVE|CV_NETVAR|CV_CALL, coopstarposts_cons_t, CoopStarposts_OnChange); +consvar_t cv_coopstarposts = CVAR_INIT ("coopstarposts", "Per-player", CV_SAVE|CV_NETVAR|CV_CALL|CV_ALLOWLUA, coopstarposts_cons_t, CoopStarposts_OnChange); static CV_PossibleValue_t cooplives_cons_t[] = {{0, "Infinite"}, {1, "Per-player"}, {2, "Avoid Game Over"}, {3, "Single pool"}, {0, NULL}}; -consvar_t cv_cooplives = CVAR_INIT ("cooplives", "Avoid Game Over", CV_SAVE|CV_NETVAR|CV_CALL|CV_CHEAT, cooplives_cons_t, CoopLives_OnChange); +consvar_t cv_cooplives = CVAR_INIT ("cooplives", "Avoid Game Over", CV_SAVE|CV_NETVAR|CV_CALL|CV_CHEAT|CV_ALLOWLUA, cooplives_cons_t, CoopLives_OnChange); static CV_PossibleValue_t advancemap_cons_t[] = {{0, "Off"}, {1, "Next"}, {2, "Random"}, {0, NULL}}; -consvar_t cv_advancemap = CVAR_INIT ("advancemap", "Next", CV_SAVE|CV_NETVAR, advancemap_cons_t, NULL); +consvar_t cv_advancemap = CVAR_INIT ("advancemap", "Next", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, advancemap_cons_t, NULL); static CV_PossibleValue_t playersforexit_cons_t[] = {{0, "One"}, {1, "1/4"}, {2, "Half"}, {3, "3/4"}, {4, "All"}, {0, NULL}}; -consvar_t cv_playersforexit = CVAR_INIT ("playersforexit", "All", CV_SAVE|CV_NETVAR, playersforexit_cons_t, NULL); +consvar_t cv_playersforexit = CVAR_INIT ("playersforexit", "All", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, playersforexit_cons_t, NULL); -consvar_t cv_exitmove = CVAR_INIT ("exitmove", "On", CV_SAVE|CV_NETVAR|CV_CALL, CV_OnOff, ExitMove_OnChange); +consvar_t cv_exitmove = CVAR_INIT ("exitmove", "On", CV_SAVE|CV_NETVAR|CV_CALL|CV_ALLOWLUA, CV_OnOff, ExitMove_OnChange); -consvar_t cv_runscripts = CVAR_INIT ("runscripts", "Yes", 0, CV_YesNo, NULL); +consvar_t cv_runscripts = CVAR_INIT ("runscripts", "Yes", CV_ALLOWLUA, CV_YesNo, NULL); -consvar_t cv_pause = CVAR_INIT ("pausepermission", "Server", CV_SAVE|CV_NETVAR, pause_cons_t, NULL); -consvar_t cv_mute = CVAR_INIT ("mute", "Off", CV_NETVAR|CV_CALL, CV_OnOff, Mute_OnChange); +consvar_t cv_pause = CVAR_INIT ("pausepermission", "Server", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, pause_cons_t, NULL); +consvar_t cv_mute = CVAR_INIT ("mute", "Off", CV_NETVAR|CV_CALL|CV_ALLOWLUA, CV_OnOff, Mute_OnChange); consvar_t cv_sleep = CVAR_INIT ("cpusleep", "1", CV_SAVE, sleeping_cons_t, NULL); static CV_PossibleValue_t perfstats_cons_t[] = { {0, "Off"}, {1, "Rendering"}, {2, "Logic"}, {3, "ThinkFrame"}, {0, NULL}}; -consvar_t cv_perfstats = CVAR_INIT ("perfstats", "Off", 0, perfstats_cons_t, NULL); +consvar_t cv_perfstats = CVAR_INIT ("perfstats", "Off", CV_CALL, perfstats_cons_t, PS_PerfStats_OnChange); +static CV_PossibleValue_t ps_samplesize_cons_t[] = { + {1, "MIN"}, {1000, "MAX"}, {0, NULL}}; +consvar_t cv_ps_samplesize = CVAR_INIT ("ps_samplesize", "1", CV_CALL, ps_samplesize_cons_t, PS_SampleSize_OnChange); +static CV_PossibleValue_t ps_descriptor_cons_t[] = { + {1, "Average"}, {2, "SD"}, {3, "Minimum"}, {4, "Maximum"}, {0, NULL}}; +consvar_t cv_ps_descriptor = CVAR_INIT ("ps_descriptor", "Average", 0, ps_descriptor_cons_t, NULL); + consvar_t cv_freedemocamera = CVAR_INIT("freedemocamera", "Off", CV_SAVE, CV_OnOff, NULL); char timedemo_name[256]; @@ -398,16 +411,16 @@ const char *netxcmdnames[MAXNETXCMD - 1] = "MAP", "EXITLEVEL", "ADDFILE", + "ADDFOLDER", "PAUSE", "ADDPLAYER", "TEAMCHANGE", "CLEARSCORES", - "LOGIN", "VERIFIED", "RANDOMSEED", "RUNSOC", "REQADDFILE", - "DELFILE", // replace next time we add an XD + "REQADDFOLDER", "SETMOTD", "SUICIDE", "LUACMD", @@ -441,7 +454,9 @@ void D_RegisterServerCommands(void) RegisterNetXCmd(XD_MAP, Got_Mapcmd); RegisterNetXCmd(XD_EXITLEVEL, Got_ExitLevelcmd); RegisterNetXCmd(XD_ADDFILE, Got_Addfilecmd); + RegisterNetXCmd(XD_ADDFOLDER, Got_Addfoldercmd); RegisterNetXCmd(XD_REQADDFILE, Got_RequestAddfilecmd); + RegisterNetXCmd(XD_REQADDFOLDER, Got_RequestAddfoldercmd); RegisterNetXCmd(XD_PAUSE, Got_Pause); RegisterNetXCmd(XD_SUICIDE, Got_Suicide); RegisterNetXCmd(XD_RUNSOC, Got_RunSOCcmd); @@ -449,56 +464,57 @@ void D_RegisterServerCommands(void) RegisterNetXCmd(XD_LUAFILE, Got_LuaFile); // Remote Administration - COM_AddCommand("password", Command_Changepassword_f); - COM_AddCommand("login", Command_Login_f); // useful in dedicated to kick off remote admin - COM_AddCommand("promote", Command_Verify_f); + COM_AddCommand("password", Command_Changepassword_f, COM_LUA); + COM_AddCommand("login", Command_Login_f, COM_LUA); // useful in dedicated to kick off remote admin + COM_AddCommand("promote", Command_Verify_f, COM_LUA); RegisterNetXCmd(XD_VERIFIED, Got_Verification); - COM_AddCommand("demote", Command_RemoveAdmin_f); + COM_AddCommand("demote", Command_RemoveAdmin_f, COM_LUA); RegisterNetXCmd(XD_DEMOTED, Got_Removal); - COM_AddCommand("motd", Command_MotD_f); + COM_AddCommand("motd", Command_MotD_f, COM_LUA); RegisterNetXCmd(XD_SETMOTD, Got_MotD_f); // For remote admin RegisterNetXCmd(XD_TEAMCHANGE, Got_Teamchange); - COM_AddCommand("serverchangeteam", Command_ServerTeamChange_f); + COM_AddCommand("serverchangeteam", Command_ServerTeamChange_f, COM_LUA); RegisterNetXCmd(XD_CLEARSCORES, Got_Clearscores); - COM_AddCommand("clearscores", Command_Clearscores_f); - COM_AddCommand("map", Command_Map_f); + COM_AddCommand("clearscores", Command_Clearscores_f, COM_LUA); + COM_AddCommand("map", Command_Map_f, COM_LUA); - COM_AddCommand("exitgame", Command_ExitGame_f); - COM_AddCommand("retry", Command_Retry_f); - COM_AddCommand("exitlevel", Command_ExitLevel_f); - COM_AddCommand("showmap", Command_Showmap_f); - COM_AddCommand("mapmd5", Command_Mapmd5_f); + COM_AddCommand("exitgame", Command_ExitGame_f, COM_LUA); + COM_AddCommand("retry", Command_Retry_f, COM_LUA); + COM_AddCommand("exitlevel", Command_ExitLevel_f, COM_LUA); + COM_AddCommand("showmap", Command_Showmap_f, COM_LUA); + COM_AddCommand("mapmd5", Command_Mapmd5_f, COM_LUA); - COM_AddCommand("addfile", Command_Addfile); - COM_AddCommand("listwad", Command_ListWADS_f); + COM_AddCommand("addfolder", Command_Addfolder, COM_LUA); + COM_AddCommand("addfile", Command_Addfile, COM_LUA); + COM_AddCommand("listwad", Command_ListWADS_f, COM_LUA); - COM_AddCommand("runsoc", Command_RunSOC); - COM_AddCommand("pause", Command_Pause); - COM_AddCommand("suicide", Command_Suicide); + COM_AddCommand("runsoc", Command_RunSOC, COM_LUA); + COM_AddCommand("pause", Command_Pause, COM_LUA); + COM_AddCommand("suicide", Command_Suicide, COM_LUA); - COM_AddCommand("gametype", Command_ShowGametype_f); - COM_AddCommand("version", Command_Version_f); + COM_AddCommand("gametype", Command_ShowGametype_f, COM_LUA); + COM_AddCommand("version", Command_Version_f, COM_LUA); #ifdef UPDATE_ALERT - COM_AddCommand("mod_details", Command_ModDetails_f); + COM_AddCommand("mod_details", Command_ModDetails_f, COM_LUA); #endif - COM_AddCommand("quit", Command_Quit_f); + COM_AddCommand("quit", Command_Quit_f, COM_LUA); - COM_AddCommand("saveconfig", Command_SaveConfig_f); - COM_AddCommand("loadconfig", Command_LoadConfig_f); - COM_AddCommand("changeconfig", Command_ChangeConfig_f); - COM_AddCommand("isgamemodified", Command_Isgamemodified_f); // test - COM_AddCommand("showscores", Command_ShowScores_f); - COM_AddCommand("showtime", Command_ShowTime_f); - COM_AddCommand("cheats", Command_Cheats_f); // test + COM_AddCommand("saveconfig", Command_SaveConfig_f, 0); + COM_AddCommand("loadconfig", Command_LoadConfig_f, 0); + COM_AddCommand("changeconfig", Command_ChangeConfig_f, 0); + COM_AddCommand("isgamemodified", Command_Isgamemodified_f, COM_LUA); // test + COM_AddCommand("showscores", Command_ShowScores_f, COM_LUA); + COM_AddCommand("showtime", Command_ShowTime_f, COM_LUA); + COM_AddCommand("cheats", Command_Cheats_f, COM_LUA); // test #ifdef _DEBUG - COM_AddCommand("togglemodified", Command_Togglemodified_f); - COM_AddCommand("archivetest", Command_Archivetest_f); + COM_AddCommand("togglemodified", Command_Togglemodified_f, COM_LUA); + COM_AddCommand("archivetest", Command_Archivetest_f, COM_LUA); #endif - COM_AddCommand("downloads", Command_Downloads_f); + COM_AddCommand("downloads", Command_Downloads_f, COM_LUA); // for master server connection AddMServCommands(); @@ -585,7 +601,7 @@ void D_RegisterServerCommands(void) CV_RegisterVar(&cv_blamecfail); #endif - COM_AddCommand("ping", Command_Ping_f); + COM_AddCommand("ping", Command_Ping_f, COM_LUA); CV_RegisterVar(&cv_nettimeout); CV_RegisterVar(&cv_jointimeout); @@ -597,6 +613,10 @@ void D_RegisterServerCommands(void) CV_RegisterVar(&cv_allowseenames); + // Other filesrch.c consvars are defined in D_RegisterClientCommands + CV_RegisterVar(&cv_addons_option); + CV_RegisterVar(&cv_addons_folder); + CV_RegisterVar(&cv_dummyconsvar); } @@ -629,25 +649,25 @@ void D_RegisterClientCommands(void) if (dedicated) return; - COM_AddCommand("numthinkers", Command_Numthinkers_f); - COM_AddCommand("countmobjs", Command_CountMobjs_f); + COM_AddCommand("numthinkers", Command_Numthinkers_f, COM_LUA); + COM_AddCommand("countmobjs", Command_CountMobjs_f, COM_LUA); - COM_AddCommand("changeteam", Command_Teamchange_f); - COM_AddCommand("changeteam2", Command_Teamchange2_f); + COM_AddCommand("changeteam", Command_Teamchange_f, COM_LUA); + COM_AddCommand("changeteam2", Command_Teamchange2_f, COM_LUA); - COM_AddCommand("playdemo", Command_Playdemo_f); - COM_AddCommand("timedemo", Command_Timedemo_f); - COM_AddCommand("stopdemo", Command_Stopdemo_f); - COM_AddCommand("playintro", Command_Playintro_f); + COM_AddCommand("playdemo", Command_Playdemo_f, 0); + COM_AddCommand("timedemo", Command_Timedemo_f, 0); + COM_AddCommand("stopdemo", Command_Stopdemo_f, COM_LUA); + COM_AddCommand("playintro", Command_Playintro_f, COM_LUA); - COM_AddCommand("resetcamera", Command_ResetCamera_f); + COM_AddCommand("resetcamera", Command_ResetCamera_f, COM_LUA); - COM_AddCommand("setcontrol", Command_Setcontrol_f); - COM_AddCommand("setcontrol2", Command_Setcontrol2_f); + COM_AddCommand("setcontrol", Command_Setcontrol_f, 0); + COM_AddCommand("setcontrol2", Command_Setcontrol2_f, 0); - COM_AddCommand("screenshot", M_ScreenShot); - COM_AddCommand("startmovie", Command_StartMovie_f); - COM_AddCommand("stopmovie", Command_StopMovie_f); + COM_AddCommand("screenshot", M_ScreenShot, COM_LUA); + COM_AddCommand("startmovie", Command_StartMovie_f, COM_LUA); + COM_AddCommand("stopmovie", Command_StopMovie_f, COM_LUA); CV_RegisterVar(&cv_screenshot_option); CV_RegisterVar(&cv_screenshot_folder); @@ -709,7 +729,7 @@ void D_RegisterClientCommands(void) CV_RegisterVar(&cv_ghost_last); CV_RegisterVar(&cv_ghost_guest); - COM_AddCommand("displayplayer", Command_Displayplayer_f); + COM_AddCommand("displayplayer", Command_Displayplayer_f, COM_LUA); // FIXME: not to be here.. but needs be done for config loading CV_RegisterVar(&cv_globalgamma); @@ -778,8 +798,8 @@ void D_RegisterClientCommands(void) CV_RegisterVar(&cv_digitaldeadzone2); // filesrch.c - CV_RegisterVar(&cv_addons_option); - CV_RegisterVar(&cv_addons_folder); + //CV_RegisterVar(&cv_addons_option); // These two are now defined + //CV_RegisterVar(&cv_addons_folder); // in D_RegisterServerCommands CV_RegisterVar(&cv_addons_md5); CV_RegisterVar(&cv_addons_showall); CV_RegisterVar(&cv_addons_search_type); @@ -861,10 +881,12 @@ void D_RegisterClientCommands(void) CV_RegisterVar(&cv_soundtest); CV_RegisterVar(&cv_perfstats); + CV_RegisterVar(&cv_ps_samplesize); + CV_RegisterVar(&cv_ps_descriptor); // ingame object placing - COM_AddCommand("objectplace", Command_ObjectPlace_f); - COM_AddCommand("writethings", Command_Writethings_f); + COM_AddCommand("objectplace", Command_ObjectPlace_f, COM_LUA); + //COM_AddCommand("writethings", Command_Writethings_f); CV_RegisterVar(&cv_speed); CV_RegisterVar(&cv_opflags); CV_RegisterVar(&cv_ophoopflags); @@ -875,32 +897,32 @@ void D_RegisterClientCommands(void) CV_RegisterVar(&cv_freedemocamera); // add cheat commands - COM_AddCommand("noclip", Command_CheatNoClip_f); - COM_AddCommand("god", Command_CheatGod_f); - COM_AddCommand("notarget", Command_CheatNoTarget_f); - COM_AddCommand("getallemeralds", Command_Getallemeralds_f); - COM_AddCommand("resetemeralds", Command_Resetemeralds_f); - COM_AddCommand("setrings", Command_Setrings_f); - COM_AddCommand("setlives", Command_Setlives_f); - COM_AddCommand("setcontinues", Command_Setcontinues_f); - COM_AddCommand("devmode", Command_Devmode_f); - COM_AddCommand("savecheckpoint", Command_Savecheckpoint_f); - COM_AddCommand("scale", Command_Scale_f); - COM_AddCommand("gravflip", Command_Gravflip_f); - COM_AddCommand("hurtme", Command_Hurtme_f); - COM_AddCommand("jumptoaxis", Command_JumpToAxis_f); - COM_AddCommand("charability", Command_Charability_f); - COM_AddCommand("charspeed", Command_Charspeed_f); - COM_AddCommand("teleport", Command_Teleport_f); - COM_AddCommand("rteleport", Command_RTeleport_f); - COM_AddCommand("skynum", Command_Skynum_f); - COM_AddCommand("weather", Command_Weather_f); - COM_AddCommand("toggletwod", Command_Toggletwod_f); + COM_AddCommand("noclip", Command_CheatNoClip_f, COM_LUA); + COM_AddCommand("god", Command_CheatGod_f, COM_LUA); + COM_AddCommand("notarget", Command_CheatNoTarget_f, COM_LUA); + COM_AddCommand("getallemeralds", Command_Getallemeralds_f, COM_LUA); + COM_AddCommand("resetemeralds", Command_Resetemeralds_f, COM_LUA); + COM_AddCommand("setrings", Command_Setrings_f, COM_LUA); + COM_AddCommand("setlives", Command_Setlives_f, COM_LUA); + COM_AddCommand("setcontinues", Command_Setcontinues_f, COM_LUA); + COM_AddCommand("devmode", Command_Devmode_f, COM_LUA); + COM_AddCommand("savecheckpoint", Command_Savecheckpoint_f, COM_LUA); + COM_AddCommand("scale", Command_Scale_f, COM_LUA); + COM_AddCommand("gravflip", Command_Gravflip_f, COM_LUA); + COM_AddCommand("hurtme", Command_Hurtme_f, COM_LUA); + COM_AddCommand("jumptoaxis", Command_JumpToAxis_f, COM_LUA); + COM_AddCommand("charability", Command_Charability_f, COM_LUA); + COM_AddCommand("charspeed", Command_Charspeed_f, COM_LUA); + COM_AddCommand("teleport", Command_Teleport_f, COM_LUA); + COM_AddCommand("rteleport", Command_RTeleport_f, COM_LUA); + COM_AddCommand("skynum", Command_Skynum_f, COM_LUA); + COM_AddCommand("weather", Command_Weather_f, COM_LUA); + COM_AddCommand("toggletwod", Command_Toggletwod_f, COM_LUA); #ifdef _DEBUG - COM_AddCommand("causecfail", Command_CauseCfail_f); + COM_AddCommand("causecfail", Command_CauseCfail_f, COM_LUA); #endif #ifdef LUA_ALLOW_BYTECODE - COM_AddCommand("dumplua", Command_Dumplua_f); + COM_AddCommand("dumplua", Command_Dumplua_f, COM_LUA); #endif } @@ -1512,7 +1534,7 @@ static void Got_NameAndColor(UINT8 **cp, INT32 playernum) { illegalMask &= ~(1 << i); } - + if ((p->availabilities & illegalMask) != 0) { kick = true; @@ -1860,7 +1882,7 @@ static void Command_Map_f(void) const char *gametypename; boolean newresetplayers; - boolean mustmodifygame; + boolean wouldSetCheats; INT32 newmapnum; @@ -1881,11 +1903,11 @@ static void Command_Map_f(void) option_gametype = COM_CheckPartialParm("-g"); newresetplayers = ! COM_CheckParm("-noresetplayers"); - mustmodifygame = - !( netgame || multiplayer ) && - (!modifiedgame || savemoddata ); + wouldSetCheats = + !( netgame || multiplayer ) && + !( usedCheats ); - if (mustmodifygame && !option_force) + if (wouldSetCheats && !option_force) { /* May want to be more descriptive? */ CONS_Printf(M_GetText("Sorry, level change disabled in single player.\n")); @@ -1939,9 +1961,9 @@ static void Command_Map_f(void) return; } - if (mustmodifygame && option_force) + if (wouldSetCheats && option_force) { - G_SetGameModified(false); + G_SetUsedCheats(false); } // new gametype value @@ -2014,7 +2036,7 @@ static void Command_Map_f(void) // ... unless you're in a dedicated server. Yes, technically this means you can view any level by // running a dedicated server and joining it yourself, but that's better than making dedicated server's // lives hell. - if (!dedicated && M_MapLocked(newmapnum)) + if (!dedicated && M_MapLocked(newmapnum, serverGamedata)) { CONS_Alert(CONS_NOTICE, M_GetText("You need to unlock this level before you can warp to it!\n")); Z_Free(realmapname); @@ -2117,7 +2139,7 @@ static void Got_Mapcmd(UINT8 **cp, INT32 playernum) } mapnumber = M_MapNumber(mapname[3], mapname[4]); - LUAh_MapChange(mapnumber); + LUA_HookInt(mapnumber, HOOK(MapChange)); G_InitNew(ultimatemode, mapname, resetplayer, skipprecutscene, FLS); if (demoplayback && !timingdemo) @@ -2702,7 +2724,7 @@ static void Got_Teamchange(UINT8 **cp, INT32 playernum) } // Don't switch team, just go away, please, go awaayyyy, aaauuauugghhhghgh - if (!LUAh_TeamSwitch(&players[playernum], NetPacket.packet.newteam, players[playernum].spectator, NetPacket.packet.autobalance, NetPacket.packet.scrambled)) + if (!LUA_HookTeamSwitch(&players[playernum], NetPacket.packet.newteam, players[playernum].spectator, NetPacket.packet.autobalance, NetPacket.packet.scrambled)) return; //no status changes after hidetime @@ -2863,7 +2885,7 @@ static void Got_Teamchange(UINT8 **cp, INT32 playernum) // Call ViewpointSwitch hooks here. // The viewpoint was forcibly changed. if (displayplayer != consoleplayer) // You're already viewing yourself. No big deal. - LUAh_ViewpointSwitch(&players[consoleplayer], &players[consoleplayer], true); + LUA_HookViewpointSwitch(&players[consoleplayer], &players[consoleplayer], true); displayplayer = consoleplayer; } @@ -3217,7 +3239,7 @@ static void Command_RunSOC(void) static void Got_RunSOCcmd(UINT8 **cp, INT32 playernum) { char filename[256]; - filestatus_t ncs = FS_NOTFOUND; + filestatus_t ncs = FS_NOTCHECKED; if (playernum != serverplayer && !IsPlayerAdmin(playernum)) { @@ -3255,6 +3277,69 @@ static void Got_RunSOCcmd(UINT8 **cp, INT32 playernum) G_SetGameModified(true); } +// C++ would make this SO much simpler! +typedef struct addedfile_s +{ + struct addedfile_s *next; + struct addedfile_s *prev; + char *value; +} addedfile_t; + +static boolean AddedFileContains(addedfile_t *list, const char *value) +{ + addedfile_t *node; + for (node = list; node; node = node->next) + { + if (!strcmp(value, node->value)) + return true; + } + + return false; +} + +static void AddedFilesAdd(addedfile_t **list, const char *value) +{ + addedfile_t *item = Z_Calloc(sizeof(addedfile_t), PU_STATIC, NULL); + item->value = Z_StrDup(value); + ListAdd(item, (listitem_t**)list); +} + +static void AddedFilesRemove(void *pItem, addedfile_t **itemHead) +{ + addedfile_t *item = (addedfile_t *)pItem; + + if (item == *itemHead) // Start of list + { + *itemHead = item->next; + + if (*itemHead) + (*itemHead)->prev = NULL; + } + else if (item->next == NULL) // end of list + { + item->prev->next = NULL; + } + else // Somewhere in between + { + item->prev->next = item->next; + item->next->prev = item->prev; + } + + Z_Free(item->value); + Z_Free(item); +} + +static void AddedFilesClearList(addedfile_t **itemHead) +{ + addedfile_t *item; + addedfile_t *next; + for (item = *itemHead; item; item = next) + { + next = item->next; + AddedFilesRemove(item, itemHead); + } +} + /** Adds a pwad at runtime. * Searches for sounds, maps, music, new images. */ @@ -3263,8 +3348,7 @@ static void Command_Addfile(void) size_t argc = COM_Argc(); // amount of arguments total size_t curarg; // current argument index - const char *addedfiles[argc]; // list of filenames already processed - size_t numfilesadded = 0; // the amount of filenames processed + addedfile_t *addedfiles = NULL; // list of filenames already processed if (argc < 2) { @@ -3279,25 +3363,14 @@ static void Command_Addfile(void) char buf[256]; char *buf_p = buf; INT32 i; - size_t ii; int musiconly; // W_VerifyNMUSlumps isn't boolean boolean fileadded = false; fn = COM_Argv(curarg); // For the amount of filenames previously processed... - for (ii = 0; ii < numfilesadded; ii++) - { - // If this is one of them, don't try to add it. - if (!strcmp(fn, addedfiles[ii])) - { - fileadded = true; - break; - } - } - - // If we've added this one, skip to the next one. - if (fileadded) + fileadded = AddedFileContains(addedfiles, fn); + if (fileadded) // If this is one of them, don't try to add it. { CONS_Alert(CONS_WARNING, M_GetText("Already processed %s, skipping\n"), fn); continue; @@ -3306,13 +3379,16 @@ static void Command_Addfile(void) // Disallow non-printing characters and semicolons. for (i = 0; fn[i] != '\0'; i++) if (!isprint(fn[i]) || fn[i] == ';') + { + AddedFilesClearList(&addedfiles); return; + } musiconly = W_VerifyNMUSlumps(fn, false); if (musiconly == -1) { - addedfiles[numfilesadded++] = fn; + AddedFilesAdd(&addedfiles, fn); continue; } @@ -3331,7 +3407,7 @@ static void Command_Addfile(void) if (!(netgame || multiplayer) || musiconly) { P_AddWadFile(fn); - addedfiles[numfilesadded++] = fn; + AddedFilesAdd(&addedfiles, fn); continue; } @@ -3341,12 +3417,12 @@ static void Command_Addfile(void) break; ++p; - // check total packet size and no of files currently loaded + // check no of files currently loaded // See W_LoadWadFile in w_wad.c - if ((numwadfiles >= MAX_WADFILES) - || ((packetsizetally + nameonlylength(fn) + 22) > MAXFILENEEDED*sizeof(UINT8))) + if (numwadfiles >= MAX_WADFILES) { CONS_Alert(CONS_ERROR, M_GetText("Too many files loaded to add %s\n"), fn); + AddedFilesClearList(&addedfiles); return; } @@ -3373,6 +3449,9 @@ static void Command_Addfile(void) for (i = 0; i < numwadfiles; i++) { + if (wadfiles[i]->type == RET_FOLDER) + continue; + if (!memcmp(wadfiles[i]->md5sum, md5sum, 16)) { CONS_Alert(CONS_ERROR, M_GetText("%s is already loaded\n"), fn); @@ -3383,19 +3462,145 @@ static void Command_Addfile(void) WRITEMEM(buf_p, md5sum, 16); } - addedfiles[numfilesadded++] = fn; + AddedFilesAdd(&addedfiles, fn); if (IsPlayerAdmin(consoleplayer) && (!server)) // Request to add file SendNetXCmd(XD_REQADDFILE, buf, buf_p - buf); else SendNetXCmd(XD_ADDFILE, buf, buf_p - buf); } + + AddedFilesClearList(&addedfiles); +} + +static void Command_Addfolder(void) +{ + size_t argc = COM_Argc(); // amount of arguments total + size_t curarg; // current argument index + + addedfile_t *addedfolders = NULL; // list of filenames already processed + + if (argc < 2) + { + CONS_Printf(M_GetText("addfolder [path2...] [...]: Load add-ons\n")); + return; + } + + // start at one to skip command name + for (curarg = 1; curarg < argc; curarg++) + { + const char *fn, *p; + char *fullpath; + char buf[256]; + char *buf_p = buf; + INT32 i, stat; + boolean folderadded = false; + + fn = COM_Argv(curarg); + + // For the amount of filenames previously processed... + folderadded = AddedFileContains(addedfolders, fn); + if (folderadded) // If we've added this one, skip to the next one. + { + CONS_Alert(CONS_WARNING, M_GetText("Already processed %s, skipping\n"), fn); + continue; + } + + // Disallow non-printing characters and semicolons. + for (i = 0; fn[i] != '\0'; i++) + if (!isprint(fn[i]) || fn[i] == ';') + { + AddedFilesClearList(&addedfolders); + return; + } + + // Add file on your client directly if you aren't in a netgame. + if (!(netgame || multiplayer)) + { + P_AddFolder(fn); + AddedFilesAdd(&addedfolders, fn); + continue; + } + + p = fn+strlen(fn); + while(--p >= fn) + if (*p == '\\' || *p == '/' || *p == ':') + break; + ++p; + + // Don't add an empty path. + if (M_IsStringEmpty(fn)) + { + CONS_Alert(CONS_WARNING, M_GetText("Folder name is empty, skipping\n")); + continue; + } + + // check no of files currently loaded + // See W_LoadWadFile in w_wad.c + if (numwadfiles >= MAX_WADFILES) + { + CONS_Alert(CONS_ERROR, M_GetText("Too many files loaded to add %s\n"), fn); + AddedFilesClearList(&addedfolders); + return; + } + + // Check if the path is valid. + stat = W_IsPathToFolderValid(fn); + + if (stat == 0) + { + CONS_Alert(CONS_WARNING, M_GetText("Path %s is invalid, skipping\n"), fn); + continue; + } + else if (stat < 0) + { +#ifndef AVOID_ERRNO + CONS_Alert(CONS_WARNING, M_GetText("Error accessing %s (%s), skipping\n"), fn, strerror(direrror)); +#else + CONS_Alert(CONS_WARNING, M_GetText("Error accessing %s, skipping\n"), fn); +#endif + continue; + } + + // Get the full path for this folder. + fullpath = W_GetFullFolderPath(fn); + + if (fullpath == NULL) + { + CONS_Alert(CONS_WARNING, M_GetText("Path %s is invalid, skipping\n"), fn); + continue; + } + + // Check if the folder is already added. + for (i = 0; i < numwadfiles; i++) + { + if (wadfiles[i]->type != RET_FOLDER) + continue; + + if (samepaths(wadfiles[i]->path, fullpath) > 0) + { + CONS_Alert(CONS_ERROR, M_GetText("%s is already loaded\n"), fn); + continue; + } + } + + Z_Free(fullpath); + + AddedFilesAdd(&addedfolders, fn); + + WRITESTRINGN(buf_p,p,240); + + if (IsPlayerAdmin(consoleplayer) && (!server)) // Request to add file + SendNetXCmd(XD_REQADDFOLDER, buf, buf_p - buf); + else + SendNetXCmd(XD_ADDFOLDER, buf, buf_p - buf); + } } static void Got_RequestAddfilecmd(UINT8 **cp, INT32 playernum) { char filename[241]; - filestatus_t ncs = FS_NOTFOUND; + filestatus_t ncs = FS_NOTCHECKED; UINT8 md5sum[16]; boolean kick = false; boolean toomany = false; @@ -3420,9 +3625,7 @@ static void Got_RequestAddfilecmd(UINT8 **cp, INT32 playernum) return; } - // See W_LoadWadFile in w_wad.c - if ((numwadfiles >= MAX_WADFILES) - || ((packetsizetally + nameonlylength(filename) + 22) > MAXFILENEEDED*sizeof(UINT8))) + if (numwadfiles >= MAX_WADFILES) toomany = true; else ncs = findfile(filename,md5sum,true); @@ -3452,10 +3655,66 @@ static void Got_RequestAddfilecmd(UINT8 **cp, INT32 playernum) COM_BufAddText(va("addfile %s\n", filename)); } +static void Got_RequestAddfoldercmd(UINT8 **cp, INT32 playernum) +{ + char path[241]; + filestatus_t ncs = FS_NOTCHECKED; + boolean kick = false; + boolean toomany = false; + INT32 i,j; + + READSTRINGN(*cp, path, 240); + + /// \todo Integrity checks. + + // Only the server processes this message. + if (client) + return; + + // Disallow non-printing characters and semicolons. + for (i = 0; path[i] != '\0'; i++) + if (!isprint(path[i]) || path[i] == ';') + kick = true; + + if ((playernum != serverplayer && !IsPlayerAdmin(playernum)) || kick) + { + CONS_Alert(CONS_WARNING, M_GetText("Illegal addfolder command received from %s\n"), player_names[playernum]); + SendKick(playernum, KICK_MSG_CON_FAIL | KICK_MSG_KEEP_BODY); + return; + } + + if (numwadfiles >= MAX_WADFILES) + toomany = true; + else + ncs = findfolder(path); + + if (ncs != FS_FOUND || toomany) + { + char message[256]; + + if (toomany) + sprintf(message, M_GetText("Too many files loaded to add %s\n"), path); + else if (ncs == FS_NOTFOUND) + sprintf(message, M_GetText("The server doesn't have %s\n"), path); + else + sprintf(message, M_GetText("Unknown error finding folder (%s)\n"), path); + + CONS_Printf("%s",message); + + for (j = 0; j < MAXPLAYERS; j++) + if (adminplayers[j]) + COM_BufAddText(va("sayto %d %s", adminplayers[j], message)); + + return; + } + + COM_BufAddText(va("addfolder \"%s\"\n", path)); +} + static void Got_Addfilecmd(UINT8 **cp, INT32 playernum) { char filename[241]; - filestatus_t ncs = FS_NOTFOUND; + filestatus_t ncs = FS_NOTCHECKED; UINT8 md5sum[16]; READSTRINGN(*cp, filename, 240); @@ -3500,20 +3759,71 @@ static void Got_Addfilecmd(UINT8 **cp, INT32 playernum) G_SetGameModified(true); } +static void Got_Addfoldercmd(UINT8 **cp, INT32 playernum) +{ + char path[241]; + filestatus_t ncs = FS_NOTCHECKED; + + READSTRINGN(*cp, path, 240); + + /// \todo Integrity checks. + + if (playernum != serverplayer) + { + CONS_Alert(CONS_WARNING, M_GetText("Illegal addfolder command received from %s\n"), player_names[playernum]); + if (server) + SendKick(playernum, KICK_MSG_CON_FAIL | KICK_MSG_KEEP_BODY); + return; + } + + ncs = findfolder(path); + + if (ncs != FS_FOUND || !P_AddFolder(path)) + { + Command_ExitGame_f(); + if (ncs == FS_FOUND) + { + CONS_Printf(M_GetText("The server tried to add %s,\nbut you have too many files added.\nRestart the game to clear loaded files\nand play on this server."), path); + M_StartMessage(va("The server added a folder \n(%s)\nbut you have too many files added.\nRestart the game to clear loaded files.\n\nPress ESC\n",path), NULL, MM_NOTHING); + } + else if (ncs == FS_NOTFOUND) + { + CONS_Printf(M_GetText("The server tried to add %s,\nbut you don't have this file.\nYou need to find it in order\nto play on this server."), path); + M_StartMessage(va("The server added a folder \n(%s)\nthat you do not have.\n\nPress ESC\n",path), NULL, MM_NOTHING); + } + else + { + CONS_Printf(M_GetText("Unknown error finding folder (%s) the server added.\n"), path); + M_StartMessage(va("Unknown error trying to load a folder\nthat the server added \n(%s).\n\nPress ESC\n",path), NULL, MM_NOTHING); + } + return; + } + + G_SetGameModified(true); +} + static void Command_ListWADS_f(void) { INT32 i = numwadfiles; char *tempname; - CONS_Printf(M_GetText("There are %d wads loaded:\n"),numwadfiles); + +#ifdef ENFORCE_WAD_LIMIT + CONS_Printf(M_GetText("There are %d/%d files loaded:\n"),numwadfiles,MAX_WADFILES); +#else + CONS_Printf(M_GetText("There are %d files loaded:\n"),numwadfiles); +#endif + for (i--; i >= 0; i--) { nameonly(tempname = va("%s", wadfiles[i]->filename)); if (!i) CONS_Printf("\x82 IWAD\x80: %s\n", tempname); - else if (i <= mainwads) + else if (i < mainwads) CONS_Printf("\x82 * %.2d\x80: %s\n", i, tempname); else if (!wadfiles[i]->important) CONS_Printf("\x86 %.2d: %s\n", i, tempname); + else if (wadfiles[i]->type == RET_FOLDER) + CONS_Printf("\x82 * %.2d\x84: %s\n", i, tempname); else CONS_Printf(" %.2d: %s\n", i, tempname); } @@ -3626,7 +3936,7 @@ static void Command_Playintro_f(void) */ FUNCNORETURN static ATTRNORETURN void Command_Quit_f(void) { - LUAh_GameQuit(true); + LUA_HookBool(true, HOOK(GameQuit)); I_Quit(); } @@ -3635,18 +3945,12 @@ void ItemFinder_OnChange(void) if (!cv_itemfinder.value) return; // it's fine. - if (!M_SecretUnlocked(SECRET_ITEMFINDER)) + if (!M_SecretUnlocked(SECRET_ITEMFINDER, clientGamedata)) { CONS_Printf(M_GetText("You haven't earned this yet.\n")); CV_StealthSetValue(&cv_itemfinder, 0); return; } - else if (netgame || multiplayer) - { - CONS_Printf(M_GetText("This only works in single player.\n")); - CV_StealthSetValue(&cv_itemfinder, 0); - return; - } } /** Deals with a pointlimit change by printing the change to the console. @@ -3995,7 +4299,7 @@ void D_GameTypeChanged(INT32 lastgametype) static void Ringslinger_OnChange(void) { - if (!M_SecretUnlocked(SECRET_PANDORA) && !netgame && cv_ringslinger.value && !cv_debug) + if (!M_SecretUnlocked(SECRET_PANDORA, serverGamedata) && !netgame && cv_ringslinger.value && !cv_debug) { CONS_Printf(M_GetText("You haven't earned this yet.\n")); CV_StealthSetValue(&cv_ringslinger, 0); @@ -4003,12 +4307,12 @@ static void Ringslinger_OnChange(void) } if (cv_ringslinger.value) // Only if it's been turned on - G_SetGameModified(multiplayer); + G_SetUsedCheats(false); } static void Gravity_OnChange(void) { - if (!M_SecretUnlocked(SECRET_PANDORA) && !netgame && !cv_debug + if (!M_SecretUnlocked(SECRET_PANDORA, serverGamedata) && !netgame && !cv_debug && strcmp(cv_gravity.string, cv_gravity.defaultvalue)) { CONS_Printf(M_GetText("You haven't earned this yet.\n")); @@ -4024,7 +4328,7 @@ static void Gravity_OnChange(void) #endif if (!CV_IsSetToDefault(&cv_gravity)) - G_SetGameModified(multiplayer); + G_SetUsedCheats(false); gravity = cv_gravity.value; } @@ -4288,7 +4592,7 @@ void Command_ExitGame_f(void) { INT32 i; - LUAh_GameQuit(false); + LUA_HookBool(false, HOOK(GameQuit)); D_QuitNetGame(); CL_Reset(); @@ -4320,7 +4624,7 @@ void Command_Retry_f(void) CONS_Printf(M_GetText("You must be in a level to use this.\n")); else if (netgame || multiplayer) CONS_Printf(M_GetText("This only works in single player.\n")); - else if (!&players[consoleplayer] || players[consoleplayer].lives <= 1) + else if (players[consoleplayer].lives <= 1) CONS_Printf(M_GetText("You can't retry without any lives remaining!\n")); else if (G_IsSpecialStage(gamemap)) CONS_Printf(M_GetText("You can't retry special stages!\n")); @@ -4340,7 +4644,7 @@ static void Fishcake_OnChange(void) // so don't make modifiedgame always on! if (cv_debug) { - G_SetGameModified(multiplayer); + G_SetUsedCheats(false); } else if (cv_debug != cv_fishcake.value) @@ -4357,11 +4661,11 @@ static void Fishcake_OnChange(void) static void Command_Isgamemodified_f(void) { if (savemoddata) - CONS_Printf(M_GetText("modifiedgame is true, but you can save emblem and time data in this mod.\n")); + CONS_Printf(M_GetText("modifiedgame is true, but you can save time data in this mod.\n")); else if (modifiedgame) - CONS_Printf(M_GetText("modifiedgame is true, extras will not be unlocked\n")); + CONS_Printf(M_GetText("modifiedgame is true, time data can't be saved\n")); else - CONS_Printf(M_GetText("modifiedgame is false, you can unlock extras\n")); + CONS_Printf(M_GetText("modifiedgame is false, you can save time data\n")); } static void Command_Cheats_f(void) diff --git a/src/d_netcmd.h b/src/d_netcmd.h index bc5f72209..26bf4d5c6 100644 --- a/src/d_netcmd.h +++ b/src/d_netcmd.h @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -73,6 +73,7 @@ extern consvar_t cv_teamscramble; extern consvar_t cv_scrambleonchange; extern consvar_t cv_netstat; +extern consvar_t cv_nettimeout; extern consvar_t cv_countdowntime; extern consvar_t cv_runscripts; @@ -110,6 +111,8 @@ extern consvar_t cv_skipmapcheck; extern consvar_t cv_sleep; extern consvar_t cv_perfstats; +extern consvar_t cv_ps_samplesize; +extern consvar_t cv_ps_descriptor; extern char timedemo_name[256]; extern boolean timedemo_csv; @@ -128,16 +131,16 @@ typedef enum XD_MAP, // 6 XD_EXITLEVEL, // 7 XD_ADDFILE, // 8 - XD_PAUSE, // 9 - XD_ADDPLAYER, // 10 - XD_TEAMCHANGE, // 11 - XD_CLEARSCORES, // 12 - // UNUSED 13 (Because I don't want to change these comments) - XD_VERIFIED = 14,//14 + XD_ADDFOLDER, // 9 + XD_PAUSE, // 10 + XD_ADDPLAYER, // 11 + XD_TEAMCHANGE, // 12 + XD_CLEARSCORES, // 13 + XD_VERIFIED, // 14 XD_RANDOMSEED, // 15 XD_RUNSOC, // 16 XD_REQADDFILE, // 17 - XD_DELFILE, // 18 - replace next time we add an XD + XD_REQADDFOLDER,// 18 XD_SETMOTD, // 19 XD_SUICIDE, // 20 XD_DEMOTED, // 21 diff --git a/src/d_netfil.c b/src/d_netfil.c index 55ab4ea23..e60af2c2c 100644 --- a/src/d_netfil.c +++ b/src/d_netfil.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -35,6 +35,7 @@ #include "doomstat.h" #include "d_main.h" #include "g_game.h" +#include "i_time.h" #include "i_net.h" #include "i_system.h" #include "m_argv.h" @@ -52,7 +53,7 @@ #include // Prototypes -static boolean AddFileToSendQueue(INT32 node, const char *filename, UINT8 fileid); +static boolean AddFileToSendQueue(INT32 node, UINT8 fileid); // Sender structure typedef struct filetx_s @@ -87,7 +88,7 @@ static filetran_t transfer[MAXNETNODES]; // Receiver structure INT32 fileneedednum; // Number of files needed to join the server -fileneeded_t fileneeded[MAX_WADFILES]; // List of needed files +fileneeded_t *fileneeded; // List of needed files static tic_t lasttimeackpacketsent = 0; char downloaddir[512] = "DOWNLOAD"; @@ -105,6 +106,10 @@ static pauseddownload_t *pauseddownload = NULL; #ifndef NONET // for cl loading screen INT32 lastfilenum = -1; +INT32 downloadcompletednum = 0; +UINT32 downloadcompletedsize = 0; +INT32 totalfilesrequestednum = 0; +UINT32 totalfilesrequestedsize = 0; #endif luafiletransfer_t *luafiletransfers = NULL; @@ -113,29 +118,67 @@ boolean waitingforluafilecommand = false; char luafiledir[256 + 16] = "luafiles"; +static UINT16 GetWadNumFromFileNeededId(UINT8 id) +{ + UINT16 wadnum; + + for (wadnum = mainwads; wadnum < numwadfiles; wadnum++) + { + if (!wadfiles[wadnum]->important) + continue; + if (id == 0) + return wadnum; + id--; + } + + return UINT16_MAX; +} + /** Fills a serverinfo packet with information about wad files loaded. * * \todo Give this function a better name since it is in global scope. - * Used to have size limiting built in - now handled via W_LoadWadFile in w_wad.c + * Used to have size limiting built in - now handled via W_InitFile in w_wad.c * */ -UINT8 *PutFileNeeded(void) +UINT8 *PutFileNeeded(UINT16 firstfile) { - size_t i, count = 0; - UINT8 *p = netbuffer->u.serverinfo.fileneeded; + size_t i; + UINT8 count = 0; + UINT8 *p_start = netbuffer->packettype == PT_MOREFILESNEEDED ? netbuffer->u.filesneededcfg.files : netbuffer->u.serverinfo.fileneeded; + UINT8 *p = p_start; char wadfilename[MAX_WADPATH] = ""; - UINT8 filestatus; + UINT8 filestatus, folder; - for (i = 0; i < numwadfiles; i++) + for (i = mainwads; i < numwadfiles; i++) //mainwads, otherwise we start on the first mainwad { // If it has only music/sound lumps, don't put it in the list if (!wadfiles[i]->important) continue; + if (firstfile) + { // Skip files until we reach the first file. + firstfile--; + continue; + } + + nameonly(strcpy(wadfilename, wadfiles[i]->filename)); + + // Look below at the WRITE macros to understand what these numbers mean. + if (p + 1 + 4 + min(strlen(wadfilename) + 1, MAX_WADPATH) + 16 > p_start + MAXFILENEEDED) + { + // Too many files to send all at once + if (netbuffer->packettype == PT_MOREFILESNEEDED) + netbuffer->u.filesneededcfg.more = 1; + else + netbuffer->u.serverinfo.flags |= SV_LOTSOFADDONS; + break; + } + filestatus = 1; // Importance - not really used any more, holds 1 by default for backwards compat with MS + folder = (wadfiles[i]->type == RET_FOLDER); // Store in the upper four bits - if (!cv_downloading.value) + if (!cv_downloading.value || folder) /// \todo Implement folder downloading. filestatus += (2 << 4); // Won't send else if ((wadfiles[i]->filesize <= (UINT32)cv_maxsend.value * 1024)) filestatus += (1 << 4); // Will send if requested @@ -143,37 +186,60 @@ UINT8 *PutFileNeeded(void) // filestatus += (0 << 4); -- Won't send, too big WRITEUINT8(p, filestatus); + WRITEUINT8(p, folder); count++; WRITEUINT32(p, wadfiles[i]->filesize); - nameonly(strcpy(wadfilename, wadfiles[i]->filename)); WRITESTRINGN(p, wadfilename, MAX_WADPATH); WRITEMEM(p, wadfiles[i]->md5sum, 16); } - netbuffer->u.serverinfo.fileneedednum = (UINT8)count; + + if (netbuffer->packettype == PT_MOREFILESNEEDED) + netbuffer->u.filesneededcfg.num = count; + else + netbuffer->u.serverinfo.fileneedednum = count; return p; } +void AllocFileNeeded(INT32 size) +{ + if (fileneeded == NULL) + fileneeded = Z_Calloc(sizeof(fileneeded_t) * size, PU_STATIC, NULL); + else + fileneeded = Z_Realloc(fileneeded, sizeof(fileneeded_t) * size, PU_STATIC, NULL); +} + +void FreeFileNeeded(void) +{ + Z_Free(fileneeded); + fileneeded = NULL; +} + /** Parses the serverinfo packet and fills the fileneeded table on client * * \param fileneedednum_parm The number of files needed to join the server * \param fileneededstr The memory block containing the list of needed files * */ -void D_ParseFileneeded(INT32 fileneedednum_parm, UINT8 *fileneededstr) +void D_ParseFileneeded(INT32 fileneedednum_parm, UINT8 *fileneededstr, UINT16 firstfile) { INT32 i; UINT8 *p; UINT8 filestatus; - fileneedednum = fileneedednum_parm; + fileneedednum = firstfile + fileneedednum_parm; p = (UINT8 *)fileneededstr; - for (i = 0; i < fileneedednum; i++) + + AllocFileNeeded(fileneedednum); + + for (i = firstfile; i < fileneedednum; i++) { - fileneeded[i].status = FS_NOTFOUND; // We haven't even started looking for the file yet + fileneeded[i].type = FILENEEDED_WAD; + fileneeded[i].status = FS_NOTCHECKED; // We haven't even started looking for the file yet fileneeded[i].justdownloaded = false; filestatus = READUINT8(p); // The first byte is the file status + fileneeded[i].folder = READUINT8(p); // The second byte is the folder flag fileneeded[i].willsend = (UINT8)(filestatus >> 4); fileneeded[i].totalsize = READUINT32(p); // The four next bytes are the file size fileneeded[i].file = NULL; // The file isn't open yet @@ -188,7 +254,11 @@ void CL_PrepareDownloadSaveGame(const char *tmpsave) lastfilenum = -1; #endif + FreeFileNeeded(); + AllocFileNeeded(1); + fileneedednum = 1; + fileneeded[0].type = FILENEEDED_SAVEGAME; fileneeded[0].status = FS_REQUESTED; fileneeded[0].justdownloaded = false; fileneeded[0].totalsize = UINT32_MAX; @@ -319,14 +389,18 @@ boolean CL_SendFileRequest(void) if ((fileneeded[i].status == FS_NOTFOUND || fileneeded[i].status == FS_MD5SUMBAD)) { totalfreespaceneeded += fileneeded[i].totalsize; - nameonly(fileneeded[i].filename); + WRITEUINT8(p, i); // fileid - WRITESTRINGN(p, fileneeded[i].filename, MAX_WADPATH); + // put it in download dir + nameonly(fileneeded[i].filename); strcatbf(fileneeded[i].filename, downloaddir, "/"); + fileneeded[i].status = FS_REQUESTED; } + WRITEUINT8(p, 0xFF); + I_GetDiskFreeSpace(&availablefreespace); if (totalfreespaceneeded > availablefreespace) I_Error("To play on this server you must download %s KB,\n" @@ -342,21 +416,22 @@ boolean CL_SendFileRequest(void) // returns false if a requested file was not found or cannot be sent boolean PT_RequestFile(INT32 node) { - char wad[MAX_WADPATH+1]; UINT8 *p = netbuffer->u.textcmd; UINT8 id; + while (p < netbuffer->u.textcmd + MAXTEXTCMD-1) // Don't allow hacked client to overflow { id = READUINT8(p); if (id == 0xFF) break; - READSTRINGN(p, wad, MAX_WADPATH); - if (!AddFileToSendQueue(node, wad, id)) + + if (!AddFileToSendQueue(node, id)) { SV_AbortSendFiles(node); return false; // don't read the rest of the files } } + return true; // no problems with any files } @@ -365,23 +440,16 @@ boolean PT_RequestFile(INT32 node) * \return 0 if some files are missing * 1 if all files exist * 2 if some already loaded files are not requested or are in a different order + * 3 too many files, over WADLIMIT + * 4 still checking, continuing next tic * */ INT32 CL_CheckFiles(void) { INT32 i, j; char wadfilename[MAX_WADPATH]; - INT32 ret = 1; - size_t packetsize = 0; - size_t filestoget = 0; - -// if (M_CheckParm("-nofiles")) -// return 1; - - // the first is the iwad (the main wad file) - // we don't care if it's called srb2.pk3 or not. - // Never download the IWAD, just assume it's there and identical - fileneeded[0].status = FS_OPEN; + size_t filestoload = 0; + boolean downloadrequired = false; // Modified game handling -- check for an identical file list // must be identical in files loaded AND in order @@ -389,7 +457,7 @@ INT32 CL_CheckFiles(void) if (modifiedgame) { CONS_Debug(DBG_NETPLAY, "game is modified; only doing basic checks\n"); - for (i = 1, j = 1; i < fileneedednum || j < numwadfiles;) + for (i = 0, j = mainwads; i < fileneedednum || j < numwadfiles;) { if (j < numwadfiles && !wadfiles[j]->important) { @@ -416,15 +484,21 @@ INT32 CL_CheckFiles(void) return 1; } - // See W_LoadWadFile in w_wad.c - packetsize = packetsizetally; - - for (i = 1; i < fileneedednum; i++) + for (i = 0; i < fileneedednum; i++) { + if (fileneeded[i].status == FS_NOTFOUND || fileneeded[i].status == FS_MD5SUMBAD) + downloadrequired = true; + + if (fileneeded[i].status != FS_OPEN) + filestoload++; + + if (fileneeded[i].status != FS_NOTCHECKED) //since we're running this over multiple tics now, its possible for us to come across files checked in previous tics + continue; + CONS_Debug(DBG_NETPLAY, "searching for '%s' ", fileneeded[i].filename); // Check in already loaded files - for (j = 1; wadfiles[j]; j++) + for (j = mainwads; wadfiles[j]; j++) { nameonly(strcpy(wadfilename, wadfiles[j]->filename)); if (!stricmp(wadfilename, fileneeded[i].filename) && @@ -432,45 +506,46 @@ INT32 CL_CheckFiles(void) { CONS_Debug(DBG_NETPLAY, "already loaded\n"); fileneeded[i].status = FS_OPEN; - break; + return 4; } } - if (fileneeded[i].status != FS_NOTFOUND) - continue; - packetsize += nameonlylength(fileneeded[i].filename) + 22; + if (fileneeded[i].folder) + fileneeded[i].status = findfolder(fileneeded[i].filename); + else + fileneeded[i].status = findfile(fileneeded[i].filename, fileneeded[i].md5sum, true); - if ((numwadfiles+filestoget >= MAX_WADFILES) - || (packetsize > MAXFILENEEDED*sizeof(UINT8))) - return 3; - - filestoget++; - - fileneeded[i].status = findfile(fileneeded[i].filename, fileneeded[i].md5sum, true); CONS_Debug(DBG_NETPLAY, "found %d\n", fileneeded[i].status); - if (fileneeded[i].status != FS_FOUND) - ret = 0; + return 4; } - return ret; + + //now making it here means we've checked the entire list and no FS_NOTCHECKED files remain + if (numwadfiles+filestoload > MAX_WADFILES) + return 3; + else if (downloadrequired) + return 0; //some stuff is FS_NOTFOUND, needs download + else + return 1; //everything is FS_OPEN or FS_FOUND, proceed to loading } // Load it now -void CL_LoadServerFiles(void) +boolean CL_LoadServerFiles(void) { INT32 i; -// if (M_CheckParm("-nofiles")) -// return; - - for (i = 1; i < fileneedednum; i++) + for (i = 0; i < fileneedednum; i++) { if (fileneeded[i].status == FS_OPEN) continue; // Already loaded else if (fileneeded[i].status == FS_FOUND) { - P_AddWadFile(fileneeded[i].filename); + if (fileneeded[i].folder) + P_AddFolder(fileneeded[i].filename); + else + P_AddWadFile(fileneeded[i].filename); G_SetGameModified(true); fileneeded[i].status = FS_OPEN; + return false; } else if (fileneeded[i].status == FS_MD5SUMBAD) I_Error("Wrong version of file %s", fileneeded[i].filename); @@ -496,6 +571,7 @@ void CL_LoadServerFiles(void) fileneeded[i].status, s); } } + return true; } void AddLuaFileTransfer(const char *filename, const char *mode) @@ -677,7 +753,11 @@ void CL_PrepareDownloadLuaFile(void) netbuffer->packettype = PT_ASKLUAFILE; HSendPacket(servernode, true, 0, 0); + FreeFileNeeded(); + AllocFileNeeded(1); + fileneedednum = 1; + fileneeded[0].type = FILENEEDED_LUAFILE; fileneeded[0].status = FS_REQUESTED; fileneeded[0].justdownloaded = false; fileneeded[0].totalsize = UINT32_MAX; @@ -704,15 +784,11 @@ static INT32 filestosend = 0; * \sa AddLuaFileToSendQueue * */ -static boolean AddFileToSendQueue(INT32 node, const char *filename, UINT8 fileid) +static boolean AddFileToSendQueue(INT32 node, UINT8 fileid) { filetx_t **q; // A pointer to the "next" field of the last file in the list filetx_t *p; // The new file request - INT32 i; - char wadfilename[MAX_WADPATH]; - - if (cv_noticedownload.value) - CONS_Printf("Sending file \"%s\" to node %d (%s)\n", filename, node, I_GetNodeAddress(node)); + UINT16 wadnum; // Find the last file in the list and set a pointer to its "next" field q = &transfer[node].txlist; @@ -732,51 +808,43 @@ static boolean AddFileToSendQueue(INT32 node, const char *filename, UINT8 fileid if (!p->id.filename) I_Error("AddFileToSendQueue: No more memory\n"); - // Set the file name and get rid of the path - strlcpy(p->id.filename, filename, MAX_WADPATH); - nameonly(p->id.filename); - - // Look for the requested file through all loaded files - for (i = 0; wadfiles[i]; i++) - { - strlcpy(wadfilename, wadfiles[i]->filename, MAX_WADPATH); - nameonly(wadfilename); - if (!stricmp(wadfilename, p->id.filename)) - { - // Copy file name with full path - strlcpy(p->id.filename, wadfiles[i]->filename, MAX_WADPATH); - break; - } - } + // Find the wad the ID refers to + wadnum = GetWadNumFromFileNeededId(fileid); // Handle non-loaded file requests - if (!wadfiles[i]) + if (wadnum == UINT16_MAX) { - DEBFILE(va("%s not found in wadfiles\n", filename)); + DEBFILE(va("fileneeded %d not found in wadfiles\n", fileid)); // This formerly checked if (!findfile(p->id.filename, NULL, true)) // Not found - // Don't inform client (probably someone who thought they could leak 2.2 ACZ) - DEBFILE(va("Client %d request %s: not found\n", node, filename)); + // Don't inform client + DEBFILE(va("Client %d request fileneeded %d: not found\n", node, fileid)); free(p->id.filename); free(p); *q = NULL; return false; // cancel the rest of the requests } + // Set the file name and get rid of the path + strlcpy(p->id.filename, wadfiles[wadnum]->filename, MAX_WADPATH); + // Handle huge file requests (i.e. bigger than cv_maxsend.value KB) - if (wadfiles[i]->filesize > (UINT32)cv_maxsend.value * 1024) + if (wadfiles[wadnum]->filesize > (UINT32)cv_maxsend.value * 1024) { // Too big // Don't inform client (client sucks, man) - DEBFILE(va("Client %d request %s: file too big, not sending\n", node, filename)); + DEBFILE(va("Client %d request %s: file too big, not sending\n", node, p->id.filename)); free(p->id.filename); free(p); *q = NULL; return false; // cancel the rest of the requests } - DEBFILE(va("Sending file %s (id=%d) to %d\n", filename, fileid, node)); + if (cv_noticedownload.value) + CONS_Printf("Sending file \"%s\" to node %d (%s)\n", p->id.filename, node, I_GetNodeAddress(node)); + + DEBFILE(va("Sending file %s (id=%d) to %d\n", p->id.filename, fileid, node)); p->ram = SF_FILE; // It's a file, we need to close it and free its name once we're done sending it p->fileid = fileid; p->next = NULL; // End of list @@ -913,7 +981,6 @@ static void SV_EndFileSend(INT32 node) filestosend--; } -#define PACKETPERTIC net_bandwidth/(TICRATE*software_MAXPACKETLENGTH) #define FILEFRAGMENTSIZE (software_MAXPACKETLENGTH - (FILETXHEADER + BASEPACKETSIZE)) /** Handles file transmission @@ -946,14 +1013,7 @@ void FileSendTicker(void) if (!filestosend) // No file to send return; - if (cv_downloadspeed.value) // New behavior - packetsent = cv_downloadspeed.value; - else // Old behavior - { - packetsent = PACKETPERTIC; - if (!packetsent) - packetsent = 1; - } + packetsent = cv_downloadspeed.value; netbuffer->packettype = PT_FILEFRAGMENT; @@ -1230,6 +1290,9 @@ void PT_FileFragment(void) UINT16 boundedfragmentsize = doomcom->datalength - BASEPACKETSIZE - sizeof(netbuffer->u.filetxpak); char *filename; + if (!file) + return; + filename = va("%s", file->filename); nameonly(filename); @@ -1341,6 +1404,7 @@ void PT_FileFragment(void) // Tell the server we have received the file netbuffer->packettype = PT_HASLUAFILE; HSendPacket(servernode, true, 0, 0); + FreeFileNeeded(); } } } @@ -1411,32 +1475,37 @@ void CloseNetFile(void) SV_AbortSendFiles(i); // Receiving a file? - for (i = 0; i < MAX_WADFILES; i++) - if (fileneeded[i].status == FS_DOWNLOADING && fileneeded[i].file) - { - fclose(fileneeded[i].file); - free(fileneeded[i].ackpacket); - - if (!pauseddownload && i != 0) // 0 is either srb2.srb or the gamestate... + if (fileneeded) + { + for (i = 0; i < fileneedednum; i++) + if (fileneeded[i].status == FS_DOWNLOADING && fileneeded[i].file) { - // Don't remove the file, save it for later in case we resume the download - pauseddownload = malloc(sizeof(*pauseddownload)); - if (!pauseddownload) - I_Error("CloseNetFile: No more memory\n"); + fclose(fileneeded[i].file); + free(fileneeded[i].ackpacket); - strcpy(pauseddownload->filename, fileneeded[i].filename); - memcpy(pauseddownload->md5sum, fileneeded[i].md5sum, 16); - pauseddownload->currentsize = fileneeded[i].currentsize; - pauseddownload->receivedfragments = fileneeded[i].receivedfragments; - pauseddownload->fragmentsize = fileneeded[i].fragmentsize; + if (!pauseddownload && (fileneeded[i].type == FILENEEDED_WAD || i != 0)) // 0 is the gamestate... + { + // Don't remove the file, save it for later in case we resume the download + pauseddownload = malloc(sizeof(*pauseddownload)); + if (!pauseddownload) + I_Error("CloseNetFile: No more memory\n"); + + strcpy(pauseddownload->filename, fileneeded[i].filename); + memcpy(pauseddownload->md5sum, fileneeded[i].md5sum, 16); + pauseddownload->currentsize = fileneeded[i].currentsize; + pauseddownload->receivedfragments = fileneeded[i].receivedfragments; + pauseddownload->fragmentsize = fileneeded[i].fragmentsize; + } + else + { + // File is not complete, delete it. + free(fileneeded[i].receivedfragments); + remove(fileneeded[i].filename); + } } - else - { - free(fileneeded[i].receivedfragments); - // File is not complete delete it - remove(fileneeded[i].filename); - } - } + } + + FreeFileNeeded(); } void Command_Downloads_f(void) @@ -1571,3 +1640,26 @@ filestatus_t findfile(char *filename, const UINT8 *wantedmd5sum, boolean complet return (badmd5 ? FS_MD5SUMBAD : FS_NOTFOUND); // md5 sum bad or file not found } + +// Searches for a folder. +// This can be used with a full path, or an incomplete path. +// In the latter case, the function will try to find folders in +// srb2home, srb2path, and the current directory. +filestatus_t findfolder(const char *path) +{ + // Check the path by itself first. + if (concatpaths(path, NULL) == 1) + return FS_FOUND; + +#define checkpath(startpath) \ + if (concatpaths(path, startpath) == 1) \ + return FS_FOUND + + checkpath(srb2home); // Then, look in srb2home. + checkpath(srb2path); // Now, look in srb2path. + checkpath("."); // Finally, look in the current directory. + +#undef checkpath + + return FS_NOTFOUND; +} diff --git a/src/d_netfil.h b/src/d_netfil.h index ddcbcfec3..ecec976be 100644 --- a/src/d_netfil.h +++ b/src/d_netfil.h @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -27,6 +27,7 @@ typedef enum typedef enum { + FS_NOTCHECKED, FS_NOTFOUND, FS_FOUND, FS_REQUESTED, @@ -35,12 +36,21 @@ typedef enum FS_MD5SUMBAD } filestatus_t; +typedef enum +{ + FILENEEDED_WAD, + FILENEEDED_SAVEGAME, + FILENEEDED_LUAFILE +} fileneededtype_t; + typedef struct { - UINT8 willsend; // Is the server willing to send it? char filename[MAX_WADPATH]; UINT8 md5sum[16]; filestatus_t status; // The value returned by recsearch + UINT8 willsend; // Is the server willing to send it? + UINT8 folder; // File is a folder + fileneededtype_t type; boolean justdownloaded; // To prevent late fragments from causing an I_Error // Used only for download @@ -54,20 +64,28 @@ typedef struct UINT32 ackresendposition; // Used when resuming downloads } fileneeded_t; +#define FILENEEDEDSIZE 23 + extern INT32 fileneedednum; -extern fileneeded_t fileneeded[MAX_WADFILES]; +extern fileneeded_t *fileneeded; extern char downloaddir[512]; #ifndef NONET extern INT32 lastfilenum; +extern INT32 downloadcompletednum; +extern UINT32 downloadcompletedsize; +extern INT32 totalfilesrequestednum; +extern UINT32 totalfilesrequestedsize; #endif -UINT8 *PutFileNeeded(void); -void D_ParseFileneeded(INT32 fileneedednum_parm, UINT8 *fileneededstr); +void AllocFileNeeded(INT32 size); +void FreeFileNeeded(void); +UINT8 *PutFileNeeded(UINT16 firstfile); +void D_ParseFileneeded(INT32 fileneedednum_parm, UINT8 *fileneededstr, UINT16 firstfile); void CL_PrepareDownloadSaveGame(const char *tmpsave); INT32 CL_CheckFiles(void); -void CL_LoadServerFiles(void); +boolean CL_LoadServerFiles(void); void AddRamToSendQueue(INT32 node, void *data, size_t size, freemethod_t freemethod, UINT8 fileid); @@ -135,6 +153,9 @@ filestatus_t findfile(char *filename, const UINT8 *wantedmd5sum, boolean completepath); filestatus_t checkfilemd5(char *filename, const UINT8 *wantedmd5sum); +// Searches for a folder +filestatus_t findfolder(const char *path); + void nameonly(char *s); size_t nameonlylength(const char *s); diff --git a/src/d_player.h b/src/d_player.h index 54ab34288..756c7141e 100644 --- a/src/d_player.h +++ b/src/d_player.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -245,7 +245,8 @@ typedef enum CR_MINECART, CR_ROLLOUT, CR_PTERABYTE, - CR_DUSTDEVIL + CR_DUSTDEVIL, + CR_FAN } carrytype_t; // pw_carry // Player powers. (don't edit this comment) @@ -313,9 +314,43 @@ typedef enum RW_RAIL = 32 } ringweapons_t; +//Bot types +typedef enum +{ + BOT_NONE = 0, + BOT_2PAI, + BOT_2PHUMAN, + BOT_MPAI +} bottype_t; + +//AI states +typedef enum +{ + AI_STANDBY = 0, + AI_FOLLOW, + AI_CATCHUP, + AI_THINKFLY, + AI_FLYSTANDBY, + AI_FLYCARRY, + AI_SPINFOLLOW +} aistatetype_t; + + // ======================================================================== // PLAYER STRUCTURE // ======================================================================== + +//Bot memory struct +typedef struct botmem_s +{ + boolean lastForward; + boolean lastBlocked; + boolean blocked; + UINT8 catchup_tics; + UINT8 thinkstate; +} botmem_t; + +//Main struct typedef struct player_s { mobj_t *mo; @@ -348,6 +383,8 @@ typedef struct player_s // fun thing for player sprite angle_t drawangle; + angle_t old_drawangle; + angle_t old_drawangle2; // player's ring count INT16 rings; @@ -525,7 +562,12 @@ typedef struct player_s boolean spectator; boolean outofcoop; + boolean removing; UINT8 bot; + struct player_s *botleader; + UINT16 lastbuttons; + botmem_t botmem; + boolean blocked; tic_t jointime; // Timer when player joins game to change skin/color tic_t quittime; // Time elapsed since user disconnected, zero if connected diff --git a/src/d_think.h b/src/d_think.h index c3f91edc4..bdb5db3f5 100644 --- a/src/d_think.h +++ b/src/d_think.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/d_ticcmd.h b/src/d_ticcmd.h index 182b30e6a..2481ed738 100644 --- a/src/d_ticcmd.h +++ b/src/d_ticcmd.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/deh_lua.c b/src/deh_lua.c index fbeaae08c..6dabb7e2d 100644 --- a/src/deh_lua.c +++ b/src/deh_lua.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -10,20 +10,7 @@ /// \file deh_lua.c /// \brief Lua SOC library -#include "g_game.h" -#include "s_sound.h" -#include "z_zone.h" -#include "m_menu.h" -#include "m_misc.h" -#include "p_local.h" -#include "st_stuff.h" -#include "fastcmp.h" -#include "lua_script.h" -#include "lua_libs.h" - -#include "dehacked.h" #include "deh_lua.h" -#include "deh_tables.h" // freeslot takes a name (string only!) // and allocates it to the appropriate free slot. @@ -89,6 +76,8 @@ static inline int lib_freeslot(lua_State *L) strncpy(sprnames[j],word,4); //sprnames[j][4] = 0; used_spr[(j-SPR_FIRSTFREESLOT)/8] |= 1<<(j%8); // Okay, this sprite slot has been named now. + // Lua needs to update the value in _G if it exists + LUA_UpdateSprName(word, j); lua_pushinteger(L, j); r++; break; @@ -188,6 +177,9 @@ static inline int lib_freeslot(lua_State *L) lua_remove(L, 1); continue; } + + R_RefreshSprite2(); + return r; } @@ -216,18 +208,27 @@ static int lib_dummysuper(lua_State *L) return luaL_error(L, "Can't call super() outside of hardcode-replacing A_Action functions being called by state changes!"); // convoluted, I know. @_@;; } -static inline int lib_getenum(lua_State *L) +static void CacheAndPushConstant(lua_State *L, const char *name, lua_Integer value) { - const char *word, *p; + // "cache" into _G + lua_pushstring(L, name); + lua_pushinteger(L, value); + lua_rawset(L, LUA_GLOBALSINDEX); + // push + lua_pushinteger(L, value); +} + +// Search for a matching constant variable. +// Result is stored into _G for faster subsequent use. (Except for SPR_ in the SOC parser) +static int ScanConstants(lua_State *L, boolean mathlib, const char *word) +{ + const char *p; fixed_t i; - boolean mathlib = lua_toboolean(L, lua_upvalueindex(1)); - if (lua_type(L,2) != LUA_TSTRING) - return 0; - word = lua_tostring(L,2); + if (strlen(word) == 1) { // Assume sprite frame if length 1. if (*word >= 'A' && *word <= '~') { - lua_pushinteger(L, *word-'A'); + CacheAndPushConstant(L, word, *word-'A'); return 1; } if (mathlib) return luaL_error(L, "constant '%s' could not be parsed.\n", word); @@ -237,7 +238,7 @@ static inline int lib_getenum(lua_State *L) p = word+3; for (i = 0; MOBJFLAG_LIST[i]; i++) if (fastcmp(p, MOBJFLAG_LIST[i])) { - lua_pushinteger(L, ((lua_Integer)1<= NUMMAPS) + if (re <= 0 || re > NUMMAPS) { deh_warning("Level number %d out of range (1 - %d)", re, NUMMAPS); return; @@ -3327,7 +3340,7 @@ static void readcondition(UINT8 set, UINT32 id, char *word2) else x1 = (INT16)atoi(params[1]); - if (x1 < 0 || x1 >= NUMMAPS) + if (x1 <= 0 || x1 > NUMMAPS) { deh_warning("Level number %d out of range (1 - %d)", re, NUMMAPS); return; @@ -3362,7 +3375,7 @@ static void readcondition(UINT8 set, UINT32 id, char *word2) else x1 = (INT16)atoi(params[1]); - if (x1 < 0 || x1 >= NUMMAPS) + if (x1 <= 0 || x1 > NUMMAPS) { deh_warning("Level number %d out of range (1 - %d)", re, NUMMAPS); return; @@ -3829,6 +3842,10 @@ void readmaincfg(MYFILE *f) { useContinues = (UINT8)(value || word2[0] == 'T' || word2[0] == 'Y'); } + else if (fastcmp(word, "SHAREEMBLEMS")) + { + shareEmblems = (UINT8)(value || word2[0] == 'T' || word2[0] == 'Y'); + } else if (fastcmp(word, "GAMEDATA")) { @@ -3839,7 +3856,7 @@ void readmaincfg(MYFILE *f) if (!GoodDataFileName(word2)) I_Error("Maincfg: bad data file name '%s'\n", word2); - G_SaveGameData(); + G_SaveGameData(clientGamedata); strlcpy(gamedatafilename, word2, sizeof (gamedatafilename)); strlwr(gamedatafilename); savemoddata = true; diff --git a/src/deh_soc.h b/src/deh_soc.h index 28e3c9512..0cab545f6 100644 --- a/src/deh_soc.h +++ b/src/deh_soc.h @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/deh_tables.c b/src/deh_tables.c index 23faf0092..c3b2cfccd 100644 --- a/src/deh_tables.c +++ b/src/deh_tables.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -22,6 +22,9 @@ #include "v_video.h" // video flags (for lua) #include "i_sound.h" // musictype_t (for lua) #include "g_state.h" // gamestate_t (for lua) +#include "g_game.h" // Joystick axes (for lua) +#include "i_joy.h" +#include "g_input.h" // Game controls (for lua) #include "deh_tables.h" @@ -88,6 +91,8 @@ actionpointer_t actionpointers[] = {{A_FaceTracer}, "A_FACETRACER"}, {{A_Scream}, "A_SCREAM"}, {{A_BossDeath}, "A_BOSSDEATH"}, + {{A_SetShadowScale}, "A_SETSHADOWSCALE"}, + {{A_ShadowScream}, "A_SHADOWSCREAM"}, {{A_CustomPower}, "A_CUSTOMPOWER"}, {{A_GiveWeapon}, "A_GIVEWEAPON"}, {{A_RingBox}, "A_RINGBOX"}, @@ -194,6 +199,7 @@ actionpointer_t actionpointers[] = {{A_Boss3Path}, "A_BOSS3PATH"}, {{A_Boss3ShockThink}, "A_BOSS3SHOCKTHINK"}, {{A_LinedefExecute}, "A_LINEDEFEXECUTE"}, + {{A_LinedefExecuteFromArg}, "A_LINEDEFEXECUTEFROMARG"}, {{A_PlaySeeSound}, "A_PLAYSEESOUND"}, {{A_PlayAttackSound}, "A_PLAYATTACKSOUND"}, {{A_PlayActiveSound}, "A_PLAYACTIVESOUND"}, @@ -221,6 +227,8 @@ actionpointer_t actionpointers[] = {{A_SetObjectFlags2}, "A_SETOBJECTFLAGS2"}, {{A_RandomState}, "A_RANDOMSTATE"}, {{A_RandomStateRange}, "A_RANDOMSTATERANGE"}, + {{A_StateRangeByAngle}, "A_STATERANGEBYANGLE"}, + {{A_StateRangeByParameter}, "A_STATERANGEBYPARAMETER"}, {{A_DualAction}, "A_DUALACTION"}, {{A_RemoteAction}, "A_REMOTEACTION"}, {{A_ToggleFlameJet}, "A_TOGGLEFLAMEJET"}, @@ -1748,6 +1756,56 @@ const char *const STATE_LIST[] = { // array length left dynamic for sanity testi // The letter "S_LETTER", + // Tutorial Scenery + "S_TUTORIALLEAF1", + "S_TUTORIALLEAF2", + "S_TUTORIALLEAF3", + "S_TUTORIALLEAF4", + "S_TUTORIALLEAF5", + "S_TUTORIALLEAF6", + "S_TUTORIALLEAF7", + "S_TUTORIALLEAF8", + "S_TUTORIALLEAF9", + "S_TUTORIALLEAF10", + "S_TUTORIALLEAF11", + "S_TUTORIALLEAF12", + "S_TUTORIALLEAF13", + "S_TUTORIALLEAF14", + "S_TUTORIALLEAF15", + "S_TUTORIALLEAF16", + "S_TUTORIALFLOWER1", + "S_TUTORIALFLOWER2", + "S_TUTORIALFLOWER3", + "S_TUTORIALFLOWER4", + "S_TUTORIALFLOWER5", + "S_TUTORIALFLOWER6", + "S_TUTORIALFLOWER7", + "S_TUTORIALFLOWER8", + "S_TUTORIALFLOWER9", + "S_TUTORIALFLOWER10", + "S_TUTORIALFLOWER11", + "S_TUTORIALFLOWER12", + "S_TUTORIALFLOWER13", + "S_TUTORIALFLOWER14", + "S_TUTORIALFLOWER15", + "S_TUTORIALFLOWER16", + "S_TUTORIALFLOWERF1", + "S_TUTORIALFLOWERF2", + "S_TUTORIALFLOWERF3", + "S_TUTORIALFLOWERF4", + "S_TUTORIALFLOWERF5", + "S_TUTORIALFLOWERF6", + "S_TUTORIALFLOWERF7", + "S_TUTORIALFLOWERF8", + "S_TUTORIALFLOWERF9", + "S_TUTORIALFLOWERF10", + "S_TUTORIALFLOWERF11", + "S_TUTORIALFLOWERF12", + "S_TUTORIALFLOWERF13", + "S_TUTORIALFLOWERF14", + "S_TUTORIALFLOWERF15", + "S_TUTORIALFLOWERF16", + // GFZ flowers "S_GFZFLOWERA", "S_GFZFLOWERB", @@ -3290,14 +3348,13 @@ const char *const STATE_LIST[] = { // array length left dynamic for sanity testi "S_NIGHTOPIANHELPER9", // Nightopian - "S_PIAN0", - "S_PIAN1", - "S_PIAN2", - "S_PIAN3", - "S_PIAN4", - "S_PIAN5", - "S_PIAN6", - "S_PIANSING", + "S_PIAN_LOOK1", + "S_PIAN_LOOK2", + "S_PIAN_LOOK3", + "S_PIAN_FLY1", + "S_PIAN_FLY2", + "S_PIAN_FLY3", + "S_PIAN_SING", // Shleep "S_SHLEEP1", @@ -3760,6 +3817,12 @@ const char *const MOBJTYPE_LIST[] = { // array length left dynamic for sanity t // The letter "MT_LETTER", + // Tutorial Scenery + "MT_TUTORIALPLANT", + "MT_TUTORIALLEAF", + "MT_TUTORIALFLOWER", + "MT_TUTORIALFLOWERF", + // Greenflower Scenery "MT_GFZFLOWER1", "MT_GFZFLOWER2", @@ -4109,17 +4172,7 @@ const char *const MOBJTYPE_LIST[] = { // array length left dynamic for sanity t "MT_FINISHFLAG", // Finish flag // Ambient Sounds - "MT_AWATERA", // Ambient Water Sound 1 - "MT_AWATERB", // Ambient Water Sound 2 - "MT_AWATERC", // Ambient Water Sound 3 - "MT_AWATERD", // Ambient Water Sound 4 - "MT_AWATERE", // Ambient Water Sound 5 - "MT_AWATERF", // Ambient Water Sound 6 - "MT_AWATERG", // Ambient Water Sound 7 - "MT_AWATERH", // Ambient Water Sound 8 - "MT_RANDOMAMBIENT", - "MT_RANDOMAMBIENT2", - "MT_MACHINEAMBIENCE", + "MT_AMBIENT", "MT_CORK", "MT_LHRT", @@ -4223,7 +4276,6 @@ const char *const MOBJTYPE_LIST[] = { // array length left dynamic for sanity t "MT_CRUMBLEOBJ", // Sound generator for crumbling platform "MT_TUBEWAYPOINT", "MT_PUSH", - "MT_PULL", "MT_GHOST", "MT_OVERLAY", "MT_ANGLEMAN", @@ -4266,6 +4318,7 @@ const char *const MOBJTYPE_LIST[] = { // array length left dynamic for sanity t "MT_YELLOWBRICKDEBRIS", "MT_NAMECHECK", + "MT_RAY", }; const char *const MOBJFLAG_LIST[] = { @@ -4351,6 +4404,8 @@ const char *const MOBJEFLAG_LIST[] = { "SPRUNG", // Mobj was already sprung this tic "APPLYPMOMZ", // Platform movement "TRACERANGLE", // Compute and trigger on mobj angle relative to tracer + "FORCESUPER", // Forces an object to use super sprites with SPR_PLAY. + "FORCENOSUPER", // Forces an object to NOT use super sprites with SPR_PLAY. NULL }; @@ -4457,23 +4512,85 @@ const char *const GAMETYPERULE_LIST[] = { }; // Linedef flags -const char *const ML_LIST[16] = { +const char *const ML_LIST[] = { "IMPASSIBLE", "BLOCKMONSTERS", "TWOSIDED", "DONTPEGTOP", "DONTPEGBOTTOM", - "EFFECT1", + "SKEWTD", "NOCLIMB", - "EFFECT2", - "EFFECT3", - "EFFECT4", - "EFFECT5", - "NOSONIC", - "NOTAILS", - "NOKNUX", + "NOSKEW", + "MIDPEG", + "MIDSOLID", + "WRAPMIDTEX", + "NETONLY", + "NONET", + "EFFECT6", "BOUNCY", - "TFERLINE" + "TFERLINE", + NULL +}; + +// Sector flags +const char *const MSF_LIST[] = { + "FLIPSPECIAL_FLOOR", + "FLIPSPECIAL_CEILING", + "TRIGGERSPECIAL_TOUCH", + "TRIGGERSPECIAL_HEADBUMP", + "TRIGGERLINE_PLANE", + "TRIGGERLINE_MOBJ", + "GRAVITYFLIP", + "HEATWAVE", + "NOCLIPCAMERA", + NULL +}; + +// Sector special flags +const char *const SSF_LIST[] = { + "OUTERSPACE", + "DOUBLESTEPUP", + "WINDCURRENT", + "CONVEYOR", + "SPEEDPAD", + "STARPOSTACTIVATOR", + "EXIT", + "SPECIALSTAGEPIT", + "RETURNFLAG", + "REDTEAMBASE", + "BLUETEAMBASE", + "FAN", + "SUPERTRANSFORM", + "FORCESPIN", + "ZOOMTUBESTART", + "ZOOMTUBEEND", + "FINISHLINE", + "ROPEHANG", + NULL +}; + +// Sector damagetypes +const char *const SD_LIST[] = { + "NONE", + "GENERIC", + "WATER", + "FIRE", + "LAVA", + "ELECTRIC", + "SPIKE", + "DEATHPITTILT", + "DEATHPITNOTILT", + "INSTAKILL", + "SPECIALSTAGE", + NULL +}; + +// Sector triggerer +const char *const TO_LIST[] = { + "PLAYER", + "ALLPLAYERS", + "MOBJ", + NULL }; const char *COLOR_ENUMS[] = { @@ -4838,9 +4955,18 @@ struct int_const_s const INT_CONST[] = { {"FF_RANDOMANIM",FF_RANDOMANIM}, {"FF_GLOBALANIM",FF_GLOBALANIM}, {"FF_FULLBRIGHT",FF_FULLBRIGHT}, + {"FF_SEMIBRIGHT",FF_SEMIBRIGHT}, + {"FF_FULLDARK",FF_FULLDARK}, {"FF_VERTICALFLIP",FF_VERTICALFLIP}, {"FF_HORIZONTALFLIP",FF_HORIZONTALFLIP}, {"FF_PAPERSPRITE",FF_PAPERSPRITE}, + {"FF_FLOORSPRITE",FF_FLOORSPRITE}, + {"FF_BLENDMASK",FF_BLENDMASK}, + {"FF_BLENDSHIFT",FF_BLENDSHIFT}, + {"FF_ADD",FF_ADD}, + {"FF_SUBTRACT",FF_SUBTRACT}, + {"FF_REVERSESUBTRACT",FF_REVERSESUBTRACT}, + {"FF_MODULATE",FF_MODULATE}, {"FF_TRANSMASK",FF_TRANSMASK}, {"FF_TRANSSHIFT",FF_TRANSSHIFT}, // new preshifted translucency (used in source) @@ -4884,6 +5010,7 @@ struct int_const_s const INT_CONST[] = { {"AST_REVERSESUBTRACT",AST_REVERSESUBTRACT}, {"AST_MODULATE",AST_MODULATE}, {"AST_OVERLAY",AST_OVERLAY}, + {"AST_FOG",AST_FOG}, // Render flags {"RF_HORIZONTALFLIP",RF_HORIZONTALFLIP}, @@ -4895,9 +5022,10 @@ struct int_const_s const INT_CONST[] = { {"RF_OBJECTSLOPESPLAT",RF_OBJECTSLOPESPLAT}, {"RF_NOSPLATBILLBOARD",RF_NOSPLATBILLBOARD}, {"RF_NOSPLATROLLANGLE",RF_NOSPLATROLLANGLE}, - {"RF_BLENDMASK",RF_BLENDMASK}, + {"RF_BRIGHTMASK",RF_BRIGHTMASK}, {"RF_FULLBRIGHT",RF_FULLBRIGHT}, {"RF_FULLDARK",RF_FULLDARK}, + {"RF_SEMIBRIGHT",RF_SEMIBRIGHT}, {"RF_NOCOLORMAPS",RF_NOCOLORMAPS}, {"RF_SPRITETYPEMASK",RF_SPRITETYPEMASK}, {"RF_PAPERSPRITE",RF_PAPERSPRITE}, @@ -4991,6 +5119,7 @@ struct int_const_s const INT_CONST[] = { {"CR_ROLLOUT",CR_ROLLOUT}, {"CR_PTERABYTE",CR_PTERABYTE}, {"CR_DUSTDEVIL",CR_DUSTDEVIL}, + {"CR_FAN",CR_FAN}, // Ring weapons (ringweapons_t) // Useful for A_GiveWeapon @@ -5083,6 +5212,7 @@ struct int_const_s const INT_CONST[] = { {"PAL_MIXUP",PAL_MIXUP}, {"PAL_RECYCLE",PAL_RECYCLE}, {"PAL_NUKE",PAL_NUKE}, + {"PAL_INVERT",PAL_INVERT}, // for P_DamageMobj //// Damage types {"DMG_WATER",DMG_WATER}, @@ -5167,6 +5297,12 @@ struct int_const_s const INT_CONST[] = { {"GF_REDFLAG",GF_REDFLAG}, {"GF_BLUEFLAG",GF_BLUEFLAG}, + // Bot types + {"BOT_NONE",BOT_NONE}, + {"BOT_2PAI",BOT_2PAI}, + {"BOT_2PHUMAN",BOT_2PHUMAN}, + {"BOT_MPAI",BOT_MPAI}, + // Customisable sounds for Skins, from sounds.h {"SKSSPIN",SKSSPIN}, {"SKSPUTPUT",SKSPUTPUT}, @@ -5191,44 +5327,92 @@ struct int_const_s const INT_CONST[] = { {"SKSJUMP",SKSJUMP}, // 3D Floor/Fake Floor/FOF/whatever flags - {"FF_EXISTS",FF_EXISTS}, ///< Always set, to check for validity. - {"FF_BLOCKPLAYER",FF_BLOCKPLAYER}, ///< Solid to player, but nothing else - {"FF_BLOCKOTHERS",FF_BLOCKOTHERS}, ///< Solid to everything but player - {"FF_SOLID",FF_SOLID}, ///< Clips things. - {"FF_RENDERSIDES",FF_RENDERSIDES}, ///< Renders the sides. - {"FF_RENDERPLANES",FF_RENDERPLANES}, ///< Renders the floor/ceiling. - {"FF_RENDERALL",FF_RENDERALL}, ///< Renders everything. - {"FF_SWIMMABLE",FF_SWIMMABLE}, ///< Is a water block. - {"FF_NOSHADE",FF_NOSHADE}, ///< Messes with the lighting? - {"FF_CUTSOLIDS",FF_CUTSOLIDS}, ///< Cuts out hidden solid pixels. - {"FF_CUTEXTRA",FF_CUTEXTRA}, ///< Cuts out hidden translucent pixels. - {"FF_CUTLEVEL",FF_CUTLEVEL}, ///< Cuts out all hidden pixels. - {"FF_CUTSPRITES",FF_CUTSPRITES}, ///< Final step in making 3D water. - {"FF_BOTHPLANES",FF_BOTHPLANES}, ///< Render inside and outside planes. - {"FF_EXTRA",FF_EXTRA}, ///< Gets cut by ::FF_CUTEXTRA. - {"FF_TRANSLUCENT",FF_TRANSLUCENT}, ///< See through! - {"FF_FOG",FF_FOG}, ///< Fog "brush." - {"FF_INVERTPLANES",FF_INVERTPLANES}, ///< Only render inside planes. - {"FF_ALLSIDES",FF_ALLSIDES}, ///< Render inside and outside sides. - {"FF_INVERTSIDES",FF_INVERTSIDES}, ///< Only render inside sides. - {"FF_DOUBLESHADOW",FF_DOUBLESHADOW}, ///< Make two lightlist entries to reset light? - {"FF_FLOATBOB",FF_FLOATBOB}, ///< Floats on water and bobs if you step on it. - {"FF_NORETURN",FF_NORETURN}, ///< Used with ::FF_CRUMBLE. Will not return to its original position after falling. - {"FF_CRUMBLE",FF_CRUMBLE}, ///< Falls 2 seconds after being stepped on, and randomly brings all touching crumbling 3dfloors down with it, providing their master sectors share the same tag (allows crumble platforms above or below, to also exist). - {"FF_SHATTERBOTTOM",FF_SHATTERBOTTOM}, ///< Used with ::FF_BUSTUP. Like FF_SHATTER, but only breaks from the bottom. Good for springing up through rubble. - {"FF_MARIO",FF_MARIO}, ///< Acts like a question block when hit from underneath. Goodie spawned at top is determined by master sector. - {"FF_BUSTUP",FF_BUSTUP}, ///< You can spin through/punch this block and it will crumble! - {"FF_QUICKSAND",FF_QUICKSAND}, ///< Quicksand! - {"FF_PLATFORM",FF_PLATFORM}, ///< You can jump up through this to the top. - {"FF_REVERSEPLATFORM",FF_REVERSEPLATFORM}, ///< A fall-through floor in normal gravity, a platform in reverse gravity. - {"FF_INTANGIBLEFLATS",FF_INTANGIBLEFLATS}, ///< Both flats are intangible, but the sides are still solid. - {"FF_INTANGABLEFLATS",FF_INTANGIBLEFLATS}, ///< Both flats are intangable, but the sides are still solid. - {"FF_SHATTER",FF_SHATTER}, ///< Used with ::FF_BUSTUP. Bustable on mere touch. - {"FF_SPINBUST",FF_SPINBUST}, ///< Used with ::FF_BUSTUP. Also bustable if you're in your spinning frames. - {"FF_STRONGBUST",FF_STRONGBUST}, ///< Used with ::FF_BUSTUP. Only bustable by "strong" characters (Knuckles) and abilities (bouncing, twinspin, melee). - {"FF_RIPPLE",FF_RIPPLE}, ///< Ripple the flats - {"FF_COLORMAPONLY",FF_COLORMAPONLY}, ///< Only copy the colormap, not the lightlevel - {"FF_GOOWATER",FF_GOOWATER}, ///< Used with ::FF_SWIMMABLE. Makes thick bouncey goop. + {"FOF_EXISTS",FOF_EXISTS}, ///< Always set, to check for validity. + {"FOF_BLOCKPLAYER",FOF_BLOCKPLAYER}, ///< Solid to player, but nothing else + {"FOF_BLOCKOTHERS",FOF_BLOCKOTHERS}, ///< Solid to everything but player + {"FOF_SOLID",FOF_SOLID}, ///< Clips things. + {"FOF_RENDERSIDES",FOF_RENDERSIDES}, ///< Renders the sides. + {"FOF_RENDERPLANES",FOF_RENDERPLANES}, ///< Renders the floor/ceiling. + {"FOF_RENDERALL",FOF_RENDERALL}, ///< Renders everything. + {"FOF_SWIMMABLE",FOF_SWIMMABLE}, ///< Is a water block. + {"FOF_NOSHADE",FOF_NOSHADE}, ///< Messes with the lighting? + {"FOF_CUTSOLIDS",FOF_CUTSOLIDS}, ///< Cuts out hidden solid pixels. + {"FOF_CUTEXTRA",FOF_CUTEXTRA}, ///< Cuts out hidden translucent pixels. + {"FOF_CUTLEVEL",FOF_CUTLEVEL}, ///< Cuts out all hidden pixels. + {"FOF_CUTSPRITES",FOF_CUTSPRITES}, ///< Final step in making 3D water. + {"FOF_BOTHPLANES",FOF_BOTHPLANES}, ///< Render inside and outside planes. + {"FOF_EXTRA",FOF_EXTRA}, ///< Gets cut by ::FOF_CUTEXTRA. + {"FOF_TRANSLUCENT",FOF_TRANSLUCENT}, ///< See through! + {"FOF_FOG",FOF_FOG}, ///< Fog "brush." + {"FOF_INVERTPLANES",FOF_INVERTPLANES}, ///< Only render inside planes. + {"FOF_ALLSIDES",FOF_ALLSIDES}, ///< Render inside and outside sides. + {"FOF_INVERTSIDES",FOF_INVERTSIDES}, ///< Only render inside sides. + {"FOF_DOUBLESHADOW",FOF_DOUBLESHADOW}, ///< Make two lightlist entries to reset light? + {"FOF_FLOATBOB",FOF_FLOATBOB}, ///< Floats on water and bobs if you step on it. + {"FOF_NORETURN",FOF_NORETURN}, ///< Used with ::FOF_CRUMBLE. Will not return to its original position after falling. + {"FOF_CRUMBLE",FOF_CRUMBLE}, ///< Falls 2 seconds after being stepped on, and randomly brings all touching crumbling 3dfloors down with it, providing their master sectors share the same tag (allows crumble platforms above or below, to also exist). + {"FOF_GOOWATER",FOF_GOOWATER}, ///< Used with ::FOF_SWIMMABLE. Makes thick bouncey goop. + {"FOF_MARIO",FOF_MARIO}, ///< Acts like a question block when hit from underneath. Goodie spawned at top is determined by master sector. + {"FOF_BUSTUP",FOF_BUSTUP}, ///< You can spin through/punch this block and it will crumble! + {"FOF_QUICKSAND",FOF_QUICKSAND}, ///< Quicksand! + {"FOF_PLATFORM",FOF_PLATFORM}, ///< You can jump up through this to the top. + {"FOF_REVERSEPLATFORM",FOF_REVERSEPLATFORM}, ///< A fall-through floor in normal gravity, a platform in reverse gravity. + {"FOF_INTANGIBLEFLATS",FOF_INTANGIBLEFLATS}, ///< Both flats are intangible, but the sides are still solid. + {"FOF_RIPPLE",FOF_RIPPLE}, ///< Ripple the flats + {"FOF_COLORMAPONLY",FOF_COLORMAPONLY}, ///< Only copy the colormap, not the lightlevel + {"FOF_BOUNCY",FOF_BOUNCY}, ///< Bounces players + {"FOF_SPLAT",FOF_SPLAT}, ///< Use splat flat renderer (treat cyan pixels as invisible) + + // Old FOF flags for backwards compatibility + {"FF_EXISTS",FF_OLD_EXISTS}, + {"FF_BLOCKPLAYER",FF_OLD_BLOCKPLAYER}, + {"FF_BLOCKOTHERS",FF_OLD_BLOCKOTHERS}, + {"FF_SOLID",FF_OLD_SOLID}, + {"FF_RENDERSIDES",FF_OLD_RENDERSIDES}, + {"FF_RENDERPLANES",FF_OLD_RENDERPLANES}, + {"FF_RENDERALL",FF_OLD_RENDERALL}, + {"FF_SWIMMABLE",FF_OLD_SWIMMABLE}, + {"FF_NOSHADE",FF_OLD_NOSHADE}, + {"FF_CUTSOLIDS",FF_OLD_CUTSOLIDS}, + {"FF_CUTEXTRA",FF_OLD_CUTEXTRA}, + {"FF_CUTLEVEL",FF_OLD_CUTLEVEL}, + {"FF_CUTSPRITES",FF_OLD_CUTSPRITES}, + {"FF_BOTHPLANES",FF_OLD_BOTHPLANES}, + {"FF_EXTRA",FF_OLD_EXTRA}, + {"FF_TRANSLUCENT",FF_OLD_TRANSLUCENT}, + {"FF_FOG",FF_OLD_FOG}, + {"FF_INVERTPLANES",FF_OLD_INVERTPLANES}, + {"FF_ALLSIDES",FF_OLD_ALLSIDES}, + {"FF_INVERTSIDES",FF_OLD_INVERTSIDES}, + {"FF_DOUBLESHADOW",FF_OLD_DOUBLESHADOW}, + {"FF_FLOATBOB",FF_OLD_FLOATBOB}, + {"FF_NORETURN",FF_OLD_NORETURN}, + {"FF_CRUMBLE",FF_OLD_CRUMBLE}, + {"FF_SHATTERBOTTOM",FF_OLD_SHATTERBOTTOM}, + {"FF_GOOWATER",FF_OLD_GOOWATER}, + {"FF_MARIO",FF_OLD_MARIO}, + {"FF_BUSTUP",FF_OLD_BUSTUP}, + {"FF_QUICKSAND",FF_OLD_QUICKSAND}, + {"FF_PLATFORM",FF_OLD_PLATFORM}, + {"FF_REVERSEPLATFORM",FF_OLD_REVERSEPLATFORM}, + {"FF_INTANGIBLEFLATS",FF_OLD_INTANGIBLEFLATS}, + {"FF_INTANGABLEFLATS",FF_OLD_INTANGIBLEFLATS}, + {"FF_SHATTER",FF_OLD_SHATTER}, + {"FF_SPINBUST",FF_OLD_SPINBUST}, + {"FF_STRONGBUST",FF_OLD_STRONGBUST}, + {"FF_RIPPLE",FF_OLD_RIPPLE}, + {"FF_COLORMAPONLY",FF_OLD_COLORMAPONLY}, + + // FOF bustable flags + {"FB_PUSHABLES",FB_PUSHABLES}, + {"FB_EXECUTOR",FB_EXECUTOR}, + {"FB_ONLYBOTTOM",FB_ONLYBOTTOM}, + + // Bustable FOF type + {"BT_TOUCH",BT_TOUCH}, + {"BT_SPINBUST",BT_SPINBUST}, + {"BT_REGULAR",BT_REGULAR}, + {"BT_STRONG",BT_STRONG}, // PolyObject flags {"POF_CLIPLINES",POF_CLIPLINES}, ///< Test against lines for collision @@ -5341,7 +5525,7 @@ struct int_const_s const INT_CONST[] = { {"CV_HIDEN",CV_HIDEN}, {"CV_HIDDEN",CV_HIDEN}, {"CV_CHEAT",CV_CHEAT}, - {"CV_NOLUA",CV_NOLUA}, + {"CV_ALLOWLUA",CV_ALLOWLUA}, // v_video flags {"V_NOSCALEPATCH",V_NOSCALEPATCH}, @@ -5380,9 +5564,12 @@ struct int_const_s const INT_CONST[] = { {"V_HUDTRANSHALF",V_HUDTRANSHALF}, {"V_HUDTRANS",V_HUDTRANS}, {"V_HUDTRANSDOUBLE",V_HUDTRANSDOUBLE}, - {"V_AUTOFADEOUT",V_AUTOFADEOUT}, - {"V_RETURN8",V_RETURN8}, - {"V_OFFSET",V_OFFSET}, + {"V_BLENDSHIFT",V_BLENDSHIFT}, + {"V_BLENDMASK",V_BLENDMASK}, + {"V_ADD",V_ADD}, + {"V_SUBTRACT",V_SUBTRACT}, + {"V_REVERSESUBTRACT",V_REVERSESUBTRACT}, + {"V_MODULATE",V_MODULATE}, {"V_ALLOWLOWERCASE",V_ALLOWLOWERCASE}, {"V_FLIP",V_FLIP}, {"V_CENTERNAMETAG",V_CENTERNAMETAG}, @@ -5390,8 +5577,8 @@ struct int_const_s const INT_CONST[] = { {"V_SNAPTOBOTTOM",V_SNAPTOBOTTOM}, {"V_SNAPTOLEFT",V_SNAPTOLEFT}, {"V_SNAPTORIGHT",V_SNAPTORIGHT}, - {"V_WRAPX",V_WRAPX}, - {"V_WRAPY",V_WRAPY}, + {"V_AUTOFADEOUT",V_AUTOFADEOUT}, + {"V_RETURN8",V_RETURN8}, {"V_NOSCALESTART",V_NOSCALESTART}, {"V_PERPLAYER",V_PERPLAYER}, @@ -5455,6 +5642,78 @@ struct int_const_s const INT_CONST[] = { {"GS_DEDICATEDSERVER",GS_DEDICATEDSERVER}, {"GS_WAITINGPLAYERS",GS_WAITINGPLAYERS}, + // Joystick axes + {"JA_NONE",JA_NONE}, + {"JA_TURN",JA_TURN}, + {"JA_MOVE",JA_MOVE}, + {"JA_LOOK",JA_LOOK}, + {"JA_STRAFE",JA_STRAFE}, + {"JA_DIGITAL",JA_DIGITAL}, + {"JA_JUMP",JA_JUMP}, + {"JA_SPIN",JA_SPIN}, + {"JA_FIRE",JA_FIRE}, + {"JA_FIRENORMAL",JA_FIRENORMAL}, + {"JOYAXISRANGE",JOYAXISRANGE}, + + // Game controls + {"GC_NULL",GC_NULL}, + {"GC_FORWARD",GC_FORWARD}, + {"GC_BACKWARD",GC_BACKWARD}, + {"GC_STRAFELEFT",GC_STRAFELEFT}, + {"GC_STRAFERIGHT",GC_STRAFERIGHT}, + {"GC_TURNLEFT",GC_TURNLEFT}, + {"GC_TURNRIGHT",GC_TURNRIGHT}, + {"GC_WEAPONNEXT",GC_WEAPONNEXT}, + {"GC_WEAPONPREV",GC_WEAPONPREV}, + {"GC_WEPSLOT1",GC_WEPSLOT1}, + {"GC_WEPSLOT2",GC_WEPSLOT2}, + {"GC_WEPSLOT3",GC_WEPSLOT3}, + {"GC_WEPSLOT4",GC_WEPSLOT4}, + {"GC_WEPSLOT5",GC_WEPSLOT5}, + {"GC_WEPSLOT6",GC_WEPSLOT6}, + {"GC_WEPSLOT7",GC_WEPSLOT7}, + {"GC_WEPSLOT8",GC_WEPSLOT8}, + {"GC_WEPSLOT9",GC_WEPSLOT9}, + {"GC_WEPSLOT10",GC_WEPSLOT10}, + {"GC_FIRE",GC_FIRE}, + {"GC_FIRENORMAL",GC_FIRENORMAL}, + {"GC_TOSSFLAG",GC_TOSSFLAG}, + {"GC_SPIN",GC_SPIN}, + {"GC_CAMTOGGLE",GC_CAMTOGGLE}, + {"GC_CAMRESET",GC_CAMRESET}, + {"GC_LOOKUP",GC_LOOKUP}, + {"GC_LOOKDOWN",GC_LOOKDOWN}, + {"GC_CENTERVIEW",GC_CENTERVIEW}, + {"GC_MOUSEAIMING",GC_MOUSEAIMING}, + {"GC_TALKKEY",GC_TALKKEY}, + {"GC_TEAMKEY",GC_TEAMKEY}, + {"GC_SCORES",GC_SCORES}, + {"GC_JUMP",GC_JUMP}, + {"GC_CONSOLE",GC_CONSOLE}, + {"GC_PAUSE",GC_PAUSE}, + {"GC_SYSTEMMENU",GC_SYSTEMMENU}, + {"GC_SCREENSHOT",GC_SCREENSHOT}, + {"GC_RECORDGIF",GC_RECORDGIF}, + {"GC_VIEWPOINTNEXT",GC_VIEWPOINTNEXT}, + {"GC_VIEWPOINT",GC_VIEWPOINTNEXT}, // Alias for retrocompatibility. Remove for the next major version + {"GC_VIEWPOINTPREV",GC_VIEWPOINTPREV}, + {"GC_CUSTOM1",GC_CUSTOM1}, + {"GC_CUSTOM2",GC_CUSTOM2}, + {"GC_CUSTOM3",GC_CUSTOM3}, + {"NUM_GAMECONTROLS",NUM_GAMECONTROLS}, + + // Mouse buttons + {"MB_BUTTON1",MB_BUTTON1}, + {"MB_BUTTON2",MB_BUTTON2}, + {"MB_BUTTON3",MB_BUTTON3}, + {"MB_BUTTON4",MB_BUTTON4}, + {"MB_BUTTON5",MB_BUTTON5}, + {"MB_BUTTON6",MB_BUTTON6}, + {"MB_BUTTON7",MB_BUTTON7}, + {"MB_BUTTON8",MB_BUTTON8}, + {"MB_SCROLLUP",MB_SCROLLUP}, + {"MB_SCROLLDOWN",MB_SCROLLDOWN}, + {NULL,0} }; diff --git a/src/deh_tables.h b/src/deh_tables.h index 1f265cc99..8943ab71a 100644 --- a/src/deh_tables.h +++ b/src/deh_tables.h @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -64,7 +64,11 @@ extern const char *const MOBJEFLAG_LIST[]; extern const char *const MAPTHINGFLAG_LIST[4]; extern const char *const PLAYERFLAG_LIST[]; extern const char *const GAMETYPERULE_LIST[]; -extern const char *const ML_LIST[16]; // Linedef flags +extern const char *const ML_LIST[]; // Linedef flags +extern const char *const MSF_LIST[]; // Sector flags +extern const char *const SSF_LIST[]; // Sector special flags +extern const char *const SD_LIST[]; // Sector damagetype +extern const char *const TO_LIST[]; // Sector triggerer extern const char *COLOR_ENUMS[]; extern const char *const POWERS_LIST[]; extern const char *const HUDITEMS_LIST[]; diff --git a/src/dehacked.c b/src/dehacked.c index da8c81c35..fd2a70171 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -575,7 +575,7 @@ static void DEH_LoadDehackedFile(MYFILE *f, boolean mainfile) } // end while if (gamedataadded) - G_LoadGameData(); + G_LoadGameData(clientGamedata); if (gamestate == GS_TITLESCREEN) { diff --git a/src/dehacked.h b/src/dehacked.h index 1b200e246..902404df7 100644 --- a/src/dehacked.h +++ b/src/dehacked.h @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/doomdata.h b/src/doomdata.h index e317fec1b..4c5bdefaf 100644 --- a/src/doomdata.h +++ b/src/doomdata.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -123,15 +123,15 @@ typedef struct // lower texture unpegged #define ML_DONTPEGBOTTOM 16 -#define ML_EFFECT1 32 +#define ML_SKEWTD 32 // Don't let Knuckles climb on this line #define ML_NOCLIMB 64 -#define ML_EFFECT2 128 -#define ML_EFFECT3 256 -#define ML_EFFECT4 512 -#define ML_EFFECT5 1024 +#define ML_NOSKEW 128 +#define ML_MIDPEG 256 +#define ML_MIDSOLID 512 +#define ML_WRAPMIDTEX 1024 #define ML_NETONLY 2048 // Apply effect only in netgames #define ML_NONET 4096 // Apply effect only in single player games @@ -196,7 +196,7 @@ typedef struct #pragma pack() #endif -#define NUMMAPTHINGARGS 6 +#define NUMMAPTHINGARGS 10 #define NUMMAPTHINGSTRINGARGS 2 // Thing definition, position, orientation and type, diff --git a/src/doomdef.h b/src/doomdef.h index 11ca80538..d521d4fbb 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -104,6 +104,8 @@ #include #endif +FILE *fopenfile(const char*, const char*); + //#define NOMD5 // Uncheck this to compile debugging code @@ -127,6 +129,7 @@ extern char logfilename[1024]; //#define DEVELOP // Disable this for release builds to remove excessive cheat commands and enable MD5 checking and stuff, all in one go. :3 #ifdef DEVELOP #define VERSIONSTRING "Development EXE" +#define VERSIONSTRING_RC "Development EXE" "\0" // most interface strings are ignored in development mode. // we use comprevision and compbranch instead. // VERSIONSTRING_RC is for the resource-definition script used by windows builds @@ -151,6 +154,9 @@ extern char logfilename[1024]; // Comment or uncomment this as necessary. #define USE_PATCH_DTA +// Enforce a limit of loaded WAD files. +//#define ENFORCE_WAD_LIMIT + // Use .kart extension addons //#define USE_KART @@ -397,7 +403,7 @@ extern skincolor_t skincolors[MAXSKINCOLORS]; #define PUSHACCEL (2*FRACUNIT) // Acceleration for MF2_SLIDEPUSH items. -// Special linedef executor tag numbers! +// Special linedef executor tag numbers! Binary map format only (UDMF has other ways of doing these things). enum { LE_PINCHPHASE = -2, // A boss entered pinch phase (and, in most cases, is preparing their pinch phase attack!) LE_ALLBOSSESDEAD = -3, // All bosses in the map are dead (Egg capsule raise) @@ -479,8 +485,11 @@ extern void *(*M_Memcpy)(void* dest, const void* src, size_t n) FUNCNONNULL; char *va(const char *format, ...) FUNCPRINTF; char *M_GetToken(const char *inputString); void M_UnGetToken(void); -UINT32 M_GetTokenPos(void); -void M_SetTokenPos(UINT32 newPos); +void M_TokenizerOpen(const char *inputString); +void M_TokenizerClose(void); +const char *M_TokenizerRead(UINT32 i); +UINT32 M_TokenizerGetEndPos(void); +void M_TokenizerSetEndPos(UINT32 newPos); char *sizeu1(size_t num); char *sizeu2(size_t num); char *sizeu3(size_t num); @@ -526,6 +535,22 @@ extern boolean capslock; // i_system.c, replace getchar() once the keyboard has been appropriated 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 min // Double-Check with WATTCP-32's cdefs.h #define min(x, y) (((x) < (y)) ? (x) : (y)) #endif diff --git a/src/doomstat.h b/src/doomstat.h index 32669b68b..a812cc304 100644 --- a/src/doomstat.h +++ b/src/doomstat.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -75,6 +75,7 @@ extern SINT8 startinglivesbalance[maxgameovers+1]; extern boolean modifiedgame; extern UINT16 mainwads; extern boolean savemoddata; // This mod saves time/emblem data. +extern boolean usedCheats; extern boolean disableSpeedAdjust; // Don't alter the duration of player states if true extern boolean imcontinuing; // Temporary flag while continuing extern boolean metalrecording; @@ -131,8 +132,6 @@ extern INT32 postimgparam2; extern INT32 viewwindowx, viewwindowy; extern INT32 viewwidth, scaledviewwidth; -extern boolean gamedataloaded; - // Player taking events, and displaying. extern INT32 consoleplayer; extern INT32 displayplayer; @@ -494,8 +493,6 @@ typedef struct extern tolinfo_t TYPEOFLEVEL[NUMTOLNAMES]; extern UINT32 lastcustomtol; -extern tic_t totalplaytime; - extern boolean stagefailed; // Emeralds stored as bits to throw savegame hackers off. @@ -514,52 +511,6 @@ extern INT32 luabanks[NUM_LUABANKS]; extern INT32 nummaprings; //keep track of spawned rings/coins -/** Time attack information, currently a very small structure. - */ -typedef struct -{ - tic_t time; ///< Time in which the level was finished. - UINT32 score; ///< Score when the level was finished. - UINT16 rings; ///< Rings when the level was finished. -} recorddata_t; - -/** Setup for one NiGHTS map. - * These are dynamically allocated because I am insane - */ -#define GRADE_F 0 -#define GRADE_E 1 -#define GRADE_D 2 -#define GRADE_C 3 -#define GRADE_B 4 -#define GRADE_A 5 -#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]; - -// mapvisited is now a set of flags that says what we've done in the map. -#define MV_VISITED 1 -#define MV_BEATEN 2 -#define MV_ALLEMERALDS 4 -#define MV_ULTIMATE 8 -#define MV_PERFECT 16 -#define MV_PERFECTRA 32 -#define MV_MAX 63 // used in gamedata check, update whenever MV's are added -#define MV_MP 128 -extern UINT8 mapvisited[NUMMAPS]; - -// Temporary holding place for nights data for the current map -extern nightsdata_t ntemprecords; - extern UINT32 token; ///< Number of tokens collected in a level extern UINT32 tokenlist; ///< List of tokens collected extern boolean gottoken; ///< Did you get a token? Used for end of act @@ -592,9 +543,12 @@ extern UINT8 useBlackRock; extern UINT8 use1upSound; extern UINT8 maxXtraLife; // Max extra lives from rings + extern UINT8 useContinues; #define continuesInSession (!multiplayer && (ultimatemode || (useContinues && !marathonmode) || (!modeattacking && !(cursaveslot > 0)))) +extern UINT8 shareEmblems; + extern mobj_t *hunt1, *hunt2, *hunt3; // Emerald hunt locations // For racing @@ -615,10 +569,6 @@ extern INT32 cheats; extern tic_t hidetime; -extern UINT32 timesBeaten; // # of times the game has been beaten. -extern UINT32 timesBeatenWithEmeralds; -extern UINT32 timesBeatenUltimate; - // =========================== // Internal parameters, fixed. // =========================== diff --git a/src/doomtype.h b/src/doomtype.h index 900a5eca6..f6c236e20 100644 --- a/src/doomtype.h +++ b/src/doomtype.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -31,18 +31,8 @@ #include #endif -#define UINT8 unsigned __int8 #define SINT8 signed __int8 -#define UINT16 unsigned __int16 -#define INT16 __int16 - -#define INT32 __int32 -#define UINT32 unsigned __int32 - -#define INT64 __int64 -#define UINT64 unsigned __int64 - typedef long ssize_t; /* Older Visual C++ headers don't have the Win64-compatible typedefs... */ @@ -107,6 +97,9 @@ typedef long ssize_t; char *strcasestr(const char *in, const char *what); #define stristr strcasestr +int startswith (const char *base, const char *tag); +int endswith (const char *base, const char *tag); + #if defined (macintosh) //|| defined (__APPLE__) //skip all boolean/Boolean crap #define true 1 #define false 0 @@ -356,6 +349,8 @@ typedef UINT32 tic_t; #define UINT2RGBA(a) (UINT32)((a&0xff)<<24)|((a&0xff00)<<8)|((a&0xff0000)>>8)|(((UINT32)a&0xff000000)>>24) #endif +#define TOSTR(x) #x + /* preprocessor dumb and needs second macro to expand input */ #define WSTRING2(s) L ## s #define WSTRING(s) WSTRING2 (s) @@ -390,8 +385,6 @@ unset_bit_array (bitarray_t * const array, const int value) array[value >> 3] &= ~(1<<(value & 7)); } -#ifdef HAVE_SDL typedef UINT64 precise_t; -#endif #endif //__DOOMTYPE__ diff --git a/src/dummy/Sourcefile b/src/dummy/Sourcefile new file mode 100644 index 000000000..2f5dd1a59 --- /dev/null +++ b/src/dummy/Sourcefile @@ -0,0 +1,5 @@ +i_net.c +i_system.c +i_main.c +i_video.c +i_sound.c diff --git a/src/dummy/i_sound.c b/src/dummy/i_sound.c index f09158e01..ba0fc6423 100644 --- a/src/dummy/i_sound.c +++ b/src/dummy/i_sound.c @@ -139,29 +139,24 @@ boolean I_LoadSong(char *data, size_t len) void I_UnloadSong(void) { - (void)handle; } boolean I_PlaySong(boolean looping) { - (void)handle; (void)looping; return false; } void I_StopSong(void) { - (void)handle; } void I_PauseSong(void) { - (void)handle; } void I_ResumeSong(void) { - (void)handle; } void I_SetMusicVolume(UINT8 volume) @@ -188,18 +183,20 @@ void I_StopFadingSong(void) { } -boolean I_FadeSongFromVolume(UINT8 target_volume, UINT8 source_volume, UINT32 ms, void (*callback)(void)); +boolean I_FadeSongFromVolume(UINT8 target_volume, UINT8 source_volume, UINT32 ms, void (*callback)(void)) { (void)target_volume; (void)source_volume; (void)ms; + (void)callback; return false; } -boolean I_FadeSong(UINT8 target_volume, UINT32 ms, void (*callback)(void)); +boolean I_FadeSong(UINT8 target_volume, UINT32 ms, void (*callback)(void)) { (void)target_volume; (void)ms; + (void)callback; return false; } diff --git a/src/dummy/i_system.c b/src/dummy/i_system.c index 4a657ed19..8556c0248 100644 --- a/src/dummy/i_system.c +++ b/src/dummy/i_system.c @@ -1,28 +1,29 @@ #include "../doomdef.h" +#include "../doomtype.h" #include "../i_system.h" +FILE *logstream = NULL; + UINT8 graphics_started = 0; UINT8 keyboard_started = 0; -UINT32 I_GetFreeMem(UINT32 *total) +size_t I_GetFreeMem(size_t *total) { *total = 0; return 0; } -tic_t I_GetTime(void) -{ +void I_Sleep(UINT32 ms){} + +precise_t I_GetPreciseTime(void) { return 0; } -int I_GetTimeMicros(void) -{ - return 0; +UINT64 I_GetPrecisePrecision(void) { + return 1000000; } -void I_Sleep(void){} - void I_GetEvent(void){} void I_OsPolling(void){} @@ -96,8 +97,6 @@ void I_StartupMouse(void){} void I_StartupMouse2(void){} -void I_StartupKeyboard(void){} - INT32 I_GetKey(void) { return 0; @@ -176,12 +175,18 @@ INT32 I_ClipboardCopy(const char *data, size_t size) return -1; } -char *I_ClipboardPaste(void) +const char *I_ClipboardPaste(void) { return NULL; } void I_RegisterSysCommands(void) {} +void I_GetCursorPosition(INT32 *x, INT32 *y) +{ + (void)x; + (void)y; +} + #include "../sdl/dosstr.c" diff --git a/src/endian.h b/src/endian.h index e78204e72..87f752471 100644 --- a/src/endian.h +++ b/src/endian.h @@ -1,6 +1,6 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- -// Copyright (C) 2014-2021 by Sonic Team Junior. +// Copyright (C) 2014-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/f_finale.c b/src/f_finale.c index bfba7cf96..f529b4564 100644 --- a/src/f_finale.c +++ b/src/f_finale.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -20,6 +20,7 @@ #include "hu_stuff.h" #include "r_local.h" #include "s_sound.h" +#include "i_time.h" #include "i_video.h" #include "v_video.h" #include "w_wad.h" @@ -41,6 +42,7 @@ #include "console.h" #include "lua_hud.h" +#include "lua_hook.h" // Stage of animation: // 0 = text, 1 = art screen @@ -61,9 +63,6 @@ static tic_t stoptimer; static boolean keypressed = false; // (no longer) De-Demo'd Title Screen -static tic_t xscrolltimer; -static tic_t yscrolltimer; -static INT32 menuanimtimer; // Title screen: background animation timing mobj_t *titlemapcameraref = NULL; // menu presentation state @@ -75,6 +74,8 @@ INT32 curbgyspeed; boolean curbghide; boolean hidetitlemap; // WARNING: set to false by M_SetupNextMenu and M_ClearMenus +static fixed_t curbgx = 0; +static fixed_t curbgy = 0; static UINT8 curDemo = 0; static UINT32 demoDelayLeft; static UINT32 demoIdleLeft; @@ -228,6 +229,8 @@ static tic_t cutscene_lasttextwrite = 0; // STJR Intro char stjrintro[9] = "STJRI000"; +static huddrawlist_h luahuddrawlist_title; + // // This alters the text string cutscene_disptext. // Use the typical string drawing functions to display it. @@ -335,7 +338,7 @@ static tic_t introscenetime[NUMINTROSCENES] = }; // custom intros -void F_StartCustomCutscene(INT32 cutscenenum, boolean precutscene, boolean resetplayer); +void F_StartCustomCutscene(INT32 cutscenenum, boolean precutscene, boolean resetplayer, boolean FLS); void F_StartIntro(void) { @@ -347,7 +350,7 @@ void F_StartIntro(void) if (!cutscenes[introtoplay - 1]) D_StartTitle(); else - F_StartCustomCutscene(introtoplay - 1, false, false); + F_StartCustomCutscene(introtoplay - 1, false, false, false); return; } @@ -516,9 +519,9 @@ void F_StartIntro(void) } // -// F_IntroDrawScene +// F_IntroDrawer // -static void F_IntroDrawScene(void) +void F_IntroDrawer(void) { boolean highres = true; INT32 cx = 8, cy = 128; @@ -624,24 +627,22 @@ static void F_IntroDrawScene(void) if (intro_curtime > 1 && intro_curtime < (INT32)introscenetime[intro_scenenum]) { V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); + if (intro_curtime < TICRATE-5) // Make the text shine! + { sprintf(stjrintro, "STJRI%03u", intro_curtime-1); + } else if (intro_curtime >= TICRATE-6 && intro_curtime < 2*TICRATE-20) // Pause on black screen for just a second + { return; + } else if (intro_curtime == 2*TICRATE-19) { // Fade in the text // The text fade out is automatically handled when switching to a new intro scene strncpy(stjrintro, "STJRI029", 9); - S_ChangeMusicInternal("_stjr", false); - background = W_CachePatchName(stjrintro, PU_PATCH_LOWPRIORITY); - wipestyleflags = WSF_FADEIN; - F_WipeStartScreen(); - F_TryColormapFade(31); V_DrawSmallScaledPatch(bgxoffs, 84, 0, background); - F_WipeEndScreen(); - F_RunWipe(0,true); } if (!WipeInAction) // Draw the patch if not in a wipe @@ -840,17 +841,27 @@ static void F_IntroDrawScene(void) V_DrawRightAlignedString(BASEVIDWIDTH-4, BASEVIDHEIGHT-12, V_ALLOWLOWERCASE|(trans< nowtime) { while (!((nowtime = I_GetTime()) - lasttime)) - I_Sleep(); + { + I_Sleep(cv_sleep.value); + I_UpdateTime(cv_timescale.value); + } lasttime = nowtime; I_OsPolling(); @@ -919,12 +942,12 @@ void F_IntroDrawer(void) wipegamestate = GS_INTRO; return; } + F_NewCutscene(introtext[++intro_scenenum]); timetonext = introscenetime[intro_scenenum]; F_WipeStartScreen(); wipegamestate = -1; - wipestyleflags = WSF_CROSSFADE; animtimer = stoptimer = 0; } @@ -932,78 +955,36 @@ void F_IntroDrawer(void) if (rendermode != render_none) { - if (intro_scenenum == 5 && intro_curtime == 5*TICRATE) + if (intro_scenenum == 0 && intro_curtime == 2*TICRATE-19) { - patch_t *radar = W_CachePatchName("RADAR", PU_PATCH_LOWPRIORITY); + S_ChangeMusicInternal("_stjr", false); + wipestyleflags = WSF_FADEIN; F_WipeStartScreen(); - F_WipeColorFill(31); - V_DrawSmallScaledPatch(0, 0, 0, radar); - W_UnlockCachedPatch(radar); - V_DrawString(8, 128, V_ALLOWLOWERCASE, cutscene_disptext); + F_TryColormapFade(31); + + F_IntroDrawer(); F_WipeEndScreen(); F_RunWipe(99,true); } - else if (intro_scenenum == 7 && intro_curtime == 6*TICRATE) // Force a wipe here + else if ((intro_scenenum == 5 && intro_curtime == 5*TICRATE) + || (intro_scenenum == 7 && intro_curtime == 6*TICRATE) + //|| (intro_scenenum == 11 && intro_curtime == 7*TICRATE) + || (intro_scenenum == 15 && intro_curtime == 7*TICRATE)) { - patch_t *grass = W_CachePatchName("SGRASS2", PU_PATCH_LOWPRIORITY); - F_WipeStartScreen(); F_WipeColorFill(31); - V_DrawSmallScaledPatch(0, 0, 0, grass); - W_UnlockCachedPatch(grass); - V_DrawString(8, 128, V_ALLOWLOWERCASE, cutscene_disptext); - F_WipeEndScreen(); - F_RunWipe(99,true); - } - /*else if (intro_scenenum == 11 && intro_curtime == 7*TICRATE) - { - patch_t *confront = W_CachePatchName("CONFRONT", PU_PATCH_LOWPRIORITY); - - F_WipeStartScreen(); - F_WipeColorFill(31); - V_DrawSmallScaledPatch(0, 0, 0, confront); - W_UnlockCachedPatch(confront); - V_DrawString(8, 128, V_ALLOWLOWERCASE, cutscene_disptext); - - F_WipeEndScreen(); - F_RunWipe(99,true); - }*/ - if (intro_scenenum == 15 && intro_curtime == 7*TICRATE) - { - patch_t *sdo = W_CachePatchName("SONICDO2", PU_PATCH_LOWPRIORITY); - - F_WipeStartScreen(); - F_WipeColorFill(31); - V_DrawSmallScaledPatch(0, 0, 0, sdo); - W_UnlockCachedPatch(sdo); - V_DrawString(224, 8, V_ALLOWLOWERCASE, cutscene_disptext); + F_IntroDrawer(); F_WipeEndScreen(); F_RunWipe(99,true); } } - F_IntroDrawScene(); -} - -// -// F_IntroTicker -// -void F_IntroTicker(void) -{ - // advance animation - finalecount++; - - timetonext--; - - F_WriteText(); - - // check for skipping - if (keypressed) - keypressed = false; + if (animtimer) + animtimer--; } // @@ -1011,7 +992,7 @@ void F_IntroTicker(void) // boolean F_IntroResponder(event_t *event) { - INT32 key = event->data1; + INT32 key = event->key; // remap virtual keys (mouse & joystick buttons) switch (key) @@ -1063,7 +1044,7 @@ boolean F_IntroResponder(event_t *event) // CREDITS // ========= static const char *credits[] = { - "\1Sonic Robo Blast II", + "\1Sonic Robo Blast 2", "\1Credits", "", "\1Game Design", @@ -1072,6 +1053,7 @@ static const char *credits[] = { "Johnny \"Sonikku\" Wallbank", "", "\1Programming", + "\"altaluna\"", "Alam \"GBC\" Arias", "Logan \"GBA\" Arias", "Zolton \"Zippy_Zolton\" Auburn", @@ -1089,19 +1071,19 @@ static const char *credits[] = { "\"Hannu_Hanhi\"", // For many OpenGL performance improvements! "Kepa \"Nev3r\" Iceta", "Thomas \"Shadow Hog\" Igoe", - "\"james\"", "Iestyn \"Monster Iestyn\" Jealous", - "\"Jimita\"", "\"Kaito Sinclaire\"", "\"Kalaron\"", // Coded some of Sryder13's collection of OpenGL fixes, especially fog "Ronald \"Furyhunter\" Kinard", // The SDL2 port "\"Lat'\"", // SRB2-CHAT, the chat window from Kart + "\"LZA\"", "Matthew \"Shuffle\" Marsalko", "Steven \"StroggOnMeth\" McGranahan", "\"Morph\"", // For SRB2Morphed stuff "Louis-Antoine \"LJ Sonic\" de Moulins", // de Rochefort doesn't quite fit on the screen sorry lol "John \"JTE\" Muniz", "Colin \"Sonict\" Pfaff", + "James \"james\" Robert Roman", "Sean \"Sryder13\" Ryder", "Ehab \"Wolfy\" Saeed", "Tasos \"tatokis\" Sahanidis", // Corrected C FixedMul, making 64-bit builds netplay compatible @@ -1109,7 +1091,6 @@ static const char *credits[] = { "Jonas \"MascaraSnake\" Sauer", "Wessel \"sphere\" Smit", "\"SSNTails\"", - "\"Varren\"", "\"VelocitOni\"", // Wrote the original dashmode script "Ikaro \"Tatsuru\" Vinhas", "Ben \"Cue\" Woodford", @@ -1158,7 +1139,7 @@ static const char *credits[] = { "Dave \"DemonTomatoDave\" Bulmer", "Paul \"Boinciel\" Clempson", "\"Cyan Helkaraxe\"", - "Shane \"CobaltBW\" Ellis", + "Claire \"clairebun\" Ellis", "James \"SeventhSentinel\" Hall", "Kepa \"Nev3r\" Iceta", "Iestyn \"Monster Iestyn\" Jealous", @@ -1166,9 +1147,8 @@ static const char *credits[] = { "Alexander \"DrTapeworm\" Moench-Ford", "Stefan \"Stuf\" Rimalia", "Shane Mychal Sexton", - "\"Spazzo\"", - "David \"Big Wave Dave\" Spencer Sr.", - "David \"Instant Sonic\" Spencer Jr.", + "Dave \"Big Wave Dave\" Spencer", + "David \"instantSonic\" Spencer", "\"SSNTails\"", "", "\1Level Design", @@ -1182,7 +1162,6 @@ static const char *credits[] = { "Ben \"Mystic\" Geyer", "Nathan \"Jazz\" Giroux", "Vivian \"toaster\" Grannell", - "Dan \"Blitzzo\" Hagerstrand", "James \"SeventhSentinel\" Hall", "Kepa \"Nev3r\" Iceta", "Thomas \"Shadow Hog\" Igoe", @@ -1191,7 +1170,6 @@ static const char *credits[] = { "\"Revan\"", "Anna \"QueenDelta\" Sandlin", "Wessel \"sphere\" Smit", - "\"Spazzo\"", "\"SSNTails\"", "Rob Tisdell", "\"Torgo\"", @@ -1220,7 +1198,7 @@ static const char *credits[] = { "Bill \"Tets\" Reed", "", "\1Special Thanks", - "iD Software", + "id Software", "Doom Legacy Project", "FreeDoom Project", // Used some of the mancubus and rocket launcher sprites for Brak "Kart Krew", @@ -1280,7 +1258,7 @@ void F_StartCredits(void) if (creditscutscene) { - F_StartCustomCutscene(creditscutscene - 1, false, false); + F_StartCustomCutscene(creditscutscene - 1, false, false, false); return; } @@ -1399,7 +1377,7 @@ void F_CreditTicker(void) boolean F_CreditResponder(event_t *event) { - INT32 key = event->data1; + INT32 key = event->key; // remap virtual keys (mouse & joystick buttons) switch (key) @@ -1434,7 +1412,7 @@ boolean F_CreditResponder(event_t *event) break; } - if (!(timesBeaten) && !(netgame || multiplayer) && !cv_debug) + if (!(serverGamedata->timesBeaten) && !(netgame || multiplayer) && !cv_debug) return false; if (event->type != ev_keydown) @@ -1596,27 +1574,19 @@ void F_GameEvaluationDrawer(void) #if 0 // the following looks like hot garbage the more unlockables we add, and we now have a lot of unlockables if (finalecount >= 5*TICRATE) { + INT32 startcoord = 32; V_DrawString(8, 16, V_YELLOWMAP, "Unlocked:"); - if (!(netgame) && (!modifiedgame || savemoddata)) + for (i = 0; i < MAXUNLOCKABLES; i++) { - INT32 startcoord = 32; - - for (i = 0; i < MAXUNLOCKABLES; i++) + if (unlockables[i].conditionset && unlockables[i].conditionset < MAXCONDITIONSETS + && unlockables[i].type && !unlockables[i].nocecho) { - if (unlockables[i].conditionset && unlockables[i].conditionset < MAXCONDITIONSETS - && unlockables[i].type && !unlockables[i].nocecho) - { - if (unlockables[i].unlocked) - V_DrawString(8, startcoord, 0, unlockables[i].name); - startcoord += 8; - } + if (clientGamedata->unlocked[i]) + V_DrawString(8, startcoord, 0, unlockables[i].name); + startcoord += 8; } } - else if (netgame) - V_DrawString(8, 96, V_YELLOWMAP, "Multiplayer games\ncan't unlock\nextras!"); - else - V_DrawString(8, 96, V_YELLOWMAP, "Modified games\ncan't unlock\nextras!"); } #endif @@ -1673,35 +1643,27 @@ void F_GameEvaluationTicker(void) if (finalecount == 5*TICRATE) { - if (netgame || multiplayer) // modify this when we finally allow unlocking stuff in 2P + serverGamedata->timesBeaten++; + clientGamedata->timesBeaten++; + + if (ALL7EMERALDS(emeralds)) { - HU_SetCEchoFlags(V_YELLOWMAP|V_RETURN8); - HU_SetCEchoDuration(6); - HU_DoCEcho("\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\Multiplayer games can't unlock extras!"); + serverGamedata->timesBeatenWithEmeralds++; + clientGamedata->timesBeatenWithEmeralds++; + } + + if (ultimatemode) + { + serverGamedata->timesBeatenUltimate++; + clientGamedata->timesBeatenUltimate++; + } + + M_SilentUpdateUnlockablesAndEmblems(serverGamedata); + + if (M_UpdateUnlockablesAndExtraEmblems(clientGamedata)) S_StartSound(NULL, sfx_s3k68); - } - else if (!modifiedgame || savemoddata) - { - ++timesBeaten; - if (ALL7EMERALDS(emeralds)) - ++timesBeatenWithEmeralds; - - if (ultimatemode) - ++timesBeatenUltimate; - - if (M_UpdateUnlockablesAndExtraEmblems()) - S_StartSound(NULL, sfx_s3k68); - - G_SaveGameData(); - } - else - { - HU_SetCEchoFlags(V_YELLOWMAP|V_RETURN8); - HU_SetCEchoDuration(6); - HU_DoCEcho("\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\Modified games can't unlock extras!"); - S_StartSound(NULL, sfx_s3k68); - } + G_SaveGameData(clientGamedata); } } @@ -2215,7 +2177,7 @@ void F_EndingDrawer(void) //colset(linkmap, 164, 165, 169); -- the ideal purple colour to represent a clicked in-game link, but not worth it just for a soundtest-controlled secret V_DrawCenteredString(BASEVIDWIDTH/2, 8, V_ALLOWLOWERCASE|(trans<'|(trans<= STOPPINGPOINT-TICRATE) ? V_PURPLEMAP : V_BLUEMAP)|(trans<"); + V_DrawString(40, ((finalecount == STOPPINGPOINT-(20+TICRATE)) ? 1 : 0)+BASEVIDHEIGHT-16, ((serverGamedata->timesBeaten || finalecount >= STOPPINGPOINT-TICRATE) ? V_PURPLEMAP : V_BLUEMAP)|(trans<"); } if (finalecount > STOPPINGPOINT-(20+(2*TICRATE))) @@ -2281,7 +2243,8 @@ void F_GameEndTicker(void) void F_InitMenuPresValues(void) { - menuanimtimer = 0; + curbgx = 0; + curbgy = 0; prevMenuId = 0; activeMenuId = MainDef.menuid; @@ -2306,21 +2269,19 @@ void F_InitMenuPresValues(void) M_SetMenuCurBackground((gamestate == GS_TIMEATTACK) ? "RECATTBG" : "TITLESKY"); M_SetMenuCurFadeValue(16); M_SetMenuCurTitlePics(); + + LUA_HUD_DestroyDrawList(luahuddrawlist_title); + luahuddrawlist_title = LUA_HUD_CreateDrawList(); } // // F_SkyScroll // -void F_SkyScroll(INT32 scrollxspeed, INT32 scrollyspeed, const char *patchname) +void F_SkyScroll(const char *patchname) { - INT32 xscrolled, x, xneg = (scrollxspeed > 0) - (scrollxspeed < 0), tilex; - INT32 yscrolled, y, yneg = (scrollyspeed > 0) - (scrollyspeed < 0), tiley; - boolean xispos = (scrollxspeed >= 0), yispos = (scrollyspeed >= 0); + INT32 x, basey = 0; INT32 dupz = (vid.dupx < vid.dupy ? vid.dupx : vid.dupy); - INT16 patwidth, patheight; - INT32 pw, ph; // scaled by dupz patch_t *pat; - INT32 i, j; if (rendermode == render_none) return; @@ -2331,42 +2292,34 @@ void F_SkyScroll(INT32 scrollxspeed, INT32 scrollyspeed, const char *patchname) return; } - if (!scrollxspeed && !scrollyspeed) + pat = W_CachePatchName(patchname, PU_PATCH_LOWPRIORITY); + + if (!curbgxspeed && !curbgyspeed) { - V_DrawPatchFill(W_CachePatchName(patchname, PU_PATCH_LOWPRIORITY)); + V_DrawPatchFill(pat); + W_UnlockCachedPatch(pat); return; } - pat = W_CachePatchName(patchname, PU_PATCH_LOWPRIORITY); + // Modulo the background scrolling to prevent jumps from integer overflows + // We already load the background patch here, so we can modulo it here + // to avoid also having to load the patch in F_MenuPresTicker + curbgx %= pat->width * 16; + curbgy %= pat->height * 16; - patwidth = pat->width; - patheight = pat->height; - pw = patwidth * dupz; - ph = patheight * dupz; + // Ooh, fancy frame interpolation + x = ((curbgx*dupz) + FixedInt((rendertimefrac-FRACUNIT) * curbgxspeed*dupz)) / 16; + basey = ((curbgy*dupz) + FixedInt((rendertimefrac-FRACUNIT) * curbgyspeed*dupz)) / 16; - tilex = max(FixedCeil(FixedDiv(vid.width, pw)) >> FRACBITS, 1)+2; // one tile on both sides of center - tiley = max(FixedCeil(FixedDiv(vid.height, ph)) >> FRACBITS, 1)+2; + if (x > 0) // Make sure that we don't leave the left or top sides empty + x -= pat->width * dupz; + if (basey > 0) + basey -= pat->height * dupz; - xscrolltimer = ((menuanimtimer*scrollxspeed)/16 + patwidth*xneg) % (patwidth); - yscrolltimer = ((menuanimtimer*scrollyspeed)/16 + patheight*yneg) % (patheight); - - // coordinate offsets - xscrolled = xscrolltimer * dupz; - yscrolled = yscrolltimer * dupz; - - for (x = (xispos) ? -pw*(tilex-1)+pw : 0, i = 0; - i < tilex; - x += pw, i++) + for (; x < vid.width; x += pat->width * dupz) { - for (y = (yispos) ? -ph*(tiley-1)+ph : 0, j = 0; - j < tiley; - y += ph, j++) - { - V_DrawScaledPatch( - (xispos) ? xscrolled - x : x + xscrolled, - (yispos) ? yscrolled - y : y + yscrolled, - V_NOSCALESTART, pat); - } + for (INT32 y = basey; y < vid.height; y += pat->height * dupz) + V_DrawScaledPatch(x, y, V_NOSCALESTART, pat); } W_UnlockCachedPatch(pat); @@ -2521,6 +2474,8 @@ void F_StartTitleScreen(void) { titlemapinaction = TITLEMAP_OFF; gamemap = 1; // g_game.c + if (!mapheaderinfo[gamemap-1]) + P_AllocMapHeader(gamemap-1); CON_ClearHUD(); } @@ -2687,7 +2642,7 @@ void F_TitleScreenDrawer(void) if (curbgcolor >= 0) V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, curbgcolor); else if (!curbghide || !titlemapinaction || gamestate == GS_WAITINGPLAYERS) - F_SkyScroll(curbgxspeed, curbgyspeed, curbgname); + F_SkyScroll(curbgname); // Don't draw outside of the title screen, or if the patch isn't there. if (gamestate != GS_TITLESCREEN && gamestate != GS_WAITINGPLAYERS) @@ -3423,15 +3378,29 @@ void F_TitleScreenDrawer(void) } luahook: - LUAh_TitleHUD(); + // The title drawer is sometimes called without first being started + // In order to avoid use-before-initialization crashes, let's check and + // create the drawlist if it doesn't exist. + if (!LUA_HUD_IsDrawListValid(luahuddrawlist_title)) + { + LUA_HUD_DestroyDrawList(luahuddrawlist_title); + luahuddrawlist_title = LUA_HUD_CreateDrawList(); + } + + if (renderisnewtic) + { + LUA_HUD_ClearDrawList(luahuddrawlist_title); + LUA_HUDHOOK(title, luahuddrawlist_title); + } + LUA_HUD_DrawList(luahuddrawlist_title); } // separate animation timer for backgrounds, since we also count // during GS_TIMEATTACK -void F_MenuPresTicker(boolean run) +void F_MenuPresTicker(void) { - if (run) - menuanimtimer++; + curbgx += curbgxspeed; + curbgy += curbgyspeed; } // (no longer) De-Demo'd Title Screen @@ -3823,7 +3792,7 @@ void F_ContinueTicker(void) boolean F_ContinueResponder(event_t *event) { - INT32 key = event->data1; + INT32 key = event->key; if (keypressed) return true; @@ -3860,11 +3829,27 @@ boolean F_ContinueResponder(event_t *event) static INT32 scenenum, cutnum; static INT32 picxpos, picypos, picnum, pictime, picmode, numpics, pictoloop; static INT32 textxpos, textypos; -static boolean dofadenow = false, cutsceneover = false; -static boolean runningprecutscene = false, precutresetplayer = false; +static boolean cutsceneover = false; +static boolean runningprecutscene = false, precutresetplayer = false, precutFLS = false; static void F_AdvanceToNextScene(void) { + if (rendermode != render_none) + { + F_WipeStartScreen(); + + // Fade to any palette color you want. + if (cutscenes[cutnum]->scene[scenenum].fadecolor) + { + V_DrawFill(0,0,BASEVIDWIDTH,BASEVIDHEIGHT,cutscenes[cutnum]->scene[scenenum].fadecolor); + + F_WipeEndScreen(); + F_RunWipe(cutscenes[cutnum]->scene[scenenum].fadeinid, true); + + F_WipeStartScreen(); + } + } + // Don't increment until after endcutscene check // (possible overflow / bad patch names from the one tic drawn before the fade) if (scenenum+1 >= cutscenes[cutnum]->numscenes) @@ -3872,6 +3857,7 @@ static void F_AdvanceToNextScene(void) F_EndCutScene(); return; } + ++scenenum; timetonext = 0; @@ -3887,7 +3873,6 @@ static void F_AdvanceToNextScene(void) cutscenes[cutnum]->scene[scenenum].musswitchposition, 0, 0); // Fade to the next - dofadenow = true; F_NewCutscene(cutscenes[cutnum]->scene[scenenum].text); picnum = 0; @@ -3897,6 +3882,14 @@ static void F_AdvanceToNextScene(void) textypos = cutscenes[cutnum]->scene[scenenum].textypos; animtimer = pictime = cutscenes[cutnum]->scene[scenenum].picduration[picnum]; + + if (rendermode != render_none) + { + F_CutsceneDrawer(); + + F_WipeEndScreen(); + F_RunWipe(cutscenes[cutnum]->scene[scenenum].fadeoutid, true); + } } // See also G_AfterIntermission, the only other place which handles intra-map/ending transitions @@ -3906,7 +3899,7 @@ void F_EndCutScene(void) if (runningprecutscene) { if (server) - D_MapChange(gamemap, gametype, ultimatemode, precutresetplayer, 0, true, false); + D_MapChange(gamemap, gametype, ultimatemode, precutresetplayer, 0, true, precutFLS); } else { @@ -3921,7 +3914,7 @@ void F_EndCutScene(void) } } -void F_StartCustomCutscene(INT32 cutscenenum, boolean precutscene, boolean resetplayer) +void F_StartCustomCutscene(INT32 cutscenenum, boolean precutscene, boolean resetplayer, boolean FLS) { if (!cutscenes[cutscenenum]) return; @@ -3940,6 +3933,7 @@ void F_StartCustomCutscene(INT32 cutscenenum, boolean precutscene, boolean reset cutsceneover = false; runningprecutscene = precutscene; precutresetplayer = resetplayer; + precutFLS = FLS; scenenum = picnum = 0; cutnum = cutscenenum; @@ -3971,21 +3965,6 @@ void F_StartCustomCutscene(INT32 cutscenenum, boolean precutscene, boolean reset // void F_CutsceneDrawer(void) { - if (dofadenow && rendermode != render_none) - { - F_WipeStartScreen(); - - // Fade to any palette color you want. - if (cutscenes[cutnum]->scene[scenenum].fadecolor) - { - V_DrawFill(0,0,BASEVIDWIDTH,BASEVIDHEIGHT,cutscenes[cutnum]->scene[scenenum].fadecolor); - - F_WipeEndScreen(); - F_RunWipe(cutscenes[cutnum]->scene[scenenum].fadeinid, true); - - F_WipeStartScreen(); - } - } V_DrawFill(0,0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); if (cutscenes[cutnum]->scene[scenenum].picname[picnum][0] != '\0') @@ -3998,12 +3977,6 @@ void F_CutsceneDrawer(void) W_CachePatchName(cutscenes[cutnum]->scene[scenenum].picname[picnum], PU_PATCH_LOWPRIORITY)); } - if (dofadenow && rendermode != render_none) - { - F_WipeEndScreen(); - F_RunWipe(cutscenes[cutnum]->scene[scenenum].fadeoutid, true); - } - V_DrawString(textxpos, textypos, V_ALLOWLOWERCASE, cutscene_disptext); } @@ -4020,8 +3993,6 @@ void F_CutsceneTicker(void) finalecount++; cutscene_boostspeed = 0; - dofadenow = false; - for (i = 0; i < MAXPLAYERS; i++) { if (netgame && i != serverplayer && !IsPlayerAdmin(i)) diff --git a/src/f_finale.h b/src/f_finale.h index 4aa2c3f05..7f53bfbad 100644 --- a/src/f_finale.h +++ b/src/f_finale.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -40,7 +40,7 @@ void F_TextPromptTicker(void); void F_GameEndDrawer(void); void F_IntroDrawer(void); void F_TitleScreenDrawer(void); -void F_SkyScroll(INT32 scrollxspeed, INT32 scrollyspeed, const char *patchname); +void F_SkyScroll(const char *patchname); void F_GameEvaluationDrawer(void); void F_StartGameEvaluation(void); @@ -52,7 +52,7 @@ void F_EndingDrawer(void); void F_CreditTicker(void); void F_CreditDrawer(void); -void F_StartCustomCutscene(INT32 cutscenenum, boolean precutscene, boolean resetplayer); +void F_StartCustomCutscene(INT32 cutscenenum, boolean precutscene, boolean resetplayer, boolean FLS); void F_CutsceneDrawer(void); void F_EndCutScene(void); @@ -131,7 +131,7 @@ extern UINT16 curtttics; #define TITLEBACKGROUNDACTIVE (curfadevalue >= 0 || curbgname[0]) void F_InitMenuPresValues(void); -void F_MenuPresTicker(boolean run); +void F_MenuPresTicker(void); // // WIPE diff --git a/src/f_wipe.c b/src/f_wipe.c index 7526aeca3..6014fb7f9 100644 --- a/src/f_wipe.c +++ b/src/f_wipe.c @@ -3,7 +3,7 @@ // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. // Copyright (C) 2013-2016 by Matthew "Kaito Sinclaire" Walsh. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -24,6 +24,7 @@ #include "w_wad.h" #include "z_zone.h" +#include "i_time.h" #include "i_system.h" #include "i_threads.h" #include "m_menu.h" @@ -555,7 +556,10 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu) // wait loop while (!((nowtime = I_GetTime()) - lastwipetic)) - I_Sleep(); + { + I_Sleep(cv_sleep.value); + I_UpdateTime(cv_timescale.value); + } lastwipetic = nowtime; // Wipe styles diff --git a/src/filesrch.c b/src/filesrch.c index cb53d07be..9ee64f5ba 100644 --- a/src/filesrch.c +++ b/src/filesrch.c @@ -13,6 +13,7 @@ /// FS_FOUND #include +#include #ifdef __GNUC__ #include #endif @@ -29,15 +30,16 @@ #include "m_misc.h" #include "z_zone.h" #include "m_menu.h" // Addons_option_Onchange +#include "w_wad.h" #if defined (_WIN32) && defined (_MSC_VER) -#include #include #include #define SUFFIX "*" #define SLASH "\\" +#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) #define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) #ifndef INVALID_FILE_ATTRIBUTES @@ -306,6 +308,39 @@ closedir (DIR * dirp) } #endif +// fopen but it REALLY only works on regular files +// Turns out, on linux, anyway, you can fopen directories +// in read mode. (It's supposed to fail in write mode +// though!!) +FILE *fopenfile(const char *path, const char *mode) +{ + FILE *h = fopen(path, mode); + + if (h != NULL) + { + struct stat st; + int eno; + + if (fstat(fileno(h), &st) == -1) + { + eno = errno; + } + else if (!S_ISREG(st.st_mode)) + { + eno = EACCES; // set some kinda error + } + else + { + return h; // ok + } + + fclose(h); + errno = eno; + } + + return NULL; +} + static CV_PossibleValue_t addons_cons_t[] = {{0, "Default"}, #if 1 {1, "HOME"}, {2, "SRB2"}, @@ -337,8 +372,10 @@ size_t dir_on[menudepth]; UINT8 refreshdirmenu = 0; char *refreshdirname = NULL; -size_t packetsizetally = 0; -size_t mainwadstally = 0; +#define dirpathlen 1024 +#define maxdirdepth 48 + +#define isuptree(dirent) ((dirent)[0]=='.' && ((dirent)[1]=='\0' || ((dirent)[1]=='.' && (dirent)[2]=='\0'))) filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *wantedmd5sum, boolean completepath, int maxsearchdepth) { @@ -387,10 +424,7 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want continue; } - if (dent->d_name[0]=='.' && - (dent->d_name[1]=='\0' || - (dent->d_name[1]=='.' && - dent->d_name[2]=='\0'))) + if (isuptree(dent->d_name)) { // we don't want to scan uptree continue; @@ -445,6 +479,381 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want return retval; } +#ifndef AVOID_ERRNO +int direrror = 0; +#endif + +// Checks if the specified path is a directory. +// Returns 1 if so, 0 if not, and -1 if an error occurred. +// direrror is set if there was an error. +INT32 pathisdirectory(const char *path) +{ + struct stat fsstat; + + if (stat(path, &fsstat) < 0) + { +#ifndef AVOID_ERRNO + direrror = errno; +#endif + return -1; + } + else if (S_ISDIR(fsstat.st_mode)) + return 1; + + return 0; +} + +// Concatenates two paths, and checks if it is a directory that can be opened. +// Returns 1 if so, 0 if not, and -1 if an error occurred. +INT32 concatpaths(const char *path, const char *startpath) +{ + char dirpath[dirpathlen]; + DIR *dirhandle; + INT32 stat; + + if (startpath) + { + char basepath[dirpathlen]; + + snprintf(basepath, sizeof basepath, "%s" PATHSEP, startpath); + snprintf(dirpath, sizeof dirpath, "%s%s", basepath, path); + + // Base path and directory path are the same? Not valid. + stat = samepaths(basepath, dirpath); + + if (stat == 1) + return 0; + else if (stat < 0) + return -1; + } + else + snprintf(dirpath, sizeof dirpath, "%s", path); + + // Check if the path is a directory. + // Will return -1 if there was an error. + stat = pathisdirectory(dirpath); + if (stat == 0) + return 0; + else if (stat < 0) + { + // The path doesn't exist, so it can't be a directory. + if (direrror == ENOENT) + return 0; + + return -1; + } + + // Open the directory. + // Will return 0 if it couldn't be opened. + dirhandle = opendir(dirpath); + if (dirhandle == NULL) + return 0; + else + closedir(dirhandle); + + return 1; +} + +// Checks if two paths are the same. Returns 1 if so, and 0 if not. +// Returns -1 if an error occurred with the first path, +// and returns -2 if an error occurred with the second path. +// direrror is set if there was an error. +INT32 samepaths(const char *path1, const char *path2) +{ + struct stat stat1; + struct stat stat2; + + if (stat(path1, &stat1) < 0) + { +#ifndef AVOID_ERRNO + direrror = errno; +#endif + return -1; + } + if (stat(path2, &stat2) < 0) + { +#ifndef AVOID_ERRNO + direrror = errno; +#endif + return -2; + } + + if (stat1.st_dev == stat2.st_dev) + { +#if !defined(_WIN32) + return (stat1.st_ino == stat2.st_ino); +#else + // The above doesn't work on NTFS or FAT. + HANDLE file1 = CreateFileA(path1, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL); + HANDLE file2 = CreateFileA(path2, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL); + BY_HANDLE_FILE_INFORMATION file1info, file2info; + + if (file1 == INVALID_HANDLE_VALUE) + { +#ifndef AVOID_ERRNO + direrror = ENOENT; +#endif + return -1; + } + else if (file2 == INVALID_HANDLE_VALUE) + { + CloseHandle(file1); +#ifndef AVOID_ERRNO + direrror = ENOENT; +#endif + return -2; + } + + // I have no idea why GetFileInformationByHandle would fail. + // Microsoft's documentation doesn't tell me. + // I'll just use EIO... + if (!GetFileInformationByHandle(file1, &file1info)) + { +#ifndef AVOID_ERRNO + direrror = EIO; +#endif + return -1; + } + else if (!GetFileInformationByHandle(file2, &file2info)) + { + CloseHandle(file1); + CloseHandle(file2); +#ifndef AVOID_ERRNO + direrror = EIO; +#endif + return -2; + } + + if (file1info.dwVolumeSerialNumber == file2info.dwVolumeSerialNumber + && file1info.nFileIndexLow == file2info.nFileIndexLow + && file1info.nFileIndexHigh == file2info.nFileIndexHigh) + { + CloseHandle(file1); + CloseHandle(file2); + return 1; + } + + return 0; +#endif + } + + return 0; +} + +// +// Directory loading +// + +static void initdirpath(char *dirpath, size_t *dirpathindex, int depthleft) +{ + dirpathindex[depthleft] = strlen(dirpath) + 1; + + if (dirpath[dirpathindex[depthleft]-2] != PATHSEP[0]) + { + dirpath[dirpathindex[depthleft]-1] = PATHSEP[0]; + dirpath[dirpathindex[depthleft]] = 0; + } + else + dirpathindex[depthleft]--; +} + +lumpinfo_t *getdirectoryfiles(const char *path, UINT16 *nlmp, UINT16 *nfolders) +{ + DIR **dirhandle; + struct dirent *dent; + struct stat fsstat; + + int rootdir = (maxdirdepth - 1); + int depthleft = rootdir; + + char dirpath[dirpathlen]; + size_t *dirpathindex; + + lumpinfo_t *lumpinfo, *lump_p; + UINT16 i = 0, numlumps = 0; + + boolean failure = false; + + dirhandle = (DIR **)malloc(maxdirdepth * sizeof (DIR*)); + dirpathindex = (size_t *)malloc(maxdirdepth * sizeof(size_t)); + + // Open the root directory + strlcpy(dirpath, path, dirpathlen); + dirhandle[depthleft] = opendir(dirpath); + + if (dirhandle[depthleft] == NULL) + { + free(dirhandle); + free(dirpathindex); + return NULL; + } + + initdirpath(dirpath, dirpathindex, depthleft); + (*nfolders) = 0; + + // Count files and directories + while (depthleft < maxdirdepth) + { + dirpath[dirpathindex[depthleft]] = 0; + dent = readdir(dirhandle[depthleft]); + + if (!dent) + { + if (depthleft != rootdir) // Don't close the root directory + closedir(dirhandle[depthleft]); + depthleft++; + continue; + } + else if (isuptree(dent->d_name)) + continue; + + strcpy(&dirpath[dirpathindex[depthleft]], dent->d_name); + + if (stat(dirpath, &fsstat) < 0) + ; + else if (S_ISDIR(fsstat.st_mode) && depthleft) + { + dirpathindex[--depthleft] = strlen(dirpath) + 1; + dirhandle[depthleft] = opendir(dirpath); + + if (dirhandle[depthleft]) + (*nfolders)++; + else + depthleft++; + + dirpath[dirpathindex[depthleft]-1] = '/'; + dirpath[dirpathindex[depthleft]] = 0; + } + else + numlumps++; + + // Failure: Too many files. + if (numlumps == UINT16_MAX) + { + (*nlmp) = UINT16_MAX; + failure = true; + break; + } + } + + // Failure: No files have been found. + if (!numlumps) + { + (*nlmp) = 0; + failure = true; + } + + // Close any open directories and return if something went wrong. + if (failure) + { + for (; depthleft < maxdirdepth; closedir(dirhandle[depthleft++])); + free(dirpathindex); + free(dirhandle); + return NULL; + } + + // Create the files and directories as lump entries + // It's possible to create lumps and count files at the same time, + // but I didn't want to have to reallocate memory for every lump. + rewinddir(dirhandle[rootdir]); + depthleft = rootdir; + + strlcpy(dirpath, path, dirpathlen); + initdirpath(dirpath, dirpathindex, depthleft); + + lump_p = lumpinfo = Z_Calloc(numlumps * sizeof(lumpinfo_t), PU_STATIC, NULL); + + while (depthleft < maxdirdepth) + { + char *fullname, *trimname; + + dirpath[dirpathindex[depthleft]] = 0; + dent = readdir(dirhandle[depthleft]); + + if (!dent) + { + closedir(dirhandle[depthleft++]); + continue; + } + else if (isuptree(dent->d_name)) + continue; + + strcpy(&dirpath[dirpathindex[depthleft]], dent->d_name); + + if (stat(dirpath, &fsstat) < 0) + continue; + else if (S_ISDIR(fsstat.st_mode) && depthleft) + { + dirpathindex[--depthleft] = strlen(dirpath) + 1; + dirhandle[depthleft] = opendir(dirpath); + + if (dirhandle[depthleft]) + { + dirpath[dirpathindex[depthleft]-1] = '/'; + dirpath[dirpathindex[depthleft]] = 0; + } + else + depthleft++; + + continue; + } + + lump_p->diskpath = Z_StrDup(dirpath); // Path in the filesystem to the file + lump_p->compression = CM_NOCOMPRESSION; // Lump is uncompressed + + // Remove the directory's path. + fullname = lump_p->diskpath; + if (strstr(fullname, path)) + fullname += strlen(path) + 1; + + // Get the 8-character long lump name. + trimname = strrchr(fullname, '/'); + if (trimname) + trimname++; + else + trimname = fullname; + + if (trimname[0]) + { + char *dotpos = strrchr(trimname, '.'); + if (dotpos == NULL) + dotpos = fullname + strlen(fullname); + + strncpy(lump_p->name, trimname, min(8, dotpos - trimname)); + + // The name of the file, without the extension. + lump_p->longname = Z_Calloc(dotpos - trimname + 1, PU_STATIC, NULL); + strlcpy(lump_p->longname, trimname, dotpos - trimname + 1); + } + else + lump_p->longname = Z_Calloc(1, PU_STATIC, NULL); + + // The complete name of the file, with its extension, + // excluding the path of the directory where it resides. + lump_p->fullname = Z_StrDup(fullname); + lump_p->hash = quickncasehash(lump_p->name, 8); + + lump_p++; + i++; + + if (i > numlumps || i == (UINT16_MAX-1)) + { + for (; depthleft < maxdirdepth; closedir(dirhandle[depthleft++])); // Close any open directories. + break; + } + } + + free(dirpathindex); + free(dirhandle); + + (*nlmp) = numlumps; + return lumpinfo; +} + +// +// Addons menu +// + char exttable[NUM_EXT_TABLE][7] = { // maximum extension length (currently 4) plus 3 (null terminator, stop, and length including previous two) "\5.txt", "\5.cfg", // exec "\5.wad", @@ -453,8 +862,7 @@ char exttable[NUM_EXT_TABLE][7] = { // maximum extension length (currently 4) pl #endif "\5.pk3", "\5.soc", "\5.lua"}; // addfile -char filenamebuf[MAX_WADFILES][MAX_WADPATH]; - +static char (*filenamebuf)[MAX_WADPATH]; static boolean filemenucmp(char *haystack, char *needle) { @@ -640,10 +1048,7 @@ boolean preparefilemenu(boolean samedepth) if (!dent) break; - else if (dent->d_name[0]=='.' && - (dent->d_name[1]=='\0' || - (dent->d_name[1]=='.' && - dent->d_name[2]=='\0'))) + else if (isuptree(dent->d_name)) continue; // we don't want to scan uptree strcpy(&menupath[menupathindex[menudepthleft]],dent->d_name); @@ -704,10 +1109,7 @@ boolean preparefilemenu(boolean samedepth) if (!dent) break; - else if (dent->d_name[0]=='.' && - (dent->d_name[1]=='\0' || - (dent->d_name[1]=='.' && - dent->d_name[2]=='\0'))) + else if (isuptree(dent->d_name)) continue; // we don't want to scan uptree strcpy(&menupath[menupathindex[menudepthleft]],dent->d_name); @@ -732,6 +1134,10 @@ boolean preparefilemenu(boolean samedepth) if (ext >= EXT_LOADSTART) { size_t i; + + if (filenamebuf == NULL) + filenamebuf = calloc(sizeof(char) * MAX_WADPATH, numwadfiles); + for (i = 0; i < numwadfiles; i++) { if (!filenamebuf[i][0]) @@ -781,6 +1187,12 @@ boolean preparefilemenu(boolean samedepth) } } + if (filenamebuf) + { + free(filenamebuf); + filenamebuf = NULL; + } + closedir(dirhandle); if ((menudepthleft != menudepth-1) // now for UP... entry diff --git a/src/filesrch.h b/src/filesrch.h index dfea8979e..59ef5269b 100644 --- a/src/filesrch.h +++ b/src/filesrch.h @@ -7,6 +7,7 @@ #include "doomdef.h" #include "d_netfil.h" #include "m_menu.h" // MAXSTRINGLENGTH +#include "w_wad.h" extern consvar_t cv_addons_option, cv_addons_folder, cv_addons_md5, cv_addons_showall, cv_addons_search_case, cv_addons_search_type; @@ -28,6 +29,16 @@ extern consvar_t cv_addons_option, cv_addons_folder, cv_addons_md5, cv_addons_sh filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *wantedmd5sum, boolean completepath, int maxsearchdepth); +INT32 pathisdirectory(const char *path); +INT32 samepaths(const char *path1, const char *path2); +INT32 concatpaths(const char *path, const char *startpath); + +#ifndef AVOID_ERRNO +extern int direrror; +#endif + +lumpinfo_t *getdirectoryfiles(const char *path, UINT16 *nlmp, UINT16 *nfolders); + #define menudepth 20 extern char menupath[1024]; @@ -42,9 +53,6 @@ extern size_t dir_on[menudepth]; extern UINT8 refreshdirmenu; extern char *refreshdirname; -extern size_t packetsizetally; -extern size_t mainwadstally; - typedef enum { EXT_FOLDER = 0, @@ -94,5 +102,4 @@ typedef enum void closefilemenu(boolean validsize); void searchfilemenu(char *tempname); boolean preparefilemenu(boolean samedepth); - #endif // __FILESRCH_H__ diff --git a/src/g_demo.c b/src/g_demo.c index 7793e0272..0403da16d 100644 --- a/src/g_demo.c +++ b/src/g_demo.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -17,6 +17,7 @@ #include "d_player.h" #include "d_clisrv.h" #include "p_setup.h" +#include "i_time.h" #include "i_system.h" #include "m_random.h" #include "p_local.h" @@ -94,7 +95,7 @@ demoghost *ghosts = NULL; // DEMO RECORDING // -#define DEMOVERSION 0x000e +#define DEMOVERSION 0x000f #define DEMOHEADER "\xF0" "SRB2Replay" "\x0F" #define DF_GHOST 0x01 // This demo contains ghost data too! @@ -1008,7 +1009,7 @@ void G_ReadMetalTic(mobj_t *metal) oldmetal.x = READFIXED(metal_p); oldmetal.y = READFIXED(metal_p); oldmetal.z = READFIXED(metal_p); - P_TeleportMove(metal, oldmetal.x, oldmetal.y, oldmetal.z); + P_MoveOrigin(metal, oldmetal.x, oldmetal.y, oldmetal.z); oldmetal.x = metal->x; oldmetal.y = metal->y; oldmetal.z = metal->z; @@ -1029,7 +1030,11 @@ void G_ReadMetalTic(mobj_t *metal) if (ziptic & GZT_ANGLE) metal->angle = READUINT8(metal_p)<<24; if (ziptic & GZT_FRAME) + { oldmetal.frame = READUINT32(metal_p); + if (metalversion < 0x000f) + oldmetal.frame = G_ConvertOldFrameFlags(oldmetal.frame); + } if (ziptic & GZT_SPR2) oldmetal.sprite2 = READUINT8(metal_p); @@ -1169,6 +1174,8 @@ void G_ReadMetalTic(mobj_t *metal) follow->sprite2 = 0; follow->sprite = READUINT16(metal_p); follow->frame = READUINT32(metal_p); // NOT & FF_FRAMEMASK here, so 32 bits + if (metalversion < 0x000f) + follow->frame = G_ConvertOldFrameFlags(follow->frame); follow->angle = metal->angle; follow->color = (metalversion==0x000c) ? READUINT8(metal_p) : READUINT16(metal_p); @@ -1680,7 +1687,9 @@ UINT8 G_CmpDemoTime(char *oldname, char *newname) switch(oldversion) // demoversion { case DEMOVERSION: // latest always supported - case 0x000c: // all that changed between then and now was longer color name + case 0x000e: // The previous demoversions also supported + case 0x000d: // all that changed between then and now was longer color name + case 0x000c: break; // too old, cannot support. default: @@ -1823,6 +1832,7 @@ void G_DoPlayDemo(char *defdemoname) switch(demoversion) { case 0x000d: + case 0x000e: case DEMOVERSION: // latest always supported cnamelen = MAXCOLORNAME; break; @@ -1968,7 +1978,7 @@ void G_DoPlayDemo(char *defdemoname) // Set skin SetPlayerSkin(0, skin); - LUAh_MapChange(gamemap); + LUA_HookInt(gamemap, HOOK(MapChange)); displayplayer = consoleplayer = 0; memset(playeringame,0,sizeof(playeringame)); playeringame[0] = true; @@ -2023,7 +2033,7 @@ void G_AddGhost(char *defdemoname) char name[17],skin[17],color[MAXCOLORNAME+1],*n,*pdemoname,md5[16]; UINT8 cnamelen; demoghost *gh; - UINT8 flags; + UINT8 flags, subversion; UINT8 *buffer,*p; mapthing_t *mthing; UINT16 count, ghostversion; @@ -2071,11 +2081,12 @@ void G_AddGhost(char *defdemoname) return; } p += 12; // DEMOHEADER p++; // VERSION - p++; // SUBVERSION + subversion = READUINT8(p); // SUBVERSION ghostversion = READUINT16(p); switch(ghostversion) { case 0x000d: + case 0x000e: case DEMOVERSION: // latest always supported cnamelen = MAXCOLORNAME; break; @@ -2170,9 +2181,19 @@ void G_AddGhost(char *defdemoname) count = READUINT16(p); while (count--) { - SKIPSTRING(p); - SKIPSTRING(p); - p++; + // In 2.2.7 netvar saving was updated + if (subversion < 7) + { + p += 2; + SKIPSTRING(p); + p++; + } + else + { + SKIPSTRING(p); + SKIPSTRING(p); + p++; + } } if (*p == DEMOMARKER) @@ -2201,7 +2222,7 @@ void G_AddGhost(char *defdemoname) gh->mo->angle = FixedAngle(mthing->angle << FRACBITS); f = gh->mo->floorz; c = gh->mo->ceilingz - mobjinfo[MT_PLAYER].height; - if (!!(mthing->options & MTF_AMBUSH) ^ !!(mthing->options & MTF_OBJECTFLIP)) + if (!!(mthing->args[0]) ^ !!(mthing->options & MTF_OBJECTFLIP)) { z = c - offset; if (z < f) @@ -2326,8 +2347,9 @@ void G_DoPlayMetal(void) switch(metalversion) { case DEMOVERSION: // latest always supported - case 0x000d: // There are checks wheter the momentum is from older demo versions or not - case 0x000c: // all that changed between then and now was longer color name + case 0x000e: // There are checks wheter the momentum is from older demo versions or not + case 0x000d: // all that changed between then and now was longer color name + case 0x000c: break; // too old, cannot support. default: @@ -2422,12 +2444,13 @@ ATTRNORETURN void FUNCNORETURN G_StopMetalRecording(boolean kill) { WRITEUINT8(demo_p, (kill) ? METALDEATH : DEMOMARKER); // add the demo end (or metal death) marker WriteDemoChecksum(); - saved = FIL_WriteFile(va("%sMS.LMP", G_BuildMapName(gamemap)), demobuffer, demo_p - demobuffer); // finally output the file. + sprintf(demoname, "%sMS.LMP", G_BuildMapName(gamemap)); + saved = FIL_WriteFile(va(pandf, srb2home, demoname), demobuffer, demo_p - demobuffer); // finally output the file. } free(demobuffer); metalrecording = false; if (saved) - I_Error("Saved to %sMS.LMP", G_BuildMapName(gamemap)); + I_Error("Saved to %s", demoname); I_Error("Failed to save demo!"); } @@ -2542,3 +2565,45 @@ boolean G_CheckDemoStatus(void) return false; } + +// 2.2.10 shifted some frame flags around, this function converts frame flags from older versions to their 2.2.10 equivalents. +INT32 G_ConvertOldFrameFlags(INT32 frame) +{ + if (frame & 0x01000000) // was FF_ANIMATE, is now FF_VERTICALFLIP + { + frame &= ~0x01000000; + frame |= FF_ANIMATE; + } + + if (frame & 0x02000000) // was FF_RANDOMANIM, is now FF_HORIZONTALFLIP + { + frame &= ~0x02000000; + frame |= FF_RANDOMANIM; + } + + if (frame & 0x04000000) // was FF_GLOBALANIM, is now empty + { + frame &= ~0x04000000; + frame |= FF_GLOBALANIM; + } + + if (frame & 0x00200000) // was FF_VERTICALFLIP, is now FF_FULLDARK + { + frame &= ~0x00200000; + frame |= FF_VERTICALFLIP; + } + + if (frame & 0x00400000) // was FF_HORIZONTALFLIP, is now FF_PAPERSPRITE + { + frame &= ~0x00400000; + frame |= FF_HORIZONTALFLIP; + } + + if (frame & 0x00800000) // was FF_PAPERSPRITE, is now FF_FLOORSPRITE + { + frame &= ~0x00800000; + frame |= FF_PAPERSPRITE; + } + + return frame; +} diff --git a/src/g_demo.h b/src/g_demo.h index 73cf27358..f25315a58 100644 --- a/src/g_demo.h +++ b/src/g_demo.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -82,5 +82,6 @@ void G_StopMetalDemo(void); ATTRNORETURN void FUNCNORETURN G_StopMetalRecording(boolean kill); void G_StopDemo(void); boolean G_CheckDemoStatus(void); +INT32 G_ConvertOldFrameFlags(INT32 frame); #endif // __G_DEMO__ diff --git a/src/g_game.c b/src/g_game.c index debc27096..b23980044 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -19,6 +19,7 @@ #include "f_finale.h" #include "p_setup.h" #include "p_saveg.h" +#include "i_time.h" #include "i_system.h" #include "am_map.h" #include "m_random.h" @@ -45,6 +46,8 @@ #include "lua_hook.h" #include "b_bot.h" #include "m_cond.h" // condition sets +#include "lua_script.h" +#include "r_fps.h" // frame interpolation/uncapped #include "lua_hud.h" @@ -93,6 +96,7 @@ SINT8 startinglivesbalance[maxgameovers+1] = {3, 5, 7, 9, 12, 15, 20, 25, 30, 40 UINT16 mainwads = 0; boolean modifiedgame; // Set if homebrew PWAD stuff has been added. boolean savemoddata = false; +boolean usedCheats = false; // Set when a gamedata-preventing cheat command is used. UINT8 paused; UINT8 modeattacking = ATTACKING_NONE; boolean disableSpeedAdjust = false; @@ -181,18 +185,6 @@ INT32 tokenbits; // Used for setting token bits // Old Special Stage INT32 sstimer; // Time allotted in the special stage -tic_t totalplaytime; -boolean gamedataloaded = false; - -// Time attack data for levels -// These are dynamically allocated for space reasons now -recorddata_t *mainrecords[NUMMAPS] = {NULL}; -nightsdata_t *nightsrecords[NUMMAPS] = {NULL}; -UINT8 mapvisited[NUMMAPS]; - -// Temporary holding place for nights data for the current map -nightsdata_t ntemprecords; - UINT32 bluescore, redscore; // CTF and Team Match team scores // ring count... for PERFECT! @@ -223,6 +215,7 @@ UINT8 ammoremovaltics = 2*TICRATE; UINT8 use1upSound = 0; UINT8 maxXtraLife = 2; // Max extra lives from rings UINT8 useContinues = 0; // Set to 1 to enable continues outside of no-save scenarioes +UINT8 shareEmblems = 0; // Set to 1 to share all picked up emblems in multiplayer UINT8 introtoplay; UINT8 creditscutscene; @@ -248,11 +241,6 @@ INT32 cheats; //for multiplayer cheat commands tic_t hidetime; -// Grading -UINT32 timesBeaten; -UINT32 timesBeatenWithEmeralds; -UINT32 timesBeatenUltimate; - typedef struct joystickvector2_s { INT32 xaxis; @@ -345,8 +333,8 @@ consvar_t cv_analog[2] = { CVAR_INIT ("sessionanalog2", "Off", CV_CALL|CV_NOSHOWHELP, CV_OnOff, Analog2_OnChange), }; consvar_t cv_useranalog[2] = { - CVAR_INIT ("configanalog", "Off", CV_SAVE|CV_CALL|CV_NOSHOWHELP, CV_OnOff, UserAnalog_OnChange), - CVAR_INIT ("configanalog2", "Off", CV_SAVE|CV_CALL|CV_NOSHOWHELP, CV_OnOff, UserAnalog2_OnChange), + CVAR_INIT ("configanalog", "On", CV_SAVE|CV_CALL|CV_NOSHOWHELP, CV_OnOff, UserAnalog_OnChange), + CVAR_INIT ("configanalog2", "On", CV_SAVE|CV_CALL|CV_NOSHOWHELP, CV_OnOff, UserAnalog2_OnChange), }; // deez New User eXperiences @@ -361,36 +349,36 @@ consvar_t cv_autobrake2 = CVAR_INIT ("autobrake2", "On", CV_SAVE|CV_CALL, CV_OnO // hi here's some new controls static CV_PossibleValue_t zerotoone_cons_t[] = {{0, "MIN"}, {FRACUNIT, "MAX"}, {0, NULL}}; consvar_t cv_cam_shiftfacing[2] = { - CVAR_INIT ("cam_shiftfacingchar", "0.33", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL), - CVAR_INIT ("cam2_shiftfacingchar", "0.33", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL), + CVAR_INIT ("cam_shiftfacingchar", "0.375", CV_FLOAT|CV_SAVE|CV_ALLOWLUA, zerotoone_cons_t, NULL), + CVAR_INIT ("cam2_shiftfacingchar", "0.375", CV_FLOAT|CV_SAVE|CV_ALLOWLUA, zerotoone_cons_t, NULL), }; consvar_t cv_cam_turnfacing[2] = { - CVAR_INIT ("cam_turnfacingchar", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL), - CVAR_INIT ("cam2_turnfacingchar", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL), + CVAR_INIT ("cam_turnfacingchar", "0.25", CV_FLOAT|CV_SAVE|CV_ALLOWLUA, zerotoone_cons_t, NULL), + CVAR_INIT ("cam2_turnfacingchar", "0.25", CV_FLOAT|CV_SAVE|CV_ALLOWLUA, zerotoone_cons_t, NULL), }; consvar_t cv_cam_turnfacingability[2] = { - CVAR_INIT ("cam_turnfacingability", "0.125", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL), - CVAR_INIT ("cam2_turnfacingability", "0.125", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL), + CVAR_INIT ("cam_turnfacingability", "0.125", CV_FLOAT|CV_SAVE|CV_ALLOWLUA, zerotoone_cons_t, NULL), + CVAR_INIT ("cam2_turnfacingability", "0.125", CV_FLOAT|CV_SAVE|CV_ALLOWLUA, zerotoone_cons_t, NULL), }; consvar_t cv_cam_turnfacingspindash[2] = { - CVAR_INIT ("cam_turnfacingspindash", "0.5", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL), - CVAR_INIT ("cam2_turnfacingspindash", "0.5", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL), + CVAR_INIT ("cam_turnfacingspindash", "0.25", CV_FLOAT|CV_SAVE|CV_ALLOWLUA, zerotoone_cons_t, NULL), + CVAR_INIT ("cam2_turnfacingspindash", "0.25", CV_FLOAT|CV_SAVE|CV_ALLOWLUA, zerotoone_cons_t, NULL), }; consvar_t cv_cam_turnfacinginput[2] = { - CVAR_INIT ("cam_turnfacinginput", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL), - CVAR_INIT ("cam2_turnfacinginput", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL), + CVAR_INIT ("cam_turnfacinginput", "0.375", CV_FLOAT|CV_SAVE|CV_ALLOWLUA, zerotoone_cons_t, NULL), + CVAR_INIT ("cam2_turnfacinginput", "0.375", CV_FLOAT|CV_SAVE|CV_ALLOWLUA, zerotoone_cons_t, NULL), }; static CV_PossibleValue_t centertoggle_cons_t[] = {{0, "Hold"}, {1, "Toggle"}, {2, "Sticky Hold"}, {0, NULL}}; consvar_t cv_cam_centertoggle[2] = { - CVAR_INIT ("cam_centertoggle", "Hold", CV_SAVE, centertoggle_cons_t, NULL), - CVAR_INIT ("cam2_centertoggle", "Hold", CV_SAVE, centertoggle_cons_t, NULL), + CVAR_INIT ("cam_centertoggle", "Hold", CV_SAVE|CV_ALLOWLUA, centertoggle_cons_t, NULL), + CVAR_INIT ("cam2_centertoggle", "Hold", CV_SAVE|CV_ALLOWLUA, centertoggle_cons_t, NULL), }; static CV_PossibleValue_t lockedinput_cons_t[] = {{0, "Strafe"}, {1, "Turn"}, {0, NULL}}; consvar_t cv_cam_lockedinput[2] = { - CVAR_INIT ("cam_lockedinput", "Strafe", CV_SAVE, lockedinput_cons_t, NULL), - CVAR_INIT ("cam2_lockedinput", "Strafe", CV_SAVE, lockedinput_cons_t, NULL), + CVAR_INIT ("cam_lockedinput", "Strafe", CV_SAVE|CV_ALLOWLUA, lockedinput_cons_t, NULL), + CVAR_INIT ("cam2_lockedinput", "Strafe", CV_SAVE|CV_ALLOWLUA, lockedinput_cons_t, NULL), }; static CV_PossibleValue_t lockedassist_cons_t[] = { @@ -402,44 +390,28 @@ static CV_PossibleValue_t lockedassist_cons_t[] = { {0, NULL} }; consvar_t cv_cam_lockonboss[2] = { - CVAR_INIT ("cam_lockaimassist", "Bosses", CV_SAVE, lockedassist_cons_t, NULL), - CVAR_INIT ("cam2_lockaimassist", "Bosses", CV_SAVE, lockedassist_cons_t, NULL), + CVAR_INIT ("cam_lockaimassist", "Full", CV_SAVE|CV_ALLOWLUA, lockedassist_cons_t, NULL), + CVAR_INIT ("cam2_lockaimassist", "Full", CV_SAVE|CV_ALLOWLUA, lockedassist_cons_t, NULL), }; -typedef enum -{ - AXISNONE = 0, - AXISTURN, - AXISMOVE, - AXISLOOK, - AXISSTRAFE, - - AXISDIGITAL, // axes below this use digital deadzone - - AXISJUMP, - AXISSPIN, - AXISFIRE, - AXISFIRENORMAL, -} axis_input_e; - -consvar_t cv_turnaxis = CVAR_INIT ("joyaxis_turn", "X-Rudder", CV_SAVE, joyaxis_cons_t, NULL); consvar_t cv_moveaxis = CVAR_INIT ("joyaxis_move", "Y-Axis", CV_SAVE, joyaxis_cons_t, NULL); consvar_t cv_sideaxis = CVAR_INIT ("joyaxis_side", "X-Axis", CV_SAVE, joyaxis_cons_t, NULL); -consvar_t cv_lookaxis = CVAR_INIT ("joyaxis_look", "Y-Rudder-", CV_SAVE, joyaxis_cons_t, NULL); +consvar_t cv_lookaxis = CVAR_INIT ("joyaxis_look", "X-Rudder-", CV_SAVE, joyaxis_cons_t, NULL); +consvar_t cv_turnaxis = CVAR_INIT ("joyaxis_turn", "Z-Axis", CV_SAVE, joyaxis_cons_t, NULL); consvar_t cv_jumpaxis = CVAR_INIT ("joyaxis_jump", "None", CV_SAVE, joyaxis_cons_t, NULL); consvar_t cv_spinaxis = CVAR_INIT ("joyaxis_spin", "None", CV_SAVE, joyaxis_cons_t, NULL); -consvar_t cv_fireaxis = CVAR_INIT ("joyaxis_fire", "Z-Axis-", CV_SAVE, joyaxis_cons_t, NULL); +consvar_t cv_fireaxis = CVAR_INIT ("joyaxis_fire", "Z-Rudder", CV_SAVE, joyaxis_cons_t, NULL); consvar_t cv_firenaxis = CVAR_INIT ("joyaxis_firenormal", "Z-Axis", CV_SAVE, joyaxis_cons_t, NULL); consvar_t cv_deadzone = CVAR_INIT ("joy_deadzone", "0.125", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL); consvar_t cv_digitaldeadzone = CVAR_INIT ("joy_digdeadzone", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL); -consvar_t cv_turnaxis2 = CVAR_INIT ("joyaxis2_turn", "X-Rudder", CV_SAVE, joyaxis_cons_t, NULL); consvar_t cv_moveaxis2 = CVAR_INIT ("joyaxis2_move", "Y-Axis", CV_SAVE, joyaxis_cons_t, NULL); consvar_t cv_sideaxis2 = CVAR_INIT ("joyaxis2_side", "X-Axis", CV_SAVE, joyaxis_cons_t, NULL); -consvar_t cv_lookaxis2 = CVAR_INIT ("joyaxis2_look", "Y-Rudder-", CV_SAVE, joyaxis_cons_t, NULL); +consvar_t cv_lookaxis2 = CVAR_INIT ("joyaxis2_look", "X-Rudder-", CV_SAVE, joyaxis_cons_t, NULL); +consvar_t cv_turnaxis2 = CVAR_INIT ("joyaxis2_turn", "Z-Axis", CV_SAVE, joyaxis_cons_t, NULL); consvar_t cv_jumpaxis2 = CVAR_INIT ("joyaxis2_jump", "None", CV_SAVE, joyaxis_cons_t, NULL); consvar_t cv_spinaxis2 = CVAR_INIT ("joyaxis2_spin", "None", CV_SAVE, joyaxis_cons_t, NULL); -consvar_t cv_fireaxis2 = CVAR_INIT ("joyaxis2_fire", "Z-Axis-", CV_SAVE, joyaxis_cons_t, NULL); +consvar_t cv_fireaxis2 = CVAR_INIT ("joyaxis2_fire", "Z-Rudder", CV_SAVE, joyaxis_cons_t, NULL); consvar_t cv_firenaxis2 = CVAR_INIT ("joyaxis2_firenormal", "Z-Axis", CV_SAVE, joyaxis_cons_t, NULL); consvar_t cv_deadzone2 = CVAR_INIT ("joy_deadzone2", "0.125", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL); consvar_t cv_digitaldeadzone2 = CVAR_INIT ("joy_digdeadzone2", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL); @@ -464,86 +436,86 @@ INT16 rw_maximums[NUM_WEAPONS] = }; // Allocation for time and nights data -void G_AllocMainRecordData(INT16 i) +void G_AllocMainRecordData(INT16 i, gamedata_t *data) { - if (!mainrecords[i]) - mainrecords[i] = Z_Malloc(sizeof(recorddata_t), PU_STATIC, NULL); - memset(mainrecords[i], 0, sizeof(recorddata_t)); + if (!data->mainrecords[i]) + data->mainrecords[i] = Z_Malloc(sizeof(recorddata_t), PU_STATIC, NULL); + memset(data->mainrecords[i], 0, sizeof(recorddata_t)); } -void G_AllocNightsRecordData(INT16 i) +void G_AllocNightsRecordData(INT16 i, gamedata_t *data) { - if (!nightsrecords[i]) - nightsrecords[i] = Z_Malloc(sizeof(nightsdata_t), PU_STATIC, NULL); - memset(nightsrecords[i], 0, sizeof(nightsdata_t)); + if (!data->nightsrecords[i]) + data->nightsrecords[i] = Z_Malloc(sizeof(nightsdata_t), PU_STATIC, NULL); + memset(data->nightsrecords[i], 0, sizeof(nightsdata_t)); } // MAKE SURE YOU SAVE DATA BEFORE CALLING THIS -void G_ClearRecords(void) +void G_ClearRecords(gamedata_t *data) { INT16 i; for (i = 0; i < NUMMAPS; ++i) { - if (mainrecords[i]) + if (data->mainrecords[i]) { - Z_Free(mainrecords[i]); - mainrecords[i] = NULL; + Z_Free(data->mainrecords[i]); + data->mainrecords[i] = NULL; } - if (nightsrecords[i]) + if (data->nightsrecords[i]) { - Z_Free(nightsrecords[i]); - nightsrecords[i] = NULL; + Z_Free(data->nightsrecords[i]); + data->nightsrecords[i] = NULL; } } } // For easy retrieval of records -UINT32 G_GetBestScore(INT16 map) +UINT32 G_GetBestScore(INT16 map, gamedata_t *data) { - if (!mainrecords[map-1]) + if (!data->mainrecords[map-1]) return 0; - return mainrecords[map-1]->score; + return data->mainrecords[map-1]->score; } -tic_t G_GetBestTime(INT16 map) +tic_t G_GetBestTime(INT16 map, gamedata_t *data) { - if (!mainrecords[map-1] || mainrecords[map-1]->time <= 0) + if (!data->mainrecords[map-1] || data->mainrecords[map-1]->time <= 0) return (tic_t)UINT32_MAX; - return mainrecords[map-1]->time; + return data->mainrecords[map-1]->time; } -UINT16 G_GetBestRings(INT16 map) +UINT16 G_GetBestRings(INT16 map, gamedata_t *data) { - if (!mainrecords[map-1]) + if (!data->mainrecords[map-1]) return 0; - return mainrecords[map-1]->rings; + return data->mainrecords[map-1]->rings; } -UINT32 G_GetBestNightsScore(INT16 map, UINT8 mare) +UINT32 G_GetBestNightsScore(INT16 map, UINT8 mare, gamedata_t *data) { - if (!nightsrecords[map-1]) + if (!data->nightsrecords[map-1]) return 0; - return nightsrecords[map-1]->score[mare]; + return data->nightsrecords[map-1]->score[mare]; } -tic_t G_GetBestNightsTime(INT16 map, UINT8 mare) +tic_t G_GetBestNightsTime(INT16 map, UINT8 mare, gamedata_t *data) { - if (!nightsrecords[map-1] || nightsrecords[map-1]->time[mare] <= 0) + if (!data->nightsrecords[map-1] || data->nightsrecords[map-1]->time[mare] <= 0) return (tic_t)UINT32_MAX; - return nightsrecords[map-1]->time[mare]; + return data->nightsrecords[map-1]->time[mare]; } -UINT8 G_GetBestNightsGrade(INT16 map, UINT8 mare) +UINT8 G_GetBestNightsGrade(INT16 map, UINT8 mare, gamedata_t *data) { - if (!nightsrecords[map-1]) + if (!data->nightsrecords[map-1]) return 0; - return nightsrecords[map-1]->grade[mare]; + return data->nightsrecords[map-1]->grade[mare]; } // For easy adding of NiGHTS records @@ -565,7 +537,7 @@ void G_AddTempNightsRecords(UINT32 pscore, tic_t ptime, UINT8 mare) // Update replay files/data, etc. for Record Attack // See G_SetNightsRecords for NiGHTS Attack. // -static void G_UpdateRecordReplays(void) +static void G_UpdateRecordReplays(gamedata_t *data) { const size_t glen = strlen(srb2home)+1+strlen("replay")+1+strlen(timeattackfolder)+1+strlen("MAPXX")+1; char *gpath; @@ -573,17 +545,17 @@ static void G_UpdateRecordReplays(void) UINT8 earnedEmblems; // Record new best time - if (!mainrecords[gamemap-1]) - G_AllocMainRecordData(gamemap-1); + if (!data->mainrecords[gamemap-1]) + G_AllocMainRecordData(gamemap-1, data); - if (players[consoleplayer].score > mainrecords[gamemap-1]->score) - mainrecords[gamemap-1]->score = players[consoleplayer].score; + if (players[consoleplayer].score > data->mainrecords[gamemap-1]->score) + data->mainrecords[gamemap-1]->score = players[consoleplayer].score; - if ((mainrecords[gamemap-1]->time == 0) || (players[consoleplayer].realtime < mainrecords[gamemap-1]->time)) - mainrecords[gamemap-1]->time = players[consoleplayer].realtime; + if ((data->mainrecords[gamemap-1]->time == 0) || (players[consoleplayer].realtime < data->mainrecords[gamemap-1]->time)) + data->mainrecords[gamemap-1]->time = players[consoleplayer].realtime; - if ((UINT16)(players[consoleplayer].rings) > mainrecords[gamemap-1]->rings) - mainrecords[gamemap-1]->rings = (UINT16)(players[consoleplayer].rings); + if ((UINT16)(players[consoleplayer].rings) > data->mainrecords[gamemap-1]->rings) + data->mainrecords[gamemap-1]->rings = (UINT16)(players[consoleplayer].rings); // Save demo! bestdemo[255] = '\0'; @@ -639,14 +611,14 @@ static void G_UpdateRecordReplays(void) free(gpath); // Check emblems when level data is updated - if ((earnedEmblems = M_CheckLevelEmblems())) + if ((earnedEmblems = M_CheckLevelEmblems(data))) CONS_Printf(M_GetText("\x82" "Earned %hu emblem%s for Record Attack records.\n"), (UINT16)earnedEmblems, earnedEmblems > 1 ? "s" : ""); // Update timeattack menu's replay availability. Nextmap_OnChange(); } -void G_SetNightsRecords(void) +void G_SetNightsRecords(gamedata_t *data) { INT32 i; UINT32 totalscore = 0; @@ -687,9 +659,9 @@ void G_SetNightsRecords(void) { nightsdata_t *maprecords; - if (!nightsrecords[gamemap-1]) - G_AllocNightsRecordData(gamemap-1); - maprecords = nightsrecords[gamemap-1]; + if (!data->nightsrecords[gamemap-1]) + G_AllocNightsRecordData(gamemap-1, data); + maprecords = data->nightsrecords[gamemap-1]; if (maprecords->nummares != ntemprecords.nummares) maprecords->nummares = ntemprecords.nummares; @@ -751,7 +723,7 @@ void G_SetNightsRecords(void) } free(gpath); - if ((earnedEmblems = M_CheckLevelEmblems())) + if ((earnedEmblems = M_CheckLevelEmblems(data))) CONS_Printf(M_GetText("\x82" "Earned %hu emblem%s for NiGHTS records.\n"), (UINT16)earnedEmblems, earnedEmblems > 1 ? "s" : ""); // If the mare count changed, this will update the score display @@ -768,7 +740,24 @@ void G_SetGameModified(boolean silent) savemoddata = false; if (!silent) - CONS_Alert(CONS_NOTICE, M_GetText("Game must be restarted to record statistics.\n")); + CONS_Alert(CONS_NOTICE, M_GetText("Game must be restarted to play Record Attack.\n")); + + // If in record attack recording, cancel it. + if (modeattacking) + M_EndModeAttackRun(); + else if (marathonmode) + Command_ExitGame_f(); +} + +void G_SetUsedCheats(boolean silent) +{ + if (usedCheats) + return; + + usedCheats = true; + + if (!silent) + CONS_Alert(CONS_NOTICE, M_GetText("Game must be restarted to save progress.\n")); // If in record attack recording, cancel it. if (modeattacking) @@ -841,7 +830,7 @@ INT16 G_SoftwareClipAimingPitch(INT32 *aiming) return (INT16)((*aiming)>>16); } -static INT32 JoyAxis(axis_input_e axissel) +INT32 JoyAxis(joyaxis_e axissel) { INT32 retaxis; INT32 axisval; @@ -850,28 +839,28 @@ static INT32 JoyAxis(axis_input_e axissel) //find what axis to get switch (axissel) { - case AXISTURN: + case JA_TURN: axisval = cv_turnaxis.value; break; - case AXISMOVE: + case JA_MOVE: axisval = cv_moveaxis.value; break; - case AXISLOOK: + case JA_LOOK: axisval = cv_lookaxis.value; break; - case AXISSTRAFE: + case JA_STRAFE: axisval = cv_sideaxis.value; break; - case AXISJUMP: + case JA_JUMP: axisval = cv_jumpaxis.value; break; - case AXISSPIN: + case JA_SPIN: axisval = cv_spinaxis.value; break; - case AXISFIRE: + case JA_FIRE: axisval = cv_fireaxis.value; break; - case AXISFIRENORMAL: + case JA_FIRENORMAL: axisval = cv_firenaxis.value; break; default: @@ -903,7 +892,7 @@ static INT32 JoyAxis(axis_input_e axissel) if (retaxis > (+JOYAXISRANGE)) retaxis = +JOYAXISRANGE; - if (!Joystick.bGamepadStyle && axissel > AXISDIGITAL) + if (!Joystick.bGamepadStyle && axissel >= JA_DIGITAL) { const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_digitaldeadzone.value) >> FRACBITS; if (-jdeadzone < retaxis && retaxis < jdeadzone) @@ -914,7 +903,7 @@ static INT32 JoyAxis(axis_input_e axissel) return retaxis; } -static INT32 Joy2Axis(axis_input_e axissel) +INT32 Joy2Axis(joyaxis_e axissel) { INT32 retaxis; INT32 axisval; @@ -923,28 +912,28 @@ static INT32 Joy2Axis(axis_input_e axissel) //find what axis to get switch (axissel) { - case AXISTURN: + case JA_TURN: axisval = cv_turnaxis2.value; break; - case AXISMOVE: + case JA_MOVE: axisval = cv_moveaxis2.value; break; - case AXISLOOK: + case JA_LOOK: axisval = cv_lookaxis2.value; break; - case AXISSTRAFE: + case JA_STRAFE: axisval = cv_sideaxis2.value; break; - case AXISJUMP: + case JA_JUMP: axisval = cv_jumpaxis2.value; break; - case AXISSPIN: + case JA_SPIN: axisval = cv_spinaxis2.value; break; - case AXISFIRE: + case JA_FIRE: axisval = cv_fireaxis2.value; break; - case AXISFIRENORMAL: + case JA_FIRENORMAL: axisval = cv_firenaxis2.value; break; default: @@ -978,7 +967,7 @@ static INT32 Joy2Axis(axis_input_e axissel) if (retaxis > (+JOYAXISRANGE)) retaxis = +JOYAXISRANGE; - if (!Joystick2.bGamepadStyle && axissel > AXISDIGITAL) + if (!Joystick2.bGamepadStyle && axissel >= JA_DIGITAL) { const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_digitaldeadzone2.value) >> FRACBITS; if (-jdeadzone < retaxis && retaxis < jdeadzone) @@ -1087,14 +1076,14 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer) boolean turnleft, turnright, strafelkey, straferkey, movefkey, movebkey, mouseaiming, analogjoystickmove, gamepadjoystickmove, thisjoyaiming; boolean strafeisturn; // Simple controls only player_t *player = &players[ssplayer == 2 ? secondarydisplayplayer : consoleplayer]; - camera_t *thiscam = ((ssplayer == 1 || player->bot == 2) ? &camera : &camera2); + camera_t *thiscam = ((ssplayer == 1 || player->bot == BOT_2PHUMAN) ? &camera : &camera2); angle_t *myangle = (ssplayer == 1 ? &localangle : &localangle2); INT32 *myaiming = (ssplayer == 1 ? &localaiming : &localaiming2); angle_t drawangleoffset = (player->powers[pw_carry] == CR_ROLLOUT) ? ANGLE_180 : 0; INT32 chasecam, chasefreelook, alwaysfreelook, usejoystick, invertmouse, turnmultiplier, mousemove; controlstyle_e controlstyle = G_ControlStyle(ssplayer); - INT32 *mx; INT32 *my; INT32 *mly; + INT32 mdx, mdy, mldy; static INT32 turnheld[2]; // for accelerative turning static boolean keyboard_look[2]; // true if lookup/down using keyboard @@ -1117,9 +1106,9 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer) invertmouse = cv_invertmouse.value; turnmultiplier = cv_cam_turnmultiplier.value; mousemove = cv_mousemove.value; - mx = &mousex; - my = &mousey; - mly = &mlooky; + mdx = mouse.dx; + mdy = -mouse.dy; + mldy = -mouse.mlookdy; G_CopyTiccmd(cmd, I_BaseTiccmd(), 1); // empty, or external driver } else @@ -1131,12 +1120,15 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer) invertmouse = cv_invertmouse2.value; turnmultiplier = cv_cam2_turnmultiplier.value; mousemove = cv_mousemove2.value; - mx = &mouse2x; - my = &mouse2y; - mly = &mlook2y; + mdx = mouse2.dx; + mdy = -mouse2.dy; + mldy = -mouse2.mlookdy; G_CopyTiccmd(cmd, I_BaseTiccmd2(), 1); // empty, or external driver } + if (menuactive || CON_Ready() || chat_on) + mdx = mdy = mldy = 0; + strafeisturn = controlstyle == CS_SIMPLE && ticcmd_centerviewdown[forplayer] && ((cv_cam_lockedinput[forplayer].value && !ticcmd_ztargetfocus[forplayer]) || (player->pflags & PF_STARTDASH)) && !player->climbing && player->powers[pw_carry] != CR_MINECART; @@ -1152,13 +1144,13 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer) return; } - turnright = PLAYERINPUTDOWN(ssplayer, gc_turnright); - turnleft = PLAYERINPUTDOWN(ssplayer, gc_turnleft); + turnright = PLAYERINPUTDOWN(ssplayer, GC_TURNRIGHT); + turnleft = PLAYERINPUTDOWN(ssplayer, GC_TURNLEFT); - straferkey = PLAYERINPUTDOWN(ssplayer, gc_straferight); - strafelkey = PLAYERINPUTDOWN(ssplayer, gc_strafeleft); - movefkey = PLAYERINPUTDOWN(ssplayer, gc_forward); - movebkey = PLAYERINPUTDOWN(ssplayer, gc_backward); + straferkey = PLAYERINPUTDOWN(ssplayer, GC_STRAFERIGHT); + strafelkey = PLAYERINPUTDOWN(ssplayer, GC_STRAFELEFT); + movefkey = PLAYERINPUTDOWN(ssplayer, GC_FORWARD); + movebkey = PLAYERINPUTDOWN(ssplayer, GC_BACKWARD); if (strafeisturn) { @@ -1167,7 +1159,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer) straferkey = strafelkey = false; } - mouseaiming = (PLAYERINPUTDOWN(ssplayer, gc_mouseaiming)) ^ + mouseaiming = (PLAYERINPUTDOWN(ssplayer, GC_MOUSEAIMING)) ^ ((chasecam && !player->spectator) ? chasefreelook : alwaysfreelook); analogjoystickmove = usejoystick && !Joystick.bGamepadStyle; gamepadjoystickmove = usejoystick && Joystick.bGamepadStyle; @@ -1179,10 +1171,10 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer) *myaiming = 0; joyaiming[forplayer] = thisjoyaiming; - turnaxis = PlayerJoyAxis(ssplayer, AXISTURN); + turnaxis = PlayerJoyAxis(ssplayer, JA_TURN); if (strafeisturn) - turnaxis += PlayerJoyAxis(ssplayer, AXISSTRAFE); - lookaxis = PlayerJoyAxis(ssplayer, AXISLOOK); + turnaxis += PlayerJoyAxis(ssplayer, JA_STRAFE); + lookaxis = PlayerJoyAxis(ssplayer, JA_LOOK); lookjoystickvector.xaxis = turnaxis; lookjoystickvector.yaxis = lookaxis; G_HandleAxisDeadZone(forplayer, &lookjoystickvector); @@ -1261,8 +1253,8 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer) tta_factor[forplayer] = 0; // suspend turn to angle } - strafeaxis = strafeisturn ? 0 : PlayerJoyAxis(ssplayer, AXISSTRAFE); - moveaxis = PlayerJoyAxis(ssplayer, AXISMOVE); + strafeaxis = strafeisturn ? 0 : PlayerJoyAxis(ssplayer, JA_STRAFE); + moveaxis = PlayerJoyAxis(ssplayer, JA_MOVE); movejoystickvector.xaxis = strafeaxis; movejoystickvector.yaxis = moveaxis; G_HandleAxisDeadZone(forplayer, &movejoystickvector); @@ -1283,11 +1275,11 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer) // forward with key or button if (movefkey || (gamepadjoystickmove && movejoystickvector.yaxis < 0) || ((player->powers[pw_carry] == CR_NIGHTSMODE) - && (PLAYERINPUTDOWN(ssplayer, gc_lookup) || (gamepadjoystickmove && lookjoystickvector.yaxis > 0)))) + && (PLAYERINPUTDOWN(ssplayer, GC_LOOKUP) || (gamepadjoystickmove && lookjoystickvector.yaxis > 0)))) forward = forwardmove[speed]; if (movebkey || (gamepadjoystickmove && movejoystickvector.yaxis > 0) || ((player->powers[pw_carry] == CR_NIGHTSMODE) - && (PLAYERINPUTDOWN(ssplayer, gc_lookdown) || (gamepadjoystickmove && lookjoystickvector.yaxis < 0)))) + && (PLAYERINPUTDOWN(ssplayer, GC_LOOKDOWN) || (gamepadjoystickmove && lookjoystickvector.yaxis < 0)))) forward -= forwardmove[speed]; if (analogjoystickmove && movejoystickvector.yaxis != 0) @@ -1300,9 +1292,9 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer) if (strafelkey) side -= sidemove[speed]; - if (PLAYERINPUTDOWN(ssplayer, gc_weaponnext)) + if (PLAYERINPUTDOWN(ssplayer, GC_WEAPONNEXT)) cmd->buttons |= BT_WEAPONNEXT; // Next Weapon - if (PLAYERINPUTDOWN(ssplayer, gc_weaponprev)) + if (PLAYERINPUTDOWN(ssplayer, GC_WEAPONPREV)) cmd->buttons |= BT_WEAPONPREV; // Previous Weapon #if NUM_WEAPONS > 10 @@ -1311,42 +1303,42 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer) //use the four avaliable bits to determine the weapon. cmd->buttons &= ~BT_WEAPONMASK; for (i = 0; i < NUM_WEAPONS; ++i) - if (PLAYERINPUTDOWN(ssplayer, gc_wepslot1 + i)) + if (PLAYERINPUTDOWN(ssplayer, GC_WEPSLOT1 + i)) { cmd->buttons |= (UINT16)(i + 1); break; } // fire with any button/key - axis = PlayerJoyAxis(ssplayer, AXISFIRE); - if (PLAYERINPUTDOWN(ssplayer, gc_fire) || (usejoystick && axis > 0)) + axis = PlayerJoyAxis(ssplayer, JA_FIRE); + if (PLAYERINPUTDOWN(ssplayer, GC_FIRE) || (usejoystick && axis > 0)) cmd->buttons |= BT_ATTACK; // fire normal with any button/key - axis = PlayerJoyAxis(ssplayer, AXISFIRENORMAL); - if (PLAYERINPUTDOWN(ssplayer, gc_firenormal) || (usejoystick && axis > 0)) + axis = PlayerJoyAxis(ssplayer, JA_FIRENORMAL); + if (PLAYERINPUTDOWN(ssplayer, GC_FIRENORMAL) || (usejoystick && axis > 0)) cmd->buttons |= BT_FIRENORMAL; - if (PLAYERINPUTDOWN(ssplayer, gc_tossflag)) + if (PLAYERINPUTDOWN(ssplayer, GC_TOSSFLAG)) cmd->buttons |= BT_TOSSFLAG; // Lua scriptable buttons - if (PLAYERINPUTDOWN(ssplayer, gc_custom1)) + if (PLAYERINPUTDOWN(ssplayer, GC_CUSTOM1)) cmd->buttons |= BT_CUSTOM1; - if (PLAYERINPUTDOWN(ssplayer, gc_custom2)) + if (PLAYERINPUTDOWN(ssplayer, GC_CUSTOM2)) cmd->buttons |= BT_CUSTOM2; - if (PLAYERINPUTDOWN(ssplayer, gc_custom3)) + if (PLAYERINPUTDOWN(ssplayer, GC_CUSTOM3)) cmd->buttons |= BT_CUSTOM3; // use with any button/key - axis = PlayerJoyAxis(ssplayer, AXISSPIN); - if (PLAYERINPUTDOWN(ssplayer, gc_spin) || (usejoystick && axis > 0)) + axis = PlayerJoyAxis(ssplayer, JA_SPIN); + if (PLAYERINPUTDOWN(ssplayer, GC_SPIN) || (usejoystick && axis > 0)) cmd->buttons |= BT_SPIN; // Centerview can be a toggle in simple mode! { static boolean last_centerviewdown[2], centerviewhold[2]; // detect taps for toggle behavior - boolean down = PLAYERINPUTDOWN(ssplayer, gc_centerview); + boolean down = PLAYERINPUTDOWN(ssplayer, GC_CENTERVIEW); if (!(controlstyle == CS_SIMPLE && cv_cam_centertoggle[forplayer].value)) centerviewdown = down; @@ -1393,7 +1385,6 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer) if ( P_MobjWasRemoved(ticcmd_ztargetfocus[forplayer]) || !ticcmd_ztargetfocus[forplayer]->health || - (ticcmd_ztargetfocus[forplayer]->flags2 & MF2_FRET) || (ticcmd_ztargetfocus[forplayer]->type == MT_EGGMOBILE3 && !ticcmd_ztargetfocus[forplayer]->movecount) // Sea Egg is moving around underground and shouldn't be tracked ) P_SetTarget(&ticcmd_ztargetfocus[forplayer], NULL); @@ -1423,7 +1414,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer) newtarget = P_SpawnMobj(ticcmd_ztargetfocus[forplayer]->x, ticcmd_ztargetfocus[forplayer]->y, ticcmd_ztargetfocus[forplayer]->z, MT_LOCKON); // positioning, flip handled in P_SceneryThinker P_SetTarget(&newtarget->target, ticcmd_ztargetfocus[forplayer]); - if (P_AproxDistance( + if (player->mo && P_AproxDistance( player->mo->x - ticcmd_ztargetfocus[forplayer]->x, player->mo->y - ticcmd_ztargetfocus[forplayer]->y ) > 50*player->mo->scale) @@ -1445,7 +1436,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer) if (ticcmd_centerviewdown[forplayer] && controlstyle == CS_SIMPLE) controlstyle = CS_LEGACY; - if (PLAYERINPUTDOWN(ssplayer, gc_camreset)) + if (PLAYERINPUTDOWN(ssplayer, GC_CAMRESET)) { if (thiscam->chase && !resetdown[forplayer]) P_ResetCamera(&players[ssplayer == 1 ? displayplayer : secondarydisplayplayer], thiscam); @@ -1457,8 +1448,8 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer) // jump button - axis = PlayerJoyAxis(ssplayer, AXISJUMP); - if (PLAYERINPUTDOWN(ssplayer, gc_jump) || (usejoystick && axis > 0)) + axis = PlayerJoyAxis(ssplayer, JA_JUMP); + if (PLAYERINPUTDOWN(ssplayer, GC_JUMP) || (usejoystick && axis > 0)) cmd->buttons |= BT_JUMP; // player aiming shit, ahhhh... @@ -1476,7 +1467,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer) keyboard_look[forplayer] = false; // looking up/down - *myaiming += (*mly<<19)*player_invert*screen_invert; + *myaiming += (mldy<<19)*player_invert*screen_invert; } if (analogjoystickmove && joyaiming[forplayer] && lookjoystickvector.yaxis != 0 && configlookaxis != 0) @@ -1488,12 +1479,12 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer) if (!(player->powers[pw_carry] == CR_NIGHTSMODE)) { - if (PLAYERINPUTDOWN(ssplayer, gc_lookup) || (gamepadjoystickmove && lookjoystickvector.yaxis < 0)) + if (PLAYERINPUTDOWN(ssplayer, GC_LOOKUP) || (gamepadjoystickmove && lookjoystickvector.yaxis < 0)) { *myaiming += KB_LOOKSPEED * screen_invert; keyboard_look[forplayer] = true; } - else if (PLAYERINPUTDOWN(ssplayer, gc_lookdown) || (gamepadjoystickmove && lookjoystickvector.yaxis > 0)) + else if (PLAYERINPUTDOWN(ssplayer, GC_LOOKDOWN) || (gamepadjoystickmove && lookjoystickvector.yaxis > 0)) { *myaiming -= KB_LOOKSPEED * screen_invert; keyboard_look[forplayer] = true; @@ -1510,24 +1501,22 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer) } if (!mouseaiming && mousemove) - forward += *my; + forward += mdy; if ((!demoplayback && (player->pflags & PF_SLIDING))) // Analog for mouse - side += *mx*2; + side += mdx*2; else if (controlstyle == CS_LMAOGALOG) { - if (*mx) + if (mdx) { - if (*mx > 0) + if (mdx > 0) cmd->buttons |= BT_CAMRIGHT; else cmd->buttons |= BT_CAMLEFT; } } else - cmd->angleturn = (INT16)(cmd->angleturn - (*mx*8)); - - *mx = *my = *mly = 0; + cmd->angleturn = (INT16)(cmd->angleturn - (mdx*8)); if (forward > MAXPLMOVE) forward = MAXPLMOVE; @@ -1560,21 +1549,16 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer) cmd->forwardmove = (SINT8)(cmd->forwardmove + forward); cmd->sidemove = (SINT8)(cmd->sidemove + side); - if (player->bot == 1) { // Tailsbot for P2 - if (!player->powers[pw_tailsfly] && (cmd->forwardmove || cmd->sidemove || cmd->buttons)) - { - player->bot = 2; // A player-controlled bot. Returns to AI when it respawns. - CV_SetValue(&cv_analog[1], true); - } - else - { - G_CopyTiccmd(cmd, I_BaseTiccmd2(), 1); // empty, or external driver - B_BuildTiccmd(player, cmd); - } - B_HandleFlightIndicator(player); + // Note: Majority of botstuffs are handled in G_Ticker now. + if (player->bot == BOT_2PAI + && !player->powers[pw_tailsfly] + && (cmd->forwardmove || cmd->sidemove || cmd->buttons)) + { + player->bot = BOT_2PHUMAN; // A player-controlled bot. Returns to AI when it respawns. + CV_SetValue(&cv_analog[1], true); } - else if (player->bot == 2) - // Fix offset angle for P2-controlled Tailsbot when P2's controls are set to non-Legacy + + if (player->bot == BOT_2PHUMAN) cmd->angleturn = (INT16)((localangle - *myangle) >> 16); *myangle += (cmd->angleturn<<16); @@ -1687,7 +1671,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer) cmd->angleturn = orighookangle; - LUAh_PlayerCmd(player, cmd); + LUA_HookTiccmd(player, cmd, HOOK(PlayerCmd)); extra = cmd->angleturn - orighookangle; cmd->angleturn = origangle + extra; @@ -1696,7 +1680,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer) // Send leveltime when this tic was generated to the server for control lag calculations. // Only do this when in a level. Also do this after the hook, so that it can't overwrite this. - cmd->latency = (leveltime & 0xFF); + cmd->latency = (leveltime & 0xFF); } //Reset away view if a command is given. @@ -1705,7 +1689,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer) { // Call ViewpointSwitch hooks here. // The viewpoint was forcibly changed. - LUAh_ViewpointSwitch(player, &players[consoleplayer], true); + LUA_HookViewpointSwitch(player, &players[consoleplayer], true); displayplayer = consoleplayer; } @@ -1878,8 +1862,8 @@ void G_DoLoadLevel(boolean resetplayer) joyxmove[i] = joyymove[i] = 0; joy2xmove[i] = joy2ymove[i] = 0; } - mousex = mousey = 0; - mouse2x = mouse2y = 0; + G_SetMouseDeltas(0, 0, 1); + G_SetMouseDeltas(0, 0, 2); // clear hud messages remains (usually from game startup) CON_ClearHUD(); @@ -1922,7 +1906,10 @@ void G_PreLevelTitleCard(void) { // draw loop while (!((nowtime = I_GetTime()) - lasttime)) - I_Sleep(); + { + I_Sleep(cv_sleep.value); + I_UpdateTime(cv_timescale.value); + } lasttime = nowtime; ST_runTitleCard(); @@ -1973,6 +1960,85 @@ INT32 pausedelay = 0; boolean pausebreakkey = false; static INT32 camtoggledelay, camtoggledelay2 = 0; +static boolean ViewpointSwitchResponder(event_t *ev) +{ + // ViewpointSwitch Lua hook. + UINT8 canSwitchView = 0; + + INT32 direction = 0; + if (ev->key == KEY_F12 || ev->key == gamecontrol[GC_VIEWPOINTNEXT][0] || ev->key == gamecontrol[GC_VIEWPOINTNEXT][1]) + direction = 1; + if (ev->key == gamecontrol[GC_VIEWPOINTPREV][0] || ev->key == gamecontrol[GC_VIEWPOINTPREV][1]) + direction = -1; + // This enabled reverse-iterating with shift+F12, sadly I had to + // disable this in case your shift key is bound to a control =(( + //if (shiftdown) + // direction = -direction; + + // allow spy mode changes even during the demo + if (!(gamestate == GS_LEVEL && ev->type == ev_keydown && direction != 0)) + return false; + + if (splitscreen || !netgame) + { + displayplayer = consoleplayer; + return false; + } + + // spy mode + do + { + // Wrap in both directions + displayplayer += direction; + displayplayer = (displayplayer + MAXPLAYERS) % MAXPLAYERS; + + if (!playeringame[displayplayer]) + continue; + + // Call ViewpointSwitch hooks here. + canSwitchView = LUA_HookViewpointSwitch(&players[consoleplayer], &players[displayplayer], false); + if (canSwitchView == 1) // Set viewpoint to this player + break; + else if (canSwitchView == 2) // Skip this player + continue; + + if (players[displayplayer].spectator) + continue; + + if (G_GametypeHasTeams()) + { + if (players[consoleplayer].ctfteam + && players[displayplayer].ctfteam != players[consoleplayer].ctfteam) + continue; + } + else if (gametyperules & GTR_HIDEFROZEN) + { + if (players[consoleplayer].pflags & PF_TAGIT) + continue; + } + // Other Tag-based gametypes? + else if (G_TagGametype()) + { + if (!players[consoleplayer].spectator + && (players[consoleplayer].pflags & PF_TAGIT) != (players[displayplayer].pflags & PF_TAGIT)) + continue; + } + else if (G_GametypeHasSpectators() && G_RingSlingerGametype()) + { + if (!players[consoleplayer].spectator) + continue; + } + + break; + } while (displayplayer != consoleplayer); + + // change statusbar also if playing back demo + if (singledemo) + ST_changeDemoView(); + + return true; +} + // // G_Responder // Get info needed to make ticcmd_ts for the players. @@ -1983,7 +2049,7 @@ boolean G_Responder(event_t *ev) if (gameaction == ga_nothing && !singledemo && ((demoplayback && !modeattacking && !titledemo) || gamestate == GS_TITLESCREEN)) { - if (ev->type == ev_keydown && ev->data1 != 301 && !(gamestate == GS_TITLESCREEN && finalecount < TICRATE)) + if (ev->type == ev_keydown && ev->key != 301 && !(gamestate == GS_TITLESCREEN && finalecount < TICRATE)) { M_StartControlPanel(); return true; @@ -2057,74 +2123,8 @@ boolean G_Responder(event_t *ev) if (HU_Responder(ev)) return true; // chat ate the event - // allow spy mode changes even during the demo - if (gamestate == GS_LEVEL && ev->type == ev_keydown - && (ev->data1 == KEY_F12 || ev->data1 == gamecontrol[gc_viewpoint][0] || ev->data1 == gamecontrol[gc_viewpoint][1])) - { - // ViewpointSwitch Lua hook. - UINT8 canSwitchView = 0; - - if (splitscreen || !netgame) - displayplayer = consoleplayer; - else - { - // spy mode - do - { - displayplayer++; - if (displayplayer == MAXPLAYERS) - displayplayer = 0; - - if (!playeringame[displayplayer]) - continue; - - // Call ViewpointSwitch hooks here. - canSwitchView = LUAh_ViewpointSwitch(&players[consoleplayer], &players[displayplayer], false); - if (canSwitchView == 1) // Set viewpoint to this player - break; - else if (canSwitchView == 2) // Skip this player - continue; - - if (players[displayplayer].spectator) - continue; - - if (G_GametypeHasTeams()) - { - if (players[consoleplayer].ctfteam - && players[displayplayer].ctfteam != players[consoleplayer].ctfteam) - continue; - } - else if (gametyperules & GTR_HIDEFROZEN) - { - if (players[consoleplayer].pflags & PF_TAGIT) - continue; - } - // Other Tag-based gametypes? - else if (G_TagGametype()) - { - if (!players[consoleplayer].spectator - && (players[consoleplayer].pflags & PF_TAGIT) != (players[displayplayer].pflags & PF_TAGIT)) - continue; - } - else if (G_GametypeHasSpectators() && G_RingSlingerGametype()) - { - if (!players[consoleplayer].spectator) - continue; - } - - break; - } while (displayplayer != consoleplayer); - - // change statusbar also if playing back demo - if (singledemo) - ST_changeDemoView(); - - // tell who's the view - CONS_Printf(M_GetText("Viewpoint: %s\n"), player_names[displayplayer]); - - return true; - } - } + if (ViewpointSwitchResponder(ev)) + return true; // update keys current state G_MapEventsToControls(ev); @@ -2132,13 +2132,13 @@ boolean G_Responder(event_t *ev) switch (ev->type) { case ev_keydown: - if (ev->data1 == gamecontrol[gc_pause][0] - || ev->data1 == gamecontrol[gc_pause][1] - || ev->data1 == KEY_PAUSE) + if (ev->key == gamecontrol[GC_PAUSE][0] + || ev->key == gamecontrol[GC_PAUSE][1] + || ev->key == KEY_PAUSE) { if (modeattacking && !demoplayback && (gamestate == GS_LEVEL)) { - pausebreakkey = (ev->data1 == KEY_PAUSE); + pausebreakkey = (ev->key == KEY_PAUSE); if (menuactive || pausedelay < 0 || leveltime < 2) return true; @@ -2163,8 +2163,8 @@ boolean G_Responder(event_t *ev) } } } - if (ev->data1 == gamecontrol[gc_camtoggle][0] - || ev->data1 == gamecontrol[gc_camtoggle][1]) + if (ev->key == gamecontrol[GC_CAMTOGGLE][0] + || ev->key == gamecontrol[GC_CAMTOGGLE][1]) { if (!camtoggledelay) { @@ -2172,8 +2172,8 @@ boolean G_Responder(event_t *ev) CV_SetValue(&cv_chasecam, cv_chasecam.value ? 0 : 1); } } - if (ev->data1 == gamecontrolbis[gc_camtoggle][0] - || ev->data1 == gamecontrolbis[gc_camtoggle][1]) + if (ev->key == gamecontrolbis[GC_CAMTOGGLE][0] + || ev->key == gamecontrolbis[GC_CAMTOGGLE][1]) { if (!camtoggledelay2) { @@ -2203,6 +2203,28 @@ boolean G_Responder(event_t *ev) return false; } +// +// G_LuaResponder +// Let Lua handle key events. +// +boolean G_LuaResponder(event_t *ev) +{ + boolean cancelled = false; + + if (ev->type == ev_keydown) + { + cancelled = LUA_HookKey(ev, HOOK(KeyDown)); + LUA_InvalidateUserdata(ev); + } + else if (ev->type == ev_keyup) + { + cancelled = LUA_HookKey(ev, HOOK(KeyUp)); + LUA_InvalidateUserdata(ev); + } + + return cancelled; +} + // // G_Ticker // Make ticcmd_ts for the players. @@ -2212,6 +2234,23 @@ void G_Ticker(boolean run) UINT32 i; INT32 buf; + // Bot players queued for removal + for (i = MAXPLAYERS-1; i != UINT32_MAX; i--) + { + if (playeringame[i] && players[i].removing) + { + CL_RemovePlayer(i, i); + if (netgame) + { + char kickmsg[256]; + + strcpy(kickmsg, M_GetText("\x82*Bot %s has been removed")); + strcpy(kickmsg, va(kickmsg, player_names[i], i)); + HU_AddChatText(kickmsg, false); + } + } + } + // see also SCR_DisplayMarathonInfo if ((marathonmode & (MA_INIT|MA_INGAME)) == MA_INGAME && gamestate == GS_LEVEL) marathontime++; @@ -2292,30 +2331,44 @@ void G_Ticker(boolean run) buf = gametic % BACKUPTICS; + // Generate ticcmds for bots FIRST, then copy received ticcmds for players. + // This emulates pre-2.2.10 behaviour where the bot referenced their leader's last copied ticcmd, + // which is desirable because P_PlayerThink can override inputs (e.g. while PF_STASIS is applied or in a waterslide), + // and the bot AI needs to respect that. +#define ISHUMAN (players[i].bot == BOT_NONE || players[i].bot == BOT_2PHUMAN) for (i = 0; i < MAXPLAYERS; i++) { - if (playeringame[i]) + if (playeringame[i] && !ISHUMAN) // Less work is required if we're building a bot ticcmd. { - INT16 received; + players[i].lastbuttons = players[i].cmd.buttons; // Save last frame's button readings + B_BuildTiccmd(&players[i], &players[i].cmd); + // Since bot TicCmd is pre-determined for both the client and server, the latency and packet checks are simplified. + players[i].cmd.latency = 0; + P_SetPlayerAngle(&players[i], players[i].cmd.angleturn << 16); + } + } + + for (i = 0; i < MAXPLAYERS; i++) + { + if (playeringame[i] && ISHUMAN) + { + players[i].lastbuttons = players[i].cmd.buttons; // Save last frame's button readings G_CopyTiccmd(&players[i].cmd, &netcmds[buf][i], 1); - received = (players[i].cmd.angleturn & TICCMD_RECEIVED); + // Use the leveltime sent in the player's ticcmd to determine control lag + players[i].cmd.latency = min(((leveltime & 0xFF) - players[i].cmd.latency) & 0xFF, MAXPREDICTTICS-1); + // Do angle adjustments. players[i].angleturn += players[i].cmd.angleturn - players[i].oldrelangleturn; players[i].oldrelangleturn = players[i].cmd.angleturn; if (P_ControlStyle(&players[i]) == CS_LMAOGALOG) P_ForceLocalAngle(&players[i], players[i].angleturn << 16); else - players[i].cmd.angleturn = players[i].angleturn; - - players[i].cmd.angleturn &= ~TICCMD_RECEIVED; - players[i].cmd.angleturn |= received; - - // Use the leveltime sent in the player's ticcmd to determine control lag - players[i].cmd.latency = min(((leveltime & 0xFF) - players[i].cmd.latency) & 0xFF, MAXPREDICTTICS-1); + players[i].cmd.angleturn = (players[i].angleturn & ~TICCMD_RECEIVED) | (players[i].cmd.angleturn & TICCMD_RECEIVED); } } +#undef ISHUMAN // do main actions switch (gamestate) @@ -2328,6 +2381,7 @@ void G_Ticker(boolean run) F_TextPromptTicker(); AM_Ticker(); HU_Ticker(); + break; case GS_INTERMISSION: @@ -2337,7 +2391,8 @@ void G_Ticker(boolean run) break; case GS_TIMEATTACK: - F_MenuPresTicker(run); + if (run) + F_MenuPresTicker(); break; case GS_INTRO: @@ -2380,10 +2435,13 @@ void G_Ticker(boolean run) break; case GS_TITLESCREEN: - if (titlemapinaction) P_Ticker(run); // then intentionally fall through + if (titlemapinaction) + P_Ticker(run); + // then intentionally fall through /* FALLTHRU */ case GS_WAITINGPLAYERS: - F_MenuPresTicker(run); + if (run) + F_MenuPresTicker(); F_TitleScreenTicker(run); break; @@ -2499,6 +2557,7 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps) tic_t quittime; boolean spectator; boolean outofcoop; + boolean removing; INT16 bot; SINT8 pity; INT16 rings; @@ -2515,6 +2574,7 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps) quittime = players[player].quittime; spectator = players[player].spectator; outofcoop = players[player].outofcoop; + removing = players[player].removing; pflags = (players[player].pflags & (PF_FLIPCAM|PF_ANALOGMODE|PF_DIRECTIONCHAR|PF_AUTOBRAKE|PF_TAGIT|PF_GAMETYPEOVER)); playerangleturn = players[player].angleturn; oldrelangleturn = players[player].oldrelangleturn; @@ -2591,6 +2651,7 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps) p->quittime = quittime; p->spectator = spectator; p->outofcoop = outofcoop; + p->removing = removing; p->angleturn = playerangleturn; p->oldrelangleturn = oldrelangleturn; @@ -2635,8 +2696,10 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps) p->totalring = totalring; p->mare = mare; - if (bot) - p->bot = 1; // reset to AI-controlled + if (bot == BOT_2PHUMAN) + p->bot = BOT_2PAI; // reset to AI-controlled + else + p->bot = bot; p->pity = pity; p->rings = rings; p->spheres = spheres; @@ -2753,7 +2816,7 @@ void G_SpawnPlayer(INT32 playernum) P_SpawnPlayer(playernum); G_MovePlayerToSpawnOrStarpost(playernum); - LUAh_PlayerSpawn(&players[playernum]); // Lua hook for player spawning :) + LUA_HookPlayer(&players[playernum], HOOK(PlayerSpawn)); // Lua hook for player spawning :) } void G_MovePlayerToSpawnOrStarpost(INT32 playernum) @@ -2762,6 +2825,16 @@ void G_MovePlayerToSpawnOrStarpost(INT32 playernum) P_MovePlayerToStarpost(playernum); else P_MovePlayerToSpawn(playernum, G_FindMapStart(playernum)); + + R_ResetMobjInterpolationState(players[playernum].mo); + + if (players[playernum].bot) // don't reset the camera for bots + return; + + if (playernum == consoleplayer) + P_ResetCamera(&players[playernum], &camera); + else if (playernum == secondarydisplayplayer) + P_ResetCamera(&players[playernum], &camera2); } mapthing_t *G_FindCTFStart(INT32 playernum) @@ -2982,7 +3055,8 @@ void G_DoReborn(INT32 playernum) // Make sure objectplace is OFF when you first start the level! OP_ResetObjectplace(); - if (player->bot && playernum != consoleplayer) + // Tailsbot + if (player->bot == BOT_2PAI || player->bot == BOT_2PHUMAN) { // Bots respawn next to their master. mobj_t *oldmo = NULL; @@ -3001,6 +3075,28 @@ void G_DoReborn(INT32 playernum) return; } + // Additional players (e.g. independent bots) in Single Player + if (playernum != consoleplayer && !(netgame || multiplayer)) + { + mobj_t *oldmo = NULL; + // Do nothing if out of lives + if (player->lives <= 0) + return; + + // Otherwise do respawn, starting by removing the player object + if (player->mo) + { + oldmo = player->mo; + P_RemoveMobj(player->mo); + } + // Do spawning + G_SpawnPlayer(playernum); + if (oldmo) + G_ChangePlayerReferences(oldmo, players[playernum].mo); + + return; //Exit function to avoid proccing other SP related mechanics + } + if (countdowntimeup || (!(netgame || multiplayer) && (gametyperules & GTR_CAMPAIGN))) resetlevel = true; else if ((G_GametypeUsesCoopLives() || G_GametypeUsesCoopStarposts()) && (netgame || multiplayer) && !G_IsSpecialStage(gamemap)) @@ -3059,6 +3155,9 @@ void G_DoReborn(INT32 playernum) if (resetlevel) { + // Don't give completion emblems for reloading the level... + stagefailed = true; + // reload the level from scratch if (countdowntimeup) { @@ -3103,8 +3202,8 @@ void G_DoReborn(INT32 playernum) joyxmove[i] = joyymove[i] = 0; joy2xmove[i] = joy2ymove[i] = 0; } - mousex = mousey = 0; - mouse2x = mouse2y = 0; + G_SetMouseDeltas(0, 0, 1); + G_SetMouseDeltas(0, 0, 2); // clear hud messages remains (usually from game startup) CON_ClearHUD(); @@ -3132,7 +3231,7 @@ void G_DoReborn(INT32 playernum) } else { - LUAh_MapChange(gamemap); + LUA_HookInt(gamemap, HOOK(MapChange)); titlecardforreload = true; G_DoLoadLevel(true); titlecardforreload = false; @@ -3181,7 +3280,7 @@ void G_AddPlayer(INT32 playernum) if (!playeringame[i]) continue; - if (players[i].bot) // ignore dumb, stupid tails + if (players[i].bot == BOT_2PAI || players[i].bot == BOT_2PHUMAN) // ignore dumb, stupid tails continue; countplayers++; @@ -3728,7 +3827,7 @@ static INT16 RandMap(UINT32 tolflags, INT16 pprevmap) for (ix = 0; ix < NUMMAPS; ix++) if (mapheaderinfo[ix] && (mapheaderinfo[ix]->typeoflevel & tolflags) == tolflags && ix != pprevmap // Don't pick the same map. - && (dedicated || !M_MapLocked(ix+1)) // Don't pick locked maps. + && (dedicated || !M_MapLocked(ix+1, serverGamedata)) // Don't pick locked maps. ) okmaps[numokmaps++] = ix; @@ -3745,41 +3844,52 @@ static INT16 RandMap(UINT32 tolflags, INT16 pprevmap) // // G_UpdateVisited // -static void G_UpdateVisited(void) +static void G_UpdateVisited(gamedata_t *data, boolean silent) { boolean spec = G_IsSpecialStage(gamemap); // Update visitation flags? - if ((!modifiedgame || savemoddata) // Not modified - && !multiplayer && !demoplayback && (gametype == GT_COOP) // SP/RA/NiGHTS mode + if (!demoplayback + && G_CoopGametype() // Campaign mode && !stagefailed) // Did not fail the stage { UINT8 earnedEmblems; // Update visitation flags - mapvisited[gamemap-1] |= MV_BEATEN; + data->mapvisited[gamemap-1] |= MV_BEATEN; + // eh, what the hell if (ultimatemode) - mapvisited[gamemap-1] |= MV_ULTIMATE; + data->mapvisited[gamemap-1] |= MV_ULTIMATE; + // may seem incorrect but IS possible in what the main game uses as mp special stages, and nummaprings will be -1 in NiGHTS if (nummaprings > 0 && players[consoleplayer].rings >= nummaprings) { - mapvisited[gamemap-1] |= MV_PERFECT; + data->mapvisited[gamemap-1] |= MV_PERFECT; if (modeattacking) - mapvisited[gamemap-1] |= MV_PERFECTRA; + data->mapvisited[gamemap-1] |= MV_PERFECTRA; } + if (!spec) { // not available to special stages because they can only really be done in one order in an unmodified game, so impossible for first six and trivial for seventh if (ALL7EMERALDS(emeralds)) - mapvisited[gamemap-1] |= MV_ALLEMERALDS; + data->mapvisited[gamemap-1] |= MV_ALLEMERALDS; } - if (modeattacking == ATTACKING_RECORD) - G_UpdateRecordReplays(); - else if (modeattacking == ATTACKING_NIGHTS) - G_SetNightsRecords(); + if (silent) + { + if (modeattacking) + M_CheckLevelEmblems(data); + } + else + { + if (modeattacking == ATTACKING_RECORD) + G_UpdateRecordReplays(data); + else if (modeattacking == ATTACKING_NIGHTS) + G_SetNightsRecords(data); + } - if ((earnedEmblems = M_CompletionEmblems())) + if ((earnedEmblems = M_CompletionEmblems(data)) && !silent) CONS_Printf(M_GetText("\x82" "Earned %hu emblem%s for level completion.\n"), (UINT16)earnedEmblems, earnedEmblems > 1 ? "s" : ""); } } @@ -3818,14 +3928,18 @@ static void G_HandleSaveLevel(void) remove(liveeventbackup); cursaveslot = 0; } - else if ((!modifiedgame || savemoddata) && !(netgame || multiplayer || ultimatemode || demorecording || metalrecording || modeattacking)) + else if (!usedCheats && !(netgame || multiplayer || ultimatemode || demorecording || metalrecording || modeattacking)) + { G_SaveGame((UINT32)cursaveslot, spstage_start); + } } } // and doing THIS here means you don't lose your progress if you close the game mid-intermission else if (!(ultimatemode || netgame || multiplayer || demoplayback || demorecording || metalrecording || modeattacking) - && (!modifiedgame || savemoddata) && cursaveslot > 0 && CanSaveLevel(lastmap+1)) + && !usedCheats && cursaveslot > 0 && CanSaveLevel(lastmap+1)) + { G_SaveGame((UINT32)cursaveslot, lastmap+1); // not nextmap+1 to route around special stages + } } // @@ -3848,6 +3962,9 @@ static void G_DoCompleted(void) if (metalrecording) G_StopMetalRecording(false); + G_SetGamestate(GS_NULL); + wipegamestate = GS_NULL; + for (i = 0; i < MAXPLAYERS; i++) if (playeringame[i]) G_PlayerFinishLevel(i); // take away cards and stuff @@ -3975,7 +4092,8 @@ static void G_DoCompleted(void) if ((skipstats && !modeattacking) || (modeattacking && stagefailed) || (intertype == int_none)) { - G_UpdateVisited(); + G_UpdateVisited(serverGamedata, true); + G_UpdateVisited(clientGamedata, false); G_HandleSaveLevel(); G_AfterIntermission(); } @@ -3984,7 +4102,8 @@ static void G_DoCompleted(void) G_SetGamestate(GS_INTERMISSION); Y_StartIntermission(); Y_LoadIntermissionData(); - G_UpdateVisited(); + G_UpdateVisited(serverGamedata, true); + G_UpdateVisited(clientGamedata, false); G_HandleSaveLevel(); } } @@ -4012,7 +4131,7 @@ void G_AfterIntermission(void) && stagefailed == false) { // Start a custom cutscene. - F_StartCustomCutscene(mapheaderinfo[gamemap-1]->cutscenenum-1, false, false); + F_StartCustomCutscene(mapheaderinfo[gamemap-1]->cutscenenum-1, false, false, false); } else { @@ -4098,8 +4217,10 @@ static void G_DoContinued(void) tokenlist = 0; token = 0; - if (!(netgame || multiplayer || demoplayback || demorecording || metalrecording || modeattacking) && (!modifiedgame || savemoddata) && cursaveslot > 0) + if (!(netgame || multiplayer || demoplayback || demorecording || metalrecording || modeattacking) && !usedCheats && cursaveslot > 0) + { G_SaveGameOver((UINT32)cursaveslot, true); + } // Reset # of lives pl->lives = (ultimatemode) ? 1 : startinglivesbalance[numgameovers]; @@ -4164,13 +4285,17 @@ void G_LoadGameSettings(void) S_InitRuntimeSounds(); } +#define GAMEDATA_ID 0x86E4A27C // Change every major version, as usual +#define COMPAT_GAMEDATA_ID 0xFCAFE211 // Can be removed entirely for 2.3 + // G_LoadGameData // Loads the main data file, which stores information such as emblems found, etc. -void G_LoadGameData(void) +void G_LoadGameData(gamedata_t *data) { size_t length; INT32 i, j; - UINT8 modded = false; + + UINT32 versionID; UINT8 rtemp; //For records @@ -4181,34 +4306,45 @@ void G_LoadGameData(void) UINT8 recmares; INT32 curmare; + // Stop saving, until we successfully load it again. + data->loaded = false; + // Clear things so previously read gamedata doesn't transfer // to new gamedata - G_ClearRecords(); // main and nights records - M_ClearSecrets(); // emblems, unlocks, maps visited, etc - totalplaytime = 0; // total play time (separate from all) + G_ClearRecords(data); // main and nights records + M_ClearSecrets(data); // emblems, unlocks, maps visited, etc + data->totalplaytime = 0; // total play time (separate from all) if (M_CheckParm("-nodata")) - return; // Don't load. - - // Allow saving of gamedata beyond this point - gamedataloaded = true; - - if (M_CheckParm("-gamedata") && M_IsNextParm()) { - strlcpy(gamedatafilename, M_GetNextParm(), sizeof gamedatafilename); + // Don't load at all. + return; } if (M_CheckParm("-resetdata")) - return; // Don't load (essentially, reset). + { + // Don't load, but do save. (essentially, reset) + data->loaded = true; + return; + } length = FIL_ReadFile(va(pandf, srb2home, gamedatafilename), &savebuffer); - if (!length) // Aw, no game data. Their loss! + if (!length) + { + // No gamedata. We can save a new one. + data->loaded = true; return; + } save_p = savebuffer; // Version check - if (READUINT32(save_p) != 0xFCAFE211) + versionID = READUINT32(save_p); + if (versionID != GAMEDATA_ID +#ifdef COMPAT_GAMEDATA_ID // backwards compat behavior + && versionID != COMPAT_GAMEDATA_ID +#endif + ) { const char *gdfolder = "the SRB2 folder"; if (strcmp(srb2home,".")) @@ -4219,19 +4355,41 @@ void G_LoadGameData(void) I_Error("Game data is from another version of SRB2.\nDelete %s(maybe in %s) and try again.", gamedatafilename, gdfolder); } - totalplaytime = READUINT32(save_p); + data->totalplaytime = READUINT32(save_p); - modded = READUINT8(save_p); +#ifdef COMPAT_GAMEDATA_ID + if (versionID == COMPAT_GAMEDATA_ID) + { + // We'll temporarily use the old condition when loading an older file. + // The proper mod-specific hash will get saved in afterwards. + boolean modded = READUINT8(save_p); - // Aha! Someone's been screwing with the save file! - if ((modded && !savemoddata)) - goto datacorrupt; - else if (modded != true && modded != false) - goto datacorrupt; + if (modded && !savemoddata) + { + goto datacorrupt; + } + else if (modded != true && modded != false) + { + goto datacorrupt; + } + } + else +#endif + { + // Quick & dirty hash for what mod this save file is for. + UINT32 modID = READUINT32(save_p); + UINT32 expectedID = quickncasehash(timeattackfolder, sizeof timeattackfolder); + + if (modID != expectedID) + { + // Aha! Someone's been screwing with the save file! + goto datacorrupt; + } + } // TODO put another cipher on these things? meh, I don't care... for (i = 0; i < NUMMAPS; i++) - if ((mapvisited[i] = READUINT8(save_p)) > MV_MAX) + if ((data->mapvisited[i] = READUINT8(save_p)) > MV_MAX) goto datacorrupt; // To save space, use one bit per collected/achieved/unlocked flag @@ -4239,34 +4397,34 @@ void G_LoadGameData(void) { rtemp = READUINT8(save_p); for (j = 0; j < 8 && j+i < MAXEMBLEMS; ++j) - emblemlocations[j+i].collected = ((rtemp >> j) & 1); + data->collected[j+i] = ((rtemp >> j) & 1); i += j; } for (i = 0; i < MAXEXTRAEMBLEMS;) { rtemp = READUINT8(save_p); for (j = 0; j < 8 && j+i < MAXEXTRAEMBLEMS; ++j) - extraemblems[j+i].collected = ((rtemp >> j) & 1); + data->extraCollected[j+i] = ((rtemp >> j) & 1); i += j; } for (i = 0; i < MAXUNLOCKABLES;) { rtemp = READUINT8(save_p); for (j = 0; j < 8 && j+i < MAXUNLOCKABLES; ++j) - unlockables[j+i].unlocked = ((rtemp >> j) & 1); + data->unlocked[j+i] = ((rtemp >> j) & 1); i += j; } for (i = 0; i < MAXCONDITIONSETS;) { rtemp = READUINT8(save_p); for (j = 0; j < 8 && j+i < MAXCONDITIONSETS; ++j) - conditionSets[j+i].achieved = ((rtemp >> j) & 1); + data->achieved[j+i] = ((rtemp >> j) & 1); i += j; } - timesBeaten = READUINT32(save_p); - timesBeatenWithEmeralds = READUINT32(save_p); - timesBeatenUltimate = READUINT32(save_p); + data->timesBeaten = READUINT32(save_p); + data->timesBeatenWithEmeralds = READUINT32(save_p); + data->timesBeatenUltimate = READUINT32(save_p); // Main records for (i = 0; i < NUMMAPS; ++i) @@ -4281,10 +4439,10 @@ void G_LoadGameData(void) if (recscore || rectime || recrings) { - G_AllocMainRecordData((INT16)i); - mainrecords[i]->score = recscore; - mainrecords[i]->time = rectime; - mainrecords[i]->rings = recrings; + G_AllocMainRecordData((INT16)i, data); + data->mainrecords[i]->score = recscore; + data->mainrecords[i]->time = rectime; + data->mainrecords[i]->rings = recrings; } } @@ -4294,27 +4452,36 @@ void G_LoadGameData(void) if ((recmares = READUINT8(save_p)) == 0) continue; - G_AllocNightsRecordData((INT16)i); + G_AllocNightsRecordData((INT16)i, data); for (curmare = 0; curmare < (recmares+1); ++curmare) { - nightsrecords[i]->score[curmare] = READUINT32(save_p); - nightsrecords[i]->grade[curmare] = READUINT8(save_p); - nightsrecords[i]->time[curmare] = (tic_t)READUINT32(save_p); + data->nightsrecords[i]->score[curmare] = READUINT32(save_p); + data->nightsrecords[i]->grade[curmare] = READUINT8(save_p); + data->nightsrecords[i]->time[curmare] = (tic_t)READUINT32(save_p); - if (nightsrecords[i]->grade[curmare] > GRADE_S) + if (data->nightsrecords[i]->grade[curmare] > GRADE_S) + { goto datacorrupt; + } } - nightsrecords[i]->nummares = recmares; + data->nightsrecords[i]->nummares = recmares; } // done Z_Free(savebuffer); save_p = NULL; + // Don't consider loaded until it's a success! + // It used to do this much earlier, but this would cause the gamedata to + // save over itself when it I_Errors from the corruption landing point below, + // which can accidentally delete players' legitimate data if the code ever has any tiny mistakes! + data->loaded = true; + // Silent update unlockables in case they're out of sync with conditions - M_SilentUpdateUnlockablesAndEmblems(); + M_SilentUpdateUnlockablesAndEmblems(data); + M_SilentUpdateSkinAvailabilites(); return; @@ -4334,7 +4501,7 @@ void G_LoadGameData(void) // G_SaveGameData // Saves the main data file, which stores information such as emblems found, etc. -void G_SaveGameData(void) +void G_SaveGameData(gamedata_t *data) { size_t length; INT32 i, j; @@ -4342,7 +4509,7 @@ void G_SaveGameData(void) INT32 curmare; - if (!gamedataloaded) + if (!data->loaded) return; // If never loaded (-nodata), don't save save_p = savebuffer = (UINT8 *)malloc(GAMEDATASIZE); @@ -4352,7 +4519,7 @@ void G_SaveGameData(void) return; } - if (modifiedgame && !savemoddata) + if (usedCheats) { free(savebuffer); save_p = savebuffer = NULL; @@ -4360,23 +4527,22 @@ void G_SaveGameData(void) } // Version test - WRITEUINT32(save_p, 0xFCAFE211); + WRITEUINT32(save_p, GAMEDATA_ID); - WRITEUINT32(save_p, totalplaytime); + WRITEUINT32(save_p, data->totalplaytime); - btemp = (UINT8)(savemoddata || modifiedgame); - WRITEUINT8(save_p, btemp); + WRITEUINT32(save_p, quickncasehash(timeattackfolder, sizeof timeattackfolder)); // TODO put another cipher on these things? meh, I don't care... for (i = 0; i < NUMMAPS; i++) - WRITEUINT8(save_p, (mapvisited[i] & MV_MAX)); + WRITEUINT8(save_p, (data->mapvisited[i] & MV_MAX)); // To save space, use one bit per collected/achieved/unlocked flag for (i = 0; i < MAXEMBLEMS;) { btemp = 0; for (j = 0; j < 8 && j+i < MAXEMBLEMS; ++j) - btemp |= (emblemlocations[j+i].collected << j); + btemp |= (data->collected[j+i] << j); WRITEUINT8(save_p, btemp); i += j; } @@ -4384,7 +4550,7 @@ void G_SaveGameData(void) { btemp = 0; for (j = 0; j < 8 && j+i < MAXEXTRAEMBLEMS; ++j) - btemp |= (extraemblems[j+i].collected << j); + btemp |= (data->extraCollected[j+i] << j); WRITEUINT8(save_p, btemp); i += j; } @@ -4392,7 +4558,7 @@ void G_SaveGameData(void) { btemp = 0; for (j = 0; j < 8 && j+i < MAXUNLOCKABLES; ++j) - btemp |= (unlockables[j+i].unlocked << j); + btemp |= (data->unlocked[j+i] << j); WRITEUINT8(save_p, btemp); i += j; } @@ -4400,23 +4566,23 @@ void G_SaveGameData(void) { btemp = 0; for (j = 0; j < 8 && j+i < MAXCONDITIONSETS; ++j) - btemp |= (conditionSets[j+i].achieved << j); + btemp |= (data->achieved[j+i] << j); WRITEUINT8(save_p, btemp); i += j; } - WRITEUINT32(save_p, timesBeaten); - WRITEUINT32(save_p, timesBeatenWithEmeralds); - WRITEUINT32(save_p, timesBeatenUltimate); + WRITEUINT32(save_p, data->timesBeaten); + WRITEUINT32(save_p, data->timesBeatenWithEmeralds); + WRITEUINT32(save_p, data->timesBeatenUltimate); // Main records for (i = 0; i < NUMMAPS; i++) { - if (mainrecords[i]) + if (data->mainrecords[i]) { - WRITEUINT32(save_p, mainrecords[i]->score); - WRITEUINT32(save_p, mainrecords[i]->time); - WRITEUINT16(save_p, mainrecords[i]->rings); + WRITEUINT32(save_p, data->mainrecords[i]->score); + WRITEUINT32(save_p, data->mainrecords[i]->time); + WRITEUINT16(save_p, data->mainrecords[i]->rings); } else { @@ -4430,19 +4596,19 @@ void G_SaveGameData(void) // NiGHTS records for (i = 0; i < NUMMAPS; i++) { - if (!nightsrecords[i] || !nightsrecords[i]->nummares) + if (!data->nightsrecords[i] || !data->nightsrecords[i]->nummares) { WRITEUINT8(save_p, 0); continue; } - WRITEUINT8(save_p, nightsrecords[i]->nummares); + WRITEUINT8(save_p, data->nightsrecords[i]->nummares); - for (curmare = 0; curmare < (nightsrecords[i]->nummares + 1); ++curmare) + for (curmare = 0; curmare < (data->nightsrecords[i]->nummares + 1); ++curmare) { - WRITEUINT32(save_p, nightsrecords[i]->score[curmare]); - WRITEUINT8(save_p, nightsrecords[i]->grade[curmare]); - WRITEUINT32(save_p, nightsrecords[i]->time[curmare]); + WRITEUINT32(save_p, data->nightsrecords[i]->score[curmare]); + WRITEUINT8(save_p, data->nightsrecords[i]->grade[curmare]); + WRITEUINT32(save_p, data->nightsrecords[i]->time[curmare]); } } @@ -4862,7 +5028,7 @@ void G_InitNew(UINT8 pultmode, const char *mapname, boolean resetplayer, boolean imcontinuing = false; if ((gametyperules & GTR_CUTSCENES) && !skipprecutscene && mapheaderinfo[gamemap-1]->precutscenenum && !modeattacking && !(marathonmode & MA_NOCUTSCENES)) // Start a custom cutscene. - F_StartCustomCutscene(mapheaderinfo[gamemap-1]->precutscenenum-1, true, resetplayer); + F_StartCustomCutscene(mapheaderinfo[gamemap-1]->precutscenenum-1, true, resetplayer, FLS); else G_DoLoadLevel(resetplayer); @@ -5245,4 +5411,3 @@ INT32 G_TicsToMilliseconds(tic_t tics) { return (INT32)((tics%TICRATE) * (1000.00f/TICRATE)); } - diff --git a/src/g_game.h b/src/g_game.h index 98336ad44..6cda7ca9c 100644 --- a/src/g_game.h +++ b/src/g_game.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -19,6 +19,7 @@ #include "d_event.h" #include "g_demo.h" #include "m_cheat.h" // objectplacing +#include "m_cond.h" extern char gamedatafilename[64]; extern char timeattackfolder[64]; @@ -85,6 +86,25 @@ typedef enum } lockassist_e; +typedef enum +{ + JA_NONE = 0, + JA_TURN, + JA_MOVE, + JA_LOOK, + JA_STRAFE, + + JA_DIGITAL, // axes henceforth use digital deadzone + + JA_JUMP = JA_DIGITAL, + JA_SPIN, + JA_FIRE, + JA_FIRENORMAL, +} joyaxis_e; + +INT32 JoyAxis(joyaxis_e axissel); +INT32 Joy2Axis(joyaxis_e axissel); + // mouseaiming (looking up/down with the mouse or keyboard) #define KB_LOOKSPEED (1<<25) #define MAXPLMOVE (50) @@ -164,7 +184,7 @@ boolean G_IsTitleCardAvailable(void); // Can be called by the startup code or M_Responder, calls P_SetupLevel. void G_LoadGame(UINT32 slot, INT16 mapoverride); -void G_SaveGameData(void); +void G_SaveGameData(gamedata_t *data); void G_SaveGame(UINT32 slot, INT16 mapnum); @@ -204,6 +224,7 @@ void G_EndGame(void); // moved from y_inter.c/h and renamed void G_Ticker(boolean run); boolean G_Responder(event_t *ev); +boolean G_LuaResponder(event_t *ev); void G_AddPlayer(INT32 playernum); @@ -219,27 +240,28 @@ void G_SetModeAttackRetryFlag(void); void G_ClearModeAttackRetryFlag(void); boolean G_GetModeAttackRetryFlag(void); -void G_LoadGameData(void); +void G_LoadGameData(gamedata_t *data); void G_LoadGameSettings(void); void G_SetGameModified(boolean silent); +void G_SetUsedCheats(boolean silent); void G_SetGamestate(gamestate_t newstate); // Gamedata record shit -void G_AllocMainRecordData(INT16 i); -void G_AllocNightsRecordData(INT16 i); -void G_ClearRecords(void); +void G_AllocMainRecordData(INT16 i, gamedata_t *data); +void G_AllocNightsRecordData(INT16 i, gamedata_t *data); +void G_ClearRecords(gamedata_t *data); -UINT32 G_GetBestScore(INT16 map); -tic_t G_GetBestTime(INT16 map); -UINT16 G_GetBestRings(INT16 map); -UINT32 G_GetBestNightsScore(INT16 map, UINT8 mare); -tic_t G_GetBestNightsTime(INT16 map, UINT8 mare); -UINT8 G_GetBestNightsGrade(INT16 map, UINT8 mare); +UINT32 G_GetBestScore(INT16 map, gamedata_t *data); +tic_t G_GetBestTime(INT16 map, gamedata_t *data); +UINT16 G_GetBestRings(INT16 map, gamedata_t *data); +UINT32 G_GetBestNightsScore(INT16 map, UINT8 mare, gamedata_t *data); +tic_t G_GetBestNightsTime(INT16 map, UINT8 mare, gamedata_t *data); +UINT8 G_GetBestNightsGrade(INT16 map, UINT8 mare, gamedata_t *data); void G_AddTempNightsRecords(UINT32 pscore, tic_t ptime, UINT8 mare); -void G_SetNightsRecords(void); +void G_SetNightsRecords(gamedata_t *data); FUNCMATH INT32 G_TicsToHours(tic_t tics); FUNCMATH INT32 G_TicsToMinutes(tic_t tics, boolean full); diff --git a/src/g_input.c b/src/g_input.c index 357081e1d..826dcecbd 100644 --- a/src/g_input.c +++ b/src/g_input.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -31,10 +31,8 @@ consvar_t cv_mouseysens = CVAR_INIT ("mouseysens", "20", CV_SAVE, mousesens_cons consvar_t cv_mouseysens2 = CVAR_INIT ("mouseysens2", "20", CV_SAVE, mousesens_cons_t, NULL); consvar_t cv_controlperkey = CVAR_INIT ("controlperkey", "One", CV_SAVE, onecontrolperkey_cons_t, NULL); -INT32 mousex, mousey; -INT32 mlooky; // like mousey but with a custom sensitivity for mlook - -INT32 mouse2x, mouse2y, mlook2y; +mouse_t mouse; +mouse_t mouse2; // joystick values are repeated INT32 joyxmove[JOYAXISSET], joyymove[JOYAXISSET], joy2xmove[JOYAXISSET], joy2ymove[JOYAXISSET]; @@ -43,49 +41,49 @@ INT32 joyxmove[JOYAXISSET], joyymove[JOYAXISSET], joy2xmove[JOYAXISSET], joy2ymo UINT8 gamekeydown[NUMINPUTS]; // two key codes (or virtual key) per game control -INT32 gamecontrol[num_gamecontrols][2]; -INT32 gamecontrolbis[num_gamecontrols][2]; // secondary splitscreen player -INT32 gamecontroldefault[num_gamecontrolschemes][num_gamecontrols][2]; // default control storage, use 0 (gcs_custom) for memory retention -INT32 gamecontrolbisdefault[num_gamecontrolschemes][num_gamecontrols][2]; +INT32 gamecontrol[NUM_GAMECONTROLS][2]; +INT32 gamecontrolbis[NUM_GAMECONTROLS][2]; // secondary splitscreen player +INT32 gamecontroldefault[num_gamecontrolschemes][NUM_GAMECONTROLS][2]; // default control storage, use 0 (gcs_custom) for memory retention +INT32 gamecontrolbisdefault[num_gamecontrolschemes][NUM_GAMECONTROLS][2]; // lists of GC codes for selective operation const INT32 gcl_tutorial_check[num_gcl_tutorial_check] = { - gc_forward, gc_backward, gc_strafeleft, gc_straferight, - gc_turnleft, gc_turnright + GC_FORWARD, GC_BACKWARD, GC_STRAFELEFT, GC_STRAFERIGHT, + GC_TURNLEFT, GC_TURNRIGHT }; const INT32 gcl_tutorial_used[num_gcl_tutorial_used] = { - gc_forward, gc_backward, gc_strafeleft, gc_straferight, - gc_turnleft, gc_turnright, - gc_jump, gc_spin + GC_FORWARD, GC_BACKWARD, GC_STRAFELEFT, GC_STRAFERIGHT, + GC_TURNLEFT, GC_TURNRIGHT, + GC_JUMP, GC_SPIN }; const INT32 gcl_tutorial_full[num_gcl_tutorial_full] = { - gc_forward, gc_backward, gc_strafeleft, gc_straferight, - gc_lookup, gc_lookdown, gc_turnleft, gc_turnright, gc_centerview, - gc_jump, gc_spin, - gc_fire, gc_firenormal + GC_FORWARD, GC_BACKWARD, GC_STRAFELEFT, GC_STRAFERIGHT, + GC_LOOKUP, GC_LOOKDOWN, GC_TURNLEFT, GC_TURNRIGHT, GC_CENTERVIEW, + GC_JUMP, GC_SPIN, + GC_FIRE, GC_FIRENORMAL }; const INT32 gcl_movement[num_gcl_movement] = { - gc_forward, gc_backward, gc_strafeleft, gc_straferight + GC_FORWARD, GC_BACKWARD, GC_STRAFELEFT, GC_STRAFERIGHT }; const INT32 gcl_camera[num_gcl_camera] = { - gc_turnleft, gc_turnright + GC_TURNLEFT, GC_TURNRIGHT }; const INT32 gcl_movement_camera[num_gcl_movement_camera] = { - gc_forward, gc_backward, gc_strafeleft, gc_straferight, - gc_turnleft, gc_turnright + GC_FORWARD, GC_BACKWARD, GC_STRAFELEFT, GC_STRAFERIGHT, + GC_TURNLEFT, GC_TURNRIGHT }; -const INT32 gcl_jump[num_gcl_jump] = { gc_jump }; +const INT32 gcl_jump[num_gcl_jump] = { GC_JUMP }; -const INT32 gcl_spin[num_gcl_spin] = { gc_spin }; +const INT32 gcl_spin[num_gcl_spin] = { GC_SPIN }; const INT32 gcl_jump_spin[num_gcl_jump_spin] = { - gc_jump, gc_spin + GC_JUMP, GC_SPIN }; typedef struct @@ -117,58 +115,54 @@ void G_MapEventsToControls(event_t *ev) switch (ev->type) { case ev_keydown: - if (ev->data1 < NUMINPUTS) - gamekeydown[ev->data1] = 1; + if (ev->key < NUMINPUTS) + gamekeydown[ev->key] = 1; #ifdef PARANOIA else { - CONS_Debug(DBG_GAMELOGIC, "Bad downkey input %d\n",ev->data1); + CONS_Debug(DBG_GAMELOGIC, "Bad downkey input %d\n",ev->key); } #endif break; case ev_keyup: - if (ev->data1 < NUMINPUTS) - gamekeydown[ev->data1] = 0; + if (ev->key < NUMINPUTS) + gamekeydown[ev->key] = 0; #ifdef PARANOIA else { - CONS_Debug(DBG_GAMELOGIC, "Bad upkey input %d\n",ev->data1); + CONS_Debug(DBG_GAMELOGIC, "Bad upkey input %d\n",ev->key); } #endif break; case ev_mouse: // buttons are virtual keys - if (menuactive || CON_Ready() || chat_on) - break; - mousex = (INT32)(ev->data2*((cv_mousesens.value*cv_mousesens.value)/110.0f + 0.1f)); - mousey = (INT32)(ev->data3*((cv_mousesens.value*cv_mousesens.value)/110.0f + 0.1f)); - mlooky = (INT32)(ev->data3*((cv_mouseysens.value*cv_mousesens.value)/110.0f + 0.1f)); + mouse.rdx = ev->x; + mouse.rdy = ev->y; break; case ev_joystick: // buttons are virtual keys - i = ev->data1; + i = ev->key; if (i >= JOYAXISSET || menuactive || CON_Ready() || chat_on) break; - if (ev->data2 != INT32_MAX) joyxmove[i] = ev->data2; - if (ev->data3 != INT32_MAX) joyymove[i] = ev->data3; + if (ev->x != INT32_MAX) joyxmove[i] = ev->x; + if (ev->y != INT32_MAX) joyymove[i] = ev->y; break; case ev_joystick2: // buttons are virtual keys - i = ev->data1; + i = ev->key; if (i >= JOYAXISSET || menuactive || CON_Ready() || chat_on) break; - if (ev->data2 != INT32_MAX) joy2xmove[i] = ev->data2; - if (ev->data3 != INT32_MAX) joy2ymove[i] = ev->data3; + if (ev->x != INT32_MAX) joy2xmove[i] = ev->x; + if (ev->y != INT32_MAX) joy2ymove[i] = ev->y; break; case ev_mouse2: // buttons are virtual keys if (menuactive || CON_Ready() || chat_on) break; - mouse2x = (INT32)(ev->data2*((cv_mousesens2.value*cv_mousesens2.value)/110.0f + 0.1f)); - mouse2y = (INT32)(ev->data3*((cv_mousesens2.value*cv_mousesens2.value)/110.0f + 0.1f)); - mlook2y = (INT32)(ev->data3*((cv_mouseysens2.value*cv_mousesens2.value)/110.0f + 0.1f)); + mouse2.rdx = ev->x; + mouse2.rdy = ev->y; break; default: @@ -239,329 +233,329 @@ typedef struct static keyname_t keynames[] = { - {KEY_SPACE, "SPACE"}, - {KEY_CAPSLOCK, "CAPS LOCK"}, - {KEY_ENTER, "ENTER"}, - {KEY_TAB, "TAB"}, - {KEY_ESCAPE, "ESCAPE"}, - {KEY_BACKSPACE, "BACKSPACE"}, + {KEY_SPACE, "space"}, + {KEY_CAPSLOCK, "caps lock"}, + {KEY_ENTER, "enter"}, + {KEY_TAB, "tab"}, + {KEY_ESCAPE, "escape"}, + {KEY_BACKSPACE, "backspace"}, - {KEY_NUMLOCK, "NUMLOCK"}, - {KEY_SCROLLLOCK, "SCROLLLOCK"}, + {KEY_NUMLOCK, "numlock"}, + {KEY_SCROLLLOCK, "scrolllock"}, // bill gates keys - {KEY_LEFTWIN, "LEFTWIN"}, - {KEY_RIGHTWIN, "RIGHTWIN"}, - {KEY_MENU, "MENU"}, + {KEY_LEFTWIN, "leftwin"}, + {KEY_RIGHTWIN, "rightwin"}, + {KEY_MENU, "menu"}, - {KEY_LSHIFT, "LSHIFT"}, - {KEY_RSHIFT, "RSHIFT"}, - {KEY_LSHIFT, "SHIFT"}, - {KEY_LCTRL, "LCTRL"}, - {KEY_RCTRL, "RCTRL"}, - {KEY_LCTRL, "CTRL"}, - {KEY_LALT, "LALT"}, - {KEY_RALT, "RALT"}, - {KEY_LALT, "ALT"}, + {KEY_LSHIFT, "lshift"}, + {KEY_RSHIFT, "rshift"}, + {KEY_LSHIFT, "shift"}, + {KEY_LCTRL, "lctrl"}, + {KEY_RCTRL, "rctrl"}, + {KEY_LCTRL, "ctrl"}, + {KEY_LALT, "lalt"}, + {KEY_RALT, "ralt"}, + {KEY_LALT, "alt"}, // keypad keys - {KEY_KPADSLASH, "KEYPAD /"}, - {KEY_KEYPAD7, "KEYPAD 7"}, - {KEY_KEYPAD8, "KEYPAD 8"}, - {KEY_KEYPAD9, "KEYPAD 9"}, - {KEY_MINUSPAD, "KEYPAD -"}, - {KEY_KEYPAD4, "KEYPAD 4"}, - {KEY_KEYPAD5, "KEYPAD 5"}, - {KEY_KEYPAD6, "KEYPAD 6"}, - {KEY_PLUSPAD, "KEYPAD +"}, - {KEY_KEYPAD1, "KEYPAD 1"}, - {KEY_KEYPAD2, "KEYPAD 2"}, - {KEY_KEYPAD3, "KEYPAD 3"}, - {KEY_KEYPAD0, "KEYPAD 0"}, - {KEY_KPADDEL, "KEYPAD ."}, + {KEY_KPADSLASH, "keypad /"}, + {KEY_KEYPAD7, "keypad 7"}, + {KEY_KEYPAD8, "keypad 8"}, + {KEY_KEYPAD9, "keypad 9"}, + {KEY_MINUSPAD, "keypad -"}, + {KEY_KEYPAD4, "keypad 4"}, + {KEY_KEYPAD5, "keypad 5"}, + {KEY_KEYPAD6, "keypad 6"}, + {KEY_PLUSPAD, "keypad +"}, + {KEY_KEYPAD1, "keypad 1"}, + {KEY_KEYPAD2, "keypad 2"}, + {KEY_KEYPAD3, "keypad 3"}, + {KEY_KEYPAD0, "keypad 0"}, + {KEY_KPADDEL, "keypad ."}, // extended keys (not keypad) - {KEY_HOME, "HOME"}, - {KEY_UPARROW, "UP ARROW"}, - {KEY_PGUP, "PGUP"}, - {KEY_LEFTARROW, "LEFT ARROW"}, - {KEY_RIGHTARROW, "RIGHT ARROW"}, - {KEY_END, "END"}, - {KEY_DOWNARROW, "DOWN ARROW"}, - {KEY_PGDN, "PGDN"}, - {KEY_INS, "INS"}, - {KEY_DEL, "DEL"}, + {KEY_HOME, "home"}, + {KEY_UPARROW, "up arrow"}, + {KEY_PGUP, "pgup"}, + {KEY_LEFTARROW, "left arrow"}, + {KEY_RIGHTARROW, "right arrow"}, + {KEY_END, "end"}, + {KEY_DOWNARROW, "down arrow"}, + {KEY_PGDN, "pgdn"}, + {KEY_INS, "ins"}, + {KEY_DEL, "del"}, // other keys - {KEY_F1, "F1"}, - {KEY_F2, "F2"}, - {KEY_F3, "F3"}, - {KEY_F4, "F4"}, - {KEY_F5, "F5"}, - {KEY_F6, "F6"}, - {KEY_F7, "F7"}, - {KEY_F8, "F8"}, - {KEY_F9, "F9"}, - {KEY_F10, "F10"}, - {KEY_F11, "F11"}, - {KEY_F12, "F12"}, + {KEY_F1, "f1"}, + {KEY_F2, "f2"}, + {KEY_F3, "f3"}, + {KEY_F4, "f4"}, + {KEY_F5, "f5"}, + {KEY_F6, "f6"}, + {KEY_F7, "f7"}, + {KEY_F8, "f8"}, + {KEY_F9, "f9"}, + {KEY_F10, "f10"}, + {KEY_F11, "f11"}, + {KEY_F12, "f12"}, // KEY_CONSOLE has an exception in the keyname code {'`', "TILDE"}, - {KEY_PAUSE, "PAUSE/BREAK"}, + {KEY_PAUSE, "pause/break"}, // virtual keys for mouse buttons and joystick buttons - {KEY_MOUSE1+0,"MOUSE1"}, - {KEY_MOUSE1+1,"MOUSE2"}, - {KEY_MOUSE1+2,"MOUSE3"}, - {KEY_MOUSE1+3,"MOUSE4"}, - {KEY_MOUSE1+4,"MOUSE5"}, - {KEY_MOUSE1+5,"MOUSE6"}, - {KEY_MOUSE1+6,"MOUSE7"}, - {KEY_MOUSE1+7,"MOUSE8"}, - {KEY_2MOUSE1+0,"SEC_MOUSE2"}, // BP: sorry my mouse handler swap button 1 and 2 - {KEY_2MOUSE1+1,"SEC_MOUSE1"}, - {KEY_2MOUSE1+2,"SEC_MOUSE3"}, - {KEY_2MOUSE1+3,"SEC_MOUSE4"}, - {KEY_2MOUSE1+4,"SEC_MOUSE5"}, - {KEY_2MOUSE1+5,"SEC_MOUSE6"}, - {KEY_2MOUSE1+6,"SEC_MOUSE7"}, - {KEY_2MOUSE1+7,"SEC_MOUSE8"}, - {KEY_MOUSEWHEELUP, "Wheel 1 UP"}, - {KEY_MOUSEWHEELDOWN, "Wheel 1 Down"}, - {KEY_2MOUSEWHEELUP, "Wheel 2 UP"}, - {KEY_2MOUSEWHEELDOWN, "Wheel 2 Down"}, + {KEY_MOUSE1+0,"mouse1"}, + {KEY_MOUSE1+1,"mouse2"}, + {KEY_MOUSE1+2,"mouse3"}, + {KEY_MOUSE1+3,"mouse4"}, + {KEY_MOUSE1+4,"mouse5"}, + {KEY_MOUSE1+5,"mouse6"}, + {KEY_MOUSE1+6,"mouse7"}, + {KEY_MOUSE1+7,"mouse8"}, + {KEY_2MOUSE1+0,"sec_mouse2"}, // BP: sorry my mouse handler swap button 1 and 2 + {KEY_2MOUSE1+1,"sec_mouse1"}, + {KEY_2MOUSE1+2,"sec_mouse3"}, + {KEY_2MOUSE1+3,"sec_mouse4"}, + {KEY_2MOUSE1+4,"sec_mouse5"}, + {KEY_2MOUSE1+5,"sec_mouse6"}, + {KEY_2MOUSE1+6,"sec_mouse7"}, + {KEY_2MOUSE1+7,"sec_mouse8"}, + {KEY_MOUSEWHEELUP, "wheel 1 up"}, + {KEY_MOUSEWHEELDOWN, "wheel 1 down"}, + {KEY_2MOUSEWHEELUP, "wheel 2 up"}, + {KEY_2MOUSEWHEELDOWN, "wheel 2 down"}, - {KEY_JOY1+0, "JOY1"}, - {KEY_JOY1+1, "JOY2"}, - {KEY_JOY1+2, "JOY3"}, - {KEY_JOY1+3, "JOY4"}, - {KEY_JOY1+4, "JOY5"}, - {KEY_JOY1+5, "JOY6"}, - {KEY_JOY1+6, "JOY7"}, - {KEY_JOY1+7, "JOY8"}, - {KEY_JOY1+8, "JOY9"}, + {KEY_JOY1+0, "joy1"}, + {KEY_JOY1+1, "joy2"}, + {KEY_JOY1+2, "joy3"}, + {KEY_JOY1+3, "joy4"}, + {KEY_JOY1+4, "joy5"}, + {KEY_JOY1+5, "joy6"}, + {KEY_JOY1+6, "joy7"}, + {KEY_JOY1+7, "joy8"}, + {KEY_JOY1+8, "joy9"}, #if !defined (NOMOREJOYBTN_1S) // we use up to 32 buttons in DirectInput - {KEY_JOY1+9, "JOY10"}, - {KEY_JOY1+10, "JOY11"}, - {KEY_JOY1+11, "JOY12"}, - {KEY_JOY1+12, "JOY13"}, - {KEY_JOY1+13, "JOY14"}, - {KEY_JOY1+14, "JOY15"}, - {KEY_JOY1+15, "JOY16"}, - {KEY_JOY1+16, "JOY17"}, - {KEY_JOY1+17, "JOY18"}, - {KEY_JOY1+18, "JOY19"}, - {KEY_JOY1+19, "JOY20"}, - {KEY_JOY1+20, "JOY21"}, - {KEY_JOY1+21, "JOY22"}, - {KEY_JOY1+22, "JOY23"}, - {KEY_JOY1+23, "JOY24"}, - {KEY_JOY1+24, "JOY25"}, - {KEY_JOY1+25, "JOY26"}, - {KEY_JOY1+26, "JOY27"}, - {KEY_JOY1+27, "JOY28"}, - {KEY_JOY1+28, "JOY29"}, - {KEY_JOY1+29, "JOY30"}, - {KEY_JOY1+30, "JOY31"}, - {KEY_JOY1+31, "JOY32"}, + {KEY_JOY1+9, "joy10"}, + {KEY_JOY1+10, "joy11"}, + {KEY_JOY1+11, "joy12"}, + {KEY_JOY1+12, "joy13"}, + {KEY_JOY1+13, "joy14"}, + {KEY_JOY1+14, "joy15"}, + {KEY_JOY1+15, "joy16"}, + {KEY_JOY1+16, "joy17"}, + {KEY_JOY1+17, "joy18"}, + {KEY_JOY1+18, "joy19"}, + {KEY_JOY1+19, "joy20"}, + {KEY_JOY1+20, "joy21"}, + {KEY_JOY1+21, "joy22"}, + {KEY_JOY1+22, "joy23"}, + {KEY_JOY1+23, "joy24"}, + {KEY_JOY1+24, "joy25"}, + {KEY_JOY1+25, "joy26"}, + {KEY_JOY1+26, "joy27"}, + {KEY_JOY1+27, "joy28"}, + {KEY_JOY1+28, "joy29"}, + {KEY_JOY1+29, "joy30"}, + {KEY_JOY1+30, "joy31"}, + {KEY_JOY1+31, "joy32"}, #endif // the DOS version uses Allegro's joystick support - {KEY_HAT1+0, "HATUP"}, - {KEY_HAT1+1, "HATDOWN"}, - {KEY_HAT1+2, "HATLEFT"}, - {KEY_HAT1+3, "HATRIGHT"}, - {KEY_HAT1+4, "HATUP2"}, - {KEY_HAT1+5, "HATDOWN2"}, - {KEY_HAT1+6, "HATLEFT2"}, - {KEY_HAT1+7, "HATRIGHT2"}, - {KEY_HAT1+8, "HATUP3"}, - {KEY_HAT1+9, "HATDOWN3"}, - {KEY_HAT1+10, "HATLEFT3"}, - {KEY_HAT1+11, "HATRIGHT3"}, - {KEY_HAT1+12, "HATUP4"}, - {KEY_HAT1+13, "HATDOWN4"}, - {KEY_HAT1+14, "HATLEFT4"}, - {KEY_HAT1+15, "HATRIGHT4"}, + {KEY_HAT1+0, "hatup"}, + {KEY_HAT1+1, "hatdown"}, + {KEY_HAT1+2, "hatleft"}, + {KEY_HAT1+3, "hatright"}, + {KEY_HAT1+4, "hatup2"}, + {KEY_HAT1+5, "hatdown2"}, + {KEY_HAT1+6, "hatleft2"}, + {KEY_HAT1+7, "hatright2"}, + {KEY_HAT1+8, "hatup3"}, + {KEY_HAT1+9, "hatdown3"}, + {KEY_HAT1+10, "hatleft3"}, + {KEY_HAT1+11, "hatright3"}, + {KEY_HAT1+12, "hatup4"}, + {KEY_HAT1+13, "hatdown4"}, + {KEY_HAT1+14, "hatleft4"}, + {KEY_HAT1+15, "hatright4"}, - {KEY_DBLMOUSE1+0, "DBLMOUSE1"}, - {KEY_DBLMOUSE1+1, "DBLMOUSE2"}, - {KEY_DBLMOUSE1+2, "DBLMOUSE3"}, - {KEY_DBLMOUSE1+3, "DBLMOUSE4"}, - {KEY_DBLMOUSE1+4, "DBLMOUSE5"}, - {KEY_DBLMOUSE1+5, "DBLMOUSE6"}, - {KEY_DBLMOUSE1+6, "DBLMOUSE7"}, - {KEY_DBLMOUSE1+7, "DBLMOUSE8"}, - {KEY_DBL2MOUSE1+0, "DBLSEC_MOUSE2"}, // BP: sorry my mouse handler swap button 1 and 2 - {KEY_DBL2MOUSE1+1, "DBLSEC_MOUSE1"}, - {KEY_DBL2MOUSE1+2, "DBLSEC_MOUSE3"}, - {KEY_DBL2MOUSE1+3, "DBLSEC_MOUSE4"}, - {KEY_DBL2MOUSE1+4, "DBLSEC_MOUSE5"}, - {KEY_DBL2MOUSE1+5, "DBLSEC_MOUSE6"}, - {KEY_DBL2MOUSE1+6, "DBLSEC_MOUSE7"}, - {KEY_DBL2MOUSE1+7, "DBLSEC_MOUSE8"}, + {KEY_DBLMOUSE1+0, "dblmouse1"}, + {KEY_DBLMOUSE1+1, "dblmouse2"}, + {KEY_DBLMOUSE1+2, "dblmouse3"}, + {KEY_DBLMOUSE1+3, "dblmouse4"}, + {KEY_DBLMOUSE1+4, "dblmouse5"}, + {KEY_DBLMOUSE1+5, "dblmouse6"}, + {KEY_DBLMOUSE1+6, "dblmouse7"}, + {KEY_DBLMOUSE1+7, "dblmouse8"}, + {KEY_DBL2MOUSE1+0, "dblsec_mouse2"}, // BP: sorry my mouse handler swap button 1 and 2 + {KEY_DBL2MOUSE1+1, "dblsec_mouse1"}, + {KEY_DBL2MOUSE1+2, "dblsec_mouse3"}, + {KEY_DBL2MOUSE1+3, "dblsec_mouse4"}, + {KEY_DBL2MOUSE1+4, "dblsec_mouse5"}, + {KEY_DBL2MOUSE1+5, "dblsec_mouse6"}, + {KEY_DBL2MOUSE1+6, "dblsec_mouse7"}, + {KEY_DBL2MOUSE1+7, "dblsec_mouse8"}, - {KEY_DBLJOY1+0, "DBLJOY1"}, - {KEY_DBLJOY1+1, "DBLJOY2"}, - {KEY_DBLJOY1+2, "DBLJOY3"}, - {KEY_DBLJOY1+3, "DBLJOY4"}, - {KEY_DBLJOY1+4, "DBLJOY5"}, - {KEY_DBLJOY1+5, "DBLJOY6"}, - {KEY_DBLJOY1+6, "DBLJOY7"}, - {KEY_DBLJOY1+7, "DBLJOY8"}, + {KEY_DBLJOY1+0, "dbljoy1"}, + {KEY_DBLJOY1+1, "dbljoy2"}, + {KEY_DBLJOY1+2, "dbljoy3"}, + {KEY_DBLJOY1+3, "dbljoy4"}, + {KEY_DBLJOY1+4, "dbljoy5"}, + {KEY_DBLJOY1+5, "dbljoy6"}, + {KEY_DBLJOY1+6, "dbljoy7"}, + {KEY_DBLJOY1+7, "dbljoy8"}, #if !defined (NOMOREJOYBTN_1DBL) - {KEY_DBLJOY1+8, "DBLJOY9"}, - {KEY_DBLJOY1+9, "DBLJOY10"}, - {KEY_DBLJOY1+10, "DBLJOY11"}, - {KEY_DBLJOY1+11, "DBLJOY12"}, - {KEY_DBLJOY1+12, "DBLJOY13"}, - {KEY_DBLJOY1+13, "DBLJOY14"}, - {KEY_DBLJOY1+14, "DBLJOY15"}, - {KEY_DBLJOY1+15, "DBLJOY16"}, - {KEY_DBLJOY1+16, "DBLJOY17"}, - {KEY_DBLJOY1+17, "DBLJOY18"}, - {KEY_DBLJOY1+18, "DBLJOY19"}, - {KEY_DBLJOY1+19, "DBLJOY20"}, - {KEY_DBLJOY1+20, "DBLJOY21"}, - {KEY_DBLJOY1+21, "DBLJOY22"}, - {KEY_DBLJOY1+22, "DBLJOY23"}, - {KEY_DBLJOY1+23, "DBLJOY24"}, - {KEY_DBLJOY1+24, "DBLJOY25"}, - {KEY_DBLJOY1+25, "DBLJOY26"}, - {KEY_DBLJOY1+26, "DBLJOY27"}, - {KEY_DBLJOY1+27, "DBLJOY28"}, - {KEY_DBLJOY1+28, "DBLJOY29"}, - {KEY_DBLJOY1+29, "DBLJOY30"}, - {KEY_DBLJOY1+30, "DBLJOY31"}, - {KEY_DBLJOY1+31, "DBLJOY32"}, + {KEY_DBLJOY1+8, "dbljoy9"}, + {KEY_DBLJOY1+9, "dbljoy10"}, + {KEY_DBLJOY1+10, "dbljoy11"}, + {KEY_DBLJOY1+11, "dbljoy12"}, + {KEY_DBLJOY1+12, "dbljoy13"}, + {KEY_DBLJOY1+13, "dbljoy14"}, + {KEY_DBLJOY1+14, "dbljoy15"}, + {KEY_DBLJOY1+15, "dbljoy16"}, + {KEY_DBLJOY1+16, "dbljoy17"}, + {KEY_DBLJOY1+17, "dbljoy18"}, + {KEY_DBLJOY1+18, "dbljoy19"}, + {KEY_DBLJOY1+19, "dbljoy20"}, + {KEY_DBLJOY1+20, "dbljoy21"}, + {KEY_DBLJOY1+21, "dbljoy22"}, + {KEY_DBLJOY1+22, "dbljoy23"}, + {KEY_DBLJOY1+23, "dbljoy24"}, + {KEY_DBLJOY1+24, "dbljoy25"}, + {KEY_DBLJOY1+25, "dbljoy26"}, + {KEY_DBLJOY1+26, "dbljoy27"}, + {KEY_DBLJOY1+27, "dbljoy28"}, + {KEY_DBLJOY1+28, "dbljoy29"}, + {KEY_DBLJOY1+29, "dbljoy30"}, + {KEY_DBLJOY1+30, "dbljoy31"}, + {KEY_DBLJOY1+31, "dbljoy32"}, #endif - {KEY_DBLHAT1+0, "DBLHATUP"}, - {KEY_DBLHAT1+1, "DBLHATDOWN"}, - {KEY_DBLHAT1+2, "DBLHATLEFT"}, - {KEY_DBLHAT1+3, "DBLHATRIGHT"}, - {KEY_DBLHAT1+4, "DBLHATUP2"}, - {KEY_DBLHAT1+5, "DBLHATDOWN2"}, - {KEY_DBLHAT1+6, "DBLHATLEFT2"}, - {KEY_DBLHAT1+7, "DBLHATRIGHT2"}, - {KEY_DBLHAT1+8, "DBLHATUP3"}, - {KEY_DBLHAT1+9, "DBLHATDOWN3"}, - {KEY_DBLHAT1+10, "DBLHATLEFT3"}, - {KEY_DBLHAT1+11, "DBLHATRIGHT3"}, - {KEY_DBLHAT1+12, "DBLHATUP4"}, - {KEY_DBLHAT1+13, "DBLHATDOWN4"}, - {KEY_DBLHAT1+14, "DBLHATLEFT4"}, - {KEY_DBLHAT1+15, "DBLHATRIGHT4"}, + {KEY_DBLHAT1+0, "dblhatup"}, + {KEY_DBLHAT1+1, "dblhatdown"}, + {KEY_DBLHAT1+2, "dblhatleft"}, + {KEY_DBLHAT1+3, "dblhatright"}, + {KEY_DBLHAT1+4, "dblhatup2"}, + {KEY_DBLHAT1+5, "dblhatdown2"}, + {KEY_DBLHAT1+6, "dblhatleft2"}, + {KEY_DBLHAT1+7, "dblhatright2"}, + {KEY_DBLHAT1+8, "dblhatup3"}, + {KEY_DBLHAT1+9, "dblhatdown3"}, + {KEY_DBLHAT1+10, "dblhatleft3"}, + {KEY_DBLHAT1+11, "dblhatright3"}, + {KEY_DBLHAT1+12, "dblhatup4"}, + {KEY_DBLHAT1+13, "dblhatdown4"}, + {KEY_DBLHAT1+14, "dblhatleft4"}, + {KEY_DBLHAT1+15, "dblhatright4"}, - {KEY_2JOY1+0, "SEC_JOY1"}, - {KEY_2JOY1+1, "SEC_JOY2"}, - {KEY_2JOY1+2, "SEC_JOY3"}, - {KEY_2JOY1+3, "SEC_JOY4"}, - {KEY_2JOY1+4, "SEC_JOY5"}, - {KEY_2JOY1+5, "SEC_JOY6"}, - {KEY_2JOY1+6, "SEC_JOY7"}, - {KEY_2JOY1+7, "SEC_JOY8"}, + {KEY_2JOY1+0, "sec_joy1"}, + {KEY_2JOY1+1, "sec_joy2"}, + {KEY_2JOY1+2, "sec_joy3"}, + {KEY_2JOY1+3, "sec_joy4"}, + {KEY_2JOY1+4, "sec_joy5"}, + {KEY_2JOY1+5, "sec_joy6"}, + {KEY_2JOY1+6, "sec_joy7"}, + {KEY_2JOY1+7, "sec_joy8"}, #if !defined (NOMOREJOYBTN_2S) // we use up to 32 buttons in DirectInput - {KEY_2JOY1+8, "SEC_JOY9"}, - {KEY_2JOY1+9, "SEC_JOY10"}, - {KEY_2JOY1+10, "SEC_JOY11"}, - {KEY_2JOY1+11, "SEC_JOY12"}, - {KEY_2JOY1+12, "SEC_JOY13"}, - {KEY_2JOY1+13, "SEC_JOY14"}, - {KEY_2JOY1+14, "SEC_JOY15"}, - {KEY_2JOY1+15, "SEC_JOY16"}, - {KEY_2JOY1+16, "SEC_JOY17"}, - {KEY_2JOY1+17, "SEC_JOY18"}, - {KEY_2JOY1+18, "SEC_JOY19"}, - {KEY_2JOY1+19, "SEC_JOY20"}, - {KEY_2JOY1+20, "SEC_JOY21"}, - {KEY_2JOY1+21, "SEC_JOY22"}, - {KEY_2JOY1+22, "SEC_JOY23"}, - {KEY_2JOY1+23, "SEC_JOY24"}, - {KEY_2JOY1+24, "SEC_JOY25"}, - {KEY_2JOY1+25, "SEC_JOY26"}, - {KEY_2JOY1+26, "SEC_JOY27"}, - {KEY_2JOY1+27, "SEC_JOY28"}, - {KEY_2JOY1+28, "SEC_JOY29"}, - {KEY_2JOY1+29, "SEC_JOY30"}, - {KEY_2JOY1+30, "SEC_JOY31"}, - {KEY_2JOY1+31, "SEC_JOY32"}, + {KEY_2JOY1+8, "sec_joy9"}, + {KEY_2JOY1+9, "sec_joy10"}, + {KEY_2JOY1+10, "sec_joy11"}, + {KEY_2JOY1+11, "sec_joy12"}, + {KEY_2JOY1+12, "sec_joy13"}, + {KEY_2JOY1+13, "sec_joy14"}, + {KEY_2JOY1+14, "sec_joy15"}, + {KEY_2JOY1+15, "sec_joy16"}, + {KEY_2JOY1+16, "sec_joy17"}, + {KEY_2JOY1+17, "sec_joy18"}, + {KEY_2JOY1+18, "sec_joy19"}, + {KEY_2JOY1+19, "sec_joy20"}, + {KEY_2JOY1+20, "sec_joy21"}, + {KEY_2JOY1+21, "sec_joy22"}, + {KEY_2JOY1+22, "sec_joy23"}, + {KEY_2JOY1+23, "sec_joy24"}, + {KEY_2JOY1+24, "sec_joy25"}, + {KEY_2JOY1+25, "sec_joy26"}, + {KEY_2JOY1+26, "sec_joy27"}, + {KEY_2JOY1+27, "sec_joy28"}, + {KEY_2JOY1+28, "sec_joy29"}, + {KEY_2JOY1+29, "sec_joy30"}, + {KEY_2JOY1+30, "sec_joy31"}, + {KEY_2JOY1+31, "sec_joy32"}, #endif // the DOS version uses Allegro's joystick support - {KEY_2HAT1+0, "SEC_HATUP"}, - {KEY_2HAT1+1, "SEC_HATDOWN"}, - {KEY_2HAT1+2, "SEC_HATLEFT"}, - {KEY_2HAT1+3, "SEC_HATRIGHT"}, - {KEY_2HAT1+4, "SEC_HATUP2"}, - {KEY_2HAT1+5, "SEC_HATDOWN2"}, - {KEY_2HAT1+6, "SEC_HATLEFT2"}, - {KEY_2HAT1+7, "SEC_HATRIGHT2"}, - {KEY_2HAT1+8, "SEC_HATUP3"}, - {KEY_2HAT1+9, "SEC_HATDOWN3"}, - {KEY_2HAT1+10, "SEC_HATLEFT3"}, - {KEY_2HAT1+11, "SEC_HATRIGHT3"}, - {KEY_2HAT1+12, "SEC_HATUP4"}, - {KEY_2HAT1+13, "SEC_HATDOWN4"}, - {KEY_2HAT1+14, "SEC_HATLEFT4"}, - {KEY_2HAT1+15, "SEC_HATRIGHT4"}, + {KEY_2HAT1+0, "sec_hatup"}, + {KEY_2HAT1+1, "sec_hatdown"}, + {KEY_2HAT1+2, "sec_hatleft"}, + {KEY_2HAT1+3, "sec_hatright"}, + {KEY_2HAT1+4, "sec_hatup2"}, + {KEY_2HAT1+5, "sec_hatdown2"}, + {KEY_2HAT1+6, "sec_hatleft2"}, + {KEY_2HAT1+7, "sec_hatright2"}, + {KEY_2HAT1+8, "sec_hatup3"}, + {KEY_2HAT1+9, "sec_hatdown3"}, + {KEY_2HAT1+10, "sec_hatleft3"}, + {KEY_2HAT1+11, "sec_hatright3"}, + {KEY_2HAT1+12, "sec_hatup4"}, + {KEY_2HAT1+13, "sec_hatdown4"}, + {KEY_2HAT1+14, "sec_hatleft4"}, + {KEY_2HAT1+15, "sec_hatright4"}, - {KEY_DBL2JOY1+0, "DBLSEC_JOY1"}, - {KEY_DBL2JOY1+1, "DBLSEC_JOY2"}, - {KEY_DBL2JOY1+2, "DBLSEC_JOY3"}, - {KEY_DBL2JOY1+3, "DBLSEC_JOY4"}, - {KEY_DBL2JOY1+4, "DBLSEC_JOY5"}, - {KEY_DBL2JOY1+5, "DBLSEC_JOY6"}, - {KEY_DBL2JOY1+6, "DBLSEC_JOY7"}, - {KEY_DBL2JOY1+7, "DBLSEC_JOY8"}, + {KEY_DBL2JOY1+0, "dblsec_joy1"}, + {KEY_DBL2JOY1+1, "dblsec_joy2"}, + {KEY_DBL2JOY1+2, "dblsec_joy3"}, + {KEY_DBL2JOY1+3, "dblsec_joy4"}, + {KEY_DBL2JOY1+4, "dblsec_joy5"}, + {KEY_DBL2JOY1+5, "dblsec_joy6"}, + {KEY_DBL2JOY1+6, "dblsec_joy7"}, + {KEY_DBL2JOY1+7, "dblsec_joy8"}, #if !defined (NOMOREJOYBTN_2DBL) - {KEY_DBL2JOY1+8, "DBLSEC_JOY9"}, - {KEY_DBL2JOY1+9, "DBLSEC_JOY10"}, - {KEY_DBL2JOY1+10, "DBLSEC_JOY11"}, - {KEY_DBL2JOY1+11, "DBLSEC_JOY12"}, - {KEY_DBL2JOY1+12, "DBLSEC_JOY13"}, - {KEY_DBL2JOY1+13, "DBLSEC_JOY14"}, - {KEY_DBL2JOY1+14, "DBLSEC_JOY15"}, - {KEY_DBL2JOY1+15, "DBLSEC_JOY16"}, - {KEY_DBL2JOY1+16, "DBLSEC_JOY17"}, - {KEY_DBL2JOY1+17, "DBLSEC_JOY18"}, - {KEY_DBL2JOY1+18, "DBLSEC_JOY19"}, - {KEY_DBL2JOY1+19, "DBLSEC_JOY20"}, - {KEY_DBL2JOY1+20, "DBLSEC_JOY21"}, - {KEY_DBL2JOY1+21, "DBLSEC_JOY22"}, - {KEY_DBL2JOY1+22, "DBLSEC_JOY23"}, - {KEY_DBL2JOY1+23, "DBLSEC_JOY24"}, - {KEY_DBL2JOY1+24, "DBLSEC_JOY25"}, - {KEY_DBL2JOY1+25, "DBLSEC_JOY26"}, - {KEY_DBL2JOY1+26, "DBLSEC_JOY27"}, - {KEY_DBL2JOY1+27, "DBLSEC_JOY28"}, - {KEY_DBL2JOY1+28, "DBLSEC_JOY29"}, - {KEY_DBL2JOY1+29, "DBLSEC_JOY30"}, - {KEY_DBL2JOY1+30, "DBLSEC_JOY31"}, - {KEY_DBL2JOY1+31, "DBLSEC_JOY32"}, + {KEY_DBL2JOY1+8, "dblsec_joy9"}, + {KEY_DBL2JOY1+9, "dblsec_joy10"}, + {KEY_DBL2JOY1+10, "dblsec_joy11"}, + {KEY_DBL2JOY1+11, "dblsec_joy12"}, + {KEY_DBL2JOY1+12, "dblsec_joy13"}, + {KEY_DBL2JOY1+13, "dblsec_joy14"}, + {KEY_DBL2JOY1+14, "dblsec_joy15"}, + {KEY_DBL2JOY1+15, "dblsec_joy16"}, + {KEY_DBL2JOY1+16, "dblsec_joy17"}, + {KEY_DBL2JOY1+17, "dblsec_joy18"}, + {KEY_DBL2JOY1+18, "dblsec_joy19"}, + {KEY_DBL2JOY1+19, "dblsec_joy20"}, + {KEY_DBL2JOY1+20, "dblsec_joy21"}, + {KEY_DBL2JOY1+21, "dblsec_joy22"}, + {KEY_DBL2JOY1+22, "dblsec_joy23"}, + {KEY_DBL2JOY1+23, "dblsec_joy24"}, + {KEY_DBL2JOY1+24, "dblsec_joy25"}, + {KEY_DBL2JOY1+25, "dblsec_joy26"}, + {KEY_DBL2JOY1+26, "dblsec_joy27"}, + {KEY_DBL2JOY1+27, "dblsec_joy28"}, + {KEY_DBL2JOY1+28, "dblsec_joy29"}, + {KEY_DBL2JOY1+29, "dblsec_joy30"}, + {KEY_DBL2JOY1+30, "dblsec_joy31"}, + {KEY_DBL2JOY1+31, "dblsec_joy32"}, #endif - {KEY_DBL2HAT1+0, "DBLSEC_HATUP"}, - {KEY_DBL2HAT1+1, "DBLSEC_HATDOWN"}, - {KEY_DBL2HAT1+2, "DBLSEC_HATLEFT"}, - {KEY_DBL2HAT1+3, "DBLSEC_HATRIGHT"}, - {KEY_DBL2HAT1+4, "DBLSEC_HATUP2"}, - {KEY_DBL2HAT1+5, "DBLSEC_HATDOWN2"}, - {KEY_DBL2HAT1+6, "DBLSEC_HATLEFT2"}, - {KEY_DBL2HAT1+7, "DBLSEC_HATRIGHT2"}, - {KEY_DBL2HAT1+8, "DBLSEC_HATUP3"}, - {KEY_DBL2HAT1+9, "DBLSEC_HATDOWN3"}, - {KEY_DBL2HAT1+10, "DBLSEC_HATLEFT3"}, - {KEY_DBL2HAT1+11, "DBLSEC_HATRIGHT3"}, - {KEY_DBL2HAT1+12, "DBLSEC_HATUP4"}, - {KEY_DBL2HAT1+13, "DBLSEC_HATDOWN4"}, - {KEY_DBL2HAT1+14, "DBLSEC_HATLEFT4"}, - {KEY_DBL2HAT1+15, "DBLSEC_HATRIGHT4"}, + {KEY_DBL2HAT1+0, "dblsec_hatup"}, + {KEY_DBL2HAT1+1, "dblsec_hatdown"}, + {KEY_DBL2HAT1+2, "dblsec_hatleft"}, + {KEY_DBL2HAT1+3, "dblsec_hatright"}, + {KEY_DBL2HAT1+4, "dblsec_hatup2"}, + {KEY_DBL2HAT1+5, "dblsec_hatdown2"}, + {KEY_DBL2HAT1+6, "dblsec_hatleft2"}, + {KEY_DBL2HAT1+7, "dblsec_hatright2"}, + {KEY_DBL2HAT1+8, "dblsec_hatup3"}, + {KEY_DBL2HAT1+9, "dblsec_hatdown3"}, + {KEY_DBL2HAT1+10, "dblsec_hatleft3"}, + {KEY_DBL2HAT1+11, "dblsec_hatright3"}, + {KEY_DBL2HAT1+12, "dblsec_hatup4"}, + {KEY_DBL2HAT1+13, "dblsec_hatdown4"}, + {KEY_DBL2HAT1+14, "dblsec_hatleft4"}, + {KEY_DBL2HAT1+15, "dblsec_hatright4"}, }; -static const char *gamecontrolname[num_gamecontrols] = +static const char *gamecontrolname[NUM_GAMECONTROLS] = { - "nothing", // a key/button mapped to gc_null has no effect + "nothing", // a key/button mapped to GC_NULL has no effect "forward", "backward", "strafeleft", @@ -599,7 +593,8 @@ static const char *gamecontrolname[num_gamecontrols] = "systemmenu", "screenshot", "recordgif", - "viewpoint", + "viewpoint", // Rename this to "viewpointnext" for the next major version + "viewpointprev", "custom1", "custom2", "custom3", @@ -619,7 +614,7 @@ void G_ClearControlKeys(INT32 (*setupcontrols)[2], INT32 control) void G_ClearAllControlKeys(void) { INT32 i; - for (i = 0; i < num_gamecontrols; i++) + for (i = 0; i < NUM_GAMECONTROLS; i++) { G_ClearControlKeys(gamecontrol, i); G_ClearControlKeys(gamecontrolbis, i); @@ -630,7 +625,7 @@ void G_ClearAllControlKeys(void) // Returns the name of a key (or virtual key for mouse and joy) // the input value being an keynum // -const char *G_KeynumToString(INT32 keynum) +const char *G_KeyNumToName(INT32 keynum) { static char keynamestr[8]; @@ -654,7 +649,7 @@ const char *G_KeynumToString(INT32 keynum) return keynamestr; } -INT32 G_KeyStringtoNum(const char *keystr) +INT32 G_KeyNameToNum(const char *keystr) { UINT32 j; @@ -682,92 +677,98 @@ void G_DefineDefaultControls(void) INT32 i; // FPS game controls (WASD) - gamecontroldefault[gcs_fps][gc_forward ][0] = 'w'; - gamecontroldefault[gcs_fps][gc_backward ][0] = 's'; - gamecontroldefault[gcs_fps][gc_strafeleft ][0] = 'a'; - gamecontroldefault[gcs_fps][gc_straferight][0] = 'd'; - gamecontroldefault[gcs_fps][gc_lookup ][0] = KEY_UPARROW; - gamecontroldefault[gcs_fps][gc_lookdown ][0] = KEY_DOWNARROW; - gamecontroldefault[gcs_fps][gc_turnleft ][0] = KEY_LEFTARROW; - gamecontroldefault[gcs_fps][gc_turnright ][0] = KEY_RIGHTARROW; - gamecontroldefault[gcs_fps][gc_centerview ][0] = KEY_END; - gamecontroldefault[gcs_fps][gc_jump ][0] = KEY_SPACE; - gamecontroldefault[gcs_fps][gc_spin ][0] = KEY_LSHIFT; - gamecontroldefault[gcs_fps][gc_fire ][0] = KEY_RCTRL; - gamecontroldefault[gcs_fps][gc_fire ][1] = KEY_MOUSE1+0; - gamecontroldefault[gcs_fps][gc_firenormal ][0] = 'c'; + gamecontroldefault[gcs_fps][GC_FORWARD ][0] = 'w'; + gamecontroldefault[gcs_fps][GC_BACKWARD ][0] = 's'; + gamecontroldefault[gcs_fps][GC_STRAFELEFT ][0] = 'a'; + gamecontroldefault[gcs_fps][GC_STRAFERIGHT][0] = 'd'; + gamecontroldefault[gcs_fps][GC_LOOKUP ][0] = KEY_UPARROW; + gamecontroldefault[gcs_fps][GC_LOOKDOWN ][0] = KEY_DOWNARROW; + gamecontroldefault[gcs_fps][GC_TURNLEFT ][0] = KEY_LEFTARROW; + gamecontroldefault[gcs_fps][GC_TURNRIGHT ][0] = KEY_RIGHTARROW; + gamecontroldefault[gcs_fps][GC_CENTERVIEW ][0] = KEY_LCTRL; + gamecontroldefault[gcs_fps][GC_JUMP ][0] = KEY_SPACE; + gamecontroldefault[gcs_fps][GC_SPIN ][0] = KEY_LSHIFT; + gamecontroldefault[gcs_fps][GC_FIRE ][0] = KEY_RCTRL; + gamecontroldefault[gcs_fps][GC_FIRE ][1] = KEY_MOUSE1+0; + gamecontroldefault[gcs_fps][GC_FIRENORMAL ][0] = KEY_RALT; + gamecontroldefault[gcs_fps][GC_FIRENORMAL ][1] = KEY_MOUSE1+1; + gamecontroldefault[gcs_fps][GC_CUSTOM1 ][0] = 'z'; + gamecontroldefault[gcs_fps][GC_CUSTOM2 ][0] = 'x'; + gamecontroldefault[gcs_fps][GC_CUSTOM3 ][0] = 'c'; - // Platform game controls (arrow keys) - gamecontroldefault[gcs_platform][gc_forward ][0] = KEY_UPARROW; - gamecontroldefault[gcs_platform][gc_backward ][0] = KEY_DOWNARROW; - gamecontroldefault[gcs_platform][gc_strafeleft ][0] = 'a'; - gamecontroldefault[gcs_platform][gc_straferight][0] = 'd'; - gamecontroldefault[gcs_platform][gc_lookup ][0] = KEY_PGUP; - gamecontroldefault[gcs_platform][gc_lookdown ][0] = KEY_PGDN; - gamecontroldefault[gcs_platform][gc_turnleft ][0] = KEY_LEFTARROW; - gamecontroldefault[gcs_platform][gc_turnright ][0] = KEY_RIGHTARROW; - gamecontroldefault[gcs_platform][gc_centerview ][0] = KEY_END; - gamecontroldefault[gcs_platform][gc_jump ][0] = KEY_SPACE; - gamecontroldefault[gcs_platform][gc_spin ][0] = KEY_LSHIFT; - gamecontroldefault[gcs_platform][gc_fire ][0] = 's'; - gamecontroldefault[gcs_platform][gc_fire ][1] = KEY_MOUSE1+0; - gamecontroldefault[gcs_platform][gc_firenormal ][0] = 'w'; + // Platform game controls (arrow keys), currently unused + gamecontroldefault[gcs_platform][GC_FORWARD ][0] = KEY_UPARROW; + gamecontroldefault[gcs_platform][GC_BACKWARD ][0] = KEY_DOWNARROW; + gamecontroldefault[gcs_platform][GC_STRAFELEFT ][0] = 'a'; + gamecontroldefault[gcs_platform][GC_STRAFERIGHT][0] = 'd'; + gamecontroldefault[gcs_platform][GC_LOOKUP ][0] = KEY_PGUP; + gamecontroldefault[gcs_platform][GC_LOOKDOWN ][0] = KEY_PGDN; + gamecontroldefault[gcs_platform][GC_TURNLEFT ][0] = KEY_LEFTARROW; + gamecontroldefault[gcs_platform][GC_TURNRIGHT ][0] = KEY_RIGHTARROW; + gamecontroldefault[gcs_platform][GC_CENTERVIEW ][0] = KEY_END; + gamecontroldefault[gcs_platform][GC_JUMP ][0] = KEY_SPACE; + gamecontroldefault[gcs_platform][GC_SPIN ][0] = KEY_LSHIFT; + gamecontroldefault[gcs_platform][GC_FIRE ][0] = 's'; + gamecontroldefault[gcs_platform][GC_FIRE ][1] = KEY_MOUSE1+0; + gamecontroldefault[gcs_platform][GC_FIRENORMAL ][0] = 'w'; for (i = 1; i < num_gamecontrolschemes; i++) // skip gcs_custom (0) { - gamecontroldefault[i][gc_weaponnext ][0] = KEY_MOUSEWHEELUP+0; - gamecontroldefault[i][gc_weaponprev ][0] = KEY_MOUSEWHEELDOWN+0; - gamecontroldefault[i][gc_wepslot1 ][0] = '1'; - gamecontroldefault[i][gc_wepslot2 ][0] = '2'; - gamecontroldefault[i][gc_wepslot3 ][0] = '3'; - gamecontroldefault[i][gc_wepslot4 ][0] = '4'; - gamecontroldefault[i][gc_wepslot5 ][0] = '5'; - gamecontroldefault[i][gc_wepslot6 ][0] = '6'; - gamecontroldefault[i][gc_wepslot7 ][0] = '7'; - gamecontroldefault[i][gc_wepslot8 ][0] = '8'; - gamecontroldefault[i][gc_wepslot9 ][0] = '9'; - gamecontroldefault[i][gc_wepslot10 ][0] = '0'; - gamecontroldefault[i][gc_tossflag ][0] = '\''; - gamecontroldefault[i][gc_camtoggle ][0] = 'v'; - gamecontroldefault[i][gc_camreset ][0] = 'r'; - gamecontroldefault[i][gc_talkkey ][0] = 't'; - gamecontroldefault[i][gc_teamkey ][0] = 'y'; - gamecontroldefault[i][gc_scores ][0] = KEY_TAB; - gamecontroldefault[i][gc_console ][0] = KEY_CONSOLE; - gamecontroldefault[i][gc_pause ][0] = 'p'; - gamecontroldefault[i][gc_screenshot ][0] = KEY_F8; - gamecontroldefault[i][gc_recordgif ][0] = KEY_F9; - gamecontroldefault[i][gc_viewpoint ][0] = KEY_F12; + gamecontroldefault[i][GC_WEAPONNEXT ][0] = KEY_MOUSEWHEELUP+0; + gamecontroldefault[i][GC_WEAPONPREV ][0] = KEY_MOUSEWHEELDOWN+0; + gamecontroldefault[i][GC_WEPSLOT1 ][0] = '1'; + gamecontroldefault[i][GC_WEPSLOT2 ][0] = '2'; + gamecontroldefault[i][GC_WEPSLOT3 ][0] = '3'; + gamecontroldefault[i][GC_WEPSLOT4 ][0] = '4'; + gamecontroldefault[i][GC_WEPSLOT5 ][0] = '5'; + gamecontroldefault[i][GC_WEPSLOT6 ][0] = '6'; + gamecontroldefault[i][GC_WEPSLOT7 ][0] = '7'; + gamecontroldefault[i][GC_WEPSLOT8 ][0] = '8'; + gamecontroldefault[i][GC_WEPSLOT9 ][0] = '9'; + gamecontroldefault[i][GC_WEPSLOT10 ][0] = '0'; + gamecontroldefault[i][GC_TOSSFLAG ][0] = '\''; + gamecontroldefault[i][GC_CAMTOGGLE ][0] = 'v'; + gamecontroldefault[i][GC_CAMRESET ][0] = 'r'; + gamecontroldefault[i][GC_TALKKEY ][0] = 't'; + gamecontroldefault[i][GC_TEAMKEY ][0] = 'y'; + gamecontroldefault[i][GC_SCORES ][0] = KEY_TAB; + gamecontroldefault[i][GC_CONSOLE ][0] = KEY_CONSOLE; + gamecontroldefault[i][GC_PAUSE ][0] = 'p'; + gamecontroldefault[i][GC_SCREENSHOT ][0] = KEY_F8; + gamecontroldefault[i][GC_RECORDGIF ][0] = KEY_F9; + gamecontroldefault[i][GC_VIEWPOINTNEXT][0] = KEY_F12; // Gamepad controls -- same for both schemes - gamecontroldefault[i][gc_weaponnext ][1] = KEY_JOY1+1; // B - gamecontroldefault[i][gc_weaponprev ][1] = KEY_JOY1+2; // X - gamecontroldefault[i][gc_tossflag ][1] = KEY_JOY1+0; // A - gamecontroldefault[i][gc_spin ][1] = KEY_JOY1+4; // LB - gamecontroldefault[i][gc_camtoggle ][1] = KEY_HAT1+0; // D-Pad Up - gamecontroldefault[i][gc_camreset ][1] = KEY_JOY1+3; // Y - gamecontroldefault[i][gc_centerview ][1] = KEY_JOY1+9; // Right Stick - gamecontroldefault[i][gc_talkkey ][1] = KEY_HAT1+2; // D-Pad Left - gamecontroldefault[i][gc_scores ][1] = KEY_HAT1+3; // D-Pad Right - gamecontroldefault[i][gc_jump ][1] = KEY_JOY1+5; // RB - gamecontroldefault[i][gc_pause ][1] = KEY_JOY1+6; // Back - gamecontroldefault[i][gc_screenshot ][1] = KEY_HAT1+1; // D-Pad Down - gamecontroldefault[i][gc_systemmenu ][0] = KEY_JOY1+7; // Start + gamecontroldefault[i][GC_JUMP ][1] = KEY_JOY1+0; // A + gamecontroldefault[i][GC_SPIN ][1] = KEY_JOY1+2; // X + gamecontroldefault[i][GC_CUSTOM1 ][1] = KEY_JOY1+1; // B + gamecontroldefault[i][GC_CUSTOM2 ][1] = KEY_JOY1+3; // Y + gamecontroldefault[i][GC_CUSTOM3 ][1] = KEY_JOY1+8; // Left Stick + gamecontroldefault[i][GC_CAMTOGGLE ][1] = KEY_JOY1+4; // LB + gamecontroldefault[i][GC_CENTERVIEW ][1] = KEY_JOY1+5; // RB + gamecontroldefault[i][GC_SCREENSHOT ][1] = KEY_JOY1+6; // Back + gamecontroldefault[i][GC_SYSTEMMENU ][0] = KEY_JOY1+7; // Start + gamecontroldefault[i][GC_WEAPONPREV ][1] = KEY_HAT1+2; // D-Pad Left + gamecontroldefault[i][GC_WEAPONNEXT ][1] = KEY_HAT1+3; // D-Pad Right + gamecontroldefault[i][GC_VIEWPOINTNEXT][1] = KEY_JOY1+9; // Right Stick + gamecontroldefault[i][GC_TOSSFLAG ][1] = KEY_HAT1+0; // D-Pad Up + gamecontroldefault[i][GC_SCORES ][1] = KEY_HAT1+1; // D-Pad Down // Second player controls only have joypad defaults - gamecontrolbisdefault[i][gc_weaponnext][0] = KEY_2JOY1+1; // B - gamecontrolbisdefault[i][gc_weaponprev][0] = KEY_2JOY1+2; // X - gamecontrolbisdefault[i][gc_tossflag ][0] = KEY_2JOY1+0; // A - gamecontrolbisdefault[i][gc_spin ][0] = KEY_2JOY1+4; // LB - gamecontrolbisdefault[i][gc_camreset ][0] = KEY_2JOY1+3; // Y - gamecontrolbisdefault[i][gc_centerview][0] = KEY_2JOY1+9; // Right Stick - gamecontrolbisdefault[i][gc_jump ][0] = KEY_2JOY1+5; // RB - //gamecontrolbisdefault[i][gc_pause ][0] = KEY_2JOY1+6; // Back - //gamecontrolbisdefault[i][gc_systemmenu][0] = KEY_2JOY1+7; // Start - gamecontrolbisdefault[i][gc_camtoggle ][0] = KEY_2HAT1+0; // D-Pad Up - gamecontrolbisdefault[i][gc_screenshot][0] = KEY_2HAT1+1; // D-Pad Down - //gamecontrolbisdefault[i][gc_talkkey ][0] = KEY_2HAT1+2; // D-Pad Left - //gamecontrolbisdefault[i][gc_scores ][0] = KEY_2HAT1+3; // D-Pad Right + gamecontrolbisdefault[i][GC_JUMP ][1] = KEY_2JOY1+0; // A + gamecontrolbisdefault[i][GC_SPIN ][1] = KEY_2JOY1+2; // X + gamecontrolbisdefault[i][GC_CUSTOM1 ][1] = KEY_2JOY1+1; // B + gamecontrolbisdefault[i][GC_CUSTOM2 ][1] = KEY_2JOY1+3; // Y + gamecontrolbisdefault[i][GC_CUSTOM3 ][1] = KEY_2JOY1+8; // Left Stick + gamecontrolbisdefault[i][GC_CAMTOGGLE ][1] = KEY_2JOY1+4; // LB + gamecontrolbisdefault[i][GC_CENTERVIEW ][1] = KEY_2JOY1+5; // RB + gamecontrolbisdefault[i][GC_SCREENSHOT ][1] = KEY_2JOY1+6; // Back + //gamecontrolbisdefault[i][GC_SYSTEMMENU ][0] = KEY_2JOY1+7; // Start + gamecontrolbisdefault[i][GC_WEAPONPREV ][1] = KEY_2HAT1+2; // D-Pad Left + gamecontrolbisdefault[i][GC_WEAPONNEXT ][1] = KEY_2HAT1+3; // D-Pad Right + gamecontrolbisdefault[i][GC_VIEWPOINTNEXT][1] = KEY_2JOY1+9; // Right Stick + gamecontrolbisdefault[i][GC_TOSSFLAG ][1] = KEY_2HAT1+0; // D-Pad Up + //gamecontrolbisdefault[i][GC_SCORES ][1] = KEY_2HAT1+1; // D-Pad Down } } @@ -779,7 +780,7 @@ INT32 G_GetControlScheme(INT32 (*fromcontrols)[2], const INT32 *gclist, INT32 gc for (i = 1; i < num_gamecontrolschemes; i++) // skip gcs_custom (0) { skipscheme = false; - for (j = 0; j < (gclist && gclen ? gclen : num_gamecontrols); j++) + for (j = 0; j < (gclist && gclen ? gclen : NUM_GAMECONTROLS); j++) { gc = (gclist && gclen) ? gclist[j] : j; if (((fromcontrols[gc][0] && gamecontroldefault[i][gc][0]) ? fromcontrols[gc][0] != gamecontroldefault[i][gc][0] : true) && @@ -802,7 +803,7 @@ void G_CopyControls(INT32 (*setupcontrols)[2], INT32 (*fromcontrols)[2], const I { INT32 i, gc; - for (i = 0; i < (gclist && gclen ? gclen : num_gamecontrols); i++) + for (i = 0; i < (gclist && gclen ? gclen : NUM_GAMECONTROLS); i++) { gc = (gclist && gclen) ? gclist[i] : i; setupcontrols[gc][0] = fromcontrols[gc][0]; @@ -814,24 +815,24 @@ void G_SaveKeySetting(FILE *f, INT32 (*fromcontrols)[2], INT32 (*fromcontrolsbis { INT32 i; - for (i = 1; i < num_gamecontrols; i++) + for (i = 1; i < NUM_GAMECONTROLS; i++) { fprintf(f, "setcontrol \"%s\" \"%s\"", gamecontrolname[i], - G_KeynumToString(fromcontrols[i][0])); + G_KeyNumToName(fromcontrols[i][0])); if (fromcontrols[i][1]) - fprintf(f, " \"%s\"\n", G_KeynumToString(fromcontrols[i][1])); + fprintf(f, " \"%s\"\n", G_KeyNumToName(fromcontrols[i][1])); else fprintf(f, "\n"); } - for (i = 1; i < num_gamecontrols; i++) + for (i = 1; i < NUM_GAMECONTROLS; i++) { fprintf(f, "setcontrol2 \"%s\" \"%s\"", gamecontrolname[i], - G_KeynumToString(fromcontrolsbis[i][0])); + G_KeyNumToName(fromcontrolsbis[i][0])); if (fromcontrolsbis[i][1]) - fprintf(f, " \"%s\"\n", G_KeynumToString(fromcontrolsbis[i][1])); + fprintf(f, " \"%s\"\n", G_KeyNumToName(fromcontrolsbis[i][1])); else fprintf(f, "\n"); } @@ -839,11 +840,11 @@ void G_SaveKeySetting(FILE *f, INT32 (*fromcontrols)[2], INT32 (*fromcontrolsbis INT32 G_CheckDoubleUsage(INT32 keynum, boolean modify) { - INT32 result = gc_null; + INT32 result = GC_NULL; if (cv_controlperkey.value == 1) { INT32 i; - for (i = 0; i < num_gamecontrols; i++) + for (i = 0; i < NUM_GAMECONTROLS; i++) { if (gamecontrol[i][0] == keynum) { @@ -889,11 +890,11 @@ static INT32 G_FilterKeyByVersion(INT32 numctrl, INT32 keyidx, INT32 player, INT return -1; // skip setting control if (GETMAJOREXECVERSION(cv_execversion.value) < 27 && ( // v2.1.22 - numctrl == gc_weaponnext || numctrl == gc_weaponprev || numctrl == gc_tossflag || - numctrl == gc_spin || numctrl == gc_camreset || numctrl == gc_jump || - numctrl == gc_pause || numctrl == gc_systemmenu || numctrl == gc_camtoggle || - numctrl == gc_screenshot || numctrl == gc_talkkey || numctrl == gc_scores || - numctrl == gc_centerview + numctrl == GC_WEAPONNEXT || numctrl == GC_WEAPONPREV || numctrl == GC_TOSSFLAG || + numctrl == GC_SPIN || numctrl == GC_CAMRESET || numctrl == GC_JUMP || + numctrl == GC_PAUSE || numctrl == GC_SYSTEMMENU || numctrl == GC_CAMTOGGLE || + numctrl == GC_SCREENSHOT || numctrl == GC_TALKKEY || numctrl == GC_SCORES || + numctrl == GC_CENTERVIEW )) { INT32 keynum = 0, existingctrl = 0; @@ -901,7 +902,7 @@ static INT32 G_FilterKeyByVersion(INT32 numctrl, INT32 keyidx, INT32 player, INT boolean defaultoverride = false; // get the default gamecontrol - if (player == 0 && numctrl == gc_systemmenu) + if (player == 0 && numctrl == GC_SYSTEMMENU) defaultkey = gamecontrol[numctrl][0]; else defaultkey = (player == 1 ? gamecontrolbis[numctrl][0] : gamecontrol[numctrl][1]); @@ -992,23 +993,24 @@ static void setcontrol(INT32 (*gc)[2]) { INT32 numctrl; const char *namectrl; - INT32 keynum, keynum1, keynum2; + INT32 keynum, keynum1, keynum2 = 0; INT32 player = ((void*)gc == (void*)&gamecontrolbis ? 1 : 0); boolean nestedoverride = false; // Update me for 2.3 namectrl = (stricmp(COM_Argv(1), "use")) ? COM_Argv(1) : "spin"; - for (numctrl = 0; numctrl < num_gamecontrols && stricmp(namectrl, gamecontrolname[numctrl]); + for (numctrl = 0; numctrl < NUM_GAMECONTROLS && stricmp(namectrl, gamecontrolname[numctrl]); numctrl++) ; - if (numctrl == num_gamecontrols) + if (numctrl == NUM_GAMECONTROLS) { CONS_Printf(M_GetText("Control '%s' unknown\n"), namectrl); return; } - keynum1 = G_KeyStringtoNum(COM_Argv(2)); - keynum2 = G_KeyStringtoNum(COM_Argv(3)); + keynum1 = G_KeyNameToNum(COM_Argv(2)); + if (COM_Argc() > 3) + keynum2 = G_KeyNameToNum(COM_Argv(3)); keynum = G_FilterKeyByVersion(numctrl, 0, player, &keynum1, &keynum2, &nestedoverride); if (keynum >= 0) @@ -1073,3 +1075,17 @@ void Command_Setcontrol2_f(void) setcontrol(gamecontrolbis); } + +void G_SetMouseDeltas(INT32 dx, INT32 dy, UINT8 ssplayer) +{ + mouse_t *m = ssplayer == 1 ? &mouse : &mouse2; + consvar_t *cvsens, *cvysens; + + cvsens = ssplayer == 1 ? &cv_mousesens : &cv_mousesens2; + cvysens = ssplayer == 1 ? &cv_mouseysens : &cv_mouseysens2; + m->rdx = dx; + m->rdy = dy; + m->dx = (INT32)(m->rdx*((cvsens->value*cvsens->value)/110.0f + 0.1f)); + m->dy = (INT32)(m->rdy*((cvsens->value*cvsens->value)/110.0f + 0.1f)); + m->mlookdy = (INT32)(m->rdy*((cvysens->value*cvsens->value)/110.0f + 0.1f)); +} diff --git a/src/g_input.h b/src/g_input.h index 609141825..e9c909e6e 100644 --- a/src/g_input.h +++ b/src/g_input.h @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -58,49 +58,50 @@ typedef enum typedef enum { - gc_null = 0, // a key/button mapped to gc_null has no effect - gc_forward, - gc_backward, - gc_strafeleft, - gc_straferight, - gc_turnleft, - gc_turnright, - gc_weaponnext, - gc_weaponprev, - gc_wepslot1, - gc_wepslot2, - gc_wepslot3, - gc_wepslot4, - gc_wepslot5, - gc_wepslot6, - gc_wepslot7, - gc_wepslot8, - gc_wepslot9, - gc_wepslot10, - gc_fire, - gc_firenormal, - gc_tossflag, - gc_spin, - gc_camtoggle, - gc_camreset, - gc_lookup, - gc_lookdown, - gc_centerview, - gc_mouseaiming, // mouse aiming is momentary (toggleable in the menu) - gc_talkkey, - gc_teamkey, - gc_scores, - gc_jump, - gc_console, - gc_pause, - gc_systemmenu, - gc_screenshot, - gc_recordgif, - gc_viewpoint, - gc_custom1, // Lua scriptable - gc_custom2, // Lua scriptable - gc_custom3, // Lua scriptable - num_gamecontrols + GC_NULL = 0, // a key/button mapped to GC_NULL has no effect + GC_FORWARD, + GC_BACKWARD, + GC_STRAFELEFT, + GC_STRAFERIGHT, + GC_TURNLEFT, + GC_TURNRIGHT, + GC_WEAPONNEXT, + GC_WEAPONPREV, + GC_WEPSLOT1, + GC_WEPSLOT2, + GC_WEPSLOT3, + GC_WEPSLOT4, + GC_WEPSLOT5, + GC_WEPSLOT6, + GC_WEPSLOT7, + GC_WEPSLOT8, + GC_WEPSLOT9, + GC_WEPSLOT10, + GC_FIRE, + GC_FIRENORMAL, + GC_TOSSFLAG, + GC_SPIN, + GC_CAMTOGGLE, + GC_CAMRESET, + GC_LOOKUP, + GC_LOOKDOWN, + GC_CENTERVIEW, + GC_MOUSEAIMING, // mouse aiming is momentary (toggleable in the menu) + GC_TALKKEY, + GC_TEAMKEY, + GC_SCORES, + GC_JUMP, + GC_CONSOLE, + GC_PAUSE, + GC_SYSTEMMENU, + GC_SCREENSHOT, + GC_RECORDGIF, + GC_VIEWPOINTNEXT, + GC_VIEWPOINTPREV, + GC_CUSTOM1, // Lua scriptable + GC_CUSTOM2, // Lua scriptable + GC_CUSTOM3, // Lua scriptable + NUM_GAMECONTROLS } gamecontrols_e; typedef enum @@ -116,9 +117,29 @@ extern consvar_t cv_mousesens, cv_mouseysens; extern consvar_t cv_mousesens2, cv_mouseysens2; extern consvar_t cv_controlperkey; -extern INT32 mousex, mousey; -extern INT32 mlooky; //mousey with mlookSensitivity -extern INT32 mouse2x, mouse2y, mlook2y; +typedef struct +{ + INT32 dx; // deltas with mousemove sensitivity + INT32 dy; + INT32 mlookdy; // dy with mouselook sensitivity + INT32 rdx; // deltas without sensitivity + INT32 rdy; + UINT16 buttons; +} mouse_t; + +#define MB_BUTTON1 0x0001 +#define MB_BUTTON2 0x0002 +#define MB_BUTTON3 0x0004 +#define MB_BUTTON4 0x0008 +#define MB_BUTTON5 0x0010 +#define MB_BUTTON6 0x0020 +#define MB_BUTTON7 0x0040 +#define MB_BUTTON8 0x0080 +#define MB_SCROLLUP 0x0100 +#define MB_SCROLLDOWN 0x0200 + +extern mouse_t mouse; +extern mouse_t mouse2; extern INT32 joyxmove[JOYAXISSET], joyymove[JOYAXISSET], joy2xmove[JOYAXISSET], joy2ymove[JOYAXISSET]; @@ -126,10 +147,10 @@ extern INT32 joyxmove[JOYAXISSET], joyymove[JOYAXISSET], joy2xmove[JOYAXISSET], extern UINT8 gamekeydown[NUMINPUTS]; // two key codes (or virtual key) per game control -extern INT32 gamecontrol[num_gamecontrols][2]; -extern INT32 gamecontrolbis[num_gamecontrols][2]; // secondary splitscreen player -extern INT32 gamecontroldefault[num_gamecontrolschemes][num_gamecontrols][2]; // default control storage, use 0 (gcs_custom) for memory retention -extern INT32 gamecontrolbisdefault[num_gamecontrolschemes][num_gamecontrols][2]; +extern INT32 gamecontrol[NUM_GAMECONTROLS][2]; +extern INT32 gamecontrolbis[NUM_GAMECONTROLS][2]; // secondary splitscreen player +extern INT32 gamecontroldefault[num_gamecontrolschemes][NUM_GAMECONTROLS][2]; // default control storage, use 0 (gcs_custom) for memory retention +extern INT32 gamecontrolbisdefault[num_gamecontrolschemes][NUM_GAMECONTROLS][2]; #define PLAYER1INPUTDOWN(gc) (gamekeydown[gamecontrol[gc][0]] || gamekeydown[gamecontrol[gc][1]]) #define PLAYER2INPUTDOWN(gc) (gamekeydown[gamecontrolbis[gc][0]] || gamekeydown[gamecontrolbis[gc][1]]) #define PLAYERINPUTDOWN(p, gc) ((p) == 2 ? PLAYER2INPUTDOWN(gc) : PLAYER1INPUTDOWN(gc)) @@ -161,8 +182,8 @@ extern const INT32 gcl_jump_spin[num_gcl_jump_spin]; void G_MapEventsToControls(event_t *ev); // returns the name of a key -const char *G_KeynumToString(INT32 keynum); -INT32 G_KeyStringtoNum(const char *keystr); +const char *G_KeyNumToName(INT32 keynum); +INT32 G_KeyNameToNum(const char *keystr); // detach any keys associated to the given game control void G_ClearControlKeys(INT32 (*setupcontrols)[2], INT32 control); @@ -175,4 +196,7 @@ void G_CopyControls(INT32 (*setupcontrols)[2], INT32 (*fromcontrols)[2], const I void G_SaveKeySetting(FILE *f, INT32 (*fromcontrols)[2], INT32 (*fromcontrolsbis)[2]); INT32 G_CheckDoubleUsage(INT32 keynum, boolean modify); +// sets the members of a mouse_t given position deltas +void G_SetMouseDeltas(INT32 dx, INT32 dy, UINT8 ssplayer); + #endif diff --git a/src/g_state.h b/src/g_state.h index 589dc6361..8f97930bb 100644 --- a/src/g_state.h +++ b/src/g_state.h @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/hardware/CMakeLists.txt b/src/hardware/CMakeLists.txt new file mode 100644 index 000000000..4e9c67d2f --- /dev/null +++ b/src/hardware/CMakeLists.txt @@ -0,0 +1 @@ +target_sourcefile(c) diff --git a/src/hardware/Sourcefile b/src/hardware/Sourcefile new file mode 100644 index 000000000..1c05de76c --- /dev/null +++ b/src/hardware/Sourcefile @@ -0,0 +1,13 @@ +hw_bsp.c +hw_draw.c +hw_light.c +hw_main.c +hw_clip.c +hw_md2.c +hw_cache.c +hw_md2load.c +hw_md3load.c +hw_model.c +u_list.c +hw_batching.c +r_opengl/r_opengl.c diff --git a/src/hardware/hw_batching.c b/src/hardware/hw_batching.c index 0ac33d136..d1b84a5ee 100644 --- a/src/hardware/hw_batching.c +++ b/src/hardware/hw_batching.c @@ -1,6 +1,6 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- -// Copyright (C) 2020-2021 by Sonic Team Junior. +// Copyright (C) 2020-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -245,13 +245,16 @@ void HWR_RenderBatches(void) currently_batching = false;// no longer collecting batches if (!polygonArraySize) { - ps_hw_numpolys = ps_hw_numcalls = ps_hw_numshaders = ps_hw_numtextures = ps_hw_numpolyflags = ps_hw_numcolors = 0; + ps_hw_numpolys.value.i = ps_hw_numcalls.value.i = ps_hw_numshaders.value.i + = ps_hw_numtextures.value.i = ps_hw_numpolyflags.value.i + = ps_hw_numcolors.value.i = 0; return;// nothing to draw } // init stats vars - ps_hw_numpolys = polygonArraySize; - ps_hw_numcalls = ps_hw_numverts = 0; - ps_hw_numshaders = ps_hw_numtextures = ps_hw_numpolyflags = ps_hw_numcolors = 1; + ps_hw_numpolys.value.i = polygonArraySize; + ps_hw_numcalls.value.i = ps_hw_numverts.value.i = 0; + ps_hw_numshaders.value.i = ps_hw_numtextures.value.i + = ps_hw_numpolyflags.value.i = ps_hw_numcolors.value.i = 1; // init polygonIndexArray for (i = 0; i < polygonArraySize; i++) { @@ -259,12 +262,12 @@ void HWR_RenderBatches(void) } // sort polygons - ps_hw_batchsorttime = I_GetPreciseTime(); + PS_START_TIMING(ps_hw_batchsorttime); if (cv_glshaders.value && gl_shadersavailable) qsort(polygonIndexArray, polygonArraySize, sizeof(unsigned int), comparePolygons); else qsort(polygonIndexArray, polygonArraySize, sizeof(unsigned int), comparePolygonsNoShaders); - ps_hw_batchsorttime = I_GetPreciseTime() - ps_hw_batchsorttime; + PS_STOP_TIMING(ps_hw_batchsorttime); // sort order // 1. shader // 2. texture @@ -272,7 +275,7 @@ void HWR_RenderBatches(void) // 4. colors + light level // not sure about what order of the last 2 should be, or if it even matters - ps_hw_batchdrawtime = I_GetPreciseTime(); + PS_START_TIMING(ps_hw_batchdrawtime); currentShader = polygonArray[polygonIndexArray[0]].shader; currentTexture = polygonArray[polygonIndexArray[0]].texture; @@ -408,8 +411,8 @@ void HWR_RenderBatches(void) // execute draw call HWD.pfnDrawIndexedTriangles(¤tSurfaceInfo, finalVertexArray, finalIndexWritePos, currentPolyFlags, finalVertexIndexArray); // update stats - ps_hw_numcalls++; - ps_hw_numverts += finalIndexWritePos; + ps_hw_numcalls.value.i++; + ps_hw_numverts.value.i += finalIndexWritePos; // reset write positions finalVertexWritePos = 0; finalIndexWritePos = 0; @@ -426,7 +429,7 @@ void HWR_RenderBatches(void) currentShader = nextShader; changeShader = false; - ps_hw_numshaders++; + ps_hw_numshaders.value.i++; } if (changeTexture) { @@ -435,21 +438,21 @@ void HWR_RenderBatches(void) currentTexture = nextTexture; changeTexture = false; - ps_hw_numtextures++; + ps_hw_numtextures.value.i++; } if (changePolyFlags) { currentPolyFlags = nextPolyFlags; changePolyFlags = false; - ps_hw_numpolyflags++; + ps_hw_numpolyflags.value.i++; } if (changeSurfaceInfo) { currentSurfaceInfo = nextSurfaceInfo; changeSurfaceInfo = false; - ps_hw_numcolors++; + ps_hw_numcolors.value.i++; } // and that should be it? } @@ -457,7 +460,7 @@ void HWR_RenderBatches(void) polygonArraySize = 0; unsortedVertexArraySize = 0; - ps_hw_batchdrawtime = I_GetPreciseTime() - ps_hw_batchdrawtime; + PS_STOP_TIMING(ps_hw_batchdrawtime); } diff --git a/src/hardware/hw_batching.h b/src/hardware/hw_batching.h index 9ccc7de3d..c7fd7afe3 100644 --- a/src/hardware/hw_batching.h +++ b/src/hardware/hw_batching.h @@ -1,6 +1,6 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- -// Copyright (C) 2020-2021 by Sonic Team Junior. +// Copyright (C) 2020-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/hardware/hw_cache.c b/src/hardware/hw_cache.c index 317efd320..d6245df64 100644 --- a/src/hardware/hw_cache.c +++ b/src/hardware/hw_cache.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -804,45 +804,18 @@ GLMapTexture_t *HWR_GetTexture(INT32 tex) static void HWR_CacheFlat(GLMipmap_t *grMipmap, lumpnum_t flatlumpnum) { - size_t size, pflatsize; + size_t size = W_LumpLength(flatlumpnum); + UINT16 pflatsize = R_GetFlatSize(size); // setup the texture info grMipmap->format = GL_TEXFMT_P_8; grMipmap->flags = TF_WRAPXY|TF_CHROMAKEYED; - size = W_LumpLength(flatlumpnum); - - switch (size) - { - case 4194304: // 2048x2048 lump - pflatsize = 2048; - break; - case 1048576: // 1024x1024 lump - pflatsize = 1024; - break; - case 262144:// 512x512 lump - pflatsize = 512; - break; - case 65536: // 256x256 lump - pflatsize = 256; - break; - case 16384: // 128x128 lump - pflatsize = 128; - break; - case 1024: // 32x32 lump - pflatsize = 32; - break; - default: // 64x64 lump - pflatsize = 64; - break; - } - - grMipmap->width = (UINT16)pflatsize; - grMipmap->height = (UINT16)pflatsize; + grMipmap->width = pflatsize; + grMipmap->height = pflatsize; // the flat raw data needn't be converted with palettized textures - W_ReadLump(flatlumpnum, Z_Malloc(W_LumpLength(flatlumpnum), - PU_HWRCACHE, &grMipmap->data)); + W_ReadLump(flatlumpnum, Z_Malloc(size, PU_HWRCACHE, &grMipmap->data)); } static void HWR_CacheTextureAsFlat(GLMipmap_t *grMipmap, INT32 texturenum) diff --git a/src/hardware/hw_data.h b/src/hardware/hw_data.h index 5aba6a2a9..af65a4e65 100644 --- a/src/hardware/hw_data.h +++ b/src/hardware/hw_data.h @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/hardware/hw_defs.h b/src/hardware/hw_defs.h index 8df9b8916..b0859f478 100644 --- a/src/hardware/hw_defs.h +++ b/src/hardware/hw_defs.h @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/hardware/hw_draw.c b/src/hardware/hw_draw.c index e83aff0d7..eb0b9e332 100644 --- a/src/hardware/hw_draw.c +++ b/src/hardware/hw_draw.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -119,11 +119,6 @@ void HWR_DrawPatch(patch_t *gpatch, INT32 x, INT32 y, INT32 option) flags = PF_Translucent|PF_NoDepthTest; - if (option & V_WRAPX) - flags |= PF_ForceWrapX; - if (option & V_WRAPY) - flags |= PF_ForceWrapY; - // clip it since it is used for bunny scroll in doom I HWD.pfnDrawPolygon(NULL, v, 4, flags); } @@ -135,6 +130,7 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p float cx = FIXED_TO_FLOAT(x); float cy = FIXED_TO_FLOAT(y); UINT8 alphalevel = ((option & V_ALPHAMASK) >> V_ALPHASHIFT); + UINT8 blendmode = ((option & V_BLENDMASK) >> V_BLENDSHIFT); GLPatch_t *hwrPatch; // 3--2 @@ -145,9 +141,6 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p UINT8 perplayershuffle = 0; - if (alphalevel >= 10 && alphalevel < 13) - return; - // make patch ready in hardware cache if (!colormap) HWR_GetPatch(gpatch); @@ -191,15 +184,9 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p offsetx = (float)(gpatch->leftoffset) * fscalew; // top offset - // TODO: make some kind of vertical version of V_FLIP, maybe by deprecating V_OFFSET in future?!? + // TODO: make some kind of vertical version of V_FLIP offsety = (float)(gpatch->topoffset) * fscaleh; - if ((option & (V_NOSCALESTART|V_OFFSET)) == (V_NOSCALESTART|V_OFFSET)) // Multiply by dupx/dupy for crosshairs - { - offsetx *= dupx; - offsety *= dupy; - } - cx -= offsetx; cy -= offsety; } @@ -317,7 +304,7 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p } } - if (pscale != FRACUNIT || (splitscreen && option & V_PERPLAYER)) + if (pscale != FRACUNIT || vscale != FRACUNIT || (splitscreen && option & V_PERPLAYER)) { fwidth = (float)(gpatch->width) * fscalew * dupx; fheight = (float)(gpatch->height) * fscaleh * dupy; @@ -359,21 +346,17 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p v[0].t = v[1].t = 0.0f; v[2].t = v[3].t = hwrPatch->max_t; - flags = PF_Translucent|PF_NoDepthTest; - - if (option & V_WRAPX) - flags |= PF_ForceWrapX; - if (option & V_WRAPY) - flags |= PF_ForceWrapY; - // clip it since it is used for bunny scroll in doom I + flags = HWR_GetBlendModeFlag(blendmode+1)|PF_NoDepthTest; + if (alphalevel) { FSurfaceInfo Surf; Surf.PolyColor.s.red = Surf.PolyColor.s.green = Surf.PolyColor.s.blue = 0xff; - if (alphalevel == 13) Surf.PolyColor.s.alpha = softwaretranstogl_lo[st_translucency]; - else if (alphalevel == 14) Surf.PolyColor.s.alpha = softwaretranstogl[st_translucency]; - else if (alphalevel == 15) Surf.PolyColor.s.alpha = softwaretranstogl_hi[st_translucency]; + + if (alphalevel == 10) Surf.PolyColor.s.alpha = softwaretranstogl_lo[st_translucency]; // V_HUDTRANSHALF + else if (alphalevel == 11) Surf.PolyColor.s.alpha = softwaretranstogl[st_translucency]; // V_HUDTRANS + else if (alphalevel == 12) Surf.PolyColor.s.alpha = softwaretranstogl_hi[st_translucency]; // V_HUDTRANSDOUBLE else Surf.PolyColor.s.alpha = softwaretranstogl[10-alphalevel]; flags |= PF_Modulated; HWD.pfnDrawPolygon(&Surf, v, 4, flags); @@ -382,26 +365,30 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p HWD.pfnDrawPolygon(NULL, v, 4, flags); } -void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale, INT32 option, fixed_t sx, fixed_t sy, fixed_t w, fixed_t h) +void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 option, const UINT8 *colormap, fixed_t sx, fixed_t sy, fixed_t w, fixed_t h) { FOutVector v[4]; FBITFIELD flags; float cx = FIXED_TO_FLOAT(x); float cy = FIXED_TO_FLOAT(y); UINT8 alphalevel = ((option & V_ALPHAMASK) >> V_ALPHASHIFT); + UINT8 blendmode = ((option & V_BLENDMASK) >> V_BLENDSHIFT); GLPatch_t *hwrPatch; // 3--2 // | /| // |/ | // 0--1 - float dupx, dupy, fscale, fwidth, fheight; + float dupx, dupy, fscalew, fscaleh, fwidth, fheight; - if (alphalevel >= 10 && alphalevel < 13) - return; + UINT8 perplayershuffle = 0; // make patch ready in hardware cache - HWR_GetPatch(gpatch); + if (!colormap) + HWR_GetPatch(gpatch); + else + HWR_GetMappedPatch(gpatch, colormap); + hwrPatch = ((GLPatch_t *)gpatch->hardware); dupx = (float)vid.dupx; @@ -423,12 +410,80 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale, } dupx = dupy = (dupx < dupy ? dupx : dupy); - fscale = FIXED_TO_FLOAT(pscale); + fscalew = fscaleh = FIXED_TO_FLOAT(pscale); + if (vscale != pscale) + fscaleh = FIXED_TO_FLOAT(vscale); - // fuck it, no GL support for croppedpatch v_perplayer right now. it's not like it's accessible to Lua or anything, and we only use it for menus... + cx -= (float)(gpatch->leftoffset) * fscalew; + cy -= (float)(gpatch->topoffset) * fscaleh; - cy -= (float)(gpatch->topoffset) * fscale; - cx -= (float)(gpatch->leftoffset) * fscale; + if (splitscreen && (option & V_PERPLAYER)) + { + float adjusty = ((option & V_NOSCALESTART) ? vid.height : BASEVIDHEIGHT)/2.0f; + fscaleh /= 2; + cy /= 2; +#ifdef QUADS + if (splitscreen > 1) // 3 or 4 players + { + float adjustx = ((option & V_NOSCALESTART) ? vid.width : BASEVIDWIDTH)/2.0f; + fscalew /= 2; + cx /= 2; + if (stplyr == &players[displayplayer]) + { + if (!(option & (V_SNAPTOTOP|V_SNAPTOBOTTOM))) + perplayershuffle |= 1; + if (!(option & (V_SNAPTOLEFT|V_SNAPTORIGHT))) + perplayershuffle |= 4; + option &= ~V_SNAPTOBOTTOM|V_SNAPTORIGHT; + } + else if (stplyr == &players[secondarydisplayplayer]) + { + if (!(option & (V_SNAPTOTOP|V_SNAPTOBOTTOM))) + perplayershuffle |= 1; + if (!(option & (V_SNAPTOLEFT|V_SNAPTORIGHT))) + perplayershuffle |= 8; + cx += adjustx; + option &= ~V_SNAPTOBOTTOM|V_SNAPTOLEFT; + } + else if (stplyr == &players[thirddisplayplayer]) + { + if (!(option & (V_SNAPTOTOP|V_SNAPTOBOTTOM))) + perplayershuffle |= 2; + if (!(option & (V_SNAPTOLEFT|V_SNAPTORIGHT))) + perplayershuffle |= 4; + cy += adjusty; + option &= ~V_SNAPTOTOP|V_SNAPTORIGHT; + } + else if (stplyr == &players[fourthdisplayplayer]) + { + if (!(option & (V_SNAPTOTOP|V_SNAPTOBOTTOM))) + perplayershuffle |= 2; + if (!(option & (V_SNAPTOLEFT|V_SNAPTORIGHT))) + perplayershuffle |= 8; + cx += adjustx; + cy += adjusty; + option &= ~V_SNAPTOTOP|V_SNAPTOLEFT; + } + } + else +#endif + // 2 players + { + if (stplyr == &players[displayplayer]) + { + if (!(option & (V_SNAPTOTOP|V_SNAPTOBOTTOM))) + perplayershuffle = 1; + option &= ~V_SNAPTOBOTTOM; + } + else //if (stplyr == &players[secondarydisplayplayer]) + { + if (!(option & (V_SNAPTOTOP|V_SNAPTOBOTTOM))) + perplayershuffle = 2; + cy += adjusty; + option &= ~V_SNAPTOTOP; + } + } + } if (!(option & V_NOSCALESTART)) { @@ -447,6 +502,10 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale, cx += ((float)vid.width - ((float)BASEVIDWIDTH * dupx)); else if (!(option & V_SNAPTOLEFT)) cx += ((float)vid.width - ((float)BASEVIDWIDTH * dupx))/2; + if (perplayershuffle & 4) + cx -= ((float)vid.width - ((float)BASEVIDWIDTH * dupx))/4; + else if (perplayershuffle & 8) + cx += ((float)vid.width - ((float)BASEVIDWIDTH * dupx))/4; } if (fabsf((float)vid.height - (float)BASEVIDHEIGHT * dupy) > 1.0E-36f) { @@ -454,23 +513,27 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale, cy += ((float)vid.height - ((float)BASEVIDHEIGHT * dupy)); else if (!(option & V_SNAPTOTOP)) cy += ((float)vid.height - ((float)BASEVIDHEIGHT * dupy))/2; + if (perplayershuffle & 1) + cy -= ((float)vid.height - ((float)BASEVIDHEIGHT * dupy))/4; + else if (perplayershuffle & 2) + cy += ((float)vid.height - ((float)BASEVIDHEIGHT * dupy))/4; } } } - fwidth = w; - fheight = h; + fwidth = FIXED_TO_FLOAT(w); + fheight = FIXED_TO_FLOAT(h); - if (sx + w > gpatch->width) - fwidth = gpatch->width - sx; + if (sx + w > gpatch->width<width< gpatch->height) - fheight = gpatch->height - sy; + if (sy + h > gpatch->height<height<width))*hwrPatch->max_s; - if (sx + w > gpatch->width) + v[0].s = v[3].s = (FIXED_TO_FLOAT(sx)/(float)(gpatch->width))*hwrPatch->max_s; + if (sx + w > gpatch->width<max_s; else - v[2].s = v[1].s = ((sx+w)/(float)(gpatch->width))*hwrPatch->max_s; + v[2].s = v[1].s = (FIXED_TO_FLOAT(sx+w)/(float)(gpatch->width))*hwrPatch->max_s; - v[0].t = v[1].t = ((sy)/(float)(gpatch->height))*hwrPatch->max_t; - if (sy + h > gpatch->height) + v[0].t = v[1].t = (FIXED_TO_FLOAT(sy)/(float)(gpatch->height))*hwrPatch->max_t; + if (sy + h > gpatch->height<max_t; else - v[2].t = v[3].t = ((sy+h)/(float)(gpatch->height))*hwrPatch->max_t; + v[2].t = v[3].t = (FIXED_TO_FLOAT(sy+h)/(float)(gpatch->height))*hwrPatch->max_t; - flags = PF_Translucent|PF_NoDepthTest; + // Auto-crop at splitscreen borders! + if (splitscreen && (option & V_PERPLAYER)) + { +#define flerp(a,b,amount) (((a) * (1.0f - (amount))) + ((b) * (amount))) // Float lerp - if (option & V_WRAPX) - flags |= PF_ForceWrapX; - if (option & V_WRAPY) - flags |= PF_ForceWrapY; +#ifdef QUADS + if (splitscreen > 1) // 3 or 4 players + { + #error Auto-cropping doesnt take quadscreen into account! Fix it! + // Hint: For player 1/2, copy player 1's code below. For player 3/4, copy player 2's code below + // For player 1/3 and 2/4, mangle the below code to apply horizontally instead of vertically + } + else +#endif + // 2 players + { + if (stplyr == &players[displayplayer]) // Player 1's screen, crop at the bottom + { + if ((cy - fheight) < 0) // If the bottom is below the border + { + if (cy <= 0) // If the whole patch is beyond the border... + return; // ...crop away the entire patch, don't draw anything + + if (fheight <= 0) // Don't divide by zero + return; + + v[2].y = v[3].y = 0; // Clamp the polygon edge vertex position + // Now for the UV-map... Uh-oh, math time! + + // On second thought, a basic linear interpolation suffices + //float full_height = fheight; + //float cropped_height = fheight - cy; + //float remaining_height = cy; + //float cropped_percentage = (fheight - cy) / fheight; + //float remaining_percentage = cy / fheight; + //v[2].t = v[3].t = lerp(v[2].t, v[0].t, cropped_percentage); + // By swapping v[2] and v[0], we can use remaining_percentage for less operations + //v[2].t = v[3].t = lerp(v[0].t, v[2].t, remaining_percentage); + + v[2].t = v[3].t = flerp(v[0].t, v[2].t, cy/fheight); + } + } + else //if (stplyr == &players[secondarydisplayplayer]) // Player 2's screen, crop at the top + { + if (cy > 0) // If the top is above the border + { + if ((cy - fheight) >= 0) // If the whole patch is beyond the border... + return; // ...crop away the entire patch, don't draw anything + + if (fheight <= 0) // Don't divide by zero + return; + + v[0].y = v[1].y = 0; // Clamp the polygon edge vertex position + // Now for the UV-map... Uh-oh, math time! + + // On second thought, a basic linear interpolation suffices + //float full_height = fheight; + //float cropped_height = cy; + //float remaining_height = fheight - cy; + //float cropped_percentage = cy / fheight; + //float remaining_percentage = (fheight - cy) / fheight; + //v[0].t = v[1].t = lerp(v[0].t, v[2].t, cropped_percentage); + + v[0].t = v[1].t = flerp(v[0].t, v[2].t, cy/fheight); + } + } + } +#undef flerp + } // clip it since it is used for bunny scroll in doom I + flags = HWR_GetBlendModeFlag(blendmode+1)|PF_NoDepthTest; + if (alphalevel) { FSurfaceInfo Surf; Surf.PolyColor.s.red = Surf.PolyColor.s.green = Surf.PolyColor.s.blue = 0xff; - if (alphalevel == 13) Surf.PolyColor.s.alpha = softwaretranstogl_lo[st_translucency]; - else if (alphalevel == 14) Surf.PolyColor.s.alpha = softwaretranstogl[st_translucency]; - else if (alphalevel == 15) Surf.PolyColor.s.alpha = softwaretranstogl_hi[st_translucency]; + + if (alphalevel == 10) Surf.PolyColor.s.alpha = softwaretranstogl_lo[st_translucency]; // V_HUDTRANSHALF + else if (alphalevel == 11) Surf.PolyColor.s.alpha = softwaretranstogl[st_translucency]; // V_HUDTRANS + else if (alphalevel == 12) Surf.PolyColor.s.alpha = softwaretranstogl_hi[st_translucency]; // V_HUDTRANSDOUBLE else Surf.PolyColor.s.alpha = softwaretranstogl[10-alphalevel]; + flags |= PF_Modulated; HWD.pfnDrawPolygon(&Surf, v, 4, flags); } @@ -575,42 +705,10 @@ void HWR_DrawPic(INT32 x, INT32 y, lumpnum_t lumpnum) // -------------------------------------------------------------------------- void HWR_DrawFlatFill (INT32 x, INT32 y, INT32 w, INT32 h, lumpnum_t flatlumpnum) { - FOutVector v[4]; - double dflatsize; - INT32 flatflag; + FOutVector v[4]; const size_t len = W_LumpLength(flatlumpnum); - - switch (len) - { - case 4194304: // 2048x2048 lump - dflatsize = 2048.0f; - flatflag = 2047; - break; - case 1048576: // 1024x1024 lump - dflatsize = 1024.0f; - flatflag = 1023; - break; - case 262144:// 512x512 lump - dflatsize = 512.0f; - flatflag = 511; - break; - case 65536: // 256x256 lump - dflatsize = 256.0f; - flatflag = 255; - break; - case 16384: // 128x128 lump - dflatsize = 128.0f; - flatflag = 127; - break; - case 1024: // 32x32 lump - dflatsize = 32.0f; - flatflag = 31; - break; - default: // 64x64 lump - dflatsize = 64.0f; - flatflag = 63; - break; - } + UINT16 flatflag = R_GetFlatSize(len) - 1; + double dflatsize = (double)(flatflag + 1); // 3--2 // | /| @@ -624,7 +722,6 @@ void HWR_DrawFlatFill (INT32 x, INT32 y, INT32 w, INT32 h, lumpnum_t flatlumpnum v[0].z = v[1].z = v[2].z = v[3].z = 1.0f; - // flat is 64x64 lod and texture offsets are [0.0, 1.0] v[0].s = v[3].s = (float)((x & flatflag)/dflatsize); v[2].s = v[1].s = (float)(v[0].s + w/dflatsize); v[0].t = v[1].t = (float)((y & flatflag)/dflatsize); diff --git a/src/hardware/hw_drv.h b/src/hardware/hw_drv.h index d4a586d41..426d2f283 100644 --- a/src/hardware/hw_drv.h +++ b/src/hardware/hw_drv.h @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -51,7 +51,7 @@ EXPORT void HWRAPI(ClearMipMapCache) (void); EXPORT void HWRAPI(SetSpecialState) (hwdspecialstate_t IdState, INT32 Value); //Hurdler: added for new development -EXPORT void HWRAPI(DrawModel) (model_t *model, INT32 frameIndex, INT32 duration, INT32 tics, INT32 nextFrameIndex, FTransform *pos, float scale, UINT8 flipped, UINT8 hflipped, FSurfaceInfo *Surface); +EXPORT void HWRAPI(DrawModel) (model_t *model, INT32 frameIndex, float duration, float tics, INT32 nextFrameIndex, FTransform *pos, float scale, UINT8 flipped, UINT8 hflipped, FSurfaceInfo *Surface); EXPORT void HWRAPI(CreateModelVBOs) (model_t *model); EXPORT void HWRAPI(SetTransform) (FTransform *ptransform); EXPORT INT32 HWRAPI(GetTextureUsed) (void); diff --git a/src/hardware/hw_glob.h b/src/hardware/hw_glob.h index 37d77b467..b5daba822 100644 --- a/src/hardware/hw_glob.h +++ b/src/hardware/hw_glob.h @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -74,6 +74,8 @@ typedef struct gl_vissprite_s float spritexscale, spriteyscale; float spritexoffset, spriteyoffset; + skincolornum_t color; + UINT32 renderflags; UINT8 rotateflags; @@ -82,9 +84,11 @@ typedef struct gl_vissprite_s boolean rotated; UINT8 translucency; //alpha level 0-255 + angle_t angle; // for splats + //Hurdler: 25/04/2000: now support colormap in hardware mode UINT8 *colormap; - INT32 dispoffset; // copy of info->dispoffset, affects ordering but not drawing + INT32 dispoffset; // copy of mobj->dispoffset, affects ordering but not drawing patch_t *gpatch; mobj_t *mobj; // NOTE: This is a precipmobj_t if precip is true !!! Watch out. diff --git a/src/hardware/hw_light.c b/src/hardware/hw_light.c index e83d9a6ec..c1f0b3407 100644 --- a/src/hardware/hw_light.c +++ b/src/hardware/hw_light.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/hardware/hw_light.h b/src/hardware/hw_light.h index 244cc921f..e9d87933d 100644 --- a/src/hardware/hw_light.h +++ b/src/hardware/hw_light.h @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index d413e3bbe..897288da2 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -24,6 +24,7 @@ #include "../v_video.h" #include "../p_local.h" #include "../p_setup.h" +#include "../r_fps.h" #include "../r_local.h" #include "../r_patch.h" #include "../r_picformats.h" @@ -38,6 +39,7 @@ #include "../m_cheat.h" #include "../f_finale.h" #include "../r_things.h" // R_GetShadowZ +#include "../d_main.h" #include "../p_slopes.h" #include "hw_md2.h" @@ -147,22 +149,22 @@ static angle_t gl_aimingangle; static void HWR_SetTransformAiming(FTransform *trans, player_t *player, boolean skybox); // Render stats -precise_t ps_hw_skyboxtime = 0; -precise_t ps_hw_nodesorttime = 0; -precise_t ps_hw_nodedrawtime = 0; -precise_t ps_hw_spritesorttime = 0; -precise_t ps_hw_spritedrawtime = 0; +ps_metric_t ps_hw_skyboxtime = {0}; +ps_metric_t ps_hw_nodesorttime = {0}; +ps_metric_t ps_hw_nodedrawtime = {0}; +ps_metric_t ps_hw_spritesorttime = {0}; +ps_metric_t ps_hw_spritedrawtime = {0}; // Render stats for batching -int ps_hw_numpolys = 0; -int ps_hw_numverts = 0; -int ps_hw_numcalls = 0; -int ps_hw_numshaders = 0; -int ps_hw_numtextures = 0; -int ps_hw_numpolyflags = 0; -int ps_hw_numcolors = 0; -precise_t ps_hw_batchsorttime = 0; -precise_t ps_hw_batchdrawtime = 0; +ps_metric_t ps_hw_numpolys = {0}; +ps_metric_t ps_hw_numverts = {0}; +ps_metric_t ps_hw_numcalls = {0}; +ps_metric_t ps_hw_numshaders = {0}; +ps_metric_t ps_hw_numtextures = {0}; +ps_metric_t ps_hw_numpolyflags = {0}; +ps_metric_t ps_hw_numcolors = {0}; +ps_metric_t ps_hw_batchsorttime = {0}; +ps_metric_t ps_hw_batchdrawtime = {0}; boolean gl_init = false; boolean gl_maploaded = false; @@ -358,30 +360,39 @@ static FUINT HWR_CalcSlopeLight(FUINT lightnum, angle_t dir, fixed_t delta) // -----------------+ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, boolean isceiling, fixed_t fixedheight, FBITFIELD PolyFlags, INT32 lightlevel, levelflat_t *levelflat, sector_t *FOFsector, UINT8 alpha, extracolormap_t *planecolormap) { - polyvertex_t * pv; - float height; //constant y for all points on the convex flat polygon - FOutVector *v3d; - INT32 nrPlaneVerts; //verts original define of convex flat polygon - INT32 i; - float flatxref,flatyref; - float fflatwidth = 64.0f, fflatheight = 64.0f; - INT32 flatflag = 63; - boolean texflat = false; - float scrollx = 0.0f, scrolly = 0.0f, anglef = 0.0f; - angle_t angle = 0; - FSurfaceInfo Surf; - float tempxsow, tempytow; + FSurfaceInfo Surf; + FOutVector *v3d; + polyvertex_t *pv; pslope_t *slope = NULL; + INT32 shader = SHADER_DEFAULT; + + size_t nrPlaneVerts; + INT32 i; + + float height; // constant y for all points on the convex flat polygon + float flatxref, flatyref, anglef = 0.0f; + float fflatwidth = 64.0f, fflatheight = 64.0f; + UINT16 flatflag = 63; + + boolean texflat = false; + + float tempxsow, tempytow; + float scrollx = 0.0f, scrolly = 0.0f; + angle_t angle = 0; static FOutVector *planeVerts = NULL; static UINT16 numAllocedPlaneVerts = 0; - INT32 shader = SHADER_DEFAULT; - // no convex poly were generated for this subsector if (!xsub->planepoly) return; + pv = xsub->planepoly->pts; + nrPlaneVerts = xsub->planepoly->numpts; + + if (nrPlaneVerts < 3) // not even a triangle? + return; + // Get the slope pointer to simplify future code if (FOFsector) { @@ -404,12 +415,6 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool height = FIXED_TO_FLOAT(fixedheight); - pv = xsub->planepoly->pts; - nrPlaneVerts = xsub->planepoly->numpts; - - if (nrPlaneVerts < 3) //not even a triangle ? - return; - // Allocate plane-vertex buffer if we need to if (!planeVerts || nrPlaneVerts > numAllocedPlaneVerts) { @@ -424,31 +429,8 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool if (levelflat->type == LEVELFLAT_FLAT) { size_t len = W_LumpLength(levelflat->u.flat.lumpnum); - switch (len) - { - case 4194304: // 2048x2048 lump - fflatwidth = fflatheight = 2048.0f; - break; - case 1048576: // 1024x1024 lump - fflatwidth = fflatheight = 1024.0f; - break; - case 262144:// 512x512 lump - fflatwidth = fflatheight = 512.0f; - break; - case 65536: // 256x256 lump - fflatwidth = fflatheight = 256.0f; - break; - case 16384: // 128x128 lump - fflatwidth = fflatheight = 128.0f; - break; - case 1024: // 32x32 lump - fflatwidth = fflatheight = 32.0f; - break; - default: // 64x64 lump - fflatwidth = fflatheight = 64.0f; - break; - } - flatflag = ((INT32)fflatwidth)-1; + flatflag = R_GetFlatSize(len) - 1; + fflatwidth = fflatheight = (float)(flatflag + 1); } else { @@ -548,7 +530,7 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool }\ } - for (i = 0, v3d = planeVerts; i < nrPlaneVerts; i++,v3d++,pv++) + for (i = 0, v3d = planeVerts; i < (INT32)nrPlaneVerts; i++,v3d++,pv++) SETUP3DVERT(v3d, pv->x, pv->y); if (slope) @@ -556,7 +538,7 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool HWR_Lighting(&Surf, lightlevel, planecolormap); - if (PolyFlags & (PF_Translucent|PF_Fog)) + if (PolyFlags & (PF_Translucent|PF_Fog|PF_Additive|PF_Subtractive|PF_ReverseSubtract|PF_Multiplicative|PF_Environment)) { Surf.PolyColor.s.alpha = (UINT8)alpha; PolyFlags |= PF_Modulated; @@ -838,15 +820,10 @@ static float HWR_ClipViewSegment(INT32 x, polyvertex_t *v1, polyvertex_t *v2) } #endif -// -// HWR_SplitWall -// +// SoM: split up and light walls according to the lightlist. +// This may also include leaving out parts of the wall that can't be seen static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum, FSurfaceInfo* Surf, INT32 cutflag, ffloor_t *pfloor, FBITFIELD polyflags) { - /* SoM: split up and light walls according to the - lightlist. This may also include leaving out parts - of the wall that can't be seen */ - float realtop, realbot, top, bot; float pegt, pegb, pegmul; float height = 0.0f, bheight = 0.0f; @@ -855,41 +832,54 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum, float endpegt, endpegb, endpegmul; float endheight = 0.0f, endbheight = 0.0f; - // compiler complains when P_GetSlopeZAt is used in FLOAT_TO_FIXED directly - // use this as a temp var to store P_GetSlopeZAt's return value each time - fixed_t temp; + float diff; - fixed_t v1x = FLOAT_TO_FIXED(wallVerts[0].x); - fixed_t v1y = FLOAT_TO_FIXED(wallVerts[0].z); // not a typo - fixed_t v2x = FLOAT_TO_FIXED(wallVerts[1].x); - fixed_t v2y = FLOAT_TO_FIXED(wallVerts[1].z); // not a typo + fixed_t v1x = FloatToFixed(wallVerts[0].x); + fixed_t v1y = FloatToFixed(wallVerts[0].z); + fixed_t v2x = FloatToFixed(wallVerts[1].x); + fixed_t v2y = FloatToFixed(wallVerts[1].z); - INT32 solid, i; - lightlist_t * list = sector->lightlist; const UINT8 alpha = Surf->PolyColor.s.alpha; FUINT lightnum = HWR_CalcWallLight(sector->lightlevel, v1x, v1y, v2x, v2y); extracolormap_t *colormap = NULL; realtop = top = wallVerts[3].y; realbot = bot = wallVerts[0].y; + diff = top - bot; + pegt = wallVerts[3].t; pegb = wallVerts[0].t; - pegmul = (pegb - pegt) / (top - bot); + + // Lactozilla: If both heights of a side lay on the same position, then this wall is a triangle. + // To avoid division by zero, which would result in a NaN, we check if the vertical difference + // between the two vertices is not zero. + if (fpclassify(diff) == FP_ZERO) + pegmul = 0.0; + else + pegmul = (pegb - pegt) / diff; endrealtop = endtop = wallVerts[2].y; endrealbot = endbot = wallVerts[1].y; + diff = endtop - endbot; + endpegt = wallVerts[2].t; endpegb = wallVerts[1].t; - endpegmul = (endpegb - endpegt) / (endtop - endbot); - for (i = 0; i < sector->numlights; i++) + if (fpclassify(diff) == FP_ZERO) + endpegmul = 0.0; + else + endpegmul = (endpegb - endpegt) / diff; + + for (INT32 i = 0; i < sector->numlights; i++) { if (endtop < endrealbot && top < realbot) return; - if (!(list[i].flags & FF_NOSHADE)) + lightlist_t *list = sector->lightlist; + + if (!(list[i].flags & FOF_NOSHADE)) { - if (pfloor && (pfloor->flags & FF_FOG)) + if (pfloor && (pfloor->fofflags & FOF_FOG)) { lightnum = HWR_CalcWallLight(pfloor->master->frontsector->lightlevel, v1x, v1y, v2x, v2y); colormap = pfloor->master->frontsector->extra_colormap; @@ -901,15 +891,15 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum, } } - solid = false; + boolean solid = false; - if ((sector->lightlist[i].flags & FF_CUTSOLIDS) && !(cutflag & FF_EXTRA)) + if ((sector->lightlist[i].flags & FOF_CUTSOLIDS) && !(cutflag & FOF_EXTRA)) solid = true; - else if ((sector->lightlist[i].flags & FF_CUTEXTRA) && (cutflag & FF_EXTRA)) + else if ((sector->lightlist[i].flags & FOF_CUTEXTRA) && (cutflag & FOF_EXTRA)) { - if (sector->lightlist[i].flags & FF_EXTRA) + if (sector->lightlist[i].flags & FOF_EXTRA) { - if ((sector->lightlist[i].flags & (FF_FOG|FF_SWIMMABLE)) == (cutflag & (FF_FOG|FF_SWIMMABLE))) // Only merge with your own types + if ((sector->lightlist[i].flags & (FOF_FOG|FOF_SWIMMABLE)) == (cutflag & (FOF_FOG|FOF_SWIMMABLE))) // Only merge with your own types solid = true; } else @@ -918,16 +908,12 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum, else solid = false; - temp = P_GetLightZAt(&list[i], v1x, v1y); - height = FIXED_TO_FLOAT(temp); - temp = P_GetLightZAt(&list[i], v2x, v2y); - endheight = FIXED_TO_FLOAT(temp); + height = FixedToFloat(P_GetLightZAt(&list[i], v1x, v1y)); + endheight = FixedToFloat(P_GetLightZAt(&list[i], v2x, v2y)); if (solid) { - temp = P_GetFFloorBottomZAt(list[i].caster, v1x, v1y); - bheight = FIXED_TO_FLOAT(temp); - temp = P_GetFFloorBottomZAt(list[i].caster, v2x, v2y); - endbheight = FIXED_TO_FLOAT(temp); + bheight = FixedToFloat(P_GetFFloorBottomZAt(list[i].caster, v1x, v1y)); + endbheight = FixedToFloat(P_GetFFloorBottomZAt(list[i].caster, v2x, v2y)); } if (endheight >= endtop && height >= top) @@ -940,10 +926,8 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum, if (i + 1 < sector->numlights) { - temp = P_GetLightZAt(&list[i+1], v1x, v1y); - bheight = FIXED_TO_FLOAT(temp); - temp = P_GetLightZAt(&list[i+1], v2x, v2y); - endbheight = FIXED_TO_FLOAT(temp); + bheight = FixedToFloat(P_GetLightZAt(&list[i+1], v1x, v1y)); + endbheight = FixedToFloat(P_GetLightZAt(&list[i+1], v2x, v2y)); } else { @@ -951,19 +935,10 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum, endbheight = endrealbot; } - if (endbheight >= endtop && bheight >= top) - continue; - - //Found a break; - bot = bheight; - - if (bot < realbot) - bot = realbot; - - endbot = endbheight; - - if (endbot < endrealbot) - endbot = endrealbot; + // Found a break + // The heights are clamped to ensure the polygon doesn't cross itself. + bot = min(max(bheight, realbot), top); + endbot = min(max(endbheight, endrealbot), endtop); Surf->PolyColor.s.alpha = alpha; @@ -978,10 +953,10 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum, wallVerts[0].y = bot; wallVerts[1].y = endbot; - if (cutflag & FF_FOG) + if (cutflag & FOF_FOG) HWR_AddTransparentWall(wallVerts, Surf, texnum, PF_Fog|PF_NoTexture|polyflags, true, lightnum, colormap); - else if (cutflag & FF_TRANSLUCENT) - HWR_AddTransparentWall(wallVerts, Surf, texnum, PF_Translucent|polyflags, false, lightnum, colormap); + else if (polyflags & (PF_Translucent|PF_Additive|PF_Subtractive|PF_ReverseSubtract|PF_Multiplicative|PF_Environment)) + HWR_AddTransparentWall(wallVerts, Surf, texnum, polyflags, false, lightnum, colormap); else HWR_ProjectWall(wallVerts, Surf, PF_Masked|polyflags, lightnum, colormap); @@ -1007,10 +982,10 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum, wallVerts[0].y = bot; wallVerts[1].y = endbot; - if (cutflag & FF_FOG) + if (cutflag & FOF_FOG) HWR_AddTransparentWall(wallVerts, Surf, texnum, PF_Fog|PF_NoTexture|polyflags, true, lightnum, colormap); - else if (cutflag & FF_TRANSLUCENT) - HWR_AddTransparentWall(wallVerts, Surf, texnum, PF_Translucent|polyflags, false, lightnum, colormap); + else if (polyflags & (PF_Translucent|PF_Additive|PF_Subtractive|PF_ReverseSubtract|PF_Multiplicative|PF_Environment)) + HWR_AddTransparentWall(wallVerts, Surf, texnum, polyflags, false, lightnum, colormap); else HWR_ProjectWall(wallVerts, Surf, PF_Masked|polyflags, lightnum, colormap); } @@ -1032,6 +1007,42 @@ static void HWR_DrawSkyWall(FOutVector *wallVerts, FSurfaceInfo *Surf) // PF_Occlude is set in HWR_ProjectWall to draw into the depth buffer } +// Returns true if the midtexture is visible, and false if... it isn't... +static boolean HWR_BlendMidtextureSurface(FSurfaceInfo *pSurf) +{ + FUINT blendmode = PF_Masked; + + pSurf->PolyColor.s.alpha = 0xFF; + + if (!gl_curline->polyseg) + { + if (gl_linedef->blendmode && gl_linedef->blendmode != AST_FOG) + { + if (gl_linedef->alpha >= 0 && gl_linedef->alpha < FRACUNIT) + blendmode = HWR_SurfaceBlend(gl_linedef->blendmode, R_GetLinedefTransTable(gl_linedef->alpha), pSurf); + else + blendmode = HWR_GetBlendModeFlag(gl_linedef->blendmode); + } + else if (gl_linedef->alpha >= 0 && gl_linedef->alpha < FRACUNIT) + blendmode = HWR_TranstableToAlpha(R_GetLinedefTransTable(gl_linedef->alpha), pSurf); + } + else if (gl_curline->polyseg->translucency > 0) + { + // Polyobject translucency is done differently + if (gl_curline->polyseg->translucency >= NUMTRANSMAPS) // wall not drawn + return false; + else + blendmode = HWR_TranstableToAlpha(gl_curline->polyseg->translucency, pSurf); + } + + if (blendmode != PF_Masked && pSurf->PolyColor.s.alpha == 0x00) + return false; + + pSurf->PolyFlags = blendmode; + + return true; +} + // // HWR_ProcessSeg // A portion or all of a wall segment will be drawn, from startfrac to endfrac, @@ -1050,16 +1061,9 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom fixed_t worldhighslope = 0, worldlowslope = 0; fixed_t v1x, v1y, v2x, v2y; - GLMapTexture_t *grTex = NULL; - float cliplow = 0.0f, cliphigh = 0.0f; - INT32 gl_midtexture; fixed_t h, l; // 3D sides and 2s middle textures fixed_t hS, lS; - FUINT lightnum = 0; // shut up compiler - extracolormap_t *colormap; - FSurfaceInfo Surf; - gl_sidedef = gl_curline->sidedef; gl_linedef = gl_curline->linedef; @@ -1093,22 +1097,25 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom wallVerts[2].z = wallVerts[1].z = ve.y; // x offset the texture - { - fixed_t texturehpeg = gl_sidedef->textureoffset + gl_curline->offset; - cliplow = (float)texturehpeg; - cliphigh = (float)(texturehpeg + (gl_curline->flength*FRACUNIT)); - } + fixed_t texturehpeg = gl_sidedef->textureoffset + gl_curline->offset; + float cliplow = (float)texturehpeg; + float cliphigh = (float)(texturehpeg + (gl_curline->flength*FRACUNIT)); - lightnum = HWR_CalcWallLight(gl_frontsector->lightlevel, vs.x, vs.y, ve.x, ve.y); - colormap = gl_frontsector->extra_colormap; + FUINT lightnum = HWR_CalcWallLight(gl_frontsector->lightlevel, vs.x, vs.y, ve.x, ve.y); + extracolormap_t *colormap = gl_frontsector->extra_colormap; - if (gl_frontsector) - Surf.PolyColor.s.alpha = 255; + FSurfaceInfo Surf; + Surf.PolyColor.s.alpha = 255; + INT32 gl_midtexture = R_GetTextureNum(gl_sidedef->midtexture); + GLMapTexture_t *grTex = NULL; + + // two sided line if (gl_backsector) { INT32 gl_toptexture = 0, gl_bottomtexture = 0; - // two sided line + fixed_t texturevpeg; + boolean bothceilingssky = false; // turned on if both back and front ceilings are sky boolean bothfloorssky = false; // likewise, but for floors @@ -1138,51 +1145,47 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom // check TOP TEXTURE if ((worldhighslope < worldtopslope || worldhigh < worldtop) && gl_toptexture) { + // PEGGING + if (gl_linedef->flags & ML_DONTPEGTOP) + texturevpeg = 0; + else if (gl_linedef->flags & ML_SKEWTD) + texturevpeg = worldhigh + textureheight[gl_toptexture] - worldtop; + else + texturevpeg = gl_backsector->ceilingheight + textureheight[gl_toptexture] - gl_frontsector->ceilingheight; + + texturevpeg += gl_sidedef->rowoffset; + + // This is so that it doesn't overflow and screw up the wall, it doesn't need to go higher than the texture's height anyway + texturevpeg %= textureheight[gl_toptexture]; + + grTex = HWR_GetTexture(gl_toptexture); + + wallVerts[3].t = wallVerts[2].t = texturevpeg * grTex->scaleY; + wallVerts[0].t = wallVerts[1].t = (texturevpeg + gl_frontsector->ceilingheight - gl_backsector->ceilingheight) * grTex->scaleY; + wallVerts[0].s = wallVerts[3].s = cliplow * grTex->scaleX; + wallVerts[2].s = wallVerts[1].s = cliphigh * grTex->scaleX; + + // Adjust t value for sloped walls + if (!(gl_linedef->flags & ML_SKEWTD)) { - fixed_t texturevpegtop; // top - - grTex = HWR_GetTexture(gl_toptexture); - - // PEGGING - if (gl_linedef->flags & ML_DONTPEGTOP) - texturevpegtop = 0; - else if (gl_linedef->flags & ML_EFFECT1) - texturevpegtop = worldhigh + textureheight[gl_sidedef->toptexture] - worldtop; - else - texturevpegtop = gl_backsector->ceilingheight + textureheight[gl_sidedef->toptexture] - gl_frontsector->ceilingheight; - - texturevpegtop += gl_sidedef->rowoffset; - - // This is so that it doesn't overflow and screw up the wall, it doesn't need to go higher than the texture's height anyway - texturevpegtop %= (textures[gl_toptexture]->height)<scaleY; - wallVerts[0].t = wallVerts[1].t = (texturevpegtop + gl_frontsector->ceilingheight - gl_backsector->ceilingheight) * grTex->scaleY; - wallVerts[0].s = wallVerts[3].s = cliplow * grTex->scaleX; - wallVerts[2].s = wallVerts[1].s = cliphigh * grTex->scaleX; - - // Adjust t value for sloped walls - if (!(gl_linedef->flags & ML_EFFECT1)) - { - // Unskewed - wallVerts[3].t -= (worldtop - gl_frontsector->ceilingheight) * grTex->scaleY; - wallVerts[2].t -= (worldtopslope - gl_frontsector->ceilingheight) * grTex->scaleY; - wallVerts[0].t -= (worldhigh - gl_backsector->ceilingheight) * grTex->scaleY; - wallVerts[1].t -= (worldhighslope - gl_backsector->ceilingheight) * grTex->scaleY; - } - else if (gl_linedef->flags & ML_DONTPEGTOP) - { - // Skewed by top - wallVerts[0].t = (texturevpegtop + worldtop - worldhigh) * grTex->scaleY; - wallVerts[1].t = (texturevpegtop + worldtopslope - worldhighslope) * grTex->scaleY; - } - else - { - // Skewed by bottom - wallVerts[0].t = wallVerts[1].t = (texturevpegtop + worldtop - worldhigh) * grTex->scaleY; - wallVerts[3].t = wallVerts[0].t - (worldtop - worldhigh) * grTex->scaleY; - wallVerts[2].t = wallVerts[1].t - (worldtopslope - worldhighslope) * grTex->scaleY; - } + // Unskewed + wallVerts[3].t -= (worldtop - gl_frontsector->ceilingheight) * grTex->scaleY; + wallVerts[2].t -= (worldtopslope - gl_frontsector->ceilingheight) * grTex->scaleY; + wallVerts[0].t -= (worldhigh - gl_backsector->ceilingheight) * grTex->scaleY; + wallVerts[1].t -= (worldhighslope - gl_backsector->ceilingheight) * grTex->scaleY; + } + else if (gl_linedef->flags & ML_DONTPEGTOP) + { + // Skewed by top + wallVerts[0].t = (texturevpeg + worldtop - worldhigh) * grTex->scaleY; + wallVerts[1].t = (texturevpeg + worldtopslope - worldhighslope) * grTex->scaleY; + } + else + { + // Skewed by bottom + wallVerts[0].t = wallVerts[1].t = (texturevpeg + worldtop - worldhigh) * grTex->scaleY; + wallVerts[3].t = wallVerts[0].t - (worldtop - worldhigh) * grTex->scaleY; + wallVerts[2].t = wallVerts[1].t - (worldtopslope - worldhighslope) * grTex->scaleY; } // set top/bottom coords @@ -1192,7 +1195,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom wallVerts[1].y = FIXED_TO_FLOAT(worldhighslope); if (gl_frontsector->numlights) - HWR_SplitWall(gl_frontsector, wallVerts, gl_toptexture, &Surf, FF_CUTLEVEL, NULL, 0); + HWR_SplitWall(gl_frontsector, wallVerts, gl_toptexture, &Surf, FOF_CUTLEVEL, NULL, 0); else if (grTex->mipmap.flags & TF_TRANSPARENT) HWR_AddTransparentWall(wallVerts, &Surf, gl_toptexture, PF_Environment, false, lightnum, colormap); else @@ -1200,55 +1203,48 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom } // check BOTTOM TEXTURE - if (( - worldlowslope > worldbottomslope || - worldlow > worldbottom) && gl_bottomtexture) //only if VISIBLE!!! + if ((worldlowslope > worldbottomslope || worldlow > worldbottom) && gl_bottomtexture) { + // PEGGING + if (!(gl_linedef->flags & ML_DONTPEGBOTTOM)) + texturevpeg = 0; + else if (gl_linedef->flags & ML_SKEWTD) + texturevpeg = worldbottom - worldlow; + else + texturevpeg = gl_frontsector->floorheight - gl_backsector->floorheight; + + texturevpeg += gl_sidedef->rowoffset; + + // This is so that it doesn't overflow and screw up the wall, it doesn't need to go higher than the texture's height anyway + texturevpeg %= textureheight[gl_bottomtexture]; + + grTex = HWR_GetTexture(gl_bottomtexture); + + wallVerts[3].t = wallVerts[2].t = texturevpeg * grTex->scaleY; + wallVerts[0].t = wallVerts[1].t = (texturevpeg + gl_backsector->floorheight - gl_frontsector->floorheight) * grTex->scaleY; + wallVerts[0].s = wallVerts[3].s = cliplow * grTex->scaleX; + wallVerts[2].s = wallVerts[1].s = cliphigh * grTex->scaleX; + + // Adjust t value for sloped walls + if (!(gl_linedef->flags & ML_SKEWTD)) { - fixed_t texturevpegbottom = 0; // bottom - - grTex = HWR_GetTexture(gl_bottomtexture); - - // PEGGING - if (!(gl_linedef->flags & ML_DONTPEGBOTTOM)) - texturevpegbottom = 0; - else if (gl_linedef->flags & ML_EFFECT1) - texturevpegbottom = worldbottom - worldlow; - else - texturevpegbottom = gl_frontsector->floorheight - gl_backsector->floorheight; - - texturevpegbottom += gl_sidedef->rowoffset; - - // This is so that it doesn't overflow and screw up the wall, it doesn't need to go higher than the texture's height anyway - texturevpegbottom %= (textures[gl_bottomtexture]->height)<scaleY; - wallVerts[0].t = wallVerts[1].t = (texturevpegbottom + gl_backsector->floorheight - gl_frontsector->floorheight) * grTex->scaleY; - wallVerts[0].s = wallVerts[3].s = cliplow * grTex->scaleX; - wallVerts[2].s = wallVerts[1].s = cliphigh * grTex->scaleX; - - // Adjust t value for sloped walls - if (!(gl_linedef->flags & ML_EFFECT1)) - { - // Unskewed - wallVerts[0].t -= (worldbottom - gl_frontsector->floorheight) * grTex->scaleY; - wallVerts[1].t -= (worldbottomslope - gl_frontsector->floorheight) * grTex->scaleY; - wallVerts[3].t -= (worldlow - gl_backsector->floorheight) * grTex->scaleY; - wallVerts[2].t -= (worldlowslope - gl_backsector->floorheight) * grTex->scaleY; - } - else if (gl_linedef->flags & ML_DONTPEGBOTTOM) - { - // Skewed by bottom - wallVerts[0].t = wallVerts[1].t = (texturevpegbottom + worldlow - worldbottom) * grTex->scaleY; - //wallVerts[3].t = wallVerts[0].t - (worldlow - worldbottom) * grTex->scaleY; // no need, [3] is already this - wallVerts[2].t = wallVerts[1].t - (worldlowslope - worldbottomslope) * grTex->scaleY; - } - else - { - // Skewed by top - wallVerts[0].t = (texturevpegbottom + worldlow - worldbottom) * grTex->scaleY; - wallVerts[1].t = (texturevpegbottom + worldlowslope - worldbottomslope) * grTex->scaleY; - } + // Unskewed + wallVerts[0].t -= (worldbottom - gl_frontsector->floorheight) * grTex->scaleY; + wallVerts[1].t -= (worldbottomslope - gl_frontsector->floorheight) * grTex->scaleY; + wallVerts[3].t -= (worldlow - gl_backsector->floorheight) * grTex->scaleY; + wallVerts[2].t -= (worldlowslope - gl_backsector->floorheight) * grTex->scaleY; + } + else if (gl_linedef->flags & ML_DONTPEGBOTTOM) + { + // Skewed by bottom + wallVerts[0].t = wallVerts[1].t = (texturevpeg + worldlow - worldbottom) * grTex->scaleY; + wallVerts[2].t = wallVerts[1].t - (worldlowslope - worldbottomslope) * grTex->scaleY; + } + else + { + // Skewed by top + wallVerts[0].t = (texturevpeg + worldlow - worldbottom) * grTex->scaleY; + wallVerts[1].t = (texturevpeg + worldlowslope - worldbottomslope) * grTex->scaleY; } // set top/bottom coords @@ -1258,19 +1254,17 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom wallVerts[1].y = FIXED_TO_FLOAT(worldbottomslope); if (gl_frontsector->numlights) - HWR_SplitWall(gl_frontsector, wallVerts, gl_bottomtexture, &Surf, FF_CUTLEVEL, NULL, 0); + HWR_SplitWall(gl_frontsector, wallVerts, gl_bottomtexture, &Surf, FOF_CUTLEVEL, NULL, 0); else if (grTex->mipmap.flags & TF_TRANSPARENT) HWR_AddTransparentWall(wallVerts, &Surf, gl_bottomtexture, PF_Environment, false, lightnum, colormap); else HWR_ProjectWall(wallVerts, &Surf, PF_Masked, lightnum, colormap); } - gl_midtexture = R_GetTextureNum(gl_sidedef->midtexture); - if (gl_midtexture) + + // Render midtexture if there's one. Determine if it's visible first, though + if (gl_midtexture && HWR_BlendMidtextureSurface(&Surf)) { - FBITFIELD blendmode; sector_t *front, *back; - fixed_t popentop, popenbottom, polytop, polybottom, lowcut, highcut; - fixed_t texturevpeg = 0; INT32 repeats; if (gl_linedef->frontsector->heightsec != -1) @@ -1285,7 +1279,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom if (gl_sidedef->repeatcnt) repeats = 1 + gl_sidedef->repeatcnt; - else if (gl_linedef->flags & ML_EFFECT5) + else if (gl_linedef->flags & ML_WRAPMIDTEX) { fixed_t high, low; @@ -1299,57 +1293,77 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom else low = back->floorheight; - repeats = (high - low)/textureheight[gl_sidedef->midtexture]; - if ((high-low)%textureheight[gl_sidedef->midtexture]) + repeats = (high - low) / textureheight[gl_midtexture]; + if ((high - low) % textureheight[gl_midtexture]) repeats++; // tile an extra time to fill the gap -- Monster Iestyn } else repeats = 1; - // SoM: a little note: This code re-arranging will - // fix the bug in Nimrod map02. popentop and popenbottom + // SoM: a little note: popentop and popenbottom // record the limits the texture can be displayed in. // polytop and polybottom, are the ideal (i.e. unclipped) // heights of the polygon, and h & l, are the final (clipped) // poly coords. + fixed_t popentop, popenbottom, polytop, polybottom, lowcut, highcut; + fixed_t popentopslope, popenbottomslope, polytopslope, polybottomslope, lowcutslope, highcutslope; // NOTE: With polyobjects, whenever you need to check the properties of the polyobject sector it belongs to, // you must use the linedef's backsector to be correct // From CB if (gl_curline->polyseg) { - popentop = back->ceilingheight; - popenbottom = back->floorheight; + popentop = popentopslope = back->ceilingheight; + popenbottom = popenbottomslope = back->floorheight; } else { popentop = min(worldtop, worldhigh); popenbottom = max(worldbottom, worldlow); + popentopslope = min(worldtopslope, worldhighslope); + popenbottomslope = max(worldbottomslope, worldlowslope); } - if (gl_linedef->flags & ML_EFFECT2) + // Find the wall's coordinates + fixed_t midtexheight = textureheight[gl_midtexture] * repeats; + + // Texture is not skewed + if (gl_linedef->flags & ML_NOSKEW) { - if (!!(gl_linedef->flags & ML_DONTPEGBOTTOM) ^ !!(gl_linedef->flags & ML_EFFECT3)) + // Peg it to the floor + if (gl_linedef->flags & ML_MIDPEG) { polybottom = max(front->floorheight, back->floorheight) + gl_sidedef->rowoffset; - polytop = polybottom + textureheight[gl_midtexture]*repeats; + polytop = polybottom + midtexheight; } + // Peg it to the ceiling else { polytop = min(front->ceilingheight, back->ceilingheight) + gl_sidedef->rowoffset; - polybottom = polytop - textureheight[gl_midtexture]*repeats; + polybottom = polytop - midtexheight; } + + // The right side's coordinates are the the same as the left side + polytopslope = polytop; + polybottomslope = polybottom; } - else if (!!(gl_linedef->flags & ML_DONTPEGBOTTOM) ^ !!(gl_linedef->flags & ML_EFFECT3)) + // Skew the texture, but peg it to the floor + else if (gl_linedef->flags & ML_MIDPEG) { polybottom = popenbottom + gl_sidedef->rowoffset; - polytop = polybottom + textureheight[gl_midtexture]*repeats; + polytop = polybottom + midtexheight; + polybottomslope = popenbottomslope + gl_sidedef->rowoffset; + polytopslope = polybottomslope + midtexheight; } + // Skew it according to the ceiling's slope else { polytop = popentop + gl_sidedef->rowoffset; - polybottom = polytop - textureheight[gl_midtexture]*repeats; + polybottom = polytop - midtexheight; + polytopslope = popentopslope + gl_sidedef->rowoffset; + polybottomslope = polytopslope - midtexheight; } + // CB // NOTE: With polyobjects, whenever you need to check the properties of the polyobject sector it belongs to, // you must use the linedef's backsector to be correct @@ -1357,122 +1371,59 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom { lowcut = polybottom; highcut = polytop; + lowcutslope = polybottomslope; + highcutslope = polytopslope; } else { // The cut-off values of a linedef can always be constant, since every line has an absoulute front and or back sector lowcut = popenbottom; highcut = popentop; + lowcutslope = popenbottomslope; + highcutslope = popentopslope; } h = min(highcut, polytop); l = max(polybottom, lowcut); + hS = min(highcutslope, polytopslope); + lS = max(polybottomslope, lowcutslope); + // PEGGING + fixed_t texturevpegslope; + + if (gl_linedef->flags & ML_MIDPEG) { - // PEGGING - if (!!(gl_linedef->flags & ML_DONTPEGBOTTOM) ^ !!(gl_linedef->flags & ML_EFFECT3)) - texturevpeg = textureheight[gl_sidedef->midtexture]*repeats - h + polybottom; - else - texturevpeg = polytop - h; - - grTex = HWR_GetTexture(gl_midtexture); - - wallVerts[3].t = wallVerts[2].t = texturevpeg * grTex->scaleY; - wallVerts[0].t = wallVerts[1].t = (h - l + texturevpeg) * grTex->scaleY; - wallVerts[0].s = wallVerts[3].s = cliplow * grTex->scaleX; - wallVerts[2].s = wallVerts[1].s = cliphigh * grTex->scaleX; + texturevpeg = midtexheight - h + polybottom; + texturevpegslope = midtexheight - hS + polybottomslope; } + else + { + texturevpeg = polytop - h; + texturevpegslope = polytopslope - hS; + } + + grTex = HWR_GetTexture(gl_midtexture); + + // Left side + wallVerts[3].t = texturevpeg * grTex->scaleY; + wallVerts[0].t = (h - l + texturevpeg) * grTex->scaleY; + wallVerts[0].s = wallVerts[3].s = cliplow * grTex->scaleX; + + // Right side + wallVerts[2].t = texturevpegslope * grTex->scaleY; + wallVerts[1].t = (hS - lS + texturevpegslope) * grTex->scaleY; + wallVerts[2].s = wallVerts[1].s = cliphigh * grTex->scaleX; // set top/bottom coords // Take the texture peg into account, rather than changing the offsets past // where the polygon might not be. - wallVerts[2].y = wallVerts[3].y = FIXED_TO_FLOAT(h); - wallVerts[0].y = wallVerts[1].y = FIXED_TO_FLOAT(l); + wallVerts[3].y = FIXED_TO_FLOAT(h); + wallVerts[0].y = FIXED_TO_FLOAT(l); + wallVerts[2].y = FIXED_TO_FLOAT(hS); + wallVerts[1].y = FIXED_TO_FLOAT(lS); - // Correct to account for slopes - { - fixed_t midtextureslant; - - if (gl_linedef->flags & ML_EFFECT2) - midtextureslant = 0; - else if (!!(gl_linedef->flags & ML_DONTPEGBOTTOM) ^ !!(gl_linedef->flags & ML_EFFECT3)) - midtextureslant = worldlow < worldbottom - ? worldbottomslope-worldbottom - : worldlowslope-worldlow; - else - midtextureslant = worldtop < worldhigh - ? worldtopslope-worldtop - : worldhighslope-worldhigh; - - polytop += midtextureslant; - polybottom += midtextureslant; - - highcut += worldtop < worldhigh - ? worldtopslope-worldtop - : worldhighslope-worldhigh; - lowcut += worldlow < worldbottom - ? worldbottomslope-worldbottom - : worldlowslope-worldlow; - - // Texture stuff - h = min(highcut, polytop); - l = max(polybottom, lowcut); - - { - // PEGGING - if (!!(gl_linedef->flags & ML_DONTPEGBOTTOM) ^ !!(gl_linedef->flags & ML_EFFECT3)) - texturevpeg = textureheight[gl_sidedef->midtexture]*repeats - h + polybottom; - else - texturevpeg = polytop - h; - wallVerts[2].t = texturevpeg * grTex->scaleY; - wallVerts[1].t = (h - l + texturevpeg) * grTex->scaleY; - } - - wallVerts[2].y = FIXED_TO_FLOAT(h); - wallVerts[1].y = FIXED_TO_FLOAT(l); - } - - // set alpha for transparent walls - // ooops ! this do not work at all because render order we should render it in backtofront order - switch (gl_linedef->special) - { - // Translucent - case 102: - case 121: - case 123: - case 124: - case 125: - case 141: - case 142: - case 144: - case 145: - case 174: - case 175: - case 192: - case 195: - case 221: - case 253: - case 256: - blendmode = PF_Translucent; - break; - default: - if (gl_linedef->alpha >= 0 && gl_linedef->alpha < FRACUNIT) - blendmode = HWR_TranstableToAlpha(R_GetLinedefTransTable(gl_linedef->alpha), &Surf); - else - blendmode = PF_Masked; - break; - } - - if (gl_curline->polyseg && gl_curline->polyseg->translucency > 0) - { - if (gl_curline->polyseg->translucency >= NUMTRANSMAPS) // wall not drawn - { - Surf.PolyColor.s.alpha = 0x00; // This shouldn't draw anything regardless of blendmode - blendmode = PF_Masked; - } - else - blendmode = HWR_TranstableToAlpha(gl_curline->polyseg->translucency, &Surf); - } + // TODO: Actually use the surface's flags so that I don't have to do this + FUINT blendmode = Surf.PolyFlags; // Render midtextures on two-sided lines with a z-buffer offset. // This will cause the midtexture appear on top, if a FOF overlaps with it. @@ -1481,11 +1432,9 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom if (gl_frontsector->numlights) { if (!(blendmode & PF_Masked)) - HWR_SplitWall(gl_frontsector, wallVerts, gl_midtexture, &Surf, FF_TRANSLUCENT, NULL, PF_Decal); + HWR_SplitWall(gl_frontsector, wallVerts, gl_midtexture, &Surf, FOF_TRANSLUCENT, NULL, blendmode); else - { - HWR_SplitWall(gl_frontsector, wallVerts, gl_midtexture, &Surf, FF_CUTLEVEL, NULL, PF_Decal); - } + HWR_SplitWall(gl_frontsector, wallVerts, gl_midtexture, &Surf, FOF_CUTLEVEL, NULL, blendmode); } else if (!(blendmode & PF_Masked)) HWR_AddTransparentWall(wallVerts, &Surf, gl_midtexture, blendmode, false, lightnum, colormap); @@ -1497,66 +1446,60 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom // No longer so much a mess as before! if (!gl_curline->polyseg) // Don't do it for polyobjects { - if (gl_frontsector->ceilingpic == skyflatnum) + if (gl_frontsector->ceilingpic == skyflatnum + && gl_backsector->ceilingpic != skyflatnum) // don't cull if back sector is also sky { - if (gl_backsector->ceilingpic != skyflatnum) // don't cull if back sector is also sky - { - wallVerts[2].y = wallVerts[3].y = FIXED_TO_FLOAT(INT32_MAX); // draw to top of map space - wallVerts[0].y = FIXED_TO_FLOAT(worldtop); - wallVerts[1].y = FIXED_TO_FLOAT(worldtopslope); - HWR_DrawSkyWall(wallVerts, &Surf); - } + wallVerts[2].y = wallVerts[3].y = FIXED_TO_FLOAT(INT32_MAX); // draw to top of map space + wallVerts[0].y = FIXED_TO_FLOAT(worldtop); + wallVerts[1].y = FIXED_TO_FLOAT(worldtopslope); + HWR_DrawSkyWall(wallVerts, &Surf); } - if (gl_frontsector->floorpic == skyflatnum) + if (gl_frontsector->floorpic == skyflatnum + && gl_backsector->floorpic != skyflatnum) // same thing here { - if (gl_backsector->floorpic != skyflatnum) // don't cull if back sector is also sky - { - wallVerts[3].y = FIXED_TO_FLOAT(worldbottom); - wallVerts[2].y = FIXED_TO_FLOAT(worldbottomslope); - wallVerts[0].y = wallVerts[1].y = FIXED_TO_FLOAT(INT32_MIN); // draw to bottom of map space - HWR_DrawSkyWall(wallVerts, &Surf); - } + wallVerts[3].y = FIXED_TO_FLOAT(worldbottom); + wallVerts[2].y = FIXED_TO_FLOAT(worldbottomslope); + wallVerts[0].y = wallVerts[1].y = FIXED_TO_FLOAT(INT32_MIN); // draw to bottom of map space + HWR_DrawSkyWall(wallVerts, &Surf); } } } else { // Single sided line... Deal only with the middletexture (if one exists) - gl_midtexture = R_GetTextureNum(gl_sidedef->midtexture); - if (gl_midtexture && gl_linedef->special != 41) // (Ignore horizon line for OGL) + if (gl_midtexture && gl_linedef->special != HORIZONSPECIAL) // (Ignore horizon line for OGL) { - { - fixed_t texturevpeg; - // PEGGING - 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; - else if (gl_linedef->flags & ML_DONTPEGBOTTOM) - texturevpeg = worldbottom + textureheight[gl_sidedef->midtexture] - worldtop + gl_sidedef->rowoffset; - else - // top of texture at top - texturevpeg = gl_sidedef->rowoffset; + fixed_t texturevpeg; - grTex = HWR_GetTexture(gl_midtexture); + // PEGGING + if ((gl_linedef->flags & (ML_DONTPEGBOTTOM|ML_NOSKEW)) == (ML_DONTPEGBOTTOM|ML_NOSKEW)) + texturevpeg = gl_frontsector->floorheight + textureheight[gl_sidedef->midtexture] - gl_frontsector->ceilingheight + gl_sidedef->rowoffset; + else if (gl_linedef->flags & ML_DONTPEGBOTTOM) + texturevpeg = worldbottom + textureheight[gl_sidedef->midtexture] - worldtop + gl_sidedef->rowoffset; + else + // top of texture at top + texturevpeg = gl_sidedef->rowoffset; - wallVerts[3].t = wallVerts[2].t = texturevpeg * grTex->scaleY; - wallVerts[0].t = wallVerts[1].t = (texturevpeg + gl_frontsector->ceilingheight - gl_frontsector->floorheight) * grTex->scaleY; - wallVerts[0].s = wallVerts[3].s = cliplow * grTex->scaleX; - wallVerts[2].s = wallVerts[1].s = cliphigh * grTex->scaleX; + grTex = HWR_GetTexture(gl_midtexture); - // Texture correction for slopes - if (gl_linedef->flags & ML_EFFECT2) { - wallVerts[3].t += (gl_frontsector->ceilingheight - worldtop) * grTex->scaleY; - wallVerts[2].t += (gl_frontsector->ceilingheight - worldtopslope) * grTex->scaleY; - wallVerts[0].t += (gl_frontsector->floorheight - worldbottom) * grTex->scaleY; - wallVerts[1].t += (gl_frontsector->floorheight - worldbottomslope) * grTex->scaleY; - } else if (gl_linedef->flags & ML_DONTPEGBOTTOM) { - wallVerts[3].t = wallVerts[0].t + (worldbottom-worldtop) * grTex->scaleY; - wallVerts[2].t = wallVerts[1].t + (worldbottomslope-worldtopslope) * grTex->scaleY; - } else { - wallVerts[0].t = wallVerts[3].t - (worldbottom-worldtop) * grTex->scaleY; - wallVerts[1].t = wallVerts[2].t - (worldbottomslope-worldtopslope) * grTex->scaleY; - } + wallVerts[3].t = wallVerts[2].t = texturevpeg * grTex->scaleY; + wallVerts[0].t = wallVerts[1].t = (texturevpeg + gl_frontsector->ceilingheight - gl_frontsector->floorheight) * grTex->scaleY; + wallVerts[0].s = wallVerts[3].s = cliplow * grTex->scaleX; + wallVerts[2].s = wallVerts[1].s = cliphigh * grTex->scaleX; + + // Texture correction for slopes + if (gl_linedef->flags & ML_NOSKEW) { + wallVerts[3].t += (gl_frontsector->ceilingheight - worldtop) * grTex->scaleY; + wallVerts[2].t += (gl_frontsector->ceilingheight - worldtopslope) * grTex->scaleY; + wallVerts[0].t += (gl_frontsector->floorheight - worldbottom) * grTex->scaleY; + wallVerts[1].t += (gl_frontsector->floorheight - worldbottomslope) * grTex->scaleY; + } else if (gl_linedef->flags & ML_DONTPEGBOTTOM) { + wallVerts[3].t = wallVerts[0].t + (worldbottom-worldtop) * grTex->scaleY; + wallVerts[2].t = wallVerts[1].t + (worldbottomslope-worldtopslope) * grTex->scaleY; + } else { + wallVerts[0].t = wallVerts[3].t - (worldbottom-worldtop) * grTex->scaleY; + wallVerts[1].t = wallVerts[2].t - (worldbottomslope-worldtopslope) * grTex->scaleY; } //Set textures properly on single sided walls that are sloped @@ -1567,7 +1510,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom // I don't think that solid walls can use translucent linedef types... if (gl_frontsector->numlights) - HWR_SplitWall(gl_frontsector, wallVerts, gl_midtexture, &Surf, FF_CUTLEVEL, NULL, 0); + HWR_SplitWall(gl_frontsector, wallVerts, gl_midtexture, &Surf, FOF_CUTLEVEL, NULL, 0); else { if (grTex->mipmap.flags & TF_TRANSPARENT) @@ -1596,9 +1539,8 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom } } - //Hurdler: 3d-floors test - if (gl_frontsector && gl_backsector && !Tag_Compare(&gl_frontsector->tags, &gl_backsector->tags) && (gl_backsector->ffloors || gl_frontsector->ffloors)) + if (gl_backsector && !Tag_Compare(&gl_frontsector->tags, &gl_backsector->tags) && (gl_backsector->ffloors || gl_frontsector->ffloors)) { ffloor_t * rover; fixed_t highcut = 0, lowcut = 0; @@ -1631,9 +1573,9 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom if (bothsides) continue; - if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERSIDES)) + if (!(rover->fofflags & FOF_EXISTS) || !(rover->fofflags & FOF_RENDERSIDES)) continue; - if (!(rover->flags & FF_ALLSIDES) && rover->flags & FF_INVERTSIDES) + if (!(rover->fofflags & FOF_ALLSIDES) && rover->fofflags & FOF_INVERTSIDES) continue; SLOPEPARAMS(*rover->t_slope, high1, highslope1, *rover->topheight) @@ -1674,7 +1616,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom wallVerts[2].y = FIXED_TO_FLOAT(hS); wallVerts[0].y = FIXED_TO_FLOAT(l); wallVerts[1].y = FIXED_TO_FLOAT(lS); - if (rover->flags & FF_FOG) + if (rover->fofflags & FOF_FOG) { wallVerts[3].t = wallVerts[2].t = 0; wallVerts[0].t = wallVerts[1].t = 0; @@ -1694,13 +1636,13 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom { texturevpeg = sides[newline->sidenum[0]].rowoffset; attachtobottom = !!(newline->flags & ML_DONTPEGBOTTOM); - slopeskew = !!(newline->flags & ML_DONTPEGTOP); + slopeskew = !!(newline->flags & ML_SKEWTD); } else { texturevpeg = sides[rover->master->sidenum[0]].rowoffset; attachtobottom = !!(gl_linedef->flags & ML_DONTPEGBOTTOM); - slopeskew = !!(rover->master->flags & ML_DONTPEGTOP); + slopeskew = !!(rover->master->flags & ML_SKEWTD); } grTex = HWR_GetTexture(texnum); @@ -1733,7 +1675,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom wallVerts[0].s = wallVerts[3].s = cliplow * grTex->scaleX; wallVerts[2].s = wallVerts[1].s = cliphigh * grTex->scaleX; } - if (rover->flags & FF_FOG) + if (rover->fofflags & FOF_FOG) { FBITFIELD blendmode; @@ -1745,7 +1687,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom Surf.PolyColor.s.alpha = HWR_FogBlockAlpha(rover->master->frontsector->lightlevel, rover->master->frontsector->extra_colormap); if (gl_frontsector->numlights) - HWR_SplitWall(gl_frontsector, wallVerts, 0, &Surf, rover->flags, rover, 0); + HWR_SplitWall(gl_frontsector, wallVerts, 0, &Surf, rover->fofflags, rover, blendmode); else HWR_AddTransparentWall(wallVerts, &Surf, 0, blendmode, true, lightnum, colormap); } @@ -1753,14 +1695,14 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom { FBITFIELD blendmode = PF_Masked; - if (rover->flags & FF_TRANSLUCENT && rover->alpha < 256) + if ((rover->fofflags & FOF_TRANSLUCENT && !(rover->fofflags & FOF_SPLAT)) || rover->blend) { - blendmode = PF_Translucent; + blendmode = rover->blend ? HWR_GetBlendModeFlag(rover->blend) : PF_Translucent; Surf.PolyColor.s.alpha = (UINT8)rover->alpha-1 > 255 ? 255 : rover->alpha-1; } if (gl_frontsector->numlights) - HWR_SplitWall(gl_frontsector, wallVerts, texnum, &Surf, rover->flags, rover, 0); + HWR_SplitWall(gl_frontsector, wallVerts, texnum, &Surf, rover->fofflags, rover, blendmode); else { if (blendmode != PF_Masked) @@ -1788,9 +1730,9 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom if (bothsides) continue; - if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERSIDES)) + if (!(rover->fofflags & FOF_EXISTS) || !(rover->fofflags & FOF_RENDERSIDES)) continue; - if (!(rover->flags & FF_ALLSIDES || rover->flags & FF_INVERTSIDES)) + if (!(rover->fofflags & FOF_ALLSIDES || rover->fofflags & FOF_INVERTSIDES)) continue; SLOPEPARAMS(*rover->t_slope, high1, highslope1, *rover->topheight) @@ -1830,7 +1772,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom wallVerts[2].y = FIXED_TO_FLOAT(hS); wallVerts[0].y = FIXED_TO_FLOAT(l); wallVerts[1].y = FIXED_TO_FLOAT(lS); - if (rover->flags & FF_FOG) + if (rover->fofflags & FOF_FOG) { wallVerts[3].t = wallVerts[2].t = 0; wallVerts[0].t = wallVerts[1].t = 0; @@ -1856,7 +1798,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom wallVerts[2].s = wallVerts[1].s = cliphigh * grTex->scaleX; } - if (rover->flags & FF_FOG) + if (rover->fofflags & FOF_FOG) { FBITFIELD blendmode; @@ -1868,7 +1810,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom Surf.PolyColor.s.alpha = HWR_FogBlockAlpha(rover->master->frontsector->lightlevel, rover->master->frontsector->extra_colormap); if (gl_backsector->numlights) - HWR_SplitWall(gl_backsector, wallVerts, 0, &Surf, rover->flags, rover, 0); + HWR_SplitWall(gl_backsector, wallVerts, 0, &Surf, rover->fofflags, rover, blendmode); else HWR_AddTransparentWall(wallVerts, &Surf, 0, blendmode, true, lightnum, colormap); } @@ -1876,14 +1818,14 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom { FBITFIELD blendmode = PF_Masked; - if (rover->flags & FF_TRANSLUCENT && rover->alpha < 256) + if ((rover->fofflags & FOF_TRANSLUCENT && !(rover->fofflags & FOF_SPLAT)) || rover->blend) { - blendmode = PF_Translucent; + blendmode = rover->blend ? HWR_GetBlendModeFlag(rover->blend) : PF_Translucent; Surf.PolyColor.s.alpha = (UINT8)rover->alpha-1 > 255 ? 255 : rover->alpha-1; } if (gl_backsector->numlights) - HWR_SplitWall(gl_backsector, wallVerts, texnum, &Surf, rover->flags, rover, 0); + HWR_SplitWall(gl_backsector, wallVerts, texnum, &Surf, rover->fofflags, rover, blendmode); else { if (blendmode != PF_Masked) @@ -2709,13 +2651,13 @@ static void HWR_RenderPolyObjectPlane(polyobj_t *polysector, boolean isceiling, float height = FIXED_TO_FLOAT(fixedheight); // constant y for all points on the convex flat polygon float flatxref, flatyref; float fflatwidth = 64.0f, fflatheight = 64.0f; - INT32 flatflag = 63; + UINT16 flatflag = 63; boolean texflat = false; float scrollx = 0.0f, scrolly = 0.0f; + float tempxsow, tempytow, anglef = 0.0f; angle_t angle = 0; - fixed_t tempxs, tempyt; static FOutVector *planeVerts = NULL; static UINT16 numAllocedPlaneVerts = 0; @@ -2742,31 +2684,8 @@ static void HWR_RenderPolyObjectPlane(polyobj_t *polysector, boolean isceiling, if (levelflat->type == LEVELFLAT_FLAT) { size_t len = W_LumpLength(levelflat->u.flat.lumpnum); - switch (len) - { - case 4194304: // 2048x2048 lump - fflatwidth = fflatheight = 2048.0f; - break; - case 1048576: // 1024x1024 lump - fflatwidth = fflatheight = 1024.0f; - break; - case 262144:// 512x512 lump - fflatwidth = fflatheight = 512.0f; - break; - case 65536: // 256x256 lump - fflatwidth = fflatheight = 256.0f; - break; - case 16384: // 128x128 lump - fflatwidth = fflatheight = 128.0f; - break; - case 1024: // 32x32 lump - fflatwidth = fflatheight = 32.0f; - break; - default: // 64x64 lump - fflatwidth = fflatheight = 64.0f; - break; - } - flatflag = ((INT32)fflatwidth)-1; + flatflag = R_GetFlatSize(len) - 1; + fflatwidth = fflatheight = (float)(flatflag + 1); } else { @@ -2829,20 +2748,13 @@ static void HWR_RenderPolyObjectPlane(polyobj_t *polysector, boolean isceiling, if (angle) // Only needs to be done if there's an altered angle { - angle = (InvAngle(angle))>>ANGLETOFINESHIFT; + tempxsow = flatxref; + tempytow = flatyref; - // This needs to be done so that it scrolls in a different direction after rotation like software - /*tempxs = FLOAT_TO_FIXED(scrollx); - tempyt = FLOAT_TO_FIXED(scrolly); - scrollx = (FIXED_TO_FLOAT(FixedMul(tempxs, FINECOSINE(angle)) - FixedMul(tempyt, FINESINE(angle)))); - scrolly = (FIXED_TO_FLOAT(FixedMul(tempxs, FINESINE(angle)) + FixedMul(tempyt, FINECOSINE(angle))));*/ + anglef = ANG2RAD(InvAngle(angle)); - // This needs to be done so everything aligns after rotation - // It would be done so that rotation is done, THEN the translation, but I couldn't get it to rotate AND scroll like software does - tempxs = FLOAT_TO_FIXED(flatxref); - tempyt = FLOAT_TO_FIXED(flatyref); - flatxref = (FIXED_TO_FLOAT(FixedMul(tempxs, FINECOSINE(angle)) - FixedMul(tempyt, FINESINE(angle)))); - flatyref = (FIXED_TO_FLOAT(FixedMul(tempxs, FINESINE(angle)) + FixedMul(tempyt, FINECOSINE(angle)))); + flatxref = (tempxsow * cos(anglef)) - (tempytow * sin(anglef)); + flatyref = (tempxsow * sin(anglef)) + (tempytow * cos(anglef)); } for (i = 0; i < (INT32)nrPlaneVerts; i++,v3d++) @@ -2863,10 +2775,11 @@ static void HWR_RenderPolyObjectPlane(polyobj_t *polysector, boolean isceiling, // Need to rotate before translate if (angle) // Only needs to be done if there's an altered angle { - tempxs = FLOAT_TO_FIXED(v3d->s); - tempyt = FLOAT_TO_FIXED(v3d->t); - v3d->s = (FIXED_TO_FLOAT(FixedMul(tempxs, FINECOSINE(angle)) - FixedMul(tempyt, FINESINE(angle)))); - v3d->t = (FIXED_TO_FLOAT(FixedMul(tempxs, FINESINE(angle)) + FixedMul(tempyt, FINECOSINE(angle)))); + tempxsow = v3d->s; + tempytow = v3d->t; + + v3d->s = (tempxsow * cos(anglef)) - (tempytow * sin(anglef)); + v3d->t = (tempxsow * sin(anglef)) + (tempytow * cos(anglef)); } v3d->x = FIXED_TO_FLOAT(polysector->vertices[i]->x); @@ -2960,6 +2873,13 @@ static void HWR_AddPolyObjectPlanes(void) } } +static FBITFIELD HWR_RippleBlend(sector_t *sector, ffloor_t *rover, boolean ceiling) +{ + (void)sector; + (void)ceiling; + return /*R_IsRipplePlane(sector, rover, ceiling)*/ (rover->fofflags & FOF_RIPPLE) ? PF_Ripple : 0; +} + // -----------------+ // HWR_Subsector : Determine floor/ceiling planes. // : Add sprites of things in sector. @@ -2979,6 +2899,7 @@ static void HWR_Subsector(size_t num) INT32 light = 0; extracolormap_t *floorcolormap; extracolormap_t *ceilingcolormap; + ffloor_t *rover; #ifdef PARANOIA //no risk while developing, enough debugging nights! if (num >= addsubsector) @@ -3036,7 +2957,22 @@ static void HWR_Subsector(size_t num) if (gl_frontsector->ffloors) { - if (gl_frontsector->moved) + boolean anyMoved = gl_frontsector->moved; + + if (anyMoved == false) + { + for (rover = gl_frontsector->ffloors; rover; rover = rover->next) + { + sector_t *controlSec = §ors[rover->secnum]; + if (controlSec->moved == true) + { + anyMoved = true; + break; + } + } + } + + if (anyMoved == true) { gl_frontsector->numlights = sub->sector->numlights = 0; R_Prep3DFloors(gl_frontsector); @@ -3046,13 +2982,13 @@ static void HWR_Subsector(size_t num) } light = R_GetPlaneLight(gl_frontsector, locFloorHeight, false); - if (gl_frontsector->floorlightsec == -1) - floorlightlevel = *gl_frontsector->lightlist[light].lightlevel; + if (gl_frontsector->floorlightsec == -1 && !gl_frontsector->floorlightabsolute) + floorlightlevel = max(0, min(255, *gl_frontsector->lightlist[light].lightlevel + gl_frontsector->floorlightlevel)); floorcolormap = *gl_frontsector->lightlist[light].extra_colormap; light = R_GetPlaneLight(gl_frontsector, locCeilingHeight, false); - if (gl_frontsector->ceilinglightsec == -1) - ceilinglightlevel = *gl_frontsector->lightlist[light].lightlevel; + if (gl_frontsector->ceilinglightsec == -1 && !gl_frontsector->ceilinglightabsolute) + ceilinglightlevel = max(0, min(255, *gl_frontsector->lightlist[light].lightlevel + gl_frontsector->ceilinglightlevel)); ceilingcolormap = *gl_frontsector->lightlist[light].extra_colormap; } @@ -3115,7 +3051,6 @@ static void HWR_Subsector(size_t num) if (gl_frontsector->ffloors) { /// \todo fix light, xoffs, yoffs, extracolormap ? - ffloor_t * rover; for (rover = gl_frontsector->ffloors; rover; rover = rover->next) { @@ -3125,17 +3060,17 @@ static void HWR_Subsector(size_t num) cullHeight = P_GetFFloorBottomZAt(rover, viewx, viewy); centerHeight = P_GetFFloorBottomZAt(rover, gl_frontsector->soundorg.x, gl_frontsector->soundorg.y); - if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERPLANES)) + if (!(rover->fofflags & FOF_EXISTS) || !(rover->fofflags & FOF_RENDERPLANES)) continue; if (sub->validcount == validcount) continue; if (centerHeight <= locCeilingHeight && centerHeight >= locFloorHeight && - ((dup_viewz < cullHeight && (rover->flags & FF_BOTHPLANES || !(rover->flags & FF_INVERTPLANES))) || - (dup_viewz > cullHeight && (rover->flags & FF_BOTHPLANES || rover->flags & FF_INVERTPLANES)))) + ((dup_viewz < cullHeight && (rover->fofflags & FOF_BOTHPLANES || !(rover->fofflags & FOF_INVERTPLANES))) || + (dup_viewz > cullHeight && (rover->fofflags & FOF_BOTHPLANES || rover->fofflags & FOF_INVERTPLANES)))) { - if (rover->flags & FF_FOG) + if (rover->fofflags & FOF_FOG) { UINT8 alpha; @@ -3150,7 +3085,7 @@ static void HWR_Subsector(size_t num) alpha, rover->master->frontsector, PF_Fog|PF_NoTexture, true, rover->master->frontsector->extra_colormap); } - else if (rover->flags & FF_TRANSLUCENT && rover->alpha < 256) // SoM: Flags are more efficient + else if ((rover->fofflags & FOF_TRANSLUCENT && !(rover->fofflags & FOF_SPLAT)) || rover->blend) // SoM: Flags are more efficient { light = R_GetPlaneLight(gl_frontsector, centerHeight, dup_viewz < cullHeight ? true : false); @@ -3159,14 +3094,15 @@ static void HWR_Subsector(size_t num) false, *rover->bottomheight, *gl_frontsector->lightlist[light].lightlevel, - rover->alpha-1 > 255 ? 255 : rover->alpha-1, rover->master->frontsector, (rover->flags & FF_RIPPLE ? PF_Ripple : 0)|PF_Translucent, + rover->alpha-1 > 255 ? 255 : rover->alpha-1, rover->master->frontsector, + HWR_RippleBlend(gl_frontsector, rover, false) | (rover->blend ? HWR_GetBlendModeFlag(rover->blend) : PF_Translucent), false, *gl_frontsector->lightlist[light].extra_colormap); } else { HWR_GetLevelFlat(&levelflats[*rover->bottompic]); light = R_GetPlaneLight(gl_frontsector, centerHeight, dup_viewz < cullHeight ? true : false); - HWR_RenderPlane(sub, &extrasubsectors[num], false, *rover->bottomheight, (rover->flags & FF_RIPPLE ? PF_Ripple : 0)|PF_Occlude, *gl_frontsector->lightlist[light].lightlevel, &levelflats[*rover->bottompic], + HWR_RenderPlane(sub, &extrasubsectors[num], false, *rover->bottomheight, HWR_RippleBlend(gl_frontsector, rover, false)|PF_Occlude, *gl_frontsector->lightlist[light].lightlevel, &levelflats[*rover->bottompic], rover->master->frontsector, 255, *gl_frontsector->lightlist[light].extra_colormap); } } @@ -3177,10 +3113,10 @@ static void HWR_Subsector(size_t num) if (centerHeight >= locFloorHeight && centerHeight <= locCeilingHeight && - ((dup_viewz > cullHeight && (rover->flags & FF_BOTHPLANES || !(rover->flags & FF_INVERTPLANES))) || - (dup_viewz < cullHeight && (rover->flags & FF_BOTHPLANES || rover->flags & FF_INVERTPLANES)))) + ((dup_viewz > cullHeight && (rover->fofflags & FOF_BOTHPLANES || !(rover->fofflags & FOF_INVERTPLANES))) || + (dup_viewz < cullHeight && (rover->fofflags & FOF_BOTHPLANES || rover->fofflags & FOF_INVERTPLANES)))) { - if (rover->flags & FF_FOG) + if (rover->fofflags & FOF_FOG) { UINT8 alpha; @@ -3195,7 +3131,7 @@ static void HWR_Subsector(size_t num) alpha, rover->master->frontsector, PF_Fog|PF_NoTexture, true, rover->master->frontsector->extra_colormap); } - else if (rover->flags & FF_TRANSLUCENT && rover->alpha < 256) + else if ((rover->fofflags & FOF_TRANSLUCENT && !(rover->fofflags & FOF_SPLAT)) || rover->blend) { light = R_GetPlaneLight(gl_frontsector, centerHeight, dup_viewz < cullHeight ? true : false); @@ -3204,14 +3140,15 @@ static void HWR_Subsector(size_t num) true, *rover->topheight, *gl_frontsector->lightlist[light].lightlevel, - rover->alpha-1 > 255 ? 255 : rover->alpha-1, rover->master->frontsector, (rover->flags & FF_RIPPLE ? PF_Ripple : 0)|PF_Translucent, + rover->alpha-1 > 255 ? 255 : rover->alpha-1, rover->master->frontsector, + HWR_RippleBlend(gl_frontsector, rover, false) | (rover->blend ? HWR_GetBlendModeFlag(rover->blend) : PF_Translucent), false, *gl_frontsector->lightlist[light].extra_colormap); } else { HWR_GetLevelFlat(&levelflats[*rover->toppic]); light = R_GetPlaneLight(gl_frontsector, centerHeight, dup_viewz < cullHeight ? true : false); - HWR_RenderPlane(sub, &extrasubsectors[num], true, *rover->topheight, (rover->flags & FF_RIPPLE ? PF_Ripple : 0)|PF_Occlude, *gl_frontsector->lightlist[light].lightlevel, &levelflats[*rover->toppic], + HWR_RenderPlane(sub, &extrasubsectors[num], true, *rover->topheight, HWR_RippleBlend(gl_frontsector, rover, false)|PF_Occlude, *gl_frontsector->lightlist[light].lightlevel, &levelflats[*rover->toppic], rover->master->frontsector, 255, *gl_frontsector->lightlist[light].extra_colormap); } } @@ -3235,7 +3172,7 @@ static void HWR_Subsector(size_t num) } // for render stats - ps_numpolyobjects += numpolys; + ps_numpolyobjects.value.i += numpolys; // Sort polyobjects R_SortPolyObjects(sub); @@ -3343,7 +3280,7 @@ static void HWR_RenderBSPNode(INT32 bspnum) // Decide which side the view point is on INT32 side; - ps_numbspcalls++; + ps_numbspcalls.value.i++; // Found a subsector? if (bspnum & NF_SUBSECTOR) @@ -3576,7 +3513,7 @@ static boolean HWR_DoCulling(line_t *cullheight, line_t *viewcullheight, float v return false; cullplane = FIXED_TO_FLOAT(cullheight->frontsector->floorheight); - if (cullheight->flags & ML_NOCLIMB) // Group culling + if (cullheight->args[1]) // Group culling { if (!viewcullheight) return false; @@ -3614,6 +3551,7 @@ static void HWR_DrawDropShadow(mobj_t *thing, fixed_t scale) FBITFIELD blendmode = PF_Translucent|PF_Modulated; INT32 shader = SHADER_DEFAULT; UINT8 i; + INT32 heightsec, phs; SINT8 flip = P_MobjFlip(thing); INT32 light; @@ -3624,11 +3562,39 @@ static void HWR_DrawDropShadow(mobj_t *thing, fixed_t scale) fixed_t slopez; pslope_t *groundslope; + // uncapped/interpolation + interpmobjstate_t interp = {0}; + + if (R_UsingFrameInterpolation() && !paused) + { + R_InterpolateMobjState(thing, rendertimefrac, &interp); + } + else + { + R_InterpolateMobjState(thing, FRACUNIT, &interp); + } + groundz = R_GetShadowZ(thing, &groundslope); - //if (abs(groundz - gl_viewz) / tz > 4) return; // Prevent stretchy shadows and possible crashes + heightsec = thing->subsector->sector->heightsec; + if (viewplayer->mo && viewplayer->mo->subsector) + phs = viewplayer->mo->subsector->sector->heightsec; + else + phs = -1; - floordiff = abs((flip < 0 ? thing->height : 0) + thing->z - groundz); + if (heightsec != -1 && phs != -1) // only clip things which are in special sectors + { + if (gl_viewz < FIXED_TO_FLOAT(sectors[phs].floorheight) ? + thing->z >= sectors[heightsec].floorheight : + thing->z < sectors[heightsec].floorheight) + return; + if (gl_viewz > FIXED_TO_FLOAT(sectors[phs].ceilingheight) ? + thing->z < sectors[heightsec].ceilingheight && gl_viewz >= FIXED_TO_FLOAT(sectors[heightsec].ceilingheight) : + thing->z >= sectors[heightsec].ceilingheight) + return; + } + + floordiff = abs((flip < 0 ? thing->height : 0) + interp.z - groundz); alpha = floordiff / (4*FRACUNIT) + 75; if (alpha >= 255) return; @@ -3640,10 +3606,12 @@ static void HWR_DrawDropShadow(mobj_t *thing, fixed_t scale) scalemul = FixedMul(FRACUNIT - floordiff/640, scale); scalemul = FixedMul(scalemul, (thing->radius*2) / gpatch->height); + if ((thing->scale != thing->old_scale) && (thing->scale >= FRACUNIT/1024)) // Interpolate shadows when scaling mobjs + scalemul = FixedMul(scalemul, FixedDiv(interp.scale, thing->scale)); fscale = FIXED_TO_FLOAT(scalemul); - fx = FIXED_TO_FLOAT(thing->x); - fy = FIXED_TO_FLOAT(thing->y); + fx = FIXED_TO_FLOAT(interp.x); + fy = FIXED_TO_FLOAT(interp.y); // 3--2 // | /| @@ -3721,12 +3689,44 @@ static void HWR_RotateSpritePolyToAim(gl_vissprite_t *spr, FOutVector *wallVerts && spr && spr->mobj && !R_ThingIsPaperSprite(spr->mobj) && wallVerts) { - float basey = FIXED_TO_FLOAT(spr->mobj->z); - float lowy = wallVerts[0].y; - if (!precip && P_MobjFlip(spr->mobj) == -1) // precip doesn't have eflags so they can't flip + // uncapped/interpolation + interpmobjstate_t interp = {0}; + float basey, lowy; + + // do interpolation + if (R_UsingFrameInterpolation() && !paused) { - basey = FIXED_TO_FLOAT(spr->mobj->z + spr->mobj->height); + if (precip) + { + R_InterpolatePrecipMobjState((precipmobj_t *)spr->mobj, rendertimefrac, &interp); + } + else + { + R_InterpolateMobjState(spr->mobj, rendertimefrac, &interp); + } } + else + { + if (precip) + { + R_InterpolatePrecipMobjState((precipmobj_t *)spr->mobj, FRACUNIT, &interp); + } + else + { + R_InterpolateMobjState(spr->mobj, FRACUNIT, &interp); + } + } + + if (P_MobjFlip(spr->mobj) == -1) + { + basey = FIXED_TO_FLOAT(interp.z + spr->mobj->height); + } + else + { + basey = FIXED_TO_FLOAT(interp.z); + } + lowy = wallVerts[0].y; + // Rotate sprites to fully billboard with the camera // X, Y, AND Z need to be manipulated for the polys to rotate around the // origin, because of how the origin setting works I believe that should @@ -3853,6 +3853,12 @@ static void HWR_SplitSprite(gl_vissprite_t *spr) else occlusion = PF_Occlude; + INT32 blendmode; + if (spr->mobj->frame & FF_BLENDMASK) + blendmode = ((spr->mobj->frame & FF_BLENDMASK) >> FF_BLENDSHIFT) + 1; + else + blendmode = spr->mobj->blendmode; + if (!cv_translucency.value) // translucency disabled { Surf.PolyColor.s.alpha = 0xFF; @@ -3862,12 +3868,12 @@ static void HWR_SplitSprite(gl_vissprite_t *spr) else if (spr->mobj->flags2 & MF2_SHADOW) { Surf.PolyColor.s.alpha = 0x40; - blend = HWR_GetBlendModeFlag(spr->mobj->blendmode); + blend = HWR_GetBlendModeFlag(blendmode); } else if (spr->mobj->frame & FF_TRANSMASK) { INT32 trans = (spr->mobj->frame & FF_TRANSMASK)>>FF_TRANSSHIFT; - blend = HWR_SurfaceBlend(spr->mobj->blendmode, trans, &Surf); + blend = HWR_SurfaceBlend(blendmode, trans, &Surf); } else { @@ -3876,7 +3882,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr) // Hurdler: PF_Environement would be cool, but we need to fix // the issue with the fog before Surf.PolyColor.s.alpha = 0xFF; - blend = HWR_GetBlendModeFlag(spr->mobj->blendmode)|occlusion; + blend = HWR_GetBlendModeFlag(blendmode)|occlusion; if (!occlusion) use_linkdraw_hack = true; } @@ -3916,13 +3922,16 @@ static void HWR_SplitSprite(gl_vissprite_t *spr) } } + if (R_ThingIsSemiBright(spr->mobj)) + lightlevel = 128 + (lightlevel>>1); + for (i = 0; i < sector->numlights; i++) { if (endtop < endrealbot && top < realbot) return; // even if we aren't changing colormap or lightlevel, we still need to continue drawing down the sprite - if (!(list[i].flags & FF_NOSHADE) && (list[i].flags & FF_CUTSPRITES)) + if (!(list[i].flags & FOF_NOSHADE) && (list[i].flags & FOF_CUTSPRITES)) { if (!lightset) lightlevel = *list[i].lightlevel > 255 ? 255 : *list[i].lightlevel; @@ -4178,7 +4187,7 @@ static void HWR_DrawSprite(gl_vissprite_t *spr) else { for (i = 0; i < 4; i++) - wallVerts[i].y = FIXED_TO_FLOAT(spr->mobj->z) + zoffset; + wallVerts[i].y = FIXED_TO_FLOAT(spr->gz) + zoffset; } } else @@ -4269,6 +4278,9 @@ static void HWR_DrawSprite(gl_vissprite_t *spr) else if (!lightset) lightlevel = sector->lightlevel > 255 ? 255 : sector->lightlevel; + if (R_ThingIsSemiBright(spr->mobj)) + lightlevel = 128 + (lightlevel>>1); + HWR_Lighting(&Surf, lightlevel, colormap); } @@ -4285,6 +4297,12 @@ static void HWR_DrawSprite(gl_vissprite_t *spr) else occlusion = PF_Occlude; + INT32 blendmode; + if (spr->mobj->frame & FF_BLENDMASK) + blendmode = ((spr->mobj->frame & FF_BLENDMASK) >> FF_BLENDSHIFT) + 1; + else + blendmode = spr->mobj->blendmode; + if (!cv_translucency.value) // translucency disabled { Surf.PolyColor.s.alpha = 0xFF; @@ -4294,12 +4312,12 @@ static void HWR_DrawSprite(gl_vissprite_t *spr) else if (spr->mobj->flags2 & MF2_SHADOW) { Surf.PolyColor.s.alpha = 0x40; - blend = HWR_GetBlendModeFlag(spr->mobj->blendmode); + blend = HWR_GetBlendModeFlag(blendmode); } else if (spr->mobj->frame & FF_TRANSMASK) { INT32 trans = (spr->mobj->frame & FF_TRANSMASK)>>FF_TRANSSHIFT; - blend = HWR_SurfaceBlend(spr->mobj->blendmode, trans, &Surf); + blend = HWR_SurfaceBlend(blendmode, trans, &Surf); } else { @@ -4308,7 +4326,7 @@ static void HWR_DrawSprite(gl_vissprite_t *spr) // Hurdler: PF_Environement would be cool, but we need to fix // the issue with the fog before Surf.PolyColor.s.alpha = 0xFF; - blend = HWR_GetBlendModeFlag(spr->mobj->blendmode)|occlusion; + blend = HWR_GetBlendModeFlag(blendmode)|occlusion; if (!occlusion) use_linkdraw_hack = true; } @@ -4615,7 +4633,7 @@ void HWR_AddTransparentFloor(levelflat_t *levelflat, extrasubsector_t *xsub, boo planeinfo[numplanes].isceiling = isceiling; planeinfo[numplanes].fixedheight = fixedheight; - planeinfo[numplanes].lightlevel = (planecolormap && (planecolormap->flags & CMF_FOG)) ? lightlevel : 255; + planeinfo[numplanes].lightlevel = (planecolormap && (planecolormap->flags & CMF_FOG)) ? 255 : lightlevel; planeinfo[numplanes].levelflat = levelflat; planeinfo[numplanes].xsub = xsub; planeinfo[numplanes].alpha = alpha; @@ -4646,7 +4664,7 @@ void HWR_AddTransparentPolyobjectFloor(levelflat_t *levelflat, polyobj_t *polyse polyplaneinfo[numpolyplanes].isceiling = isceiling; polyplaneinfo[numpolyplanes].fixedheight = fixedheight; - polyplaneinfo[numpolyplanes].lightlevel = (planecolormap && (planecolormap->flags & CMF_FOG)) ? lightlevel : 255; + polyplaneinfo[numpolyplanes].lightlevel = (planecolormap && (planecolormap->flags & CMF_FOG)) ? 255 : lightlevel; polyplaneinfo[numpolyplanes].levelflat = levelflat; polyplaneinfo[numpolyplanes].polysector = polysector; polyplaneinfo[numpolyplanes].alpha = alpha; @@ -4718,7 +4736,7 @@ static void HWR_CreateDrawNodes(void) // that is already lying around. This should all be in some sort of linked list or lists. sortindex = Z_Calloc(sizeof(size_t) * (numplanes + numpolyplanes + numwalls), PU_STATIC, NULL); - ps_hw_nodesorttime = I_GetPreciseTime(); + PS_START_TIMING(ps_hw_nodesorttime); for (i = 0; i < numplanes; i++, p++) { @@ -4738,7 +4756,7 @@ static void HWR_CreateDrawNodes(void) sortindex[p] = p; } - ps_numdrawnodes = p; + ps_numdrawnodes.value.i = p; // p is the number of stuff to sort @@ -4773,9 +4791,9 @@ static void HWR_CreateDrawNodes(void) } } - ps_hw_nodesorttime = I_GetPreciseTime() - ps_hw_nodesorttime; + PS_STOP_TIMING(ps_hw_nodesorttime); - ps_hw_nodedrawtime = I_GetPreciseTime(); + PS_START_TIMING(ps_hw_nodedrawtime); // Okay! Let's draw it all! Woo! HWD.pfnSetTransform(&atransform); @@ -4812,7 +4830,7 @@ static void HWR_CreateDrawNodes(void) } } - ps_hw_nodedrawtime = I_GetPreciseTime() - ps_hw_nodedrawtime; + PS_STOP_TIMING(ps_hw_nodedrawtime); numwalls = 0; numplanes = 0; @@ -4987,7 +5005,6 @@ static void HWR_ProjectSprite(mobj_t *thing) INT32 heightsec, phs; const boolean splat = R_ThingIsFloorSprite(thing); const boolean papersprite = (R_ThingIsPaperSprite(thing) && !splat); - angle_t mobjangle = (thing->player ? thing->player->drawangle : thing->angle); float z1, z2; fixed_t spr_width, spr_height; @@ -4997,28 +5014,47 @@ static void HWR_ProjectSprite(mobj_t *thing) INT32 rollangle = 0; #endif + // uncapped/interpolation + interpmobjstate_t interp = {0}; + if (!thing) return; - if (thing->spritexscale < 1 || thing->spriteyscale < 1) - return; + INT32 blendmode; + if (thing->frame & FF_BLENDMASK) + blendmode = ((thing->frame & FF_BLENDMASK) >> FF_BLENDSHIFT) + 1; + else + blendmode = thing->blendmode; // Visibility check by the blend mode. if (thing->frame & FF_TRANSMASK) { - if (!R_BlendLevelVisible(thing->blendmode, (thing->frame & FF_TRANSMASK)>>FF_TRANSSHIFT)) + if (!R_BlendLevelVisible(blendmode, (thing->frame & FF_TRANSMASK)>>FF_TRANSSHIFT)) return; } - dispoffset = thing->info->dispoffset; + dispoffset = thing->dispoffset; - this_scale = FIXED_TO_FLOAT(thing->scale); - spritexscale = FIXED_TO_FLOAT(thing->spritexscale); - spriteyscale = FIXED_TO_FLOAT(thing->spriteyscale); + + if (R_UsingFrameInterpolation() && !paused) + { + R_InterpolateMobjState(thing, rendertimefrac, &interp); + } + else + { + R_InterpolateMobjState(thing, FRACUNIT, &interp); + } + + if (interp.spritexscale < 1 || interp.spriteyscale < 1) + return; + + this_scale = FIXED_TO_FLOAT(interp.scale); + spritexscale = FIXED_TO_FLOAT(interp.spritexscale); + spriteyscale = FIXED_TO_FLOAT(interp.spriteyscale); // transform the origin point - tr_x = FIXED_TO_FLOAT(thing->x) - gl_viewx; - tr_y = FIXED_TO_FLOAT(thing->y) - gl_viewy; + tr_x = FIXED_TO_FLOAT(interp.x) - gl_viewx; + tr_y = FIXED_TO_FLOAT(interp.y) - gl_viewy; // rotation around vertical axis tz = (tr_x * gl_viewcos) + (tr_y * gl_viewsin); @@ -5041,8 +5077,8 @@ static void HWR_ProjectSprite(mobj_t *thing) } // The above can stay as it works for cutting sprites that are too close - tr_x = FIXED_TO_FLOAT(thing->x); - tr_y = FIXED_TO_FLOAT(thing->y); + tr_x = FIXED_TO_FLOAT(interp.x); + tr_y = FIXED_TO_FLOAT(interp.y); // decide which patch to use for sprite relative to player #ifdef RANGECHECK @@ -5090,9 +5126,16 @@ static void HWR_ProjectSprite(mobj_t *thing) I_Error("sprframes NULL for sprite %d\n", thing->sprite); #endif - ang = R_PointToAngle (thing->x, thing->y) - mobjangle; - if (mirrored) - ang = InvAngle(ang); + if (splat) + { + ang = R_PointToAngle2(0, viewz, 0, interp.z); + } + else + { + ang = R_PointToAngle (interp.x, interp.y) - interp.angle; + if (mirrored) + ang = InvAngle(ang); + } if (sprframe->rotate == SRF_SINGLE) { @@ -5139,7 +5182,15 @@ static void HWR_ProjectSprite(mobj_t *thing) if (thing->rollangle && !(splat && !(thing->renderflags & RF_NOSPLATROLLANGLE))) { - rollangle = R_GetRollAngle(thing->rollangle); + if (papersprite) + { + // a positive rollangle should should pitch papersprites upwards relative to their facing angle + rollangle = R_GetRollAngle(InvAngle(thing->rollangle)); + } + else + { + rollangle = R_GetRollAngle(thing->rollangle); + } rotsprite = Patch_GetRotatedSprite(sprframe, (thing->frame & FF_FRAMEMASK), rot, flip, false, sprinfo, rollangle); if (rotsprite != NULL) @@ -5158,8 +5209,8 @@ static void HWR_ProjectSprite(mobj_t *thing) if (thing->renderflags & RF_ABSOLUTEOFFSETS) { - spr_offset = thing->spritexoffset; - spr_topoffset = thing->spriteyoffset; + spr_offset = interp.spritexoffset; + spr_topoffset = interp.spriteyoffset; } else { @@ -5168,14 +5219,14 @@ static void HWR_ProjectSprite(mobj_t *thing) if ((thing->renderflags & RF_FLIPOFFSETS) && flip) flipoffset = -1; - spr_offset += thing->spritexoffset * flipoffset; - spr_topoffset += thing->spriteyoffset * flipoffset; + spr_offset += interp.spritexoffset * flipoffset; + spr_topoffset += interp.spriteyoffset * flipoffset; } if (papersprite) { - rightsin = FIXED_TO_FLOAT(FINESINE((mobjangle)>>ANGLETOFINESHIFT)); - rightcos = FIXED_TO_FLOAT(FINECOSINE((mobjangle)>>ANGLETOFINESHIFT)); + rightsin = FIXED_TO_FLOAT(FINESINE(interp.angle >> ANGLETOFINESHIFT)); + rightcos = FIXED_TO_FLOAT(FINECOSINE(interp.angle >> ANGLETOFINESHIFT)); } else { @@ -5191,11 +5242,24 @@ static void HWR_ProjectSprite(mobj_t *thing) if (caster && !P_MobjWasRemoved(caster)) { - fixed_t groundz = R_GetShadowZ(thing, NULL); - fixed_t floordiff = abs(((thing->eflags & MFE_VERTICALFLIP) ? caster->height : 0) + caster->z - groundz); + interpmobjstate_t casterinterp = { 0 }; + fixed_t groundz; + fixed_t floordiff; + + if (R_UsingFrameInterpolation() && !paused) + { + R_InterpolateMobjState(caster, rendertimefrac, &casterinterp); + } + else + { + R_InterpolateMobjState(caster, FRACUNIT, &casterinterp); + } + + groundz = R_GetShadowZ(thing, NULL); + floordiff = abs(((thing->eflags & MFE_VERTICALFLIP) ? caster->height : 0) + casterinterp.z - groundz); shadowheight = FIXED_TO_FLOAT(floordiff); - shadowscale = FIXED_TO_FLOAT(FixedMul(FRACUNIT - floordiff/640, caster->scale)); + shadowscale = FIXED_TO_FLOAT(FixedMul(FRACUNIT - floordiff/640, casterinterp.scale)); if (splat) spritexscale *= shadowscale; @@ -5206,43 +5270,52 @@ static void HWR_ProjectSprite(mobj_t *thing) this_xscale = spritexscale * this_scale; this_yscale = spriteyscale * this_scale; - if (flip) + if (splat) { - x1 = (FIXED_TO_FLOAT(spr_width - spr_offset) * this_xscale); - x2 = (FIXED_TO_FLOAT(spr_offset) * this_xscale); + z1 = z2 = tr_y; + x1 = x2 = tr_x; + gz = gzt = interp.z; } else { - x1 = (FIXED_TO_FLOAT(spr_offset) * this_xscale); - x2 = (FIXED_TO_FLOAT(spr_width - spr_offset) * this_xscale); - } + if (flip) + { + x1 = (FIXED_TO_FLOAT(spr_width - spr_offset) * this_xscale); + x2 = (FIXED_TO_FLOAT(spr_offset) * this_xscale); + } + else + { + x1 = (FIXED_TO_FLOAT(spr_offset) * this_xscale); + x2 = (FIXED_TO_FLOAT(spr_width - spr_offset) * this_xscale); + } - // test if too close -/* - if (papersprite) - { - z1 = tz - x1 * angle_scalez; - z2 = tz + x2 * angle_scalez; + // test if too close + /* + if (papersprite) + { + z1 = tz - x1 * angle_scalez; + z2 = tz + x2 * angle_scalez; - if (max(z1, z2) < ZCLIP_PLANE) - return; - } -*/ + if (max(z1, z2) < ZCLIP_PLANE) + return; + } + */ - z1 = tr_y + x1 * rightsin; - z2 = tr_y - x2 * rightsin; - x1 = tr_x + x1 * rightcos; - x2 = tr_x - x2 * rightcos; + z1 = tr_y + x1 * rightsin; + z2 = tr_y - x2 * rightsin; + x1 = tr_x + x1 * rightcos; + x2 = tr_x - x2 * rightcos; - if (vflip) - { - gz = FIXED_TO_FLOAT(thing->z + thing->height) - (FIXED_TO_FLOAT(spr_topoffset) * this_yscale); - gzt = gz + (FIXED_TO_FLOAT(spr_height) * this_yscale); - } - else - { - gzt = FIXED_TO_FLOAT(thing->z) + (FIXED_TO_FLOAT(spr_topoffset) * this_yscale); - gz = gzt - (FIXED_TO_FLOAT(spr_height) * this_yscale); + if (vflip) + { + gz = FIXED_TO_FLOAT(interp.z + thing->height) - (FIXED_TO_FLOAT(spr_topoffset) * this_yscale); + gzt = gz + (FIXED_TO_FLOAT(spr_height) * this_yscale); + } + else + { + gzt = FIXED_TO_FLOAT(interp.z) + (FIXED_TO_FLOAT(spr_topoffset) * this_yscale); + gz = gzt - (FIXED_TO_FLOAT(spr_height) * this_yscale); + } } if (thing->subsector->sector->cullheight) @@ -5259,25 +5332,42 @@ static void HWR_ProjectSprite(mobj_t *thing) if (heightsec != -1 && phs != -1) // only clip things which are in special sectors { + float top = gzt; + float bottom = FIXED_TO_FLOAT(interp.z); + + if (R_ThingIsFloorSprite(thing)) + top = bottom; + if (gl_viewz < FIXED_TO_FLOAT(sectors[phs].floorheight) ? - FIXED_TO_FLOAT(thing->z) >= FIXED_TO_FLOAT(sectors[heightsec].floorheight) : - gzt < FIXED_TO_FLOAT(sectors[heightsec].floorheight)) + bottom >= FIXED_TO_FLOAT(sectors[heightsec].floorheight) : + top < FIXED_TO_FLOAT(sectors[heightsec].floorheight)) return; if (gl_viewz > FIXED_TO_FLOAT(sectors[phs].ceilingheight) ? - gzt < FIXED_TO_FLOAT(sectors[heightsec].ceilingheight) && gl_viewz >= FIXED_TO_FLOAT(sectors[heightsec].ceilingheight) : - FIXED_TO_FLOAT(thing->z) >= FIXED_TO_FLOAT(sectors[heightsec].ceilingheight)) + top < FIXED_TO_FLOAT(sectors[heightsec].ceilingheight) && gl_viewz >= FIXED_TO_FLOAT(sectors[heightsec].ceilingheight) : + bottom >= FIXED_TO_FLOAT(sectors[heightsec].ceilingheight)) return; } if ((thing->flags2 & MF2_LINKDRAW) && thing->tracer) { + interpmobjstate_t tracer_interp = { 0 }; + if (! R_ThingVisible(thing->tracer)) return; + if (R_UsingFrameInterpolation() && !paused) + { + R_InterpolateMobjState(thing->tracer, rendertimefrac, &tracer_interp); + } + else + { + R_InterpolateMobjState(thing->tracer, FRACUNIT, &tracer_interp); + } + // calculate tz for tracer, same way it is calculated for this sprite // transform the origin point - tr_x = FIXED_TO_FLOAT(thing->tracer->x) - gl_viewx; - tr_y = FIXED_TO_FLOAT(thing->tracer->y) - gl_viewy; + tr_x = FIXED_TO_FLOAT(tracer_interp.x) - gl_viewx; + tr_y = FIXED_TO_FLOAT(tracer_interp.y) - gl_viewy; // rotation around vertical axis tracertz = (tr_x * gl_viewcos) + (tr_y * gl_viewsin); @@ -5332,6 +5422,10 @@ static void HWR_ProjectSprite(mobj_t *thing) vis->gpatch = (patch_t *)W_CachePatchNum(sprframe->lumppat[rot], PU_SPRITE); vis->mobj = thing; + if ((thing->flags2 & MF2_LINKDRAW) && thing->tracer && thing->color == SKINCOLOR_NONE) + vis->color = thing->tracer->color; + else + vis->color = thing->color; //Hurdler: 25/04/2000: now support colormap in hardware mode if ((vis->mobj->flags & (MF_ENEMY|MF_BOSS)) && (vis->mobj->flags2 & MF2_FRET) && !(vis->mobj->flags & MF_GRENADEBOUNCE) && (leveltime & 1)) // Bosses "flash" @@ -5341,13 +5435,13 @@ static void HWR_ProjectSprite(mobj_t *thing) else if (vis->mobj->type == MT_METALSONIC_BATTLE) vis->colormap = R_GetTranslationColormap(TC_METALSONIC, 0, GTC_CACHE); else - vis->colormap = R_GetTranslationColormap(TC_BOSS, vis->mobj->color, GTC_CACHE); + vis->colormap = R_GetTranslationColormap(TC_BOSS, vis->color, GTC_CACHE); } - else if (thing->color) + else if (vis->color) { // New colormap stuff for skins Tails 06-07-2002 if (thing->colorized) - vis->colormap = R_GetTranslationColormap(TC_RAINBOW, thing->color, GTC_CACHE); + vis->colormap = R_GetTranslationColormap(TC_RAINBOW, vis->color, GTC_CACHE); else if (thing->player && thing->player->dashmode >= DASHMODE_THRESHOLD && (thing->player->charflags & SF_DASHMODE) && ((leveltime/2) & 1)) @@ -5355,15 +5449,15 @@ static void HWR_ProjectSprite(mobj_t *thing) if (thing->player->charflags & SF_MACHINE) vis->colormap = R_GetTranslationColormap(TC_DASHMODE, 0, GTC_CACHE); else - vis->colormap = R_GetTranslationColormap(TC_RAINBOW, thing->color, GTC_CACHE); + vis->colormap = R_GetTranslationColormap(TC_RAINBOW, vis->color, GTC_CACHE); } else if (thing->skin && thing->sprite == SPR_PLAY) // This thing is a player! { size_t skinnum = (skin_t*)thing->skin-skins; - vis->colormap = R_GetTranslationColormap((INT32)skinnum, thing->color, GTC_CACHE); + vis->colormap = R_GetTranslationColormap((INT32)skinnum, vis->color, GTC_CACHE); } else - vis->colormap = R_GetTranslationColormap(TC_DEFAULT, vis->mobj->color ? vis->mobj->color : SKINCOLOR_CYAN, GTC_CACHE); + vis->colormap = R_GetTranslationColormap(TC_DEFAULT, vis->color ? vis->color : SKINCOLOR_CYAN, GTC_CACHE); } else vis->colormap = NULL; @@ -5378,6 +5472,8 @@ static void HWR_ProjectSprite(mobj_t *thing) vis->vflip = vflip; vis->precip = false; + + vis->angle = interp.angle; } #ifdef HWPRECIP @@ -5396,6 +5492,9 @@ static void HWR_ProjectPrecipitationSprite(precipmobj_t *thing) unsigned rot = 0; UINT8 flip; + if (!thing) + return; + // Visibility check by the blend mode. if (thing->frame & FF_TRANSMASK) { @@ -5403,9 +5502,22 @@ static void HWR_ProjectPrecipitationSprite(precipmobj_t *thing) return; } + // uncapped/interpolation + interpmobjstate_t interp = {0}; + + // do interpolation + if (R_UsingFrameInterpolation() && !paused) + { + R_InterpolatePrecipMobjState(thing, rendertimefrac, &interp); + } + else + { + R_InterpolatePrecipMobjState(thing, FRACUNIT, &interp); + } + // transform the origin point - tr_x = FIXED_TO_FLOAT(thing->x) - gl_viewx; - tr_y = FIXED_TO_FLOAT(thing->y) - gl_viewy; + tr_x = FIXED_TO_FLOAT(interp.x) - gl_viewx; + tr_y = FIXED_TO_FLOAT(interp.y) - gl_viewy; // rotation around vertical axis tz = (tr_x * gl_viewcos) + (tr_y * gl_viewsin); @@ -5414,8 +5526,8 @@ static void HWR_ProjectPrecipitationSprite(precipmobj_t *thing) if (tz < ZCLIP_PLANE) return; - tr_x = FIXED_TO_FLOAT(thing->x); - tr_y = FIXED_TO_FLOAT(thing->y); + tr_x = FIXED_TO_FLOAT(interp.x); + tr_y = FIXED_TO_FLOAT(interp.y); // decide which patch to use for sprite relative to player if ((unsigned)thing->sprite >= numsprites) @@ -5473,11 +5585,12 @@ static void HWR_ProjectPrecipitationSprite(precipmobj_t *thing) vis->gpatch = (patch_t *)W_CachePatchNum(sprframe->lumppat[rot], PU_SPRITE); vis->flip = flip; vis->mobj = (mobj_t *)thing; + vis->color = SKINCOLOR_NONE; vis->colormap = NULL; // set top/bottom coords - vis->gzt = FIXED_TO_FLOAT(thing->z + spritecachedinfo[lumpoff].topoffset); + vis->gzt = FIXED_TO_FLOAT(interp.z + spritecachedinfo[lumpoff].topoffset); vis->gz = vis->gzt - FIXED_TO_FLOAT(spritecachedinfo[lumpoff].height); vis->precip = true; @@ -6095,10 +6208,10 @@ void HWR_RenderPlayerView(INT32 viewnumber, player_t *player) if (viewnumber == 0) // Only do it if it's the first screen being rendered HWD.pfnClearBuffer(true, false, &ClearColor); // Clear the Color Buffer, stops HOMs. Also seems to fix the skybox issue on Intel GPUs. - ps_hw_skyboxtime = I_GetPreciseTime(); + PS_START_TIMING(ps_hw_skyboxtime); if (skybox && drawsky) // If there's a skybox and we should be drawing the sky, draw the skybox HWR_RenderSkyboxView(viewnumber, player); // This is drawn before everything else so it is placed behind - ps_hw_skyboxtime = I_GetPreciseTime() - ps_hw_skyboxtime; + PS_STOP_TIMING(ps_hw_skyboxtime); { // do we really need to save player (is it not the same)? @@ -6208,9 +6321,9 @@ void HWR_RenderPlayerView(INT32 viewnumber, player_t *player) // Reset the shader state. HWR_SetShaderState(); - ps_numbspcalls = 0; - ps_numpolyobjects = 0; - ps_bsptime = I_GetPreciseTime(); + ps_numbspcalls.value.i = 0; + ps_numpolyobjects.value.i = 0; + PS_START_TIMING(ps_bsptime); validcount++; @@ -6248,7 +6361,7 @@ void HWR_RenderPlayerView(INT32 viewnumber, player_t *player) } #endif - ps_bsptime = I_GetPreciseTime() - ps_bsptime; + PS_STOP_TIMING(ps_bsptime); if (cv_glbatching.value) HWR_RenderBatches(); @@ -6263,22 +6376,22 @@ void HWR_RenderPlayerView(INT32 viewnumber, player_t *player) #endif // Draw MD2 and sprites - ps_numsprites = gl_visspritecount; - ps_hw_spritesorttime = I_GetPreciseTime(); + ps_numsprites.value.i = gl_visspritecount; + PS_START_TIMING(ps_hw_spritesorttime); HWR_SortVisSprites(); - ps_hw_spritesorttime = I_GetPreciseTime() - ps_hw_spritesorttime; - ps_hw_spritedrawtime = I_GetPreciseTime(); + PS_STOP_TIMING(ps_hw_spritesorttime); + PS_START_TIMING(ps_hw_spritedrawtime); HWR_DrawSprites(); - ps_hw_spritedrawtime = I_GetPreciseTime() - ps_hw_spritedrawtime; + PS_STOP_TIMING(ps_hw_spritedrawtime); #ifdef NEWCORONAS //Hurdler: they must be drawn before translucent planes, what about gl fog? HWR_DrawCoronas(); #endif - ps_numdrawnodes = 0; - ps_hw_nodesorttime = 0; - ps_hw_nodedrawtime = 0; + ps_numdrawnodes.value.i = 0; + ps_hw_nodesorttime.value.p = 0; + ps_hw_nodedrawtime.value.p = 0; if (numplanes || numpolyplanes || numwalls) //Hurdler: render 3D water and transparent walls after everything { HWR_CreateDrawNodes(); @@ -6612,7 +6725,8 @@ void HWR_DoPostProcessor(player_t *player) { // 10 by 10 grid. 2 coordinates (xy) float v[SCREENVERTS][SCREENVERTS][2]; - static double disStart = 0; + float disStart = (leveltime-1) + FIXED_TO_FLOAT(rendertimefrac); + UINT8 x, y; INT32 WAVELENGTH; INT32 AMPLITUDE; @@ -6621,15 +6735,15 @@ void HWR_DoPostProcessor(player_t *player) // Modifies the wave. if (*type == postimg_water) { - WAVELENGTH = 20; // Lower is longer - AMPLITUDE = 20; // Lower is bigger - FREQUENCY = 16; // Lower is faster + WAVELENGTH = 5; + AMPLITUDE = 20; + FREQUENCY = 8; } else { - WAVELENGTH = 10; // Lower is longer - AMPLITUDE = 30; // Lower is bigger - FREQUENCY = 4; // Lower is faster + WAVELENGTH = 10; + AMPLITUDE = 60; + FREQUENCY = 4; } for (x = 0; x < SCREENVERTS; x++) @@ -6642,8 +6756,6 @@ void HWR_DoPostProcessor(player_t *player) } } HWD.pfnPostImgRedraw(v); - if (!(paused || P_AutoPause())) - disStart += 1; // Capture the screen again for screen waving on the intermission if(gamestate != GS_INTERMISSION) @@ -6767,7 +6879,7 @@ void HWR_LoadAllCustomShaders(void) // read every custom shader for (i = 0; i < numwadfiles; i++) - HWR_LoadCustomShadersFromFile(i, (wadfiles[i]->type == RET_PK3)); + HWR_LoadCustomShadersFromFile(i, W_FileHasFolders(wadfiles[i])); } void HWR_LoadCustomShadersFromFile(UINT16 wadnum, boolean PK3) diff --git a/src/hardware/hw_main.h b/src/hardware/hw_main.h index 218650b53..4a1b412fc 100644 --- a/src/hardware/hw_main.h +++ b/src/hardware/hw_main.h @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -20,6 +20,8 @@ #include "../d_player.h" #include "../r_defs.h" +#include "../m_perfstats.h" + // Startup & Shutdown the hardware mode renderer void HWR_Startup(void); void HWR_Switch(void); @@ -39,7 +41,7 @@ void HWR_InitTextureMapping(void); void HWR_SetViewSize(void); void HWR_DrawPatch(patch_t *gpatch, INT32 x, INT32 y, INT32 option); void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 option, const UINT8 *colormap); -void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t scale, INT32 option, fixed_t sx, fixed_t sy, fixed_t w, fixed_t h); +void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 option, const UINT8 *colormap, fixed_t sx, fixed_t sy, fixed_t w, fixed_t h); void HWR_MakePatch(const patch_t *patch, GLPatch_t *grPatch, GLMipmap_t *grMipmap, boolean makebitmap); void HWR_CreatePlanePolygons(INT32 bspnum); void HWR_CreateStaticLightmaps(INT32 bspnum); @@ -116,22 +118,22 @@ extern FTransform atransform; // Render stats -extern precise_t ps_hw_skyboxtime; -extern precise_t ps_hw_nodesorttime; -extern precise_t ps_hw_nodedrawtime; -extern precise_t ps_hw_spritesorttime; -extern precise_t ps_hw_spritedrawtime; +extern ps_metric_t ps_hw_skyboxtime; +extern ps_metric_t ps_hw_nodesorttime; +extern ps_metric_t ps_hw_nodedrawtime; +extern ps_metric_t ps_hw_spritesorttime; +extern ps_metric_t ps_hw_spritedrawtime; // Render stats for batching -extern int ps_hw_numpolys; -extern int ps_hw_numverts; -extern int ps_hw_numcalls; -extern int ps_hw_numshaders; -extern int ps_hw_numtextures; -extern int ps_hw_numpolyflags; -extern int ps_hw_numcolors; -extern precise_t ps_hw_batchsorttime; -extern precise_t ps_hw_batchdrawtime; +extern ps_metric_t ps_hw_numpolys; +extern ps_metric_t ps_hw_numverts; +extern ps_metric_t ps_hw_numcalls; +extern ps_metric_t ps_hw_numshaders; +extern ps_metric_t ps_hw_numtextures; +extern ps_metric_t ps_hw_numpolyflags; +extern ps_metric_t ps_hw_numcolors; +extern ps_metric_t ps_hw_batchsorttime; +extern ps_metric_t ps_hw_batchdrawtime; extern boolean gl_init; extern boolean gl_maploaded; diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c index b66f91e19..38e8e8fc4 100644 --- a/src/hardware/hw_md2.c +++ b/src/hardware/hw_md2.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -30,6 +30,7 @@ #include "hw_md2.h" #include "../d_main.h" #include "../r_bsp.h" +#include "../r_fps.h" #include "../r_main.h" #include "../m_misc.h" #include "../w_wad.h" @@ -1306,7 +1307,11 @@ boolean HWR_DrawModel(gl_vissprite_t *spr) light = R_GetPlaneLight(sector, spr->mobj->z + spr->mobj->height, false); // Always use the light at the top instead of whatever I was doing before - if (!R_ThingIsFullBright(spr->mobj)) + if (R_ThingIsFullDark(spr->mobj)) + lightlevel = 0; + else if (R_ThingIsSemiBright(spr->mobj)) + lightlevel = 128 + (*sector->lightlist[light].lightlevel>>1); + else if (!R_ThingIsFullBright(spr->mobj)) lightlevel = *sector->lightlist[light].lightlevel > 255 ? 255 : *sector->lightlist[light].lightlevel; if (*sector->lightlist[light].extra_colormap) @@ -1314,7 +1319,11 @@ boolean HWR_DrawModel(gl_vissprite_t *spr) } else { - if (!R_ThingIsFullBright(spr->mobj)) + if (R_ThingIsFullDark(spr->mobj)) + lightlevel = 0; + else if (R_ThingIsSemiBright(spr->mobj)) + lightlevel = 128 + (sector->lightlevel>>1); + else if (!R_ThingIsFullBright(spr->mobj)) lightlevel = sector->lightlevel > 255 ? 255 : sector->lightlevel; if (sector->extra_colormap) @@ -1330,8 +1339,8 @@ boolean HWR_DrawModel(gl_vissprite_t *spr) { patch_t *gpatch, *blendgpatch; GLPatch_t *hwrPatch = NULL, *hwrBlendPatch = NULL; - INT32 durs = spr->mobj->state->tics; - INT32 tics = spr->mobj->tics; + float durs = (float)spr->mobj->state->tics; + float tics = (float)spr->mobj->tics; const boolean papersprite = (R_ThingIsPaperSprite(spr->mobj) && !R_ThingIsFloorSprite(spr->mobj)); const UINT8 flip = (UINT8)(!(spr->mobj->eflags & MFE_VERTICALFLIP) != !R_ThingVerticallyFlipped(spr->mobj)); const UINT8 hflip = (UINT8)(!(spr->mobj->mirrored) != !R_ThingHorizontallyFlipped(spr->mobj)); @@ -1341,17 +1350,33 @@ boolean HWR_DrawModel(gl_vissprite_t *spr) angle_t ang; INT32 mod; float finalscale; + interpmobjstate_t interp; + + if (R_UsingFrameInterpolation() && !paused) + { + R_InterpolateMobjState(spr->mobj, rendertimefrac, &interp); + } + else + { + R_InterpolateMobjState(spr->mobj, FRACUNIT, &interp); + } // Apparently people don't like jump frames like that, so back it goes //if (tics > durs) //durs = tics; + INT32 blendmode; + if (spr->mobj->frame & FF_BLENDMASK) + blendmode = ((spr->mobj->frame & FF_BLENDMASK) >> FF_BLENDSHIFT) + 1; + else + blendmode = spr->mobj->blendmode; + if (spr->mobj->frame & FF_TRANSMASK) - Surf.PolyFlags = HWR_SurfaceBlend(spr->mobj->blendmode, (spr->mobj->frame & FF_TRANSMASK)>>FF_TRANSSHIFT, &Surf); + Surf.PolyFlags = HWR_SurfaceBlend(blendmode, (spr->mobj->frame & FF_TRANSMASK)>>FF_TRANSSHIFT, &Surf); else { Surf.PolyColor.s.alpha = (spr->mobj->flags2 & MF2_SHADOW) ? 0x40 : 0xff; - Surf.PolyFlags = HWR_GetBlendModeFlag(spr->mobj->blendmode); + Surf.PolyFlags = HWR_GetBlendModeFlag(blendmode); } // don't forget to enable the depth test because we can't do this @@ -1484,8 +1509,8 @@ boolean HWR_DrawModel(gl_vissprite_t *spr) if (spr->mobj->frame & FF_ANIMATE) { // set duration and tics to be the correct values for FF_ANIMATE states - durs = spr->mobj->state->var2; - tics = spr->mobj->anim_duration; + durs = (float)spr->mobj->state->var2; + tics = (float)spr->mobj->anim_duration; } frame = (spr->mobj->frame & FF_FRAMEMASK); @@ -1509,7 +1534,11 @@ boolean HWR_DrawModel(gl_vissprite_t *spr) } #ifdef USE_MODEL_NEXTFRAME -#define INTERPOLERATION_LIMIT TICRATE/4 + // Interpolate the model interpolation. (lol) + tics -= FixedToFloat(rendertimefrac); + +#define INTERPOLERATION_LIMIT (TICRATE * 0.25f) + if (cv_glmodelinterpolation.value && tics <= durs && tics <= INTERPOLERATION_LIMIT) { if (durs > INTERPOLERATION_LIMIT) @@ -1558,13 +1587,13 @@ boolean HWR_DrawModel(gl_vissprite_t *spr) #endif //Hurdler: it seems there is still a small problem with mobj angle - p.x = FIXED_TO_FLOAT(spr->mobj->x); - p.y = FIXED_TO_FLOAT(spr->mobj->y)+md2->offset; + p.x = FIXED_TO_FLOAT(interp.x); + p.y = FIXED_TO_FLOAT(interp.y)+md2->offset; if (flip) - p.z = FIXED_TO_FLOAT(spr->mobj->z + spr->mobj->height); + p.z = FIXED_TO_FLOAT(interp.z + spr->mobj->height); else - p.z = FIXED_TO_FLOAT(spr->mobj->z); + p.z = FIXED_TO_FLOAT(interp.z); if (spr->mobj->skin && spr->mobj->sprite == SPR_PLAY) sprdef = &((skin_t *)spr->mobj->skin)->sprites[spr->mobj->sprite2]; @@ -1575,16 +1604,13 @@ boolean HWR_DrawModel(gl_vissprite_t *spr) if (sprframe->rotate || papersprite) { - fixed_t anglef = AngleFixed(spr->mobj->angle); - - if (spr->mobj->player) - anglef = AngleFixed(spr->mobj->player->drawangle); + fixed_t anglef = AngleFixed(interp.angle); p.angley = FIXED_TO_FLOAT(anglef); } else { - const fixed_t anglef = AngleFixed((R_PointToAngle(spr->mobj->x, spr->mobj->y))-ANGLE_180); + const fixed_t anglef = AngleFixed((R_PointToAngle(interp.x, interp.y))-ANGLE_180); p.angley = FIXED_TO_FLOAT(anglef); } @@ -1606,7 +1632,7 @@ boolean HWR_DrawModel(gl_vissprite_t *spr) p.rotaxis = (UINT8)(sprinfo->pivot[(spr->mobj->frame & FF_FRAMEMASK)].rotaxis); // for NiGHTS specifically but should work everywhere else - ang = R_PointToAngle (spr->mobj->x, spr->mobj->y) - (spr->mobj->player ? spr->mobj->player->drawangle : spr->mobj->angle); + ang = R_PointToAngle (interp.x, interp.y) - interp.angle; if ((sprframe->rotate & SRF_RIGHT) && (ang < ANGLE_180)) // See from right p.rollflip = 1; else if ((sprframe->rotate & SRF_LEFT) && (ang >= ANGLE_180)) // See from left @@ -1634,7 +1660,7 @@ boolean HWR_DrawModel(gl_vissprite_t *spr) #endif // SRB2CBTODO: MD2 scaling support - finalscale *= FIXED_TO_FLOAT(spr->mobj->scale); + finalscale *= FIXED_TO_FLOAT(interp.scale); p.flip = atransform.flip; #ifdef USE_FTRANSFORM_MIRROR diff --git a/src/hardware/hw_md2.h b/src/hardware/hw_md2.h index 9249c034c..f1cca763c 100644 --- a/src/hardware/hw_md2.h +++ b/src/hardware/hw_md2.h @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/hardware/r_opengl/r_opengl-vc10.vcxproj b/src/hardware/r_opengl/r_opengl-vc10.vcxproj index d1f856e96..c93e47d50 100644 --- a/src/hardware/r_opengl/r_opengl-vc10.vcxproj +++ b/src/hardware/r_opengl/r_opengl-vc10.vcxproj @@ -38,51 +38,51 @@ r_opengl {51137D5C-4E81-4955-AACF-EA3092006051} r_opengl - 10.0.16299.0 + 10.0 DynamicLibrary false - v140 + v143 DynamicLibrary false - v141 + v143 true DynamicLibrary false - v140 + v143 DynamicLibrary false - v141 + v143 true DynamicLibrary false - v140 + v143 DynamicLibrary false - v141 + v143 true DynamicLibrary false - v140 + v143 DynamicLibrary false - v141 + v143 true diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c index 645a3bbae..569ddfee8 100644 --- a/src/hardware/r_opengl/r_opengl.c +++ b/src/hardware/r_opengl/r_opengl.c @@ -1,6 +1,6 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- -// Copyright (C) 1998-2021 by Sonic Team Junior. +// Copyright (C) 1998-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -21,6 +21,7 @@ #include #include +#include "../../r_local.h" // For rendertimefrac, used for the leveltime shader uniform #include "r_opengl.h" #include "r_vbo.h" @@ -62,6 +63,9 @@ static FBITFIELD CurrentPolyFlags; static FTextureInfo *TexCacheTail = NULL; static FTextureInfo *TexCacheHead = NULL; +static RGBA_t *textureBuffer = NULL; +static size_t textureBufferSize = 0; + RGBA_t myPaletteData[256]; GLint screen_width = 0; // used by Draw2DLine() GLint screen_height = 0; @@ -131,7 +135,6 @@ static const GLfloat byte2float[256] = { // -----------------+ // GL_DBG_Printf : Output debug messages to debug log if DEBUG_TO_FILE is defined, // : else do nothing -// Returns : // -----------------+ #ifdef DEBUG_TO_FILE @@ -159,8 +162,6 @@ FUNCPRINTF void GL_DBG_Printf(const char *format, ...) // -----------------+ // GL_MSG_Warning : Raises a warning. -// : -// Returns : // -----------------+ static void GL_MSG_Warning(const char *format, ...) @@ -184,8 +185,6 @@ static void GL_MSG_Warning(const char *format, ...) // -----------------+ // GL_MSG_Error : Raises an error. -// : -// Returns : // -----------------+ static void GL_MSG_Error(const char *format, ...) @@ -618,7 +617,7 @@ typedef struct gl_shaderstate_s static gl_shaderstate_t gl_shaderstate; // Shader info -static INT32 shader_leveltime = 0; +static float shader_leveltime = 0; // Lactozilla: Shader functions static boolean Shader_CompileProgram(gl_shader_t *shader, GLint i, const GLchar *vert_shader, const GLchar *frag_shader); @@ -978,7 +977,7 @@ EXPORT void HWRAPI(SetShaderInfo) (hwdshaderinfo_t info, INT32 value) switch (info) { case HWD_SHADERINFO_LEVELTIME: - shader_leveltime = value; + shader_leveltime = (((float)(value-1)) + FIXED_TO_FLOAT(rendertimefrac)) / TICRATE; break; default: break; @@ -1131,7 +1130,7 @@ static void GLPerspective(GLfloat fovy, GLfloat aspect) const GLfloat zNear = NEAR_CLIPPING_PLANE; const GLfloat zFar = FAR_CLIPPING_PLANE; const GLfloat radians = (GLfloat)(fovy / 2.0f * M_PIl / 180.0f); - const GLfloat sine = sin(radians); + const GLfloat sine = (GLfloat)sin(radians); const GLfloat deltaZ = zFar - zNear; GLfloat cotangent; @@ -1345,6 +1344,10 @@ void Flush(void) TexCacheTail = TexCacheHead = NULL; //Hurdler: well, TexCacheHead is already NULL tex_downloaded = 0; + + free(textureBuffer); + textureBuffer = NULL; + textureBufferSize = 0; } @@ -1378,7 +1381,6 @@ INT32 isExtAvailable(const char *extension, const GLubyte *start) // -----------------+ // Init : Initialise the OpenGL interface API -// Returns : // -----------------+ EXPORT boolean HWRAPI(Init) (void) { @@ -1738,37 +1740,48 @@ EXPORT void HWRAPI(SetBlend) (FBITFIELD PolyFlags) CurrentPolyFlags = PolyFlags; } +static void AllocTextureBuffer(GLMipmap_t *pTexInfo) +{ + size_t size = pTexInfo->width * pTexInfo->height; + if (size > textureBufferSize) + { + textureBuffer = realloc(textureBuffer, size * sizeof(RGBA_t)); + if (textureBuffer == NULL) + I_Error("AllocTextureBuffer: out of memory allocating %s bytes", sizeu1(size * sizeof(RGBA_t))); + textureBufferSize = size; + } +} + // -----------------+ -// UpdateTexture : Updates the texture data. +// UpdateTexture : Updates texture data. // -----------------+ EXPORT void HWRAPI(UpdateTexture) (GLMipmap_t *pTexInfo) { - // Download a mipmap - boolean updatemipmap = true; - static RGBA_t tex[2048*2048]; - const GLvoid *ptex = tex; - INT32 w, h; - GLuint texnum = 0; + // Upload a texture + GLuint num = pTexInfo->downloaded; + boolean update = true; - if (!pTexInfo->downloaded) + INT32 w = pTexInfo->width, h = pTexInfo->height; + INT32 i, j; + + const GLubyte *pImgData = (const GLubyte *)pTexInfo->data; + const GLvoid *ptex = NULL; + RGBA_t *tex = NULL; + + // Generate a new texture name. + if (!num) { - pglGenTextures(1, &texnum); - pTexInfo->downloaded = texnum; - updatemipmap = false; + pglGenTextures(1, &num); + pTexInfo->downloaded = num; + update = false; } - else - texnum = pTexInfo->downloaded; - //GL_DBG_Printf ("DownloadMipmap %d %x\n",(INT32)texnum,pTexInfo->data); + //GL_DBG_Printf("UpdateTexture %d %x\n", (INT32)num, pImgData); - w = pTexInfo->width; - h = pTexInfo->height; - - if ((pTexInfo->format == GL_TEXFMT_P_8) || - (pTexInfo->format == GL_TEXFMT_AP_88)) + if ((pTexInfo->format == GL_TEXFMT_P_8) || (pTexInfo->format == GL_TEXFMT_AP_88)) { - const GLubyte *pImgData = (const GLubyte *)pTexInfo->data; - INT32 i, j; + AllocTextureBuffer(pTexInfo); + ptex = tex = textureBuffer; for (j = 0; j < h; j++) { @@ -1799,20 +1812,18 @@ EXPORT void HWRAPI(UpdateTexture) (GLMipmap_t *pTexInfo) tex[w*j+i].s.alpha = *pImgData; pImgData++; } - } } } else if (pTexInfo->format == GL_TEXFMT_RGBA) { - // corona test : passed as ARGB 8888, which is not in glide formats - // Hurdler: not used for coronas anymore, just for dynamic lighting - ptex = pTexInfo->data; + // Directly upload the texture data without any kind of conversion. + ptex = pImgData; } else if (pTexInfo->format == GL_TEXFMT_ALPHA_INTENSITY_88) { - const GLubyte *pImgData = (const GLubyte *)pTexInfo->data; - INT32 i, j; + AllocTextureBuffer(pTexInfo); + ptex = tex = textureBuffer; for (j = 0; j < h; j++) { @@ -1829,8 +1840,8 @@ EXPORT void HWRAPI(UpdateTexture) (GLMipmap_t *pTexInfo) } else if (pTexInfo->format == GL_TEXFMT_ALPHA_8) // Used for fade masks { - const GLubyte *pImgData = (const GLubyte *)pTexInfo->data; - INT32 i, j; + AllocTextureBuffer(pTexInfo); + ptex = tex = textureBuffer; for (j = 0; j < h; j++) { @@ -1845,11 +1856,10 @@ EXPORT void HWRAPI(UpdateTexture) (GLMipmap_t *pTexInfo) } } else - GL_MSG_Warning ("SetTexture(bad format) %ld\n", pTexInfo->format); + GL_MSG_Warning("UpdateTexture: bad format %d\n", pTexInfo->format); - // the texture number was already generated by pglGenTextures - pglBindTexture(GL_TEXTURE_2D, texnum); - tex_downloaded = texnum; + pglBindTexture(GL_TEXTURE_2D, num); + tex_downloaded = num; // disable texture filtering on any texture that has holes so there's no dumb borders or blending issues if (pTexInfo->flags & TF_TRANSPARENT) @@ -1878,7 +1888,7 @@ EXPORT void HWRAPI(UpdateTexture) (GLMipmap_t *pTexInfo) } else { - if (updatemipmap) + if (update) pglTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, ptex); else pglTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE_ALPHA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, ptex); @@ -1899,7 +1909,7 @@ EXPORT void HWRAPI(UpdateTexture) (GLMipmap_t *pTexInfo) } else { - if (updatemipmap) + if (update) pglTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, ptex); else pglTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, ptex); @@ -1919,7 +1929,7 @@ EXPORT void HWRAPI(UpdateTexture) (GLMipmap_t *pTexInfo) } else { - if (updatemipmap) + if (update) pglTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, ptex); else pglTexImage2D(GL_TEXTURE_2D, 0, textureformatGL, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, ptex); @@ -2032,12 +2042,12 @@ static void Shader_SetUniforms(FSurfaceInfo *Surface, GLRGBAFloat *poly, GLRGBAF if (Surface != NULL) { - UNIFORM_1(shader->uniforms[gluniform_lighting], Surface->LightInfo.light_level, pglUniform1f); - UNIFORM_1(shader->uniforms[gluniform_fade_start], Surface->LightInfo.fade_start, pglUniform1f); - UNIFORM_1(shader->uniforms[gluniform_fade_end], Surface->LightInfo.fade_end, pglUniform1f); + UNIFORM_1(shader->uniforms[gluniform_lighting], (GLfloat)Surface->LightInfo.light_level, pglUniform1f); + UNIFORM_1(shader->uniforms[gluniform_fade_start], (GLfloat)Surface->LightInfo.fade_start, pglUniform1f); + UNIFORM_1(shader->uniforms[gluniform_fade_end], (GLfloat)Surface->LightInfo.fade_end, pglUniform1f); } - UNIFORM_1(shader->uniforms[gluniform_leveltime], ((float)shader_leveltime) / TICRATE, pglUniform1f); + UNIFORM_1(shader->uniforms[gluniform_leveltime], shader_leveltime, pglUniform1f); #undef UNIFORM_1 #undef UNIFORM_2 @@ -2663,7 +2673,7 @@ EXPORT void HWRAPI(CreateModelVBOs) (model_t *model) #define BUFFER_OFFSET(i) ((void*)(i)) -static void DrawModelEx(model_t *model, INT32 frameIndex, INT32 duration, INT32 tics, INT32 nextFrameIndex, FTransform *pos, float scale, UINT8 flipped, UINT8 hflipped, FSurfaceInfo *Surface) +static void DrawModelEx(model_t *model, INT32 frameIndex, float duration, float tics, INT32 nextFrameIndex, FTransform *pos, float scale, UINT8 flipped, UINT8 hflipped, FSurfaceInfo *Surface) { static GLRGBAFloat poly = {0,0,0,0}; static GLRGBAFloat tint = {0,0,0,0}; @@ -2692,11 +2702,11 @@ static void DrawModelEx(model_t *model, INT32 frameIndex, INT32 duration, INT32 scaley = scale; scalez = scale; - if (duration != 0 && duration != -1 && tics != -1) // don't interpolate if instantaneous or infinite in length + if (duration > 0.0 && tics >= 0.0) // don't interpolate if instantaneous or infinite in length { - UINT32 newtime = (duration - tics); // + 1; + float newtime = (duration - tics); // + 1; - pol = (newtime)/(float)duration; + pol = newtime / duration; if (pol > 1.0f) pol = 1.0f; @@ -2968,7 +2978,7 @@ static void DrawModelEx(model_t *model, INT32 frameIndex, INT32 duration, INT32 // -----------------+ // HWRAPI DrawModel : Draw a model // -----------------+ -EXPORT void HWRAPI(DrawModel) (model_t *model, INT32 frameIndex, INT32 duration, INT32 tics, INT32 nextFrameIndex, FTransform *pos, float scale, UINT8 flipped, UINT8 hflipped, FSurfaceInfo *Surface) +EXPORT void HWRAPI(DrawModel) (model_t *model, INT32 frameIndex, float duration, float tics, INT32 nextFrameIndex, FTransform *pos, float scale, UINT8 flipped, UINT8 hflipped, FSurfaceInfo *Surface) { DrawModelEx(model, frameIndex, duration, tics, nextFrameIndex, pos, scale, flipped, hflipped, Surface); } @@ -3028,7 +3038,7 @@ EXPORT void HWRAPI(SetTransform) (FTransform *stransform) if (special_splitscreen) { - used_fov = atan(tan(used_fov*M_PI/360)*0.8)*360/M_PI; + used_fov = (float)(atan(tan(used_fov*M_PI/360)*0.8)*360/M_PI); GLPerspective(used_fov, 2*ASPECT_RATIO); } else diff --git a/src/hardware/s_openal/s_openal-vc10.vcxproj b/src/hardware/s_openal/s_openal-vc10.vcxproj index 5039cd006..1480cd3d0 100644 --- a/src/hardware/s_openal/s_openal-vc10.vcxproj +++ b/src/hardware/s_openal/s_openal-vc10.vcxproj @@ -38,52 +38,52 @@ s_openal {E662D0B3-412D-4D55-A5EC-8CBD680DDCBE} s_openal - 10.0.16299.0 + 10.0 DynamicLibrary false MultiByte - v140 + v143 DynamicLibrary false MultiByte - v141 + v143 DynamicLibrary false - v140 + v143 DynamicLibrary false - v141 + v143 DynamicLibrary false MultiByte - v140 + v143 DynamicLibrary false MultiByte - v141 + v143 DynamicLibrary false - v140 + v143 DynamicLibrary false - v141 + v143 diff --git a/src/http-mserv.c b/src/http-mserv.c index f9134ba50..b7032e89a 100644 --- a/src/http-mserv.c +++ b/src/http-mserv.c @@ -1,6 +1,6 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- -// Copyright (C) 2020-2021 by James R. +// Copyright (C) 2020-2023 by James R. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -65,6 +65,8 @@ static I_mutex hms_api_mutex; static char *hms_server_token; +static char hms_useragent[512]; + struct HMS_buffer { CURL *curl; @@ -81,6 +83,22 @@ Contact_error (void) ); } +static void +get_user_agent(char *buf, size_t len) +{ + if (snprintf(buf, len, "%s/%s (%s; %s; %i; %i) SRB2BASE/%i", SRB2APPLICATION, VERSIONSTRING, compbranch, comprevision, MODID, MODVERSION, CODEBASE) < 0) + I_Error("http-mserv: get_user_agent failed"); +} + +static void +init_user_agent_once(void) +{ + if (hms_useragent[0] != '\0') + return; + + get_user_agent(hms_useragent, 512); +} + static size_t HMS_on_read (char *s, size_t _1, size_t n, void *userdata) { @@ -156,6 +174,8 @@ HMS_connect (const char *format, ...) I_lock_mutex(&hms_api_mutex); #endif + init_user_agent_once(); + seek = strlen(hms_api) + 1;/* + '/' */ va_start (ap, format); @@ -196,12 +216,18 @@ HMS_connect (const char *format, ...) curl_easy_setopt(curl, CURLOPT_URL, url); curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); - curl_easy_setopt(curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4); + +#ifndef NO_IPV6 + if (M_CheckParm("-noipv6")) +#endif + curl_easy_setopt(curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4); curl_easy_setopt(curl, CURLOPT_TIMEOUT, cv_masterserver_timeout.value); curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, HMS_on_read); curl_easy_setopt(curl, CURLOPT_WRITEDATA, buffer); + curl_easy_setopt(curl, CURLOPT_USERAGENT, hms_useragent); + curl_free(quack_token); free(url); diff --git a/src/hu_stuff.c b/src/hu_stuff.c index 0c073866e..091e2b2fb 100644 --- a/src/hu_stuff.c +++ b/src/hu_stuff.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -48,6 +48,7 @@ #endif #include "lua_hud.h" +#include "lua_hudlib_drawlist.h" #include "lua_hook.h" // coords are scaled @@ -76,7 +77,7 @@ patch_t *nto_font[NT_FONTSIZE]; static player_t *plr; boolean chat_on; // entering a chat message? -static char w_chat[HU_MAXMSGLEN]; +static char w_chat[HU_MAXMSGLEN + 1]; static size_t c_input = 0; // let's try to make the chat input less shitty. static boolean headsupactive = false; boolean hu_showscores; // draw rankings @@ -166,10 +167,14 @@ static tic_t cechotimer = 0; static tic_t cechoduration = 5*TICRATE; static INT32 cechoflags = 0; +static huddrawlist_h luahuddrawlist_scores; + //====================================================================== // HEADS UP INIT //====================================================================== +static tic_t resynch_ticker = 0; + #ifndef NONET // just after static void Command_Say_f(void); @@ -323,15 +328,17 @@ void HU_LoadGraphics(void) void HU_Init(void) { #ifndef NONET - COM_AddCommand("say", Command_Say_f); - COM_AddCommand("sayto", Command_Sayto_f); - COM_AddCommand("sayteam", Command_Sayteam_f); - COM_AddCommand("csay", Command_CSay_f); + COM_AddCommand("say", Command_Say_f, COM_LUA); + COM_AddCommand("sayto", Command_Sayto_f, COM_LUA); + COM_AddCommand("sayteam", Command_Sayteam_f, COM_LUA); + COM_AddCommand("csay", Command_CSay_f, COM_LUA); RegisterNetXCmd(XD_SAY, Got_Saycmd); #endif // set shift translation table shiftxform = english_shiftxform; + + luahuddrawlist_scores = LUA_HUD_CreateDrawList(); } static inline void HU_Stop(void) @@ -382,12 +389,12 @@ static INT16 addy = 0; // use this to make the messages scroll smoothly when one static void HU_removeChatText_Mini(void) { - // MPC: Don't create new arrays, just iterate through an existing one + // MPC: Don't create new arrays, just iterate through an existing one size_t i; - for(i=0;i= HU_FONTSTART && ch <= HU_FONTEND && hu_font[ch-HU_FONTSTART]) - || ch == ' ') // Allow spaces, of course - { - l = strlen(s); - if (l < HU_MAXMSGLEN - 1) - { - if (c_input >= strlen(s)) // don't do anything complicated - { - s[l++] = ch; - s[l]=0; - } - else - { - - // move everything past c_input for new characters: - size_t m = HU_MAXMSGLEN-1; - while (m>=c_input) - { - if (s[m]) - s[m+1] = (s[m]); - if (m == 0) // prevent overflow - break; - m--; - } - s[c_input] = ch; // and replace this. - } - c_input++; - return true; - } - return false; - } - else if (ch == KEY_BACKSPACE) - { - size_t i = c_input; - - if (c_input <= 0) - return false; - - if (!s[i-1]) - return false; - - if (i >= strlen(s)-1) - { - s[strlen(s)-1] = 0; - c_input--; - return false; - } - - for (; (i < HU_MAXMSGLEN); i++) - { - s[i-1] = s[i]; - } - c_input--; - } - else if (ch != KEY_ENTER) - return false; // did not eat key - - return true; // ate the key -} - #endif // @@ -936,160 +877,167 @@ void HU_Ticker(void) hu_tick++; hu_tick &= 7; // currently only to blink chat input cursor - if (PLAYER1INPUTDOWN(gc_scores)) + if (PLAYER1INPUTDOWN(GC_SCORES)) hu_showscores = !chat_on; else hu_showscores = false; + +#ifndef NONET + if (chat_on) + { + // count down the scroll timer. + if (chat_scrolltime > 0) + chat_scrolltime--; + } + + if (netgame) + { + size_t i = 0; + + // handle spam while we're at it: + for(; (i 0) + stop_spamming[i]--; + } + + // handle chat timers + for (i=0; (i 0) + chat_timers[i]--; + else + HU_removeChatText_Mini(); + } + } +#endif + + if (cechotimer > 0) --cechotimer; + + if (hu_redownloadinggamestate) + resynch_ticker++; } #ifndef NONET static boolean teamtalk = false; +static boolean justscrolleddown; +static boolean justscrolledup; +static INT16 typelines = 1; // number of drawfill lines we need when drawing the chat. it's some weird hack and might be one frame off but I'm lazy to make another loop. +// It's up here since it has to be reset when we open the chat. -// Clear spaces so we don't end up with messages only made out of emptiness -static boolean HU_clearChatSpaces(void) +static boolean HU_chatboxContainsOnlySpaces(void) { - size_t i = 0; // Used to just check our message - char c; // current character we're iterating. - boolean nothingbutspaces = true; + size_t i; - for (; i < strlen(w_chat); i++) // iterate through message and eradicate all spaces that don't belong. - { - c = w_chat[i]; - if (!c) - break; // if there's nothing, it's safe to assume our message has ended, so let's not waste any more time here. + for (i = 0; w_chat[i]; i++) + if (w_chat[i] != ' ') + return false; - if (c != ' ') // Isn't a space - { - nothingbutspaces = false; - } - } - return nothingbutspaces; + return true; } -// -// -static void HU_queueChatChar(char c) +static void HU_sendChatMessage(void) { - // send automaticly the message (no more chat char) - if (c == KEY_ENTER) + char buf[2 + HU_MAXMSGLEN + 1]; + char *msg = &buf[2]; + size_t ci; + INT32 target = 0; + + // if our message was nothing but spaces, don't send it. + if (HU_chatboxContainsOnlySpaces()) + return; + + // copy printable characters and terminating '\0' only. + for (ci = 2; w_chat[ci-2]; ci++) { - char buf[2+256]; - char *msg = &buf[2]; - size_t i = 0; - size_t ci = 2; - INT32 target = 0; + char c = w_chat[ci-2]; + if (c >= ' ' && !(c & 0x80)) + buf[ci] = c; + }; + buf[ci] = '\0'; - if (HU_clearChatSpaces()) // Avoids being able to send empty messages, or something. - return; // If this returns true, that means our message was NOTHING but spaces, so don't send it period. + memset(w_chat, '\0', sizeof(w_chat)); + c_input = 0; - do { - c = w_chat[-2+ci++]; - if (!c || (c >= ' ' && !(c & 0x80))) // copy printable characters and terminating '\0' only. - buf[ci-1]=c; - } while (c); + // last minute mute check + if (CHAT_MUTE) + { + HU_AddChatText(va("%s>ERROR: The chat is muted. You can't say anything.", "\x85"), false); + return; + } - for (;(i 4 && strnicmp(msg, "/pm", 3) == 0) // used /pm + { + INT32 spc = 1; // used if playernum[1] is a space. + char playernum[3]; + const char *newmsg; - c_input = 0; + // what we're gonna do now is check if the player exists + // with that logic, characters 4 and 5 are our numbers: - // last minute mute check - if (CHAT_MUTE) + // teamtalk can't send PMs, just don't send it, else everyone would be able to see it, and no one wants to see your sex RP sicko. + if (teamtalk) { - HU_AddChatText(va("%s>ERROR: The chat is muted. You can't say anything.", "\x85"), false); + HU_AddChatText(va("%sCannot send sayto in Say-Team.", "\x85"), false); return; } - if (strlen(msg) > 4 && strnicmp(msg, "/pm", 3) == 0) // used /pm + strncpy(playernum, msg+3, 3); + // check for undesirable characters in our "number" + if (!(isdigit(playernum[0]) && isdigit(playernum[1]))) { - INT32 spc = 1; // used if playernum[1] is a space. - char playernum[3]; - const char *newmsg; - - // what we're gonna do now is check if the player exists - // with that logic, characters 4 and 5 are our numbers: - - // teamtalk can't send PMs, just don't send it, else everyone would be able to see it, and no one wants to see your sex RP sicko. - if (teamtalk) - { - HU_AddChatText(va("%sCannot send sayto in Say-Team.", "\x85"), false); - return; - } - - strncpy(playernum, msg+3, 3); - // check for undesirable characters in our "number" - if (((playernum[0] < '0') || (playernum[0] > '9')) || ((playernum[1] < '0') || (playernum[1] > '9'))) - { - // check if playernum[1] is a space - if (playernum[1] == ' ') - spc = 0; - // let it slide - else - { - HU_AddChatText("\x82NOTICE: \x80Invalid command format. Correct format is \'/pm \'.", false); - return; - } - } - // I'm very bad at C, I swear I am, additional checks eww! - if (spc != 0) - { - if (msg[5] != ' ') - { - HU_AddChatText("\x82NOTICE: \x80Invalid command format. Correct format is \'/pm \'.", false); - return; - } - } - - target = atoi(playernum); // turn that into a number - //CONS_Printf("%d\n", target); - - // check for target player, if it doesn't exist then we can't send the message! - if (target < MAXPLAYERS && playeringame[target]) // player exists - target++; // even though playernums are from 0 to 31, target is 1 to 32, so up that by 1 to have it work! + // check if playernum[1] is a space + if (playernum[1] == ' ') + spc = 0; + // let it slide else { - HU_AddChatText(va("\x82NOTICE: \x80Player %d does not exist.", target), false); // same + HU_AddChatText("\x82NOTICE: \x80Invalid command format. Correct format is \'/pm \'.", false); return; } - - // we need to get rid of the /pm - newmsg = msg+5+spc; - strlcpy(msg, newmsg, 255); } - if (ci > 3) // don't send target+flags+empty message. + // I'm very bad at C, I swear I am, additional checks eww! + if (spc != 0 && msg[5] != ' ') { - if (teamtalk) - buf[0] = -1; // target - else - buf[0] = target; - - buf[1] = 0; // flags - SendNetXCmd(XD_SAY, buf, 2 + strlen(&buf[2]) + 1); + HU_AddChatText("\x82NOTICE: \x80Invalid command format. Correct format is \'/pm \'.", false); + return; } - return; + + target = atoi(playernum); // turn that into a number + + // check for target player, if it doesn't exist then we can't send the message! + if (target < MAXPLAYERS && playeringame[target]) // player exists + target++; // even though playernums are from 0 to 31, target is 1 to 32, so up that by 1 to have it work! + else + { + HU_AddChatText(va("\x82NOTICE: \x80Player %d does not exist.", target), false); // same + return; + } + + // we need to get rid of the /pm + newmsg = msg+5+spc; + strlcpy(msg, newmsg, HU_MAXMSGLEN + 1); + } + if (ci > 2) // don't send target+flags+empty message. + { + buf[0] = teamtalk ? -1 : target; // target + buf[1] = 0; // flags + SendNetXCmd(XD_SAY, buf, 2 + strlen(&buf[2]) + 1); } } + #endif void HU_clearChatChars(void) { - size_t i = 0; - for (;idata1 >= KEY_MOUSE1) + if (ev->key >= KEY_MOUSE1) { INT32 i; - for (i = 0; i < num_gamecontrols; i++) + for (i = 0; i < NUM_GAMECONTROLS; i++) { - if (gamecontrol[i][0] == ev->data1 || gamecontrol[i][1] == ev->data1) + if (gamecontrol[i][0] == ev->key || gamecontrol[i][1] == ev->key) break; } - if (i == num_gamecontrols) + if (i == NUM_GAMECONTROLS) return false; }*/ //We don't actually care about that unless we get splitscreen netgames. :V #ifndef NONET - c = (INT32)ev->data1; + c = (INT32)ev->key; if (!chat_on) { // enter chat mode - if ((ev->data1 == gamecontrol[gc_talkkey][0] || ev->data1 == gamecontrol[gc_talkkey][1]) + if ((ev->key == gamecontrol[GC_TALKKEY][0] || ev->key == gamecontrol[GC_TALKKEY][1]) && netgame && !OLD_MUTE) // check for old chat mute, still let the players open the chat incase they want to scroll otherwise. { chat_on = true; @@ -1140,7 +1088,7 @@ boolean HU_Responder(event_t *ev) typelines = 1; return true; } - if ((ev->data1 == gamecontrol[gc_teamkey][0] || ev->data1 == gamecontrol[gc_teamkey][1]) + if ((ev->key == gamecontrol[GC_TEAMKEY][0] || ev->key == gamecontrol[GC_TEAMKEY][1]) && netgame && !OLD_MUTE) { chat_on = true; @@ -1157,12 +1105,12 @@ boolean HU_Responder(event_t *ev) // Ignore modifier keys // Note that we do this here so users can still set // their chat keys to one of these, if they so desire. - if (ev->data1 == KEY_LSHIFT || ev->data1 == KEY_RSHIFT - || ev->data1 == KEY_LCTRL || ev->data1 == KEY_RCTRL - || ev->data1 == KEY_LALT || ev->data1 == KEY_RALT) + if (ev->key == KEY_LSHIFT || ev->key == KEY_RSHIFT + || ev->key == KEY_LCTRL || ev->key == KEY_RCTRL + || ev->key == KEY_LALT || ev->key == KEY_RALT) return true; - c = (INT32)ev->data1; + c = (INT32)ev->key; // I know this looks very messy but this works. If it ain't broke, don't fix it! // shift LETTERS to uppercase if we have capslock or are holding shift @@ -1171,21 +1119,23 @@ boolean HU_Responder(event_t *ev) if (shiftdown ^ capslock) c = shiftxform[c]; } - else // if we're holding shift we should still shift non letter symbols + else // if we're holding shift we should still shift non letter symbols { if (shiftdown) c = shiftxform[c]; } // pasting. pasting is cool. chat is a bit limited, though :( - if (((c == 'v' || c == 'V') && ctrldown) && !CHAT_MUTE) + if ((c == 'v' || c == 'V') && ctrldown) { - const char *paste = I_ClipboardPaste(); + const char *paste; size_t chatlen; size_t pastelen; - // create a dummy string real quickly + if (CHAT_MUTE) + return true; + paste = I_ClipboardPaste(); if (paste == NULL) return true; @@ -1194,48 +1144,24 @@ boolean HU_Responder(event_t *ev) if (chatlen+pastelen > HU_MAXMSGLEN) return true; // we can't paste this!! - if (c_input >= strlen(w_chat)) // add it at the end of the string. - { - memcpy(&w_chat[chatlen], paste, pastelen); // copy all of that. - c_input += pastelen; - /*size_t i = 0; - for (;i= c_input) - { - if (w_chat[i]) - w_chat[i+pastelen] = w_chat[i]; - if (i == 0) // prevent overflow - break; - i--; - } - memcpy(&w_chat[c_input], paste, pastelen); // copy all of that. - c_input += pastelen; - return true; - } + memmove(&w_chat[c_input + pastelen], &w_chat[c_input], (chatlen - c_input) + 1); // +1 for '\0' + memcpy(&w_chat[c_input], paste, pastelen); // copy all of that. + c_input += pastelen; + return true; } + else if (c == KEY_ENTER) + { + if (!CHAT_MUTE) + HU_sendChatMessage(); - if (!CHAT_MUTE && HU_keyInChatString(w_chat,c)) - { - HU_queueChatChar(c); - } - if (c == KEY_ENTER) - { chat_on = false; c_input = 0; // reset input cursor chat_scrollmedown = true; // you hit enter, so you might wanna autoscroll to see what you just sent. :) I_UpdateMouseGrab(); } else if (c == KEY_ESCAPE - || ((c == gamecontrol[gc_talkkey][0] || c == gamecontrol[gc_talkkey][1] - || c == gamecontrol[gc_teamkey][0] || c == gamecontrol[gc_teamkey][1]) + || ((c == gamecontrol[GC_TALKKEY][0] || c == gamecontrol[GC_TALKKEY][1] + || c == gamecontrol[GC_TEAMKEY][0] || c == gamecontrol[GC_TEAMKEY][1]) && c >= KEY_MOUSE1)) // If it's not a keyboard key, then the chat button is used as a toggle. { chat_on = false; @@ -1268,6 +1194,32 @@ boolean HU_Responder(event_t *ev) else c_input++; } + else if ((c >= HU_FONTSTART && c <= HU_FONTEND && hu_font[c-HU_FONTSTART]) + || c == ' ') // Allow spaces, of course + { + if (CHAT_MUTE || strlen(w_chat) >= HU_MAXMSGLEN) + return true; + + memmove(&w_chat[c_input + 1], &w_chat[c_input], strlen(w_chat) - c_input + 1); + w_chat[c_input] = c; + c_input++; + } + else if (c == KEY_BACKSPACE) + { + if (CHAT_MUTE || c_input <= 0) + return true; + + memmove(&w_chat[c_input - 1], &w_chat[c_input], strlen(w_chat) - c_input + 1); + c_input--; + } + else if (c == KEY_DEL) + { + if (CHAT_MUTE || c_input >= strlen(w_chat)) + return true; + + memmove(&w_chat[c_input], &w_chat[c_input + 1], strlen(w_chat) - c_input); + } + return true; } #endif @@ -1863,60 +1815,25 @@ static void HU_DrawChat_Old(void) } #endif -// draw the Crosshair, at the exact center of the view. -// +// Draw crosshairs at the exact center of the view. +// In splitscreen, crosshairs are stretched vertically to compensate for V_PERPLAYER squishing them. // Crosshairs are pre-cached at HU_Init -static inline void HU_DrawCrosshair(void) +static inline void HU_DrawCrosshairs(void) { - INT32 i, y; + INT32 cross1 = cv_crosshair.value & 3; + INT32 cross2 = cv_crosshair2.value & 3; - i = cv_crosshair.value & 3; - if (!i) + if (automapactive || demoplayback) return; - if ((netgame || multiplayer) && players[displayplayer].spectator) - return; + stplyr = ((stplyr == &players[displayplayer]) ? &players[secondarydisplayplayer] : &players[displayplayer]); + if (!players[displayplayer].spectator && (!camera.chase || ticcmd_ztargetfocus[0]) && cross1) + V_DrawStretchyFixedPatch((BASEVIDWIDTH/2)<>1); - - V_DrawScaledPatch(vid.width>>1, y, V_NOSCALESTART|V_OFFSET|V_TRANSLUCENT, crosshair[i - 1]); -} - -static inline void HU_DrawCrosshair2(void) -{ - INT32 i, y; - - i = cv_crosshair2.value & 3; - if (!i) - return; - - if ((netgame || multiplayer) && players[secondarydisplayplayer].spectator) - return; - -#ifdef HWRENDER - if (rendermode != render_soft) - y = (INT32)gl_basewindowcentery; - else -#endif - y = viewwindowy + (viewheight>>1); - - if (splitscreen) - { -#ifdef HWRENDER - if (rendermode != render_soft) - y += (INT32)gl_viewheight; - else -#endif - y += viewheight; - - V_DrawScaledPatch(vid.width>>1, y, V_NOSCALESTART|V_OFFSET|V_TRANSLUCENT, crosshair[i - 1]); - } + stplyr = ((stplyr == &players[displayplayer]) ? &players[secondarydisplayplayer] : &players[displayplayer]); + if (!players[secondarydisplayplayer].spectator && (!camera2.chase || ticcmd_ztargetfocus[1]) && cross2 && splitscreen) + V_DrawStretchyFixedPatch((BASEVIDWIDTH/2)< 0) - chat_scrolltime--; if (!OLDCHAT) HU_DrawChat(); else @@ -2054,30 +1966,10 @@ void HU_Drawer(void) { typelines = 1; chat_scrolltime = 0; + if (!OLDCHAT && cv_consolechat.value < 2 && netgame) // Don't display minimized chat if you set the mode to Window (Hidden) HU_drawMiniChat(); // draw messages in a cool fashion. } - - if (netgame) // would handle that in hu_drawminichat, but it's actually kinda awkward when you're typing a lot of messages. (only handle that in netgames duh) - { - size_t i = 0; - - // handle spam while we're at it: - for(; (i 0) - stop_spamming[i]--; - } - - // handle chat timers - for (i=0; (i 0) - chat_timers[i]--; - else - HU_removeChatText_Mini(); - } - } #endif if (cechotimer) @@ -2104,35 +1996,28 @@ void HU_Drawer(void) } else HU_DrawCoopOverlay(); - LUAh_ScoresHUD(); + + if (renderisnewtic) + { + LUA_HUD_ClearDrawList(luahuddrawlist_scores); + LUA_HUDHOOK(scores, luahuddrawlist_scores); + } + LUA_HUD_DrawList(luahuddrawlist_scores); } if (gamestate != GS_LEVEL) return; - // draw the crosshair, not when viewing demos nor with chasecam + // draw the crosshair if (LUA_HudEnabled(hud_crosshair)) - { - if (!automapactive && cv_crosshair.value && !demoplayback && - (!camera.chase || ticcmd_ztargetfocus[0]) - && !players[displayplayer].spectator) - HU_DrawCrosshair(); - - if (!automapactive && cv_crosshair2.value && !demoplayback && - (!camera2.chase || ticcmd_ztargetfocus[1]) - && !players[secondarydisplayplayer].spectator) - HU_DrawCrosshair2(); - } + HU_DrawCrosshairs(); // draw desynch text if (hu_redownloadinggamestate) { - static UINT32 resynch_ticker = 0; char resynch_text[14]; UINT32 i; - // Animate the dots - resynch_ticker++; strcpy(resynch_text, "Resynching"); for (i = 0; i < (resynch_ticker / 16) % 4; i++) strcat(resynch_text, "."); @@ -2472,7 +2357,7 @@ static void HU_Draw32TeamTabRankings(playersort_t *tab, INT32 whiteplayer) if (!players[tab[i].num].quittime || (leveltime / (TICRATE/2) & 1)) V_DrawString(x + 10, y, ((tab[i].num == whiteplayer) ? V_YELLOWMAP : 0) - | (greycheck ? 0 : V_TRANSLUCENT) + | (greycheck ? V_TRANSLUCENT : 0) | V_ALLOWLOWERCASE, name); if (gametyperules & GTR_TEAMFLAGS) @@ -2733,12 +2618,12 @@ void HU_DrawDualTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scoreline if (circuitmap) { if (players[tab[i].num].exiting) - V_DrawRightAlignedThinString(x+146, y, 0, va("%i:%02i.%02i", G_TicsToMinutes(players[tab[i].num].realtime,true), G_TicsToSeconds(players[tab[i].num].realtime), G_TicsToCentiseconds(players[tab[i].num].realtime))); + V_DrawRightAlignedThinString(x+100, y, 0, va("%i:%02i.%02i", G_TicsToMinutes(players[tab[i].num].realtime,true), G_TicsToSeconds(players[tab[i].num].realtime), G_TicsToCentiseconds(players[tab[i].num].realtime))); else - V_DrawRightAlignedThinString(x+146, y, (greycheck ? V_TRANSLUCENT : 0), va("%u", tab[i].count)); + V_DrawRightAlignedThinString(x+100, y, (greycheck ? V_TRANSLUCENT : 0), va("%u", tab[i].count)); } else - V_DrawRightAlignedThinString(x+146, y, (greycheck ? V_TRANSLUCENT : 0), va("%i:%02i.%02i", G_TicsToMinutes(tab[i].count,true), G_TicsToSeconds(tab[i].count), G_TicsToCentiseconds(tab[i].count))); + V_DrawRightAlignedThinString(x+100, y, (greycheck ? V_TRANSLUCENT : 0), va("%i:%02i.%02i", G_TicsToMinutes(tab[i].count,true), G_TicsToSeconds(tab[i].count), G_TicsToCentiseconds(tab[i].count))); } else V_DrawRightAlignedThinString(x+100, y, (greycheck ? V_TRANSLUCENT : 0), va("%u", tab[i].count)); @@ -2786,7 +2671,7 @@ static void HU_Draw32TabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scor if (!players[tab[i].num].quittime || (leveltime / (TICRATE/2) & 1)) V_DrawString(x + 10, y, ((tab[i].num == whiteplayer) ? V_YELLOWMAP : 0) - | (greycheck ? 0 : V_TRANSLUCENT) + | (greycheck ? V_TRANSLUCENT : 0) | V_ALLOWLOWERCASE, name); if (G_GametypeUsesLives()) //show lives @@ -2846,13 +2731,13 @@ static void HU_Draw32TabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scor if (players[tab[i].num].exiting) V_DrawRightAlignedThinString(x+128, y, 0, va("%i:%02i.%02i", G_TicsToMinutes(players[tab[i].num].realtime,true), G_TicsToSeconds(players[tab[i].num].realtime), G_TicsToCentiseconds(players[tab[i].num].realtime))); else - V_DrawRightAlignedThinString(x+128, y, (greycheck ? 0 : V_TRANSLUCENT), va("%u", tab[i].count)); + V_DrawRightAlignedThinString(x+128, y, (greycheck ? V_TRANSLUCENT : 0), va("%u", tab[i].count)); } else - V_DrawRightAlignedThinString(x+128, y, (greycheck ? 0 : V_TRANSLUCENT), va("%i:%02i.%02i", G_TicsToMinutes(tab[i].count,true), G_TicsToSeconds(tab[i].count), G_TicsToCentiseconds(tab[i].count))); + V_DrawRightAlignedThinString(x+128, y, (greycheck ? V_TRANSLUCENT : 0), va("%i:%02i.%02i", G_TicsToMinutes(tab[i].count,true), G_TicsToSeconds(tab[i].count), G_TicsToCentiseconds(tab[i].count))); } else - V_DrawRightAlignedThinString(x+128, y, (greycheck ? 0 : V_TRANSLUCENT), va("%u", tab[i].count)); + V_DrawRightAlignedThinString(x+128, y, (greycheck ? V_TRANSLUCENT : 0), va("%u", tab[i].count)); y += 9; if (i == 16) @@ -2977,18 +2862,6 @@ static void HU_DrawRankings(void) V_DrawCenteredString(256, 16, 0, va("%d", cv_pointlimit.value)); } } - else if (gametyperankings[gametype] == GT_COOP) - { - INT32 totalscore = 0; - for (i = 0; i < MAXPLAYERS; i++) - { - if (playeringame[i]) - totalscore += players[i].score; - } - - V_DrawCenteredString(256, 8, 0, "TOTAL SCORE"); - V_DrawCenteredString(256, 16, 0, va("%u", totalscore)); - } else { if (circuitmap) @@ -3091,7 +2964,7 @@ static void HU_DrawRankings(void) HU_DrawTeamTabRankings(tab, whiteplayer); else if (scorelines <= 9 && !cv_compactscoreboard.value) HU_DrawTabRankings(40, 32, tab, scorelines, whiteplayer); - else if (scorelines <= 20 && !cv_compactscoreboard.value) + else if (scorelines <= 18 && !cv_compactscoreboard.value) HU_DrawDualTabRankings(32, 32, tab, scorelines, whiteplayer); else HU_Draw32TabRankings(14, 28, tab, scorelines, whiteplayer); @@ -3109,9 +2982,9 @@ static void HU_DrawCoopOverlay(void) V_DrawSmallScaledPatch(148, 172, 0, tokenicon); } - if (LUA_HudEnabled(hud_tabemblems) && (!modifiedgame || savemoddata)) + if (LUA_HudEnabled(hud_tabemblems)) { - V_DrawString(160, 144, 0, va("- %d/%d", M_CountEmblems(), numemblems+numextraemblems)); + V_DrawString(160, 144, 0, va("- %d/%d", M_CountEmblems(clientGamedata), numemblems+numextraemblems)); V_DrawScaledPatch(128, 144 - emblemicon->height/4, 0, emblemicon); } @@ -3144,6 +3017,15 @@ static void HU_DrawNetplayCoopOverlay(void) V_DrawSmallScaledPatch(148, 6, 0, tokenicon); } + if (G_CoopGametype() && LUA_HudEnabled(hud_tabemblems)) + { + V_DrawCenteredString(256, 14, 0, "/"); + V_DrawString(256 + 4, 14, 0, va("%d", numemblems + numextraemblems)); + V_DrawRightAlignedString(256 - 4, 14, 0, va("%d", M_CountEmblems(clientGamedata))); + + V_DrawSmallScaledPatch(256 - (emblemicon->width / 4), 6, 0, emblemicon); + } + if (!LUA_HudEnabled(hud_coopemeralds)) return; diff --git a/src/hu_stuff.h b/src/hu_stuff.h index 9b7cee2d3..8647e4500 100644 --- a/src/hu_stuff.h +++ b/src/hu_stuff.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -62,7 +62,7 @@ typedef struct //------------------------------------ // chat stuff //------------------------------------ -#define HU_MAXMSGLEN 224 +#define HU_MAXMSGLEN 223 #define CHAT_BUFSIZE 64 // that's enough messages, right? We'll delete the older ones when that gets out of hand. #ifdef NETSPLITSCREEN #define OLDCHAT (cv_consolechat.value == 1 || dedicated || vid.width < 640) diff --git a/src/i_addrinfo.c b/src/i_addrinfo.c index 5dcea1002..9efaff4da 100644 --- a/src/i_addrinfo.c +++ b/src/i_addrinfo.c @@ -1,6 +1,6 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- -// Copyright (C) 2011-2021 by Sonic Team Junior. +// Copyright (C) 2011-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/i_addrinfo.h b/src/i_addrinfo.h index 397a1969d..79cfb05b2 100644 --- a/src/i_addrinfo.h +++ b/src/i_addrinfo.h @@ -1,6 +1,6 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- -// Copyright (C) 2011-2021 by Sonic Team Junior. +// Copyright (C) 2011-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/i_joy.h b/src/i_joy.h index 0c7c8dd3f..95caed4fd 100644 --- a/src/i_joy.h +++ b/src/i_joy.h @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/i_net.h b/src/i_net.h index dbc82db65..12a07f183 100644 --- a/src/i_net.h +++ b/src/i_net.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -109,6 +109,17 @@ extern boolean (*I_NetCanSend)(void); */ extern void (*I_NetFreeNodenum)(INT32 nodenum); +/** + \brief split a string into address and port + + \param address string to split + + \param port double pointer to hold port component (optional) + + \return address component +*/ +extern char *I_NetSplitAddress(char *address, char **port); + /** \brief open a connection with specified address \param address address to connect to diff --git a/src/i_sound.h b/src/i_sound.h index e38a17626..c51d8e4f4 100644 --- a/src/i_sound.h +++ b/src/i_sound.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/i_system.h b/src/i_system.h index b88ea3177..deea9f8a8 100644 --- a/src/i_system.h +++ b/src/i_system.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -40,25 +40,34 @@ extern UINT8 keyboard_started; \return free memory in the system */ -UINT32 I_GetFreeMem(UINT32 *total); +size_t I_GetFreeMem(size_t *total); -/** \brief Called by D_SRB2Loop, returns current time in tics. -*/ -tic_t I_GetTime(void); - -/** \brief Returns precise time value for performance measurement. +/** \brief Returns precise time value for performance measurement. The precise + time should be a monotonically increasing counter, and will wrap. + precise_t is internally represented as an unsigned integer and + integer arithmetic may be used directly between values of precise_t. */ precise_t I_GetPreciseTime(void); -/** \brief Returns the difference between precise times as microseconds. +/** \brief Get the precision of precise_t in units per second. Invocations of + this function for the program's duration MUST return the same value. */ -int I_PreciseToMicros(precise_t); +UINT64 I_GetPrecisePrecision(void); -/** \brief The I_Sleep function +/** \brief Get the current time in rendering tics, including fractions. +*/ +double I_GetFrameTime(void); + +/** \brief Sleeps for the given duration in milliseconds. Depending on the + operating system's scheduler, the calling thread may give up its + time slice for a longer duration. The implementation should give a + best effort to sleep for the given duration, without spin-locking. + Calling code should check the current precise time after sleeping + and not assume the thread has slept for the expected duration. \return void */ -void I_Sleep(void); +void I_Sleep(UINT32 ms); /** \brief Get events @@ -314,4 +323,12 @@ const char *I_ClipboardPaste(void); void I_RegisterSysCommands(void); +/** \brief Return the position of the cursor relative to the top-left window corner. +*/ +void I_GetCursorPosition(INT32 *x, INT32 *y); + +/** \brief Sets whether the mouse is grabbed +*/ +void I_SetMouseGrab(boolean grab); + #endif diff --git a/src/i_tcp.c b/src/i_tcp.c index cae97a7d1..d95b381f4 100644 --- a/src/i_tcp.c +++ b/src/i_tcp.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -340,8 +340,14 @@ static inline void I_UPnP_rem(const char *port, const char * servicetype) static const char *SOCK_AddrToStr(mysockaddr_t *sk) { - static char s[64]; // 255.255.255.255:65535 or IPv6:65535 + static char s[64]; // 255.255.255.255:65535 or + // [ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]:65535 #ifdef HAVE_NTOP +#ifdef HAVE_IPV6 + int v6 = (sk->any.sa_family == AF_INET6); +#else + int v6 = 0; +#endif void *addr; if(sk->any.sa_family == AF_INET) @@ -355,14 +361,21 @@ static const char *SOCK_AddrToStr(mysockaddr_t *sk) if(addr == NULL) sprintf(s, "No address"); - else if(inet_ntop(sk->any.sa_family, addr, s, sizeof (s)) == NULL) + else if(inet_ntop(sk->any.sa_family, addr, &s[v6], sizeof (s) - v6) == NULL) sprintf(s, "Unknown family type, error #%u", errno); #ifdef HAVE_IPV6 - else if(sk->any.sa_family == AF_INET6 && sk->ip6.sin6_port != 0) - strcat(s, va(":%d", ntohs(sk->ip6.sin6_port))); + else if(sk->any.sa_family == AF_INET6) + { + s[0] = '['; + strcat(s, "]"); + + if (sk->ip6.sin6_port != 0) + strcat(s, va(":%d", ntohs(sk->ip6.sin6_port))); + } #endif else if(sk->any.sa_family == AF_INET && sk->ip4.sin_port != 0) strcat(s, va(":%d", ntohs(sk->ip4.sin_port))); + #else if (sk->any.sa_family == AF_INET) { @@ -427,7 +440,7 @@ static boolean SOCK_cmpaddr(mysockaddr_t *a, mysockaddr_t *b, UINT8 mask) && (b->ip4.sin_port == 0 || (a->ip4.sin_port == b->ip4.sin_port)); #ifdef HAVE_IPV6 else if (b->any.sa_family == AF_INET6) - return memcmp(&a->ip6.sin6_addr, &b->ip6.sin6_addr, sizeof(b->ip6.sin6_addr)) + return !memcmp(&a->ip6.sin6_addr, &b->ip6.sin6_addr, sizeof(b->ip6.sin6_addr)) && (b->ip6.sin6_port == 0 || (a->ip6.sin6_port == b->ip6.sin6_port)); #endif else @@ -735,8 +748,7 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen unsigned long trueval = true; #endif mysockaddr_t straddr; - struct sockaddr_in sin; - socklen_t len = sizeof(sin); + socklen_t len = sizeof(straddr); if (s == (SOCKET_TYPE)ERRSOCKET) return (SOCKET_TYPE)ERRSOCKET; @@ -754,14 +766,12 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen } #endif - straddr.any = *addr; + memcpy(&straddr, addr, addrlen); I_OutputMsg("Binding to %s\n", SOCK_AddrToStr(&straddr)); if (family == AF_INET) { - mysockaddr_t tmpaddr; - tmpaddr.any = *addr ; - if (tmpaddr.ip4.sin_addr.s_addr == htonl(INADDR_ANY)) + if (straddr.ip4.sin_addr.s_addr == htonl(INADDR_ANY)) { opt = true; opts = (socklen_t)sizeof(opt); @@ -778,7 +788,7 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen #ifdef HAVE_IPV6 else if (family == AF_INET6) { - if (memcmp(addr, &in6addr_any, sizeof(in6addr_any)) == 0) //IN6_ARE_ADDR_EQUAL + if (memcmp(&straddr.ip6.sin6_addr, &in6addr_any, sizeof(in6addr_any)) == 0) //IN6_ARE_ADDR_EQUAL { opt = true; opts = (socklen_t)sizeof(opt); @@ -788,7 +798,7 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen // make it IPv6 ony opt = true; opts = (socklen_t)sizeof(opt); - if (setsockopt(s, SOL_SOCKET, IPV6_V6ONLY, (char *)&opt, opts)) + if (setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, (char *)&opt, opts)) { CONS_Alert(CONS_WARNING, M_GetText("Could not limit IPv6 bind\n")); // I do not care anymore } @@ -830,10 +840,17 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen CONS_Printf(M_GetText("Network system buffer set to: %dKb\n"), opt>>10); } - if (getsockname(s, (struct sockaddr *)&sin, &len) == -1) + if (getsockname(s, &straddr.any, &len) == -1) CONS_Alert(CONS_WARNING, M_GetText("Failed to get port number\n")); else - current_port = (UINT16)ntohs(sin.sin_port); + { + if (family == AF_INET) + current_port = (UINT16)ntohs(straddr.ip4.sin_port); +#ifdef HAVE_IPV6 + else if (family == AF_INET6) + current_port = (UINT16)ntohs(straddr.ip6.sin6_port); +#endif + } return s; } @@ -844,7 +861,7 @@ static boolean UDP_Socket(void) struct my_addrinfo *ai, *runp, hints; int gaie; #ifdef HAVE_IPV6 - const INT32 b_ipv6 = M_CheckParm("-ipv6"); + const INT32 b_ipv6 = !M_CheckParm("-noipv6"); #endif const char *serv; @@ -1156,6 +1173,7 @@ static SINT8 SOCK_NetMakeNodewPort(const char *address, const char *port) SINT8 newnode = -1; struct my_addrinfo *ai = NULL, *runp, hints; int gaie; + size_t i; if (!port || !port[0]) port = DEFAULTPORT; @@ -1183,13 +1201,24 @@ static SINT8 SOCK_NetMakeNodewPort(const char *address, const char *port) while (runp != NULL) { - // find ip of the server - if (sendto(mysockets[0], NULL, 0, 0, runp->ai_addr, runp->ai_addrlen) == 0) + // test ip address of server + for (i = 0; i < mysocketses; ++i) { - memcpy(&clientaddress[newnode], runp->ai_addr, runp->ai_addrlen); - break; + /* sendto tests that there is a network to this + address */ + if (runp->ai_addr->sa_family == myfamily[i] && + sendto(mysockets[i], NULL, 0, 0, + runp->ai_addr, runp->ai_addrlen) == 0) + { + memcpy(&clientaddress[newnode], runp->ai_addr, runp->ai_addrlen); + break; + } } - runp = runp->ai_next; + + if (i < mysocketses) + runp = runp->ai_next; + else + break; } I_freeaddrinfo(ai); return newnode; diff --git a/src/i_tcp.h b/src/i_tcp.h index 785734415..ae9983bf1 100644 --- a/src/i_tcp.h +++ b/src/i_tcp.h @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/i_threads.h b/src/i_threads.h index bc752181f..fe6ab4fb0 100644 --- a/src/i_threads.h +++ b/src/i_threads.h @@ -1,6 +1,6 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- -// Copyright (C) 2020-2021 by James R. +// Copyright (C) 2020-2023 by James R. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/i_time.c b/src/i_time.c new file mode 100644 index 000000000..2a22503f1 --- /dev/null +++ b/src/i_time.c @@ -0,0 +1,125 @@ +// SONIC ROBO BLAST 2 +//----------------------------------------------------------------------------- +// Copyright (C) 1993-1996 by id Software, Inc. +// Copyright (C) 1998-2000 by DooM Legacy Team. +// Copyright (C) 1999-2023 by Sonic Team Junior. +// +// This program is free software distributed under the +// terms of the GNU General Public License, version 2. +// See the 'LICENSE' file for more details. +//----------------------------------------------------------------------------- +/// \file i_time.c +/// \brief Timing for the system layer. + +#include "i_time.h" + +#include + +#include "command.h" +#include "doomtype.h" +#include "d_netcmd.h" +#include "m_fixed.h" +#include "i_system.h" + +timestate_t g_time; + +static CV_PossibleValue_t timescale_cons_t[] = {{FRACUNIT/20, "MIN"}, {20*FRACUNIT, "MAX"}, {0, NULL}}; +consvar_t cv_timescale = CVAR_INIT ("timescale", "1.0", CV_NETVAR|CV_CHEAT|CV_FLOAT, timescale_cons_t, NULL); + +static precise_t enterprecise, oldenterprecise; +static fixed_t entertic, oldentertics; +static double tictimer; + +// A little more than the minimum sleep duration on Windows. +// May be incorrect for other platforms, but we don't currently have a way to +// query the scheduler granularity. SDL will do what's needed to make this as +// low as possible though. +#define MIN_SLEEP_DURATION_MS 2.1 + +tic_t I_GetTime(void) +{ + return g_time.time; +} + +void I_InitializeTime(void) +{ + CV_RegisterVar(&cv_timescale); + + // I_StartupTimer is preserved for potential subsystems that need to setup + // timing information for I_GetPreciseTime and sleeping + I_StartupTimer(); + + g_time.time = 0; + g_time.timefrac = 0; + + enterprecise = I_GetPreciseTime(); + oldenterprecise = enterprecise; + entertic = 0; + oldentertics = 0; + tictimer = 0.0; +} + +void I_UpdateTime(fixed_t timescale) +{ + double ticratescaled; + double elapsedseconds; + tic_t realtics; + + // get real tics + ticratescaled = (double)TICRATE * FIXED_TO_FLOAT(timescale); + + enterprecise = I_GetPreciseTime(); + elapsedseconds = (double)(enterprecise - oldenterprecise) / I_GetPrecisePrecision(); + tictimer += elapsedseconds; + while (tictimer > 1.0/ticratescaled) + { + entertic += 1; + tictimer -= 1.0/ticratescaled; + } + realtics = entertic - oldentertics; + oldentertics = entertic; + oldenterprecise = enterprecise; + + // Update global time state + g_time.time += realtics; + { + double fractional, integral; + fractional = modf(tictimer * ticratescaled, &integral); + g_time.timefrac = FLOAT_TO_FIXED(fractional); + } +} + +void I_SleepDuration(precise_t duration) +{ + UINT64 precision = I_GetPrecisePrecision(); + INT32 sleepvalue = cv_sleep.value; + UINT64 delaygranularity; + precise_t cur; + precise_t dest; + + { + double gran = round(((double)(precision / 1000) * sleepvalue * MIN_SLEEP_DURATION_MS)); + delaygranularity = (UINT64)gran; + } + + cur = I_GetPreciseTime(); + dest = cur + duration; + + // the reason this is not dest > cur is because the precise counter may wrap + // two's complement arithmetic is our friend here, though! + // e.g. cur 0xFFFFFFFFFFFFFFFE = -2, dest 0x0000000000000001 = 1 + // 0x0000000000000001 - 0xFFFFFFFFFFFFFFFE = 3 + while ((INT64)(dest - cur) > 0) + { + // If our cv_sleep value exceeds the remaining sleep duration, use the + // hard sleep function. + if (sleepvalue > 0 && (dest - cur) > delaygranularity) + { + I_Sleep(sleepvalue); + } + + // Otherwise, this is a spinloop. + + cur = I_GetPreciseTime(); + } +} diff --git a/src/i_time.h b/src/i_time.h new file mode 100644 index 000000000..997ba7ef2 --- /dev/null +++ b/src/i_time.h @@ -0,0 +1,54 @@ +// SONIC ROBO BLAST 2 +//----------------------------------------------------------------------------- +// Copyright (C) 1993-1996 by id Software, Inc. +// Copyright (C) 1998-2000 by DooM Legacy Team. +// Copyright (C) 1999-2023 by Sonic Team Junior. +// +// This program is free software distributed under the +// terms of the GNU General Public License, version 2. +// See the 'LICENSE' file for more details. +//----------------------------------------------------------------------------- +/// \file i_time.h +/// \brief Timing for the system layer. + +#ifndef __I_TIME_H__ +#define __I_TIME_H__ + +#include "command.h" +#include "doomtype.h" +#include "m_fixed.h" + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct timestate_s { + tic_t time; + fixed_t timefrac; +} timestate_t; + +extern timestate_t g_time; +extern consvar_t cv_timescale; + +/** \brief Called by D_SRB2Loop, returns current time in game tics. +*/ +tic_t I_GetTime(void); + +/** \brief Initializes timing system. +*/ +void I_InitializeTime(void); + +void I_UpdateTime(fixed_t timescale); + +/** \brief Block for at minimum the duration specified. This function makes a + best effort not to oversleep, and will spinloop if sleeping would + take too long. However, callers should still check the current time + after this returns. +*/ +void I_SleepDuration(precise_t duration); + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // __I_TIME_H__ diff --git a/src/i_video.h b/src/i_video.h index 2d07fcf10..8efca5f9a 100644 --- a/src/i_video.h +++ b/src/i_video.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -151,4 +151,6 @@ void I_BeginRead(void); */ void I_EndRead(void); +UINT32 I_GetRefreshRate(void); + #endif diff --git a/src/info.c b/src/info.c index efcf1c044..09452a74f 100644 --- a/src/info.c +++ b/src/info.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -203,6 +203,10 @@ char sprnames[NUMSPRITES + 1][5] = // The letter "LETR", + // Tutorial Scenery + "TUPL", + "TUPF", + // Greenflower Scenery "FWR1", "FWR2", // GFZ Sunflower @@ -766,9 +770,9 @@ state_t states[NUMSTATES] = // 1-Up box sprites (uses player sprite) {SPR_PLAY, SPR2_LIFE, 2, {NULL}, 0, 18, S_PLAY_BOX2}, // S_PLAY_BOX1 - {SPR_NULL, 0, 1, {NULL}, 0, 0, S_PLAY_BOX1}, // S_PLAY_BOX2 + {SPR_NULL, 0, 1, {NULL}, 0, 18, S_PLAY_BOX1}, // S_PLAY_BOX2 {SPR_PLAY, SPR2_LIFE, 4, {NULL}, 0, 4, S_PLAY_ICON2}, // S_PLAY_ICON1 - {SPR_NULL, 0, 12, {NULL}, 0, 0, S_PLAY_ICON3}, // S_PLAY_ICON2 + {SPR_NULL, 0, 12, {NULL}, 0, 4, S_PLAY_ICON3}, // S_PLAY_ICON2 {SPR_PLAY, SPR2_LIFE, 20, {NULL}, 0, 4, S_NULL}, // S_PLAY_ICON3 // Level end sign (uses player sprite) @@ -899,7 +903,7 @@ state_t states[NUMSTATES] = {SPR_TRET, FF_FULLBRIGHT|2, 7, {A_Pain}, 0, 0, S_TURRETSHOCK7}, // S_TURRETSHOCK6 {SPR_TRET, FF_FULLBRIGHT|3, 7, {NULL}, 0, 0, S_TURRETSHOCK8}, // S_TURRETSHOCK7 {SPR_TRET, FF_FULLBRIGHT|4, 7, {NULL}, 0, 0, S_TURRETSHOCK9}, // S_TURRETSHOCK8 - {SPR_TRET, FF_FULLBRIGHT|4, 7, {A_LinedefExecute}, LE_TURRET, 0, S_XPLD1}, // S_TURRETSHOCK9 + {SPR_TRET, FF_FULLBRIGHT|4, 7, {A_LinedefExecuteFromArg}, 0, 0, S_XPLD1}, // S_TURRETSHOCK9 {SPR_TURR, 0, 1, {A_Look}, 1, 0, S_TURRETPOPDOWN8}, // S_TURRETLOOK {SPR_TURR, 0, 0, {A_FaceTarget}, 0, 0, S_TURRETPOPUP1}, // S_TURRETSEE @@ -1452,7 +1456,7 @@ state_t states[NUMSTATES] = {SPR_FANG, 18, 16, {A_FaceTarget}, 3, 0, S_FANG_PINCHLOBSHOT1}, // S_FANG_PINCHLOBSHOT0 {SPR_FANG, 19, 2, {A_FaceTarget}, 3, 0, S_FANG_PINCHLOBSHOT2}, // S_FANG_PINCHLOBSHOT1 {SPR_FANG, 20, 30, {A_Boss5MakeItRain}, MT_FBOMB, -16, S_FANG_PINCHLOBSHOT3}, // S_FANG_PINCHLOBSHOT2 - {SPR_FANG, 20, 18, {A_LinedefExecute}, LE_BOSS4DROP, 0, S_FANG_PINCHLOBSHOT4}, // S_FANG_PINCHLOBSHOT3 + {SPR_FANG, 20, 18, {A_LinedefExecuteFromArg}, 4, 0, S_FANG_PINCHLOBSHOT4}, // S_FANG_PINCHLOBSHOT3 {SPR_FANG, 0, 0, {A_Boss5Calm}, 0, 0, S_FANG_PATHINGSTART1}, // S_FANG_PINCHLOBSHOT4 {SPR_FANG, 21, 0, {A_DoNPCPain}, 0, 0, S_FANG_DIE2}, // S_FANG_DIE1 @@ -1584,7 +1588,7 @@ state_t states[NUMSTATES] = {SPR_BRAK, 21, 3*TICRATE, {NULL}, 0, 0, S_BLACKEGG_DESTROYPLAT2}, // S_BLACKEGG_DESTROYPLAT1 {SPR_BRAK, 21, 1, {A_PlaySound}, sfx_s3k54, 0, S_BLACKEGG_DESTROYPLAT3}, // S_BLACKEGG_DESTROYPLAT2 - {SPR_BRAK, 21, 14, {A_LinedefExecute}, LE_BRAKPLATFORM, 0, S_BLACKEGG_STND}, // S_BLACKEGG_DESTROYPLAT3 + {SPR_BRAK, 21, 14, {A_LinedefExecuteFromArg}, 5, 0, S_BLACKEGG_STND}, // S_BLACKEGG_DESTROYPLAT3 {SPR_NULL, 0, 1, {A_CapeChase}, (160 - 20) << 16, 0, S_BLACKEGG_HELPER}, // S_BLACKEGG_HELPER @@ -1618,7 +1622,7 @@ state_t states[NUMSTATES] = {SPR_BRAK, 26 + FF_FULLBRIGHT, 2, {A_BrakFireShot}, MT_CYBRAKDEMON_FLAMESHOT, 128, S_CYBRAKDEMON_FLAME_ATTACK4}, // S_CYBRAKDEMON_FLAME_ATTACK3 // Fire {SPR_BRAK, 7, 1, {A_Repeat}, 30, S_CYBRAKDEMON_FLAME_ATTACK3, S_CYBRAKDEMON_FINISH_ATTACK1}, // S_CYBRAKDEMON_FLAME_ATTACK4 // Loop {SPR_BRAK, 0, 6, {A_RandomState}, S_CYBRAKDEMON_VILE_ATTACK1, S_CYBRAKDEMON_NAPALM_ATTACK1, S_CYBRAKDEMON_MISSILE_ATTACK1}, // S_CYBRAKDEMON_CHOOSE_ATTACK2 - {SPR_BRAK, 20, 0, {A_LinedefExecute}, LE_BRAKVILEATACK, 0, S_CYBRAKDEMON_VILE_ATTACK2}, // S_CYBRAKDEMON_VILE_ATTACK1 + {SPR_BRAK, 20, 0, {A_LinedefExecuteFromArg}, 5, 0, S_CYBRAKDEMON_VILE_ATTACK2}, // S_CYBRAKDEMON_VILE_ATTACK1 {SPR_BRAK, 20, 24, {A_VileTarget}, MT_CYBRAKDEMON_TARGET_RETICULE, 1, S_CYBRAKDEMON_VILE_ATTACK3}, // S_CYBRAKDEMON_VILE_ATTACK2 {SPR_BRAK, 19, 8, {A_FaceTarget}, 0, 0, S_CYBRAKDEMON_VILE_ATTACK4}, // S_CYBRAKDEMON_VILE_ATTACK3 {SPR_BRAK, 18, 8, {A_FaceTarget}, 0, 0, S_CYBRAKDEMON_VILE_ATTACK5}, // S_CYBRAKDEMON_VILE_ATTACK4 @@ -1631,7 +1635,7 @@ state_t states[NUMSTATES] = {SPR_BRAK, 0, 0, {A_SetReactionTime}, 0, 0, S_CYBRAKDEMON_WALK1}, // S_CYBRAKDEMON_FINISH_ATTACK2 // If just attacked, remove MF2_FRET w/out going back to spawnstate {SPR_BRAK, 18, 24, {A_Pain}, 0, 0, S_CYBRAKDEMON_PAIN2}, // S_CYBRAKDEMON_PAIN1 {SPR_BRAK, 18, 0, {A_CheckHealth}, 3, S_CYBRAKDEMON_PAIN3, S_CYBRAKDEMON_CHOOSE_ATTACK1}, // S_CYBRAKDEMON_PAIN2 - {SPR_BRAK, 18, 0, {A_LinedefExecute}, LE_PINCHPHASE, 0, S_CYBRAKDEMON_CHOOSE_ATTACK1}, // S_CYBRAKDEMON_PAIN3 + {SPR_BRAK, 18, 0, {A_LinedefExecuteFromArg}, 4, 0, S_CYBRAKDEMON_CHOOSE_ATTACK1}, // S_CYBRAKDEMON_PAIN3 {SPR_BRAK, 18, 1, {A_Repeat}, 1, S_CYBRAKDEMON_DIE1, S_CYBRAKDEMON_DIE2}, // S_CYBRAKDEMON_DIE1 {SPR_BRAK, 18, 2, {A_BossScream}, 2, 0, S_CYBRAKDEMON_DIE3}, // S_CYBRAKDEMON_DIE2 {SPR_BRAK, 18, 0, {A_Repeat}, 52, S_CYBRAKDEMON_DIE2, S_CYBRAKDEMON_DIE4}, // S_CYBRAKDEMON_DIE3 @@ -1754,14 +1758,14 @@ state_t states[NUMSTATES] = // Metal Sonic {SPR_PLAY, SPR2_STND, -1, {NULL}, 0, 0, S_METALSONIC_RACE}, // S_METALSONIC_RACE - {SPR_METL, 4, -1, {NULL}, 0, 0, S_NULL}, // S_METALSONIC_FLOAT + {SPR_METL, 4, -1, {NULL}, 0, 0, S_METALSONIC_FLOAT}, // S_METALSONIC_FLOAT {SPR_METL, 16|FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_METALSONIC_STUN}, // S_METALSONIC_VECTOR {SPR_METL, 15, -1, {NULL}, 0, 0, S_METALSONIC_FLOAT}, // S_METALSONIC_STUN {SPR_METL, 17, 20, {NULL}, 0, 0, S_METALSONIC_GATHER},// S_METALSONIC_RAISE - {SPR_METL, 18, -1, {NULL}, 0, 0, S_NULL}, // S_METALSONIC_GATHER + {SPR_METL, 18, -1, {NULL}, 0, 0, S_METALSONIC_FLOAT}, // S_METALSONIC_GATHER {SPR_METL, 6|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 1, 2, S_METALSONIC_BOUNCE},// S_METALSONIC_DASH - {SPR_METL, 18|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 1, 2, S_NULL}, // S_METALSONIC_BOUNCE - {SPR_METL, 14, -1, {NULL}, 0, 0, S_NULL}, // S_METALSONIC_BADBOUNCE + {SPR_METL, 18|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 1, 2, S_METALSONIC_FLOAT}, // S_METALSONIC_BOUNCE + {SPR_METL, 14, -1, {NULL}, 0, 0, S_METALSONIC_FLOAT}, // S_METALSONIC_BADBOUNCE {SPR_METL, 17, -1, {NULL}, 0, 0, S_METALSONIC_GATHER},// S_METALSONIC_SHOOT {SPR_METL, 15, 40, {A_Pain}, 0, 0, S_METALSONIC_FLOAT}, // S_METALSONIC_PAIN {SPR_METL, 17, 2, {A_Fall}, 0, 0, S_METALSONIC_DEATH2},// S_METALSONIC_DEATH1 @@ -2069,7 +2073,7 @@ state_t states[NUMSTATES] = {SPR_TVFL, 2, 18, {A_GiveShield}, SH_FLAMEAURA, 0, S_NULL}, // S_FLAMEAURA_ICON2 {SPR_TVBB, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_BUBBLEWRAP_ICON2}, // S_BUBBLEWRAP_ICON1 - {SPR_TVBB, 2, 18, {A_GiveShield}, SH_BUBBLEWRAP, 0, S_NULL}, // S_BUBBLERWAP_ICON2 + {SPR_TVBB, 2, 18, {A_GiveShield}, SH_BUBBLEWRAP, 0, S_NULL}, // S_BUBBLEWRAP_ICON2 {SPR_TVZP, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_THUNDERCOIN_ICON2}, // S_THUNDERCOIN_ICON1 {SPR_TVZP, 2, 18, {A_GiveShield}, SH_THUNDERCOIN, 0, S_NULL}, // S_THUNDERCOIN_ICON2 @@ -2117,6 +2121,56 @@ state_t states[NUMSTATES] = {SPR_LETR, FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL}, // S_LETTER + // Tutorial scenery + {SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|0, 3, {NULL}, 0, 0, S_TUTORIALLEAF2}, // S_TUTORIALLEAF1 + {SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|1, 3, {NULL}, 0, 0, S_TUTORIALLEAF3}, // S_TUTORIALLEAF2 + {SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|2, 3, {NULL}, 0, 0, S_TUTORIALLEAF4}, // S_TUTORIALLEAF3 + {SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|3, 3, {NULL}, 0, 0, S_TUTORIALLEAF5}, // S_TUTORIALLEAF4 + {SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|4, 3, {NULL}, 0, 0, S_TUTORIALLEAF6}, // S_TUTORIALLEAF5 + {SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|5, 3, {NULL}, 0, 0, S_TUTORIALLEAF7}, // S_TUTORIALLEAF6 + {SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|6, 3, {NULL}, 0, 0, S_TUTORIALLEAF8}, // S_TUTORIALLEAF7 + {SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|7, 3, {NULL}, 0, 0, S_TUTORIALLEAF9}, // S_TUTORIALLEAF8 + {SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|7, 3, {NULL}, 0, 0, S_TUTORIALLEAF10}, // S_TUTORIALLEAF9 + {SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|6, 3, {NULL}, 0, 0, S_TUTORIALLEAF11}, // S_TUTORIALLEAF10 + {SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|5, 3, {NULL}, 0, 0, S_TUTORIALLEAF12}, // S_TUTORIALLEAF11 + {SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|4, 3, {NULL}, 0, 0, S_TUTORIALLEAF13}, // S_TUTORIALLEAF12 + {SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|3, 3, {NULL}, 0, 0, S_TUTORIALLEAF14}, // S_TUTORIALLEAF13 + {SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|2, 3, {NULL}, 0, 0, S_TUTORIALLEAF15}, // S_TUTORIALLEAF14 + {SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|1, 3, {NULL}, 0, 0, S_TUTORIALLEAF16}, // S_TUTORIALLEAF15 + {SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|0, 3, {NULL}, 0, 0, S_TUTORIALLEAF1}, // S_TUTORIALLEAF16 + {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|0, 3, {NULL}, 0, 0, S_TUTORIALFLOWER2}, // S_TUTORIALFLOWER1 + {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|1, 3, {NULL}, 0, 0, S_TUTORIALFLOWER3}, // S_TUTORIALFLOWER2 + {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|2, 3, {NULL}, 0, 0, S_TUTORIALFLOWER4}, // S_TUTORIALFLOWER3 + {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|3, 3, {NULL}, 0, 0, S_TUTORIALFLOWER5}, // S_TUTORIALFLOWER4 + {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|4, 3, {NULL}, 0, 0, S_TUTORIALFLOWER6}, // S_TUTORIALFLOWER5 + {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|5, 3, {NULL}, 0, 0, S_TUTORIALFLOWER7}, // S_TUTORIALFLOWER6 + {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|6, 3, {NULL}, 0, 0, S_TUTORIALFLOWER8}, // S_TUTORIALFLOWER7 + {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|7, 3, {NULL}, 0, 0, S_TUTORIALFLOWER9}, // S_TUTORIALFLOWER8 + {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|7, 3, {NULL}, 0, 0, S_TUTORIALFLOWER10}, // S_TUTORIALFLOWER9 + {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|6, 3, {NULL}, 0, 0, S_TUTORIALFLOWER11}, // S_TUTORIALFLOWER10 + {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|5, 3, {NULL}, 0, 0, S_TUTORIALFLOWER12}, // S_TUTORIALFLOWER11 + {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|4, 3, {NULL}, 0, 0, S_TUTORIALFLOWER13}, // S_TUTORIALFLOWER12 + {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|3, 3, {NULL}, 0, 0, S_TUTORIALFLOWER14}, // S_TUTORIALFLOWER13 + {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|2, 3, {NULL}, 0, 0, S_TUTORIALFLOWER15}, // S_TUTORIALFLOWER14 + {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|1, 3, {NULL}, 0, 0, S_TUTORIALFLOWER16}, // S_TUTORIALFLOWER15 + {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|0, 3, {NULL}, 0, 0, S_TUTORIALFLOWER1}, // S_TUTORIALFLOWER16 + {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|0, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF2}, // S_TUTORIALFLOWERF1 + {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|1, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF3}, // S_TUTORIALFLOWERF2 + {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|2, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF4}, // S_TUTORIALFLOWERF3 + {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|3, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF5}, // S_TUTORIALFLOWERF4 + {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|4, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF6}, // S_TUTORIALFLOWERF5 + {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|5, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF7}, // S_TUTORIALFLOWERF6 + {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|6, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF8}, // S_TUTORIALFLOWERF7 + {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|7, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF9}, // S_TUTORIALFLOWERF8 + {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|7, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF10}, // S_TUTORIALFLOWERF9 + {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|6, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF11}, // S_TUTORIALFLOWERF10 + {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|5, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF12}, // S_TUTORIALFLOWERF11 + {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|4, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF13}, // S_TUTORIALFLOWERF12 + {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|3, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF14}, // S_TUTORIALFLOWERF13 + {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|2, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF15}, // S_TUTORIALFLOWERF14 + {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|1, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF16}, // S_TUTORIALFLOWERF15 + {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|0, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF1}, // S_TUTORIALFLOWERF16 + // GFZ flowers {SPR_FWR1, FF_ANIMATE, -1, {NULL}, 7, 3, S_NULL}, // S_GFZFLOWERA {SPR_FWR2, FF_ANIMATE, -1, {NULL}, 19, 3, S_NULL}, // S_GFZFLOWERB @@ -2168,7 +2222,7 @@ state_t states[NUMSTATES] = {SPR_GARG, 1, -1, {NULL}, 0, 0, S_NULL}, // S_BIGGARGOYLE // DSZ Seaweed - {SPR_SEWE, 0, -1, {NULL}, 0, 0, S_SEAWEED2}, // S_SEAWEED1 + {SPR_SEWE, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 26, 3, S_SEAWEED1}, // S_SEAWEED1 {SPR_SEWE, 1, 5, {NULL}, 0, 0, S_SEAWEED3}, // S_SEAWEED2 {SPR_SEWE, 2, 5, {NULL}, 0, 0, S_SEAWEED4}, // S_SEAWEED3 {SPR_SEWE, 3, 5, {NULL}, 0, 0, S_SEAWEED5}, // S_SEAWEED4 @@ -2938,10 +2992,10 @@ state_t states[NUMSTATES] = {SPR_NULL, 0, 15*2, {NULL}, 0, 0, S_ZAPSB2 }, // S_ZAPSB11 // Thunder spark - {SPR_SSPK, FF_ANIMATE, -1, {NULL}, 1, 2, S_NULL}, // S_THUNDERCOIN_SPARK + {SPR_SSPK, FF_ANIMATE|FF_FULLBRIGHT, -1, {NULL}, 1, 2, S_NULL}, // S_THUNDERCOIN_SPARK // Invincibility Sparkles - {SPR_IVSP, FF_ANIMATE, 32, {NULL}, 31, 1, S_NULL}, // S_IVSP + {SPR_IVSP, FF_ANIMATE|FF_FULLBRIGHT, 32, {NULL}, 31, 1, S_NULL}, // S_IVSP // Super Sonic Spark {SPR_SSPK, FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_SSPK2}, // S_SSPK1 @@ -3375,10 +3429,10 @@ state_t states[NUMSTATES] = {SPR_LCKN, 2|FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL}, // S_LOCKONINF3 {SPR_LCKN, 3|FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL}, // S_LOCKONINF4 - {SPR_TTAG, FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_NULL}, // S_TTAG + {SPR_TTAG, FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_NULL}, // S_TTAG // CTF Sign - {SPR_GFLG, FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_NULL}, // S_GOTFLAG + {SPR_GFLG, FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_NULL}, // S_GOTFLAG // Finish flag {SPR_FNSF, FF_TRANS30, -1, {NULL}, 0, 0, S_NULL}, // S_FINISHFLAG @@ -3736,14 +3790,13 @@ state_t states[NUMSTATES] = {SPR_FL01, 3, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER1}, // S_NIGHTOPIANHELPER9 // Nightopian - {SPR_NTPN, 0, 4, {A_Look}, 0, 0, S_PIAN0}, // S_PIAN0 - {SPR_NTPN, 0, 4, {A_JetgThink}, 0, 0, S_PIAN2}, // S_PIAN1 - {SPR_NTPN, 1, 4, {NULL}, 0, 0, S_PIAN3}, // S_PIAN2 - {SPR_NTPN, 2, 4, {NULL}, 0, 0, S_PIAN4}, // S_PIAN3 - {SPR_NTPN, 3, 4, {NULL}, 0, 0, S_PIAN5}, // S_PIAN4 - {SPR_NTPN, 2, 4, {NULL}, 0, 0, S_PIAN6}, // S_PIAN5 - {SPR_NTPN, 1, 4, {NULL}, 0, 0, S_PIAN1}, // S_PIAN6 - {SPR_NTPN, 5|FF_ANIMATE, 4, {NULL}, 1, 4, S_PIAN1}, // S_PIANSING + {SPR_NTPN, 0, 2, {A_Look}, 1, 1, S_PIAN_LOOK2}, // S_PIAN_LOOK1 + {SPR_NTPN, 1, 2, {A_Look}, 1, 1, S_PIAN_LOOK3}, // S_PIAN_LOOK2 + {SPR_NTPN, 2, 2, {A_Look}, 1, 1, S_PIAN_LOOK1}, // S_PIAN_LOOK3 + {SPR_NTPN, 0, 2, {A_JetgThink}, 0, 0, S_PIAN_FLY2}, // S_PIAN_FLY1 + {SPR_NTPN, 1, 2, {NULL}, 0, 0, S_PIAN_FLY3}, // S_PIAN_FLY2 + {SPR_NTPN, 2, 2, {NULL}, 0, 0, S_PIAN_FLY1}, // S_PIAN_FLY3 + {SPR_NTPN, 3|FF_ANIMATE, 24, {NULL}, 2, 2, S_PIAN_FLY1}, // S_PIAN_SING // Shleep {SPR_SHLP, 0, 15, {NULL}, 0, 0, S_SHLEEP2}, // S_SHLEEP1 @@ -3883,23 +3936,23 @@ state_t states[NUMSTATES] = {SPR_SPRK, FF_TRANS20|FF_ANIMATE|9, 18, {NULL}, 8, 2, S_NULL}, // S_SPRK3 // Robot Explosion - {SPR_BOM1, 0, 0, {A_FlickySpawn}, 0, 0, S_XPLD1}, // S_XPLD_FLICKY - {SPR_BOM1, 0, 2, {A_Scream}, 0, 0, S_XPLD2}, // S_XPLD1 - {SPR_BOM1, 1, 2, {NULL}, 0, 0, S_XPLD3}, // S_XPLD2 - {SPR_BOM1, 2, 3, {NULL}, 0, 0, S_XPLD4}, // S_XPLD3 - {SPR_BOM1, 3, 3, {NULL}, 0, 0, S_XPLD5}, // S_XPLD4 - {SPR_BOM1, 4, 4, {NULL}, 0, 0, S_XPLD6}, // S_XPLD5 - {SPR_BOM1, 5, 4, {NULL}, 0, 0, S_NULL}, // S_XPLD6 + {SPR_BOM1, 0, 0, {A_FlickySpawn}, 0, 0, S_XPLD1}, // S_XPLD_FLICKY + {SPR_BOM1, 0, 2, {A_ShadowScream}, 0, 0, S_XPLD2}, // S_XPLD1 + {SPR_BOM1, 1, 2, {NULL}, 0, 0, S_XPLD3}, // S_XPLD2 + {SPR_BOM1, 2, 3, {NULL}, 0, 0, S_XPLD4}, // S_XPLD3 + {SPR_BOM1, 3, 3, {NULL}, 0, 0, S_XPLD5}, // S_XPLD4 + {SPR_BOM1, 4, 4, {NULL}, 0, 0, S_XPLD6}, // S_XPLD5 + {SPR_BOM1, 5, 4, {NULL}, 0, 0, S_NULL}, // S_XPLD6 {SPR_BOM1, FF_ANIMATE, 21, {NULL}, 5, 4, S_INVISIBLE}, // S_XPLD_EGGTRAP // Underwater Explosion - {SPR_BOM4, 0, 3, {A_Scream}, 0, 0, S_WPLD2}, // S_WPLD1 - {SPR_BOM4, 1, 3, {NULL}, 0, 0, S_WPLD3}, // S_WPLD2 - {SPR_BOM4, 2, 3, {NULL}, 0, 0, S_WPLD4}, // S_WPLD3 - {SPR_BOM4, 3, 3, {NULL}, 0, 0, S_WPLD5}, // S_WPLD4 - {SPR_BOM4, 4, 3, {NULL}, 0, 0, S_WPLD6}, // S_WPLD5 - {SPR_BOM4, 5, 3, {NULL}, 0, 0, S_NULL}, // S_WPLD6 + {SPR_BOM4, 0, 3, {A_ShadowScream}, 0, 0, S_WPLD2}, // S_WPLD1 + {SPR_BOM4, 1, 3, {NULL}, 0, 0, S_WPLD3}, // S_WPLD2 + {SPR_BOM4, 2, 3, {NULL}, 0, 0, S_WPLD4}, // S_WPLD3 + {SPR_BOM4, 3, 3, {NULL}, 0, 0, S_WPLD5}, // S_WPLD4 + {SPR_BOM4, 4, 3, {NULL}, 0, 0, S_WPLD6}, // S_WPLD5 + {SPR_BOM4, 5, 3, {NULL}, 0, 0, S_NULL}, // S_WPLD6 {SPR_DUST, FF_TRANS40, 4, {NULL}, 0, 0, S_DUST2}, // S_DUST1 {SPR_DUST, 1|FF_TRANS50, 5, {NULL}, 0, 0, S_DUST3}, // S_DUST2 @@ -5198,11 +5251,11 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = 0, // speed 24*FRACUNIT, // radius 34*FRACUNIT, // height - 0, // display offset - 100, // mass + 1, // display offset + DMG_FIRE, // mass 0, // damage sfx_None, // activesound - MF_NOGRAVITY|MF_NOBLOCKMAP|MF_FIRE|MF_PAIN, // flags + MF_NOGRAVITY|MF_NOBLOCKMAP|MF_NOCLIPHEIGHT|MF_FIRE|MF_PAIN, // flags S_NULL // raisestate }, @@ -5601,8 +5654,8 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_EGGMOBILE_FLEE1, // xdeathstate sfx_s3kb4, // deathsound 4, // speed - 24*FRACUNIT, // radius - 76*FRACUNIT, // height + 36*FRACUNIT, // radius + 84*FRACUNIT, // height 0, // display offset sfx_None, // mass 3, // damage @@ -5736,8 +5789,8 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_EGGMOBILE2_FLEE1,// xdeathstate sfx_s3kb4, // deathsound 2*FRACUNIT, // speed - 24*FRACUNIT, // radius - 76*FRACUNIT, // height + 36*FRACUNIT, // radius + 84*FRACUNIT, // height 0, // display offset 0, // mass 3, // damage @@ -5844,7 +5897,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_EGGMOBILE3_FLEE1, // xdeathstate sfx_s3kb4, // deathsound 8*FRACUNIT, // speed - 32*FRACUNIT, // radius + 36*FRACUNIT, // radius 116*FRACUNIT, // height 0, // display offset MT_FAKEMOBILE, // mass @@ -5871,7 +5924,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL, // xdeathstate sfx_mswarp, // deathsound 8*FRACUNIT, // speed - 32*FRACUNIT, // radius + 36*FRACUNIT, // radius 116*FRACUNIT, // height 0, // display offset 0, // mass @@ -5925,8 +5978,8 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_EGGMOBILE4_FLEE1,// xdeathstate sfx_s3kb4, // deathsound 0, // speed - 24*FRACUNIT, // radius - 76*FRACUNIT, // height + 36*FRACUNIT, // radius + 84*FRACUNIT, // height 0, // display offset 0, // mass 3, // damage @@ -7974,7 +8027,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = 8*FRACUNIT, // radius 32*FRACUNIT, // height 0, // display offset - 4, // mass + DMG_SPIKE, // mass 0, // damage sfx_None, // activesound MF_NOBLOCKMAP|MF_SCENERY|MF_NOCLIPHEIGHT, // flags @@ -8001,7 +8054,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = 16*FRACUNIT, // radius 14*FRACUNIT, // height 0, // display offset - 4, // mass + DMG_SPIKE, // mass 0, // damage sfx_None, // activesound MF_NOBLOCKMAP|MF_NOGRAVITY|MF_SCENERY|MF_NOCLIPHEIGHT|MF_PAPERCOLLISION, // flags @@ -9776,8 +9829,8 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_MINE_BOOM1, // deathstate - S_MINE_BOOM1, // xdeathstate + S_XPLD1, // deathstate + S_XPLD1, // xdeathstate sfx_cybdth, // deathsound 0, // speed 8*FRACUNIT, // radius @@ -9979,6 +10032,114 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL // raisestate }, + { // MT_TUTORIALPLANT + 799, // doomednum + S_NULL, // spawnstate + 1000, // spawnhealth + S_NULL, // seestate + sfx_None, // seesound + 8, // reactiontime + sfx_None, // attacksound + S_NULL, // painstate + 0, // painchance + sfx_None, // painsound + S_NULL, // meleestate + S_NULL, // missilestate + S_NULL, // deathstate + S_NULL, // xdeathstate + sfx_None, // deathsound + 0, // speed + 32*FRACUNIT, // radius + 32*FRACUNIT, // height + 0, // display offset + 100, // mass + 0, // damage + sfx_None, // activesound + MF_NOBLOCKMAP|MF_NOCLIP|MF_NOGRAVITY|MF_SCENERY, // flags + S_NULL // raisestate + }, + + { // MT_TUTORIALLEAF + -1, // doomednum + S_TUTORIALLEAF1, // spawnstate + 1000, // spawnhealth + S_NULL, // seestate + sfx_None, // seesound + 8, // reactiontime + sfx_None, // attacksound + S_NULL, // painstate + 0, // painchance + sfx_None, // painsound + S_NULL, // meleestate + S_NULL, // missilestate + S_NULL, // deathstate + S_NULL, // xdeathstate + sfx_None, // deathsound + 0, // speed + 32*FRACUNIT, // radius + 32*FRACUNIT, // height + 0, // display offset + 100, // mass + 0, // damage + sfx_None, // activesound + MF_NOBLOCKMAP|MF_NOCLIP|MF_NOGRAVITY|MF_SCENERY, // flags + S_NULL // raisestate + }, + + { // MT_TUTORIALFLOWER + -1, // doomednum + S_TUTORIALFLOWER1, // spawnstate + 1000, // spawnhealth + S_NULL, // seestate + sfx_None, // seesound + 8, // reactiontime + sfx_None, // attacksound + S_NULL, // painstate + 0, // painchance + sfx_None, // painsound + S_NULL, // meleestate + S_NULL, // missilestate + S_NULL, // deathstate + S_NULL, // xdeathstate + sfx_None, // deathsound + 0, // speed + 32*FRACUNIT, // radius + 32*FRACUNIT, // height + 0, // display offset + 100, // mass + 0, // damage + sfx_None, // activesound + MF_NOBLOCKMAP|MF_NOCLIP|MF_NOGRAVITY|MF_SCENERY, // flags + S_NULL // raisestate + }, + + { // MT_TUTORIALFLOWERF + -1, // doomednum + S_TUTORIALFLOWERF1, // spawnstate + 1000, // spawnhealth + S_NULL, // seestate + sfx_None, // seesound + 8, // reactiontime + sfx_None, // attacksound + S_NULL, // painstate + 0, // painchance + sfx_None, // painsound + S_NULL, // meleestate + S_NULL, // missilestate + S_NULL, // deathstate + S_NULL, // xdeathstate + sfx_None, // deathsound + 0, // speed + 32*FRACUNIT, // radius + 32*FRACUNIT, // height + 0, // display offset + 100, // mass + 0, // damage + sfx_None, // activesound + MF_NOBLOCKMAP|MF_NOCLIP|MF_NOGRAVITY|MF_SCENERY, // flags + S_NULL // raisestate + }, + { // MT_GFZFLOWER1 800, // doomednum S_GFZFLOWERA, // spawnstate @@ -11430,7 +11591,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = 17*FRACUNIT, // radius 34*FRACUNIT, // height 1, // display offset - 0, // mass + DMG_SPIKE, // mass 1, // damage sfx_s3kc9s, //sfx_mswing, -- activesound MF_SCENERY|MF_PAIN|MF_NOGRAVITY, // flags @@ -11457,7 +11618,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = 34*FRACUNIT, // radius 68*FRACUNIT, // height 1, // display offset - 0, // mass + DMG_SPIKE, // mass 1, // damage sfx_s3kc9s, //sfx_mswing, -- activesound MF_SCENERY|MF_PAIN|MF_NOGRAVITY, // flags @@ -13401,7 +13562,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = 30*FRACUNIT, // radius 48*FRACUNIT, // height 0, // display offset - 100, // mass + DMG_FIRE, // mass 0, // damage sfx_None, // activesound MF_SPECIAL|MF_PAIN|MF_NOGRAVITY|MF_FIRE, // flags @@ -13806,7 +13967,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = 8*FRACUNIT, // radius 32*FRACUNIT, // height 0, // display offset - 0, // mass + 0, // mass 0, // damage sfx_None, // activesound MF_NOGRAVITY|MF_PAIN, // flags @@ -18056,13 +18217,13 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL // raisestate }, - // ambient water 1a (large) - { // MT_AWATERA + // ambient sound effect + { // MT_AMBIENT 700, // doomednum S_INVISIBLE, // spawnstate - 35, // spawnhealth + 1000, // spawnhealth S_NULL, // seestate - sfx_amwtr1, // seesound + sfx_None, // seesound 8, // reactiontime sfx_None, // attacksound S_NULL, // painstate @@ -18084,283 +18245,6 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL // raisestate }, - // ambient water 1b (large) - { // MT_AWATERB - 701, // doomednum - S_INVISIBLE, // spawnstate - 35, // spawnhealth - S_NULL, // seestate - sfx_amwtr2, // seesound - 8, // reactiontime - sfx_None, // attacksound - S_NULL, // painstate - 0, // painchance - sfx_None, // painsound - S_NULL, // meleestate - S_NULL, // missilestate - S_NULL, // deathstate - S_NULL, // xdeathstate - sfx_None, // deathsound - 0, // speed - 16*FRACUNIT, // radius - 16*FRACUNIT, // height - 0, // display offset - 100, // mass - 0, // damage - sfx_None, // activesound - MF_NOBLOCKMAP|MF_NOSECTOR|MF_NOGRAVITY|MF_AMBIENT, // flags - S_NULL // raisestate - }, - - // ambient water 2a (medium) - { // MT_AWATERC - 702, // doomednum - S_INVISIBLE, // spawnstate - 35, // spawnhealth - S_NULL, // seestate - sfx_amwtr3, // seesound - 8, // reactiontime - sfx_None, // attacksound - S_NULL, // painstate - 0, // painchance - sfx_None, // painsound - S_NULL, // meleestate - S_NULL, // missilestate - S_NULL, // deathstate - S_NULL, // xdeathstate - sfx_None, // deathsound - 0, // speed - 16*FRACUNIT, // radius - 16*FRACUNIT, // height - 0, // display offset - 100, // mass - 0, // damage - sfx_None, // activesound - MF_NOBLOCKMAP|MF_NOSECTOR|MF_NOGRAVITY|MF_AMBIENT, // flags - S_NULL // raisestate - }, - - // ambient water 2b (medium) - { // MT_AWATERD - 703, // doomednum - S_INVISIBLE, // spawnstate - 35, // spawnhealth - S_NULL, // seestate - sfx_amwtr4, // seesound - 8, // reactiontime - sfx_None, // attacksound - S_NULL, // painstate - 0, // painchance - sfx_None, // painsound - S_NULL, // meleestate - S_NULL, // missilestate - S_NULL, // deathstate - S_NULL, // xdeathstate - sfx_None, // deathsound - 0, // speed - 16*FRACUNIT, // radius - 16*FRACUNIT, // height - 0, // display offset - 100, // mass - 0, // damage - sfx_None, // activesound - MF_NOBLOCKMAP|MF_NOSECTOR|MF_NOGRAVITY|MF_AMBIENT, // flags - S_NULL // raisestate - }, - - // ambient water 3a (small) - { // MT_AWATERE - 704, // doomednum - S_INVISIBLE, // spawnstate - 35, // spawnhealth - S_NULL, // seestate - sfx_amwtr5, // seesound - 8, // reactiontime - sfx_None, // attacksound - S_NULL, // painstate - 0, // painchance - sfx_None, // painsound - S_NULL, // meleestate - S_NULL, // missilestate - S_NULL, // deathstate - S_NULL, // xdeathstate - sfx_None, // deathsound - 0, // speed - 16*FRACUNIT, // radius - 16*FRACUNIT, // height - 0, // display offset - 100, // mass - 0, // damage - sfx_None, // activesound - MF_NOBLOCKMAP|MF_NOSECTOR|MF_NOGRAVITY|MF_AMBIENT, // flags - S_NULL // raisestate - }, - - // ambient water 3b (small) - { // MT_AWATERF - 705, // doomednum - S_INVISIBLE, // spawnstate - 35, // spawnhealth - S_NULL, // seestate - sfx_amwtr6, // seesound - 8, // reactiontime - sfx_None, // attacksound - S_NULL, // painstate - 0, // painchance - sfx_None, // painsound - S_NULL, // meleestate - S_NULL, // missilestate - S_NULL, // deathstate - S_NULL, // xdeathstate - sfx_None, // deathsound - 0, // speed - 16*FRACUNIT, // radius - 16*FRACUNIT, // height - 0, // display offset - 100, // mass - 0, // damage - sfx_None, // activesound - MF_NOBLOCKMAP|MF_NOSECTOR|MF_NOGRAVITY|MF_AMBIENT, // flags - S_NULL // raisestate - }, - - // ambient water 4a (extra large) - { // MT_AWATERG - 706, // doomednum - S_INVISIBLE, // spawnstate - 35, // spawnhealth - S_NULL, // seestate - sfx_amwtr7, // seesound - 8, // reactiontime - sfx_None, // attacksound - S_NULL, // painstate - 0, // painchance - sfx_None, // painsound - S_NULL, // meleestate - S_NULL, // missilestate - S_NULL, // deathstate - S_NULL, // xdeathstate - sfx_None, // deathsound - 0, // speed - 16*FRACUNIT, // radius - 16*FRACUNIT, // height - 0, // display offset - 100, // mass - 0, // damage - sfx_None, // activesound - MF_NOBLOCKMAP|MF_NOSECTOR|MF_NOGRAVITY|MF_AMBIENT, // flags - S_NULL // raisestate - }, - - // ambient water 4b (extra large) - { // MT_AWATERH - 707, // doomednum - S_INVISIBLE, // spawnstate - 35, // spawnhealth - S_NULL, // seestate - sfx_amwtr8, // seesound - 8, // reactiontime - sfx_None, // attacksound - S_NULL, // painstate - 0, // painchance - sfx_None, // painsound - S_NULL, // meleestate - S_NULL, // missilestate - S_NULL, // deathstate - S_NULL, // xdeathstate - sfx_None, // deathsound - 0, // speed - 16*FRACUNIT, // radius - 16*FRACUNIT, // height - 0, // display offset - 100, // mass - 0, // damage - sfx_None, // activesound - MF_NOBLOCKMAP|MF_NOSECTOR|MF_NOGRAVITY|MF_AMBIENT, // flags - S_NULL // raisestate - }, - - { // MT_RANDOMAMBIENT - 708, // doomednum - S_INVISIBLE, // spawnstate - 512, // spawnhealth: repeat speed - S_NULL, // seestate - sfx_ambint, // seesound - 0, // reactiontime - sfx_None, // attacksound - S_NULL, // painstate - 255, // painchance - sfx_None, // painsound - S_NULL, // meleestate - S_NULL, // missilestate - S_NULL, // deathstate - S_NULL, // xdeathstate - sfx_None, // deathsound - 0, // speed - 8*FRACUNIT, // radius - 16*FRACUNIT, // height - 0, // display offset - 1000, // mass - 0, // damage - sfx_None, // activesound - MF_NOSECTOR|MF_NOBLOCKMAP|MF_NOGRAVITY|MF_AMBIENT, // flags - S_NULL // raisestate - }, - - { // MT_RANDOMAMBIENT2 - 709, // doomednum - S_INVISIBLE, // spawnstate - 220, // spawnhealth: repeat speed - S_NULL, // seestate - sfx_ambin2, // seesound - 0, // reactiontime - sfx_None, // attacksound - S_NULL, // painstate - 255, // painchance - sfx_None, // painsound - S_NULL, // meleestate - S_NULL, // missilestate - S_NULL, // deathstate - S_NULL, // xdeathstate - sfx_None, // deathsound - 0, // speed - 8*FRACUNIT, // radius - 16*FRACUNIT, // height - 0, // display offset - 1000, // mass - 0, // damage - sfx_None, // activesound - MF_NOSECTOR|MF_NOBLOCKMAP|MF_NOGRAVITY|MF_AMBIENT, // flags - S_NULL // raisestate - }, - - { // MT_MACHINEAMBIENCE - 710, // doomednum - S_INVISIBLE, // spawnstate - 24, // spawnhealth: repeat speed - S_NULL, // seestate - sfx_ambmac, // seesound - 8, // reactiontime - sfx_None, // attacksound - S_NULL, // painstate - 200, // painchance - sfx_None, // painsound - S_NULL, // meleestate - S_NULL, // missilestate - S_NULL, // deathstate - S_NULL, // xdeathstate - sfx_None, // deathsound - 1*FRACUNIT, // speed - 16*FRACUNIT, // radius - 16*FRACUNIT, // height - 0, // display offset - 100, // mass - 20, // damage - sfx_None, // activesound - MF_NOSECTOR|MF_NOBLOCKMAP|MF_NOGRAVITY|MF_AMBIENT, // flags - S_NULL // raisestate - }, - { // MT_CORK -1, // doomednum S_CORK, // spawnstate @@ -20119,28 +20003,28 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = { // MT_PIAN 1602, // doomednum - S_PIAN0, // spawnstate + S_PIAN_LOOK1, // spawnstate 1000, // spawnhealth - S_PIAN1, // seestate + S_PIAN_FLY1, // seestate sfx_None, // seesound 0, // reactiontime sfx_None, // attacksound S_NULL, // painstate 200, // painchance sfx_None, // painsound - S_PIANSING, // meleestate - S_NULL, // missilestate + S_NULL, // meleestate + S_PIAN_SING, // missilestate S_NULL, // deathstate S_NULL, // xdeathstate sfx_None, // deathsound FRACUNIT, // speed 16*FRACUNIT, // radius - 32*FRACUNIT, // height + 40*FRACUNIT, // height 0, // display offset 16, // mass 0, // damage sfx_None, // activesound - MF_SLIDEME|MF_ENEMY|MF_SPECIAL|MF_SHOOTABLE|MF_NOGRAVITY, // flags + MF_SLIDEME|MF_NOGRAVITY, // flags S_NULL // raisestate }, @@ -20380,7 +20264,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = 18*FRACUNIT, // radius 28*FRACUNIT, // height 0, // display offset - 0, // mass + DMG_SPIKE, // mass 0, // damage sfx_None, // activesound MF_NOGRAVITY|MF_PAIN, // flags @@ -20713,34 +20597,6 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL // raisestate }, - // for use with wind and current effects - { // MT_PULL - 755, // doomednum - S_INVISIBLE, // spawnstate - 1000, // spawnhealth - S_NULL, // seestate - sfx_None, // seesound - 8, // reactiontime - sfx_None, // attacksound - S_NULL, // painstate - 0, // painchance - sfx_None, // painsound - S_NULL, // meleestate - S_NULL, // missilestate - S_NULL, // deathstate - S_NULL, // xdeathstate - sfx_None, // deathsound - 0, // speed - 8, // radius - 8, // height - 0, // display offset - 10, // mass - 0, // damage - sfx_None, // activesound - MF_NOBLOCKMAP|MF_NOGRAVITY, // flags - S_NULL // raisestate - }, - { // MT_GHOST -1, // doomednum S_THOK, // spawnstate @@ -21685,6 +21541,33 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = MF_NOBLOCKMAP|MF_MISSILE|MF_NOGRAVITY|MF_NOSECTOR, // flags S_NULL // raisestate }, + + { // MT_RAY + -1, // doomednum + S_NULL, // spawnstate + 0, // spawnhealth + S_NULL, // seestate + sfx_None, // seesound + 0, // reactiontime + sfx_None, // attacksound + S_NULL, // painstate + 0, // painchance + sfx_None, // painsound + S_NULL, // meleestate + S_NULL, // missilestate + S_NULL, // deathstate + S_NULL, // xdeathstate + sfx_None, // deathsound + 0, // speed + 0, // radius + 0, // height + 0, // display offset + 0, // mass + 0, // damage + sfx_None, // activesound + MF_NOBLOCKMAP|MF_NOSECTOR|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY|MF_SCENERY, // flags + S_NULL // raisestate + }, }; skincolor_t skincolors[MAXSKINCOLORS] = { diff --git a/src/info.h b/src/info.h index 031a08b43..502ecd726 100644 --- a/src/info.h +++ b/src/info.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -44,6 +44,8 @@ enum actionnum A_FACETRACER, A_SCREAM, A_BOSSDEATH, + A_SETSHADOWSCALE, + A_SHADOWSCREAM, A_CUSTOMPOWER, A_GIVEWEAPON, A_RINGBOX, @@ -150,6 +152,7 @@ enum actionnum A_BOSS3PATH, A_BOSS3SHOCKTHINK, A_LINEDEFEXECUTE, + A_LINEDEFEXECUTEFROMARG, A_PLAYSEESOUND, A_PLAYATTACKSOUND, A_PLAYACTIVESOUND, @@ -177,6 +180,8 @@ enum actionnum A_SETOBJECTFLAGS2, A_RANDOMSTATE, A_RANDOMSTATERANGE, + A_STATERANGEBYANGLE, + A_STATERANGEBYPARAMETER, A_DUALACTION, A_REMOTEACTION, A_TOGGLEFLAMEJET, @@ -310,6 +315,8 @@ void A_FaceTarget(); void A_FaceTracer(); void A_Scream(); void A_BossDeath(); +void A_SetShadowScale(); +void A_ShadowScream(); // MARIA!!!!!! void A_CustomPower(); // Use this for a custom power void A_GiveWeapon(); // Gives the player weapon(s) void A_RingBox(); // Obtained Ring Box Tails @@ -409,6 +416,7 @@ void A_Boss3TakeDamage(); void A_Boss3Path(); void A_Boss3ShockThink(); void A_LinedefExecute(); +void A_LinedefExecuteFromArg(); void A_PlaySeeSound(); void A_PlayAttackSound(); void A_PlayActiveSound(); @@ -443,6 +451,8 @@ void A_SetObjectFlags(); void A_SetObjectFlags2(); void A_RandomState(); void A_RandomStateRange(); +void A_StateRangeByAngle(); +void A_StateRangeByParameter(); void A_DualAction(); void A_RemoteAction(); void A_ToggleFlameJet(); @@ -737,6 +747,10 @@ typedef enum sprite // The letter SPR_LETR, + // Tutorial scenery + SPR_TUPL, + SPR_TUPF, + // Greenflower Scenery SPR_FWR1, SPR_FWR2, // GFZ Sunflower @@ -2551,6 +2565,56 @@ typedef enum state // The letter S_LETTER, + // Tutorial scenery + S_TUTORIALLEAF1, + S_TUTORIALLEAF2, + S_TUTORIALLEAF3, + S_TUTORIALLEAF4, + S_TUTORIALLEAF5, + S_TUTORIALLEAF6, + S_TUTORIALLEAF7, + S_TUTORIALLEAF8, + S_TUTORIALLEAF9, + S_TUTORIALLEAF10, + S_TUTORIALLEAF11, + S_TUTORIALLEAF12, + S_TUTORIALLEAF13, + S_TUTORIALLEAF14, + S_TUTORIALLEAF15, + S_TUTORIALLEAF16, + S_TUTORIALFLOWER1, + S_TUTORIALFLOWER2, + S_TUTORIALFLOWER3, + S_TUTORIALFLOWER4, + S_TUTORIALFLOWER5, + S_TUTORIALFLOWER6, + S_TUTORIALFLOWER7, + S_TUTORIALFLOWER8, + S_TUTORIALFLOWER9, + S_TUTORIALFLOWER10, + S_TUTORIALFLOWER11, + S_TUTORIALFLOWER12, + S_TUTORIALFLOWER13, + S_TUTORIALFLOWER14, + S_TUTORIALFLOWER15, + S_TUTORIALFLOWER16, + S_TUTORIALFLOWERF1, + S_TUTORIALFLOWERF2, + S_TUTORIALFLOWERF3, + S_TUTORIALFLOWERF4, + S_TUTORIALFLOWERF5, + S_TUTORIALFLOWERF6, + S_TUTORIALFLOWERF7, + S_TUTORIALFLOWERF8, + S_TUTORIALFLOWERF9, + S_TUTORIALFLOWERF10, + S_TUTORIALFLOWERF11, + S_TUTORIALFLOWERF12, + S_TUTORIALFLOWERF13, + S_TUTORIALFLOWERF14, + S_TUTORIALFLOWERF15, + S_TUTORIALFLOWERF16, + // GFZ flowers S_GFZFLOWERA, S_GFZFLOWERB, @@ -4093,14 +4157,13 @@ typedef enum state S_NIGHTOPIANHELPER9, // Nightopian - S_PIAN0, - S_PIAN1, - S_PIAN2, - S_PIAN3, - S_PIAN4, - S_PIAN5, - S_PIAN6, - S_PIANSING, + S_PIAN_LOOK1, + S_PIAN_LOOK2, + S_PIAN_LOOK3, + S_PIAN_FLY1, + S_PIAN_FLY2, + S_PIAN_FLY3, + S_PIAN_SING, // Shleep S_SHLEEP1, @@ -4583,6 +4646,12 @@ typedef enum mobj_type // The letter MT_LETTER, + // Tutorial Scenery + MT_TUTORIALPLANT, + MT_TUTORIALLEAF, + MT_TUTORIALFLOWER, + MT_TUTORIALFLOWERF, + // Greenflower Scenery MT_GFZFLOWER1, MT_GFZFLOWER2, @@ -4932,17 +5001,7 @@ typedef enum mobj_type MT_FINISHFLAG, // Finish flag // Ambient Sounds - MT_AWATERA, // Ambient Water Sound 1 - MT_AWATERB, // Ambient Water Sound 2 - MT_AWATERC, // Ambient Water Sound 3 - MT_AWATERD, // Ambient Water Sound 4 - MT_AWATERE, // Ambient Water Sound 5 - MT_AWATERF, // Ambient Water Sound 6 - MT_AWATERG, // Ambient Water Sound 7 - MT_AWATERH, // Ambient Water Sound 8 - MT_RANDOMAMBIENT, - MT_RANDOMAMBIENT2, - MT_MACHINEAMBIENCE, + MT_AMBIENT, MT_CORK, MT_LHRT, @@ -5046,7 +5105,6 @@ typedef enum mobj_type MT_CRUMBLEOBJ, // Sound generator for crumbling platform MT_TUBEWAYPOINT, MT_PUSH, - MT_PULL, MT_GHOST, MT_OVERLAY, MT_ANGLEMAN, @@ -5089,6 +5147,7 @@ typedef enum mobj_type MT_YELLOWBRICKDEBRIS, // for CEZ3 MT_NAMECHECK, + MT_RAY, // General purpose mobj MT_FIRSTFREESLOT, MT_LASTFREESLOT = MT_FIRSTFREESLOT + NUMMOBJFREESLOTS - 1, diff --git a/src/keys.h b/src/keys.h index b19259320..689f15fef 100644 --- a/src/keys.h +++ b/src/keys.h @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/lua_baselib.c b/src/lua_baselib.c index 594ac6af2..25fa38769 100644 --- a/src/lua_baselib.c +++ b/src/lua_baselib.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 2012-2016 by John "JTE" Muniz. -// Copyright (C) 2012-2021 by Sonic Team Junior. +// Copyright (C) 2012-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -29,6 +29,9 @@ #include "d_netcmd.h" // IsPlayerAdmin #include "m_menu.h" // Player Setup menu color stuff #include "m_misc.h" // M_MapNumber +#include "b_bot.h" // B_UpdateBotleader +#include "d_clisrv.h" // CL_RemovePlayer +#include "i_system.h" // I_GetPreciseTime, I_GetPrecisePrecision #include "lua_script.h" #include "lua_libs.h" @@ -185,6 +188,8 @@ static const struct { {META_MAPHEADER, "mapheader_t"}, {META_POLYOBJ, "polyobj_t"}, + {META_POLYOBJVERTICES, "polyobj_t.vertices"}, + {META_POLYOBJLINES, "polyobj_t.lines"}, {META_CVAR, "consvar_t"}, @@ -213,6 +218,9 @@ static const struct { {META_ACTION, "action"}, {META_LUABANKS, "luabanks[]"}, + + {META_KEYEVENT, "keyevent_t"}, + {META_MOUSE, "mouse_t"}, {NULL, NULL} }; @@ -866,6 +874,7 @@ static int lib_pGetClosestAxis(lua_State *L) static int lib_pSpawnParaloop(lua_State *L) { + mobj_t *ptmthing = tmthing; fixed_t x = luaL_checkfixed(L, 1); fixed_t y = luaL_checkfixed(L, 2); fixed_t z = luaL_checkfixed(L, 3); @@ -882,6 +891,7 @@ static int lib_pSpawnParaloop(lua_State *L) if (nstate >= NUMSTATES) return luaL_error(L, "state %d out of range (0 - %d)", nstate, NUMSTATES-1); P_SpawnParaloop(x, y, z, radius, number, type, nstate, rotangle, spawncenter); + P_SetTarget(&tmthing, ptmthing); return 0; } @@ -1293,6 +1303,17 @@ static int lib_pInQuicksand(lua_State *L) return 1; } +static int lib_pInJumpFlipSector(lua_State *L) +{ + mobj_t *mo = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ)); + //HUDSAFE + INLEVEL + if (!mo) + return LUA_ErrInvalid(L, "mobj_t"); + lua_pushboolean(L, P_InJumpFlipSector(mo)); + return 1; +} + static int lib_pSetObjectMomZ(lua_State *L) { mobj_t *mo = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ)); @@ -1775,7 +1796,42 @@ static int lib_pTeleportMove(lua_State *L) INLEVEL if (!thing) return LUA_ErrInvalid(L, "mobj_t"); - lua_pushboolean(L, P_TeleportMove(thing, x, y, z)); + LUA_Deprecated(L, "P_TeleportMove", "P_SetOrigin\" or \"P_MoveOrigin"); + lua_pushboolean(L, P_MoveOrigin(thing, x, y, z)); + LUA_PushUserdata(L, tmthing, META_MOBJ); + P_SetTarget(&tmthing, ptmthing); + return 2; +} + +static int lib_pSetOrigin(lua_State *L) +{ + mobj_t *ptmthing = tmthing; + mobj_t *thing = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ)); + fixed_t x = luaL_checkfixed(L, 2); + fixed_t y = luaL_checkfixed(L, 3); + fixed_t z = luaL_checkfixed(L, 4); + NOHUD + INLEVEL + if (!thing) + return LUA_ErrInvalid(L, "mobj_t"); + lua_pushboolean(L, P_SetOrigin(thing, x, y, z)); + LUA_PushUserdata(L, tmthing, META_MOBJ); + P_SetTarget(&tmthing, ptmthing); + return 2; +} + +static int lib_pMoveOrigin(lua_State *L) +{ + mobj_t *ptmthing = tmthing; + mobj_t *thing = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ)); + fixed_t x = luaL_checkfixed(L, 2); + fixed_t y = luaL_checkfixed(L, 3); + fixed_t z = luaL_checkfixed(L, 4); + NOHUD + INLEVEL + if (!thing) + return LUA_ErrInvalid(L, "mobj_t"); + lua_pushboolean(L, P_MoveOrigin(thing, x, y, z)); LUA_PushUserdata(L, tmthing, META_MOBJ); P_SetTarget(&tmthing, ptmthing); return 2; @@ -1881,6 +1937,37 @@ static int lib_pDoSpring(lua_State *L) return 1; } +static int lib_pTryCameraMove(lua_State *L) +{ + camera_t *cam = *((camera_t **)luaL_checkudata(L, 1, META_CAMERA)); + fixed_t x = luaL_checkfixed(L, 2); + fixed_t y = luaL_checkfixed(L, 3); + + if (!cam) + return LUA_ErrInvalid(L, "camera_t"); + lua_pushboolean(L, P_TryCameraMove(x, y, cam)); + return 1; +} + +static int lib_pTeleportCameraMove(lua_State *L) +{ + camera_t *cam = *((camera_t **)luaL_checkudata(L, 1, META_CAMERA)); + fixed_t x = luaL_checkfixed(L, 2); + fixed_t y = luaL_checkfixed(L, 3); + fixed_t z = luaL_checkfixed(L, 4); + + if (!cam) + return LUA_ErrInvalid(L, "camera_t"); + cam->x = x; + cam->y = y; + cam->z = z; + P_CheckCameraPosition(x, y, cam); + cam->subsector = R_PointInSubsector(x, y); + cam->floorz = tmfloorz; + cam->ceilingz = tmceilingz; + return 0; +} + // P_INTER //////////// @@ -2163,6 +2250,43 @@ static int lib_pExplodeMissile(lua_State *L) return 0; } +static int lib_pMobjTouchingSectorSpecial(lua_State *L) +{ + mobj_t *mo = *((mobj_t**)luaL_checkudata(L, 1, META_MOBJ)); + INT32 section = (INT32)luaL_checkinteger(L, 2); + INT32 number = (INT32)luaL_checkinteger(L, 3); + //HUDSAFE + INLEVEL + if (!mo) + return LUA_ErrInvalid(L, "mobj_t"); + LUA_PushUserdata(L, P_MobjTouchingSectorSpecial(mo, section, number), META_SECTOR); + return 1; +} + +static int lib_pThingOnSpecial3DFloor(lua_State *L) +{ + mobj_t *mo = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ)); + NOHUD + INLEVEL + if (!mo) + return LUA_ErrInvalid(L, "mobj_t"); + LUA_Deprecated(L, "P_ThingOnSpecial3DFloor", "P_MobjTouchingSectorSpecial\" or \"P_MobjTouchingSectorSpecialFlag"); + LUA_PushUserdata(L, P_ThingOnSpecial3DFloor(mo), META_SECTOR); + return 1; +} + +static int lib_pMobjTouchingSectorSpecialFlag(lua_State *L) +{ + mobj_t *mo = *((mobj_t**)luaL_checkudata(L, 1, META_MOBJ)); + sectorspecialflags_t flag = (INT32)luaL_checkinteger(L, 2); + //HUDSAFE + INLEVEL + if (!mo) + return LUA_ErrInvalid(L, "mobj_t"); + LUA_PushUserdata(L, P_MobjTouchingSectorSpecialFlag(mo, flag), META_SECTOR); + return 1; +} + static int lib_pPlayerTouchingSectorSpecial(lua_State *L) { player_t *player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER)); @@ -2176,6 +2300,18 @@ static int lib_pPlayerTouchingSectorSpecial(lua_State *L) return 1; } +static int lib_pPlayerTouchingSectorSpecialFlag(lua_State *L) +{ + player_t *player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER)); + sectorspecialflags_t flag = (INT32)luaL_checkinteger(L, 2); + //HUDSAFE + INLEVEL + if (!player) + return LUA_ErrInvalid(L, "player_t"); + LUA_PushUserdata(L, P_PlayerTouchingSectorSpecialFlag(player, flag), META_SECTOR); + return 1; +} + static int lib_pFindLowestFloorSurrounding(lua_State *L) { sector_t *sector = *((sector_t **)luaL_checkudata(L, 1, META_SECTOR)); @@ -2307,23 +2443,13 @@ static int lib_pFadeLight(lua_State *L) INT32 speed = (INT32)luaL_checkinteger(L, 3); boolean ticbased = lua_optboolean(L, 4); boolean force = lua_optboolean(L, 5); + boolean relative = lua_optboolean(L, 6); NOHUD INLEVEL - P_FadeLight(tag, destvalue, speed, ticbased, force); + P_FadeLight(tag, destvalue, speed, ticbased, force, relative); return 0; } -static int lib_pThingOnSpecial3DFloor(lua_State *L) -{ - mobj_t *mo = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ)); - NOHUD - INLEVEL - if (!mo) - return LUA_ErrInvalid(L, "mobj_t"); - LUA_PushUserdata(L, P_ThingOnSpecial3DFloor(mo), META_SECTOR); - return 1; -} - static int lib_pIsFlagAtBase(lua_State *L) { mobjtype_t flag = luaL_checkinteger(L, 1); @@ -3395,6 +3521,125 @@ static int lib_gAddGametype(lua_State *L) return 0; } +// Bot adding function! +// Partly lifted from Got_AddPlayer +static int lib_gAddPlayer(lua_State *L) +{ + INT16 i, newplayernum, botcount = 1; + player_t *newplayer; + SINT8 skinnum = 0, bot; + + for (i = 0; i < MAXPLAYERS; i++) + { + if (!playeringame[i]) + break; + + if (players[i].bot) + botcount++; // How many of us are there already? + } + if (i >= MAXPLAYERS) + { + lua_pushnil(L); + return 1; + } + + newplayernum = i; + + CL_ClearPlayer(newplayernum); + + playeringame[newplayernum] = true; + G_AddPlayer(newplayernum); + newplayer = &players[newplayernum]; + + newplayer->jointime = 0; + newplayer->quittime = 0; + + // Read the skin argument (defaults to Sonic) + if (!lua_isnoneornil(L, 1)) + { + skinnum = R_SkinAvailable(luaL_checkstring(L, 1)); + skinnum = skinnum < 0 ? 0 : skinnum; + } + + // Read the color (defaults to skin prefcolor) + if (!lua_isnoneornil(L, 2)) + newplayer->skincolor = R_GetColorByName(luaL_checkstring(L, 2)); + else + newplayer->skincolor = skins[skinnum].prefcolor; + + // Set the bot default name as the skin + strcpy(player_names[newplayernum], skins[skinnum].realname); + + // Read the bot name, if given + if (!lua_isnoneornil(L, 3)) + strlcpy(player_names[newplayernum], luaL_checkstring(L, 3), sizeof(*player_names)); + + bot = luaL_optinteger(L, 4, 3); + newplayer->bot = (bot >= BOT_NONE && bot <= BOT_MPAI) ? bot : BOT_MPAI; + + // If our bot is a 2P type, we'll need to set its leader so it can spawn + if (newplayer->bot == BOT_2PAI || newplayer->bot == BOT_2PHUMAN) + B_UpdateBotleader(newplayer); + + // Set the skin (can't do this until AFTER bot type is set!) + SetPlayerSkinByNum(newplayernum, skinnum); + + if (netgame) + { + char joinmsg[256]; + + // Truncate bot name + player_names[newplayernum][sizeof(*player_names) - 8] = '\0'; // The length of colored [BOT] + 1 + + strcpy(joinmsg, M_GetText("\x82*Bot %s has joined the game (player %d)")); + strcpy(joinmsg, va(joinmsg, player_names[newplayernum], newplayernum)); + HU_AddChatText(joinmsg, false); + + // Append blue [BOT] tag at the end + strlcat(player_names[newplayernum], "\x84[BOT]\x80", sizeof(*player_names)); + } + + LUA_PushUserdata(L, newplayer, META_PLAYER); + return 1; +} + + +// Bot removing function +static int lib_gRemovePlayer(lua_State *L) +{ + UINT8 pnum = -1; + if (!lua_isnoneornil(L, 1)) + pnum = luaL_checkinteger(L, 1); + else // No argument + return luaL_error(L, "argument #1 not given (expected number)"); + if (pnum >= MAXPLAYERS) // Out of range + return luaL_error(L, "playernum %d out of range (0 - %d)", pnum, MAXPLAYERS-1); + if (playeringame[pnum]) // Found player + { + if (players[pnum].bot == BOT_NONE) // Can't remove clients. + return luaL_error(L, "G_RemovePlayer can only be used on players with a bot value other than BOT_NONE."); + else + { + players[pnum].removing = true; + lua_pushboolean(L, true); + return 1; + } + } + // Fell through. Invalid player + return LUA_ErrInvalid(L, "player_t"); +} + + +static int lib_gSetUsedCheats(lua_State *L) +{ + // Let large-scale level packs using Lua be able to add cheat commands. + boolean silent = lua_optboolean(L, 1); + //NOHUD + //INLEVEL + G_SetUsedCheats(silent); + return 0; +} + static int Lcheckmapnumber (lua_State *L, int idx, const char *fun) { if (ISINLEVEL) @@ -3736,6 +3981,12 @@ static int lib_gTicsToMilliseconds(lua_State *L) return 1; } +static int lib_getTimeMicros(lua_State *L) +{ + lua_pushinteger(L, I_GetPreciseTime() / (I_GetPrecisePrecision() / 1000000)); + return 1; +} + static luaL_Reg lib[] = { {"print", lib_print}, {"chatprint", lib_chatprint}, @@ -3832,6 +4083,7 @@ static luaL_Reg lib[] = { {"P_IsObjectOnGround",lib_pIsObjectOnGround}, {"P_InSpaceSector",lib_pInSpaceSector}, {"P_InQuicksand",lib_pInQuicksand}, + {"P_InJumpFlipSector",lib_pInJumpFlipSector}, {"P_SetObjectMomZ",lib_pSetObjectMomZ}, {"P_PlayJingle",lib_pPlayJingle}, {"P_PlayJingleMusic",lib_pPlayJingleMusic}, @@ -3871,6 +4123,8 @@ static luaL_Reg lib[] = { {"P_TryMove",lib_pTryMove}, {"P_Move",lib_pMove}, {"P_TeleportMove",lib_pTeleportMove}, + {"P_SetOrigin",lib_pSetOrigin}, + {"P_MoveOrigin",lib_pMoveOrigin}, {"P_SlideMove",lib_pSlideMove}, {"P_BounceMove",lib_pBounceMove}, {"P_CheckSight", lib_pCheckSight}, @@ -3879,6 +4133,8 @@ static luaL_Reg lib[] = { {"P_FloorzAtPos",lib_pFloorzAtPos}, {"P_CeilingzAtPos",lib_pCeilingzAtPos}, {"P_DoSpring",lib_pDoSpring}, + {"P_TryCameraMove", lib_pTryCameraMove}, + {"P_TeleportCameraMove", lib_pTeleportCameraMove}, // p_inter {"P_RemoveShield",lib_pRemoveShield}, @@ -3903,7 +4159,11 @@ static luaL_Reg lib[] = { {"P_SetMobjStateNF",lib_pSetMobjStateNF}, {"P_DoSuperTransformation",lib_pDoSuperTransformation}, {"P_ExplodeMissile",lib_pExplodeMissile}, + {"P_MobjTouchingSectorSpecial",lib_pMobjTouchingSectorSpecial}, + {"P_ThingOnSpecial3DFloor",lib_pThingOnSpecial3DFloor}, + {"P_MobjTouchingSectorSpecialFlag",lib_pMobjTouchingSectorSpecialFlag}, {"P_PlayerTouchingSectorSpecial",lib_pPlayerTouchingSectorSpecial}, + {"P_PlayerTouchingSectorSpecialFlag",lib_pPlayerTouchingSectorSpecialFlag}, {"P_FindLowestFloorSurrounding",lib_pFindLowestFloorSurrounding}, {"P_FindHighestFloorSurrounding",lib_pFindHighestFloorSurrounding}, {"P_FindNextHighestFloor",lib_pFindNextHighestFloor}, @@ -3915,7 +4175,6 @@ static luaL_Reg lib[] = { {"P_LinedefExecute",lib_pLinedefExecute}, {"P_SpawnLightningFlash",lib_pSpawnLightningFlash}, {"P_FadeLight",lib_pFadeLight}, - {"P_ThingOnSpecial3DFloor",lib_pThingOnSpecial3DFloor}, {"P_IsFlagAtBase",lib_pIsFlagAtBase}, {"P_SetupLevelSky",lib_pSetupLevelSky}, {"P_SetSkyboxMobj",lib_pSetSkyboxMobj}, @@ -3981,6 +4240,9 @@ static luaL_Reg lib[] = { // g_game {"G_AddGametype", lib_gAddGametype}, + {"G_AddPlayer", lib_gAddPlayer}, + {"G_RemovePlayer", lib_gRemovePlayer}, + {"G_SetUsedCheats", lib_gSetUsedCheats}, {"G_BuildMapName",lib_gBuildMapName}, {"G_BuildMapTitle",lib_gBuildMapTitle}, {"G_FindMap",lib_gFindMap}, @@ -4006,6 +4268,8 @@ static luaL_Reg lib[] = { {"G_TicsToCentiseconds",lib_gTicsToCentiseconds}, {"G_TicsToMilliseconds",lib_gTicsToMilliseconds}, + {"getTimeMicros",lib_getTimeMicros}, + {NULL, NULL} }; diff --git a/src/lua_blockmaplib.c b/src/lua_blockmaplib.c index 9089d19b6..8d47f3dc1 100644 --- a/src/lua_blockmaplib.c +++ b/src/lua_blockmaplib.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- -// Copyright (C) 2016-2021 by Iestyn "Monster Iestyn" Jealous. -// Copyright (C) 2016-2021 by Sonic Team Junior. +// Copyright (C) 2016-2023 by Iestyn "Monster Iestyn" Jealous. +// Copyright (C) 2016-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/lua_consolelib.c b/src/lua_consolelib.c index 414d9692a..1d15b3b14 100644 --- a/src/lua_consolelib.c +++ b/src/lua_consolelib.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 2012-2016 by John "JTE" Muniz. -// Copyright (C) 2012-2021 by Sonic Team Junior. +// Copyright (C) 2012-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -253,7 +253,7 @@ static int lib_comBufAddText(lua_State *L) plr = *((player_t **)luaL_checkudata(L, 1, META_PLAYER)); if (plr && plr != &players[consoleplayer]) return 0; - COM_BufAddTextEx(va("%s\n", luaL_checkstring(L, 2)), COM_SAFE); + COM_BufAddTextEx(va("%s\n", luaL_checkstring(L, 2)), COM_LUA); return 0; } @@ -269,7 +269,7 @@ static int lib_comBufInsertText(lua_State *L) plr = *((player_t **)luaL_checkudata(L, 1, META_PLAYER)); if (plr && plr != &players[consoleplayer]) return 0; - COM_BufInsertTextEx(va("%s\n", luaL_checkstring(L, 2)), COM_SAFE); + COM_BufInsertTextEx(va("%s\n", luaL_checkstring(L, 2)), COM_LUA); return 0; } @@ -313,36 +313,57 @@ static int lib_cvRegisterVar(lua_State *L) #define TYPEERROR(f, t) FIELDERROR(f, va("%s expected, got %s", lua_typename(L, t), luaL_typename(L, -1))) lua_pushnil(L); - while (lua_next(L, 1)) { + while (lua_next(L, 1)) + { // stack: cvar table, cvar userdata, key/index, value // 1 2 3 4 i = 0; k = NULL; if (lua_isnumber(L, 3)) + { i = lua_tointeger(L, 3); + } else if (lua_isstring(L, 3)) + { k = lua_tostring(L, 3); + } - if (i == 1 || (k && fasticmp(k, "name"))) { + if (i == 1 || (k && fasticmp(k, "name"))) + { if (!lua_isstring(L, 4)) + { TYPEERROR("name", LUA_TSTRING) + } cvar->name = Z_StrDup(lua_tostring(L, 4)); - } else if (i == 2 || (k && fasticmp(k, "defaultvalue"))) { + } + else if (i == 2 || (k && fasticmp(k, "defaultvalue"))) + { if (!lua_isstring(L, 4)) + { TYPEERROR("defaultvalue", LUA_TSTRING) + } cvar->defaultvalue = Z_StrDup(lua_tostring(L, 4)); - } else if (i == 3 || (k && fasticmp(k, "flags"))) { + } + else if (i == 3 || (k && fasticmp(k, "flags"))) + { if (!lua_isnumber(L, 4)) + { TYPEERROR("flags", LUA_TNUMBER) + } cvar->flags = (INT32)lua_tointeger(L, 4); - } else if (i == 4 || (k && fasticmp(k, "PossibleValue"))) { - if (lua_islightuserdata(L, 4)) { + } + else if (i == 4 || (k && fasticmp(k, "PossibleValue"))) + { + if (lua_islightuserdata(L, 4)) + { CV_PossibleValue_t *pv = lua_touserdata(L, 4); if (pv == CV_OnOff || pv == CV_YesNo || pv == CV_Unsigned || pv == CV_Natural) cvar->PossibleValue = pv; else FIELDERROR("PossibleValue", "CV_PossibleValue_t expected, got unrecognised pointer") - } else if (lua_istable(L, 4)) { + } + else if (lua_istable(L, 4)) + { // Accepts tables in the form of {MIN=0, MAX=9999} or {Red=0, Green=1, Blue=2} // and converts them to CV_PossibleValue_t {{0,"MIN"},{9999,"MAX"}} or {{0,"Red"},{1,"Green"},{2,"Blue"}} // @@ -353,7 +374,8 @@ static int lib_cvRegisterVar(lua_State *L) CV_PossibleValue_t *cvpv; lua_pushnil(L); - while (lua_next(L, 4)) { + while (lua_next(L, 4)) + { count++; lua_pop(L, 1); } @@ -367,7 +389,8 @@ static int lib_cvRegisterVar(lua_State *L) i = 0; lua_pushnil(L); - while (lua_next(L, 4)) { + while (lua_next(L, 4)) + { // stack: [...] PossibleValue table, index, value // 4 5 6 if (lua_type(L, 5) != LUA_TSTRING @@ -381,11 +404,18 @@ static int lib_cvRegisterVar(lua_State *L) cvpv[i].value = 0; cvpv[i].strvalue = NULL; cvar->PossibleValue = cvpv; - } else + } + else + { FIELDERROR("PossibleValue", va("%s or CV_PossibleValue_t expected, got %s", lua_typename(L, LUA_TTABLE), luaL_typename(L, -1))) - } else if (cvar->flags & CV_CALL && (i == 5 || (k && fasticmp(k, "func")))) { + } + } + else if (cvar->flags & CV_CALL && (i == 5 || (k && fasticmp(k, "func")))) + { if (!lua_isfunction(L, 4)) + { TYPEERROR("func", LUA_TFUNCTION) + } lua_getfield(L, LUA_REGISTRYINDEX, "CV_OnChange"); I_Assert(lua_istable(L, 5)); lua_pushlightuserdata(L, cvar); @@ -400,18 +430,35 @@ static int lib_cvRegisterVar(lua_State *L) #undef FIELDERROR #undef TYPEERROR - if (!cvar->name) - return luaL_error(L, M_GetText("Variable has no name!\n")); - if ((cvar->flags & CV_NOINIT) && !(cvar->flags & CV_CALL)) - return luaL_error(L, M_GetText("Variable %s has CV_NOINIT without CV_CALL\n"), cvar->name); - if ((cvar->flags & CV_CALL) && !cvar->func) - return luaL_error(L, M_GetText("Variable %s has CV_CALL without a function\n"), cvar->name); + if (!cvar->name || cvar->name[0] == '\0') + { + return luaL_error(L, M_GetText("Variable has no name!")); + } + if (!cvar->defaultvalue) + { + return luaL_error(L, M_GetText("Variable has no defaultvalue!")); + } + + if ((cvar->flags & CV_NOINIT) && !(cvar->flags & CV_CALL)) + { + return luaL_error(L, M_GetText("Variable %s has CV_NOINIT without CV_CALL"), cvar->name); + } + + if ((cvar->flags & CV_CALL) && !cvar->func) + { + return luaL_error(L, M_GetText("Variable %s has CV_CALL without a function"), cvar->name); + } + + cvar->flags |= CV_ALLOWLUA; // actually time to register it to the console now! Finally! cvar->flags |= CV_MODIFIED; CV_RegisterVar(cvar); + if (cvar->flags & CV_MODIFIED) + { return luaL_error(L, "failed to register cvar (probable conflict with internal variable/command names)"); + } // return cvar userdata return 1; @@ -432,8 +479,8 @@ static int CVarSetFunction ){ consvar_t *cvar = *(consvar_t **)luaL_checkudata(L, 1, META_CVAR); - if (cvar->flags & CV_NOLUA) - return luaL_error(L, "Variable %s cannot be set from Lua.", cvar->name); + if (!(cvar->flags & CV_ALLOWLUA)) + return luaL_error(L, "Variable '%s' cannot be set from Lua.", cvar->name); switch (lua_type(L, 2)) { @@ -464,7 +511,7 @@ static int lib_cvAddValue(lua_State *L) { consvar_t *cvar = *(consvar_t **)luaL_checkudata(L, 1, META_CVAR); - if (cvar->flags & CV_NOLUA) + if (!(cvar->flags & CV_ALLOWLUA)) return luaL_error(L, "Variable %s cannot be set from Lua.", cvar->name); CV_AddValue(cvar, (INT32)luaL_checknumber(L, 2)); @@ -519,27 +566,59 @@ static luaL_Reg lib[] = { {NULL, NULL} }; +enum cvar_e +{ + cvar_name, + cvar_defaultvalue, + cvar_flags, + cvar_value, + cvar_string, + cvar_changed, +}; + +static const char *const cvar_opt[] = { + "name", + "defaultvalue", + "flags", + "value", + "string", + "changed", + NULL, +}; + +static int cvar_fields_ref = LUA_NOREF; + static int cvar_get(lua_State *L) { consvar_t *cvar = *(consvar_t **)luaL_checkudata(L, 1, META_CVAR); - const char *field = luaL_checkstring(L, 2); + enum cvar_e field = Lua_optoption(L, 2, -1, cvar_fields_ref); - if(fastcmp(field,"name")) + switch (field) + { + case cvar_name: lua_pushstring(L, cvar->name); - else if(fastcmp(field,"defaultvalue")) + break; + case cvar_defaultvalue: lua_pushstring(L, cvar->defaultvalue); - else if(fastcmp(field,"flags")) + break; + case cvar_flags: lua_pushinteger(L, cvar->flags); - else if(fastcmp(field,"value")) + break; + case cvar_value: lua_pushinteger(L, cvar->value); - else if(fastcmp(field,"string")) + break; + case cvar_string: lua_pushstring(L, cvar->string); - else if(fastcmp(field,"changed")) + break; + case cvar_changed: lua_pushboolean(L, cvar->changed); - else if (devparm) - return luaL_error(L, LUA_QL("consvar_t") " has no field named " LUA_QS, field); - else - return 0; + break; + default: + if (devparm) + return luaL_error(L, LUA_QL("consvar_t") " has no field named " LUA_QS, field); + else + return 0; + } return 1; } @@ -551,6 +630,8 @@ int LUA_ConsoleLib(lua_State *L) lua_setfield(L, -2, "__index"); lua_pop(L,1); + cvar_fields_ref = Lua_CreateFieldTable(L, cvar_opt); + // Set empty registry tables lua_newtable(L); lua_setfield(L, LUA_REGISTRYINDEX, "COM_Command"); diff --git a/src/lua_hook.h b/src/lua_hook.h index 3a5ba3afd..cb0e30d87 100644 --- a/src/lua_hook.h +++ b/src/lua_hook.h @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 2012-2016 by John "JTE" Muniz. -// Copyright (C) 2012-2021 by Sonic Team Junior. +// Copyright (C) 2012-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -12,113 +12,140 @@ #include "r_defs.h" #include "d_player.h" +#include "s_sound.h" +#include "d_event.h" +#include "lua_hudlib_drawlist.h" -enum hook { - hook_NetVars=0, - hook_MapChange, - hook_MapLoad, - hook_PlayerJoin, - hook_PreThinkFrame, - hook_ThinkFrame, - hook_PostThinkFrame, - hook_MobjSpawn, - hook_MobjCollide, - hook_MobjLineCollide, - hook_MobjMoveCollide, - hook_TouchSpecial, - hook_MobjFuse, - hook_MobjThinker, - hook_BossThinker, - hook_ShouldDamage, - hook_MobjDamage, - hook_MobjDeath, - hook_BossDeath, - hook_MobjRemoved, - hook_JumpSpecial, - hook_AbilitySpecial, - hook_SpinSpecial, - hook_JumpSpinSpecial, - hook_BotTiccmd, - hook_BotAI, - hook_BotRespawn, - hook_LinedefExecute, - hook_PlayerMsg, - hook_HurtMsg, - hook_PlayerSpawn, - hook_ShieldSpawn, - hook_ShieldSpecial, - hook_MobjMoveBlocked, - hook_MapThingSpawn, - hook_FollowMobj, - hook_PlayerCanDamage, - hook_PlayerQuit, - hook_IntermissionThinker, - hook_TeamSwitch, - hook_ViewpointSwitch, - hook_SeenPlayer, - hook_PlayerThink, - hook_ShouldJingleContinue, - hook_GameQuit, - hook_PlayerCmd, - hook_MusicChange, - hook_PlayerHeight, - hook_PlayerCanEnterSpinGaps, +/* +Do you know what an 'X Macro' is? Such a macro is called over each element of +a list and expands the input. I use it for the hook lists because both an enum +and array of hook names need to be kept in order. The X Macro handles this +automatically. +*/ - hook_MAX // last hook -}; -extern const char *const hookNames[]; +#define MOBJ_HOOK_LIST(X) \ + X (MobjSpawn),/* P_SpawnMobj */\ + X (MobjCollide),/* PIT_CheckThing */\ + X (MobjLineCollide),/* ditto */\ + X (MobjMoveCollide),/* tritto */\ + X (TouchSpecial),/* P_TouchSpecialThing */\ + X (MobjFuse),/* when mobj->fuse runs out */\ + X (MobjThinker),/* P_MobjThinker, P_SceneryThinker */\ + X (BossThinker),/* P_GenericBossThinker */\ + X (ShouldDamage),/* P_DamageMobj (Should mobj take damage?) */\ + X (MobjDamage),/* P_DamageMobj (Mobj actually takes damage!) */\ + X (MobjDeath),/* P_KillMobj */\ + X (BossDeath),/* A_BossDeath */\ + X (MobjRemoved),/* P_RemoveMobj */\ + X (BotRespawn),/* B_CheckRespawn */\ + X (MobjMoveBlocked),/* P_XYMovement (when movement is blocked) */\ + X (MapThingSpawn),/* P_SpawnMapThing */\ + X (FollowMobj),/* P_PlayerAfterThink Smiles mobj-following */\ + X (HurtMsg),/* imhurttin */\ + +#define HOOK_LIST(X) \ + X (NetVars),/* add to archive table (netsave) */\ + X (MapChange),/* (before map load) */\ + X (MapLoad),\ + X (PlayerJoin),/* Got_AddPlayer */\ + X (PreThinkFrame)/* frame (before mobj and player thinkers) */,\ + X (ThinkFrame),/* frame (after mobj and player thinkers) */\ + X (PostThinkFrame),/* frame (at end of tick, ie after overlays, precipitation, specials) */\ + X (JumpSpecial),/* P_DoJumpStuff (Any-jumping) */\ + X (AbilitySpecial),/* P_DoJumpStuff (Double-jumping) */\ + X (SpinSpecial),/* P_DoSpinAbility (Spin button effect) */\ + X (JumpSpinSpecial),/* P_DoJumpStuff (Spin button effect (mid-air)) */\ + X (BotTiccmd),/* B_BuildTiccmd */\ + X (PlayerMsg),/* chat messages */\ + X (PlayerSpawn),/* G_SpawnPlayer */\ + X (ShieldSpawn),/* P_SpawnShieldOrb */\ + X (ShieldSpecial),/* shield abilities */\ + X (PlayerCanDamage),/* P_PlayerCanDamage */\ + X (PlayerQuit),\ + X (IntermissionThinker),/* Y_Ticker */\ + X (TeamSwitch),/* team switching in... uh... *what* speak, spit it the fuck out */\ + X (ViewpointSwitch),/* spy mode (no trickstabs) */\ + X (SeenPlayer),/* MT_NAMECHECK */\ + X (PlayerThink),/* P_PlayerThink */\ + X (GameQuit),\ + X (PlayerCmd),/* building the player's ticcmd struct (Ported from SRB2Kart) */\ + X (MusicChange),\ + X (PlayerHeight),/* override player height */\ + X (PlayerCanEnterSpinGaps),\ + X (KeyDown),\ + X (KeyUp),\ + +#define STRING_HOOK_LIST(X) \ + X (BotAI),/* B_BuildTailsTiccmd by skin name */\ + X (LinedefExecute),\ + X (ShouldJingleContinue),/* should jingle of the given music continue playing */\ + +#define HUD_HOOK_LIST(X) \ + X (game),\ + X (scores),/* emblems/multiplayer list */\ + X (title),/* titlescreen */\ + X (titlecard),\ + X (intermission),\ + +/* +I chose to access the hook enums through a macro as well. This could provide +a hint to lookup the macro's definition instead of the enum's definition. +(Since each enumeration is not defined in the source code, but by the list +macros above, it is not greppable.) The name passed to the macro can also be +grepped and found in the lists above. +*/ + +#define MOBJ_HOOK(name) mobjhook_ ## name +#define HOOK(name) hook_ ## name +#define HUD_HOOK(name) hudhook_ ## name +#define STRING_HOOK(name) stringhook_ ## name + +#define ENUM(X) enum { X ## _LIST (X) X(MAX) } + +ENUM (MOBJ_HOOK); +ENUM (HOOK); +ENUM (HUD_HOOK); +ENUM (STRING_HOOK); + +#undef ENUM + +/* dead simple, LUA_HOOK(GameQuit) */ +#define LUA_HOOK(type) LUA_HookVoid(HOOK(type)) +#define LUA_HUDHOOK(type,drawlist) LUA_HookHUD(HUD_HOOK(type),(drawlist)) extern boolean hook_cmd_running; -void LUAh_MapChange(INT16 mapnumber); // Hook for map change (before load) -void LUAh_MapLoad(void); // Hook for map load -void LUAh_PlayerJoin(int playernum); // Hook for Got_AddPlayer -void LUAh_PreThinkFrame(void); // Hook for frame (before mobj and player thinkers) -void LUAh_ThinkFrame(void); // Hook for frame (after mobj and player thinkers) -void LUAh_PostThinkFrame(void); // Hook for frame (at end of tick, ie after overlays, precipitation, specials) -boolean LUAh_MobjHook(mobj_t *mo, enum hook which); -boolean LUAh_PlayerHook(player_t *plr, enum hook which); -#define LUAh_MobjSpawn(mo) LUAh_MobjHook(mo, hook_MobjSpawn) // Hook for P_SpawnMobj by mobj type -UINT8 LUAh_MobjCollideHook(mobj_t *thing1, mobj_t *thing2, enum hook which); -UINT8 LUAh_MobjLineCollideHook(mobj_t *thing, line_t *line, enum hook which); -#define LUAh_MobjCollide(thing1, thing2) LUAh_MobjCollideHook(thing1, thing2, hook_MobjCollide) // Hook for PIT_CheckThing by (thing) mobj type -#define LUAh_MobjLineCollide(thing, line) LUAh_MobjLineCollideHook(thing, line, hook_MobjLineCollide) // Hook for PIT_CheckThing by (thing) mobj type -#define LUAh_MobjMoveCollide(thing1, thing2) LUAh_MobjCollideHook(thing1, thing2, hook_MobjMoveCollide) // Hook for PIT_CheckThing by (tmthing) mobj type -boolean LUAh_TouchSpecial(mobj_t *special, mobj_t *toucher); // Hook for P_TouchSpecialThing by mobj type -#define LUAh_MobjFuse(mo) LUAh_MobjHook(mo, hook_MobjFuse) // Hook for mobj->fuse == 0 by mobj type -boolean LUAh_MobjThinker(mobj_t *mo); // Hook for P_MobjThinker or P_SceneryThinker by mobj type -#define LUAh_BossThinker(mo) LUAh_MobjHook(mo, hook_BossThinker) // Hook for P_GenericBossThinker by mobj type -UINT8 LUAh_ShouldDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage, UINT8 damagetype); // Hook for P_DamageMobj by mobj type (Should mobj take damage?) -boolean LUAh_MobjDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage, UINT8 damagetype); // Hook for P_DamageMobj by mobj type (Mobj actually takes damage!) -boolean LUAh_MobjDeath(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damagetype); // Hook for P_KillMobj by mobj type -#define LUAh_BossDeath(mo) LUAh_MobjHook(mo, hook_BossDeath) // Hook for A_BossDeath by mobj type -#define LUAh_MobjRemoved(mo) LUAh_MobjHook(mo, hook_MobjRemoved) // Hook for P_RemoveMobj by mobj type -#define LUAh_JumpSpecial(player) LUAh_PlayerHook(player, hook_JumpSpecial) // Hook for P_DoJumpStuff (Any-jumping) -#define LUAh_AbilitySpecial(player) LUAh_PlayerHook(player, hook_AbilitySpecial) // Hook for P_DoJumpStuff (Double-jumping) -#define LUAh_SpinSpecial(player) LUAh_PlayerHook(player, hook_SpinSpecial) // Hook for P_DoSpinAbility (Spin button effect) -#define LUAh_JumpSpinSpecial(player) LUAh_PlayerHook(player, hook_JumpSpinSpecial) // Hook for P_DoJumpStuff (Spin button effect (mid-air)) -boolean LUAh_BotTiccmd(player_t *bot, ticcmd_t *cmd); // Hook for B_BuildTiccmd -boolean LUAh_BotAI(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd); // Hook for B_BuildTailsTiccmd by skin name -boolean LUAh_BotRespawn(mobj_t *sonic, mobj_t *tails); // Hook for B_CheckRespawn -boolean LUAh_LinedefExecute(line_t *line, mobj_t *mo, sector_t *sector); // Hook for linedef executors -boolean LUAh_PlayerMsg(int source, int target, int flags, char *msg); // Hook for chat messages -boolean LUAh_HurtMsg(player_t *player, mobj_t *inflictor, mobj_t *source, UINT8 damagetype); // Hook for hurt messages -#define LUAh_PlayerSpawn(player) LUAh_PlayerHook(player, hook_PlayerSpawn) // Hook for G_SpawnPlayer -#define LUAh_ShieldSpawn(player) LUAh_PlayerHook(player, hook_ShieldSpawn) // Hook for P_SpawnShieldOrb -#define LUAh_ShieldSpecial(player) LUAh_PlayerHook(player, hook_ShieldSpecial) // Hook for shield abilities -#define LUAh_MobjMoveBlocked(mo) LUAh_MobjHook(mo, hook_MobjMoveBlocked) // Hook for P_XYMovement (when movement is blocked) -boolean LUAh_MapThingSpawn(mobj_t *mo, mapthing_t *mthing); // Hook for P_SpawnMapThing by mobj type -boolean LUAh_FollowMobj(player_t *player, mobj_t *mobj); // Hook for P_PlayerAfterThink Smiles mobj-following -UINT8 LUAh_PlayerCanDamage(player_t *player, mobj_t *mobj); // Hook for P_PlayerCanDamage -void LUAh_PlayerQuit(player_t *plr, kickreason_t reason); // Hook for player quitting -void LUAh_IntermissionThinker(boolean stagefailed); // Hook for Y_Ticker -boolean LUAh_TeamSwitch(player_t *player, int newteam, boolean fromspectators, boolean tryingautobalance, boolean tryingscramble); // Hook for team switching in... uh.... -UINT8 LUAh_ViewpointSwitch(player_t *player, player_t *newdisplayplayer, boolean forced); // Hook for spy mode -boolean LUAh_SeenPlayer(player_t *player, player_t *seenfriend); // Hook for MT_NAMECHECK -#define LUAh_PlayerThink(player) LUAh_PlayerHook(player, hook_PlayerThink) // Hook for P_PlayerThink -boolean LUAh_ShouldJingleContinue(player_t *player, const char *musname); // Hook for whether a jingle of the given music should continue playing -void LUAh_GameQuit(boolean quitting); // Hook for game quitting -boolean LUAh_PlayerCmd(player_t *player, ticcmd_t *cmd); // Hook for building player's ticcmd struct (Ported from SRB2Kart) -boolean LUAh_MusicChange(const char *oldname, char *newname, UINT16 *mflags, boolean *looping, UINT32 *position, UINT32 *prefadems, UINT32 *fadeinms); // Hook for music changes -fixed_t LUAh_PlayerHeight(player_t *player); -UINT8 LUAh_PlayerCanEnterSpinGaps(player_t *player); +void LUA_HookVoid(int hook); +void LUA_HookHUD(int hook, huddrawlist_h drawlist); + +int LUA_HookMobj(mobj_t *, int hook); +int LUA_Hook2Mobj(mobj_t *, mobj_t *, int hook); +void LUA_HookInt(INT32 integer, int hook); +void LUA_HookBool(boolean value, int hook); +int LUA_HookPlayer(player_t *, int hook); +int LUA_HookTiccmd(player_t *, ticcmd_t *, int hook); +int LUA_HookKey(event_t *event, int hook); // Hooks for key events + +void LUA_HookThinkFrame(void); +int LUA_HookMobjLineCollide(mobj_t *, line_t *); +int LUA_HookTouchSpecial(mobj_t *special, mobj_t *toucher); +int LUA_HookShouldDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage, UINT8 damagetype); +int LUA_HookMobjDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage, UINT8 damagetype); +int LUA_HookMobjDeath(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damagetype); +int LUA_HookMobjMoveBlocked(mobj_t *, mobj_t *, line_t *); +int LUA_HookBotAI(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd); +void LUA_HookLinedefExecute(line_t *, mobj_t *, sector_t *); +int LUA_HookPlayerMsg(int source, int target, int flags, char *msg); +int LUA_HookHurtMsg(player_t *, mobj_t *inflictor, mobj_t *source, UINT8 damagetype); +int LUA_HookMapThingSpawn(mobj_t *, mapthing_t *); +int LUA_HookFollowMobj(player_t *, mobj_t *); +int LUA_HookPlayerCanDamage(player_t *, mobj_t *); +void LUA_HookPlayerQuit(player_t *, kickreason_t); +int LUA_HookTeamSwitch(player_t *, int newteam, boolean fromspectators, boolean tryingautobalance, boolean tryingscramble); +int LUA_HookViewpointSwitch(player_t *player, player_t *newdisplayplayer, boolean forced); +int LUA_HookSeenPlayer(player_t *player, player_t *seenfriend); +int LUA_HookShouldJingleContinue(player_t *, const char *musname); +int LUA_HookPlayerCmd(player_t *, ticcmd_t *); +int LUA_HookMusicChange(const char *oldname, struct MusicChange *); +fixed_t LUA_HookPlayerHeight(player_t *player); +int LUA_HookPlayerCanEnterSpinGaps(player_t *player); diff --git a/src/lua_hooklib.c b/src/lua_hooklib.c index 5dca0d7a0..039a9677f 100644 --- a/src/lua_hooklib.c +++ b/src/lua_hooklib.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 2012-2016 by John "JTE" Muniz. -// Copyright (C) 2012-2021 by Sonic Team Junior. +// Copyright (C) 2012-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -27,2040 +27,1158 @@ #include "d_netcmd.h" // for cv_perfstats #include "i_system.h" // I_GetPreciseTime -static UINT8 hooksAvailable[(hook_MAX/8)+1]; +/* ========================================================================= + ABSTRACTION + ========================================================================= */ -const char *const hookNames[hook_MAX+1] = { - "NetVars", - "MapChange", - "MapLoad", - "PlayerJoin", - "PreThinkFrame", - "ThinkFrame", - "PostThinkFrame", - "MobjSpawn", - "MobjCollide", - "MobjLineCollide", - "MobjMoveCollide", - "TouchSpecial", - "MobjFuse", - "MobjThinker", - "BossThinker", - "ShouldDamage", - "MobjDamage", - "MobjDeath", - "BossDeath", - "MobjRemoved", - "JumpSpecial", - "AbilitySpecial", - "SpinSpecial", - "JumpSpinSpecial", - "BotTiccmd", - "BotAI", - "BotRespawn", - "LinedefExecute", - "PlayerMsg", - "HurtMsg", - "PlayerSpawn", - "ShieldSpawn", - "ShieldSpecial", - "MobjMoveBlocked", - "MapThingSpawn", - "FollowMobj", - "PlayerCanDamage", - "PlayerQuit", - "IntermissionThinker", - "TeamSwitch", - "ViewpointSwitch", - "SeenPlayer", - "PlayerThink", - "ShouldJingleContinue", - "GameQuit", - "PlayerCmd", - "MusicChange", - "PlayerHeight", - "PlayerCanEnterSpinGaps", - NULL -}; +#define LIST(id, M) \ + static const char * const id [] = { M (TOSTR) NULL } -// Hook metadata -struct hook_s +LIST (mobjHookNames, MOBJ_HOOK_LIST); +LIST (hookNames, HOOK_LIST); +LIST (hudHookNames, HUD_HOOK_LIST); +LIST (stringHookNames, STRING_HOOK_LIST); + +#undef LIST + +typedef struct { + int numHooks; + int *ids; +} hook_t; + +typedef struct { + int numGeneric; + int ref; +} stringhook_t; + +static hook_t hookIds[HOOK(MAX)]; +static hook_t hudHookIds[HUD_HOOK(MAX)]; +static hook_t mobjHookIds[NUMMOBJTYPES][MOBJ_HOOK(MAX)]; + +// Lua tables are used to lookup string hook ids. +static stringhook_t stringHooks[STRING_HOOK(MAX)]; + +// This will be indexed by hook id, the value of which fetches the registry. +static int * hookRefs; +static int nextid; + +// After a hook errors once, don't print the error again. +static UINT8 * hooksErrored; + +static int errorRef; + +static boolean mobj_hook_available(int hook_type, mobjtype_t mobj_type) { - struct hook_s *next; - enum hook type; - UINT16 id; - union { - mobjtype_t mt; - char *str; - } s; - boolean error; -}; -typedef struct hook_s* hook_p; + return + ( + mobjHookIds [MT_NULL] [hook_type].numHooks > 0 || + (mobj_type < NUMMOBJTYPES && mobjHookIds[mobj_type][hook_type].numHooks > 0) + ); +} -#define FMT_HOOKID "hook_%d" +static int hook_in_list +( + const char * const name, + const char * const * const list +){ + int type; -// For each mobj type, a linked list to its thinker and collision hooks. -// That way, we don't have to iterate through all the hooks. -// We could do that with all other mobj hooks, but it would probably just be -// a waste of memory since they are only called occasionally. Probably... -static hook_p mobjthinkerhooks[NUMMOBJTYPES]; -static hook_p mobjcollidehooks[NUMMOBJTYPES]; + for (type = 0; list[type] != NULL; ++type) + { + if (strcmp(name, list[type]) == 0) + break; + } -// For each mobj type, a linked list for other mobj hooks -static hook_p mobjhooks[NUMMOBJTYPES]; + return type; +} -// A linked list for player hooks -static hook_p playerhooks; - -// A linked list for linedef executor hooks -static hook_p linedefexecutorhooks; - -// For other hooks, a unique linked list -hook_p roothook; - -static void PushHook(lua_State *L, hook_p hookp) +static void get_table(lua_State *L) { - lua_pushfstring(L, FMT_HOOKID, hookp->id); - lua_gettable(L, LUA_REGISTRYINDEX); + lua_pushvalue(L, -1); + lua_rawget(L, -3); + + if (lua_isnil(L, -1)) + { + lua_pop(L, 1); + lua_createtable(L, 1, 0); + lua_pushvalue(L, -2); + lua_pushvalue(L, -2); + lua_rawset(L, -5); + } + + lua_remove(L, -2); +} + +static void add_hook_to_table(lua_State *L, int n) +{ + lua_pushnumber(L, nextid); + lua_rawseti(L, -2, n); +} + +static void add_string_hook(lua_State *L, int type) +{ + stringhook_t * hook = &stringHooks[type]; + + char * string = NULL; + + switch (type) + { + case STRING_HOOK(BotAI): + case STRING_HOOK(ShouldJingleContinue): + if (lua_isstring(L, 3)) + { // lowercase copy + string = Z_StrDup(lua_tostring(L, 3)); + strlwr(string); + } + break; + + case STRING_HOOK(LinedefExecute): + string = Z_StrDup(luaL_checkstring(L, 3)); + strupr(string); + break; + } + + if (hook->ref > 0) + lua_getref(L, hook->ref); + else + { + lua_newtable(L); + lua_pushvalue(L, -1); + hook->ref = luaL_ref(L, LUA_REGISTRYINDEX); + } + + if (string) + { + lua_pushstring(L, string); + get_table(L); + add_hook_to_table(L, 1 + lua_objlen(L, -1)); + } + else + add_hook_to_table(L, ++hook->numGeneric); +} + +static void add_hook(hook_t *map) +{ + Z_Realloc(map->ids, (map->numHooks + 1) * sizeof *map->ids, + PU_STATIC, &map->ids); + map->ids[map->numHooks++] = nextid; +} + +static void add_mobj_hook(lua_State *L, int hook_type) +{ + mobjtype_t mobj_type = luaL_optnumber(L, 3, MT_NULL); + + luaL_argcheck(L, mobj_type < NUMMOBJTYPES, 3, "invalid mobjtype_t"); + + add_hook(&mobjHookIds[mobj_type][hook_type]); +} + +static void add_hud_hook(lua_State *L, int idx) +{ + add_hook(&hudHookIds[luaL_checkoption(L, + idx, "game", hudHookNames)]); +} + +static void add_hook_ref(lua_State *L, int idx) +{ + if (!(nextid & 7)) + { + Z_Realloc(hooksErrored, + BIT_ARRAY_SIZE (nextid + 1) * sizeof *hooksErrored, + PU_STATIC, &hooksErrored); + hooksErrored[nextid >> 3] = 0; + } + + Z_Realloc(hookRefs, (nextid + 1) * sizeof *hookRefs, PU_STATIC, &hookRefs); + + // set the hook function in the registry. + lua_pushvalue(L, idx); + hookRefs[nextid++] = luaL_ref(L, LUA_REGISTRYINDEX); } // Takes hook, function, and additional arguments (mobj type to act on, etc.) static int lib_addHook(lua_State *L) { - static struct hook_s hook = {NULL, 0, 0, {0}, false}; - static UINT32 nextid; - hook_p hookp, *lastp; - - hook.type = luaL_checkoption(L, 1, NULL, hookNames); - lua_remove(L, 1); - - luaL_checktype(L, 1, LUA_TFUNCTION); + const char * name; + int type; if (!lua_lumploading) return luaL_error(L, "This function cannot be called from within a hook or coroutine!"); - switch(hook.type) + name = luaL_checkstring(L, 1); + luaL_checktype(L, 2, LUA_TFUNCTION); + + /* this is a very special case */ + if (( type = hook_in_list(name, stringHookNames) ) < STRING_HOOK(MAX)) { - // Take a mobjtype enum which this hook is specifically for. - case hook_MobjSpawn: - case hook_MobjCollide: - case hook_MobjLineCollide: - case hook_MobjMoveCollide: - case hook_TouchSpecial: - case hook_MobjFuse: - case hook_MobjThinker: - case hook_BossThinker: - case hook_ShouldDamage: - case hook_MobjDamage: - case hook_MobjDeath: - case hook_BossDeath: - case hook_MobjRemoved: - case hook_HurtMsg: - case hook_MobjMoveBlocked: - case hook_MapThingSpawn: - case hook_FollowMobj: - hook.s.mt = MT_NULL; - if (lua_isnumber(L, 2)) - hook.s.mt = lua_tonumber(L, 2); - luaL_argcheck(L, hook.s.mt < NUMMOBJTYPES, 2, "invalid mobjtype_t"); - break; - case hook_BotAI: - case hook_ShouldJingleContinue: - hook.s.str = NULL; - if (lua_isstring(L, 2)) - { // lowercase copy - hook.s.str = Z_StrDup(lua_tostring(L, 2)); - strlwr(hook.s.str); - } - break; - case hook_LinedefExecute: // Linedef executor functions - hook.s.str = Z_StrDup(luaL_checkstring(L, 2)); - strupr(hook.s.str); - break; - default: - break; + add_string_hook(L, type); } - lua_settop(L, 1); // lua stack contains only the function now. - - hooksAvailable[hook.type/8] |= 1<<(hook.type%8); - - // set hook.id to the highest id + 1 - hook.id = nextid++; - - // Special cases for some hook types (see the comments above mobjthinkerhooks declaration) - switch(hook.type) + else if (( type = hook_in_list(name, mobjHookNames) ) < MOBJ_HOOK(MAX)) { - case hook_MobjThinker: - lastp = &mobjthinkerhooks[hook.s.mt]; - break; - case hook_MobjCollide: - case hook_MobjLineCollide: - case hook_MobjMoveCollide: - lastp = &mobjcollidehooks[hook.s.mt]; - break; - case hook_MobjSpawn: - case hook_TouchSpecial: - case hook_MobjFuse: - case hook_BossThinker: - case hook_ShouldDamage: - case hook_MobjDamage: - case hook_MobjDeath: - case hook_BossDeath: - case hook_MobjRemoved: - case hook_MobjMoveBlocked: - case hook_MapThingSpawn: - case hook_FollowMobj: - lastp = &mobjhooks[hook.s.mt]; - break; - case hook_JumpSpecial: - case hook_AbilitySpecial: - case hook_SpinSpecial: - case hook_JumpSpinSpecial: - case hook_PlayerSpawn: - case hook_PlayerCanDamage: - case hook_TeamSwitch: - case hook_ViewpointSwitch: - case hook_SeenPlayer: - case hook_ShieldSpawn: - case hook_ShieldSpecial: - case hook_PlayerThink: - case hook_PlayerHeight: - case hook_PlayerCanEnterSpinGaps: - lastp = &playerhooks; - break; - case hook_LinedefExecute: - lastp = &linedefexecutorhooks; - break; - default: - lastp = &roothook; - break; + add_mobj_hook(L, type); + } + else if (( type = hook_in_list(name, hookNames) ) < HOOK(MAX)) + { + add_hook(&hookIds[type]); + } + else if (strcmp(name, "HUD") == 0) + { + add_hud_hook(L, 3); + } + else + { + return luaL_argerror(L, 1, lua_pushfstring(L, "invalid hook " LUA_QS, name)); } - // iterate the hook metadata structs - // set lastp to the last hook struct's "next" pointer. - for (hookp = *lastp; hookp; hookp = hookp->next) - lastp = &hookp->next; - // allocate a permanent memory struct to stuff hook. - hookp = ZZ_Alloc(sizeof(struct hook_s)); - memcpy(hookp, &hook, sizeof(struct hook_s)); - // tack it onto the end of the linked list. - *lastp = hookp; + add_hook_ref(L, 2);/* the function */ - // set the hook function in the registry. - lua_pushfstring(L, FMT_HOOKID, hook.id); - lua_pushvalue(L, 1); - lua_settable(L, LUA_REGISTRYINDEX); return 0; } int LUA_HookLib(lua_State *L) { - memset(hooksAvailable,0,sizeof(UINT8[(hook_MAX/8)+1])); - roothook = NULL; + lua_pushcfunction(L, LUA_GetErrorMessage); + errorRef = luaL_ref(L, LUA_REGISTRYINDEX); + lua_register(L, "addHook", lib_addHook); + return 0; } -boolean LUAh_MobjHook(mobj_t *mo, enum hook which) +/* TODO: remove in next backwards incompatible release */ +int lib_hudadd(lua_State *L);/* yeah compiler */ +int lib_hudadd(lua_State *L) { - hook_p hookp; - boolean hooked = false; - if (!gL || !(hooksAvailable[which/8] & (1<<(which%8)))) - return false; + if (!lua_lumploading) + return luaL_error(L, "This function cannot be called from within a hook or coroutine!"); - I_Assert(mo->type < NUMMOBJTYPES); + luaL_checktype(L, 1, LUA_TFUNCTION); - if (!(mobjhooks[MT_NULL] || mobjhooks[mo->type])) - return false; + add_hud_hook(L, 2); + add_hook_ref(L, 1); + return 0; +} + +typedef struct Hook_State Hook_State; +typedef void (*Hook_Callback)(Hook_State *); + +struct Hook_State { + INT32 status;/* return status to calling function */ + void * userdata; + int hook_type; + mobjtype_t mobj_type;/* >0 if mobj hook */ + const char * string;/* used to fetch table, ran first if set */ + int top;/* index of last argument passed to hook */ + int id;/* id to fetch ref */ + int values;/* num arguments passed to hook */ + int results;/* num values returned by hook */ + Hook_Callback results_handler;/* callback when hook successfully returns */ +}; + +enum { + EINDEX = 1,/* error handler */ + SINDEX = 2,/* string itself is pushed in case of string hook */ +}; + +static void push_error_handler(void) +{ + lua_getref(gL, errorRef); +} + +/* repush hook string */ +static void push_string(void) +{ + lua_pushvalue(gL, SINDEX); +} + +static boolean begin_hook_values(Hook_State *hook) +{ + hook->top = lua_gettop(gL); + return true; +} + +static void start_hook_stack(void) +{ lua_settop(gL, 0); - lua_pushcfunction(gL, LUA_GetErrorMessage); + push_error_handler(); +} - // Look for all generic mobj hooks - for (hookp = mobjhooks[MT_NULL]; hookp; hookp = hookp->next) +static boolean init_hook_type +( + Hook_State * hook, + int status, + int hook_type, + mobjtype_t mobj_type, + const char * string, + int nonzero +){ + hook->status = status; + + if (nonzero) { - if (hookp->type != which) - continue; + start_hook_stack(); + hook->hook_type = hook_type; + hook->mobj_type = mobj_type; + hook->string = string; + return begin_hook_values(hook); + } + else + return false; +} - ps_lua_mobjhooks++; - if (lua_gettop(gL) == 1) - LUA_PushUserdata(gL, mo, META_MOBJ); - PushHook(gL, hookp); - lua_pushvalue(gL, -2); - if (lua_pcall(gL, 1, 1, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - continue; +static boolean prepare_hook +( + Hook_State * hook, + int default_status, + int hook_type +){ + return init_hook_type(hook, default_status, + hook_type, 0, NULL, + hookIds[hook_type].numHooks); +} + +static boolean prepare_mobj_hook +( + Hook_State * hook, + int default_status, + int hook_type, + mobj_t * primary_mobj +){ + const mobjtype_t mobj_type = + primary_mobj ? primary_mobj->type : NUMMOBJTYPES; + +#ifdef PARANOIA + if (mobj_type == MT_NULL) + I_Error("MT_NULL has been passed to a mobj hook\n"); +#endif + return init_hook_type(hook, default_status, + hook_type, mobj_type, NULL, + mobj_hook_available(hook_type, mobj_type)); +} + +static boolean prepare_string_hook +( + Hook_State * hook, + int default_status, + int hook_type, + const char * string +){ + if (init_hook_type(hook, default_status, + hook_type, 0, string, + stringHooks[hook_type].ref)) + { + lua_pushstring(gL, string); + return begin_hook_values(hook); + } + else + return false; +} + +static void init_hook_call +( + Hook_State * hook, + int results, + Hook_Callback results_handler +){ + const int top = lua_gettop(gL); + hook->values = (top - hook->top); + hook->top = top; + hook->results = results; + hook->results_handler = results_handler; +} + +static void get_hook(Hook_State *hook, const int *ids, int n) +{ + hook->id = ids[n]; + lua_getref(gL, hookRefs[hook->id]); +} + +static void get_hook_from_table(Hook_State *hook, int n) +{ + lua_rawgeti(gL, -1, n); + hook->id = lua_tonumber(gL, -1); + lua_pop(gL, 1); + lua_getref(gL, hookRefs[hook->id]); +} + +static int call_single_hook_no_copy(Hook_State *hook) +{ + if (lua_pcall(gL, hook->values, hook->results, EINDEX) == 0) + { + if (hook->results > 0) + { + (*hook->results_handler)(hook); + lua_pop(gL, hook->results); + } + } + else + { + /* print the error message once */ + if (cv_debug & DBG_LUA || !in_bit_array(hooksErrored, hook->id)) + { + CONS_Alert(CONS_WARNING, "%s\n", lua_tostring(gL, -1)); + set_bit_array(hooksErrored, hook->id); } - if (lua_toboolean(gL, -1)) - hooked = true; lua_pop(gL, 1); } - for (hookp = mobjhooks[mo->type]; hookp; hookp = hookp->next) - { - if (hookp->type != which) - continue; + return 1; +} - ps_lua_mobjhooks++; - if (lua_gettop(gL) == 1) - LUA_PushUserdata(gL, mo, META_MOBJ); - PushHook(gL, hookp); - lua_pushvalue(gL, -2); - if (lua_pcall(gL, 1, 1, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - continue; - } +static int call_single_hook(Hook_State *hook) +{ + int i; + + for (i = -(hook->values) + 1; i <= 0; ++i) + lua_pushvalue(gL, hook->top + i); + + return call_single_hook_no_copy(hook); +} + +static int call_hook_table_for(Hook_State *hook, int n) +{ + int k; + + for (k = 1; k <= n; ++k) + { + get_hook_from_table(hook, k); + call_single_hook(hook); + } + + return n; +} + +static int call_hook_table(Hook_State *hook) +{ + return call_hook_table_for(hook, lua_objlen(gL, -1)); +} + +static int call_mapped(Hook_State *hook, const hook_t *map) +{ + int k; + + for (k = 0; k < map->numHooks; ++k) + { + get_hook(hook, map->ids, k); + call_single_hook(hook); + } + + return map->numHooks; +} + +static int call_string_hooks(Hook_State *hook) +{ + const stringhook_t *map = &stringHooks[hook->hook_type]; + + int calls = 0; + + lua_getref(gL, map->ref); + + /* call generic string hooks first */ + calls += call_hook_table_for(hook, map->numGeneric); + + push_string(); + lua_rawget(gL, -2); + calls += call_hook_table(hook); + + return calls; +} + +static int call_mobj_type_hooks(Hook_State *hook, mobjtype_t mobj_type) +{ + return call_mapped(hook, &mobjHookIds[mobj_type][hook->hook_type]); +} + +static int call_hooks +( + Hook_State * hook, + int results, + Hook_Callback results_handler +){ + int calls = 0; + + init_hook_call(hook, results, results_handler); + + if (hook->string) + { + calls += call_string_hooks(hook); + } + else if (hook->mobj_type > 0) + { + /* call generic mobj hooks first */ + calls += call_mobj_type_hooks(hook, MT_NULL); + + if (hook->mobj_type < NUMMOBJTYPES) + calls += call_mobj_type_hooks(hook, hook->mobj_type); + + ps_lua_mobjhooks.value.i += calls; + } + else + calls += call_mapped(hook, &hookIds[hook->hook_type]); + + lua_settop(gL, 0); + + return calls; +} + +/* ========================================================================= + COMMON RESULT HANDLERS + ========================================================================= */ + +#define res_none NULL + +static void res_true(Hook_State *hook) +{ + if (lua_toboolean(gL, -1)) + hook->status = true; +} + +static void res_false(Hook_State *hook) +{ + if (!lua_isnil(gL, -1) && !lua_toboolean(gL, -1)) + hook->status = false; +} + +static void res_force(Hook_State *hook) +{ + if (!lua_isnil(gL, -1)) + { if (lua_toboolean(gL, -1)) - hooked = true; - lua_pop(gL, 1); + hook->status = 1; // Force yes + else + hook->status = 2; // Force no } - - lua_settop(gL, 0); - return hooked; } -boolean LUAh_PlayerHook(player_t *plr, enum hook which) +/* ========================================================================= + GENERALISED HOOKS + ========================================================================= */ + +int LUA_HookMobj(mobj_t *mobj, int hook_type) { - hook_p hookp; - boolean hooked = false; - if (!gL || !(hooksAvailable[which/8] & (1<<(which%8)))) - return false; - - lua_settop(gL, 0); - lua_pushcfunction(gL, LUA_GetErrorMessage); - - for (hookp = playerhooks; hookp; hookp = hookp->next) + Hook_State hook; + if (prepare_mobj_hook(&hook, false, hook_type, mobj)) { - if (hookp->type != which) - continue; - - ps_lua_mobjhooks++; - if (lua_gettop(gL) == 1) - LUA_PushUserdata(gL, plr, META_PLAYER); - PushHook(gL, hookp); - lua_pushvalue(gL, -2); - if (lua_pcall(gL, 1, 1, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - continue; - } - if (lua_toboolean(gL, -1)) - hooked = true; - lua_pop(gL, 1); + LUA_PushUserdata(gL, mobj, META_MOBJ); + call_hooks(&hook, 1, res_true); } - - lua_settop(gL, 0); - return hooked; + return hook.status; } -// Hook for map change (before load) -void LUAh_MapChange(INT16 mapnumber) +int LUA_Hook2Mobj(mobj_t *t1, mobj_t *t2, int hook_type) { - hook_p hookp; - if (!gL || !(hooksAvailable[hook_MapChange/8] & (1<<(hook_MapChange%8)))) - return; - - lua_settop(gL, 0); - lua_pushcfunction(gL, LUA_GetErrorMessage); - lua_pushinteger(gL, mapnumber); - - for (hookp = roothook; hookp; hookp = hookp->next) + Hook_State hook; + if (prepare_mobj_hook(&hook, 0, hook_type, t1)) { - if (hookp->type != hook_MapChange) - continue; - - PushHook(gL, hookp); - lua_pushvalue(gL, -2); - if (lua_pcall(gL, 1, 0, 1)) { - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - } + LUA_PushUserdata(gL, t1, META_MOBJ); + LUA_PushUserdata(gL, t2, META_MOBJ); + call_hooks(&hook, 1, res_force); } - - lua_settop(gL, 0); + return hook.status; } -// Hook for map load -void LUAh_MapLoad(void) +void LUA_HookVoid(int type) { - hook_p hookp; - if (!gL || !(hooksAvailable[hook_MapLoad/8] & (1<<(hook_MapLoad%8)))) - return; + Hook_State hook; + if (prepare_hook(&hook, 0, type)) + call_hooks(&hook, 0, res_none); +} - lua_settop(gL, 0); - lua_pushcfunction(gL, LUA_GetErrorMessage); - lua_pushinteger(gL, gamemap); - - for (hookp = roothook; hookp; hookp = hookp->next) +void LUA_HookInt(INT32 number, int hook_type) +{ + Hook_State hook; + if (prepare_hook(&hook, 0, hook_type)) { - if (hookp->type != hook_MapLoad) - continue; - - PushHook(gL, hookp); - lua_pushvalue(gL, -2); - if (lua_pcall(gL, 1, 0, 1)) { - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - } + lua_pushinteger(gL, number); + call_hooks(&hook, 0, res_none); } - - lua_settop(gL, 0); } -// Hook for Got_AddPlayer -void LUAh_PlayerJoin(int playernum) +void LUA_HookBool(boolean value, int hook_type) { - hook_p hookp; - if (!gL || !(hooksAvailable[hook_PlayerJoin/8] & (1<<(hook_PlayerJoin%8)))) - return; - - lua_settop(gL, 0); - lua_pushcfunction(gL, LUA_GetErrorMessage); - lua_pushinteger(gL, playernum); - - for (hookp = roothook; hookp; hookp = hookp->next) + Hook_State hook; + if (prepare_hook(&hook, 0, hook_type)) { - if (hookp->type != hook_PlayerJoin) - continue; - - PushHook(gL, hookp); - lua_pushvalue(gL, -2); - if (lua_pcall(gL, 1, 0, 1)) { - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - } + lua_pushboolean(gL, value); + call_hooks(&hook, 0, res_none); } - - lua_settop(gL, 0); } -// Hook for frame (before mobj and player thinkers) -void LUAh_PreThinkFrame(void) +int LUA_HookPlayer(player_t *player, int hook_type) { - hook_p hookp; - if (!gL || !(hooksAvailable[hook_PreThinkFrame/8] & (1<<(hook_PreThinkFrame%8)))) - return; - - lua_pushcfunction(gL, LUA_GetErrorMessage); - - for (hookp = roothook; hookp; hookp = hookp->next) + Hook_State hook; + if (prepare_hook(&hook, false, hook_type)) { - if (hookp->type != hook_PreThinkFrame) - continue; - - PushHook(gL, hookp); - if (lua_pcall(gL, 0, 0, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - } + LUA_PushUserdata(gL, player, META_PLAYER); + call_hooks(&hook, 1, res_true); } - - lua_pop(gL, 1); // Pop error handler + return hook.status; } -// Hook for frame (after mobj and player thinkers) -void LUAh_ThinkFrame(void) +int LUA_HookTiccmd(player_t *player, ticcmd_t *cmd, int hook_type) { - hook_p hookp; + Hook_State hook; + if (prepare_hook(&hook, false, hook_type)) + { + LUA_PushUserdata(gL, player, META_PLAYER); + LUA_PushUserdata(gL, cmd, META_TICCMD); + + if (hook_type == HOOK(PlayerCmd)) + hook_cmd_running = true; + + call_hooks(&hook, 1, res_true); + + if (hook_type == HOOK(PlayerCmd)) + hook_cmd_running = false; + } + return hook.status; +} + +int LUA_HookKey(event_t *event, int hook_type) +{ + Hook_State hook; + if (prepare_hook(&hook, false, hook_type)) + { + LUA_PushUserdata(gL, event, META_KEYEVENT); + call_hooks(&hook, 1, res_true); + } + return hook.status; +} + +void LUA_HookHUD(int hook_type, huddrawlist_h list) +{ + const hook_t * map = &hudHookIds[hook_type]; + Hook_State hook; + if (map->numHooks > 0) + { + start_hook_stack(); + begin_hook_values(&hook); + + LUA_SetHudHook(hook_type, list); + + hud_running = true; // local hook + init_hook_call(&hook, 0, res_none); + call_mapped(&hook, map); + hud_running = false; + + lua_pushnil(gL); + lua_setfield(gL, LUA_REGISTRYINDEX, "HUD_DRAW_LIST"); + } +} + +/* ========================================================================= + SPECIALIZED HOOKS + ========================================================================= */ + +void LUA_HookThinkFrame(void) +{ + const int type = HOOK(ThinkFrame); + // variables used by perf stats int hook_index = 0; precise_t time_taken = 0; - if (!gL || !(hooksAvailable[hook_ThinkFrame/8] & (1<<(hook_ThinkFrame%8)))) - return; - lua_pushcfunction(gL, LUA_GetErrorMessage); + Hook_State hook; - for (hookp = roothook; hookp; hookp = hookp->next) + const hook_t * map = &hookIds[type]; + int k; + + if (prepare_hook(&hook, 0, type)) { - if (hookp->type != hook_ThinkFrame) - continue; + init_hook_call(&hook, 0, res_none); - if (cv_perfstats.value == 3) - time_taken = I_GetPreciseTime(); - PushHook(gL, hookp); - if (lua_pcall(gL, 0, 0, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - } - if (cv_perfstats.value == 3) + for (k = 0; k < map->numHooks; ++k) { - lua_Debug ar; - time_taken = I_GetPreciseTime() - time_taken; - // we need the function, let's just retrieve it again - PushHook(gL, hookp); - lua_getinfo(gL, ">S", &ar); - PS_SetThinkFrameHookInfo(hook_index, time_taken, ar.short_src); - hook_index++; - } - } + get_hook(&hook, map->ids, k); - lua_pop(gL, 1); // Pop error handler -} - -// Hook for frame (at end of tick, ie after overlays, precipitation, specials) -void LUAh_PostThinkFrame(void) -{ - hook_p hookp; - if (!gL || !(hooksAvailable[hook_PostThinkFrame/8] & (1<<(hook_PostThinkFrame%8)))) - return; - - lua_pushcfunction(gL, LUA_GetErrorMessage); - - for (hookp = roothook; hookp; hookp = hookp->next) - { - if (hookp->type != hook_PostThinkFrame) - continue; - - PushHook(gL, hookp); - if (lua_pcall(gL, 0, 0, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - } - } - - lua_pop(gL, 1); // Pop error handler -} - -// Hook for mobj collisions -UINT8 LUAh_MobjCollideHook(mobj_t *thing1, mobj_t *thing2, enum hook which) -{ - hook_p hookp; - UINT8 shouldCollide = 0; // 0 = default, 1 = force yes, 2 = force no. - if (!gL || !(hooksAvailable[which/8] & (1<<(which%8)))) - return 0; - - I_Assert(thing1->type < NUMMOBJTYPES); - - if (!(mobjcollidehooks[MT_NULL] || mobjcollidehooks[thing1->type])) - return 0; - - lua_settop(gL, 0); - lua_pushcfunction(gL, LUA_GetErrorMessage); - - // Look for all generic mobj collision hooks - for (hookp = mobjcollidehooks[MT_NULL]; hookp; hookp = hookp->next) - { - if (hookp->type != which) - continue; - - ps_lua_mobjhooks++; - if (lua_gettop(gL) == 1) - { - LUA_PushUserdata(gL, thing1, META_MOBJ); - LUA_PushUserdata(gL, thing2, META_MOBJ); - } - PushHook(gL, hookp); - lua_pushvalue(gL, -3); - lua_pushvalue(gL, -3); - if (lua_pcall(gL, 2, 1, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - continue; - } - if (!lua_isnil(gL, -1)) - { // if nil, leave shouldCollide = 0. - if (lua_toboolean(gL, -1)) - shouldCollide = 1; // Force yes - else - shouldCollide = 2; // Force no - } - lua_pop(gL, 1); - } - - for (hookp = mobjcollidehooks[thing1->type]; hookp; hookp = hookp->next) - { - if (hookp->type != which) - continue; - - ps_lua_mobjhooks++; - if (lua_gettop(gL) == 1) - { - LUA_PushUserdata(gL, thing1, META_MOBJ); - LUA_PushUserdata(gL, thing2, META_MOBJ); - } - PushHook(gL, hookp); - lua_pushvalue(gL, -3); - lua_pushvalue(gL, -3); - if (lua_pcall(gL, 2, 1, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - continue; - } - if (!lua_isnil(gL, -1)) - { // if nil, leave shouldCollide = 0. - if (lua_toboolean(gL, -1)) - shouldCollide = 1; // Force yes - else - shouldCollide = 2; // Force no - } - lua_pop(gL, 1); - } - - lua_settop(gL, 0); - return shouldCollide; -} - -UINT8 LUAh_MobjLineCollideHook(mobj_t *thing, line_t *line, enum hook which) -{ - hook_p hookp; - UINT8 shouldCollide = 0; // 0 = default, 1 = force yes, 2 = force no. - if (!gL || !(hooksAvailable[which/8] & (1<<(which%8)))) - return 0; - - I_Assert(thing->type < NUMMOBJTYPES); - - if (!(mobjcollidehooks[MT_NULL] || mobjcollidehooks[thing->type])) - return 0; - - lua_settop(gL, 0); - lua_pushcfunction(gL, LUA_GetErrorMessage); - - // Look for all generic mobj collision hooks - for (hookp = mobjcollidehooks[MT_NULL]; hookp; hookp = hookp->next) - { - if (hookp->type != which) - continue; - - ps_lua_mobjhooks++; - if (lua_gettop(gL) == 1) - { - LUA_PushUserdata(gL, thing, META_MOBJ); - LUA_PushUserdata(gL, line, META_LINE); - } - PushHook(gL, hookp); - lua_pushvalue(gL, -3); - lua_pushvalue(gL, -3); - if (lua_pcall(gL, 2, 1, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - continue; - } - if (!lua_isnil(gL, -1)) - { // if nil, leave shouldCollide = 0. - if (lua_toboolean(gL, -1)) - shouldCollide = 1; // Force yes - else - shouldCollide = 2; // Force no - } - lua_pop(gL, 1); - } - - for (hookp = mobjcollidehooks[thing->type]; hookp; hookp = hookp->next) - { - if (hookp->type != which) - continue; - - ps_lua_mobjhooks++; - if (lua_gettop(gL) == 1) - { - LUA_PushUserdata(gL, thing, META_MOBJ); - LUA_PushUserdata(gL, line, META_LINE); - } - PushHook(gL, hookp); - lua_pushvalue(gL, -3); - lua_pushvalue(gL, -3); - if (lua_pcall(gL, 2, 1, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - continue; - } - if (!lua_isnil(gL, -1)) - { // if nil, leave shouldCollide = 0. - if (lua_toboolean(gL, -1)) - shouldCollide = 1; // Force yes - else - shouldCollide = 2; // Force no - } - lua_pop(gL, 1); - } - - lua_settop(gL, 0); - return shouldCollide; -} - -// Hook for mobj thinkers -boolean LUAh_MobjThinker(mobj_t *mo) -{ - hook_p hookp; - boolean hooked = false; - if (!gL || !(hooksAvailable[hook_MobjThinker/8] & (1<<(hook_MobjThinker%8)))) - return false; - - I_Assert(mo->type < NUMMOBJTYPES); - - if (!(mobjthinkerhooks[MT_NULL] || mobjthinkerhooks[mo->type])) - return false; - - lua_settop(gL, 0); - lua_pushcfunction(gL, LUA_GetErrorMessage); - - // Look for all generic mobj thinker hooks - for (hookp = mobjthinkerhooks[MT_NULL]; hookp; hookp = hookp->next) - { - ps_lua_mobjhooks++; - if (lua_gettop(gL) == 1) - LUA_PushUserdata(gL, mo, META_MOBJ); - PushHook(gL, hookp); - lua_pushvalue(gL, -2); - if (lua_pcall(gL, 1, 1, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - continue; - } - if (lua_toboolean(gL, -1)) - hooked = true; - lua_pop(gL, 1); - } - - for (hookp = mobjthinkerhooks[mo->type]; hookp; hookp = hookp->next) - { - ps_lua_mobjhooks++; - if (lua_gettop(gL) == 1) - LUA_PushUserdata(gL, mo, META_MOBJ); - PushHook(gL, hookp); - lua_pushvalue(gL, -2); - if (lua_pcall(gL, 1, 1, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - continue; - } - if (lua_toboolean(gL, -1)) - hooked = true; - lua_pop(gL, 1); - } - - lua_settop(gL, 0); - return hooked; -} - -// Hook for P_TouchSpecialThing by mobj type -boolean LUAh_TouchSpecial(mobj_t *special, mobj_t *toucher) -{ - hook_p hookp; - boolean hooked = false; - if (!gL || !(hooksAvailable[hook_TouchSpecial/8] & (1<<(hook_TouchSpecial%8)))) - return false; - - I_Assert(special->type < NUMMOBJTYPES); - - if (!(mobjhooks[MT_NULL] || mobjhooks[special->type])) - return false; - - lua_settop(gL, 0); - lua_pushcfunction(gL, LUA_GetErrorMessage); - - // Look for all generic touch special hooks - for (hookp = mobjhooks[MT_NULL]; hookp; hookp = hookp->next) - { - if (hookp->type != hook_TouchSpecial) - continue; - - ps_lua_mobjhooks++; - if (lua_gettop(gL) == 1) - { - LUA_PushUserdata(gL, special, META_MOBJ); - LUA_PushUserdata(gL, toucher, META_MOBJ); - } - PushHook(gL, hookp); - lua_pushvalue(gL, -3); - lua_pushvalue(gL, -3); - if (lua_pcall(gL, 2, 1, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - continue; - } - if (lua_toboolean(gL, -1)) - hooked = true; - lua_pop(gL, 1); - } - - for (hookp = mobjhooks[special->type]; hookp; hookp = hookp->next) - { - if (hookp->type != hook_TouchSpecial) - continue; - - ps_lua_mobjhooks++; - if (lua_gettop(gL) == 1) - { - LUA_PushUserdata(gL, special, META_MOBJ); - LUA_PushUserdata(gL, toucher, META_MOBJ); - } - PushHook(gL, hookp); - lua_pushvalue(gL, -3); - lua_pushvalue(gL, -3); - if (lua_pcall(gL, 2, 1, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - continue; - } - if (lua_toboolean(gL, -1)) - hooked = true; - lua_pop(gL, 1); - } - - lua_settop(gL, 0); - return hooked; -} - -// Hook for P_DamageMobj by mobj type (Should mobj take damage?) -UINT8 LUAh_ShouldDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage, UINT8 damagetype) -{ - hook_p hookp; - UINT8 shouldDamage = 0; // 0 = default, 1 = force yes, 2 = force no. - if (!gL || !(hooksAvailable[hook_ShouldDamage/8] & (1<<(hook_ShouldDamage%8)))) - return 0; - - I_Assert(target->type < NUMMOBJTYPES); - - if (!(mobjhooks[MT_NULL] || mobjhooks[target->type])) - return 0; - - lua_settop(gL, 0); - lua_pushcfunction(gL, LUA_GetErrorMessage); - - // Look for all generic should damage hooks - for (hookp = mobjhooks[MT_NULL]; hookp; hookp = hookp->next) - { - if (hookp->type != hook_ShouldDamage) - continue; - - ps_lua_mobjhooks++; - if (lua_gettop(gL) == 1) - { - LUA_PushUserdata(gL, target, META_MOBJ); - LUA_PushUserdata(gL, inflictor, META_MOBJ); - LUA_PushUserdata(gL, source, META_MOBJ); - lua_pushinteger(gL, damage); - lua_pushinteger(gL, damagetype); - } - PushHook(gL, hookp); - lua_pushvalue(gL, -6); - lua_pushvalue(gL, -6); - lua_pushvalue(gL, -6); - lua_pushvalue(gL, -6); - lua_pushvalue(gL, -6); - if (lua_pcall(gL, 5, 1, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - continue; - } - if (!lua_isnil(gL, -1)) - { - if (lua_toboolean(gL, -1)) - shouldDamage = 1; // Force yes - else - shouldDamage = 2; // Force no - } - lua_pop(gL, 1); - } - - for (hookp = mobjhooks[target->type]; hookp; hookp = hookp->next) - { - if (hookp->type != hook_ShouldDamage) - continue; - ps_lua_mobjhooks++; - if (lua_gettop(gL) == 1) - { - LUA_PushUserdata(gL, target, META_MOBJ); - LUA_PushUserdata(gL, inflictor, META_MOBJ); - LUA_PushUserdata(gL, source, META_MOBJ); - lua_pushinteger(gL, damage); - lua_pushinteger(gL, damagetype); - } - PushHook(gL, hookp); - lua_pushvalue(gL, -6); - lua_pushvalue(gL, -6); - lua_pushvalue(gL, -6); - lua_pushvalue(gL, -6); - lua_pushvalue(gL, -6); - if (lua_pcall(gL, 5, 1, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - continue; - } - if (!lua_isnil(gL, -1)) - { - if (lua_toboolean(gL, -1)) - shouldDamage = 1; // Force yes - else - shouldDamage = 2; // Force no - } - lua_pop(gL, 1); - } - - lua_settop(gL, 0); - return shouldDamage; -} - -// Hook for P_DamageMobj by mobj type (Mobj actually takes damage!) -boolean LUAh_MobjDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage, UINT8 damagetype) -{ - hook_p hookp; - boolean hooked = false; - if (!gL || !(hooksAvailable[hook_MobjDamage/8] & (1<<(hook_MobjDamage%8)))) - return false; - - I_Assert(target->type < NUMMOBJTYPES); - - if (!(mobjhooks[MT_NULL] || mobjhooks[target->type])) - return false; - - lua_settop(gL, 0); - lua_pushcfunction(gL, LUA_GetErrorMessage); - - // Look for all generic mobj damage hooks - for (hookp = mobjhooks[MT_NULL]; hookp; hookp = hookp->next) - { - if (hookp->type != hook_MobjDamage) - continue; - - ps_lua_mobjhooks++; - if (lua_gettop(gL) == 1) - { - LUA_PushUserdata(gL, target, META_MOBJ); - LUA_PushUserdata(gL, inflictor, META_MOBJ); - LUA_PushUserdata(gL, source, META_MOBJ); - lua_pushinteger(gL, damage); - lua_pushinteger(gL, damagetype); - } - PushHook(gL, hookp); - lua_pushvalue(gL, -6); - lua_pushvalue(gL, -6); - lua_pushvalue(gL, -6); - lua_pushvalue(gL, -6); - lua_pushvalue(gL, -6); - if (lua_pcall(gL, 5, 1, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - continue; - } - if (lua_toboolean(gL, -1)) - hooked = true; - lua_pop(gL, 1); - } - - for (hookp = mobjhooks[target->type]; hookp; hookp = hookp->next) - { - if (hookp->type != hook_MobjDamage) - continue; - - ps_lua_mobjhooks++; - if (lua_gettop(gL) == 1) - { - LUA_PushUserdata(gL, target, META_MOBJ); - LUA_PushUserdata(gL, inflictor, META_MOBJ); - LUA_PushUserdata(gL, source, META_MOBJ); - lua_pushinteger(gL, damage); - lua_pushinteger(gL, damagetype); - } - PushHook(gL, hookp); - lua_pushvalue(gL, -6); - lua_pushvalue(gL, -6); - lua_pushvalue(gL, -6); - lua_pushvalue(gL, -6); - lua_pushvalue(gL, -6); - if (lua_pcall(gL, 5, 1, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - continue; - } - if (lua_toboolean(gL, -1)) - hooked = true; - lua_pop(gL, 1); - } - - lua_settop(gL, 0); - return hooked; -} - -// Hook for P_KillMobj by mobj type -boolean LUAh_MobjDeath(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damagetype) -{ - hook_p hookp; - boolean hooked = false; - if (!gL || !(hooksAvailable[hook_MobjDeath/8] & (1<<(hook_MobjDeath%8)))) - return false; - - I_Assert(target->type < NUMMOBJTYPES); - - if (!(mobjhooks[MT_NULL] || mobjhooks[target->type])) - return false; - - lua_settop(gL, 0); - lua_pushcfunction(gL, LUA_GetErrorMessage); - - // Look for all generic mobj death hooks - for (hookp = mobjhooks[MT_NULL]; hookp; hookp = hookp->next) - { - if (hookp->type != hook_MobjDeath) - continue; - - ps_lua_mobjhooks++; - if (lua_gettop(gL) == 1) - { - LUA_PushUserdata(gL, target, META_MOBJ); - LUA_PushUserdata(gL, inflictor, META_MOBJ); - LUA_PushUserdata(gL, source, META_MOBJ); - lua_pushinteger(gL, damagetype); - } - PushHook(gL, hookp); - lua_pushvalue(gL, -5); - lua_pushvalue(gL, -5); - lua_pushvalue(gL, -5); - lua_pushvalue(gL, -5); - if (lua_pcall(gL, 4, 1, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - continue; - } - if (lua_toboolean(gL, -1)) - hooked = true; - lua_pop(gL, 1); - } - - for (hookp = mobjhooks[target->type]; hookp; hookp = hookp->next) - { - if (hookp->type != hook_MobjDeath) - continue; - - ps_lua_mobjhooks++; - if (lua_gettop(gL) == 1) - { - LUA_PushUserdata(gL, target, META_MOBJ); - LUA_PushUserdata(gL, inflictor, META_MOBJ); - LUA_PushUserdata(gL, source, META_MOBJ); - lua_pushinteger(gL, damagetype); - } - PushHook(gL, hookp); - lua_pushvalue(gL, -5); - lua_pushvalue(gL, -5); - lua_pushvalue(gL, -5); - lua_pushvalue(gL, -5); - if (lua_pcall(gL, 4, 1, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - continue; - } - if (lua_toboolean(gL, -1)) - hooked = true; - lua_pop(gL, 1); - } - - lua_settop(gL, 0); - return hooked; -} - -// Hook for B_BuildTiccmd -boolean LUAh_BotTiccmd(player_t *bot, ticcmd_t *cmd) -{ - hook_p hookp; - boolean hooked = false; - if (!gL || !(hooksAvailable[hook_BotTiccmd/8] & (1<<(hook_BotTiccmd%8)))) - return false; - - lua_settop(gL, 0); - lua_pushcfunction(gL, LUA_GetErrorMessage); - - for (hookp = roothook; hookp; hookp = hookp->next) - { - if (hookp->type != hook_BotTiccmd) - continue; - - if (lua_gettop(gL) == 1) - { - LUA_PushUserdata(gL, bot, META_PLAYER); - LUA_PushUserdata(gL, cmd, META_TICCMD); - } - PushHook(gL, hookp); - lua_pushvalue(gL, -3); - lua_pushvalue(gL, -3); - if (lua_pcall(gL, 2, 1, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - continue; - } - if (lua_toboolean(gL, -1)) - hooked = true; - lua_pop(gL, 1); - } - - lua_settop(gL, 0); - return hooked; -} - -// Hook for B_BuildTailsTiccmd by skin name -boolean LUAh_BotAI(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd) -{ - hook_p hookp; - boolean hooked = false; - if (!gL || !(hooksAvailable[hook_BotAI/8] & (1<<(hook_BotAI%8)))) - return false; - - lua_settop(gL, 0); - lua_pushcfunction(gL, LUA_GetErrorMessage); - - for (hookp = roothook; hookp; hookp = hookp->next) - { - if (hookp->type != hook_BotAI - || (hookp->s.str && strcmp(hookp->s.str, ((skin_t*)tails->skin)->name))) - continue; - - if (lua_gettop(gL) == 1) - { - LUA_PushUserdata(gL, sonic, META_MOBJ); - LUA_PushUserdata(gL, tails, META_MOBJ); - } - PushHook(gL, hookp); - lua_pushvalue(gL, -3); - lua_pushvalue(gL, -3); - if (lua_pcall(gL, 2, 8, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - continue; - } - - // This turns forward, backward, left, right, jump, and spin into a proper ticcmd for tails. - if (lua_istable(gL, 2+1)) { - boolean forward=false, backward=false, left=false, right=false, strafeleft=false, straferight=false, jump=false, spin=false; -#define CHECKFIELD(field) \ - lua_getfield(gL, 2+1, #field);\ - if (lua_toboolean(gL, -1))\ - field = true;\ - lua_pop(gL, 1); - - CHECKFIELD(forward) - CHECKFIELD(backward) - CHECKFIELD(left) - CHECKFIELD(right) - CHECKFIELD(strafeleft) - CHECKFIELD(straferight) - CHECKFIELD(jump) - CHECKFIELD(spin) -#undef CHECKFIELD - B_KeysToTiccmd(tails, cmd, forward, backward, left, right, strafeleft, straferight, jump, spin); - } else - B_KeysToTiccmd(tails, cmd, lua_toboolean(gL, 2+1), lua_toboolean(gL, 2+2), lua_toboolean(gL, 2+3), lua_toboolean(gL, 2+4), lua_toboolean(gL, 2+5), lua_toboolean(gL, 2+6), lua_toboolean(gL, 2+7), lua_toboolean(gL, 2+8)); - - lua_pop(gL, 8); - hooked = true; - } - - lua_settop(gL, 0); - return hooked; -} - -// Hook for B_CheckRespawn -boolean LUAh_BotRespawn(mobj_t *sonic, mobj_t *tails) -{ - hook_p hookp; - UINT8 shouldRespawn = 0; // 0 = default, 1 = force yes, 2 = force no. - if (!gL || !(hooksAvailable[hook_BotRespawn/8] & (1<<(hook_BotRespawn%8)))) - return false; - - lua_settop(gL, 0); - lua_pushcfunction(gL, LUA_GetErrorMessage); - - for (hookp = roothook; hookp; hookp = hookp->next) - { - if (hookp->type != hook_BotRespawn) - continue; - - if (lua_gettop(gL) == 1) - { - LUA_PushUserdata(gL, sonic, META_MOBJ); - LUA_PushUserdata(gL, tails, META_MOBJ); - } - PushHook(gL, hookp); - lua_pushvalue(gL, -3); - lua_pushvalue(gL, -3); - if (lua_pcall(gL, 2, 1, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - continue; - } - if (!lua_isnil(gL, -1)) - { - if (lua_toboolean(gL, -1)) - shouldRespawn = 1; // Force yes - else - shouldRespawn = 2; // Force no - } - lua_pop(gL, 1); - } - - lua_settop(gL, 0); - return shouldRespawn; -} - -// Hook for linedef executors -boolean LUAh_LinedefExecute(line_t *line, mobj_t *mo, sector_t *sector) -{ - hook_p hookp; - boolean hooked = false; - if (!gL || !(hooksAvailable[hook_LinedefExecute/8] & (1<<(hook_LinedefExecute%8)))) - return 0; - - lua_settop(gL, 0); - lua_pushcfunction(gL, LUA_GetErrorMessage); - - for (hookp = linedefexecutorhooks; hookp; hookp = hookp->next) - { - if (strcmp(hookp->s.str, line->stringargs[0])) - continue; - - ps_lua_mobjhooks++; - if (lua_gettop(gL) == 1) - { - LUA_PushUserdata(gL, line, META_LINE); - LUA_PushUserdata(gL, mo, META_MOBJ); - LUA_PushUserdata(gL, sector, META_SECTOR); - } - PushHook(gL, hookp); - lua_pushvalue(gL, -4); - lua_pushvalue(gL, -4); - lua_pushvalue(gL, -4); - if (lua_pcall(gL, 3, 0, 1)) { - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - } - hooked = true; - } - - lua_settop(gL, 0); - return hooked; -} - - -boolean LUAh_PlayerMsg(int source, int target, int flags, char *msg) -{ - hook_p hookp; - boolean hooked = false; - if (!gL || !(hooksAvailable[hook_PlayerMsg/8] & (1<<(hook_PlayerMsg%8)))) - return false; - - lua_settop(gL, 0); - lua_pushcfunction(gL, LUA_GetErrorMessage); - - for (hookp = roothook; hookp; hookp = hookp->next) - { - if (hookp->type != hook_PlayerMsg) - continue; - - if (lua_gettop(gL) == 1) - { - LUA_PushUserdata(gL, &players[source], META_PLAYER); // Source player - if (flags & 2 /*HU_CSAY*/) { // csay TODO: make HU_CSAY accessible outside hu_stuff.c - lua_pushinteger(gL, 3); // type - lua_pushnil(gL); // target - } else if (target == -1) { // sayteam - lua_pushinteger(gL, 1); // type - lua_pushnil(gL); // target - } else if (target == 0) { // say - lua_pushinteger(gL, 0); // type - lua_pushnil(gL); // target - } else { // sayto - lua_pushinteger(gL, 2); // type - LUA_PushUserdata(gL, &players[target-1], META_PLAYER); // target + if (cv_perfstats.value == 3) + { + lua_pushvalue(gL, -1);/* need the function again */ + time_taken = I_GetPreciseTime(); } - lua_pushstring(gL, msg); // msg - } - PushHook(gL, hookp); - lua_pushvalue(gL, -5); - lua_pushvalue(gL, -5); - lua_pushvalue(gL, -5); - lua_pushvalue(gL, -5); - if (lua_pcall(gL, 4, 1, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - continue; - } - if (lua_toboolean(gL, -1)) - hooked = true; - lua_pop(gL, 1); - } - lua_settop(gL, 0); - return hooked; + call_single_hook(&hook); + + if (cv_perfstats.value == 3) + { + lua_Debug ar; + time_taken = I_GetPreciseTime() - time_taken; + lua_getinfo(gL, ">S", &ar); + PS_SetThinkFrameHookInfo(hook_index, time_taken, ar.short_src); + hook_index++; + } + } + + lua_settop(gL, 0); + } } - -// Hook for hurt messages -boolean LUAh_HurtMsg(player_t *player, mobj_t *inflictor, mobj_t *source, UINT8 damagetype) +int LUA_HookMobjLineCollide(mobj_t *mobj, line_t *line) { - hook_p hookp; - boolean hooked = false; - if (!gL || !(hooksAvailable[hook_HurtMsg/8] & (1<<(hook_HurtMsg%8)))) - return false; - - lua_settop(gL, 0); - lua_pushcfunction(gL, LUA_GetErrorMessage); - - for (hookp = roothook; hookp; hookp = hookp->next) + Hook_State hook; + if (prepare_mobj_hook(&hook, 0, MOBJ_HOOK(MobjLineCollide), mobj)) { - if (hookp->type != hook_HurtMsg - || (hookp->s.mt && !(inflictor && hookp->s.mt == inflictor->type))) - continue; + LUA_PushUserdata(gL, mobj, META_MOBJ); + LUA_PushUserdata(gL, line, META_LINE); + call_hooks(&hook, 1, res_force); + } + return hook.status; +} - if (lua_gettop(gL) == 1) +int LUA_HookTouchSpecial(mobj_t *special, mobj_t *toucher) +{ + Hook_State hook; + if (prepare_mobj_hook(&hook, false, MOBJ_HOOK(TouchSpecial), special)) + { + LUA_PushUserdata(gL, special, META_MOBJ); + LUA_PushUserdata(gL, toucher, META_MOBJ); + call_hooks(&hook, 1, res_true); + } + return hook.status; +} + +static int damage_hook +( + mobj_t *target, + mobj_t *inflictor, + mobj_t *source, + INT32 damage, + UINT8 damagetype, + int hook_type, + Hook_Callback results_handler +){ + Hook_State hook; + if (prepare_mobj_hook(&hook, 0, hook_type, target)) + { + LUA_PushUserdata(gL, target, META_MOBJ); + LUA_PushUserdata(gL, inflictor, META_MOBJ); + LUA_PushUserdata(gL, source, META_MOBJ); + if (hook_type != MOBJ_HOOK(MobjDeath)) + lua_pushinteger(gL, damage); + lua_pushinteger(gL, damagetype); + call_hooks(&hook, 1, results_handler); + } + return hook.status; +} + +int LUA_HookShouldDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage, UINT8 damagetype) +{ + return damage_hook(target, inflictor, source, damage, damagetype, + MOBJ_HOOK(ShouldDamage), res_force); +} + +int LUA_HookMobjDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage, UINT8 damagetype) +{ + return damage_hook(target, inflictor, source, damage, damagetype, + MOBJ_HOOK(MobjDamage), res_true); +} + +int LUA_HookMobjDeath(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damagetype) +{ + return damage_hook(target, inflictor, source, 0, damagetype, + MOBJ_HOOK(MobjDeath), res_true); +} + +int LUA_HookMobjMoveBlocked(mobj_t *t1, mobj_t *t2, line_t *line) +{ + Hook_State hook; + if (prepare_mobj_hook(&hook, 0, MOBJ_HOOK(MobjMoveBlocked), t1)) + { + LUA_PushUserdata(gL, t1, META_MOBJ); + LUA_PushUserdata(gL, t2, META_MOBJ); + LUA_PushUserdata(gL, line, META_LINE); + call_hooks(&hook, 1, res_true); + } + return hook.status; +} + +typedef struct { + mobj_t * tails; + ticcmd_t * cmd; +} BotAI_State; + +static boolean checkbotkey(const char *field) +{ + return lua_toboolean(gL, -1) && strcmp(lua_tostring(gL, -2), field) == 0; +} + +static void res_botai(Hook_State *hook) +{ + BotAI_State *botai = hook->userdata; + + int k[8]; + + int fields = 0; + + // This turns forward, backward, left, right, jump, and spin into a proper ticcmd for tails. + if (lua_istable(gL, -8)) { + lua_pushnil(gL); // key + while (lua_next(gL, -9)) { +#define CHECK(n, f) (checkbotkey(f) ? (k[(n)-1] = 1) : 0) + if ( + CHECK(1, "forward") || CHECK(2, "backward") || + CHECK(3, "left") || CHECK(4, "right") || + CHECK(5, "strafeleft") || CHECK(6, "straferight") || + CHECK(7, "jump") || CHECK(8, "spin") + ){ + if (8 <= ++fields) + { + lua_pop(gL, 2); // pop key and value + break; + } + } + + lua_pop(gL, 1); // pop value +#undef CHECK + } + } else { + while (fields < 8) { - LUA_PushUserdata(gL, player, META_PLAYER); - LUA_PushUserdata(gL, inflictor, META_MOBJ); - LUA_PushUserdata(gL, source, META_MOBJ); - lua_pushinteger(gL, damagetype); + k[fields] = lua_toboolean(gL, -8 + fields); + fields++; } - PushHook(gL, hookp); - lua_pushvalue(gL, -5); - lua_pushvalue(gL, -5); - lua_pushvalue(gL, -5); - lua_pushvalue(gL, -5); - if (lua_pcall(gL, 4, 1, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - continue; - } - if (lua_toboolean(gL, -1)) - hooked = true; - lua_pop(gL, 1); } - lua_settop(gL, 0); - return hooked; + B_KeysToTiccmd(botai->tails, botai->cmd, + k[0],k[1],k[2],k[3],k[4],k[5],k[6],k[7]); + + hook->status = true; } -void LUAh_NetArchiveHook(lua_CFunction archFunc) +int LUA_HookBotAI(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd) { - hook_p hookp; - int errorhandlerindex; - if (!gL || !(hooksAvailable[hook_NetVars/8] & (1<<(hook_NetVars%8)))) - return; + const char *skin = ((skin_t *)tails->skin)->name; - // stack: tables - I_Assert(lua_gettop(gL) > 0); - I_Assert(lua_istable(gL, -1)); + Hook_State hook; + BotAI_State botai; - lua_pushcfunction(gL, LUA_GetErrorMessage); - errorhandlerindex = lua_gettop(gL); - - // tables becomes an upvalue of archFunc - lua_pushvalue(gL, -2); - lua_pushcclosure(gL, archFunc, 1); - // stack: tables, archFunc - - for (hookp = roothook; hookp; hookp = hookp->next) + if (prepare_string_hook(&hook, false, STRING_HOOK(BotAI), skin)) { - if (hookp->type != hook_NetVars) - continue; + LUA_PushUserdata(gL, sonic, META_MOBJ); + LUA_PushUserdata(gL, tails, META_MOBJ); - PushHook(gL, hookp); - lua_pushvalue(gL, -2); // archFunc - if (lua_pcall(gL, 1, 0, errorhandlerindex)) { - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - } + botai.tails = tails; + botai.cmd = cmd; + + hook.userdata = &botai; + + call_hooks(&hook, 8, res_botai); } - lua_pop(gL, 2); // Pop archFunc and error handler - // stack: tables + return hook.status; } -boolean LUAh_MapThingSpawn(mobj_t *mo, mapthing_t *mthing) +void LUA_HookLinedefExecute(line_t *line, mobj_t *mo, sector_t *sector) { - hook_p hookp; - boolean hooked = false; - if (!gL || !(hooksAvailable[hook_MapThingSpawn/8] & (1<<(hook_MapThingSpawn%8)))) - return false; - - if (!(mobjhooks[MT_NULL] || mobjhooks[mo->type])) - return false; - - lua_settop(gL, 0); - lua_pushcfunction(gL, LUA_GetErrorMessage); - - // Look for all generic mobj map thing spawn hooks - for (hookp = mobjhooks[MT_NULL]; hookp; hookp = hookp->next) + Hook_State hook; + if (prepare_string_hook + (&hook, 0, STRING_HOOK(LinedefExecute), line->stringargs[0])) { - if (hookp->type != hook_MapThingSpawn) - continue; - - ps_lua_mobjhooks++; - if (lua_gettop(gL) == 1) - { - LUA_PushUserdata(gL, mo, META_MOBJ); - LUA_PushUserdata(gL, mthing, META_MAPTHING); - } - PushHook(gL, hookp); - lua_pushvalue(gL, -3); - lua_pushvalue(gL, -3); - if (lua_pcall(gL, 2, 1, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - continue; - } - if (lua_toboolean(gL, -1)) - hooked = true; - lua_pop(gL, 1); + LUA_PushUserdata(gL, line, META_LINE); + LUA_PushUserdata(gL, mo, META_MOBJ); + LUA_PushUserdata(gL, sector, META_SECTOR); + ps_lua_mobjhooks.value.i += call_hooks(&hook, 0, res_none); } - - for (hookp = mobjhooks[mo->type]; hookp; hookp = hookp->next) - { - if (hookp->type != hook_MapThingSpawn) - continue; - - ps_lua_mobjhooks++; - if (lua_gettop(gL) == 1) - { - LUA_PushUserdata(gL, mo, META_MOBJ); - LUA_PushUserdata(gL, mthing, META_MAPTHING); - } - PushHook(gL, hookp); - lua_pushvalue(gL, -3); - lua_pushvalue(gL, -3); - if (lua_pcall(gL, 2, 1, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - continue; - } - if (lua_toboolean(gL, -1)) - hooked = true; - lua_pop(gL, 1); - } - - lua_settop(gL, 0); - return hooked; } -// Hook for P_PlayerAfterThink Smiles mobj-following -boolean LUAh_FollowMobj(player_t *player, mobj_t *mobj) +int LUA_HookPlayerMsg(int source, int target, int flags, char *msg) { - hook_p hookp; - boolean hooked = false; - if (!gL || !(hooksAvailable[hook_FollowMobj/8] & (1<<(hook_FollowMobj%8)))) - return 0; - - if (!(mobjhooks[MT_NULL] || mobjhooks[mobj->type])) - return 0; - - lua_settop(gL, 0); - lua_pushcfunction(gL, LUA_GetErrorMessage); - - // Look for all generic mobj follow item hooks - for (hookp = mobjhooks[MT_NULL]; hookp; hookp = hookp->next) + Hook_State hook; + if (prepare_hook(&hook, false, HOOK(PlayerMsg))) { - if (hookp->type != hook_FollowMobj) - continue; - - ps_lua_mobjhooks++; - if (lua_gettop(gL) == 1) - { - LUA_PushUserdata(gL, player, META_PLAYER); - LUA_PushUserdata(gL, mobj, META_MOBJ); + LUA_PushUserdata(gL, &players[source], META_PLAYER); // Source player + if (flags & 2 /*HU_CSAY*/) { // csay TODO: make HU_CSAY accessible outside hu_stuff.c + lua_pushinteger(gL, 3); // type + lua_pushnil(gL); // target + } else if (target == -1) { // sayteam + lua_pushinteger(gL, 1); // type + lua_pushnil(gL); // target + } else if (target == 0) { // say + lua_pushinteger(gL, 0); // type + lua_pushnil(gL); // target + } else { // sayto + lua_pushinteger(gL, 2); // type + LUA_PushUserdata(gL, &players[target-1], META_PLAYER); // target } - PushHook(gL, hookp); - lua_pushvalue(gL, -3); - lua_pushvalue(gL, -3); - if (lua_pcall(gL, 2, 1, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - continue; - } - if (lua_toboolean(gL, -1)) - hooked = true; - lua_pop(gL, 1); + lua_pushstring(gL, msg); // msg + call_hooks(&hook, 1, res_true); } - - for (hookp = mobjhooks[mobj->type]; hookp; hookp = hookp->next) - { - if (hookp->type != hook_FollowMobj) - continue; - - ps_lua_mobjhooks++; - if (lua_gettop(gL) == 1) - { - LUA_PushUserdata(gL, player, META_PLAYER); - LUA_PushUserdata(gL, mobj, META_MOBJ); - } - PushHook(gL, hookp); - lua_pushvalue(gL, -3); - lua_pushvalue(gL, -3); - if (lua_pcall(gL, 2, 1, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - continue; - } - if (lua_toboolean(gL, -1)) - hooked = true; - lua_pop(gL, 1); - } - - lua_settop(gL, 0); - return hooked; + return hook.status; } -// Hook for P_PlayerCanDamage -UINT8 LUAh_PlayerCanDamage(player_t *player, mobj_t *mobj) +int LUA_HookHurtMsg(player_t *player, mobj_t *inflictor, mobj_t *source, UINT8 damagetype) { - hook_p hookp; - UINT8 shouldCollide = 0; // 0 = default, 1 = force yes, 2 = force no. - if (!gL || !(hooksAvailable[hook_PlayerCanDamage/8] & (1<<(hook_PlayerCanDamage%8)))) - return 0; - - lua_settop(gL, 0); - lua_pushcfunction(gL, LUA_GetErrorMessage); - - for (hookp = playerhooks; hookp; hookp = hookp->next) + Hook_State hook; + if (prepare_mobj_hook(&hook, false, MOBJ_HOOK(HurtMsg), inflictor)) { - if (hookp->type != hook_PlayerCanDamage) - continue; - - ps_lua_mobjhooks++; - if (lua_gettop(gL) == 1) - { - LUA_PushUserdata(gL, player, META_PLAYER); - LUA_PushUserdata(gL, mobj, META_MOBJ); - } - PushHook(gL, hookp); - lua_pushvalue(gL, -3); - lua_pushvalue(gL, -3); - if (lua_pcall(gL, 2, 1, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - continue; - } - if (!lua_isnil(gL, -1)) - { // if nil, leave shouldCollide = 0. - if (lua_toboolean(gL, -1)) - shouldCollide = 1; // Force yes - else - shouldCollide = 2; // Force no - } - lua_pop(gL, 1); + LUA_PushUserdata(gL, player, META_PLAYER); + LUA_PushUserdata(gL, inflictor, META_MOBJ); + LUA_PushUserdata(gL, source, META_MOBJ); + lua_pushinteger(gL, damagetype); + call_hooks(&hook, 1, res_true); } - - lua_settop(gL, 0); - return shouldCollide; + return hook.status; } -void LUAh_PlayerQuit(player_t *plr, kickreason_t reason) +void LUA_HookNetArchive(lua_CFunction archFunc) { - hook_p hookp; - if (!gL || !(hooksAvailable[hook_PlayerQuit/8] & (1<<(hook_PlayerQuit%8)))) - return; - - lua_settop(gL, 0); - lua_pushcfunction(gL, LUA_GetErrorMessage); - - for (hookp = roothook; hookp; hookp = hookp->next) + const hook_t * map = &hookIds[HOOK(NetVars)]; + Hook_State hook; + /* this is a remarkable case where the stack isn't reset */ + if (map->numHooks > 0) { - if (hookp->type != hook_PlayerQuit) - continue; + // stack: tables + I_Assert(lua_gettop(gL) > 0); + I_Assert(lua_istable(gL, -1)); - if (lua_gettop(gL) == 1) - { - LUA_PushUserdata(gL, plr, META_PLAYER); // Player that quit - lua_pushinteger(gL, reason); // Reason for quitting - } - PushHook(gL, hookp); - lua_pushvalue(gL, -3); - lua_pushvalue(gL, -3); - if (lua_pcall(gL, 2, 0, 1)) { - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - } + push_error_handler(); + lua_insert(gL, EINDEX); + + begin_hook_values(&hook); + + // tables becomes an upvalue of archFunc + lua_pushvalue(gL, -1); + lua_pushcclosure(gL, archFunc, 1); + // stack: tables, archFunc + + init_hook_call(&hook, 0, res_none); + call_mapped(&hook, map); + + lua_pop(gL, 1); // pop archFunc + lua_remove(gL, EINDEX); // pop error handler + // stack: tables } - - lua_settop(gL, 0); } -// Hook for Y_Ticker -void LUAh_IntermissionThinker(boolean failedstage) +int LUA_HookMapThingSpawn(mobj_t *mobj, mapthing_t *mthing) { - hook_p hookp; - if (!gL || !(hooksAvailable[hook_IntermissionThinker/8] & (1<<(hook_IntermissionThinker%8)))) - return; - - lua_pushcfunction(gL, LUA_GetErrorMessage); - - for (hookp = roothook; hookp; hookp = hookp->next) + Hook_State hook; + if (prepare_mobj_hook(&hook, false, MOBJ_HOOK(MapThingSpawn), mobj)) { - if (hookp->type != hook_IntermissionThinker) - continue; - - lua_pushboolean(gL, failedstage); // stagefailed - - PushHook(gL, hookp); - lua_pushvalue(gL, -2); // stagefailed - if (lua_pcall(gL, 1, 0, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - } + LUA_PushUserdata(gL, mobj, META_MOBJ); + LUA_PushUserdata(gL, mthing, META_MAPTHING); + call_hooks(&hook, 1, res_true); } - - lua_pop(gL, 1); // Pop error handler + return hook.status; } -// Hook for team switching -// It's just an edit of LUAh_ViewpointSwitch. -boolean LUAh_TeamSwitch(player_t *player, int newteam, boolean fromspectators, boolean tryingautobalance, boolean tryingscramble) +int LUA_HookFollowMobj(player_t *player, mobj_t *mobj) { - hook_p hookp; - boolean canSwitchTeam = true; - if (!gL || !(hooksAvailable[hook_TeamSwitch/8] & (1<<(hook_TeamSwitch%8)))) - return true; - - lua_settop(gL, 0); - lua_pushcfunction(gL, LUA_GetErrorMessage); - - for (hookp = playerhooks; hookp; hookp = hookp->next) + Hook_State hook; + if (prepare_mobj_hook(&hook, false, MOBJ_HOOK(FollowMobj), mobj)) { - if (hookp->type != hook_TeamSwitch) - continue; - - if (lua_gettop(gL) == 1) - { - LUA_PushUserdata(gL, player, META_PLAYER); - lua_pushinteger(gL, newteam); - lua_pushboolean(gL, fromspectators); - lua_pushboolean(gL, tryingautobalance); - lua_pushboolean(gL, tryingscramble); - } - PushHook(gL, hookp); - lua_pushvalue(gL, -6); - lua_pushvalue(gL, -6); - lua_pushvalue(gL, -6); - lua_pushvalue(gL, -6); - lua_pushvalue(gL, -6); - if (lua_pcall(gL, 5, 1, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - continue; - } - if (!lua_isnil(gL, -1) && !lua_toboolean(gL, -1)) - canSwitchTeam = false; // Can't switch team - lua_pop(gL, 1); + LUA_PushUserdata(gL, player, META_PLAYER); + LUA_PushUserdata(gL, mobj, META_MOBJ); + call_hooks(&hook, 1, res_true); } - - lua_settop(gL, 0); - return canSwitchTeam; + return hook.status; } -// Hook for spy mode -UINT8 LUAh_ViewpointSwitch(player_t *player, player_t *newdisplayplayer, boolean forced) +int LUA_HookPlayerCanDamage(player_t *player, mobj_t *mobj) { - hook_p hookp; - UINT8 canSwitchView = 0; // 0 = default, 1 = force yes, 2 = force no. - if (!gL || !(hooksAvailable[hook_ViewpointSwitch/8] & (1<<(hook_ViewpointSwitch%8)))) - return 0; - - lua_settop(gL, 0); - lua_pushcfunction(gL, LUA_GetErrorMessage); - - hud_running = true; // local hook - - for (hookp = playerhooks; hookp; hookp = hookp->next) + Hook_State hook; + if (prepare_hook(&hook, 0, HOOK(PlayerCanDamage))) { - if (hookp->type != hook_ViewpointSwitch) - continue; - - if (lua_gettop(gL) == 1) - { - LUA_PushUserdata(gL, player, META_PLAYER); - LUA_PushUserdata(gL, newdisplayplayer, META_PLAYER); - lua_pushboolean(gL, forced); - } - PushHook(gL, hookp); - lua_pushvalue(gL, -4); - lua_pushvalue(gL, -4); - lua_pushvalue(gL, -4); - if (lua_pcall(gL, 3, 1, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - continue; - } - if (!lua_isnil(gL, -1)) - { // if nil, leave canSwitchView = 0. - if (lua_toboolean(gL, -1)) - canSwitchView = 1; // Force viewpoint switch - else - canSwitchView = 2; // Skip viewpoint switch - } - lua_pop(gL, 1); + LUA_PushUserdata(gL, player, META_PLAYER); + LUA_PushUserdata(gL, mobj, META_MOBJ); + call_hooks(&hook, 1, res_force); } - - lua_settop(gL, 0); - - hud_running = false; - - return canSwitchView; + return hook.status; } -// Hook for MT_NAMECHECK -boolean LUAh_SeenPlayer(player_t *player, player_t *seenfriend) +void LUA_HookPlayerQuit(player_t *plr, kickreason_t reason) { - hook_p hookp; - boolean hasSeenPlayer = true; - if (!gL || !(hooksAvailable[hook_SeenPlayer/8] & (1<<(hook_SeenPlayer%8)))) - return true; - - lua_settop(gL, 0); - lua_pushcfunction(gL, LUA_GetErrorMessage); - - hud_running = true; // local hook - - for (hookp = playerhooks; hookp; hookp = hookp->next) + Hook_State hook; + if (prepare_hook(&hook, 0, HOOK(PlayerQuit))) { - if (hookp->type != hook_SeenPlayer) - continue; - - if (lua_gettop(gL) == 1) - { - LUA_PushUserdata(gL, player, META_PLAYER); - LUA_PushUserdata(gL, seenfriend, META_PLAYER); - } - PushHook(gL, hookp); - lua_pushvalue(gL, -3); - lua_pushvalue(gL, -3); - if (lua_pcall(gL, 2, 1, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - continue; - } - if (!lua_isnil(gL, -1) && !lua_toboolean(gL, -1)) - hasSeenPlayer = false; // Hasn't seen player - lua_pop(gL, 1); + LUA_PushUserdata(gL, plr, META_PLAYER); // Player that quit + lua_pushinteger(gL, reason); // Reason for quitting + call_hooks(&hook, 0, res_none); } - - lua_settop(gL, 0); - - hud_running = false; - - return hasSeenPlayer; } -boolean LUAh_ShouldJingleContinue(player_t *player, const char *musname) +int LUA_HookTeamSwitch(player_t *player, int newteam, boolean fromspectators, boolean tryingautobalance, boolean tryingscramble) { - hook_p hookp; - boolean keepplaying = false; - if (!gL || !(hooksAvailable[hook_ShouldJingleContinue/8] & (1<<(hook_ShouldJingleContinue%8)))) - return true; - - lua_settop(gL, 0); - lua_pushcfunction(gL, LUA_GetErrorMessage); - - hud_running = true; // local hook - - for (hookp = roothook; hookp; hookp = hookp->next) + Hook_State hook; + if (prepare_hook(&hook, true, HOOK(TeamSwitch))) { - if (hookp->type != hook_ShouldJingleContinue - || (hookp->s.str && strcmp(hookp->s.str, musname))) - continue; - - if (lua_gettop(gL) == 1) - { - LUA_PushUserdata(gL, player, META_PLAYER); - lua_pushstring(gL, musname); - } - PushHook(gL, hookp); - lua_pushvalue(gL, -3); - lua_pushvalue(gL, -3); - if (lua_pcall(gL, 2, 1, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - continue; - } - if (!lua_isnil(gL, -1) && lua_toboolean(gL, -1)) - keepplaying = true; // Keep playing this boolean - lua_pop(gL, 1); + LUA_PushUserdata(gL, player, META_PLAYER); + lua_pushinteger(gL, newteam); + lua_pushboolean(gL, fromspectators); + lua_pushboolean(gL, tryingautobalance); + lua_pushboolean(gL, tryingscramble); + call_hooks(&hook, 1, res_false); } - - lua_settop(gL, 0); - - hud_running = false; - - return keepplaying; + return hook.status; } -// Hook for game quitting -void LUAh_GameQuit(boolean quitting) +int LUA_HookViewpointSwitch(player_t *player, player_t *newdisplayplayer, boolean forced) { - hook_p hookp; - if (!gL || !(hooksAvailable[hook_GameQuit/8] & (1<<(hook_GameQuit%8)))) - return; - - lua_pushcfunction(gL, LUA_GetErrorMessage); - - for (hookp = roothook; hookp; hookp = hookp->next) + Hook_State hook; + if (prepare_hook(&hook, 0, HOOK(ViewpointSwitch))) { - if (hookp->type != hook_GameQuit) - continue; + LUA_PushUserdata(gL, player, META_PLAYER); + LUA_PushUserdata(gL, newdisplayplayer, META_PLAYER); + lua_pushboolean(gL, forced); - PushHook(gL, hookp); - lua_pushboolean(gL, quitting); - if (lua_pcall(gL, 1, 0, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - } + hud_running = true; // local hook + call_hooks(&hook, 1, res_force); + hud_running = false; } - - lua_pop(gL, 1); // Pop error handler + return hook.status; +} + +int LUA_HookSeenPlayer(player_t *player, player_t *seenfriend) +{ + Hook_State hook; + if (prepare_hook(&hook, true, HOOK(SeenPlayer))) + { + LUA_PushUserdata(gL, player, META_PLAYER); + LUA_PushUserdata(gL, seenfriend, META_PLAYER); + + hud_running = true; // local hook + call_hooks(&hook, 1, res_false); + hud_running = false; + } + return hook.status; +} + +int LUA_HookShouldJingleContinue(player_t *player, const char *musname) +{ + Hook_State hook; + if (prepare_string_hook + (&hook, false, STRING_HOOK(ShouldJingleContinue), musname)) + { + LUA_PushUserdata(gL, player, META_PLAYER); + push_string(); + + hud_running = true; // local hook + call_hooks(&hook, 1, res_true); + hud_running = false; + } + return hook.status; } -// Hook for building player's ticcmd struct (Ported from SRB2Kart) boolean hook_cmd_running = false; -boolean LUAh_PlayerCmd(player_t *player, ticcmd_t *cmd) + +static void update_music_name(struct MusicChange *musicchange) { - hook_p hookp; - boolean hooked = false; - if (!gL || !(hooksAvailable[hook_PlayerCmd/8] & (1<<(hook_PlayerCmd%8)))) - return false; + size_t length; + const char * new = lua_tolstring(gL, -6, &length); - lua_settop(gL, 0); - lua_pushcfunction(gL, LUA_GetErrorMessage); - - hook_cmd_running = true; - for (hookp = roothook; hookp; hookp = hookp->next) + if (length < 7) { - if (hookp->type != hook_PlayerCmd) - continue; - - if (lua_gettop(gL) == 1) - { - LUA_PushUserdata(gL, player, META_PLAYER); - LUA_PushUserdata(gL, cmd, META_TICCMD); - } - PushHook(gL, hookp); - lua_pushvalue(gL, -3); - lua_pushvalue(gL, -3); - if (lua_pcall(gL, 2, 1, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - continue; - } - if (lua_toboolean(gL, -1)) - hooked = true; - lua_pop(gL, 1); + strcpy(musicchange->newname, new); + lua_pushvalue(gL, -6);/* may as well keep it for next call */ + } + else + { + memcpy(musicchange->newname, new, 6); + musicchange->newname[6] = '\0'; + lua_pushlstring(gL, new, 6); } - lua_settop(gL, 0); - hook_cmd_running = false; - return hooked; + lua_replace(gL, -7); } -// Hook for music changes -boolean LUAh_MusicChange(const char *oldname, char *newname, UINT16 *mflags, boolean *looping, - UINT32 *position, UINT32 *prefadems, UINT32 *fadeinms) +static void res_musicchange(Hook_State *hook) { - hook_p hookp; - boolean hooked = false; + struct MusicChange *musicchange = hook->userdata; - if (!gL || !(hooksAvailable[hook_MusicChange/8] & (1<<(hook_MusicChange%8)))) - return false; + // output 1: true, false, or string musicname override + if (lua_isstring(gL, -6)) + update_music_name(musicchange); + else if (lua_isboolean(gL, -6) && lua_toboolean(gL, -6)) + hook->status = true; - lua_settop(gL, 0); - lua_pushcfunction(gL, LUA_GetErrorMessage); - - for (hookp = roothook; hookp; hookp = hookp->next) - if (hookp->type == hook_MusicChange) - { - PushHook(gL, hookp); - lua_pushstring(gL, oldname); - lua_pushstring(gL, newname); - lua_pushinteger(gL, *mflags); - lua_pushboolean(gL, *looping); - lua_pushinteger(gL, *position); - lua_pushinteger(gL, *prefadems); - lua_pushinteger(gL, *fadeinms); - if (lua_pcall(gL, 7, 6, 1)) { - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL,-1)); - lua_pop(gL, 1); - continue; - } - - // output 1: true, false, or string musicname override - if (lua_isboolean(gL, -6) && lua_toboolean(gL, -6)) - hooked = true; - else if (lua_isstring(gL, -6)) - strncpy(newname, lua_tostring(gL, -6), 7); - // output 2: mflags override - if (lua_isnumber(gL, -5)) - *mflags = lua_tonumber(gL, -5); - // output 3: looping override - if (lua_isboolean(gL, -4)) - *looping = lua_toboolean(gL, -4); - // output 4: position override - if (lua_isnumber(gL, -3)) - *position = lua_tonumber(gL, -3); - // output 5: prefadems override - if (lua_isnumber(gL, -2)) - *prefadems = lua_tonumber(gL, -2); - // output 6: fadeinms override - if (lua_isnumber(gL, -1)) - *fadeinms = lua_tonumber(gL, -1); - - lua_pop(gL, 7); // Pop returned values and error handler - } - - lua_settop(gL, 0); - newname[6] = 0; - return hooked; + // output 2: mflags override + if (lua_isnumber(gL, -5)) + *musicchange->mflags = lua_tonumber(gL, -5); + // output 3: looping override + if (lua_isboolean(gL, -4)) + *musicchange->looping = lua_toboolean(gL, -4); + // output 4: position override + if (lua_isnumber(gL, -3)) + *musicchange->position = lua_tonumber(gL, -3); + // output 5: prefadems override + if (lua_isnumber(gL, -2)) + *musicchange->prefadems = lua_tonumber(gL, -2); + // output 6: fadeinms override + if (lua_isnumber(gL, -1)) + *musicchange->fadeinms = lua_tonumber(gL, -1); } -// Hook for determining player height -fixed_t LUAh_PlayerHeight(player_t *player) +int LUA_HookMusicChange(const char *oldname, struct MusicChange *param) { - hook_p hookp; - fixed_t newheight = -1; - if (!gL || !(hooksAvailable[hook_PlayerHeight/8] & (1<<(hook_PlayerHeight%8)))) - return newheight; + const int type = HOOK(MusicChange); + const hook_t * map = &hookIds[type]; - lua_settop(gL, 0); - lua_pushcfunction(gL, LUA_GetErrorMessage); + Hook_State hook; - for (hookp = playerhooks; hookp; hookp = hookp->next) + int k; + + if (prepare_hook(&hook, false, type)) { - if (hookp->type != hook_PlayerHeight) - continue; + init_hook_call(&hook, 6, res_musicchange); + hook.values = 7;/* values pushed later */ + hook.userdata = param; - ps_lua_mobjhooks++; - if (lua_gettop(gL) == 1) - LUA_PushUserdata(gL, player, META_PLAYER); - PushHook(gL, hookp); - lua_pushvalue(gL, -2); - if (lua_pcall(gL, 1, 1, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - continue; - } - if (!lua_isnil(gL, -1)) + lua_pushstring(gL, oldname);/* the only constant value */ + lua_pushstring(gL, param->newname);/* semi constant */ + + for (k = 0; k < map->numHooks; ++k) { - fixed_t returnedheight = lua_tonumber(gL, -1); - // 0 height has... strange results, but it's not problematic like negative heights are. - // when an object's height is set to a negative number directly with lua, it's forced to 0 instead. - // here, I think it's better to ignore negatives so that they don't replace any results of previous hooks! - if (returnedheight >= 0) - newheight = returnedheight; + get_hook(&hook, map->ids, k); + + lua_pushvalue(gL, -3); + lua_pushvalue(gL, -3); + lua_pushinteger(gL, *param->mflags); + lua_pushboolean(gL, *param->looping); + lua_pushinteger(gL, *param->position); + lua_pushinteger(gL, *param->prefadems); + lua_pushinteger(gL, *param->fadeinms); + + call_single_hook_no_copy(&hook); } - lua_pop(gL, 1); + + lua_settop(gL, 0); } - lua_settop(gL, 0); - return newheight; + return hook.status; } -// Hook for determining whether players are allowed passage through spin gaps -UINT8 LUAh_PlayerCanEnterSpinGaps(player_t *player) +static void res_playerheight(Hook_State *hook) { - hook_p hookp; - UINT8 canEnter = 0; // 0 = default, 1 = force yes, 2 = force no. - if (!gL || !(hooksAvailable[hook_PlayerCanEnterSpinGaps/8] & (1<<(hook_PlayerCanEnterSpinGaps%8)))) - return 0; - - lua_settop(gL, 0); - lua_pushcfunction(gL, LUA_GetErrorMessage); - - for (hookp = playerhooks; hookp; hookp = hookp->next) + if (!lua_isnil(gL, -1)) { - if (hookp->type != hook_PlayerCanEnterSpinGaps) - continue; - - ps_lua_mobjhooks++; - if (lua_gettop(gL) == 1) - LUA_PushUserdata(gL, player, META_PLAYER); - PushHook(gL, hookp); - lua_pushvalue(gL, -2); - if (lua_pcall(gL, 1, 1, 1)) { - if (!hookp->error || cv_debug & DBG_LUA) - CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1)); - lua_pop(gL, 1); - hookp->error = true; - continue; - } - if (!lua_isnil(gL, -1)) - { // if nil, leave canEnter = 0. - if (lua_toboolean(gL, -1)) - canEnter = 1; // Force yes - else - canEnter = 2; // Force no - } - lua_pop(gL, 1); + fixed_t returnedheight = lua_tonumber(gL, -1); + // 0 height has... strange results, but it's not problematic like negative heights are. + // when an object's height is set to a negative number directly with lua, it's forced to 0 instead. + // here, I think it's better to ignore negatives so that they don't replace any results of previous hooks! + if (returnedheight >= 0) + hook->status = returnedheight; } - - lua_settop(gL, 0); - return canEnter; +} + +fixed_t LUA_HookPlayerHeight(player_t *player) +{ + Hook_State hook; + if (prepare_hook(&hook, -1, HOOK(PlayerHeight))) + { + LUA_PushUserdata(gL, player, META_PLAYER); + call_hooks(&hook, 1, res_playerheight); + } + return hook.status; +} + +int LUA_HookPlayerCanEnterSpinGaps(player_t *player) +{ + Hook_State hook; + if (prepare_hook(&hook, 0, HOOK(PlayerCanEnterSpinGaps))) + { + LUA_PushUserdata(gL, player, META_PLAYER); + call_hooks(&hook, 1, res_force); + } + return hook.status; } diff --git a/src/lua_hud.h b/src/lua_hud.h index d2f5bceca..ba102f2f4 100644 --- a/src/lua_hud.h +++ b/src/lua_hud.h @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 2014-2016 by John "JTE" Muniz. -// Copyright (C) 2014-2021 by Sonic Team Junior. +// Copyright (C) 2014-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -10,6 +10,11 @@ /// \file lua_hud.h /// \brief HUD enable/disable flags for Lua scripting +#ifndef __LUA_HUD_H__ +#define __LUA_HUD_H__ + +#include "lua_hudlib_drawlist.h" + enum hud { hud_stagetitle = 0, hud_textspectator, @@ -47,8 +52,6 @@ extern boolean hud_running; boolean LUA_HudEnabled(enum hud option); -void LUAh_GameHUD(player_t *stplyr); -void LUAh_ScoresHUD(void); -void LUAh_TitleHUD(void); -void LUAh_TitleCardHUD(player_t *stplayr); -void LUAh_IntermissionHUD(boolean failedstage); +void LUA_SetHudHook(int hook, huddrawlist_h list); + +#endif // __LUA_HUD_H__ diff --git a/src/lua_hudlib.c b/src/lua_hudlib.c index 9a3e676d5..c7f67e93a 100644 --- a/src/lua_hudlib.c +++ b/src/lua_hudlib.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 2014-2016 by John "JTE" Muniz. -// Copyright (C) 2014-2021 by Sonic Team Junior. +// Copyright (C) 2014-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -23,18 +23,18 @@ #include "v_video.h" #include "w_wad.h" #include "z_zone.h" +#include "y_inter.h" #include "lua_script.h" #include "lua_libs.h" #include "lua_hud.h" +#include "lua_hook.h" #define HUDONLY if (!hud_running) return luaL_error(L, "HUD rendering code should not be called outside of rendering hooks!"); boolean hud_running = false; static UINT8 hud_enabled[(hud_MAX/8)+1]; -static UINT8 hudAvailable; // hud hooks field - // must match enum hud in lua_hud.h static const char *const hud_disable_options[] = { "stagetitle", @@ -95,20 +95,7 @@ static const char *const patch_opt[] = { "topoffset", NULL}; -enum hudhook { - hudhook_game = 0, - hudhook_scores, - hudhook_intermission, - hudhook_title, - hudhook_titlecard -}; -static const char *const hudhook_opt[] = { - "game", - "scores", - "intermission", - "title", - "titlecard", - NULL}; +static int patch_fields_ref = LUA_NOREF; // alignment types for v.drawString enum align { @@ -211,6 +198,8 @@ static const char *const camera_opt[] = { "momz", NULL}; +static int camera_fields_ref = LUA_NOREF; + static int lib_getHudInfo(lua_State *L) { UINT32 i; @@ -291,7 +280,7 @@ static int colormap_get(lua_State *L) static int patch_get(lua_State *L) { patch_t *patch = *((patch_t **)luaL_checkudata(L, 1, META_PATCH)); - enum patch field = luaL_checkoption(L, 2, NULL, patch_opt); + enum patch field = Lua_optoption(L, 2, -1, patch_fields_ref); // patches are invalidated when switching renderers if (!patch) { @@ -331,7 +320,7 @@ static int patch_set(lua_State *L) static int camera_get(lua_State *L) { camera_t *cam = *((camera_t **)luaL_checkudata(L, 1, META_CAMERA)); - enum cameraf field = luaL_checkoption(L, 2, NULL, camera_opt); + enum cameraf field = Lua_optoption(L, 2, -1, camera_fields_ref); // cameras should always be valid unless I'm a nutter I_Assert(cam != NULL); @@ -384,6 +373,74 @@ static int camera_get(lua_State *L) return 1; } +static int camera_set(lua_State *L) +{ + camera_t *cam = *((camera_t **)luaL_checkudata(L, 1, META_CAMERA)); + enum cameraf field = Lua_optoption(L, 2, -1, camera_fields_ref); + + I_Assert(cam != NULL); + + switch(field) + { + case camera_subsector: + case camera_floorz: + case camera_ceilingz: + case camera_x: + case camera_y: + return luaL_error(L, LUA_QL("camera_t") " field " LUA_QS " should not be set directly. Use " LUA_QL("P_TryCameraMove") " or " LUA_QL("P_TeleportCameraMove") " instead.", camera_opt[field]); + case camera_chase: { + INT32 chase = luaL_checkboolean(L, 3); + if (cam == &camera) + CV_SetValue(&cv_chasecam, chase); + else if (cam == &camera2) + CV_SetValue(&cv_chasecam2, chase); + else // ??? this should never happen, but ok + cam->chase = chase; + break; + } + case camera_aiming: + cam->aiming = luaL_checkangle(L, 3); + break; + case camera_z: + cam->z = luaL_checkfixed(L, 3); + P_CheckCameraPosition(cam->x, cam->y, cam); + cam->floorz = tmfloorz; + cam->ceilingz = tmceilingz; + break; + case camera_angle: + cam->angle = luaL_checkangle(L, 3); + break; + case camera_radius: + cam->radius = luaL_checkfixed(L, 3); + if (cam->radius < 0) + cam->radius = 0; + P_CheckCameraPosition(cam->x, cam->y, cam); + cam->floorz = tmfloorz; + cam->ceilingz = tmceilingz; + break; + case camera_height: + cam->height = luaL_checkfixed(L, 3); + if (cam->height < 0) + cam->height = 0; + P_CheckCameraPosition(cam->x, cam->y, cam); + cam->floorz = tmfloorz; + cam->ceilingz = tmceilingz; + break; + case camera_momx: + cam->momx = luaL_checkfixed(L, 3); + break; + case camera_momy: + cam->momy = luaL_checkfixed(L, 3); + break; + case camera_momz: + cam->momz = luaL_checkfixed(L, 3); + break; + default: + return luaL_error(L, LUA_QL("camera_t") " has no field named " LUA_QS, camera_opt[field]); + } + return 0; +} + // // lib_draw // @@ -592,7 +649,8 @@ static int libd_draw(lua_State *L) { INT32 x, y, flags; patch_t *patch; - const UINT8 *colormap = NULL; + UINT8 *colormap = NULL; + huddrawlist_h list; HUDONLY x = luaL_checkinteger(L, 1); @@ -606,7 +664,14 @@ static int libd_draw(lua_State *L) flags &= ~V_PARAMMASK; // Don't let crashes happen. - V_DrawFixedPatch(x< maxstrength) return luaL_error(L, "%s fade strength %d out of range (0 - %d)", ((color & 0xFF00) ? "COLORMAP" : "TRANSMAP"), strength, maxstrength); + lua_getfield(L, LUA_REGISTRYINDEX, "HUD_DRAW_LIST"); + list = (huddrawlist_h) lua_touserdata(L, -1); + lua_pop(L, 1); + if (strength == maxstrength) // Allow as a shortcut for drawfill... { - V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, ((color & 0xFF00) ? 31 : color)); + if (LUA_HUD_IsDrawListValid(list)) + LUA_HUD_AddDrawFill(list, 0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, ((color & 0xFF00) ? 31 : color)); + else + V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, ((color & 0xFF00) ? 31 : color)); return 0; } - V_DrawFadeScreen(color, strength); + if (LUA_HUD_IsDrawListValid(list)) + LUA_HUD_AddFadeScreen(list, color, strength); + else + V_DrawFadeScreen(color, strength); + return 0; } @@ -1121,6 +1324,7 @@ static luaL_Reg lib_draw[] = { {"draw", libd_draw}, {"drawScaled", libd_drawScaled}, {"drawStretched", libd_drawStretched}, + {"drawCropped", libd_drawCropped}, {"drawNum", libd_drawNum}, {"drawPaddedNum", libd_drawPaddedNum}, {"drawFill", libd_drawFill}, @@ -1152,6 +1356,8 @@ static luaL_Reg lib_draw[] = { {NULL, NULL} }; +static int lib_draw_ref; + // // lib_hud // @@ -1186,28 +1392,7 @@ static int lib_hudenabled(lua_State *L) // add a HUD element for rendering -static int lib_hudadd(lua_State *L) -{ - enum hudhook field; - - luaL_checktype(L, 1, LUA_TFUNCTION); - field = luaL_checkoption(L, 2, "game", hudhook_opt); - - if (!lua_lumploading) - return luaL_error(L, "This function cannot be called from within a hook or coroutine!"); - - lua_getfield(L, LUA_REGISTRYINDEX, "HUD"); - I_Assert(lua_istable(L, -1)); - lua_rawgeti(L, -1, field+2); // HUD[2+] - I_Assert(lua_istable(L, -1)); - lua_remove(L, -2); - - lua_pushvalue(L, 1); - lua_rawseti(L, -2, (int)(lua_objlen(L, -2) + 1)); - - hudAvailable |= 1< + +#include "v_video.h" +#include "z_zone.h" + +enum drawitem_e { + DI_Draw = 0, + DI_DrawScaled, + DI_DrawStretched, + DI_DrawCropped, + DI_DrawNum, + DI_DrawPaddedNum, + DI_DrawFill, + DI_DrawString, + DI_DrawNameTag, + DI_DrawScaledNameTag, + DI_DrawLevelTitle, + DI_FadeScreen, + DI_MAX, +}; + +// A single draw item with all possible arguments needed for a draw call. +typedef struct drawitem_s { + enum drawitem_e type; + fixed_t x; + fixed_t y; + fixed_t w; + fixed_t h; + INT32 c; + fixed_t scale; + fixed_t hscale; + fixed_t vscale; + patch_t *patch; + INT32 flags; + UINT16 basecolor; + UINT16 outlinecolor; + UINT8 *colormap; + UINT8 *basecolormap; + UINT8 *outlinecolormap; + fixed_t sx; + fixed_t sy; + INT32 num; + INT32 digits; + const char *str; + UINT16 color; + UINT8 strength; + INT32 align; +} drawitem_t; + +// The internal structure of a drawlist. +struct huddrawlist_s { + drawitem_t *items; + size_t items_capacity; + size_t items_len; + char *strbuf; + size_t strbuf_capacity; + size_t strbuf_len; +}; + +// alignment types for v.drawString +enum align { + align_left = 0, + align_center, + align_right, + align_fixed, + align_fixedcenter, + align_fixedright, + align_small, + align_smallfixed, + align_smallfixedcenter, + align_smallfixedright, + align_smallcenter, + align_smallright, + align_smallthin, + align_smallthincenter, + align_smallthinright, + align_smallthinfixed, + align_smallthinfixedcenter, + align_smallthinfixedright, + align_thin, + align_thinfixed, + align_thinfixedcenter, + align_thinfixedright, + align_thincenter, + align_thinright +}; + +huddrawlist_h LUA_HUD_CreateDrawList(void) +{ + huddrawlist_h drawlist; + + drawlist = (huddrawlist_h) Z_CallocAlign(sizeof(struct huddrawlist_s), PU_STATIC, NULL, 64); + drawlist->items = NULL; + drawlist->items_capacity = 0; + drawlist->items_len = 0; + drawlist->strbuf = NULL; + drawlist->strbuf_capacity = 0; + drawlist->strbuf_len = 0; + + return drawlist; +} + +void LUA_HUD_ClearDrawList(huddrawlist_h list) +{ + // rather than deallocate, we'll just save the existing allocation and empty + // it out for reuse + + // this memset probably isn't necessary + if (list->items) + { + memset(list->items, 0, sizeof(drawitem_t) * list->items_capacity); + } + + list->items_len = 0; + + if (list->strbuf) + { + list->strbuf[0] = 0; + } + list->strbuf_len = 0; +} + +void LUA_HUD_DestroyDrawList(huddrawlist_h list) +{ + if (list == NULL) return; + + if (list->items) + { + Z_Free(list->items); + } + Z_Free(list); +} + +boolean LUA_HUD_IsDrawListValid(huddrawlist_h list) +{ + if (!list) return false; + + // that's all we can really do to check the validity of the handle right now + return true; +} + +static size_t AllocateDrawItem(huddrawlist_h list) +{ + if (!list) I_Error("can't allocate draw item: invalid list"); + if (list->items_capacity <= list->items_len + 1) + { + if (list->items_capacity == 0) list->items_capacity = 128; + else list->items_capacity *= 2; + list->items = (drawitem_t *) Z_ReallocAlign(list->items, sizeof(struct drawitem_s) * list->items_capacity, PU_STATIC, NULL, 64); + } + + return list->items_len++; +} + +// copy string to list's internal string buffer +// lua can deallocate the string before we get to use it, so it's important to +// keep our own copy +static const char *CopyString(huddrawlist_h list, const char* str) +{ + size_t lenstr; + + if (!list) I_Error("can't allocate string; invalid list"); + lenstr = strlen(str); + if (list->strbuf_capacity <= list->strbuf_len + lenstr + 1) + { + if (list->strbuf_capacity == 0) list->strbuf_capacity = 256; + else list->strbuf_capacity *= 2; + list->strbuf = (char*) Z_ReallocAlign(list->strbuf, sizeof(char) * list->strbuf_capacity, PU_STATIC, NULL, 8); + } + const char *result = (const char *) &list->strbuf[list->strbuf_len]; + strncpy(&list->strbuf[list->strbuf_len], str, lenstr + 1); + list->strbuf_len += lenstr + 1; + return result; +} + +void LUA_HUD_AddDraw( + huddrawlist_h list, + INT32 x, + INT32 y, + patch_t *patch, + INT32 flags, + UINT8 *colormap +) +{ + size_t i = AllocateDrawItem(list); + drawitem_t *item = &list->items[i]; + item->type = DI_Draw; + item->x = x; + item->y = y; + item->patch = patch; + item->flags = flags; + item->colormap = colormap; +} + +void LUA_HUD_AddDrawScaled( + huddrawlist_h list, + fixed_t x, + fixed_t y, + fixed_t scale, + patch_t *patch, + INT32 flags, + UINT8 *colormap +) +{ + size_t i = AllocateDrawItem(list); + drawitem_t *item = &list->items[i]; + item->type = DI_DrawScaled; + item->x = x; + item->y = y; + item->scale = scale; + item->patch = patch; + item->flags = flags; + item->colormap = colormap; +} + +void LUA_HUD_AddDrawStretched( + huddrawlist_h list, + fixed_t x, + fixed_t y, + fixed_t hscale, + fixed_t vscale, + patch_t *patch, + INT32 flags, + UINT8 *colormap +) +{ + size_t i = AllocateDrawItem(list); + drawitem_t *item = &list->items[i]; + item->type = DI_DrawStretched; + item->x = x; + item->y = y; + item->hscale = hscale; + item->vscale = vscale; + item->patch = patch; + item->flags = flags; + item->colormap = colormap; +} + +void LUA_HUD_AddDrawCropped( + huddrawlist_h list, + fixed_t x, + fixed_t y, + fixed_t hscale, + fixed_t vscale, + patch_t *patch, + INT32 flags, + UINT8 *colormap, + fixed_t sx, + fixed_t sy, + fixed_t w, + fixed_t h +) +{ + size_t i = AllocateDrawItem(list); + drawitem_t *item = &list->items[i]; + item->type = DI_DrawCropped; + item->x = x; + item->y = y; + item->hscale = hscale; + item->vscale = vscale; + item->patch = patch; + item->flags = flags; + item->colormap = colormap; + item->sx = sx; + item->sy = sy; + item->w = w; + item->h = h; +} + +void LUA_HUD_AddDrawNum( + huddrawlist_h list, + INT32 x, + INT32 y, + INT32 num, + INT32 flags +) +{ + size_t i = AllocateDrawItem(list); + drawitem_t *item = &list->items[i]; + item->type = DI_DrawNum; + item->x = x; + item->y = y; + item->num = num; + item->flags = flags; +} + +void LUA_HUD_AddDrawPaddedNum( + huddrawlist_h list, + INT32 x, + INT32 y, + INT32 num, + INT32 digits, + INT32 flags +) +{ + size_t i = AllocateDrawItem(list); + drawitem_t *item = &list->items[i]; + item->type = DI_DrawPaddedNum; + item->x = x; + item->y = y; + item->num = num; + item->digits = digits; + item->flags = flags; +} + +void LUA_HUD_AddDrawFill( + huddrawlist_h list, + INT32 x, + INT32 y, + INT32 w, + INT32 h, + INT32 c +) +{ + size_t i = AllocateDrawItem(list); + drawitem_t *item = &list->items[i]; + item->type = DI_DrawFill; + item->x = x; + item->y = y; + item->w = w; + item->h = h; + item->c = c; +} + +void LUA_HUD_AddDrawString( + huddrawlist_h list, + fixed_t x, + fixed_t y, + const char *str, + INT32 flags, + INT32 align +) +{ + size_t i = AllocateDrawItem(list); + drawitem_t *item = &list->items[i]; + item->type = DI_DrawString; + item->x = x; + item->y = y; + item->str = CopyString(list, str); + item->flags = flags; + item->align = align; +} + +void LUA_HUD_AddDrawNameTag( + huddrawlist_h list, + INT32 x, + INT32 y, + const char *str, + INT32 flags, + UINT16 basecolor, + UINT16 outlinecolor, + UINT8 *basecolormap, + UINT8 *outlinecolormap +) +{ + size_t i = AllocateDrawItem(list); + drawitem_t *item = &list->items[i]; + item->type = DI_DrawNameTag; + item->x = x; + item->y = y; + item->str = CopyString(list, str); + item->flags = flags; + item->basecolor = basecolor; + item->outlinecolor = outlinecolor; + item->basecolormap = basecolormap; + item->outlinecolormap = outlinecolormap; +} + +void LUA_HUD_AddDrawScaledNameTag( + huddrawlist_h list, + fixed_t x, + fixed_t y, + const char *str, + INT32 flags, + fixed_t scale, + UINT16 basecolor, + UINT16 outlinecolor, + UINT8 *basecolormap, + UINT8 *outlinecolormap +) +{ + size_t i = AllocateDrawItem(list); + drawitem_t *item = &list->items[i]; + item->type = DI_DrawScaledNameTag; + item->x = x; + item->y = y; + item->str = CopyString(list, str); + item->flags = flags; + item->scale = scale; + item->basecolor = basecolor; + item->outlinecolor = outlinecolor; + item->basecolormap = basecolormap; + item->outlinecolormap = outlinecolormap; +} + +void LUA_HUD_AddDrawLevelTitle( + huddrawlist_h list, + INT32 x, + INT32 y, + const char *str, + INT32 flags +) +{ + size_t i = AllocateDrawItem(list); + drawitem_t *item = &list->items[i]; + item->type = DI_DrawLevelTitle; + item->x = x; + item->y = y; + item->str = CopyString(list, str); + item->flags = flags; +} + +void LUA_HUD_AddFadeScreen( + huddrawlist_h list, + UINT16 color, + UINT8 strength +) +{ + size_t i = AllocateDrawItem(list); + drawitem_t *item = &list->items[i]; + item->type = DI_FadeScreen; + item->color = color; + item->strength = strength; +} + +void LUA_HUD_DrawList(huddrawlist_h list) +{ + size_t i; + + if (!list) I_Error("HUD drawlist invalid"); + if (list->items_len <= 0) return; + if (!list->items) I_Error("HUD drawlist->items invalid"); + + for (i = 0; i < list->items_len; i++) + { + drawitem_t *item = &list->items[i]; + + switch (item->type) + { + case DI_Draw: + V_DrawFixedPatch(item->x<y<flags, item->patch, item->colormap); + break; + case DI_DrawScaled: + V_DrawFixedPatch(item->x, item->y, item->scale, item->flags, item->patch, item->colormap); + break; + case DI_DrawStretched: + V_DrawStretchyFixedPatch(item->x, item->y, item->hscale, item->vscale, item->flags, item->patch, item->colormap); + break; + case DI_DrawCropped: + V_DrawCroppedPatch(item->x, item->y, item->hscale, item->vscale, item->flags, item->patch, item->colormap, item->sx, item->sy, item->w, item->h); + break; + case DI_DrawNum: + V_DrawTallNum(item->x, item->y, item->flags, item->num); + break; + case DI_DrawPaddedNum: + V_DrawPaddedTallNum(item->x, item->y, item->flags, item->num, item->digits); + break; + case DI_DrawFill: + V_DrawFill(item->x, item->y, item->w, item->h, item->c); + break; + case DI_DrawString: + switch(item->align) + { + // hu_font + case align_left: + V_DrawString(item->x, item->y, item->flags, item->str); + break; + case align_center: + V_DrawCenteredString(item->x, item->y, item->flags, item->str); + break; + case align_right: + V_DrawRightAlignedString(item->x, item->y, item->flags, item->str); + break; + case align_fixed: + V_DrawStringAtFixed(item->x, item->y, item->flags, item->str); + break; + case align_fixedcenter: + V_DrawCenteredStringAtFixed(item->x, item->y, item->flags, item->str); + break; + case align_fixedright: + V_DrawRightAlignedStringAtFixed(item->x, item->y, item->flags, item->str); + break; + // hu_font, 0.5x scale + case align_small: + V_DrawSmallString(item->x, item->y, item->flags, item->str); + break; + case align_smallfixed: + V_DrawSmallStringAtFixed(item->x, item->y, item->flags, item->str); + break; + case align_smallfixedcenter: + V_DrawCenteredSmallStringAtFixed(item->x, item->y, item->flags, item->str); + break; + case align_smallfixedright: + V_DrawRightAlignedSmallStringAtFixed(item->x, item->y, item->flags, item->str); + break; + case align_smallcenter: + V_DrawCenteredSmallString(item->x, item->y, item->flags, item->str); + break; + case align_smallright: + V_DrawRightAlignedSmallString(item->x, item->y, item->flags, item->str); + break; + case align_smallthin: + V_DrawSmallThinString(item->x, item->y, item->flags, item->str); + break; + case align_smallthincenter: + V_DrawCenteredSmallThinString(item->x, item->y, item->flags, item->str); + break; + case align_smallthinright: + V_DrawRightAlignedSmallThinString(item->x, item->y, item->flags, item->str); + break; + case align_smallthinfixed: + V_DrawSmallThinStringAtFixed(item->x, item->y, item->flags, item->str); + break; + case align_smallthinfixedcenter: + V_DrawCenteredSmallThinStringAtFixed(item->x, item->y, item->flags, item->str); + break; + case align_smallthinfixedright: + V_DrawRightAlignedSmallThinStringAtFixed(item->x, item->y, item->flags, item->str); + break; + // tny_font + case align_thin: + V_DrawThinString(item->x, item->y, item->flags, item->str); + break; + case align_thincenter: + V_DrawCenteredThinString(item->x, item->y, item->flags, item->str); + break; + case align_thinright: + V_DrawRightAlignedThinString(item->x, item->y, item->flags, item->str); + break; + case align_thinfixed: + V_DrawThinStringAtFixed(item->x, item->y, item->flags, item->str); + break; + case align_thinfixedcenter: + V_DrawCenteredThinStringAtFixed(item->x, item->y, item->flags, item->str); + break; + case align_thinfixedright: + V_DrawRightAlignedThinStringAtFixed(item->x, item->y, item->flags, item->str); + break; + } + break; + case DI_DrawNameTag: + V_DrawNameTag(item->x, item->y, item->flags, FRACUNIT, item->basecolormap, item->outlinecolormap, item->str); + break; + case DI_DrawScaledNameTag: + V_DrawNameTag(FixedInt(item->x), FixedInt(item->y), item->flags, item->scale, item->basecolormap, item->outlinecolormap, item->str); + break; + case DI_DrawLevelTitle: + V_DrawLevelTitle(item->x, item->y, item->flags, item->str); + break; + case DI_FadeScreen: + V_DrawFadeScreen(item->color, item->strength); + break; + default: + I_Error("can't draw draw list item: invalid draw list item type"); + continue; + } + } +} diff --git a/src/lua_hudlib_drawlist.h b/src/lua_hudlib_drawlist.h new file mode 100644 index 000000000..b2df39747 --- /dev/null +++ b/src/lua_hudlib_drawlist.h @@ -0,0 +1,152 @@ +// SONIC ROBO BLAST 2 +//----------------------------------------------------------------------------- +// Copyright (C) 2022-2023 by Sonic Team Junior. +// +// This program is free software distributed under the +// terms of the GNU General Public License, version 2. +// See the 'LICENSE' file for more details. +//----------------------------------------------------------------------------- +/// \file lua_hudlib_drawlist.h +/// \brief a data structure for managing cached drawlists for the Lua hud lib + +// The idea behinds this module is to cache drawcall information into an ordered +// list to repeat the same draw operations in later frames. It's used to ensure +// that the HUD hooks from Lua are called at precisely 35hz to avoid problems +// with variable framerates in existing Lua addons. + +#ifndef __LUA_HUDLIB_DRAWLIST__ +#define __LUA_HUDLIB_DRAWLIST__ + +#include "doomtype.h" +#include "r_defs.h" + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct huddrawlist_s *huddrawlist_h; + +// Create a new drawlist. Returns a handle to it. +huddrawlist_h LUA_HUD_CreateDrawList(void); +// Clears the draw list. +void LUA_HUD_ClearDrawList(huddrawlist_h list); +// Destroys the drawlist, invalidating the given handle +void LUA_HUD_DestroyDrawList(huddrawlist_h list); +boolean LUA_HUD_IsDrawListValid(huddrawlist_h list); + +void LUA_HUD_AddDraw( + huddrawlist_h list, + INT32 x, + INT32 y, + patch_t *patch, + INT32 flags, + UINT8 *colormap +); +void LUA_HUD_AddDrawScaled( + huddrawlist_h list, + fixed_t x, + fixed_t y, + fixed_t scale, + patch_t *patch, + INT32 flags, + UINT8 *colormap +); +void LUA_HUD_AddDrawStretched( + huddrawlist_h list, + fixed_t x, + fixed_t y, + fixed_t hscale, + fixed_t vscale, + patch_t *patch, + INT32 flags, + UINT8 *colormap +); +void LUA_HUD_AddDrawCropped( + huddrawlist_h list, + fixed_t x, + fixed_t y, + fixed_t hscale, + fixed_t vscale, + patch_t *patch, + INT32 flags, + UINT8 *colormap, + fixed_t sx, + fixed_t sy, + fixed_t w, + fixed_t h +); +void LUA_HUD_AddDrawNum( + huddrawlist_h list, + INT32 x, + INT32 y, + INT32 num, + INT32 flags +); +void LUA_HUD_AddDrawPaddedNum( + huddrawlist_h list, + INT32 x, + INT32 y, + INT32 num, + INT32 digits, + INT32 flags +); +void LUA_HUD_AddDrawFill( + huddrawlist_h list, + INT32 x, + INT32 y, + INT32 w, + INT32 h, + INT32 c +); +void LUA_HUD_AddDrawString( + huddrawlist_h list, + fixed_t x, + fixed_t y, + const char *str, + INT32 flags, + INT32 align +); +void LUA_HUD_AddDrawNameTag( + huddrawlist_h list, + INT32 x, + INT32 y, + const char *str, + INT32 flags, + UINT16 basecolor, + UINT16 outlinecolor, + UINT8 *basecolormap, + UINT8 *outlinecolormap +); +void LUA_HUD_AddDrawScaledNameTag( + huddrawlist_h list, + fixed_t x, + fixed_t y, + const char *str, + INT32 flags, + fixed_t scale, + UINT16 basecolor, + UINT16 outlinecolor, + UINT8 *basecolormap, + UINT8 *outlinecolormap +); +void LUA_HUD_AddDrawLevelTitle( + huddrawlist_h list, + INT32 x, + INT32 y, + const char *str, + INT32 flags +); +void LUA_HUD_AddFadeScreen( + huddrawlist_h list, + UINT16 color, + UINT8 strength +); + +// Draws the given draw list +void LUA_HUD_DrawList(huddrawlist_h list); + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // __LUA_HUDLIB_DRAWLIST__ diff --git a/src/lua_infolib.c b/src/lua_infolib.c index af2d99a0c..fb07ccebb 100644 --- a/src/lua_infolib.c +++ b/src/lua_infolib.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 2012-2016 by John "JTE" Muniz. -// Copyright (C) 2012-2021 by Sonic Team Junior. +// Copyright (C) 2012-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -1106,75 +1106,161 @@ static int lib_mobjinfolen(lua_State *L) return 1; } +enum mobjinfo_e +{ + mobjinfo_doomednum, + mobjinfo_spawnstate, + mobjinfo_spawnhealth, + mobjinfo_seestate, + mobjinfo_seesound, + mobjinfo_reactiontime, + mobjinfo_attacksound, + mobjinfo_painstate, + mobjinfo_painchance, + mobjinfo_painsound, + mobjinfo_meleestate, + mobjinfo_missilestate, + mobjinfo_deathstate, + mobjinfo_xdeathstate, + mobjinfo_deathsound, + mobjinfo_speed, + mobjinfo_radius, + mobjinfo_height, + mobjinfo_dispoffset, + mobjinfo_mass, + mobjinfo_damage, + mobjinfo_activesound, + mobjinfo_flags, + mobjinfo_raisestate, +}; + +const char *const mobjinfo_opt[] = { + "doomednum", + "spawnstate", + "spawnhealth", + "seestate", + "seesound", + "reactiontime", + "attacksound", + "painstate", + "painchance", + "painsound", + "meleestate", + "missilestate", + "deathstate", + "xdeathstate", + "deathsound", + "speed", + "radius", + "height", + "dispoffset", + "mass", + "damage", + "activesound", + "flags", + "raisestate", + NULL, +}; + +static int mobjinfo_fields_ref = LUA_NOREF; + // mobjinfo_t *, field -> number static int mobjinfo_get(lua_State *L) { mobjinfo_t *info = *((mobjinfo_t **)luaL_checkudata(L, 1, META_MOBJINFO)); - const char *field = luaL_checkstring(L, 2); + enum mobjinfo_e field = luaL_checkoption(L, 2, mobjinfo_opt[0], mobjinfo_opt); I_Assert(info != NULL); I_Assert(info >= mobjinfo); - if (fastcmp(field,"doomednum")) + switch (field) + { + case mobjinfo_doomednum: lua_pushinteger(L, info->doomednum); - else if (fastcmp(field,"spawnstate")) + break; + case mobjinfo_spawnstate: lua_pushinteger(L, info->spawnstate); - else if (fastcmp(field,"spawnhealth")) + break; + case mobjinfo_spawnhealth: lua_pushinteger(L, info->spawnhealth); - else if (fastcmp(field,"seestate")) + break; + case mobjinfo_seestate: lua_pushinteger(L, info->seestate); - else if (fastcmp(field,"seesound")) + break; + case mobjinfo_seesound: lua_pushinteger(L, info->seesound); - else if (fastcmp(field,"reactiontime")) + break; + case mobjinfo_reactiontime: lua_pushinteger(L, info->reactiontime); - else if (fastcmp(field,"attacksound")) + break; + case mobjinfo_attacksound: lua_pushinteger(L, info->attacksound); - else if (fastcmp(field,"painstate")) + break; + case mobjinfo_painstate: lua_pushinteger(L, info->painstate); - else if (fastcmp(field,"painchance")) + break; + case mobjinfo_painchance: lua_pushinteger(L, info->painchance); - else if (fastcmp(field,"painsound")) + break; + case mobjinfo_painsound: lua_pushinteger(L, info->painsound); - else if (fastcmp(field,"meleestate")) + break; + case mobjinfo_meleestate: lua_pushinteger(L, info->meleestate); - else if (fastcmp(field,"missilestate")) + break; + case mobjinfo_missilestate: lua_pushinteger(L, info->missilestate); - else if (fastcmp(field,"deathstate")) + break; + case mobjinfo_deathstate: lua_pushinteger(L, info->deathstate); - else if (fastcmp(field,"xdeathstate")) + break; + case mobjinfo_xdeathstate: lua_pushinteger(L, info->xdeathstate); - else if (fastcmp(field,"deathsound")) + break; + case mobjinfo_deathsound: lua_pushinteger(L, info->deathsound); - else if (fastcmp(field,"speed")) + break; + case mobjinfo_speed: lua_pushinteger(L, info->speed); // sometimes it's fixed_t, sometimes it's not... - else if (fastcmp(field,"radius")) + break; + case mobjinfo_radius: lua_pushfixed(L, info->radius); - else if (fastcmp(field,"height")) + break; + case mobjinfo_height: lua_pushfixed(L, info->height); - else if (fastcmp(field,"dispoffset")) + break; + case mobjinfo_dispoffset: lua_pushinteger(L, info->dispoffset); - else if (fastcmp(field,"mass")) + break; + case mobjinfo_mass: lua_pushinteger(L, info->mass); - else if (fastcmp(field,"damage")) + break; + case mobjinfo_damage: lua_pushinteger(L, info->damage); - else if (fastcmp(field,"activesound")) + break; + case mobjinfo_activesound: lua_pushinteger(L, info->activesound); - else if (fastcmp(field,"flags")) + break; + case mobjinfo_flags: lua_pushinteger(L, info->flags); - else if (fastcmp(field,"raisestate")) + break; + case mobjinfo_raisestate: lua_pushinteger(L, info->raisestate); - else { + break; + default: lua_getfield(L, LUA_REGISTRYINDEX, LREG_EXTVARS); I_Assert(lua_istable(L, -1)); lua_pushlightuserdata(L, info); lua_rawget(L, -2); if (!lua_istable(L, -1)) { // no extra values table - CONS_Debug(DBG_LUA, M_GetText("'%s' has no field named '%s'; returning nil.\n"), "mobjinfo_t", field); + CONS_Debug(DBG_LUA, M_GetText("'%s' has no field named '%s'; returning nil.\n"), "mobjinfo_t", lua_tostring(L, 2)); return 0; } - lua_getfield(L, -1, field); + lua_pushvalue(L, 2); // field name + lua_gettable(L, -2); if (lua_isnil(L, -1)) // no value for this field - CONS_Debug(DBG_LUA, M_GetText("'%s' has no field named '%s'; returning nil.\n"), "mobjinfo_t", field); + CONS_Debug(DBG_LUA, M_GetText("'%s' has no field named '%s'; returning nil.\n"), "mobjinfo_t", lua_tostring(L, 2)); + break; } return 1; } @@ -1183,7 +1269,7 @@ static int mobjinfo_get(lua_State *L) static int mobjinfo_set(lua_State *L) { mobjinfo_t *info = *((mobjinfo_t **)luaL_checkudata(L, 1, META_MOBJINFO)); - const char *field = luaL_checkstring(L, 2); + enum mobjinfo_e field = Lua_optoption(L, 2, -1, mobjinfo_fields_ref); if (hud_running) return luaL_error(L, "Do not alter mobjinfo in HUD rendering code!"); @@ -1193,55 +1279,81 @@ static int mobjinfo_set(lua_State *L) I_Assert(info != NULL); I_Assert(info >= mobjinfo); - if (fastcmp(field,"doomednum")) + switch (field) + { + case mobjinfo_doomednum: info->doomednum = (INT32)luaL_checkinteger(L, 3); - else if (fastcmp(field,"spawnstate")) + break; + case mobjinfo_spawnstate: info->spawnstate = luaL_checkinteger(L, 3); - else if (fastcmp(field,"spawnhealth")) + break; + case mobjinfo_spawnhealth: info->spawnhealth = (INT32)luaL_checkinteger(L, 3); - else if (fastcmp(field,"seestate")) + break; + case mobjinfo_seestate: info->seestate = luaL_checkinteger(L, 3); - else if (fastcmp(field,"seesound")) + break; + case mobjinfo_seesound: info->seesound = luaL_checkinteger(L, 3); - else if (fastcmp(field,"reactiontime")) + break; + case mobjinfo_reactiontime: info->reactiontime = (INT32)luaL_checkinteger(L, 3); - else if (fastcmp(field,"attacksound")) + break; + case mobjinfo_attacksound: info->attacksound = luaL_checkinteger(L, 3); - else if (fastcmp(field,"painstate")) + break; + case mobjinfo_painstate: info->painstate = luaL_checkinteger(L, 3); - else if (fastcmp(field,"painchance")) + break; + case mobjinfo_painchance: info->painchance = (INT32)luaL_checkinteger(L, 3); - else if (fastcmp(field,"painsound")) + break; + case mobjinfo_painsound: info->painsound = luaL_checkinteger(L, 3); - else if (fastcmp(field,"meleestate")) + break; + case mobjinfo_meleestate: info->meleestate = luaL_checkinteger(L, 3); - else if (fastcmp(field,"missilestate")) + break; + case mobjinfo_missilestate: info->missilestate = luaL_checkinteger(L, 3); - else if (fastcmp(field,"deathstate")) + break; + case mobjinfo_deathstate: info->deathstate = luaL_checkinteger(L, 3); - else if (fastcmp(field,"xdeathstate")) + break; + case mobjinfo_xdeathstate: info->xdeathstate = luaL_checkinteger(L, 3); - else if (fastcmp(field,"deathsound")) + break; + case mobjinfo_deathsound: info->deathsound = luaL_checkinteger(L, 3); - else if (fastcmp(field,"speed")) + break; + case mobjinfo_speed: info->speed = luaL_checkfixed(L, 3); - else if (fastcmp(field,"radius")) + break; + case mobjinfo_radius: info->radius = luaL_checkfixed(L, 3); - else if (fastcmp(field,"height")) + break; + case mobjinfo_height: info->height = luaL_checkfixed(L, 3); - else if (fastcmp(field,"dispoffset")) + break; + case mobjinfo_dispoffset: info->dispoffset = (INT32)luaL_checkinteger(L, 3); - else if (fastcmp(field,"mass")) + break; + case mobjinfo_mass: info->mass = (INT32)luaL_checkinteger(L, 3); - else if (fastcmp(field,"damage")) + break; + case mobjinfo_damage: info->damage = (INT32)luaL_checkinteger(L, 3); - else if (fastcmp(field,"activesound")) + break; + case mobjinfo_activesound: info->activesound = luaL_checkinteger(L, 3); - else if (fastcmp(field,"flags")) + break; + case mobjinfo_flags: info->flags = (INT32)luaL_checkinteger(L, 3); - else if (fastcmp(field,"raisestate")) + break; + case mobjinfo_raisestate: info->raisestate = luaL_checkinteger(L, 3); - else { + break; + default: lua_getfield(L, LUA_REGISTRYINDEX, LREG_EXTVARS); I_Assert(lua_istable(L, -1)); lua_pushlightuserdata(L, info); @@ -1249,18 +1361,17 @@ static int mobjinfo_set(lua_State *L) if (lua_isnil(L, -1)) { // This index doesn't have a table for extra values yet, let's make one. lua_pop(L, 1); - CONS_Debug(DBG_LUA, M_GetText("'%s' has no field named '%s'; adding it as Lua data.\n"), "mobjinfo_t", field); + CONS_Debug(DBG_LUA, M_GetText("'%s' has no field named '%s'; adding it as Lua data.\n"), "mobjinfo_t", lua_tostring(L, 2)); lua_newtable(L); lua_pushlightuserdata(L, info); lua_pushvalue(L, -2); // ext value table lua_rawset(L, -4); // LREG_EXTVARS table } + lua_pushvalue(L, 2); // key lua_pushvalue(L, 3); // value to store - lua_setfield(L, -2, field); + lua_settable(L, -3); lua_pop(L, 2); } - //else - //return luaL_error(L, LUA_QL("mobjinfo_t") " has no field named " LUA_QS, field); return 0; } @@ -1788,6 +1899,8 @@ int LUA_InfoLib(lua_State *L) lua_setfield(L, -2, "__len"); lua_pop(L, 1); + mobjinfo_fields_ref = Lua_CreateFieldTable(L, mobjinfo_opt); + luaL_newmetatable(L, META_SKINCOLOR); lua_pushcfunction(L, skincolor_get); lua_setfield(L, -2, "__index"); diff --git a/src/lua_inputlib.c b/src/lua_inputlib.c new file mode 100644 index 000000000..1f75ee6fe --- /dev/null +++ b/src/lua_inputlib.c @@ -0,0 +1,270 @@ +// SONIC ROBO BLAST 2 +//----------------------------------------------------------------------------- +// Copyright (C) 2021-2023 by Sonic Team Junior. +// +// This program is free software distributed under the +// terms of the GNU General Public License, version 2. +// See the 'LICENSE' file for more details. +//----------------------------------------------------------------------------- +/// \file lua_inputlib.c +/// \brief input library for Lua scripting + +#include "doomdef.h" +#include "fastcmp.h" +#include "g_input.h" +#include "g_game.h" +#include "hu_stuff.h" +#include "i_system.h" + +#include "lua_script.h" +#include "lua_libs.h" + +boolean mousegrabbedbylua = true; + +/////////////// +// FUNCTIONS // +/////////////// + +static int lib_gameControlDown(lua_State *L) +{ + int i = luaL_checkinteger(L, 1); + if (i < 0 || i >= NUM_GAMECONTROLS) + return luaL_error(L, "GC_* constant %d out of range (0 - %d)", i, NUM_GAMECONTROLS-1); + lua_pushinteger(L, PLAYER1INPUTDOWN(i)); + return 1; +} + +static int lib_gameControl2Down(lua_State *L) +{ + int i = luaL_checkinteger(L, 1); + if (i < 0 || i >= NUM_GAMECONTROLS) + return luaL_error(L, "GC_* constant %d out of range (0 - %d)", i, NUM_GAMECONTROLS-1); + lua_pushinteger(L, PLAYER2INPUTDOWN(i)); + return 1; +} + +static int lib_gameControlToKeyNum(lua_State *L) +{ + int i = luaL_checkinteger(L, 1); + if (i < 0 || i >= NUM_GAMECONTROLS) + return luaL_error(L, "GC_* constant %d out of range (0 - %d)", i, NUM_GAMECONTROLS-1); + lua_pushinteger(L, gamecontrol[i][0]); + lua_pushinteger(L, gamecontrol[i][1]); + return 2; +} + +static int lib_gameControl2ToKeyNum(lua_State *L) +{ + int i = luaL_checkinteger(L, 1); + if (i < 0 || i >= NUM_GAMECONTROLS) + return luaL_error(L, "GC_* constant %d out of range (0 - %d)", i, NUM_GAMECONTROLS-1); + lua_pushinteger(L, gamecontrolbis[i][0]); + lua_pushinteger(L, gamecontrolbis[i][1]); + return 2; +} + +static int lib_joyAxis(lua_State *L) +{ + int i = luaL_checkinteger(L, 1); + lua_pushinteger(L, JoyAxis(i)); + return 1; +} + +static int lib_joy2Axis(lua_State *L) +{ + int i = luaL_checkinteger(L, 1); + lua_pushinteger(L, Joy2Axis(i)); + return 1; +} + +static int lib_keyNumToName(lua_State *L) +{ + int i = luaL_checkinteger(L, 1); + lua_pushstring(L, G_KeyNumToName(i)); + return 1; +} + +static int lib_keyNameToNum(lua_State *L) +{ + const char *str = luaL_checkstring(L, 1); + lua_pushinteger(L, G_KeyNameToNum(str)); + return 1; +} + +static int lib_keyNumPrintable(lua_State *L) +{ + int i = luaL_checkinteger(L, 1); + lua_pushboolean(L, i >= 32 && i <= 127); + return 1; +} + +static int lib_shiftKeyNum(lua_State *L) +{ + int i = luaL_checkinteger(L, 1); + if (i >= 32 && i <= 127) + lua_pushinteger(L, shiftxform[i]); + return 1; +} + +static int lib_getMouseGrab(lua_State *L) +{ + lua_pushboolean(L, mousegrabbedbylua); + return 1; +} + +static int lib_setMouseGrab(lua_State *L) +{ + mousegrabbedbylua = luaL_checkboolean(L, 1); + I_UpdateMouseGrab(); + return 0; +} + +static int lib_getCursorPosition(lua_State *L) +{ + int x, y; + I_GetCursorPosition(&x, &y); + lua_pushinteger(L, x); + lua_pushinteger(L, y); + return 2; +} + +static luaL_Reg lib[] = { + {"gameControlDown", lib_gameControlDown}, + {"gameControl2Down", lib_gameControl2Down}, + {"gameControlToKeyNum", lib_gameControlToKeyNum}, + {"gameControl2ToKeyNum", lib_gameControl2ToKeyNum}, + {"joyAxis", lib_joyAxis}, + {"joy2Axis", lib_joy2Axis}, + {"keyNumToName", lib_keyNumToName}, + {"keyNameToNum", lib_keyNameToNum}, + {"keyNumPrintable", lib_keyNumPrintable}, + {"shiftKeyNum", lib_shiftKeyNum}, + {"getMouseGrab", lib_getMouseGrab}, + {"setMouseGrab", lib_setMouseGrab}, + {"getCursorPosition", lib_getCursorPosition}, + {NULL, NULL} +}; + +/////////////////// +// gamekeydown[] // +/////////////////// + +static int lib_getGameKeyDown(lua_State *L) +{ + int i = luaL_checkinteger(L, 2); + if (i < 0 || i >= NUMINPUTS) + return luaL_error(L, "gamekeydown[] index %d out of range (0 - %d)", i, NUMINPUTS-1); + lua_pushboolean(L, gamekeydown[i]); + return 1; +} + +static int lib_setGameKeyDown(lua_State *L) +{ + int i = luaL_checkinteger(L, 2); + boolean j = luaL_checkboolean(L, 3); + if (i < 0 || i >= NUMINPUTS) + return luaL_error(L, "gamekeydown[] index %d out of range (0 - %d)", i, NUMINPUTS-1); + gamekeydown[i] = j; + return 0; +} + +static int lib_lenGameKeyDown(lua_State *L) +{ + lua_pushinteger(L, NUMINPUTS); + return 1; +} + +/////////////// +// KEY EVENT // +/////////////// + +static int keyevent_get(lua_State *L) +{ + event_t *event = *((event_t **)luaL_checkudata(L, 1, META_KEYEVENT)); + const char *field = luaL_checkstring(L, 2); + + I_Assert(event != NULL); + + if (fastcmp(field,"name")) + lua_pushstring(L, G_KeyNumToName(event->key)); + else if (fastcmp(field,"num")) + lua_pushinteger(L, event->key); + else if (fastcmp(field,"repeated")) + lua_pushboolean(L, event->repeated); + else + return luaL_error(L, "keyevent_t has no field named %s", field); + + return 1; +} + +/////////// +// MOUSE // +/////////// + +static int mouse_get(lua_State *L) +{ + mouse_t *m = *((mouse_t **)luaL_checkudata(L, 1, META_MOUSE)); + const char *field = luaL_checkstring(L, 2); + + I_Assert(m != NULL); + + if (fastcmp(field,"dx")) + lua_pushinteger(L, m->dx); + else if (fastcmp(field,"dy")) + lua_pushinteger(L, m->dy); + else if (fastcmp(field,"mlookdy")) + lua_pushinteger(L, m->mlookdy); + else if (fastcmp(field,"rdx")) + lua_pushinteger(L, m->rdx); + else if (fastcmp(field,"rdy")) + lua_pushinteger(L, m->rdy); + else if (fastcmp(field,"buttons")) + lua_pushinteger(L, m->buttons); + else + return luaL_error(L, "mouse_t has no field named %s", field); + + return 1; +} + +// #mouse -> 1 or 2 +static int mouse_num(lua_State *L) +{ + mouse_t *m = *((mouse_t **)luaL_checkudata(L, 1, META_MOUSE)); + + I_Assert(m != NULL); + + lua_pushinteger(L, m == &mouse ? 1 : 2); + return 1; +} + +int LUA_InputLib(lua_State *L) +{ + lua_newuserdata(L, 0); + lua_createtable(L, 0, 2); + lua_pushcfunction(L, lib_getGameKeyDown); + lua_setfield(L, -2, "__index"); + + lua_pushcfunction(L, lib_setGameKeyDown); + lua_setfield(L, -2, "__newindex"); + + lua_pushcfunction(L, lib_lenGameKeyDown); + lua_setfield(L, -2, "__len"); + lua_setmetatable(L, -2); + lua_setglobal(L, "gamekeydown"); + + luaL_newmetatable(L, META_KEYEVENT); + lua_pushcfunction(L, keyevent_get); + lua_setfield(L, -2, "__index"); + lua_pop(L, 1); + + luaL_newmetatable(L, META_MOUSE); + lua_pushcfunction(L, mouse_get); + lua_setfield(L, -2, "__index"); + + lua_pushcfunction(L, mouse_num); + lua_setfield(L, -2, "__len"); + lua_pop(L, 1); + + luaL_register(L, "input", lib); + return 0; +} diff --git a/src/lua_libs.h b/src/lua_libs.h index 05061f118..7f8d21f38 100644 --- a/src/lua_libs.h +++ b/src/lua_libs.h @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 2012-2016 by John "JTE" Muniz. -// Copyright (C) 2012-2021 by Sonic Team Junior. +// Copyright (C) 2012-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -12,6 +12,8 @@ extern lua_State *gL; +extern boolean mousegrabbedbylua; + #define MUTABLE_TAGS #define LREG_VALID "VALID_USERDATA" @@ -88,6 +90,9 @@ extern lua_State *gL; #define META_LUABANKS "LUABANKS[]*" +#define META_KEYEVENT "KEYEVENT_T*" +#define META_MOUSE "MOUSE_T*" + boolean luaL_checkboolean(lua_State *L, int narg); int LUA_EnumLib(lua_State *L); @@ -106,3 +111,4 @@ int LUA_TagLib(lua_State *L); int LUA_PolyObjLib(lua_State *L); int LUA_BlockmapLib(lua_State *L); int LUA_HudLib(lua_State *L); +int LUA_InputLib(lua_State *L); diff --git a/src/lua_maplib.c b/src/lua_maplib.c index 9031c99f1..dc477c81f 100644 --- a/src/lua_maplib.c +++ b/src/lua_maplib.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 2012-2016 by John "JTE" Muniz. -// Copyright (C) 2012-2021 by Sonic Team Junior. +// Copyright (C) 2012-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -35,6 +35,10 @@ enum sector_e { sector_floorpic, sector_ceilingpic, sector_lightlevel, + sector_floorlightlevel, + sector_floorlightabsolute, + sector_ceilinglightlevel, + sector_ceilinglightabsolute, sector_special, sector_tag, sector_taglist, @@ -44,7 +48,14 @@ enum sector_e { sector_lines, sector_ffloors, sector_fslope, - sector_cslope + sector_cslope, + sector_flags, + sector_specialflags, + sector_damagetype, + sector_triggertag, + sector_triggerer, + sector_friction, + sector_gravity, }; static const char *const sector_opt[] = { @@ -54,6 +65,10 @@ static const char *const sector_opt[] = { "floorpic", "ceilingpic", "lightlevel", + "floorlightlevel", + "floorlightabsolute", + "ceilinglightlevel", + "ceilinglightabsolute", "special", "tag", "taglist", @@ -64,8 +79,17 @@ static const char *const sector_opt[] = { "ffloors", "f_slope", "c_slope", + "flags", + "specialflags", + "damagetype", + "triggertag", + "triggerer", + "friction", + "gravity", NULL}; +static int sector_fields_ref = LUA_NOREF; + enum subsector_e { subsector_valid = 0, subsector_sector, @@ -82,12 +106,15 @@ static const char *const subsector_opt[] = { "polyList", NULL}; +static int subsector_fields_ref = LUA_NOREF; + enum line_e { line_valid = 0, line_v1, line_v2, line_dx, line_dy, + line_angle, line_flags, line_special, line_tag, @@ -113,6 +140,7 @@ static const char *const line_opt[] = { "v2", "dx", "dy", + "angle", "flags", "special", "tag", @@ -132,6 +160,8 @@ static const char *const line_opt[] = { "callcount", NULL}; +static int line_fields_ref = LUA_NOREF; + enum side_e { side_valid = 0, side_textureoffset, @@ -160,6 +190,8 @@ static const char *const side_opt[] = { "text", NULL}; +static int side_fields_ref = LUA_NOREF; + enum vertex_e { vertex_valid = 0, vertex_x, @@ -180,6 +212,8 @@ static const char *const vertex_opt[] = { "ceilingzset", NULL}; +static int vertex_fields_ref = LUA_NOREF; + enum ffloor_e { ffloor_valid = 0, ffloor_topheight, @@ -190,12 +224,20 @@ enum ffloor_e { ffloor_tslope, ffloor_bslope, ffloor_sector, + ffloor_fofflags, ffloor_flags, ffloor_master, ffloor_target, ffloor_next, ffloor_prev, ffloor_alpha, + ffloor_blend, + ffloor_bustflags, + ffloor_busttype, + ffloor_busttag, + ffloor_sinkspeed, + ffloor_friction, + ffloor_bouncestrength, }; static const char *const ffloor_opt[] = { @@ -208,14 +250,24 @@ static const char *const ffloor_opt[] = { "t_slope", "b_slope", "sector", // secnum pushed as control sector userdata + "fofflags", "flags", "master", // control linedef "target", // target sector "next", "prev", "alpha", + "blend", + "bustflags", + "busttype", + "busttag", + "sinkspeed", + "friction", + "bouncestrength", NULL}; +static int ffloor_fields_ref = LUA_NOREF; + #ifdef HAVE_LUA_SEGS enum seg_e { seg_valid = 0, @@ -245,6 +297,8 @@ static const char *const seg_opt[] = { "polyseg", NULL}; +static int seg_fields_ref = LUA_NOREF; + enum node_e { node_valid = 0, node_x, @@ -265,6 +319,8 @@ static const char *const node_opt[] = { "children", NULL}; +static int node_fields_ref = LUA_NOREF; + enum nodechild_e { nodechild_valid = 0, nodechild_right, @@ -316,6 +372,8 @@ static const char *const slope_opt[] = { "flags", NULL}; +static int slope_fields_ref = LUA_NOREF; + // shared by both vector2_t and vector3_t enum vector_e { vector_x = 0, @@ -535,7 +593,7 @@ static int sectorlines_num(lua_State *L) static int sector_get(lua_State *L) { sector_t *sector = *((sector_t **)luaL_checkudata(L, 1, META_SECTOR)); - enum sector_e field = luaL_checkoption(L, 2, sector_opt[0], sector_opt); + enum sector_e field = Lua_optoption(L, 2, sector_valid, sector_fields_ref); INT16 i; if (!sector) @@ -579,6 +637,18 @@ static int sector_get(lua_State *L) case sector_lightlevel: lua_pushinteger(L, sector->lightlevel); return 1; + case sector_floorlightlevel: + lua_pushinteger(L, sector->floorlightlevel); + return 1; + case sector_floorlightabsolute: + lua_pushboolean(L, sector->floorlightabsolute); + return 1; + case sector_ceilinglightlevel: + lua_pushinteger(L, sector->ceilinglightlevel); + return 1; + case sector_ceilinglightabsolute: + lua_pushboolean(L, sector->ceilinglightabsolute); + return 1; case sector_special: lua_pushinteger(L, sector->special); return 1; @@ -617,6 +687,27 @@ static int sector_get(lua_State *L) case sector_cslope: // c_slope LUA_PushUserdata(L, sector->c_slope, META_SLOPE); return 1; + case sector_flags: // flags + lua_pushinteger(L, sector->flags); + return 1; + case sector_specialflags: // specialflags + lua_pushinteger(L, sector->specialflags); + return 1; + case sector_damagetype: // damagetype + lua_pushinteger(L, (UINT8)sector->damagetype); + return 1; + case sector_triggertag: // triggertag + lua_pushinteger(L, (INT16)sector->triggertag); + return 1; + case sector_triggerer: // triggerer + lua_pushinteger(L, (UINT8)sector->triggerer); + return 1; + case sector_friction: // friction + lua_pushfixed(L, sector->friction); + return 1; + case sector_gravity: // gravity + lua_pushfixed(L, sector->gravity); + return 1; } return 0; } @@ -624,7 +715,7 @@ static int sector_get(lua_State *L) static int sector_set(lua_State *L) { sector_t *sector = *((sector_t **)luaL_checkudata(L, 1, META_SECTOR)); - enum sector_e field = luaL_checkoption(L, 2, sector_opt[0], sector_opt); + enum sector_e field = Lua_optoption(L, 2, sector_valid, sector_fields_ref); if (!sector) return luaL_error(L, "accessed sector_t doesn't exist anymore."); @@ -644,6 +735,7 @@ static int sector_set(lua_State *L) case sector_ffloors: // ffloors case sector_fslope: // f_slope case sector_cslope: // c_slope + case sector_friction: // friction default: return luaL_error(L, "sector_t field " LUA_QS " cannot be set.", sector_opt[field]); case sector_floorheight: { // floorheight @@ -683,6 +775,18 @@ static int sector_set(lua_State *L) case sector_lightlevel: sector->lightlevel = (INT16)luaL_checkinteger(L, 3); break; + case sector_floorlightlevel: + sector->floorlightlevel = (INT16)luaL_checkinteger(L, 3); + break; + case sector_floorlightabsolute: + sector->floorlightabsolute = luaL_checkboolean(L, 3); + break; + case sector_ceilinglightlevel: + sector->ceilinglightlevel = (INT16)luaL_checkinteger(L, 3); + break; + case sector_ceilinglightabsolute: + sector->ceilinglightabsolute = luaL_checkboolean(L, 3); + break; case sector_special: sector->special = (INT16)luaL_checkinteger(L, 3); break; @@ -691,6 +795,25 @@ static int sector_set(lua_State *L) break; case sector_taglist: return LUA_ErrSetDirectly(L, "sector_t", "taglist"); + case sector_flags: + sector->flags = luaL_checkinteger(L, 3); + CheckForReverseGravity |= (sector->flags & MSF_GRAVITYFLIP); + break; + case sector_specialflags: + sector->specialflags = luaL_checkinteger(L, 3); + break; + case sector_damagetype: + sector->damagetype = (UINT8)luaL_checkinteger(L, 3); + break; + case sector_triggertag: + sector->triggertag = (INT16)luaL_checkinteger(L, 3); + break; + case sector_triggerer: + sector->triggerer = (UINT8)luaL_checkinteger(L, 3); + break; + case sector_gravity: + sector->gravity = luaL_checkfixed(L, 3); + break; } return 0; } @@ -709,7 +832,7 @@ static int sector_num(lua_State *L) static int subsector_get(lua_State *L) { subsector_t *subsector = *((subsector_t **)luaL_checkudata(L, 1, META_SUBSECTOR)); - enum subsector_e field = luaL_checkoption(L, 2, subsector_opt[0], subsector_opt); + enum subsector_e field = Lua_optoption(L, 2, subsector_valid, subsector_fields_ref); if (!subsector) { @@ -793,7 +916,7 @@ static int linestringargs_len(lua_State *L) static int line_get(lua_State *L) { line_t *line = *((line_t **)luaL_checkudata(L, 1, META_LINE)); - enum line_e field = luaL_checkoption(L, 2, line_opt[0], line_opt); + enum line_e field = Lua_optoption(L, 2, line_valid, line_fields_ref); if (!line) { @@ -821,6 +944,9 @@ static int line_get(lua_State *L) case line_dy: lua_pushfixed(L, line->dy); return 1; + case line_angle: + lua_pushangle(L, line->angle); + return 1; case line_flags: lua_pushinteger(L, line->flags); return 1; @@ -949,7 +1075,7 @@ static int sidenum_get(lua_State *L) static int side_get(lua_State *L) { side_t *side = *((side_t **)luaL_checkudata(L, 1, META_SIDE)); - enum side_e field = luaL_checkoption(L, 2, side_opt[0], side_opt); + enum side_e field = Lua_optoption(L, 2, side_valid, side_fields_ref); if (!side) { @@ -1002,7 +1128,7 @@ static int side_get(lua_State *L) static int side_set(lua_State *L) { side_t *side = *((side_t **)luaL_checkudata(L, 1, META_SIDE)); - enum side_e field = luaL_checkoption(L, 2, side_opt[0], side_opt); + enum side_e field = Lua_optoption(L, 2, side_valid, side_fields_ref); if (!side) { @@ -1058,7 +1184,7 @@ static int side_num(lua_State *L) static int vertex_get(lua_State *L) { vertex_t *vertex = *((vertex_t **)luaL_checkudata(L, 1, META_VERTEX)); - enum vertex_e field = luaL_checkoption(L, 2, vertex_opt[0], vertex_opt); + enum vertex_e field = Lua_optoption(L, 2, vertex_valid, vertex_fields_ref); if (!vertex) { @@ -1112,7 +1238,7 @@ static int vertex_num(lua_State *L) static int seg_get(lua_State *L) { seg_t *seg = *((seg_t **)luaL_checkudata(L, 1, META_SEG)); - enum seg_e field = luaL_checkoption(L, 2, seg_opt[0], seg_opt); + enum seg_e field = Lua_optoption(L, 2, seg_valid, seg_fields_ref); if (!seg) { @@ -1176,7 +1302,7 @@ static int seg_num(lua_State *L) static int node_get(lua_State *L) { node_t *node = *((node_t **)luaL_checkudata(L, 1, META_NODE)); - enum node_e field = luaL_checkoption(L, 2, node_opt[0], node_opt); + enum node_e field = Lua_optoption(L, 2, node_valid, node_fields_ref); if (!node) { @@ -1735,10 +1861,84 @@ static int lib_numnodes(lua_State *L) // ffloor_t // ////////////// +static INT32 P_GetOldFOFFlags(ffloor_t *fflr) +{ + INT32 result = 0; + if (fflr->fofflags & FOF_EXISTS) + result |= FF_OLD_EXISTS; + if (fflr->fofflags & FOF_BLOCKPLAYER) + result |= FF_OLD_BLOCKPLAYER; + if (fflr->fofflags & FOF_BLOCKOTHERS) + result |= FF_OLD_BLOCKOTHERS; + if (fflr->fofflags & FOF_RENDERSIDES) + result |= FF_OLD_RENDERSIDES; + if (fflr->fofflags & FOF_RENDERPLANES) + result |= FF_OLD_RENDERPLANES; + if (fflr->fofflags & FOF_SWIMMABLE) + result |= FF_OLD_SWIMMABLE; + if (fflr->fofflags & FOF_NOSHADE) + result |= FF_OLD_NOSHADE; + if (fflr->fofflags & FOF_CUTSOLIDS) + result |= FF_OLD_CUTSOLIDS; + if (fflr->fofflags & FOF_CUTEXTRA) + result |= FF_OLD_CUTEXTRA; + if (fflr->fofflags & FOF_CUTSPRITES) + result |= FF_OLD_CUTSPRITES; + if (fflr->fofflags & FOF_BOTHPLANES) + result |= FF_OLD_BOTHPLANES; + if (fflr->fofflags & FOF_EXTRA) + result |= FF_OLD_EXTRA; + if (fflr->fofflags & FOF_TRANSLUCENT) + result |= FF_OLD_TRANSLUCENT; + if (fflr->fofflags & FOF_FOG) + result |= FF_OLD_FOG; + if (fflr->fofflags & FOF_INVERTPLANES) + result |= FF_OLD_INVERTPLANES; + if (fflr->fofflags & FOF_ALLSIDES) + result |= FF_OLD_ALLSIDES; + if (fflr->fofflags & FOF_INVERTSIDES) + result |= FF_OLD_INVERTSIDES; + if (fflr->fofflags & FOF_DOUBLESHADOW) + result |= FF_OLD_DOUBLESHADOW; + if (fflr->fofflags & FOF_FLOATBOB) + result |= FF_OLD_FLOATBOB; + if (fflr->fofflags & FOF_NORETURN) + result |= FF_OLD_NORETURN; + if (fflr->fofflags & FOF_CRUMBLE) + result |= FF_OLD_CRUMBLE; + if (fflr->bustflags & FB_ONLYBOTTOM) + result |= FF_OLD_SHATTERBOTTOM; + if (fflr->fofflags & FOF_GOOWATER) + result |= FF_OLD_GOOWATER; + if (fflr->fofflags & FOF_MARIO) + result |= FF_OLD_MARIO; + if (fflr->fofflags & FOF_BUSTUP) + result |= FF_OLD_BUSTUP; + if (fflr->fofflags & FOF_QUICKSAND) + result |= FF_OLD_QUICKSAND; + if (fflr->fofflags & FOF_PLATFORM) + result |= FF_OLD_PLATFORM; + if (fflr->fofflags & FOF_REVERSEPLATFORM) + result |= FF_OLD_REVERSEPLATFORM; + if (fflr->fofflags & FOF_INTANGIBLEFLATS) + result |= FF_OLD_INTANGIBLEFLATS; + if (fflr->busttype == BT_TOUCH) + result |= FF_OLD_SHATTER; + if (fflr->busttype == BT_SPINBUST) + result |= FF_OLD_SPINBUST; + if (fflr->busttype == BT_STRONG) + result |= FF_OLD_STRONGBUST; + if (fflr->fofflags & FOF_RIPPLE) + result |= FF_OLD_RIPPLE; + if (fflr->fofflags & FOF_COLORMAPONLY) + result |= FF_OLD_COLORMAPONLY; + return result; +} + static int ffloor_get(lua_State *L) { ffloor_t *ffloor = *((ffloor_t **)luaL_checkudata(L, 1, META_FFLOOR)); - enum ffloor_e field = luaL_checkoption(L, 2, ffloor_opt[0], ffloor_opt); + enum ffloor_e field = Lua_optoption(L, 2, ffloor_valid, ffloor_fields_ref); INT16 i; if (!ffloor) @@ -1789,8 +1989,11 @@ static int ffloor_get(lua_State *L) case ffloor_sector: LUA_PushUserdata(L, §ors[ffloor->secnum], META_SECTOR); return 1; + case ffloor_fofflags: + lua_pushinteger(L, ffloor->fofflags); + return 1; case ffloor_flags: - lua_pushinteger(L, ffloor->flags); + lua_pushinteger(L, P_GetOldFOFFlags(ffloor)); return 1; case ffloor_master: LUA_PushUserdata(L, ffloor->master, META_LINE); @@ -1807,14 +2010,117 @@ static int ffloor_get(lua_State *L) case ffloor_alpha: lua_pushinteger(L, ffloor->alpha); return 1; + case ffloor_blend: + lua_pushinteger(L, ffloor->blend); + return 1; + case ffloor_bustflags: + lua_pushinteger(L, ffloor->bustflags); + return 1; + case ffloor_busttype: + lua_pushinteger(L, ffloor->busttype); + return 1; + case ffloor_busttag: + lua_pushinteger(L, ffloor->busttag); + return 1; + case ffloor_sinkspeed: + lua_pushfixed(L, ffloor->sinkspeed); + return 1; + case ffloor_friction: + lua_pushfixed(L, ffloor->friction); + return 1; + case ffloor_bouncestrength: + lua_pushfixed(L, ffloor->bouncestrength); + return 1; } return 0; } +static void P_SetOldFOFFlags(ffloor_t *fflr, oldffloortype_e oldflags) +{ + ffloortype_e originalflags = fflr->fofflags; + fflr->fofflags = 0; + if (oldflags & FF_OLD_EXISTS) + fflr->fofflags |= FOF_EXISTS; + if (oldflags & FF_OLD_BLOCKPLAYER) + fflr->fofflags |= FOF_BLOCKPLAYER; + if (oldflags & FF_OLD_BLOCKOTHERS) + fflr->fofflags |= FOF_BLOCKOTHERS; + if (oldflags & FF_OLD_RENDERSIDES) + fflr->fofflags |= FOF_RENDERSIDES; + if (oldflags & FF_OLD_RENDERPLANES) + fflr->fofflags |= FOF_RENDERPLANES; + if (oldflags & FF_OLD_SWIMMABLE) + fflr->fofflags |= FOF_SWIMMABLE; + if (oldflags & FF_OLD_NOSHADE) + fflr->fofflags |= FOF_NOSHADE; + if (oldflags & FF_OLD_CUTSOLIDS) + fflr->fofflags |= FOF_CUTSOLIDS; + if (oldflags & FF_OLD_CUTEXTRA) + fflr->fofflags |= FOF_CUTEXTRA; + if (oldflags & FF_OLD_CUTSPRITES) + fflr->fofflags |= FOF_CUTSPRITES; + if (oldflags & FF_OLD_BOTHPLANES) + fflr->fofflags |= FOF_BOTHPLANES; + if (oldflags & FF_OLD_EXTRA) + fflr->fofflags |= FOF_EXTRA; + if (oldflags & FF_OLD_TRANSLUCENT) + fflr->fofflags |= FOF_TRANSLUCENT; + if (oldflags & FF_OLD_FOG) + fflr->fofflags |= FOF_FOG; + if (oldflags & FF_OLD_INVERTPLANES) + fflr->fofflags |= FOF_INVERTPLANES; + if (oldflags & FF_OLD_ALLSIDES) + fflr->fofflags |= FOF_ALLSIDES; + if (oldflags & FF_OLD_INVERTSIDES) + fflr->fofflags |= FOF_INVERTSIDES; + if (oldflags & FF_OLD_DOUBLESHADOW) + fflr->fofflags |= FOF_DOUBLESHADOW; + if (oldflags & FF_OLD_FLOATBOB) + fflr->fofflags |= FOF_FLOATBOB; + if (oldflags & FF_OLD_NORETURN) + fflr->fofflags |= FOF_NORETURN; + if (oldflags & FF_OLD_CRUMBLE) + fflr->fofflags |= FOF_CRUMBLE; + if (oldflags & FF_OLD_GOOWATER) + fflr->fofflags |= FOF_GOOWATER; + if (oldflags & FF_OLD_MARIO) + fflr->fofflags |= FOF_MARIO; + if (oldflags & FF_OLD_BUSTUP) + fflr->fofflags |= FOF_BUSTUP; + if (oldflags & FF_OLD_QUICKSAND) + fflr->fofflags |= FOF_QUICKSAND; + if (oldflags & FF_OLD_PLATFORM) + fflr->fofflags |= FOF_PLATFORM; + if (oldflags & FF_OLD_REVERSEPLATFORM) + fflr->fofflags |= FOF_REVERSEPLATFORM; + if (oldflags & FF_OLD_RIPPLE) + fflr->fofflags |= FOF_RIPPLE; + if (oldflags & FF_OLD_COLORMAPONLY) + fflr->fofflags |= FOF_COLORMAPONLY; + if (originalflags & FOF_BOUNCY) + fflr->fofflags |= FOF_BOUNCY; + if (originalflags & FOF_SPLAT) + fflr->fofflags |= FOF_SPLAT; + + if (oldflags & FF_OLD_SHATTER) + fflr->busttype = BT_TOUCH; + else if (oldflags & FF_OLD_SPINBUST) + fflr->busttype = BT_SPINBUST; + else if (oldflags & FF_OLD_STRONGBUST) + fflr->busttype = BT_STRONG; + else + fflr->busttype = BT_REGULAR; + + if (oldflags & FF_OLD_SHATTERBOTTOM) + fflr->bustflags |= FB_ONLYBOTTOM; + else + fflr->bustflags &= ~FB_ONLYBOTTOM; +} + static int ffloor_set(lua_State *L) { ffloor_t *ffloor = *((ffloor_t **)luaL_checkudata(L, 1, META_FFLOOR)); - enum ffloor_e field = luaL_checkoption(L, 2, ffloor_opt[0], ffloor_opt); + enum ffloor_e field = Lua_optoption(L, 2, ffloor_valid, ffloor_fields_ref); if (!ffloor) return luaL_error(L, "accessed ffloor_t doesn't exist anymore."); @@ -1875,16 +2181,29 @@ static int ffloor_set(lua_State *L) case ffloor_bottompic: *ffloor->bottompic = P_AddLevelFlatRuntime(luaL_checkstring(L, 3)); break; + case ffloor_fofflags: { + ffloortype_e oldflags = ffloor->fofflags; // store FOF's old flags + ffloor->fofflags = luaL_checkinteger(L, 3); + if (ffloor->fofflags != oldflags) + ffloor->target->moved = true; // reset target sector's lightlist + break; + } case ffloor_flags: { - ffloortype_e oldflags = ffloor->flags; // store FOF's old flags - ffloor->flags = luaL_checkinteger(L, 3); - if (ffloor->flags != oldflags) + ffloortype_e oldflags = ffloor->fofflags; // store FOF's old flags + busttype_e oldbusttype = ffloor->busttype; + ffloorbustflags_e oldbustflags = ffloor->bustflags; + oldffloortype_e newflags = luaL_checkinteger(L, 3); + P_SetOldFOFFlags(ffloor, newflags); + if (ffloor->fofflags != oldflags || ffloor->busttype != oldbusttype || ffloor->bustflags != oldbustflags) ffloor->target->moved = true; // reset target sector's lightlist break; } case ffloor_alpha: ffloor->alpha = (INT32)luaL_checkinteger(L, 3); break; + case ffloor_blend: + ffloor->blend = (INT32)luaL_checkinteger(L, 3); + break; } return 0; } @@ -1896,7 +2215,7 @@ static int ffloor_set(lua_State *L) static int slope_get(lua_State *L) { pslope_t *slope = *((pslope_t **)luaL_checkudata(L, 1, META_SLOPE)); - enum slope_e field = luaL_checkoption(L, 2, slope_opt[0], slope_opt); + enum slope_e field = Lua_optoption(L, 2, slope_valid, slope_fields_ref); if (!slope) { @@ -1940,7 +2259,7 @@ static int slope_get(lua_State *L) static int slope_set(lua_State *L) { pslope_t *slope = *((pslope_t **)luaL_checkudata(L, 1, META_SLOPE)); - enum slope_e field = luaL_checkoption(L, 2, slope_opt[0], slope_opt); + enum slope_e field = Lua_optoption(L, 2, slope_valid, slope_fields_ref); if (!slope) return luaL_error(L, "accessed pslope_t doesn't exist anymore."); @@ -2104,110 +2423,258 @@ static int lib_nummapheaders(lua_State *L) // mapheader_t // ///////////////// +enum mapheaderinfo_e +{ + mapheaderinfo_lvlttl, + mapheaderinfo_subttl, + mapheaderinfo_actnum, + mapheaderinfo_typeoflevel, + mapheaderinfo_nextlevel, + mapheaderinfo_marathonnext, + mapheaderinfo_keywords, + mapheaderinfo_musname, + mapheaderinfo_mustrack, + mapheaderinfo_muspos, + mapheaderinfo_musinterfadeout, + mapheaderinfo_musintername, + mapheaderinfo_muspostbossname, + mapheaderinfo_muspostbosstrack, + mapheaderinfo_muspostbosspos, + mapheaderinfo_muspostbossfadein, + mapheaderinfo_musforcereset, + mapheaderinfo_forcecharacter, + mapheaderinfo_weather, + mapheaderinfo_skynum, + mapheaderinfo_skybox_scalex, + mapheaderinfo_skybox_scaley, + mapheaderinfo_skybox_scalez, + mapheaderinfo_interscreen, + mapheaderinfo_runsoc, + mapheaderinfo_scriptname, + mapheaderinfo_precutscenenum, + mapheaderinfo_cutscenenum, + mapheaderinfo_countdown, + mapheaderinfo_palette, + mapheaderinfo_numlaps, + mapheaderinfo_unlockrequired, + mapheaderinfo_levelselect, + mapheaderinfo_bonustype, + mapheaderinfo_ltzzpatch, + mapheaderinfo_ltzztext, + mapheaderinfo_ltactdiamond, + mapheaderinfo_maxbonuslives, + mapheaderinfo_levelflags, + mapheaderinfo_menuflags, + mapheaderinfo_selectheading, + mapheaderinfo_startrings, + mapheaderinfo_sstimer, + mapheaderinfo_ssspheres, + mapheaderinfo_gravity, +}; + +static const char *const mapheaderinfo_opt[] = { + "lvlttl", + "subttl", + "actnum", + "typeoflevel", + "nextlevel", + "marathonnext", + "keywords", + "musname", + "mustrack", + "muspos", + "musinterfadeout", + "musintername", + "muspostbossname", + "muspostbosstrack", + "muspostbosspos", + "muspostbossfadein", + "musforcereset", + "forcecharacter", + "weather", + "skynum", + "skybox_scalex", + "skybox_scaley", + "skybox_scalez", + "interscreen", + "runsoc", + "scriptname", + "precutscenenum", + "cutscenenum", + "countdown", + "palette", + "numlaps", + "unlockrequired", + "levelselect", + "bonustype", + "ltzzpatch", + "ltzztext", + "ltactdiamond", + "maxbonuslives", + "levelflags", + "menuflags", + "selectheading", + "startrings", + "sstimer", + "ssspheres", + "gravity", + NULL, +}; + +static int mapheaderinfo_fields_ref = LUA_NOREF; + static int mapheaderinfo_get(lua_State *L) { mapheader_t *header = *((mapheader_t **)luaL_checkudata(L, 1, META_MAPHEADER)); - const char *field = luaL_checkstring(L, 2); + enum mapheaderinfo_e field = Lua_optoption(L, 2, -1, mapheaderinfo_fields_ref); INT16 i; - if (fastcmp(field,"lvlttl")) + + switch (field) + { + case mapheaderinfo_lvlttl: lua_pushstring(L, header->lvlttl); - else if (fastcmp(field,"subttl")) + break; + case mapheaderinfo_subttl: lua_pushstring(L, header->subttl); - else if (fastcmp(field,"actnum")) + break; + case mapheaderinfo_actnum: lua_pushinteger(L, header->actnum); - else if (fastcmp(field,"typeoflevel")) + break; + case mapheaderinfo_typeoflevel: lua_pushinteger(L, header->typeoflevel); - else if (fastcmp(field,"nextlevel")) + break; + case mapheaderinfo_nextlevel: lua_pushinteger(L, header->nextlevel); - else if (fastcmp(field,"marathonnext")) + break; + case mapheaderinfo_marathonnext: lua_pushinteger(L, header->marathonnext); - else if (fastcmp(field,"keywords")) + break; + case mapheaderinfo_keywords: lua_pushstring(L, header->keywords); - else if (fastcmp(field,"musname")) + break; + case mapheaderinfo_musname: lua_pushstring(L, header->musname); - else if (fastcmp(field,"mustrack")) + break; + case mapheaderinfo_mustrack: lua_pushinteger(L, header->mustrack); - else if (fastcmp(field,"muspos")) + break; + case mapheaderinfo_muspos: lua_pushinteger(L, header->muspos); - else if (fastcmp(field,"musinterfadeout")) + break; + case mapheaderinfo_musinterfadeout: lua_pushinteger(L, header->musinterfadeout); - else if (fastcmp(field,"musintername")) + break; + case mapheaderinfo_musintername: lua_pushstring(L, header->musintername); - else if (fastcmp(field,"muspostbossname")) + break; + case mapheaderinfo_muspostbossname: lua_pushstring(L, header->muspostbossname); - else if (fastcmp(field,"muspostbosstrack")) + break; + case mapheaderinfo_muspostbosstrack: lua_pushinteger(L, header->muspostbosstrack); - else if (fastcmp(field,"muspostbosspos")) + break; + case mapheaderinfo_muspostbosspos: lua_pushinteger(L, header->muspostbosspos); - else if (fastcmp(field,"muspostbossfadein")) + break; + case mapheaderinfo_muspostbossfadein: lua_pushinteger(L, header->muspostbossfadein); - else if (fastcmp(field,"musforcereset")) + break; + case mapheaderinfo_musforcereset: lua_pushinteger(L, header->musforcereset); - else if (fastcmp(field,"forcecharacter")) + break; + case mapheaderinfo_forcecharacter: lua_pushstring(L, header->forcecharacter); - else if (fastcmp(field,"weather")) + break; + case mapheaderinfo_weather: lua_pushinteger(L, header->weather); - else if (fastcmp(field,"skynum")) + break; + case mapheaderinfo_skynum: lua_pushinteger(L, header->skynum); - else if (fastcmp(field,"skybox_scalex")) + break; + case mapheaderinfo_skybox_scalex: lua_pushinteger(L, header->skybox_scalex); - else if (fastcmp(field,"skybox_scaley")) + break; + case mapheaderinfo_skybox_scaley: lua_pushinteger(L, header->skybox_scaley); - else if (fastcmp(field,"skybox_scalez")) + break; + case mapheaderinfo_skybox_scalez: lua_pushinteger(L, header->skybox_scalez); - else if (fastcmp(field,"interscreen")) { + break; + case mapheaderinfo_interscreen: for (i = 0; i < 8; i++) if (!header->interscreen[i]) break; lua_pushlstring(L, header->interscreen, i); - } else if (fastcmp(field,"runsoc")) + break; + case mapheaderinfo_runsoc: lua_pushstring(L, header->runsoc); - else if (fastcmp(field,"scriptname")) + break; + case mapheaderinfo_scriptname: lua_pushstring(L, header->scriptname); - else if (fastcmp(field,"precutscenenum")) + break; + case mapheaderinfo_precutscenenum: lua_pushinteger(L, header->precutscenenum); - else if (fastcmp(field,"cutscenenum")) + break; + case mapheaderinfo_cutscenenum: lua_pushinteger(L, header->cutscenenum); - else if (fastcmp(field,"countdown")) + break; + case mapheaderinfo_countdown: lua_pushinteger(L, header->countdown); - else if (fastcmp(field,"palette")) + break; + case mapheaderinfo_palette: lua_pushinteger(L, header->palette); - else if (fastcmp(field,"numlaps")) + break; + case mapheaderinfo_numlaps: lua_pushinteger(L, header->numlaps); - else if (fastcmp(field,"unlockrequired")) + break; + case mapheaderinfo_unlockrequired: lua_pushinteger(L, header->unlockrequired); - else if (fastcmp(field,"levelselect")) + break; + case mapheaderinfo_levelselect: lua_pushinteger(L, header->levelselect); - else if (fastcmp(field,"bonustype")) + break; + case mapheaderinfo_bonustype: lua_pushinteger(L, header->bonustype); - else if (fastcmp(field,"ltzzpatch")) + break; + case mapheaderinfo_ltzzpatch: lua_pushstring(L, header->ltzzpatch); - else if (fastcmp(field,"ltzztext")) + break; + case mapheaderinfo_ltzztext: lua_pushstring(L, header->ltzztext); - else if (fastcmp(field,"ltactdiamond")) + break; + case mapheaderinfo_ltactdiamond: lua_pushstring(L, header->ltactdiamond); - else if (fastcmp(field,"maxbonuslives")) + break; + case mapheaderinfo_maxbonuslives: lua_pushinteger(L, header->maxbonuslives); - else if (fastcmp(field,"levelflags")) + break; + case mapheaderinfo_levelflags: lua_pushinteger(L, header->levelflags); - else if (fastcmp(field,"menuflags")) + break; + case mapheaderinfo_menuflags: lua_pushinteger(L, header->menuflags); - else if (fastcmp(field,"selectheading")) + break; + case mapheaderinfo_selectheading: lua_pushstring(L, header->selectheading); - else if (fastcmp(field,"startrings")) + break; + case mapheaderinfo_startrings: lua_pushinteger(L, header->startrings); - else if (fastcmp(field, "sstimer")) + break; + case mapheaderinfo_sstimer: lua_pushinteger(L, header->sstimer); - else if (fastcmp(field, "ssspheres")) + break; + case mapheaderinfo_ssspheres: lua_pushinteger(L, header->ssspheres); - else if (fastcmp(field, "gravity")) + break; + case mapheaderinfo_gravity: lua_pushfixed(L, header->gravity); + break; // TODO add support for reading numGradedMares and grades - else { + default: // Read custom vars now // (note: don't include the "LUA." in your lua scripts!) UINT8 j = 0; - for (;j < header->numCustomOptions && !fastcmp(field, header->customopts[j].option); ++j); + for (;j < header->numCustomOptions && !fastcmp(lua_tostring(L, 2), header->customopts[j].option); ++j); if(j < header->numCustomOptions) lua_pushstring(L, header->customopts[j].value); @@ -2238,6 +2705,8 @@ int LUA_MapLib(lua_State *L) lua_setfield(L, -2, "__len"); lua_pop(L, 1); + sector_fields_ref = Lua_CreateFieldTable(L, sector_opt); + luaL_newmetatable(L, META_SUBSECTOR); lua_pushcfunction(L, subsector_get); lua_setfield(L, -2, "__index"); @@ -2246,6 +2715,8 @@ int LUA_MapLib(lua_State *L) lua_setfield(L, -2, "__len"); lua_pop(L, 1); + subsector_fields_ref = Lua_CreateFieldTable(L, subsector_opt); + luaL_newmetatable(L, META_LINE); lua_pushcfunction(L, line_get); lua_setfield(L, -2, "__index"); @@ -2254,6 +2725,8 @@ int LUA_MapLib(lua_State *L) lua_setfield(L, -2, "__len"); lua_pop(L, 1); + line_fields_ref = Lua_CreateFieldTable(L, line_opt); + luaL_newmetatable(L, META_LINEARGS); lua_pushcfunction(L, lineargs_get); lua_setfield(L, -2, "__index"); @@ -2286,6 +2759,8 @@ int LUA_MapLib(lua_State *L) lua_setfield(L, -2, "__len"); lua_pop(L, 1); + side_fields_ref = Lua_CreateFieldTable(L, side_opt); + luaL_newmetatable(L, META_VERTEX); lua_pushcfunction(L, vertex_get); lua_setfield(L, -2, "__index"); @@ -2294,6 +2769,8 @@ int LUA_MapLib(lua_State *L) lua_setfield(L, -2, "__len"); lua_pop(L, 1); + vertex_fields_ref = Lua_CreateFieldTable(L, vertex_opt); + luaL_newmetatable(L, META_FFLOOR); lua_pushcfunction(L, ffloor_get); lua_setfield(L, -2, "__index"); @@ -2302,6 +2779,8 @@ int LUA_MapLib(lua_State *L) lua_setfield(L, -2, "__newindex"); lua_pop(L, 1); + ffloor_fields_ref = Lua_CreateFieldTable(L, ffloor_opt); + #ifdef HAVE_LUA_SEGS luaL_newmetatable(L, META_SEG); lua_pushcfunction(L, seg_get); @@ -2311,6 +2790,8 @@ int LUA_MapLib(lua_State *L) lua_setfield(L, -2, "__len"); lua_pop(L, 1); + seg_fields_ref = Lua_CreateFieldTable(L, seg_opt); + luaL_newmetatable(L, META_NODE); lua_pushcfunction(L, node_get); lua_setfield(L, -2, "__index"); @@ -2319,6 +2800,8 @@ int LUA_MapLib(lua_State *L) lua_setfield(L, -2, "__len"); lua_pop(L, 1); + node_fields_ref = Lua_CreateFieldTable(L, node_opt); + luaL_newmetatable(L, META_NODEBBOX); //lua_pushcfunction(L, nodebbox_get); //lua_setfield(L, -2, "__index"); @@ -2345,6 +2828,8 @@ int LUA_MapLib(lua_State *L) lua_setfield(L, -2, "__newindex"); lua_pop(L, 1); + slope_fields_ref = Lua_CreateFieldTable(L, slope_opt); + luaL_newmetatable(L, META_VECTOR2); lua_pushcfunction(L, vector2_get); lua_setfield(L, -2, "__index"); @@ -2363,6 +2848,8 @@ int LUA_MapLib(lua_State *L) //lua_setfield(L, -2, "__len"); lua_pop(L, 1); + mapheaderinfo_fields_ref = Lua_CreateFieldTable(L, mapheaderinfo_opt); + LUA_PushTaggableObjectArray(L, "sectors", lib_iterateSectors, lib_getSector, diff --git a/src/lua_mathlib.c b/src/lua_mathlib.c index e6f8c98c1..d0fe6863f 100644 --- a/src/lua_mathlib.c +++ b/src/lua_mathlib.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 2012-2016 by John "JTE" Muniz. -// Copyright (C) 2012-2021 by Sonic Team Junior. +// Copyright (C) 2012-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -88,6 +88,12 @@ static int lib_finetangent(lua_State *L) return 1; } +static int lib_fixedasin(lua_State *L) +{ + lua_pushangle(L, -FixedAcos(luaL_checkfixed(L, 1)) + ANGLE_90); + return 1; +} + static int lib_fixedacos(lua_State *L) { lua_pushangle(L, FixedAcos(luaL_checkfixed(L, 1))); @@ -199,6 +205,7 @@ static luaL_Reg lib_math[] = { {"sin", lib_finesine}, {"cos", lib_finecosine}, {"tan", lib_finetangent}, + {"asin", lib_fixedasin}, {"acos", lib_fixedacos}, {"FixedAngle", lib_fixedangle}, {"fixangle" , lib_fixedangle}, diff --git a/src/lua_mobjlib.c b/src/lua_mobjlib.c index cf8ccab2c..09d244c91 100644 --- a/src/lua_mobjlib.c +++ b/src/lua_mobjlib.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 2012-2016 by John "JTE" Muniz. -// Copyright (C) 2012-2021 by Sonic Team Junior. +// Copyright (C) 2012-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -96,7 +96,8 @@ enum mobj_e { mobj_standingslope, mobj_colorized, mobj_mirrored, - mobj_shadowscale + mobj_shadowscale, + mobj_dispoffset }; static const char *const mobj_opt[] = { @@ -173,14 +174,17 @@ static const char *const mobj_opt[] = { "colorized", "mirrored", "shadowscale", + "dispoffset", NULL}; #define UNIMPLEMENTED luaL_error(L, LUA_QL("mobj_t") " field " LUA_QS " is not implemented for Lua and cannot be accessed.", mobj_opt[field]) +static int mobj_fields_ref = LUA_NOREF; + static int mobj_get(lua_State *L) { mobj_t *mo = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ)); - enum mobj_e field = Lua_optoption(L, 2, NULL, mobj_opt); + enum mobj_e field = Lua_optoption(L, 2, -1, mobj_fields_ref); lua_settop(L, 2); if (!mo || !ISINLEVEL) { @@ -439,6 +443,9 @@ static int mobj_get(lua_State *L) case mobj_shadowscale: lua_pushfixed(L, mo->shadowscale); break; + case mobj_dispoffset: + lua_pushinteger(L, mo->dispoffset); + break; default: // extra custom variables in Lua memory lua_getfield(L, LUA_REGISTRYINDEX, LREG_EXTVARS); I_Assert(lua_istable(L, -1)); @@ -458,11 +465,11 @@ static int mobj_get(lua_State *L) } #define NOSET luaL_error(L, LUA_QL("mobj_t") " field " LUA_QS " should not be set directly.", mobj_opt[field]) -#define NOSETPOS luaL_error(L, LUA_QL("mobj_t") " field " LUA_QS " should not be set directly. Use " LUA_QL("P_Move") ", " LUA_QL("P_TryMove") ", or " LUA_QL("P_TeleportMove") " instead.", mobj_opt[field]) +#define NOSETPOS luaL_error(L, LUA_QL("mobj_t") " field " LUA_QS " should not be set directly. Use " LUA_QL("P_Move") ", " LUA_QL("P_TryMove") ", or " LUA_QL("P_SetOrigin") ", or " LUA_QL("P_MoveOrigin") " instead.", mobj_opt[field]) static int mobj_set(lua_State *L) { mobj_t *mo = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ)); - enum mobj_e field = Lua_optoption(L, 2, mobj_opt[0], mobj_opt); + enum mobj_e field = Lua_optoption(L, 2, mobj_valid, mobj_fields_ref); lua_settop(L, 3); INLEVEL @@ -767,6 +774,7 @@ static int mobj_set(lua_State *L) scale = FRACUNIT/100; mo->destscale = scale; P_SetScale(mo, scale); + mo->old_scale = scale; break; } case mobj_destscale: @@ -803,6 +811,9 @@ static int mobj_set(lua_State *L) case mobj_shadowscale: mo->shadowscale = luaL_checkfixed(L, 3); break; + case mobj_dispoffset: + mo->dispoffset = luaL_checkinteger(L, 3); + break; default: lua_getfield(L, LUA_REGISTRYINDEX, LREG_EXTVARS); I_Assert(lua_istable(L, -1)); @@ -867,14 +878,55 @@ static int thingstringargs_len(lua_State *L) return 1; } +enum mapthing_e { + mapthing_valid = 0, + mapthing_x, + mapthing_y, + mapthing_angle, + mapthing_pitch, + mapthing_roll, + mapthing_type, + mapthing_options, + mapthing_scale, + mapthing_z, + mapthing_extrainfo, + mapthing_tag, + mapthing_taglist, + mapthing_args, + mapthing_stringargs, + mapthing_mobj, +}; + +const char *const mapthing_opt[] = { + "valid", + "x", + "y", + "angle", + "pitch", + "roll", + "type", + "options", + "scale", + "z", + "extrainfo", + "tag", + "taglist", + "args", + "stringargs", + "mobj", + NULL, +}; + +static int mapthing_fields_ref = LUA_NOREF; + static int mapthing_get(lua_State *L) { mapthing_t *mt = *((mapthing_t **)luaL_checkudata(L, 1, META_MAPTHING)); - const char *field = luaL_checkstring(L, 2); - lua_Integer number; + enum mapthing_e field = Lua_optoption(L, 2, -1, mapthing_fields_ref); + lua_settop(L, 2); if (!mt) { - if (fastcmp(field,"valid")) { + if (field == mapthing_valid) { lua_pushboolean(L, false); return 1; } @@ -883,62 +935,71 @@ static int mapthing_get(lua_State *L) return 0; } - if (fastcmp(field,"valid")) { - lua_pushboolean(L, true); - return 1; - } else if(fastcmp(field,"x")) - number = mt->x; - else if(fastcmp(field,"y")) - number = mt->y; - else if(fastcmp(field,"angle")) - number = mt->angle; - else if(fastcmp(field,"pitch")) - number = mt->pitch; - else if(fastcmp(field,"roll")) - number = mt->roll; - else if(fastcmp(field,"type")) - number = mt->type; - else if(fastcmp(field,"options")) - number = mt->options; - else if(fastcmp(field,"scale")) - number = mt->scale; - else if(fastcmp(field,"z")) - number = mt->z; - else if(fastcmp(field,"extrainfo")) - number = mt->extrainfo; - else if(fastcmp(field,"tag")) - number = Tag_FGet(&mt->tags); - else if(fastcmp(field,"taglist")) + switch (field) { - LUA_PushUserdata(L, &mt->tags, META_TAGLIST); - return 1; + case mapthing_valid: + lua_pushboolean(L, true); + break; + case mapthing_x: + lua_pushinteger(L, mt->x); + break; + case mapthing_y: + lua_pushinteger(L, mt->y); + break; + case mapthing_angle: + lua_pushinteger(L, mt->angle); + break; + case mapthing_pitch: + lua_pushinteger(L, mt->pitch); + break; + case mapthing_roll: + lua_pushinteger(L, mt->roll); + break; + case mapthing_type: + lua_pushinteger(L, mt->type); + break; + case mapthing_options: + lua_pushinteger(L, mt->options); + break; + case mapthing_scale: + lua_pushinteger(L, mt->scale); + break; + case mapthing_z: + lua_pushinteger(L, mt->z); + break; + case mapthing_extrainfo: + lua_pushinteger(L, mt->extrainfo); + break; + case mapthing_tag: + lua_pushinteger(L, Tag_FGet(&mt->tags)); + break; + case mapthing_taglist: + LUA_PushUserdata(L, &mt->tags, META_TAGLIST); + break; + case mapthing_args: + LUA_PushUserdata(L, mt->args, META_THINGARGS); + break; + case mapthing_stringargs: + LUA_PushUserdata(L, mt->stringargs, META_THINGSTRINGARGS); + break; + case mapthing_mobj: + LUA_PushUserdata(L, mt->mobj, META_MOBJ); + break; + default: + if (devparm) + return luaL_error(L, LUA_QL("mapthing_t") " has no field named " LUA_QS, field); + else + return 0; } - else if(fastcmp(field,"args")) - { - LUA_PushUserdata(L, mt->args, META_THINGARGS); - return 1; - } - else if(fastcmp(field,"stringargs")) - { - LUA_PushUserdata(L, mt->stringargs, META_THINGSTRINGARGS); - return 1; - } - else if(fastcmp(field,"mobj")) { - LUA_PushUserdata(L, mt->mobj, META_MOBJ); - return 1; - } else if (devparm) - return luaL_error(L, LUA_QL("mapthing_t") " has no field named " LUA_QS, field); - else - return 0; - lua_pushinteger(L, number); return 1; } static int mapthing_set(lua_State *L) { mapthing_t *mt = *((mapthing_t **)luaL_checkudata(L, 1, META_MAPTHING)); - const char *field = luaL_checkstring(L, 2); + enum mapthing_e field = Lua_optoption(L, 2, -1, mapthing_fields_ref); + lua_settop(L, 3); if (!mt) return luaL_error(L, "accessed mapthing_t doesn't exist anymore."); @@ -948,39 +1009,52 @@ static int mapthing_set(lua_State *L) if (hook_cmd_running) return luaL_error(L, "Do not alter mapthing_t in CMD building code!"); - if(fastcmp(field,"x")) - mt->x = (INT16)luaL_checkinteger(L, 3); - else if(fastcmp(field,"y")) - mt->y = (INT16)luaL_checkinteger(L, 3); - else if(fastcmp(field,"angle")) - mt->angle = (INT16)luaL_checkinteger(L, 3); - else if(fastcmp(field,"pitch")) - mt->pitch = (INT16)luaL_checkinteger(L, 3); - else if(fastcmp(field,"roll")) - mt->roll = (INT16)luaL_checkinteger(L, 3); - else if(fastcmp(field,"type")) - mt->type = (UINT16)luaL_checkinteger(L, 3); - else if(fastcmp(field,"options")) - mt->options = (UINT16)luaL_checkinteger(L, 3); - else if(fastcmp(field,"scale")) - mt->scale = luaL_checkfixed(L, 3); - else if(fastcmp(field,"z")) - mt->z = (INT16)luaL_checkinteger(L, 3); - else if(fastcmp(field,"extrainfo")) + switch (field) { - INT32 extrainfo = luaL_checkinteger(L, 3); - if (extrainfo & ~15) - return luaL_error(L, "mapthing_t extrainfo set %d out of range (%d - %d)", extrainfo, 0, 15); - mt->extrainfo = (UINT8)extrainfo; + case mapthing_x: + mt->x = (INT16)luaL_checkinteger(L, 3); + break; + case mapthing_y: + mt->y = (INT16)luaL_checkinteger(L, 3); + break; + case mapthing_angle: + mt->angle = (INT16)luaL_checkinteger(L, 3); + break; + case mapthing_pitch: + mt->pitch = (INT16)luaL_checkinteger(L, 3); + break; + case mapthing_roll: + mt->roll = (INT16)luaL_checkinteger(L, 3); + break; + case mapthing_type: + mt->type = (UINT16)luaL_checkinteger(L, 3); + break; + case mapthing_options: + mt->options = (UINT16)luaL_checkinteger(L, 3); + break; + case mapthing_scale: + mt->scale = luaL_checkfixed(L, 3); + break; + case mapthing_z: + mt->z = (INT16)luaL_checkinteger(L, 3); + break; + case mapthing_extrainfo: + INT32 extrainfo = luaL_checkinteger(L, 3); + if (extrainfo & ~15) + return luaL_error(L, "mapthing_t extrainfo set %d out of range (%d - %d)", extrainfo, 0, 15); + mt->extrainfo = (UINT8)extrainfo; + break; + case mapthing_tag: + Tag_FSet(&mt->tags, (INT16)luaL_checkinteger(L, 3)); + break; + case mapthing_taglist: + return LUA_ErrSetDirectly(L, "mapthing_t", "taglist"); + case mapthing_mobj: + mt->mobj = *((mobj_t **)luaL_checkudata(L, 3, META_MOBJ)); + break; + default: + return luaL_error(L, LUA_QL("mapthing_t") " has no field named " LUA_QS, field); } - else if (fastcmp(field,"tag")) - Tag_FSet(&mt->tags, (INT16)luaL_checkinteger(L, 3)); - else if (fastcmp(field,"taglist")) - return LUA_ErrSetDirectly(L, "mapthing_t", "taglist"); - else if(fastcmp(field,"mobj")) - mt->mobj = *((mobj_t **)luaL_checkudata(L, 3, META_MOBJ)); - else - return luaL_error(L, LUA_QL("mapthing_t") " has no field named " LUA_QS, field); return 0; } @@ -1042,6 +1116,8 @@ int LUA_MobjLib(lua_State *L) lua_setfield(L, -2, "__newindex"); lua_pop(L,1); + mobj_fields_ref = Lua_CreateFieldTable(L, mobj_opt); + luaL_newmetatable(L, META_THINGARGS); lua_pushcfunction(L, thingargs_get); lua_setfield(L, -2, "__index"); @@ -1069,6 +1145,8 @@ int LUA_MobjLib(lua_State *L) lua_setfield(L, -2, "__len"); lua_pop(L,1); + mapthing_fields_ref = Lua_CreateFieldTable(L, mapthing_opt); + LUA_PushTaggableObjectArray(L, "mapthings", lib_iterateMapthings, lib_getMapthing, diff --git a/src/lua_playerlib.c b/src/lua_playerlib.c index 06104ff2d..1d06e081b 100644 --- a/src/lua_playerlib.c +++ b/src/lua_playerlib.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 2012-2016 by John "JTE" Muniz. -// Copyright (C) 2012-2021 by Sonic Team Junior. +// Copyright (C) 2012-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -80,316 +80,764 @@ static int lib_lenPlayer(lua_State *L) return 1; } +enum player_e +{ + player_valid, + player_name, + player_realmo, + player_mo, + player_cmd, + player_playerstate, + player_camerascale, + player_shieldscale, + player_viewz, + player_viewheight, + player_deltaviewheight, + player_bob, + player_viewrollangle, + player_aiming, + player_drawangle, + player_rings, + player_spheres, + player_pity, + player_currentweapon, + player_ringweapons, + player_ammoremoval, + player_ammoremovaltimer, + player_ammoremovalweapon, + player_powers, + player_pflags, + player_panim, + player_flashcount, + player_flashpal, + player_skincolor, + player_skin, + player_availabilities, + player_score, + player_dashspeed, + player_normalspeed, + player_runspeed, + player_thrustfactor, + player_accelstart, + player_acceleration, + player_charability, + player_charability2, + player_charflags, + player_thokitem, + player_spinitem, + player_revitem, + player_followitem, + player_followmobj, + player_actionspd, + player_mindash, + player_maxdash, + player_jumpfactor, + player_height, + player_spinheight, + player_lives, + player_continues, + player_xtralife, + player_gotcontinue, + player_speed, + player_secondjump, + player_fly1, + player_scoreadd, + player_glidetime, + player_climbing, + player_deadtimer, + player_exiting, + player_homing, + player_dashmode, + player_skidtime, + player_cmomx, + player_cmomy, + player_rmomx, + player_rmomy, + player_numboxes, + player_totalring, + player_realtime, + player_laps, + player_ctfteam, + player_gotflag, + player_weapondelay, + player_tossdelay, + player_starpostx, + player_starposty, + player_starpostz, + player_starpostnum, + player_starposttime, + player_starpostangle, + player_starpostscale, + player_angle_pos, + player_old_angle_pos, + player_axis1, + player_axis2, + player_bumpertime, + player_flyangle, + player_drilltimer, + player_linkcount, + player_linktimer, + player_anotherflyangle, + player_nightstime, + player_drillmeter, + player_drilldelay, + player_bonustime, + player_capsule, + player_drone, + player_oldscale, + player_mare, + player_marelap, + player_marebonuslap, + player_marebegunat, + player_startedtime, + player_finishedtime, + player_lapbegunat, + player_lapstartedtime, + player_finishedspheres, + player_finishedrings, + player_marescore, + player_lastmarescore, + player_totalmarescore, + player_lastmare, + player_lastmarelap, + player_lastmarebonuslap, + player_totalmarelap, + player_totalmarebonuslap, + player_maxlink, + player_texttimer, + player_textvar, + player_lastsidehit, + player_lastlinehit, + player_losstime, + player_timeshit, + player_onconveyor, + player_awayviewmobj, + player_awayviewtics, + player_awayviewaiming, + player_spectator, + player_outofcoop, + player_bot, + player_botleader, + player_lastbuttons, + player_blocked, + player_jointime, + player_quittime, +#ifdef HWRENDER + player_fovadd, +#endif +}; + +static const char *const player_opt[] = { + "valid", + "name", + "realmo", + "mo", + "cmd", + "playerstate", + "camerascale", + "shieldscale", + "viewz", + "viewheight", + "deltaviewheight", + "bob", + "viewrollangle", + "aiming", + "drawangle", + "rings", + "spheres", + "pity", + "currentweapon", + "ringweapons", + "ammoremoval", + "ammoremovaltimer", + "ammoremovalweapon", + "powers", + "pflags", + "panim", + "flashcount", + "flashpal", + "skincolor", + "skin", + "availabilities", + "score", + "dashspeed", + "normalspeed", + "runspeed", + "thrustfactor", + "accelstart", + "acceleration", + "charability", + "charability2", + "charflags", + "thokitem", + "spinitem", + "revitem", + "followitem", + "followmobj", + "actionspd", + "mindash", + "maxdash", + "jumpfactor", + "height", + "spinheight", + "lives", + "continues", + "xtralife", + "gotcontinue", + "speed", + "secondjump", + "fly1", + "scoreadd", + "glidetime", + "climbing", + "deadtimer", + "exiting", + "homing", + "dashmode", + "skidtime", + "cmomx", + "cmomy", + "rmomx", + "rmomy", + "numboxes", + "totalring", + "realtime", + "laps", + "ctfteam", + "gotflag", + "weapondelay", + "tossdelay", + "starpostx", + "starposty", + "starpostz", + "starpostnum", + "starposttime", + "starpostangle", + "starpostscale", + "angle_pos", + "old_angle_pos", + "axis1", + "axis2", + "bumpertime", + "flyangle", + "drilltimer", + "linkcount", + "linktimer", + "anotherflyangle", + "nightstime", + "drillmeter", + "drilldelay", + "bonustime", + "capsule", + "drone", + "oldscale", + "mare", + "marelap", + "marebonuslap", + "marebegunat", + "startedtime", + "finishedtime", + "lapbegunat", + "lapstartedtime", + "finishedspheres", + "finishedrings", + "marescore", + "lastmarescore", + "totalmarescore", + "lastmare", + "lastmarelap", + "lastmarebonuslap", + "totalmarelap", + "totalmarebonuslap", + "maxlink", + "texttimer", + "textvar", + "lastsidehit", + "lastlinehit", + "losstime", + "timeshit", + "onconveyor", + "awayviewmobj", + "awayviewtics", + "awayviewaiming", + "spectator", + "outofcoop", + "bot", + "botleader", + "lastbuttons", + "blocked", + "jointime", + "quittime", +#ifdef HWRENDER + "fovadd", +#endif + NULL, +}; + +static int player_fields_ref = LUA_NOREF; + static int player_get(lua_State *L) { player_t *plr = *((player_t **)luaL_checkudata(L, 1, META_PLAYER)); - const char *field = luaL_checkstring(L, 2); + enum player_e field = Lua_optoption(L, 2, -1, player_fields_ref); + lua_settop(L, 2); - if (!plr) { - if (fastcmp(field,"valid")) { + if (!plr) + { + if (field == player_valid) + { lua_pushboolean(L, false); return 1; } return LUA_ErrInvalid(L, "player_t"); } - if (fastcmp(field,"valid")) + switch (field) + { + case player_valid: lua_pushboolean(L, true); - else if (fastcmp(field,"name")) + break; + case player_name: lua_pushstring(L, player_names[plr-players]); - else if (fastcmp(field,"realmo")) + break; + case player_realmo: LUA_PushUserdata(L, plr->mo, META_MOBJ); + break; // Kept for backward-compatibility // Should be fixed to work like "realmo" later - else if (fastcmp(field,"mo")) - { + case player_mo: if (plr->spectator) lua_pushnil(L); else LUA_PushUserdata(L, plr->mo, META_MOBJ); - } - else if (fastcmp(field,"cmd")) + break; + case player_cmd: LUA_PushUserdata(L, &plr->cmd, META_TICCMD); - else if (fastcmp(field,"playerstate")) + break; + case player_playerstate: lua_pushinteger(L, plr->playerstate); - else if (fastcmp(field,"camerascale")) + break; + case player_camerascale: lua_pushfixed(L, plr->camerascale); - else if (fastcmp(field,"shieldscale")) + break; + case player_shieldscale: lua_pushfixed(L, plr->shieldscale); - else if (fastcmp(field,"viewz")) + break; + case player_viewz: lua_pushfixed(L, plr->viewz); - else if (fastcmp(field,"viewheight")) + break; + case player_viewheight: lua_pushfixed(L, plr->viewheight); - else if (fastcmp(field,"deltaviewheight")) + break; + case player_deltaviewheight: lua_pushfixed(L, plr->deltaviewheight); - else if (fastcmp(field,"bob")) + break; + case player_bob: lua_pushfixed(L, plr->bob); - else if (fastcmp(field,"viewrollangle")) + break; + case player_viewrollangle: lua_pushangle(L, plr->viewrollangle); - else if (fastcmp(field,"aiming")) + break; + case player_aiming: lua_pushangle(L, plr->aiming); - else if (fastcmp(field,"drawangle")) + break; + case player_drawangle: lua_pushangle(L, plr->drawangle); - else if (fastcmp(field,"rings")) + break; + case player_rings: lua_pushinteger(L, plr->rings); - else if (fastcmp(field,"spheres")) + break; + case player_spheres: lua_pushinteger(L, plr->spheres); - else if (fastcmp(field,"pity")) + break; + case player_pity: lua_pushinteger(L, plr->pity); - else if (fastcmp(field,"currentweapon")) + break; + case player_currentweapon: lua_pushinteger(L, plr->currentweapon); - else if (fastcmp(field,"ringweapons")) + break; + case player_ringweapons: lua_pushinteger(L, plr->ringweapons); - else if (fastcmp(field,"ammoremoval")) + break; + case player_ammoremoval: lua_pushinteger(L, plr->ammoremoval); - else if (fastcmp(field,"ammoremovaltimer")) + break; + case player_ammoremovaltimer: lua_pushinteger(L, plr->ammoremovaltimer); - else if (fastcmp(field,"ammoremovalweapon")) + break; + case player_ammoremovalweapon: lua_pushinteger(L, plr->ammoremovalweapon); - else if (fastcmp(field,"powers")) + break; + case player_powers: LUA_PushUserdata(L, plr->powers, META_POWERS); - else if (fastcmp(field,"pflags")) + break; + case player_pflags: lua_pushinteger(L, plr->pflags); - else if (fastcmp(field,"panim")) + break; + case player_panim: lua_pushinteger(L, plr->panim); - else if (fastcmp(field,"flashcount")) + break; + case player_flashcount: lua_pushinteger(L, plr->flashcount); - else if (fastcmp(field,"flashpal")) + break; + case player_flashpal: lua_pushinteger(L, plr->flashpal); - else if (fastcmp(field,"skincolor")) + break; + case player_skincolor: lua_pushinteger(L, plr->skincolor); - else if (fastcmp(field,"skin")) + break; + case player_skin: lua_pushinteger(L, plr->skin); - else if (fastcmp(field,"availabilities")) + break; + case player_availabilities: lua_pushinteger(L, plr->availabilities); - else if (fastcmp(field,"score")) + break; + case player_score: lua_pushinteger(L, plr->score); - else if (fastcmp(field,"dashspeed")) + break; + case player_dashspeed: lua_pushfixed(L, plr->dashspeed); - else if (fastcmp(field,"normalspeed")) + break; + case player_normalspeed: lua_pushfixed(L, plr->normalspeed); - else if (fastcmp(field,"runspeed")) + break; + case player_runspeed: lua_pushfixed(L, plr->runspeed); - else if (fastcmp(field,"thrustfactor")) + break; + case player_thrustfactor: lua_pushinteger(L, plr->thrustfactor); - else if (fastcmp(field,"accelstart")) + break; + case player_accelstart: lua_pushinteger(L, plr->accelstart); - else if (fastcmp(field,"acceleration")) + break; + case player_acceleration: lua_pushinteger(L, plr->acceleration); - else if (fastcmp(field,"charability")) + break; + case player_charability: lua_pushinteger(L, plr->charability); - else if (fastcmp(field,"charability2")) + break; + case player_charability2: lua_pushinteger(L, plr->charability2); - else if (fastcmp(field,"charflags")) + break; + case player_charflags: lua_pushinteger(L, plr->charflags); - else if (fastcmp(field,"thokitem")) + break; + case player_thokitem: lua_pushinteger(L, plr->thokitem); - else if (fastcmp(field,"spinitem")) + break; + case player_spinitem: lua_pushinteger(L, plr->spinitem); - else if (fastcmp(field,"revitem")) + break; + case player_revitem: lua_pushinteger(L, plr->revitem); - else if (fastcmp(field,"followitem")) + break; + case player_followitem: lua_pushinteger(L, plr->followitem); - else if (fastcmp(field,"followmobj")) + break; + case player_followmobj: LUA_PushUserdata(L, plr->followmobj, META_MOBJ); - else if (fastcmp(field,"actionspd")) + break; + case player_actionspd: lua_pushfixed(L, plr->actionspd); - else if (fastcmp(field,"mindash")) + break; + case player_mindash: lua_pushfixed(L, plr->mindash); - else if (fastcmp(field,"maxdash")) + break; + case player_maxdash: lua_pushfixed(L, plr->maxdash); - else if (fastcmp(field,"jumpfactor")) + break; + case player_jumpfactor: lua_pushfixed(L, plr->jumpfactor); - else if (fastcmp(field,"height")) + break; + case player_height: lua_pushfixed(L, plr->height); - else if (fastcmp(field,"spinheight")) + break; + case player_spinheight: lua_pushfixed(L, plr->spinheight); - else if (fastcmp(field,"lives")) + break; + case player_lives: lua_pushinteger(L, plr->lives); - else if (fastcmp(field,"continues")) + break; + case player_continues: lua_pushinteger(L, plr->continues); - else if (fastcmp(field,"xtralife")) + break; + case player_xtralife: lua_pushinteger(L, plr->xtralife); - else if (fastcmp(field,"gotcontinue")) + break; + case player_gotcontinue: lua_pushinteger(L, plr->gotcontinue); - else if (fastcmp(field,"speed")) + break; + case player_speed: lua_pushfixed(L, plr->speed); - else if (fastcmp(field,"secondjump")) + break; + case player_secondjump: lua_pushinteger(L, plr->secondjump); - else if (fastcmp(field,"fly1")) + break; + case player_fly1: lua_pushinteger(L, plr->fly1); - else if (fastcmp(field,"scoreadd")) + break; + case player_scoreadd: lua_pushinteger(L, plr->scoreadd); - else if (fastcmp(field,"glidetime")) + break; + case player_glidetime: lua_pushinteger(L, plr->glidetime); - else if (fastcmp(field,"climbing")) + break; + case player_climbing: lua_pushinteger(L, plr->climbing); - else if (fastcmp(field,"deadtimer")) + break; + case player_deadtimer: lua_pushinteger(L, plr->deadtimer); - else if (fastcmp(field,"exiting")) + break; + case player_exiting: lua_pushinteger(L, plr->exiting); - else if (fastcmp(field,"homing")) + break; + case player_homing: lua_pushinteger(L, plr->homing); - else if (fastcmp(field,"dashmode")) + break; + case player_dashmode: lua_pushinteger(L, plr->dashmode); - else if (fastcmp(field,"skidtime")) + break; + case player_skidtime: lua_pushinteger(L, plr->skidtime); - else if (fastcmp(field,"cmomx")) + break; + case player_cmomx: lua_pushfixed(L, plr->cmomx); - else if (fastcmp(field,"cmomy")) + break; + case player_cmomy: lua_pushfixed(L, plr->cmomy); - else if (fastcmp(field,"rmomx")) + break; + case player_rmomx: lua_pushfixed(L, plr->rmomx); - else if (fastcmp(field,"rmomy")) + break; + case player_rmomy: lua_pushfixed(L, plr->rmomy); - else if (fastcmp(field,"numboxes")) + break; + case player_numboxes: lua_pushinteger(L, plr->numboxes); - else if (fastcmp(field,"totalring")) + break; + case player_totalring: lua_pushinteger(L, plr->totalring); - else if (fastcmp(field,"realtime")) + break; + case player_realtime: lua_pushinteger(L, plr->realtime); - else if (fastcmp(field,"laps")) + break; + case player_laps: lua_pushinteger(L, plr->laps); - else if (fastcmp(field,"ctfteam")) + break; + case player_ctfteam: lua_pushinteger(L, plr->ctfteam); - else if (fastcmp(field,"gotflag")) + break; + case player_gotflag: lua_pushinteger(L, plr->gotflag); - else if (fastcmp(field,"weapondelay")) + break; + case player_weapondelay: lua_pushinteger(L, plr->weapondelay); - else if (fastcmp(field,"tossdelay")) + break; + case player_tossdelay: lua_pushinteger(L, plr->tossdelay); - else if (fastcmp(field,"starpostx")) + break; + case player_starpostx: lua_pushinteger(L, plr->starpostx); - else if (fastcmp(field,"starposty")) + break; + case player_starposty: lua_pushinteger(L, plr->starposty); - else if (fastcmp(field,"starpostz")) + break; + case player_starpostz: lua_pushinteger(L, plr->starpostz); - else if (fastcmp(field,"starpostnum")) + break; + case player_starpostnum: lua_pushinteger(L, plr->starpostnum); - else if (fastcmp(field,"starposttime")) + break; + case player_starposttime: lua_pushinteger(L, plr->starposttime); - else if (fastcmp(field,"starpostangle")) + break; + case player_starpostangle: lua_pushangle(L, plr->starpostangle); - else if (fastcmp(field,"starpostscale")) + break; + case player_starpostscale: lua_pushfixed(L, plr->starpostscale); - else if (fastcmp(field,"angle_pos")) + break; + case player_angle_pos: lua_pushangle(L, plr->angle_pos); - else if (fastcmp(field,"old_angle_pos")) + break; + case player_old_angle_pos: lua_pushangle(L, plr->old_angle_pos); - else if (fastcmp(field,"axis1")) + break; + case player_axis1: LUA_PushUserdata(L, plr->axis1, META_MOBJ); - else if (fastcmp(field,"axis2")) + break; + case player_axis2: LUA_PushUserdata(L, plr->axis2, META_MOBJ); - else if (fastcmp(field,"bumpertime")) + break; + case player_bumpertime: lua_pushinteger(L, plr->bumpertime); - else if (fastcmp(field,"flyangle")) + break; + case player_flyangle: lua_pushinteger(L, plr->flyangle); - else if (fastcmp(field,"drilltimer")) + break; + case player_drilltimer: lua_pushinteger(L, plr->drilltimer); - else if (fastcmp(field,"linkcount")) + break; + case player_linkcount: lua_pushinteger(L, plr->linkcount); - else if (fastcmp(field,"linktimer")) + break; + case player_linktimer: lua_pushinteger(L, plr->linktimer); - else if (fastcmp(field,"anotherflyangle")) + break; + case player_anotherflyangle: lua_pushinteger(L, plr->anotherflyangle); - else if (fastcmp(field,"nightstime")) + break; + case player_nightstime: lua_pushinteger(L, plr->nightstime); - else if (fastcmp(field,"drillmeter")) + break; + case player_drillmeter: lua_pushinteger(L, plr->drillmeter); - else if (fastcmp(field,"drilldelay")) + break; + case player_drilldelay: lua_pushinteger(L, plr->drilldelay); - else if (fastcmp(field,"bonustime")) + break; + case player_bonustime: lua_pushboolean(L, plr->bonustime); - else if (fastcmp(field,"capsule")) + break; + case player_capsule: LUA_PushUserdata(L, plr->capsule, META_MOBJ); - else if (fastcmp(field,"drone")) + break; + case player_drone: LUA_PushUserdata(L, plr->drone, META_MOBJ); - else if (fastcmp(field,"oldscale")) + break; + case player_oldscale: lua_pushfixed(L, plr->oldscale); - else if (fastcmp(field,"mare")) + break; + case player_mare: lua_pushinteger(L, plr->mare); - else if (fastcmp(field,"marelap")) + break; + case player_marelap: lua_pushinteger(L, plr->marelap); - else if (fastcmp(field,"marebonuslap")) + break; + case player_marebonuslap: lua_pushinteger(L, plr->marebonuslap); - else if (fastcmp(field,"marebegunat")) + break; + case player_marebegunat: lua_pushinteger(L, plr->marebegunat); - else if (fastcmp(field,"startedtime")) + break; + case player_startedtime: lua_pushinteger(L, plr->startedtime); - else if (fastcmp(field,"finishedtime")) + break; + case player_finishedtime: lua_pushinteger(L, plr->finishedtime); - else if (fastcmp(field,"lapbegunat")) + break; + case player_lapbegunat: lua_pushinteger(L, plr->lapbegunat); - else if (fastcmp(field,"lapstartedtime")) + break; + case player_lapstartedtime: lua_pushinteger(L, plr->lapstartedtime); - else if (fastcmp(field,"finishedspheres")) + break; + case player_finishedspheres: lua_pushinteger(L, plr->finishedspheres); - else if (fastcmp(field,"finishedrings")) + break; + case player_finishedrings: lua_pushinteger(L, plr->finishedrings); - else if (fastcmp(field,"marescore")) + break; + case player_marescore: lua_pushinteger(L, plr->marescore); - else if (fastcmp(field,"lastmarescore")) + break; + case player_lastmarescore: lua_pushinteger(L, plr->lastmarescore); - else if (fastcmp(field,"totalmarescore")) + break; + case player_totalmarescore: lua_pushinteger(L, plr->totalmarescore); - else if (fastcmp(field,"lastmare")) + break; + case player_lastmare: lua_pushinteger(L, plr->lastmare); - else if (fastcmp(field,"lastmarelap")) + break; + case player_lastmarelap: lua_pushinteger(L, plr->lastmarelap); - else if (fastcmp(field,"lastmarebonuslap")) + break; + case player_lastmarebonuslap: lua_pushinteger(L, plr->lastmarebonuslap); - else if (fastcmp(field,"totalmarelap")) + break; + case player_totalmarelap: lua_pushinteger(L, plr->totalmarelap); - else if (fastcmp(field,"totalmarebonuslap")) + break; + case player_totalmarebonuslap: lua_pushinteger(L, plr->totalmarebonuslap); - else if (fastcmp(field,"maxlink")) + break; + case player_maxlink: lua_pushinteger(L, plr->maxlink); - else if (fastcmp(field,"texttimer")) + break; + case player_texttimer: lua_pushinteger(L, plr->texttimer); - else if (fastcmp(field,"textvar")) + break; + case player_textvar: lua_pushinteger(L, plr->textvar); - else if (fastcmp(field,"lastsidehit")) + break; + case player_lastsidehit: lua_pushinteger(L, plr->lastsidehit); - else if (fastcmp(field,"lastlinehit")) + break; + case player_lastlinehit: lua_pushinteger(L, plr->lastlinehit); - else if (fastcmp(field,"losstime")) + break; + case player_losstime: lua_pushinteger(L, plr->losstime); - else if (fastcmp(field,"timeshit")) + break; + case player_timeshit: lua_pushinteger(L, plr->timeshit); - else if (fastcmp(field,"onconveyor")) + break; + case player_onconveyor: lua_pushinteger(L, plr->onconveyor); - else if (fastcmp(field,"awayviewmobj")) + break; + case player_awayviewmobj: LUA_PushUserdata(L, plr->awayviewmobj, META_MOBJ); - else if (fastcmp(field,"awayviewtics")) + break; + case player_awayviewtics: lua_pushinteger(L, plr->awayviewtics); - else if (fastcmp(field,"awayviewaiming")) + break; + case player_awayviewaiming: lua_pushangle(L, plr->awayviewaiming); - else if (fastcmp(field,"spectator")) + break; + case player_spectator: lua_pushboolean(L, plr->spectator); - else if (fastcmp(field,"outofcoop")) + break; + case player_outofcoop: lua_pushboolean(L, plr->outofcoop); - else if (fastcmp(field,"bot")) + break; + case player_bot: lua_pushinteger(L, plr->bot); - else if (fastcmp(field,"jointime")) + break; + case player_botleader: + LUA_PushUserdata(L, plr->botleader, META_PLAYER); + break; + case player_lastbuttons: + lua_pushinteger(L, plr->lastbuttons); + break; + case player_blocked: + lua_pushboolean(L, plr->blocked); + break; + case player_jointime: lua_pushinteger(L, plr->jointime); - else if (fastcmp(field,"quittime")) + break; + case player_quittime: lua_pushinteger(L, plr->quittime); + break; #ifdef HWRENDER - else if (fastcmp(field,"fovadd")) + case player_fovadd: lua_pushfixed(L, plr->fovadd); + break; #endif - else { + default: lua_getfield(L, LUA_REGISTRYINDEX, LREG_EXTVARS); I_Assert(lua_istable(L, -1)); lua_pushlightuserdata(L, plr); lua_rawget(L, -2); if (!lua_istable(L, -1)) { // no extra values table - CONS_Debug(DBG_LUA, M_GetText("'%s' has no extvars table or field named '%s'; returning nil.\n"), "player_t", field); + CONS_Debug(DBG_LUA, M_GetText("'%s' has no extvars table or field named '%s'; returning nil.\n"), "player_t", lua_tostring(L, 2)); return 0; } - lua_getfield(L, -1, field); + lua_pushvalue(L, 2); // field name + lua_gettable(L, -2); if (lua_isnil(L, -1)) // no value for this field - CONS_Debug(DBG_LUA, M_GetText("'%s' has no field named '%s'; returning nil.\n"), "player_t", field); + CONS_Debug(DBG_LUA, M_GetText("'%s' has no field named '%s'; returning nil.\n"), "player_t", lua_tostring(L, 2)); + break; } return 1; @@ -399,7 +847,7 @@ static int player_get(lua_State *L) static int player_set(lua_State *L) { player_t *plr = *((player_t **)luaL_checkudata(L, 1, META_PLAYER)); - const char *field = luaL_checkstring(L, 2); + enum player_e field = Lua_optoption(L, 2, player_cmd, player_fields_ref); if (!plr) return LUA_ErrInvalid(L, "player_t"); @@ -408,326 +856,473 @@ static int player_set(lua_State *L) if (hook_cmd_running) return luaL_error(L, "Do not alter player_t in CMD building code!"); - if (fastcmp(field,"mo") || fastcmp(field,"realmo")) { + switch (field) + { + case player_mo: + case player_realmo: + { mobj_t *newmo = *((mobj_t **)luaL_checkudata(L, 3, META_MOBJ)); plr->mo->player = NULL; // remove player pointer from old mobj (newmo->player = plr)->mo = newmo; // set player pointer for new mobj, and set new mobj as the player's mobj + break; } - else if (fastcmp(field,"cmd")) + case player_cmd: return NOSET; - else if (fastcmp(field,"playerstate")) + case player_playerstate: plr->playerstate = luaL_checkinteger(L, 3); - else if (fastcmp(field,"camerascale")) + break; + case player_camerascale: plr->camerascale = luaL_checkfixed(L, 3); - else if (fastcmp(field,"shieldscale")) + break; + case player_shieldscale: plr->shieldscale = luaL_checkfixed(L, 3); - else if (fastcmp(field,"viewz")) + break; + case player_viewz: plr->viewz = luaL_checkfixed(L, 3); - else if (fastcmp(field,"viewheight")) + break; + case player_viewheight: plr->viewheight = luaL_checkfixed(L, 3); - else if (fastcmp(field,"deltaviewheight")) + break; + case player_deltaviewheight: plr->deltaviewheight = luaL_checkfixed(L, 3); - else if (fastcmp(field,"bob")) + break; + case player_bob: plr->bob = luaL_checkfixed(L, 3); - else if (fastcmp(field,"viewrollangle")) + break; + case player_viewrollangle: plr->viewrollangle = luaL_checkangle(L, 3); - else if (fastcmp(field,"aiming")) { + break; + case player_aiming: + { plr->aiming = luaL_checkangle(L, 3); if (plr == &players[consoleplayer]) localaiming = plr->aiming; else if (plr == &players[secondarydisplayplayer]) localaiming2 = plr->aiming; + break; } - else if (fastcmp(field,"drawangle")) + case player_drawangle: plr->drawangle = luaL_checkangle(L, 3); - else if (fastcmp(field,"rings")) + break; + case player_rings: plr->rings = (INT32)luaL_checkinteger(L, 3); - else if (fastcmp(field,"spheres")) + break; + case player_spheres: plr->spheres = (INT32)luaL_checkinteger(L, 3); - else if (fastcmp(field,"pity")) + break; + case player_pity: plr->pity = (SINT8)luaL_checkinteger(L, 3); - else if (fastcmp(field,"currentweapon")) + break; + case player_currentweapon: plr->currentweapon = (INT32)luaL_checkinteger(L, 3); - else if (fastcmp(field,"ringweapons")) + break; + case player_ringweapons: plr->ringweapons = (INT32)luaL_checkinteger(L, 3); - else if (fastcmp(field,"ammoremoval")) + break; + case player_ammoremoval: plr->ammoremoval = (UINT16)luaL_checkinteger(L, 3); - else if (fastcmp(field,"ammoremovaltimer")) + break; + case player_ammoremovaltimer: plr->ammoremovaltimer = (tic_t)luaL_checkinteger(L, 3); - else if (fastcmp(field,"ammoremovalweapon")) + break; + case player_ammoremovalweapon: plr->ammoremovalweapon = (INT32)luaL_checkinteger(L, 3); - else if (fastcmp(field,"powers")) + break; + case player_powers: return NOSET; - else if (fastcmp(field,"pflags")) + case player_pflags: plr->pflags = luaL_checkinteger(L, 3); - else if (fastcmp(field,"panim")) + break; + case player_panim: plr->panim = luaL_checkinteger(L, 3); - else if (fastcmp(field,"flashcount")) + break; + case player_flashcount: plr->flashcount = (UINT16)luaL_checkinteger(L, 3); - else if (fastcmp(field,"flashpal")) + break; + case player_flashpal: plr->flashpal = (UINT16)luaL_checkinteger(L, 3); - else if (fastcmp(field,"skincolor")) + break; + case player_skincolor: { UINT16 newcolor = (UINT16)luaL_checkinteger(L,3); if (newcolor >= numskincolors) return luaL_error(L, "player.skincolor %d out of range (0 - %d).", newcolor, numskincolors-1); plr->skincolor = newcolor; + break; } - else if (fastcmp(field,"skin")) + case player_skin: return NOSET; - else if (fastcmp(field,"availabilities")) + case player_availabilities: return NOSET; - else if (fastcmp(field,"score")) + case player_score: plr->score = (UINT32)luaL_checkinteger(L, 3); - else if (fastcmp(field,"dashspeed")) + break; + case player_dashspeed: plr->dashspeed = luaL_checkfixed(L, 3); - else if (fastcmp(field,"normalspeed")) + break; + case player_normalspeed: plr->normalspeed = luaL_checkfixed(L, 3); - else if (fastcmp(field,"runspeed")) + break; + case player_runspeed: plr->runspeed = luaL_checkfixed(L, 3); - else if (fastcmp(field,"thrustfactor")) + break; + case player_thrustfactor: plr->thrustfactor = (UINT8)luaL_checkinteger(L, 3); - else if (fastcmp(field,"accelstart")) + break; + case player_accelstart: plr->accelstart = (UINT8)luaL_checkinteger(L, 3); - else if (fastcmp(field,"acceleration")) + break; + case player_acceleration: plr->acceleration = (UINT8)luaL_checkinteger(L, 3); - else if (fastcmp(field,"charability")) + break; + case player_charability: plr->charability = (UINT8)luaL_checkinteger(L, 3); - else if (fastcmp(field,"charability2")) + break; + case player_charability2: plr->charability2 = (UINT8)luaL_checkinteger(L, 3); - else if (fastcmp(field,"charflags")) + break; + case player_charflags: plr->charflags = (UINT32)luaL_checkinteger(L, 3); - else if (fastcmp(field,"thokitem")) + break; + case player_thokitem: plr->thokitem = luaL_checkinteger(L, 3); - else if (fastcmp(field,"spinitem")) + break; + case player_spinitem: plr->spinitem = luaL_checkinteger(L, 3); - else if (fastcmp(field,"revitem")) + break; + case player_revitem: plr->revitem = luaL_checkinteger(L, 3); - else if (fastcmp(field,"followitem")) + break; + case player_followitem: plr->followitem = luaL_checkinteger(L, 3); - else if (fastcmp(field,"followmobj")) + break; + case player_followmobj: { mobj_t *mo = NULL; if (!lua_isnil(L, 3)) mo = *((mobj_t **)luaL_checkudata(L, 3, META_MOBJ)); P_SetTarget(&plr->followmobj, mo); + break; } - else if (fastcmp(field,"actionspd")) + case player_actionspd: plr->actionspd = (INT32)luaL_checkinteger(L, 3); - else if (fastcmp(field,"mindash")) + break; + case player_mindash: plr->mindash = (INT32)luaL_checkinteger(L, 3); - else if (fastcmp(field,"maxdash")) + break; + case player_maxdash: plr->maxdash = (INT32)luaL_checkinteger(L, 3); - else if (fastcmp(field,"jumpfactor")) + break; + case player_jumpfactor: plr->jumpfactor = (INT32)luaL_checkinteger(L, 3); - else if (fastcmp(field,"height")) + break; + case player_height: plr->height = luaL_checkfixed(L, 3); - else if (fastcmp(field,"spinheight")) + break; + case player_spinheight: plr->spinheight = luaL_checkfixed(L, 3); - else if (fastcmp(field,"lives")) + break; + case player_lives: plr->lives = (SINT8)luaL_checkinteger(L, 3); - else if (fastcmp(field,"continues")) + break; + case player_continues: plr->continues = (SINT8)luaL_checkinteger(L, 3); - else if (fastcmp(field,"xtralife")) + break; + case player_xtralife: plr->xtralife = (SINT8)luaL_checkinteger(L, 3); - else if (fastcmp(field,"gotcontinue")) + break; + case player_gotcontinue: plr->gotcontinue = (UINT8)luaL_checkinteger(L, 3); - else if (fastcmp(field,"speed")) + break; + case player_speed: plr->speed = luaL_checkfixed(L, 3); - else if (fastcmp(field,"secondjump")) + break; + case player_secondjump: plr->secondjump = (UINT8)luaL_checkinteger(L, 3); - else if (fastcmp(field,"fly1")) + break; + case player_fly1: plr->fly1 = (UINT8)luaL_checkinteger(L, 3); - else if (fastcmp(field,"scoreadd")) + break; + case player_scoreadd: plr->scoreadd = (UINT8)luaL_checkinteger(L, 3); - else if (fastcmp(field,"glidetime")) + break; + case player_glidetime: plr->glidetime = (tic_t)luaL_checkinteger(L, 3); - else if (fastcmp(field,"climbing")) + break; + case player_climbing: plr->climbing = (INT32)luaL_checkinteger(L, 3); - else if (fastcmp(field,"deadtimer")) + break; + case player_deadtimer: plr->deadtimer = (INT32)luaL_checkinteger(L, 3); - else if (fastcmp(field,"exiting")) + break; + case player_exiting: plr->exiting = (tic_t)luaL_checkinteger(L, 3); - else if (fastcmp(field,"homing")) + break; + case player_homing: plr->homing = (UINT8)luaL_checkinteger(L, 3); - else if (fastcmp(field,"dashmode")) + break; + case player_dashmode: plr->dashmode = (tic_t)luaL_checkinteger(L, 3); - else if (fastcmp(field,"skidtime")) + break; + case player_skidtime: plr->skidtime = (tic_t)luaL_checkinteger(L, 3); - else if (fastcmp(field,"cmomx")) + break; + case player_cmomx: plr->cmomx = luaL_checkfixed(L, 3); - else if (fastcmp(field,"cmomy")) + break; + case player_cmomy: plr->cmomy = luaL_checkfixed(L, 3); - else if (fastcmp(field,"rmomx")) + break; + case player_rmomx: plr->rmomx = luaL_checkfixed(L, 3); - else if (fastcmp(field,"rmomy")) + break; + case player_rmomy: plr->rmomy = luaL_checkfixed(L, 3); - else if (fastcmp(field,"numboxes")) + break; + case player_numboxes: plr->numboxes = (INT16)luaL_checkinteger(L, 3); - else if (fastcmp(field,"totalring")) + break; + case player_totalring: plr->totalring = (INT16)luaL_checkinteger(L, 3); - else if (fastcmp(field,"realtime")) + break; + case player_realtime: plr->realtime = (tic_t)luaL_checkinteger(L, 3); - else if (fastcmp(field,"laps")) + break; + case player_laps: plr->laps = (UINT8)luaL_checkinteger(L, 3); - else if (fastcmp(field,"ctfteam")) + break; + case player_ctfteam: plr->ctfteam = (INT32)luaL_checkinteger(L, 3); - else if (fastcmp(field,"gotflag")) + break; + case player_gotflag: plr->gotflag = (UINT16)luaL_checkinteger(L, 3); - else if (fastcmp(field,"weapondelay")) + break; + case player_weapondelay: plr->weapondelay = (INT32)luaL_checkinteger(L, 3); - else if (fastcmp(field,"tossdelay")) + break; + case player_tossdelay: plr->tossdelay = (INT32)luaL_checkinteger(L, 3); - else if (fastcmp(field,"starpostx")) + break; + case player_starpostx: plr->starpostx = (INT16)luaL_checkinteger(L, 3); - else if (fastcmp(field,"starposty")) + break; + case player_starposty: plr->starposty = (INT16)luaL_checkinteger(L, 3); - else if (fastcmp(field,"starpostz")) + break; + case player_starpostz: plr->starpostz = (INT16)luaL_checkinteger(L, 3); - else if (fastcmp(field,"starpostnum")) + break; + case player_starpostnum: plr->starpostnum = (INT32)luaL_checkinteger(L, 3); - else if (fastcmp(field,"starposttime")) + break; + case player_starposttime: plr->starposttime = (tic_t)luaL_checkinteger(L, 3); - else if (fastcmp(field,"starpostangle")) + break; + case player_starpostangle: plr->starpostangle = luaL_checkangle(L, 3); - else if (fastcmp(field,"starpostscale")) + break; + case player_starpostscale: plr->starpostscale = luaL_checkfixed(L, 3); - else if (fastcmp(field,"angle_pos")) + break; + case player_angle_pos: plr->angle_pos = luaL_checkangle(L, 3); - else if (fastcmp(field,"old_angle_pos")) + break; + case player_old_angle_pos: plr->old_angle_pos = luaL_checkangle(L, 3); - else if (fastcmp(field,"axis1")) + break; + case player_axis1: { mobj_t *mo = NULL; if (!lua_isnil(L, 3)) mo = *((mobj_t **)luaL_checkudata(L, 3, META_MOBJ)); P_SetTarget(&plr->axis1, mo); + break; } - else if (fastcmp(field,"axis2")) + case player_axis2: { mobj_t *mo = NULL; if (!lua_isnil(L, 3)) mo = *((mobj_t **)luaL_checkudata(L, 3, META_MOBJ)); P_SetTarget(&plr->axis2, mo); + break; } - else if (fastcmp(field,"bumpertime")) + case player_bumpertime: plr->bumpertime = (tic_t)luaL_checkinteger(L, 3); - else if (fastcmp(field,"flyangle")) + break; + case player_flyangle: plr->flyangle = (INT32)luaL_checkinteger(L, 3); - else if (fastcmp(field,"drilltimer")) + break; + case player_drilltimer: plr->drilltimer = (tic_t)luaL_checkinteger(L, 3); - else if (fastcmp(field,"linkcount")) + break; + case player_linkcount: plr->linkcount = (INT32)luaL_checkinteger(L, 3); - else if (fastcmp(field,"linktimer")) + break; + case player_linktimer: plr->linktimer = (tic_t)luaL_checkinteger(L, 3); - else if (fastcmp(field,"anotherflyangle")) + break; + case player_anotherflyangle: plr->anotherflyangle = (INT32)luaL_checkinteger(L, 3); - else if (fastcmp(field,"nightstime")) + break; + case player_nightstime: plr->nightstime = (tic_t)luaL_checkinteger(L, 3); - else if (fastcmp(field,"drillmeter")) + break; + case player_drillmeter: plr->drillmeter = (INT32)luaL_checkinteger(L, 3); - else if (fastcmp(field,"drilldelay")) + break; + case player_drilldelay: plr->drilldelay = (UINT8)luaL_checkinteger(L, 3); - else if (fastcmp(field,"bonustime")) + break; + case player_bonustime: plr->bonustime = luaL_checkboolean(L, 3); - else if (fastcmp(field,"capsule")) + break; + case player_capsule: { mobj_t *mo = NULL; if (!lua_isnil(L, 3)) mo = *((mobj_t **)luaL_checkudata(L, 3, META_MOBJ)); P_SetTarget(&plr->capsule, mo); + break; } - else if (fastcmp(field,"drone")) + case player_drone: { mobj_t *mo = NULL; if (!lua_isnil(L, 3)) mo = *((mobj_t **)luaL_checkudata(L, 3, META_MOBJ)); P_SetTarget(&plr->drone, mo); + break; } - else if (fastcmp(field,"oldscale")) + case player_oldscale: plr->oldscale = luaL_checkfixed(L, 3); - else if (fastcmp(field,"mare")) + break; + case player_mare: plr->mare = (UINT8)luaL_checkinteger(L, 3); - else if (fastcmp(field,"marelap")) + break; + case player_marelap: plr->marelap = (UINT8)luaL_checkinteger(L, 3); - else if (fastcmp(field,"marebonuslap")) + break; + case player_marebonuslap: plr->marebonuslap = (UINT8)luaL_checkinteger(L, 3); - else if (fastcmp(field,"marebegunat")) + break; + case player_marebegunat: plr->marebegunat = (tic_t)luaL_checkinteger(L, 3); - else if (fastcmp(field,"startedtime")) + break; + case player_startedtime: plr->startedtime = (tic_t)luaL_checkinteger(L, 3); - else if (fastcmp(field,"finishedtime")) + break; + case player_finishedtime: plr->finishedtime = (tic_t)luaL_checkinteger(L, 3); - else if (fastcmp(field,"lapbegunat")) + break; + case player_lapbegunat: plr->lapbegunat = (tic_t)luaL_checkinteger(L, 3); - else if (fastcmp(field,"lapstartedtime")) + break; + case player_lapstartedtime: plr->lapstartedtime = (tic_t)luaL_checkinteger(L, 3); - else if (fastcmp(field,"finishedspheres")) + break; + case player_finishedspheres: plr->finishedspheres = (INT16)luaL_checkinteger(L, 3); - else if (fastcmp(field,"finishedrings")) + break; + case player_finishedrings: plr->finishedrings = (INT16)luaL_checkinteger(L, 3); - else if (fastcmp(field,"marescore")) + break; + case player_marescore: plr->marescore = (UINT32)luaL_checkinteger(L, 3); - else if (fastcmp(field,"lastmarescore")) + break; + case player_lastmarescore: plr->lastmarescore = (UINT32)luaL_checkinteger(L, 3); - else if (fastcmp(field,"totalmarescore")) + break; + case player_totalmarescore: plr->totalmarescore = (UINT32)luaL_checkinteger(L, 3); - else if (fastcmp(field,"lastmare")) + break; + case player_lastmare: plr->lastmare = (UINT8)luaL_checkinteger(L, 3); - else if (fastcmp(field,"lastmarelap")) + break; + case player_lastmarelap: plr->lastmarelap = (UINT8)luaL_checkinteger(L, 3); - else if (fastcmp(field,"lastmarebonuslap")) + break; + case player_lastmarebonuslap: plr->lastmarebonuslap = (UINT8)luaL_checkinteger(L, 3); - else if (fastcmp(field,"totalmarelap")) + break; + case player_totalmarelap: plr->totalmarelap = (UINT8)luaL_checkinteger(L, 3); - else if (fastcmp(field,"totalmarebonuslap")) + break; + case player_totalmarebonuslap: plr->totalmarebonuslap = (UINT8)luaL_checkinteger(L, 3); - else if (fastcmp(field,"maxlink")) + break; + case player_maxlink: plr->maxlink = (INT32)luaL_checkinteger(L, 3); - else if (fastcmp(field,"texttimer")) + break; + case player_texttimer: plr->texttimer = (UINT8)luaL_checkinteger(L, 3); - else if (fastcmp(field,"textvar")) + break; + case player_textvar: plr->textvar = (UINT8)luaL_checkinteger(L, 3); - else if (fastcmp(field,"lastsidehit")) + break; + case player_lastsidehit: plr->lastsidehit = (INT16)luaL_checkinteger(L, 3); - else if (fastcmp(field,"lastlinehit")) + break; + case player_lastlinehit: plr->lastlinehit = (INT16)luaL_checkinteger(L, 3); - else if (fastcmp(field,"losstime")) + break; + case player_losstime: plr->losstime = (tic_t)luaL_checkinteger(L, 3); - else if (fastcmp(field,"timeshit")) + break; + case player_timeshit: plr->timeshit = (UINT8)luaL_checkinteger(L, 3); - else if (fastcmp(field,"onconveyor")) + break; + case player_onconveyor: plr->onconveyor = (INT32)luaL_checkinteger(L, 3); - else if (fastcmp(field,"awayviewmobj")) + break; + case player_awayviewmobj: { mobj_t *mo = NULL; if (!lua_isnil(L, 3)) mo = *((mobj_t **)luaL_checkudata(L, 3, META_MOBJ)); P_SetTarget(&plr->awayviewmobj, mo); + break; } - else if (fastcmp(field,"awayviewtics")) - { + case player_awayviewtics: plr->awayviewtics = (INT32)luaL_checkinteger(L, 3); if (plr->awayviewtics && !plr->awayviewmobj) // awayviewtics must ALWAYS have an awayviewmobj set!! P_SetTarget(&plr->awayviewmobj, plr->mo); // but since the script might set awayviewmobj immediately AFTER setting awayviewtics, use player mobj as filler for now. - } - else if (fastcmp(field,"awayviewaiming")) + break; + case player_awayviewaiming: plr->awayviewaiming = luaL_checkangle(L, 3); - else if (fastcmp(field,"spectator")) + break; + case player_spectator: plr->spectator = lua_toboolean(L, 3); - else if (fastcmp(field,"outofcoop")) + break; + case player_outofcoop: plr->outofcoop = lua_toboolean(L, 3); - else if (fastcmp(field,"bot")) + break; + case player_bot: return NOSET; - else if (fastcmp(field,"jointime")) + case player_botleader: + { + player_t *player = NULL; + if (!lua_isnil(L, 3)) + player = *((player_t **)luaL_checkudata(L, 3, META_PLAYER)); + plr->botleader = player; + break; + } + case player_lastbuttons: + plr->lastbuttons = (UINT16)luaL_checkinteger(L, 3); + break; + case player_blocked: + plr->blocked = (UINT8)luaL_checkinteger(L, 3); + break; + case player_jointime: plr->jointime = (tic_t)luaL_checkinteger(L, 3); - else if (fastcmp(field,"quittime")) + break; + case player_quittime: plr->quittime = (tic_t)luaL_checkinteger(L, 3); + break; #ifdef HWRENDER - else if (fastcmp(field,"fovadd")) + case player_fovadd: plr->fovadd = luaL_checkfixed(L, 3); + break; #endif - else { + default: lua_getfield(L, LUA_REGISTRYINDEX, LREG_EXTVARS); I_Assert(lua_istable(L, -1)); lua_pushlightuserdata(L, plr); @@ -735,15 +1330,17 @@ static int player_set(lua_State *L) if (lua_isnil(L, -1)) { // This index doesn't have a table for extra values yet, let's make one. lua_pop(L, 1); - CONS_Debug(DBG_LUA, M_GetText("'%s' has no field named '%s'; adding it as Lua data.\n"), "player_t", field); + CONS_Debug(DBG_LUA, M_GetText("'%s' has no field named '%s'; adding it as Lua data.\n"), "player_t", lua_tostring(L, 2)); lua_newtable(L); lua_pushlightuserdata(L, plr); lua_pushvalue(L, -2); // ext value table lua_rawset(L, -4); // LREG_EXTVARS table } + lua_pushvalue(L, 2); // key lua_pushvalue(L, 3); // value to store - lua_setfield(L, -2, field); + lua_settable(L, -3); lua_pop(L, 2); + break; } return 0; @@ -797,27 +1394,58 @@ static int power_len(lua_State *L) #define NOFIELD luaL_error(L, LUA_QL("ticcmd_t") " has no field named " LUA_QS, field) #define NOSET luaL_error(L, LUA_QL("ticcmd_t") " field " LUA_QS " should not be set directly.", field) +enum ticcmd_e +{ + ticcmd_forwardmove, + ticcmd_sidemove, + ticcmd_angleturn, + ticcmd_aiming, + ticcmd_buttons, + ticcmd_latency, +}; + +static const char *const ticcmd_opt[] = { + "forwardmove", + "sidemove", + "angleturn", + "aiming", + "buttons", + "latency", + NULL, +}; + +static int ticcmd_fields_ref = LUA_NOREF; + static int ticcmd_get(lua_State *L) { ticcmd_t *cmd = *((ticcmd_t **)luaL_checkudata(L, 1, META_TICCMD)); - const char *field = luaL_checkstring(L, 2); + enum ticcmd_e field = Lua_optoption(L, 2, -1, ticcmd_fields_ref); if (!cmd) return LUA_ErrInvalid(L, "player_t"); - if (fastcmp(field,"forwardmove")) + switch (field) + { + case ticcmd_forwardmove: lua_pushinteger(L, cmd->forwardmove); - else if (fastcmp(field,"sidemove")) + break; + case ticcmd_sidemove: lua_pushinteger(L, cmd->sidemove); - else if (fastcmp(field,"angleturn")) + break; + case ticcmd_angleturn: lua_pushinteger(L, cmd->angleturn); - else if (fastcmp(field,"aiming")) + break; + case ticcmd_aiming: lua_pushinteger(L, cmd->aiming); - else if (fastcmp(field,"buttons")) + break; + case ticcmd_buttons: lua_pushinteger(L, cmd->buttons); - else if (fastcmp(field,"latency")) + break; + case ticcmd_latency: lua_pushinteger(L, cmd->latency); - else + break; + default: return NOFIELD; + } return 1; } @@ -825,27 +1453,35 @@ static int ticcmd_get(lua_State *L) static int ticcmd_set(lua_State *L) { ticcmd_t *cmd = *((ticcmd_t **)luaL_checkudata(L, 1, META_TICCMD)); - const char *field = luaL_checkstring(L, 2); + enum ticcmd_e field = Lua_optoption(L, 2, -1, ticcmd_fields_ref); if (!cmd) return LUA_ErrInvalid(L, "ticcmd_t"); if (hud_running) return luaL_error(L, "Do not alter player_t in HUD rendering code!"); - if (fastcmp(field,"forwardmove")) + switch (field) + { + case ticcmd_forwardmove: cmd->forwardmove = (SINT8)luaL_checkinteger(L, 3); - else if (fastcmp(field,"sidemove")) + break; + case ticcmd_sidemove: cmd->sidemove = (SINT8)luaL_checkinteger(L, 3); - else if (fastcmp(field,"angleturn")) + break; + case ticcmd_angleturn: cmd->angleturn = (INT16)luaL_checkinteger(L, 3); - else if (fastcmp(field,"aiming")) + break; + case ticcmd_aiming: cmd->aiming = (INT16)luaL_checkinteger(L, 3); - else if (fastcmp(field,"buttons")) + break; + case ticcmd_buttons: cmd->buttons = (UINT16)luaL_checkinteger(L, 3); - else if (fastcmp(field,"latency")) + break; + case ticcmd_latency: return NOSET; - else + default: return NOFIELD; + } return 0; } @@ -866,6 +1502,8 @@ int LUA_PlayerLib(lua_State *L) lua_setfield(L, -2, "__len"); lua_pop(L,1); + player_fields_ref = Lua_CreateFieldTable(L, player_opt); + luaL_newmetatable(L, META_POWERS); lua_pushcfunction(L, power_get); lua_setfield(L, -2, "__index"); @@ -885,6 +1523,8 @@ int LUA_PlayerLib(lua_State *L) lua_setfield(L, -2, "__newindex"); lua_pop(L,1); + ticcmd_fields_ref = Lua_CreateFieldTable(L, ticcmd_opt); + lua_newuserdata(L, 0); lua_createtable(L, 0, 2); lua_pushcfunction(L, lib_getPlayer); diff --git a/src/lua_polyobjlib.c b/src/lua_polyobjlib.c index 5d76a912d..c3d9d9d1a 100644 --- a/src/lua_polyobjlib.c +++ b/src/lua_polyobjlib.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- -// Copyright (C) 2020-2021 by Iestyn "Monster Iestyn" Jealous. -// Copyright (C) 2020-2021 by Sonic Team Junior. +// Copyright (C) 2020-2023 by Iestyn "Monster Iestyn" Jealous. +// Copyright (C) 2020-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -244,13 +244,14 @@ static int lib_polyobj_rotate(lua_State *L) { polyobj_t *po = *((polyobj_t **)luaL_checkudata(L, 1, META_POLYOBJ)); angle_t delta = luaL_checkangle(L, 2); - UINT8 turnthings = (UINT8)luaL_optinteger(L, 3, 0); // don't turn anything by default? (could change this if not desired) - boolean checkmobjs = lua_opttrueboolean(L, 4); + boolean turnplayers = lua_opttrueboolean(L, 3); + boolean turnothers = lua_opttrueboolean(L, 4); + boolean checkmobjs = lua_opttrueboolean(L, 5); NOHUD INLEVEL if (!po) return LUA_ErrInvalid(L, "polyobj_t"); - lua_pushboolean(L, Polyobj_rotate(po, delta, turnthings, checkmobjs)); + lua_pushboolean(L, Polyobj_rotate(po, delta, turnplayers, turnothers, checkmobjs)); return 1; } diff --git a/src/lua_script.c b/src/lua_script.c index 4e04c2ee0..6893265d5 100644 --- a/src/lua_script.c +++ b/src/lua_script.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 2012-2016 by John "JTE" Muniz. -// Copyright (C) 2012-2021 by Sonic Team Junior. +// Copyright (C) 2012-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -20,11 +20,12 @@ #include "r_state.h" #include "r_sky.h" #include "g_game.h" +#include "g_input.h" #include "f_finale.h" #include "byteptr.h" #include "p_saveg.h" #include "p_local.h" -#include "p_slopes.h" // for P_SlopeById +#include "p_slopes.h" // for P_SlopeById and slopelist #include "p_polyobj.h" // polyobj_t, PolyObjects #ifdef LUA_ALLOW_BYTECODE #include "d_netfil.h" // for LUA_DumpFile @@ -57,6 +58,7 @@ static lua_CFunction liblist[] = { LUA_PolyObjLib, // polyobj_t LUA_BlockmapLib, // blockmap stuff LUA_HudLib, // HUD stuff + LUA_InputLib, // inputs NULL }; @@ -202,6 +204,9 @@ int LUA_PushGlobals(lua_State *L, const char *word) } else if (fastcmp(word,"modifiedgame")) { lua_pushboolean(L, modifiedgame && !savemoddata); return 1; + } else if (fastcmp(word,"usedCheats")) { + lua_pushboolean(L, usedCheats); + return 1; } else if (fastcmp(word,"menuactive")) { lua_pushboolean(L, menuactive); return 1; @@ -301,6 +306,18 @@ int LUA_PushGlobals(lua_State *L, const char *word) lua_pushinteger(L, ammoremovaltics); return 1; // end timers + } else if (fastcmp(word,"use1upSound")) { + lua_pushinteger(L, use1upSound); + return 1; + } else if (fastcmp(word,"maxXtraLife")) { + lua_pushinteger(L, maxXtraLife); + return 1; + } else if (fastcmp(word,"useContinues")) { + lua_pushinteger(L, useContinues); + return 1; + } else if (fastcmp(word,"shareEmblems")) { + lua_pushinteger(L, shareEmblems); + return 1; } else if (fastcmp(word,"gametype")) { lua_pushinteger(L, gametype); return 1; @@ -386,6 +403,20 @@ int LUA_PushGlobals(lua_State *L, const char *word) } else if (fastcmp(word, "stagefailed")) { lua_pushboolean(L, stagefailed); return 1; + } else if (fastcmp(word, "mouse")) { + LUA_PushUserdata(L, &mouse, META_MOUSE); + return 1; + } else if (fastcmp(word, "mouse2")) { + LUA_PushUserdata(L, &mouse2, META_MOUSE); + return 1; + } else if (fastcmp(word, "camera")) { + LUA_PushUserdata(L, &camera, META_CAMERA); + return 1; + } else if (fastcmp(word, "camera2")) { + if (!splitscreen) + return 0; + LUA_PushUserdata(L, &camera2, META_CAMERA); + return 1; } return 0; } @@ -431,7 +462,7 @@ int LUA_CheckGlobals(lua_State *L, const char *word) if (strlen(str) < strlength) return luaL_error(L, "string must not contain embedded zeros!"); - strncpy(mapmusname, str, strlength); + strlcpy(mapmusname, str, sizeof mapmusname); } else if (fastcmp(word, "mapmusflags")) mapmusflags = (UINT16)luaL_checkinteger(L, 2); @@ -679,20 +710,23 @@ void LUA_DumpFile(const char *filename) fixed_t LUA_EvalMath(const char *word) { - lua_State *L = NULL; + static lua_State *L = NULL; char buf[1024], *b; const char *p; fixed_t res = 0; - // make a new state so SOC can't interefere with scripts - // allocate state - L = lua_newstate(LUA_Alloc, NULL); - lua_atpanic(L, LUA_Panic); + if (!L) + { + // make a new state so SOC can't interefere with scripts + // allocate state + L = lua_newstate(LUA_Alloc, NULL); + lua_atpanic(L, LUA_Panic); - // open only enum lib - lua_pushcfunction(L, LUA_EnumLib); - lua_pushboolean(L, true); - lua_call(L, 1, 0); + // open only enum lib + lua_pushcfunction(L, LUA_EnumLib); + lua_pushboolean(L, true); + lua_call(L, 1, 0); + } // change ^ into ^^ for Lua. strcpy(buf, "return "); @@ -717,8 +751,6 @@ fixed_t LUA_EvalMath(const char *word) else res = lua_tointeger(L, -1); - // clean up and return. - lua_close(L); return res; } @@ -844,6 +876,8 @@ void LUA_InvalidateLevel(void) { LUA_InvalidateUserdata(&lines[i]); LUA_InvalidateUserdata(&lines[i].tags); + LUA_InvalidateUserdata(lines[i].args); + LUA_InvalidateUserdata(lines[i].stringargs); LUA_InvalidateUserdata(lines[i].sidenum); } for (i = 0; i < numsides; i++) @@ -856,6 +890,13 @@ void LUA_InvalidateLevel(void) LUA_InvalidateUserdata(&PolyObjects[i].vertices); LUA_InvalidateUserdata(&PolyObjects[i].lines); } + for (pslope_t *slope = slopelist; slope; slope = slope->next) + { + LUA_InvalidateUserdata(slope); + LUA_InvalidateUserdata(&slope->normal); + LUA_InvalidateUserdata(&slope->o); + LUA_InvalidateUserdata(&slope->d); + } #ifdef HAVE_LUA_SEGS for (i = 0; i < numsegs; i++) LUA_InvalidateUserdata(&segs[i]); @@ -878,6 +919,8 @@ void LUA_InvalidateMapthings(void) { LUA_InvalidateUserdata(&mapthings[i]); LUA_InvalidateUserdata(&mapthings[i].tags); + LUA_InvalidateUserdata(mapthings[i].args); + LUA_InvalidateUserdata(mapthings[i].stringargs); } } @@ -921,6 +964,7 @@ enum ARCH_SLOPE, ARCH_MAPHEADER, ARCH_SKINCOLOR, + ARCH_MOUSE, ARCH_TEND=0xFF, }; @@ -948,6 +992,7 @@ static const struct { {META_SLOPE, ARCH_SLOPE}, {META_MAPHEADER, ARCH_MAPHEADER}, {META_SKINCOLOR, ARCH_SKINCOLOR}, + {META_MOUSE, ARCH_MOUSE}, {NULL, ARCH_NULL} }; @@ -1255,7 +1300,6 @@ static UINT8 ArchiveValue(int TABLESINDEX, int myindex) } break; } - case ARCH_SKINCOLOR: { skincolor_t *info = *((skincolor_t **)lua_touserdata(gL, myindex)); @@ -1263,6 +1307,13 @@ static UINT8 ArchiveValue(int TABLESINDEX, int myindex) WRITEUINT16(save_p, info - skincolors); break; } + case ARCH_MOUSE: + { + mouse_t *m = *((mouse_t **)lua_touserdata(gL, myindex)); + WRITEUINT8(save_p, ARCH_MOUSE); + WRITEUINT8(save_p, m == &mouse ? 1 : 2); + break; + } default: WRITEUINT8(save_p, ARCH_NULL); return 2; @@ -1358,21 +1409,13 @@ static void ArchiveTables(void) // Write key e = ArchiveValue(TABLESINDEX, -2); // key should be either a number or a string, ArchiveValue can handle this. if (e == 2) // invalid key type (function, thread, lightuserdata, or anything we don't recognise) - { - lua_pushvalue(gL, -2); - CONS_Alert(CONS_ERROR, "Index '%s' (%s) of table %d could not be archived!\n", lua_tostring(gL, -1), luaL_typename(gL, -1), i); - lua_pop(gL, 1); - } + CONS_Alert(CONS_ERROR, "Index '%s' (%s) of table %d could not be archived!\n", lua_tostring(gL, -2), luaL_typename(gL, -2), i); // Write value e = ArchiveValue(TABLESINDEX, -1); if (e == 1) n++; // the table contained a new table we'll have to archive. :( else if (e == 2) // invalid value type - { - lua_pushvalue(gL, -2); - CONS_Alert(CONS_ERROR, "Type of value for table %d entry '%s' (%s) could not be archived!\n", i, lua_tostring(gL, -1), luaL_typename(gL, -1)); - lua_pop(gL, 1); - } + CONS_Alert(CONS_ERROR, "Type of value for table %d entry '%s' (%s) could not be archived!\n", i, lua_tostring(gL, -2), luaL_typename(gL, -1)); lua_pop(gL, 1); } @@ -1514,6 +1557,9 @@ static UINT8 UnArchiveValue(int TABLESINDEX) case ARCH_SKINCOLOR: LUA_PushUserdata(gL, &skincolors[READUINT16(save_p)], META_SKINCOLOR); break; + case ARCH_MOUSE: + LUA_PushUserdata(gL, READUINT16(save_p) == 1 ? &mouse : &mouse2, META_MOUSE); + break; case ARCH_TEND: return 1; } @@ -1640,7 +1686,7 @@ void LUA_Archive(void) WRITEUINT32(save_p, UINT32_MAX); // end of mobjs marker, replaces mobjnum. - LUAh_NetArchiveHook(NetArchive); // call the NetArchive hook in archive mode + LUA_HookNetArchive(NetArchive); // call the NetArchive hook in archive mode ArchiveTables(); if (gL) @@ -1675,7 +1721,7 @@ void LUA_UnArchive(void) } } while(mobjnum != UINT32_MAX); // repeat until end of mobjs marker. - LUAh_NetArchiveHook(NetUnArchive); // call the NetArchive hook in unarchive mode + LUA_HookNetArchive(NetUnArchive); // call the NetArchive hook in unarchive mode UnArchiveTables(); if (gL) @@ -1683,17 +1729,39 @@ void LUA_UnArchive(void) } // For mobj_t, player_t, etc. to take custom variables. -int Lua_optoption(lua_State *L, int narg, - const char *def, const char *const lst[]) +int Lua_optoption(lua_State *L, int narg, int def, int list_ref) { - const char *name = (def) ? luaL_optstring(L, narg, def) : luaL_checkstring(L, narg); - int i; - for (i=0; lst[i]; i++) - if (fastcmp(lst[i], name)) - return i; + if (lua_isnoneornil(L, narg)) + return def; + + I_Assert(lua_checkstack(L, 2)); + luaL_checkstring(L, narg); + + lua_rawgeti(L, LUA_REGISTRYINDEX, list_ref); + I_Assert(lua_istable(L, -1)); + lua_pushvalue(L, narg); + lua_rawget(L, -2); + + if (lua_isnumber(L, -1)) + return lua_tointeger(L, -1); return -1; } +int Lua_CreateFieldTable(lua_State *L, const char *const lst[]) +{ + int i; + + lua_newtable(L); + for (i = 0; lst[i] != NULL; i++) + { + lua_pushstring(L, lst[i]); + lua_pushinteger(L, i); + lua_settable(L, -3); + } + + return luaL_ref(L, LUA_REGISTRYINDEX); +} + void LUA_PushTaggableObjectArray ( lua_State *L, const char *field, diff --git a/src/lua_script.h b/src/lua_script.h index a9c8762ad..d0b06a719 100644 --- a/src/lua_script.h +++ b/src/lua_script.h @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 2012-2016 by John "JTE" Muniz. -// Copyright (C) 2012-2021 by Sonic Team Junior. +// Copyright (C) 2012-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -57,9 +57,9 @@ int LUA_PushGlobals(lua_State *L, const char *word); int LUA_CheckGlobals(lua_State *L, const char *word); void Got_Luacmd(UINT8 **cp, INT32 playernum); // lua_consolelib.c void LUA_CVarChanged(void *cvar); // lua_consolelib.c -int Lua_optoption(lua_State *L, int narg, - const char *def, const char *const lst[]); -void LUAh_NetArchiveHook(lua_CFunction archFunc); +int Lua_optoption(lua_State *L, int narg, int def, int list_ref); +int Lua_CreateFieldTable(lua_State *L, const char *const lst[]); +void LUA_HookNetArchive(lua_CFunction archFunc); void LUA_PushTaggableObjectArray ( lua_State *L, diff --git a/src/lua_skinlib.c b/src/lua_skinlib.c index e66a379e9..b7890a6c7 100644 --- a/src/lua_skinlib.c +++ b/src/lua_skinlib.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 2014-2016 by John "JTE" Muniz. -// Copyright (C) 2014-2021 by Sonic Team Junior. +// Copyright (C) 2014-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -55,6 +55,7 @@ enum skin { skin_soundsid, skin_sprites }; + static const char *const skin_opt[] = { "valid", "name", @@ -95,10 +96,12 @@ static const char *const skin_opt[] = { #define UNIMPLEMENTED luaL_error(L, LUA_QL("skin_t") " field " LUA_QS " is not implemented for Lua and cannot be accessed.", skin_opt[field]) +static int skin_fields_ref = LUA_NOREF; + static int skin_get(lua_State *L) { skin_t *skin = *((skin_t **)luaL_checkudata(L, 1, META_SKIN)); - enum skin field = luaL_checkoption(L, 2, NULL, skin_opt); + enum skin field = Lua_optoption(L, 2, -1, skin_fields_ref); // skins are always valid, only added, never removed I_Assert(skin != NULL); @@ -376,6 +379,8 @@ int LUA_SkinLib(lua_State *L) lua_setfield(L, -2, "__len"); lua_pop(L,1); + skin_fields_ref = Lua_CreateFieldTable(L, skin_opt); + luaL_newmetatable(L, META_SOUNDSID); lua_pushcfunction(L, soundsid_get); lua_setfield(L, -2, "__index"); diff --git a/src/lua_taglib.c b/src/lua_taglib.c index d0cf385a9..2ba60df99 100644 --- a/src/lua_taglib.c +++ b/src/lua_taglib.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- -// Copyright (C) 2020-2021 by James R. -// Copyright (C) 2020-2021 by Sonic Team Junior. +// Copyright (C) 2020-2023 by James R. +// Copyright (C) 2020-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/lua_thinkerlib.c b/src/lua_thinkerlib.c index 65bf8c313..cff92f34d 100644 --- a/src/lua_thinkerlib.c +++ b/src/lua_thinkerlib.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 2012-2016 by John "JTE" Muniz. -// Copyright (C) 2012-2021 by Sonic Team Junior. +// Copyright (C) 2012-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/m_aatree.c b/src/m_aatree.c index b228ed63d..a530395f6 100644 --- a/src/m_aatree.c +++ b/src/m_aatree.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/m_aatree.h b/src/m_aatree.h index 5a240394f..91716f346 100644 --- a/src/m_aatree.h +++ b/src/m_aatree.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/m_anigif.c b/src/m_anigif.c index fe04a5cb4..90e4c69ce 100644 --- a/src/m_anigif.c +++ b/src/m_anigif.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 2013-2016 by Matthew "Kaito Sinclaire" Walsh. // Copyright (C) 2013 by "Ninji". -// Copyright (C) 2013-2021 by Sonic Team Junior. +// Copyright (C) 2013-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -608,7 +608,7 @@ static void GIF_framewrite(void) { // golden's attempt at creating a "dynamic delay" UINT16 mingifdelay = 10; // minimum gif delay in milliseconds (keep at 10 because gifs can't get more precise). - gif_delayus += I_PreciseToMicros(I_GetPreciseTime() - gif_prevframetime); // increase delay by how much time was spent between last measurement + gif_delayus += (I_GetPreciseTime() - gif_prevframetime) / (I_GetPrecisePrecision() / 1000000); // increase delay by how much time was spent between last measurement if (gif_delayus/1000 >= mingifdelay) // delay is big enough to be able to effect gif frame delay? { @@ -621,7 +621,7 @@ static void GIF_framewrite(void) { float delayf = ceil(100.0f/NEWTICRATE); - delay = (UINT16)I_PreciseToMicros((I_GetPreciseTime() - gif_prevframetime))/10/1000; + delay = (UINT16)((I_GetPreciseTime() - gif_prevframetime)) / (I_GetPrecisePrecision() / 1000000) /10/1000; if (delay < (UINT16)(delayf)) delay = (UINT16)(delayf); diff --git a/src/m_anigif.h b/src/m_anigif.h index ca7563b1e..060c5f585 100644 --- a/src/m_anigif.h +++ b/src/m_anigif.h @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 2013-2016 by Matthew "Kaito Sinclaire" Walsh. -// Copyright (C) 2013-2021 by Sonic Team Junior. +// Copyright (C) 2013-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/m_argv.c b/src/m_argv.c index 453d6e45c..475be23a3 100644 --- a/src/m_argv.c +++ b/src/m_argv.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/m_argv.h b/src/m_argv.h index f39db513f..2d74ca150 100644 --- a/src/m_argv.h +++ b/src/m_argv.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/m_bbox.c b/src/m_bbox.c index e0505fd95..75c84385a 100644 --- a/src/m_bbox.c +++ b/src/m_bbox.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/m_bbox.h b/src/m_bbox.h index c56bd22c0..046e325a9 100644 --- a/src/m_bbox.h +++ b/src/m_bbox.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/m_cheat.c b/src/m_cheat.c index c958bb4a4..e370335f8 100644 --- a/src/m_cheat.c +++ b/src/m_cheat.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -72,19 +72,16 @@ static UINT8 cheatf_ultimate(void) static UINT8 cheatf_warp(void) { - if (modifiedgame) - return 0; - if (menuactive && currentMenu != &MainDef) return 0; // Only on the main menu! S_StartSound(0, sfx_itemup); // Temporarily unlock stuff. - G_SetGameModified(false); - unlockables[31].unlocked = true; // credits - unlockables[30].unlocked = true; // sound test - unlockables[28].unlocked = true; // level select + G_SetUsedCheats(false); + clientGamedata->unlocked[31] = true; // credits + clientGamedata->unlocked[30] = true; // sound test + clientGamedata->unlocked[28] = true; // level select // Refresh secrets menu existing. M_ClearMenus(true); @@ -97,18 +94,15 @@ static UINT8 cheatf_devmode(void) { UINT8 i; - if (modifiedgame) - return 0; - if (menuactive && currentMenu != &MainDef) return 0; // Only on the main menu! S_StartSound(0, sfx_itemup); // Just unlock all the things and turn on -debug and console devmode. - G_SetGameModified(false); + G_SetUsedCheats(false); for (i = 0; i < MAXUNLOCKABLES; i++) - unlockables[i].unlocked = true; + clientGamedata->unlocked[i] = true; devparm = true; cv_debug |= 0x8000; @@ -203,11 +197,11 @@ boolean cht_Responder(event_t *ev) if (ev->type != ev_keydown) return false; - if (ev->data1 > 0xFF) + if (ev->key > 0xFF) { // map some fake (joy) inputs into keys // map joy inputs into keys - switch (ev->data1) + switch (ev->key) { case KEY_JOY1: case KEY_JOY1 + 2: @@ -231,7 +225,7 @@ boolean cht_Responder(event_t *ev) } } else - ch = (UINT8)ev->data1; + ch = (UINT8)ev->key; ret += cht_CheckCheat(&cheat_ultimate, (char)ch); ret += cht_CheckCheat(&cheat_ultimate_joy, (char)ch); @@ -244,7 +238,7 @@ boolean cht_Responder(event_t *ev) } // Console cheat commands rely on these a lot... -#define REQUIRE_PANDORA if (!M_SecretUnlocked(SECRET_PANDORA) && !cv_debug)\ +#define REQUIRE_PANDORA if (!M_SecretUnlocked(SECRET_PANDORA, serverGamedata) && !cv_debug)\ { CONS_Printf(M_GetText("You haven't earned this yet.\n")); return; } #define REQUIRE_DEVMODE if (!cv_debug)\ @@ -275,7 +269,7 @@ void Command_CheatNoClip_f(void) plyr->pflags ^= PF_NOCLIP; CONS_Printf(M_GetText("No Clipping %s\n"), plyr->pflags & PF_NOCLIP ? M_GetText("On") : M_GetText("Off")); - G_SetGameModified(multiplayer); + G_SetUsedCheats(false); } void Command_CheatGod_f(void) @@ -290,7 +284,7 @@ void Command_CheatGod_f(void) plyr->pflags ^= PF_GODMODE; CONS_Printf(M_GetText("Cheese Mode %s\n"), plyr->pflags & PF_GODMODE ? M_GetText("On") : M_GetText("Off")); - G_SetGameModified(multiplayer); + G_SetUsedCheats(false); } void Command_CheatNoTarget_f(void) @@ -305,7 +299,7 @@ void Command_CheatNoTarget_f(void) plyr->pflags ^= PF_INVIS; CONS_Printf(M_GetText("SEP Field %s\n"), plyr->pflags & PF_INVIS ? M_GetText("On") : M_GetText("Off")); - G_SetGameModified(multiplayer); + G_SetUsedCheats(false); } void Command_Scale_f(void) @@ -475,7 +469,7 @@ void Command_RTeleport_f(void) CONS_Printf(M_GetText("Teleporting by %d, %d, %d...\n"), intx, inty, FixedInt((intz-p->mo->z))); P_MapStart(); - if (!P_TeleportMove(p->mo, p->mo->x+intx*FRACUNIT, p->mo->y+inty*FRACUNIT, intz)) + if (!P_SetOrigin(p->mo, p->mo->x+intx*FRACUNIT, p->mo->y+inty*FRACUNIT, intz)) CONS_Alert(CONS_WARNING, M_GetText("Unable to teleport to that spot!\n")); else S_StartSound(p->mo, sfx_mixup); @@ -539,7 +533,7 @@ void Command_Teleport_f(void) // Flagging a player's ambush will make them start on the ceiling // Objectflip inverts - if (!!(mt->options & MTF_AMBUSH) ^ !!(mt->options & MTF_OBJECTFLIP)) + if (!!(mt->args[0]) ^ !!(mt->options & MTF_OBJECTFLIP)) intz = ss->sector->ceilingheight - p->mo->height - offset; else intz = ss->sector->floorheight + offset; @@ -696,7 +690,7 @@ void Command_Teleport_f(void) } P_MapStart(); - if (!P_TeleportMove(p->mo, intx, inty, intz)) + if (!P_SetOrigin(p->mo, intx, inty, intz)) CONS_Alert(CONS_WARNING, M_GetText("Unable to teleport to that spot!\n")); else S_StartSound(p->mo, sfx_mixup); @@ -879,7 +873,7 @@ void Command_Devmode_f(void) return; } - G_SetGameModified(multiplayer); + G_SetUsedCheats(false); } void Command_Setrings_f(void) @@ -905,7 +899,7 @@ void Command_Setrings_f(void) // no totalsphere addition to revert } - G_SetGameModified(multiplayer); + G_SetUsedCheats(false); } } @@ -928,7 +922,7 @@ void Command_Setlives_f(void) P_GivePlayerLives(&players[consoleplayer], atoi(COM_Argv(1))); } - G_SetGameModified(multiplayer); + G_SetUsedCheats(false); } } @@ -955,7 +949,7 @@ void Command_Setcontinues_f(void) players[consoleplayer].continues = numcontinues; - G_SetGameModified(multiplayer); + G_SetUsedCheats(false); } } @@ -1137,7 +1131,7 @@ void OP_ResetObjectplace(void) // // Main meat of objectplace: handling functions // -void OP_NightsObjectplace(player_t *player) +/*void OP_NightsObjectplace(player_t *player) { ticcmd_t *cmd = &player->cmd; mapthing_t *mt; @@ -1283,14 +1277,14 @@ void OP_NightsObjectplace(player_t *player) mt = OP_CreateNewMapThing(player, (UINT16)cv_mapthingnum.value, false); mt->angle = angle; - if (mt->type >= 600 && mt->type <= 609) // Placement patterns + if (mt->type >= 600 && mt->type <= 611) // Placement patterns P_SpawnItemPattern(mt, false); - else if (mt->type == 1705 || mt->type == 1713) // NiGHTS Hoops + else if (mt->type == 1713) // NiGHTS Hoops P_SpawnHoop(mt); else P_SpawnMapThing(mt); } -} +}*/ // // OP_ObjectplaceMovement @@ -1315,13 +1309,13 @@ void OP_ObjectplaceMovement(player_t *player) if (cmd->forwardmove != 0) { P_Thrust(player->mo, player->mo->angle, (cmd->forwardmove*player->mo->scale/MAXPLMOVE)*cv_speed.value); - P_TeleportMove(player->mo, player->mo->x+player->mo->momx, player->mo->y+player->mo->momy, player->mo->z); + P_MoveOrigin(player->mo, player->mo->x+player->mo->momx, player->mo->y+player->mo->momy, player->mo->z); player->mo->momx = player->mo->momy = 0; } if (cmd->sidemove != 0) { P_Thrust(player->mo, player->mo->angle-ANGLE_90, (cmd->sidemove*player->mo->scale/MAXPLMOVE)*cv_speed.value); - P_TeleportMove(player->mo, player->mo->x+player->mo->momx, player->mo->y+player->mo->momy, player->mo->z); + P_MoveOrigin(player->mo, player->mo->x+player->mo->momx, player->mo->y+player->mo->momy, player->mo->z); player->mo->momx = player->mo->momy = 0; } @@ -1414,9 +1408,9 @@ void OP_ObjectplaceMovement(player_t *player) return; mt = OP_CreateNewMapThing(player, (UINT16)spawnthing, ceiling); - if (mt->type >= 600 && mt->type <= 609) // Placement patterns + if (mt->type >= 600 && mt->type <= 611) // Placement patterns P_SpawnItemPattern(mt, false); - else if (mt->type == 1705 || mt->type == 1713) // NiGHTS Hoops + else if (mt->type == 1713) // NiGHTS Hoops P_SpawnHoop(mt); else P_SpawnMapThing(mt); @@ -1428,14 +1422,14 @@ void OP_ObjectplaceMovement(player_t *player) // // Objectplace related commands. // -void Command_Writethings_f(void) +/*void Command_Writethings_f(void) { REQUIRE_INLEVEL; REQUIRE_SINGLEPLAYER; REQUIRE_OBJECTPLACE; P_WriteThings(); -} +}*/ void Command_ObjectPlace_f(void) { @@ -1446,7 +1440,7 @@ void Command_ObjectPlace_f(void) REQUIRE_SINGLEPLAYER; REQUIRE_NOULTIMATE; - G_SetGameModified(multiplayer); + G_SetUsedCheats(false); silent = COM_CheckParm("-silent"); diff --git a/src/m_cheat.h b/src/m_cheat.h index ee4ba5f55..f4ac01d84 100644 --- a/src/m_cheat.h +++ b/src/m_cheat.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -26,7 +26,7 @@ void cht_Init(void); // ObjectPlace // void Command_ObjectPlace_f(void); -void Command_Writethings_f(void); +//void Command_Writethings_f(void); extern consvar_t cv_opflags, cv_ophoopflags, cv_mapthingnum, cv_speed; //extern consvar_t cv_snapto, cv_grid; @@ -38,7 +38,7 @@ extern UINT32 op_displayflags; boolean OP_FreezeObjectplace(void); void OP_ResetObjectplace(void); -void OP_NightsObjectplace(player_t *player); +//void OP_NightsObjectplace(player_t *player); void OP_ObjectplaceMovement(player_t *player); // diff --git a/src/m_cond.c b/src/m_cond.c index 85d732a48..a54988f67 100644 --- a/src/m_cond.c +++ b/src/m_cond.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 2012-2016 by Matthew "Kaito Sinclaire" Walsh. -// Copyright (C) 2012-2021 by Sonic Team Junior. +// Copyright (C) 2012-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -21,6 +21,9 @@ #include "r_skins.h" // numskins #include "r_draw.h" // R_GetColorByName +gamedata_t *clientGamedata; // Our gamedata +gamedata_t *serverGamedata; // Server's gamedata + // Map triggers for linedef executors // 32 triggers, one bit each UINT32 unlocktriggers; @@ -41,6 +44,70 @@ unlockable_t unlockables[MAXUNLOCKABLES]; INT32 numemblems = 0; INT32 numextraemblems = 0; +// Temporary holding place for nights data for the current map +nightsdata_t ntemprecords; + +// Create a new gamedata_t, for start-up +gamedata_t *M_NewGameDataStruct(void) +{ + gamedata_t *data = Z_Calloc(sizeof (*data), PU_STATIC, NULL); + M_ClearSecrets(data); + G_ClearRecords(data); + return data; +} + +void M_CopyGameData(gamedata_t *dest, gamedata_t *src) +{ + INT32 i, j; + + M_ClearSecrets(dest); + G_ClearRecords(dest); + + dest->loaded = src->loaded; + dest->totalplaytime = src->totalplaytime; + + dest->timesBeaten = src->timesBeaten; + dest->timesBeatenWithEmeralds = src->timesBeatenWithEmeralds; + dest->timesBeatenUltimate = src->timesBeatenUltimate; + + memcpy(dest->achieved, src->achieved, sizeof(dest->achieved)); + memcpy(dest->collected, src->collected, sizeof(dest->collected)); + memcpy(dest->extraCollected, src->extraCollected, sizeof(dest->extraCollected)); + memcpy(dest->unlocked, src->unlocked, sizeof(dest->unlocked)); + + memcpy(dest->mapvisited, src->mapvisited, sizeof(dest->mapvisited)); + + // Main records + for (i = 0; i < NUMMAPS; ++i) + { + if (!src->mainrecords[i]) + continue; + + G_AllocMainRecordData((INT16)i, dest); + dest->mainrecords[i]->score = src->mainrecords[i]->score; + dest->mainrecords[i]->time = src->mainrecords[i]->time; + dest->mainrecords[i]->rings = src->mainrecords[i]->rings; + } + + // Nights records + for (i = 0; i < NUMMAPS; ++i) + { + if (!src->nightsrecords[i] || !src->nightsrecords[i]->nummares) + continue; + + G_AllocNightsRecordData((INT16)i, dest); + + for (j = 0; j < (src->nightsrecords[i]->nummares + 1); j++) + { + dest->nightsrecords[i]->score[j] = src->nightsrecords[i]->score[j]; + dest->nightsrecords[i]->grade[j] = src->nightsrecords[i]->grade[j]; + dest->nightsrecords[i]->time[j] = src->nightsrecords[i]->time[j]; + } + + dest->nightsrecords[i]->nummares = src->nightsrecords[i]->nummares; + } +} + void M_AddRawCondition(UINT8 set, UINT8 id, conditiontype_t c, INT32 r, INT16 x1, INT16 x2) { condition_t *cond; @@ -70,89 +137,90 @@ void M_ClearConditionSet(UINT8 set) conditionSets[set - 1].condition = NULL; conditionSets[set - 1].numconditions = 0; } - conditionSets[set - 1].achieved = false; + clientGamedata->achieved[set - 1] = serverGamedata->achieved[set - 1] = false; } // Clear ALL secrets. -void M_ClearSecrets(void) +void M_ClearSecrets(gamedata_t *data) { INT32 i; - memset(mapvisited, 0, sizeof(mapvisited)); + memset(data->mapvisited, 0, sizeof(data->mapvisited)); for (i = 0; i < MAXEMBLEMS; ++i) - emblemlocations[i].collected = false; + data->collected[i] = false; for (i = 0; i < MAXEXTRAEMBLEMS; ++i) - extraemblems[i].collected = false; + data->extraCollected[i] = false; for (i = 0; i < MAXUNLOCKABLES; ++i) - unlockables[i].unlocked = false; + data->unlocked[i] = false; for (i = 0; i < MAXCONDITIONSETS; ++i) - conditionSets[i].achieved = false; + data->achieved[i] = false; - timesBeaten = timesBeatenWithEmeralds = timesBeatenUltimate = 0; + data->timesBeaten = data->timesBeatenWithEmeralds = data->timesBeatenUltimate = 0; // Re-unlock any always unlocked things - M_SilentUpdateUnlockablesAndEmblems(); + M_SilentUpdateUnlockablesAndEmblems(data); + M_SilentUpdateSkinAvailabilites(); } // ---------------------- // Condition set checking // ---------------------- -static UINT8 M_CheckCondition(condition_t *cn) +static UINT8 M_CheckCondition(condition_t *cn, gamedata_t *data) { switch (cn->type) { case UC_PLAYTIME: // Requires total playing time >= x - return (totalplaytime >= (unsigned)cn->requirement); + return (data->totalplaytime >= (unsigned)cn->requirement); case UC_GAMECLEAR: // Requires game beaten >= x times - return (timesBeaten >= (unsigned)cn->requirement); + return (data->timesBeaten >= (unsigned)cn->requirement); case UC_ALLEMERALDS: // Requires game beaten with all 7 emeralds >= x times - return (timesBeatenWithEmeralds >= (unsigned)cn->requirement); + return (data->timesBeatenWithEmeralds >= (unsigned)cn->requirement); case UC_ULTIMATECLEAR: // Requires game beaten on ultimate >= x times (in other words, never) - return (timesBeatenUltimate >= (unsigned)cn->requirement); + return (data->timesBeatenUltimate >= (unsigned)cn->requirement); case UC_OVERALLSCORE: // Requires overall score >= x - return (M_GotHighEnoughScore(cn->requirement)); + return (M_GotHighEnoughScore(cn->requirement, data)); case UC_OVERALLTIME: // Requires overall time <= x - return (M_GotLowEnoughTime(cn->requirement)); + return (M_GotLowEnoughTime(cn->requirement, data)); case UC_OVERALLRINGS: // Requires overall rings >= x - return (M_GotHighEnoughRings(cn->requirement)); + return (M_GotHighEnoughRings(cn->requirement, data)); case UC_MAPVISITED: // Requires map x to be visited - return ((mapvisited[cn->requirement - 1] & MV_VISITED) == MV_VISITED); + return ((data->mapvisited[cn->requirement - 1] & MV_VISITED) == MV_VISITED); case UC_MAPBEATEN: // Requires map x to be beaten - return ((mapvisited[cn->requirement - 1] & MV_BEATEN) == MV_BEATEN); + return ((data->mapvisited[cn->requirement - 1] & MV_BEATEN) == MV_BEATEN); case UC_MAPALLEMERALDS: // Requires map x to be beaten with all emeralds in possession - return ((mapvisited[cn->requirement - 1] & MV_ALLEMERALDS) == MV_ALLEMERALDS); + return ((data->mapvisited[cn->requirement - 1] & MV_ALLEMERALDS) == MV_ALLEMERALDS); case UC_MAPULTIMATE: // Requires map x to be beaten on ultimate - return ((mapvisited[cn->requirement - 1] & MV_ULTIMATE) == MV_ULTIMATE); + return ((data->mapvisited[cn->requirement - 1] & MV_ULTIMATE) == MV_ULTIMATE); case UC_MAPPERFECT: // Requires map x to be beaten with a perfect bonus - return ((mapvisited[cn->requirement - 1] & MV_PERFECT) == MV_PERFECT); + return ((data->mapvisited[cn->requirement - 1] & MV_PERFECT) == MV_PERFECT); case UC_MAPSCORE: // Requires score on map >= x - return (G_GetBestScore(cn->extrainfo1) >= (unsigned)cn->requirement); + return (G_GetBestScore(cn->extrainfo1, data) >= (unsigned)cn->requirement); case UC_MAPTIME: // Requires time on map <= x - return (G_GetBestTime(cn->extrainfo1) <= (unsigned)cn->requirement); + return (G_GetBestTime(cn->extrainfo1, data) <= (unsigned)cn->requirement); case UC_MAPRINGS: // Requires rings on map >= x - return (G_GetBestRings(cn->extrainfo1) >= cn->requirement); + return (G_GetBestRings(cn->extrainfo1, data) >= cn->requirement); case UC_NIGHTSSCORE: - return (G_GetBestNightsScore(cn->extrainfo1, (UINT8)cn->extrainfo2) >= (unsigned)cn->requirement); + return (G_GetBestNightsScore(cn->extrainfo1, (UINT8)cn->extrainfo2, data) >= (unsigned)cn->requirement); case UC_NIGHTSTIME: - return (G_GetBestNightsTime(cn->extrainfo1, (UINT8)cn->extrainfo2) <= (unsigned)cn->requirement); + return (G_GetBestNightsTime(cn->extrainfo1, (UINT8)cn->extrainfo2, data) <= (unsigned)cn->requirement); case UC_NIGHTSGRADE: - return (G_GetBestNightsGrade(cn->extrainfo1, (UINT8)cn->extrainfo2) >= cn->requirement); + return (G_GetBestNightsGrade(cn->extrainfo1, (UINT8)cn->extrainfo2, data) >= cn->requirement); case UC_TRIGGER: // requires map trigger set return !!(unlocktriggers & (1 << cn->requirement)); case UC_TOTALEMBLEMS: // Requires number of emblems >= x - return (M_GotEnoughEmblems(cn->requirement)); + return (M_GotEnoughEmblems(cn->requirement, data)); case UC_EMBLEM: // Requires emblem x to be obtained - return emblemlocations[cn->requirement-1].collected; + return data->collected[cn->requirement-1]; case UC_EXTRAEMBLEM: // Requires extra emblem x to be obtained - return extraemblems[cn->requirement-1].collected; + return data->extraCollected[cn->requirement-1]; case UC_CONDITIONSET: // requires condition set x to already be achieved - return M_Achieved(cn->requirement-1); + return M_Achieved(cn->requirement-1, data); } return false; } -static UINT8 M_CheckConditionSet(conditionset_t *c) +static UINT8 M_CheckConditionSet(conditionset_t *c, gamedata_t *data) { UINT32 i; UINT32 lastID = 0; @@ -173,13 +241,13 @@ static UINT8 M_CheckConditionSet(conditionset_t *c) continue; lastID = cn->id; - achievedSoFar = M_CheckCondition(cn); + achievedSoFar = M_CheckCondition(cn, data); } return achievedSoFar; } -void M_CheckUnlockConditions(void) +void M_CheckUnlockConditions(gamedata_t *data) { INT32 i; conditionset_t *c; @@ -187,30 +255,27 @@ void M_CheckUnlockConditions(void) for (i = 0; i < MAXCONDITIONSETS; ++i) { c = &conditionSets[i]; - if (!c->numconditions || c->achieved) + if (!c->numconditions || data->achieved[i]) continue; - c->achieved = (M_CheckConditionSet(c)); + data->achieved[i] = (M_CheckConditionSet(c, data)); } } -UINT8 M_UpdateUnlockablesAndExtraEmblems(void) +UINT8 M_UpdateUnlockablesAndExtraEmblems(gamedata_t *data) { INT32 i; char cechoText[992] = ""; UINT8 cechoLines = 0; - if (modifiedgame && !savemoddata) - return false; - - M_CheckUnlockConditions(); + M_CheckUnlockConditions(data); // Go through extra emblems for (i = 0; i < numextraemblems; ++i) { - if (extraemblems[i].collected || !extraemblems[i].conditionset) + if (data->extraCollected[i] || !extraemblems[i].conditionset) continue; - if ((extraemblems[i].collected = M_Achieved(extraemblems[i].conditionset - 1)) != false) + if ((data->extraCollected[i] = M_Achieved(extraemblems[i].conditionset - 1, data)) != false) { strcat(cechoText, va(M_GetText("Got \"%s\" emblem!\\"), extraemblems[i].name)); ++cechoLines; @@ -220,14 +285,14 @@ UINT8 M_UpdateUnlockablesAndExtraEmblems(void) // Fun part: if any of those unlocked we need to go through the // unlock conditions AGAIN just in case an emblem reward was reached if (cechoLines) - M_CheckUnlockConditions(); + M_CheckUnlockConditions(data); // Go through unlockables for (i = 0; i < MAXUNLOCKABLES; ++i) { - if (unlockables[i].unlocked || !unlockables[i].conditionset) + if (data->unlocked[i] || !unlockables[i].conditionset) continue; - if ((unlockables[i].unlocked = M_Achieved(unlockables[i].conditionset - 1)) != false) + if ((data->unlocked[i] = M_Achieved(unlockables[i].conditionset - 1, data)) != false) { if (unlockables[i].nocecho) continue; @@ -251,45 +316,50 @@ UINT8 M_UpdateUnlockablesAndExtraEmblems(void) HU_DoCEcho(slashed); return true; } + return false; } // Used when loading gamedata to make sure all unlocks are synched with conditions -void M_SilentUpdateUnlockablesAndEmblems(void) +void M_SilentUpdateUnlockablesAndEmblems(gamedata_t *data) { INT32 i; boolean checkAgain = false; // Just in case they aren't to sync - M_CheckUnlockConditions(); - M_CheckLevelEmblems(); + M_CheckUnlockConditions(data); + M_CheckLevelEmblems(data); + M_CompletionEmblems(data); // Go through extra emblems for (i = 0; i < numextraemblems; ++i) { - if (extraemblems[i].collected || !extraemblems[i].conditionset) + if (data->extraCollected[i] || !extraemblems[i].conditionset) continue; - if ((extraemblems[i].collected = M_Achieved(extraemblems[i].conditionset - 1)) != false) + if ((data->extraCollected[i] = M_Achieved(extraemblems[i].conditionset - 1, data)) != false) checkAgain = true; } // check again if extra emblems unlocked, blah blah, etc if (checkAgain) - M_CheckUnlockConditions(); + M_CheckUnlockConditions(data); // Go through unlockables for (i = 0; i < MAXUNLOCKABLES; ++i) { - if (unlockables[i].unlocked || !unlockables[i].conditionset) + if (data->unlocked[i] || !unlockables[i].conditionset) continue; - unlockables[i].unlocked = M_Achieved(unlockables[i].conditionset - 1); + data->unlocked[i] = M_Achieved(unlockables[i].conditionset - 1, data); } +} +void M_SilentUpdateSkinAvailabilites(void) +{ players[consoleplayer].availabilities = players[1].availabilities = R_GetSkinAvailabilities(); // players[1] is supposed to be for 2p } // Emblem unlocking shit -UINT8 M_CheckLevelEmblems(void) +UINT8 M_CheckLevelEmblems(gamedata_t *data) { INT32 i; INT32 valToReach; @@ -300,7 +370,7 @@ UINT8 M_CheckLevelEmblems(void) // Update Score, Time, Rings emblems for (i = 0; i < numemblems; ++i) { - if (emblemlocations[i].type <= ET_SKIN || emblemlocations[i].type == ET_MAP || emblemlocations[i].collected) + if (emblemlocations[i].type <= ET_SKIN || emblemlocations[i].type == ET_MAP || data->collected[i]) continue; levelnum = emblemlocations[i].level; @@ -309,32 +379,32 @@ UINT8 M_CheckLevelEmblems(void) switch (emblemlocations[i].type) { case ET_SCORE: // Requires score on map >= x - res = (G_GetBestScore(levelnum) >= (unsigned)valToReach); + res = (G_GetBestScore(levelnum, data) >= (unsigned)valToReach); break; case ET_TIME: // Requires time on map <= x - res = (G_GetBestTime(levelnum) <= (unsigned)valToReach); + res = (G_GetBestTime(levelnum, data) <= (unsigned)valToReach); break; case ET_RINGS: // Requires rings on map >= x - res = (G_GetBestRings(levelnum) >= valToReach); + res = (G_GetBestRings(levelnum, data) >= valToReach); break; case ET_NGRADE: // Requires NiGHTS grade on map >= x - res = (G_GetBestNightsGrade(levelnum, 0) >= valToReach); + res = (G_GetBestNightsGrade(levelnum, 0, data) >= valToReach); break; case ET_NTIME: // Requires NiGHTS time on map <= x - res = (G_GetBestNightsTime(levelnum, 0) <= (unsigned)valToReach); + res = (G_GetBestNightsTime(levelnum, 0, data) <= (unsigned)valToReach); break; default: // unreachable but shuts the compiler up. continue; } - emblemlocations[i].collected = res; + data->collected[i] = res; if (res) ++somethingUnlocked; } return somethingUnlocked; } -UINT8 M_CompletionEmblems(void) // Bah! Duplication sucks, but it's for a separate print when awarding emblems and it's sorta different enough. +UINT8 M_CompletionEmblems(gamedata_t *data) // Bah! Duplication sucks, but it's for a separate print when awarding emblems and it's sorta different enough. { INT32 i; INT32 embtype; @@ -345,7 +415,7 @@ UINT8 M_CompletionEmblems(void) // Bah! Duplication sucks, but it's for a separa for (i = 0; i < numemblems; ++i) { - if (emblemlocations[i].type != ET_MAP || emblemlocations[i].collected) + if (emblemlocations[i].type != ET_MAP || data->collected[i]) continue; levelnum = emblemlocations[i].level; @@ -361,9 +431,9 @@ UINT8 M_CompletionEmblems(void) // Bah! Duplication sucks, but it's for a separa if (embtype & ME_PERFECT) flags |= MV_PERFECT; - res = ((mapvisited[levelnum - 1] & flags) == flags); + res = ((data->mapvisited[levelnum - 1] & flags) == flags); - emblemlocations[i].collected = res; + data->collected[i] = res; if (res) ++somethingUnlocked; } @@ -373,48 +443,54 @@ UINT8 M_CompletionEmblems(void) // Bah! Duplication sucks, but it's for a separa // ------------------- // Quick unlock checks // ------------------- -UINT8 M_AnySecretUnlocked(void) +UINT8 M_AnySecretUnlocked(gamedata_t *data) { INT32 i; for (i = 0; i < MAXUNLOCKABLES; ++i) { - if (!unlockables[i].nocecho && unlockables[i].unlocked) + if (!unlockables[i].nocecho && data->unlocked[i]) return true; } return false; } -UINT8 M_SecretUnlocked(INT32 type) +UINT8 M_SecretUnlocked(INT32 type, gamedata_t *data) { INT32 i; for (i = 0; i < MAXUNLOCKABLES; ++i) { - if (unlockables[i].type == type && unlockables[i].unlocked) + if (unlockables[i].type == type && data->unlocked[i]) return true; } return false; } -UINT8 M_MapLocked(INT32 mapnum) +UINT8 M_MapLocked(INT32 mapnum, gamedata_t *data) { if (!mapheaderinfo[mapnum-1] || mapheaderinfo[mapnum-1]->unlockrequired < 0) + { return false; - if (!unlockables[mapheaderinfo[mapnum-1]->unlockrequired].unlocked) + } + + if (!data->unlocked[mapheaderinfo[mapnum-1]->unlockrequired]) + { return true; + } + return false; } -INT32 M_CountEmblems(void) +INT32 M_CountEmblems(gamedata_t *data) { INT32 found = 0, i; for (i = 0; i < numemblems; ++i) { - if (emblemlocations[i].collected) + if (data->collected[i]) found++; } for (i = 0; i < numextraemblems; ++i) { - if (extraemblems[i].collected) + if (data->extraCollected[i]) found++; } return found; @@ -426,23 +502,23 @@ INT32 M_CountEmblems(void) // Theoretically faster than using M_CountEmblems() // Stops when it reaches the target number of emblems. -UINT8 M_GotEnoughEmblems(INT32 number) +UINT8 M_GotEnoughEmblems(INT32 number, gamedata_t *data) { INT32 i, gottenemblems = 0; for (i = 0; i < numemblems; ++i) { - if (emblemlocations[i].collected) + if (data->collected[i]) if (++gottenemblems >= number) return true; } for (i = 0; i < numextraemblems; ++i) { - if (extraemblems[i].collected) + if (data->extraCollected[i]) if (++gottenemblems >= number) return true; } return false; } -UINT8 M_GotHighEnoughScore(INT32 tscore) +UINT8 M_GotHighEnoughScore(INT32 tscore, gamedata_t *data) { INT32 mscore = 0; INT32 i; @@ -451,16 +527,16 @@ UINT8 M_GotHighEnoughScore(INT32 tscore) { if (!mapheaderinfo[i] || !(mapheaderinfo[i]->menuflags & LF2_RECORDATTACK)) continue; - if (!mainrecords[i]) + if (!data->mainrecords[i]) continue; - if ((mscore += mainrecords[i]->score) > tscore) + if ((mscore += data->mainrecords[i]->score) > tscore) return true; } return false; } -UINT8 M_GotLowEnoughTime(INT32 tictime) +UINT8 M_GotLowEnoughTime(INT32 tictime, gamedata_t *data) { INT32 curtics = 0; INT32 i; @@ -470,15 +546,15 @@ UINT8 M_GotLowEnoughTime(INT32 tictime) if (!mapheaderinfo[i] || !(mapheaderinfo[i]->menuflags & LF2_RECORDATTACK)) continue; - if (!mainrecords[i] || !mainrecords[i]->time) + if (!data->mainrecords[i] || !data->mainrecords[i]->time) return false; - else if ((curtics += mainrecords[i]->time) > tictime) + else if ((curtics += data->mainrecords[i]->time) > tictime) return false; } return true; } -UINT8 M_GotHighEnoughRings(INT32 trings) +UINT8 M_GotHighEnoughRings(INT32 trings, gamedata_t *data) { INT32 mrings = 0; INT32 i; @@ -487,10 +563,10 @@ UINT8 M_GotHighEnoughRings(INT32 trings) { if (!mapheaderinfo[i] || !(mapheaderinfo[i]->menuflags & LF2_RECORDATTACK)) continue; - if (!mainrecords[i]) + if (!data->mainrecords[i]) continue; - if ((mrings += mainrecords[i]->rings) > trings) + if ((mrings += data->mainrecords[i]->rings) > trings) return true; } return false; diff --git a/src/m_cond.h b/src/m_cond.h index b2c6d65e6..6a3da79ec 100644 --- a/src/m_cond.h +++ b/src/m_cond.h @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 2012-2016 by Matthew "Kaito Sinclaire" Walsh. -// Copyright (C) 2012-2021 by Sonic Team Junior. +// Copyright (C) 2012-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -10,7 +10,11 @@ /// \file m_cond.h /// \brief Unlockable condition system for SRB2 version 2.1 +#ifndef __M_COND__ +#define __M_COND__ + #include "doomdef.h" +#include "doomdata.h" // -------- // Typedefs @@ -61,8 +65,6 @@ typedef struct { UINT32 numconditions; /// <- number of conditions. condition_t *condition; /// <- All conditionals to be checked. - UINT8 achieved; /// <- Whether this conditional has been achieved already or not. - /// (Conditional checking is skipped if true -- it's assumed you can't relock an unlockable) } conditionset_t; // Emblem information @@ -94,7 +96,6 @@ typedef struct INT32 var; ///< If needed, specifies information on the target amount to achieve (or target skin) char *stringVar; ///< String version char hint[110]; ///< Hint for emblem hints menu - UINT8 collected; ///< Do you have this emblem? } emblem_t; typedef struct { @@ -104,7 +105,6 @@ typedef struct UINT8 showconditionset; ///< Condition set that shows this emblem. UINT8 sprite; ///< emblem sprite to use, 0 - 25 UINT16 color; ///< skincolor to use - UINT8 collected; ///< Do you have this emblem? } extraemblem_t; // Unlockable information @@ -120,7 +120,6 @@ typedef struct char *stringVar; UINT8 nocecho; UINT8 nochecklist; - UINT8 unlocked; } unlockable_t; #define SECRET_NONE -6 // Does nil. Use with levels locked by UnlockRequired @@ -143,6 +142,83 @@ typedef struct #define MAXEXTRAEMBLEMS 16 #define MAXUNLOCKABLES 32 +/** Time attack information, currently a very small structure. + */ +typedef struct +{ + tic_t time; ///< Time in which the level was finished. + UINT32 score; ///< Score when the level was finished. + UINT16 rings; ///< Rings when the level was finished. +} recorddata_t; + +/** Setup for one NiGHTS map. + * These are dynamically allocated because I am insane + */ +#define GRADE_F 0 +#define GRADE_E 1 +#define GRADE_D 2 +#define GRADE_C 3 +#define GRADE_B 4 +#define GRADE_A 5 +#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; + +// mapvisited is now a set of flags that says what we've done in the map. +#define MV_VISITED 1 +#define MV_BEATEN 2 +#define MV_ALLEMERALDS 4 +#define MV_ULTIMATE 8 +#define MV_PERFECT 16 +#define MV_PERFECTRA 32 +#define MV_MAX 63 // used in gamedata check, update whenever MV's are added + +// Temporary holding place for nights data for the current map +extern nightsdata_t ntemprecords; + +// GAMEDATA STRUCTURE +// Everything that would get saved in gamedata.dat +typedef struct +{ + // WHENEVER OR NOT WE'RE READY TO SAVE + boolean loaded; + + // CONDITION SETS ACHIEVED + boolean achieved[MAXCONDITIONSETS]; + + // EMBLEMS COLLECTED + boolean collected[MAXEMBLEMS]; + + // EXTRA EMBLEMS COLLECTED + boolean extraCollected[MAXEXTRAEMBLEMS]; + + // UNLOCKABLES UNLOCKED + boolean unlocked[MAXUNLOCKABLES]; + + // TIME ATTACK DATA + recorddata_t *mainrecords[NUMMAPS]; + nightsdata_t *nightsrecords[NUMMAPS]; + UINT8 mapvisited[NUMMAPS]; + + // # OF TIMES THE GAME HAS BEEN BEATEN + UINT32 timesBeaten; + UINT32 timesBeatenWithEmeralds; + UINT32 timesBeatenUltimate; + + // PLAY TIME + UINT32 totalplaytime; +} gamedata_t; + +extern gamedata_t *clientGamedata; +extern gamedata_t *serverGamedata; + extern conditionset_t conditionSets[MAXCONDITIONSETS]; extern emblem_t emblemlocations[MAXEMBLEMS]; extern extraemblem_t extraemblems[MAXEXTRAEMBLEMS]; @@ -153,25 +229,30 @@ extern INT32 numextraemblems; extern UINT32 unlocktriggers; +gamedata_t *M_NewGameDataStruct(void); +void M_CopyGameData(gamedata_t *dest, gamedata_t *src); + // Condition set setup void M_AddRawCondition(UINT8 set, UINT8 id, conditiontype_t c, INT32 r, INT16 x1, INT16 x2); // Clearing secrets void M_ClearConditionSet(UINT8 set); -void M_ClearSecrets(void); +void M_ClearSecrets(gamedata_t *data); // Updating conditions and unlockables -void M_CheckUnlockConditions(void); -UINT8 M_UpdateUnlockablesAndExtraEmblems(void); -void M_SilentUpdateUnlockablesAndEmblems(void); -UINT8 M_CheckLevelEmblems(void); -UINT8 M_CompletionEmblems(void); +void M_CheckUnlockConditions(gamedata_t *data); +UINT8 M_UpdateUnlockablesAndExtraEmblems(gamedata_t *data); +void M_SilentUpdateUnlockablesAndEmblems(gamedata_t *data); +UINT8 M_CheckLevelEmblems(gamedata_t *data); +UINT8 M_CompletionEmblems(gamedata_t *data); + +void M_SilentUpdateSkinAvailabilites(void); // Checking unlockable status -UINT8 M_AnySecretUnlocked(void); -UINT8 M_SecretUnlocked(INT32 type); -UINT8 M_MapLocked(INT32 mapnum); -INT32 M_CountEmblems(void); +UINT8 M_AnySecretUnlocked(gamedata_t *data); +UINT8 M_SecretUnlocked(INT32 type, gamedata_t *data); +UINT8 M_MapLocked(INT32 mapnum, gamedata_t *data); +INT32 M_CountEmblems(gamedata_t *data); // Emblem shit emblem_t *M_GetLevelEmblems(INT32 mapnum); @@ -183,12 +264,14 @@ const char *M_GetExtraEmblemPatch(extraemblem_t *em, boolean big); // If you're looking to compare stats for unlocks or what not, use these // They stop checking upon reaching the target number so they // should be (theoretically?) slightly faster. -UINT8 M_GotEnoughEmblems(INT32 number); -UINT8 M_GotHighEnoughScore(INT32 tscore); -UINT8 M_GotLowEnoughTime(INT32 tictime); -UINT8 M_GotHighEnoughRings(INT32 trings); +UINT8 M_GotEnoughEmblems(INT32 number, gamedata_t *data); +UINT8 M_GotHighEnoughScore(INT32 tscore, gamedata_t *data); +UINT8 M_GotLowEnoughTime(INT32 tictime, gamedata_t *data); +UINT8 M_GotHighEnoughRings(INT32 trings, gamedata_t *data); INT32 M_UnlockableSkinNum(unlockable_t *unlock); INT32 M_EmblemSkinNum(emblem_t *emblem); -#define M_Achieved(a) ((a) >= MAXCONDITIONSETS || conditionSets[a].achieved) +#define M_Achieved(a, data) ((a) >= MAXCONDITIONSETS || data->achieved[a]) + +#endif diff --git a/src/m_dllist.h b/src/m_dllist.h index 65303b4a3..06a479422 100644 --- a/src/m_dllist.h +++ b/src/m_dllist.h @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 2005 by James Haley -// Copyright (C) 2005-2021 by Sonic Team Junior. +// Copyright (C) 2005-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/m_easing.c b/src/m_easing.c index c871d3106..48fe1efbc 100644 --- a/src/m_easing.c +++ b/src/m_easing.c @@ -1,6 +1,6 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- -// Copyright (C) 2020-2021 by Jaime "Lactozilla" Passos. +// Copyright (C) 2020-2023 by Jaime "Lactozilla" Passos. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/m_easing.h b/src/m_easing.h index 435ad35e7..eaa5d6773 100644 --- a/src/m_easing.h +++ b/src/m_easing.h @@ -1,6 +1,6 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- -// Copyright (C) 2020-2021 by Jaime "Lactozilla" Passos. +// Copyright (C) 2020-2023 by Jaime "Lactozilla" Passos. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/m_fixed.c b/src/m_fixed.c index d40ccd98e..ad2831196 100644 --- a/src/m_fixed.c +++ b/src/m_fixed.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -276,6 +276,15 @@ vector3_t *FV3_Load(vector3_t *vec, fixed_t x, fixed_t y, fixed_t z) return vec; } +vector4_t *FV4_Load(vector4_t *vec, fixed_t x, fixed_t y, fixed_t z, fixed_t a) +{ + vec->x = x; + vec->y = y; + vec->z = z; + vec->a = a; + return vec; +} + vector3_t *FV3_UnLoad(vector3_t *vec, fixed_t *x, fixed_t *y, fixed_t *z) { *x = vec->x; @@ -284,11 +293,25 @@ vector3_t *FV3_UnLoad(vector3_t *vec, fixed_t *x, fixed_t *y, fixed_t *z) return vec; } +vector4_t *FV4_UnLoad(vector4_t *vec, fixed_t *x, fixed_t *y, fixed_t *z, fixed_t *a) +{ + *x = vec->x; + *y = vec->y; + *z = vec->z; + *a = vec->a; + return vec; +} + vector3_t *FV3_Copy(vector3_t *a_o, const vector3_t *a_i) { return M_Memcpy(a_o, a_i, sizeof(vector3_t)); } +vector4_t *FV4_Copy(vector4_t *a_o, const vector4_t *a_i) +{ + return M_Memcpy(a_o, a_i, sizeof(vector4_t)); +} + vector3_t *FV3_AddEx(const vector3_t *a_i, const vector3_t *a_c, vector3_t *a_o) { a_o->x = a_i->x + a_c->x; @@ -297,11 +320,25 @@ vector3_t *FV3_AddEx(const vector3_t *a_i, const vector3_t *a_c, vector3_t *a_o) return a_o; } +vector4_t *FV4_AddEx(const vector4_t *a_i, const vector4_t *a_c, vector4_t *a_o) +{ + a_o->x = a_i->x + a_c->x; + a_o->y = a_i->y + a_c->y; + a_o->z = a_i->z + a_c->z; + a_o->a = a_i->a + a_c->a; + return a_o; +} + vector3_t *FV3_Add(vector3_t *a_i, const vector3_t *a_c) { return FV3_AddEx(a_i, a_c, a_i); } +vector4_t *FV4_Add(vector4_t *a_i, const vector4_t *a_c) +{ + return FV4_AddEx(a_i, a_c, a_i); +} + vector3_t *FV3_SubEx(const vector3_t *a_i, const vector3_t *a_c, vector3_t *a_o) { a_o->x = a_i->x - a_c->x; @@ -310,11 +347,25 @@ vector3_t *FV3_SubEx(const vector3_t *a_i, const vector3_t *a_c, vector3_t *a_o) return a_o; } +vector4_t *FV4_SubEx(const vector4_t *a_i, const vector4_t *a_c, vector4_t *a_o) +{ + a_o->x = a_i->x - a_c->x; + a_o->y = a_i->y - a_c->y; + a_o->z = a_i->z - a_c->z; + a_o->a = a_i->a - a_c->a; + return a_o; +} + vector3_t *FV3_Sub(vector3_t *a_i, const vector3_t *a_c) { return FV3_SubEx(a_i, a_c, a_i); } +vector4_t *FV4_Sub(vector4_t *a_i, const vector4_t *a_c) +{ + return FV4_SubEx(a_i, a_c, a_i); +} + vector3_t *FV3_MulEx(const vector3_t *a_i, fixed_t a_c, vector3_t *a_o) { a_o->x = FixedMul(a_i->x, a_c); @@ -323,11 +374,25 @@ vector3_t *FV3_MulEx(const vector3_t *a_i, fixed_t a_c, vector3_t *a_o) return a_o; } +vector4_t *FV4_MulEx(const vector4_t *a_i, fixed_t a_c, vector4_t *a_o) +{ + a_o->x = FixedMul(a_i->x, a_c); + a_o->y = FixedMul(a_i->y, a_c); + a_o->z = FixedMul(a_i->z, a_c); + a_o->a = FixedMul(a_i->a, a_c); + return a_o; +} + vector3_t *FV3_Mul(vector3_t *a_i, fixed_t a_c) { return FV3_MulEx(a_i, a_c, a_i); } +vector4_t *FV4_Mul(vector4_t *a_i, fixed_t a_c) +{ + return FV4_MulEx(a_i, a_c, a_i); +} + vector3_t *FV3_DivideEx(const vector3_t *a_i, fixed_t a_c, vector3_t *a_o) { a_o->x = FixedDiv(a_i->x, a_c); @@ -336,11 +401,25 @@ vector3_t *FV3_DivideEx(const vector3_t *a_i, fixed_t a_c, vector3_t *a_o) return a_o; } +vector4_t *FV4_DivideEx(const vector4_t *a_i, fixed_t a_c, vector4_t *a_o) +{ + a_o->x = FixedDiv(a_i->x, a_c); + a_o->y = FixedDiv(a_i->y, a_c); + a_o->z = FixedDiv(a_i->z, a_c); + a_o->a = FixedDiv(a_i->a, a_c); + return a_o; +} + vector3_t *FV3_Divide(vector3_t *a_i, fixed_t a_c) { return FV3_DivideEx(a_i, a_c, a_i); } +vector4_t *FV4_Divide(vector4_t *a_i, fixed_t a_c) +{ + return FV4_DivideEx(a_i, a_c, a_i); +} + // Vector Complex Math vector3_t *FV3_Midpoint(const vector3_t *a_1, const vector3_t *a_2, vector3_t *a_o) { @@ -353,6 +432,19 @@ vector3_t *FV3_Midpoint(const vector3_t *a_1, const vector3_t *a_2, vector3_t *a return a_o; } +vector4_t *FV4_Midpoint(const vector4_t *a_1, const vector4_t *a_2, vector4_t *a_o) +{ + a_o->x = FixedDiv(a_2->x - a_1->x, 2 * FRACUNIT); + a_o->y = FixedDiv(a_2->y - a_1->y, 2 * FRACUNIT); + a_o->z = FixedDiv(a_2->z - a_1->z, 2 * FRACUNIT); + a_o->a = FixedDiv(a_2->a - a_1->a, 2 * FRACUNIT); + a_o->x = a_1->x + a_o->x; + a_o->y = a_1->y + a_o->y; + a_o->z = a_1->z + a_o->z; + a_o->a = a_1->z + a_o->a; + return a_o; +} + fixed_t FV3_Distance(const vector3_t *p1, const vector3_t *p2) { fixed_t xs = FixedMul(p2->x - p1->x, p2->x - p1->x); @@ -361,6 +453,15 @@ fixed_t FV3_Distance(const vector3_t *p1, const vector3_t *p2) return FixedSqrt(xs + ys + zs); } +fixed_t FV4_Distance(const vector4_t *p1, const vector4_t *p2) +{ + fixed_t xs = FixedMul(p2->x - p1->x, p2->x - p1->x); + fixed_t ys = FixedMul(p2->y - p1->y, p2->y - p1->y); + fixed_t zs = FixedMul(p2->z - p1->z, p2->z - p1->z); + fixed_t za = FixedMul(p2->a - p1->a, p2->a - p1->a); + return FixedSqrt(xs + ys + zs + za); +} + fixed_t FV3_Magnitude(const vector3_t *a_normal) { fixed_t xs = FixedMul(a_normal->x, a_normal->x); @@ -369,6 +470,15 @@ fixed_t FV3_Magnitude(const vector3_t *a_normal) return FixedSqrt(xs + ys + zs); } +fixed_t FV4_Magnitude(const vector4_t *a_normal) +{ + fixed_t xs = FixedMul(a_normal->x, a_normal->x); + fixed_t ys = FixedMul(a_normal->y, a_normal->y); + fixed_t zs = FixedMul(a_normal->z, a_normal->z); + fixed_t as = FixedMul(a_normal->a, a_normal->a); + return FixedSqrt(xs + ys + zs + as); +} + // Also returns the magnitude fixed_t FV3_NormalizeEx(const vector3_t *a_normal, vector3_t *a_o) { @@ -379,11 +489,26 @@ fixed_t FV3_NormalizeEx(const vector3_t *a_normal, vector3_t *a_o) return magnitude; } +fixed_t FV4_NormalizeEx(const vector4_t *a_normal, vector4_t *a_o) +{ + fixed_t magnitude = FV4_Magnitude(a_normal); + a_o->x = FixedDiv(a_normal->x, magnitude); + a_o->y = FixedDiv(a_normal->y, magnitude); + a_o->z = FixedDiv(a_normal->z, magnitude); + a_o->a = FixedDiv(a_normal->a, magnitude); + return magnitude; +} + fixed_t FV3_Normalize(vector3_t *a_normal) { return FV3_NormalizeEx(a_normal, a_normal); } +fixed_t FV4_Normalize(vector4_t *a_normal) +{ + return FV4_NormalizeEx(a_normal, a_normal); +} + vector3_t *FV3_NegateEx(const vector3_t *a_1, vector3_t *a_o) { a_o->x = -a_1->x; @@ -392,11 +517,25 @@ vector3_t *FV3_NegateEx(const vector3_t *a_1, vector3_t *a_o) return a_o; } +vector4_t *FV4_NegateEx(const vector4_t *a_1, vector4_t *a_o) +{ + a_o->x = -a_1->x; + a_o->y = -a_1->y; + a_o->z = -a_1->z; + a_o->a = -a_1->a; + return a_o; +} + vector3_t *FV3_Negate(vector3_t *a_1) { return FV3_NegateEx(a_1, a_1); } +vector4_t *FV4_Negate(vector4_t *a_1) +{ + return FV4_NegateEx(a_1, a_1); +} + boolean FV3_Equal(const vector3_t *a_1, const vector3_t *a_2) { fixed_t Epsilon = FRACUNIT / FRACUNIT; @@ -411,11 +550,31 @@ boolean FV3_Equal(const vector3_t *a_1, const vector3_t *a_2) return false; } +boolean FV4_Equal(const vector4_t *a_1, const vector4_t *a_2) +{ + fixed_t Epsilon = FRACUNIT / FRACUNIT; + + if ((abs(a_2->x - a_1->x) > Epsilon) || + (abs(a_2->y - a_1->y) > Epsilon) || + (abs(a_2->z - a_1->z) > Epsilon) || + (abs(a_2->a - a_1->a) > Epsilon)) + { + return true; + } + + return false; +} + fixed_t FV3_Dot(const vector3_t *a_1, const vector3_t *a_2) { return (FixedMul(a_1->x, a_2->x) + FixedMul(a_1->y, a_2->y) + FixedMul(a_1->z, a_2->z)); } +fixed_t FV4_Dot(const vector4_t *a_1, const vector4_t *a_2) +{ + return (FixedMul(a_1->x, a_2->x) + FixedMul(a_1->y, a_2->y) + FixedMul(a_1->z, a_2->z) + FixedMul(a_1->a, a_2->a)); +} + vector3_t *FV3_Cross(const vector3_t *a_1, const vector3_t *a_2, vector3_t *a_o) { a_o->x = FixedMul(a_1->y, a_2->z) - FixedMul(a_1->z, a_2->y); @@ -432,7 +591,7 @@ vector3_t *FV3_Cross(const vector3_t *a_1, const vector3_t *a_2, vector3_t *a_o) // vector3_t *FV3_ClosestPointOnLine(const vector3_t *Line, const vector3_t *p, vector3_t *out) { - // Determine t (the length of the vector from �Line[0]� to �p�) + // Determine t (the length of the vector from "Line[0]" to "p") vector3_t c, V; fixed_t t, d = 0; FV3_SubEx(p, &Line[0], &c); @@ -442,7 +601,7 @@ vector3_t *FV3_ClosestPointOnLine(const vector3_t *Line, const vector3_t *p, vec d = FV3_Distance(&Line[0], &Line[1]); t = FV3_Dot(&V, &c); - // Check to see if �t� is beyond the extents of the line segment + // Check to see if "t" is beyond the extents of the line segment if (t < 0) { return FV3_Copy(out, &Line[0]); @@ -452,7 +611,7 @@ vector3_t *FV3_ClosestPointOnLine(const vector3_t *Line, const vector3_t *p, vec return FV3_Copy(out, &Line[1]); } - // Return the point between �Line[0]� and �Line[1]� + // Return the point between "Line[0]" and "Line[1]" FV3_Mul(&V, t); return FV3_AddEx(&Line[0], &V, out); @@ -810,7 +969,7 @@ void FM_CreateObjectMatrix(matrix_t *matrix, fixed_t x, fixed_t y, fixed_t z, fi // // Multiplies a vector by the specified matrix // -void FM_MultMatrixVec3(const matrix_t *matrix, const vector3_t *vec, vector3_t *out) +const vector3_t *FM_MultMatrixVec3(const matrix_t *matrix, const vector3_t *vec, vector3_t *out) { #define M(row,col) matrix->m[col * 4 + row] out->x = FixedMul(vec->x, M(0, 0)) @@ -828,6 +987,34 @@ void FM_MultMatrixVec3(const matrix_t *matrix, const vector3_t *vec, vector3_t * + FixedMul(vec->z, M(2, 2)) + M(2, 3); #undef M + return out; +} + +const vector4_t *FM_MultMatrixVec4(const matrix_t *matrix, const vector4_t *vec, vector4_t *out) +{ +#define M(row,col) matrix->m[col * 4 + row] + out->x = FixedMul(vec->x, M(0, 0)) + + FixedMul(vec->y, M(0, 1)) + + FixedMul(vec->z, M(0, 2)) + + FixedMul(vec->a, M(0, 3)); + + out->y = FixedMul(vec->x, M(1, 0)) + + FixedMul(vec->y, M(1, 1)) + + FixedMul(vec->z, M(1, 2)) + + FixedMul(vec->a, M(1, 3)); + + out->z = FixedMul(vec->x, M(2, 0)) + + FixedMul(vec->y, M(2, 1)) + + FixedMul(vec->z, M(2, 2)) + + FixedMul(vec->a, M(2, 3)); + + + out->a = FixedMul(vec->x, M(3, 0)) + + FixedMul(vec->y, M(3, 1)) + + FixedMul(vec->z, M(3, 2)) + + FixedMul(vec->a, M(3, 3)); +#undef M + return out; } // diff --git a/src/m_fixed.h b/src/m_fixed.h index e2a0e3fbe..51f9c2764 100644 --- a/src/m_fixed.h +++ b/src/m_fixed.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -409,6 +409,32 @@ vector3_t *FV3_IntersectionPoint(const vector3_t *vNormal, const vector3_t *vLin UINT8 FV3_PointOnLineSide(const vector3_t *point, const vector3_t *line); boolean FV3_PointInsideBox(const vector3_t *point, const vector3_t *box); +typedef struct +{ + fixed_t x, y, z, a; +} vector4_t; + +vector4_t *FV4_Load(vector4_t *vec, fixed_t x, fixed_t y, fixed_t z, fixed_t a); +vector4_t *FV4_UnLoad(vector4_t *vec, fixed_t *x, fixed_t *y, fixed_t *z, fixed_t *a); +vector4_t *FV4_Copy(vector4_t *a_o, const vector4_t *a_i); +vector4_t *FV4_AddEx(const vector4_t *a_i, const vector4_t *a_c, vector4_t *a_o); +vector4_t *FV4_Add(vector4_t *a_i, const vector4_t *a_c); +vector4_t *FV4_SubEx(const vector4_t *a_i, const vector4_t *a_c, vector4_t *a_o); +vector4_t *FV4_Sub(vector4_t *a_i, const vector4_t *a_c); +vector4_t *FV4_MulEx(const vector4_t *a_i, fixed_t a_c, vector4_t *a_o); +vector4_t *FV4_Mul(vector4_t *a_i, fixed_t a_c); +vector4_t *FV4_DivideEx(const vector4_t *a_i, fixed_t a_c, vector4_t *a_o); +vector4_t *FV4_Divide(vector4_t *a_i, fixed_t a_c); +vector4_t *FV4_Midpoint(const vector4_t *a_1, const vector4_t *a_2, vector4_t *a_o); +fixed_t FV4_Distance(const vector4_t *p1, const vector4_t *p2); +fixed_t FV4_Magnitude(const vector4_t *a_normal); +fixed_t FV4_NormalizeEx(const vector4_t *a_normal, vector4_t *a_o); +fixed_t FV4_Normalize(vector4_t *a_normal); +vector4_t *FV4_NegateEx(const vector4_t *a_1, vector4_t *a_o); +vector4_t *FV4_Negate(vector4_t *a_1); +boolean FV4_Equal(const vector4_t *a_1, const vector4_t *a_2); +fixed_t FV4_Dot(const vector4_t *a_1, const vector4_t *a_2); + typedef struct { fixed_t m[16]; @@ -416,7 +442,8 @@ typedef struct void FM_LoadIdentity(matrix_t* matrix); void FM_CreateObjectMatrix(matrix_t *matrix, fixed_t x, fixed_t y, fixed_t z, fixed_t anglex, fixed_t angley, fixed_t anglez, fixed_t upx, fixed_t upy, fixed_t upz, fixed_t radius); -void FM_MultMatrixVec3(const matrix_t *matrix, const vector3_t *vec, vector3_t *out); +const vector3_t *FM_MultMatrixVec3(const matrix_t *matrix, const vector3_t *vec, vector3_t *out); +const vector4_t *FM_MultMatrixVec4(const matrix_t *matrix, const vector4_t *vec, vector4_t *out); void FM_MultMatrix(matrix_t *dest, const matrix_t *multme); void FM_Translate(matrix_t *dest, fixed_t x, fixed_t y, fixed_t z); void FM_Scale(matrix_t *dest, fixed_t x, fixed_t y, fixed_t z); diff --git a/src/m_menu.c b/src/m_menu.c index b19479797..f9f52335d 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -3,7 +3,7 @@ // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. // Copyright (C) 2011-2016 by Matthew "Kaito Sinclaire" Walsh. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -22,6 +22,7 @@ #include "d_main.h" #include "d_netcmd.h" #include "console.h" +#include "r_fps.h" #include "r_local.h" #include "hu_stuff.h" #include "g_game.h" @@ -31,6 +32,7 @@ // Data. #include "sounds.h" #include "s_sound.h" +#include "i_time.h" #include "i_system.h" #include "i_threads.h" @@ -171,10 +173,10 @@ static INT32 vidm_nummodes; static INT32 vidm_column_size; // new menus -static tic_t recatkdrawtimer = 0; -static tic_t ntsatkdrawtimer = 0; +static fixed_t recatkdrawtimer = 0; +static fixed_t ntsatkdrawtimer = 0; -static tic_t charseltimer = 0; +static fixed_t charseltimer = 0; static fixed_t char_scroll = 0; #define charscrollamt 128*FRACUNIT @@ -207,17 +209,17 @@ menu_t SPauseDef; static levelselect_t levelselect = {0, NULL}; static UINT8 levelselectselect[3]; static patch_t *levselp[2][3]; -static INT32 lsoffs[2]; +static fixed_t lsoffs[2]; #define lsrow levelselectselect[0] #define lscol levelselectselect[1] #define lshli levelselectselect[2] #define lshseperation 101 -#define lsbasevseperation (62*vid.height)/(BASEVIDHEIGHT*vid.dupy) //62 +#define lsbasevseperation ((62*vid.height)/(BASEVIDHEIGHT*vid.dupy)) //62 #define lsheadingheight 16 #define getheadingoffset(row) (levelselect.rows[row].header[0] ? lsheadingheight : 0) -#define lsvseperation(row) lsbasevseperation + getheadingoffset(row) +#define lsvseperation(row) (lsbasevseperation + getheadingoffset(row)) #define lswide(row) levelselect.rows[row].mapavailable[3] #define lsbasex 19 @@ -239,6 +241,7 @@ static void M_EmblemHints(INT32 choice); static void M_HandleEmblemHints(INT32 choice); UINT32 hintpage = 1; static void M_HandleChecklist(INT32 choice); +static void M_PauseLevelSelect(INT32 choice); menu_t SR_MainDef, SR_UnlockChecklistDef; static UINT8 check_on; @@ -552,26 +555,30 @@ static menuitem_t MPauseMenu[] = { {IT_STRING | IT_CALL, NULL, "Add-ons...", M_Addons, 8}, {IT_STRING | IT_SUBMENU, NULL, "Scramble Teams...", &MISC_ScrambleTeamDef, 16}, - {IT_STRING | IT_CALL, NULL, "Switch Gametype/Level...", M_MapChange, 24}, + {IT_STRING | IT_CALL, NULL, "Emblem Hints...", M_EmblemHints, 24}, + {IT_STRING | IT_CALL, NULL, "Switch Gametype/Level...", M_MapChange, 32}, - {IT_STRING | IT_CALL, NULL, "Continue", M_SelectableClearMenus,40}, - {IT_STRING | IT_CALL, NULL, "Player 1 Setup", M_SetupMultiPlayer, 48}, // splitscreen - {IT_STRING | IT_CALL, NULL, "Player 2 Setup", M_SetupMultiPlayer2, 56}, // splitscreen + {IT_STRING | IT_CALL, NULL, "Continue", M_SelectableClearMenus,48}, - {IT_STRING | IT_CALL, NULL, "Spectate", M_ConfirmSpectate, 48}, - {IT_STRING | IT_CALL, NULL, "Enter Game", M_ConfirmEnterGame, 48}, - {IT_STRING | IT_SUBMENU, NULL, "Switch Team...", &MISC_ChangeTeamDef, 48}, - {IT_STRING | IT_CALL, NULL, "Player Setup", M_SetupMultiPlayer, 56}, // alone - {IT_STRING | IT_CALL, NULL, "Options", M_Options, 64}, + {IT_STRING | IT_CALL, NULL, "Player 1 Setup", M_SetupMultiPlayer, 56}, // splitscreen + {IT_STRING | IT_CALL, NULL, "Player 2 Setup", M_SetupMultiPlayer2, 64}, - {IT_STRING | IT_CALL, NULL, "Return to Title", M_EndGame, 80}, - {IT_STRING | IT_CALL, NULL, "Quit Game", M_QuitSRB2, 88}, + {IT_STRING | IT_CALL, NULL, "Spectate", M_ConfirmSpectate, 56}, // alone + {IT_STRING | IT_CALL, NULL, "Enter Game", M_ConfirmEnterGame, 56}, + {IT_STRING | IT_SUBMENU, NULL, "Switch Team...", &MISC_ChangeTeamDef, 56}, + {IT_STRING | IT_CALL, NULL, "Player Setup", M_SetupMultiPlayer, 64}, + + {IT_STRING | IT_CALL, NULL, "Options", M_Options, 72}, + + {IT_STRING | IT_CALL, NULL, "Return to Title", M_EndGame, 88}, + {IT_STRING | IT_CALL, NULL, "Quit Game", M_QuitSRB2, 96}, }; typedef enum { mpause_addons = 0, mpause_scramble, + mpause_hints, mpause_switchmap, mpause_continue, @@ -595,7 +602,7 @@ static menuitem_t SPauseMenu[] = // Pandora's Box will be shifted up if both options are available {IT_CALL | IT_STRING, NULL, "Pandora's Box...", M_PandorasBox, 16}, {IT_CALL | IT_STRING, NULL, "Emblem Hints...", M_EmblemHints, 24}, - {IT_CALL | IT_STRING, NULL, "Level Select...", M_LoadGameLevelSelect, 32}, + {IT_CALL | IT_STRING, NULL, "Level Select...", M_PauseLevelSelect, 32}, {IT_CALL | IT_STRING, NULL, "Continue", M_SelectableClearMenus,48}, {IT_CALL | IT_STRING, NULL, "Retry", M_Retry, 56}, @@ -755,12 +762,12 @@ static menuitem_t SR_EmblemHintMenu[] = static menuitem_t SP_MainMenu[] = { // Note: If changing the positions here, also change them in M_SinglePlayerMenu() - {IT_CALL | IT_STRING, NULL, "Start Game", M_LoadGame, 76}, - {IT_SECRET, NULL, "Record Attack", M_TimeAttack, 84}, - {IT_SECRET, NULL, "NiGHTS Mode", M_NightsAttack, 92}, - {IT_SECRET, NULL, "Marathon Run", M_Marathon, 100}, - {IT_CALL | IT_STRING, NULL, "Tutorial", M_StartTutorial, 108}, - {IT_CALL | IT_STRING | IT_CALL_NOTMODIFIED, NULL, "Statistics", M_Statistics, 116} + {IT_CALL | IT_STRING, NULL, "Start Game", M_LoadGame, 76}, + {IT_SECRET, NULL, "Record Attack", M_TimeAttack, 84}, + {IT_SECRET, NULL, "NiGHTS Mode", M_NightsAttack, 92}, + {IT_SECRET, NULL, "Marathon Run", M_Marathon, 100}, + {IT_CALL | IT_STRING, NULL, "Tutorial", M_StartTutorial, 108}, + {IT_CALL | IT_STRING, NULL, "Statistics", M_Statistics, 116} }; enum @@ -968,7 +975,7 @@ static menuitem_t MP_MainMenu[] = { {IT_HEADER, NULL, "Join a game", NULL, 0}, {IT_STRING|IT_CALL, NULL, "Server browser...", M_ConnectMenuModChecks, 12}, - {IT_STRING|IT_KEYHANDLER, NULL, "Specify IPv4 address:", M_HandleConnectIP, 22}, + {IT_STRING|IT_KEYHANDLER, NULL, "Specify server address:", M_HandleConnectIP, 22}, {IT_HEADER, NULL, "Host a game", NULL, 54}, {IT_STRING|IT_CALL, NULL, "Internet/LAN...", M_StartServerMenu, 66}, {IT_STRING|IT_CALL, NULL, "Splitscreen...", M_StartSplitServerMenu, 76}, @@ -1106,55 +1113,56 @@ static menuitem_t OP_ChangeControlsMenu[] = { {IT_HEADER, NULL, "Movement", NULL, 0}, {IT_SPACE, NULL, NULL, NULL, 0}, // padding - {IT_CALL | IT_STRING2, NULL, "Move Forward", M_ChangeControl, gc_forward }, - {IT_CALL | IT_STRING2, NULL, "Move Backward", M_ChangeControl, gc_backward }, - {IT_CALL | IT_STRING2, NULL, "Move Left", M_ChangeControl, gc_strafeleft }, - {IT_CALL | IT_STRING2, NULL, "Move Right", M_ChangeControl, gc_straferight }, - {IT_CALL | IT_STRING2, NULL, "Jump", M_ChangeControl, gc_jump }, - {IT_CALL | IT_STRING2, NULL, "Spin", M_ChangeControl, gc_spin }, + {IT_CALL | IT_STRING2, NULL, "Move Forward", M_ChangeControl, GC_FORWARD }, + {IT_CALL | IT_STRING2, NULL, "Move Backward", M_ChangeControl, GC_BACKWARD }, + {IT_CALL | IT_STRING2, NULL, "Move Left", M_ChangeControl, GC_STRAFELEFT }, + {IT_CALL | IT_STRING2, NULL, "Move Right", M_ChangeControl, GC_STRAFERIGHT }, + {IT_CALL | IT_STRING2, NULL, "Jump", M_ChangeControl, GC_JUMP }, + {IT_CALL | IT_STRING2, NULL, "Spin", M_ChangeControl, GC_SPIN }, {IT_HEADER, NULL, "Camera", NULL, 0}, {IT_SPACE, NULL, NULL, NULL, 0}, // padding - {IT_CALL | IT_STRING2, NULL, "Look Up", M_ChangeControl, gc_lookup }, - {IT_CALL | IT_STRING2, NULL, "Look Down", M_ChangeControl, gc_lookdown }, - {IT_CALL | IT_STRING2, NULL, "Look Left", M_ChangeControl, gc_turnleft }, - {IT_CALL | IT_STRING2, NULL, "Look Right", M_ChangeControl, gc_turnright }, - {IT_CALL | IT_STRING2, NULL, "Center View", M_ChangeControl, gc_centerview }, - {IT_CALL | IT_STRING2, NULL, "Toggle Mouselook", M_ChangeControl, gc_mouseaiming }, - {IT_CALL | IT_STRING2, NULL, "Toggle Third-Person", M_ChangeControl, gc_camtoggle}, - {IT_CALL | IT_STRING2, NULL, "Reset Camera", M_ChangeControl, gc_camreset }, + {IT_CALL | IT_STRING2, NULL, "Look Up", M_ChangeControl, GC_LOOKUP }, + {IT_CALL | IT_STRING2, NULL, "Look Down", M_ChangeControl, GC_LOOKDOWN }, + {IT_CALL | IT_STRING2, NULL, "Look Left", M_ChangeControl, GC_TURNLEFT }, + {IT_CALL | IT_STRING2, NULL, "Look Right", M_ChangeControl, GC_TURNRIGHT }, + {IT_CALL | IT_STRING2, NULL, "Center View", M_ChangeControl, GC_CENTERVIEW }, + {IT_CALL | IT_STRING2, NULL, "Toggle Mouselook", M_ChangeControl, GC_MOUSEAIMING }, + {IT_CALL | IT_STRING2, NULL, "Toggle Third-Person", M_ChangeControl, GC_CAMTOGGLE}, + {IT_CALL | IT_STRING2, NULL, "Reset Camera", M_ChangeControl, GC_CAMRESET }, {IT_HEADER, NULL, "Meta", NULL, 0}, {IT_SPACE, NULL, NULL, NULL, 0}, // padding {IT_CALL | IT_STRING2, NULL, "Game Status", - M_ChangeControl, gc_scores }, - {IT_CALL | IT_STRING2, NULL, "Pause / Run Retry", M_ChangeControl, gc_pause }, - {IT_CALL | IT_STRING2, NULL, "Screenshot", M_ChangeControl, gc_screenshot }, - {IT_CALL | IT_STRING2, NULL, "Toggle GIF Recording", M_ChangeControl, gc_recordgif }, - {IT_CALL | IT_STRING2, NULL, "Open/Close Menu (ESC)", M_ChangeControl, gc_systemmenu }, - {IT_CALL | IT_STRING2, NULL, "Change Viewpoint", M_ChangeControl, gc_viewpoint }, - {IT_CALL | IT_STRING2, NULL, "Console", M_ChangeControl, gc_console }, + M_ChangeControl, GC_SCORES }, + {IT_CALL | IT_STRING2, NULL, "Pause / Run Retry", M_ChangeControl, GC_PAUSE }, + {IT_CALL | IT_STRING2, NULL, "Screenshot", M_ChangeControl, GC_SCREENSHOT }, + {IT_CALL | IT_STRING2, NULL, "Toggle GIF Recording", M_ChangeControl, GC_RECORDGIF }, + {IT_CALL | IT_STRING2, NULL, "Open/Close Menu (ESC)", M_ChangeControl, GC_SYSTEMMENU }, + {IT_CALL | IT_STRING2, NULL, "Next Viewpoint", M_ChangeControl, GC_VIEWPOINTNEXT }, + {IT_CALL | IT_STRING2, NULL, "Prev Viewpoint", M_ChangeControl, GC_VIEWPOINTPREV }, + {IT_CALL | IT_STRING2, NULL, "Console", M_ChangeControl, GC_CONSOLE }, {IT_HEADER, NULL, "Multiplayer", NULL, 0}, {IT_SPACE, NULL, NULL, NULL, 0}, // padding - {IT_CALL | IT_STRING2, NULL, "Talk", M_ChangeControl, gc_talkkey }, - {IT_CALL | IT_STRING2, NULL, "Talk (Team only)", M_ChangeControl, gc_teamkey }, + {IT_CALL | IT_STRING2, NULL, "Talk", M_ChangeControl, GC_TALKKEY }, + {IT_CALL | IT_STRING2, NULL, "Talk (Team only)", M_ChangeControl, GC_TEAMKEY }, {IT_HEADER, NULL, "Ringslinger (Match, CTF, Tag, H&S)", NULL, 0}, {IT_SPACE, NULL, NULL, NULL, 0}, // padding - {IT_CALL | IT_STRING2, NULL, "Fire", M_ChangeControl, gc_fire }, - {IT_CALL | IT_STRING2, NULL, "Fire Normal", M_ChangeControl, gc_firenormal }, - {IT_CALL | IT_STRING2, NULL, "Toss Flag", M_ChangeControl, gc_tossflag }, - {IT_CALL | IT_STRING2, NULL, "Next Weapon", M_ChangeControl, gc_weaponnext }, - {IT_CALL | IT_STRING2, NULL, "Prev Weapon", M_ChangeControl, gc_weaponprev }, - {IT_CALL | IT_STRING2, NULL, "Normal / Infinity", M_ChangeControl, gc_wepslot1 }, - {IT_CALL | IT_STRING2, NULL, "Automatic", M_ChangeControl, gc_wepslot2 }, - {IT_CALL | IT_STRING2, NULL, "Bounce", M_ChangeControl, gc_wepslot3 }, - {IT_CALL | IT_STRING2, NULL, "Scatter", M_ChangeControl, gc_wepslot4 }, - {IT_CALL | IT_STRING2, NULL, "Grenade", M_ChangeControl, gc_wepslot5 }, - {IT_CALL | IT_STRING2, NULL, "Explosion", M_ChangeControl, gc_wepslot6 }, - {IT_CALL | IT_STRING2, NULL, "Rail", M_ChangeControl, gc_wepslot7 }, + {IT_CALL | IT_STRING2, NULL, "Fire", M_ChangeControl, GC_FIRE }, + {IT_CALL | IT_STRING2, NULL, "Fire Normal", M_ChangeControl, GC_FIRENORMAL }, + {IT_CALL | IT_STRING2, NULL, "Toss Flag", M_ChangeControl, GC_TOSSFLAG }, + {IT_CALL | IT_STRING2, NULL, "Next Weapon", M_ChangeControl, GC_WEAPONNEXT }, + {IT_CALL | IT_STRING2, NULL, "Prev Weapon", M_ChangeControl, GC_WEAPONPREV }, + {IT_CALL | IT_STRING2, NULL, "Normal / Infinity", M_ChangeControl, GC_WEPSLOT1 }, + {IT_CALL | IT_STRING2, NULL, "Automatic", M_ChangeControl, GC_WEPSLOT2 }, + {IT_CALL | IT_STRING2, NULL, "Bounce", M_ChangeControl, GC_WEPSLOT3 }, + {IT_CALL | IT_STRING2, NULL, "Scatter", M_ChangeControl, GC_WEPSLOT4 }, + {IT_CALL | IT_STRING2, NULL, "Grenade", M_ChangeControl, GC_WEPSLOT5 }, + {IT_CALL | IT_STRING2, NULL, "Explosion", M_ChangeControl, GC_WEPSLOT6 }, + {IT_CALL | IT_STRING2, NULL, "Rail", M_ChangeControl, GC_WEPSLOT7 }, {IT_HEADER, NULL, "Add-ons", NULL, 0}, {IT_SPACE, NULL, NULL, NULL, 0}, // padding - {IT_CALL | IT_STRING2, NULL, "Custom Action 1", M_ChangeControl, gc_custom1 }, - {IT_CALL | IT_STRING2, NULL, "Custom Action 2", M_ChangeControl, gc_custom2 }, - {IT_CALL | IT_STRING2, NULL, "Custom Action 3", M_ChangeControl, gc_custom3 }, + {IT_CALL | IT_STRING2, NULL, "Custom Action 1", M_ChangeControl, GC_CUSTOM1 }, + {IT_CALL | IT_STRING2, NULL, "Custom Action 2", M_ChangeControl, GC_CUSTOM2 }, + {IT_CALL | IT_STRING2, NULL, "Custom Action 3", M_ChangeControl, GC_CUSTOM3 }, }; static menuitem_t OP_Joystick1Menu[] = @@ -1386,6 +1394,7 @@ static menuitem_t OP_VideoOptionsMenu[] = #ifdef HWRENDER {IT_HEADER, NULL, "Renderer", NULL, 208}, {IT_CALL | IT_STRING, NULL, "OpenGL Options...", M_OpenGLOptionsMenu, 214}, + {IT_STRING | IT_CVAR, NULL, "FPS Cap", &cv_fpscap, 219}, #endif }; @@ -1820,6 +1829,10 @@ menu_t SP_LevelSelectDef = MAPPLATTERMENUSTYLE( MTREE4(MN_SP_MAIN, MN_SP_LOAD, MN_SP_PLAYER, MN_SP_LEVELSELECT), NULL, SP_LevelSelectMenu); +menu_t SP_PauseLevelSelectDef = MAPPLATTERMENUSTYLE( + MTREE4(MN_SP_MAIN, MN_SP_LOAD, MN_SP_PLAYER, MN_SP_LEVELSELECT), + NULL, SP_LevelSelectMenu); + menu_t SP_LevelStatsDef = { MTREE2(MN_SP_MAIN, MN_SP_LEVELSTATS), @@ -2280,6 +2293,7 @@ static boolean M_CanShowLevelOnPlatter(INT32 mapnum, INT32 gt); // Nextmap. Used for Level select. void Nextmap_OnChange(void) { + gamedata_t *data = clientGamedata; char *leveltitle; char tabase[256]; #ifdef OLDNREPLAYNAME @@ -2297,7 +2311,7 @@ void Nextmap_OnChange(void) { CV_StealthSetValue(&cv_dummymares, 0); // Hide the record changing CVAR if only one mare is available. - if (!nightsrecords[cv_nextmap.value-1] || nightsrecords[cv_nextmap.value-1]->nummares < 2) + if (!data->nightsrecords[cv_nextmap.value-1] || data->nightsrecords[cv_nextmap.value-1]->nummares < 2) SP_NightsAttackMenu[narecords].status = IT_DISABLED; else SP_NightsAttackMenu[narecords].status = IT_STRING|IT_CVAR; @@ -2428,14 +2442,15 @@ void Nextmap_OnChange(void) static void Dummymares_OnChange(void) { - if (!nightsrecords[cv_nextmap.value-1]) + gamedata_t *data = clientGamedata; + if (!data->nightsrecords[cv_nextmap.value-1]) { CV_StealthSetValue(&cv_dummymares, 0); return; } else { - UINT8 mares = nightsrecords[cv_nextmap.value-1]->nummares; + UINT8 mares = data->nightsrecords[cv_nextmap.value-1]->nummares; if (cv_dummymares.value < 0) CV_StealthSetValue(&cv_dummymares, mares); @@ -3215,7 +3230,7 @@ boolean M_Responder(event_t *ev) if (gamestate == GS_TITLESCREEN && finalecount < TICRATE) return false; - if (CON_Ready()) + if (CON_Ready() && gamestate != GS_WAITINGPLAYERS) return false; if (noFurtherInput) @@ -3229,7 +3244,7 @@ boolean M_Responder(event_t *ev) if (ev->type == ev_keydown) { keydown++; - ch = ev->data1; + ch = ev->key; // added 5-2-98 remap virtual keys (mouse & joystick buttons) switch (ch) @@ -3262,44 +3277,44 @@ boolean M_Responder(event_t *ev) break; } } - else if (ev->type == ev_joystick && ev->data1 == 0 && joywait < I_GetTime()) + else if (ev->type == ev_joystick && ev->key == 0 && joywait < I_GetTime()) { const INT32 jdeadzone = (JOYAXISRANGE * cv_digitaldeadzone.value) / FRACUNIT; - if (ev->data3 != INT32_MAX) + if (ev->y != INT32_MAX) { - if (Joystick.bGamepadStyle || abs(ev->data3) > jdeadzone) + if (Joystick.bGamepadStyle || abs(ev->y) > jdeadzone) { - if (ev->data3 < 0 && pjoyy >= 0) + if (ev->y < 0 && pjoyy >= 0) { ch = KEY_UPARROW; joywait = I_GetTime() + NEWTICRATE/7; } - else if (ev->data3 > 0 && pjoyy <= 0) + else if (ev->y > 0 && pjoyy <= 0) { ch = KEY_DOWNARROW; joywait = I_GetTime() + NEWTICRATE/7; } - pjoyy = ev->data3; + pjoyy = ev->y; } else pjoyy = 0; } - if (ev->data2 != INT32_MAX) + if (ev->x != INT32_MAX) { - if (Joystick.bGamepadStyle || abs(ev->data2) > jdeadzone) + if (Joystick.bGamepadStyle || abs(ev->x) > jdeadzone) { - if (ev->data2 < 0 && pjoyx >= 0) + if (ev->x < 0 && pjoyx >= 0) { ch = KEY_LEFTARROW; joywait = I_GetTime() + NEWTICRATE/17; } - else if (ev->data2 > 0 && pjoyx <= 0) + else if (ev->x > 0 && pjoyx <= 0) { ch = KEY_RIGHTARROW; joywait = I_GetTime() + NEWTICRATE/17; } - pjoyx = ev->data2; + pjoyx = ev->x; } else pjoyx = 0; @@ -3307,7 +3322,7 @@ boolean M_Responder(event_t *ev) } else if (ev->type == ev_mouse && mousewait < I_GetTime()) { - pmousey += ev->data3; + pmousey -= ev->y; if (pmousey < lasty-30) { ch = KEY_DOWNARROW; @@ -3321,7 +3336,7 @@ boolean M_Responder(event_t *ev) pmousey = lasty += 30; } - pmousex += ev->data2; + pmousex += ev->x; if (pmousex < lastx - 30) { ch = KEY_LEFTARROW; @@ -3339,11 +3354,11 @@ boolean M_Responder(event_t *ev) keydown = 0; } else if (ev->type == ev_keydown) // Preserve event for other responders - ch = ev->data1; + ch = ev->key; if (ch == -1) return false; - else if (ch == gamecontrol[gc_systemmenu][0] || ch == gamecontrol[gc_systemmenu][1]) // allow remappable ESC key + else if (ch == gamecontrol[GC_SYSTEMMENU][0] || ch == gamecontrol[GC_SYSTEMMENU][1]) // allow remappable ESC key ch = KEY_ESCAPE; // F-Keys @@ -3511,10 +3526,12 @@ boolean M_Responder(event_t *ev) { if (((currentMenu->menuitems[itemOn].status & IT_TYPE)==IT_CALL || (currentMenu->menuitems[itemOn].status & IT_TYPE)==IT_SUBMENU) - && (currentMenu->menuitems[itemOn].status & IT_CALLTYPE)) + && (currentMenu->menuitems[itemOn].status & IT_CALLTYPE)) { #ifndef DEVELOP - if (((currentMenu->menuitems[itemOn].status & IT_CALLTYPE) & IT_CALL_NOTMODIFIED) && modifiedgame && !savemoddata) + // TODO: Replays are scary, so I left the remaining instances of this alone. + // It'd be nice to get rid of this once and for all though! + if (((currentMenu->menuitems[itemOn].status & IT_CALLTYPE) & IT_CALL_NOTMODIFIED) && (modifiedgame && !savemoddata) && !usedCheats) { S_StartSound(NULL, sfx_skid); M_StartMessage(M_GetText("This cannot be done in a modified game.\n\n(Press a key)\n"), NULL, MM_NOTHING); @@ -3664,9 +3681,9 @@ void M_StartControlPanel(void) if (!Playing()) { // Secret menu! - MainMenu[singleplr].alphaKey = (M_AnySecretUnlocked()) ? 76 : 84; - MainMenu[multiplr].alphaKey = (M_AnySecretUnlocked()) ? 84 : 92; - MainMenu[secrets].status = (M_AnySecretUnlocked()) ? (IT_STRING | IT_CALL) : (IT_DISABLED); + MainMenu[singleplr].alphaKey = (M_AnySecretUnlocked(clientGamedata)) ? 76 : 84; + MainMenu[multiplr].alphaKey = (M_AnySecretUnlocked(clientGamedata)) ? 84 : 92; + MainMenu[secrets].status = (M_AnySecretUnlocked(clientGamedata)) ? (IT_STRING | IT_CALL) : (IT_DISABLED); currentMenu = &MainDef; itemOn = singleplr; @@ -3674,28 +3691,23 @@ void M_StartControlPanel(void) else if (modeattacking) { currentMenu = &MAPauseDef; - MAPauseMenu[mapause_hints].status = (M_SecretUnlocked(SECRET_EMBLEMHINTS)) ? (IT_STRING | IT_CALL) : (IT_DISABLED); + MAPauseMenu[mapause_hints].status = (M_SecretUnlocked(SECRET_EMBLEMHINTS, clientGamedata)) ? (IT_STRING | IT_CALL) : (IT_DISABLED); itemOn = mapause_continue; } else if (!(netgame || multiplayer)) // Single Player { if (gamestate != GS_LEVEL || ultimatemode) // intermission, so gray out stuff. { - SPauseMenu[spause_pandora].status = (M_SecretUnlocked(SECRET_PANDORA)) ? (IT_GRAYEDOUT) : (IT_DISABLED); + SPauseMenu[spause_pandora].status = (M_SecretUnlocked(SECRET_PANDORA, serverGamedata)) ? (IT_GRAYEDOUT) : (IT_DISABLED); SPauseMenu[spause_retry].status = IT_GRAYEDOUT; } else { - INT32 numlives = 2; + INT32 numlives = players[consoleplayer].lives; + if (players[consoleplayer].playerstate != PST_LIVE) + ++numlives; - SPauseMenu[spause_pandora].status = (M_SecretUnlocked(SECRET_PANDORA) && !marathonmode) ? (IT_STRING | IT_CALL) : (IT_DISABLED); - - if (&players[consoleplayer]) - { - numlives = players[consoleplayer].lives; - if (players[consoleplayer].playerstate != PST_LIVE) - ++numlives; - } + SPauseMenu[spause_pandora].status = (M_SecretUnlocked(SECRET_PANDORA, serverGamedata) && !marathonmode) ? (IT_STRING | IT_CALL) : (IT_DISABLED); // The list of things that can disable retrying is (was?) a little too complex // for me to want to use the short if statement syntax @@ -3706,10 +3718,10 @@ void M_StartControlPanel(void) } // We can always use level select though. :33 - SPauseMenu[spause_levelselect].status = (gamecomplete == 1) ? (IT_STRING | IT_CALL) : (IT_DISABLED); + SPauseMenu[spause_levelselect].status = (maplistoption != 0) ? (IT_STRING | IT_CALL) : (IT_DISABLED); // And emblem hints. - SPauseMenu[spause_hints].status = (M_SecretUnlocked(SECRET_EMBLEMHINTS) && !marathonmode) ? (IT_STRING | IT_CALL) : (IT_DISABLED); + SPauseMenu[spause_hints].status = (M_SecretUnlocked(SECRET_EMBLEMHINTS, clientGamedata) && !marathonmode) ? (IT_STRING | IT_CALL) : (IT_DISABLED); // Shift up Pandora's Box if both pandora and levelselect are active /*if (SPauseMenu[spause_pandora].status != (IT_DISABLED) @@ -3744,21 +3756,21 @@ void M_StartControlPanel(void) if (splitscreen) { MPauseMenu[mpause_psetupsplit].status = MPauseMenu[mpause_psetupsplit2].status = IT_STRING | IT_CALL; - MPauseMenu[mpause_psetup].text = "Player 1 Setup"; } else { MPauseMenu[mpause_psetup].status = IT_STRING | IT_CALL; - MPauseMenu[mpause_psetup].text = "Player Setup"; if (G_GametypeHasTeams()) MPauseMenu[mpause_switchteam].status = IT_STRING | IT_SUBMENU; else if (G_GametypeHasSpectators()) - MPauseMenu[((&players[consoleplayer] && players[consoleplayer].spectator) ? mpause_entergame : mpause_spectate)].status = IT_STRING | IT_CALL; + MPauseMenu[players[consoleplayer].spectator ? mpause_entergame : mpause_spectate].status = IT_STRING | IT_CALL; else // in this odd case, we still want something to be on the menu even if it's useless MPauseMenu[mpause_spectate].status = IT_GRAYEDOUT; } + MPauseMenu[mpause_hints].status = (M_SecretUnlocked(SECRET_EMBLEMHINTS, clientGamedata) && G_CoopGametype()) ? (IT_STRING | IT_CALL) : (IT_DISABLED); + currentMenu = &MPauseDef; itemOn = mpause_continue; } @@ -3910,7 +3922,7 @@ void M_Init(void) { int i; - COM_AddCommand("manual", Command_Manual_f); + COM_AddCommand("manual", Command_Manual_f, COM_LUA); CV_RegisterVar(&cv_nextmap); CV_RegisterVar(&cv_newgametype); @@ -4036,7 +4048,7 @@ static void M_DrawThermo(INT32 x, INT32 y, consvar_t *cv) xx += p->width - p->leftoffset; for (i = 0; i < 16; i++) { - V_DrawScaledPatch(xx, y, V_WRAPX, W_CachePatchNum(centerlump[i & 1], PU_PATCH)); + V_DrawScaledPatch(xx, y, 0, W_CachePatchNum(centerlump[i & 1], PU_PATCH)); xx += 8; } V_DrawScaledPatch(xx, y, 0, W_CachePatchNum(rightlump, PU_PATCH)); @@ -4062,14 +4074,6 @@ static void M_DrawSlider(INT32 x, INT32 y, const consvar_t *cv, boolean ontop) for (i = 1; i < SLIDER_RANGE; i++) V_DrawScaledPatch (x+i*8, y, 0,p); - if (ontop) - { - V_DrawCharacter(x - 6 - (skullAnimCounter/5), y, - '\x1C' | V_YELLOWMAP, false); - V_DrawCharacter(x+i*8 + 8 + (skullAnimCounter/5), y, - '\x1D' | V_YELLOWMAP, false); - } - p = W_CachePatchName("M_SLIDER", PU_PATCH); V_DrawScaledPatch(x+i*8, y, 0, p); @@ -4105,6 +4109,16 @@ static void M_DrawSlider(INT32 x, INT32 y, const consvar_t *cv, boolean ontop) range = 100; V_DrawMappedPatch(x + 2 + (SLIDER_RANGE*8*range)/100, y, 0, p, yellowmap); + + if (ontop) + { + V_DrawCharacter(x - 6 - (skullAnimCounter/5), y, + '\x1C' | V_YELLOWMAP, false); + V_DrawCharacter(x + 80 + (skullAnimCounter/5), y, + '\x1D' | V_YELLOWMAP, false); + V_DrawCenteredString(x + 40, y, V_30TRANS, + (cv->flags & CV_FLOAT) ? va("%.2f", FIXED_TO_FLOAT(cv->value)) : va("%d", cv->value)); + } } // @@ -4132,7 +4146,7 @@ void M_DrawTextBox(INT32 x, INT32 y, INT32 width, INT32 boxlines) p = W_CachePatchNum(viewborderlump[BRDR_L], PU_PATCH); for (n = 0; n < boxlines; n++) { - V_DrawScaledPatch(cx, cy, V_WRAPY, p); + V_DrawScaledPatch(cx, cy, 0, p); cy += step; } V_DrawScaledPatch(cx, cy, 0, W_CachePatchNum(viewborderlump[BRDR_BL], PU_PATCH)); @@ -4144,8 +4158,8 @@ void M_DrawTextBox(INT32 x, INT32 y, INT32 width, INT32 boxlines) cy = y; while (width > 0) { - V_DrawScaledPatch(cx, cy, V_WRAPX, W_CachePatchNum(viewborderlump[BRDR_T], PU_PATCH)); - V_DrawScaledPatch(cx, y + boff + boxlines*step, V_WRAPX, W_CachePatchNum(viewborderlump[BRDR_B], PU_PATCH)); + V_DrawScaledPatch(cx, cy, 0, W_CachePatchNum(viewborderlump[BRDR_T], PU_PATCH)); + V_DrawScaledPatch(cx, y + boff + boxlines*step, 0, W_CachePatchNum(viewborderlump[BRDR_B], PU_PATCH)); width--; cx += step; } @@ -4157,7 +4171,7 @@ void M_DrawTextBox(INT32 x, INT32 y, INT32 width, INT32 boxlines) p = W_CachePatchNum(viewborderlump[BRDR_R], PU_PATCH); for (n = 0; n < boxlines; n++) { - V_DrawScaledPatch(cx, cy, V_WRAPY, p); + V_DrawScaledPatch(cx, cy, 0, p); cy += step; } V_DrawScaledPatch(cx, cy, 0, W_CachePatchNum(viewborderlump[BRDR_BR], PU_PATCH)); @@ -4185,7 +4199,7 @@ static void M_DrawStaticBox(fixed_t x, fixed_t y, INT32 flags, fixed_t w, fixed_ if (staticalong > pw) // simplified for base LSSTATIC staticalong -= pw; - V_DrawCroppedPatch(x<collected) + if (clientGamedata->collected[emblem - emblemlocations]) V_DrawSmallMappedPatch(x, y, 0, W_CachePatchName(M_GetEmblemPatch(emblem, false), PU_PATCH), R_GetTranslationColormap(TC_DEFAULT, M_GetEmblemColor(emblem), GTC_CACHE)); else V_DrawSmallScaledPatch(x, y, 0, W_CachePatchName("NEEDIT", PU_PATCH)); emblem = M_GetLevelEmblems(-1); - x -= 12; + x -= 12+1; } } @@ -4436,22 +4456,21 @@ static void M_DrawGenericMenu(void) } } -const char *PlaystyleNames[4] = {"Strafe", "Standard", "Simple", "Old Analog??"}; +const char *PlaystyleNames[4] = {"\x86Strafe\x80", "Manual", "Automatic", "Old Analog??"}; const char *PlaystyleDesc[4] = { - // Legacy - "The play style used for\n" - "old-school SRB2.\n" + // Strafe (or Legacy) + "A play style resembling\n" + "old-school SRB2 gameplay.\n" "\n" "This play style is identical\n" - "to Standard, except that the\n" + "to Manual, except that the\n" "player always looks in the\n" "direction of the camera." , - // Standard - "The default play style,\n" - "designed for full control\n" - "with a keyboard and mouse.\n" + // Manual (formerly Standard) + "A play style made for full control,\n" + "using a keyboard and mouse.\n" "\n" "The camera rotates only when\n" "you tell it to. The player\n" @@ -4463,8 +4482,8 @@ const char *PlaystyleDesc[4] = { "open up the highest level of play!" , - // Simple - "A play style designed for\n" + // Automatic (formerly Simple) + "The default play style, designed for\n" "gamepads and hassle-free play.\n" "\n" "The camera rotates automatically\n" @@ -4473,7 +4492,8 @@ const char *PlaystyleDesc[4] = { "they're moving.\n" "\n" "Hold \x82" "Center View\x80 to lock the\n" - "camera behind the player!\n" + "camera behind the player, or target\n" + "enemies, bosses and monitors!\n" , // Old Analog @@ -4484,7 +4504,7 @@ const char *PlaystyleDesc[4] = { "your config file and brought it back.\n" "\n" "That's absolutely valid, but I implore\n" - "you to try the new Simple play style\n" + "you to try the new Automatic play style\n" "instead!" }; @@ -4683,7 +4703,9 @@ static void M_DrawGenericScrollMenu(void) static void M_DrawPauseMenu(void) { - if (!netgame && !multiplayer && (gamestate == GS_LEVEL || gamestate == GS_INTERMISSION)) + gamedata_t *data = clientGamedata; + + if (gamestate == GS_LEVEL || gamestate == GS_INTERMISSION) { emblem_t *emblem_detail[3] = {NULL, NULL, NULL}; char emblem_text[3][20]; @@ -4692,7 +4714,7 @@ static void M_DrawPauseMenu(void) M_DrawTextBox(27, 16, 32, 6); // Draw any and all emblems at the top. - M_DrawMapEmblems(gamemap, 272, 28); + M_DrawMapEmblems(gamemap, 272, 28, true); if (mapheaderinfo[gamemap-1]->actnum != 0) V_DrawString(40, 28, V_YELLOWMAP, va("%s %d", mapheaderinfo[gamemap-1]->lvlttl, mapheaderinfo[gamemap-1]->actnum)); @@ -4711,7 +4733,7 @@ static void M_DrawPauseMenu(void) { case ET_SCORE: snprintf(targettext, 9, "%d", emblem->var); - snprintf(currenttext, 9, "%u", G_GetBestScore(gamemap)); + snprintf(currenttext, 9, "%u", G_GetBestScore(gamemap, data)); targettext[8] = 0; currenttext[8] = 0; @@ -4725,7 +4747,7 @@ static void M_DrawPauseMenu(void) G_TicsToSeconds((tic_t)emblemslot), G_TicsToCentiseconds((tic_t)emblemslot)); - emblemslot = (INT32)G_GetBestTime(gamemap); // dumb hack pt ii + emblemslot = (INT32)G_GetBestTime(gamemap, data); // dumb hack pt ii if ((tic_t)emblemslot == UINT32_MAX) snprintf(currenttext, 9, "-:--.--"); else @@ -4741,7 +4763,7 @@ static void M_DrawPauseMenu(void) break; case ET_RINGS: snprintf(targettext, 9, "%d", emblem->var); - snprintf(currenttext, 9, "%u", G_GetBestRings(gamemap)); + snprintf(currenttext, 9, "%u", G_GetBestRings(gamemap, data)); targettext[8] = 0; currenttext[8] = 0; @@ -4750,7 +4772,7 @@ static void M_DrawPauseMenu(void) break; case ET_NGRADE: snprintf(targettext, 9, "%u", P_GetScoreForGrade(gamemap, 0, emblem->var)); - snprintf(currenttext, 9, "%u", G_GetBestNightsScore(gamemap, 0)); + snprintf(currenttext, 9, "%u", G_GetBestNightsScore(gamemap, 0, data)); targettext[8] = 0; currenttext[8] = 0; @@ -4764,7 +4786,7 @@ static void M_DrawPauseMenu(void) G_TicsToSeconds((tic_t)emblemslot), G_TicsToCentiseconds((tic_t)emblemslot)); - emblemslot = (INT32)G_GetBestNightsTime(gamemap, 0); // dumb hack pt iv + emblemslot = (INT32)G_GetBestNightsTime(gamemap, 0, data); // dumb hack pt iv if ((tic_t)emblemslot == UINT32_MAX) snprintf(currenttext, 9, "-:--.--"); else @@ -4798,7 +4820,7 @@ static void M_DrawPauseMenu(void) if (!emblem) continue; - if (emblem->collected) + if (data->collected[emblem - emblemlocations]) V_DrawSmallMappedPatch(40, 44 + (i*8), 0, W_CachePatchName(M_GetEmblemPatch(emblem, false), PU_PATCH), R_GetTranslationColormap(TC_DEFAULT, M_GetEmblemColor(emblem), GTC_CACHE)); else @@ -5010,7 +5032,9 @@ static void M_PatchSkinNameTable(void) // static boolean M_LevelAvailableOnPlatter(INT32 mapnum) { - if (M_MapLocked(mapnum+1)) + gamedata_t *data = serverGamedata; + + if (M_MapLocked(mapnum+1, data)) return false; // not unlocked switch (levellistmode) @@ -5023,7 +5047,7 @@ static boolean M_LevelAvailableOnPlatter(INT32 mapnum) return true; #ifndef DEVELOP - if (mapvisited[mapnum]) // MV_MP + if (data->mapvisited[mapnum]) #endif return true; @@ -5031,7 +5055,7 @@ static boolean M_LevelAvailableOnPlatter(INT32 mapnum) case LLM_RECORDATTACK: case LLM_NIGHTSATTACK: #ifndef DEVELOP - if (mapvisited[mapnum] & MV_MAX) + if (data->mapvisited[mapnum]) return true; if (mapheaderinfo[mapnum]->menuflags & LF2_NOVISITNEEDED) @@ -5062,7 +5086,7 @@ static boolean M_CanShowLevelOnPlatter(INT32 mapnum, INT32 gt) if (!mapheaderinfo[mapnum]->lvlttl[0]) return false; - /*if (M_MapLocked(mapnum+1)) + /*if (M_MapLocked(mapnum+1, serverGamedata)) return false; // not unlocked*/ switch (levellistmode) @@ -5406,11 +5430,13 @@ static boolean M_PrepareLevelPlatter(INT32 gt, boolean nextmappick) if (actnum) sprintf(mapname, "%s %d", mapheaderinfo[headingIterate]->lvlttl, actnum); + else if (V_ThinStringWidth(mapheaderinfo[headingIterate]->lvlttl, 0) <= 80) + strlcpy(mapname, mapheaderinfo[headingIterate]->lvlttl, 22); else - strcpy(mapname, mapheaderinfo[headingIterate]->lvlttl); - - if (strlen(mapname) >= 17) - strcpy(mapname+17-3, "..."); + { + strlcpy(mapname, mapheaderinfo[headingIterate]->lvlttl, 15); + strcat(mapname, "..."); + } strcpy(levelselect.rows[row].mapnames[col], (const char *)mapname); } @@ -5497,7 +5523,7 @@ static void M_HandleLevelPlatter(INT32 choice) { if (!lsoffs[0]) // prevent sound spam { - lsoffs[0] = -8; + lsoffs[0] = -8 * FRACUNIT; S_StartSound(NULL,sfx_s3kb7); } return; @@ -5506,7 +5532,7 @@ static void M_HandleLevelPlatter(INT32 choice) } lsrow++; - lsoffs[0] = lsvseperation(lsrow); + lsoffs[0] = lsvseperation(lsrow) * FRACUNIT; if (levelselect.rows[lsrow].header[0]) lshli = lsrow; @@ -5525,7 +5551,7 @@ static void M_HandleLevelPlatter(INT32 choice) { if (!lsoffs[0]) // prevent sound spam { - lsoffs[0] = 8; + lsoffs[0] = 8 * FRACUNIT; S_StartSound(NULL,sfx_s3kb7); } return; @@ -5534,7 +5560,7 @@ static void M_HandleLevelPlatter(INT32 choice) } lsrow--; - lsoffs[0] = -lsvseperation(iter); + lsoffs[0] = -lsvseperation(iter) * FRACUNIT; if (levelselect.rows[lsrow].header[0]) lshli = lsrow; @@ -5575,7 +5601,7 @@ static void M_HandleLevelPlatter(INT32 choice) } else if (!lsoffs[0]) // prevent sound spam { - lsoffs[0] = -8; + lsoffs[0] = -8 * FRACUNIT; S_StartSound(NULL,sfx_s3kb2); } break; @@ -5601,14 +5627,14 @@ static void M_HandleLevelPlatter(INT32 choice) { lscol++; - lsoffs[1] = (lswide(lsrow) ? 8 : -lshseperation); + lsoffs[1] = (lswide(lsrow) ? 8 : -lshseperation) * FRACUNIT; S_StartSound(NULL,sfx_s3kb7); ifselectvalnextmap(lscol) else ifselectvalnextmap(0) } else if (!lsoffs[1]) // prevent sound spam { - lsoffs[1] = 8; + lsoffs[1] = 8 * FRACUNIT; S_StartSound(NULL,sfx_s3kb7); } break; @@ -5633,14 +5659,14 @@ static void M_HandleLevelPlatter(INT32 choice) { lscol--; - lsoffs[1] = (lswide(lsrow) ? -8 : lshseperation); + lsoffs[1] = (lswide(lsrow) ? -8 : lshseperation) * FRACUNIT; S_StartSound(NULL,sfx_s3kb7); ifselectvalnextmap(lscol) else ifselectvalnextmap(0) } else if (!lsoffs[1]) // prevent sound spam { - lsoffs[1] = -8; + lsoffs[1] = -8 * FRACUNIT; S_StartSound(NULL,sfx_s3kb7); } break; @@ -5745,7 +5771,7 @@ static void M_DrawLevelPlatterMap(UINT8 row, UINT8 col, INT32 x, INT32 y, boolea ? 159 : 63)); if (strlen(levelselect.rows[row].mapnames[col]) > 6) // "AERIAL GARDEN" vs "ACT 18" - "THE ACT" intentionally compressed - V_DrawThinString(x, y+50, (highlight ? V_YELLOWMAP : 0), levelselect.rows[row].mapnames[col]); + V_DrawThinString(x, y+50+1, (highlight ? V_YELLOWMAP : 0), levelselect.rows[row].mapnames[col]); else V_DrawString(x, y+50, (highlight ? V_YELLOWMAP : 0), levelselect.rows[row].mapnames[col]); } @@ -5803,7 +5829,7 @@ static void M_DrawRecordAttackForeground(void) for (i = -12; i < (BASEVIDHEIGHT/height) + 12; i++) { - INT32 y = ((i*height) - (height - ((recatkdrawtimer*2)%height))); + INT32 y = ((i*height) - (height - ((FixedInt(recatkdrawtimer*2))%height))); // don't draw above the screen { INT32 sy = FixedMul(y, dupz<> FRACBITS; @@ -5820,17 +5846,18 @@ static void M_DrawRecordAttackForeground(void) } // draw clock - fa = (FixedAngle(((recatkdrawtimer * 4) % 360)<>ANGLETOFINESHIFT) & FINEMASK; + fa = (FixedAngle(((FixedInt(recatkdrawtimer * 4)) % 360)<>ANGLETOFINESHIFT) & FINEMASK; V_DrawSciencePatch(160<width; @@ -5846,7 +5873,7 @@ static void M_DrawNightsAttackMountains(void) if (x < BASEVIDWIDTH) V_DrawScaledPatch(x, y, V_SNAPTOLEFT, background); - bgscrollx += (FRACUNIT/2); + bgscrollx += FixedMul(FRACUNIT/2, renderdeltatics); if (bgscrollx > w<>ANGLETOFINESHIFT) & FINEMASK; + INT32 timer = FixedInt(ntsatkdrawtimer/4) % 2; + angle_t fa = (FixedAngle((FixedInt(ntsatkdrawtimer * 4) % 360)<>ANGLETOFINESHIFT) & FINEMASK; V_DrawFixedPatch(235<prevMenu == &SP_TimeAttackDef) @@ -5953,7 +5981,7 @@ static void M_DrawLevelPlatterMenu(void) V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, curbgcolor); else if (!curbghide || !titlemapinaction) { - F_SkyScroll(curbgxspeed, curbgyspeed, curbgname); + F_SkyScroll(curbgname); // Draw and animate foreground if (!strncmp("RECATKBG", curbgname, 8)) M_DrawRecordAttackForeground(); @@ -6007,7 +6035,7 @@ static void M_DrawLevelPlatterMenu(void) // draw cursor box if (levellistmode != LLM_CREATESERVER || lsrow) - V_DrawSmallScaledPatch(lsbasex + cursorx + lsoffs[1], lsbasey+lsoffs[0], 0, (levselp[sizeselect][((skullAnimCounter/4) ? 1 : 0)])); + V_DrawSmallScaledPatch(lsbasex + cursorx + FixedInt(lsoffs[1]), lsbasey+FixedInt(lsoffs[0]), 0, (levselp[sizeselect][((skullAnimCounter/4) ? 1 : 0)])); #if 0 if (levelselect.rows[lsrow].maplist[lscol] > 0) @@ -6015,13 +6043,26 @@ static void M_DrawLevelPlatterMenu(void) #endif // handle movement of cursor box - if (lsoffs[0] > 1 || lsoffs[0] < -1) - lsoffs[0] = 2*lsoffs[0]/3; + fixed_t cursormovefrac = FixedDiv(2, 3); + if (lsoffs[0] > FRACUNIT || lsoffs[0] < -FRACUNIT) + { + fixed_t offs = lsoffs[0]; + fixed_t newoffs = FixedMul(offs, cursormovefrac); + fixed_t deltaoffs = newoffs - offs; + newoffs = offs + FixedMul(deltaoffs, renderdeltatics); + lsoffs[0] = newoffs; + } else lsoffs[0] = 0; - if (lsoffs[1] > 1 || lsoffs[1] < -1) - lsoffs[1] = 2*lsoffs[1]/3; + if (lsoffs[1] > FRACUNIT || lsoffs[1] < -FRACUNIT) + { + fixed_t offs = lsoffs[1]; + fixed_t newoffs = FixedMul(offs, cursormovefrac); + fixed_t deltaoffs = newoffs - offs; + newoffs = offs + FixedMul(deltaoffs, renderdeltatics); + lsoffs[1] = newoffs; + } else lsoffs[1] = 0; @@ -6202,7 +6243,7 @@ static void M_DrawMessageMenu(void) } else { - F_SkyScroll(curbgxspeed, curbgyspeed, curbgname); + F_SkyScroll(curbgname); if (!strncmp("RECATKBG", curbgname, 8)) M_DrawRecordAttackForeground(); } @@ -6410,6 +6451,7 @@ static void M_Addons(INT32 choice) M_SetupNextMenu(&MISC_AddonsDef); } +#ifdef ENFORCE_WAD_LIMIT #define width 4 #define vpadding 27 #define h (BASEVIDHEIGHT-(2*vpadding)) @@ -6457,6 +6499,7 @@ static void M_DrawTemperature(INT32 x, fixed_t t) #undef vpadding #undef h #undef NUMCOLOURS +#endif static char *M_AddonsHeaderPath(void) { @@ -6550,21 +6593,20 @@ static void M_DrawAddons(void) V_DrawCenteredString(BASEVIDWIDTH/2, 5, 0, LOCATIONSTRING1); // (recommendedflags == V_SKYMAP ? LOCATIONSTRING2 : LOCATIONSTRING1) +#ifdef ENFORCE_WAD_LIMIT if (numwadfiles <= mainwads+1) y = 0; else if (numwadfiles >= MAX_WADFILES) y = FRACUNIT; else { - x = FixedDiv(((ssize_t)(numwadfiles) - (ssize_t)(mainwads+1))< y) - y = x; + y = FixedDiv(((ssize_t)(numwadfiles) - (ssize_t)(mainwads+1))< FRACUNIT) // happens because of how we're shrinkin' it a little y = FRACUNIT; } M_DrawTemperature(BASEVIDWIDTH - 19 - 5, y); +#endif // DRAW MENU x = currentMenu->x; @@ -6664,7 +6706,7 @@ static void M_DrawAddons(void) } // draw down arrow that bobs down and up - if (b != sizedirmenu) + if (b != sizedirmenu - 1) V_DrawString(19, y-12 + (skullAnimCounter/5), highlightflags, "\x1B"); // draw search box @@ -6685,7 +6727,7 @@ static void M_DrawAddons(void) // draw save icon x = BASEVIDWIDTH - x - 16; - V_DrawSmallScaledPatch(x, y + 4, ((!modifiedgame || savemoddata) ? 0 : V_TRANSLUCENT), addonsp[NUM_EXT+4]); + V_DrawSmallScaledPatch(x, y + 4, (!usedCheats ? 0 : V_TRANSLUCENT), addonsp[NUM_EXT+4]); if (modifiedgame) V_DrawSmallScaledPatch(x, y + 4, 0, addonsp[NUM_EXT+2]); @@ -6763,11 +6805,15 @@ static void M_HandleAddons(INT32 choice) case KEY_DOWNARROW: if (dir_on[menudepthleft] < sizedirmenu-1) dir_on[menudepthleft]++; + else if (dir_on[menudepthleft] == sizedirmenu-1) + dir_on[menudepthleft] = 0; S_StartSound(NULL, sfx_menu1); break; case KEY_UPARROW: if (dir_on[menudepthleft]) dir_on[menudepthleft]--; + else if (!dir_on[menudepthleft]) + dir_on[menudepthleft] = sizedirmenu-1; S_StartSound(NULL, sfx_menu1); break; case KEY_PGDN: @@ -6873,7 +6919,7 @@ static void M_HandleAddons(INT32 choice) closefilemenu(true); // secrets disabled by addfile... - MainMenu[secrets].status = (M_AnySecretUnlocked()) ? (IT_STRING | IT_CALL) : (IT_DISABLED); + MainMenu[secrets].status = (M_AnySecretUnlocked(clientGamedata)) ? (IT_STRING | IT_CALL) : (IT_DISABLED); if (currentMenu->prevMenu) M_SetupNextMenu(currentMenu->prevMenu); @@ -7009,7 +7055,7 @@ static void M_RetryResponse(INT32 ch) if (ch != 'y' && ch != KEY_ENTER) return; - if (!&players[consoleplayer] || netgame || multiplayer) // Should never happen! + if (netgame || multiplayer) // Should never happen! return; M_ClearMenus(true); @@ -7040,7 +7086,7 @@ static void M_SelectableClearMenus(INT32 choice) static void M_UltimateCheat(INT32 choice) { (void)choice; - LUAh_GameQuit(true); + LUA_HookBool(true, HOOK(GameQuit)); I_Quit(); } @@ -7052,7 +7098,7 @@ static void M_AllowSuper(INT32 choice) M_StartMessage(M_GetText("You are now capable of turning super.\nRemember to get all the emeralds!\n"),NULL,MM_NOTHING); SR_PandorasBox[6].status = IT_GRAYEDOUT; - G_SetGameModified(multiplayer); + G_SetUsedCheats(false); } static void M_GetAllEmeralds(INT32 choice) @@ -7063,7 +7109,7 @@ static void M_GetAllEmeralds(INT32 choice) M_StartMessage(M_GetText("You now have all 7 emeralds.\nUse them wisely.\nWith great power comes great ring drain.\n"),NULL,MM_NOTHING); SR_PandorasBox[7].status = IT_GRAYEDOUT; - G_SetGameModified(multiplayer); + G_SetUsedCheats(false); } static void M_DestroyRobotsResponse(INT32 ch) @@ -7074,7 +7120,7 @@ static void M_DestroyRobotsResponse(INT32 ch) // Destroy all robots P_DestroyRobots(); - G_SetGameModified(multiplayer); + G_SetUsedCheats(false); } static void M_DestroyRobots(INT32 choice) @@ -7087,6 +7133,7 @@ static void M_DestroyRobots(INT32 choice) static void M_LevelSelectWarp(INT32 choice) { boolean fromloadgame = (currentMenu == &SP_LevelSelectDef); + boolean frompause = (currentMenu == &SP_PauseLevelSelectDef); (void)choice; @@ -7097,7 +7144,6 @@ static void M_LevelSelectWarp(INT32 choice) } startmap = (INT16)(cv_nextmap.value); - fromlevelselect = true; if (fromloadgame) @@ -7105,7 +7151,20 @@ static void M_LevelSelectWarp(INT32 choice) else { cursaveslot = 0; - M_SetupChoosePlayer(0); + + if (frompause) + { + M_ClearMenus(true); + + G_DeferedInitNew(false, G_BuildMapName(startmap), cv_skin.value, false, fromlevelselect); // Not sure about using cv_skin here, but it seems fine in testing. + COM_BufAddText("dummyconsvar 1\n"); // G_DeferedInitNew doesn't do this + + if (levelselect.rows) + Z_Free(levelselect.rows); + levelselect.rows = NULL; + } + else + M_SetupChoosePlayer(0); } } @@ -7119,7 +7178,9 @@ static boolean checklist_cangodown; // uuuueeerggghhhh HACK static void M_HandleChecklist(INT32 choice) { + gamedata_t *data = clientGamedata; INT32 j; + switch (choice) { case KEY_DOWNARROW: @@ -7136,7 +7197,7 @@ static void M_HandleChecklist(INT32 choice) continue; if (unlockables[j].conditionset > MAXCONDITIONSETS) continue; - if (!unlockables[j].unlocked && unlockables[j].showconditionset && !M_Achieved(unlockables[j].showconditionset)) + if (!data->unlocked[j] && unlockables[j].showconditionset && !M_Achieved(unlockables[j].showconditionset, data)) continue; if (unlockables[j].conditionset == unlockables[check_on].conditionset) continue; @@ -7161,7 +7222,7 @@ static void M_HandleChecklist(INT32 choice) continue; if (unlockables[j].conditionset > MAXCONDITIONSETS) continue; - if (!unlockables[j].unlocked && unlockables[j].showconditionset && !M_Achieved(unlockables[j].showconditionset)) + if (!data->unlocked[j] && unlockables[j].showconditionset && !M_Achieved(unlockables[j].showconditionset, data)) continue; if (j && unlockables[j].conditionset == unlockables[j-1].conditionset) continue; @@ -7187,13 +7248,23 @@ static void M_HandleChecklist(INT32 choice) static void M_DrawChecklist(void) { - INT32 i = check_on, j = 0, y = currentMenu->y; + gamedata_t *data = clientGamedata; + INT32 emblemCount = M_CountEmblems(data); + + INT32 i = check_on, j = 0, y = currentMenu->y, emblems = numemblems+numextraemblems; UINT32 condnum, previd, maxcond; condition_t *cond; // draw title (or big pic) M_DrawMenuTitle(); + // draw emblem counter + if (emblems > 0) + { + V_DrawString(42, 20, (emblems == emblemCount) ? V_GREENMAP : 0, va("%d/%d", emblemCount, emblems)); + V_DrawSmallScaledPatch(28, 20, 0, W_CachePatchName("EMBLICON", PU_PATCH)); + } + if (check_on) V_DrawString(10, y-(skullAnimCounter/5), V_YELLOWMAP, "\x1A"); @@ -7201,13 +7272,13 @@ static void M_DrawChecklist(void) { if (unlockables[i].name[0] == 0 //|| unlockables[i].nochecklist || !unlockables[i].conditionset || unlockables[i].conditionset > MAXCONDITIONSETS - || (!unlockables[i].unlocked && unlockables[i].showconditionset && !M_Achieved(unlockables[i].showconditionset))) + || (!data->unlocked[i] && unlockables[i].showconditionset && !M_Achieved(unlockables[i].showconditionset, data))) { i += 1; continue; } - V_DrawString(currentMenu->x, y, ((unlockables[i].unlocked) ? V_GREENMAP : V_TRANSLUCENT)|V_ALLOWLOWERCASE, ((unlockables[i].unlocked || !unlockables[i].nochecklist) ? unlockables[i].name : M_CreateSecretMenuOption(unlockables[i].name))); + V_DrawString(currentMenu->x, y, ((data->unlocked[i]) ? V_GREENMAP : V_TRANSLUCENT)|V_ALLOWLOWERCASE, ((data->unlocked[i] || !unlockables[i].nochecklist) ? unlockables[i].name : M_CreateSecretMenuOption(unlockables[i].name))); for (j = i+1; j < MAXUNLOCKABLES; j++) { @@ -7285,7 +7356,7 @@ static void M_DrawChecklist(void) if (title) { - const char *level = ((M_MapLocked(cond[condnum].requirement) || !((mapheaderinfo[cond[condnum].requirement-1]->menuflags & LF2_NOVISITNEEDED) || (mapvisited[cond[condnum].requirement-1] & MV_MAX))) ? M_CreateSecretMenuOption(title) : title); + const char *level = ((M_MapLocked(cond[condnum].requirement, data) || !((mapheaderinfo[cond[condnum].requirement-1]->menuflags & LF2_NOVISITNEEDED) || (data->mapvisited[cond[condnum].requirement-1] & MV_MAX))) ? M_CreateSecretMenuOption(title) : title); switch (cond[condnum].type) { @@ -7318,7 +7389,7 @@ static void M_DrawChecklist(void) if (title) { - const char *level = ((M_MapLocked(cond[condnum].extrainfo1) || !((mapheaderinfo[cond[condnum].extrainfo1-1]->menuflags & LF2_NOVISITNEEDED) || (mapvisited[cond[condnum].extrainfo1-1] & MV_MAX))) ? M_CreateSecretMenuOption(title) : title); + const char *level = ((M_MapLocked(cond[condnum].extrainfo1, data) || !((mapheaderinfo[cond[condnum].extrainfo1-1]->menuflags & LF2_NOVISITNEEDED) || (data->mapvisited[cond[condnum].extrainfo1-1] & MV_MAX))) ? M_CreateSecretMenuOption(title) : title); switch (cond[condnum].type) { @@ -7387,7 +7458,7 @@ static void M_DrawChecklist(void) if (title) { - const char *level = ((M_MapLocked(cond[condnum].extrainfo1) || !((mapheaderinfo[cond[condnum].extrainfo1-1]->menuflags & LF2_NOVISITNEEDED) || (mapvisited[cond[condnum].extrainfo1-1] & MV_MAX))) ? M_CreateSecretMenuOption(title) : title); + const char *level = ((M_MapLocked(cond[condnum].extrainfo1, data) || !((mapheaderinfo[cond[condnum].extrainfo1-1]->menuflags & LF2_NOVISITNEEDED) || (data->mapvisited[cond[condnum].extrainfo1-1] & MV_MAX))) ? M_CreateSecretMenuOption(title) : title); switch (cond[condnum].type) { @@ -7450,7 +7521,7 @@ static void M_DrawChecklist(void) /*V_DrawString(160, 8+(24*j), V_RETURN8, V_WordWrap(160, 292, 0, unlockables[i].objective)); - if (unlockables[i].unlocked) + if (data->unlocked[i]) V_DrawString(308, 8+(24*j), V_YELLOWMAP, "Y"); else V_DrawString(308, 8+(24*j), V_YELLOWMAP, "N");*/ @@ -7479,7 +7550,7 @@ static void M_EmblemHints(INT32 choice) (void)choice; SR_EmblemHintMenu[0].status = (local > NUMHINTS*2) ? (IT_STRING | IT_ARROWS) : (IT_DISABLED); - SR_EmblemHintMenu[1].status = (M_SecretUnlocked(SECRET_ITEMFINDER)) ? (IT_CVAR|IT_STRING) : (IT_SECRET); + SR_EmblemHintMenu[1].status = (M_SecretUnlocked(SECRET_ITEMFINDER, clientGamedata)) ? (IT_CVAR|IT_STRING) : (IT_SECRET); hintpage = 1; SR_EmblemHintDef.prevMenu = currentMenu; M_SetupNextMenu(&SR_EmblemHintDef); @@ -7539,7 +7610,7 @@ static void M_DrawEmblemHints(void) if (totalemblems >= ((hintpage-1)*(NUMHINTS*2) + 1) && totalemblems < (hintpage*NUMHINTS*2)+1){ - if (emblem->collected) + if (clientGamedata->collected[i]) { collected = V_GREENMAP; V_DrawMappedPatch(x, y+4, 0, W_CachePatchName(M_GetEmblemPatch(emblem, false), PU_PATCH), @@ -7609,6 +7680,26 @@ static void M_HandleEmblemHints(INT32 choice) } +static void M_PauseLevelSelect(INT32 choice) +{ + (void)choice; + + SP_PauseLevelSelectDef.prevMenu = currentMenu; + levellistmode = LLM_LEVELSELECT; + + // maplistoption is NOT specified, so that this + // transfers the level select list from the menu + // used to enter the game to the pause menu. + + if (!M_PrepareLevelPlatter(-1, true)) + { + M_StartMessage(M_GetText("No selectable levels found.\n"),NULL,MM_NOTHING); + return; + } + + M_SetupNextMenu(&SP_PauseLevelSelectDef); +} + /*static void M_DrawSkyRoom(void) { INT32 i, y = 0; @@ -7640,7 +7731,7 @@ static void M_HandleEmblemHints(INT32 choice) static musicdef_t *curplaying = NULL; static INT32 st_sel = 0, st_cc = 0; -static tic_t st_time = 0; +static fixed_t st_time = 0; static patch_t* st_radio[9]; static patch_t* st_launchpad[4]; @@ -7704,16 +7795,19 @@ static void M_DrawSoundTest(void) { if (cv_soundtest.value) { - frame[1] = (2-st_time); + frame[1] = (2 - (st_time >> FRACBITS)); frame[2] = ((cv_soundtest.value - 1) % 9); frame[3] += (((cv_soundtest.value - 1) / 9) % (FIRSTSUPERCOLOR - frame[3])); - if (st_time < 2) - st_time++; + if (st_time < (2 << FRACBITS)) + st_time += renderdeltatics; + if (st_time >= (2 << FRACBITS)) + st_time = 2 << FRACBITS; } } else { - if (curplaying->stoppingtics && st_time >= curplaying->stoppingtics) + fixed_t stoppingtics = (fixed_t)(curplaying->stoppingtics) << FRACBITS; + if (stoppingtics && st_time >= stoppingtics) { curplaying = NULL; st_time = 0; @@ -7724,11 +7818,11 @@ static void M_DrawSoundTest(void) angle_t ang; //bpm = FixedDiv((60*TICRATE)<= (FRACUNIT>>1)) // prevent overflow jump - takes about 15 minutes of loop on the same song to reach - st_time = (work>>FRACBITS); + if (st_time >= (FRACUNIT << (FRACBITS - 2))) // prevent overflow jump - takes about 15 minutes of loop on the same song to reach + st_time = work; work = FixedDiv(work*180, bpm); frame[0] = 8-(work/(20<= i) - st_scroll %= i; + st_scroll += renderdeltatics; - x -= st_scroll; + while (st_scroll >= (i << FRACBITS)) + st_scroll -= i << FRACBITS; + + x -= st_scroll >> FRACBITS; while (x < BASEVIDWIDTH-y) x += i; @@ -8074,7 +8170,7 @@ static void M_SecretsMenu(INT32 choice) SR_MainMenu[i].status = IT_SECRET; - if (unlockables[ul].unlocked) + if (clientGamedata->unlocked[ul]) { switch (unlockables[ul].type) { @@ -8111,6 +8207,7 @@ INT32 ultimate_selectable = false; static void M_NewGame(void) { fromlevelselect = false; + maplistoption = 0; startmap = spstage_start; CV_SetValue(&cv_newgametype, GT_COOP); // Graue 09-08-2004 @@ -8122,6 +8219,7 @@ static void M_CustomWarp(INT32 choice) { INT32 ul = skyRoomMenuTranslations[choice-1]; + maplistoption = 0; startmap = (INT16)(unlockables[ul].variable); M_SetupChoosePlayer(0); @@ -8173,7 +8271,7 @@ static void M_SinglePlayerMenu(INT32 choice) levellistmode = LLM_RECORDATTACK; if (M_GametypeHasLevels(-1)) - SP_MainMenu[sprecordattack].status = (M_SecretUnlocked(SECRET_RECORDATTACK)) ? IT_CALL|IT_STRING : IT_SECRET; + SP_MainMenu[sprecordattack].status = (M_SecretUnlocked(SECRET_RECORDATTACK, clientGamedata)) ? IT_CALL|IT_STRING : IT_SECRET; else // If Record Attack is nonexistent in the current add-on... { SP_MainMenu[sprecordattack].status = IT_NOTHING|IT_DISABLED; // ...hide and disable the Record Attack option... @@ -8183,7 +8281,7 @@ static void M_SinglePlayerMenu(INT32 choice) levellistmode = LLM_NIGHTSATTACK; if (M_GametypeHasLevels(-1)) - SP_MainMenu[spnightsmode].status = (M_SecretUnlocked(SECRET_NIGHTSMODE)) ? IT_CALL|IT_STRING : IT_SECRET; + SP_MainMenu[spnightsmode].status = (M_SecretUnlocked(SECRET_NIGHTSMODE, clientGamedata)) ? IT_CALL|IT_STRING : IT_SECRET; else // If NiGHTS Mode is nonexistent in the current add-on... { SP_MainMenu[spnightsmode].status = IT_NOTHING|IT_DISABLED; // ...hide and disable the NiGHTS Mode option... @@ -8206,7 +8304,7 @@ static void M_SinglePlayerMenu(INT32 choice) SP_MainMenu[spnightsmode] .alphaKey += 8; } else // Otherwise, if Marathon Run is allowed and Record Attack is unlocked, unlock Marathon Run! - SP_MainMenu[spmarathon].status = (M_SecretUnlocked(SECRET_RECORDATTACK)) ? IT_CALL|IT_STRING|IT_CALL_NOTMODIFIED : IT_SECRET; + SP_MainMenu[spmarathon].status = (M_SecretUnlocked(SECRET_RECORDATTACK, clientGamedata)) ? IT_CALL|IT_STRING|IT_CALL_NOTMODIFIED : IT_SECRET; if (tutorialmap) // If there's a tutorial available in the current add-on... @@ -8314,6 +8412,7 @@ static void M_StartTutorial(INT32 choice) M_ClearMenus(true); gamecomplete = 0; cursaveslot = 0; + maplistoption = 0; G_DeferedInitNew(false, G_BuildMapName(tutorialmap), 0, false, false); } @@ -8322,8 +8421,8 @@ static void M_StartTutorial(INT32 choice) // ============== static INT32 saveSlotSelected = 1; -static INT32 loadgamescroll = 0; -static UINT8 loadgameoffset = 0; +static fixed_t loadgamescroll = 0; +static fixed_t loadgameoffset = 0; static void M_CacheLoadGameData(void) { @@ -8348,14 +8447,14 @@ static void M_DrawLoadGameData(void) { prev_i = i; savetodraw = (saveSlotSelected + i + numsaves)%numsaves; - x = (BASEVIDWIDTH/2 - 42 + loadgamescroll) + (i*hsep); + x = (BASEVIDWIDTH/2 - 42 + FixedInt(loadgamescroll)) + (i*hsep); y = 33 + 9; { INT32 diff = x - (BASEVIDWIDTH/2 - 42); if (diff < 0) diff = -diff; - diff = (42 - diff)/3 - loadgameoffset; + diff = (42 - diff)/3 - FixedInt(loadgameoffset); if (diff < 0) diff = 0; y -= diff; @@ -8386,7 +8485,7 @@ static void M_DrawLoadGameData(void) savetodraw--; - if (savegameinfo[savetodraw].lives > 0) + if (savegameinfo[savetodraw].lives != 0) charskin = &skins[savegameinfo[savetodraw].skinnum]; // signpost background @@ -8640,18 +8739,33 @@ skiplife: static void M_DrawLoad(void) { M_DrawMenuTitle(); + fixed_t scrollfrac = FixedDiv(2, 3); - if (loadgamescroll > 1 || loadgamescroll < -1) - loadgamescroll = 2*loadgamescroll/3; + if (loadgamescroll > FRACUNIT || loadgamescroll < -FRACUNIT) + { + fixed_t newscroll = FixedMul(loadgamescroll, scrollfrac); + fixed_t deltascroll = FixedMul(newscroll - loadgamescroll, renderdeltatics); + loadgamescroll += deltascroll; + } else loadgamescroll = 0; - if (loadgameoffset > 1) - loadgameoffset = 2*loadgameoffset/3; + if (loadgameoffset > FRACUNIT) + { + fixed_t newoffs = FixedMul(loadgameoffset, scrollfrac); + fixed_t deltaoffs = FixedMul(newoffs - loadgameoffset, renderdeltatics); + loadgameoffset += deltaoffs; + } else loadgameoffset = 0; M_DrawLoadGameData(); + + if (usedCheats) + { + V_DrawCenteredThinString(BASEVIDWIDTH/2, 184, 0, "\x85WARNING:\x80 Cheats have been activated."); + V_DrawCenteredThinString(BASEVIDWIDTH/2, 192, 0, "Progress will not be saved."); + } } // @@ -8661,6 +8775,10 @@ static void M_LoadSelect(INT32 choice) { (void)choice; + // Reset here, if we want a level select + // M_LoadGameLevelSelect will set it for us. + maplistoption = 0; + if (saveSlotSelected == NOSAVESLOT) //last slot is play without saving { M_NewGame(); @@ -8732,12 +8850,12 @@ static void M_ReadSavegameInfo(UINT32 slot) if(!mapheaderinfo[(fake-1) & 8191]) savegameinfo[slot].levelname[0] = '\0'; + else if (V_ThinStringWidth(mapheaderinfo[(fake-1) & 8191]->lvlttl, 0) <= 78) + strlcpy(savegameinfo[slot].levelname, mapheaderinfo[(fake-1) & 8191]->lvlttl, 22); else { - strlcpy(savegameinfo[slot].levelname, mapheaderinfo[(fake-1) & 8191]->lvlttl, 17+1); - - if (strlen(mapheaderinfo[(fake-1) & 8191]->lvlttl) >= 17) - strcpy(savegameinfo[slot].levelname+17-3, "..."); + strlcpy(savegameinfo[slot].levelname, mapheaderinfo[(fake-1) & 8191]->lvlttl, 15); + strcat(savegameinfo[slot].levelname, "..."); } savegameinfo[slot].gamemap = fake; @@ -8850,7 +8968,7 @@ static void M_ReadSaveStrings(void) UINT8 lastseen = 0; loadgamescroll = 0; - loadgameoffset = 14; + loadgameoffset = 14 * FRACUNIT; for (i = 1; (i < MAXSAVEGAMES); i++) // slot 0 is no save { @@ -8941,7 +9059,7 @@ static void M_HandleLoadSave(INT32 choice) ++saveSlotSelected; if (saveSlotSelected >= numsaves) saveSlotSelected -= numsaves; - loadgamescroll = 90; + loadgamescroll = 90 * FRACUNIT; break; case KEY_LEFTARROW: @@ -8949,21 +9067,21 @@ static void M_HandleLoadSave(INT32 choice) --saveSlotSelected; if (saveSlotSelected < 0) saveSlotSelected += numsaves; - loadgamescroll = -90; + loadgamescroll = -90 * FRACUNIT; break; case KEY_ENTER: - if (ultimate_selectable && saveSlotSelected == NOSAVESLOT) + if (ultimate_selectable && saveSlotSelected == NOSAVESLOT && !savemoddata) { loadgamescroll = 0; S_StartSound(NULL, sfx_skid); M_StartMessage("Are you sure you want to play\n\x85ultimate mode\x80? It isn't remotely fair,\nand you don't even get an emblem for it.\n\n(Press 'Y' to confirm)\n",M_SaveGameUltimateResponse,MM_YESNO); } - else if (saveSlotSelected != NOSAVESLOT && savegameinfo[saveSlotSelected-1].lives == -42 && !(!modifiedgame || savemoddata)) + else if (saveSlotSelected != NOSAVESLOT && savegameinfo[saveSlotSelected-1].lives == -42 && usedCheats) { loadgamescroll = 0; S_StartSound(NULL, sfx_skid); - M_StartMessage(M_GetText("This cannot be done in a modified game.\n\n(Press a key)\n"), NULL, MM_NOTHING); + M_StartMessage(M_GetText("This cannot be done in a cheated game.\n\n(Press a key)\n"), NULL, MM_NOTHING); } else if (saveSlotSelected == NOSAVESLOT || savegameinfo[saveSlotSelected-1].lives != -666) // don't allow loading of "bad saves" { @@ -8974,7 +9092,7 @@ static void M_HandleLoadSave(INT32 choice) else if (!loadgameoffset) { S_StartSound(NULL, sfx_lose); - loadgameoffset = 14; + loadgameoffset = 14 * FRACUNIT; } break; @@ -9000,7 +9118,7 @@ static void M_HandleLoadSave(INT32 choice) } else S_StartSound(NULL, sfx_lose); - loadgameoffset = 14; + loadgameoffset = 14 * FRACUNIT; } break; } @@ -9046,7 +9164,7 @@ static void M_LoadGame(INT32 choice) if (tutorialmap && cv_tutorialprompt.value) { - M_StartMessage("Do you want to \x82play a brief Tutorial\x80?\n\nWe highly recommend this because \nthe controls are slightly different \nfrom other games.\n\nPress 'Y' or 'Enter' to go\nPress 'N' or any key to skip\n", + M_StartMessage("Do you want to \x82play a brief Tutorial\x80?\n\nWe highly recommend this because \nthe controls are slightly different \nfrom other games.\n\nPress the\x82 Y\x80 key or the\x83 A button\x80 to go\nPress the\x82 N\x80 key or the\x83 Y button\x80 to skip\n", M_FirstTimeResponse, MM_YESNO); return; } @@ -9060,13 +9178,13 @@ static void M_LoadGame(INT32 choice) // void M_ForceSaveSlotSelected(INT32 sslot) { - loadgameoffset = 14; + loadgameoffset = 14 * FRACUNIT; // Already there? Whatever, then! if (sslot == saveSlotSelected) return; - loadgamescroll = 90; + loadgamescroll = 90 * FRACUNIT; if (saveSlotSelected <= numsaves/2) loadgamescroll = -loadgamescroll; @@ -9310,8 +9428,8 @@ static void M_DrawSetupChoosePlayerMenu(void) INT32 x, y; INT32 w = (vid.width/vid.dupx); - if (abs(char_scroll) > FRACUNIT) - char_scroll -= (char_scroll>>2); + if (abs(char_scroll) > FRACUNIT/4) + char_scroll -= FixedMul((char_scroll>>2), renderdeltatics); else // close enough. char_scroll = 0; // just be exact now. @@ -9339,7 +9457,7 @@ static void M_DrawSetupChoosePlayerMenu(void) // Don't render the title map hidetitlemap = true; - charseltimer++; + charseltimer += renderdeltatics; // Background and borders V_DrawFill(0, 0, bgwidth, vid.height, V_SNAPTOTOP|colormap[101]); @@ -9351,7 +9469,7 @@ static void M_DrawSetupChoosePlayerMenu(void) V_DrawFill(0, 0, bw, vid.height, V_NOSCALESTART|col); } - y = (charseltimer%32); + y = (charseltimer / FRACUNIT) % 32; V_DrawMappedPatch(0, y-bgheight, V_SNAPTOTOP, charbg, colormap); V_DrawMappedPatch(0, y, V_SNAPTOTOP, charbg, colormap); V_DrawMappedPatch(0, y+bgheight, V_SNAPTOTOP, charbg, colormap); @@ -9568,7 +9686,7 @@ static void M_Statistics(INT32 choice) if (!(mapheaderinfo[i]->typeoflevel & TOL_SP) || (mapheaderinfo[i]->menuflags & LF2_HIDEINSTATS)) continue; - if (!(mapvisited[i] & MV_MAX)) + if (!(clientGamedata->mapvisited[i] & MV_MAX)) continue; statsMapList[j++] = i; @@ -9585,6 +9703,7 @@ static void M_Statistics(INT32 choice) static void M_DrawStatsMaps(int location) { + gamedata_t *data = clientGamedata; INT32 y = 80, i = -1; INT16 mnum; extraemblem_t *exemblem; @@ -9609,7 +9728,7 @@ static void M_DrawStatsMaps(int location) } mnum = statsMapList[i]; - M_DrawMapEmblems(mnum+1, 292, y); + M_DrawMapEmblems(mnum+1, 292, y, false); if (mapheaderinfo[mnum]->actnum != 0) V_DrawString(20, y, V_YELLOWMAP|V_ALLOWLOWERCASE, va("%s %d", mapheaderinfo[mnum]->lvlttl, mapheaderinfo[mnum]->actnum)); @@ -9652,14 +9771,14 @@ static void M_DrawStatsMaps(int location) { exemblem = &extraemblems[i]; - if (exemblem->collected) + if (data->extraCollected[i]) V_DrawSmallMappedPatch(292, y, 0, W_CachePatchName(M_GetExtraEmblemPatch(exemblem, false), PU_PATCH), R_GetTranslationColormap(TC_DEFAULT, M_GetExtraEmblemColor(exemblem), GTC_CACHE)); else V_DrawSmallScaledPatch(292, y, 0, W_CachePatchName("NEEDIT", PU_PATCH)); V_DrawString(20, y, V_YELLOWMAP|V_ALLOWLOWERCASE, - (!exemblem->collected && exemblem->showconditionset && !M_Achieved(exemblem->showconditionset)) + (!data->extraCollected[i] && exemblem->showconditionset && !M_Achieved(exemblem->showconditionset, data)) ? M_CreateSecretMenuOption(exemblem->description) : exemblem->description); } @@ -9676,6 +9795,7 @@ bottomarrow: static void M_DrawLevelStats(void) { + gamedata_t *data = clientGamedata; char beststr[40]; tic_t besttime = 0; @@ -9690,9 +9810,9 @@ static void M_DrawLevelStats(void) V_DrawString(20, 24, V_YELLOWMAP, "Total Play Time:"); V_DrawCenteredString(BASEVIDWIDTH/2, 32, 0, va("%i hours, %i minutes, %i seconds", - G_TicsToHours(totalplaytime), - G_TicsToMinutes(totalplaytime, false), - G_TicsToSeconds(totalplaytime))); + G_TicsToHours(data->totalplaytime), + G_TicsToMinutes(data->totalplaytime, false), + G_TicsToSeconds(data->totalplaytime))); for (i = 0; i < NUMMAPS; i++) { @@ -9701,25 +9821,25 @@ static void M_DrawLevelStats(void) if (!mapheaderinfo[i] || !(mapheaderinfo[i]->menuflags & LF2_RECORDATTACK)) continue; - if (!mainrecords[i]) + if (!data->mainrecords[i]) { mapsunfinished++; bestunfinished[0] = bestunfinished[1] = bestunfinished[2] = true; continue; } - if (mainrecords[i]->score > 0) - bestscore += mainrecords[i]->score; + if (data->mainrecords[i]->score > 0) + bestscore += data->mainrecords[i]->score; else mapunfinished = bestunfinished[0] = true; - if (mainrecords[i]->time > 0) - besttime += mainrecords[i]->time; + if (data->mainrecords[i]->time > 0) + besttime += data->mainrecords[i]->time; else mapunfinished = bestunfinished[1] = true; - if (mainrecords[i]->rings > 0) - bestrings += mainrecords[i]->rings; + if (data->mainrecords[i]->rings > 0) + bestrings += data->mainrecords[i]->rings; else mapunfinished = bestunfinished[2] = true; @@ -9734,7 +9854,7 @@ static void M_DrawLevelStats(void) else V_DrawString(20, 56, V_GREENMAP, "(complete)"); - V_DrawString(36, 64, 0, va("x %d/%d", M_CountEmblems(), numemblems+numextraemblems)); + V_DrawString(36, 64, 0, va("x %d/%d", M_CountEmblems(data), numemblems+numextraemblems)); V_DrawSmallScaledPatch(20, 64, 0, W_CachePatchName("EMBLICON", PU_PATCH)); sprintf(beststr, "%u", bestscore); @@ -9801,6 +9921,7 @@ static void M_HandleLevelStats(INT32 choice) // Drawing function for Time Attack void M_DrawTimeAttackMenu(void) { + gamedata_t *data = clientGamedata; INT32 i, x, y, empatx, empaty, cursory = 0; UINT16 dispstatus; patch_t *PictureOfUrFace; // my WHAT @@ -9817,7 +9938,7 @@ void M_DrawTimeAttackMenu(void) V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, curbgcolor); else if (!curbghide || !titlemapinaction) { - F_SkyScroll(curbgxspeed, curbgyspeed, curbgname); + F_SkyScroll(curbgname); // Draw and animate foreground if (!strncmp("RECATKBG", curbgname, 8)) M_DrawRecordAttackForeground(); @@ -9959,7 +10080,7 @@ void M_DrawTimeAttackMenu(void) empatx = empatch->leftoffset / 2; empaty = empatch->topoffset / 2; - if (em->collected) + if (data->collected[em - emblemlocations]) V_DrawSmallMappedPatch(104+76+empatx, yHeight+lsheadingheight/2+empaty, 0, empatch, R_GetTranslationColormap(TC_DEFAULT, M_GetEmblemColor(em), GTC_CACHE)); else @@ -9969,34 +10090,37 @@ void M_DrawTimeAttackMenu(void) em = M_GetLevelEmblems(-1); } - if (!mainrecords[cv_nextmap.value-1] || !mainrecords[cv_nextmap.value-1]->score) + // Draw in-level emblems. + M_DrawMapEmblems(cv_nextmap.value, 288, 28, true); + + if (!data->mainrecords[cv_nextmap.value-1] || !data->mainrecords[cv_nextmap.value-1]->score) sprintf(beststr, "(none)"); else - sprintf(beststr, "%u", mainrecords[cv_nextmap.value-1]->score); + sprintf(beststr, "%u", data->mainrecords[cv_nextmap.value-1]->score); V_DrawString(104-72, 33+lsheadingheight/2, V_YELLOWMAP, "SCORE:"); V_DrawRightAlignedString(104+64, 33+lsheadingheight/2, V_ALLOWLOWERCASE, beststr); V_DrawRightAlignedString(104+72, 43+lsheadingheight/2, V_ALLOWLOWERCASE, reqscore); - if (!mainrecords[cv_nextmap.value-1] || !mainrecords[cv_nextmap.value-1]->time) + if (!data->mainrecords[cv_nextmap.value-1] || !data->mainrecords[cv_nextmap.value-1]->time) sprintf(beststr, "(none)"); else - sprintf(beststr, "%i:%02i.%02i", G_TicsToMinutes(mainrecords[cv_nextmap.value-1]->time, true), - G_TicsToSeconds(mainrecords[cv_nextmap.value-1]->time), - G_TicsToCentiseconds(mainrecords[cv_nextmap.value-1]->time)); + sprintf(beststr, "%i:%02i.%02i", G_TicsToMinutes(data->mainrecords[cv_nextmap.value-1]->time, true), + G_TicsToSeconds(data->mainrecords[cv_nextmap.value-1]->time), + G_TicsToCentiseconds(data->mainrecords[cv_nextmap.value-1]->time)); V_DrawString(104-72, 53+lsheadingheight/2, V_YELLOWMAP, "TIME:"); V_DrawRightAlignedString(104+64, 53+lsheadingheight/2, V_ALLOWLOWERCASE, beststr); V_DrawRightAlignedString(104+72, 63+lsheadingheight/2, V_ALLOWLOWERCASE, reqtime); - if (!mainrecords[cv_nextmap.value-1] || !mainrecords[cv_nextmap.value-1]->rings) + if (!data->mainrecords[cv_nextmap.value-1] || !data->mainrecords[cv_nextmap.value-1]->rings) sprintf(beststr, "(none)"); else - sprintf(beststr, "%hu", mainrecords[cv_nextmap.value-1]->rings); + sprintf(beststr, "%hu", data->mainrecords[cv_nextmap.value-1]->rings); V_DrawString(104-72, 73+lsheadingheight/2, V_YELLOWMAP, "RINGS:"); - V_DrawRightAlignedString(104+64, 73+lsheadingheight/2, V_ALLOWLOWERCASE|((mapvisited[cv_nextmap.value-1] & MV_PERFECTRA) ? V_YELLOWMAP : 0), beststr); + V_DrawRightAlignedString(104+64, 73+lsheadingheight/2, V_ALLOWLOWERCASE|((data->mapvisited[cv_nextmap.value-1] & MV_PERFECTRA) ? V_YELLOWMAP : 0), beststr); V_DrawRightAlignedString(104+72, 83+lsheadingheight/2, V_ALLOWLOWERCASE, reqrings); } @@ -10090,6 +10214,7 @@ static void M_TimeAttack(INT32 choice) // Drawing function for Nights Attack void M_DrawNightsAttackMenu(void) { + gamedata_t *data = clientGamedata; INT32 i, x, y, cursory = 0; UINT16 dispstatus; @@ -10156,10 +10281,10 @@ void M_DrawNightsAttackMenu(void) lumpnum_t lumpnum; char beststr[40]; - //UINT8 bestoverall = G_GetBestNightsGrade(cv_nextmap.value, 0); - UINT8 bestgrade = G_GetBestNightsGrade(cv_nextmap.value, cv_dummymares.value); - UINT32 bestscore = G_GetBestNightsScore(cv_nextmap.value, cv_dummymares.value); - tic_t besttime = G_GetBestNightsTime(cv_nextmap.value, cv_dummymares.value); + //UINT8 bestoverall = G_GetBestNightsGrade(cv_nextmap.value, 0, data); + UINT8 bestgrade = G_GetBestNightsGrade(cv_nextmap.value, cv_dummymares.value, data); + UINT32 bestscore = G_GetBestNightsScore(cv_nextmap.value, cv_dummymares.value, data); + tic_t besttime = G_GetBestNightsTime(cv_nextmap.value, cv_dummymares.value, data); M_DrawLevelPlatterHeader(32-lsheadingheight/2, cv_nextmap.string, true, false); @@ -10240,7 +10365,7 @@ void M_DrawNightsAttackMenu(void) goto skipThisOne; } - if (em->collected) + if (data->collected[em - emblemlocations]) V_DrawSmallMappedPatch(xpos, yHeight+lsheadingheight/2, 0, W_CachePatchName(M_GetEmblemPatch(em, false), PU_PATCH), R_GetTranslationColormap(TC_DEFAULT, M_GetEmblemColor(em), GTC_CACHE)); else @@ -10249,6 +10374,9 @@ void M_DrawNightsAttackMenu(void) skipThisOne: em = M_GetLevelEmblems(-1); } + + // Draw in-level emblems. + M_DrawMapEmblems(cv_nextmap.value, 288, 28, true); } } @@ -10591,6 +10719,7 @@ static void M_Marathon(INT32 choice) } fromlevelselect = false; + maplistoption = 0; startmap = spmarathon_start; CV_SetValue(&cv_newgametype, GT_COOP); // Graue 09-08-2004 @@ -10618,7 +10747,7 @@ static void M_Marathon(INT32 choice) titlemapinaction = TITLEMAP_OFF; // Nope don't give us HOMs please M_SetupNextMenu(&SP_MarathonDef); itemOn = marathonstart; // "Start" is selected. - recatkdrawtimer = 50-8; + recatkdrawtimer = (50-8) * FRACUNIT; char_scroll = 0; } @@ -10699,13 +10828,16 @@ void M_DrawMarathon(void) x = (((BASEVIDWIDTH-82)/2)+11)<>ANGLETOFINESHIFT) & FINEMASK; y -= (10*FINECOSINE(fa)); - recatkdrawtimer++; + if (renderisnewtic) + { + recatkdrawtimer += FRACUNIT; + } - soffset = cnt = (recatkdrawtimer%50); + soffset = cnt = ((recatkdrawtimer >> FRACBITS) % 50); if (!useBlackRock) { if (cnt > 8) @@ -10744,7 +10876,7 @@ void M_DrawMarathon(void) } w = char_scroll + (((8-cnt)*(8-cnt))<<(FRACBITS-5)); - if (soffset == 50-1) + if (soffset == 50-1 && renderisnewtic) w += FRACUNIT/2; { @@ -10799,11 +10931,11 @@ void M_DrawMarathon(void) if (!soffset) { - char_scroll += (360<= 360< (10*TICRATE)) - recatkdrawtimer -= (10*TICRATE); + if (recatkdrawtimer > ((10 << FRACBITS) * TICRATE)) + recatkdrawtimer -= ((10 << FRACBITS) * TICRATE); } M_DrawMenuTitle(); @@ -11015,7 +11147,7 @@ static INT32 menuRoomIndex = 0; static void M_DrawRoomMenu(void) { - static int frame = -12; + static fixed_t frame = -(12 << FRACBITS); int dot_frame; char text[4]; @@ -11026,7 +11158,7 @@ static void M_DrawRoomMenu(void) if (m_waiting_mode) { - dot_frame = frame / 4; + dot_frame = (int)(frame >> FRACBITS) / 4; dots = dot_frame + 3; strcpy(text, " "); @@ -11039,8 +11171,9 @@ static void M_DrawRoomMenu(void) strncpy(&text[dot_frame], "...", min(dots, 3 - dot_frame)); } - if (++frame == 12) - frame = -12; + frame += renderdeltatics; + while (frame >= (12 << FRACBITS)) + frame -= 12 << FRACBITS; currentMenu->menuitems[0].text = text; } @@ -11572,9 +11705,7 @@ static void M_ServerOptions(INT32 choice) OP_ServerOptionsMenu[ 2].status = IT_STRING | IT_CVAR; OP_ServerOptionsMenu[ 3].status = IT_STRING | IT_CVAR; OP_ServerOptionsMenu[ 4].status = IT_STRING | IT_CVAR; - OP_ServerOptionsMenu[36].status = (netgame - ? IT_GRAYEDOUT - : (IT_STRING | IT_CVAR | IT_CV_STRING)); + OP_ServerOptionsMenu[36].status = IT_STRING | IT_CVAR | IT_CV_STRING; OP_ServerOptionsMenu[37].status = IT_STRING | IT_CVAR; OP_ServerOptionsMenu[38].status = IT_STRING | IT_CVAR; } @@ -11605,7 +11736,67 @@ static void M_StartServerMenu(INT32 choice) // CONNECT VIA IP // ============== -static char setupm_ip[28]; +#define CONNIP_LEN 128 +static char setupm_ip[CONNIP_LEN]; +#define DOTS "... " + +static void M_DrawConnectIP(void) +{ + INT32 x = currentMenu->x; + INT32 y = currentMenu->y + 22; + + const INT32 boxwidth = /*16*8 + 6*/ (BASEVIDWIDTH - 2*(x+5)); + const INT32 maxstrwidth = boxwidth - 5; + char *drawnstr = malloc(sizeof(setupm_ip)); + char *drawnstr_orig = drawnstr; + boolean drawthin, shorten = false; + + V_DrawFill(x+5, y+4+5, boxwidth, 8+6, 159); + + strcpy(drawnstr, setupm_ip); + drawthin = V_StringWidth(drawnstr, V_ALLOWLOWERCASE) + V_StringWidth("_", V_ALLOWLOWERCASE) > maxstrwidth; + + // draw name string + if (drawthin) + { + INT32 dotswidth = V_ThinStringWidth(DOTS, V_ALLOWLOWERCASE); + //UINT32 color = 0; + while (V_ThinStringWidth(drawnstr, V_ALLOWLOWERCASE) + V_ThinStringWidth("_", V_ALLOWLOWERCASE) >= maxstrwidth) + { + shorten = true; + drawnstr++; + } + + if (shorten) + { + INT32 initiallen = V_ThinStringWidth(drawnstr, V_ALLOWLOWERCASE); + INT32 cutofflen = 0; + while ((cutofflen = initiallen - V_ThinStringWidth(drawnstr, V_ALLOWLOWERCASE)) < dotswidth) + drawnstr++; + + V_DrawThinString(x+8,y+13, V_ALLOWLOWERCASE|V_GRAYMAP, DOTS); + x += V_ThinStringWidth(DOTS, V_ALLOWLOWERCASE); + } + + V_DrawThinString(x+8,y+13, V_ALLOWLOWERCASE, drawnstr); + } + else + { + V_DrawString(x+8,y+12, V_ALLOWLOWERCASE, drawnstr); + } + + // draw text cursor for name + if (itemOn == 2 //0 + && skullAnimCounter < 4) //blink cursor + { + if (drawthin) + V_DrawCharacter(x+8+V_ThinStringWidth(drawnstr, V_ALLOWLOWERCASE),y+12,'_',false); + else + V_DrawCharacter(x+8+V_StringWidth(drawnstr, V_ALLOWLOWERCASE),y+12,'_',false); + } + + free(drawnstr_orig); +} // Draw the funky Connect IP menu. Tails 11-19-2002 // So much work for such a little thing! @@ -11626,19 +11817,11 @@ static void M_DrawMPMainMenu(void) V_DrawRightAlignedString(BASEVIDWIDTH-x, y+116, ((itemOn == 8) ? V_YELLOWMAP : 0), "(splitscreen)"); - y += 22; - - V_DrawFill(x+5, y+4+5, /*16*8 + 6,*/ BASEVIDWIDTH - 2*(x+5), 8+6, 159); - - // draw name string - V_DrawString(x+8,y+12, V_ALLOWLOWERCASE, setupm_ip); - - // draw text cursor for name - if (itemOn == 2 //0 - && skullAnimCounter < 4) //blink cursor - V_DrawCharacter(x+8+V_StringWidth(setupm_ip, V_ALLOWLOWERCASE),y+12,'_',false); + M_DrawConnectIP(); } +#undef DOTS + // Tails 11-19-2002 static void M_ConnectIP(INT32 choice) { @@ -11719,7 +11902,7 @@ static void M_HandleConnectIP(INT32 choice) const char *paste = I_ClipboardPaste(); if (paste != NULL) { - strncat(setupm_ip, paste, 28-1 - l); // Concat the ip field with clipboard + strncat(setupm_ip, paste, CONNIP_LEN-1 - l); // Concat the ip field with clipboard if (strlen(paste) != 0) // Don't play sound if nothing was pasted S_StartSound(NULL,sfx_menu1); // Tails } @@ -11753,7 +11936,7 @@ static void M_HandleConnectIP(INT32 choice) const char *paste = I_ClipboardPaste(); if (paste != NULL) { - strncat(setupm_ip, paste, 28-1 - l); // Concat the ip field with clipboard + strncat(setupm_ip, paste, CONNIP_LEN-1 - l); // Concat the ip field with clipboard if (strlen(paste) != 0) // Don't play sound if nothing was pasted S_StartSound(NULL,sfx_menu1); // Tails } @@ -11770,11 +11953,15 @@ static void M_HandleConnectIP(INT32 choice) } } - if (l >= 28-1) + if (l >= CONNIP_LEN-1) break; // Rudimentary number and period enforcing - also allows letters so hostnames can be used instead - if ((choice >= '-' && choice <= ':') || (choice >= 'A' && choice <= 'Z') || (choice >= 'a' && choice <= 'z')) + // and square brackets for RFC 2732 IPv6 addresses + if ((choice >= '-' && choice <= ':') || + (choice == '[' || choice == ']') || + (choice >= 'A' && choice <= 'Z') || + (choice >= 'a' && choice <= 'z')) { S_StartSound(NULL,sfx_menu1); // Tails setupm_ip[l] = (char)choice; @@ -11808,7 +11995,7 @@ static void M_HandleConnectIP(INT32 choice) // ======================== // Tails 03-02-2002 -static UINT8 multi_tics; +static fixed_t multi_tics; static UINT8 multi_frame; static UINT8 multi_spr2; @@ -11876,10 +12063,11 @@ static void M_DrawSetupMultiPlayerMenu(void) y += 11; // anim the player in the box - if (--multi_tics <= 0) + multi_tics -= renderdeltatics; + while (multi_tics <= 0) { multi_frame++; - multi_tics = 4; + multi_tics += 4*FRACUNIT; } #define charw 74 @@ -12150,7 +12338,7 @@ static void M_SetupMultiPlayer(INT32 choice) (void)choice; multi_frame = 0; - multi_tics = 4; + multi_tics = 4*FRACUNIT; strcpy(setupm_name, cv_playername.string); // set for player 1 @@ -12194,7 +12382,7 @@ static void M_SetupMultiPlayer2(INT32 choice) (void)choice; multi_frame = 0; - multi_tics = 4; + multi_tics = 4*FRACUNIT; strcpy (setupm_name, cv_playername2.string); // set for splitscreen secondary player @@ -12431,12 +12619,12 @@ static void M_EraseDataResponse(INT32 ch) // Delete the data if (erasecontext != 1) - G_ClearRecords(); + G_ClearRecords(clientGamedata); if (erasecontext != 0) - M_ClearSecrets(); + M_ClearSecrets(clientGamedata); if (erasecontext == 2) { - totalplaytime = 0; + clientGamedata->totalplaytime = 0; F_StartIntro(); } BwehHehHe(); @@ -12686,13 +12874,14 @@ static void M_Setup1PControlsMenu(INT32 choice) OP_ChangeControlsMenu[18+5].status = IT_CALL|IT_STRING2; OP_ChangeControlsMenu[18+6].status = IT_CALL|IT_STRING2; //OP_ChangeControlsMenu[18+7].status = IT_CALL|IT_STRING2; - OP_ChangeControlsMenu[18+8].status = IT_CALL|IT_STRING2; + //OP_ChangeControlsMenu[18+8].status = IT_CALL|IT_STRING2; + OP_ChangeControlsMenu[18+9].status = IT_CALL|IT_STRING2; // ... - OP_ChangeControlsMenu[27+0].status = IT_HEADER; - OP_ChangeControlsMenu[27+1].status = IT_SPACE; + OP_ChangeControlsMenu[28+0].status = IT_HEADER; + OP_ChangeControlsMenu[28+1].status = IT_SPACE; // ... - OP_ChangeControlsMenu[27+2].status = IT_CALL|IT_STRING2; - OP_ChangeControlsMenu[27+3].status = IT_CALL|IT_STRING2; + OP_ChangeControlsMenu[28+2].status = IT_CALL|IT_STRING2; + OP_ChangeControlsMenu[28+3].status = IT_CALL|IT_STRING2; OP_ChangeControlsDef.prevMenu = &OP_P1ControlsDef; OP_ChangeControlsDef.menuid &= ~(((1 << MENUBITS) - 1) << MENUBITS); // remove second level @@ -12717,13 +12906,14 @@ static void M_Setup2PControlsMenu(INT32 choice) OP_ChangeControlsMenu[18+5].status = IT_GRAYEDOUT2; OP_ChangeControlsMenu[18+6].status = IT_GRAYEDOUT2; //OP_ChangeControlsMenu[18+7].status = IT_GRAYEDOUT2; - OP_ChangeControlsMenu[18+8].status = IT_GRAYEDOUT2; + //OP_ChangeControlsMenu[18+8].status = IT_GRAYEDOUT2; + OP_ChangeControlsMenu[18+9].status = IT_GRAYEDOUT2; // ... - OP_ChangeControlsMenu[27+0].status = IT_GRAYEDOUT2; - OP_ChangeControlsMenu[27+1].status = IT_GRAYEDOUT2; + OP_ChangeControlsMenu[28+0].status = IT_GRAYEDOUT2; + OP_ChangeControlsMenu[28+1].status = IT_GRAYEDOUT2; // ... - OP_ChangeControlsMenu[27+2].status = IT_GRAYEDOUT2; - OP_ChangeControlsMenu[27+3].status = IT_GRAYEDOUT2; + OP_ChangeControlsMenu[28+2].status = IT_GRAYEDOUT2; + OP_ChangeControlsMenu[28+3].status = IT_GRAYEDOUT2; OP_ChangeControlsDef.prevMenu = &OP_P2ControlsDef; OP_ChangeControlsDef.menuid &= ~(((1 << MENUBITS) - 1) << MENUBITS); // remove second level @@ -12826,13 +13016,13 @@ static void M_DrawControl(void) else { if (keys[0] != KEY_NULL) - strcat (tmp, G_KeynumToString (keys[0])); + strcat (tmp, G_KeyNumToName (keys[0])); if (keys[0] != KEY_NULL && keys[1] != KEY_NULL) strcat(tmp," or "); if (keys[1] != KEY_NULL) - strcat (tmp, G_KeynumToString (keys[1])); + strcat (tmp, G_KeyNumToName (keys[1])); } @@ -12859,7 +13049,7 @@ static void M_ChangecontrolResponse(event_t *ev) { INT32 control; INT32 found; - INT32 ch = ev->data1; + INT32 ch = ev->key; // ESCAPE cancels; dummy out PAUSE if (ch != KEY_ESCAPE && ch != KEY_PAUSE) @@ -12878,7 +13068,7 @@ static void M_ChangecontrolResponse(event_t *ev) // keypad arrows are converted for the menu in cursor arrows // so use the event instead of ch case ev_keydown: - ch = ev->data1; + ch = ev->key; break; default: @@ -12929,7 +13119,7 @@ static void M_ChangecontrolResponse(event_t *ev) static char tmp[158]; menu_t *prev = currentMenu->prevMenu; - if (controltochange == gc_pause) + if (controltochange == GC_PAUSE) sprintf(tmp, M_GetText("The \x82Pause Key \x80is enabled, but \nit cannot be used to retry runs \nduring Record Attack. \n\nHit another key for\n%s\nESC for Cancel"), controltochangetext); else @@ -12994,6 +13184,7 @@ static void M_DrawPlaystyleMenu(void) if (i == playstyle_currentchoice) { + V_DrawFill(20, 40, 280, 150, 159); V_DrawScaledPatch((i+1)*BASEVIDWIDTH/4 - 8, 10, 0, W_CachePatchName("M_CURSOR", PU_CACHE)); V_DrawString(30, 50, V_ALLOWLOWERCASE, PlaystyleDesc[i]); } @@ -13509,7 +13700,7 @@ void M_QuitResponse(INT32 ch) if (ch != 'y' && ch != KEY_ENTER) return; - LUAh_GameQuit(true); + LUA_HookBool(true, HOOK(GameQuit)); if (!(netgame || cv_debug)) { S_ResetCaptions(); @@ -13524,7 +13715,8 @@ void M_QuitResponse(INT32 ch) { V_DrawScaledPatch(0, 0, 0, W_CachePatchName("GAMEQUIT", PU_PATCH)); // Demo 3 Quit Screen Tails 06-16-2001 I_FinishUpdate(); // Update the screen with the image Tails 06-19-2001 - I_Sleep(); + I_Sleep(cv_sleep.value); + I_UpdateTime(cv_timescale.value); } } I_Quit(); diff --git a/src/m_menu.h b/src/m_menu.h index ba9c326a0..35c77cc43 100644 --- a/src/m_menu.h +++ b/src/m_menu.h @@ -3,7 +3,7 @@ // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. // Copyright (C) 2011-2016 by Matthew "Kaito Sinclaire" Walsh. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -389,9 +389,9 @@ typedef struct // level select platter typedef struct { - char header[22+5]; // mapheader_t lvltttl max length + " ZONE" + char header[22+5]; // mapheader_t lvlttl max length + " ZONE" INT32 maplist[3]; - char mapnames[3][17+1]; + char mapnames[3][22]; // lvlttl max length boolean mapavailable[4]; // mapavailable[3] == wide or not } levelselectrow_t; diff --git a/src/m_misc.c b/src/m_misc.c index ac60d49c7..c24896600 100644 --- a/src/m_misc.c +++ b/src/m_misc.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -36,6 +36,7 @@ #include "v_video.h" #include "z_zone.h" #include "g_input.h" +#include "i_time.h" #include "i_video.h" #include "d_main.h" #include "m_argv.h" @@ -273,8 +274,8 @@ size_t FIL_ReadFileTag(char const *name, UINT8 **buffer, INT32 tag) size_t count, length; UINT8 *buf; - if (FIL_ReadFileOK(name)) - handle = fopen(name, "rb"); + //if (FIL_ReadFileOK(name)) + handle = fopenfile(name, "rb"); if (!handle) return 0; @@ -467,6 +468,7 @@ void Command_SaveConfig_f(void) CONS_Printf(M_GetText("saveconfig [-silent] : save config to a file\n")); return; } + strcpy(tmpstr, COM_Argv(1)); FIL_ForceExtension(tmpstr, ".cfg"); @@ -566,10 +568,13 @@ void M_FirstLoadConfig(void) gameconfig_loaded = true; // reset to default player stuff - COM_BufAddText (va("%s \"%s\"\n",cv_skin.name,cv_defaultskin.string)); - COM_BufAddText (va("%s \"%s\"\n",cv_playercolor.name,cv_defaultplayercolor.string)); - COM_BufAddText (va("%s \"%s\"\n",cv_skin2.name,cv_defaultskin2.string)); - COM_BufAddText (va("%s \"%s\"\n",cv_playercolor2.name,cv_defaultplayercolor2.string)); + if (!dedicated) + { + COM_BufAddText (va("%s \"%s\"\n",cv_skin.name,cv_defaultskin.string)); + COM_BufAddText (va("%s \"%s\"\n",cv_playercolor.name,cv_defaultplayercolor.string)); + COM_BufAddText (va("%s \"%s\"\n",cv_skin2.name,cv_defaultskin2.string)); + COM_BufAddText (va("%s \"%s\"\n",cv_playercolor2.name,cv_defaultplayercolor2.string)); + } } /** Saves the game configuration. @@ -833,7 +838,7 @@ static void M_PNGText(png_structp png_ptr, png_infop png_info_ptr, PNG_CONST png else snprintf(lvlttltext, 48, "Unknown"); - if (gamestate == GS_LEVEL && &players[displayplayer] && players[displayplayer].mo) + if (gamestate == GS_LEVEL && players[displayplayer].mo) snprintf(locationtxt, 40, "X:%d Y:%d Z:%d A:%d", players[displayplayer].mo->x>>FRACBITS, players[displayplayer].mo->y>>FRACBITS, @@ -1631,14 +1636,14 @@ boolean M_ScreenshotResponder(event_t *ev) if (dedicated || ev->type != ev_keydown) return false; - ch = ev->data1; + ch = ev->key; if (ch >= KEY_MOUSE1 && menuactive) // If it's not a keyboard key, then don't allow it in the menus! return false; - if (ch == KEY_F8 || ch == gamecontrol[gc_screenshot][0] || ch == gamecontrol[gc_screenshot][1]) // remappable F8 + if (ch == KEY_F8 || ch == gamecontrol[GC_SCREENSHOT][0] || ch == gamecontrol[GC_SCREENSHOT][1]) // remappable F8 M_ScreenShot(); - else if (ch == KEY_F9 || ch == gamecontrol[gc_recordgif][0] || ch == gamecontrol[gc_recordgif][1]) // remappable F9 + else if (ch == KEY_F9 || ch == gamecontrol[GC_RECORDGIF][0] || ch == gamecontrol[GC_RECORDGIF][1]) // remappable F9 ((moviemode) ? M_StopMovie : M_StartMovie)(); else return false; @@ -1970,18 +1975,168 @@ void M_UnGetToken(void) endPos = oldendPos; } -/** Returns the current token's position. - */ -UINT32 M_GetTokenPos(void) +#define NUMTOKENS 2 +static const char *tokenizerInput = NULL; +static UINT32 tokenCapacity[NUMTOKENS] = {0}; +static char *tokenizerToken[NUMTOKENS] = {NULL}; +static UINT32 tokenizerStartPos = 0; +static UINT32 tokenizerEndPos = 0; +static UINT32 tokenizerInputLength = 0; +static UINT8 tokenizerInComment = 0; // 0 = not in comment, 1 = // Single-line, 2 = /* Multi-line */ + +void M_TokenizerOpen(const char *inputString) { - return endPos; + size_t i; + + tokenizerInput = inputString; + for (i = 0; i < NUMTOKENS; i++) + { + tokenCapacity[i] = 1024; + tokenizerToken[i] = (char*)Z_Malloc(tokenCapacity[i] * sizeof(char), PU_STATIC, NULL); + } + tokenizerInputLength = strlen(tokenizerInput); } -/** Sets the current token's position. - */ -void M_SetTokenPos(UINT32 newPos) +void M_TokenizerClose(void) { - endPos = newPos; + size_t i; + + tokenizerInput = NULL; + for (i = 0; i < NUMTOKENS; i++) + Z_Free(tokenizerToken[i]); + tokenizerStartPos = 0; + tokenizerEndPos = 0; + tokenizerInComment = 0; +} + +static void M_DetectComment(UINT32 *pos) +{ + if (tokenizerInComment) + return; + + if (*pos >= tokenizerInputLength - 1) + return; + + if (tokenizerInput[*pos] != '/') + return; + + //Single-line comment start + if (tokenizerInput[*pos + 1] == '/') + tokenizerInComment = 1; + //Multi-line comment start + else if (tokenizerInput[*pos + 1] == '*') + tokenizerInComment = 2; +} + +static void M_ReadTokenString(UINT32 i) +{ + UINT32 tokenLength = tokenizerEndPos - tokenizerStartPos; + if (tokenLength + 1 > tokenCapacity[i]) + { + tokenCapacity[i] = tokenLength + 1; + // Assign the memory. Don't forget an extra byte for the end of the string! + tokenizerToken[i] = (char *)Z_Malloc(tokenCapacity[i] * sizeof(char), PU_STATIC, NULL); + } + // Copy the string. + M_Memcpy(tokenizerToken[i], tokenizerInput + tokenizerStartPos, (size_t)tokenLength); + // Make the final character NUL. + tokenizerToken[i][tokenLength] = '\0'; +} + +const char *M_TokenizerRead(UINT32 i) +{ + if (!tokenizerInput) + return NULL; + + tokenizerStartPos = tokenizerEndPos; + + // Try to detect comments now, in case we're pointing right at one + M_DetectComment(&tokenizerStartPos); + + // Find the first non-whitespace char, or else the end of the string trying + while ((tokenizerInput[tokenizerStartPos] == ' ' + || tokenizerInput[tokenizerStartPos] == '\t' + || tokenizerInput[tokenizerStartPos] == '\r' + || tokenizerInput[tokenizerStartPos] == '\n' + || tokenizerInput[tokenizerStartPos] == '\0' + || tokenizerInput[tokenizerStartPos] == '=' || tokenizerInput[tokenizerStartPos] == ';' // UDMF TEXTMAP. + || tokenizerInComment != 0) + && tokenizerStartPos < tokenizerInputLength) + { + // Try to detect comment endings now + if (tokenizerInComment == 1 && tokenizerInput[tokenizerStartPos] == '\n') + tokenizerInComment = 0; // End of line for a single-line comment + else if (tokenizerInComment == 2 + && tokenizerStartPos < tokenizerInputLength - 1 + && tokenizerInput[tokenizerStartPos] == '*' + && tokenizerInput[tokenizerStartPos+1] == '/') + { + // End of multi-line comment + tokenizerInComment = 0; + tokenizerStartPos++; // Make damn well sure we're out of the comment ending at the end of it all + } + + tokenizerStartPos++; + M_DetectComment(&tokenizerStartPos); + } + + // If the end of the string is reached, no token is to be read + if (tokenizerStartPos == tokenizerInputLength) { + tokenizerEndPos = tokenizerInputLength; + return NULL; + } + // Else, if it's one of these three symbols, capture only this one character + else if (tokenizerInput[tokenizerStartPos] == ',' + || tokenizerInput[tokenizerStartPos] == '{' + || tokenizerInput[tokenizerStartPos] == '}') + { + tokenizerEndPos = tokenizerStartPos + 1; + tokenizerToken[i][0] = tokenizerInput[tokenizerStartPos]; + tokenizerToken[i][1] = '\0'; + return tokenizerToken[i]; + } + // Return entire string within quotes, except without the quotes. + else if (tokenizerInput[tokenizerStartPos] == '"') + { + tokenizerEndPos = ++tokenizerStartPos; + while (tokenizerInput[tokenizerEndPos] != '"' && tokenizerEndPos < tokenizerInputLength) + tokenizerEndPos++; + + M_ReadTokenString(i); + tokenizerEndPos++; + return tokenizerToken[i]; + } + + // Now find the end of the token. This includes several additional characters that are okay to capture as one character, but not trailing at the end of another token. + tokenizerEndPos = tokenizerStartPos + 1; + while ((tokenizerInput[tokenizerEndPos] != ' ' + && tokenizerInput[tokenizerEndPos] != '\t' + && tokenizerInput[tokenizerEndPos] != '\r' + && tokenizerInput[tokenizerEndPos] != '\n' + && tokenizerInput[tokenizerEndPos] != ',' + && tokenizerInput[tokenizerEndPos] != '{' + && tokenizerInput[tokenizerEndPos] != '}' + && tokenizerInput[tokenizerEndPos] != '=' && tokenizerInput[tokenizerEndPos] != ';' // UDMF TEXTMAP. + && tokenizerInComment == 0) + && tokenizerEndPos < tokenizerInputLength) + { + tokenizerEndPos++; + // Try to detect comment starts now; if it's in a comment, we don't want it in this token + M_DetectComment(&tokenizerEndPos); + } + + M_ReadTokenString(i); + return tokenizerToken[i]; +} + +UINT32 M_TokenizerGetEndPos(void) +{ + return tokenizerEndPos; +} + +void M_TokenizerSetEndPos(UINT32 newPos) +{ + tokenizerEndPos = newPos; } /** Count bits in a number. @@ -2011,63 +2166,6 @@ const char *GetRevisionString(void) return rev; } -// Vector/matrix math -TVector *VectorMatrixMultiply(TVector v, TMatrix m) -{ - static TVector ret; - - ret[0] = FixedMul(v[0],m[0][0]) + FixedMul(v[1],m[1][0]) + FixedMul(v[2],m[2][0]) + FixedMul(v[3],m[3][0]); - ret[1] = FixedMul(v[0],m[0][1]) + FixedMul(v[1],m[1][1]) + FixedMul(v[2],m[2][1]) + FixedMul(v[3],m[3][1]); - ret[2] = FixedMul(v[0],m[0][2]) + FixedMul(v[1],m[1][2]) + FixedMul(v[2],m[2][2]) + FixedMul(v[3],m[3][2]); - ret[3] = FixedMul(v[0],m[0][3]) + FixedMul(v[1],m[1][3]) + FixedMul(v[2],m[2][3]) + FixedMul(v[3],m[3][3]); - - return &ret; -} - -TMatrix *RotateXMatrix(angle_t rad) -{ - static TMatrix ret; - const angle_t fa = rad>>ANGLETOFINESHIFT; - const fixed_t cosrad = FINECOSINE(fa), sinrad = FINESINE(fa); - - ret[0][0] = FRACUNIT; ret[0][1] = 0; ret[0][2] = 0; ret[0][3] = 0; - ret[1][0] = 0; ret[1][1] = cosrad; ret[1][2] = sinrad; ret[1][3] = 0; - ret[2][0] = 0; ret[2][1] = -sinrad; ret[2][2] = cosrad; ret[2][3] = 0; - ret[3][0] = 0; ret[3][1] = 0; ret[3][2] = 0; ret[3][3] = FRACUNIT; - - return &ret; -} - -#if 0 -TMatrix *RotateYMatrix(angle_t rad) -{ - static TMatrix ret; - const angle_t fa = rad>>ANGLETOFINESHIFT; - const fixed_t cosrad = FINECOSINE(fa), sinrad = FINESINE(fa); - - ret[0][0] = cosrad; ret[0][1] = 0; ret[0][2] = -sinrad; ret[0][3] = 0; - ret[1][0] = 0; ret[1][1] = FRACUNIT; ret[1][2] = 0; ret[1][3] = 0; - ret[2][0] = sinrad; ret[2][1] = 0; ret[2][2] = cosrad; ret[2][3] = 0; - ret[3][0] = 0; ret[3][1] = 0; ret[3][2] = 0; ret[3][3] = FRACUNIT; - - return &ret; -} -#endif - -TMatrix *RotateZMatrix(angle_t rad) -{ - static TMatrix ret; - const angle_t fa = rad>>ANGLETOFINESHIFT; - const fixed_t cosrad = FINECOSINE(fa), sinrad = FINESINE(fa); - - ret[0][0] = cosrad; ret[0][1] = sinrad; ret[0][2] = 0; ret[0][3] = 0; - ret[1][0] = -sinrad; ret[1][1] = cosrad; ret[1][2] = 0; ret[1][3] = 0; - ret[2][0] = 0; ret[2][1] = 0; ret[2][2] = FRACUNIT; ret[2][3] = 0; - ret[3][0] = 0; ret[3][1] = 0; ret[3][2] = 0; ret[3][3] = FRACUNIT; - - return &ret; -} - /** Set of functions to take in a size_t as an argument, * put the argument in a character buffer, and return the * pointer to that buffer. @@ -2688,3 +2786,22 @@ const char * M_Ftrim (double f) return &dig[1];/* skip the 0 */ } } + +// Returns true if the string is empty. +boolean M_IsStringEmpty(const char *s) +{ + const char *ch = s; + + if (s == NULL || s[0] == '\0') + return true; + + for (;;ch++) + { + if (!(*ch)) + break; + if (!isspace((*ch))) + return false; + } + + return true; +} diff --git a/src/m_misc.h b/src/m_misc.h index fc5430f01..8cad7ba9a 100644 --- a/src/m_misc.h +++ b/src/m_misc.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -80,17 +80,6 @@ INT32 axtoi(const char *hexStg); const char *GetRevisionString(void); -// Vector/matrix math -typedef fixed_t TVector[4]; -typedef fixed_t TMatrix[4][4]; - -TVector *VectorMatrixMultiply(TVector v, TMatrix m); -TMatrix *RotateXMatrix(angle_t rad); -#if 0 -TMatrix *RotateYMatrix(angle_t rad); -#endif -TMatrix *RotateZMatrix(angle_t rad); - // s1 = s2+s3+s1 (1024 lenghtmax) void strcatbf(char *s1, const char *s2, const char *s3); @@ -117,6 +106,9 @@ trailing zeros, or "" if the fractional part is zero. */ const char * M_Ftrim (double); +// Returns true if the string is empty. +boolean M_IsStringEmpty(const char *s); + // counting bits, for weapon ammo code, usually FUNCMATH UINT8 M_CountBits(UINT32 num, UINT8 size); diff --git a/src/m_perfstats.c b/src/m_perfstats.c index 8a99312e6..17e026b3e 100644 --- a/src/m_perfstats.c +++ b/src/m_perfstats.c @@ -1,6 +1,6 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- -// Copyright (C) 2020-2021 by Sonic Team Junior. +// Copyright (C) 2020-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -17,565 +17,826 @@ #include "i_system.h" #include "z_zone.h" #include "p_local.h" +#include "r_fps.h" #ifdef HWRENDER #include "hardware/hw_main.h" #endif -struct perfstatcol; struct perfstatrow; -typedef struct perfstatcol perfstatcol_t; typedef struct perfstatrow perfstatrow_t; -struct perfstatcol { - INT32 lores_x; - INT32 hires_x; - INT32 color; - perfstatrow_t * rows; -}; - struct perfstatrow { - const char * lores_label; - const char * hires_label; - void * value; + const char * lores_label; + const char * hires_label; + ps_metric_t * metric; + UINT8 flags; }; -static precise_t ps_frametime = 0; +// perfstatrow_t flags -precise_t ps_tictime = 0; +#define PS_TIME 1 // metric measures time (uses precise_t instead of INT32) +#define PS_LEVEL 2 // metric is valid only when a level is active +#define PS_SW 4 // metric is valid only in software mode +#define PS_HW 8 // metric is valid only in opengl mode +#define PS_BATCHING 16 // metric is valid only when opengl batching is active +#define PS_HIDE_ZERO 32 // hide metric if its value is zero -precise_t ps_playerthink_time = 0; -precise_t ps_thinkertime = 0; +static ps_metric_t ps_frametime = {0}; -precise_t ps_thlist_times[NUM_THINKERLISTS]; +ps_metric_t ps_tictime = {0}; -int ps_checkposition_calls = 0; +ps_metric_t ps_playerthink_time = {0}; +ps_metric_t ps_thinkertime = {0}; -precise_t ps_lua_thinkframe_time = 0; -int ps_lua_mobjhooks = 0; +ps_metric_t ps_thlist_times[NUM_THINKERLISTS]; + +static ps_metric_t ps_thinkercount = {0}; +static ps_metric_t ps_polythcount = {0}; +static ps_metric_t ps_mainthcount = {0}; +static ps_metric_t ps_mobjcount = {0}; +static ps_metric_t ps_regularcount = {0}; +static ps_metric_t ps_scenerycount = {0}; +static ps_metric_t ps_nothinkcount = {0}; +static ps_metric_t ps_dynslopethcount = {0}; +static ps_metric_t ps_precipcount = {0}; +static ps_metric_t ps_removecount = {0}; + +ps_metric_t ps_checkposition_calls = {0}; + +ps_metric_t ps_lua_thinkframe_time = {0}; +ps_metric_t ps_lua_mobjhooks = {0}; + +ps_metric_t ps_otherlogictime = {0}; + +// Columns for perfstats pages. + +// Position on screen is determined separately in the drawing functions. + +// New columns must also be added to the drawing and update functions. +// Drawing functions: PS_DrawRenderStats, PS_DrawGameLogicStats, etc. +// Update functions: +// - PS_UpdateFrameStats for frame-dependent values +// - PS_UpdateTickStats for tick-dependent values + +// Rendering stats columns + +perfstatrow_t rendertime_rows[] = { + {"frmtime", "Frame time: ", &ps_frametime, PS_TIME}, + {"drwtime", "3d rendering: ", &ps_rendercalltime, PS_TIME|PS_LEVEL}, + +#ifdef HWRENDER + {" skybox ", " Skybox render: ", &ps_hw_skyboxtime, PS_TIME|PS_LEVEL|PS_HW}, + {" bsptime", " RenderBSPNode: ", &ps_bsptime, PS_TIME|PS_LEVEL|PS_HW}, + {" batsort", " Batch sort: ", &ps_hw_batchsorttime, PS_TIME|PS_LEVEL|PS_HW|PS_BATCHING}, + {" batdraw", " Batch render: ", &ps_hw_batchdrawtime, PS_TIME|PS_LEVEL|PS_HW|PS_BATCHING}, + {" sprsort", " Sprite sort: ", &ps_hw_spritesorttime, PS_TIME|PS_LEVEL|PS_HW}, + {" sprdraw", " Sprite render: ", &ps_hw_spritedrawtime, PS_TIME|PS_LEVEL|PS_HW}, + {" nodesrt", " Drwnode sort: ", &ps_hw_nodesorttime, PS_TIME|PS_LEVEL|PS_HW}, + {" nodedrw", " Drwnode render:", &ps_hw_nodedrawtime, PS_TIME|PS_LEVEL|PS_HW}, + {" other ", " Other: ", &ps_otherrendertime, PS_TIME|PS_LEVEL|PS_HW}, +#endif + + {" bsptime", " RenderBSPNode: ", &ps_bsptime, PS_TIME|PS_LEVEL|PS_SW}, + {" sprclip", " R_ClipSprites: ", &ps_sw_spritecliptime, PS_TIME|PS_LEVEL|PS_SW}, + {" portals", " Portals+Skybox:", &ps_sw_portaltime, PS_TIME|PS_LEVEL|PS_SW}, + {" planes ", " R_DrawPlanes: ", &ps_sw_planetime, PS_TIME|PS_LEVEL|PS_SW}, + {" masked ", " R_DrawMasked: ", &ps_sw_maskedtime, PS_TIME|PS_LEVEL|PS_SW}, + {" other ", " Other: ", &ps_otherrendertime, PS_TIME|PS_LEVEL|PS_SW}, + + {"ui ", "UI render: ", &ps_uitime, PS_TIME}, + {"finupdt", "I_FinishUpdate:", &ps_swaptime, PS_TIME}, + {0} +}; + +perfstatrow_t gamelogicbrief_row[] = { + {"logic ", "Game logic: ", &ps_tictime, PS_TIME}, + {0} +}; + +perfstatrow_t commoncounter_rows[] = { + {"bspcall", "BSP calls: ", &ps_numbspcalls, 0}, + {"sprites", "Sprites: ", &ps_numsprites, 0}, + {"drwnode", "Drawnodes: ", &ps_numdrawnodes, 0}, + {"plyobjs", "Polyobjects: ", &ps_numpolyobjects, 0}, + {0} +}; + +perfstatrow_t interpolation_rows[] = { + {"intpfrc", "Interp frac: ", &ps_interp_frac, PS_TIME}, + {"intplag", "Interp lag: ", &ps_interp_lag, PS_TIME}, + {0} +}; + +#ifdef HWRENDER +perfstatrow_t batchcount_rows[] = { + {"polygon", "Polygons: ", &ps_hw_numpolys, 0}, + {"vertex ", "Vertices: ", &ps_hw_numverts, 0}, + {0} +}; + +perfstatrow_t batchcalls_rows[] = { + {"drwcall", "Draw calls:", &ps_hw_numcalls, 0}, + {"shaders", "Shaders: ", &ps_hw_numshaders, 0}, + {"texture", "Textures: ", &ps_hw_numtextures, 0}, + {"polyflg", "Polyflags: ", &ps_hw_numpolyflags, 0}, + {"colors ", "Colors: ", &ps_hw_numcolors, 0}, + {0} +}; +#endif + +// Game logic stats columns + +perfstatrow_t gamelogic_rows[] = { + {"logic ", "Game logic: ", &ps_tictime, PS_TIME}, + {" plrthnk", " P_PlayerThink: ", &ps_playerthink_time, PS_TIME|PS_LEVEL}, + {" thnkers", " P_RunThinkers: ", &ps_thinkertime, PS_TIME|PS_LEVEL}, + {" plyobjs", " Polyobjects: ", &ps_thlist_times[THINK_POLYOBJ], PS_TIME|PS_LEVEL}, + {" main ", " Main: ", &ps_thlist_times[THINK_MAIN], PS_TIME|PS_LEVEL}, + {" mobjs ", " Mobjs: ", &ps_thlist_times[THINK_MOBJ], PS_TIME|PS_LEVEL}, + {" dynslop", " Dynamic slopes: ", &ps_thlist_times[THINK_DYNSLOPE], PS_TIME|PS_LEVEL}, + {" precip ", " Precipitation: ", &ps_thlist_times[THINK_PRECIP], PS_TIME|PS_LEVEL}, + {" lthinkf", " LUAh_ThinkFrame:", &ps_lua_thinkframe_time, PS_TIME|PS_LEVEL}, + {" other ", " Other: ", &ps_otherlogictime, PS_TIME|PS_LEVEL}, + {0} +}; + +perfstatrow_t thinkercount_rows[] = { + {"thnkers", "Thinkers: ", &ps_thinkercount, PS_LEVEL}, + {" plyobjs", " Polyobjects: ", &ps_polythcount, PS_LEVEL}, + {" main ", " Main: ", &ps_mainthcount, PS_LEVEL}, + {" mobjs ", " Mobjs: ", &ps_mobjcount, PS_LEVEL}, + {" regular", " Regular: ", &ps_regularcount, PS_LEVEL}, + {" scenery", " Scenery: ", &ps_scenerycount, PS_LEVEL}, + {" nothink", " Nothink: ", &ps_nothinkcount, PS_HIDE_ZERO|PS_LEVEL}, + {" dynslop", " Dynamic slopes: ", &ps_dynslopethcount, PS_LEVEL}, + {" precip ", " Precipitation: ", &ps_precipcount, PS_LEVEL}, + {" remove ", " Pending removal:", &ps_removecount, PS_LEVEL}, + {0} +}; + +perfstatrow_t misc_calls_rows[] = { + {"lmhook", "Lua mobj hooks: ", &ps_lua_mobjhooks, PS_LEVEL}, + {"chkpos", "P_CheckPosition:", &ps_checkposition_calls, PS_LEVEL}, + {0} +}; + +// Sample collection status for averaging. +// Maximum of these two is shown to user if nonzero to tell that +// the reported averages are not correct yet. +int ps_frame_samples_left = 0; +int ps_tick_samples_left = 0; +// History writing positions for frame and tick based metrics +int ps_frame_index = 0; +int ps_tick_index = 0; // dynamically allocated resizeable array for thinkframe hook stats ps_hookinfo_t *thinkframe_hooks = NULL; int thinkframe_hooks_length = 0; int thinkframe_hooks_capacity = 16; -static INT32 draw_row; - void PS_SetThinkFrameHookInfo(int index, precise_t time_taken, char* short_src) { if (!thinkframe_hooks) { // array needs to be initialized - thinkframe_hooks = Z_Malloc(sizeof(ps_hookinfo_t) * thinkframe_hooks_capacity, PU_STATIC, NULL); + thinkframe_hooks = Z_Calloc(sizeof(ps_hookinfo_t) * thinkframe_hooks_capacity, PU_STATIC, NULL); } if (index >= thinkframe_hooks_capacity) { // array needs more space, realloc with double size - thinkframe_hooks_capacity *= 2; + int new_capacity = thinkframe_hooks_capacity * 2; thinkframe_hooks = Z_Realloc(thinkframe_hooks, - sizeof(ps_hookinfo_t) * thinkframe_hooks_capacity, PU_STATIC, NULL); + sizeof(ps_hookinfo_t) * new_capacity, PU_STATIC, NULL); + // initialize new memory with zeros so the pointers in the structs are null + memset(&thinkframe_hooks[thinkframe_hooks_capacity], 0, + sizeof(ps_hookinfo_t) * thinkframe_hooks_capacity); + thinkframe_hooks_capacity = new_capacity; } - thinkframe_hooks[index].time_taken = time_taken; + thinkframe_hooks[index].time_taken.value.p = time_taken; memcpy(thinkframe_hooks[index].short_src, short_src, LUA_IDSIZE * sizeof(char)); // since the values are set sequentially from begin to end, the last call should leave // the correct value to this variable thinkframe_hooks_length = index + 1; } -static void PS_SetFrameTime(void) -{ - precise_t currenttime = I_GetPreciseTime(); - ps_frametime = currenttime - ps_prevframetime; - ps_prevframetime = currenttime; -} - -static boolean M_HighResolution(void) +static boolean PS_HighResolution(void) { return (vid.width >= 640 && vid.height >= 400); } -enum { - PERF_TIME, - PERF_COUNT, -}; - -static void M_DrawPerfString(perfstatcol_t *col, int type) +static boolean PS_IsLevelActive(void) { - const boolean hires = M_HighResolution(); + return gamestate == GS_LEVEL || + (gamestate == GS_TITLESCREEN && titlemapinaction); +} - INT32 draw_flags = V_MONOSPACE | col->color; +// Is the row valid in the current context? +static boolean PS_IsRowValid(perfstatrow_t *row) +{ + return !((row->flags & PS_LEVEL && !PS_IsLevelActive()) + || (row->flags & PS_SW && rendermode != render_soft) + || (row->flags & PS_HW && rendermode != render_opengl) +#ifdef HWRENDER + || (row->flags & PS_BATCHING && !cv_glbatching.value) +#endif + ); +} +// Should the row be visible on the screen? +static boolean PS_IsRowVisible(perfstatrow_t *row) +{ + boolean value_is_zero; + + if (row->flags & PS_TIME) + value_is_zero = row->metric->value.p == 0; + else + value_is_zero = row->metric->value.i == 0; + + return !(!PS_IsRowValid(row) || + (row->flags & PS_HIDE_ZERO && value_is_zero)); +} + +static INT32 PS_GetMetricAverage(ps_metric_t *metric, boolean time_metric) +{ + char* history_read_pos = metric->history; // char* used for pointer arithmetic + INT64 sum = 0; + int i; + int value_size = time_metric ? sizeof(precise_t) : sizeof(INT32); + + for (i = 0; i < cv_ps_samplesize.value; i++) + { + if (time_metric) + sum += (*((precise_t*)history_read_pos)) / (I_GetPrecisePrecision() / 1000000); + else + sum += *((INT32*)history_read_pos); + history_read_pos += value_size; + } + + return sum / cv_ps_samplesize.value; +} + +static INT32 PS_GetMetricMinOrMax(ps_metric_t *metric, boolean time_metric, boolean get_max) +{ + char* history_read_pos = metric->history; // char* used for pointer arithmetic + INT32 found_value = get_max ? INT32_MIN : INT32_MAX; + int i; + int value_size = time_metric ? sizeof(precise_t) : sizeof(INT32); + + for (i = 0; i < cv_ps_samplesize.value; i++) + { + INT32 value; + if (time_metric) + value = (*((precise_t*)history_read_pos)) / (I_GetPrecisePrecision() / 1000000); + else + value = *((INT32*)history_read_pos); + + if ((get_max && value > found_value) || + (!get_max && value < found_value)) + { + found_value = value; + } + history_read_pos += value_size; + } + + return found_value; +} + +// Calculates the standard deviation for metric. +static INT32 PS_GetMetricSD(ps_metric_t *metric, boolean time_metric) +{ + char* history_read_pos = metric->history; // char* used for pointer arithmetic + INT64 sum = 0; + int i; + int value_size = time_metric ? sizeof(precise_t) : sizeof(INT32); + INT32 avg = PS_GetMetricAverage(metric, time_metric); + + for (i = 0; i < cv_ps_samplesize.value; i++) + { + INT64 value; + if (time_metric) + value = (*((precise_t*)history_read_pos)) / (I_GetPrecisePrecision() / 1000000); + else + value = *((INT32*)history_read_pos); + + value -= avg; + sum += value * value; + + history_read_pos += value_size; + } + + return round(sqrt(sum / cv_ps_samplesize.value)); +} + +// Returns the value to show on screen for metric. +static INT32 PS_GetMetricScreenValue(ps_metric_t *metric, boolean time_metric) +{ + if (cv_ps_samplesize.value > 1 && metric->history) + { + if (cv_ps_descriptor.value == 1) + return PS_GetMetricAverage(metric, time_metric); + else if (cv_ps_descriptor.value == 2) + return PS_GetMetricSD(metric, time_metric); + else if (cv_ps_descriptor.value == 3) + return PS_GetMetricMinOrMax(metric, time_metric, false); + else + return PS_GetMetricMinOrMax(metric, time_metric, true); + } + else + { + if (time_metric) + return (metric->value.p) / (I_GetPrecisePrecision() / 1000000); + else + return metric->value.i; + } +} + +static int PS_DrawPerfRows(int x, int y, int color, perfstatrow_t *rows) +{ + const boolean hires = PS_HighResolution(); + INT32 draw_flags = V_MONOSPACE | color; perfstatrow_t * row; - - int value; + int draw_y = y; if (hires) draw_flags |= V_ALLOWLOWERCASE; - for (row = col->rows; row->lores_label; ++row) + for (row = rows; row->lores_label; ++row) { - if (type == PERF_TIME) - value = I_PreciseToMicros(*(precise_t *)row->value); - else - value = *(int *)row->value; + const char *label; + INT32 value; + char *final_str; + + if (!PS_IsRowVisible(row)) + continue; + + label = hires ? row->hires_label : row->lores_label; + value = PS_GetMetricScreenValue(row->metric, !!(row->flags & PS_TIME)); + final_str = va("%s %d", label, value); if (hires) { - V_DrawSmallString(col->hires_x, draw_row, draw_flags, - va("%s %d", row->hires_label, value)); - - draw_row += 5; + V_DrawSmallString(x, draw_y, draw_flags, final_str); + draw_y += 5; } else { - V_DrawThinString(col->lores_x, draw_row, draw_flags, - va("%s %d", row->lores_label, value)); - - draw_row += 8; + V_DrawThinString(x, draw_y, draw_flags, final_str); + draw_y += 8; } } + + return draw_y; +} + +static void PS_UpdateMetricHistory(ps_metric_t *metric, boolean time_metric, boolean frame_metric, boolean set_user) +{ + int index = frame_metric ? ps_frame_index : ps_tick_index; + + if (!metric->history) + { + // allocate history table + int value_size = time_metric ? sizeof(precise_t) : sizeof(INT32); + void** memory_user = set_user ? &metric->history : NULL; + + metric->history = Z_Calloc(value_size * cv_ps_samplesize.value, PU_PERFSTATS, + memory_user); + + // reset "samples left" counter since this history table needs to be filled + if (frame_metric) + ps_frame_samples_left = cv_ps_samplesize.value; + else + ps_tick_samples_left = cv_ps_samplesize.value; + } + + if (time_metric) + { + precise_t *history = (precise_t*)metric->history; + history[index] = metric->value.p; + } + else + { + INT32 *history = (INT32*)metric->history; + history[index] = metric->value.i; + } } -static void M_DrawPerfTiming(perfstatcol_t *col) +static void PS_UpdateRowHistories(perfstatrow_t *rows, boolean frame_metric) { - M_DrawPerfString(col, PERF_TIME); -} - -static void M_DrawPerfCount(perfstatcol_t *col) -{ - M_DrawPerfString(col, PERF_COUNT); -} - -static void M_DrawRenderStats(void) -{ - const boolean hires = M_HighResolution(); - - const int half_row = hires ? 5 : 4; - - precise_t extrarendertime; - - perfstatrow_t frametime_row[] = { - {"frmtime", "Frame time: ", &ps_frametime}, - {0} - }; - - perfstatrow_t rendercalltime_row[] = { - {"drwtime", "3d rendering: ", &ps_rendercalltime}, - {0} - }; - - perfstatrow_t opengltime_row[] = { - {"skybox ", "Skybox render: ", &ps_hw_skyboxtime}, - {"bsptime", "RenderBSPNode: ", &ps_bsptime}, - {"nodesrt", "Drwnode sort: ", &ps_hw_nodesorttime}, - {"nodedrw", "Drwnode render:", &ps_hw_nodedrawtime}, - {"sprsort", "Sprite sort: ", &ps_hw_spritesorttime}, - {"sprdraw", "Sprite render: ", &ps_hw_spritedrawtime}, - {"other ", "Other: ", &extrarendertime}, - {0} - }; - - perfstatrow_t softwaretime_row[] = { - {"bsptime", "RenderBSPNode: ", &ps_bsptime}, - {"sprclip", "R_ClipSprites: ", &ps_sw_spritecliptime}, - {"portals", "Portals+Skybox:", &ps_sw_portaltime}, - {"planes ", "R_DrawPlanes: ", &ps_sw_planetime}, - {"masked ", "R_DrawMasked: ", &ps_sw_maskedtime}, - {"other ", "Other: ", &extrarendertime}, - {0} - }; - - perfstatrow_t uiswaptime_row[] = { - {"ui ", "UI render: ", &ps_uitime}, - {"finupdt", "I_FinishUpdate:", &ps_swaptime}, - {0} - }; - - perfstatrow_t tictime_row[] = { - {"logic ", "Game logic: ", &ps_tictime}, - {0} - }; - - perfstatrow_t rendercalls_row[] = { - {"bspcall", "BSP calls: ", &ps_numbspcalls}, - {"sprites", "Sprites: ", &ps_numsprites}, - {"drwnode", "Drawnodes: ", &ps_numdrawnodes}, - {"plyobjs", "Polyobjects: ", &ps_numpolyobjects}, - {0} - }; - - perfstatrow_t batchtime_row[] = { - {"batsort", "Batch sort: ", &ps_hw_batchsorttime}, - {"batdraw", "Batch render:", &ps_hw_batchdrawtime}, - {0} - }; - - perfstatrow_t batchcount_row[] = { - {"polygon", "Polygons: ", &ps_hw_numpolys}, - {"vertex ", "Vertices: ", &ps_hw_numverts}, - {0} - }; - - perfstatrow_t batchcalls_row[] = { - {"drwcall", "Draw calls:", &ps_hw_numcalls}, - {"shaders", "Shaders: ", &ps_hw_numshaders}, - {"texture", "Textures: ", &ps_hw_numtextures}, - {"polyflg", "Polyflags: ", &ps_hw_numpolyflags}, - {"colors ", "Colors: ", &ps_hw_numcolors}, - {0} - }; - - perfstatcol_t frametime_col = {20, 20, V_YELLOWMAP, frametime_row}; - perfstatcol_t rendercalltime_col = {20, 20, V_YELLOWMAP, rendercalltime_row}; - - perfstatcol_t opengltime_col = {24, 24, V_YELLOWMAP, opengltime_row}; - perfstatcol_t softwaretime_col = {24, 24, V_YELLOWMAP, softwaretime_row}; - - perfstatcol_t uiswaptime_col = {20, 20, V_YELLOWMAP, uiswaptime_row}; - perfstatcol_t tictime_col = {20, 20, V_GRAYMAP, tictime_row}; - - perfstatcol_t rendercalls_col = {90, 115, V_BLUEMAP, rendercalls_row}; - - perfstatcol_t batchtime_col = {90, 115, V_REDMAP, batchtime_row}; - - perfstatcol_t batchcount_col = {155, 200, V_PURPLEMAP, batchcount_row}; - perfstatcol_t batchcalls_col = {220, 200, V_PURPLEMAP, batchcalls_row}; - - - boolean rendering = ( - gamestate == GS_LEVEL || - (gamestate == GS_TITLESCREEN && titlemapinaction) - ); - - draw_row = 10; - M_DrawPerfTiming(&frametime_col); - - if (rendering) + perfstatrow_t *row; + for (row = rows; row->lores_label; row++) { - M_DrawPerfTiming(&rendercalltime_col); + if (PS_IsRowValid(row)) + PS_UpdateMetricHistory(row->metric, !!(row->flags & PS_TIME), frame_metric, true); + } +} +// Update all metrics that are calculated on every frame. +static void PS_UpdateFrameStats(void) +{ + // update frame time + precise_t currenttime = I_GetPreciseTime(); + ps_frametime.value.p = currenttime - ps_prevframetime; + ps_prevframetime = currenttime; + + // update 3d rendering stats + if (PS_IsLevelActive()) + { // Remember to update this calculation when adding more 3d rendering stats! - extrarendertime = ps_rendercalltime - ps_bsptime; + ps_otherrendertime.value.p = ps_rendercalltime.value.p - ps_bsptime.value.p; #ifdef HWRENDER if (rendermode == render_opengl) { - extrarendertime -= - ps_hw_skyboxtime + - ps_hw_nodesorttime + - ps_hw_nodedrawtime + - ps_hw_spritesorttime + - ps_hw_spritedrawtime; + ps_otherrendertime.value.p -= + ps_hw_skyboxtime.value.p + + ps_hw_nodesorttime.value.p + + ps_hw_nodedrawtime.value.p + + ps_hw_spritesorttime.value.p + + ps_hw_spritedrawtime.value.p; if (cv_glbatching.value) { - extrarendertime -= - ps_hw_batchsorttime + - ps_hw_batchdrawtime; + ps_otherrendertime.value.p -= + ps_hw_batchsorttime.value.p + + ps_hw_batchdrawtime.value.p; } - - M_DrawPerfTiming(&opengltime_col); } else #endif { - extrarendertime -= - ps_sw_spritecliptime + - ps_sw_portaltime + - ps_sw_planetime + - ps_sw_maskedtime; - - M_DrawPerfTiming(&softwaretime_col); + ps_otherrendertime.value.p -= + ps_sw_spritecliptime.value.p + + ps_sw_portaltime.value.p + + ps_sw_planetime.value.p + + ps_sw_maskedtime.value.p; } } - M_DrawPerfTiming(&uiswaptime_col); - - draw_row += half_row; - M_DrawPerfTiming(&tictime_col); - - if (rendering) + if (cv_ps_samplesize.value > 1) { - draw_row = 10; - M_DrawPerfCount(&rendercalls_col); + PS_UpdateRowHistories(rendertime_rows, true); + if (PS_IsLevelActive()) + PS_UpdateRowHistories(commoncounter_rows, true); + + if (R_UsingFrameInterpolation()) + PS_UpdateRowHistories(interpolation_rows, true); #ifdef HWRENDER if (rendermode == render_opengl && cv_glbatching.value) { - draw_row += half_row; - M_DrawPerfTiming(&batchtime_col); - - draw_row = 10; - M_DrawPerfCount(&batchcount_col); - - if (hires) - draw_row += half_row; - else - draw_row = 10; - - M_DrawPerfCount(&batchcalls_col); + PS_UpdateRowHistories(batchcount_rows, true); + PS_UpdateRowHistories(batchcalls_rows, true); } #endif + + ps_frame_index++; + if (ps_frame_index >= cv_ps_samplesize.value) + ps_frame_index = 0; + if (ps_frame_samples_left) + ps_frame_samples_left--; } } -static void M_DrawTickStats(void) +// Update thinker counters by iterating the thinker lists. +static void PS_CountThinkers(void) { - int i = 0; + int i; thinker_t *thinker; - int thinkercount = 0; - int polythcount = 0; - int mainthcount = 0; - int mobjcount = 0; - int nothinkcount = 0; - int scenerycount = 0; - int regularcount = 0; - int dynslopethcount = 0; - int precipcount = 0; - int removecount = 0; - precise_t extratime = - ps_tictime - - ps_playerthink_time - - ps_thinkertime - - ps_lua_thinkframe_time; - - perfstatrow_t tictime_row[] = { - {"logic ", "Game logic: ", &ps_tictime}, - {0} - }; - - perfstatrow_t thinker_time_row[] = { - {"plrthnk", "P_PlayerThink: ", &ps_playerthink_time}, - {"thnkers", "P_RunThinkers: ", &ps_thinkertime}, - {0} - }; - - perfstatrow_t detailed_thinker_time_row[] = { - {"plyobjs", "Polyobjects: ", &ps_thlist_times[THINK_POLYOBJ]}, - {"main ", "Main: ", &ps_thlist_times[THINK_MAIN]}, - {"mobjs ", "Mobjs: ", &ps_thlist_times[THINK_MOBJ]}, - {"dynslop", "Dynamic slopes: ", &ps_thlist_times[THINK_DYNSLOPE]}, - {"precip ", "Precipitation: ", &ps_thlist_times[THINK_PRECIP]}, - {0} - }; - - perfstatrow_t extra_thinker_time_row[] = { - {"lthinkf", "LUAh_ThinkFrame:", &ps_lua_thinkframe_time}, - {"other ", "Other: ", &extratime}, - {0} - }; - - perfstatrow_t thinkercount_row[] = { - {"thnkers", "Thinkers: ", &thinkercount}, - {0} - }; - - perfstatrow_t detailed_thinkercount_row[] = { - {"plyobjs", "Polyobjects: ", &polythcount}, - {"main ", "Main: ", &mainthcount}, - {"mobjs ", "Mobjs: ", &mobjcount}, - {0} - }; - - perfstatrow_t mobjthinkercount_row[] = { - {"regular", "Regular: ", ®ularcount}, - {"scenery", "Scenery: ", &scenerycount}, - {0} - }; - - perfstatrow_t nothinkcount_row[] = { - {"nothink", "Nothink: ", ¬hinkcount}, - {0} - }; - - perfstatrow_t detailed_thinkercount_row2[] = { - {"dynslop", "Dynamic slopes: ", &dynslopethcount}, - {"precip ", "Precipitation: ", &precipcount}, - {"remove ", "Pending removal:", &removecount}, - {0} - }; - - perfstatrow_t misc_calls_row[] = { - {"lmhook", "Lua mobj hooks: ", &ps_lua_mobjhooks}, - {"chkpos", "P_CheckPosition:", &ps_checkposition_calls}, - {0} - }; - - perfstatcol_t tictime_col = {20, 20, V_YELLOWMAP, tictime_row}; - perfstatcol_t thinker_time_col = {24, 24, V_YELLOWMAP, thinker_time_row}; - perfstatcol_t detailed_thinker_time_col = {28, 28, V_YELLOWMAP, detailed_thinker_time_row}; - perfstatcol_t extra_thinker_time_col = {24, 24, V_YELLOWMAP, extra_thinker_time_row}; - - perfstatcol_t thinkercount_col = {90, 115, V_BLUEMAP, thinkercount_row}; - perfstatcol_t detailed_thinkercount_col = {94, 119, V_BLUEMAP, detailed_thinkercount_row}; - perfstatcol_t mobjthinkercount_col = {98, 123, V_BLUEMAP, mobjthinkercount_row}; - perfstatcol_t nothinkcount_col = {98, 123, V_BLUEMAP, nothinkcount_row}; - perfstatcol_t detailed_thinkercount_col2 = {94, 119, V_BLUEMAP, detailed_thinkercount_row2}; - perfstatcol_t misc_calls_col = {170, 216, V_PURPLEMAP, misc_calls_row}; + ps_thinkercount.value.i = 0; + ps_polythcount.value.i = 0; + ps_mainthcount.value.i = 0; + ps_mobjcount.value.i = 0; + ps_regularcount.value.i = 0; + ps_scenerycount.value.i = 0; + ps_nothinkcount.value.i = 0; + ps_dynslopethcount.value.i = 0; + ps_precipcount.value.i = 0; + ps_removecount.value.i = 0; for (i = 0; i < NUM_THINKERLISTS; i++) { for (thinker = thlist[i].next; thinker != &thlist[i]; thinker = thinker->next) { - thinkercount++; + ps_thinkercount.value.i++; if (thinker->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed) - removecount++; + ps_removecount.value.i++; else if (i == THINK_POLYOBJ) - polythcount++; + ps_polythcount.value.i++; else if (i == THINK_MAIN) - mainthcount++; + ps_mainthcount.value.i++; else if (i == THINK_MOBJ) { if (thinker->function.acp1 == (actionf_p1)P_MobjThinker) { mobj_t *mobj = (mobj_t*)thinker; - mobjcount++; + ps_mobjcount.value.i++; if (mobj->flags & MF_NOTHINK) - nothinkcount++; + ps_nothinkcount.value.i++; else if (mobj->flags & MF_SCENERY) - scenerycount++; + ps_scenerycount.value.i++; else - regularcount++; + ps_regularcount.value.i++; } } else if (i == THINK_DYNSLOPE) - dynslopethcount++; + ps_dynslopethcount.value.i++; else if (i == THINK_PRECIP) - precipcount++; + ps_precipcount.value.i++; } } +} - draw_row = 10; - M_DrawPerfTiming(&tictime_col); - M_DrawPerfTiming(&thinker_time_col); - M_DrawPerfTiming(&detailed_thinker_time_col); - M_DrawPerfTiming(&extra_thinker_time_col); - - draw_row = 10; - M_DrawPerfCount(&thinkercount_col); - M_DrawPerfCount(&detailed_thinkercount_col); - M_DrawPerfCount(&mobjthinkercount_col); - - if (nothinkcount) - M_DrawPerfCount(¬hinkcount_col); - - M_DrawPerfCount(&detailed_thinkercount_col2); - - if (M_HighResolution()) +// Update all metrics that are calculated on every tick. +void PS_UpdateTickStats(void) +{ + if (cv_perfstats.value == 1 && cv_ps_samplesize.value > 1) { + PS_UpdateRowHistories(gamelogicbrief_row, false); + } + if (cv_perfstats.value == 2) + { + if (PS_IsLevelActive()) + { + ps_otherlogictime.value.p = + ps_tictime.value.p - + ps_playerthink_time.value.p - + ps_thinkertime.value.p - + ps_lua_thinkframe_time.value.p; + + PS_CountThinkers(); + } + + if (cv_ps_samplesize.value > 1) + { + PS_UpdateRowHistories(gamelogic_rows, false); + PS_UpdateRowHistories(thinkercount_rows, false); + PS_UpdateRowHistories(misc_calls_rows, false); + } + } + if (cv_perfstats.value == 3 && cv_ps_samplesize.value > 1 && PS_IsLevelActive()) + { + int i; + for (i = 0; i < thinkframe_hooks_length; i++) + { + PS_UpdateMetricHistory(&thinkframe_hooks[i].time_taken, true, false, false); + } + } + if (cv_perfstats.value && cv_ps_samplesize.value > 1) + { + ps_tick_index++; + if (ps_tick_index >= cv_ps_samplesize.value) + ps_tick_index = 0; + if (ps_tick_samples_left) + ps_tick_samples_left--; + } +} + +static void PS_DrawDescriptorHeader(void) +{ + if (cv_ps_samplesize.value > 1) + { + const char* descriptor_names[] = { + "average", + "standard deviation", + "minimum", + "maximum" + }; + const boolean hires = PS_HighResolution(); + char* str; + INT32 flags = V_MONOSPACE | V_ALLOWLOWERCASE; + int samples_left = max(ps_frame_samples_left, ps_tick_samples_left); + int x, y; + + if (cv_perfstats.value == 3) + { + x = 2; + y = 0; + } + else + { + x = 20; + y = hires ? 5 : 2; + } + + if (samples_left) + { + str = va("Samples needed for correct results: %d", samples_left); + flags |= V_REDMAP; + } + else + { + str = va("Showing the %s of %d samples.", + descriptor_names[cv_ps_descriptor.value - 1], cv_ps_samplesize.value); + flags |= V_GREENMAP; + } + + if (hires) + V_DrawSmallString(x, y, flags, str); + else + V_DrawThinString(x, y, flags, str); + } +} + +static void PS_DrawRenderStats(void) +{ + const boolean hires = PS_HighResolution(); + const int half_row = hires ? 5 : 4; + int x, y, cy = 10; + + PS_DrawDescriptorHeader(); + + y = PS_DrawPerfRows(20, 10, V_YELLOWMAP, rendertime_rows); + + PS_DrawPerfRows(20, y + half_row, V_GRAYMAP, gamelogicbrief_row); + + if (PS_IsLevelActive()) + { + x = hires ? 115 : 90; + cy = PS_DrawPerfRows(x, 10, V_BLUEMAP, commoncounter_rows) + half_row; + +#ifdef HWRENDER + if (rendermode == render_opengl && cv_glbatching.value) + { + x = hires ? 200 : 155; + y = PS_DrawPerfRows(x, 10, V_PURPLEMAP, batchcount_rows); + + x = hires ? 200 : 220; + y = hires ? y + half_row : 10; + PS_DrawPerfRows(x, y, V_PURPLEMAP, batchcalls_rows); + } +#endif + } + + if (R_UsingFrameInterpolation()) + { + x = hires ? 115 : 90; + PS_DrawPerfRows(x, cy, V_ROSYMAP, interpolation_rows); + } +} + +static void PS_DrawGameLogicStats(void) +{ + const boolean hires = PS_HighResolution(); + int x, y; + + PS_DrawDescriptorHeader(); + + PS_DrawPerfRows(20, 10, V_YELLOWMAP, gamelogic_rows); + + x = hires ? 115 : 90; + PS_DrawPerfRows(x, 10, V_BLUEMAP, thinkercount_rows); + + if (hires) V_DrawSmallString(212, 10, V_MONOSPACE | V_ALLOWLOWERCASE | V_PURPLEMAP, "Calls:"); - draw_row = 15; - } - else - { - draw_row = 10; - } + x = hires ? 216 : 170; + y = hires ? 15 : 10; + PS_DrawPerfRows(x, y, V_PURPLEMAP, misc_calls_rows); +} - M_DrawPerfCount(&misc_calls_col); +static void PS_DrawThinkFrameStats(void) +{ + char s[100]; + int i; + // text writing position + int x = 2; + int y = 4; + UINT32 text_color; + char tempbuffer[LUA_IDSIZE]; + char last_mod_name[LUA_IDSIZE]; + last_mod_name[0] = '\0'; + + PS_DrawDescriptorHeader(); + + for (i = 0; i < thinkframe_hooks_length; i++) + { + +#define NEXT_ROW() \ +y += 4; \ +if (y > 192) \ +{ \ + y = 4; \ + x += 106; \ + if (x > 214) \ + break; \ +} + + char* str = thinkframe_hooks[i].short_src; + char* tempstr = tempbuffer; + int len = (int)strlen(str); + char* str_ptr; + if (strcmp(".lua", str + len - 4) == 0) + { + str[len-4] = '\0'; // remove .lua at end + len -= 4; + } + // we locate the wad/pk3 name in the string and compare it to + // what we found on the previous iteration. + // if the name has changed, print it out on the screen + strcpy(tempstr, str); + str_ptr = strrchr(tempstr, '|'); + if (str_ptr) + { + *str_ptr = '\0'; + str = str_ptr + 1; // this is the name of the hook without the mod file name + str_ptr = strrchr(tempstr, PATHSEP[0]); + if (str_ptr) + tempstr = str_ptr + 1; + // tempstr should now point to the mod name, (wad/pk3) possibly truncated + if (strcmp(tempstr, last_mod_name) != 0) + { + strcpy(last_mod_name, tempstr); + len = (int)strlen(tempstr); + if (len > 25) + tempstr += len - 25; + snprintf(s, sizeof s - 1, "%s", tempstr); + V_DrawSmallString(x, y, V_MONOSPACE | V_ALLOWLOWERCASE | V_GRAYMAP, s); + NEXT_ROW() + } + text_color = V_YELLOWMAP; + } + else + { + // probably a standalone lua file + // cut off the folder if it's there + str_ptr = strrchr(tempstr, PATHSEP[0]); + if (str_ptr) + str = str_ptr + 1; + text_color = 0; // white + } + len = (int)strlen(str); + if (len > 20) + str += len - 20; + snprintf(s, sizeof s - 1, "%20s: %d", str, + PS_GetMetricScreenValue(&thinkframe_hooks[i].time_taken, true)); + V_DrawSmallString(x, y, V_MONOSPACE | V_ALLOWLOWERCASE | text_color, s); + NEXT_ROW() + +#undef NEXT_ROW + + } } void M_DrawPerfStats(void) { - char s[100]; - - PS_SetFrameTime(); - if (cv_perfstats.value == 1) // rendering { - M_DrawRenderStats(); + PS_UpdateFrameStats(); + PS_DrawRenderStats(); } else if (cv_perfstats.value == 2) // logic { - M_DrawTickStats(); + // PS_UpdateTickStats is called in TryRunTics, since otherwise it would miss + // tics when frame skips happen + PS_DrawGameLogicStats(); } else if (cv_perfstats.value == 3) // lua thinkframe { - if (!(gamestate == GS_LEVEL || (gamestate == GS_TITLESCREEN && titlemapinaction))) + if (!PS_IsLevelActive()) return; - if (vid.width < 640 || vid.height < 400) // low resolution + if (!PS_HighResolution()) { - // it's not gonna fit very well.. - V_DrawThinString(30, 30, V_MONOSPACE | V_ALLOWLOWERCASE | V_YELLOWMAP, "Not available for resolutions below 640x400"); + // Low resolutions can't really use V_DrawSmallString that is used by thinkframe stats. + // A low-res version using V_DrawThinString could be implemented, + // but it would have much less space for information. + V_DrawThinString(80, 92, V_MONOSPACE | V_ALLOWLOWERCASE | V_YELLOWMAP, "Perfstats 3 is not available"); + V_DrawThinString(80, 100, V_MONOSPACE | V_ALLOWLOWERCASE | V_YELLOWMAP, "for resolutions below 640x400."); } - else // high resolution + else { - int i; - // text writing position - int x = 2; - int y = 4; - UINT32 text_color; - char tempbuffer[LUA_IDSIZE]; - char last_mod_name[LUA_IDSIZE]; - last_mod_name[0] = '\0'; - for (i = 0; i < thinkframe_hooks_length; i++) - { - char* str = thinkframe_hooks[i].short_src; - char* tempstr = tempbuffer; - int len = (int)strlen(str); - char* str_ptr; - if (strcmp(".lua", str + len - 4) == 0) - { - str[len-4] = '\0'; // remove .lua at end - len -= 4; - } - // we locate the wad/pk3 name in the string and compare it to - // what we found on the previous iteration. - // if the name has changed, print it out on the screen - strcpy(tempstr, str); - str_ptr = strrchr(tempstr, '|'); - if (str_ptr) - { - *str_ptr = '\0'; - str = str_ptr + 1; // this is the name of the hook without the mod file name - str_ptr = strrchr(tempstr, PATHSEP[0]); - if (str_ptr) - tempstr = str_ptr + 1; - // tempstr should now point to the mod name, (wad/pk3) possibly truncated - if (strcmp(tempstr, last_mod_name) != 0) - { - strcpy(last_mod_name, tempstr); - len = (int)strlen(tempstr); - if (len > 25) - tempstr += len - 25; - snprintf(s, sizeof s - 1, "%s", tempstr); - V_DrawSmallString(x, y, V_MONOSPACE | V_ALLOWLOWERCASE | V_GRAYMAP, s); - y += 4; // repeated code! - if (y > 192) - { - y = 4; - x += 106; - if (x > 214) - break; - } - } - text_color = V_YELLOWMAP; - } - else - { - // probably a standalone lua file - // cut off the folder if it's there - str_ptr = strrchr(tempstr, PATHSEP[0]); - if (str_ptr) - str = str_ptr + 1; - text_color = 0; // white - } - len = (int)strlen(str); - if (len > 20) - str += len - 20; - snprintf(s, sizeof s - 1, "%20s: %d", str, I_PreciseToMicros(thinkframe_hooks[i].time_taken)); - V_DrawSmallString(x, y, V_MONOSPACE | V_ALLOWLOWERCASE | text_color, s); - y += 4; // repeated code! - if (y > 192) - { - y = 4; - x += 106; - if (x > 214) - break; - } - } + PS_DrawThinkFrameStats(); } } } + +// remove and unallocate history from all metrics +static void PS_ClearHistory(void) +{ + int i; + + Z_FreeTag(PU_PERFSTATS); + // thinkframe hook metric history pointers need to be cleared manually + for (i = 0; i < thinkframe_hooks_length; i++) + { + thinkframe_hooks[i].time_taken.history = NULL; + } + + ps_frame_index = ps_tick_index = 0; + // PS_UpdateMetricHistory will set these correctly when it runs + ps_frame_samples_left = ps_tick_samples_left = 0; +} + +void PS_PerfStats_OnChange(void) +{ + if (cv_perfstats.value && cv_ps_samplesize.value > 1) + PS_ClearHistory(); +} + +void PS_SampleSize_OnChange(void) +{ + if (cv_ps_samplesize.value > 1) + PS_ClearHistory(); +} diff --git a/src/m_perfstats.h b/src/m_perfstats.h index 71208fbc1..db250be2a 100644 --- a/src/m_perfstats.h +++ b/src/m_perfstats.h @@ -1,6 +1,6 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- -// Copyright (C) 2020-2021 by Sonic Team Junior. +// Copyright (C) 2020-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -16,26 +16,45 @@ #include "lua_script.h" #include "p_local.h" -extern precise_t ps_tictime; - -extern precise_t ps_playerthink_time; -extern precise_t ps_thinkertime; - -extern precise_t ps_thlist_times[]; - -extern int ps_checkposition_calls; - -extern precise_t ps_lua_thinkframe_time; -extern int ps_lua_mobjhooks; +typedef struct +{ + union { + precise_t p; + INT32 i; + } value; + void *history; +} ps_metric_t; typedef struct { - precise_t time_taken; + ps_metric_t time_taken; char short_src[LUA_IDSIZE]; } ps_hookinfo_t; +#define PS_START_TIMING(metric) metric.value.p = I_GetPreciseTime() +#define PS_STOP_TIMING(metric) metric.value.p = I_GetPreciseTime() - metric.value.p + +extern ps_metric_t ps_tictime; + +extern ps_metric_t ps_playerthink_time; +extern ps_metric_t ps_thinkertime; + +extern ps_metric_t ps_thlist_times[]; + +extern ps_metric_t ps_checkposition_calls; + +extern ps_metric_t ps_lua_thinkframe_time; +extern ps_metric_t ps_lua_mobjhooks; + +extern ps_metric_t ps_otherlogictime; + void PS_SetThinkFrameHookInfo(int index, precise_t time_taken, char* short_src); +void PS_UpdateTickStats(void); + void M_DrawPerfStats(void); +void PS_PerfStats_OnChange(void); +void PS_SampleSize_OnChange(void); + #endif diff --git a/src/m_queue.c b/src/m_queue.c index a337ca4ce..1c10a6692 100644 --- a/src/m_queue.c +++ b/src/m_queue.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 2003 by James Haley -// Copyright (C) 2003-2021 by Sonic Team Junior. +// Copyright (C) 2003-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/m_queue.h b/src/m_queue.h index cc64b8dd7..b1ad22bf5 100644 --- a/src/m_queue.h +++ b/src/m_queue.h @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 2003 by James Haley -// Copyright (C) 2003-2021 by Sonic Team Junior. +// Copyright (C) 2003-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/m_random.c b/src/m_random.c index 2e6213e12..8b5138b9c 100644 --- a/src/m_random.c +++ b/src/m_random.c @@ -3,7 +3,7 @@ // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. // Copyright (C) 2012-2016 by Matthew "Kaito Sinclaire" Walsh. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -14,12 +14,11 @@ #include "doomdef.h" #include "doomtype.h" -#include "doomstat.h" // totalplaytime #include "m_random.h" #include "m_fixed.h" - +#include "m_cond.h" // totalplaytime // --------------------------- // RNG functions (not synched) @@ -252,5 +251,5 @@ void P_SetRandSeedD(const char *rfile, INT32 rline, UINT32 seed) */ UINT32 M_RandomizedSeed(void) { - return ((totalplaytime & 0xFFFF) << 16)|M_RandomFixed(); + return ((serverGamedata->totalplaytime & 0xFFFF) << 16) | M_RandomFixed(); } diff --git a/src/m_random.h b/src/m_random.h index df10b4bb3..824287e27 100644 --- a/src/m_random.h +++ b/src/m_random.h @@ -3,7 +3,7 @@ // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. // Copyright (C) 2012-2016 by Matthew "Kaito Sinclaire" Walsh. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/m_swap.h b/src/m_swap.h index 6aa347d97..b63089bcb 100644 --- a/src/m_swap.h +++ b/src/m_swap.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/mserv.c b/src/mserv.c index f64c7bea9..62cda96e4 100644 --- a/src/mserv.c +++ b/src/mserv.c @@ -1,8 +1,8 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. -// Copyright (C) 2020-2021 by James R. +// Copyright (C) 1999-2023 by Sonic Team Junior. +// Copyright (C) 2020-2023 by James R. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -62,7 +62,7 @@ static CV_PossibleValue_t masterserver_update_rate_cons_t[] = { }; consvar_t cv_masterserver = CVAR_INIT ("masterserver", "https://mb.srb2.org/MS/0", CV_SAVE|CV_CALL, NULL, MasterServer_OnChange); -consvar_t cv_servername = CVAR_INIT ("servername", "SRB2 server", CV_SAVE|CV_NETVAR|CV_CALL|CV_NOINIT, NULL, Update_parameters); +consvar_t cv_servername = CVAR_INIT ("servername", "SRB2 server", CV_SAVE|CV_NETVAR|CV_CALL|CV_NOINIT|CV_ALLOWLUA, NULL, Update_parameters); consvar_t cv_masterserver_update_rate = CVAR_INIT ("masterserver_update_rate", "15", CV_SAVE|CV_CALL|CV_NOINIT, masterserver_update_rate_cons_t, Update_parameters); @@ -97,7 +97,8 @@ void AddMServCommands(void) CV_RegisterVar(&cv_masterserver_token); CV_RegisterVar(&cv_servername); #ifdef MASTERSERVER - COM_AddCommand("listserv", Command_Listserv_f); + COM_AddCommand("listserv", Command_Listserv_f, 0); + COM_AddCommand("masterserver_update", Update_parameters, COM_LUA); // allows people to updates manually in case you were delisted by accident #endif #endif } diff --git a/src/mserv.h b/src/mserv.h index 7a3b3d8ec..07253da85 100644 --- a/src/mserv.h +++ b/src/mserv.h @@ -1,8 +1,8 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. -// Copyright (C) 2020-2021 by James R. +// Copyright (C) 1999-2023 by Sonic Team Junior. +// Copyright (C) 2020-2023 by James R. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -33,7 +33,7 @@ typedef union typedef struct { msg_header_t header; - char ip[16]; + char ip[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"]; char port[8]; char name[32]; INT32 room; diff --git a/src/p_ceilng.c b/src/p_ceilng.c index 43f3cc1d5..98e931362 100644 --- a/src/p_ceilng.c +++ b/src/p_ceilng.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -13,6 +13,7 @@ #include "doomdef.h" #include "p_local.h" +#include "r_fps.h" #include "r_main.h" #include "s_sound.h" #include "z_zone.h" @@ -34,7 +35,6 @@ INT32 ceilmovesound = sfx_None; void T_MoveCeiling(ceiling_t *ceiling) { result_e res; - boolean dontupdate = false; if (ceiling->delaytimer) { @@ -42,257 +42,81 @@ void T_MoveCeiling(ceiling_t *ceiling) return; } - switch (ceiling->direction) + res = T_MovePlane(ceiling->sector, ceiling->speed, (ceiling->direction == 1) ? ceiling->topheight : ceiling->bottomheight, false, true, ceiling->direction); + + if (ceiling->type == bounceCeiling) { - case 0: // IN STASIS - break; - case 1: // UP - res = T_MovePlane(ceiling->sector, ceiling->speed, ceiling->topheight, false, true, ceiling->direction); - - if (ceiling->type == bounceCeiling) - { - const fixed_t origspeed = FixedDiv(ceiling->origspeed,(ELEVATORSPEED/2)); - const fixed_t fs = abs(ceiling->sector->ceilingheight - lines[ceiling->texture].frontsector->ceilingheight); - const fixed_t bs = abs(ceiling->sector->ceilingheight - lines[ceiling->texture].backsector->ceilingheight); - if (fs < bs) - ceiling->speed = FixedDiv(fs,25*FRACUNIT) + FRACUNIT/4; - else - ceiling->speed = FixedDiv(bs,25*FRACUNIT) + FRACUNIT/4; - - ceiling->speed = FixedMul(ceiling->speed,origspeed); - } - - if (res == pastdest) - { - switch (ceiling->type) - { - case instantMoveCeilingByFrontSector: - ceiling->sector->ceilingpic = ceiling->texture; - ceiling->sector->ceilingdata = NULL; - ceiling->sector->ceilspeed = 0; - P_RemoveThinker(&ceiling->thinker); - dontupdate = true; - break; - case moveCeilingByFrontSector: - if (ceiling->texture < -1) // chained linedef executing - P_LinedefExecute((INT16)(ceiling->texture + INT16_MAX + 2), NULL, NULL); - if (ceiling->texture > -1) // flat changing - ceiling->sector->ceilingpic = ceiling->texture; - /* FALLTHRU */ - case raiseToHighest: -// case raiseCeilingByLine: - case moveCeilingByFrontTexture: - ceiling->sector->ceilingdata = NULL; - ceiling->sector->ceilspeed = 0; - P_RemoveThinker(&ceiling->thinker); - dontupdate = true; - break; - - case fastCrushAndRaise: - case crushAndRaise: - ceiling->direction = -1; - break; - - case bounceCeiling: - { - fixed_t dest = ceiling->topheight; - - if (dest == lines[ceiling->texture].frontsector->ceilingheight) - dest = lines[ceiling->texture].backsector->ceilingheight; - else - dest = lines[ceiling->texture].frontsector->ceilingheight; - - if (dest < ceiling->sector->ceilingheight) // must move down - { - ceiling->direction = -1; - ceiling->bottomheight = dest; - } - else // must move up - { - ceiling->direction = 1; - ceiling->topheight = dest; - } - - ceiling->delaytimer = ceiling->delay; - - // That's it. Do not set dontupdate, do not remove the thinker. - break; - } - - case bounceCeilingCrush: - { - fixed_t dest = ceiling->topheight; - - if (dest == lines[ceiling->texture].frontsector->ceilingheight) - { - dest = lines[ceiling->texture].backsector->ceilingheight; - ceiling->speed = ceiling->origspeed = FixedDiv(abs(lines[ceiling->texture].dy),4*FRACUNIT); // return trip, use dy - } - else - { - dest = lines[ceiling->texture].frontsector->ceilingheight; - ceiling->speed = ceiling->origspeed = FixedDiv(abs(lines[ceiling->texture].dx),4*FRACUNIT); // going frontways, use dx - } - - if (dest < ceiling->sector->ceilingheight) // must move down - { - ceiling->direction = -1; - ceiling->bottomheight = dest; - } - else // must move up - { - ceiling->direction = 1; - ceiling->topheight = dest; - } - - ceiling->delaytimer = ceiling->delay; - - // That's it. Do not set dontupdate, do not remove the thinker. - break; - } - - default: - break; - } - } - break; - - case -1: // DOWN - res = T_MovePlane(ceiling->sector, ceiling->speed, ceiling->bottomheight, ceiling->crush, true, ceiling->direction); - - if (ceiling->type == bounceCeiling) - { - const fixed_t origspeed = FixedDiv(ceiling->origspeed,(ELEVATORSPEED/2)); - const fixed_t fs = abs(ceiling->sector->ceilingheight - lines[ceiling->texture].frontsector->ceilingheight); - const fixed_t bs = abs(ceiling->sector->ceilingheight - lines[ceiling->texture].backsector->ceilingheight); - if (fs < bs) - ceiling->speed = FixedDiv(fs,25*FRACUNIT) + FRACUNIT/4; - else - ceiling->speed = FixedDiv(bs,25*FRACUNIT) + FRACUNIT/4; - ceiling->speed = FixedMul(ceiling->speed,origspeed); - } - - if (res == pastdest) - { - switch (ceiling->type) - { - // make platform stop at bottom of all crusher strokes - // except generalized ones, reset speed, start back up - case crushAndRaise: - ceiling->speed = CEILSPEED; - /* FALLTHRU */ - case fastCrushAndRaise: - ceiling->direction = 1; - break; - - case instantMoveCeilingByFrontSector: - ceiling->sector->ceilingpic = ceiling->texture; - ceiling->sector->ceilingdata = NULL; - ceiling->sector->ceilspeed = 0; - P_RemoveThinker(&ceiling->thinker); - dontupdate = true; - break; - - case moveCeilingByFrontSector: - if (ceiling->texture < -1) // chained linedef executing - P_LinedefExecute((INT16)(ceiling->texture + INT16_MAX + 2), NULL, NULL); - if (ceiling->texture > -1) // flat changing - ceiling->sector->ceilingpic = ceiling->texture; - // don't break - /* FALLTHRU */ - - // in all other cases, just remove the active ceiling - case lowerAndCrush: - case lowerToLowest: - case raiseToLowest: -// case lowerCeilingByLine: - case moveCeilingByFrontTexture: - ceiling->sector->ceilingdata = NULL; - ceiling->sector->ceilspeed = 0; - P_RemoveThinker(&ceiling->thinker); - dontupdate = true; - break; - case bounceCeiling: - { - fixed_t dest = ceiling->bottomheight; - - if (dest == lines[ceiling->texture].frontsector->ceilingheight) - dest = lines[ceiling->texture].backsector->ceilingheight; - else - dest = lines[ceiling->texture].frontsector->ceilingheight; - - if (dest < ceiling->sector->ceilingheight) // must move down - { - ceiling->direction = -1; - ceiling->bottomheight = dest; - } - else // must move up - { - ceiling->direction = 1; - ceiling->topheight = dest; - } - - ceiling->delaytimer = ceiling->delay; - - // That's it. Do not set dontupdate, do not remove the thinker. - break; - } - - case bounceCeilingCrush: - { - fixed_t dest = ceiling->bottomheight; - - if (dest == lines[ceiling->texture].frontsector->ceilingheight) - { - dest = lines[ceiling->texture].backsector->ceilingheight; - ceiling->speed = ceiling->origspeed = FixedDiv(abs(lines[ceiling->texture].dy),4*FRACUNIT); // return trip, use dy - } - else - { - dest = lines[ceiling->texture].frontsector->ceilingheight; - ceiling->speed = ceiling->origspeed = FixedDiv(abs(lines[ceiling->texture].dx),4*FRACUNIT); // going frontways, use dx - } - - if (dest < ceiling->sector->ceilingheight) // must move down - { - ceiling->direction = -1; - ceiling->bottomheight = dest; - } - else // must move up - { - ceiling->direction = 1; - ceiling->topheight = dest; - } - - ceiling->delaytimer = ceiling->delay; - - // That's it. Do not set dontupdate, do not remove the thinker. - break; - } - - default: - break; - } - } - else if (res == crushed) - { - switch (ceiling->type) - { - case crushAndRaise: - case lowerAndCrush: - ceiling->speed = FixedDiv(CEILSPEED,8*FRACUNIT); - break; - - default: - break; - } - } - break; + const fixed_t origspeed = FixedDiv(ceiling->origspeed, (ELEVATORSPEED/2)); + const fixed_t fs = abs(ceiling->sector->ceilingheight - lines[ceiling->sourceline].frontsector->ceilingheight); + const fixed_t bs = abs(ceiling->sector->ceilingheight - lines[ceiling->sourceline].backsector->ceilingheight); + if (fs < bs) + ceiling->speed = FixedDiv(fs, 25*FRACUNIT) + FRACUNIT/4; + else + ceiling->speed = FixedDiv(bs, 25*FRACUNIT) + FRACUNIT/4; + ceiling->speed = FixedMul(ceiling->speed, origspeed); } - if (!dontupdate) - ceiling->sector->ceilspeed = ceiling->speed*ceiling->direction; - else - ceiling->sector->ceilspeed = 0; + + if (res == pastdest) + { + switch (ceiling->type) + { + case instantMoveCeilingByFrontSector: + if (ceiling->texture > -1) // flat changing + ceiling->sector->ceilingpic = ceiling->texture; + ceiling->sector->ceilingdata = NULL; + ceiling->sector->ceilspeed = 0; + P_RemoveThinker(&ceiling->thinker); + return; + case moveCeilingByFrontSector: + if (ceiling->tag) // chained linedef executing + P_LinedefExecute(ceiling->tag, NULL, NULL); + if (ceiling->texture > -1) // flat changing + ceiling->sector->ceilingpic = ceiling->texture; + /* FALLTHRU */ + case raiseToHighest: + case moveCeilingByDistance: + ceiling->sector->ceilingdata = NULL; + ceiling->sector->ceilspeed = 0; + P_RemoveThinker(&ceiling->thinker); + return; + case bounceCeiling: + case bounceCeilingCrush: + { + fixed_t dest = (ceiling->direction == 1) ? ceiling->topheight : ceiling->bottomheight; + + if (dest == lines[ceiling->sourceline].frontsector->ceilingheight) + { + dest = lines[ceiling->sourceline].backsector->ceilingheight; + ceiling->origspeed = lines[ceiling->sourceline].args[3] << (FRACBITS - 2); // return trip, use args[3] + } + else + { + dest = lines[ceiling->sourceline].frontsector->ceilingheight; + ceiling->origspeed = lines[ceiling->sourceline].args[2] << (FRACBITS - 2); // going frontways, use args[2] + } + + if (ceiling->type == bounceCeilingCrush) + ceiling->speed = ceiling->origspeed; + + if (dest < ceiling->sector->ceilingheight) // must move down + { + ceiling->direction = -1; + ceiling->bottomheight = dest; + } + else // must move up + { + ceiling->direction = 1; + ceiling->topheight = dest; + } + + ceiling->delaytimer = ceiling->delay; + break; + } + default: + break; + } + } + ceiling->sector->ceilspeed = ceiling->speed*ceiling->direction; } /** Moves a ceiling crusher. @@ -320,11 +144,7 @@ void T_CrushCeiling(ceiling_t *ceiling) if (res == pastdest) { ceiling->direction = -1; - - if (lines[ceiling->sourceline].flags & ML_EFFECT4) - ceiling->speed = ceiling->oldspeed; - else - ceiling->speed = ceiling->oldspeed*2; + ceiling->speed = lines[ceiling->sourceline].args[2] << (FRACBITS - 2); if (ceiling->type == crushCeilOnce || ceiling->type == crushBothOnce) @@ -365,12 +185,8 @@ void T_CrushCeiling(ceiling_t *ceiling) ceiling->sector->soundorg.z = ceiling->sector->floorheight; S_StartSound(mp,sfx_pstop); - if (lines[ceiling->sourceline].flags & ML_EFFECT4) - ceiling->speed = ceiling->oldspeed; - else - ceiling->speed = ceiling->oldspeed/2; - ceiling->direction = 1; + ceiling->speed = lines[ceiling->sourceline].args[3] << (FRACBITS - 2); } break; } @@ -383,18 +199,18 @@ void T_CrushCeiling(ceiling_t *ceiling) /** Starts a ceiling mover. * + * \param tag Tag. * \param line The source line. * \param type The type of ceiling movement. * \return 1 if at least one ceiling mover was started, 0 otherwise. * \sa EV_DoCrush, EV_DoFloor, EV_DoElevator, T_MoveCeiling */ -INT32 EV_DoCeiling(line_t *line, ceiling_e type) +INT32 EV_DoCeiling(mtag_t tag, line_t *line, ceiling_e type) { INT32 rtn = 0, firstone = 1; INT32 secnum = -1; sector_t *sec; ceiling_t *ceiling; - mtag_t tag = Tag_FGet(&line->tags); TAG_ITER_SECTORS(tag, secnum) { @@ -415,44 +231,12 @@ INT32 EV_DoCeiling(line_t *line, ceiling_e type) switch (type) { - case fastCrushAndRaise: - ceiling->crush = true; - ceiling->topheight = sec->ceilingheight; - ceiling->bottomheight = sec->floorheight + (8*FRACUNIT); - ceiling->direction = -1; - ceiling->speed = CEILSPEED * 2; - break; - - case crushAndRaise: - ceiling->crush = true; - ceiling->topheight = sec->ceilingheight; - /* FALLTHRU */ - case lowerAndCrush: - ceiling->bottomheight = sec->floorheight; - ceiling->bottomheight += 4*FRACUNIT; - ceiling->direction = -1; - ceiling->speed = line->dx; - break; - case raiseToHighest: ceiling->topheight = P_FindHighestCeilingSurrounding(sec); ceiling->direction = 1; ceiling->speed = CEILSPEED; break; - //SoM: 3/6/2000: Added Boom types - case lowerToLowest: - ceiling->bottomheight = P_FindLowestCeilingSurrounding(sec); - ceiling->direction = -1; - ceiling->speed = CEILSPEED; - break; - - case raiseToLowest: // Graue 09-07-2004 - ceiling->topheight = P_FindLowestCeilingSurrounding(sec) - 4*FRACUNIT; - ceiling->direction = 1; - ceiling->speed = line->dx; // hack - break; - case lowerToLowestFast: ceiling->bottomheight = P_FindLowestCeilingSurrounding(sec); ceiling->direction = -1; @@ -467,8 +251,7 @@ INT32 EV_DoCeiling(line_t *line, ceiling_e type) // Linedef executor excellence case moveCeilingByFrontSector: - ceiling->speed = P_AproxDistance(line->dx, line->dy); - ceiling->speed = FixedDiv(ceiling->speed,8*FRACUNIT); + ceiling->speed = line->args[2] << (FRACBITS - 3); if (line->frontsector->ceilingheight >= sec->ceilingheight) // Move up { ceiling->direction = 1; @@ -481,21 +264,13 @@ INT32 EV_DoCeiling(line_t *line, ceiling_e type) } // chained linedef executing ability - if (line->flags & ML_BLOCKMONSTERS) - { - // only set it on ONE of the moving sectors (the smallest numbered) - // and front side x offset must be positive - if (firstone && sides[line->sidenum[0]].textureoffset > 0) - ceiling->texture = (sides[line->sidenum[0]].textureoffset>>FRACBITS) - 32769; - else - ceiling->texture = -1; - } + // only set it on ONE of the moving sectors (the smallest numbered) + // only set it if there isn't also a floor mover + if (line->args[3] && line->args[1] == 1) + ceiling->tag = firstone ? (INT16)line->args[3] : 0; // flat changing ability - else if (line->flags & ML_NOCLIMB) - ceiling->texture = line->frontsector->ceilingpic; - else - ceiling->texture = -1; + ceiling->texture = line->args[4] ? line->frontsector->ceilingpic : -1; break; // More linedef executor junk @@ -512,64 +287,30 @@ INT32 EV_DoCeiling(line_t *line, ceiling_e type) ceiling->direction = -1; ceiling->bottomheight = line->frontsector->ceilingheight; } - ceiling->texture = line->frontsector->ceilingpic; + + // If flag is set, change ceiling texture after moving + ceiling->texture = line->args[2] ? line->frontsector->ceilingpic : -1; break; - case moveCeilingByFrontTexture: - if (line->flags & ML_NOCLIMB) + case moveCeilingByDistance: + if (line->args[4]) ceiling->speed = INT32_MAX/2; // as above, "instant" is one tic else - ceiling->speed = FixedDiv(sides[line->sidenum[0]].textureoffset,8*FRACUNIT); // texture x offset - if (sides[line->sidenum[0]].rowoffset > 0) + ceiling->speed = line->args[3] << (FRACBITS - 3); + if (line->args[2] > 0) { ceiling->direction = 1; // up - ceiling->topheight = sec->ceilingheight + sides[line->sidenum[0]].rowoffset; // texture y offset + ceiling->topheight = sec->ceilingheight + (line->args[2] << FRACBITS); } else { ceiling->direction = -1; // down - ceiling->bottomheight = sec->ceilingheight + sides[line->sidenum[0]].rowoffset; // texture y offset + ceiling->bottomheight = sec->ceilingheight + (line->args[2] << FRACBITS); } break; -/* - case lowerCeilingByLine: - ceiling->speed = FixedDiv(abs(line->dx),8*FRACUNIT); - ceiling->direction = -1; // Move down - ceiling->bottomheight = sec->ceilingheight - abs(line->dy); - break; - - case raiseCeilingByLine: - ceiling->speed = FixedDiv(abs(line->dx),8*FRACUNIT); - ceiling->direction = 1; // Move up - ceiling->topheight = sec->ceilingheight + abs(line->dy); - break; -*/ - case bounceCeiling: - ceiling->speed = P_AproxDistance(line->dx, line->dy); // same speed as elevateContinuous - ceiling->speed = FixedDiv(ceiling->speed,4*FRACUNIT); - ceiling->origspeed = ceiling->speed; - if (line->frontsector->ceilingheight >= sec->ceilingheight) // Move up - { - ceiling->direction = 1; - ceiling->topheight = line->frontsector->ceilingheight; - } - else // Move down - { - ceiling->direction = -1; - ceiling->bottomheight = line->frontsector->ceilingheight; - } - - // Any delay? - ceiling->delay = sides[line->sidenum[0]].textureoffset >> FRACBITS; - ceiling->delaytimer = sides[line->sidenum[0]].rowoffset >> FRACBITS; // Initial delay - - ceiling->texture = (fixed_t)(line - lines); // hack: use texture to store sourceline number - break; - case bounceCeilingCrush: - ceiling->speed = abs(line->dx); // same speed as elevateContinuous - ceiling->speed = FixedDiv(ceiling->speed,4*FRACUNIT); + ceiling->speed = line->args[2] << (FRACBITS - 2); // same speed as elevateContinuous ceiling->origspeed = ceiling->speed; if (line->frontsector->ceilingheight >= sec->ceilingheight) // Move up { @@ -583,10 +324,8 @@ INT32 EV_DoCeiling(line_t *line, ceiling_e type) } // Any delay? - ceiling->delay = sides[line->sidenum[0]].textureoffset >> FRACBITS; - ceiling->delaytimer = sides[line->sidenum[0]].rowoffset >> FRACBITS; // Initial delay - - ceiling->texture = (fixed_t)(line - lines); // hack: use texture to store sourceline number + ceiling->delay = line->args[5]; + ceiling->delaytimer = line->args[4]; // Initial delay break; default: @@ -594,28 +333,30 @@ INT32 EV_DoCeiling(line_t *line, ceiling_e type) } - ceiling->tag = tag; ceiling->type = type; firstone = 0; + + // interpolation + R_CreateInterpolator_SectorPlane(&ceiling->thinker, sec, true); } return rtn; } /** Starts a ceiling crusher. * + * \param tag Tag. * \param line The source line. * \param type The type of ceiling, either ::crushAndRaise or * ::fastCrushAndRaise. * \return 1 if at least one crusher was started, 0 otherwise. * \sa EV_DoCeiling, EV_DoFloor, EV_DoElevator, T_CrushCeiling */ -INT32 EV_DoCrush(line_t *line, ceiling_e type) +INT32 EV_DoCrush(mtag_t tag, line_t *line, ceiling_e type) { INT32 rtn = 0; INT32 secnum = -1; sector_t *sec; ceiling_t *ceiling; - mtag_t tag = Tag_FGet(&line->tags); TAG_ITER_SECTORS(tag, secnum) { @@ -633,47 +374,38 @@ INT32 EV_DoCrush(line_t *line, ceiling_e type) ceiling->sector = sec; ceiling->crush = true; ceiling->sourceline = (INT32)(line-lines); - - if (line->flags & ML_EFFECT4) - ceiling->oldspeed = FixedDiv(abs(line->dx),4*FRACUNIT); - else - ceiling->oldspeed = (R_PointToDist2(line->v2->x, line->v2->y, line->v1->x, line->v1->y)/16); + ceiling->speed = ceiling->origspeed = line->args[2] << (FRACBITS - 2); switch(type) { - case fastCrushAndRaise: // Up and then down + case raiseAndCrush: // Up and then down ceiling->topheight = P_FindHighestCeilingSurrounding(sec); ceiling->direction = 1; - ceiling->speed = ceiling->oldspeed; + // Retain stupid behavior for backwards compatibility + if (!udmf && !(line->flags & ML_MIDSOLID)) + ceiling->speed /= 2; + else + ceiling->speed = line->args[3] << (FRACBITS - 2); ceiling->bottomheight = sec->floorheight + FRACUNIT; break; case crushBothOnce: ceiling->topheight = sec->ceilingheight; ceiling->bottomheight = sec->floorheight + (sec->ceilingheight-sec->floorheight)/2; ceiling->direction = -1; - - if (line->flags & ML_EFFECT4) - ceiling->speed = ceiling->oldspeed; - else - ceiling->speed = ceiling->oldspeed*2; - break; case crushCeilOnce: default: // Down and then up. ceiling->topheight = sec->ceilingheight; ceiling->direction = -1; - - if (line->flags & ML_EFFECT4) - ceiling->speed = ceiling->oldspeed; - else - ceiling->speed = ceiling->oldspeed*2; - ceiling->bottomheight = sec->floorheight + FRACUNIT; break; } - ceiling->tag = tag; ceiling->type = type; + + // interpolation + R_CreateInterpolator_SectorPlane(&ceiling->thinker, sec, false); + R_CreateInterpolator_SectorPlane(&ceiling->thinker, sec, true); } return rtn; } diff --git a/src/p_enemy.c b/src/p_enemy.c index 9a9edb5e3..c7d87b88a 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -12,6 +12,7 @@ /// \brief Enemy thinking, AI /// Action Pointer Functions that are associated with states/frames +#include "dehacked.h" #include "doomdef.h" #include "g_game.h" #include "p_local.h" @@ -107,6 +108,8 @@ void A_GoldMonitorRestore(mobj_t *actor); void A_GoldMonitorSparkle(mobj_t *actor); void A_Explode(mobj_t *actor); void A_BossDeath(mobj_t *actor); +void A_SetShadowScale(mobj_t *actor); +void A_ShadowScream(mobj_t *actor); void A_CustomPower(mobj_t *actor); void A_GiveWeapon(mobj_t *actor); void A_RingBox(mobj_t *actor); @@ -172,6 +175,7 @@ void A_Boss3TakeDamage(mobj_t *actor); void A_Boss3Path(mobj_t *actor); void A_Boss3ShockThink(mobj_t *actor); void A_LinedefExecute(mobj_t *actor); +void A_LinedefExecuteFromArg(mobj_t *actor); void A_PlaySeeSound(mobj_t *actor); void A_PlayAttackSound(mobj_t *actor); void A_PlayActiveSound(mobj_t *actor); @@ -200,6 +204,8 @@ void A_SetObjectFlags(mobj_t *actor); void A_SetObjectFlags2(mobj_t *actor); void A_RandomState(mobj_t *actor); void A_RandomStateRange(mobj_t *actor); +void A_StateRangeByAngle(mobj_t *actor); +void A_StateRangeByParameter(mobj_t *actor); void A_DualAction(mobj_t *actor); void A_RemoteAction(mobj_t *actor); void A_ToggleFlameJet(mobj_t *actor); @@ -492,7 +498,7 @@ static boolean P_WaterInSector(mobj_t *mobj, fixed_t x, fixed_t y) for (rover = sector->ffloors; rover; rover = rover->next) { - if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_SWIMMABLE)) + if (!(rover->fofflags & FOF_EXISTS) || !(rover->fofflags & FOF_SWIMMABLE)) continue; if (*rover->topheight >= mobj->floorz && *rover->topheight <= mobj->z) @@ -744,8 +750,8 @@ boolean P_LookForPlayers(mobj_t *actor, boolean allaround, boolean tracer, fixed if (player->mo->health <= 0) continue; // dead - if (player->bot) - continue; // ignore bots + if (player->bot == BOT_2PAI || player->bot == BOT_2PHUMAN) + continue; // ignore followbots if (player->quittime) continue; // Ignore uncontrolled bodies @@ -1327,7 +1333,7 @@ void A_FaceStabHurl(mobj_t *actor) hwork->destscale = FixedSqrt(step*basesize); P_SetScale(hwork, hwork->destscale); hwork->fuse = 2; - P_TeleportMove(hwork, actor->x + xo*(15-step), actor->y + yo*(15-step), actor->z + (actor->height - hwork->height)/2 + (P_MobjFlip(actor)*(8<x + xo*(15-step), actor->y + yo*(15-step), actor->z + (actor->height - hwork->height)/2 + (P_MobjFlip(actor)*(8<flags &= ~MF_SOLID; + if (!locvar1 || !(new = P_SpawnMobjFromMobj(actor, 0, 0, 0, locvar1))) return; @@ -1515,8 +1524,9 @@ void A_PointyThink(mobj_t *actor) INT32 i; player_t *player = NULL; mobj_t *ball; - TVector v; - TVector *res; + matrix_t m; + vector4_t v; + vector4_t res; angle_t fa; fixed_t radius = FixedMul(actor->info->radius*actor->info->reactiontime, actor->scale); boolean firsttime = true; @@ -1561,6 +1571,8 @@ void A_PointyThink(mobj_t *actor) // Okay, we found the closest player. Let's move based on his movement. P_SetTarget(&actor->target, player->mo); A_FaceTarget(actor); + if (P_MobjWasRemoved(actor)) + return; if (P_AproxDistance(player->mo->x - actor->x, player->mo->y - actor->y) < P_AproxDistance(player->mo->x + player->mo->momx - actor->x, player->mo->y + player->mo->momy - actor->y)) sign = -1; // Player is moving away @@ -1579,6 +1591,10 @@ void A_PointyThink(mobj_t *actor) if (!actor->tracer) // For some reason we do not have spike balls... return; + // Catch case where actor lastlook is -1 (which segfaults the following blocks) + if (actor->lastlook < 0) + return; + // Position spike balls relative to the value of 'lastlook'. ball = actor->tracer; @@ -1586,20 +1602,21 @@ void A_PointyThink(mobj_t *actor) while (ball) { fa = actor->lastlook+i; - v[0] = FixedMul(FINECOSINE(fa),radius); - v[1] = 0; - v[2] = FixedMul(FINESINE(fa),radius); - v[3] = FRACUNIT; + v.x = FixedMul(FINECOSINE(fa),radius); + v.y = 0; + v.z = FixedMul(FINESINE(fa),radius); + v.a = FRACUNIT; - res = VectorMatrixMultiply(v, *RotateXMatrix(FixedAngle(actor->lastlook+i))); - M_Memcpy(&v, res, sizeof (v)); - res = VectorMatrixMultiply(v, *RotateZMatrix(actor->angle+ANGLE_180)); - M_Memcpy(&v, res, sizeof (v)); + FM_RotateX(&m, FixedAngle(actor->lastlook+i)); + FV4_Copy(&v, FM_MultMatrixVec4(&m, &v, &res)); + + FM_RotateZ(&m, actor->angle+ANGLE_180); + FV4_Copy(&v, FM_MultMatrixVec4(&m, &v, &res)); P_UnsetThingPosition(ball); - ball->x = actor->x + v[0]; - ball->y = actor->y + v[1]; - ball->z = actor->z + (actor->height>>1) + v[2]; + ball->x = actor->x + v.x; + ball->y = actor->y + v.y; + ball->z = actor->z + (actor->height>>1) + v.z; P_SetThingPosition(ball); ball = ball->tracer; @@ -1675,6 +1692,8 @@ void A_HoodFire(mobj_t *actor) } A_FaceTarget(actor); + if (P_MobjWasRemoved(actor)) + return; if (!(arrow = P_SpawnMissile(actor, actor->target, (mobjtype_t)locvar1))) return; @@ -1709,7 +1728,7 @@ void A_HoodThink(mobj_t *actor) dx = (actor->target->x - actor->x), dy = (actor->target->y - actor->y), dz = (actor->target->z - actor->z); dm = P_AproxDistance(dx, dy); // Target dangerously close to robohood, retreat then. - if ((dm < 256<flags2 & MF2_AMBUSH)) { S_StartSound(actor, actor->info->attacksound); P_SetMobjState(actor, actor->info->raisestate); @@ -2087,7 +2106,7 @@ void A_CrushclawAim(mobj_t *actor) #undef anglimit #undef angfactor - P_TeleportMove(actor, + P_MoveOrigin(actor, crab->x + P_ReturnThrustX(actor, actor->angle, locvar1*crab->scale), crab->y + P_ReturnThrustY(actor, actor->angle, locvar1*crab->scale), crab->z + locvar2*crab->scale); @@ -2216,7 +2235,7 @@ void A_CrushclawLaunch(mobj_t *actor) } } - if (!actor->target) + if (P_MobjWasRemoved(actor->target)) return; { @@ -2225,7 +2244,7 @@ void A_CrushclawLaunch(mobj_t *actor) fixed_t idx = dx, idy = dy, idz = dz; while (chain) { - P_TeleportMove(chain, actor->target->x + idx, actor->target->y + idy, actor->target->z + idz); + P_MoveOrigin(chain, actor->target->x + idx, actor->target->y + idy, actor->target->z + idz); chain->movefactor = chain->z; idx += dx; idy += dy; @@ -2255,6 +2274,8 @@ void A_VultureVtol(mobj_t *actor) actor->flags |= MF_FLOAT; A_FaceTarget(actor); + if (P_MobjWasRemoved(actor)) + return; S_StopSound(actor); @@ -2353,6 +2374,9 @@ void A_VultureHover(mobj_t *actor) P_VultureHoverParticle(actor); A_FaceTarget(actor); + if (P_MobjWasRemoved(actor)) + return; + targetz = actor->target->z + actor->target->height / 2; for (i = -1; i <= 1; i++) { @@ -2655,12 +2679,12 @@ void A_LobShot(mobj_t *actor) { INT32 locvar1 = var1; INT32 locvar2 = var2 >> 16; - mobj_t *shot, *hitspot; + mobj_t *shot; angle_t an; fixed_t z; fixed_t dist; fixed_t vertical, horizontal; - fixed_t airtime = var2 & 65535; + fixed_t airtime = max(1, var2 & 65535); if (LUA_CallAction(A_LOBSHOT, actor)) return; @@ -2669,6 +2693,8 @@ void A_LobShot(mobj_t *actor) return; A_FaceTarget(actor); + if (P_MobjWasRemoved(actor)) + return; if (actor->eflags & MFE_VERTICALFLIP) { @@ -2694,11 +2720,6 @@ void A_LobShot(mobj_t *actor) P_SetScale(shot, actor->scale); } - // Keep track of where it's going to land - hitspot = P_SpawnMobj(actor->target->x&(64*FRACUNIT-1), actor->target->y&(64*FRACUNIT-1), actor->target->subsector->sector->floorheight, MT_NULL); - hitspot->tics = airtime; - P_SetTarget(&shot->tracer, hitspot); - P_SetTarget(&shot->target, actor); // where it came from shot->angle = an = actor->angle; @@ -2769,6 +2790,8 @@ void A_FireShot(mobj_t *actor) return; A_FaceTarget(actor); + if (P_MobjWasRemoved(actor)) + return; if (actor->eflags & MFE_VERTICALFLIP) z = actor->z + actor->height - FixedMul(48*FRACUNIT + locvar2*FRACUNIT, actor->scale); @@ -2807,6 +2830,8 @@ void A_SuperFireShot(mobj_t *actor) return; A_FaceTarget(actor); + if (P_MobjWasRemoved(actor)) + return; if (actor->eflags & MFE_VERTICALFLIP) z = actor->z + actor->height - FixedMul(48*FRACUNIT + locvar2*FRACUNIT, actor->scale); @@ -2854,6 +2879,8 @@ void A_BossFireShot(mobj_t *actor) return; A_FaceTarget(actor); + if (P_MobjWasRemoved(actor)) + return; switch (locvar2) { @@ -2941,6 +2968,8 @@ void A_Boss7FireMissiles(mobj_t *actor) } A_FaceTarget(actor); + if (P_MobjWasRemoved(actor)) + return; S_StartSound(NULL, locvar2); @@ -3325,6 +3354,8 @@ void A_SkullAttack(mobj_t *actor) if (actor->info->activesound) S_StartSound(actor, actor->info->activesound); A_FaceTarget(actor); + if (P_MobjWasRemoved(actor)) + return; dist = P_AproxDistance(dest->x - actor->x, dest->y - actor->y); @@ -3334,20 +3365,18 @@ void A_SkullAttack(mobj_t *actor) actor->angle += (P_RandomChance(FRACUNIT/2)) ? ANGLE_90 : -ANGLE_90; else if (locvar1 == 3) { - statenum_t oldspawnstate = mobjinfo[MT_NULL].spawnstate; - UINT32 oldflags = mobjinfo[MT_NULL].flags; - fixed_t oldradius = mobjinfo[MT_NULL].radius; - fixed_t oldheight = mobjinfo[MT_NULL].height; - mobj_t *check; + statenum_t oldspawnstate = mobjinfo[MT_RAY].spawnstate; + UINT32 oldflags = mobjinfo[MT_RAY].flags; + fixed_t oldradius = mobjinfo[MT_RAY].radius; + fixed_t oldheight = mobjinfo[MT_RAY].height; INT32 i, j; static INT32 k;/* static for (at least) GCC 9.1 weirdness */ - boolean allow; angle_t testang = 0; - mobjinfo[MT_NULL].spawnstate = S_INVISIBLE; - mobjinfo[MT_NULL].flags = MF_NOGRAVITY|MF_NOTHINK|MF_NOCLIPTHING|MF_NOBLOCKMAP; - mobjinfo[MT_NULL].radius = mobjinfo[actor->type].radius; - mobjinfo[MT_NULL].height = mobjinfo[actor->type].height; + mobjinfo[MT_RAY].spawnstate = S_INVISIBLE; + mobjinfo[MT_RAY].flags = MF_NOGRAVITY|MF_NOTHINK|MF_NOCLIPTHING|MF_NOBLOCKMAP; + mobjinfo[MT_RAY].radius = mobjinfo[actor->type].radius; + mobjinfo[MT_RAY].height = mobjinfo[actor->type].height; if (P_RandomChance(FRACUNIT/2)) // port priority 1? { @@ -3360,15 +3389,12 @@ void A_SkullAttack(mobj_t *actor) j = 9; } -#define dostuff(q) check = P_SpawnMobjFromMobj(actor, 0, 0, 0, MT_NULL);\ +#define dostuff(q) \ testang = actor->angle + ((i+(q))*ANG10);\ - allow = (P_TryMove(check,\ - P_ReturnThrustX(check, testang, dist + 2*actor->radius),\ - P_ReturnThrustY(check, testang, dist + 2*actor->radius),\ - true));\ - P_RemoveMobj(check);\ - if (allow)\ - break; + if (P_CheckMove(actor,\ + P_ReturnThrustX(actor, testang, dist + 2*actor->radius),\ + P_ReturnThrustY(actor, testang, dist + 2*actor->radius),\ + true)) break; if (P_RandomChance(FRACUNIT/2)) // port priority 2? { @@ -3394,10 +3420,10 @@ void A_SkullAttack(mobj_t *actor) #undef dostuff - mobjinfo[MT_NULL].spawnstate = oldspawnstate; - mobjinfo[MT_NULL].flags = oldflags; - mobjinfo[MT_NULL].radius = oldradius; - mobjinfo[MT_NULL].height = oldheight; + mobjinfo[MT_RAY].spawnstate = oldspawnstate; + mobjinfo[MT_RAY].flags = oldflags; + mobjinfo[MT_RAY].radius = oldradius; + mobjinfo[MT_RAY].height = oldheight; } an = actor->angle >> ANGLETOFINESHIFT; @@ -3441,6 +3467,9 @@ void A_BossZoom(mobj_t *actor) if (actor->info->attacksound) S_StartAttackSound(actor, actor->info->attacksound); A_FaceTarget(actor); + if (P_MobjWasRemoved(actor)) + return; + an = actor->angle >> ANGLETOFINESHIFT; actor->momx = FixedMul(FixedMul(actor->info->speed*5*FRACUNIT, actor->scale), FINECOSINE(an)); actor->momy = FixedMul(FixedMul(actor->info->speed*5*FRACUNIT, actor->scale), FINESINE(an)); @@ -3518,9 +3547,7 @@ void A_Scream(mobj_t *actor) if (LUA_CallAction(A_SCREAM, actor)) return; - if (actor->tracer && (actor->tracer->type == MT_SHELL || actor->tracer->type == MT_FIREBALL)) - S_StartScreamSound(actor, sfx_mario2); - else if (actor->info->deathsound) + if (actor->info->deathsound && !S_SoundPlaying(actor, sfx_mario2)) S_StartScreamSound(actor, actor->info->deathsound); } @@ -3591,7 +3618,7 @@ void A_1upThinker(mobj_t *actor) for (i = 0; i < MAXPLAYERS; i++) { - if (!playeringame[i] || players[i].bot || players[i].spectator) + if (!playeringame[i] || players[i].bot == BOT_2PAI || players[i].bot == BOT_2PHUMAN || players[i].spectator) continue; if (!players[i].mo) @@ -3717,8 +3744,8 @@ void A_MonitorPop(mobj_t *actor) // Run a linedef executor immediately upon popping // You may want to delay your effects by 18 tics to sync with the reward giving - if (actor->spawnpoint && actor->lastlook) - P_LinedefExecute(actor->lastlook, actor->target, NULL); + if (actor->spawnpoint && actor->spawnpoint->args[0]) + P_LinedefExecute(actor->spawnpoint->args[0], actor->target, NULL); } // Function: A_GoldMonitorPop @@ -3803,8 +3830,8 @@ void A_GoldMonitorPop(mobj_t *actor) // Run a linedef executor immediately upon popping // You may want to delay your effects by 18 tics to sync with the reward giving - if (actor->spawnpoint && actor->lastlook) - P_LinedefExecute(actor->lastlook, actor->target, NULL); + if (actor->spawnpoint && actor->spawnpoint->args[0]) + P_LinedefExecute(actor->spawnpoint->args[0], actor->target, NULL); } // Function: A_GoldMonitorRestore @@ -3862,58 +3889,61 @@ void A_Explode(mobj_t *actor) P_RadiusAttack(actor, actor->target, actor->info->damage, locvar1, true); } -// Function: A_BossDeath -// -// Description: Possibly trigger special effects when boss dies. -// -// var1 = unused -// var2 = unused -// -void A_BossDeath(mobj_t *mo) +static mobj_t *P_FindBossFlyPoint(mobj_t *mo, INT32 tag) +{ + INT32 i; + mobj_t *closest = NULL; + + TAG_ITER_THINGS(tag, i) + { + mobj_t *mo2 = mapthings[i].mobj; + + if (!mo2) + continue; + + if (mo2->type != MT_BOSSFLYPOINT) + continue; + + // If this one's further than the last one, don't go for it. + if (closest && + P_AproxDistance(P_AproxDistance(mo->x - mo2->x, mo->y - mo2->y), mo->z - mo2->z) > + P_AproxDistance(P_AproxDistance(mo->x - closest->x, mo->y - closest->y), mo->z - closest->z)) + continue; + + closest = mo2; + } + + return closest; +} + +static void P_DoBossVictory(mobj_t *mo) { thinker_t *th; mobj_t *mo2; - line_t junk; INT32 i; - if (LUA_CallAction(A_BOSSDEATH, mo)) - return; - - if (mo->spawnpoint && mo->spawnpoint->extrainfo) - P_LinedefExecute(LE_BOSSDEAD+(mo->spawnpoint->extrainfo*LE_PARAMWIDTH), mo, NULL); - else - P_LinedefExecute(LE_BOSSDEAD, mo, NULL); - mo->health = 0; - - // Boss is dead (but not necessarily fleeing...) - // Lua may use this to ignore bosses after they start fleeing - mo->flags2 |= MF2_BOSSDEAD; - - // make sure there is a player alive for victory - for (i = 0; i < MAXPLAYERS; i++) - if (playeringame[i] && ((players[i].mo && players[i].mo->health) - || ((netgame || multiplayer) && (players[i].lives || players[i].continues)))) - break; - - if (i == MAXPLAYERS) - return; // no one left alive, so do not end game - - // scan the remaining thinkers to see - // if all bosses are dead + // scan the remaining thinkers to see if all bosses are dead for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next) { if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed) continue; mo2 = (mobj_t *)th; - if (mo2 != mo && (mo2->flags & MF_BOSS) && mo2->health > 0) - goto bossjustdie; // other boss not dead - just go straight to dying! + + if (mo2 == mo) + continue; + + if ((mo2->flags & MF_BOSS) && mo2->health > 0) + return; } // victory! - P_LinedefExecute(LE_ALLBOSSESDEAD, mo, NULL); + if (mo->spawnpoint) + P_LinedefExecute(mo->spawnpoint->args[3], mo, NULL); + if (stoppedclock && modeattacking) // if you're just time attacking, skip making the capsule appear since you don't need to step on it anyways. - goto bossjustdie; + return; + if (mo->flags2 & MF2_BOSSNOTRAP) { for (i = 0; i < MAXPLAYERS; i++) @@ -3925,18 +3955,14 @@ void A_BossDeath(mobj_t *mo) } else { - // Initialize my junk - junk.tags.tags = NULL; - junk.tags.count = 0; - - // Bring the egg trap up to the surface - // Incredibly shitty code ahead - Tag_FSet(&junk.tags, LE_CAPSULE0); - EV_DoElevator(&junk, elevateHighest, false); - Tag_FSet(&junk.tags, LE_CAPSULE1); - EV_DoElevator(&junk, elevateUp, false); - Tag_FSet(&junk.tags, LE_CAPSULE2); - EV_DoElevator(&junk, elevateHighest, false); + if (!udmf) + { + // Bring the egg trap up to the surface + // Incredibly shitty code ahead + EV_DoElevator(LE_CAPSULE0, NULL, elevateHighest); + EV_DoElevator(LE_CAPSULE1, NULL, elevateUp); + EV_DoElevator(LE_CAPSULE2, NULL, elevateHighest); + } if (mapheaderinfo[gamemap-1]->muspostbossname[0] && S_MusicExists(mapheaderinfo[gamemap-1]->muspostbossname, !midi_disabled, !digital_disabled)) @@ -3960,9 +3986,197 @@ void A_BossDeath(mobj_t *mo) mapheaderinfo[gamemap-1]->muspostbossfadein); } } +} -bossjustdie: - if (LUAh_BossDeath(mo)) +static void P_SpawnBoss1Junk(mobj_t *mo) +{ + mobj_t *mo2 = P_SpawnMobjFromMobj(mo, + P_ReturnThrustX(mo, mo->angle - ANGLE_90, 32<angle - ANGLE_90, 32<angle = mo->angle; + P_InstaThrust(mo2, mo2->angle - ANGLE_90, 4*mo2->scale); + P_SetObjectMomZ(mo2, 4*FRACUNIT, false); + P_SetMobjState(mo2, S_BOSSEGLZ1); + + mo2 = P_SpawnMobjFromMobj(mo, + P_ReturnThrustX(mo, mo->angle + ANGLE_90, 32<angle + ANGLE_90, 32<angle = mo->angle; + P_InstaThrust(mo2, mo2->angle + ANGLE_90, 4*mo2->scale); + P_SetObjectMomZ(mo2, 4*FRACUNIT, false); + P_SetMobjState(mo2, S_BOSSEGLZ2); +} + +static void P_SpawnBoss2Junk(mobj_t *mo) +{ + mobj_t *mo2 = P_SpawnMobjFromMobj(mo, + P_ReturnThrustX(mo, mo->angle - ANGLE_90, 32<angle - ANGLE_90, 32<angle = mo->angle; + P_InstaThrust(mo2, mo2->angle - ANGLE_90, 4*mo2->scale); + P_SetObjectMomZ(mo2, 4*FRACUNIT, false); + P_SetMobjState(mo2, S_BOSSTANK1); + + mo2 = P_SpawnMobjFromMobj(mo, + P_ReturnThrustX(mo, mo->angle + ANGLE_90, 32<angle + ANGLE_90, 32<angle = mo->angle; + P_InstaThrust(mo2, mo2->angle + ANGLE_90, 4*mo2->scale); + P_SetObjectMomZ(mo2, 4*FRACUNIT, false); + P_SetMobjState(mo2, S_BOSSTANK2); + + mo2 = P_SpawnMobjFromMobj(mo, 0, 0, + mobjinfo[MT_EGGMOBILE2].height + (32<angle = mo->angle; + P_SetObjectMomZ(mo2, 4*FRACUNIT, false); + mo2->momz += mo->momz; + P_SetMobjState(mo2, S_BOSSSPIGOT); +} + +static void P_SpawnBoss3Junk(mobj_t *mo) +{ + mobj_t *mo2 = P_SpawnMobjFromMobj(mo, 0, 0, 0, MT_BOSSJUNK); + mo2->angle = mo->angle; + P_SetMobjState(mo2, S_BOSSSEBH1); +} + +static void P_DoCybrakdemonDeath(mobj_t *mo) +{ + mo->flags |= MF_NOCLIP; + mo->flags &= ~(MF_SPECIAL|MF_NOGRAVITY|MF_NOCLIPHEIGHT); + + S_StartSound(NULL, sfx_bedie2); + P_SpawnMobjFromMobj(mo, 0, 0, 0, MT_CYBRAKDEMON_VILE_EXPLOSION); + mo->z += P_MobjFlip(mo); + P_SetObjectMomZ(mo, 12*FRACUNIT, false); + S_StartSound(mo, sfx_bgxpld); + if (mo->spawnpoint && !(mo->spawnpoint->args[6] & TMB_NODEATHFLING)) + P_InstaThrust(mo, R_PointToAngle2(0, 0, mo->x, mo->y), 14*FRACUNIT); +} + +static void P_DoBoss5Death(mobj_t *mo) +{ + if (mo->flags2 & MF2_SLIDEPUSH) + { + P_RemoveMobj(mo); + return; + } + if (mo->tracer) + { + var1 = var2 = 0; + A_Boss5Jump(mo); + mo->momx = ((16 - 1)*mo->momx)/16; + mo->momy = ((16 - 1)*mo->momy)/16; + { + const fixed_t time = FixedHypot(mo->tracer->x - mo->x, mo->tracer->y - mo->y)/FixedHypot(mo->momx, mo->momy); + const fixed_t speed = 64*FRACUNIT; + mobj_t *pole = P_SpawnMobj( + mo->tracer->x - P_ReturnThrustX(mo->tracer, mo->tracer->angle, speed*time), + mo->tracer->y - P_ReturnThrustY(mo->tracer, mo->tracer->angle, speed*time), + mo->tracer->floorz + (256+1)*FRACUNIT, + MT_FSGNB); + P_SetTarget(&pole->tracer, P_SpawnMobj( + pole->x, pole->y, + pole->z - 256*FRACUNIT, + MT_FSGNB)); + P_SetTarget(&pole->tracer->tracer, P_SpawnMobj( + pole->x + P_ReturnThrustX(pole, mo->tracer->angle, FRACUNIT), + pole->y + P_ReturnThrustY(pole, mo->tracer->angle, FRACUNIT), + pole->z + 256*FRACUNIT, + MT_FSGNA)); + pole->tracer->flags |= MF_NOCLIPTHING; + P_SetScale(pole, (pole->destscale = 2*FRACUNIT)); + P_SetScale(pole->tracer, (pole->tracer->destscale = 2*FRACUNIT)); + pole->angle = pole->tracer->angle = mo->tracer->angle; + pole->tracer->tracer->angle = pole->angle - ANGLE_90; + pole->momx = P_ReturnThrustX(pole, pole->angle, speed); + pole->momy = P_ReturnThrustY(pole, pole->angle, speed); + pole->tracer->momx = pole->momx; + pole->tracer->momy = pole->momy; + pole->tracer->tracer->momx = pole->momx; + pole->tracer->tracer->momy = pole->momy; + } + } + else + { + P_SetObjectMomZ(mo, 10*FRACUNIT, false); + mo->flags |= MF_NOGRAVITY; + } + mo->flags |= MF_NOCLIP|MF_NOCLIPHEIGHT; +} + +static void P_DoBossDefaultDeath(mobj_t *mo) +{ + INT32 bossid = (mo->spawnpoint ? mo->spawnpoint->args[0] : 0); + + // Stop exploding and prepare to run. + P_SetMobjState(mo, mo->info->xdeathstate); + if (P_MobjWasRemoved(mo)) + return; + + P_SetTarget(&mo->target, P_FindBossFlyPoint(mo, bossid)); + + mo->flags |= MF_NOGRAVITY|MF_NOCLIP; + mo->flags |= MF_NOCLIPHEIGHT; + + mo->movedir = 0; + mo->extravalue1 = 35; + mo->flags2 |= MF2_BOSSFLEE; + mo->momz = P_MobjFlip(mo)*2*mo->scale; + + if (mo->target) + { + angle_t diff = R_PointToAngle2(mo->x, mo->y, mo->target->x, mo->target->y) - mo->angle; + if (diff) + { + if (diff > ANGLE_180) + diff = InvAngle(InvAngle(diff)/mo->extravalue1); + else + diff /= mo->extravalue1; + mo->movedir = diff; + } + } +} + +// Function: A_BossDeath +// +// Description: Possibly trigger special effects when boss dies. +// +// var1 = unused +// var2 = unused +// +void A_BossDeath(mobj_t *mo) +{ + INT32 i; + + if (LUA_CallAction(A_BOSSDEATH, mo)) + return; + + if (mo->spawnpoint) + P_LinedefExecute(mo->spawnpoint->args[2], mo, NULL); + mo->health = 0; + + // Boss is dead (but not necessarily fleeing...) + // Lua may use this to ignore bosses after they start fleeing + mo->flags2 |= MF2_BOSSDEAD; + + // make sure there is a player alive for victory + for (i = 0; i < MAXPLAYERS; i++) + if (playeringame[i] && ((players[i].mo && players[i].mo->health) + || ((netgame || multiplayer) && (players[i].lives || players[i].continues)))) + break; + + if (i == MAXPLAYERS) + return; // no one left alive, so do not end game + + P_DoBossVictory(mo); + + if (LUA_HookMobj(mo, MOBJ_HOOK(BossDeath))) return; else if (P_MobjWasRemoved(mo)) return; @@ -3973,61 +4187,13 @@ bossjustdie: default: break; case MT_EGGMOBILE: // twin laser pods - { - mo2 = P_SpawnMobjFromMobj(mo, - P_ReturnThrustX(mo, mo->angle - ANGLE_90, 32<angle - ANGLE_90, 32<angle = mo->angle; - P_InstaThrust(mo2, mo2->angle - ANGLE_90, 4*mo2->scale); - P_SetObjectMomZ(mo2, 4*FRACUNIT, false); - P_SetMobjState(mo2, S_BOSSEGLZ1); - - mo2 = P_SpawnMobjFromMobj(mo, - P_ReturnThrustX(mo, mo->angle + ANGLE_90, 32<angle + ANGLE_90, 32<angle = mo->angle; - P_InstaThrust(mo2, mo2->angle + ANGLE_90, 4*mo2->scale); - P_SetObjectMomZ(mo2, 4*FRACUNIT, false); - P_SetMobjState(mo2, S_BOSSEGLZ2); - } + P_SpawnBoss1Junk(mo); break; case MT_EGGMOBILE2: // twin tanks + spigot - { - mo2 = P_SpawnMobjFromMobj(mo, - P_ReturnThrustX(mo, mo->angle - ANGLE_90, 32<angle - ANGLE_90, 32<angle = mo->angle; - P_InstaThrust(mo2, mo2->angle - ANGLE_90, 4*mo2->scale); - P_SetObjectMomZ(mo2, 4*FRACUNIT, false); - P_SetMobjState(mo2, S_BOSSTANK1); - - mo2 = P_SpawnMobjFromMobj(mo, - P_ReturnThrustX(mo, mo->angle + ANGLE_90, 32<angle + ANGLE_90, 32<angle = mo->angle; - P_InstaThrust(mo2, mo2->angle + ANGLE_90, 4*mo2->scale); - P_SetObjectMomZ(mo2, 4*FRACUNIT, false); - P_SetMobjState(mo2, S_BOSSTANK2); - - mo2 = P_SpawnMobjFromMobj(mo, 0, 0, - mobjinfo[MT_EGGMOBILE2].height + (32<angle = mo->angle; - P_SetObjectMomZ(mo2, 4*FRACUNIT, false); - mo2->momz += mo->momz; - P_SetMobjState(mo2, S_BOSSSPIGOT); - } + P_SpawnBoss2Junk(mo); break; case MT_EGGMOBILE3: - { - mo2 = P_SpawnMobjFromMobj(mo, 0, 0, 0, MT_BOSSJUNK); - mo2->angle = mo->angle; - P_SetMobjState(mo2, S_BOSSSEBH1); - } + P_SpawnBoss3Junk(mo); break; } @@ -4035,150 +4201,58 @@ bossjustdie: switch (mo->type) { case MT_BLACKEGGMAN: - { mo->flags |= MF_NOCLIP; mo->flags &= ~MF_SPECIAL; S_StartSound(NULL, sfx_befall); break; - } case MT_CYBRAKDEMON: - { - mo->flags |= MF_NOCLIP; - mo->flags &= ~(MF_SPECIAL|MF_NOGRAVITY|MF_NOCLIPHEIGHT); - - S_StartSound(NULL, sfx_bedie2); - P_SpawnMobjFromMobj(mo, 0, 0, 0, MT_CYBRAKDEMON_VILE_EXPLOSION); - mo->z += P_MobjFlip(mo); - P_SetObjectMomZ(mo, 12*FRACUNIT, false); - S_StartSound(mo, sfx_bgxpld); - if (mo->spawnpoint && !(mo->spawnpoint->options & MTF_EXTRA)) - P_InstaThrust(mo, R_PointToAngle2(0, 0, mo->x, mo->y), 14*FRACUNIT); + P_DoCybrakdemonDeath(mo); break; - } - case MT_KOOPA: - { - // Initialize my junk - junk.tags.tags = NULL; - junk.tags.count = 0; - - Tag_FSet(&junk.tags, LE_KOOPA); - EV_DoCeiling(&junk, raiseToHighest); - return; - } case MT_FANG: - { - if (mo->flags2 & MF2_SLIDEPUSH) - { - P_RemoveMobj(mo); - return; - } - if (mo->tracer) - { - var1 = var2 = 0; - A_Boss5Jump(mo); - mo->momx = ((16 - 1)*mo->momx)/16; - mo->momy = ((16 - 1)*mo->momy)/16; - { - const fixed_t time = FixedHypot(mo->tracer->x - mo->x, mo->tracer->y - mo->y)/FixedHypot(mo->momx, mo->momy); - const fixed_t speed = 64*FRACUNIT; - mobj_t *pole = P_SpawnMobj( - mo->tracer->x - P_ReturnThrustX(mo->tracer, mo->tracer->angle, speed*time), - mo->tracer->y - P_ReturnThrustY(mo->tracer, mo->tracer->angle, speed*time), - mo->tracer->floorz + (256+1)*FRACUNIT, - MT_FSGNB); - P_SetTarget(&pole->tracer, P_SpawnMobj( - pole->x, pole->y, - pole->z - 256*FRACUNIT, - MT_FSGNB)); - P_SetTarget(&pole->tracer->tracer, P_SpawnMobj( - pole->x + P_ReturnThrustX(pole, mo->tracer->angle, FRACUNIT), - pole->y + P_ReturnThrustY(pole, mo->tracer->angle, FRACUNIT), - pole->z + 256*FRACUNIT, - MT_FSGNA)); - pole->tracer->flags |= MF_NOCLIPTHING; - P_SetScale(pole, (pole->destscale = 2*FRACUNIT)); - P_SetScale(pole->tracer, (pole->tracer->destscale = 2*FRACUNIT)); - pole->angle = pole->tracer->angle = mo->tracer->angle; - pole->tracer->tracer->angle = pole->angle - ANGLE_90; - pole->momx = P_ReturnThrustX(pole, pole->angle, speed); - pole->momy = P_ReturnThrustY(pole, pole->angle, speed); - pole->tracer->momx = pole->momx; - pole->tracer->momy = pole->momy; - pole->tracer->tracer->momx = pole->momx; - pole->tracer->tracer->momy = pole->momy; - } - } - else - { - P_SetObjectMomZ(mo, 10*FRACUNIT, false); - mo->flags |= MF_NOGRAVITY; - } - mo->flags |= MF_NOCLIP|MF_NOCLIPHEIGHT; - return; - } - default: //eggmobiles - { - UINT8 extrainfo = (mo->spawnpoint ? mo->spawnpoint->extrainfo : 0); - - // Stop exploding and prepare to run. - P_SetMobjState(mo, mo->info->xdeathstate); - if (P_MobjWasRemoved(mo)) - return; - - P_SetTarget(&mo->target, NULL); - - // Flee! Flee! Find a point to escape to! If none, just shoot upward! - // scan the thinkers to find the runaway point - for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next) - { - if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed) - continue; - - mo2 = (mobj_t *)th; - - if (mo2->type != MT_BOSSFLYPOINT) - continue; - - if (mo2->spawnpoint && mo2->spawnpoint->extrainfo != extrainfo) - continue; - - // If this one's further then the last one, don't go for it. - if (mo->target && - P_AproxDistance(P_AproxDistance(mo->x - mo2->x, mo->y - mo2->y), mo->z - mo2->z) > - P_AproxDistance(P_AproxDistance(mo->x - mo->target->x, mo->y - mo->target->y), mo->z - mo->target->z)) - continue; - - // Otherwise... Do! - P_SetTarget(&mo->target, mo2); - } - - mo->flags |= MF_NOGRAVITY|MF_NOCLIP; - mo->flags |= MF_NOCLIPHEIGHT; - - mo->movedir = 0; - mo->extravalue1 = 35; - mo->flags2 |= MF2_BOSSFLEE; - mo->momz = P_MobjFlip(mo)*2*mo->scale; - - if (mo->target) - { - angle_t diff = R_PointToAngle2(mo->x, mo->y, mo->target->x, mo->target->y) - mo->angle; - if (diff) - { - if (diff > ANGLE_180) - diff = InvAngle(InvAngle(diff)/mo->extravalue1); - else - diff /= mo->extravalue1; - mo->movedir = diff; - } - } - + P_DoBoss5Death(mo); + break; + default: //eggmobiles + P_DoBossDefaultDeath(mo); break; - } } } +// Function: A_SetShadowScale +// +// Description: Sets the target's shadowscale. +// +// var1 = new fixed_t shadowscale (default = FRACUNIT) +// var2 = unused +// +void A_SetShadowScale(mobj_t *actor) +{ + INT32 locvar1 = var1; + + if (LUA_CallAction(A_SETSHADOWSCALE, actor)) + return; + + actor->shadowscale = locvar1; +} + + +// Function: A_ShadowScream +// +// Description: Sets the target's shadowscale and starts the death sound of the object. +// +// var1 = new fixed_t shadowscale (default = FRACUNIT) +// var2 = unused +// +void A_ShadowScream(mobj_t *actor) +{ + if (LUA_CallAction(A_SHADOWSCREAM, actor)) + return; + + A_SetShadowScale(actor); + A_Scream(actor); +} + + // Function: A_CustomPower // // Description: Provides a custom powerup. Target (must be a player) is awarded the powerup. Reactiontime of the object is used as an index to the powers array. @@ -4191,7 +4265,6 @@ void A_CustomPower(mobj_t *actor) player_t *player; INT32 locvar1 = var1; INT32 locvar2 = var2; - boolean spawnshield = false; if (LUA_CallAction(A_CUSTOMPOWER, actor)) return; @@ -4210,15 +4283,10 @@ void A_CustomPower(mobj_t *actor) player = actor->target->player; - if (locvar1 == pw_shield && player->powers[pw_shield] != locvar2) - spawnshield = true; + P_SetPower(player, locvar1, locvar2); - player->powers[locvar1] = (UINT16)locvar2; if (actor->info->seesound) S_StartSound(player->mo, actor->info->seesound); - - if (spawnshield) //workaround for a bug - P_SpawnShieldOrb(player); } // Function: A_GiveWeapon @@ -4815,12 +4883,16 @@ void A_FishJump(mobj_t *actor) fixed_t jumpval; if (locvar1) - jumpval = var1; + jumpval = locvar1; else - jumpval = FixedMul(AngleFixed(actor->angle)/4, actor->scale); + { + if (actor->spawnpoint && actor->spawnpoint->args[0]) + jumpval = actor->spawnpoint->args[0] << (FRACBITS - 2); + else + jumpval = 44 << (FRACBITS - 2); + } - if (!jumpval) jumpval = FixedMul(44*(FRACUNIT/4), actor->scale); - actor->momz = jumpval; + actor->momz = FixedMul(jumpval, actor->scale); P_SetMobjStateNF(actor, actor->info->seestate); } @@ -5297,7 +5369,7 @@ void A_OverlayThink(mobj_t *actor) actor->z = actor->target->z + actor->target->height - mobjinfo[actor->type].height - ((var2>>16) ? -1 : 1)*(var2&0xFFFF)*FRACUNIT; else actor->z = actor->target->z + ((var2>>16) ? -1 : 1)*(var2&0xFFFF)*FRACUNIT; - actor->angle = actor->target->angle + actor->movedir; + actor->angle = (actor->target->player ? actor->target->player->drawangle : actor->target->angle) + actor->movedir; actor->eflags = actor->target->eflags; actor->momx = actor->target->momx; @@ -5495,6 +5567,9 @@ void A_JetgShoot(mobj_t *actor) return; A_FaceTarget(actor); + if (P_MobjWasRemoved(actor)) + return; + P_SpawnMissile(actor, actor->target, (mobjtype_t)actor->info->raisestate); if (ultimatemode) @@ -5529,6 +5604,9 @@ void A_ShootBullet(mobj_t *actor) return; A_FaceTarget(actor); + if (P_MobjWasRemoved(actor)) + return; + P_SpawnMissile(actor, actor->target, (mobjtype_t)actor->info->raisestate); if (actor->info->attacksound) @@ -6197,48 +6275,34 @@ void A_RockSpawn(mobj_t *actor) { mobj_t *mo; mobjtype_t type; - INT32 i = Tag_FindLineSpecial(12, (INT16)actor->threshold); - line_t *line; fixed_t dist; - fixed_t randomoomph; if (LUA_CallAction(A_ROCKSPAWN, actor)) return; - if (i == -1) + if (!actor->spawnpoint) + return; + + type = actor->spawnpoint->stringargs[0] ? get_number(actor->spawnpoint->stringargs[0]) : MT_ROCKCRUMBLE1; + + if (type < MT_NULL || type >= NUMMOBJTYPES) { - CONS_Debug(DBG_GAMELOGIC, "A_RockSpawn: Unable to find parameter line 12 (tag %d)!\n", actor->threshold); + CONS_Debug(DBG_GAMELOGIC, "A_RockSpawn: Invalid mobj type %s!\n", actor->spawnpoint->stringargs[0]); return; } - line = &lines[i]; - - if (!(sides[line->sidenum[0]].textureoffset >> FRACBITS)) - { - CONS_Debug(DBG_GAMELOGIC, "A_RockSpawn: No X-offset detected! (tag %d)!\n", actor->threshold); - return; - } - - dist = P_AproxDistance(line->dx, line->dy)/16; - - if (dist < 1) - dist = 1; - - type = MT_ROCKCRUMBLE1 + (sides[line->sidenum[0]].rowoffset >> FRACBITS); - - if (line->flags & ML_NOCLIMB) - randomoomph = P_RandomByte() * (FRACUNIT/32); - else - randomoomph = 0; + dist = max(actor->spawnpoint->args[0] << (FRACBITS - 4), 1); + if (actor->spawnpoint->args[2]) + dist += actor->spawnpoint->args[2] ? P_RandomByte() * (FRACUNIT/32) : 0; // random oomph mo = P_SpawnMobj(actor->x, actor->y, actor->z, MT_FALLINGROCK); P_SetMobjState(mo, mobjinfo[type].spawnstate); - mo->angle = R_PointToAngle2(line->v2->x, line->v2->y, line->v1->x, line->v1->y); + mo->angle = FixedAngle(actor->spawnpoint->angle << FRACBITS); - P_InstaThrust(mo, mo->angle, dist + randomoomph); - mo->momz = dist + randomoomph; + P_InstaThrust(mo, mo->angle, dist); + mo->momz = dist; - var1 = sides[line->sidenum[0]].textureoffset >> FRACBITS; + var1 = actor->spawnpoint->args[1]; A_SetTics(actor); } @@ -6544,7 +6608,7 @@ void A_OldRingExplode(mobj_t *actor) { { const angle_t fa = (i*FINEANGLES/16) & FINEMASK; - mo = P_SpawnMobj(actor->x, actor->y, actor->z, locvar1); + mo = P_SpawnMobjFromMobj(actor, 0, 0, 0, locvar1); P_SetTarget(&mo->target, actor->target); // Transfer target so player gets the points mo->momx = FixedMul(FINECOSINE(fa),ns); @@ -6570,7 +6634,7 @@ void A_OldRingExplode(mobj_t *actor) { } } - mo = P_SpawnMobj(actor->x, actor->y, actor->z, locvar1); + mo = P_SpawnMobjFromMobj(actor, 0, 0, 0, locvar1); P_SetTarget(&mo->target, actor->target); mo->momz = ns; @@ -6585,7 +6649,7 @@ void A_OldRingExplode(mobj_t *actor) { mo->color = skincolor_bluering; } - mo = P_SpawnMobj(actor->x, actor->y, actor->z, locvar1); + mo = P_SpawnMobjFromMobj(actor, 0, 0, 0, locvar1); P_SetTarget(&mo->target, actor->target); mo->momz = -ns; @@ -7072,10 +7136,8 @@ void A_Boss1Chase(mobj_t *actor) } else { - if (actor->spawnpoint && actor->spawnpoint->extrainfo) - P_LinedefExecute(LE_PINCHPHASE+(actor->spawnpoint->extrainfo*LE_PARAMWIDTH), actor, NULL); - else - P_LinedefExecute(LE_PINCHPHASE, actor, NULL); + if (actor->spawnpoint) + P_LinedefExecute(actor->spawnpoint->args[4], actor, NULL); P_SetMobjState(actor, actor->info->raisestate); } @@ -7199,7 +7261,7 @@ void A_Boss2Chase(mobj_t *actor) } else { - // Only speed up if you have the 'Deaf' flag. + // Only speed up if you have the ambush flag. if (actor->flags2 & MF2_AMBUSH) speedvar = actor->health; else @@ -7403,6 +7465,8 @@ void A_Boss7Chase(mobj_t *actor) && (actor->target->player->powers[pw_carry] == CR_GENERIC)) { A_FaceTarget(actor); + if (P_MobjWasRemoved(actor)) + return; P_SetMobjState(actor, S_BLACKEGG_SHOOT1); actor->movecount = TICRATE + P_RandomByte()/2; return; @@ -7420,6 +7484,8 @@ void A_Boss7Chase(mobj_t *actor) if (actor->z < 1056*FRACUNIT) { A_FaceTarget(actor); + if (P_MobjWasRemoved(actor)) + return; P_SetMobjState(actor, actor->info->xdeathstate); actor->movecount = 7*TICRATE + P_RandomByte(); break; @@ -7428,6 +7494,8 @@ void A_Boss7Chase(mobj_t *actor) /* FALLTHRU */ case 1: // Chaingun Goop A_FaceTarget(actor); + if (P_MobjWasRemoved(actor)) + return; P_SetMobjState(actor, S_BLACKEGG_SHOOT1); if (actor->health > actor->info->damage) @@ -7437,6 +7505,8 @@ void A_Boss7Chase(mobj_t *actor) break; case 2: // Homing Missile A_FaceTarget(actor); + if (P_MobjWasRemoved(actor)) + return; P_SetMobjState(actor, actor->info->missilestate); S_StartSound(0, sfx_beflap); break; @@ -7912,12 +7982,21 @@ void A_GuardChase(mobj_t *actor) false) && speed > 0) // can't be the same check as previous so that P_TryMove gets to happen. { - if (actor->spawnpoint && ((actor->spawnpoint->options & (MTF_EXTRA|MTF_OBJECTSPECIAL)) == MTF_OBJECTSPECIAL)) - actor->angle += ANGLE_90; - else if (actor->spawnpoint && ((actor->spawnpoint->options & (MTF_EXTRA|MTF_OBJECTSPECIAL)) == MTF_EXTRA)) - actor->angle -= ANGLE_90; - else - actor->angle += ANGLE_180; + INT32 direction = actor->spawnpoint ? actor->spawnpoint->args[0] : TMGD_BACK; + + switch (direction) + { + case TMGD_BACK: + default: + actor->angle += ANGLE_180; + break; + case TMGD_RIGHT: + actor->angle -= ANGLE_90; + break; + case TMGD_LEFT: + actor->angle += ANGLE_90; + break; + } } if (actor->extravalue1 < actor->info->speed) @@ -8117,10 +8196,6 @@ void A_Boss3TakeDamage(mobj_t *actor) actor->movecount = var1; actor->movefactor = -512*FRACUNIT; - - /*if (actor->target && actor->target->spawnpoint) - actor->threshold = actor->target->spawnpoint->extrainfo;*/ - } // Function: A_Boss3Path @@ -8149,6 +8224,9 @@ void A_Boss3Path(mobj_t *actor) P_SetTarget(&actor->target, actor->tracer->target); var1 = 0, var2 = 0; A_FaceTarget(actor); + if (P_MobjWasRemoved(actor)) + return; + if (actor->tracer->state == &states[actor->tracer->info->missilestate]) P_SetMobjState(actor, actor->info->missilestate); return; @@ -8160,27 +8238,21 @@ void A_Boss3Path(mobj_t *actor) if (!(actor->flags2 & MF2_STRONGBOX)) { - thinker_t *th; mobj_t *mo2; + INT32 i; P_SetTarget(&actor->target, NULL); - // scan the thinkers - // to find a point that matches - // the number - for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next) + // Find waypoint + TAG_ITER_THINGS(actor->cusval, i) { - if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed) - continue; + mo2 = mapthings[i].mobj; - mo2 = (mobj_t *)th; + if (!mo2) + continue; if (mo2->type != MT_BOSS3WAYPOINT) continue; - if (!mo2->spawnpoint) - continue; - if (mo2->spawnpoint->angle != actor->threshold) - continue; - if (mo2->spawnpoint->extrainfo != actor->cusval) + if (mapthings[i].args[0] != actor->threshold) continue; P_SetTarget(&actor->target, mo2); @@ -8272,7 +8344,7 @@ void A_Boss3ShockThink(mobj_t *actor) fixed_t x0, y0, x1, y1; // Break the link if movements are too different - if (FixedHypot(snext->momx - actor->momx, snext->momy - actor->momy) > 12*actor->scale) + if (R_PointToDist2(0, 0, snext->momx - actor->momx, snext->momy - actor->momy) > 12*actor->scale) { P_SetTarget(&actor->hnext, NULL); return; @@ -8283,9 +8355,11 @@ void A_Boss3ShockThink(mobj_t *actor) y0 = actor->y; x1 = snext->x; y1 = snext->y; - if (FixedHypot(x1 - x0, y1 - y0) > 2*actor->radius) + if (R_PointToDist2(0, 0, x1 - x0, y1 - y0) > 2*actor->radius) { - snew = P_SpawnMobj((x0 + x1) >> 1, (y0 + y1) >> 1, (actor->z + snext->z) >> 1, actor->type); + snew = P_SpawnMobj((x0 >> 1) + (x1 >> 1), + (y0 >> 1) + (y1 >> 1), + (actor->z >> 1) + (snext->z >> 1), actor->type); snew->momx = (actor->momx + snext->momx) >> 1; snew->momy = (actor->momy + snext->momy) >> 1; snew->momz = (actor->momz + snext->momz) >> 1; // is this really needed? @@ -8293,6 +8367,10 @@ void A_Boss3ShockThink(mobj_t *actor) P_SetTarget(&snew->target, actor->target); snew->fuse = actor->fuse; + P_SetScale(snew, actor->scale); + snew->destscale = actor->destscale; + snew->scalespeed = actor->scalespeed; + P_SetTarget(&actor->hnext, snew); P_SetTarget(&snew->hnext, snext); } @@ -8320,8 +8398,6 @@ void A_LinedefExecute(mobj_t *actor) if (locvar2) tagnum += locvar2*(AngleFixed(actor->angle)>>FRACBITS); - else if (actor->spawnpoint && actor->spawnpoint->extrainfo) - tagnum += (actor->spawnpoint->extrainfo*LE_PARAMWIDTH); CONS_Debug(DBG_GAMELOGIC, "A_LinedefExecute: Running mobjtype %d's sector with tag %d\n", actor->type, tagnum); @@ -8329,6 +8405,38 @@ void A_LinedefExecute(mobj_t *actor) P_LinedefExecute((INT16)tagnum, actor, actor->subsector->sector); } +// Function: A_LinedefExecuteFromArg +// +// Description: Object's location is used to set the calling sector. The tag used is the spawnpoint mapthing's args[var1]. +// +// var1 = mapthing arg to take tag from +// var2 = unused +// +void A_LinedefExecuteFromArg(mobj_t *actor) +{ + INT32 tagnum; + INT32 locvar1 = var1; + + if (LUA_CallAction(A_LINEDEFEXECUTEFROMARG, actor)) + return; + + if (!actor->spawnpoint) + return; + + if (locvar1 < 0 || locvar1 > NUMMAPTHINGARGS) + { + CONS_Debug(DBG_GAMELOGIC, "A_LinedefExecuteFromArg: Invalid mapthing arg %d\n", locvar1); + return; + } + + tagnum = actor->spawnpoint->args[locvar1]; + + CONS_Debug(DBG_GAMELOGIC, "A_LinedefExecuteFromArg: Running mobjtype %d's sector with tag %d\n", actor->type, tagnum); + + // tag 32768 displayed in map editors is actually tag -32768, tag 32769 is -32767, 65535 is -1 etc. + P_LinedefExecute((INT16)tagnum, actor, actor->subsector->sector); +} + // Function: A_PlaySeeSound // // Description: Plays the object's seesound. @@ -9286,6 +9394,49 @@ void A_RandomStateRange(mobj_t *actor) P_SetMobjState(actor, P_RandomRange(locvar1, locvar2)); } +// Function: A_StateRangeByAngle +// +// Description: Chooses a state within the range supplied, depending on the actor's angle. +// +// var1 = Minimum state number to use. +// var2 = Maximum state number to use. The difference will act as a modulo operator. +// +void A_StateRangeByAngle(mobj_t *actor) +{ + INT32 locvar1 = var1; + INT32 locvar2 = var2; + + if (LUA_CallAction(A_STATERANGEBYANGLE, actor)) + return; + + if (locvar2 - locvar1 < 0) + return; // invalid range + + P_SetMobjState(actor, locvar1 + (AngleFixed(actor->angle)>>FRACBITS % (1 + locvar2 - locvar1))); +} + +// Function: A_StateRangeByParameter +// +// Description: Chooses a state within the range supplied, depending on the actor's parameter/extrainfo value. +// +// var1 = Minimum state number to use. +// var2 = Maximum state number to use. The difference will act as a modulo operator. +// +void A_StateRangeByParameter(mobj_t *actor) +{ + INT32 locvar1 = var1; + INT32 locvar2 = var2; + UINT8 parameter = (actor->spawnpoint ? actor->spawnpoint->extrainfo : 0); + + if (LUA_CallAction(A_STATERANGEBYPARAMETER, actor)) + return; + + if (locvar2 - locvar1 < 0) + return; // invalid range + + P_SetMobjState(actor, locvar1 + (parameter % (1 + locvar2 - locvar1))); +} + // Function: A_DualAction // // Description: Calls two actions. Be careful, if you reference the same state this action is called from, you can create an infinite loop. @@ -9750,6 +9901,8 @@ void A_SplitShot(mobj_t *actor) return; A_FaceTarget(actor); + if (P_MobjWasRemoved(actor)) + return; { const angle_t an = (actor->angle + ANGLE_90) >> ANGLETOFINESHIFT; const fixed_t fasin = FINESINE(an); @@ -9814,6 +9967,9 @@ void A_MultiShot(mobj_t *actor) if (actor->target) A_FaceTarget(actor); + if (P_MobjWasRemoved(actor)) + return; + if(loc1lw > 90) ad = FixedMul(90*FRACUNIT, actor->scale); else @@ -10958,6 +11114,8 @@ void A_VileTarget(mobj_t *actor) return; A_FaceTarget(actor); + if (P_MobjWasRemoved(actor)) + return; // Determine object to spawn if (locvar1 <= 0 || locvar1 >= NUMMOBJTYPES) @@ -11045,6 +11203,8 @@ void A_VileAttack(mobj_t *actor) return; A_FaceTarget(actor); + if (P_MobjWasRemoved(actor)) + return; if (locvar1 <= 0 || locvar1 >= NUMSFX) soundtoplay = sfx_brakrx; @@ -11078,7 +11238,7 @@ void A_VileAttack(mobj_t *actor) // move the fire between the vile and the player //fire->x = actor->target->x - FixedMul (24*FRACUNIT, finecosine[an]); //fire->y = actor->target->y - FixedMul (24*FRACUNIT, finesine[an]); - P_TeleportMove(fire, + P_MoveOrigin(fire, actor->target->x - P_ReturnThrustX(fire, actor->angle, FixedMul(24*FRACUNIT, fire->scale)), actor->target->y - P_ReturnThrustY(fire, actor->angle, FixedMul(24*FRACUNIT, fire->scale)), fire->z); @@ -11123,7 +11283,7 @@ void A_VileAttack(mobj_t *actor) // move the fire between the vile and the player //fire->x = actor->target->x - FixedMul (24*FRACUNIT, finecosine[an]); //fire->y = actor->target->y - FixedMul (24*FRACUNIT, finesine[an]); - P_TeleportMove(fire, + P_MoveOrigin(fire, actor->target->x - P_ReturnThrustX(fire, actor->angle, FixedMul(24*FRACUNIT, fire->scale)), actor->target->y - P_ReturnThrustY(fire, actor->angle, FixedMul(24*FRACUNIT, fire->scale)), fire->z); @@ -11363,6 +11523,8 @@ void A_BrakFireShot(mobj_t *actor) return; A_FaceTarget(actor); + if (P_MobjWasRemoved(actor)) + return; x = actor->x + P_ReturnThrustX(actor, actor->angle, FixedMul(64*FRACUNIT, actor->scale)) @@ -11426,10 +11588,7 @@ void A_BrakLobShot(mobj_t *actor) return; // Don't even bother if we've got nothing to aim at. // Look up actor's current gravity situation - if (actor->subsector->sector->gravity) - g = FixedMul(gravity,(FixedDiv(*actor->subsector->sector->gravity>>FRACBITS, 1000))); - else - g = gravity; + g = FixedMul(gravity, P_GetSectorGravityFactor(actor->subsector->sector)); // Look up distance between actor and its target x = P_AproxDistance(actor->target->x - actor->x, actor->target->y - actor->y); @@ -11483,6 +11642,9 @@ void A_BrakLobShot(mobj_t *actor) // Okay, complicated math done. Let's fire our object already, sheesh. A_FaceTarget(actor); + if (P_MobjWasRemoved(actor)) + return; + if (locvar1 <= 0 || locvar1 >= NUMMOBJTYPES) typeOfShot = MT_CANNONBALL; else typeOfShot = (mobjtype_t)locvar1; @@ -11541,10 +11703,7 @@ void A_NapalmScatter(mobj_t *actor) airtime = 16<subsector->sector->gravity) - g = FixedMul(gravity,(FixedDiv(*actor->subsector->sector->gravity>>FRACBITS, 1000))); - else - g = gravity; + g = FixedMul(gravity, P_GetSectorGravityFactor(actor->subsector->sector)); // vy = (g*(airtime-1))/2 vy = FixedMul(g,(airtime-(1<>1; @@ -11667,7 +11826,7 @@ void A_FlickySpawn(mobj_t *actor) } // Internal Flicky color setting -void P_InternalFlickySetColor(mobj_t *actor, UINT8 extrainfo) +void P_InternalFlickySetColor(mobj_t *actor, UINT8 color) { UINT8 flickycolors[] = { SKINCOLOR_RED, @@ -11687,11 +11846,11 @@ void P_InternalFlickySetColor(mobj_t *actor, UINT8 extrainfo) SKINCOLOR_YELLOW, }; - if (extrainfo == 0) + if (color == 0) // until we can customize flicky colors by level header, just stick to SRB2's defaults actor->color = flickycolors[P_RandomKey(2)]; //flickycolors[P_RandomKey(sizeof(flickycolors))]; else - actor->color = flickycolors[min(extrainfo-1, 14)]; // sizeof(flickycolors)-1 + actor->color = flickycolors[min(color-1, 14)]; // sizeof(flickycolors)-1 } // Function: A_FlickyCenter @@ -11701,17 +11860,17 @@ void P_InternalFlickySetColor(mobj_t *actor, UINT8 extrainfo) // var1: // Lower 16 bits = if 0, spawns random flicky based on level header. Else, spawns the designated thing type. // Bits 17-20 = Flicky color, up to 15. Applies to fish. -// Bit 21 = Flag MF_SLIDEME (see below) -// Bit 22 = Flag MF_GRENADEBOUNCE (see below) -// Bit 23 = Flag MF_NOCLIPTHING (see below) +// Bit 21 = Flag TMFF_AIMLESS (see below) +// Bit 22 = Flag TMFF_STATIONARY (see below) +// Bit 23 = Flag TMFF_HOP (see below) // // If actor is placed from a spawnpoint (map Thing), the Thing's properties take precedence. // -// var2 = maximum default distance away from spawn the flickies are allowed to travel. If angle != 0, then that's the radius. +// var2 = maximum default distance away from spawn the flickies are allowed to travel. If args[0] != 0, then that's the radius. // -// If MTF_EXTRA (MF_SLIDEME): is flagged, Flickies move aimlessly. Else, orbit around the target. -// If MTF_OBJECTSPECIAL (MF_GRENADEBOUNCE): Flickies stand in-place without gravity (unless they hop, then gravity is applied.) -// If MTF_AMBUSH (MF_NOCLIPTHING): is flagged, Flickies hop. +// If TMFF_AIMLESS (MF_SLIDEME): is flagged, Flickies move aimlessly. Else, orbit around the target. +// If TMFF_STATIONARY (MF_GRENADEBOUNCE): Flickies stand in-place without gravity (unless they hop, then gravity is applied.) +// If TMFF_HOP (MF_NOCLIPTHING): is flagged, Flickies hop. // void A_FlickyCenter(mobj_t *actor) { @@ -11733,14 +11892,15 @@ void A_FlickyCenter(mobj_t *actor) if (actor->spawnpoint) { actor->flags &= ~(MF_SLIDEME|MF_GRENADEBOUNCE|MF_NOCLIPTHING); - actor->flags |= ( - ((actor->spawnpoint->options & MTF_EXTRA) ? MF_SLIDEME : 0) - | ((actor->spawnpoint->options & MTF_OBJECTSPECIAL) ? MF_GRENADEBOUNCE : 0) - | ((actor->spawnpoint->options & MTF_AMBUSH) ? MF_NOCLIPTHING : 0) - ); - actor->extravalue1 = actor->spawnpoint->angle ? abs(actor->spawnpoint->angle) * FRACUNIT - : locvar2 ? abs(locvar2) : 384 * FRACUNIT; - actor->extravalue2 = actor->spawnpoint->extrainfo; + if (actor->spawnpoint->args[1] & TMFF_AIMLESS) + actor->flags |= MF_SLIDEME; + if (actor->spawnpoint->args[1] & TMFF_STATIONARY) + actor->flags |= MF_GRENADEBOUNCE; + if (actor->spawnpoint->args[1] & TMFF_HOP) + actor->flags |= MF_NOCLIPTHING; + actor->extravalue1 = actor->spawnpoint->args[0] ? abs(actor->spawnpoint->args[0])*FRACUNIT + : locvar2 ? abs(locvar2) : 384*FRACUNIT; + actor->extravalue2 = actor->spawnpoint->args[2]; actor->friction = actor->spawnpoint->x*FRACUNIT; actor->movefactor = actor->spawnpoint->y*FRACUNIT; actor->watertop = actor->spawnpoint->z*FRACUNIT; @@ -11748,11 +11908,12 @@ void A_FlickyCenter(mobj_t *actor) else { actor->flags &= ~(MF_SLIDEME|MF_GRENADEBOUNCE|MF_NOCLIPTHING); - actor->flags |= ( - ((flickyflags & 1) ? MF_SLIDEME : 0) - | ((flickyflags & 2) ? MF_GRENADEBOUNCE : 0) - | ((flickyflags & 4) ? MF_NOCLIPTHING : 0) - ); + if (flickyflags & TMFF_AIMLESS) + actor->flags |= MF_SLIDEME; + if (flickyflags & TMFF_STATIONARY) + actor->flags |= MF_GRENADEBOUNCE; + if (flickyflags & TMFF_HOP) + actor->flags |= MF_NOCLIPTHING; actor->extravalue1 = abs(locvar2); actor->extravalue2 = flickycolor; actor->friction = actor->x; @@ -11794,12 +11955,12 @@ void A_FlickyCenter(mobj_t *actor) if (actor->target && P_AproxDistance(actor->target->x - originx, actor->target->y - originy) < actor->extravalue1) { actor->extravalue2 = 1; - P_TeleportMove(actor, actor->target->x, actor->target->y, actor->target->z); + P_SetOrigin(actor, actor->target->x, actor->target->y, actor->target->z); } else if(actor->extravalue2) { actor->extravalue2 = 0; - P_TeleportMove(actor, originx, originy, originz); + P_SetOrigin(actor, originx, originy, originz); } } } @@ -12252,10 +12413,7 @@ void A_Boss5Jump(mobj_t *actor) return; // Don't even bother if we've got nothing to aim at. // Look up actor's current gravity situation - if (actor->subsector->sector->gravity) - g = FixedMul(gravity,(FixedDiv(*actor->subsector->sector->gravity>>FRACBITS, 1000))); - else - g = gravity; + g = FixedMul(gravity, P_GetSectorGravityFactor(actor->subsector->sector)); // Look up distance between actor and its tracer x = P_AproxDistance(actor->tracer->x - actor->x, actor->tracer->y - actor->y); @@ -12335,7 +12493,7 @@ void A_LightBeamReset(mobj_t *actor) actor->momy = (P_SignedRandom()*FINECOSINE(((actor->spawnpoint->angle*ANG1)>>ANGLETOFINESHIFT) & FINEMASK))/128; actor->momz = (P_SignedRandom()*FRACUNIT)/128; - P_TeleportMove(actor, + P_SetOrigin(actor, actor->spawnpoint->x*FRACUNIT - (P_SignedRandom()*FINESINE(((actor->spawnpoint->angle*ANG1)>>ANGLETOFINESHIFT) & FINEMASK))/2, actor->spawnpoint->y*FRACUNIT + (P_SignedRandom()*FINECOSINE(((actor->spawnpoint->angle*ANG1)>>ANGLETOFINESHIFT) & FINEMASK))/2, actor->spawnpoint->z*FRACUNIT + (P_SignedRandom()*FRACUNIT)/2); @@ -12571,6 +12729,8 @@ void A_WhoCaresIfYourSonIsABee(mobj_t *actor) return; A_FaceTarget(actor); + if (P_MobjWasRemoved(actor)) + return; if (actor->extravalue1) actor->extravalue1--; @@ -12592,7 +12752,7 @@ void A_WhoCaresIfYourSonIsABee(mobj_t *actor) // Function: A_ParentTriesToSleep // -// Description: If extravalue1 is less than or equal to var1, go to var2. +// Description: If extravalue1 is greater than 0 go to var1 // // var1 = state to go to when extravalue1 // var2 = unused @@ -12677,67 +12837,43 @@ void A_Boss5FindWaypoint(mobj_t *actor) { INT32 locvar1 = var1; boolean avoidcenter; - UINT32 i; - UINT8 extrainfo = (actor->spawnpoint ? actor->spawnpoint->extrainfo : 0); + INT32 i; + INT32 bossid = (actor->spawnpoint ? actor->spawnpoint->args[0] : 0); if (LUA_CallAction(A_BOSS5FINDWAYPOINT, actor)) return; avoidcenter = !actor->tracer || (actor->health == actor->info->damage+1); - if (locvar1 == 2) // look for the boss waypoint + if (locvar1 == 2) // look for the boss flypoint { - thinker_t *th; - mobj_t *mo2; - P_SetTarget(&actor->tracer, NULL); - // Flee! Flee! Find a point to escape to! If none, just shoot upward! - // scan the thinkers to find the runaway point - for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next) - { - if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed) - continue; + P_SetTarget(&actor->tracer, P_FindBossFlyPoint(actor, bossid)); - mo2 = (mobj_t *)th; - - if (mo2->type != MT_BOSSFLYPOINT) - continue; - - if (mo2->spawnpoint && mo2->spawnpoint->extrainfo != extrainfo) - continue; - - // If this one's further then the last one, don't go for it. - if (actor->tracer && - P_AproxDistance(P_AproxDistance(actor->x - mo2->x, actor->y - mo2->y), actor->z - mo2->z) > - P_AproxDistance(P_AproxDistance(actor->x - actor->tracer->x, actor->y - actor->tracer->y), actor->z - actor->tracer->z)) - continue; - - // Otherwise... Do! - P_SetTarget(&actor->tracer, mo2); - } if (!actor->tracer) return; // no boss flypoints found } else if (locvar1 == 1) // always go to ambush-marked waypoint { + boolean found = false; + if (avoidcenter) goto nowaypoints; // if we can't go the center, why on earth are we doing this? - for (i = 0; i < nummapthings; i++) + TAG_ITER_THINGS(bossid, i) { if (!mapthings[i].mobj) continue; if (mapthings[i].mobj->type != MT_FANGWAYPOINT) continue; - if (mapthings[i].extrainfo != extrainfo) - continue; - if (!(mapthings[i].options & MTF_AMBUSH)) + if (!(mapthings[i].args[0])) continue; P_SetTarget(&actor->tracer, mapthings[i].mobj); + found = true; break; } - if (i == nummapthings) + if (!found) goto nowaypoints; } else // locvar1 == 0 @@ -12750,7 +12886,7 @@ void A_Boss5FindWaypoint(mobj_t *actor) actor->z += hackoffset; // first, count how many waypoints we have - for (i = 0; i < nummapthings; i++) + TAG_ITER_THINGS(bossid, i) { if (!mapthings[i].mobj) continue; @@ -12758,9 +12894,7 @@ void A_Boss5FindWaypoint(mobj_t *actor) continue; if (actor->tracer == mapthings[i].mobj) // this was your tracer last time continue; - if (mapthings[i].extrainfo != extrainfo) - continue; - if (mapthings[i].options & MTF_AMBUSH) + if (mapthings[i].args[0]) { if (avoidcenter) continue; @@ -12807,7 +12941,7 @@ void A_Boss5FindWaypoint(mobj_t *actor) numfangwaypoints = 0; // now find them again and add them to the table! - for (i = 0; i < nummapthings; i++) + TAG_ITER_THINGS(bossid, i) { if (!mapthings[i].mobj) continue; @@ -12815,9 +12949,7 @@ void A_Boss5FindWaypoint(mobj_t *actor) continue; if (actor->tracer == mapthings[i].mobj) // this was your tracer last time continue; - if (mapthings[i].extrainfo != extrainfo) - continue; - if (mapthings[i].options & MTF_AMBUSH) + if (mapthings[i].args[0]) { if (avoidcenter) continue; @@ -12920,7 +13052,7 @@ void A_DoNPCSkid(mobj_t *actor) actor->momy = (2*actor->momy)/3; } - P_TeleportMove(actor, x, y, z); + P_MoveOrigin(actor, x, y, z); // Spawn a particle every 3 tics. if (!(leveltime % 3)) @@ -13261,7 +13393,7 @@ void A_Boss5MakeJunk(mobj_t *actor) if (locvar1 > 0) P_SetMobjState(broked, locvar1); if (!P_MobjWasRemoved(broked)) - P_TeleportMove(broked, broked->x + broked->momx, broked->y + broked->momy, broked->z); + P_MoveOrigin(broked, broked->x + broked->momx, broked->y + broked->momy, broked->z); ang += ANGLE_45; } @@ -13389,6 +13521,9 @@ static boolean PIT_DustDevilLaunch(mobj_t *thing) if (!player) return true; + if (player->spectator) + return true; + if (player->powers[pw_carry] != CR_DUSTDEVIL && (player->powers[pw_ignorelatch] & (1<<15))) return true; @@ -13470,7 +13605,7 @@ void A_DustDevilThink(mobj_t *actor) //Chained thinker for the spiralling dust column. while (layer && !P_MobjWasRemoved(layer)) { angle_t fa = layer->angle >> ANGLETOFINESHIFT; - P_TeleportMove(layer, layer->x + 5 * FixedMul(scale, FINECOSINE(fa)), layer->y + 5 * FixedMul(scale, FINESINE(fa)), layer->z); + P_MoveOrigin(layer, layer->x + 5 * FixedMul(scale, FINECOSINE(fa)), layer->y + 5 * FixedMul(scale, FINESINE(fa)), layer->z); layer->scale = scale; layer->angle += ANG10 / 2; layer->momx = actor->momx; @@ -14254,7 +14389,7 @@ void A_SpawnPterabytes(mobj_t *actor) return; if (actor->spawnpoint) - amount = actor->spawnpoint->extrainfo + 1; + amount = max(1, actor->spawnpoint->args[0]); interval = FixedAngle(FRACUNIT*360/amount); @@ -14479,7 +14614,7 @@ void A_DragonWing(mobj_t *actor) actor->angle = target->angle + actor->movedir; x = target->x + P_ReturnThrustX(actor, actor->angle, -target->radius); y = target->y + P_ReturnThrustY(actor, actor->angle, -target->radius); - P_TeleportMove(actor, x, y, target->z); + P_MoveOrigin(actor, x, y, target->z); } // Function: A_DragonSegment @@ -14520,7 +14655,7 @@ void A_DragonSegment(mobj_t *actor) zdist = P_ReturnThrustY(target, zangle, radius); actor->angle = hangle; - P_TeleportMove(actor, target->x + xdist, target->y + ydist, target->z + zdist); + P_MoveOrigin(actor, target->x + xdist, target->y + ydist, target->z + zdist); } // Function: A_ChangeHeight diff --git a/src/p_floor.c b/src/p_floor.c index d81a022e5..9c24f5851 100644 --- a/src/p_floor.c +++ b/src/p_floor.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -11,11 +11,13 @@ /// \file p_floor.c /// \brief Floor animation, elevators +#include "dehacked.h" #include "doomdef.h" #include "doomstat.h" #include "m_random.h" #include "p_local.h" #include "p_slopes.h" +#include "r_fps.h" #include "r_state.h" #include "s_sound.h" #include "z_zone.h" @@ -162,7 +164,7 @@ result_e T_MovePlane(sector_t *sector, fixed_t speed, fixed_t dest, boolean crus void T_MoveFloor(floormove_t *movefloor) { result_e res = 0; - boolean dontupdate = false; + boolean remove = false; if (movefloor->delaytimer) { @@ -178,8 +180,8 @@ void T_MoveFloor(floormove_t *movefloor) if (movefloor->type == bounceFloor) { const fixed_t origspeed = FixedDiv(movefloor->origspeed,(ELEVATORSPEED/2)); - const fixed_t fs = abs(movefloor->sector->floorheight - lines[movefloor->texture].frontsector->floorheight); - const fixed_t bs = abs(movefloor->sector->floorheight - lines[movefloor->texture].backsector->floorheight); + const fixed_t fs = abs(movefloor->sector->floorheight - lines[movefloor->sourceline].frontsector->floorheight); + const fixed_t bs = abs(movefloor->sector->floorheight - lines[movefloor->sourceline].backsector->floorheight); if (fs < bs) movefloor->speed = FixedDiv(fs,25*FRACUNIT) + FRACUNIT/4; else @@ -190,113 +192,62 @@ void T_MoveFloor(floormove_t *movefloor) if (res == pastdest) { - if (movefloor->direction == 1) + switch (movefloor->type) { - switch (movefloor->type) - { - case moveFloorByFrontSector: - if (movefloor->texture < -1) // chained linedef executing - P_LinedefExecute((INT16)(movefloor->texture + INT16_MAX + 2), NULL, NULL); - /* FALLTHRU */ - case instantMoveFloorByFrontSector: - if (movefloor->texture > -1) // flat changing - movefloor->sector->floorpic = movefloor->texture; - break; - case bounceFloor: // Graue 03-12-2004 - if (movefloor->floordestheight == lines[movefloor->texture].frontsector->floorheight) - movefloor->floordestheight = lines[movefloor->texture].backsector->floorheight; - else - movefloor->floordestheight = lines[movefloor->texture].frontsector->floorheight; - movefloor->direction = (movefloor->floordestheight < movefloor->sector->floorheight) ? -1 : 1; - movefloor->sector->floorspeed = movefloor->speed * movefloor->direction; - movefloor->delaytimer = movefloor->delay; - P_RecalcPrecipInSector(movefloor->sector); - return; // not break, why did this work? Graue 04-03-2004 - case bounceFloorCrush: // Graue 03-27-2004 - if (movefloor->floordestheight == lines[movefloor->texture].frontsector->floorheight) - { - movefloor->floordestheight = lines[movefloor->texture].backsector->floorheight; - movefloor->speed = movefloor->origspeed = FixedDiv(abs(lines[movefloor->texture].dy),4*FRACUNIT); // return trip, use dy - } - else - { - movefloor->floordestheight = lines[movefloor->texture].frontsector->floorheight; - movefloor->speed = movefloor->origspeed = FixedDiv(abs(lines[movefloor->texture].dx),4*FRACUNIT); // forward again, use dx - } - movefloor->direction = (movefloor->floordestheight < movefloor->sector->floorheight) ? -1 : 1; - movefloor->sector->floorspeed = movefloor->speed * movefloor->direction; - movefloor->delaytimer = movefloor->delay; - P_RecalcPrecipInSector(movefloor->sector); - return; // not break, why did this work? Graue 04-03-2004 - case crushFloorOnce: - movefloor->floordestheight = lines[movefloor->texture].frontsector->floorheight; + case moveFloorByFrontSector: + if (movefloor->tag) // chained linedef executing + P_LinedefExecute(movefloor->tag, NULL, NULL); + /* FALLTHRU */ + case instantMoveFloorByFrontSector: + if (movefloor->texture > -1) // flat changing + movefloor->sector->floorpic = movefloor->texture; + remove = true; + break; + case bounceFloor: // Graue 03-12-2004 + case bounceFloorCrush: // Graue 03-27-2004 + if (movefloor->floordestheight == lines[movefloor->sourceline].frontsector->floorheight) + { + movefloor->floordestheight = lines[movefloor->sourceline].backsector->floorheight; + movefloor->origspeed = lines[movefloor->sourceline].args[3] << (FRACBITS - 2); // return trip, use args[3] + } + else + { + movefloor->floordestheight = lines[movefloor->sourceline].frontsector->floorheight; + movefloor->origspeed = lines[movefloor->sourceline].args[2] << (FRACBITS - 2); // forward again, use args[2] + } + if (movefloor->type == bounceFloorCrush) + movefloor->speed = movefloor->origspeed; + movefloor->direction = (movefloor->floordestheight < movefloor->sector->floorheight) ? -1 : 1; + movefloor->delaytimer = movefloor->delay; + remove = false; + break; + case crushFloorOnce: + if (movefloor->direction == 1) + { + movefloor->floordestheight = lines[movefloor->sourceline].frontsector->floorheight; movefloor->direction = -1; + movefloor->speed = lines[movefloor->sourceline].args[3] << (FRACBITS - 2); movefloor->sector->soundorg.z = movefloor->sector->floorheight; - S_StartSound(&movefloor->sector->soundorg,sfx_pstop); - P_RecalcPrecipInSector(movefloor->sector); - return; - default: - break; - } - } - else if (movefloor->direction == -1) - { - switch (movefloor->type) - { - case moveFloorByFrontSector: - if (movefloor->texture < -1) // chained linedef executing - P_LinedefExecute((INT16)(movefloor->texture + INT16_MAX + 2), NULL, NULL); - /* FALLTHRU */ - case instantMoveFloorByFrontSector: - if (movefloor->texture > -1) // flat changing - movefloor->sector->floorpic = movefloor->texture; - break; - case bounceFloor: // Graue 03-12-2004 - if (movefloor->floordestheight == lines[movefloor->texture].frontsector->floorheight) - movefloor->floordestheight = lines[movefloor->texture].backsector->floorheight; - else - movefloor->floordestheight = lines[movefloor->texture].frontsector->floorheight; - movefloor->direction = (movefloor->floordestheight < movefloor->sector->floorheight) ? -1 : 1; - movefloor->sector->floorspeed = movefloor->speed * movefloor->direction; - movefloor->delaytimer = movefloor->delay; - P_RecalcPrecipInSector(movefloor->sector); - return; // not break, why did this work? Graue 04-03-2004 - case bounceFloorCrush: // Graue 03-27-2004 - if (movefloor->floordestheight == lines[movefloor->texture].frontsector->floorheight) - { - movefloor->floordestheight = lines[movefloor->texture].backsector->floorheight; - movefloor->speed = movefloor->origspeed = FixedDiv(abs(lines[movefloor->texture].dy),4*FRACUNIT); // return trip, use dy - } - else - { - movefloor->floordestheight = lines[movefloor->texture].frontsector->floorheight; - movefloor->speed = movefloor->origspeed = FixedDiv(abs(lines[movefloor->texture].dx),4*FRACUNIT); // forward again, use dx - } - movefloor->direction = (movefloor->floordestheight < movefloor->sector->floorheight) ? -1 : 1; - movefloor->sector->floorspeed = movefloor->speed * movefloor->direction; - movefloor->delaytimer = movefloor->delay; - P_RecalcPrecipInSector(movefloor->sector); - return; // not break, why did this work? Graue 04-03-2004 - case crushFloorOnce: - movefloor->sector->floordata = NULL; // Clear up the thinker so others can use it - P_RemoveThinker(&movefloor->thinker); - movefloor->sector->floorspeed = 0; - P_RecalcPrecipInSector(movefloor->sector); - return; - default: - break; - } + S_StartSound(&movefloor->sector->soundorg, sfx_pstop); + remove = false; + } + else + remove = true; + break; + default: + remove = true; + break; } + } + if (remove) + { movefloor->sector->floordata = NULL; // Clear up the thinker so others can use it movefloor->sector->floorspeed = 0; P_RemoveThinker(&movefloor->thinker); - dontupdate = true; } - if (!dontupdate) - movefloor->sector->floorspeed = movefloor->speed*movefloor->direction; else - movefloor->sector->floorspeed = 0; + movefloor->sector->floorspeed = movefloor->speed*movefloor->direction; P_RecalcPrecipInSector(movefloor->sector); } @@ -573,6 +524,8 @@ void T_ContinuousFalling(continuousfall_t *faller) { faller->sector->ceilingheight = faller->ceilingstartheight; faller->sector->floorheight = faller->floorstartheight; + + R_ClearLevelInterpolatorState(&faller->thinker); } P_CheckSector(faller->sector, false); // you might think this is irrelevant. you would be wrong @@ -601,7 +554,7 @@ static fixed_t P_SectorCheckWater(sector_t *analyzesector, for (rover = analyzesector->ffloors; rover; rover = rover->next) { - if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_SWIMMABLE) || rover->flags & FF_SOLID) + if (!(rover->fofflags & FOF_EXISTS) || !(rover->fofflags & FOF_SWIMMABLE) || rover->fofflags & FOF_SOLID) continue; // If the sector is below the water, don't bother. @@ -634,12 +587,10 @@ void T_BounceCheese(bouncecheese_t *bouncer) sector_t *actionsector; boolean remove; INT32 i; - mtag_t tag = Tag_FGet(&bouncer->sourceline->tags); if (bouncer->sector->crumblestate == CRUMBLE_RESTORE || bouncer->sector->crumblestate == CRUMBLE_WAIT || bouncer->sector->crumblestate == CRUMBLE_ACTIVATED) // Oops! Crumbler says to remove yourself! { - bouncer->sector->crumblestate = CRUMBLE_WAIT; bouncer->sector->ceilingdata = NULL; bouncer->sector->ceilspeed = 0; bouncer->sector->floordata = NULL; @@ -649,7 +600,7 @@ void T_BounceCheese(bouncecheese_t *bouncer) } // You can use multiple target sectors, but at your own risk!!! - TAG_ITER_SECTORS(tag, i) + TAG_ITER_SECTORS(bouncer->sourceline->args[0], i) { actionsector = §ors[i]; actionsector->moved = true; @@ -773,7 +724,7 @@ void T_StartCrumble(crumble_t *crumble) ffloor_t *rover; sector_t *sector; INT32 i; - mtag_t tag = Tag_FGet(&crumble->sourceline->tags); + mtag_t tag = crumble->sourceline->args[0]; // Once done, the no-return thinker just sits there, // constantly 'returning'... kind of an oxymoron, isn't it? @@ -808,10 +759,10 @@ void T_StartCrumble(crumble_t *crumble) for (rover = sector->ffloors; rover; rover = rover->next) { - if (!(rover->flags & FF_CRUMBLE)) + if (!(rover->fofflags & FOF_CRUMBLE)) continue; - if (!(rover->flags & FF_FLOATBOB)) + if (!(rover->fofflags & FOF_FLOATBOB)) continue; if (rover->master != crumble->sourceline) @@ -820,7 +771,7 @@ void T_StartCrumble(crumble_t *crumble) rover->alpha = crumble->origalpha; if (rover->alpha == 0xff) - rover->flags &= ~FF_TRANSLUCENT; + rover->fofflags &= ~FOF_TRANSLUCENT; } } @@ -844,13 +795,13 @@ void T_StartCrumble(crumble_t *crumble) for (rover = sector->ffloors; rover; rover = rover->next) { - if (rover->flags & FF_NORETURN) + if (rover->fofflags & FOF_NORETURN) continue; - if (!(rover->flags & FF_CRUMBLE)) + if (!(rover->fofflags & FOF_CRUMBLE)) continue; - if (!(rover->flags & FF_FLOATBOB)) + if (!(rover->fofflags & FOF_FLOATBOB)) continue; if (rover->master != crumble->sourceline) @@ -858,7 +809,7 @@ void T_StartCrumble(crumble_t *crumble) if (rover->alpha == crumble->origalpha) { - rover->flags |= FF_TRANSLUCENT; + rover->fofflags |= FOF_TRANSLUCENT; rover->alpha = 0x00; } else @@ -866,7 +817,7 @@ void T_StartCrumble(crumble_t *crumble) rover->alpha = crumble->origalpha; if (rover->alpha == 0xff) - rover->flags &= ~FF_TRANSLUCENT; + rover->fofflags &= ~FOF_TRANSLUCENT; } } } @@ -1042,6 +993,7 @@ static mobj_t *SearchMarioNode(msecnode_t *node) case MT_THUNDERCOIN_ORB: case MT_IVSP: case MT_SUPERSPARK: + case MT_BOXSPARKLE: case MT_RAIN: case MT_SNOWFLAKE: case MT_SPLISH: @@ -1096,23 +1048,6 @@ void T_MarioBlockChecker(mariocheck_t *block) } } -static boolean P_IsPlayerValid(size_t playernum) -{ - if (!playeringame[playernum]) - return false; - - if (!players[playernum].mo) - return false; - - if (players[playernum].mo->health <= 0) - return false; - - if (players[playernum].spectator) - return false; - - return true; -} - // This is the Thwomp's 'brain'. It looks around for players nearby, and if // it finds any, **SMASH**!!! Muahahhaa.... void T_ThwompSector(thwomp_t *thwomp) @@ -1149,7 +1084,7 @@ void T_ThwompSector(thwomp_t *thwomp) if (thwomp->direction == 0) // Not going anywhere, so look for players. { - if (rover->flags & FF_EXISTS) + if (rover->fofflags & FOF_EXISTS) { UINT8 i; // scan the players to find victims! @@ -1242,7 +1177,7 @@ void T_ThwompSector(thwomp_t *thwomp) if (res == pastdest) { - if (rover->flags & FF_EXISTS) + if (rover->fofflags & FOF_EXISTS) S_StartSound((void *)&actionsector->soundorg, thwomp->sound); thwomp->direction = 1; // start heading back up @@ -1289,7 +1224,7 @@ void T_NoEnemiesSector(noenemies_t *nobaddies) sector_t *sec = NULL; INT32 secnum = -1; boolean FOFsector = false; - mtag_t tag = Tag_FGet(&nobaddies->sourceline->tags); + mtag_t tag = nobaddies->sourceline->args[0]; TAG_ITER_SECTORS(tag, secnum) { @@ -1301,14 +1236,13 @@ void T_NoEnemiesSector(noenemies_t *nobaddies) for (i = 0; i < sec->linecount; i++) { INT32 targetsecnum = -1; - mtag_t tag2 = Tag_FGet(&sec->lines[i]->tags); if (sec->lines[i]->special < 100 || sec->lines[i]->special >= 300) continue; FOFsector = true; - TAG_ITER_SECTORS(tag2, targetsecnum) + TAG_ITER_SECTORS(sec->lines[i]->args[0], targetsecnum) { if (T_SectorHasEnemies(§ors[targetsecnum])) return; @@ -1326,217 +1260,68 @@ void T_NoEnemiesSector(noenemies_t *nobaddies) P_RemoveThinker(&nobaddies->thinker); } -// -// P_IsObjectOnRealGround -// -// Helper function for T_EachTimeThinker -// Like P_IsObjectOnGroundIn, except ONLY THE REAL GROUND IS CONSIDERED, NOT FOFS -// I'll consider whether to make this a more globally accessible function or whatever in future -// -- Monster Iestyn -// -static boolean P_IsObjectOnRealGround(mobj_t *mo, sector_t *sec) +static boolean P_CheckAllTrigger(eachtime_t *eachtime) { - // Is the object in reverse gravity? - if (mo->eflags & MFE_VERTICALFLIP) + size_t i; + + for (i = 0; i < MAXPLAYERS; i++) { - // Detect if the player is on the ceiling. - if (mo->z+mo->height >= P_GetSpecialTopZ(mo, sec, sec)) - return true; + if (P_CanPlayerTrigger(i) && !eachtime->playersInArea[i]) + return false; } - // Nope! - else - { - // Detect if the player is on the floor. - if (mo->z <= P_GetSpecialBottomZ(mo, sec, sec)) - return true; - } - return false; + + return true; } -static boolean P_IsMobjTouchingSector(mobj_t *mo, sector_t *sec) -{ - msecnode_t *node; - - if (mo->subsector->sector == sec) - return true; - - if (!(sec->flags & SF_TRIGGERSPECIAL_TOUCH)) - return false; - - for (node = mo->touching_sectorlist; node; node = node->m_sectorlist_next) - { - if (node->m_sector == sec) - return true; - } - - return false; -} - -// -// T_EachTimeThinker -// -// Runs a linedef exec whenever a player enters an area. -// Keeps track of players currently in the area and notices any changes. -// -// \sa P_AddEachTimeThinker -// void T_EachTimeThinker(eachtime_t *eachtime) { - size_t i, j; - sector_t *sec = NULL; - sector_t *targetsec = NULL; - INT32 secnum = -1; + size_t i; boolean oldPlayersInArea[MAXPLAYERS]; - boolean oldPlayersOnArea[MAXPLAYERS]; - boolean *oldPlayersArea; - boolean *playersArea; - boolean FOFsector = false; - boolean floortouch = false; - fixed_t bottomheight, topheight; - ffloor_t *rover; - mtag_t tag = Tag_FGet(&eachtime->sourceline->tags); + sector_t *caller[MAXPLAYERS]; + boolean allPlayersChecked = false; + boolean allPlayersTrigger = false; for (i = 0; i < MAXPLAYERS; i++) { oldPlayersInArea[i] = eachtime->playersInArea[i]; - oldPlayersOnArea[i] = eachtime->playersOnArea[i]; - eachtime->playersInArea[i] = false; - eachtime->playersOnArea[i] = false; - } - - TAG_ITER_SECTORS(tag, secnum) - { - sec = §ors[secnum]; - - FOFsector = false; - - if (GETSECSPECIAL(sec->special, 2) == 3 || GETSECSPECIAL(sec->special, 2) == 5) - floortouch = true; - else if (GETSECSPECIAL(sec->special, 2) >= 1 && GETSECSPECIAL(sec->special, 2) <= 8) - floortouch = false; - else - continue; - - // Check the lines of this sector, to see if it is a FOF control sector. - for (i = 0; i < sec->linecount; i++) - { - INT32 targetsecnum = -1; - mtag_t tag2 = Tag_FGet(&sec->lines[i]->tags); - - if (sec->lines[i]->special < 100 || sec->lines[i]->special >= 300) - continue; - - FOFsector = true; - - TAG_ITER_SECTORS(tag2, targetsecnum) - { - targetsec = §ors[targetsecnum]; - - // Find the FOF corresponding to the control linedef - for (rover = targetsec->ffloors; rover; rover = rover->next) - { - if (rover->master == sec->lines[i]) - break; - } - - if (!rover) // This should be impossible, but don't complain if it is the case somehow - continue; - - if (!(rover->flags & FF_EXISTS)) // If the FOF does not "exist", we pretend that nobody's there - continue; - - for (j = 0; j < MAXPLAYERS; j++) - { - if (!P_IsPlayerValid(j)) - continue; - - if (!P_IsMobjTouchingSector(players[j].mo, targetsec)) - continue; - - topheight = P_GetSpecialTopZ(players[j].mo, sec, targetsec); - bottomheight = P_GetSpecialBottomZ(players[j].mo, sec, targetsec); - - if (players[j].mo->z > topheight) - continue; - - if (players[j].mo->z + players[j].mo->height < bottomheight) - continue; - - if (floortouch && P_IsObjectOnGroundIn(players[j].mo, targetsec)) - eachtime->playersOnArea[j] = true; - else - eachtime->playersInArea[j] = true; - } - } - } - - if (!FOFsector) - { - for (i = 0; i < MAXPLAYERS; i++) - { - if (!P_IsPlayerValid(i)) - continue; - - if (!P_IsMobjTouchingSector(players[i].mo, sec)) - continue; - - if (!(players[i].mo->subsector->sector == sec - || P_PlayerTouchingSectorSpecial(&players[i], 2, (GETSECSPECIAL(sec->special, 2))) == sec)) - continue; - - if (floortouch && P_IsObjectOnRealGround(players[i].mo, sec)) - eachtime->playersOnArea[i] = true; - else - eachtime->playersInArea[i] = true; - } - } - } - - // Check if a new player entered. - // If not, check if a player hit the floor. - // If either condition is true, execute. - if (floortouch) - { - playersArea = eachtime->playersOnArea; - oldPlayersArea = oldPlayersOnArea; - } - else - { - playersArea = eachtime->playersInArea; - oldPlayersArea = oldPlayersInArea; + caller[i] = P_CanPlayerTrigger(i) ? P_FindPlayerTrigger(&players[i], eachtime->sourceline) : NULL; + eachtime->playersInArea[i] = caller[i] != NULL; } // Easy check... nothing has changed - if (!memcmp(playersArea, oldPlayersArea, sizeof(boolean)*MAXPLAYERS)) + if (!memcmp(eachtime->playersInArea, oldPlayersInArea, sizeof(boolean)*MAXPLAYERS)) return; - // If sector has an "all players" trigger type, all players need to be in area - if (GETSECSPECIAL(sec->special, 2) == 2 || GETSECSPECIAL(sec->special, 2) == 3) - { - for (i = 0; i < MAXPLAYERS; i++) - { - if (P_IsPlayerValid(i) && playersArea[i]) - continue; - } - } - // Trigger for every player who has entered (and exited, if triggerOnExit) for (i = 0; i < MAXPLAYERS; i++) { - if (playersArea[i] == oldPlayersArea[i]) + if (eachtime->playersInArea[i] == oldPlayersInArea[i]) continue; // If player has just left, check if still valid - if (!playersArea[i] && (!eachtime->triggerOnExit || !P_IsPlayerValid(i))) + if (!eachtime->playersInArea[i] && (!eachtime->triggerOnExit || !P_CanPlayerTrigger(i))) continue; - CONS_Debug(DBG_GAMELOGIC, "Trying to activate each time executor with tag %d\n", tag); + // If sector has an "all players" trigger type, all players need to be in area + if (caller[i] && caller[i]->triggerer == TO_ALLPLAYERS) + { + if (!allPlayersChecked) + { + allPlayersChecked = true; + allPlayersTrigger = P_CheckAllTrigger(eachtime); + } + + if (!allPlayersTrigger) + continue; + } + + CONS_Debug(DBG_GAMELOGIC, "Trying to activate each time executor with tag %d\n", Tag_FGet(&eachtime->sourceline->tags)); // 03/08/14 -Monster Iestyn // No more stupid hacks involving changing eachtime->sourceline's tag or special or whatever! // This should now run ONLY the stuff for eachtime->sourceline itself, instead of all trigger linedefs sharing the same tag. // Makes much more sense doing it this way, honestly. - P_RunTriggerLinedef(eachtime->sourceline, players[i].mo, sec); + P_RunTriggerLinedef(eachtime->sourceline, players[i].mo, caller[i]); if (!eachtime->sourceline->special) // this happens only for "Trigger on X calls" linedefs P_RemoveThinker(&eachtime->thinker); @@ -1805,13 +1590,12 @@ void T_PlaneDisplace(planedisplace_t *pd) // (egg capsule button), P_PlayerInSpecialSector (buttons), // and P_SpawnSpecials (continuous floor movers and instant lower). // -void EV_DoFloor(line_t *line, floor_e floortype) +void EV_DoFloor(mtag_t tag, line_t *line, floor_e floortype) { INT32 firstone = 1; INT32 secnum = -1; sector_t *sec; floormove_t *dofloor; - mtag_t tag = Tag_FGet(&line->tags); TAG_ITER_SECTORS(tag, secnum) { @@ -1832,34 +1616,25 @@ void EV_DoFloor(line_t *line, floor_e floortype) dofloor->type = floortype; dofloor->crush = false; // default: types that crush will change this dofloor->sector = sec; + dofloor->sourceline = (INT32)(line - lines); switch (floortype) { - // Lowers a floor to the lowest surrounding floor. - case lowerFloorToLowest: - dofloor->direction = -1; // down - dofloor->speed = FLOORSPEED*2; // 2 fracunits per tic - dofloor->floordestheight = P_FindLowestFloorSurrounding(sec); - break; - - // Used for part of the Egg Capsule, when an FOF with type 666 is - // contacted by the player. + // Used to open the top of an Egg Capsule. case raiseFloorToNearestFast: dofloor->direction = -1; // down dofloor->speed = FLOORSPEED*4; // 4 fracunits per tic dofloor->floordestheight = P_FindNextHighestFloor(sec, sec->floorheight); break; - // Used for sectors tagged to 50 linedefs (effectively - // changing the base height for placing things in that sector). + // Instantly lower floor to surrounding sectors. + // Used as a hack in the binary map format to allow thing heights above 4096. case instantLower: dofloor->direction = -1; // down dofloor->speed = INT32_MAX/2; // "instant" means "takes one tic" dofloor->floordestheight = P_FindLowestFloorSurrounding(sec); break; - // Linedef executor command, linetype 101. - // Front sector floor = destination height. case instantMoveFloorByFrontSector: dofloor->speed = INT32_MAX/2; // as above, "instant" is one tic dofloor->floordestheight = line->frontsector->floorheight; @@ -1869,22 +1644,12 @@ void EV_DoFloor(line_t *line, floor_e floortype) else dofloor->direction = -1; // down - // New for 1.09: now you can use the no climb flag to - // DISABLE the flat changing. This makes it work - // totally opposite the way linetype 106 does. Yet - // another reason I'll be glad to break backwards - // compatibility for the final. - if (line->flags & ML_NOCLIMB) - dofloor->texture = -1; // don't mess with the floorpic - else - dofloor->texture = line->frontsector->floorpic; + // If flag is set, change floor texture after moving + dofloor->texture = line->args[2] ? line->frontsector->floorpic : -1; break; - // Linedef executor command, linetype 106. - // Line length = speed, front sector floor = destination height. case moveFloorByFrontSector: - dofloor->speed = P_AproxDistance(line->dx, line->dy); - dofloor->speed = FixedDiv(dofloor->speed,8*FRACUNIT); + dofloor->speed = line->args[2] << (FRACBITS - 3); dofloor->floordestheight = line->frontsector->floorheight; if (dofloor->floordestheight >= sec->floorheight) @@ -1893,85 +1658,31 @@ void EV_DoFloor(line_t *line, floor_e floortype) dofloor->direction = -1; // down // chained linedef executing ability - if (line->flags & ML_BLOCKMONSTERS) - { - // Only set it on one of the moving sectors (the - // smallest numbered) and only if the front side - // x offset is positive, indicating a valid tag. - if (firstone && sides[line->sidenum[0]].textureoffset > 0) - dofloor->texture = (sides[line->sidenum[0]].textureoffset>>FRACBITS) - 32769; - else - dofloor->texture = -1; - } + // Only set it on one of the moving sectors (the smallest numbered) + if (line->args[3]) + dofloor->tag = firstone ? (INT16)line->args[3] : 0; // flat changing ability - else if (line->flags & ML_NOCLIMB) - dofloor->texture = line->frontsector->floorpic; - else - dofloor->texture = -1; // nothing special to do after movement completes - + dofloor->texture = line->args[4] ? line->frontsector->floorpic : -1; break; - case moveFloorByFrontTexture: - if (line->flags & ML_NOCLIMB) + case moveFloorByDistance: + if (line->args[4]) dofloor->speed = INT32_MAX/2; // as above, "instant" is one tic else - dofloor->speed = FixedDiv(sides[line->sidenum[0]].textureoffset,8*FRACUNIT); // texture x offset - dofloor->floordestheight = sec->floorheight + sides[line->sidenum[0]].rowoffset; // texture y offset + dofloor->speed = line->args[3] << (FRACBITS - 3); + dofloor->floordestheight = sec->floorheight + (line->args[2] << FRACBITS); if (dofloor->floordestheight > sec->floorheight) dofloor->direction = 1; // up else dofloor->direction = -1; // down break; -/* - // Linedef executor command, linetype 108. - // dx = speed, dy = amount to lower. - case lowerFloorByLine: - dofloor->direction = -1; // down - dofloor->speed = FixedDiv(abs(line->dx),8*FRACUNIT); - dofloor->floordestheight = sec->floorheight - abs(line->dy); - if (dofloor->floordestheight > sec->floorheight) // wrapped around - I_Error("Can't lower sector %d\n", secnum); - break; - - // Linedef executor command, linetype 109. - // dx = speed, dy = amount to raise. - case raiseFloorByLine: - dofloor->direction = 1; // up - dofloor->speed = FixedDiv(abs(line->dx),8*FRACUNIT); - dofloor->floordestheight = sec->floorheight + abs(line->dy); - if (dofloor->floordestheight < sec->floorheight) // wrapped around - I_Error("Can't raise sector %d\n", secnum); - break; -*/ - - // Linetypes 2/3. - // Move floor up and down indefinitely like the old elevators. + // Move floor up and down indefinitely. + // bounceFloor has slowdown at the top and bottom of movement. case bounceFloor: - dofloor->speed = P_AproxDistance(line->dx, line->dy); // same speed as elevateContinuous - dofloor->speed = FixedDiv(dofloor->speed,4*FRACUNIT); - dofloor->origspeed = dofloor->speed; // it gets slowed down at the top and bottom - dofloor->floordestheight = line->frontsector->floorheight; - - if (dofloor->floordestheight >= sec->floorheight) - dofloor->direction = 1; // up - else - dofloor->direction = -1; // down - - // Any delay? - dofloor->delay = sides[line->sidenum[0]].textureoffset >> FRACBITS; - dofloor->delaytimer = sides[line->sidenum[0]].rowoffset >> FRACBITS; // Initial delay - - dofloor->texture = (fixed_t)(line - lines); // hack: store source line number - break; - - // Linetypes 6/7. - // Like 2/3, but no slowdown at the top and bottom of movement, - // and the speed is line->dx the first way, line->dy for the - // return trip. Good for crushers. case bounceFloorCrush: - dofloor->speed = FixedDiv(abs(line->dx),4*FRACUNIT); + dofloor->speed = line->args[2] << (FRACBITS - 2); // same speed as elevateContinuous dofloor->origspeed = dofloor->speed; dofloor->floordestheight = line->frontsector->floorheight; @@ -1981,27 +1692,18 @@ void EV_DoFloor(line_t *line, floor_e floortype) dofloor->direction = -1; // down // Any delay? - dofloor->delay = sides[line->sidenum[0]].textureoffset >> FRACBITS; - dofloor->delaytimer = sides[line->sidenum[0]].rowoffset >> FRACBITS; // Initial delay - - dofloor->texture = (fixed_t)(line - lines); // hack: store source line number + dofloor->delay = line->args[5]; + dofloor->delaytimer = line->args[4]; // Initial delay break; case crushFloorOnce: - dofloor->speed = FixedDiv(abs(line->dx),4*FRACUNIT); - dofloor->origspeed = dofloor->speed; + dofloor->speed = dofloor->origspeed = line->args[2] << (FRACBITS - 2); dofloor->floordestheight = line->frontsector->ceilingheight; if (dofloor->floordestheight >= sec->floorheight) dofloor->direction = 1; // up else dofloor->direction = -1; // down - - // Any delay? - dofloor->delay = sides[line->sidenum[0]].textureoffset >> FRACBITS; - dofloor->delaytimer = sides[line->sidenum[0]].rowoffset >> FRACBITS; - - dofloor->texture = (fixed_t)(line - lines); // hack: store source line number break; default: @@ -2009,6 +1711,9 @@ void EV_DoFloor(line_t *line, floor_e floortype) } firstone = 0; + + // interpolation + R_CreateInterpolator_SectorPlane(&dofloor->thinker, sec, false); } } @@ -2022,14 +1727,13 @@ void EV_DoFloor(line_t *line, floor_e floortype) // // jff 2/22/98 new type to move floor and ceiling in parallel // -void EV_DoElevator(line_t *line, elevator_e elevtype, boolean customspeed) +void EV_DoElevator(mtag_t tag, line_t *line, elevator_e elevtype) { INT32 secnum = -1; sector_t *sec; elevator_t *elevator; - mtag_t tag = Tag_FGet(&line->tags); - // act on all sectors with the same tag as the triggering linedef + // act on all sectors with the given tag TAG_ITER_SECTORS(tag, secnum) { sec = §ors[secnum]; @@ -2047,6 +1751,7 @@ void EV_DoElevator(line_t *line, elevator_e elevtype, boolean customspeed) elevator->type = elevtype; elevator->sourceline = line; elevator->distance = 1; // Always crush unless otherwise + elevator->sector = sec; // set up the fields according to the type of elevator action switch (elevtype) @@ -2054,91 +1759,61 @@ void EV_DoElevator(line_t *line, elevator_e elevtype, boolean customspeed) // elevator down to next floor case elevateDown: elevator->direction = -1; - elevator->sector = sec; elevator->speed = ELEVATORSPEED/2; // half speed elevator->floordestheight = P_FindNextLowestFloor(sec, sec->floorheight); - elevator->ceilingdestheight = elevator->floordestheight - + sec->ceilingheight - sec->floorheight; break; // elevator up to next floor case elevateUp: elevator->direction = 1; - elevator->sector = sec; elevator->speed = ELEVATORSPEED/4; // quarter speed elevator->floordestheight = P_FindNextHighestFloor(sec, sec->floorheight); - elevator->ceilingdestheight = elevator->floordestheight - + sec->ceilingheight - sec->floorheight; break; // elevator up to highest floor case elevateHighest: elevator->direction = 1; - elevator->sector = sec; elevator->speed = ELEVATORSPEED/4; // quarter speed elevator->floordestheight = P_FindHighestFloorSurrounding(sec); - elevator->ceilingdestheight = elevator->floordestheight - + sec->ceilingheight - sec->floorheight; - break; - - // elevator to floor height of activating switch's front sector - case elevateCurrent: - elevator->sector = sec; - elevator->speed = ELEVATORSPEED; - elevator->floordestheight = line->frontsector->floorheight; - elevator->ceilingdestheight = elevator->floordestheight - + sec->ceilingheight - sec->floorheight; - elevator->direction = elevator->floordestheight > sec->floorheight? 1 : -1; break; case elevateContinuous: - if (customspeed) - { - elevator->origspeed = P_AproxDistance(line->dx, line->dy); - elevator->origspeed = FixedDiv(elevator->origspeed,4*FRACUNIT); - elevator->speed = elevator->origspeed; - } - else - { - elevator->speed = ELEVATORSPEED/2; - elevator->origspeed = elevator->speed; - } + elevator->origspeed = line->args[1] << (FRACBITS - 2); + elevator->speed = elevator->origspeed; - elevator->sector = sec; - elevator->low = !(line->flags & ML_NOCLIMB); // go down first unless noclimb is on + elevator->low = !line->args[4]; // go down first unless args[4] is set if (elevator->low) { elevator->direction = 1; elevator->floordestheight = P_FindNextHighestFloor(sec, sec->floorheight); - elevator->ceilingdestheight = elevator->floordestheight - + sec->ceilingheight - sec->floorheight; } else { elevator->direction = -1; elevator->floordestheight = P_FindNextLowestFloor(sec,sec->floorheight); - elevator->ceilingdestheight = elevator->floordestheight - + sec->ceilingheight - sec->floorheight; } elevator->floorwasheight = elevator->sector->floorheight; elevator->ceilingwasheight = elevator->sector->ceilingheight; - elevator->delay = sides[line->sidenum[0]].textureoffset >> FRACBITS; - elevator->delaytimer = sides[line->sidenum[0]].rowoffset >> FRACBITS; // Initial delay + elevator->delay = line->args[3]; + elevator->delaytimer = line->args[2]; // Initial delay break; case bridgeFall: elevator->direction = -1; - elevator->sector = sec; elevator->speed = ELEVATORSPEED*4; // quadruple speed elevator->floordestheight = P_FindNextLowestFloor(sec, sec->floorheight); - elevator->ceilingdestheight = elevator->floordestheight - + sec->ceilingheight - sec->floorheight; break; default: break; } + + elevator->ceilingdestheight = elevator->floordestheight + sec->ceilingheight - sec->floorheight; + + // interpolation + R_CreateInterpolator_SectorPlane(&elevator->thinker, sec, false); + R_CreateInterpolator_SectorPlane(&elevator->thinker, sec, true); } } @@ -2148,7 +1823,7 @@ void EV_CrumbleChain(sector_t *sec, ffloor_t *rover) fixed_t leftx, rightx, topy, bottomy, topz, bottomz, widthfactor, heightfactor, a, b, c, spacing; mobjtype_t type; tic_t lifetime; - INT16 flags; + boolean fromcenter; sector_t *controlsec = rover->master->frontsector; mtag_t tag = Tag_FGet(&controlsec->tags); @@ -2178,34 +1853,28 @@ void EV_CrumbleChain(sector_t *sec, ffloor_t *rover) spacing = (32<>FRACBITS != -1) - lifetime = (sides[lines[tagline].sidenum[0]].rowoffset>>FRACBITS); - else - lifetime = 0; - } - flags = lines[tagline].flags; + if (lines[tagline].stringargs[0]) + type = get_number(lines[tagline].stringargs[0]); + if (lines[tagline].args[0]) + spacing = lines[tagline].args[0] << FRACBITS; + if (lines[tagline].args[1]) + lifetime = (lines[tagline].args[1] != -1) ? lines[tagline].args[1] : 0; + fromcenter = !!lines[tagline].args[2]; } } -#undef controlsec - - // soundorg z height never gets set normally, so MEH. - sec->soundorg.z = sec->floorheight; + sec->soundorg.z = (controlsec->floorheight + controlsec->ceilingheight)/2; S_StartSound(&sec->soundorg, mobjinfo[type].activesound); +#undef controlsec + // Find the outermost vertexes in the subsector for (i = 0; i < sec->linecount; i++) { @@ -2231,7 +1900,7 @@ void EV_CrumbleChain(sector_t *sec, ffloor_t *rover) topz = *rover->topheight-(spacing>>1); bottomz = *rover->bottomheight; - if (flags & ML_EFFECT1) + if (fromcenter) { widthfactor = (rightx + topy - leftx - bottomy)>>3; heightfactor = (topz - *rover->bottomheight)>>2; @@ -2254,7 +1923,7 @@ void EV_CrumbleChain(sector_t *sec, ffloor_t *rover) spawned = P_SpawnMobj(a, b, c, type); spawned->angle += P_RandomKey(36)*ANG10; // irrelevant for default objects but might make sense for some custom ones - if (flags & ML_EFFECT1) + if (fromcenter) { P_InstaThrust(spawned, R_PointToAngle2(sec->soundorg.x, sec->soundorg.y, a, b), FixedDiv(P_AproxDistance(a - sec->soundorg.x, b - sec->soundorg.y), widthfactor)); P_SetObjectMomZ(spawned, FixedDiv((c - bottomz), heightfactor), false); @@ -2267,7 +1936,7 @@ void EV_CrumbleChain(sector_t *sec, ffloor_t *rover) } // no longer exists (can't collide with again) - rover->flags &= ~FF_EXISTS; + rover->fofflags &= ~FOF_EXISTS; rover->master->frontsector->moved = true; P_RecalcPrecipInSector(sec); } @@ -2292,6 +1961,10 @@ void EV_BounceSector(sector_t *sec, fixed_t momz, line_t *sourceline) bouncer->speed = momz/2; bouncer->distance = FRACUNIT; bouncer->low = true; + + // interpolation + R_CreateInterpolator_SectorPlane(&bouncer->thinker, sec, false); + R_CreateInterpolator_SectorPlane(&bouncer->thinker, sec, true); } // For T_ContinuousFalling special @@ -2317,6 +1990,10 @@ void EV_DoContinuousFall(sector_t *sec, sector_t *backsector, fixed_t spd, boole faller->destheight = backwards ? backsector->ceilingheight : backsector->floorheight; faller->direction = backwards ? 1 : -1; + + // interpolation + R_CreateInterpolator_SectorPlane(&faller->thinker, sec, false); + R_CreateInterpolator_SectorPlane(&faller->thinker, sec, true); } // Some other 3dfloor special things Tails 03-11-2002 (Search p_mobj.c for description) @@ -2326,7 +2003,7 @@ INT32 EV_StartCrumble(sector_t *sec, ffloor_t *rover, boolean floating, crumble_t *crumble; sector_t *foundsec; INT32 i; - mtag_t tag = Tag_FGet(&rover->master->tags); + mtag_t tag = rover->master->args[0]; // If floor is already activated, skip it if (sec->floordata) @@ -2369,6 +2046,10 @@ INT32 EV_StartCrumble(sector_t *sec, ffloor_t *rover, boolean floating, crumble->sector->crumblestate = CRUMBLE_ACTIVATED; + // interpolation + R_CreateInterpolator_SectorPlane(&crumble->thinker, sec, false); + R_CreateInterpolator_SectorPlane(&crumble->thinker, sec, true); + TAG_ITER_SECTORS(tag, i) { foundsec = §ors[i]; @@ -2393,8 +2074,8 @@ void EV_MarioBlock(ffloor_t *rover, sector_t *sector, mobj_t *puncher) if (roversec->floordata || roversec->ceilingdata) return; - if (!(rover->flags & FF_SOLID)) - rover->flags |= (FF_SOLID|FF_RENDERALL|FF_CUTLEVEL); + if (!(rover->fofflags & FOF_SOLID)) + rover->fofflags |= (FOF_SOLID|FOF_RENDERALL|FOF_CUTLEVEL); // Find an item to pop out! thing = SearchMarioNode(roversec->touching_thinglist); @@ -2418,7 +2099,11 @@ void EV_MarioBlock(ffloor_t *rover, sector_t *sector, mobj_t *puncher) block->direction = 1; block->floorstartheight = block->sector->floorheight; block->ceilingstartheight = block->sector->ceilingheight; - block->tag = (INT16)Tag_FGet(§or->tags); + block->tag = (INT16)rover->master->args[0]; + + // interpolation + R_CreateInterpolator_SectorPlane(&block->thinker, roversec, false); + R_CreateInterpolator_SectorPlane(&block->thinker, roversec, true); if (itsamonitor) { @@ -2428,9 +2113,9 @@ void EV_MarioBlock(ffloor_t *rover, sector_t *sector, mobj_t *puncher) } P_UnsetThingPosition(thing); - thing->x = sector->soundorg.x; - thing->y = sector->soundorg.y; - thing->z = topheight; + thing->x = thing->old_x = sector->soundorg.x; + thing->y = thing->old_y = sector->soundorg.y; + thing->z = thing->old_z = topheight; thing->momz = FixedMul(6*FRACUNIT, thing->scale); P_SetThingPosition(thing); if (thing->flags & MF_SHOOTABLE) @@ -2451,9 +2136,9 @@ void EV_MarioBlock(ffloor_t *rover, sector_t *sector, mobj_t *puncher) if (itsamonitor && thing) { P_UnsetThingPosition(thing); - thing->x = oldx; - thing->y = oldy; - thing->z = oldz; + thing->x = thing->old_x = oldx; + thing->y = thing->old_y = oldy; + thing->z = thing->old_z = oldz; thing->momx = 1; thing->momy = 1; P_SetThingPosition(thing); diff --git a/src/p_inter.c b/src/p_inter.c index 380040bc8..046a0a198 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -151,7 +151,7 @@ boolean P_CanPickupItem(player_t *player, boolean weapon) if (!player->mo || player->mo->health <= 0) return false; - if (player->bot) + if (player->bot && player->bot != BOT_MPAI) { if (weapon) return false; @@ -164,6 +164,62 @@ boolean P_CanPickupItem(player_t *player, boolean weapon) return true; } +boolean P_CanPickupEmblem(player_t *player, INT32 emblemID) +{ + emblem_t *emblem = NULL; + + if (emblemID < 0 || emblemID >= numemblems) + { + // Invalid emblem ID, can't pickup. + return false; + } + + emblem = &emblemlocations[emblemID]; + + if (demoplayback) + { + // Never collect emblems in replays. + return false; + } + + if (player->bot && player->bot != BOT_MPAI) + { + // Your little lap-dog can't grab these for you. + return false; + } + + if (emblem->type == ET_SKIN) + { + INT32 skinnum = M_EmblemSkinNum(emblem); + + if (player->skin != skinnum) + { + // Incorrect skin to pick up this emblem. + return false; + } + } + + return true; +} + +boolean P_EmblemWasCollected(INT32 emblemID) +{ + if (emblemID < 0 || emblemID >= numemblems) + { + // Invalid emblem ID, can't pickup. + return true; + } + + if (shareEmblems && !serverGamedata->collected[emblemID]) + { + // It can be worth collecting again if we're sharing emblems + // and the server doesn't have it. + return false; + } + + return clientGamedata->collected[emblemID]; +} + // // P_DoNightsScore // @@ -178,7 +234,7 @@ void P_DoNightsScore(player_t *player) return; // Don't do any fancy shit for failures. dummymo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z+player->mo->height/2, MT_NIGHTSCORE); - if (player->bot) + if (player->bot && player->bot != BOT_MPAI) player = &players[consoleplayer]; if (G_IsSpecialStage(gamemap)) // Global link count? Maybe not a good idea... @@ -365,7 +421,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) if (special->flags & (MF_ENEMY|MF_BOSS) && special->flags2 & MF2_FRET) return; - if (LUAh_TouchSpecial(special, toucher) || P_MobjWasRemoved(special)) + if (LUA_HookTouchSpecial(special, toucher) || P_MobjWasRemoved(special)) return; // 0 = none, 1 = elemental pierce, 2 = bubble bounce @@ -563,7 +619,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) special->momx = special->momy = special->momz = 0; P_GivePlayerSpheres(player, 1); - if (special->type == MT_BLUESPHERE) + if (special->type == MT_BLUESPHERE || special->type == MT_FLINGBLUESPHERE) { special->destscale = ((player->powers[pw_carry] == CR_NIGHTSMODE) ? 4 : 2)*special->scale; if (states[special->info->deathstate].tics > 0) @@ -630,7 +686,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) // ***************************** // // Special Stage Token case MT_TOKEN: - if (player->bot) + if (player->bot && player->bot != BOT_MPAI) return; P_AddPlayerScore(player, 1000); @@ -670,7 +726,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) // Emerald Hunt case MT_EMERHUNT: - if (player->bot) + if (player->bot && player->bot != BOT_MPAI) return; if (hunt1 == special) @@ -701,7 +757,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) case MT_EMERALD5: case MT_EMERALD6: case MT_EMERALD7: - if (player->bot) + if (player->bot && player->bot != BOT_MPAI) return; if (special->threshold) @@ -738,20 +794,76 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) // Secret emblem thingy case MT_EMBLEM: { - if (demoplayback || player->bot) + const boolean toucherIsServer = ((player - players) == serverplayer); + const boolean consoleIsServer = (consoleplayer == serverplayer); + boolean prevCollected = false; + + if ((special->flags2 & MF2_NIGHTSPULL) + && (toucher == special->tracer)) + { + // Since collecting may not remove the object, + // we need to manually stop it from chasing. + P_SetTarget(&special->tracer, NULL); + special->flags2 &= ~MF2_NIGHTSPULL; + special->movefactor = 0; + special->momx = special->momy = special->momz = 0; + } + + if (!P_CanPickupEmblem(player, special->health - 1)) + { return; - emblemlocations[special->health-1].collected = true; + } - M_UpdateUnlockablesAndExtraEmblems(); + prevCollected = P_EmblemWasCollected(special->health - 1); - G_SaveGameData(); - break; + if (toucherIsServer || shareEmblems) + { + serverGamedata->collected[special->health-1] = true; + M_SilentUpdateUnlockablesAndEmblems(serverGamedata); + } + + if (P_IsLocalPlayer(player) || (consoleIsServer && shareEmblems)) + { + clientGamedata->collected[special->health-1] = true; + M_UpdateUnlockablesAndExtraEmblems(clientGamedata); + G_SaveGameData(clientGamedata); + } + + if (netgame) + { + // This always spawns the object to prevent mobjnum issues, + // but makes the effect invisible to whoever it doesn't matter to. + mobj_t *spark = P_SpawnMobjFromMobj(special, 0, 0, 0, MT_SPARK); + + if (prevCollected == false && P_EmblemWasCollected(special->health - 1) == true) + { + // Play the sound if it was collected. + S_StartSound((shareEmblems ? NULL : special), special->info->deathsound); + } + else + { + // We didn't collect it, make it invisible to us. + spark->flags2 |= MF2_DONTDRAW; + } + + return; + } + else + { + if (prevCollected == false && P_EmblemWasCollected(special->health - 1) == true) + { + // Disappear when collecting for local games. + break; + } + + return; + } } // CTF Flags case MT_REDFLAG: case MT_BLUEFLAG: - if (player->bot) + if (player->bot && player->bot != BOT_MPAI) return; if (player->powers[pw_flashing] || player->tossdelay) return; @@ -763,6 +875,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) // return; { UINT8 flagteam = (special->type == MT_REDFLAG) ? 1 : 2; + sectorspecialflags_t specialflag = (special->type == MT_REDFLAG) ? SSF_REDTEAMBASE : SSF_BLUETEAMBASE; const char *flagtext; char flagcolor; char plname[MAXPLAYERNAME+4]; @@ -792,7 +905,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) special->fuse = 1; special->flags2 |= MF2_JUSTATTACKED; - if (!P_PlayerTouchingSectorSpecial(player, 4, 2 + flagteam)) + if (!P_PlayerTouchingSectorSpecialFlag(player, specialflag)) { CONS_Printf(M_GetText("%s returned the %c%s%c to base.\n"), plname, flagcolor, flagtext, 0x80); @@ -826,7 +939,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) { boolean spec = G_IsSpecialStage(gamemap); boolean cangiveemmy = false; - if (player->bot) + if (player->bot && player->bot != BOT_MPAI) return; if (player->exiting) return; @@ -1072,7 +1185,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) } return; case MT_EGGCAPSULE: - if (player->bot) + if (player->bot && player->bot != BOT_MPAI) return; // make sure everything is as it should be, THEN take rings from players in special stages @@ -1164,7 +1277,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) } return; case MT_NIGHTSSUPERLOOP: - if (player->bot || !(player->powers[pw_carry] == CR_NIGHTSMODE)) + if ((player->bot && player->bot != BOT_MPAI) || !(player->powers[pw_carry] == CR_NIGHTSMODE)) return; if (!G_IsSpecialStage(gamemap)) player->powers[pw_nights_superloop] = (UINT16)special->info->speed; @@ -1186,7 +1299,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) } break; case MT_NIGHTSDRILLREFILL: - if (player->bot || !(player->powers[pw_carry] == CR_NIGHTSMODE)) + if ((player->bot && player->bot != BOT_MPAI) || !(player->powers[pw_carry] == CR_NIGHTSMODE)) return; if (!G_IsSpecialStage(gamemap)) player->drillmeter = special->info->speed; @@ -1208,7 +1321,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) } break; case MT_NIGHTSHELPER: - if (player->bot || !(player->powers[pw_carry] == CR_NIGHTSMODE)) + if ((player->bot && player->bot != BOT_MPAI) || !(player->powers[pw_carry] == CR_NIGHTSMODE)) return; if (!G_IsSpecialStage(gamemap)) { @@ -1240,7 +1353,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) } break; case MT_NIGHTSEXTRATIME: - if (player->bot || !(player->powers[pw_carry] == CR_NIGHTSMODE)) + if ((player->bot && player->bot != BOT_MPAI) || !(player->powers[pw_carry] == CR_NIGHTSMODE)) return; if (!G_IsSpecialStage(gamemap)) { @@ -1272,7 +1385,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) } break; case MT_NIGHTSLINKFREEZE: - if (player->bot || !(player->powers[pw_carry] == CR_NIGHTSMODE)) + if ((player->bot && player->bot != BOT_MPAI) || !(player->powers[pw_carry] == CR_NIGHTSMODE)) return; if (!G_IsSpecialStage(gamemap)) { @@ -1332,7 +1445,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) if (playeringame[i] && players[i].powers[pw_carry] == CR_NIGHTSMODE) players[i].drillmeter += TICRATE/2; } - else if (player->bot) + else if (player->bot && player->bot != BOT_MPAI) players[consoleplayer].drillmeter += TICRATE/2; else player->drillmeter += TICRATE/2; @@ -1381,19 +1494,14 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) return; case MT_AXE: { - line_t junk; thinker_t *th; mobj_t *mo2; - if (player->bot) + if (player->bot && player->bot != BOT_MPAI) return; - // Initialize my junk - junk.tags.tags = NULL; - junk.tags.count = 0; - - Tag_FSet(&junk.tags, LE_AXE); - EV_DoElevator(&junk, bridgeFall, false); + if (special->spawnpoint) + EV_DoElevator(special->spawnpoint->args[0], NULL, bridgeFall); // scan the remaining thinkers to find koopa for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next) @@ -1423,7 +1531,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) return; } case MT_FIREFLOWER: - if (player->bot) + if (player->bot && player->bot != BOT_MPAI) return; S_StartSound(toucher, sfx_mario3); @@ -1442,7 +1550,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) // Misc touchables // // *************** // case MT_STARPOST: - P_TouchStarPost(special, player, special->spawnpoint && (special->spawnpoint->options & MTF_OBJECTSPECIAL)); + P_TouchStarPost(special, player, special->spawnpoint && special->spawnpoint->args[1]); return; case MT_FAKEMOBILE: @@ -1685,7 +1793,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) return; // Only go in the mouth // Eaten by player! - if ((!player->bot) && (player->powers[pw_underwater] && player->powers[pw_underwater] <= 12*TICRATE + 1)) + if ((!player->bot || player->bot == BOT_MPAI) && (player->powers[pw_underwater] && player->powers[pw_underwater] <= 12*TICRATE + 1)) { player->powers[pw_underwater] = underwatertics + 1; P_RestoreMusic(player); @@ -1696,7 +1804,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) if (!player->climbing) { - if (player->bot && toucher->state-states != S_PLAY_GASP) + if (player->bot && player->bot != BOT_MPAI && toucher->state-states != S_PLAY_GASP) S_StartSound(toucher, special->info->deathsound); // Force it to play a sound for bots P_SetPlayerMobjState(toucher, S_PLAY_GASP); P_ResetPlayer(player); @@ -1704,7 +1812,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) toucher->momx = toucher->momy = toucher->momz = 0; - if (player->bot) + if (player->bot && player->bot != BOT_MPAI) return; else break; @@ -1736,7 +1844,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) return; case MT_MINECARTSPAWNER: - if (!player->bot && special->fuse <= TICRATE && player->powers[pw_carry] != CR_MINECART && !(player->powers[pw_ignorelatch] & (1<<15))) + if (!player->bot && player->bot != BOT_MPAI && special->fuse <= TICRATE && player->powers[pw_carry] != CR_MINECART && !(player->powers[pw_ignorelatch] & (1<<15))) { mobj_t *mcart = P_SpawnMobj(special->x, special->y, special->z, MT_MINECART); P_SetTarget(&mcart->target, toucher); @@ -1789,7 +1897,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) } return; default: // SOC or script pickup - if (player->bot) + if (player->bot && player->bot != BOT_MPAI) return; P_SetTarget(&special->target, toucher); break; @@ -1813,7 +1921,7 @@ void P_TouchStarPost(mobj_t *post, player_t *player, boolean snaptopost) mobj_t *toucher = player->mo; mobj_t *checkbase = snaptopost ? post : toucher; - if (player->bot) + if (player->bot && player->bot != BOT_MPAI) return; // In circuit, player must have touched all previous starposts if (circuitmap @@ -1939,7 +2047,7 @@ static void P_HitDeathMessages(player_t *player, mobj_t *inflictor, mobj_t *sour if (!netgame) return; // Presumably it's obvious what's happening in splitscreen. - if (LUAh_HurtMsg(player, inflictor, source, damagetype)) + if (LUA_HookHurtMsg(player, inflictor, source, damagetype)) return; deadtarget = (player->mo->health <= 0); @@ -2391,7 +2499,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damaget mobj_t *mo; if (inflictor && (inflictor->type == MT_SHELL || inflictor->type == MT_FIREBALL)) - P_SetTarget(&target->tracer, inflictor); + S_StartScreamSound(target, sfx_mario2); if (!(maptol & TOL_NIGHTS) && G_IsSpecialStage(gamemap) && target->player && target->player->nightstime > 6) target->player->nightstime = 6; // Just let P_Ticker take care of the rest. @@ -2413,7 +2521,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damaget target->flags2 &= ~(MF2_SKULLFLY|MF2_NIGHTSPULL); target->health = 0; // This makes it easy to check if something's dead elsewhere. - if (LUAh_MobjDeath(target, inflictor, source, damagetype) || P_MobjWasRemoved(target)) + if (LUA_HookMobjDeath(target, inflictor, source, damagetype) || P_MobjWasRemoved(target)) return; // Let EVERYONE know what happened to a player! 01-29-2002 Tails @@ -2555,7 +2663,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damaget if ((target->player->lives <= 1) && (netgame || multiplayer) && G_GametypeUsesCoopLives() && (cv_cooplives.value == 0)) ; - else if (!target->player->bot && !target->player->spectator && (target->player->lives != INFLIVES) + else if ((!target->player->bot || target->player->bot == BOT_MPAI) && !target->player->spectator && (target->player->lives != INFLIVES) && G_GametypeUsesLives()) { if (!(target->player->pflags & PF_FINISHED)) @@ -2588,7 +2696,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damaget if (!(netgame || multiplayer || demoplayback || demorecording || metalrecording || modeattacking) && numgameovers < maxgameovers) { numgameovers++; - if ((!modifiedgame || savemoddata) && cursaveslot > 0) + if (!usedCheats && cursaveslot > 0) G_SaveGameOver((UINT32)cursaveslot, (target->player->continues <= 0)); } } @@ -2776,7 +2884,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damaget case MT_BLASTEXECUTOR: if (target->spawnpoint) - P_LinedefExecute(target->spawnpoint->angle, (source ? source : inflictor), target->subsector->sector); + P_LinedefExecute(target->spawnpoint->args[0], (source ? source : inflictor), target->subsector->sector); break; case MT_SPINBOBERT: @@ -3475,7 +3583,7 @@ void P_SpecialStageDamage(player_t *player, mobj_t *inflictor, mobj_t *source) if (inflictor && inflictor->type == MT_LHRT) return; - if (player->powers[pw_shield] || player->bot) //If One-Hit Shield + if (player->powers[pw_shield] || (player->bot && player->bot != BOT_MPAI)) //If One-Hit Shield { P_RemoveShield(player); S_StartSound(player->mo, sfx_shldls); // Ba-Dum! Shield loss. @@ -3548,9 +3656,11 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da // Everything above here can't be forced. if (!metalrecording) { - UINT8 shouldForce = LUAh_ShouldDamage(target, inflictor, source, damage, damagetype); + UINT8 shouldForce = LUA_HookShouldDamage(target, inflictor, source, damage, damagetype); if (P_MobjWasRemoved(target)) return (shouldForce == 1); // mobj was removed + if (P_MobjWasRemoved(source)) + source = NULL; if (shouldForce == 1) force = true; else if (shouldForce == 2) @@ -3566,7 +3676,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da return false; // Make sure that boxes cannot be popped by enemies, red rings, etc. - if (target->flags & MF_MONITOR && ((!source || !source->player || source->player->bot) + if (target->flags & MF_MONITOR && ((!source || !source->player || (source->player->bot && source->player->bot != BOT_MPAI)) || (inflictor && (inflictor->type == MT_REDRING || (inflictor->type >= MT_THROWNBOUNCE && inflictor->type <= MT_THROWNGRENADE))))) return false; } @@ -3589,7 +3699,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da if (!force && target->flags2 & MF2_FRET) // Currently flashing from being hit return false; - if (LUAh_MobjDamage(target, inflictor, source, damage, damagetype) || P_MobjWasRemoved(target)) + if (LUA_HookMobjDamage(target, inflictor, source, damage, damagetype) || P_MobjWasRemoved(target)) return true; if (target->health > 1) @@ -3639,7 +3749,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da || (G_GametypeHasTeams() && player->ctfteam == source->player->ctfteam))) return false; // Don't run eachother over in special stages and team games and such } - if (LUAh_MobjDamage(target, inflictor, source, damage, damagetype)) + if (LUA_HookMobjDamage(target, inflictor, source, damage, damagetype)) return true; P_NiGHTSDamage(target, source); // -5s :( return true; @@ -3651,7 +3761,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da return true; } - if (!force && inflictor && inflictor->flags & MF_FIRE) + if (!force && inflictor && inflictor->flags & MF_FIRE && !(damagetype && damagetype != DMG_FIRE)) { if (player->powers[pw_shield] & SH_PROTECTFIRE) return false; // Invincible to fire objects @@ -3693,15 +3803,15 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da if (force || (inflictor && inflictor->flags & MF_MISSILE && inflictor->flags2 & MF2_SUPERFIRE)) // Super Sonic is stunned! { - if (!LUAh_MobjDamage(target, inflictor, source, damage, damagetype)) + if (!LUA_HookMobjDamage(target, inflictor, source, damage, damagetype)) P_SuperDamage(player, inflictor, source, damage); return true; } return false; } - else if (LUAh_MobjDamage(target, inflictor, source, damage, damagetype)) + else if (LUA_HookMobjDamage(target, inflictor, source, damage, damagetype)) return true; - else if (player->powers[pw_shield] || (player->bot && !ultimatemode)) //If One-Hit Shield + else if (player->powers[pw_shield] || (player->bot && player->bot != BOT_MPAI && !ultimatemode)) //If One-Hit Shield { P_ShieldDamage(player, inflictor, source, damage, damagetype); damage = 0; @@ -3768,6 +3878,9 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da else P_SetMobjState(target, target->info->painstate); + if (P_MobjWasRemoved(target)) + return false; + if (target->type == MT_HIVEELEMENTAL) target->extravalue1 += 3; @@ -3888,7 +4001,10 @@ void P_PlayerRingBurst(player_t *player, INT32 num_rings) P_SetObjectMomZ(mo, ns, true); } if (player->mo->eflags & MFE_VERTICALFLIP) + { mo->momz *= -1; + mo->flags2 |= MF2_OBJECTFLIP; + } } player->losstime += 10*TICRATE; @@ -4112,6 +4228,8 @@ void P_PlayerWeaponPanelOrAmmoBurst(player_t *player) P_SetObjectMomZ(mo, 4*FRACUNIT, false); \ if (i & 1) \ P_SetObjectMomZ(mo, 4*FRACUNIT, true); \ + if (player->mo->eflags & MFE_VERTICALFLIP) \ + mo->flags2 |= MF2_OBJECTFLIP; \ ++i; \ } \ else if (player->powers[power] > 0) \ @@ -4131,6 +4249,8 @@ void P_PlayerWeaponPanelOrAmmoBurst(player_t *player) P_SetObjectMomZ(mo, 3*FRACUNIT, false); \ if (i & 1) \ P_SetObjectMomZ(mo, 3*FRACUNIT, true); \ + if (player->mo->eflags & MFE_VERTICALFLIP) \ + mo->flags2 |= MF2_OBJECTFLIP; \ player->powers[power] = 0; \ ++i; \ } @@ -4271,7 +4391,10 @@ void P_PlayerEmeraldBurst(player_t *player, boolean toss) P_SetObjectMomZ(mo, 3*FRACUNIT, false); if (player->mo->eflags & MFE_VERTICALFLIP) + { mo->momz = -mo->momz; + mo->flags2 |= MF2_OBJECTFLIP; + } if (toss) player->tossdelay = 2*TICRATE; @@ -4300,7 +4423,10 @@ void P_PlayerFlagBurst(player_t *player, boolean toss) flag = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, type); if (player->mo->eflags & MFE_VERTICALFLIP) + { flag->z += player->mo->height - flag->height; + flag->flags2 |= MF2_OBJECTFLIP; + } if (toss) P_InstaThrust(flag, player->mo->angle, FixedMul(6*FRACUNIT, player->mo->scale)); diff --git a/src/p_lights.c b/src/p_lights.c index 1e41146da..4b6a3673b 100644 --- a/src/p_lights.c +++ b/src/p_lights.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -30,7 +30,7 @@ void P_RemoveLighting(sector_t *sector) // The thinker is the first member in all the lighting action structs, // so just let the thinker get freed, and that will free the whole // structure. - P_RemoveThinker(&((elevator_t *)sector->lightingdata)->thinker); + P_RemoveThinker(&((thinkerdata_t *)sector->lightingdata)->thinker); sector->lightingdata = NULL; } } @@ -54,43 +54,36 @@ void T_FireFlicker(fireflicker_t *flick) amount = (INT16)((UINT8)(P_RandomByte() & 3) * 16); if (flick->sector->lightlevel - amount < flick->minlight) - flick->sector->lightlevel = (INT16)flick->minlight; + flick->sector->lightlevel = flick->minlight; else - flick->sector->lightlevel = (INT16)((INT16)flick->maxlight - amount); + flick->sector->lightlevel = flick->maxlight - amount; flick->count = flick->resetcount; } /** Spawns an adjustable fire flicker effect in a sector. * - * \param minsector Sector whose light level is used as the darkest. - * \param maxsector Sector whose light level is used as the brightest, - * and also the target sector for the effect. + * \param sector Target sector for the effect. + * \param lighta One of the two light levels to move between. + * \param lightb The other light level. * \param length Four times the number of tics between flickers. * \sa T_FireFlicker */ -fireflicker_t *P_SpawnAdjustableFireFlicker(sector_t *minsector, sector_t *maxsector, INT32 length) +fireflicker_t *P_SpawnAdjustableFireFlicker(sector_t *sector, INT16 lighta, INT16 lightb, INT32 length) { fireflicker_t *flick; - P_RemoveLighting(maxsector); // out with the old, in with the new + P_RemoveLighting(sector); // out with the old, in with the new flick = Z_Calloc(sizeof (*flick), PU_LEVSPEC, NULL); P_AddThinker(THINK_MAIN, &flick->thinker); flick->thinker.function.acp1 = (actionf_p1)T_FireFlicker; - flick->sector = maxsector; - flick->maxlight = maxsector->lightlevel; - flick->minlight = minsector->lightlevel; - if (flick->minlight > flick->maxlight) - { - // You mixed them up, you dummy. - INT32 oops = flick->minlight; - flick->minlight = flick->maxlight; - flick->maxlight = oops; - } + flick->sector = sector; + flick->maxlight = max(lighta, lightb); + flick->minlight = min(lighta, lightb); flick->count = flick->resetcount = length/4; - maxsector->lightingdata = flick; + sector->lightingdata = flick; // input bounds checking and stuff if (!flick->resetcount) @@ -103,6 +96,9 @@ fireflicker_t *P_SpawnAdjustableFireFlicker(sector_t *minsector, sector_t *maxse flick->maxlight++; } + // Make sure the starting light level is in range. + sector->lightlevel = max(flick->minlight, min(flick->maxlight, sector->lightlevel)); + return flick; } @@ -148,7 +144,7 @@ void P_SpawnLightningFlash(sector_t *sector) minlight = ((lightflash_t *)sector->lightingdata)->minlight; } - P_RemoveThinker(&((elevator_t *)sector->lightingdata)->thinker); + P_RemoveThinker(&((thinkerdata_t *)sector->lightingdata)->thinker); } sector->lightingdata = NULL; @@ -182,21 +178,21 @@ void T_StrobeFlash(strobe_t *flash) if (flash->sector->lightlevel == flash->minlight) { - flash->sector->lightlevel = (INT16)flash->maxlight; + flash->sector->lightlevel = flash->maxlight; flash->count = flash->brighttime; } else { - flash->sector->lightlevel = (INT16)flash->minlight; + flash->sector->lightlevel = flash->minlight; flash->count = flash->darktime; } } /** Spawns an adjustable strobe light effect in a sector. * - * \param minsector Sector whose light level is used as the darkest. - * \param maxsector Sector whose light level is used as the brightest, - * and also the target sector for the effect. + * \param sector Target sector for the effect. + * \param lighta One of the two light levels to move between. + * \param lightb The other light level. * \param darktime Time in tics for the light to be dark. * \param brighttime Time in tics for the light to be bright. * \param inSync If true, the effect will be kept in sync @@ -207,29 +203,21 @@ void T_StrobeFlash(strobe_t *flash) * the strobe flash is random. * \sa T_StrobeFlash */ -strobe_t *P_SpawnAdjustableStrobeFlash(sector_t *minsector, sector_t *maxsector, INT32 darktime, INT32 brighttime, boolean inSync) +strobe_t *P_SpawnAdjustableStrobeFlash(sector_t *sector, INT16 lighta, INT16 lightb, INT32 darktime, INT32 brighttime, boolean inSync) { strobe_t *flash; - P_RemoveLighting(maxsector); // out with the old, in with the new + P_RemoveLighting(sector); // out with the old, in with the new flash = Z_Calloc(sizeof (*flash), PU_LEVSPEC, NULL); P_AddThinker(THINK_MAIN, &flash->thinker); - flash->sector = maxsector; + flash->sector = sector; flash->darktime = darktime; flash->brighttime = brighttime; flash->thinker.function.acp1 = (actionf_p1)T_StrobeFlash; - flash->maxlight = maxsector->lightlevel; - flash->minlight = minsector->lightlevel; - - if (flash->minlight > flash->maxlight) - { - // You mixed them up, you dummy. - INT32 oops = flash->minlight; - flash->minlight = flash->maxlight; - flash->maxlight = oops; - } + flash->maxlight = max(lighta, lightb); + flash->minlight = min(lighta, lightb); if (flash->minlight == flash->maxlight) flash->minlight = 0; @@ -239,7 +227,10 @@ strobe_t *P_SpawnAdjustableStrobeFlash(sector_t *minsector, sector_t *maxsector, else flash->count = 1; - maxsector->lightingdata = flash; + // Make sure the starting light level is in range. + sector->lightlevel = max(flash->minlight, min(flash->maxlight, sector->lightlevel)); + + sector->lightingdata = flash; return flash; } @@ -254,20 +245,20 @@ void T_Glow(glow_t *g) { case -1: // DOWN - g->sector->lightlevel = (INT16)(g->sector->lightlevel - (INT16)g->speed); + g->sector->lightlevel -= g->speed; if (g->sector->lightlevel <= g->minlight) { - g->sector->lightlevel = (INT16)(g->sector->lightlevel + (INT16)g->speed); + g->sector->lightlevel += g->speed; g->direction = 1; } break; case 1: // UP - g->sector->lightlevel = (INT16)(g->sector->lightlevel + (INT16)g->speed); + g->sector->lightlevel += g->speed; if (g->sector->lightlevel >= g->maxlight) { - g->sector->lightlevel = (INT16)(g->sector->lightlevel - (INT16)g->speed); + g->sector->lightlevel -= g->speed; g->direction = -1; } break; @@ -276,34 +267,27 @@ void T_Glow(glow_t *g) /** Spawns an adjustable glowing light effect in a sector. * - * \param minsector Sector whose light level is used as the darkest. - * \param maxsector Sector whose light level is used as the brightest, - * and also the target sector for the effect. + * \param sector Target sector for the effect. + * \param lighta One of the two light levels to move between. + * \param lightb The other light level. * \param length The speed of the effect. * \sa T_Glow */ -glow_t *P_SpawnAdjustableGlowingLight(sector_t *minsector, sector_t *maxsector, INT32 length) +glow_t *P_SpawnAdjustableGlowingLight(sector_t *sector, INT16 lighta, INT16 lightb, INT32 length) { glow_t *g; - P_RemoveLighting(maxsector); // out with the old, in with the new + P_RemoveLighting(sector); // out with the old, in with the new g = Z_Calloc(sizeof (*g), PU_LEVSPEC, NULL); P_AddThinker(THINK_MAIN, &g->thinker); - g->sector = maxsector; - g->minlight = minsector->lightlevel; - g->maxlight = maxsector->lightlevel; - if (g->minlight > g->maxlight) - { - // You mixed them up, you dummy. - INT32 oops = g->minlight; - g->minlight = g->maxlight; - g->maxlight = oops; - } + g->sector = sector; + g->minlight = min(lighta, lightb); + g->maxlight = max(lighta, lightb); g->thinker.function.acp1 = (actionf_p1)T_Glow; g->direction = 1; - g->speed = length/4; + g->speed = (INT16)(length/4); if (g->speed > (g->maxlight - g->minlight)/2) // don't make it ridiculous speed g->speed = (g->maxlight - g->minlight)/2; @@ -317,7 +301,10 @@ glow_t *P_SpawnAdjustableGlowingLight(sector_t *minsector, sector_t *maxsector, g->speed = (g->maxlight - g->minlight)/2; } - maxsector->lightingdata = g; + // Make sure the starting light level is in range. + sector->lightlevel = max(g->minlight, min(g->maxlight, sector->lightlevel)); + + sector->lightingdata = g; return g; } @@ -366,14 +353,15 @@ void P_FadeLightBySector(sector_t *sector, INT32 destvalue, INT32 speed, boolean else { // Speed means increment per tic (literally speed). - ll->timer = FixedDiv((destvalue<fixedcurlevel, speed<>FRACBITS; - ll->fixedpertic = speed<timer = abs(FixedDiv((destvalue<fixedcurlevel, speed<>FRACBITS); + ll->fixedpertic = ll->destlevel < ll->sourcelevel ? -speed<timer); continue; } - P_FadeLightBySector(§ors[i], destvalue, speed, ticbased); + + realdestvalue = relative ? max(0, min(255, sectors[i].lightlevel + destvalue)) : destvalue; + P_FadeLightBySector(§ors[i], realdestvalue, speed, ticbased); } } diff --git a/src/p_local.h b/src/p_local.h index 1fcd3050d..3c84d6fe2 100644 --- a/src/p_local.h +++ b/src/p_local.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -91,6 +91,7 @@ typedef struct camera_s // Camera demobjerization // Info for drawing: position. fixed_t x, y, z; + boolean reset; //More drawing info: to determine current sprite. angle_t angle; // orientation @@ -148,13 +149,14 @@ boolean P_PlayerShouldUseSpinHeight(player_t *player); boolean P_IsObjectInGoop(mobj_t *mo); boolean P_IsObjectOnGround(mobj_t *mo); -boolean P_IsObjectOnGroundIn(mobj_t *mo, sector_t *sec); boolean P_InSpaceSector(mobj_t *mo); boolean P_InQuicksand(mobj_t *mo); +boolean P_InJumpFlipSector(mobj_t *mo); boolean P_PlayerHitFloor(player_t *player, boolean dorollstuff); void P_SetObjectMomZ(mobj_t *mo, fixed_t value, boolean relative); void P_RestoreMusic(player_t *player); +void P_SetPower(player_t *player, powertype_t power, UINT16 value); void P_SpawnShieldOrb(player_t *player); void P_SwitchShield(player_t *player, UINT16 shieldtype); mobj_t *P_SpawnGhostMobj(mobj_t *mobj); @@ -349,6 +351,7 @@ void P_FlashPal(player_t *pl, UINT16 type, UINT16 duration); #define PAL_MIXUP 2 #define PAL_RECYCLE 3 #define PAL_NUKE 4 +#define PAL_INVERT 5 // // P_ENEMY @@ -371,7 +374,7 @@ void P_NewChaseDir(mobj_t *actor); boolean P_LookForPlayers(mobj_t *actor, boolean allaround, boolean tracer, fixed_t dist); mobj_t *P_InternalFlickySpawn(mobj_t *actor, mobjtype_t flickytype, fixed_t momz, boolean lookforplayers, SINT8 moveforward); -void P_InternalFlickySetColor(mobj_t *actor, UINT8 extrainfo); +void P_InternalFlickySetColor(mobj_t *actor, UINT8 color); #define P_IsFlickyCenter(type) (type > MT_FLICKY_01 && type < MT_SEED && (type - MT_FLICKY_01) % 2 ? 1 : 0) void P_InternalFlickyBubble(mobj_t *actor); void P_InternalFlickyFly(mobj_t *actor, fixed_t flyspeed, fixed_t targetdist, fixed_t chasez); @@ -409,9 +412,11 @@ void P_SetUnderlayPosition(mobj_t *thing); boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y); boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam); +boolean P_CheckMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff); boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff); boolean P_Move(mobj_t *actor, fixed_t speed); -boolean P_TeleportMove(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z); +boolean P_SetOrigin(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z); +boolean P_MoveOrigin(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z); void P_SlideMove(mobj_t *mo); void P_BounceMove(mobj_t *mo); boolean P_CheckSight(mobj_t *t1, mobj_t *t2); @@ -505,6 +510,8 @@ void P_ClearStarPost(INT32 postnum); void P_ResetStarposts(void); boolean P_CanPickupItem(player_t *player, boolean weapon); +boolean P_CanPickupEmblem(player_t *player, INT32 emblemID); +boolean P_EmblemWasCollected(INT32 emblemID); void P_DoNightsScore(player_t *player); void P_DoMatchSuper(player_t *player); diff --git a/src/p_map.c b/src/p_map.c index 5533478e5..aa2bda90d 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -19,6 +19,7 @@ #include "m_random.h" #include "p_local.h" #include "p_setup.h" // NiGHTS stuff +#include "r_fps.h" #include "r_state.h" #include "r_main.h" #include "r_sky.h" @@ -74,7 +75,7 @@ camera_t *mapcampointer; // // P_TeleportMove // -boolean P_TeleportMove(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z) +static boolean P_TeleportMove(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z) { // the move is ok, // so link the thing into its new position @@ -106,6 +107,30 @@ boolean P_TeleportMove(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z) return true; } +// P_SetOrigin - P_TeleportMove which RESETS interpolation values. +// +boolean P_SetOrigin(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z) +{ + boolean result = P_TeleportMove(thing, x, y, z); + + if (result == true) + { + thing->old_x = thing->x; + thing->old_y = thing->y; + thing->old_z = thing->z; + } + + return result; +} + +// +// P_MoveOrigin - P_TeleportMove which KEEPS interpolation values. +// +boolean P_MoveOrigin(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z) +{ + return P_TeleportMove(thing, x, y, z); +} + // ========================================================================= // MOVEMENT ITERATOR FUNCTIONS // ========================================================================= @@ -237,13 +262,15 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object) } else { - INT32 pflags = object->player->pflags & (PF_JUMPED|PF_NOJUMPDAMAGE|PF_SPINNING|PF_THOKKED|PF_BOUNCING); // Not identical to below... + INT32 pflags = object->player->pflags & (PF_JUMPED|PF_NOJUMPDAMAGE|PF_SPINNING|PF_THOKKED|PF_BOUNCING|PF_CANCARRY); // Not identical to below... UINT8 secondjump = object->player->secondjump; + UINT16 tailsfly = object->player->powers[pw_tailsfly]; if (object->player->pflags & PF_GLIDING) P_SetPlayerMobjState(object, S_PLAY_FALL); P_ResetPlayer(object->player); object->player->pflags |= pflags; object->player->secondjump = secondjump; + object->player->powers[pw_tailsfly] = tailsfly; } } @@ -393,7 +420,20 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object) P_SetPlayerMobjState(object, S_PLAY_ROLL); } else - pflags = object->player->pflags & (PF_STARTJUMP|PF_JUMPED|PF_NOJUMPDAMAGE|PF_SPINNING|PF_THOKKED|PF_BOUNCING); // I still need these. + { + boolean wasSpindashing = object->player->dashspeed > 0 && (object->player->charability2 == CA2_SPINDASH); + + pflags = object->player->pflags & (PF_STARTJUMP | PF_JUMPED | PF_NOJUMPDAMAGE | PF_SPINNING | PF_THOKKED | PF_BOUNCING); // I still need these. + + if (wasSpindashing) // Ensure we're in the rolling state, and not spindash. + P_SetPlayerMobjState(object, S_PLAY_ROLL); + + if (object->player->charability == CA_GLIDEANDCLIMB && object->player->skidtime && (pflags & PF_JUMPED)) + { + object->player->skidtime = 0; // No skidding should be happening, either. + pflags &= ~PF_JUMPED; + } + } secondjump = object->player->secondjump; washoming = object->player->homing; P_ResetPlayer(object->player); @@ -492,7 +532,7 @@ static void P_DoFanAndGasJet(mobj_t *spring, mobj_t *object) switch (spring->type) { case MT_FAN: // fan - if (zdist > (spring->health << FRACBITS)) // max z distance determined by health (set by map thing angle) + if (zdist > (spring->health << FRACBITS)) // max z distance determined by health (set by map thing args[0]) break; if (flipval*object->momz >= FixedMul(speed, spring->scale)) // if object's already moving faster than your best, don't bother break; @@ -505,11 +545,12 @@ static void P_DoFanAndGasJet(mobj_t *spring, mobj_t *object) if (flipval*object->momz > FixedMul(speed, spring->scale)) object->momz = flipval*FixedMul(speed, spring->scale); - if (p && !p->powers[pw_tailsfly]) // doesn't reset anim for Tails' flight + if (p && !p->powers[pw_tailsfly] && !p->powers[pw_carry]) // doesn't reset anim for Tails' flight { P_ResetPlayer(p); - if (p->panim != PA_FALL) - P_SetPlayerMobjState(object, S_PLAY_FALL); + P_SetPlayerMobjState(object, S_PLAY_FALL); + P_SetTarget(&object->tracer, spring); + p->powers[pw_carry] = CR_FAN; } break; case MT_STEAM: // Steam @@ -567,7 +608,7 @@ static void P_DoPterabyteCarry(player_t *player, mobj_t *ptera) player->mo->x = ptera->x; player->mo->y = ptera->y; P_SetThingPosition(player->mo); - ptera->movefactor = 3*TICRATE; + ptera->movefactor = 3*TICRATE; // timer before dropping ptera->watertop = ptera->waterbottom = ptera->cusval = 0; } @@ -754,7 +795,7 @@ static boolean PIT_CheckThing(mobj_t *thing) return true; // underneath // REX HAS SEEN YOU - if (!LUAh_SeenPlayer(tmthing->target->player, thing->player)) + if (!LUA_HookSeenPlayer(tmthing->target->player, thing->player)) return false; seenplayer = thing->player; @@ -943,7 +984,7 @@ static boolean PIT_CheckThing(mobj_t *thing) } { - UINT8 shouldCollide = LUAh_MobjCollide(thing, tmthing); // checks hook for thing's type + UINT8 shouldCollide = LUA_Hook2Mobj(thing, tmthing, MOBJ_HOOK(MobjCollide)); // checks hook for thing's type if (P_MobjWasRemoved(tmthing) || P_MobjWasRemoved(thing)) return true; // one of them was removed??? if (shouldCollide == 1) @@ -951,7 +992,7 @@ static boolean PIT_CheckThing(mobj_t *thing) else if (shouldCollide == 2) return true; // force no collide - shouldCollide = LUAh_MobjMoveCollide(tmthing, thing); // checks hook for tmthing's type + shouldCollide = LUA_Hook2Mobj(tmthing, thing, MOBJ_HOOK(MobjMoveCollide)); // checks hook for tmthing's type if (P_MobjWasRemoved(tmthing) || P_MobjWasRemoved(thing)) return true; // one of them was removed??? if (shouldCollide == 1) @@ -1152,11 +1193,11 @@ static boolean PIT_CheckThing(mobj_t *thing) return true; // underneath if (tmthing->eflags & MFE_VERTICALFLIP) - thing->z = tmthing->z - thing->height - FixedMul(FRACUNIT, tmthing->scale); + P_SetOrigin(thing, thing->x, thing->y, tmthing->z - thing->height - FixedMul(FRACUNIT, tmthing->scale)); else - thing->z = tmthing->z + tmthing->height + FixedMul(FRACUNIT, tmthing->scale); + P_SetOrigin(thing, thing->x, thing->y, tmthing->z + tmthing->height + FixedMul(FRACUNIT, tmthing->scale)); if (thing->flags & MF_SHOOTABLE) - P_DamageMobj(thing, tmthing, tmthing, 1, 0); + P_DamageMobj(thing, tmthing, tmthing, 1, DMG_SPIKE); return true; } @@ -1914,7 +1955,7 @@ static boolean PIT_CheckLine(line_t *ld) cosradius = FixedMul(dist, FINECOSINE(langle>>ANGLETOFINESHIFT)); sinradius = FixedMul(dist, FINESINE(langle>>ANGLETOFINESHIFT)); tmthing->flags |= MF_NOCLIP; - P_TeleportMove(tmthing, result.x + cosradius - tmthing->momx, result.y + sinradius - tmthing->momy, tmthing->z); + P_MoveOrigin(tmthing, result.x + cosradius - tmthing->momx, result.y + sinradius - tmthing->momy, tmthing->z); tmthing->flags &= ~MF_NOCLIP; } #endif @@ -1935,7 +1976,7 @@ static boolean PIT_CheckLine(line_t *ld) blockingline = ld; { - UINT8 shouldCollide = LUAh_MobjLineCollide(tmthing, blockingline); // checks hook for thing's type + UINT8 shouldCollide = LUA_HookMobjLineCollide(tmthing, blockingline); // checks hook for thing's type if (P_MobjWasRemoved(tmthing)) return true; // one of them was removed??? if (shouldCollide == 1) @@ -2029,7 +2070,7 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y) subsector_t *newsubsec; boolean blockval = true; - ps_checkposition_calls++; + ps_checkposition_calls.value.i++; I_Assert(thing != NULL); #ifdef PARANOIA @@ -2073,13 +2114,13 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y) { fixed_t topheight, bottomheight; - if (!(rover->flags & FF_EXISTS)) + if (!(rover->fofflags & FOF_EXISTS)) continue; topheight = P_GetFOFTopZ(thing, newsubsec->sector, rover, x, y, NULL); bottomheight = P_GetFOFBottomZ(thing, newsubsec->sector, rover, x, y, NULL); - if ((rover->flags & (FF_SWIMMABLE|FF_GOOWATER)) == (FF_SWIMMABLE|FF_GOOWATER) && !(thing->flags & MF_NOGRAVITY)) + if ((rover->fofflags & (FOF_SWIMMABLE|FOF_GOOWATER)) == (FOF_SWIMMABLE|FOF_GOOWATER) && !(thing->flags & MF_NOGRAVITY)) { // If you're inside goowater and slowing down fixed_t sinklevel = FixedMul(thing->info->height/6, thing->scale); @@ -2118,16 +2159,16 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y) if (thing->player && (P_CheckSolidLava(rover) || P_CanRunOnWater(thing->player, rover))) ; - else if (thing->type == MT_SKIM && (rover->flags & FF_SWIMMABLE)) + else if (thing->type == MT_SKIM && (rover->fofflags & FOF_SWIMMABLE)) ; - else if (!((rover->flags & FF_BLOCKPLAYER && thing->player) - || (rover->flags & FF_BLOCKOTHERS && !thing->player) - || rover->flags & FF_QUICKSAND)) + else if (!((rover->fofflags & FOF_BLOCKPLAYER && thing->player) + || (rover->fofflags & FOF_BLOCKOTHERS && !thing->player) + || rover->fofflags & FOF_QUICKSAND)) continue; - if (rover->flags & FF_QUICKSAND) + if (rover->fofflags & FOF_QUICKSAND) { - if (thing->z < topheight && bottomheight < thingtop) + if (!(thing->eflags & MFE_VERTICALFLIP) && thing->z < topheight && bottomheight < thingtop) { if (tmfloorz < thing->z) { tmfloorz = thing->z; @@ -2135,6 +2176,14 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y) tmfloorslope = NULL; } } + else if (thing->eflags & MFE_VERTICALFLIP && thing->z < topheight && bottomheight < thingtop) + { + if (tmceilingz > thingtop) { + tmceilingz = thingtop; + tmceilingrover = rover; + tmceilingslope = NULL; + } + } // Quicksand blocks never change heights otherwise. continue; } @@ -2145,15 +2194,15 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y) + ((topheight - bottomheight)/2)); if (topheight > tmfloorz && abs(delta1) < abs(delta2) - && !(rover->flags & FF_REVERSEPLATFORM)) + && !(rover->fofflags & FOF_REVERSEPLATFORM)) { tmfloorz = tmdropoffz = topheight; tmfloorrover = rover; tmfloorslope = *rover->t_slope; } if (bottomheight < tmceilingz && abs(delta1) >= abs(delta2) - && !(rover->flags & FF_PLATFORM) - && !(thing->type == MT_SKIM && (rover->flags & FF_SWIMMABLE))) + && !(rover->fofflags & FOF_PLATFORM) + && !(thing->type == MT_SKIM && (rover->fofflags & FOF_SWIMMABLE))) { tmceilingz = tmdrpoffceilz = bottomheight; tmceilingrover = rover; @@ -2331,7 +2380,7 @@ boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam) mapcampointer = thiscam; - if (GETSECSPECIAL(newsubsec->sector->special, 4) == 12) + if (newsubsec->sector->flags & MSF_NOCLIPCAMERA) { // Camera noclip on entire sector. tmfloorz = tmdropoffz = thiscam->z; tmceilingz = tmdrpoffceilz = thiscam->z + thiscam->height; @@ -2371,7 +2420,7 @@ boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam) for (rover = newsubsec->sector->ffloors; rover; rover = rover->next) { fixed_t topheight, bottomheight; - if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERALL) || GETSECSPECIAL(rover->master->frontsector->special, 4) == 12) + if (!(rover->fofflags & FOF_BLOCKOTHERS) || !(rover->fofflags & FOF_EXISTS) || !(rover->fofflags & FOF_RENDERALL) || (rover->master->frontsector->flags & MSF_NOCLIPCAMERA)) continue; topheight = P_CameraGetFOFTopZ(thiscam, newsubsec->sector, rover, x, y, NULL); @@ -2443,7 +2492,7 @@ boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam) // We're inside it! Yess... polysec = po->lines[0]->backsector; - if (GETSECSPECIAL(polysec->special, 4) == 12) + if (polysec->flags & MSF_NOCLIPCAMERA) { // Camera noclip polyobj. plink = (polymaplink_t *)(plink->link.next); continue; @@ -2666,21 +2715,35 @@ boolean PIT_PushableMoved(mobj_t *thing) return true; } -// -// P_TryMove -// Attempt to move to a new position. -// -boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff) +static boolean +increment_move +( mobj_t * thing, + fixed_t x, + fixed_t y, + boolean allowdropoff) { fixed_t tryx = thing->x; fixed_t tryy = thing->y; fixed_t radius = thing->radius; fixed_t thingtop; - fixed_t startingonground = P_IsObjectOnGround(thing); floatok = false; - if (radius < MAXRADIUS/2) - radius = MAXRADIUS/2; + // This makes sure that there are no freezes from computing extremely small movements. + // Originally was MAXRADIUS/2, but that can cause some bad inconsistencies for small players. + radius = max(radius, thing->scale); + + // And we also have to prevent Big Large (tm) movements, as those can skip too far + // across slopes and cause us to fail step up checks on them when we otherwise shouldn't. + radius = min(radius, 16 * thing->scale); + + // (This whole "step" system is flawed; it was OK before, but the addition of slopes has + // exposed the problems with doing it like this. The right thing to do would be to use + // raycasting for physics to fix colliding in weird order, double-checking collisions, + // randomly colliding with slopes instead of going up them, etc. I don't feel like porting + // that from RR, as its both a huge sweeping change and still incomplete at the time of + // writing. Clamping radius to make our steps more precise will work just fine as long + // as you keep all of your crazy intentions to poke any of the other deep-rooted movement + // code to yourself. -- Sal 6/5/2023) do { if (thing->flags & MF_NOCLIP) { @@ -2711,14 +2774,14 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff) if (thing->player) { - // If using type Section1:13, double the maxstep. - if (P_PlayerTouchingSectorSpecial(thing->player, 1, 13) - || GETSECSPECIAL(R_PointInSubsector(x, y)->sector->special, 1) == 13) + // If using SSF_DOUBLESTEPUP, double the maxstep. + if (P_PlayerTouchingSectorSpecialFlag(thing->player, SSF_DOUBLESTEPUP) + || (R_PointInSubsector(x, y)->sector->specialflags & SSF_DOUBLESTEPUP)) maxstep <<= 1; - // If using type Section1:14, no maxstep. - if (P_PlayerTouchingSectorSpecial(thing->player, 1, 14) - || GETSECSPECIAL(R_PointInSubsector(x, y)->sector->special, 1) == 14) + // If using SSF_NOSTEPDOWN, no maxstep. + if (P_PlayerTouchingSectorSpecialFlag(thing->player, SSF_NOSTEPDOWN) + || (R_PointInSubsector(x, y)->sector->specialflags & SSF_NOSTEPDOWN)) maxstep = 0; // Don't 'step up' while springing, @@ -2727,6 +2790,16 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff) && P_MobjFlip(thing)*thing->momz > FixedMul(FRACUNIT, thing->scale)) maxstep = 0; } + else if (thing->flags & MF_PUSHABLE) + { + // If using SSF_DOUBLESTEPUP, double the maxstep. + if (R_PointInSubsector(x, y)->sector->specialflags & SSF_DOUBLESTEPUP) + maxstep <<= 1; + + // If using SSF_NOSTEPDOWN, no maxstep. + if (R_PointInSubsector(x, y)->sector->specialflags & SSF_NOSTEPDOWN) + maxstep = 0; + } if (thing->type == MT_SKIM) maxstep = 0; @@ -2804,7 +2877,38 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff) } } while (tryx != x || tryy != y); + return true; +} + +// +// P_CheckMove +// Check if a P_TryMove would be successful. +// +boolean P_CheckMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff) +{ + boolean moveok; + mobj_t *hack = P_SpawnMobjFromMobj(thing, 0, 0, 0, MT_RAY); + + hack->radius = thing->radius; + hack->height = thing->height; + + moveok = increment_move(hack, x, y, allowdropoff); + P_RemoveMobj(hack); + + return moveok; +} + +// +// P_TryMove +// Attempt to move to a new position. +// +boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff) +{ + fixed_t startingonground = P_IsObjectOnGround(thing); + // The move is ok! + if (!increment_move(thing, x, y, allowdropoff)) + return false; // If it's a pushable object, check if anything is // standing on top and move it, too. @@ -2983,9 +3087,9 @@ static boolean P_ThingHeightClip(mobj_t *thing) { rover = (thing->eflags & MFE_VERTICALFLIP) ? oldceilingrover : oldfloorrover; - // Match the Thing's old floorz to an FOF and check for FF_EXISTS - // If ~FF_EXISTS, don't set mobj Z. - if (!rover || ((rover->flags & FF_EXISTS) && (rover->flags & FF_SOLID))) + // Match the Thing's old floorz to an FOF and check for FOF_EXISTS + // If ~FOF_EXISTS, don't set mobj Z. + if (!rover || ((rover->fofflags & FOF_EXISTS) && (rover->fofflags & FOF_SOLID))) { hitfloor = bouncing; if (thing->eflags & MFE_VERTICALFLIP) @@ -3060,7 +3164,7 @@ static void P_HitCameraSlideLine(line_t *ld, camera_t *thiscam) } side = P_PointOnLineSide(thiscam->x, thiscam->y, ld); - lineangle = R_PointToAngle2(0, 0, ld->dx, ld->dy); + lineangle = ld->angle; if (side == 1) lineangle += ANGLE_180; @@ -3106,7 +3210,7 @@ static void P_HitSlideLine(line_t *ld) side = P_PointOnLineSide(slidemo->x, slidemo->y, ld); - lineangle = R_PointToAngle2(0, 0, ld->dx, ld->dy); + lineangle = ld->angle; if (side == 1) lineangle += ANGLE_180; @@ -3149,7 +3253,7 @@ static void P_HitBounceLine(line_t *ld) return; } - lineangle = R_PointToAngle2(0, 0, ld->dx, ld->dy); + lineangle = ld->angle; if (lineangle >= ANGLE_180) lineangle -= ANGLE_180; @@ -3246,7 +3350,7 @@ static boolean P_IsClimbingValid(player_t *player, angle_t angle) for (rover = glidesector->ffloors; rover; rover = rover->next) { - if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BLOCKPLAYER)) + if (!(rover->fofflags & FOF_EXISTS) || !(rover->fofflags & FOF_BLOCKPLAYER)) continue; topheight = P_GetFFloorTopZAt (rover, mo->x, mo->y); @@ -3362,7 +3466,7 @@ static void PTR_GlideClimbTraverse(line_t *li) { for (rover = checksector->ffloors; rover; rover = rover->next) { - if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BLOCKPLAYER) || ((rover->flags & FF_BUSTUP) && (slidemo->player->charflags & SF_CANBUSTWALLS))) + if (!(rover->fofflags & FOF_EXISTS) || !(rover->fofflags & FOF_BLOCKPLAYER) || ((rover->fofflags & FOF_BUSTUP) && (slidemo->player->charflags & SF_CANBUSTWALLS))) continue; topheight = P_GetFFloorTopZAt (rover, slidemo->x, slidemo->y); @@ -3431,11 +3535,9 @@ static void PTR_GlideClimbTraverse(line_t *li) if (fofline) whichside = 0; - if (!whichside) - { - slidemo->player->lastsidehit = checkline->sidenum[whichside]; - slidemo->player->lastlinehit = (INT16)(checkline - lines); - } + // Even if you attach to the second side of a linedef, we want to know the last hit. + slidemo->player->lastsidehit = checkline->sidenum[whichside]; + slidemo->player->lastlinehit = (INT16)(checkline - lines); P_Thrust(slidemo, slidemo->angle, FixedMul(5*FRACUNIT, slidemo->scale)); } @@ -3457,7 +3559,7 @@ static boolean PTR_SlideTraverse(intercept_t *in) // see if it is closer than best so far if (li->polyobj && slidemo->player) { - if ((li->polyobj->lines[0]->backsector->flags & SF_TRIGGERSPECIAL_TOUCH) && !(li->polyobj->flags & POF_NOSPECIALS)) + if ((li->polyobj->lines[0]->backsector->flags & MSF_TRIGGERSPECIAL_TOUCH) && !(li->polyobj->flags & POF_NOSPECIALS)) P_ProcessSpecialSector(slidemo->player, slidemo->subsector->sector, li->polyobj->lines[0]->backsector); } @@ -3590,16 +3692,13 @@ static void P_CheckLavaWall(mobj_t *mo, sector_t *sec) for (rover = sec->ffloors; rover; rover = rover->next) { - if (!(rover->flags & FF_EXISTS)) + if (!(rover->fofflags & FOF_EXISTS)) continue; - if (!(rover->flags & FF_SWIMMABLE)) + if (!(rover->fofflags & FOF_SWIMMABLE)) continue; - if (GETSECSPECIAL(rover->master->frontsector->special, 1) != 3) - continue; - - if (rover->master->flags & ML_BLOCKMONSTERS) + if (rover->master->frontsector->damagetype != SD_LAVA) continue; topheight = P_GetFFloorTopZAt(rover, mo->x, mo->y); @@ -4157,13 +4256,11 @@ void P_RadiusAttack(mobj_t *spot, mobj_t *source, fixed_t damagedist, UINT8 dama // the way it was and call P_CheckSector (? was P_ChangeSector - Graue) again // to undo the changes. // -static boolean crushchange; -static boolean nofit; // // PIT_ChangeSector // -static boolean PIT_ChangeSector(mobj_t *thing, boolean realcrush) +static boolean PIT_ChangeSector(mobj_t *thing, boolean realcrush, boolean crunch) { mobj_t *killer = NULL; //If a thing is both pushable and vulnerable, it doesn't block the crusher because it gets killed. @@ -4187,11 +4284,7 @@ static boolean PIT_ChangeSector(mobj_t *thing, boolean realcrush) if (thing->z + thing->height > thing->ceilingz && thing->z <= thing->ceilingz) { if (immunepushable && thing->z + thing->height > thing->subsector->sector->ceilingheight) - { - //Thing is a pushable and blocks the moving ceiling - nofit = true; - return false; - } + return false; //Thing is a pushable and blocks the moving ceiling //Check FOFs in the sector if (thing->subsector->sector->ffloors && (realcrush || immunepushable)) @@ -4203,47 +4296,54 @@ static boolean PIT_ChangeSector(mobj_t *thing, boolean realcrush) for (rover = thing->subsector->sector->ffloors; rover; rover = rover->next) { - if (!(((rover->flags & FF_BLOCKPLAYER) && thing->player) - || ((rover->flags & FF_BLOCKOTHERS) && !thing->player)) || !(rover->flags & FF_EXISTS)) + thinker_t *think; + + if (!(rover->fofflags & FOF_EXISTS)) + continue; + if (thing->player && !(rover->fofflags & FOF_BLOCKPLAYER)) + continue; + if (!thing->player && !(rover->fofflags & FOF_BLOCKOTHERS)) continue; topheight = *rover->topheight; bottomheight = *rover->bottomheight; - //topheight = P_GetFFloorTopZAt (rover, thing->x, thing->y); - //bottomheight = P_GetFFloorBottomZAt(rover, thing->x, thing->y); + + if (bottomheight > thing->ceilingz) + continue; delta1 = thing->z - (bottomheight + topheight)/2; delta2 = thingtop - (bottomheight + topheight)/2; - if (bottomheight <= thing->ceilingz && abs(delta1) >= abs(delta2)) + if (abs(delta1) < abs(delta2)) + continue; + + if (immunepushable) + return false; //FOF is blocked by pushable + + if (!realcrush) + continue; + + //If the thing was crushed by a crumbling FOF, reward the player who made it crumble! + for (think = thlist[THINK_MAIN].next; think != &thlist[THINK_MAIN]; think = think->next) { - if (immunepushable) - { - //FOF is blocked by pushable - nofit = true; - return false; - } - else - { - //If the thing was crushed by a crumbling FOF, reward the player who made it crumble! - thinker_t *think; - crumble_t *crumbler; + crumble_t *crumbler; - for (think = thlist[THINK_MAIN].next; think != &thlist[THINK_MAIN]; think = think->next) - { - if (think->function.acp1 != (actionf_p1)T_StartCrumble) - continue; + if (think->function.acp1 != (actionf_p1)T_StartCrumble) + continue; - crumbler = (crumble_t *)think; + crumbler = (crumble_t *)think; - if (crumbler->player && crumbler->player->mo - && crumbler->player->mo != thing - && crumbler->actionsector == thing->subsector->sector - && crumbler->sector == rover->master->frontsector) - { - killer = crumbler->player->mo; - } - } - } + if (!crumbler->player) + continue; + if (!crumbler->player->mo) + continue; + if (crumbler->player->mo == thing) + continue; + if (crumbler->actionsector != thing->subsector->sector) + continue; + if (crumbler->sector != rover->master->frontsector) + continue; + + killer = crumbler->player->mo; } } } @@ -4259,24 +4359,139 @@ static boolean PIT_ChangeSector(mobj_t *thing, boolean realcrush) } } - if (realcrush && crushchange) + if (realcrush && crunch) P_DamageMobj(thing, NULL, NULL, 1, 0); // keep checking (crush other things) return true; } +static boolean P_CheckSectorPolyObjects(sector_t *sector, boolean realcrush, boolean crunch) +{ + size_t i; + + // Sal: This stupid function chain is required to fix polyobjects not being able to crush. + // Monster Iestyn: don't use P_CheckSector actually just look for objects in the blockmap instead + validcount++; + + for (i = 0; i < sector->linecount; i++) + { + INT32 x, y; + polyobj_t *po = sector->lines[i]->polyobj; + + if (!po) + continue; + if (po->validcount == validcount) + continue; // skip if already checked + if (!(po->flags & POF_SOLID)) + continue; + if (po->lines[0]->backsector != sector) // Make sure you're currently checking the control sector + continue; + + po->validcount = validcount; + + for (y = po->blockbox[BOXBOTTOM]; y <= po->blockbox[BOXTOP]; ++y) + { + for (x = po->blockbox[BOXLEFT]; x <= po->blockbox[BOXRIGHT]; ++x) + { + mobj_t *mo; + + if (x < 0 || y < 0 || x >= bmapwidth || y >= bmapheight) + continue; + + mo = blocklinks[y * bmapwidth + x]; + + for (; mo; mo = mo->bnext) + { + // Monster Iestyn: do we need to check if a mobj has already been checked? ...probably not I suspect + + if (!P_MobjInsidePolyobj(po, mo)) + continue; + + if (!PIT_ChangeSector(mo, realcrush, crunch) && !realcrush) + return false; + } + } + } + } + + return true; +} + +static boolean P_CheckTouchingThinglist(sector_t *sector, boolean realcrush, boolean crunch) +{ + msecnode_t *n; + + for (n = sector->touching_thinglist; n; n = n->m_thinglist_next) + n->visited = false; + + do + { + for (n = sector->touching_thinglist; n; n = n->m_thinglist_next) // go through list + { + if (n->visited) + continue; + + n->visited = true; // mark thing as processed + + if (n->m_thing->flags & MF_NOBLOCKMAP) //jff 4/7/98 don't do these + continue; + + if (!PIT_ChangeSector(n->m_thing, realcrush, crunch) && !realcrush) // process it + return false; + + break; // exit and start over + } + } while (n); // repeat from scratch until all things left are marked valid + + return true; +} + +static boolean P_CheckSectorFFloors(sector_t *sector, boolean realcrush, boolean crunch) +{ + sector_t *sec; + size_t i; + + if (!sector->numattached) + return true; + + for (i = 0; i < sector->numattached; i++) + { + sec = §ors[sector->attached[i]]; + + sec->moved = true; + + P_RecalcPrecipInSector(sec); + + if (!sector->attachedsolid[i]) + continue; + + if (!P_CheckTouchingThinglist(sec, realcrush, crunch)) + return false; + } + + return true; +} + +static boolean P_CheckSectorHelper(sector_t *sector, boolean realcrush, boolean crunch) +{ + if (!P_CheckSectorPolyObjects(sector, realcrush, crunch)) + return false; + + if (!P_CheckSectorFFloors(sector, realcrush, crunch)) + return false; + + // Mark all things invalid + sector->moved = true; + + return P_CheckTouchingThinglist(sector, realcrush, crunch); +} + // // P_CheckSector // boolean P_CheckSector(sector_t *sector, boolean crunch) { - msecnode_t *n; - size_t i; - - nofit = false; - crushchange = crunch; - // killough 4/4/98: scan list front-to-back until empty or exhausted, // restarting from beginning after each thing is processed. Avoids // crashes, and is sure to examine all things in the sector, and only @@ -4285,218 +4500,14 @@ boolean P_CheckSector(sector_t *sector, boolean crunch) // // killough 4/7/98: simplified to avoid using complicated counter - // First, let's see if anything will keep it from crushing. - - // Sal: This stupid function chain is required to fix polyobjects not being able to crush. - // Monster Iestyn: don't use P_CheckSector actually just look for objects in the blockmap instead - validcount++; - - for (i = 0; i < sector->linecount; i++) - { - if (sector->lines[i]->polyobj) - { - polyobj_t *po = sector->lines[i]->polyobj; - if (po->validcount == validcount) - continue; // skip if already checked - if (!(po->flags & POF_SOLID)) - continue; - if (po->lines[0]->backsector == sector) // Make sure you're currently checking the control sector - { - INT32 x, y; - po->validcount = validcount; - - for (y = po->blockbox[BOXBOTTOM]; y <= po->blockbox[BOXTOP]; ++y) - { - for (x = po->blockbox[BOXLEFT]; x <= po->blockbox[BOXRIGHT]; ++x) - { - mobj_t *mo; - - if (x < 0 || y < 0 || x >= bmapwidth || y >= bmapheight) - continue; - - mo = blocklinks[y * bmapwidth + x]; - - for (; mo; mo = mo->bnext) - { - // Monster Iestyn: do we need to check if a mobj has already been checked? ...probably not I suspect - - if (!P_MobjInsidePolyobj(po, mo)) - continue; - - if (!PIT_ChangeSector(mo, false)) - { - nofit = true; - return nofit; - } - } - } - } - } - } - } - - if (sector->numattached) - { - sector_t *sec; - for (i = 0; i < sector->numattached; i++) - { - sec = §ors[sector->attached[i]]; - for (n = sec->touching_thinglist; n; n = n->m_thinglist_next) - n->visited = false; - - sec->moved = true; - - P_RecalcPrecipInSector(sec); - - if (!sector->attachedsolid[i]) - continue; - - do - { - for (n = sec->touching_thinglist; n; n = n->m_thinglist_next) - if (!n->visited) - { - n->visited = true; - if (!(n->m_thing->flags & MF_NOBLOCKMAP)) - { - if (!PIT_ChangeSector(n->m_thing, false)) - { - nofit = true; - return nofit; - } - } - break; - } - } while (n); - } - } - - // Mark all things invalid - sector->moved = true; - - for (n = sector->touching_thinglist; n; n = n->m_thinglist_next) - n->visited = false; - - do - { - for (n = sector->touching_thinglist; n; n = n->m_thinglist_next) // go through list - if (!n->visited) // unprocessed thing found - { - n->visited = true; // mark thing as processed - if (!(n->m_thing->flags & MF_NOBLOCKMAP)) //jff 4/7/98 don't do these - { - if (!PIT_ChangeSector(n->m_thing, false)) // process it - { - nofit = true; - return nofit; - } - } - break; // exit and start over - } - } while (n); // repeat from scratch until all things left are marked valid + if (!P_CheckSectorHelper(sector, false, crunch)) + return true; // Nothing blocked us, so lets crush for real! + P_CheckSectorHelper(sector, true, crunch); - // Sal: This stupid function chain is required to fix polyobjects not being able to crush. - // Monster Iestyn: don't use P_CheckSector actually just look for objects in the blockmap instead - validcount++; - - for (i = 0; i < sector->linecount; i++) - { - if (sector->lines[i]->polyobj) - { - polyobj_t *po = sector->lines[i]->polyobj; - if (po->validcount == validcount) - continue; // skip if already checked - if (!(po->flags & POF_SOLID)) - continue; - if (po->lines[0]->backsector == sector) // Make sure you're currently checking the control sector - { - INT32 x, y; - po->validcount = validcount; - - for (y = po->blockbox[BOXBOTTOM]; y <= po->blockbox[BOXTOP]; ++y) - { - for (x = po->blockbox[BOXLEFT]; x <= po->blockbox[BOXRIGHT]; ++x) - { - mobj_t *mo; - - if (x < 0 || y < 0 || x >= bmapwidth || y >= bmapheight) - continue; - - mo = blocklinks[y * bmapwidth + x]; - - for (; mo; mo = mo->bnext) - { - // Monster Iestyn: do we need to check if a mobj has already been checked? ...probably not I suspect - - if (!P_MobjInsidePolyobj(po, mo)) - continue; - - PIT_ChangeSector(mo, true); - return nofit; - } - } - } - } - } - } - if (sector->numattached) - { - sector_t *sec; - for (i = 0; i < sector->numattached; i++) - { - sec = §ors[sector->attached[i]]; - for (n = sec->touching_thinglist; n; n = n->m_thinglist_next) - n->visited = false; - - sec->moved = true; - - P_RecalcPrecipInSector(sec); - - if (!sector->attachedsolid[i]) - continue; - - do - { - for (n = sec->touching_thinglist; n; n = n->m_thinglist_next) - if (!n->visited) - { - n->visited = true; - if (!(n->m_thing->flags & MF_NOBLOCKMAP)) - { - PIT_ChangeSector(n->m_thing, true); - return nofit; - } - break; - } - } while (n); - } - } - - // Mark all things invalid - sector->moved = true; - - for (n = sector->touching_thinglist; n; n = n->m_thinglist_next) - n->visited = false; - - do - { - for (n = sector->touching_thinglist; n; n = n->m_thinglist_next) // go through list - if (!n->visited) // unprocessed thing found - { - n->visited = true; // mark thing as processed - if (!(n->m_thing->flags & MF_NOBLOCKMAP)) //jff 4/7/98 don't do these - { - PIT_ChangeSector(n->m_thing, true); // process it - return nofit; - } - break; // exit and start over - } - } while (n); // repeat from scratch until all things left are marked valid - - return nofit; + return false; } /* @@ -4998,16 +5009,16 @@ fixed_t P_FloorzAtPos(fixed_t x, fixed_t y, fixed_t z, fixed_t height) for (rover = sec->ffloors; rover; rover = rover->next) { fixed_t topheight, bottomheight; - if (!(rover->flags & FF_EXISTS)) + if (!(rover->fofflags & FOF_EXISTS)) continue; - if ((!(rover->flags & FF_SOLID || rover->flags & FF_QUICKSAND) || (rover->flags & FF_SWIMMABLE))) + if ((!(rover->fofflags & FOF_SOLID || rover->fofflags & FOF_QUICKSAND) || (rover->fofflags & FOF_SWIMMABLE))) continue; topheight = P_GetFFloorTopZAt (rover, x, y); bottomheight = P_GetFFloorBottomZAt(rover, x, y); - if (rover->flags & FF_QUICKSAND) + if (rover->fofflags & FOF_QUICKSAND) { if (z < topheight && bottomheight < thingtop) { @@ -5042,21 +5053,21 @@ fixed_t P_CeilingzAtPos(fixed_t x, fixed_t y, fixed_t z, fixed_t height) for (rover = sec->ffloors; rover; rover = rover->next) { fixed_t topheight, bottomheight; - if (!(rover->flags & FF_EXISTS)) + if (!(rover->fofflags & FOF_EXISTS)) continue; - if ((!(rover->flags & FF_SOLID || rover->flags & FF_QUICKSAND) || (rover->flags & FF_SWIMMABLE))) + if ((!(rover->fofflags & FOF_SOLID || rover->fofflags & FOF_QUICKSAND) || (rover->fofflags & FOF_SWIMMABLE))) continue; topheight = P_GetFFloorTopZAt (rover, x, y); bottomheight = P_GetFFloorBottomZAt(rover, x, y); - if (rover->flags & FF_QUICKSAND) + if (rover->fofflags & FOF_QUICKSAND) { if (thingtop > bottomheight && topheight > z) { - if (ceilingz > z) - ceilingz = z; + if (ceilingz > thingtop) + ceilingz = thingtop; } continue; } diff --git a/src/p_maputl.c b/src/p_maputl.c index efcebe736..b6a320730 100644 --- a/src/p_maputl.c +++ b/src/p_maputl.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -374,7 +374,7 @@ void P_CameraLineOpening(line_t *linedef) for (rover = front->ffloors; rover; rover = rover->next) { fixed_t topheight, bottomheight; - if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_RENDERALL) || !(rover->flags & FF_EXISTS) || GETSECSPECIAL(rover->master->frontsector->special, 4) == 12) + if (!(rover->fofflags & FOF_BLOCKOTHERS) || !(rover->fofflags & FOF_RENDERALL) || !(rover->fofflags & FOF_EXISTS) || (rover->master->frontsector->flags & MSF_NOCLIPCAMERA)) continue; topheight = P_CameraGetFOFTopZ(mapcampointer, front, rover, tmx, tmy, linedef); @@ -398,7 +398,7 @@ void P_CameraLineOpening(line_t *linedef) for (rover = back->ffloors; rover; rover = rover->next) { fixed_t topheight, bottomheight; - if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_RENDERALL) || !(rover->flags & FF_EXISTS) || GETSECSPECIAL(rover->master->frontsector->special, 4) == 12) + if (!(rover->fofflags & FOF_BLOCKOTHERS) || !(rover->fofflags & FOF_RENDERALL) || !(rover->fofflags & FOF_EXISTS) || (rover->master->frontsector->flags & MSF_NOCLIPCAMERA)) continue; topheight = P_CameraGetFOFTopZ(mapcampointer, back, rover, tmx, tmy, linedef); @@ -491,7 +491,7 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj) fixed_t thingtop = mobj->z + mobj->height; // Check for collision with front side's midtexture if Effect 4 is set - if (linedef->flags & ML_EFFECT4 + if (linedef->flags & ML_MIDSOLID && !linedef->polyobj // don't do anything for polyobjects! ...for now ) { side_t *side = &sides[linedef->sidenum[0]]; @@ -508,10 +508,10 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj) // don't remove this code unless solid midtextures // on non-solid polyobjects should NEVER happen in the future if (linedef->polyobj && (linedef->polyobj->flags & POF_TESTHEIGHT)) { - if (linedef->flags & ML_EFFECT5 && !side->repeatcnt) { // "infinite" repeat + if (linedef->flags & ML_WRAPMIDTEX && !side->repeatcnt) { // "infinite" repeat texbottom = back->floorheight + side->rowoffset; textop = back->ceilingheight + side->rowoffset; - } else if (!!(linedef->flags & ML_DONTPEGBOTTOM) ^ !!(linedef->flags & ML_EFFECT3)) { + } else if (linedef->flags & ML_MIDTEX) { texbottom = back->floorheight + side->rowoffset; textop = texbottom + texheight*(side->repeatcnt+1); } else { @@ -521,10 +521,10 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj) } else #endif { - if (linedef->flags & ML_EFFECT5 && !side->repeatcnt) { // "infinite" repeat + if (linedef->flags & ML_WRAPMIDTEX && !side->repeatcnt) { // "infinite" repeat texbottom = openbottom + side->rowoffset; textop = opentop + side->rowoffset; - } else if (!!(linedef->flags & ML_DONTPEGBOTTOM) ^ !!(linedef->flags & ML_EFFECT3)) { + } else if (linedef->flags & ML_MIDPEG) { texbottom = openbottom + side->rowoffset; textop = texbottom + texheight*(side->repeatcnt+1); } else { @@ -594,13 +594,13 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj) for (rover = front->ffloors; rover; rover = rover->next) { fixed_t topheight, bottomheight; - if (!(rover->flags & FF_EXISTS)) + if (!(rover->fofflags & FOF_EXISTS)) continue; if (mobj->player && (P_CheckSolidLava(rover) || P_CanRunOnWater(mobj->player, rover))) ; - else if (!((rover->flags & FF_BLOCKPLAYER && mobj->player) - || (rover->flags & FF_BLOCKOTHERS && !mobj->player))) + else if (!((rover->fofflags & FOF_BLOCKPLAYER && mobj->player) + || (rover->fofflags & FOF_BLOCKOTHERS && !mobj->player))) continue; topheight = P_GetFOFTopZ(mobj, front, rover, tmx, tmy, linedef); @@ -609,7 +609,7 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj) delta1 = abs(mobj->z - (bottomheight + ((topheight - bottomheight)/2))); delta2 = abs(thingtop - (bottomheight + ((topheight - bottomheight)/2))); - if (delta1 >= delta2 && (rover->flags & FF_INTANGIBLEFLATS) != FF_PLATFORM) // thing is below FOF + if (delta1 >= delta2 && (rover->fofflags & FOF_INTANGIBLEFLATS) != FOF_PLATFORM) // thing is below FOF { if (bottomheight < opentop) { opentop = bottomheight; @@ -620,7 +620,7 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj) highceiling = bottomheight; } - if (delta1 < delta2 && (rover->flags & FF_INTANGIBLEFLATS) != FF_REVERSEPLATFORM) // thing is above FOF + if (delta1 < delta2 && (rover->fofflags & FOF_INTANGIBLEFLATS) != FOF_REVERSEPLATFORM) // thing is above FOF { if (topheight > openbottom) { openbottom = topheight; @@ -636,13 +636,13 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj) for (rover = back->ffloors; rover; rover = rover->next) { fixed_t topheight, bottomheight; - if (!(rover->flags & FF_EXISTS)) + if (!(rover->fofflags & FOF_EXISTS)) continue; if (mobj->player && (P_CheckSolidLava(rover) || P_CanRunOnWater(mobj->player, rover))) ; - else if (!((rover->flags & FF_BLOCKPLAYER && mobj->player) - || (rover->flags & FF_BLOCKOTHERS && !mobj->player))) + else if (!((rover->fofflags & FOF_BLOCKPLAYER && mobj->player) + || (rover->fofflags & FOF_BLOCKOTHERS && !mobj->player))) continue; topheight = P_GetFOFTopZ(mobj, back, rover, tmx, tmy, linedef); @@ -651,7 +651,7 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj) delta1 = abs(mobj->z - (bottomheight + ((topheight - bottomheight)/2))); delta2 = abs(thingtop - (bottomheight + ((topheight - bottomheight)/2))); - if (delta1 >= delta2 && (rover->flags & FF_INTANGIBLEFLATS) != FF_PLATFORM) // thing is below FOF + if (delta1 >= delta2 && (rover->fofflags & FOF_INTANGIBLEFLATS) != FOF_PLATFORM) // thing is below FOF { if (bottomheight < opentop) { opentop = bottomheight; @@ -662,7 +662,7 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj) highceiling = bottomheight; } - if (delta1 < delta2 && (rover->flags & FF_INTANGIBLEFLATS) != FF_REVERSEPLATFORM) // thing is above FOF + if (delta1 < delta2 && (rover->fofflags & FOF_INTANGIBLEFLATS) != FOF_REVERSEPLATFORM) // thing is above FOF { if (topheight > openbottom) { openbottom = topheight; diff --git a/src/p_maputl.h b/src/p_maputl.h index cec344d03..08de0cb0b 100644 --- a/src/p_maputl.h +++ b/src/p_maputl.h @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/p_mobj.c b/src/p_mobj.c index 91e091090..3eab29c09 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -11,6 +11,7 @@ /// \file p_mobj.c /// \brief Moving object handling. Spawn functions +#include "dehacked.h" #include "doomdef.h" #include "g_game.h" #include "g_input.h" @@ -18,6 +19,7 @@ #include "hu_stuff.h" #include "p_local.h" #include "p_setup.h" +#include "r_fps.h" #include "r_main.h" #include "r_skins.h" #include "r_sky.h" @@ -78,7 +80,7 @@ void P_AddCachedAction(mobj_t *mobj, INT32 statenum) // // P_SetupStateAnimation // -FUNCINLINE static ATTRINLINE void P_SetupStateAnimation(mobj_t *mobj, state_t *st) +static void P_SetupStateAnimation(mobj_t *mobj, state_t *st) { INT32 animlength = (mobj->sprite == SPR_PLAY && mobj->skin) ? (INT32)(((skin_t *)mobj->skin)->sprites[mobj->sprite2].numframes) - 1 @@ -325,9 +327,7 @@ boolean P_SetPlayerMobjState(mobj_t *mobj, statenum_t state) mobj->tics = st->tics; // Adjust the player's animation speed to match their velocity. - if (state == S_PLAY_STND && player->powers[pw_super] && skins[player->skin].sprites[SPR2_WAIT|FF_SPR2SUPER].numframes == 0) // if no super wait, don't wait at all - mobj->tics = -1; - else if (player->panim == PA_EDGE && (player->charflags & SF_FASTEDGE)) + if (player->panim == PA_EDGE && (player->charflags & SF_FASTEDGE)) mobj->tics = 2; else if (!(disableSpeedAdjust || player->charflags & SF_NOSPEEDADJUST)) { @@ -396,8 +396,28 @@ boolean P_SetPlayerMobjState(mobj_t *mobj, statenum_t state) if (skin) { - spr2 = P_GetSkinSprite2(skin, (((player->powers[pw_super] && !(player->charflags & SF_NOSUPERSPRITES)) ? FF_SPR2SUPER : 0)|st->frame) & FF_FRAMEMASK, mobj->player); + UINT16 stateframe = st->frame; + + // Add/Remove FF_SPR2SUPER based on certain conditions + if (player->charflags & SF_NOSUPERSPRITES) + stateframe = stateframe & ~FF_SPR2SUPER; + else if (player->powers[pw_super]) + stateframe = stateframe | FF_SPR2SUPER; + + if (stateframe & FF_SPR2SUPER) + { + if (mobj->eflags & MFE_FORCENOSUPER) + stateframe = stateframe & ~FF_SPR2SUPER; + } + else if (mobj->eflags & MFE_FORCESUPER) + stateframe = stateframe | FF_SPR2SUPER; + + // Get the sprite2 and frame number + spr2 = P_GetSkinSprite2(skin, (stateframe & FF_FRAMEMASK), mobj->player); numframes = skin->sprites[spr2].numframes; + + if (state == S_PLAY_STND && (spr2 & FF_SPR2SUPER) && skin->sprites[SPR2_WAIT|FF_SPR2SUPER].numframes == 0) + mobj->tics = -1; // If no super wait, don't wait at all } else { @@ -522,8 +542,23 @@ boolean P_SetMobjState(mobj_t *mobj, statenum_t state) if (skin) { - spr2 = P_GetSkinSprite2(skin, st->frame & FF_FRAMEMASK, mobj->player); + UINT16 stateframe = st->frame; + + // Add/Remove FF_SPR2SUPER based on certain conditions + if (stateframe & FF_SPR2SUPER) + { + if (mobj->eflags & MFE_FORCENOSUPER) + stateframe = stateframe & ~FF_SPR2SUPER; + } + else if (mobj->eflags & MFE_FORCESUPER) + stateframe = stateframe | FF_SPR2SUPER; + + // Get the sprite2 and frame number + spr2 = P_GetSkinSprite2(skin, (stateframe & FF_FRAMEMASK), NULL); numframes = skin->sprites[spr2].numframes; + + if (state == S_PLAY_STND && (spr2 & FF_SPR2SUPER) && skin->sprites[SPR2_WAIT|FF_SPR2SUPER].numframes == 0) + mobj->tics = -1; // If no super wait, don't wait at all } else { @@ -921,11 +956,11 @@ void P_ExplodeMissile(mobj_t *mo) boolean P_InsideANonSolidFFloor(mobj_t *mobj, ffloor_t *rover) { fixed_t topheight, bottomheight; - if (!(rover->flags & FF_EXISTS)) + if (!(rover->fofflags & FOF_EXISTS)) return false; - if ((((rover->flags & FF_BLOCKPLAYER) && mobj->player) - || ((rover->flags & FF_BLOCKOTHERS) && !mobj->player))) + if ((((rover->fofflags & FOF_BLOCKPLAYER) && mobj->player) + || ((rover->fofflags & FOF_BLOCKOTHERS) && !mobj->player))) return false; topheight = P_GetFFloorTopZAt (rover, mobj->x, mobj->y); @@ -1397,7 +1432,7 @@ static void P_PlayerFlip(mobj_t *mo) fixed_t P_GetMobjGravity(mobj_t *mo) { fixed_t gravityadd = 0; - boolean no3dfloorgrav = true; // Custom gravity + sector_t *gravsector = NULL; // Custom gravity boolean goopgravity = false; boolean wasflip; @@ -1405,9 +1440,7 @@ fixed_t P_GetMobjGravity(mobj_t *mo) I_Assert(!P_MobjWasRemoved(mo)); wasflip = (mo->eflags & MFE_VERTICALFLIP) != 0; - - if (mo->type != MT_SPINFIRE) - mo->eflags &= ~MFE_VERTICALFLIP; + mo->eflags &= ~MFE_VERTICALFLIP; if (mo->subsector->sector->ffloors) // Check for 3D floor gravity too. { @@ -1415,36 +1448,30 @@ fixed_t P_GetMobjGravity(mobj_t *mo) for (rover = mo->subsector->sector->ffloors; rover; rover = rover->next) { - if (!(rover->flags & FF_EXISTS) || !P_InsideANonSolidFFloor(mo, rover)) // P_InsideANonSolidFFloor checks for FF_EXISTS itself, but let's not always call this function + if (!(rover->fofflags & FOF_EXISTS) || !P_InsideANonSolidFFloor(mo, rover)) // P_InsideANonSolidFFloor checks for FOF_EXISTS itself, but let's not always call this function continue; - if ((rover->flags & (FF_SWIMMABLE|FF_GOOWATER)) == (FF_SWIMMABLE|FF_GOOWATER)) + if ((rover->fofflags & (FOF_SWIMMABLE|FOF_GOOWATER)) == (FOF_SWIMMABLE|FOF_GOOWATER)) goopgravity = true; - if (!(rover->master->frontsector->gravity)) + if (P_GetSectorGravityFactor(rover->master->frontsector) == FRACUNIT) continue; - gravityadd = -FixedMul(gravity, - (FixedDiv(*rover->master->frontsector->gravity>>FRACBITS, 1000))); - - if (rover->master->frontsector->verticalflip && gravityadd > 0) - mo->eflags |= MFE_VERTICALFLIP; - - no3dfloorgrav = false; + gravsector = rover->master->frontsector; break; } } - if (no3dfloorgrav) - { - if (mo->subsector->sector->gravity) - gravityadd = -FixedMul(gravity, - (FixedDiv(*mo->subsector->sector->gravity>>FRACBITS, 1000))); - else - gravityadd = -gravity; + if (!gravsector) // If there is no 3D floor gravity, check sector's gravity + gravsector = mo->subsector->sector; - if (mo->subsector->sector->verticalflip && gravityadd > 0) - mo->eflags |= MFE_VERTICALFLIP; + gravityadd = -FixedMul(gravity, P_GetSectorGravityFactor(gravsector)); + + if ((gravsector->flags & MSF_GRAVITYFLIP) && gravityadd > 0) + { + if (gravsector->specialflags & SSF_GRAVITYOVERRIDE) + mo->flags2 &= ~MF2_OBJECTFLIP; + mo->eflags |= MFE_VERTICALFLIP; } // Less gravity underwater. @@ -1482,36 +1509,6 @@ fixed_t P_GetMobjGravity(mobj_t *mo) { switch (mo->type) { - case MT_FLINGRING: - case MT_FLINGCOIN: - case MT_FLINGBLUESPHERE: - case MT_FLINGNIGHTSCHIP: - case MT_FLINGEMERALD: - case MT_BOUNCERING: - case MT_RAILRING: - case MT_INFINITYRING: - case MT_AUTOMATICRING: - case MT_EXPLOSIONRING: - case MT_SCATTERRING: - case MT_GRENADERING: - case MT_BOUNCEPICKUP: - case MT_RAILPICKUP: - case MT_AUTOPICKUP: - case MT_EXPLODEPICKUP: - case MT_SCATTERPICKUP: - case MT_GRENADEPICKUP: - case MT_REDFLAG: - case MT_BLUEFLAG: - if (mo->target) - { - // Flung items copy the gravity of their tosser. - if ((mo->target->eflags & MFE_VERTICALFLIP) && !(mo->eflags & MFE_VERTICALFLIP)) - { - gravityadd = -gravityadd; - mo->eflags |= MFE_VERTICALFLIP; - } - } - break; case MT_WATERDROP: case MT_CYBRAKDEMON: gravityadd >>= 1; @@ -1682,14 +1679,13 @@ static void P_PushableCheckBustables(mobj_t *mo) for (rover = node->m_sector->ffloors; rover; rover = rover->next) { - if (!(rover->flags & FF_EXISTS)) + if (!(rover->fofflags & FOF_EXISTS)) continue; - if (!(rover->flags & FF_BUSTUP)) + if (!(rover->fofflags & FOF_BUSTUP)) continue; - // Needs ML_EFFECT4 flag for pushables to break it - if (!(rover->master->flags & ML_EFFECT4)) + if (!(rover->bustflags & FB_PUSHABLES)) continue; if (rover->master->frontsector->crumblestate != CRUMBLE_NONE) @@ -1699,7 +1695,7 @@ static void P_PushableCheckBustables(mobj_t *mo) bottomheight = P_GetFOFBottomZ(mo, node->m_sector, rover, mo->x, mo->y, NULL); // Height checks - if (rover->flags & FF_SHATTERBOTTOM) + if (rover->bustflags & FB_ONLYBOTTOM) { if (mo->z + mo->momz + mo->height < bottomheight) continue; @@ -1707,36 +1703,42 @@ static void P_PushableCheckBustables(mobj_t *mo) if (mo->z + mo->height > bottomheight) continue; } - else if (rover->flags & FF_SPINBUST) - { - if (mo->z + mo->momz > topheight) - continue; - - if (mo->z + mo->height < bottomheight) - continue; - } - else if (rover->flags & FF_SHATTER) - { - if (mo->z + mo->momz > topheight) - continue; - - if (mo->z + mo->momz + mo->height < bottomheight) - continue; - } else { - if (mo->z >= topheight) - continue; + switch (rover->busttype) + { + case BT_TOUCH: + if (mo->z + mo->momz > topheight) + continue; - if (mo->z + mo->height < bottomheight) - continue; + if (mo->z + mo->momz + mo->height < bottomheight) + continue; + + break; + case BT_SPINBUST: + if (mo->z + mo->momz > topheight) + continue; + + if (mo->z + mo->height < bottomheight) + continue; + + break; + default: + if (mo->z >= topheight) + continue; + + if (mo->z + mo->height < bottomheight) + continue; + + break; + } } EV_CrumbleChain(NULL, rover); // node->m_sector // Run a linedef executor?? - if (rover->master->flags & ML_EFFECT5) - P_LinedefExecute((INT16)(P_AproxDistance(rover->master->dx, rover->master->dy)>>FRACBITS), mo, node->m_sector); + if (rover->bustflags & FB_EXECUTOR) + P_LinedefExecute(rover->busttag, mo, node->m_sector); goto bustupdone; } @@ -1839,12 +1841,10 @@ void P_XYMovement(mobj_t *mo) // blocked move moved = false; - if (player) { - if (player->bot) - B_MoveBlocked(player); - } + if (player) + B_MoveBlocked(player); - if (LUAh_MobjMoveBlocked(mo)) + if (LUA_HookMobjMoveBlocked(mo, tmhitthing, blockingline)) { if (P_MobjWasRemoved(mo)) return; @@ -2133,7 +2133,7 @@ void P_AdjustMobjFloorZ_FFloors(mobj_t *mo, sector_t *sector, UINT8 motype) for (rover = sector->ffloors; rover; rover = rover->next) { - if (!(rover->flags & FF_EXISTS)) + if (!(rover->fofflags & FOF_EXISTS)) continue; topheight = P_GetFOFTopZ(mo, sector, rover, mo->x, mo->y, NULL); @@ -2141,31 +2141,36 @@ void P_AdjustMobjFloorZ_FFloors(mobj_t *mo, sector_t *sector, UINT8 motype) if (mo->player && (P_CheckSolidLava(rover) || P_CanRunOnWater(mo->player, rover))) // only the player should stand on lava or run on water ; - else if (motype != 0 && rover->flags & FF_SWIMMABLE) // "scenery" only + else if (motype != 0 && rover->fofflags & FOF_SWIMMABLE) // "scenery" only continue; - else if (rover->flags & FF_QUICKSAND) // quicksand + else if (rover->fofflags & FOF_QUICKSAND) // quicksand ; else if (!( // if it's not either of the following... - (rover->flags & (FF_BLOCKPLAYER|FF_MARIO) && mo->player) // ...solid to players? (mario blocks are always solid from beneath to players) - || (rover->flags & FF_BLOCKOTHERS && !mo->player) // ...solid to others? + (rover->fofflags & (FOF_BLOCKPLAYER|FOF_MARIO) && mo->player) // ...solid to players? (mario blocks are always solid from beneath to players) + || (rover->fofflags & FOF_BLOCKOTHERS && !mo->player) // ...solid to others? )) // ...don't take it into account. continue; - if (rover->flags & FF_QUICKSAND) + if (rover->fofflags & FOF_QUICKSAND) { switch (motype) { case 2: // scenery does things differently for some reason if (mo->z < topheight && bottomheight < thingtop) { - mo->floorz = mo->z; + if (!(mo->eflags & MFE_VERTICALFLIP)) + mo->floorz = mo->z; + else if (mo->eflags & MFE_VERTICALFLIP) + mo->ceilingz = thingtop; continue; } break; default: if (mo->z < topheight && bottomheight < thingtop) { - if (mo->floorz < mo->z) + if (!(mo->eflags & MFE_VERTICALFLIP) && mo->floorz < mo->z) mo->floorz = mo->z; + else if (mo->eflags & MFE_VERTICALFLIP && mo->ceilingz > thingtop) + mo->ceilingz = thingtop; } continue; // This is so you can jump/spring up through quicksand from below. } @@ -2175,15 +2180,15 @@ void P_AdjustMobjFloorZ_FFloors(mobj_t *mo, sector_t *sector, UINT8 motype) delta2 = thingtop - (bottomheight + ((topheight - bottomheight)/2)); if (topheight > mo->floorz && abs(delta1) < abs(delta2) - && (rover->flags & FF_SOLID) // Non-FF_SOLID Mario blocks are only solid from bottom - && !(rover->flags & FF_REVERSEPLATFORM) - && ((P_MobjFlip(mo)*mo->momz >= 0) || (!(rover->flags & FF_PLATFORM)))) // In reverse gravity, only clip for FOFs that are intangible from their bottom (the "top" you're falling through) if you're coming from above ("below" in your frame of reference) + && (rover->fofflags & FOF_SOLID) // Non-FOF_SOLID Mario blocks are only solid from bottom + && !(rover->fofflags & FOF_REVERSEPLATFORM) + && ((P_MobjFlip(mo)*mo->momz >= 0) || (!(rover->fofflags & FOF_PLATFORM)))) // In reverse gravity, only clip for FOFs that are intangible from their bottom (the "top" you're falling through) if you're coming from above ("below" in your frame of reference) { mo->floorz = topheight; } if (bottomheight < mo->ceilingz && abs(delta1) >= abs(delta2) - && !(rover->flags & FF_PLATFORM) - && ((P_MobjFlip(mo)*mo->momz >= 0) || ((rover->flags & FF_SOLID) && !(rover->flags & FF_REVERSEPLATFORM)))) // In normal gravity, only clip for FOFs that are intangible from the top if you're coming from below + && !(rover->fofflags & FOF_PLATFORM) + && ((P_MobjFlip(mo)*mo->momz >= 0) || ((rover->fofflags & FOF_SOLID) && !(rover->fofflags & FOF_REVERSEPLATFORM)))) // In normal gravity, only clip for FOFs that are intangible from the top if you're coming from below { mo->ceilingz = bottomheight; } @@ -2287,11 +2292,11 @@ boolean P_CheckDeathPitCollide(mobj_t *mo) return false; if (((mo->z <= mo->subsector->sector->floorheight - && ((mo->subsector->sector->flags & SF_TRIGGERSPECIAL_HEADBUMP) || !(mo->eflags & MFE_VERTICALFLIP)) && (mo->subsector->sector->flags & SF_FLIPSPECIAL_FLOOR)) + && ((mo->subsector->sector->flags & MSF_TRIGGERSPECIAL_HEADBUMP) || !(mo->eflags & MFE_VERTICALFLIP)) && (mo->subsector->sector->flags & MSF_FLIPSPECIAL_FLOOR)) || (mo->z + mo->height >= mo->subsector->sector->ceilingheight - && ((mo->subsector->sector->flags & SF_TRIGGERSPECIAL_HEADBUMP) || (mo->eflags & MFE_VERTICALFLIP)) && (mo->subsector->sector->flags & SF_FLIPSPECIAL_CEILING))) - && (GETSECSPECIAL(mo->subsector->sector->special, 1) == 6 - || GETSECSPECIAL(mo->subsector->sector->special, 1) == 7)) + && ((mo->subsector->sector->flags & MSF_TRIGGERSPECIAL_HEADBUMP) || (mo->eflags & MFE_VERTICALFLIP)) && (mo->subsector->sector->flags & MSF_FLIPSPECIAL_CEILING))) + && (mo->subsector->sector->damagetype == SD_DEATHPITTILT + || mo->subsector->sector->damagetype == SD_DEATHPITNOTILT)) return true; return false; @@ -2299,11 +2304,7 @@ boolean P_CheckDeathPitCollide(mobj_t *mo) boolean P_CheckSolidLava(ffloor_t *rover) { - if (rover->flags & FF_SWIMMABLE && GETSECSPECIAL(rover->master->frontsector->special, 1) == 3 - && !(rover->master->flags & ML_BLOCKMONSTERS)) - return true; - - return false; + return (rover->fofflags & FOF_SWIMMABLE) && (rover->master->frontsector->damagetype == SD_LAVA); } // @@ -2491,7 +2492,7 @@ boolean P_ZMovement(mobj_t *mo) { P_KillMobj(mo, NULL, NULL, 0); } - return false; + return !P_MobjWasRemoved(mo); // allows explosion states to run } else { @@ -2549,6 +2550,10 @@ boolean P_ZMovement(mobj_t *mo) } P_CheckPosition(mo, mo->x, mo->y); // Sets mo->standingslope correctly + + if (P_MobjWasRemoved(mo)) // mobjs can be removed by P_CheckPosition -- Monster Iestyn 31/07/21 + return false; + if (((mo->eflags & MFE_VERTICALFLIP) ? tmceilingslope : tmfloorslope) && (mo->type != MT_STEAM)) { mo->standingslope = (mo->eflags & MFE_VERTICALFLIP) ? tmceilingslope : tmfloorslope; @@ -2640,7 +2645,7 @@ boolean P_ZMovement(mobj_t *mo) { if (mo->flags2 & MF2_AMBUSH) { - // If deafed, give the tumbleweed another random kick if it runs out of steam. + // Give the tumbleweed another random kick if it runs out of steam. mom.z += P_MobjFlip(mo)*FixedMul(6*FRACUNIT, mo->scale); if (P_RandomChance(FRACUNIT/2)) @@ -2793,10 +2798,10 @@ static void P_CheckMarioBlocks(mobj_t *mo) for (rover = node->m_sector->ffloors; rover; rover = rover->next) { - if (!(rover->flags & FF_EXISTS)) + if (!(rover->fofflags & FOF_EXISTS)) continue; - if (!(rover->flags & FF_MARIO)) + if (!(rover->fofflags & FOF_MARIO)) continue; if (mo->eflags & MFE_VERTICALFLIP) @@ -2805,7 +2810,7 @@ static void P_CheckMarioBlocks(mobj_t *mo) if (*rover->bottomheight != mo->ceilingz) continue; - if (rover->flags & FF_SHATTERBOTTOM) // Brick block! + if (rover->fofflags & FOF_GOOWATER) // Brick block! EV_CrumbleChain(node->m_sector, rover); else // Question block! EV_MarioBlock(rover, node->m_sector, mo); @@ -3134,7 +3139,8 @@ boolean P_SceneryZMovement(mobj_t *mo) if (P_CheckDeathPitCollide(mo)) { - P_RemoveMobj(mo); + if (mo->type != MT_GHOST) // ghosts play death animations instead, so don't remove them + P_RemoveMobj(mo); return false; } @@ -3195,7 +3201,7 @@ boolean P_CanRunOnWater(player_t *player, ffloor_t *rover) if (!player->powers[pw_carry] && !player->homing && ((player->powers[pw_super] || player->charflags & SF_RUNONWATER || player->dashmode >= DASHMODE_THRESHOLD) && doifit) - && (rover->flags & FF_SWIMMABLE) && !(player->pflags & PF_SPINNING) && player->speed > FixedMul(player->runspeed, player->mo->scale) + && (rover->fofflags & FOF_SWIMMABLE) && !(player->pflags & PF_SPINNING) && player->speed > FixedMul(player->runspeed, player->mo->scale) && !(player->pflags & PF_SLIDING) && abs(playerbottom - surfaceheight) < FixedMul(30*FRACUNIT, player->mo->scale)) return true; @@ -3229,13 +3235,13 @@ void P_MobjCheckWater(mobj_t *mobj) for (rover = sector->ffloors; rover; rover = rover->next) { fixed_t topheight, bottomheight; - if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_SWIMMABLE) - || (((rover->flags & FF_BLOCKPLAYER) && mobj->player) - || ((rover->flags & FF_BLOCKOTHERS) && !mobj->player))) + if (!(rover->fofflags & FOF_EXISTS) || !(rover->fofflags & FOF_SWIMMABLE) + || (((rover->fofflags & FOF_BLOCKPLAYER) && mobj->player) + || ((rover->fofflags & FOF_BLOCKOTHERS) && !mobj->player))) continue; - topheight = P_GetFFloorTopZAt (rover, mobj->x, mobj->y); - bottomheight = P_GetFFloorBottomZAt(rover, mobj->x, mobj->y); + topheight = P_GetSpecialTopZ(mobj, sectors + rover->secnum, sector); + bottomheight = P_GetSpecialBottomZ(mobj, sectors + rover->secnum, sector); if (mobj->eflags & MFE_VERTICALFLIP) { @@ -3266,10 +3272,10 @@ void P_MobjCheckWater(mobj_t *mobj) if (mobj->eflags & (MFE_TOUCHWATER|MFE_UNDERWATER)) { - if (GETSECSPECIAL(rover->master->frontsector->special, 1) == 3) + if (rover->master->frontsector->damagetype == SD_FIRE || rover->master->frontsector->damagetype == SD_LAVA) mobj->eflags |= MFE_TOUCHLAVA; - if (rover->flags & FF_GOOWATER && !(mobj->flags & MF_NOGRAVITY)) + if (rover->fofflags & FOF_GOOWATER && !(mobj->flags & MF_NOGRAVITY)) mobj->eflags |= MFE_GOOWATER; } } @@ -3288,7 +3294,7 @@ void P_MobjCheckWater(mobj_t *mobj) { // Water removes electric and non-water fire shields... if (electric) P_FlashPal(p, PAL_WHITE, 1); - + p->powers[pw_shield] = p->powers[pw_shield] & SH_STACK; } } @@ -3477,7 +3483,7 @@ static void P_SceneryCheckWater(mobj_t *mobj) for (rover = sector->ffloors; rover; rover = rover->next) { - if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_SWIMMABLE) || rover->flags & FF_BLOCKOTHERS) + if (!(rover->fofflags & FOF_EXISTS) || !(rover->fofflags & FOF_SWIMMABLE) || rover->fofflags & FOF_BLOCKOTHERS) continue; topheight = P_GetFFloorTopZAt (rover, mobj->x, mobj->y); @@ -3510,23 +3516,20 @@ static boolean P_CameraCheckHeat(camera_t *thiscam) { sector_t *sector; fixed_t halfheight = thiscam->z + (thiscam->height >> 1); - size_t i; // see if we are in water sector = thiscam->subsector->sector; - for (i = 0; i < sector->tags.count; i++) - if (Tag_FindLineSpecial(13, sector->tags.tags[i]) != -1) - return true; + if (sector->flags & MSF_HEATWAVE) + return true; if (sector->ffloors) { ffloor_t *rover; - size_t j; for (rover = sector->ffloors; rover; rover = rover->next) { - if (!(rover->flags & FF_EXISTS)) + if (!(rover->fofflags & FOF_EXISTS)) continue; if (halfheight >= P_GetFFloorTopZAt(rover, thiscam->x, thiscam->y)) @@ -3534,8 +3537,7 @@ static boolean P_CameraCheckHeat(camera_t *thiscam) if (halfheight <= P_GetFFloorBottomZAt(rover, thiscam->x, thiscam->y)) continue; - for (j = 0; j < rover->master->frontsector->tags.count; j++) - if (Tag_FindLineSpecial(13, rover->master->frontsector->tags.tags[j]) != -1) + if (rover->master->frontsector->flags & MSF_HEATWAVE) return true; } } @@ -3557,7 +3559,7 @@ static boolean P_CameraCheckWater(camera_t *thiscam) for (rover = sector->ffloors; rover; rover = rover->next) { - if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_SWIMMABLE) || rover->flags & FF_BLOCKOTHERS) + if (!(rover->fofflags & FOF_EXISTS) || !(rover->fofflags & FOF_SWIMMABLE) || rover->fofflags & FOF_BLOCKOTHERS) continue; if (halfheight >= P_GetFFloorTopZAt(rover, thiscam->x, thiscam->y)) @@ -3751,10 +3753,10 @@ static void P_CheckCrumblingPlatforms(mobj_t *mobj) for (rover = node->m_sector->ffloors; rover; rover = rover->next) { - if (!(rover->flags & FF_EXISTS)) + if (!(rover->fofflags & FOF_EXISTS)) continue; - if (!(rover->flags & FF_CRUMBLE)) + if (!(rover->fofflags & FOF_CRUMBLE)) continue; if (mobj->eflags & MFE_VERTICALFLIP) @@ -3768,7 +3770,7 @@ static void P_CheckCrumblingPlatforms(mobj_t *mobj) continue; } - EV_StartCrumble(rover->master->frontsector, rover, (rover->flags & FF_FLOATBOB), mobj->player, rover->alpha, !(rover->flags & FF_NORETURN)); + EV_StartCrumble(rover->master->frontsector, rover, (rover->fofflags & FOF_FLOATBOB), mobj->player, rover->alpha, !(rover->fofflags & FOF_NORETURN)); } } } @@ -3786,10 +3788,10 @@ static boolean P_MobjTouchesSectorWithWater(mobj_t *mobj) for (rover = node->m_sector->ffloors; rover; rover = rover->next) { - if (!(rover->flags & FF_EXISTS)) + if (!(rover->fofflags & FOF_EXISTS)) continue; - if (!(rover->flags & FF_SWIMMABLE)) + if (!(rover->fofflags & FOF_SWIMMABLE)) continue; return true; @@ -3820,10 +3822,10 @@ static void P_CheckFloatbobPlatforms(mobj_t *mobj) for (rover = node->m_sector->ffloors; rover; rover = rover->next) { - if (!(rover->flags & FF_EXISTS)) + if (!(rover->fofflags & FOF_EXISTS)) continue; - if (!(rover->flags & FF_FLOATBOB)) + if (!(rover->fofflags & FOF_FLOATBOB)) continue; @@ -3953,10 +3955,10 @@ static void CalculatePrecipFloor(precipmobj_t *mobj) for (rover = mobjsecsubsec->ffloors; rover; rover = rover->next) { // If it exists, it'll get rained on. - if (!(rover->flags & FF_EXISTS)) + if (!(rover->fofflags & FOF_EXISTS)) continue; - if (!(rover->flags & FF_BLOCKOTHERS) && !(rover->flags & FF_SWIMMABLE)) + if (!(rover->fofflags & FOF_BLOCKOTHERS) && !(rover->fofflags & FOF_SWIMMABLE)) continue; topheight = P_GetFFloorTopZAt(rover, mobj->x, mobj->y); @@ -3988,6 +3990,7 @@ void P_NullPrecipThinker(precipmobj_t *mobj) { //(void)mobj; mobj->precipflags &= ~PCF_THUNK; + R_ResetPrecipitationMobjInterpolationState(mobj); } void P_SnowThinker(precipmobj_t *mobj) @@ -3996,7 +3999,10 @@ void P_SnowThinker(precipmobj_t *mobj) // adjust height if ((mobj->z += mobj->momz) <= mobj->floorz) + { mobj->z = mobj->ceilingz; + R_ResetPrecipitationMobjInterpolationState(mobj); + } } void P_RainThinker(precipmobj_t *mobj) @@ -4020,6 +4026,7 @@ void P_RainThinker(precipmobj_t *mobj) return; mobj->z = mobj->ceilingz; + R_ResetPrecipitationMobjInterpolationState(mobj); P_SetPrecipMobjState(mobj, S_RAIN1); return; @@ -4059,11 +4066,13 @@ static void P_KillRingsInLava(mobj_t *mo) for (rover = node->m_sector->ffloors; rover; rover = rover->next) // go through all fofs in the sector { - if (!(rover->flags & FF_EXISTS)) continue; // fof must be real + if (!(rover->fofflags & FOF_EXISTS)) continue; // fof must be real - if (!(rover->flags & FF_SWIMMABLE // fof must be water - && GETSECSPECIAL(rover->master->frontsector->special, 1) == 3)) // fof must be lava water - continue; + if (!(rover->fofflags & FOF_SWIMMABLE)) + continue; // fof must be water + + if (rover->master->frontsector->damagetype != SD_FIRE && rover->master->frontsector->damagetype != SD_LAVA) + continue; // fof must have fire or lava damage // find heights of FOF topheight = P_GetFOFTopZ(mo, node->m_sector, rover, mo->x, mo->y, NULL); @@ -4136,7 +4145,7 @@ boolean P_BossTargetPlayer(mobj_t *actor, boolean closest) player = &players[actor->lastlook]; - if (player->pflags & PF_INVIS || player->bot || player->spectator) + if (player->pflags & PF_INVIS || player->bot == BOT_2PAI || player->bot == BOT_2PHUMAN || player->spectator) continue; // ignore notarget if (!player->mo || P_MobjWasRemoved(player->mo)) @@ -4177,7 +4186,7 @@ boolean P_SupermanLook4Players(mobj_t *actor) if (players[c].pflags & PF_INVIS) continue; // ignore notarget - if (!players[c].mo || players[c].bot) + if (!players[c].mo || players[c].bot == BOT_2PAI || players[c].bot == BOT_2PHUMAN) continue; if (players[c].mo->health <= 0) @@ -4306,7 +4315,8 @@ static void P_Boss2Thinker(mobj_t *mobj) { mobj->flags &= ~MF_NOGRAVITY; A_Boss2Pogo(mobj); - P_LinedefExecute(LE_PINCHPHASE, mobj, NULL); + if (mobj->spawnpoint) + P_LinedefExecute(mobj->spawnpoint->args[4], mobj, NULL); } } @@ -4435,7 +4445,8 @@ static void P_Boss3Thinker(mobj_t *mobj) dummy->cusval = mobj->cusval; CONS_Debug(DBG_GAMELOGIC, "Eggman path %d - Dummy selected paths %d and %d\n", way0, way1, way2); - P_LinedefExecute(LE_PINCHPHASE+(mobj->cusval*LE_PARAMWIDTH), mobj, NULL); + if (mobj->spawnpoint) + P_LinedefExecute(mobj->spawnpoint->args[4], mobj, NULL); } } else if (mobj->movecount) // Firing mode @@ -4477,27 +4488,21 @@ static void P_Boss3Thinker(mobj_t *mobj) if (!(mobj->flags2 & MF2_STRONGBOX)) { - thinker_t *th; mobj_t *mo2; + INT32 i; P_SetTarget(&mobj->tracer, NULL); - // scan the thinkers - // to find a point that matches - // the number - for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next) + // Find waypoint + TAG_ITER_THINGS(mobj->cusval, i) { - if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed) - continue; + mo2 = mapthings[i].mobj; - mo2 = (mobj_t *)th; + if (!mo2) + continue; if (mo2->type != MT_BOSS3WAYPOINT) continue; - if (!mo2->spawnpoint) - continue; - if (mo2->spawnpoint->angle != mobj->threshold) - continue; - if (mo2->spawnpoint->extrainfo != mobj->cusval) + if (mapthings[i].args[0] != mobj->threshold) continue; P_SetTarget(&mobj->tracer, mo2); @@ -4601,12 +4606,14 @@ static void P_Boss3Thinker(mobj_t *mobj) // Move Boss4's sectors by delta. static boolean P_Boss4MoveCage(mobj_t *mobj, fixed_t delta) { - const UINT16 tag = 65534 + (mobj->spawnpoint ? mobj->spawnpoint->extrainfo*LE_PARAMWIDTH : 0); INT32 snum; sector_t *sector; boolean gotcage = false; - TAG_ITER_SECTORS(tag, snum) + if (!mobj->spawnpoint) + return false; + + TAG_ITER_SECTORS(mobj->spawnpoint->args[4], snum) { sector = §ors[snum]; sector->floorheight += delta; @@ -4626,7 +4633,7 @@ static void P_Boss4MoveSpikeballs(mobj_t *mobj, angle_t angle, fixed_t fz) while ((base = base->tracer)) { for (seg = base, dist = 172*FRACUNIT, s = 9; seg; seg = seg->hnext, dist += 124*FRACUNIT, --s) - P_TeleportMove(seg, mobj->x + P_ReturnThrustX(mobj, angle, dist), mobj->y + P_ReturnThrustY(mobj, angle, dist), bz + FixedMul(fz, FixedDiv(s<x + P_ReturnThrustX(mobj, angle, dist), mobj->y + P_ReturnThrustY(mobj, angle, dist), bz + FixedMul(fz, FixedDiv(s<spawnpoint ? mobj->spawnpoint->extrainfo*LE_PARAMWIDTH : 0); INT32 snum; size_t a; sector_t *sector, *rsec; ffloor_t *rover; - TAG_ITER_SECTORS(tag, snum) + if (!mobj->spawnpoint) + return; + + TAG_ITER_SECTORS(mobj->spawnpoint->args[4], snum) { sector = §ors[snum]; @@ -4700,14 +4709,14 @@ static void P_Boss4DestroyCage(mobj_t *mobj) { rsec = §ors[sector->attached[a]]; for (rover = rsec->ffloors; rover; rover = rover->next) - if (rover->flags & FF_EXISTS && rover->secnum == (size_t)snum) + if (rover->fofflags & FOF_EXISTS && rover->secnum == (size_t)snum) { - if (rover->flags & FF_RENDERALL) // checking for FF_RENDERANY. + if (rover->fofflags & FOF_RENDERALL) // checking for FF_RENDERANY. EV_CrumbleChain(rsec, rover); // This FOF is visible to some extent? Crumble it. else // Completely invisible FOF { // no longer exists (can't collide with again) - rover->flags &= ~FF_EXISTS; + rover->fofflags &= ~FOF_EXISTS; sector->moved = true; rsec->moved = true; } @@ -4964,13 +4973,15 @@ static void P_Boss4Thinker(mobj_t *mobj) { // Proceed to pinch phase! P_Boss4DestroyCage(mobj); mobj->movedir = 3; - P_LinedefExecute(LE_PINCHPHASE + (mobj->spawnpoint ? mobj->spawnpoint->extrainfo*LE_PARAMWIDTH : 0), mobj, NULL); + if (mobj->spawnpoint) + P_LinedefExecute(mobj->spawnpoint->args[4], mobj, NULL); P_Boss4MoveSpikeballs(mobj, FixedAngle(mobj->movecount), 0); var1 = 3; A_BossJetFume(mobj); return; } - P_LinedefExecute(LE_BOSS4DROP - (mobj->info->spawnhealth-mobj->health) + (mobj->spawnpoint ? mobj->spawnpoint->extrainfo*LE_PARAMWIDTH : 0), mobj, NULL); + if (mobj->spawnpoint) + P_LinedefExecute(mobj->spawnpoint->args[5] - (mobj->info->spawnhealth-mobj->health), mobj, NULL); // 1 -> 1.5 second timer mobj->threshold = TICRATE+(TICRATE*(mobj->info->spawnhealth-mobj->health)/10); if (mobj->threshold < 1) @@ -5002,7 +5013,8 @@ static void P_Boss4Thinker(mobj_t *mobj) { // Proceed to pinch phase! P_Boss4DestroyCage(mobj); mobj->movedir = 3; - P_LinedefExecute(LE_PINCHPHASE + (mobj->spawnpoint ? mobj->spawnpoint->extrainfo*LE_PARAMWIDTH : 0), mobj, NULL); + if (mobj->spawnpoint) + P_LinedefExecute(mobj->spawnpoint->args[4], mobj, NULL); var1 = 3; A_BossJetFume(mobj); return; @@ -5142,7 +5154,8 @@ static void P_Boss7Thinker(mobj_t *mobj) // Begin platform destruction mobj->flags2 |= MF2_FRET; P_SetMobjState(mobj, mobj->info->raisestate); - P_LinedefExecute(LE_PINCHPHASE, mobj, NULL); + if (mobj->spawnpoint) + P_LinedefExecute(mobj->spawnpoint->args[4], mobj, NULL); } } else if (mobj->state == &states[S_BLACKEGG_HITFACE4] && mobj->tics == mobj->state->tics) @@ -5232,11 +5245,10 @@ static void P_Boss7Thinker(mobj_t *mobj) fixed_t vertical, horizontal; fixed_t airtime = 5*TICRATE; INT32 waypointNum = 0; - thinker_t *th; - INT32 i; + INT32 i, j; boolean foundgoop = false; INT32 closestNum; - UINT8 extrainfo = (mobj->spawnpoint ? mobj->spawnpoint->extrainfo : 0); + UINT8 bossid = (mobj->spawnpoint ? mobj->spawnpoint->args[0] : 0); // Looks for players in goop. If you find one, try to jump on him. for (i = 0; i < MAXPLAYERS; i++) @@ -5256,19 +5268,15 @@ static void P_Boss7Thinker(mobj_t *mobj) closestdist = INT32_MAX; // Just in case... // Find waypoint he is closest to - for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next) + TAG_ITER_THINGS(bossid, j) { - if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed) - continue; + mo2 = mapthings[j].mobj; - mo2 = (mobj_t *)th; + if (!mo2) + continue; if (mo2->type != MT_BOSS3WAYPOINT) continue; - if (!mo2->spawnpoint) - continue; - if (mo2->spawnpoint->extrainfo != extrainfo) - continue; - if (mobj->health <= mobj->info->damage && !(mo2->spawnpoint->options & 7)) + if (mobj->health <= mobj->info->damage && !mapthings[j].args[1]) continue; // don't jump to center dist = P_AproxDistance(players[i].mo->x - mo2->x, players[i].mo->y - mo2->y); @@ -5276,7 +5284,7 @@ static void P_Boss7Thinker(mobj_t *mobj) if (!(closestNum == -1 || dist < closestdist)) continue; - closestNum = (mo2->spawnpoint->options & 7); + closestNum = mapthings[j].args[1]; closestdist = dist; foundgoop = true; } @@ -5296,7 +5304,7 @@ static void P_Boss7Thinker(mobj_t *mobj) } if (mobj->tracer && mobj->tracer->type == MT_BOSS3WAYPOINT - && mobj->tracer->spawnpoint && (mobj->tracer->spawnpoint->options & 7) == waypointNum) + && mobj->tracer->spawnpoint && mobj->tracer->spawnpoint->args[1] == waypointNum) { if (P_RandomChance(FRACUNIT/2)) waypointNum++; @@ -5309,28 +5317,25 @@ static void P_Boss7Thinker(mobj_t *mobj) waypointNum = ((waypointNum + 5) % 5); } - // scan the thinkers to find - // the waypoint to use - for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next) + // Scan mapthings to find the waypoint to use + TAG_ITER_THINGS(bossid, i) { - if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed) + mo2 = mapthings[i].mobj; + + if (!mo2) continue; - mo2 = (mobj_t *)th; if (mo2->type != MT_BOSS3WAYPOINT) continue; - if (!mo2->spawnpoint) - continue; - if ((mo2->spawnpoint->options & 7) != waypointNum) - continue; - if (mo2->spawnpoint->extrainfo != extrainfo) + + if (mapthings[i].args[1] != waypointNum) continue; hitspot = mo2; break; } - if (hitspot == NULL) + if (!hitspot) { CONS_Debug(DBG_GAMELOGIC, "BlackEggman unable to find waypoint #%d!\n", waypointNum); P_SetMobjState(mobj, mobj->info->spawnstate); @@ -5549,7 +5554,7 @@ static void P_Boss9Thinker(mobj_t *mobj) mobj->hprev->destscale = FRACUNIT + (2*TICRATE - mobj->fuse)*(FRACUNIT/2)/TICRATE + FixedMul(FINECOSINE(angle>>ANGLETOFINESHIFT),FRACUNIT/2); P_SetScale(mobj->hprev, mobj->hprev->destscale); - P_TeleportMove(mobj->hprev, mobj->x, mobj->y, mobj->z + mobj->height/2 - mobj->hprev->height/2); + P_MoveOrigin(mobj->hprev, mobj->x, mobj->y, mobj->z + mobj->height/2 - mobj->hprev->height/2); mobj->hprev->momx = mobj->momx; mobj->hprev->momy = mobj->momy; mobj->hprev->momz = mobj->momz; @@ -5657,23 +5662,29 @@ static void P_Boss9Thinker(mobj_t *mobj) { mobj_t *missile = P_SpawnMissile(spawner, mobj, MT_MSGATHER); missile->fuse = (dist/P_AproxDistance(missile->momx, missile->momy)); + if (missile->fuse <= 0) // Prevents a division by zero when calculating missile->scalespeed + missile->fuse = 1; if (missile->fuse > mobj->fuse) - P_RemoveMobj(missile); - - if (mobj->health > mobj->info->damage) { - P_SetScale(missile, FRACUNIT/3); - missile->color = SKINCOLOR_MAGENTA; // sonic OVA/4 purple power + P_RemoveMobj(missile); } else { - P_SetScale(missile, FRACUNIT/5); - missile->color = SKINCOLOR_SUNSET; // sonic cd electric power + if (mobj->health > mobj->info->damage) + { + P_SetScale(missile, FRACUNIT/3); + missile->color = SKINCOLOR_MAGENTA; // sonic OVA/4 purple power + } + else + { + P_SetScale(missile, FRACUNIT/5); + missile->color = SKINCOLOR_SUNSET; // sonic cd electric power + } + missile->destscale = missile->scale*2; + missile->scalespeed = abs(missile->scale - missile->destscale)/missile->fuse; + missile->colorized = true; } - missile->destscale = missile->scale*2; - missile->scalespeed = abs(missile->scale - missile->destscale)/missile->fuse; - missile->colorized = true; } // ...then down. easier than changing the missile's momz after-the-fact @@ -5999,7 +6010,8 @@ static void P_Boss9Thinker(mobj_t *mobj) mobj->watertop = mobj->floorz + 16*FRACUNIT; else mobj->watertop = mobj->target->floorz + 16*FRACUNIT; - P_LinedefExecute(LE_PINCHPHASE, mobj, NULL); + if (mobj->spawnpoint) + P_LinedefExecute(mobj->spawnpoint->args[4], mobj, NULL); #if 0 whoosh = P_SpawnMobjFromMobj(mobj, 0, 0, 0, MT_GHOST); // done here so the offset is correct @@ -6159,8 +6171,9 @@ static void P_MoveHoop(mobj_t *mobj) { const fixed_t fuse = (mobj->fuse*mobj->extravalue2); const angle_t fa = mobj->movedir*(FINEANGLES/mobj->extravalue1); - TVector v; - TVector *res; + matrix_t m; + vector4_t v; + vector4_t res; fixed_t finalx, finaly, finalz; fixed_t x, y, z; @@ -6173,19 +6186,20 @@ static void P_MoveHoop(mobj_t *mobj) z = mobj->target->z+mobj->target->height/2; // Make the sprite travel towards the center of the hoop - v[0] = FixedMul(FINECOSINE(fa),fuse); - v[1] = 0; - v[2] = FixedMul(FINESINE(fa),fuse); - v[3] = FRACUNIT; + v.x = FixedMul(FINECOSINE(fa),fuse); + v.y = 0; + v.z = FixedMul(FINESINE(fa),fuse); + v.a = FRACUNIT; - res = VectorMatrixMultiply(v, *RotateXMatrix(FixedAngle(mobj->target->movedir*FRACUNIT))); - M_Memcpy(&v, res, sizeof (v)); - res = VectorMatrixMultiply(v, *RotateZMatrix(FixedAngle(mobj->target->movecount*FRACUNIT))); - M_Memcpy(&v, res, sizeof (v)); + FM_RotateX(&m, FixedAngle(mobj->target->movedir*FRACUNIT)); + FV4_Copy(&v, FM_MultMatrixVec4(&m, &v, &res)); - finalx = x + v[0]; - finaly = y + v[1]; - finalz = z + v[2]; + FM_RotateZ(&m, FixedAngle(mobj->target->movecount*FRACUNIT)); + FV4_Copy(&v, FM_MultMatrixVec4(&m, &v, &res)); + + finalx = x + v.x; + finaly = y + v.y; + finalz = z + v.z; P_UnsetThingPosition(mobj); mobj->x = finalx; @@ -6198,8 +6212,9 @@ void P_SpawnHoopOfSomething(fixed_t x, fixed_t y, fixed_t z, fixed_t radius, INT { mobj_t *mobj; INT32 i; - TVector v; - TVector *res; + matrix_t m; + vector4_t v; + vector4_t res; fixed_t finalx, finaly, finalz; mobj_t hoopcenter; mobj_t *axis; @@ -6241,19 +6256,20 @@ void P_SpawnHoopOfSomething(fixed_t x, fixed_t y, fixed_t z, fixed_t radius, INT for (i = 0; i < number; i++) { fa = (i*degrees); - v[0] = FixedMul(FINECOSINE(fa),radius); - v[1] = 0; - v[2] = FixedMul(FINESINE(fa),radius); - v[3] = FRACUNIT; + v.x = FixedMul(FINECOSINE(fa),radius); + v.y = 0; + v.z = FixedMul(FINESINE(fa),radius); + v.a = FRACUNIT; - res = VectorMatrixMultiply(v, *RotateXMatrix(rotangle)); - M_Memcpy(&v, res, sizeof (v)); - res = VectorMatrixMultiply(v, *RotateZMatrix(closestangle)); - M_Memcpy(&v, res, sizeof (v)); + FM_RotateX(&m, rotangle); + FV4_Copy(&v, FM_MultMatrixVec4(&m, &v, &res)); - finalx = x + v[0]; - finaly = y + v[1]; - finalz = z + v[2]; + FM_RotateZ(&m, closestangle); + FV4_Copy(&v, FM_MultMatrixVec4(&m, &v, &res)); + + finalx = x + v.x; + finaly = y + v.y; + finalz = z + v.z; mobj = P_SpawnMobj(finalx, finaly, finalz, type); mobj->z -= mobj->height/2; @@ -6264,8 +6280,9 @@ void P_SpawnParaloop(fixed_t x, fixed_t y, fixed_t z, fixed_t radius, INT32 numb { mobj_t *mobj; INT32 i; - TVector v; - TVector *res; + matrix_t m; + vector4_t v; + vector4_t res; fixed_t finalx, finaly, finalz, dist; angle_t degrees, fa, closestangle; fixed_t mobjx, mobjy, mobjz; @@ -6280,19 +6297,20 @@ void P_SpawnParaloop(fixed_t x, fixed_t y, fixed_t z, fixed_t radius, INT32 numb for (i = 0; i < number; i++) { fa = (i*degrees); - v[0] = FixedMul(FINECOSINE(fa),radius); - v[1] = 0; - v[2] = FixedMul(FINESINE(fa),radius); - v[3] = FRACUNIT; + v.x = FixedMul(FINECOSINE(fa),radius); + v.y = 0; + v.z = FixedMul(FINESINE(fa),radius); + v.a = FRACUNIT; - res = VectorMatrixMultiply(v, *RotateXMatrix(rotangle)); - M_Memcpy(&v, res, sizeof (v)); - res = VectorMatrixMultiply(v, *RotateZMatrix(closestangle)); - M_Memcpy(&v, res, sizeof (v)); + FM_RotateX(&m, rotangle); + FV4_Copy(&v, FM_MultMatrixVec4(&m, &v, &res)); - finalx = x + v[0]; - finaly = y + v[1]; - finalz = z + v[2]; + FM_RotateZ(&m, closestangle); + FV4_Copy(&v, FM_MultMatrixVec4(&m, &v, &res)); + + finalx = x + v.x; + finaly = y + v.y; + finalz = z + v.z; mobj = P_SpawnMobj(finalx, finaly, finalz, type); @@ -6321,11 +6339,7 @@ void P_SpawnParaloop(fixed_t x, fixed_t y, fixed_t z, fixed_t radius, INT32 numb mobj->fuse = (radius>>(FRACBITS+2)) + 1; if (spawncenter) - { - mobj->x = x; - mobj->y = y; - mobj->z = z; - } + P_SetOrigin(mobj, x, y, z); if (mobj->fuse <= 1) mobj->fuse = 2; @@ -6397,7 +6411,7 @@ void P_Attract(mobj_t *source, mobj_t *dest, boolean nightsgrab) // Home in on y if (dist < source->movefactor) { source->momx = source->momy = source->momz = 0; - P_TeleportMove(source, tx, ty, tz); + P_MoveOrigin(source, tx, ty, tz); } else { @@ -6459,9 +6473,10 @@ static void P_NightsItemChase(mobj_t *thing) // void P_MaceRotate(mobj_t *center, INT32 baserot, INT32 baseprevrot) { - TVector unit_lengthways, unit_sideways, pos_lengthways, pos_sideways; - TVector *res; - fixed_t radius, dist, zstore; + matrix_t m; + vector4_t unit_lengthways, unit_sideways, pos_lengthways, pos_sideways; + vector4_t res; + fixed_t radius, dist = 0, zstore; angle_t fa; boolean dosound = false; mobj_t *mobj = center->hnext, *hnext = NULL; @@ -6472,8 +6487,9 @@ void P_MaceRotate(mobj_t *center, INT32 baserot, INT32 baseprevrot) INT32 rot; INT32 prevrot; - dist = pos_sideways[0] = pos_sideways[1] = pos_sideways[2] = pos_sideways[3] = unit_sideways[3] =\ - pos_lengthways[0] = pos_lengthways[1] = pos_lengthways[2] = pos_lengthways[3] = 0; + FV4_Load(&pos_sideways, 0, 0, 0, 0); + FV4_Load(&unit_sideways, 0, 0, 0, 0); + FV4_Load(&pos_lengthways, 0, 0, 0, 0); while (mobj) { @@ -6491,15 +6507,15 @@ void P_MaceRotate(mobj_t *center, INT32 baserot, INT32 baseprevrot) rot = (baserot + mobj->threshold) & FINEMASK; prevrot = (baseprevrot + mobj->threshold) & FINEMASK; - pos_lengthways[0] = pos_lengthways[1] = pos_lengthways[2] = pos_lengthways[3] = 0; + FV4_Load(&pos_lengthways, 0, 0, 0, 0); dist = ((mobj->info->speed) ? mobj->info->speed : mobjinfo[MT_SMALLMACECHAIN].speed); dist = ((center->scale == FRACUNIT) ? dist : FixedMul(dist, center->scale)); fa = (FixedAngle(center->movefactor*FRACUNIT) >> ANGLETOFINESHIFT); radius = FixedMul(dist, FINECOSINE(fa)); - unit_lengthways[1] = -FixedMul(dist, FINESINE(fa)); - unit_lengthways[3] = FRACUNIT; + unit_lengthways.y = -FixedMul(dist, FINESINE(fa)); + unit_lengthways.a = FRACUNIT; // Swinging Chain. if (center->flags2 & MF2_STRONGBOX) @@ -6512,8 +6528,8 @@ void P_MaceRotate(mobj_t *center, INT32 baserot, INT32 baseprevrot) fa = ((FixedAngle(swingmag) >> ANGLETOFINESHIFT) + mobj->friction) & FINEMASK; - unit_lengthways[0] = FixedMul(FINESINE(fa), -radius); - unit_lengthways[2] = FixedMul(FINECOSINE(fa), -radius); + unit_lengthways.x = FixedMul(FINESINE(fa), -radius); + unit_lengthways.z = FixedMul(FINECOSINE(fa), -radius); } // Rotating Chain. else @@ -6524,15 +6540,16 @@ void P_MaceRotate(mobj_t *center, INT32 baserot, INT32 baseprevrot) if (!(prevfa > (FINEMASK/2)) && (fa > (FINEMASK/2))) // completed a full swing dosound = true; - unit_lengthways[0] = FixedMul(FINECOSINE(fa), radius); - unit_lengthways[2] = FixedMul(FINESINE(fa), radius); + unit_lengthways.x = FixedMul(FINECOSINE(fa), radius); + unit_lengthways.z = FixedMul(FINESINE(fa), radius); } // Calculate the angle matrixes for the link. - res = VectorMatrixMultiply(unit_lengthways, *RotateXMatrix(center->threshold << ANGLETOFINESHIFT)); - M_Memcpy(&unit_lengthways, res, sizeof(unit_lengthways)); - res = VectorMatrixMultiply(unit_lengthways, *RotateZMatrix(center->angle)); - M_Memcpy(&unit_lengthways, res, sizeof(unit_lengthways)); + FM_RotateX(&m, center->threshold << ANGLETOFINESHIFT); + FV4_Copy(&unit_lengthways, FM_MultMatrixVec4(&m, &unit_lengthways, &res)); + + FM_RotateZ(&m, center->angle); + FV4_Copy(&unit_lengthways, FM_MultMatrixVec4(&m, &unit_lengthways, &res)); lastthreshold = mobj->threshold; lastfriction = mobj->friction; @@ -6544,63 +6561,64 @@ void P_MaceRotate(mobj_t *center, INT32 baserot, INT32 baseprevrot) dosound = false; } - if (pos_sideways[3] != mobj->movefactor) + if (pos_sideways.a != mobj->movefactor) { - if (!unit_sideways[3]) + if (!unit_sideways.a) { - unit_sideways[1] = dist; - unit_sideways[0] = unit_sideways[2] = 0; - unit_sideways[3] = FRACUNIT; + unit_sideways.y = dist; + unit_sideways.x = unit_sideways.z = 0; + unit_sideways.a = FRACUNIT; - res = VectorMatrixMultiply(unit_sideways, *RotateXMatrix(center->threshold << ANGLETOFINESHIFT)); - M_Memcpy(&unit_sideways, res, sizeof(unit_sideways)); - res = VectorMatrixMultiply(unit_sideways, *RotateZMatrix(center->angle)); - M_Memcpy(&unit_sideways, res, sizeof(unit_sideways)); + FM_RotateX(&m, center->threshold << ANGLETOFINESHIFT); + FV4_Copy(&unit_sideways, FM_MultMatrixVec4(&m, &unit_sideways, &res)); + + FM_RotateZ(&m, center->angle); + FV4_Copy(&unit_sideways, FM_MultMatrixVec4(&m, &unit_sideways, &res)); } - if (pos_sideways[3] > mobj->movefactor) + if (pos_sideways.a > mobj->movefactor) { do { - pos_sideways[0] -= unit_sideways[0]; - pos_sideways[1] -= unit_sideways[1]; - pos_sideways[2] -= unit_sideways[2]; + pos_sideways.x -= unit_sideways.x; + pos_sideways.y -= unit_sideways.y; + pos_sideways.z -= unit_sideways.z; } - while ((--pos_sideways[3]) != mobj->movefactor); + while ((--pos_sideways.a) != mobj->movefactor); } else { do { - pos_sideways[0] += unit_sideways[0]; - pos_sideways[1] += unit_sideways[1]; - pos_sideways[2] += unit_sideways[2]; + pos_sideways.x += unit_sideways.x; + pos_sideways.y += unit_sideways.y; + pos_sideways.z += unit_sideways.z; } - while ((++pos_sideways[3]) != mobj->movefactor); + while ((++pos_sideways.a) != mobj->movefactor); } } hnext = mobj->hnext; // just in case the mobj is removed - if (pos_lengthways[3] > mobj->movecount) + if (pos_lengthways.a > mobj->movecount) { do { - pos_lengthways[0] -= unit_lengthways[0]; - pos_lengthways[1] -= unit_lengthways[1]; - pos_lengthways[2] -= unit_lengthways[2]; + pos_lengthways.x -= unit_lengthways.x; + pos_lengthways.y -= unit_lengthways.y; + pos_lengthways.z -= unit_lengthways.z; } - while ((--pos_lengthways[3]) != mobj->movecount); + while ((--pos_lengthways.a) != mobj->movecount); } - else if (pos_lengthways[3] < mobj->movecount) + else if (pos_lengthways.a < mobj->movecount) { do { - pos_lengthways[0] += unit_lengthways[0]; - pos_lengthways[1] += unit_lengthways[1]; - pos_lengthways[2] += unit_lengthways[2]; + pos_lengthways.x += unit_lengthways.x; + pos_lengthways.y += unit_lengthways.y; + pos_lengthways.z += unit_lengthways.z; } - while ((++pos_lengthways[3]) != mobj->movecount); + while ((++pos_lengthways.a) != mobj->movecount); } P_UnsetThingPosition(mobj); @@ -6610,17 +6628,17 @@ void P_MaceRotate(mobj_t *center, INT32 baserot, INT32 baseprevrot) mobj->z = center->z; // Add on the appropriate distances to the center's co-ordinates. - if (pos_lengthways[3]) + if (pos_lengthways.a) { - mobj->x += pos_lengthways[0]; - mobj->y += pos_lengthways[1]; - zstore = pos_lengthways[2] + pos_sideways[2]; + mobj->x += pos_lengthways.x; + mobj->y += pos_lengthways.y; + zstore = pos_lengthways.z + pos_sideways.z; } else - zstore = pos_sideways[2]; + zstore = pos_sideways.z; - mobj->x += pos_sideways[0]; - mobj->y += pos_sideways[1]; + mobj->x += pos_sideways.x; + mobj->y += pos_sideways.y; // Cut the height to align the link with the axis. if (mobj->type == MT_SMALLMACECHAIN || mobj->type == MT_BIGMACECHAIN || mobj->type == MT_SMALLGRABCHAIN || mobj->type == MT_BIGGRABCHAIN) @@ -6638,7 +6656,7 @@ void P_MaceRotate(mobj_t *center, INT32 baserot, INT32 baseprevrot) P_SetThingPosition(mobj); #if 0 // toaster's height-clipping dealie! - if (!pos_lengthways[3] || P_MobjWasRemoved(mobj) || (mobj->flags & MF_NOCLIPHEIGHT)) + if (!pos_lengthways.a || P_MobjWasRemoved(mobj) || (mobj->flags & MF_NOCLIPHEIGHT)) goto cont; if ((fa = ((center->threshold & (FINEMASK/2)) << ANGLETOFINESHIFT)) > ANGLE_45 && fa < ANGLE_135) // only move towards center when the motion is towards/away from the ground, rather than alongside it @@ -6658,8 +6676,8 @@ void P_MaceRotate(mobj_t *center, INT32 baserot, INT32 baseprevrot) P_UnsetThingPosition(mobj); - mobj->x -= FixedMul(unit_lengthways[0], zstore); - mobj->y -= FixedMul(unit_lengthways[1], zstore); + mobj->x -= FixedMul(unit_lengthways.x, zstore); + mobj->y -= FixedMul(unit_lengthways.y, zstore); P_SetThingPosition(mobj); @@ -6748,7 +6766,8 @@ void P_RunShields(void) // run shields for (i = 0; i < numshields; i++) { - P_ShieldLook(shields[i], shields[i]->threshold); + if (!P_MobjWasRemoved(shields[i])) + P_ShieldLook(shields[i], shields[i]->threshold); P_SetTarget(&shields[i], NULL); } numshields = 0; @@ -6835,7 +6854,7 @@ void P_RunOverlays(void) mo->eflags = (mo->eflags & ~MFE_VERTICALFLIP) | (mo->target->eflags & MFE_VERTICALFLIP); mo->scale = mo->destscale = mo->target->scale; - mo->angle = mo->target->angle + mo->movedir; + mo->angle = (mo->target->player ? mo->target->player->drawangle : mo->target->angle) + mo->movedir; if (!(mo->state->frame & FF_ANIMATE)) zoffs = FixedMul(((signed)mo->state->var2)*FRACUNIT, mo->scale); @@ -6887,6 +6906,13 @@ static void P_AddOverlay(mobj_t *thing) static void P_RemoveOverlay(mobj_t *thing) { mobj_t *mo; + if (overlaycap == thing) + { + P_SetTarget(&overlaycap, thing->hnext); + P_SetTarget(&thing->hnext, NULL); + return; + } + for (mo = overlaycap; mo; mo = mo->hnext) { if (mo->hnext != thing) @@ -6898,7 +6924,6 @@ static void P_RemoveOverlay(mobj_t *thing) } } -void A_BossDeath(mobj_t *mo); // AI for the Koopa boss. static void P_KoopaThinker(mobj_t *koopa) { @@ -6906,7 +6931,8 @@ static void P_KoopaThinker(mobj_t *koopa) if (koopa->watertop > koopa->z + koopa->height + FixedMul(128*FRACUNIT, koopa->scale) && koopa->health > 0) { - A_BossDeath(koopa); + if (koopa->spawnpoint) + EV_DoCeiling(koopa->spawnpoint->args[0], NULL, raiseToHighest); P_RemoveMobj(koopa); return; } @@ -7002,7 +7028,7 @@ static void P_UpdateMinecartSegments(mobj_t *mobj) dx = seg->extravalue1; dy = seg->extravalue2; sang = seg->cusval; - P_TeleportMove(seg, x + s*dx + c*dy, y - c*dx + s*dy, z); + P_MoveOrigin(seg, x + s*dx + c*dy, y - c*dx + s*dy, z); seg->angle = ang + FixedAngle(FRACUNIT*sang); seg->flags2 = (seg->flags2 & ~MF2_DONTDRAW) | (mobj->flags2 & MF2_DONTDRAW); seg = seg->tracer; @@ -7024,6 +7050,8 @@ static void P_PyreFlyBurn(mobj_t *mobj, fixed_t hoffs, INT16 vrange, mobjtype_t fixed_t zoffs = P_RandomRange(-vrange, vrange)*FRACUNIT; mobj_t *particle = P_SpawnMobjFromMobj(mobj, xoffs, yoffs, zoffs, mobjtype); particle->momz = momz; + particle->flags2 |= MF2_LINKDRAW; + P_SetTarget(&particle->tracer, mobj); } static void P_MobjScaleThink(mobj_t *mobj) @@ -7188,8 +7216,7 @@ static void P_FlameJetSceneryThink(mobj_t *mobj) else flame->angle += FixedAngle(mobj->fuse<movedir; + strength = (mobj->movedir ? mobj->movedir : 80)<<(FRACBITS-2); P_InstaThrust(flame, flame->angle, strength); S_StartSound(flame, sfx_fire); @@ -7219,8 +7246,7 @@ static void P_VerticalFlameJetSceneryThink(mobj_t *mobj) flame = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_FLAMEJETFLAME); - strength = 20*FRACUNIT; - strength -= ((20*FRACUNIT)/16)*mobj->movedir; + strength = (mobj->movedir ? mobj->movedir : 80)<<(FRACBITS-2); // If deaf'd, the object spawns on the ceiling. if (mobj->flags2 & MF2_AMBUSH) @@ -7254,8 +7280,22 @@ static boolean P_ParticleGenSceneryThink(mobj_t *mobj) mobj->fuse = (tic_t)mobj->reactiontime; - bottomheight = lines[line].frontsector->floorheight; - topheight = lines[line].frontsector->ceilingheight - mobjinfo[(mobjtype_t)type].height; + if (line != -1) + { + bottomheight = lines[line].frontsector->floorheight; + topheight = lines[line].frontsector->ceilingheight - mobjinfo[(mobjtype_t)type].height; + } + else if (mobj->flags2 & MF2_OBJECTFLIP) + { + bottomheight = mobj->z - mobj->extravalue1; + topheight = mobj->z - mobjinfo[(mobjtype_t)type].height; + } + else + { + bottomheight = mobj->z; + topheight = mobj->z + mobj->extravalue1 - mobjinfo[(mobjtype_t)type].height; + } + if (mobj->waterbottom != bottomheight || mobj->watertop != topheight) { @@ -7264,7 +7304,8 @@ static boolean P_ParticleGenSceneryThink(mobj_t *mobj) else mobj->health = 0; - mobj->z = ((mobj->flags2 & MF2_OBJECTFLIP) ? topheight : bottomheight); + if (line != -1) + mobj->z = ((mobj->flags2 & MF2_OBJECTFLIP) ? topheight : bottomheight); } if (!mobj->health) @@ -7306,7 +7347,7 @@ static void P_RosySceneryThink(mobj_t *mobj) continue; if (!players[i].mo) continue; - if (players[i].bot) + if (players[i].bot == BOT_2PAI || players[i].bot == BOT_2PHUMAN) continue; if (!players[i].mo->health) continue; @@ -7508,7 +7549,7 @@ static void P_RosySceneryThink(mobj_t *mobj) static void P_MobjSceneryThink(mobj_t *mobj) { - if (LUAh_MobjThinker(mobj)) + if (LUA_HookMobj(mobj, MOBJ_HOOK(MobjThinker))) return; if (P_MobjWasRemoved(mobj)) return; @@ -7703,7 +7744,8 @@ static void P_MobjSceneryThink(mobj_t *mobj) break; case MT_WATERDROP: P_SceneryCheckWater(mobj); - if ((mobj->z <= mobj->floorz || mobj->z <= mobj->watertop) + if (((!(mobj->eflags & MFE_VERTICALFLIP) && (mobj->z <= mobj->floorz || mobj->z <= mobj->watertop)) + || (mobj->eflags & MFE_VERTICALFLIP && mobj->z + mobj->height >= mobj->ceilingz)) && mobj->health > 0) { mobj->health = 0; @@ -7753,6 +7795,9 @@ static void P_MobjSceneryThink(mobj_t *mobj) mobj->z = mobj->target->z + mobj->target->height + FixedMul((16 + abs((signed)(leveltime % TICRATE) - TICRATE/2))*FRACUNIT, mobj->target->scale); else mobj->z = mobj->target->z - FixedMul((16 + abs((signed)(leveltime % TICRATE) - TICRATE/2))*FRACUNIT, mobj->target->scale) - mobj->height; + + mobj->old_z = mobj->z; + break; case MT_LOCKONINF: if (!(mobj->flags2 & MF2_STRONGBOX)) @@ -7764,6 +7809,9 @@ static void P_MobjSceneryThink(mobj_t *mobj) mobj->z = mobj->threshold + FixedMul((16 + abs((signed)(leveltime % TICRATE) - TICRATE/2))*FRACUNIT, mobj->scale); else mobj->z = mobj->threshold - FixedMul((16 + abs((signed)(leveltime % TICRATE) - TICRATE/2))*FRACUNIT, mobj->scale); + + mobj->old_z = mobj->z; + break; case MT_DROWNNUMBERS: if (!P_DrownNumbersSceneryThink(mobj)) @@ -7826,7 +7874,8 @@ static void P_MobjSceneryThink(mobj_t *mobj) case MT_WOODDEBRIS: case MT_BRICKDEBRIS: case MT_BROKENROBOT: - if (mobj->z <= P_FloorzAtPos(mobj->x, mobj->y, mobj->z, mobj->height) + if (((!(mobj->eflags & MFE_VERTICALFLIP) && mobj->z <= P_FloorzAtPos(mobj->x, mobj->y, mobj->z, mobj->height)) + || (mobj->eflags & MFE_VERTICALFLIP && mobj->z + mobj->height >= P_CeilingzAtPos(mobj->x, mobj->y, mobj->z, mobj->height))) && mobj->state != &states[mobj->info->deathstate]) { P_SetMobjState(mobj, mobj->info->deathstate); @@ -7856,7 +7905,7 @@ static void P_MobjSceneryThink(mobj_t *mobj) if (!mobj->fuse) { - if (!LUAh_MobjFuse(mobj)) + if (!LUA_HookMobj(mobj, MOBJ_HOOK(MobjFuse))) P_RemoveMobj(mobj); return; } @@ -7898,6 +7947,9 @@ static void P_MobjSceneryThink(mobj_t *mobj) P_SetScale(mobj, mobj->target->scale); } break; + case MT_TUTORIALFLOWER: + mobj->angle += FixedAngle(3*FRACUNIT); + break; case MT_VWREF: case MT_VWREB: { @@ -7915,7 +7967,7 @@ static void P_MobjSceneryThink(mobj_t *mobj) mobj->fuse--; if (!mobj->fuse) { - if (!LUAh_MobjFuse(mobj)) + if (!LUA_HookMobj(mobj, MOBJ_HOOK(MobjFuse))) P_RemoveMobj(mobj); return; } @@ -7944,7 +7996,7 @@ static boolean P_MobjPushableThink(mobj_t *mobj) static boolean P_MobjBossThink(mobj_t *mobj) { - if (LUAh_BossThinker(mobj)) + if (LUA_HookMobj(mobj, MOBJ_HOOK(BossThinker))) { if (P_MobjWasRemoved(mobj)) return false; @@ -8392,7 +8444,10 @@ static boolean P_HangsterThink(mobj_t *mobj) } //after swooping back up, check for ceiling else if ((st == S_HANGSTER_RETURN1 || st == S_HANGSTER_RETURN2) && mobj->momz == 0 && mobj->ceilingz == (mobj->z + mobj->height)) + { P_SetMobjState(mobj, (st = S_HANGSTER_RETURN3)); + mobj->momx = mobj->momy = 0; + } //should you roost on a ceiling with F_SKY1 as its flat, disappear forever if (st == S_HANGSTER_RETURN3 && mobj->momz == 0 && mobj->ceilingz == (mobj->z + mobj->height) @@ -8539,9 +8594,9 @@ static boolean P_EggRobo1Think(mobj_t *mobj) { fixed_t basex = mobj->cusval, basey = mobj->cvmem; - if (mobj->spawnpoint && mobj->spawnpoint->options & (MTF_AMBUSH|MTF_OBJECTSPECIAL)) + if (mobj->spawnpoint && mobj->spawnpoint->args[0] != TMED_NONE) { - angle_t sideang = mobj->movedir + ((mobj->spawnpoint->options & MTF_AMBUSH) ? ANGLE_90 : -ANGLE_90); + angle_t sideang = mobj->movedir + ((mobj->spawnpoint->args[0] == TMED_LEFT) ? ANGLE_90 : -ANGLE_90); fixed_t oscillate = FixedMul(FINESINE(((leveltime * ANG1) >> (ANGLETOFINESHIFT + 2)) & FINEMASK), 250*mobj->scale); basex += P_ReturnThrustX(mobj, sideang, oscillate); basey += P_ReturnThrustY(mobj, sideang, oscillate); @@ -8595,7 +8650,7 @@ static boolean P_EggRobo1Think(mobj_t *mobj) < mobj->scale) S_StartSound(mobj, mobj->info->seesound); - P_TeleportMove(mobj, + P_MoveOrigin(mobj, (15*(mobj->x >> 4)) + (basex >> 4) + P_ReturnThrustX(mobj, mobj->angle, SPECTATORRADIUS >> 4), (15*(mobj->y >> 4)) + (basey >> 4) + P_ReturnThrustY(mobj, mobj->angle, SPECTATORRADIUS >> 4), mobj->z); @@ -8621,9 +8676,9 @@ static boolean P_EggRobo1Think(mobj_t *mobj) if (!didmove) { if (P_AproxDistance(mobj->x - basex, mobj->y - basey) < mobj->scale) - P_TeleportMove(mobj, basex, basey, mobj->z); + P_MoveOrigin(mobj, basex, basey, mobj->z); else - P_TeleportMove(mobj, + P_MoveOrigin(mobj, (15*(mobj->x >> 4)) + (basex >> 4), (15*(mobj->y >> 4)) + (basey >> 4), mobj->z); @@ -8636,245 +8691,242 @@ static boolean P_EggRobo1Think(mobj_t *mobj) static void P_NiGHTSDroneThink(mobj_t *mobj) { + mobj_t *goalpost = NULL; + mobj_t *sparkle = NULL; + mobj_t *droneman = NULL; + + boolean flip = mobj->flags2 & MF2_OBJECTFLIP; + boolean topaligned = (mobj->flags & MF_SLIDEME) && !(mobj->flags & MF_GRENADEBOUNCE); + boolean middlealigned = (mobj->flags & MF_GRENADEBOUNCE) && !(mobj->flags & MF_SLIDEME); + boolean bottomoffsetted = !(mobj->flags & MF_SLIDEME) && !(mobj->flags & MF_GRENADEBOUNCE); + boolean flipchanged = false; + + fixed_t dronemanoffset, goaloffset, sparkleoffset, droneboxmandiff, dronemangoaldiff; + + if (mobj->target && mobj->target->type == MT_NIGHTSDRONE_GOAL) { - // variable setup - mobj_t *goalpost = NULL; - mobj_t *sparkle = NULL; - mobj_t *droneman = NULL; + goalpost = mobj->target; + if (goalpost->target && goalpost->target->type == MT_NIGHTSDRONE_SPARKLING) + sparkle = goalpost->target; + if (goalpost->tracer && goalpost->tracer->type == MT_NIGHTSDRONE_MAN) + droneman = goalpost->tracer; + } - boolean flip = mobj->flags2 & MF2_OBJECTFLIP; - boolean topaligned = (mobj->flags & MF_SLIDEME) && !(mobj->flags & MF_GRENADEBOUNCE); - boolean middlealigned = (mobj->flags & MF_GRENADEBOUNCE) && !(mobj->flags & MF_SLIDEME); - boolean bottomoffsetted = !(mobj->flags & MF_SLIDEME) && !(mobj->flags & MF_GRENADEBOUNCE); - boolean flipchanged = false; + if (!goalpost || !sparkle || !droneman) + return; - fixed_t dronemanoffset, goaloffset, sparkleoffset, droneboxmandiff, dronemangoaldiff; + // did NIGHTSDRONE position, scale, flip, or flags change? all elements need to be synced + droneboxmandiff = max(mobj->height - droneman->height, 0); + dronemangoaldiff = max(droneman->height - goalpost->height, 0); - if (mobj->target && mobj->target->type == MT_NIGHTSDRONE_GOAL) + if (!(goalpost->flags2 & MF2_OBJECTFLIP) && (mobj->flags2 & MF2_OBJECTFLIP)) + { + goalpost->eflags |= MFE_VERTICALFLIP; + goalpost->flags2 |= MF2_OBJECTFLIP; + sparkle->eflags |= MFE_VERTICALFLIP; + sparkle->flags2 |= MF2_OBJECTFLIP; + droneman->eflags |= MFE_VERTICALFLIP; + droneman->flags2 |= MF2_OBJECTFLIP; + flipchanged = true; + } + else if ((goalpost->flags2 & MF2_OBJECTFLIP) && !(mobj->flags2 & MF2_OBJECTFLIP)) + { + goalpost->eflags &= ~MFE_VERTICALFLIP; + goalpost->flags2 &= ~MF2_OBJECTFLIP; + sparkle->eflags &= ~MFE_VERTICALFLIP; + sparkle->flags2 &= ~MF2_OBJECTFLIP; + droneman->eflags &= ~MFE_VERTICALFLIP; + droneman->flags2 &= ~MF2_OBJECTFLIP; + flipchanged = true; + } + + if (goalpost->destscale != mobj->destscale + || goalpost->movefactor != mobj->z + || goalpost->friction != mobj->height + || flipchanged + || goalpost->threshold != (INT32)(mobj->flags & (MF_SLIDEME|MF_GRENADEBOUNCE))) + { + goalpost->destscale = sparkle->destscale = droneman->destscale = mobj->destscale; + + // straight copy-pasta from P_SpawnMapThing, case MT_NIGHTSDRONE + if (!flip) { - goalpost = mobj->target; - if (goalpost->target && goalpost->target->type == MT_NIGHTSDRONE_SPARKLING) - sparkle = goalpost->target; - if (goalpost->tracer && goalpost->tracer->type == MT_NIGHTSDRONE_MAN) - droneman = goalpost->tracer; - } - - if (!goalpost || !sparkle || !droneman) - return; - - // did NIGHTSDRONE position, scale, flip, or flags change? all elements need to be synced - droneboxmandiff = max(mobj->height - droneman->height, 0); - dronemangoaldiff = max(droneman->height - goalpost->height, 0); - - if (!(goalpost->flags2 & MF2_OBJECTFLIP) && (mobj->flags2 & MF2_OBJECTFLIP)) - { - goalpost->eflags |= MFE_VERTICALFLIP; - goalpost->flags2 |= MF2_OBJECTFLIP; - sparkle->eflags |= MFE_VERTICALFLIP; - sparkle->flags2 |= MF2_OBJECTFLIP; - droneman->eflags |= MFE_VERTICALFLIP; - droneman->flags2 |= MF2_OBJECTFLIP; - flipchanged = true; - } - else if ((goalpost->flags2 & MF2_OBJECTFLIP) && !(mobj->flags2 & MF2_OBJECTFLIP)) - { - goalpost->eflags &= ~MFE_VERTICALFLIP; - goalpost->flags2 &= ~MF2_OBJECTFLIP; - sparkle->eflags &= ~MFE_VERTICALFLIP; - sparkle->flags2 &= ~MF2_OBJECTFLIP; - droneman->eflags &= ~MFE_VERTICALFLIP; - droneman->flags2 &= ~MF2_OBJECTFLIP; - flipchanged = true; - } - - if (goalpost->destscale != mobj->destscale - || goalpost->movefactor != mobj->z - || goalpost->friction != mobj->height - || flipchanged - || goalpost->threshold != (INT32)(mobj->flags & (MF_SLIDEME|MF_GRENADEBOUNCE))) - { - goalpost->destscale = sparkle->destscale = droneman->destscale = mobj->destscale; - - // straight copy-pasta from P_SpawnMapThing, case MT_NIGHTSDRONE - if (!flip) + if (topaligned) // Align droneman to top of hitbox { - if (topaligned) // Align droneman to top of hitbox - { - dronemanoffset = droneboxmandiff; - goaloffset = dronemangoaldiff/2 + dronemanoffset; - } - else if (middlealigned) // Align droneman to center of hitbox - { - dronemanoffset = droneboxmandiff/2; - goaloffset = dronemangoaldiff/2 + dronemanoffset; - } - else if (bottomoffsetted) - { - dronemanoffset = 24*FRACUNIT; - goaloffset = dronemangoaldiff + dronemanoffset; - } - else - { - dronemanoffset = 0; - goaloffset = dronemangoaldiff/2 + dronemanoffset; - } - - sparkleoffset = goaloffset - FixedMul(15*FRACUNIT, mobj->scale); + dronemanoffset = droneboxmandiff; + goaloffset = dronemangoaldiff/2 + dronemanoffset; + } + else if (middlealigned) // Align droneman to center of hitbox + { + dronemanoffset = droneboxmandiff/2; + goaloffset = dronemangoaldiff/2 + dronemanoffset; + } + else if (bottomoffsetted) + { + dronemanoffset = 24*FRACUNIT; + goaloffset = dronemangoaldiff + dronemanoffset; } else { - if (topaligned) // Align droneman to top of hitbox - { - dronemanoffset = 0; - goaloffset = dronemangoaldiff/2 + dronemanoffset; - } - else if (middlealigned) // Align droneman to center of hitbox - { - dronemanoffset = droneboxmandiff/2; - goaloffset = dronemangoaldiff/2 + dronemanoffset; - } - else if (bottomoffsetted) - { - dronemanoffset = droneboxmandiff - FixedMul(24*FRACUNIT, mobj->scale); - goaloffset = dronemangoaldiff + dronemanoffset; - } - else - { - dronemanoffset = droneboxmandiff; - goaloffset = dronemangoaldiff/2 + dronemanoffset; - } - - sparkleoffset = goaloffset + FixedMul(15*FRACUNIT, mobj->scale); + dronemanoffset = 0; + goaloffset = dronemangoaldiff/2 + dronemanoffset; } - P_TeleportMove(goalpost, mobj->x, mobj->y, mobj->z + goaloffset); - P_TeleportMove(sparkle, mobj->x, mobj->y, mobj->z + sparkleoffset); - if (goalpost->movefactor != mobj->z || goalpost->friction != mobj->height) - { - P_TeleportMove(droneman, mobj->x, mobj->y, mobj->z + dronemanoffset); - goalpost->movefactor = mobj->z; - goalpost->friction = mobj->height; - } - goalpost->threshold = mobj->flags & (MF_SLIDEME|MF_GRENADEBOUNCE); + sparkleoffset = goaloffset - FixedMul(15*FRACUNIT, mobj->scale); } else { - if (goalpost->x != mobj->x || goalpost->y != mobj->y) + if (topaligned) // Align droneman to top of hitbox { - P_TeleportMove(goalpost, mobj->x, mobj->y, goalpost->z); - P_TeleportMove(sparkle, mobj->x, mobj->y, sparkle->z); + dronemanoffset = 0; + goaloffset = dronemangoaldiff/2 + dronemanoffset; } - - if (droneman->x != mobj->x || droneman->y != mobj->y) - P_TeleportMove(droneman, mobj->x, mobj->y, - droneman->z >= mobj->floorz && droneman->z <= mobj->ceilingz ? droneman->z : mobj->z); - } - - // now toggle states! - // GOAL mode? - if (sparkle->state >= &states[S_NIGHTSDRONE_SPARKLING1] && sparkle->state <= &states[S_NIGHTSDRONE_SPARKLING16]) - { - INT32 i; - boolean bonustime = false; - - for (i = 0; i < MAXPLAYERS; i++) - if (playeringame[i] && players[i].bonustime && players[i].powers[pw_carry] == CR_NIGHTSMODE) - { - bonustime = true; - break; - } - - if (!bonustime) + else if (middlealigned) // Align droneman to center of hitbox { - CONS_Debug(DBG_NIGHTSBASIC, "Removing goal post\n"); - if (goalpost && goalpost->state != &states[S_INVISIBLE]) - P_SetMobjState(goalpost, S_INVISIBLE); - if (sparkle && sparkle->state != &states[S_INVISIBLE]) - P_SetMobjState(sparkle, S_INVISIBLE); + dronemanoffset = droneboxmandiff/2; + goaloffset = dronemangoaldiff/2 + dronemanoffset; } - } - // Invisible/bouncing mode. - else - { - INT32 i; - boolean bonustime = false; - fixed_t zcomp; - - // Bouncy bouncy! - if (!flip) + else if (bottomoffsetted) { - if (topaligned) - zcomp = droneboxmandiff + mobj->z; - else if (middlealigned) - zcomp = (droneboxmandiff/2) + mobj->z; - else if (bottomoffsetted) - zcomp = mobj->z + FixedMul(24*FRACUNIT, mobj->scale); - else - zcomp = mobj->z; + dronemanoffset = droneboxmandiff - FixedMul(24*FRACUNIT, mobj->scale); + goaloffset = dronemangoaldiff + dronemanoffset; } else { - if (topaligned) - zcomp = mobj->z; - else if (middlealigned) - zcomp = (droneboxmandiff/2) + mobj->z; - else if (bottomoffsetted) - zcomp = mobj->z + droneboxmandiff - FixedMul(24*FRACUNIT, mobj->scale); - else - zcomp = mobj->z + droneboxmandiff; + dronemanoffset = droneboxmandiff; + goaloffset = dronemangoaldiff/2 + dronemanoffset; } - droneman->angle += ANG10; - if (!flip && droneman->z <= zcomp) - droneman->momz = FixedMul(5*FRACUNIT, droneman->scale); - else if (flip && droneman->z >= zcomp) - droneman->momz = FixedMul(-5*FRACUNIT, droneman->scale); + sparkleoffset = goaloffset + FixedMul(15*FRACUNIT, mobj->scale); + } - // state switching logic + P_MoveOrigin(goalpost, mobj->x, mobj->y, mobj->z + goaloffset); + P_MoveOrigin(sparkle, mobj->x, mobj->y, mobj->z + sparkleoffset); + if (goalpost->movefactor != mobj->z || goalpost->friction != mobj->height) + { + P_MoveOrigin(droneman, mobj->x, mobj->y, mobj->z + dronemanoffset); + goalpost->movefactor = mobj->z; + goalpost->friction = mobj->height; + } + goalpost->threshold = mobj->flags & (MF_SLIDEME|MF_GRENADEBOUNCE); + } + else + { + if (goalpost->x != mobj->x || goalpost->y != mobj->y) + { + P_MoveOrigin(goalpost, mobj->x, mobj->y, goalpost->z); + P_MoveOrigin(sparkle, mobj->x, mobj->y, sparkle->z); + } + + if (droneman->x != mobj->x || droneman->y != mobj->y) + P_MoveOrigin(droneman, mobj->x, mobj->y, + droneman->z >= mobj->floorz && droneman->z <= mobj->ceilingz ? droneman->z : mobj->z); + } + + // now toggle states! + // GOAL mode? + if (sparkle->state >= &states[S_NIGHTSDRONE_SPARKLING1] && sparkle->state <= &states[S_NIGHTSDRONE_SPARKLING16]) + { + INT32 i; + boolean bonustime = false; + + for (i = 0; i < MAXPLAYERS; i++) + if (playeringame[i] && players[i].bonustime && players[i].powers[pw_carry] == CR_NIGHTSMODE) + { + bonustime = true; + break; + } + + if (!bonustime) + { + CONS_Debug(DBG_NIGHTSBASIC, "Removing goal post\n"); + if (goalpost && goalpost->state != &states[S_INVISIBLE]) + P_SetMobjState(goalpost, S_INVISIBLE); + if (sparkle && sparkle->state != &states[S_INVISIBLE]) + P_SetMobjState(sparkle, S_INVISIBLE); + } + } + // Invisible/bouncing mode. + else + { + INT32 i; + boolean bonustime = false; + fixed_t zcomp; + + // Bouncy bouncy! + if (!flip) + { + if (topaligned) + zcomp = droneboxmandiff + mobj->z; + else if (middlealigned) + zcomp = (droneboxmandiff/2) + mobj->z; + else if (bottomoffsetted) + zcomp = mobj->z + FixedMul(24*FRACUNIT, mobj->scale); + else + zcomp = mobj->z; + } + else + { + if (topaligned) + zcomp = mobj->z; + else if (middlealigned) + zcomp = (droneboxmandiff/2) + mobj->z; + else if (bottomoffsetted) + zcomp = mobj->z + droneboxmandiff - FixedMul(24*FRACUNIT, mobj->scale); + else + zcomp = mobj->z + droneboxmandiff; + } + + droneman->angle += ANG10; + if (!flip && droneman->z <= zcomp) + droneman->momz = FixedMul(5*FRACUNIT, droneman->scale); + else if (flip && droneman->z >= zcomp) + droneman->momz = FixedMul(-5*FRACUNIT, droneman->scale); + + // state switching logic + for (i = 0; i < MAXPLAYERS; i++) + if (playeringame[i] && players[i].bonustime && players[i].powers[pw_carry] == CR_NIGHTSMODE) + { + bonustime = true; + break; + } + + if (bonustime) + { + CONS_Debug(DBG_NIGHTSBASIC, "Adding goal post\n"); + if (!(droneman->flags2 & MF2_DONTDRAW)) + droneman->flags2 |= MF2_DONTDRAW; + if (goalpost->state == &states[S_INVISIBLE]) + P_SetMobjState(goalpost, mobjinfo[goalpost->type].meleestate); + if (sparkle->state == &states[S_INVISIBLE]) + P_SetMobjState(sparkle, mobjinfo[sparkle->type].meleestate); + } + else if (!G_IsSpecialStage(gamemap)) + { for (i = 0; i < MAXPLAYERS; i++) - if (playeringame[i] && players[i].bonustime && players[i].powers[pw_carry] == CR_NIGHTSMODE) + if (playeringame[i] && players[i].powers[pw_carry] != CR_NIGHTSMODE) { - bonustime = true; + bonustime = true; // variable reuse break; } if (bonustime) { - CONS_Debug(DBG_NIGHTSBASIC, "Adding goal post\n"); + // show droneman if at least one player is non-nights + if (goalpost->state != &states[S_INVISIBLE]) + P_SetMobjState(goalpost, S_INVISIBLE); + if (sparkle->state != &states[S_INVISIBLE]) + P_SetMobjState(sparkle, S_INVISIBLE); + if (droneman->state != &states[mobjinfo[droneman->type].meleestate]) + P_SetMobjState(droneman, mobjinfo[droneman->type].meleestate); + if (droneman->flags2 & MF2_DONTDRAW) + droneman->flags2 &= ~MF2_DONTDRAW; + } + else + { + // else, hide it if (!(droneman->flags2 & MF2_DONTDRAW)) droneman->flags2 |= MF2_DONTDRAW; - if (goalpost->state == &states[S_INVISIBLE]) - P_SetMobjState(goalpost, mobjinfo[goalpost->type].meleestate); - if (sparkle->state == &states[S_INVISIBLE]) - P_SetMobjState(sparkle, mobjinfo[sparkle->type].meleestate); - } - else if (!G_IsSpecialStage(gamemap)) - { - for (i = 0; i < MAXPLAYERS; i++) - if (playeringame[i] && players[i].powers[pw_carry] != CR_NIGHTSMODE) - { - bonustime = true; // variable reuse - break; - } - - if (bonustime) - { - // show droneman if at least one player is non-nights - if (goalpost->state != &states[S_INVISIBLE]) - P_SetMobjState(goalpost, S_INVISIBLE); - if (sparkle->state != &states[S_INVISIBLE]) - P_SetMobjState(sparkle, S_INVISIBLE); - if (droneman->state != &states[mobjinfo[droneman->type].meleestate]) - P_SetMobjState(droneman, mobjinfo[droneman->type].meleestate); - if (droneman->flags2 & MF2_DONTDRAW) - droneman->flags2 &= ~MF2_DONTDRAW; - } - else - { - // else, hide it - if (!(droneman->flags2 & MF2_DONTDRAW)) - droneman->flags2 |= MF2_DONTDRAW; - } } } } @@ -8966,7 +9018,7 @@ static void P_SaloonDoorThink(mobj_t *mobj) fma = (mobj->angle >> ANGLETOFINESHIFT) & FINEMASK; c = 48*FINECOSINE(fma); s = 48*FINESINE(fma); - P_TeleportMove(mobj, x + c0 + c, y + s0 + s, z); + P_MoveOrigin(mobj, x + c0 + c, y + s0 + s, z); } static void P_PyreFlyThink(mobj_t *mobj) @@ -9193,6 +9245,118 @@ static void P_DragonbomberThink(mobj_t *mobj) #undef DRAGONTURNSPEED } +static mobj_t *pushmobj; + +#define PUSH_FACTOR 7 + +static inline boolean PIT_PushThing(mobj_t *thing) +{ + if (thing->eflags & MFE_PUSHED) + return false; + + if (thing->player && thing->player->powers[pw_carry] == CR_ROPEHANG) + return false; + + if (!pushmobj) + return false; + + if (!pushmobj->spawnpoint) + return false; + + // Allow this to affect pushable objects at some point? + if (thing->player && !(thing->flags & (MF_NOGRAVITY|MF_NOCLIP))) + { + INT32 dist; + INT32 speed; + INT32 sx = pushmobj->x; + INT32 sy = pushmobj->y; + INT32 sz = pushmobj->z; + fixed_t radius = pushmobj->spawnpoint->args[0] << FRACBITS; + + if (pushmobj->spawnpoint->args[2] & TMPP_NOZFADE) + dist = P_AproxDistance(thing->x - sx, thing->y - sy); + else + { + // Make sure the Z is in range + if (thing->z < sz - radius || thing->z > sz + radius) + return false; + + dist = P_AproxDistance(P_AproxDistance(thing->x - sx, thing->y - sy), thing->z - sz); + } + + speed = (abs(pushmobj->spawnpoint->args[1]) - ((dist>>FRACBITS)>>1))<<(FRACBITS - PUSH_FACTOR - 1); + + // If speed <= 0, you're outside the effective radius. You also have + // to be able to see the push/pull source point. + + // Written with bits and pieces of P_HomingAttack + if ((speed > 0) && (P_CheckSight(thing, pushmobj))) + { + fixed_t tmpmomx, tmpmomy, tmpmomz; + + if (pushmobj->spawnpoint->args[2] & TMPP_PUSHZ) + { + tmpmomx = FixedMul(FixedDiv(sx - thing->x, dist), speed); + tmpmomy = FixedMul(FixedDiv(sy - thing->y, dist), speed); + tmpmomz = FixedMul(FixedDiv(sz - thing->z, dist), speed); + } + else + { + angle_t pushangle = R_PointToAngle2(thing->x, thing->y, sx, sy) >> ANGLETOFINESHIFT; + tmpmomx = FixedMul(speed, FINECOSINE(pushangle)); + tmpmomy = FixedMul(speed, FINESINE(pushangle)); + tmpmomz = 0; + } + + if (pushmobj->spawnpoint->args[1] > 0) // away! + { + tmpmomx *= -1; + tmpmomy *= -1; + tmpmomz *= -1; + } + + thing->momx += tmpmomx; + thing->momy += tmpmomy; + thing->momz += tmpmomz; + + if (thing->player) + { + thing->player->cmomx += tmpmomx; + thing->player->cmomy += tmpmomy; + thing->player->cmomx = FixedMul(thing->player->cmomx, 0xe800); + thing->player->cmomy = FixedMul(thing->player->cmomy, 0xe800); + } + } + } + + if (!(pushmobj->spawnpoint->args[2] & TMPP_NONEXCLUSIVE)) + thing->eflags |= MFE_PUSHED; + + return true; +} + +static void P_PointPushThink(mobj_t *mobj) +{ + INT32 xl, xh, yl, yh, bx, by; + fixed_t radius; + + if (!mobj->spawnpoint) + return; + + // Seek out all pushable things within the force radius of this + // point pusher. Crosses sectors, so use blockmap. + radius = mobj->spawnpoint->args[0] << FRACBITS; + + pushmobj = mobj; + xl = (unsigned)(mobj->x - radius - bmaporgx - MAXRADIUS)>>MAPBLOCKSHIFT; + xh = (unsigned)(mobj->x + radius - bmaporgx + MAXRADIUS)>>MAPBLOCKSHIFT; + yl = (unsigned)(mobj->y - radius - bmaporgy - MAXRADIUS)>>MAPBLOCKSHIFT; + yh = (unsigned)(mobj->y + radius - bmaporgy + MAXRADIUS)>>MAPBLOCKSHIFT; + for (bx = xl; bx <= xh; bx++) + for (by = yl; by <= yh; by++) + P_BlockThingsIterator(bx, by, PIT_PushThing); +} + static boolean P_MobjRegularThink(mobj_t *mobj) { if ((mobj->flags & MF_ENEMY) && (mobj->state->nextstate == mobj->info->spawnstate && mobj->tics == 1)) @@ -9204,7 +9368,8 @@ static boolean P_MobjRegularThink(mobj_t *mobj) switch (mobj->type) { case MT_WALLSPIKEBASE: - if (!mobj->target) { + if (!mobj->target) + { P_RemoveMobj(mobj); return false; } @@ -9408,7 +9573,7 @@ static boolean P_MobjRegularThink(mobj_t *mobj) P_RemoveMobj(mobj); return false; } - P_TeleportMove(mobj, mobj->target->x, mobj->target->y, mobj->target->z - mobj->height); + P_MoveOrigin(mobj, mobj->target->x, mobj->target->y, mobj->target->z - mobj->height); break; case MT_HAMMER: if (mobj->z <= mobj->floorz) @@ -9534,7 +9699,7 @@ static boolean P_MobjRegularThink(mobj_t *mobj) P_RingThinker(mobj); if (mobj->flags2 & MF2_NIGHTSPULL) P_NightsItemChase(mobj); - else + else if (mobj->type != MT_BOMBSPHERE) // prevent shields from attracting bomb spheres A_AttractChase(mobj); return false; // Flung items @@ -9552,6 +9717,11 @@ static boolean P_MobjRegularThink(mobj_t *mobj) A_AttractChase(mobj); break; case MT_EMBLEM: + if (P_EmblemWasCollected(mobj->health - 1) || !P_CanPickupEmblem(&players[consoleplayer], mobj->health - 1)) + mobj->frame |= (tr_trans50 << FF_TRANSSHIFT); + else + mobj->frame &= ~FF_TRANSMASK; + if (mobj->flags2 & MF2_NIGHTSPULL) P_NightsItemChase(mobj); break; @@ -9571,13 +9741,9 @@ static boolean P_MobjRegularThink(mobj_t *mobj) break; case MT_BLUEFLAG: case MT_REDFLAG: - { - sector_t* sec2; - sec2 = P_ThingOnSpecial3DFloor(mobj); - if ((sec2 && GETSECSPECIAL(sec2->special, 4) == 2) || (GETSECSPECIAL(mobj->subsector->sector->special, 4) == 2)) + if (P_MobjTouchingSectorSpecialFlag(mobj, SSF_RETURNFLAG)) mobj->fuse = 1; // Return to base. break; - } case MT_SPINDUST: // Spindash dust mobj->momx = FixedMul(mobj->momx, (3*FRACUNIT)/4); // originally 50000 mobj->momy = FixedMul(mobj->momy, (3*FRACUNIT)/4); // same @@ -9682,7 +9848,10 @@ static boolean P_MobjRegularThink(mobj_t *mobj) if (P_IsObjectOnGround(mobj)) mobj->rollangle = 0; else - mobj->rollangle = R_PointToAngle2(0, 0, mobj->momz, (mobj->scale << 1) - min(abs(mobj->momz), mobj->scale << 1)); + mobj->rollangle = R_PointToAngle2(0, 0, P_MobjFlip(mobj)*mobj->momz, (mobj->scale << 1) - min(abs(mobj->momz), mobj->scale << 1)); + break; + case MT_PUSH: + P_PointPushThink(mobj); break; case MT_SPINFIRE: if (mobj->flags & MF_NOGRAVITY) @@ -9871,7 +10040,7 @@ static boolean P_FuseThink(mobj_t *mobj) if (mobj->fuse) return true; - if (LUAh_MobjFuse(mobj) || P_MobjWasRemoved(mobj)) + if (LUA_HookMobj(mobj, MOBJ_HOOK(MobjFuse)) || P_MobjWasRemoved(mobj)) ; else if (mobj->info->flags & MF_MONITOR) { @@ -9908,16 +10077,11 @@ static boolean P_FuseThink(mobj_t *mobj) case MT_METALSONIC_BATTLE: break; // don't remove case MT_SPIKE: - P_SetMobjState(mobj, mobj->state->nextstate); - mobj->fuse = mobj->info->speed; - if (mobj->spawnpoint) - mobj->fuse += mobj->spawnpoint->angle; - break; case MT_WALLSPIKE: P_SetMobjState(mobj, mobj->state->nextstate); - mobj->fuse = mobj->info->speed; - if (mobj->spawnpoint) - mobj->fuse += (mobj->spawnpoint->angle / 360); + if (P_MobjWasRemoved(mobj)) + return false; + mobj->fuse = mobj->spawnpoint ? mobj->spawnpoint->args[0] : mobj->info->speed; break; case MT_NIGHTSCORE: P_RemoveMobj(mobj); @@ -9990,7 +10154,7 @@ void P_MobjThinker(mobj_t *mobj) if (mobj->flags & MF_NOTHINK) return; - if ((mobj->flags & MF_BOSS) && mobj->spawnpoint && (bossdisabled & (1<spawnpoint->extrainfo))) + if ((mobj->flags & MF_BOSS) && mobj->spawnpoint && (bossdisabled & (1<spawnpoint->args[0]))) return; // Remove dead target/tracer. @@ -10007,16 +10171,8 @@ void P_MobjThinker(mobj_t *mobj) tmfloorthing = tmhitthing = NULL; - // Sector special (2,8) allows ANY mobj to trigger a linedef exec - if (mobj->subsector && GETSECSPECIAL(mobj->subsector->sector->special, 2) == 8) - { - sector_t *sec2 = P_ThingOnSpecial3DFloor(mobj); - if (sec2 && GETSECSPECIAL(sec2->special, 2) == 1) - { - mtag_t tag = Tag_FGet(&sec2->tags); - P_LinedefExecute(tag, mobj, sec2); - } - } + // Sector flag MSF_TRIGGERLINE_MOBJ allows ANY mobj to trigger a linedef exec + P_CheckMobjTrigger(mobj, false); if (mobj->scale != mobj->destscale) P_MobjScaleThink(mobj); // Slowly scale up/down to reach your destscale. @@ -10047,13 +10203,13 @@ void P_MobjThinker(mobj_t *mobj) // Check for a Lua thinker first if (!mobj->player) { - if (LUAh_MobjThinker(mobj) || P_MobjWasRemoved(mobj)) + if (LUA_HookMobj(mobj, MOBJ_HOOK(MobjThinker)) || P_MobjWasRemoved(mobj)) return; } else if (!mobj->player->spectator) { // You cannot short-circuit the player thinker like you can other thinkers. - LUAh_MobjThinker(mobj); + LUA_HookMobj(mobj, MOBJ_HOOK(MobjThinker)); if (P_MobjWasRemoved(mobj)) return; } @@ -10088,8 +10244,10 @@ void P_MobjThinker(mobj_t *mobj) if (mobj->flags & MF_AMBIENT) { - if (!(leveltime % mobj->health) && mobj->info->seesound) - S_StartSound(mobj, mobj->info->seesound); + if (leveltime % mobj->health) + return; + if (mobj->threshold) + S_StartSound(mobj, mobj->threshold); return; } @@ -10231,28 +10389,10 @@ boolean P_RailThinker(mobj_t *mobj) // Unquick, unoptimized function for pushables void P_PushableThinker(mobj_t *mobj) { - sector_t *sec; - I_Assert(mobj != NULL); I_Assert(!P_MobjWasRemoved(mobj)); - sec = mobj->subsector->sector; - - if (GETSECSPECIAL(sec->special, 2) == 1 && mobj->z == sec->floorheight) - { - mtag_t tag = Tag_FGet(&sec->tags); - P_LinedefExecute(tag, mobj, sec); - } - -// else if (GETSECSPECIAL(sec->special, 2) == 8) - { - sector_t *sec2 = P_ThingOnSpecial3DFloor(mobj); - if (sec2 && GETSECSPECIAL(sec2->special, 2) == 1) - { - mtag_t tag = Tag_FGet(&sec2->tags); - P_LinedefExecute(tag, mobj, sec2); - } - } + P_CheckMobjTrigger(mobj, true); // it has to be pushable RIGHT NOW for this part to happen if (mobj->flags & MF_PUSHABLE && !(mobj->momx || mobj->momy)) @@ -10371,6 +10511,7 @@ static fixed_t P_DefaultMobjShadowScale (mobj_t *thing) switch (thing->type) { case MT_PLAYER: + case MT_METALSONIC_RACE: case MT_ROLLOUTROCK: case MT_EGGMOBILE4_MACE: @@ -10388,6 +10529,9 @@ static fixed_t P_DefaultMobjShadowScale (mobj_t *thing) case MT_RING: case MT_FLINGRING: + case MT_COIN: + case MT_FLINGCOIN: + case MT_BLUESPHERE: case MT_FLINGBLUESPHERE: case MT_BOMBSPHERE: @@ -10412,6 +10556,27 @@ static fixed_t P_DefaultMobjShadowScale (mobj_t *thing) return 2*FRACUNIT/3; + case MT_FLICKY_01: + case MT_FLICKY_02: + case MT_FLICKY_03: + case MT_FLICKY_04: + case MT_FLICKY_05: + case MT_FLICKY_06: + case MT_FLICKY_07: + case MT_FLICKY_08: + case MT_FLICKY_09: + case MT_FLICKY_10: + case MT_FLICKY_11: + case MT_FLICKY_12: + case MT_FLICKY_13: + case MT_FLICKY_14: + case MT_FLICKY_15: + case MT_FLICKY_16: + case MT_SECRETFLICKY_01: + case MT_SECRETFLICKY_02: + + return FRACUNIT; + default: if (thing->flags & (MF_ENEMY|MF_BOSS)) @@ -10429,7 +10594,24 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type) const mobjinfo_t *info = &mobjinfo[type]; SINT8 sc = -1; state_t *st; - mobj_t *mobj = Z_Calloc(sizeof (*mobj), PU_LEVEL, NULL); + mobj_t *mobj; + + if (type == MT_NULL) + { +#if 0 +#ifdef PARANOIA + I_Error("Tried to spawn MT_NULL\n"); +#endif + return NULL; +#endif + // Hack: Some code assumes that P_SpawnMobj can never return NULL + // So replace MT_NULL with MT_RAY in the meantime + // Remove when dealt properly + CONS_Debug(DBG_GAMELOGIC, "Tried to spawn MT_NULL, using MT_RAY\n"); + type = MT_RAY; + } + + mobj = Z_Calloc(sizeof (*mobj), PU_LEVEL, NULL); // this is officially a mobj, declared as soon as possible. mobj->thinker.function.acp1 = (actionf_p1)P_MobjThinker; @@ -10447,6 +10629,8 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type) mobj->reactiontime = info->reactiontime; + mobj->dispoffset = info->dispoffset; + mobj->lastlook = -1; // stuff moved in P_enemy.P_LookForPlayer // do not set the state with P_SetMobjState, @@ -10521,7 +10705,7 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type) // DANGER! This can cause P_SpawnMobj to return NULL! // Avoid using P_RemoveMobj on the newly created mobj in "MobjSpawn" Lua hooks! - if (LUAh_MobjSpawn(mobj)) + if (LUA_HookMobj(mobj, MOBJ_HOOK(MobjSpawn))) { if (P_MobjWasRemoved(mobj)) return NULL; @@ -10810,6 +10994,8 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type) if (CheckForReverseGravity && !(mobj->flags & MF_NOBLOCKMAP)) P_CheckGravity(mobj, false); + R_AddMobjInterpolator(mobj); + return mobj; } @@ -10852,11 +11038,13 @@ static precipmobj_t *P_SpawnPrecipMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype if (mobj->floorz != starting_floorz) mobj->precipflags |= PCF_FOF; - else if (GETSECSPECIAL(mobj->subsector->sector->special, 1) == 7 - || GETSECSPECIAL(mobj->subsector->sector->special, 1) == 6 + else if (mobj->subsector->sector->damagetype == SD_DEATHPITNOTILT + || mobj->subsector->sector->damagetype == SD_DEATHPITTILT || mobj->subsector->sector->floorpic == skyflatnum) mobj->precipflags |= PCF_PIT; + R_ResetPrecipitationMobjInterpolationState(mobj); + return mobj; } @@ -10908,7 +11096,7 @@ void P_RemoveMobj(mobj_t *mobj) return; // something already removing this mobj. mobj->thinker.function.acp1 = (actionf_p1)P_RemoveThinkerDelayed; // shh. no recursing. - LUAh_MobjRemoved(mobj); + LUA_HookMobj(mobj, MOBJ_HOOK(MobjRemoved)); mobj->thinker.function.acp1 = (actionf_p1)P_MobjThinker; // needed for P_UnsetThingPosition, etc. to work. // Rings only, please! @@ -10976,6 +11164,8 @@ void P_RemoveMobj(mobj_t *mobj) memset((UINT8 *)mobj + sizeof(thinker_t), 0xff, sizeof(mobj_t) - sizeof(thinker_t)); #endif + R_RemoveMobjInterpolator(mobj); + // free block if (!mobj->thinker.next) { // Uh-oh, the mobj doesn't think, P_RemoveThinker would never go through! @@ -11022,27 +11212,48 @@ void P_RemovePrecipMobj(precipmobj_t *mobj) void P_RemoveSavegameMobj(mobj_t *mobj) { // unlink from sector and block lists - P_UnsetThingPosition(mobj); - - // Remove touching_sectorlist from mobj. - if (sector_list) + if (((thinker_t *)mobj)->function.acp1 == (actionf_p1)P_NullPrecipThinker) { - P_DelSeclist(sector_list); - sector_list = NULL; + P_UnsetPrecipThingPosition((precipmobj_t *)mobj); + + if (precipsector_list) + { + P_DelPrecipSeclist(precipsector_list); + precipsector_list = NULL; + } + } + else + { + // unlink from sector and block lists + P_UnsetThingPosition(mobj); + + // Remove touching_sectorlist from mobj. + if (sector_list) + { + P_DelSeclist(sector_list); + sector_list = NULL; + } } // stop any playing sound S_StopSound(mobj); + R_RemoveMobjInterpolator(mobj); // free block - P_RemoveThinker((thinker_t *)mobj); + // Here we use the same code as R_RemoveThinkerDelayed, but without reference counting (we're removing everything so it shouldn't matter) and without touching currentthinker since we aren't in P_RunThinkers + { + thinker_t *thinker = (thinker_t *)mobj; + thinker_t *next = thinker->next; + (next->prev = thinker->prev)->next = next; + Z_Free(thinker); + } } static CV_PossibleValue_t respawnitemtime_cons_t[] = {{1, "MIN"}, {300, "MAX"}, {0, NULL}}; -consvar_t cv_itemrespawntime = CVAR_INIT ("respawnitemtime", "30", CV_SAVE|CV_NETVAR|CV_CHEAT, respawnitemtime_cons_t, NULL); -consvar_t cv_itemrespawn = CVAR_INIT ("respawnitem", "On", CV_SAVE|CV_NETVAR, CV_OnOff, NULL); +consvar_t cv_itemrespawntime = CVAR_INIT ("respawnitemtime", "30", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, respawnitemtime_cons_t, NULL); +consvar_t cv_itemrespawn = CVAR_INIT ("respawnitem", "On", CV_SAVE|CV_NETVAR|CV_ALLOWLUA, CV_OnOff, NULL); static CV_PossibleValue_t flagtime_cons_t[] = {{0, "MIN"}, {300, "MAX"}, {0, NULL}}; -consvar_t cv_flagtime = CVAR_INIT ("flagtime", "30", CV_SAVE|CV_NETVAR|CV_CHEAT, flagtime_cons_t, NULL); +consvar_t cv_flagtime = CVAR_INIT ("flagtime", "30", CV_SAVE|CV_NETVAR|CV_CHEAT|CV_ALLOWLUA, flagtime_cons_t, NULL); void P_SpawnPrecipitation(void) { @@ -11051,7 +11262,7 @@ void P_SpawnPrecipitation(void) subsector_t *precipsector = NULL; precipmobj_t *rainmo = NULL; - if (dedicated || !(cv_drawdist_precip.value) || curWeather == PRECIP_NONE) + if (dedicated || !(cv_drawdist_precip.value) || curWeather == PRECIP_NONE || curWeather == PRECIP_STORM_NORAIN) return; // Use the blockmap to narrow down our placing patterns @@ -11080,7 +11291,7 @@ void P_SpawnPrecipitation(void) if (curWeather == PRECIP_SNOW) { // Not in a sector with visible sky -- exception for NiGHTS. - if ((!(maptol & TOL_NIGHTS) && (precipsector->sector->ceilingpic != skyflatnum)) == !(precipsector->sector->flags & SF_INVERTPRECIP)) + if ((!(maptol & TOL_NIGHTS) && (precipsector->sector->ceilingpic != skyflatnum)) == !(precipsector->sector->flags & MSF_INVERTPRECIP)) continue; rainmo = P_SpawnSnowMobj(x, y, height, MT_SNOWFLAKE); @@ -11093,26 +11304,18 @@ void P_SpawnPrecipitation(void) else // everything else. { // Not in a sector with visible sky. - if ((precipsector->sector->ceilingpic != skyflatnum) == !(precipsector->sector->flags & SF_INVERTPRECIP)) + if ((precipsector->sector->ceilingpic != skyflatnum) == !(precipsector->sector->flags & MSF_INVERTPRECIP)) continue; rainmo = P_SpawnRainMobj(x, y, height, MT_RAIN); + if (curWeather == PRECIP_BLANK) + rainmo->precipflags |= PCF_INVISIBLE; } // Randomly assign a height, now that floorz is set. rainmo->z = M_RandomRange(rainmo->floorz>>FRACBITS, rainmo->ceilingz>>FRACBITS)<z << FRACBITS; - // Flagging a player's ambush will make them start on the ceiling + // Setting the spawnpoint's args[0] will make the player start on the ceiling // Objectflip inverts - if (!!(mthing->options & MTF_AMBUSH) ^ !!(mthing->options & MTF_OBJECTFLIP)) + if (!!(mthing->args[0]) ^ !!(mthing->options & MTF_OBJECTFLIP)) z = ceilingspawn - offset; else z = floor + offset; @@ -11519,7 +11722,7 @@ void P_MovePlayerToSpawn(INT32 playernum, mapthing_t *mthing) mobj->eflags |= MFE_VERTICALFLIP; mobj->flags2 |= MF2_OBJECTFLIP; } - if (mthing->options & MTF_AMBUSH) + if (mthing->args[0]) P_SetPlayerMobjState(mobj, S_PLAY_FALL); else if (metalrecording) P_SetPlayerMobjState(mobj, S_PLAY_WAIT); @@ -11633,11 +11836,6 @@ fixed_t P_GetMapThingSpawnHeight(const mobjtype_t mobjtype, const mapthing_t* mt switch (mobjtype) { - // Bumpers never spawn flipped. - case MT_NIGHTSBUMPER: - flip = false; - break; - // Objects with a non-zero default height. case MT_CRAWLACOMMANDER: case MT_DETON: @@ -11657,19 +11855,18 @@ fixed_t P_GetMapThingSpawnHeight(const mobjtype_t mobjtype, const mapthing_t* mt dz = 288*FRACUNIT; break; - // Horizontal springs, may float additional units with MTF_AMBUSH. + // Horizontal springs, float additional units unless args[0] is set. case MT_YELLOWHORIZ: case MT_REDHORIZ: case MT_BLUEHORIZ: - offset += mthing->options & MTF_AMBUSH ? 16*FRACUNIT : 0; + offset += mthing->args[0] ? 0 : 16*FRACUNIT; break; - // Ring-like items, may float additional units with MTF_AMBUSH. + // Ring-like items, float additional units unless args[0] is set. case MT_SPIKEBALL: case MT_EMERHUNT: case MT_EMERALDSPAWN: case MT_TOKEN: - case MT_EMBLEM: case MT_RING: case MT_REDTEAMRING: case MT_BLUETEAMRING: @@ -11678,13 +11875,17 @@ fixed_t P_GetMapThingSpawnHeight(const mobjtype_t mobjtype, const mapthing_t* mt case MT_BOMBSPHERE: case MT_NIGHTSCHIP: case MT_NIGHTSSTAR: - offset += mthing->options & MTF_AMBUSH ? 24*FRACUNIT : 0; + offset += mthing->args[0] ? 0 : 24*FRACUNIT; + break; + + case MT_EMBLEM: + offset += mthing->args[1] ? 0 : 24 * FRACUNIT; break; // Remaining objects. default: if (P_WeaponOrPanel(mobjtype)) - offset += mthing->options & MTF_AMBUSH ? 24*FRACUNIT : 0; + offset += mthing->args[0] ? 0 : 24*FRACUNIT; } if (!(dz + offset)) // Snap to the surfaces when there's no offset set. @@ -11746,8 +11947,8 @@ static boolean P_SpawnNonMobjMapThing(mapthing_t *mthing) return true; } else if (mthing->type == 750 // Slope vertex point (formerly chaos spawn) - || (mthing->type >= 600 && mthing->type <= 609) // Special placement patterns - || mthing->type == 1705 || mthing->type == 1713) // Hoops + || (mthing->type >= 600 && mthing->type <= 611) // Special placement patterns + || mthing->type == 1713) // Hoops return true; // These are handled elsewhere. else if (mthing->type == mobjinfo[MT_EMERHUNT].doomednum) { @@ -11791,7 +11992,7 @@ static boolean P_AllowMobjSpawn(mapthing_t* mthing, mobjtype_t i) runemeraldmanager = true; break; case MT_ROSY: - if (!(G_CoopGametype() || (mthing->options & MTF_EXTRA))) + if (!(G_CoopGametype() || mthing->args[0])) return false; // she doesn't hang out here if (!(netgame || multiplayer) && players[consoleplayer].skin == 3) @@ -11810,12 +12011,8 @@ static boolean P_AllowMobjSpawn(mapthing_t* mthing, mobjtype_t i) break; case MT_EMBLEM: - if (netgame || multiplayer) - return false; // Single player - - if (modifiedgame && !savemoddata) - return false; // No cheating!! - + if (!G_CoopGametype()) + return false; // Gametype's not right break; default: break; @@ -11915,7 +12112,7 @@ static mobjtype_t P_GetMobjtypeSubstitute(mapthing_t *mthing, mobjtype_t i) case 2: // Unchanging if (i == MT_MYSTERY_BOX) return MT_NULL; // don't spawn - mthing->options &= ~(MTF_AMBUSH|MTF_OBJECTSPECIAL); // no random respawning! + mthing->args[1] = TMMR_SAME; // no random respawning! return i; case 3: // Don't spawn return MT_NULL; @@ -11945,8 +12142,7 @@ static mobjtype_t P_GetMobjtypeSubstitute(mapthing_t *mthing, mobjtype_t i) if (modeattacking && i == MT_1UP_BOX) // 1UPs -->> Score TVs { - // Either or, doesn't matter which. - if (mthing->options & (MTF_AMBUSH | MTF_OBJECTSPECIAL)) + if (mthing->args[2]) return MT_SCORE10K_BOX; // 10,000 else return MT_SCORE1K_BOX; // 1,000 @@ -11960,11 +12156,10 @@ static boolean P_SetupEmblem(mapthing_t *mthing, mobj_t *mobj) INT32 j; emblem_t* emblem = M_GetLevelEmblems(gamemap); skincolornum_t emcolor; - boolean validEmblem = true; while (emblem) { - if ((emblem->type == ET_GLOBAL || emblem->type == ET_SKIN) && emblem->tag == mthing->angle) + if ((emblem->type == ET_GLOBAL || emblem->type == ET_SKIN) && emblem->tag == Tag_FGet(&mthing->tags)) break; emblem = M_GetLevelEmblems(-1); @@ -11972,7 +12167,7 @@ static boolean P_SetupEmblem(mapthing_t *mthing, mobj_t *mobj) if (!emblem) { - CONS_Debug(DBG_GAMELOGIC, "No map emblem for map %d with tag %d found!\n", gamemap, mthing->angle); + CONS_Debug(DBG_GAMELOGIC, "No map emblem for map %d with tag %d found!\n", gamemap, Tag_FGet(&mthing->tags)); return false; } @@ -11985,42 +12180,19 @@ static boolean P_SetupEmblem(mapthing_t *mthing, mobj_t *mobj) emcolor = M_GetEmblemColor(&emblemlocations[j]); // workaround for compiler complaint about bad function casting mobj->color = (UINT16)emcolor; - validEmblem = !emblemlocations[j].collected; + mobj->frame &= ~FF_TRANSMASK; - if (emblemlocations[j].type == ET_SKIN) + if (emblemlocations[j].type == ET_GLOBAL) { - INT32 skinnum = M_EmblemSkinNum(&emblemlocations[j]); - - if (players[0].skin != skinnum) + mobj->reactiontime = emblemlocations[j].var; + if (emblemlocations[j].var & GE_NIGHTSITEM) { - validEmblem = false; + mobj->flags |= MF_NIGHTSITEM; + mobj->flags &= ~MF_SPECIAL; + mobj->flags2 |= MF2_DONTDRAW; } } - if (validEmblem == false) - { - P_UnsetThingPosition(mobj); - mobj->flags |= MF_NOCLIP; - mobj->flags &= ~MF_SPECIAL; - mobj->flags |= MF_NOBLOCKMAP; - mobj->frame |= (tr_trans50 << FF_TRANSSHIFT); - P_SetThingPosition(mobj); - } - else - { - mobj->frame &= ~FF_TRANSMASK; - - if (emblemlocations[j].type == ET_GLOBAL) - { - mobj->reactiontime = emblemlocations[j].var; - if (emblemlocations[j].var & GE_NIGHTSITEM) - { - mobj->flags |= MF_NIGHTSITEM; - mobj->flags &= ~MF_SPECIAL; - mobj->flags2 |= MF2_DONTDRAW; - } - } - } return true; } @@ -12034,59 +12206,20 @@ static boolean P_SetupMace(mapthing_t *mthing, mobj_t *mobj, boolean *doangle) mobjflag_t mflagsapply; mobjflag2_t mflags2apply; mobjeflag_t meflagsapply; - INT32 line; const size_t mthingi = (size_t)(mthing - mapthings); - // Find the corresponding linedef special, using angle as tag - line = Tag_FindLineSpecial(9, mthing->angle); - - if (line == -1) - { - CONS_Debug(DBG_GAMELOGIC, "Mace chain (mapthing #%s) needs to be tagged to a #9 parameter line (trying to find tag %d).\n", sizeu1(mthingi), mthing->angle); - return false; - } - /* - mapthing - - MTF_AMBUSH : - MT_SPRINGBALLPOINT - upgrade from yellow to red spring - anything else - bigger mace/chain theory - MTF_OBJECTSPECIAL - force silent - MTF_GRAVFLIP - flips objects, doesn't affect chain arrangements - Parameter value : number of "spokes" - - linedef - - ML_NOCLIMB : - MT_CHAINPOINT/MT_CHAINMACEPOINT with ML_EFFECT1 applied - Direction not controllable - anything else - no functionality - ML_EFFECT1 : Swings instead of spins - ML_EFFECT2 : Linktype is replaced with macetype for all spokes not ending in chains (inverted for MT_FIREBARPOINT) - ML_EFFECT3 : Spawn a bonus linktype at the hinge point - ML_EFFECT4 : Don't clip inside the ground - ML_EFFECT5 : Don't stop thinking when too far away - */ - mlength = abs(lines[line].dx >> FRACBITS); - mspeed = abs(lines[line].dy >> (FRACBITS - 4)); - mphase = (sides[lines[line].sidenum[0]].textureoffset >> FRACBITS) % 360; - if ((mminlength = -sides[lines[line].sidenum[0]].rowoffset >> FRACBITS) < 0) - mminlength = 0; - else if (mminlength > mlength - 1) - mminlength = mlength - 1; - mpitch = (lines[line].frontsector->floorheight >> FRACBITS) % 360; - myaw = (lines[line].frontsector->ceilingheight >> FRACBITS) % 360; - - mnumspokes = mthing->extrainfo + 1; + mlength = abs(mthing->args[0]); + mnumspokes = mthing->args[1] + 1; mspokeangle = FixedAngle((360*FRACUNIT)/mnumspokes) >> ANGLETOFINESHIFT; - - if (lines[line].backsector) - { - mpinch = (lines[line].backsector->floorheight >> FRACBITS) % 360; - mroll = (lines[line].backsector->ceilingheight >> FRACBITS) % 360; - mnumnospokes = (sides[lines[line].sidenum[1]].textureoffset >> FRACBITS); - if ((mwidth = sides[lines[line].sidenum[1]].rowoffset >> FRACBITS) < 0) - mwidth = 0; - } - else - mpinch = mroll = mnumnospokes = mwidth = 0; + mwidth = max(0, mthing->args[2]); + mspeed = abs(mthing->args[3] << 4); + mphase = mthing->args[4] % 360; + mpinch = mthing->args[5] % 360; + mnumnospokes = mthing->args[6]; + mminlength = max(0, min(mlength - 1, mthing->args[7])); + mpitch = mthing->pitch % 360; + myaw = mthing->angle % 360; + mroll = mthing->roll % 360; CONS_Debug(DBG_GAMELOGIC, "Mace/Chain (mapthing #%s):\n" "Length is %d (minus %d)\n" @@ -12117,26 +12250,23 @@ static boolean P_SetupMace(mapthing_t *mthing, mobj_t *mobj, boolean *doangle) switch (mobj->type) { case MT_SPRINGBALLPOINT: - macetype = ((mthing->options & MTF_AMBUSH) + macetype = ((mthing->args[8] & TMM_DOUBLESIZE) ? MT_REDSPRINGBALL : MT_YELLOWSPRINGBALL); chainlink = MT_SMALLMACECHAIN; break; case MT_FIREBARPOINT: - macetype = ((mthing->options & MTF_AMBUSH) + macetype = ((mthing->args[8] & TMM_DOUBLESIZE) ? MT_BIGFIREBAR : MT_SMALLFIREBAR); chainlink = MT_NULL; break; case MT_CUSTOMMACEPOINT: - macetype = (mobjtype_t)sides[lines[line].sidenum[0]].toptexture; - if (lines[line].backsector) - chainlink = (mobjtype_t)sides[lines[line].sidenum[1]].toptexture; - else - chainlink = MT_NULL; + macetype = mthing->stringargs[0] ? get_number(mthing->stringargs[0]) : MT_NULL; + chainlink = mthing->stringargs[1] ? get_number(mthing->stringargs[1]) : MT_NULL; break; case MT_CHAINPOINT: - if (mthing->options & MTF_AMBUSH) + if (mthing->args[8] & TMM_DOUBLESIZE) { macetype = MT_BIGGRABCHAIN; chainlink = MT_BIGMACECHAIN; @@ -12149,7 +12279,7 @@ static boolean P_SetupMace(mapthing_t *mthing, mobj_t *mobj, boolean *doangle) mchainlike = true; break; default: - if (mthing->options & MTF_AMBUSH) + if (mthing->args[8] & TMM_DOUBLESIZE) { macetype = MT_BIGMACE; chainlink = MT_BIGMACECHAIN; @@ -12176,11 +12306,11 @@ static boolean P_SetupMace(mapthing_t *mthing, mobj_t *mobj, boolean *doangle) firsttype = macetype; // Adjustable direction - if (lines[line].flags & ML_NOCLIMB) + if (mthing->args[8] & TMM_ALLOWYAWCONTROL) mobj->flags |= MF_SLIDEME; // Swinging - if (lines[line].flags & ML_EFFECT1) + if (mthing->args[8] & TMM_SWING) { mobj->flags2 |= MF2_STRONGBOX; mmin = ((mnumnospokes > 1) ? 1 : 0); @@ -12189,11 +12319,11 @@ static boolean P_SetupMace(mapthing_t *mthing, mobj_t *mobj, boolean *doangle) mmin = mnumspokes; // If over distance away, don't move UNLESS this flag is applied - if (lines[line].flags & ML_EFFECT5) + if (mthing->args[8] & TMM_ALWAYSTHINK) mobj->flags2 |= MF2_BOSSNOTRAP; // Make the links the same type as the end - repeated below - if ((mobj->type != MT_CHAINPOINT) && (((lines[line].flags & ML_EFFECT2) == ML_EFFECT2) != (mobj->type == MT_FIREBARPOINT))) // exclusive or + if ((mobj->type != MT_CHAINPOINT) && (((mthing->args[8] & TMM_MACELINKS) == TMM_MACELINKS) != (mobj->type == MT_FIREBARPOINT))) // exclusive or { linktype = macetype; radiusfactor = 2; // Double the radius. @@ -12205,7 +12335,7 @@ static boolean P_SetupMace(mapthing_t *mthing, mobj_t *mobj, boolean *doangle) mchainlike = (firsttype == chainlink); widthfactor = (mchainlike ? 1 : 2); - mflagsapply = ((lines[line].flags & ML_EFFECT4) ? 0 : (MF_NOCLIP | MF_NOCLIPHEIGHT)); + mflagsapply = (mthing->args[8] & TMM_CLIP) ? 0 : (MF_NOCLIP|MF_NOCLIPHEIGHT); mflags2apply = ((mthing->options & MTF_OBJECTFLIP) ? MF2_OBJECTFLIP : 0); meflagsapply = ((mthing->options & MTF_OBJECTFLIP) ? MFE_VERTICALFLIP : 0); @@ -12231,14 +12361,14 @@ static boolean P_SetupMace(mapthing_t *mthing, mobj_t *mobj, boolean *doangle) hprev = spawnee;\ } - mdosound = (mspeed && !(mthing->options & MTF_OBJECTSPECIAL)); - mdocenter = (macetype && (lines[line].flags & ML_EFFECT3)); + mdosound = (mspeed && !(mthing->args[8] & TMM_SILENT)); + mdocenter = (macetype && (mthing->args[8] & TMM_CENTERLINK)); // The actual spawning of spokes while (mnumspokes-- > 0) { // Offsets - if (lines[line].flags & ML_EFFECT1) // Swinging + if (mthing->args[8] & TMM_SWING) // Swinging mroll = (mroll - mspokeangle) & FINEMASK; else // Spinning mphase = (mphase - mspokeangle) & FINEMASK; @@ -12249,7 +12379,7 @@ static boolean P_SetupMace(mapthing_t *mthing, mobj_t *mobj, boolean *doangle) continue; linktype = chainlink; - firsttype = ((mthing->options & MTF_AMBUSH) ? MT_BIGGRABCHAIN : MT_SMALLGRABCHAIN); + firsttype = ((mthing->args[8] & TMM_DOUBLESIZE) ? MT_BIGGRABCHAIN : MT_SMALLGRABCHAIN); mmaxlength = 1 + (mlength - 1) * radiusfactor; radiusfactor = widthfactor = 1; } @@ -12258,7 +12388,7 @@ static boolean P_SetupMace(mapthing_t *mthing, mobj_t *mobj, boolean *doangle) if (mobj->type == MT_CHAINMACEPOINT) { // Make the links the same type as the end - repeated above - if (lines[line].flags & ML_EFFECT2) + if (mthing->args[8] & TMM_MACELINKS) { linktype = macetype; radiusfactor = 2; @@ -12341,50 +12471,43 @@ static boolean P_SetupMace(mapthing_t *mthing, mobj_t *mobj, boolean *doangle) static boolean P_SetupParticleGen(mapthing_t *mthing, mobj_t *mobj) { - fixed_t radius, speed; + fixed_t radius, speed, zdist; INT32 type, numdivisions, anglespeed, ticcount; angle_t angledivision; INT32 line; const size_t mthingi = (size_t)(mthing - mapthings); - // Find the corresponding linedef special, using angle as tag - line = Tag_FindLineSpecial(15, mthing->angle); + // Find the corresponding linedef special, using args[6] as tag + line = mthing->args[6] ? Tag_FindLineSpecial(15, mthing->args[6]) : -1; - if (line == -1) - { - CONS_Debug(DBG_GAMELOGIC, "Particle generator (mapthing #%s) needs to be tagged to a #15 parameter line (trying to find tag %d).\n", sizeu1(mthingi), mthing->angle); - return false; - } + type = mthing->stringargs[0] ? get_number(mthing->stringargs[0]) : MT_PARTICLE; - if (sides[lines[line].sidenum[0]].toptexture) - type = sides[lines[line].sidenum[0]].toptexture; // Set as object type in p_setup.c... - else - type = (INT32)MT_PARTICLE; - - if (!lines[line].backsector - || (ticcount = (sides[lines[line].sidenum[1]].textureoffset >> FRACBITS)) < 1) + ticcount = mthing->args[4]; + if (ticcount < 1) ticcount = 3; - numdivisions = mthing->z; + numdivisions = mthing->args[0]; if (numdivisions) { - radius = R_PointToDist2(lines[line].v1->x, lines[line].v1->y, lines[line].v2->x, lines[line].v2->y); - anglespeed = (sides[lines[line].sidenum[0]].rowoffset >> FRACBITS) % 360; + radius = mthing->args[1] << FRACBITS; + anglespeed = (mthing->args[3]) % 360; angledivision = 360/numdivisions; } else { - numdivisions = 1; // Simple trick to make A_ParticleSpawn simpler. + numdivisions = 1; // Simple trick to make P_ParticleGenSceneryThink simpler. radius = 0; anglespeed = 0; angledivision = 0; } - speed = abs(sides[lines[line].sidenum[0]].textureoffset); + speed = abs(mthing->args[2]) << FRACBITS; if (mthing->options & MTF_OBJECTFLIP) speed *= -1; + zdist = abs(mthing->args[5]) << FRACBITS; + CONS_Debug(DBG_GAMELOGIC, "Particle Generator (mapthing #%s):\n" "Radius is %d\n" "Speed is %d\n" @@ -12392,9 +12515,14 @@ static boolean P_SetupParticleGen(mapthing_t *mthing, mobj_t *mobj) "Numdivisions is %d\n" "Angledivision is %d\n" "Type is %d\n" - "Tic seperation is %d\n", + "Tic separation is %d\n", sizeu1(mthingi), radius, speed, anglespeed, numdivisions, angledivision, type, ticcount); + if (line == -1) + CONS_Debug(DBG_GAMELOGIC, "Spawn Z is %d\nZ dist is %d\n", mobj->z, zdist); + else + CONS_Debug(DBG_GAMELOGIC, "Heights are taken from control sector\n"); + mobj->angle = 0; mobj->movefactor = speed; mobj->lastlook = numdivisions; @@ -12403,21 +12531,19 @@ static boolean P_SetupParticleGen(mapthing_t *mthing, mobj_t *mobj) mobj->friction = radius; mobj->threshold = type; mobj->reactiontime = ticcount; + mobj->extravalue1 = zdist; mobj->cvmem = line; mobj->watertop = mobj->waterbottom = 0; return true; } -static boolean P_SetupNiGHTSDrone(mapthing_t* mthing, mobj_t* mobj) +static boolean P_SetupNiGHTSDrone(mapthing_t *mthing, mobj_t *mobj) { boolean flip = mthing->options & MTF_OBJECTFLIP; - boolean topaligned = (mthing->options & MTF_OBJECTSPECIAL) && !(mthing->options & MTF_EXTRA); - boolean middlealigned = (mthing->options & MTF_EXTRA) && !(mthing->options & MTF_OBJECTSPECIAL); - boolean bottomoffsetted = !(mthing->options & MTF_OBJECTSPECIAL) && !(mthing->options & MTF_EXTRA); - - INT16 timelimit = mthing->angle & 0xFFF; - fixed_t hitboxradius = ((mthing->angle & 0xF000) >> 12)*32*FRACUNIT; - fixed_t hitboxheight = mthing->extrainfo*32*FRACUNIT; + INT16 timelimit = mthing->args[0]; + fixed_t hitboxheight = mthing->args[1] << FRACBITS; + fixed_t hitboxradius = mthing->args[2] << FRACBITS; + INT32 dronemanalignment = mthing->args[3]; fixed_t oldheight = mobj->height; fixed_t dronemanoffset, goaloffset, sparkleoffset, droneboxmandiff, dronemangoaldiff; @@ -12432,33 +12558,36 @@ static boolean P_SetupNiGHTSDrone(mapthing_t* mthing, mobj_t* mobj) else mobj->height = mobjinfo[MT_NIGHTSDRONE].height; + if (mthing->args[4]) + mobj->flags2 |= MF2_AMBUSH; //Kill player upon time up + droneboxmandiff = max(mobj->height - mobjinfo[MT_NIGHTSDRONE_MAN].height, 0); dronemangoaldiff = max(mobjinfo[MT_NIGHTSDRONE_MAN].height - mobjinfo[MT_NIGHTSDRONE_GOAL].height, 0); if (flip && mobj->height != oldheight) - P_TeleportMove(mobj, mobj->x, mobj->y, mobj->z - (mobj->height - oldheight)); + P_MoveOrigin(mobj, mobj->x, mobj->y, mobj->z - (mobj->height - oldheight)); if (!flip) { - if (topaligned) // Align droneman to top of hitbox + switch (dronemanalignment) { - dronemanoffset = droneboxmandiff; - goaloffset = dronemangoaldiff/2 + dronemanoffset; - } - else if (middlealigned) // Align droneman to center of hitbox - { - dronemanoffset = droneboxmandiff/2; - goaloffset = dronemangoaldiff/2 + dronemanoffset; - } - else if (bottomoffsetted) - { - dronemanoffset = 24*FRACUNIT; - goaloffset = dronemangoaldiff + dronemanoffset; - } - else - { - dronemanoffset = 0; - goaloffset = dronemangoaldiff/2 + dronemanoffset; + case TMDA_BOTTOMOFFSET: + default: + dronemanoffset = FixedMul(24*FRACUNIT, mobj->scale); + goaloffset = dronemangoaldiff + dronemanoffset; + break; + case TMDA_BOTTOM: + dronemanoffset = 0; + goaloffset = dronemangoaldiff/2 + dronemanoffset; + break; + case TMDA_MIDDLE: + dronemanoffset = droneboxmandiff/2; + goaloffset = dronemangoaldiff/2 + dronemanoffset; + break; + case TMDA_TOP: + dronemanoffset = droneboxmandiff; + goaloffset = dronemangoaldiff/2 + dronemanoffset; + break; } sparkleoffset = goaloffset - FixedMul(15*FRACUNIT, mobj->scale); @@ -12468,25 +12597,25 @@ static boolean P_SetupNiGHTSDrone(mapthing_t* mthing, mobj_t* mobj) mobj->eflags |= MFE_VERTICALFLIP; mobj->flags2 |= MF2_OBJECTFLIP; - if (topaligned) // Align droneman to top of hitbox + switch (dronemanalignment) { - dronemanoffset = 0; - goaloffset = dronemangoaldiff/2 + dronemanoffset; - } - else if (middlealigned) // Align droneman to center of hitbox - { - dronemanoffset = droneboxmandiff/2; - goaloffset = dronemangoaldiff/2 + dronemanoffset; - } - else if (bottomoffsetted) - { - dronemanoffset = droneboxmandiff - FixedMul(24*FRACUNIT, mobj->scale); - goaloffset = dronemangoaldiff + dronemanoffset; - } - else - { - dronemanoffset = droneboxmandiff; - goaloffset = dronemangoaldiff/2 + dronemanoffset; + case TMDA_BOTTOMOFFSET: + default: + dronemanoffset = droneboxmandiff - FixedMul(24*FRACUNIT, mobj->scale); + goaloffset = dronemangoaldiff + dronemanoffset; + break; + case TMDA_BOTTOM: + dronemanoffset = droneboxmandiff; + goaloffset = dronemangoaldiff/2 + dronemanoffset; + break; + case TMDA_MIDDLE: + dronemanoffset = droneboxmandiff/2; + goaloffset = dronemangoaldiff/2 + dronemanoffset; + break; + case TMDA_TOP: + dronemanoffset = 0; + goaloffset = dronemangoaldiff/2 + dronemanoffset; + break; } sparkleoffset = goaloffset + FixedMul(15*FRACUNIT, mobj->scale); @@ -12494,9 +12623,9 @@ static boolean P_SetupNiGHTSDrone(mapthing_t* mthing, mobj_t* mobj) // spawn visual elements { - mobj_t* goalpost = P_SpawnMobjFromMobj(mobj, 0, 0, goaloffset, MT_NIGHTSDRONE_GOAL); - mobj_t* sparkle = P_SpawnMobjFromMobj(mobj, 0, 0, sparkleoffset, MT_NIGHTSDRONE_SPARKLING); - mobj_t* droneman = P_SpawnMobjFromMobj(mobj, 0, 0, dronemanoffset, MT_NIGHTSDRONE_MAN); + mobj_t *goalpost = P_SpawnMobjFromMobj(mobj, 0, 0, goaloffset, MT_NIGHTSDRONE_GOAL); + mobj_t *sparkle = P_SpawnMobjFromMobj(mobj, 0, 0, sparkleoffset, MT_NIGHTSDRONE_SPARKLING); + mobj_t *droneman = P_SpawnMobjFromMobj(mobj, 0, 0, dronemanoffset, MT_NIGHTSDRONE_MAN); P_SetTarget(&mobj->target, goalpost); P_SetTarget(&goalpost->target, sparkle); @@ -12505,19 +12634,28 @@ static boolean P_SetupNiGHTSDrone(mapthing_t* mthing, mobj_t* mobj) // correct Z position if (flip) { - P_TeleportMove(goalpost, goalpost->x, goalpost->y, mobj->z + goaloffset); - P_TeleportMove(sparkle, sparkle->x, sparkle->y, mobj->z + sparkleoffset); - P_TeleportMove(droneman, droneman->x, droneman->y, mobj->z + dronemanoffset); + P_MoveOrigin(goalpost, goalpost->x, goalpost->y, mobj->z + goaloffset); + P_MoveOrigin(sparkle, sparkle->x, sparkle->y, mobj->z + sparkleoffset); + P_MoveOrigin(droneman, droneman->x, droneman->y, mobj->z + dronemanoffset); } // Remember position preference for later mobj->flags &= ~(MF_SLIDEME|MF_GRENADEBOUNCE); - if (topaligned) - mobj->flags |= MF_SLIDEME; - else if (middlealigned) - mobj->flags |= MF_GRENADEBOUNCE; - else if (!bottomoffsetted) - mobj->flags |= MF_SLIDEME|MF_GRENADEBOUNCE; + switch (dronemanalignment) + { + case TMDA_BOTTOMOFFSET: + default: + mobj->flags |= MF_SLIDEME|MF_GRENADEBOUNCE; + break; + case TMDA_BOTTOM: + break; + case TMDA_MIDDLE: + mobj->flags |= MF_GRENADEBOUNCE; + break; + case TMDA_TOP: + mobj->flags |= MF_SLIDEME; + break; + } // Remember old Z position and flags for correction detection goalpost->movefactor = mobj->z; @@ -12568,9 +12706,40 @@ static boolean P_SetupBooster(mapthing_t* mthing, mobj_t* mobj, boolean strong) return true; } +static mobj_t *P_MakeSoftwareCorona(mobj_t *mo, INT32 height) +{ + mobj_t *corona = P_SpawnMobjFromMobj(mo, 0, 0, height<sprite = SPR_FLAM; + corona->frame = (FF_FULLBRIGHT|FF_TRANS90|12); + corona->tics = -1; + return corona; +} + +static boolean P_MapAlreadyHasStarPost(mobj_t *mobj) +{ + thinker_t *th; + mobj_t *mo2; + + for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next) + { + if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed) + continue; + + mo2 = (mobj_t *)th; + + if (mo2 == mobj) + continue; + + if (mo2->type == MT_STARPOST && mo2->health == mobj->health) + return true; + } + + return false; +} + static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean *doangle) { - boolean override = LUAh_MapThingSpawn(mobj, mthing); + boolean override = LUA_HookMapThingSpawn(mobj, mthing); if (P_MobjWasRemoved(mobj)) return false; @@ -12595,24 +12764,32 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean break; } - if (mthing->options & MTF_OBJECTSPECIAL) + if (mthing->args[0]) skyboxcenterpnts[tag] = mobj; else skyboxviewpnts[tag] = mobj; break; } case MT_EGGSTATUE: - if (mthing->options & MTF_EXTRA) + if (mthing->args[1]) { mobj->color = SKINCOLOR_GOLD; mobj->colorized = true; } break; + case MT_EGGMOBILE2: + if (!mthing->args[5]) + mobj->flags2 |= MF2_AMBUSH; + break; case MT_EGGMOBILE3: - mobj->cusval = mthing->extrainfo; + mobj->cusval = mthing->args[0]; + break; + case MT_BUBBLES: + if (mthing->args[0]) + mobj->flags2 |= MF2_AMBUSH; break; case MT_FAN: - if (mthing->options & MTF_OBJECTSPECIAL) + if (mthing->args[1] & TMF_INVISIBLE) { P_UnsetThingPosition(mobj); if (sector_list) @@ -12623,16 +12800,34 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean mobj->flags |= MF_NOSECTOR; // this flag basically turns it invisible P_SetThingPosition(mobj); } - if (mthing->angle) - mobj->health = mthing->angle; + if (mthing->args[1] & TMF_NODISTANCECHECK) + mobj->flags2 |= MF2_AMBUSH; + if (mthing->args[0]) + mobj->health = mthing->args[0]; else mobj->health = FixedMul(mobj->subsector->sector->ceilingheight - mobj->subsector->sector->floorheight, 3*(FRACUNIT/4)) >> FRACBITS; break; - case MT_METALSONIC_RACE: - case MT_METALSONIC_BATTLE: case MT_FANG: + if (mthing->args[5] & TMF_GRAYSCALE) + { + mobj->color = SKINCOLOR_SILVER; + mobj->colorized = true; + mobj->flags2 |= MF2_SLIDEPUSH; + } + if (mthing->args[5] & TMF_SKIPINTRO) + mobj->flags2 |= MF2_AMBUSH; + break; + case MT_METALSONIC_BATTLE: + if (mthing->args[5]) + { + mobj->color = SKINCOLOR_SILVER; + mobj->colorized = true; + mobj->flags2 |= MF2_SLIDEPUSH; + } + break; + case MT_METALSONIC_RACE: case MT_ROSY: - if (mthing->options & MTF_EXTRA) + if (mthing->args[0]) { mobj->color = SKINCOLOR_SILVER; mobj->colorized = true; @@ -12640,33 +12835,28 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean } break; case MT_BALLOON: - if (mthing->angle > 0) - mobj->color = ((mthing->angle - 1) % (numskincolors - 1)) + 1; + if (mthing->stringargs[0]) + mobj->color = get_number(mthing->stringargs[0]); + if (mthing->args[0]) + mobj->flags2 |= MF2_AMBUSH; break; -#define makesoftwarecorona(mo, h) \ - corona = P_SpawnMobjFromMobj(mo, 0, 0, h<sprite = SPR_FLAM;\ - corona->frame = (FF_FULLBRIGHT|FF_TRANS90|12);\ - corona->tics = -1 case MT_FLAME: - if (mthing->options & MTF_EXTRA) + if (mthing->args[0]) { - mobj_t *corona; - makesoftwarecorona(mobj, 20); + mobj_t *corona = P_MakeSoftwareCorona(mobj, 20); P_SetScale(corona, (corona->destscale = mobj->scale*3)); P_SetTarget(&mobj->tracer, corona); } break; case MT_FLAMEHOLDER: - if (!(mthing->options & MTF_OBJECTSPECIAL)) // Spawn the fire + if (!(mthing->args[0] & TMFH_NOFLAME)) // Spawn the fire { mobj_t *flame = P_SpawnMobjFromMobj(mobj, 0, 0, mobj->height, MT_FLAME); P_SetTarget(&flame->target, mobj); flame->flags2 |= MF2_BOSSNOTRAP; - if (mthing->options & MTF_EXTRA) + if (mthing->args[0] & TMFH_CORONA) { - mobj_t *corona; - makesoftwarecorona(flame, 20); + mobj_t *corona = P_MakeSoftwareCorona(flame, 20); P_SetScale(corona, (corona->destscale = flame->scale*3)); P_SetTarget(&flame->tracer, corona); } @@ -12674,17 +12864,13 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean break; case MT_CANDLE: case MT_CANDLEPRICKET: - if (mthing->options & MTF_EXTRA) - { - mobj_t *corona; - makesoftwarecorona(mobj, ((mobj->type == MT_CANDLE) ? 42 : 176)); - } + if (mthing->args[0]) + P_MakeSoftwareCorona(mobj, ((mobj->type == MT_CANDLE) ? 42 : 176)); break; -#undef makesoftwarecorona case MT_JACKO1: case MT_JACKO2: case MT_JACKO3: - if (!(mthing->options & MTF_EXTRA)) // take the torch out of the crafting recipe + if (!(mthing->args[0])) // take the torch out of the crafting recipe { mobj_t *overlay = P_SpawnMobjFromMobj(mobj, 0, 0, 0, MT_OVERLAY); P_SetTarget(&overlay->target, mobj); @@ -12692,17 +12878,15 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean } break; case MT_WATERDRIP: - mobj->tics = 3*TICRATE + mthing->angle; + mobj->tics = 3*TICRATE + mthing->args[0]; break; case MT_FLAMEJET: case MT_VERTICALFLAMEJET: - mobj->threshold = (mthing->angle >> 10) & 7; - mobj->movecount = (mthing->angle >> 13); - - mobj->threshold *= (TICRATE/2); - mobj->movecount *= (TICRATE/2); - - mobj->movedir = mthing->extrainfo; + mobj->movecount = mthing->args[0]; + mobj->threshold = mthing->args[1]; + mobj->movedir = mthing->args[2]; + if (mthing->args[3]) + mobj->flags2 |= MF2_AMBUSH; break; case MT_MACEPOINT: case MT_CHAINMACEPOINT: @@ -12717,60 +12901,50 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean if (!P_SetupParticleGen(mthing, mobj)) return false; break; - case MT_ROCKSPAWNER: - mobj->threshold = mthing->angle; - mobj->movecount = mthing->extrainfo; - break; case MT_POPUPTURRET: - if (mthing->angle) - mobj->threshold = mthing->angle; - else - mobj->threshold = (TICRATE*2)-1; + mobj->threshold = mthing->args[0] ? mthing->args[0] : (TICRATE*2)-1; break; case MT_NIGHTSBUMPER: - // Lower 4 bits specify the angle of - // the bumper in 30 degree increments. - mobj->threshold = (mthing->options & 15) % 12; // It loops over, etc + // Pitch of the bumper is set in 30 degree increments. + mobj->threshold = ((mthing->pitch/30) + 3) % 12; P_SetMobjState(mobj, mobj->info->spawnstate + mobj->threshold); break; case MT_EGGCAPSULE: - if (mthing->angle <= 0) - mthing->angle = 20; // prevent 0 health - - mobj->health = mthing->angle; - mobj->threshold = min(mthing->extrainfo, 7); + mobj->threshold = min(mthing->args[0], 7); + mobj->health = mthing->args[1]; + if (mobj->health <= 0) + mobj->health = 20; // prevent 0 health break; case MT_TUBEWAYPOINT: { - UINT8 sequence = mthing->angle >> 8; - UINT8 id = mthing->angle & 255; + UINT8 sequence = mthing->args[0]; + UINT8 id = mthing->args[1]; mobj->health = id; mobj->threshold = sequence; P_AddWaypoint(sequence, id, mobj); break; } case MT_IDEYAANCHOR: - mobj->health = mthing->extrainfo; + mobj->health = mthing->args[0]; break; case MT_NIGHTSDRONE: if (!P_SetupNiGHTSDrone(mthing, mobj)) return false; break; case MT_HIVEELEMENTAL: - if (mthing->extrainfo) - mobj->extravalue1 = mthing->extrainfo; + if (mthing->args[0]) + mobj->extravalue1 = mthing->args[0]; break; case MT_GLAREGOYLE: case MT_GLAREGOYLEUP: case MT_GLAREGOYLEDOWN: case MT_GLAREGOYLELONG: - if (mthing->angle >= 360) - mobj->tics += 7*(mthing->angle/360) + 1; // starting delay + mobj->tics += mthing->args[1]; // starting delay break; case MT_DSZSTALAGMITE: case MT_DSZ2STALAGMITE: case MT_KELP: - if (mthing->options & MTF_OBJECTSPECIAL) { // make mobj twice as big as normal + if (mthing->args[0]) { // make mobj twice as big as normal P_SetScale(mobj, 2*mobj->scale); // not 2*FRACUNIT in case of something like the old ERZ3 mode mobj->destscale = mobj->scale; } @@ -12783,6 +12957,25 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean P_SpawnMobjFromMobj(mobj, -FRACUNIT, 0, 0, MT_THZTREEBRANCH)->angle = mobjangle + ANGLE_270; } break; + case MT_TUTORIALPLANT: + { + INT32 i; + mobj_t *segment; + for (i = 0; i < 6; i++) + { + segment = P_SpawnMobjFromMobj(mobj, 0, 0, 0, MT_TUTORIALLEAF); + segment->angle = mobj->angle + FixedAngle(i*60*FRACUNIT); + P_SetMobjState(segment, S_TUTORIALLEAF1 + mthing->args[0]); + } + for (i = 0; i < 3; i++) + { + segment = P_SpawnMobjFromMobj(mobj, 0, 0, 112*FRACUNIT, MT_TUTORIALFLOWER); + segment->angle = mobj->angle + FixedAngle(i*120*FRACUNIT); + P_SetMobjState(segment, S_TUTORIALFLOWER1 + mthing->args[0]); + } + P_SetMobjState(P_SpawnMobjFromMobj(mobj, 0, 0, 112*FRACUNIT, MT_TUTORIALFLOWERF), S_TUTORIALFLOWERF1 + mthing->args[0]); + } + break; case MT_CEZPOLE1: case MT_CEZPOLE2: { // Spawn the banner @@ -12810,20 +13003,20 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean } break; case MT_SMASHINGSPIKEBALL: - if (mthing->angle > 0) - mobj->tics += mthing->angle; + if (mthing->args[0] > 0) + mobj->tics += mthing->args[0]; break; case MT_LAVAFALL: - mobj->fuse = 30 + mthing->angle; - if (mthing->options & MTF_AMBUSH) + mobj->fuse = 30 + mthing->args[0]; + if (mthing->args[1]) { P_SetScale(mobj, 2*mobj->scale); mobj->destscale = mobj->scale; } break; case MT_PYREFLY: - //start on fire if Ambush flag is set, otherwise behave normally - if (mthing->options & MTF_AMBUSH) + //start on fire if args[0], otherwise behave normally + if (mthing->args[0]) { P_SetMobjState(mobj, mobj->info->meleestate); mobj->extravalue2 = 2; @@ -12851,20 +13044,19 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean return false; break; case MT_AXIS: - // Inverted if uppermost bit is set - if (mthing->angle & 16384) + // Inverted if args[3] is set + if (mthing->args[3]) mobj->flags2 |= MF2_AMBUSH; - if (mthing->angle > 0) - mobj->radius = (mthing->angle & 16383) << FRACBITS; + mobj->radius = abs(mthing->args[2]) << FRACBITS; // FALLTHRU case MT_AXISTRANSFER: case MT_AXISTRANSFERLINE: // Mare it belongs to - mobj->threshold = min(mthing->extrainfo, 7); + mobj->threshold = min(mthing->args[0], 7); // # in the mare - mobj->health = mthing->options; + mobj->health = mthing->args[1]; mobj->flags2 |= MF2_AXIS; break; @@ -12874,7 +13066,7 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean mobj->health = 1 << (tokenbits - 1); break; case MT_CYBRAKDEMON: - if (mthing->options & MTF_AMBUSH) + if (mthing->args[6] & TMB_BARRIER) { mobj_t* elecmobj; elecmobj = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_CYBRAKDEMON_ELECTRIC_BARRIER); @@ -12885,54 +13077,21 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean } break; case MT_STARPOST: - { - thinker_t* th; - mobj_t* mo2; - boolean foundanother = false; - - if (mthing->extrainfo) - // Allow thing Parameter to define star post num too! - // For starposts above param 15 (the 16th), add 360 to the angle like before and start parameter from 1 (NOT 0)! - // So the 16th starpost is angle=0 param=15, the 17th would be angle=360 param=1. - // This seems more intuitive for mappers to use until UDMF is ready, since most SP maps won't have over 16 consecutive star posts. - mobj->health = mthing->extrainfo + (mthing->angle/360)*15 + 1; - else - // Old behavior if Parameter is 0; add 360 to the angle for each consecutive star post. - mobj->health = (mthing->angle/360) + 1; - - // See if other starposts exist in this level that have the same value. - for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next) - { - if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed) - continue; - - mo2 = (mobj_t*)th; - - if (mo2 == mobj) - continue; - - if (mo2->type == MT_STARPOST && mo2->health == mobj->health) - { - foundanother = true; - break; - } - } - - if (!foundanother) + mobj->health = mthing->args[0] + 1; + if (!P_MapAlreadyHasStarPost(mobj)) numstarposts++; break; - } case MT_SPIKE: // Pop up spikes! - if (mthing->options & MTF_OBJECTSPECIAL) + if (mthing->args[0]) { mobj->flags &= ~MF_SCENERY; - mobj->fuse = (16 - mthing->extrainfo)*(mthing->angle + mobj->info->speed)/16; - if (mthing->options & MTF_EXTRA) - P_SetMobjState(mobj, mobj->info->meleestate); + mobj->fuse = mthing->args[1]; } - // Use per-thing collision for spikes if the deaf flag isn't checked. - if (!(mthing->options & MTF_AMBUSH) && !metalrecording) + if (mthing->args[2] & TMSF_RETRACTED) + P_SetMobjState(mobj, mobj->info->meleestate); + // Use per-thing collision for spikes unless the intangible flag is checked. + if (!(mthing->args[2] & TMSF_INTANGIBLE) && !metalrecording) { P_UnsetThingPosition(mobj); mobj->flags &= ~(MF_NOBLOCKMAP|MF_NOGRAVITY|MF_NOCLIPHEIGHT); @@ -12942,22 +13101,21 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean break; case MT_WALLSPIKE: // Pop up spikes! - if (mthing->options & MTF_OBJECTSPECIAL) + if (mthing->args[0]) { mobj->flags &= ~MF_SCENERY; - mobj->fuse = (16 - mthing->extrainfo)*((mthing->angle/360) + mobj->info->speed)/16; - if (mthing->options & MTF_EXTRA) - P_SetMobjState(mobj, mobj->info->meleestate); + mobj->fuse = mthing->args[1]; } - // Use per-thing collision for spikes if the deaf flag isn't checked. - if (!(mthing->options & MTF_AMBUSH) && !metalrecording) + if (mthing->args[2] & TMSF_RETRACTED) + P_SetMobjState(mobj, mobj->info->meleestate); + // Use per-thing collision for spikes unless the intangible flag is checked. + if (!(mthing->args[2] & TMSF_INTANGIBLE) && !metalrecording) { P_UnsetThingPosition(mobj); mobj->flags &= ~(MF_NOBLOCKMAP | MF_NOCLIPHEIGHT); mobj->flags |= MF_SOLID; P_SetThingPosition(mobj); } - // spawn base { const angle_t mobjangle = FixedAngle(mthing->angle << FRACBITS); // the mobj's own angle hasn't been set quite yet so... @@ -12980,12 +13138,13 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean break; case MT_BIGTUMBLEWEED: case MT_LITTLETUMBLEWEED: - if (mthing->options & MTF_AMBUSH) + if (mthing->args[0]) { fixed_t offset = FixedMul(16*FRACUNIT, mobj->scale); mobj->momx += P_RandomChance(FRACUNIT/2) ? offset : -offset; mobj->momy += P_RandomChance(FRACUNIT/2) ? offset : -offset; mobj->momz += offset; + mobj->flags2 |= MF2_AMBUSH; } break; case MT_REDFLAG: @@ -12996,87 +13155,142 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean blueflag = mobj; bflagpoint = mobj->spawnpoint; break; - case MT_PUSH: - case MT_PULL: - mobj->health = 0; // Default behaviour: pushing uses XY, fading uses XYZ - - if (mthing->options & MTF_AMBUSH) - mobj->health |= 1; // If ambush is set, push using XYZ - if (mthing->options & MTF_OBJECTSPECIAL) - mobj->health |= 2; // If object special is set, fade using XY - - if (G_IsSpecialStage(gamemap)) - P_SetMobjState(mobj, (mobj->type == MT_PUSH) ? S_GRAVWELLGREEN : S_GRAVWELLRED); - break; case MT_NIGHTSSTAR: if (maptol & TOL_XMAS) P_SetMobjState(mobj, mobj->info->seestate); break; + case MT_YELLOWDIAG: + case MT_REDDIAG: + case MT_BLUEDIAG: + mobj->angle = FixedAngle(mthing->angle << FRACBITS); + if (mthing->args[0] & TMDS_NOGRAVITY) + mobj->flags |= MF_NOGRAVITY; + if (mthing->args[0] & TMDS_ROTATEEXTRA) + mobj->angle += ANGLE_22h; + *doangle = false; + break; + case MT_AMBIENT: + if (mthing->stringargs[0]) + mobj->threshold = get_number(mthing->stringargs[0]); + mobj->health = mthing->args[0] ? mthing->args[0] : TICRATE; + break; + case MT_GOLDBUZZ: + case MT_REDBUZZ: + case MT_JETTBOMBER: + case MT_JETTGUNNER: + case MT_ROBOHOOD: + case MT_CRUSHSTACEAN: + case MT_BANPYURA: + case MT_BUMBLEBORE: + case MT_CACOLANTERN: + case MT_PIAN: + if (mthing->args[0]) + mobj->flags2 |= MF2_AMBUSH; + break; + case MT_EGGGUARD: + if (mthing->args[1]) + mobj->flags2 |= MF2_AMBUSH; + break; + case MT_STEAM: + if (mthing->args[0]) + mobj->flags2 |= MF2_AMBUSH; + break; + case MT_SALOONDOORCENTER: + if (mthing->args[0]) + mobj->flags2 |= MF2_AMBUSH; + break; + case MT_MINECARTSWITCHPOINT: + if (mthing->args[0]) + mobj->flags2 |= MF2_AMBUSH; + break; + case MT_ROLLOUTSPAWN: + if (mthing->args[0]) + mobj->flags2 |= MF2_AMBUSH; + break; default: break; } if (mobj->flags & MF_BOSS) { - if (mthing->options & MTF_OBJECTSPECIAL) // No egg trap for this boss + if (mthing->args[1]) // No egg trap for this boss mobj->flags2 |= MF2_BOSSNOTRAP; } + if (mobj->flags & MF_NIGHTSITEM) + { + // Requires you to be in bonus time to activate + if (mthing->args[0] & TMNI_BONUSONLY) + mobj->flags2 |= MF2_STRONGBOX; + // Spawn already displayed + if (mthing->args[0] & TMNI_REVEAL) + { + mobj->flags |= MF_SPECIAL; + mobj->flags &= ~MF_NIGHTSITEM; + } + } + if (mobj->flags & MF_PUSHABLE) + { + switch (mthing->args[0]) + { + case TMP_NORMAL: + default: + break; + case TMP_SLIDE: + mobj->flags2 |= MF2_SLIDEPUSH; + mobj->flags |= MF_BOUNCE; + break; + case TMP_IMMOVABLE: + mobj->flags &= ~MF_PUSHABLE; + break; + case TMP_CLASSIC: + mobj->flags2 |= MF2_CLASSICPUSH; + break; + } + } + if (mobj->flags & MF_SPRING && mobj->info->painchance == 3) + { + if (mthing->args[0]) + mobj->flags2 |= MF2_AMBUSH; + } + if ((mobj->flags & MF_MONITOR) && mobj->info->speed != 0) + { + switch (mthing->args[1]) + { + case TMMR_SAME: + default: + break; + case TMMR_WEAK: + mobj->flags2 |= MF2_AMBUSH; + break; + case TMMR_STRONG: + mobj->flags2 |= MF2_STRONGBOX; + } + } + // Custom ambient sounds + if ((mobj->flags & MF_AMBIENT) && mobj->type != MT_AMBIENT) + { + mobj->threshold = mobj->info->seesound; + mobj->health = mobj->info->spawnhealth; + } return true; } -static void P_SetAmbush(mobj_t *mobj) +// Pre-UDMF backwards compatibility stuff. Remove for 2.3 +static void P_SetAmbush(mapthing_t *mthing, mobj_t *mobj) { - if (mobj->type == MT_YELLOWDIAG || mobj->type == MT_REDDIAG || mobj->type == MT_BLUEDIAG) - mobj->angle += ANGLE_22h; + if (mobj->type == MT_NIGHTSBUMPER + || mobj->type == MT_AXIS + || mobj->type == MT_AXISTRANSFER + || mobj->type == MT_AXISTRANSFERLINE + || mobj->type == MT_NIGHTSBUMPER + || mobj->type == MT_STARPOST) + return; - if (mobj->flags & MF_NIGHTSITEM) - { - // Spawn already displayed - mobj->flags |= MF_SPECIAL; - mobj->flags &= ~MF_NIGHTSITEM; - } + if ((mthing->options & MTF_OBJECTSPECIAL) && (mobj->flags & MF_PUSHABLE)) + return; - if (mobj->flags & MF_PUSHABLE) - mobj->flags &= ~MF_PUSHABLE; - - if ((mobj->flags & MF_MONITOR) && mobj->info->speed != 0) - { - // flag for strong/weak random boxes - // any monitor with nonzero speed is allowed to respawn like this - mobj->flags2 |= MF2_AMBUSH; - } - - else if (mobj->type != MT_AXIS && - mobj->type != MT_AXISTRANSFER && - mobj->type != MT_AXISTRANSFERLINE && - mobj->type != MT_NIGHTSBUMPER && - mobj->type != MT_STARPOST) - mobj->flags2 |= MF2_AMBUSH; -} - -static void P_SetObjectSpecial(mobj_t *mobj) -{ - if (mobj->type == MT_YELLOWDIAG || mobj->type == MT_REDDIAG || mobj->type == MT_BLUEDIAG) - mobj->flags |= MF_NOGRAVITY; - - if ((mobj->flags & MF_MONITOR) && mobj->info->speed != 0) - { - // flag for strong/weak random boxes - // any monitor with nonzero speed is allowed to respawn like this - mobj->flags2 |= MF2_STRONGBOX; - } - - // Requires you to be in bonus time to activate - if (mobj->flags & MF_NIGHTSITEM) - mobj->flags2 |= MF2_STRONGBOX; - - // Pushables bounce and slide coolly with object special flag set - if (mobj->flags & MF_PUSHABLE) - { - mobj->flags2 |= MF2_SLIDEPUSH; - mobj->flags |= MF_BOUNCE; - } + mobj->flags2 |= MF2_AMBUSH; } static mobj_t *P_SpawnMobjFromMapThing(mapthing_t *mthing, fixed_t x, fixed_t y, fixed_t z, mobjtype_t i) @@ -13101,22 +13315,8 @@ static mobj_t *P_SpawnMobjFromMapThing(mapthing_t *mthing, fixed_t x, fixed_t y, mthing->mobj = mobj; - // ignore MTF_ flags and return early - if (i == MT_NIGHTSBUMPER) - return mobj; - - if ((mthing->options & MTF_AMBUSH) - && (mthing->options & MTF_OBJECTSPECIAL) - && (mobj->flags & MF_PUSHABLE)) - mobj->flags2 |= MF2_CLASSICPUSH; - else - { - if (mthing->options & MTF_AMBUSH) - P_SetAmbush(mobj); - - if (mthing->options & MTF_OBJECTSPECIAL) - P_SetObjectSpecial(mobj); - } + if (!udmf && (mthing->options & MTF_AMBUSH)) + P_SetAmbush(mthing, mobj); // Generic reverse gravity for individual objects flag. if (mthing->options & MTF_OBJECTFLIP) @@ -13125,16 +13325,6 @@ static mobj_t *P_SpawnMobjFromMapThing(mapthing_t *mthing, fixed_t x, fixed_t y, mobj->flags2 |= MF2_OBJECTFLIP; } - // Extra functionality - if (mthing->options & MTF_EXTRA) - { - if (mobj->flags & MF_MONITOR && (mthing->angle & 16384)) - { - // Store line exec tag to run upon popping - mobj->lastlook = (mthing->angle & 16383); - } - } - // Final set of not being able to draw nightsitems. if (mobj->flags & MF_NIGHTSITEM) mobj->flags2 |= MF2_DONTDRAW; @@ -13183,16 +13373,21 @@ mobj_t *P_SpawnMapThing(mapthing_t *mthing) return P_SpawnMobjFromMapThing(mthing, x, y, z, i); } -static void P_SpawnHoopInternal(mapthing_t *mthing, INT32 hoopsize, fixed_t sizefactor) +void P_SpawnHoop(mapthing_t *mthing) { + if (metalrecording) + return; + mobj_t *mobj = NULL; mobj_t *nextmobj = NULL; mobj_t *hoopcenter; - TMatrix *pitchmatrix, *yawmatrix; - fixed_t radius = hoopsize*sizefactor; + matrix_t pitchmatrix, yawmatrix; + fixed_t radius = mthing->args[0] << FRACBITS; + fixed_t sizefactor = 4*FRACUNIT; + fixed_t hoopsize = radius/sizefactor; INT32 i; angle_t fa; - TVector v, *res; + vector4_t v, res; fixed_t x = mthing->x << FRACBITS; fixed_t y = mthing->y << FRACBITS; fixed_t z = P_GetMobjSpawnHeight(MT_HOOP, x, y, mthing->z << FRACBITS, 0, false, mthing->scale); @@ -13206,11 +13401,10 @@ static void P_SpawnHoopInternal(mapthing_t *mthing, INT32 hoopsize, fixed_t size hoopcenter->y = y; P_SetThingPosition(hoopcenter); - // Scale 0-255 to 0-359 =( - hoopcenter->movedir = ((mthing->angle & 255)*360)/256; // Pitch - pitchmatrix = RotateXMatrix(FixedAngle(hoopcenter->movedir << FRACBITS)); - hoopcenter->movecount = (((UINT16)mthing->angle >> 8)*360)/256; // Yaw - yawmatrix = RotateZMatrix(FixedAngle(hoopcenter->movecount << FRACBITS)); + hoopcenter->movedir = mthing->pitch; + FM_RotateX(&pitchmatrix, FixedAngle(hoopcenter->movedir << FRACBITS)); + hoopcenter->movecount = mthing->angle; + FM_RotateZ(&yawmatrix, FixedAngle(hoopcenter->movecount << FRACBITS)); // For the hoop when it flies away hoopcenter->extravalue1 = hoopsize; @@ -13220,17 +13414,15 @@ static void P_SpawnHoopInternal(mapthing_t *mthing, INT32 hoopsize, fixed_t size for (i = 0; i < hoopsize; i++) { fa = i*(FINEANGLES/hoopsize); - v[0] = FixedMul(FINECOSINE(fa), radius); - v[1] = 0; - v[2] = FixedMul(FINESINE(fa), radius); - v[3] = FRACUNIT; + v.x = FixedMul(FINECOSINE(fa), radius); + v.y = 0; + v.z = FixedMul(FINESINE(fa), radius); + v.a = FRACUNIT; - res = VectorMatrixMultiply(v, *pitchmatrix); - M_Memcpy(&v, res, sizeof(v)); - res = VectorMatrixMultiply(v, *yawmatrix); - M_Memcpy(&v, res, sizeof(v)); + FV4_Copy(&v, FM_MultMatrixVec4(&pitchmatrix, &v, &res)); + FV4_Copy(&v, FM_MultMatrixVec4(&yawmatrix, &v, &res)); - mobj = P_SpawnMobj(x + v[0], y + v[1], z + v[2], MT_HOOP); + mobj = P_SpawnMobj(x + v.x, y + v.y, z + v.z, MT_HOOP); mobj->z -= mobj->height/2; if (maptol & TOL_XMAS) @@ -13266,17 +13458,15 @@ static void P_SpawnHoopInternal(mapthing_t *mthing, INT32 hoopsize, fixed_t size for (i = 0; i < hoopsize; i++) { fa = i*(FINEANGLES/hoopsize); - v[0] = FixedMul(FINECOSINE(fa), radius); - v[1] = 0; - v[2] = FixedMul(FINESINE(fa), radius); - v[3] = FRACUNIT; + v.x = FixedMul(FINECOSINE(fa), radius); + v.y = 0; + v.z = FixedMul(FINESINE(fa), radius); + v.a = FRACUNIT; - res = VectorMatrixMultiply(v, *pitchmatrix); - M_Memcpy(&v, res, sizeof(v)); - res = VectorMatrixMultiply(v, *yawmatrix); - M_Memcpy(&v, res, sizeof(v)); + FV4_Copy(&v, FM_MultMatrixVec4(&pitchmatrix, &v, &res)); + FV4_Copy(&v, FM_MultMatrixVec4(&yawmatrix, &v, &res)); - mobj = P_SpawnMobj(x + v[0], y + v[1], z + v[2], MT_HOOPCOLLIDE); + mobj = P_SpawnMobj(x + v.x, y + v.y, z + v.z, MT_HOOPCOLLIDE); mobj->z -= mobj->height/2; // Link all the collision sprites together. @@ -13289,19 +13479,6 @@ static void P_SpawnHoopInternal(mapthing_t *mthing, INT32 hoopsize, fixed_t size } while (hoopsize >= 8); } -void P_SpawnHoop(mapthing_t *mthing) -{ - if (metalrecording) - return; - - if (mthing->type == 1705) // Generic hoop - P_SpawnHoopInternal(mthing, 24, 4*FRACUNIT); - else // Customizable hoop - // For each flag add 16 fracunits to the size - // Default (0 flags) is 32 fracunits - P_SpawnHoopInternal(mthing, 8 + (4*(mthing->options & 0xF)), 4*FRACUNIT); -} - void P_SetBonusTime(mobj_t *mobj) { if (!mobj) @@ -13313,7 +13490,7 @@ void P_SetBonusTime(mobj_t *mobj) P_SetMobjState(mobj, mobj->info->raisestate); } -static void P_SpawnItemRow(mapthing_t *mthing, mobjtype_t* itemtypes, UINT8 numitemtypes, INT32 numitems, fixed_t horizontalspacing, fixed_t verticalspacing, INT16 fixedangle, boolean bonustime) +static void P_SpawnItemRow(mapthing_t *mthing, mobjtype_t *itemtypes, UINT8 numitemtypes, INT32 numitems, fixed_t horizontalspacing, fixed_t verticalspacing, INT16 fixedangle, boolean bonustime) { mapthing_t dummything; mobj_t *mobj = NULL; @@ -13364,10 +13541,10 @@ static void P_SpawnItemRow(mapthing_t *mthing, mobjtype_t* itemtypes, UINT8 numi } } -static void P_SpawnSingularItemRow(mapthing_t* mthing, mobjtype_t itemtype, INT32 numitems, fixed_t horizontalspacing, fixed_t verticalspacing, INT16 fixedangle, boolean bonustime) +static void P_SpawnSingularItemRow(mapthing_t *mthing, mobjtype_t itemtype, INT32 numitems, fixed_t horizontalspacing, fixed_t verticalspacing, INT16 fixedangle, boolean bonustime) { mobjtype_t itemtypes[1] = { itemtype }; - return P_SpawnItemRow(mthing, itemtypes, 1, numitems, horizontalspacing, verticalspacing, fixedangle, bonustime); + P_SpawnItemRow(mthing, itemtypes, 1, numitems, horizontalspacing, verticalspacing, fixedangle, bonustime); } static void P_SpawnItemCircle(mapthing_t *mthing, mobjtype_t *itemtypes, UINT8 numitemtypes, INT32 numitems, fixed_t size, boolean bonustime) @@ -13380,7 +13557,8 @@ static void P_SpawnItemCircle(mapthing_t *mthing, mobjtype_t *itemtypes, UINT8 n angle_t angle = FixedAngle(mthing->angle << FRACBITS); angle_t fa; INT32 i; - TVector v, *res; + matrix_t m; + vector4_t v, res; for (i = 0; i < numitemtypes; i++) { @@ -13408,15 +13586,15 @@ static void P_SpawnItemCircle(mapthing_t *mthing, mobjtype_t *itemtypes, UINT8 n dummything.type = mobjinfo[itemtype].doomednum; fa = i*FINEANGLES/numitems; - v[0] = FixedMul(FINECOSINE(fa), size); - v[1] = 0; - v[2] = FixedMul(FINESINE(fa), size); - v[3] = FRACUNIT; + v.x = FixedMul(FINECOSINE(fa), size); + v.y = 0; + v.z = FixedMul(FINESINE(fa), size); + v.a = FRACUNIT; - res = VectorMatrixMultiply(v, *RotateZMatrix(angle)); - M_Memcpy(&v, res, sizeof(v)); + FM_RotateZ(&m, angle); + FV4_Copy(&v, FM_MultMatrixVec4(&m, &v, &res)); - mobj = P_SpawnMobjFromMapThing(&dummything, x + v[0], y + v[1], z + v[2], itemtype); + mobj = P_SpawnMobjFromMapThing(&dummything, x + v.x, y + v.y, z + v.z, itemtype); if (!mobj) continue; @@ -13428,6 +13606,35 @@ static void P_SpawnItemCircle(mapthing_t *mthing, mobjtype_t *itemtypes, UINT8 n } } +static void P_ParseItemTypes(char *itemstring, mobjtype_t *itemtypes, UINT8 *numitemtypes) +{ + char *tok; + + *numitemtypes = 0; + if (itemstring) + { + char *stringcopy = Z_Malloc(strlen(itemstring) + 1, PU_LEVEL, NULL); + M_Memcpy(stringcopy, itemstring, strlen(itemstring)); + stringcopy[strlen(itemstring)] = '\0'; + + tok = strtok(stringcopy, " "); + while (tok && *numitemtypes < 128) + { + itemtypes[*numitemtypes] = get_number(tok); + tok = strtok(NULL, " "); + (*numitemtypes)++; + } + + Z_Free(stringcopy); + } + else + { + //If no types are supplied, default to ring + itemtypes[0] = MT_RING; + *numitemtypes = 1; + } +} + void P_SpawnItemPattern(mapthing_t *mthing, boolean bonustime) { switch (mthing->type) @@ -13465,6 +13672,26 @@ void P_SpawnItemPattern(mapthing_t *mthing, boolean bonustime) P_SpawnItemCircle(mthing, itemtypes, 2, numitems, size, bonustime); return; } + case 610: // Generic item row + { + mobjtype_t itemtypes[128]; //If you want to have a row with more than 128 different object types, you're crazy. + UINT8 numitemtypes; + if (!udmf) + return; + P_ParseItemTypes(mthing->stringargs[0], itemtypes, &numitemtypes); + P_SpawnItemRow(mthing, itemtypes, numitemtypes, mthing->args[0], mthing->args[1] << FRACBITS, mthing->args[2] << FRACBITS, mthing->angle, bonustime); + return; + } + case 611: // Generic item circle + { + mobjtype_t itemtypes[128]; //If you want to have a circle with more than 128 different object types, you're crazy. + UINT8 numitemtypes; + if (!udmf) + return; + P_ParseItemTypes(mthing->stringargs[0], itemtypes, &numitemtypes); + P_SpawnItemCircle(mthing, itemtypes, numitemtypes, mthing->args[0], mthing->args[1] << FRACBITS, bonustime); + return; + } default: return; } @@ -13887,9 +14114,43 @@ mobj_t *P_SpawnMobjFromMobj(mobj_t *mobj, fixed_t xofs, fixed_t yofs, fixed_t zo newmobj->eflags |= MFE_VERTICALFLIP; newmobj->flags2 |= MF2_OBJECTFLIP; newmobj->z = mobj->z + mobj->height - zofs - elementheight; + + newmobj->old_z = mobj->old_z + mobj->height - zofs - elementheight; + newmobj->old_z2 = mobj->old_z2 + mobj->height - zofs - elementheight; + } + else + { + newmobj->old_z = mobj->old_z + zofs; + newmobj->old_z2 = mobj->old_z2 + zofs; } newmobj->destscale = mobj->destscale; P_SetScale(newmobj, mobj->scale); + + newmobj->old_x2 = mobj->old_x2 + xofs; + newmobj->old_y2 = mobj->old_y2 + yofs; + newmobj->old_x = mobj->old_x + xofs; + newmobj->old_y = mobj->old_y + yofs; + + // This angle hack is needed for Lua scripts that set the angle after + // spawning, to avoid erroneous interpolation. + if (mobj->player) + { + newmobj->old_angle2 = mobj->player->old_drawangle2; + newmobj->old_angle = mobj->player->old_drawangle; + } + else + { + newmobj->old_angle2 = mobj->old_angle2; + newmobj->old_angle = mobj->old_angle; + } + + newmobj->old_scale2 = mobj->old_scale2; + newmobj->old_scale = mobj->old_scale; + newmobj->old_spritexscale = mobj->old_spritexscale; + newmobj->old_spriteyscale = mobj->old_spriteyscale; + newmobj->old_spritexoffset = mobj->old_spritexoffset; + newmobj->old_spriteyoffset = mobj->old_spriteyoffset; + return newmobj; } diff --git a/src/p_mobj.h b/src/p_mobj.h index 82cd056a8..6717c4add 100644 --- a/src/p_mobj.h +++ b/src/p_mobj.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -218,33 +218,40 @@ typedef enum typedef enum { // The mobj stands on solid floor (not on another mobj or in air) - MFE_ONGROUND = 1, + MFE_ONGROUND = 1, // The mobj just hit the floor while falling, this is cleared on next frame // (instant damage in lava/slime sectors to prevent jump cheat..) - MFE_JUSTHITFLOOR = 1<<1, + MFE_JUSTHITFLOOR = 1<<1, // The mobj stands in a sector with water, and touches the surface // this bit is set once and for all at the start of mobjthinker - MFE_TOUCHWATER = 1<<2, + MFE_TOUCHWATER = 1<<2, // The mobj stands in a sector with water, and his waist is BELOW the water surface // (for player, allows swimming up/down) - MFE_UNDERWATER = 1<<3, + MFE_UNDERWATER = 1<<3, // used for ramp sectors - MFE_JUSTSTEPPEDDOWN = 1<<4, + MFE_JUSTSTEPPEDDOWN = 1<<4, // Vertically flip sprite/allow upside-down physics - MFE_VERTICALFLIP = 1<<5, + MFE_VERTICALFLIP = 1<<5, // Goo water - MFE_GOOWATER = 1<<6, + MFE_GOOWATER = 1<<6, // The mobj is touching a lava block - MFE_TOUCHLAVA = 1<<7, + MFE_TOUCHLAVA = 1<<7, // Mobj was already pushed this tic - MFE_PUSHED = 1<<8, + MFE_PUSHED = 1<<8, // Mobj was already sprung this tic - MFE_SPRUNG = 1<<9, + MFE_SPRUNG = 1<<9, // Platform movement - MFE_APPLYPMOMZ = 1<<10, + MFE_APPLYPMOMZ = 1<<10, // Compute and trigger on mobj angle relative to tracer // See Linedef Exec 457 (Track mobj angle to point) - MFE_TRACERANGLE = 1<<11, + MFE_TRACERANGLE = 1<<11, + // Forces an object to use super sprites with SPR_PLAY. + MFE_FORCESUPER = 1<<12, + // Forces an object to NOT use super sprites with SPR_PLAY. + MFE_FORCENOSUPER = 1<<13, + // Makes an object use super sprites where they wouldn't have otherwise and vice-versa + MFE_REVERSESUPER = MFE_FORCESUPER|MFE_FORCENOSUPER + // free: to and including 1<<15 } mobjeflag_t; @@ -274,6 +281,8 @@ typedef struct mobj_s // Info for drawing: position. fixed_t x, y, z; + fixed_t old_x, old_y, old_z; // position interpolation + fixed_t old_x2, old_y2, old_z2; // More list: links in sector (if needed) struct mobj_s *snext; @@ -281,6 +290,8 @@ typedef struct mobj_s // More drawing info: to determine current sprite. angle_t angle, pitch, roll; // orientation + angle_t old_angle, old_pitch, old_roll; // orientation interpolation + angle_t old_angle2, old_pitch2, old_roll2; angle_t rollangle; spritenum_t sprite; // used to find patch_t and flip value UINT32 frame; // frame number, plus bits see p_pspr.h @@ -291,6 +302,8 @@ typedef struct mobj_s INT32 blendmode; // blend mode fixed_t spritexscale, spriteyscale; fixed_t spritexoffset, spriteyoffset; + fixed_t old_spritexscale, old_spriteyscale; + fixed_t old_spritexoffset, old_spriteyoffset; struct pslope_s *floorspriteslope; // The slope that the floorsprite is rotated by struct msecnode_s *touching_sectorlist; // a linked list of sectors where this object appears @@ -366,6 +379,8 @@ typedef struct mobj_s UINT32 mobjnum; // A unique number for this mobj. Used for restoring pointers on save games. fixed_t scale; + fixed_t old_scale; // interpolation + fixed_t old_scale2; fixed_t destscale; fixed_t scalespeed; @@ -380,9 +395,11 @@ typedef struct mobj_s struct pslope_s *standingslope; // The slope that the object is standing on (shouldn't need synced in savegames, right?) + boolean resetinterp; // if true, some fields should not be interpolated (see R_InterpolateMobjState implementation) boolean colorized; // Whether the mobj uses the rainbow colormap boolean mirrored; // The object's rotations will be mirrored left to right, e.g., see frame AL from the right and AR from the left fixed_t shadowscale; // If this object casts a shadow, and the size relative to radius + INT32 dispoffset; // copy of info->dispoffset, so mobjs can be sorted independently of their type // WARNING: New fields must be added separately to savegame and Lua. } mobj_t; @@ -401,6 +418,8 @@ typedef struct precipmobj_s // Info for drawing: position. fixed_t x, y, z; + fixed_t old_x, old_y, old_z; // position interpolation + fixed_t old_x2, old_y2, old_z2; // More list: links in sector (if needed) struct precipmobj_s *snext; @@ -408,6 +427,8 @@ typedef struct precipmobj_s // More drawing info: to determine current sprite. angle_t angle, pitch, roll; // orientation + angle_t old_angle, old_pitch, old_roll; // orientation interpolation + angle_t old_angle2, old_pitch2, old_roll2; angle_t rollangle; spritenum_t sprite; // used to find patch_t and flip value UINT32 frame; // frame number, plus bits see p_pspr.h @@ -418,6 +439,8 @@ typedef struct precipmobj_s INT32 blendmode; // blend mode fixed_t spritexscale, spriteyscale; fixed_t spritexoffset, spriteyoffset; + fixed_t old_spritexscale, old_spriteyscale; + fixed_t old_spritexoffset, old_spriteyoffset; struct pslope_s *floorspriteslope; // The slope that the floorsprite is rotated by struct mprecipsecnode_s *touching_sectorlist; // a linked list of sectors where this object appears diff --git a/src/p_polyobj.c b/src/p_polyobj.c index 0cdd567f7..e0316b3c8 100644 --- a/src/p_polyobj.c +++ b/src/p_polyobj.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 2006 by James Haley -// Copyright (C) 2006-2021 by Sonic Team Junior. +// Copyright (C) 2006-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -22,6 +22,7 @@ #include "p_tick.h" #include "p_local.h" #include "p_polyobj.h" +#include "r_fps.h" #include "r_main.h" #include "r_state.h" #include "r_defs.h" @@ -1236,7 +1237,7 @@ static void Polyobj_pushThing(polyobj_t *po, line_t *line, mobj_t *mo) vertex_t closest; // calculate angle of line and subtract 90 degrees to get normal - lineangle = R_PointToAngle2(0, 0, line->dx, line->dy) - ANGLE_90; + lineangle = line->angle - ANGLE_90; lineangle >>= ANGLETOFINESHIFT; momx = FixedMul(po->thrust, FINECOSINE(lineangle)); momy = FixedMul(po->thrust, FINESINE(lineangle)); @@ -1414,7 +1415,7 @@ static INT32 Polyobj_clipThings(polyobj_t *po, line_t *line) else Polyobj_pushThing(po, line, mo); - if (mo->player && (po->lines[0]->backsector->flags & SF_TRIGGERSPECIAL_TOUCH) && !(po->flags & POF_NOSPECIALS)) + if (mo->player && (po->lines[0]->backsector->flags & MSF_TRIGGERSPECIAL_TOUCH) && !(po->flags & POF_NOSPECIALS)) P_ProcessSpecialSector(mo->player, mo->subsector->sector, po->lines[0]->backsector); hitflags |= 1; @@ -1512,6 +1513,8 @@ static void Polyobj_rotateLine(line_t *ld) ld->dx = v2->x - v1->x; ld->dy = v2->y - v1->y; + ld->angle = R_PointToAngle2(0, 0, ld->dx, ld->dy); + // determine slopetype ld->slopetype = !ld->dx ? ST_VERTICAL : !ld->dy ? ST_HORIZONTAL : ((ld->dy > 0) == (ld->dx > 0)) ? ST_POSITIVE : ST_NEGATIVE; @@ -1541,7 +1544,7 @@ static void Polyobj_rotateLine(line_t *ld) } // Causes objects resting on top of the rotating polyobject to 'ride' with its movement. -static void Polyobj_rotateThings(polyobj_t *po, vector2_t origin, angle_t delta, UINT8 turnthings) +static void Polyobj_rotateThings(polyobj_t *po, vector2_t origin, angle_t delta, boolean turnplayers, boolean turnothers) { static INT32 pomovecount = 10000; INT32 x, y; @@ -1603,7 +1606,7 @@ static void Polyobj_rotateThings(polyobj_t *po, vector2_t origin, angle_t delta, Polyobj_slideThing(mo, newxoff, newyoff); - if (turnthings == 2 || (turnthings == 1 && !mo->player)) { + if ((turnplayers && mo->player) || (turnothers && !mo->player)) { mo->angle += delta; if (mo->player) P_SetPlayerAngle(mo->player, (angle_t)(mo->player->angleturn << 16) + delta); @@ -1615,7 +1618,7 @@ static void Polyobj_rotateThings(polyobj_t *po, vector2_t origin, angle_t delta, } // Rotates a polyobject around its start point. -boolean Polyobj_rotate(polyobj_t *po, angle_t delta, UINT8 turnthings, boolean checkmobjs) +boolean Polyobj_rotate(polyobj_t *po, angle_t delta, boolean turnplayers, boolean turnothers, boolean checkmobjs) { size_t i; angle_t angle; @@ -1653,7 +1656,7 @@ boolean Polyobj_rotate(polyobj_t *po, angle_t delta, UINT8 turnthings, boolean c for (i = 0; i < po->numLines; ++i) hitflags |= Polyobj_clipThings(po, po->lines[i]); - Polyobj_rotateThings(po, origin, delta, turnthings); + Polyobj_rotateThings(po, origin, delta, turnplayers, turnothers); } if (hitflags & 2) @@ -1862,7 +1865,7 @@ void Polyobj_MoveOnLoad(polyobj_t *po, angle_t angle, fixed_t x, fixed_t y) fixed_t dx, dy; // first, rotate to the saved angle - Polyobj_rotate(po, angle, false, false); + Polyobj_rotate(po, angle, false, false, false); // determine component distances to translate dx = x - po->spawnSpot.x; @@ -1905,7 +1908,7 @@ void T_PolyObjRotate(polyrotate_t *th) // rotate by 'speed' angle per frame // if distance == -1, this polyobject rotates perpetually - if (Polyobj_rotate(po, th->speed, th->turnobjs, true) && th->distance != -1) + if (Polyobj_rotate(po, th->speed, th->turnobjs & PTF_PLAYERS, th->turnobjs & PTF_OTHERS, true) && th->distance != -1) { INT32 avel = abs(th->speed); @@ -2307,7 +2310,7 @@ void T_PolyDoorSwing(polyswingdoor_t *th) // rotate by 'speed' angle per frame // if distance == -1, this polyobject rotates perpetually - if (Polyobj_rotate(po, th->speed, false, true) && th->distance != -1) + if (Polyobj_rotate(po, th->speed, false, false, true) && th->distance != -1) { INT32 avel = abs(th->speed); @@ -2438,7 +2441,7 @@ void T_PolyObjRotDisplace(polyrotdisplace_t *th) rotangle = FixedMul(th->rotscale, delta); - if (Polyobj_rotate(po, FixedAngle(rotangle), th->turnobjs, true)) + if (Polyobj_rotate(po, FixedAngle(rotangle), th->turnobjs & PTF_PLAYERS, th->turnobjs & PTF_OTHERS, true)) th->oldHeights = newheights; } @@ -2467,7 +2470,7 @@ boolean EV_DoPolyObjRotate(polyrotdata_t *prdata) return false; // check for override if this polyobj already has a thinker - if (po->thinker && !prdata->overRide) + if (po->thinker && !(prdata->flags & TMPR_OVERRIDE)) return false; // create a new thinker @@ -2482,10 +2485,10 @@ boolean EV_DoPolyObjRotate(polyrotdata_t *prdata) // use Hexen-style byte angles for speed and distance th->speed = Polyobj_AngSpeed(prdata->speed * prdata->direction); - if (prdata->distance == 360) // 360 means perpetual + if (prdata->flags & TMPR_CONTINUOUS) th->distance = -1; - else if (prdata->distance == 0) // 0 means 360 degrees - th->distance = 0xffffffff - 1; + else if (prdata->distance == 360) + th->distance = ANGLE_MAX - 1; else th->distance = FixedAngle(prdata->distance*FRACUNIT); @@ -2500,7 +2503,14 @@ boolean EV_DoPolyObjRotate(polyrotdata_t *prdata) oldpo = po; - th->turnobjs = prdata->turnobjs; + // interpolation + R_CreateInterpolator_Polyobj(&th->thinker, po); + + th->turnobjs = 0; + if (!(prdata->flags & TMPR_DONTROTATEOTHERS)) + th->turnobjs |= PTF_OTHERS; + if (prdata->flags & TMPR_ROTATEPLAYERS) + th->turnobjs |= PTF_PLAYERS; // apply action to mirroring polyobjects as well start = 0; @@ -2561,6 +2571,9 @@ boolean EV_DoPolyObjMove(polymovedata_t *pmdata) oldpo = po; + // interpolation + R_CreateInterpolator_Polyobj(&th->thinker, po); + // apply action to mirroring polyobjects as well start = 0; while ((po = Polyobj_GetChild(oldpo, &start))) @@ -2576,8 +2589,10 @@ boolean EV_DoPolyObjMove(polymovedata_t *pmdata) boolean EV_DoPolyObjWaypoint(polywaypointdata_t *pwdata) { polyobj_t *po; + polyobj_t *oldpo; polywaypoint_t *th; mobj_t *first = NULL; + INT32 start; if (!(po = Polyobj_GetForNum(pwdata->polyObjNum))) { @@ -2628,6 +2643,26 @@ boolean EV_DoPolyObjWaypoint(polywaypointdata_t *pwdata) th->continuous = false; } + // interpolation + R_CreateInterpolator_Polyobj(&th->thinker, po); + // T_PolyObjWaypoint is the only polyobject movement + // that can adjust z, so we add these ones too. + R_CreateInterpolator_SectorPlane(&th->thinker, po->lines[0]->backsector, false); + R_CreateInterpolator_SectorPlane(&th->thinker, po->lines[0]->backsector, true); + + // Most other polyobject functions handle children by recursively + // giving each child another thinker. T_PolyObjWaypoint handles + // it manually though, which means we need to manually give them + // interpolation here instead. + start = 0; + oldpo = po; + while ((po = Polyobj_GetChild(oldpo, &start))) + { + R_CreateInterpolator_Polyobj(&th->thinker, po); + R_CreateInterpolator_SectorPlane(&th->thinker, po->lines[0]->backsector, false); + R_CreateInterpolator_SectorPlane(&th->thinker, po->lines[0]->backsector, true); + } + th->pointnum = first->health; return true; @@ -2676,6 +2711,9 @@ static void Polyobj_doSlideDoor(polyobj_t *po, polydoordata_t *doordata) oldpo = po; + // interpolation + R_CreateInterpolator_Polyobj(&th->thinker, po); + // start action on mirroring polyobjects as well start = 0; while ((po = Polyobj_GetChild(oldpo, &start))) @@ -2716,6 +2754,9 @@ static void Polyobj_doSwingDoor(polyobj_t *po, polydoordata_t *doordata) oldpo = po; + // interpolation + R_CreateInterpolator_Polyobj(&th->thinker, po); + // start action on mirroring polyobjects as well start = 0; while ((po = Polyobj_GetChild(oldpo, &start))) @@ -2787,6 +2828,9 @@ boolean EV_DoPolyObjDisplace(polydisplacedata_t *prdata) oldpo = po; + // interpolation + R_CreateInterpolator_Polyobj(&th->thinker, po); + // apply action to mirroring polyobjects as well start = 0; while ((po = Polyobj_GetChild(oldpo, &start))) @@ -2833,6 +2877,9 @@ boolean EV_DoPolyObjRotDisplace(polyrotdisplacedata_t *prdata) oldpo = po; + // interpolation + R_CreateInterpolator_Polyobj(&th->thinker, po); + // apply action to mirroring polyobjects as well start = 0; while ((po = Polyobj_GetChild(oldpo, &start))) @@ -2938,6 +2985,9 @@ boolean EV_DoPolyObjFlag(polyflagdata_t *pfdata) oldpo = po; + // interpolation + R_CreateInterpolator_Polyobj(&th->thinker, po); + // apply action to mirroring polyobjects as well start = 0; while ((po = Polyobj_GetChild(oldpo, &start))) diff --git a/src/p_polyobj.h b/src/p_polyobj.h index 8fec0e7d7..75490a14b 100644 --- a/src/p_polyobj.h +++ b/src/p_polyobj.h @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 2006 by James Haley -// Copyright (C) 2006-2021 by Sonic Team Junior. +// Copyright (C) 2006-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -164,7 +164,7 @@ typedef struct polyrotate_s INT32 polyObjNum; // numeric id of polyobject (avoid C pointers here) INT32 speed; // speed of movement per frame INT32 distance; // distance to move - UINT8 turnobjs; // turn objects? 0=no, 1=everything but players, 2=everything + UINT8 turnobjs; // turn objects? PTF_ flags } polyrotate_t; typedef struct polymove_s @@ -274,14 +274,27 @@ typedef struct polyfade_s // Line Activation Data Structures // +typedef enum +{ + TMPR_DONTROTATEOTHERS = 1, + TMPR_ROTATEPLAYERS = 1<<1, + TMPR_CONTINUOUS = 1<<2, + TMPR_OVERRIDE = 1<<3, +} textmappolyrotate_t; + +typedef enum +{ + PTF_PLAYERS = 1, // Turn players with movement + PTF_OTHERS = 1<<1, // Turn other mobjs with movement +} polyturnflags_e; + typedef struct polyrotdata_s { INT32 polyObjNum; // numeric id of polyobject to affect INT32 direction; // direction of rotation INT32 speed; // angular speed INT32 distance; // distance to move - UINT8 turnobjs; // rotate objects being carried? - UINT8 overRide; // if true, will override any action on the object + UINT8 flags; // TMPR_ flags } polyrotdata_t; typedef struct polymovedata_s @@ -308,6 +321,20 @@ typedef struct polywaypointdata_s UINT8 flags; // PWF_ flags } polywaypointdata_t; +typedef enum +{ + TMPV_NOCHANGE = 0, + TMPV_VISIBLE = 1, + TMPV_INVISIBLE = 2, +} textmappolyvisibility_t; + +typedef enum +{ + TMPT_NOCHANGE = 0, + TMPT_TANGIBLE = 1, + TMPT_INTANGIBLE = 2, +} textmappolytangibility_t; + // polyobject door types typedef enum { @@ -349,6 +376,15 @@ typedef struct polyflagdata_s fixed_t momx; } polyflagdata_t; +typedef enum +{ + TMPF_RELATIVE = 1, + TMPF_OVERRIDE = 1<<1, + TMPF_TICBASED = 1<<2, + TMPF_IGNORECOLLISION = 1<<3, + TMPF_GHOSTFADE = 1<<4, +} textmappolyfade_t; + typedef struct polyfadedata_s { INT32 polyObjNum; @@ -369,7 +405,7 @@ void Polyobj_ClearSubsectorLinks(polyobj_t *polyobj); void Polyobj_ClearAllSubsectorLinks(void); boolean Polyobj_moveXY(polyobj_t *po, fixed_t x, fixed_t y, boolean checkmobjs); -boolean Polyobj_rotate(polyobj_t *po, angle_t delta, UINT8 turnthings, boolean checkmobjs); +boolean Polyobj_rotate(polyobj_t *po, angle_t delta, boolean turnplayers, boolean turnothers, boolean checkmobjs); polyobj_t *Polyobj_GetForNum(INT32 id); void Polyobj_MoveOnLoad(polyobj_t *po, angle_t angle, fixed_t x, fixed_t y); boolean P_PointInsidePolyobj(polyobj_t *po, fixed_t x, fixed_t y); diff --git a/src/p_pspr.h b/src/p_pspr.h index 4525ba14c..69e5eeeb3 100644 --- a/src/p_pspr.h +++ b/src/p_pspr.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -41,9 +41,20 @@ /// \brief Frame flags - SPR2: Super sprite2 #define FF_SPR2SUPER 0x80 /// \brief Frame flags - SPR2: A change of state at the end of Sprite2 animation -#define FF_SPR2ENDSTATE 0x1000 +#define FF_SPR2ENDSTATE 0x100 /// \brief Frame flags - SPR2: 50% of starting in middle of Sprite2 animation -#define FF_SPR2MIDSTART 0x2000 +#define FF_SPR2MIDSTART 0x200 + +/// \brief Frame flags: blend types +#define FF_BLENDMASK 0x7000 +/// \brief shift for FF_BLENDMASK +#define FF_BLENDSHIFT 12 +/// \brief preshifted blend flags minus 1 as effects don't distinguish between AST_COPY and AST_TRANSLUCENT +#define FF_ADD ((AST_ADD-1)<ffloors; rover; rover = rover->next) { - if (rover->flags != rover->spawnflags + if (rover->fofflags != rover->spawnflags || rover->alpha != rover->spawnalpha) { return true; // we found an FOF that changed! @@ -897,7 +937,7 @@ static void ArchiveFFloors(const sector_t *ss) for (rover = ss->ffloors; rover; rover = rover->next) { fflr_diff = 0; // reset diff flags - if (rover->flags != rover->spawnflags) + if (rover->fofflags != rover->spawnflags) fflr_diff |= FD_FLAGS; if (rover->alpha != rover->spawnalpha) fflr_diff |= FD_ALPHA; @@ -907,7 +947,7 @@ static void ArchiveFFloors(const sector_t *ss) WRITEUINT16(save_p, j); // save ffloor "number" WRITEUINT8(save_p, fflr_diff); if (fflr_diff & FD_FLAGS) - WRITEUINT32(save_p, rover->flags); + WRITEUINT32(save_p, rover->fofflags); if (fflr_diff & FD_ALPHA) WRITEINT16(save_p, rover->alpha); } @@ -945,7 +985,7 @@ static void UnArchiveFFloors(const sector_t *ss) fflr_diff = READUINT8(save_p); if (fflr_diff & FD_FLAGS) - rover->flags = READUINT32(save_p); + rover->fofflags = READUINT32(save_p); if (fflr_diff & FD_ALPHA) rover->alpha = READINT16(save_p); @@ -961,11 +1001,11 @@ static void ArchiveSectors(void) size_t i, j; const sector_t *ss = sectors; const sector_t *spawnss = spawnsectors; - UINT8 diff, diff2, diff3; + UINT8 diff, diff2, diff3, diff4; for (i = 0; i < numsectors; i++, ss++, spawnss++) { - diff = diff2 = diff3 = 0; + diff = diff2 = diff3 = diff4 = 0; if (ss->floorheight != spawnss->floorheight) diff |= SD_FLOORHT; if (ss->ceilingheight != spawnss->ceilingheight) @@ -1004,9 +1044,29 @@ static void ArchiveSectors(void) if (ss->crumblestate) diff3 |= SD_CRUMBLESTATE; + if (ss->floorlightlevel != spawnss->floorlightlevel || ss->floorlightabsolute != spawnss->floorlightabsolute) + diff3 |= SD_FLOORLIGHT; + if (ss->ceilinglightlevel != spawnss->ceilinglightlevel || ss->ceilinglightabsolute != spawnss->ceilinglightabsolute) + diff3 |= SD_CEILLIGHT; + if (ss->flags != spawnss->flags) + diff3 |= SD_FLAG; + if (ss->specialflags != spawnss->specialflags) + diff3 |= SD_SPECIALFLAG; + if (ss->damagetype != spawnss->damagetype) + diff4 |= SD_DAMAGETYPE; + if (ss->triggertag != spawnss->triggertag) + diff4 |= SD_TRIGGERTAG; + if (ss->triggerer != spawnss->triggerer) + diff4 |= SD_TRIGGERER; + if (ss->gravity != spawnss->gravity) + diff4 |= SD_GRAVITY; + if (ss->ffloors && CheckFFloorDiff(ss)) diff |= SD_FFLOORS; + if (diff4) + diff3 |= SD_DIFF4; + if (diff3) diff2 |= SD_DIFF3; @@ -1021,6 +1081,8 @@ static void ArchiveSectors(void) WRITEUINT8(save_p, diff2); if (diff2 & SD_DIFF3) WRITEUINT8(save_p, diff3); + if (diff3 & SD_DIFF4) + WRITEUINT8(save_p, diff4); if (diff & SD_FLOORHT) WRITEFIXED(save_p, ss->floorheight); if (diff & SD_CEILHT) @@ -1057,6 +1119,28 @@ static void ArchiveSectors(void) // returns existing index if already added, or appends to net_colormaps and returns new index if (diff3 & SD_CRUMBLESTATE) WRITEINT32(save_p, ss->crumblestate); + if (diff3 & SD_FLOORLIGHT) + { + WRITEINT16(save_p, ss->floorlightlevel); + WRITEUINT8(save_p, ss->floorlightabsolute); + } + if (diff3 & SD_CEILLIGHT) + { + WRITEINT16(save_p, ss->ceilinglightlevel); + WRITEUINT8(save_p, ss->ceilinglightabsolute); + } + if (diff3 & SD_FLAG) + WRITEUINT32(save_p, ss->flags); + if (diff3 & SD_SPECIALFLAG) + WRITEUINT32(save_p, ss->specialflags); + if (diff4 & SD_DAMAGETYPE) + WRITEUINT8(save_p, ss->damagetype); + if (diff4 & SD_TRIGGERTAG) + WRITEINT16(save_p, ss->triggertag); + if (diff4 & SD_TRIGGERER) + WRITEUINT8(save_p, ss->triggerer); + if (diff4 & SD_GRAVITY) + WRITEFIXED(save_p, ss->gravity); if (diff & SD_FFLOORS) ArchiveFFloors(ss); } @@ -1068,7 +1152,7 @@ static void ArchiveSectors(void) static void UnArchiveSectors(void) { UINT16 i, j; - UINT8 diff, diff2, diff3; + UINT8 diff, diff2, diff3, diff4; for (;;) { i = READUINT16(save_p); @@ -1088,6 +1172,10 @@ static void UnArchiveSectors(void) diff3 = READUINT8(save_p); else diff3 = 0; + if (diff3 & SD_DIFF4) + diff4 = READUINT8(save_p); + else + diff4 = 0; if (diff & SD_FLOORHT) sectors[i].floorheight = READFIXED(save_p); @@ -1148,6 +1236,31 @@ static void UnArchiveSectors(void) sectors[i].extra_colormap = GetNetColormapFromList(READUINT32(save_p)); if (diff3 & SD_CRUMBLESTATE) sectors[i].crumblestate = READINT32(save_p); + if (diff3 & SD_FLOORLIGHT) + { + sectors[i].floorlightlevel = READINT16(save_p); + sectors[i].floorlightabsolute = READUINT8(save_p); + } + if (diff3 & SD_CEILLIGHT) + { + sectors[i].ceilinglightlevel = READINT16(save_p); + sectors[i].ceilinglightabsolute = READUINT8(save_p); + } + if (diff3 & SD_FLAG) + { + sectors[i].flags = READUINT32(save_p); + CheckForReverseGravity |= (sectors[i].flags & MSF_GRAVITYFLIP); + } + if (diff3 & SD_SPECIALFLAG) + sectors[i].specialflags = READUINT32(save_p); + if (diff4 & SD_DAMAGETYPE) + sectors[i].damagetype = READUINT8(save_p); + if (diff4 & SD_TRIGGERTAG) + sectors[i].triggertag = READINT16(save_p); + if (diff4 & SD_TRIGGERER) + sectors[i].triggerer = READUINT8(save_p); + if (diff4 & SD_GRAVITY) + sectors[i].gravity = READFIXED(save_p); if (diff & SD_FFLOORS) UnArchiveFFloors(§ors[i]); @@ -1459,6 +1572,7 @@ typedef enum MD2_SPRITEXOFFSET = 1<<20, MD2_SPRITEYOFFSET = 1<<21, MD2_FLOORSPRITESLOPE = 1<<22, + MD2_DISPOFFSET = 1<<23 } mobj_diff2_t; typedef enum @@ -1576,7 +1690,7 @@ static void SaveMobjThinker(const thinker_t *th, const UINT8 type) diff2 = 0; // not the default but the most probable - if (mobj->momx != 0 || mobj->momy != 0 || mobj->momz != 0) + if (mobj->momx != 0 || mobj->momy != 0 || mobj->momz != 0 || mobj->pmomz !=0) diff |= MD_MOM; if (mobj->radius != mobj->info->radius) diff |= MD_RADIUS; @@ -1693,6 +1807,8 @@ static void SaveMobjThinker(const thinker_t *th, const UINT8 type) || (slope->normal.z != FRACUNIT)) diff2 |= MD2_FLOORSPRITESLOPE; } + if (mobj->dispoffset != mobj->info->dispoffset) + diff2 |= MD2_DISPOFFSET; if (diff2 != 0) diff |= MD_MORE; @@ -1751,6 +1867,7 @@ static void SaveMobjThinker(const thinker_t *th, const UINT8 type) WRITEFIXED(save_p, mobj->momx); WRITEFIXED(save_p, mobj->momy); WRITEFIXED(save_p, mobj->momz); + WRITEFIXED(save_p, mobj->pmomz); } if (diff & MD_RADIUS) WRITEFIXED(save_p, mobj->radius); @@ -1867,6 +1984,8 @@ static void SaveMobjThinker(const thinker_t *th, const UINT8 type) WRITEFIXED(save_p, slope->normal.y); WRITEFIXED(save_p, slope->normal.z); } + if (diff2 & MD2_DISPOFFSET) + WRITEINT32(save_p, mobj->dispoffset); WRITEUINT32(save_p, mobj->mobjnum); } @@ -1957,7 +2076,6 @@ static void SaveEachTimeThinker(const thinker_t *th, const UINT8 type) for (i = 0; i < MAXPLAYERS; i++) { WRITECHAR(save_p, ht->playersInArea[i]); - WRITECHAR(save_p, ht->playersOnArea[i]); } WRITECHAR(save_p, ht->triggerOnExit); } @@ -1985,14 +2103,12 @@ static void SaveCeilingThinker(const thinker_t *th, const UINT8 type) WRITEFIXED(save_p, ht->bottomheight); WRITEFIXED(save_p, ht->topheight); WRITEFIXED(save_p, ht->speed); - WRITEFIXED(save_p, ht->oldspeed); WRITEFIXED(save_p, ht->delay); WRITEFIXED(save_p, ht->delaytimer); WRITEUINT8(save_p, ht->crush); WRITEINT32(save_p, ht->texture); WRITEINT32(save_p, ht->direction); - WRITEINT32(save_p, ht->tag); - WRITEINT32(save_p, ht->olddirection); + WRITEINT16(save_p, ht->tag); WRITEFIXED(save_p, ht->origspeed); WRITEFIXED(save_p, ht->sourceline); } @@ -2011,6 +2127,8 @@ static void SaveFloormoveThinker(const thinker_t *th, const UINT8 type) WRITEFIXED(save_p, ht->origspeed); WRITEFIXED(save_p, ht->delay); WRITEFIXED(save_p, ht->delaytimer); + WRITEINT16(save_p, ht->tag); + WRITEFIXED(save_p, ht->sourceline); } static void SaveLightflashThinker(const thinker_t *th, const UINT8 type) @@ -2028,8 +2146,8 @@ static void SaveStrobeThinker(const thinker_t *th, const UINT8 type) WRITEUINT8(save_p, type); WRITEUINT32(save_p, SaveSector(ht->sector)); WRITEINT32(save_p, ht->count); - WRITEINT32(save_p, ht->minlight); - WRITEINT32(save_p, ht->maxlight); + WRITEINT16(save_p, ht->minlight); + WRITEINT16(save_p, ht->maxlight); WRITEINT32(save_p, ht->darktime); WRITEINT32(save_p, ht->brighttime); } @@ -2039,10 +2157,10 @@ static void SaveGlowThinker(const thinker_t *th, const UINT8 type) const glow_t *ht = (const void *)th; WRITEUINT8(save_p, type); WRITEUINT32(save_p, SaveSector(ht->sector)); - WRITEINT32(save_p, ht->minlight); - WRITEINT32(save_p, ht->maxlight); - WRITEINT32(save_p, ht->direction); - WRITEINT32(save_p, ht->speed); + WRITEINT16(save_p, ht->minlight); + WRITEINT16(save_p, ht->maxlight); + WRITEINT16(save_p, ht->direction); + WRITEINT16(save_p, ht->speed); } static inline void SaveFireflickerThinker(const thinker_t *th, const UINT8 type) @@ -2052,8 +2170,8 @@ static inline void SaveFireflickerThinker(const thinker_t *th, const UINT8 type) WRITEUINT32(save_p, SaveSector(ht->sector)); WRITEINT32(save_p, ht->count); WRITEINT32(save_p, ht->resetcount); - WRITEINT32(save_p, ht->maxlight); - WRITEINT32(save_p, ht->minlight); + WRITEINT16(save_p, ht->maxlight); + WRITEINT16(save_p, ht->minlight); } static void SaveElevatorThinker(const thinker_t *th, const UINT8 type) @@ -2127,13 +2245,9 @@ static inline void SavePusherThinker(const thinker_t *th, const UINT8 type) const pusher_t *ht = (const void *)th; WRITEUINT8(save_p, type); WRITEUINT8(save_p, ht->type); - WRITEINT32(save_p, ht->x_mag); - WRITEINT32(save_p, ht->y_mag); - WRITEINT32(save_p, ht->magnitude); - WRITEINT32(save_p, ht->radius); - WRITEINT32(save_p, ht->x); - WRITEINT32(save_p, ht->y); - WRITEINT32(save_p, ht->z); + WRITEFIXED(save_p, ht->x_mag); + WRITEFIXED(save_p, ht->y_mag); + WRITEFIXED(save_p, ht->z_mag); WRITEINT32(save_p, ht->affectee); WRITEUINT8(save_p, ht->roverpusher); WRITEINT32(save_p, ht->referrer); @@ -2231,18 +2345,30 @@ static void SavePlaneDisplaceThinker(const thinker_t *th, const UINT8 type) WRITEUINT8(save_p, ht->type); } -static inline void SaveDynamicSlopeThinker(const thinker_t *th, const UINT8 type) +static inline void SaveDynamicLineSlopeThinker(const thinker_t *th, const UINT8 type) { - const dynplanethink_t* ht = (const void*)th; + const dynlineplanethink_t* ht = (const void*)th; WRITEUINT8(save_p, type); WRITEUINT8(save_p, ht->type); WRITEUINT32(save_p, SaveSlope(ht->slope)); WRITEUINT32(save_p, SaveLine(ht->sourceline)); WRITEFIXED(save_p, ht->extent); +} - WRITEMEM(save_p, ht->tags, sizeof(ht->tags)); - WRITEMEM(save_p, ht->vex, sizeof(ht->vex)); +static inline void SaveDynamicVertexSlopeThinker(const thinker_t *th, const UINT8 type) +{ + size_t i; + const dynvertexplanethink_t* ht = (const void*)th; + + WRITEUINT8(save_p, type); + WRITEUINT32(save_p, SaveSlope(ht->slope)); + for (i = 0; i < 3; i++) + WRITEUINT32(save_p, SaveSector(ht->secs[i])); + WRITEMEM(save_p, ht->vex, sizeof(ht->vex)); + WRITEMEM(save_p, ht->origsecheights, sizeof(ht->origsecheights)); + WRITEMEM(save_p, ht->origvecheights, sizeof(ht->origvecheights)); + WRITEUINT8(save_p, ht->relative); } static inline void SavePolyrotatetThinker(const thinker_t *th, const UINT8 type) @@ -2567,12 +2693,12 @@ static void P_NetArchiveThinkers(void) } else if (th->function.acp1 == (actionf_p1)T_DynamicSlopeLine) { - SaveDynamicSlopeThinker(th, tc_dynslopeline); + SaveDynamicLineSlopeThinker(th, tc_dynslopeline); continue; } else if (th->function.acp1 == (actionf_p1)T_DynamicSlopeVert) { - SaveDynamicSlopeThinker(th, tc_dynslopevert); + SaveDynamicVertexSlopeThinker(th, tc_dynslopevert); continue; } #ifdef PARANOIA @@ -2687,7 +2813,7 @@ static thinker_t* LoadMobjThinker(actionf_p1 thinker) { UINT16 spawnpointnum = READUINT16(save_p); - if (mapthings[spawnpointnum].type == 1705 || mapthings[spawnpointnum].type == 1713) // NiGHTS Hoop special case + if (mapthings[spawnpointnum].type == 1713) // NiGHTS Hoop special case { P_SpawnHoop(&mapthings[spawnpointnum]); return NULL; @@ -2749,6 +2875,7 @@ static thinker_t* LoadMobjThinker(actionf_p1 thinker) mobj->momx = READFIXED(save_p); mobj->momy = READFIXED(save_p); mobj->momz = READFIXED(save_p); + mobj->pmomz = READFIXED(save_p); } // otherwise they're zero, and the memset took care of it if (diff & MD_RADIUS) @@ -2913,6 +3040,10 @@ static thinker_t* LoadMobjThinker(actionf_p1 thinker) slope->normal.y = READFIXED(save_p); slope->normal.z = READFIXED(save_p); } + if (diff2 & MD2_DISPOFFSET) + mobj->dispoffset = READINT32(save_p); + else + mobj->dispoffset = mobj->info->dispoffset; if (diff & MD_REDFLAG) { @@ -2938,8 +3069,22 @@ static thinker_t* LoadMobjThinker(actionf_p1 thinker) mobj->player->viewz = mobj->player->mo->z + mobj->player->viewheight; } + if (mobj->type == MT_SKYBOX && mobj->spawnpoint) + { + mtag_t tag = Tag_FGet(&mobj->spawnpoint->tags); + if (tag >= 0 && tag <= 15) + { + if (mobj->spawnpoint->args[0]) + skyboxcenterpnts[tag] = mobj; + else + skyboxviewpnts[tag] = mobj; + } + } + mobj->info = (mobjinfo_t *)next; // temporarily, set when leave this function + R_AddMobjInterpolator(mobj); + return &mobj->thinker; } @@ -3061,7 +3206,6 @@ static thinker_t* LoadEachTimeThinker(actionf_p1 thinker) for (i = 0; i < MAXPLAYERS; i++) { ht->playersInArea[i] = READCHAR(save_p); - ht->playersOnArea[i] = READCHAR(save_p); } ht->triggerOnExit = READCHAR(save_p); return &ht->thinker; @@ -3091,14 +3235,12 @@ static thinker_t* LoadCeilingThinker(actionf_p1 thinker) ht->bottomheight = READFIXED(save_p); ht->topheight = READFIXED(save_p); ht->speed = READFIXED(save_p); - ht->oldspeed = READFIXED(save_p); ht->delay = READFIXED(save_p); ht->delaytimer = READFIXED(save_p); ht->crush = READUINT8(save_p); ht->texture = READINT32(save_p); ht->direction = READINT32(save_p); - ht->tag = READINT32(save_p); - ht->olddirection = READINT32(save_p); + ht->tag = READINT16(save_p); ht->origspeed = READFIXED(save_p); ht->sourceline = READFIXED(save_p); if (ht->sector) @@ -3120,6 +3262,8 @@ static thinker_t* LoadFloormoveThinker(actionf_p1 thinker) ht->origspeed = READFIXED(save_p); ht->delay = READFIXED(save_p); ht->delaytimer = READFIXED(save_p); + ht->tag = READINT16(save_p); + ht->sourceline = READFIXED(save_p); if (ht->sector) ht->sector->floordata = ht; return &ht->thinker; @@ -3143,8 +3287,8 @@ static thinker_t* LoadStrobeThinker(actionf_p1 thinker) ht->thinker.function.acp1 = thinker; ht->sector = LoadSector(READUINT32(save_p)); ht->count = READINT32(save_p); - ht->minlight = READINT32(save_p); - ht->maxlight = READINT32(save_p); + ht->minlight = READINT16(save_p); + ht->maxlight = READINT16(save_p); ht->darktime = READINT32(save_p); ht->brighttime = READINT32(save_p); if (ht->sector) @@ -3157,10 +3301,10 @@ static thinker_t* LoadGlowThinker(actionf_p1 thinker) glow_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL); ht->thinker.function.acp1 = thinker; ht->sector = LoadSector(READUINT32(save_p)); - ht->minlight = READINT32(save_p); - ht->maxlight = READINT32(save_p); - ht->direction = READINT32(save_p); - ht->speed = READINT32(save_p); + ht->minlight = READINT16(save_p); + ht->maxlight = READINT16(save_p); + ht->direction = READINT16(save_p); + ht->speed = READINT16(save_p); if (ht->sector) ht->sector->lightingdata = ht; return &ht->thinker; @@ -3173,8 +3317,8 @@ static thinker_t* LoadFireflickerThinker(actionf_p1 thinker) ht->sector = LoadSector(READUINT32(save_p)); ht->count = READINT32(save_p); ht->resetcount = READINT32(save_p); - ht->maxlight = READINT32(save_p); - ht->minlight = READINT32(save_p); + ht->maxlight = READINT16(save_p); + ht->minlight = READINT16(save_p); if (ht->sector) ht->sector->lightingdata = ht; return &ht->thinker; @@ -3266,19 +3410,14 @@ static thinker_t* LoadPusherThinker(actionf_p1 thinker) pusher_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL); ht->thinker.function.acp1 = thinker; ht->type = READUINT8(save_p); - ht->x_mag = READINT32(save_p); - ht->y_mag = READINT32(save_p); - ht->magnitude = READINT32(save_p); - ht->radius = READINT32(save_p); - ht->x = READINT32(save_p); - ht->y = READINT32(save_p); - ht->z = READINT32(save_p); + ht->x_mag = READFIXED(save_p); + ht->y_mag = READFIXED(save_p); + ht->z_mag = READFIXED(save_p); ht->affectee = READINT32(save_p); ht->roverpusher = READUINT8(save_p); ht->referrer = READINT32(save_p); ht->exclusive = READINT32(save_p); ht->slider = READINT32(save_p); - ht->source = P_GetPushThing(ht->affectee); return &ht->thinker; } @@ -3402,17 +3541,31 @@ static inline thinker_t* LoadPlaneDisplaceThinker(actionf_p1 thinker) return &ht->thinker; } -static inline thinker_t* LoadDynamicSlopeThinker(actionf_p1 thinker) +static inline thinker_t* LoadDynamicLineSlopeThinker(actionf_p1 thinker) { - dynplanethink_t* ht = Z_Malloc(sizeof(*ht), PU_LEVSPEC, NULL); + dynlineplanethink_t* ht = Z_Malloc(sizeof(*ht), PU_LEVSPEC, NULL); ht->thinker.function.acp1 = thinker; ht->type = READUINT8(save_p); ht->slope = LoadSlope(READUINT32(save_p)); ht->sourceline = LoadLine(READUINT32(save_p)); ht->extent = READFIXED(save_p); - READMEM(save_p, ht->tags, sizeof(ht->tags)); + return &ht->thinker; +} + +static inline thinker_t* LoadDynamicVertexSlopeThinker(actionf_p1 thinker) +{ + size_t i; + dynvertexplanethink_t* ht = Z_Malloc(sizeof(*ht), PU_LEVSPEC, NULL); + ht->thinker.function.acp1 = thinker; + + ht->slope = LoadSlope(READUINT32(save_p)); + for (i = 0; i < 3; i++) + ht->secs[i] = LoadSector(READUINT32(save_p)); READMEM(save_p, ht->vex, sizeof(ht->vex)); + READMEM(save_p, ht->origsecheights, sizeof(ht->origsecheights)); + READMEM(save_p, ht->origvecheights, sizeof(ht->origvecheights)); + ht->relative = READUINT8(save_p); return &ht->thinker; } @@ -3549,10 +3702,14 @@ static void P_NetUnArchiveThinkers(void) { next = currentthinker->next; - if (currentthinker->function.acp1 == (actionf_p1)P_MobjThinker) + if (currentthinker->function.acp1 == (actionf_p1)P_MobjThinker || currentthinker->function.acp1 == (actionf_p1)P_NullPrecipThinker) P_RemoveSavegameMobj((mobj_t *)currentthinker); // item isn't saved, don't remove it else + { + (next->prev = currentthinker->prev)->next = next; + R_DestroyLevelInterpolators(currentthinker); Z_Free(currentthinker); + } } } @@ -3725,11 +3882,11 @@ static void P_NetUnArchiveThinkers(void) break; case tc_dynslopeline: - th = LoadDynamicSlopeThinker((actionf_p1)T_DynamicSlopeLine); + th = LoadDynamicLineSlopeThinker((actionf_p1)T_DynamicSlopeLine); break; case tc_dynslopevert: - th = LoadDynamicSlopeThinker((actionf_p1)T_DynamicSlopeVert); + th = LoadDynamicVertexSlopeThinker((actionf_p1)T_DynamicSlopeVert); break; case tc_scroll: @@ -3754,6 +3911,10 @@ static void P_NetUnArchiveThinkers(void) CONS_Debug(DBG_NETPLAY, "%u thinkers loaded in list %d\n", numloaded, i); } + // Set each skyboxmo to the first skybox (or NULL) + skyboxmo[0] = skyboxviewpnts[0]; + skyboxmo[1] = skyboxcenterpnts[0]; + if (restoreNum) { executor_t *delay = NULL; @@ -4179,6 +4340,8 @@ static void P_NetArchiveMisc(boolean resending) WRITEUINT32(save_p, hidetime); + WRITEUINT32(save_p, unlocktriggers); + // Is it paused? if (paused) WRITEUINT8(save_p, 0x2f); @@ -4277,6 +4440,8 @@ static inline boolean P_NetUnArchiveMisc(boolean reloading) hidetime = READUINT32(save_p); + unlocktriggers = READUINT32(save_p); + // Is it paused? if (READUINT8(save_p) == 0x2f) paused = true; @@ -4284,6 +4449,224 @@ static inline boolean P_NetUnArchiveMisc(boolean reloading) return true; } + +static inline void P_NetArchiveEmblems(void) +{ + gamedata_t *data = serverGamedata; + INT32 i, j; + UINT8 btemp; + INT32 curmare; + + WRITEUINT32(save_p, ARCHIVEBLOCK_EMBLEMS); + + // These should be synchronized before savegame loading by the wad files being the same anyway, + // but just in case, for now, we'll leave them here for testing. It would be very bad if they mismatch. + WRITEUINT8(save_p, (UINT8)savemoddata); + WRITEINT32(save_p, numemblems); + WRITEINT32(save_p, numextraemblems); + + // The rest of this is lifted straight from G_SaveGameData in g_game.c + // TODO: Optimize this to only send information about emblems, unlocks, etc. which actually exist + // There is no need to go all the way up to MAXEMBLEMS when wads are guaranteed to be the same. + + WRITEUINT32(save_p, data->totalplaytime); + + // TODO put another cipher on these things? meh, I don't care... + for (i = 0; i < NUMMAPS; i++) + WRITEUINT8(save_p, (data->mapvisited[i] & MV_MAX)); + + // To save space, use one bit per collected/achieved/unlocked flag + for (i = 0; i < MAXEMBLEMS;) + { + btemp = 0; + for (j = 0; j < 8 && j+i < MAXEMBLEMS; ++j) + btemp |= (data->collected[j+i] << j); + WRITEUINT8(save_p, btemp); + i += j; + } + for (i = 0; i < MAXEXTRAEMBLEMS;) + { + btemp = 0; + for (j = 0; j < 8 && j+i < MAXEXTRAEMBLEMS; ++j) + btemp |= (data->extraCollected[j+i] << j); + WRITEUINT8(save_p, btemp); + i += j; + } + for (i = 0; i < MAXUNLOCKABLES;) + { + btemp = 0; + for (j = 0; j < 8 && j+i < MAXUNLOCKABLES; ++j) + btemp |= (data->unlocked[j+i] << j); + WRITEUINT8(save_p, btemp); + i += j; + } + for (i = 0; i < MAXCONDITIONSETS;) + { + btemp = 0; + for (j = 0; j < 8 && j+i < MAXCONDITIONSETS; ++j) + btemp |= (data->achieved[j+i] << j); + WRITEUINT8(save_p, btemp); + i += j; + } + + WRITEUINT32(save_p, data->timesBeaten); + WRITEUINT32(save_p, data->timesBeatenWithEmeralds); + WRITEUINT32(save_p, data->timesBeatenUltimate); + + // Main records + for (i = 0; i < NUMMAPS; i++) + { + if (data->mainrecords[i]) + { + WRITEUINT32(save_p, data->mainrecords[i]->score); + WRITEUINT32(save_p, data->mainrecords[i]->time); + WRITEUINT16(save_p, data->mainrecords[i]->rings); + } + else + { + WRITEUINT32(save_p, 0); + WRITEUINT32(save_p, 0); + WRITEUINT16(save_p, 0); + } + } + + // NiGHTS records + for (i = 0; i < NUMMAPS; i++) + { + if (!data->nightsrecords[i] || !data->nightsrecords[i]->nummares) + { + WRITEUINT8(save_p, 0); + continue; + } + + WRITEUINT8(save_p, data->nightsrecords[i]->nummares); + + for (curmare = 0; curmare < (data->nightsrecords[i]->nummares + 1); ++curmare) + { + WRITEUINT32(save_p, data->nightsrecords[i]->score[curmare]); + WRITEUINT8(save_p, data->nightsrecords[i]->grade[curmare]); + WRITEUINT32(save_p, data->nightsrecords[i]->time[curmare]); + } + } +} + +static inline void P_NetUnArchiveEmblems(void) +{ + gamedata_t *data = serverGamedata; + INT32 i, j; + UINT8 rtemp; + UINT32 recscore; + tic_t rectime; + UINT16 recrings; + UINT8 recmares; + INT32 curmare; + + if (READUINT32(save_p) != ARCHIVEBLOCK_EMBLEMS) + I_Error("Bad $$$.sav at archive block Emblems"); + + savemoddata = (boolean)READUINT8(save_p); // this one is actually necessary because savemoddata stays false otherwise for some reason. + + if (numemblems != READINT32(save_p)) + I_Error("numemblems mismatch"); + if (numextraemblems != READINT32(save_p)) + I_Error("numextraemblems mismatch"); + + // This shouldn't happen, but if something really fucked up happens and you transfer + // the SERVER player's gamedata over your own CLIENT gamedata, + // then this prevents it from being saved over yours. + data->loaded = false; + + M_ClearSecrets(data); + G_ClearRecords(data); + + // The rest of this is lifted straight from G_LoadGameData in g_game.c + // TODO: Optimize this to only read information about emblems, unlocks, etc. which actually exist + // There is no need to go all the way up to MAXEMBLEMS when wads are guaranteed to be the same. + + data->totalplaytime = READUINT32(save_p); + + // TODO put another cipher on these things? meh, I don't care... + for (i = 0; i < NUMMAPS; i++) + if ((data->mapvisited[i] = READUINT8(save_p)) > MV_MAX) + I_Error("Bad $$$.sav dearchiving Emblems"); + + // To save space, use one bit per collected/achieved/unlocked flag + for (i = 0; i < MAXEMBLEMS;) + { + rtemp = READUINT8(save_p); + for (j = 0; j < 8 && j+i < MAXEMBLEMS; ++j) + data->collected[j+i] = ((rtemp >> j) & 1); + i += j; + } + for (i = 0; i < MAXEXTRAEMBLEMS;) + { + rtemp = READUINT8(save_p); + for (j = 0; j < 8 && j+i < MAXEXTRAEMBLEMS; ++j) + data->extraCollected[j+i] = ((rtemp >> j) & 1); + i += j; + } + for (i = 0; i < MAXUNLOCKABLES;) + { + rtemp = READUINT8(save_p); + for (j = 0; j < 8 && j+i < MAXUNLOCKABLES; ++j) + data->unlocked[j+i] = ((rtemp >> j) & 1); + i += j; + } + for (i = 0; i < MAXCONDITIONSETS;) + { + rtemp = READUINT8(save_p); + for (j = 0; j < 8 && j+i < MAXCONDITIONSETS; ++j) + data->achieved[j+i] = ((rtemp >> j) & 1); + i += j; + } + + data->timesBeaten = READUINT32(save_p); + data->timesBeatenWithEmeralds = READUINT32(save_p); + data->timesBeatenUltimate = READUINT32(save_p); + + // Main records + for (i = 0; i < NUMMAPS; ++i) + { + recscore = READUINT32(save_p); + rectime = (tic_t)READUINT32(save_p); + recrings = READUINT16(save_p); + + if (recrings > 10000 || recscore > MAXSCORE) + I_Error("Bad $$$.sav dearchiving Emblems"); + + if (recscore || rectime || recrings) + { + G_AllocMainRecordData((INT16)i, data); + data->mainrecords[i]->score = recscore; + data->mainrecords[i]->time = rectime; + data->mainrecords[i]->rings = recrings; + } + } + + // Nights records + for (i = 0; i < NUMMAPS; ++i) + { + if ((recmares = READUINT8(save_p)) == 0) + continue; + + G_AllocNightsRecordData((INT16)i, data); + + for (curmare = 0; curmare < (recmares+1); ++curmare) + { + data->nightsrecords[i]->score[curmare] = READUINT32(save_p); + data->nightsrecords[i]->grade[curmare] = READUINT8(save_p); + data->nightsrecords[i]->time[curmare] = (tic_t)READUINT32(save_p); + + if (data->nightsrecords[i]->grade[curmare] > GRADE_S) + { + I_Error("Bad $$$.sav dearchiving Emblems"); + } + } + + data->nightsrecords[i]->nummares = recmares; + } +} + static inline void P_ArchiveLuabanksAndConsistency(void) { UINT8 i, banksinuse = NUM_LUABANKS; @@ -4347,6 +4730,7 @@ void P_SaveNetGame(boolean resending) CV_SaveNetVars(&save_p); P_NetArchiveMisc(resending); + P_NetArchiveEmblems(); // Assign the mobjnumber for pointer tracking for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next) @@ -4399,6 +4783,7 @@ boolean P_LoadNetGame(boolean reloading) CV_LoadNetVars(&save_p); if (!P_NetUnArchiveMisc(reloading)) return false; + P_NetUnArchiveEmblems(); P_NetUnArchivePlayers(); if (gamestate == GS_LEVEL) { diff --git a/src/p_saveg.h b/src/p_saveg.h index a909282fe..73fcfd583 100644 --- a/src/p_saveg.h +++ b/src/p_saveg.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/p_setup.c b/src/p_setup.c index f30d99b07..48b572b66 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -21,6 +21,7 @@ #include "p_spec.h" #include "p_saveg.h" +#include "i_time.h" #include "i_sound.h" // for I_PlayCD().. #include "i_video.h" // for I_FinishUpdate().. #include "r_sky.h" @@ -33,6 +34,7 @@ #include "r_picformats.h" #include "r_sky.h" #include "r_draw.h" +#include "r_fps.h" // R_ResetViewInterpolation in level load #include "s_sound.h" #include "st_stuff.h" @@ -66,7 +68,7 @@ #include "md5.h" // map MD5 -// for LUAh_MapLoad +// for MapLoad hook #include "lua_script.h" #include "lua_hook.h" @@ -509,6 +511,17 @@ UINT32 P_GetScoreForGrade(INT16 map, UINT8 mare, UINT8 grade) return mapheaderinfo[map-1]->grades[mare].grade[grade-1]; } +UINT32 P_GetScoreForGradeOverall(INT16 map, UINT8 grade) +{ + UINT8 mares; + INT32 i; + UINT32 score = 0; + mares = mapheaderinfo[map-1]->numGradedMares; + for (i = 0; i < mares; ++i) + score += P_GetScoreForGrade(map, i, grade); + return score; +} + // // levelflats // @@ -735,7 +748,7 @@ void P_ReloadRings(void) mt->mobj = NULL; P_SetBonusTime(P_SpawnMapThing(mt)); } - else if (mt->type >= 600 && mt->type <= 609) // Item patterns + else if (mt->type >= 600 && mt->type <= 611) // Item patterns { mt->mobj = NULL; P_SpawnItemPattern(mt, true); @@ -864,7 +877,7 @@ static void P_SpawnMapThings(boolean spawnemblems) size_t i; mapthing_t *mt; - // Spawn axis points first so they are at the front of the list for fast searching. + // Spawn axis points first so they are at the front of the list for fast searching. for (i = 0, mt = mapthings; i < nummapthings; i++, mt++) { switch (mt->type) @@ -894,9 +907,9 @@ static void P_SpawnMapThings(boolean spawnemblems) mt->mobj = NULL; - if (mt->type >= 600 && mt->type <= 609) // item patterns + if (mt->type >= 600 && mt->type <= 611) // item patterns P_SpawnItemPattern(mt, false); - else if (mt->type == 1705 || mt->type == 1713) // hoops + else if (mt->type == 1713) // hoops P_SpawnHoop(mt); else // Everything else P_SpawnMapThing(mt); @@ -908,7 +921,7 @@ static void P_SpawnMapThings(boolean spawnemblems) } // Experimental groovy write function! -void P_WriteThings(void) +/*void P_WriteThings(void) { size_t i, length; mapthing_t *mt; @@ -943,7 +956,7 @@ void P_WriteThings(void) savebuf_p = NULL; CONS_Printf(M_GetText("newthings%d.lmp saved.\n"), gamemap); -} +}*/ // // MAP LOADING FUNCTIONS @@ -1000,9 +1013,7 @@ static void P_InitializeSector(sector_t *ss) ss->extra_colormap = NULL; - ss->gravity = NULL; - ss->verticalflip = false; - ss->flags = SF_FLIPSPECIAL_FLOOR; + ss->gravityptr = NULL; ss->cullheight = NULL; @@ -1044,8 +1055,21 @@ static void P_LoadSectors(UINT8 *data) ss->floorpic_angle = ss->ceilingpic_angle = 0; + ss->floorlightlevel = ss->ceilinglightlevel = 0; + ss->floorlightabsolute = ss->ceilinglightabsolute = false; + ss->colormap_protected = false; + ss->gravity = FRACUNIT; + + ss->flags = MSF_FLIPSPECIAL_FLOOR; + ss->specialflags = 0; + ss->damagetype = SD_NONE; + ss->triggertag = 0; + ss->triggerer = TO_PLAYER; + + ss->friction = ORIG_FRICTION; + P_InitializeSector(ss); } } @@ -1059,6 +1083,8 @@ static void P_InitializeLinedef(line_t *ld) ld->dx = v2->x - v1->x; ld->dy = v2->y - v1->y; + ld->angle = R_PointToAngle2(0, 0, ld->dx, ld->dy); + ld->bbox[BOXLEFT] = min(v1->x, v2->x); ld->bbox[BOXRIGHT] = max(v1->x, v2->x); ld->bbox[BOXBOTTOM] = min(v1->y, v2->y); @@ -1202,7 +1228,7 @@ static void P_LoadSidedefs(UINT8 *data) isfrontside = sd->line->sidenum[0] == i; // Repeat count for midtexture - if (((sd->line->flags & (ML_TWOSIDED|ML_EFFECT5)) == (ML_TWOSIDED|ML_EFFECT5)) + if (((sd->line->flags & (ML_TWOSIDED|ML_WRAPMIDTEX)) == (ML_TWOSIDED|ML_WRAPMIDTEX)) && !(sd->special >= 300 && sd->special < 500)) // exempt linedef exec specials { sd->repeatcnt = (INT16)(((UINT16)textureoffset) >> 12); @@ -1225,11 +1251,8 @@ static void P_LoadSidedefs(UINT8 *data) case 455: // Fade colormaps! mazmazz 9/12/2018 (:flag_us:) // SoM: R_CreateColormap will only create a colormap in software mode... // Perhaps we should just call it instead of doing the calculations here. - if (!udmf) - { - sd->colormap_data = R_CreateColormapFromLinedef(msd->toptexture, msd->midtexture, msd->bottomtexture); - sd->toptexture = sd->midtexture = sd->bottomtexture = 0; - } + sd->colormap_data = R_CreateColormapFromLinedef(msd->toptexture, msd->midtexture, msd->bottomtexture); + sd->toptexture = sd->midtexture = sd->bottomtexture = 0; break; case 413: // Change music @@ -1251,7 +1274,7 @@ static void P_LoadSidedefs(UINT8 *data) sd->midtexture = get_number(process); } - sd->text = Z_Malloc(7, PU_LEVEL, NULL); + sd->text = Z_Malloc(7, PU_LEVEL, NULL); if (isfrontside && !(msd->toptexture[0] == '-' && msd->toptexture[1] == '\0')) { M_Memcpy(process,msd->toptexture,8); @@ -1271,7 +1294,6 @@ static void P_LoadSidedefs(UINT8 *data) } case 4: // Speed pad parameters - case 414: // Play SFX { sd->toptexture = sd->midtexture = sd->bottomtexture = 0; if (msd->toptexture[0] != '-' || msd->toptexture[1] != '\0') @@ -1284,17 +1306,23 @@ static void P_LoadSidedefs(UINT8 *data) break; } + case 414: // Play SFX + { + sd->toptexture = sd->midtexture = sd->bottomtexture = 0; + if (msd->toptexture[0] != '-' || msd->toptexture[1] != '\0') + { + char process[8 + 1]; + M_Memcpy(process, msd->toptexture, 8); + process[8] = '\0'; + sd->text = Z_Malloc(strlen(process) + 1, PU_LEVEL, NULL); + M_Memcpy(sd->text, process, strlen(process) + 1); + } + break; + } + case 9: // Mace parameters case 14: // Bustable block parameters case 15: // Fan particle spawner parameters - case 334: // Trigger linedef executor: Object dye - Continuous - case 335: // Trigger linedef executor: Object dye - Each time - case 336: // Trigger linedef executor: Object dye - Once - case 425: // Calls P_SetMobjState on calling mobj - case 434: // Custom Power - case 442: // Calls P_SetMobjState on mobjs of a given type in the tagged sectors - case 461: // Spawns an object on the map based on texture offsets - case 463: // Colorizes an object { char process[8*3+1]; memset(process,0,8*3+1); @@ -1314,8 +1342,16 @@ static void P_LoadSidedefs(UINT8 *data) case 331: // Trigger linedef executor: Skin - Continuous case 332: // Trigger linedef executor: Skin - Each time case 333: // Trigger linedef executor: Skin - Once + case 334: // Trigger linedef executor: Object dye - Continuous + case 335: // Trigger linedef executor: Object dye - Each time + case 336: // Trigger linedef executor: Object dye - Once + case 425: // Calls P_SetMobjState on calling mobj + case 434: // Custom Power + case 442: // Calls P_SetMobjState on mobjs of a given type in the tagged sectors case 443: // Calls a named Lua function case 459: // Control text prompt (named tag) + case 461: // Spawns an object on the map based on texture offsets + case 463: // Colorizes an object { char process[8*3+1]; memset(process,0,8*3+1); @@ -1351,8 +1387,11 @@ static void P_LoadSidedefs(UINT8 *data) if (msd->toptexture[0] == '#') { char *col = msd->toptexture; - sd->toptexture = sd->bottomtexture = - ((col[1]-'0')*100 + (col[2]-'0')*10 + col[3]-'0') + 1; + sd->toptexture = + ((col[1]-'0')*100 + (col[2]-'0')*10 + col[3]-'0')+1; + if (col[4]) // extra num for blendmode + sd->toptexture += (col[4]-'0')*1000; + sd->bottomtexture = sd->toptexture; sd->midtexture = R_TextureNumForName(msd->midtexture); } else @@ -1405,9 +1444,9 @@ UINT32 vertexesPos[UINT16_MAX]; UINT32 sectorsPos[UINT16_MAX]; // Determine total amount of map data in TEXTMAP. -static boolean TextmapCount(UINT8 *data, size_t size) +static boolean TextmapCount(size_t size) { - char *tkn = M_GetToken((char *)data); + const char *tkn = M_TokenizerRead(0); UINT8 brackets = 0; nummapthings = 0; @@ -1419,20 +1458,16 @@ static boolean TextmapCount(UINT8 *data, size_t size) // Look for namespace at the beginning. if (!fastcmp(tkn, "namespace")) { - Z_Free(tkn); CONS_Alert(CONS_ERROR, "No namespace at beginning of lump!\n"); return false; } - Z_Free(tkn); // Check if namespace is valid. - tkn = M_GetToken(NULL); + tkn = M_TokenizerRead(0); if (!fastcmp(tkn, "srb2")) CONS_Alert(CONS_WARNING, "Invalid namespace '%s', only 'srb2' is supported.\n", tkn); - Z_Free(tkn); - tkn = M_GetToken(NULL); - while (tkn && M_GetTokenPos() < size) + while ((tkn = M_TokenizerRead(0)) && M_TokenizerGetEndPos() < size) { // Avoid anything inside bracketed stuff, only look for external keywords. if (brackets) @@ -1444,24 +1479,19 @@ static boolean TextmapCount(UINT8 *data, size_t size) brackets++; // Check for valid fields. else if (fastcmp(tkn, "thing")) - mapthingsPos[nummapthings++] = M_GetTokenPos(); + mapthingsPos[nummapthings++] = M_TokenizerGetEndPos(); else if (fastcmp(tkn, "linedef")) - linesPos[numlines++] = M_GetTokenPos(); + linesPos[numlines++] = M_TokenizerGetEndPos(); else if (fastcmp(tkn, "sidedef")) - sidesPos[numsides++] = M_GetTokenPos(); + sidesPos[numsides++] = M_TokenizerGetEndPos(); else if (fastcmp(tkn, "vertex")) - vertexesPos[numvertexes++] = M_GetTokenPos(); + vertexesPos[numvertexes++] = M_TokenizerGetEndPos(); else if (fastcmp(tkn, "sector")) - sectorsPos[numsectors++] = M_GetTokenPos(); + sectorsPos[numsectors++] = M_TokenizerGetEndPos(); else CONS_Alert(CONS_NOTICE, "Unknown field '%s'.\n", tkn); - - Z_Free(tkn); - tkn = M_GetToken(NULL); } - Z_Free(tkn); - if (brackets) { CONS_Alert(CONS_ERROR, "Unclosed brackets detected in textmap lump.\n"); @@ -1471,7 +1501,7 @@ static boolean TextmapCount(UINT8 *data, size_t size) return true; } -static void ParseTextmapVertexParameter(UINT32 i, char *param, char *val) +static void ParseTextmapVertexParameter(UINT32 i, const char *param, const char *val) { if (fastcmp(param, "x")) vertexes[i].x = FLOAT_TO_FIXED(atof(val)); @@ -1502,7 +1532,23 @@ typedef struct textmap_colormap_s { textmap_colormap_t textmap_colormap = { false, 0, 25, 0, 25, 0, 31, 0 }; -static void ParseTextmapSectorParameter(UINT32 i, char *param, char *val) +typedef enum +{ + PD_A = 1, + PD_B = 1<<1, + PD_C = 1<<2, + PD_D = 1<<3, +} planedef_t; + +typedef struct textmap_plane_s { + UINT8 defined; + fixed_t a, b, c, d; +} textmap_plane_t; + +textmap_plane_t textmap_planefloor = {0, 0, 0, 0, 0}; +textmap_plane_t textmap_planeceiling = {0, 0, 0, 0, 0}; + +static void ParseTextmapSectorParameter(UINT32 i, const char *param, const char *val) { if (fastcmp(param, "heightfloor")) sectors[i].floorheight = atol(val) << FRACBITS; @@ -1514,13 +1560,19 @@ static void ParseTextmapSectorParameter(UINT32 i, char *param, char *val) sectors[i].ceilingpic = P_AddLevelFlat(val, foundflats); else if (fastcmp(param, "lightlevel")) sectors[i].lightlevel = atol(val); - else if (fastcmp(param, "special")) - sectors[i].special = atol(val); + else if (fastcmp(param, "lightfloor")) + sectors[i].floorlightlevel = atol(val); + else if (fastcmp(param, "lightfloorabsolute") && fastcmp("true", val)) + sectors[i].floorlightabsolute = true; + else if (fastcmp(param, "lightceiling")) + sectors[i].ceilinglightlevel = atol(val); + else if (fastcmp(param, "lightceilingabsolute") && fastcmp("true", val)) + sectors[i].ceilinglightabsolute = true; else if (fastcmp(param, "id")) Tag_FSet(§ors[i].tags, atol(val)); else if (fastcmp(param, "moreids")) { - char* id = val; + const char* id = val; while (id) { Tag_Add(§ors[i].tags, atol(id)); @@ -1540,6 +1592,46 @@ static void ParseTextmapSectorParameter(UINT32 i, char *param, char *val) sectors[i].floorpic_angle = FixedAngle(FLOAT_TO_FIXED(atof(val))); else if (fastcmp(param, "rotationceiling")) sectors[i].ceilingpic_angle = FixedAngle(FLOAT_TO_FIXED(atof(val))); + else if (fastcmp(param, "floorplane_a")) + { + textmap_planefloor.defined |= PD_A; + textmap_planefloor.a = FLOAT_TO_FIXED(atof(val)); + } + else if (fastcmp(param, "floorplane_b")) + { + textmap_planefloor.defined |= PD_B; + textmap_planefloor.b = FLOAT_TO_FIXED(atof(val)); + } + else if (fastcmp(param, "floorplane_c")) + { + textmap_planefloor.defined |= PD_C; + textmap_planefloor.c = FLOAT_TO_FIXED(atof(val)); + } + else if (fastcmp(param, "floorplane_d")) + { + textmap_planefloor.defined |= PD_D; + textmap_planefloor.d = FLOAT_TO_FIXED(atof(val)); + } + else if (fastcmp(param, "ceilingplane_a")) + { + textmap_planeceiling.defined |= PD_A; + textmap_planeceiling.a = FLOAT_TO_FIXED(atof(val)); + } + else if (fastcmp(param, "ceilingplane_b")) + { + textmap_planeceiling.defined |= PD_B; + textmap_planeceiling.b = FLOAT_TO_FIXED(atof(val)); + } + else if (fastcmp(param, "ceilingplane_c")) + { + textmap_planeceiling.defined |= PD_C; + textmap_planeceiling.c = FLOAT_TO_FIXED(atof(val)); + } + else if (fastcmp(param, "ceilingplane_d")) + { + textmap_planeceiling.defined |= PD_D; + textmap_planeceiling.d = FLOAT_TO_FIXED(atof(val)); + } else if (fastcmp(param, "lightcolor")) { textmap_colormap.used = true; @@ -1582,9 +1674,105 @@ static void ParseTextmapSectorParameter(UINT32 i, char *param, char *val) } else if (fastcmp(param, "colormapprotected") && fastcmp("true", val)) sectors[i].colormap_protected = true; + else if (fastcmp(param, "flipspecial_nofloor") && fastcmp("true", val)) + sectors[i].flags &= ~MSF_FLIPSPECIAL_FLOOR; + else if (fastcmp(param, "flipspecial_ceiling") && fastcmp("true", val)) + sectors[i].flags |= MSF_FLIPSPECIAL_CEILING; + else if (fastcmp(param, "triggerspecial_touch") && fastcmp("true", val)) + sectors[i].flags |= MSF_TRIGGERSPECIAL_TOUCH; + else if (fastcmp(param, "triggerspecial_headbump") && fastcmp("true", val)) + sectors[i].flags |= MSF_TRIGGERSPECIAL_HEADBUMP; + else if (fastcmp(param, "triggerline_plane") && fastcmp("true", val)) + sectors[i].flags |= MSF_TRIGGERLINE_PLANE; + else if (fastcmp(param, "triggerline_mobj") && fastcmp("true", val)) + sectors[i].flags |= MSF_TRIGGERLINE_MOBJ; + else if (fastcmp(param, "invertprecip") && fastcmp("true", val)) + sectors[i].flags |= MSF_INVERTPRECIP; + else if (fastcmp(param, "gravityflip") && fastcmp("true", val)) + sectors[i].flags |= MSF_GRAVITYFLIP; + else if (fastcmp(param, "heatwave") && fastcmp("true", val)) + sectors[i].flags |= MSF_HEATWAVE; + else if (fastcmp(param, "noclipcamera") && fastcmp("true", val)) + sectors[i].flags |= MSF_NOCLIPCAMERA; + else if (fastcmp(param, "outerspace") && fastcmp("true", val)) + sectors[i].specialflags |= SSF_OUTERSPACE; + else if (fastcmp(param, "doublestepup") && fastcmp("true", val)) + sectors[i].specialflags |= SSF_DOUBLESTEPUP; + else if (fastcmp(param, "nostepdown") && fastcmp("true", val)) + sectors[i].specialflags |= SSF_NOSTEPDOWN; + else if (fastcmp(param, "speedpad") && fastcmp("true", val)) + sectors[i].specialflags |= SSF_SPEEDPAD; + else if (fastcmp(param, "starpostactivator") && fastcmp("true", val)) + sectors[i].specialflags |= SSF_STARPOSTACTIVATOR; + else if (fastcmp(param, "exit") && fastcmp("true", val)) + sectors[i].specialflags |= SSF_EXIT; + else if (fastcmp(param, "specialstagepit") && fastcmp("true", val)) + sectors[i].specialflags |= SSF_SPECIALSTAGEPIT; + else if (fastcmp(param, "returnflag") && fastcmp("true", val)) + sectors[i].specialflags |= SSF_RETURNFLAG; + else if (fastcmp(param, "redteambase") && fastcmp("true", val)) + sectors[i].specialflags |= SSF_REDTEAMBASE; + else if (fastcmp(param, "blueteambase") && fastcmp("true", val)) + sectors[i].specialflags |= SSF_BLUETEAMBASE; + else if (fastcmp(param, "fan") && fastcmp("true", val)) + sectors[i].specialflags |= SSF_FAN; + else if (fastcmp(param, "supertransform") && fastcmp("true", val)) + sectors[i].specialflags |= SSF_SUPERTRANSFORM; + else if (fastcmp(param, "forcespin") && fastcmp("true", val)) + sectors[i].specialflags |= SSF_FORCESPIN; + else if (fastcmp(param, "zoomtubestart") && fastcmp("true", val)) + sectors[i].specialflags |= SSF_ZOOMTUBESTART; + else if (fastcmp(param, "zoomtubeend") && fastcmp("true", val)) + sectors[i].specialflags |= SSF_ZOOMTUBEEND; + else if (fastcmp(param, "finishline") && fastcmp("true", val)) + sectors[i].specialflags |= SSF_FINISHLINE; + else if (fastcmp(param, "ropehang") && fastcmp("true", val)) + sectors[i].specialflags |= SSF_ROPEHANG; + else if (fastcmp(param, "jumpflip") && fastcmp("true", val)) + sectors[i].specialflags |= SSF_JUMPFLIP; + else if (fastcmp(param, "gravityoverride") && fastcmp("true", val)) + sectors[i].specialflags |= SSF_GRAVITYOVERRIDE; + else if (fastcmp(param, "friction")) + sectors[i].friction = FLOAT_TO_FIXED(atof(val)); + else if (fastcmp(param, "gravity")) + sectors[i].gravity = FLOAT_TO_FIXED(atof(val)); + else if (fastcmp(param, "damagetype")) + { + if (fastcmp(val, "Generic")) + sectors[i].damagetype = SD_GENERIC; + if (fastcmp(val, "Water")) + sectors[i].damagetype = SD_WATER; + if (fastcmp(val, "Fire")) + sectors[i].damagetype = SD_FIRE; + if (fastcmp(val, "Lava")) + sectors[i].damagetype = SD_LAVA; + if (fastcmp(val, "Electric")) + sectors[i].damagetype = SD_ELECTRIC; + if (fastcmp(val, "Spike")) + sectors[i].damagetype = SD_SPIKE; + if (fastcmp(val, "DeathPitTilt")) + sectors[i].damagetype = SD_DEATHPITTILT; + if (fastcmp(val, "DeathPitNoTilt")) + sectors[i].damagetype = SD_DEATHPITNOTILT; + if (fastcmp(val, "Instakill")) + sectors[i].damagetype = SD_INSTAKILL; + if (fastcmp(val, "SpecialStage")) + sectors[i].damagetype = SD_SPECIALSTAGE; + } + else if (fastcmp(param, "triggertag")) + sectors[i].triggertag = atol(val); + else if (fastcmp(param, "triggerer")) + { + if (fastcmp(val, "Player")) + sectors[i].triggerer = TO_PLAYER; + if (fastcmp(val, "AllPlayers")) + sectors[i].triggerer = TO_ALLPLAYERS; + if (fastcmp(val, "Mobj")) + sectors[i].triggerer = TO_MOBJ; + } } -static void ParseTextmapSidedefParameter(UINT32 i, char *param, char *val) +static void ParseTextmapSidedefParameter(UINT32 i, const char *param, const char *val) { if (fastcmp(param, "offsetx")) sides[i].textureoffset = atol(val)< 9) { - size_t argnum = param[3] - '0'; + size_t argnum = atol(param + 9); if (argnum >= NUMLINESTRINGARGS) return; lines[i].stringargs[argnum] = Z_Malloc(strlen(val) + 1, PU_LEVEL, NULL); @@ -1643,6 +1831,21 @@ static void ParseTextmapLinedefParameter(UINT32 i, char *param, char *val) lines[i].sidenum[1] = atol(val); else if (fastcmp(param, "alpha")) lines[i].alpha = FLOAT_TO_FIXED(atof(val)); + else if (fastcmp(param, "blendmode") || fastcmp(param, "renderstyle")) + { + if (fastcmp(val, "translucent")) + lines[i].blendmode = AST_COPY; + else if (fastcmp(val, "add")) + lines[i].blendmode = AST_ADD; + else if (fastcmp(val, "subtract")) + lines[i].blendmode = AST_SUBTRACT; + else if (fastcmp(val, "reversesubtract")) + lines[i].blendmode = AST_REVERSESUBTRACT; + else if (fastcmp(val, "modulate")) + lines[i].blendmode = AST_MODULATE; + if (fastcmp(val, "fog")) + lines[i].blendmode = AST_FOG; + } else if (fastcmp(param, "executordelay")) lines[i].executordelay = atol(val); @@ -1658,19 +1861,19 @@ static void ParseTextmapLinedefParameter(UINT32 i, char *param, char *val) else if (fastcmp(param, "dontpegbottom") && fastcmp("true", val)) lines[i].flags |= ML_DONTPEGBOTTOM; else if (fastcmp(param, "skewtd") && fastcmp("true", val)) - lines[i].flags |= ML_EFFECT1; + lines[i].flags |= ML_SKEWTD; else if (fastcmp(param, "noclimb") && fastcmp("true", val)) lines[i].flags |= ML_NOCLIMB; else if (fastcmp(param, "noskew") && fastcmp("true", val)) - lines[i].flags |= ML_EFFECT2; + lines[i].flags |= ML_NOSKEW; else if (fastcmp(param, "midpeg") && fastcmp("true", val)) - lines[i].flags |= ML_EFFECT3; + lines[i].flags |= ML_MIDPEG; else if (fastcmp(param, "midsolid") && fastcmp("true", val)) - lines[i].flags |= ML_EFFECT4; + lines[i].flags |= ML_MIDSOLID; else if (fastcmp(param, "wrapmidtex") && fastcmp("true", val)) - lines[i].flags |= ML_EFFECT5; - else if (fastcmp(param, "effect6") && fastcmp("true", val)) - lines[i].flags |= ML_EFFECT6; + lines[i].flags |= ML_WRAPMIDTEX; + /*else if (fastcmp(param, "effect6") && fastcmp("true", val)) + lines[i].flags |= ML_EFFECT6;*/ else if (fastcmp(param, "nonet") && fastcmp("true", val)) lines[i].flags |= ML_NONET; else if (fastcmp(param, "netonly") && fastcmp("true", val)) @@ -1681,13 +1884,13 @@ static void ParseTextmapLinedefParameter(UINT32 i, char *param, char *val) lines[i].flags |= ML_TFERLINE; } -static void ParseTextmapThingParameter(UINT32 i, char *param, char *val) +static void ParseTextmapThingParameter(UINT32 i, const char *param, const char *val) { if (fastcmp(param, "id")) Tag_FSet(&mapthings[i].tags, atol(val)); else if (fastcmp(param, "moreids")) { - char* id = val; + const char* id = val; while (id) { Tag_Add(&mapthings[i].tags, atol(id)); @@ -1712,18 +1915,12 @@ static void ParseTextmapThingParameter(UINT32 i, char *param, char *val) else if (fastcmp(param, "scale") || fastcmp(param, "scalex") || fastcmp(param, "scaley")) mapthings[i].scale = FLOAT_TO_FIXED(atof(val)); // Flags - else if (fastcmp(param, "extra") && fastcmp("true", val)) - mapthings[i].options |= MTF_EXTRA; else if (fastcmp(param, "flip") && fastcmp("true", val)) mapthings[i].options |= MTF_OBJECTFLIP; - else if (fastcmp(param, "objectspecial") && fastcmp("true", val)) - mapthings[i].options |= MTF_OBJECTSPECIAL; - else if (fastcmp(param, "ambush") && fastcmp("true", val)) - mapthings[i].options |= MTF_AMBUSH; - else if (strlen(param) == 7 && fastncmp(param, "arg", 3) && fastncmp(param + 4, "str", 3)) + else if (fastncmp(param, "stringarg", 9) && strlen(param) > 9) { - size_t argnum = param[3] - '0'; + size_t argnum = atol(param + 9); if (argnum >= NUMMAPTHINGSTRINGARGS) return; mapthings[i].stringargs[argnum] = Z_Malloc(strlen(val) + 1, PU_LEVEL, NULL); @@ -1744,32 +1941,25 @@ static void ParseTextmapThingParameter(UINT32 i, char *param, char *val) * \param Structure number (mapthings, sectors, ...). * \param Parser function pointer. */ -static void TextmapParse(UINT32 dataPos, size_t num, void (*parser)(UINT32, char *, char *)) +static void TextmapParse(UINT32 dataPos, size_t num, void (*parser)(UINT32, const char *, const char *)) { - char *param, *val; + const char *param, *val; - M_SetTokenPos(dataPos); - param = M_GetToken(NULL); + M_TokenizerSetEndPos(dataPos); + param = M_TokenizerRead(0); if (!fastcmp(param, "{")) { - Z_Free(param); CONS_Alert(CONS_WARNING, "Invalid UDMF data capsule!\n"); return; } - Z_Free(param); while (true) { - param = M_GetToken(NULL); + param = M_TokenizerRead(0); if (fastcmp(param, "}")) - { - Z_Free(param); break; - } - val = M_GetToken(NULL); + val = M_TokenizerRead(1); parser(num, param, val); - Z_Free(param); - Z_Free(val); } } @@ -1798,6 +1988,29 @@ static void TextmapFixFlatOffsets(sector_t *sec) } } +static void TextmapUnfixFlatOffsets(sector_t *sec) +{ + if (sec->floorpic_angle) + { + fixed_t pc = FINECOSINE(sec->floorpic_angle >> ANGLETOFINESHIFT); + fixed_t ps = FINESINE(sec->floorpic_angle >> ANGLETOFINESHIFT); + fixed_t xoffs = sec->floor_xoffs; + fixed_t yoffs = sec->floor_yoffs; + sec->floor_xoffs = (FixedMul(xoffs, ps) % MAXFLATSIZE) + (FixedMul(yoffs, pc) % MAXFLATSIZE); + sec->floor_yoffs = (FixedMul(xoffs, pc) % MAXFLATSIZE) - (FixedMul(yoffs, ps) % MAXFLATSIZE); + } + + if (sec->ceilingpic_angle) + { + fixed_t pc = FINECOSINE(sec->ceilingpic_angle >> ANGLETOFINESHIFT); + fixed_t ps = FINESINE(sec->ceilingpic_angle >> ANGLETOFINESHIFT); + fixed_t xoffs = sec->ceiling_xoffs; + fixed_t yoffs = sec->ceiling_yoffs; + sec->ceiling_xoffs = (FixedMul(xoffs, ps) % MAXFLATSIZE) + (FixedMul(yoffs, pc) % MAXFLATSIZE); + sec->ceiling_yoffs = (FixedMul(xoffs, pc) % MAXFLATSIZE) - (FixedMul(yoffs, ps) % MAXFLATSIZE); + } +} + static INT32 P_ColorToRGBA(INT32 color, UINT8 alpha) { UINT8 r = (color >> 16) & 0xFF; @@ -1806,6 +2019,679 @@ static INT32 P_ColorToRGBA(INT32 color, UINT8 alpha) return R_PutRgbaRGBA(r, g, b, alpha); } +static INT32 P_RGBAToColor(INT32 rgba) +{ + UINT8 r = R_GetRgbaR(rgba); + UINT8 g = R_GetRgbaG(rgba); + UINT8 b = R_GetRgbaB(rgba); + return (r << 16) | (g << 8) | b; +} + +typedef struct +{ + mapthing_t *teleport; + mapthing_t *altview; + mapthing_t *angleanchor; +} sectorspecialthings_t; + +static void P_WriteTextmap(void) +{ + size_t i, j; + FILE *f; + char *filepath = va(pandf, srb2home, "TEXTMAP"); + mtag_t firsttag; + mapthing_t *wmapthings; + vertex_t *wvertexes; + sector_t *wsectors; + line_t *wlines; + side_t *wsides; + mtag_t freetag; + sectorspecialthings_t *specialthings; + + f = fopen(filepath, "w"); + if (!f) + { + CONS_Alert(CONS_ERROR, M_GetText("Couldn't save map file %s\n"), filepath); + return; + } + + wmapthings = Z_Calloc(nummapthings * sizeof(*mapthings), PU_LEVEL, NULL); + wvertexes = Z_Calloc(numvertexes * sizeof(*vertexes), PU_LEVEL, NULL); + wsectors = Z_Calloc(numsectors * sizeof(*sectors), PU_LEVEL, NULL); + wlines = Z_Calloc(numlines * sizeof(*lines), PU_LEVEL, NULL); + wsides = Z_Calloc(numsides * sizeof(*sides), PU_LEVEL, NULL); + specialthings = Z_Calloc(numsectors * sizeof(*sectors), PU_LEVEL, NULL); + + memcpy(wmapthings, mapthings, nummapthings * sizeof(*mapthings)); + memcpy(wvertexes, vertexes, numvertexes * sizeof(*vertexes)); + memcpy(wsectors, sectors, numsectors * sizeof(*sectors)); + memcpy(wlines, lines, numlines * sizeof(*lines)); + memcpy(wsides, sides, numsides * sizeof(*sides)); + + for (i = 0; i < nummapthings; i++) + if (mapthings[i].tags.count) + wmapthings[i].tags.tags = memcpy(Z_Malloc(mapthings[i].tags.count * sizeof(mtag_t), PU_LEVEL, NULL), mapthings[i].tags.tags, mapthings[i].tags.count * sizeof(mtag_t)); + + for (i = 0; i < numsectors; i++) + if (sectors[i].tags.count) + wsectors[i].tags.tags = memcpy(Z_Malloc(sectors[i].tags.count*sizeof(mtag_t), PU_LEVEL, NULL), sectors[i].tags.tags, sectors[i].tags.count*sizeof(mtag_t)); + + for (i = 0; i < numlines; i++) + if (lines[i].tags.count) + wlines[i].tags.tags = memcpy(Z_Malloc(lines[i].tags.count * sizeof(mtag_t), PU_LEVEL, NULL), lines[i].tags.tags, lines[i].tags.count * sizeof(mtag_t)); + + freetag = Tag_NextUnused(0); + + for (i = 0; i < nummapthings; i++) + { + subsector_t *ss; + INT32 s; + + if (wmapthings[i].type != 751 && wmapthings[i].type != 752 && wmapthings[i].type != 758) + continue; + + ss = R_PointInSubsector(wmapthings[i].x << FRACBITS, wmapthings[i].y << FRACBITS); + + if (!ss) + continue; + + s = ss->sector - sectors; + + switch (wmapthings[i].type) + { + case 751: + if (!specialthings[s].teleport) + specialthings[s].teleport = &wmapthings[i]; + break; + case 752: + if (!specialthings[s].altview) + specialthings[s].altview = &wmapthings[i]; + break; + case 758: + if (!specialthings[s].angleanchor) + specialthings[s].angleanchor = &wmapthings[i]; + break; + default: + break; + } + } + + for (i = 0; i < numlines; i++) + { + INT32 s; + + switch (wlines[i].special) + { + case 1: + TAG_ITER_SECTORS(Tag_FGet(&wlines[i].tags), s) + { + CONS_Alert(CONS_WARNING, M_GetText("Linedef %s applies custom gravity to sector %d. Changes to this gravity at runtime will not be reflected in the converted map. Use linedef type 469 for this.\n"), sizeu1(i), s); + wsectors[s].gravity = FixedDiv(lines[i].frontsector->floorheight >> FRACBITS, 1000); + } + break; + case 2: + CONS_Alert(CONS_WARNING, M_GetText("Custom exit linedef %s detected. Changes to the next map at runtime will not be reflected in the converted map. Use linedef type 468 for this.\n"), sizeu1(i)); + wlines[i].args[0] = lines[i].frontsector->floorheight >> FRACBITS; + wlines[i].args[2] = lines[i].frontsector->ceilingheight >> FRACBITS; + break; + case 5: + case 50: + case 51: + CONS_Alert(CONS_WARNING, M_GetText("Linedef %s has type %d, which is not supported in UDMF.\n"), sizeu1(i), wlines[i].special); + break; + case 61: + if (wlines[i].flags & ML_MIDSOLID) + continue; + if (!wlines[i].args[1]) + continue; + CONS_Alert(CONS_WARNING, M_GetText("Linedef %s with crusher type 61 rises twice as fast on spawn. This behavior is not supported in UDMF.\n"), sizeu1(i)); + break; + case 76: + if (freetag == (mtag_t)MAXTAGS) + { + CONS_Alert(CONS_WARNING, M_GetText("No unused tag found. Linedef %s with type 76 cannot be converted.\n"), sizeu1(i)); + break; + } + TAG_ITER_SECTORS(wlines[i].args[0], s) + for (j = 0; (unsigned)j < wsectors[s].linecount; j++) + { + line_t *line = wsectors[s].lines[j] - lines + wlines; + if (line->special < 100 || line->special >= 300) + continue; + Tag_Add(&line->tags, freetag); + } + wlines[i].args[0] = freetag; + freetag = Tag_NextUnused(freetag); + break; + case 259: + if (wlines[i].args[3] & FOF_QUICKSAND) + CONS_Alert(CONS_WARNING, M_GetText("Quicksand properties of custom FOF on linedef %s cannot be converted. Use linedef type 75 instead.\n"), sizeu1(i)); + if (wlines[i].args[3] & FOF_BUSTUP) + CONS_Alert(CONS_WARNING, M_GetText("Bustable properties of custom FOF on linedef %s cannot be converted. Use linedef type 74 instead.\n"), sizeu1(i)); + break; + case 412: + if ((s = Tag_Iterate_Sectors(wlines[i].args[0], 0)) < 0) + break; + if (!specialthings[s].teleport) + break; + if (freetag == (mtag_t)MAXTAGS) + { + CONS_Alert(CONS_WARNING, M_GetText("No unused tag found. Linedef %s with type 412 cannot be converted.\n"), sizeu1(i)); + break; + } + Tag_Add(&specialthings[s].teleport->tags, freetag); + wlines[i].args[0] = freetag; + freetag = Tag_NextUnused(freetag); + break; + case 422: + if ((s = Tag_Iterate_Sectors(wlines[i].args[0], 0)) < 0) + break; + if (!specialthings[s].altview) + break; + if (freetag == (mtag_t)MAXTAGS) + { + CONS_Alert(CONS_WARNING, M_GetText("No unused tag found. Linedef %s with type 422 cannot be converted.\n"), sizeu1(i)); + break; + } + Tag_Add(&specialthings[s].altview->tags, freetag); + wlines[i].args[0] = freetag; + specialthings[s].altview->pitch = wlines[i].args[2]; + freetag = Tag_NextUnused(freetag); + break; + case 447: + CONS_Alert(CONS_WARNING, M_GetText("Linedef %s has change colormap action, which cannot be converted automatically. Tag arg0 to a sector with the desired colormap.\n"), sizeu1(i)); + if (wlines[i].flags & ML_TFERLINE) + CONS_Alert(CONS_WARNING, M_GetText("Linedef %s mixes front and back colormaps, which is not supported in UDMF. Copy one colormap to the target sector first, then mix in the second one.\n"), sizeu1(i)); + break; + case 455: + CONS_Alert(CONS_WARNING, M_GetText("Linedef %s has fade colormap action, which cannot be converted automatically. Tag arg0 to a sector with the desired colormap.\n"), sizeu1(i)); + if (wlines[i].flags & ML_TFERLINE) + CONS_Alert(CONS_WARNING, M_GetText("Linedef %s specifies starting colormap for the fade, which is not supported in UDMF. Change the colormap with linedef type 447 instead.\n"), sizeu1(i)); + break; + case 457: + if ((s = Tag_Iterate_Sectors(wlines[i].args[0], 0)) < 0) + break; + if (!specialthings[s].angleanchor) + break; + if (freetag == (mtag_t)MAXTAGS) + { + CONS_Alert(CONS_WARNING, M_GetText("No unused tag found. Linedef %s with type 457 cannot be converted.\n"), sizeu1(i)); + break; + } + Tag_Add(&specialthings[s].angleanchor->tags, freetag); + wlines[i].args[0] = freetag; + freetag = Tag_NextUnused(freetag); + break; + case 606: + if (wlines[i].args[0] == MTAG_GLOBAL) + { + sector_t *sec = wlines[i].frontsector - sectors + wsectors; + sec->extra_colormap = wsides[wlines[i].sidenum[0]].colormap_data; + } + else + { + TAG_ITER_SECTORS(wlines[i].args[0], s) + { + if (wsectors[s].colormap_protected) + continue; + + wsectors[s].extra_colormap = wsides[wlines[i].sidenum[0]].colormap_data; + if (freetag == (mtag_t)MAXTAGS) + { + CONS_Alert(CONS_WARNING, M_GetText("No unused tag found. Linedef %s with type 606 cannot be converted.\n"), sizeu1(i)); + break; + } + Tag_Add(&wsectors[s].tags, freetag); + wlines[i].args[1] = freetag; + freetag = Tag_NextUnused(freetag); + break; + } + } + break; + default: + break; + } + + if (wlines[i].special >= 300 && wlines[i].special < 400 && wlines[i].flags & ML_WRAPMIDTEX) + CONS_Alert(CONS_WARNING, M_GetText("Linedef executor trigger linedef %s has disregard order flag, which is not supported in UDMF.\n"), sizeu1(i)); + } + + for (i = 0; i < numsectors; i++) + { + if (Tag_Find(&wsectors[i].tags, LE_CAPSULE0)) + CONS_Alert(CONS_WARNING, M_GetText("Sector %s has reserved tag %d, which is not supported in UDMF. Use arg3 of the boss mapthing instead.\n"), sizeu1(i), LE_CAPSULE0); + if (Tag_Find(&wsectors[i].tags, LE_CAPSULE1)) + CONS_Alert(CONS_WARNING, M_GetText("Sector %s has reserved tag %d, which is not supported in UDMF. Use arg3 of the boss mapthing instead.\n"), sizeu1(i), LE_CAPSULE1); + if (Tag_Find(&wsectors[i].tags, LE_CAPSULE2)) + CONS_Alert(CONS_WARNING, M_GetText("Sector %s has reserved tag %d, which is not supported in UDMF. Use arg3 of the boss mapthing instead.\n"), sizeu1(i), LE_CAPSULE2); + + switch (GETSECSPECIAL(wsectors[i].special, 1)) + { + case 9: + case 10: + CONS_Alert(CONS_WARNING, M_GetText("Sector %s has ring drainer effect, which is not supported in UDMF. Use linedef type 462 instead.\n"), sizeu1(i)); + break; + case 15: + CONS_Alert(CONS_WARNING, M_GetText("Sector %s has bouncy FOF effect, which is not supported in UDMF. Use linedef type 76 instead.\n"), sizeu1(i)); + break; + default: + break; + } + + switch (GETSECSPECIAL(wsectors[i].special, 2)) + { + case 6: + CONS_Alert(CONS_WARNING, M_GetText("Sector %s has emerald check trigger type, which is not supported in UDMF. Use linedef types 337-339 instead.\n"), sizeu1(i)); + break; + case 7: + CONS_Alert(CONS_WARNING, M_GetText("Sector %s has NiGHTS mare trigger type, which is not supported in UDMF. Use linedef types 340-342 instead.\n"), sizeu1(i)); + break; + case 9: + CONS_Alert(CONS_WARNING, M_GetText("Sector %s has Egg Capsule type, which is not supported in UDMF. Use linedef type 464 instead.\n"), sizeu1(i)); + break; + case 10: + CONS_Alert(CONS_WARNING, M_GetText("Sector %s has special stage time/spheres requirements effect, which is not supported in UDMF. Use the SpecialStageTime and SpecialStageSpheres level header options instead.\n"), sizeu1(i)); + break; + case 11: + CONS_Alert(CONS_WARNING, M_GetText("Sector %s has custom global gravity effect, which is not supported in UDMF. Use the Gravity level header option instead.\n"), sizeu1(i)); + break; + default: + break; + } + } + + fprintf(f, "namespace = \"srb2\";\n"); + for (i = 0; i < nummapthings; i++) + { + fprintf(f, "thing // %s\n", sizeu1(i)); + fprintf(f, "{\n"); + firsttag = Tag_FGet(&wmapthings[i].tags); + if (firsttag != 0) + fprintf(f, "id = %d;\n", firsttag); + if (wmapthings[i].tags.count > 1) + { + fprintf(f, "moreids = \""); + for (j = 1; j < wmapthings[i].tags.count; j++) + { + if (j > 1) + fprintf(f, " "); + fprintf(f, "%d", wmapthings[i].tags.tags[j]); + } + fprintf(f, "\";\n"); + } + fprintf(f, "x = %d;\n", wmapthings[i].x); + fprintf(f, "y = %d;\n", wmapthings[i].y); + if (wmapthings[i].z != 0) + fprintf(f, "height = %d;\n", wmapthings[i].z); + fprintf(f, "angle = %d;\n", wmapthings[i].angle); + if (wmapthings[i].pitch != 0) + fprintf(f, "pitch = %d;\n", wmapthings[i].pitch); + if (wmapthings[i].roll != 0) + fprintf(f, "roll = %d;\n", wmapthings[i].roll); + if (wmapthings[i].type != 0) + fprintf(f, "type = %d;\n", wmapthings[i].type); + if (wmapthings[i].scale != FRACUNIT) + fprintf(f, "scale = %f;\n", FIXED_TO_FLOAT(wmapthings[i].scale)); + if (wmapthings[i].options & MTF_OBJECTFLIP) + fprintf(f, "flip = true;\n"); + for (j = 0; j < NUMMAPTHINGARGS; j++) + if (wmapthings[i].args[j] != 0) + fprintf(f, "arg%s = %d;\n", sizeu1(j), wmapthings[i].args[j]); + for (j = 0; j < NUMMAPTHINGSTRINGARGS; j++) + if (mapthings[i].stringargs[j]) + fprintf(f, "stringarg%s = \"%s\";\n", sizeu1(j), mapthings[i].stringargs[j]); + fprintf(f, "}\n"); + fprintf(f, "\n"); + } + + for (i = 0; i < numvertexes; i++) + { + fprintf(f, "vertex // %s\n", sizeu1(i)); + fprintf(f, "{\n"); + fprintf(f, "x = %f;\n", FIXED_TO_FLOAT(wvertexes[i].x)); + fprintf(f, "y = %f;\n", FIXED_TO_FLOAT(wvertexes[i].y)); + if (wvertexes[i].floorzset) + fprintf(f, "zfloor = %f;\n", FIXED_TO_FLOAT(wvertexes[i].floorz)); + if (wvertexes[i].ceilingzset) + fprintf(f, "zceiling = %f;\n", FIXED_TO_FLOAT(wvertexes[i].ceilingz)); + fprintf(f, "}\n"); + fprintf(f, "\n"); + } + + for (i = 0; i < numlines; i++) + { + fprintf(f, "linedef // %s\n", sizeu1(i)); + fprintf(f, "{\n"); + fprintf(f, "v1 = %s;\n", sizeu1(wlines[i].v1 - vertexes)); + fprintf(f, "v2 = %s;\n", sizeu1(wlines[i].v2 - vertexes)); + fprintf(f, "sidefront = %d;\n", wlines[i].sidenum[0]); + if (wlines[i].sidenum[1] != 0xffff) + fprintf(f, "sideback = %d;\n", wlines[i].sidenum[1]); + firsttag = Tag_FGet(&wlines[i].tags); + if (firsttag != 0) + fprintf(f, "id = %d;\n", firsttag); + if (wlines[i].tags.count > 1) + { + fprintf(f, "moreids = \""); + for (j = 1; j < wlines[i].tags.count; j++) + { + if (j > 1) + fprintf(f, " "); + fprintf(f, "%d", wlines[i].tags.tags[j]); + } + fprintf(f, "\";\n"); + } + if (wlines[i].special != 0) + fprintf(f, "special = %d;\n", wlines[i].special); + for (j = 0; j < NUMLINEARGS; j++) + if (wlines[i].args[j] != 0) + fprintf(f, "arg%s = %d;\n", sizeu1(j), wlines[i].args[j]); + for (j = 0; j < NUMLINESTRINGARGS; j++) + if (lines[i].stringargs[j]) + fprintf(f, "stringarg%s = \"%s\";\n", sizeu1(j), lines[i].stringargs[j]); + if (wlines[i].alpha != FRACUNIT) + fprintf(f, "alpha = %f;\n", FIXED_TO_FLOAT(wlines[i].alpha)); + if (wlines[i].blendmode != AST_COPY) + { + switch (wlines[i].blendmode) + { + case AST_ADD: + fprintf(f, "renderstyle = \"add\";\n"); + break; + case AST_SUBTRACT: + fprintf(f, "renderstyle = \"subtract\";\n"); + break; + case AST_REVERSESUBTRACT: + fprintf(f, "renderstyle = \"reversesubtract\";\n"); + break; + case AST_MODULATE: + fprintf(f, "renderstyle = \"modulate\";\n"); + break; + case AST_FOG: + fprintf(f, "renderstyle = \"fog\";\n"); + break; + default: + break; + } + } + if (wlines[i].executordelay != 0 && wlines[i].backsector) + { + CONS_Alert(CONS_WARNING, M_GetText("Linedef %s has an executor delay. Changes to the delay at runtime will not be reflected in the converted map. Use linedef type 465 for this.\n"), sizeu1(i)); + fprintf(f, "executordelay = %d;\n", (wlines[i].backsector->ceilingheight >> FRACBITS) + (wlines[i].backsector->floorheight >> FRACBITS)); + } + if (wlines[i].flags & ML_IMPASSIBLE) + fprintf(f, "blocking = true;\n"); + if (wlines[i].flags & ML_BLOCKMONSTERS) + fprintf(f, "blockmonsters = true;\n"); + if (wlines[i].flags & ML_TWOSIDED) + fprintf(f, "twosided = true;\n"); + if (wlines[i].flags & ML_DONTPEGTOP) + fprintf(f, "dontpegtop = true;\n"); + if (wlines[i].flags & ML_DONTPEGBOTTOM) + fprintf(f, "dontpegbottom = true;\n"); + if (wlines[i].flags & ML_SKEWTD) + fprintf(f, "skewtd = true;\n"); + if (wlines[i].flags & ML_NOCLIMB) + fprintf(f, "noclimb = true;\n"); + if (wlines[i].flags & ML_NOSKEW) + fprintf(f, "noskew = true;\n"); + if (wlines[i].flags & ML_MIDPEG) + fprintf(f, "midpeg = true;\n"); + if (wlines[i].flags & ML_MIDSOLID) + fprintf(f, "midsolid = true;\n"); + if (wlines[i].flags & ML_WRAPMIDTEX) + fprintf(f, "wrapmidtex = true;\n"); + if (wlines[i].flags & ML_NONET) + fprintf(f, "nonet = true;\n"); + if (wlines[i].flags & ML_NETONLY) + fprintf(f, "netonly = true;\n"); + if (wlines[i].flags & ML_BOUNCY) + fprintf(f, "bouncy = true;\n"); + if (wlines[i].flags & ML_TFERLINE) + fprintf(f, "transfer = true;\n"); + fprintf(f, "}\n"); + fprintf(f, "\n"); + } + + for (i = 0; i < numsides; i++) + { + fprintf(f, "sidedef // %s\n", sizeu1(i)); + fprintf(f, "{\n"); + fprintf(f, "sector = %s;\n", sizeu1(wsides[i].sector - sectors)); + if (wsides[i].textureoffset != 0) + fprintf(f, "offsetx = %d;\n", wsides[i].textureoffset >> FRACBITS); + if (wsides[i].rowoffset != 0) + fprintf(f, "offsety = %d;\n", wsides[i].rowoffset >> FRACBITS); + if (wsides[i].toptexture > 0 && wsides[i].toptexture < numtextures) + fprintf(f, "texturetop = \"%.*s\";\n", 8, textures[wsides[i].toptexture]->name); + if (wsides[i].bottomtexture > 0 && wsides[i].bottomtexture < numtextures) + fprintf(f, "texturebottom = \"%.*s\";\n", 8, textures[wsides[i].bottomtexture]->name); + if (wsides[i].midtexture > 0 && wsides[i].midtexture < numtextures) + fprintf(f, "texturemiddle = \"%.*s\";\n", 8, textures[wsides[i].midtexture]->name); + if (wsides[i].repeatcnt != 0) + fprintf(f, "repeatcnt = %d;\n", wsides[i].repeatcnt); + fprintf(f, "}\n"); + fprintf(f, "\n"); + } + + for (i = 0; i < numsectors; i++) + { + fprintf(f, "sector // %s\n", sizeu1(i)); + fprintf(f, "{\n"); + fprintf(f, "heightfloor = %d;\n", wsectors[i].floorheight >> FRACBITS); + fprintf(f, "heightceiling = %d;\n", wsectors[i].ceilingheight >> FRACBITS); + if (wsectors[i].floorpic != -1) + fprintf(f, "texturefloor = \"%s\";\n", levelflats[wsectors[i].floorpic].name); + if (wsectors[i].ceilingpic != -1) + fprintf(f, "textureceiling = \"%s\";\n", levelflats[wsectors[i].ceilingpic].name); + fprintf(f, "lightlevel = %d;\n", wsectors[i].lightlevel); + if (wsectors[i].floorlightlevel != 0) + fprintf(f, "lightfloor = %d;\n", wsectors[i].floorlightlevel); + if (wsectors[i].floorlightabsolute) + fprintf(f, "lightfloorabsolute = true;\n"); + if (wsectors[i].ceilinglightlevel != 0) + fprintf(f, "lightceiling = %d;\n", wsectors[i].ceilinglightlevel); + if (wsectors[i].ceilinglightabsolute) + fprintf(f, "lightceilingabsolute = true;\n"); + firsttag = Tag_FGet(&wsectors[i].tags); + if (firsttag != 0) + fprintf(f, "id = %d;\n", firsttag); + if (wsectors[i].tags.count > 1) + { + fprintf(f, "moreids = \""); + for (j = 1; j < wsectors[i].tags.count; j++) + { + if (j > 1) + fprintf(f, " "); + fprintf(f, "%d", wsectors[i].tags.tags[j]); + } + fprintf(f, "\";\n"); + } + sector_t tempsec = wsectors[i]; + TextmapUnfixFlatOffsets(&tempsec); + if (tempsec.floor_xoffs != 0) + fprintf(f, "xpanningfloor = %f;\n", FIXED_TO_FLOAT(tempsec.floor_xoffs)); + if (tempsec.floor_yoffs != 0) + fprintf(f, "ypanningfloor = %f;\n", FIXED_TO_FLOAT(tempsec.floor_yoffs)); + if (tempsec.ceiling_xoffs != 0) + fprintf(f, "xpanningceiling = %f;\n", FIXED_TO_FLOAT(tempsec.ceiling_xoffs)); + if (tempsec.ceiling_yoffs != 0) + fprintf(f, "ypanningceiling = %f;\n", FIXED_TO_FLOAT(tempsec.ceiling_yoffs)); + if (wsectors[i].floorpic_angle != 0) + fprintf(f, "rotationfloor = %f;\n", FIXED_TO_FLOAT(AngleFixed(wsectors[i].floorpic_angle))); + if (wsectors[i].ceilingpic_angle != 0) + fprintf(f, "rotationceiling = %f;\n", FIXED_TO_FLOAT(AngleFixed(wsectors[i].ceilingpic_angle))); + if (wsectors[i].extra_colormap) + { + INT32 lightcolor = P_RGBAToColor(wsectors[i].extra_colormap->rgba); + UINT8 lightalpha = R_GetRgbaA(wsectors[i].extra_colormap->rgba); + INT32 fadecolor = P_RGBAToColor(wsectors[i].extra_colormap->fadergba); + UINT8 fadealpha = R_GetRgbaA(wsectors[i].extra_colormap->fadergba); + + if (lightcolor != 0) + fprintf(f, "lightcolor = %d;\n", lightcolor); + if (lightalpha != 25) + fprintf(f, "lightalpha = %d;\n", lightalpha); + if (fadecolor != 0) + fprintf(f, "fadecolor = %d;\n", fadecolor); + if (fadealpha != 25) + fprintf(f, "fadealpha = %d;\n", fadealpha); + if (wsectors[i].extra_colormap->fadestart != 0) + fprintf(f, "fadestart = %d;\n", wsectors[i].extra_colormap->fadestart); + if (wsectors[i].extra_colormap->fadeend != 31) + fprintf(f, "fadeend = %d;\n", wsectors[i].extra_colormap->fadeend); + if (wsectors[i].extra_colormap->flags & CMF_FOG) + fprintf(f, "colormapfog = true;\n"); + if (wsectors[i].extra_colormap->flags & CMF_FADEFULLBRIGHTSPRITES) + fprintf(f, "colormapfadesprites = true;\n"); + } + if (wsectors[i].colormap_protected) + fprintf(f, "colormapprotected = true;\n"); + if (!(wsectors[i].flags & MSF_FLIPSPECIAL_FLOOR)) + fprintf(f, "flipspecial_nofloor = true;\n"); + if (wsectors[i].flags & MSF_FLIPSPECIAL_CEILING) + fprintf(f, "flipspecial_ceiling = true;\n"); + if (wsectors[i].flags & MSF_TRIGGERSPECIAL_TOUCH) + fprintf(f, "triggerspecial_touch = true;\n"); + if (wsectors[i].flags & MSF_TRIGGERSPECIAL_HEADBUMP) + fprintf(f, "triggerspecial_headbump = true;\n"); + if (wsectors[i].flags & MSF_TRIGGERLINE_PLANE) + fprintf(f, "triggerline_plane = true;\n"); + if (wsectors[i].flags & MSF_TRIGGERLINE_MOBJ) + fprintf(f, "triggerline_mobj = true;\n"); + if (wsectors[i].flags & MSF_INVERTPRECIP) + fprintf(f, "invertprecip = true;\n"); + if (wsectors[i].flags & MSF_GRAVITYFLIP) + fprintf(f, "gravityflip = true;\n"); + if (wsectors[i].flags & MSF_HEATWAVE) + fprintf(f, "heatwave = true;\n"); + if (wsectors[i].flags & MSF_NOCLIPCAMERA) + fprintf(f, "noclipcamera = true;\n"); + if (wsectors[i].specialflags & SSF_OUTERSPACE) + fprintf(f, "outerspace = true;\n"); + if (wsectors[i].specialflags & SSF_DOUBLESTEPUP) + fprintf(f, "doublestepup = true;\n"); + if (wsectors[i].specialflags & SSF_NOSTEPDOWN) + fprintf(f, "nostepdown = true;\n"); + if (wsectors[i].specialflags & SSF_SPEEDPAD) + fprintf(f, "speedpad = true;\n"); + if (wsectors[i].specialflags & SSF_STARPOSTACTIVATOR) + fprintf(f, "starpostactivator = true;\n"); + if (wsectors[i].specialflags & SSF_EXIT) + fprintf(f, "exit = true;\n"); + if (wsectors[i].specialflags & SSF_SPECIALSTAGEPIT) + fprintf(f, "specialstagepit = true;\n"); + if (wsectors[i].specialflags & SSF_RETURNFLAG) + fprintf(f, "returnflag = true;\n"); + if (wsectors[i].specialflags & SSF_REDTEAMBASE) + fprintf(f, "redteambase = true;\n"); + if (wsectors[i].specialflags & SSF_BLUETEAMBASE) + fprintf(f, "blueteambase = true;\n"); + if (wsectors[i].specialflags & SSF_FAN) + fprintf(f, "fan = true;\n"); + if (wsectors[i].specialflags & SSF_SUPERTRANSFORM) + fprintf(f, "supertransform = true;\n"); + if (wsectors[i].specialflags & SSF_FORCESPIN) + fprintf(f, "forcespin = true;\n"); + if (wsectors[i].specialflags & SSF_ZOOMTUBESTART) + fprintf(f, "zoomtubestart = true;\n"); + if (wsectors[i].specialflags & SSF_ZOOMTUBEEND) + fprintf(f, "zoomtubeend = true;\n"); + if (wsectors[i].specialflags & SSF_FINISHLINE) + fprintf(f, "finishline = true;\n"); + if (wsectors[i].specialflags & SSF_ROPEHANG) + fprintf(f, "ropehang = true;\n"); + if (wsectors[i].specialflags & SSF_JUMPFLIP) + fprintf(f, "jumpflip = true;\n"); + if (wsectors[i].specialflags & SSF_GRAVITYOVERRIDE) + fprintf(f, "gravityoverride = true;\n"); + if (wsectors[i].friction != ORIG_FRICTION) + fprintf(f, "friction = %f;\n", FIXED_TO_FLOAT(wsectors[i].friction)); + if (wsectors[i].gravity != FRACUNIT) + fprintf(f, "gravity = %f;\n", FIXED_TO_FLOAT(wsectors[i].gravity)); + if (wsectors[i].damagetype != SD_NONE) + { + switch (wsectors[i].damagetype) + { + case SD_GENERIC: + fprintf(f, "damagetype = \"Generic\";\n"); + break; + case SD_WATER: + fprintf(f, "damagetype = \"Water\";\n"); + break; + case SD_FIRE: + fprintf(f, "damagetype = \"Fire\";\n"); + break; + case SD_LAVA: + fprintf(f, "damagetype = \"Lava\";\n"); + break; + case SD_ELECTRIC: + fprintf(f, "damagetype = \"Electric\";\n"); + break; + case SD_SPIKE: + fprintf(f, "damagetype = \"Spike\";\n"); + break; + case SD_DEATHPITTILT: + fprintf(f, "damagetype = \"DeathPitTilt\";\n"); + break; + case SD_DEATHPITNOTILT: + fprintf(f, "damagetype = \"DeathPitNoTilt\";\n"); + break; + case SD_INSTAKILL: + fprintf(f, "damagetype = \"Instakill\";\n"); + break; + case SD_SPECIALSTAGE: + fprintf(f, "damagetype = \"SpecialStage\";\n"); + break; + default: + break; + } + } + if (wsectors[i].triggertag != 0) + fprintf(f, "triggertag = %d;\n", wsectors[i].triggertag); + if (wsectors[i].triggerer != 0) + { + switch (wsectors[i].triggerer) + { + case TO_PLAYER: + fprintf(f, "triggerer = \"Player\";\n"); + break; + case TO_ALLPLAYERS: + fprintf(f, "triggerer = \"AllPlayers\";\n"); + break; + case TO_MOBJ: + fprintf(f, "triggerer = \"Mobj\";\n"); + break; + default: + break; + } + } + fprintf(f, "}\n"); + fprintf(f, "\n"); + } + + fclose(f); + + for (i = 0; i < nummapthings; i++) + if (wmapthings[i].tags.count) + Z_Free(wmapthings[i].tags.tags); + + for (i = 0; i < numsectors; i++) + if (wsectors[i].tags.count) + Z_Free(wsectors[i].tags.tags); + + for (i = 0; i < numlines; i++) + if (wlines[i].tags.count) + Z_Free(wlines[i].tags.tags); + + Z_Free(wmapthings); + Z_Free(wvertexes); + Z_Free(wsectors); + Z_Free(wlines); + Z_Free(wsides); + Z_Free(specialthings); +} + /** Loads the textmap data, after obtaining the elements count and allocating their respective space. */ static void P_LoadTextmap(void) @@ -1859,8 +2745,21 @@ static void P_LoadTextmap(void) sc->floorpic_angle = sc->ceilingpic_angle = 0; + sc->floorlightlevel = sc->ceilinglightlevel = 0; + sc->floorlightabsolute = sc->ceilinglightabsolute = false; + sc->colormap_protected = false; + sc->gravity = FRACUNIT; + + sc->flags = MSF_FLIPSPECIAL_FLOOR; + sc->specialflags = 0; + sc->damagetype = SD_NONE; + sc->triggertag = 0; + sc->triggerer = TO_PLAYER; + + sc->friction = ORIG_FRICTION; + textmap_colormap.used = false; textmap_colormap.lightcolor = 0; textmap_colormap.lightalpha = 25; @@ -1869,6 +2768,10 @@ static void P_LoadTextmap(void) textmap_colormap.fadestart = 0; textmap_colormap.fadeend = 31; textmap_colormap.flags = 0; + + textmap_planefloor.defined = 0; + textmap_planeceiling.defined = 0; + TextmapParse(sectorsPos[i], i, ParseTextmapSectorParameter); P_InitializeSector(sc); @@ -1878,6 +2781,19 @@ static void P_LoadTextmap(void) INT32 fadergba = P_ColorToRGBA(textmap_colormap.fadecolor, textmap_colormap.fadealpha); sc->extra_colormap = sc->spawn_extra_colormap = R_CreateColormap(rgba, fadergba, textmap_colormap.fadestart, textmap_colormap.fadeend, textmap_colormap.flags); } + + if (textmap_planefloor.defined == (PD_A|PD_B|PD_C|PD_D)) + { + sc->f_slope = MakeViaEquationConstants(textmap_planefloor.a, textmap_planefloor.b, textmap_planefloor.c, textmap_planefloor.d); + sc->hasslope = true; + } + + if (textmap_planeceiling.defined == (PD_A|PD_B|PD_C|PD_D)) + { + sc->c_slope = MakeViaEquationConstants(textmap_planeceiling.a, textmap_planeceiling.b, textmap_planeceiling.c, textmap_planeceiling.d); + sc->hasslope = true; + } + TextmapFixFlatOffsets(sc); } @@ -1955,6 +2871,9 @@ static void P_ProcessLinedefsAfterSidedefs(void) ld->frontsector = sides[ld->sidenum[0]].sector; //e6y: Can't be -1 here ld->backsector = ld->sidenum[1] != 0xffff ? sides[ld->sidenum[1]].sector : 0; + if (udmf) + continue; + switch (ld->special) { // Compile linedef 'text' from both sidedefs 'text' for appropriate specials. @@ -1975,8 +2894,6 @@ static void P_ProcessLinedefsAfterSidedefs(void) break; case 447: // Change colormap case 455: // Fade colormap - if (udmf) - break; if (ld->flags & ML_DONTPEGBOTTOM) // alternate alpha (by texture offsets) { extracolormap_t *exc = R_CopyColormap(sides[ld->sidenum[0]].colormap_data, false); @@ -2020,8 +2937,12 @@ static boolean P_LoadMapData(const virtres_t *virt) if (udmf) // Count how many entries for each type we got in textmap. { virtlump_t *textmap = vres_Find(virt, "TEXTMAP"); - if (!TextmapCount(textmap->data, textmap->size)) + M_TokenizerOpen((char *)textmap->data); + if (!TextmapCount(textmap->size)) + { + M_TokenizerClose(); return false; + } } else { @@ -2075,7 +2996,10 @@ static boolean P_LoadMapData(const virtres_t *virt) // Load map data. if (udmf) + { P_LoadTextmap(); + M_TokenizerClose(); + } else { P_LoadVertices(virtvertexes->data); @@ -2117,7 +3041,7 @@ static inline void P_LoadSubsectors(UINT8 *data) for (i = 0; i < numsubsectors; i++, ss++, ms++) { ss->numlines = SHORT(ms->numsegs); - ss->firstline = SHORT(ms->firstseg); + ss->firstline = (UINT16)SHORT(ms->firstseg); P_InitializeSubsector(ss); } } @@ -2381,11 +3305,17 @@ static boolean P_LoadExtendedSubsectorsAndSegs(UINT8 **data, nodetype_t nodetype linenum = (nodetype == NT_XGL3) ? READUINT32((*data)) : READUINT16((*data)); if (linenum != 0xFFFF && linenum >= numlines) - I_Error("P_LoadExtendedSubsectorsAndSegs: Seg %s in subsector %d has invalid linedef %d!\n", sizeu1(k), m, linenum); + I_Error("P_LoadExtendedSubsectorsAndSegs: Seg %s in subsector %s has invalid linedef %d!\n", sizeu1(k), sizeu2(i), linenum); segs[k].glseg = (linenum == 0xFFFF); segs[k].linedef = (linenum == 0xFFFF) ? NULL : &lines[linenum]; segs[k].side = READUINT8((*data)); } + while (segs[subsectors[i].firstline].glseg) + { + subsectors[i].firstline++; + if (subsectors[i].firstline == k) + I_Error("P_LoadExtendedSubsectorsAndSegs: Subsector %s does not have any valid segs!", sizeu1(i)); + } break; case NT_XNOD: @@ -2422,7 +3352,10 @@ static boolean P_LoadExtendedSubsectorsAndSegs(UINT8 **data, nodetype_t nodetype P_InitializeSeg(seg); seg->angle = R_PointToAngle2(v1->x, v1->y, v2->x, v2->y); if (seg->linedef) - segs[i].offset = FixedHypot(v1->x - seg->linedef->v1->x, v1->y - seg->linedef->v1->y); + { + vertex_t *v = (seg->side == 1) ? seg->linedef->v2 : seg->linedef->v1; + segs[i].offset = FixedHypot(v1->x - v->x, v1->y - v->y); + } seg->length = P_SegLength(seg); #ifdef HWRENDER seg->flength = (rendermode == render_opengl) ? P_SegLengthFloat(seg) : 0; @@ -2975,54 +3908,206 @@ static void P_AddBinaryMapTags(void) { size_t i; - for (i = 0; i < numlines; i++) - { - // 96: Apply Tag to Tagged Sectors + for (i = 0; i < numlines; i++) { // 97: Apply Tag to Front Sector // 98: Apply Tag to Back Sector // 99: Apply Tag to Front and Back Sectors - if (lines[i].special == 96) { - size_t j; - mtag_t tag = Tag_FGet(&lines[i].frontsector->tags); - mtag_t target_tag = Tag_FGet(&lines[i].tags); - mtag_t offset_tags[4]; - memset(offset_tags, 0, sizeof(mtag_t)*4); - if (lines[i].flags & ML_EFFECT6) { - offset_tags[0] = (INT32)sides[lines[i].sidenum[0]].textureoffset / FRACUNIT; - offset_tags[1] = (INT32)sides[lines[i].sidenum[0]].rowoffset / FRACUNIT; - } - if (lines[i].flags & ML_TFERLINE) { - offset_tags[2] = (INT32)sides[lines[i].sidenum[1]].textureoffset / FRACUNIT; - offset_tags[3] = (INT32)sides[lines[i].sidenum[1]].rowoffset / FRACUNIT; - } + if (lines[i].special == 97 || lines[i].special == 99) + P_AddBinaryMapTagsFromLine(lines[i].frontsector, &lines[i]); + if (lines[i].special == 98 || lines[i].special == 99) + P_AddBinaryMapTagsFromLine(lines[i].backsector, &lines[i]); + } - for (j = 0; j < numsectors; j++) { - boolean matches_target_tag = Tag_Find(§ors[j].tags, target_tag); - size_t k; for (k = 0; k < 4; k++) { - if (lines[i].flags & ML_EFFECT5) { - if (matches_target_tag || (offset_tags[k] && Tag_Find(§ors[j].tags, offset_tags[k]))) { - Tag_Add(§ors[j].tags, tag); - break; - } - } else if (matches_target_tag) { - if (k == 0) - Tag_Add(§ors[j].tags, tag); - if (offset_tags[k]) - Tag_Add(§ors[j].tags, offset_tags[k]); + // Run this loop after the 97-99 loop to ensure that 96 can search through all of the + // 97-99-applied tags. + for (i = 0; i < numlines; i++) { + size_t j; + mtag_t tag, target_tag; + mtag_t offset_tags[4]; + + // 96: Apply Tag to Tagged Sectors + if (lines[i].special != 96) + continue; + + tag = Tag_FGet(&lines[i].frontsector->tags); + target_tag = Tag_FGet(&lines[i].tags); + memset(offset_tags, 0, sizeof(mtag_t)*4); + if (lines[i].flags & ML_EFFECT6) { + offset_tags[0] = (INT32)sides[lines[i].sidenum[0]].textureoffset / FRACUNIT; + offset_tags[1] = (INT32)sides[lines[i].sidenum[0]].rowoffset / FRACUNIT; + } + if (lines[i].flags & ML_TFERLINE) { + offset_tags[2] = (INT32)sides[lines[i].sidenum[1]].textureoffset / FRACUNIT; + offset_tags[3] = (INT32)sides[lines[i].sidenum[1]].rowoffset / FRACUNIT; + } + + for (j = 0; j < numsectors; j++) { + boolean matches_target_tag = target_tag && Tag_Find(§ors[j].tags, target_tag); + size_t k; + for (k = 0; k < 4; k++) { + if (lines[i].flags & ML_WRAPMIDTEX) { + if (matches_target_tag || (offset_tags[k] && Tag_Find(§ors[j].tags, offset_tags[k]))) { + Tag_Add(§ors[j].tags, tag); + break; } + } else if (matches_target_tag) { + if (k == 0) + Tag_Add(§ors[j].tags, tag); + if (offset_tags[k]) + Tag_Add(§ors[j].tags, offset_tags[k]); } } - } else { - if (lines[i].special == 97 || lines[i].special == 99) - P_AddBinaryMapTagsFromLine(lines[i].frontsector, &lines[i]); - if (lines[i].special == 98 || lines[i].special == 99) - P_AddBinaryMapTagsFromLine(lines[i].backsector, &lines[i]); + } + } + + for (i = 0; i < nummapthings; i++) + { + switch (mapthings[i].type) + { + case 291: + case 322: + case 750: + case 760: + case 761: + case 762: + Tag_FSet(&mapthings[i].tags, mapthings[i].angle); + break; + case 290: + case 292: + case 294: + case 780: + Tag_FSet(&mapthings[i].tags, mapthings[i].extrainfo); + break; + default: + break; } } } -//For maps in binary format, converts setup of specials to UDMF format. -static void P_ConvertBinaryMap(void) +static void P_WriteConstant(INT32 constant, char **target) +{ + char buffer[12]; + sprintf(buffer, "%d", constant); + *target = Z_Malloc(strlen(buffer) + 1, PU_LEVEL, NULL); + M_Memcpy(*target, buffer, strlen(buffer) + 1); +} + +static line_t *P_FindPointPushLine(taglist_t *list) +{ + INT32 i, l; + + for (i = 0; i < list->count; i++) + { + mtag_t tag = list->tags[i]; + TAG_ITER_LINES(tag, l) + { + if (Tag_FGet(&lines[l].tags) != tag) + continue; + + if (lines[l].special != 547) + continue; + + return &lines[l]; + } + } + + return NULL; +} + +static void P_SetBinaryFOFAlpha(line_t *line) +{ + if (sides[line->sidenum[0]].toptexture > 0) + { + line->args[1] = sides[line->sidenum[0]].toptexture; + if (sides[line->sidenum[0]].toptexture >= 1001) + { + line->args[2] = (sides[line->sidenum[0]].toptexture/1000); + line->args[1] %= 1000; + } + } + else + { + line->args[1] = 128; + line->args[2] = TMB_TRANSLUCENT; + } +} + +static INT32 P_GetFOFFlags(INT32 oldflags) +{ + INT32 result = 0; + if (oldflags & FF_OLD_EXISTS) + result |= FOF_EXISTS; + if (oldflags & FF_OLD_BLOCKPLAYER) + result |= FOF_BLOCKPLAYER; + if (oldflags & FF_OLD_BLOCKOTHERS) + result |= FOF_BLOCKOTHERS; + if (oldflags & FF_OLD_RENDERSIDES) + result |= FOF_RENDERSIDES; + if (oldflags & FF_OLD_RENDERPLANES) + result |= FOF_RENDERPLANES; + if (oldflags & FF_OLD_SWIMMABLE) + result |= FOF_SWIMMABLE; + if (oldflags & FF_OLD_NOSHADE) + result |= FOF_NOSHADE; + if (oldflags & FF_OLD_CUTSOLIDS) + result |= FOF_CUTSOLIDS; + if (oldflags & FF_OLD_CUTEXTRA) + result |= FOF_CUTEXTRA; + if (oldflags & FF_OLD_CUTSPRITES) + result |= FOF_CUTSPRITES; + if (oldflags & FF_OLD_BOTHPLANES) + result |= FOF_BOTHPLANES; + if (oldflags & FF_OLD_EXTRA) + result |= FOF_EXTRA; + if (oldflags & FF_OLD_TRANSLUCENT) + result |= FOF_TRANSLUCENT; + if (oldflags & FF_OLD_FOG) + result |= FOF_FOG; + if (oldflags & FF_OLD_INVERTPLANES) + result |= FOF_INVERTPLANES; + if (oldflags & FF_OLD_ALLSIDES) + result |= FOF_ALLSIDES; + if (oldflags & FF_OLD_INVERTSIDES) + result |= FOF_INVERTSIDES; + if (oldflags & FF_OLD_DOUBLESHADOW) + result |= FOF_DOUBLESHADOW; + if (oldflags & FF_OLD_FLOATBOB) + result |= FOF_FLOATBOB; + if (oldflags & FF_OLD_NORETURN) + result |= FOF_NORETURN; + if (oldflags & FF_OLD_CRUMBLE) + result |= FOF_CRUMBLE; + if (oldflags & FF_OLD_GOOWATER) + result |= FOF_GOOWATER; + if (oldflags & FF_OLD_MARIO) + result |= FOF_MARIO; + if (oldflags & FF_OLD_BUSTUP) + result |= FOF_BUSTUP; + if (oldflags & FF_OLD_QUICKSAND) + result |= FOF_QUICKSAND; + if (oldflags & FF_OLD_PLATFORM) + result |= FOF_PLATFORM; + if (oldflags & FF_OLD_REVERSEPLATFORM) + result |= FOF_REVERSEPLATFORM; + if (oldflags & FF_OLD_RIPPLE) + result |= FOF_RIPPLE; + if (oldflags & FF_OLD_COLORMAPONLY) + result |= FOF_COLORMAPONLY; + return result; +} + +static INT32 P_GetFOFBusttype(INT32 oldflags) +{ + if (oldflags & FF_OLD_SHATTER) + return TMFB_TOUCH; + if (oldflags & FF_OLD_SPINBUST) + return TMFB_SPIN; + if (oldflags & FF_OLD_STRONGBUST) + return TMFB_STRONG; + return TMFB_REGULAR; +} + +static void P_ConvertBinaryLinedefTypes(void) { size_t i; @@ -3032,6 +4117,115 @@ static void P_ConvertBinaryMap(void) switch (lines[i].special) { + case 2: //Custom exit + if (lines[i].flags & ML_NOCLIMB) + lines[i].args[1] |= TMEF_SKIPTALLY; + if (lines[i].flags & ML_BLOCKMONSTERS) + lines[i].args[1] |= TMEF_EMERALDCHECK; + break; + case 3: //Zoom tube parameters + lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + lines[i].args[1] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS; + lines[i].args[2] = !!(lines[i].flags & ML_MIDSOLID); + break; + case 4: //Speed pad parameters + lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + if (lines[i].flags & ML_MIDSOLID) + lines[i].args[1] |= TMSP_NOTELEPORT; + if (lines[i].flags & ML_WRAPMIDTEX) + lines[i].args[1] |= TMSP_FORCESPIN; + P_WriteConstant(sides[lines[i].sidenum[0]].toptexture ? sides[lines[i].sidenum[0]].toptexture : sfx_spdpad, &lines[i].stringargs[0]); + break; + case 7: //Sector flat alignment + lines[i].args[0] = tag; + if ((lines[i].flags & (ML_NETONLY|ML_NONET)) == (ML_NETONLY|ML_NONET)) + { + CONS_Alert(CONS_WARNING, M_GetText("Flat alignment linedef (tag %d) doesn't have anything to do.\nConsider changing the linedef's flag configuration or removing it entirely.\n"), tag); + lines[i].special = 0; + } + else if (lines[i].flags & ML_NETONLY) + lines[i].args[1] = TMP_CEILING; + else if (lines[i].flags & ML_NONET) + lines[i].args[1] = TMP_FLOOR; + else + lines[i].args[1] = TMP_BOTH; + lines[i].flags &= ~(ML_NETONLY|ML_NONET); + + if (lines[i].flags & ML_EFFECT6) // Set offset through x and y texture offsets + { + angle_t flatangle = InvAngle(R_PointToAngle2(lines[i].v1->x, lines[i].v1->y, lines[i].v2->x, lines[i].v2->y)); + fixed_t xoffs = sides[lines[i].sidenum[0]].textureoffset; + fixed_t yoffs = sides[lines[i].sidenum[0]].rowoffset; + + //If no tag is given, apply to front sector + if (lines[i].args[0] == 0) + P_ApplyFlatAlignment(lines[i].frontsector, flatangle, xoffs, yoffs, lines[i].args[1] != TMP_CEILING, lines[i].args[1] != TMP_FLOOR); + else + { + INT32 s; + TAG_ITER_SECTORS(lines[i].args[0], s) + P_ApplyFlatAlignment(sectors + s, flatangle, xoffs, yoffs, lines[i].args[1] != TMP_CEILING, lines[i].args[1] != TMP_FLOOR); + } + lines[i].special = 0; + } + break; + case 8: //Special sector properties + { + INT32 s; + + lines[i].args[0] = tag; + TAG_ITER_SECTORS(tag, s) + { + if (lines[i].flags & ML_NOCLIMB) + { + sectors[s].flags &= ~MSF_FLIPSPECIAL_FLOOR; + sectors[s].flags |= MSF_FLIPSPECIAL_CEILING; + } + else if (lines[i].flags & ML_MIDSOLID) + sectors[s].flags |= MSF_FLIPSPECIAL_BOTH; + + if (lines[i].flags & ML_MIDPEG) + sectors[s].flags |= MSF_TRIGGERSPECIAL_TOUCH; + if (lines[i].flags & ML_NOSKEW) + sectors[s].flags |= MSF_TRIGGERSPECIAL_HEADBUMP; + + if (lines[i].flags & ML_SKEWTD) + sectors[s].flags |= MSF_INVERTPRECIP; + } + + if (GETSECSPECIAL(lines[i].frontsector->special, 4) != 12) + lines[i].special = 0; + + break; + } + case 10: //Culling plane + lines[i].args[0] = tag; + lines[i].args[1] = !!(lines[i].flags & ML_NOCLIMB); + break; + case 11: //Rope hang parameters + lines[i].args[0] = (lines[i].flags & ML_NOCLIMB) ? 0 : sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + lines[i].args[1] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS; + lines[i].args[2] = !!(lines[i].flags & ML_SKEWTD); + break; + case 13: //Heat wave effect + { + INT32 s; + + TAG_ITER_SECTORS(tag, s) + sectors[s].flags |= MSF_HEATWAVE; + + break; + } + case 14: //Bustable block parameters + lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + lines[i].args[1] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS; + lines[i].args[2] = !!(lines[i].flags & ML_SKEWTD); + if (sides[lines[i].sidenum[0]].toptexture) + P_WriteConstant(sides[lines[i].sidenum[0]].toptexture, &lines[i].stringargs[0]); + break; + case 16: //Minecart parameters + lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + break; case 20: //PolyObject first line { INT32 check = -1; @@ -3066,15 +4260,15 @@ static void P_ConvertBinaryMap(void) : ((lines[paramline].frontsector->floorheight >> FRACBITS) / 100); //Flags - if (lines[paramline].flags & ML_EFFECT1) + if (lines[paramline].flags & ML_SKEWTD) lines[i].args[3] |= TMPF_NOINSIDES; - if (lines[paramline].flags & ML_EFFECT2) + if (lines[paramline].flags & ML_NOSKEW) lines[i].args[3] |= TMPF_INTANGIBLE; - if (lines[paramline].flags & ML_EFFECT3) + if (lines[paramline].flags & ML_MIDPEG) lines[i].args[3] |= TMPF_PUSHABLESTOP; - if (lines[paramline].flags & ML_EFFECT4) + if (lines[paramline].flags & ML_MIDSOLID) lines[i].args[3] &= ~TMPF_INVISIBLEPLANES; - /*if (lines[paramline].flags & ML_EFFECT5) + /*if (lines[paramline].flags & ML_WRAPMIDTEX) lines[i].args[3] |= TMPF_DONTCLIPPLANES;*/ if (lines[paramline].flags & ML_EFFECT6) lines[i].args[3] |= TMPF_SPLAT; @@ -3083,6 +4277,1089 @@ static void P_ConvertBinaryMap(void) break; } + case 30: //Polyobject - waving flag + lines[i].args[0] = tag; + lines[i].args[1] = P_AproxDistance(lines[i].dx, lines[i].dy) >> FRACBITS; + lines[i].args[2] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + break; + case 31: //Polyobject - displacement by front sector + lines[i].args[0] = tag; + lines[i].args[1] = R_PointToDist2(lines[i].v2->x, lines[i].v2->y, lines[i].v1->x, lines[i].v1->y) >> FRACBITS; + break; + case 32: //Polyobject - angular displacement by front sector + lines[i].args[0] = tag; + lines[i].args[1] = sides[lines[i].sidenum[0]].textureoffset ? sides[lines[i].sidenum[0]].textureoffset >> FRACBITS : 128; + lines[i].args[2] = sides[lines[i].sidenum[0]].rowoffset ? sides[lines[i].sidenum[0]].rowoffset >> FRACBITS : 90; + if (lines[i].flags & ML_NOCLIMB) + lines[i].args[3] |= TMPR_DONTROTATEOTHERS; + else if (lines[i].flags & ML_MIDSOLID) + lines[i].args[3] |= TMPR_ROTATEPLAYERS; + break; + case 50: //Instantly lower floor on level load + case 51: //Instantly raise ceiling on level load + lines[i].args[0] = tag; + break; + case 52: //Continuously falling sector + lines[i].args[0] = P_AproxDistance(lines[i].dx, lines[i].dy) >> FRACBITS; + lines[i].args[1] = !!(lines[i].flags & ML_NOCLIMB); + break; + case 53: //Continuous floor/ceiling mover + case 54: //Continuous floor mover + case 55: //Continuous ceiling mover + lines[i].args[0] = tag; + lines[i].args[1] = (lines[i].special == 53) ? TMP_BOTH : lines[i].special - 54; + lines[i].args[2] = P_AproxDistance(lines[i].dx, lines[i].dy) >> FRACBITS; + lines[i].args[3] = lines[i].args[2]; + lines[i].args[4] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS; + lines[i].args[5] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + lines[i].special = 53; + break; + case 56: //Continuous two-speed floor/ceiling mover + case 57: //Continuous two-speed floor mover + case 58: //Continuous two-speed ceiling mover + lines[i].args[0] = tag; + lines[i].args[1] = (lines[i].special == 56) ? TMP_BOTH : lines[i].special - 57; + lines[i].args[2] = abs(lines[i].dx) >> FRACBITS; + lines[i].args[3] = abs(lines[i].dy) >> FRACBITS; + lines[i].args[4] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS; + lines[i].args[5] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + lines[i].special = 56; + break; + case 59: //Activate moving platform + case 60: //Activate moving platform (adjustable speed) + lines[i].args[0] = tag; + lines[i].args[1] = (lines[i].special == 60) ? P_AproxDistance(lines[i].dx, lines[i].dy) >> FRACBITS : 8; + lines[i].args[2] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS; + lines[i].args[3] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + lines[i].args[4] = (lines[i].flags & ML_NOCLIMB) ? 1 : 0; + lines[i].special = 60; + break; + case 61: //Crusher (Ceiling to floor) + case 62: //Crusher (Floor to ceiling) + lines[i].args[0] = tag; + lines[i].args[1] = lines[i].special - 61; + if (lines[i].flags & ML_MIDSOLID) + { + lines[i].args[2] = abs(lines[i].dx) >> FRACBITS; + lines[i].args[3] = lines[i].args[2]; + } + else + { + lines[i].args[2] = R_PointToDist2(lines[i].v2->x, lines[i].v2->y, lines[i].v1->x, lines[i].v1->y) >> (FRACBITS + 1); + lines[i].args[3] = lines[i].args[2] / 4; + } + lines[i].special = 61; + break; + case 63: //Fake floor/ceiling planes + lines[i].args[0] = tag; + break; + case 64: //Appearing/disappearing FOF + lines[i].args[0] = (lines[i].flags & ML_BLOCKMONSTERS) ? 0 : tag; + lines[i].args[1] = (lines[i].flags & ML_BLOCKMONSTERS) ? tag : Tag_FGet(&lines[i].frontsector->tags); + lines[i].args[2] = lines[i].dx >> FRACBITS; + lines[i].args[3] = lines[i].dy >> FRACBITS; + lines[i].args[4] = lines[i].frontsector->floorheight >> FRACBITS; + lines[i].args[5] = !!(lines[i].flags & ML_NOCLIMB); + break; + case 66: //Move floor by displacement + case 67: //Move ceiling by displacement + case 68: //Move floor and ceiling by displacement + lines[i].args[0] = tag; + lines[i].args[1] = lines[i].special - 66; + lines[i].args[2] = P_AproxDistance(lines[i].dx, lines[i].dy) >> FRACBITS; + if (lines[i].flags & ML_NOCLIMB) + lines[i].args[2] *= -1; + lines[i].special = 66; + break; + case 76: //Make FOF bouncy + lines[i].args[0] = tag; + lines[i].args[1] = P_AproxDistance(lines[i].dx, lines[i].dy) >> FRACBITS; + break; + case 100: //FOF: solid, opaque, shadowcasting + case 101: //FOF: solid, opaque, non-shadowcasting + case 102: //FOF: solid, translucent + case 103: //FOF: solid, sides only + case 104: //FOF: solid, no sides + case 105: //FOF: solid, invisible + lines[i].args[0] = tag; + + //Alpha + if (lines[i].special == 102) + { + if (lines[i].flags & ML_NOCLIMB) + lines[i].args[3] |= TMFA_INSIDES; + P_SetBinaryFOFAlpha(&lines[i]); + + //Replicate old hack: Translucent FOFs set to full opacity cut cyan pixels + if (lines[i].args[1] == 256) + lines[i].args[3] |= TMFA_SPLAT; + } + else + lines[i].args[1] = 255; + + //Appearance + if (lines[i].special == 105) + lines[i].args[3] |= TMFA_NOPLANES|TMFA_NOSIDES; + else if (lines[i].special == 104) + lines[i].args[3] |= TMFA_NOSIDES; + else if (lines[i].special == 103) + lines[i].args[3] |= TMFA_NOPLANES; + if (lines[i].special != 100 && (lines[i].special != 104 || !(lines[i].flags & ML_NOCLIMB))) + lines[i].args[3] |= TMFA_NOSHADE; + if (lines[i].flags & ML_EFFECT6) + lines[i].args[3] |= TMFA_SPLAT; + + //Tangibility + if (lines[i].flags & ML_SKEWTD) + lines[i].args[4] |= TMFT_DONTBLOCKOTHERS; + if (lines[i].flags & ML_NOSKEW) + lines[i].args[4] |= TMFT_DONTBLOCKPLAYER; + + lines[i].special = 100; + break; + case 120: //FOF: water, opaque + case 121: //FOF: water, translucent + case 122: //FOF: water, opaque, no sides + case 123: //FOF: water, translucent, no sides + case 124: //FOF: goo water, translucent + case 125: //FOF: goo water, translucent, no sides + lines[i].args[0] = tag; + + //Alpha + if (lines[i].special == 120 || lines[i].special == 122) + lines[i].args[1] = 255; + else + { + P_SetBinaryFOFAlpha(&lines[i]); + + //Replicate old hack: Translucent FOFs set to full opacity cut cyan pixels + if (lines[i].args[1] == 256) + lines[i].args[3] |= TMFW_SPLAT; + } + + //No sides? + if (lines[i].special == 122 || lines[i].special == 123 || lines[i].special == 125) + lines[i].args[3] |= TMFW_NOSIDES; + + //Flags + if (lines[i].flags & ML_NOCLIMB) + lines[i].args[3] |= TMFW_DOUBLESHADOW; + if (lines[i].flags & ML_MIDSOLID) + lines[i].args[3] |= TMFW_COLORMAPONLY; + if (!(lines[i].flags & ML_WRAPMIDTEX)) + lines[i].args[3] |= TMFW_NORIPPLE; + + //Goo? + if (lines[i].special >= 124) + lines[i].args[3] |= TMFW_GOOWATER; + + //Splat rendering? + if (lines[i].flags & ML_EFFECT6) + lines[i].args[3] |= TMFW_SPLAT; + + lines[i].special = 120; + break; + case 140: //FOF: intangible from bottom, opaque + case 141: //FOF: intangible from bottom, translucent + case 142: //FOF: intangible from bottom, translucent, no sides + case 143: //FOF: intangible from top, opaque + case 144: //FOF: intangible from top, translucent + case 145: //FOF: intangible from top, translucent, no sides + case 146: //FOF: only tangible from sides + lines[i].args[0] = tag; + + //Alpha + if (lines[i].special == 141 || lines[i].special == 142 || lines[i].special == 144 || lines[i].special == 145) + { + if (lines[i].flags & ML_NOCLIMB) + lines[i].args[3] |= TMFA_INSIDES; + P_SetBinaryFOFAlpha(&lines[i]); + + //Replicate old hack: Translucent FOFs set to full opacity cut cyan pixels + if (lines[i].args[1] == 256) + lines[i].args[3] |= TMFA_SPLAT; + } + else + lines[i].args[1] = 255; + + //Appearance + if (lines[i].special == 142 || lines[i].special == 145) + lines[i].args[3] |= TMFA_NOSIDES; + else if (lines[i].special == 146) + lines[i].args[3] |= TMFA_NOPLANES; + if (lines[i].special != 146 && (lines[i].flags & ML_NOCLIMB)) + lines[i].args[3] |= TMFA_NOSHADE; + if (lines[i].flags & ML_EFFECT6) + lines[i].args[3] |= TMFA_SPLAT; + + //Tangibility + if (lines[i].special <= 142) + lines[i].args[4] |= TMFT_INTANGIBLEBOTTOM; + else if (lines[i].special <= 145) + lines[i].args[4] |= TMFT_INTANGIBLETOP; + else + lines[i].args[4] |= TMFT_INTANGIBLEBOTTOM|TMFT_INTANGIBLETOP; + + if (lines[i].flags & ML_SKEWTD) + lines[i].args[4] |= TMFT_DONTBLOCKOTHERS; + if (lines[i].flags & ML_NOSKEW) + lines[i].args[4] |= TMFT_DONTBLOCKPLAYER; + + lines[i].special = 100; + break; + case 150: //FOF: Air bobbing + case 151: //FOF: Air bobbing (adjustable) + case 152: //FOF: Reverse air bobbing (adjustable) + case 153: //FOF: Dynamically sinking platform + lines[i].args[0] = tag; + lines[i].args[1] = (lines[i].special == 150) ? 16 : (P_AproxDistance(lines[i].dx, lines[i].dy) >> FRACBITS); + + //Flags + if (lines[i].special == 152) + lines[i].args[2] |= TMFB_REVERSE; + if (lines[i].flags & ML_NOCLIMB) + lines[i].args[2] |= TMFB_SPINDASH; + if (lines[i].special == 153) + lines[i].args[2] |= TMFB_DYNAMIC; + + lines[i].special = 150; + break; + case 160: //FOF: Water bobbing + lines[i].args[0] = tag; + break; + case 170: //FOF: Crumbling, respawn + case 171: //FOF: Crumbling, no respawn + case 172: //FOF: Crumbling, respawn, intangible from bottom + case 173: //FOF: Crumbling, no respawn, intangible from bottom + case 174: //FOF: Crumbling, respawn, intangible from bottom, translucent + case 175: //FOF: Crumbling, no respawn, intangible from bottom, translucent + case 176: //FOF: Crumbling, respawn, floating, bobbing + case 177: //FOF: Crumbling, no respawn, floating, bobbing + case 178: //FOF: Crumbling, respawn, floating + case 179: //FOF: Crumbling, no respawn, floating + case 180: //FOF: Crumbling, respawn, air bobbing + lines[i].args[0] = tag; + + //Alpha + if (lines[i].special >= 174 && lines[i].special <= 175) + { + P_SetBinaryFOFAlpha(&lines[i]); + + //Replicate old hack: Translucent FOFs set to full opacity cut cyan pixels + if (lines[i].args[1] == 256) + lines[i].args[4] |= TMFC_SPLAT; + } + else + lines[i].args[1] = 255; + + if (lines[i].special >= 172 && lines[i].special <= 175) + { + lines[i].args[3] |= TMFT_INTANGIBLEBOTTOM; + if (lines[i].flags & ML_NOCLIMB) + lines[i].args[4] |= TMFC_NOSHADE; + } + + if (lines[i].special % 2 == 1) + lines[i].args[4] |= TMFC_NORETURN; + if (lines[i].special == 176 || lines[i].special == 177 || lines[i].special == 180) + lines[i].args[4] |= TMFC_AIRBOB; + if (lines[i].special >= 176 && lines[i].special <= 179) + lines[i].args[4] |= TMFC_FLOATBOB; + if (lines[i].flags & ML_EFFECT6) + lines[i].args[4] |= TMFC_SPLAT; + + if (lines[i].flags & ML_SKEWTD) + lines[i].args[3] |= TMFT_DONTBLOCKOTHERS; + if (lines[i].flags & ML_NOSKEW) + lines[i].args[3] |= TMFT_DONTBLOCKPLAYER; + + lines[i].special = 170; + break; + case 190: // FOF: Rising, solid, opaque, shadowcasting + case 191: // FOF: Rising, solid, opaque, non-shadowcasting + case 192: // FOF: Rising, solid, translucent + case 193: // FOF: Rising, solid, invisible + case 194: // FOF: Rising, intangible from bottom, opaque + case 195: // FOF: Rising, intangible from bottom, translucent + lines[i].args[0] = tag; + + //Translucency + if (lines[i].special == 192 || lines[i].special == 195) + { + P_SetBinaryFOFAlpha(&lines[i]); + + //Replicate old hack: Translucent FOFs set to full opacity cut cyan pixels + if (lines[i].args[1] == 256) + lines[i].args[3] |= TMFA_SPLAT; + } + else + lines[i].args[1] = 255; + + //Appearance + if (lines[i].special == 193) + lines[i].args[3] |= TMFA_NOPLANES|TMFA_NOSIDES; + if (lines[i].special >= 194) + lines[i].args[3] |= TMFA_INSIDES; + if (lines[i].special != 190 && (lines[i].special <= 193 || lines[i].flags & ML_NOCLIMB)) + lines[i].args[3] |= TMFA_NOSHADE; + if (lines[i].flags & ML_EFFECT6) + lines[i].args[3] |= TMFA_SPLAT; + + //Tangibility + if (lines[i].flags & ML_SKEWTD) + lines[i].args[4] |= TMFT_DONTBLOCKOTHERS; + if (lines[i].flags & ML_NOSKEW) + lines[i].args[4] |= TMFT_DONTBLOCKPLAYER; + if (lines[i].special >= 194) + lines[i].args[4] |= TMFT_INTANGIBLEBOTTOM; + + //Speed + lines[i].args[5] = P_AproxDistance(lines[i].dx, lines[i].dy) >> FRACBITS; + + //Flags + if (lines[i].flags & ML_BLOCKMONSTERS) + lines[i].args[6] |= TMFR_REVERSE; + if (lines[i].flags & ML_NOCLIMB) + lines[i].args[6] |= TMFR_SPINDASH; + + lines[i].special = 190; + break; + case 200: //FOF: Light block + case 201: //FOF: Half light block + lines[i].args[0] = tag; + if (lines[i].special == 201) + lines[i].args[1] = 1; + lines[i].special = 200; + break; + case 202: //FOF: Fog block + case 223: //FOF: Intangible, invisible + lines[i].args[0] = tag; + break; + case 220: //FOF: Intangible, opaque + case 221: //FOF: Intangible, translucent + case 222: //FOF: Intangible, sides only + lines[i].args[0] = tag; + + //Alpha + if (lines[i].special == 221) + { + P_SetBinaryFOFAlpha(&lines[i]); + + //Replicate old hack: Translucent FOFs set to full opacity cut cyan pixels + if (lines[i].args[1] == 256) + lines[i].args[3] |= TMFA_SPLAT; + } + else + lines[i].args[1] = 255; + + //Appearance + if (lines[i].special == 222) + lines[i].args[3] |= TMFA_NOPLANES; + if (lines[i].special == 221) + lines[i].args[3] |= TMFA_INSIDES; + if (lines[i].special != 220 && !(lines[i].flags & ML_NOCLIMB)) + lines[i].args[3] |= TMFA_NOSHADE; + if (lines[i].flags & ML_EFFECT6) + lines[i].args[3] |= TMFA_SPLAT; + + lines[i].special = 220; + break; + case 250: //FOF: Mario block + lines[i].args[0] = tag; + if (lines[i].flags & ML_NOCLIMB) + lines[i].args[1] |= TMFM_BRICK; + if (lines[i].flags & ML_SKEWTD) + lines[i].args[1] |= TMFM_INVISIBLE; + break; + case 251: //FOF: Thwomp block + lines[i].args[0] = tag; + if (lines[i].flags & ML_WRAPMIDTEX) //Custom speeds + { + lines[i].args[1] = lines[i].dy >> FRACBITS; + lines[i].args[2] = lines[i].dx >> FRACBITS; + } + else + { + lines[i].args[1] = 80; + lines[i].args[2] = 16; + } + if (lines[i].flags & ML_MIDSOLID) + P_WriteConstant(sides[lines[i].sidenum[0]].textureoffset >> FRACBITS, &lines[i].stringargs[0]); + break; + case 252: //FOF: Shatter block + case 253: //FOF: Shatter block, translucent + case 254: //FOF: Bustable block + case 255: //FOF: Spin-bustable block + case 256: //FOF: Spin-bustable block, translucent + lines[i].args[0] = tag; + + //Alpha + if (lines[i].special == 253 || lines[i].special == 256) + { + P_SetBinaryFOFAlpha(&lines[i]); + + //Replicate old hack: Translucent FOFs set to full opacity cut cyan pixels + if (lines[i].args[1] == 256) + lines[i].args[4] |= TMFB_SPLAT; + } + else + lines[i].args[1] = 255; + + //Bustable type + if (lines[i].special <= 253) + lines[i].args[3] = TMFB_TOUCH; + else if (lines[i].special >= 255) + lines[i].args[3] = TMFB_SPIN; + else if (lines[i].flags & ML_NOCLIMB) + lines[i].args[3] = TMFB_STRONG; + else + lines[i].args[3] = TMFB_REGULAR; + + //Flags + if (lines[i].flags & ML_MIDSOLID) + lines[i].args[4] |= TMFB_PUSHABLES; + if (lines[i].flags & ML_WRAPMIDTEX) + { + lines[i].args[4] |= TMFB_EXECUTOR; + lines[i].args[5] = P_AproxDistance(lines[i].dx, lines[i].dy) >> FRACBITS; + } + if (lines[i].special == 252 && lines[i].flags & ML_NOCLIMB) + lines[i].args[4] |= TMFB_ONLYBOTTOM; + if (lines[i].flags & ML_EFFECT6) + lines[i].args[4] |= TMFB_SPLAT; + + lines[i].special = 254; + break; + case 257: //FOF: Quicksand + lines[i].args[0] = tag; + if (!(lines[i].flags & ML_WRAPMIDTEX)) + lines[i].args[1] = 1; //No ripple effect + lines[i].args[2] = lines[i].dx >> FRACBITS; //Sinking speed + lines[i].args[3] = lines[i].dy >> FRACBITS; //Friction + break; + case 258: //FOF: Laser + lines[i].args[0] = tag; + + //Alpha + P_SetBinaryFOFAlpha(&lines[i]); + + //Flags + if (lines[i].flags & ML_SKEWTD) + lines[i].args[3] |= TMFL_NOBOSSES; + //Replicate old hack: Translucent FOFs set to full opacity cut cyan pixels + if (lines[i].flags & ML_EFFECT6 || lines[i].args[1] == 256) + lines[i].args[3] |= TMFL_SPLAT; + + break; + case 259: //Custom FOF + if (lines[i].sidenum[1] == 0xffff) + I_Error("Custom FOF (tag %d) found without a linedef back side!", tag); + + lines[i].args[0] = tag; + lines[i].args[3] = P_GetFOFFlags(sides[lines[i].sidenum[1]].toptexture); + if (lines[i].flags & ML_EFFECT6) + lines[i].args[3] |= FOF_SPLAT; + lines[i].args[4] = P_GetFOFBusttype(sides[lines[i].sidenum[1]].toptexture); + if (sides[lines[i].sidenum[1]].toptexture & FF_OLD_SHATTERBOTTOM) + lines[i].args[4] |= TMFB_ONLYBOTTOM; + if (lines[i].args[3] & FOF_TRANSLUCENT) + { + P_SetBinaryFOFAlpha(&lines[i]); + + //Replicate old hack: Translucent FOFs set to full opacity cut cyan pixels + if (lines[i].args[1] == 256) + lines[i].args[3] |= FOF_SPLAT; + } + else + lines[i].args[1] = 255; + break; + case 300: //Trigger linedef executor - Continuous + case 301: //Trigger linedef executor - Each time + case 302: //Trigger linedef executor - Once + if (lines[i].special == 302) + lines[i].args[0] = TMT_ONCE; + else if (lines[i].special == 301) + lines[i].args[0] = (lines[i].flags & ML_BOUNCY) ? TMT_EACHTIMEENTERANDEXIT : TMT_EACHTIMEENTER; + else + lines[i].args[0] = TMT_CONTINUOUS; + lines[i].special = 300; + break; + case 303: //Ring count - Continuous + case 304: //Ring count - Once + lines[i].args[0] = (lines[i].special == 304) ? TMT_ONCE : TMT_CONTINUOUS; + lines[i].args[1] = P_AproxDistance(lines[i].dx, lines[i].dy) >> FRACBITS; + if (lines[i].flags & ML_NOCLIMB) + lines[i].args[2] = TMC_LTE; + else if (lines[i].flags & ML_BLOCKMONSTERS) + lines[i].args[2] = TMC_GTE; + else + lines[i].args[2] = TMC_EQUAL; + lines[i].args[3] = !!(lines[i].flags & ML_MIDSOLID); + lines[i].special = 303; + break; + case 305: //Character ability - Continuous + case 306: //Character ability - Each time + case 307: //Character ability - Once + if (lines[i].special == 307) + lines[i].args[0] = TMT_ONCE; + else if (lines[i].special == 306) + lines[i].args[0] = (lines[i].flags & ML_BOUNCY) ? TMT_EACHTIMEENTERANDEXIT : TMT_EACHTIMEENTER; + else + lines[i].args[0] = TMT_CONTINUOUS; + lines[i].args[1] = (P_AproxDistance(lines[i].dx, lines[i].dy) >> FRACBITS) / 10; + lines[i].special = 305; + break; + case 308: //Race only - once + lines[i].args[0] = TMT_ONCE; + lines[i].args[1] = GTR_RACE; + lines[i].args[2] = TMF_HASANY; + break; + case 309: //CTF red team - continuous + case 310: //CTF red team - each time + case 311: //CTF blue team - continuous + case 312: //CTF blue team - each time + if (lines[i].special % 2 == 0) + lines[i].args[0] = (lines[i].flags & ML_BOUNCY) ? TMT_EACHTIMEENTERANDEXIT : TMT_EACHTIMEENTER; + else + lines[i].args[0] = TMT_CONTINUOUS; + lines[i].args[1] = (lines[i].special > 310) ? TMT_BLUE : TMT_RED; + lines[i].special = 309; + break; + case 313: //No more enemies - once + lines[i].args[0] = tag; + break; + case 314: //Number of pushables - Continuous + case 315: //Number of pushables - Once + lines[i].args[0] = (lines[i].special == 315) ? TMT_ONCE : TMT_CONTINUOUS; + lines[i].args[1] = P_AproxDistance(lines[i].dx, lines[i].dy) >> FRACBITS; + if (lines[i].flags & ML_NOCLIMB) + lines[i].args[2] = TMC_GTE; + else if (lines[i].flags & ML_MIDSOLID) + lines[i].args[2] = TMC_LTE; + else + lines[i].args[2] = TMC_EQUAL; + lines[i].special = 314; + break; + case 317: //Condition set trigger - Continuous + case 318: //Condition set trigger - Once + lines[i].args[0] = (lines[i].special == 318) ? TMT_ONCE : TMT_CONTINUOUS; + lines[i].args[1] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + lines[i].special = 317; + break; + case 319: //Unlockable trigger - Continuous + case 320: //Unlockable trigger - Once + lines[i].args[0] = (lines[i].special == 320) ? TMT_ONCE : TMT_CONTINUOUS; + lines[i].args[1] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + lines[i].special = 319; + break; + case 321: //Trigger after X calls - Continuous + case 322: //Trigger after X calls - Each time + if (lines[i].special % 2 == 0) + lines[i].args[0] = (lines[i].flags & ML_BOUNCY) ? TMXT_EACHTIMEENTERANDEXIT : TMXT_EACHTIMEENTER; + else + lines[i].args[0] = TMXT_CONTINUOUS; + lines[i].args[1] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + if (lines[i].flags & ML_NOCLIMB) + { + lines[i].args[2] = 1; + lines[i].args[3] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS; + } + else + lines[i].args[2] = lines[i].args[3] = 0; + lines[i].special = 321; + break; + case 323: //NiGHTSerize - Each time + case 324: //NiGHTSerize - Once + case 325: //DeNiGHTSerize - Each time + case 326: //DeNiGHTSerize - Once + case 327: //NiGHTS lap - Each time + case 328: //NiGHTS lap - Once + case 329: //Ideya capture touch - Each time + case 330: //Ideya capture touch - Once + lines[i].args[0] = (lines[i].special + 1) % 2; + lines[i].args[1] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + lines[i].args[2] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS; + if (lines[i].flags & ML_NOCLIMB) + lines[i].args[3] = TMC_LTE; + else if (lines[i].flags & ML_BLOCKMONSTERS) + lines[i].args[3] = TMC_GTE; + else + lines[i].args[3] = TMC_EQUAL; + if (lines[i].flags & ML_SKEWTD) + lines[i].args[4] = TMC_LTE; + else if (lines[i].flags & ML_NOSKEW) + lines[i].args[4] = TMC_GTE; + else + lines[i].args[4] = TMC_EQUAL; + if (lines[i].flags & ML_DONTPEGBOTTOM) + lines[i].args[5] = TMNP_SLOWEST; + else if (lines[i].flags & ML_MIDSOLID) + lines[i].args[5] = TMNP_TRIGGERER; + else + lines[i].args[5] = TMNP_FASTEST; + if (lines[i].special % 2 == 0) + lines[i].special--; + if (lines[i].special == 323) + { + if (lines[i].flags & ML_TFERLINE) + lines[i].args[6] = TMN_FROMNONIGHTS; + else if (lines[i].flags & ML_DONTPEGTOP) + lines[i].args[6] = TMN_FROMNIGHTS; + else + lines[i].args[6] = TMN_ALWAYS; + + if (lines[i].flags & ML_MIDPEG) + lines[i].args[7] |= TMN_BONUSLAPS; + if (lines[i].flags & ML_BOUNCY) + lines[i].args[7] |= TMN_LEVELCOMPLETION; + } + else if (lines[i].special == 325) + { + if (lines[i].flags & ML_TFERLINE) + lines[i].args[6] = TMD_NOBODYNIGHTS; + else if (lines[i].flags & ML_DONTPEGTOP) + lines[i].args[6] = TMD_SOMEBODYNIGHTS; + else + lines[i].args[6] = TMD_ALWAYS; + + lines[i].args[7] = !!(lines[i].flags & ML_MIDPEG); + } + else if (lines[i].special == 327) + lines[i].args[6] = !!(lines[i].flags & ML_MIDPEG); + else + { + if (lines[i].flags & ML_DONTPEGTOP) + lines[i].args[6] = TMS_ALWAYS; + else if (lines[i].flags & ML_BOUNCY) + lines[i].args[6] = TMS_IFNOTENOUGH; + else + lines[i].args[6] = TMS_IFENOUGH; + + if (lines[i].flags & ML_MIDPEG) + lines[i].args[7] |= TMI_BONUSLAPS; + if (lines[i].flags & ML_TFERLINE) + lines[i].args[7] |= TMI_ENTER; + } + break; + case 331: // Player skin - continuous + case 332: // Player skin - each time + case 333: // Player skin - once + if (lines[i].special == 333) + lines[i].args[0] = TMT_ONCE; + else if (lines[i].special == 332) + lines[i].args[0] = (lines[i].flags & ML_BOUNCY) ? TMT_EACHTIMEENTERANDEXIT : TMT_EACHTIMEENTER; + else + lines[i].args[0] = TMT_CONTINUOUS; + lines[i].args[1] = !!(lines[i].flags & ML_NOCLIMB); + if (lines[i].text) + { + lines[i].stringargs[0] = Z_Malloc(strlen(lines[i].text) + 1, PU_LEVEL, NULL); + M_Memcpy(lines[i].stringargs[0], lines[i].text, strlen(lines[i].text) + 1); + } + lines[i].special = 331; + break; + case 334: // Object dye - continuous + case 335: // Object dye - each time + case 336: // Object dye - once + if (lines[i].special == 336) + lines[i].args[0] = TMT_ONCE; + else if (lines[i].special == 335) + lines[i].args[0] = (lines[i].flags & ML_BOUNCY) ? TMT_EACHTIMEENTERANDEXIT : TMT_EACHTIMEENTER; + else + lines[i].args[0] = TMT_CONTINUOUS; + lines[i].args[1] = !!(lines[i].flags & ML_NOCLIMB); + if (sides[lines[i].sidenum[0]].text) + { + lines[i].stringargs[0] = Z_Malloc(strlen(sides[lines[i].sidenum[0]].text) + 1, PU_LEVEL, NULL); + M_Memcpy(lines[i].stringargs[0], sides[lines[i].sidenum[0]].text, strlen(sides[lines[i].sidenum[0]].text) + 1); + } + lines[i].special = 334; + break; + case 337: //Emerald check - continuous + case 338: //Emerald check - each time + case 339: //Emerald check - once + if (lines[i].special == 339) + lines[i].args[0] = TMT_ONCE; + else if (lines[i].special == 338) + lines[i].args[0] = (lines[i].flags & ML_BOUNCY) ? TMT_EACHTIMEENTERANDEXIT : TMT_EACHTIMEENTER; + else + lines[i].args[0] = TMT_CONTINUOUS; + lines[i].args[1] = EMERALD1|EMERALD2|EMERALD3|EMERALD4|EMERALD5|EMERALD6|EMERALD7; + lines[i].args[2] = TMF_HASALL; + lines[i].special = 337; + break; + case 340: //NiGHTS mare - continuous + case 341: //NiGHTS mare - each time + case 342: //NiGHTS mare - once + if (lines[i].special == 342) + lines[i].args[0] = TMT_ONCE; + else if (lines[i].special == 341) + lines[i].args[0] = (lines[i].flags & ML_BOUNCY) ? TMT_EACHTIMEENTERANDEXIT : TMT_EACHTIMEENTER; + else + lines[i].args[0] = TMT_CONTINUOUS; + lines[i].args[1] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + if (lines[i].flags & ML_NOCLIMB) + lines[i].args[2] = TMC_LTE; + else if (lines[i].flags & ML_BLOCKMONSTERS) + lines[i].args[2] = TMC_GTE; + else + lines[i].args[2] = TMC_EQUAL; + lines[i].special = 340; + break; + case 343: //Gravity check - continuous + case 344: //Gravity check - each time + case 345: //Gravity check - once + if (lines[i].special == 345) + lines[i].args[0] = TMT_ONCE; + else if (lines[i].special == 344) + lines[i].args[0] = (lines[i].flags & ML_BOUNCY) ? TMT_EACHTIMEENTERANDEXIT : TMT_EACHTIMEENTER; + else + lines[i].args[0] = TMT_CONTINUOUS; + if (lines[i].flags & ML_BLOCKMONSTERS) + lines[i].args[1] = TMG_TEMPREVERSE; + else if (lines[i].flags & ML_NOCLIMB) + lines[i].args[1] = TMG_REVERSE; + lines[i].special = 343; + break; + case 400: //Set tagged sector's floor height/texture + case 401: //Set tagged sector's ceiling height/texture + lines[i].args[0] = tag; + lines[i].args[1] = lines[i].special - 400; + lines[i].args[2] = !(lines[i].flags & ML_NOCLIMB); + lines[i].special = 400; + break; + case 402: //Copy light level + lines[i].args[0] = tag; + lines[i].args[1] = 0; + break; + case 403: //Move tagged sector's floor + case 404: //Move tagged sector's ceiling + lines[i].args[0] = tag; + lines[i].args[1] = lines[i].special - 403; + lines[i].args[2] = P_AproxDistance(lines[i].dx, lines[i].dy) >> FRACBITS; + lines[i].args[3] = (lines[i].flags & ML_BLOCKMONSTERS) ? sides[lines[i].sidenum[0]].textureoffset >> FRACBITS : 0; + lines[i].args[4] = !!(lines[i].flags & ML_NOCLIMB); + lines[i].special = 403; + break; + case 405: //Move floor according to front texture offsets + case 407: //Move ceiling according to front texture offsets + lines[i].args[0] = tag; + lines[i].args[1] = (lines[i].special == 405) ? TMP_FLOOR : TMP_CEILING; + lines[i].args[2] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS; + lines[i].args[3] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + lines[i].args[4] = !!(lines[i].flags & ML_NOCLIMB); + lines[i].special = 405; + break; + case 408: //Set flats + lines[i].args[0] = tag; + if ((lines[i].flags & (ML_NOCLIMB|ML_MIDSOLID)) == (ML_NOCLIMB|ML_MIDSOLID)) + { + CONS_Alert(CONS_WARNING, M_GetText("Set flats linedef (tag %d) doesn't have anything to do.\nConsider changing the linedef's flag configuration or removing it entirely.\n"), tag); + lines[i].special = 0; + } + else if (lines[i].flags & ML_NOCLIMB) + lines[i].args[1] = TMP_CEILING; + else if (lines[i].flags & ML_MIDSOLID) + lines[i].args[1] = TMP_FLOOR; + else + lines[i].args[1] = TMP_BOTH; + break; + case 409: //Change tagged sector's tag + lines[i].args[0] = tag; + lines[i].args[1] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + if (lines[i].flags & ML_NOCLIMB) + lines[i].args[2] = TMT_ADD; + else if (lines[i].flags & ML_BLOCKMONSTERS) + lines[i].args[2] = TMT_REMOVE; + else + lines[i].args[2] = TMT_REPLACEFIRST; + break; + case 410: //Change front sector's tag + lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + if (lines[i].flags & ML_NOCLIMB) + lines[i].args[1] = TMT_ADD; + else if (lines[i].flags & ML_BLOCKMONSTERS) + lines[i].args[1] = TMT_REMOVE; + else + lines[i].args[1] = TMT_REPLACEFIRST; + break; + case 411: //Stop plane movement + lines[i].args[0] = tag; + break; + case 412: //Teleporter + lines[i].args[0] = tag; + if (lines[i].flags & ML_BLOCKMONSTERS) + lines[i].args[1] |= TMT_SILENT; + if (lines[i].flags & ML_NOCLIMB) + lines[i].args[1] |= TMT_KEEPANGLE; + if (lines[i].flags & ML_MIDSOLID) + lines[i].args[1] |= TMT_KEEPMOMENTUM; + if (lines[i].flags & ML_MIDPEG) + lines[i].args[1] |= TMT_RELATIVE; + lines[i].args[2] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + lines[i].args[3] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS; + lines[i].args[4] = lines[i].frontsector->ceilingheight >> FRACBITS; + break; + case 413: //Change music + if (lines[i].flags & ML_NOCLIMB) + lines[i].args[0] |= TMM_ALLPLAYERS; + if (lines[i].flags & ML_SKEWTD) + lines[i].args[0] |= TMM_OFFSET; + if (lines[i].flags & ML_NOSKEW) + lines[i].args[0] |= TMM_FADE; + if (lines[i].flags & ML_BLOCKMONSTERS) + lines[i].args[0] |= TMM_NORELOAD; + if (lines[i].flags & ML_BOUNCY) + lines[i].args[0] |= TMM_FORCERESET; + if (lines[i].flags & ML_MIDSOLID) + lines[i].args[0] |= TMM_NOLOOP; + lines[i].args[1] = sides[lines[i].sidenum[0]].midtexture; + lines[i].args[2] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + lines[i].args[3] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS; + lines[i].args[4] = (lines[i].sidenum[1] != 0xffff) ? sides[lines[i].sidenum[1]].textureoffset >> FRACBITS : 0; + lines[i].args[5] = (lines[i].sidenum[1] != 0xffff) ? sides[lines[i].sidenum[1]].rowoffset >> FRACBITS : -1; + lines[i].args[6] = sides[lines[i].sidenum[0]].bottomtexture; + if (sides[lines[i].sidenum[0]].text) + { + lines[i].stringargs[0] = Z_Malloc(strlen(sides[lines[i].sidenum[0]].text) + 1, PU_LEVEL, NULL); + M_Memcpy(lines[i].stringargs[0], sides[lines[i].sidenum[0]].text, strlen(sides[lines[i].sidenum[0]].text) + 1); + } + break; + case 414: //Play sound effect + lines[i].args[2] = tag; + if (tag != 0) + { + if (lines[i].flags & ML_WRAPMIDTEX) + { + lines[i].args[0] = TMSS_TAGGEDSECTOR; + lines[i].args[1] = TMSL_EVERYONE; + } + else + { + lines[i].args[0] = TMSS_NOWHERE; + lines[i].args[1] = TMSL_TAGGEDSECTOR; + } + } + else + { + if (lines[i].flags & ML_NOCLIMB) + { + lines[i].args[0] = TMSS_NOWHERE; + lines[i].args[1] = TMSL_TRIGGERER; + } + else if (lines[i].flags & ML_MIDSOLID) + { + lines[i].args[0] = TMSS_NOWHERE; + lines[i].args[1] = TMSL_EVERYONE; + } + else if (lines[i].flags & ML_BLOCKMONSTERS) + { + lines[i].args[0] = TMSS_TRIGGERSECTOR; + lines[i].args[1] = TMSL_EVERYONE; + } + else + { + lines[i].args[0] = TMSS_TRIGGERMOBJ; + lines[i].args[1] = TMSL_EVERYONE; + } + } + if (sides[lines[i].sidenum[0]].text) + { + lines[i].stringargs[0] = Z_Malloc(strlen(sides[lines[i].sidenum[0]].text) + 1, PU_LEVEL, NULL); + M_Memcpy(lines[i].stringargs[0], sides[lines[i].sidenum[0]].text, strlen(sides[lines[i].sidenum[0]].text) + 1); + } + break; + case 415: //Run script + { + INT32 scrnum; + + lines[i].stringargs[0] = Z_Malloc(9, PU_LEVEL, NULL); + strcpy(lines[i].stringargs[0], G_BuildMapName(gamemap)); + lines[i].stringargs[0][0] = 'S'; + lines[i].stringargs[0][1] = 'C'; + lines[i].stringargs[0][2] = 'R'; + + scrnum = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + if (scrnum < 0 || scrnum > 999) + { + scrnum = 0; + lines[i].stringargs[0][5] = lines[i].stringargs[0][6] = lines[i].stringargs[0][7] = '0'; + } + else + { + lines[i].stringargs[0][5] = (char)('0' + (char)((scrnum / 100))); + lines[i].stringargs[0][6] = (char)('0' + (char)((scrnum % 100) / 10)); + lines[i].stringargs[0][7] = (char)('0' + (char)(scrnum % 10)); + } + lines[i].stringargs[0][8] = '\0'; + break; + } + case 416: //Start adjustable flickering light + case 417: //Start adjustable pulsating light + case 602: //Adjustable pulsating light + case 603: //Adjustable flickering light + lines[i].args[0] = tag; + lines[i].args[1] = P_AproxDistance(lines[i].dx, lines[i].dy) >> FRACBITS; + lines[i].args[2] = lines[i].frontsector->lightlevel; + if ((lines[i].flags & ML_NOCLIMB) && lines[i].backsector) + lines[i].args[4] = lines[i].backsector->lightlevel; + else + lines[i].args[3] = 1; + break; + case 418: //Start adjustable blinking light (unsynchronized) + case 419: //Start adjustable blinking light (synchronized) + case 604: //Adjustable blinking light (unsynchronized) + case 605: //Adjustable blinking light (synchronized) + lines[i].args[0] = tag; + lines[i].args[1] = abs(lines[i].dx) >> FRACBITS; + lines[i].args[2] = abs(lines[i].dy) >> FRACBITS; + lines[i].args[3] = lines[i].frontsector->lightlevel; + if ((lines[i].flags & ML_NOCLIMB) && lines[i].backsector) + lines[i].args[5] = lines[i].backsector->lightlevel; + else + lines[i].args[4] |= TMB_USETARGET; + if (lines[i].special % 2 == 1) + { + lines[i].args[4] |= TMB_SYNC; + lines[i].special--; + } + break; + case 420: //Fade light level + lines[i].args[0] = tag; + if (lines[i].flags & ML_DONTPEGBOTTOM) + { + lines[i].args[1] = max(sides[lines[i].sidenum[0]].textureoffset >> FRACBITS, 0); + // failsafe: if user specifies Back Y Offset and NOT Front Y Offset, use the Back Offset + // to be consistent with other light and fade specials + lines[i].args[2] = ((lines[i].sidenum[1] != 0xFFFF && !(sides[lines[i].sidenum[0]].rowoffset >> FRACBITS)) ? + max(min(sides[lines[i].sidenum[1]].rowoffset >> FRACBITS, 255), 0) + : max(min(sides[lines[i].sidenum[0]].rowoffset >> FRACBITS, 255), 0)); + } + else + { + lines[i].args[1] = lines[i].frontsector->lightlevel; + lines[i].args[2] = abs(P_AproxDistance(lines[i].dx, lines[i].dy)) >> FRACBITS; + } + if (lines[i].flags & ML_MIDSOLID) + lines[i].args[3] |= TMF_TICBASED; + if (lines[i].flags & ML_WRAPMIDTEX) + lines[i].args[3] |= TMF_OVERRIDE; + break; + case 421: //Stop lighting effect + lines[i].args[0] = tag; + break; + case 422: //Switch to cut-away view + lines[i].args[0] = tag; + lines[i].args[1] = P_AproxDistance(lines[i].dx, lines[i].dy) >> FRACBITS; + lines[i].args[2] = (lines[i].flags & ML_NOCLIMB) ? sides[lines[i].sidenum[0]].textureoffset >> FRACBITS : 0; + break; + case 423: //Change sky + case 424: //Change weather + lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + lines[i].args[1] = !!(lines[i].flags & ML_NOCLIMB); + break; + case 425: //Change object state + if (sides[lines[i].sidenum[0]].text) + { + lines[i].stringargs[0] = Z_Malloc(strlen(sides[lines[i].sidenum[0]].text) + 1, PU_LEVEL, NULL); + M_Memcpy(lines[i].stringargs[0], sides[lines[i].sidenum[0]].text, strlen(sides[lines[i].sidenum[0]].text) + 1); + } + break; + case 426: //Stop object + lines[i].args[0] = !!(lines[i].flags & ML_NOCLIMB); + break; + case 427: //Award score + lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + break; + case 428: //Start platform movement + lines[i].args[0] = tag; + lines[i].args[1] = P_AproxDistance(lines[i].dx, lines[i].dy) >> FRACBITS; + lines[i].args[2] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS; + lines[i].args[3] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + lines[i].args[4] = (lines[i].flags & ML_NOCLIMB) ? 1 : 0; + break; + case 429: //Crush ceiling once + case 430: //Crush floor once + case 431: //Crush floor and ceiling once + lines[i].args[0] = tag; + lines[i].args[1] = (lines[i].special == 429) ? TMP_CEILING : ((lines[i].special == 430) ? TMP_FLOOR : TMP_BOTH); + if (lines[i].special == 430 || lines[i].flags & ML_MIDSOLID) + { + lines[i].args[2] = abs(lines[i].dx) >> FRACBITS; + lines[i].args[3] = lines[i].args[2]; + } + else + { + lines[i].args[2] = R_PointToDist2(lines[i].v2->x, lines[i].v2->y, lines[i].v1->x, lines[i].v1->y) >> (FRACBITS + 1); + lines[i].args[3] = lines[i].args[2] / 4; + } + lines[i].special = 429; + break; + case 432: //Enable/disable 2D mode + lines[i].args[0] = !!(lines[i].flags & ML_NOCLIMB); + break; + case 433: //Enable/disable gravity flip + lines[i].args[0] = !!(lines[i].flags & ML_NOCLIMB); + lines[i].args[1] = !!(lines[i].flags & ML_SKEWTD); + lines[i].args[2] = !!(lines[i].flags & ML_BLOCKMONSTERS); + break; + case 434: //Award power-up + if (sides[lines[i].sidenum[0]].text) + { + lines[i].stringargs[0] = Z_Malloc(strlen(sides[lines[i].sidenum[0]].text) + 1, PU_LEVEL, NULL); + M_Memcpy(lines[i].stringargs[0], sides[lines[i].sidenum[0]].text, strlen(sides[lines[i].sidenum[0]].text) + 1); + } + if (lines[i].sidenum[1] != 0xffff && lines[i].flags & ML_BLOCKMONSTERS) // read power from back sidedef + { + lines[i].stringargs[1] = Z_Malloc(strlen(sides[lines[i].sidenum[1]].text) + 1, PU_LEVEL, NULL); + M_Memcpy(lines[i].stringargs[1], sides[lines[i].sidenum[1]].text, strlen(sides[lines[i].sidenum[1]].text) + 1); + } + else + P_WriteConstant((lines[i].flags & ML_NOCLIMB) ? -1 : (sides[lines[i].sidenum[0]].textureoffset >> FRACBITS), &lines[i].stringargs[1]); + break; + case 435: //Change plane scroller direction + lines[i].args[0] = tag; + lines[i].args[1] = R_PointToDist2(lines[i].v2->x, lines[i].v2->y, lines[i].v1->x, lines[i].v1->y) >> FRACBITS; + break; + case 436: //Shatter FOF + lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + lines[i].args[1] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS; + break; + case 437: //Disable player control + lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + lines[i].args[1] = !!(lines[i].flags & ML_NOCLIMB); + break; + case 438: //Change object size + lines[i].args[0] = P_AproxDistance(lines[i].dx, lines[i].dy) >> FRACBITS; + break; + case 439: //Change tagged linedef's textures + lines[i].args[0] = tag; + lines[i].args[1] = TMSD_FRONTBACK; + lines[i].args[2] = !!(lines[i].flags & ML_NOCLIMB); + lines[i].args[3] = !!(lines[i].flags & ML_EFFECT6); + break; + case 441: //Condition set trigger + lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + break; + case 442: //Change object type state + lines[i].args[0] = tag; + if (sides[lines[i].sidenum[0]].text) + { + lines[i].stringargs[0] = Z_Malloc(strlen(sides[lines[i].sidenum[0]].text) + 1, PU_LEVEL, NULL); + M_Memcpy(lines[i].stringargs[0], sides[lines[i].sidenum[0]].text, strlen(sides[lines[i].sidenum[0]].text) + 1); + } + if (lines[i].sidenum[1] == 0xffff) + lines[i].args[1] = 1; + else + { + lines[i].args[1] = 0; + if (sides[lines[i].sidenum[1]].text) + { + lines[i].stringargs[1] = Z_Malloc(strlen(sides[lines[i].sidenum[1]].text) + 1, PU_LEVEL, NULL); + M_Memcpy(lines[i].stringargs[1], sides[lines[i].sidenum[1]].text, strlen(sides[lines[i].sidenum[1]].text) + 1); + } + } + break; case 443: //Call Lua function if (lines[i].text) { @@ -3092,47 +5369,456 @@ static void P_ConvertBinaryMap(void) else CONS_Alert(CONS_WARNING, "Linedef %s is missing the hook name of the Lua function to call! (This should be given in the front texture fields)\n", sizeu1(i)); break; + case 444: //Earthquake + lines[i].args[0] = P_AproxDistance(lines[i].dx, lines[i].dy) >> FRACBITS; + lines[i].args[1] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + lines[i].args[2] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS; + break; + case 445: //Make FOF disappear/reappear + lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + lines[i].args[1] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS; + lines[i].args[2] = !!(lines[i].flags & ML_NOCLIMB); + break; + case 446: //Make FOF crumble + lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + lines[i].args[1] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS; + if (lines[i].flags & ML_NOCLIMB) + lines[i].args[2] |= TMFR_NORETURN; + if (lines[i].flags & ML_BLOCKMONSTERS) + lines[i].args[2] |= TMFR_CHECKFLAG; + break; case 447: //Change colormap - lines[i].args[0] = Tag_FGet(&lines[i].tags); - if (lines[i].flags & ML_EFFECT3) + lines[i].args[0] = tag; + if (lines[i].flags & ML_MIDPEG) lines[i].args[2] |= TMCF_RELATIVE; - if (lines[i].flags & ML_EFFECT1) + if (lines[i].flags & ML_SKEWTD) lines[i].args[2] |= TMCF_SUBLIGHTR|TMCF_SUBFADER; if (lines[i].flags & ML_NOCLIMB) lines[i].args[2] |= TMCF_SUBLIGHTG|TMCF_SUBFADEG; - if (lines[i].flags & ML_EFFECT2) + if (lines[i].flags & ML_NOSKEW) lines[i].args[2] |= TMCF_SUBLIGHTB|TMCF_SUBFADEB; break; + case 448: //Change skybox + lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + lines[i].args[1] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS; + if ((lines[i].flags & (ML_MIDSOLID|ML_BLOCKMONSTERS)) == ML_MIDSOLID) // Solid Midtexture is on but Block Enemies is off? + { + CONS_Alert(CONS_WARNING, + M_GetText("Skybox switch linedef (tag %d) doesn't have anything to do.\nConsider changing the linedef's flag configuration or removing it entirely.\n"), + tag); + lines[i].special = 0; + break; + } + else if ((lines[i].flags & (ML_MIDSOLID|ML_BLOCKMONSTERS)) == (ML_MIDSOLID|ML_BLOCKMONSTERS)) + lines[i].args[2] = TMS_CENTERPOINT; + else if (lines[i].flags & ML_BLOCKMONSTERS) + lines[i].args[2] = TMS_BOTH; + else + lines[i].args[2] = TMS_VIEWPOINT; + lines[i].args[3] = !!(lines[i].flags & ML_NOCLIMB); + break; + case 449: //Enable bosses with parameters + lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + lines[i].args[1] = !!(lines[i].flags & ML_NOCLIMB); + break; + case 450: //Execute linedef executor (specific tag) + lines[i].args[0] = tag; + break; + case 451: //Execute linedef executor (random tag in range) + lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + lines[i].args[1] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS; + break; + case 452: //Set FOF translucency + lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + lines[i].args[1] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS; + lines[i].args[2] = lines[i].sidenum[1] != 0xffff ? (sides[lines[i].sidenum[1]].textureoffset >> FRACBITS) : (P_AproxDistance(lines[i].dx, lines[i].dy) >> FRACBITS); + if (lines[i].flags & ML_MIDPEG) + lines[i].args[3] |= TMST_RELATIVE; + if (lines[i].flags & ML_NOCLIMB) + lines[i].args[3] |= TMST_DONTDOTRANSLUCENT; + break; + case 453: //Fade FOF + lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + lines[i].args[1] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS; + lines[i].args[2] = lines[i].sidenum[1] != 0xffff ? (sides[lines[i].sidenum[1]].textureoffset >> FRACBITS) : (lines[i].dx >> FRACBITS); + lines[i].args[3] = lines[i].sidenum[1] != 0xffff ? (sides[lines[i].sidenum[1]].rowoffset >> FRACBITS) : (abs(lines[i].dy) >> FRACBITS); + if (lines[i].flags & ML_MIDPEG) + lines[i].args[4] |= TMFT_RELATIVE; + if (lines[i].flags & ML_WRAPMIDTEX) + lines[i].args[4] |= TMFT_OVERRIDE; + if (lines[i].flags & ML_MIDSOLID) + lines[i].args[4] |= TMFT_TICBASED; + if (lines[i].flags & ML_BOUNCY) + lines[i].args[4] |= TMFT_IGNORECOLLISION; + if (lines[i].flags & ML_SKEWTD) + lines[i].args[4] |= TMFT_GHOSTFADE; + if (lines[i].flags & ML_NOCLIMB) + lines[i].args[4] |= TMFT_DONTDOTRANSLUCENT; + if (lines[i].flags & ML_BLOCKMONSTERS) + lines[i].args[4] |= TMFT_DONTDOEXISTS; + if (lines[i].flags & ML_NOSKEW) + lines[i].args[4] |= (TMFT_DONTDOLIGHTING|TMFT_DONTDOCOLORMAP); + if (lines[i].flags & ML_TFERLINE) + lines[i].args[4] |= TMFT_USEEXACTALPHA; + break; + case 454: //Stop fading FOF + lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + lines[i].args[1] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS; + lines[i].args[2] = !!(lines[i].flags & ML_BLOCKMONSTERS); + break; case 455: //Fade colormap { INT32 speed = (INT32)((((lines[i].flags & ML_DONTPEGBOTTOM) || !sides[lines[i].sidenum[0]].rowoffset) && lines[i].sidenum[1] != 0xFFFF) ? abs(sides[lines[i].sidenum[1]].rowoffset >> FRACBITS) : abs(sides[lines[i].sidenum[0]].rowoffset >> FRACBITS)); - lines[i].args[0] = Tag_FGet(&lines[i].tags); - if (lines[i].flags & ML_EFFECT4) + lines[i].args[0] = tag; + if (lines[i].flags & ML_MIDSOLID) lines[i].args[2] = speed; else lines[i].args[2] = (256 + speed - 1)/speed; - if (lines[i].flags & ML_EFFECT3) + if (lines[i].flags & ML_MIDPEG) lines[i].args[3] |= TMCF_RELATIVE; - if (lines[i].flags & ML_EFFECT1) + if (lines[i].flags & ML_SKEWTD) lines[i].args[3] |= TMCF_SUBLIGHTR|TMCF_SUBFADER; if (lines[i].flags & ML_NOCLIMB) lines[i].args[3] |= TMCF_SUBLIGHTG|TMCF_SUBFADEG; - if (lines[i].flags & ML_EFFECT2) + if (lines[i].flags & ML_NOSKEW) lines[i].args[3] |= TMCF_SUBLIGHTB|TMCF_SUBFADEB; if (lines[i].flags & ML_BOUNCY) lines[i].args[3] |= TMCF_FROMBLACK; - if (lines[i].flags & ML_EFFECT5) + if (lines[i].flags & ML_WRAPMIDTEX) lines[i].args[3] |= TMCF_OVERRIDE; break; } case 456: //Stop fading colormap - lines[i].args[0] = Tag_FGet(&lines[i].tags); + lines[i].args[0] = tag; + break; + case 457: //Track object's angle + lines[i].args[0] = tag; + lines[i].args[1] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + lines[i].args[2] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS; + lines[i].args[3] = (lines[i].sidenum[1] != 0xffff) ? sides[lines[i].sidenum[1]].textureoffset >> FRACBITS : 0; + lines[i].args[4] = !!(lines[i].flags & ML_NOSKEW); + break; + case 459: //Control text prompt + lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + lines[i].args[1] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS; + if (lines[i].flags & ML_BLOCKMONSTERS) + lines[i].args[2] |= TMP_CLOSE; + if (lines[i].flags & ML_SKEWTD) + lines[i].args[2] |= TMP_RUNPOSTEXEC; + if (lines[i].flags & ML_TFERLINE) + lines[i].args[2] |= TMP_CALLBYNAME; + if (lines[i].flags & ML_NOSKEW) + lines[i].args[2] |= TMP_KEEPCONTROLS; + if (lines[i].flags & ML_MIDPEG) + lines[i].args[2] |= TMP_KEEPREALTIME; + /*if (lines[i].flags & ML_NOCLIMB) + lines[i].args[2] |= TMP_ALLPLAYERS; + if (lines[i].flags & ML_MIDSOLID) + lines[i].args[2] |= TMP_FREEZETHINKERS;*/ + lines[i].args[3] = (lines[i].sidenum[1] != 0xFFFF) ? sides[lines[i].sidenum[1]].textureoffset >> FRACBITS : tag; + if (sides[lines[i].sidenum[0]].text) + { + lines[i].stringargs[0] = Z_Malloc(strlen(sides[lines[i].sidenum[0]].text) + 1, PU_LEVEL, NULL); + M_Memcpy(lines[i].stringargs[0], sides[lines[i].sidenum[0]].text, strlen(sides[lines[i].sidenum[0]].text) + 1); + } + break; + case 460: //Award rings + lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + lines[i].args[1] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS; + break; + case 461: //Spawn object + lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + lines[i].args[1] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS; + lines[i].args[2] = lines[i].frontsector->floorheight >> FRACBITS; + lines[i].args[3] = (lines[i].flags & ML_SKEWTD) ? AngleFixed(R_PointToAngle2(lines[i].v1->x, lines[i].v1->y, lines[i].v2->x, lines[i].v2->y)) >> FRACBITS : 0; + if (lines[i].flags & ML_NOCLIMB) + { + if (lines[i].sidenum[1] != 0xffff) // Make sure the linedef has a back side + { + lines[i].args[4] = 1; + lines[i].args[5] = sides[lines[i].sidenum[1]].textureoffset >> FRACBITS; + lines[i].args[6] = sides[lines[i].sidenum[1]].rowoffset >> FRACBITS; + lines[i].args[7] = lines[i].frontsector->ceilingheight >> FRACBITS; + } + else + { + CONS_Alert(CONS_WARNING, "Linedef Type %d - Spawn Object: Linedef is set for random range but has no back side.\n", lines[i].special); + lines[i].args[4] = 0; + } + } + else + lines[i].args[4] = 0; + if (sides[lines[i].sidenum[0]].text) + { + lines[i].stringargs[0] = Z_Malloc(strlen(sides[lines[i].sidenum[0]].text) + 1, PU_LEVEL, NULL); + M_Memcpy(lines[i].stringargs[0], sides[lines[i].sidenum[0]].text, strlen(sides[lines[i].sidenum[0]].text) + 1); + } + break; + case 463: //Dye object + if (sides[lines[i].sidenum[0]].text) + { + lines[i].stringargs[0] = Z_Malloc(strlen(sides[lines[i].sidenum[0]].text) + 1, PU_LEVEL, NULL); + M_Memcpy(lines[i].stringargs[0], sides[lines[i].sidenum[0]].text, strlen(sides[lines[i].sidenum[0]].text) + 1); + } + break; + case 464: //Trigger egg capsule + lines[i].args[0] = tag; + lines[i].args[1] = !!(lines[i].flags & ML_NOCLIMB); + break; + case 466: //Set level failure state + lines[i].args[0] = !!(lines[i].flags & ML_NOCLIMB); + break; + case 467: //Set light level + lines[i].args[0] = tag; + lines[i].args[1] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + lines[i].args[2] = TML_SECTOR; + lines[i].args[3] = !!(lines[i].flags & ML_MIDPEG); + break; + case 480: //Polyobject - door slide + case 481: //Polyobject - door move + lines[i].args[0] = tag; + lines[i].args[1] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + lines[i].args[2] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS; + if (lines[i].sidenum[1] != 0xffff) + lines[i].args[3] = sides[lines[i].sidenum[1]].textureoffset >> FRACBITS; + break; + case 482: //Polyobject - move + case 483: //Polyobject - move, override + lines[i].args[0] = tag; + lines[i].args[1] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + lines[i].args[2] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS; + lines[i].args[3] = lines[i].special == 483; + lines[i].special = 482; + break; + case 484: //Polyobject - rotate right + case 485: //Polyobject - rotate right, override + case 486: //Polyobject - rotate left + case 487: //Polyobject - rotate left, override + lines[i].args[0] = tag; + lines[i].args[1] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + lines[i].args[2] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS; + if (lines[i].args[2] == 360) + lines[i].args[3] |= TMPR_CONTINUOUS; + else if (lines[i].args[2] == 0) + lines[i].args[2] = 360; + if (lines[i].special < 486) + lines[i].args[2] *= -1; + if (lines[i].flags & ML_NOCLIMB) + lines[i].args[3] |= TMPR_DONTROTATEOTHERS; + else if (lines[i].flags & ML_MIDSOLID) + lines[i].args[3] |= TMPR_ROTATEPLAYERS; + if (lines[i].special % 2 == 1) + lines[i].args[3] |= TMPR_OVERRIDE; + lines[i].special = 484; + break; + case 488: //Polyobject - move by waypoints + lines[i].args[0] = tag; + lines[i].args[1] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + lines[i].args[2] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS; + if (lines[i].flags & ML_MIDPEG) + lines[i].args[3] = PWR_WRAP; + else if (lines[i].flags & ML_NOSKEW) + lines[i].args[3] = PWR_COMEBACK; + else + lines[i].args[3] = PWR_STOP; + if (lines[i].flags & ML_SKEWTD) + lines[i].args[4] |= PWF_REVERSE; + if (lines[i].flags & ML_MIDSOLID) + lines[i].args[4] |= PWF_LOOP; + break; + case 489: //Polyobject - turn invisible, intangible + case 490: //Polyobject - turn visible, tangible + lines[i].args[0] = tag; + lines[i].args[1] = 491 - lines[i].special; + if (!(lines[i].flags & ML_NOCLIMB)) + lines[i].args[2] = lines[i].args[1]; + lines[i].special = 489; + break; + case 491: //Polyobject - set translucency + lines[i].args[0] = tag; + // If Front X Offset is specified, use that. Else, use floorheight. + lines[i].args[1] = (sides[lines[i].sidenum[0]].textureoffset ? sides[lines[i].sidenum[0]].textureoffset : lines[i].frontsector->floorheight) >> FRACBITS; + // If DONTPEGBOTTOM, specify raw translucency value. Else, take it out of 1000. + if (!(lines[i].flags & ML_DONTPEGBOTTOM)) + lines[i].args[1] /= 100; + lines[i].args[2] = !!(lines[i].flags & ML_MIDPEG); + break; + case 492: //Polyobject - fade translucency + lines[i].args[0] = tag; + // If Front X Offset is specified, use that. Else, use floorheight. + lines[i].args[1] = (sides[lines[i].sidenum[0]].textureoffset ? sides[lines[i].sidenum[0]].textureoffset : lines[i].frontsector->floorheight) >> FRACBITS; + // If DONTPEGBOTTOM, specify raw translucency value. Else, take it out of 1000. + if (!(lines[i].flags & ML_DONTPEGBOTTOM)) + lines[i].args[1] /= 100; + // allow Back Y Offset to be consistent with other fade specials + lines[i].args[2] = (lines[i].sidenum[1] != 0xffff && !sides[lines[i].sidenum[0]].rowoffset) ? + abs(sides[lines[i].sidenum[1]].rowoffset >> FRACBITS) + : abs(sides[lines[i].sidenum[0]].rowoffset >> FRACBITS); + if (lines[i].flags & ML_MIDPEG) + lines[i].args[3] |= TMPF_RELATIVE; + if (lines[i].flags & ML_WRAPMIDTEX) + lines[i].args[3] |= TMPF_OVERRIDE; + if (lines[i].flags & ML_MIDSOLID) + lines[i].args[3] |= TMPF_TICBASED; + if (lines[i].flags & ML_BOUNCY) + lines[i].args[3] |= TMPF_IGNORECOLLISION; + if (lines[i].flags & ML_SKEWTD) + lines[i].args[3] |= TMPF_GHOSTFADE; + break; + case 500: //Scroll front wall left + case 501: //Scroll front wall right + lines[i].args[0] = 0; + lines[i].args[1] = (lines[i].special == 500) ? -1 : 1; + lines[i].args[2] = 0; + lines[i].special = 500; + break; + case 502: //Scroll tagged wall + case 503: //Scroll tagged wall (accelerative) + case 504: //Scroll tagged wall (displacement) + lines[i].args[0] = tag; + if (lines[i].flags & ML_MIDPEG) + { + if (lines[i].sidenum[1] == 0xffff) + { + CONS_Debug(DBG_GAMELOGIC, "Line special %d (line #%s) missing back side!\n", lines[i].special, sizeu1(i)); + lines[i].special = 0; + break; + } + lines[i].args[1] = 1; + } + else + lines[i].args[1] = 0; + if (lines[i].flags & ML_NOSKEW) + { + lines[i].args[2] = sides[lines[i].sidenum[0]].textureoffset >> (FRACBITS - SCROLL_SHIFT); + lines[i].args[3] = sides[lines[i].sidenum[0]].rowoffset >> (FRACBITS - SCROLL_SHIFT); + } + else + { + lines[i].args[2] = lines[i].dx >> FRACBITS; + lines[i].args[3] = lines[i].dy >> FRACBITS; + } + lines[i].args[4] = lines[i].special - 502; + lines[i].special = 502; + break; + case 505: //Scroll front wall by front side offsets + case 506: //Scroll front wall by back side offsets + case 507: //Scroll back wall by front side offsets + case 508: //Scroll back wall by back side offsets + lines[i].args[0] = lines[i].special >= 507; + if (lines[i].special % 2 == 0) + { + if (lines[i].sidenum[1] == 0xffff) + { + CONS_Debug(DBG_GAMELOGIC, "Line special %d (line #%s) missing back side!\n", lines[i].special, sizeu1(i)); + lines[i].special = 0; + break; + } + lines[i].args[1] = sides[lines[i].sidenum[1]].textureoffset >> FRACBITS; + lines[i].args[2] = sides[lines[i].sidenum[1]].rowoffset >> FRACBITS; + } + else + { + lines[i].args[1] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + lines[i].args[2] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS; + } + lines[i].special = 500; + break; + case 510: //Scroll floor texture + case 511: //Scroll floor texture (accelerative) + case 512: //Scroll floor texture (displacement) + case 513: //Scroll ceiling texture + case 514: //Scroll ceiling texture (accelerative) + case 515: //Scroll ceiling texture (displacement) + case 516: //Scroll floor and ceiling texture + case 517: //Scroll floor and ceiling texture (accelerative) + case 518: //Scroll floor and ceiling texture (displacement) + case 520: //Carry objects on floor + case 521: //Carry objects on floor (accelerative) + case 522: //Carry objects on floor (displacement) + case 523: //Carry objects on ceiling + case 524: //Carry objects on ceiling (accelerative) + case 525: //Carry objects on ceiling (displacement) + case 526: //Carry objects on floor and ceiling + case 527: //Carry objects on floor and ceiling (accelerative) + case 528: //Carry objects on floor and ceiling (displacement) + case 530: //Scroll floor texture and carry objects + case 531: //Scroll floor texture and carry objects (accelerative) + case 532: //Scroll floor texture and carry objects (displacement) + case 533: //Scroll ceiling texture and carry objects + case 534: //Scroll ceiling texture and carry objects (accelerative) + case 535: //Scroll ceiling texture and carry objects (displacement) + case 536: //Scroll floor and ceiling texture and carry objects + case 537: //Scroll floor and ceiling texture and carry objects (accelerative) + case 538: //Scroll floor and ceiling texture and carry objects (displacement) + lines[i].args[0] = tag; + lines[i].args[1] = ((lines[i].special % 10) < 6) ? (((lines[i].special % 10) < 3) ? TMP_FLOOR : TMP_CEILING) : TMP_BOTH; + lines[i].args[2] = ((lines[i].special - 510)/10 + 1) % 3; + lines[i].args[3] = ((lines[i].flags & ML_EFFECT6) ? sides[lines[i].sidenum[0]].textureoffset : R_PointToDist2(lines[i].v2->x, lines[i].v2->y, lines[i].v1->x, lines[i].v1->y)) >> FRACBITS; + lines[i].args[4] = (lines[i].special % 10) % 3; + if (lines[i].args[2] != TMS_SCROLLONLY && !(lines[i].flags & ML_NOCLIMB)) + lines[i].args[4] |= TMST_NONEXCLUSIVE; + lines[i].special = 510; + break; + case 540: //Floor friction + { + INT32 s; + fixed_t strength; // friction value of sector + fixed_t friction; // friction value to be applied during movement + + strength = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; + if (strength > 0) // sludge + strength = strength*2; // otherwise, the maximum sludginess value is +967... + + // The following might seem odd. At the time of movement, + // the move distance is multiplied by 'friction/0x10000', so a + // higher friction value actually means 'less friction'. + friction = ORIG_FRICTION - (0x1EB8*strength)/0x80; // ORIG_FRICTION is 0xE800 + + TAG_ITER_SECTORS(tag, s) + sectors[s].friction = friction; + break; + } + case 541: //Wind + case 542: //Upwards wind + case 543: //Downwards wind + case 544: //Current + case 545: //Upwards current + case 546: //Downwards current + { + fixed_t strength = (lines[i].flags & ML_EFFECT6) ? sides[lines[i].sidenum[0]].textureoffset : R_PointToDist2(lines[i].v2->x, lines[i].v2->y, lines[i].v1->x, lines[i].v1->y); + lines[i].args[0] = tag; + switch ((lines[i].special - 541) % 3) + { + case 0: + lines[i].args[1] = strength >> FRACBITS; + break; + case 1: + lines[i].args[2] = strength >> FRACBITS; + break; + case 2: + lines[i].args[2] = -strength >> FRACBITS; + break; + } + lines[i].args[3] = (lines[i].special >= 544) ? p_current : p_wind; + if (lines[i].flags & ML_MIDSOLID) + lines[i].args[4] |= TMPF_SLIDE; + if (!(lines[i].flags & ML_NOCLIMB)) + lines[i].args[4] |= TMPF_NONEXCLUSIVE; + lines[i].special = 541; + break; + } + case 600: //Floor lighting + case 601: //Ceiling lighting + lines[i].args[0] = tag; + lines[i].args[1] = (lines[i].special == 601) ? TMP_CEILING : TMP_FLOOR; + lines[i].special = 600; break; case 606: //Colormap - lines[i].args[0] = Tag_FGet(&lines[i].tags); + lines[i].args[0] = tag; break; case 700: //Slope front sector floor case 701: //Slope front sector ceiling @@ -3155,6 +5841,8 @@ static void P_ConvertBinaryMap(void) lines[i].args[2] |= TMSL_NOPHYSICS; if (lines[i].flags & ML_NONET) lines[i].args[2] |= TMSL_DYNAMIC; + if (lines[i].flags & ML_TFERLINE) + lines[i].args[2] |= TMSL_COPY; lines[i].special = 700; break; @@ -3237,22 +5925,36 @@ static void P_ConvertBinaryMap(void) lines[i].args[4] |= TMSC_BACKTOFRONTCEILING; lines[i].special = 720; break; - - case 900: //Translucent wall (10%) - case 901: //Translucent wall (20%) - case 902: //Translucent wall (30%) - case 903: //Translucent wall (40%) - case 904: //Translucent wall (50%) - case 905: //Translucent wall (60%) - case 906: //Translucent wall (70%) - case 907: //Translucent wall (80%) - case 908: //Translucent wall (90%) - lines[i].alpha = ((909 - lines[i].special) << FRACBITS)/10; + case 799: //Set dynamic slope vertex to front sector height + lines[i].args[0] = !!(lines[i].flags & ML_NOCLIMB); + break; + case 909: //Fog wall + lines[i].blendmode = AST_FOG; break; default: break; } + // Set alpha for translucent walls + if (lines[i].special >= 900 && lines[i].special < 909) + lines[i].alpha = ((909 - lines[i].special) << FRACBITS)/10; + + // Set alpha for additive/subtractive/reverse subtractive walls + if (lines[i].special >= 910 && lines[i].special <= 939) + lines[i].alpha = ((10 - lines[i].special % 10) << FRACBITS)/10; + + if (lines[i].special >= 910 && lines[i].special <= 919) // additive + lines[i].blendmode = AST_ADD; + + if (lines[i].special >= 920 && lines[i].special <= 929) // subtractive + lines[i].blendmode = AST_SUBTRACT; + + if (lines[i].special >= 930 && lines[i].special <= 939) // reverse subtractive + lines[i].blendmode = AST_REVERSESUBTRACT; + + if (lines[i].special == 940) // modulate + lines[i].blendmode = AST_MODULATE; + //Linedef executor delay if (lines[i].special >= 400 && lines[i].special < 500) { @@ -3262,25 +5964,545 @@ static void P_ConvertBinaryMap(void) lines[i].executordelay = 1; } } +} + +static void P_ConvertBinarySectorTypes(void) +{ + size_t i; + + for (i = 0; i < numsectors; i++) + { + mtag_t tag = Tag_FGet(§ors[i].tags); + + switch(GETSECSPECIAL(sectors[i].special, 1)) + { + case 1: //Damage + sectors[i].damagetype = SD_GENERIC; + break; + case 2: //Damage (Water) + sectors[i].damagetype = SD_WATER; + break; + case 3: //Damage (Fire) + { + size_t j; + boolean isLava = false; + + for (j = 0; j < sectors[i].linecount; j++) + { + line_t *line = sectors[i].lines[j]; + + if (line->frontsector != §ors[i]) + continue; + + if (line->flags & ML_BLOCKMONSTERS) + continue; + + if (line->special == 120 || (line->special == 259 && (line->args[2] & FOF_SWIMMABLE))) + { + isLava = true; + break; + } + } + sectors[i].damagetype = isLava ? SD_LAVA : SD_FIRE; + break; + } + case 4: //Damage (Electric) + sectors[i].damagetype = SD_ELECTRIC; + break; + case 5: //Spikes + sectors[i].damagetype = SD_SPIKE; + break; + case 6: //Death pit (camera tilt) + sectors[i].damagetype = SD_DEATHPITTILT; + break; + case 7: //Death pit (no camera tilt) + sectors[i].damagetype = SD_DEATHPITNOTILT; + break; + case 8: //Instakill + sectors[i].damagetype = SD_INSTAKILL; + break; + case 11: //Special stage damage + sectors[i].damagetype = SD_SPECIALSTAGE; + break; + case 12: //Space countdown + sectors[i].specialflags |= SSF_OUTERSPACE; + break; + case 13: //Ramp sector + sectors[i].specialflags |= SSF_DOUBLESTEPUP; + break; + case 14: //Non-ramp sector + sectors[i].specialflags |= SSF_NOSTEPDOWN; + break; + case 15: //Bouncy FOF + CONS_Alert(CONS_WARNING, M_GetText("Deprecated bouncy FOF sector type detected. Please use linedef type 76 instead.\n")); + break; + default: + break; + } + + switch(GETSECSPECIAL(sectors[i].special, 2)) + { + case 1: //Trigger linedef executor (pushable objects) + sectors[i].triggertag = tag; + sectors[i].flags |= MSF_TRIGGERLINE_PLANE; + sectors[i].triggerer = TO_MOBJ; + break; + case 2: //Trigger linedef executor (Anywhere in sector, all players) + sectors[i].triggertag = tag; + sectors[i].flags &= ~MSF_TRIGGERLINE_PLANE; + sectors[i].triggerer = TO_ALLPLAYERS; + break; + case 3: //Trigger linedef executor (Floor touch, all players) + sectors[i].triggertag = tag; + sectors[i].flags |= MSF_TRIGGERLINE_PLANE; + sectors[i].triggerer = TO_ALLPLAYERS; + break; + case 4: //Trigger linedef executor (Anywhere in sector) + sectors[i].triggertag = tag; + sectors[i].flags &= ~MSF_TRIGGERLINE_PLANE; + sectors[i].triggerer = TO_PLAYER; + break; + case 5: //Trigger linedef executor (Floor touch) + sectors[i].triggertag = tag; + sectors[i].flags |= MSF_TRIGGERLINE_PLANE; + sectors[i].triggerer = TO_PLAYER; + break; + case 6: //Trigger linedef executor (Emerald check) + CONS_Alert(CONS_WARNING, M_GetText("Deprecated emerald check sector type detected. Please use linedef types 337-339 instead.\n")); + sectors[i].triggertag = tag; + sectors[i].flags &= ~MSF_TRIGGERLINE_PLANE; + sectors[i].triggerer = TO_PLAYEREMERALDS; + break; + case 7: //Trigger linedef executor (NiGHTS mare) + CONS_Alert(CONS_WARNING, M_GetText("Deprecated NiGHTS mare sector type detected. Please use linedef types 340-342 instead.\n")); + sectors[i].triggertag = tag; + sectors[i].flags &= ~MSF_TRIGGERLINE_PLANE; + sectors[i].triggerer = TO_PLAYERNIGHTS; + break; + case 8: //Check for linedef executor on FOFs + sectors[i].flags |= MSF_TRIGGERLINE_MOBJ; + break; + case 10: //Special stage time/spheres requirements + CONS_Alert(CONS_WARNING, M_GetText("Deprecated sector type for special stage requirements detected. Please use the SpecialStageTime and SpecialStageSpheres level header options instead.\n")); + break; + case 11: //Custom global gravity + CONS_Alert(CONS_WARNING, M_GetText("Deprecated sector type for global gravity detected. Please use the Gravity level header option instead.\n")); + break; + default: + break; + } + + switch(GETSECSPECIAL(sectors[i].special, 3)) + { + case 5: //Speed pad + sectors[i].specialflags |= SSF_SPEEDPAD; + break; + case 6: //Gravity flip on jump (think VVVVVV) + sectors[i].specialflags |= SSF_JUMPFLIP; + break; + default: + break; + } + + switch(GETSECSPECIAL(sectors[i].special, 4)) + { + case 1: //Star post activator + sectors[i].specialflags |= SSF_STARPOSTACTIVATOR; + break; + case 2: //Exit/Special Stage pit/Return flag + sectors[i].specialflags |= SSF_EXIT|SSF_SPECIALSTAGEPIT|SSF_RETURNFLAG; + break; + case 3: //Red team base + sectors[i].specialflags |= SSF_REDTEAMBASE; + break; + case 4: //Blue team base + sectors[i].specialflags |= SSF_BLUETEAMBASE; + break; + case 5: //Fan sector + sectors[i].specialflags |= SSF_FAN; + break; + case 6: //Super Sonic transform + sectors[i].specialflags |= SSF_SUPERTRANSFORM; + break; + case 7: //Force spin + sectors[i].specialflags |= SSF_FORCESPIN; + break; + case 8: //Zoom tube start + sectors[i].specialflags |= SSF_ZOOMTUBESTART; + break; + case 9: //Zoom tube end + sectors[i].specialflags |= SSF_ZOOMTUBEEND; + break; + case 10: //Circuit finish line + sectors[i].specialflags |= SSF_FINISHLINE; + break; + case 11: //Rope hang + sectors[i].specialflags |= SSF_ROPEHANG; + break; + case 12: //Intangible to the camera + sectors[i].flags |= MSF_NOCLIPCAMERA; + break; + default: + break; + } + } +} + +static void P_ConvertBinaryThingTypes(void) +{ + size_t i; + mobjtype_t mobjtypeofthing[4096] = {0}; + mobjtype_t mobjtype; + + for (i = 0; i < NUMMOBJTYPES; i++) + { + if (mobjinfo[i].doomednum < 0 || mobjinfo[i].doomednum >= 4096) + continue; + + mobjtypeofthing[mobjinfo[i].doomednum] = (mobjtype_t)i; + } for (i = 0; i < nummapthings; i++) { + mobjtype = mobjtypeofthing[mapthings[i].type]; + if (mobjtype) + { + if (mobjinfo[mobjtype].flags & MF_BOSS) + { + INT32 paramoffset = mapthings[i].extrainfo*LE_PARAMWIDTH; + mapthings[i].args[0] = mapthings[i].extrainfo; + mapthings[i].args[1] = !!(mapthings[i].options & MTF_OBJECTSPECIAL); + mapthings[i].args[2] = LE_BOSSDEAD + paramoffset; + mapthings[i].args[3] = LE_ALLBOSSESDEAD + paramoffset; + mapthings[i].args[4] = LE_PINCHPHASE + paramoffset; + } + if (mobjinfo[mobjtype].flags & MF_NIGHTSITEM) + { + if (mapthings[i].options & MTF_OBJECTSPECIAL) + mapthings[i].args[0] |= TMNI_BONUSONLY; + if (mapthings[i].options & MTF_AMBUSH) + mapthings[i].args[0] |= TMNI_REVEAL; + } + if (mobjinfo[mobjtype].flags & MF_PUSHABLE) + { + if ((mapthings[i].options & (MTF_OBJECTSPECIAL|MTF_AMBUSH)) == (MTF_OBJECTSPECIAL|MTF_AMBUSH)) + mapthings[i].args[0] = TMP_CLASSIC; + else if (mapthings[i].options & MTF_OBJECTSPECIAL) + mapthings[i].args[0] = TMP_SLIDE; + else if (mapthings[i].options & MTF_AMBUSH) + mapthings[i].args[0] = TMP_IMMOVABLE; + else + mapthings[i].args[0] = TMP_NORMAL; + } + if ((mobjinfo[mobjtype].flags & MF_SPRING) && mobjinfo[mobjtype].painchance == 3) + mapthings[i].args[0] = !!(mapthings[i].options & MTF_AMBUSH); + if (mobjinfo[mobjtype].flags & MF_MONITOR) + { + if ((mapthings[i].options & MTF_EXTRA) && mapthings[i].angle & 16384) + mapthings[i].args[0] = mapthings[i].angle & 16383; + + if (mobjinfo[mobjtype].speed != 0) + { + if (mapthings[i].options & MTF_OBJECTSPECIAL) + mapthings[i].args[1] = TMMR_STRONG; + else if (mapthings[i].options & MTF_AMBUSH) + mapthings[i].args[1] = TMMR_WEAK; + else + mapthings[i].args[1] = TMMR_SAME; + } + } + } + + if (mapthings[i].type >= 1 && mapthings[i].type <= 35) //Player starts + { + mapthings[i].args[0] = !!(mapthings[i].options & MTF_AMBUSH); + continue; + } + else if (mapthings[i].type >= 2200 && mapthings[i].type <= 2217) //Flickies + { + mapthings[i].args[0] = mapthings[i].angle; + if (mapthings[i].options & MTF_EXTRA) + mapthings[i].args[1] |= TMFF_AIMLESS; + if (mapthings[i].options & MTF_OBJECTSPECIAL) + mapthings[i].args[1] |= TMFF_STATIONARY; + if (mapthings[i].options & MTF_AMBUSH) + mapthings[i].args[1] |= TMFF_HOP; + if (mapthings[i].type == 2207) + mapthings[i].args[2] = mapthings[i].extrainfo; + continue; + } + switch (mapthings[i].type) { - case 750: - Tag_FSet(&mapthings[i].tags, mapthings[i].angle); + case 102: //SDURF + case 1805: //Puma + mapthings[i].args[0] = mapthings[i].angle; break; - case 760: - case 761: - Tag_FSet(&mapthings[i].tags, mapthings[i].angle); + case 110: //THZ Turret + mapthings[i].args[0] = LE_TURRET; break; - case 762: + case 111: //Pop-up Turret + mapthings[i].args[0] = mapthings[i].angle; + break; + case 103: //Buzz (Gold) + case 104: //Buzz (Red) + case 105: //Jetty-syn Bomber + case 106: //Jetty-syn Gunner + case 117: //Robo-Hood + case 126: //Crushstacean + case 128: //Bumblebore + case 132: //Cacolantern + case 138: //Banpyura + case 1602: //Pian + mapthings[i].args[0] = !!(mapthings[i].options & MTF_AMBUSH); + break; + case 119: //Egg Guard + if ((mapthings[i].options & (MTF_EXTRA|MTF_OBJECTSPECIAL)) == MTF_OBJECTSPECIAL) + mapthings[i].args[0] = TMGD_LEFT; + else if ((mapthings[i].options & (MTF_EXTRA|MTF_OBJECTSPECIAL)) == MTF_EXTRA) + mapthings[i].args[0] = TMGD_RIGHT; + else + mapthings[i].args[0] = TMGD_BACK; + mapthings[i].args[1] = !!(mapthings[i].options & MTF_AMBUSH); + break; + case 127: //Hive Elemental + mapthings[i].args[0] = mapthings[i].extrainfo; + break; + case 135: //Pterabyte Spawner + mapthings[i].args[0] = mapthings[i].extrainfo + 1; + break; + case 136: //Pyre Fly + mapthings[i].args[0] = !!(mapthings[i].options & MTF_AMBUSH); + break; + case 201: //Egg Slimer + mapthings[i].args[5] = !(mapthings[i].options & MTF_AMBUSH); + break; + case 203: //Egg Colosseum + mapthings[i].args[5] = LE_BOSS4DROP + mapthings[i].extrainfo * LE_PARAMWIDTH; + break; + case 204: //Fang + mapthings[i].args[4] = LE_BOSS4DROP + mapthings[i].extrainfo*LE_PARAMWIDTH; + if (mapthings[i].options & MTF_EXTRA) + mapthings[i].args[5] |= TMF_GRAYSCALE; + if (mapthings[i].options & MTF_AMBUSH) + mapthings[i].args[5] |= TMF_SKIPINTRO; + break; + case 206: //Brak Eggman (Old) + mapthings[i].args[5] = LE_BRAKPLATFORM + mapthings[i].extrainfo*LE_PARAMWIDTH; + break; + case 207: //Metal Sonic (Race) + case 2104: //Amy Cameo + mapthings[i].args[0] = !!(mapthings[i].options & MTF_EXTRA); + break; + case 208: //Metal Sonic (Battle) + mapthings[i].args[5] = !!(mapthings[i].options & MTF_EXTRA); + break; + case 209: //Brak Eggman + mapthings[i].args[5] = LE_BRAKVILEATACK + mapthings[i].extrainfo*LE_PARAMWIDTH; + if (mapthings[i].options & MTF_EXTRA) + mapthings[i].args[6] |= TMB_NODEATHFLING; + if (mapthings[i].options & MTF_AMBUSH) + mapthings[i].args[6] |= TMB_BARRIER; + break; + case 292: //Boss waypoint + mapthings[i].args[0] = mapthings[i].angle; + mapthings[i].args[1] = mapthings[i].options & 7; + break; + case 294: //Fang waypoint + mapthings[i].args[0] = !!(mapthings[i].options & MTF_AMBUSH); + break; + case 300: //Ring + case 301: //Bounce ring + case 302: //Rail ring + case 303: //Infinity ring + case 304: //Automatic ring + case 305: //Explosion ring + case 306: //Scatter ring + case 307: //Grenade ring + case 308: //Red team ring + case 309: //Blue team ring + case 312: //Emerald token + case 320: //Emerald hunt location + case 321: //Match chaos emerald spawn + case 330: //Bounce ring panel + case 331: //Rail ring panel + case 332: //Automatic ring panel + case 333: //Explosion ring panel + case 334: //Scatter ring panel + case 335: //Grenade ring panel + case 520: //Bomb sphere + case 521: //Spikeball + case 1706: //Blue sphere + case 1800: //Coin + mapthings[i].args[0] = !(mapthings[i].options & MTF_AMBUSH); + break; + case 322: //Emblem + mapthings[i].args[1] = !(mapthings[i].options & MTF_AMBUSH); + break; + case 409: //Extra life monitor + mapthings[i].args[2] = !(mapthings[i].options & (MTF_AMBUSH|MTF_OBJECTSPECIAL)); + break; + case 500: //Air bubble patch + mapthings[i].args[0] = !!(mapthings[i].options & MTF_AMBUSH); + break; + case 502: //Star post + if (mapthings[i].extrainfo) + // Allow thing Parameter to define star post num too! + // For starposts above param 15 (the 16th), add 360 to the angle like before and start parameter from 1 (NOT 0)! + // So the 16th starpost is angle=0 param=15, the 17th would be angle=360 param=1. + // This seems more intuitive for mappers to use, since most SP maps won't have over 16 consecutive star posts. + mapthings[i].args[0] = mapthings[i].extrainfo + (mapthings[i].angle/360) * 15; + else + // Old behavior if Parameter is 0; add 360 to the angle for each consecutive star post. + mapthings[i].args[0] = (mapthings[i].angle/360); + mapthings[i].args[1] = !!(mapthings[i].options & MTF_OBJECTSPECIAL); + break; + case 522: //Wall spike + if (mapthings[i].options & MTF_OBJECTSPECIAL) + { + mapthings[i].args[0] = mobjinfo[MT_WALLSPIKE].speed + mapthings[i].angle/360; + mapthings[i].args[1] = (16 - mapthings[i].extrainfo) * mapthings[i].args[0]/16; + if (mapthings[i].options & MTF_EXTRA) + mapthings[i].args[2] |= TMSF_RETRACTED; + } + if (mapthings[i].options & MTF_AMBUSH) + mapthings[i].args[2] |= TMSF_INTANGIBLE; + break; + case 523: //Spike + if (mapthings[i].options & MTF_OBJECTSPECIAL) + { + mapthings[i].args[0] = mobjinfo[MT_SPIKE].speed + mapthings[i].angle; + mapthings[i].args[1] = (16 - mapthings[i].extrainfo) * mapthings[i].args[0]/16; + if (mapthings[i].options & MTF_EXTRA) + mapthings[i].args[2] |= TMSF_RETRACTED; + } + if (mapthings[i].options & MTF_AMBUSH) + mapthings[i].args[2] |= TMSF_INTANGIBLE; + break; + case 540: //Fan + mapthings[i].args[0] = mapthings[i].angle; + if (mapthings[i].options & MTF_OBJECTSPECIAL) + mapthings[i].args[1] |= TMF_INVISIBLE; + if (mapthings[i].options & MTF_AMBUSH) + mapthings[i].args[1] |= TMF_NODISTANCECHECK; + break; + case 541: //Gas jet + mapthings[i].args[0] = !!(mapthings[i].options & MTF_AMBUSH); + break; + case 543: //Balloon + if (mapthings[i].angle > 0) + P_WriteConstant(((mapthings[i].angle - 1) % (numskincolors - 1)) + 1, &mapthings[i].stringargs[0]); + mapthings[i].args[0] = !!(mapthings[i].options & MTF_AMBUSH); + break; + case 555: //Diagonal yellow spring + case 556: //Diagonal red spring + case 557: //Diagonal blue spring + if (mapthings[i].options & MTF_OBJECTSPECIAL) + mapthings[i].args[0] |= TMDS_NOGRAVITY; + if (mapthings[i].options & MTF_AMBUSH) + mapthings[i].args[0] |= TMDS_ROTATEEXTRA; + break; + case 558: //Horizontal yellow spring + case 559: //Horizontal red spring + case 560: //Horizontal blue spring + mapthings[i].args[0] = !(mapthings[i].options & MTF_AMBUSH); + break; + case 700: //Water ambience A + case 701: //Water ambience B + case 702: //Water ambience C + case 703: //Water ambience D + case 704: //Water ambience E + case 705: //Water ambience F + case 706: //Water ambience G + case 707: //Water ambience H + mapthings[i].args[0] = 35; + P_WriteConstant(sfx_amwtr1 + mapthings[i].type - 700, &mapthings[i].stringargs[0]); + mapthings[i].type = 700; + break; + case 708: //Disco ambience + mapthings[i].args[0] = 512; + P_WriteConstant(sfx_ambint, &mapthings[i].stringargs[0]); + mapthings[i].type = 700; + break; + case 709: //Volcano ambience + mapthings[i].args[0] = 220; + P_WriteConstant(sfx_ambin2, &mapthings[i].stringargs[0]); + mapthings[i].type = 700; + break; + case 710: //Machine ambience + mapthings[i].args[0] = 24; + P_WriteConstant(sfx_ambmac, &mapthings[i].stringargs[0]); + mapthings[i].type = 700; + break; + case 750: //Slope vertex + mapthings[i].args[0] = mapthings[i].extrainfo; + break; + case 753: //Zoom tube waypoint + mapthings[i].args[0] = mapthings[i].angle >> 8; + mapthings[i].args[1] = mapthings[i].angle & 255; + break; + case 754: //Push point + case 755: //Pull point + { + subsector_t *ss = R_PointInSubsector(mapthings[i].x << FRACBITS, mapthings[i].y << FRACBITS); + sector_t *s; + line_t *line; + + if (!ss) + { + CONS_Debug(DBG_GAMELOGIC, "Push/pull point: Placed outside of map bounds!\n"); + break; + } + + s = ss->sector; + line = P_FindPointPushLine(&s->tags); + + if (!line) + { + CONS_Debug(DBG_GAMELOGIC, "Push/pull point: Unable to find line of type 547 tagged to sector %s!\n", sizeu1((size_t)(s - sectors))); + break; + } + + mapthings[i].args[0] = mapthings[i].angle; + mapthings[i].args[1] = (line->flags & ML_EFFECT6) ? sides[line->sidenum[0]].textureoffset >> FRACBITS : P_AproxDistance(line->dx >> FRACBITS, line->dy >> FRACBITS); + if (mapthings[i].type == 755) + mapthings[i].args[1] *= -1; + if (mapthings[i].options & MTF_OBJECTSPECIAL) + mapthings[i].args[2] |= TMPP_NOZFADE; + if (mapthings[i].options & MTF_AMBUSH) + mapthings[i].args[2] |= TMPP_PUSHZ; + if (!(line->flags & ML_NOCLIMB)) + mapthings[i].args[2] |= TMPP_NONEXCLUSIVE; + mapthings[i].type = 754; + break; + } + case 756: //Blast linedef executor + mapthings[i].args[0] = mapthings[i].angle; + break; + case 757: //Fan particle generator + { + INT32 j = Tag_FindLineSpecial(15, mapthings[i].angle); + + if (j == -1) + { + CONS_Debug(DBG_GAMELOGIC, "Particle generator (mapthing #%s) needs to be tagged to a #15 parameter line (trying to find tag %d).\n", sizeu1(i), mapthings[i].angle); + break; + } + mapthings[i].args[0] = mapthings[i].z; + mapthings[i].args[1] = R_PointToDist2(lines[j].v1->x, lines[j].v1->y, lines[j].v2->x, lines[j].v2->y) >> FRACBITS; + mapthings[i].args[2] = sides[lines[j].sidenum[0]].textureoffset >> FRACBITS; + mapthings[i].args[3] = sides[lines[j].sidenum[0]].rowoffset >> FRACBITS; + mapthings[i].args[4] = lines[j].backsector ? sides[lines[j].sidenum[1]].textureoffset >> FRACBITS : 0; + mapthings[i].args[6] = mapthings[i].angle; + if (sides[lines[j].sidenum[0]].toptexture) + P_WriteConstant(sides[lines[j].sidenum[0]].toptexture, &mapthings[i].stringargs[0]); + break; + } + case 762: //PolyObject spawn point (crush) { INT32 check = -1; INT32 firstline = -1; - mtag_t tag = mapthings[i].angle; - - Tag_FSet(&mapthings[i].tags, tag); + mtag_t tag = Tag_FGet(&mapthings[i].tags); TAG_ITER_LINES(tag, check) { @@ -3297,8 +6519,201 @@ static void P_ConvertBinaryMap(void) mapthings[i].type = 761; break; } - case 780: - Tag_FSet(&mapthings[i].tags, mapthings[i].extrainfo); + case 780: //Skybox + mapthings[i].args[0] = !!(mapthings[i].options & MTF_OBJECTSPECIAL); + break; + case 799: //Tutorial plant + mapthings[i].args[0] = mapthings[i].extrainfo; + break; + case 1002: //Dripping water + mapthings[i].args[0] = mapthings[i].angle; + break; + case 1007: //Kelp + case 1008: //Stalagmite (DSZ1) + case 1011: //Stalagmite (DSZ2) + mapthings[i].args[0] = !!(mapthings[i].options & MTF_OBJECTSPECIAL); + break; + case 1102: //Eggman Statue + mapthings[i].args[1] = !!(mapthings[i].options & MTF_EXTRA); + break; + case 1104: //Mace spawnpoint + case 1105: //Chain with maces spawnpoint + case 1106: //Chained spring spawnpoint + case 1107: //Chain spawnpoint + case 1109: //Firebar spawnpoint + case 1110: //Custom mace spawnpoint + { + mtag_t tag = (mtag_t)mapthings[i].angle; + INT32 j = Tag_FindLineSpecial(9, tag); + + if (j == -1) + { + CONS_Debug(DBG_GAMELOGIC, "Chain/mace setup: Unable to find parameter line 9 (tag %d)!\n", tag); + break; + } + + mapthings[i].angle = lines[j].frontsector->ceilingheight >> FRACBITS; + mapthings[i].pitch = lines[j].frontsector->floorheight >> FRACBITS; + mapthings[i].args[0] = lines[j].dx >> FRACBITS; + mapthings[i].args[1] = mapthings[i].extrainfo; + mapthings[i].args[3] = lines[j].dy >> FRACBITS; + mapthings[i].args[4] = sides[lines[j].sidenum[0]].textureoffset >> FRACBITS; + mapthings[i].args[7] = -sides[lines[j].sidenum[0]].rowoffset >> FRACBITS; + if (lines[j].backsector) + { + mapthings[i].roll = lines[j].backsector->ceilingheight >> FRACBITS; + mapthings[i].args[2] = sides[lines[j].sidenum[1]].rowoffset >> FRACBITS; + mapthings[i].args[5] = lines[j].backsector->floorheight >> FRACBITS; + mapthings[i].args[6] = sides[lines[j].sidenum[1]].textureoffset >> FRACBITS; + } + if (mapthings[i].options & MTF_AMBUSH) + mapthings[i].args[8] |= TMM_DOUBLESIZE; + if (mapthings[i].options & MTF_OBJECTSPECIAL) + mapthings[i].args[8] |= TMM_SILENT; + if (lines[j].flags & ML_NOCLIMB) + mapthings[i].args[8] |= TMM_ALLOWYAWCONTROL; + if (lines[j].flags & ML_SKEWTD) + mapthings[i].args[8] |= TMM_SWING; + if (lines[j].flags & ML_NOSKEW) + mapthings[i].args[8] |= TMM_MACELINKS; + if (lines[j].flags & ML_MIDPEG) + mapthings[i].args[8] |= TMM_CENTERLINK; + if (lines[j].flags & ML_MIDSOLID) + mapthings[i].args[8] |= TMM_CLIP; + if (lines[j].flags & ML_WRAPMIDTEX) + mapthings[i].args[8] |= TMM_ALWAYSTHINK; + if (mapthings[i].type == 1110) + { + P_WriteConstant(sides[lines[j].sidenum[0]].toptexture, &mapthings[i].stringargs[0]); + P_WriteConstant(lines[j].backsector ? sides[lines[j].sidenum[1]].toptexture : MT_NULL, &mapthings[i].stringargs[1]); + } + break; + } + case 1101: //Torch + case 1119: //Candle + case 1120: //Candle pricket + mapthings[i].args[0] = !!(mapthings[i].options & MTF_EXTRA); + break; + case 1121: //Flame holder + if (mapthings[i].options & MTF_OBJECTSPECIAL) + mapthings[i].args[0] |= TMFH_NOFLAME; + if (mapthings[i].options & MTF_EXTRA) + mapthings[i].args[0] |= TMFH_CORONA; + break; + case 1127: //Spectator EggRobo + if (mapthings[i].options & MTF_AMBUSH) + mapthings[i].args[0] = TMED_LEFT; + else if (mapthings[i].options & MTF_OBJECTSPECIAL) + mapthings[i].args[0] = TMED_RIGHT; + else + mapthings[i].args[0] = TMED_NONE; + break; + case 1200: //Tumbleweed (Big) + case 1201: //Tumbleweed (Small) + mapthings[i].args[0] = !!(mapthings[i].options & MTF_AMBUSH); + break; + case 1202: //Rock spawner + { + mtag_t tag = (mtag_t)mapthings[i].angle; + INT32 j = Tag_FindLineSpecial(12, tag); + + if (j == -1) + { + CONS_Debug(DBG_GAMELOGIC, "Rock spawner: Unable to find parameter line 12 (tag %d)!\n", tag); + break; + } + mapthings[i].angle = AngleFixed(R_PointToAngle2(lines[j].v2->x, lines[j].v2->y, lines[j].v1->x, lines[j].v1->y)) >> FRACBITS; + mapthings[i].args[0] = P_AproxDistance(lines[j].dx, lines[j].dy) >> FRACBITS; + mapthings[i].args[1] = sides[lines[j].sidenum[0]].textureoffset >> FRACBITS; + mapthings[i].args[2] = !!(lines[j].flags & ML_NOCLIMB); + P_WriteConstant(MT_ROCKCRUMBLE1 + (sides[lines[j].sidenum[0]].rowoffset >> FRACBITS), &mapthings[i].stringargs[0]); + break; + } + case 1221: //Minecart saloon door + mapthings[i].args[0] = !!(mapthings[i].options & MTF_AMBUSH); + break; + case 1229: //Minecart switch point + mapthings[i].args[0] = !!(mapthings[i].options & MTF_AMBUSH); + break; + case 1300: //Flame jet (horizontal) + case 1301: //Flame jet (vertical) + mapthings[i].args[0] = (mapthings[i].angle >> 13)*TICRATE/2; + mapthings[i].args[1] = ((mapthings[i].angle >> 10) & 7)*TICRATE/2; + mapthings[i].args[2] = 80 - 5*mapthings[i].extrainfo; + mapthings[i].args[3] = !!(mapthings[i].options & MTF_AMBUSH); + break; + case 1304: //Lavafall + mapthings[i].args[0] = mapthings[i].angle; + mapthings[i].args[1] = !!(mapthings[i].options & MTF_AMBUSH); + break; + case 1305: //Rollout Rock + mapthings[i].args[0] = !!(mapthings[i].options & MTF_AMBUSH); + break; + case 1500: //Glaregoyle + case 1501: //Glaregoyle (Up) + case 1502: //Glaregoyle (Down) + case 1503: //Glaregoyle (Long) + if (mapthings[i].angle >= 360) + mapthings[i].args[1] = 7*(mapthings[i].angle/360) + 1; + break; + case 1700: //Axis + mapthings[i].args[2] = mapthings[i].angle & 16383; + mapthings[i].args[3] = !!(mapthings[i].angle & 16384); + /* FALLTHRU */ + case 1701: //Axis transfer + case 1702: //Axis transfer line + mapthings[i].args[0] = mapthings[i].extrainfo; + mapthings[i].args[1] = mapthings[i].options; + break; + case 1703: //Ideya drone + mapthings[i].args[0] = mapthings[i].angle & 0xFFF; + mapthings[i].args[1] = mapthings[i].extrainfo*32; + mapthings[i].args[2] = ((mapthings[i].angle & 0xF000) >> 12)*32; + if ((mapthings[i].options & (MTF_OBJECTSPECIAL|MTF_EXTRA)) == (MTF_OBJECTSPECIAL|MTF_EXTRA)) + mapthings[i].args[3] = TMDA_BOTTOM; + else if ((mapthings[i].options & (MTF_OBJECTSPECIAL|MTF_EXTRA)) == MTF_OBJECTSPECIAL) + mapthings[i].args[3] = TMDA_TOP; + else if ((mapthings[i].options & (MTF_OBJECTSPECIAL|MTF_EXTRA)) == MTF_EXTRA) + mapthings[i].args[3] = TMDA_MIDDLE; + else + mapthings[i].args[3] = TMDA_BOTTOMOFFSET; + mapthings[i].args[4] = !!(mapthings[i].options & MTF_AMBUSH); + break; + case 1704: //NiGHTS bumper + mapthings[i].pitch = 30 * (((mapthings[i].options & 15) + 9) % 12); + mapthings[i].options &= ~0xF; + break; + case 1705: //Hoop + case 1713: //Hoop (Customizable) + { + UINT16 oldangle = mapthings[i].angle; + mapthings[i].angle = (mapthings[i].extrainfo == 1) ? oldangle - 90 : ((oldangle >> 8)*360)/256; + mapthings[i].pitch = (mapthings[i].extrainfo == 1) ? oldangle / 360 : ((oldangle & 255)*360)/256; + mapthings[i].args[0] = (mapthings[i].type == 1705) ? 96 : (mapthings[i].options & 0xF)*16 + 32; + mapthings[i].options &= ~0xF; + mapthings[i].type = 1713; + break; + } + case 1710: //Ideya capture + mapthings[i].args[0] = mapthings[i].extrainfo; + mapthings[i].args[1] = mapthings[i].angle; + break; + case 1714: //Ideya anchor point + mapthings[i].args[0] = mapthings[i].extrainfo; + break; + case 1806: //King Bowser + mapthings[i].args[0] = LE_KOOPA; + break; + case 1807: //Axe + mapthings[i].args[0] = LE_AXE; + break; + case 2000: //Smashing spikeball + mapthings[i].args[0] = mapthings[i].angle; + break; + case 2006: //Jack-o'-lantern 1 + case 2007: //Jack-o'-lantern 2 + case 2008: //Jack-o'-lantern 3 + mapthings[i].args[0] = !!(mapthings[i].options & MTF_EXTRA); break; default: break; @@ -3306,6 +6721,52 @@ static void P_ConvertBinaryMap(void) } } +static void P_ConvertBinaryLinedefFlags(void) +{ + size_t i; + + for (i = 0; i < numlines; i++) + { + if (!!(lines[i].flags & ML_DONTPEGBOTTOM) ^ !!(lines[i].flags & ML_MIDPEG)) + lines[i].flags |= ML_MIDPEG; + else + lines[i].flags &= ~ML_MIDPEG; + + if (lines[i].special >= 100 && lines[i].special < 300) + { + if (lines[i].flags & ML_DONTPEGTOP) + lines[i].flags |= ML_SKEWTD; + else + lines[i].flags &= ~ML_SKEWTD; + + if ((lines[i].flags & ML_TFERLINE) && lines[i].frontsector) + { + size_t j; + + for (j = 0; j < lines[i].frontsector->linecount; j++) + { + if (lines[i].frontsector->lines[j]->flags & ML_DONTPEGTOP) + lines[i].frontsector->lines[j]->flags |= ML_SKEWTD; + else + lines[i].frontsector->lines[j]->flags &= ~ML_SKEWTD; + } + } + } + + } +} + +//For maps in binary format, converts setup of specials to UDMF format. +static void P_ConvertBinaryMap(void) +{ + P_ConvertBinaryLinedefTypes(); + P_ConvertBinarySectorTypes(); + P_ConvertBinaryThingTypes(); + P_ConvertBinaryLinedefFlags(); + if (M_CheckParm("-writetextmap")) + P_WriteTextmap(); +} + /** Compute MD5 message digest for bytes read from memory source * * The resulting message digest number will be written into the 16 bytes @@ -3941,7 +7402,10 @@ static void P_RunSpecialStageWipe(void) { // wait loop while (!((nowtime = I_GetTime()) - lastwipetic)) - I_Sleep(); + { + I_Sleep(cv_sleep.value); + I_UpdateTime(cv_timescale.value); + } lastwipetic = nowtime; if (moviemode) // make sure we save frames for the white hold too M_SaveFrame(); @@ -3998,7 +7462,7 @@ static void P_WriteLetter(void) { char *buf, *b; - if (!unlockables[27].unlocked) // pandora's box + if (!serverGamedata->unlocked[28]) // pandora's box return; if (modeattacking) @@ -4246,7 +7710,10 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate) Patch_FreeTag(PU_PATCH_ROTATED); Z_FreeTags(PU_LEVEL, PU_PURGELEVEL - 1); + R_InitializeLevelInterpolators(); + P_InitThinkers(); + R_InitMobjInterpolators(); P_InitCachedActions(); if (!fromnetsave && savedata.lives > 0) @@ -4263,7 +7730,7 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate) // internal game map maplumpname = G_BuildMapName(gamemap); - lastloadedmaplumpnum = W_CheckNumForName(maplumpname); + lastloadedmaplumpnum = W_CheckNumForMap(maplumpname); if (lastloadedmaplumpnum == LUMPERROR) I_Error("Map %s not found.\n", maplumpname); @@ -4279,6 +7746,8 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate) P_MapStart(); // tmthing can be used starting from this point + P_InitSlopes(); + if (!P_LoadMapFromFile()) return false; @@ -4340,10 +7809,11 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate) nextmapoverride = 0; skipstats = 0; - if (!(netgame || multiplayer || demoplayback) && (!modifiedgame || savemoddata)) - mapvisited[gamemap-1] |= MV_VISITED; - else if (netgame || multiplayer) - mapvisited[gamemap-1] |= MV_MP; // you want to record that you've been there this session, but not permanently + if (!demoplayback) + { + clientGamedata->mapvisited[gamemap-1] |= MV_VISITED; + serverGamedata->mapvisited[gamemap-1] |= MV_VISITED; + } levelloading = false; @@ -4358,8 +7828,10 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate) { // I'd love to do this in the menu code instead of here, but everything's a mess and I can't guarantee saving proper player struct info before the first act's started. You could probably refactor it, but it'd be a lot of effort. Easier to just work off known good code. ~toast 22/06/2020 if (!(ultimatemode || netgame || multiplayer || demoplayback || demorecording || metalrecording || modeattacking || marathonmode) - && (!modifiedgame || savemoddata) && cursaveslot > 0) + && !usedCheats && cursaveslot > 0) + { G_SaveGame((UINT32)cursaveslot, gamemap); + } // If you're looking for saving sp file progression (distinct from G_SaveGameOver), check G_DoCompleted. } lastmaploaded = gamemap; // HAS to be set after saving!! @@ -4375,7 +7847,7 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate) } P_PreTicker(2); P_MapStart(); // just in case MapLoad modifies tmthing - LUAh_MapLoad(); + LUA_HookInt(gamemap, HOOK(MapLoad)); P_MapEnd(); // just in case MapLoad modifies tmthing } @@ -4383,6 +7855,10 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate) if (rendermode == render_none || reloadinggamestate) return true; + R_ResetViewInterpolation(0); + R_ResetViewInterpolation(0); + R_UpdateMobjInterpolators(); + // Title card! G_StartTitleCard(); @@ -4490,10 +7966,11 @@ static lumpinfo_t* FindFolder(const char *folName, UINT16 *start, UINT16 *end, l // Add a wadfile to the active wad files, // replace sounds, musics, patches, textures, sprites and maps // -boolean P_AddWadFile(const char *wadfilename) +static boolean P_LoadAddon(UINT16 numlumps) { + const UINT16 wadnum = (UINT16)(numwadfiles-1); + size_t i, j, sreplaces = 0, mreplaces = 0, digmreplaces = 0; - UINT16 numlumps, wadnum; char *name; lumpinfo_t *lumpinfo; @@ -4514,18 +7991,16 @@ boolean P_AddWadFile(const char *wadfilename) // UINT16 flaPos, flaNum = 0; // UINT16 mapPos, mapNum = 0; - // Init file. - if ((numlumps = W_InitFile(wadfilename, false, false)) == INT16_MAX) + if (numlumps == INT16_MAX) { refreshdirmenu |= REFRESHDIR_NOTLOADED; return false; } - else - wadnum = (UINT16)(numwadfiles-1); switch(wadfiles[wadnum]->type) { case RET_PK3: + case RET_FOLDER: // Look for the lumps that act as resource delimitation markers. lumpinfo = wadfiles[wadnum]->lumpinfo; for (i = 0; i < numlumps; i++, lumpinfo++) @@ -4619,7 +8094,7 @@ boolean P_AddWadFile(const char *wadfilename) // Reload it all anyway, just in case they // added some textures but didn't insert a // TEXTURES/etc. list. - R_LoadTextures(); // numtexture changes + R_LoadTexturesPwad(wadnum); // numtexture changes // Reload ANIMDEFS P_InitPicAnims(); @@ -4677,7 +8152,7 @@ boolean P_AddWadFile(const char *wadfilename) ST_Start(); // Prevent savefile cheating - if (cursaveslot > 0) + if (modifiedgame && (cursaveslot > 0)) cursaveslot = 0; if (replacedcurrentmap && gamestate == GS_LEVEL && (netgame || multiplayer)) @@ -4689,3 +8164,15 @@ boolean P_AddWadFile(const char *wadfilename) return true; } + +boolean P_AddWadFile(const char *wadfilename) +{ + return D_CheckPathAllowed(wadfilename, "tried to add file") && + P_LoadAddon(W_InitFile(wadfilename, false, false)); +} + +boolean P_AddFolder(const char *folderpath) +{ + return D_CheckPathAllowed(folderpath, "tried to add folder") && + P_LoadAddon(W_InitFolder(folderpath, false, false)); +} diff --git a/src/p_setup.h b/src/p_setup.h index 9fa70d516..c6f4f741c 100644 --- a/src/p_setup.h +++ b/src/p_setup.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -103,10 +103,11 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate); void HWR_LoadLevel(void); #endif boolean P_AddWadFile(const char *wadfilename); +boolean P_AddFolder(const char *folderpath); boolean P_RunSOC(const char *socfilename); void P_LoadSoundsRange(UINT16 wadnum, UINT16 first, UINT16 num); void P_LoadMusicsRange(UINT16 wadnum, UINT16 first, UINT16 num); -void P_WriteThings(void); +//void P_WriteThings(void); size_t P_PrecacheLevelFlats(void); void P_AllocMapHeader(INT16 i); @@ -121,5 +122,6 @@ void P_AddGradesForMare(INT16 i, UINT8 mare, char *gtext); UINT8 P_GetGrade(UINT32 pscore, INT16 map, UINT8 mare); UINT8 P_HasGrades(INT16 map, UINT8 mare); UINT32 P_GetScoreForGrade(INT16 map, UINT8 mare, UINT8 grade); +UINT32 P_GetScoreForGradeOverall(INT16 map, UINT8 grade); #endif diff --git a/src/p_sight.c b/src/p_sight.c index e4a37a718..3e92bec86 100644 --- a/src/p_sight.c +++ b/src/p_sight.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -306,8 +306,8 @@ static boolean P_CrossSubsector(size_t num, register los_t *los) // check front sector's FOFs first for (rover = front->ffloors; rover; rover = rover->next) { - if (!(rover->flags & FF_EXISTS) - || !(rover->flags & FF_RENDERSIDES) || rover->flags & FF_TRANSLUCENT) + if (!(rover->fofflags & FOF_EXISTS) + || !(rover->fofflags & FOF_RENDERSIDES) || (rover->fofflags & (FOF_TRANSLUCENT|FOF_FOG))) { continue; } @@ -322,8 +322,8 @@ static boolean P_CrossSubsector(size_t num, register los_t *los) // check back sector's FOFs as well for (rover = back->ffloors; rover; rover = rover->next) { - if (!(rover->flags & FF_EXISTS) - || !(rover->flags & FF_RENDERSIDES) || rover->flags & FF_TRANSLUCENT) + if (!(rover->fofflags & FOF_EXISTS) + || !(rover->fofflags & FOF_RENDERSIDES) || (rover->fofflags & (FOF_TRANSLUCENT|FOF_FOG))) { continue; } @@ -451,8 +451,8 @@ boolean P_CheckSight(mobj_t *t1, mobj_t *t2) // Allow sight through water, fog, etc. /// \todo Improve by checking fog density/translucency /// and setting a sight limit. - if (!(rover->flags & FF_EXISTS) - || !(rover->flags & FF_RENDERPLANES) || rover->flags & FF_TRANSLUCENT) + if (!(rover->fofflags & FOF_EXISTS) + || !(rover->fofflags & FOF_RENDERPLANES) || (rover->fofflags & (FOF_TRANSLUCENT|FOF_FOG))) { continue; } @@ -470,10 +470,10 @@ boolean P_CheckSight(mobj_t *t1, mobj_t *t2) return false; } - if (rover->flags & FF_SOLID) + if (rover->fofflags & FOF_SOLID) continue; // shortcut since neither mobj can be inside the 3dfloor - if (rover->flags & FF_BOTHPLANES || !(rover->flags & FF_INVERTPLANES)) + if (rover->fofflags & FOF_BOTHPLANES || !(rover->fofflags & FOF_INVERTPLANES)) { if (los.sightzstart >= topz1 && t2->z + t2->height < topz2) return false; // blocked by upper outside plane @@ -482,7 +482,7 @@ boolean P_CheckSight(mobj_t *t1, mobj_t *t2) return false; // blocked by lower outside plane } - if (rover->flags & FF_BOTHPLANES || rover->flags & FF_INVERTPLANES) + if (rover->fofflags & FOF_BOTHPLANES || rover->fofflags & FOF_INVERTPLANES) { if (los.sightzstart < topz1 && t2->z >= topz2) return false; // blocked by upper inside plane diff --git a/src/p_slopes.c b/src/p_slopes.c index 4e93e4a45..48a13a07d 100644 --- a/src/p_slopes.c +++ b/src/p_slopes.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 2004 by Stephen McGranahan -// Copyright (C) 2015-2021 by Sonic Team Junior. +// Copyright (C) 2015-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -22,6 +22,7 @@ #include "r_main.h" #include "p_maputl.h" #include "w_wad.h" +#include "r_fps.h" pslope_t *slopelist = NULL; UINT16 slopecount = 0; @@ -90,8 +91,42 @@ static void ReconfigureViaVertexes (pslope_t *slope, const vector3_t v1, const v } } +/// Setup slope via constants. +static void ReconfigureViaConstants (pslope_t *slope, const fixed_t a, const fixed_t b, const fixed_t c, const fixed_t d) +{ + fixed_t m; + fixed_t o = 0; + vector3_t *normal = &slope->normal; + + if (c) + o = abs(c) <= FRACUNIT ? -FixedMul(d, FixedDiv(FRACUNIT, c)) : -FixedDiv(d, c); + + // Set origin. + FV3_Load(&slope->o, 0, 0, o); + + // Get slope's normal. + FV3_Load(normal, a, b, c); + FV3_Normalize(normal); + + // Invert normal if it's facing down. + if (normal->z < 0) + FV3_Negate(normal); + + // Get direction vector + m = FixedHypot(normal->x, normal->y); + slope->d.x = -FixedDiv(normal->x, m); + slope->d.y = -FixedDiv(normal->y, m); + + // Z delta + slope->zdelta = FixedDiv(m, normal->z); + + // Get angles + slope->xydirection = R_PointToAngle2(0, 0, slope->d.x, slope->d.y)+ANGLE_180; + slope->zangle = InvAngle(R_PointToAngle2(0, 0, FRACUNIT, slope->zdelta)); +} + /// Recalculate dynamic slopes. -void T_DynamicSlopeLine (dynplanethink_t* th) +void T_DynamicSlopeLine (dynlineplanethink_t* th) { pslope_t* slope = th->slope; line_t* srcline = th->sourceline; @@ -131,47 +166,57 @@ void T_DynamicSlopeLine (dynplanethink_t* th) } /// Mapthing-defined -void T_DynamicSlopeVert (dynplanethink_t* th) +void T_DynamicSlopeVert (dynvertexplanethink_t* th) { - pslope_t* slope = th->slope; - size_t i; - INT32 l; - for (i = 0; i < 3; i++) { - l = Tag_FindLineSpecial(799, th->tags[i]); - if (l != -1) { - th->vex[i].z = lines[l].frontsector->floorheight; - } + for (i = 0; i < 3; i++) + { + if (!th->secs[i]) + continue; + + if (th->relative & (1 << i)) + th->vex[i].z = th->origvecheights[i] + (th->secs[i]->floorheight - th->origsecheights[i]); else - th->vex[i].z = 0; + th->vex[i].z = th->secs[i]->floorheight; } - ReconfigureViaVertexes(slope, th->vex[0], th->vex[1], th->vex[2]); + ReconfigureViaVertexes(th->slope, th->vex[0], th->vex[1], th->vex[2]); } -static inline void P_AddDynSlopeThinker (pslope_t* slope, dynplanetype_t type, line_t* sourceline, fixed_t extent, const INT16 tags[3], const vector3_t vx[3]) +static inline void P_AddDynLineSlopeThinker (pslope_t* slope, dynplanetype_t type, line_t* sourceline, fixed_t extent) { - dynplanethink_t* th = Z_Calloc(sizeof (*th), PU_LEVSPEC, NULL); - switch (type) - { - case DP_VERTEX: - th->thinker.function.acp1 = (actionf_p1)T_DynamicSlopeVert; - memcpy(th->tags, tags, sizeof(th->tags)); - memcpy(th->vex, vx, sizeof(th->vex)); - break; - default: - th->thinker.function.acp1 = (actionf_p1)T_DynamicSlopeLine; - th->sourceline = sourceline; - th->extent = extent; - } - + dynlineplanethink_t* th = Z_Calloc(sizeof (*th), PU_LEVSPEC, NULL); + th->thinker.function.acp1 = (actionf_p1)T_DynamicSlopeLine; th->slope = slope; th->type = type; - + th->sourceline = sourceline; + th->extent = extent; P_AddThinker(THINK_DYNSLOPE, &th->thinker); + + // interpolation + R_CreateInterpolator_DynSlope(&th->thinker, slope); } +static inline void P_AddDynVertexSlopeThinker (pslope_t* slope, const INT16 tags[3], const vector3_t vx[3]) +{ + dynvertexplanethink_t* th = Z_Calloc(sizeof (*th), PU_LEVSPEC, NULL); + size_t i; + INT32 l; + th->thinker.function.acp1 = (actionf_p1)T_DynamicSlopeVert; + th->slope = slope; + + for (i = 0; i < 3; i++) { + l = Tag_FindLineSpecial(799, tags[i]); + th->secs[i] = (l == -1) ? NULL : lines[l].frontsector; + th->vex[i] = vx[i]; + th->origsecheights[i] = (l == -1) ? 0 : lines[l].frontsector->floorheight; + th->origvecheights[i] = vx[i].z; + if (l != -1 && lines[l].args[0]) + th->relative |= 1<thinker); +} /// Create a new slope and add it to the slope list. static inline pslope_t* Slope_Add (const UINT8 flags) @@ -238,6 +283,27 @@ static fixed_t GetExtent(sector_t *sector, line_t *line) return fardist; } +static boolean P_CopySlope(pslope_t** toslope, pslope_t* fromslope) +{ + if (*toslope || !fromslope) + return true; + + *toslope = fromslope; + return true; +} + +static void P_UpdateHasSlope(sector_t *sec) +{ + size_t i; + + sec->hasslope = true; + + // if this is an FOF control sector, make sure any target sectors also are marked as having slopes + if (sec->numattached) + for (i = 0; i < sec->numattached; i++) + sectors[sec->attached[i]].hasslope = true; +} + /// Creates one or more slopes based on the given line type and front/back sectors. static void line_SpawnViaLine(const int linenum, const boolean spawnthinker) { @@ -328,7 +394,7 @@ static void line_SpawnViaLine(const int linenum, const boolean spawnthinker) P_CalculateSlopeNormal(fslope); if (spawnthinker && (flags & SL_DYNAMIC)) - P_AddDynSlopeThinker(fslope, DP_FRONTFLOOR, line, extent, NULL, NULL); + P_AddDynLineSlopeThinker(fslope, DP_FRONTFLOOR, line, extent); } if(frontceil) { @@ -345,7 +411,7 @@ static void line_SpawnViaLine(const int linenum, const boolean spawnthinker) P_CalculateSlopeNormal(cslope); if (spawnthinker && (flags & SL_DYNAMIC)) - P_AddDynSlopeThinker(cslope, DP_FRONTCEIL, line, extent, NULL, NULL); + P_AddDynLineSlopeThinker(cslope, DP_FRONTCEIL, line, extent); } } if(backfloor || backceil) @@ -385,7 +451,7 @@ static void line_SpawnViaLine(const int linenum, const boolean spawnthinker) P_CalculateSlopeNormal(fslope); if (spawnthinker && (flags & SL_DYNAMIC)) - P_AddDynSlopeThinker(fslope, DP_BACKFLOOR, line, extent, NULL, NULL); + P_AddDynLineSlopeThinker(fslope, DP_BACKFLOOR, line, extent); } if(backceil) { @@ -402,9 +468,26 @@ static void line_SpawnViaLine(const int linenum, const boolean spawnthinker) P_CalculateSlopeNormal(cslope); if (spawnthinker && (flags & SL_DYNAMIC)) - P_AddDynSlopeThinker(cslope, DP_BACKCEIL, line, extent, NULL, NULL); + P_AddDynLineSlopeThinker(cslope, DP_BACKCEIL, line, extent); } } + + if (line->args[2] & TMSL_COPY) + { + if (frontfloor) + P_CopySlope(&line->backsector->f_slope, line->frontsector->f_slope); + if (backfloor) + P_CopySlope(&line->frontsector->f_slope, line->backsector->f_slope); + if (frontceil) + P_CopySlope(&line->backsector->c_slope, line->frontsector->c_slope); + if (backceil) + P_CopySlope(&line->frontsector->c_slope, line->backsector->c_slope); + + if (backfloor || backceil) + P_UpdateHasSlope(line->frontsector); + if (frontfloor || frontceil) + P_UpdateHasSlope(line->backsector); + } } /// Creates a new slope from three mapthings with the specified IDs @@ -439,14 +522,14 @@ static pslope_t *MakeViaMapthings(INT16 tag1, INT16 tag2, INT16 tag3, UINT8 flag vx[i].x = mt->x << FRACBITS; vx[i].y = mt->y << FRACBITS; vx[i].z = mt->z << FRACBITS; - if (!mt->extrainfo) + if (!mt->args[0]) vx[i].z += R_PointInSubsector(vx[i].x, vx[i].y)->sector->floorheight; } ReconfigureViaVertexes(ret, vx[0], vx[1], vx[2]); if (spawnthinker && (flags & SL_DYNAMIC)) - P_AddDynSlopeThinker(ret, DP_VERTEX, NULL, 0, tags, vx); + P_AddDynVertexSlopeThinker(ret, tags, vx); return ret; } @@ -561,27 +644,6 @@ static boolean P_SetSlopeFromTag(sector_t *sec, INT32 tag, boolean ceiling) return false; } -static boolean P_CopySlope(pslope_t **toslope, pslope_t *fromslope) -{ - if (*toslope || !fromslope) - return true; - - *toslope = fromslope; - return true; -} - -static void P_UpdateHasSlope(sector_t *sec) -{ - size_t i; - - sec->hasslope = true; - - // if this is an FOF control sector, make sure any target sectors also are marked as having slopes - if (sec->numattached) - for (i = 0; i < sec->numattached; i++) - sectors[sec->attached[i]].hasslope = true; -} - // // P_CopySectorSlope // @@ -631,13 +693,20 @@ pslope_t *P_SlopeById(UINT16 id) return ret; } +/// Creates a new slope from equation constants. +pslope_t *MakeViaEquationConstants(const fixed_t a, const fixed_t b, const fixed_t c, const fixed_t d) +{ + pslope_t* ret = Slope_Add(0); + + ReconfigureViaConstants(ret, a, b, c, d); + + return ret; +} + /// Initializes and reads the slopes from the map data. void P_SpawnSlopes(const boolean fromsave) { size_t i; - slopelist = NULL; - slopecount = 0; - /// Generates vertex slopes. SpawnVertexSlopes(); @@ -671,6 +740,13 @@ void P_SpawnSlopes(const boolean fromsave) { } } +/// Initializes slopes. +void P_InitSlopes(void) +{ + slopelist = NULL; + slopecount = 0; +} + // ============================================================================ // // Various utilities related to slopes @@ -773,7 +849,7 @@ void P_SlopeLaunch(mobj_t *mo) mo->momx = slopemom.x; mo->momy = slopemom.y; mo->momz = slopemom.z/2; - + if (mo->player) mo->player->powers[pw_justlaunched] = 1; } @@ -793,7 +869,7 @@ fixed_t P_GetWallTransferMomZ(mobj_t *mo, pslope_t *slope) vector3_t slopemom, axis; angle_t ang; - if (mo->standingslope->flags & SL_NOPHYSICS) + if (slope->flags & SL_NOPHYSICS) return 0; // If there's physics, time for launching. diff --git a/src/p_slopes.h b/src/p_slopes.h index ae040ae56..096bf8f82 100644 --- a/src/p_slopes.h +++ b/src/p_slopes.h @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 2004 by Stephen McGranahan -// Copyright (C) 2015-2021 by Sonic Team Junior. +// Copyright (C) 2015-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -44,12 +44,14 @@ typedef enum typedef enum { TMSL_NOPHYSICS = 1, - TMSL_DYNAMIC = 2, + TMSL_DYNAMIC = 1<<1, + TMSL_COPY = 1<<2, } textmapslopeflags_t; void P_LinkSlopeThinkers (void); void P_CalculateSlopeNormal(pslope_t *slope); +void P_InitSlopes(void); void P_SpawnSlopes(const boolean fromsave); // @@ -86,6 +88,7 @@ fixed_t P_GetWallTransferMomZ(mobj_t *mo, pslope_t *slope); void P_HandleSlopeLanding(mobj_t *thing, pslope_t *slope); void P_ButteredSlope(mobj_t *mo); +pslope_t *MakeViaEquationConstants(const fixed_t a, const fixed_t b, const fixed_t c, const fixed_t d); /// Dynamic plane type enum for the thinker. Will have a different functionality depending on this. typedef enum { @@ -93,26 +96,29 @@ typedef enum { DP_FRONTCEIL, DP_BACKFLOOR, DP_BACKCEIL, - DP_VERTEX } dynplanetype_t; /// Permit slopes to be dynamically altered through a thinker. typedef struct { thinker_t thinker; - - pslope_t* slope; + pslope_t *slope; dynplanetype_t type; - - // Used by line slopes. - line_t* sourceline; + line_t *sourceline; fixed_t extent; +} dynlineplanethink_t; - // Used by mapthing vertex slopes. - INT16 tags[3]; +typedef struct +{ + thinker_t thinker; + pslope_t *slope; + sector_t *secs[3]; vector3_t vex[3]; -} dynplanethink_t; + fixed_t origsecheights[3]; + fixed_t origvecheights[3]; + UINT8 relative; +} dynvertexplanethink_t; -void T_DynamicSlopeLine (dynplanethink_t* th); -void T_DynamicSlopeVert (dynplanethink_t* th); +void T_DynamicSlopeLine (dynlineplanethink_t* th); +void T_DynamicSlopeVert (dynvertexplanethink_t* th); #endif // #ifndef P_SLOPES_H__ diff --git a/src/p_spec.c b/src/p_spec.c index 742fd544b..71ea145b9 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -15,11 +15,13 @@ /// utility functions, etc. /// Line Tag handling. Line and Sector triggers. +#include "dehacked.h" #include "doomdef.h" #include "g_game.h" #include "p_local.h" #include "p_setup.h" // levelflats for flat animation #include "r_data.h" +#include "r_fps.h" #include "r_textures.h" #include "m_random.h" #include "p_mobj.h" @@ -35,7 +37,7 @@ #include "v_video.h" // V_AUTOFADEOUT|V_ALLOWLOWERCASE #include "m_misc.h" #include "m_cond.h" //unlock triggers -#include "lua_hook.h" // LUAh_LinedefExecute +#include "lua_hook.h" // LUA_HookLinedefExecute #include "f_finale.h" // control text prompt #include "r_skins.h" // skins @@ -50,9 +52,6 @@ mobj_t *skyboxmo[2]; // current skybox mobjs: 0 = viewpoint, 1 = centerpoint mobj_t *skyboxviewpnts[16]; // array of MT_SKYBOX viewpoint mobjs mobj_t *skyboxcenterpnts[16]; // array of MT_SKYBOX centerpoint mobjs -// Amount (dx, dy) vector linedef is shifted right to get scroll amount -#define SCROLL_SHIFT 5 - /** Animated texture descriptor * This keeps track of an animated texture or an animated flat. * \sa P_UpdateSpecials, P_InitPicAnims, animdef_t @@ -100,7 +99,7 @@ typedef struct static void P_SpawnScrollers(void); static void P_SpawnFriction(void); static void P_SpawnPushers(void); -static void Add_Pusher(pushertype_e type, fixed_t x_mag, fixed_t y_mag, mobj_t *source, INT32 affectee, INT32 referrer, INT32 exclusive, INT32 slider); //SoM: 3/9/2000 +static void Add_Pusher(pushertype_e type, fixed_t x_mag, fixed_t y_mag, fixed_t z_mag, INT32 affectee, INT32 referrer, INT32 exclusive, INT32 slider); //SoM: 3/9/2000 static void Add_MasterDisappearer(tic_t appeartime, tic_t disappeartime, tic_t offset, INT32 line, INT32 sourceline); static void P_ResetFakeFloorFader(ffloor_t *rover, fade_t *data, boolean finalize); #define P_RemoveFakeFloorFader(l) P_ResetFakeFloorFader(l, NULL, false); @@ -117,7 +116,7 @@ static void Add_ColormapFader(sector_t *sector, extracolormap_t *source_exc, ext static void P_AddBlockThinker(sector_t *sec, line_t *sourceline); static void P_AddFloatThinker(sector_t *sec, UINT16 tag, line_t *sourceline); //static void P_AddBridgeThinker(line_t *sourceline, sector_t *sec); -static void P_AddFakeFloorsByLine(size_t line, ffloortype_e ffloorflags, thinkerlist_t *secthinkers); +static void P_AddFakeFloorsByLine(size_t line, INT32 alpha, UINT8 blendmode, ffloortype_e ffloorflags, thinkerlist_t *secthinkers); static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec); static void Add_Friction(INT32 friction, INT32 movefactor, INT32 affectee, INT32 referrer); static void P_AddPlaneDisplaceThinker(INT32 type, fixed_t speed, INT32 control, INT32 affectee, UINT8 reverse); @@ -993,30 +992,22 @@ static boolean PolyDoor(line_t *line) { polydoordata_t pdd; - pdd.polyObjNum = Tag_FGet(&line->tags); // polyobject id + pdd.polyObjNum = line->args[0]; // polyobject id switch(line->special) { case 480: // Polyobj_DoorSlide pdd.doorType = POLY_DOOR_SLIDE; - pdd.speed = sides[line->sidenum[0]].textureoffset / 8; + pdd.speed = line->args[1] << (FRACBITS - 3); pdd.angle = R_PointToAngle2(line->v1->x, line->v1->y, line->v2->x, line->v2->y); // angle of motion - pdd.distance = sides[line->sidenum[0]].rowoffset; - - if (line->sidenum[1] != 0xffff) - pdd.delay = sides[line->sidenum[1]].textureoffset >> FRACBITS; // delay in tics - else - pdd.delay = 0; + pdd.distance = line->args[2] << FRACBITS; + pdd.delay = line->args[3]; // delay in tics break; case 481: // Polyobj_DoorSwing pdd.doorType = POLY_DOOR_SWING; - pdd.speed = sides[line->sidenum[0]].textureoffset >> FRACBITS; // angular speed - pdd.distance = sides[line->sidenum[0]].rowoffset >> FRACBITS; // angular distance - - if (line->sidenum[1] != 0xffff) - pdd.delay = sides[line->sidenum[1]].textureoffset >> FRACBITS; // delay in tics - else - pdd.delay = 0; + pdd.speed = line->args[1]; // angular speed + pdd.distance = line->args[2]; // angular distance + pdd.delay = line->args[3]; // delay in tics break; default: return 0; // ??? @@ -1025,31 +1016,29 @@ static boolean PolyDoor(line_t *line) return EV_DoPolyDoor(&pdd); } -// Parses arguments for parameterized polyobject move specials +// Parses arguments for parameterized polyobject move special static boolean PolyMove(line_t *line) { polymovedata_t pmd; - pmd.polyObjNum = Tag_FGet(&line->tags); - pmd.speed = sides[line->sidenum[0]].textureoffset / 8; + pmd.polyObjNum = line->args[0]; + pmd.speed = line->args[1] << (FRACBITS - 3); pmd.angle = R_PointToAngle2(line->v1->x, line->v1->y, line->v2->x, line->v2->y); - pmd.distance = sides[line->sidenum[0]].rowoffset; + pmd.distance = line->args[2] << FRACBITS; - pmd.overRide = (line->special == 483); // Polyobj_OR_Move + pmd.overRide = !!line->args[3]; // Polyobj_OR_Move return EV_DoPolyObjMove(&pmd); } -// Makes a polyobject invisible and intangible -// If NOCLIMB is ticked, the polyobject will still be tangible, just not visible. -static void PolyInvisible(line_t *line) +static void PolySetVisibilityTangibility(line_t *line) { - INT32 polyObjNum = Tag_FGet(&line->tags); - polyobj_t *po; + INT32 polyObjNum = line->args[0]; + polyobj_t* po; if (!(po = Polyobj_GetForNum(polyObjNum))) { - CONS_Debug(DBG_POLYOBJ, "PolyInvisible: bad polyobj %d\n", polyObjNum); + CONS_Debug(DBG_POLYOBJ, "PolySetVisibilityTangibility: bad polyobj %d\n", polyObjNum); return; } @@ -1057,49 +1046,32 @@ static void PolyInvisible(line_t *line) if (po->isBad) return; - if (!(line->flags & ML_NOCLIMB)) - po->flags &= ~POF_SOLID; - - po->flags |= POF_NOSPECIALS; - po->flags &= ~POF_RENDERALL; -} - -// Makes a polyobject visible and tangible -// If NOCLIMB is ticked, the polyobject will not be tangible, just visible. -static void PolyVisible(line_t *line) -{ - INT32 polyObjNum = Tag_FGet(&line->tags); - polyobj_t *po; - - if (!(po = Polyobj_GetForNum(polyObjNum))) + if (line->args[1] == TMPV_VISIBLE) { - CONS_Debug(DBG_POLYOBJ, "PolyVisible: bad polyobj %d\n", polyObjNum); - return; + po->flags &= ~POF_NOSPECIALS; + po->flags |= (po->spawnflags & POF_RENDERALL); + } + else if (line->args[1] == TMPV_INVISIBLE) + { + po->flags |= POF_NOSPECIALS; + po->flags &= ~POF_RENDERALL; } - // don't allow line actions to affect bad polyobjects - if (po->isBad) - return; - - if (!(line->flags & ML_NOCLIMB)) + if (line->args[2] == TMPT_TANGIBLE) po->flags |= POF_SOLID; - - po->flags &= ~POF_NOSPECIALS; - po->flags |= (po->spawnflags & POF_RENDERALL); + else if (line->args[2] == TMPT_INTANGIBLE) + po->flags &= ~POF_SOLID; } - // Sets the translucency of a polyobject -// Frontsector floor / 100 = translevel static void PolyTranslucency(line_t *line) { - INT32 polyObjNum = Tag_FGet(&line->tags); + INT32 polyObjNum = line->args[0]; polyobj_t *po; - INT32 value; if (!(po = Polyobj_GetForNum(polyObjNum))) { - CONS_Debug(DBG_POLYOBJ, "EV_DoPolyObjWaypoint: bad polyobj %d\n", polyObjNum); + CONS_Debug(DBG_POLYOBJ, "PolyTranslucency: bad polyobj %d\n", polyObjNum); return; } @@ -1107,17 +1079,10 @@ static void PolyTranslucency(line_t *line) if (po->isBad) return; - // If Front X Offset is specified, use that. Else, use floorheight. - value = (sides[line->sidenum[0]].textureoffset ? sides[line->sidenum[0]].textureoffset : line->frontsector->floorheight) >> FRACBITS; - - // If DONTPEGBOTTOM, specify raw translucency value. Else, take it out of 1000. - if (!(line->flags & ML_DONTPEGBOTTOM)) - value /= 100; - - if (line->flags & ML_EFFECT3) // relative calc - po->translucency += value; + if (lines->args[2]) // relative calc + po->translucency += line->args[1]; else - po->translucency = value; + po->translucency = line->args[1]; po->translucency = max(min(po->translucency, NUMTRANSMAPS), 0); } @@ -1125,10 +1090,9 @@ static void PolyTranslucency(line_t *line) // Makes a polyobject translucency fade and applies tangibility static boolean PolyFade(line_t *line) { - INT32 polyObjNum = Tag_FGet(&line->tags); + INT32 polyObjNum = line->args[0]; polyobj_t *po; polyfadedata_t pfd; - INT32 value; if (!(po = Polyobj_GetForNum(polyObjNum))) { @@ -1141,7 +1105,7 @@ static boolean PolyFade(line_t *line) return 0; // Prevent continuous execs from interfering on an existing fade - if (!(line->flags & ML_EFFECT5) + if (!(line->args[3] & TMPF_OVERRIDE) && po->thinker && po->thinker->function.acp1 == (actionf_p1)T_PolyObjFade) { @@ -1151,17 +1115,10 @@ static boolean PolyFade(line_t *line) pfd.polyObjNum = polyObjNum; - // If Front X Offset is specified, use that. Else, use floorheight. - value = (sides[line->sidenum[0]].textureoffset ? sides[line->sidenum[0]].textureoffset : line->frontsector->floorheight) >> FRACBITS; - - // If DONTPEGBOTTOM, specify raw translucency value. Else, take it out of 1000. - if (!(line->flags & ML_DONTPEGBOTTOM)) - value /= 100; - - if (line->flags & ML_EFFECT3) // relative calc - pfd.destvalue = po->translucency + value; + if (line->args[3] & TMPF_RELATIVE) // relative calc + pfd.destvalue = po->translucency + line->args[1]; else - pfd.destvalue = value; + pfd.destvalue = line->args[1]; pfd.destvalue = max(min(pfd.destvalue, NUMTRANSMAPS), 0); @@ -1169,15 +1126,11 @@ static boolean PolyFade(line_t *line) if (po->translucency == pfd.destvalue) return 1; - pfd.docollision = !(line->flags & ML_BOUNCY); // do not handle collision flags - pfd.doghostfade = (line->flags & ML_EFFECT1); // do ghost fade (no collision flags during fade) - pfd.ticbased = (line->flags & ML_EFFECT4); // Speed = Tic Duration - - // allow Back Y Offset to be consistent with other fade specials - pfd.speed = (line->sidenum[1] != 0xFFFF && !sides[line->sidenum[0]].rowoffset) ? - abs(sides[line->sidenum[1]].rowoffset>>FRACBITS) - : abs(sides[line->sidenum[0]].rowoffset>>FRACBITS); + pfd.docollision = !(line->args[3] & TMPF_IGNORECOLLISION); // do not handle collision flags + pfd.doghostfade = (line->args[3] & TMPF_GHOSTFADE); // do ghost fade (no collision flags during fade) + pfd.ticbased = (line->args[3] & TMPF_TICBASED); // Speed = Tic Duration + pfd.speed = line->args[2]; return EV_DoPolyObjFade(&pfd); } @@ -1187,49 +1140,25 @@ static boolean PolyWaypoint(line_t *line) { polywaypointdata_t pwd; - pwd.polyObjNum = Tag_FGet(&line->tags); - pwd.speed = sides[line->sidenum[0]].textureoffset / 8; - pwd.sequence = sides[line->sidenum[0]].rowoffset >> FRACBITS; // Sequence # - - // Behavior after reaching the last waypoint? - if (line->flags & ML_EFFECT3) - pwd.returnbehavior = PWR_WRAP; // Wrap back to first waypoint - else if (line->flags & ML_EFFECT2) - pwd.returnbehavior = PWR_COMEBACK; // Go through sequence in reverse - else - pwd.returnbehavior = PWR_STOP; // Stop - - // Flags - pwd.flags = 0; - if (line->flags & ML_EFFECT1) - pwd.flags |= PWF_REVERSE; - if (line->flags & ML_EFFECT4) - pwd.flags |= PWF_LOOP; + pwd.polyObjNum = line->args[0]; + pwd.speed = line->args[1] << (FRACBITS - 3); + pwd.sequence = line->args[2]; + pwd.returnbehavior = line->args[3]; + pwd.flags = line->args[4]; return EV_DoPolyObjWaypoint(&pwd); } -// Parses arguments for parameterized polyobject rotate specials +// Parses arguments for parameterized polyobject rotate special static boolean PolyRotate(line_t *line) { polyrotdata_t prd; - prd.polyObjNum = Tag_FGet(&line->tags); - prd.speed = sides[line->sidenum[0]].textureoffset >> FRACBITS; // angular speed - prd.distance = sides[line->sidenum[0]].rowoffset >> FRACBITS; // angular distance - - // Polyobj_(OR_)RotateRight have dir == -1 - prd.direction = (line->special == 484 || line->special == 485) ? -1 : 1; - - // Polyobj_OR types have override set to true - prd.overRide = (line->special == 485 || line->special == 487); - - if (line->flags & ML_NOCLIMB) - prd.turnobjs = 0; - else if (line->flags & ML_EFFECT4) - prd.turnobjs = 2; - else - prd.turnobjs = 1; + prd.polyObjNum = line->args[0]; + prd.speed = line->args[1]; // angular speed + prd.distance = abs(line->args[2]); // angular distance + prd.direction = (line->args[2] < 0) ? -1 : 1; + prd.flags = line->args[3]; return EV_DoPolyObjRotate(&prd); } @@ -1239,10 +1168,10 @@ static boolean PolyFlag(line_t *line) { polyflagdata_t pfd; - pfd.polyObjNum = Tag_FGet(&line->tags); - pfd.speed = P_AproxDistance(line->dx, line->dy) >> FRACBITS; - pfd.angle = R_PointToAngle2(line->v1->x, line->v1->y, line->v2->x, line->v2->y) >> ANGLETOFINESHIFT; - pfd.momx = sides[line->sidenum[0]].textureoffset >> FRACBITS; + pfd.polyObjNum = line->args[0]; + pfd.speed = line->args[1]; + pfd.angle = line->angle >> ANGLETOFINESHIFT; + pfd.momx = line->args[2]; return EV_DoPolyObjFlag(&pfd); } @@ -1251,12 +1180,14 @@ static boolean PolyFlag(line_t *line) static boolean PolyDisplace(line_t *line) { polydisplacedata_t pdd; + fixed_t length = R_PointToDist2(line->v2->x, line->v2->y, line->v1->x, line->v1->y); + fixed_t speed = line->args[1] << FRACBITS; - pdd.polyObjNum = Tag_FGet(&line->tags); + pdd.polyObjNum = line->args[0]; pdd.controlSector = line->frontsector; - pdd.dx = line->dx>>8; - pdd.dy = line->dy>>8; + pdd.dx = FixedMul(FixedDiv(line->dx, length), speed) >> 8; + pdd.dy = FixedMul(FixedDiv(line->dy, length), speed) >> 8; return EV_DoPolyObjDisplace(&pdd); } @@ -1268,22 +1199,16 @@ static boolean PolyRotDisplace(line_t *line) polyrotdisplacedata_t pdd; fixed_t anginter, distinter; - pdd.polyObjNum = Tag_FGet(&line->tags); + pdd.polyObjNum = line->args[0]; pdd.controlSector = line->frontsector; // Rotate 'anginter' interval for each 'distinter' interval from the control sector. - // Use default values if not provided as fallback. - anginter = sides[line->sidenum[0]].rowoffset ? sides[line->sidenum[0]].rowoffset : 90*FRACUNIT; - distinter = sides[line->sidenum[0]].textureoffset ? sides[line->sidenum[0]].textureoffset : 128*FRACUNIT; + anginter = line->args[2] << FRACBITS; + distinter = line->args[1] << FRACBITS; pdd.rotscale = FixedDiv(anginter, distinter); // Same behavior as other rotators when carrying things. - if (line->flags & ML_NOCLIMB) - pdd.turnobjs = 0; - else if (line->flags & ML_EFFECT4) - pdd.turnobjs = 2; - else - pdd.turnobjs = 1; + pdd.turnobjs = line->args[3]; return EV_DoPolyObjRotDisplace(&pdd); } @@ -1298,7 +1223,7 @@ void P_RunNightserizeExecutors(mobj_t *actor) for (i = 0; i < numlines; i++) { - if (lines[i].special == 323 || lines[i].special == 324) + if (lines[i].special == 323) P_RunTriggerLinedef(&lines[i], actor, NULL); } } @@ -1312,7 +1237,7 @@ void P_RunDeNightserizeExecutors(mobj_t *actor) for (i = 0; i < numlines; i++) { - if (lines[i].special == 325 || lines[i].special == 326) + if (lines[i].special == 325) P_RunTriggerLinedef(&lines[i], actor, NULL); } } @@ -1326,7 +1251,7 @@ void P_RunNightsLapExecutors(mobj_t *actor) for (i = 0; i < numlines; i++) { - if (lines[i].special == 327 || lines[i].special == 328) + if (lines[i].special == 327) P_RunTriggerLinedef(&lines[i], actor, NULL); } } @@ -1340,13 +1265,19 @@ void P_RunNightsCapsuleTouchExecutors(mobj_t *actor, boolean entering, boolean e for (i = 0; i < numlines; i++) { - if ((lines[i].special == 329 || lines[i].special == 330) - && ((entering && (lines[i].flags & ML_TFERLINE)) - || (!entering && !(lines[i].flags & ML_TFERLINE))) - && ((lines[i].flags & ML_DONTPEGTOP) - || (enoughspheres && !(lines[i].flags & ML_BOUNCY)) - || (!enoughspheres && (lines[i].flags & ML_BOUNCY)))) - P_RunTriggerLinedef(&lines[i], actor, NULL); + if (lines[i].special != 329) + continue; + + if (!!(lines[i].args[7] & TMI_ENTER) != entering) + continue; + + if (lines[i].args[6] == TMS_IFENOUGH && !enoughspheres) + continue; + + if (lines[i].args[6] == TMS_IFNOTENOUGH && enoughspheres) + continue; + + P_RunTriggerLinedef(&lines[i], actor, NULL); } } @@ -1426,27 +1357,42 @@ static boolean P_CheckNightsTriggerLine(line_t *triggerline, mobj_t *actor) INT16 specialtype = triggerline->special; size_t i; - UINT8 inputmare = max(0, min(255, sides[triggerline->sidenum[0]].textureoffset>>FRACBITS)); - UINT8 inputlap = max(0, min(255, sides[triggerline->sidenum[0]].rowoffset>>FRACBITS)); + UINT8 inputmare = max(0, min(255, triggerline->args[1])); + UINT8 inputlap = max(0, min(255, triggerline->args[2])); - boolean ltemare = triggerline->flags & ML_NOCLIMB; - boolean gtemare = triggerline->flags & ML_BLOCKMONSTERS; - boolean ltelap = triggerline->flags & ML_EFFECT1; - boolean gtelap = triggerline->flags & ML_EFFECT2; + textmapcomparison_t marecomp = triggerline->args[3]; + textmapcomparison_t lapcomp = triggerline->args[4]; + textmapnightsplayer_t checkplayer = triggerline->args[5]; - boolean lapfrombonustime = triggerline->flags & ML_EFFECT3; - boolean perglobalinverse = triggerline->flags & ML_DONTPEGBOTTOM; - boolean perglobal = !(triggerline->flags & ML_EFFECT4) && !perglobalinverse; + boolean lapfrombonustime; - boolean donomares = triggerline->flags & ML_BOUNCY; // nightserize: run at end of level (no mares) - boolean fromnonights = triggerline->flags & ML_TFERLINE; // nightserize: from non-nights // denightserize: all players no nights - boolean fromnights = triggerline->flags & ML_DONTPEGTOP; // nightserize: from nights // denightserize: >0 players are nights + boolean donomares = (specialtype == 323) && (triggerline->args[7] & TMN_LEVELCOMPLETION); // nightserize: run at end of level (no mares) UINT8 currentmare = UINT8_MAX; UINT8 currentlap = UINT8_MAX; + // Set lapfrombonustime + switch (specialtype) + { + case 323: + lapfrombonustime = !!(triggerline->args[7] & TMN_BONUSLAPS); + break; + case 325: + lapfrombonustime = !!(triggerline->args[7]); + break; + case 327: + lapfrombonustime = !!(triggerline->args[6]); + break; + case 329: + lapfrombonustime = !!(triggerline->args[7] & TMI_BONUSLAPS); + break; + default: + lapfrombonustime = false; + break; + } + // Do early returns for Nightserize - if (specialtype >= 323 && specialtype <= 324) + if (specialtype == 323) { // run only when no mares are found if (donomares && P_FindLowestMare() != UINT8_MAX) @@ -1457,7 +1403,7 @@ static boolean P_CheckNightsTriggerLine(line_t *triggerline, mobj_t *actor) return false; // run only if player is nightserizing from non-nights - if (fromnonights) + if (triggerline->args[6] == TMN_FROMNONIGHTS) { if (!actor->player) return false; @@ -1465,7 +1411,7 @@ static boolean P_CheckNightsTriggerLine(line_t *triggerline, mobj_t *actor) return false; } // run only if player is nightserizing from nights - else if (fromnights) + else if (triggerline->args[6] == TMN_FROMNIGHTS) { if (!actor->player) return false; @@ -1475,8 +1421,8 @@ static boolean P_CheckNightsTriggerLine(line_t *triggerline, mobj_t *actor) } // Get current mare and lap (and check early return for DeNightserize) - if (perglobal || perglobalinverse - || (specialtype >= 325 && specialtype <= 326 && (fromnonights || fromnights))) + if (checkplayer != TMNP_TRIGGERER + || (specialtype == 325 && triggerline->args[6] != TMD_ALWAYS)) { UINT8 playersarenights = 0; @@ -1487,19 +1433,19 @@ static boolean P_CheckNightsTriggerLine(line_t *triggerline, mobj_t *actor) continue; // denightserize: run only if all players are not nights - if (specialtype >= 325 && specialtype <= 326 && fromnonights + if (specialtype == 325 && triggerline->args[6] == TMD_NOBODYNIGHTS && players[i].powers[pw_carry] == CR_NIGHTSMODE) return false; // count number of nights players for denightserize return - if (specialtype >= 325 && specialtype <= 326 && fromnights + if (specialtype == 325 && triggerline->args[6] == TMD_SOMEBODYNIGHTS && players[i].powers[pw_carry] == CR_NIGHTSMODE) playersarenights++; lap = lapfrombonustime ? players[i].marebonuslap : players[i].marelap; // get highest mare/lap of players - if (perglobal) + if (checkplayer == TMNP_FASTEST) { if (players[i].mare > currentmare || currentmare == UINT8_MAX) { @@ -1511,7 +1457,7 @@ static boolean P_CheckNightsTriggerLine(line_t *triggerline, mobj_t *actor) currentlap = lap; } // get lowest mare/lap of players - else if (perglobalinverse) + else if (checkplayer == TMNP_SLOWEST) { if (players[i].mare < currentmare || currentmare == UINT8_MAX) { @@ -1525,12 +1471,12 @@ static boolean P_CheckNightsTriggerLine(line_t *triggerline, mobj_t *actor) } // denightserize: run only if >0 players are nights - if (specialtype >= 325 && specialtype <= 326 && fromnights + if (specialtype == 325 && triggerline->args[6] == TMD_SOMEBODYNIGHTS && playersarenights < 1) return false; } // get current mare/lap from triggering player - else if (!perglobal && !perglobalinverse) + else if (checkplayer == TMNP_TRIGGERER) { if (!actor->player) return false; @@ -1542,280 +1488,170 @@ static boolean P_CheckNightsTriggerLine(line_t *triggerline, mobj_t *actor) return false; // special case: player->marebonuslap is 0 until passing through on bonus time. Don't trigger lines looking for inputlap 0. // Compare current mare/lap to input mare/lap based on rules - if (!(specialtype >= 323 && specialtype <= 324 && donomares) // don't return false if donomares and we got this far - && ((ltemare && currentmare > inputmare) - || (gtemare && currentmare < inputmare) - || (!ltemare && !gtemare && currentmare != inputmare) - || (ltelap && currentlap > inputlap) - || (gtelap && currentlap < inputlap) - || (!ltelap && !gtelap && currentlap != inputlap)) + if (!donomares // don't return false if donomares and we got this far + && ((marecomp == TMC_LTE && currentmare > inputmare) + || (marecomp == TMC_GTE && currentmare < inputmare) + || (marecomp == TMC_EQUAL && currentmare != inputmare) + || (lapcomp == TMC_LTE && currentlap > inputlap) + || (lapcomp == TMC_GTE && currentlap < inputlap) + || (lapcomp == TMC_EQUAL && currentlap != inputlap)) ) return false; return true; } -/** Used by P_LinedefExecute to check a trigger linedef's conditions - * The linedef executor specials in the trigger linedef's sector are run if all conditions are met. - * Return false cancels P_LinedefExecute, this happens if a condition is not met. - * - * \param triggerline Trigger linedef to check conditions for; should NEVER be NULL. - * \param actor Object initiating the action; should not be NULL. - * \param caller Sector in which the action was started. May be NULL. - * \sa P_ProcessLineSpecial, P_LinedefExecute - */ -boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller) +static boolean P_CheckPlayerMareOld(line_t *triggerline) { - sector_t *ctlsector; - fixed_t dist = P_AproxDistance(triggerline->dx, triggerline->dy)>>FRACBITS; - size_t i, linecnt, sectori; - INT16 specialtype = triggerline->special; + UINT8 mare; + INT32 targetmare = P_AproxDistance(triggerline->dx, triggerline->dy) >> FRACBITS; - ///////////////////////////////////////////////// - // Distance-checking/sector trigger conditions // - ///////////////////////////////////////////////// + if (!(maptol & TOL_NIGHTS)) + return false; - // Linetypes 303 and 304 require a specific - // number, or minimum or maximum, of rings. - if (specialtype == 303 || specialtype == 304) + mare = P_FindLowestMare(); + + if (triggerline->flags & ML_NOCLIMB) + return mare <= targetmare; + + if (triggerline->flags & ML_BLOCKMONSTERS) + return mare >= targetmare; + + return mare == targetmare; +} + +static boolean P_CheckPlayerMare(line_t *triggerline) +{ + UINT8 mare; + INT32 targetmare = triggerline->args[1]; + + if (!(maptol & TOL_NIGHTS)) + return false; + + mare = P_FindLowestMare(); + + switch (triggerline->args[2]) { - fixed_t rings = 0; - - // With the passuse flag, count all player's - // rings. - if (triggerline->flags & ML_EFFECT4) - { - for (i = 0; i < MAXPLAYERS; i++) - { - if (!playeringame[i] || players[i].spectator) - continue; - - if (!players[i].mo || ((maptol & TOL_NIGHTS) ? players[i].spheres : players[i].rings) <= 0) - continue; - - rings += (maptol & TOL_NIGHTS) ? players[i].spheres : players[i].rings; - } - } - else - { - if (!(actor && actor->player)) - return false; // no player to count rings from here, sorry - - rings = (maptol & TOL_NIGHTS) ? actor->player->spheres : actor->player->rings; - } - - if (triggerline->flags & ML_NOCLIMB) - { - if (rings > dist) - return false; - } - else if (triggerline->flags & ML_BLOCKMONSTERS) - { - if (rings < dist) - return false; - } - else - { - if (rings != dist) - return false; - } - } - else if (specialtype >= 314 && specialtype <= 315) - { - msecnode_t *node; - mobj_t *mo; - INT32 numpush = 0; - INT32 numneeded = dist; - - if (!caller) - return false; // we need a calling sector to find pushables in, silly! - - // Count the pushables in this sector - node = caller->touching_thinglist; // things touching this sector - while (node) - { - mo = node->m_thing; - if ((mo->flags & MF_PUSHABLE) || ((mo->info->flags & MF_PUSHABLE) && mo->fuse)) - numpush++; - node = node->m_thinglist_next; - } - - if (triggerline->flags & ML_NOCLIMB) // Need at least or more - { - if (numpush < numneeded) - return false; - } - else if (triggerline->flags & ML_EFFECT4) // Need less than - { - if (numpush >= numneeded) - return false; - } - else // Need exact - { - if (numpush != numneeded) - return false; - } - } - else if (caller) - { - if (GETSECSPECIAL(caller->special, 2) == 6) - { - if (!(ALL7EMERALDS(emeralds))) - return false; - } - else if (GETSECSPECIAL(caller->special, 2) == 7) - { - UINT8 mare; - - if (!(maptol & TOL_NIGHTS)) - return false; - - mare = P_FindLowestMare(); - - if (triggerline->flags & ML_NOCLIMB) - { - if (!(mare <= dist)) - return false; - } - else if (triggerline->flags & ML_BLOCKMONSTERS) - { - if (!(mare >= dist)) - return false; - } - else - { - if (!(mare == dist)) - return false; - } - } - // If we were not triggered by a sector type especially for the purpose, - // a Linedef Executor linedef trigger is not handling sector triggers properly, return. - - else if ((!GETSECSPECIAL(caller->special, 2) || GETSECSPECIAL(caller->special, 2) > 7) && (specialtype > 322)) - { - CONS_Alert(CONS_WARNING, - M_GetText("Linedef executor trigger isn't handling sector triggers properly!\nspecialtype = %d, if you are not a dev, report this warning instance\nalong with the wad that caused it!\n"), - specialtype); - return false; - } - } - - ////////////////////////////////////// - // Miscellaneous trigger conditions // - ////////////////////////////////////// - - switch (specialtype) - { - case 305: // continuous - case 306: // each time - case 307: // once - if (!(actor && actor->player && actor->player->charability == dist/10)) - return false; - break; - case 309: // continuous - case 310: // each time - // Only red team members can activate this. - if (!(actor && actor->player && actor->player->ctfteam == 1)) - return false; - break; - case 311: // continuous - case 312: // each time - // Only blue team members can activate this. - if (!(actor && actor->player && actor->player->ctfteam == 2)) - return false; - break; - case 317: // continuous - case 318: // once - { // Unlockable triggers required - INT32 trigid = (INT32)(sides[triggerline->sidenum[0]].textureoffset>>FRACBITS); - - if ((modifiedgame && !savemoddata) || (netgame || multiplayer)) - return false; - else if (trigid < 0 || trigid > 31) // limited by 32 bit variable - { - CONS_Debug(DBG_GAMELOGIC, "Unlockable trigger (sidedef %hu): bad trigger ID %d\n", triggerline->sidenum[0], trigid); - return false; - } - else if (!(unlocktriggers & (1 << trigid))) - return false; - } - break; - case 319: // continuous - case 320: // once - { // An unlockable itself must be unlocked! - INT32 unlockid = (INT32)(sides[triggerline->sidenum[0]].textureoffset>>FRACBITS); - - if ((modifiedgame && !savemoddata) || (netgame || multiplayer)) - return false; - else if (unlockid < 0 || unlockid >= MAXUNLOCKABLES) // limited by unlockable count - { - CONS_Debug(DBG_GAMELOGIC, "Unlockable check (sidedef %hu): bad unlockable ID %d\n", triggerline->sidenum[0], unlockid); - return false; - } - else if (!(unlockables[unlockid-1].unlocked)) - return false; - } - break; - case 321: // continuous - case 322: // each time - // decrement calls left before triggering - if (triggerline->callcount > 0) - { - if (--triggerline->callcount > 0) - return false; - } - break; - case 323: // nightserize - each time - case 324: // nightserize - once - case 325: // denightserize - each time - case 326: // denightserize - once - case 327: // nights lap - each time - case 328: // nights lap - once - case 329: // nights egg capsule touch - each time - case 330: // nights egg capsule touch - once - if (!P_CheckNightsTriggerLine(triggerline, actor)) - return false; - break; - case 331: // continuous - case 332: // each time - case 333: // once - if (!(actor && actor->player && ((stricmp(triggerline->text, skins[actor->player->skin].name) == 0) ^ ((triggerline->flags & ML_NOCLIMB) == ML_NOCLIMB)))) - return false; - break; - case 334: // object dye - continuous - case 335: // object dye - each time - case 336: // object dye - once - { - INT32 triggercolor = (INT32)sides[triggerline->sidenum[0]].toptexture; - UINT16 color = (actor->player ? actor->player->powers[pw_dye] : actor->color); - boolean invert = (triggerline->flags & ML_NOCLIMB ? true : false); - - if (invert ^ (triggercolor != color)) - return false; - } + case TMC_EQUAL: default: - break; + return mare == targetmare; + case TMC_GTE: + return mare >= targetmare; + case TMC_LTE: + return mare <= targetmare; + } +} + +static boolean P_CheckPlayerRings(line_t *triggerline, mobj_t *actor) +{ + INT32 rings = 0; + INT32 targetrings = triggerline->args[1]; + size_t i; + + // Count all players' rings. + if (triggerline->args[3]) + { + for (i = 0; i < MAXPLAYERS; i++) + { + if (!playeringame[i] || players[i].spectator) + continue; + + if (!players[i].mo || ((maptol & TOL_NIGHTS) ? players[i].spheres : players[i].rings) <= 0) + continue; + + rings += (maptol & TOL_NIGHTS) ? players[i].spheres : players[i].rings; + } + } + else + { + if (!(actor && actor->player)) + return false; // no player to count rings from here, sorry + + rings = (maptol & TOL_NIGHTS) ? actor->player->spheres : actor->player->rings; } - ///////////////////////////////// - // Processing linedef specials // - ///////////////////////////////// + switch (triggerline->args[2]) + { + case TMC_EQUAL: + default: + return rings == targetrings; + case TMC_GTE: + return rings >= targetrings; + case TMC_LTE: + return rings <= targetrings; + } +} - ctlsector = triggerline->frontsector; - sectori = (size_t)(ctlsector - sectors); - linecnt = ctlsector->linecount; +static boolean P_CheckPushables(line_t *triggerline, sector_t *caller) +{ + msecnode_t *node; + mobj_t *mo; + INT32 numpushables = 0; + INT32 targetpushables = triggerline->args[1]; - if (triggerline->flags & ML_EFFECT5) // disregard order for efficiency + if (!caller) + return false; // we need a calling sector to find pushables in, silly! + + // Count the pushables in this sector + for (node = caller->touching_thinglist; node; node = node->m_thinglist_next) + { + mo = node->m_thing; + if ((mo->flags & MF_PUSHABLE) || ((mo->info->flags & MF_PUSHABLE) && mo->fuse)) + numpushables++; + } + + switch (triggerline->args[2]) + { + case TMC_EQUAL: + default: + return numpushables == targetpushables; + case TMC_GTE: + return numpushables >= targetpushables; + case TMC_LTE: + return numpushables <= targetpushables; + } +} + +static boolean P_CheckEmeralds(INT32 checktype, UINT16 target) +{ + switch (checktype) + { + case TMF_HASALL: + default: + return (emeralds & target) == target; + case TMF_HASANY: + return !!(emeralds & target); + case TMF_HASEXACTLY: + return emeralds == target; + case TMF_DOESNTHAVEALL: + return (emeralds & target) != target; + case TMF_DOESNTHAVEANY: + return !(emeralds & target); + } +} + +static void P_ActivateLinedefExecutor(line_t *line, mobj_t *actor, sector_t *caller) +{ + if (line->special < 400 || line->special >= 500) + return; + + if (line->executordelay) + P_AddExecutorDelay(line, actor, caller); + else + P_ProcessLineSpecial(line, actor, caller); +} + +static boolean P_ActivateLinedefExecutorsInSector(line_t *triggerline, mobj_t *actor, sector_t *caller) +{ + sector_t *ctlsector = triggerline->frontsector; + size_t sectori = (size_t)(ctlsector - sectors); + size_t linecnt = ctlsector->linecount; + size_t i; + + if (!udmf && triggerline->flags & ML_WRAPMIDTEX) // disregard order for efficiency { for (i = 0; i < linecnt; i++) - if (ctlsector->lines[i]->special >= 400 - && ctlsector->lines[i]->special < 500) - { - if (ctlsector->lines[i]->executordelay) - P_AddExecutorDelay(ctlsector->lines[i], actor, caller); - else - P_ProcessLineSpecial(ctlsector->lines[i], actor, caller); - } + P_ActivateLinedefExecutor(ctlsector->lines[i], actor, caller); } else // walk around the sector in a defined order { @@ -1896,39 +1732,179 @@ boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller if (i == masterlineindex) break; - if (ctlsector->lines[i]->special >= 400 - && ctlsector->lines[i]->special < 500) - { - if (ctlsector->lines[i]->executordelay) - P_AddExecutorDelay(ctlsector->lines[i], actor, caller); - else - P_ProcessLineSpecial(ctlsector->lines[i], actor, caller); - } + P_ActivateLinedefExecutor(ctlsector->lines[i], actor, caller); } } - // "Trigger on X calls" linedefs reset if noclimb is set - if ((specialtype == 321 || specialtype == 322) && triggerline->flags & ML_NOCLIMB) - triggerline->callcount = sides[triggerline->sidenum[0]].textureoffset>>FRACBITS; + return true; +} + +/** Used by P_LinedefExecute to check a trigger linedef's conditions + * The linedef executor specials in the trigger linedef's sector are run if all conditions are met. + * Return false cancels P_LinedefExecute, this happens if a condition is not met. + * + * \param triggerline Trigger linedef to check conditions for; should NEVER be NULL. + * \param actor Object initiating the action; should not be NULL. + * \param caller Sector in which the action was started. May be NULL. + * \sa P_ProcessLineSpecial, P_LinedefExecute + */ +boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller) +{ + INT16 specialtype = triggerline->special; + + //////////////////////// + // Trigger conditions // + //////////////////////// + + if (caller && !udmf) + { + if (caller->triggerer == TO_PLAYEREMERALDS) + { + if (!(ALL7EMERALDS(emeralds))) + return false; + } + else if (caller->triggerer == TO_PLAYERNIGHTS) + { + if (!P_CheckPlayerMareOld(triggerline)) + return false; + } + } + + switch (specialtype) + { + case 303: + if (!P_CheckPlayerRings(triggerline, actor)) + return false; + break; + case 305: + if (!(actor && actor->player && actor->player->charability == triggerline->args[1])) + return false; + break; + case 309: + // Only red/blue team members can activate this. + if (!(actor && actor->player)) + return false; + if (actor->player->ctfteam != ((triggerline->args[1] == TMT_RED) ? 1 : 2)) + return false; + break; + case 314: + if (!P_CheckPushables(triggerline, caller)) + return false; + break; + case 317: + { // Unlockable triggers required + INT32 trigid = triggerline->args[1]; + + if (trigid < 0 || trigid > 31) // limited by 32 bit variable + { + CONS_Debug(DBG_GAMELOGIC, "Unlockable trigger (sidedef %hu): bad trigger ID %d\n", triggerline->sidenum[0], trigid); + return false; + } + else if (!(unlocktriggers & (1 << trigid))) + return false; + } + break; + case 319: + { // An unlockable itself must be unlocked! + INT32 unlockid = triggerline->args[1]; + + if (unlockid < 0 || unlockid >= MAXUNLOCKABLES) // limited by unlockable count + { + CONS_Debug(DBG_GAMELOGIC, "Unlockable check (sidedef %hu): bad unlockable ID %d\n", triggerline->sidenum[0], unlockid); + return false; + } + else if (!(serverGamedata->unlocked[unlockid-1])) + return false; + } + break; + case 321: + // decrement calls left before triggering + if (triggerline->callcount > 0) + { + if (--triggerline->callcount > 0) + return false; + } + break; + case 323: // nightserize + case 325: // denightserize + case 327: // nights lap + case 329: // nights egg capsule touch + if (!P_CheckNightsTriggerLine(triggerline, actor)) + return false; + break; + case 331: + if (!(actor && actor->player)) + return false; + if (!triggerline->stringargs[0]) + return false; + if (!(stricmp(triggerline->stringargs[0], skins[actor->player->skin].name) == 0) ^ !!(triggerline->args[1])) + return false; + break; + case 334: // object dye + { + INT32 triggercolor = triggerline->stringargs[0] ? get_number(triggerline->stringargs[0]) : SKINCOLOR_NONE; + UINT16 color = (actor->player ? actor->player->powers[pw_dye] : actor->color); + + if (!!(triggerline->args[1]) ^ (triggercolor != color)) + return false; + } + break; + case 337: // emerald check + if (!P_CheckEmeralds(triggerline->args[2], (UINT16)triggerline->args[1])) + return false; + break; + case 340: // NiGHTS mare + if (!P_CheckPlayerMare(triggerline)) + return false; + break; + case 343: // gravity check + if (triggerline->args[1] == TMG_TEMPREVERSE && (!(actor->flags2 & MF2_OBJECTFLIP) != !(actor->player->powers[pw_gravityboots]))) + return false; + if ((triggerline->args[1] == TMG_NORMAL) != !(actor->eflags & MFE_VERTICALFLIP)) + return false; + break; + default: + break; + } + + ///////////////////////////////// + // Processing linedef specials // + ///////////////////////////////// + + if (!P_ActivateLinedefExecutorsInSector(triggerline, actor, caller)) + return false; + + // "Trigger on X calls" linedefs reset if args[2] is set + if (specialtype == 321 && triggerline->args[2]) + triggerline->callcount = triggerline->args[1]; else - // These special types work only once - if (specialtype == 302 // Once - || specialtype == 304 // Ring count - Once - || specialtype == 307 // Character ability - Once - || specialtype == 308 // Race only - Once - || specialtype == 313 // No More Enemies - Once - || specialtype == 315 // No of pushables - Once - || specialtype == 318 // Unlockable trigger - Once - || specialtype == 320 // Unlockable - Once - || specialtype == 321 || specialtype == 322 // Trigger on X calls - Continuous + Each Time - || specialtype == 324 // Nightserize - Once - || specialtype == 326 // DeNightserize - Once - || specialtype == 328 // Nights lap - Once - || specialtype == 330 // Nights Bonus Time - Once - || specialtype == 333 // Skin - Once - || specialtype == 336 // Dye - Once - || specialtype == 399) // Level Load - triggerline->special = 0; // Clear it out + { + // These special types work only once + if (specialtype == 313 // No more enemies + || specialtype == 321 // Trigger on X calls + || specialtype == 399) // Level Load + triggerline->special = 0; + else if ((specialtype == 323 // Nightserize + || specialtype == 325 // DeNightserize + || specialtype == 327 // Nights lap + || specialtype == 329) // Nights bonus time + && triggerline->args[0]) + triggerline->special = 0; + else if ((specialtype == 300 // Basic + || specialtype == 303 // Ring count + || specialtype == 305 // Character ability + || specialtype == 308 // Gametype + || specialtype == 309 // CTF team + || specialtype == 314 // No of pushables + || specialtype == 317 // Unlockable trigger + || specialtype == 319 // Unlockable + || specialtype == 331 // Player skin + || specialtype == 334 // Object dye + || specialtype == 337 // Emerald check + || specialtype == 343) // Gravity check + && triggerline->args[0] == TMT_ONCE) + triggerline->special = 0; + } return true; } @@ -1948,39 +1924,161 @@ boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller */ void P_LinedefExecute(INT16 tag, mobj_t *actor, sector_t *caller) { - size_t masterline; + INT32 masterline; CONS_Debug(DBG_GAMELOGIC, "P_LinedefExecute: Executing trigger linedefs of tag %d\n", tag); I_Assert(!actor || !P_MobjWasRemoved(actor)); // If actor is there, it must be valid. - for (masterline = 0; masterline < numlines; masterline++) + TAG_ITER_LINES(tag, masterline) { - if (Tag_FGet(&lines[masterline].tags) != tag) - continue; - - // "No More Enemies" and "Level Load" take care of themselves. - if (lines[masterline].special == 313 - || lines[masterline].special == 399 - // Each-time executors handle themselves, too - || lines[masterline].special == 301 // Each time - || lines[masterline].special == 306 // Character ability - Each time - || lines[masterline].special == 310 // CTF Red team - Each time - || lines[masterline].special == 312 // CTF Blue team - Each time - || lines[masterline].special == 322 // Trigger on X calls - Each Time - || lines[masterline].special == 332 // Skin - Each time - || lines[masterline].special == 335)// Dye - Each time - continue; - if (lines[masterline].special < 300 || lines[masterline].special > 399) continue; + // "No More Enemies" and "Level Load" take care of themselves. + if (lines[masterline].special == 313 || lines[masterline].special == 399) + continue; + + // Each-time executors handle themselves, too + if ((lines[masterline].special == 300 // Basic + || lines[masterline].special == 303 // Ring count + || lines[masterline].special == 305 // Character ability + || lines[masterline].special == 308 // Gametype + || lines[masterline].special == 309 // CTF team + || lines[masterline].special == 314 // Number of pushables + || lines[masterline].special == 317 // Condition set trigger + || lines[masterline].special == 319 // Unlockable trigger + || lines[masterline].special == 331 // Player skin + || lines[masterline].special == 334 // Object dye + || lines[masterline].special == 337 // Emerald check + || lines[masterline].special == 343) // Gravity check + && lines[masterline].args[0] > TMT_EACHTIMEMASK) + continue; + + if (lines[masterline].special == 321 && lines[masterline].args[0] > TMXT_EACHTIMEMASK) // Trigger after X calls + continue; + if (!P_RunTriggerLinedef(&lines[masterline], actor, caller)) return; // cancel P_LinedefExecute if function returns false } } +static void P_PlaySFX(INT32 sfxnum, mobj_t *mo, sector_t *callsec, INT16 tag, textmapsoundsource_t source, textmapsoundlistener_t listener) +{ + if (sfxnum == sfx_None) + return; // Do nothing! + + if (sfxnum < sfx_None || sfxnum >= NUMSFX) + { + CONS_Debug(DBG_GAMELOGIC, "Line type 414 Executor: sfx number %d is invalid!\n", sfxnum); + return; + } + + // Check if you can hear the sound + switch (listener) + { + case TMSL_TRIGGERER: // only play sound if displayplayer + if (!mo) + return; + + if (!mo->player) + return; + + if (mo->player != &players[displayplayer] && mo->player != &players[secondarydisplayplayer]) + return; + + break; + case TMSL_TAGGEDSECTOR: // only play if touching tagged sectors + { + UINT8 i = 0; + mobj_t *camobj = players[displayplayer].mo; + ffloor_t *rover; + boolean foundit = false; + + for (i = 0; i < 2; camobj = players[secondarydisplayplayer].mo, i++) + { + if (!camobj) + continue; + + if (foundit || Tag_Find(&camobj->subsector->sector->tags, tag)) + { + foundit = true; + break; + } + + // Only trigger if mobj is touching the tag + for (rover = camobj->subsector->sector->ffloors; rover; rover = rover->next) + { + if (!Tag_Find(&rover->master->frontsector->tags, tag)) + continue; + + if (camobj->z > P_GetSpecialTopZ(camobj, sectors + rover->secnum, camobj->subsector->sector)) + continue; + + if (camobj->z + camobj->height < P_GetSpecialBottomZ(camobj, sectors + rover->secnum, camobj->subsector->sector)) + continue; + + foundit = true; + break; + } + } + + if (!foundit) + return; + + break; + } + case TMSL_EVERYONE: // no additional check + default: + break; + } + + // Play the sound from the specified source + switch (source) + { + case TMSS_TRIGGERMOBJ: // play the sound from mobj that triggered it + if (mo) + S_StartSound(mo, sfxnum); + break; + case TMSS_TRIGGERSECTOR: // play the sound from calling sector's soundorg + if (callsec) + S_StartSound(&callsec->soundorg, sfxnum); + else if (mo) + S_StartSound(&mo->subsector->sector->soundorg, sfxnum); + break; + case TMSS_NOWHERE: // play the sound from nowhere + S_StartSound(NULL, sfxnum); + break; + case TMSS_TAGGEDSECTOR: // play the sound from tagged sectors' soundorgs + { + INT32 secnum; + + TAG_ITER_SECTORS(tag, secnum) + S_StartSound(§ors[secnum].soundorg, sfxnum); + break; + } + default: + break; + } +} + +static boolean is_rain_type (INT32 weathernum) +{ + switch (weathernum) + { + case PRECIP_SNOW: + case PRECIP_RAIN: + case PRECIP_STORM: + case PRECIP_STORM_NOSTRIKES: + case PRECIP_BLANK: + return true; + + default: + return false; + } +} + // // P_SwitchWeather // @@ -1988,53 +2086,14 @@ void P_LinedefExecute(INT16 tag, mobj_t *actor, sector_t *caller) // void P_SwitchWeather(INT32 weathernum) { - boolean purge = false; - INT32 swap = 0; + boolean purge = true; - switch (weathernum) - { - case PRECIP_NONE: // None - if (curWeather == PRECIP_NONE) - return; // Nothing to do. - purge = true; - break; - case PRECIP_STORM: // Storm - case PRECIP_STORM_NOSTRIKES: // Storm w/ no lightning - case PRECIP_RAIN: // Rain - if (curWeather == PRECIP_SNOW || curWeather == PRECIP_BLANK || curWeather == PRECIP_STORM_NORAIN) - swap = PRECIP_RAIN; - break; - case PRECIP_SNOW: // Snow - if (curWeather == PRECIP_SNOW) - return; // Nothing to do. - if (curWeather == PRECIP_RAIN || curWeather == PRECIP_STORM || curWeather == PRECIP_STORM_NOSTRIKES || curWeather == PRECIP_BLANK || curWeather == PRECIP_STORM_NORAIN) - swap = PRECIP_SNOW; // Need to delete the other precips. - break; - case PRECIP_STORM_NORAIN: // Storm w/o rain - if (curWeather == PRECIP_SNOW - || curWeather == PRECIP_STORM - || curWeather == PRECIP_STORM_NOSTRIKES - || curWeather == PRECIP_RAIN - || curWeather == PRECIP_BLANK) - swap = PRECIP_STORM_NORAIN; - else if (curWeather == PRECIP_STORM_NORAIN) - return; - break; - case PRECIP_BLANK: - if (curWeather == PRECIP_SNOW - || curWeather == PRECIP_STORM - || curWeather == PRECIP_STORM_NOSTRIKES - || curWeather == PRECIP_RAIN) - swap = PRECIP_BLANK; - else if (curWeather == PRECIP_STORM_NORAIN) - swap = PRECIP_BLANK; - else if (curWeather == PRECIP_BLANK) - return; - break; - default: - CONS_Debug(DBG_GAMELOGIC, "P_SwitchWeather: Unknown weather type %d.\n", weathernum); - break; - } + if (weathernum == curWeather) + return; + + if (is_rain_type(weathernum) && + is_rain_type(curWeather)) + purge = false; if (purge) { @@ -2051,7 +2110,7 @@ void P_SwitchWeather(INT32 weathernum) P_RemovePrecipMobj(precipmobj); } } - else if (swap && !((swap == PRECIP_BLANK && curWeather == PRECIP_STORM_NORAIN) || (swap == PRECIP_STORM_NORAIN && curWeather == PRECIP_BLANK))) // Rather than respawn all that crap, reuse it! + else // Rather than respawn all that crap, reuse it! { thinker_t *think; precipmobj_t *precipmobj; @@ -2063,7 +2122,7 @@ void P_SwitchWeather(INT32 weathernum) continue; // not a precipmobj thinker precipmobj = (precipmobj_t *)think; - if (swap == PRECIP_RAIN) // Snow To Rain + if (weathernum == PRECIP_RAIN || weathernum == PRECIP_STORM || weathernum == PRECIP_STORM_NOSTRIKES) // Snow To Rain { precipmobj->flags = mobjinfo[MT_RAIN].flags; st = &states[mobjinfo[MT_RAIN].spawnstate]; @@ -2078,7 +2137,7 @@ void P_SwitchWeather(INT32 weathernum) precipmobj->precipflags |= PCF_RAIN; //think->function.acp1 = (actionf_p1)P_RainThinker; } - else if (swap == PRECIP_SNOW) // Rain To Snow + else if (weathernum == PRECIP_SNOW) // Rain To Snow { INT32 z; @@ -2103,7 +2162,7 @@ void P_SwitchWeather(INT32 weathernum) //think->function.acp1 = (actionf_p1)P_SnowThinker; } - else if (swap == PRECIP_BLANK || swap == PRECIP_STORM_NORAIN) // Remove precip, but keep it around for reuse. + else // Remove precip, but keep it around for reuse. { //think->function.acp1 = (actionf_p1)P_NullPrecipThinker; @@ -2117,48 +2176,33 @@ void P_SwitchWeather(INT32 weathernum) case PRECIP_SNOW: // snow curWeather = PRECIP_SNOW; - if (!swap) + if (purge) P_SpawnPrecipitation(); break; case PRECIP_RAIN: // rain { - boolean dontspawn = false; - - if (curWeather == PRECIP_RAIN || curWeather == PRECIP_STORM || curWeather == PRECIP_STORM_NOSTRIKES) - dontspawn = true; - curWeather = PRECIP_RAIN; - if (!dontspawn && !swap) + if (purge) P_SpawnPrecipitation(); break; } case PRECIP_STORM: // storm { - boolean dontspawn = false; - - if (curWeather == PRECIP_RAIN || curWeather == PRECIP_STORM || curWeather == PRECIP_STORM_NOSTRIKES) - dontspawn = true; - curWeather = PRECIP_STORM; - if (!dontspawn && !swap) + if (purge) P_SpawnPrecipitation(); break; } case PRECIP_STORM_NOSTRIKES: // storm w/o lightning { - boolean dontspawn = false; - - if (curWeather == PRECIP_RAIN || curWeather == PRECIP_STORM || curWeather == PRECIP_STORM_NOSTRIKES) - dontspawn = true; - curWeather = PRECIP_STORM_NOSTRIKES; - if (!dontspawn && !swap) + if (purge) P_SpawnPrecipitation(); break; @@ -2166,14 +2210,11 @@ void P_SwitchWeather(INT32 weathernum) case PRECIP_STORM_NORAIN: // storm w/o rain curWeather = PRECIP_STORM_NORAIN; - if (!swap) - P_SpawnPrecipitation(); - break; - case PRECIP_BLANK: + case PRECIP_BLANK: //preloaded curWeather = PRECIP_BLANK; - if (!swap) + if (purge) P_SpawnPrecipitation(); break; @@ -2204,6 +2245,39 @@ static mobj_t *P_GetObjectTypeInSectorNum(mobjtype_t type, size_t s) return NULL; } +static mobj_t* P_FindObjectTypeFromTag(mobjtype_t type, mtag_t tag) +{ + if (udmf) + { + INT32 mtnum; + mobj_t *mo; + + TAG_ITER_THINGS(tag, mtnum) + { + mo = mapthings[mtnum].mobj; + + if (!mo) + continue; + + if (mo->type != type) + continue; + + return mo; + } + + return NULL; + } + else + { + INT32 secnum; + + if ((secnum = Tag_Iterate_Sectors(tag, 0)) < 0) + return NULL; + + return P_GetObjectTypeInSectorNum(type, secnum); + } +} + /** Processes the line special triggered by an object. * * \param line Line with the special command on it. @@ -2222,7 +2296,6 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) { INT32 secnum = -1; mobj_t *bot = NULL; - mtag_t tag = Tag_FGet(&line->tags); I_Assert(!mo || !P_MobjWasRemoved(mo)); // If mo is there, mo must be valid! @@ -2232,90 +2305,134 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) // note: only commands with linedef types >= 400 && < 500 can be used switch (line->special) { - case 400: // Set tagged sector's floor height/pic - EV_DoFloor(line, instantMoveFloorByFrontSector); + case 400: // Set tagged sector's heights/flats + if (line->args[1] != TMP_CEILING) + EV_DoFloor(line->args[0], line, instantMoveFloorByFrontSector); + if (line->args[1] != TMP_FLOOR) + EV_DoCeiling(line->args[0], line, instantMoveCeilingByFrontSector); break; - case 401: // Set tagged sector's ceiling height/pic - EV_DoCeiling(line, instantMoveCeilingByFrontSector); - break; - - case 402: // Set tagged sector's light level + case 402: // Copy light level to tagged sectors { INT16 newlightlevel; + INT16 newfloorlightlevel, newceilinglightlevel; + boolean newfloorlightabsolute, newceilinglightabsolute; INT32 newfloorlightsec, newceilinglightsec; newlightlevel = line->frontsector->lightlevel; + newfloorlightlevel = line->frontsector->floorlightlevel; + newfloorlightabsolute = line->frontsector->floorlightabsolute; + newceilinglightlevel = line->frontsector->ceilinglightlevel; + newceilinglightabsolute = line->frontsector->ceilinglightabsolute; newfloorlightsec = line->frontsector->floorlightsec; newceilinglightsec = line->frontsector->ceilinglightsec; - // act on all sectors with the same tag as the triggering linedef - TAG_ITER_SECTORS(tag, secnum) + TAG_ITER_SECTORS(line->args[0], secnum) { if (sectors[secnum].lightingdata) { // Stop the lighting madness going on in this sector! - P_RemoveThinker(&((elevator_t *)sectors[secnum].lightingdata)->thinker); + P_RemoveThinker(&((thinkerdata_t *)sectors[secnum].lightingdata)->thinker); sectors[secnum].lightingdata = NULL; - - // No, it's not an elevator_t, but any struct with a thinker_t named - // 'thinker' at the beginning will do here. (We don't know what it - // actually is: could be lightlevel_t, fireflicker_t, glow_t, etc.) } - sectors[secnum].lightlevel = newlightlevel; - sectors[secnum].floorlightsec = newfloorlightsec; - sectors[secnum].ceilinglightsec = newceilinglightsec; + if (!(line->args[1] & TMLC_NOSECTOR)) + sectors[secnum].lightlevel = newlightlevel; + if (!(line->args[1] & TMLC_NOFLOOR)) + { + sectors[secnum].floorlightlevel = newfloorlightlevel; + sectors[secnum].floorlightabsolute = newfloorlightabsolute; + sectors[secnum].floorlightsec = newfloorlightsec; + } + if (!(line->args[1] & TMLC_NOCEILING)) + { + sectors[secnum].ceilinglightlevel = newceilinglightlevel; + sectors[secnum].ceilinglightabsolute = newceilinglightabsolute; + sectors[secnum].ceilinglightsec = newceilinglightsec; + } } } break; - case 403: // Move floor, linelen = speed, frontsector floor = dest height - EV_DoFloor(line, moveFloorByFrontSector); + case 403: // Move planes by front sector + if (line->args[1] != TMP_CEILING) + EV_DoFloor(line->args[0], line, moveFloorByFrontSector); + if (line->args[1] != TMP_FLOOR) + EV_DoCeiling(line->args[0], line, moveCeilingByFrontSector); break; - case 404: // Move ceiling, linelen = speed, frontsector ceiling = dest height - EV_DoCeiling(line, moveCeilingByFrontSector); + case 405: // Move planes by distance + if (line->args[1] != TMP_CEILING) + EV_DoFloor(line->args[0], line, moveFloorByDistance); + if (line->args[1] != TMP_FLOOR) + EV_DoCeiling(line->args[0], line, moveCeilingByDistance); break; - case 405: // Move floor by front side texture offsets, offset x = speed, offset y = amount to raise/lower - EV_DoFloor(line, moveFloorByFrontTexture); + case 408: // Set flats + { + TAG_ITER_SECTORS(line->args[0], secnum) + { + if (line->args[1] != TMP_CEILING) + sectors[secnum].floorpic = line->frontsector->floorpic; + if (line->args[1] != TMP_FLOOR) + sectors[secnum].ceilingpic = line->frontsector->ceilingpic; + } break; - - case 407: // Move ceiling by front side texture offsets, offset x = speed, offset y = amount to raise/lower - EV_DoCeiling(line, moveCeilingByFrontTexture); - break; - -/* case 405: // Lower floor by line, dx = speed, dy = amount to lower - EV_DoFloor(line, lowerFloorByLine); - break; - - case 406: // Raise floor by line, dx = speed, dy = amount to raise - EV_DoFloor(line, raiseFloorByLine); - break; - - case 407: // Lower ceiling by line, dx = speed, dy = amount to lower - EV_DoCeiling(line, lowerCeilingByLine); - break; - - case 408: // Raise ceiling by line, dx = speed, dy = amount to raise - EV_DoCeiling(line, raiseCeilingByLine); - break;*/ + } case 409: // Change tagged sectors' tag // (formerly "Change calling sectors' tag", but behavior was changed) { - TAG_ITER_SECTORS(tag, secnum) - Tag_SectorFSet(secnum,(INT16)(sides[line->sidenum[0]].textureoffset>>FRACBITS)); + mtag_t newtag = line->args[1]; + + TAG_ITER_SECTORS(line->args[0], secnum) + { + switch (line->args[2]) + { + case TMT_ADD: + Tag_SectorAdd(secnum, newtag); + break; + case TMT_REMOVE: + Tag_SectorRemove(secnum, newtag); + break; + case TMT_REPLACEFIRST: + default: + Tag_SectorFSet(secnum, newtag); + break; + case TMT_TRIGGERTAG: + sectors[secnum].triggertag = newtag; + break; + } + } break; } case 410: // Change front sector's tag - Tag_SectorFSet((UINT32)(line->frontsector - sectors), (INT16)(sides[line->sidenum[0]].textureoffset>>FRACBITS)); + { + mtag_t newtag = line->args[1]; + secnum = (UINT32)(line->frontsector - sectors); + + switch (line->args[2]) + { + case TMT_ADD: + Tag_SectorAdd(secnum, newtag); + break; + case TMT_REMOVE: + Tag_SectorRemove(secnum, newtag); + break; + case TMT_REPLACEFIRST: + default: + Tag_SectorFSet(secnum, newtag); + break; + case TMT_TRIGGERTAG: + sectors[secnum].triggertag = newtag; + break; + } break; + } case 411: // Stop floor/ceiling movement in tagged sector(s) - TAG_ITER_SECTORS(tag, secnum) + TAG_ITER_SECTORS(line->args[0], secnum) { if (sectors[secnum].floordata) { @@ -2349,13 +2466,13 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) if (!mo) // nothing to teleport return; - if (line->flags & ML_EFFECT3) // Relative silent teleport + if (line->args[1] & TMT_RELATIVE) // Relative silent teleport { fixed_t x, y, z; - x = sides[line->sidenum[0]].textureoffset; - y = sides[line->sidenum[0]].rowoffset; - z = line->frontsector->ceilingheight; + x = line->args[2] << FRACBITS; + y = line->args[3] << FRACBITS; + z = line->args[4] << FRACBITS; P_UnsetThingPosition(mo); mo->x += x; @@ -2366,7 +2483,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) if (mo->player) { if (bot) // This might put poor Tails in a wall if he's too far behind! D: But okay, whatever! >:3 - P_TeleportMove(bot, bot->x + x, bot->y + y, bot->z + z); + P_SetOrigin(bot, bot->x + x, bot->y + y, bot->z + z); if (splitscreen && mo->player == &players[secondarydisplayplayer] && camera2.chase) { camera2.x += x; @@ -2385,41 +2502,40 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) } else { - if ((secnum = Tag_Iterate_Sectors(tag, 0)) < 0) - return; + angle_t angle; + boolean silent, keepmomentum; - dest = P_GetObjectTypeInSectorNum(MT_TELEPORTMAN, secnum); + dest = P_FindObjectTypeFromTag(MT_TELEPORTMAN, line->args[0]); if (!dest) return; + angle = (line->args[1] & TMT_KEEPANGLE) ? mo->angle : dest->angle; + silent = !!(line->args[1] & TMT_SILENT); + keepmomentum = !!(line->args[1] & TMT_KEEPMOMENTUM); + if (bot) - P_Teleport(bot, dest->x, dest->y, dest->z, (line->flags & ML_NOCLIMB) ? mo->angle : dest->angle, (line->flags & ML_BLOCKMONSTERS) == 0, (line->flags & ML_EFFECT4) == ML_EFFECT4); - if (line->flags & ML_BLOCKMONSTERS) - P_Teleport(mo, dest->x, dest->y, dest->z, (line->flags & ML_NOCLIMB) ? mo->angle : dest->angle, false, (line->flags & ML_EFFECT4) == ML_EFFECT4); - else - { - P_Teleport(mo, dest->x, dest->y, dest->z, (line->flags & ML_NOCLIMB) ? mo->angle : dest->angle, true, (line->flags & ML_EFFECT4) == ML_EFFECT4); - // Play the 'bowrwoosh!' sound - S_StartSound(dest, sfx_mixup); - } + P_Teleport(bot, dest->x, dest->y, dest->z, angle, !silent, keepmomentum); + P_Teleport(mo, dest->x, dest->y, dest->z, angle, !silent, keepmomentum); + if (!silent) + S_StartSound(dest, sfx_mixup); // Play the 'bowrwoosh!' sound } } break; case 413: // Change music - // console player only unless NOCLIMB is set - if ((line->flags & ML_NOCLIMB) || (mo && mo->player && P_IsLocalPlayer(mo->player)) || titlemapinaction) + // console player only unless TMM_ALLPLAYERS is set + if ((line->args[0] & TMM_ALLPLAYERS) || (mo && mo->player && P_IsLocalPlayer(mo->player)) || titlemapinaction) { - boolean musicsame = (!sides[line->sidenum[0]].text[0] || !strnicmp(sides[line->sidenum[0]].text, S_MusicName(), 7)); - UINT16 tracknum = (UINT16)max(sides[line->sidenum[0]].bottomtexture, 0); - INT32 position = (INT32)max(sides[line->sidenum[0]].midtexture, 0); - UINT32 prefadems = (UINT32)max(sides[line->sidenum[0]].textureoffset >> FRACBITS, 0); - UINT32 postfadems = (UINT32)max(sides[line->sidenum[0]].rowoffset >> FRACBITS, 0); - UINT8 fadetarget = (UINT8)max((line->sidenum[1] != 0xffff) ? sides[line->sidenum[1]].textureoffset >> FRACBITS : 0, 0); - INT16 fadesource = (INT16)max((line->sidenum[1] != 0xffff) ? sides[line->sidenum[1]].rowoffset >> FRACBITS : -1, -1); + boolean musicsame = (!line->stringargs[0] || !line->stringargs[0][0] || !strnicmp(line->stringargs[0], S_MusicName(), 7)); + UINT16 tracknum = (UINT16)max(line->args[6], 0); + INT32 position = (INT32)max(line->args[1], 0); + UINT32 prefadems = (UINT32)max(line->args[2], 0); + UINT32 postfadems = (UINT32)max(line->args[3], 0); + UINT8 fadetarget = (UINT8)max(line->args[4], 0); + INT16 fadesource = (INT16)max(line->args[5], -1); // Seek offset from current song position - if (line->flags & ML_EFFECT1) + if (line->args[0] & TMM_OFFSET) { // adjust for loop point if subtracting if (position < 0 && S_GetMusicLength() && @@ -2431,7 +2547,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) } // Fade current music to target volume (if music won't be changed) - if ((line->flags & ML_EFFECT2) && fadetarget && musicsame) + if ((line->args[0] & TMM_FADE) && fadetarget && musicsame) { // 0 fadesource means fade from current volume. // meaning that we can't specify volume 0 as the source volume -- this starts at 1. @@ -2449,22 +2565,25 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) // Change the music and apply position/fade operations else { - strncpy(mapmusname, sides[line->sidenum[0]].text, 7); + if (!line->stringargs[0]) + break; + + strncpy(mapmusname, line->stringargs[0], 7); mapmusname[6] = 0; mapmusflags = tracknum & MUSIC_TRACKMASK; - if (!(line->flags & ML_BLOCKMONSTERS)) + if (!(line->args[0] & TMM_NORELOAD)) mapmusflags |= MUSIC_RELOADRESET; - if (line->flags & ML_BOUNCY) + if (line->args[0] & TMM_FORCERESET) mapmusflags |= MUSIC_FORCERESET; mapmusposition = position; - S_ChangeMusicEx(mapmusname, mapmusflags, !(line->flags & ML_EFFECT4), position, - !(line->flags & ML_EFFECT2) ? prefadems : 0, - !(line->flags & ML_EFFECT2) ? postfadems : 0); + S_ChangeMusicEx(mapmusname, mapmusflags, !(line->args[0] & TMM_NOLOOP), position, + !(line->args[0] & TMM_FADE) ? prefadems : 0, + !(line->args[0] & TMM_FADE) ? postfadems : 0); - if ((line->flags & ML_EFFECT2) && fadetarget) + if ((line->args[0] & TMM_FADE) && fadetarget) { if (!postfadems) S_SetInternalMusicVolume(fadetarget); @@ -2473,302 +2592,55 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) } } - // Except, you can use the ML_BLOCKMONSTERS flag to change this behavior. + // Except, you can use the TMM_NORELOAD flag to change this behavior. // if (mapmusflags & MUSIC_RELOADRESET) then it will reset the music in G_PlayerReborn. } break; case 414: // Play SFX - { - INT32 sfxnum; - - sfxnum = sides[line->sidenum[0]].toptexture; - - if (sfxnum == sfx_None) - return; // Do nothing! - if (sfxnum < sfx_None || sfxnum >= NUMSFX) - { - CONS_Debug(DBG_GAMELOGIC, "Line type 414 Executor: sfx number %d is invalid!\n", sfxnum); - return; - } - - if (tag != 0) // Do special stuff only if a non-zero linedef tag is set - { - // Play sounds from tagged sectors' origins. - if (line->flags & ML_EFFECT5) // Repeat Midtexture - { - // Additionally play the sound from tagged sectors' soundorgs - sector_t *sec; - - TAG_ITER_SECTORS(tag, secnum) - { - sec = §ors[secnum]; - S_StartSound(&sec->soundorg, sfxnum); - } - } - - // Play the sound without origin for anyone, as long as they're inside tagged areas. - else - { - UINT8 i = 0; - mobj_t* camobj = players[displayplayer].mo; - ffloor_t *rover; - boolean foundit = false; - - for (i = 0; i < 2; camobj = players[secondarydisplayplayer].mo, i++) - { - if (!camobj) - continue; - - if (foundit || Tag_Find(&camobj->subsector->sector->tags, tag)) - { - foundit = true; - break; - } - - // Only trigger if mobj is touching the tag - for(rover = camobj->subsector->sector->ffloors; rover; rover = rover->next) - { - if (!Tag_Find(&rover->master->frontsector->tags, tag)) - continue; - - if (camobj->z > P_GetSpecialTopZ(camobj, sectors + rover->secnum, camobj->subsector->sector)) - continue; - - if (camobj->z + camobj->height < P_GetSpecialBottomZ(camobj, sectors + rover->secnum, camobj->subsector->sector)) - continue; - - foundit = true; - break; - } - } - - if (foundit) - S_StartSound(NULL, sfxnum); - } - } - else - { - if (line->flags & ML_NOCLIMB) - { - // play the sound from nowhere, but only if display player triggered it - if (mo && mo->player && (mo->player == &players[displayplayer] || mo->player == &players[secondarydisplayplayer])) - S_StartSound(NULL, sfxnum); - } - else if (line->flags & ML_EFFECT4) - { - // play the sound from nowhere - S_StartSound(NULL, sfxnum); - } - else if (line->flags & ML_BLOCKMONSTERS) - { - // play the sound from calling sector's soundorg - if (callsec) - S_StartSound(&callsec->soundorg, sfxnum); - else if (mo) - S_StartSound(&mo->subsector->sector->soundorg, sfxnum); - } - else if (mo) - { - // play the sound from mobj that triggered it - S_StartSound(mo, sfxnum); - } - } - } + P_PlaySFX(line->stringargs[0] ? get_number(line->stringargs[0]) : sfx_None, mo, callsec, line->args[2], line->args[0], line->args[1]); break; case 415: // Run a script if (cv_runscripts.value) { - INT32 scrnum; - lumpnum_t lumpnum; - char newname[9]; - - strcpy(newname, G_BuildMapName(gamemap)); - newname[0] = 'S'; - newname[1] = 'C'; - newname[2] = 'R'; - - scrnum = sides[line->sidenum[0]].textureoffset>>FRACBITS; - if (scrnum < 0 || scrnum > 999) - { - scrnum = 0; - newname[5] = newname[6] = newname[7] = '0'; - } - else - { - newname[5] = (char)('0' + (char)((scrnum/100))); - newname[6] = (char)('0' + (char)((scrnum%100)/10)); - newname[7] = (char)('0' + (char)(scrnum%10)); - } - newname[8] = '\0'; - - lumpnum = W_CheckNumForName(newname); + lumpnum_t lumpnum = W_CheckNumForName(line->stringargs[0]); if (lumpnum == LUMPERROR || W_LumpLength(lumpnum) == 0) - { - CONS_Debug(DBG_SETUP, "SOC Error: script lump %s not found/not valid.\n", newname); - } + CONS_Debug(DBG_SETUP, "Line type 415 Executor: script lump %s not found/not valid.\n", line->stringargs[0]); else COM_BufInsertText(W_CacheLumpNum(lumpnum, PU_CACHE)); } break; case 416: // Spawn adjustable fire flicker - TAG_ITER_SECTORS(tag, secnum) - { - if (line->flags & ML_NOCLIMB && line->backsector) - { - // Use front sector for min light level, back sector for max. - // This is tricky because P_SpawnAdjustableFireFlicker expects - // the maxsector (second argument) to also be the target - // sector, so we have to do some light level twiddling. - fireflicker_t *flick; - INT16 reallightlevel = sectors[secnum].lightlevel; - sectors[secnum].lightlevel = line->backsector->lightlevel; - - flick = P_SpawnAdjustableFireFlicker(line->frontsector, §ors[secnum], - P_AproxDistance(line->dx, line->dy)>>FRACBITS); - - // Make sure the starting light level is in range. - if (reallightlevel < flick->minlight) - reallightlevel = (INT16)flick->minlight; - else if (reallightlevel > flick->maxlight) - reallightlevel = (INT16)flick->maxlight; - - sectors[secnum].lightlevel = reallightlevel; - } - else - { - // Use front sector for min, target sector for max, - // the same way linetype 61 does it. - P_SpawnAdjustableFireFlicker(line->frontsector, §ors[secnum], - P_AproxDistance(line->dx, line->dy)>>FRACBITS); - } - } + TAG_ITER_SECTORS(line->args[0], secnum) + P_SpawnAdjustableFireFlicker(§ors[secnum], line->args[2], + line->args[3] ? sectors[secnum].lightlevel : line->args[4], line->args[1]); break; case 417: // Spawn adjustable glowing light - TAG_ITER_SECTORS(tag, secnum) - { - if (line->flags & ML_NOCLIMB && line->backsector) - { - // Use front sector for min light level, back sector for max. - // This is tricky because P_SpawnAdjustableGlowingLight expects - // the maxsector (second argument) to also be the target - // sector, so we have to do some light level twiddling. - glow_t *glow; - INT16 reallightlevel = sectors[secnum].lightlevel; - sectors[secnum].lightlevel = line->backsector->lightlevel; - - glow = P_SpawnAdjustableGlowingLight(line->frontsector, §ors[secnum], - P_AproxDistance(line->dx, line->dy)>>FRACBITS); - - // Make sure the starting light level is in range. - if (reallightlevel < glow->minlight) - reallightlevel = (INT16)glow->minlight; - else if (reallightlevel > glow->maxlight) - reallightlevel = (INT16)glow->maxlight; - - sectors[secnum].lightlevel = reallightlevel; - } - else - { - // Use front sector for min, target sector for max, - // the same way linetype 602 does it. - P_SpawnAdjustableGlowingLight(line->frontsector, §ors[secnum], - P_AproxDistance(line->dx, line->dy)>>FRACBITS); - } - } + TAG_ITER_SECTORS(line->args[0], secnum) + P_SpawnAdjustableGlowingLight(§ors[secnum], line->args[2], + line->args[3] ? sectors[secnum].lightlevel : line->args[4], line->args[1]); break; - case 418: // Spawn adjustable strobe flash (unsynchronized) - TAG_ITER_SECTORS(tag, secnum) - { - if (line->flags & ML_NOCLIMB && line->backsector) - { - // Use front sector for min light level, back sector for max. - // This is tricky because P_SpawnAdjustableGlowingLight expects - // the maxsector (second argument) to also be the target - // sector, so we have to do some light level twiddling. - strobe_t *flash; - INT16 reallightlevel = sectors[secnum].lightlevel; - sectors[secnum].lightlevel = line->backsector->lightlevel; - - flash = P_SpawnAdjustableStrobeFlash(line->frontsector, §ors[secnum], - abs(line->dx)>>FRACBITS, abs(line->dy)>>FRACBITS, false); - - // Make sure the starting light level is in range. - if (reallightlevel < flash->minlight) - reallightlevel = (INT16)flash->minlight; - else if (reallightlevel > flash->maxlight) - reallightlevel = (INT16)flash->maxlight; - - sectors[secnum].lightlevel = reallightlevel; - } - else - { - // Use front sector for min, target sector for max, - // the same way linetype 602 does it. - P_SpawnAdjustableStrobeFlash(line->frontsector, §ors[secnum], - abs(line->dx)>>FRACBITS, abs(line->dy)>>FRACBITS, false); - } - } - break; - - case 419: // Spawn adjustable strobe flash (synchronized) - TAG_ITER_SECTORS(tag, secnum) - { - if (line->flags & ML_NOCLIMB && line->backsector) - { - // Use front sector for min light level, back sector for max. - // This is tricky because P_SpawnAdjustableGlowingLight expects - // the maxsector (second argument) to also be the target - // sector, so we have to do some light level twiddling. - strobe_t *flash; - INT16 reallightlevel = sectors[secnum].lightlevel; - sectors[secnum].lightlevel = line->backsector->lightlevel; - - flash = P_SpawnAdjustableStrobeFlash(line->frontsector, §ors[secnum], - abs(line->dx)>>FRACBITS, abs(line->dy)>>FRACBITS, true); - - // Make sure the starting light level is in range. - if (reallightlevel < flash->minlight) - reallightlevel = (INT16)flash->minlight; - else if (reallightlevel > flash->maxlight) - reallightlevel = (INT16)flash->maxlight; - - sectors[secnum].lightlevel = reallightlevel; - } - else - { - // Use front sector for min, target sector for max, - // the same way linetype 602 does it. - P_SpawnAdjustableStrobeFlash(line->frontsector, §ors[secnum], - abs(line->dx)>>FRACBITS, abs(line->dy)>>FRACBITS, true); - } - } + case 418: // Spawn adjustable strobe flash + TAG_ITER_SECTORS(line->args[0], secnum) + P_SpawnAdjustableStrobeFlash(§ors[secnum], line->args[3], + (line->args[4] & TMB_USETARGET) ? sectors[secnum].lightlevel : line->args[5], + line->args[1], line->args[2], line->args[4] & TMB_SYNC); break; case 420: // Fade light levels in tagged sectors to new value - P_FadeLight(tag, - (line->flags & ML_DONTPEGBOTTOM) ? max(sides[line->sidenum[0]].textureoffset>>FRACBITS, 0) : line->frontsector->lightlevel, - // failsafe: if user specifies Back Y Offset and NOT Front Y Offset, use the Back Offset - // to be consistent with other light and fade specials - (line->flags & ML_DONTPEGBOTTOM) ? - ((line->sidenum[1] != 0xFFFF && !(sides[line->sidenum[0]].rowoffset>>FRACBITS)) ? - max(min(sides[line->sidenum[1]].rowoffset>>FRACBITS, 255), 0) - : max(min(sides[line->sidenum[0]].rowoffset>>FRACBITS, 255), 0)) - : abs(P_AproxDistance(line->dx, line->dy))>>FRACBITS, - (line->flags & ML_EFFECT4), - (line->flags & ML_EFFECT5)); + P_FadeLight(line->args[0], line->args[1], line->args[2], line->args[3] & TMF_TICBASED, line->args[3] & TMF_OVERRIDE, line->args[3] & TMF_RELATIVE); break; case 421: // Stop lighting effect in tagged sectors - TAG_ITER_SECTORS(tag, secnum) + TAG_ITER_SECTORS(line->args[0], secnum) if (sectors[secnum].lightingdata) { - P_RemoveThinker(&((elevator_t *)sectors[secnum].lightingdata)->thinker); + P_RemoveThinker(&((thinkerdata_t *)sectors[secnum].lightingdata)->thinker); sectors[secnum].lightingdata = NULL; } break; @@ -2776,15 +2648,13 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) case 422: // Cut away to another view { mobj_t *altview; + INT32 aim; if ((!mo || !mo->player) && !titlemapinaction) // only players have views, and title screens return; - if ((secnum = Tag_Iterate_Sectors(tag, 0)) < 0) - return; - - altview = P_GetObjectTypeInSectorNum(MT_ALTVIEWMAN, secnum); - if (!altview) + altview = P_FindObjectTypeFromTag(MT_ALTVIEWMAN, line->args[0]); + if (!altview || !altview->spawnpoint) return; // If titlemap, set the camera ref for title's thinker @@ -2794,59 +2664,50 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) else { P_SetTarget(&mo->player->awayviewmobj, altview); - mo->player->awayviewtics = P_AproxDistance(line->dx, line->dy)>>FRACBITS; + mo->player->awayviewtics = line->args[1]; } - - if (line->flags & ML_NOCLIMB) // lets you specify a vertical angle - { - INT32 aim; - - aim = sides[line->sidenum[0]].textureoffset>>FRACBITS; - aim = (aim + 360) % 360; - aim *= (ANGLE_90>>8); - aim /= 90; - aim <<= 8; - if (titlemapinaction) - titlemapcameraref->cusval = (angle_t)aim; - else - mo->player->awayviewaiming = (angle_t)aim; - } + aim = udmf ? altview->spawnpoint->pitch : line->args[2]; + aim = (aim + 360) % 360; + aim *= (ANGLE_90>>8); + aim /= 90; + aim <<= 8; + if (titlemapinaction) + titlemapcameraref->cusval = (angle_t)aim; else - { - // straight ahead - if (!titlemapinaction) - mo->player->awayviewaiming = 0; - // don't do cusval cause that's annoying - } + mo->player->awayviewaiming = (angle_t)aim; } break; case 423: // Change Sky - if ((mo && mo->player && P_IsLocalPlayer(mo->player)) || (line->flags & ML_NOCLIMB)) - P_SetupLevelSky(sides[line->sidenum[0]].textureoffset>>FRACBITS, (line->flags & ML_NOCLIMB)); + if ((mo && mo->player && P_IsLocalPlayer(mo->player)) || line->args[1]) + P_SetupLevelSky(line->args[0], line->args[1]); break; case 424: // Change Weather - if (line->flags & ML_NOCLIMB) + if (line->args[1]) { - globalweather = (UINT8)(sides[line->sidenum[0]].textureoffset>>FRACBITS); + globalweather = (UINT8)(line->args[0]); P_SwitchWeather(globalweather); } else if (mo && mo->player && P_IsLocalPlayer(mo->player)) - P_SwitchWeather(sides[line->sidenum[0]].textureoffset>>FRACBITS); + P_SwitchWeather(line->args[0]); break; case 425: // Calls P_SetMobjState on calling mobj if (mo && !mo->player) - P_SetMobjState(mo, sides[line->sidenum[0]].toptexture); //P_AproxDistance(line->dx, line->dy)>>FRACBITS); + { + statenum_t state = line->stringargs[0] ? get_number(line->stringargs[0]) : S_NULL; + if (state >= 0 && state < NUMSTATES) + P_SetMobjState(mo, state); + } break; case 426: // Moves the mobj to its sector's soundorg and on the floor, and stops it if (!mo) return; - if (line->flags & ML_NOCLIMB) + if (line->args[0]) { P_UnsetThingPosition(mo); mo->x = mo->subsector->sector->soundorg.x; @@ -2867,8 +2728,8 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) // Reset bot too. if (bot) { - if (line->flags & ML_NOCLIMB) - P_TeleportMove(bot, mo->x, mo->y, mo->z); + if (line->args[0]) + P_SetOrigin(bot, mo->x, mo->y, mo->z); bot->momx = bot->momy = bot->momz = 1; bot->pmomz = 0; bot->player->rmomx = bot->player->rmomy = 1; @@ -2881,29 +2742,26 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) case 427: // Awards points if the mobj is a player if (mo && mo->player) - P_AddPlayerScore(mo->player, sides[line->sidenum[0]].textureoffset>>FRACBITS); + P_AddPlayerScore(mo->player, line->args[0]); break; case 428: // Start floating platform movement - EV_DoElevator(line, elevateContinuous, true); + EV_DoElevator(line->args[0], line, elevateContinuous); break; - case 429: // Crush Ceiling Down Once - EV_DoCrush(line, crushCeilOnce); + case 429: // Crush planes once + if (line->args[1] == TMP_FLOOR) + EV_DoFloor(line->args[0], line, crushFloorOnce); + else if (line->args[1] == TMP_CEILING) + EV_DoCrush(line->args[0], line, crushCeilOnce); + else + EV_DoCrush(line->args[0], line, crushBothOnce); break; - case 430: // Crush Floor Up Once - EV_DoFloor(line, crushFloorOnce); - break; - - case 431: // Crush Floor & Ceiling to middle Once - EV_DoCrush(line, crushBothOnce); - break; - - case 432: // Enable 2D Mode (Disable if noclimb) + case 432: // Enable/Disable 2D Mode if (mo && mo->player) { - if (line->flags & ML_NOCLIMB) + if (line->args[0]) mo->flags2 &= ~MF2_TWOD; else mo->flags2 |= MF2_TWOD; @@ -2912,16 +2770,20 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) // (Teleport them to you so they don't break it.) if (bot && (bot->flags2 & MF2_TWOD) != (mo->flags2 & MF2_TWOD)) { bot->flags2 = (bot->flags2 & ~MF2_TWOD) | (mo->flags2 & MF2_TWOD); - P_TeleportMove(bot, mo->x, mo->y, mo->z); + P_SetOrigin(bot, mo->x, mo->y, mo->z); } } break; - case 433: // Flip gravity (Flop gravity if noclimb) Works on pushables, too! - if (line->flags & ML_NOCLIMB) + case 433: // Flip/flop gravity. Works on pushables, too! + if (line->args[1]) + mo->flags2 ^= MF2_OBJECTFLIP; + else if (line->args[0]) mo->flags2 &= ~MF2_OBJECTFLIP; else mo->flags2 |= MF2_OBJECTFLIP; + if (line->args[2]) + mo->eflags |= MFE_VERTICALFLIP; if (bot) bot->flags2 = (bot->flags2 & ~MF2_OBJECTFLIP) | (mo->flags2 & MF2_OBJECTFLIP); break; @@ -2929,25 +2791,15 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) case 434: // Custom Power if (mo && mo->player) { - mobj_t *dummy = P_SpawnMobj(mo->x, mo->y, mo->z, MT_NULL); + powertype_t power = line->stringargs[0] ? get_number(line->stringargs[0]) : 0; + INT32 value = line->stringargs[1] ? get_number(line->stringargs[1]) : 0; + if (value == -1) // 'Infinite' + value = UINT16_MAX; - var1 = sides[line->sidenum[0]].toptexture; //(line->dx>>FRACBITS)-1; + P_SetPower(mo->player, power, value); - if (line->sidenum[1] != 0xffff && line->flags & ML_BLOCKMONSTERS) // read power from back sidedef - var2 = sides[line->sidenum[1]].toptexture; - else if (line->flags & ML_NOCLIMB) // 'Infinite' - var2 = UINT16_MAX; - else - var2 = sides[line->sidenum[0]].textureoffset>>FRACBITS; - - P_SetTarget(&dummy->target, mo); - A_CustomPower(dummy); - - if (bot) { - P_SetTarget(&dummy->target, bot); - A_CustomPower(dummy); - } - P_RemoveMobj(dummy); + if (bot) + P_SetPower(bot->player, power, value); } break; @@ -2956,25 +2808,30 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) scroll_t *scroller; thinker_t *th; + fixed_t length = R_PointToDist2(line->v2->x, line->v2->y, line->v1->x, line->v1->y); + fixed_t speed = line->args[1] << FRACBITS; + fixed_t dx = FixedMul(FixedMul(FixedDiv(line->dx, length), speed) >> SCROLL_SHIFT, CARRYFACTOR); + fixed_t dy = FixedMul(FixedMul(FixedDiv(line->dy, length), speed) >> SCROLL_SHIFT, CARRYFACTOR); + for (th = thlist[THINK_MAIN].next; th != &thlist[THINK_MAIN]; th = th->next) { if (th->function.acp1 != (actionf_p1)T_Scroll) continue; scroller = (scroll_t *)th; - if (!Tag_Find(§ors[scroller->affectee].tags, tag)) + if (!Tag_Find(§ors[scroller->affectee].tags, line->args[0])) continue; - scroller->dx = FixedMul(line->dx>>SCROLL_SHIFT, CARRYFACTOR); - scroller->dy = FixedMul(line->dy>>SCROLL_SHIFT, CARRYFACTOR); + scroller->dx = dx; + scroller->dy = dy; } } break; case 436: // Shatter block remotely { - INT16 sectag = (INT16)(sides[line->sidenum[0]].textureoffset>>FRACBITS); - INT16 foftag = (INT16)(sides[line->sidenum[0]].rowoffset>>FRACBITS); + INT16 sectag = (INT16)(line->args[0]); + INT16 foftag = (INT16)(line->args[1]); sector_t *sec; // Sector that the FOF is visible in ffloor_t *rover; // FOF that we are going to crumble boolean foundrover = false; // for debug, "Can't find a FOF" message @@ -3011,10 +2868,10 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) case 437: // Disable Player Controls if (mo && mo->player) { - UINT16 fractime = (UINT16)(sides[line->sidenum[0]].textureoffset>>FRACBITS); + UINT16 fractime = (UINT16)(line->args[0]); if (fractime < 1) fractime = 1; //instantly wears off upon leaving - if (line->flags & ML_NOCLIMB) + if (line->args[1]) fractime |= 1<<15; //more crazy &ing, as if music stuff wasn't enough mo->player->powers[pw_nocontrol] = fractime; if (bot) @@ -3025,7 +2882,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) case 438: // Set player scale if (mo) { - mo->destscale = FixedDiv(P_AproxDistance(line->dx, line->dy), 100<destscale = FixedDiv(line->args[0]<destscale < FRACUNIT/100) mo->destscale = FRACUNIT/100; if (mo->player && bot) @@ -3036,31 +2893,36 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) case 439: // Set texture { size_t linenum; - side_t *set = &sides[line->sidenum[0]], *this; - boolean always = !(line->flags & ML_NOCLIMB); // If noclimb: Only change mid texture if mid texture already exists on tagged lines, etc. + side_t *setfront = &sides[line->sidenum[0]]; + side_t *setback = (line->args[3] && line->sidenum[1] != 0xffff) ? &sides[line->sidenum[1]] : setfront; + side_t *this; + boolean always = !(line->args[2]); // If args[2] is set: Only change mid texture if mid texture already exists on tagged lines, etc. for (linenum = 0; linenum < numlines; linenum++) { if (lines[linenum].special == 439) continue; // Don't override other set texture lines! - if (!Tag_Find(&lines[linenum].tags, tag)) + if (!Tag_Find(&lines[linenum].tags, line->args[0])) continue; // Find tagged lines // Front side - this = &sides[lines[linenum].sidenum[0]]; - if (always || this->toptexture) this->toptexture = set->toptexture; - if (always || this->midtexture) this->midtexture = set->midtexture; - if (always || this->bottomtexture) this->bottomtexture = set->bottomtexture; - - if (lines[linenum].sidenum[1] == 0xffff) - continue; // One-sided stops here. + if (line->args[1] != TMSD_BACK) + { + this = &sides[lines[linenum].sidenum[0]]; + if (always || this->toptexture) this->toptexture = setfront->toptexture; + if (always || this->midtexture) this->midtexture = setfront->midtexture; + if (always || this->bottomtexture) this->bottomtexture = setfront->bottomtexture; + } // Back side - this = &sides[lines[linenum].sidenum[1]]; - if (always || this->toptexture) this->toptexture = set->toptexture; - if (always || this->midtexture) this->midtexture = set->midtexture; - if (always || this->bottomtexture) this->bottomtexture = set->bottomtexture; + if (line->args[1] != TMSD_FRONT && lines[linenum].sidenum[1] != 0xffff) + { + this = &sides[lines[linenum].sidenum[1]]; + if (always || this->toptexture) this->toptexture = setback->toptexture; + if (always || this->midtexture) this->midtexture = setback->midtexture; + if (always || this->bottomtexture) this->bottomtexture = setback->bottomtexture; + } } } break; @@ -3071,9 +2933,8 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) break; case 441: // Trigger unlockable - if ((!modifiedgame || savemoddata) && !(netgame || multiplayer)) { - INT32 trigid = (INT32)(sides[line->sidenum[0]].textureoffset>>FRACBITS); + INT32 trigid = line->args[0]; if (trigid < 0 || trigid > 31) // limited by 32 bit variable CONS_Debug(DBG_GAMELOGIC, "Unlockable trigger (sidedef %hu): bad trigger ID %d\n", line->sidenum[0], trigid); @@ -3082,10 +2943,12 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) unlocktriggers |= 1 << trigid; // Unlocked something? - if (M_UpdateUnlockablesAndExtraEmblems()) + M_SilentUpdateUnlockablesAndEmblems(serverGamedata); + + if (M_UpdateUnlockablesAndExtraEmblems(clientGamedata)) { S_StartSound(NULL, sfx_s3k68); - G_SaveGameData(); // only save if unlocked something + G_SaveGameData(clientGamedata); // only save if unlocked something } } } @@ -3096,37 +2959,37 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) case 442: // Calls P_SetMobjState on mobjs of a given type in the tagged sectors { - const mobjtype_t type = (mobjtype_t)sides[line->sidenum[0]].toptexture; + const mobjtype_t type = line->stringargs[0] ? get_number(line->stringargs[0]) : MT_NULL; statenum_t state = NUMSTATES; - sector_t *sec; mobj_t *thing; - if (line->sidenum[1] != 0xffff) - state = (statenum_t)sides[line->sidenum[1]].toptexture; + if (type < 0 || type >= NUMMOBJTYPES) + break; - TAG_ITER_SECTORS(tag, secnum) + if (!line->args[1]) + { + state = line->stringargs[1] ? get_number(line->stringargs[1]) : S_NULL; + + if (state < 0 || state >= NUMSTATES) + break; + } + + TAG_ITER_SECTORS(line->args[0], secnum) { boolean tryagain; - sec = sectors + secnum; do { tryagain = false; - for (thing = sec->thinglist; thing; thing = thing->snext) - if (thing->type == type) - { - if (state != NUMSTATES) - { - if (!P_SetMobjState(thing, state)) // set state to specific state - { // mobj was removed - tryagain = true; // snext is corrupt, we'll have to start over. - break; - } - } - else if (!P_SetMobjState(thing, thing->state->nextstate)) // set state to nextstate - { // mobj was removed - tryagain = true; // snext is corrupt, we'll have to start over. - break; - } + for (thing = sectors[secnum].thinglist; thing; thing = thing->snext) + { + if (thing->type != type) + continue; + + if (!P_SetMobjState(thing, line->args[1] ? thing->state->nextstate : state)) + { // mobj was removed + tryagain = true; // snext is corrupt, we'll have to start over. + break; } + } } while (tryagain); } break; @@ -3134,16 +2997,16 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) case 443: // Calls a named Lua function if (line->stringargs[0]) - LUAh_LinedefExecute(line, mo, callsec); + LUA_HookLinedefExecute(line, mo, callsec); else - CONS_Alert(CONS_WARNING, "Linedef %s is missing the hook name of the Lua function to call! (This should be given in arg0str)\n", sizeu1(line-lines)); + CONS_Alert(CONS_WARNING, "Linedef %s is missing the hook name of the Lua function to call! (This should be given in stringarg0)\n", sizeu1(line-lines)); break; case 444: // Earthquake camera { - quake.intensity = sides[line->sidenum[0]].textureoffset; - quake.radius = sides[line->sidenum[0]].rowoffset; - quake.time = P_AproxDistance(line->dx, line->dy)>>FRACBITS; + quake.intensity = line->args[1] << FRACBITS; + quake.radius = line->args[2] << FRACBITS; + quake.time = line->args[0]; quake.epicenter = NULL; /// \todo @@ -3155,10 +3018,10 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) break; } - case 445: // Force block disappear remotely (reappear if noclimb) + case 445: // Force block disappear remotely (reappear if args[2] is set) { - INT16 sectag = (INT16)(sides[line->sidenum[0]].textureoffset>>FRACBITS); - INT16 foftag = (INT16)(sides[line->sidenum[0]].rowoffset>>FRACBITS); + INT16 sectag = (INT16)(line->args[0]); + INT16 foftag = (INT16)(line->args[1]); sector_t *sec; // Sector that the FOF is visible (or not visible) in ffloor_t *rover; // FOF to vanish/un-vanish boolean foundrover = false; // for debug, "Can't find a FOF" message @@ -3180,16 +3043,16 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) { foundrover = true; - oldflags = rover->flags; + oldflags = rover->fofflags; // Abracadabra! - if (line->flags & ML_NOCLIMB) - rover->flags |= FF_EXISTS; + if (line->args[2]) + rover->fofflags |= FOF_EXISTS; else - rover->flags &= ~FF_EXISTS; + rover->fofflags &= ~FOF_EXISTS; // if flags changed, reset sector's light list - if (rover->flags != oldflags) + if (rover->fofflags != oldflags) { sec->moved = true; P_RecalcPrecipInSector(sec); @@ -3206,10 +3069,10 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) } break; - case 446: // Make block fall remotely (acts like FF_CRUMBLE) + case 446: // Make block fall remotely (acts like FOF_CRUMBLE) { - INT16 sectag = (INT16)(sides[line->sidenum[0]].textureoffset>>FRACBITS); - INT16 foftag = (INT16)(sides[line->sidenum[0]].rowoffset>>FRACBITS); + INT16 sectag = (INT16)(line->args[0]); + INT16 foftag = (INT16)(line->args[1]); sector_t *sec; // Sector that the FOF is visible in ffloor_t *rover; // FOF that we are going to make fall down boolean foundrover = false; // for debug, "Can't find a FOF" message @@ -3219,7 +3082,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) if (mo) // NULL check player = mo->player; - if (line->flags & ML_NOCLIMB) // don't respawn! + if (line->args[2] & TMFR_NORETURN) // don't respawn! respawn = false; TAG_ITER_SECTORS(sectag, secnum) @@ -3238,10 +3101,10 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) { foundrover = true; - if (line->flags & ML_BLOCKMONSTERS) // FOF flags determine respawn ability instead? - respawn = !(rover->flags & FF_NORETURN) ^ !!(line->flags & ML_NOCLIMB); // no climb inverts + if (line->args[2] & TMFR_CHECKFLAG) // FOF flags determine respawn ability instead? + respawn = !(rover->fofflags & FOF_NORETURN) ^ !!(line->args[2] & TMFR_NORETURN); // TMFR_NORETURN inverts - EV_StartCrumble(rover->master->frontsector, rover, (rover->flags & FF_FLOATBOB), player, rover->alpha, respawn); + EV_StartCrumble(rover->master->frontsector, rover, (rover->fofflags & FOF_FLOATBOB), player, rover->alpha, respawn); } } @@ -3321,57 +3184,48 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) break; } case 448: // Change skybox viewpoint/centerpoint - if ((mo && mo->player && P_IsLocalPlayer(mo->player)) || (line->flags & ML_NOCLIMB)) + if ((mo && mo->player && P_IsLocalPlayer(mo->player)) || line->args[3]) { - INT32 viewid = sides[line->sidenum[0]].textureoffset>>FRACBITS; - INT32 centerid = sides[line->sidenum[0]].rowoffset>>FRACBITS; + INT32 viewid = line->args[0]; + INT32 centerid = line->args[1]; - if ((line->flags & (ML_EFFECT4|ML_BLOCKMONSTERS)) == ML_EFFECT4) // Solid Midtexture is on but Block Enemies is off? + // set viewpoint mobj + if (line->args[2] != TMS_CENTERPOINT) { - CONS_Alert(CONS_WARNING, - M_GetText("Skybox switch linedef (tag %d) doesn't have anything to do.\nConsider changing the linedef's flag configuration or removing it entirely.\n"), - tag); + if (viewid >= 0 && viewid < 16) + skyboxmo[0] = skyboxviewpnts[viewid]; + else + skyboxmo[0] = NULL; } - else - { - // set viewpoint mobj - if (!(line->flags & ML_EFFECT4)) // Solid Midtexture turns off viewpoint setting - { - if (viewid >= 0 && viewid < 16) - skyboxmo[0] = skyboxviewpnts[viewid]; - else - skyboxmo[0] = NULL; - } - // set centerpoint mobj - if (line->flags & ML_BLOCKMONSTERS) // Block Enemies turns ON centerpoint setting - { - if (centerid >= 0 && centerid < 16) - skyboxmo[1] = skyboxcenterpnts[centerid]; - else - skyboxmo[1] = NULL; - } + // set centerpoint mobj + if (line->args[2] != TMS_VIEWPOINT) + { + if (centerid >= 0 && centerid < 16) + skyboxmo[1] = skyboxcenterpnts[centerid]; + else + skyboxmo[1] = NULL; } CONS_Debug(DBG_GAMELOGIC, "Line type 448 Executor: viewid = %d, centerid = %d, viewpoint? = %s, centerpoint? = %s\n", viewid, centerid, - ((line->flags & ML_EFFECT4) ? "no" : "yes"), - ((line->flags & ML_BLOCKMONSTERS) ? "yes" : "no")); + ((line->args[2] == TMS_CENTERPOINT) ? "no" : "yes"), + ((line->args[2] == TMS_VIEWPOINT) ? "no" : "yes")); } break; case 449: // Enable bosses with parameter { - INT32 bossid = sides[line->sidenum[0]].textureoffset>>FRACBITS; + INT32 bossid = line->args[0]; if (bossid & ~15) // if any bits other than first 16 are set { CONS_Alert(CONS_WARNING, - M_GetText("Boss enable linedef (tag %d) has an invalid texture x offset.\nConsider changing it or removing it entirely.\n"), - tag); + M_GetText("Boss enable linedef has an invalid boss ID (%d).\nConsider changing it or removing it entirely.\n"), + bossid); break; } - if (line->flags & ML_NOCLIMB) + if (line->args[1]) { bossdisabled |= (1<args[0], mo, NULL); break; case 451: // Execute Random Linedef Executor { - INT32 rvalue1 = sides[line->sidenum[0]].textureoffset>>FRACBITS; - INT32 rvalue2 = sides[line->sidenum[0]].rowoffset>>FRACBITS; + INT32 rvalue1 = line->args[0]; + INT32 rvalue2 = line->args[1]; INT32 result; if (rvalue1 <= rvalue2) @@ -3405,10 +3259,9 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) case 452: // Set FOF alpha { - INT16 destvalue = line->sidenum[1] != 0xffff ? - (INT16)(sides[line->sidenum[1]].textureoffset>>FRACBITS) : (INT16)(P_AproxDistance(line->dx, line->dy)>>FRACBITS); - INT16 sectag = (INT16)(sides[line->sidenum[0]].textureoffset>>FRACBITS); - INT16 foftag = (INT16)(sides[line->sidenum[0]].rowoffset>>FRACBITS); + INT16 destvalue = (INT16)(line->args[2]); + INT16 sectag = (INT16)(line->args[0]); + INT16 foftag = (INT16)(line->args[1]); sector_t *sec; // Sector that the FOF is visible in ffloor_t *rover; // FOF that we are going to operate boolean foundrover = false; // for debug, "Can't find a FOF" message @@ -3432,26 +3285,26 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) // If fading an invisible FOF whose render flags we did not yet set, // initialize its alpha to 1 // for relative alpha calc - if (!(line->flags & ML_NOCLIMB) && // do translucent - (rover->spawnflags & FF_NOSHADE) && // do not include light blocks, which don't set FF_NOSHADE - !(rover->spawnflags & FF_RENDERSIDES) && - !(rover->spawnflags & FF_RENDERPLANES) && - !(rover->flags & FF_RENDERALL)) + if (!(line->args[3] & TMST_DONTDOTRANSLUCENT) && // do translucent + (rover->spawnflags & FOF_NOSHADE) && // do not include light blocks, which don't set FOF_NOSHADE + !(rover->spawnflags & FOF_RENDERSIDES) && + !(rover->spawnflags & FOF_RENDERPLANES) && + !(rover->fofflags & FOF_RENDERALL)) rover->alpha = 1; P_RemoveFakeFloorFader(rover); P_FadeFakeFloor(rover, rover->alpha, - max(1, min(256, (line->flags & ML_EFFECT3) ? rover->alpha + destvalue : destvalue)), - 0, // set alpha immediately - false, NULL, // tic-based logic - false, // do not handle FF_EXISTS - !(line->flags & ML_NOCLIMB), // handle FF_TRANSLUCENT - false, // do not handle lighting - false, // do not handle colormap - false, // do not handle collision - false, // do not do ghost fade (no collision during fade) - true); // use exact alpha values (for opengl) + max(1, min(256, (line->args[3] & TMST_RELATIVE) ? rover->alpha + destvalue : destvalue)), + 0, // set alpha immediately + false, NULL, // tic-based logic + false, // do not handle FOF_EXISTS + !(line->args[3] & TMST_DONTDOTRANSLUCENT), // handle FOF_TRANSLUCENT + false, // do not handle lighting + false, // do not handle colormap + false, // do not handle collision + false, // do not do ghost fade (no collision during fade) + true); // use exact alpha values (for opengl) } } @@ -3466,12 +3319,10 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) case 453: // Fade FOF { - INT16 destvalue = line->sidenum[1] != 0xffff ? - (INT16)(sides[line->sidenum[1]].textureoffset>>FRACBITS) : (INT16)(line->dx>>FRACBITS); - INT16 speed = line->sidenum[1] != 0xffff ? - (INT16)(abs(sides[line->sidenum[1]].rowoffset>>FRACBITS)) : (INT16)(abs(line->dy)>>FRACBITS); - INT16 sectag = (INT16)(sides[line->sidenum[0]].textureoffset>>FRACBITS); - INT16 foftag = (INT16)(sides[line->sidenum[0]].rowoffset>>FRACBITS); + INT16 destvalue = (INT16)(line->args[2]); + INT16 speed = (INT16)(line->args[3]); + INT16 sectag = (INT16)(line->args[0]); + INT16 foftag = (INT16)(line->args[1]); sector_t *sec; // Sector that the FOF is visible in ffloor_t *rover; // FOF that we are going to operate boolean foundrover = false; // for debug, "Can't find a FOF" message @@ -3494,7 +3345,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) foundrover = true; // Prevent continuous execs from interfering on an existing fade - if (!(line->flags & ML_EFFECT5) + if (!(line->args[4] & TMFT_OVERRIDE) && rover->fadingdata) //&& ((fade_t*)rover->fadingdata)->timer > (ticbased ? 2 : speed*2)) { @@ -3506,40 +3357,40 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) P_AddFakeFloorFader(rover, secnum, j, destvalue, speed, - (line->flags & ML_EFFECT4), // tic-based logic - (line->flags & ML_EFFECT3), // Relative destvalue - !(line->flags & ML_BLOCKMONSTERS), // do not handle FF_EXISTS - !(line->flags & ML_NOCLIMB), // do not handle FF_TRANSLUCENT - !(line->flags & ML_EFFECT2), // do not handle lighting - !(line->flags & ML_EFFECT2), // do not handle colormap (ran out of flags) - !(line->flags & ML_BOUNCY), // do not handle collision - (line->flags & ML_EFFECT1), // do ghost fade (no collision during fade) - (line->flags & ML_TFERLINE)); // use exact alpha values (for opengl) + (line->args[4] & TMFT_TICBASED), // tic-based logic + (line->args[4] & TMFT_RELATIVE), // Relative destvalue + !(line->args[4] & TMFT_DONTDOEXISTS), // do not handle FOF_EXISTS + !(line->args[4] & TMFT_DONTDOTRANSLUCENT), // do not handle FOF_TRANSLUCENT + !(line->args[4] & TMFT_DONTDOLIGHTING), // do not handle lighting + !(line->args[4] & TMFT_DONTDOCOLORMAP), // do not handle colormap + !(line->args[4] & TMFT_IGNORECOLLISION), // do not handle collision + (line->args[4] & TMFT_GHOSTFADE), // do ghost fade (no collision during fade) + (line->args[4] & TMFT_USEEXACTALPHA)); // use exact alpha values (for opengl) else { // If fading an invisible FOF whose render flags we did not yet set, // initialize its alpha to 1 // for relative alpha calc - if (!(line->flags & ML_NOCLIMB) && // do translucent - (rover->spawnflags & FF_NOSHADE) && // do not include light blocks, which don't set FF_NOSHADE - !(rover->spawnflags & FF_RENDERSIDES) && - !(rover->spawnflags & FF_RENDERPLANES) && - !(rover->flags & FF_RENDERALL)) + if (!(line->args[4] & TMFT_DONTDOTRANSLUCENT) && // do translucent + (rover->spawnflags & FOF_NOSHADE) && // do not include light blocks, which don't set FOF_NOSHADE + !(rover->spawnflags & FOF_RENDERSIDES) && + !(rover->spawnflags & FOF_RENDERPLANES) && + !(rover->fofflags & FOF_RENDERALL)) rover->alpha = 1; P_RemoveFakeFloorFader(rover); P_FadeFakeFloor(rover, rover->alpha, - max(1, min(256, (line->flags & ML_EFFECT3) ? rover->alpha + destvalue : destvalue)), - 0, // set alpha immediately - false, NULL, // tic-based logic - !(line->flags & ML_BLOCKMONSTERS), // do not handle FF_EXISTS - !(line->flags & ML_NOCLIMB), // do not handle FF_TRANSLUCENT - !(line->flags & ML_EFFECT2), // do not handle lighting - !(line->flags & ML_EFFECT2), // do not handle colormap (ran out of flags) - !(line->flags & ML_BOUNCY), // do not handle collision - (line->flags & ML_EFFECT1), // do ghost fade (no collision during fade) - (line->flags & ML_TFERLINE)); // use exact alpha values (for opengl) + max(1, min(256, (line->args[4] & TMFT_RELATIVE) ? rover->alpha + destvalue : destvalue)), + 0, // set alpha immediately + false, NULL, // tic-based logic + !(line->args[4] & TMFT_DONTDOEXISTS), // do not handle FOF_EXISTS + !(line->args[4] & TMFT_DONTDOTRANSLUCENT), // do not handle FOF_TRANSLUCENT + !(line->args[4] & TMFT_DONTDOLIGHTING), // do not handle lighting + !(line->args[4] & TMFT_DONTDOCOLORMAP), // do not handle colormap + !(line->args[4] & TMFT_IGNORECOLLISION), // do not handle collision + (line->args[4] & TMFT_GHOSTFADE), // do ghost fade (no collision during fade) + (line->args[4] & TMFT_USEEXACTALPHA)); // use exact alpha values (for opengl) } } j++; @@ -3556,8 +3407,8 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) case 454: // Stop fading FOF { - INT16 sectag = (INT16)(sides[line->sidenum[0]].textureoffset>>FRACBITS); - INT16 foftag = (INT16)(sides[line->sidenum[0]].rowoffset>>FRACBITS); + INT16 sectag = (INT16)(line->args[0]); + INT16 foftag = (INT16)(line->args[1]); sector_t *sec; // Sector that the FOF is visible in ffloor_t *rover; // FOF that we are going to operate boolean foundrover = false; // for debug, "Can't find a FOF" message @@ -3579,7 +3430,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) foundrover = true; P_ResetFakeFloorFader(rover, NULL, - !(line->flags & ML_BLOCKMONSTERS)); // do not finalize collision flags + !(line->args[2])); // do not finalize collision flags } } @@ -3700,17 +3551,13 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) case 457: // Track mobj angle to point if (mo) { - INT32 failureangle = FixedAngle((min(max(abs(sides[line->sidenum[0]].textureoffset>>FRACBITS), 0), 360))*FRACUNIT); - INT32 failuredelay = abs(sides[line->sidenum[0]].rowoffset>>FRACBITS); - INT32 failureexectag = line->sidenum[1] != 0xffff ? - (INT32)(sides[line->sidenum[1]].textureoffset>>FRACBITS) : 0; - boolean persist = (line->flags & ML_EFFECT2); + INT32 failureangle = FixedAngle((min(max(abs(line->args[1]), 0), 360))*FRACUNIT); + INT32 failuredelay = abs(line->args[2]); + INT32 failureexectag = line->args[3]; + boolean persist = !!(line->args[4]); mobj_t *anchormo; - if ((secnum = Tag_Iterate_Sectors(tag, 0)) < 0) - return; - - anchormo = P_GetObjectTypeInSectorNum(MT_ANGLEMAN, secnum); + anchormo = P_FindObjectTypeFromTag(MT_ANGLEMAN, line->args[0]); if (!anchormo) return; @@ -3733,27 +3580,27 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) break; case 459: // Control Text Prompt - // console player only unless NOCLIMB is set + // console player only if (mo && mo->player && P_IsLocalPlayer(mo->player) && (!bot || bot != mo)) { - INT32 promptnum = max(0, (sides[line->sidenum[0]].textureoffset>>FRACBITS)-1); - INT32 pagenum = max(0, (sides[line->sidenum[0]].rowoffset>>FRACBITS)-1); - INT32 postexectag = abs((line->sidenum[1] != 0xFFFF) ? sides[line->sidenum[1]].textureoffset>>FRACBITS : tag); + INT32 promptnum = max(0, line->args[0] - 1); + INT32 pagenum = max(0, line->args[1] - 1); + INT32 postexectag = abs(line->args[3]); - boolean closetextprompt = (line->flags & ML_BLOCKMONSTERS); - //boolean allplayers = (line->flags & ML_NOCLIMB); - boolean runpostexec = (line->flags & ML_EFFECT1); - boolean blockcontrols = !(line->flags & ML_EFFECT2); - boolean freezerealtime = !(line->flags & ML_EFFECT3); - //boolean freezethinkers = (line->flags & ML_EFFECT4); - boolean callbynamedtag = (line->flags & ML_TFERLINE); + boolean closetextprompt = (line->args[2] & TMP_CLOSE); + //boolean allplayers = (line->args[2] & TMP_ALLPLAYERS); + boolean runpostexec = (line->args[2] & TMP_RUNPOSTEXEC); + boolean blockcontrols = !(line->args[2] & TMP_KEEPCONTROLS); + boolean freezerealtime = !(line->args[2] & TMP_KEEPREALTIME); + //boolean freezethinkers = (line->args[2] & TMP_FREEZETHINKERS); + boolean callbynamedtag = (line->args[2] & TMP_CALLBYNAME); if (closetextprompt) F_EndTextPrompt(false, false); else { - if (callbynamedtag && sides[line->sidenum[0]].text && sides[line->sidenum[0]].text[0]) - F_GetPromptPageByNamedTag(sides[line->sidenum[0]].text, &promptnum, &pagenum); + if (callbynamedtag && line->stringargs[0] && line->stringargs[0][0]) + F_GetPromptPageByNamedTag(line->stringargs[0], &promptnum, &pagenum); F_StartTextPrompt(promptnum, pagenum, mo, runpostexec ? postexectag : 0, blockcontrols, freezerealtime); } } @@ -3761,8 +3608,8 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) case 460: // Award rings { - INT16 rings = (sides[line->sidenum[0]].textureoffset>>FRACBITS); - INT32 delay = (sides[line->sidenum[0]].rowoffset>>FRACBITS); + INT16 rings = line->args[0]; + INT32 delay = line->args[1]; if (mo && mo->player) { if (delay <= 0 || !(leveltime % delay)) @@ -3773,34 +3620,28 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) case 461: // Spawns an object on the map based on texture offsets { - const mobjtype_t type = (mobjtype_t)(sides[line->sidenum[0]].toptexture); + const mobjtype_t type = line->stringargs[0] ? get_number(line->stringargs[0]) : MT_NULL; mobj_t *mobj; fixed_t x, y, z; - x = sides[line->sidenum[0]].textureoffset; - y = sides[line->sidenum[0]].rowoffset; - z = line->frontsector->floorheight; - if (line->flags & ML_NOCLIMB) // If noclimb is set, spawn randomly within a range + if (line->args[4]) // If args[4] is set, spawn randomly within a range { - if (line->sidenum[1] != 0xffff) // Make sure the linedef has a back side - { - x = P_RandomRange(sides[line->sidenum[0]].textureoffset>>FRACBITS, sides[line->sidenum[1]].textureoffset>>FRACBITS)<sidenum[0]].rowoffset>>FRACBITS, sides[line->sidenum[1]].rowoffset>>FRACBITS)<frontsector->floorheight>>FRACBITS, line->frontsector->ceilingheight>>FRACBITS)<special); - break; - } + x = P_RandomRange(line->args[0], line->args[5])<args[1], line->args[6])<args[2], line->args[7])<args[0] << FRACBITS; + y = line->args[1] << FRACBITS; + z = line->args[2] << FRACBITS; } mobj = P_SpawnMobj(x, y, z, type); if (mobj) { - if (line->flags & ML_EFFECT1) - mobj->angle = R_PointToAngle2(line->v1->x, line->v1->y, line->v2->x, line->v2->y); + mobj->angle = FixedAngle(line->args[3] << FRACBITS); CONS_Debug(DBG_GAMELOGIC, "Linedef Type %d - Spawn Object: %d spawned at (%d, %d, %d)\n", line->special, mobj->type, mobj->x>>FRACBITS, mobj->y>>FRACBITS, mobj->z>>FRACBITS); //TODO: Convert mobj->type to a string somehow. } else @@ -3828,10 +3669,10 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) case 463: // Dye object { - INT32 color = sides[line->sidenum[0]].toptexture; - if (mo) { + INT32 color = line->stringargs[0] ? get_number(line->stringargs[0]) : SKINCOLOR_NONE; + if (color < 0 || color >= numskincolors) return; @@ -3844,31 +3685,28 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) case 464: // Trigger Egg Capsule { - thinker_t *th; + INT32 mtnum; mobj_t *mo2; // Find the center of the Eggtrap and release all the pretty animals! // The chimps are my friends.. heeheeheheehehee..... - LouisJM - for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next) + TAG_ITER_THINGS(line->args[0], mtnum) { - if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed) - continue; + mo2 = mapthings[mtnum].mobj; - mo2 = (mobj_t *)th; + if (!mo2) + continue; if (mo2->type != MT_EGGTRAP) continue; - if (!mo2->spawnpoint) - continue; - - if (mo2->spawnpoint->angle != tag) + if (mo2->thinker.function.acp1 == (actionf_p1)P_RemoveThinkerDelayed) continue; P_KillMobj(mo2, NULL, mo, 0); } - if (!(line->flags & ML_NOCLIMB)) + if (!(line->args[1])) { INT32 i; @@ -3902,7 +3740,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) case 466: // Set level failure state { - if (line->flags & ML_NOCLIMB) + if (line->args[1]) { stagefailed = false; CONS_Debug(DBG_GAMELOGIC, "Stage can be completed successfully!\n"); @@ -3915,28 +3753,109 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) } break; + case 467: // Set light level + TAG_ITER_SECTORS(line->args[0], secnum) + { + if (sectors[secnum].lightingdata) + { + // Stop any lighting effects going on in the sector + P_RemoveThinker(&((thinkerdata_t *)sectors[secnum].lightingdata)->thinker); + sectors[secnum].lightingdata = NULL; + } + + if (line->args[2] == TML_FLOOR) + { + if (line->args[3]) + sectors[secnum].floorlightlevel += line->args[1]; + else + sectors[secnum].floorlightlevel = line->args[1]; + } + else if (line->args[2] == TML_CEILING) + { + if (line->args[3]) + sectors[secnum].ceilinglightlevel += line->args[1]; + else + sectors[secnum].ceilinglightlevel = line->args[1]; + } + else + { + if (line->args[3]) + sectors[secnum].lightlevel += line->args[1]; + else + sectors[secnum].lightlevel = line->args[1]; + sectors[secnum].lightlevel = max(0, min(255, sectors[secnum].lightlevel)); + } + } + break; + + case 468: // Change linedef executor argument + { + INT32 linenum; + + if (!udmf) + break; + + if (line->args[1] < 0 || line->args[1] >= NUMLINEARGS) + { + CONS_Debug(DBG_GAMELOGIC, "Linedef type 468: Invalid linedef arg %d\n", line->args[1]); + break; + } + + TAG_ITER_LINES(line->args[0], linenum) + { + if (line->args[3]) + lines[linenum].args[line->args[1]] += line->args[2]; + else + lines[linenum].args[line->args[1]] = line->args[2]; + } + } + break; + + case 469: // Change sector gravity + { + fixed_t gravityvalue; + + if (!udmf) + break; + + if (!line->stringargs[0]) + break; + + gravityvalue = FloatToFixed(atof(line->stringargs[0])); + + TAG_ITER_SECTORS(line->args[0], secnum) + { + if (line->args[1]) + sectors[secnum].gravity = FixedMul(sectors[secnum].gravity, gravityvalue); + else + sectors[secnum].gravity = gravityvalue; + + if (line->args[2] == TMF_ADD) + sectors[secnum].flags |= MSF_GRAVITYFLIP; + else if (line->args[2] == TMF_REMOVE) + sectors[secnum].flags &= ~MSF_GRAVITYFLIP; + + if (line->args[3]) + sectors[secnum].specialflags |= SSF_GRAVITYOVERRIDE; + } + } + break; + case 480: // Polyobj_DoorSlide case 481: // Polyobj_DoorSwing PolyDoor(line); break; case 482: // Polyobj_Move - case 483: // Polyobj_OR_Move PolyMove(line); break; case 484: // Polyobj_RotateRight - case 485: // Polyobj_OR_RotateRight - case 486: // Polyobj_RotateLeft - case 487: // Polyobj_OR_RotateLeft PolyRotate(line); break; case 488: // Polyobj_Waypoint PolyWaypoint(line); break; case 489: - PolyInvisible(line); - break; - case 490: - PolyVisible(line); + PolySetVisibilityTangibility(line); break; case 491: PolyTranslucency(line); @@ -4027,7 +3946,7 @@ boolean P_IsFlagAtBase(mobjtype_t flag) { thinker_t *think; mobj_t *mo; - INT32 specialnum = (flag == MT_REDFLAG) ? 3 : 4; + sectorspecialflags_t specialflag = (flag == MT_REDFLAG) ? SSF_REDTEAMBASE : SSF_BLUETEAMBASE; for (think = thlist[THINK_MOBJ].next; think != &thlist[THINK_MOBJ]; think = think->next) { @@ -4039,7 +3958,7 @@ boolean P_IsFlagAtBase(mobjtype_t flag) if (mo->type != flag) continue; - if (GETSECSPECIAL(mo->subsector->sector->special, 4) == specialnum) + if (mo->subsector->sector->specialflags & specialflag) return true; else if (mo->subsector->sector->ffloors) // Check the 3D floors { @@ -4047,10 +3966,10 @@ boolean P_IsFlagAtBase(mobjtype_t flag) for (rover = mo->subsector->sector->ffloors; rover; rover = rover->next) { - if (!(rover->flags & FF_EXISTS)) + if (!(rover->fofflags & FOF_EXISTS)) continue; - if (GETSECSPECIAL(rover->master->frontsector->special, 4) != specialnum) + if (!(rover->master->frontsector->specialflags & specialflag)) continue; if (!(mo->z <= P_GetSpecialTopZ(mo, sectors + rover->secnum, mo->subsector->sector) @@ -4064,6 +3983,258 @@ boolean P_IsFlagAtBase(mobjtype_t flag) return false; } +static boolean P_IsMobjTouchingPlane(mobj_t *mo, sector_t *sec, fixed_t floorz, fixed_t ceilingz) +{ + boolean floorallowed = ((sec->flags & MSF_FLIPSPECIAL_FLOOR) && ((sec->flags & MSF_TRIGGERSPECIAL_HEADBUMP) || !(mo->eflags & MFE_VERTICALFLIP)) && (mo->z == floorz)); + boolean ceilingallowed = ((sec->flags & MSF_FLIPSPECIAL_CEILING) && ((sec->flags & MSF_TRIGGERSPECIAL_HEADBUMP) || (mo->eflags & MFE_VERTICALFLIP)) && (mo->z + mo->height == ceilingz)); + return (floorallowed || ceilingallowed); +} + +boolean P_IsMobjTouchingSectorPlane(mobj_t *mo, sector_t *sec) +{ + return P_IsMobjTouchingPlane(mo, sec, P_GetSpecialBottomZ(mo, sec, sec), P_GetSpecialTopZ(mo, sec, sec)); +} + +boolean P_IsMobjTouching3DFloor(mobj_t *mo, ffloor_t *ffloor, sector_t *sec) +{ + fixed_t topheight = P_GetSpecialTopZ(mo, sectors + ffloor->secnum, sec); + fixed_t bottomheight = P_GetSpecialBottomZ(mo, sectors + ffloor->secnum, sec); + + if (((ffloor->fofflags & FOF_BLOCKPLAYER) && mo->player) + || ((ffloor->fofflags & FOF_BLOCKOTHERS) && !mo->player)) + { + // Solid 3D floor: Mobj must touch the top or bottom + return P_IsMobjTouchingPlane(mo, ffloor->master->frontsector, topheight, bottomheight); + } + else + { + // Water or intangible 3D floor: Mobj must be inside + return mo->z <= topheight && (mo->z + mo->height) >= bottomheight; + } +} + +boolean P_IsMobjTouchingPolyobj(mobj_t *mo, polyobj_t *po, sector_t *polysec) +{ + if (!(po->flags & POF_TESTHEIGHT)) // Don't do height checking + return true; + + if (po->flags & POF_SOLID) + { + // Solid polyobject: Player must touch the top or bottom + return P_IsMobjTouchingPlane(mo, polysec, polysec->ceilingheight, polysec->floorheight); + } + else + { + // Water or intangible polyobject: Player must be inside + return mo->z <= polysec->ceilingheight && (mo->z + mo->height) >= polysec->floorheight; + } +} + +static sector_t *P_MobjTouching3DFloorSpecial(mobj_t *mo, sector_t *sector, INT32 section, INT32 number) +{ + ffloor_t *rover; + + for (rover = sector->ffloors; rover; rover = rover->next) + { + if (GETSECSPECIAL(rover->master->frontsector->special, section) != number) + continue; + + if (!(rover->fofflags & FOF_EXISTS)) + continue; + + if (!P_IsMobjTouching3DFloor(mo, rover, sector)) + continue; + + // This FOF has the special we're looking for, but are we allowed to touch it? + if (sector == mo->subsector->sector + || (rover->master->frontsector->flags & MSF_TRIGGERSPECIAL_TOUCH)) + return rover->master->frontsector; + } + + return NULL; +} + +static sector_t *P_MobjTouching3DFloorSpecialFlag(mobj_t *mo, sector_t *sector, sectorspecialflags_t flag) +{ + ffloor_t *rover; + + for (rover = sector->ffloors; rover; rover = rover->next) + { + if (!(rover->master->frontsector->specialflags & flag)) + continue; + + if (!(rover->fofflags & FOF_EXISTS)) + continue; + + if (!P_IsMobjTouching3DFloor(mo, rover, sector)) + continue; + + // This FOF has the special we're looking for, but are we allowed to touch it? + if (sector == mo->subsector->sector + || (rover->master->frontsector->flags & MSF_TRIGGERSPECIAL_TOUCH)) + return rover->master->frontsector; + } + + return NULL; +} + +static sector_t *P_MobjTouchingPolyobjSpecial(mobj_t *mo, INT32 section, INT32 number) +{ + polyobj_t *po; + sector_t *polysec; + boolean touching = false; + boolean inside = false; + + for (po = mo->subsector->polyList; po; po = (polyobj_t *)(po->link.next)) + { + if (po->flags & POF_NOSPECIALS) + continue; + + polysec = po->lines[0]->backsector; + + if (GETSECSPECIAL(polysec->special, section) != number) + continue; + + touching = (polysec->flags & MSF_TRIGGERSPECIAL_TOUCH) && P_MobjTouchingPolyobj(po, mo); + inside = P_MobjInsidePolyobj(po, mo); + + if (!(inside || touching)) + continue; + + if (!P_IsMobjTouchingPolyobj(mo, po, polysec)) + continue; + + return polysec; + } + + return NULL; +} + +static sector_t *P_MobjTouchingPolyobjSpecialFlag(mobj_t *mo, sectorspecialflags_t flag) +{ + polyobj_t *po; + sector_t *polysec; + boolean touching = false; + boolean inside = false; + + for (po = mo->subsector->polyList; po; po = (polyobj_t *)(po->link.next)) + { + if (po->flags & POF_NOSPECIALS) + continue; + + polysec = po->lines[0]->backsector; + + if (!(polysec->specialflags & flag)) + continue; + + touching = (polysec->flags & MSF_TRIGGERSPECIAL_TOUCH) && P_MobjTouchingPolyobj(po, mo); + inside = P_MobjInsidePolyobj(po, mo); + + if (!(inside || touching)) + continue; + + if (!P_IsMobjTouchingPolyobj(mo, po, polysec)) + continue; + + return polysec; + } + + return NULL; +} + +sector_t *P_MobjTouchingSectorSpecial(mobj_t *mo, INT32 section, INT32 number) +{ + msecnode_t *node; + sector_t *result; + + result = P_MobjTouching3DFloorSpecial(mo, mo->subsector->sector, section, number); + if (result) + return result; + + result = P_MobjTouchingPolyobjSpecial(mo, section, number); + if (result) + return result; + + if (GETSECSPECIAL(mo->subsector->sector->special, section) == number) + return mo->subsector->sector; + + for (node = mo->touching_sectorlist; node; node = node->m_sectorlist_next) + { + if (node->m_sector == mo->subsector->sector) // Don't duplicate + continue; + + result = P_MobjTouching3DFloorSpecial(mo, node->m_sector, section, number); + if (result) + return result; + + if (!(node->m_sector->flags & MSF_TRIGGERSPECIAL_TOUCH)) + continue; + + if (GETSECSPECIAL(node->m_sector->special, section) == number) + return node->m_sector; + } + + return NULL; +} + +// Deprecated in favor of P_MobjTouchingSectorSpecial +// Kept for Lua backwards compatibility only +sector_t *P_ThingOnSpecial3DFloor(mobj_t *mo) +{ + ffloor_t *rover; + + for (rover = mo->subsector->sector->ffloors; rover; rover = rover->next) + { + if (!rover->master->frontsector->special) + continue; + + if (!(rover->fofflags & FOF_EXISTS)) + continue; + + if (!P_IsMobjTouching3DFloor(mo, rover, mo->subsector->sector)) + continue; + + return rover->master->frontsector; + } + + return NULL; +} + +sector_t *P_MobjTouchingSectorSpecialFlag(mobj_t *mo, sectorspecialflags_t flag) +{ + msecnode_t *node; + sector_t *result; + + result = P_MobjTouching3DFloorSpecialFlag(mo, mo->subsector->sector, flag); + if (result) + return result; + + result = P_MobjTouchingPolyobjSpecialFlag(mo, flag); + if (result) + return result; + + if (mo->subsector->sector->specialflags & flag) + return mo->subsector->sector; + + for (node = mo->touching_sectorlist; node; node = node->m_sectorlist_next) + { + if (node->m_sector == mo->subsector->sector) // Don't duplicate + continue; + + result = P_MobjTouching3DFloorSpecialFlag(mo, node->m_sector, flag); + if (result) + return result; + + if (!(node->m_sector->flags & MSF_TRIGGERSPECIAL_TOUCH)) + continue; + + if (node->m_sector->specialflags & flag) + return node->m_sector; + } + + return NULL; +} + // // P_PlayerTouchingSectorSpecial // @@ -4077,163 +4248,898 @@ boolean P_IsFlagAtBase(mobjtype_t flag) // sector_t *P_PlayerTouchingSectorSpecial(player_t *player, INT32 section, INT32 number) { - msecnode_t *node; - ffloor_t *rover; - if (!player->mo) return NULL; - // Check default case first - if (GETSECSPECIAL(player->mo->subsector->sector->special, section) == number) - return player->mo->subsector->sector; + return P_MobjTouchingSectorSpecial(player->mo, section, number); +} - // Hmm.. maybe there's a FOF that has it... - for (rover = player->mo->subsector->sector->ffloors; rover; rover = rover->next) +sector_t *P_PlayerTouchingSectorSpecialFlag(player_t *player, sectorspecialflags_t flag) +{ + if (!player->mo) + return NULL; + + return P_MobjTouchingSectorSpecialFlag(player->mo, flag); +} + +static sector_t *P_CheckPlayer3DFloorTrigger(player_t *player, sector_t *sector, line_t *sourceline) +{ + ffloor_t *rover; + + for (rover = sector->ffloors; rover; rover = rover->next) { - fixed_t topheight, bottomheight; - - if (GETSECSPECIAL(rover->master->frontsector->special, section) != number) + if (!rover->master->frontsector->triggertag) continue; - if (!(rover->flags & FF_EXISTS)) + if (rover->master->frontsector->triggerer == TO_MOBJ) continue; - topheight = P_GetSpecialTopZ(player->mo, sectors + rover->secnum, player->mo->subsector->sector); - bottomheight = P_GetSpecialBottomZ(player->mo, sectors + rover->secnum, player->mo->subsector->sector); + if (!(rover->fofflags & FOF_EXISTS)) + continue; - // Check the 3D floor's type... - if (rover->flags & FF_BLOCKPLAYER) - { - boolean floorallowed = ((rover->master->frontsector->flags & SF_FLIPSPECIAL_FLOOR) && ((rover->master->frontsector->flags & SF_TRIGGERSPECIAL_HEADBUMP) || !(player->mo->eflags & MFE_VERTICALFLIP)) && (player->mo->z == topheight)); - boolean ceilingallowed = ((rover->master->frontsector->flags & SF_FLIPSPECIAL_CEILING) && ((rover->master->frontsector->flags & SF_TRIGGERSPECIAL_HEADBUMP) || (player->mo->eflags & MFE_VERTICALFLIP)) && (player->mo->z + player->mo->height == bottomheight)); - // Thing must be on top of the floor to be affected... - if (!(floorallowed || ceilingallowed)) - continue; - } - else - { - // Water and DEATH FOG!!! heh - if (player->mo->z > topheight || (player->mo->z + player->mo->height) < bottomheight) - continue; - } + if (!Tag_Find(&sourceline->tags, rover->master->frontsector->triggertag)) + continue; - // This FOF has the special we're looking for! - return rover->master->frontsector; - } + if (!P_IsMobjTouching3DFloor(player->mo, rover, sector)) + continue; - for (node = player->mo->touching_sectorlist; node; node = node->m_sectorlist_next) - { - if (GETSECSPECIAL(node->m_sector->special, section) == number) - { - // This sector has the special we're looking for, but - // are we allowed to touch it? - if (node->m_sector == player->mo->subsector->sector - || (node->m_sector->flags & SF_TRIGGERSPECIAL_TOUCH)) - return node->m_sector; - } - - // Hmm.. maybe there's a FOF that has it... - for (rover = node->m_sector->ffloors; rover; rover = rover->next) - { - fixed_t topheight, bottomheight; - - if (GETSECSPECIAL(rover->master->frontsector->special, section) != number) - continue; - - if (!(rover->flags & FF_EXISTS)) - continue; - - topheight = P_GetSpecialTopZ(player->mo, sectors + rover->secnum, player->mo->subsector->sector); - bottomheight = P_GetSpecialBottomZ(player->mo, sectors + rover->secnum, player->mo->subsector->sector); - - // Check the 3D floor's type... - if (rover->flags & FF_BLOCKPLAYER) - { - boolean floorallowed = ((rover->master->frontsector->flags & SF_FLIPSPECIAL_FLOOR) && ((rover->master->frontsector->flags & SF_TRIGGERSPECIAL_HEADBUMP) || !(player->mo->eflags & MFE_VERTICALFLIP)) && (player->mo->z == topheight)); - boolean ceilingallowed = ((rover->master->frontsector->flags & SF_FLIPSPECIAL_CEILING) && ((rover->master->frontsector->flags & SF_TRIGGERSPECIAL_HEADBUMP) || (player->mo->eflags & MFE_VERTICALFLIP)) && (player->mo->z + player->mo->height == bottomheight)); - // Thing must be on top of the floor to be affected... - if (!(floorallowed || ceilingallowed)) - continue; - } - else - { - // Water and DEATH FOG!!! heh - if (player->mo->z > topheight || (player->mo->z + player->mo->height) < bottomheight) - continue; - } - - // This FOF has the special we're looking for, but are we allowed to touch it? - if (node->m_sector == player->mo->subsector->sector - || (rover->master->frontsector->flags & SF_TRIGGERSPECIAL_TOUCH)) - return rover->master->frontsector; - } + // This FOF has the special we're looking for, but are we allowed to touch it? + if (sector == player->mo->subsector->sector + || (rover->master->frontsector->flags & MSF_TRIGGERSPECIAL_TOUCH)) + return rover->master->frontsector; } return NULL; } -// -// P_ThingIsOnThe3DFloor -// -// This checks whether the mobj is on/in the FOF we want it to be at -// Needed for the "All players" trigger sector specials only -// -static boolean P_ThingIsOnThe3DFloor(mobj_t *mo, sector_t *sector, sector_t *targetsec) +static sector_t *P_CheckPlayerPolyobjTrigger(player_t *player, line_t *sourceline) { - ffloor_t *rover; - fixed_t top, bottom; + polyobj_t *po; + sector_t *polysec; + boolean touching = false; + boolean inside = false; - if (!mo->player) // should NEVER happen - return false; - - if (!targetsec->ffloors) // also should NEVER happen - return false; - - for (rover = targetsec->ffloors; rover; rover = rover->next) + for (po = player->mo->subsector->polyList; po; po = (polyobj_t *)(po->link.next)) { - if (rover->master->frontsector != sector) + if (po->flags & POF_NOSPECIALS) continue; - // we're assuming the FOF existed when the first player touched it - //if (!(rover->flags & FF_EXISTS)) - // return false; + polysec = po->lines[0]->backsector; - top = P_GetSpecialTopZ(mo, sector, targetsec); - bottom = P_GetSpecialBottomZ(mo, sector, targetsec); + if (!polysec->triggertag) + continue; - // Check the 3D floor's type... - if (rover->flags & FF_BLOCKPLAYER) + if (polysec->triggerer == TO_MOBJ) + continue; + + if (!Tag_Find(&sourceline->tags, polysec->triggertag)) + continue; + + touching = (polysec->flags & MSF_TRIGGERSPECIAL_TOUCH) && P_MobjTouchingPolyobj(po, player->mo); + inside = P_MobjInsidePolyobj(po, player->mo); + + if (!(inside || touching)) + continue; + + if (!P_IsMobjTouchingPolyobj(player->mo, po, polysec)) + continue; + + return polysec; + } + + return NULL; +} + +static boolean P_CheckPlayerSectorTrigger(player_t *player, sector_t *sector, line_t *sourceline) +{ + if (!sector->triggertag) + return false; + + if (sector->triggerer == TO_MOBJ) + return false; + + if (!Tag_Find(&sourceline->tags, sector->triggertag)) + return false; + + if (!(sector->flags & MSF_TRIGGERLINE_PLANE)) + return true; // Don't require plane touch + + return P_IsMobjTouchingSectorPlane(player->mo, sector); + +} + +sector_t *P_FindPlayerTrigger(player_t *player, line_t *sourceline) +{ + sector_t *originalsector; + sector_t *loopsector; + msecnode_t *node; + sector_t *caller; + + if (!player->mo) + return NULL; + + originalsector = player->mo->subsector->sector; + + caller = P_CheckPlayer3DFloorTrigger(player, originalsector, sourceline); // Handle FOFs first. + + if (caller) + return caller; + + // Allow sector specials to be applied to polyobjects! + caller = P_CheckPlayerPolyobjTrigger(player, sourceline); + + if (caller) + return caller; + + if (P_CheckPlayerSectorTrigger(player, originalsector, sourceline)) + return originalsector; + + // Iterate through touching_sectorlist for SF_TRIGGERSPECIAL_TOUCH + for (node = player->mo->touching_sectorlist; node; node = node->m_sectorlist_next) + { + loopsector = node->m_sector; + + if (loopsector == originalsector) // Don't duplicate + continue; + + // Check 3D floors... + caller = P_CheckPlayer3DFloorTrigger(player, loopsector, sourceline); // Handle FOFs first. + + if (caller) + return caller; + + if (!(loopsector->flags & MSF_TRIGGERSPECIAL_TOUCH)) + continue; + + if (P_CheckPlayerSectorTrigger(player, loopsector, sourceline)) + return loopsector; + } + + return NULL; +} + +boolean P_IsPlayerValid(size_t playernum) +{ + if (!playeringame[playernum]) + return false; + + if (!players[playernum].mo) + return false; + + if (players[playernum].mo->health <= 0) + return false; + + if (players[playernum].spectator) + return false; + + return true; +} + +boolean P_CanPlayerTrigger(size_t playernum) +{ + return P_IsPlayerValid(playernum) && !players[playernum].bot; +} + +/// \todo check continues for proper splitscreen support? +static boolean P_DoAllPlayersTrigger(mtag_t triggertag) +{ + INT32 i; + line_t dummyline; + dummyline.tags.count = 1; + dummyline.tags.tags = &triggertag; + + for (i = 0; i < MAXPLAYERS; i++) + { + if (!P_CanPlayerTrigger(i)) + continue; + if (!P_FindPlayerTrigger(&players[i], &dummyline)) + return false; + } + + return true; +} + +static void P_ProcessEggCapsule(player_t *player, sector_t *sector) +{ + thinker_t *th; + mobj_t *mo2; + INT32 i; + + if (player->bot || sector->ceilingdata || sector->floordata) + return; + + // Find the center of the Eggtrap and release all the pretty animals! + // The chimps are my friends.. heeheeheheehehee..... - LouisJM + for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next) + { + if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed) + continue; + mo2 = (mobj_t *)th; + if (mo2->type != MT_EGGTRAP) + continue; + P_KillMobj(mo2, NULL, player->mo, 0); + } + + // clear the special so you can't push the button twice. + sector->special = 0; + + // Move the button down + EV_DoElevator(LE_CAPSULE0, NULL, elevateDown); + + // Open the top FOF + EV_DoFloor(LE_CAPSULE1, NULL, raiseFloorToNearestFast); + // Open the bottom FOF + EV_DoCeiling(LE_CAPSULE2, NULL, lowerToLowestFast); + + // Mark all players with the time to exit thingy! + for (i = 0; i < MAXPLAYERS; i++) + { + if (!playeringame[i]) + continue; + P_DoPlayerExit(&players[i]); + } +} + +static void P_ProcessSpeedPad(player_t *player, sector_t *sector, sector_t *roversector, mtag_t sectag) +{ + INT32 lineindex = -1; + angle_t lineangle; + fixed_t linespeed; + fixed_t sfxnum; + size_t i; + + if (player->powers[pw_flashing] != 0 && player->powers[pw_flashing] < TICRATE/2) + return; + + // Try for lines facing the sector itself, with tag 0. + for (i = 0; i < sector->linecount; i++) + { + line_t *li = sector->lines[i]; + + if (li->frontsector != sector) + continue; + + if (li->special != 4) + continue; + + if (!Tag_Find(&li->tags, 0)) + continue; + + lineindex = li - lines; + break; + } + + // Nothing found? Look via tag. + if (lineindex == -1) + lineindex = Tag_FindLineSpecial(4, sectag); + + if (lineindex == -1) + { + CONS_Debug(DBG_GAMELOGIC, "ERROR: Speed pad missing line special #4.\n"); + return; + } + + lineangle = R_PointToAngle2(lines[lineindex].v1->x, lines[lineindex].v1->y, lines[lineindex].v2->x, lines[lineindex].v2->y); + linespeed = lines[lineindex].args[0] << FRACBITS; + + if (linespeed == 0) + { + CONS_Debug(DBG_GAMELOGIC, "ERROR: Speed pad (tag %d) at zero speed.\n", sectag); + return; + } + + player->mo->angle = player->drawangle = lineangle; + + if (!demoplayback || P_ControlStyle(player) == CS_LMAOGALOG) + P_SetPlayerAngle(player, player->mo->angle); + + if (!(lines[lineindex].args[1] & TMSP_NOTELEPORT)) + { + P_UnsetThingPosition(player->mo); + if (roversector) // make FOF speed pads work { - boolean floorallowed = ((rover->master->frontsector->flags & SF_FLIPSPECIAL_FLOOR) && ((rover->master->frontsector->flags & SF_TRIGGERSPECIAL_HEADBUMP) || !(mo->eflags & MFE_VERTICALFLIP)) && (mo->z == top)); - boolean ceilingallowed = ((rover->master->frontsector->flags & SF_FLIPSPECIAL_CEILING) && ((rover->master->frontsector->flags & SF_TRIGGERSPECIAL_HEADBUMP) || (mo->eflags & MFE_VERTICALFLIP)) && (mo->z + mo->height == bottom)); - // Thing must be on top of the floor to be affected... - if (!(floorallowed || ceilingallowed)) - continue; + player->mo->x = roversector->soundorg.x; + player->mo->y = roversector->soundorg.y; } else { - // Water and intangible FOFs - if (mo->z > top || (mo->z + mo->height) < bottom) - return false; + player->mo->x = sector->soundorg.x; + player->mo->y = sector->soundorg.y; + } + P_SetThingPosition(player->mo); + } + + P_InstaThrust(player->mo, player->mo->angle, linespeed); + + if (lines[lineindex].args[1] & TMSP_FORCESPIN) // Roll! + { + if (!(player->pflags & PF_SPINNING)) + player->pflags |= PF_SPINNING; + + P_SetPlayerMobjState(player->mo, S_PLAY_ROLL); + } + + player->powers[pw_flashing] = TICRATE/3; + + sfxnum = lines[lineindex].stringargs[0] ? get_number(lines[lineindex].stringargs[0]) : sfx_spdpad; + + if (!sfxnum) + sfxnum = sfx_spdpad; + + S_StartSound(player->mo, sfxnum); +} + +static void P_ProcessSpecialStagePit(player_t* player) +{ + if (!(gametyperules & GTR_ALLOWEXIT)) + return; + + if (player->bot) + return; + + if (!G_IsSpecialStage(gamemap)) + return; + + if (maptol & TOL_NIGHTS) + return; + + if (player->nightstime <= 6) + return; + + player->nightstime = 6; // Just let P_Ticker take care of the rest. +} + +static void P_ProcessExitSector(player_t *player, mtag_t sectag) +{ + INT32 lineindex; + + if (!(gametyperules & GTR_ALLOWEXIT)) + return; + + if (player->bot) + return; + + if (G_IsSpecialStage(gamemap) && !(maptol & TOL_NIGHTS)) + return; + + // Exit (for FOF exits; others are handled in P_PlayerThink in p_user.c) + P_DoPlayerFinish(player); + + P_SetupSignExit(player); + + if (!G_CoopGametype()) + return; + + // Custom exit! + // important: use sectag on next line instead of player->mo->subsector->tag + // this part is different from in P_PlayerThink, this is what was causing + // FOF custom exits not to work. + lineindex = Tag_FindLineSpecial(2, sectag); + + if (lineindex == -1) + { + CONS_Debug(DBG_GAMELOGIC, "ERROR: Exit sector missing line special #2.\n"); + return; + } + + // Special goodies depending on emeralds collected + if ((lines[lineindex].args[1] & TMEF_EMERALDCHECK) && ALL7EMERALDS(emeralds)) + nextmapoverride = (INT16)(udmf ? lines[lineindex].args[2] : lines[lineindex].frontsector->ceilingheight>>FRACBITS); + else + nextmapoverride = (INT16)(udmf ? lines[lineindex].args[0] : lines[lineindex].frontsector->floorheight>>FRACBITS); + + if (lines[lineindex].args[1] & TMEF_SKIPTALLY) + skipstats = 1; +} + +static void P_ProcessTeamBase(player_t *player, boolean redteam) +{ + mobj_t *mo; + + if (!(gametyperules & GTR_TEAMFLAGS)) + return; + + if (!P_IsObjectOnGround(player->mo)) + return; + + if (player->ctfteam != (redteam ? 1 : 2)) + return; + + if (!(player->gotflag & (redteam ? GF_BLUEFLAG : GF_REDFLAG))) + return; + + // Make sure the team still has their own + // flag at their base so they can score. + if (!P_IsFlagAtBase(redteam ? MT_REDFLAG : MT_BLUEFLAG)) + return; + + HU_SetCEchoFlags(V_AUTOFADEOUT|V_ALLOWLOWERCASE); + HU_SetCEchoDuration(5); + HU_DoCEcho(va(M_GetText("%s%s\200\\CAPTURED THE %s%s FLAG\200.\\\\\\\\"), redteam ? "\205" : "\204", player_names[player-players], redteam ? "\204" : "\205", redteam ? "BLUE" : "RED")); + + if (splitscreen || players[consoleplayer].ctfteam == (redteam ? 1 : 2)) + S_StartSound(NULL, sfx_flgcap); + else if (players[consoleplayer].ctfteam == (redteam ? 2 : 1)) + S_StartSound(NULL, sfx_lose); + + mo = P_SpawnMobj(player->mo->x,player->mo->y,player->mo->z, redteam ? MT_BLUEFLAG : MT_REDFLAG); + player->gotflag &= ~(redteam ? GF_BLUEFLAG : GF_REDFLAG); + mo->flags &= ~MF_SPECIAL; + mo->fuse = TICRATE; + mo->spawnpoint = redteam ? bflagpoint : rflagpoint; + mo->flags2 |= MF2_JUSTATTACKED; + if (redteam) + redscore += 1; + else + bluescore += 1; + P_AddPlayerScore(player, 250); +} + +static void P_ProcessZoomTube(player_t *player, mtag_t sectag, boolean end) +{ + INT32 sequence; + fixed_t speed; + INT32 lineindex; + mobj_t *waypoint = NULL; + angle_t an; + + if (player->mo->tracer && player->mo->tracer->type == MT_TUBEWAYPOINT && player->powers[pw_carry] == CR_ZOOMTUBE) + return; + + if (player->powers[pw_ignorelatch] & (1<<15)) + return; + + // Find line #3 tagged to this sector + lineindex = Tag_FindLineSpecial(3, sectag); + + if (lineindex == -1) + { + CONS_Debug(DBG_GAMELOGIC, "ERROR: Zoom tube missing line special #3.\n"); + return; + } + + // Grab speed and sequence values + speed = abs(lines[lineindex].args[0])<<(FRACBITS-3); + if (end) + speed *= -1; + sequence = abs(lines[lineindex].args[1]); + + if (speed == 0) + { + CONS_Debug(DBG_GAMELOGIC, "ERROR: Waypoint sequence %d at zero speed.\n", sequence); + return; + } + + waypoint = end ? P_GetLastWaypoint(sequence) : P_GetFirstWaypoint(sequence); + + if (!waypoint) + { + CONS_Debug(DBG_GAMELOGIC, "ERROR: %s WAYPOINT IN SEQUENCE %d NOT FOUND.\n", end ? "LAST" : "FIRST", sequence); + return; + } + + CONS_Debug(DBG_GAMELOGIC, "Waypoint %d found in sequence %d - speed = %d\n", waypoint->health, sequence, speed); + + an = R_PointToAngle2(player->mo->x, player->mo->y, waypoint->x, waypoint->y) - player->mo->angle; + + if (an > ANGLE_90 && an < ANGLE_270 && !(lines[lineindex].args[2])) + return; // behind back + + P_SetTarget(&player->mo->tracer, waypoint); + player->powers[pw_carry] = CR_ZOOMTUBE; + player->speed = speed; + player->pflags |= PF_SPINNING; + player->pflags &= ~(PF_JUMPED|PF_NOJUMPDAMAGE|PF_GLIDING|PF_BOUNCING|PF_SLIDING|PF_CANCARRY); + player->climbing = 0; + + if (player->mo->state-states != S_PLAY_ROLL) + { + P_SetPlayerMobjState(player->mo, S_PLAY_ROLL); + S_StartSound(player->mo, sfx_spin); + } +} + +static void P_ProcessFinishLine(player_t *player) +{ + if ((gametyperules & (GTR_RACE|GTR_LIVES)) != GTR_RACE) + return; + + if (player->exiting) + return; + + if (player->starpostnum == numstarposts) // Must have touched all the starposts + { + player->laps++; + + if (player->powers[pw_carry] == CR_NIGHTSMODE) + player->drillmeter += 48*20; + + if (player->laps >= (UINT8)cv_numlaps.value) + CONS_Printf(M_GetText("%s has finished the race.\n"), player_names[player-players]); + else if (player->laps == (UINT8)cv_numlaps.value-1) + CONS_Printf(M_GetText("%s started the \205final lap\200!\n"), player_names[player-players]); + else + CONS_Printf(M_GetText("%s started lap %u\n"), player_names[player-players], (UINT32)player->laps+1); + + // Reset starposts (checkpoints) info + player->starpostscale = player->starpostangle = player->starposttime = player->starpostnum = 0; + player->starpostx = player->starposty = player->starpostz = 0; + P_ResetStarposts(); + + // Play the starpost sound for 'consistency' + S_StartSound(player->mo, sfx_strpst); + } + else if (player->starpostnum) + { + // blatant reuse of a variable that's normally unused in circuit + if (!player->tossdelay) + S_StartSound(player->mo, sfx_lose); + player->tossdelay = 3; + } + + if (player->laps >= (unsigned)cv_numlaps.value) + { + if (P_IsLocalPlayer(player)) + { + HU_SetCEchoFlags(0); + HU_SetCEchoDuration(5); + HU_DoCEcho("FINISHED!"); } - return true; + P_DoPlayerExit(player); } +} + +static void P_ProcessRopeHang(player_t *player, mtag_t sectag) +{ + INT32 sequence; + fixed_t speed; + INT32 lineindex; + mobj_t *waypointmid = NULL; + mobj_t *waypointhigh = NULL; + mobj_t *waypointlow = NULL; + mobj_t *closest = NULL; + vector3_t p, line[2], resulthigh, resultlow; + + if (player->mo->tracer && player->mo->tracer->type == MT_TUBEWAYPOINT && player->powers[pw_carry] == CR_ROPEHANG) + return; + + if (player->powers[pw_ignorelatch] & (1<<15)) + return; + + if (player->mo->momz > 0) + return; + + if (player->cmd.buttons & BT_SPIN) + return; + + if (!(player->pflags & PF_SLIDING) && player->mo->state == &states[player->mo->info->painstate]) + return; + + if (player->exiting) + return; + + //initialize resulthigh and resultlow with 0 + memset(&resultlow, 0x00, sizeof(resultlow)); + memset(&resulthigh, 0x00, sizeof(resulthigh)); + + // Find line #11 tagged to this sector + lineindex = Tag_FindLineSpecial(11, sectag); + + if (lineindex == -1) + { + CONS_Debug(DBG_GAMELOGIC, "ERROR: Rope hang missing line special #11.\n"); + return; + } + + // Grab speed and sequence values + speed = abs(lines[lineindex].args[0]) << (FRACBITS - 3); + sequence = abs(lines[lineindex].args[1]); + + // Find the closest waypoint + // Find the preceding waypoint + // Find the proceeding waypoint + // Determine the closest spot on the line between the three waypoints + // Put player at that location. + + waypointmid = P_GetClosestWaypoint(sequence, player->mo); + + if (!waypointmid) + { + CONS_Debug(DBG_GAMELOGIC, "ERROR: WAYPOINT(S) IN SEQUENCE %d NOT FOUND.\n", sequence); + return; + } + + waypointlow = P_GetPreviousWaypoint(waypointmid, true); + waypointhigh = P_GetNextWaypoint(waypointmid, true); + + CONS_Debug(DBG_GAMELOGIC, "WaypointMid: %d; WaypointLow: %d; WaypointHigh: %d\n", + waypointmid->health, waypointlow ? waypointlow->health : -1, waypointhigh ? waypointhigh->health : -1); + + // Now we have three waypoints... the closest one we're near, and the one that comes before, and after. + // Next, we need to find the closest point on the line between each set, and determine which one we're + // closest to. + + p.x = player->mo->x; + p.y = player->mo->y; + p.z = player->mo->z; + + // Waypointmid and Waypointlow: + if (waypointlow) + { + line[0].x = waypointmid->x; + line[0].y = waypointmid->y; + line[0].z = waypointmid->z; + line[1].x = waypointlow->x; + line[1].y = waypointlow->y; + line[1].z = waypointlow->z; + + P_ClosestPointOnLine3D(&p, line, &resultlow); + } + + // Waypointmid and Waypointhigh: + if (waypointhigh) + { + line[0].x = waypointmid->x; + line[0].y = waypointmid->y; + line[0].z = waypointmid->z; + line[1].x = waypointhigh->x; + line[1].y = waypointhigh->y; + line[1].z = waypointhigh->z; + + P_ClosestPointOnLine3D(&p, line, &resulthigh); + } + + // 3D support now available. Disregard the previous notice here. -Red + + P_UnsetThingPosition(player->mo); + P_ResetPlayer(player); + player->mo->momx = player->mo->momy = player->mo->momz = 0; + + if (lines[lineindex].args[2]) // Don't wrap + { + mobj_t *highest = P_GetLastWaypoint(sequence); + highest->flags |= MF_SLIDEME; + } + + // Changing the conditions on these ifs to fix issues with snapping to the wrong spot -Red + if ((lines[lineindex].args[2]) && waypointmid->health == 0) + { + closest = waypointhigh; + player->mo->x = resulthigh.x; + player->mo->y = resulthigh.y; + player->mo->z = resulthigh.z - P_GetPlayerHeight(player); + } + else if ((lines[lineindex].args[2]) && waypointmid->health == numwaypoints[sequence] - 1) + { + closest = waypointmid; + player->mo->x = resultlow.x; + player->mo->y = resultlow.y; + player->mo->z = resultlow.z - P_GetPlayerHeight(player); + } + else + { + if (P_AproxDistance(P_AproxDistance(player->mo->x-resultlow.x, player->mo->y-resultlow.y), + player->mo->z-resultlow.z) < P_AproxDistance(P_AproxDistance(player->mo->x-resulthigh.x, + player->mo->y-resulthigh.y), player->mo->z-resulthigh.z)) + { + // Line between Mid and Low is closer + closest = waypointmid; + player->mo->x = resultlow.x; + player->mo->y = resultlow.y; + player->mo->z = resultlow.z - P_GetPlayerHeight(player); + } + else + { + // Line between Mid and High is closer + closest = waypointhigh; + player->mo->x = resulthigh.x; + player->mo->y = resulthigh.y; + player->mo->z = resulthigh.z - P_GetPlayerHeight(player); + } + } + + P_SetTarget(&player->mo->tracer, closest); + player->powers[pw_carry] = CR_ROPEHANG; + player->speed = speed; + + S_StartSound(player->mo, sfx_s3k4a); + + player->pflags &= ~(PF_JUMPED|PF_NOJUMPDAMAGE|PF_GLIDING|PF_BOUNCING|PF_SLIDING|PF_CANCARRY); + player->climbing = 0; + P_SetThingPosition(player->mo); + P_SetPlayerMobjState(player->mo, S_PLAY_RIDE); +} + +static boolean P_SectorHasSpecial(sector_t *sec) +{ + if (sec->specialflags) + return true; + + if (sec->damagetype != SD_NONE) + return true; + + if (sec->triggertag) + return true; + + if (sec->special) + return true; return false; } -// -// P_MobjReadyToTrigger -// -// Is player standing on the sector's "ground"? -// -static boolean P_MobjReadyToTrigger(mobj_t *mo, sector_t *sec) +static void P_EvaluateSpecialFlags(player_t *player, sector_t *sector, sector_t *roversector, boolean isTouching) { - boolean floorallowed = ((sec->flags & SF_FLIPSPECIAL_FLOOR) && ((sec->flags & SF_TRIGGERSPECIAL_HEADBUMP) || !(mo->eflags & MFE_VERTICALFLIP)) && (mo->z == P_GetSpecialBottomZ(mo, sec, sec))); - boolean ceilingallowed = ((sec->flags & SF_FLIPSPECIAL_CEILING) && ((sec->flags & SF_TRIGGERSPECIAL_HEADBUMP) || (mo->eflags & MFE_VERTICALFLIP)) && (mo->z + mo->height == P_GetSpecialTopZ(mo, sec, sec))); - // Thing must be on top of the floor to be affected... - return (floorallowed || ceilingallowed); + mtag_t sectag = Tag_FGet(§or->tags); + + if (sector->specialflags & SSF_OUTERSPACE) + { + if (!(player->powers[pw_shield] & SH_PROTECTWATER) && !player->powers[pw_spacetime]) + player->powers[pw_spacetime] = spacetimetics + 1; + } + if (sector->specialflags & SSF_WINDCURRENT) + player->onconveyor = 2; + if (sector->specialflags & SSF_CONVEYOR) + player->onconveyor = 4; + if ((sector->specialflags & SSF_SPEEDPAD) && isTouching) + P_ProcessSpeedPad(player, sector, roversector, sectag); + if (sector->specialflags & SSF_STARPOSTACTIVATOR) + { + mobj_t *post = P_GetObjectTypeInSectorNum(MT_STARPOST, sector - sectors); + if (post) + P_TouchStarPost(post, player, false); + } + if (sector->specialflags & SSF_EXIT) + P_ProcessExitSector(player, sectag); + if ((sector->specialflags & SSF_SPECIALSTAGEPIT) && isTouching) + P_ProcessSpecialStagePit(player); + if ((sector->specialflags & SSF_REDTEAMBASE) && isTouching) + P_ProcessTeamBase(player, true); + if ((sector->specialflags & SSF_BLUETEAMBASE) && isTouching) + P_ProcessTeamBase(player, false); + if (sector->specialflags & SSF_FAN) + { + player->mo->momz += mobjinfo[MT_FAN].mass/4; + + if (player->mo->momz > mobjinfo[MT_FAN].mass) + player->mo->momz = mobjinfo[MT_FAN].mass; + + if (!player->powers[pw_carry]) + { + P_ResetPlayer(player); + P_SetPlayerMobjState(player->mo, S_PLAY_FALL); + P_SetTarget(&player->mo->tracer, player->mo); + player->powers[pw_carry] = CR_FAN; + } + } + if (sector->specialflags & SSF_SUPERTRANSFORM) + { + if (player->mo->health > 0 && !player->bot && (player->charflags & SF_SUPER) && !player->powers[pw_super] && ALL7EMERALDS(emeralds)) + P_DoSuperTransformation(player, true); + } + if ((sector->specialflags & SSF_FORCESPIN) && isTouching) + { + if (!(player->pflags & PF_SPINNING)) + { + player->pflags |= PF_SPINNING; + P_SetPlayerMobjState(player->mo, S_PLAY_ROLL); + S_StartAttackSound(player->mo, sfx_spin); + + if (abs(player->rmomx) < FixedMul(5*FRACUNIT, player->mo->scale) + && abs(player->rmomy) < FixedMul(5*FRACUNIT, player->mo->scale)) + P_InstaThrust(player->mo, player->mo->angle, FixedMul(10*FRACUNIT, player->mo->scale)); + } + } + if (sector->specialflags & SSF_ZOOMTUBESTART) + P_ProcessZoomTube(player, sectag, false); + if (sector->specialflags & SSF_ZOOMTUBEEND) + P_ProcessZoomTube(player, sectag, true); + if (sector->specialflags & SSF_FINISHLINE) + P_ProcessFinishLine(player); + if ((sector->specialflags & SSF_ROPEHANG) && isTouching) + P_ProcessRopeHang(player, sectag); +} + +static void P_EvaluateDamageType(player_t *player, sector_t *sector, boolean isTouching) +{ + switch (sector->damagetype) + { + case SD_GENERIC: + if (isTouching) + P_DamageMobj(player->mo, NULL, NULL, 1, 0); + break; + case SD_WATER: + if (isTouching && (player->powers[pw_underwater] || player->powers[pw_carry] == CR_NIGHTSMODE)) + P_DamageMobj(player->mo, NULL, NULL, 1, DMG_WATER); + break; + case SD_FIRE: + case SD_LAVA: + if (isTouching) + P_DamageMobj(player->mo, NULL, NULL, 1, DMG_FIRE); + break; + case SD_ELECTRIC: + if (isTouching) + P_DamageMobj(player->mo, NULL, NULL, 1, DMG_ELECTRIC); + break; + case SD_SPIKE: + if (isTouching) + P_DamageMobj(player->mo, NULL, NULL, 1, DMG_SPIKE); + break; + case SD_DEATHPITTILT: + case SD_DEATHPITNOTILT: + if (!isTouching) + break; + if (player->quittime) + G_MovePlayerToSpawnOrStarpost(player - players); + else + P_DamageMobj(player->mo, NULL, NULL, 1, DMG_DEATHPIT); + break; + case SD_INSTAKILL: + if (player->quittime) + G_MovePlayerToSpawnOrStarpost(player - players); + else + P_DamageMobj(player->mo, NULL, NULL, 1, DMG_INSTAKILL); + break; + case SD_SPECIALSTAGE: + if (!isTouching) + break; + + if (player->exiting || player->bot) // Don't do anything for bots or players who have just finished + break; + + if (!(player->powers[pw_shield] || player->spheres > 0)) // Don't do anything if no shield or spheres anyway + break; + + P_SpecialStageDamage(player, NULL, NULL); + break; + default: + break; + } +} + +static void P_EvaluateLinedefExecutorTrigger(player_t *player, sector_t *sector, boolean isTouching) +{ + if (player->bot) + return; + + if (!sector->triggertag) + return; + + if (sector->triggerer == TO_MOBJ) + return; + else if (sector->triggerer == TO_ALLPLAYERS && !P_DoAllPlayersTrigger(sector->triggertag)) + return; + + if ((sector->flags & MSF_TRIGGERLINE_PLANE) && !isTouching) + return; + + P_LinedefExecute(sector->triggertag, player->mo, sector); +} + +static void P_EvaluateOldSectorSpecial(player_t *player, sector_t *sector, sector_t *roversector, boolean isTouching) +{ + switch (GETSECSPECIAL(sector->special, 1)) + { + case 9: // Ring Drainer (Floor Touch) + if (!isTouching) + break; + /* FALLTHRU */ + case 10: // Ring Drainer (No Floor Touch) + if (leveltime % (TICRATE/2) == 0 && player->rings > 0) + { + player->rings--; + S_StartSound(player->mo, sfx_antiri); + } + break; + } + + switch (GETSECSPECIAL(sector->special, 2)) + { + case 9: // Egg trap capsule + if (roversector) + P_ProcessEggCapsule(player, sector); + break; + } } /** Applies a sector special to a player. @@ -4242,20 +5148,14 @@ static boolean P_MobjReadyToTrigger(mobj_t *mo, sector_t *sec) * \param sector Sector with the special. * \param roversector If !NULL, sector is actually an FOF; otherwise, sector * is being physically contacted by the player. - * \todo Split up into multiple functions. * \sa P_PlayerInSpecialSector, P_PlayerOnSpecial3DFloor */ void P_ProcessSpecialSector(player_t *player, sector_t *sector, sector_t *roversector) { - INT32 i = 0; - INT32 section1, section2, section3, section4; - INT32 special; - mtag_t sectag = Tag_FGet(§or->tags); + boolean isTouching; - section1 = GETSECSPECIAL(sector->special, 1); - section2 = GETSECSPECIAL(sector->special, 2); - section3 = GETSECSPECIAL(sector->special, 3); - section4 = GETSECSPECIAL(sector->special, 4); + if (!P_SectorHasSpecial(sector)) + return; // Ignore spectators if (player->spectator) @@ -4267,847 +5167,17 @@ void P_ProcessSpecialSector(player_t *player, sector_t *sector, sector_t *rovers if (player->playerstate != PST_LIVE) return; - // Conveyor stuff - if (section3 == 2 || section3 == 4) - player->onconveyor = section3; + isTouching = roversector || P_IsMobjTouchingSectorPlane(player->mo, sector); - special = section1; + P_EvaluateSpecialFlags(player, sector, roversector, isTouching); + P_EvaluateDamageType(player, sector, isTouching); + P_EvaluateLinedefExecutorTrigger(player, sector, isTouching); - // Process Section 1 - switch (special) - { - case 1: // Damage (Generic) - if (roversector || P_MobjReadyToTrigger(player->mo, sector)) - P_DamageMobj(player->mo, NULL, NULL, 1, 0); - break; - case 2: // Damage (Water) - if ((roversector || P_MobjReadyToTrigger(player->mo, sector)) && (player->powers[pw_underwater] || player->powers[pw_carry] == CR_NIGHTSMODE)) - P_DamageMobj(player->mo, NULL, NULL, 1, DMG_WATER); - break; - case 3: // Damage (Fire) - if (roversector || P_MobjReadyToTrigger(player->mo, sector)) - P_DamageMobj(player->mo, NULL, NULL, 1, DMG_FIRE); - break; - case 4: // Damage (Electrical) - if (roversector || P_MobjReadyToTrigger(player->mo, sector)) - P_DamageMobj(player->mo, NULL, NULL, 1, DMG_ELECTRIC); - break; - case 5: // Spikes - if (roversector || P_MobjReadyToTrigger(player->mo, sector)) - P_DamageMobj(player->mo, NULL, NULL, 1, DMG_SPIKE); - break; - case 6: // Death Pit (Camera Mod) - case 7: // Death Pit (No Camera Mod) - if (roversector || P_MobjReadyToTrigger(player->mo, sector)) - { - if (player->quittime) - G_MovePlayerToSpawnOrStarpost(player - players); - else - P_DamageMobj(player->mo, NULL, NULL, 1, DMG_DEATHPIT); - } - break; - case 8: // Instant Kill - if (player->quittime) - G_MovePlayerToSpawnOrStarpost(player - players); - else - P_DamageMobj(player->mo, NULL, NULL, 1, DMG_INSTAKILL); - break; - case 9: // Ring Drainer (Floor Touch) - case 10: // Ring Drainer (No Floor Touch) - if (leveltime % (TICRATE/2) == 0 && player->rings > 0) - { - player->rings--; - S_StartSound(player->mo, sfx_antiri); - } - break; - case 11: // Special Stage Damage - if (player->exiting || player->bot) // Don't do anything for bots or players who have just finished - break; - - if (!(player->powers[pw_shield] || player->spheres > 0)) // Don't do anything if no shield or spheres anyway - break; - - P_SpecialStageDamage(player, NULL, NULL); - break; - case 12: // Space Countdown - if (!(player->powers[pw_shield] & SH_PROTECTWATER) && !player->powers[pw_spacetime]) - player->powers[pw_spacetime] = spacetimetics + 1; - break; - case 13: // Ramp Sector (Increase step-up/down) - case 14: // Non-Ramp Sector (Don't step-down) - case 15: // Bouncy Sector (FOF Control Only) - break; - } - - special = section2; - - // Process Section 2 - switch (special) - { - case 1: // Trigger Linedef Exec (Pushable Objects) - break; - case 2: // Linedef executor requires all players present+doesn't require touching floor - case 3: // Linedef executor requires all players present - /// \todo check continues for proper splitscreen support? - for (i = 0; i < MAXPLAYERS; i++) - { - if (!playeringame[i]) - continue; - if (!players[i].mo) - continue; - if (players[i].spectator) - continue; - if (players[i].bot) - continue; - if (G_CoopGametype() && players[i].lives <= 0) - continue; - if (roversector) - { - if (sector->flags & SF_TRIGGERSPECIAL_TOUCH) - { - msecnode_t *node; - for (node = players[i].mo->touching_sectorlist; node; node = node->m_sectorlist_next) - { - if (P_ThingIsOnThe3DFloor(players[i].mo, sector, node->m_sector)) - break; - } - if (!node) - goto DoneSection2; - } - else if (players[i].mo->subsector && !P_ThingIsOnThe3DFloor(players[i].mo, sector, players[i].mo->subsector->sector)) // this function handles basically everything for us lmao - goto DoneSection2; - } - else - { - if (players[i].mo->subsector->sector == sector) - ; - else if (sector->flags & SF_TRIGGERSPECIAL_TOUCH) - { - msecnode_t *node; - for (node = players[i].mo->touching_sectorlist; node; node = node->m_sectorlist_next) - { - if (node->m_sector == sector) - break; - } - if (!node) - goto DoneSection2; - } - else - goto DoneSection2; - - if (special == 3 && !P_MobjReadyToTrigger(players[i].mo, sector)) - goto DoneSection2; - } - } - /* FALLTHRU */ - case 4: // Linedef executor that doesn't require touching floor - case 5: // Linedef executor - case 6: // Linedef executor (7 Emeralds) - case 7: // Linedef executor (NiGHTS Mare) - if (!player->bot) - P_LinedefExecute(sectag, player->mo, sector); - break; - case 8: // Tells pushable things to check FOFs - break; - case 9: // Egg trap capsule - { - thinker_t *th; - mobj_t *mo2; - line_t junk; - - if (player->bot || sector->ceilingdata || sector->floordata) - return; - - // Find the center of the Eggtrap and release all the pretty animals! - // The chimps are my friends.. heeheeheheehehee..... - LouisJM - for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next) - { - if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed) - continue; - mo2 = (mobj_t *)th; - if (mo2->type != MT_EGGTRAP) - continue; - P_KillMobj(mo2, NULL, player->mo, 0); - } - - // clear the special so you can't push the button twice. - sector->special = 0; - - // Initialize my junk - junk.tags.tags = NULL; - junk.tags.count = 0; - - // Move the button down - Tag_FSet(&junk.tags, LE_CAPSULE0); - EV_DoElevator(&junk, elevateDown, false); - - // Open the top FOF - Tag_FSet(&junk.tags, LE_CAPSULE1); - EV_DoFloor(&junk, raiseFloorToNearestFast); - // Open the bottom FOF - Tag_FSet(&junk.tags, LE_CAPSULE2); - EV_DoCeiling(&junk, lowerToLowestFast); - - // Mark all players with the time to exit thingy! - for (i = 0; i < MAXPLAYERS; i++) - { - if (!playeringame[i]) - continue; - P_DoPlayerExit(&players[i]); - } - break; - } - case 10: // Special Stage Time/Rings - case 11: // Custom Gravity - break; - case 12: // Lua sector special - break; - } -DoneSection2: - - special = section3; - - // Process Section 3 - switch (special) - { - case 1: // Unused - case 2: // Wind/Current - case 3: // Unused - case 4: // Conveyor Belt - break; - - case 5: // Speed pad - if (player->powers[pw_flashing] != 0 && player->powers[pw_flashing] < TICRATE/2) - break; - - i = Tag_FindLineSpecial(4, sectag); - - if (i != -1) - { - angle_t lineangle; - fixed_t linespeed; - fixed_t sfxnum; - - lineangle = R_PointToAngle2(lines[i].v1->x, lines[i].v1->y, lines[i].v2->x, lines[i].v2->y); - linespeed = sides[lines[i].sidenum[0]].textureoffset; - - if (linespeed == 0) - { - CONS_Debug(DBG_GAMELOGIC, "ERROR: Speed pad (tag %d) at zero speed.\n", sectag); - break; - } - - player->mo->angle = player->drawangle = lineangle; - - if (!demoplayback || P_ControlStyle(player) == CS_LMAOGALOG) - P_SetPlayerAngle(player, player->mo->angle); - - if (!(lines[i].flags & ML_EFFECT4)) - { - P_UnsetThingPosition(player->mo); - if (roversector) // make FOF speed pads work - { - player->mo->x = roversector->soundorg.x; - player->mo->y = roversector->soundorg.y; - } - else - { - player->mo->x = sector->soundorg.x; - player->mo->y = sector->soundorg.y; - } - P_SetThingPosition(player->mo); - } - - P_InstaThrust(player->mo, player->mo->angle, linespeed); - - if (lines[i].flags & ML_EFFECT5) // Roll! - { - if (!(player->pflags & PF_SPINNING)) - player->pflags |= PF_SPINNING; - - P_SetPlayerMobjState(player->mo, S_PLAY_ROLL); - } - - player->powers[pw_flashing] = TICRATE/3; - - sfxnum = sides[lines[i].sidenum[0]].toptexture; - - if (!sfxnum) - sfxnum = sfx_spdpad; - - S_StartSound(player->mo, sfxnum); - } - break; - - case 6: // Unused - case 7: // Unused - case 8: // Unused - case 9: // Unused - case 10: // Unused - case 11: // Unused - case 12: // Unused - case 13: // Unused - case 14: // Unused - case 15: // Unused - break; - } - - special = section4; - - // Process Section 4 - switch (special) - { - case 1: // Starpost Activator - { - mobj_t *post = P_GetObjectTypeInSectorNum(MT_STARPOST, sector - sectors); - - if (!post) - break; - - P_TouchStarPost(post, player, false); - break; - } - - case 2: // Special stage GOAL sector / Exit Sector / CTF Flag Return - if (player->bot || !(gametyperules & GTR_ALLOWEXIT)) - break; - if (!(maptol & TOL_NIGHTS) && G_IsSpecialStage(gamemap) && player->nightstime > 6) - { - player->nightstime = 6; // Just let P_Ticker take care of the rest. - return; - } - - // Exit (for FOF exits; others are handled in P_PlayerThink in p_user.c) - { - INT32 lineindex; - - P_DoPlayerFinish(player); - - P_SetupSignExit(player); - // important: use sector->tag on next line instead of player->mo->subsector->tag - // this part is different from in P_PlayerThink, this is what was causing - // FOF custom exits not to work. - lineindex = Tag_FindLineSpecial(2, sectag); - - if (G_CoopGametype() && lineindex != -1) // Custom exit! - { - // Special goodies with the block monsters flag depending on emeralds collected - if ((lines[lineindex].flags & ML_BLOCKMONSTERS) && ALL7EMERALDS(emeralds)) - nextmapoverride = (INT16)(lines[lineindex].frontsector->ceilingheight>>FRACBITS); - else - nextmapoverride = (INT16)(lines[lineindex].frontsector->floorheight>>FRACBITS); - - if (lines[lineindex].flags & ML_NOCLIMB) - skipstats = 1; - } - } - break; - - case 3: // Red Team's Base - if ((gametyperules & GTR_TEAMFLAGS) && P_IsObjectOnGround(player->mo)) - { - if (player->ctfteam == 1 && (player->gotflag & GF_BLUEFLAG)) - { - mobj_t *mo; - - // Make sure the red team still has their own - // flag at their base so they can score. - if (!P_IsFlagAtBase(MT_REDFLAG)) - break; - - HU_SetCEchoFlags(V_AUTOFADEOUT|V_ALLOWLOWERCASE); - HU_SetCEchoDuration(5); - HU_DoCEcho(va(M_GetText("\205%s\200\\CAPTURED THE \204BLUE FLAG\200.\\\\\\\\"), player_names[player-players])); - - if (splitscreen || players[consoleplayer].ctfteam == 1) - S_StartSound(NULL, sfx_flgcap); - else if (players[consoleplayer].ctfteam == 2) - S_StartSound(NULL, sfx_lose); - - mo = P_SpawnMobj(player->mo->x,player->mo->y,player->mo->z,MT_BLUEFLAG); - player->gotflag &= ~GF_BLUEFLAG; - mo->flags &= ~MF_SPECIAL; - mo->fuse = TICRATE; - mo->spawnpoint = bflagpoint; - mo->flags2 |= MF2_JUSTATTACKED; - redscore += 1; - P_AddPlayerScore(player, 250); - } - } - break; - - case 4: // Blue Team's Base - if ((gametyperules & GTR_TEAMFLAGS) && P_IsObjectOnGround(player->mo)) - { - if (player->ctfteam == 2 && (player->gotflag & GF_REDFLAG)) - { - mobj_t *mo; - - // Make sure the blue team still has their own - // flag at their base so they can score. - if (!P_IsFlagAtBase(MT_BLUEFLAG)) - break; - - HU_SetCEchoFlags(V_AUTOFADEOUT|V_ALLOWLOWERCASE); - HU_SetCEchoDuration(5); - HU_DoCEcho(va(M_GetText("\204%s\200\\CAPTURED THE \205RED FLAG\200.\\\\\\\\"), player_names[player-players])); - - if (splitscreen || players[consoleplayer].ctfteam == 2) - S_StartSound(NULL, sfx_flgcap); - else if (players[consoleplayer].ctfteam == 1) - S_StartSound(NULL, sfx_lose); - - mo = P_SpawnMobj(player->mo->x,player->mo->y,player->mo->z,MT_REDFLAG); - player->gotflag &= ~GF_REDFLAG; - mo->flags &= ~MF_SPECIAL; - mo->fuse = TICRATE; - mo->spawnpoint = rflagpoint; - mo->flags2 |= MF2_JUSTATTACKED; - bluescore += 1; - P_AddPlayerScore(player, 250); - } - } - break; - - case 5: // Fan sector - player->mo->momz += mobjinfo[MT_FAN].mass/4; - - if (player->mo->momz > mobjinfo[MT_FAN].mass) - player->mo->momz = mobjinfo[MT_FAN].mass; - - P_ResetPlayer(player); - if (player->panim != PA_FALL) - P_SetPlayerMobjState(player->mo, S_PLAY_FALL); - break; - - case 6: // Super Sonic transformer - if (player->mo->health > 0 && !player->bot && (player->charflags & SF_SUPER) && !player->powers[pw_super] && ALL7EMERALDS(emeralds)) - P_DoSuperTransformation(player, true); - break; - - case 7: // Make player spin - if (!(player->pflags & PF_SPINNING)) - { - player->pflags |= PF_SPINNING; - P_SetPlayerMobjState(player->mo, S_PLAY_ROLL); - S_StartAttackSound(player->mo, sfx_spin); - - if (abs(player->rmomx) < FixedMul(5*FRACUNIT, player->mo->scale) - && abs(player->rmomy) < FixedMul(5*FRACUNIT, player->mo->scale)) - P_InstaThrust(player->mo, player->mo->angle, FixedMul(10*FRACUNIT, player->mo->scale)); - } - break; - - case 8: // Zoom Tube Start - { - INT32 sequence; - fixed_t speed; - INT32 lineindex; - mobj_t *waypoint = NULL; - angle_t an; - - if (player->mo->tracer && player->mo->tracer->type == MT_TUBEWAYPOINT && player->powers[pw_carry] == CR_ZOOMTUBE) - break; - - if (player->powers[pw_ignorelatch] & (1<<15)) - break; - - // Find line #3 tagged to this sector - lineindex = Tag_FindLineSpecial(3, sectag); - - if (lineindex == -1) - { - CONS_Debug(DBG_GAMELOGIC, "ERROR: Sector special %d missing line special #3.\n", sector->special); - break; - } - - // Grab speed and sequence values - speed = abs(sides[lines[lineindex].sidenum[0]].textureoffset)/8; - sequence = abs(sides[lines[lineindex].sidenum[0]].rowoffset)>>FRACBITS; - - if (speed == 0) - { - CONS_Debug(DBG_GAMELOGIC, "ERROR: Waypoint sequence %d at zero speed.\n", sequence); - break; - } - - waypoint = P_GetFirstWaypoint(sequence); - - if (!waypoint) - { - CONS_Debug(DBG_GAMELOGIC, "ERROR: FIRST WAYPOINT IN SEQUENCE %d NOT FOUND.\n", sequence); - break; - } - else - { - CONS_Debug(DBG_GAMELOGIC, "Waypoint %d found in sequence %d - speed = %d\n", waypoint->health, sequence, speed); - } - - an = R_PointToAngle2(player->mo->x, player->mo->y, waypoint->x, waypoint->y) - player->mo->angle; - - if (an > ANGLE_90 && an < ANGLE_270 && !(lines[lineindex].flags & ML_EFFECT4)) - break; // behind back - - P_SetTarget(&player->mo->tracer, waypoint); - player->powers[pw_carry] = CR_ZOOMTUBE; - player->speed = speed; - player->pflags |= PF_SPINNING; - player->pflags &= ~(PF_JUMPED|PF_NOJUMPDAMAGE|PF_GLIDING|PF_BOUNCING|PF_SLIDING|PF_CANCARRY); - player->climbing = 0; - - if (player->mo->state-states != S_PLAY_ROLL) - { - P_SetPlayerMobjState(player->mo, S_PLAY_ROLL); - S_StartSound(player->mo, sfx_spin); - } - } - break; - - case 9: // Zoom Tube End - { - INT32 sequence; - fixed_t speed; - INT32 lineindex; - mobj_t *waypoint = NULL; - angle_t an; - - if (player->mo->tracer && player->mo->tracer->type == MT_TUBEWAYPOINT && player->powers[pw_carry] == CR_ZOOMTUBE) - break; - - if (player->powers[pw_ignorelatch] & (1<<15)) - break; - - // Find line #3 tagged to this sector - lineindex = Tag_FindLineSpecial(3, sectag); - - if (lineindex == -1) - { - CONS_Debug(DBG_GAMELOGIC, "ERROR: Sector special %d missing line special #3.\n", sector->special); - break; - } - - // Grab speed and sequence values - speed = -abs(sides[lines[lineindex].sidenum[0]].textureoffset)/8; // Negative means reverse - sequence = abs(sides[lines[lineindex].sidenum[0]].rowoffset)>>FRACBITS; - - if (speed == 0) - { - CONS_Debug(DBG_GAMELOGIC, "ERROR: Waypoint sequence %d at zero speed.\n", sequence); - break; - } - - waypoint = P_GetLastWaypoint(sequence); - - if (!waypoint) - { - CONS_Debug(DBG_GAMELOGIC, "ERROR: LAST WAYPOINT IN SEQUENCE %d NOT FOUND.\n", sequence); - break; - } - else - { - CONS_Debug(DBG_GAMELOGIC, "Waypoint %d found in sequence %d - speed = %d\n", waypoint->health, sequence, speed); - } - - an = R_PointToAngle2(player->mo->x, player->mo->y, waypoint->x, waypoint->y) - player->mo->angle; - - if (an > ANGLE_90 && an < ANGLE_270 && !(lines[lineindex].flags & ML_EFFECT4)) - break; // behind back - - P_SetTarget(&player->mo->tracer, waypoint); - player->powers[pw_carry] = CR_ZOOMTUBE; - player->speed = speed; - player->pflags |= PF_SPINNING; - player->pflags &= ~(PF_JUMPED|PF_NOJUMPDAMAGE|PF_GLIDING|PF_BOUNCING|PF_SLIDING|PF_CANCARRY); - player->climbing = 0; - - if (player->mo->state-states != S_PLAY_ROLL) - { - P_SetPlayerMobjState(player->mo, S_PLAY_ROLL); - S_StartSound(player->mo, sfx_spin); - } - } - break; - - case 10: // Finish Line - if (((gametyperules & (GTR_RACE|GTR_LIVES)) == GTR_RACE) && !player->exiting) - { - if (player->starpostnum == numstarposts) // Must have touched all the starposts - { - player->laps++; - - if (player->powers[pw_carry] == CR_NIGHTSMODE) - player->drillmeter += 48*20; - - if (player->laps >= (UINT8)cv_numlaps.value) - CONS_Printf(M_GetText("%s has finished the race.\n"), player_names[player-players]); - else if (player->laps == (UINT8)cv_numlaps.value-1) - CONS_Printf(M_GetText("%s started the \205final lap\200!\n"), player_names[player-players]); - else - CONS_Printf(M_GetText("%s started lap %u\n"), player_names[player-players], (UINT32)player->laps+1); - - // Reset starposts (checkpoints) info - player->starpostscale = player->starpostangle = player->starposttime = player->starpostnum = 0; - player->starpostx = player->starposty = player->starpostz = 0; - P_ResetStarposts(); - - // Play the starpost sound for 'consistency' - S_StartSound(player->mo, sfx_strpst); - } - else if (player->starpostnum) - { - // blatant reuse of a variable that's normally unused in circuit - if (!player->tossdelay) - S_StartSound(player->mo, sfx_lose); - player->tossdelay = 3; - } - - if (player->laps >= (unsigned)cv_numlaps.value) - { - if (P_IsLocalPlayer(player)) - { - HU_SetCEchoFlags(0); - HU_SetCEchoDuration(5); - HU_DoCEcho("FINISHED!"); - } - - P_DoPlayerExit(player); - } - } - break; - - case 11: // Rope hang - { - INT32 sequence; - fixed_t speed; - INT32 lineindex; - mobj_t *waypointmid = NULL; - mobj_t *waypointhigh = NULL; - mobj_t *waypointlow = NULL; - mobj_t *closest = NULL; - vector3_t p, line[2], resulthigh, resultlow; - - if (player->mo->tracer && player->mo->tracer->type == MT_TUBEWAYPOINT && player->powers[pw_carry] == CR_ROPEHANG) - break; - - if (player->powers[pw_ignorelatch] & (1<<15)) - break; - - if (player->mo->momz > 0) - break; - - if (player->cmd.buttons & BT_SPIN) - break; - - if (!(player->pflags & PF_SLIDING) && player->mo->state == &states[player->mo->info->painstate]) - break; - - if (player->exiting) - break; - - //initialize resulthigh and resultlow with 0 - memset(&resultlow, 0x00, sizeof(resultlow)); - memset(&resulthigh, 0x00, sizeof(resulthigh)); - - // Find line #11 tagged to this sector - lineindex = Tag_FindLineSpecial(11, sectag); - - if (lineindex == -1) - { - CONS_Debug(DBG_GAMELOGIC, "ERROR: Sector special %d missing line special #11.\n", sector->special); - break; - } - - // Grab speed and sequence values - speed = abs(sides[lines[lineindex].sidenum[0]].textureoffset)/8; - sequence = abs(sides[lines[lineindex].sidenum[0]].rowoffset)>>FRACBITS; - - if (speed == 0) - { - CONS_Debug(DBG_GAMELOGIC, "ERROR: Waypoint sequence %d at zero speed.\n", sequence); - break; - } - - // Find the closest waypoint - // Find the preceding waypoint - // Find the proceeding waypoint - // Determine the closest spot on the line between the three waypoints - // Put player at that location. - - waypointmid = P_GetClosestWaypoint(sequence, player->mo); - - if (!waypointmid) - { - CONS_Debug(DBG_GAMELOGIC, "ERROR: WAYPOINT(S) IN SEQUENCE %d NOT FOUND.\n", sequence); - break; - } - - waypointlow = P_GetPreviousWaypoint(waypointmid, true); - waypointhigh = P_GetNextWaypoint(waypointmid, true); - - CONS_Debug(DBG_GAMELOGIC, "WaypointMid: %d; WaypointLow: %d; WaypointHigh: %d\n", - waypointmid->health, waypointlow ? waypointlow->health : -1, waypointhigh ? waypointhigh->health : -1); - - // Now we have three waypoints... the closest one we're near, and the one that comes before, and after. - // Next, we need to find the closest point on the line between each set, and determine which one we're - // closest to. - - p.x = player->mo->x; - p.y = player->mo->y; - p.z = player->mo->z; - - // Waypointmid and Waypointlow: - if (waypointlow) - { - line[0].x = waypointmid->x; - line[0].y = waypointmid->y; - line[0].z = waypointmid->z; - line[1].x = waypointlow->x; - line[1].y = waypointlow->y; - line[1].z = waypointlow->z; - - P_ClosestPointOnLine3D(&p, line, &resultlow); - } - - // Waypointmid and Waypointhigh: - if (waypointhigh) - { - line[0].x = waypointmid->x; - line[0].y = waypointmid->y; - line[0].z = waypointmid->z; - line[1].x = waypointhigh->x; - line[1].y = waypointhigh->y; - line[1].z = waypointhigh->z; - - P_ClosestPointOnLine3D(&p, line, &resulthigh); - } - - // 3D support now available. Disregard the previous notice here. -Red - - P_UnsetThingPosition(player->mo); - P_ResetPlayer(player); - player->mo->momx = player->mo->momy = player->mo->momz = 0; - - if (lines[lineindex].flags & ML_EFFECT1) // Don't wrap - { - mobj_t *highest = P_GetLastWaypoint(sequence); - highest->flags |= MF_SLIDEME; - } - - // Changing the conditions on these ifs to fix issues with snapping to the wrong spot -Red - if ((lines[lineindex].flags & ML_EFFECT1) && waypointmid->health == 0) - { - closest = waypointhigh; - player->mo->x = resulthigh.x; - player->mo->y = resulthigh.y; - player->mo->z = resulthigh.z - P_GetPlayerHeight(player); - } - else if ((lines[lineindex].flags & ML_EFFECT1) && waypointmid->health == numwaypoints[sequence] - 1) - { - closest = waypointmid; - player->mo->x = resultlow.x; - player->mo->y = resultlow.y; - player->mo->z = resultlow.z - P_GetPlayerHeight(player); - } - else - { - if (P_AproxDistance(P_AproxDistance(player->mo->x-resultlow.x, player->mo->y-resultlow.y), - player->mo->z-resultlow.z) < P_AproxDistance(P_AproxDistance(player->mo->x-resulthigh.x, - player->mo->y-resulthigh.y), player->mo->z-resulthigh.z)) - { - // Line between Mid and Low is closer - closest = waypointmid; - player->mo->x = resultlow.x; - player->mo->y = resultlow.y; - player->mo->z = resultlow.z - P_GetPlayerHeight(player); - } - else - { - // Line between Mid and High is closer - closest = waypointhigh; - player->mo->x = resulthigh.x; - player->mo->y = resulthigh.y; - player->mo->z = resulthigh.z - P_GetPlayerHeight(player); - } - } - - P_SetTarget(&player->mo->tracer, closest); - player->powers[pw_carry] = CR_ROPEHANG; - - // Option for static ropes. - if (lines[lineindex].flags & ML_NOCLIMB) - player->speed = 0; - else - player->speed = speed; - - S_StartSound(player->mo, sfx_s3k4a); - - player->pflags &= ~(PF_JUMPED|PF_NOJUMPDAMAGE|PF_GLIDING|PF_BOUNCING|PF_SLIDING|PF_CANCARRY); - player->climbing = 0; - P_SetThingPosition(player->mo); - P_SetPlayerMobjState(player->mo, S_PLAY_RIDE); - } - break; - case 12: // Camera noclip - case 13: // Unused - case 14: // Unused - case 15: // Unused - break; - } + if (!udmf) + P_EvaluateOldSectorSpecial(player, sector, roversector, isTouching); } -/** Checks if an object is standing on or is inside a special 3D floor. - * If so, the sector is returned. - * - * \param mo Object to check. - * \return Pointer to the sector with a special type, or NULL if no special 3D - * floors are being contacted. - * \sa P_PlayerOnSpecial3DFloor - */ -sector_t *P_ThingOnSpecial3DFloor(mobj_t *mo) -{ - sector_t *sector; - ffloor_t *rover; - fixed_t topheight, bottomheight; - - sector = mo->subsector->sector; - if (!sector->ffloors) - return NULL; - - for (rover = sector->ffloors; rover; rover = rover->next) - { - if (!rover->master->frontsector->special) - continue; - - if (!(rover->flags & FF_EXISTS)) - continue; - - topheight = P_GetSpecialTopZ(mo, sectors + rover->secnum, sector); - bottomheight = P_GetSpecialBottomZ(mo, sectors + rover->secnum, sector); - - // Check the 3D floor's type... - if (((rover->flags & FF_BLOCKPLAYER) && mo->player) - || ((rover->flags & FF_BLOCKOTHERS) && !mo->player)) - { - boolean floorallowed = ((rover->master->frontsector->flags & SF_FLIPSPECIAL_FLOOR) && ((rover->master->frontsector->flags & SF_TRIGGERSPECIAL_HEADBUMP) || !(mo->eflags & MFE_VERTICALFLIP)) && (mo->z == topheight)); - boolean ceilingallowed = ((rover->master->frontsector->flags & SF_FLIPSPECIAL_CEILING) && ((rover->master->frontsector->flags & SF_TRIGGERSPECIAL_HEADBUMP) || (mo->eflags & MFE_VERTICALFLIP)) && (mo->z + mo->height == bottomheight)); - // Thing must be on top of the floor to be affected... - if (!(floorallowed || ceilingallowed)) - continue; - } - else - { - // Water and intangible FOFs - if (mo->z > topheight || (mo->z + mo->height) < bottomheight) - continue; - } - - return rover->master->frontsector; - } - - return NULL; -} - -#define TELEPORTED (player->mo->subsector->sector != originalsector) +#define TELEPORTED(mo) (mo->subsector->sector != originalsector) /** Checks if a player is standing on or is inside a 3D floor (e.g. water) and * applies any specials. @@ -5119,200 +5189,58 @@ static void P_PlayerOnSpecial3DFloor(player_t *player, sector_t *sector) { sector_t *originalsector = player->mo->subsector->sector; ffloor_t *rover; - fixed_t topheight, bottomheight; for (rover = sector->ffloors; rover; rover = rover->next) { - if (!rover->master->frontsector->special) + if (!P_SectorHasSpecial(rover->master->frontsector)) continue; - if (!(rover->flags & FF_EXISTS)) + if (!(rover->fofflags & FOF_EXISTS)) continue; - topheight = P_GetSpecialTopZ(player->mo, sectors + rover->secnum, sector); - bottomheight = P_GetSpecialBottomZ(player->mo, sectors + rover->secnum, sector); - - // Check the 3D floor's type... - if (rover->flags & FF_BLOCKPLAYER) - { - boolean floorallowed = ((rover->master->frontsector->flags & SF_FLIPSPECIAL_FLOOR) && ((rover->master->frontsector->flags & SF_TRIGGERSPECIAL_HEADBUMP) || !(player->mo->eflags & MFE_VERTICALFLIP)) && (player->mo->z == topheight)); - boolean ceilingallowed = ((rover->master->frontsector->flags & SF_FLIPSPECIAL_CEILING) && ((rover->master->frontsector->flags & SF_TRIGGERSPECIAL_HEADBUMP) || (player->mo->eflags & MFE_VERTICALFLIP)) && (player->mo->z + player->mo->height == bottomheight)); - // Thing must be on top of the floor to be affected... - if (!(floorallowed || ceilingallowed)) - continue; - } - else - { - // Water and DEATH FOG!!! heh - if (player->mo->z > topheight || (player->mo->z + player->mo->height) < bottomheight) - continue; - } + if (!P_IsMobjTouching3DFloor(player->mo, rover, sector)) + continue; // This FOF has the special we're looking for, but are we allowed to touch it? if (sector == player->mo->subsector->sector - || (rover->master->frontsector->flags & SF_TRIGGERSPECIAL_TOUCH)) + || (rover->master->frontsector->flags & MSF_TRIGGERSPECIAL_TOUCH)) { P_ProcessSpecialSector(player, rover->master->frontsector, sector); - if TELEPORTED return; - } - } - - // Allow sector specials to be applied to polyobjects! - if (player->mo->subsector->polyList) - { - polyobj_t *po = player->mo->subsector->polyList; - sector_t *polysec; - boolean touching = false; - boolean inside = false; - - while (po) - { - if (po->flags & POF_NOSPECIALS) - { - po = (polyobj_t *)(po->link.next); - continue; - } - - polysec = po->lines[0]->backsector; - - if ((polysec->flags & SF_TRIGGERSPECIAL_TOUCH)) - touching = P_MobjTouchingPolyobj(po, player->mo); - else - touching = false; - - inside = P_MobjInsidePolyobj(po, player->mo); - - if (!(inside || touching)) - { - po = (polyobj_t *)(po->link.next); - continue; - } - - // We're inside it! Yess... - if (!polysec->special) - { - po = (polyobj_t *)(po->link.next); - continue; - } - - if (!(po->flags & POF_TESTHEIGHT)) // Don't do height checking - ; - else if (po->flags & POF_SOLID) - { - boolean floorallowed = ((polysec->flags & SF_FLIPSPECIAL_FLOOR) && ((polysec->flags & SF_TRIGGERSPECIAL_HEADBUMP) || !(player->mo->eflags & MFE_VERTICALFLIP)) && (player->mo->z == polysec->ceilingheight)); - boolean ceilingallowed = ((polysec->flags & SF_FLIPSPECIAL_CEILING) && ((polysec->flags & SF_TRIGGERSPECIAL_HEADBUMP) || (player->mo->eflags & MFE_VERTICALFLIP)) && (player->mo->z + player->mo->height == polysec->floorheight)); - // Thing must be on top of the floor to be affected... - if (!(floorallowed || ceilingallowed)) - { - po = (polyobj_t *)(po->link.next); - continue; - } - } - else - { - // Water and DEATH FOG!!! heh - if (player->mo->z > polysec->ceilingheight || (player->mo->z + player->mo->height) < polysec->floorheight) - { - po = (polyobj_t *)(po->link.next); - continue; - } - } - - P_ProcessSpecialSector(player, polysec, sector); - if TELEPORTED return; - - po = (polyobj_t *)(po->link.next); + if TELEPORTED(player->mo) return; } } } -#define VDOORSPEED (FRACUNIT*2) - -// -// P_RunSpecialSectorCheck -// -// Helper function to P_PlayerInSpecialSector -// -static void P_RunSpecialSectorCheck(player_t *player, sector_t *sector) +static void P_PlayerOnSpecialPolyobj(player_t *player) { - boolean nofloorneeded = false; - fixed_t f_affectpoint, c_affectpoint; + sector_t *originalsector = player->mo->subsector->sector; + polyobj_t *po; + sector_t *polysec; + boolean touching = false; + boolean inside = false; - if (!sector->special) // nothing special, exit - return; - - if (GETSECSPECIAL(sector->special, 2) == 9) // Egg trap capsule -- should only be for 3dFloors! - return; - - // The list of specials that activate without floor touch - // Check Section 1 - switch(GETSECSPECIAL(sector->special, 1)) + for (po = player->mo->subsector->polyList; po; po = (polyobj_t *)(po->link.next)) { - case 2: // Damage (water) - case 8: // Instant kill - case 10: // Ring drainer that doesn't require floor touch - case 12: // Space countdown - nofloorneeded = true; - break; + if (po->flags & POF_NOSPECIALS) + continue; + + polysec = po->lines[0]->backsector; + + if (!P_SectorHasSpecial(polysec)) + continue; + + touching = (polysec->flags & MSF_TRIGGERSPECIAL_TOUCH) && P_MobjTouchingPolyobj(po, player->mo); + inside = P_MobjInsidePolyobj(po, player->mo); + + if (!(inside || touching)) + continue; + + if (!P_IsMobjTouchingPolyobj(player->mo, po, polysec)) + continue; + + P_ProcessSpecialSector(player, polysec, originalsector); + if TELEPORTED(player->mo) return; } - - // Check Section 2 - switch(GETSECSPECIAL(sector->special, 2)) - { - case 2: // Linedef executor (All players needed) - case 4: // Linedef executor - case 6: // Linedef executor (7 Emeralds) - case 7: // Linedef executor (NiGHTS Mare) - nofloorneeded = true; - break; - } - - // Check Section 3 -/* switch(GETSECSPECIAL(sector->special, 3)) - { - - }*/ - - // Check Section 4 - switch(GETSECSPECIAL(sector->special, 4)) - { - case 2: // Level Exit / GOAL Sector / Flag Return - if (!(maptol & TOL_NIGHTS) && G_IsSpecialStage(gamemap)) - { - // Special stage GOAL sector - // requires touching floor. - break; - } - /* FALLTHRU */ - - case 1: // Starpost activator - case 5: // Fan sector - case 6: // Super Sonic Transform - case 8: // Zoom Tube Start - case 9: // Zoom Tube End - case 10: // Finish line - nofloorneeded = true; - break; - } - - if (nofloorneeded) - { - P_ProcessSpecialSector(player, sector, NULL); - return; - } - - f_affectpoint = P_GetSpecialBottomZ(player->mo, sector, sector); - c_affectpoint = P_GetSpecialTopZ(player->mo, sector, sector); - - { - boolean floorallowed = ((sector->flags & SF_FLIPSPECIAL_FLOOR) && ((sector->flags & SF_TRIGGERSPECIAL_HEADBUMP) || !(player->mo->eflags & MFE_VERTICALFLIP)) && (player->mo->z == f_affectpoint)); - boolean ceilingallowed = ((sector->flags & SF_FLIPSPECIAL_CEILING) && ((sector->flags & SF_TRIGGERSPECIAL_HEADBUMP) || (player->mo->eflags & MFE_VERTICALFLIP)) && (player->mo->z + player->mo->height == c_affectpoint)); - // Thing must be on top of the floor to be affected... - if (!(floorallowed || ceilingallowed)) - return; - } - - P_ProcessSpecialSector(player, sector, NULL); } /** Checks if the player is in a special sector or FOF and apply any specials. @@ -5332,10 +5260,14 @@ void P_PlayerInSpecialSector(player_t *player) originalsector = player->mo->subsector->sector; P_PlayerOnSpecial3DFloor(player, originalsector); // Handle FOFs first. - if TELEPORTED return; + if TELEPORTED(player->mo) return; - P_RunSpecialSectorCheck(player, originalsector); - if TELEPORTED return; + // Allow sector specials to be applied to polyobjects! + P_PlayerOnSpecialPolyobj(player); + if TELEPORTED(player->mo) return; + + P_ProcessSpecialSector(player, originalsector, NULL); + if TELEPORTED(player->mo) return; // Iterate through touching_sectorlist for SF_TRIGGERSPECIAL_TOUCH for (node = player->mo->touching_sectorlist; node; node = node->m_sectorlist_next) @@ -5347,16 +5279,110 @@ void P_PlayerInSpecialSector(player_t *player) // Check 3D floors... P_PlayerOnSpecial3DFloor(player, loopsector); - if TELEPORTED return; + if TELEPORTED(player->mo) return; - if (!(loopsector->flags & SF_TRIGGERSPECIAL_TOUCH)) + if (!(loopsector->flags & MSF_TRIGGERSPECIAL_TOUCH)) continue; - P_RunSpecialSectorCheck(player, loopsector); - if TELEPORTED return; + P_ProcessSpecialSector(player, loopsector, NULL); + if TELEPORTED(player->mo) return; } } +static void P_CheckMobj3DFloorTrigger(mobj_t *mo, sector_t *sec) +{ + sector_t *originalsector = mo->subsector->sector; + ffloor_t *rover; + + for (rover = sec->ffloors; rover; rover = rover->next) + { + if (!rover->master->frontsector->triggertag) + continue; + + if (rover->master->frontsector->triggerer != TO_MOBJ) + continue; + + if (!(rover->fofflags & FOF_EXISTS)) + continue; + + if (!P_IsMobjTouching3DFloor(mo, rover, sec)) + continue; + + P_LinedefExecute(rover->master->frontsector->triggertag, mo, rover->master->frontsector); + if TELEPORTED(mo) return; + } +} + +static void P_CheckMobjPolyobjTrigger(mobj_t *mo) +{ + sector_t *originalsector = mo->subsector->sector; + polyobj_t *po; + sector_t *polysec; + boolean touching = false; + boolean inside = false; + + for (po = mo->subsector->polyList; po; po = (polyobj_t *)(po->link.next)) + { + if (po->flags & POF_NOSPECIALS) + continue; + + polysec = po->lines[0]->backsector; + + if (!polysec->triggertag) + continue; + + if (polysec->triggerer != TO_MOBJ) + continue; + + touching = (polysec->flags & MSF_TRIGGERSPECIAL_TOUCH) && P_MobjTouchingPolyobj(po, mo); + inside = P_MobjInsidePolyobj(po, mo); + + if (!(inside || touching)) + continue; + + if (!P_IsMobjTouchingPolyobj(mo, po, polysec)) + continue; + + P_LinedefExecute(polysec->triggertag, mo, polysec); + if TELEPORTED(mo) return; + } +} + +static void P_CheckMobjSectorTrigger(mobj_t *mo, sector_t *sec) +{ + if (!sec->triggertag) + return; + + if (sec->triggerer != TO_MOBJ) + return; + + if ((sec->flags & MSF_TRIGGERLINE_PLANE) && !P_IsMobjTouchingSectorPlane(mo, sec)) + return; + + P_LinedefExecute(sec->triggertag, mo, sec); +} + +void P_CheckMobjTrigger(mobj_t *mobj, boolean pushable) +{ + sector_t *originalsector; + + if (!mobj->subsector) + return; + + originalsector = mobj->subsector->sector; + + if (!pushable && !(originalsector->flags & MSF_TRIGGERLINE_MOBJ)) + return; + + P_CheckMobj3DFloorTrigger(mobj, originalsector); + if TELEPORTED(mobj) return; + + P_CheckMobjPolyobjTrigger(mobj); + if TELEPORTED(mobj) return; + + P_CheckMobjSectorTrigger(mobj, originalsector); +} + #undef TELEPORTED /** Animate planes, scroll walls, etc. and keeps track of level timelimit and exits if time is up. @@ -5506,12 +5532,14 @@ static inline void P_AddFFloorToList(sector_t *sec, ffloor_t *fflr) * \param sec Target sector. * \param sec2 Control sector. * \param master Control linedef. + * \param alpha Alpha value (0-255). + * \param blendmode Blending mode. * \param flags Options affecting this 3Dfloor. * \param secthinkers List of relevant thinkers sorted by sector. May be NULL. * \return Pointer to the new 3Dfloor. * \sa P_AddFFloor, P_AddFakeFloorsByLine, P_SpawnSpecials */ -static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, ffloortype_e flags, thinkerlist_t *secthinkers) +static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, INT32 alpha, UINT8 blendmode, ffloortype_e flags, thinkerlist_t *secthinkers) { ffloor_t *fflr; thinker_t *th; @@ -5529,7 +5557,7 @@ static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, f { fixed_t tempceiling = sec2->ceilingheight; //flip the sector around and print an error instead of crashing 12.1.08 -Inuyasha - CONS_Alert(CONS_ERROR, M_GetText("FOF (line %s) has a top height below its bottom.\n"), sizeu1(master - lines)); + CONS_Alert(CONS_ERROR, M_GetText("A FOF tagged %d has a top height below its bottom.\n"), master->args[0]); sec2->ceilingheight = sec2->floorheight; sec2->floorheight = tempceiling; } @@ -5540,7 +5568,7 @@ static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, f sec2->attachedsolid = Z_Malloc(sizeof (*sec2->attachedsolid) * sec2->maxattached, PU_STATIC, NULL); sec2->attached[0] = sec - sectors; sec2->numattached = 1; - sec2->attachedsolid[0] = (flags & FF_SOLID); + sec2->attachedsolid[0] = (flags & FOF_SOLID); } else { @@ -5555,7 +5583,7 @@ static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, f sec2->attachedsolid = Z_Realloc(sec2->attachedsolid, sizeof (*sec2->attachedsolid) * sec2->maxattached, PU_STATIC, NULL); } sec2->attached[sec2->numattached] = sec - sectors; - sec2->attachedsolid[sec2->numattached] = (flags & FF_SOLID); + sec2->attachedsolid[sec2->numattached] = (flags & FOF_SOLID); sec2->numattached++; } @@ -5585,13 +5613,7 @@ static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, f if (sec2->hasslope) sec->hasslope = true; - if ((flags & FF_SOLID) && (master->flags & ML_EFFECT1)) // Block player only - flags &= ~FF_BLOCKOTHERS; - - if ((flags & FF_SOLID) && (master->flags & ML_EFFECT2)) // Block all BUT player - flags &= ~FF_BLOCKPLAYER; - - fflr->spawnflags = fflr->flags = flags; + fflr->spawnflags = fflr->fofflags = flags; fflr->master = master; fflr->norender = INFTICS; fflr->fadingdata = NULL; @@ -5631,45 +5653,60 @@ static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, f p = (pusher_t *)th; if (p->affectee == (INT32)sec2num) - Add_Pusher(p->type, p->x_mag<y_mag<source, (INT32)(sec-sectors), p->affectee, p->exclusive, p->slider); + Add_Pusher(p->type, p->x_mag, p->y_mag, p->z_mag, (INT32)(sec-sectors), p->affectee, p->exclusive, p->slider); } if(secthinkers) i++; else th = th->next; } - - if (flags & FF_TRANSLUCENT) + fflr->alpha = max(0, min(0xff, alpha)); + if (fflr->alpha < 0xff || flags & FOF_SPLAT) { - if (sides[master->sidenum[0]].toptexture > 0) - fflr->alpha = sides[master->sidenum[0]].toptexture; // for future reference, "#0" is 1, and "#255" is 256. Be warned - else - fflr->alpha = 0x80; + fflr->fofflags |= FOF_TRANSLUCENT; + fflr->spawnflags = fflr->fofflags; } - else - fflr->alpha = 0xff; - fflr->spawnalpha = fflr->alpha; // save for netgames - if (flags & FF_QUICKSAND) + switch (blendmode) + { + case TMB_TRANSLUCENT: + default: + fflr->blend = AST_COPY; + break; + case TMB_ADD: + fflr->blend = AST_ADD; + break; + case TMB_SUBTRACT: + fflr->blend = AST_SUBTRACT; + break; + case TMB_REVERSESUBTRACT: + fflr->blend = AST_REVERSESUBTRACT; + break; + case TMB_MODULATE: + fflr->blend = AST_MODULATE; + break; + } + + if (flags & FOF_QUICKSAND) CheckForQuicksand = true; - if ((flags & FF_BUSTUP) || (flags & FF_SHATTER) || (flags & FF_SPINBUST)) + if (flags & FOF_BUSTUP) CheckForBustableBlocks = true; - if ((flags & FF_MARIO)) + if ((flags & FOF_MARIO)) { - if (!(flags & FF_SHATTERBOTTOM)) // Don't change the textures of a brick block, just a question block + if (!(flags & FOF_GOOWATER)) // Don't change the textures of a brick block, just a question block P_AddBlockThinker(sec2, master); CheckForMarioBlocks = true; } - if ((flags & FF_CRUMBLE)) + if ((flags & FOF_CRUMBLE)) sec2->crumblestate = CRUMBLE_WAIT; - if ((flags & FF_FLOATBOB)) + if ((flags & FOF_FLOATBOB)) { - P_AddFloatThinker(sec2, Tag_FGet(&master->tags), master); + P_AddFloatThinker(sec2, master->args[0], master); CheckForFloatBob = true; } @@ -5703,6 +5740,10 @@ static void P_AddFloatThinker(sector_t *sec, UINT16 tag, line_t *sourceline) floater->sector = sec; floater->tag = (INT16)tag; floater->sourceline = sourceline; + + // interpolation + R_CreateInterpolator_SectorPlane(&floater->thinker, sec, false); + R_CreateInterpolator_SectorPlane(&floater->thinker, sec, true); } /** @@ -5732,6 +5773,9 @@ static void P_AddPlaneDisplaceThinker(INT32 type, fixed_t speed, INT32 control, displace->speed = speed; displace->type = type; displace->reverse = reverse; + + // interpolation + R_CreateInterpolator_SectorPlane(&displace->thinker, §ors[affectee], false); } /** Adds a Mario block thinker, which changes the block's texture between blank @@ -5785,12 +5829,16 @@ static void P_AddRaiseThinker(sector_t *sec, INT16 tag, fixed_t speed, fixed_t c raise->ceilingtop = ceilingtop; raise->ceilingbottom = ceilingbottom; - raise->basespeed = speed; + raise->basespeed = speed >> 2; if (lower) raise->flags |= RF_REVERSE; if (spindash) raise->flags |= RF_SPINDASH; + + // interpolation + R_CreateInterpolator_SectorPlane(&raise->thinker, sec, false); + R_CreateInterpolator_SectorPlane(&raise->thinker, sec, true); } static void P_AddAirbob(sector_t *sec, INT16 tag, fixed_t dist, boolean raise, boolean spindash, boolean dynamic) @@ -5816,6 +5864,10 @@ static void P_AddAirbob(sector_t *sec, INT16 tag, fixed_t dist, boolean raise, b airbob->flags |= RF_SPINDASH; if (dynamic) airbob->flags |= RF_DYNAMIC; + + // interpolation + R_CreateInterpolator_SectorPlane(&airbob->thinker, sec, false); + R_CreateInterpolator_SectorPlane(&airbob->thinker, sec, true); } /** Adds a thwomp thinker. @@ -5849,13 +5901,17 @@ static inline void P_AddThwompThinker(sector_t *sec, line_t *sourceline, fixed_t thwomp->floorstartheight = sec->floorheight; thwomp->ceilingstartheight = sec->ceilingheight; thwomp->delay = 1; - thwomp->tag = Tag_FGet(&sourceline->tags); + thwomp->tag = sourceline->args[0]; thwomp->sound = sound; sec->floordata = thwomp; sec->ceilingdata = thwomp; // Start with 'resting' texture sides[sourceline->sidenum[0]].midtexture = sides[sourceline->sidenum[0]].bottomtexture; + + // interpolation + R_CreateInterpolator_SectorPlane(&thwomp->thinker, sec, false); + R_CreateInterpolator_SectorPlane(&thwomp->thinker, sec, true); } /** Adds a thinker which checks if any MF_ENEMY objects with health are in the defined area. @@ -5885,7 +5941,7 @@ static inline void P_AddNoEnemiesThinker(line_t *sourceline) * \sa P_SpawnSpecials, T_EachTimeThinker * \author SSNTails */ -static void P_AddEachTimeThinker(line_t *sourceline) +static void P_AddEachTimeThinker(line_t *sourceline, boolean triggerOnExit) { eachtime_t *eachtime; @@ -5896,7 +5952,7 @@ static void P_AddEachTimeThinker(line_t *sourceline) eachtime->thinker.function.acp1 = (actionf_p1)T_EachTimeThinker; eachtime->sourceline = sourceline; - eachtime->triggerOnExit = !!(sourceline->flags & ML_BOUNCY); + eachtime->triggerOnExit = triggerOnExit; } /** Adds a camera scanner. @@ -5911,8 +5967,6 @@ static inline void P_AddCameraScanner(sector_t *sourcesec, sector_t *actionsecto { elevator_t *elevator; // Why not? LOL - CONS_Alert(CONS_WARNING, M_GetText("Detected a camera scanner effect (linedef type 5). This effect is deprecated and will be removed in the future!\n")); - // create and initialize new elevator thinker elevator = Z_Calloc(sizeof (*elevator), PU_LEVSPEC, NULL); P_AddThinker(THINK_MAIN, &elevator->thinker); @@ -5950,14 +6004,14 @@ void T_LaserFlash(laserthink_t *flash) if (fflr->master != flash->sourceline) continue; - if (!(fflr->flags & FF_EXISTS)) + if (!(fflr->fofflags & FOF_EXISTS)) break; if (leveltime & 2) - //fflr->flags |= FF_RENDERALL; + //fflr->flags |= FOF_RENDERALL; fflr->alpha = 0xB0; else - //fflr->flags &= ~FF_RENDERALL; + //fflr->flags &= ~FOF_RENDERALL; fflr->alpha = 0x90; top = P_GetFFloorTopZAt (fflr, sector->soundorg.x, sector->soundorg.y); @@ -6061,16 +6115,16 @@ void P_InitSpecials(void) globalweather = mapheaderinfo[gamemap-1]->weather; } -static void P_ApplyFlatAlignment(line_t *master, sector_t *sector, angle_t flatangle, fixed_t xoffs, fixed_t yoffs) +void P_ApplyFlatAlignment(sector_t *sector, angle_t flatangle, fixed_t xoffs, fixed_t yoffs, boolean floor, boolean ceiling) { - if (!(master->flags & ML_NETONLY)) // Modify floor flat alignment unless ML_NETONLY flag is set + if (floor) { sector->floorpic_angle = flatangle; sector->floor_xoffs += xoffs; sector->floor_yoffs += yoffs; } - if (!(master->flags & ML_NONET)) // Modify ceiling flat alignment unless ML_NONET flag is set + if (ceiling) { sector->ceilingpic_angle = flatangle; sector->ceiling_xoffs += xoffs; @@ -6079,6 +6133,58 @@ static void P_ApplyFlatAlignment(line_t *master, sector_t *sector, angle_t flata } +static void P_MakeFOFBouncy(line_t *paramline, line_t *masterline) +{ + INT32 s; + + if (masterline->special < 100 || masterline->special >= 300) + return; + + TAG_ITER_SECTORS(masterline->args[0], s) + { + ffloor_t *rover; + + for (rover = sectors[s].ffloors; rover; rover = rover->next) + { + if (rover->master != masterline) + continue; + + rover->fofflags |= FOF_BOUNCY; + rover->spawnflags |= FOF_BOUNCY; + rover->bouncestrength = (paramline->args[1]<< FRACBITS)/100; + CheckForBouncySector = true; + break; + } + } + +} + +static boolean P_CheckGametypeRules(INT32 checktype, UINT32 target) +{ + switch (checktype) + { + case TMF_HASALL: + default: + return (gametyperules & target) == target; + case TMF_HASANY: + return !!(gametyperules & target); + case TMF_HASEXACTLY: + return gametyperules == target; + case TMF_DOESNTHAVEALL: + return (gametyperules & target) != target; + case TMF_DOESNTHAVEANY: + return !(gametyperules & target); + } +} + +fixed_t P_GetSectorGravityFactor(sector_t *sec) +{ + if (sec->gravityptr) + return FixedDiv(*sec->gravityptr >> FRACBITS, 1000); + else + return sec->gravity; +} + /** After the map has loaded, scans for specials that spawn 3Dfloors and * thinkers. * @@ -6107,19 +6213,29 @@ void P_SpawnSpecials(boolean fromnetsave) sector = sectors; for (i = 0; i < numsectors; i++, sector++) { - if (!sector->special) + CheckForReverseGravity |= (sector->flags & MSF_GRAVITYFLIP); + + if (sector->specialflags & SSF_FINISHLINE) + { + if ((gametyperules & (GTR_RACE|GTR_LIVES)) == GTR_RACE) + circuitmap = true; + } + + if (sector->damagetype == SD_SPIKE) { + //Terrible hack to replace an even worse hack: + //Spike damage automatically sets MSF_TRIGGERSPECIAL_TOUCH. + //Yes, this also affects other specials on the same sector. Sorry. + sector->flags |= MSF_TRIGGERSPECIAL_TOUCH; + } + + // Process deprecated binary sector specials + if (udmf || !sector->special) continue; // Process Section 1 switch(GETSECSPECIAL(sector->special, 1)) { - case 5: // Spikes - //Terrible hack to replace an even worse hack: - //Spike damage automatically sets SF_TRIGGERSPECIAL_TOUCH. - //Yes, this also affects other specials on the same sector. Sorry. - sector->flags |= SF_TRIGGERSPECIAL_TOUCH; - break; - case 15: // Bouncy sector + case 15: // Bouncy FOF CheckForBouncySector = true; break; } @@ -6136,21 +6252,6 @@ void P_SpawnSpecials(boolean fromnetsave) gravity = sector->floorheight/1000; break; } - - // Process Section 3 -/* switch(GETSECSPECIAL(player->specialsector, 3)) - { - - }*/ - - // Process Section 4 - switch(GETSECSPECIAL(sector->special, 4)) - { - case 10: // Circuit finish line - if ((gametyperules & (GTR_RACE|GTR_LIVES)) == GTR_RACE) - circuitmap = true; - break; - } } P_SpawnScrollers(); // Add generalized scrollers @@ -6197,665 +6298,686 @@ void P_SpawnSpecials(boolean fromnetsave) // Init line EFFECTs for (i = 0; i < numlines; i++) { - mtag_t tag = Tag_FGet(&lines[i].tags); - - if (lines[i].special != 7) // This is a hack. I can at least hope nobody wants to prevent flat alignment in netgames... + // set line specials to 0 here too, same reason as above + if (netgame || multiplayer) { - // set line specials to 0 here too, same reason as above - if (netgame || multiplayer) - { - if (lines[i].flags & ML_NONET) - { - lines[i].special = 0; - continue; - } - } - else if (lines[i].flags & ML_NETONLY) + if (lines[i].flags & ML_NONET) { lines[i].special = 0; continue; } } + else if (lines[i].flags & ML_NETONLY) + { + lines[i].special = 0; + continue; + } switch (lines[i].special) { INT32 s; + INT32 l; size_t sec; ffloortype_e ffloorflags; case 1: // Definable gravity per sector + if (udmf) + break; + sec = sides[*lines[i].sidenum].sector - sectors; - TAG_ITER_SECTORS(tag, s) + TAG_ITER_SECTORS(Tag_FGet(&lines[i].tags), s) { - sectors[s].gravity = §ors[sec].floorheight; // This allows it to change in realtime! + sectors[s].gravityptr = §ors[sec].floorheight; // This allows it to change in realtime! if (lines[i].flags & ML_NOCLIMB) - sectors[s].verticalflip = true; + sectors[s].flags |= MSF_GRAVITYFLIP; else - sectors[s].verticalflip = false; + sectors[s].flags &= ~MSF_GRAVITYFLIP; - CheckForReverseGravity = sectors[s].verticalflip; + if (lines[i].flags & ML_EFFECT6) + sectors[s].specialflags |= SSF_GRAVITYOVERRIDE; + + CheckForReverseGravity |= (sectors[s].flags & MSF_GRAVITYFLIP); } break; - case 2: // Custom exit - break; - - case 3: // Zoom Tube Parameters - break; - - case 4: // Speed pad (combines with sector special Section3:5 or Section3:6) - break; - case 5: // Change camera info + if (udmf) + break; + sec = sides[*lines[i].sidenum].sector - sectors; - TAG_ITER_SECTORS(tag, s) + TAG_ITER_SECTORS(Tag_FGet(&lines[i].tags), s) P_AddCameraScanner(§ors[sec], §ors[s], R_PointToAngle2(lines[i].v2->x, lines[i].v2->y, lines[i].v1->x, lines[i].v1->y)); break; case 7: // Flat alignment - redone by toast - if ((lines[i].flags & (ML_NETONLY|ML_NONET)) != (ML_NETONLY|ML_NONET)) // If you can do something... + { + // Set calculated offsets such that line's v1 is the apparent origin + angle_t flatangle = InvAngle(R_PointToAngle2(lines[i].v1->x, lines[i].v1->y, lines[i].v2->x, lines[i].v2->y)); + fixed_t xoffs = -lines[i].v1->x; + fixed_t yoffs = lines[i].v1->y; + + //If no tag is given, apply to front sector + if (lines[i].args[0] == 0) + P_ApplyFlatAlignment(lines[i].frontsector, flatangle, xoffs, yoffs, lines[i].args[1] != TMP_CEILING, lines[i].args[1] != TMP_FLOOR); + else { - angle_t flatangle = InvAngle(R_PointToAngle2(lines[i].v1->x, lines[i].v1->y, lines[i].v2->x, lines[i].v2->y)); - fixed_t xoffs; - fixed_t yoffs; - - if (lines[i].flags & ML_EFFECT6) // Set offset through x and y texture offsets if ML_EFFECT6 flag is set - { - xoffs = sides[lines[i].sidenum[0]].textureoffset; - yoffs = sides[lines[i].sidenum[0]].rowoffset; - } - else // Otherwise, set calculated offsets such that line's v1 is the apparent origin - { - xoffs = -lines[i].v1->x; - yoffs = lines[i].v1->y; - } - - //If no tag is given, apply to front sector - if (tag == 0) - P_ApplyFlatAlignment(lines + i, lines[i].frontsector, flatangle, xoffs, yoffs); - else - { - TAG_ITER_SECTORS(tag, s) - P_ApplyFlatAlignment(lines + i, sectors + s, flatangle, xoffs, yoffs); - } - } - else // Otherwise, print a helpful warning. Can I do no less? - CONS_Alert(CONS_WARNING, - M_GetText("Flat alignment linedef (tag %d) doesn't have anything to do.\nConsider changing the linedef's flag configuration or removing it entirely.\n"), - tag); - break; - - case 8: // Sector Parameters - TAG_ITER_SECTORS(tag, s) - { - if (lines[i].flags & ML_NOCLIMB) - { - sectors[s].flags &= ~SF_FLIPSPECIAL_FLOOR; - sectors[s].flags |= SF_FLIPSPECIAL_CEILING; - } - else if (lines[i].flags & ML_EFFECT4) - sectors[s].flags |= SF_FLIPSPECIAL_BOTH; - - if (lines[i].flags & ML_EFFECT3) - sectors[s].flags |= SF_TRIGGERSPECIAL_TOUCH; - if (lines[i].flags & ML_EFFECT2) - sectors[s].flags |= SF_TRIGGERSPECIAL_HEADBUMP; - - if (lines[i].flags & ML_EFFECT1) - sectors[s].flags |= SF_INVERTPRECIP; - - if (lines[i].frontsector && GETSECSPECIAL(lines[i].frontsector->special, 4) == 12) - sectors[s].camsec = sides[*lines[i].sidenum].sector-sectors; + TAG_ITER_SECTORS(lines[i].args[0], s) + P_ApplyFlatAlignment(sectors + s, flatangle, xoffs, yoffs, lines[i].args[1] != TMP_CEILING, lines[i].args[1] != TMP_FLOOR); } break; + } - case 9: // Chain Parameters + case 8: // Set camera collision planes + if (lines[i].frontsector) + TAG_ITER_SECTORS(lines[i].args[0], s) + sectors[s].camsec = lines[i].frontsector-sectors; break; case 10: // Vertical culling plane for sprites and FOFs - TAG_ITER_SECTORS(tag, s) + TAG_ITER_SECTORS(lines[i].args[0], s) sectors[s].cullheight = &lines[i]; // This allows it to change in realtime! break; case 50: // Insta-Lower Sector - EV_DoFloor(&lines[i], instantLower); + if (!udmf) + EV_DoFloor(lines[i].args[0], &lines[i], instantLower); break; case 51: // Instant raise for ceilings - EV_DoCeiling(&lines[i], instantRaise); + if (!udmf) + EV_DoCeiling(lines[i].args[0], &lines[i], instantRaise); break; case 52: // Continuously Falling sector - EV_DoContinuousFall(lines[i].frontsector, lines[i].backsector, P_AproxDistance(lines[i].dx, lines[i].dy), (lines[i].flags & ML_NOCLIMB)); + EV_DoContinuousFall(lines[i].frontsector, lines[i].backsector, lines[i].args[0] << FRACBITS, lines[i].args[1]); break; - case 53: // New super cool and awesome moving floor and ceiling type - case 54: // New super cool and awesome moving floor type + case 53: // Continuous plane movement (slowdown) if (lines[i].backsector) - EV_DoFloor(&lines[i], bounceFloor); - if (lines[i].special == 54) - break; - /* FALLTHRU */ - - case 55: // New super cool and awesome moving ceiling type - if (lines[i].backsector) - EV_DoCeiling(&lines[i], bounceCeiling); + { + if (lines[i].args[1] != TMP_CEILING) + EV_DoFloor(lines[i].args[0], &lines[i], bounceFloor); + if (lines[i].args[1] != TMP_FLOOR) + EV_DoCeiling(lines[i].args[0], &lines[i], bounceCeiling); + } break; - case 56: // New super cool and awesome moving floor and ceiling crush type - case 57: // New super cool and awesome moving floor crush type + case 56: // Continuous plane movement (constant) if (lines[i].backsector) - EV_DoFloor(&lines[i], bounceFloorCrush); - - if (lines[i].special == 57) - break; //only move the floor - /* FALLTHRU */ - - case 58: // New super cool and awesome moving ceiling crush type - if (lines[i].backsector) - EV_DoCeiling(&lines[i], bounceCeilingCrush); + { + if (lines[i].args[1] != TMP_CEILING) + EV_DoFloor(lines[i].args[0], &lines[i], bounceFloorCrush); + if (lines[i].args[1] != TMP_FLOOR) + EV_DoCeiling(lines[i].args[0], &lines[i], bounceCeilingCrush); + } break; - case 59: // Activate floating platform - EV_DoElevator(&lines[i], elevateContinuous, false); - break; - - case 60: // Floating platform with adjustable speed - EV_DoElevator(&lines[i], elevateContinuous, true); + case 60: // Moving platform + EV_DoElevator(lines[i].args[0], &lines[i], elevateContinuous); break; case 61: // Crusher! - EV_DoCrush(&lines[i], crushAndRaise); - break; - - case 62: // Crusher (up and then down)! - EV_DoCrush(&lines[i], fastCrushAndRaise); + EV_DoCrush(lines[i].args[0], &lines[i], lines[i].args[1] ? raiseAndCrush : crushAndRaise); break; case 63: // support for drawn heights coming from different sector sec = sides[*lines[i].sidenum].sector-sectors; - TAG_ITER_SECTORS(tag, s) + TAG_ITER_SECTORS(lines[i].args[0], s) sectors[s].heightsec = (INT32)sec; break; case 64: // Appearing/Disappearing FOF option - if (lines[i].flags & ML_BLOCKMONSTERS) { // Find FOFs by control sector tag - TAG_ITER_SECTORS(tag, s) - for (j = 0; (unsigned)j < sectors[s].linecount; j++) - if (sectors[s].lines[j]->special >= 100 && sectors[s].lines[j]->special < 300) - Add_MasterDisappearer(abs(lines[i].dx>>FRACBITS), abs(lines[i].dy>>FRACBITS), abs(sides[lines[i].sidenum[0]].sector->floorheight>>FRACBITS), (INT32)(sectors[s].lines[j]-lines), (INT32)i); - } else // Find FOFs by effect sector tag + if (lines[i].args[0] == 0) // Find FOFs by control sector tag { - TAG_ITER_LINES(tag, s) + TAG_ITER_SECTORS(lines[i].args[1], s) { - if ((size_t)s == i) + for (j = 0; (unsigned)j < sectors[s].linecount; j++) + { + if (sectors[s].lines[j]->special < 100 || sectors[s].lines[j]->special >= 300) + continue; + + Add_MasterDisappearer(abs(lines[i].args[2]), abs(lines[i].args[3]), abs(lines[i].args[4]), (INT32)(sectors[s].lines[j] - lines), (INT32)i); + } + } + } + else // Find FOFs by effect sector tag + { + TAG_ITER_LINES(lines[i].args[0], s) + { + if (lines[s].special < 100 || lines[s].special >= 300) continue; - if (Tag_Find(&sides[lines[s].sidenum[0]].sector->tags, Tag_FGet(&sides[lines[i].sidenum[0]].sector->tags))) - Add_MasterDisappearer(abs(lines[i].dx>>FRACBITS), abs(lines[i].dy>>FRACBITS), abs(sides[lines[i].sidenum[0]].sector->floorheight>>FRACBITS), s, (INT32)i); + + if (lines[i].args[1] != 0 && !Tag_Find(&lines[s].frontsector->tags, lines[i].args[1])) + continue; + + Add_MasterDisappearer(abs(lines[i].args[2]), abs(lines[i].args[3]), abs(lines[i].args[4]), s, (INT32)i); } } break; - case 66: // Displace floor by front sector - TAG_ITER_SECTORS(tag, s) - P_AddPlaneDisplaceThinker(pd_floor, P_AproxDistance(lines[i].dx, lines[i].dy)>>8, sides[lines[i].sidenum[0]].sector-sectors, s, !!(lines[i].flags & ML_NOCLIMB)); - break; - case 67: // Displace ceiling by front sector - TAG_ITER_SECTORS(tag, s) - P_AddPlaneDisplaceThinker(pd_ceiling, P_AproxDistance(lines[i].dx, lines[i].dy)>>8, sides[lines[i].sidenum[0]].sector-sectors, s, !!(lines[i].flags & ML_NOCLIMB)); - break; - case 68: // Displace both floor AND ceiling by front sector - TAG_ITER_SECTORS(tag, s) - P_AddPlaneDisplaceThinker(pd_both, P_AproxDistance(lines[i].dx, lines[i].dy)>>8, sides[lines[i].sidenum[0]].sector-sectors, s, !!(lines[i].flags & ML_NOCLIMB)); + case 66: // Displace planes by front sector + TAG_ITER_SECTORS(lines[i].args[0], s) + P_AddPlaneDisplaceThinker(lines[i].args[1], abs(lines[i].args[2])<<8, sides[lines[i].sidenum[0]].sector-sectors, s, lines[i].args[2] < 0); break; - case 100: // FOF (solid, opaque, shadows) - P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL, secthinkers); - break; - - case 101: // FOF (solid, opaque, no shadows) - P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_NOSHADE|FF_CUTLEVEL, secthinkers); - break; - - case 102: // TL block: FOF (solid, translucent) - ffloorflags = FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_NOSHADE|FF_TRANSLUCENT|FF_EXTRA|FF_CUTEXTRA; - - // Draw the 'insides' of the block too - if (lines[i].flags & ML_NOCLIMB) + case 70: // Add raise thinker to FOF + if (udmf) { - ffloorflags |= FF_CUTLEVEL|FF_BOTHPLANES|FF_ALLSIDES; - ffloorflags &= ~(FF_EXTRA|FF_CUTEXTRA); + fixed_t destheight = lines[i].args[2] << FRACBITS; + fixed_t startheight, topheight, bottomheight; + + TAG_ITER_LINES(lines[i].args[0], l) + { + if (lines[l].special < 100 || lines[l].special >= 300) + continue; + + startheight = lines[l].frontsector->ceilingheight; + topheight = max(startheight, destheight); + bottomheight = min(startheight, destheight); + + P_AddRaiseThinker(lines[l].frontsector, lines[l].args[0], lines[i].args[1] << FRACBITS, topheight, bottomheight, (destheight < startheight), !!(lines[i].args[3])); + } + } + break; + + case 71: // Add air bob thinker to FOF + if (udmf) + { + TAG_ITER_LINES(lines[i].args[0], l) + { + if (lines[l].special < 100 || lines[l].special >= 300) + continue; + + P_AddAirbob(lines[l].frontsector, lines[l].args[0], lines[i].args[1] << FRACBITS, !!(lines[i].args[2] & TMFB_REVERSE), !!(lines[i].args[2] & TMFB_SPINDASH), !!(lines[i].args[2] & TMFB_DYNAMIC)); + } + } + break; + + case 72: // Add thwomp thinker to FOF + if (udmf) + { + UINT16 sound = (lines[i].stringargs[0]) ? get_number(lines[i].stringargs[0]) : sfx_thwomp; + + TAG_ITER_LINES(lines[i].args[0], l) + { + if (lines[l].special < 100 || lines[l].special >= 300) + continue; + + P_AddThwompThinker(lines[l].frontsector, &lines[l], lines[i].args[1] << (FRACBITS - 3), lines[i].args[2] << (FRACBITS - 3), sound); + } + } + break; + + case 73: // Add laser thinker to FOF + if (udmf) + { + TAG_ITER_LINES(lines[i].args[0], l) + { + if (lines[l].special < 100 || lines[l].special >= 300) + continue; + + P_AddLaserThinker(lines[l].args[0], lines + l, !!(lines[i].args[1])); + } + } + break; + + case 100: // FOF (solid) + ffloorflags = FOF_EXISTS|FOF_SOLID|FOF_RENDERALL; + + //Appearance settings + if (lines[i].args[3] & TMFA_NOPLANES) + ffloorflags &= ~FOF_RENDERPLANES; + if (lines[i].args[3] & TMFA_NOSIDES) + ffloorflags &= ~FOF_RENDERSIDES; + if (lines[i].args[3] & TMFA_INSIDES) + { + if (ffloorflags & FOF_RENDERPLANES) + ffloorflags |= FOF_BOTHPLANES; + if (ffloorflags & FOF_RENDERSIDES) + ffloorflags |= FOF_ALLSIDES; + } + if (lines[i].args[3] & TMFA_ONLYINSIDES) + { + if (ffloorflags & FOF_RENDERPLANES) + ffloorflags |= FOF_INVERTPLANES; + if (ffloorflags & FOF_RENDERSIDES) + ffloorflags |= FOF_INVERTSIDES; + } + if (lines[i].args[3] & TMFA_NOSHADE) + ffloorflags |= FOF_NOSHADE; + if (lines[i].args[3] & TMFA_SPLAT) + ffloorflags |= FOF_SPLAT; + + //Tangibility settings + if (lines[i].args[4] & TMFT_INTANGIBLETOP) + ffloorflags |= FOF_REVERSEPLATFORM; + if (lines[i].args[4] & TMFT_INTANGIBLEBOTTOM) + ffloorflags |= FOF_PLATFORM; + if (lines[i].args[4] & TMFT_DONTBLOCKPLAYER) + ffloorflags &= ~FOF_BLOCKPLAYER; + if (lines[i].args[4] & TMFT_DONTBLOCKOTHERS) + ffloorflags &= ~FOF_BLOCKOTHERS; + + //Cutting options + if (ffloorflags & FOF_RENDERALL) + { + //If inside is visible, cut inner walls + if ((lines[i].args[1] < 255) || (lines[i].args[3] & TMFA_SPLAT) || (lines[i].args[4] & TMFT_VISIBLEFROMINSIDE)) + ffloorflags |= FOF_CUTEXTRA|FOF_EXTRA; + else + ffloorflags |= FOF_CUTLEVEL; } - P_AddFakeFloorsByLine(i, ffloorflags, secthinkers); + P_AddFakeFloorsByLine(i, lines[i].args[1], lines[i].args[2], ffloorflags, secthinkers); break; - case 103: // Solid FOF with no floor/ceiling (quite possibly useless) - P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERSIDES|FF_NOSHADE|FF_CUTLEVEL, secthinkers); + case 120: // FOF (water) + ffloorflags = FOF_EXISTS|FOF_RENDERPLANES|FOF_SWIMMABLE|FOF_BOTHPLANES|FOF_CUTEXTRA|FOF_EXTRA|FOF_CUTSPRITES; + if (!(lines[i].args[3] & TMFW_NOSIDES)) + ffloorflags |= FOF_RENDERSIDES|FOF_ALLSIDES; + if (lines[i].args[3] & TMFW_DOUBLESHADOW) + ffloorflags |= FOF_DOUBLESHADOW; + if (lines[i].args[3] & TMFW_COLORMAPONLY) + ffloorflags |= FOF_COLORMAPONLY; + if (!(lines[i].args[3] & TMFW_NORIPPLE)) + ffloorflags |= FOF_RIPPLE; + if (lines[i].args[3] & TMFW_GOOWATER) + ffloorflags |= FOF_GOOWATER; + if (lines[i].args[3] & TMFW_SPLAT) + ffloorflags |= FOF_SPLAT; + P_AddFakeFloorsByLine(i, lines[i].args[1], lines[i].args[2], ffloorflags, secthinkers); break; - case 104: // 3D Floor type that doesn't draw sides - // If line has no-climb set, give it shadows, otherwise don't - ffloorflags = FF_EXISTS|FF_SOLID|FF_RENDERPLANES|FF_CUTLEVEL; - if (!(lines[i].flags & ML_NOCLIMB)) - ffloorflags |= FF_NOSHADE; - - P_AddFakeFloorsByLine(i, ffloorflags, secthinkers); + case 150: // FOF (Air bobbing) + P_AddFakeFloorsByLine(i, 0xff, TMB_TRANSLUCENT, FOF_EXISTS|FOF_SOLID|FOF_RENDERALL, secthinkers); + P_AddAirbob(lines[i].frontsector, lines[i].args[0], lines[i].args[1] << FRACBITS, !!(lines[i].args[2] & TMFB_REVERSE), !!(lines[i].args[2] & TMFB_SPINDASH), !!(lines[i].args[2] & TMFB_DYNAMIC)); break; - case 105: // FOF (solid, invisible) - P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_NOSHADE, secthinkers); + case 160: // FOF (Water bobbing) + P_AddFakeFloorsByLine(i, 0xff, TMB_TRANSLUCENT, FOF_EXISTS|FOF_SOLID|FOF_RENDERALL|FOF_FLOATBOB, secthinkers); break; - case 120: // Opaque water - ffloorflags = FF_EXISTS|FF_RENDERALL|FF_SWIMMABLE|FF_BOTHPLANES|FF_ALLSIDES|FF_CUTEXTRA|FF_EXTRA|FF_CUTSPRITES; - if (lines[i].flags & ML_NOCLIMB) - ffloorflags |= FF_DOUBLESHADOW; - if (lines[i].flags & ML_EFFECT4) - ffloorflags |= FF_COLORMAPONLY; - if (lines[i].flags & ML_EFFECT5) - ffloorflags |= FF_RIPPLE; - P_AddFakeFloorsByLine(i, ffloorflags, secthinkers); - break; + case 170: // FOF (Crumbling) + ffloorflags = FOF_EXISTS|FOF_SOLID|FOF_RENDERALL|FOF_CRUMBLE; - case 121: // TL water - ffloorflags = FF_EXISTS|FF_RENDERALL|FF_TRANSLUCENT|FF_SWIMMABLE|FF_BOTHPLANES|FF_ALLSIDES|FF_CUTEXTRA|FF_EXTRA|FF_CUTSPRITES; - if (lines[i].flags & ML_NOCLIMB) - ffloorflags |= FF_DOUBLESHADOW; - if (lines[i].flags & ML_EFFECT4) - ffloorflags |= FF_COLORMAPONLY; - if (lines[i].flags & ML_EFFECT5) - ffloorflags |= FF_RIPPLE; - P_AddFakeFloorsByLine(i, ffloorflags, secthinkers); - break; + //Tangibility settings + if (lines[i].args[3] & TMFT_INTANGIBLETOP) + ffloorflags |= FOF_REVERSEPLATFORM; + if (lines[i].args[3] & TMFT_INTANGIBLEBOTTOM) + ffloorflags |= FOF_PLATFORM; + if (lines[i].args[3] & TMFT_DONTBLOCKPLAYER) + ffloorflags &= ~FOF_BLOCKPLAYER; + if (lines[i].args[3] & TMFT_DONTBLOCKOTHERS) + ffloorflags &= ~FOF_BLOCKOTHERS; - case 122: // Opaque water, no sides - ffloorflags = FF_EXISTS|FF_RENDERPLANES|FF_SWIMMABLE|FF_BOTHPLANES|FF_CUTEXTRA|FF_EXTRA|FF_CUTSPRITES; - if (lines[i].flags & ML_NOCLIMB) - ffloorflags |= FF_DOUBLESHADOW; - if (lines[i].flags & ML_EFFECT4) - ffloorflags |= FF_COLORMAPONLY; - if (lines[i].flags & ML_EFFECT5) - ffloorflags |= FF_RIPPLE; - P_AddFakeFloorsByLine(i, ffloorflags, secthinkers); - break; + //Flags + if (lines[i].args[4] & TMFC_NOSHADE) + ffloorflags |= FOF_NOSHADE; + if (lines[i].args[4] & TMFC_NORETURN) + ffloorflags |= FOF_NORETURN; + if (lines[i].args[4] & TMFC_FLOATBOB) + ffloorflags |= FOF_FLOATBOB; + if (lines[i].args[4] & TMFC_SPLAT) + ffloorflags |= FOF_SPLAT; - case 123: // TL water, no sides - ffloorflags = FF_EXISTS|FF_RENDERPLANES|FF_TRANSLUCENT|FF_SWIMMABLE|FF_BOTHPLANES|FF_CUTEXTRA|FF_EXTRA|FF_CUTSPRITES; - if (lines[i].flags & ML_NOCLIMB) - ffloorflags |= FF_DOUBLESHADOW; - if (lines[i].flags & ML_EFFECT4) - ffloorflags |= FF_COLORMAPONLY; - if (lines[i].flags & ML_EFFECT5) - ffloorflags |= FF_RIPPLE; - P_AddFakeFloorsByLine(i, ffloorflags, secthinkers); - break; + //If inside is visible, cut inner walls + if (lines[i].args[1] < 0xff || (lines[i].args[3] & TMFT_VISIBLEFROMINSIDE) || (lines[i].args[4] & TMFC_SPLAT)) + ffloorflags |= FOF_CUTEXTRA|FOF_EXTRA; + else + ffloorflags |= FOF_CUTLEVEL; - case 124: // goo water - ffloorflags = FF_EXISTS|FF_RENDERALL|FF_TRANSLUCENT|FF_SWIMMABLE|FF_GOOWATER|FF_BOTHPLANES|FF_ALLSIDES|FF_CUTEXTRA|FF_EXTRA|FF_CUTSPRITES; - if (lines[i].flags & ML_NOCLIMB) - ffloorflags |= FF_DOUBLESHADOW; - if (lines[i].flags & ML_EFFECT4) - ffloorflags |= FF_COLORMAPONLY; - if (lines[i].flags & ML_EFFECT5) - ffloorflags |= FF_RIPPLE; - P_AddFakeFloorsByLine(i, ffloorflags, secthinkers); - break; - - case 125: // goo water, no sides - ffloorflags = FF_EXISTS|FF_RENDERPLANES|FF_TRANSLUCENT|FF_SWIMMABLE|FF_GOOWATER|FF_BOTHPLANES|FF_CUTEXTRA|FF_EXTRA|FF_CUTSPRITES; - if (lines[i].flags & ML_NOCLIMB) - ffloorflags |= FF_DOUBLESHADOW; - if (lines[i].flags & ML_EFFECT4) - ffloorflags |= FF_COLORMAPONLY; - if (lines[i].flags & ML_EFFECT5) - ffloorflags |= FF_RIPPLE; - P_AddFakeFloorsByLine(i, ffloorflags, secthinkers); - break; - - case 140: // 'Platform' - You can jump up through it - // If line has no-climb set, don't give it shadows, otherwise do - ffloorflags = FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_PLATFORM|FF_BOTHPLANES|FF_ALLSIDES; - if (lines[i].flags & ML_NOCLIMB) - ffloorflags |= FF_NOSHADE; - - P_AddFakeFloorsByLine(i, ffloorflags, secthinkers); - break; - - case 141: // Translucent "platform" - // If line has no-climb set, don't give it shadows, otherwise do - ffloorflags = FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_PLATFORM|FF_TRANSLUCENT|FF_EXTRA|FF_CUTEXTRA; - if (lines[i].flags & ML_NOCLIMB) - ffloorflags |= FF_NOSHADE; - - // Draw the 'insides' of the block too - if (lines[i].flags & ML_EFFECT2) + //If player can enter it, render insides + if (lines[i].args[3] & TMFT_VISIBLEFROMINSIDE) { - ffloorflags |= FF_CUTLEVEL|FF_BOTHPLANES|FF_ALLSIDES; - ffloorflags &= ~(FF_EXTRA|FF_CUTEXTRA); + if (ffloorflags & FOF_RENDERPLANES) + ffloorflags |= FOF_BOTHPLANES; + if (ffloorflags & FOF_RENDERSIDES) + ffloorflags |= FOF_ALLSIDES; } - P_AddFakeFloorsByLine(i, ffloorflags, secthinkers); + P_AddFakeFloorsByLine(i, lines[i].args[1], lines[i].args[2], ffloorflags, secthinkers); + if (lines[i].args[4] & TMFC_AIRBOB) + P_AddAirbob(lines[i].frontsector, lines[i].args[0], 16*FRACUNIT, false, false, false); break; - case 142: // Translucent "platform" with no sides - ffloorflags = FF_EXISTS|FF_SOLID|FF_RENDERPLANES|FF_TRANSLUCENT|FF_PLATFORM|FF_EXTRA|FF_CUTEXTRA; - if (lines[i].flags & ML_NOCLIMB) // shade it unless no-climb - ffloorflags |= FF_NOSHADE; - - // Draw the 'insides' of the block too - if (lines[i].flags & ML_EFFECT2) - { - ffloorflags |= FF_CUTLEVEL|FF_BOTHPLANES|FF_ALLSIDES; - ffloorflags &= ~(FF_EXTRA|FF_CUTEXTRA); - } - - P_AddFakeFloorsByLine(i, ffloorflags, secthinkers); - break; - - case 143: // 'Reverse platform' - You fall through it - // If line has no-climb set, don't give it shadows, otherwise do - ffloorflags = FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_REVERSEPLATFORM|FF_BOTHPLANES|FF_ALLSIDES; - if (lines[i].flags & ML_NOCLIMB) - ffloorflags |= FF_NOSHADE; - - P_AddFakeFloorsByLine(i, ffloorflags, secthinkers); - break; - - case 144: // Translucent "reverse platform" - // If line has no-climb set, don't give it shadows, otherwise do - ffloorflags = FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_REVERSEPLATFORM|FF_TRANSLUCENT|FF_EXTRA|FF_CUTEXTRA; - if (lines[i].flags & ML_NOCLIMB) - ffloorflags |= FF_NOSHADE; - - // Draw the 'insides' of the block too - if (lines[i].flags & ML_EFFECT2) - { - ffloorflags |= FF_CUTLEVEL|FF_BOTHPLANES|FF_ALLSIDES; - ffloorflags &= ~(FF_EXTRA|FF_CUTEXTRA); - } - - P_AddFakeFloorsByLine(i, ffloorflags, secthinkers); - break; - - case 145: // Translucent "reverse platform" with no sides - ffloorflags = FF_EXISTS|FF_SOLID|FF_RENDERPLANES|FF_TRANSLUCENT|FF_REVERSEPLATFORM|FF_EXTRA|FF_CUTEXTRA; - if (lines[i].flags & ML_NOCLIMB) // shade it unless no-climb - ffloorflags |= FF_NOSHADE; - - // Draw the 'insides' of the block too - if (lines[i].flags & ML_EFFECT2) - { - ffloorflags |= FF_CUTLEVEL|FF_BOTHPLANES|FF_ALLSIDES; - ffloorflags &= ~(FF_EXTRA|FF_CUTEXTRA); - } - - P_AddFakeFloorsByLine(i, ffloorflags, secthinkers); - break; - - case 146: // Intangible floor/ceiling with solid sides (fences/hoops maybe?) - P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERSIDES|FF_ALLSIDES|FF_INTANGIBLEFLATS, secthinkers); - break; - - case 150: // Air bobbing platform - case 151: // Adjustable air bobbing platform + case 190: // FOF (Rising) { - fixed_t dist = (lines[i].special == 150) ? 16*FRACUNIT : P_AproxDistance(lines[i].dx, lines[i].dy); - P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL, secthinkers); - P_AddAirbob(lines[i].frontsector, tag, dist, false, !!(lines[i].flags & ML_NOCLIMB), false); - break; - } - case 152: // Adjustable air bobbing platform in reverse - P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL, secthinkers); - P_AddAirbob(lines[i].frontsector, tag, P_AproxDistance(lines[i].dx, lines[i].dy), true, !!(lines[i].flags & ML_NOCLIMB), false); - break; - case 153: // Dynamic Sinking Platform - P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL, secthinkers); - P_AddAirbob(lines[i].frontsector, tag, P_AproxDistance(lines[i].dx, lines[i].dy), false, !!(lines[i].flags & ML_NOCLIMB), true); - break; - - case 160: // Float/bob platform - P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL|FF_FLOATBOB, secthinkers); - break; - - case 170: // Crumbling platform - P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL|FF_CRUMBLE, secthinkers); - break; - - case 171: // Crumbling platform that will not return - P_AddFakeFloorsByLine(i, - FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL|FF_CRUMBLE|FF_NORETURN, secthinkers); - break; - - case 172: // "Platform" that crumbles and returns - ffloorflags = FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_PLATFORM|FF_CRUMBLE|FF_BOTHPLANES|FF_ALLSIDES; - if (lines[i].flags & ML_NOCLIMB) // shade it unless no-climb - ffloorflags |= FF_NOSHADE; - - P_AddFakeFloorsByLine(i, ffloorflags, secthinkers); - break; - - case 173: // "Platform" that crumbles and doesn't return - ffloorflags = FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_PLATFORM|FF_CRUMBLE|FF_NORETURN|FF_BOTHPLANES|FF_ALLSIDES; - if (lines[i].flags & ML_NOCLIMB) // shade it unless no-climb - ffloorflags |= FF_NOSHADE; - - P_AddFakeFloorsByLine(i, ffloorflags, secthinkers); - break; - - case 174: // Translucent "platform" that crumbles and returns - ffloorflags = FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL|FF_PLATFORM|FF_CRUMBLE|FF_TRANSLUCENT|FF_BOTHPLANES|FF_ALLSIDES; - if (lines[i].flags & ML_NOCLIMB) // shade it unless no-climb - ffloorflags |= FF_NOSHADE; - - P_AddFakeFloorsByLine(i, ffloorflags, secthinkers); - break; - - case 175: // Translucent "platform" that crumbles and doesn't return - ffloorflags = FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL|FF_PLATFORM|FF_CRUMBLE|FF_NORETURN|FF_TRANSLUCENT|FF_BOTHPLANES|FF_ALLSIDES; - if (lines[i].flags & ML_NOCLIMB) // shade it unless no-climb - ffloorflags |= FF_NOSHADE; - - P_AddFakeFloorsByLine(i, ffloorflags, secthinkers); - break; - - case 176: // Air bobbing platform that will crumble and bob on the water when it falls and hits - P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_FLOATBOB|FF_CRUMBLE, secthinkers); - P_AddAirbob(lines[i].frontsector, tag, 16*FRACUNIT, false, !!(lines[i].flags & ML_NOCLIMB), false); - break; - - case 177: // Air bobbing platform that will crumble and bob on - // the water when it falls and hits, then never return - P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL|FF_FLOATBOB|FF_CRUMBLE|FF_NORETURN, secthinkers); - P_AddAirbob(lines[i].frontsector, tag, 16*FRACUNIT, false, !!(lines[i].flags & ML_NOCLIMB), false); - break; - - case 178: // Crumbling platform that will float when it hits water - P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CRUMBLE|FF_FLOATBOB, secthinkers); - break; - - case 179: // Crumbling platform that will float when it hits water, but not return - P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL|FF_CRUMBLE|FF_FLOATBOB|FF_NORETURN, secthinkers); - break; - - case 180: // Air bobbing platform that will crumble - P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL|FF_CRUMBLE, secthinkers); - P_AddAirbob(lines[i].frontsector, tag, 16*FRACUNIT, false, !!(lines[i].flags & ML_NOCLIMB), false); - break; - - case 190: // Rising Platform FOF (solid, opaque, shadows) - case 191: // Rising Platform FOF (solid, opaque, no shadows) - case 192: // Rising Platform TL block: FOF (solid, translucent) - case 193: // Rising Platform FOF (solid, invisible) - case 194: // Rising Platform 'Platform' - You can jump up through it - case 195: // Rising Platform Translucent "platform" - { - fixed_t speed = FixedDiv(P_AproxDistance(lines[i].dx, lines[i].dy), 4*FRACUNIT); fixed_t ceilingtop = P_FindHighestCeilingSurrounding(lines[i].frontsector); fixed_t ceilingbottom = P_FindLowestCeilingSurrounding(lines[i].frontsector); - ffloorflags = FF_EXISTS|FF_SOLID; - if (lines[i].special != 193) - ffloorflags |= FF_RENDERALL; - if (lines[i].special <= 191) - ffloorflags |= FF_CUTLEVEL; - if (lines[i].special == 192 || lines[i].special == 195) - ffloorflags |= FF_TRANSLUCENT|FF_EXTRA|FF_CUTEXTRA; - if (lines[i].special >= 194) - ffloorflags |= FF_PLATFORM|FF_BOTHPLANES|FF_ALLSIDES; - if (lines[i].special != 190 && (lines[i].special <= 193 || lines[i].flags & ML_NOCLIMB)) - ffloorflags |= FF_NOSHADE; - P_AddFakeFloorsByLine(i, ffloorflags, secthinkers); + ffloorflags = FOF_EXISTS|FOF_SOLID|FOF_RENDERALL; - P_AddRaiseThinker(lines[i].frontsector, tag, speed, ceilingtop, ceilingbottom, !!(lines[i].flags & ML_BLOCKMONSTERS), !!(lines[i].flags & ML_NOCLIMB)); + //Appearance settings + if (lines[i].args[3] & TMFA_NOPLANES) + ffloorflags &= ~FOF_RENDERPLANES; + if (lines[i].args[3] & TMFA_NOSIDES) + ffloorflags &= ~FOF_RENDERSIDES; + if (lines[i].args[3] & TMFA_INSIDES) + { + if (ffloorflags & FOF_RENDERPLANES) + ffloorflags |= FOF_BOTHPLANES; + if (ffloorflags & FOF_RENDERSIDES) + ffloorflags |= FOF_ALLSIDES; + } + if (lines[i].args[3] & TMFA_ONLYINSIDES) + { + if (ffloorflags & FOF_RENDERPLANES) + ffloorflags |= FOF_INVERTPLANES; + if (ffloorflags & FOF_RENDERSIDES) + ffloorflags |= FOF_INVERTSIDES; + } + if (lines[i].args[3] & TMFA_NOSHADE) + ffloorflags |= FOF_NOSHADE; + if (lines[i].args[3] & TMFA_SPLAT) + ffloorflags |= FOF_SPLAT; + + //Tangibility settings + if (lines[i].args[4] & TMFT_INTANGIBLETOP) + ffloorflags |= FOF_REVERSEPLATFORM; + if (lines[i].args[4] & TMFT_INTANGIBLEBOTTOM) + ffloorflags |= FOF_PLATFORM; + if (lines[i].args[4] & TMFT_DONTBLOCKPLAYER) + ffloorflags &= ~FOF_BLOCKPLAYER; + if (lines[i].args[4] & TMFT_DONTBLOCKOTHERS) + ffloorflags &= ~FOF_BLOCKOTHERS; + + //Cutting options + if (ffloorflags & FOF_RENDERALL) + { + //If inside is visible, cut inner walls + if ((lines[i].args[1] < 255) || (lines[i].args[3] & TMFA_SPLAT) || (lines[i].args[4] & TMFT_VISIBLEFROMINSIDE)) + ffloorflags |= FOF_CUTEXTRA|FOF_EXTRA; + else + ffloorflags |= FOF_CUTLEVEL; + } + + P_AddFakeFloorsByLine(i, lines[i].args[1], lines[i].args[2], ffloorflags, secthinkers); + P_AddRaiseThinker(lines[i].frontsector, lines[i].args[0], lines[i].args[5] << FRACBITS, ceilingtop, ceilingbottom, !!(lines[i].args[6] & TMFR_REVERSE), !!(lines[i].args[6] & TMFR_SPINDASH)); break; } - - case 200: // Double light effect - P_AddFakeFloorsByLine(i, FF_EXISTS|FF_CUTSPRITES|FF_DOUBLESHADOW, secthinkers); - break; - - case 201: // Light effect - P_AddFakeFloorsByLine(i, FF_EXISTS|FF_CUTSPRITES, secthinkers); + case 200: // Light block + ffloorflags = FOF_EXISTS|FOF_CUTSPRITES; + if (!lines[i].args[1]) + ffloorflags |= FOF_DOUBLESHADOW; + P_AddFakeFloorsByLine(i, 0xff, TMB_TRANSLUCENT, ffloorflags, secthinkers); break; case 202: // Fog - ffloorflags = FF_EXISTS|FF_RENDERALL|FF_FOG|FF_INVERTPLANES|FF_INVERTSIDES|FF_CUTEXTRA|FF_EXTRA|FF_DOUBLESHADOW|FF_CUTSPRITES; + ffloorflags = FOF_EXISTS|FOF_RENDERALL|FOF_FOG|FOF_INVERTPLANES|FOF_INVERTSIDES|FOF_CUTEXTRA|FOF_EXTRA|FOF_DOUBLESHADOW|FOF_CUTSPRITES; sec = sides[*lines[i].sidenum].sector - sectors; // SoM: Because it's fog, check for an extra colormap and set the fog flag... if (sectors[sec].extra_colormap) sectors[sec].extra_colormap->flags = CMF_FOG; - P_AddFakeFloorsByLine(i, ffloorflags, secthinkers); + P_AddFakeFloorsByLine(i, 0xff, TMB_TRANSLUCENT, ffloorflags, secthinkers); break; - case 220: // Like opaque water, but not swimmable. (Good for snow effect on FOFs) - P_AddFakeFloorsByLine(i, FF_EXISTS|FF_RENDERALL|FF_BOTHPLANES|FF_ALLSIDES|FF_CUTEXTRA|FF_EXTRA|FF_CUTSPRITES, secthinkers); - break; + case 220: //Intangible + ffloorflags = FOF_EXISTS|FOF_RENDERALL|FOF_CUTEXTRA|FOF_EXTRA|FOF_CUTSPRITES; - case 221: // FOF (intangible, translucent) - // If line has no-climb set, give it shadows, otherwise don't - ffloorflags = FF_EXISTS|FF_RENDERALL|FF_TRANSLUCENT|FF_EXTRA|FF_CUTEXTRA|FF_CUTSPRITES; - if (!(lines[i].flags & ML_NOCLIMB)) - ffloorflags |= FF_NOSHADE; + //Appearance settings + if (lines[i].args[3] & TMFA_NOPLANES) + ffloorflags &= ~FOF_RENDERPLANES; + if (lines[i].args[3] & TMFA_NOSIDES) + ffloorflags &= ~FOF_RENDERSIDES; + if (!(lines[i].args[3] & TMFA_INSIDES)) + { + if (ffloorflags & FOF_RENDERPLANES) + ffloorflags |= FOF_BOTHPLANES; + if (ffloorflags & FOF_RENDERSIDES) + ffloorflags |= FOF_ALLSIDES; + } + if (lines[i].args[3] & TMFA_ONLYINSIDES) + { + if (ffloorflags & FOF_RENDERPLANES) + ffloorflags |= FOF_INVERTPLANES; + if (ffloorflags & FOF_RENDERSIDES) + ffloorflags |= FOF_INVERTSIDES; + } + if (lines[i].args[3] & TMFA_NOSHADE) + ffloorflags |= FOF_NOSHADE; + if (lines[i].args[3] & TMFA_SPLAT) + ffloorflags |= FOF_SPLAT; - P_AddFakeFloorsByLine(i, ffloorflags, secthinkers); - break; - - case 222: // FOF with no floor/ceiling (good for GFZGRASS effect on FOFs) - // If line has no-climb set, give it shadows, otherwise don't - ffloorflags = FF_EXISTS|FF_RENDERSIDES|FF_ALLSIDES; - if (!(lines[i].flags & ML_NOCLIMB)) - ffloorflags |= FF_NOSHADE|FF_CUTSPRITES; - - P_AddFakeFloorsByLine(i, ffloorflags, secthinkers); + P_AddFakeFloorsByLine(i, lines[i].args[1], lines[i].args[2], ffloorflags, secthinkers); break; case 223: // FOF (intangible, invisible) - for combining specials in a sector - P_AddFakeFloorsByLine(i, FF_EXISTS|FF_NOSHADE, secthinkers); + P_AddFakeFloorsByLine(i, 0xff, TMB_TRANSLUCENT, FOF_EXISTS|FOF_NOSHADE, secthinkers); break; case 250: // Mario Block - ffloorflags = FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL|FF_MARIO; - if (lines[i].flags & ML_NOCLIMB) - ffloorflags |= FF_SHATTERBOTTOM; - if (lines[i].flags & ML_EFFECT1) - ffloorflags &= ~(FF_SOLID|FF_RENDERALL|FF_CUTLEVEL); + ffloorflags = FOF_EXISTS|FOF_SOLID|FOF_RENDERALL|FOF_CUTLEVEL|FOF_MARIO; + if (lines[i].args[1] & TMFM_BRICK) + ffloorflags |= FOF_GOOWATER; + if (lines[i].args[1] & TMFM_INVISIBLE) + ffloorflags &= ~(FOF_SOLID|FOF_RENDERALL|FOF_CUTLEVEL); - P_AddFakeFloorsByLine(i, ffloorflags, secthinkers); + P_AddFakeFloorsByLine(i, 0xff, TMB_TRANSLUCENT, ffloorflags, secthinkers); break; case 251: // A THWOMP! { - fixed_t crushspeed = (lines[i].flags & ML_EFFECT5) ? lines[i].dy >> 3 : 10*FRACUNIT; - fixed_t retractspeed = (lines[i].flags & ML_EFFECT5) ? lines[i].dx >> 3 : 2*FRACUNIT; - UINT16 sound = (lines[i].flags & ML_EFFECT4) ? sides[lines[i].sidenum[0]].textureoffset >> FRACBITS : sfx_thwomp; - P_AddThwompThinker(lines[i].frontsector, &lines[i], crushspeed, retractspeed, sound); - P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL, secthinkers); + UINT16 sound = (lines[i].stringargs[0]) ? get_number(lines[i].stringargs[0]) : sfx_thwomp; + P_AddThwompThinker(lines[i].frontsector, &lines[i], lines[i].args[1] << (FRACBITS - 3), lines[i].args[2] << (FRACBITS - 3), sound); + P_AddFakeFloorsByLine(i, 0xff, TMB_TRANSLUCENT, FOF_EXISTS|FOF_SOLID|FOF_RENDERALL|FOF_CUTLEVEL, secthinkers); break; } - case 252: // Shatter block (breaks when touched) - ffloorflags = FF_EXISTS|FF_BLOCKOTHERS|FF_RENDERALL|FF_BUSTUP|FF_SHATTER; - if (lines[i].flags & ML_NOCLIMB) - ffloorflags |= FF_BLOCKPLAYER|FF_SHATTERBOTTOM; - - P_AddFakeFloorsByLine(i, ffloorflags, secthinkers); - break; - - case 253: // Translucent shatter block (see 76) - P_AddFakeFloorsByLine(i, FF_EXISTS|FF_BLOCKOTHERS|FF_RENDERALL|FF_BUSTUP|FF_SHATTER|FF_TRANSLUCENT, secthinkers); - break; - case 254: // Bustable block - ffloorflags = FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_BUSTUP; - if (lines[i].flags & ML_NOCLIMB) - ffloorflags |= FF_STRONGBUST; + { + UINT8 busttype = BT_REGULAR; + ffloorbustflags_e bustflags = 0; - P_AddFakeFloorsByLine(i, ffloorflags, secthinkers); + ffloorflags = FOF_EXISTS|FOF_BLOCKOTHERS|FOF_RENDERALL|FOF_BUSTUP; + + //Bustable type + switch (lines[i].args[3]) + { + case TMFB_TOUCH: + busttype = BT_TOUCH; + break; + case TMFB_SPIN: + busttype = BT_SPINBUST; + break; + case TMFB_REGULAR: + busttype = BT_REGULAR; + break; + case TMFB_STRONG: + busttype = BT_STRONG; + break; + } + + //Flags + if (lines[i].args[4] & TMFB_PUSHABLES) + bustflags |= FB_PUSHABLES; + if (lines[i].args[4] & TMFB_EXECUTOR) + bustflags |= FB_EXECUTOR; + if (lines[i].args[4] & TMFB_ONLYBOTTOM) + bustflags |= FB_ONLYBOTTOM; + if (lines[i].args[4] & TMFB_SPLAT) + ffloorflags |= FOF_SPLAT; + + if (busttype != BT_TOUCH || bustflags & FB_ONLYBOTTOM) + ffloorflags |= FOF_BLOCKPLAYER; + + TAG_ITER_SECTORS(lines[i].args[0], s) + { + ffloor_t *fflr = P_AddFakeFloor(§ors[s], lines[i].frontsector, lines + i, lines[i].args[1], lines[i].args[2], ffloorflags, secthinkers); + if (!fflr) + continue; + fflr->bustflags = bustflags; + fflr->busttype = busttype; + fflr->busttag = lines[i].args[5]; + } break; - - case 255: // Spin bust block (breaks when jumped or spun downwards onto) - P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_BUSTUP|FF_SPINBUST, secthinkers); - break; - - case 256: // Translucent spin bust block (see 78) - P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_BUSTUP|FF_SPINBUST|FF_TRANSLUCENT, secthinkers); - break; - + } case 257: // Quicksand - ffloorflags = FF_EXISTS|FF_QUICKSAND|FF_RENDERALL|FF_ALLSIDES|FF_CUTSPRITES; - if (lines[i].flags & ML_EFFECT5) - ffloorflags |= FF_RIPPLE; + ffloorflags = FOF_EXISTS|FOF_QUICKSAND|FOF_RENDERALL|FOF_ALLSIDES|FOF_CUTSPRITES; + if (!(lines[i].args[1])) + ffloorflags |= FOF_RIPPLE; - P_AddFakeFloorsByLine(i, ffloorflags, secthinkers); + TAG_ITER_SECTORS(lines[i].args[0], s) + { + ffloor_t *fflr = P_AddFakeFloor(§ors[s], lines[i].frontsector, lines + i, 0xff, TMB_TRANSLUCENT, ffloorflags, secthinkers); + if (!fflr) + continue; + fflr->sinkspeed = abs(lines[i].args[2]) << (FRACBITS - 1); + fflr->friction = abs(lines[i].args[3]) << (FRACBITS - 6); + } break; case 258: // Laser block - P_AddLaserThinker(tag, lines + i, !!(lines[i].flags & ML_EFFECT1)); - P_AddFakeFloorsByLine(i, FF_EXISTS|FF_RENDERALL|FF_NOSHADE|FF_EXTRA|FF_CUTEXTRA|FF_TRANSLUCENT, secthinkers); + ffloorflags = FOF_EXISTS|FOF_RENDERALL|FOF_NOSHADE|FOF_EXTRA|FOF_CUTEXTRA|FOF_TRANSLUCENT; + P_AddLaserThinker(lines[i].args[0], lines + i, !!(lines[i].args[3] & TMFL_NOBOSSES)); + if (lines[i].args[3] & TMFL_SPLAT) + ffloorflags |= FOF_SPLAT; + P_AddFakeFloorsByLine(i, lines[i].args[1], lines[i].args[2], ffloorflags, secthinkers); break; case 259: // Custom FOF - if (lines[i].sidenum[1] != 0xffff) + TAG_ITER_SECTORS(lines[i].args[0], s) { - ffloortype_e fofflags = sides[lines[i].sidenum[1]].toptexture; - P_AddFakeFloorsByLine(i, fofflags, secthinkers); + ffloor_t *fflr = P_AddFakeFloor(§ors[s], lines[i].frontsector, lines + i, lines[i].args[1], lines[i].args[2], lines[i].args[3], secthinkers); + if (!fflr) + continue; + if (!udmf) // Ugly backwards compatibility stuff + { + if (lines[i].args[3] & FOF_QUICKSAND) + { + fflr->sinkspeed = abs(lines[i].dx) >> 1; + fflr->friction = abs(lines[i].dy) >> 6; + } + if (lines[i].args[3] & FOF_BUSTUP) + { + switch (lines[i].args[4] % TMFB_ONLYBOTTOM) + { + case TMFB_TOUCH: + fflr->busttype = BT_TOUCH; + break; + case TMFB_SPIN: + fflr->busttype = BT_SPINBUST; + break; + case TMFB_REGULAR: + fflr->busttype = BT_REGULAR; + break; + case TMFB_STRONG: + fflr->busttype = BT_STRONG; + break; + } + + if (lines[i].args[4] & TMFB_ONLYBOTTOM) + fflr->bustflags |= FB_ONLYBOTTOM; + if (lines[i].flags & ML_MIDSOLID) + fflr->bustflags |= FB_PUSHABLES; + if (lines[i].flags & ML_WRAPMIDTEX) + { + fflr->bustflags |= FB_EXECUTOR; + fflr->busttag = P_AproxDistance(lines[i].dx, lines[i].dy) >> FRACBITS; + } + } + } } - else - I_Error("Custom FOF (tag %d) found without a linedef back side!", tag); break; - case 300: // Linedef executor (combines with sector special 974/975) and commands - case 302: - case 303: - case 304: + case 260: // GZDoom-like 3D Floor. + { + UINT8 dtype = lines[i].args[1] & 3; + UINT8 dflags1 = lines[i].args[1] - dtype; + UINT8 dflags2 = lines[i].args[2]; + UINT8 dopacity = lines[i].args[3]; + boolean isfog = false; - // Charability linedef executors - case 305: - case 307: + if (dtype == 0) + dtype = 1; + + ffloorflags = FOF_EXISTS; + + if (dflags2 & 1) ffloorflags |= FOF_NOSHADE; // Disable light effects (Means no shadowcast) + if (dflags2 & 2) ffloorflags |= FOF_DOUBLESHADOW; // Restrict light inside (Means doubleshadow) + if (dflags2 & 4) isfog = true; // Fog effect (Explicitly render like a fog block) + + if (dflags1 & 4) ffloorflags |= FOF_BOTHPLANES|FOF_ALLSIDES; // Render-inside + if (dflags1 & 16) ffloorflags |= FOF_INVERTSIDES|FOF_INVERTPLANES; // Invert visibility rules + + // Fog block + if (isfog) + ffloorflags |= FOF_RENDERALL|FOF_CUTEXTRA|FOF_CUTSPRITES|FOF_BOTHPLANES|FOF_EXTRA|FOF_FOG|FOF_INVERTPLANES|FOF_ALLSIDES|FOF_INVERTSIDES; + else + { + ffloorflags |= FOF_RENDERALL; + + // Solid + if (dtype == 1) + ffloorflags |= FOF_SOLID|FOF_CUTLEVEL; + // Water + else if (dtype == 2) + ffloorflags |= FOF_SWIMMABLE|FOF_CUTEXTRA|FOF_CUTSPRITES|FOF_EXTRA|FOF_RIPPLE; + // Intangible + else if (dtype == 3) + ffloorflags |= FOF_CUTEXTRA|FOF_CUTSPRITES|FOF_EXTRA; + } + + // Non-opaque + if (dopacity < 255) + { + // Invisible + if (dopacity == 0) + { + // True invisible + if (ffloorflags & FOF_NOSHADE) + ffloorflags &= ~(FOF_RENDERALL|FOF_CUTEXTRA|FOF_CUTSPRITES|FOF_EXTRA|FOF_BOTHPLANES|FOF_ALLSIDES|FOF_CUTLEVEL); + // Shadow block + else + { + ffloorflags |= FOF_CUTSPRITES; + ffloorflags &= ~(FOF_RENDERALL|FOF_CUTEXTRA|FOF_EXTRA|FOF_BOTHPLANES|FOF_ALLSIDES|FOF_CUTLEVEL); + } + } + else + { + ffloorflags |= FOF_TRANSLUCENT|FOF_CUTEXTRA|FOF_EXTRA; + ffloorflags &= ~FOF_CUTLEVEL; + } + } + + P_AddFakeFloorsByLine(i, dopacity, TMB_TRANSLUCENT, ffloorflags, secthinkers); + } + break; + + case 300: // Trigger linedef executor + case 303: // Count rings + case 305: // Character ability + case 314: // Pushable linedef executors (count # of pushables) + case 317: // Condition set trigger + case 319: // Unlockable trigger + case 331: // Player skin + case 334: // Object dye + case 337: // Emerald check + case 343: // Gravity check + if (lines[i].args[0] > TMT_EACHTIMEMASK) + P_AddEachTimeThinker(&lines[i], lines[i].args[0] == TMT_EACHTIMEENTERANDEXIT); break; case 308: // Race-only linedef executor. Triggers once. - if (!(gametyperules & GTR_RACE)) + if (!P_CheckGametypeRules(lines[i].args[2], (UINT32)lines[i].args[1])) + { lines[i].special = 0; + break; + } + if (lines[i].args[0] > TMT_EACHTIMEMASK) + P_AddEachTimeThinker(&lines[i], lines[i].args[0] == TMT_EACHTIMEENTERANDEXIT); break; // Linedef executor triggers for CTF teams. case 309: - case 311: if (!(gametyperules & GTR_TEAMFLAGS)) + { lines[i].special = 0; - break; - - // Each time executors - case 306: - case 301: - case 310: - case 312: - case 332: - case 335: - P_AddEachTimeThinker(&lines[i]); + break; + } + if (lines[i].args[0] > TMT_EACHTIMEMASK) + P_AddEachTimeThinker(&lines[i], lines[i].args[0] == TMT_EACHTIMEENTERANDEXIT); break; // No More Enemies Linedef Exec @@ -6863,100 +6985,24 @@ void P_SpawnSpecials(boolean fromnetsave) P_AddNoEnemiesThinker(&lines[i]); break; - // Pushable linedef executors (count # of pushables) - case 314: - case 315: - break; - - // Unlock trigger executors - case 317: - case 318: - break; - case 319: - case 320: - break; - // Trigger on X calls case 321: - case 322: - if (lines[i].flags & ML_NOCLIMB && sides[lines[i].sidenum[0]].rowoffset > 0) // optional "starting" count - lines[i].callcount = sides[lines[i].sidenum[0]].rowoffset>>FRACBITS; - else - lines[i].callcount = sides[lines[i].sidenum[0]].textureoffset>>FRACBITS; - if (lines[i].special == 322) // Each time - P_AddEachTimeThinker(&lines[i]); - break; - - // NiGHTS trigger executors - case 323: - case 324: - case 325: - case 326: - case 327: - case 328: - case 329: - case 330: - break; - - // Skin trigger executors - case 331: - case 333: - break; - - // Object dye executors - case 334: - case 336: - break; - - case 399: // Linedef execute on map load - // This is handled in P_RunLevelLoadExecutors. - break; - - case 400: - case 401: - case 402: - case 403: - case 404: - case 405: - case 406: - case 407: - case 408: - case 409: - case 410: - case 411: - case 412: - case 413: - case 414: - case 415: - case 416: - case 417: - case 418: - case 419: - case 420: - case 421: - case 422: - case 423: - case 424: - case 425: - case 426: - case 427: - case 428: - case 429: - case 430: - case 431: + lines[i].callcount = (lines[i].args[2] && lines[i].args[3] > 0) ? lines[i].args[3] : lines[i].args[1]; // optional "starting" count + if (lines[i].args[0] > TMXT_EACHTIMEMASK) // Each time + P_AddEachTimeThinker(&lines[i], lines[i].args[0] == TMXT_EACHTIMEENTERANDEXIT); break; case 449: // Enable bosses with parameter { - INT32 bossid = sides[*lines[i].sidenum].textureoffset>>FRACBITS; + INT32 bossid = lines[i].args[0]; if (bossid & ~15) // if any bits other than first 16 are set { CONS_Alert(CONS_WARNING, - M_GetText("Boss enable linedef (tag %d) has an invalid texture x offset.\nConsider changing it or removing it entirely.\n"), - tag); + M_GetText("Boss enable linedef has an invalid boss ID (%d).\nConsider changing it or removing it entirely.\n"), + bossid); break; } - if (!(lines[i].flags & ML_NOCLIMB)) + if (!(lines[i].args[1])) { bossdisabled |= (1<>FRACBITS); + TAG_ITER_SECTORS(lines[i].args[0], s) + P_SpawnAdjustableGlowingLight(§ors[s], lines[i].args[2], + lines[i].args[3] ? sectors[s].lightlevel : lines[i].args[4], lines[i].args[1]); break; case 603: // Adjustable flickering light sec = sides[*lines[i].sidenum].sector - sectors; - TAG_ITER_SECTORS(tag, s) - P_SpawnAdjustableFireFlicker(§ors[sec], §ors[s], - P_AproxDistance(lines[i].dx, lines[i].dy)>>FRACBITS); + TAG_ITER_SECTORS(lines[i].args[0], s) + P_SpawnAdjustableFireFlicker(§ors[s], lines[i].args[2], + lines[i].args[3] ? sectors[s].lightlevel : lines[i].args[4], lines[i].args[1]); break; - case 604: // Adjustable Blinking Light (unsynchronized) + case 604: // Adjustable Blinking Light sec = sides[*lines[i].sidenum].sector - sectors; - TAG_ITER_SECTORS(tag, s) - P_SpawnAdjustableStrobeFlash(§ors[sec], §ors[s], - abs(lines[i].dx)>>FRACBITS, abs(lines[i].dy)>>FRACBITS, false); - break; - - case 605: // Adjustable Blinking Light (synchronized) - sec = sides[*lines[i].sidenum].sector - sectors; - TAG_ITER_SECTORS(tag, s) - P_SpawnAdjustableStrobeFlash(§ors[sec], §ors[s], - abs(lines[i].dx)>>FRACBITS, abs(lines[i].dy)>>FRACBITS, true); + TAG_ITER_SECTORS(lines[i].args[0], s) + P_SpawnAdjustableStrobeFlash(§ors[s], lines[i].args[3], + (lines[i].args[4] & TMB_USETARGET) ? sectors[s].lightlevel : lines[i].args[5], + lines[i].args[1], lines[i].args[2], lines[i].args[4] & TMB_SYNC); break; case 606: // HACK! Copy colormaps. Just plain colormaps. @@ -7074,6 +7077,124 @@ void P_SpawnSpecials(boolean fromnetsave) } } + // And another round, this time with all FOFs already created + for (i = 0; i < numlines; i++) + { + switch (lines[i].special) + { + INT32 s; + INT32 l; + + case 74: // Make FOF bustable + { + UINT8 busttype = BT_REGULAR; + ffloorbustflags_e bustflags = 0; + + if (!udmf) + break; + + switch (lines[i].args[1]) + { + case TMFB_TOUCH: + busttype = BT_TOUCH; + break; + case TMFB_SPIN: + busttype = BT_SPINBUST; + break; + case TMFB_REGULAR: + busttype = BT_REGULAR; + break; + case TMFB_STRONG: + busttype = BT_STRONG; + break; + } + + if (lines[i].args[2] & TMFB_PUSHABLES) + bustflags |= FB_PUSHABLES; + if (lines[i].args[2] & TMFB_EXECUTOR) + bustflags |= FB_EXECUTOR; + if (lines[i].args[2] & TMFB_ONLYBOTTOM) + bustflags |= FB_ONLYBOTTOM; + + TAG_ITER_LINES(lines[i].args[0], l) + { + if (lines[l].special < 100 || lines[l].special >= 300) + continue; + + TAG_ITER_SECTORS(lines[l].args[0], s) + { + ffloor_t *rover; + + for (rover = sectors[s].ffloors; rover; rover = rover->next) + { + if (rover->master != lines + l) + continue; + + rover->fofflags |= FOF_BUSTUP; + rover->spawnflags |= FOF_BUSTUP; + rover->bustflags = bustflags; + rover->busttype = busttype; + rover->busttag = lines[i].args[3]; + CheckForBustableBlocks = true; + break; + } + } + } + break; + } + + case 75: // Make FOF quicksand + { + if (!udmf) + break; + TAG_ITER_LINES(lines[i].args[0], l) + { + if (lines[l].special < 100 || lines[l].special >= 300) + continue; + + TAG_ITER_SECTORS(lines[l].args[0], s) + { + ffloor_t *rover; + + for (rover = sectors[s].ffloors; rover; rover = rover->next) + { + if (rover->master != lines + l) + continue; + + rover->fofflags |= FOF_QUICKSAND; + rover->spawnflags |= FOF_QUICKSAND; + rover->sinkspeed = abs(lines[i].args[1]) << (FRACBITS - 1); + rover->friction = abs(lines[i].args[2]) << (FRACBITS - 6); + CheckForQuicksand = true; + break; + } + } + } + break; + } + + case 76: // Make FOF bouncy + { + if (udmf) + { + TAG_ITER_LINES(lines[i].args[0], l) + P_MakeFOFBouncy(lines + i, lines + l); + } + else + { + TAG_ITER_SECTORS(lines[i].args[0], s) + for (j = 0; (unsigned)j < sectors[s].linecount; j++) + P_MakeFOFBouncy(lines + i, sectors[s].lines[j]); + } + break; + } + } + } + + + + + // Allocate each list for (i = 0; i < numsectors; i++) if(secthinkers[i].thinkers) @@ -7102,26 +7223,29 @@ void P_SpawnSpecials(boolean fromnetsave) } } - P_RunLevelLoadExecutors(); + if (!fromnetsave) + P_RunLevelLoadExecutors(); } /** Adds 3Dfloors as appropriate based on a common control linedef. * * \param line Control linedef to use. + * \param alpha Alpha value (0-255). + * \param blendmode Blending mode. * \param ffloorflags 3Dfloor flags to use. * \param secthkiners Lists of thinkers sorted by sector. May be NULL. * \sa P_SpawnSpecials, P_AddFakeFloor * \author Graue */ -static void P_AddFakeFloorsByLine(size_t line, ffloortype_e ffloorflags, thinkerlist_t *secthinkers) +static void P_AddFakeFloorsByLine(size_t line, INT32 alpha, UINT8 blendmode, ffloortype_e ffloorflags, thinkerlist_t *secthinkers) { INT32 s; - mtag_t tag = Tag_FGet(&lines[line].tags); + mtag_t tag = lines[line].args[0]; size_t sec = sides[*lines[line].sidenum].sector-sectors; line_t* li = lines + line; TAG_ITER_SECTORS(tag, s) - P_AddFakeFloor(§ors[s], §ors[sec], li, ffloorflags, secthinkers); + P_AddFakeFloor(§ors[s], §ors[sec], li, alpha, blendmode, ffloorflags, secthinkers); } /* @@ -7266,7 +7390,7 @@ void T_Scroll(scroll_t *s) if (!is3dblock) continue; - TAG_ITER_SECTORS(Tag_FGet(&line->tags), sect) + TAG_ITER_SECTORS(line->args[0], sect) { sector_t *psec; psec = sectors + sect; @@ -7281,7 +7405,7 @@ void T_Scroll(scroll_t *s) if (!rover) // This should be impossible, but don't complain if it is the case somehow continue; - if (!(rover->flags & FF_EXISTS)) // If the FOF does not "exist", we pretend that nobody's there + if (!(rover->fofflags & FOF_EXISTS)) // If the FOF does not "exist", we pretend that nobody's there continue; for (node = psec->touching_thinglist; node; node = node->m_thinglist_next) @@ -7341,7 +7465,7 @@ void T_Scroll(scroll_t *s) if (!is3dblock) continue; - TAG_ITER_SECTORS(Tag_FGet(&line->tags), sect) + TAG_ITER_SECTORS(line->args[0], sect) { sector_t *psec; psec = sectors + sect; @@ -7356,7 +7480,7 @@ void T_Scroll(scroll_t *s) if (!rover) // This should be impossible, but don't complain if it is the case somehow continue; - if (!(rover->flags & FF_EXISTS)) // If the FOF does not "exist", we pretend that nobody's there + if (!(rover->fofflags & FOF_EXISTS)) // If the FOF does not "exist", we pretend that nobody's there continue; for (node = psec->touching_thinglist; node; node = node->m_thinglist_next) @@ -7403,6 +7527,17 @@ void T_Scroll(scroll_t *s) } // end of switch } +static boolean IsSector3DBlock(sector_t* sec) +{ + size_t i; + for (i = 0; i < sec->linecount; i++) + { + if (sec->lines[i]->special >= 100 && sec->lines[i]->special < 300) + return true; + } + return false; +} + /** Adds a generalized scroller to the thinker list. * * \param type The enumerated type of scrolling. @@ -7424,10 +7559,56 @@ static void Add_Scroller(INT32 type, fixed_t dx, fixed_t dy, INT32 control, INT3 s->accel = accel; s->exclusive = exclusive; s->vdx = s->vdy = 0; - if ((s->control = control) != -1) + s->control = control; + if (s->control != -1) s->last_height = sectors[control].floorheight + sectors[control].ceilingheight; s->affectee = affectee; + if (type == sc_carry || type == sc_carry_ceiling) + { + sectors[affectee].specialflags |= SSF_CONVEYOR; + if (IsSector3DBlock(§ors[affectee])) + { + if (type == sc_carry) + sectors[affectee].flags |= MSF_FLIPSPECIAL_CEILING; + else + sectors[affectee].flags |= MSF_FLIPSPECIAL_FLOOR; + } + } P_AddThinker(THINK_MAIN, &s->thinker); + + // interpolation + switch (type) + { + case sc_side: + R_CreateInterpolator_SideScroll(&s->thinker, &sides[affectee]); + break; + case sc_floor: + R_CreateInterpolator_SectorScroll(&s->thinker, §ors[affectee], false); + break; + case sc_ceiling: + R_CreateInterpolator_SectorScroll(&s->thinker, §ors[affectee], true); + break; + default: + break; + } +} + +static void P_SpawnPlaneScroller(line_t *l, fixed_t dx, fixed_t dy, INT32 control, INT32 affectee, INT32 accel, INT32 exclusive) +{ + if (l->args[1] != TMP_CEILING) + { + if (l->args[2] != TMS_SCROLLONLY) + Add_Scroller(sc_carry, FixedMul(dx, CARRYFACTOR), FixedMul(dy, CARRYFACTOR), control, affectee, accel, exclusive); + if (l->args[2] != TMS_CARRYONLY) + Add_Scroller(sc_floor, -dx, dy, control, affectee, accel, exclusive); + } + if (l->args[1] != TMP_FLOOR) + { + if (l->args[2] != TMS_SCROLLONLY) + Add_Scroller(sc_carry_ceiling, FixedMul(dx, CARRYFACTOR), FixedMul(dy, CARRYFACTOR), control, affectee, accel, exclusive); + if (l->args[2] != TMS_CARRYONLY) + Add_Scroller(sc_ceiling, -dx, dy, control, affectee, accel, exclusive); + } } /** Initializes the scrollers. @@ -7439,140 +7620,65 @@ static void P_SpawnScrollers(void) { size_t i; line_t *l = lines; - mtag_t tag; for (i = 0; i < numlines; i++, l++) { - fixed_t dx = l->dx >> SCROLL_SHIFT; // direction and speed of scrolling - fixed_t dy = l->dy >> SCROLL_SHIFT; INT32 control = -1, accel = 0; // no control sector or acceleration - INT32 special = l->special; - tag = Tag_FGet(&l->tags); - - // These types are same as the ones they get set to except that the - // first side's sector's heights cause scrolling when they change, and - // this linedef controls the direction and speed of the scrolling. The - // most complicated linedef since donuts, but powerful :) - - if (special == 515 || special == 512 || special == 522 || special == 532 || special == 504) // displacement scrollers + if (l->special == 502 || l->special == 510) { - special -= 2; - control = (INT32)(sides[*l->sidenum].sector - sectors); - } - else if (special == 514 || special == 511 || special == 521 || special == 531 || special == 503) // accelerative scrollers - { - special--; - accel = 1; - control = (INT32)(sides[*l->sidenum].sector - sectors); - } - else if (special == 535 || special == 525) // displacement scrollers - { - special -= 2; - control = (INT32)(sides[*l->sidenum].sector - sectors); - } - else if (special == 534 || special == 524) // accelerative scrollers - { - accel = 1; - special--; - control = (INT32)(sides[*l->sidenum].sector - sectors); + if ((l->args[4] & TMST_TYPEMASK) != TMST_REGULAR) + control = (INT32)(sides[*l->sidenum].sector - sectors); + if ((l->args[4] & TMST_TYPEMASK) == TMST_ACCELERATIVE) + accel = 1; } - switch (special) + switch (l->special) { register INT32 s; - case 513: // scroll effect ceiling - case 533: // scroll and carry objects on ceiling - TAG_ITER_SECTORS(tag, s) - Add_Scroller(sc_ceiling, -dx, dy, control, s, accel, l->flags & ML_NOCLIMB); - if (special != 533) - break; - /* FALLTHRU */ + case 510: // plane scroller + { + fixed_t length = R_PointToDist2(l->v2->x, l->v2->y, l->v1->x, l->v1->y); + fixed_t speed = l->args[3] << FRACBITS; + fixed_t dx = FixedMul(FixedDiv(l->dx, length), speed) >> SCROLL_SHIFT; + fixed_t dy = FixedMul(FixedDiv(l->dy, length), speed) >> SCROLL_SHIFT; - case 523: // carry objects on ceiling - dx = FixedMul(dx, CARRYFACTOR); - dy = FixedMul(dy, CARRYFACTOR); - TAG_ITER_SECTORS(tag, s) - Add_Scroller(sc_carry_ceiling, dx, dy, control, s, accel, l->flags & ML_NOCLIMB); - break; - - case 510: // scroll effect floor - case 530: // scroll and carry objects on floor - TAG_ITER_SECTORS(tag, s) - Add_Scroller(sc_floor, -dx, dy, control, s, accel, l->flags & ML_NOCLIMB); - if (special != 530) - break; - /* FALLTHRU */ - - case 520: // carry objects on floor - dx = FixedMul(dx, CARRYFACTOR); - dy = FixedMul(dy, CARRYFACTOR); - TAG_ITER_SECTORS(tag, s) - Add_Scroller(sc_carry, dx, dy, control, s, accel, l->flags & ML_NOCLIMB); + if (l->args[0] == 0) + P_SpawnPlaneScroller(l, dx, dy, control, (INT32)(l->frontsector - sectors), accel, !(l->args[4] & TMST_NONEXCLUSIVE)); + else + { + TAG_ITER_SECTORS(l->args[0], s) + P_SpawnPlaneScroller(l, dx, dy, control, s, accel, !(l->args[4] & TMST_NONEXCLUSIVE)); + } break; + } // scroll wall according to linedef // (same direction and speed as scrolling floors) case 502: { - TAG_ITER_LINES(tag, s) + TAG_ITER_LINES(l->args[0], s) if (s != (INT32)i) { - if (l->flags & ML_EFFECT2) // use texture offsets instead - { - dx = sides[l->sidenum[0]].textureoffset; - dy = sides[l->sidenum[0]].rowoffset; - } - if (l->flags & ML_EFFECT3) - { - if (lines[s].sidenum[1] != 0xffff) - Add_Scroller(sc_side, dx, dy, control, lines[s].sidenum[1], accel, 0); - } - else - Add_Scroller(sc_side, dx, dy, control, lines[s].sidenum[0], accel, 0); + if (l->args[1] != TMSD_BACK) + Add_Scroller(sc_side, l->args[2] << (FRACBITS - SCROLL_SHIFT), l->args[3] << (FRACBITS - SCROLL_SHIFT), control, lines[s].sidenum[0], accel, 0); + if (l->args[1] != TMSD_FRONT && lines[s].sidenum[1] != 0xffff) + Add_Scroller(sc_side, l->args[2] << (FRACBITS - SCROLL_SHIFT), l->args[3] << (FRACBITS - SCROLL_SHIFT), control, lines[s].sidenum[1], accel, 0); } break; } - case 505: - s = lines[i].sidenum[0]; - Add_Scroller(sc_side, -sides[s].textureoffset, sides[s].rowoffset, -1, s, accel, 0); - break; - - case 506: - s = lines[i].sidenum[1]; - - if (s != 0xffff) - Add_Scroller(sc_side, -sides[s].textureoffset, sides[s].rowoffset, -1, lines[i].sidenum[0], accel, 0); - else - CONS_Debug(DBG_GAMELOGIC, "Line special 506 (line #%s) missing back side!\n", sizeu1(i)); - break; - - case 507: - s = lines[i].sidenum[0]; - - if (lines[i].sidenum[1] != 0xffff) - Add_Scroller(sc_side, -sides[s].textureoffset, sides[s].rowoffset, -1, lines[i].sidenum[1], accel, 0); - else - CONS_Debug(DBG_GAMELOGIC, "Line special 507 (line #%s) missing back side!\n", sizeu1(i)); - break; - - case 508: - s = lines[i].sidenum[1]; - - if (s != 0xffff) - Add_Scroller(sc_side, -sides[s].textureoffset, sides[s].rowoffset, -1, s, accel, 0); - else - CONS_Debug(DBG_GAMELOGIC, "Line special 508 (line #%s) missing back side!\n", sizeu1(i)); - break; - - case 500: // scroll first side - Add_Scroller(sc_side, FRACUNIT, 0, -1, lines[i].sidenum[0], accel, 0); - break; - - case 501: // jff 1/30/98 2-way scroll - Add_Scroller(sc_side, -FRACUNIT, 0, -1, lines[i].sidenum[0], accel, 0); + case 500: + if (l->args[0] != TMSD_BACK) + Add_Scroller(sc_side, -l->args[1] << FRACBITS, l->args[2] << FRACBITS, -1, l->sidenum[0], accel, 0); + if (l->args[0] != TMSD_FRONT) + { + if (l->sidenum[1] != 0xffff) + Add_Scroller(sc_side, -l->args[1] << FRACBITS, l->args[2] << FRACBITS, -1, l->sidenum[1], accel, 0); + else + CONS_Debug(DBG_GAMELOGIC, "Line special 500 (line #%s) missing back side!\n", sizeu1(i)); + } break; } } @@ -7617,7 +7723,7 @@ void T_Disappear(disappear_t *d) { ffloor_t *rover; register INT32 s; - mtag_t afftag = Tag_FGet(&lines[d->affectee].tags); + mtag_t afftag = lines[d->affectee].args[0]; TAG_ITER_SECTORS(afftag, s) { @@ -7627,12 +7733,12 @@ void T_Disappear(disappear_t *d) continue; if (d->exists) - rover->flags &= ~FF_EXISTS; + rover->fofflags &= ~FOF_EXISTS; else { - rover->flags |= FF_EXISTS; + rover->fofflags |= FOF_EXISTS; - if (!(lines[d->sourceline].flags & ML_NOCLIMB)) + if (!(lines[d->sourceline].args[5])) { sectors[s].soundorg.z = P_GetFFloorTopZAt(rover, sectors[s].soundorg.x, sectors[s].soundorg.y); S_StartSound(§ors[s].soundorg, sfx_appear); @@ -7715,11 +7821,11 @@ static boolean P_FadeFakeFloor(ffloor_t *rover, INT16 sourcevalue, INT16 destval // If fading an invisible FOF whose render flags we did not yet set, // initialize its alpha to 1 if (dotranslucent && - (rover->spawnflags & FF_NOSHADE) && // do not include light blocks, which don't set FF_NOSHADE - !(rover->flags & FF_FOG) && // do not include fog - !(rover->spawnflags & FF_RENDERSIDES) && - !(rover->spawnflags & FF_RENDERPLANES) && - !(rover->flags & FF_RENDERALL)) + (rover->spawnflags & FOF_NOSHADE) && // do not include light blocks, which don't set FOF_NOSHADE + !(rover->fofflags & FOF_FOG) && // do not include fog + !(rover->spawnflags & FOF_RENDERSIDES) && + !(rover->spawnflags & FOF_RENDERPLANES) && + !(rover->fofflags & FOF_RENDERALL)) rover->alpha = 1; if (fadingdata) @@ -7740,16 +7846,16 @@ static boolean P_FadeFakeFloor(ffloor_t *rover, INT16 sourcevalue, INT16 destval if (docollision) { - if (rover->spawnflags & FF_SOLID) - rover->flags &= ~FF_SOLID; - if (rover->spawnflags & FF_SWIMMABLE) - rover->flags &= ~FF_SWIMMABLE; - if (rover->spawnflags & FF_QUICKSAND) - rover->flags &= ~FF_QUICKSAND; - if (rover->spawnflags & FF_BUSTUP) - rover->flags &= ~FF_BUSTUP; - if (rover->spawnflags & FF_MARIO) - rover->flags &= ~FF_MARIO; + if (rover->spawnflags & FOF_SOLID) + rover->fofflags &= ~FOF_SOLID; + if (rover->spawnflags & FOF_SWIMMABLE) + rover->fofflags &= ~FOF_SWIMMABLE; + if (rover->spawnflags & FOF_QUICKSAND) + rover->fofflags &= ~FOF_QUICKSAND; + if (rover->spawnflags & FOF_BUSTUP) + rover->fofflags &= ~FOF_BUSTUP; + if (rover->spawnflags & FOF_MARIO) + rover->fofflags &= ~FOF_MARIO; } } else // continue fading out @@ -7775,16 +7881,16 @@ static boolean P_FadeFakeFloor(ffloor_t *rover, INT16 sourcevalue, INT16 destval if (docollision) { - if (rover->spawnflags & FF_SOLID) - rover->flags |= FF_SOLID; - if (rover->spawnflags & FF_SWIMMABLE) - rover->flags |= FF_SWIMMABLE; - if (rover->spawnflags & FF_QUICKSAND) - rover->flags |= FF_QUICKSAND; - if (rover->spawnflags & FF_BUSTUP) - rover->flags |= FF_BUSTUP; - if (rover->spawnflags & FF_MARIO) - rover->flags |= FF_MARIO; + if (rover->spawnflags & FOF_SOLID) + rover->fofflags |= FOF_SOLID; + if (rover->spawnflags & FOF_SWIMMABLE) + rover->fofflags |= FOF_SWIMMABLE; + if (rover->spawnflags & FOF_QUICKSAND) + rover->fofflags |= FOF_QUICKSAND; + if (rover->spawnflags & FOF_BUSTUP) + rover->fofflags |= FOF_BUSTUP; + if (rover->spawnflags & FOF_MARIO) + rover->fofflags |= FOF_MARIO; } } else // continue fading in @@ -7804,114 +7910,114 @@ static boolean P_FadeFakeFloor(ffloor_t *rover, INT16 sourcevalue, INT16 destval // routines common to both fade in and fade out if (!stillfading) { - if (doexists && !(rover->spawnflags & FF_BUSTUP)) + if (doexists && !(rover->spawnflags & FOF_BUSTUP)) { if (alpha <= 1) - rover->flags &= ~FF_EXISTS; + rover->fofflags &= ~FOF_EXISTS; else - rover->flags |= FF_EXISTS; + rover->fofflags |= FOF_EXISTS; // Re-render lighting at end of fade - if (dolighting && !(rover->spawnflags & FF_NOSHADE) && !(rover->flags & FF_EXISTS)) + if (dolighting && !(rover->spawnflags & FOF_NOSHADE) && !(rover->fofflags & FOF_EXISTS)) rover->target->moved = true; } - if (dotranslucent && !(rover->flags & FF_FOG)) + if (dotranslucent && !(rover->fofflags & FOF_FOG)) { if (alpha >= 256) { - if (!(rover->flags & FF_CUTSOLIDS) && - (rover->spawnflags & FF_CUTSOLIDS)) + if (!(rover->fofflags & FOF_CUTSOLIDS) && + (rover->spawnflags & FOF_CUTSOLIDS)) { - rover->flags |= FF_CUTSOLIDS; + rover->fofflags |= FOF_CUTSOLIDS; rover->target->moved = true; } - rover->flags &= ~FF_TRANSLUCENT; + rover->fofflags &= ~FOF_TRANSLUCENT; } else { - rover->flags |= FF_TRANSLUCENT; + rover->fofflags |= FOF_TRANSLUCENT; - if ((rover->flags & FF_CUTSOLIDS) && - (rover->spawnflags & FF_CUTSOLIDS)) + if ((rover->fofflags & FOF_CUTSOLIDS) && + (rover->spawnflags & FOF_CUTSOLIDS)) { - rover->flags &= ~FF_CUTSOLIDS; + rover->fofflags &= ~FOF_CUTSOLIDS; rover->target->moved = true; } } - if ((rover->spawnflags & FF_NOSHADE) && // do not include light blocks, which don't set FF_NOSHADE - !(rover->spawnflags & FF_RENDERSIDES) && - !(rover->spawnflags & FF_RENDERPLANES)) + if ((rover->spawnflags & FOF_NOSHADE) && // do not include light blocks, which don't set FOF_NOSHADE + !(rover->spawnflags & FOF_RENDERSIDES) && + !(rover->spawnflags & FOF_RENDERPLANES)) { if (rover->alpha > 1) - rover->flags |= FF_RENDERALL; + rover->fofflags |= FOF_RENDERALL; else - rover->flags &= ~FF_RENDERALL; + rover->fofflags &= ~FOF_RENDERALL; } } } else { - if (doexists && !(rover->spawnflags & FF_BUSTUP)) + if (doexists && !(rover->spawnflags & FOF_BUSTUP)) { - // Re-render lighting if we haven't yet set FF_EXISTS (beginning of fade) - if (dolighting && !(rover->spawnflags & FF_NOSHADE) && !(rover->flags & FF_EXISTS)) + // Re-render lighting if we haven't yet set FOF_EXISTS (beginning of fade) + if (dolighting && !(rover->spawnflags & FOF_NOSHADE) && !(rover->fofflags & FOF_EXISTS)) rover->target->moved = true; - rover->flags |= FF_EXISTS; + rover->fofflags |= FOF_EXISTS; } - if (dotranslucent && !(rover->flags & FF_FOG)) + if (dotranslucent && !(rover->fofflags & FOF_FOG)) { - rover->flags |= FF_TRANSLUCENT; + rover->fofflags |= FOF_TRANSLUCENT; - if ((rover->flags & FF_CUTSOLIDS) && - (rover->spawnflags & FF_CUTSOLIDS)) + if ((rover->fofflags & FOF_CUTSOLIDS) && + (rover->spawnflags & FOF_CUTSOLIDS)) { - rover->flags &= ~FF_CUTSOLIDS; + rover->fofflags &= ~FOF_CUTSOLIDS; rover->target->moved = true; } - if ((rover->spawnflags & FF_NOSHADE) && // do not include light blocks, which don't set FF_NOSHADE - !(rover->spawnflags & FF_RENDERSIDES) && - !(rover->spawnflags & FF_RENDERPLANES)) - rover->flags |= FF_RENDERALL; + if ((rover->spawnflags & FOF_NOSHADE) && // do not include light blocks, which don't set FOF_NOSHADE + !(rover->spawnflags & FOF_RENDERSIDES) && + !(rover->spawnflags & FOF_RENDERPLANES)) + rover->fofflags |= FOF_RENDERALL; } if (docollision) { if (doghostfade) // remove collision flags during fade { - if (rover->spawnflags & FF_SOLID) - rover->flags &= ~FF_SOLID; - if (rover->spawnflags & FF_SWIMMABLE) - rover->flags &= ~FF_SWIMMABLE; - if (rover->spawnflags & FF_QUICKSAND) - rover->flags &= ~FF_QUICKSAND; - if (rover->spawnflags & FF_BUSTUP) - rover->flags &= ~FF_BUSTUP; - if (rover->spawnflags & FF_MARIO) - rover->flags &= ~FF_MARIO; + if (rover->spawnflags & FOF_SOLID) + rover->fofflags &= ~FOF_SOLID; + if (rover->spawnflags & FOF_SWIMMABLE) + rover->fofflags &= ~FOF_SWIMMABLE; + if (rover->spawnflags & FOF_QUICKSAND) + rover->fofflags &= ~FOF_QUICKSAND; + if (rover->spawnflags & FOF_BUSTUP) + rover->fofflags &= ~FOF_BUSTUP; + if (rover->spawnflags & FOF_MARIO) + rover->fofflags &= ~FOF_MARIO; } else // keep collision during fade { - if (rover->spawnflags & FF_SOLID) - rover->flags |= FF_SOLID; - if (rover->spawnflags & FF_SWIMMABLE) - rover->flags |= FF_SWIMMABLE; - if (rover->spawnflags & FF_QUICKSAND) - rover->flags |= FF_QUICKSAND; - if (rover->spawnflags & FF_BUSTUP) - rover->flags |= FF_BUSTUP; - if (rover->spawnflags & FF_MARIO) - rover->flags |= FF_MARIO; + if (rover->spawnflags & FOF_SOLID) + rover->fofflags |= FOF_SOLID; + if (rover->spawnflags & FOF_SWIMMABLE) + rover->fofflags |= FOF_SWIMMABLE; + if (rover->spawnflags & FOF_QUICKSAND) + rover->fofflags |= FOF_QUICKSAND; + if (rover->spawnflags & FOF_BUSTUP) + rover->fofflags |= FOF_BUSTUP; + if (rover->spawnflags & FOF_MARIO) + rover->fofflags |= FOF_MARIO; } } } - if (!(rover->flags & FF_FOG)) // don't set FOG alpha + if (!(rover->fofflags & FOF_FOG)) // don't set FOG alpha { if (!stillfading || exactalpha) rover->alpha = alpha; @@ -7954,8 +8060,8 @@ static boolean P_FadeFakeFloor(ffloor_t *rover, INT16 sourcevalue, INT16 destval * \param speed speed to fade by * \param ticbased tic-based logic, speed = duration * \param relative Destvalue is relative to rover->alpha - * \param doexists handle FF_EXISTS - * \param dotranslucent handle FF_TRANSLUCENT + * \param doexists handle FOF_EXISTS + * \param dotranslucent handle FOF_TRANSLUCENT * \param dolighting fade FOF light * \param docollision handle interactive flags * \param doghostfade no interactive flags during fading @@ -7971,10 +8077,10 @@ static void P_AddFakeFloorFader(ffloor_t *rover, size_t sectornum, size_t ffloor // If fading an invisible FOF whose render flags we did not yet set, // initialize its alpha to 1 if (dotranslucent && - (rover->spawnflags & FF_NOSHADE) && // do not include light blocks, which don't set FF_NOSHADE - !(rover->spawnflags & FF_RENDERSIDES) && - !(rover->spawnflags & FF_RENDERPLANES) && - !(rover->flags & FF_RENDERALL)) + (rover->spawnflags & FOF_NOSHADE) && // do not include light blocks, which don't set FOF_NOSHADE + !(rover->spawnflags & FOF_RENDERSIDES) && + !(rover->spawnflags & FOF_RENDERPLANES) && + !(rover->fofflags & FOF_RENDERALL)) rover->alpha = 1; // already equal, nothing to do @@ -8015,7 +8121,7 @@ static void P_AddFakeFloorFader(ffloor_t *rover, size_t sectornum, size_t ffloor P_ResetFakeFloorFader(rover, d, false); // Set a separate thinker for shadow fading - if (dolighting && !(rover->flags & FF_NOSHADE)) + if (dolighting && !(rover->fofflags & FOF_NOSHADE)) { UINT16 lightdelta = abs(sectors[rover->secnum].spawn_lightlevel - rover->target->lightlevel); fixed_t alphapercent = min(FixedDiv(d->destvalue, rover->spawnalpha), 1*FRACUNIT); // don't make darker than spawn_lightlevel @@ -8036,7 +8142,7 @@ static void P_AddFakeFloorFader(ffloor_t *rover, size_t sectornum, size_t ffloor d->destlightlevel = -1; // Set a separate thinker for colormap fading - if (docolormap && !(rover->flags & FF_NOSHADE) && sectors[rover->secnum].spawn_extra_colormap && !sectors[rover->secnum].colormap_protected) + if (docolormap && !(rover->fofflags & FOF_NOSHADE) && sectors[rover->secnum].spawn_extra_colormap && !sectors[rover->secnum].colormap_protected) { extracolormap_t *dest_exc, *source_exc = sectors[rover->secnum].extra_colormap ? sectors[rover->secnum].extra_colormap : R_GetDefaultColormap(); @@ -8097,11 +8203,11 @@ void T_Fade(fade_t *d) d->doexists, d->dotranslucent, d->dolighting, d->docolormap, d->docollision, d->doghostfade, d->exactalpha)) { // Finalize lighting, copypasta from P_AddFakeFloorFader - if (d->dolighting && !(d->rover->flags & FF_NOSHADE) && d->destlightlevel > -1) + if (d->dolighting && !(d->rover->fofflags & FOF_NOSHADE) && d->destlightlevel > -1) sectors[d->rover->secnum].lightlevel = d->destlightlevel; // Finalize colormap - if (d->docolormap && !(d->rover->flags & FF_NOSHADE) && sectors[d->rover->secnum].spawn_extra_colormap) + if (d->docolormap && !(d->rover->fofflags & FOF_NOSHADE) && sectors[d->rover->secnum].spawn_extra_colormap) sectors[d->rover->secnum].extra_colormap = d->dest_exc; P_RemoveFakeFloorFader(d->rover); @@ -8115,7 +8221,7 @@ static void P_ResetColormapFader(sector_t *sector) // The thinker is the first member in all the action structs, // so just let the thinker get freed, and that will free the whole // structure. - P_RemoveThinker(&((elevator_t *)sector->fadecolormapdata)->thinker); + P_RemoveThinker(&((thinkerdata_t *)sector->fadecolormapdata)->thinker); sector->fadecolormapdata = NULL; } } @@ -8344,40 +8450,32 @@ void T_Friction(friction_t *f) static void P_SpawnFriction(void) { size_t i; - line_t *l = lines; - mtag_t tag; - register INT32 s; - fixed_t strength; // frontside texture offset controls magnitude + sector_t *s = sectors; + fixed_t friction; // friction value to be applied during movement INT32 movefactor; // applied to each player move to simulate inertia - for (i = 0; i < numlines; i++, l++) - if (l->special == 540) - { - tag = Tag_FGet(&l->tags); - strength = sides[l->sidenum[0]].textureoffset>>FRACBITS; - if (strength > 0) // sludge - strength = strength*2; // otherwise, the maximum sludginess value is +967... + for (i = 0; i < numsectors; i++, s++) + { + if (s->friction == ORIG_FRICTION) + continue; - // The following might seem odd. At the time of movement, - // the move distance is multiplied by 'friction/0x10000', so a - // higher friction value actually means 'less friction'. - friction = ORIG_FRICTION - (0x1EB8*strength)/0x80; // ORIG_FRICTION is 0xE800 + friction = s->friction; - if (friction > FRACUNIT) - friction = FRACUNIT; - if (friction < 0) - friction = 0; + if (friction > FRACUNIT) + friction = FRACUNIT; + if (friction < 0) + friction = 0; - movefactor = FixedDiv(ORIG_FRICTION, friction); - if (movefactor < FRACUNIT) - movefactor = 8*movefactor - 7*FRACUNIT; - else - movefactor = FRACUNIT; + movefactor = FixedDiv(ORIG_FRICTION, friction); + if (movefactor < FRACUNIT) + movefactor = 8*movefactor - 7*FRACUNIT; + else + movefactor = FRACUNIT; - TAG_ITER_SECTORS(tag, s) - Add_Friction(friction, movefactor, s, -1); - } + Add_Friction(friction, movefactor, (INT32)(s-sectors), -1); + + } } /* @@ -8396,20 +8494,20 @@ static void P_SpawnFriction(void) * \param type Type of push/pull effect. * \param x_mag X magnitude. * \param y_mag Y magnitude. - * \param source For a point pusher/puller, the source object. + * \param z_mag Z magnitude. * \param affectee Target sector. * \param referrer What sector set it * \sa T_Pusher, P_GetPushThing, P_SpawnPushers */ -static void Add_Pusher(pushertype_e type, fixed_t x_mag, fixed_t y_mag, mobj_t *source, INT32 affectee, INT32 referrer, INT32 exclusive, INT32 slider) +static void Add_Pusher(pushertype_e type, fixed_t x_mag, fixed_t y_mag, fixed_t z_mag, INT32 affectee, INT32 referrer, INT32 exclusive, INT32 slider) { pusher_t *p = Z_Calloc(sizeof *p, PU_LEVSPEC, NULL); p->thinker.function.acp1 = (actionf_p1)T_Pusher; - p->source = source; p->type = type; - p->x_mag = x_mag>>FRACBITS; - p->y_mag = y_mag>>FRACBITS; + p->x_mag = x_mag; + p->y_mag = y_mag; + p->z_mag = z_mag; p->exclusive = exclusive; p->slider = slider; @@ -8417,185 +8515,18 @@ static void Add_Pusher(pushertype_e type, fixed_t x_mag, fixed_t y_mag, mobj_t * { p->roverpusher = true; p->referrer = referrer; + sectors[referrer].specialflags |= SSF_WINDCURRENT; } else - p->roverpusher = false; - - // "The right triangle of the square of the length of the hypotenuse is equal to the sum of the squares of the lengths of the other two sides." - // "Bah! Stupid brains! Don't you know anything besides the Pythagorean Theorem?" - Earthworm Jim - if (type == p_downcurrent || type == p_upcurrent || type == p_upwind || type == p_downwind) - p->magnitude = P_AproxDistance(p->x_mag,p->y_mag)<<(FRACBITS-PUSH_FACTOR); - else - p->magnitude = P_AproxDistance(p->x_mag,p->y_mag); - if (source) // point source exist? { - // where force goes to zero - if (type == p_push) - p->radius = AngleFixed(source->angle); - else - p->radius = (p->magnitude)<<(FRACBITS+1); - - p->x = p->source->x; - p->y = p->source->y; - p->z = p->source->z; + p->roverpusher = false; + sectors[affectee].specialflags |= SSF_WINDCURRENT; } + p->affectee = affectee; P_AddThinker(THINK_MAIN, &p->thinker); } - -// PIT_PushThing determines the angle and magnitude of the effect. -// The object's x and y momentum values are changed. -static pusher_t *tmpusher; // pusher structure for blockmap searches - -/** Applies a point pusher/puller to a thing. - * - * \param thing Thing to be pushed. - * \return True if the thing was pushed. - * \todo Make a more robust P_BlockThingsIterator() so the hidden parameter - * ::tmpusher won't need to be used. - * \sa T_Pusher - */ -static inline boolean PIT_PushThing(mobj_t *thing) -{ - if (thing->eflags & MFE_PUSHED) - return false; - - if (thing->player && thing->player->powers[pw_carry] == CR_ROPEHANG) - return false; - - if (!tmpusher->source) - return false; - - // Allow this to affect pushable objects at some point? - if (thing->player && (!(thing->flags & (MF_NOGRAVITY | MF_NOCLIP)) || thing->player->powers[pw_carry] == CR_NIGHTSMODE)) - { - INT32 dist; - INT32 speed; - INT32 sx, sy, sz; - - sx = tmpusher->x; - sy = tmpusher->y; - sz = tmpusher->z; - - // don't fade wrt Z if health & 2 (mapthing has multi flag) - if (tmpusher->source->health & 2) - dist = P_AproxDistance(thing->x - sx,thing->y - sy); - else - { - // Make sure the Z is in range - if (thing->z < sz - tmpusher->radius || thing->z > sz + tmpusher->radius) - return false; - - dist = P_AproxDistance(P_AproxDistance(thing->x - sx, thing->y - sy), - thing->z - sz); - } - - speed = (tmpusher->magnitude - ((dist>>FRACBITS)>>1))<<(FRACBITS - PUSH_FACTOR - 1); - - // If speed <= 0, you're outside the effective radius. You also have - // to be able to see the push/pull source point. - - // Written with bits and pieces of P_HomingAttack - if ((speed > 0) && (P_CheckSight(thing, tmpusher->source))) - { - if (thing->player->powers[pw_carry] != CR_NIGHTSMODE) - { - // only push wrt Z if health & 1 (mapthing has ambush flag) - if (tmpusher->source->health & 1) - { - fixed_t tmpmomx, tmpmomy, tmpmomz; - - tmpmomx = FixedMul(FixedDiv(sx - thing->x, dist), speed); - tmpmomy = FixedMul(FixedDiv(sy - thing->y, dist), speed); - tmpmomz = FixedMul(FixedDiv(sz - thing->z, dist), speed); - if (tmpusher->source->type == MT_PUSH) // away! - { - tmpmomx *= -1; - tmpmomy *= -1; - tmpmomz *= -1; - } - - thing->momx += tmpmomx; - thing->momy += tmpmomy; - thing->momz += tmpmomz; - - if (thing->player) - { - thing->player->cmomx += tmpmomx; - thing->player->cmomy += tmpmomy; - thing->player->cmomx = FixedMul(thing->player->cmomx, 0xe800); - thing->player->cmomy = FixedMul(thing->player->cmomy, 0xe800); - } - } - else - { - angle_t pushangle; - - pushangle = R_PointToAngle2(thing->x, thing->y, sx, sy); - if (tmpusher->source->type == MT_PUSH) - pushangle += ANGLE_180; // away - pushangle >>= ANGLETOFINESHIFT; - thing->momx += FixedMul(speed, FINECOSINE(pushangle)); - thing->momy += FixedMul(speed, FINESINE(pushangle)); - - if (thing->player) - { - thing->player->cmomx += FixedMul(speed, FINECOSINE(pushangle)); - thing->player->cmomy += FixedMul(speed, FINESINE(pushangle)); - thing->player->cmomx = FixedMul(thing->player->cmomx, 0xe800); - thing->player->cmomy = FixedMul(thing->player->cmomy, 0xe800); - } - } - } - else - { - //NiGHTS-specific handling. - //By default, pushes and pulls only affect the Z-axis. - //By having the ambush flag, it affects the X-axis. - //By having the object special flag, it affects the Y-axis. - fixed_t tmpmomx, tmpmomy, tmpmomz; - - if (tmpusher->source->health & 1) - tmpmomx = FixedMul(FixedDiv(sx - thing->x, dist), speed); - else - tmpmomx = 0; - - if (tmpusher->source->health & 2) - tmpmomy = FixedMul(FixedDiv(sy - thing->y, dist), speed); - else - tmpmomy = 0; - - tmpmomz = FixedMul(FixedDiv(sz - thing->z, dist), speed); - - if (tmpusher->source->type == MT_PUSH) // away! - { - tmpmomx *= -1; - tmpmomy *= -1; - tmpmomz *= -1; - } - - thing->momx += tmpmomx; - thing->momy += tmpmomy; - thing->momz += tmpmomz; - - if (thing->player) - { - thing->player->cmomx += tmpmomx; - thing->player->cmomy += tmpmomy; - thing->player->cmomx = FixedMul(thing->player->cmomx, 0xe800); - thing->player->cmomy = FixedMul(thing->player->cmomy, 0xe800); - } - } - } - } - - if (tmpusher->exclusive) - thing->eflags |= MFE_PUSHED; - - return true; -} - /** Applies a pusher to all affected objects. * * \param p Thinker for the pusher effect. @@ -8607,30 +8538,19 @@ void T_Pusher(pusher_t *p) sector_t *sec, *referrer = NULL; mobj_t *thing; msecnode_t *node; - INT32 xspeed = 0,yspeed = 0; - INT32 xl, xh, yl, yh, bx, by; - INT32 radius; - //INT32 ht = 0; + fixed_t x_mag, y_mag, z_mag; + fixed_t xspeed = 0, yspeed = 0, zspeed = 0; boolean inFOF; boolean touching; boolean moved; - xspeed = yspeed = 0; + x_mag = p->x_mag >> PUSH_FACTOR; + y_mag = p->y_mag >> PUSH_FACTOR; + z_mag = p->z_mag >> PUSH_FACTOR; sec = sectors + p->affectee; - - // Be sure the special sector type is still turned on. If so, proceed. - // Else, bail out; the sector type has been changed on us. - if (p->roverpusher) - { - referrer = §ors[p->referrer]; - - if (GETSECSPECIAL(referrer->special, 3) != 2) - return; - } - else if (GETSECSPECIAL(sec->special, 3) != 2) - return; + referrer = sectors + p->referrer; // For constant pushers (wind/current) there are 3 situations: // @@ -8650,29 +8570,6 @@ void T_Pusher(pusher_t *p) // // In Phase II, you can apply these effects to Things other than players. - if (p->type == p_push) - { - - // Seek out all pushable things within the force radius of this - // point pusher. Crosses sectors, so use blockmap. - - tmpusher = p; // MT_PUSH/MT_PULL point source - radius = p->radius; // where force goes to zero - tmbbox[BOXTOP] = p->y + radius; - tmbbox[BOXBOTTOM] = p->y - radius; - tmbbox[BOXRIGHT] = p->x + radius; - tmbbox[BOXLEFT] = p->x - radius; - - xl = (unsigned)(tmbbox[BOXLEFT] - bmaporgx - MAXRADIUS)>>MAPBLOCKSHIFT; - xh = (unsigned)(tmbbox[BOXRIGHT] - bmaporgx + MAXRADIUS)>>MAPBLOCKSHIFT; - yl = (unsigned)(tmbbox[BOXBOTTOM] - bmaporgy - MAXRADIUS)>>MAPBLOCKSHIFT; - yh = (unsigned)(tmbbox[BOXTOP] - bmaporgy + MAXRADIUS)>>MAPBLOCKSHIFT; - for (bx = xl; bx <= xh; bx++) - for (by = yl; by <= yh; by++) - P_BlockThingsIterator(bx,by, PIT_PushThing); - return; - } - // constant pushers p_wind and p_current node = sec->touching_thinglist; // things touching this sector for (; node; node = node->m_thinglist_next) @@ -8740,91 +8637,45 @@ void T_Pusher(pusher_t *p) { if (thing->z == P_GetSpecialBottomZ(thing, sec, sec)) touching = true; - else if (p->type != p_current) + // Annoying backwards compatibility nonsense: + // In binary, horizontal currents require floor touch + else if (udmf || p->type != p_current || z_mag != 0) inFOF = true; } if (!touching && !inFOF) // Object is out of range of effect continue; - if (p->type == p_wind) + if (inFOF || (p->type == p_current && touching)) { - if (touching) // on ground - { - xspeed = (p->x_mag)>>1; // half force - yspeed = (p->y_mag)>>1; - moved = true; - } - else if (inFOF) - { - xspeed = (p->x_mag); // full force - yspeed = (p->y_mag); - moved = true; - } + xspeed = x_mag; // full force + yspeed = y_mag; + zspeed = z_mag; + moved = true; } - else if (p->type == p_upwind) + else if (p->type == p_wind && touching) { - if (touching) // on ground - { - thing->momz += (p->magnitude)>>1; - moved = true; - } - else if (inFOF) - { - thing->momz += p->magnitude; - moved = true; - } - } - else if (p->type == p_downwind) - { - if (touching) // on ground - { - thing->momz -= (p->magnitude)>>1; - moved = true; - } - else if (inFOF) - { - thing->momz -= p->magnitude; - moved = true; - } - } - else // p_current - { - if (!touching && !inFOF) // Not in water at all - xspeed = yspeed = 0; // no force - else // underwater / touching water - { - if (p->type == p_upcurrent) - thing->momz += p->magnitude; - else if (p->type == p_downcurrent) - thing->momz -= p->magnitude; - else - { - xspeed = p->x_mag; // full force - yspeed = p->y_mag; - } - moved = true; - } + xspeed = x_mag>>1; // half force + yspeed = y_mag>>1; + zspeed = z_mag>>1; + moved = true; } - if (p->type != p_downcurrent && p->type != p_upcurrent - && p->type != p_upwind && p->type != p_downwind) + thing->momx += xspeed; + thing->momy += yspeed; + thing->momz += zspeed; + if (thing->player) { - thing->momx += xspeed<<(FRACBITS-PUSH_FACTOR); - thing->momy += yspeed<<(FRACBITS-PUSH_FACTOR); - if (thing->player) - { - thing->player->cmomx += xspeed<<(FRACBITS-PUSH_FACTOR); - thing->player->cmomy += yspeed<<(FRACBITS-PUSH_FACTOR); - thing->player->cmomx = FixedMul(thing->player->cmomx, ORIG_FRICTION); - thing->player->cmomy = FixedMul(thing->player->cmomy, ORIG_FRICTION); - } - - // Tumbleweeds bounce a bit... - if (thing->type == MT_LITTLETUMBLEWEED || thing->type == MT_BIGTUMBLEWEED) - thing->momz += P_AproxDistance(xspeed<<(FRACBITS-PUSH_FACTOR), yspeed<<(FRACBITS-PUSH_FACTOR)) >> 2; + thing->player->cmomx += xspeed; + thing->player->cmomy += yspeed; + thing->player->cmomx = FixedMul(thing->player->cmomx, ORIG_FRICTION); + thing->player->cmomy = FixedMul(thing->player->cmomy, ORIG_FRICTION); } + // Tumbleweeds bounce a bit... + if (thing->type == MT_LITTLETUMBLEWEED || thing->type == MT_BIGTUMBLEWEED) + thing->momz += P_AproxDistance(xspeed, yspeed) >> 2; + if (moved) { if (p->slider && thing->player) @@ -8836,7 +8687,7 @@ void T_Pusher(pusher_t *p) thing->player->pflags |= jumped; thing->player->pflags |= PF_SLIDING; - thing->angle = R_PointToAngle2 (0, 0, xspeed<<(FRACBITS-PUSH_FACTOR), yspeed<<(FRACBITS-PUSH_FACTOR)); + thing->angle = R_PointToAngle2(0, 0, xspeed, yspeed); if (!demoplayback || P_ControlStyle(thing->player) == CS_LMAOGALOG) { @@ -8855,86 +8706,33 @@ void T_Pusher(pusher_t *p) } } - -/** Gets a push/pull object. - * - * \param s Sector number to look in. - * \return Pointer to the first ::MT_PUSH or ::MT_PULL object found in the - * sector. - * \sa P_GetTeleportDestThing, P_GetStarpostThing, P_GetAltViewThing - */ -mobj_t *P_GetPushThing(UINT32 s) -{ - mobj_t *thing; - sector_t *sec; - - sec = sectors + s; - thing = sec->thinglist; - while (thing) - { - switch (thing->type) - { - case MT_PUSH: - case MT_PULL: - return thing; - default: - break; - } - thing = thing->snext; - } - return NULL; -} - /** Spawns pushers. * - * \todo Remove magic numbers. * \sa P_SpawnSpecials, Add_Pusher */ static void P_SpawnPushers(void) { size_t i; line_t *l = lines; - mtag_t tag; register INT32 s; - mobj_t *thing; + fixed_t length, hspeed, dx, dy; for (i = 0; i < numlines; i++, l++) { - tag = Tag_FGet(&l->tags); - switch (l->special) + if (l->special != 541) + continue; + + length = R_PointToDist2(l->v2->x, l->v2->y, l->v1->x, l->v1->y); + hspeed = l->args[1] << FRACBITS; + dx = FixedMul(FixedDiv(l->dx, length), hspeed); + dy = FixedMul(FixedDiv(l->dy, length), hspeed); + + if (l->args[0] == 0) + Add_Pusher(l->args[3], dx, dy, l->args[2] << FRACBITS, (INT32)(l->frontsector - sectors), -1, !(l->args[4] & TMPF_NONEXCLUSIVE), !!(l->args[4] & TMPF_SLIDE)); + else { - case 541: // wind - TAG_ITER_SECTORS(tag, s) - Add_Pusher(p_wind, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4); - break; - case 544: // current - TAG_ITER_SECTORS(tag, s) - Add_Pusher(p_current, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4); - break; - case 547: // push/pull - TAG_ITER_SECTORS(tag, s) - { - thing = P_GetPushThing(s); - if (thing) // No MT_P* means no effect - Add_Pusher(p_push, l->dx, l->dy, thing, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4); - } - break; - case 545: // current up - TAG_ITER_SECTORS(tag, s) - Add_Pusher(p_upcurrent, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4); - break; - case 546: // current down - TAG_ITER_SECTORS(tag, s) - Add_Pusher(p_downcurrent, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4); - break; - case 542: // wind up - TAG_ITER_SECTORS(tag, s) - Add_Pusher(p_upwind, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4); - break; - case 543: // wind down - TAG_ITER_SECTORS(tag, s) - Add_Pusher(p_downwind, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4); - break; + TAG_ITER_SECTORS(l->args[0], s) + Add_Pusher(l->args[3], dx, dy, l->args[2] << FRACBITS, s, -1, !(l->args[4] & TMPF_NONEXCLUSIVE), !!(l->args[4] & TMPF_SLIDE)); } } } diff --git a/src/p_spec.h b/src/p_spec.h index 3b8abfcf8..91dfccb70 100644 --- a/src/p_spec.h +++ b/src/p_spec.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -21,6 +21,457 @@ extern mobj_t *skyboxmo[2]; // current skybox mobjs: 0 = viewpoint, 1 = centerpo extern mobj_t *skyboxviewpnts[16]; // array of MT_SKYBOX viewpoint mobjs extern mobj_t *skyboxcenterpnts[16]; // array of MT_SKYBOX centerpoint mobjs +// Amount (dx, dy) vector linedef is shifted right to get scroll amount +#define SCROLL_SHIFT 5 + +typedef enum +{ + TMM_DOUBLESIZE = 1, + TMM_SILENT = 1<<1, + TMM_ALLOWYAWCONTROL = 1<<2, + TMM_SWING = 1<<3, + TMM_MACELINKS = 1<<4, + TMM_CENTERLINK = 1<<5, + TMM_CLIP = 1<<6, + TMM_ALWAYSTHINK = 1<<7, +} textmapmaceflags_t; + +typedef enum +{ + TMDA_BOTTOMOFFSET = 1, + TMDA_BOTTOM = 1<<1, + TMDA_MIDDLE = 1<<2, + TMDA_TOP = 1<<3, +} textmapdronealignment_t; + +typedef enum +{ + TMSF_RETRACTED = 1, + TMSF_INTANGIBLE = 1<<1, +} textmapspikeflags_t; + +typedef enum +{ + TMFF_AIMLESS = 1, + TMFF_STATIONARY = 1<<1, + TMFF_HOP = 1<<2, +} textmapflickyflags_t; + +typedef enum +{ + TMFH_NOFLAME = 1, + TMFH_CORONA = 1<<1, +} textmapflameholderflags_t; + +typedef enum +{ + TMDS_NOGRAVITY = 1, + TMDS_ROTATEEXTRA = 1<<1, +} textmapdiagonalspringflags_t; + +typedef enum +{ + TMF_INVISIBLE = 1, + TMF_NODISTANCECHECK = 1<<1, +} textmapfanflags_t; + +typedef enum +{ + TMGD_BACK = 0, + TMGD_RIGHT = 1, + TMGD_LEFT = 2, +} textmapguarddirection_t; + +typedef enum +{ + TMNI_BONUSONLY = 1, + TMNI_REVEAL = 1<<1, +} textmapnightsitem_t; + +typedef enum +{ + TMP_NORMAL = 0, + TMP_SLIDE = 1, + TMP_IMMOVABLE = 2, + TMP_CLASSIC = 3, +} textmappushabletype_t; + +typedef enum +{ + TMED_NONE = 0, + TMED_RIGHT = 1, + TMED_LEFT = 2, +} textmapeggrobodirection_t; + +typedef enum +{ + TMMR_SAME = 0, + TMMR_WEAK = 1, + TMMR_STRONG = 2, +} textmapmonitorrespawn_t; + +typedef enum +{ + TMF_GRAYSCALE = 1, + TMF_SKIPINTRO = 1<<1, +} textmapfangflags_t; + +typedef enum +{ + TMB_NODEATHFLING = 1, + TMB_BARRIER = 1<<1, +} textmapbrakflags_t; + +typedef enum +{ + TMEF_SKIPTALLY = 1, + TMEF_EMERALDCHECK = 1<<1, +} textmapexitflags_t; + +typedef enum +{ + TMSP_NOTELEPORT = 1, + TMSP_FORCESPIN = 1<<1, +} textmapspeedpadflags_t; + +//FOF flags +typedef enum +{ + TMFA_NOPLANES = 1, + TMFA_NOSIDES = 1<<1, + TMFA_INSIDES = 1<<2, + TMFA_ONLYINSIDES = 1<<3, + TMFA_NOSHADE = 1<<4, + TMFA_SPLAT = 1<<5, +} textmapfofappearance_t; + +typedef enum +{ + TMFT_INTANGIBLETOP = 1, + TMFT_INTANGIBLEBOTTOM = 1<<1, + TMFT_DONTBLOCKPLAYER = 1<<2, + TMFT_VISIBLEFROMINSIDE = (TMFT_INTANGIBLETOP|TMFT_INTANGIBLEBOTTOM|TMFT_DONTBLOCKPLAYER), + TMFT_DONTBLOCKOTHERS = 1<<3, + TMFT_INTANGIBLE = (TMFT_DONTBLOCKPLAYER|TMFT_DONTBLOCKOTHERS), +} textmapfoftangibility_t; + +typedef enum +{ + TMFW_NOSIDES = 1, + TMFW_DOUBLESHADOW = 1<<1, + TMFW_COLORMAPONLY = 1<<2, + TMFW_NORIPPLE = 1<<3, + TMFW_GOOWATER = 1<<4, + TMFW_SPLAT = 1<<5, +} textmapfofwater_t; + +typedef enum +{ + TMFB_REVERSE = 1, + TMFB_SPINDASH = 1<<1, + TMFB_DYNAMIC = 1<<2, +} textmapfofbobbing_t; + +typedef enum +{ + TMFC_NOSHADE = 1, + TMFC_NORETURN = 1<<1, + TMFC_AIRBOB = 1<<2, + TMFC_FLOATBOB = 1<<3, + TMFC_SPLAT = 1<<4, +} textmapfofcrumbling_t; + +typedef enum +{ + TMFR_REVERSE = 1, + TMFR_SPINDASH = 1<<1, +} textmapfofrising_t; + +typedef enum +{ + TMFM_BRICK = 1, + TMFM_INVISIBLE = 1<<1, +} textmapfofmario_t; + +typedef enum +{ + TMFB_TOUCH, + TMFB_SPIN, + TMFB_REGULAR, + TMFB_STRONG, +} textmapfofbusttype_t; + +typedef enum +{ + TMFB_PUSHABLES = 1, + TMFB_EXECUTOR = 1<<1, + TMFB_ONLYBOTTOM = 1<<2, + TMFB_SPLAT = 1<<3, +} textmapfofbustflags_t; + +typedef enum +{ + TMFL_NOBOSSES = 1, + TMFL_SPLAT = 1<<1, +} textmapfoflaserflags_t; + +typedef enum +{ + TMT_CONTINUOUS = 0, + TMT_ONCE = 1, + TMT_EACHTIMEMASK = TMT_ONCE, + TMT_EACHTIMEENTER = 2, + TMT_EACHTIMEENTERANDEXIT = 3, +} textmaptriggertype_t; + +typedef enum +{ + TMXT_CONTINUOUS = 0, + TMXT_EACHTIMEMASK = TMXT_CONTINUOUS, + TMXT_EACHTIMEENTER = 1, + TMXT_EACHTIMEENTERANDEXIT = 2, +} textmapxtriggertype_t; + +typedef enum +{ + TMF_HASALL = 0, + TMF_HASANY = 1, + TMF_HASEXACTLY = 2, + TMF_DOESNTHAVEALL = 3, + TMF_DOESNTHAVEANY = 4, +} textmapflagcheck_t; + +typedef enum +{ + TMT_RED = 0, + TMT_BLUE = 1, +} textmapteam_t; + +typedef enum +{ + TMC_EQUAL = 0, + TMC_LTE = 1, + TMC_GTE = 2, +} textmapcomparison_t; + +typedef enum +{ + TMG_NORMAL = 0, + TMG_REVERSE = 1, + TMG_TEMPREVERSE = 2, +} textmapgravity_t; + +typedef enum +{ + TMNP_FASTEST = 0, + TMNP_SLOWEST = 1, + TMNP_TRIGGERER = 2, +} textmapnightsplayer_t; + +typedef enum +{ + TMN_ALWAYS = 0, + TMN_FROMNONIGHTS = 1, + TMN_FROMNIGHTS = 2, +} textmapnighterizeoptions_t; + +typedef enum +{ + TMN_BONUSLAPS = 1, + TMN_LEVELCOMPLETION = 1<<2, +} textmapnightserizeflags_t; + +typedef enum +{ + TMD_ALWAYS = 0, + TMD_NOBODYNIGHTS = 1, + TMD_SOMEBODYNIGHTS = 2, +} textmapdenighterizeoptions_t; + +typedef enum +{ + TMS_IFENOUGH = 0, + TMS_IFNOTENOUGH = 1, + TMS_ALWAYS = 2, +} textmapspherescheck_t; + +typedef enum +{ + TMI_BONUSLAPS = 1, + TMI_ENTER = 1<<2, +} textmapideyacaptureflags_t; + +typedef enum +{ + TMP_FLOOR = 0, + TMP_CEILING = 1, + TMP_BOTH = 2, +} textmapplanes_t; + +typedef enum +{ + TMT_ADD = 0, + TMT_REMOVE = 1, + TMT_REPLACEFIRST = 2, + TMT_TRIGGERTAG = 3, +} textmaptagoptions_t; + +typedef enum +{ + TMT_SILENT = 1, + TMT_KEEPANGLE = 1<<1, + TMT_KEEPMOMENTUM = 1<<2, + TMT_RELATIVE = 1<<3, +} textmapteleportflags_t; + +typedef enum +{ + TMM_ALLPLAYERS = 1, + TMM_OFFSET = 1<<1, + TMM_FADE = 1<<2, + TMM_NORELOAD = 1<<3, + TMM_FORCERESET = 1<<4, + TMM_NOLOOP = 1<<5, +} textmapmusicflags_t; + +typedef enum +{ + TMSS_TRIGGERMOBJ = 0, + TMSS_TRIGGERSECTOR = 1, + TMSS_NOWHERE = 2, + TMSS_TAGGEDSECTOR = 3, +} textmapsoundsource_t; + +typedef enum +{ + TMSL_EVERYONE = 0, + TMSL_TRIGGERER = 1, + TMSL_TAGGEDSECTOR = 2, +} textmapsoundlistener_t; + +typedef enum +{ + TML_SECTOR = 0, + TML_FLOOR = 1, + TML_CEILING = 2, +} textmaplightareas_t; + +typedef enum +{ + TMLC_NOSECTOR = 1, + TMLC_NOFLOOR = 1<<1, + TMLC_NOCEILING = 1<<2, +} textmaplightcopyflags_t; + +typedef enum +{ + TMF_RELATIVE = 1, + TMF_OVERRIDE = 1<<1, + TMF_TICBASED = 1<<2, +} textmapfadeflags_t; + +typedef enum +{ + TMB_USETARGET = 1, + TMB_SYNC = 1<<1, +} textmapblinkinglightflags_t; + +typedef enum +{ + TMFR_NORETURN = 1, + TMFR_CHECKFLAG = 1<<1, +} textmapfofrespawnflags_t; + +typedef enum +{ + TMST_RELATIVE = 1, + TMST_DONTDOTRANSLUCENT = 1<<1, +} textmapsettranslucencyflags_t; + +typedef enum +{ + TMFT_RELATIVE = 1, + TMFT_OVERRIDE = 1<<1, + TMFT_TICBASED = 1<<2, + TMFT_IGNORECOLLISION = 1<<3, + TMFT_GHOSTFADE = 1<<4, + TMFT_DONTDOTRANSLUCENT = 1<<5, + TMFT_DONTDOEXISTS = 1<<6, + TMFT_DONTDOLIGHTING = 1<<7, + TMFT_DONTDOCOLORMAP = 1<<8, + TMFT_USEEXACTALPHA = 1<<9, +} textmapfadetranslucencyflags_t; + +typedef enum +{ + TMS_VIEWPOINT = 0, + TMS_CENTERPOINT = 1, + TMS_BOTH = 2, +} textmapskybox_t; + +typedef enum +{ + TMP_CLOSE = 1, + TMP_RUNPOSTEXEC = 1<<1, + TMP_CALLBYNAME = 1<<2, + TMP_KEEPCONTROLS = 1<<3, + TMP_KEEPREALTIME = 1<<4, + //TMP_ALLPLAYERS = 1<<5, + //TMP_FREEZETHINKERS = 1<<6, +} textmappromptflags_t; + +typedef enum +{ + TMF_NOCHANGE = 0, + TMF_ADD = 1, + TMF_REMOVE = 2, +} textmapsetflagflags_t; + +typedef enum +{ + TMSD_FRONT = 0, + TMSD_BACK = 1, + TMSD_FRONTBACK = 2, +} textmapsides_t; + +typedef enum +{ + TMS_SCROLLCARRY = 0, + TMS_SCROLLONLY = 1, + TMS_CARRYONLY = 2, +} textmapscroll_t; + +typedef enum +{ + TMST_REGULAR = 0, + TMST_ACCELERATIVE = 1, + TMST_DISPLACEMENT = 2, + TMST_TYPEMASK = 3, + TMST_NONEXCLUSIVE = 4, +} textmapscrolltype_t; + +typedef enum +{ + TMPF_SLIDE = 1, + TMPF_NONEXCLUSIVE = 1<<1, +} textmappusherflags_t; + +typedef enum +{ + TMPP_NOZFADE = 1, + TMPP_PUSHZ = 1<<1, + TMPP_NONEXCLUSIVE = 1<<2, +} textmappointpushflags_t; + +typedef enum +{ + TMB_TRANSLUCENT = 0, + TMB_ADD = 1, + TMB_SUBTRACT = 2, + TMB_REVERSESUBTRACT = 3, + TMB_MODULATE = 4, +} textmapblendmodes_t; + // GETSECSPECIAL (specialval, section) // // Pulls out the special # from a particular section. @@ -38,12 +489,22 @@ void P_SetupLevelFlatAnims(void); // at map load void P_InitSpecials(void); +void P_ApplyFlatAlignment(sector_t* sector, angle_t flatangle, fixed_t xoffs, fixed_t yoffs, boolean floor, boolean ceiling); +fixed_t P_GetSectorGravityFactor(sector_t *sec); void P_SpawnSpecials(boolean fromnetsave); // every tic void P_UpdateSpecials(void); +sector_t *P_MobjTouchingSectorSpecial(mobj_t *mo, INT32 section, INT32 number); +sector_t *P_ThingOnSpecial3DFloor(mobj_t *mo); +sector_t *P_MobjTouchingSectorSpecialFlag(mobj_t *mo, sectorspecialflags_t flag); sector_t *P_PlayerTouchingSectorSpecial(player_t *player, INT32 section, INT32 number); +sector_t *P_PlayerTouchingSectorSpecialFlag(player_t *player, sectorspecialflags_t flag); void P_PlayerInSpecialSector(player_t *player); +void P_CheckMobjTrigger(mobj_t *mobj, boolean pushable); +sector_t *P_FindPlayerTrigger(player_t *player, line_t *sourceline); +boolean P_IsPlayerValid(size_t playernum); +boolean P_CanPlayerTrigger(size_t playernum); void P_ProcessSpecialSector(player_t *player, sector_t *sector, sector_t *roversector); fixed_t P_FindLowestFloorSurrounding(sector_t *sec); @@ -60,6 +521,10 @@ INT32 P_FindMinSurroundingLight(sector_t *sector, INT32 max); void P_SetupSignExit(player_t *player); boolean P_IsFlagAtBase(mobjtype_t flag); +boolean P_IsMobjTouchingSectorPlane(mobj_t *mo, sector_t *sec); +boolean P_IsMobjTouching3DFloor(mobj_t *mo, ffloor_t *ffloor, sector_t *sec); +boolean P_IsMobjTouchingPolyobj(mobj_t *mo, polyobj_t *po, sector_t *polysec); + void P_SwitchWeather(INT32 weathernum); boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller); @@ -72,6 +537,12 @@ void P_RunNightsCapsuleTouchExecutors(mobj_t *actor, boolean entering, boolean e UINT16 P_GetFFloorID(ffloor_t *fflr); ffloor_t *P_GetFFloorByID(sector_t *sec, UINT16 id); +// Use this when you don't know the type of your thinker data struct but need to access its thinker. +typedef struct +{ + thinker_t thinker; +} thinkerdata_t; + // // P_LIGHTS // @@ -83,8 +554,8 @@ typedef struct sector_t *sector; ///< The sector where action is taking place. INT32 count; INT32 resetcount; - INT32 maxlight; ///< The brightest light level to use. - INT32 minlight; ///< The darkest light level to use. + INT16 maxlight; ///< The brightest light level to use. + INT16 minlight; ///< The darkest light level to use. } fireflicker_t; typedef struct @@ -112,8 +583,8 @@ typedef struct thinker_t thinker; ///< The thinker in use for the effect. sector_t *sector; ///< The sector where the action is taking place. INT32 count; - INT32 minlight; ///< The minimum light level to use. - INT32 maxlight; ///< The maximum light level to use. + INT16 minlight; ///< The minimum light level to use. + INT16 maxlight; ///< The maximum light level to use. INT32 darktime; ///< How INT32 to use minlight. INT32 brighttime; ///< How INT32 to use maxlight. } strobe_t; @@ -122,10 +593,10 @@ typedef struct { thinker_t thinker; sector_t *sector; - INT32 minlight; - INT32 maxlight; - INT32 direction; - INT32 speed; + INT16 minlight; + INT16 maxlight; + INT16 direction; + INT16 speed; } glow_t; /** Thinker struct for fading lights. @@ -151,18 +622,18 @@ typedef struct void P_RemoveLighting(sector_t *sector); void T_FireFlicker(fireflicker_t *flick); -fireflicker_t *P_SpawnAdjustableFireFlicker(sector_t *minsector, sector_t *maxsector, INT32 length); +fireflicker_t *P_SpawnAdjustableFireFlicker(sector_t *sector, INT16 lighta, INT16 lightb, INT32 length); void T_LightningFlash(lightflash_t *flash); void T_StrobeFlash(strobe_t *flash); void P_SpawnLightningFlash(sector_t *sector); -strobe_t * P_SpawnAdjustableStrobeFlash(sector_t *minsector, sector_t *maxsector, INT32 darktime, INT32 brighttime, boolean inSync); +strobe_t * P_SpawnAdjustableStrobeFlash(sector_t *sector, INT16 lighta, INT16 lightb, INT32 darktime, INT32 brighttime, boolean inSync); void T_Glow(glow_t *g); -glow_t *P_SpawnAdjustableGlowingLight(sector_t *minsector, sector_t *maxsector, INT32 length); +glow_t *P_SpawnAdjustableGlowingLight(sector_t *sector, INT16 lighta, INT16 lightb, INT32 length); void P_FadeLightBySector(sector_t *sector, INT32 destvalue, INT32 speed, boolean ticbased); -void P_FadeLight(INT16 tag, INT32 destvalue, INT32 speed, boolean ticbased, boolean force); +void P_FadeLight(INT16 tag, INT32 destvalue, INT32 speed, boolean ticbased, boolean force, boolean relative); void T_LightFade(lightlevel_t *ll); typedef enum @@ -178,22 +649,19 @@ typedef enum typedef enum { raiseToHighest, - lowerToLowest, - raiseToLowest, lowerToLowestFast, instantRaise, // instant-move for ceilings - lowerAndCrush, crushAndRaise, - fastCrushAndRaise, + raiseAndCrush, crushCeilOnce, crushBothOnce, moveCeilingByFrontSector, instantMoveCeilingByFrontSector, - moveCeilingByFrontTexture, + moveCeilingByDistance, bounceCeiling, bounceCeilingCrush, @@ -209,7 +677,6 @@ typedef struct fixed_t bottomheight; ///< The lowest height to move to. fixed_t topheight; ///< The highest height to move to. fixed_t speed; ///< Ceiling speed. - fixed_t oldspeed; fixed_t delay; fixed_t delaytimer; UINT8 crush; ///< Whether to crush things or not. @@ -218,17 +685,16 @@ typedef struct INT32 direction; ///< 1 = up, 0 = waiting, -1 = down. // ID - INT32 tag; - INT32 olddirection; + INT16 tag; ///< Tag of linedef executor to run when movement is done. fixed_t origspeed; ///< The original, "real" speed. INT32 sourceline; ///< Index of the source linedef } ceiling_t; #define CEILSPEED (FRACUNIT) -INT32 EV_DoCeiling(line_t *line, ceiling_e type); +INT32 EV_DoCeiling(mtag_t tag, line_t *line, ceiling_e type); -INT32 EV_DoCrush(line_t *line, ceiling_e type); +INT32 EV_DoCrush(mtag_t tag, line_t *line, ceiling_e type); void T_CrushCeiling(ceiling_t *ceiling); void T_MoveCeiling(ceiling_t *ceiling); @@ -238,9 +704,6 @@ void T_MoveCeiling(ceiling_t *ceiling); // typedef enum { - // lower floor to lowest surrounding floor - lowerFloorToLowest, - // raise floor to next highest surrounding floor raiseFloorToNearestFast, @@ -250,7 +713,7 @@ typedef enum moveFloorByFrontSector, instantMoveFloorByFrontSector, - moveFloorByFrontTexture, + moveFloorByDistance, bounceFloor, bounceFloorCrush, @@ -262,7 +725,6 @@ typedef enum { elevateUp, elevateDown, - elevateCurrent, elevateContinuous, elevateBounce, elevateHighest, @@ -282,6 +744,8 @@ typedef struct fixed_t origspeed; fixed_t delay; fixed_t delaytimer; + INT16 tag; + INT32 sourceline; } floormove_t; typedef struct @@ -403,7 +867,6 @@ typedef struct thinker_t thinker; line_t *sourceline; // Source line of the thinker boolean playersInArea[MAXPLAYERS]; - boolean playersOnArea[MAXPLAYERS]; boolean triggerOnExit; } eachtime_t; @@ -439,8 +902,8 @@ typedef enum result_e T_MovePlane(sector_t *sector, fixed_t speed, fixed_t dest, boolean crush, boolean ceiling, INT32 direction); -void EV_DoFloor(line_t *line, floor_e floortype); -void EV_DoElevator(line_t *line, elevator_e elevtype, boolean customspeed); +void EV_DoFloor(mtag_t tag, line_t *line, floor_e floortype); +void EV_DoElevator(mtag_t tag, line_t *line, elevator_e elevtype); void EV_CrumbleChain(sector_t *sec, ffloor_t *rover); void EV_BounceSector(sector_t *sector, fixed_t momz, line_t *sourceline); @@ -525,30 +988,20 @@ void T_Friction(friction_t *f); typedef enum { - p_push, ///< Point pusher or puller. p_wind, ///< Wind. p_current, ///< Current. - p_upcurrent, ///< Upwards current. - p_downcurrent, ///< Downwards current. - p_upwind, ///< Upwards wind. - p_downwind ///< Downwards wind. } pushertype_e; // Model for pushers for push/pull effects typedef struct { - thinker_t thinker; ///< Thinker structure for push/pull effect. - /** Types of push/pull effects. - */ - pushertype_e type; ///< Type of push/pull effect. - mobj_t *source; ///< Point source if point pusher/puller. - INT32 x_mag; ///< X strength. - INT32 y_mag; ///< Y strength. - INT32 magnitude; ///< Vector strength for point pusher/puller. - INT32 radius; ///< Effective radius for point pusher/puller. - INT32 x, y, z; ///< Point source if point pusher/puller. + thinker_t thinker; ///< Thinker structure for pusher effect. + pushertype_e type; ///< Type of pusher effect. + fixed_t x_mag; ///< X strength. + fixed_t y_mag; ///< Y strength. + fixed_t z_mag; ///< Z strength. INT32 affectee; ///< Number of affected sector. - UINT8 roverpusher; ///< flag for whether pusher originated from a FOF or not + UINT8 roverpusher; ///< flag for whether pusher originated from a FOF or not INT32 referrer; ///< If roverpusher == true, then this will contain the sector # of the control sector where the effect was applied. INT32 exclusive; /// < Once this affect has been applied to a mobj, no other pushers may affect it. INT32 slider; /// < Should the player go into an uncontrollable slide? @@ -584,8 +1037,8 @@ typedef struct INT16 speed; ///< Speed to fade by boolean ticbased; ///< Tic-based logic toggle INT32 timer; ///< Timer for tic-based logic - boolean doexists; ///< Handle FF_EXISTS - boolean dotranslucent; ///< Handle FF_TRANSLUCENT + boolean doexists; ///< Handle FOF_EXISTS + boolean dotranslucent; ///< Handle FOF_TRANSLUCENT boolean dolighting; ///< Handle shadows and light blocks boolean docolormap; ///< Handle colormaps boolean docollision; ///< Handle interactive flags @@ -610,9 +1063,8 @@ typedef struct void T_FadeColormap(fadecolormap_t *d); -// Prototype functions for pushers +// Prototype function for pushers void T_Pusher(pusher_t *p); -mobj_t *P_GetPushThing(UINT32 s); // Plane displacement typedef struct @@ -637,6 +1089,4 @@ void T_PlaneDisplace(planedisplace_t *pd); void P_CalcHeight(player_t *player); -sector_t *P_ThingOnSpecial3DFloor(mobj_t *mo); - #endif diff --git a/src/p_telept.c b/src/p_telept.c index 6bac5ad20..66b05ff01 100644 --- a/src/p_telept.c +++ b/src/p_telept.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -122,7 +122,7 @@ void P_MixUp(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z, angle_t angle, */ boolean P_Teleport(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z, angle_t angle, boolean flash, boolean dontstopmove) { - if (!P_TeleportMove(thing, x, y, z)) + if (!P_SetOrigin(thing, x, y, z)) return false; if (!dontstopmove) diff --git a/src/p_tick.c b/src/p_tick.c index 9f00ef8dc..b1fd367ed 100644 --- a/src/p_tick.c +++ b/src/p_tick.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -23,6 +23,9 @@ #include "lua_hook.h" #include "m_perfstats.h" #include "i_system.h" // I_GetPreciseTime +#include "r_main.h" +#include "r_fps.h" +#include "i_video.h" // rendermode // Object place #include "m_cheat.h" @@ -254,6 +257,7 @@ void P_RemoveThinkerDelayed(thinker_t *thinker) * thinker->prev->next = thinker->next */ (next->prev = currentthinker = thinker->prev)->next = next; + R_DestroyLevelInterpolators(thinker); Z_Free(thinker); } @@ -323,7 +327,7 @@ static inline void P_RunThinkers(void) size_t i; for (i = 0; i < NUM_THINKERLISTS; i++) { - ps_thlist_times[i] = I_GetPreciseTime(); + PS_START_TIMING(ps_thlist_times[i]); for (currentthinker = thlist[i].next; currentthinker != &thlist[i]; currentthinker = currentthinker->next) { #ifdef PARANOIA @@ -331,7 +335,7 @@ static inline void P_RunThinkers(void) #endif currentthinker->function.acp1(currentthinker); } - ps_thlist_times[i] = I_GetPreciseTime() - ps_thlist_times[i]; + PS_STOP_TIMING(ps_thlist_times[i]); } } @@ -487,7 +491,7 @@ static inline void P_DoSpecialStageStuff(void) continue; // If in water, deplete timer 6x as fast. - if (players[i].mo->eflags & (MFE_TOUCHWATER|MFE_UNDERWATER) && !(players[i].powers[pw_shield] & SH_PROTECTWATER)) + if (players[i].mo->eflags & (MFE_TOUCHWATER|MFE_UNDERWATER) && !(players[i].powers[pw_shield] & ((players[i].mo->eflags & MFE_TOUCHLAVA) ? SH_PROTECTFIRE : SH_PROTECTWATER))) players[i].nightstime -= 5; if (--players[i].nightstime > 6) { @@ -616,8 +620,10 @@ void P_Ticker(boolean run) if (OP_FreezeObjectplace()) { P_MapStart(); + R_UpdateMobjInterpolators(); OP_ObjectplaceMovement(&players[0]); P_MoveChaseCamera(&players[0], &camera, false); + R_UpdateViewInterpolation(); P_MapEnd(); S_SetStackAdjustmentStart(); return; @@ -640,6 +646,8 @@ void P_Ticker(boolean run) if (run) { + R_UpdateMobjInterpolators(); + if (demorecording) G_WriteDemoTiccmd(&players[consoleplayer].cmd, 0); if (demoplayback) @@ -653,21 +661,24 @@ void P_Ticker(boolean run) } } - ps_lua_mobjhooks = 0; - ps_checkposition_calls = 0; + ps_lua_mobjhooks.value.i = 0; + ps_checkposition_calls.value.i = 0; - LUAh_PreThinkFrame(); + LUA_HOOK(PreThinkFrame); - ps_playerthink_time = I_GetPreciseTime(); + PS_START_TIMING(ps_playerthink_time); for (i = 0; i < MAXPLAYERS; i++) if (playeringame[i] && players[i].mo && !P_MobjWasRemoved(players[i].mo)) P_PlayerThink(&players[i]); - ps_playerthink_time = I_GetPreciseTime() - ps_playerthink_time; + PS_STOP_TIMING(ps_playerthink_time); } // Keep track of how long they've been playing! if (!demoplayback) // Don't increment if a demo is playing. - totalplaytime++; + { + clientGamedata->totalplaytime++; + serverGamedata->totalplaytime++; + } if (!(maptol & TOL_NIGHTS) && G_IsSpecialStage(gamemap)) P_DoSpecialStageStuff(); @@ -677,18 +688,18 @@ void P_Ticker(boolean run) if (run) { - ps_thinkertime = I_GetPreciseTime(); + PS_START_TIMING(ps_thinkertime); P_RunThinkers(); - ps_thinkertime = I_GetPreciseTime() - ps_thinkertime; + PS_STOP_TIMING(ps_thinkertime); // Run any "after all the other thinkers" stuff for (i = 0; i < MAXPLAYERS; i++) if (playeringame[i] && players[i].mo && !P_MobjWasRemoved(players[i].mo)) P_PlayerAfterThink(&players[i]); - ps_lua_thinkframe_time = I_GetPreciseTime(); - LUAh_ThinkFrame(); - ps_lua_thinkframe_time = I_GetPreciseTime() - ps_lua_thinkframe_time; + PS_START_TIMING(ps_lua_thinkframe_time); + LUA_HookThinkFrame(); + PS_STOP_TIMING(ps_lua_thinkframe_time); } // Run shield positioning @@ -760,7 +771,43 @@ void P_Ticker(boolean run) if (modeattacking) G_GhostTicker(); - LUAh_PostThinkFrame(); + LUA_HOOK(PostThinkFrame); + } + + if (run) + { + R_UpdateLevelInterpolators(); + R_UpdateViewInterpolation(); + + // Hack: ensure newview is assigned every tic. + // Ensures view interpolation is T-1 to T in poor network conditions + // We need a better way to assign view state decoupled from game logic + if (rendermode != render_none) + { + player_t *player1 = &players[displayplayer]; + if (player1->mo && skyboxmo[0] && cv_skybox.value) + { + R_SkyboxFrame(player1); + } + if (player1->mo) + { + R_SetupFrame(player1); + } + + if (splitscreen) + { + player_t *player2 = &players[secondarydisplayplayer]; + if (player2->mo && skyboxmo[0] && cv_skybox.value) + { + R_SkyboxFrame(player2); + } + if (player2->mo) + { + R_SetupFrame(player2); + } + } + } + } P_MapEnd(); @@ -783,7 +830,9 @@ void P_PreTicker(INT32 frames) { P_MapStart(); - LUAh_PreThinkFrame(); + R_UpdateMobjInterpolators(); + + LUA_HOOK(PreThinkFrame); for (i = 0; i < MAXPLAYERS; i++) if (playeringame[i] && players[i].mo && !P_MobjWasRemoved(players[i].mo)) @@ -810,7 +859,7 @@ void P_PreTicker(INT32 frames) if (playeringame[i] && players[i].mo && !P_MobjWasRemoved(players[i].mo)) P_PlayerAfterThink(&players[i]); - LUAh_ThinkFrame(); + LUA_HookThinkFrame(); // Run shield positioning P_RunShields(); @@ -819,7 +868,11 @@ void P_PreTicker(INT32 frames) P_UpdateSpecials(); P_RespawnSpecials(); - LUAh_PostThinkFrame(); + LUA_HOOK(PostThinkFrame); + + R_UpdateLevelInterpolators(); + R_UpdateViewInterpolation(); + R_ResetViewInterpolation(0); P_MapEnd(); } diff --git a/src/p_tick.h b/src/p_tick.h index ae481c6a2..594bbc7af 100644 --- a/src/p_tick.h +++ b/src/p_tick.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/p_user.c b/src/p_user.c index 2b773c84a..0f3282da5 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -20,6 +20,7 @@ #include "d_net.h" #include "g_game.h" #include "p_local.h" +#include "r_fps.h" #include "r_main.h" #include "s_sound.h" #include "r_skins.h" @@ -706,8 +707,7 @@ static void P_DeNightserizePlayer(player_t *player) // If you screwed up, kiss your score and ring bonus goodbye. // But only do this in special stage (and instakill!) In regular stages, wait til we hit the ground. - player->marescore = player->spheres =\ - player->rings = 0; + player->marescore = player->spheres = player->rings = 0; } // Check to see if the player should be killed. @@ -717,13 +717,12 @@ static void P_DeNightserizePlayer(player_t *player) continue; mo2 = (mobj_t *)th; - if (!(mo2->type == MT_NIGHTSDRONE)) + if (mo2->type != MT_NIGHTSDRONE) continue; if (mo2->flags2 & MF2_AMBUSH) { - player->marescore = player->spheres =\ - player->rings = 0; + player->marescore = player->spheres = player->rings = 0; P_DamageMobj(player->mo, NULL, NULL, 1, DMG_INSTAKILL); // Reset music to beginning if MIXNIGHTSCOUNTDOWN @@ -1045,7 +1044,8 @@ void P_DoPlayerPain(player_t *player, mobj_t *source, mobj_t *inflictor) fallbackspeed = FixedMul(4*FRACUNIT, player->mo->scale); } - player->drawangle = ang + ANGLE_180; + if (player->pflags & PF_DIRECTIONCHAR) + player->drawangle = ang + ANGLE_180; P_InstaThrust(player->mo, ang, fallbackspeed); } @@ -1111,7 +1111,7 @@ boolean P_PlayerCanDamage(player_t *player, mobj_t *thing) return false; { - UINT8 shouldCollide = LUAh_PlayerCanDamage(player, thing); + UINT8 shouldCollide = LUA_HookPlayerCanDamage(player, thing); if (P_MobjWasRemoved(thing)) return false; // removed??? if (shouldCollide == 1) @@ -1189,8 +1189,8 @@ void P_GivePlayerRings(player_t *player, INT32 num_rings) if (!player) return; - if (player->bot) - player = &players[consoleplayer]; + if ((player->bot == BOT_2PAI || player->bot == BOT_2PHUMAN) && player->botleader) + player = player->botleader; if (!player->mo) return; @@ -1367,8 +1367,8 @@ void P_AddPlayerScore(player_t *player, UINT32 amount) { UINT32 oldscore; - if (player->bot) - player = &players[consoleplayer]; + if ((player->bot == BOT_2PAI || player->bot == BOT_2PHUMAN) && player->botleader) + player = player->botleader; // NiGHTS does it different! if (gamestate == GS_LEVEL && mapheaderinfo[gamemap-1]->typeoflevel & TOL_NIGHTS) @@ -1514,8 +1514,8 @@ void P_PlayJingle(player_t *player, jingletype_t jingletype) char newmusic[7]; strncpy(newmusic, musname, 7); #ifdef HAVE_LUA_MUSICPLUS - if(LUAh_MusicJingle(jingletype, newmusic, &musflags, &looping)) - return; + if(LUAh_MusicJingle(jingletype, newmusic, &musflags, &looping)) + return; #endif newmusic[6] = 0; @@ -1594,7 +1594,7 @@ boolean P_EvaluateMusicStatus(UINT16 status, const char *musname) break; case JT_OTHER: // Other state - result = LUAh_ShouldJingleContinue(&players[i], musname); + result = LUA_HookShouldJingleContinue(&players[i], musname); break; case JT_NONE: // Null state @@ -1605,7 +1605,7 @@ boolean P_EvaluateMusicStatus(UINT16 status, const char *musname) if (result) break; - } + } return result; } @@ -1662,8 +1662,8 @@ void P_RestoreMusic(player_t *player) else if (!S_RecallMusic(JT_NONE, false)) // go down the stack { CONS_Debug(DBG_BASIC, "Cannot find any music in resume stack!\n"); - S_ChangeMusicEx(mapmusname, mapmusflags, true, mapmusposition, 0, 0); - } + S_ChangeMusicEx(mapmusname, mapmusflags, true, mapmusposition, 0, 0); + } } // @@ -1728,89 +1728,6 @@ boolean P_IsObjectOnGround(mobj_t *mo) return false; } -// -// P_IsObjectOnGroundIn -// -// Returns true if the player is -// on the ground in a specific sector. Takes reverse -// gravity and FOFs into account. -// -boolean P_IsObjectOnGroundIn(mobj_t *mo, sector_t *sec) -{ - ffloor_t *rover; - - // Is the object in reverse gravity? - if (mo->eflags & MFE_VERTICALFLIP) - { - // Detect if the player is on the ceiling. - if (mo->z+mo->height >= P_GetSpecialTopZ(mo, sec, sec)) - return true; - // Otherwise, detect if the player is on the bottom of a FOF. - else - { - for (rover = sec->ffloors; rover; rover = rover->next) - { - // If the FOF doesn't exist, continue. - if (!(rover->flags & FF_EXISTS)) - continue; - - // If the FOF is configured to let the object through, continue. - if (!((rover->flags & FF_BLOCKPLAYER && mo->player) - || (rover->flags & FF_BLOCKOTHERS && !mo->player))) - continue; - - // If the the platform is intangible from below, continue. - if (rover->flags & FF_PLATFORM) - continue; - - // If the FOF is a water block, continue. (Unnecessary check?) - if (rover->flags & FF_SWIMMABLE) - continue; - - // Actually check if the player is on the suitable FOF. - if (mo->z+mo->height == P_GetSpecialBottomZ(mo, sectors + rover->secnum, sec)) - return true; - } - } - } - // Nope! - else - { - // Detect if the player is on the floor. - if (mo->z <= P_GetSpecialBottomZ(mo, sec, sec)) - return true; - // Otherwise, detect if the player is on the top of a FOF. - else - { - for (rover = sec->ffloors; rover; rover = rover->next) - { - // If the FOF doesn't exist, continue. - if (!(rover->flags & FF_EXISTS)) - continue; - - // If the FOF is configured to let the object through, continue. - if (!((rover->flags & FF_BLOCKPLAYER && mo->player) - || (rover->flags & FF_BLOCKOTHERS && !mo->player))) - continue; - - // If the the platform is intangible from above, continue. - if (rover->flags & FF_REVERSEPLATFORM) - continue; - - // If the FOF is a water block, continue. (Unnecessary check?) - if (rover->flags & FF_SWIMMABLE) - continue; - - // Actually check if the player is on the suitable FOF. - if (mo->z == P_GetSpecialTopZ(mo, sectors + rover->secnum, sec)) - return true; - } - } - } - - return false; -} - // // P_SetObjectMomZ // @@ -1860,7 +1777,7 @@ void P_SpawnShieldOrb(player_t *player) I_Error("P_SpawnShieldOrb: player->mo is NULL!\n"); #endif - if (LUAh_ShieldSpawn(player)) + if (LUA_HookPlayer(player, HOOK(ShieldSpawn))) return; if (player->powers[pw_shield] & SH_FORCE) @@ -2007,6 +1924,24 @@ void P_SwitchShield(player_t *player, UINT16 shieldtype) } } +// +// P_SetPower +// +// Sets a power and spawns a shield orb if required. +// +void P_SetPower(player_t *player, powertype_t power, UINT16 value) +{ + boolean spawnshield = false; + + if (power == pw_shield && player->powers[pw_shield] != value) + spawnshield = true; + + player->powers[power] = value; + + if (spawnshield) //workaround for a bug + P_SpawnShieldOrb(player); +} + // // P_SpawnGhostMobj // @@ -2032,12 +1967,22 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj) ghost->angle = (mobj->player ? mobj->player->drawangle : mobj->angle); ghost->rollangle = mobj->rollangle; + ghost->sprite = mobj->sprite; ghost->sprite2 = mobj->sprite2; ghost->frame = mobj->frame; ghost->tics = -1; ghost->frame &= ~FF_TRANSMASK; ghost->frame |= tr_trans50<renderflags = mobj->renderflags; + ghost->blendmode = mobj->blendmode; + + ghost->spritexscale = mobj->spritexscale; + ghost->spriteyscale = mobj->spriteyscale; + ghost->spritexoffset = mobj->spritexoffset; + ghost->spriteyoffset = mobj->spriteyoffset; + ghost->fuse = ghost->info->damage; ghost->skin = mobj->skin; @@ -2052,6 +1997,14 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj) ghost2->flags2 |= (mobj->player->followmobj->flags2 & MF2_LINKDRAW); } + // Copy interpolation data :) + ghost->old_x = mobj->old_x2; + ghost->old_y = mobj->old_y2; + ghost->old_z = mobj->old_z2; + ghost->old_angle = (mobj->player ? mobj->player->old_drawangle2 : mobj->old_angle2); + ghost->old_pitch = mobj->old_pitch2; + ghost->old_roll = mobj->old_roll2; + return ghost; } @@ -2251,13 +2204,12 @@ void P_DoPlayerExit(player_t *player) P_RestoreMusic(player); } -#define SPACESPECIAL 12 boolean P_InSpaceSector(mobj_t *mo) // Returns true if you are in space { sector_t *sector = mo->subsector->sector; fixed_t topheight, bottomheight; - if (GETSECSPECIAL(sector->special, 1) == SPACESPECIAL) + if (sector->specialflags & SSF_OUTERSPACE) return true; if (sector->ffloors) @@ -2266,10 +2218,10 @@ boolean P_InSpaceSector(mobj_t *mo) // Returns true if you are in space for (rover = sector->ffloors; rover; rover = rover->next) { - if (!(rover->flags & FF_EXISTS)) + if (!(rover->fofflags & FOF_EXISTS)) continue; - if (GETSECSPECIAL(rover->master->frontsector->special, 1) != SPACESPECIAL) + if (!(rover->master->frontsector->specialflags & SSF_OUTERSPACE)) continue; topheight = P_GetFFloorTopZAt (rover, mo->x, mo->y); bottomheight = P_GetFFloorBottomZAt(rover, mo->x, mo->y); @@ -2519,10 +2471,10 @@ boolean P_InQuicksand(mobj_t *mo) // Returns true if you are in quicksand for (rover = sector->ffloors; rover; rover = rover->next) { - if (!(rover->flags & FF_EXISTS)) + if (!(rover->fofflags & FOF_EXISTS)) continue; - if (!(rover->flags & FF_QUICKSAND)) + if (!(rover->fofflags & FOF_QUICKSAND)) continue; topheight = P_GetFFloorTopZAt (rover, mo->x, mo->y); @@ -2541,69 +2493,106 @@ boolean P_InQuicksand(mobj_t *mo) // Returns true if you are in quicksand return false; // No sand here, Captain! } +boolean P_InJumpFlipSector(mobj_t *mo) // Returns true if you are in a jumpflip sector +{ + sector_t *sector = mo->subsector->sector; + fixed_t topheight, bottomheight; + + if (sector->specialflags & SSF_JUMPFLIP) + return true; + + if (sector->ffloors) + { + ffloor_t *rover; + + for (rover = sector->ffloors; rover; rover = rover->next) + { + if (!(rover->fofflags & FOF_EXISTS)) + continue; + + if (!(rover->master->frontsector->specialflags & SSF_JUMPFLIP)) + continue; + topheight = P_GetFFloorTopZAt (rover, mo->x, mo->y); + bottomheight = P_GetFFloorBottomZAt(rover, mo->x, mo->y); + + if (mo->z + (mo->height/2) > topheight) + continue; + + if (mo->z + (mo->height/2) < bottomheight) + continue; + + return true; + } + } + + return false; // No gravity jumping here, Captain Viridian! +} + static boolean P_PlayerCanBust(player_t *player, ffloor_t *rover) { - if (!(rover->flags & FF_EXISTS)) + if (!(rover->fofflags & FOF_EXISTS)) return false; - if (!(rover->flags & FF_BUSTUP)) + if (!(rover->fofflags & FOF_BUSTUP)) return false; /*if (rover->master->frontsector->crumblestate != CRUMBLE_NONE) return false;*/ - // If it's an FF_SHATTER, you can break it just by touching it. - if (rover->flags & FF_SHATTER) - return true; - - // If it's an FF_SPINBUST, you can break it if you are in your spinning frames - // (either from jumping or spindashing). - if (rover->flags & FF_SPINBUST) + switch (rover->busttype) { + case BT_TOUCH: // Shatters on contact + return true; + case BT_SPINBUST: // Can be busted by spinning (either from jumping or spindashing) if ((player->pflags & PF_SPINNING) && !(player->pflags & PF_STARTDASH)) return true; if ((player->pflags & PF_JUMPED) && !(player->pflags & PF_NOJUMPDAMAGE)) return true; + + /* FALLTHRU */ + case BT_REGULAR: + // Spinning (and not jumping) + if ((player->pflags & PF_SPINNING) && !(player->pflags & PF_JUMPED)) + return true; + + // Passive wall breaking + if (player->charflags & SF_CANBUSTWALLS) + return true; + + // Super + if (player->powers[pw_super]) + return true; + + // Dashmode + if ((player->charflags & (SF_DASHMODE|SF_MACHINE)) == (SF_DASHMODE|SF_MACHINE) && player->dashmode >= DASHMODE_THRESHOLD) + return true; + + // NiGHTS drill + if (player->pflags & PF_DRILLING) + return true; + + // Recording for Metal Sonic + if (metalrecording) + return true; + + /* FALLTHRU */ + case BT_STRONG: // Requires a "strong ability" + if (player->charflags & SF_CANBUSTWALLS) + return true; + + if (player->pflags & PF_BOUNCING) + return true; + + if (player->charability == CA_TWINSPIN && player->panim == PA_ABILITY) + return true; + + if (player->charability2 == CA2_MELEE && player->panim == PA_ABILITY2) + return true; + + break; } - // Strong abilities can break even FF_STRONGBUST. - if (player->charflags & SF_CANBUSTWALLS) - return true; - - if (player->pflags & PF_BOUNCING) - return true; - - if (player->charability == CA_TWINSPIN && player->panim == PA_ABILITY) - return true; - - if (player->charability2 == CA2_MELEE && player->panim == PA_ABILITY2) - return true; - - // Everyone else is out of luck. - if (rover->flags & FF_STRONGBUST) - return false; - - // Spinning (and not jumping) - if ((player->pflags & PF_SPINNING) && !(player->pflags & PF_JUMPED)) - return true; - - // Super - if (player->powers[pw_super]) - return true; - - // Dashmode - if ((player->charflags & (SF_DASHMODE|SF_MACHINE)) == (SF_DASHMODE|SF_MACHINE) && player->dashmode >= DASHMODE_THRESHOLD) - return true; - - // NiGHTS drill - if (player->pflags & PF_DRILLING) - return true; - - // Recording for Metal Sonic - if (metalrecording) - return true; - return false; } @@ -2654,7 +2643,7 @@ static void P_CheckBustableBlocks(player_t *player) } // Height checks - if (rover->flags & FF_SHATTERBOTTOM) + if (rover->bustflags & FB_ONLYBOTTOM) { if (player->mo->z + player->mo->momz + player->mo->height < bottomheight) continue; @@ -2662,35 +2651,41 @@ static void P_CheckBustableBlocks(player_t *player) if (player->mo->z + player->mo->height > bottomheight) continue; } - else if (rover->flags & FF_SPINBUST) - { - if (player->mo->z + player->mo->momz > topheight) - continue; - - if (player->mo->z + player->mo->height < bottomheight) - continue; - } - else if (rover->flags & FF_SHATTER) - { - if (player->mo->z + player->mo->momz > topheight) - continue; - - if (player->mo->z + player->mo->momz + player->mo->height < bottomheight) - continue; - } else { - if (player->mo->z >= topheight) - continue; + switch (rover->busttype) + { + case BT_TOUCH: + if (player->mo->z + player->mo->momz > topheight) + continue; - if (player->mo->z + player->mo->height < bottomheight) - continue; + if (player->mo->z + player->mo->momz + player->mo->height < bottomheight) + continue; + + break; + case BT_SPINBUST: + if (player->mo->z + player->mo->momz > topheight) + continue; + + if (player->mo->z + player->mo->height < bottomheight) + continue; + + break; + default: + if (player->mo->z >= topheight) + continue; + + if (player->mo->z + player->mo->height < bottomheight) + continue; + + break; + } } // Impede the player's fall a bit - if (((rover->flags & FF_SPINBUST) || (rover->flags & FF_SHATTER)) && player->mo->z >= topheight) + if (((rover->busttype == BT_TOUCH) || (rover->busttype == BT_SPINBUST)) && player->mo->z >= topheight) player->mo->momz >>= 1; - else if (rover->flags & FF_SHATTER) + else if (rover->busttype == BT_TOUCH) { player->mo->momx >>= 1; player->mo->momy >>= 1; @@ -2702,8 +2697,8 @@ static void P_CheckBustableBlocks(player_t *player) EV_CrumbleChain(NULL, rover); // node->m_sector // Run a linedef executor?? - if (rover->master->flags & ML_EFFECT5) - P_LinedefExecute((INT16)(P_AproxDistance(rover->master->dx, rover->master->dy)>>FRACBITS), player->mo, node->m_sector); + if (rover->bustflags & FB_EXECUTOR) + P_LinedefExecute(rover->busttag, player->mo, node->m_sector); goto bustupdone; } @@ -2748,14 +2743,20 @@ static void P_CheckBouncySectors(player_t *player) for (rover = node->m_sector->ffloors; rover; rover = rover->next) { - fixed_t bouncestrength; fixed_t topheight, bottomheight; - if (!(rover->flags & FF_EXISTS)) + if (!(rover->fofflags & FOF_EXISTS)) continue; // FOFs should not be bouncy if they don't even "exist" - if (GETSECSPECIAL(rover->master->frontsector->special, 1) != 15) - continue; // this sector type is required for FOFs to be bouncy + // Handle deprecated bouncy FOF sector type + if (!udmf && GETSECSPECIAL(rover->master->frontsector->special, 1) == 15) + { + rover->fofflags |= FOF_BOUNCY; + rover->bouncestrength = P_AproxDistance(rover->master->dx, rover->master->dy)/100; + } + + if (!(rover->fofflags & FOF_BOUNCY)) + continue; topheight = P_GetFOFTopZ(player->mo, node->m_sector, rover, player->mo->x, player->mo->y, NULL); bottomheight = P_GetFOFBottomZ(player->mo, node->m_sector, rover, player->mo->x, player->mo->y, NULL); @@ -2766,24 +2767,14 @@ static void P_CheckBouncySectors(player_t *player) if (player->mo->z + player->mo->height < bottomheight) continue; - bouncestrength = P_AproxDistance(rover->master->dx, rover->master->dy)/100; - if (oldz < P_GetFOFTopZ(player->mo, node->m_sector, rover, oldx, oldy, NULL) && oldz + player->mo->height > P_GetFOFBottomZ(player->mo, node->m_sector, rover, oldx, oldy, NULL)) { - player->mo->momx = -FixedMul(player->mo->momx,bouncestrength); - player->mo->momy = -FixedMul(player->mo->momy,bouncestrength); - - if (player->pflags & PF_SPINNING) - { - player->pflags &= ~PF_SPINNING; - player->pflags |= P_GetJumpFlags(player); - player->pflags |= PF_THOKKED; - } + player->mo->momx = -FixedMul(player->mo->momx,rover->bouncestrength); + player->mo->momy = -FixedMul(player->mo->momy,rover->bouncestrength); } else { - fixed_t newmom; pslope_t *slope = (abs(oldz - topheight) < abs(oldz + player->mo->height - bottomheight)) ? *rover->t_slope : *rover->b_slope; momentum.x = player->mo->momx; @@ -2793,53 +2784,28 @@ static void P_CheckBouncySectors(player_t *player) if (slope) P_ReverseQuantizeMomentumToSlope(&momentum, slope); - newmom = momentum.z = -FixedMul(momentum.z,bouncestrength)/2; + momentum.z = -FixedMul(momentum.z,rover->bouncestrength)/2; - if (abs(newmom) < (bouncestrength*2)) + if (abs(momentum.z) < (rover->bouncestrength*2)) goto bouncydone; - if (!(rover->master->flags & ML_BOUNCY)) - { - if (newmom > 0) - { - if (newmom < 8*FRACUNIT) - newmom = 8*FRACUNIT; - } - else if (newmom < 0) - { - if (newmom > -8*FRACUNIT) - newmom = -8*FRACUNIT; - } - } - - if (newmom > P_GetPlayerHeight(player)/2) - newmom = P_GetPlayerHeight(player)/2; - else if (newmom < -P_GetPlayerHeight(player)/2) - newmom = -P_GetPlayerHeight(player)/2; - - momentum.z = newmom*2; + if (momentum.z > FixedMul(24*FRACUNIT, player->mo->scale)) //half of the default player height + momentum.z = FixedMul(24*FRACUNIT, player->mo->scale); + else if (momentum.z < -FixedMul(24*FRACUNIT, player->mo->scale)) + momentum.z = -FixedMul(24*FRACUNIT, player->mo->scale); if (slope) P_QuantizeMomentumToSlope(&momentum, slope); player->mo->momx = momentum.x; player->mo->momy = momentum.y; - player->mo->momz = momentum.z/2; + player->mo->momz = momentum.z; if (player->pflags & PF_SPINNING) { - player->pflags &= ~PF_SPINNING; - player->pflags |= P_GetJumpFlags(player); player->pflags |= PF_THOKKED; } } - - if ((player->pflags & PF_SPINNING) && player->speed < FixedMul(1<mo->scale) && player->mo->momz) - { - player->pflags &= ~PF_SPINNING; - player->pflags |= P_GetJumpFlags(player); - } - goto bouncydone; } } @@ -2854,17 +2820,18 @@ bouncydone: static void P_CheckQuicksand(player_t *player) { ffloor_t *rover; - fixed_t sinkspeed, friction; + fixed_t sinkspeed; fixed_t topheight, bottomheight; - if (!(player->mo->subsector->sector->ffloors && player->mo->momz <= 0)) + if (!(player->mo->subsector->sector->ffloors && P_MobjFlip(player->mo)*player->mo->momz <= 0)) return; for (rover = player->mo->subsector->sector->ffloors; rover; rover = rover->next) { - if (!(rover->flags & FF_EXISTS)) continue; + if (!(rover->fofflags & FOF_EXISTS)) + continue; - if (!(rover->flags & FF_QUICKSAND)) + if (!(rover->fofflags & FOF_QUICKSAND)) continue; topheight = P_GetFFloorTopZAt (rover, player->mo->x, player->mo->y); @@ -2872,9 +2839,7 @@ static void P_CheckQuicksand(player_t *player) if (topheight >= player->mo->z && bottomheight < player->mo->z + player->mo->height) { - sinkspeed = abs(rover->master->v1->x - rover->master->v2->x)>>1; - - sinkspeed = FixedDiv(sinkspeed,TICRATE*FRACUNIT); + sinkspeed = FixedDiv(rover->sinkspeed,TICRATE*FRACUNIT); if (player->mo->eflags & MFE_VERTICALFLIP) { @@ -2901,10 +2866,8 @@ static void P_CheckQuicksand(player_t *player) P_PlayerHitFloor(player, false); } - friction = abs(rover->master->v1->y - rover->master->v2->y)>>6; - - player->mo->momx = FixedMul(player->mo->momx, friction); - player->mo->momy = FixedMul(player->mo->momy, friction); + player->mo->momx = FixedMul(player->mo->momx, rover->friction); + player->mo->momy = FixedMul(player->mo->momy, rover->friction); } } } @@ -3144,14 +3107,25 @@ static void P_DoPlayerHeadSigns(player_t *player) if (G_TagGametype()) { // If you're "IT", show a big "IT" over your head for others to see. - if (player->pflags & PF_TAGIT) + if (player->pflags & PF_TAGIT && !P_IsLocalPlayer(player)) { - if (!P_IsLocalPlayer(player)) // Don't display it on your own view. + mobj_t* it = P_SpawnMobjFromMobj(player->mo, 0, 0, 0, MT_TAG); + it->x = player->mo->x; + it->y = player->mo->y; + it->z = player->mo->z; + it->old_x = player->mo->old_x; + it->old_y = player->mo->old_y; + it->old_z = player->mo->old_z; + + if (!(player->mo->eflags & MFE_VERTICALFLIP)) { - if (!(player->mo->eflags & MFE_VERTICALFLIP)) - P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z + player->mo->height, MT_TAG); - else - P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z - mobjinfo[MT_TAG].height, MT_TAG)->eflags |= MFE_VERTICALFLIP; + it->z += player->mo->height; + it->old_z += player->mo->height; + } + else + { + it->z -= mobjinfo[MT_TAG].height; + it->old_z -= mobjinfo[MT_TAG].height; } } } @@ -3161,15 +3135,32 @@ static void P_DoPlayerHeadSigns(player_t *player) // has it (but not on your own screen if you have the flag). if (splitscreen || player != &players[consoleplayer]) { - mobj_t *sign = P_SpawnMobj(player->mo->x+player->mo->momx, player->mo->y+player->mo->momy, - player->mo->z+player->mo->momz, MT_GOTFLAG); - if (player->mo->eflags & MFE_VERTICALFLIP) + fixed_t zofs; + mobj_t *sign; + boolean player_is_flipped = (player->mo->eflags & MFE_VERTICALFLIP) > 0; + + zofs = player->mo->momz; + if (player_is_flipped) { - sign->z += player->mo->height-P_GetPlayerHeight(player)-mobjinfo[MT_GOTFLAG].height-FixedMul(16*FRACUNIT, player->mo->scale); - sign->eflags |= MFE_VERTICALFLIP; + zofs += player->mo->height - P_GetPlayerHeight(player) - mobjinfo[MT_GOTFLAG].height - FixedMul(16 * FRACUNIT, player->mo->scale); } else - sign->z += P_GetPlayerHeight(player)+FixedMul(16*FRACUNIT, player->mo->scale); + { + zofs += P_GetPlayerHeight(player) + FixedMul(16 * FRACUNIT, player->mo->scale); + } + + sign = P_SpawnMobjFromMobj(player->mo, 0, 0, 0, MT_GOTFLAG); + sign->x = player->mo->x; + sign->y = player->mo->y; + sign->z = player->mo->z + zofs; + sign->old_x = player->mo->old_x; + sign->old_y = player->mo->old_y; + sign->old_z = player->mo->old_z + zofs; + + if (player_is_flipped) + { + sign->eflags |= MFE_VERTICALFLIP; + } if (player->gotflag & GF_REDFLAG) sign->frame = 1|FF_FULLBRIGHT; @@ -3218,7 +3209,7 @@ static void P_DoClimbing(player_t *player) for (rover = glidesector->sector->ffloors; rover; rover = rover->next) { - if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BLOCKPLAYER) || ((rover->flags & FF_BUSTUP) && (player->charflags & SF_CANBUSTWALLS))) + if (!(rover->fofflags & FOF_EXISTS) || !(rover->fofflags & FOF_BLOCKPLAYER) || ((rover->fofflags & FOF_BUSTUP) && (player->charflags & SF_CANBUSTWALLS))) continue; floorclimb = true; @@ -3259,7 +3250,7 @@ static void P_DoClimbing(player_t *player) // Is there a FOF directly below this one that we can move onto? for (roverbelow = glidesector->sector->ffloors; roverbelow; roverbelow = roverbelow->next) { - if (!(roverbelow->flags & FF_EXISTS) || !(roverbelow->flags & FF_BLOCKPLAYER) || ((rover->flags & FF_BUSTUP) && (player->charflags & SF_CANBUSTWALLS))) + if (!(roverbelow->fofflags & FOF_EXISTS) || !(roverbelow->fofflags & FOF_BLOCKPLAYER) || ((rover->fofflags & FOF_BUSTUP) && (player->charflags & SF_CANBUSTWALLS))) continue; if (roverbelow == rover) @@ -3304,7 +3295,7 @@ static void P_DoClimbing(player_t *player) // Is there a FOF directly below this one that we can move onto? for (roverbelow = glidesector->sector->ffloors; roverbelow; roverbelow = roverbelow->next) { - if (!(roverbelow->flags & FF_EXISTS) || !(roverbelow->flags & FF_BLOCKPLAYER) || ((rover->flags & FF_BUSTUP) && (player->charflags & SF_CANBUSTWALLS))) + if (!(roverbelow->fofflags & FOF_EXISTS) || !(roverbelow->fofflags & FOF_BLOCKPLAYER) || ((rover->fofflags & FOF_BUSTUP) && (player->charflags & SF_CANBUSTWALLS))) continue; if (roverbelow == rover) @@ -3338,8 +3329,8 @@ static void P_DoClimbing(player_t *player) if (floorclimb) { - if (rover->flags & FF_CRUMBLE && !(netgame && player->spectator)) - EV_StartCrumble(rover->master->frontsector, rover, (rover->flags & FF_FLOATBOB), player, rover->alpha, !(rover->flags & FF_NORETURN)); + if (rover->fofflags & FOF_CRUMBLE && !(netgame && player->spectator)) + EV_StartCrumble(rover->master->frontsector, rover, (rover->fofflags & FOF_FLOATBOB), player, rover->alpha, !(rover->fofflags & FOF_NORETURN)); break; } } @@ -3361,7 +3352,7 @@ static void P_DoClimbing(player_t *player) ffloor_t *rover; for (rover = glidesector->sector->ffloors; rover; rover = rover->next) { - if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BLOCKPLAYER) || ((rover->flags & FF_BUSTUP) && (player->charflags & SF_CANBUSTWALLS))) + if (!(rover->fofflags & FOF_EXISTS) || !(rover->fofflags & FOF_BLOCKPLAYER) || ((rover->fofflags & FOF_BUSTUP) && (player->charflags & SF_CANBUSTWALLS))) continue; bottomheight = P_GetFFloorBottomZAt(rover, player->mo->x, player->mo->y); @@ -3401,7 +3392,7 @@ static void P_DoClimbing(player_t *player) ffloor_t *rover; for (rover = glidesector->sector->ffloors; rover; rover = rover->next) { - if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BLOCKPLAYER) || ((rover->flags & FF_BUSTUP) && (player->charflags & SF_CANBUSTWALLS))) + if (!(rover->fofflags & FOF_EXISTS) || !(rover->fofflags & FOF_BLOCKPLAYER) || ((rover->fofflags & FOF_BUSTUP) && (player->charflags & SF_CANBUSTWALLS))) continue; topheight = P_GetFFloorTopZAt(rover, player->mo->x, player->mo->y); @@ -3775,14 +3766,14 @@ static void P_DoTeeter(player_t *player) for (rover = sec->ffloors; rover; rover = rover->next) { - if (!(rover->flags & FF_EXISTS)) continue; + if (!(rover->fofflags & FOF_EXISTS)) continue; topheight = P_GetFFloorTopZAt (rover, player->mo->x, player->mo->y); bottomheight = P_GetFFloorBottomZAt(rover, player->mo->x, player->mo->y); if (P_CheckSolidLava(rover)) ; - else if (!(rover->flags & FF_BLOCKPLAYER || rover->flags & FF_QUICKSAND)) + else if (!(rover->fofflags & FOF_BLOCKPLAYER || rover->fofflags & FOF_QUICKSAND)) continue; // intangible 3d floor if (player->mo->eflags & MFE_VERTICALFLIP) @@ -4406,7 +4397,7 @@ void P_DoJump(player_t *player, boolean soundandstate) if (player->powers[pw_carry] == CR_PTERABYTE) { S_StartSound(player->mo, sfx_s3kd7s); - player->mo->tracer->cusval += 10; + player->mo->tracer->cusval += 10; // attempting to break free player->mo->tracer->watertop = P_RandomRange(-player->mo->tracer->cusval, player->mo->tracer->cusval) << (FRACBITS - 1); player->mo->tracer->waterbottom = P_RandomRange(-player->mo->tracer->cusval, player->mo->tracer->cusval) << (FRACBITS - 1); player->mo->tracer->cvmem = P_RandomRange(-player->mo->tracer->cusval, player->mo->tracer->cusval) << (FRACBITS - 1); @@ -4531,6 +4522,12 @@ void P_DoJump(player_t *player, boolean soundandstate) if (player->charflags & SF_NOJUMPDAMAGE) player->pflags &= ~PF_SPINNING; + if (P_InJumpFlipSector(player->mo)) // Flip gravity on jump? + { + player->mo->flags2 ^= MF2_OBJECTFLIP; + S_StartSound(player->mo, sfx_s3k73); // Play gravity flip sound + } + if (soundandstate) { if (!player->spectator) @@ -4583,7 +4580,7 @@ static void P_DoSpinAbility(player_t *player, ticcmd_t *cmd) if (cmd->buttons & BT_SPIN) { - if (LUAh_SpinSpecial(player)) + if (LUA_HookPlayer(player, HOOK(SpinSpecial))) return; } @@ -4788,7 +4785,7 @@ static void P_DoSpinAbility(player_t *player, ticcmd_t *cmd) if (onground && player->pflags & PF_SPINNING && !(player->pflags & PF_STARTDASH) && player->speed < 5*player->mo->scale && canstand) { - if (GETSECSPECIAL(player->mo->subsector->sector->special, 4) == 7 || (player->mo->ceilingz - player->mo->floorz < P_GetPlayerHeight(player))) + if ((player->mo->subsector->sector->specialflags & SSF_FORCESPIN) || (player->mo->ceilingz - player->mo->floorz < P_GetPlayerHeight(player))) P_InstaThrust(player->mo, player->mo->angle, 10*player->mo->scale); else { @@ -5014,7 +5011,7 @@ void P_Telekinesis(player_t *player, fixed_t thrust, fixed_t range) static void P_DoTwinSpin(player_t *player) { - player->pflags &= ~PF_NOJUMPDAMAGE; + player->pflags &= ~(PF_NOJUMPDAMAGE|PF_SPINNING); player->pflags |= P_GetJumpFlags(player) | PF_THOKKED; S_StartSound(player->mo, sfx_s3k42); player->mo->frame = 0; @@ -5055,12 +5052,13 @@ static boolean P_PlayerShieldThink(player_t *player, ticcmd_t *cmd, mobj_t *lock } } } - if ((!(player->charflags & SF_NOSHIELDABILITY)) && (cmd->buttons & BT_SPIN && !LUAh_ShieldSpecial(player))) // Spin button effects + if ((!(player->charflags & SF_NOSHIELDABILITY)) && (cmd->buttons & BT_SPIN && !LUA_HookPlayer(player, HOOK(ShieldSpecial)))) // Spin button effects { // Force stop if ((player->powers[pw_shield] & ~(SH_FORCEHP|SH_STACK)) == SH_FORCE) { player->pflags |= PF_THOKKED|PF_SHIELDABILITY; + player->pflags &= ~PF_SPINNING; player->mo->momx = player->mo->momy = player->mo->momz = 0; S_StartSound(player->mo, sfx_ngskid); } @@ -5076,11 +5074,13 @@ static boolean P_PlayerShieldThink(player_t *player, ticcmd_t *cmd, mobj_t *lock // Armageddon pow case SH_ARMAGEDDON: player->pflags |= PF_THOKKED|PF_SHIELDABILITY; + player->pflags &= ~PF_SPINNING; P_BlackOw(player); break; // Attraction blast case SH_ATTRACT: player->pflags |= PF_THOKKED|PF_SHIELDABILITY; + player->pflags &= ~PF_SPINNING; player->homing = 2; P_SetTarget(&player->mo->target, P_SetTarget(&player->mo->tracer, lockonshield)); if (lockonshield) @@ -5100,6 +5100,7 @@ static boolean P_PlayerShieldThink(player_t *player, ticcmd_t *cmd, mobj_t *lock { boolean elem = ((player->powers[pw_shield] & SH_NOSTACK) == SH_ELEMENTAL); player->pflags |= PF_THOKKED|PF_SHIELDABILITY; + player->pflags &= ~PF_SPINNING; if (elem) { player->mo->momx = player->mo->momy = 0; @@ -5122,7 +5123,7 @@ static boolean P_PlayerShieldThink(player_t *player, ticcmd_t *cmd, mobj_t *lock player->pflags |= PF_THOKKED|PF_SHIELDABILITY; P_Thrust(player->mo, player->mo->angle, FixedMul(30*FRACUNIT - FixedSqrt(FixedDiv(player->speed, player->mo->scale)), player->mo->scale)); player->drawangle = player->mo->angle; - player->pflags &= ~PF_NOJUMPDAMAGE; + player->pflags &= ~(PF_NOJUMPDAMAGE|PF_SPINNING); P_SetPlayerMobjState(player->mo, S_PLAY_ROLL); S_StartSound(player->mo, sfx_s3k43); default: @@ -5179,7 +5180,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd) // and you don't have a shield, do it! P_DoSuperTransformation(player, false); } - else if (!LUAh_JumpSpinSpecial(player)) + else if (!LUA_HookPlayer(player, HOOK(JumpSpinSpecial))) switch (player->charability) { case CA_THOK: @@ -5252,7 +5253,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd) if (cmd->buttons & BT_JUMP && !player->exiting && !P_PlayerInPain(player)) { - if (LUAh_JumpSpecial(player)) + if (LUA_HookPlayer(player, HOOK(JumpSpecial))) ; // all situations below this require jump button not to be pressed already else if (player->pflags & PF_JUMPDOWN) @@ -5287,7 +5288,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd) }*/ else if (player->pflags & PF_JUMPED) { - if (!LUAh_AbilitySpecial(player)) + if (!LUA_HookPlayer(player, HOOK(AbilitySpecial))) switch (player->charability) { case CA_THOK: @@ -5357,9 +5358,9 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd) // disabled because it seemed to disorient people and Z-targeting exists now /*if (!demoplayback) { - if (player == &players[consoleplayer] && cv_cam_turnfacingability[0].value > 0 && !(PLAYER1INPUTDOWN(gc_turnleft) || PLAYER1INPUTDOWN(gc_turnright))) + if (player == &players[consoleplayer] && cv_cam_turnfacingability[0].value > 0 && !(PLAYER1INPUTDOWN(GC_TURNLEFT) || PLAYER1INPUTDOWN(GC_TURNRIGHT))) P_SetPlayerAngle(player, player->mo->angle);; - else if (player == &players[secondarydisplayplayer] && cv_cam_turnfacingability[1].value > 0 && !(PLAYER2INPUTDOWN(gc_turnleft) || PLAYER2INPUTDOWN(gc_turnright))) + else if (player == &players[secondarydisplayplayer] && cv_cam_turnfacingability[1].value > 0 && !(PLAYER2INPUTDOWN(GC_TURNLEFT) || PLAYER2INPUTDOWN(GC_TURNRIGHT))) P_SetPlayerAngle(player, player->mo->angle); }*/ } @@ -5378,7 +5379,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd) player->powers[pw_tailsfly] = tailsflytics + 1; // Set the fly timer player->pflags &= ~(PF_JUMPED|PF_NOJUMPDAMAGE|PF_SPINNING|PF_STARTDASH); - if (player->bot == 1) + if (player->bot == BOT_2PAI) player->pflags |= PF_THOKKED; else player->pflags |= (PF_THOKKED|PF_CANCARRY); @@ -5415,7 +5416,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd) if (!(player->pflags & PF_THOKKED) || ((player->charflags & SF_MULTIABILITY) && (player->secondjump < (player->actionspd >> FRACBITS)))) { player->pflags |= PF_THOKKED; - player->pflags &= ~PF_JUMPED; + player->pflags &= ~(PF_JUMPED|PF_SPINNING); P_DoJump(player, true); player->secondjump++; } @@ -5441,6 +5442,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd) P_Telekinesis(player, FixedMul(player->actionspd, player->mo->scale), // +ve thrust (pushing away from player) FixedMul(384*FRACUNIT, player->mo->scale)); + player->pflags &= ~PF_SPINNING; } break; case CA_FALLSWITCH: @@ -5449,6 +5451,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd) player->mo->momz = -player->mo->momz; P_SpawnThokMobj(player); player->pflags |= PF_THOKKED; + player->pflags &= ~PF_SPINNING; } break; case CA_AIRDRILL: @@ -5456,6 +5459,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd) { player->flyangle = 56 + (60-(player->actionspd>>FRACBITS))/3; player->pflags |= PF_THOKKED; + player->pflags &= ~PF_SPINNING; S_StartSound(player->mo, sfx_spndsh); } break; @@ -5463,7 +5467,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd) if (!(player->pflags & PF_THOKKED) || player->charflags & SF_MULTIABILITY) { P_SetPlayerMobjState(player->mo, S_PLAY_BOUNCE); - player->pflags &= ~(PF_JUMPED|PF_NOJUMPDAMAGE); + player->pflags &= ~(PF_JUMPED|PF_NOJUMPDAMAGE|PF_SPINNING); player->pflags |= PF_THOKKED|PF_BOUNCING; player->mo->momx >>= 1; player->mo->momy >>= 1; @@ -5480,7 +5484,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd) } else if (player->pflags & PF_THOKKED) { - if (!LUAh_AbilitySpecial(player)) + if (!LUA_HookPlayer(player, HOOK(AbilitySpecial))) switch (player->charability) { case CA_FLY: @@ -5503,7 +5507,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd) break; } } - else if ((!(player->charflags & SF_NOSHIELDABILITY)) && ((player->powers[pw_shield] & SH_NOSTACK) == SH_WHIRLWIND && !player->powers[pw_super] && !LUAh_ShieldSpecial(player))) + else if ((!(player->charflags & SF_NOSHIELDABILITY)) && ((player->powers[pw_shield] & SH_NOSTACK) == SH_WHIRLWIND && !player->powers[pw_super] && !LUA_HookPlayer(player, HOOK(ShieldSpecial)))) P_DoJumpShield(player); } @@ -5573,7 +5577,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd) { fixed_t potentialmomz; if (player->charability == CA_SLOWFALL) - potentialmomz = -gravity*4; + potentialmomz = FixedMul(gravity, -4*player->mo->scale); else potentialmomz = ((player->speed < 10*player->mo->scale) ? (player->speed - 10*player->mo->scale)/5 @@ -5624,16 +5628,10 @@ INT32 P_GetPlayerControlDirection(player_t *player) { ticcmd_t *cmd = &player->cmd; angle_t controllerdirection, controlplayerdirection; - camera_t *thiscam; angle_t dangle; fixed_t tempx = 0, tempy = 0; angle_t tempangle, origtempangle; - if (splitscreen && player == &players[secondarydisplayplayer]) - thiscam = &camera2; - else - thiscam = &camera; - if (!cmd->forwardmove && !cmd->sidemove) return 0; @@ -5649,17 +5647,15 @@ INT32 P_GetPlayerControlDirection(player_t *player) origtempangle = tempangle = 0; // relative to the axis rather than the player! controlplayerdirection = R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy); } - else if ((P_ControlStyle(player) & CS_LMAOGALOG) && thiscam->chase) + else { if (player->awayviewtics) origtempangle = tempangle = player->awayviewmobj->angle; + else if (P_ControlStyle(player) & CS_LMAOGALOG) + origtempangle = tempangle = (cmd->angleturn << 16); else - origtempangle = tempangle = thiscam->angle; - controlplayerdirection = player->mo->angle; - } - else - { - origtempangle = tempangle = player->mo->angle; + origtempangle = tempangle = player->mo->angle; + controlplayerdirection = R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy); } @@ -5690,6 +5686,22 @@ INT32 P_GetPlayerControlDirection(player_t *player) return 1; // Controls pointing in player's general direction } +static boolean P_ShouldResetConveyorMomentum(player_t *player) +{ + switch (player->onconveyor) + { + case 1: + return false; + case 2: // Wind/Current + return !(player->mo->eflags & (MFE_UNDERWATER|MFE_TOUCHWATER)); + case 3: + default: + return true; + case 4: // Actual conveyor belt + return !P_IsObjectOnGround(player->mo); + } +} + // Control scheme for 2d levels. static void P_2dMovement(player_t *player) { @@ -5724,16 +5736,7 @@ static void P_2dMovement(player_t *player) } } - // cmomx/cmomy stands for the conveyor belt speed. - if (player->onconveyor == 2) // Wind/Current - { - //if (player->mo->z > player->mo->watertop || player->mo->z + player->mo->height < player->mo->waterbottom) - if (!(player->mo->eflags & (MFE_UNDERWATER|MFE_TOUCHWATER))) - player->cmomx = player->cmomy = 0; - } - else if (player->onconveyor == 4 && !P_IsObjectOnGround(player->mo)) // Actual conveyor belt - player->cmomx = player->cmomy = 0; - else if (player->onconveyor != 2 && player->onconveyor != 4 && player->onconveyor != 1) + if (P_ShouldResetConveyorMomentum(player)) player->cmomx = player->cmomy = 0; player->rmomx = player->mo->momx - player->cmomx; @@ -5916,16 +5919,7 @@ static void P_3dMovement(player_t *player) } movepushsideangle = movepushangle-ANGLE_90; - // cmomx/cmomy stands for the conveyor belt speed. - if (player->onconveyor == 2) // Wind/Current - { - //if (player->mo->z > player->mo->watertop || player->mo->z + player->mo->height < player->mo->waterbottom) - if (!(player->mo->eflags & (MFE_UNDERWATER|MFE_TOUCHWATER))) - player->cmomx = player->cmomy = 0; - } - else if (player->onconveyor == 4 && !P_IsObjectOnGround(player->mo)) // Actual conveyor belt - player->cmomx = player->cmomy = 0; - else if (player->onconveyor != 2 && player->onconveyor != 4 && player->onconveyor != 1) + if (P_ShouldResetConveyorMomentum(player)) player->cmomx = player->cmomy = 0; player->rmomx = player->mo->momx - player->cmomx; @@ -5965,22 +5959,6 @@ static void P_3dMovement(player_t *player) acceleration = 96 + (FixedDiv(player->speed, player->mo->scale)>>FRACBITS) * 40; topspeed = normalspd; } - else if (player->bot) - { // Bot steals player 1's stats - normalspd = FixedMul(players[consoleplayer].normalspeed, player->mo->scale); - thrustfactor = players[consoleplayer].thrustfactor; - acceleration = players[consoleplayer].accelstart + (FixedDiv(player->speed, player->mo->scale)>>FRACBITS) * players[consoleplayer].acceleration; - - if (player->powers[pw_tailsfly]) - topspeed = normalspd/2; - else if (player->mo->eflags & (MFE_UNDERWATER|MFE_GOOWATER)) - { - topspeed = normalspd/2; - acceleration = 2*acceleration/3; - } - else - topspeed = normalspd; - } else { if (player->powers[pw_super] || player->powers[pw_sneakers]) @@ -6333,18 +6311,11 @@ static void P_NightsTransferPoints(player_t *player, fixed_t xspeed, fixed_t rad if (player->exiting) return; + if (!P_CheckMove(player->mo, + player->mo->x + player->mo->momx, + player->mo->y + player->mo->momy, true)) { - boolean notallowed; - mobj_t *hack = P_SpawnMobjFromMobj(player->mo, 0, 0, 0, MT_NULL); - hack->flags = MF_NOGRAVITY; - hack->radius = player->mo->radius; - hack->height = player->mo->height; - hack->z = player->mo->z; - P_SetThingPosition(hack); - notallowed = (!(P_TryMove(hack, player->mo->x+player->mo->momx, player->mo->y+player->mo->momy, true))); - P_RemoveMobj(hack); - if (notallowed) - return; + return; } { @@ -6736,7 +6707,7 @@ static void P_NightsTransferPoints(player_t *player, fixed_t xspeed, fixed_t rad // static void P_DoNiGHTSCapsule(player_t *player) { - INT32 i, spherecount, totalduration, popduration, deductinterval, deductquantity, sphereresult, firstpoptic, startingspheres; + INT32 i, spherecount, totalduration, popduration, deductinterval, deductquantity, sphereresult, firstpoptic; INT32 tictimer = ++player->capsule->extravalue2; if (abs(player->mo->x-player->capsule->x) <= 3*FRACUNIT) @@ -6859,15 +6830,20 @@ static void P_DoNiGHTSCapsule(player_t *player) if (player->capsule->health > sphereresult && player->spheres > 0) { + // If spherecount isn't a multiple of deductquantity, the final deduction might steal too many spheres from the player + // E.g. with 80 capsule health, deductquantity is 3, 3*26 is 78, 78+3=81, and then it'll have stolen more than the 80 that it was meant to! + // So let's adjust deductquantity accordingly for the final deduction + deductquantity = min(deductquantity, player->capsule->health - sphereresult); + player->spheres -= deductquantity; player->capsule->health -= deductquantity; + + if (player->spheres < 0) // This can't happen... without Lua, setrings, et cetera + player->spheres = 0; + + //if (player->capsule->health < sphereresult) // This can't happen + //player->capsule->health = sphereresult; } - - if (player->spheres < 0) - player->spheres = 0; - - if (player->capsule->health < sphereresult) - player->capsule->health = sphereresult; } // Spawn a 'pop' for every 2 tics @@ -6888,9 +6864,8 @@ static void P_DoNiGHTSCapsule(player_t *player) } else { - startingspheres = player->spheres - player->capsule->health; + player->spheres -= player->capsule->health; player->capsule->health = 0; - player->spheres = startingspheres; } } @@ -7042,7 +7017,7 @@ static void P_MoveNiGHTSToDrone(player_t *player) } player->mo->momx = player->mo->momy = player->mo->momz = 0; - P_TeleportMove(player->mo, player->drone->x, player->drone->y, player->drone->z + zofs); + P_MoveOrigin(player->mo, player->drone->x, player->drone->y, player->drone->z + zofs); P_SetTarget(&player->drone, NULL); } @@ -7657,8 +7632,8 @@ static void P_NiGHTSMovement(player_t *player) } } - if (objectplacing) - OP_NightsObjectplace(player); + //if (objectplacing) + // OP_NightsObjectplace(player); } // May be used in future for CTF @@ -7743,11 +7718,9 @@ void P_ElementalFire(player_t *player, boolean cropcircle) else ground = player->mo->floorz; - if (cropcircle) - ground += P_MobjFlip(player->mo); - if (cropcircle) { + ground += P_MobjFlip(player->mo); #define numangles 8 #define limitangle (180/numangles) travelangle = player->mo->angle + P_RandomRange(-limitangle, limitangle)*ANG1; @@ -7760,7 +7733,8 @@ void P_ElementalFire(player_t *player, boolean cropcircle) flame->fuse = TICRATE*7; // takes about an extra second to hit the ground flame->destscale = player->mo->scale; P_SetScale(flame, player->mo->scale); - flame->flags2 = (flame->flags2 & ~MF2_OBJECTFLIP)|(player->mo->flags2 & MF2_OBJECTFLIP); + if (!(player->mo->flags2 & MF2_OBJECTFLIP) != !(player->powers[pw_gravityboots])) // take gravity boots into account + flame->flags2 |= MF2_OBJECTFLIP; flame->eflags = (flame->eflags & ~MFE_VERTICALFLIP)|(player->mo->eflags & MFE_VERTICALFLIP); P_InstaThrust(flame, flame->angle, FixedMul(3*FRACUNIT, flame->scale)); P_SetObjectMomZ(flame, 3*FRACUNIT, false); @@ -7795,6 +7769,8 @@ void P_ElementalFire(player_t *player, boolean cropcircle) flame->fuse = TICRATE*6; flame->destscale = player->mo->scale; P_SetScale(flame, player->mo->scale); + if (!(player->mo->flags2 & MF2_OBJECTFLIP) != !(player->powers[pw_gravityboots])) // take gravity boots into account + flame->flags2 |= MF2_OBJECTFLIP; flame->eflags = (flame->eflags & ~MFE_VERTICALFLIP)|(player->mo->eflags & MFE_VERTICALFLIP); if (!(gametyperules & GTR_FRIENDLY)) { @@ -8523,12 +8499,12 @@ void P_MovePlayer(player_t *player) } } - // End your chain if you're on the ground or climbing a wall. + // End your chain if you're on the ground while not rolling, or climbing a wall. // But not if invincible! Allow for some crazy long chains with it. // Also keep in mind the PF_JUMPED check. // If we lacked this, stepping up while jumping up would reset score. // (for instance, when climbing up off a wall.) - if ((onground || player->climbing) && !(player->pflags & PF_JUMPED) && player->powers[pw_invulnerability] <= 1) + if ((onground || player->climbing) && ((player->pflags & (PF_STARTDASH|PF_SPINNING)) != PF_SPINNING) && !(player->pflags & PF_JUMPED) && player->powers[pw_invulnerability] <= 1) P_ResetScore(player); // Show the "THOK!" graphic when spinning quickly across the ground. (even applies to non-spinners, in the case of zoom tubes) @@ -8653,7 +8629,7 @@ void P_MovePlayer(player_t *player) { boolean atspinheight = false; fixed_t oldheight = player->mo->height; - fixed_t luaheight = LUAh_PlayerHeight(player); + fixed_t luaheight = LUA_HookPlayerHeight(player); if (luaheight != -1) { @@ -8719,7 +8695,7 @@ void P_MovePlayer(player_t *player) #endif // Look for blocks to bust up - // Because of FF_SHATTER, we should look for blocks constantly, + // Because of BT_TOUCH, we should look for blocks constantly, // not just when spinning or playing as Knuckles if (CheckForBustableBlocks) P_CheckBustableBlocks(player); @@ -9110,10 +9086,6 @@ mobj_t *P_LookForFocusTarget(player_t *player, mobj_t *exclude, SINT8 direction, switch (mo->type) { - case MT_TNTBARREL: - if (lockonflags & LOCK_INTERESTS) - break; - /*FALLTHRU*/ case MT_PLAYER: // Don't chase other players! case MT_DETON: continue; // Don't be STUPID, Sonic! @@ -9134,17 +9106,13 @@ mobj_t *P_LookForFocusTarget(player_t *player, mobj_t *exclude, SINT8 direction, /*FALLTHRU*/ default: - if ((lockonflags & LOCK_BOSS) && ((mo->flags & (MF_BOSS|MF_SHOOTABLE)) == (MF_BOSS|MF_SHOOTABLE))) // allows if it has the flags desired XOR it has the invert aimable flag - { - if (mo->flags2 & MF2_FRET) - continue; + if ((lockonflags & LOCK_BOSS) && (mo->flags & MF_BOSS)) // always allow targeting bosses break; - } if ((lockonflags & LOCK_ENEMY) && (!((mo->flags & (MF_ENEMY|MF_SHOOTABLE)) == (MF_ENEMY|MF_SHOOTABLE)) != !(mo->flags2 & MF2_INVERTAIMABLE))) // allows if it has the flags desired XOR it has the invert aimable flag break; - if ((lockonflags & LOCK_INTERESTS) && (mo->flags & (MF_PUSHABLE|MF_MONITOR))) // allows if it has the flags desired XOR it has the invert aimable flag + if ((lockonflags & LOCK_INTERESTS) && (mo->flags & (MF_PUSHABLE|MF_MONITOR))) // allows if it has the flags desired break; continue; // not a valid object @@ -9510,11 +9478,11 @@ static void P_DeathThink(player_t *player) if (player->deadtimer < INT32_MAX) player->deadtimer++; - if (player->bot) // don't allow bots to do any of the below, B_CheckRespawn does all they need for respawning already + if (player->bot == BOT_2PAI || player->bot == BOT_2PHUMAN) // don't allow followbots to do any of the below, B_CheckRespawn does all they need for respawning already goto notrealplayer; // continue logic - if (!(netgame || multiplayer) && player->lives <= 0) + if (!(netgame || multiplayer) && player->lives <= 0 && player == &players[consoleplayer]) //Extra players in SP can't be allowed to continue or end game { if (player->deadtimer > (3*TICRATE) && (cmd->buttons & BT_SPIN || cmd->buttons & BT_JUMP) && (!continuesInSession || player->continues > 0)) G_UseContinue(); @@ -9671,45 +9639,45 @@ static CV_PossibleValue_t rotation_cons_t[] = {{1, "MIN"}, {25, "MAX"}, {0, NULL static CV_PossibleValue_t CV_CamRotate[] = {{-720, "MIN"}, {720, "MAX"}, {0, NULL}}; static CV_PossibleValue_t multiplier_cons_t[] = {{0, "MIN"}, {3*FRACUNIT, "MAX"}, {0, NULL}}; -consvar_t cv_cam_dist = CVAR_INIT ("cam_curdist", "160", CV_FLOAT, NULL, NULL); -consvar_t cv_cam_height = CVAR_INIT ("cam_curheight", "25", CV_FLOAT, NULL, NULL); -consvar_t cv_cam_still = CVAR_INIT ("cam_still", "Off", 0, CV_OnOff, NULL); -consvar_t cv_cam_speed = CVAR_INIT ("cam_speed", "0.3", CV_FLOAT|CV_SAVE, CV_CamSpeed, NULL); -consvar_t cv_cam_rotate = CVAR_INIT ("cam_rotate", "0", CV_CALL|CV_NOINIT, CV_CamRotate, CV_CamRotate_OnChange); -consvar_t cv_cam_rotspeed = CVAR_INIT ("cam_rotspeed", "10", CV_SAVE, rotation_cons_t, NULL); -consvar_t cv_cam_turnmultiplier = CVAR_INIT ("cam_turnmultiplier", "1.0", CV_FLOAT|CV_SAVE, multiplier_cons_t, NULL); -consvar_t cv_cam_orbit = CVAR_INIT ("cam_orbit", "Off", CV_SAVE, CV_OnOff, NULL); -consvar_t cv_cam_adjust = CVAR_INIT ("cam_adjust", "On", CV_SAVE, CV_OnOff, NULL); -consvar_t cv_cam2_dist = CVAR_INIT ("cam2_curdist", "160", CV_FLOAT, NULL, NULL); -consvar_t cv_cam2_height = CVAR_INIT ("cam2_curheight", "25", CV_FLOAT, NULL, NULL); -consvar_t cv_cam2_still = CVAR_INIT ("cam2_still", "Off", 0, CV_OnOff, NULL); -consvar_t cv_cam2_speed = CVAR_INIT ("cam2_speed", "0.3", CV_FLOAT|CV_SAVE, CV_CamSpeed, NULL); -consvar_t cv_cam2_rotate = CVAR_INIT ("cam2_rotate", "0", CV_CALL|CV_NOINIT, CV_CamRotate, CV_CamRotate2_OnChange); -consvar_t cv_cam2_rotspeed = CVAR_INIT ("cam2_rotspeed", "10", CV_SAVE, rotation_cons_t, NULL); -consvar_t cv_cam2_turnmultiplier = CVAR_INIT ("cam2_turnmultiplier", "1.0", CV_FLOAT|CV_SAVE, multiplier_cons_t, NULL); -consvar_t cv_cam2_orbit = CVAR_INIT ("cam2_orbit", "Off", CV_SAVE, CV_OnOff, NULL); -consvar_t cv_cam2_adjust = CVAR_INIT ("cam2_adjust", "On", CV_SAVE, CV_OnOff, NULL); +consvar_t cv_cam_dist = CVAR_INIT ("cam_curdist", "160", CV_FLOAT|CV_ALLOWLUA, NULL, NULL); +consvar_t cv_cam_height = CVAR_INIT ("cam_curheight", "25", CV_FLOAT|CV_ALLOWLUA, NULL, NULL); +consvar_t cv_cam_still = CVAR_INIT ("cam_still", "Off", CV_ALLOWLUA, CV_OnOff, NULL); +consvar_t cv_cam_speed = CVAR_INIT ("cam_speed", "0.3", CV_FLOAT|CV_SAVE|CV_ALLOWLUA, CV_CamSpeed, NULL); +consvar_t cv_cam_rotate = CVAR_INIT ("cam_rotate", "0", CV_CALL|CV_NOINIT|CV_ALLOWLUA, CV_CamRotate, CV_CamRotate_OnChange); +consvar_t cv_cam_rotspeed = CVAR_INIT ("cam_rotspeed", "10", CV_SAVE|CV_ALLOWLUA, rotation_cons_t, NULL); +consvar_t cv_cam_turnmultiplier = CVAR_INIT ("cam_turnmultiplier", "0.75", CV_FLOAT|CV_SAVE|CV_ALLOWLUA, multiplier_cons_t, NULL); +consvar_t cv_cam_orbit = CVAR_INIT ("cam_orbit", "Off", CV_SAVE|CV_ALLOWLUA, CV_OnOff, NULL); +consvar_t cv_cam_adjust = CVAR_INIT ("cam_adjust", "On", CV_SAVE|CV_ALLOWLUA, CV_OnOff, NULL); +consvar_t cv_cam2_dist = CVAR_INIT ("cam2_curdist", "160", CV_FLOAT|CV_ALLOWLUA, NULL, NULL); +consvar_t cv_cam2_height = CVAR_INIT ("cam2_curheight", "25", CV_FLOAT|CV_ALLOWLUA, NULL, NULL); +consvar_t cv_cam2_still = CVAR_INIT ("cam2_still", "Off", CV_ALLOWLUA, CV_OnOff, NULL); +consvar_t cv_cam2_speed = CVAR_INIT ("cam2_speed", "0.3", CV_FLOAT|CV_SAVE|CV_ALLOWLUA, CV_CamSpeed, NULL); +consvar_t cv_cam2_rotate = CVAR_INIT ("cam2_rotate", "0", CV_CALL|CV_NOINIT|CV_ALLOWLUA, CV_CamRotate, CV_CamRotate2_OnChange); +consvar_t cv_cam2_rotspeed = CVAR_INIT ("cam2_rotspeed", "10", CV_SAVE|CV_ALLOWLUA, rotation_cons_t, NULL); +consvar_t cv_cam2_turnmultiplier = CVAR_INIT ("cam2_turnmultiplier", "0.75", CV_FLOAT|CV_SAVE|CV_ALLOWLUA, multiplier_cons_t, NULL); +consvar_t cv_cam2_orbit = CVAR_INIT ("cam2_orbit", "Off", CV_SAVE|CV_ALLOWLUA, CV_OnOff, NULL); +consvar_t cv_cam2_adjust = CVAR_INIT ("cam2_adjust", "On", CV_SAVE|CV_ALLOWLUA, CV_OnOff, NULL); // [standard vs simple][p1 or p2] consvar_t cv_cam_savedist[2][2] = { { // standard - CVAR_INIT ("cam_dist", "160", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCamDist), - CVAR_INIT ("cam2_dist", "160", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCam2Dist), + CVAR_INIT ("cam_dist", "192", CV_FLOAT|CV_SAVE|CV_CALL|CV_ALLOWLUA, NULL, CV_UpdateCamDist), + CVAR_INIT ("cam2_dist", "192", CV_FLOAT|CV_SAVE|CV_CALL|CV_ALLOWLUA, NULL, CV_UpdateCam2Dist), }, { // simple - CVAR_INIT ("cam_simpledist", "224", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCamDist), - CVAR_INIT ("cam2_simpledist", "224", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCam2Dist), + CVAR_INIT ("cam_simpledist", "256", CV_FLOAT|CV_SAVE|CV_CALL|CV_ALLOWLUA, NULL, CV_UpdateCamDist), + CVAR_INIT ("cam2_simpledist", "256", CV_FLOAT|CV_SAVE|CV_CALL|CV_ALLOWLUA, NULL, CV_UpdateCam2Dist), } }; consvar_t cv_cam_saveheight[2][2] = { { // standard - CVAR_INIT ("cam_height", "25", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCamDist), - CVAR_INIT ("cam2_height", "25", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCam2Dist), + CVAR_INIT ("cam_height", "40", CV_FLOAT|CV_SAVE|CV_CALL|CV_ALLOWLUA, NULL, CV_UpdateCamDist), + CVAR_INIT ("cam2_height", "40", CV_FLOAT|CV_SAVE|CV_CALL|CV_ALLOWLUA, NULL, CV_UpdateCam2Dist), }, { // simple - CVAR_INIT ("cam_simpleheight", "48", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCamDist), - CVAR_INIT ("cam2_simpleheight", "48", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCam2Dist), + CVAR_INIT ("cam_simpleheight", "60", CV_FLOAT|CV_SAVE|CV_CALL|CV_ALLOWLUA, NULL, CV_UpdateCamDist), + CVAR_INIT ("cam2_simpleheight", "60", CV_FLOAT|CV_SAVE|CV_CALL|CV_ALLOWLUA, NULL, CV_UpdateCam2Dist), } }; @@ -9758,6 +9726,7 @@ void P_ResetCamera(player_t *player, camera_t *thiscam) thiscam->x = x; thiscam->y = y; thiscam->z = z; + thiscam->reset = true; if ((thiscam == &camera && G_ControlStyle(1) == CS_SIMPLE) || (thiscam == &camera2 && G_ControlStyle(2) == CS_SIMPLE)) @@ -9891,17 +9860,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall if (P_CameraThinker(player, thiscam, resetcalled)) return true; - if (tutorialmode) - { - // force defaults because we have a camera look section - camspeed = (INT32)(atof(cv_cam_speed.defaultvalue) * FRACUNIT); - camstill = (!stricmp(cv_cam_still.defaultvalue, "off")) ? false : true; - camorbit = (!stricmp(cv_cam_orbit.defaultvalue, "off")) ? false : true; - camrotate = atoi(cv_cam_rotate.defaultvalue); - camdist = FixedMul((INT32)(atof(cv_cam_dist.defaultvalue) * FRACUNIT), mo->scale); - camheight = FixedMul((INT32)(atof(cv_cam_height.defaultvalue) * FRACUNIT), mo->scale); - } - else if (thiscam == &camera) + if (thiscam == &camera) { camspeed = cv_cam_speed.value; camstill = cv_cam_still.value; @@ -10193,7 +10152,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall for (rover = newsubsec->sector->ffloors; rover; rover = rover->next) { fixed_t topheight, bottomheight; - if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERALL) || GETSECSPECIAL(rover->master->frontsector->special, 4) == 12) + if (!(rover->fofflags & FOF_BLOCKOTHERS) || !(rover->fofflags & FOF_EXISTS) || !(rover->fofflags & FOF_RENDERALL) || (rover->master->frontsector->flags & MSF_NOCLIPCAMERA)) continue; topheight = P_CameraGetFOFTopZ(thiscam, newsubsec->sector, rover, midx, midy, NULL); @@ -10257,7 +10216,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall // We're inside it! Yess... polysec = po->lines[0]->backsector; - if (GETSECSPECIAL(polysec->special, 4) == 12) + if (polysec->flags & MSF_NOCLIPCAMERA) { // Camera noclip polyobj. plink = (polymaplink_t *)(plink->link.next); continue; @@ -10319,7 +10278,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall for (rover = newsubsec->sector->ffloors; rover; rover = rover->next) { fixed_t topheight, bottomheight; - if ((rover->flags & FF_BLOCKOTHERS) && (rover->flags & FF_RENDERALL) && (rover->flags & FF_EXISTS) && GETSECSPECIAL(rover->master->frontsector->special, 4) != 12) + if ((rover->fofflags & FOF_BLOCKOTHERS) && (rover->fofflags & FOF_RENDERALL) && (rover->fofflags & FOF_EXISTS) && !(rover->master->frontsector->flags & MSF_NOCLIPCAMERA)) { topheight = P_CameraGetFOFTopZ(thiscam, newsubsec->sector, rover, midx, midy, NULL); bottomheight = P_CameraGetFOFBottomZ(thiscam, newsubsec->sector, rover, midx, midy, NULL); @@ -10395,7 +10354,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall thiscam->momx = FixedMul(x - thiscam->x, camspeed); thiscam->momy = FixedMul(y - thiscam->y, camspeed); - if (GETSECSPECIAL(thiscam->subsector->sector->special, 1) == 6 + if (thiscam->subsector->sector->damagetype == SD_DEATHPITTILT && thiscam->z < thiscam->subsector->sector->floorheight + 256*FRACUNIT && FixedMul(z - thiscam->z, camspeed) < 0) { @@ -10515,7 +10474,7 @@ boolean P_SpectatorJoinGame(player_t *player) else changeto = (P_RandomFixed() & 1) + 1; - if (!LUAh_TeamSwitch(player, changeto, true, false, false)) + if (!LUA_HookTeamSwitch(player, changeto, true, false, false)) return false; if (player->mo) @@ -10532,7 +10491,7 @@ boolean P_SpectatorJoinGame(player_t *player) { // Call ViewpointSwitch hooks here. // The viewpoint was forcibly changed. - LUAh_ViewpointSwitch(player, &players[consoleplayer], true); + LUA_HookViewpointSwitch(player, &players[consoleplayer], true); displayplayer = consoleplayer; } @@ -10550,7 +10509,7 @@ boolean P_SpectatorJoinGame(player_t *player) // respawn in place and sit there for the rest of the round. if (!((gametyperules & GTR_HIDEFROZEN) && leveltime > (hidetime * TICRATE))) { - if (!LUAh_TeamSwitch(player, 3, true, false, false)) + if (!LUA_HookTeamSwitch(player, 3, true, false, false)) return false; if (player->mo) { @@ -10577,7 +10536,7 @@ boolean P_SpectatorJoinGame(player_t *player) { // Call ViewpointSwitch hooks here. // The viewpoint was forcibly changed. - LUAh_ViewpointSwitch(player, &players[consoleplayer], true); + LUA_HookViewpointSwitch(player, &players[consoleplayer], true); displayplayer = consoleplayer; } @@ -10602,7 +10561,6 @@ static void P_CalcPostImg(player_t *player) postimg_t *type; INT32 *param; fixed_t pviewheight; - size_t i; if (player->mo->eflags & MFE_VERTICALFLIP) pviewheight = player->mo->z + player->mo->height - player->viewheight; @@ -10627,45 +10585,30 @@ static void P_CalcPostImg(player_t *player) } // see if we are in heat (no, not THAT kind of heat...) - for (i = 0; i < sector->tags.count; i++) + if (sector->flags & MSF_HEATWAVE) + *type = postimg_heat; + else if (sector->ffloors) { - if (Tag_FindLineSpecial(13, sector->tags.tags[i]) != -1) - { - *type = postimg_heat; - break; - } - else if (sector->ffloors) - { - ffloor_t *rover; - fixed_t topheight; - fixed_t bottomheight; - boolean gotres = false; + ffloor_t *rover; + fixed_t topheight; + fixed_t bottomheight; - for (rover = sector->ffloors; rover; rover = rover->next) + for (rover = sector->ffloors; rover; rover = rover->next) + { + if (!(rover->fofflags & FOF_EXISTS)) + continue; + + topheight = P_GetFFloorTopZAt (rover, player->mo->x, player->mo->y); + bottomheight = P_GetFFloorBottomZAt(rover, player->mo->x, player->mo->y); + + if (pviewheight >= topheight || pviewheight <= bottomheight) + continue; + + if (rover->master->frontsector->flags & MSF_HEATWAVE) { - size_t j; - - if (!(rover->flags & FF_EXISTS)) - continue; - - topheight = P_GetFFloorTopZAt (rover, player->mo->x, player->mo->y); - bottomheight = P_GetFFloorBottomZAt(rover, player->mo->x, player->mo->y); - - if (pviewheight >= topheight || pviewheight <= bottomheight) - continue; - - for (j = 0; j < rover->master->frontsector->tags.count; j++) - { - if (Tag_FindLineSpecial(13, rover->master->frontsector->tags.tags[j]) != -1) - { - *type = postimg_heat; - gotres = true; - break; - } - } - } - if (gotres) + *type = postimg_heat; break; + } } } @@ -10678,7 +10621,7 @@ static void P_CalcPostImg(player_t *player) for (rover = sector->ffloors; rover; rover = rover->next) { - if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_SWIMMABLE) || rover->flags & FF_BLOCKPLAYER) + if (!(rover->fofflags & FOF_EXISTS) || !(rover->fofflags & FOF_SWIMMABLE) || rover->fofflags & FOF_BLOCKPLAYER) continue; topheight = P_GetFFloorTopZAt (rover, player->mo->x, player->mo->y); @@ -10741,7 +10684,7 @@ static sector_t *P_GetMinecartSector(fixed_t x, fixed_t y, fixed_t z, fixed_t *n ffloor_t *rover; for (rover = sec->ffloors; rover; rover = rover->next) { - if (!(rover->flags & (FF_EXISTS|FF_BLOCKOTHERS))) + if (!(rover->fofflags & (FOF_EXISTS|FOF_BLOCKOTHERS))) continue; *nz = P_GetFFloorTopZAt(rover, x, y); @@ -10904,7 +10847,7 @@ static mobj_t *P_LookForRails(mobj_t* mobj, fixed_t c, fixed_t s, angle_t target fixed_t nx, ny; angle_t nang, dummy, angdiff; mobj_t *mark; - mobj_t *snax = P_GetAxis(sides[lines[lline].sidenum[0]].textureoffset >> FRACBITS); + mobj_t *snax = P_GetAxis(lines[lline].args[0]); if (!snax) return NULL; P_GetAxisPosition(x, y, snax, &nx, &ny, &nang, &dummy); @@ -11006,7 +10949,7 @@ static void P_MinecartThink(player_t *player) // Update axis if the cart is standing on a rail. if (sec && lnum != -1) { - mobj_t *axis = P_GetAxis(sides[lines[lnum].sidenum[0]].textureoffset >> FRACBITS); + mobj_t *axis = P_GetAxis(lines[lnum].args[0]); fixed_t newx, newy; angle_t targetangle, grind; angle_t prevangle, angdiff; @@ -11114,6 +11057,21 @@ static void P_MinecartThink(player_t *player) S_StartSound(minecart, minecart->info->activesound); } } + + // Mark interpolation; the old positions need to be relative to the displacement from the minecart _after_ it's moved. + // This isn't quite correct (it captures the landing wobble) but it works well enough + if (detleft) + { + detleft->old_x = detleft->x - (minecart->old_x - minecart->old_x2); + detleft->old_y = detleft->y - (minecart->old_y - minecart->old_y2); + detleft->old_z = detleft->z - (minecart->old_z - minecart->old_z2); + } + if (detright) + { + detright->old_x = detright->x - (minecart->old_x - minecart->old_x2); + detright->old_y = detright->y - (minecart->old_y - minecart->old_y2); + detright->old_z = detright->z - (minecart->old_z - minecart->old_z2); + } } else { @@ -11134,7 +11092,7 @@ static void P_MinecartThink(player_t *player) } // Move player to minecart. - P_TeleportMove(player->mo, minecart->x - minecart->momx, minecart->y - minecart->momy, minecart->z + max(minecart->momz, 0) + 8*FRACUNIT); + P_MoveOrigin(player->mo, minecart->x - minecart->momx, minecart->y - minecart->momy, minecart->z + max(minecart->momz, 0) + 8*FRACUNIT); if (player->powers[pw_carry] != CR_MINECART) return; player->mo->momx = player->mo->momy = player->mo->momz = 0; @@ -11342,6 +11300,11 @@ static void P_DoTailsOverlay(player_t *player, mobj_t *tails) tails->y = player->mo->y + P_ReturnThrustY(tails, tails->angle, FixedMul(backwards, tails->scale)); tails->z = player->mo->z + zoffs; P_SetThingPosition(tails); + + if (player->mo->flags2 & MF2_SHADOW) + tails->flags2 |= MF2_SHADOW; + else + tails->flags2 &= ~MF2_SHADOW; } // Metal Sonic's jet fume @@ -11373,6 +11336,7 @@ static void P_DoMetalJetFume(player_t *player, mobj_t *fume) tic_t dashmode = min(player->dashmode, DASHMODE_MAX); boolean underwater = mo->eflags & MFE_UNDERWATER; statenum_t stat = fume->state-states; + boolean resetinterp = false; if (panim != PA_WALK && panim != PA_RUN && panim != PA_DASH) // turn invisible when not in a coherent movement state { @@ -11424,6 +11388,7 @@ static void P_DoMetalJetFume(player_t *player, mobj_t *fume) { P_SetMobjState(fume, (stat = fume->info->seestate)); P_SetScale(fume, mo->scale); + resetinterp = true; } if (dashmode > DASHMODE_THRESHOLD && stat != fume->info->seestate) // If in dashmode, grow really big and flash @@ -11467,6 +11432,7 @@ static void P_DoMetalJetFume(player_t *player, mobj_t *fume) fume->y = mo->y + P_ReturnThrustY(fume, angle, dist); fume->z = mo->z + heightoffset - (fume->height >> 1); P_SetThingPosition(fume); + if (resetinterp) R_ResetMobjInterpolationState(fume); // If dashmode is high enough, spawn a trail if (player->normalspeed >= skins[player->skin].normalspeed*2) @@ -11487,6 +11453,9 @@ void P_PlayerThink(player_t *player) I_Error("p_playerthink: players[%s].mo == NULL", sizeu1(playeri)); #endif + // Reset terrain blocked status for this frame + player->blocked = false; + // todo: Figure out what is actually causing these problems in the first place... if (player->mo->health <= 0 && player->playerstate == PST_LIVE) //you should be DEAD! { @@ -11494,16 +11463,18 @@ void P_PlayerThink(player_t *player) player->playerstate = PST_DEAD; } - if (player->bot) + if (player->bot == BOT_2PAI || player->bot == BOT_2PHUMAN) { if (player->playerstate == PST_LIVE || player->playerstate == PST_DEAD) { if (B_CheckRespawn(player)) player->playerstate = PST_REBORN; + else + B_HandleFlightIndicator(player); } if (player->playerstate == PST_REBORN) { - LUAh_PlayerThink(player); + LUA_HookPlayer(player, HOOK(PlayerThink)); return; } } @@ -11605,7 +11576,7 @@ void P_PlayerThink(player_t *player) if (player->playerstate == PST_DEAD) { - LUAh_PlayerThink(player); + LUA_HookPlayer(player, HOOK(PlayerThink)); return; } } @@ -11726,7 +11697,7 @@ void P_PlayerThink(player_t *player) { player->mo->flags2 &= ~MF2_SHADOW; P_DeathThink(player); - LUAh_PlayerThink(player); + LUA_HookPlayer(player, HOOK(PlayerThink)); return; } @@ -11768,7 +11739,7 @@ void P_PlayerThink(player_t *player) { if (P_SpectatorJoinGame(player)) { - LUAh_PlayerThink(player); + LUA_HookPlayer(player, HOOK(PlayerThink)); return; // player->mo was removed. } } @@ -11864,7 +11835,7 @@ void P_PlayerThink(player_t *player) // P_TouchSpecialThing case MT_NIGHTSBUMPER, that position is fudged in the time // between that routine in the previous tic // and reaching here in the current tic - P_TeleportMove(player->mo, player->mo->hnext->x, player->mo->hnext->y + P_MoveOrigin(player->mo, player->mo->hnext->x, player->mo->hnext->y , player->mo->hnext->z + FixedMul(player->mo->hnext->height/4, player->mo->hnext->scale)); P_SetTarget(&player->mo->hnext, NULL); } @@ -11873,7 +11844,7 @@ void P_PlayerThink(player_t *player) if (!player->mo) { - LUAh_PlayerThink(player); + LUA_HookPlayer(player, HOOK(PlayerThink)); return; // P_MovePlayer removed player->mo. } @@ -12047,7 +12018,7 @@ void P_PlayerThink(player_t *player) if (player->mo->movefactor != FRACUNIT) // Friction-scaled acceleration... acceleration = FixedMul(acceleration<mo->movefactor)>>FRACBITS; - P_Thrust(player->mo, moveAngle, -acceleration); + P_Thrust(player->mo, moveAngle, FixedMul(-acceleration, player->mo->scale)); } if (!(player->pflags & PF_AUTOBRAKE) @@ -12081,7 +12052,6 @@ void P_PlayerThink(player_t *player) P_DoBubbleBreath(player); // Spawn Sonic's bubbles P_CheckUnderwaterAndSpaceTimer(player); // Display the countdown drown numbers! P_CheckInvincibilityTimer(player); // Spawn Invincibility Sparkles - P_DoPlayerHeadSigns(player); // Spawn Tag/CTF signs over player's head #if 1 // "Blur" a bit when you have speed shoes and are going fast enough @@ -12256,7 +12226,7 @@ void P_PlayerThink(player_t *player) player->losstime--; // Flash player after being hit. - if (player->powers[pw_flashing] > 0 && player->powers[pw_flashing] < flashingtics && (leveltime & 1)) + if (player->powers[pw_flashing] > 0 && player->powers[pw_flashing] < flashingtics && (leveltime & 1) && player->playerstate == PST_LIVE) player->mo->flags2 |= MF2_DONTDRAW; else player->mo->flags2 &= ~MF2_DONTDRAW; @@ -12327,7 +12297,7 @@ void P_PlayerThink(player_t *player) } #undef dashmode - LUAh_PlayerThink(player); + LUA_HookPlayer(player, HOOK(PlayerThink)); /* // Colormap verification @@ -12380,7 +12350,10 @@ static boolean P_MobjAboveLava(mobj_t *mobj) for (rover = sector->ffloors; rover; rover = rover->next) { - if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_SWIMMABLE) || GETSECSPECIAL(rover->master->frontsector->special, 1) != 3) + if (!(rover->fofflags & FOF_EXISTS) || !(rover->fofflags & FOF_SWIMMABLE)) + continue; + + if (rover->master->frontsector->damagetype != SD_FIRE && rover->master->frontsector->damagetype != SD_LAVA) continue; if (mobj->eflags & MFE_VERTICALFLIP) @@ -12611,7 +12584,7 @@ void P_PlayerAfterThink(player_t *player) player->mo->momz = tails->momz; } - if (G_CoopGametype() && tails->player && tails->player->bot != 1) + if (G_CoopGametype() && tails->player && tails->player->bot != BOT_2PAI) { player->mo->angle = tails->angle; @@ -12685,7 +12658,7 @@ void P_PlayerAfterThink(player_t *player) player->mo->momx = (chain->x - player->mo->x)*2; player->mo->momy = (chain->y - player->mo->y)*2; player->mo->momz = (chain->z - (player->mo->height-chain->height/2) - player->mo->z)*2; - P_TeleportMove(player->mo, chain->x, chain->y, chain->z - (player->mo->height-chain->height/2)); + P_MoveOrigin(player->mo, chain->x, chain->y, chain->z - (player->mo->height-chain->height/2)); if (!player->powers[pw_flashing]) // handle getting hurt { player->pflags |= PF_JUMPED; @@ -12718,6 +12691,29 @@ void P_PlayerAfterThink(player_t *player) break; } + case CR_FAN: + { + fixed_t zdist; + mobj_t *mo = player->mo, *fan = player->mo->tracer; + + if (!(player->pflags & PF_JUMPSTASIS)) + player->pflags |= PF_JUMPSTASIS; + + if (fan->eflags & MFE_VERTICALFLIP) + zdist = (mo->z + mo->height) - (fan->z + fan->height); + else + zdist = mo->z - fan->z; + + if ((fan->type != MT_FAN && !P_PlayerTouchingSectorSpecialFlag(player, SSF_FAN)) + || (fan->type == MT_FAN && (abs(mo->x - fan->x) > fan->radius || abs(mo->y - fan->y) > fan->radius || zdist > (fan->health << FRACBITS)))) + { + P_SetTarget(&player->mo->tracer, NULL); + player->pflags &= ~PF_JUMPSTASIS; + player->powers[pw_carry] = CR_NONE; + break; + } + break; + } case CR_ROLLOUT: { mobj_t *mo = player->mo, *rock = player->mo->tracer; @@ -12756,11 +12752,14 @@ void P_PlayerAfterThink(player_t *player) mo->tics = walktics; } - P_TeleportMove(player->mo, rock->x, rock->y, rock->z + ((mo->eflags & MFE_VERTICALFLIP) ? -mo->height : rock->height)); + P_MoveOrigin(player->mo, rock->x, rock->y, rock->z + ((mo->eflags & MFE_VERTICALFLIP) ? -mo->height : rock->height)); break; } case CR_PTERABYTE: // being carried by a Pterabyte { + +#define DROPTHRESHOLD TICRATE + mobj_t *ptera = player->mo->tracer; mobj_t *spawnpoint = ptera->tracer->tracer; player->mo->height = FixedDiv(P_GetPlayerHeight(player), FixedDiv(14 * FRACUNIT, 10 * FRACUNIT)); @@ -12768,7 +12767,7 @@ void P_PlayerAfterThink(player_t *player) if (ptera->health <= 0) goto dropoff; - if (P_MobjAboveLava(ptera) && ptera->movefactor <= 3*TICRATE - 10) + if (P_MobjAboveLava(ptera) && ptera->movefactor < DROPTHRESHOLD) goto dropoff; if (player->mo->eflags & MFE_VERTICALFLIP) @@ -12777,7 +12776,7 @@ void P_PlayerAfterThink(player_t *player) && (ptera->eflags & MFE_VERTICALFLIP)) // Reverse gravity check for the carrier - Flame player->mo->z = ptera->z + ptera->height + FixedMul(FRACUNIT, player->mo->scale); - if (ptera->ceilingz - ptera->z > spawnpoint->ceilingz - spawnpoint->z + 512*FRACUNIT && ptera->movefactor <= 3 * TICRATE - 10) + if (ptera->ceilingz - ptera->z > spawnpoint->ceilingz - spawnpoint->z + 512*FRACUNIT && ptera->movefactor < DROPTHRESHOLD) goto dropoff; } else @@ -12786,7 +12785,7 @@ void P_PlayerAfterThink(player_t *player) && !(ptera->eflags & MFE_VERTICALFLIP)) // Correct gravity check for the carrier - Flame player->mo->z = ptera->z - player->mo->height - FixedMul(FRACUNIT, player->mo->scale); - if (ptera->z - ptera->floorz > spawnpoint->z - spawnpoint->floorz + 512 * FRACUNIT && ptera->movefactor <= 3 * TICRATE - 10) + if (ptera->z - ptera->floorz > spawnpoint->z - spawnpoint->floorz + 512 * FRACUNIT && ptera->movefactor < DROPTHRESHOLD) goto dropoff; } @@ -12794,14 +12793,14 @@ void P_PlayerAfterThink(player_t *player) if (!ptera->movefactor) goto dropoff; - if (ptera->cusval >= 50) + if (ptera->cusval >= 50) // breaking free { player->powers[pw_carry] = CR_NONE; P_SetTarget(&player->mo->tracer, NULL); P_KillMobj(ptera, player->mo, player->mo, 0); - player->mo->momz = 9*FRACUNIT; + P_SetObjectMomZ(player->mo, 12*FRACUNIT, false); player->pflags |= PF_APPLYAUTOBRAKE|PF_JUMPED|PF_THOKKED; - P_SetMobjState(player->mo, S_PLAY_ROLL); + P_SetPlayerMobjState(player->mo, S_PLAY_ROLL); break; } @@ -12896,7 +12895,7 @@ void P_PlayerAfterThink(player_t *player) if (player->followmobj) { - if (LUAh_FollowMobj(player, player->followmobj) || P_MobjWasRemoved(player->followmobj)) + if (LUA_HookFollowMobj(player, player->followmobj) || P_MobjWasRemoved(player->followmobj)) {;} else { @@ -12917,6 +12916,8 @@ void P_PlayerAfterThink(player_t *player) } } } + + P_DoPlayerHeadSigns(player); // Spawn Tag/CTF signs over player's head } void P_SetPlayerAngle(player_t *player, angle_t angle) @@ -12975,7 +12976,7 @@ boolean P_PlayerFullbright(player_t *player) // returns true if the player can enter a sector that they could not if standing at their skin's full height boolean P_PlayerCanEnterSpinGaps(player_t *player) { - UINT8 canEnter = LUAh_PlayerCanEnterSpinGaps(player); + UINT8 canEnter = LUA_HookPlayerCanEnterSpinGaps(player); if (canEnter == 1) return true; else if (canEnter == 2) diff --git a/src/r_bsp.c b/src/r_bsp.c index 0c45609e2..fb84e5d08 100644 --- a/src/r_bsp.c +++ b/src/r_bsp.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -243,11 +243,11 @@ sector_t *R_FakeFlat(sector_t *sec, sector_t *tempsec, INT32 *floorlightlevel, { if (floorlightlevel) *floorlightlevel = sec->floorlightsec == -1 ? - sec->lightlevel : sectors[sec->floorlightsec].lightlevel; + (sec->floorlightabsolute ? sec->floorlightlevel : max(0, min(255, sec->lightlevel + sec->floorlightlevel))) : sectors[sec->floorlightsec].lightlevel; if (ceilinglightlevel) *ceilinglightlevel = sec->ceilinglightsec == -1 ? - sec->lightlevel : sectors[sec->ceilinglightsec].lightlevel; + (sec->ceilinglightabsolute ? sec->ceilinglightlevel : max(0, min(255, sec->lightlevel + sec->ceilinglightlevel))) : sectors[sec->ceilinglightsec].lightlevel; // if (sec->midmap != -1) // mapnum = sec->midmap; @@ -306,11 +306,11 @@ sector_t *R_FakeFlat(sector_t *sec, sector_t *tempsec, INT32 *floorlightlevel, tempsec->lightlevel = s->lightlevel; if (floorlightlevel) - *floorlightlevel = s->floorlightsec == -1 ? s->lightlevel + *floorlightlevel = s->floorlightsec == -1 ? (s->floorlightabsolute ? s->floorlightlevel : max(0, min(255, s->lightlevel + s->floorlightlevel))) : sectors[s->floorlightsec].lightlevel; if (ceilinglightlevel) - *ceilinglightlevel = s->ceilinglightsec == -1 ? s->lightlevel + *ceilinglightlevel = s->ceilinglightsec == -1 ? (s->ceilinglightabsolute ? s->ceilinglightlevel : max(0, min(255, s->lightlevel + s->ceilinglightlevel))) : sectors[s->ceilinglightsec].lightlevel; } else if (heightsec != -1 && viewz >= sectors[heightsec].ceilingheight @@ -344,12 +344,12 @@ sector_t *R_FakeFlat(sector_t *sec, sector_t *tempsec, INT32 *floorlightlevel, tempsec->lightlevel = s->lightlevel; if (floorlightlevel) - *floorlightlevel = s->floorlightsec == -1 ? s->lightlevel : - sectors[s->floorlightsec].lightlevel; + *floorlightlevel = s->floorlightsec == -1 ? (s->floorlightabsolute ? s->floorlightlevel : max(0, min(255, s->lightlevel + s->floorlightlevel))) + : sectors[s->floorlightsec].lightlevel; if (ceilinglightlevel) - *ceilinglightlevel = s->ceilinglightsec == -1 ? s->lightlevel : - sectors[s->ceilinglightsec].lightlevel; + *ceilinglightlevel = s->ceilinglightsec == -1 ? (s->ceilinglightabsolute ? s->ceilinglightlevel : max(0, min(255, s->lightlevel + s->ceilinglightlevel))) + : sectors[s->ceilinglightsec].lightlevel; } sec = tempsec; } @@ -375,6 +375,10 @@ boolean R_IsEmptyLine(seg_t *line, sector_t *front, sector_t *back) && back->ceiling_yoffs == front->ceiling_yoffs && back->ceilingpic_angle == front->ceilingpic_angle // Consider altered lighting. + && back->floorlightlevel == front->floorlightlevel + && back->floorlightabsolute == front->floorlightabsolute + && back->ceilinglightlevel == front->ceilinglightlevel + && back->ceilinglightabsolute == front->ceilinglightabsolute && back->floorlightsec == front->floorlightsec && back->ceilinglightsec == front->ceilinglightsec // Consider colormaps @@ -389,19 +393,17 @@ boolean R_IsEmptyLine(seg_t *line, sector_t *front, sector_t *back) // static void R_AddLine(seg_t *line) { - INT32 x1, x2; - angle_t angle1, angle2, span, tspan; static sector_t tempsec; boolean bothceilingssky = false, bothfloorssky = false; - angle1 = R_PointToAngleEx(viewx, viewy, line->v1->x, line->v1->y); - angle2 = R_PointToAngleEx(viewx, viewy, line->v2->x, line->v2->y); + angle_t angle1 = R_PointToAngle64(line->v1->x, line->v1->y); + angle_t angle2 = R_PointToAngle64(line->v2->x, line->v2->y); curline = line; portalline = false; // Clip to view edges. - span = angle1 - angle2; + angle_t span = angle1 - angle2; // Back side? i.e. backface culling? if (span >= ANGLE_180) @@ -412,7 +414,7 @@ static void R_AddLine(seg_t *line) angle1 -= viewangle; angle2 -= viewangle; - tspan = angle1 + clipangle; + angle_t tspan = angle1 + clipangle; if (tspan > doubleclipangle) { tspan -= doubleclipangle; @@ -438,8 +440,9 @@ static void R_AddLine(seg_t *line) // The seg is in the view range, but not necessarily visible. angle1 = (angle1+ANGLE_90)>>ANGLETOFINESHIFT; angle2 = (angle2+ANGLE_90)>>ANGLETOFINESHIFT; - x1 = viewangletox[angle1]; - x2 = viewangletox[angle2]; + + INT32 x1 = viewangletox[angle1]; + INT32 x2 = viewangletox[angle2]; // Does not cross a pixel? if (x1 >= x2) // killough 1/31/98 -- change == to >= for robustness @@ -617,8 +620,8 @@ static boolean R_CheckBBox(const fixed_t *bspcoord) check = checkcoord[boxpos]; // big room fix - angle1 = R_PointToAngleEx(viewx, viewy, bspcoord[check[0]], bspcoord[check[1]]) - viewangle; - angle2 = R_PointToAngleEx(viewx, viewy, bspcoord[check[2]], bspcoord[check[3]]) - viewangle; + angle1 = R_PointToAngle64(bspcoord[check[0]], bspcoord[check[1]]) - viewangle; + angle2 = R_PointToAngle64(bspcoord[check[2]], bspcoord[check[3]]) - viewangle; if ((signed)angle1 < (signed)angle2) { @@ -670,7 +673,7 @@ void R_BuildPolyBSP(subsector_t *sub) for (pn = sub->polynodes; pn != NULL; pn = pn->pnext) { NodeBuilder_AddPolySegs(pn); - ps_numpolyobjects++; // for render stats + ps_numpolyobjects.value.i++; // for render stats } NodeBuilder_BuildMini(); @@ -798,6 +801,7 @@ void R_Subsector(size_t num) extracolormap_t *floorcolormap; extracolormap_t *ceilingcolormap; fixed_t floorcenterz, ceilingcenterz; + ffloor_t *rover; if (minibsp) { @@ -850,7 +854,23 @@ void R_Subsector(size_t num) // Check and prep all 3D floors. Set the sector floor/ceiling light levels and colormaps. if (frontsector->ffloors) { - if (frontsector->moved) + boolean anyMoved = frontsector->moved; + + if (anyMoved == false) + { + for (rover = frontsector->ffloors; rover; rover = rover->next) + { + sector_t *controlSec = §ors[rover->secnum]; + + if (controlSec->moved == true) + { + anyMoved = true; + break; + } + } + } + + if (anyMoved == true) { frontsector->numlights = sub->sector->numlights = 0; R_Prep3DFloors(frontsector); @@ -860,12 +880,12 @@ void R_Subsector(size_t num) } light = R_GetPlaneLight(frontsector, floorcenterz, false); - if (frontsector->floorlightsec == -1) - floorlightlevel = *frontsector->lightlist[light].lightlevel; + if (frontsector->floorlightsec == -1 && !frontsector->floorlightabsolute) + floorlightlevel = max(0, min(255, *frontsector->lightlist[light].lightlevel + frontsector->floorlightlevel)); floorcolormap = *frontsector->lightlist[light].extra_colormap; light = R_GetPlaneLight(frontsector, ceilingcenterz, false); - if (frontsector->ceilinglightsec == -1) - ceilinglightlevel = *frontsector->lightlist[light].lightlevel; + if (frontsector->ceilinglightsec == -1 && !frontsector->ceilinglightabsolute) + ceilinglightlevel = max(0, min(255, *frontsector->lightlist[light].lightlevel + frontsector->ceilinglightlevel)); ceilingcolormap = *frontsector->lightlist[light].extra_colormap; } @@ -898,12 +918,11 @@ void R_Subsector(size_t num) ffloor[numffloors].polyobj = NULL; if (frontsector->ffloors) { - ffloor_t *rover; fixed_t heightcheck, planecenterz; for (rover = frontsector->ffloors; rover && numffloors < MAXFFLOORS; rover = rover->next) { - if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERPLANES)) + if (!(rover->fofflags & FOF_EXISTS) || !(rover->fofflags & FOF_RENDERPLANES)) continue; if (frontsector->cullheight) @@ -923,8 +942,8 @@ void R_Subsector(size_t num) planecenterz = P_GetFFloorBottomZAt(rover, frontsector->soundorg.x, frontsector->soundorg.y); if (planecenterz <= ceilingcenterz && planecenterz >= floorcenterz - && ((viewz < heightcheck && (rover->flags & FF_BOTHPLANES || !(rover->flags & FF_INVERTPLANES))) - || (viewz > heightcheck && (rover->flags & FF_BOTHPLANES || rover->flags & FF_INVERTPLANES)))) + && ((viewz < heightcheck && (rover->fofflags & FOF_BOTHPLANES || !(rover->fofflags & FOF_INVERTPLANES))) + || (viewz > heightcheck && (rover->fofflags & FOF_BOTHPLANES || rover->fofflags & FOF_INVERTPLANES)))) { light = R_GetPlaneLight(frontsector, planecenterz, viewz < heightcheck); @@ -953,8 +972,8 @@ void R_Subsector(size_t num) planecenterz = P_GetFFloorTopZAt(rover, frontsector->soundorg.x, frontsector->soundorg.y); if (planecenterz >= floorcenterz && planecenterz <= ceilingcenterz - && ((viewz > heightcheck && (rover->flags & FF_BOTHPLANES || !(rover->flags & FF_INVERTPLANES))) - || (viewz < heightcheck && (rover->flags & FF_BOTHPLANES || rover->flags & FF_INVERTPLANES)))) + && ((viewz > heightcheck && (rover->fofflags & FOF_BOTHPLANES || !(rover->fofflags & FOF_INVERTPLANES))) + || (viewz < heightcheck && (rover->fofflags & FOF_BOTHPLANES || rover->fofflags & FOF_INVERTPLANES)))) { light = R_GetPlaneLight(frontsector, planecenterz, viewz < heightcheck); @@ -1081,11 +1100,11 @@ void R_Prep3DFloors(sector_t *sector) count = 1; for (rover = sector->ffloors; rover; rover = rover->next) { - if ((rover->flags & FF_EXISTS) && (!(rover->flags & FF_NOSHADE) - || (rover->flags & FF_CUTLEVEL) || (rover->flags & FF_CUTSPRITES))) + if ((rover->fofflags & FOF_EXISTS) && (!(rover->fofflags & FOF_NOSHADE) + || (rover->fofflags & FOF_CUTLEVEL) || (rover->fofflags & FOF_CUTSPRITES))) { count++; - if (rover->flags & FF_DOUBLESHADOW) + if (rover->fofflags & FOF_DOUBLESHADOW) count++; } } @@ -1116,8 +1135,8 @@ void R_Prep3DFloors(sector_t *sector) for (rover = sector->ffloors; rover; rover = rover->next) { rover->lastlight = 0; - if (!(rover->flags & FF_EXISTS) || (rover->flags & FF_NOSHADE - && !(rover->flags & FF_CUTLEVEL) && !(rover->flags & FF_CUTSPRITES))) + if (!(rover->fofflags & FOF_EXISTS) || (rover->fofflags & FOF_NOSHADE + && !(rover->fofflags & FOF_CUTLEVEL) && !(rover->fofflags & FOF_CUTSPRITES))) continue; heighttest = P_GetFFloorTopZAt(rover, sector->soundorg.x, sector->soundorg.y); @@ -1129,7 +1148,7 @@ void R_Prep3DFloors(sector_t *sector) bestslope = *rover->t_slope; continue; } - if (rover->flags & FF_DOUBLESHADOW) { + if (rover->fofflags & FOF_DOUBLESHADOW) { heighttest = P_GetFFloorBottomZAt(rover, sector->soundorg.x, sector->soundorg.y); if (heighttest > bestheight @@ -1150,16 +1169,16 @@ void R_Prep3DFloors(sector_t *sector) sector->lightlist[i].height = maxheight = bestheight; sector->lightlist[i].caster = best; - sector->lightlist[i].flags = best->flags; + sector->lightlist[i].flags = best->fofflags; sector->lightlist[i].slope = bestslope; sec = §ors[best->secnum]; - if (best->flags & FF_NOSHADE) + if (best->fofflags & FOF_NOSHADE) { sector->lightlist[i].lightlevel = sector->lightlist[i-1].lightlevel; sector->lightlist[i].extra_colormap = sector->lightlist[i-1].extra_colormap; } - else if (best->flags & FF_COLORMAPONLY) + else if (best->fofflags & FOF_COLORMAPONLY) { sector->lightlist[i].lightlevel = sector->lightlist[i-1].lightlevel; sector->lightlist[i].extra_colormap = &sec->extra_colormap; @@ -1170,7 +1189,7 @@ void R_Prep3DFloors(sector_t *sector) sector->lightlist[i].extra_colormap = &sec->extra_colormap; } - if (best->flags & FF_DOUBLESHADOW) + if (best->fofflags & FOF_DOUBLESHADOW) { heighttest = P_GetFFloorBottomZAt(best, sector->soundorg.x, sector->soundorg.y); if (bestheight == heighttest) ///TODO: do this in a more efficient way -Red @@ -1218,7 +1237,7 @@ void R_RenderBSPNode(INT32 bspnum) node_t *bsp; INT32 side; - ps_numbspcalls++; + ps_numbspcalls.value.i++; while (!(bspnum & NF_SUBSECTOR)) // Found a subsector? { @@ -1253,7 +1272,7 @@ void R_RenderMiniBSPNode(INT32 bspnum) node_t *bsp; INT32 side; - ps_numbspcalls++; + ps_numbspcalls.value.i++; while (!(bspnum & NF_SUBSECTOR)) // Found a subsector? { diff --git a/src/r_bsp.h b/src/r_bsp.h index 245c93dca..769bcf9ca 100644 --- a/src/r_bsp.h +++ b/src/r_bsp.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/r_data.c b/src/r_data.c index 2cfe9cb7a..4b7492f90 100644 --- a/src/r_data.c +++ b/src/r_data.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/r_data.h b/src/r_data.h index 571fdc54f..ef5c967e5 100644 --- a/src/r_data.h +++ b/src/r_data.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -30,9 +30,6 @@ typedef struct size_t numlumps; } lumplist_t; -// Possible alpha types for a patch. -enum patchalphastyle {AST_COPY, AST_TRANSLUCENT, AST_ADD, AST_SUBTRACT, AST_REVERSESUBTRACT, AST_MODULATE, AST_OVERLAY}; - UINT32 ASTBlendPixel(RGBA_t background, RGBA_t foreground, int style, UINT8 alpha); UINT32 ASTBlendTexturePixel(RGBA_t background, RGBA_t foreground, int style, UINT8 alpha); UINT8 ASTBlendPaletteIndexes(UINT8 background, UINT8 foreground, int style, UINT8 alpha); diff --git a/src/r_defs.h b/src/r_defs.h index 8ebcb89f5..ae8e4d7fc 100644 --- a/src/r_defs.h +++ b/src/r_defs.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -115,45 +115,99 @@ typedef struct */ typedef enum { - FF_EXISTS = 0x1, ///< Always set, to check for validity. - FF_BLOCKPLAYER = 0x2, ///< Solid to player, but nothing else - FF_BLOCKOTHERS = 0x4, ///< Solid to everything but player - FF_SOLID = 0x6, ///< Clips things. - FF_RENDERSIDES = 0x8, ///< Renders the sides. - FF_RENDERPLANES = 0x10, ///< Renders the floor/ceiling. - FF_RENDERALL = 0x18, ///< Renders everything. - FF_SWIMMABLE = 0x20, ///< Is a water block. - FF_NOSHADE = 0x40, ///< Messes with the lighting? - FF_CUTSOLIDS = 0x80, ///< Cuts out hidden solid pixels. - FF_CUTEXTRA = 0x100, ///< Cuts out hidden translucent pixels. - FF_CUTLEVEL = 0x180, ///< Cuts out all hidden pixels. - FF_CUTSPRITES = 0x200, ///< Final step in making 3D water. - FF_BOTHPLANES = 0x400, ///< Render inside and outside planes. - FF_EXTRA = 0x800, ///< Gets cut by ::FF_CUTEXTRA. - FF_TRANSLUCENT = 0x1000, ///< See through! - FF_FOG = 0x2000, ///< Fog "brush." - FF_INVERTPLANES = 0x4000, ///< Only render inside planes. - FF_ALLSIDES = 0x8000, ///< Render inside and outside sides. - FF_INVERTSIDES = 0x10000, ///< Only render inside sides. - FF_DOUBLESHADOW = 0x20000, ///< Make two lightlist entries to reset light? - FF_FLOATBOB = 0x40000, ///< Floats on water and bobs if you step on it. - FF_NORETURN = 0x80000, ///< Used with ::FF_CRUMBLE. Will not return to its original position after falling. - FF_CRUMBLE = 0x100000, ///< Falls 2 seconds after being stepped on, and randomly brings all touching crumbling 3dfloors down with it, providing their master sectors share the same tag (allows crumble platforms above or below, to also exist). - FF_SHATTERBOTTOM = 0x200000, ///< Used with ::FF_BUSTUP. Like FF_SHATTER, but only breaks from the bottom. Good for springing up through rubble. - FF_MARIO = 0x400000, ///< Acts like a question block when hit from underneath. Goodie spawned at top is determined by master sector. - FF_BUSTUP = 0x800000, ///< You can spin through/punch this block and it will crumble! - FF_QUICKSAND = 0x1000000, ///< Quicksand! - FF_PLATFORM = 0x2000000, ///< You can jump up through this to the top. - FF_REVERSEPLATFORM = 0x4000000, ///< A fall-through floor in normal gravity, a platform in reverse gravity. - FF_INTANGIBLEFLATS = 0x6000000, ///< Both flats are intangible, but the sides are still solid. - FF_SHATTER = 0x8000000, ///< Used with ::FF_BUSTUP. Bustable on mere touch. - FF_SPINBUST = 0x10000000, ///< Used with ::FF_BUSTUP. Also bustable if you're in your spinning frames. - FF_STRONGBUST = 0x20000000, ///< Used with ::FF_BUSTUP. Only bustable by "strong" characters (Knuckles) and abilities (bouncing, twinspin, melee). - FF_RIPPLE = 0x40000000, ///< Ripple the flats - FF_COLORMAPONLY = 0x80000000, ///< Only copy the colormap, not the lightlevel - FF_GOOWATER = FF_SHATTERBOTTOM, ///< Used with ::FF_SWIMMABLE. Makes thick bouncey goop. + FOF_EXISTS = 0x1, ///< Always set, to check for validity. + FOF_BLOCKPLAYER = 0x2, ///< Solid to player, but nothing else + FOF_BLOCKOTHERS = 0x4, ///< Solid to everything but player + FOF_SOLID = 0x6, ///< Clips things. + FOF_RENDERSIDES = 0x8, ///< Renders the sides. + FOF_RENDERPLANES = 0x10, ///< Renders the floor/ceiling. + FOF_RENDERALL = 0x18, ///< Renders everything. + FOF_SWIMMABLE = 0x20, ///< Is a water block. + FOF_NOSHADE = 0x40, ///< Messes with the lighting? + FOF_CUTSOLIDS = 0x80, ///< Cuts out hidden solid pixels. + FOF_CUTEXTRA = 0x100, ///< Cuts out hidden translucent pixels. + FOF_CUTLEVEL = 0x180, ///< Cuts out all hidden pixels. + FOF_CUTSPRITES = 0x200, ///< Final step in making 3D water. + FOF_BOTHPLANES = 0x400, ///< Render inside and outside planes. + FOF_EXTRA = 0x800, ///< Gets cut by ::FOF_CUTEXTRA. + FOF_TRANSLUCENT = 0x1000, ///< See through! + FOF_FOG = 0x2000, ///< Fog "brush." + FOF_INVERTPLANES = 0x4000, ///< Only render inside planes. + FOF_ALLSIDES = 0x8000, ///< Render inside and outside sides. + FOF_INVERTSIDES = 0x10000, ///< Only render inside sides. + FOF_DOUBLESHADOW = 0x20000, ///< Make two lightlist entries to reset light? + FOF_FLOATBOB = 0x40000, ///< Floats on water and bobs if you step on it. + FOF_NORETURN = 0x80000, ///< Used with ::FOF_CRUMBLE. Will not return to its original position after falling. + FOF_CRUMBLE = 0x100000, ///< Falls 2 seconds after being stepped on, and randomly brings all touching crumbling 3dfloors down with it, providing their master sectors share the same tag (allows crumble platforms above or below, to also exist). + FOF_GOOWATER = 0x200000, ///< Used with ::FOF_SWIMMABLE. Makes thick bouncey goop. + FOF_MARIO = 0x400000, ///< Acts like a question block when hit from underneath. Goodie spawned at top is determined by master sector. + FOF_BUSTUP = 0x800000, ///< You can spin through/punch this block and it will crumble! + FOF_QUICKSAND = 0x1000000, ///< Quicksand! + FOF_PLATFORM = 0x2000000, ///< You can jump up through this to the top. + FOF_REVERSEPLATFORM = 0x4000000, ///< A fall-through floor in normal gravity, a platform in reverse gravity. + FOF_INTANGIBLEFLATS = 0x6000000, ///< Both flats are intangible, but the sides are still solid. + FOF_RIPPLE = 0x8000000, ///< Ripple the flats + FOF_COLORMAPONLY = 0x10000000, ///< Only copy the colormap, not the lightlevel + FOF_BOUNCY = 0x20000000, ///< Bounces players + FOF_SPLAT = 0x40000000, ///< Use splat flat renderer (treat cyan pixels as invisible) } ffloortype_e; +typedef enum +{ + FF_OLD_EXISTS = 0x1, + FF_OLD_BLOCKPLAYER = 0x2, + FF_OLD_BLOCKOTHERS = 0x4, + FF_OLD_SOLID = 0x6, + FF_OLD_RENDERSIDES = 0x8, + FF_OLD_RENDERPLANES = 0x10, + FF_OLD_RENDERALL = 0x18, + FF_OLD_SWIMMABLE = 0x20, + FF_OLD_NOSHADE = 0x40, + FF_OLD_CUTSOLIDS = 0x80, + FF_OLD_CUTEXTRA = 0x100, + FF_OLD_CUTLEVEL = 0x180, + FF_OLD_CUTSPRITES = 0x200, + FF_OLD_BOTHPLANES = 0x400, + FF_OLD_EXTRA = 0x800, + FF_OLD_TRANSLUCENT = 0x1000, + FF_OLD_FOG = 0x2000, + FF_OLD_INVERTPLANES = 0x4000, + FF_OLD_ALLSIDES = 0x8000, + FF_OLD_INVERTSIDES = 0x10000, + FF_OLD_DOUBLESHADOW = 0x20000, + FF_OLD_FLOATBOB = 0x40000, + FF_OLD_NORETURN = 0x80000, + FF_OLD_CRUMBLE = 0x100000, + FF_OLD_SHATTERBOTTOM = 0x200000, + FF_OLD_GOOWATER = 0x200000, + FF_OLD_MARIO = 0x400000, + FF_OLD_BUSTUP = 0x800000, + FF_OLD_QUICKSAND = 0x1000000, + FF_OLD_PLATFORM = 0x2000000, + FF_OLD_REVERSEPLATFORM = 0x4000000, + FF_OLD_INTANGIBLEFLATS = 0x6000000, + FF_OLD_SHATTER = 0x8000000, + FF_OLD_SPINBUST = 0x10000000, + FF_OLD_STRONGBUST = 0x20000000, + FF_OLD_RIPPLE = 0x40000000, + FF_OLD_COLORMAPONLY = 0x80000000, +} oldffloortype_e; + +typedef enum +{ + FB_PUSHABLES = 0x1, // Bustable by pushables + FB_EXECUTOR = 0x2, // Trigger linedef executor + FB_ONLYBOTTOM = 0x4, // Only bustable from below +} ffloorbustflags_e; + +typedef enum +{ + BT_TOUCH, + BT_SPINBUST, + BT_REGULAR, + BT_STRONG, +} busttype_e; + typedef struct ffloor_s { fixed_t *topheight; @@ -174,7 +228,7 @@ typedef struct ffloor_s struct pslope_s **b_slope; size_t secnum; - ffloortype_e flags; + ffloortype_e fofflags; struct line_s *master; struct sector_s *target; @@ -184,8 +238,21 @@ typedef struct ffloor_s INT32 lastlight; INT32 alpha; + UINT8 blend; // blendmode tic_t norender; // for culling + // Only relevant for FOF_BUSTUP + ffloorbustflags_e bustflags; + UINT8 busttype; + INT16 busttag; + + // Only relevant for FOF_QUICKSAND + fixed_t sinkspeed; + fixed_t friction; + + // Only relevant for FOF_BOUNCY + fixed_t bouncestrength; + // these are saved for netgames, so do not let Lua touch these! ffloortype_e spawnflags; // flags the 3D floor spawned with INT32 spawnalpha; // alpha the 3D floor spawned with @@ -204,7 +271,7 @@ typedef struct lightlist_s extracolormap_t **extra_colormap; // pointer-to-a-pointer, so we can react to colormap changes INT32 flags; ffloor_t *caster; - struct pslope_s *slope; // FF_DOUBLESHADOW makes me have to store this pointer here. Bluh bluh. + struct pslope_s *slope; // FOF_DOUBLESHADOW makes me have to store this pointer here. Bluh bluh. } lightlist_t; @@ -251,16 +318,70 @@ typedef struct pslope_s typedef enum { // flipspecial - planes with effect - SF_FLIPSPECIAL_FLOOR = 1, - SF_FLIPSPECIAL_CEILING = 1<<1, - SF_FLIPSPECIAL_BOTH = (SF_FLIPSPECIAL_FLOOR|SF_FLIPSPECIAL_CEILING), + MSF_FLIPSPECIAL_FLOOR = 1, + MSF_FLIPSPECIAL_CEILING = 1<<1, + MSF_FLIPSPECIAL_BOTH = (MSF_FLIPSPECIAL_FLOOR|MSF_FLIPSPECIAL_CEILING), // triggerspecial - conditions under which plane touch causes effect - SF_TRIGGERSPECIAL_TOUCH = 1<<2, - SF_TRIGGERSPECIAL_HEADBUMP = 1<<3, + MSF_TRIGGERSPECIAL_TOUCH = 1<<2, + MSF_TRIGGERSPECIAL_HEADBUMP = 1<<3, + // triggerline - conditions for linedef executor triggering + MSF_TRIGGERLINE_PLANE = 1<<4, // require plane touch + MSF_TRIGGERLINE_MOBJ = 1<<5, // allow non-pushable mobjs to trigger // invertprecip - inverts presence of precipitation - SF_INVERTPRECIP = 1<<4, + MSF_INVERTPRECIP = 1<<6, + MSF_GRAVITYFLIP = 1<<7, + MSF_HEATWAVE = 1<<8, + MSF_NOCLIPCAMERA = 1<<9, } sectorflags_t; +typedef enum +{ + SSF_OUTERSPACE = 1, + SSF_DOUBLESTEPUP = 1<<1, + SSF_NOSTEPDOWN = 1<<2, + SSF_WINDCURRENT = 1<<3, + SSF_CONVEYOR = 1<<4, + SSF_SPEEDPAD = 1<<5, + SSF_STARPOSTACTIVATOR = 1<<6, + SSF_EXIT = 1<<7, + SSF_SPECIALSTAGEPIT = 1<<8, + SSF_RETURNFLAG = 1<<9, + SSF_REDTEAMBASE = 1<<10, + SSF_BLUETEAMBASE = 1<<11, + SSF_FAN = 1<<12, + SSF_SUPERTRANSFORM = 1<<13, + SSF_FORCESPIN = 1<<14, + SSF_ZOOMTUBESTART = 1<<15, + SSF_ZOOMTUBEEND = 1<<16, + SSF_FINISHLINE = 1<<17, + SSF_ROPEHANG = 1<<18, + SSF_JUMPFLIP = 1<<19, + SSF_GRAVITYOVERRIDE = 1<<20, // combine with MSF_GRAVITYFLIP +} sectorspecialflags_t; + +typedef enum +{ + SD_NONE = 0, + SD_GENERIC = 1, + SD_WATER = 2, + SD_FIRE = 3, + SD_LAVA = 4, + SD_ELECTRIC = 5, + SD_SPIKE = 6, + SD_DEATHPITTILT = 7, + SD_DEATHPITNOTILT = 8, + SD_INSTAKILL = 9, + SD_SPECIALSTAGE = 10, +} sectordamage_t; + +typedef enum +{ + TO_PLAYER = 0, + TO_ALLPLAYERS = 1, + TO_MOBJ = 2, + TO_PLAYEREMERALDS = 3, // only for binary backwards compatibility: check player emeralds + TO_PLAYERNIGHTS = 4, // only for binary backwards compatibility: check NiGHTS mare +} triggerobject_t; typedef enum { @@ -312,7 +433,11 @@ typedef struct sector_s INT32 heightsec; // other sector, or -1 if no other sector INT32 camsec; // used for camera clipping - INT32 floorlightsec, ceilinglightsec; + // floor and ceiling lighting + INT16 floorlightlevel, ceilinglightlevel; + boolean floorlightabsolute, ceilinglightabsolute; // absolute or relative to sector's light level? + INT32 floorlightsec, ceilinglightsec; // take floor/ceiling light level from another sector + INT32 crumblestate; // used for crumbling and bobbing // list of mobjs that are at least partially in the sector @@ -336,10 +461,18 @@ typedef struct sector_s extracolormap_t *extra_colormap; boolean colormap_protected; - // This points to the master's floorheight, so it can be changed in realtime! - fixed_t *gravity; // per-sector gravity - boolean verticalflip; // If gravity < 0, then allow flipped physics + fixed_t gravity; // per-sector gravity factor + fixed_t *gravityptr; // For binary format: Read gravity from floor height of master sector + sectorflags_t flags; + sectorspecialflags_t specialflags; + UINT8 damagetype; + + // Linedef executor triggering + mtag_t triggertag; // tag to call upon triggering + UINT8 triggerer; // who can trigger? + + fixed_t friction; // Sprite culling feature struct line_s *cullheight; @@ -376,7 +509,7 @@ typedef enum #define HORIZONSPECIAL 41 -#define NUMLINEARGS 6 +#define NUMLINEARGS 10 #define NUMLINESTRINGARGS 2 typedef struct line_s @@ -386,6 +519,7 @@ typedef struct line_s vertex_t *v2; fixed_t dx, dy; // Precalculated v2 - v1 for side checking. + angle_t angle; // Precalculated angle between dx and dy // Animation related. INT16 flags; @@ -397,6 +531,7 @@ typedef struct line_s // Visual appearance: sidedefs. UINT16 sidenum[2]; // sidenum[1] will be 0xffff if one-sided fixed_t alpha; // translucency + UINT8 blendmode; // blendmode INT32 executordelay; fixed_t bbox[4]; // bounding box for the extent of the linedef @@ -454,7 +589,7 @@ typedef struct subsector_s { sector_t *sector; INT16 numlines; - UINT16 firstline; + UINT32 firstline; size_t validcount; struct polyobj_s *polyList; // haleyjd 02/19/06: list of polyobjects @@ -735,6 +870,9 @@ typedef struct #pragma pack() #endif +// Possible alpha types for a patch. +enum patchalphastyle {AST_COPY, AST_TRANSLUCENT, AST_ADD, AST_SUBTRACT, AST_REVERSESUBTRACT, AST_MODULATE, AST_OVERLAY, AST_FOG}; + typedef enum { RF_HORIZONTALFLIP = 0x0001, // Flip sprite horizontally @@ -748,17 +886,19 @@ typedef enum RF_NOSPLATBILLBOARD = 0x0040, // Don't billboard floor sprites (faces forward from the view angle) RF_NOSPLATROLLANGLE = 0x0080, // Don't rotate floor sprites by the object's rollangle (uses rotated patches instead) - RF_BLENDMASK = 0x0F00, // --Blending modes - RF_FULLBRIGHT = 0x0100, // Sprite is drawn at full brightness - RF_FULLDARK = 0x0200, // Sprite is drawn completely dark - RF_NOCOLORMAPS = 0x0400, // Sprite is not drawn with colormaps + RF_BRIGHTMASK = 0x00000300, // --Bright modes + RF_FULLBRIGHT = 0x00000100, // Sprite is drawn at full brightness + RF_FULLDARK = 0x00000200, // Sprite is drawn completely dark + RF_SEMIBRIGHT = (RF_FULLBRIGHT | RF_FULLDARK), // between sector bright and full bright - RF_SPRITETYPEMASK = 0x7000, // ---Different sprite types - RF_PAPERSPRITE = 0x1000, // Paper sprite - RF_FLOORSPRITE = 0x2000, // Floor sprite + RF_NOCOLORMAPS = 0x00000400, // Sprite is not drawn with colormaps - RF_SHADOWDRAW = 0x10000, // Stretches and skews the sprite like a shadow. - RF_SHADOWEFFECTS = 0x20000, // Scales and becomes transparent like a shadow. + RF_SPRITETYPEMASK = 0x00003000, // --Different sprite types + RF_PAPERSPRITE = 0x00001000, // Paper sprite + RF_FLOORSPRITE = 0x00002000, // Floor sprite + + RF_SHADOWDRAW = 0x00004000, // Stretches and skews the sprite like a shadow. + RF_SHADOWEFFECTS = 0x00008000, // Scales and becomes transparent like a shadow. RF_DROPSHADOW = (RF_SHADOWDRAW | RF_SHADOWEFFECTS | RF_FULLDARK), } renderflags_t; diff --git a/src/r_draw.c b/src/r_draw.c index f0a19a462..b0467e4f7 100644 --- a/src/r_draw.c +++ b/src/r_draw.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -106,7 +106,7 @@ fixed_t ds_xfrac, ds_yfrac, ds_xstep, ds_ystep; INT32 ds_waterofs, ds_bgofs; UINT16 ds_flatwidth, ds_flatheight; -boolean ds_powersoftwo; +boolean ds_powersoftwo, ds_solidcolor; UINT8 *ds_source; // points to the start of a flat UINT8 *ds_transmap; // one of the translucency tables @@ -248,6 +248,9 @@ static void BlendTab_Subtractive(UINT8 *table, int style, UINT8 blendamt) result.s.green = max(0, result.s.green - blendamt); result.s.blue = max(0, result.s.blue - blendamt); + //probably incorrect, but does look better at lower opacity... + //result.rgba = ASTBlendPixel(result, frontrgba, AST_TRANSLUCENT, blendamt); + table[((bg * 0x100) + fg)] = GetColorLUT(&transtab_lut, result.s.red, result.s.green, result.s.blue); } } @@ -883,6 +886,39 @@ void R_DrawViewBorder(void) } #endif +// R_CalcTiltedLighting +// Exactly what it says on the tin. I wish I wasn't too lazy to explain things properly. +static INT32 tiltlighting[MAXVIDWIDTH]; + +static void R_CalcTiltedLighting(fixed_t start, fixed_t end) +{ + // ZDoom uses a different lighting setup to us, and I couldn't figure out how to adapt their version + // of this function. Here's my own. + INT32 left = ds_x1, right = ds_x2; + fixed_t step = (end-start)/(ds_x2-ds_x1+1); + INT32 i; + + // I wanna do some optimizing by checking for out-of-range segments on either side to fill in all at once, + // but I'm too bad at coding to not crash the game trying to do that. I guess this is fast enough for now... + + for (i = left; i <= right; i++) { + tiltlighting[i] = (start += step) >> FRACBITS; + if (tiltlighting[i] < 0) + tiltlighting[i] = 0; + else if (tiltlighting[i] >= MAXLIGHTSCALE) + tiltlighting[i] = MAXLIGHTSCALE-1; + } +} + +// Lighting is simple. It's just linear interpolation from start to end +#define CALC_SLOPE_LIGHT { \ + float planelightfloat = PLANELIGHTFLOAT; \ + float lightstart, lightend; \ + lightend = (iz + ds_szp->x*width) * planelightfloat; \ + lightstart = iz * planelightfloat; \ + R_CalcTiltedLighting(FloatToFixed(lightstart), FloatToFixed(lightend)); \ +} + // ========================================================================== // INCLUDE 8bpp DRAWING CODE HERE // ========================================================================== diff --git a/src/r_draw.h b/src/r_draw.h index 2173c7a5a..ea03a8e3d 100644 --- a/src/r_draw.h +++ b/src/r_draw.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -61,7 +61,7 @@ extern fixed_t ds_xfrac, ds_yfrac, ds_xstep, ds_ystep; extern INT32 ds_waterofs, ds_bgofs; extern UINT16 ds_flatwidth, ds_flatheight; -extern boolean ds_powersoftwo; +extern boolean ds_powersoftwo, ds_solidcolor; extern UINT8 *ds_source; extern UINT8 *ds_transmap; @@ -170,6 +170,7 @@ void R_DrawViewBorder(void); void R_DrawColumn_8(void); void R_DrawShadeColumn_8(void); void R_DrawTranslucentColumn_8(void); +void R_DrawDropShadowColumn_8(void); void R_DrawTranslatedColumn_8(void); void R_DrawTranslatedTranslucentColumn_8(void); void R_Draw2sMultiPatchColumn_8(void); @@ -193,13 +194,11 @@ void R_DrawTranslucentFloorSprite_8(void); void R_DrawTiltedFloorSprite_8(void); void R_DrawTiltedTranslucentFloorSprite_8(void); -void R_CalcTiltedLighting(fixed_t start, fixed_t end); -extern INT32 tiltlighting[MAXVIDWIDTH]; - -void R_DrawTranslucentWaterSpan_8(void); -void R_DrawTiltedTranslucentWaterSpan_8(void); +void R_DrawWaterSpan_8(void); +void R_DrawTiltedWaterSpan_8(void); void R_DrawFogSpan_8(void); +void R_DrawTiltedFogSpan_8(void); // Lactozilla: Non-powers-of-two void R_DrawSpan_NPO2_8(void); @@ -216,8 +215,15 @@ void R_DrawTranslucentFloorSprite_NPO2_8(void); void R_DrawTiltedFloorSprite_NPO2_8(void); void R_DrawTiltedTranslucentFloorSprite_NPO2_8(void); -void R_DrawTranslucentWaterSpan_NPO2_8(void); -void R_DrawTiltedTranslucentWaterSpan_NPO2_8(void); +void R_DrawWaterSpan_NPO2_8(void); +void R_DrawTiltedWaterSpan_NPO2_8(void); + +void R_DrawSolidColorSpan_8(void); +void R_DrawTransSolidColorSpan_8(void); +void R_DrawTiltedSolidColorSpan_8(void); +void R_DrawTiltedTransSolidColorSpan_8(void); +void R_DrawWaterSolidColorSpan_8(void); +void R_DrawTiltedWaterSolidColorSpan_8(void); #ifdef USEASM void ASMCALL R_DrawColumn_8_ASM(void); diff --git a/src/r_draw16.c b/src/r_draw16.c index 1a2fed773..2ed5a2a8e 100644 --- a/src/r_draw16.c +++ b/src/r_draw16.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/r_draw8.c b/src/r_draw8.c index b8a63d5c0..b80a47984 100644 --- a/src/r_draw8.c +++ b/src/r_draw8.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -416,6 +416,39 @@ void R_DrawTranslucentColumn_8(void) } } +// Hack: A cut-down copy of R_DrawTranslucentColumn_8 that does not read texture +// data since something about calculating the texture reading address for drop shadows is broken. +// dc_texturemid and dc_iscale get wrong values for drop shadows, however those are not strictly +// needed for the current design of the shadows, so this function bypasses the issue +// by not using those variables at all. +void R_DrawDropShadowColumn_8(void) +{ + register INT32 count; + register UINT8 *dest; + + count = dc_yh - dc_yl + 1; + + if (count <= 0) // Zero length, column does not exceed a pixel. + return; + + dest = &topleft[dc_yl*vid.width + dc_x]; + + { +#define DSCOLOR 31 // palette index for the color of the shadow + register const UINT8 *transmap_offset = dc_transmap + (dc_colormap[DSCOLOR] << 8); +#undef DSCOLOR + while ((count -= 2) >= 0) + { + *dest = *(transmap_offset + (*dest)); + dest += vid.width; + *dest = *(transmap_offset + (*dest)); + dest += vid.width; + } + if (count & 1) + *dest = *(transmap_offset + (*dest)); + } +} + /** \brief The R_DrawTranslatedTranslucentColumn_8 function Spiffy function. Not only does it colormap a sprite, but does translucency as well. Uber-kudos to Cyan Helkaraxe @@ -623,29 +656,6 @@ void R_DrawSpan_8 (void) } } -// R_CalcTiltedLighting -// Exactly what it says on the tin. I wish I wasn't too lazy to explain things properly. -INT32 tiltlighting[MAXVIDWIDTH]; -void R_CalcTiltedLighting(fixed_t start, fixed_t end) -{ - // ZDoom uses a different lighting setup to us, and I couldn't figure out how to adapt their version - // of this function. Here's my own. - INT32 left = ds_x1, right = ds_x2; - fixed_t step = (end-start)/(ds_x2-ds_x1+1); - INT32 i; - - // I wanna do some optimizing by checking for out-of-range segments on either side to fill in all at once, - // but I'm too bad at coding to not crash the game trying to do that. I guess this is fast enough for now... - - for (i = left; i <= right; i++) { - tiltlighting[i] = (start += step) >> FRACBITS; - if (tiltlighting[i] < 0) - tiltlighting[i] = 0; - else if (tiltlighting[i] >= MAXLIGHTSCALE) - tiltlighting[i] = MAXLIGHTSCALE-1; - } -} - /** \brief The R_DrawTiltedSpan_8 function Draw slopes! Holy sheit! */ @@ -668,17 +678,7 @@ void R_DrawTiltedSpan_8(void) iz = ds_szp->z + ds_szp->y*(centery-ds_y) + ds_szp->x*(ds_x1-centerx); - // Lighting is simple. It's just linear interpolation from start to end - { - float planelightfloat = PLANELIGHTFLOAT; - float lightstart, lightend; - - lightend = (iz + ds_szp->x*width) * planelightfloat; - lightstart = iz * planelightfloat; - - R_CalcTiltedLighting(FLOAT_TO_FIXED(lightstart), FLOAT_TO_FIXED(lightend)); - //CONS_Printf("tilted lighting %f to %f (foc %f)\n", lightstart, lightend, focallengthf); - } + CALC_SLOPE_LIGHT uz = ds_sup->z + ds_sup->y*(centery-ds_y) + ds_sup->x*(ds_x1-centerx); vz = ds_svp->z + ds_svp->y*(centery-ds_y) + ds_svp->x*(ds_x1-centerx); @@ -801,17 +801,7 @@ void R_DrawTiltedTranslucentSpan_8(void) iz = ds_szp->z + ds_szp->y*(centery-ds_y) + ds_szp->x*(ds_x1-centerx); - // Lighting is simple. It's just linear interpolation from start to end - { - float planelightfloat = PLANELIGHTFLOAT; - float lightstart, lightend; - - lightend = (iz + ds_szp->x*width) * planelightfloat; - lightstart = iz * planelightfloat; - - R_CalcTiltedLighting(FLOAT_TO_FIXED(lightstart), FLOAT_TO_FIXED(lightend)); - //CONS_Printf("tilted lighting %f to %f (foc %f)\n", lightstart, lightend, focallengthf); - } + CALC_SLOPE_LIGHT uz = ds_sup->z + ds_sup->y*(centery-ds_y) + ds_sup->x*(ds_x1-centerx); vz = ds_svp->z + ds_svp->y*(centery-ds_y) + ds_svp->x*(ds_x1-centerx); @@ -911,10 +901,10 @@ void R_DrawTiltedTranslucentSpan_8(void) #endif } -/** \brief The R_DrawTiltedTranslucentWaterSpan_8 function +/** \brief The R_DrawTiltedWaterSpan_8 function Like DrawTiltedTranslucentSpan, but for water */ -void R_DrawTiltedTranslucentWaterSpan_8(void) +void R_DrawTiltedWaterSpan_8(void) { // x1, x2 = ds_x1, ds_x2 int width = ds_x2 - ds_x1; @@ -934,17 +924,7 @@ void R_DrawTiltedTranslucentWaterSpan_8(void) iz = ds_szp->z + ds_szp->y*(centery-ds_y) + ds_szp->x*(ds_x1-centerx); - // Lighting is simple. It's just linear interpolation from start to end - { - float planelightfloat = PLANELIGHTFLOAT; - float lightstart, lightend; - - lightend = (iz + ds_szp->x*width) * planelightfloat; - lightstart = iz * planelightfloat; - - R_CalcTiltedLighting(FLOAT_TO_FIXED(lightstart), FLOAT_TO_FIXED(lightend)); - //CONS_Printf("tilted lighting %f to %f (foc %f)\n", lightstart, lightend, focallengthf); - } + CALC_SLOPE_LIGHT uz = ds_sup->z + ds_sup->y*(centery-ds_y) + ds_sup->x*(ds_x1-centerx); vz = ds_svp->z + ds_svp->y*(centery-ds_y) + ds_svp->x*(ds_x1-centerx); @@ -1066,17 +1046,7 @@ void R_DrawTiltedSplat_8(void) iz = ds_szp->z + ds_szp->y*(centery-ds_y) + ds_szp->x*(ds_x1-centerx); - // Lighting is simple. It's just linear interpolation from start to end - { - float planelightfloat = PLANELIGHTFLOAT; - float lightstart, lightend; - - lightend = (iz + ds_szp->x*width) * planelightfloat; - lightstart = iz * planelightfloat; - - R_CalcTiltedLighting(FLOAT_TO_FIXED(lightstart), FLOAT_TO_FIXED(lightend)); - //CONS_Printf("tilted lighting %f to %f (foc %f)\n", lightstart, lightend, focallengthf); - } + CALC_SLOPE_LIGHT uz = ds_sup->z + ds_sup->y*(centery-ds_y) + ds_sup->x*(ds_x1-centerx); vz = ds_svp->z + ds_svp->y*(centery-ds_y) + ds_svp->x*(ds_x1-centerx); @@ -1923,7 +1893,7 @@ void R_DrawTranslucentSpan_8 (void) } } -void R_DrawTranslucentWaterSpan_8(void) +void R_DrawWaterSpan_8(void) { UINT32 xposition; UINT32 yposition; @@ -2034,6 +2004,144 @@ void R_DrawFogSpan_8(void) } } +/** \brief The R_DrawTiltedFogSpan_8 function + Draws a tilted span with fogging. +*/ +void R_DrawTiltedFogSpan_8(void) +{ + int width = ds_x2 - ds_x1; + + UINT8 *dest = ylookup[ds_y] + columnofs[ds_x1]; + + double iz = ds_szp->z + ds_szp->y*(centery-ds_y) + ds_szp->x*(ds_x1-centerx); + + CALC_SLOPE_LIGHT + + do + { + UINT8 *colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps); + *dest = colormap[*dest]; + dest++; + } while (--width >= 0); +} + +/** \brief The R_DrawSolidColorSpan_8 function + Draws a solid color span. +*/ +void R_DrawSolidColorSpan_8(void) +{ + size_t count = (ds_x2 - ds_x1 + 1); + + UINT8 source = ds_colormap[ds_source[0]]; + UINT8 *dest = ylookup[ds_y] + columnofs[ds_x1]; + + memset(dest, source, count); +} + +/** \brief The R_DrawTransSolidColorSpan_8 function + Draws a translucent solid color span. +*/ +void R_DrawTransSolidColorSpan_8(void) +{ + size_t count = (ds_x2 - ds_x1 + 1); + + UINT8 source = ds_colormap[ds_source[0]]; + UINT8 *dest = ylookup[ds_y] + columnofs[ds_x1]; + + const UINT8 *deststop = screens[0] + vid.rowbytes * vid.height; + + while (count-- && dest <= deststop) + { + *dest = *(ds_transmap + (source << 8) + *dest); + dest++; + } +} + +/** \brief The R_DrawTiltedSolidColorSpan_8 function + Draws a tilted solid color span. +*/ +void R_DrawTiltedSolidColorSpan_8(void) +{ + int width = ds_x2 - ds_x1; + + UINT8 source = ds_source[0]; + UINT8 *dest = ylookup[ds_y] + columnofs[ds_x1]; + + double iz = ds_szp->z + ds_szp->y*(centery-ds_y) + ds_szp->x*(ds_x1-centerx); + + CALC_SLOPE_LIGHT + + do + { + UINT8 *colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps); + *dest++ = colormap[source]; + } while (--width >= 0); +} + +/** \brief The R_DrawTiltedTransSolidColorSpan_8 function + Draws a tilted and translucent solid color span. +*/ +void R_DrawTiltedTransSolidColorSpan_8(void) +{ + int width = ds_x2 - ds_x1; + + UINT8 source = ds_source[0]; + UINT8 *dest = ylookup[ds_y] + columnofs[ds_x1]; + + double iz = ds_szp->z + ds_szp->y*(centery-ds_y) + ds_szp->x*(ds_x1-centerx); + + CALC_SLOPE_LIGHT + + do + { + UINT8 *colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps); + *dest = *(ds_transmap + (colormap[source] << 8) + *dest); + dest++; + } while (--width >= 0); +} + +/** \brief The R_DrawWaterSolidColorSpan_8 function + Draws a water solid color span. +*/ +void R_DrawWaterSolidColorSpan_8(void) +{ + UINT8 source = ds_source[0]; + UINT8 *colormap = ds_colormap; + UINT8 *dest = ylookup[ds_y] + columnofs[ds_x1]; + UINT8 *dsrc = screens[1] + (ds_y+ds_bgofs)*vid.width + ds_x1; + + size_t count = (ds_x2 - ds_x1 + 1); + const UINT8 *deststop = screens[0] + vid.rowbytes * vid.height; + + while (count-- && dest <= deststop) + { + *dest = colormap[*(ds_transmap + (source << 8) + *dsrc++)]; + dest++; + } +} + +/** \brief The R_DrawTiltedWaterSolidColorSpan_8 function + Draws a tilted water solid color span. +*/ +void R_DrawTiltedWaterSolidColorSpan_8(void) +{ + int width = ds_x2 - ds_x1; + + UINT8 source = ds_source[0]; + UINT8 *dest = ylookup[ds_y] + columnofs[ds_x1]; + UINT8 *dsrc = screens[1] + (ds_y+ds_bgofs)*vid.width + ds_x1; + + double iz = ds_szp->z + ds_szp->y*(centery-ds_y) + ds_szp->x*(ds_x1-centerx); + + CALC_SLOPE_LIGHT + + do + { + UINT8 *colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps); + *dest++ = *(ds_transmap + (colormap[source] << 8) + *dsrc++); + } while (--width >= 0); +} + /** \brief The R_DrawFogColumn_8 function Fog wall. */ @@ -2095,7 +2203,7 @@ void R_DrawColumnShadowed_8(void) { // If the height of the light is above the column, get the colormap // anyway because the lighting of the top should be affected. - solid = dc_lightlist[i].flags & FF_CUTSOLIDS; + solid = dc_lightlist[i].flags & FOF_CUTSOLIDS; height = dc_lightlist[i].height >> LIGHTSCALESHIFT; if (solid) diff --git a/src/r_draw8_npo2.c b/src/r_draw8_npo2.c index 71ec99948..faf1cdba8 100644 --- a/src/r_draw8_npo2.c +++ b/src/r_draw8_npo2.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -111,17 +111,7 @@ void R_DrawTiltedSpan_NPO2_8(void) iz = ds_szp->z + ds_szp->y*(centery-ds_y) + ds_szp->x*(ds_x1-centerx); - // Lighting is simple. It's just linear interpolation from start to end - { - float planelightfloat = PLANELIGHTFLOAT; - float lightstart, lightend; - - lightend = (iz + ds_szp->x*width) * planelightfloat; - lightstart = iz * planelightfloat; - - R_CalcTiltedLighting(FLOAT_TO_FIXED(lightstart), FLOAT_TO_FIXED(lightend)); - //CONS_Printf("tilted lighting %f to %f (foc %f)\n", lightstart, lightend, focallengthf); - } + CALC_SLOPE_LIGHT uz = ds_sup->z + ds_sup->y*(centery-ds_y) + ds_sup->x*(ds_x1-centerx); vz = ds_svp->z + ds_svp->y*(centery-ds_y) + ds_svp->x*(ds_x1-centerx); @@ -311,17 +301,7 @@ void R_DrawTiltedTranslucentSpan_NPO2_8(void) iz = ds_szp->z + ds_szp->y*(centery-ds_y) + ds_szp->x*(ds_x1-centerx); - // Lighting is simple. It's just linear interpolation from start to end - { - float planelightfloat = PLANELIGHTFLOAT; - float lightstart, lightend; - - lightend = (iz + ds_szp->x*width) * planelightfloat; - lightstart = iz * planelightfloat; - - R_CalcTiltedLighting(FLOAT_TO_FIXED(lightstart), FLOAT_TO_FIXED(lightend)); - //CONS_Printf("tilted lighting %f to %f (foc %f)\n", lightstart, lightend, focallengthf); - } + CALC_SLOPE_LIGHT uz = ds_sup->z + ds_sup->y*(centery-ds_y) + ds_sup->x*(ds_x1-centerx); vz = ds_svp->z + ds_svp->y*(centery-ds_y) + ds_svp->x*(ds_x1-centerx); @@ -509,17 +489,7 @@ void R_DrawTiltedSplat_NPO2_8(void) iz = ds_szp->z + ds_szp->y*(centery-ds_y) + ds_szp->x*(ds_x1-centerx); - // Lighting is simple. It's just linear interpolation from start to end - { - float planelightfloat = PLANELIGHTFLOAT; - float lightstart, lightend; - - lightend = (iz + ds_szp->x*width) * planelightfloat; - lightstart = iz * planelightfloat; - - R_CalcTiltedLighting(FLOAT_TO_FIXED(lightstart), FLOAT_TO_FIXED(lightend)); - //CONS_Printf("tilted lighting %f to %f (foc %f)\n", lightstart, lightend, focallengthf); - } + CALC_SLOPE_LIGHT uz = ds_sup->z + ds_sup->y*(centery-ds_y) + ds_sup->x*(ds_x1-centerx); vz = ds_svp->z + ds_svp->y*(centery-ds_y) + ds_svp->x*(ds_x1-centerx); @@ -666,7 +636,6 @@ void R_DrawTiltedSplat_NPO2_8(void) for (; width != 0; width--) { colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps); - val = source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)]; // Lactozilla: Non-powers-of-two { fixed_t x = (((fixed_t)u) >> FRACBITS); @@ -993,6 +962,9 @@ void R_DrawTiltedFloorSprite_NPO2_8(void) double endz, endu, endv; UINT32 stepu, stepv; + struct libdivide_u32_t x_divider = libdivide_u32_gen(ds_flatwidth); + struct libdivide_u32_t y_divider = libdivide_u32_gen(ds_flatheight); + iz = ds_szp->z + ds_szp->y*(centery-ds_y) + ds_szp->x*(ds_x1-centerx); uz = ds_sup->z + ds_sup->y*(centery-ds_y) + ds_sup->x*(ds_x1-centerx); vz = ds_svp->z + ds_svp->y*(centery-ds_y) + ds_svp->x*(ds_x1-centerx); @@ -1034,12 +1006,13 @@ void R_DrawTiltedFloorSprite_NPO2_8(void) // Carefully align all of my Friends. if (x < 0) - x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth); + x += (libdivide_u32_do((UINT32)(-x-1), &x_divider) + 1) * ds_flatwidth; + else + x -= libdivide_u32_do((UINT32)x, &x_divider) * ds_flatwidth; if (y < 0) - y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight); - - x %= ds_flatwidth; - y %= ds_flatheight; + y += (libdivide_u32_do((UINT32)(-y-1), &y_divider) + 1) * ds_flatheight; + else + y -= libdivide_u32_do((UINT32)y, &y_divider) * ds_flatheight; val = source[((y * ds_flatwidth) + x)]; if (val & 0xFF00) @@ -1066,12 +1039,13 @@ void R_DrawTiltedFloorSprite_NPO2_8(void) // Carefully align all of my Friends. if (x < 0) - x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth); + x += (libdivide_u32_do((UINT32)(-x-1), &x_divider) + 1) * ds_flatwidth; + else + x -= libdivide_u32_do((UINT32)x, &x_divider) * ds_flatwidth; if (y < 0) - y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight); - - x %= ds_flatwidth; - y %= ds_flatheight; + y += (libdivide_u32_do((UINT32)(-y-1), &y_divider) + 1) * ds_flatheight; + else + y -= libdivide_u32_do((UINT32)y, &y_divider) * ds_flatheight; val = source[((y * ds_flatwidth) + x)]; if (val & 0xFF00) @@ -1102,12 +1076,13 @@ void R_DrawTiltedFloorSprite_NPO2_8(void) // Carefully align all of my Friends. if (x < 0) - x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth); + x += (libdivide_u32_do((UINT32)(-x-1), &x_divider) + 1) * ds_flatwidth; + else + x -= libdivide_u32_do((UINT32)x, &x_divider) * ds_flatwidth; if (y < 0) - y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight); - - x %= ds_flatwidth; - y %= ds_flatheight; + y += (libdivide_u32_do((UINT32)(-y-1), &y_divider) + 1) * ds_flatheight; + else + y -= libdivide_u32_do((UINT32)y, &y_divider) * ds_flatheight; val = source[((y * ds_flatwidth) + x)]; if (val & 0xFF00) @@ -1143,6 +1118,9 @@ void R_DrawTiltedTranslucentFloorSprite_NPO2_8(void) double endz, endu, endv; UINT32 stepu, stepv; + struct libdivide_u32_t x_divider = libdivide_u32_gen(ds_flatwidth); + struct libdivide_u32_t y_divider = libdivide_u32_gen(ds_flatheight); + iz = ds_szp->z + ds_szp->y*(centery-ds_y) + ds_szp->x*(ds_x1-centerx); uz = ds_sup->z + ds_sup->y*(centery-ds_y) + ds_sup->x*(ds_x1-centerx); vz = ds_svp->z + ds_svp->y*(centery-ds_y) + ds_svp->x*(ds_x1-centerx); @@ -1184,12 +1162,13 @@ void R_DrawTiltedTranslucentFloorSprite_NPO2_8(void) // Carefully align all of my Friends. if (x < 0) - x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth); + x += (libdivide_u32_do((UINT32)(-x-1), &x_divider) + 1) * ds_flatwidth; + else + x -= libdivide_u32_do((UINT32)x, &x_divider) * ds_flatwidth; if (y < 0) - y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight); - - x %= ds_flatwidth; - y %= ds_flatheight; + y += (libdivide_u32_do((UINT32)(-y-1), &y_divider) + 1) * ds_flatheight; + else + y -= libdivide_u32_do((UINT32)y, &y_divider) * ds_flatheight; val = source[((y * ds_flatwidth) + x)]; if (val & 0xFF00) @@ -1216,12 +1195,13 @@ void R_DrawTiltedTranslucentFloorSprite_NPO2_8(void) // Carefully align all of my Friends. if (x < 0) - x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth); + x += (libdivide_u32_do((UINT32)(-x-1), &x_divider) + 1) * ds_flatwidth; + else + x -= libdivide_u32_do((UINT32)x, &x_divider) * ds_flatwidth; if (y < 0) - y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight); - - x %= ds_flatwidth; - y %= ds_flatheight; + y += (libdivide_u32_do((UINT32)(-y-1), &y_divider) + 1) * ds_flatheight; + else + y -= libdivide_u32_do((UINT32)y, &y_divider) * ds_flatheight; val = source[((y * ds_flatwidth) + x)]; if (val & 0xFF00) @@ -1252,12 +1232,13 @@ void R_DrawTiltedTranslucentFloorSprite_NPO2_8(void) // Carefully align all of my Friends. if (x < 0) - x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth); + x += (libdivide_u32_do((UINT32)(-x-1), &x_divider) + 1) * ds_flatwidth; + else + x -= libdivide_u32_do((UINT32)x, &x_divider) * ds_flatwidth; if (y < 0) - y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight); - - x %= ds_flatwidth; - y %= ds_flatheight; + y += (libdivide_u32_do((UINT32)(-y-1), &y_divider) + 1) * ds_flatheight; + else + y -= libdivide_u32_do((UINT32)y, &y_divider) * ds_flatheight; val = source[((y * ds_flatwidth) + x)]; if (val & 0xFF00) @@ -1338,7 +1319,7 @@ void R_DrawTranslucentSpan_NPO2_8 (void) } } -void R_DrawTranslucentWaterSpan_NPO2_8(void) +void R_DrawWaterSpan_NPO2_8(void) { fixed_t xposition; fixed_t yposition; @@ -1401,10 +1382,10 @@ void R_DrawTranslucentWaterSpan_NPO2_8(void) } } -/** \brief The R_DrawTiltedTranslucentWaterSpan_NPO2_8 function +/** \brief The R_DrawTiltedWaterSpan_NPO2_8 function Like DrawTiltedTranslucentSpan_NPO2, but for water */ -void R_DrawTiltedTranslucentWaterSpan_NPO2_8(void) +void R_DrawTiltedWaterSpan_NPO2_8(void) { // x1, x2 = ds_x1, ds_x2 int width = ds_x2 - ds_x1; @@ -1427,17 +1408,7 @@ void R_DrawTiltedTranslucentWaterSpan_NPO2_8(void) iz = ds_szp->z + ds_szp->y*(centery-ds_y) + ds_szp->x*(ds_x1-centerx); - // Lighting is simple. It's just linear interpolation from start to end - { - float planelightfloat = PLANELIGHTFLOAT; - float lightstart, lightend; - - lightend = (iz + ds_szp->x*width) * planelightfloat; - lightstart = iz * planelightfloat; - - R_CalcTiltedLighting(FLOAT_TO_FIXED(lightstart), FLOAT_TO_FIXED(lightend)); - //CONS_Printf("tilted lighting %f to %f (foc %f)\n", lightstart, lightend, focallengthf); - } + CALC_SLOPE_LIGHT uz = ds_sup->z + ds_sup->y*(centery-ds_y) + ds_sup->x*(ds_x1-centerx); vz = ds_svp->z + ds_svp->y*(centery-ds_y) + ds_svp->x*(ds_x1-centerx); diff --git a/src/r_fps.c b/src/r_fps.c new file mode 100644 index 000000000..2d30c9f01 --- /dev/null +++ b/src/r_fps.c @@ -0,0 +1,817 @@ +// SONIC ROBO BLAST 2 +//----------------------------------------------------------------------------- +// Copyright (C) 1993-1996 by id Software, Inc. +// Copyright (C) 1998-2000 by DooM Legacy Team. +// Copyright (C) 1999-2000 by Jess Haas, Nicolas Kalkhof, Colin Phipps, Florian Schulze, Andrey Budko (prboom) +// Copyright (C) 1999-2019 by Sonic Team Junior. +// +// This program is free software distributed under the +// terms of the GNU General Public License, version 2. +// See the 'LICENSE' file for more details. +//----------------------------------------------------------------------------- +/// \file r_fps.h +/// \brief Uncapped framerate stuff. + +#include "r_fps.h" + +#include "r_main.h" +#include "g_game.h" +#include "i_video.h" +#include "r_plane.h" +#include "p_spec.h" +#include "r_state.h" +#include "z_zone.h" +#include "console.h" // con_startup_loadprogress +#include "m_perfstats.h" // ps_metric_t +#ifdef HWRENDER +#include "hardware/hw_main.h" // for cv_glshearing +#endif + +static CV_PossibleValue_t fpscap_cons_t[] = { +#ifdef DEVELOP + // Lower values are actually pretty useful for debugging interp problems! + {1, "MIN"}, +#else + {TICRATE, "MIN"}, +#endif + {300, "MAX"}, + {-1, "Unlimited"}, + {0, "Match refresh rate"}, + {0, NULL} +}; +consvar_t cv_fpscap = CVAR_INIT ("fpscap", "Match refresh rate", CV_SAVE, fpscap_cons_t, NULL); + +ps_metric_t ps_interp_frac = {0}; +ps_metric_t ps_interp_lag = {0}; + +UINT32 R_GetFramerateCap(void) +{ + if (rendermode == render_none) + { + // If we're not rendering (dedicated server), + // we shouldn't be using any interpolation. + return TICRATE; + } + + if (cv_fpscap.value == 0) + { + // 0: Match refresh rate + return I_GetRefreshRate(); + } + + if (cv_fpscap.value < 0) + { + // -1: Unlimited + return 0; + } + + return cv_fpscap.value; +} + +boolean R_UsingFrameInterpolation(void) +{ + return (R_GetFramerateCap() != TICRATE || cv_timescale.value < FRACUNIT); +} + +static viewvars_t p1view_old; +static viewvars_t p1view_new; +static viewvars_t p2view_old; +static viewvars_t p2view_new; +static viewvars_t sky1view_old; +static viewvars_t sky1view_new; +static viewvars_t sky2view_old; +static viewvars_t sky2view_new; + +static viewvars_t *oldview = &p1view_old; +static int oldview_invalid[MAXSPLITSCREENPLAYERS] = {0, 0}; +viewvars_t *newview = &p1view_new; + + +enum viewcontext_e viewcontext = VIEWCONTEXT_PLAYER1; + +static levelinterpolator_t **levelinterpolators; +static size_t levelinterpolators_len; +static size_t levelinterpolators_size; + + +static fixed_t R_LerpFixed(fixed_t from, fixed_t to, fixed_t frac) +{ + return from + FixedMul(frac, to - from); +} + +static angle_t R_LerpAngle(angle_t from, angle_t to, fixed_t frac) +{ + return from + FixedMul(frac, to - from); +} + +static vector2_t *R_LerpVector2(const vector2_t *from, const vector2_t *to, fixed_t frac, vector2_t *out) +{ + FV2_SubEx(to, from, out); + FV2_MulEx(out, frac, out); + FV2_AddEx(from, out, out); + return out; +} + +static vector3_t *R_LerpVector3(const vector3_t *from, const vector3_t *to, fixed_t frac, vector3_t *out) +{ + FV3_SubEx(to, from, out); + FV3_MulEx(out, frac, out); + FV3_AddEx(from, out, out); + return out; +} + +// recalc necessary stuff for mouseaiming +// slopes are already calculated for the full possible view (which is 4*viewheight). +// 18/08/18: (No it's actually 16*viewheight, thanks Jimita for finding this out) +static void R_SetupFreelook(player_t *player, boolean skybox) +{ +#ifndef HWRENDER + (void)player; + (void)skybox; +#endif + + // clip it in the case we are looking a hardware 90 degrees full aiming + // (lmps, network and use F12...) + if (rendermode == render_soft +#ifdef HWRENDER + || (rendermode == render_opengl + && (cv_glshearing.value == 1 + || (cv_glshearing.value == 2 && R_IsViewpointThirdPerson(player, skybox)))) +#endif + ) + { + G_SoftwareClipAimingPitch((INT32 *)&aimingangle); + } + + centeryfrac = (viewheight/2)< FRACUNIT) + frac = FRACUNIT; + + if (viewcontext == VIEWCONTEXT_SKY1 || viewcontext == VIEWCONTEXT_PLAYER1) + { + i = 0; + } + else + { + i = 1; + } + + if (oldview_invalid[i] != 0) + { + // interpolate from newview to newview + prevview = newview; + } + + viewx = R_LerpFixed(prevview->x, newview->x, frac); + viewy = R_LerpFixed(prevview->y, newview->y, frac); + viewz = R_LerpFixed(prevview->z, newview->z, frac); + + viewangle = R_LerpAngle(prevview->angle, newview->angle, frac); + aimingangle = R_LerpAngle(prevview->aim, newview->aim, frac); + + viewsin = FINESINE(viewangle>>ANGLETOFINESHIFT); + viewcos = FINECOSINE(viewangle>>ANGLETOFINESHIFT); + + // this is gonna create some interesting visual errors for long distance teleports... + // might want to recalculate the view sector every frame instead... + viewplayer = newview->player; + viewsector = R_PointInSubsector(viewx, viewy)->sector; + + // well, this ain't pretty + if (newview == &sky1view_new || newview == &sky2view_new) + { + skybox = 1; + } + + R_SetupFreelook(newview->player, skybox); +} + +void R_UpdateViewInterpolation(void) +{ + p1view_old = p1view_new; + p2view_old = p2view_new; + sky1view_old = sky1view_new; + sky2view_old = sky2view_new; + if (oldview_invalid[0] > 0) oldview_invalid[0]--; + if (oldview_invalid[1] > 0) oldview_invalid[1]--; +} + +void R_ResetViewInterpolation(UINT8 p) +{ + if (p == 0) + { + UINT8 i; + for (i = 0; i < MAXSPLITSCREENPLAYERS; i++) + { + oldview_invalid[i]++; + } + } + else + { + oldview_invalid[p - 1]++; + } +} + +void R_SetViewContext(enum viewcontext_e _viewcontext) +{ + I_Assert(_viewcontext == VIEWCONTEXT_PLAYER1 + || _viewcontext == VIEWCONTEXT_PLAYER2 + || _viewcontext == VIEWCONTEXT_SKY1 + || _viewcontext == VIEWCONTEXT_SKY2); + viewcontext = _viewcontext; + + switch (viewcontext) + { + case VIEWCONTEXT_PLAYER1: + oldview = &p1view_old; + newview = &p1view_new; + break; + case VIEWCONTEXT_PLAYER2: + oldview = &p2view_old; + newview = &p2view_new; + break; + case VIEWCONTEXT_SKY1: + oldview = &sky1view_old; + newview = &sky1view_new; + break; + case VIEWCONTEXT_SKY2: + oldview = &sky2view_old; + newview = &sky2view_new; + break; + default: + I_Error("viewcontext value is invalid: we should never get here without an assert!!"); + break; + } +} + +fixed_t R_InterpolateFixed(fixed_t from, fixed_t to) +{ + if (!R_UsingFrameInterpolation()) + { + return to; + } + + return (R_LerpFixed(from, to, rendertimefrac)); +} + +angle_t R_InterpolateAngle(angle_t from, angle_t to) +{ + if (!R_UsingFrameInterpolation()) + { + return to; + } + + return (R_LerpAngle(from, to, rendertimefrac)); +} + +void R_InterpolateMobjState(mobj_t *mobj, fixed_t frac, interpmobjstate_t *out) +{ + if (frac == FRACUNIT) + { + out->x = mobj->x; + out->y = mobj->y; + out->z = mobj->z; + out->scale = mobj->scale; + out->subsector = mobj->subsector; + out->angle = mobj->player ? mobj->player->drawangle : mobj->angle; + out->spritexscale = mobj->spritexscale; + out->spriteyscale = mobj->spriteyscale; + out->spritexoffset = mobj->spritexoffset; + out->spriteyoffset = mobj->spriteyoffset; + return; + } + + out->x = R_LerpFixed(mobj->old_x, mobj->x, frac); + out->y = R_LerpFixed(mobj->old_y, mobj->y, frac); + out->z = R_LerpFixed(mobj->old_z, mobj->z, frac); + out->scale = mobj->resetinterp ? mobj->scale : R_LerpFixed(mobj->old_scale, mobj->scale, frac); + out->spritexscale = mobj->resetinterp ? mobj->spritexscale : R_LerpFixed(mobj->old_spritexscale, mobj->spritexscale, frac); + out->spriteyscale = mobj->resetinterp ? mobj->spriteyscale : R_LerpFixed(mobj->old_spriteyscale, mobj->spriteyscale, frac); + + // Sprite offsets are not interpolated until we have a way to interpolate them explicitly in Lua. + // It seems existing mods visually break more often than not if it is interpolated. + out->spritexoffset = mobj->spritexoffset; + out->spriteyoffset = mobj->spriteyoffset; + + out->subsector = R_PointInSubsector(out->x, out->y); + + if (mobj->player) + { + out->angle = mobj->resetinterp ? mobj->player->drawangle : R_LerpAngle(mobj->player->old_drawangle, mobj->player->drawangle, frac); + } + else + { + out->angle = mobj->resetinterp ? mobj->angle : R_LerpAngle(mobj->old_angle, mobj->angle, frac); + } +} + +void R_InterpolatePrecipMobjState(precipmobj_t *mobj, fixed_t frac, interpmobjstate_t *out) +{ + if (frac == FRACUNIT) + { + out->x = mobj->x; + out->y = mobj->y; + out->z = mobj->z; + out->scale = FRACUNIT; + out->subsector = mobj->subsector; + out->angle = mobj->angle; + out->spritexscale = mobj->spritexscale; + out->spriteyscale = mobj->spriteyscale; + out->spritexoffset = mobj->spritexoffset; + out->spriteyoffset = mobj->spriteyoffset; + return; + } + + out->x = R_LerpFixed(mobj->old_x, mobj->x, frac); + out->y = R_LerpFixed(mobj->old_y, mobj->y, frac); + out->z = R_LerpFixed(mobj->old_z, mobj->z, frac); + out->scale = FRACUNIT; + out->spritexscale = R_LerpFixed(mobj->old_spritexscale, mobj->spritexscale, frac); + out->spriteyscale = R_LerpFixed(mobj->old_spriteyscale, mobj->spriteyscale, frac); + out->spritexoffset = R_LerpFixed(mobj->old_spritexoffset, mobj->spritexoffset, frac); + out->spriteyoffset = R_LerpFixed(mobj->old_spriteyoffset, mobj->spriteyoffset, frac); + + out->subsector = R_PointInSubsector(out->x, out->y); + + out->angle = R_LerpAngle(mobj->old_angle, mobj->angle, frac); +} + +static void AddInterpolator(levelinterpolator_t* interpolator) +{ + if (levelinterpolators_len >= levelinterpolators_size) + { + if (levelinterpolators_size == 0) + { + levelinterpolators_size = 128; + } + else + { + levelinterpolators_size *= 2; + } + + levelinterpolators = Z_ReallocAlign( + (void*) levelinterpolators, + sizeof(levelinterpolator_t*) * levelinterpolators_size, + PU_LEVEL, + NULL, + sizeof(levelinterpolator_t*) * 8 + ); + } + + levelinterpolators[levelinterpolators_len] = interpolator; + levelinterpolators_len += 1; +} + +static levelinterpolator_t *CreateInterpolator(levelinterpolator_type_e type, thinker_t *thinker) +{ + levelinterpolator_t *ret = (levelinterpolator_t*) Z_CallocAlign( + sizeof(levelinterpolator_t), + PU_LEVEL, + NULL, + sizeof(levelinterpolator_t) * 8 + ); + + ret->type = type; + ret->thinker = thinker; + + AddInterpolator(ret); + + return ret; +} + +void R_CreateInterpolator_SectorPlane(thinker_t *thinker, sector_t *sector, boolean ceiling) +{ + levelinterpolator_t *interp = CreateInterpolator(LVLINTERP_SectorPlane, thinker); + interp->sectorplane.sector = sector; + interp->sectorplane.ceiling = ceiling; + if (ceiling) + { + interp->sectorplane.oldheight = interp->sectorplane.bakheight = sector->ceilingheight; + } + else + { + interp->sectorplane.oldheight = interp->sectorplane.bakheight = sector->floorheight; + } +} + +void R_CreateInterpolator_SectorScroll(thinker_t *thinker, sector_t *sector, boolean ceiling) +{ + levelinterpolator_t *interp = CreateInterpolator(LVLINTERP_SectorScroll, thinker); + interp->sectorscroll.sector = sector; + interp->sectorscroll.ceiling = ceiling; + if (ceiling) + { + interp->sectorscroll.oldxoffs = interp->sectorscroll.bakxoffs = sector->ceiling_xoffs; + interp->sectorscroll.oldyoffs = interp->sectorscroll.bakyoffs = sector->ceiling_yoffs; + } + else + { + interp->sectorscroll.oldxoffs = interp->sectorscroll.bakxoffs = sector->floor_xoffs; + interp->sectorscroll.oldyoffs = interp->sectorscroll.bakyoffs = sector->floor_yoffs; + } +} + +void R_CreateInterpolator_SideScroll(thinker_t *thinker, side_t *side) +{ + levelinterpolator_t *interp = CreateInterpolator(LVLINTERP_SideScroll, thinker); + interp->sidescroll.side = side; + interp->sidescroll.oldtextureoffset = interp->sidescroll.baktextureoffset = side->textureoffset; + interp->sidescroll.oldrowoffset = interp->sidescroll.bakrowoffset = side->rowoffset; +} + +void R_CreateInterpolator_Polyobj(thinker_t *thinker, polyobj_t *polyobj) +{ + levelinterpolator_t *interp = CreateInterpolator(LVLINTERP_Polyobj, thinker); + interp->polyobj.polyobj = polyobj; + interp->polyobj.vertices_size = polyobj->numVertices; + + interp->polyobj.oldvertices = Z_CallocAlign(sizeof(fixed_t) * 2 * polyobj->numVertices, PU_LEVEL, NULL, 32); + interp->polyobj.bakvertices = Z_CallocAlign(sizeof(fixed_t) * 2 * polyobj->numVertices, PU_LEVEL, NULL, 32); + for (size_t i = 0; i < polyobj->numVertices; i++) + { + interp->polyobj.oldvertices[i * 2 ] = interp->polyobj.bakvertices[i * 2 ] = polyobj->vertices[i]->x; + interp->polyobj.oldvertices[i * 2 + 1] = interp->polyobj.bakvertices[i * 2 + 1] = polyobj->vertices[i]->y; + } + + interp->polyobj.oldcx = interp->polyobj.bakcx = polyobj->centerPt.x; + interp->polyobj.oldcy = interp->polyobj.bakcy = polyobj->centerPt.y; +} + +void R_CreateInterpolator_DynSlope(thinker_t *thinker, pslope_t *slope) +{ + levelinterpolator_t *interp = CreateInterpolator(LVLINTERP_DynSlope, thinker); + interp->dynslope.slope = slope; + + FV3_Copy(&interp->dynslope.oldo, &slope->o); + FV3_Copy(&interp->dynslope.bako, &slope->o); + + FV2_Copy(&interp->dynslope.oldd, &slope->d); + FV2_Copy(&interp->dynslope.bakd, &slope->d); + + interp->dynslope.oldzdelta = interp->dynslope.bakzdelta = slope->zdelta; +} + +void R_InitializeLevelInterpolators(void) +{ + levelinterpolators_len = 0; + levelinterpolators_size = 0; + levelinterpolators = NULL; +} + +static void UpdateLevelInterpolatorState(levelinterpolator_t *interp) +{ + size_t i; + + switch (interp->type) + { + case LVLINTERP_SectorPlane: + interp->sectorplane.oldheight = interp->sectorplane.bakheight; + interp->sectorplane.bakheight = interp->sectorplane.ceiling ? interp->sectorplane.sector->ceilingheight : interp->sectorplane.sector->floorheight; + break; + case LVLINTERP_SectorScroll: + interp->sectorscroll.oldxoffs = interp->sectorscroll.bakxoffs; + interp->sectorscroll.bakxoffs = interp->sectorscroll.ceiling ? interp->sectorscroll.sector->ceiling_xoffs : interp->sectorscroll.sector->floor_xoffs; + interp->sectorscroll.oldyoffs = interp->sectorscroll.bakyoffs; + interp->sectorscroll.bakyoffs = interp->sectorscroll.ceiling ? interp->sectorscroll.sector->ceiling_yoffs : interp->sectorscroll.sector->floor_yoffs; + break; + case LVLINTERP_SideScroll: + interp->sidescroll.oldtextureoffset = interp->sidescroll.baktextureoffset; + interp->sidescroll.baktextureoffset = interp->sidescroll.side->textureoffset; + interp->sidescroll.oldrowoffset = interp->sidescroll.bakrowoffset; + interp->sidescroll.bakrowoffset = interp->sidescroll.side->rowoffset; + break; + case LVLINTERP_Polyobj: + for (i = 0; i < interp->polyobj.vertices_size; i++) + { + interp->polyobj.oldvertices[i * 2 ] = interp->polyobj.bakvertices[i * 2 ]; + interp->polyobj.oldvertices[i * 2 + 1] = interp->polyobj.bakvertices[i * 2 + 1]; + interp->polyobj.bakvertices[i * 2 ] = interp->polyobj.polyobj->vertices[i]->x; + interp->polyobj.bakvertices[i * 2 + 1] = interp->polyobj.polyobj->vertices[i]->y; + } + interp->polyobj.oldcx = interp->polyobj.bakcx; + interp->polyobj.oldcy = interp->polyobj.bakcy; + interp->polyobj.bakcx = interp->polyobj.polyobj->centerPt.x; + interp->polyobj.bakcy = interp->polyobj.polyobj->centerPt.y; + break; + case LVLINTERP_DynSlope: + FV3_Copy(&interp->dynslope.oldo, &interp->dynslope.bako); + FV2_Copy(&interp->dynslope.oldd, &interp->dynslope.bakd); + interp->dynslope.oldzdelta = interp->dynslope.bakzdelta; + + FV3_Copy(&interp->dynslope.bako, &interp->dynslope.slope->o); + FV2_Copy(&interp->dynslope.bakd, &interp->dynslope.slope->d); + interp->dynslope.bakzdelta = interp->dynslope.slope->zdelta; + break; + } +} + +void R_UpdateLevelInterpolators(void) +{ + size_t i; + + for (i = 0; i < levelinterpolators_len; i++) + { + levelinterpolator_t *interp = levelinterpolators[i]; + + UpdateLevelInterpolatorState(interp); + } +} + +void R_ClearLevelInterpolatorState(thinker_t *thinker) +{ + size_t i; + + for (i = 0; i < levelinterpolators_len; i++) + { + levelinterpolator_t *interp = levelinterpolators[i]; + + if (interp->thinker == thinker) + { + // Do it twice to make the old state match the new + UpdateLevelInterpolatorState(interp); + UpdateLevelInterpolatorState(interp); + } + } +} + +void R_ApplyLevelInterpolators(fixed_t frac) +{ + size_t i, ii; + + for (i = 0; i < levelinterpolators_len; i++) + { + levelinterpolator_t *interp = levelinterpolators[i]; + + switch (interp->type) + { + case LVLINTERP_SectorPlane: + if (interp->sectorplane.ceiling) + { + interp->sectorplane.sector->ceilingheight = R_LerpFixed(interp->sectorplane.oldheight, interp->sectorplane.bakheight, frac); + } + else + { + interp->sectorplane.sector->floorheight = R_LerpFixed(interp->sectorplane.oldheight, interp->sectorplane.bakheight, frac); + } + interp->sectorplane.sector->moved = true; + break; + case LVLINTERP_SectorScroll: + if (interp->sectorscroll.ceiling) + { + interp->sectorscroll.sector->ceiling_xoffs = R_LerpFixed(interp->sectorscroll.oldxoffs, interp->sectorscroll.bakxoffs, frac); + interp->sectorscroll.sector->ceiling_yoffs = R_LerpFixed(interp->sectorscroll.oldyoffs, interp->sectorscroll.bakyoffs, frac); + } + else + { + interp->sectorscroll.sector->floor_xoffs = R_LerpFixed(interp->sectorscroll.oldxoffs, interp->sectorscroll.bakxoffs, frac); + interp->sectorscroll.sector->floor_yoffs = R_LerpFixed(interp->sectorscroll.oldyoffs, interp->sectorscroll.bakyoffs, frac); + } + break; + case LVLINTERP_SideScroll: + interp->sidescroll.side->textureoffset = R_LerpFixed(interp->sidescroll.oldtextureoffset, interp->sidescroll.baktextureoffset, frac); + interp->sidescroll.side->rowoffset = R_LerpFixed(interp->sidescroll.oldrowoffset, interp->sidescroll.bakrowoffset, frac); + break; + case LVLINTERP_Polyobj: + for (ii = 0; ii < interp->polyobj.vertices_size; ii++) + { + interp->polyobj.polyobj->vertices[ii]->x = R_LerpFixed(interp->polyobj.oldvertices[ii * 2 ], interp->polyobj.bakvertices[ii * 2 ], frac); + interp->polyobj.polyobj->vertices[ii]->y = R_LerpFixed(interp->polyobj.oldvertices[ii * 2 + 1], interp->polyobj.bakvertices[ii * 2 + 1], frac); + } + interp->polyobj.polyobj->centerPt.x = R_LerpFixed(interp->polyobj.oldcx, interp->polyobj.bakcx, frac); + interp->polyobj.polyobj->centerPt.y = R_LerpFixed(interp->polyobj.oldcy, interp->polyobj.bakcy, frac); + break; + case LVLINTERP_DynSlope: + R_LerpVector3(&interp->dynslope.oldo, &interp->dynslope.bako, frac, &interp->dynslope.slope->o); + R_LerpVector2(&interp->dynslope.oldd, &interp->dynslope.bakd, frac, &interp->dynslope.slope->d); + interp->dynslope.slope->zdelta = R_LerpFixed(interp->dynslope.oldzdelta, interp->dynslope.bakzdelta, frac); + break; + } + } +} + +void R_RestoreLevelInterpolators(void) +{ + size_t i, ii; + + for (i = 0; i < levelinterpolators_len; i++) + { + levelinterpolator_t *interp = levelinterpolators[i]; + + switch (interp->type) + { + case LVLINTERP_SectorPlane: + if (interp->sectorplane.ceiling) + { + interp->sectorplane.sector->ceilingheight = interp->sectorplane.bakheight; + } + else + { + interp->sectorplane.sector->floorheight = interp->sectorplane.bakheight; + } + interp->sectorplane.sector->moved = true; + break; + case LVLINTERP_SectorScroll: + if (interp->sectorscroll.ceiling) + { + interp->sectorscroll.sector->ceiling_xoffs = interp->sectorscroll.bakxoffs; + interp->sectorscroll.sector->ceiling_yoffs = interp->sectorscroll.bakyoffs; + } + else + { + interp->sectorscroll.sector->floor_xoffs = interp->sectorscroll.bakxoffs; + interp->sectorscroll.sector->floor_yoffs = interp->sectorscroll.bakyoffs; + } + break; + case LVLINTERP_SideScroll: + interp->sidescroll.side->textureoffset = interp->sidescroll.baktextureoffset; + interp->sidescroll.side->rowoffset = interp->sidescroll.bakrowoffset; + break; + case LVLINTERP_Polyobj: + for (ii = 0; ii < interp->polyobj.vertices_size; ii++) + { + interp->polyobj.polyobj->vertices[ii]->x = interp->polyobj.bakvertices[ii * 2 ]; + interp->polyobj.polyobj->vertices[ii]->y = interp->polyobj.bakvertices[ii * 2 + 1]; + } + interp->polyobj.polyobj->centerPt.x = interp->polyobj.bakcx; + interp->polyobj.polyobj->centerPt.y = interp->polyobj.bakcy; + break; + case LVLINTERP_DynSlope: + FV3_Copy(&interp->dynslope.slope->o, &interp->dynslope.bako); + FV2_Copy(&interp->dynslope.slope->d, &interp->dynslope.bakd); + interp->dynslope.slope->zdelta = interp->dynslope.bakzdelta; + break; + } + } +} + +void R_DestroyLevelInterpolators(thinker_t *thinker) +{ + size_t i; + + for (i = 0; i < levelinterpolators_len; i++) + { + levelinterpolator_t *interp = levelinterpolators[i]; + + if (interp->thinker == thinker) + { + // Swap the tail of the level interpolators to this spot + levelinterpolators[i] = levelinterpolators[levelinterpolators_len - 1]; + levelinterpolators_len -= 1; + + Z_Free(interp); + i -= 1; + } + } +} + +static mobj_t **interpolated_mobjs = NULL; +static size_t interpolated_mobjs_len = 0; +static size_t interpolated_mobjs_capacity = 0; + +// NOTE: This will NOT check that the mobj has already been added, for perf +// reasons. +void R_AddMobjInterpolator(mobj_t *mobj) +{ + if (interpolated_mobjs_len >= interpolated_mobjs_capacity) + { + if (interpolated_mobjs_capacity == 0) + { + interpolated_mobjs_capacity = 256; + } + else + { + interpolated_mobjs_capacity *= 2; + } + + interpolated_mobjs = Z_ReallocAlign( + interpolated_mobjs, + sizeof(mobj_t *) * interpolated_mobjs_capacity, + PU_LEVEL, + NULL, + 64 + ); + } + + interpolated_mobjs[interpolated_mobjs_len] = mobj; + interpolated_mobjs_len += 1; + + R_ResetMobjInterpolationState(mobj); + mobj->resetinterp = true; +} + +void R_RemoveMobjInterpolator(mobj_t *mobj) +{ + size_t i; + + if (interpolated_mobjs_len == 0) return; + + for (i = 0; i < interpolated_mobjs_len; i++) + { + if (interpolated_mobjs[i] == mobj) + { + interpolated_mobjs[i] = interpolated_mobjs[ + interpolated_mobjs_len - 1 + ]; + interpolated_mobjs_len -= 1; + return; + } + } +} + +void R_InitMobjInterpolators(void) +{ + // apparently it's not acceptable to free something already unallocated + // Z_Free(interpolated_mobjs); + interpolated_mobjs = NULL; + interpolated_mobjs_len = 0; + interpolated_mobjs_capacity = 0; +} + +void R_UpdateMobjInterpolators(void) +{ + size_t i; + for (i = 0; i < interpolated_mobjs_len; i++) + { + mobj_t *mobj = interpolated_mobjs[i]; + if (!P_MobjWasRemoved(mobj)) + R_ResetMobjInterpolationState(mobj); + } +} + +// +// P_ResetMobjInterpolationState +// +// Reset the rendering interpolation state of the mobj. +// +void R_ResetMobjInterpolationState(mobj_t *mobj) +{ + mobj->old_x2 = mobj->old_x; + mobj->old_y2 = mobj->old_y; + mobj->old_z2 = mobj->old_z; + mobj->old_angle2 = mobj->old_angle; + mobj->old_pitch2 = mobj->old_pitch; + mobj->old_roll2 = mobj->old_roll; + mobj->old_scale2 = mobj->old_scale; + mobj->old_x = mobj->x; + mobj->old_y = mobj->y; + mobj->old_z = mobj->z; + mobj->old_angle = mobj->angle; + mobj->old_pitch = mobj->pitch; + mobj->old_roll = mobj->roll; + mobj->old_scale = mobj->scale; + mobj->old_spritexscale = mobj->spritexscale; + mobj->old_spriteyscale = mobj->spriteyscale; + mobj->old_spritexoffset = mobj->spritexoffset; + mobj->old_spriteyoffset = mobj->spriteyoffset; + + if (mobj->player) + { + mobj->player->old_drawangle2 = mobj->player->old_drawangle; + mobj->player->old_drawangle = mobj->player->drawangle; + } + + mobj->resetinterp = false; +} + +// +// P_ResetPrecipitationMobjInterpolationState +// +// Reset the rendering interpolation state of the precipmobj. +// +void R_ResetPrecipitationMobjInterpolationState(precipmobj_t *mobj) +{ + mobj->old_x2 = mobj->old_x; + mobj->old_y2 = mobj->old_y; + mobj->old_z2 = mobj->old_z; + mobj->old_angle2 = mobj->old_angle; + mobj->old_pitch2 = mobj->old_pitch; + mobj->old_roll2 = mobj->old_roll; + mobj->old_x = mobj->x; + mobj->old_y = mobj->y; + mobj->old_z = mobj->z; + mobj->old_angle = mobj->angle; + mobj->old_spritexscale = mobj->spritexscale; + mobj->old_spriteyscale = mobj->spriteyscale; + mobj->old_spritexoffset = mobj->spritexoffset; + mobj->old_spriteyoffset = mobj->spriteyoffset; +} diff --git a/src/r_fps.h b/src/r_fps.h new file mode 100644 index 000000000..85c87a2f4 --- /dev/null +++ b/src/r_fps.h @@ -0,0 +1,162 @@ +// SONIC ROBO BLAST 2 +//----------------------------------------------------------------------------- +// Copyright (C) 1993-1996 by id Software, Inc. +// Copyright (C) 1998-2000 by DooM Legacy Team. +// Copyright (C) 1999-2000 by Jess Haas, Nicolas Kalkhof, Colin Phipps, Florian Schulze, Andrey Budko (prboom) +// Copyright (C) 1999-2019 by Sonic Team Junior. +// +// This program is free software distributed under the +// terms of the GNU General Public License, version 2. +// See the 'LICENSE' file for more details. +//----------------------------------------------------------------------------- +/// \file r_fps.h +/// \brief Uncapped framerate stuff. + +#ifndef __R_FPS_H__ +#define __R_FPS_H__ + +#include "m_fixed.h" +#include "p_local.h" +#include "r_state.h" +#include "m_perfstats.h" // ps_metric_t + +extern consvar_t cv_fpscap; + +extern ps_metric_t ps_interp_frac; +extern ps_metric_t ps_interp_lag; + +UINT32 R_GetFramerateCap(void); +boolean R_UsingFrameInterpolation(void); + +enum viewcontext_e +{ + VIEWCONTEXT_PLAYER1 = 0, + VIEWCONTEXT_PLAYER2, + VIEWCONTEXT_SKY1, + VIEWCONTEXT_SKY2 +}; + +typedef struct { + fixed_t x; + fixed_t y; + fixed_t z; + boolean sky; + sector_t *sector; + player_t *player; + + angle_t angle; + angle_t aim; + fixed_t cos; + fixed_t sin; + mobj_t *mobj; +} viewvars_t; + +extern viewvars_t *newview; + +typedef struct { + fixed_t x; + fixed_t y; + fixed_t z; + subsector_t *subsector; + angle_t angle; + fixed_t scale; + fixed_t spritexscale; + fixed_t spriteyscale; + fixed_t spritexoffset; + fixed_t spriteyoffset; +} interpmobjstate_t; + +// Level interpolators + +// The union tag for levelinterpolator_t +typedef enum { + LVLINTERP_SectorPlane, + LVLINTERP_SectorScroll, + LVLINTERP_SideScroll, + LVLINTERP_Polyobj, + LVLINTERP_DynSlope, +} levelinterpolator_type_e; + +// Tagged union of a level interpolator +typedef struct levelinterpolator_s { + levelinterpolator_type_e type; + thinker_t *thinker; + union { + struct { + sector_t *sector; + fixed_t oldheight; + fixed_t bakheight; + boolean ceiling; + } sectorplane; + struct { + sector_t *sector; + fixed_t oldxoffs, oldyoffs, bakxoffs, bakyoffs; + boolean ceiling; + } sectorscroll; + struct { + side_t *side; + fixed_t oldtextureoffset, oldrowoffset, baktextureoffset, bakrowoffset; + } sidescroll; + struct { + polyobj_t *polyobj; + fixed_t *oldvertices; + fixed_t *bakvertices; + size_t vertices_size; + fixed_t oldcx, oldcy, bakcx, bakcy; + } polyobj; + struct { + pslope_t *slope; + vector3_t oldo, bako; + vector2_t oldd, bakd; + fixed_t oldzdelta, bakzdelta; + } dynslope; + }; +} levelinterpolator_t; + +// Interpolates the current view variables (r_state.h) against the selected view context in R_SetViewContext +void R_InterpolateView(fixed_t frac); +// Buffer the current new views into the old views. Call once after each real tic. +void R_UpdateViewInterpolation(void); +// Reset the view states (e.g. after level load) so R_InterpolateView doesn't interpolate invalid data +void R_ResetViewInterpolation(UINT8 p); +// Set the current view context (the viewvars pointed to by newview) +void R_SetViewContext(enum viewcontext_e _viewcontext); + +fixed_t R_InterpolateFixed(fixed_t from, fixed_t to); +angle_t R_InterpolateAngle(angle_t from, angle_t to); + +// Evaluate the interpolated mobj state for the given mobj +void R_InterpolateMobjState(mobj_t *mobj, fixed_t frac, interpmobjstate_t *out); +// Evaluate the interpolated mobj state for the given precipmobj +void R_InterpolatePrecipMobjState(precipmobj_t *mobj, fixed_t frac, interpmobjstate_t *out); + +void R_CreateInterpolator_SectorPlane(thinker_t *thinker, sector_t *sector, boolean ceiling); +void R_CreateInterpolator_SectorScroll(thinker_t *thinker, sector_t *sector, boolean ceiling); +void R_CreateInterpolator_SideScroll(thinker_t *thinker, side_t *side); +void R_CreateInterpolator_Polyobj(thinker_t *thinker, polyobj_t *polyobj); +void R_CreateInterpolator_DynSlope(thinker_t *thinker, pslope_t *slope); + +// Initialize level interpolators after a level change +void R_InitializeLevelInterpolators(void); +// Update level interpolators, storing the previous and current states. +void R_UpdateLevelInterpolators(void); +// Clear states for all level interpolators for the thinker +void R_ClearLevelInterpolatorState(thinker_t *thinker); +// Apply level interpolators to the actual game state +void R_ApplyLevelInterpolators(fixed_t frac); +// Restore level interpolators to the real game state +void R_RestoreLevelInterpolators(void); +// Destroy interpolators associated with a thinker +void R_DestroyLevelInterpolators(thinker_t *thinker); + +// Initialize internal mobj interpolator list (e.g. during level loading) +void R_InitMobjInterpolators(void); +// Add interpolation state for the given mobj +void R_AddMobjInterpolator(mobj_t *mobj); +// Remove the interpolation state for the given mobj +void R_RemoveMobjInterpolator(mobj_t *mobj); +void R_UpdateMobjInterpolators(void); +void R_ResetMobjInterpolationState(mobj_t *mobj); +void R_ResetPrecipitationMobjInterpolationState(precipmobj_t *mobj); + +#endif diff --git a/src/r_local.h b/src/r_local.h index ba78ea87d..65fad64d0 100644 --- a/src/r_local.h +++ b/src/r_local.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/r_main.c b/src/r_main.c index a3356f7c7..a5f29a3ed 100644 --- a/src/r_main.c +++ b/src/r_main.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -35,6 +35,7 @@ #include "r_portal.h" #include "r_main.h" #include "i_system.h" // I_GetPreciseTime +#include "r_fps.h" // Frame interpolation/uncapped #ifdef HWRENDER #include "hardware/hw_main.h" @@ -75,6 +76,10 @@ sector_t *viewsector; player_t *viewplayer; mobj_t *r_viewmobj; +fixed_t rendertimefrac; +fixed_t renderdeltatics; +boolean renderisnewtic; + // // precalculated math tables // @@ -101,21 +106,22 @@ extracolormap_t *extra_colormaps = NULL; // Render stats precise_t ps_prevframetime = 0; -precise_t ps_rendercalltime = 0; -precise_t ps_uitime = 0; -precise_t ps_swaptime = 0; +ps_metric_t ps_rendercalltime = {0}; +ps_metric_t ps_otherrendertime = {0}; +ps_metric_t ps_uitime = {0}; +ps_metric_t ps_swaptime = {0}; -precise_t ps_bsptime = 0; +ps_metric_t ps_bsptime = {0}; -precise_t ps_sw_spritecliptime = 0; -precise_t ps_sw_portaltime = 0; -precise_t ps_sw_planetime = 0; -precise_t ps_sw_maskedtime = 0; +ps_metric_t ps_sw_spritecliptime = {0}; +ps_metric_t ps_sw_portaltime = {0}; +ps_metric_t ps_sw_planetime = {0}; +ps_metric_t ps_sw_maskedtime = {0}; -int ps_numbspcalls = 0; -int ps_numsprites = 0; -int ps_numdrawnodes = 0; -int ps_numpolyobjects = 0; +ps_metric_t ps_numbspcalls = {0}; +ps_metric_t ps_numsprites = {0}; +ps_metric_t ps_numdrawnodes = {0}; +ps_metric_t ps_numpolyobjects = {0}; static CV_PossibleValue_t drawdist_cons_t[] = { {256, "256"}, {512, "512"}, {768, "768"}, @@ -143,7 +149,7 @@ static void FlipCam2_OnChange(void); void SendWeaponPref(void); void SendWeaponPref2(void); -consvar_t cv_tailspickup = CVAR_INIT ("tailspickup", "On", CV_NETVAR, CV_OnOff, NULL); +consvar_t cv_tailspickup = CVAR_INIT ("tailspickup", "On", CV_NETVAR|CV_ALLOWLUA, CV_OnOff, NULL); consvar_t cv_chasecam = CVAR_INIT ("chasecam", "On", CV_CALL, CV_OnOff, ChaseCam_OnChange); consvar_t cv_chasecam2 = CVAR_INIT ("chasecam2", "On", CV_CALL, CV_OnOff, ChaseCam2_OnChange); consvar_t cv_flipcam = CVAR_INIT ("flipcam", "No", CV_SAVE|CV_CALL|CV_NOINIT, CV_YesNo, FlipCam_OnChange); @@ -152,8 +158,8 @@ consvar_t cv_flipcam2 = CVAR_INIT ("flipcam2", "No", CV_SAVE|CV_CALL|CV_NOINIT, consvar_t cv_shadow = CVAR_INIT ("shadow", "On", CV_SAVE, CV_OnOff, NULL); consvar_t cv_skybox = CVAR_INIT ("skybox", "On", CV_SAVE, CV_OnOff, NULL); consvar_t cv_ffloorclip = CVAR_INIT ("ffloorclip", "On", CV_SAVE, CV_OnOff, NULL); -consvar_t cv_allowmlook = CVAR_INIT ("allowmlook", "Yes", CV_NETVAR, CV_YesNo, NULL); -consvar_t cv_showhud = CVAR_INIT ("showhud", "Yes", CV_CALL, CV_YesNo, R_SetViewSize); +consvar_t cv_allowmlook = CVAR_INIT ("allowmlook", "Yes", CV_NETVAR|CV_ALLOWLUA, CV_YesNo, NULL); +consvar_t cv_showhud = CVAR_INIT ("showhud", "Yes", CV_CALL|CV_ALLOWLUA, CV_YesNo, R_SetViewSize); consvar_t cv_translucenthud = CVAR_INIT ("translucenthud", "10", CV_SAVE, translucenthud_cons_t, NULL); consvar_t cv_translucency = CVAR_INIT ("translucency", "On", CV_SAVE, CV_OnOff, NULL); @@ -260,13 +266,13 @@ INT32 R_PointOnSide(fixed_t x, fixed_t y, node_t *node) if (!node->dy) return y <= node->y ? node->dx < 0 : node->dx > 0; - x -= node->x; - y -= node->y; + fixed_t dx = (x >> 1) - (node->x >> 1); + fixed_t dy = (y >> 1) - (node->y >> 1); // Try to quickly decide by looking at sign bits. - if ((node->dy ^ node->dx ^ x ^ y) < 0) - return (node->dy ^ x) < 0; // (left is negative) - return FixedMul(y, node->dx>>FRACBITS) >= FixedMul(node->dy>>FRACBITS, x); + if ((node->dy ^ node->dx ^ dx ^ dy) < 0) + return (node->dy ^ dx) < 0; // (left is negative) + return FixedMul(dy, node->dx>>FRACBITS) >= FixedMul(node->dy>>FRACBITS, dx); } // killough 5/2/98: reformatted @@ -283,13 +289,13 @@ INT32 R_PointOnSegSide(fixed_t x, fixed_t y, seg_t *line) if (!ldy) return y <= ly ? ldx < 0 : ldx > 0; - x -= lx; - y -= ly; + fixed_t dx = (x >> 1) - (lx >> 1); + fixed_t dy = (y >> 1) - (ly >> 1); // Try to quickly decide by looking at sign bits. - if ((ldy ^ ldx ^ x ^ y) < 0) - return (ldy ^ x) < 0; // (left is negative) - return FixedMul(y, ldx>>FRACBITS) >= FixedMul(ldy>>FRACBITS, x); + if ((ldy ^ ldx ^ dx ^ dy) < 0) + return (ldy ^ dx) < 0; // (left is negative) + return FixedMul(dy, ldx>>FRACBITS) >= FixedMul(ldy>>FRACBITS, dx); } // @@ -444,7 +450,7 @@ fixed_t R_ScaleFromGlobalAngle(angle_t visangle) // R_DoCulling // Checks viewz and top/bottom heights of an item against culling planes // Returns true if the item is to be culled, i.e it shouldn't be drawn! -// if ML_NOCLIMB is set, the camera view is required to be in the same area for culling to occur +// if args[1] is set, the camera view is required to be in the same area for culling to occur boolean R_DoCulling(line_t *cullheight, line_t *viewcullheight, fixed_t vz, fixed_t bottomh, fixed_t toph) { fixed_t cullplane; @@ -453,7 +459,7 @@ boolean R_DoCulling(line_t *cullheight, line_t *viewcullheight, fixed_t vz, fixe return false; cullplane = cullheight->frontsector->floorheight; - if (cullheight->flags & ML_NOCLIMB) // Group culling + if (cullheight->args[1]) // Group culling { if (!viewcullheight) return false; @@ -614,7 +620,7 @@ static struct { 0, 0, - {}, {}, + {0}, {0}, false }; @@ -1083,146 +1089,93 @@ subsector_t *R_PointInSubsectorOrNull(fixed_t x, fixed_t y) // // R_SetupFrame // - -// recalc necessary stuff for mouseaiming -// slopes are already calculated for the full possible view (which is 4*viewheight). -// 18/08/18: (No it's actually 16*viewheight, thanks Jimita for finding this out) -static void R_SetupFreelook(player_t *player, boolean skybox) -{ -#ifndef HWRENDER - (void)player; - (void)skybox; -#endif - - // clip it in the case we are looking a hardware 90 degrees full aiming - // (lmps, network and use F12...) - if (rendermode == render_soft -#ifdef HWRENDER - || (rendermode == render_opengl - && (cv_glshearing.value == 1 - || (cv_glshearing.value == 2 && R_IsViewpointThirdPerson(player, skybox)))) -#endif - ) - { - G_SoftwareClipAimingPitch((INT32 *)&aimingangle); - } - - centeryfrac = (viewheight/2)<climbing || (player->powers[pw_carry] == CR_NIGHTSMODE) || player->playerstate == PST_DEAD || gamestate == GS_TITLESCREEN || tutorialmode) - chasecam = true; // force chasecam on - else if (player->spectator) // no spectator chasecam - chasecam = false; // force chasecam off - - if (chasecam && !thiscam->chase) - { - P_ResetCamera(player, thiscam); - thiscam->chase = true; - } - else if (!chasecam) - thiscam->chase = false; + newview->sky = false; if (player->awayviewtics) { // cut-away view stuff r_viewmobj = player->awayviewmobj; // should be a MT_ALTVIEWMAN I_Assert(r_viewmobj != NULL); - viewz = r_viewmobj->z + 20*FRACUNIT; - aimingangle = player->awayviewaiming; - viewangle = r_viewmobj->angle; + newview->z = r_viewmobj->z + 20*FRACUNIT; + newview->aim = player->awayviewaiming; + newview->angle = r_viewmobj->angle; } else if (!player->spectator && chasecam) // use outside cam view { r_viewmobj = NULL; - viewz = thiscam->z + (thiscam->height>>1); - aimingangle = thiscam->aiming; - viewangle = thiscam->angle; + newview->z = thiscam->z + (thiscam->height>>1); + newview->aim = thiscam->aiming; + newview->angle = thiscam->angle; } else // use the player's eyes view { - viewz = player->viewz; + newview->z = player->viewz; r_viewmobj = player->mo; I_Assert(r_viewmobj != NULL); - aimingangle = player->aiming; - viewangle = r_viewmobj->angle; + newview->aim = player->aiming; + newview->angle = r_viewmobj->angle; if (!demoplayback && player->playerstate != PST_DEAD) { if (player == &players[consoleplayer]) { - viewangle = localangle; // WARNING: camera uses this - aimingangle = localaiming; + newview->angle = localangle; // WARNING: camera uses this + newview->aim = localaiming; } else if (player == &players[secondarydisplayplayer]) { - viewangle = localangle2; - aimingangle = localaiming2; + newview->angle = localangle2; + newview->aim = localaiming2; } } } - viewz += quake.z; + newview->z += quake.z; - viewplayer = player; + newview->player = player; if (chasecam && !player->awayviewtics && !player->spectator) { - viewx = thiscam->x; - viewy = thiscam->y; - viewx += quake.x; - viewy += quake.y; + newview->x = thiscam->x; + newview->y = thiscam->y; + newview->x += quake.x; + newview->y += quake.y; if (thiscam->subsector) - viewsector = thiscam->subsector->sector; + newview->sector = thiscam->subsector->sector; else - viewsector = R_PointInSubsector(viewx, viewy)->sector; + newview->sector = R_PointInSubsector(newview->x, newview->y)->sector; } else { - viewx = r_viewmobj->x; - viewy = r_viewmobj->y; - viewx += quake.x; - viewy += quake.y; + newview->x = r_viewmobj->x; + newview->y = r_viewmobj->y; + newview->x += quake.x; + newview->y += quake.y; if (r_viewmobj->subsector) - viewsector = r_viewmobj->subsector->sector; + newview->sector = r_viewmobj->subsector->sector; else - viewsector = R_PointInSubsector(viewx, viewy)->sector; + newview->sector = R_PointInSubsector(newview->x, newview->y)->sector; } - viewsin = FINESINE(viewangle>>ANGLETOFINESHIFT); - viewcos = FINECOSINE(viewangle>>ANGLETOFINESHIFT); + // newview->sin = FINESINE(viewangle>>ANGLETOFINESHIFT); + // newview->cos = FINECOSINE(viewangle>>ANGLETOFINESHIFT); - R_SetupFreelook(player, false); + R_InterpolateView(R_UsingFrameInterpolation() ? rendertimefrac : FRACUNIT); } void R_SkyboxFrame(player_t *player) @@ -1231,11 +1184,18 @@ void R_SkyboxFrame(player_t *player) if (splitscreen && player == &players[secondarydisplayplayer] && player != &players[consoleplayer]) + { thiscam = &camera2; + R_SetViewContext(VIEWCONTEXT_SKY2); + } else + { thiscam = &camera; + R_SetViewContext(VIEWCONTEXT_SKY1); + } // cut-away view stuff + newview->sky = true; r_viewmobj = skyboxmo[0]; #ifdef PARANOIA if (!r_viewmobj) @@ -1246,39 +1206,39 @@ void R_SkyboxFrame(player_t *player) #endif if (player->awayviewtics) { - aimingangle = player->awayviewaiming; - viewangle = player->awayviewmobj->angle; + newview->aim = player->awayviewaiming; + newview->angle = player->awayviewmobj->angle; } else if (thiscam->chase) { - aimingangle = thiscam->aiming; - viewangle = thiscam->angle; + newview->aim = thiscam->aiming; + newview->angle = thiscam->angle; } else { - aimingangle = player->aiming; - viewangle = player->mo->angle; + newview->aim = player->aiming; + newview->angle = player->mo->angle; if (!demoplayback && player->playerstate != PST_DEAD) { if (player == &players[consoleplayer]) { - viewangle = localangle; // WARNING: camera uses this - aimingangle = localaiming; + newview->angle = localangle; // WARNING: camera uses this + newview->aim = localaiming; } else if (player == &players[secondarydisplayplayer]) { - viewangle = localangle2; - aimingangle = localaiming2; + newview->angle = localangle2; + newview->aim = localaiming2; } } } - viewangle += r_viewmobj->angle; + newview->angle += r_viewmobj->angle; - viewplayer = player; + newview->player = player; - viewx = r_viewmobj->x; - viewy = r_viewmobj->y; - viewz = r_viewmobj->z; // 26/04/17: use actual Z position instead of spawnpoint angle! + newview->x = r_viewmobj->x; + newview->y = r_viewmobj->y; + newview->z = r_viewmobj->z; // 26/04/17: use actual Z position instead of spawnpoint angle! if (mapheaderinfo[gamemap-1]) { @@ -1320,61 +1280,99 @@ void R_SkyboxFrame(player_t *player) if (r_viewmobj->angle == 0) { - viewx += x; - viewy += y; + newview->x += x; + newview->y += y; } else if (r_viewmobj->angle == ANGLE_90) { - viewx -= y; - viewy += x; + newview->x -= y; + newview->y += x; } else if (r_viewmobj->angle == ANGLE_180) { - viewx -= x; - viewy -= y; + newview->x -= x; + newview->y -= y; } else if (r_viewmobj->angle == ANGLE_270) { - viewx += y; - viewy -= x; + newview->x += y; + newview->y -= x; } else { angle_t ang = r_viewmobj->angle>>ANGLETOFINESHIFT; - viewx += FixedMul(x,FINECOSINE(ang)) - FixedMul(y, FINESINE(ang)); - viewy += FixedMul(x, FINESINE(ang)) + FixedMul(y,FINECOSINE(ang)); + newview->x += FixedMul(x,FINECOSINE(ang)) - FixedMul(y, FINESINE(ang)); + newview->y += FixedMul(x, FINESINE(ang)) + FixedMul(y,FINECOSINE(ang)); } } if (mh->skybox_scalez > 0) - viewz += campos.z / mh->skybox_scalez; + newview->z += campos.z / mh->skybox_scalez; else if (mh->skybox_scalez < 0) - viewz += campos.z * -mh->skybox_scalez; + newview->z += campos.z * -mh->skybox_scalez; } if (r_viewmobj->subsector) - viewsector = r_viewmobj->subsector->sector; + newview->sector = r_viewmobj->subsector->sector; else - viewsector = R_PointInSubsector(viewx, viewy)->sector; + newview->sector = R_PointInSubsector(newview->x, newview->y)->sector; - viewsin = FINESINE(viewangle>>ANGLETOFINESHIFT); - viewcos = FINECOSINE(viewangle>>ANGLETOFINESHIFT); + // newview->sin = FINESINE(viewangle>>ANGLETOFINESHIFT); + // newview->cos = FINECOSINE(viewangle>>ANGLETOFINESHIFT); - R_SetupFreelook(player, true); + R_InterpolateView(R_UsingFrameInterpolation() ? rendertimefrac : FRACUNIT); } boolean R_ViewpointHasChasecam(player_t *player) { + camera_t *thiscam; boolean chasecam = false; + boolean isplayer2 = (splitscreen && player == &players[secondarydisplayplayer] && player != &players[consoleplayer]); - if (splitscreen && player == &players[secondarydisplayplayer] && player != &players[consoleplayer]) + if (isplayer2) + { + thiscam = &camera2; chasecam = (cv_chasecam2.value != 0); + } else + { + thiscam = &camera; chasecam = (cv_chasecam.value != 0); + } if (player->climbing || (player->powers[pw_carry] == CR_NIGHTSMODE) || player->playerstate == PST_DEAD || gamestate == GS_TITLESCREEN || tutorialmode) chasecam = true; // force chasecam on else if (player->spectator) // no spectator chasecam chasecam = false; // force chasecam off + + if (chasecam && !thiscam->chase) + { + P_ResetCamera(player, thiscam); + thiscam->chase = true; + } + else if (!chasecam && thiscam->chase) + { + P_ResetCamera(player, thiscam); + thiscam->chase = false; + } + + if (isplayer2) + { + R_SetViewContext(VIEWCONTEXT_PLAYER2); + if (thiscam->reset) + { + R_ResetViewInterpolation(2); + thiscam->reset = false; + } + } + else + { + R_SetViewContext(VIEWCONTEXT_PLAYER1); + if (thiscam->reset) + { + R_ResetViewInterpolation(1); + thiscam->reset = false; + } + } return chasecam; } @@ -1449,7 +1447,7 @@ static void Mask_Post (maskcount_t* m) void R_RenderPlayerView(player_t *player) { - UINT8 nummasks = 1; + INT32 nummasks = 1; maskcount_t* masks = malloc(sizeof(maskcount_t)); if (cv_homremoval.value && player == &players[displayplayer]) // if this is display player 1 @@ -1496,13 +1494,13 @@ void R_RenderPlayerView(player_t *player) mytotal = 0; ProfZeroTimer(); #endif - ps_numbspcalls = ps_numpolyobjects = ps_numdrawnodes = 0; - ps_bsptime = I_GetPreciseTime(); + ps_numbspcalls.value.i = ps_numpolyobjects.value.i = ps_numdrawnodes.value.i = 0; + PS_START_TIMING(ps_bsptime); // Link the polyobjects right before drawing the scene to reduce the amounts of calls to this function Polyobj_LinkToSubsectors(); R_RenderBSPNode((INT32)numnodes - 1); - ps_bsptime = I_GetPreciseTime() - ps_bsptime; - ps_numsprites = visspritecount; + PS_STOP_TIMING(ps_bsptime); + ps_numsprites.value.i = visspritecount; #ifdef TIMING RDMSR(0x10, &mycount); mytotal += mycount; // 64bit add @@ -1512,9 +1510,9 @@ void R_RenderPlayerView(player_t *player) //profile stuff --------------------------------------------------------- Mask_Post(&masks[nummasks - 1]); - ps_sw_spritecliptime = I_GetPreciseTime(); + PS_START_TIMING(ps_sw_spritecliptime); R_ClipSprites(drawsegs, NULL); - ps_sw_spritecliptime = I_GetPreciseTime() - ps_sw_spritecliptime; + PS_STOP_TIMING(ps_sw_spritecliptime); // Add skybox portals caused by sky visplanes. @@ -1522,7 +1520,7 @@ void R_RenderPlayerView(player_t *player) Portal_AddSkyboxPortals(); // Portal rendering. Hijacks the BSP traversal. - ps_sw_portaltime = I_GetPreciseTime(); + PS_START_TIMING(ps_sw_portaltime); if (portal_base) { portal_t *portal; @@ -1562,17 +1560,17 @@ void R_RenderPlayerView(player_t *player) Portal_Remove(portal); } } - ps_sw_portaltime = I_GetPreciseTime() - ps_sw_portaltime; + PS_STOP_TIMING(ps_sw_portaltime); - ps_sw_planetime = I_GetPreciseTime(); + PS_START_TIMING(ps_sw_planetime); R_DrawPlanes(); - ps_sw_planetime = I_GetPreciseTime() - ps_sw_planetime; + PS_STOP_TIMING(ps_sw_planetime); // draw mid texture and sprite // And now 3D floors/sides! - ps_sw_maskedtime = I_GetPreciseTime(); + PS_START_TIMING(ps_sw_maskedtime); R_DrawMasked(masks, nummasks); - ps_sw_maskedtime = I_GetPreciseTime() - ps_sw_maskedtime; + PS_STOP_TIMING(ps_sw_maskedtime); free(masks); } @@ -1643,4 +1641,7 @@ void R_RegisterEngineStuff(void) CV_RegisterVar(&cv_maxportals); CV_RegisterVar(&cv_movebob); + + // Frame interpolation/uncapped + CV_RegisterVar(&cv_fpscap); } diff --git a/src/r_main.h b/src/r_main.h index f81447c45..f08070d0f 100644 --- a/src/r_main.h +++ b/src/r_main.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -17,6 +17,7 @@ #include "d_player.h" #include "r_data.h" #include "r_textures.h" +#include "m_perfstats.h" // ps_metric_t // // POV related. @@ -34,6 +35,13 @@ extern fixed_t fovtan; extern size_t validcount, linecount, loopcount, framecount; +// The fraction of a tic being drawn (for interpolation between two tics) +extern fixed_t rendertimefrac; +// Evaluated delta tics for this frame (how many tics since the last frame) +extern fixed_t renderdeltatics; +// The current render is a new logical tic +extern boolean renderisnewtic; + // // Lighting LUT. // Used for z-depth cuing per column/row, @@ -79,21 +87,22 @@ boolean R_DoCulling(line_t *cullheight, line_t *viewcullheight, fixed_t vz, fixe // Render stats extern precise_t ps_prevframetime;// time when previous frame was rendered -extern precise_t ps_rendercalltime; -extern precise_t ps_uitime; -extern precise_t ps_swaptime; +extern ps_metric_t ps_rendercalltime; +extern ps_metric_t ps_otherrendertime; +extern ps_metric_t ps_uitime; +extern ps_metric_t ps_swaptime; -extern precise_t ps_bsptime; +extern ps_metric_t ps_bsptime; -extern precise_t ps_sw_spritecliptime; -extern precise_t ps_sw_portaltime; -extern precise_t ps_sw_planetime; -extern precise_t ps_sw_maskedtime; +extern ps_metric_t ps_sw_spritecliptime; +extern ps_metric_t ps_sw_portaltime; +extern ps_metric_t ps_sw_planetime; +extern ps_metric_t ps_sw_maskedtime; -extern int ps_numbspcalls; -extern int ps_numsprites; -extern int ps_numdrawnodes; -extern int ps_numpolyobjects; +extern ps_metric_t ps_numbspcalls; +extern ps_metric_t ps_numsprites; +extern ps_metric_t ps_numdrawnodes; +extern ps_metric_t ps_numpolyobjects; // // REFRESH - the actual rendering functions. diff --git a/src/r_patch.c b/src/r_patch.c index 6827cd12c..7c561e959 100644 --- a/src/r_patch.c +++ b/src/r_patch.c @@ -1,6 +1,6 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- -// Copyright (C) 2020-2021 by Jaime "Lactozilla" Passos. +// Copyright (C) 2020-2023 by Jaime "Lactozilla" Passos. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/r_patch.h b/src/r_patch.h index 96fbb0e28..d2106a390 100644 --- a/src/r_patch.h +++ b/src/r_patch.h @@ -1,6 +1,6 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- -// Copyright (C) 2020-2021 by Jaime "Lactozilla" Passos. +// Copyright (C) 2020-2023 by Jaime "Lactozilla" Passos. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/r_patchrotation.c b/src/r_patchrotation.c index a9b4a2b8f..3d3c6c512 100644 --- a/src/r_patchrotation.c +++ b/src/r_patchrotation.c @@ -1,6 +1,6 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- -// Copyright (C) 2020-2021 by Jaime "Lactozilla" Passos. +// Copyright (C) 2020-2023 by Jaime "Lactozilla" Passos. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -230,7 +230,7 @@ void RotatedPatch_DoRotation(rotsprite_t *rotsprite, patch_t *patch, INT32 angle width = (maxx - minx); height = (maxy - miny); - if ((unsigned)(width * height) != size) + if ((unsigned)(width * height) > size) { UINT16 *src, *dest; diff --git a/src/r_patchrotation.h b/src/r_patchrotation.h index 689b7d411..a239ac5fa 100644 --- a/src/r_patchrotation.h +++ b/src/r_patchrotation.h @@ -1,6 +1,6 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- -// Copyright (C) 2020-2021 by Jaime "Lactozilla" Passos. +// Copyright (C) 2020-2023 by Jaime "Lactozilla" Passos. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/r_picformats.c b/src/r_picformats.c index 59b1d16c5..9aea8c6c1 100644 --- a/src/r_picformats.c +++ b/src/r_picformats.c @@ -2,8 +2,8 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 2005-2009 by Andrey "entryway" Budko. -// Copyright (C) 2018-2021 by Jaime "Lactozilla" Passos. -// Copyright (C) 2019-2021 by Sonic Team Junior. +// Copyright (C) 2018-2023 by Jaime "Lactozilla" Passos. +// Copyright (C) 2019-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -447,7 +447,7 @@ void *Picture_FlatConvert( for (y = 0; y < inheight; y++) for (x = 0; x < inwidth; x++) { - void *input; + void *input = NULL; size_t offs = ((y * inwidth) + x); // Read pixel @@ -901,9 +901,8 @@ static png_bytep *PNG_Read( png_colorp palette; int palette_size; - png_bytep trans; - int trans_num; - png_color_16p trans_values; + png_bytep trans = NULL; + int num_trans = 0; #ifdef PNG_SETJMP_SUPPORTED #ifdef USE_FAR_KEYWORD @@ -998,12 +997,12 @@ static png_bytep *PNG_Read( // color is present on the image, the palette flag is disabled. if (usepal) { - png_get_tRNS(png_ptr, png_info_ptr, &trans, &trans_num, &trans_values); + png_uint_32 result = png_get_tRNS(png_ptr, png_info_ptr, &trans, &num_trans, NULL); - if (trans && trans_num > 0) + if ((result & PNG_INFO_tRNS) && num_trans > 0 && trans != NULL) { INT32 i; - for (i = 0; i < trans_num; i++) + for (i = 0; i < num_trans; i++) { // libpng will transform this image into RGBA even if // the transparent index does not exist in the image, diff --git a/src/r_picformats.h b/src/r_picformats.h index b1bb35edd..4f9637460 100644 --- a/src/r_picformats.h +++ b/src/r_picformats.h @@ -1,8 +1,8 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. -// Copyright (C) 2018-2021 by Jaime "Lactozilla" Passos. -// Copyright (C) 2019-2021 by Sonic Team Junior. +// Copyright (C) 2018-2023 by Jaime "Lactozilla" Passos. +// Copyright (C) 2019-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -105,6 +105,7 @@ typedef struct } spriteinfo_t; // Portable Network Graphics +#define PNG_HEADER_SIZE (8) boolean Picture_IsLumpPNG(const UINT8 *d, size_t s); #define Picture_ThrowPNGError(lumpname, wadfilename) I_Error("W_Wad: Lump \"%s\" in file \"%s\" is a .png - please convert to either Doom or Flat (raw) image format.", lumpname, wadfilename); // Fears Of LJ Sonic @@ -116,9 +117,9 @@ void *Picture_PNGConvert( size_t insize, size_t *outsize, pictureflags_t flags); boolean Picture_PNGDimensions(UINT8 *png, INT32 *width, INT32 *height, INT16 *topoffset, INT16 *leftoffset, size_t size); -#endif #define PICTURE_PNG_USELOOKUP +#endif // SpriteInfo extern spriteinfo_t spriteinfo[NUMSPRITES]; diff --git a/src/r_plane.c b/src/r_plane.c index 43994f91b..6ac830eda 100644 --- a/src/r_plane.c +++ b/src/r_plane.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -15,6 +15,7 @@ #include "doomdef.h" #include "console.h" +#include "m_easing.h" // For Easing_InOutSine, used in R_UpdatePlaneRipple #include "g_game.h" #include "p_setup.h" // levelflats #include "p_slopes.h" @@ -35,9 +36,6 @@ // opening // -// Quincunx antialiasing of flats! -//#define QUINCUNX - //SoM: 3/23/2000: Use Boom visplane hashing. visplane_t *visplanes[MAXVISPLANES]; @@ -89,8 +87,6 @@ static fixed_t planeheight; fixed_t yslopetab[MAXVIDHEIGHT*16]; fixed_t *yslope; -fixed_t basexscale, baseyscale; - fixed_t cachedheight[MAXVIDHEIGHT]; fixed_t cacheddistance[MAXVIDHEIGHT]; fixed_t cachedxstep[MAXVIDHEIGHT]; @@ -114,7 +110,7 @@ void R_InitPlanes(void) // Sets planeripple.xfrac and planeripple.yfrac, added to ds_xfrac and ds_yfrac, if the span is not tilted. // -struct +static struct { INT32 offset; fixed_t xfrac, yfrac; @@ -139,18 +135,15 @@ static void R_CalculatePlaneRipple(angle_t angle) static void R_UpdatePlaneRipple(void) { - ds_waterofs = (leveltime & 1)*16384; - planeripple.offset = (leveltime * 140); -} + // ds_waterofs oscillates between 0 and 16384 every other tic + // Now that frame interpolation is a thing, HOW does it oscillate? + // The difference between linear interpolation and a sine wave is miniscule here, + // but a sine wave is ever so slightly smoother and sleeker + ds_waterofs = Easing_InOutSine(((leveltime & 1)*FRACUNIT) + rendertimefrac,16384,0); -// -// R_MapPlane -// -// Uses global vars: -// planeheight -// basexscale -// baseyscale -// centerx + // Meanwhile, planeripple.offset just counts up, so it gets simple linear interpolation + planeripple.offset = ((leveltime-1)*140) + ((rendertimefrac*140) / FRACUNIT); +} static void R_MapPlane(INT32 y, INT32 x1, INT32 x2) { @@ -176,16 +169,13 @@ static void R_MapPlane(INT32 y, INT32 x1, INT32 x2) cacheddistance[y] = distance = FixedMul(planeheight, yslope[y]); span = abs(centery - y); - if (span) // don't divide by zero + if (span) // Don't divide by zero { ds_xstep = FixedMul(planesin, planeheight) / span; ds_ystep = FixedMul(planecos, planeheight) / span; } else - { - ds_xstep = FixedMul(distance, basexscale); - ds_ystep = FixedMul(distance, baseyscale); - } + ds_xstep = ds_ystep = FRACUNIT; cachedxstep[y] = ds_xstep; cachedystep[y] = ds_ystep; @@ -197,6 +187,11 @@ static void R_MapPlane(INT32 y, INT32 x1, INT32 x2) ds_ystep = cachedystep[y]; } + // [RH] Instead of using the xtoviewangle array, I calculated the fractional values + // at the middle of the screen, then used the calculated ds_xstep and ds_ystep + // to step from those to the proper texture coordinate to start drawing at. + // That way, the texture coordinate is always calculated by its position + // on the screen and not by its position relative to the edge of the visplane. ds_xfrac = xoffs + FixedMul(planecos, distance) + (x1 - centerx) * ds_xstep; ds_yfrac = yoffs - FixedMul(planesin, distance) + (x1 - centerx) * ds_ystep; @@ -271,6 +266,61 @@ static void R_MapTiltedPlane(INT32 y, INT32 x1, INT32 x2) spanfunc(); } +static void R_MapFogPlane(INT32 y, INT32 x1, INT32 x2) +{ + fixed_t distance; + size_t pindex; + +#ifdef RANGECHECK + if (x2 < x1 || x1 < 0 || x2 >= viewwidth || y > viewheight) + I_Error("R_MapFogPlane: %d, %d at %d", x1, x2, y); +#endif + + if (x1 >= vid.width) + x1 = vid.width - 1; + + if (planeheight != cachedheight[y]) + distance = FixedMul(planeheight, yslope[y]); + else + distance = cacheddistance[y]; + + pindex = distance >> LIGHTZSHIFT; + if (pindex >= MAXLIGHTZ) + pindex = MAXLIGHTZ - 1; + + ds_colormap = planezlight[pindex]; + if (currentplane->extra_colormap) + ds_colormap = currentplane->extra_colormap->colormap + (ds_colormap - colormaps); + + ds_y = y; + ds_x1 = x1; + ds_x2 = x2; + + spanfunc(); +} + +static void R_MapTiltedFogPlane(INT32 y, INT32 x1, INT32 x2) +{ +#ifdef RANGECHECK + if (x2 < x1 || x1 < 0 || x2 >= viewwidth || y > viewheight) + I_Error("R_MapTiltedFogPlane: %d, %d at %d", x1, x2, y); +#endif + + if (x1 >= vid.width) + x1 = vid.width - 1; + + if (currentplane->extra_colormap) + ds_colormap = currentplane->extra_colormap->colormap; + else + ds_colormap = colormaps; + + ds_y = y; + ds_x1 = x1; + ds_x2 = x2; + + spanfunc(); +} + void R_ClearFFloorClips (void) { INT32 i, p; @@ -295,7 +345,6 @@ void R_ClearFFloorClips (void) void R_ClearPlanes(void) { INT32 i, p; - angle_t angle; // opening / clipping determination for (i = 0; i < viewwidth; i++) @@ -321,13 +370,6 @@ void R_ClearPlanes(void) // texture calculation memset(cachedheight, 0, sizeof (cachedheight)); - - // left to right mapping - angle = (viewangle-ANGLE_90)>>ANGLETOFINESHIFT; - - // scale will be unit scale at SCREENWIDTH/2 distance - basexscale = FixedDiv (FINECOSINE(angle),centerxfrac); - baseyscale = -FixedDiv (FINESINE(angle),centerxfrac); } static visplane_t *new_visplane(unsigned hash) @@ -335,7 +377,7 @@ static visplane_t *new_visplane(unsigned hash) visplane_t *check = freetail; if (!check) { - check = calloc(2, sizeof (*check)); + check = malloc(sizeof (*check)); if (check == NULL) I_Error("%s: Out of memory", "new_visplane"); // FIXME: ugly } else @@ -380,9 +422,11 @@ visplane_t *R_FindPlane(fixed_t height, INT32 picnum, INT32 lightlevel, { if (polyobj->angle != 0) { - angle_t fineshift = polyobj->angle >> ANGLETOFINESHIFT; - xoff -= FixedMul(FINECOSINE(fineshift), polyobj->centerPt.x)+FixedMul(FINESINE(fineshift), polyobj->centerPt.y); - yoff -= FixedMul(FINESINE(fineshift), polyobj->centerPt.x)-FixedMul(FINECOSINE(fineshift), polyobj->centerPt.y); + float ang = ANG2RAD(polyobj->angle); + float x = FixedToFloat(polyobj->centerPt.x); + float y = FixedToFloat(polyobj->centerPt.y); + xoff -= FloatToFixed(x * cos(ang) + y * sin(ang)); + yoff -= FloatToFixed(x * sin(ang) - y * cos(ang)); } else { @@ -552,7 +596,7 @@ void R_ExpandPlane(visplane_t *pl, INT32 start, INT32 stop) if (pl->maxx < stop) pl->maxx = stop; } -static void R_MakeSpans(INT32 x, INT32 t1, INT32 b1, INT32 t2, INT32 b2) +static void R_MakeSpans(void (*mapfunc)(INT32, INT32, INT32), INT32 x, INT32 t1, INT32 b1, INT32 t2, INT32 b2) { // Alam: from r_splats's R_RasterizeFloorSplat if (t1 >= vid.height) t1 = vid.height-1; @@ -563,38 +607,12 @@ static void R_MakeSpans(INT32 x, INT32 t1, INT32 b1, INT32 t2, INT32 b2) while (t1 < t2 && t1 <= b1) { - R_MapPlane(t1, spanstart[t1], x - 1); + mapfunc(t1, spanstart[t1], x - 1); t1++; } while (b1 > b2 && b1 >= t1) { - R_MapPlane(b1, spanstart[b1], x - 1); - b1--; - } - - while (t2 < t1 && t2 <= b2) - spanstart[t2++] = x; - while (b2 > b1 && b2 >= t2) - spanstart[b2--] = x; -} - -static void R_MakeTiltedSpans(INT32 x, INT32 t1, INT32 b1, INT32 t2, INT32 b2) -{ - // Alam: from r_splats's R_RasterizeFloorSplat - if (t1 >= vid.height) t1 = vid.height-1; - if (b1 >= vid.height) b1 = vid.height-1; - if (t2 >= vid.height) t2 = vid.height-1; - if (b2 >= vid.height) b2 = vid.height-1; - if (x-1 >= vid.width) x = vid.width; - - while (t1 < t2 && t1 <= b1) - { - R_MapTiltedPlane(t1, spanstart[t1], x - 1); - t1++; - } - while (b1 > b2 && b1 >= t1) - { - R_MapTiltedPlane(b1, spanstart[b1], x - 1); + mapfunc(b1, spanstart[b1], x - 1); b1--; } @@ -775,6 +793,9 @@ d->z = (v1.x * v2.y) - (v1.y * v2.x) ds_svp->z *= focallengthf; ds_szp->z *= focallengthf; + if (ds_solidcolor) + return; + // Premultiply the texture vectors with the scale factors if (ds_powersoftwo) sfmult *= (1 << nflatshiftup); @@ -839,13 +860,12 @@ static inline void R_AdjustSlopeCoordinatesNPO2(vector3_t *origin) void R_DrawSinglePlane(visplane_t *pl) { - levelflat_t *levelflat; INT32 light = 0; - INT32 x; - INT32 stop, angle; + INT32 x, stop; ffloor_t *rover; - INT32 type; + boolean fog = false; INT32 spanfunctype = BASEDRAWFUNC; + void (*mapfunc)(INT32, INT32, INT32); if (!(pl->minx <= pl->maxx)) return; @@ -858,7 +878,6 @@ void R_DrawSinglePlane(visplane_t *pl) } planeripple.active = false; - spanfunc = spanfuncs[BASEDRAWFUNC]; if (pl->polyobj) { @@ -885,13 +904,13 @@ void R_DrawSinglePlane(visplane_t *pl) // Don't draw planes that shouldn't be drawn. for (rover = pl->ffloor->target->ffloors; rover; rover = rover->next) { - if ((pl->ffloor->flags & FF_CUTEXTRA) && (rover->flags & FF_EXTRA)) + if ((pl->ffloor->fofflags & FOF_CUTEXTRA) && (rover->fofflags & FOF_EXTRA)) { - if (pl->ffloor->flags & FF_EXTRA) + if (pl->ffloor->fofflags & FOF_EXTRA) { // The plane is from an extra 3D floor... Check the flags so // there are no undesired cuts. - if (((pl->ffloor->flags & (FF_FOG|FF_SWIMMABLE)) == (rover->flags & (FF_FOG|FF_SWIMMABLE))) + if (((pl->ffloor->fofflags & (FOF_FOG|FOF_SWIMMABLE)) == (rover->fofflags & (FOF_FOG|FOF_SWIMMABLE))) && pl->height < *rover->topheight && pl->height > *rover->bottomheight) return; @@ -899,65 +918,52 @@ void R_DrawSinglePlane(visplane_t *pl) } } - if (pl->ffloor->flags & FF_TRANSLUCENT) + if (pl->ffloor->fofflags & FOF_TRANSLUCENT) { - spanfunctype = (pl->ffloor->master->flags & ML_EFFECT6) ? SPANDRAWFUNC_TRANSSPLAT : SPANDRAWFUNC_TRANS; + spanfunctype = (pl->ffloor->fofflags & FOF_SPLAT) ? SPANDRAWFUNC_TRANSSPLAT : SPANDRAWFUNC_TRANS; // Hacked up support for alpha value in software mode Tails 09-24-2002 - if (pl->ffloor->alpha < 12) - return; // Don't even draw it - else if (pl->ffloor->alpha < 38) - ds_transmap = R_GetTranslucencyTable(tr_trans90); - else if (pl->ffloor->alpha < 64) - ds_transmap = R_GetTranslucencyTable(tr_trans80); - else if (pl->ffloor->alpha < 89) - ds_transmap = R_GetTranslucencyTable(tr_trans70); - else if (pl->ffloor->alpha < 115) - ds_transmap = R_GetTranslucencyTable(tr_trans60); - else if (pl->ffloor->alpha < 140) - ds_transmap = R_GetTranslucencyTable(tr_trans50); - else if (pl->ffloor->alpha < 166) - ds_transmap = R_GetTranslucencyTable(tr_trans40); - else if (pl->ffloor->alpha < 192) - ds_transmap = R_GetTranslucencyTable(tr_trans30); - else if (pl->ffloor->alpha < 217) - ds_transmap = R_GetTranslucencyTable(tr_trans20); - else if (pl->ffloor->alpha < 243) - ds_transmap = R_GetTranslucencyTable(tr_trans10); - else // Opaque, but allow transparent flat pixels - spanfunctype = SPANDRAWFUNC_SPLAT; + // ...unhacked by toaster 04-01-2021, re-hacked a little by sphere 19-11-2021 + { + INT32 trans = (10*((256+12) - pl->ffloor->alpha))/255; + if (trans >= 10) + return; // Don't even draw it + if (pl->ffloor->blend) // additive, (reverse) subtractive, modulative + ds_transmap = R_GetBlendTable(pl->ffloor->blend, trans); + else if (!(ds_transmap = R_GetTranslucencyTable(trans)) || trans == 0) + spanfunctype = SPANDRAWFUNC_SPLAT; // Opaque, but allow transparent flat pixels + } if ((spanfunctype == SPANDRAWFUNC_SPLAT) || (pl->extra_colormap && (pl->extra_colormap->flags & CMF_FOG))) light = (pl->lightlevel >> LIGHTSEGSHIFT); else light = LIGHTLEVELS-1; } - else if (pl->ffloor->flags & FF_FOG) + else if (pl->ffloor->fofflags & FOF_FOG) { + fog = true; spanfunctype = SPANDRAWFUNC_FOG; light = (pl->lightlevel >> LIGHTSEGSHIFT); } else light = (pl->lightlevel >> LIGHTSEGSHIFT); - if (pl->ffloor->flags & FF_RIPPLE) + if (pl->ffloor->fofflags & FOF_RIPPLE && !fog) { - INT32 top, bottom; - planeripple.active = true; if (spanfunctype == SPANDRAWFUNC_TRANS) { - spanfunctype = SPANDRAWFUNC_WATER; - // Copy the current scene, ugh - top = pl->high-8; - bottom = pl->low+8; + INT32 top = pl->high-8; + INT32 bottom = pl->low+8; if (top < 0) top = 0; if (bottom > vid.height) bottom = vid.height; + spanfunctype = SPANDRAWFUNC_WATER; + // Only copy the part of the screen we need VID_BlitLinearScreen((splitscreen && viewplayer == &players[secondarydisplayplayer]) ? screens[0] + (top+(vid.height>>1))*vid.width : screens[0]+((top)*vid.width), screens[1]+((top)*vid.width), vid.width, bottom-top, @@ -969,38 +975,68 @@ void R_DrawSinglePlane(visplane_t *pl) light = (pl->lightlevel >> LIGHTSEGSHIFT); } - currentplane = pl; - levelflat = &levelflats[pl->picnum]; + ds_powersoftwo = ds_solidcolor = false; - /* :james: */ - type = levelflat->type; - switch (type) + if (fog) { - case LEVELFLAT_NONE: - return; - case LEVELFLAT_FLAT: - ds_source = (UINT8 *)R_GetFlat(levelflat->u.flat.lumpnum); - R_CheckFlatLength(W_LumpLength(levelflat->u.flat.lumpnum)); - // Raw flats always have dimensions that are powers-of-two numbers. - ds_powersoftwo = true; - break; - default: - ds_source = (UINT8 *)R_GetLevelFlat(levelflat); - if (!ds_source) - return; - // Check if this texture or patch has power-of-two dimensions. - if (R_CheckPowersOfTwo()) - R_CheckFlatLength(ds_flatwidth * ds_flatheight); + // Since all fog planes do is apply a colormap, it's not required + // to know any information about their textures. + mapfunc = R_MapFogPlane; } - - if (!pl->slope // Don't mess with angle on slopes! We'll handle this ourselves later - && viewangle != pl->viewangle+pl->plangle) + else { - memset(cachedheight, 0, sizeof (cachedheight)); - angle = (pl->viewangle+pl->plangle-ANGLE_90)>>ANGLETOFINESHIFT; - basexscale = FixedDiv(FINECOSINE(angle),centerxfrac); - baseyscale = -FixedDiv(FINESINE(angle),centerxfrac); - viewangle = pl->viewangle+pl->plangle; + levelflat_t *levelflat = &levelflats[pl->picnum]; + + /* :james: */ + switch (levelflat->type) + { + case LEVELFLAT_NONE: + return; + case LEVELFLAT_FLAT: + ds_source = (UINT8 *)R_GetFlat(levelflat->u.flat.lumpnum); + R_SetFlatVars(W_LumpLength(levelflat->u.flat.lumpnum)); + if (R_CheckSolidColorFlat()) + ds_solidcolor = true; + else + ds_powersoftwo = true; + break; + default: + ds_source = (UINT8 *)R_GetLevelFlat(levelflat); + if (!ds_source) + return; + else if (R_CheckSolidColorFlat()) + ds_solidcolor = true; + else if (R_CheckPowersOfTwo()) + { + R_SetFlatVars(ds_flatwidth * ds_flatheight); + ds_powersoftwo = true; + } + } + + // Don't mess with angle on slopes! We'll handle this ourselves later + if (!pl->slope && viewangle != pl->viewangle+pl->plangle) + { + memset(cachedheight, 0, sizeof (cachedheight)); + viewangle = pl->viewangle+pl->plangle; + } + + mapfunc = R_MapPlane; + + if (ds_solidcolor) + { + switch (spanfunctype) + { + case SPANDRAWFUNC_WATER: + spanfunctype = SPANDRAWFUNC_WATERSOLID; + break; + case SPANDRAWFUNC_TRANS: + spanfunctype = SPANDRAWFUNC_TRANSSOLID; + break; + default: + spanfunctype = SPANDRAWFUNC_SOLID; + break; + } + } } xoffs = pl->xoffs; @@ -1014,12 +1050,19 @@ void R_DrawSinglePlane(visplane_t *pl) if (pl->slope) { - if (!pl->plangle) + if (fog) + mapfunc = R_MapTiltedFogPlane; + else { - if (ds_powersoftwo) - R_AdjustSlopeCoordinates(&pl->slope->o); - else - R_AdjustSlopeCoordinatesNPO2(&pl->slope->o); + mapfunc = R_MapTiltedPlane; + + if (!pl->plangle && !ds_solidcolor) + { + if (ds_powersoftwo) + R_AdjustSlopeCoordinates(&pl->slope->o); + else + R_AdjustSlopeCoordinatesNPO2(&pl->slope->o); + } } if (planeripple.active) @@ -1049,6 +1092,18 @@ void R_DrawSinglePlane(visplane_t *pl) case SPANDRAWFUNC_SPLAT: spanfunctype = SPANDRAWFUNC_TILTEDSPLAT; break; + case SPANDRAWFUNC_SOLID: + spanfunctype = SPANDRAWFUNC_TILTEDSOLID; + break; + case SPANDRAWFUNC_TRANSSOLID: + spanfunctype = SPANDRAWFUNC_TILTEDTRANSSOLID; + break; + case SPANDRAWFUNC_WATERSOLID: + spanfunctype = SPANDRAWFUNC_TILTEDWATERSOLID; + break; + case SPANDRAWFUNC_FOG: + spanfunctype = SPANDRAWFUNC_TILTEDFOG; + break; default: spanfunctype = SPANDRAWFUNC_TILTED; break; @@ -1062,7 +1117,7 @@ void R_DrawSinglePlane(visplane_t *pl) planezlight = zlight[light]; } - // Use the correct span drawer depending on the powers-of-twoness + // Set the span drawer if (!ds_powersoftwo) { if (spanfuncs_npo2[spanfunctype]) @@ -1079,89 +1134,11 @@ void R_DrawSinglePlane(visplane_t *pl) pl->bottom[pl->maxx+1] = 0x0000; pl->bottom[pl->minx-1] = 0x0000; + currentplane = pl; stop = pl->maxx + 1; - if (pl->slope) - { - for (x = pl->minx; x <= stop; x++) - R_MakeTiltedSpans(x, pl->top[x-1], pl->bottom[x-1], pl->top[x], pl->bottom[x]); - } - else - { - for (x = pl->minx; x <= stop; x++) - R_MakeSpans(x, pl->top[x-1], pl->bottom[x-1], pl->top[x], pl->bottom[x]); - } - -/* -QUINCUNX anti-aliasing technique (sort of) - -Normally, Quincunx antialiasing staggers pixels -in a 5-die pattern like so: - -o o - o -o o - -To simulate this, we offset the plane by -FRACUNIT/4 in each direction, and draw -at 50% translucency. The result is -a 'smoothing' of the texture while -using the palette colors. -*/ -#ifdef QUINCUNX - if (spanfunc == spanfuncs[BASEDRAWFUNC]) - { - INT32 i; - ds_transmap = R_GetTranslucencyTable(tr_trans50); - spanfunc = spanfuncs[SPANDRAWFUNC_TRANS]; - for (i=0; i<4; i++) - { - xoffs = pl->xoffs; - yoffs = pl->yoffs; - - switch(i) - { - case 0: - xoffs -= FRACUNIT/4; - yoffs -= FRACUNIT/4; - break; - case 1: - xoffs -= FRACUNIT/4; - yoffs += FRACUNIT/4; - break; - case 2: - xoffs += FRACUNIT/4; - yoffs -= FRACUNIT/4; - break; - case 3: - xoffs += FRACUNIT/4; - yoffs += FRACUNIT/4; - break; - } - planeheight = abs(pl->height - pl->viewz); - - if (light >= LIGHTLEVELS) - light = LIGHTLEVELS-1; - - if (light < 0) - light = 0; - - planezlight = zlight[light]; - - // set the maximum value for unsigned - pl->top[pl->maxx+1] = 0xffff; - pl->top[pl->minx-1] = 0xffff; - pl->bottom[pl->maxx+1] = 0x0000; - pl->bottom[pl->minx-1] = 0x0000; - - stop = pl->maxx + 1; - - for (x = pl->minx; x <= stop; x++) - R_MakeSpans(x, pl->top[x-1], pl->bottom[x-1], - pl->top[x], pl->bottom[x]); - } - } -#endif + for (x = pl->minx; x <= stop; x++) + R_MakeSpans(mapfunc, x, pl->top[x-1], pl->bottom[x-1], pl->top[x], pl->bottom[x]); } void R_PlaneBounds(visplane_t *plane) diff --git a/src/r_plane.h b/src/r_plane.h index bdad77930..9870a43e2 100644 --- a/src/r_plane.h +++ b/src/r_plane.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -69,7 +69,6 @@ extern fixed_t cachedheight[MAXVIDHEIGHT]; extern fixed_t cacheddistance[MAXVIDHEIGHT]; extern fixed_t cachedxstep[MAXVIDHEIGHT]; extern fixed_t cachedystep[MAXVIDHEIGHT]; -extern fixed_t basexscale, baseyscale; extern fixed_t *yslope; extern lighttable_t **planezlight; @@ -85,9 +84,6 @@ visplane_t *R_CheckPlane(visplane_t *pl, INT32 start, INT32 stop); void R_ExpandPlane(visplane_t *pl, INT32 start, INT32 stop); void R_PlaneBounds(visplane_t *plane); -void R_CheckFlatLength(size_t size); -boolean R_CheckPowersOfTwo(void); - // Draws a single visplane. void R_DrawSinglePlane(visplane_t *pl); diff --git a/src/r_portal.c b/src/r_portal.c index 3026f4e4c..e594f960a 100644 --- a/src/r_portal.c +++ b/src/r_portal.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -132,6 +132,7 @@ static portal_t* Portal_Add (const INT16 x1, const INT16 x2) void Portal_Remove (portal_t* portal) { + portalcullsector = NULL; portal_base = portal->next; Z_Free(portal->ceilingclip); Z_Free(portal->floorclip); diff --git a/src/r_portal.h b/src/r_portal.h index 0effd07b5..f90f05fbc 100644 --- a/src/r_portal.h +++ b/src/r_portal.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/r_segs.c b/src/r_segs.c index 642f54a4a..fccbc151c 100644 --- a/src/r_segs.c +++ b/src/r_segs.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -151,17 +151,25 @@ void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2) if (!ldef->alpha) return; - if (ldef->alpha > 0 && ldef->alpha < FRACUNIT) - { - dc_transmap = R_GetTranslucencyTable(R_GetLinedefTransTable(ldef->alpha)); - colfunc = colfuncs[COLDRAWFUNC_FUZZY]; - } - else if (ldef->special == 909) + if (ldef->blendmode == AST_FOG) { colfunc = colfuncs[COLDRAWFUNC_FOG]; windowtop = frontsector->ceilingheight; windowbottom = frontsector->floorheight; } + else if (ldef->blendmode) + { + if (ldef->alpha == NUMTRANSMAPS || ldef->blendmode == AST_MODULATE) + dc_transmap = R_GetBlendTable(ldef->blendmode, 0); + else + dc_transmap = R_GetBlendTable(ldef->blendmode, R_GetLinedefTransTable(ldef->alpha)); + colfunc = colfuncs[COLDRAWFUNC_FUZZY]; + } + else if (ldef->alpha > 0 && ldef->alpha < FRACUNIT) + { + dc_transmap = R_GetTranslucencyTable(R_GetLinedefTransTable(ldef->alpha)); + colfunc = colfuncs[COLDRAWFUNC_FUZZY]; + } else colfunc = colfuncs[BASEDRAWFUNC]; @@ -230,7 +238,7 @@ void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2) rlight->flags = light->flags; if ((colfunc != colfuncs[COLDRAWFUNC_FUZZY]) - || (rlight->flags & FF_FOG) + || (rlight->flags & FOF_FOG) || (rlight->extra_colormap && (rlight->extra_colormap->flags & CMF_FOG))) lightnum = (rlight->lightlevel >> LIGHTSEGSHIFT); else @@ -292,8 +300,8 @@ void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2) if (!curline->polyseg) { if (ds->curline->sidedef->repeatcnt) - repeats += ds->curline->sidedef->repeatcnt; - else if (ldef->flags & ML_EFFECT5) + repeats = 1 + ds->curline->sidedef->repeatcnt; + else if (ldef->flags & ML_WRAPMIDTEX) { fixed_t high, low; @@ -336,7 +344,7 @@ void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2) { dc_texturemid = ds->maskedtextureheight[dc_x]; - if (!!(curline->linedef->flags & ML_DONTPEGBOTTOM) ^ !!(curline->linedef->flags & ML_EFFECT3)) + if (curline->linedef->flags & ML_MIDPEG) dc_texturemid += (textureheight[texnum])*times + textureheight[texnum]; else dc_texturemid -= (textureheight[texnum])*times; @@ -378,7 +386,7 @@ void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2) { rlight = &dc_lightlist[i]; - if ((rlight->flags & FF_NOSHADE)) + if ((rlight->flags & FOF_NOSHADE)) continue; if (rlight->lightnum < 0) @@ -538,7 +546,7 @@ static boolean R_IsFFloorTranslucent(visffloor_t *pfloor) // Polyobjects have no ffloors, and they're handled in the conditional above. if (pfloor->ffloor != NULL) - return (pfloor->ffloor->flags & (FF_TRANSLUCENT|FF_FOG)); + return (pfloor->ffloor->fofflags & (FOF_TRANSLUCENT|FOF_FOG)); return false; } @@ -593,38 +601,26 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor) texnum = R_GetTextureNum(sides[newline->sidenum[0]].midtexture); } - if (pfloor->flags & FF_TRANSLUCENT) + if (pfloor->fofflags & FOF_TRANSLUCENT) { boolean fuzzy = true; // Hacked up support for alpha value in software mode Tails 09-24-2002 - if (pfloor->alpha < 12) - return; // Don't even draw it - else if (pfloor->alpha < 38) - dc_transmap = R_GetTranslucencyTable(tr_trans90); - else if (pfloor->alpha < 64) - dc_transmap = R_GetTranslucencyTable(tr_trans80); - else if (pfloor->alpha < 89) - dc_transmap = R_GetTranslucencyTable(tr_trans70); - else if (pfloor->alpha < 115) - dc_transmap = R_GetTranslucencyTable(tr_trans60); - else if (pfloor->alpha < 140) - dc_transmap = R_GetTranslucencyTable(tr_trans50); - else if (pfloor->alpha < 166) - dc_transmap = R_GetTranslucencyTable(tr_trans40); - else if (pfloor->alpha < 192) - dc_transmap = R_GetTranslucencyTable(tr_trans30); - else if (pfloor->alpha < 217) - dc_transmap = R_GetTranslucencyTable(tr_trans20); - else if (pfloor->alpha < 243) - dc_transmap = R_GetTranslucencyTable(tr_trans10); - else - fuzzy = false; // Opaque + // ...unhacked by toaster 04-01-2021, re-hacked a little by sphere 19-11-2021 + { + INT32 trans = (10*((256+12) - pfloor->alpha))/255; + if (trans >= 10) + return; // Don't even draw it + if (pfloor->blend) // additive, (reverse) subtractive, modulative + dc_transmap = R_GetBlendTable(pfloor->blend, trans); + else if (!(dc_transmap = R_GetTranslucencyTable(trans)) || trans == 0) + fuzzy = false; // Opaque + } if (fuzzy) colfunc = colfuncs[COLDRAWFUNC_FUZZY]; } - else if (pfloor->flags & FF_FOG) + else if (pfloor->fofflags & FOF_FOG) colfunc = colfuncs[COLDRAWFUNC_FOG]; range = max(ds->x2-ds->x1, 1); @@ -687,7 +683,7 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor) else rlight->heightstep = CLAMPMIN; rlight->heightstep = (rlight->heightstep-rlight->height)/(range); rlight->flags = light->flags; - if (light->flags & FF_CUTLEVEL) + if (light->flags & FOF_CUTLEVEL) { SLOPEPARAMS(*light->caster->b_slope, leftheight, rightheight, *light->caster->bottomheight) #undef SLOPEPARAMS @@ -711,12 +707,12 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor) rlight->extra_colormap = *light->extra_colormap; // Check if the current light effects the colormap/lightlevel - if (pfloor->flags & FF_FOG) + if (pfloor->fofflags & FOF_FOG) rlight->lightnum = (pfloor->master->frontsector->lightlevel >> LIGHTSEGSHIFT); else rlight->lightnum = (rlight->lightlevel >> LIGHTSEGSHIFT); - if (pfloor->flags & FF_FOG || rlight->flags & FF_FOG || (rlight->extra_colormap && (rlight->extra_colormap->flags & CMF_FOG))) + if (pfloor->fofflags & FOF_FOG || rlight->flags & FOF_FOG || (rlight->extra_colormap && (rlight->extra_colormap->flags & CMF_FOG))) ; else if (curline->v1->y == curline->v2->y) rlight->lightnum--; @@ -733,7 +729,7 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor) // Get correct light level! if ((frontsector->extra_colormap && (frontsector->extra_colormap->flags & CMF_FOG))) lightnum = (frontsector->lightlevel >> LIGHTSEGSHIFT); - else if (pfloor->flags & FF_FOG) + else if (pfloor->fofflags & FOF_FOG) lightnum = (pfloor->master->frontsector->lightlevel >> LIGHTSEGSHIFT); else if (colfunc == colfuncs[COLDRAWFUNC_FUZZY]) lightnum = LIGHTLEVELS-1; @@ -741,7 +737,7 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor) lightnum = R_FakeFlat(frontsector, &tempsec, &templight, &templight, false) ->lightlevel >> LIGHTSEGSHIFT; - if (pfloor->flags & FF_FOG || (frontsector->extra_colormap && (frontsector->extra_colormap->flags & CMF_FOG))); + if (pfloor->fofflags & FOF_FOG || (frontsector->extra_colormap && (frontsector->extra_colormap->flags & CMF_FOG))); else if (curline->v1->y == curline->v2->y) lightnum--; else if (curline->v1->x == curline->v2->x) @@ -768,10 +764,10 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor) skewslope = *pfloor->t_slope; // skew using top slope by default if (newline) { - if (newline->flags & ML_DONTPEGTOP) + if (newline->flags & ML_SKEWTD) slopeskew = true; } - else if (pfloor->master->flags & ML_DONTPEGTOP) + else if (pfloor->master->flags & ML_SKEWTD) slopeskew = true; if (slopeskew) @@ -888,7 +884,7 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor) { rlight = &dc_lightlist[i]; rlight->height += rlight->heightstep; - if (rlight->flags & FF_CUTLEVEL) + if (rlight->flags & FOF_CUTLEVEL) rlight->botheight += rlight->botheightstep; } } @@ -915,7 +911,7 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor) { // Check if the current light effects the colormap/lightlevel rlight = &dc_lightlist[i]; - lighteffect = !(dc_lightlist[i].flags & FF_NOSHADE); + lighteffect = !(dc_lightlist[i].flags & FOF_NOSHADE); if (lighteffect) { lightnum = rlight->lightnum; @@ -932,7 +928,7 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor) if (pindex >= MAXLIGHTSCALE) pindex = MAXLIGHTSCALE-1; - if (pfloor->flags & FF_FOG) + if (pfloor->fofflags & FOF_FOG) { if (pfloor->master->frontsector->extra_colormap) rlight->rcolormap = pfloor->master->frontsector->extra_colormap->colormap + (xwalllights[pindex] - colormaps); @@ -951,15 +947,15 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor) solid = 0; // don't carry over solid-cutting flag from the previous light // Check if the current light can cut the current 3D floor. - if (rlight->flags & FF_CUTSOLIDS && !(pfloor->flags & FF_EXTRA)) + if (rlight->flags & FOF_CUTSOLIDS && !(pfloor->fofflags & FOF_EXTRA)) solid = 1; - else if (rlight->flags & FF_CUTEXTRA && pfloor->flags & FF_EXTRA) + else if (rlight->flags & FOF_CUTEXTRA && pfloor->fofflags & FOF_EXTRA) { - if (rlight->flags & FF_EXTRA) + if (rlight->flags & FOF_EXTRA) { // The light is from an extra 3D floor... Check the flags so // there are no undesired cuts. - if ((rlight->flags & (FF_FOG|FF_SWIMMABLE)) == (pfloor->flags & (FF_FOG|FF_SWIMMABLE))) + if ((rlight->flags & (FOF_FOG|FOF_SWIMMABLE)) == (pfloor->fofflags & (FOF_FOG|FOF_SWIMMABLE))) solid = 1; } else @@ -996,7 +992,7 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor) { rlight = &dc_lightlist[i]; rlight->height += rlight->heightstep; - if (rlight->flags & FF_CUTLEVEL) + if (rlight->flags & FOF_CUTLEVEL) rlight->botheight += rlight->botheightstep; } continue; @@ -1027,7 +1023,7 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor) dc_colormap = walllights[pindex]; - if (pfloor->flags & FF_FOG && pfloor->master->frontsector->extra_colormap) + if (pfloor->fofflags & FOF_FOG && pfloor->master->frontsector->extra_colormap) dc_colormap = pfloor->master->frontsector->extra_colormap->colormap + (dc_colormap - colormaps); else if (frontsector->extra_colormap) dc_colormap = frontsector->extra_colormap->colormap + (dc_colormap - colormaps); @@ -1452,16 +1448,16 @@ static void R_RenderSegLoop (void) maskedtexturecol[rw_x] = (INT16)texturecolumn; if (maskedtextureheight != NULL) { - maskedtextureheight[rw_x] = (!!(curline->linedef->flags & ML_DONTPEGBOTTOM) ^ !!(curline->linedef->flags & ML_EFFECT3) ? + maskedtextureheight[rw_x] = (curline->linedef->flags & ML_MIDPEG) ? max(rw_midtexturemid, rw_midtextureback) : - min(rw_midtexturemid, rw_midtextureback)); + min(rw_midtexturemid, rw_midtextureback); } } for (i = 0; i < dc_numlights; i++) { dc_lightlist[i].height += dc_lightlist[i].heightstep; - if (dc_lightlist[i].flags & FF_CUTSOLIDS) + if (dc_lightlist[i].flags & FOF_CUTSOLIDS) dc_lightlist[i].botheight += dc_lightlist[i].botheightstep; } @@ -1752,7 +1748,7 @@ void R_StoreWallRange(INT32 start, INT32 stop) texheight = textureheight[midtexture]; // a single sided line is terminal, so it must mark ends markfloor = markceiling = true; - if (linedef->flags & ML_EFFECT2) { + if (linedef->flags & ML_NOSKEW) { if (linedef->flags & ML_DONTPEGBOTTOM) rw_midtexturemid = frontsector->floorheight + texheight - viewz; else @@ -1889,18 +1885,20 @@ void R_StoreWallRange(INT32 start, INT32 stop) else if (worldlow != worldbottom || worldlowslope != worldbottomslope || backsector->f_slope != frontsector->f_slope - || backsector->floorpic != frontsector->floorpic - || backsector->lightlevel != frontsector->lightlevel - //SoM: 3/22/2000: Check floor x and y offsets. - || backsector->floor_xoffs != frontsector->floor_xoffs - || backsector->floor_yoffs != frontsector->floor_yoffs - || backsector->floorpic_angle != frontsector->floorpic_angle - //SoM: 3/22/2000: Prevents bleeding. - || (frontsector->heightsec != -1 && frontsector->floorpic != skyflatnum) - || backsector->floorlightsec != frontsector->floorlightsec - //SoM: 4/3/2000: Check for colormaps - || frontsector->extra_colormap != backsector->extra_colormap - || (frontsector->ffloors != backsector->ffloors && !Tag_Compare(&frontsector->tags, &backsector->tags))) + || backsector->floorpic != frontsector->floorpic + || backsector->lightlevel != frontsector->lightlevel + //SoM: 3/22/2000: Check floor x and y offsets. + || backsector->floor_xoffs != frontsector->floor_xoffs + || backsector->floor_yoffs != frontsector->floor_yoffs + || backsector->floorpic_angle != frontsector->floorpic_angle + //SoM: 3/22/2000: Prevents bleeding. + || (frontsector->heightsec != -1 && frontsector->floorpic != skyflatnum) + || backsector->floorlightlevel != frontsector->floorlightlevel + || backsector->floorlightabsolute != frontsector->floorlightabsolute + || backsector->floorlightsec != frontsector->floorlightsec + //SoM: 4/3/2000: Check for colormaps + || frontsector->extra_colormap != backsector->extra_colormap + || (frontsector->ffloors != backsector->ffloors && !Tag_Compare(&frontsector->tags, &backsector->tags))) { markfloor = true; } @@ -1920,18 +1918,20 @@ void R_StoreWallRange(INT32 start, INT32 stop) else if (worldhigh != worldtop || worldhighslope != worldtopslope || backsector->c_slope != frontsector->c_slope - || backsector->ceilingpic != frontsector->ceilingpic - || backsector->lightlevel != frontsector->lightlevel - //SoM: 3/22/2000: Check floor x and y offsets. - || backsector->ceiling_xoffs != frontsector->ceiling_xoffs - || backsector->ceiling_yoffs != frontsector->ceiling_yoffs - || backsector->ceilingpic_angle != frontsector->ceilingpic_angle - //SoM: 3/22/2000: Prevents bleeding. - || (frontsector->heightsec != -1 && frontsector->ceilingpic != skyflatnum) - || backsector->ceilinglightsec != frontsector->ceilinglightsec - //SoM: 4/3/2000: Check for colormaps - || frontsector->extra_colormap != backsector->extra_colormap - || (frontsector->ffloors != backsector->ffloors && !Tag_Compare(&frontsector->tags, &backsector->tags))) + || backsector->ceilingpic != frontsector->ceilingpic + || backsector->lightlevel != frontsector->lightlevel + //SoM: 3/22/2000: Check floor x and y offsets. + || backsector->ceiling_xoffs != frontsector->ceiling_xoffs + || backsector->ceiling_yoffs != frontsector->ceiling_yoffs + || backsector->ceilingpic_angle != frontsector->ceilingpic_angle + //SoM: 3/22/2000: Prevents bleeding. + || (frontsector->heightsec != -1 && frontsector->ceilingpic != skyflatnum) + || backsector->ceilinglightlevel != frontsector->ceilinglightlevel + || backsector->ceilinglightabsolute != frontsector->ceilinglightabsolute + || backsector->ceilinglightsec != frontsector->ceilinglightsec + //SoM: 4/3/2000: Check for colormaps + || frontsector->extra_colormap != backsector->extra_colormap + || (frontsector->ffloors != backsector->ffloors && !Tag_Compare(&frontsector->tags, &backsector->tags))) { markceiling = true; } @@ -1957,23 +1957,10 @@ void R_StoreWallRange(INT32 start, INT32 stop) { fixed_t texheight; // top texture - if ((linedef->flags & (ML_DONTPEGTOP) && (linedef->flags & ML_DONTPEGBOTTOM)) - && linedef->sidenum[1] != 0xffff) - { - // Special case... use offsets from 2nd side but only if it has a texture. - side_t *def = &sides[linedef->sidenum[1]]; - toptexture = R_GetTextureNum(def->toptexture); + toptexture = R_GetTextureNum(sidedef->toptexture); + texheight = textureheight[toptexture]; - if (!toptexture) //Second side has no texture, use the first side's instead. - toptexture = R_GetTextureNum(sidedef->toptexture); - texheight = textureheight[toptexture]; - } - else - { - toptexture = R_GetTextureNum(sidedef->toptexture); - texheight = textureheight[toptexture]; - } - if (!(linedef->flags & ML_EFFECT1)) { // Ignore slopes for lower/upper textures unless flag is checked + if (!(linedef->flags & ML_SKEWTD)) { // Ignore slopes for lower/upper textures unless flag is checked if (linedef->flags & ML_DONTPEGTOP) rw_toptexturemid = frontsector->ceilingheight - viewz; else @@ -1998,7 +1985,7 @@ void R_StoreWallRange(INT32 start, INT32 stop) // bottom texture bottomtexture = R_GetTextureNum(sidedef->bottomtexture); - if (!(linedef->flags & ML_EFFECT1)) { // Ignore slopes for lower/upper textures unless flag is checked + if (!(linedef->flags & ML_SKEWTD)) { // Ignore slopes for lower/upper textures unless flag is checked if (linedef->flags & ML_DONTPEGBOTTOM) rw_bottomtexturemid = frontsector->floorheight - viewz; else @@ -2046,9 +2033,9 @@ void R_StoreWallRange(INT32 start, INT32 stop) i = 0; for (rover = backsector->ffloors; rover && i < MAXFFLOORS; rover = rover->next) { - if (!(rover->flags & FF_RENDERSIDES) || !(rover->flags & FF_EXISTS)) + if (!(rover->fofflags & FOF_RENDERSIDES) || !(rover->fofflags & FOF_EXISTS)) continue; - if (!(rover->flags & FF_ALLSIDES) && rover->flags & FF_INVERTSIDES) + if (!(rover->fofflags & FOF_ALLSIDES) && rover->fofflags & FOF_INVERTSIDES) continue; if (rover->norender == leveltime) @@ -2065,23 +2052,23 @@ void R_StoreWallRange(INT32 start, INT32 stop) if (r2->master == rover->master) // Skip if same control line. break; - if (!(r2->flags & FF_EXISTS) || !(r2->flags & FF_RENDERSIDES)) + if (!(r2->fofflags & FOF_EXISTS) || !(r2->fofflags & FOF_RENDERSIDES)) continue; if (r2->norender == leveltime) continue; - if (rover->flags & FF_EXTRA) + if (rover->fofflags & FOF_EXTRA) { - if (!(r2->flags & FF_CUTEXTRA)) + if (!(r2->fofflags & FOF_CUTEXTRA)) continue; - if (r2->flags & FF_EXTRA && (r2->flags & (FF_TRANSLUCENT|FF_FOG)) != (rover->flags & (FF_TRANSLUCENT|FF_FOG))) + if (r2->fofflags & FOF_EXTRA && (r2->fofflags & (FOF_TRANSLUCENT|FOF_FOG)) != (rover->fofflags & (FOF_TRANSLUCENT|FOF_FOG))) continue; } else { - if (!(r2->flags & FF_CUTSOLIDS)) + if (!(r2->fofflags & FOF_CUTSOLIDS)) continue; } @@ -2104,9 +2091,9 @@ void R_StoreWallRange(INT32 start, INT32 stop) for (rover = frontsector->ffloors; rover && i < MAXFFLOORS; rover = rover->next) { - if (!(rover->flags & FF_RENDERSIDES) || !(rover->flags & FF_EXISTS)) + if (!(rover->fofflags & FOF_RENDERSIDES) || !(rover->fofflags & FOF_EXISTS)) continue; - if (!(rover->flags & FF_ALLSIDES || rover->flags & FF_INVERTSIDES)) + if (!(rover->fofflags & FOF_ALLSIDES || rover->fofflags & FOF_INVERTSIDES)) continue; if (rover->norender == leveltime) @@ -2123,23 +2110,23 @@ void R_StoreWallRange(INT32 start, INT32 stop) if (r2->master == rover->master) // Skip if same control line. break; - if (!(r2->flags & FF_EXISTS) || !(r2->flags & FF_RENDERSIDES)) + if (!(r2->fofflags & FOF_EXISTS) || !(r2->fofflags & FOF_RENDERSIDES)) continue; if (r2->norender == leveltime) continue; - if (rover->flags & FF_EXTRA) + if (rover->fofflags & FOF_EXTRA) { - if (!(r2->flags & FF_CUTEXTRA)) + if (!(r2->fofflags & FOF_CUTEXTRA)) continue; - if (r2->flags & FF_EXTRA && (r2->flags & (FF_TRANSLUCENT|FF_FOG)) != (rover->flags & (FF_TRANSLUCENT|FF_FOG))) + if (r2->fofflags & FOF_EXTRA && (r2->fofflags & (FOF_TRANSLUCENT|FOF_FOG)) != (rover->fofflags & (FOF_TRANSLUCENT|FOF_FOG))) continue; } else { - if (!(r2->flags & FF_CUTSOLIDS)) + if (!(r2->fofflags & FOF_CUTSOLIDS)) continue; } @@ -2164,9 +2151,9 @@ void R_StoreWallRange(INT32 start, INT32 stop) { for (rover = backsector->ffloors, i = 0; rover && i < MAXFFLOORS; rover = rover->next) { - if (!(rover->flags & FF_RENDERSIDES) || !(rover->flags & FF_EXISTS)) + if (!(rover->fofflags & FOF_RENDERSIDES) || !(rover->fofflags & FOF_EXISTS)) continue; - if (!(rover->flags & FF_ALLSIDES) && rover->flags & FF_INVERTSIDES) + if (!(rover->fofflags & FOF_ALLSIDES) && rover->fofflags & FOF_INVERTSIDES) continue; if (rover->norender == leveltime) continue; @@ -2186,9 +2173,9 @@ void R_StoreWallRange(INT32 start, INT32 stop) { for (rover = frontsector->ffloors, i = 0; rover && i < MAXFFLOORS; rover = rover->next) { - if (!(rover->flags & FF_RENDERSIDES) || !(rover->flags & FF_EXISTS)) + if (!(rover->fofflags & FOF_RENDERSIDES) || !(rover->fofflags & FOF_EXISTS)) continue; - if (!(rover->flags & FF_ALLSIDES || rover->flags & FF_INVERTSIDES)) + if (!(rover->fofflags & FOF_ALLSIDES || rover->fofflags & FOF_INVERTSIDES)) continue; if (rover->norender == leveltime) continue; @@ -2231,7 +2218,7 @@ void R_StoreWallRange(INT32 start, INT32 stop) if (curline->polyseg) { rw_midtextureslide = rw_midtexturebackslide = 0; - if (!!(linedef->flags & ML_DONTPEGBOTTOM) ^ !!(linedef->flags & ML_EFFECT3)) + if (linedef->flags & ML_MIDPEG) rw_midtexturemid = rw_midtextureback = max(curline->frontsector->floorheight, curline->backsector->floorheight) - viewz; else rw_midtexturemid = rw_midtextureback = min(curline->frontsector->ceilingheight, curline->backsector->ceilingheight) - viewz; @@ -2239,16 +2226,16 @@ void R_StoreWallRange(INT32 start, INT32 stop) else { // Set midtexture starting height - if (linedef->flags & ML_EFFECT2) + if (linedef->flags & ML_NOSKEW) { // Ignore slopes when texturing rw_midtextureslide = rw_midtexturebackslide = 0; - if (!!(linedef->flags & ML_DONTPEGBOTTOM) ^ !!(linedef->flags & ML_EFFECT3)) + if (linedef->flags & ML_MIDPEG) rw_midtexturemid = rw_midtextureback = max(frontsector->floorheight, backsector->floorheight) - viewz; else rw_midtexturemid = rw_midtextureback = min(frontsector->ceilingheight, backsector->ceilingheight) - viewz; } - else if (!!(linedef->flags & ML_DONTPEGBOTTOM) ^ !!(linedef->flags & ML_EFFECT3)) + else if (linedef->flags & ML_MIDPEG) { rw_midtexturemid = worldbottom; rw_midtextureslide = floorfrontslide; @@ -2413,7 +2400,7 @@ void R_StoreWallRange(INT32 start, INT32 stop) rlight->heightstep = (rlight->heightstep-rlight->height)/(range); rlight->flags = light->flags; - if (light->caster && light->caster->flags & FF_CUTSOLIDS) + if (light->caster && light->caster->fofflags & FOF_CUTSOLIDS) { leftheight = P_GetFFloorBottomZAt(light->caster, segleft.x, segleft.y); rightheight = P_GetFFloorBottomZAt(light->caster, segright.x, segright.y); @@ -2499,7 +2486,7 @@ void R_StoreWallRange(INT32 start, INT32 stop) { for (rover = backsector->ffloors; rover && i < MAXFFLOORS; rover = rover->next) { - if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERPLANES)) + if (!(rover->fofflags & FOF_EXISTS) || !(rover->fofflags & FOF_RENDERPLANES)) continue; if (rover->norender == leveltime) continue; @@ -2514,8 +2501,8 @@ void R_StoreWallRange(INT32 start, INT32 stop) if ((roverleft>>4 <= worldhigh || roverright>>4 <= worldhighslope) && (roverleft>>4 >= worldlow || roverright>>4 >= worldlowslope) && - ((viewz < planevistest && (rover->flags & FF_BOTHPLANES || !(rover->flags & FF_INVERTPLANES))) || - (viewz > planevistest && (rover->flags & FF_BOTHPLANES || rover->flags & FF_INVERTPLANES)))) + ((viewz < planevistest && (rover->fofflags & FOF_BOTHPLANES || !(rover->fofflags & FOF_INVERTPLANES))) || + (viewz > planevistest && (rover->fofflags & FOF_BOTHPLANES || rover->fofflags & FOF_INVERTPLANES)))) { ffloor[i].b_pos = roverleft; ffloor[i].b_pos_slope = roverright; @@ -2536,8 +2523,8 @@ void R_StoreWallRange(INT32 start, INT32 stop) if ((roverleft>>4 <= worldhigh || roverright>>4 <= worldhighslope) && (roverleft>>4 >= worldlow || roverright>>4 >= worldlowslope) && - ((viewz > planevistest && (rover->flags & FF_BOTHPLANES || !(rover->flags & FF_INVERTPLANES))) || - (viewz < planevistest && (rover->flags & FF_BOTHPLANES || rover->flags & FF_INVERTPLANES)))) + ((viewz > planevistest && (rover->fofflags & FOF_BOTHPLANES || !(rover->fofflags & FOF_INVERTPLANES))) || + (viewz < planevistest && (rover->fofflags & FOF_BOTHPLANES || rover->fofflags & FOF_INVERTPLANES)))) { ffloor[i].b_pos = roverleft; ffloor[i].b_pos_slope = roverright; @@ -2554,7 +2541,7 @@ void R_StoreWallRange(INT32 start, INT32 stop) { for (rover = frontsector->ffloors; rover && i < MAXFFLOORS; rover = rover->next) { - if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERPLANES)) + if (!(rover->fofflags & FOF_EXISTS) || !(rover->fofflags & FOF_RENDERPLANES)) continue; if (rover->norender == leveltime) continue; @@ -2569,8 +2556,8 @@ void R_StoreWallRange(INT32 start, INT32 stop) if ((roverleft>>4 <= worldhigh || roverright>>4 <= worldhighslope) && (roverleft>>4 >= worldlow || roverright>>4 >= worldlowslope) && - ((viewz < planevistest && (rover->flags & FF_BOTHPLANES || !(rover->flags & FF_INVERTPLANES))) || - (viewz > planevistest && (rover->flags & FF_BOTHPLANES || rover->flags & FF_INVERTPLANES)))) + ((viewz < planevistest && (rover->fofflags & FOF_BOTHPLANES || !(rover->fofflags & FOF_INVERTPLANES))) || + (viewz > planevistest && (rover->fofflags & FOF_BOTHPLANES || rover->fofflags & FOF_INVERTPLANES)))) { ffloor[i].b_pos = roverleft; ffloor[i].b_pos_slope = roverright; @@ -2591,8 +2578,8 @@ void R_StoreWallRange(INT32 start, INT32 stop) if ((roverleft>>4 <= worldhigh || roverright>>4 <= worldhighslope) && (roverleft>>4 >= worldlow || roverright>>4 >= worldlowslope) && - ((viewz > planevistest && (rover->flags & FF_BOTHPLANES || !(rover->flags & FF_INVERTPLANES))) || - (viewz < planevistest && (rover->flags & FF_BOTHPLANES || rover->flags & FF_INVERTPLANES)))) + ((viewz > planevistest && (rover->fofflags & FOF_BOTHPLANES || !(rover->fofflags & FOF_INVERTPLANES))) || + (viewz < planevistest && (rover->fofflags & FOF_BOTHPLANES || rover->fofflags & FOF_INVERTPLANES)))) { ffloor[i].b_pos = roverleft; ffloor[i].b_pos_slope = roverright; diff --git a/src/r_segs.h b/src/r_segs.h index da7d44ad4..09c68b27e 100644 --- a/src/r_segs.h +++ b/src/r_segs.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/r_skins.c b/src/r_skins.c index b7eb24345..2c031ee85 100644 --- a/src/r_skins.c +++ b/src/r_skins.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -194,7 +194,7 @@ UINT32 R_GetSkinAvailabilities(void) return 0; } - if (unlockables[i].unlocked) + if (clientGamedata->unlocked[i]) { response |= (1 << unlockShift); } @@ -225,7 +225,7 @@ boolean R_SkinUsable(INT32 playernum, INT32 skinnum) return true; } - if (Playing() && (R_SkinAvailable(mapheaderinfo[gamemap-1]->forcecharacter) == skinnum)) + if (Playing() && mapheaderinfo[gamemap-1] && (R_SkinAvailable(mapheaderinfo[gamemap-1]->forcecharacter) == skinnum)) { // Force 1. return true; @@ -236,13 +236,19 @@ boolean R_SkinUsable(INT32 playernum, INT32 skinnum) // Force 2. return true; } - + if (metalrecording && skinnum == 5) { // Force 3. return true; } + if (playernum != -1 && players[playernum].bot) + { + // Force 4. + return true; + } + // We will now check if this skin is supposed to be locked or not. for (i = 0; i < MAXUNLOCKABLES; i++) @@ -279,7 +285,7 @@ boolean R_SkinUsable(INT32 playernum, INT32 skinnum) else { // We want to check our global unlockables. - return (unlockables[unlockID].unlocked); + return (clientGamedata->unlocked[unlockID]); } } @@ -494,7 +500,7 @@ static UINT16 W_CheckForPatchSkinMarkerInPwad(UINT16 wadid, UINT16 startlump) return INT16_MAX; // not found } -static void R_LoadSkinSprites(UINT16 wadnum, UINT16 *lump, UINT16 *lastlump, skin_t *skin) +static void R_LoadSkinSprites(UINT16 wadnum, UINT16 *lump, UINT16 *lastlump, skin_t *skin, UINT8 start_spr2) { UINT16 newlastlump; UINT8 sprite2; @@ -516,7 +522,7 @@ static void R_LoadSkinSprites(UINT16 wadnum, UINT16 *lump, UINT16 *lastlump, ski { newlastlump++; // load all sprite sets we are aware of... for super! - for (sprite2 = 0; sprite2 < free_spr2; sprite2++) + for (sprite2 = start_spr2; sprite2 < free_spr2; sprite2++) R_AddSingleSpriteDef(spr2names[sprite2], &skin->sprites[FF_SPR2SUPER|sprite2], wadnum, newlastlump, *lastlump); newlastlump--; @@ -524,7 +530,7 @@ static void R_LoadSkinSprites(UINT16 wadnum, UINT16 *lump, UINT16 *lastlump, ski } // load all sprite sets we are aware of... for normal stuff. - for (sprite2 = 0; sprite2 < free_spr2; sprite2++) + for (sprite2 = start_spr2; sprite2 < free_spr2; sprite2++) R_AddSingleSpriteDef(spr2names[sprite2], &skin->sprites[sprite2], wadnum, *lump, *lastlump); if (skin->sprites[0].numframes == 0) @@ -790,7 +796,7 @@ next_token: free(buf2); // Add sprites - R_LoadSkinSprites(wadnum, &lump, &lastlump, skin); + R_LoadSkinSprites(wadnum, &lump, &lastlump, skin, 0); //ST_LoadFaceGraphics(numskins); -- nah let's do this elsewhere R_FlushTranslationColormapCache(); @@ -923,7 +929,7 @@ next_token: } // Patch sprites - R_LoadSkinSprites(wadnum, &lump, &lastlump, skin); + R_LoadSkinSprites(wadnum, &lump, &lastlump, skin, 0); //ST_LoadFaceGraphics(skinnum); -- nah let's do this elsewhere R_FlushTranslationColormapCache(); @@ -936,3 +942,149 @@ next_token: #undef HUDNAMEWRITE #undef SYMBOLCONVERT + +static UINT16 W_CheckForEitherSkinMarkerInPwad(UINT16 wadid, UINT16 startlump) +{ + UINT16 i; + const char *S_SKIN = "S_SKIN"; + const char *P_SKIN = "P_SKIN"; + lumpinfo_t *lump_p; + + // scan forward, start at + if (startlump < wadfiles[wadid]->numlumps) + { + lump_p = wadfiles[wadid]->lumpinfo + startlump; + for (i = startlump; i < wadfiles[wadid]->numlumps; i++, lump_p++) + if (memcmp(lump_p->name,S_SKIN,6)==0 || memcmp(lump_p->name,P_SKIN,6)==0) + return i; + } + return INT16_MAX; // not found +} + +static void R_RefreshSprite2ForWad(UINT16 wadnum, UINT8 start_spr2) +{ + UINT16 lump, lastlump = 0; + char *buf; + char *buf2; + char *stoken; + char *value; + size_t size; + skin_t *skin; + boolean noskincomplain; + + // + // search for all skin patch markers in pwad + // + + while ((lump = W_CheckForEitherSkinMarkerInPwad(wadnum, lastlump)) != INT16_MAX) + { + INT32 skinnum = 0; + + // advance by default + lastlump = lump + 1; + + buf = W_CacheLumpNumPwad(wadnum, lump, PU_CACHE); + size = W_LumpLengthPwad(wadnum, lump); + + // for strtok + buf2 = malloc(size+1); + if (!buf2) + I_Error("R_RefreshSprite2ForWad: No more free memory\n"); + M_Memcpy(buf2,buf,size); + buf2[size] = '\0'; + + skin = NULL; + noskincomplain = false; + + /* + Parse. Has more phases than the parser in R_AddSkins because it needs to have the patching name first (no default skin name is acceptible for patching, unlike skin creation) + */ + + stoken = strtok(buf2, "\r\n= "); + while (stoken) + { + if ((stoken[0] == '/' && stoken[1] == '/') + || (stoken[0] == '#'))// skip comments + { + stoken = strtok(NULL, "\r\n"); // skip end of line + goto next_token; // find the real next token + } + + value = strtok(NULL, "\r\n= "); + + if (!value) + I_Error("R_RefreshSprite2ForWad: syntax error in P_SKIN lump# %d(%s) in WAD %s\n", lump, W_CheckNameForNumPwad(wadnum,lump), wadfiles[wadnum]->filename); + + if (!stricmp(stoken, "name")) + { + strlwr(value); + skinnum = R_SkinAvailable(value); + if (skinnum != -1) + skin = &skins[skinnum]; + else + { + CONS_Debug(DBG_SETUP, "R_RefreshSprite2ForWad: unknown skin name in P_SKIN lump# %d(%s) in WAD %s\n", lump, W_CheckNameForNumPwad(wadnum,lump), wadfiles[wadnum]->filename); + noskincomplain = true; + } + } + + if (!skin) + break; + +next_token: + stoken = strtok(NULL, "\r\n= "); + } + free(buf2); + + if (!skin) // Didn't include a name parameter? What a waste. + { + if (!noskincomplain) + CONS_Debug(DBG_SETUP, "R_RefreshSprite2ForWad: no skin name given in P_SKIN lump #%d (WAD %s)\n", lump, wadfiles[wadnum]->filename); + continue; + } + + // Update sprites, in the range of (start_spr2 - free_spr2-1) + R_LoadSkinSprites(wadnum, &lump, &lastlump, skin, start_spr2); + //R_FlushTranslationColormapCache(); // I don't think this is needed for what we're doing? + } +} + +static playersprite_t old_spr2 = SPR2_FIRSTFREESLOT; +void R_RefreshSprite2(void) +{ + // Sprite2s being defined by custom wads can create situations where + // a custom character might want to add support, but due to load order, + // might not be defined in time. + + // The trick where you load characters then level packs to keep savedata + // in particular will practically garantuee a level pack can NEVER add custom animations, + // because custom character's Sprite2s will not be added. + + // So, go through every file, and reload the sprite2s that were added. + + INT32 i; + + if (old_spr2 > free_spr2) + { +#ifdef PARANOIA + I_Error("R_RefreshSprite2: old_spr2 is too high?! (old_spr2: %d, free_spr2: %d)\n", old_spr2, free_spr2); +#else + // Just silently fix + old_spr2 = free_spr2; +#endif + } + + if (old_spr2 == free_spr2) + { + // No sprite2s were added since the last time we did freeslots. + return; + } + + for (i = 0; i < numwadfiles; i++) + { + R_RefreshSprite2ForWad(i, old_spr2); + } + + // Update previous value. + old_spr2 = free_spr2; +} diff --git a/src/r_skins.h b/src/r_skins.h index a38997f4d..082b690dd 100644 --- a/src/r_skins.h +++ b/src/r_skins.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -100,4 +100,6 @@ void R_PatchSkins(UINT16 wadnum, boolean mainfile); UINT8 P_GetSkinSprite2(skin_t *skin, UINT8 spr2, player_t *player); +void R_RefreshSprite2(void); + #endif //__R_SKINS__ diff --git a/src/r_sky.c b/src/r_sky.c index 041cccfc5..c47029f0b 100644 --- a/src/r_sky.c +++ b/src/r_sky.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/r_sky.h b/src/r_sky.h index f4356dcfa..012f47d23 100644 --- a/src/r_sky.h +++ b/src/r_sky.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/r_splats.c b/src/r_splats.c index 4783fb640..72bfe74b3 100644 --- a/src/r_splats.c +++ b/src/r_splats.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -11,6 +11,7 @@ /// \brief Floor splats #include "r_draw.h" +#include "r_fps.h" #include "r_main.h" #include "r_splats.h" #include "r_bsp.h" @@ -155,7 +156,6 @@ void R_DrawFloorSplat(vissprite_t *spr) fixed_t xscale, yscale; fixed_t xoffset, yoffset; fixed_t leftoffset, topoffset; - pslope_t *slope = NULL; INT32 i; boolean hflip = (spr->xiscale < 0); @@ -188,7 +188,7 @@ void R_DrawFloorSplat(vissprite_t *spr) if (spr->rotateflags & SRF_3D || renderflags & RF_NOSPLATBILLBOARD) splatangle = mobj->angle; else - splatangle = spr->viewangle; + splatangle = spr->viewpoint.angle; if (!(spr->cut & SC_ISROTATED)) splatangle += mobj->rollangle; @@ -217,8 +217,8 @@ void R_DrawFloorSplat(vissprite_t *spr) splat.x = x; splat.y = y; - splat.z = mobj->z; - splat.tilted = false; + splat.z = spr->pz; + splat.slope = NULL; // Set positions @@ -238,9 +238,9 @@ void R_DrawFloorSplat(vissprite_t *spr) splat.verts[3].x = w - xoffset; splat.verts[3].y = -h + yoffset; - angle = -splat.angle; - ca = FINECOSINE(angle>>ANGLETOFINESHIFT); - sa = FINESINE(angle>>ANGLETOFINESHIFT); + angle = -splat.angle>>ANGLETOFINESHIFT; + ca = FINECOSINE(angle); + sa = FINESINE(angle); // Rotate for (i = 0; i < 4; i++) @@ -255,47 +255,21 @@ void R_DrawFloorSplat(vissprite_t *spr) // The slope that was defined for the sprite. if (renderflags & RF_SLOPESPLAT) - slope = mobj->floorspriteslope; + splat.slope = mobj->floorspriteslope; if (standingslope && (renderflags & RF_OBJECTSLOPESPLAT)) - slope = standingslope; - - // Set splat as tilted - splat.tilted = (slope != NULL); - } - - if (splat.tilted) - { - pslope_t *s = &splat.slope; - - s->o.x = slope->o.x; - s->o.y = slope->o.y; - s->o.z = slope->o.z; - - s->d.x = slope->d.x; - s->d.y = slope->d.y; - - s->normal.x = slope->normal.x; - s->normal.y = slope->normal.y; - s->normal.z = slope->normal.z; - - s->zdelta = slope->zdelta; - s->zangle = slope->zangle; - s->xydirection = slope->xydirection; - - s->next = NULL; - s->flags = 0; + splat.slope = standingslope; } // Translate for (i = 0; i < 4; i++) { - tr_x = rotated[i].x + x; - tr_y = rotated[i].y + y; + tr_x = rotated[i].x + mobj->x; + tr_y = rotated[i].y + mobj->y; - if (slope) + if (splat.slope) { - rot_z = P_GetSlopeZAt(slope, tr_x, tr_y); + rot_z = P_GetSlopeZAt(splat.slope, tr_x, tr_y); splat.verts[i].z = rot_z; } else @@ -305,18 +279,23 @@ void R_DrawFloorSplat(vissprite_t *spr) splat.verts[i].y = tr_y; } + angle = spr->viewpoint.angle >> ANGLETOFINESHIFT; + ca = FINECOSINE(angle); + sa = FINESINE(angle); + + // Project for (i = 0; i < 4; i++) { v3d = &splat.verts[i]; // transform the origin point - tr_x = v3d->x - viewx; - tr_y = v3d->y - viewy; + tr_x = v3d->x - spr->viewpoint.x; + tr_y = v3d->y - spr->viewpoint.y; // rotation around vertical y axis - rot_x = FixedMul(tr_x, viewsin) - FixedMul(tr_y, viewcos); - rot_y = FixedMul(tr_x, viewcos) + FixedMul(tr_y, viewsin); - rot_z = v3d->z - viewz; + rot_x = FixedMul(tr_x - (mobj->x - x), sa) - FixedMul(tr_y - (mobj->y - y), ca); + rot_y = FixedMul(tr_x - (mobj->x - x), ca) + FixedMul(tr_y - (mobj->y - y), sa); + rot_z = v3d->z - spr->viewpoint.z; if (rot_y < FRACUNIT) return; @@ -412,35 +391,40 @@ static void R_RasterizeFloorSplat(floorsplat_t *pSplat, vector2_t *verts, visspr ds_source = (UINT8 *)pSplat->pic; ds_flatwidth = pSplat->width; ds_flatheight = pSplat->height; + ds_powersoftwo = false; if (R_CheckPowersOfTwo()) - R_CheckFlatLength(ds_flatwidth * ds_flatheight); + { + R_SetFlatVars(ds_flatwidth * ds_flatheight); + ds_powersoftwo = true; + } - if (pSplat->tilted) + if (pSplat->slope) { R_SetTiltedSpan(0); - R_SetScaledSlopePlane(&pSplat->slope, viewx, viewy, viewz, pSplat->xscale, pSplat->yscale, -pSplat->verts[0].x, pSplat->verts[0].y, vis->viewangle, pSplat->angle); + R_SetScaledSlopePlane(pSplat->slope, vis->viewpoint.x, vis->viewpoint.y, vis->viewpoint.z, pSplat->xscale, pSplat->yscale, -pSplat->verts[0].x, pSplat->verts[0].y, vis->viewpoint.angle, pSplat->angle); R_CalculateSlopeVectors(); spanfunctype = SPANDRAWFUNC_TILTEDSPRITE; } else { - planeheight = abs(pSplat->z - viewz); + planeheight = abs(pSplat->z - vis->viewpoint.z); if (pSplat->angle) { - // Add the view offset, rotated by the plane angle. - fixed_t a = -pSplat->verts[0].x + viewx; - fixed_t b = -pSplat->verts[0].y + viewy; - angle_t angle = (pSplat->angle >> ANGLETOFINESHIFT); - offsetx = FixedMul(a, FINECOSINE(angle)) - FixedMul(b,FINESINE(angle)); - offsety = -FixedMul(a, FINESINE(angle)) - FixedMul(b,FINECOSINE(angle)); memset(cachedheight, 0, sizeof(cachedheight)); + + // Add the view offset, rotated by the plane angle. + fixed_t a = -pSplat->verts[0].x + vis->viewpoint.x; + fixed_t b = -pSplat->verts[0].y + vis->viewpoint.y; + angle_t angle = (pSplat->angle >> ANGLETOFINESHIFT); + offsetx = FixedMul(a, FINECOSINE(angle)) - FixedMul(b, FINESINE(angle)); + offsety = -FixedMul(a, FINESINE(angle)) - FixedMul(b, FINECOSINE(angle)); } else { - offsetx = viewx - pSplat->verts[0].x; - offsety = pSplat->verts[0].y - viewy; + offsetx = vis->viewpoint.x - pSplat->verts[0].x; + offsety = pSplat->verts[0].y - vis->viewpoint.y; } } @@ -461,7 +445,7 @@ static void R_RasterizeFloorSplat(floorsplat_t *pSplat, vector2_t *verts, visspr { ds_transmap = vis->transmap; - if (pSplat->tilted) + if (pSplat->slope) spanfunctype = SPANDRAWFUNC_TILTEDTRANSSPRITE; else spanfunctype = SPANDRAWFUNC_TRANSSPRITE; @@ -503,7 +487,7 @@ static void R_RasterizeFloorSplat(floorsplat_t *pSplat, vector2_t *verts, visspr continue; for (i = x1; i <= x2; i++) - cliptab[i] = (y >= mfloorclip[i]); + cliptab[i] = (y >= mfloorclip[i] || y <= mceilingclip[i]); // clip left while (cliptab[x1]) @@ -528,12 +512,12 @@ static void R_RasterizeFloorSplat(floorsplat_t *pSplat, vector2_t *verts, visspr if (x2 < x1) continue; - if (!pSplat->tilted) + if (!pSplat->slope) { fixed_t xstep, ystep; fixed_t distance, span; - angle_t angle = (vis->viewangle + pSplat->angle)>>ANGLETOFINESHIFT; + angle_t angle = (vis->viewpoint.angle + pSplat->angle)>>ANGLETOFINESHIFT; angle_t planecos = FINECOSINE(angle); angle_t planesin = FINESINE(angle); @@ -577,7 +561,7 @@ static void R_RasterizeFloorSplat(floorsplat_t *pSplat, vector2_t *verts, visspr rastertab[y].maxx = INT32_MIN; } - if (pSplat->angle && !pSplat->tilted) + if (pSplat->angle && !pSplat->slope) memset(cachedheight, 0, sizeof(cachedheight)); } diff --git a/src/r_splats.h b/src/r_splats.h index cab3d63b6..dcae2789c 100644 --- a/src/r_splats.h +++ b/src/r_splats.h @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -34,8 +34,7 @@ typedef struct floorsplat_s INT32 width, height; fixed_t scale, xscale, yscale; angle_t angle; - boolean tilted; // Uses the tilted drawer - pslope_t slope; + pslope_t *slope; vector3_t verts[4]; // (x,y,z) as viewed from above on map fixed_t x, y, z; // position diff --git a/src/r_state.h b/src/r_state.h index 5a606ed8c..b36697f73 100644 --- a/src/r_state.h +++ b/src/r_state.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/r_textures.c b/src/r_textures.c index d5da69018..69e64074d 100644 --- a/src/r_textures.c +++ b/src/r_textures.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -59,6 +59,7 @@ INT32 *texturetranslation; // Painfully simple texture id cacheing to make maps load faster. :3 static struct { char name[9]; + UINT32 hash; INT32 id; } *tidcache = NULL; static INT32 tidcachelen = 0; @@ -619,88 +620,99 @@ void *R_GetLevelFlat(levelflat_t *levelflat) } // -// R_CheckPowersOfTwo -// -// Sets ds_powersoftwo true if the flat's dimensions are powers of two, and returns that. +// Checks if the current flat's dimensions are powers of two // boolean R_CheckPowersOfTwo(void) { - boolean wpow2 = (!(ds_flatwidth & (ds_flatwidth - 1))); - boolean hpow2 = (!(ds_flatheight & (ds_flatheight - 1))); + boolean wpow2 = !(ds_flatwidth & (ds_flatwidth - 1)); + boolean hpow2 = !(ds_flatheight & (ds_flatheight - 1)); - // Initially, the flat isn't powers-of-two-sized. - ds_powersoftwo = false; + if (ds_flatwidth > 2048 || ds_flatheight > 2048) + return false; - // But if the width and height are powers of two, - // and are EQUAL, then it's okay :] - if ((ds_flatwidth == ds_flatheight) && (wpow2 && hpow2)) - ds_powersoftwo = true; - - // Just return ds_powersoftwo. - return ds_powersoftwo; + return ds_flatwidth == ds_flatheight && wpow2 && hpow2; } // -// R_CheckFlatLength +// Checks if the current flat's dimensions are 1x1 // -// Determine the flat's dimensions from its lump length. +boolean R_CheckSolidColorFlat(void) +{ + return ds_flatwidth == 1 && ds_flatheight == 1; +} + // -void R_CheckFlatLength(size_t size) +// Returns the flat size corresponding to the length of a lump +// +UINT16 R_GetFlatSize(size_t length) +{ + switch (length) + { + case 4194304: // 2048x2048 lump + return 2048; + case 1048576: // 1024x1024 lump + return 1024; + case 262144:// 512x512 lump + return 512; + case 65536: // 256x256 lump + return 256; + case 16384: // 128x128 lump + return 128; + case 1024: // 32x32 lump + return 32; + case 256: // 16x16 lump + return 16; + case 64: // 8x8 lump + return 8; + case 16: // 4x4 lump + return 4; + case 4: // 2x2 lump + return 2; + case 1: // 1x1 lump + return 1; + default: // 64x64 lump + return 64; + } +} + +// +// Determines a flat's width bits from its size +// +UINT8 R_GetFlatBits(INT32 size) { switch (size) { - case 4194304: // 2048x2048 lump - nflatmask = 0x3FF800; - nflatxshift = 21; - nflatyshift = 10; - nflatshiftup = 5; - ds_flatwidth = ds_flatheight = 2048; - break; - case 1048576: // 1024x1024 lump - nflatmask = 0xFFC00; - nflatxshift = 22; - nflatyshift = 12; - nflatshiftup = 6; - ds_flatwidth = ds_flatheight = 1024; - break; - case 262144:// 512x512 lump - nflatmask = 0x3FE00; - nflatxshift = 23; - nflatyshift = 14; - nflatshiftup = 7; - ds_flatwidth = ds_flatheight = 512; - break; - case 65536: // 256x256 lump - nflatmask = 0xFF00; - nflatxshift = 24; - nflatyshift = 16; - nflatshiftup = 8; - ds_flatwidth = ds_flatheight = 256; - break; - case 16384: // 128x128 lump - nflatmask = 0x3F80; - nflatxshift = 25; - nflatyshift = 18; - nflatshiftup = 9; - ds_flatwidth = ds_flatheight = 128; - break; - case 1024: // 32x32 lump - nflatmask = 0x3E0; - nflatxshift = 27; - nflatyshift = 22; - nflatshiftup = 11; - ds_flatwidth = ds_flatheight = 32; - break; - default: // 64x64 lump - nflatmask = 0xFC0; - nflatxshift = 26; - nflatyshift = 20; - nflatshiftup = 10; - ds_flatwidth = ds_flatheight = 64; - break; + case 2048: return 11; + case 1024: return 10; + case 512: return 9; + case 256: return 8; + case 128: return 7; + case 32: return 5; + case 16: return 4; + case 8: return 3; + case 4: return 2; + case 2: return 1; + case 1: return 0; + default: return 6; // 64x64 } } +void R_SetFlatVars(size_t length) +{ + UINT16 size = R_GetFlatSize(length); + UINT8 bits = R_GetFlatBits(size); + + ds_flatwidth = ds_flatheight = size; + + if (bits == 0) + return; + + nflatshiftup = 16 - bits; + nflatxshift = 16 + nflatshiftup; + nflatyshift = nflatxshift - bits; + nflatmask = (size - 1) * size; +} + // // Empty the texture cache (used for load wad at runtime) // @@ -725,9 +737,10 @@ Rloadflats (INT32 i, INT32 w) UINT16 texstart, texend; texture_t *texture; texpatch_t *patch; + UINT8 header[PNG_HEADER_SIZE]; // Yes - if (wadfiles[w]->type == RET_PK3) + if (W_FileHasFolders(wadfiles[w])) { texstart = W_CheckNumForFolderStartPK3("flats/", (UINT16)w, 0); texend = W_CheckNumForFolderEndPK3("flats/", (UINT16)w, texstart); @@ -743,59 +756,37 @@ Rloadflats (INT32 i, INT32 w) // Work through each lump between the markers in the WAD. for (j = 0; j < (texend - texstart); j++) { - UINT8 *flatlump; UINT16 wadnum = (UINT16)w; lumpnum_t lumpnum = texstart + j; size_t lumplength; - size_t flatsize = 0; + size_t flatsize; - if (wadfiles[w]->type == RET_PK3) + if (W_FileHasFolders(wadfiles[w])) { if (W_IsLumpFolder(wadnum, lumpnum)) // Check if lump is a folder continue; // If it is then SKIP IT } - flatlump = W_CacheLumpNumPwad(wadnum, lumpnum, PU_CACHE); + W_ReadLumpHeaderPwad(wadnum, lumpnum, header, sizeof header, 0); lumplength = W_LumpLengthPwad(wadnum, lumpnum); - - switch (lumplength) - { - case 4194304: // 2048x2048 lump - flatsize = 2048; - break; - case 1048576: // 1024x1024 lump - flatsize = 1024; - break; - case 262144:// 512x512 lump - flatsize = 512; - break; - case 65536: // 256x256 lump - flatsize = 256; - break; - case 16384: // 128x128 lump - flatsize = 128; - break; - case 1024: // 32x32 lump - flatsize = 32; - break; - default: // 64x64 lump - flatsize = 64; - break; - } + flatsize = R_GetFlatSize(lumplength); //CONS_Printf("\n\"%s\" is a flat, dimensions %d x %d",W_CheckNameForNumPwad((UINT16)w,texstart+j),flatsize,flatsize); texture = textures[i] = Z_Calloc(sizeof(texture_t) + sizeof(texpatch_t), PU_STATIC, NULL); // Set texture properties. M_Memcpy(texture->name, W_CheckNameForNumPwad(wadnum, lumpnum), sizeof(texture->name)); + texture->hash = quickncasehash(texture->name, 8); #ifndef NO_PNG_LUMPS - if (Picture_IsLumpPNG((UINT8 *)flatlump, lumplength)) + if (Picture_IsLumpPNG(header, lumplength)) { + UINT8 *flatlump = W_CacheLumpNumPwad(wadnum, lumpnum, PU_CACHE); INT32 width, height; Picture_PNGDimensions((UINT8 *)flatlump, &width, &height, NULL, NULL, lumplength); texture->width = (INT16)width; texture->height = (INT16)height; + Z_Free(flatlump); } else #endif @@ -814,8 +805,6 @@ Rloadflats (INT32 i, INT32 w) patch->lump = texstart + j; patch->flip = 0; - Z_Unlock(flatlump); - texturewidth[i] = texture->width; textureheight[i] = texture->height << FRACBITS; i++; @@ -835,11 +824,11 @@ Rloadtextures (INT32 i, INT32 w) UINT16 j; UINT16 texstart, texend, texturesLumpPos; texture_t *texture; - softwarepatch_t *patchlump; texpatch_t *patch; + softwarepatch_t patchlump; // Get the lump numbers for the markers in the WAD, if they exist. - if (wadfiles[w]->type == RET_PK3) + if (W_FileHasFolders(wadfiles[w])) { texstart = W_CheckNumForFolderStartPK3("textures/", (UINT16)w, 0); texend = W_CheckNumForFolderEndPK3("textures/", (UINT16)w, texstart); @@ -870,13 +859,13 @@ Rloadtextures (INT32 i, INT32 w) size_t lumplength; #endif - if (wadfiles[w]->type == RET_PK3) + if (W_FileHasFolders(wadfiles[w])) { if (W_IsLumpFolder(wadnum, lumpnum)) // Check if lump is a folder continue; // If it is then SKIP IT } - patchlump = W_CacheLumpNumPwad(wadnum, lumpnum, PU_CACHE); + W_ReadLumpHeaderPwad(wadnum, lumpnum, &patchlump, PNG_HEADER_SIZE, 0); #ifndef NO_PNG_LUMPS lumplength = W_LumpLengthPwad(wadnum, lumpnum); #endif @@ -886,20 +875,23 @@ Rloadtextures (INT32 i, INT32 w) // Set texture properties. M_Memcpy(texture->name, W_CheckNameForNumPwad(wadnum, lumpnum), sizeof(texture->name)); + texture->hash = quickncasehash(texture->name, 8); #ifndef NO_PNG_LUMPS - if (Picture_IsLumpPNG((UINT8 *)patchlump, lumplength)) + if (Picture_IsLumpPNG((UINT8 *)&patchlump, lumplength)) { + UINT8 *png = W_CacheLumpNumPwad(wadnum, lumpnum, PU_CACHE); INT32 width, height; - Picture_PNGDimensions((UINT8 *)patchlump, &width, &height, NULL, NULL, lumplength); + Picture_PNGDimensions(png, &width, &height, NULL, NULL, lumplength); texture->width = (INT16)width; texture->height = (INT16)height; + Z_Free(png); } else #endif { - texture->width = SHORT(patchlump->width); - texture->height = SHORT(patchlump->height); + texture->width = SHORT(patchlump.width); + texture->height = SHORT(patchlump.height); } texture->type = TEXTURETYPE_SINGLEPATCH; @@ -915,8 +907,6 @@ Rloadtextures (INT32 i, INT32 w) patch->lump = texstart + j; patch->flip = 0; - Z_Unlock(patchlump); - texturewidth[i] = texture->width; textureheight[i] = texture->height << FRACBITS; i++; @@ -926,27 +916,53 @@ Rloadtextures (INT32 i, INT32 w) return i; } -// -// R_LoadTextures -// Initializes the texture list with the textures from the world map. -// -void R_LoadTextures(void) +static INT32 +count_range +( const char * marker_start, + const char * marker_end, + const char * folder, + UINT16 wadnum) { - INT32 i, w; UINT16 j; - UINT16 texstart, texend, texturesLumpPos; + UINT16 texstart, texend; + INT32 count = 0; - // Free previous memory before numtextures change. - if (numtextures) + // Count flats + if (W_FileHasFolders(wadfiles[wadnum])) { - for (i = 0; i < numtextures; i++) - { - Z_Free(textures[i]); - Z_Free(texturecache[i]); - } - Z_Free(texturetranslation); - Z_Free(textures); + texstart = W_CheckNumForFolderStartPK3(folder, wadnum, 0); + texend = W_CheckNumForFolderEndPK3(folder, wadnum, texstart); } + else + { + texstart = W_CheckNumForMarkerStartPwad(marker_start, wadnum, 0); + texend = W_CheckNumForNamePwad(marker_end, wadnum, texstart); + } + + if (texstart != INT16_MAX && texend != INT16_MAX) + { + // PK3s have subfolders, so we can't just make a simple sum + if (W_FileHasFolders(wadfiles[wadnum])) + { + for (j = texstart; j < texend; j++) + { + if (!W_IsLumpFolder(wadnum, j)) // Check if lump is a folder; if not, then count it + count++; + } + } + else // Add all the textures between markers + { + count += (texend - texstart); + } + } + + return count; +} + +static INT32 R_CountTextures(UINT16 wadnum) +{ + UINT16 texturesLumpPos; + INT32 count = 0; // Load patches and textures. @@ -955,113 +971,132 @@ void R_LoadTextures(void) // the markers. // This system will allocate memory for all duplicate/patched textures even if it never uses them, // but the alternative is to spend a ton of time checking and re-checking all previous entries just to skip any potentially patched textures. - for (w = 0, numtextures = 0; w < numwadfiles; w++) - { + #ifdef WALLFLATS - // Count flats - if (wadfiles[w]->type == RET_PK3) - { - texstart = W_CheckNumForFolderStartPK3("flats/", (UINT16)w, 0); - texend = W_CheckNumForFolderEndPK3("flats/", (UINT16)w, texstart); - } - else - { - texstart = W_CheckNumForMarkerStartPwad("F_START", (UINT16)w, 0); - texend = W_CheckNumForNamePwad("F_END", (UINT16)w, texstart); - } + count += count_range("F_START", "F_END", "flats/", wadnum); +#endif - if (!( texstart == INT16_MAX || texend == INT16_MAX )) - { - // PK3s have subfolders, so we can't just make a simple sum - if (wadfiles[w]->type == RET_PK3) - { - for (j = texstart; j < texend; j++) - { - if (!W_IsLumpFolder((UINT16)w, j)) // Check if lump is a folder; if not, then count it - numtextures++; - } - } - else // Add all the textures between F_START and F_END - { - numtextures += (UINT32)(texend - texstart); - } - } -#endif/*WALLFLATS*/ + // Count the textures from TEXTURES lumps + texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", wadnum, 0); - // Count the textures from TEXTURES lumps - texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", (UINT16)w, 0); - while (texturesLumpPos != INT16_MAX) - { - numtextures += R_CountTexturesInTEXTURESLump((UINT16)w, (UINT16)texturesLumpPos); - texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", (UINT16)w, texturesLumpPos + 1); - } - - // Count single-patch textures - if (wadfiles[w]->type == RET_PK3) - { - texstart = W_CheckNumForFolderStartPK3("textures/", (UINT16)w, 0); - texend = W_CheckNumForFolderEndPK3("textures/", (UINT16)w, texstart); - } - else - { - texstart = W_CheckNumForMarkerStartPwad(TX_START, (UINT16)w, 0); - texend = W_CheckNumForNamePwad(TX_END, (UINT16)w, 0); - } - - if (texstart == INT16_MAX || texend == INT16_MAX) - continue; - - // PK3s have subfolders, so we can't just make a simple sum - if (wadfiles[w]->type == RET_PK3) - { - for (j = texstart; j < texend; j++) - { - if (!W_IsLumpFolder((UINT16)w, j)) // Check if lump is a folder; if not, then count it - numtextures++; - } - } - else // Add all the textures between TX_START and TX_END - { - numtextures += (UINT32)(texend - texstart); - } + while (texturesLumpPos != INT16_MAX) + { + count += R_CountTexturesInTEXTURESLump(wadnum, texturesLumpPos); + texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", wadnum, texturesLumpPos + 1); } - // If no textures found by this point, bomb out - if (!numtextures) - I_Error("No textures detected in any WADs!\n"); + // Count single-patch textures + count += count_range(TX_START, TX_END, "textures/", wadnum); + + return count; +} + +static void +recallocuser +( void * user, + size_t old, + size_t new) +{ + char *p = Z_Realloc(*(void**)user, + new, PU_STATIC, user); + + if (new > old) + memset(&p[old], 0, (new - old)); +} + +static void R_AllocateTextures(INT32 add) +{ + const INT32 newtextures = (numtextures + add); + const size_t newsize = newtextures * sizeof (void*); + const size_t oldsize = numtextures * sizeof (void*); + + INT32 i; // Allocate memory and initialize to 0 for all the textures we are initialising. - // There are actually 5 buffers allocated in one for convenience. - textures = Z_Calloc((numtextures * sizeof(void *)) * 5, PU_STATIC, NULL); + recallocuser(&textures, oldsize, newsize); // Allocate texture column offset table. - texturecolumnofs = (void *)((UINT8 *)textures + (numtextures * sizeof(void *))); + recallocuser(&texturecolumnofs, oldsize, newsize); // Allocate texture referencing cache. - texturecache = (void *)((UINT8 *)textures + ((numtextures * sizeof(void *)) * 2)); + recallocuser(&texturecache, oldsize, newsize); // Allocate texture width table. - texturewidth = (void *)((UINT8 *)textures + ((numtextures * sizeof(void *)) * 3)); + recallocuser(&texturewidth, oldsize, newsize); // Allocate texture height table. - textureheight = (void *)((UINT8 *)textures + ((numtextures * sizeof(void *)) * 4)); + recallocuser(&textureheight, oldsize, newsize); // Create translation table for global animation. - texturetranslation = Z_Malloc((numtextures + 1) * sizeof(*texturetranslation), PU_STATIC, NULL); + Z_Realloc(texturetranslation, (newtextures + 1) * sizeof(*texturetranslation), PU_STATIC, &texturetranslation); - for (i = 0; i < numtextures; i++) - texturetranslation[i] = i; - - for (i = 0, w = 0; w < numwadfiles; w++) + for (i = 0; i < numtextures; ++i) { -#ifdef WALLFLATS - i = Rloadflats(i, w); -#endif - i = Rloadtextures(i, w); + // R_FlushTextureCache relies on the user for + // Z_Free, texturecache has been reallocated so the + // user is now garbage memory. + Z_SetUser(texturecache[i], + (void**)&texturecache[i]); } + while (i < newtextures) + { + texturetranslation[i] = i; + i++; + } +} + +static INT32 R_DefineTextures(INT32 i, UINT16 w) +{ +#ifdef WALLFLATS + i = Rloadflats(i, w); +#endif + return Rloadtextures(i, w); +} + +static void R_FinishLoadingTextures(INT32 add) +{ + numtextures += add; + #ifdef HWRENDER if (rendermode == render_opengl) HWR_LoadMapTextures(numtextures); #endif } +// +// R_LoadTextures +// Initializes the texture list with the textures from the world map. +// +void R_LoadTextures(void) +{ + INT32 i, w; + INT32 newtextures = 0; + + for (w = 0; w < numwadfiles; w++) + { + newtextures += R_CountTextures((UINT16)w); + } + + // If no textures found by this point, bomb out + if (!newtextures) + I_Error("No textures detected in any WADs!\n"); + + R_AllocateTextures(newtextures); + + for (i = 0, w = 0; w < numwadfiles; w++) + { + i = R_DefineTextures(i, w); + } + + R_FinishLoadingTextures(newtextures); +} + +void R_LoadTexturesPwad(UINT16 wadnum) +{ + INT32 newtextures = R_CountTextures(wadnum); + + R_AllocateTextures(newtextures); + R_DefineTextures(numtextures, wadnum); + R_FinishLoadingTextures(newtextures); +} + static texpatch_t *R_ParsePatch(boolean actuallyLoadPatch) { char *texturesToken; @@ -1368,6 +1403,7 @@ static texture_t *R_ParseTexture(boolean actuallyLoadTexture) // Allocate memory for a zero-patch texture. Obviously, we'll be adding patches momentarily. resultTexture = (texture_t *)Z_Calloc(sizeof(texture_t),PU_STATIC,NULL); M_Memcpy(resultTexture->name, newTextureName, 8); + resultTexture->hash = quickncasehash(newTextureName, 8); resultTexture->width = newTextureWidth; resultTexture->height = newTextureHeight; resultTexture->type = TEXTURETYPE_COMPOSITE; @@ -1553,6 +1589,7 @@ lumpnum_t R_GetFlatNumForName(const char *name) continue; break; case RET_PK3: + case RET_FOLDER: if ((start = W_CheckNumForFolderStartPK3("Flats/", i, 0)) == INT16_MAX) continue; if ((end = W_CheckNumForFolderEndPK3("Flats/", i, start)) == INT16_MAX) @@ -1593,19 +1630,22 @@ void R_ClearTextureNumCache(boolean btell) INT32 R_CheckTextureNumForName(const char *name) { INT32 i; + UINT32 hash; // "NoTexture" marker. if (name[0] == '-') return 0; + hash = quickncasehash(name, 8); + for (i = 0; i < tidcachelen; i++) - if (!strncasecmp(tidcache[i].name, name, 8)) + if (tidcache[i].hash == hash && !strncasecmp(tidcache[i].name, name, 8)) return tidcache[i].id; // Need to parse the list backwards, so textures loaded more recently are used in lieu of ones loaded earlier //for (i = 0; i < numtextures; i++) <- old for (i = (numtextures - 1); i >= 0; i--) // <- new - if (!strncasecmp(textures[i]->name, name, 8)) + if (textures[i]->hash == hash && !strncasecmp(textures[i]->name, name, 8)) { tidcachelen++; Z_Realloc(tidcache, tidcachelen * sizeof(*tidcache), PU_STATIC, &tidcache); @@ -1614,6 +1654,7 @@ INT32 R_CheckTextureNumForName(const char *name) #ifndef ZDEBUG CONS_Debug(DBG_SETUP, "texture #%s: %s\n", sizeu1(tidcachelen), tidcache[tidcachelen-1].name); #endif + tidcache[tidcachelen-1].hash = hash; tidcache[tidcachelen-1].id = i; return i; } diff --git a/src/r_textures.h b/src/r_textures.h index dd286b6ac..4a3c10b9e 100644 --- a/src/r_textures.h +++ b/src/r_textures.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -54,6 +54,7 @@ typedef struct { // Keep name for switch changing, etc. char name[8]; + UINT32 hash; UINT8 type; // TEXTURETYPE_ INT16 width, height; boolean holes; @@ -76,6 +77,7 @@ extern UINT8 **texturecache; // graphics data for each generated full-size textu // Load TEXTURES definitions, create lookup tables void R_LoadTextures(void); +void R_LoadTexturesPwad(UINT16 wadnum); void R_FlushTextureCache(void); // Texture generation @@ -91,7 +93,11 @@ UINT8 *R_GetColumn(fixed_t tex, INT32 col); void *R_GetFlat(lumpnum_t flatnum); boolean R_CheckPowersOfTwo(void); -void R_CheckFlatLength(size_t size); +boolean R_CheckSolidColorFlat(void); + +UINT16 R_GetFlatSize(size_t length); +UINT8 R_GetFlatBits(INT32 size); +void R_SetFlatVars(size_t length); // Returns the texture number for the texture name. INT32 R_TextureNumForName(const char *name); diff --git a/src/r_things.c b/src/r_things.c index da8f90f62..d1d9aed94 100644 --- a/src/r_things.c +++ b/src/r_things.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -23,6 +23,7 @@ #include "info.h" // spr2names #include "i_video.h" // rendermode #include "i_system.h" +#include "r_fps.h" #include "r_things.h" #include "r_patch.h" #include "r_patchrotation.h" @@ -443,6 +444,7 @@ void R_AddSpriteDefs(UINT16 wadnum) end = W_CheckNumForNamePwad("SS_END",wadnum,start); //deutex compatib. break; case RET_PK3: + case RET_FOLDER: start = W_CheckNumForFolderStartPK3("Sprites/", wadnum, 0); end = W_CheckNumForFolderEndPK3("Sprites/", wadnum, start); break; @@ -753,13 +755,13 @@ UINT8 *R_GetSpriteTranslation(vissprite_t *vis) else if (vis->mobj->type == MT_METALSONIC_BATTLE) return R_GetTranslationColormap(TC_METALSONIC, 0, GTC_CACHE); else - return R_GetTranslationColormap(TC_BOSS, vis->mobj->color, GTC_CACHE); + return R_GetTranslationColormap(TC_BOSS, vis->color, GTC_CACHE); } - else if (vis->mobj->color) + else if (vis->color) { // New colormap stuff for skins Tails 06-07-2002 if (!(vis->cut & SC_PRECIP) && vis->mobj->colorized) - return R_GetTranslationColormap(TC_RAINBOW, vis->mobj->color, GTC_CACHE); + return R_GetTranslationColormap(TC_RAINBOW, vis->color, GTC_CACHE); else if (!(vis->cut & SC_PRECIP) && vis->mobj->player && vis->mobj->player->dashmode >= DASHMODE_THRESHOLD && (vis->mobj->player->charflags & SF_DASHMODE) @@ -768,15 +770,15 @@ UINT8 *R_GetSpriteTranslation(vissprite_t *vis) if (vis->mobj->player->charflags & SF_MACHINE) return R_GetTranslationColormap(TC_DASHMODE, 0, GTC_CACHE); else - return R_GetTranslationColormap(TC_RAINBOW, vis->mobj->color, GTC_CACHE); + return R_GetTranslationColormap(TC_RAINBOW, vis->color, GTC_CACHE); } else if (!(vis->cut & SC_PRECIP) && vis->mobj->skin && vis->mobj->sprite == SPR_PLAY) // This thing is a player! { size_t skinnum = (skin_t*)vis->mobj->skin-skins; - return R_GetTranslationColormap((INT32)skinnum, vis->mobj->color, GTC_CACHE); + return R_GetTranslationColormap((INT32)skinnum, vis->color, GTC_CACHE); } else // Use the defaults - return R_GetTranslationColormap(TC_DEFAULT, vis->mobj->color, GTC_CACHE); + return R_GetTranslationColormap(TC_DEFAULT, vis->color, GTC_CACHE); } else if (vis->mobj->sprite == SPR_PLAY) // Looks like a player, but doesn't have a color? Get rid of green sonic syndrome. return R_GetTranslationColormap(TC_DEFAULT, SKINCOLOR_BLUE, GTC_CACHE); @@ -821,7 +823,7 @@ static void R_DrawVisSprite(vissprite_t *vis) if (R_SpriteIsFlashing(vis)) // Bosses "flash" colfunc = colfuncs[COLDRAWFUNC_TRANS]; // translate certain pixels to white - else if (vis->mobj->color && vis->transmap) // Color mapping + else if (vis->color && vis->transmap) // Color mapping { colfunc = colfuncs[COLDRAWFUNC_TRANSTRANS]; dc_transmap = vis->transmap; @@ -831,11 +833,17 @@ static void R_DrawVisSprite(vissprite_t *vis) colfunc = colfuncs[COLDRAWFUNC_FUZZY]; dc_transmap = vis->transmap; //Fab : 29-04-98: translucency table } - else if (vis->mobj->color) // translate green skin to another color + else if (vis->color) // translate green skin to another color colfunc = colfuncs[COLDRAWFUNC_TRANS]; else if (vis->mobj->sprite == SPR_PLAY) // Looks like a player, but doesn't have a color? Get rid of green sonic syndrome. colfunc = colfuncs[COLDRAWFUNC_TRANS]; + // Hack: Use a special column function for drop shadows that bypasses + // invalid memory access crashes caused by R_ProjectDropShadow putting wrong values + // in dc_texturemid and dc_iscale when the shadow is sloped. + if (vis->cut & SC_SHADOW) + colfunc = R_DrawDropShadowColumn_8; + if (vis->extra_colormap && !(vis->renderflags & RF_NOCOLORMAPS)) { if (!dc_colormap) @@ -1048,7 +1056,7 @@ static void R_SplitSprite(vissprite_t *sprite) { fixed_t testheight; - if (!(sector->lightlist[i].caster->flags & FF_CUTSPRITES)) + if (!(sector->lightlist[i].caster->fofflags & FOF_CUTSPRITES)) continue; testheight = P_GetLightZAt(§or->lightlist[i], sprite->gx, sprite->gy); @@ -1058,7 +1066,7 @@ static void R_SplitSprite(vissprite_t *sprite) if (testheight <= sprite->gz) return; - cutfrac = (INT16)((centeryfrac - FixedMul(testheight - viewz, sprite->sortscale))>>FRACBITS); + cutfrac = (INT16)((centeryfrac - FixedMul(testheight - viewz, sprite->linkscale))>>FRACBITS); if (cutfrac < 0) continue; if (cutfrac > viewheight) @@ -1089,7 +1097,7 @@ static void R_SplitSprite(vissprite_t *sprite) newsprite->szt -= 8; newsprite->cut |= SC_TOP; - if (!(sector->lightlist[i].caster->flags & FF_NOSHADE)) + if (!(sector->lightlist[i].caster->fofflags & FOF_NOSHADE)) { lightnum = (*sector->lightlist[i].lightlevel >> LIGHTSEGSHIFT); @@ -1109,6 +1117,10 @@ static void R_SplitSprite(vissprite_t *sprite) if (lindex >= MAXLIGHTSCALE) lindex = MAXLIGHTSCALE-1; + + if (newsprite->cut & SC_SEMIBRIGHT) + lindex = (MAXLIGHTSCALE/2) + (lindex >>1); + newsprite->colormap = spritelights[lindex]; } } @@ -1123,13 +1135,33 @@ static void R_SplitSprite(vissprite_t *sprite) // fixed_t R_GetShadowZ(mobj_t *thing, pslope_t **shadowslope) { + fixed_t halfHeight; boolean isflipped = thing->eflags & MFE_VERTICALFLIP; + fixed_t floorz; + fixed_t ceilingz; fixed_t z, groundz = isflipped ? INT32_MAX : INT32_MIN; pslope_t *slope, *groundslope = NULL; msecnode_t *node; sector_t *sector; ffloor_t *rover; -#define CHECKZ (isflipped ? z > thing->z+thing->height/2 && z < groundz : z < thing->z+thing->height/2 && z > groundz) + + // for frame interpolation + interpmobjstate_t interp = {0}; + + if (R_UsingFrameInterpolation() && !paused) + { + R_InterpolateMobjState(thing, rendertimefrac, &interp); + } + else + { + R_InterpolateMobjState(thing, FRACUNIT, &interp); + } + + halfHeight = interp.z + (thing->height >> 1); + floorz = P_GetFloorZ(thing, interp.subsector->sector, interp.x, interp.y, NULL); + ceilingz = P_GetCeilingZ(thing, interp.subsector->sector, interp.x, interp.y, NULL); + +#define CHECKZ (isflipped ? z > halfHeight && z < groundz : z < halfHeight && z > groundz) for (node = thing->touching_sectorlist; node; node = node->m_sectorlist_next) { @@ -1140,7 +1172,7 @@ fixed_t R_GetShadowZ(mobj_t *thing, pslope_t **shadowslope) if (sector->heightsec != -1) z = isflipped ? sectors[sector->heightsec].ceilingheight : sectors[sector->heightsec].floorheight; else - z = isflipped ? P_GetSectorCeilingZAt(sector, thing->x, thing->y) : P_GetSectorFloorZAt(sector, thing->x, thing->y); + z = isflipped ? P_GetSectorCeilingZAt(sector, interp.x, interp.y) : P_GetSectorFloorZAt(sector, interp.x, interp.y); if CHECKZ { @@ -1151,10 +1183,10 @@ fixed_t R_GetShadowZ(mobj_t *thing, pslope_t **shadowslope) if (sector->ffloors) for (rover = sector->ffloors; rover; rover = rover->next) { - if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERPLANES) || (rover->alpha < 90 && !(rover->flags & FF_SWIMMABLE))) + if (!(rover->fofflags & FOF_EXISTS) || !(rover->fofflags & FOF_RENDERPLANES) || (rover->alpha < 90 && !(rover->fofflags & FOF_SWIMMABLE))) continue; - z = isflipped ? P_GetFFloorBottomZAt(rover, thing->x, thing->y) : P_GetFFloorTopZAt(rover, thing->x, thing->y); + z = isflipped ? P_GetFFloorBottomZAt(rover, interp.x, interp.y) : P_GetFFloorTopZAt(rover, interp.x, interp.y); if CHECKZ { groundz = z; @@ -1163,72 +1195,39 @@ fixed_t R_GetShadowZ(mobj_t *thing, pslope_t **shadowslope) } } - if (isflipped ? (thing->ceilingz < groundz - (!groundslope ? 0 : FixedMul(abs(groundslope->zdelta), thing->radius*3/2))) - : (thing->floorz > groundz + (!groundslope ? 0 : FixedMul(abs(groundslope->zdelta), thing->radius*3/2)))) + // Check polyobjects and see if groundz needs to be altered { - groundz = isflipped ? thing->ceilingz : thing->floorz; + // This isn't very precise, but the precise method was far too slow. + // (Polies are just naturally pretty flickery anyway :P) + polyobj_t *po = interp.subsector->polyList; + + while (po) + { + if (!(po->flags & POF_RENDERPLANES) || !P_MobjInsidePolyobj(po, thing)) + { + po = (polyobj_t *)(po->link.next); + continue; + } + + // We're inside it! Yess... + z = isflipped ? po->lines[0]->backsector->floorheight : po->lines[0]->backsector->ceilingheight; + if CHECKZ + { + groundz = z; + groundslope = NULL; + } + + po = (polyobj_t *)(po->link.next); + } + } + + if (isflipped ? (ceilingz < groundz - (!groundslope ? 0 : FixedMul(abs(groundslope->zdelta), thing->radius*3/2))) + : (floorz > groundz + (!groundslope ? 0 : FixedMul(abs(groundslope->zdelta), thing->radius*3/2)))) + { + groundz = isflipped ? ceilingz : floorz; groundslope = NULL; } -#if 0 // Unfortunately, this drops CEZ2 down to sub-17 FPS on my i7. - // NOTE: this section was not updated to reflect reverse gravity support - // Check polyobjects and see if groundz needs to be altered, for rings only because they don't update floorz - if (thing->type == MT_RING) - { - INT32 xl, xh, yl, yh, bx, by; - - xl = (unsigned)(thing->x - thing->radius - bmaporgx)>>MAPBLOCKSHIFT; - xh = (unsigned)(thing->x + thing->radius - bmaporgx)>>MAPBLOCKSHIFT; - yl = (unsigned)(thing->y - thing->radius - bmaporgy)>>MAPBLOCKSHIFT; - yh = (unsigned)(thing->y + thing->radius - bmaporgy)>>MAPBLOCKSHIFT; - - BMBOUNDFIX(xl, xh, yl, yh); - - validcount++; - - for (by = yl; by <= yh; by++) - for (bx = xl; bx <= xh; bx++) - { - INT32 offset; - polymaplink_t *plink; // haleyjd 02/22/06 - - if (bx < 0 || by < 0 || bx >= bmapwidth || by >= bmapheight) - continue; - - offset = by*bmapwidth + bx; - - // haleyjd 02/22/06: consider polyobject lines - plink = polyblocklinks[offset]; - - while (plink) - { - polyobj_t *po = plink->po; - - if (po->validcount != validcount) // if polyobj hasn't been checked - { - po->validcount = validcount; - - if (!P_MobjInsidePolyobj(po, thing) || !(po->flags & POF_RENDERPLANES)) - { - plink = (polymaplink_t *)(plink->link.next); - continue; - } - - // We're inside it! Yess... - z = po->lines[0]->backsector->ceilingheight; - - if (z < thing->z+thing->height/2 && z > groundz) - { - groundz = z; - groundslope = NULL; - } - } - plink = (polymaplink_t *)(plink->link.next); - } - } - } -#endif - if (shadowslope != NULL) *shadowslope = groundslope; @@ -1241,9 +1240,24 @@ static void R_SkewShadowSprite( fixed_t groundz, INT32 spriteheight, fixed_t scalemul, fixed_t *shadowyscale, fixed_t *shadowskew) { + // haha let's try some dumb stuff fixed_t xslope, zslope; - angle_t sloperelang = (R_PointToAngle(thing->x, thing->y) - groundslope->xydirection) >> ANGLETOFINESHIFT; + angle_t sloperelang; + + // for frame interpolation + interpmobjstate_t interp = {0}; + + if (R_UsingFrameInterpolation() && !paused) + { + R_InterpolateMobjState(thing, rendertimefrac, &interp); + } + else + { + R_InterpolateMobjState(thing, FRACUNIT, &interp); + } + + sloperelang = (R_PointToAngle(interp.x, interp.y) - groundslope->xydirection) >> ANGLETOFINESHIFT; xslope = FixedMul(FINESINE(sloperelang), groundslope->zdelta); zslope = FixedMul(FINECOSINE(sloperelang), groundslope->zdelta); @@ -1264,23 +1278,54 @@ static void R_ProjectDropShadow(mobj_t *thing, vissprite_t *vis, fixed_t scale, vissprite_t *shadow; patch_t *patch; fixed_t xscale, yscale, shadowxscale, shadowyscale, shadowskew, x1, x2; + INT32 heightsec, phs; INT32 light = 0; fixed_t scalemul; UINT8 trans; fixed_t floordiff; fixed_t groundz; pslope_t *groundslope; boolean isflipped = thing->eflags & MFE_VERTICALFLIP; + interpmobjstate_t interp = {0}; groundz = R_GetShadowZ(thing, &groundslope); if (abs(groundz-viewz)/tz > 4) return; // Prevent stretchy shadows and possible crashes - floordiff = abs((isflipped ? thing->height : 0) + thing->z - groundz); + if (R_UsingFrameInterpolation() && !paused) + { + R_InterpolateMobjState(thing, rendertimefrac, &interp); + } + else + { + R_InterpolateMobjState(thing, FRACUNIT, &interp); + } + + heightsec = thing->subsector->sector->heightsec; + if (viewplayer->mo && viewplayer->mo->subsector) + phs = viewplayer->mo->subsector->sector->heightsec; + else + phs = -1; + + if (heightsec != -1 && phs != -1) // only clip things which are in special sectors + { + if (viewz < sectors[phs].floorheight ? + groundz >= sectors[heightsec].floorheight : + groundz < sectors[heightsec].floorheight) + return; + if (viewz > sectors[phs].ceilingheight ? + groundz < sectors[heightsec].ceilingheight && viewz >= sectors[heightsec].ceilingheight : + groundz >= sectors[heightsec].ceilingheight) + return; + } + + floordiff = abs((isflipped ? thing->height : 0) + interp.z - groundz); trans = floordiff / (100*FRACUNIT) + 3; if (trans >= 9) return; scalemul = FixedMul(FRACUNIT - floordiff/640, scale); + if ((thing->scale != thing->old_scale) && (thing->scale >= FRACUNIT/1024)) // Interpolate shadows when scaling mobjs + scalemul = FixedMul(scalemul, FixedDiv(interp.scale, thing->scale)); patch = W_CachePatchName("DSHADOW", PU_SPRITE); xscale = FixedDiv(projection, tz); @@ -1315,24 +1360,25 @@ static void R_ProjectDropShadow(mobj_t *thing, vissprite_t *vis, fixed_t scale, shadow->mobjflags = 0; shadow->sortscale = vis->sortscale; shadow->dispoffset = vis->dispoffset - 5; - shadow->gx = thing->x; - shadow->gy = thing->y; + shadow->gx = interp.x; + shadow->gy = interp.y; shadow->gzt = (isflipped ? shadow->pzt : shadow->pz) + patch->height * shadowyscale / 2; shadow->gz = shadow->gzt - patch->height * shadowyscale; - shadow->texturemid = FixedMul(thing->scale, FixedDiv(shadow->gzt - viewz, shadowyscale)); + shadow->texturemid = FixedMul(interp.scale, FixedDiv(shadow->gzt - viewz, shadowyscale)); if (thing->skin && ((skin_t *)thing->skin)->flags & SF_HIRES) shadow->texturemid = FixedMul(shadow->texturemid, ((skin_t *)thing->skin)->highresscale); shadow->scalestep = 0; shadow->shear.tan = shadowskew; // repurposed variable shadow->mobj = thing; // Easy access! Tails 06-07-2002 + shadow->color = thing->color; shadow->x1 = x1 < portalclipstart ? portalclipstart : x1; shadow->x2 = x2 >= portalclipend ? portalclipend-1 : x2; shadow->xscale = FixedMul(xscale, shadowxscale); //SoM: 4/17/2000 shadow->scale = FixedMul(yscale, shadowyscale); - shadow->thingscale = thing->scale; + shadow->thingscale = interp.scale; shadow->sector = vis->sector; shadow->szt = (INT16)((centeryfrac - FixedMul(shadow->gzt - viewz, yscale))>>FRACBITS); shadow->sz = (INT16)((centeryfrac - FixedMul(shadow->gz - viewz, yscale))>>FRACBITS); @@ -1360,7 +1406,7 @@ static void R_ProjectDropShadow(mobj_t *thing, vissprite_t *vis, fixed_t scale, // R_GetPlaneLight won't work on sloped lights! for (lightnum = 1; lightnum < thing->subsector->sector->numlights; lightnum++) { - fixed_t h = P_GetLightZAt(&thing->subsector->sector->lightlist[lightnum], thing->x, thing->y); + fixed_t h = P_GetLightZAt(&thing->subsector->sector->lightlist[lightnum], interp.x, interp.y); if (h <= shadow->gzt) { light = lightnum - 1; break; @@ -1392,6 +1438,7 @@ static void R_ProjectSprite(mobj_t *thing) fixed_t tx, tz; fixed_t xscale, yscale; //added : 02-02-98 : aaargll..if I were a math-guy!!! fixed_t sortscale, sortsplat = 0; + fixed_t linkscale = 0; fixed_t sort_x = 0, sort_y = 0, sort_z; INT32 x1, x2; @@ -1432,13 +1479,13 @@ static void R_ProjectSprite(mobj_t *thing) fixed_t paperoffset = 0, paperdistance = 0; angle_t centerangle = 0; - INT32 dispoffset = thing->info->dispoffset; + INT32 dispoffset = thing->dispoffset; //SoM: 3/17/2000 fixed_t gz = 0, gzt = 0; INT32 heightsec, phs; INT32 light = 0; - fixed_t this_scale = thing->scale; + fixed_t this_scale; fixed_t spritexscale, spriteyscale; // rotsprite @@ -1450,9 +1497,24 @@ static void R_ProjectSprite(mobj_t *thing) INT32 rollangle = 0; #endif + // uncapped/interpolation + interpmobjstate_t interp = {0}; + + // do interpolation + if (R_UsingFrameInterpolation() && !paused) + { + R_InterpolateMobjState(oldthing, rendertimefrac, &interp); + } + else + { + R_InterpolateMobjState(oldthing, FRACUNIT, &interp); + } + + this_scale = interp.scale; + // transform the origin point - tr_x = thing->x - viewx; - tr_y = thing->y - viewy; + tr_x = interp.x - viewx; + tr_y = interp.y - viewy; basetz = tz = FixedMul(tr_x, viewcos) + FixedMul(tr_y, viewsin); // near/far distance @@ -1527,9 +1589,13 @@ static void R_ProjectSprite(mobj_t *thing) I_Error("R_ProjectSprite: sprframes NULL for sprite %d\n", thing->sprite); #endif - if (sprframe->rotate != SRF_SINGLE || papersprite) + if (splat) { - ang = R_PointToAngle (thing->x, thing->y) - (thing->player ? thing->player->drawangle : thing->angle); + ang = R_PointToAngle2(0, viewz, 0, interp.z); + } + else if (sprframe->rotate != SRF_SINGLE || papersprite) + { + ang = R_PointToAngle (interp.x, interp.y) - interp.angle; if (mirrored) ang = InvAngle(ang); } @@ -1544,7 +1610,7 @@ static void R_ProjectSprite(mobj_t *thing) else { // choose a different rotation based on player view - //ang = R_PointToAngle (thing->x, thing->y) - thing->angle; + //ang = R_PointToAngle (interp.x, interp.y) - interpangle; if ((sprframe->rotate & SRF_RIGHT) && (ang < ANGLE_180)) // See from right rot = 6; // F7 slot @@ -1581,7 +1647,16 @@ static void R_ProjectSprite(mobj_t *thing) if (thing->rollangle && !(splat && !(thing->renderflags & RF_NOSPLATROLLANGLE))) { - rollangle = R_GetRollAngle(thing->rollangle); + if (papersprite && ang >= ANGLE_180) + { + // Makes Software act much more sane like OpenGL + rollangle = R_GetRollAngle(InvAngle(thing->rollangle)); + } + else + { + rollangle = R_GetRollAngle(thing->rollangle); + } + rotsprite = Patch_GetRotatedSprite(sprframe, (thing->frame & FF_FRAMEMASK), rot, flip, false, sprinfo, rollangle); if (rotsprite != NULL) @@ -1604,15 +1679,15 @@ static void R_ProjectSprite(mobj_t *thing) flip = !flip != !hflip; // calculate edges of the shape - spritexscale = thing->spritexscale; - spriteyscale = thing->spriteyscale; + spritexscale = interp.spritexscale; + spriteyscale = interp.spriteyscale; if (spritexscale < 1 || spriteyscale < 1) return; if (thing->renderflags & RF_ABSOLUTEOFFSETS) { - spr_offset = thing->spritexoffset; - spr_topoffset = thing->spriteyoffset; + spr_offset = interp.spritexoffset; + spr_topoffset = interp.spriteyoffset; } else { @@ -1621,8 +1696,8 @@ static void R_ProjectSprite(mobj_t *thing) if ((thing->renderflags & RF_FLIPOFFSETS) && flip) flipoffset = -1; - spr_offset += thing->spritexoffset * flipoffset; - spr_topoffset += thing->spriteyoffset * flipoffset; + spr_offset += interp.spritexoffset * flipoffset; + spr_topoffset += interp.spriteyoffset * flipoffset; } if (flip) @@ -1644,8 +1719,8 @@ static void R_ProjectSprite(mobj_t *thing) offset2 *= -1; } - cosmul = FINECOSINE(thing->angle>>ANGLETOFINESHIFT); - sinmul = FINESINE(thing->angle>>ANGLETOFINESHIFT); + cosmul = FINECOSINE(interp.angle >> ANGLETOFINESHIFT); + sinmul = FINESINE(interp.angle >> ANGLETOFINESHIFT); tr_x += FixedMul(offset, cosmul); tr_y += FixedMul(offset, sinmul); @@ -1661,7 +1736,7 @@ static void R_ProjectSprite(mobj_t *thing) paperoffset = -paperoffset; paperdistance = -paperdistance; } - centerangle = viewangle - thing->angle; + centerangle = viewangle - interp.angle; tr_x += FixedMul(offset2, cosmul); tr_y += FixedMul(offset2, sinmul); @@ -1712,7 +1787,11 @@ static void R_ProjectSprite(mobj_t *thing) range++; // fencepost problem - scalestep = ((yscale2 - yscale)/range) ?: 1; + // Compatibility with MSVC - SSNTails + scalestep = ((yscale2 - yscale) / range); + if (!scalestep) + scalestep = 1; + xscale = FixedDiv(range<> ANGLETOFINESHIFT); sort_x = FixedMul(FixedMul(FixedMul(spritexscale, this_scale), sort_z), FINECOSINE(ang)); sort_y = FixedMul(FixedMul(FixedMul(spriteyscale, this_scale), sort_z), FINESINE(ang)); + + tr_x = (interp.x + sort_x) - viewx; + tr_y = (interp.y + sort_y) - viewy; + sort_z = FixedMul(tr_x, viewcos) + FixedMul(tr_y, viewsin); + sortscale = FixedDiv(projectiony, sort_z); } if ((thing->flags2 & MF2_LINKDRAW) && thing->tracer) // toast 16/09/16 (SYMMETRY) { - fixed_t linkscale; + interpmobjstate_t tracer_interp = {0}; thing = thing->tracer; if (! R_ThingVisible(thing)) return; - tr_x = (thing->x + sort_x) - viewx; - tr_y = (thing->y + sort_y) - viewy; + if (R_UsingFrameInterpolation() && !paused) + { + R_InterpolateMobjState(thing, rendertimefrac, &tracer_interp); + } + else + { + R_InterpolateMobjState(thing, FRACUNIT, &tracer_interp); + } + + tr_x = (tracer_interp.x + sort_x) - viewx; + tr_y = (tracer_interp.y + sort_y) - viewy; tz = FixedMul(tr_x, viewcos) + FixedMul(tr_y, viewsin); linkscale = FixedDiv(projectiony, tz); @@ -1767,24 +1860,24 @@ static void R_ProjectSprite(mobj_t *thing) if (sortscale < linkscale) dispoffset *= -1; // if it's physically behind, make sure it's ordered behind (if dispoffset > 0) - sortscale = linkscale; // now make sure it's linked + //sortscale = linkscale; // now make sure it's linked + // No need to do that, linkdraw already excludes it from regular sorting. + cut |= SC_LINKDRAW; } - else if (splat) + else { - tr_x = (thing->x + sort_x) - viewx; - tr_y = (thing->y + sort_y) - viewy; - sort_z = FixedMul(tr_x, viewcos) + FixedMul(tr_y, viewsin); - sortscale = FixedDiv(projectiony, sort_z); + linkscale = sortscale; } // Calculate the splat's sortscale if (splat) { - tr_x = (thing->x - sort_x) - viewx; - tr_y = (thing->y - sort_y) - viewy; + tr_x = (interp.x - sort_x) - viewx; + tr_y = (interp.y - sort_y) - viewy; sort_z = FixedMul(tr_x, viewcos) + FixedMul(tr_y, viewsin); sortsplat = FixedDiv(projectiony, sort_z); + centerangle = interp.angle; } // PORTAL SPRITE CLIPPING @@ -1793,17 +1886,23 @@ static void R_ProjectSprite(mobj_t *thing) if (x2 < portalclipstart || x1 >= portalclipend) return; - if (P_PointOnLineSide(thing->x, thing->y, portalclipline) != 0) + if (P_PointOnLineSide(interp.x, interp.y, portalclipline) != 0) return; } + INT32 blendmode; + if (oldthing->frame & FF_BLENDMASK) + blendmode = ((oldthing->frame & FF_BLENDMASK) >> FF_BLENDSHIFT) + 1; + else + blendmode = oldthing->blendmode; + // Determine the translucency value. if (oldthing->flags2 & MF2_SHADOW || thing->flags2 & MF2_SHADOW) // actually only the player should use this (temporary invisibility) trans = tr_trans80; // because now the translucency is set through FF_TRANSMASK else if (oldthing->frame & FF_TRANSMASK) { trans = (oldthing->frame & FF_TRANSMASK) >> FF_TRANSSHIFT; - if (!R_BlendLevelVisible(oldthing->blendmode, trans)) + if (!R_BlendLevelVisible(blendmode, trans)) return; } else @@ -1822,6 +1921,16 @@ static void R_ProjectSprite(mobj_t *thing) if (shadoweffects) { mobj_t *caster = thing->target; + interpmobjstate_t casterinterp = { 0 }; // MSVC compatibility - SSNTails + + if (R_UsingFrameInterpolation() && !paused) + { + R_InterpolateMobjState(caster, rendertimefrac, &casterinterp); + } + else + { + R_InterpolateMobjState(caster, FRACUNIT, &casterinterp); + } if (caster && !P_MobjWasRemoved(caster)) { @@ -1830,9 +1939,9 @@ static void R_ProjectSprite(mobj_t *thing) if (abs(groundz-viewz)/tz > 4) return; // Prevent stretchy shadows and possible crashes - floordiff = abs((isflipped ? caster->height : 0) + caster->z - groundz); + floordiff = abs((isflipped ? caster->height : 0) + casterinterp.z - groundz); trans += ((floordiff / (100*FRACUNIT)) + 3); - shadowscale = FixedMul(FRACUNIT - floordiff/640, caster->scale); + shadowscale = FixedMul(FRACUNIT - floordiff/640, casterinterp.scale); } else trans += 3; @@ -1861,7 +1970,7 @@ static void R_ProjectSprite(mobj_t *thing) { R_SkewShadowSprite(thing, thing->standingslope, groundz, patch->height, shadowscale, &spriteyscale, &sheartan); - gzt = (isflipped ? (thing->z + thing->height) : thing->z) + patch->height * spriteyscale / 2; + gzt = (isflipped ? (interp.z + thing->height) : interp.z) + patch->height * spriteyscale / 2; gz = gzt - patch->height * spriteyscale; cut |= SC_SHEAR; @@ -1876,12 +1985,12 @@ static void R_ProjectSprite(mobj_t *thing) // When vertical flipped, draw sprites from the top down, at least as far as offsets are concerned. // sprite height - sprite topoffset is the proper inverse of the vertical offset, of course. // remember gz and gzt should be seperated by sprite height, not thing height - thing height can be shorter than the sprite itself sometimes! - gz = oldthing->z + oldthing->height - FixedMul(spr_topoffset, FixedMul(spriteyscale, this_scale)); + gz = interp.z + oldthing->height - FixedMul(spr_topoffset, FixedMul(spriteyscale, this_scale)); gzt = gz + FixedMul(spr_height, FixedMul(spriteyscale, this_scale)); } else { - gzt = oldthing->z + FixedMul(spr_topoffset, FixedMul(spriteyscale, this_scale)); + gzt = interp.z + FixedMul(spr_topoffset, FixedMul(spriteyscale, this_scale)); gz = gzt - FixedMul(spr_height, FixedMul(spriteyscale, this_scale)); } } @@ -1900,7 +2009,7 @@ static void R_ProjectSprite(mobj_t *thing) // R_GetPlaneLight won't work on sloped lights! for (lightnum = 1; lightnum < thing->subsector->sector->numlights; lightnum++) { - fixed_t h = P_GetLightZAt(&thing->subsector->sector->lightlist[lightnum], thing->x, thing->y); + fixed_t h = P_GetLightZAt(&thing->subsector->sector->lightlist[lightnum], interp.x, interp.y); if (h <= top) { light = lightnum - 1; break; @@ -1925,13 +2034,19 @@ static void R_ProjectSprite(mobj_t *thing) if (heightsec != -1 && phs != -1) // only clip things which are in special sectors { + fixed_t top = gzt; + fixed_t bottom = interp.z; + + if (splat) + top = bottom; + if (viewz < sectors[phs].floorheight ? - thing->z >= sectors[heightsec].floorheight : - gzt < sectors[heightsec].floorheight) + bottom >= sectors[heightsec].floorheight : + top < sectors[heightsec].floorheight) return; if (viewz > sectors[phs].ceilingheight ? - gzt < sectors[heightsec].ceilingheight && viewz >= sectors[heightsec].ceilingheight : - thing->z >= sectors[heightsec].ceilingheight) + top < sectors[heightsec].ceilingheight && viewz >= sectors[heightsec].ceilingheight : + bottom >= sectors[heightsec].ceilingheight) return; } @@ -1943,31 +2058,41 @@ static void R_ProjectSprite(mobj_t *thing) vis->mobjflags = thing->flags; vis->sortscale = sortscale; vis->sortsplat = sortsplat; + vis->linkscale = linkscale; vis->dispoffset = dispoffset; // Monster Iestyn: 23/11/15 - vis->gx = thing->x; - vis->gy = thing->y; + vis->gx = interp.x; + vis->gy = interp.y; vis->gz = gz; vis->gzt = gzt; vis->thingheight = thing->height; - vis->pz = thing->z; + vis->pz = interp.z; vis->pzt = vis->pz + vis->thingheight; vis->texturemid = FixedDiv(gzt - viewz, spriteyscale); vis->scalestep = scalestep; vis->paperoffset = paperoffset; vis->paperdistance = paperdistance; vis->centerangle = centerangle; - vis->viewangle = viewangle; vis->shear.tan = sheartan; vis->shear.offset = 0; + vis->viewpoint.x = viewx; + vis->viewpoint.y = viewy; + vis->viewpoint.z = viewz; + vis->viewpoint.angle = viewangle; vis->mobj = thing; // Easy access! Tails 06-07-2002 + if ((oldthing->flags2 & MF2_LINKDRAW) && oldthing->tracer && oldthing->color == SKINCOLOR_NONE) + vis->color = oldthing->tracer->color; + else + vis->color = oldthing->color; vis->x1 = x1 < portalclipstart ? portalclipstart : x1; vis->x2 = x2 >= portalclipend ? portalclipend-1 : x2; vis->sector = thing->subsector->sector; - vis->szt = (INT16)((centeryfrac - FixedMul(vis->gzt - viewz, sortscale))>>FRACBITS); - vis->sz = (INT16)((centeryfrac - FixedMul(vis->gz - viewz, sortscale))>>FRACBITS); + + // Using linkscale here improves cut detection for LINKDRAW. + vis->szt = (INT16)((centeryfrac - FixedMul(vis->gzt - viewz, linkscale))>>FRACBITS); + vis->sz = (INT16)((centeryfrac - FixedMul(vis->gz - viewz, linkscale))>>FRACBITS); vis->cut = cut; if (thing->subsector->sector->numlights) @@ -1977,7 +2102,7 @@ static void R_ProjectSprite(mobj_t *thing) vis->xscale = FixedMul(spritexscale, xscale); //SoM: 4/17/2000 vis->scale = FixedMul(spriteyscale, yscale); //<thingscale = oldthing->scale; + vis->thingscale = interp.scale; vis->spritexscale = spritexscale; vis->spriteyscale = spriteyscale; @@ -2012,13 +2137,15 @@ static void R_ProjectSprite(mobj_t *thing) vis->scale += FixedMul(scalestep, spriteyscale) * (vis->x1 - x1); } - if ((oldthing->blendmode != AST_COPY) && cv_translucency.value) - vis->transmap = R_GetBlendTable(oldthing->blendmode, trans); + if ((blendmode != AST_COPY) && cv_translucency.value) + vis->transmap = R_GetBlendTable(blendmode, trans); else vis->transmap = NULL; if (R_ThingIsFullBright(oldthing) || oldthing->flags2 & MF2_SHADOW || thing->flags2 & MF2_SHADOW) vis->cut |= SC_FULLBRIGHT; + else if (R_ThingIsSemiBright(oldthing)) + vis->cut |= SC_SEMIBRIGHT; else if (R_ThingIsFullDark(oldthing)) vis->cut |= SC_FULLDARK; @@ -2041,6 +2168,9 @@ static void R_ProjectSprite(mobj_t *thing) if (lindex >= MAXLIGHTSCALE) lindex = MAXLIGHTSCALE-1; + if (vis->cut & SC_SEMIBRIGHT) + lindex = (MAXLIGHTSCALE/2) + (lindex >> 1); + vis->colormap = spritelights[lindex]; } @@ -2080,9 +2210,22 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing) //SoM: 3/17/2000 fixed_t gz, gzt; + // uncapped/interpolation + interpmobjstate_t interp = {0}; + + // do interpolation + if (R_UsingFrameInterpolation() && !paused) + { + R_InterpolatePrecipMobjState(thing, rendertimefrac, &interp); + } + else + { + R_InterpolatePrecipMobjState(thing, FRACUNIT, &interp); + } + // transform the origin point - tr_x = thing->x - viewx; - tr_y = thing->y - viewy; + tr_x = interp.x - viewx; + tr_y = interp.y - viewy; tz = FixedMul(tr_x, viewcos) + FixedMul(tr_y, viewsin); // near/far distance @@ -2146,13 +2289,13 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing) if (x2 < portalclipstart || x1 >= portalclipend) return; - if (P_PointOnLineSide(thing->x, thing->y, portalclipline) != 0) + if (P_PointOnLineSide(interp.x, interp.y, portalclipline) != 0) return; } //SoM: 3/17/2000: Disregard sprites that are out of view.. - gzt = thing->z + spritecachedinfo[lump].topoffset; + gzt = interp.z + spritecachedinfo[lump].topoffset; gz = gzt - spritecachedinfo[lump].height; if (thing->subsector->sector->cullheight) @@ -2165,12 +2308,12 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing) vis = R_NewVisSprite(); vis->scale = vis->sortscale = yscale; //<dispoffset = 0; // Monster Iestyn: 23/11/15 - vis->gx = thing->x; - vis->gy = thing->y; + vis->gx = interp.x; + vis->gy = interp.y; vis->gz = gz; vis->gzt = gzt; vis->thingheight = 4*FRACUNIT; - vis->pz = thing->z; + vis->pz = interp.z; vis->pzt = vis->pz + vis->thingheight; vis->texturemid = vis->gzt - viewz; vis->scalestep = 0; @@ -2209,6 +2352,7 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing) vis->cut = SC_PRECIP; vis->extra_colormap = thing->subsector->sector->extra_colormap; vis->heightsec = thing->subsector->sector->heightsec; + vis->color = SKINCOLOR_NONE; // Fullbright vis->colormap = colormaps; @@ -2283,6 +2427,21 @@ void R_AddSprites(sector_t *sec, INT32 lightlevel) } } +static boolean R_SortVisSpriteFunc(vissprite_t *ds, fixed_t bestscale, INT32 bestdispoffset) +{ + if (ds->sortscale < bestscale) + { + return true; + } + // order visprites of same scale by dispoffset, smallest first + else if (ds->sortscale == bestscale && ds->dispoffset < bestdispoffset) + { + return true; + } + + return false; +} + // // R_SortVisSprites // @@ -2373,7 +2532,7 @@ static void R_SortVisSprites(vissprite_t* vsprsortedhead, UINT32 start, UINT32 e // reusing dsnext... dsnext = dsfirst->linkdraw; - if (!dsnext || ds->dispoffset < dsnext->dispoffset) + if (dsnext == NULL || R_SortVisSpriteFunc(ds, dsnext->sortscale, dsnext->dispoffset) == true) { ds->next = dsnext; dsfirst->linkdraw = ds; @@ -2381,8 +2540,13 @@ static void R_SortVisSprites(vissprite_t* vsprsortedhead, UINT32 start, UINT32 e else { for (; dsnext->next != NULL; dsnext = dsnext->next) - if (ds->dispoffset < dsnext->next->dispoffset) + { + if (R_SortVisSpriteFunc(ds, dsnext->next->sortscale, dsnext->next->dispoffset) == true) + { break; + } + } + ds->next = dsnext->next; dsnext->next = ds; } @@ -2401,18 +2565,12 @@ static void R_SortVisSprites(vissprite_t* vsprsortedhead, UINT32 start, UINT32 e I_Error("R_SortVisSprites: no link or discardal made for linkdraw!"); #endif - if (ds->sortscale < bestscale) + if (R_SortVisSpriteFunc(ds, bestscale, bestdispoffset) == true) { bestscale = ds->sortscale; bestdispoffset = ds->dispoffset; best = ds; } - // order visprites of same scale by dispoffset, smallest first - else if (ds->sortscale == bestscale && ds->dispoffset < bestdispoffset) - { - bestdispoffset = ds->dispoffset; - best = ds; - } } best->next->prev = best->prev; best->prev->next = best->next; @@ -2702,7 +2860,7 @@ static drawnode_t *R_CreateDrawNode(drawnode_t *link) node->ffloor = NULL; node->sprite = NULL; - ps_numdrawnodes++; + ps_numdrawnodes.value.i++; return node; } @@ -2758,6 +2916,57 @@ static void R_DrawPrecipitationSprite(vissprite_t *spr) R_DrawPrecipitationVisSprite(spr); } +//SoM: 3/17/2000: Clip sprites in water. +static void R_HeightSecClip(vissprite_t *spr, INT32 x1, INT32 x2) +{ + fixed_t mh, h; + INT32 x, phs; + + if (spr->heightsec == -1) + return; + + if (spr->cut & (SC_SPLAT | SC_SHADOW) || spr->renderflags & RF_SHADOWDRAW) + return; + + phs = viewplayer->mo->subsector->sector->heightsec; + + if ((mh = sectors[spr->heightsec].floorheight) > spr->gz && + (h = centeryfrac - FixedMul(mh -= viewz, spr->sortscale)) >= 0 && + (h >>= FRACBITS) < viewheight) + { + if (mh <= 0 || (phs != -1 && viewz > sectors[phs].floorheight)) + { // clip bottom + for (x = x1; x <= x2; x++) + if (spr->clipbot[x] == -2 || h < spr->clipbot[x]) + spr->clipbot[x] = (INT16)h; + } + else // clip top + { + for (x = x1; x <= x2; x++) + if (spr->cliptop[x] == -2 || h > spr->cliptop[x]) + spr->cliptop[x] = (INT16)h; + } + } + + if ((mh = sectors[spr->heightsec].ceilingheight) < spr->gzt && + (h = centeryfrac - FixedMul(mh-viewz, spr->sortscale)) >= 0 && + (h >>= FRACBITS) < viewheight) + { + if (phs != -1 && viewz >= sectors[phs].ceilingheight) + { // clip bottom + for (x = x1; x <= x2; x++) + if (spr->clipbot[x] == -2 || h < spr->clipbot[x]) + spr->clipbot[x] = (INT16)h; + } + else // clip top + { + for (x = x1; x <= x2; x++) + if (spr->cliptop[x] == -2 || h > spr->cliptop[x]) + spr->cliptop[x] = (INT16)h; + } + } +} + // R_ClipVisSprite // Clips vissprites without drawing, so that portals can work. -Red void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2, drawseg_t* dsstart, portal_t* portal) @@ -2859,47 +3068,9 @@ void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2, drawseg_t* dsstart, p } } } - //SoM: 3/17/2000: Clip sprites in water. - if (spr->heightsec != -1) // only things in specially marked sectors - { - fixed_t mh, h; - INT32 phs = viewplayer->mo->subsector->sector->heightsec; - if ((mh = sectors[spr->heightsec].floorheight) > spr->gz && - (h = centeryfrac - FixedMul(mh -= viewz, spr->sortscale)) >= 0 && - (h >>= FRACBITS) < viewheight) - { - if (mh <= 0 || (phs != -1 && viewz > sectors[phs].floorheight)) - { // clip bottom - for (x = x1; x <= x2; x++) - if (spr->clipbot[x] == -2 || h < spr->clipbot[x]) - spr->clipbot[x] = (INT16)h; - } - else // clip top - { - for (x = x1; x <= x2; x++) - if (spr->cliptop[x] == -2 || h > spr->cliptop[x]) - spr->cliptop[x] = (INT16)h; - } - } - if ((mh = sectors[spr->heightsec].ceilingheight) < spr->gzt && - (h = centeryfrac - FixedMul(mh-viewz, spr->sortscale)) >= 0 && - (h >>= FRACBITS) < viewheight) - { - if (phs != -1 && viewz >= sectors[phs].ceilingheight) - { // clip bottom - for (x = x1; x <= x2; x++) - if (spr->clipbot[x] == -2 || h < spr->clipbot[x]) - spr->clipbot[x] = (INT16)h; - } - else // clip top - { - for (x = x1; x <= x2; x++) - if (spr->cliptop[x] == -2 || h > spr->cliptop[x]) - spr->cliptop[x] = (INT16)h; - } - } - } + R_HeightSecClip(spr, x1, x2); + if (spr->cut & SC_TOP && spr->cut & SC_BOTTOM) { for (x = x1; x <= x2; x++) @@ -2943,13 +3114,25 @@ void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2, drawseg_t* dsstart, p if (portal) { - for (x = x1; x <= x2; x++) + INT32 start_index = max(portal->start, x1); + INT32 end_index = min(portal->start + portal->end - portal->start, x2); + for (x = x1; x < start_index; x++) + { + spr->clipbot[x] = -1; + spr->cliptop[x] = -1; + } + for (x = start_index; x <= end_index; x++) { if (spr->clipbot[x] > portal->floorclip[x - portal->start]) spr->clipbot[x] = portal->floorclip[x - portal->start]; if (spr->cliptop[x] < portal->ceilingclip[x - portal->start]) spr->cliptop[x] = portal->ceilingclip[x - portal->start]; } + for (x = end_index + 1; x <= x2; x++) + { + spr->clipbot[x] = -1; + spr->cliptop[x] = -1; + } } } @@ -3030,17 +3213,22 @@ boolean R_ThingIsPaperSprite(mobj_t *thing) boolean R_ThingIsFloorSprite(mobj_t *thing) { - return (thing->flags2 & MF2_SPLAT || thing->renderflags & RF_FLOORSPRITE); + return (thing->flags2 & MF2_SPLAT || thing->frame & FF_FLOORSPRITE || thing->renderflags & RF_FLOORSPRITE); } boolean R_ThingIsFullBright(mobj_t *thing) { - return (thing->frame & FF_FULLBRIGHT || thing->renderflags & RF_FULLBRIGHT); + return ((thing->frame & FF_BRIGHTMASK) == FF_FULLBRIGHT || (thing->renderflags & RF_BRIGHTMASK) == RF_FULLBRIGHT); +} + +boolean R_ThingIsSemiBright(mobj_t *thing) +{ + return ((thing->frame & FF_BRIGHTMASK) == FF_SEMIBRIGHT || (thing->renderflags & RF_BRIGHTMASK) == RF_SEMIBRIGHT); } boolean R_ThingIsFullDark(mobj_t *thing) { - return (thing->renderflags & RF_FULLDARK); + return ((thing->frame & FF_BRIGHTMASK) == FF_FULLDARK || (thing->renderflags & RF_BRIGHTMASK) == RF_FULLDARK); } // @@ -3089,14 +3277,20 @@ static void R_DrawMaskedList (drawnode_t* head) vissprite_t *ds = r2->sprite->linkdraw; for (; - (ds != NULL && r2->sprite->dispoffset > ds->dispoffset); - ds = ds->next) + (ds != NULL && r2->sprite->dispoffset > ds->dispoffset); + ds = ds->next) + { R_DrawSprite(ds); + } R_DrawSprite(r2->sprite); - for (; ds != NULL; ds = ds->next) + for (; + ds != NULL; + ds = ds->next) + { R_DrawSprite(ds); + } } R_DoneWithNode(r2); @@ -3105,10 +3299,10 @@ static void R_DrawMaskedList (drawnode_t* head) } } -void R_DrawMasked(maskcount_t* masks, UINT8 nummasks) +void R_DrawMasked(maskcount_t* masks, INT32 nummasks) { drawnode_t *heads; /**< Drawnode lists; as many as number of views/portals. */ - SINT8 i; + INT32 i; heads = calloc(nummasks, sizeof(drawnode_t)); diff --git a/src/r_things.h b/src/r_things.h index 9315b36e9..22a37a0ea 100644 --- a/src/r_things.h +++ b/src/r_things.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -82,6 +82,7 @@ boolean R_ThingIsPaperSprite (mobj_t *thing); boolean R_ThingIsFloorSprite (mobj_t *thing); boolean R_ThingIsFullBright (mobj_t *thing); +boolean R_ThingIsSemiBright (mobj_t *thing); boolean R_ThingIsFullDark (mobj_t *thing); // -------------- @@ -99,7 +100,7 @@ typedef struct sector_t* viewsector; } maskcount_t; -void R_DrawMasked(maskcount_t* masks, UINT8 nummasks); +void R_DrawMasked(maskcount_t* masks, INT32 nummasks); // ---------- // VISSPRITES @@ -123,13 +124,14 @@ typedef enum SC_PRECIP = 1<<2, SC_LINKDRAW = 1<<3, SC_FULLBRIGHT = 1<<4, - SC_FULLDARK = 1<<5, - SC_VFLIP = 1<<6, - SC_ISSCALED = 1<<7, - SC_ISROTATED = 1<<8, - SC_SHADOW = 1<<9, - SC_SHEAR = 1<<10, - SC_SPLAT = 1<<11, + SC_SEMIBRIGHT = 1<<5, + SC_FULLDARK = 1<<6, + SC_VFLIP = 1<<7, + SC_ISSCALED = 1<<8, + SC_ISROTATED = 1<<9, + SC_SHADOW = 1<<10, + SC_SHEAR = 1<<11, + SC_SPLAT = 1<<12, // masks SC_CUTMASK = SC_TOP|SC_BOTTOM, SC_FLAGMASK = ~SC_CUTMASK @@ -157,14 +159,20 @@ typedef struct vissprite_s fixed_t startfrac; // horizontal position of x1 fixed_t xscale, scale; // projected horizontal and vertical scales fixed_t thingscale; // the object's scale - fixed_t sortscale; // sortscale only differs from scale for paper sprites, floor sprites, and MF2_LINKDRAW + fixed_t sortscale; // sortscale only differs from scale for paper sprites and floor sprites fixed_t sortsplat; // the sortscale from behind the floor sprite + fixed_t linkscale; // the sortscale for MF2_LINKDRAW sprites fixed_t scalestep; // only for paper sprites, 0 otherwise fixed_t paperoffset, paperdistance; // for paper sprites, offset/dist relative to the angle fixed_t xiscale; // negative if flipped - angle_t centerangle; // for paper sprites - angle_t viewangle; // for floor sprites, the viewpoint's current angle + angle_t centerangle; // for paper sprites / splats + + // for floor sprites + struct { + fixed_t x, y, z; // the viewpoint's current position + angle_t angle; // the viewpoint's current angle + } viewpoint; struct { fixed_t tan; // The amount to shear the sprite vertically per row @@ -185,9 +193,10 @@ typedef struct vissprite_s extracolormap_t *extra_colormap; // global colormaps - // Precalculated top and bottom screen coords for the sprite. fixed_t thingheight; // The actual height of the thing (for 3D floors) sector_t *sector; // The sector containing the thing. + + // Precalculated top and bottom screen coords for the sprite. INT16 sz, szt; spritecut_e cut; @@ -199,9 +208,11 @@ typedef struct vissprite_s fixed_t shadowscale; + skincolornum_t color; + INT16 clipbot[MAXVIDWIDTH], cliptop[MAXVIDWIDTH]; - INT32 dispoffset; // copy of info->dispoffset, affects ordering but not drawing + INT32 dispoffset; // copy of mobj->dispoffset, affects ordering but not drawing } vissprite_t; extern UINT32 visspritecount; diff --git a/src/s_sound.c b/src/s_sound.c index 1bb48565a..ada1a0fd2 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -74,9 +74,9 @@ consvar_t stereoreverse = CVAR_INIT ("stereoreverse", "Off", CV_SAVE, CV_OnOff, static consvar_t precachesound = CVAR_INIT ("precachesound", "Off", CV_SAVE, CV_OnOff, NULL); // actual general (maximum) sound & music volume, saved into the config -consvar_t cv_soundvolume = CVAR_INIT ("soundvolume", "18", CV_SAVE, soundvolume_cons_t, NULL); -consvar_t cv_digmusicvolume = CVAR_INIT ("digmusicvolume", "18", CV_SAVE, soundvolume_cons_t, NULL); -consvar_t cv_midimusicvolume = CVAR_INIT ("midimusicvolume", "18", CV_SAVE, soundvolume_cons_t, NULL); +consvar_t cv_soundvolume = CVAR_INIT ("soundvolume", "16", CV_SAVE, soundvolume_cons_t, NULL); +consvar_t cv_digmusicvolume = CVAR_INIT ("digmusicvolume", "16", CV_SAVE, soundvolume_cons_t, NULL); +consvar_t cv_midimusicvolume = CVAR_INIT ("midimusicvolume", "16", CV_SAVE, soundvolume_cons_t, NULL); static void Captioning_OnChange(void) { @@ -222,7 +222,7 @@ static INT32 S_getChannel(const void *origin, sfxinfo_t *sfxinfo) } else if (origin && channels[cnum].origin == origin && channels[cnum].sfxinfo->name != sfxinfo->name - && channels[cnum].sfxinfo->pitch == SF_TOTALLYSINGLE && sfxinfo->pitch == SF_TOTALLYSINGLE) + && channels[cnum].sfxinfo->pitch & SF_TOTALLYSINGLE && sfxinfo->pitch & SF_TOTALLYSINGLE) { S_StopChannel(cnum); break; @@ -289,8 +289,8 @@ void S_RegisterSoundStuff(void) CV_RegisterVar(&cv_miditimiditypath); #endif - COM_AddCommand("tunes", Command_Tunes_f); - COM_AddCommand("restartaudio", Command_RestartAudio_f); + COM_AddCommand("tunes", Command_Tunes_f, COM_LUA); + COM_AddCommand("restartaudio", Command_RestartAudio_f, COM_LUA); } static void SetChannelsNum(void) @@ -1692,6 +1692,7 @@ UINT8 soundtestpage = 1; // boolean S_PrepareSoundTest(void) { + gamedata_t *data = clientGamedata; musicdef_t *def; INT32 pos = numsoundtestdefs = 0; @@ -1717,9 +1718,9 @@ boolean S_PrepareSoundTest(void) if (!(def->soundtestpage & soundtestpage)) continue; soundtestdefs[pos++] = def; - if (def->soundtestcond > 0 && !(mapvisited[def->soundtestcond-1] & MV_BEATEN)) + if (def->soundtestcond > 0 && !(data->mapvisited[def->soundtestcond-1] & MV_BEATEN)) continue; - if (def->soundtestcond < 0 && !M_Achieved(-1-def->soundtestcond)) + if (def->soundtestcond < 0 && !M_Achieved(-1-def->soundtestcond, data)) continue; def->allowed = true; } @@ -2238,6 +2239,16 @@ static void S_ChangeMusicToQueue(void) void S_ChangeMusicEx(const char *mmusic, UINT16 mflags, boolean looping, UINT32 position, UINT32 prefadems, UINT32 fadeinms) { char newmusic[7]; + + struct MusicChange hook_param = { + newmusic, + &mflags, + &looping, + &position, + &prefadems, + &fadeinms + }; + boolean currentmidi = (I_SongType() == MU_MID || I_SongType() == MU_MID_EX); boolean midipref = cv_musicpref.value; @@ -2245,13 +2256,13 @@ void S_ChangeMusicEx(const char *mmusic, UINT16 mflags, boolean looping, UINT32 return; strncpy(newmusic, mmusic, 7); - if (LUAh_MusicChange(music_name, newmusic, &mflags, &looping, &position, &prefadems, &fadeinms)) + if (LUA_HookMusicChange(music_name, &hook_param)) return; newmusic[6] = 0; - // No Music (empty string) + // No Music (empty string) if (newmusic[0] == 0) - { + { if (prefadems) I_FadeSong(0, prefadems, &S_StopMusic); else @@ -2269,7 +2280,7 @@ void S_ChangeMusicEx(const char *mmusic, UINT16 mflags, boolean looping, UINT32 } else if (strnicmp(music_name, newmusic, 6) || (mflags & MUSIC_FORCERESET) || (midipref != currentmidi && S_PrefAvailable(midipref, newmusic))) - { + { CONS_Debug(DBG_DETAILED, "Now playing song %s\n", newmusic); S_StopMusic(); @@ -2292,7 +2303,7 @@ void S_ChangeMusicEx(const char *mmusic, UINT16 mflags, boolean looping, UINT32 { I_SetSongPosition(position); I_FadeSong(100, fadeinms, NULL); - } +} else // reset volume to 100 with same music { I_StopFadingSong(); diff --git a/src/s_sound.h b/src/s_sound.h index 4e03e3c9e..288859c8d 100644 --- a/src/s_sound.h +++ b/src/s_sound.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -265,6 +265,16 @@ boolean S_RecallMusic(UINT16 status, boolean fromfirst); // Music Playback // +/* this is for the sake of the hook */ +struct MusicChange { + char * newname; + UINT16 * mflags; + boolean * looping; + UINT32 * position; + UINT32 * prefadems; + UINT32 * fadeinms; +}; + // Start music track, arbitrary, given its name, and set whether looping // note: music flags 12 bits for tracknum (gme, other formats with more than one track) // 13-15 aren't used yet diff --git a/src/screen.c b/src/screen.c index 770f1c802..f8af4c504 100644 --- a/src/screen.c +++ b/src/screen.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -15,6 +15,7 @@ #include "screen.h" #include "console.h" #include "am_map.h" +#include "i_time.h" #include "i_system.h" #include "i_video.h" #include "r_local.h" @@ -33,12 +34,15 @@ #include "s_sound.h" // ditto #include "g_game.h" // ditto #include "p_local.h" // P_AutoPause() + #ifdef HWRENDER #include "hardware/hw_main.h" #include "hardware/hw_light.h" #include "hardware/hw_model.h" #endif +// SRB2Kart +#include "r_fps.h" // R_GetFramerateCap #if defined (USEASM) && !defined (NORUSEASM)//&& (!defined (_MSC_VER) || (_MSC_VER <= 1200)) #define RUSEASM //MSC.NET can't patch itself @@ -67,6 +71,7 @@ static CV_PossibleValue_t scr_depth_cons_t[] = {{8, "8 bits"}, {16, "16 bits"}, consvar_t cv_scr_width = CVAR_INIT ("scr_width", "1280", CV_SAVE, CV_Unsigned, NULL); consvar_t cv_scr_height = CVAR_INIT ("scr_height", "800", CV_SAVE, CV_Unsigned, NULL); consvar_t cv_scr_depth = CVAR_INIT ("scr_depth", "16 bits", CV_SAVE, scr_depth_cons_t, NULL); + consvar_t cv_renderview = CVAR_INIT ("renderview", "On", 0, CV_OnOff, NULL); CV_PossibleValue_t cv_renderer_t[] = { @@ -77,7 +82,7 @@ CV_PossibleValue_t cv_renderer_t[] = { {0, NULL} }; -consvar_t cv_renderer = CVAR_INIT ("renderer", "Software", CV_SAVE|CV_NOLUA|CV_CALL, cv_renderer_t, SCR_ChangeRenderer); +consvar_t cv_renderer = CVAR_INIT ("renderer", "Software", CV_SAVE|CV_CALL, cv_renderer_t, SCR_ChangeRenderer); static void SCR_ChangeFullscreen(void); @@ -136,9 +141,16 @@ void SCR_SetDrawFuncs(void) spanfuncs[SPANDRAWFUNC_TRANSSPRITE] = R_DrawTranslucentFloorSprite_8; spanfuncs[SPANDRAWFUNC_TILTEDSPRITE] = R_DrawTiltedFloorSprite_8; spanfuncs[SPANDRAWFUNC_TILTEDTRANSSPRITE] = R_DrawTiltedTranslucentFloorSprite_8; - spanfuncs[SPANDRAWFUNC_WATER] = R_DrawTranslucentWaterSpan_8; - spanfuncs[SPANDRAWFUNC_TILTEDWATER] = R_DrawTiltedTranslucentWaterSpan_8; + spanfuncs[SPANDRAWFUNC_WATER] = R_DrawWaterSpan_8; + spanfuncs[SPANDRAWFUNC_TILTEDWATER] = R_DrawTiltedWaterSpan_8; + spanfuncs[SPANDRAWFUNC_SOLID] = R_DrawSolidColorSpan_8; + spanfuncs[SPANDRAWFUNC_TRANSSOLID] = R_DrawTransSolidColorSpan_8; + spanfuncs[SPANDRAWFUNC_TILTEDSOLID] = R_DrawTiltedSolidColorSpan_8; + spanfuncs[SPANDRAWFUNC_TILTEDTRANSSOLID] = R_DrawTiltedTransSolidColorSpan_8; + spanfuncs[SPANDRAWFUNC_WATERSOLID] = R_DrawWaterSolidColorSpan_8; + spanfuncs[SPANDRAWFUNC_TILTEDWATERSOLID] = R_DrawTiltedWaterSolidColorSpan_8; spanfuncs[SPANDRAWFUNC_FOG] = R_DrawFogSpan_8; + spanfuncs[SPANDRAWFUNC_TILTEDFOG] = R_DrawTiltedFogSpan_8; // Lactozilla: Non-powers-of-two spanfuncs_npo2[BASEDRAWFUNC] = R_DrawSpan_NPO2_8; @@ -152,9 +164,8 @@ void SCR_SetDrawFuncs(void) spanfuncs_npo2[SPANDRAWFUNC_TRANSSPRITE] = R_DrawTranslucentFloorSprite_NPO2_8; spanfuncs_npo2[SPANDRAWFUNC_TILTEDSPRITE] = R_DrawTiltedFloorSprite_NPO2_8; spanfuncs_npo2[SPANDRAWFUNC_TILTEDTRANSSPRITE] = R_DrawTiltedTranslucentFloorSprite_NPO2_8; - spanfuncs_npo2[SPANDRAWFUNC_WATER] = R_DrawTranslucentWaterSpan_NPO2_8; - spanfuncs_npo2[SPANDRAWFUNC_TILTEDWATER] = R_DrawTiltedTranslucentWaterSpan_NPO2_8; - spanfuncs_npo2[SPANDRAWFUNC_FOG] = NULL; // Not needed + spanfuncs_npo2[SPANDRAWFUNC_WATER] = R_DrawWaterSpan_NPO2_8; + spanfuncs_npo2[SPANDRAWFUNC_TILTEDWATER] = R_DrawTiltedWaterSpan_NPO2_8; #ifdef RUSEASM if (R_ASM) @@ -390,7 +401,6 @@ void SCR_SetDefaultMode(void) // remember the default screen size CV_SetValue(&cv_scr_width, vid.width); CV_SetValue(&cv_scr_height, vid.height); - CV_SetValue(&cv_scr_depth, vid.bpp*8); } // Change fullscreen on/off according to cv_fullscreen @@ -447,46 +457,117 @@ boolean SCR_IsAspectCorrect(INT32 width, INT32 height) ); } -// XMOD FPS display -// moved out of os-specific code for consistency -static boolean fpsgraph[TICRATE]; -static tic_t lasttic; +double averageFPS = 0.0f; + +#define USE_FPS_SAMPLES + +#ifdef USE_FPS_SAMPLES +#define FPS_SAMPLE_RATE (0.05) // How often to update FPS samples, in seconds +#define NUM_FPS_SAMPLES (16) // Number of samples to store + +static double fps_samples[NUM_FPS_SAMPLES]; +static double updateElapsed = 0.0; +#endif + +static boolean fps_init = false; +static precise_t fps_enter = 0; + +void SCR_CalculateFPS(void) +{ + precise_t fps_finish = 0; + + double frameElapsed = 0.0; + + if (fps_init == false) + { + fps_enter = I_GetPreciseTime(); + fps_init = true; + } + + fps_finish = I_GetPreciseTime(); + frameElapsed = (double)((INT64)(fps_finish - fps_enter)) / I_GetPrecisePrecision(); + fps_enter = fps_finish; + +#ifdef USE_FPS_SAMPLES + updateElapsed += frameElapsed; + + if (updateElapsed >= FPS_SAMPLE_RATE) + { + static int sampleIndex = 0; + int i; + + fps_samples[sampleIndex] = frameElapsed; + + sampleIndex++; + if (sampleIndex >= NUM_FPS_SAMPLES) + sampleIndex = 0; + + averageFPS = 0.0; + for (i = 0; i < NUM_FPS_SAMPLES; i++) + { + averageFPS += fps_samples[i]; + } + + if (averageFPS > 0.0) + { + averageFPS = 1.0 / (averageFPS / NUM_FPS_SAMPLES); + } + } + + while (updateElapsed >= FPS_SAMPLE_RATE) + { + updateElapsed -= FPS_SAMPLE_RATE; + } +#else + // Direct, unsampled counter. + averageFPS = 1.0 / frameElapsed; +#endif +} void SCR_DisplayTicRate(void) { - tic_t i; - tic_t ontic = I_GetTime(); - tic_t totaltics = 0; INT32 ticcntcolor = 0; const INT32 h = vid.height-(8*vid.dupy); + UINT32 cap = R_GetFramerateCap(); + double fps = round(averageFPS); if (gamestate == GS_NULL) return; - for (i = lasttic + 1; i < TICRATE+lasttic && i < ontic; ++i) - fpsgraph[i % TICRATE] = false; - - fpsgraph[ontic % TICRATE] = true; - - for (i = 0;i < TICRATE;++i) - if (fpsgraph[i]) - ++totaltics; - - if (totaltics <= TICRATE/2) ticcntcolor = V_REDMAP; - else if (totaltics == TICRATE) ticcntcolor = V_GREENMAP; - - if (cv_ticrate.value == 2) // compact counter - V_DrawString(vid.width-(16*vid.dupx), h, - ticcntcolor|V_NOSCALESTART|V_USERHUDTRANS, va("%02d", totaltics)); - else if (cv_ticrate.value == 1) // full counter + if (cap > 0) { - V_DrawString(vid.width-(72*vid.dupx), h, - V_YELLOWMAP|V_NOSCALESTART|V_USERHUDTRANS, "FPS:"); - V_DrawString(vid.width-(40*vid.dupx), h, - ticcntcolor|V_NOSCALESTART|V_USERHUDTRANS, va("%02d/%02u", totaltics, TICRATE)); + if (fps <= cap / 2.0) ticcntcolor = V_REDMAP; + else if (fps <= cap * 0.90) ticcntcolor = V_YELLOWMAP; + else ticcntcolor = V_GREENMAP; + } + else + { + ticcntcolor = V_GREENMAP; } - lasttic = ontic; + if (cv_ticrate.value == 2) // compact counter + { + V_DrawRightAlignedString(vid.width, h, + ticcntcolor|V_NOSCALESTART|V_USERHUDTRANS, va("%04.2f", averageFPS)); // use averageFPS directly + } + else if (cv_ticrate.value == 1) // full counter + { + const char *drawnstr; + INT32 width; + + // The highest assignable cap is < 1000, so 3 characters is fine. + if (cap > 0) + drawnstr = va("%3.0f/%3u", fps, cap); + else + drawnstr = va("%4.2f", averageFPS); + + width = V_StringWidth(drawnstr, V_NOSCALESTART); + + V_DrawString(vid.width - ((7 * 8 * vid.dupx) + V_StringWidth("FPS: ", V_NOSCALESTART)), h, + V_YELLOWMAP|V_NOSCALESTART|V_USERHUDTRANS, "FPS:"); + V_DrawString(vid.width - width, h, + ticcntcolor|V_NOSCALESTART|V_USERHUDTRANS, drawnstr); + } } void SCR_DisplayLocalPing(void) @@ -540,7 +621,13 @@ void SCR_ClosedCaptions(void) y = basey-((i + 2)*10); if (closedcaptions[i].b) - y -= (closedcaptions[i].b--)*vid.dupy; + { + y -= closedcaptions[i].b * vid.dupy; + if (renderisnewtic) + { + closedcaptions[i].b--; + } + } if (closedcaptions[i].t < CAPTIONFADETICS) flags |= (((CAPTIONFADETICS-closedcaptions[i].t)/2)*V_10TRANS); diff --git a/src/screen.h b/src/screen.h index 67880e2b9..19103b0df 100644 --- a/src/screen.h +++ b/src/screen.h @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -155,7 +155,15 @@ enum SPANDRAWFUNC_WATER, SPANDRAWFUNC_TILTEDWATER, + SPANDRAWFUNC_SOLID, + SPANDRAWFUNC_TRANSSOLID, + SPANDRAWFUNC_TILTEDSOLID, + SPANDRAWFUNC_TILTEDTRANSSOLID, + SPANDRAWFUNC_WATERSOLID, + SPANDRAWFUNC_TILTEDWATERSOLID, + SPANDRAWFUNC_FOG, + SPANDRAWFUNC_TILTEDFOG, SPANDRAWFUNC_MAX }; @@ -182,6 +190,8 @@ extern viddef_t vid; extern INT32 setmodeneeded; // mode number to set if needed, or 0 extern UINT8 setrenderneeded; +extern double averageFPS; + void SCR_ChangeRenderer(void); extern CV_PossibleValue_t cv_renderer_t[]; @@ -192,6 +202,7 @@ extern UINT8 *scr_borderpatch; // patch used to fill the view borders extern consvar_t cv_scr_width, cv_scr_height, cv_scr_depth, cv_renderview, cv_renderer, cv_fullscreen; // wait for page flipping to end or not extern consvar_t cv_vidwait; +extern consvar_t cv_timescale; // Initialize the screen void SCR_Startup(void); @@ -211,6 +222,8 @@ void SCR_CheckDefaultMode(void); // Set the mode number which is saved in the config void SCR_SetDefaultMode(void); +void SCR_CalculateFPS(void); + FUNCMATH boolean SCR_IsAspectCorrect(INT32 width, INT32 height); // move out to main code for consistency diff --git a/src/sdl/CMakeLists.txt b/src/sdl/CMakeLists.txt index a7f015c86..be540b778 100644 --- a/src/sdl/CMakeLists.txt +++ b/src/sdl/CMakeLists.txt @@ -1,417 +1,136 @@ # Declare SDL2 interface sources -if(NOT ${SRB2_CONFIG_HAVE_MIXERX}) - set(SRB2_CONFIG_SDL2_USEMIXER ON CACHE BOOL "Use SDL2_mixer or regular sdl sound") +target_sources(SRB2SDL2 PRIVATE mixer_sound.c) + +target_sourcefile(c) + +target_sources(SRB2SDL2 PRIVATE ogl_sdl.c) + +target_sources(SRB2SDL2 PRIVATE i_threads.c) + +if(${SRB2_USEASM}) + set_source_files_properties(${SRB2_ASM_SOURCES} PROPERTIES LANGUAGE C) + set_source_files_properties(${SRB2_ASM_SOURCES} PROPERTIES COMPILE_FLAGS "-x assembler-with-cpp") +endif() + +if("${CMAKE_SYSTEM_NAME}" MATCHES Windows) + target_sources(SRB2SDL2 PRIVATE + ../win32/win_dbg.c + ../win32/Srb2win.rc) +endif() + +if("${CMAKE_SYSTEM_NAME}" MATCHES Darwin) + set(MACOSX_BUNDLE_ICON_FILE Srb2mac.icns) + set_source_files_properties(macosx/Srb2mac.icns PROPERTIES MACOSX_PACKAGE_LOCATION "Resources") + target_sources(SRB2SDL2 PRIVATE + macosx/mac_alert.c + macosx/mac_alert.h + macosx/mac_resources.c + macosx/mac_resources.h + macosx/Srb2mac.icns + ) +endif() + +if("${CMAKE_SYSTEM_NAME}" MATCHES Windows) + set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME srb2win) +elseif("${CMAKE_SYSTEM_NAME}" MATCHES Linux) + set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME lsdlsrb2) else() - set(SRB2_CONFIG_SDL2_USEMIXER OFF) + set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME srb2) endif() -if(${SRB2_CONFIG_SDL2_USEMIXER}) - if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES}) - set(SDL2_MIXER_FOUND ON) - if(${SRB2_SYSTEM_BITS} EQUAL 64) - set(SDL2_MIXER_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/SDL2_mixer/x86_64-w64-mingw32/include/SDL2) - set(SDL2_MIXER_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/SDL2_mixer/x86_64-w64-mingw32/lib -lSDL2_mixer") - else() # 32-bit - set(SDL2_MIXER_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/SDL2_mixer/i686-w64-mingw32/include/SDL2) - set(SDL2_MIXER_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/SDL2_mixer/i686-w64-mingw32/lib -lSDL2_mixer") - endif() - else() - find_package(SDL2_mixer) - endif() - if(${SDL2_MIXER_FOUND}) - set(SRB2_HAVE_MIXER ON) - set(SRB2_SDL2_SOUNDIMPL mixer_sound.c) - else() - message(WARNING "You specified that SDL2_mixer is available, but it was not found. Falling back to sdl sound.") - set(SRB2_SDL2_SOUNDIMPL sdl_sound.c) - endif() -elseif(${MIXERX_FOUND}) - set(SRB2_SDL2_SOUNDIMPL mixer_sound.c) -else() - set(SRB2_SDL2_SOUNDIMPL sdl_sound.c) -endif() - -set(SRB2_SDL2_SOURCES - dosstr.c - endtxt.c - hwsym_sdl.c - i_main.c - i_net.c - i_system.c - i_ttf.c - i_video.c - #IMG_xpm.c - ogl_sdl.c - - ${SRB2_SDL2_SOUNDIMPL} -) - -set(SRB2_SDL2_HEADERS - endtxt.h - hwsym_sdl.h - i_ttf.h - ogl_sdl.h - sdlmain.h -) - -if(${SRB2_CONFIG_HAVE_THREADS}) - set(SRB2_SDL2_SOURCES ${SRB2_SDL2_SOURCES} i_threads.c) -endif() - -source_group("Interface Code" FILES ${SRB2_SDL2_SOURCES} ${SRB2_SDL2_HEADERS}) - -# Dependency -if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES}) - set(SDL2_FOUND ON) - if(${SRB2_SYSTEM_BITS} EQUAL 64) - set(SDL2_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/SDL2/x86_64-w64-mingw32/include/SDL2) - set(SDL2_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/SDL2/x86_64-w64-mingw32/lib -lSDL2") - else() # 32-bit - set(SDL2_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/SDL2/i686-w64-mingw32/include/SDL2) - set(SDL2_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/SDL2/i686-w64-mingw32/lib -lSDL2") - endif() -else() - find_package(SDL2) -endif() - -if(${SDL2_FOUND}) - set(SRB2_SDL2_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_SDL2_SOURCES} - ${SRB2_SDL2_HEADERS} +if("${CMAKE_SYSTEM_NAME}" MATCHES Darwin) + find_library(CORE_FOUNDATION_LIBRARY "CoreFoundation") + target_link_libraries(SRB2SDL2 PRIVATE + ${CORE_FOUNDATION_LIBRARY} ) - source_group("Main" FILES ${SRB2_CORE_SOURCES} ${SRB2_CORE_HEADERS} - ${SRB2_PNG_SOURCES} ${SRB2_PNG_HEADERS}) - source_group("Renderer" FILES ${SRB2_CORE_RENDER_SOURCES}) - source_group("Game" FILES ${SRB2_CORE_GAME_SOURCES}) - source_group("Assembly" FILES ${SRB2_ASM_SOURCES} ${SRB2_NASM_SOURCES}) - source_group("LUA" FILES ${SRB2_LUA_SOURCES} ${SRB2_LUA_HEADERS}) - source_group("LUA\\Interpreter" FILES ${SRB2_BLUA_SOURCES} ${SRB2_BLUA_HEADERS}) + set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}") - if(${SRB2_CONFIG_HWRENDER}) - set(SRB2_SDL2_TOTAL_SOURCES ${SRB2_SDL2_TOTAL_SOURCES} - ${SRB2_HWRENDER_SOURCES} - ${SRB2_HWRENDER_HEADERS} - ${SRB2_R_OPENGL_SOURCES} - ${SRB2_R_OPENGL_HEADERS} - ) + # 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} - source_group("Hardware" FILES ${SRB2_HWRENDER_SOURCES} ${SRB2_HWRENDER_HEADERS}) - source_group("Hardware\\OpenGL Renderer" FILES ${SRB2_R_OPENGL_SOURCES} ${SRB2_R_OPENGL_HEADERS}) - endif() + RESOURCE "${CMAKE_CURRENT_SOURCE_DIR}/macosx/Srb2mac.icns" + ) +endif() - if(${SRB2_USEASM}) - set(SRB2_SDL2_TOTAL_SOURCES ${SRB2_SDL2_TOTAL_SOURCES} - ${SRB2_NASM_SOURCES} - ) - if(MSVC) - set(SRB2_SDL2_TOTAL_SOURCES ${SRB2_SDL2_TOTAL_SOURCES} - ${SRB2_NASM_OBJECTS} - ) - set_source_files_properties(${SRB2_NASM_OBJECTS} PROPERTIES GENERATED ON) - else() - list(APPEND SRB2_SDL2_TOTAL_SOURCES ${SRB2_ASM_SOURCES}) - set_source_files_properties(${SRB2_ASM_SOURCES} PROPERTIES LANGUAGE C) - set_source_files_properties(${SRB2_ASM_SOURCES} PROPERTIES COMPILE_FLAGS "-x assembler-with-cpp") - endif() - endif() +if(NOT "${SRB2_CONFIG_SYSTEM_LIBRARIES}" AND NOT "${SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES}") + target_link_libraries(SRB2SDL2 PRIVATE SDL2::SDL2-static SDL2_mixer::SDL2_mixer-static) +else() + target_link_libraries(SRB2SDL2 PRIVATE SDL2::SDL2 SDL2_mixer::SDL2_mixer) +endif() - if(${CMAKE_SYSTEM} MATCHES Windows) - set(SRB2_SDL2_TOTAL_SOURCES ${SRB2_SDL2_TOTAL_SOURCES} - ${CMAKE_SOURCE_DIR}/src/win32/win_dbg.c - ${CMAKE_SOURCE_DIR}/src/win32/Srb2win.rc - ) - endif() +if("${CMAKE_SYSTEM_NAME}" MATCHES Linux) + target_link_libraries(SRB2SDL2 PRIVATE m rt) +endif() - if(${CMAKE_SYSTEM} MATCHES Darwin) - set(MACOSX_BUNDLE_ICON_FILE Srb2mac.icns) - set_source_files_properties(macosx/Srb2mac.icns PROPERTIES MACOSX_PACKAGE_LOCATION "Resources") - set(SRB2_SDL2_MAC_SOURCES - macosx/mac_alert.c - macosx/mac_alert.h - macosx/mac_resources.c - macosx/mac_resources.h - macosx/Srb2mac.icns - ) - source_group("Interface Code\\OSX Compatibility" FILES ${SRB2_SDL2_MAC_SOURCES}) - set(SRB2_SDL2_TOTAL_SOURCES ${SRB2_SDL2_TOTAL_SOURCES} ${SRB2_SDL2_MAC_SOURCES}) - endif() - - add_executable(SRB2SDL2 MACOSX_BUNDLE WIN32 ${SRB2_SDL2_TOTAL_SOURCES}) - if(${CMAKE_SYSTEM} MATCHES Windows) - set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME srb2win) - elseif(${CMAKE_SYSTEM} MATCHES Linux) - set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME lsdlsrb2) +if(${SRB2_USEASM}) + if(${SRB2_CONFIG_YASM}) + set(ASM_ASSEMBLER_TEMP ${CMAKE_ASM_YASM_COMPILER}) + set(ASM_ASSEMBLER_OBJFORMAT ${CMAKE_ASM_YASM_OBJECT_FORMAT}) + set_source_files_properties(${SRB2_NASM_SOURCES} LANGUAGE ASM_YASM) else() - set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME srb2) + set(ASM_ASSEMBLER_TEMP ${CMAKE_ASM_NASM_COMPILER}) + set(ASM_ASSEMBLER_OBJFORMAT ${CMAKE_ASM_NASM_OBJECT_FORMAT}) + set_source_files_properties(${SRB2_NASM_SOURCES} LANGUAGE ASM_NASM) endif() +endif() - if(${CMAKE_SYSTEM} MATCHES Darwin) - find_library(CORE_LIB CoreFoundation) - target_link_libraries(SRB2SDL2 PRIVATE - ${CORE_LIB} - SDL2 - SDL2_mixer - ${GME_LIBRARIES} - ${OPENMPT_LIBRARIES} - ${MIXERX_LIBRARIES} - ${PNG_LIBRARIES} - ${ZLIB_LIBRARIES} - ${OPENGL_LIBRARIES} - ${CURL_LIBRARIES} - ) - set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}") - else() - target_link_libraries(SRB2SDL2 PRIVATE - ${SDL2_LIBRARIES} - ${SDL2_MIXER_LIBRARIES} - ${GME_LIBRARIES} - ${OPENMPT_LIBRARIES} - ${MIXERX_LIBRARIES} - ${PNG_LIBRARIES} - ${ZLIB_LIBRARIES} - ${OPENGL_LIBRARIES} - ${CURL_LIBRARIES} - ) +if("${CMAKE_SYSTEM_NAME}" MATCHES Windows) + target_link_libraries(SRB2SDL2 PRIVATE + ws2_32 + ) + target_compile_options(SRB2SDL2 PRIVATE + -U_WINDOWS + ) +endif() - if(${CMAKE_SYSTEM} MATCHES Linux) - target_link_libraries(SRB2SDL2 PRIVATE - m - rt +target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_MIXER -DSOUND=SOUND_MIXER) +target_compile_definitions(SRB2SDL2 PRIVATE -DDIRECTFULLSCREEN -DHAVE_SDL) + +#### Installation #### +if("${CMAKE_SYSTEM_NAME}" MATCHES Darwin) + install(TARGETS SRB2SDL2 + BUNDLE DESTINATION . + ) + set_property(TARGET SRB2SDL2 PROPERTY INSTALL_RPATH_USE_LINK_PATH ON) +else() + install(TARGETS SRB2SDL2 SRB2SDL2 + RUNTIME DESTINATION . + ) + if ((${CMAKE_BUILD_TYPE} MATCHES Debug) OR (${CMAKE_BUILD_TYPE} MATCHES RelWithDebInfo)) + set(SRB2_DEBUG_INSTALL OFF CACHE BOOL "Insert *.debug file into the install directory or package.") + if (${SRB2_DEBUG_INSTALL}) + install(FILES $.debug + DESTINATION . + OPTIONAL ) endif() endif() - - #target_link_libraries(SRB2SDL2 PRIVATE SRB2Core) - - if(${SRB2_USEASM}) - if(${SRB2_CONFIG_YASM}) - set(ASM_ASSEMBLER_TEMP ${CMAKE_ASM_YASM_COMPILER}) - set(ASM_ASSEMBLER_OBJFORMAT ${CMAKE_ASM_YASM_OBJECT_FORMAT}) - set_source_files_properties(${SRB2_NASM_SOURCES} LANGUAGE ASM_YASM) - else() - set(ASM_ASSEMBLER_TEMP ${CMAKE_ASM_NASM_COMPILER}) - set(ASM_ASSEMBLER_OBJFORMAT ${CMAKE_ASM_NASM_OBJECT_FORMAT}) - set_source_files_properties(${SRB2_NASM_SOURCES} LANGUAGE ASM_NASM) - endif() - - if(MSVC) - # using assembler with msvc doesn't work, must do it manually - foreach(ASMFILE ${SRB2_NASM_SOURCES}) - get_filename_component(ASMFILE_NAME ${ASMFILE} NAME_WE) - set(ASMFILE_NAME ${ASMFILE_NAME}.obj) - add_custom_command(TARGET SRB2SDL2 PRE_LINK - COMMAND ${ASM_ASSEMBLER_TEMP} ARGS -f ${ASM_ASSEMBLER_OBJFORMAT} -o ${CMAKE_CURRENT_BINARY_DIR}/${ASMFILE_NAME} ${ASMFILE} - COMMENT "assemble ${ASMFILE_NAME}." - ) - endforeach() - endif() - endif() - - set_target_properties(SRB2SDL2 PROPERTIES VERSION ${SRB2_VERSION}) - - if(${CMAKE_SYSTEM} MATCHES Windows) - target_link_libraries(SRB2SDL2 PRIVATE - ws2_32 - ) - target_compile_options(SRB2SDL2 PRIVATE - -U_WINDOWS - ) - endif() - - if(MSVC) - if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES}) - set(SDL2_MAIN_FOUND ON) - if(${SRB2_SYSTEM_BITS} EQUAL 64) - set(SDL2_MAIN_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/SDL2/x86_64-w64-mingw32/include/SDL2) - set(SDL2_MAIN_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/SDL2/x86_64-w64-mingw32/lib -lSDL2main") - else() # 32-bit - set(SDL2_MAIN_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/SDL2/i686-w64-mingw32/include/SDL2) - set(SDL2_MAIN_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/SDL2/i686-w64-mingw32/lib -lSDL2main") - endif() - else() - find_package(SDL2_MAIN REQUIRED) - endif() - target_link_libraries(SRB2SDL2 PRIVATE - ${SDL2_MAIN_LIBRARIES} - ) - target_compile_options(SRB2SDL2 PRIVATE - /Umain - /D_CRT_SECURE_NO_WARNINGS # something about string functions. - /D_CRT_NONSTDC_NO_DEPRECATE - /DSDLMAIN - /D_WINSOCK_DEPRECATED_NO_WARNINGS # Don't care - ) - endif() - - target_include_directories(SRB2SDL2 PRIVATE - ${SDL2_INCLUDE_DIRS} - ${SDL2_MIXER_INCLUDE_DIRS} - ${GME_INCLUDE_DIRS} - ${OPENMPT_INCLUDE_DIRS} - ${MIXERX_INCLUDE_DIRS} - ${PNG_INCLUDE_DIRS} - ${ZLIB_INCLUDE_DIRS} - ${OPENGL_INCLUDE_DIRS} - ${CURL_INCLUDE_DIRS} - ) - - if((${SRB2_HAVE_MIXER}) OR (${SRB2_HAVE_MIXERX})) - target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_MIXER -DSOUND=SOUND_MIXER) - endif() - - target_compile_definitions(SRB2SDL2 PRIVATE - -DDIRECTFULLSCREEN -DHAVE_SDL - ) - - ## strip debug symbols into separate file when using gcc. - ## to be consistent with Makefile, don't generate for OS X. - if((CMAKE_COMPILER_IS_GNUCC) AND NOT (${CMAKE_SYSTEM} 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 ${OBJCOPY} ${OBJCOPY_ONLY_KEEP_DEBUG} $ $.debug - COMMAND ${OBJCOPY} --strip-debug $ - COMMAND ${OBJCOPY} --add-gnu-debuglink=$.debug $ - ) - endif() - endif() - - #### Installation #### - if(${CMAKE_SYSTEM} MATCHES Darwin) - install(TARGETS SRB2SDL2 - BUNDLE DESTINATION . - ) - else() - install(TARGETS SRB2SDL2 SRB2SDL2 - RUNTIME DESTINATION . - ) - if ((${CMAKE_BUILD_TYPE} MATCHES Debug) OR (${CMAKE_BUILD_TYPE} MATCHES RelWithDebInfo)) - set(SRB2_DEBUG_INSTALL OFF CACHE BOOL "Insert *.debug file into the install directory or package.") - if (${SRB2_DEBUG_INSTALL}) - install(FILES $.debug - DESTINATION . - OPTIONAL - ) - endif() - endif() - endif() - - if(${CMAKE_SYSTEM} MATCHES Windows) - set(win_extra_dll_list "") - macro(getwinlib dllname defaultname) - if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES}) - if (${CMAKE_GENERATOR} STREQUAL "MinGW Makefiles") - if(${SRB2_SYSTEM_BITS} EQUAL 64) - find_library(SRB2_SDL2_DLL_${dllname} "${defaultname}" - HINTS ${CMAKE_SOURCE_DIR}/libs/dll-binaries/x86_64 - HINTS ${CMAKE_SOURCE_DIR}/libs/SDL2/x86_64-w64-mingw32/bin - HINTS ${CMAKE_SOURCE_DIR}/libs/SDL2_mixer/x86_64-w64-mingw32/bin - HINTS ${CMAKE_SOURCE_DIR}/libs/libopenmpt/bin/x86_64/mingw - HINTS ${CMAKE_SOURCE_DIR}/libs/SDLMixerX/x86_64-w64-mingw32/bin - ) - else() - find_library(SRB2_SDL2_DLL_${dllname} "${defaultname}" - HINTS ${CMAKE_SOURCE_DIR}/libs/dll-binaries/i686 - HINTS ${CMAKE_SOURCE_DIR}/libs/SDL2/i686-w64-mingw32/bin - HINTS ${CMAKE_SOURCE_DIR}/libs/SDL2_mixer/i686-w64-mingw32/bin - HINTS ${CMAKE_SOURCE_DIR}/libs/libopenmpt/bin/x86/mingw - HINTS ${CMAKE_SOURCE_DIR}/libs/SDLMixerX/i686-w64-mingw32/bin - ) - endif() - else() - if(${SRB2_SYSTEM_BITS} EQUAL 64) - find_library(SRB2_SDL2_DLL_${dllname} "${defaultname}" - HINTS ${CMAKE_SOURCE_DIR}/libs/dll-binaries/x86_64 - HINTS ${CMAKE_SOURCE_DIR}/libs/SDL2/lib/x64 - HINTS ${CMAKE_SOURCE_DIR}/libs/SDL2_mixer/lib/x64 - HINTS ${CMAKE_SOURCE_DIR}/libs/libopenmpt/bin/x86_64/mingw - HINTS ${CMAKE_SOURCE_DIR}/libs/SDLMixerX/x86_64-w64-mingw32/bin - ) - else() - find_library(SRB2_SDL2_DLL_${dllname} "${defaultname}" - HINTS ${CMAKE_SOURCE_DIR}/libs/dll-binaries/i686 - HINTS ${CMAKE_SOURCE_DIR}/libs/SDL2/lib/x86 - HINTS ${CMAKE_SOURCE_DIR}/libs/SDL2_mixer/lib/x86 - HINTS ${CMAKE_SOURCE_DIR}/libs/libopenmpt/bin/x86/mingw - HINTS ${CMAKE_SOURCE_DIR}/libs/SDLMixerX/i686-w64-mingw32/bin - ) - endif() - endif() - - list(APPEND win_extra_dll_list ${SRB2_SDL2_DLL_${dllname}}) - else() - find_library(SRB2_SDL2_DLL_${dllname} "${defaultname}") - list(APPEND win_extra_dll_list ${SRB2_SDL2_DLL_${dllname}}) - endif() - endmacro() - getwinlib(SDL2 "SDL2.dll") - if(${SRB2_CONFIG_SDL2_USEMIXER}) - getwinlib(SDL2_mixer "SDL2_mixer.dll") - getwinlib(libogg_0 "libogg-0.dll") - getwinlib(libvorbis_0 "libvorbis-0.dll") - getwinlib(libvorbisfile_3 "libvorbisfile-3.dll") - endif() - if(${SRB2_CONFIG_HAVE_GME}) - getwinlib(libgme "libgme.dll") - endif() - if(${SRB2_CONFIG_HAVE_OPENMPT}) - getwinlib(libopenmpt "libopenmpt.dll") - endif() - if(${SRB2_CONFIG_HAVE_MIXERX}) - getwinlib(SDL2_mixer_ext "SDL2_mixer_ext.dll") - getwinlib(libfluidsynth-2 "libfluidsynth-2.dll") - getwinlib(libgcc_s_sjlj-1 "libgcc_s_sjlj-1.dll") - getwinlib(libstdc++-6 "libstdc++-6.dll") - endif() - - install(PROGRAMS - ${win_extra_dll_list} - DESTINATION . - ) - - # We also want to copy those DLLs to build directories on MSVC. - # So we'll add a post_build step. - copy_files_to_build_dir(SRB2SDL2 win_extra_dll_list) - endif() - - - # Mac bundle fixup - # HACK: THIS IS IMPORTANT! See the escaped \${CMAKE_INSTALL_PREFIX}? This - # makes it so that var is evaluated LATER during cpack, not right now! - # This fixes the quirk where the bundled libraries don't land in the final package - # https://cmake.org/pipermail/cmake/2011-March/043532.html - # - # HOWEVER: ${CPACK_PACKAGE_DESCRIPTION_SUMMARY} is NOT escaped, because that var - # is only available to us at this step. Read the link: ${CMAKE_INSTALL_PREFIX} at - # this current step points to the CMAKE build folder, NOT the folder that CPACK uses. - # Therefore, it makes sense to escape that var, but not the other. - if(${CMAKE_SYSTEM} MATCHES Darwin) - install(CODE " - include(BundleUtilities) - fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/${CPACK_PACKAGE_DESCRIPTION_SUMMARY}.app\" - \"\" - /Library/Frameworks - )" - ) - endif() - - set(SRB2_SDL2_AVAILABLE YES PARENT_SCOPE) -else() - message(WARNING "SDL2 was not found, so the SDL2 target will not be available.") - set(SRB2_SDL2_AVAILABLE NO PARENT_SCOPE) endif() + +# Mac bundle fixup +# HACK: THIS IS IMPORTANT! See the escaped \${CMAKE_INSTALL_PREFIX}? This +# makes it so that var is evaluated LATER during cpack, not right now! +# This fixes the quirk where the bundled libraries don't land in the final package +# https://cmake.org/pipermail/cmake/2011-March/043532.html +# +# HOWEVER: ${CPACK_PACKAGE_DESCRIPTION_SUMMARY} is NOT escaped, because that var +# is only available to us at this step. Read the link: ${CMAKE_INSTALL_PREFIX} at +# this current step points to the CMAKE build folder, NOT the folder that CPACK uses. +# Therefore, it makes sense to escape that var, but not the other. +if("${CMAKE_SYSTEM_NAME}" MATCHES Darwin) + install(CODE " + include(BundleUtilities) + fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/${CPACK_PACKAGE_DESCRIPTION_SUMMARY}.app\" + \"\" + /Library/Frameworks + )" + ) +endif() + +set(SRB2_SDL2_AVAILABLE YES PARENT_SCOPE) diff --git a/src/sdl/MakeNIX.cfg b/src/sdl/MakeNIX.cfg deleted file mode 100644 index c2f3ff0b6..000000000 --- a/src/sdl/MakeNIX.cfg +++ /dev/null @@ -1,76 +0,0 @@ -# -# sdl/makeNIX.cfg for SRB2/?nix -# - -#Valgrind support -ifdef VALGRIND -VALGRIND_PKGCONFIG?=valgrind -VALGRIND_CFLAGS?=$(shell $(PKG_CONFIG) $(VALGRIND_PKGCONFIG) --cflags) -VALGRIND_LDFLAGS?=$(shell $(PKG_CONFIG) $(VALGRIND_PKGCONFIG) --libs) -ZDEBUG=1 -LIBS+=$(VALGRIND_LDFLAGS) -ifdef GCC46 -WFLAGS+=-Wno-error=unused-but-set-variable -WFLAGS+=-Wno-unused-but-set-variable -endif -endif - -# -#here is GNU/Linux and other -# - OPTS=-DUNIXCOMMON - -#Use -rdynamic so a backtrace log shows function names instead of addresses - LDFLAGS+=-rdynamic - - #LDFLAGS = -L/usr/local/lib - LIBS=-lm -ifdef LINUX - LIBS+=-lrt -ifdef NOTERMIOS - OPTS+=-DNOTERMIOS -endif -endif - -ifdef LINUX64 - OPTS+=-DLINUX64 -endif - -# -#here is Solaris -# -ifdef SOLARIS - NOIPX=1 - NOASM=1 - OPTS+=-DSOLARIS -DINADDR_NONE=INADDR_ANY -DBSD_COMP - OPTS+=-I/usr/local/include -I/opt/sfw/include - LDFLAGS+=-L/opt/sfw/lib - LIBS+=-lsocket -lnsl -endif - -# -#here is FreeBSD -# -ifdef FREEBSD - OPTS+=-DLINUX -DFREEBSD -I/usr/X11R6/include - SDL_CONFIG?=sdl11-config - LDFLAGS+=-L/usr/X11R6/lib - LIBS+=-lipx -lkvm -endif - -# -#here is Mac OS X -# -ifdef MACOSX - OBJS+=$(OBJDIR)/mac_resources.o - OBJS+=$(OBJDIR)/mac_alert.o - LIBS+=-framework CoreFoundation -endif - -ifndef NOHW - OPTS+=-I/usr/X11R6/include - LDFLAGS+=-L/usr/X11R6/lib -endif - - # name of the exefile - EXENAME?=lsdl2srb2 diff --git a/src/sdl/Makefile.cfg b/src/sdl/Makefile.cfg deleted file mode 100644 index 45d0d6ba7..000000000 --- a/src/sdl/Makefile.cfg +++ /dev/null @@ -1,125 +0,0 @@ -# -# sdl/makefile.cfg for SRB2/SDL -# - -# -#SDL...., *looks at Alam*, THIS IS A MESS! -# - -ifdef UNIXCOMMON -include sdl/MakeNIX.cfg -endif - -ifdef PANDORA -include sdl/SRB2Pandora/Makefile.cfg -endif #ifdef PANDORA - -ifdef CYGWIN32 -include sdl/MakeCYG.cfg -endif #ifdef CYGWIN32 - -ifdef SDL_PKGCONFIG -SDL_CFLAGS?=$(shell $(PKG_CONFIG) $(SDL_PKGCONFIG) --cflags) -SDL_LDFLAGS?=$(shell $(PKG_CONFIG) $(SDL_PKGCONFIG) --libs) -else -ifdef PREFIX - SDL_CONFIG?=$(PREFIX)-sdl2-config -else - SDL_CONFIG?=sdl2-config -endif - -ifdef STATIC - SDL_CFLAGS?=$(shell $(SDL_CONFIG) --cflags) - SDL_LDFLAGS?=$(shell $(SDL_CONFIG) --static-libs) -else - SDL_CFLAGS?=$(shell $(SDL_CONFIG) --cflags) - SDL_LDFLAGS?=$(shell $(SDL_CONFIG) --libs) -endif -endif - - - #use the x86 asm code -ifndef CYGWIN32 -ifndef NOASM - USEASM=1 -endif -endif - - OBJS+=$(OBJDIR)/i_video.o $(OBJDIR)/dosstr.o $(OBJDIR)/endtxt.o $(OBJDIR)/hwsym_sdl.o - - OPTS+=-DDIRECTFULLSCREEN -DHAVE_SDL - -ifndef NOHW - OBJS+=$(OBJDIR)/r_opengl.o $(OBJDIR)/ogl_sdl.o -endif - -ifdef NOMIXER - i_sound_o=$(OBJDIR)/sdl_sound.o -else - i_sound_o=$(OBJDIR)/mixer_sound.o - OPTS+=-DHAVE_MIXER -ifdef HAVE_MIXERX - OPTS+=-DHAVE_MIXERX - SDL_LDFLAGS+=-lSDL2_mixer_ext -else - SDL_LDFLAGS+=-lSDL2_mixer -endif -endif - -ifndef NOTHREADS - OPTS+=-DHAVE_THREADS - OBJS+=$(OBJDIR)/i_threads.o -endif - -ifdef SDL_TTF - OPTS+=-DHAVE_TTF - SDL_LDFLAGS+=-lSDL2_ttf -lfreetype -lz - OBJS+=$(OBJDIR)/i_ttf.o -endif - -ifdef SDL_IMAGE - OPTS+=-DHAVE_IMAGE - SDL_LDFLAGS+=-lSDL2_image -endif - -ifdef SDL_NET - OPTS+=-DHAVE_SDLNET - SDL_LDFLAGS+=-lSDL2_net -endif - -ifdef MINGW -ifndef NOSDLMAIN - SDLMAIN=1 -endif -endif - -ifdef SDLMAIN - OPTS+=-DSDLMAIN -else -ifdef MINGW - SDL_CFLAGS+=-Umain - SDL_LDFLAGS+=-mconsole -endif -endif - -ifndef NOHW -ifdef OPENAL -ifdef MINGW - LIBS:=-lopenal32 $(LIBS) -else - LIBS:=-lopenal $(LIBS) -endif -else -ifdef MINGW -ifdef DS3D - LIBS:=-ldsound -luuid $(LIBS) -endif -endif -endif -endif - -CFLAGS+=$(SDL_CFLAGS) -LIBS:=$(SDL_LDFLAGS) $(LIBS) -ifdef STATIC - LIBS+=$(shell $(SDL_CONFIG) --static-libs) -endif diff --git a/src/sdl/Sourcefile b/src/sdl/Sourcefile new file mode 100644 index 000000000..82d5ce073 --- /dev/null +++ b/src/sdl/Sourcefile @@ -0,0 +1,7 @@ +i_net.c +i_system.c +i_main.c +i_video.c +dosstr.c +endtxt.c +hwsym_sdl.c diff --git a/src/sdl/Srb2SDL-vc10.vcxproj b/src/sdl/Srb2SDL-vc10.vcxproj index de9c4f32f..c20265ed1 100644 --- a/src/sdl/Srb2SDL-vc10.vcxproj +++ b/src/sdl/Srb2SDL-vc10.vcxproj @@ -39,46 +39,46 @@ {61BA7D3C-F77D-4D31-B718-1177FE482CF2} Win32Proj Srb2SDL - 10.0.16299.0 + 10.0 Srb2Win - v140 + v143 true - v141 + v143 true true - v140 + v143 false true - v141 + v143 false true true - v140 + v143 true - v141 + v143 true true - v140 + v143 false true - v141 + v143 false true true @@ -134,6 +134,9 @@ <_ProjectFileVersion>10.0.30319.1 false + + $(ProjectName)_Debug + ProgramDatabase @@ -154,6 +157,26 @@ setupapi.lib;winmm.lib;imm32.lib;version.lib;ole32.lib;advapi32.lib;shell32.lib;gdi32.lib;oleaut32.lib;uuid.lib;%(AdditionalDependencies) + + + Default + false + 4244;4267;4146 + true + false + stdcpp17 + + + + + stdcpp17 + + + + + 4244;4267;4146;4003 + + {72b01aca-7a1a-4f7b-acef-2607299cf052} @@ -245,11 +268,14 @@ + + + @@ -263,6 +289,7 @@ + @@ -271,6 +298,7 @@ + @@ -285,6 +313,7 @@ + @@ -304,6 +333,7 @@ + @@ -401,12 +431,15 @@ true + + + @@ -414,6 +447,7 @@ + @@ -425,6 +459,7 @@ + @@ -434,6 +469,7 @@ + @@ -460,6 +496,7 @@ true + @@ -478,6 +515,7 @@ + true @@ -501,7 +539,7 @@ true - + @@ -518,4 +556,4 @@ - + \ No newline at end of file diff --git a/src/sdl/Srb2SDL-vc10.vcxproj.filters b/src/sdl/Srb2SDL-vc10.vcxproj.filters index b59d9864d..eb37ce9da 100644 --- a/src/sdl/Srb2SDL-vc10.vcxproj.filters +++ b/src/sdl/Srb2SDL-vc10.vcxproj.filters @@ -135,6 +135,15 @@ D_Doom + + D_Doom + + + D_Doom + + + D_Doom + D_Doom @@ -288,6 +297,9 @@ I_Interface + + I_Interface + I_Interface @@ -402,6 +414,9 @@ P_Play + + P_Play + R_Rend @@ -495,6 +510,21 @@ R_Rend + + LUA + + + I_Interface + + + R_Rend + + + P_Play + + + M_Misc + @@ -600,6 +630,15 @@ D_Doom + + D_Doom + + + D_Doom + + + D_Doom + D_Doom @@ -723,6 +762,9 @@ LUA + + LUA + LUA @@ -744,6 +786,9 @@ LUA + + LUA + LUA @@ -849,6 +894,9 @@ P_Play + + P_Play + P_Play @@ -927,9 +975,6 @@ SDLApp - - SDLApp - SDLApp @@ -985,10 +1030,28 @@ R_Rend + + LUA + + + SDLApp + + + I_Interface + + + R_Rend + + + P_Play + + + M_Misc + SDLApp - + \ No newline at end of file diff --git a/src/sdl/Srb2SDL-vc9.vcproj b/src/sdl/Srb2SDL-vc9.vcproj deleted file mode 100644 index 95f035267..000000000 --- a/src/sdl/Srb2SDL-vc9.vcproj +++ /dev/null @@ -1,6021 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/sdl/Srb2SDL.dsp b/src/sdl/Srb2SDL.dsp deleted file mode 100644 index 9f6dd7b33..000000000 --- a/src/sdl/Srb2SDL.dsp +++ /dev/null @@ -1,1049 +0,0 @@ -# Microsoft Developer Studio Project File - Name="Srb2SDL" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=Srb2SDL - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Srb2SDL.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Srb2SDL.mak" CFG="Srb2SDL - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Srb2SDL - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "Srb2SDL - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "Srb2SDL - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\bin\VC\Release\SDL" -# PROP Intermediate_Dir "..\..\objs\VC\Release\SDL" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -MTL=midl.exe -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /G5 /W3 /GX /Zi /Ot /Og /Oi /Op /Oy /Ob1 /I "..\..\libs\libpng-src" /I "..\..\libs\zlib" /D "NDEBUG" /D "SDLMAIN" /D "NO_STDIO_REDIRECT" /D "USE_WGL_SWAP" /D "DIRECTFULLSCREEN" /D "HAVE_SDL" /D "HWRENDER" /D "HW3SOUND" /D "HAVE_FILTER" /D "HAVE_MIXER" /D "USEASM" /D "HAVE_PNG" /FR /FD /GF /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -# SUBTRACT RSC /x -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo /o"..\..\objs\SDL\Release\SRB2.bsc" -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 SDL.lib SDL_mixer.lib user32.lib advapi32.lib ws2_32.lib /nologo /subsystem:windows /pdb:"C:\srb2demo2\srb2sdl.pdb" /debug /machine:I386 /out:"C:\srb2demo2\srb2sdl.exe" -# SUBTRACT LINK32 /profile /pdb:none /incremental:yes - -!ELSEIF "$(CFG)" == "Srb2SDL - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\bin\VC\Debug\SDL" -# PROP Intermediate_Dir "..\..\objs\VC\Debug\SDL" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -MTL=midl.exe -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /G6 /W4 /WX /Gm /GX /ZI /Od /Op /I "..\..\libs\libpng-src" /I "..\..\libs\zlib" /D "_DEBUG" /D "USE_WGL_SWAP" /D "DIRECTFULLSCREEN" /D "HAVE_SDL" /D "HWRENDER" /D "HW3SOUND" /D "HAVE_FILTER" /D "HAVE_MIXER" /D "USEASM" /D "HAVE_PNG" /FR /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -# SUBTRACT RSC /x -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo /o"..\..\objs\SDL\Debug\SRB2.bsc" -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 SDL.lib SDL_mixer.lib user32.lib advapi32.lib ws2_32.lib /nologo /subsystem:console /pdb:"C:\srb2demo2\srb2sdldebug.pdb" /debug /machine:I386 /out:"C:\srb2demo2\srb2sdldebug.exe" /pdbtype:sept -# SUBTRACT LINK32 /pdb:none - -!ENDIF - -# Begin Target - -# Name "Srb2SDL - Win32 Release" -# Name "Srb2SDL - Win32 Debug" -# Begin Group "SDLapp" - -# PROP Default_Filter "" -# Begin Group "filter" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\filter\filters.c -# End Source File -# Begin Source File - -SOURCE=.\filter\filters.h -# End Source File -# Begin Source File - -SOURCE=.\filter\hq2x.c -# End Source File -# Begin Source File - -SOURCE=.\filter\hq2x.h -# End Source File -# Begin Source File - -SOURCE=.\filter\interp.h -# End Source File -# Begin Source File - -SOURCE=.\filter\lq2x.c -# End Source File -# Begin Source File - -SOURCE=.\filter\lq2x.h -# End Source File -# End Group -# Begin Source File - -SOURCE=.\dosstr.c -# End Source File -# Begin Source File - -SOURCE=.\endtxt.c -# End Source File -# Begin Source File - -SOURCE=.\endtxt.h -# End Source File -# Begin Source File - -SOURCE=..\filesrch.c -# End Source File -# Begin Source File - -SOURCE=..\filesrch.h -# End Source File -# Begin Source File - -SOURCE=.\hwsym_sdl.c -# End Source File -# Begin Source File - -SOURCE=.\hwsym_sdl.h -# End Source File -# Begin Source File - -SOURCE=.\i_cdmus.c -# End Source File -# Begin Source File - -SOURCE=.\i_main.c -# End Source File -# Begin Source File - -SOURCE=.\i_net.c -# End Source File -# Begin Source File - -SOURCE=.\i_sound.c -# End Source File -# Begin Source File - -SOURCE=.\i_system.c -# End Source File -# Begin Source File - -SOURCE=.\i_video.c -# End Source File -# Begin Source File - -SOURCE=.\IMG_xpm.c -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\ogl_sdl.c -# End Source File -# Begin Source File - -SOURCE=.\ogl_sdl.h -# End Source File -# Begin Source File - -SOURCE=..\hardware\r_opengl\r_opengl.c -# End Source File -# Begin Source File - -SOURCE=..\hardware\r_opengl\r_opengl.h -# End Source File -# Begin Source File - -SOURCE=.\SDL_icon.xpm -# End Source File -# Begin Source File - -SOURCE=.\SDL_main\SDL_win32_main.c - -!IF "$(CFG)" == "Srb2SDL - Win32 Release" - -!ELSEIF "$(CFG)" == "Srb2SDL - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\sdlmain.h -# End Source File -# Begin Source File - -SOURCE=..\win32\Srb2win.rc -# End Source File -# Begin Source File - -SOURCE=..\win32\win_dbg.c -# End Source File -# Begin Source File - -SOURCE=..\win32\win_dbg.h -# End Source File -# Begin Source File - -SOURCE=..\win32\win_main.h -# End Source File -# End Group -# Begin Group "A_Asm" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\p5prof.h -# End Source File -# Begin Source File - -SOURCE=..\tmap.nas - -!IF "$(CFG)" == "Srb2SDL - Win32 Release" - -# PROP Ignore_Default_Tool 1 -# Begin Custom Build - Compiling $(InputName).nas with NASM... -IntDir=.\..\..\objs\VC\Release\SDL -InputPath=..\tmap.nas -InputName=tmap - -"$(IntDir)/$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -g -o $(IntDir)/$(InputName).obj -f win32 $(InputPath) - -# End Custom Build - -!ELSEIF "$(CFG)" == "Srb2SDL - Win32 Debug" - -# PROP Ignore_Default_Tool 1 -# Begin Custom Build - Compiling $(InputName).nas with NASM... -IntDir=.\..\..\objs\VC\Debug\SDL -InputPath=..\tmap.nas -InputName=tmap - -"$(IntDir)/$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -g -o $(IntDir)/$(InputName).obj -f win32 $(InputPath) - -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\tmap_mmx.nas - -!IF "$(CFG)" == "Srb2SDL - Win32 Release" - -# PROP Ignore_Default_Tool 1 -# Begin Custom Build - Compiling $(InputName).nas with NASM... -IntDir=.\..\..\objs\VC\Release\SDL -InputPath=..\tmap_mmx.nas -InputName=tmap_mmx - -"$(IntDir)/$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -g -o $(IntDir)/$(InputName).obj -f win32 $(InputPath) - -# End Custom Build - -!ELSEIF "$(CFG)" == "Srb2SDL - Win32 Debug" - -# PROP Ignore_Default_Tool 1 -# Begin Custom Build - Compiling $(InputName).nas with NASM... - -IntDir=.\..\..\objs\VC\Debug\SDL -InputPath=..\tmap_mmx.nas -InputName=tmap_mmx - -"$(IntDir)/$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -g -o $(IntDir)/$(InputName).obj -f win32 $(InputPath) - -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\tmap_vc.nas - -!IF "$(CFG)" == "Srb2SDL - Win32 Release" - -# Begin Custom Build - Compiling $(InputName).nas with NASM... -IntDir=.\..\..\objs\VC\Release\SDL -InputPath=..\tmap_vc.nas -InputName=tmap_vc - -"$(IntDir)/$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -g -o $(IntDir)/$(InputName).obj -f win32 $(InputPath) - -# End Custom Build - -!ELSEIF "$(CFG)" == "Srb2SDL - Win32 Debug" - -# Begin Custom Build - Compiling $(InputName).nas with NASM... -IntDir=.\..\..\objs\VC\Debug\SDL -InputPath=..\tmap_vc.nas -InputName=tmap_vc - -"$(IntDir)/$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -g -o $(IntDir)/$(InputName).obj -f win32 $(InputPath) - -# End Custom Build - -!ENDIF - -# End Source File -# End Group -# Begin Group "D_Doom" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\comptime.c -# End Source File -# Begin Source File - -SOURCE=..\d_clisrv.c -# End Source File -# Begin Source File - -SOURCE=..\d_clisrv.h -# End Source File -# Begin Source File - -SOURCE=..\d_event.h -# End Source File -# Begin Source File - -SOURCE=..\d_main.c -# End Source File -# Begin Source File - -SOURCE=..\d_main.h -# End Source File -# Begin Source File - -SOURCE=..\d_net.c -# End Source File -# Begin Source File - -SOURCE=..\d_net.h -# End Source File -# Begin Source File - -SOURCE=..\d_netcmd.c -# End Source File -# Begin Source File - -SOURCE=..\d_netcmd.h -# End Source File -# Begin Source File - -SOURCE=..\d_netfil.c -# End Source File -# Begin Source File - -SOURCE=..\d_netfil.h -# End Source File -# Begin Source File - -SOURCE=..\d_player.h -# End Source File -# Begin Source File - -SOURCE=..\d_think.h -# End Source File -# Begin Source File - -SOURCE=..\d_ticcmd.h -# End Source File -# Begin Source File - -SOURCE=..\dehacked.c -# End Source File -# Begin Source File - -SOURCE=..\dehacked.h -# End Source File -# Begin Source File - -SOURCE=..\doomdata.h -# End Source File -# Begin Source File - -SOURCE=..\doomdef.h -# End Source File -# Begin Source File - -SOURCE=..\doomstat.h -# End Source File -# Begin Source File - -SOURCE=..\doomtype.h -# End Source File -# Begin Source File - -SOURCE=..\z_zone.c -# End Source File -# Begin Source File - -SOURCE=..\z_zone.h -# End Source File -# End Group -# Begin Group "F_Frame" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\f_finale.c -# End Source File -# Begin Source File - -SOURCE=..\f_finale.h -# End Source File -# Begin Source File - -SOURCE=..\f_wipe.c -# End Source File -# End Group -# Begin Group "G_Game" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\g_game.c -# End Source File -# Begin Source File - -SOURCE=..\g_game.h -# End Source File -# Begin Source File - -SOURCE=..\g_input.c -# End Source File -# Begin Source File - -SOURCE=..\g_input.h -# End Source File -# Begin Source File - -SOURCE=..\g_state.h -# End Source File -# End Group -# Begin Group "H_Hud" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\am_map.c -# End Source File -# Begin Source File - -SOURCE=..\am_map.h -# End Source File -# Begin Source File - -SOURCE=..\command.c -# End Source File -# Begin Source File - -SOURCE=..\command.h -# End Source File -# Begin Source File - -SOURCE=..\console.c -# End Source File -# Begin Source File - -SOURCE=..\console.h -# End Source File -# Begin Source File - -SOURCE=..\hu_stuff.c -# End Source File -# Begin Source File - -SOURCE=..\hu_stuff.h -# End Source File -# Begin Source File - -SOURCE=..\st_stuff.c -# End Source File -# Begin Source File - -SOURCE=..\st_stuff.h -# End Source File -# Begin Source File - -SOURCE=..\y_inter.c -# End Source File -# Begin Source File - -SOURCE=..\y_inter.h -# End Source File -# End Group -# Begin Group "Hw_Hardware" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\hardware\hw3dsdrv.h -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw3sound.c -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw3sound.h -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_bsp.c -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_cache.c -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_data.h -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_defs.h -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_dll.h -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_draw.c -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_drv.h -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_glob.h -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_light.c -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_light.h -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_main.c -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_main.h -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_md2.c -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_md2.h -# End Source File -# Begin Source File - -SOURCE=..\hardware\hws_data.h -# End Source File -# End Group -# Begin Group "I_Interface" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\byteptr.h -# End Source File -# Begin Source File - -SOURCE=..\i_joy.h -# End Source File -# Begin Source File - -SOURCE=..\i_net.h -# End Source File -# Begin Source File - -SOURCE=..\i_sound.h -# End Source File -# Begin Source File - -SOURCE=..\i_system.h -# End Source File -# Begin Source File - -SOURCE=..\i_tcp.c -# End Source File -# Begin Source File - -SOURCE=..\i_tcp.h -# End Source File -# Begin Source File - -SOURCE=..\i_video.h -# End Source File -# Begin Source File - -SOURCE=..\keys.h -# End Source File -# Begin Source File - -SOURCE=..\mserv.c -# End Source File -# Begin Source File - -SOURCE=..\mserv.h -# End Source File -# End Group -# Begin Group "M_Misc" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\m_argv.c -# End Source File -# Begin Source File - -SOURCE=..\m_argv.h -# End Source File -# Begin Source File - -SOURCE=..\m_bbox.c -# End Source File -# Begin Source File - -SOURCE=..\m_bbox.h -# End Source File -# Begin Source File - -SOURCE=..\m_cheat.c -# End Source File -# Begin Source File - -SOURCE=..\m_cheat.h -# End Source File -# Begin Source File - -SOURCE=..\m_dllist.h -# End Source File -# Begin Source File - -SOURCE=..\m_fixed.c -# End Source File -# Begin Source File - -SOURCE=..\m_fixed.h -# End Source File -# Begin Source File - -SOURCE=..\m_menu.c -# End Source File -# Begin Source File - -SOURCE=..\m_menu.h -# End Source File -# Begin Source File - -SOURCE=..\m_misc.c -# End Source File -# Begin Source File - -SOURCE=..\m_misc.h -# End Source File -# Begin Source File - -SOURCE=..\m_queue.c -# End Source File -# Begin Source File - -SOURCE=..\m_queue.h -# End Source File -# Begin Source File - -SOURCE=..\m_random.c -# End Source File -# Begin Source File - -SOURCE=..\m_random.h -# End Source File -# Begin Source File - -SOURCE=..\m_swap.h -# End Source File -# Begin Source File - -SOURCE=..\string.c -# End Source File -# End Group -# Begin Group "P_Play" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\info.c -# End Source File -# Begin Source File - -SOURCE=..\info.h -# End Source File -# Begin Source File - -SOURCE=..\p_ceilng.c -# End Source File -# Begin Source File - -SOURCE=..\p_enemy.c -# End Source File -# Begin Source File - -SOURCE=..\p_fab.c -# End Source File -# Begin Source File - -SOURCE=..\p_floor.c -# End Source File -# Begin Source File - -SOURCE=..\p_inter.c -# End Source File -# Begin Source File - -SOURCE=..\p_lights.c -# End Source File -# Begin Source File - -SOURCE=..\p_local.h -# End Source File -# Begin Source File - -SOURCE=..\p_map.c -# End Source File -# Begin Source File - -SOURCE=..\p_maputl.c -# End Source File -# Begin Source File - -SOURCE=..\p_maputl.h -# End Source File -# Begin Source File - -SOURCE=..\p_mobj.c -# End Source File -# Begin Source File - -SOURCE=..\p_mobj.h -# End Source File -# Begin Source File - -SOURCE=..\p_polyobj.c -# End Source File -# Begin Source File - -SOURCE=..\p_polyobj.h -# End Source File -# Begin Source File - -SOURCE=..\p_pspr.h -# End Source File -# Begin Source File - -SOURCE=..\p_saveg.c -# End Source File -# Begin Source File - -SOURCE=..\p_saveg.h -# End Source File -# Begin Source File - -SOURCE=..\p_setup.c -# End Source File -# Begin Source File - -SOURCE=..\p_setup.h -# End Source File -# Begin Source File - -SOURCE=..\p_sight.c -# End Source File -# Begin Source File - -SOURCE=..\p_spec.c -# End Source File -# Begin Source File - -SOURCE=..\p_spec.h -# End Source File -# Begin Source File - -SOURCE=..\p_telept.c -# End Source File -# Begin Source File - -SOURCE=..\p_tick.c -# End Source File -# Begin Source File - -SOURCE=..\p_tick.h -# End Source File -# Begin Source File - -SOURCE=..\p_user.c -# End Source File -# Begin Source File - -SOURCE=..\tables.c -# End Source File -# Begin Source File - -SOURCE=..\tables.h -# End Source File -# End Group -# Begin Group "R_Rend" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\r_bsp.c -# End Source File -# Begin Source File - -SOURCE=..\r_bsp.h -# End Source File -# Begin Source File - -SOURCE=..\r_data.c -# End Source File -# Begin Source File - -SOURCE=..\r_data.h -# End Source File -# Begin Source File - -SOURCE=..\r_defs.h -# End Source File -# Begin Source File - -SOURCE=..\r_draw.c -# End Source File -# Begin Source File - -SOURCE=..\r_draw.h -# End Source File -# Begin Source File - -SOURCE=..\r_draw16.c -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=..\r_draw8.c -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=..\r_local.h -# End Source File -# Begin Source File - -SOURCE=..\r_main.c -# End Source File -# Begin Source File - -SOURCE=..\r_main.h -# End Source File -# Begin Source File - -SOURCE=..\r_plane.c -# End Source File -# Begin Source File - -SOURCE=..\r_plane.h -# End Source File -# Begin Source File - -SOURCE=..\r_segs.c -# End Source File -# Begin Source File - -SOURCE=..\r_segs.h -# End Source File -# Begin Source File - -SOURCE=..\r_sky.c -# End Source File -# Begin Source File - -SOURCE=..\r_sky.h -# End Source File -# Begin Source File - -SOURCE=..\r_splats.c -# End Source File -# Begin Source File - -SOURCE=..\r_splats.h -# End Source File -# Begin Source File - -SOURCE=..\r_state.h -# End Source File -# Begin Source File - -SOURCE=..\r_things.c -# End Source File -# Begin Source File - -SOURCE=..\r_things.h -# End Source File -# Begin Source File - -SOURCE=..\screen.c -# End Source File -# Begin Source File - -SOURCE=..\screen.h -# End Source File -# Begin Source File - -SOURCE=..\v_video.c -# End Source File -# Begin Source File - -SOURCE=..\v_video.h -# End Source File -# End Group -# Begin Group "S_Sounds" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\s_sound.c -# End Source File -# Begin Source File - -SOURCE=..\s_sound.h -# End Source File -# Begin Source File - -SOURCE=..\sounds.c -# End Source File -# Begin Source File - -SOURCE=..\sounds.h -# End Source File -# End Group -# Begin Group "W_Wad" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\lzf.c -# End Source File -# Begin Source File - -SOURCE=..\lzf.h -# End Source File -# Begin Source File - -SOURCE=..\md5.c -# End Source File -# Begin Source File - -SOURCE=..\md5.h -# End Source File -# Begin Source File - -SOURCE=..\w_wad.c -# End Source File -# Begin Source File - -SOURCE=..\w_wad.h -# End Source File -# End Group -# Begin Group "Docs" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\doc\copying -# End Source File -# Begin Source File - -SOURCE=..\..\doc\faq.txt -# End Source File -# Begin Source File - -SOURCE=..\..\readme.txt -# End Source File -# Begin Source File - -SOURCE=..\..\doc\source.txt -# End Source File -# End Group -# Begin Source File - -SOURCE=..\win32\Srb2win.ico -# End Source File -# End Target -# End Project diff --git a/src/sdl/Srb2SDL.dsw b/src/sdl/Srb2SDL.dsw deleted file mode 100644 index 4f8f7bdce..000000000 --- a/src/sdl/Srb2SDL.dsw +++ /dev/null @@ -1,74 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "Srb2SDL"=.\Srb2SDL.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libpng - End Project Dependency - Begin Project Dependency - Project_Dep_Name zlib - End Project Dependency -}}} - -############################################################################### - -Project: "libpng"="..\..\libs\libpng-src\projects\visualc6\libpng.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name zlib - End Project Dependency -}}} - -############################################################################### - -Project: "s_openal"=..\hardware\s_openal\s_openal.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "zlib"=..\..\libs\zlib\projects\visualc6\zlib.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c index 4ad3769ab..66eeffa30 100644 --- a/src/sdl/i_system.c +++ b/src/sdl/i_system.c @@ -5,7 +5,7 @@ // // Copyright (C) 1993-1996 by id Software, Inc. // Portions Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 2014-2021 by Sonic Team Junior. +// Copyright (C) 2014-2023 by Sonic Team Junior. // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -143,21 +143,32 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T); #define UNIXBACKTRACE #endif -// Locations for searching the srb2.pk3 +// Locations to directly check for srb2.pk3 in +const char *wadDefaultPaths[] = { #if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON) -#define DEFAULTWADLOCATION1 "/usr/local/share/games/SRB2" -#define DEFAULTWADLOCATION2 "/usr/local/games/SRB2" -#define DEFAULTWADLOCATION3 "/usr/share/games/SRB2" -#define DEFAULTWADLOCATION4 "/usr/games/SRB2" -#define DEFAULTSEARCHPATH1 "/usr/local/games" -#define DEFAULTSEARCHPATH2 "/usr/games" -#define DEFAULTSEARCHPATH3 "/usr/local" + "/usr/local/share/games/SRB2", + "/usr/local/games/SRB2", + "/usr/share/games/SRB2", + "/usr/games/SRB2", #elif defined (_WIN32) -#define DEFAULTWADLOCATION1 "c:\\games\\srb2" -#define DEFAULTWADLOCATION2 "\\games\\srb2" -#define DEFAULTSEARCHPATH1 "c:\\games" -#define DEFAULTSEARCHPATH2 "\\games" + "c:\\games\\srb2", + "\\games\\srb2", #endif + NULL +}; + +// Folders to recurse through looking for srb2.pk3 +const char *wadSearchPaths[] = { +#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON) + "/usr/local/games", + "/usr/games", + "/usr/local", +#elif defined (_WIN32) + "c:\\games", + "\\games", +#endif + NULL +}; /** \brief WAD file to look for */ @@ -170,6 +181,7 @@ static char returnWadPath[256]; #include "../doomdef.h" #include "../m_misc.h" +#include "../i_time.h" #include "../i_video.h" #include "../i_sound.h" #include "../i_system.h" @@ -185,7 +197,8 @@ static char returnWadPath[256]; #include "../m_argv.h" -#include "../m_menu.h" +#include "../r_main.h" // Frame interpolation/uncapped +#include "../r_fps.h" #ifdef MAC_ALERT #include "macosx/mac_alert.h" @@ -358,9 +371,10 @@ static void I_ReportSignal(int num, int coredumped) I_OutputMsg("\nProcess killed by signal: %s\n\n", sigmsg); - SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, - "Process killed by signal", - sigmsg, NULL); + if (!M_CheckParm("-dedicated")) + SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, + "Process killed by signal", + sigmsg, NULL); } #ifndef NEWSIGNALHANDLER @@ -550,7 +564,7 @@ static void I_StartupConsole(void) void I_GetConsoleEvents(void) { // we use this when sending back commands - event_t ev = {0,0,0,0}; + event_t ev = {0}; char key = 0; ssize_t d; @@ -572,7 +586,7 @@ void I_GetConsoleEvents(void) tty_con.buffer[tty_con.cursor] = '\0'; tty_Back(); } - ev.data1 = KEY_BACKSPACE; + ev.key = KEY_BACKSPACE; } else if (key < ' ') // check if this is a control char { @@ -580,19 +594,19 @@ void I_GetConsoleEvents(void) { tty_Clear(); tty_con.cursor = 0; - ev.data1 = KEY_ENTER; + ev.key = KEY_ENTER; } else return; } else { // push regular character - ev.data1 = tty_con.buffer[tty_con.cursor] = key; + ev.key = tty_con.buffer[tty_con.cursor] = key; tty_con.cursor++; // print the current line (this is differential) d = write(STDOUT_FILENO, &key, 1); } - if (ev.data1) D_PostEvent(&ev); + if (ev.key) D_PostEvent(&ev); //tty_FlushIn(); (void)d; } @@ -626,18 +640,18 @@ static void Impl_HandleKeyboardConsoleEvent(KEY_EVENT_RECORD evt, HANDLE co) { case VK_ESCAPE: case VK_TAB: - event.data1 = KEY_NULL; + event.key = KEY_NULL; break; case VK_RETURN: entering_con_command = false; /* FALLTHRU */ default: - //event.data1 = MapVirtualKey(evt.wVirtualKeyCode,2); // convert in to char - event.data1 = evt.uChar.AsciiChar; + //event.key = MapVirtualKey(evt.wVirtualKeyCode,2); // convert in to char + event.key = evt.uChar.AsciiChar; } if (co != INVALID_HANDLE_VALUE && GetFileType(co) == FILE_TYPE_CHAR && GetConsoleMode(co, &t)) { - if (event.data1 && event.data1 != KEY_LSHIFT && event.data1 != KEY_RSHIFT) + if (event.key && event.key != KEY_LSHIFT && event.key != KEY_RSHIFT) { #ifdef _UNICODE WriteConsole(co, &evt.uChar.UnicodeChar, 1, &t, NULL); @@ -652,7 +666,7 @@ static void Impl_HandleKeyboardConsoleEvent(KEY_EVENT_RECORD evt, HANDLE co) } } } - if (event.data1) D_PostEvent(&event); + if (event.key) D_PostEvent(&event); } void I_GetConsoleEvents(void) @@ -917,7 +931,7 @@ INT32 I_GetKey (void) ev = &events[eventtail]; if (ev->type == ev_keydown || ev->type == ev_console) { - rc = ev->data1; + rc = ev->key; continue; } } @@ -977,22 +991,22 @@ void I_ShutdownJoystick(void) INT32 i; event_t event; event.type=ev_keyup; - event.data2 = 0; - event.data3 = 0; + event.x = 0; + event.y = 0; lastjoybuttons = lastjoyhats = 0; // emulate the up of all joystick buttons for (i=0;i= 0; i--) { - event.data1 = i; + event.key = i; if (i*2 + 1 <= JoyInfo.axises) axisx = SDL_JoystickGetAxis(JoyInfo.dev, i*2 + 0); else axisx = 0; @@ -1110,15 +1124,15 @@ void I_GetJoystickEvents(void) { // gamepad control type, on or off, live or die if (axisx < -(JOYAXISRANGE/2)) - event.data2 = -1; + event.x = -1; else if (axisx > (JOYAXISRANGE/2)) - event.data2 = 1; - else event.data2 = 0; + event.x = 1; + else event.x = 0; if (axisy < -(JOYAXISRANGE/2)) - event.data3 = -1; + event.y = -1; else if (axisy > (JOYAXISRANGE/2)) - event.data3 = 1; - else event.data3 = 0; + event.y = 1; + else event.y = 0; } else { @@ -1132,8 +1146,8 @@ void I_GetJoystickEvents(void) #endif // analog control style , just send the raw data - event.data2 = axisx; // x axis - event.data3 = axisy; // y axis + event.x = axisx; // x axis + event.y = axisy; // y axis } D_PostEvent(&event); } @@ -1247,22 +1261,22 @@ void I_ShutdownJoystick2(void) INT32 i; event_t event; event.type = ev_keyup; - event.data2 = 0; - event.data3 = 0; + event.x = 0; + event.y = 0; lastjoy2buttons = lastjoy2hats = 0; // emulate the up of all joystick buttons for (i = 0; i < JOYBUTTONS; i++) { - event.data1 = KEY_2JOY1 + i; + event.key = KEY_2JOY1 + i; D_PostEvent(&event); } // emulate the up of all joystick hats for (i = 0; i < JOYHATS*4; i++) { - event.data1 = KEY_2HAT1 + i; + event.key = KEY_2HAT1 + i; D_PostEvent(&event); } @@ -1270,7 +1284,7 @@ void I_ShutdownJoystick2(void) event.type = ev_joystick2; for (i = 0; i < JOYAXISSET; i++) { - event.data1 = i; + event.key = i; D_PostEvent(&event); } @@ -1282,7 +1296,7 @@ void I_ShutdownJoystick2(void) void I_GetJoystick2Events(void) { - static event_t event = {0,0,0,0}; + static event_t event = {0,0,0,0,false}; INT32 i = 0; UINT64 joyhats = 0; #if 0 @@ -1321,7 +1335,7 @@ void I_GetJoystick2Events(void) event.type = ev_keydown; else event.type = ev_keyup; - event.data1 = KEY_2JOY1 + i; + event.key = KEY_2JOY1 + i; D_PostEvent(&event); } } @@ -1352,7 +1366,7 @@ void I_GetJoystick2Events(void) event.type = ev_keydown; else event.type = ev_keyup; - event.data1 = KEY_2HAT1 + i; + event.key = KEY_2HAT1 + i; D_PostEvent(&event); } } @@ -1364,7 +1378,7 @@ void I_GetJoystick2Events(void) for (i = JOYAXISSET - 1; i >= 0; i--) { - event.data1 = i; + event.key = i; if (i*2 + 1 <= JoyInfo2.axises) axisx = SDL_JoystickGetAxis(JoyInfo2.dev, i*2 + 0); else axisx = 0; @@ -1380,17 +1394,17 @@ void I_GetJoystick2Events(void) { // gamepad control type, on or off, live or die if (axisx < -(JOYAXISRANGE/2)) - event.data2 = -1; + event.x = -1; else if (axisx > (JOYAXISRANGE/2)) - event.data2 = 1; + event.x = 1; else - event.data2 = 0; + event.x = 0; if (axisy < -(JOYAXISRANGE/2)) - event.data3 = -1; + event.y = -1; else if (axisy > (JOYAXISRANGE/2)) - event.data3 = 1; + event.y = 1; else - event.data3 = 0; + event.y = 0; } else { @@ -1404,8 +1418,8 @@ void I_GetJoystick2Events(void) #endif // analog control style , just send the raw data - event.data2 = axisx; // x axis - event.data3 = axisy; // y axis + event.x = axisx; // x axis + event.y = axisy; // y axis } D_PostEvent(&event); } @@ -1804,7 +1818,7 @@ void I_GetMouseEvents(void) if (!(button & (1< 20) { @@ -2399,9 +2446,10 @@ void I_Error(const char *error, ...) // Implement message box with SDL_ShowSimpleMessageBox, // which should fail gracefully if it can't put a message box up // on the target system - SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, - "SRB2 "VERSIONSTRING" Recursive Error", - buffer, NULL); + if (!M_CheckParm("-dedicated")) + SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, + "SRB2 "VERSIONSTRING" Recursive Error", + buffer, NULL); W_Shutdown(); exit(-1); // recursive errors detected @@ -2421,7 +2469,7 @@ void I_Error(const char *error, ...) #ifndef NONET D_SaveBan(); // save the ban list #endif - G_SaveGameData(); // Tails 12-08-2002 + G_SaveGameData(clientGamedata); // Tails 12-08-2002 // Shutdown. Here might be other errors. if (demorecording) @@ -2443,9 +2491,10 @@ void I_Error(const char *error, ...) // Implement message box with SDL_ShowSimpleMessageBox, // which should fail gracefully if it can't put a message box up // on the target system - SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, - "SRB2 "VERSIONSTRING" Error", - buffer, NULL); + if (!M_CheckParm("-dedicated")) + SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, + "SRB2 "VERSIONSTRING" Error", + buffer, NULL); // Note that SDL_ShowSimpleMessageBox does *not* require SDL to be // initialized at the time, so calling it after SDL_Quit() is // perfectly okay! In addition, we do this on purpose so the @@ -2798,6 +2847,20 @@ static const char *searchWad(const char *searchDir) return NULL; } +#define CHECKWADPATH(ret) \ +do { \ + I_OutputMsg(",%s", returnWadPath); \ + if (isWadPathOk(returnWadPath)) \ + return ret; \ +} while (0) + +#define SEARCHWAD(str) \ +do { \ + WadPath = searchWad(str); \ + if (WadPath) \ + return WadPath; \ +} while (0) + /** \brief go through all possible paths and look for srb2.pk3 \return path to srb2.pk3 if any @@ -2806,6 +2869,7 @@ static const char *locateWad(void) { const char *envstr; const char *WadPath; + int i; I_OutputMsg("SRB2WADDIR"); // does SRB2WADDIR exist? @@ -2813,108 +2877,37 @@ static const char *locateWad(void) return envstr; #ifndef NOCWD - I_OutputMsg(",."); // examine current dir strcpy(returnWadPath, "."); - if (isWadPathOk(returnWadPath)) - return NULL; -#endif - - -#ifdef CMAKECONFIG -#ifndef NDEBUG - I_OutputMsg(","CMAKE_ASSETS_DIR); - strcpy(returnWadPath, CMAKE_ASSETS_DIR); - if (isWadPathOk(returnWadPath)) - { - return returnWadPath; - } -#endif + CHECKWADPATH(NULL); #endif #ifdef __APPLE__ OSX_GetResourcesPath(returnWadPath); - I_OutputMsg(",%s", returnWadPath); - if (isWadPathOk(returnWadPath)) - { - return returnWadPath; - } + CHECKWADPATH(returnWadPath); #endif // examine default dirs -#ifdef DEFAULTWADLOCATION1 - I_OutputMsg(","DEFAULTWADLOCATION1); - strcpy(returnWadPath, DEFAULTWADLOCATION1); - if (isWadPathOk(returnWadPath)) - return returnWadPath; -#endif -#ifdef DEFAULTWADLOCATION2 - I_OutputMsg(","DEFAULTWADLOCATION2); - strcpy(returnWadPath, DEFAULTWADLOCATION2); - if (isWadPathOk(returnWadPath)) - return returnWadPath; -#endif -#ifdef DEFAULTWADLOCATION3 - I_OutputMsg(","DEFAULTWADLOCATION3); - strcpy(returnWadPath, DEFAULTWADLOCATION3); - if (isWadPathOk(returnWadPath)) - return returnWadPath; -#endif -#ifdef DEFAULTWADLOCATION4 - I_OutputMsg(","DEFAULTWADLOCATION4); - strcpy(returnWadPath, DEFAULTWADLOCATION4); - if (isWadPathOk(returnWadPath)) - return returnWadPath; -#endif -#ifdef DEFAULTWADLOCATION5 - I_OutputMsg(","DEFAULTWADLOCATION5); - strcpy(returnWadPath, DEFAULTWADLOCATION5); - if (isWadPathOk(returnWadPath)) - return returnWadPath; -#endif -#ifdef DEFAULTWADLOCATION6 - I_OutputMsg(","DEFAULTWADLOCATION6); - strcpy(returnWadPath, DEFAULTWADLOCATION6); - if (isWadPathOk(returnWadPath)) - return returnWadPath; -#endif -#ifdef DEFAULTWADLOCATION7 - I_OutputMsg(","DEFAULTWADLOCATION7); - strcpy(returnWadPath, DEFAULTWADLOCATION7); - if (isWadPathOk(returnWadPath)) - return returnWadPath; -#endif + for (i = 0; wadDefaultPaths[i]; i++) + { + strcpy(returnWadPath, wadDefaultPaths[i]); + CHECKWADPATH(returnWadPath); + } + #ifndef NOHOME // find in $HOME I_OutputMsg(",HOME"); if ((envstr = I_GetEnv("HOME")) != NULL) + SEARCHWAD(envstr); +#endif + + // search paths + for (i = 0; wadSearchPaths[i]; i++) { - WadPath = searchWad(envstr); - if (WadPath) - return WadPath; + I_OutputMsg(", in:%s", wadSearchPaths[i]); + SEARCHWAD(wadSearchPaths[i]); } -#endif -#ifdef DEFAULTSEARCHPATH1 - // find in /usr/local - I_OutputMsg(", in:"DEFAULTSEARCHPATH1); - WadPath = searchWad(DEFAULTSEARCHPATH1); - if (WadPath) - return WadPath; -#endif -#ifdef DEFAULTSEARCHPATH2 - // find in /usr/games - I_OutputMsg(", in:"DEFAULTSEARCHPATH2); - WadPath = searchWad(DEFAULTSEARCHPATH2); - if (WadPath) - return WadPath; -#endif -#ifdef DEFAULTSEARCHPATH3 - // find in ??? - I_OutputMsg(", in:"DEFAULTSEARCHPATH3); - WadPath = searchWad(DEFAULTSEARCHPATH3); - if (WadPath) - return WadPath; -#endif + // if nothing was found return NULL; } @@ -2969,8 +2962,7 @@ static long get_entry(const char* name, const char* buf) } #endif -// quick fix for compil -UINT32 I_GetFreeMem(UINT32 *total) +size_t I_GetFreeMem(size_t *total) { #ifdef FREEBSD struct vmmeter sum; @@ -3018,14 +3010,14 @@ UINT32 I_GetFreeMem(UINT32 *total) info.dwLength = sizeof (MEMORYSTATUS); GlobalMemoryStatus( &info ); if (total) - *total = (UINT32)info.dwTotalPhys; - return (UINT32)info.dwAvailPhys; + *total = (size_t)info.dwTotalPhys; + return (size_t)info.dwAvailPhys; #elif defined (__linux__) /* Linux */ char buf[1024]; char *memTag; - UINT32 freeKBytes; - UINT32 totalKBytes; + size_t freeKBytes; + size_t totalKBytes; INT32 n; INT32 meminfo_fd = -1; long Cached; @@ -3056,7 +3048,7 @@ UINT32 I_GetFreeMem(UINT32 *total) } memTag += sizeof (MEMTOTAL); - totalKBytes = atoi(memTag); + totalKBytes = (size_t)atoi(memTag); if ((memTag = strstr(buf, MEMAVAILABLE)) == NULL) { diff --git a/src/sdl/i_threads.c b/src/sdl/i_threads.c index f73d00bcf..c05936072 100644 --- a/src/sdl/i_threads.c +++ b/src/sdl/i_threads.c @@ -1,6 +1,6 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- -// Copyright (C) 2020-2021 by James R. +// Copyright (C) 2020-2023 by James R. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c index 5f18720f8..d2fbb9006 100644 --- a/src/sdl/i_video.c +++ b/src/sdl/i_video.c @@ -1,10 +1,11 @@ + // Emacs style mode select -*- C++ -*- // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // // Copyright (C) 1993-1996 by id Software, Inc. // Portions Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 2014-2021 by Sonic Team Junior. +// Copyright (C) 2014-2023 by Sonic Team Junior. // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -73,6 +74,8 @@ #include "../console.h" #include "../command.h" #include "../r_main.h" +#include "../lua_script.h" +#include "../lua_libs.h" #include "../lua_hook.h" #include "sdlmain.h" #ifdef HWRENDER @@ -99,8 +102,10 @@ rendermode_t chosenrendermode = render_none; // set by command line arguments boolean highcolor = false; +static void VidWaitChanged(void); + // synchronize page flipping with screen refresh -consvar_t cv_vidwait = CVAR_INIT ("vid_wait", "On", CV_SAVE, CV_OnOff, NULL); +consvar_t cv_vidwait = CVAR_INIT ("vid_wait", "On", CV_SAVE | CV_CALL, CV_OnOff, VidWaitChanged); static consvar_t cv_stretch = CVAR_INIT ("stretch", "Off", CV_SAVE|CV_NOSHOWHELP, CV_OnOff, NULL); static consvar_t cv_alwaysgrabmouse = CVAR_INIT ("alwaysgrabmouse", "Off", CV_SAVE, CV_OnOff, NULL); @@ -271,6 +276,22 @@ static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen, SDL_bool } } +static void VidWaitChanged(void) +{ + if (renderer && rendermode == render_soft) + { +#if SDL_VERSION_ATLEAST(2, 0, 18) + SDL_RenderSetVSync(renderer, cv_vidwait.value ? 1 : 0); +#endif + } +#ifdef HWRENDER + else if (rendermode == render_opengl && sdlglcontext != NULL && SDL_GL_GetCurrentContext() == sdlglcontext) + { + SDL_GL_SetSwapInterval(cv_vidwait.value ? 1 : 0); + } +#endif +} + static INT32 Impl_SDL_Scancode_To_Keycode(SDL_Scancode code) { if (code >= SDL_SCANCODE_A && code <= SDL_SCANCODE_Z) @@ -372,6 +393,8 @@ static boolean IgnoreMouse(void) if (gamestate != GS_LEVEL && gamestate != GS_INTERMISSION && gamestate != GS_CONTINUING && gamestate != GS_CUTSCENE) return true; + if (!mousegrabbedbylua) + return true; return false; } @@ -405,6 +428,14 @@ void I_UpdateMouseGrab(void) SDLdoGrabMouse(); } +void I_SetMouseGrab(boolean grab) +{ + if (grab) + SDLdoGrabMouse(); + else + SDLdoUngrabMouse(); +} + static void VID_Command_NumModes_f (void) { CONS_Printf(M_GetText("%d video mode(s) available(s)\n"), VID_NumModes()); @@ -650,8 +681,9 @@ static void Impl_HandleKeyboardEvent(SDL_KeyboardEvent evt, Uint32 type) { return; } - event.data1 = Impl_SDL_Scancode_To_Keycode(evt.keysym.scancode); - if (event.data1) D_PostEvent(&event); + event.key = Impl_SDL_Scancode_To_Keycode(evt.keysym.scancode); + event.repeated = (evt.repeat != 0); + if (event.key) D_PostEvent(&event); } static void Impl_HandleMouseMotionEvent(SDL_MouseMotionEvent evt) @@ -673,8 +705,8 @@ static void Impl_HandleMouseMotionEvent(SDL_MouseMotionEvent evt) { if (SDL_GetMouseFocus() == window && SDL_GetKeyboardFocus() == window) { - mousemovex += evt.xrel; - mousemovey += -evt.yrel; + mousemovex += evt.xrel; + mousemovey += evt.yrel; SDL_SetWindowGrab(window, SDL_TRUE); } firstmove = false; @@ -729,15 +761,15 @@ static void Impl_HandleMouseButtonEvent(SDL_MouseButtonEvent evt, Uint32 type) } else return; if (evt.button == SDL_BUTTON_MIDDLE) - event.data1 = KEY_MOUSE1+2; + event.key = KEY_MOUSE1+2; else if (evt.button == SDL_BUTTON_RIGHT) - event.data1 = KEY_MOUSE1+1; + event.key = KEY_MOUSE1+1; else if (evt.button == SDL_BUTTON_LEFT) - event.data1 = KEY_MOUSE1; + event.key = KEY_MOUSE1; else if (evt.button == SDL_BUTTON_X1) - event.data1 = KEY_MOUSE1+3; + event.key = KEY_MOUSE1+3; else if (evt.button == SDL_BUTTON_X2) - event.data1 = KEY_MOUSE1+4; + event.key = KEY_MOUSE1+4; if (event.type == ev_keyup || event.type == ev_keydown) { D_PostEvent(&event); @@ -753,17 +785,17 @@ static void Impl_HandleMouseWheelEvent(SDL_MouseWheelEvent evt) if (evt.y > 0) { - event.data1 = KEY_MOUSEWHEELUP; + event.key = KEY_MOUSEWHEELUP; event.type = ev_keydown; } if (evt.y < 0) { - event.data1 = KEY_MOUSEWHEELDOWN; + event.key = KEY_MOUSEWHEELDOWN; event.type = ev_keydown; } if (evt.y == 0) { - event.data1 = 0; + event.key = 0; event.type = ev_keyup; } if (event.type == ev_keyup || event.type == ev_keydown) @@ -782,7 +814,7 @@ static void Impl_HandleJoystickAxisEvent(SDL_JoyAxisEvent evt) joyid[1] = SDL_JoystickInstanceID(JoyInfo2.dev); evt.axis++; - event.data1 = event.data2 = event.data3 = INT32_MAX; + event.key = event.x = event.y = INT32_MAX; if (evt.which == joyid[0]) { @@ -799,14 +831,14 @@ static void Impl_HandleJoystickAxisEvent(SDL_JoyAxisEvent evt) //vaule if (evt.axis%2) { - event.data1 = evt.axis / 2; - event.data2 = SDLJoyAxis(evt.value, event.type); + event.key = evt.axis / 2; + event.x = SDLJoyAxis(evt.value, event.type); } else { evt.axis--; - event.data1 = evt.axis / 2; - event.data3 = SDLJoyAxis(evt.value, event.type); + event.key = evt.axis / 2; + event.y = SDLJoyAxis(evt.value, event.type); } D_PostEvent(&event); } @@ -826,11 +858,11 @@ static void Impl_HandleJoystickHatEvent(SDL_JoyHatEvent evt) if (evt.which == joyid[0]) { - event.data1 = KEY_HAT1 + (evt.hat*4); + event.key = KEY_HAT1 + (evt.hat*4); } else if (evt.which == joyid[1]) { - event.data1 = KEY_2HAT1 + (evt.hat*4); + event.key = KEY_2HAT1 + (evt.hat*4); } else return; @@ -849,11 +881,11 @@ static void Impl_HandleJoystickButtonEvent(SDL_JoyButtonEvent evt, Uint32 type) if (evt.which == joyid[0]) { - event.data1 = KEY_JOY1; + event.key = KEY_JOY1; } else if (evt.which == joyid[1]) { - event.data1 = KEY_2JOY1; + event.key = KEY_2JOY1; } else return; if (type == SDL_JOYBUTTONUP) @@ -867,7 +899,7 @@ static void Impl_HandleJoystickButtonEvent(SDL_JoyButtonEvent evt, Uint32 type) else return; if (evt.button < JOYBUTTONS) { - event.data1 += evt.button; + event.key += evt.button; } else return; @@ -1055,9 +1087,9 @@ void I_GetEvent(void) // update the menu if (currentMenu == &OP_JoystickSetDef) M_SetupJoystickMenu(0); - break; + break; case SDL_QUIT: - LUAh_GameQuit(true); + LUA_HookBool(true, HOOK(GameQuit)); I_Quit(); break; } @@ -1071,9 +1103,9 @@ void I_GetEvent(void) SDL_GetWindowSize(window, &wwidth, &wheight); //SDL_memset(&event, 0, sizeof(event_t)); event.type = ev_mouse; - event.data1 = 0; - event.data2 = (INT32)lround(mousemovex * ((float)wwidth / (float)realwidth)); - event.data3 = (INT32)lround(mousemovey * ((float)wheight / (float)realheight)); + event.key = 0; + event.x = (INT32)lround(mousemovex * ((float)wwidth / (float)realwidth)); + event.y = (INT32)lround(mousemovey * ((float)wheight / (float)realheight)); D_PostEvent(&event); } @@ -1165,12 +1197,15 @@ void I_UpdateNoBlit(void) // from PrBoom's src/SDL/i_video.c static inline boolean I_SkipFrame(void) { -#if 0 +#if 1 + // While I fixed the FPS counter bugging out with this, + // I actually really like being able to pause and + // use perfstats to measure rendering performance + // without game logic changes. + return false; +#else static boolean skip = false; - if (rendermode != render_soft) - return false; - skip = !skip; switch (gamestate) @@ -1186,17 +1221,20 @@ static inline boolean I_SkipFrame(void) return false; } #endif - return false; } // // I_FinishUpdate // +static SDL_Rect src_rect = { 0, 0, 0, 0 }; + void I_FinishUpdate(void) { if (rendermode == render_none) return; //Alam: No software or OpenGl surface + SCR_CalculateFPS(); + if (I_SkipFrame()) return; @@ -1215,27 +1253,22 @@ void I_FinishUpdate(void) if (rendermode == render_soft && screens[0]) { - SDL_Rect rect; - - rect.x = 0; - rect.y = 0; - rect.w = vid.width; - rect.h = vid.height; - if (!bufSurface) //Double-Check { Impl_VideoSetupSDLBuffer(); } + if (bufSurface) { - SDL_BlitSurface(bufSurface, NULL, vidSurface, &rect); + SDL_BlitSurface(bufSurface, &src_rect, vidSurface, &src_rect); // Fury -- there's no way around UpdateTexture, the GL backend uses it anyway SDL_LockSurface(vidSurface); - SDL_UpdateTexture(texture, &rect, vidSurface->pixels, vidSurface->pitch); + SDL_UpdateTexture(texture, &src_rect, vidSurface->pixels, vidSurface->pitch); SDL_UnlockSurface(vidSurface); } + SDL_RenderClear(renderer); - SDL_RenderCopy(renderer, texture, NULL, NULL); + SDL_RenderCopy(renderer, texture, &src_rect, NULL); SDL_RenderPresent(renderer); } #ifdef HWRENDER @@ -1244,6 +1277,7 @@ void I_FinishUpdate(void) OglSdlFinishUpdate(cv_vidwait.value); } #endif + exposevideo = SDL_FALSE; } @@ -1461,7 +1495,18 @@ static SDL_bool Impl_CreateContext(void) if (usesdl2soft) flags |= SDL_RENDERER_SOFTWARE; else if (cv_vidwait.value) + { +#if SDL_VERSION_ATLEAST(2, 0, 18) + // If SDL is new enough, we can turn off vsync later. flags |= SDL_RENDERER_PRESENTVSYNC; +#else + // However, if it isn't, we should just silently turn vid_wait off + // This is because the renderer will be created before the config + // is read and vid_wait is set from the user's preferences, and thus + // vid_wait will have no effect. + CV_StealthSetValue(&cv_vidwait, 0); +#endif + } if (!renderer) renderer = SDL_CreateRenderer(window, -1, flags); @@ -1548,6 +1593,7 @@ boolean VID_CheckRenderer(void) else if (vid.glstate == VID_GL_LIBRARY_ERROR) rendererchanged = false; } + else #endif if (!contextcreated) @@ -1580,6 +1626,27 @@ boolean VID_CheckRenderer(void) return rendererchanged; } +static UINT32 refresh_rate; +static UINT32 VID_GetRefreshRate(void) +{ + int index = SDL_GetWindowDisplayIndex(window); + SDL_DisplayMode m; + + if (SDL_WasInit(SDL_INIT_VIDEO) == 0) + { + // Video not init yet. + return 0; + } + + if (SDL_GetCurrentDisplayMode(index, &m) != 0) + { + // Error has occurred. + return 0; + } + + return m.refresh_rate; +} + INT32 VID_SetMode(INT32 modeNum) { SDLdoUngrabMouse(); @@ -1597,6 +1664,11 @@ INT32 VID_SetMode(INT32 modeNum) vid.modenum = modeNum; //Impl_SetWindowName("SRB2 "VERSIONSTRING); + src_rect.w = vid.width; + src_rect.h = vid.height; + + refresh_rate = VID_GetRefreshRate(); + VID_CheckRenderer(); return SDL_TRUE; } @@ -1620,6 +1692,11 @@ static SDL_bool Impl_CreateWindow(SDL_bool fullscreen) #ifdef HWRENDER if (vid.glstate == VID_GL_LIBRARY_LOADED) flags |= SDL_WINDOW_OPENGL; + + // Without a 24-bit depth buffer many visuals are ruined by z-fighting. + // Some GPU drivers may give us a 16-bit depth buffer since the + // default value for SDL_GL_DEPTH_SIZE is 16. + SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24); #endif // Create a window @@ -1707,10 +1784,10 @@ void I_StartupGraphics(void) if (graphics_started) return; - COM_AddCommand ("vid_nummodes", VID_Command_NumModes_f); - COM_AddCommand ("vid_info", VID_Command_Info_f); - COM_AddCommand ("vid_modelist", VID_Command_ModeList_f); - COM_AddCommand ("vid_mode", VID_Command_Mode_f); + COM_AddCommand ("vid_nummodes", VID_Command_NumModes_f, COM_LUA); + COM_AddCommand ("vid_info", VID_Command_Info_f, COM_LUA); + COM_AddCommand ("vid_modelist", VID_Command_ModeList_f, COM_LUA); + COM_AddCommand ("vid_mode", VID_Command_Mode_f, 0); CV_RegisterVar (&cv_vidwait); CV_RegisterVar (&cv_stretch); CV_RegisterVar (&cv_alwaysgrabmouse); @@ -1938,3 +2015,18 @@ void I_ShutdownGraphics(void) framebuffer = SDL_FALSE; } #endif + +void I_GetCursorPosition(INT32 *x, INT32 *y) +{ + SDL_GetMouseState(x, y); +} + +UINT32 I_GetRefreshRate(void) +{ + // Moved to VID_GetRefreshRate. + // Precalculating it like that won't work as + // well for windowed mode since you can drag + // the window around, but very slow PCs might have + // trouble querying mode over and over again. + return refresh_rate; +} diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c index 2f1a87266..f13aaef5d 100644 --- a/src/sdl/mixer_sound.c +++ b/src/sdl/mixer_sound.c @@ -1,6 +1,6 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- -// Copyright (C) 2014-2021 by Sonic Team Junior. +// Copyright (C) 2014-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -9,7 +9,7 @@ /// \file /// \brief SDL Mixer interface for sound -#ifdef HAVE_LIBGME +#ifdef HAVE_GME #ifdef HAVE_ZLIB #ifndef _MSC_VER #ifndef _LARGEFILE64_SOURCE @@ -27,7 +27,7 @@ #include #endif // HAVE_ZLIB -#endif // HAVE_LIBGME +#endif // HAVE_GME #include "../doomdef.h" #include "../doomstat.h" // menuactive @@ -73,11 +73,11 @@ #define MUS_MODPLUG MUS_MODPLUG_UNUSED #endif -#ifdef HAVE_LIBGME -#include "gme/gme.h" +#ifdef HAVE_GME +#include #define GME_TREBLE 5.0f #define GME_BASS 1.0f -#endif // HAVE_LIBGME +#endif // HAVE_GME static UINT16 BUFFERSIZE = 2048; static UINT16 SAMPLERATE = 44100; @@ -110,7 +110,7 @@ static INT32 fading_id; static void (*fading_callback)(void); static boolean fading_nocleanup; -#ifdef HAVE_LIBGME +#ifdef HAVE_GME static Music_Emu *gme; static UINT16 current_track; #endif @@ -220,7 +220,7 @@ static void var_cleanup(void) internal_volume = 100; } -#if defined (HAVE_LIBGME) && defined (HAVE_ZLIB) +#if defined (HAVE_GME) && defined (HAVE_ZLIB) static const char* get_zlib_error(int zErr) { switch (zErr) @@ -318,7 +318,7 @@ void I_ShutdownSound(void) SDL_QuitSubSystem(SDL_INIT_AUDIO); -#ifdef HAVE_LIBGME +#ifdef HAVE_GME if (gme) gme_delete(gme); #endif @@ -453,7 +453,7 @@ void *I_GetSfx(sfxinfo_t *sfx) void *lump; Mix_Chunk *chunk; SDL_RWops *rw; -#ifdef HAVE_LIBGME +#ifdef HAVE_GME Music_Emu *emu; gme_info_t *info; #endif @@ -473,7 +473,7 @@ void *I_GetSfx(sfxinfo_t *sfx) } // Not a doom sound? Try something else. -#ifdef HAVE_LIBGME +#ifdef HAVE_GME // VGZ format if (((UINT8 *)lump)[0] == 0x1F && ((UINT8 *)lump)[1] == 0x8B) @@ -729,7 +729,7 @@ static UINT32 music_fade(UINT32 interval, void *param) } } -#ifdef HAVE_LIBGME +#ifdef HAVE_GME static void mix_gme(void *udata, Uint8 *stream, int len) { int i; @@ -797,7 +797,7 @@ void I_ShutdownMusic(void) musictype_t I_SongType(void) { -#ifdef HAVE_LIBGME +#ifdef HAVE_GME if (gme) return MU_GME; else @@ -828,7 +828,7 @@ musictype_t I_SongType(void) boolean I_SongPlaying(void) { return ( -#ifdef HAVE_LIBGME +#ifdef HAVE_GME (I_SongType() == MU_GME && gme) || #endif #ifdef HAVE_OPENMPT @@ -851,7 +851,7 @@ boolean I_SetSongSpeed(float speed) { if (speed > 250.0f) speed = 250.0f; //limit speed up to 250x -#ifdef HAVE_LIBGME +#ifdef HAVE_GME if (gme) { SDL_LockAudio(); @@ -893,7 +893,7 @@ UINT32 I_GetSongLength(void) { INT32 length; -#ifdef HAVE_LIBGME +#ifdef HAVE_GME if (gme) { gme_info_t *info; @@ -963,7 +963,7 @@ boolean I_SetSongLoopPoint(UINT32 looppoint) UINT32 I_GetSongLoopPoint(void) { -#ifdef HAVE_LIBGME +#ifdef HAVE_GME if (gme) { INT32 looppoint; @@ -992,7 +992,7 @@ UINT32 I_GetSongLoopPoint(void) boolean I_SetSongPosition(UINT32 position) { UINT32 length; -#ifdef HAVE_LIBGME +#ifdef HAVE_GME if (gme) { // this is unstable, so fail silently @@ -1055,7 +1055,7 @@ boolean I_SetSongPosition(UINT32 position) UINT32 I_GetSongPosition(void) { -#ifdef HAVE_LIBGME +#ifdef HAVE_GME if (gme) { INT32 position = gme_tell(gme); @@ -1124,7 +1124,7 @@ boolean I_LoadSong(char *data, size_t len) SDL_RWops *rw; if (music -#ifdef HAVE_LIBGME +#ifdef HAVE_GME || gme #endif #ifdef HAVE_OPENMPT @@ -1136,7 +1136,7 @@ boolean I_LoadSong(char *data, size_t len) // always do this whether or not a music already exists var_cleanup(); -#ifdef HAVE_LIBGME +#ifdef HAVE_GME if ((UINT8)data[0] == 0x1F && (UINT8)data[1] == 0x8B) { @@ -1271,7 +1271,7 @@ void I_UnloadSong(void) { I_StopSong(); -#ifdef HAVE_LIBGME +#ifdef HAVE_GME if (gme) { gme_delete(gme); @@ -1294,7 +1294,7 @@ void I_UnloadSong(void) boolean I_PlaySong(boolean looping) { -#ifdef HAVE_LIBGME +#ifdef HAVE_GME if (gme) { gme_equalizer_t eq = {GME_TREBLE, GME_BASS, 0,0,0,0,0,0,0,0}; @@ -1360,7 +1360,7 @@ void I_StopSong(void) if (!fading_nocleanup) I_StopFadingSong(); -#ifdef HAVE_LIBGME +#ifdef HAVE_GME if (gme) { Mix_HookMusic(NULL, NULL); @@ -1433,7 +1433,7 @@ void I_SetMusicVolume(UINT8 volume) boolean I_SetSongTrack(int track) { -#ifdef HAVE_LIBGME +#ifdef HAVE_GME // If the specified track is within the number of tracks playing, then change it if (gme) { diff --git a/src/sdl/ogl_sdl.c b/src/sdl/ogl_sdl.c index c426e6792..db0538195 100644 --- a/src/sdl/ogl_sdl.c +++ b/src/sdl/ogl_sdl.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 2014-2021 by Sonic Team Junior. +// Copyright (C) 2014-2023 by Sonic Team Junior. // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -177,7 +177,9 @@ boolean OglSdlSurface(INT32 w, INT32 h) // Also set the renderer variable back to software so the next launch won't // repeat this error. CV_StealthSet(&cv_renderer, "Software"); - I_Error("OpenGL Error: Failed to access the GPU. There may be an issue with your graphics drivers."); + I_Error("OpenGL Error: Failed to access the GPU. Possible reasons include:\n" + "- GPU vendor has dropped OpenGL support on your GPU and OS. (Old GPU?)\n" + "- GPU drivers are missing or broken. You may need to update your drivers."); } } first_init = true; diff --git a/src/sdl/ogl_sdl.h b/src/sdl/ogl_sdl.h index 8f87f688e..bd1d699ff 100644 --- a/src/sdl/ogl_sdl.h +++ b/src/sdl/ogl_sdl.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 2014-2021 by Sonic Team Junior. +// Copyright (C) 2014-2023 by Sonic Team Junior. // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/sdl/sdl_sound.c b/src/sdl/sdl_sound.c index 058b601c3..2ca35b954 100644 --- a/src/sdl/sdl_sound.c +++ b/src/sdl/sdl_sound.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // // Copyright (C) 1993-1996 by id Software, Inc. -// Copyright (C) 2014-2021 by Sonic Team Junior. +// Copyright (C) 2014-2023 by Sonic Team Junior. // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/sdl/sdlmain.h b/src/sdl/sdlmain.h index a9676b5c2..db736880d 100644 --- a/src/sdl/sdlmain.h +++ b/src/sdl/sdlmain.h @@ -1,7 +1,7 @@ // Emacs style mode select -*- C++ -*- //----------------------------------------------------------------------------- // -// Copyright (C) 2006-2021 by Sonic Team Junior. +// Copyright (C) 2006-2023 by Sonic Team Junior. // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/sounds.c b/src/sounds.c index 4c5b11ee9..19b69dd28 100644 --- a/src/sounds.c +++ b/src/sounds.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -14,6 +14,7 @@ #include "doomtype.h" #include "i_sound.h" #include "sounds.h" +#include "s_sound.h" #include "r_defs.h" #include "r_skins.h" #include "z_zone.h" @@ -53,774 +54,774 @@ sfxinfo_t S_sfx[NUMSFX] = // Thank you! ^u^ // Skin Sounds - {"altdi1", false, 192, 16, -1, NULL, 0, SKSPLDET1, -1, LUMPERROR, "Dying"}, - {"altdi2", false, 192, 16, -1, NULL, 0, SKSPLDET2, -1, LUMPERROR, "Dying"}, - {"altdi3", false, 192, 16, -1, NULL, 0, SKSPLDET3, -1, LUMPERROR, "Dying"}, - {"altdi4", false, 192, 16, -1, NULL, 0, SKSPLDET4, -1, LUMPERROR, "Dying"}, - {"altow1", false, 192, 16, -1, NULL, 0, SKSPLPAN1, -1, LUMPERROR, "Ring loss"}, - {"altow2", false, 192, 16, -1, NULL, 0, SKSPLPAN2, -1, LUMPERROR, "Ring loss"}, - {"altow3", false, 192, 16, -1, NULL, 0, SKSPLPAN3, -1, LUMPERROR, "Ring loss"}, - {"altow4", false, 192, 16, -1, NULL, 0, SKSPLPAN4, -1, LUMPERROR, "Ring loss"}, - {"victr1", false, 64, 16, -1, NULL, 0, SKSPLVCT1, -1, LUMPERROR, "/"}, - {"victr2", false, 64, 16, -1, NULL, 0, SKSPLVCT2, -1, LUMPERROR, "/"}, - {"victr3", false, 64, 16, -1, NULL, 0, SKSPLVCT3, -1, LUMPERROR, "/"}, - {"victr4", false, 64, 16, -1, NULL, 0, SKSPLVCT4, -1, LUMPERROR, "/"}, - {"gasp" , false, 64, 0, -1, NULL, 0, SKSGASP, -1, LUMPERROR, "Bubble gasp"}, - {"jump" , false, 140, 0, -1, NULL, 0, SKSJUMP, -1, LUMPERROR, "Jump"}, - {"pudpud", false, 64, 0, -1, NULL, 0, SKSPUDPUD, -1, LUMPERROR, "Tired flight"}, - {"putput", false, 64, 0, -1, NULL, 0, SKSPUTPUT, -1, LUMPERROR, "Flight"}, // not as high a priority - {"spin" , false, 100, 0, -1, NULL, 0, SKSSPIN, -1, LUMPERROR, "Spin"}, - {"spndsh", false, 64, 1, -1, NULL, 0, SKSSPNDSH, -1, LUMPERROR, "Spindash"}, - {"thok" , false, 96, 0, -1, NULL, 0, SKSTHOK, -1, LUMPERROR, "Thok"}, - {"zoom" , false, 120, 1, -1, NULL, 0, SKSZOOM, -1, LUMPERROR, "Spin launch"}, - {"skid", false, 64, 32, -1, NULL, 0, SKSSKID, -1, LUMPERROR, "Skid"}, + {"altdi1", false, 192, SF_X8AWAYSOUND, -1, NULL, 0, SKSPLDET1, -1, LUMPERROR, "Dying"}, + {"altdi2", false, 192, SF_X8AWAYSOUND, -1, NULL, 0, SKSPLDET2, -1, LUMPERROR, "Dying"}, + {"altdi3", false, 192, SF_X8AWAYSOUND, -1, NULL, 0, SKSPLDET3, -1, LUMPERROR, "Dying"}, + {"altdi4", false, 192, SF_X8AWAYSOUND, -1, NULL, 0, SKSPLDET4, -1, LUMPERROR, "Dying"}, + {"altow1", false, 192, SF_X8AWAYSOUND, -1, NULL, 0, SKSPLPAN1, -1, LUMPERROR, "Ring loss"}, + {"altow2", false, 192, SF_X8AWAYSOUND, -1, NULL, 0, SKSPLPAN2, -1, LUMPERROR, "Ring loss"}, + {"altow3", false, 192, SF_X8AWAYSOUND, -1, NULL, 0, SKSPLPAN3, -1, LUMPERROR, "Ring loss"}, + {"altow4", false, 192, SF_X8AWAYSOUND, -1, NULL, 0, SKSPLPAN4, -1, LUMPERROR, "Ring loss"}, + {"victr1", false, 64, SF_X8AWAYSOUND, -1, NULL, 0, SKSPLVCT1, -1, LUMPERROR, "/"}, + {"victr2", false, 64, SF_X8AWAYSOUND, -1, NULL, 0, SKSPLVCT2, -1, LUMPERROR, "/"}, + {"victr3", false, 64, SF_X8AWAYSOUND, -1, NULL, 0, SKSPLVCT3, -1, LUMPERROR, "/"}, + {"victr4", false, 64, SF_X8AWAYSOUND, -1, NULL, 0, SKSPLVCT4, -1, LUMPERROR, "/"}, + {"gasp" , false, 64, 0, -1, NULL, 0, SKSGASP, -1, LUMPERROR, "Bubble gasp"}, + {"jump" , false, 140, 0, -1, NULL, 0, SKSJUMP, -1, LUMPERROR, "Jump"}, + {"pudpud", false, 64, 0, -1, NULL, 0, SKSPUDPUD, -1, LUMPERROR, "Tired flight"}, + {"putput", false, 64, 0, -1, NULL, 0, SKSPUTPUT, -1, LUMPERROR, "Flight"}, // not as high a priority + {"spin" , false, 100, 0, -1, NULL, 0, SKSSPIN, -1, LUMPERROR, "Spin"}, + {"spndsh", false, 64, SF_TOTALLYSINGLE, -1, NULL, 0, SKSSPNDSH, -1, LUMPERROR, "Spindash"}, + {"thok" , false, 96, 0, -1, NULL, 0, SKSTHOK, -1, LUMPERROR, "Thok"}, + {"zoom" , false, 120, SF_TOTALLYSINGLE, -1, NULL, 0, SKSZOOM, -1, LUMPERROR, "Spin launch"}, + {"skid", false, 64, SF_NOINTERRUPT, -1, NULL, 0, SKSSKID, -1, LUMPERROR, "Skid"}, // Ambience/background objects/etc - {"ambint", true, 32, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Obnoxious disco music"}, + {"ambint", true, 32, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Obnoxious disco music"}, - {"alarm", false, 32, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Alarm"}, - {"buzz1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Electric zap"}, - {"buzz2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Electric zap"}, - {"buzz3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Wacky worksurface"}, - {"buzz4", true, 8, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Buzz"}, - {"crumbl", true, 127, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Crumbling"}, // Platform Crumble Tails 03-16-2001 - {"fire", false, 8, 32, -1, NULL, 0, -1, -1, LUMPERROR, "Flamethrower"}, - {"grind", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Metallic grinding"}, - {"laser", true, 16, 2, -1, NULL, 0, -1, -1, LUMPERROR, "Laser hum"}, - {"mswing", false, 16, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Swinging mace"}, - {"pstart", false, 100, 0, -1, NULL, 0, -1, -1, LUMPERROR, "/"}, - {"pstop", false, 100, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Crusher stomp"}, - {"steam1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Steam jet"}, // Tails 06-19-2001 - {"steam2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Steam jet"}, // Tails 06-19-2001 - {"wbreak", true, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Wood breaking"}, - {"ambmac", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Machinery"}, - {"spsmsh", true, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Heavy impact"}, + {"alarm", false, 32, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Alarm"}, + {"buzz1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Electric zap"}, + {"buzz2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Electric zap"}, + {"buzz3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Wacky worksurface"}, + {"buzz4", true, 8, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Buzz"}, + {"crumbl", true, 127, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Crumbling"}, // Platform Crumble Tails 03-16-2001 + {"fire", false, 8, SF_NOINTERRUPT, -1, NULL, 0, -1, -1, LUMPERROR, "Flamethrower"}, + {"grind", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Metallic grinding"}, + {"laser", true, 16, SF_NOMULTIPLESOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Laser hum"}, + {"mswing", false, 16, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Swinging mace"}, + {"pstart", false, 100, 0, -1, NULL, 0, -1, -1, LUMPERROR, "/"}, + {"pstop", false, 100, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Crusher stomp"}, + {"steam1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Steam jet"}, // Tails 06-19-2001 + {"steam2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Steam jet"}, // Tails 06-19-2001 + {"wbreak", true, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Wood breaking"}, + {"ambmac", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Machinery"}, + {"spsmsh", true, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Heavy impact"}, - {"rainin", true, 24, 4, -1, NULL, 0, -1, -1, LUMPERROR, "Rain"}, - {"litng1", false, 16, 2, -1, NULL, 0, -1, -1, LUMPERROR, "Lightning"}, - {"litng2", false, 16, 2, -1, NULL, 0, -1, -1, LUMPERROR, "Lightning"}, - {"litng3", false, 16, 2, -1, NULL, 0, -1, -1, LUMPERROR, "Lightning"}, - {"litng4", false, 16, 2, -1, NULL, 0, -1, -1, LUMPERROR, "Lightning"}, - {"athun1", false, 16, 2, -1, NULL, 0, -1, -1, LUMPERROR, "Thunder"}, - {"athun2", false, 16, 2, -1, NULL, 0, -1, -1, LUMPERROR, "Thunder"}, + {"rainin", true, 24, SF_OUTSIDESOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Rain"}, + {"litng1", false, 16, SF_NOMULTIPLESOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Lightning"}, + {"litng2", false, 16, SF_NOMULTIPLESOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Lightning"}, + {"litng3", false, 16, SF_NOMULTIPLESOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Lightning"}, + {"litng4", false, 16, SF_NOMULTIPLESOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Lightning"}, + {"athun1", false, 16, SF_NOMULTIPLESOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Thunder"}, + {"athun2", false, 16, SF_NOMULTIPLESOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Thunder"}, - {"amwtr1", false, 12, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Stream"}, - {"amwtr2", false, 12, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Stream"}, - {"amwtr3", false, 12, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Stream"}, - {"amwtr4", false, 12, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Stream"}, - {"amwtr5", false, 12, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Stream"}, - {"amwtr6", false, 12, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Stream"}, - {"amwtr7", false, 12, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Stream"}, - {"amwtr8", false, 12, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Stream"}, - {"bubbl1", false, 11, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Glub"}, - {"bubbl2", false, 11, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Glub"}, - {"bubbl3", false, 11, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Glub"}, - {"bubbl4", false, 11, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Glub"}, - {"bubbl5", false, 11, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Glub"}, - {"floush", false, 16, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Glub"}, - {"splash", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Glub"}, // labeling sfx_splash as "glub" and sfx_splish as "splash" seems wrong but isn't - {"splish", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Splash"}, // Splish Tails 12-08-2000 - {"wdrip1", false, 8, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drip"}, - {"wdrip2", false, 8 , 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drip"}, - {"wdrip3", false, 8, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drip"}, - {"wdrip4", false, 8, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drip"}, - {"wdrip5", false, 8, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drip"}, - {"wdrip6", false, 8, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drip"}, - {"wdrip7", false, 8, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drip"}, - {"wdrip8", false, 8, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drip"}, - {"wslap", false, 32, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Splash"}, // Water Slap Tails 12-13-2000 + {"amwtr1", false, 12, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Stream"}, + {"amwtr2", false, 12, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Stream"}, + {"amwtr3", false, 12, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Stream"}, + {"amwtr4", false, 12, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Stream"}, + {"amwtr5", false, 12, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Stream"}, + {"amwtr6", false, 12, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Stream"}, + {"amwtr7", false, 12, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Stream"}, + {"amwtr8", false, 12, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Stream"}, + {"bubbl1", false, 11, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Glub"}, + {"bubbl2", false, 11, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Glub"}, + {"bubbl3", false, 11, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Glub"}, + {"bubbl4", false, 11, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Glub"}, + {"bubbl5", false, 11, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Glub"}, + {"floush", false, 16, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Glub"}, + {"splash", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Glub"}, // labeling sfx_splash as "glub" and sfx_splish as "splash" seems wrong but isn't + {"splish", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Splash"}, // Splish Tails 12-08-2000 + {"wdrip1", false, 8, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drip"}, + {"wdrip2", false, 8, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drip"}, + {"wdrip3", false, 8, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drip"}, + {"wdrip4", false, 8, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drip"}, + {"wdrip5", false, 8, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drip"}, + {"wdrip6", false, 8, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drip"}, + {"wdrip7", false, 8, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drip"}, + {"wdrip8", false, 8, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drip"}, + {"wslap", false, 32, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Splash"}, // Water Slap Tails 12-13-2000 - {"doora1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Sliding open"}, - {"doorb1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Sliding open"}, - {"doorc1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Wooden door opening"}, - {"doorc2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Slamming shut"}, - {"doord1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Creaking open"}, - {"doord2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Slamming shut"}, - {"eleva1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Starting elevator"}, - {"eleva2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Moving elevator"}, - {"eleva3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Stopping elevator"}, - {"elevb1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Starting elevator"}, - {"elevb2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Moving elevator"}, - {"elevb3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Stopping elevator"}, + {"doora1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Sliding open"}, + {"doorb1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Sliding open"}, + {"doorc1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Wooden door opening"}, + {"doorc2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Slamming shut"}, + {"doord1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Creaking open"}, + {"doord2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Slamming shut"}, + {"eleva1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Starting elevator"}, + {"eleva2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Moving elevator"}, + {"eleva3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Stopping elevator"}, + {"elevb1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Starting elevator"}, + {"elevb2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Moving elevator"}, + {"elevb3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Stopping elevator"}, - {"ambin2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Natural vibrations"}, - {"lavbub", false, 64, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Bubbling lava"}, - {"rocks1", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Falling rocks"}, - {"rocks2", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Falling rocks"}, - {"rocks3", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Falling rocks"}, - {"rocks4", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Falling rocks"}, - {"rumbam", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ominous rumbling"}, - {"rumble", false, 64, 24, -1, NULL, 0, -1, -1, LUMPERROR, "Ominous rumbling"}, + {"ambin2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Natural vibrations"}, + {"lavbub", false, 64, SF_X4AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Bubbling lava"}, + {"rocks1", false, 64, SF_X2AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Falling rocks"}, + {"rocks2", false, 64, SF_X2AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Falling rocks"}, + {"rocks3", false, 64, SF_X2AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Falling rocks"}, + {"rocks4", false, 64, SF_X2AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Falling rocks"}, + {"rumbam", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ominous rumbling"}, + {"rumble", false, 64, SF_X4AWAYSOUND|SF_X8AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Ominous rumbling"}, // Game objects, etc - {"appear", false, 127, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Appearing platform"}, - {"bkpoof", false, 70, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Armageddon pow"}, - {"bnce1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bounce"}, // Boing! - {"bnce2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Scatter"}, // Boing! - {"cannon", false, 64, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Powerful shot"}, - {"cgot" , true, 120, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Got Emerald"}, // Got Emerald! Tails 09-02-2001 - {"cybdth", false, 32, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Explosion"}, - {"deton", true, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Threatening beeping"}, - {"ding", false, 127, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Ding"}, - {"dmpain", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Machine damage"}, - {"drown", false, 192, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drowning"}, - {"fizzle", false, 127, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Electric fizzle"}, - {"gbeep", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Threatening beeping"}, // Grenade beep - {"wepfir", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Firing weapon"}, // defaults to thok - {"ghit" , false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Goop splash"}, - {"gloop", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Splash"}, - {"gspray", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Goop sling"}, - {"gravch", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Recycler"}, - {"itemup", true, 255, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Sparkle"}, - {"jet", false, 8, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Jet engine"}, - {"jshard", true, 167, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Life transfer"}, // placeholder repurpose; original string was "Got Shard" - {"lose" , false, 127, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Failure"}, - {"lvpass", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spinning signpost"}, - {"mindig", false, 8, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Tunnelling"}, - {"mixup", true, 127, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Teleport"}, - {"monton", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Golden Monitor activated"}, - {"pogo" , false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Mechanical pogo"}, - {"pop" , false, 78, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Pop"}, - {"rail1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Firing rail"}, - {"rail2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Crashing rail"}, - {"rlaunc", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Firing"}, - {"shield", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Pity Shield"}, // generic GET! - {"wirlsg", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Whirlwind Shield"}, // Whirlwind GET! - {"forcsg", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Force Shield"}, // Force GET! - {"frcssg", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Weak Force Shield"}, // Force GET...? (consider making a custom shield with this instead of a single-hit force shield!) - {"elemsg", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Elemental Shield"}, // Elemental GET! - {"armasg", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Armageddon Shield"}, // Armaggeddon GET! - {"attrsg", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Attraction Shield"}, // Attract GET! - {"shldls", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Hurt"}, // You LOSE! - {"spdpad", false, 127, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Speedpad"}, - {"spkdth", false, 127, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spiked"}, - {"spring", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spring"}, - {"statu1", true, 64, 2, -1, NULL, 0, -1, -1, LUMPERROR, "Pushing a statue"}, - {"statu2", true, 64, 2, -1, NULL, 0, -1, -1, LUMPERROR, "Pushing a statue"}, - {"strpst", true, 192, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Starpost"}, - {"supert", true, 127, 2, -1, NULL, 0, -1, -1, LUMPERROR, "Transformation"}, - {"telept", false, 32, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Dash"}, - {"tink" , false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Tink"}, - {"token" , true, 224, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Got Token"}, - {"trfire", true, 60, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Laser fired"}, - {"trpowr", true, 127, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Powering up"}, - {"turhit", false, 40, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Laser hit"}, - {"wdjump", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Whirlwind jump"}, - {"shrpsp", true, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spincushion"}, - {"shrpgo", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Launch"}, - {"mswarp", false, 60, 16, -1, NULL, 0, -1, -1, LUMPERROR, "Spinning out"}, - {"mspogo", true, 60, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Breaking through"}, - {"boingf", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bouncing"}, - {"corkp", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Cork fired"}, - {"corkh", false, 32, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Cork hit"}, - {"alart", false, 200, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Caught red handed!"}, - {"vwre", false, 200, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Clone fighter!"}, - {"bowl", false, 32, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bowling"}, - {"chuchu", false, 32, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Train horn"}, - {"bsnipe", false, 200, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Home-run smash"}, - {"sprong", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Power spring"}, - {"lvfal1", true, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Rumble"}, - {"pscree", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "SCREE!"}, - {"iceb", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ice crack"}, - {"shattr", true, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Shattering"}, - {"antiri", true, 255, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Depletion"}, + {"appear", false, 127, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Appearing platform"}, + {"bkpoof", false, 70, SF_X4AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Armageddon pow"}, + {"bnce1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bounce"}, // Boing! + {"bnce2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Scatter"}, // Boing! + {"cannon", false, 64, SF_X4AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Powerful shot"}, + {"cgot" , true, 120, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Got Emerald"}, // Got Emerald! Tails 09-02-2001 + {"cybdth", false, 32, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Explosion"}, + {"deton", true, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Threatening beeping"}, + {"ding", true, 127, SF_X4AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Ding"}, + {"dmpain", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Machine damage"}, + {"drown", false, 192, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drowning"}, + {"fizzle", false, 127, SF_X4AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Electric fizzle"}, + {"gbeep", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Threatening beeping"}, // Grenade beep + {"wepfir", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Firing weapon"}, // defaults to thok + {"ghit" , false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Goop splash"}, + {"gloop", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Splash"}, + {"gspray", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Goop sling"}, + {"gravch", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Recycler"}, + {"itemup", true, 255, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Sparkle"}, + {"jet", false, 8, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Jet engine"}, + {"jshard", true, 167, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Life transfer"}, // placeholder repurpose; original string was "Got Shard" + {"lose" , false, 127, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Failure"}, + {"lvpass", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spinning signpost"}, + {"mindig", false, 8, SF_X2AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Tunnelling"}, + {"mixup", true, 127, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Teleport"}, + {"monton", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Golden Monitor activated"}, + {"pogo" , false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Mechanical pogo"}, + {"pop" , false, 78, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Pop"}, + {"rail1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Firing rail"}, + {"rail2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Crashing rail"}, + {"rlaunc", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Firing"}, + {"shield", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Pity Shield"}, // generic GET! + {"wirlsg", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Whirlwind Shield"}, // Whirlwind GET! + {"forcsg", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Force Shield"}, // Force GET! + {"frcssg", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Weak Force Shield"}, // Force GET...? (consider making a custom shield with this instead of a single-hit force shield!) + {"elemsg", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Elemental Shield"}, // Elemental GET! + {"armasg", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Armageddon Shield"}, // Armaggeddon GET! + {"attrsg", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Attraction Shield"}, // Attract GET! + {"shldls", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Hurt"}, // You LOSE! + {"spdpad", false, 127, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Speedpad"}, + {"spkdth", false, 127, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spiked"}, + {"spring", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spring"}, + {"statu1", true, 64, SF_NOMULTIPLESOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Pushing a statue"}, + {"statu2", true, 64, SF_NOMULTIPLESOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Pushing a statue"}, + {"strpst", true, 192, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Starpost"}, + {"supert", true, 127, SF_NOMULTIPLESOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Transformation"}, + {"telept", false, 32, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Dash"}, + {"tink" , false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Tink"}, + {"token" , true, 224, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Got Token"}, + {"trfire", true, 60, SF_X4AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Laser fired"}, + {"trpowr", true, 127, SF_X4AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Powering up"}, + {"turhit", false, 40, SF_X4AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Laser hit"}, + {"wdjump", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Whirlwind jump"}, + {"shrpsp", true, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spincushion"}, + {"shrpgo", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Launch"}, + {"mswarp", false, 60, SF_X8AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Spinning out"}, + {"mspogo", true, 60, SF_X4AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Breaking through"}, + {"boingf", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bouncing"}, + {"corkp", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Cork fired"}, + {"corkh", false, 32, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Cork hit"}, + {"alart", false, 200, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Caught red handed!"}, + {"vwre", false, 200, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Clone fighter!"}, + {"bowl", false, 32, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bowling"}, + {"chuchu", false, 32, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Train horn"}, + {"bsnipe", false, 200, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Home-run smash"}, + {"sprong", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Power spring"}, + {"lvfal1", true, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Rumble"}, + {"pscree", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "SCREE!"}, + {"iceb", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ice crack"}, + {"shattr", true, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Shattering"}, + {"antiri", true, 255, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Depletion"}, // Menu, interface - {"chchng", false, 120, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Score"}, - {"dwnind", false, 212, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Thinking about air"}, - {"emfind", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Radar beep"}, - {"flgcap", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Flag captured"}, - {"menu1", true, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Menu beep"}, - {"oneup", true, 192, 0, -1, NULL, 0, -1, -1, LUMPERROR, "One-up"}, - {"ptally", true, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Tally"}, // Point tally is identical to menu for now - {"radio", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Notification"}, - {"wepchg", true, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Weapon change"}, // Weapon switch is identical to menu for now - {"wtrdng", true, 212, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Aquaphobia"}, // make sure you can hear the DING DING! Tails 03-08-2000 - {"zelda", false, 120, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Discovery"}, - {"adderr", true, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Error"}, - {"notadd", true, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Reject"}, - {"addfil", true, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Accept"}, + {"chchng", false, 120, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Score"}, + {"dwnind", false, 212, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Thinking about air"}, + {"emfind", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Radar beep"}, + {"flgcap", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Flag captured"}, + {"menu1", true, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Menu beep"}, + {"oneup", true, 192, 0, -1, NULL, 0, -1, -1, LUMPERROR, "One-up"}, + {"ptally", true, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Tally"}, // Point tally is identical to menu for now + {"radio", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Notification"}, + {"wepchg", true, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Weapon change"}, // Weapon switch is identical to menu for now + {"wtrdng", true, 212, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Aquaphobia"}, // make sure you can hear the DING DING! Tails 03-08-2000 + {"zelda", false, 120, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Discovery"}, + {"adderr", true, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Error"}, + {"notadd", true, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Reject"}, + {"addfil", true, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Accept"}, // NiGHTS - {"ideya", false, 127, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Success"}, - {"xideya", false, 127, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Success"}, // Xmas - {"nbmper", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bumper"}, - {"nxbump", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bumper"}, // Xmas - {"ncchip", false, 204, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Got chip"}, - {"ncitem", false, 204, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Got special"}, - {"nxitem", false, 204, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Got special"}, // Xmas - {"ngdone", true, 127, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bonus time start"}, - {"nxdone", true, 127, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bonus time start"}, // Xmas - {"drill1", false, 48, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drill"}, - {"drill2", false, 48, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drill"}, - {"ncspec", false, 204, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Power-up"}, // Tails 12-15-2003 - {"nghurt", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Hurt"}, - {"ngskid", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Force stop"}, - {"hoop1", false, 192, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Hoop"}, - {"hoop2", false, 192, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Hoop+"}, - {"hoop3", false, 192, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Hoop++"}, - {"hidden", false, 204, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Discovery"}, - {"prloop", false, 104, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Gust of wind"}, - {"timeup", true, 256, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ominous Countdown"}, - {"ngjump", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Jump"}, - {"peww", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Pew"}, + {"ideya", false, 127, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Success"}, + {"xideya", false, 127, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Success"}, // Xmas + {"nbmper", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bumper"}, + {"nxbump", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bumper"}, // Xmas + {"ncchip", false, 204, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Got chip"}, + {"ncitem", false, 204, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Got special"}, + {"nxitem", false, 204, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Got special"}, // Xmas + {"ngdone", true, 127, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bonus time start"}, + {"nxdone", true, 127, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bonus time start"}, // Xmas + {"drill1", false, 48, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drill"}, + {"drill2", false, 48, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drill"}, + {"ncspec", false, 204, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Power-up"}, // Tails 12-15-2003 + {"nghurt", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Hurt"}, + {"ngskid", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Force stop"}, + {"hoop1", false, 192, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Hoop"}, + {"hoop2", false, 192, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Hoop+"}, + {"hoop3", false, 192, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Hoop++"}, + {"hidden", false, 204, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Discovery"}, + {"prloop", false, 104, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Gust of wind"}, + {"timeup", true, 256, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ominous Countdown"}, + {"ngjump", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Jump"}, + {"peww", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Pew"}, // Halloween - {"lntsit", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Cacolantern awake"}, - {"lntdie", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Cacolantern death"}, - {"pumpkn", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Pumpkin smash"}, // idspispopd - {"ghosty", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Laughter"}, + {"lntsit", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Cacolantern awake"}, + {"lntdie", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Cacolantern death"}, + {"pumpkn", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Pumpkin smash"}, // idspispopd + {"ghosty", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Laughter"}, // Mario - {"koopfr" , true, 127, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Fire"}, - {"mario1", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Hit"}, - {"mario2", false, 127, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bonk"}, - {"mario3", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Power-up"}, - {"mario4", true, 78, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Got coin"}, - {"mario5", false, 78, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Boot-stomp"}, - {"mario6", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Jump"}, - {"mario7", false, 32, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Fire"}, - {"mario8", false, 48, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Hurt"}, - {"mario9", true, 120, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Emerging power-up"}, - {"marioa", true, 192, 0, -1, NULL, 0, -1, -1, LUMPERROR, "One-up"}, - {"thwomp", true, 127, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Thwomp"}, + {"koopfr" , true, 127, SF_X4AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Fire"}, + {"mario1", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Hit"}, + {"mario2", false, 127, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bonk"}, + {"mario3", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Power-up"}, + {"mario4", true, 78, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Got coin"}, + {"mario5", false, 78, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Boot-stomp"}, + {"mario6", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Jump"}, + {"mario7", false, 32, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Fire"}, + {"mario8", false, 48, SF_X4AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Hurt"}, + {"mario9", true, 120, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Emerging power-up"}, + {"marioa", true, 192, 0, -1, NULL, 0, -1, -1, LUMPERROR, "One-up"}, + {"thwomp", true, 127, SF_X4AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Thwomp"}, // Black Eggman - {"bebomb", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Big explosion"}, - {"bechrg", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Powering up"}, - {"becrsh", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Crash"}, - {"bedeen", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Metallic crash"}, - {"bedie1", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Eggman crying"}, - {"bedie2", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Eggman crying"}, - {"beeyow", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Failing machinery"}, - {"befall", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Metallic slam"}, - {"befire", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Firing goop"}, - {"beflap", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Mechanical jump"}, - {"begoop", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Powerful shot"}, - {"begrnd", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Metallic grinding"}, - {"behurt", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Eggman shocked"}, - {"bejet1", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Jetpack charge"}, - {"belnch", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Mechanical jump"}, - {"beoutb", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Failed shot"}, - {"beragh", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Eggman screaming"}, - {"beshot", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Firing missile"}, - {"bestep", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Mechanical stomp"}, - {"bestp2", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Mechanical stomp"}, - {"bewar1", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Eggman laughing"}, - {"bewar2", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Eggman laughing"}, - {"bewar3", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Eggman laughing"}, - {"bewar4", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Eggman laughing"}, - {"bexpld", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Explosion"}, - {"bgxpld", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Explosion"}, + {"bebomb", false, 64, SF_X2AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Big explosion"}, + {"bechrg", false, 64, SF_X2AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Powering up"}, + {"becrsh", false, 64, SF_X2AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Crash"}, + {"bedeen", false, 64, SF_X2AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Metallic crash"}, + {"bedie1", false, 64, SF_X2AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Eggman crying"}, + {"bedie2", false, 64, SF_X2AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Eggman crying"}, + {"beeyow", false, 64, SF_X2AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Failing machinery"}, + {"befall", false, 64, SF_X2AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Metallic slam"}, + {"befire", false, 64, SF_X2AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Firing goop"}, + {"beflap", false, 64, SF_X2AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Mechanical jump"}, + {"begoop", false, 64, SF_X2AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Powerful shot"}, + {"begrnd", false, 64, SF_X2AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Metallic grinding"}, + {"behurt", false, 64, SF_X2AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Eggman shocked"}, + {"bejet1", false, 64, SF_X2AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Jetpack charge"}, + {"belnch", false, 64, SF_X2AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Mechanical jump"}, + {"beoutb", false, 64, SF_X2AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Failed shot"}, + {"beragh", false, 64, SF_X2AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Eggman screaming"}, + {"beshot", false, 64, SF_X2AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Firing missile"}, + {"bestep", false, 64, SF_X2AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Mechanical stomp"}, + {"bestp2", false, 64, SF_X2AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Mechanical stomp"}, + {"bewar1", false, 64, SF_X2AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Eggman laughing"}, + {"bewar2", false, 64, SF_X2AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Eggman laughing"}, + {"bewar3", false, 64, SF_X2AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Eggman laughing"}, + {"bewar4", false, 64, SF_X2AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Eggman laughing"}, + {"bexpld", false, 64, SF_X2AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Explosion"}, + {"bgxpld", false, 64, SF_X2AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Explosion"}, // Cybrakdemon - {"beelec", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Electricity"}, - {"brakrl", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Rocket launch"}, - {"brakrx", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Rocket explosion"}, + {"beelec", false, 64, SF_X2AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Electricity"}, + {"brakrl", false, 64, SF_X2AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Rocket launch"}, + {"brakrx", false, 64, SF_X2AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Rocket explosion"}, // Sonic 1 sounds - {"s1a0", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1a1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1a2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1a3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1a4", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1a5", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1a6", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1a7", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1a8", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1a9", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1aa", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1ab", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Chomp"}, - {"s1ac", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1ad", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1ae", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1af", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1b0", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1b1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1b2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1b3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1b4", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1b5", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1b6", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1b7", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1b8", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1b9", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1ba", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1bb", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1bc", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1bd", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1be", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1bf", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1c0", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1c1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1c2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1c3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1c4", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1c5", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1c6", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1c7", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1c8", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1c9", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1ca", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1cb", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1cc", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1cd", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1ce", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s1cf", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1a0", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1a1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1a2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1a3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1a4", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1a5", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1a6", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1a7", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1a8", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1a9", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1aa", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1ab", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Chomp"}, + {"s1ac", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1ad", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1ae", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1af", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1b0", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1b1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1b2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1b3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1b4", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1b5", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1b6", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1b7", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1b8", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1b9", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1ba", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1bb", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1bc", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1bd", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1be", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1bf", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1c0", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1c1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1c2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1c3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1c4", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1c5", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1c6", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1c7", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1c8", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1c9", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1ca", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1cb", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1cc", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1cd", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1ce", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s1cf", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // Sonic 2 sounds - {"s220", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s221", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s222", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s223", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s224", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s225", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s226", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s227", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s228", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s229", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s22a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s22b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s22c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s22d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s22e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s22f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s230", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s231", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s232", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s233", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s234", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s235", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s236", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s237", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s238", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s239", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s23a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s23b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s23c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s23d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s23e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s23f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s240", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s241", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s242", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s243", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s244", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s245", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s246", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s247", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s248", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s249", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s24a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s24b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s24c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s24d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s24e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s24f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s250", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s251", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s252", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s253", false, 255, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s254", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s255", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s256", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s257", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s258", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s259", false, 96, 8, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s25a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s25b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s25c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s25d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s25e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s25f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s260", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s220", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s221", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s222", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s223", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s224", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s225", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s226", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s227", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s228", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s229", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s22a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s22b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s22c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s22d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s22e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s22f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s230", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s231", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s232", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s233", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s234", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s235", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s236", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s237", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s238", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s239", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s23a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s23b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s23c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s23d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s23e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s23f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s240", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s241", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s242", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s243", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s244", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s245", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s246", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s247", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s248", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s249", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s24a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s24b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s24c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s24d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s24e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s24f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s250", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s251", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s252", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s253", false, 255, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s254", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s255", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s256", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s257", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s258", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s259", false, 96, SF_X4AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s25a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s25b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s25c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s25d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s25e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s25f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s260", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // S3&K sounds - {"s3k2b", true, 120, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Got Emerald"}, // Got Emerald! - {"s3k33", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Sparkle"}, // stereo in original game, identical to latter - {"s3k34", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Sparkle"}, // mono in original game, identical to previous - {"s3k35", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Hurt"}, - {"s3k36", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Skid"}, - {"s3k37", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spiked"}, - {"s3k38", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bubble gasp"}, - {"s3k39", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Splash"}, - {"s3k3a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Shield"}, - {"s3k3b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drowning"}, - {"s3k3c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spin"}, - {"s3k3d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Pop"}, - {"s3k3e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Flame Shield"}, - {"s3k3f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bubble Shield"}, - {"s3k40", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Attraction blast"}, - {"s3k41", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Thunder Shield"}, - {"s3k42", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Twinspin"}, - {"s3k43", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Flame burst"}, - {"s3k44", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bubble bounce"}, - {"s3k45", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Lightning zap"}, - {"s3k46", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Transformation"}, - {"s3k47", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Rising dust"}, - {"s3k48", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Pulse"}, - {"s3k49", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Impact"}, - {"s3k4a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Grab"}, - {"s3k4b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Splash"}, - {"s3k4c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Heavy hit"}, - {"s3k4d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Firing bullet"}, - {"s3k4e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Big explosion"}, - {"s3k4f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Flamethrower"}, - {"s3k50", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Siren"}, - {"s3k51", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Falling"}, - {"s3k52", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spike"}, - {"s3k53", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Powering up"}, - {"s3k54", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Firing"}, // MetalSonic shot fire - {"s3k55", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Mechanical movement"}, - {"s3k56", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Heavy landing"}, - {"s3k57", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Burst"}, - {"s3k58", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Mechanical movement"}, - {"s3k59", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Crumbling"}, - {"s3k5a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Aiming"}, - {"s3k5b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Menu beep"}, - {"s3k5c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Electric spark"}, - {"s3k5d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Heavy hit"}, - {"s3k5e", false, 127, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Releasing charge"}, - {"s3k5f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Crusher stomp"}, - {"s3k60", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Accelerating"}, - {"s3k61", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drilling"}, - {"s3k62", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Jump"}, - {"s3k63", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Starpost"}, - {"s3k64", false, 64, 2, -1, NULL, 0, -1, -1, LUMPERROR, "Clatter"}, - {"s3k65", false, 255, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Got sphere"}, // Blue Spheres - {"s3k66", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Special stage end"}, - {"s3k67", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Firing missile"}, - {"s3k68", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Discovery"}, - {"s3k69", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Switch click"}, - {"s3k6a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Special stage clear"}, - {"s3k6b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Punch"}, - {"s3k6c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Burst"}, - {"s3k6d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s3k6e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Mechanical damage"}, - {"s3k6f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ominous rumbling"}, - {"s3k70", true, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Burst"}, - {"s3k71", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Basic Shield"}, - {"s3k72", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Movement"}, - {"s3k73", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Warp"}, - {"s3k74", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Gong"}, - {"s3k75", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Rising"}, - {"s3k76", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Click"}, - {"s3k77", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Balloon pop"}, - {"s3k78", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Magnet"}, - {"s3k79", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Electric charge"}, - {"s3k7a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Rising from lava"}, - {"s3k7b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Soft bounce"}, - {"s3k7c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Magnet"}, - {"s3k7d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s3k7e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Dust"}, - {"s3k7f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Freeze"}, - {"s3k80", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ice spike burst"}, - {"s3k81", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Burst"}, - {"s3k82", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Burst"}, - {"s3k83", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Collapsing"}, - {"s3k84", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Powering up"}, - {"s3k85", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Powering down"}, - {"s3k86", false, 128, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Alarm"}, - {"s3k87", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bounce"}, - {"s3k88", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Metallic squeak"}, - {"s3k89", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Advanced tech"}, - {"s3k8a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Boing"}, - {"s3k8b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Powerful hit"}, - {"s3k8c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Humming power"}, - {"s3k8d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "/"}, - {"s3k8e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Accelerating"}, - {"s3k8f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Opening"}, - {"s3k90", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Impact"}, - {"s3k91", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Closed"}, - {"s3k92", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ghost"}, - {"s3k93", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Gas release"}, - {"s3k94", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spike"}, - {"s3k95", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Lava burst"}, - {"s3k96", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Landing"}, - {"s3k97", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Wind"}, - {"s3k98", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Falling spike"}, - {"s3k99", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bounce"}, - {"s3k9a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Click"}, - {"s3k9b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Crusher stomp"}, - {"s3k9c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Got Super Emerald"}, - {"s3k9d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Targeting"}, - {"s3k9e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Wham"}, - {"s3k9f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Transformation"}, - {"s3ka0", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Launch"}, - {"s3ka1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s3ka2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Launch"}, - {"s3ka3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Rising charge"}, - {"s3ka4", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Powering up"}, - {"s3ka5", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s3ka6", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Attraction fizzle"}, - {"s3ka7", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Countdown beep"}, - {"s3ka8", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Energy"}, - {"s3ka9", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Aquaphobia"}, - {"s3kaa", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bumper"}, - {"s3kab", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spindash"}, - {"s3kab1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spindash"}, - {"s3kab2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spindash"}, - {"s3kab3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spindash"}, - {"s3kab4", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spindash"}, - {"s3kab5", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spindash"}, - {"s3kab6", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spindash"}, - {"s3kab7", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spindash"}, - {"s3kab8", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spindash"}, - {"s3kab9", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spindash"}, - {"s3kaba", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spindash"}, - {"s3kabb", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spindash"}, - {"s3kabc", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spindash"}, - {"s3kabd", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spindash"}, - {"s3kabe", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spindash"}, - {"s3kabf", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spindash"}, - {"s3kac", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Got Continue"}, - {"s3kad", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "GO!"}, - {"s3kae", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Pinball flipper"}, - {"s3kaf", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "To Special Stage"}, - {"s3kb0", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Score"}, - {"s3kb1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spring"}, - {"s3kb2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Failure"}, - {"s3kb3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Warp"}, - {"s3kb4", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Explosion"}, - {"s3kb5", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Clink"}, - {"s3kb6", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spin launch"}, - {"s3kb7", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Tumbler"}, - {"s3kb8", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spinning signpost"}, - {"s3kb9", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ring loss"}, - {"s3kba", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Flight"}, - {"s3kbb", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Tired flight"}, - {"s3kbcs", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s3kbcl", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // long version of previous - {"s3kbds", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Flying fortress"}, - {"s3kbdl", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Flying fortress"}, // ditto - {"s3kbes", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Flying"}, - {"s3kbel", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Flying"}, // ditto - {"s3kbfs", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Turbine"}, - {"s3kbfl", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Turbine"}, // ditto - {"s3kc0s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Turbine"}, - {"s3kc0l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Turbine"}, // ditto - {"s3kc1s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Fan"}, - {"s3kc1l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Fan"}, // ditto - {"s3kc2s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Flamethrower"}, - {"s3kc2l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Flamethrower"}, // ditto - {"s3kc3s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Levitation"}, - {"s3kc3l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Levitation"}, // ditto - {"s3kc4s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Firing laser"}, - {"s3kc4l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Firing laser"}, // ditto - {"s3kc5s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Revving up"}, - {"s3kc5l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Revving up"}, // ditto - {"s3kc6s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Orbiting"}, - {"s3kc6l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Orbiting"}, // ditto - {"s3kc7s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Aiming"}, - {"s3kc7l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Aiming"}, // ditto - {"s3kc8s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Sliding"}, - {"s3kc8l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Sliding"}, // ditto - {"s3kc9s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Swinging"}, - {"s3kc9l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Swinging"}, // ditto - {"s3kcas", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Energy"}, - {"s3kcal", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Energy"}, // ditto - {"s3kcbs", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ominous rumbling"}, - {"s3kcbl", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ominous rumbling"}, // ditto - {"s3kccs", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bursting"}, - {"s3kccl", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bursting"}, // ditto - {"s3kcds", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ominous rumbling"}, - {"s3kcdl", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ominous rumbling"}, // ditto - {"s3kces", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Wind tunnel"}, - {"s3kcel", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Dust devil"}, // ditto - {"s3kcfs", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s3kcfl", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // ditto - {"s3kd0s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Rising"}, - {"s3kd0l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Rising"}, // ditto - {"s3kd1s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s3kd1l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // ditto - {"s3kd2s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Turning"}, - {"s3kd2l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Moving chain"}, // ditto - {"s3kd3s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Digging"}, - {"s3kd3l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Digging"}, // ditto - {"s3kd4s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Engine"}, - {"s3kd4l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Engine"}, // ditto - {"s3kd5s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Falling lava"}, - {"s3kd5l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Falling lava"}, // ditto - {"s3kd6s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"s3kd6l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // ditto - {"s3kd7s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Movement"}, - {"s3kd7l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Movement"}, // ditto - {"s3kd8s", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Acceleration"}, // Sharp Spin (maybe use the long/L version?) - {"s3kd8l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Acceleration"}, // ditto - {"s3kd9s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Magnetism"}, - {"s3kd9l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Magnetism"}, // ditto - {"s3kdas", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Click"}, - {"s3kdal", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Click"}, // ditto - {"s3kdbs", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Running on water"}, - {"s3kdbl", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Running on water"}, // ditto + {"s3k2b", true, 120, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Got Emerald"}, // Got Emerald! + {"s3k33", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Sparkle"}, // stereo in original game, identical to latter + {"s3k34", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Sparkle"}, // mono in original game, identical to previous + {"s3k35", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Hurt"}, + {"s3k36", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Skid"}, + {"s3k37", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spiked"}, + {"s3k38", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bubble gasp"}, + {"s3k39", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Splash"}, + {"s3k3a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Shield"}, + {"s3k3b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drowning"}, + {"s3k3c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spin"}, + {"s3k3d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Pop"}, + {"s3k3e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Flame Shield"}, + {"s3k3f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bubble Shield"}, + {"s3k40", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Attraction blast"}, + {"s3k41", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Thunder Shield"}, + {"s3k42", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Twinspin"}, + {"s3k43", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Flame burst"}, + {"s3k44", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bubble bounce"}, + {"s3k45", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Lightning zap"}, + {"s3k46", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Transformation"}, + {"s3k47", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Rising dust"}, + {"s3k48", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Pulse"}, + {"s3k49", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Impact"}, + {"s3k4a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Grab"}, + {"s3k4b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Splash"}, + {"s3k4c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Heavy hit"}, + {"s3k4d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Firing bullet"}, + {"s3k4e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Big explosion"}, + {"s3k4f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Flamethrower"}, + {"s3k50", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Siren"}, + {"s3k51", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Falling"}, + {"s3k52", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spike"}, + {"s3k53", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Powering up"}, + {"s3k54", false, 64, SF_X2AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Firing"}, // MetalSonic shot fire + {"s3k55", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Mechanical movement"}, + {"s3k56", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Heavy landing"}, + {"s3k57", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Burst"}, + {"s3k58", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Mechanical movement"}, + {"s3k59", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Crumbling"}, + {"s3k5a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Aiming"}, + {"s3k5b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Menu beep"}, + {"s3k5c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Electric spark"}, + {"s3k5d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Heavy hit"}, + {"s3k5e", false, 127, SF_X4AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Releasing charge"}, + {"s3k5f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Crusher stomp"}, + {"s3k60", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Accelerating"}, + {"s3k61", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drilling"}, + {"s3k62", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Jump"}, + {"s3k63", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Starpost"}, + {"s3k64", false, 64, SF_NOMULTIPLESOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Clatter"}, + {"s3k65", false, 255, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Got sphere"}, // Blue Spheres + {"s3k66", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Special stage end"}, + {"s3k67", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Firing missile"}, + {"s3k68", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Discovery"}, + {"s3k69", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Switch click"}, + {"s3k6a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Special stage clear"}, + {"s3k6b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Punch"}, + {"s3k6c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Burst"}, + {"s3k6d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s3k6e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Mechanical damage"}, + {"s3k6f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ominous rumbling"}, + {"s3k70", true, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Burst"}, + {"s3k71", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Basic Shield"}, + {"s3k72", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Movement"}, + {"s3k73", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Warp"}, + {"s3k74", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Gong"}, + {"s3k75", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Rising"}, + {"s3k76", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Click"}, + {"s3k77", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Balloon pop"}, + {"s3k78", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Magnet"}, + {"s3k79", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Electric charge"}, + {"s3k7a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Rising from lava"}, + {"s3k7b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Soft bounce"}, + {"s3k7c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Magnet"}, + {"s3k7d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s3k7e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Dust"}, + {"s3k7f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Freeze"}, + {"s3k80", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ice spike burst"}, + {"s3k81", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Burst"}, + {"s3k82", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Burst"}, + {"s3k83", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Collapsing"}, + {"s3k84", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Powering up"}, + {"s3k85", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Powering down"}, + {"s3k86", false, 128, SF_X4AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Alarm"}, + {"s3k87", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bounce"}, + {"s3k88", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Metallic squeak"}, + {"s3k89", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Advanced tech"}, + {"s3k8a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Boing"}, + {"s3k8b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Powerful hit"}, + {"s3k8c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Humming power"}, + {"s3k8d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "/"}, + {"s3k8e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Accelerating"}, + {"s3k8f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Opening"}, + {"s3k90", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Impact"}, + {"s3k91", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Closed"}, + {"s3k92", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ghost"}, + {"s3k93", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Gas release"}, + {"s3k94", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spike"}, + {"s3k95", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Lava burst"}, + {"s3k96", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Landing"}, + {"s3k97", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Wind"}, + {"s3k98", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Falling spike"}, + {"s3k99", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bounce"}, + {"s3k9a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Click"}, + {"s3k9b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Crusher stomp"}, + {"s3k9c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Got Super Emerald"}, + {"s3k9d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Targeting"}, + {"s3k9e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Wham"}, + {"s3k9f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Transformation"}, + {"s3ka0", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Launch"}, + {"s3ka1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s3ka2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Launch"}, + {"s3ka3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Rising charge"}, + {"s3ka4", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Powering up"}, + {"s3ka5", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s3ka6", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Attraction fizzle"}, + {"s3ka7", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Countdown beep"}, + {"s3ka8", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Energy"}, + {"s3ka9", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Aquaphobia"}, + {"s3kaa", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bumper"}, + {"s3kab", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spindash"}, + {"s3kab1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spindash"}, + {"s3kab2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spindash"}, + {"s3kab3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spindash"}, + {"s3kab4", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spindash"}, + {"s3kab5", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spindash"}, + {"s3kab6", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spindash"}, + {"s3kab7", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spindash"}, + {"s3kab8", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spindash"}, + {"s3kab9", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spindash"}, + {"s3kaba", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spindash"}, + {"s3kabb", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spindash"}, + {"s3kabc", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spindash"}, + {"s3kabd", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spindash"}, + {"s3kabe", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spindash"}, + {"s3kabf", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spindash"}, + {"s3kac", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Got Continue"}, + {"s3kad", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "GO!"}, + {"s3kae", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Pinball flipper"}, + {"s3kaf", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "To Special Stage"}, + {"s3kb0", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Score"}, + {"s3kb1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spring"}, + {"s3kb2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Failure"}, + {"s3kb3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Warp"}, + {"s3kb4", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Explosion"}, + {"s3kb5", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Clink"}, + {"s3kb6", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spin launch"}, + {"s3kb7", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Tumbler"}, + {"s3kb8", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spinning signpost"}, + {"s3kb9", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ring loss"}, + {"s3kba", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Flight"}, + {"s3kbb", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Tired flight"}, + {"s3kbcs", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s3kbcl", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // long version of previous + {"s3kbds", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Flying fortress"}, + {"s3kbdl", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Flying fortress"}, // ditto + {"s3kbes", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Flying"}, + {"s3kbel", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Flying"}, // ditto + {"s3kbfs", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Turbine"}, + {"s3kbfl", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Turbine"}, // ditto + {"s3kc0s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Turbine"}, + {"s3kc0l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Turbine"}, // ditto + {"s3kc1s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Fan"}, + {"s3kc1l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Fan"}, // ditto + {"s3kc2s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Flamethrower"}, + {"s3kc2l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Flamethrower"}, // ditto + {"s3kc3s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Levitation"}, + {"s3kc3l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Levitation"}, // ditto + {"s3kc4s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Firing laser"}, + {"s3kc4l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Firing laser"}, // ditto + {"s3kc5s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Revving up"}, + {"s3kc5l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Revving up"}, // ditto + {"s3kc6s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Orbiting"}, + {"s3kc6l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Orbiting"}, // ditto + {"s3kc7s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Aiming"}, + {"s3kc7l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Aiming"}, // ditto + {"s3kc8s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Sliding"}, + {"s3kc8l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Sliding"}, // ditto + {"s3kc9s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Swinging"}, + {"s3kc9l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Swinging"}, // ditto + {"s3kcas", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Energy"}, + {"s3kcal", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Energy"}, // ditto + {"s3kcbs", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ominous rumbling"}, + {"s3kcbl", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ominous rumbling"}, // ditto + {"s3kccs", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bursting"}, + {"s3kccl", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bursting"}, // ditto + {"s3kcds", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ominous rumbling"}, + {"s3kcdl", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ominous rumbling"}, // ditto + {"s3kces", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Wind tunnel"}, + {"s3kcel", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Dust devil"}, // ditto + {"s3kcfs", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s3kcfl", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // ditto + {"s3kd0s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Rising"}, + {"s3kd0l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Rising"}, // ditto + {"s3kd1s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s3kd1l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // ditto + {"s3kd2s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Turning"}, + {"s3kd2l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Moving chain"}, // ditto + {"s3kd3s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Digging"}, + {"s3kd3l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Digging"}, // ditto + {"s3kd4s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Engine"}, + {"s3kd4l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Engine"}, // ditto + {"s3kd5s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Falling lava"}, + {"s3kd5l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Falling lava"}, // ditto + {"s3kd6s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"s3kd6l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // ditto + {"s3kd7s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Movement"}, + {"s3kd7l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Movement"}, // ditto + {"s3kd8s", false, 64, SF_X2AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Acceleration"}, // Sharp Spin (maybe use the long/L version?) + {"s3kd8l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Acceleration"}, // ditto + {"s3kd9s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Magnetism"}, + {"s3kd9l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Magnetism"}, // ditto + {"s3kdas", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Click"}, + {"s3kdal", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Click"}, // ditto + {"s3kdbs", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Running on water"}, + {"s3kdbl", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Running on water"}, // ditto // 3D Blast sounds (the "missing" ones are direct copies of S3K's, no minor differences what-so-ever) - {"3db06", false, 96, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Collection"}, - {"3db09", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Peep"}, - {"3db14", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Chirp"}, - {"3db16", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"3db06", false, 96, SF_X4AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Collection"}, + {"3db09", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Peep"}, + {"3db14", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Chirp"}, + {"3db16", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // Sonic CD sounds - {"cdfm00", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Skid"}, - {"cdfm01", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm02", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Jump"}, - {"cdfm03", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Dying"}, - {"cdfm04", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ring loss"}, - {"cdfm05", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Sparkle"}, - {"cdfm06", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Pop"}, - {"cdfm07", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Shield"}, - {"cdfm08", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spring"}, - {"cdfm09", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm10", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm11", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm12", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm13", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm14", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm15", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm16", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm17", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm18", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm19", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm20", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm21", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm22", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm23", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm24", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm25", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm26", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm27", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm28", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm29", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bubble gasp"}, - {"cdfm30", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Starpost"}, - {"cdfm31", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Warp"}, - {"cdfm32", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm33", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm34", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm35", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm36", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm37", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm38", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drowning"}, - {"cdfm39", false, 128, 8, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm40", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Power up"}, - {"cdfm41", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm42", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm43", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm44", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Extra time"}, - {"cdfm45", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm46", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm47", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm48", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm49", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Aquaphobia"}, - {"cdfm50", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm51", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm52", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm53", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm54", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm55", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm56", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Warp"}, - {"cdfm57", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm58", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm59", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm60", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm61", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm62", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Speed boost"}, - {"cdfm63", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm64", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm65", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm66", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm67", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm68", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm69", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm70", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm71", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm72", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm73", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm74", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm75", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm76", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm77", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm78", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdfm79", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdpcm0", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Future."}, - {"cdpcm1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Past."}, - {"cdpcm2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "All right!"}, - {"cdpcm3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "I'm outta here..."}, - {"cdpcm4", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Yes!"}, - {"cdpcm5", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Yeah!"}, - {"cdpcm6", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Giggles"}, - {"cdpcm7", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Eep!"}, - {"cdpcm8", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"cdpcm9", false, 96, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Bumper"}, + {"cdfm00", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Skid"}, + {"cdfm01", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm02", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Jump"}, + {"cdfm03", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Dying"}, + {"cdfm04", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ring loss"}, + {"cdfm05", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Sparkle"}, + {"cdfm06", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Pop"}, + {"cdfm07", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Shield"}, + {"cdfm08", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spring"}, + {"cdfm09", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm10", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm11", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm12", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm13", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm14", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm15", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm16", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm17", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm18", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm19", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm20", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm21", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm22", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm23", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm24", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm25", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm26", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm27", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm28", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm29", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bubble gasp"}, + {"cdfm30", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Starpost"}, + {"cdfm31", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Warp"}, + {"cdfm32", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm33", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm34", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm35", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm36", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm37", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm38", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drowning"}, + {"cdfm39", false, 128, SF_X4AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm40", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Power up"}, + {"cdfm41", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm42", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm43", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm44", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Extra time"}, + {"cdfm45", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm46", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm47", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm48", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm49", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Aquaphobia"}, + {"cdfm50", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm51", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm52", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm53", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm54", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm55", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm56", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Warp"}, + {"cdfm57", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm58", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm59", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm60", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm61", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm62", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Speed boost"}, + {"cdfm63", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm64", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm65", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm66", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm67", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm68", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm69", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm70", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm71", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm72", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm73", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm74", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm75", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm76", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm77", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm78", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdfm79", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdpcm0", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Future."}, + {"cdpcm1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Past."}, + {"cdpcm2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "All right!"}, + {"cdpcm3", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "I'm outta here..."}, + {"cdpcm4", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Yes!"}, + {"cdpcm5", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Yeah!"}, + {"cdpcm6", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Giggles"}, + {"cdpcm7", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Eep!"}, + {"cdpcm8", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"cdpcm9", false, 96, SF_X4AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Bumper"}, // Knuckles Chaotix sounds - {"kc2a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc2b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc2c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc2d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc2e", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc2f", false, 96, 8, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc30", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc31", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc32", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc33", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc34", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc35", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc36", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc37", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc38", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc39", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc3a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc3b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc3c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc3d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc3e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc3f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc40", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc41", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc42", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Confirm"}, - {"kc43", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc44", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc45", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc46", false, 96, 8, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc47", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc48", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Select"}, - {"kc49", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc4a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc4b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc4c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Pop-shot"}, - {"kc4d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Power up"}, - {"kc4e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc4f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc50", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc51", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc52", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc53", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc54", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc55", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc56", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc57", false, 128, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Sheer terror"}, - {"kc58", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc59", false, 128, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Shrink"}, - {"kc5a", false, 128, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Grow"}, - {"kc5b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc5c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc5d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc5e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc5f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc60", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc61", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc62", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc63", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc64", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Terrifying rumble"}, - {"kc65", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Power down"}, - {"kc66", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc67", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc68", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc69", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc6b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ascending"}, - {"kc6c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc6d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"kc6e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc2a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc2b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc2c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc2d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc2e", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc2f", false, 96, SF_X4AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc30", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc31", false, 64, SF_X2AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc32", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc33", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc34", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc35", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc36", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc37", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc38", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc39", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc3a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc3b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc3c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc3d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc3e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc3f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc40", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc41", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc42", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Confirm"}, + {"kc43", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc44", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc45", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc46", false, 96, SF_X4AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc47", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc48", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Select"}, + {"kc49", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc4a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc4b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc4c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Pop-shot"}, + {"kc4d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Power up"}, + {"kc4e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc4f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc50", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc51", false, 64, SF_X2AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc52", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc53", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc54", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc55", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc56", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc57", false, 128, SF_X4AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Sheer terror"}, + {"kc58", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc59", false, 128, SF_X4AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Shrink"}, + {"kc5a", false, 128, SF_X4AWAYSOUND, -1, NULL, 0, -1, -1, LUMPERROR, "Grow"}, + {"kc5b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc5c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc5d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc5e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc5f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc60", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc61", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc62", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc63", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc64", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Terrifying rumble"}, + {"kc65", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Power down"}, + {"kc66", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc67", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc68", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc69", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc6b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ascending"}, + {"kc6c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc6d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"kc6e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // skin sounds free slots to add sounds at run time (Boris HACK!!!) // initialized to NULL diff --git a/src/sounds.h b/src/sounds.h index 2dd37953c..102881e99 100644 --- a/src/sounds.h +++ b/src/sounds.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/st_stuff.c b/src/st_stuff.c index af14118e3..dcab2bb9c 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -43,6 +43,10 @@ #endif #include "lua_hud.h" +#include "lua_hudlib_drawlist.h" +#include "lua_hook.h" + +#include "r_fps.h" UINT16 objectsdrawn = 0; @@ -104,6 +108,9 @@ static patch_t *sneakers; static patch_t *gravboots; static patch_t *nonicon; static patch_t *nonicon2; +static patch_t *nightopianhelper; +static patch_t *linkfreeze; +static patch_t *superparaloop; static patch_t *bluestat; static patch_t *byelstat; static patch_t *orngstat; @@ -160,6 +167,9 @@ hudinfo_t hudinfo[NUMHUDITEMS] = { 288, 176, V_SNAPTORIGHT|V_SNAPTOBOTTOM}, // HUD_POWERUPS }; +static huddrawlist_h luahuddrawlist_game[2]; +static huddrawlist_h luahuddrawlist_titlecard; + // // STATUS BAR CODE // @@ -306,6 +316,10 @@ void ST_LoadGraphics(void) nonicon2 = W_CachePatchName("NONICON2", PU_HUDGFX); // NiGHTS HUD things + nightopianhelper = W_CachePatchName("NHLPICON", PU_HUDGFX); + linkfreeze = W_CachePatchName("NLFZICON", PU_HUDGFX); + superparaloop = W_CachePatchName("NSPRICON", PU_HUDGFX); + bluestat = W_CachePatchName("BLUESTAT", PU_HUDGFX); byelstat = W_CachePatchName("BYELSTAT", PU_HUDGFX); orngstat = W_CachePatchName("ORNGSTAT", PU_HUDGFX); @@ -419,6 +433,10 @@ void ST_Init(void) return; ST_LoadGraphics(); + + luahuddrawlist_game[0] = LUA_HUD_CreateDrawList(); + luahuddrawlist_game[1] = LUA_HUD_CreateDrawList(); + luahuddrawlist_titlecard = LUA_HUD_CreateDrawList(); } // change the status bar too, when pressing F12 while viewing a demo. @@ -1175,7 +1193,17 @@ static void ST_drawInput(void) break; case CS_SIMPLE: - V_DrawThinString(x, y, hudinfo[HUD_LIVES].f, "SIMPLE"); + V_DrawThinString(x, y, hudinfo[HUD_LIVES].f, "AUTOMATIC"); + y -= 8; + break; + + case CS_STANDARD: + V_DrawThinString(x, y, hudinfo[HUD_LIVES].f, "MANUAL"); + y -= 8; + break; + + case CS_LEGACY: + V_DrawThinString(x, y, hudinfo[HUD_LIVES].f, "STRAFE"); y -= 8; break; @@ -1391,7 +1419,12 @@ void ST_drawTitleCard(void) lt_lasttic = lt_ticker; luahook: - LUAh_TitleCardHUD(stplyr); + //if (renderisnewtic) + { + LUA_HUD_ClearDrawList(luahuddrawlist_titlecard); + LUA_HUDHOOK(titlecard, luahuddrawlist_titlecard); + } + LUA_HUD_DrawList(luahuddrawlist_titlecard); } // @@ -1422,6 +1455,21 @@ void ST_drawWipeTitleCard(void) } } +#define ICONSEP (16+4) // matches weapon rings HUD + +static INT32 ST_powerupHUDoffset(UINT16 timer) +{ + if (timer > 7) + return ICONSEP; + else + { + UINT8 a = ICONSEP, b = 7-timer; + while (b--) + a = 2*a/3; + return a; + } +} + static void ST_drawPowerupHUD(void) { patch_t *p = NULL; @@ -1429,7 +1477,6 @@ static void ST_drawPowerupHUD(void) INT32 offs = hudinfo[HUD_POWERUPS].x; const UINT8 q = ((splitscreen && stplyr == &players[secondarydisplayplayer]) ? 1 : 0); static INT32 flagoffs[2] = {0, 0}, shieldoffs[2] = {0, 0}, finishoffs[2] = {0, 0}; -#define ICONSEP (16+4) // matches weapon rings HUD if (F_GetPromptHideHud(hudinfo[HUD_POWERUPS].y)) return; @@ -1541,15 +1588,7 @@ static void ST_drawPowerupHUD(void) DRAWTIMERICON(invincibility, invulntime) } - if (invulntime > 7) - offs -= ICONSEP; - else - { - UINT8 a = ICONSEP, b = 7-invulntime; - while (b--) - a = 2*a/3; - offs -= a; - } + offs -= ST_powerupHUDoffset(invulntime); // Super Sneakers if (stplyr->powers[pw_sneakers] > 3*TICRATE || (stplyr->powers[pw_sneakers] && leveltime & 1)) @@ -1557,15 +1596,7 @@ static void ST_drawPowerupHUD(void) DRAWTIMERICON(sneakers, stplyr->powers[pw_sneakers]) } - if (stplyr->powers[pw_sneakers] > 7) - offs -= ICONSEP; - else - { - UINT8 a = ICONSEP, b = 7-stplyr->powers[pw_sneakers]; - while (b--) - a = 2*a/3; - offs -= a; - } + offs -= ST_powerupHUDoffset(stplyr->powers[pw_sneakers]); // Gravity Boots if (stplyr->powers[pw_gravityboots] > 3*TICRATE || (stplyr->powers[pw_gravityboots] && leveltime & 1)) @@ -1573,6 +1604,36 @@ static void ST_drawPowerupHUD(void) DRAWTIMERICON(gravboots, stplyr->powers[pw_gravityboots]) } + offs -= ST_powerupHUDoffset(stplyr->powers[pw_gravityboots]); + +// -------------------- +// NiGHTS timer-based powerups +// -------------------- + + // Nightopian Helper + if (stplyr->powers[pw_nights_helper] > 3*TICRATE || (stplyr->powers[pw_nights_helper] && leveltime & 1)) + { + DRAWTIMERICON(nightopianhelper, stplyr->powers[pw_nights_helper]) + } + + offs -= ST_powerupHUDoffset(stplyr->powers[pw_nights_helper]); + + // Link Freeze + if (stplyr->powers[pw_nights_linkfreeze] > 3*TICRATE || (stplyr->powers[pw_nights_linkfreeze] && leveltime & 1)) + { + DRAWTIMERICON(linkfreeze, stplyr->powers[pw_nights_linkfreeze]) + } + + offs -= ST_powerupHUDoffset(stplyr->powers[pw_nights_linkfreeze]); + + // Super Paraloop + if (stplyr->powers[pw_nights_superloop] > 3*TICRATE || (stplyr->powers[pw_nights_superloop] && leveltime & 1)) + { + DRAWTIMERICON(superparaloop, stplyr->powers[pw_nights_superloop]) + } + + //offs -= ST_powerupHUDoffset(stplyr->powers[pw_nights_superloop]); + #undef DRAWTIMERICON #undef ICONSEP } @@ -1671,7 +1732,7 @@ static void ST_drawNightsRecords(void) ST_DrawNightsOverlayNum((BASEVIDWIDTH/2 + 56)<lastmarescore, nightsnum, SKINCOLOR_AZURE); // If new record, say so! - if (!(netgame || multiplayer) && G_GetBestNightsScore(gamemap, stplyr->lastmare + 1) <= stplyr->lastmarescore) + if (!(netgame || multiplayer) && G_GetBestNightsScore(gamemap, stplyr->lastmare + 1, clientGamedata) <= stplyr->lastmarescore) { if (stplyr->texttimer & 16) V_DrawCenteredString(BASEVIDWIDTH/2, 184, V_YELLOWMAP|aflag, "* NEW RECORD *"); @@ -2036,9 +2097,8 @@ static void ST_drawNiGHTSHUD(void) else numbersize = 48/2; - if ((oldspecialstage && leveltime & 2) - && (stplyr->mo->eflags & (MFE_TOUCHWATER|MFE_UNDERWATER)) - && !(stplyr->powers[pw_shield] & SH_PROTECTWATER)) + if ((oldspecialstage && leveltime & 2) && + (stplyr->mo->eflags & (MFE_TOUCHWATER|MFE_UNDERWATER) && !(stplyr->powers[pw_shield] & ((stplyr->mo->eflags & MFE_TOUCHLAVA) ? SH_PROTECTFIRE : SH_PROTECTWATER)))) col = SKINCOLOR_ORANGE; ST_DrawNightsOverlayNum((160 + numbersize)<ammoremoval); V_DrawString(offset + 8 + stplyr->ammoremovalweapon * 20, y, - V_REDMAP|V_SNAPTOBOTTOM, penaltystr); + V_REDMAP|V_SNAPTOBOTTOM|V_PERPLAYER, penaltystr); } } @@ -2291,7 +2351,7 @@ static void ST_drawTextHUD(void) for (i = 0; i < MAXPLAYERS; i++) { - if (!playeringame[i] || players[i].spectator) + if (!playeringame[i] || players[i].spectator || players[i].bot) continue; if (players[i].lives <= 0) continue; @@ -2516,11 +2576,11 @@ static void ST_doHuntIconsAndSound(void) interval = newinterval; } - if (!(P_AutoPause() || paused) && interval > 0 && leveltime && leveltime % interval == 0) + if (!(P_AutoPause() || paused) && interval > 0 && leveltime && leveltime % interval == 0 && renderisnewtic) S_StartSound(NULL, sfx_emfind); } -static void ST_doItemFinderIconsAndSound(void) +static boolean ST_doItemFinderIconsAndSound(void) { INT32 emblems[16]; thinker_t *th; @@ -2531,6 +2591,12 @@ static void ST_doItemFinderIconsAndSound(void) INT32 interval = 0, newinterval = 0; INT32 soffset; + if (!(cv_itemfinder.value && M_SecretUnlocked(SECRET_ITEMFINDER, clientGamedata))) + { + // Not unlocked, or not enabled. Use emerald hunt radar. + return false; + } + for (i = 0; i < numemblems; ++i) { if (emblemlocations[i].type > ET_SKIN || emblemlocations[i].level != gamemap) @@ -2538,15 +2604,21 @@ static void ST_doItemFinderIconsAndSound(void) emblems[stemblems++] = i; - if (!emblemlocations[i].collected) + if (!P_EmblemWasCollected(i) && P_CanPickupEmblem(stplyr, i)) + { ++stunfound; + } if (stemblems >= 16) break; } + // Found all/none exist? Don't waste our time if (!stunfound) - return; + { + // Allow emerald hunt radar to function after they're all collected. + return false; + } // Scan thinkers to find emblem mobj with these ids for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next) @@ -2566,6 +2638,9 @@ static void ST_doItemFinderIconsAndSound(void) { if (mo2->health == emblems[i] + 1) { + if (P_EmblemWasCollected(emblems[i]) || !P_CanPickupEmblem(stplyr, emblems[i])) + break; + soffset = (i * 20) - ((stemblems - 1) * 10); newinterval = ST_drawEmeraldHuntIcon(mo2, itemhoming, soffset); @@ -2578,8 +2653,10 @@ static void ST_doItemFinderIconsAndSound(void) } - if (!(P_AutoPause() || paused) && interval > 0 && leveltime && leveltime % interval == 0) + if (!(P_AutoPause() || paused) && interval > 0 && leveltime && leveltime % interval == 0 && renderisnewtic) S_StartSound(NULL, sfx_emfind); + + return true; } // @@ -2698,9 +2775,7 @@ static void ST_overlayDrawer(void) ST_drawRaceHUD(); // Emerald Hunt Indicators - if (cv_itemfinder.value && M_SecretUnlocked(SECRET_ITEMFINDER)) - ST_doItemFinderIconsAndSound(); - else + if (!ST_doItemFinderIconsAndSound()) ST_doHuntIconsAndSound(); if(!P_IsLocalPlayer(stplyr)) @@ -2715,24 +2790,30 @@ static void ST_overlayDrawer(void) } // This is where we draw all the fun cheese if you have the chasecam off! - if (!(maptol & TOL_NIGHTS)) + if ((stplyr == &players[displayplayer] && !camera.chase) + || ((splitscreen && stplyr == &players[secondarydisplayplayer]) && !camera2.chase)) { - if ((stplyr == &players[displayplayer] && !camera.chase) - || ((splitscreen && stplyr == &players[secondarydisplayplayer]) && !camera2.chase)) - { - ST_drawFirstPersonHUD(); - if (cv_powerupdisplay.value) - ST_drawPowerupHUD(); // same as it ever was... - } - else if (cv_powerupdisplay.value == 2) + ST_drawFirstPersonHUD(); + if (cv_powerupdisplay.value) ST_drawPowerupHUD(); // same as it ever was... } + else if (cv_powerupdisplay.value == 2) + ST_drawPowerupHUD(); // same as it ever was... + } else if (!(netgame || multiplayer) && cv_powerupdisplay.value == 2) ST_drawPowerupHUD(); // same as it ever was... if (!(netgame || multiplayer) || !hu_showscores) - LUAh_GameHUD(stplyr); + { + INT32 hooklistindex = splitscreen && stplyr == &players[secondarydisplayplayer] ? 1 : 0; + if (renderisnewtic) + { + LUA_HUD_ClearDrawList(luahuddrawlist_game[hooklistindex]); + LUA_HUDHOOK(game, luahuddrawlist_game[hooklistindex]); + } + LUA_HUD_DrawList(luahuddrawlist_game[hooklistindex]); + } // draw level title Tails if (stagetitle && (!WipeInAction) && (!WipeStageTitle)) diff --git a/src/st_stuff.h b/src/st_stuff.h index b1ea2942d..68ac900f7 100644 --- a/src/st_stuff.h +++ b/src/st_stuff.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/strcasestr.c b/src/strcasestr.c index 1cbee286a..2796f11d5 100644 --- a/src/strcasestr.c +++ b/src/strcasestr.c @@ -2,7 +2,7 @@ strcasestr -- case insensitive substring searching function. */ /* -Copyright 2019-2021 James R. +Copyright 2019-2023 James R. All rights reserved. Redistribution and use in source forms, with or without modification, is @@ -22,6 +22,16 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#ifdef _MSC_VER +#include +#include +#include + +#ifndef strncasecmp +#define strncasecmp _strnicmp +#endif + +#endif static inline int trycmp (char **pp, char *cp, diff --git a/src/string.c b/src/string.c index f32025612..dd3080a97 100644 --- a/src/string.c +++ b/src/string.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 2006 by Graue. -// Copyright (C) 2006-2021 by Sonic Team Junior. +// Copyright (C) 2006-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -52,3 +52,19 @@ size_t strlcpy(char *dst, const char *src, size_t siz) #endif #include "strcasestr.c" + +int startswith(const char *path, const char *tag) +{ + return !strncmp(path, tag, strlen(tag)); +} + +int endswith(const char *base, const char *tag) +{ + const size_t base_length = strlen(base); + const size_t tag_length = strlen(tag); + + if (tag_length > base_length) + return false; + + return !memcmp(&base[base_length - tag_length], tag, tag_length); +} diff --git a/src/tables.c b/src/tables.c index 9263f42d3..315fe1d7a 100644 --- a/src/tables.c +++ b/src/tables.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -407,9 +407,9 @@ void FV3_Rotate(vector3_t *rotVec, const vector3_t *axisVec, const angle_t angle rotVec->z = az+dz+ez; } -void FM_Rotate(matrix_t *dest, angle_t angle, fixed_t x, fixed_t y, fixed_t z) -{ #define M(row,col) dest->m[row * 4 + col] +matrix_t *FM_Rotate(matrix_t *dest, angle_t angle, fixed_t x, fixed_t y, fixed_t z) +{ const fixed_t sinA = FINESINE(angle>>ANGLETOFINESHIFT); const fixed_t cosA = FINECOSINE(angle>>ANGLETOFINESHIFT); const fixed_t invCosA = FRACUNIT - cosA; @@ -459,5 +459,84 @@ void FM_Rotate(matrix_t *dest, angle_t angle, fixed_t x, fixed_t y, fixed_t z) M(1, 3) = 0; M(2, 3) = 0; M(3, 3) = FRACUNIT; -#undef M + + return dest; } + + +matrix_t *FM_RotateX(matrix_t *dest, angle_t rad) +{ + const angle_t fa = rad>>ANGLETOFINESHIFT; + const fixed_t cosrad = FINECOSINE(fa), sinrad = FINESINE(fa); + + M(0, 0) = FRACUNIT; + M(0, 1) = 0; + M(0, 2) = 0; + M(0, 3) = 0; + M(1, 0) = 0; + M(1, 1) = cosrad; + M(1, 2) = sinrad; + M(1, 3) = 0; + M(2, 0) = 0; + M(2, 1) = -sinrad; + M(2, 2) = cosrad; + M(2, 3) = 0; + M(3, 0) = 0; + M(3, 1) = 0; + M(3, 2) = 0; + M(3, 3) = FRACUNIT; + + return dest; +} + +matrix_t *FM_RotateY(matrix_t *dest, angle_t rad) +{ + const angle_t fa = rad>>ANGLETOFINESHIFT; + const fixed_t cosrad = FINECOSINE(fa), sinrad = FINESINE(fa); + + M(0, 0) = cosrad; + M(0, 1) = 0; + M(0, 2) = -sinrad; + M(0, 3) = 0; + M(1, 0) = 0; + M(1, 1) = FRACUNIT; + M(1, 2) = 0; + M(1, 3) = 0; + M(2, 0) = sinrad; + M(2, 1) = 0; + M(2, 2) = cosrad; + M(2, 3) = 0; + M(3, 0) = 0; + M(3, 1) = 0; + M(3, 2) = 0; + M(3, 3) = FRACUNIT; + + return dest; +} + +matrix_t *FM_RotateZ(matrix_t *dest, angle_t rad) +{ + const angle_t fa = rad>>ANGLETOFINESHIFT; + const fixed_t cosrad = FINECOSINE(fa), sinrad = FINESINE(fa); + + M(0, 0) = cosrad; + M(0, 1) = sinrad; + M(0, 2) = 0; + M(0, 3) = 0; + M(1, 0) = -sinrad; + M(1, 1) = cosrad; + M(1, 2) = 0; + M(1, 3) = 0; + M(2, 0) = 0; + M(2, 1) = 0; + M(2, 2) = FRACUNIT; + M(2, 3) = 0; + M(3, 0) = 0; + M(3, 1) = 0; + M(3, 2) = 0; + M(3, 3) = FRACUNIT; + + return dest; +} + +#undef M diff --git a/src/tables.h b/src/tables.h index baa3adf36..2736f03e8 100644 --- a/src/tables.h +++ b/src/tables.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -107,7 +107,10 @@ boolean FV3_InsidePolygon(const vector3_t *vIntersection, const vector3_t *Poly, boolean FV3_IntersectedPolygon(const vector3_t *vPoly, const vector3_t *vLine, const INT32 vertexCount, vector3_t *collisionPoint); void FV3_Rotate(vector3_t *rotVec, const vector3_t *axisVec, const angle_t angle); /// Fixed Point Matrix functions -void FM_Rotate(matrix_t *dest, angle_t angle, fixed_t x, fixed_t y, fixed_t z); +matrix_t *FM_Rotate(matrix_t *dest, angle_t angle, fixed_t x, fixed_t y, fixed_t z); +matrix_t *FM_RotateX(matrix_t *dest, angle_t rad); +matrix_t *FM_RotateY(matrix_t *dest, angle_t rad); +matrix_t *FM_RotateZ(matrix_t *dest, angle_t rad); // The table values in tables.c are calculated with this many fractional bits. #define FINE_FRACBITS 16 diff --git a/src/taglist.c b/src/taglist.c index ad1b9dc4b..e4e385b9e 100644 --- a/src/taglist.c +++ b/src/taglist.c @@ -1,8 +1,8 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. -// Copyright (C) 2020-2021 by Nev3r. +// Copyright (C) 1999-2023 by Sonic Team Junior. +// Copyright (C) 2020-2023 by Nev3r. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -14,6 +14,7 @@ #include "taglist.h" #include "z_zone.h" #include "r_data.h" +#include "p_spec.h" // Bit array of whether a tag exists for sectors/lines/things. bitarray_t tags_available[BIT_ARRAY_SIZE (MAXTAGS)]; @@ -37,6 +38,25 @@ void Tag_Add (taglist_t* list, const mtag_t tag) list->tags[list->count++] = tag; } +/// Removes a tag from a given element's taglist. +/// \warning This does not rebuild the global taggroups, which are used for iteration. +void Tag_Remove(taglist_t* list, const mtag_t tag) +{ + UINT16 i; + + for (i = 0; i < list->count; i++) + { + if (list->tags[i] != tag) + continue; + + for (; i+1 < list->count; i++) + list->tags[i] = list->tags[i+1]; + + list->tags = Z_Realloc(list->tags, (list->count - 1) * sizeof(mtag_t), PU_LEVEL, NULL); + return; + } +} + /// Sets the first tag entry in a taglist. /// Replicates the old way of accessing element->tag. void Tag_FSet (taglist_t* list, const mtag_t tag) @@ -191,6 +211,38 @@ void Taggroup_Add (taggroup_t *garray[], const mtag_t tag, size_t id) group->elements[i] = id; } +static void Taggroup_Add_Init(taggroup_t *garray[], const mtag_t tag, size_t id) +{ + taggroup_t *group; + + if (tag == MTAG_GLOBAL) + return; + + group = garray[(UINT16)tag]; + + if (! in_bit_array(tags_available, tag)) + { + num_tags++; + set_bit_array(tags_available, tag); + } + + // Create group if empty. + if (!group) + group = garray[(UINT16)tag] = Z_Calloc(sizeof(taggroup_t), PU_LEVEL, NULL); + else if (group->elements[group->count - 1] == id) + return; // Don't add duplicates + + group->count++; + + if (group->count > group->capacity) + { + group->capacity = 2 * group->count; + group->elements = Z_Realloc(group->elements, group->capacity * sizeof(size_t), PU_LEVEL, NULL); + } + + group->elements[group->count - 1] = id; +} + static size_t total_elements_with_tag (const mtag_t tag) { return @@ -250,17 +302,17 @@ void Taggroup_Remove (taggroup_t *garray[], const mtag_t tag, size_t id) static void Taglist_AddToSectors (const mtag_t tag, const size_t itemid) { - Taggroup_Add(tags_sectors, tag, itemid); + Taggroup_Add_Init(tags_sectors, tag, itemid); } static void Taglist_AddToLines (const mtag_t tag, const size_t itemid) { - Taggroup_Add(tags_lines, tag, itemid); + Taggroup_Add_Init(tags_lines, tag, itemid); } static void Taglist_AddToMapthings (const mtag_t tag, const size_t itemid) { - Taggroup_Add(tags_mapthings, tag, itemid); + Taggroup_Add_Init(tags_mapthings, tag, itemid); } /// After all taglists have been built for each element (sectors, lines, things), @@ -376,6 +428,22 @@ INT32 P_FindSpecialLineFromTag(INT16 special, INT16 tag, INT32 start) // Ingame list manipulation. +/// Adds the tag to the given sector, and updates the global taggroups. +void Tag_SectorAdd (const size_t id, const mtag_t tag) +{ + sector_t* sec = §ors[id]; + Tag_Add(&sec->tags, tag); + Taggroup_Add(tags_sectors, tag, id); +} + +/// Removes the tag from the given sector, and updates the global taggroups. +void Tag_SectorRemove (const size_t id, const mtag_t tag) +{ + sector_t* sec = §ors[id]; + Tag_Remove(&sec->tags, tag); + Taggroup_Remove(tags_sectors, tag, id); +} + /// Changes the first tag for a given sector, and updates the global taggroups. void Tag_SectorFSet (const size_t id, const mtag_t tag) { @@ -387,4 +455,22 @@ void Tag_SectorFSet (const size_t id, const mtag_t tag) Taggroup_Remove(tags_sectors, curtag, id); Taggroup_Add(tags_sectors, tag, id); Tag_FSet(&sec->tags, tag); + + // Sectors with linedef trigger effects need to have their trigger tag updated too + // This is a bit of a hack... + if (!udmf && GETSECSPECIAL(sec->special, 2) >= 1 && GETSECSPECIAL(sec->special, 2) <= 7) + sec->triggertag = tag; +} + +mtag_t Tag_NextUnused(mtag_t start) +{ + while ((UINT16)start < MAXTAGS) + { + if (!in_bit_array(tags_available, (UINT16)start)) + return start; + + start++; + } + + return (mtag_t)MAXTAGS; } diff --git a/src/taglist.h b/src/taglist.h index d045eb827..d42a48f05 100644 --- a/src/taglist.h +++ b/src/taglist.h @@ -1,8 +1,8 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. -// Copyright (C) 2020-2021 by Nev3r. +// Copyright (C) 1999-2023 by Sonic Team Junior. +// Copyright (C) 2020-2023 by Nev3r. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -28,12 +28,15 @@ typedef struct } taglist_t; void Tag_Add (taglist_t* list, const mtag_t tag); +void Tag_Remove (taglist_t* list, const mtag_t tag); void Tag_FSet (taglist_t* list, const mtag_t tag); mtag_t Tag_FGet (const taglist_t* list); boolean Tag_Find (const taglist_t* list, const mtag_t tag); boolean Tag_Share (const taglist_t* list1, const taglist_t* list2); boolean Tag_Compare (const taglist_t* list1, const taglist_t* list2); +void Tag_SectorAdd (const size_t id, const mtag_t tag); +void Tag_SectorRemove (const size_t id, const mtag_t tag); void Tag_SectorFSet (const size_t id, const mtag_t tag); /// Taggroup list. It is essentially just an element id list. @@ -41,10 +44,13 @@ typedef struct { size_t *elements; size_t count; + size_t capacity; } taggroup_t; extern bitarray_t tags_available[]; +extern mtag_t Tag_NextUnused(mtag_t start); + extern size_t num_tags; extern taggroup_t* tags_sectors[]; diff --git a/src/tmap.nas b/src/tmap.nas index 5bf28359e..85091cbd5 100644 --- a/src/tmap.nas +++ b/src/tmap.nas @@ -1,7 +1,7 @@ ;; SONIC ROBO BLAST 2 ;;----------------------------------------------------------------------------- ;; Copyright (C) 1998-2000 by DooM Legacy Team. -;; Copyright (C) 1999-2021 by Sonic Team Junior. +;; Copyright (C) 1999-2023 by Sonic Team Junior. ;; ;; This program is free software distributed under the ;; terms of the GNU General Public License, version 2. diff --git a/src/tmap.s b/src/tmap.s index 62dcf85dc..d98d82e25 100644 --- a/src/tmap.s +++ b/src/tmap.s @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/tmap_asm.s b/src/tmap_asm.s index b5a0a51e9..d8967178c 100644 --- a/src/tmap_asm.s +++ b/src/tmap_asm.s @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/tmap_mmx.nas b/src/tmap_mmx.nas index 8b6ef91a6..a45667e23 100644 --- a/src/tmap_mmx.nas +++ b/src/tmap_mmx.nas @@ -1,7 +1,7 @@ ;; SONIC ROBO BLAST 2 ;;----------------------------------------------------------------------------- ;; Copyright (C) 1998-2000 by DOSDOOM. -;; Copyright (C) 2010-2021 by Sonic Team Junior. +;; Copyright (C) 2010-2023 by Sonic Team Junior. ;; ;; This program is free software distributed under the ;; terms of the GNU General Public License, version 2. diff --git a/src/tmap_vc.nas b/src/tmap_vc.nas index b6ee26e6b..c85cf7003 100644 --- a/src/tmap_vc.nas +++ b/src/tmap_vc.nas @@ -1,7 +1,7 @@ ;; SONIC ROBO BLAST 2 ;;----------------------------------------------------------------------------- ;; Copyright (C) 1998-2000 by DooM Legacy Team. -;; Copyright (C) 1999-2021 by Sonic Team Junior. +;; Copyright (C) 1999-2023 by Sonic Team Junior. ;; ;; This program is free software distributed under the ;; terms of the GNU General Public License, version 2. diff --git a/src/v_video.c b/src/v_video.c index de05df2d5..461a5e3bc 100644 --- a/src/v_video.c +++ b/src/v_video.c @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -511,7 +511,8 @@ static inline UINT8 transmappedpdraw(const UINT8 *dest, const UINT8 *source, fix void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 scrn, patch_t *patch, const UINT8 *colormap) { UINT8 (*patchdrawfunc)(const UINT8*, const UINT8*, fixed_t); - UINT32 alphalevel = 0; + UINT32 alphalevel = ((scrn & V_ALPHAMASK) >> V_ALPHASHIFT); + UINT32 blendmode = ((scrn & V_BLENDMASK) >> V_BLENDSHIFT); fixed_t col, ofs, colfrac, rowfrac, fdup, vdup; INT32 dupx, dupy; @@ -538,21 +539,21 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca patchdrawfunc = standardpdraw; v_translevel = NULL; - if ((alphalevel = ((scrn & V_ALPHAMASK) >> V_ALPHASHIFT))) + if (alphalevel || blendmode) { - if (alphalevel == 13) + if (alphalevel == 10) // V_HUDTRANSHALF alphalevel = hudminusalpha[st_translucency]; - else if (alphalevel == 14) + else if (alphalevel == 11) // V_HUDTRANS alphalevel = 10 - st_translucency; - else if (alphalevel == 15) + else if (alphalevel == 12) // V_HUDTRANSDOUBLE alphalevel = hudplusalpha[st_translucency]; if (alphalevel >= 10) return; // invis - if (alphalevel) + if (alphalevel || blendmode) { - v_translevel = R_GetTranslucencyTable(alphalevel); + v_translevel = R_GetBlendTable(blendmode+1, alphalevel); patchdrawfunc = translucentpdraw; } } @@ -591,10 +592,6 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca colfrac = FixedDiv(FRACUNIT, fdup); rowfrac = FixedDiv(FRACUNIT, vdup); - // So it turns out offsets aren't scaled in V_NOSCALESTART unless V_OFFSET is applied ...poo, that's terrible - // For now let's just at least give V_OFFSET the ability to support V_FLIP - // I'll probably make a better fix for 2.2 where I don't have to worry about breaking existing support for stuff - // -- Monster Iestyn 29/10/18 { fixed_t offsetx = 0, offsety = 0; @@ -605,15 +602,8 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca offsetx = FixedMul(patch->leftoffset<topoffset<> V_ALPHASHIFT); + UINT32 blendmode = ((scrn & V_BLENDMASK) >> V_BLENDSHIFT); // boolean flip = false; - fixed_t col, ofs, colfrac, rowfrac, fdup; + fixed_t col, ofs, colfrac, rowfrac, fdup, vdup; INT32 dupx, dupy; const column_t *column; UINT8 *desttop, *dest; @@ -830,7 +821,7 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_ //if (rendermode != render_soft && !con_startup) // Not this again if (rendermode == render_opengl) { - HWR_DrawCroppedPatch(patch,x,y,pscale,scrn,sx,sy,w,h); + HWR_DrawCroppedPatch(patch,x,y,pscale,vscale,scrn,colormap,sx,sy,w,h); return; } #endif @@ -838,50 +829,75 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_ patchdrawfunc = standardpdraw; v_translevel = NULL; - if ((alphalevel = ((scrn & V_ALPHAMASK) >> V_ALPHASHIFT))) + if (alphalevel || blendmode) { - if (alphalevel == 13) + if (alphalevel == 10) // V_HUDTRANSHALF alphalevel = hudminusalpha[st_translucency]; - else if (alphalevel == 14) + else if (alphalevel == 11) // V_HUDTRANS alphalevel = 10 - st_translucency; - else if (alphalevel == 15) + else if (alphalevel == 12) // V_HUDTRANSDOUBLE alphalevel = hudplusalpha[st_translucency]; if (alphalevel >= 10) return; // invis - if (alphalevel) + if (alphalevel || blendmode) { - v_translevel = R_GetTranslucencyTable(alphalevel); + v_translevel = R_GetBlendTable(blendmode+1, alphalevel); patchdrawfunc = translucentpdraw; } } - // only use one dup, to avoid stretching (har har) - dupx = dupy = (vid.dupx < vid.dupy ? vid.dupx : vid.dupy); - fdup = FixedMul(dupx<> V_SCALEPATCHSHIFT) + { + case 1: // V_NOSCALEPATCH + dupx = dupy = 1; + break; + case 2: // V_SMALLSCALEPATCH + dupx = vid.smalldupx; + dupy = vid.smalldupy; + break; + case 3: // V_MEDSCALEPATCH + dupx = vid.meddupx; + dupy = vid.meddupy; + break; + default: + break; + } + + // only use one dup, to avoid stretching (har har) + dupx = dupy = (dupx < dupy ? dupx : dupy); + fdup = vdup = FixedMul(dupx<topoffset<leftoffset<topoffset<>= 1; + vdup >>= 1; rowfrac <<= 1; y >>= 1; - sy >>= 1; - h >>= 1; #ifdef QUADS if (splitscreen > 1) // 3 or 4 players { fixed_t adjustx = ((scrn & V_NOSCALESTART) ? vid.height : BASEVIDHEIGHT)<<(FRACBITS-1)); + fdup >>= 1; colfrac <<= 1; x >>= 1; - sx >>= 1; - w >>= 1; if (stplyr == &players[displayplayer]) { if (!(scrn & (V_SNAPTOTOP|V_SNAPTOBOTTOM))) @@ -897,7 +913,6 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_ if (!(scrn & (V_SNAPTOLEFT|V_SNAPTORIGHT))) perplayershuffle |= 8; x += adjustx; - sx += adjustx; scrn &= ~V_SNAPTOBOTTOM|V_SNAPTOLEFT; } else if (stplyr == &players[thirddisplayplayer]) @@ -907,7 +922,6 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_ if (!(scrn & (V_SNAPTOLEFT|V_SNAPTORIGHT))) perplayershuffle |= 4; y += adjusty; - sy += adjusty; scrn &= ~V_SNAPTOTOP|V_SNAPTORIGHT; } else //if (stplyr == &players[fourthdisplayplayer]) @@ -917,9 +931,7 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_ if (!(scrn & (V_SNAPTOLEFT|V_SNAPTORIGHT))) perplayershuffle |= 8; x += adjustx; - sx += adjustx; y += adjusty; - sy += adjusty; scrn &= ~V_SNAPTOTOP|V_SNAPTOLEFT; } } @@ -938,7 +950,6 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_ if (!(scrn & (V_SNAPTOTOP|V_SNAPTOBOTTOM))) perplayershuffle |= 2; y += adjusty; - sy += adjusty; scrn &= ~V_SNAPTOTOP; } } @@ -951,7 +962,8 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_ deststop = desttop + vid.rowbytes * vid.height; - if (scrn & V_NOSCALESTART) { + if (scrn & V_NOSCALESTART) + { x >>= FRACBITS; y >>= FRACBITS; desttop += (y*vid.width) + x; @@ -999,7 +1011,38 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_ desttop += (y*vid.width) + x; } - for (col = sx<>FRACBITS) < patch->width && ((col>>FRACBITS) - sx) < w; col += colfrac, ++x, desttop++) + // Auto-crop at splitscreen borders! + if (splitscreen && (scrn & V_PERPLAYER)) + { +#ifdef QUADS + if (splitscreen > 1) // 3 or 4 players + { + #error Auto-cropping doesnt take quadscreen into account! Fix it! + // Hint: For player 1/2, copy player 1's code below. For player 3/4, copy player 2's code below + // For player 1/3 and 2/4, hijack the X wrap prevention lines? That's probably easiest + } + else +#endif + // 2 players + { + if (stplyr == &players[displayplayer]) // Player 1's screen, crop at the bottom + { + // Just put a big old stop sign halfway through the screen + deststop -= vid.rowbytes * (vid.height>>1); + } + else //if (stplyr == &players[secondarydisplayplayer]) // Player 2's screen, crop at the top + { + if (y < (vid.height>>1)) // If the top is above the border + { + sy += ((vid.height>>1) - y) * rowfrac; // Start further down on the patch + h -= ((vid.height>>1) - y) * rowfrac; // Draw less downwards from the start + desttop += ((vid.height>>1) - y) * vid.width; // Start drawing at the border + } + } + } + } + + for (col = sx; (col>>FRACBITS) < patch->width && (col - sx) < w; col += colfrac, ++x, desttop++) { INT32 topdelta, prevdelta = -1; if (x < 0) // don't draw off the left of the screen (WRAP PREVENTION) @@ -1016,15 +1059,15 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_ prevdelta = topdelta; source = (const UINT8 *)(column) + 3; dest = desttop; - if (topdelta-sy > 0) + if ((topdelta< 0) { - dest += FixedInt(FixedMul((topdelta-sy)<>FRACBITS) < column->length && (((ofs>>FRACBITS) - sy) + topdelta) < h; ofs += rowfrac) + for (; dest < deststop && (ofs>>FRACBITS) < column->length && ((ofs - sy) + (topdelta<= screens[scrn&V_PARAMMASK]) // don't draw off the top of the screen (CRASH PREVENTION) *dest = patchdrawfunc(dest, source, ofs); @@ -1359,11 +1402,11 @@ void V_DrawFillConsoleMap(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c) if ((alphalevel = ((c & V_ALPHAMASK) >> V_ALPHASHIFT))) { - if (alphalevel == 13) + if (alphalevel == 10) // V_HUDTRANSHALF alphalevel = hudminusalpha[st_translucency]; - else if (alphalevel == 14) + else if (alphalevel == 11) // V_HUDTRANS alphalevel = 10 - st_translucency; - else if (alphalevel == 15) + else if (alphalevel == 12) // V_HUDTRANSDOUBLE alphalevel = hudplusalpha[st_translucency]; if (alphalevel >= 10) @@ -1705,7 +1748,7 @@ void V_DrawFlatFill(INT32 x, INT32 y, INT32 w, INT32 h, lumpnum_t flatnum) fixed_t dx, dy, xfrac, yfrac; const UINT8 *src, *deststop; UINT8 *flat, *dest; - size_t size, lflatsize, flatshift; + size_t lflatsize, flatshift; #ifdef HWRENDER if (rendermode == render_opengl) @@ -1715,39 +1758,8 @@ void V_DrawFlatFill(INT32 x, INT32 y, INT32 w, INT32 h, lumpnum_t flatnum) } #endif - size = W_LumpLength(flatnum); - - switch (size) - { - case 4194304: // 2048x2048 lump - lflatsize = 2048; - flatshift = 10; - break; - case 1048576: // 1024x1024 lump - lflatsize = 1024; - flatshift = 9; - break; - case 262144:// 512x512 lump - lflatsize = 512; - flatshift = 8; - break; - case 65536: // 256x256 lump - lflatsize = 256; - flatshift = 7; - break; - case 16384: // 128x128 lump - lflatsize = 128; - flatshift = 7; - break; - case 1024: // 32x32 lump - lflatsize = 32; - flatshift = 5; - break; - default: // 64x64 lump - lflatsize = 64; - flatshift = 6; - break; - } + lflatsize = R_GetFlatSize(W_LumpLength(flatnum)); + flatshift = R_GetFlatBits(lflatsize); flat = W_CacheLumpNum(flatnum, PU_CACHE); @@ -3563,7 +3575,8 @@ void V_DoPostProcessor(INT32 view, postimg_t type, INT32 param) UINT8 *tmpscr = screens[4]; UINT8 *srcscr = screens[0]; INT32 y; - angle_t disStart = (leveltime * 128) & FINEMASK; // in 0 to FINEANGLE + // Set disStart to a range from 0 to FINEANGLE, incrementing by 128 per tic + angle_t disStart = (((leveltime-1)*128) + (rendertimefrac / (FRACUNIT/128))) & FINEMASK; INT32 newpix; INT32 sine; //UINT8 *transme = R_GetTranslucencyTable(tr_trans50); @@ -3686,8 +3699,11 @@ Unoptimized version heatindex[view] %= height; } - heatindex[view]++; - heatindex[view] %= vid.height; + if (renderisnewtic) // This isn't interpolated... but how do you interpolate a one-pixel shift? + { + heatindex[view]++; + heatindex[view] %= vid.height; + } VID_BlitLinearScreen(tmpscr+vid.width*vid.bpp*yoffset, screens[0]+vid.width*vid.bpp*yoffset, vid.width*vid.bpp, height, vid.width*vid.bpp, vid.width); diff --git a/src/v_video.h b/src/v_video.h index 7184e799e..ff03836b5 100644 --- a/src/v_video.h +++ b/src/v_video.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -122,17 +122,23 @@ void V_CubeApply(UINT8 *red, UINT8 *green, UINT8 *blue); #define V_70TRANS 0x00070000 #define V_80TRANS 0x00080000 // used to be V_8020TRANS #define V_90TRANS 0x00090000 -#define V_HUDTRANSHALF 0x000D0000 -#define V_HUDTRANS 0x000E0000 // draw the hud translucent -#define V_HUDTRANSDOUBLE 0x000F0000 +#define V_HUDTRANSHALF 0x000A0000 +#define V_HUDTRANS 0x000B0000 // draw the hud translucent +#define V_HUDTRANSDOUBLE 0x000C0000 // Macros follow #define V_USERHUDTRANSHALF ((10-(cv_translucenthud.value/2))<handle); + if (wad->handle) + fclose(wad->handle); Z_Free(wad->filename); + if (wad->path) + Z_Free(wad->path); while (wad->numlumps--) { + if (wad->lumpinfo[wad->numlumps].diskpath) + Z_Free(wad->lumpinfo[wad->numlumps].diskpath); Z_Free(wad->lumpinfo[wad->numlumps].longname); Z_Free(wad->lumpinfo[wad->numlumps].fullname); } @@ -128,6 +135,8 @@ void W_Shutdown(void) Z_Free(wad->lumpinfo); Z_Free(wad); } + + Z_Free(wadfiles); } //=========================================================================== @@ -353,6 +362,7 @@ static lumpinfo_t* ResGetLumpsStandalone (FILE* handle, UINT16* numlumps, const lumpinfo->size = ftell(handle); fseek(handle, 0, SEEK_SET); strcpy(lumpinfo->name, lumpname); + lumpinfo->hash = quickncasehash(lumpname, 8); // Allocate the lump's long name. lumpinfo->longname = Z_Malloc(9 * sizeof(char), PU_STATIC, NULL); @@ -421,6 +431,7 @@ static lumpinfo_t* ResGetLumpsWad (FILE* handle, UINT16* nlmp, const char* filen { lump_p->position = LONG(fileinfo->filepos); lump_p->size = lump_p->disksize = LONG(fileinfo->size); + lump_p->diskpath = NULL; if (compressed) // wad is compressed, lump might be { UINT32 realsize = 0; @@ -450,6 +461,7 @@ static lumpinfo_t* ResGetLumpsWad (FILE* handle, UINT16* nlmp, const char* filen lump_p->compression = CM_NOCOMPRESSION; memset(lump_p->name, 0x00, 9); strncpy(lump_p->name, fileinfo->name, 8); + lump_p->hash = quickncasehash(lump_p->name, 8); // Allocate the lump's long name. lump_p->longname = Z_Malloc(9 * sizeof(char), PU_STATIC, NULL); @@ -602,6 +614,7 @@ static lumpinfo_t* ResGetLumpsZip (FILE* handle, UINT16* nlmp) lump_p->position = zentry.offset; // NOT ACCURATE YET: we still need to read the local entry to find our true position lump_p->disksize = zentry.compsize; + lump_p->diskpath = NULL; lump_p->size = zentry.size; fullname = malloc(zentry.namelen + 1); @@ -624,6 +637,7 @@ static lumpinfo_t* ResGetLumpsZip (FILE* handle, UINT16* nlmp) memset(lump_p->name, '\0', 9); // Making sure they're initialized to 0. Is it necessary? strncpy(lump_p->name, trimname, min(8, dotpos - trimname)); + lump_p->hash = quickncasehash(lump_p->name, 8); lump_p->longname = Z_Calloc(dotpos - trimname + 1, PU_STATIC, NULL); strlcpy(lump_p->longname, trimname, dotpos - trimname + 1); @@ -631,8 +645,6 @@ static lumpinfo_t* ResGetLumpsZip (FILE* handle, UINT16* nlmp) lump_p->fullname = Z_Calloc(zentry.namelen + 1, PU_STATIC, NULL); strncpy(lump_p->fullname, fullname, zentry.namelen); - free(fullname); - switch(zentry.compression) { case 0: @@ -652,6 +664,8 @@ static lumpinfo_t* ResGetLumpsZip (FILE* handle, UINT16* nlmp) break; } + free(fullname); + // skip and ignore comments/extra fields if (fseek(handle, zentry.xtralen + zentry.commlen, SEEK_CUR) != 0) { @@ -679,6 +693,114 @@ static lumpinfo_t* ResGetLumpsZip (FILE* handle, UINT16* nlmp) return lumpinfo; } +static INT32 CheckPathsNotEqual(const char *path1, const char *path2) +{ + INT32 stat = samepaths(path1, path2); + + if (stat == 1) + return 0; + else if (stat < 0) + return -1; + + return 1; +} + +// Returns 1 if the path is valid, 0 if not, and -1 if there was an error. +INT32 W_IsPathToFolderValid(const char *path) +{ + INT32 stat; + + // Remove path delimiters. + const char *p = path + (strlen(path) - 1); + while (*p == '\\' || *p == '/' || *p == ':') + { + p--; + if (p < path) + return 0; + } + + // Check if the path is a directory. + stat = pathisdirectory(path); + if (stat == 0) + return 0; + else if (stat < 0) + { + // The path doesn't exist, so it can't be a directory. + if (direrror == ENOENT) + return 0; + + return -1; + } + + // Don't add your home, you sodding tic tac. + stat = CheckPathsNotEqual(path, srb2home); + if (stat != 1) + return stat; + + // Do the same checks for SRB2's path, and the current directory. + stat = CheckPathsNotEqual(path, srb2path); + if (stat != 1) + return stat; + + stat = CheckPathsNotEqual(path, "."); + if (stat != 1) + return stat; + + return 1; +} + +// Checks if the combination of the first path and the second path are valid. +// If they are, the concatenated path is returned. +static char *CheckConcatFolderPath(const char *startpath, const char *path) +{ + if (concatpaths(path, startpath) == 1) + { + char *fn; + + if (startpath) + { + size_t len = strlen(startpath) + strlen(path) + strlen(PATHSEP) + 1; + fn = ZZ_Alloc(len); + snprintf(fn, len, "%s" PATHSEP "%s", startpath, path); + } + else + fn = Z_StrDup(path); + + return fn; + } + + return NULL; +} + +// Looks for the first valid full path for a folder. +// Returns NULL if the folder doesn't exist, or it isn't valid. +char *W_GetFullFolderPath(const char *path) +{ + // Check the path by itself first. + char *fn = CheckConcatFolderPath(NULL, path); + if (fn) + return fn; + +#define checkpath(startpath) \ + fn = CheckConcatFolderPath(startpath, path); \ + if (fn) \ + return fn + + checkpath(srb2home); // Then, look in srb2home. + checkpath(srb2path); // Now, look in srb2path. + checkpath("."); // Finally, look in the current directory. + +#undef checkpath + + return NULL; +} + +// Loads files from a folder into a lumpinfo structure. +static lumpinfo_t *ResGetLumpsFolder(const char *path, UINT16 *nlmp, UINT16 *nfolders) +{ + return getdirectoryfiles(path, nlmp, nfolders); +} + static UINT16 W_InitFileError (const char *filename, boolean exitworthy) { if (exitworthy) @@ -694,6 +816,19 @@ static UINT16 W_InitFileError (const char *filename, boolean exitworthy) return INT16_MAX; } +static void W_ReadFileShaders(wadfile_t *wadfile) +{ +#ifdef HWRENDER + if (rendermode == render_opengl && (vid.glstate == VID_GL_LIBRARY_LOADED)) + { + HWR_LoadCustomShadersFromFile(numwadfiles - 1, W_FileHasFolders(wadfile)); + HWR_CompileShaders(); + } +#else + (void)wadfile; +#endif +} + // Allocate a wadfile, setup the lumpinfo (directory) and // lumpcache, add the wadfile to the current active wadfiles // @@ -715,7 +850,6 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup) #ifndef NOMD5 size_t i; #endif - size_t packetsize; UINT8 md5sum[16]; int important; @@ -733,9 +867,8 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup) refreshdirname = NULL; //CONS_Debug(DBG_SETUP, "Loading %s\n", filename); - // - // check if limit of active wadfiles - // + + // Check if the game reached the limit of active wadfiles. if (numwadfiles >= MAX_WADFILES) { CONS_Alert(CONS_ERROR, M_GetText("Maximum wad files reached\n")); @@ -755,24 +888,7 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup) return INT16_MAX; } - // Check if wad files will overflow fileneededbuffer. Only the filename part - // is send in the packet; cf. - // see PutFileNeeded in d_netfil.c - if ((important = !important)) - { - packetsize = packetsizetally + nameonlylength(filename) + 22; - - if (packetsize > MAXFILENEEDED*sizeof(UINT8)) - { - CONS_Alert(CONS_ERROR, M_GetText("Maximum wad files reached\n")); - refreshdirmenu |= REFRESHDIR_MAX; - if (handle) - fclose(handle); - return W_InitFileError(filename, startup); - } - - packetsizetally = packetsize; - } + important = !important; #ifndef NOMD5 // @@ -784,11 +900,12 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup) for (i = 0; i < numwadfiles; i++) { + if (wadfiles[i]->type == RET_FOLDER) + continue; + if (!memcmp(wadfiles[i]->md5sum, md5sum, 16)) { CONS_Alert(CONS_ERROR, M_GetText("%s is already loaded\n"), filename); - if (important) - packetsizetally -= nameonlylength(filename) + 22; if (handle) fclose(handle); return W_InitFileError(filename, false); @@ -831,9 +948,11 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup) // wadfile = Z_Malloc(sizeof (*wadfile), PU_STATIC, NULL); wadfile->filename = Z_StrDup(filename); + wadfile->path = NULL; wadfile->type = type; wadfile->handle = handle; - wadfile->numlumps = (UINT16)numlumps; + wadfile->numlumps = numlumps; + wadfile->foldercount = 0; wadfile->lumpinfo = lumpinfo; wadfile->important = important; fseek(handle, 0, SEEK_END); @@ -853,17 +972,12 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup) // add the wadfile // CONS_Printf(M_GetText("Added file %s (%u lumps)\n"), filename, numlumps); + wadfiles = Z_Realloc(wadfiles, sizeof(wadfile_t) * (numwadfiles + 1), PU_STATIC, NULL); wadfiles[numwadfiles] = wadfile; numwadfiles++; // must come BEFORE W_LoadDehackedLumps, so any addfile called by COM_BufInsertText called by Lua doesn't overwrite what we just loaded -#ifdef HWRENDER // Read shaders from file - if (rendermode == render_opengl && (vid.glstate == VID_GL_LIBRARY_LOADED)) - { - HWR_LoadCustomShadersFromFile(numwadfiles - 1, (type == RET_PK3)); - HWR_CompileShaders(); - } -#endif // HWRENDER + W_ReadFileShaders(wadfile); // TODO: HACK ALERT - Load Lua & SOC stuff right here. I feel like this should be out of this place, but... Let's stick with this for now. switch (wadfile->type) @@ -889,6 +1003,163 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup) return wadfile->numlumps; } +// +// Loads a folder as a WAD. +// +UINT16 W_InitFolder(const char *path, boolean mainfile, boolean startup) +{ + lumpinfo_t *lumpinfo = NULL; + wadfile_t *wadfile; + UINT16 numlumps = 0; + UINT16 foldercount; + size_t i; + char *fn, *fullpath; + const char *p; + int important; + INT32 stat; + + if (!(refreshdirmenu & REFRESHDIR_ADDFILE)) + refreshdirmenu = REFRESHDIR_NORMAL|REFRESHDIR_ADDFILE; // clean out cons_alerts that happened earlier + + if (refreshdirname) + Z_Free(refreshdirname); + if (dirmenu) + refreshdirname = Z_StrDup(path); + else + refreshdirname = NULL; + + if (numwadfiles >= MAX_WADFILES) + { + CONS_Alert(CONS_ERROR, M_GetText("Maximum wad files reached\n")); + refreshdirmenu |= REFRESHDIR_MAX; + return W_InitFileError(path, startup); + } + + important = 1; /// \todo Implement a W_VerifyFolder. + + // Remove path delimiters. + p = path + (strlen(path) - 1); + + while (*p == '\\' || *p == '/' || *p == ':') + { + p--; + if (p < path) + { + CONS_Alert(CONS_ERROR, M_GetText("Path %s is invalid\n"), path); + return W_InitFileError(path, startup); + } + } + p++; + + // Allocate the new path name. + i = (p - path) + 1; + fn = ZZ_Alloc(i); + strlcpy(fn, path, i); + + // Don't add an empty path. + if (M_IsStringEmpty(fn)) + { + CONS_Alert(CONS_ERROR, M_GetText("Folder name is empty\n")); + Z_Free(fn); + + if (startup) + return W_InitFileError("A folder", true); + else + return W_InitFileError("a folder", false); + } + + // Check if the path is valid. + stat = W_IsPathToFolderValid(fn); + + if (stat != 1) + { + if (stat == 0) + CONS_Alert(CONS_ERROR, M_GetText("Path %s is invalid\n"), fn); + else if (stat < 0) + { +#ifndef AVOID_ERRNO + CONS_Alert(CONS_ERROR, M_GetText("Could not stat %s: %s\n"), fn, strerror(direrror)); +#else + CONS_Alert(CONS_ERROR, M_GetText("Could not stat %s\n"), fn); +#endif + } + + Z_Free(fn); + return W_InitFileError(path, startup); + } + + // Get the full path for this folder. + fullpath = W_GetFullFolderPath(fn); + if (fullpath == NULL) + { + CONS_Alert(CONS_ERROR, M_GetText("Path %s is invalid\n"), fn); + Z_Free(fn); + return W_InitFileError(path, startup); + } + + // Check if the folder is already added. + for (i = 0; i < numwadfiles; i++) + { + if (wadfiles[i]->type != RET_FOLDER) + continue; + + if (samepaths(wadfiles[i]->path, fullpath) > 0) + { + CONS_Alert(CONS_ERROR, M_GetText("%s is already loaded\n"), path); + Z_Free(fn); + Z_Free(fullpath); + return W_InitFileError(path, false); + } + } + + lumpinfo = ResGetLumpsFolder(fullpath, &numlumps, &foldercount); + + if (lumpinfo == NULL) + { + if (!numlumps) + CONS_Alert(CONS_ERROR, M_GetText("Folder %s is empty\n"), path); + else if (numlumps == UINT16_MAX) + CONS_Alert(CONS_ERROR, M_GetText("Folder %s contains too many files\n"), path); + else + CONS_Alert(CONS_ERROR, M_GetText("Unknown error enumerating files from folder %s\n"), path); + + Z_Free(fn); + Z_Free(fullpath); + + return W_InitFileError(path, startup); + } + + if (important && !mainfile) + G_SetGameModified(true); + + wadfile = Z_Malloc(sizeof (*wadfile), PU_STATIC, NULL); + wadfile->filename = fn; + wadfile->path = fullpath; + wadfile->type = RET_FOLDER; + wadfile->handle = NULL; + wadfile->numlumps = numlumps; + wadfile->foldercount = foldercount; + wadfile->lumpinfo = lumpinfo; + wadfile->important = important; + + // Irrelevant. + wadfile->filesize = 0; + memset(wadfile->md5sum, 0x00, 16); + + Z_Calloc(numlumps * sizeof (*wadfile->lumpcache), PU_STATIC, &wadfile->lumpcache); + Z_Calloc(numlumps * sizeof (*wadfile->patchcache), PU_STATIC, &wadfile->patchcache); + + CONS_Printf(M_GetText("Added folder %s (%u files, %u folders)\n"), fn, numlumps, foldercount); + wadfiles[numwadfiles] = wadfile; + numwadfiles++; + + W_ReadFileShaders(wadfile); + W_LoadDehackedLumpsPK3(numwadfiles - 1, mainfile); + W_InvalidateLumpnumCache(); + + return wadfile->numlumps; +} + /** Tries to load a series of files. * All files are wads unless they have an extension of ".soc" or ".lua". * @@ -898,13 +1169,22 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup) * * \param filenames A null-terminated list of files to use. */ -void W_InitMultipleFiles(char **filenames) +void W_InitMultipleFiles(addfilelist_t *list) { - // will be realloced as lumps are added - for (; *filenames; filenames++) + size_t i = 0; + + for (; i < list->numfiles; i++) { - //CONS_Debug(DBG_SETUP, "Loading %s\n", *filenames); - W_InitFile(*filenames, numwadfiles < mainwads, true); + const char *fn = list->files[i]; + char pathsep = fn[strlen(fn) - 1]; + boolean mainfile = (numwadfiles < mainwads); + + //CONS_Debug(DBG_SETUP, "Loading %s\n", fn); + + if (pathsep == '\\' || pathsep == '/') + W_InitFolder(fn, mainfile, true); + else + W_InitFile(fn, mainfile, true); } } @@ -913,7 +1193,7 @@ void W_InitMultipleFiles(char **filenames) */ static boolean TestValidLump(UINT16 wad, UINT16 lump) { - I_Assert(wad < MAX_WADFILES); + I_Assert(wad < numwadfiles); if (!wadfiles[wad]) // make sure the wad file exists return false; @@ -949,12 +1229,14 @@ UINT16 W_CheckNumForNamePwad(const char *name, UINT16 wad, UINT16 startlump) { UINT16 i; static char uname[8 + 1]; + UINT32 hash; if (!TestValidLump(wad,0)) return INT16_MAX; strlcpy(uname, name, sizeof uname); strupr(uname); + hash = quickncasehash(uname, 8); // // scan forward @@ -965,7 +1247,7 @@ UINT16 W_CheckNumForNamePwad(const char *name, UINT16 wad, UINT16 startlump) { lumpinfo_t *lump_p = wadfiles[wad]->lumpinfo + startlump; for (i = startlump; i < wadfiles[wad]->numlumps; i++, lump_p++) - if (!strncmp(lump_p->name, uname, sizeof(uname) - 1)) + if (lump_p->hash == hash && !strncmp(lump_p->name, uname, sizeof(uname) - 1)) return i; } @@ -1168,17 +1450,22 @@ lumpnum_t W_CheckNumForLongName(const char *name) // TODO: Make it search through cache first, maybe...? lumpnum_t W_CheckNumForMap(const char *name) { + UINT32 hash = quickncasehash(name, 8); UINT16 lumpNum, end; UINT32 i; + lumpinfo_t *p; for (i = numwadfiles - 1; i < numwadfiles; i--) { if (wadfiles[i]->type == RET_WAD) { for (lumpNum = 0; lumpNum < wadfiles[i]->numlumps; lumpNum++) - if (!strncmp(name, (wadfiles[i]->lumpinfo + lumpNum)->name, 8)) + { + p = wadfiles[i]->lumpinfo + lumpNum; + if (p->hash == hash && !strncmp(name, p->name, 8)) return (i<<16) + lumpNum; + } } - else if (wadfiles[i]->type == RET_PK3) + else if (W_FileHasFolders(wadfiles[i])) { lumpNum = W_CheckNumForFolderStartPK3("maps/", i, 0); if (lumpNum != INT16_MAX) @@ -1187,8 +1474,15 @@ lumpnum_t W_CheckNumForMap(const char *name) continue; // Now look for the specified map. for (; lumpNum < end; lumpNum++) - if (!strnicmp(name, (wadfiles[i]->lumpinfo + lumpNum)->name, 8)) - return (i<<16) + lumpNum; + { + p = wadfiles[i]->lumpinfo + lumpNum; + if (p->hash == hash && !strnicmp(name, p->name, 8)) + { + const char *extension = strrchr(p->fullname, '.'); + if (!(extension && stricmp(extension, ".wad"))) + return (i<<16) + lumpNum; + } + } } } return LUMPERROR; @@ -1276,9 +1570,46 @@ UINT8 W_LumpExists(const char *name) size_t W_LumpLengthPwad(UINT16 wad, UINT16 lump) { + lumpinfo_t *l; + if (!TestValidLump(wad, lump)) return 0; - return wadfiles[wad]->lumpinfo[lump].size; + + l = wadfiles[wad]->lumpinfo + lump; + + // Open the external file for this lump, if the WAD is a folder. + if (wadfiles[wad]->type == RET_FOLDER) + { + // pathisdirectory calls stat, so if anything wrong has happened, + // this is the time to be aware of it. + INT32 stat = pathisdirectory(l->diskpath); + + if (stat < 0) + { +#ifndef AVOID_ERRNO + if (direrror == ENOENT) + I_Error("W_LumpLengthPwad: file %s doesn't exist", l->diskpath); + else + I_Error("W_LumpLengthPwad: could not stat %s: %s", l->diskpath, strerror(direrror)); +#else + I_Error("W_LumpLengthPwad: could not access %s", l->diskpath); +#endif + } + else if (stat == 1) // Path is a folder. + return 0; + else + { + FILE *handle = fopen(l->diskpath, "rb"); + if (handle == NULL) + I_Error("W_LumpLengthPwad: could not open file %s", l->diskpath); + + fseek(handle, 0, SEEK_END); + l->size = l->disksize = ftell(handle); + fclose(handle); + } + } + + return l->size; } /** Returns the buffer size needed to load the given lump. @@ -1293,11 +1624,11 @@ size_t W_LumpLength(lumpnum_t lumpnum) // // W_IsLumpWad -// Is the lump a WAD? (presumably in a PK3) +// Is the lump a WAD? (presumably not in a WAD) // boolean W_IsLumpWad(lumpnum_t lumpnum) { - if (wadfiles[WADFILENUM(lumpnum)]->type == RET_PK3) + if (W_FileHasFolders(wadfiles[WADFILENUM(lumpnum)])) { const char *lumpfullName = (wadfiles[WADFILENUM(lumpnum)]->lumpinfo + LUMPNUM(lumpnum))->fullname; @@ -1306,23 +1637,23 @@ boolean W_IsLumpWad(lumpnum_t lumpnum) return !strnicmp(lumpfullName + strlen(lumpfullName) - 4, ".wad", 4); } - return false; // WADs should never be inside non-PK3s as far as SRB2 is concerned + return false; // WADs should never be inside WADs as far as SRB2 is concerned } // // W_IsLumpFolder -// Is the lump a folder? (in a PK3 obviously) +// Is the lump a folder? (not in a WAD obviously) // boolean W_IsLumpFolder(UINT16 wad, UINT16 lump) { - if (wadfiles[wad]->type == RET_PK3) + if (W_FileHasFolders(wadfiles[wad])) { const char *name = wadfiles[wad]->lumpinfo[lump].fullname; return (name[strlen(name)-1] == '/'); // folders end in '/' } - return false; // non-PK3s don't have folders + return false; // WADs don't have folders } #ifdef HAVE_ZLIB @@ -1365,17 +1696,55 @@ void zerr(int ret) */ size_t W_ReadLumpHeaderPwad(UINT16 wad, UINT16 lump, void *dest, size_t size, size_t offset) { - size_t lumpsize; + size_t lumpsize, bytesread; lumpinfo_t *l; - FILE *handle; + FILE *handle = NULL; - if (!TestValidLump(wad,lump)) + if (!TestValidLump(wad, lump)) return 0; + l = wadfiles[wad]->lumpinfo + lump; + + // Open the external file for this lump, if the WAD is a folder. + if (wadfiles[wad]->type == RET_FOLDER) + { + // pathisdirectory calls stat, so if anything wrong has happened, + // this is the time to be aware of it. + INT32 stat = pathisdirectory(l->diskpath); + + if (stat < 0) + { +#ifndef AVOID_ERRNO + if (direrror == ENOENT) + I_Error("W_ReadLumpHeaderPwad: file %s doesn't exist", l->diskpath); + else + I_Error("W_ReadLumpHeaderPwad: could not stat %s: %s", l->diskpath, strerror(direrror)); +#else + I_Error("W_ReadLumpHeaderPwad: could not access %s", l->diskpath); +#endif + } + else if (stat == 1) // Path is a folder. + return 0; + else + { + handle = fopen(l->diskpath, "rb"); + if (handle == NULL) + I_Error("W_ReadLumpHeaderPwad: could not open file %s", l->diskpath); + + // Find length of file + fseek(handle, 0, SEEK_END); + l->size = l->disksize = ftell(handle); + } + } + lumpsize = wadfiles[wad]->lumpinfo[lump].size; // empty resource (usually markers like S_START, F_END ..) if (!lumpsize || lumpsizetype == RET_FOLDER) + fclose(handle); return 0; + } // zero size means read all the lump if (!size || size+offset > lumpsize) @@ -1383,24 +1752,22 @@ size_t W_ReadLumpHeaderPwad(UINT16 wad, UINT16 lump, void *dest, size_t size, si // Let's get the raw lump data. // We setup the desired file handle to read the lump data. - l = wadfiles[wad]->lumpinfo + lump; - handle = wadfiles[wad]->handle; + if (wadfiles[wad]->type != RET_FOLDER) + handle = wadfiles[wad]->handle; fseek(handle, (long)(l->position + offset), SEEK_SET); // But let's not copy it yet. We support different compression formats on lumps, so we need to take that into account. switch(wadfiles[wad]->lumpinfo[lump].compression) { case CM_NOCOMPRESSION: // If it's uncompressed, we directly write the data into our destination, and return the bytes read. + bytesread = fread(dest, 1, size, handle); + if (wadfiles[wad]->type == RET_FOLDER) + fclose(handle); #ifdef NO_PNG_LUMPS - { - size_t bytesread = fread(dest, 1, size, handle); - if (Picture_IsLumpPNG((UINT8 *)dest, bytesread)) - Picture_ThrowPNGError(l->fullname, wadfiles[wad]->filename); - return bytesread; - } -#else - return fread(dest, 1, size, handle); + if (Picture_IsLumpPNG((UINT8 *)dest, bytesread)) + Picture_ThrowPNGError(l->fullname, wadfiles[wad]->filename); #endif + return bytesread; case CM_LZF: // Is it LZF compressed? Used by ZWADs. { #ifdef ZWAD @@ -1838,7 +2205,7 @@ void W_VerifyFileMD5(UINT16 wadfilenum, const char *matchmd5) #else I_Error #endif - (M_GetText("File is old, is corrupt or has been modified: %s (found md5: %s, wanted: %s)\n"), wadfiles[wadfilenum]->filename, actualmd5text, matchmd5); + (M_GetText("File is old, is corrupt or has been modified:\n%s\nFound MD5: %s\nWanted MD5: %s\n"), wadfiles[wadfilenum]->filename, actualmd5text, matchmd5); } #endif } @@ -2117,6 +2484,10 @@ int W_VerifyNMUSlumps(const char *filename, boolean exit_on_error) {"STNONEX", 7}, // "X" graphic {"ULTIMATE", 8}, // Ultimate no-save + {"SLCT", 4}, // Level select "cursor" + {"LSSTATIC", 8}, // Level select static + {"BLANKLV", 7}, // "?" level images + {"CRFNT", 5}, // Sonic 1 font changes {"NTFNT", 5}, // Character Select font changes {"NTFNO", 5}, // Character Select font (outline) @@ -2128,12 +2499,23 @@ int W_VerifyNMUSlumps(const char *filename, boolean exit_on_error) {"STLIVE", 6}, // Life graphics, background and the "X" that shows under skin's HUDNAME {"CROSHAI", 7}, // First person crosshairs {"INTERSC", 7}, // Default intermission backgrounds (co-op) + {"SPECTILE", 8}, // Special stage intermission background {"STT", 3}, // Acceptable HUD changes (Score Time Rings) {"YB_", 3}, // Intermission graphics, goes with the above {"RESULT", 6}, // Used in intermission for competitive modes, above too :3 {"RACE", 4}, // Race mode graphics, 321go + {"SRB2BACK", 8}, // MP intermission background {"M_", 2}, // Menu stuff {"LT", 2}, // Titlecard changes + {"HOMING", 6}, // Emerald hunt radar + {"HOMITM", 6}, // Emblem radar + + {"CHARFG", 6}, // Character select menu + {"CHARBG", 6}, + {"RECATK", 6}, // Record Attack menu + {"RECCLOCK", 8}, + {"NTSATK", 6}, // NiGHTS Mode menu + {"NTSSONC", 7}, {"SLID", 4}, // Continue {"CONT", 4}, @@ -2157,6 +2539,7 @@ int W_VerifyNMUSlumps(const char *filename, boolean exit_on_error) {"DRILL", 5}, {"GRADE", 5}, {"MINUS5", 6}, + {"NGRTIMER", 8}, // NiGHTS Mode timer {"MUSICDEF", 8}, // Song definitions (thanks kart) {"SHADERS", 7}, // OpenGL shader definitions diff --git a/src/w_wad.h b/src/w_wad.h index 130967712..ffb9095ba 100644 --- a/src/w_wad.h +++ b/src/w_wad.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -67,8 +67,10 @@ typedef struct unsigned long position; // filelump_t filepos unsigned long disksize; // filelump_t size char name[9]; // filelump_t name[] e.g. "LongEntr" + UINT32 hash; char *longname; // e.g. "LongEntryName" char *fullname; // e.g. "Folder/Subfolder/LongEntryName.extension" + char *diskpath; // path to the file e.g. "/usr/games/srb2/Addon/Folder/Subfolder/LongEntryName.extension" size_t size; // real (uncompressed) size compmethod compression; // lump compression method } lumpinfo_t; @@ -96,9 +98,15 @@ virtlump_t* vres_Find(const virtres_t*, const char*); // DYNAMIC WAD LOADING // ========================================================================= +// Maximum of files that can be loaded +// (there is a max of simultaneous open files anyway) +#ifdef ENFORCE_WAD_LIMIT +#define MAX_WADFILES 2048 // This cannot be any higher than UINT16_MAX. +#else +#define MAX_WADFILES UINT16_MAX +#endif + #define MAX_WADPATH 512 -#define MAX_WADFILES 48 // maximum of wad files used at the same time -// (there is a max of simultaneous open files anyway, and this should be plenty) #define lumpcache_t void * @@ -109,17 +117,19 @@ typedef enum restype RET_SOC, RET_LUA, RET_PK3, + RET_FOLDER, RET_UNKNOWN, } restype_t; typedef struct wadfile_s { - char *filename; + char *filename, *path; restype_t type; lumpinfo_t *lumpinfo; lumpcache_t *lumpcache; lumpcache_t *patchcache; UINT16 numlumps; // this wad's number of resources + UINT16 foldercount; // folder count FILE *handle; UINT32 filesize; // for network UINT8 md5sum[16]; @@ -127,11 +137,17 @@ typedef struct wadfile_s boolean important; // also network - !W_VerifyNMUSlumps } wadfile_t; -#define WADFILENUM(lumpnum) (UINT16)((lumpnum)>>16) // wad flumpnum>>16) // wad file number in upper word +#define WADFILENUM(lumpnum) (UINT16)((lumpnum)>>16) // wad file number in upper word #define LUMPNUM(lumpnum) (UINT16)((lumpnum)&0xFFFF) // lump number for this pwad extern UINT16 numwadfiles; -extern wadfile_t *wadfiles[MAX_WADFILES]; +extern wadfile_t **wadfiles; + +typedef struct +{ + char **files; + size_t numfiles; +} addfilelist_t; // ========================================================================= @@ -141,9 +157,16 @@ void W_Shutdown(void); FILE *W_OpenWadFile(const char **filename, boolean useerrors); // Load and add a wadfile to the active wad files, returns numbers of lumps, INT16_MAX on error UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup); +// Adds a folder as a file +UINT16 W_InitFolder(const char *path, boolean mainfile, boolean startup); // W_InitMultipleFiles exits if a file was not found, but not if all is okay. -void W_InitMultipleFiles(char **filenames); +void W_InitMultipleFiles(addfilelist_t *list); + +#define W_FileHasFolders(wadfile) ((wadfile)->type == RET_PK3 || (wadfile)->type == RET_FOLDER) + +INT32 W_IsPathToFolderValid(const char *path); +char *W_GetFullFolderPath(const char *path); const char *W_CheckNameForNumPwad(UINT16 wad, UINT16 lump); const char *W_CheckNameForNum(lumpnum_t lumpnum); diff --git a/src/win32/CMakeLists.txt b/src/win32/CMakeLists.txt deleted file mode 100644 index 39b01588b..000000000 --- a/src/win32/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -file(GLOB SRB2_WIN_SOURCES *.c *.h *.rc) - -if(${SRB2_CONFIG_HWRENDER}) - set(SRB2_WIN_SOURCES ${SRB2_WIN_SOURCES} ${SRB2_HWRENDER_SOURCES} ${SRB2_HWRENDER_HEADERS}) - set(SRB2_WIN_SOURCES ${SRB2_WIN_SOURCES} ${SRB2_R_OPENGL_SOURCES} ${SRB2_R_OPENGL_HEADERS}) -endif() - -add_executable(SRB2DD EXCLUDE_FROM_ALL WIN32 - ${SRB2_WIN_SOURCES} -) - -target_compile_definitions(SRB2DD PRIVATE - -D_WINDOWS -) - -set_target_properties(SRB2DD PROPERTIES OUTPUT_NAME ${SRB2_WIN_EXE_NAME}) - -target_link_libraries(SRB2DD PRIVATE SRB2Core) diff --git a/src/win32/Makefile.cfg b/src/win32/Makefile.cfg deleted file mode 100644 index 702ae3765..000000000 --- a/src/win32/Makefile.cfg +++ /dev/null @@ -1,136 +0,0 @@ -# -# win32/Makefile.cfg for SRB2/Minwgw -# - -# -#Mingw, if you don't know, that's Win32/Win64 -# - -ifdef MINGW64 - HAVE_LIBGME=1 - LIBGME_CFLAGS=-I../libs/gme/include - LIBGME_LDFLAGS=-L../libs/gme/win64 -lgme -ifdef HAVE_OPENMPT - LIBOPENMPT_CFLAGS?=-I../libs/libopenmpt/inc - LIBOPENMPT_LDFLAGS?=-L../libs/libopenmpt/lib/x86_64/mingw -lopenmpt -endif -ifndef NOMIXERX - HAVE_MIXERX=1 - SDL_CFLAGS?=-I../libs/SDL2/x86_64-w64-mingw32/include/SDL2 -I../libs/SDLMixerX/x86_64-w64-mingw32/include/SDL2 -Dmain=SDL_main - SDL_LDFLAGS?=-L../libs/SDL2/x86_64-w64-mingw32/lib -L../libs/SDLMixerX/x86_64-w64-mingw32/lib -lmingw32 -lSDL2main -lSDL2 -mwindows -else - SDL_CFLAGS?=-I../libs/SDL2/x86_64-w64-mingw32/include/SDL2 -I../libs/SDL2_mixer/x86_64-w64-mingw32/include/SDL2 -Dmain=SDL_main - SDL_LDFLAGS?=-L../libs/SDL2/x86_64-w64-mingw32/lib -L../libs/SDL2_mixer/x86_64-w64-mingw32/lib -lmingw32 -lSDL2main -lSDL2 -mwindows -endif -else - HAVE_LIBGME=1 - LIBGME_CFLAGS=-I../libs/gme/include - LIBGME_LDFLAGS=-L../libs/gme/win32 -lgme -ifdef HAVE_OPENMPT - LIBOPENMPT_CFLAGS?=-I../libs/libopenmpt/inc - LIBOPENMPT_LDFLAGS?=-L../libs/libopenmpt/lib/x86/mingw -lopenmpt -endif -ifndef NOMIXERX - HAVE_MIXERX=1 - SDL_CFLAGS?=-I../libs/SDL2/i686-w64-mingw32/include/SDL2 -I../libs/SDLMixerX/i686-w64-mingw32/include/SDL2 -Dmain=SDL_main - SDL_LDFLAGS?=-L../libs/SDL2/i686-w64-mingw32/lib -L../libs/SDLMixerX/i686-w64-mingw32/lib -lmingw32 -lSDL2main -lSDL2 -mwindows -else - SDL_CFLAGS?=-I../libs/SDL2/i686-w64-mingw32/include/SDL2 -I../libs/SDL2_mixer/i686-w64-mingw32/include/SDL2 -Dmain=SDL_main - SDL_LDFLAGS?=-L../libs/SDL2/i686-w64-mingw32/lib -L../libs/SDL2_mixer/i686-w64-mingw32/lib -lmingw32 -lSDL2main -lSDL2 -mwindows -endif -endif - -ifndef NOASM - USEASM=1 -endif - -ifndef NONET -ifndef MINGW64 #miniupnc is broken with MINGW64 - HAVE_MINIUPNPC=1 -endif -endif - - OPTS=-DSTDC_HEADERS - -ifndef GCC44 - #OPTS+=-mms-bitfields -endif - - LIBS+=-ladvapi32 -lkernel32 -lmsvcrt -luser32 -ifdef MINGW64 - LIBS+=-lws2_32 -else -ifdef NO_IPV6 - LIBS+=-lwsock32 -else - LIBS+=-lws2_32 -endif -endif - - # name of the exefile - EXENAME?=srb2win.exe - -ifdef SDL - i_system_o+=$(OBJDIR)/SRB2.res - #i_main_o+=$(OBJDIR)/win_dbg.o -ifndef NOHW - OPTS+=-DUSE_WGL_SWAP -endif -endif - - -ZLIB_CFLAGS?=-I../libs/zlib -ifdef MINGW64 -ZLIB_LDFLAGS?=-L../libs/zlib/win32 -lz64 -else -ZLIB_LDFLAGS?=-L../libs/zlib/win32 -lz32 -endif - -ifndef NOPNG -ifndef PNG_CONFIG - PNG_CFLAGS?=-I../libs/libpng-src -ifdef MINGW64 - PNG_LDFLAGS?=-L../libs/libpng-src/projects -lpng64 -else - PNG_LDFLAGS?=-L../libs/libpng-src/projects -lpng32 -endif #MINGW64 -endif #PNG_CONFIG -endif #NOPNG - -ifdef GETTEXT -ifndef CCBS - MSGFMT?=../libs/gettext/bin32/msgfmt.exe -endif -ifdef MINGW64 - CPPFLAGS+=-I../libs/gettext/include64 - LDFLAGS+=-L../libs/gettext/lib64 - LIBS+=-lmingwex -else - CPPFLAGS+=-I../libs/gettext/include32 - LDFLAGS+=-L../libs/gettext/lib32 - STATIC_GETTEXT=1 -endif #MINGW64 -ifdef STATIC_GETTEXT - LIBS+=-lasprintf -lintl -else - LIBS+=-lintl.dll -endif #STATIC_GETTEXT -endif #GETTEXT - -ifdef HAVE_MINIUPNPC - CPPFLAGS+=-I../libs/ -DSTATIC_MINIUPNPC -ifdef MINGW64 - LDFLAGS+=-L../libs/miniupnpc/mingw64 -else - LDFLAGS+=-L../libs/miniupnpc/mingw32 -endif #MINGW64 -endif - -ifndef NOCURL - CURL_CFLAGS+=-I../libs/curl/include -ifdef MINGW64 - CURL_LDFLAGS+=-L../libs/curl/lib64 -lcurl -else - CURL_LDFLAGS+=-L../libs/curl/lib32 -lcurl -endif #MINGW64 -endif diff --git a/src/win32/Srb2win-vc10.vcxproj b/src/win32/Srb2win-vc10.vcxproj deleted file mode 100644 index 3e8af3b0e..000000000 --- a/src/win32/Srb2win-vc10.vcxproj +++ /dev/null @@ -1,517 +0,0 @@ - - - - - Debug - ARM - - - Debug - ARM64 - - - Debug - Win32 - - - Release - ARM - - - Release - ARM64 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - Srb2DD - {0F554F1D-ED49-4D65-A9A7-F63C57F277BE} - Win32Proj - Srb2win - 10.0.17763.0 - - - - v140 - true - - - true - true - v141 - - - v140 - false - true - - - false - true - true - v141 - - - v140 - true - - - true - true - v141 - - - v140 - false - true - - - false - true - true - v141 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - false - - - - true - gdi32.lib;%(AdditionalDependencies) - - - ProgramDatabase - false - - - - - true - gdi32.lib;%(AdditionalDependencies) - - - - - ProgramDatabase - false - - - gdi32.lib;%(AdditionalDependencies) - - - - - gdi32.lib;%(AdditionalDependencies) - - - - - gdi32.lib;%(AdditionalDependencies) - - - - - gdi32.lib;%(AdditionalDependencies) - - - - - gdi32.lib;%(AdditionalDependencies) - - - - - gdi32.lib;%(AdditionalDependencies) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - true - - - true - - - - - - - - - - - - - - - - - - - - true - - - true - - - true - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {72b01aca-7a1a-4f7b-acef-2607299cf052} - - - {73a5729c-7323-41d4-ab48-8a03c9f81603} - - - - - - - Document - - - Document - - - Document - - - - - - diff --git a/src/win32/Srb2win-vc10.vcxproj.filters b/src/win32/Srb2win-vc10.vcxproj.filters deleted file mode 100644 index 7279368f1..000000000 --- a/src/win32/Srb2win-vc10.vcxproj.filters +++ /dev/null @@ -1,943 +0,0 @@ - - - - - {20cba664-c3ef-48f1-85dd-42aafd5345cc} - - - {d3817a65-82f5-4989-9217-e5a7f43380a0} - - - {9c3ed4ae-dbed-4d00-a164-b8bb7fc1710c} - - - {4b8a8fb6-7c84-48c2-85d1-0583e6b8cacd} - - - {1907eee5-0ebf-4325-a2fa-793f089ed2e3} - - - {b9e78a3f-3e2b-4f89-9817-b77c7a26d2aa} - - - {3f336df5-a1d7-4610-9728-4525e42c0abc} - - - {b5090aa0-6645-4091-aa1a-ffc3bf4dc422} - - - {d59e82c9-68e5-44bf-827e-f7bb1676cd6c} - - - {29e746a2-3d91-4b69-af6e-5e03895516b7} - - - {b295d364-61c3-4ebb-9b68-7d6c0bb891be} - - - {ba258ec5-13d7-4083-98bd-c2ee58700b66} - - - {6163f1e5-da5d-4af2-b92c-753452f9e1d0} - - - {077b0966-1151-4afa-a533-120a4c931322} - - - {bded90bc-8019-42b1-ba19-32166743d3e3} - - - {c0ddfdb5-7494-4cca-b2ad-cb048be9cbdf} - - - {d5157f99-43ef-49cc-ad76-658a1168fc0d} - - - {2cedf139-53a1-40ea-b4de-19e9f4505a1f} - - - - - Win32app - - - Win32app - - - Win32app - - - Win32app - - - Win32app - - - Win32app - - - Win32app - - - Win32app - - - Win32app - - - Win32app - - - Hw_Hardware - - - Hw_Hardware - - - Hw_Hardware - - - Hw_Hardware - - - Hw_Hardware - - - Hw_Hardware - - - Hw_Hardware - - - Hw_Hardware - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - D_Doom - - - D_Doom - - - D_Doom - - - D_Doom - - - D_Doom - - - D_Doom - - - G_Game - - - G_Game - - - F_Frame - - - F_Frame - - - I_Interface - - - I_Interface - - - LUA - - - LUA - - - LUA - - - LUA - - - LUA - - - LUA - - - LUA - - - LUA - - - LUA - - - LUA - - - LUA - - - LUA - - - LUA - - - M_Misc - - - M_Misc - - - M_Misc - - - M_Misc - - - M_Misc - - - M_Misc - - - M_Misc - - - M_Misc - - - M_Misc - - - M_Misc - - - M_Misc - - - M_Misc - - - H_Hud - - - B_Bots - - - P_Play - - - P_Play - - - P_Play - - - P_Play - - - P_Play - - - P_Play - - - P_Play - - - P_Play - - - P_Play - - - P_Play - - - P_Play - - - P_Play - - - P_Play - - - P_Play - - - P_Play - - - P_Play - - - P_Play - - - R_Rend - - - R_Rend - - - R_Rend - - - R_Rend - - - R_Rend - - - R_Rend - - - R_Rend - - - R_Rend - - - R_Rend - - - R_Rend - - - R_Rend - - - R_Rend - - - P_Play - - - P_Play - - - P_Play - - - P_Play - - - P_Play - - - S_Sounds - - - W_Wad - - - W_Wad - - - S_Sounds - - - O_Other - - - H_Hud - - - H_Hud - - - I_Interface - - - H_Hud - - - P_Play - - - I_Interface - - - H_Hud - - - R_Rend - - - R_Rend - - - H_Hud - - - D_Doom - - - M_Misc - - - Hw_Hardware - - - Hw_Hardware - - - Hw_Hardware - - - Hw_Hardware - - - Hw_Hardware - - - - R_Rend - - - R_Rend - - - R_Rend - - - R_Rend - - - R_Rend - - - - - Win32app - - - Win32app - - - Win32app - - - Win32app - - - Win32app - - - Win32app - - - Win32app - - - Hw_Hardware - - - Hw_Hardware - - - Hw_Hardware - - - Hw_Hardware - - - Hw_Hardware - - - Hw_Hardware - - - Hw_Hardware - - - Hw_Hardware - - - Hw_Hardware - - - Hw_Hardware - - - Hw_Hardware - - - Hw_Hardware - - - Hw_Hardware - - - Hw_Hardware - - - Hw_Hardware - - - Hw_Hardware - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - BLUA - - - D_Doom - - - D_Doom - - - D_Doom - - - D_Doom - - - D_Doom - - - D_Doom - - - D_Doom - - - D_Doom - - - D_Doom - - - D_Doom - - - D_Doom - - - D_Doom - - - D_Doom - - - D_Doom - - - G_Game - - - G_Game - - - G_Game - - - F_Frame - - - I_Interface - - - I_Interface - - - I_Interface - - - I_Interface - - - I_Interface - - - I_Interface - - - I_Interface - - - LUA - - - LUA - - - LUA - - - LUA - - - M_Misc - - - M_Misc - - - M_Misc - - - M_Misc - - - M_Misc - - - M_Misc - - - M_Misc - - - M_Misc - - - M_Misc - - - M_Misc - - - M_Misc - - - M_Misc - - - M_Misc - - - M_Misc - - - H_Hud - - - B_Bots - - - P_Play - - - P_Play - - - P_Play - - - P_Play - - - P_Play - - - P_Play - - - P_Play - - - P_Play - - - P_Play - - - P_Play - - - R_Rend - - - R_Rend - - - R_Rend - - - R_Rend - - - R_Rend - - - R_Rend - - - R_Rend - - - R_Rend - - - R_Rend - - - R_Rend - - - R_Rend - - - R_Rend - - - P_Play - - - S_Sounds - - - W_Wad - - - W_Wad - - - I_Interface - - - S_Sounds - - - O_Other - - - I_Interface - - - H_Hud - - - H_Hud - - - I_Interface - - - I_Interface - - - H_Hud - - - P_Play - - - I_Interface - - - A_Asm - - - H_Hud - - - R_Rend - - - R_Rend - - - H_Hud - - - D_Doom - - - O_Other - - - Hw_Hardware - - - - R_Rend - - - R_Rend - - - R_Rend - - - R_Rend - - - R_Rend - - - - - Win32app - - - - - Win32app - - - - - A_Asm - - - O_Other - - - - - A_Asm - - - A_Asm - - - A_Asm - - - diff --git a/src/win32/Srb2win-vc9.vcproj b/src/win32/Srb2win-vc9.vcproj deleted file mode 100644 index c1c6b5bc4..000000000 --- a/src/win32/Srb2win-vc9.vcproj +++ /dev/null @@ -1,4914 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/win32/Srb2win.dsp b/src/win32/Srb2win.dsp deleted file mode 100644 index 661f3eaf9..000000000 --- a/src/win32/Srb2win.dsp +++ /dev/null @@ -1,1008 +0,0 @@ -# Microsoft Developer Studio Project File - Name="Srb2win" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=Srb2win - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Srb2win.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Srb2win.mak" CFG="Srb2win - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Srb2win - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "Srb2win - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "Srb2win - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "..\..\objs\Release" -# PROP BASE Intermediate_Dir "..\..\objs\Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\bin\VC\Release\Win32" -# PROP Intermediate_Dir "..\..\objs\VC\Release\Win32" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /G5 /W3 /GX /Zi /Ot /Og /Oi /Op /Oy /Ob1 /Gy /I "..\..\libs\libpng-src" /I "..\..\libs\zlib" /D "NDEBUG" /D "_WINDOWS" /D "USEASM" /D "HAVE_PNG" /FR /FD /GF /Gs /GF /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "NDEBUG" /o "NUL" /win32 -# SUBTRACT MTL /mktyplib203 -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo /o"..\..\objs\Release\Srb2win.bsc" -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 dxguid.lib user32.lib gdi32.lib winmm.lib advapi32.lib ws2_32.lib dinput.lib /nologo /subsystem:windows /pdb:"C:\srb2demo2\srb2.pdb" /debug /machine:I386 /out:"C:\srb2demo2\srb2win.exe" -# SUBTRACT LINK32 /profile /pdb:none /incremental:yes /nodefaultlib - -!ELSEIF "$(CFG)" == "Srb2win - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\..\objs\Debug" -# PROP BASE Intermediate_Dir "..\..\objs\Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\bin\VC\Debug\Win32" -# PROP Intermediate_Dir "..\..\objs\VC\Debug\Win32" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /G6 /W4 /Gm /GX /ZI /Od /Op /Oy /I "libs\libpng-src" /I "..\..\libs\libpng-src" /I "..\..\libs\zlib" /D "_DEBUG" /D "_WINDOWS" /D "USEASM" /D "HAVE_PNG" /FAcs /FR /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 dxguid.lib user32.lib gdi32.lib winmm.lib advapi32.lib ws2_32.lib dinput.lib /nologo /subsystem:windows /profile /debug /machine:I386 /out:"C:\srb2demo2\srb2debug.exe" -# SUBTRACT LINK32 /nodefaultlib - -!ENDIF - -# Begin Target - -# Name "Srb2win - Win32 Release" -# Name "Srb2win - Win32 Debug" -# Begin Group "Win32app" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\afxres.h -# End Source File -# Begin Source File - -SOURCE=.\dx_error.c -# End Source File -# Begin Source File - -SOURCE=.\dx_error.h -# End Source File -# Begin Source File - -SOURCE=.\fabdxlib.c -# End Source File -# Begin Source File - -SOURCE=.\fabdxlib.h -# End Source File -# Begin Source File - -SOURCE=..\filesrch.c -# End Source File -# Begin Source File - -SOURCE=..\filesrch.h -# End Source File -# Begin Source File - -SOURCE=.\mid2strm.c -# End Source File -# Begin Source File - -SOURCE=.\mid2strm.h -# End Source File -# Begin Source File - -SOURCE=.\midstuff.h -# End Source File -# Begin Source File - -SOURCE=.\resource.h -# End Source File -# Begin Source File - -SOURCE=.\Srb2win.rc - -!IF "$(CFG)" == "Srb2win - Win32 Release" - -# ADD BASE RSC /l 0x40c /i "win32" -# ADD RSC /l 0x409 /i "win32" - -!ELSEIF "$(CFG)" == "Srb2win - Win32 Debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\win_cd.c -# End Source File -# Begin Source File - -SOURCE=.\win_dbg.c -# End Source File -# Begin Source File - -SOURCE=.\win_dbg.h -# End Source File -# Begin Source File - -SOURCE=.\win_dll.c -# End Source File -# Begin Source File - -SOURCE=.\win_dll.h -# End Source File -# Begin Source File - -SOURCE=.\win_main.c -# End Source File -# Begin Source File - -SOURCE=.\win_main.h -# End Source File -# Begin Source File - -SOURCE=.\win_net.c -# End Source File -# Begin Source File - -SOURCE=.\win_snd.c -# End Source File -# Begin Source File - -SOURCE=.\win_sys.c -# End Source File -# Begin Source File - -SOURCE=.\win_vid.c -# End Source File -# End Group -# Begin Group "A_Asm" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\p5prof.h -# End Source File -# Begin Source File - -SOURCE=..\tmap.nas - -!IF "$(CFG)" == "Srb2win - Win32 Release" - -# PROP Ignore_Default_Tool 1 -# Begin Custom Build - Compiling $(InputName).nas with NASM... -IntDir=.\..\..\objs\VC\Release\Win32 -InputPath=..\tmap.nas -InputName=tmap - -"$(IntDir)/$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -g -o $(IntDir)/$(InputName).obj -f win32 $(InputPath) - -# End Custom Build - -!ELSEIF "$(CFG)" == "Srb2win - Win32 Debug" - -# PROP Ignore_Default_Tool 1 -# Begin Custom Build - Compiling $(InputName).nas with NASM... -IntDir=.\..\..\objs\VC\Debug\Win32 -InputPath=..\tmap.nas -InputName=tmap - -"$(IntDir)/$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -g -o $(IntDir)/$(InputName).obj -f win32 $(InputPath) - -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\tmap_mmx.nas - -!IF "$(CFG)" == "Srb2win - Win32 Release" - -# PROP Ignore_Default_Tool 1 -# Begin Custom Build - Compiling $(InputName).nas with NASM... -IntDir=.\..\..\objs\VC\Release\Win32 -InputPath=..\tmap_mmx.nas -InputName=tmap_mmx - -"$(IntDir)/$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -g -o $(IntDir)/$(InputName).obj -f win32 $(InputPath) - -# End Custom Build - -!ELSEIF "$(CFG)" == "Srb2win - Win32 Debug" - -# PROP Ignore_Default_Tool 1 -# Begin Custom Build - Compiling $(InputName).nas with NASM... -IntDir=.\..\..\objs\VC\Debug\Win32 -InputPath=..\tmap_mmx.nas -InputName=tmap_mmx - -"$(IntDir)/$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -g -o $(IntDir)/$(InputName).obj -f win32 $(InputPath) - -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\tmap_vc.nas - -!IF "$(CFG)" == "Srb2win - Win32 Release" - -# Begin Custom Build - Compiling $(InputName).nas with NASM... -IntDir=.\..\..\objs\VC\Release\Win32 -InputPath=..\tmap_vc.nas -InputName=tmap_vc - -"$(IntDir)/$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -g -o $(IntDir)/$(InputName).obj -f win32 $(InputPath) - -# End Custom Build - -!ELSEIF "$(CFG)" == "Srb2win - Win32 Debug" - -# PROP Ignore_Default_Tool 1 -# Begin Custom Build - Compiling $(InputName).nas with NASM... -IntDir=.\..\..\objs\VC\Debug\Win32 -InputPath=..\tmap_vc.nas -InputName=tmap_vc - -"$(IntDir)/$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -g -o $(IntDir)/$(InputName).obj -f win32 $(InputPath) - -# End Custom Build - -!ENDIF - -# End Source File -# End Group -# Begin Group "D_Doom" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\comptime.c -# End Source File -# Begin Source File - -SOURCE=..\d_clisrv.c -# End Source File -# Begin Source File - -SOURCE=..\d_clisrv.h -# End Source File -# Begin Source File - -SOURCE=..\d_event.h -# End Source File -# Begin Source File - -SOURCE=..\d_main.c -# End Source File -# Begin Source File - -SOURCE=..\d_main.h -# End Source File -# Begin Source File - -SOURCE=..\d_net.c -# End Source File -# Begin Source File - -SOURCE=..\d_net.h -# End Source File -# Begin Source File - -SOURCE=..\d_netcmd.c -# End Source File -# Begin Source File - -SOURCE=..\d_netcmd.h -# End Source File -# Begin Source File - -SOURCE=..\d_netfil.c -# End Source File -# Begin Source File - -SOURCE=..\d_netfil.h -# End Source File -# Begin Source File - -SOURCE=..\d_player.h -# End Source File -# Begin Source File - -SOURCE=..\d_think.h -# End Source File -# Begin Source File - -SOURCE=..\d_ticcmd.h -# End Source File -# Begin Source File - -SOURCE=..\dehacked.c -# End Source File -# Begin Source File - -SOURCE=..\dehacked.h -# End Source File -# Begin Source File - -SOURCE=..\doomdata.h -# End Source File -# Begin Source File - -SOURCE=..\doomdef.h -# End Source File -# Begin Source File - -SOURCE=..\doomstat.h -# End Source File -# Begin Source File - -SOURCE=..\doomtype.h -# End Source File -# Begin Source File - -SOURCE=..\z_zone.c -# End Source File -# Begin Source File - -SOURCE=..\z_zone.h -# End Source File -# End Group -# Begin Group "F_Frame" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\f_finale.c -# End Source File -# Begin Source File - -SOURCE=..\f_finale.h -# End Source File -# Begin Source File - -SOURCE=..\f_wipe.c -# End Source File -# End Group -# Begin Group "G_Game" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\g_game.c -# End Source File -# Begin Source File - -SOURCE=..\g_game.h -# End Source File -# Begin Source File - -SOURCE=..\g_input.c -# End Source File -# Begin Source File - -SOURCE=..\g_input.h -# End Source File -# Begin Source File - -SOURCE=..\g_state.h -# End Source File -# End Group -# Begin Group "H_Hud" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\am_map.c -# End Source File -# Begin Source File - -SOURCE=..\am_map.h -# End Source File -# Begin Source File - -SOURCE=..\command.c -# End Source File -# Begin Source File - -SOURCE=..\command.h -# End Source File -# Begin Source File - -SOURCE=..\console.c -# End Source File -# Begin Source File - -SOURCE=..\console.h -# End Source File -# Begin Source File - -SOURCE=..\hu_stuff.c -# End Source File -# Begin Source File - -SOURCE=..\hu_stuff.h -# End Source File -# Begin Source File - -SOURCE=..\st_stuff.c -# End Source File -# Begin Source File - -SOURCE=..\st_stuff.h -# End Source File -# Begin Source File - -SOURCE=..\y_inter.c -# End Source File -# Begin Source File - -SOURCE=..\y_inter.h -# End Source File -# End Group -# Begin Group "Hw_Hardware" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\hardware\hw3dsdrv.h -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw3sound.c -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw3sound.h -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_bsp.c -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_cache.c -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_data.h -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_defs.h -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_dll.h -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_draw.c -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_drv.h -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_glob.h -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_light.c -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_light.h -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_main.c -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_main.h -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_md2.c -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_md2.h -# End Source File -# Begin Source File - -SOURCE=..\hardware\hws_data.h -# End Source File -# End Group -# Begin Group "I_Interface" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\byteptr.h -# End Source File -# Begin Source File - -SOURCE=..\i_joy.h -# End Source File -# Begin Source File - -SOURCE=..\i_net.h -# End Source File -# Begin Source File - -SOURCE=..\i_sound.h -# End Source File -# Begin Source File - -SOURCE=..\i_system.h -# End Source File -# Begin Source File - -SOURCE=..\i_tcp.c -# End Source File -# Begin Source File - -SOURCE=..\i_tcp.h -# End Source File -# Begin Source File - -SOURCE=..\i_video.h -# End Source File -# Begin Source File - -SOURCE=..\keys.h -# End Source File -# Begin Source File - -SOURCE=..\mserv.c -# End Source File -# Begin Source File - -SOURCE=..\mserv.h -# End Source File -# End Group -# Begin Group "M_Misc" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\m_argv.c -# End Source File -# Begin Source File - -SOURCE=..\m_argv.h -# End Source File -# Begin Source File - -SOURCE=..\m_bbox.c -# End Source File -# Begin Source File - -SOURCE=..\m_bbox.h -# End Source File -# Begin Source File - -SOURCE=..\m_cheat.c -# End Source File -# Begin Source File - -SOURCE=..\m_cheat.h -# End Source File -# Begin Source File - -SOURCE=..\m_dllist.h -# End Source File -# Begin Source File - -SOURCE=..\m_fixed.c -# End Source File -# Begin Source File - -SOURCE=..\m_fixed.h -# End Source File -# Begin Source File - -SOURCE=..\m_menu.c -# End Source File -# Begin Source File - -SOURCE=..\m_menu.h -# End Source File -# Begin Source File - -SOURCE=..\m_misc.c -# End Source File -# Begin Source File - -SOURCE=..\m_misc.h -# End Source File -# Begin Source File - -SOURCE=..\m_queue.c -# End Source File -# Begin Source File - -SOURCE=..\m_queue.h -# End Source File -# Begin Source File - -SOURCE=..\m_random.c -# End Source File -# Begin Source File - -SOURCE=..\m_random.h -# End Source File -# Begin Source File - -SOURCE=..\m_swap.h -# End Source File -# Begin Source File - -SOURCE=..\string.c -# End Source File -# End Group -# Begin Group "P_Play" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\info.c -# End Source File -# Begin Source File - -SOURCE=..\info.h -# End Source File -# Begin Source File - -SOURCE=..\p_ceilng.c -# End Source File -# Begin Source File - -SOURCE=..\p_enemy.c -# End Source File -# Begin Source File - -SOURCE=..\p_fab.c -# End Source File -# Begin Source File - -SOURCE=..\p_floor.c -# End Source File -# Begin Source File - -SOURCE=..\p_inter.c -# End Source File -# Begin Source File - -SOURCE=..\p_lights.c -# End Source File -# Begin Source File - -SOURCE=..\p_local.h -# End Source File -# Begin Source File - -SOURCE=..\p_map.c -# End Source File -# Begin Source File - -SOURCE=..\p_maputl.c -# End Source File -# Begin Source File - -SOURCE=..\p_maputl.h -# End Source File -# Begin Source File - -SOURCE=..\p_mobj.c -# End Source File -# Begin Source File - -SOURCE=..\p_mobj.h -# End Source File -# Begin Source File - -SOURCE=..\p_polyobj.c -# End Source File -# Begin Source File - -SOURCE=..\p_polyobj.h -# End Source File -# Begin Source File - -SOURCE=..\p_pspr.h -# End Source File -# Begin Source File - -SOURCE=..\p_saveg.c -# End Source File -# Begin Source File - -SOURCE=..\p_saveg.h -# End Source File -# Begin Source File - -SOURCE=..\p_setup.c -# End Source File -# Begin Source File - -SOURCE=..\p_setup.h -# End Source File -# Begin Source File - -SOURCE=..\p_sight.c -# End Source File -# Begin Source File - -SOURCE=..\p_spec.c -# End Source File -# Begin Source File - -SOURCE=..\p_spec.h -# End Source File -# Begin Source File - -SOURCE=..\p_telept.c -# End Source File -# Begin Source File - -SOURCE=..\p_tick.c -# End Source File -# Begin Source File - -SOURCE=..\p_tick.h -# End Source File -# Begin Source File - -SOURCE=..\p_user.c -# End Source File -# Begin Source File - -SOURCE=..\tables.c -# End Source File -# Begin Source File - -SOURCE=..\tables.h -# End Source File -# End Group -# Begin Group "R_Rend" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\r_bsp.c -# End Source File -# Begin Source File - -SOURCE=..\r_bsp.h -# End Source File -# Begin Source File - -SOURCE=..\r_data.c -# End Source File -# Begin Source File - -SOURCE=..\r_data.h -# End Source File -# Begin Source File - -SOURCE=..\r_defs.h -# End Source File -# Begin Source File - -SOURCE=..\r_draw.c -# End Source File -# Begin Source File - -SOURCE=..\r_draw.h -# End Source File -# Begin Source File - -SOURCE=..\r_draw16.c -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=..\r_draw8.c -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=..\r_local.h -# End Source File -# Begin Source File - -SOURCE=..\r_main.c -# End Source File -# Begin Source File - -SOURCE=..\r_main.h -# End Source File -# Begin Source File - -SOURCE=..\r_plane.c -# End Source File -# Begin Source File - -SOURCE=..\r_plane.h -# End Source File -# Begin Source File - -SOURCE=..\r_segs.c -# End Source File -# Begin Source File - -SOURCE=..\r_segs.h -# End Source File -# Begin Source File - -SOURCE=..\r_sky.c -# End Source File -# Begin Source File - -SOURCE=..\r_sky.h -# End Source File -# Begin Source File - -SOURCE=..\r_splats.c -# End Source File -# Begin Source File - -SOURCE=..\r_splats.h -# End Source File -# Begin Source File - -SOURCE=..\r_state.h -# End Source File -# Begin Source File - -SOURCE=..\r_things.c -# End Source File -# Begin Source File - -SOURCE=..\r_things.h -# End Source File -# Begin Source File - -SOURCE=..\screen.c -# End Source File -# Begin Source File - -SOURCE=..\screen.h -# End Source File -# Begin Source File - -SOURCE=..\v_video.c -# End Source File -# Begin Source File - -SOURCE=..\v_video.h -# End Source File -# End Group -# Begin Group "S_Sounds" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\s_sound.c -# End Source File -# Begin Source File - -SOURCE=..\s_sound.h -# End Source File -# Begin Source File - -SOURCE=..\sounds.c -# End Source File -# Begin Source File - -SOURCE=..\sounds.h -# End Source File -# End Group -# Begin Group "W_Wad" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\lzf.c -# End Source File -# Begin Source File - -SOURCE=..\lzf.h -# End Source File -# Begin Source File - -SOURCE=..\md5.c -# End Source File -# Begin Source File - -SOURCE=..\md5.h -# End Source File -# Begin Source File - -SOURCE=..\w_wad.c -# End Source File -# Begin Source File - -SOURCE=..\w_wad.h -# End Source File -# End Group -# Begin Group "Docs" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\doc\copying -# End Source File -# Begin Source File - -SOURCE=..\..\doc\faq.txt -# End Source File -# Begin Source File - -SOURCE=..\..\readme.txt -# End Source File -# Begin Source File - -SOURCE=..\..\doc\source.txt -# End Source File -# End Group -# Begin Source File - -SOURCE=.\Srb2win.ico -# End Source File -# End Target -# End Project diff --git a/src/win32/Srb2win.dsw b/src/win32/Srb2win.dsw deleted file mode 100644 index f20998142..000000000 --- a/src/win32/Srb2win.dsw +++ /dev/null @@ -1,77 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "Srb2win"=.\Srb2win.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libpng - End Project Dependency - Begin Project Dependency - Project_Dep_Name zlib - End Project Dependency -}}} - -############################################################################### - -Project: "libpng"="..\..\libs\libpng-src\projects\visualc6\libpng.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name zlib - End Project Dependency -}}} - -############################################################################### - -Project: "r_opengl"=..\hardware\r_opengl\r_opengl.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Srb2win - End Project Dependency -}}} - -############################################################################### - -Project: "zlib"=..\..\libs\zlib\projects\visualc6\zlib.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/src/win32/Srb2win.props b/src/win32/Srb2win.props deleted file mode 100644 index fa152f0c9..000000000 --- a/src/win32/Srb2win.props +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - HAVE_ZLIB;HAVE_LIBGME;_WINDOWS;%(PreprocessorDefinitions) - - _WINDOWS;%(PreprocessorDefinitions) - - - - dxguid.lib;winmm.lib;dinput8.lib;%(AdditionalDependencies) - - - - \ No newline at end of file diff --git a/src/win32/Srb2win.rc b/src/win32/Srb2win.rc index 0a280448b..869c0e7d3 100644 --- a/src/win32/Srb2win.rc +++ b/src/win32/Srb2win.rc @@ -2,6 +2,7 @@ // #include "resource.h" #include "winver.h" +#include "winuser.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -76,8 +77,8 @@ END #include "../doomdef.h" // Needed for version string VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,2,9,0 - PRODUCTVERSION 2,2,9,0 + FILEVERSION 2,2,11,0 + PRODUCTVERSION 2,2,11,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -97,7 +98,7 @@ BEGIN VALUE "FileDescription", "Sonic Robo Blast 2\0" VALUE "FileVersion", VERSIONSTRING_RC VALUE "InternalName", "srb2\0" - VALUE "LegalCopyright", "Copyright 1998-2021 by Sonic Team Junior\0" + VALUE "LegalCopyright", "Copyright 1998-2023 by Sonic Team Junior\0" VALUE "LegalTrademarks", "Sonic the Hedgehog and related characters are trademarks of Sega.\0" VALUE "OriginalFilename", "srb2win.exe\0" VALUE "PrivateBuild", "\0" @@ -128,4 +129,3 @@ END ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED - diff --git a/src/win32/dx_error.c b/src/win32/dx_error.c deleted file mode 100644 index 8e14539a3..000000000 --- a/src/win32/dx_error.c +++ /dev/null @@ -1,276 +0,0 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- -// -// Copyright (C) 1998-2000 by DooM Legacy Team. -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -//----------------------------------------------------------------------------- -/// \file -/// \brief DirectX error messages -/// adapted from DirectX6 sample code - -#include - -//#define WIN32_LEAN_AND_MEAN -#define RPC_NO_WINDOWS_H -#include -#define DIRECTSOUND_VERSION 0x0600 /* version 6.0 */ -#define DXVERSION_NTCOMPATIBLE 0x0300 -#ifdef _MSC_VER -#pragma warning(disable : 4201) -#endif -#include -#include -#include - -#include "dx_error.h" - -// ----------------- -// DXErrorMessageBox -// Displays a message box containing the given formatted string. -// ----------------- -/* -VOID DXErrorMessageBox (HRESULT error) LPSTR fmt, ...) -{ - char buff[256]; - va_list args; - - va_start(args, fmt); - wvsprintf(buff, fmt, args); - va_end(args); - - lstrcat(buff, "\r\n"); - MessageBoxA(NULL, buff, "DirectX Error:", MB_ICONEXCLAMATION + MB_OK); -}*/ - - -// --------------- -// DXErrorToString -// Returns a pointer to a string describing the given DD, D3D or D3DRM error code. -// --------------- -LPCSTR DXErrorToString (HRESULT error) -{ - switch (error) { - case DD_OK: - /* Also includes D3D_OK and D3DRM_OK */ - return "No error."; - case DDERR_ALREADYINITIALIZED: - return "This object is already initialized."; - case DDERR_BLTFASTCANTCLIP: - return "Return if a clipper object is attached to the source surface passed into a BltFast call."; - case DDERR_CANNOTATTACHSURFACE: - return "This surface can not be attached to the requested surface."; - case DDERR_CANNOTDETACHSURFACE: - return "This surface can not be detached from the requested surface."; - case DDERR_CANTCREATEDC: - return "Windows can not create any more DCs."; - case DDERR_CANTDUPLICATE: - return "Can't duplicate primary & 3D surfaces, or surfaces that are implicitly created."; - case DDERR_CLIPPERISUSINGHWND: - return "An attempt was made to set a cliplist for a clipper object that is already monitoring an hwnd."; - case DDERR_COLORKEYNOTSET: - return "No src color key specified for this operation."; - case DDERR_CURRENTLYNOTAVAIL: - return "Support is currently not available."; - case DDERR_DIRECTDRAWALREADYCREATED: - return "A DirectDraw object representing this driver has already been created for this process."; - case DDERR_EXCEPTION: - return "An exception was encountered while performing the requested operation."; - case DDERR_EXCLUSIVEMODEALREADYSET: - return "An attempt was made to set the cooperative level when it was already set to exclusive."; - case DDERR_GENERIC: - return "Generic failure."; - case DDERR_HEIGHTALIGN: - return "Height of rectangle provided is not a multiple of reqd alignment."; - case DDERR_HWNDALREADYSET: - return "The CooperativeLevel HWND has already been set. It can not be reset while the process has surfaces or palettes created."; - case DDERR_HWNDSUBCLASSED: - return "HWND used by DirectDraw CooperativeLevel has been subclassed, this prevents DirectDraw from restoring state."; - case DDERR_IMPLICITLYCREATED: - return "This surface can not be restored because it is an implicitly created surface."; - case DDERR_INCOMPATIBLEPRIMARY: - return "Unable to match primary surface creation request with existing primary surface."; - case DDERR_INVALIDCAPS: - return "One or more of the caps bits passed to the callback are incorrect."; - case DDERR_INVALIDCLIPLIST: - return "DirectDraw does not support the provided cliplist."; - case DDERR_INVALIDDIRECTDRAWGUID: - return "The GUID passed to DirectDrawCreate is not a valid DirectDraw driver identifier."; - case DDERR_INVALIDMODE: - return "DirectDraw does not support the requested mode."; - case DDERR_INVALIDOBJECT: - return "DirectDraw received a pointer that was an invalid DIRECTDRAW object."; - case DDERR_INVALIDPARAMS: - return "One or more of the parameters passed to the function are incorrect."; - case DDERR_INVALIDPIXELFORMAT: - return "The pixel format was invalid as specified."; - case DDERR_INVALIDPOSITION: - return "Returned when the position of the overlay on the destination is no longer legal for that destination."; - case DDERR_INVALIDRECT: - return "Rectangle provided was invalid."; - case DDERR_LOCKEDSURFACES: - return "Operation could not be carried out because one or more surfaces are locked."; - case DDERR_NO3D: - return "There is no 3D present."; - case DDERR_NOALPHAHW: - return "Operation could not be carried out because there is no alpha accleration hardware present or available."; - case DDERR_NOBLTHW: - return "No blitter hardware present."; - case DDERR_NOCLIPLIST: - return "No cliplist available."; - case DDERR_NOCLIPPERATTACHED: - return "No clipper object attached to surface object."; - case DDERR_NOCOLORCONVHW: - return "Operation could not be carried out because there is no color conversion hardware present or available."; - case DDERR_NOCOLORKEY: - return "Surface doesn't currently have a color key"; - case DDERR_NOCOLORKEYHW: - return "Operation could not be carried out because there is no hardware support of the destination color key."; - case DDERR_NOCOOPERATIVELEVELSET: - return "Create function called without DirectDraw object method SetCooperativeLevel being called."; - case DDERR_NODC: - return "No DC was ever created for this surface."; - case DDERR_NODDROPSHW: - return "No DirectDraw ROP hardware."; - case DDERR_NODIRECTDRAWHW: - return "A hardware-only DirectDraw object creation was attempted but the driver did not support any hardware."; - case DDERR_NOEMULATION: - return "Software emulation not available."; - case DDERR_NOEXCLUSIVEMODE: - return "Operation requires the application to have exclusive mode but the application does not have exclusive mode."; - case DDERR_NOFLIPHW: - return "Flipping visible surfaces is not supported."; - case DDERR_NOGDI: - return "There is no GDI present."; - case DDERR_NOHWND: - return "Clipper notification requires an HWND or no HWND has previously been set as the CooperativeLevel HWND."; - case DDERR_NOMIRRORHW: - return "Operation could not be carried out because there is no hardware present or available."; - case DDERR_NOOVERLAYDEST: - return "Returned when GetOverlayPosition is called on an overlay that UpdateOverlay has never been called on to establish a destination."; - case DDERR_NOOVERLAYHW: - return "Operation could not be carried out because there is no overlay hardware present or available."; - case DDERR_NOPALETTEATTACHED: - return "No palette object attached to this surface."; - case DDERR_NOPALETTEHW: - return "No hardware support for 16 or 256 color palettes."; - case DDERR_NORASTEROPHW: - return "Operation could not be carried out because there is no appropriate raster op hardware present or available."; - case DDERR_NOROTATIONHW: - return "Operation could not be carried out because there is no rotation hardware present or available."; - case DDERR_NOSTRETCHHW: - return "Operation could not be carried out because there is no hardware support for stretching."; - case DDERR_NOT4BITCOLOR: - return "DirectDrawSurface is not in 4 bit color palette and the requested operation requires 4 bit color palette."; - case DDERR_NOT4BITCOLORINDEX: - return "DirectDrawSurface is not in 4 bit color index palette and the requested operation requires 4 bit color index palette."; - case DDERR_NOT8BITCOLOR: - return "DirectDrawSurface is not in 8 bit color mode and the requested operation requires 8 bit color."; - case DDERR_NOTAOVERLAYSURFACE: - return "Returned when an overlay member is called for a non-overlay surface."; - case DDERR_NOTEXTUREHW: - return "Operation could not be carried out because there is no texture mapping hardware present or available."; - case DDERR_NOTFLIPPABLE: - return "An attempt has been made to flip a surface that is not flippable."; - case DDERR_NOTFOUND: - return "Requested item was not found."; - case DDERR_NOTLOCKED: - return "Surface was not locked. An attempt to unlock a surface that was not locked at all, or by this process, has been attempted."; - case DDERR_NOTPALETTIZED: - return "The surface being used is not a palette-based surface."; - case DDERR_NOVSYNCHW: - return "Operation could not be carried out because there is no hardware support for vertical blank synchronized operations."; - case DDERR_NOZBUFFERHW: - return "Operation could not be carried out because there is no hardware support for zbuffer blitting."; - case DDERR_NOZOVERLAYHW: - return "Overlay surfaces could not be z layered based on their BltOrder because the hardware does not support z layering of overlays."; - case DDERR_OUTOFCAPS: - return "The hardware needed for the requested operation has already been allocated."; - case DDERR_OUTOFMEMORY: - return "There is not enough memory to perform the operation."; - case DDERR_OUTOFVIDEOMEMORY: - return "DirectDraw does not have enough memory to perform the operation."; - case DDERR_OVERLAYCANTCLIP: - return "The hardware does not support clipped overlays."; - case DDERR_OVERLAYCOLORKEYONLYONEACTIVE: - return "Can only have ony color key active at one time for overlays."; - case DDERR_OVERLAYNOTVISIBLE: - return "Returned when GetOverlayPosition is called on a hidden overlay."; - case DDERR_PALETTEBUSY: - return "Access to this palette is being refused because the palette is already locked by another thread."; - case DDERR_PRIMARYSURFACEALREADYEXISTS: - return "This process already has created a primary surface."; - case DDERR_REGIONTOOSMALL: - return "Region passed to Clipper::GetClipList is too small."; - case DDERR_SURFACEALREADYATTACHED: - return "This surface is already attached to the surface it is being attached to."; - case DDERR_SURFACEALREADYDEPENDENT: - return "This surface is already a dependency of the surface it is being made a dependency of."; - case DDERR_SURFACEBUSY: - return "Access to this surface is being refused because the surface is already locked by another thread."; - case DDERR_SURFACEISOBSCURED: - return "Access to surface refused because the surface is obscured."; - case DDERR_SURFACELOST: - return "Access to this surface is being refused because the surface memory is gone. The DirectDrawSurface object representing this surface should have Restore called on it."; - case DDERR_SURFACENOTATTACHED: - return "The requested surface is not attached."; - case DDERR_TOOBIGHEIGHT: - return "Height requested by DirectDraw is too large."; - case DDERR_TOOBIGSIZE: - return "Size requested by DirectDraw is too large, but the individual height and width are OK."; - case DDERR_TOOBIGWIDTH: - return "Width requested by DirectDraw is too large."; - case DDERR_UNSUPPORTED: - return "Function call not supported."; - case DDERR_UNSUPPORTEDFORMAT: - return "FOURCC format requested is unsupported by DirectDraw."; - case DDERR_UNSUPPORTEDMASK: - return "Bitmask in the pixel format requested is unsupported by DirectDraw."; - case DDERR_VERTICALBLANKINPROGRESS: - return "Vertical blank is in progress."; - case DDERR_WASSTILLDRAWING: - return "Informs DirectDraw that the previous Blt which is transfering information to or from this Surface is incomplete."; - case DDERR_WRONGMODE: - return "This surface can not be restored because it was created in a different mode."; - case DDERR_XALIGN: - return "Rectangle provided was not horizontally aligned on required boundary."; - - // - // DirectSound errors - // - case DSERR_ALLOCATED: - return "The request failed because resources, such as a priority level, were already in use by another caller."; - case DSERR_ALREADYINITIALIZED: - return "The object is already initialized."; - case DSERR_BADFORMAT: - return "The specified wave format is not supported."; - case DSERR_BUFFERLOST: - return "The buffer memory has been lost and must be restored."; - case DSERR_CONTROLUNAVAIL: - return "The control (volume, pan, and so forth) requested by the caller is not available."; - case DSERR_INVALIDCALL: - return "This function is not valid for the current state of this object."; - case DSERR_NOAGGREGATION: - return "The object does not support aggregation."; - case DSERR_NODRIVER: - return "No sound driver is available for use."; - case DSERR_NOINTERFACE: - return "The requested COM interface is not available."; - case DSERR_OTHERAPPHASPRIO: - return "Another application has a higher priority level, preventing this call from succeeding"; - case DSERR_PRIOLEVELNEEDED: - return "The caller does not have the priority level required for the function to succeed."; - case DSERR_UNINITIALIZED: - return "The IDirectSound::Initialize method has not been called or has not been called successfully before other methods were called."; - default: - return "Unrecognized error value."; - } -} diff --git a/src/win32/dx_error.h b/src/win32/dx_error.h deleted file mode 100644 index 3af4220de..000000000 --- a/src/win32/dx_error.h +++ /dev/null @@ -1,39 +0,0 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- -// -// Copyright (C) 1998-2000 by DooM Legacy Team. -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -//----------------------------------------------------------------------------- -/// \file -/// \brief transform an unreadable DirectX error code -/// into a meaningful error message. - -#ifndef __DX_ERROR_H__ -#define __DX_ERROR_H__ - -//#define WIN32_LEAN_AND_MEAN -#include - -#ifdef __cplusplus -extern "C" { -#endif - -// Displays a message box containing the given formatted string. -//VOID DXErrorMessageBox (LPSTR fmt, ...); - -// Returns a pointer to a string describing the given DD, D3D or D3DRM error code. -LPCSTR DXErrorToString (HRESULT error); - -#ifdef __cplusplus -}; -#endif -#endif // __DX_ERROR_H__ diff --git a/src/win32/fabdxlib.c b/src/win32/fabdxlib.c deleted file mode 100644 index 45ec5d0d3..000000000 --- a/src/win32/fabdxlib.c +++ /dev/null @@ -1,677 +0,0 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- -// -// Copyright (C) 1998-2000 by DooM Legacy Team. -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -//----------------------------------------------------------------------------- -/// \file -/// \brief faB's DirectX library v1.0 -/// - converted to C for Doom Legacy - -#include "../doomdef.h" - -#ifdef _WINDOWS - -//#define WIN32_LEAN_AND_MEAN -#define RPC_NO_WINDOWS_H -#include -#include -#include "../i_system.h" -#include "dx_error.h" - -#include "fabdxlib.h" - -#define NT4COMPAT //always defined, always compatible - - -// globals - -IDirectDraw2* DDr2 = NULL; -IDirectDrawSurface* ScreenReal = NULL; // DirectDraw primary surface -IDirectDrawSurface* ScreenVirtual = NULL; // DirectDraw back surface -IDirectDrawPalette* DDPalette = NULL; // The primary surface palette -static IDirectDrawClipper *windclip = NULL; // clipper for windowed mode - -BOOL bAppFullScreen; // true for fullscreen exclusive mode, - -int windowPosX = 0; // current position in windowed mode -int windowPosY = 0; - -int ScreenWidth; -int ScreenHeight; -BOOL ScreenLocked; // Screen surface is being locked -int ScreenPitch; // offset from one line to the next -LPBYTE ScreenPtr; // memory of the surface - - -// -// CreateNewSurface -// -static inline IDirectDrawSurface* CreateNewSurface(int dwWidth, - int dwHeight, - int dwSurfaceCaps) -{ - DDSURFACEDESC ddsd; - HRESULT hr; - LPDIRECTDRAWSURFACE psurf; - - ZeroMemory(&ddsd, sizeof (ddsd)); - ddsd.dwSize = sizeof (ddsd); - ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT |DDSD_WIDTH; - - ddsd.ddsCaps.dwCaps = dwSurfaceCaps; - - ddsd.dwHeight = dwHeight; - ddsd.dwWidth = dwWidth; - - hr = IDirectDraw2_CreateSurface (DDr2, &ddsd, &psurf, NULL); - - if (hr == DD_OK) - { - //DDCOLORKEY ddck; - IDirectDrawSurface_Restore(psurf); - - //hr = IDirectDrawSurface_GetColorKey(DDCKEY_SRCBLT, &ddck); - //psurf->SetColorKey(DDCKEY_SRCBLT, &ddck); - } - else - psurf = NULL; - - return psurf; -} - -// -// wow! from 320x200x8 up to 1600x1200x32 thanks Banshee! :) -// -static HRESULT WINAPI myEnumModesCallback (LPDDSURFACEDESC surf, LPVOID lpContext) -{ - APPENUMMODESCALLBACK pfnContext = lpContext; - - if (pfnContext) pfnContext(surf->dwWidth, - surf->dwHeight,surf->ddpfPixelFormat. -#ifdef DUMMYUNIONNAMEN - DUMMYUNIONNAMEN(1). -#endif - dwRGBBitCount - ); - - /*I_OutputMsg("%dx%dx%d bpp %d refresh\n", - surf->dwWidth, - surf->dwHeight, - surf->ddpfPixelFormat.dwRGBBitCount, - surf->dwRefreshRate);*/ - - return DDENUMRET_OK; -} - - -// -// Application call here to enumerate display modes -// -BOOL EnumDirectDrawDisplayModes (APPENUMMODESCALLBACK appFunc) -{ - LPVOID lpappFunc = appFunc; - - if (DDr2 == NULL) - return FALSE; - - // enumerate display modes - // Carl: DirectX 3.x apparently does not support VGA modes. Who cares. :) - // faB: removed DDEDM_REFRESHRATES, detects too many modes, plus we don't care of refresh rate. - if (bDX0300) - IDirectDraw2_EnumDisplayModes (DDr2, 0 /*| DDEDM_REFRESHRATES*/, - NULL, lpappFunc, myEnumModesCallback); - else - IDirectDraw2_EnumDisplayModes (DDr2, DDEDM_STANDARDVGAMODES /*| DDEDM_REFRESHRATES*/, - NULL, lpappFunc, myEnumModesCallback); - return TRUE; -} - -static HINSTANCE DDrawDLL = NULL; -typedef HRESULT(WINAPI *DDCreate)(GUID FAR *lpGUID, LPDIRECTDRAW FAR *lplpDD, IUnknown FAR *pUnkOuter); -static DDCreate pfnDirectDrawCreate = NULL; - -static inline BOOL LoadDirectDraw(VOID) -{ - // load ddraw.dll - DDrawDLL = LoadLibraryA("DDRAW.DLL"); - if (DDrawDLL == NULL) - return false; - pfnDirectDrawCreate = (DDCreate)(LPVOID)GetProcAddress(DDrawDLL, "DirectDrawCreate"); - if (pfnDirectDrawCreate == NULL) - return false; - return true; -} - -static inline VOID UnLoadDirectDraw(VOID) -{ - if (!DDrawDLL) - return; - FreeLibrary(DDrawDLL); - pfnDirectDrawCreate = NULL; - DDrawDLL = NULL; -} - -// -// Create the DirectDraw object for later -// -BOOL CreateDirectDrawInstance (VOID) -{ - HRESULT hr; - IDirectDraw* DDr; - IDirectDraw** rp = &DDr; - IDirectDraw2** rp2 = &DDr2; - LPVOID *tp = (LPVOID *)rp2; - - if (!LoadDirectDraw()) - return FALSE; - // - // create an instance of DirectDraw object - // - if (FAILED(hr = pfnDirectDrawCreate(NULL, rp, NULL))) - I_Error("DirectDrawCreate FAILED: %s", DXErrorToString(hr)); - - // change interface to IDirectDraw2 - if (FAILED(hr = IDirectDraw_QueryInterface(DDr, &IID_IDirectDraw2, tp))) - I_Error("Failed to query DirectDraw2 interface: %s", DXErrorToString(hr)); - - // release the interface we don't need - IDirectDraw_Release (DDr); - return TRUE; -} - - -// -// - returns true if DirectDraw was initialized properly -// -int InitDirectDrawe (HWND appWin, int width, int height, int bpp, int fullScr) -{ - DDSURFACEDESC ddsd; // DirectDraw surface description for allocating - DDSCAPS ddscaps; - HRESULT ddrval; - - DWORD dwStyle; - RECT rect; - - // enumerate directdraw devices - //if (FAILED(DirectDrawEnumerate (myEnumDDDevicesCallback, NULL))) - // I_Error("Error with DirectDrawEnumerate"); - - if (!DDr2) - CreateDirectDrawInstance(); - - // remember what screen mode we are in - bAppFullScreen = fullScr; - ScreenHeight = height; - ScreenWidth = width; - - if (bAppFullScreen) - { - // Change window attributes - dwStyle = WS_POPUP | WS_VISIBLE; - SetWindowLong (appWin, GWL_STYLE, dwStyle); - SetWindowPos(appWin, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOACTIVATE | - SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER); - - // Get exclusive mode - ddrval = IDirectDraw2_SetCooperativeLevel(DDr2, appWin, DDSCL_EXCLUSIVE | - DDSCL_FULLSCREEN | - DDSCL_ALLOWREBOOT); - if (ddrval != DD_OK) - I_Error("SetCooperativeLevel FAILED: %s\n", DXErrorToString(ddrval)); - - // Switch from windows desktop to fullscreen - -#ifdef NT4COMPAT - ddrval = IDirectDraw2_SetDisplayMode(DDr2, width, height, bpp, 0, 0); -#else - ddrval = IDirectDraw2_SetDisplayMode(DDr2, width, height, bpp, 0, DDSDM_STANDARDVGAMODE); -#endif - if (ddrval != DD_OK) - I_Error("SetDisplayMode FAILED: %s\n", DXErrorToString(ddrval)); - - // This is not really needed, except in certain cases. One case - // is while using MFC. When the desktop is initally at 16bpp, a mode - // switch to 8bpp somehow causes the MFC window to not fully initialize - // and a CreateSurface will fail with DDERR_NOEXCLUSIVEMODE. This will - // ensure that the window is initialized properly after a mode switch. - - ShowWindow(appWin, SW_SHOW); - - // Create the primary surface with 1 back buffer. Always zero the - // DDSURFACEDESC structure and set the dwSize member! - - ZeroMemory(&ddsd, sizeof (ddsd)); - ddsd.dwSize = sizeof (ddsd); - ddsd.dwFlags = DDSD_CAPS | DDSD_BACKBUFFERCOUNT; - ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_FLIP | DDSCAPS_COMPLEX; - - // for fullscreen we use page flipping, for windowed mode, we blit the hidden surface to - // the visible surface, in both cases we have a visible (or 'real') surface, and a hidden - // (or 'virtual', or 'backbuffer') surface. - ddsd.dwBackBufferCount = 2; - - ddrval = IDirectDraw2_CreateSurface(DDr2,&ddsd, &ScreenReal, NULL); - if (ddrval != DD_OK) - I_Error("CreateSurface Primary Screen FAILED"); - - // Get a pointer to the back buffer - - ddscaps.dwCaps = DDSCAPS_BACKBUFFER; - ddrval = IDirectDrawSurface_GetAttachedSurface(ScreenReal,&ddscaps, &ScreenVirtual); - if (ddrval != DD_OK) - I_Error("GetAttachedSurface FAILED"); - } - else - { - rect.top = 0; - rect.left = 0; - rect.bottom = height; - rect.right = width; - - // Change window attributes - - dwStyle = GetWindowStyle(appWin); - dwStyle &= ~WS_POPUP; - dwStyle |= WS_OVERLAPPED | WS_SYSMENU | WS_CAPTION; - - SetWindowLong(appWin, GWL_STYLE, dwStyle); - - // Resize the window so that the client area is the requested width/height - - AdjustWindowRectEx(&rect, GetWindowStyle(appWin), GetMenu(appWin) != NULL, - GetWindowExStyle(appWin)); - - // Just in case the window was moved off the visible area of the - // screen. - - SetWindowPos(appWin, NULL, 0, 0, rect.right-rect.left, - rect.bottom-rect.top, SWP_NOMOVE | SWP_NOZORDER | - SWP_NOACTIVATE); - - SetWindowPos(appWin, HWND_NOTOPMOST, 0, 0, 0, 0, - SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE); - - // Exclusive mode is normal since it's in windowed mode and needs - // to cooperate with GDI - - ddrval = IDirectDraw2_SetCooperativeLevel(DDr2,appWin, DDSCL_NORMAL); - if (ddrval != DD_OK) - I_Error("SetCooperativeLevel FAILED"); - - // Always zero the DDSURFACEDESC structure and set the dwSize member! - - ZeroMemory(&ddsd, sizeof (ddsd)); - ddsd.dwSize = sizeof (ddsd); - ddsd.dwFlags = DDSD_CAPS; - ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; - - // Create the primary surface - - ddrval = IDirectDraw2_CreateSurface(DDr2,&ddsd, &ScreenReal, NULL); - if (ddrval != DD_OK) - I_Error("CreateSurface Primary Screen FAILED"); - - // Create a back buffer for offscreen rendering, this will be used to - // blt to the primary - - ScreenVirtual = CreateNewSurface(width, height, DDSCAPS_OFFSCREENPLAIN | - DDSCAPS_SYSTEMMEMORY); - if (ScreenVirtual == NULL) - I_Error("CreateSurface Secondary Screen FAILED"); - - /// \todo get the desktop bit depth, and build a lookup table - /// for quick conversions of 8bit color indexes 0-255 to desktop colors - /// eg: 256 entries of equivalent of palette colors 0-255 in 15,16,24,32 bit format - /// when blit virtual to real, convert pixels through lookup table.. - - // Use a clipper object for clipping when in windowed mode - // (make sure our drawing doesn't affect other windows) - - ddrval = IDirectDraw2_CreateClipper (DDr2, 0, &windclip, 0); - if (ddrval != DD_OK) - I_Error("CreateClipper FAILED"); - - // Associate the clipper with the window. - ddrval = IDirectDrawClipper_SetHWnd (windclip,0, appWin); - if (ddrval != DD_OK) - I_Error("Clipper -> SetHWnd FAILED"); - - // Attach the clipper to the surface. - ddrval = IDirectDrawSurface_SetClipper (ScreenReal,windclip); - if (ddrval != DD_OK) - I_Error("PrimaryScreen -> SetClipperClipper FAILED"); - } - - return TRUE; -} - - -// -// Free all memory -// -VOID CloseDirectDraw (VOID) -{ - ReleaseChtuff(); - if (DDr2) - { - IDirectDraw2_Release(DDr2); - DDr2 = NULL; - } - UnLoadDirectDraw(); -} - - -// -// Release DirectDraw stuff before display mode change -// -VOID ReleaseChtuff (VOID) -{ - if (!DDr2) - return; - if (windclip) - { - IDirectDrawClipper_Release(windclip); - windclip = NULL; - } - if (DDPalette) - { - IDirectDrawPalette_Release(DDPalette); - DDPalette = NULL; - } - // If the app is fullscreen, the back buffer is attached to the - // primary. Releasing the primary buffer will also release any - // attached buffers, so explicitly releasing the back buffer is not - // necessary. - - if (!bAppFullScreen && ScreenVirtual) - { - IDirectDrawSurface_Release(ScreenVirtual); // release hidden surface - ScreenVirtual = NULL; - } - if (ScreenReal) - { - IDirectDrawSurface_Release(ScreenReal); // and attached backbuffers for bAppFullScreen mode - ScreenReal = NULL; - } -} - - -// -// Clear the surface to color -// -VOID ClearSurface(IDirectDrawSurface* surface, int color) -{ - DDBLTFX ddbltfx; - - // Use the blter to do a color fill to clear the back buffer - ddbltfx.dwSize = sizeof (ddbltfx); - ddbltfx. -#ifdef DUMMYUNIONNAMEN - DUMMYUNIONNAMEN(5). -#endif - dwFillColor = color; - IDirectDrawSurface_Blt(surface,NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx); - -} - -// -// Flip the real page with virtual page -// - in bAppFullScreen mode, do page flipping -// - in windowed mode, copy the hidden surface to the visible surface -// -// waitflip : if not 0, wait for page flip to end -BOOL ScreenFlip(int waitflip) -{ - HRESULT hr; - RECT rect; - - if (bAppFullScreen) - { - //hr = IDirectDrawSurface_GetFlipStatus (ScreenReal, DDGFS_); - - // In full-screen exclusive mode, do a hardware flip. - hr = IDirectDrawSurface_Flip(ScreenReal, NULL, DDFLIP_WAIT | (waitflip ? 0 : DDFLIP_NOVSYNC)); //return immediately - - // If the surface was lost, restore it. - if (hr == DDERR_SURFACELOST) - { - IDirectDrawSurface_Restore(ScreenReal); - - // The restore worked, so try the flip again. - hr = IDirectDrawSurface_Flip(ScreenReal, 0, DDFLIP_WAIT | (waitflip ? 0 : DDFLIP_NOVSYNC)); - } - } - else - { - rect.left = windowPosX; - rect.top = windowPosY; - rect.right = windowPosX + ScreenWidth - 1; - rect.bottom = windowPosY + ScreenHeight - 1; - - // Copy the back buffer to front. - hr = IDirectDrawSurface_Blt(ScreenReal, &rect, ScreenVirtual, 0, DDBLT_WAIT, 0); - - if (hr != DD_OK) - { - // If the surfaces were lost, restore them. - if (IDirectDrawSurface_IsLost(ScreenReal) == DDERR_SURFACELOST) - IDirectDrawSurface_Restore(ScreenReal); - - if (IDirectDrawSurface_IsLost(ScreenVirtual) == DDERR_SURFACELOST) - IDirectDrawSurface_Restore(ScreenVirtual); - - // Retry the copy. - hr = IDirectDrawSurface_Blt(ScreenReal,&rect, ScreenVirtual, 0, DDBLT_WAIT, 0); - } - } - - if (hr != DD_OK) - I_Error("ScreenFlip() : couldn't Flip surfaces because %s", DXErrorToString(hr)); - - return FALSE; -} - -// -// Print a text to the surface -// -VOID TextPrint(int x, int y, LPCSTR message) -{ - HRESULT hr; - HDC hdc = NULL; - - // Get the device context handle. - hr = IDirectDrawSurface_GetDC(ScreenVirtual,&hdc); - if (hr != DD_OK) - return; - - // Write the message. - SetBkMode(hdc, TRANSPARENT); - SetTextColor(hdc, RGB(255, 255, 255)); - TextOutA(hdc, x, y, message, (int)strlen(message)); - - // Release the device context. - hr = IDirectDrawSurface_ReleaseDC(ScreenVirtual,hdc); -} - -// -// Lock surface before multiple drawings by hand, for speed -// -boolean LockScreen(VOID) -{ - DDSURFACEDESC ddsd; - HRESULT ddrval; - - ZeroMemory(&ddsd, sizeof (ddsd)); - ddsd.dwSize = sizeof (ddsd); - - // attempt to Lock the surface - ddrval = IDirectDrawSurface_Lock(ScreenVirtual, NULL, &ddsd, DDLOCK_WAIT, NULL); - - // Always, always check for errors with DirectX! - // If the surface was lost, restore it. - if (ddrval == DDERR_SURFACELOST) - { - ddrval = IDirectDrawSurface_Restore(ScreenReal); - - // now retry to get the lock - ddrval = IDirectDrawSurface_Lock(ScreenVirtual, NULL, &ddsd, DDLOCK_WAIT, NULL); - } - - if (ddrval == DD_OK) - { - ScreenLocked = TRUE; - ScreenPtr = (LPBYTE)ddsd.lpSurface; - ScreenPitch = ddsd. -#ifdef DUMMYUNIONNAMEN - DUMMYUNIONNAMEN(1). -#endif - lPitch; - } - else - { - ScreenLocked = FALSE; - ScreenPtr = NULL; - ScreenPitch = 0; - //I_Error("LockScreen() : couldn't restore the surface."); - return false; - } - return true; -} - -// -// Unlock surface -// -VOID UnlockScreen(VOID) -{ - if (DD_OK != IDirectDrawSurface_Unlock(ScreenVirtual,NULL)) - I_Error("Couldn't UnLock the renderer!"); - - ScreenLocked = FALSE; - ScreenPtr = NULL; - ScreenPitch = 0; -} - -// Blit virtual screen to real screen -//faB: note: testing 14/03/1999, see if it is faster than memcopy of virtual to -/* -static LPDIRECTDRAWSURFACE lpDDS = NULL; -VOID BlitScreen(VOID) -{ - HRESULT hr; - - if (!lpDDS) - I_Error("lpDDS NULL"); - - hr = IDirectDrawSurface_BltFast(ScreenVirtual, - 0, 0, // Upper left xy of destination - lpDDS, // Source surface - NULL, // Source rectangle = entire surface - DDBLTFAST_WAIT | DDBLTFAST_NOCOLORKEY); - if (FAILED(hr)) - I_Error("BltFast FAILED"); -} - -VOID MakeScreen(int width, int height, BYTE* lpSurface) -{ - HRESULT hr; - DDSURFACEDESC ddsd; - - // Initialize the surface description. - ZeroMemory (&ddsd, sizeof ddsd); - ZeroMemory (&ddsd.ddpfPixelFormat, sizeof (DDPIXELFORMAT)); - ddsd.dwSize = sizeof ddsd; - ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | //DDSD_LPSURFACE | - DDSD_PITCH | DDSD_PIXELFORMAT | DDSD_CAPS; - ddsd.dwWidth = width; - ddsd.dwHeight= height; - ddsd.lPitch = width; - ddsd.lpSurface = lpSurface; - ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; - - // Set up the pixel format for 8-bit - ddsd.ddpfPixelFormat.dwSize = sizeof (DDPIXELFORMAT); - ddsd.ddpfPixelFormat.dwFlags= DDPF_RGB | DDPF_PALETTEINDEXED8; - ddsd.ddpfPixelFormat.dwRGBBitCount = 8; - - // - ddsd.ddpfPixelFormat.dwRGBBitCount = (DWORD)DEPTH*8; - ddsd.ddpfPixelFormat.dwRBitMask = 0x00FF0000; - ddsd.ddpfPixelFormat.dwGBitMask = 0x0000FF00; - ddsd.ddpfPixelFormat.dwBBitMask = 0x000000FF; - - // Create the surface - hr = IDirectDraw2_CreateSurface(DDr2, &ddsd, &lpDDS, NULL); - if (FAILED(hr)) - I_Error("MakeScreen FAILED: %s",DDError(hr)); - //ddsd.lpSurface = lpSurface; -} -*/ - -// -// Create a palette object -// -VOID CreateDDPalette (PALETTEENTRY* colorTable) -{ - HRESULT ddrval; - ddrval = IDirectDraw2_CreatePalette(DDr2,DDPCAPS_8BIT|DDPCAPS_ALLOW256, colorTable, &DDPalette, NULL); - if (ddrval != DD_OK) - I_Error("couldn't CreatePalette"); -}; - - -// -// Free the palette object -// -VOID DestroyDDPalette (VOID) -{ - if (DDPalette) - { - IDirectDrawPalette_Release(DDPalette); - DDPalette = NULL; - } -} - -// -// Set a a full palette of 256 PALETTEENTRY entries -// -VOID SetDDPalette(PALETTEENTRY* pal) -{ - // create palette first time - if (DDPalette == NULL) - CreateDDPalette(pal); - else - IDirectDrawPalette_SetEntries(DDPalette, 0, 0, 256, pal); - // setting the same palette to the same surface again does not increase - // the reference count - IDirectDrawSurface_SetPalette(ScreenReal, DDPalette); -} - -// -// Wait for vsync, gross -// -VOID WaitVbl(VOID) -{ - IDirectDraw2_WaitForVerticalBlank(DDr2, DDWAITVB_BLOCKBEGIN, NULL); -} - - -// -// Restore the palette. Useful when we regain focus. -// -VOID RestoreDDPalette(VOID) -{ - if (DDPalette) - IDirectDrawSurface_SetPalette(ScreenReal, DDPalette); -} -#endif diff --git a/src/win32/fabdxlib.h b/src/win32/fabdxlib.h deleted file mode 100644 index 2836b795d..000000000 --- a/src/win32/fabdxlib.h +++ /dev/null @@ -1,82 +0,0 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- -// -// Copyright (C) 1998-2000 by DooM Legacy Team. -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -//----------------------------------------------------------------------------- -/// \file -/// \brief faB's DirectX library v1.0 - -#ifndef _H_FABDXLIB_ -#define _H_FABDXLIB_ - -//#define WIN32_LEAN_AND_MEAN -#define RPC_NO_WINDOWS_H -#include -#ifdef __MINGW32__ -//#define NONAMELESSUNION -#endif -#ifdef _MSC_VER -#pragma warning(disable : 4201) -#endif -#include -#if (defined (DIRECTDRAW_VERSION) && (DIRECTDRAW_VERSION >= 0x0700)) -#undef DUMMYUNIONNAMEN -#endif -// format of function in app called with width,height -typedef BOOL (*APPENUMMODESCALLBACK)(int width, int height, int bpp); - - -// globals -extern IDirectDraw2* DDr2; -extern IDirectDrawSurface* ScreenReal; -extern IDirectDrawSurface* ScreenVirtual; -extern IDirectDrawPalette* DDPalette; - -extern BOOL bAppFullScreen; // main code might need this to know the current - // fullscreen or windowed state - -extern int windowPosX; // current position in windowed mode -extern int windowPosY; - -extern int ScreenWidth; -extern int ScreenHeight; -extern BOOL ScreenLocked; // Screen surface is being locked -extern int ScreenPitch; // offset from one line to the next -extern LPBYTE ScreenPtr; // memory of the surface - -extern BOOL bDX0300; - -BOOL EnumDirectDrawDisplayModes (APPENUMMODESCALLBACK appFunc); -BOOL CreateDirectDrawInstance (VOID); - -int InitDirectDrawe (HWND appWin, int width, int height, int bpp, int fullScr); -VOID CloseDirectDraw (VOID); - -VOID ReleaseChtuff (VOID); - -VOID ClearSurface (IDirectDrawSurface* surface, int color); -BOOL ScreenFlip (int wait); -VOID TextPrint (int x, int y, LPCSTR message); - -VOID CreateDDPalette (PALETTEENTRY* colorTable); -VOID DestroyDDPalette (VOID); -VOID SetDDPalette (PALETTEENTRY* pal); -VOID RestoreDDPalette(VOID); - -VOID WaitVbl (VOID); - -boolean LockScreen (VOID); -VOID UnlockScreen (VOID); - - -#endif /* _H_FABDXLIB_ */ diff --git a/src/win32/srb2win.exe.manifest b/src/win32/srb2win.exe.manifest index d3b8355cb..f9ba6c814 100644 --- a/src/win32/srb2win.exe.manifest +++ b/src/win32/srb2win.exe.manifest @@ -1,5 +1,11 @@ + + + true/pm + PerMonitorV2 + + diff --git a/src/win32/win_cd.c b/src/win32/win_cd.c deleted file mode 100644 index 324c24928..000000000 --- a/src/win32/win_cd.c +++ /dev/null @@ -1,539 +0,0 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- -// -// Copyright (C) 1998-2000 by DooM Legacy Team. -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -//----------------------------------------------------------------------------- -/// \file -/// \brief cd music interface (uses MCI). - -#include "../doomdef.h" -#include "../doomstat.h" -#ifdef _WINDOWS -#include "win_main.h" -#include - -#include "../command.h" -#include "../doomtype.h" -#include "../i_sound.h" -#include "../i_system.h" - -#include "../s_sound.h" - -#define MAX_CD_TRACKS 255 - -typedef struct { - BOOL IsAudio; - DWORD Start, End; - DWORD Length; // minutes -} CDTrack; - -// ------- -// private -// ------- -static CDTrack m_nTracks[MAX_CD_TRACKS]; -static int m_nTracksCount; // up to MAX_CD_TRACKS -static MCI_STATUS_PARMS m_MCIStatus; -static MCI_OPEN_PARMS m_MCIOpen; - -// ------ -// protos -// ------ -static void Command_Cd_f (void); - - -// ------------------- -// MCIErrorMessageBox -// Retrieve error message corresponding to return value from -// mciSendCommand() or mciSenString() -// ------------------- -static VOID MCIErrorMessageBox (MCIERROR iErrorCode) -{ - char szErrorText[128]; - if (!mciGetErrorStringA (iErrorCode, szErrorText, sizeof (szErrorText))) - wsprintfA(szErrorText,"MCI CD Audio Unknown Error #%lu\n", iErrorCode); - I_OutputMsg("%s", szErrorText); - /*MessageBox (GetActiveWindow(), szTemp+1, "LEGACY", - MB_OK | MB_ICONSTOP);*/ -} - - -// -------- -// CD_Reset -// -------- -static VOID CD_Reset (VOID) -{ - // no win32 equivalent - //faB: for DOS, some odd drivers like to be reset sometimes.. useless in MCI I guess -} - - -// ---------------- -// CD_ReadTrackInfo -// Read in number of tracks, and length of each track in minutes/seconds -// returns true if error -// ---------------- -static BOOL CD_ReadTrackInfo(VOID) -{ - UINT nTrackLength; - INT i; - MCIERROR iErr; - - m_nTracksCount = 0; - - m_MCIStatus.dwItem = MCI_STATUS_NUMBER_OF_TRACKS; - iErr = mciSendCommand(m_MCIOpen.wDeviceID, MCI_STATUS, MCI_STATUS_ITEM|MCI_WAIT, (DWORD_PTR)&m_MCIStatus); - if (iErr) - { - MCIErrorMessageBox (iErr); - return FALSE; - } - m_nTracksCount = (int)m_MCIStatus.dwReturn; - if (m_nTracksCount > MAX_CD_TRACKS) - m_nTracksCount = MAX_CD_TRACKS; - - for (i = 0; i < m_nTracksCount; i++) - { - m_MCIStatus.dwTrack = (DWORD)(i+1); - m_MCIStatus.dwItem = MCI_STATUS_LENGTH; - iErr = mciSendCommand(m_MCIOpen.wDeviceID, MCI_STATUS, MCI_TRACK|MCI_STATUS_ITEM|MCI_WAIT, (DWORD_PTR)&m_MCIStatus); - if (iErr) - { - MCIErrorMessageBox (iErr); - return FALSE; - } - nTrackLength = (DWORD)(MCI_MSF_MINUTE(m_MCIStatus.dwReturn)*60 + MCI_MSF_SECOND(m_MCIStatus.dwReturn)); - m_nTracks[i].Length = nTrackLength; - - m_MCIStatus.dwItem = MCI_CDA_STATUS_TYPE_TRACK; - iErr = mciSendCommand(m_MCIOpen.wDeviceID, MCI_STATUS, MCI_TRACK|MCI_STATUS_ITEM|MCI_WAIT, (DWORD_PTR)&m_MCIStatus); - if (iErr) - { - MCIErrorMessageBox (iErr); - return FALSE; - } - m_nTracks[i].IsAudio = (m_MCIStatus.dwReturn == MCI_CDA_TRACK_AUDIO); - } - - return TRUE; -} - - -// ------------ -// CD_TotalTime -// returns total time for all audio tracks in seconds -// ------------ -static UINT CD_TotalTime(VOID) -{ - UINT nTotalLength = 0; - INT nTrack; - for (nTrack = 0; nTrack < m_nTracksCount; nTrack++) - { - if (m_nTracks[nTrack].IsAudio) - nTotalLength += m_nTracks[nTrack].Length; - } - return nTotalLength; -} - - -//====================================================================== -// CD AUDIO MUSIC SUBSYSTEM -//====================================================================== - -UINT8 cdaudio_started = 0; // for system startup/shutdown - -static BOOL cdPlaying = FALSE; -static INT cdPlayTrack; // when cdPlaying is true -static BOOL cdLooping = FALSE; -static BYTE cdRemap[MAX_CD_TRACKS]; -static BOOL cdEnabled = TRUE; // cd info available -static BOOL cdValid; // true when last cd audio info was ok -static BOOL wasPlaying; -//static INT cdVolume = 0; // current cd volume (0-31) - -// 0-31 like Music & Sfx, though CD hardware volume is 0-255. -consvar_t cd_volume = CVAR_INIT ("cd_volume","18",CV_SAVE,soundvolume_cons_t, NULL); - -// allow Update for next/loop track -// some crap cd drivers take up to -// a second for a simple 'busy' check.. -// (on those Update can be disabled) -consvar_t cdUpdate = CVAR_INIT ("cd_update","1",CV_SAVE, NULL, NULL); - -#if (__GNUC__ > 6) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat-overflow" -#endif -// hour,minutes,seconds -static LPSTR hms(UINT seconds) -{ - UINT hours, minutes; - static CHAR s[9]; - - minutes = seconds / 60; - seconds %= 60; - hours = minutes / 60; - minutes %= 60; - if (hours > 0) - sprintf (s, "%lu:%02lu:%02lu", (long unsigned int)hours, (long unsigned int)minutes, (long unsigned int)seconds); - else - sprintf (s, "%2lu:%02lu", (long unsigned int)minutes, (long unsigned int)seconds); - return s; -} -#if (__GNUC__ > 6) -#pragma GCC diagnostic pop -#endif - -static void Command_Cd_f(void) -{ - LPCSTR s; - int i,j; - - if (!cdaudio_started) - return; - - if (COM_Argc() < 2) - { - CONS_Printf (M_GetText( - "cd [on] [off] [remap] [reset] [select]\n" - " [open] [info] [play ] [resume]\n" - " [stop] [pause] [loop ]\n")); - return; - } - - s = COM_Argv(1); - - // activate cd music - if (!strncmp(s,"on",2)) - { - cdEnabled = TRUE; - return; - } - - // stop/deactivate cd music - if (!strncmp(s, "off", 3)) - { - if (cdPlaying) - I_StopCD(); - cdEnabled = FALSE; - return; - } - - // remap tracks - if (!strncmp(s, "remap", 5)) - { - i = (int)COM_Argc() - 2; - if (i <= 0) - { - CONS_Printf(M_GetText("CD tracks remapped in that order :\n")); - for (j = 1; j < MAX_CD_TRACKS; j++) - if (cdRemap[j] != j) - CONS_Printf(" %2d -> %2d\n", j, cdRemap[j]); - return; - } - for (j = 1; j <= i; j++) - cdRemap[j] = (UINT8)atoi(COM_Argv(j+1)); - return; - } - - // reset the CD driver, useful on some odd cd's - if (!strncmp(s,"reset",5)) - { - cdEnabled = TRUE; - if (cdPlaying) - I_StopCD (); - for (i = 0; i < MAX_CD_TRACKS; i++) - cdRemap[i] = (UINT8)i; - CD_Reset(); - cdValid = CD_ReadTrackInfo(); - return; - } - - // any other command is not allowed until we could retrieve cd information - if (!cdValid) - { - CONS_Printf(M_GetText("CD is not ready.\n")); - return; - } - - /* faB: not with MCI, didn't find it, useless anyway - if (!strncmp(s,"open",4)) - { - if (cdPlaying) - I_StopCD (); - bcd_open_door(); - cdValid = FALSE; - return; - }*/ - - if (!strncmp(s,"info",4)) - { - if (!CD_ReadTrackInfo()) - { - cdValid = FALSE; - return; - } - - cdValid = TRUE; - - if (m_nTracksCount <= 0) - CONS_Printf(M_GetText("No audio tracks\n")); - else - { - // display list of tracks - // highlight current playing track - for (i = 0; i < m_nTracksCount; i++) - { - CONS_Printf("%s%2d. %s %s\n", - cdPlaying && (cdPlayTrack == i) ? "\x82 " : " ", - i+1, m_nTracks[i].IsAudio ? M_GetText("audio") : M_GetText("data "), - hms(m_nTracks[i].Length)); - } - CONS_Printf(M_GetText("\x82Total time : %s\n"), hms(CD_TotalTime())); - } - if (cdPlaying) - { - CONS_Printf(M_GetText("Currently %s track %u\n"), cdLooping ? M_GetText("looping") : M_GetText("playing"), cdPlayTrack); - } - return; - } - - if (!strncmp(s,"play",4)) - { - I_PlayCD ((UINT8)atoi (COM_Argv (2)), false); - return; - } - - if (!strncmp(s,"stop",4)) - { - I_StopCD (); - return; - } - - if (!strncmp(s,"loop",4)) - { - I_PlayCD((UINT8)atoi (COM_Argv (2)), true); - return; - } - - if (!strncmp(s,"resume",4)) - { - I_ResumeCD (); - return; - } - - CONS_Printf (M_GetText("Invalid CD command \"CD %s\"\n"), s); -} - - -// ------------ -// I_ShutdownCD -// Shutdown CD Audio subsystem, release whatever was allocated -// ------------ -void I_ShutdownCD(void) -{ - MCIERROR iErr; - - if (!cdaudio_started) - return; - - CONS_Printf("I_ShutdownCD: "); - - I_StopCD(); - - // closes MCI CD - iErr = mciSendCommand(m_MCIOpen.wDeviceID, MCI_CLOSE, 0, 0); - if (iErr) - MCIErrorMessageBox (iErr); -} - - -// -------- -// I_InitCD -// Init CD Audio subsystem -// -------- -void I_InitCD(void) -{ - MCI_SET_PARMS mciSet; - MCIERROR iErr; - int i; - - // We don't have an open device yet - m_MCIOpen.wDeviceID = 0; - m_nTracksCount = 0; - - cdaudio_started = false; - - m_MCIOpen.lpstrDeviceType = (LPCTSTR)MCI_DEVTYPE_CD_AUDIO; - iErr = mciSendCommand(0, MCI_OPEN, MCI_OPEN_TYPE|MCI_OPEN_TYPE_ID, (DWORD_PTR)&m_MCIOpen); - if (iErr) - { - MCIErrorMessageBox (iErr); - return; - } - - // Set the time format to track/minute/second/frame (TMSF). - mciSet.dwTimeFormat = MCI_FORMAT_TMSF; - iErr = mciSendCommand(m_MCIOpen.wDeviceID, MCI_SET, MCI_SET_TIME_FORMAT, (DWORD_PTR)&mciSet); - if (iErr) - { - MCIErrorMessageBox (iErr); - mciSendCommand(m_MCIOpen.wDeviceID, MCI_CLOSE, 0, 0); - return; - } - - I_AddExitFunc (I_ShutdownCD); - cdaudio_started = true; - - CONS_Printf (M_GetText("CD audio Initialized\n")); - - // last saved in config.cfg - i = cd_volume.value; - //I_SetVolumeCD (0); // initialize to 0 for some odd cd drivers - I_SetVolumeCD (i); // now set the last saved volume - - for (i = 0; i < MAX_CD_TRACKS; i++) - cdRemap[i] = (UINT8)i; - - if (!CD_ReadTrackInfo()) - { - CONS_Printf(M_GetText("No CD in drive\n")); - cdEnabled = FALSE; - cdValid = FALSE; - } - else - { - cdEnabled = TRUE; - cdValid = TRUE; - } - - COM_AddCommand ("cd", Command_Cd_f); -} - - - -// loop/go to next track when track is finished (if cd_update var is true) -// update the volume when it has changed (from console/menu) -void I_UpdateCD(void) -{ - /// \todo check for cd change and restart music ? -} - - -// -void I_PlayCD(UINT8 nTrack, UINT8 bLooping) -{ - MCI_PLAY_PARMS mciPlay; - MCIERROR iErr; - - if (!cdaudio_started || !cdEnabled) - return; - - //faB: try again if it didn't work (just free the user of typing 'cd reset' command) - if (!cdValid) - cdValid = CD_ReadTrackInfo(); - if (!cdValid) - return; - - // tracks start at 0 in the code.. - nTrack--; - if (nTrack >= m_nTracksCount) - nTrack = (UINT8) (nTrack % m_nTracksCount); - - nTrack = cdRemap[nTrack]; - - if (cdPlaying) - { - if (cdPlayTrack == nTrack) - return; - I_StopCD (); - } - - cdPlayTrack = nTrack; - - if (!m_nTracks[nTrack].IsAudio) - { - //I_OutputMsg("\x82""CD Play: not an audio track\n"); // Tails 03-25-2001 - return; - } - - cdLooping = bLooping; - - //faB: stop MIDI music, MIDI music will restart if volume is upped later - cv_digmusicvolume.value = 0; - cv_midimusicvolume.value = 0; - I_StopSong(); - - //faB: I don't use the notify message, I'm trying to minimize the delay - mciPlay.dwCallback = (DWORD)((size_t)hWndMain); - mciPlay.dwFrom = MCI_MAKE_TMSF(nTrack+1, 0, 0, 0); - iErr = mciSendCommand(m_MCIOpen.wDeviceID, MCI_PLAY, MCI_FROM|MCI_NOTIFY, (DWORD_PTR)&mciPlay); - if (iErr) - { - MCIErrorMessageBox (iErr); - cdValid = FALSE; - cdPlaying = FALSE; - return; - } - - cdPlaying = TRUE; -} - - -// pause cd music -void I_StopCD(void) -{ - MCIERROR iErr; - - if (!cdaudio_started || !cdEnabled) - return; - - iErr = mciSendCommand(m_MCIOpen.wDeviceID, MCI_PAUSE, MCI_WAIT, 0); - if (iErr) - MCIErrorMessageBox (iErr); - else - { - wasPlaying = cdPlaying; - cdPlaying = FALSE; - } -} - - -// continue after a pause -void I_ResumeCD(void) -{ - MCIERROR iErr; - - if (!cdaudio_started || !cdEnabled) - return; - - if (!cdValid) - return; - - if (!wasPlaying) - return; - - iErr = mciSendCommand(m_MCIOpen.wDeviceID, MCI_RESUME, MCI_WAIT, 0); - if (iErr) - MCIErrorMessageBox (iErr); - else - cdPlaying = TRUE; -} - - -// volume : logical cd audio volume 0-31 (hardware is 0-255) -boolean I_SetVolumeCD (INT32 volume) -{ - UNREFERENCED_PARAMETER(volume); - return false; -} -#endif diff --git a/src/win32/win_dll.c b/src/win32/win_dll.c deleted file mode 100644 index 4743cec34..000000000 --- a/src/win32/win_dll.c +++ /dev/null @@ -1,238 +0,0 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- -// -// Copyright (C) 1998-2000 by DooM Legacy Team. -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -//----------------------------------------------------------------------------- -/// \file -/// \brief load and initialise the 3D driver DLL - -#include "../doomdef.h" -#ifdef HWRENDER -#include "../hardware/hw_drv.h" // get the standard 3D Driver DLL exports prototypes -#endif - -#ifdef HW3SOUND -#include "../hardware/hw3dsdrv.h" // get the 3D sound driver DLL export prototypes -#endif - -#ifdef _WINDOWS - -#include "win_dll.h" -#include "win_main.h" // I_ShowLastError() - -#if defined(HWRENDER) || defined(HW3SOUND) -typedef struct loadfunc_s { - LPCSTR fnName; - LPVOID fnPointer; -} loadfunc_t; - -// -------------------------------------------------------------------------- -// Load a DLL, returns the HMODULE handle or NULL -// -------------------------------------------------------------------------- -static HMODULE LoadDLL (LPCSTR dllName, loadfunc_t *funcTable) -{ - LPVOID funcPtr; - loadfunc_t *loadfunc; - HMODULE hModule; - - if ((hModule = LoadLibraryA(dllName)) != NULL) - { - // get function pointers for all functions we use - for (loadfunc = funcTable; loadfunc->fnName != NULL; loadfunc++) - { - funcPtr = GetProcAddress(hModule, loadfunc->fnName); - if (!funcPtr) { - I_ShowLastError(FALSE); - MessageBoxA(NULL, va("The '%s' haven't the good specification (function %s missing)\n\n" - "You must use dll from the same zip of this exe\n", dllName, loadfunc->fnName), - "Error", MB_OK|MB_ICONINFORMATION); - return FALSE; - } - // store function address - *((LPVOID*)loadfunc->fnPointer) = funcPtr; - } - } - else - { - I_ShowLastError(FALSE); - MessageBoxA(NULL, va("LoadLibrary() FAILED : couldn't load '%s'\r\n", dllName), "Warning", MB_OK|MB_ICONINFORMATION); - } - - return hModule; -} - - -// -------------------------------------------------------------------------- -// Unload the DLL -// -------------------------------------------------------------------------- -static VOID UnloadDLL (HMODULE* pModule) -{ - if (FreeLibrary(*pModule)) - *pModule = NULL; - else - I_ShowLastError(TRUE); -} -#endif - -// ========================================================================== -// STANDARD 3D DRIVER DLL FOR DOOM LEGACY -// ========================================================================== - -// note : the 3D driver loading should be put somewhere else.. - -#ifdef HWRENDER -static HMODULE hwdModule = NULL; - -static loadfunc_t hwdFuncTable[] = { -#ifdef _X86_ - {"Init@4", &hwdriver.pfnInit}, - {"Shutdown@0", &hwdriver.pfnShutdown}, - {"GetModeList@8", &hwdriver.pfnGetModeList}, - {"SetPalette@4", &hwdriver.pfnSetPalette}, - {"FinishUpdate@4", &hwdriver.pfnFinishUpdate}, - {"Draw2DLine@12", &hwdriver.pfnDraw2DLine}, - {"DrawPolygon@16", &hwdriver.pfnDrawPolygon}, - {"RenderSkyDome@4", &hwdriver.pfnRenderSkyDome}, - {"SetBlend@4", &hwdriver.pfnSetBlend}, - {"ClearBuffer@12", &hwdriver.pfnClearBuffer}, - {"SetTexture@4", &hwdriver.pfnSetTexture}, - {"UpdateTexture@4", &hwdriver.pfnUpdateTexture}, - {"DeleteTexture@4", &hwdriver.pfnDeleteTexture}, - {"ReadRect@24", &hwdriver.pfnReadRect}, - {"GClipRect@20", &hwdriver.pfnGClipRect}, - {"ClearMipMapCache@0", &hwdriver.pfnClearMipMapCache}, - {"SetSpecialState@8", &hwdriver.pfnSetSpecialState}, - {"DrawModel@16", &hwdriver.pfnDrawModel}, - {"SetTransform@4", &hwdriver.pfnSetTransform}, - {"GetTextureUsed@0", &hwdriver.pfnGetTextureUsed}, - {"GetRenderVersion@0", &hwdriver.pfnGetRenderVersion}, -#ifdef SHUFFLE - {"PostImgRedraw@4", &hwdriver.pfnPostImgRedraw}, -#endif - {"FlushScreenTextures@0",&hwdriver.pfnFlushScreenTextures}, - {"StartScreenWipe@0", &hwdriver.pfnStartScreenWipe}, - {"EndScreenWipe@0", &hwdriver.pfnEndScreenWipe}, - {"DoScreenWipe@0", &hwdriver.pfnDoScreenWipe}, - {"DrawIntermissionBG@0",&hwdriver.pfnDrawIntermissionBG}, - {"MakeScreenTexture@0", &hwdriver.pfnMakeScreenTexture}, - {"MakeScreenFinalTexture@0", &hwdriver.pfnMakeScreenFinalTexture}, - {"DrawScreenFinalTexture@8", &hwdriver.pfnDrawScreenFinalTexture}, -#else - {"Init", &hwdriver.pfnInit}, - {"Shutdown", &hwdriver.pfnShutdown}, - {"GetModeList", &hwdriver.pfnGetModeList}, - {"SetPalette", &hwdriver.pfnSetPalette}, - {"FinishUpdate", &hwdriver.pfnFinishUpdate}, - {"Draw2DLine", &hwdriver.pfnDraw2DLine}, - {"DrawPolygon", &hwdriver.pfnDrawPolygon}, - {"RenderSkyDome", &hwdriver.pfnRenderSkyDome}, - {"SetBlend", &hwdriver.pfnSetBlend}, - {"ClearBuffer", &hwdriver.pfnClearBuffer}, - {"SetTexture", &hwdriver.pfnSetTexture}, - {"UpdateTexture", &hwdriver.pfnUpdateTexture}, - {"DeleteTexture", &hwdriver.pfnDeleteTexture}, - {"ReadRect", &hwdriver.pfnReadRect}, - {"GClipRect", &hwdriver.pfnGClipRect}, - {"ClearMipMapCache", &hwdriver.pfnClearMipMapCache}, - {"SetSpecialState", &hwdriver.pfnSetSpecialState}, - {"DrawModel", &hwdriver.pfnDrawModel}, - {"SetTransform", &hwdriver.pfnSetTransform}, - {"GetTextureUsed", &hwdriver.pfnGetTextureUsed}, - {"GetRenderVersion", &hwdriver.pfnGetRenderVersion}, -#ifdef SHUFFLE - {"PostImgRedraw", &hwdriver.pfnPostImgRedraw}, -#endif - {"FlushScreenTextures", &hwdriver.pfnFlushScreenTextures}, - {"StartScreenWipe", &hwdriver.pfnStartScreenWipe}, - {"EndScreenWipe", &hwdriver.pfnEndScreenWipe}, - {"DoScreenWipe", &hwdriver.pfnDoScreenWipe}, - {"DrawIntermissionBG", &hwdriver.pfnDrawIntermissionBG}, - {"MakeScreenTexture", &hwdriver.pfnMakeScreenTexture}, - {"MakeScreenFinalTexture", &hwdriver.pfnMakeScreenFinalTexture}, - {"DrawScreenFinalTexture", &hwdriver.pfnDrawScreenFinalTexture}, -#endif - {NULL,NULL} -}; - -BOOL Init3DDriver (LPCSTR dllName) -{ - hwdModule = LoadDLL(dllName, hwdFuncTable); - return (hwdModule != NULL); -} - -VOID Shutdown3DDriver (VOID) -{ - UnloadDLL(&hwdModule); -} -#endif - -#ifdef HW3SOUND -static HMODULE hwsModule = NULL; - -static loadfunc_t hwsFuncTable[] = { -#ifdef _X86_ - {"Startup@8", &hw3ds_driver.pfnStartup}, - {"Shutdown@0", &hw3ds_driver.pfnShutdown}, - {"AddSfx@4", &hw3ds_driver.pfnAddSfx}, - {"AddSource@8", &hw3ds_driver.pfnAddSource}, - {"StartSource@4", &hw3ds_driver.pfnStartSource}, - {"StopSource@4", &hw3ds_driver.pfnStopSource}, - {"GetHW3DSVersion@0", &hw3ds_driver.pfnGetHW3DSVersion}, - {"BeginFrameUpdate@0", &hw3ds_driver.pfnBeginFrameUpdate}, - {"EndFrameUpdate@0", &hw3ds_driver.pfnEndFrameUpdate}, - {"IsPlaying@4", &hw3ds_driver.pfnIsPlaying}, - {"UpdateListener@8", &hw3ds_driver.pfnUpdateListener}, - {"UpdateSourceParms@12", &hw3ds_driver.pfnUpdateSourceParms}, - {"SetCone@8", &hw3ds_driver.pfnSetCone}, - {"SetGlobalSfxVolume@4", &hw3ds_driver.pfnSetGlobalSfxVolume}, - {"Update3DSource@8", &hw3ds_driver.pfnUpdate3DSource}, - {"ReloadSource@8", &hw3ds_driver.pfnReloadSource}, - {"KillSource@4", &hw3ds_driver.pfnKillSource}, - {"KillSfx@4", &hw3ds_driver.pfnKillSfx}, - {"GetHW3DSTitle@8", &hw3ds_driver.pfnGetHW3DSTitle}, -#else - {"Startup", &hw3ds_driver.pfnStartup}, - {"Shutdown", &hw3ds_driver.pfnShutdown}, - {"AddSfx", &hw3ds_driver.pfnAddSfx}, - {"AddSource", &hw3ds_driver.pfnAddSource}, - {"StartSource", &hw3ds_driver.pfnStartSource}, - {"StopSource", &hw3ds_driver.pfnStopSource}, - {"GetHW3DSVersion", &hw3ds_driver.pfnGetHW3DSVersion}, - {"BeginFrameUpdate", &hw3ds_driver.pfnBeginFrameUpdate}, - {"EndFrameUpdate", &hw3ds_driver.pfnEndFrameUpdate}, - {"IsPlaying", &hw3ds_driver.pfnIsPlaying}, - {"UpdateListener", &hw3ds_driver.pfnUpdateListener}, - {"UpdateSourceParms", &hw3ds_driver.pfnUpdateSourceParms}, - {"SetCone", &hw3ds_driver.pfnSetCone}, - {"SetGlobalSfxVolume", &hw3ds_driver.pfnSetGlobalSfxVolume}, - {"Update3DSource", &hw3ds_driver.pfnUpdate3DSource}, - {"ReloadSource", &hw3ds_driver.pfnReloadSource}, - {"KillSource", &hw3ds_driver.pfnKillSource}, - {"KillSfx", &hw3ds_driver.pfnKillSfx}, - {"GetHW3DSTitle", &hw3ds_driver.pfnGetHW3DSTitle}, -#endif - {NULL, NULL} -}; - -BOOL Init3DSDriver(LPCSTR dllName) -{ - hwsModule = LoadDLL(dllName, hwsFuncTable); - return (hwsModule != NULL); -} - -VOID Shutdown3DSDriver (VOID) -{ - UnloadDLL(&hwsModule); -} -#endif -#endif //_WINDOWS diff --git a/src/win32/win_dll.h b/src/win32/win_dll.h deleted file mode 100644 index b4b259587..000000000 --- a/src/win32/win_dll.h +++ /dev/null @@ -1,31 +0,0 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- -// -// Copyright (C) 1998-2000 by DooM Legacy Team. -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -//----------------------------------------------------------------------------- -/// \file -/// \brief load/unload a DLL at run-time - -//#define WIN32_LEAN_AND_MEAN -#define RPC_NO_WINDOWS_H -#include - -#ifdef HWRENDER -BOOL Init3DDriver (LPCSTR dllName); -VOID Shutdown3DDriver (VOID); -#endif - -#ifdef HW3SOUND -BOOL Init3DSDriver(LPCSTR dllName); -VOID Shutdown3DSDriver(VOID); -#endif diff --git a/src/win32/win_main.c b/src/win32/win_main.c deleted file mode 100644 index e1d90881b..000000000 --- a/src/win32/win_main.c +++ /dev/null @@ -1,674 +0,0 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- -// -// Copyright (C) 1998-2000 by DooM Legacy Team. -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -//----------------------------------------------------------------------------- -/// \file -/// \brief Win32 WinMain Entry Point -/// -/// Win32 Sonic Robo Blast 2 -/// -/// NOTE: -/// To compile WINDOWS SRB2 version : define a '_WINDOWS' symbol. -/// to do this go to Project/Settings/ menu, click C/C++ tab, in -/// 'Preprocessor definitions:' add '_WINDOWS' - -#include "../doomdef.h" -#include - -#ifdef _WINDOWS - -#include "../doomstat.h" // netgame -#include "resource.h" - -#include "../m_argv.h" -#include "../d_main.h" -#include "../i_system.h" - -#include "../keys.h" //hack quick test - -#include "../console.h" - -#include "fabdxlib.h" -#include "win_main.h" -#include "win_dbg.h" -#include "../s_sound.h" // pause sound with handling -#include "../g_input.h" // KEY_MOUSEWHEELxxx -#include "../screen.h" // for BASEVID* - -// MSWheel support for Win95/NT3.51 -#include - -#ifndef WM_XBUTTONDOWN -#define WM_XBUTTONDOWN 523 -#endif -#ifndef WM_XBUTTONUP -#define WM_XBUTTONUP 524 -#endif -#ifndef MK_XBUTTON1 -#define MK_XBUTTON1 32 -#endif -#ifndef MK_XBUTTON2 -#define MK_XBUTTON2 64 -#endif - -typedef BOOL (WINAPI *p_IsDebuggerPresent)(VOID); - -HWND hWndMain = NULL; -static HCURSOR windowCursor = NULL; // main window cursor - -static LPCSTR wClassName = "SRB2WC"; - -INT appActive = false; // app window is active - -#ifdef LOGMESSAGES -FILE *logstream; -#endif - -BOOL nodinput = FALSE; - -static LRESULT CALLBACK MainWndproc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) -{ - event_t ev; //Doom input event - int mouse_keys; - - // judgecutor: - // Response MSH Mouse Wheel event - - if (message == MSHWheelMessage) - { - message = WM_MOUSEWHEEL; - wParam <<= 16; - } - - //I_OutputMsg("MainWndproc: %p,%i,%i,%i",hWnd, message, wParam, (UINT)lParam); - - switch (message) - { - case WM_CREATE: - nodinput = M_CheckParm("-nodinput"); - if (!nodinput && !LoadDirectInput()) - nodinput = true; - break; - - case WM_ACTIVATEAPP: // Handle task switching - appActive = (int)wParam; - - //coming back from alt-tab? reset the palette. - if (appActive) - vid.recalc = true; - - // pause music when alt-tab - if (appActive && !paused) - S_ResumeAudio(); - else if (!paused) - S_PauseAudio(); - { - HANDLE ci = GetStdHandle(STD_INPUT_HANDLE); - DWORD mode; - if (ci != INVALID_HANDLE_VALUE && GetFileType(ci) == FILE_TYPE_CHAR && GetConsoleMode(ci, &mode)) - appActive = true; - } - InvalidateRect (hWnd, NULL, TRUE); - break; - - case WM_PAINT: - if (!appActive && !bAppFullScreen && !netgame) - // app becomes inactive (if windowed) - { - // Paint "Game Paused" in the middle of the screen - PAINTSTRUCT ps; - RECT rect; - HDC hdc = BeginPaint (hWnd, &ps); - GetClientRect (hWnd, &rect); - DrawText (hdc, TEXT("Game Paused"), -1, &rect, - DT_SINGLELINE | DT_CENTER | DT_VCENTER); - EndPaint (hWnd, &ps); - return 0; - } - - break; - - case WM_QUERYNEWPALETTE: - RestoreDDPalette(); - return TRUE; - - case WM_PALETTECHANGED: - if((HWND)wParam != hWnd) - RestoreDDPalette(); - break; - - //case WM_RBUTTONDOWN: - //case WM_LBUTTONDOWN: - - case WM_MOVE: - if (bAppFullScreen) - { - SetWindowPos(hWnd, NULL, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOSIZE); - return 0; - } - else - { - windowPosX = (SHORT) LOWORD(lParam); // horizontal position - windowPosY = (SHORT) HIWORD(lParam); // vertical position - break; - } - break; - - // This is where switching windowed/fullscreen is handled. DirectDraw - // objects must be destroyed, recreated, and artwork reloaded. - - case WM_DISPLAYCHANGE: - case WM_SIZE: - break; - - case WM_SETCURSOR: - if (bAppFullScreen) - SetCursor(NULL); - else - SetCursor(windowCursor); - return TRUE; - - case WM_KEYUP: - ev.type = ev_keyup; - goto handleKeyDoom; - break; - - case WM_KEYDOWN: - ev.type = ev_keydown; - - handleKeyDoom: - ev.data1 = 0; - if (wParam == VK_PAUSE) - // intercept PAUSE key - { - ev.data1 = KEY_PAUSE; - } - else if (!keyboard_started) - // post some keys during the game startup - // (allow escaping from network synchronization, or pressing enter after - // an error message in the console) - { - switch (wParam) - { - case VK_ESCAPE: ev.data1 = KEY_ESCAPE; break; - case VK_RETURN: ev.data1 = KEY_ENTER; break; - case VK_SHIFT: ev.data1 = KEY_LSHIFT; break; - default: ev.data1 = MapVirtualKey((DWORD)wParam,2); // convert in to char - } - } - - if (ev.data1) - D_PostEvent (&ev); - - return 0; - break; - - // judgecutor: - // Handle mouse events - case WM_LBUTTONDOWN: - case WM_LBUTTONUP: - case WM_RBUTTONDOWN: - case WM_RBUTTONUP: - case WM_MBUTTONDOWN: - case WM_MBUTTONUP: - case WM_MOUSEMOVE: - if (nodinput) - { - mouse_keys = 0; - if (wParam & MK_LBUTTON) - mouse_keys |= 1; - if (wParam & MK_RBUTTON) - mouse_keys |= 2; - if (wParam & MK_MBUTTON) - mouse_keys |= 4; - I_GetSysMouseEvents(mouse_keys); - } - break; - - case WM_XBUTTONUP: - if (nodinput) - { - ev.type = ev_keyup; - ev.data1 = KEY_MOUSE1 + 3 + HIWORD(wParam); - D_PostEvent(&ev); - return TRUE; - } - break; - case WM_XBUTTONDOWN: - if (nodinput) - { - ev.type = ev_keydown; - ev.data1 = KEY_MOUSE1 + 3 + HIWORD(wParam); - D_PostEvent(&ev); - return TRUE; - } - break; - case WM_MOUSEWHEEL: - //I_OutputMsg("MW_WHEEL dispatched.\n"); - ev.type = ev_keydown; - if ((INT16)HIWORD(wParam) > 0) - ev.data1 = KEY_MOUSEWHEELUP; - else - ev.data1 = KEY_MOUSEWHEELDOWN; - D_PostEvent(&ev); - break; - - case WM_SETTEXT: - COM_BufAddText((LPCSTR)lParam); - return TRUE; - break; - - case WM_CLOSE: - PostQuitMessage(0); //to quit while in-game - ev.data1 = KEY_ESCAPE; //to exit network synchronization - ev.type = ev_keydown; - D_PostEvent (&ev); - return 0; - case WM_DESTROY: - //faB: main app loop will exit the loop and proceed with I_Quit() - PostQuitMessage(0); - break; - - case WM_SYSCOMMAND: - // Don't allow the keyboard to activate the menu. - if(wParam == SC_KEYMENU) - return 0; - - break; - - default: - break; - } - - return DefWindowProc(hWnd, message, wParam, lParam); -} - -static inline VOID OpenTextConsole(VOID) -{ - HANDLE ci, co; - BOOL console; - -#ifdef _DEBUG - console = M_CheckParm("-noconsole") == 0; -#else - console = M_CheckParm("-console") != 0; -#endif - - dedicated = M_CheckParm("-dedicated") != 0; - - if (M_CheckParm("-detachconsole")) - { - if (FreeConsole()) - { - I_OutputMsg("Detatched console.\n"); - console = TRUE; //lets get back a console - } - else - { - I_OutputMsg("No console to detatch.\n"); - I_ShowLastError(FALSE); - } - } - - if (dedicated || console) - { - if (AllocConsole()) //Let get the real console HANDLEs, because Mingw's Bash is bad! - { - SetConsoleTitleA("SRB2 Console"); - CONS_Printf(M_GetText("Hello, it's me, SRB2's Console Window\n")); - } - else - { - I_OutputMsg("We have a console already.\n"); - I_ShowLastError(FALSE); - return; - } - } - else - return; - - ci = CreateFile(TEXT("CONIN$") , GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (ci != INVALID_HANDLE_VALUE) - { - HANDLE sih = GetStdHandle(STD_INPUT_HANDLE); - if (sih != ci) - { - I_OutputMsg("Old STD_INPUT_HANDLE: %p\nNew STD_INPUT_HANDLE: %p\n", sih, ci); - SetStdHandle(STD_INPUT_HANDLE,ci); - } - else - I_OutputMsg("STD_INPUT_HANDLE already set at %p\n", ci); - - if (GetFileType(ci) == FILE_TYPE_CHAR) - { -#if 0 - const DWORD CM = ENABLE_LINE_INPUT|ENABLE_ECHO_INPUT|ENABLE_PROCESSED_INPUT; //default mode but no ENABLE_MOUSE_INPUT - if (SetConsoleMode(ci,CM)) - { - I_OutputMsg("Disabled mouse input on the console\n"); - } - else - { - I_OutputMsg("Could not disable mouse input on the console\n"); - I_ShowLastError(FALSE); - } -#endif - } - else - I_OutputMsg("Handle CONIN$ in not a Console HANDLE\n"); - } - else - { - I_OutputMsg("Could not get a CONIN$ HANDLE\n"); - I_ShowLastError(FALSE); - } - - co = CreateFile(TEXT("CONOUT$"), GENERIC_WRITE|GENERIC_READ, FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (co != INVALID_HANDLE_VALUE) - { - HANDLE soh = GetStdHandle(STD_OUTPUT_HANDLE); - HANDLE seh = GetStdHandle(STD_ERROR_HANDLE); - if (soh != co) - { - I_OutputMsg("Old STD_OUTPUT_HANDLE: %p\nNew STD_OUTPUT_HANDLE: %p\n", soh, co); - SetStdHandle(STD_OUTPUT_HANDLE,co); - } - else - I_OutputMsg("STD_OUTPUT_HANDLE already set at %p\n", co); - if (seh != co) - { - I_OutputMsg("Old STD_ERROR_HANDLE: %p\nNew STD_ERROR_HANDLE: %p\n", seh, co); - SetStdHandle(STD_ERROR_HANDLE,co); - } - else - I_OutputMsg("STD_ERROR_HANDLE already set at %p\n", co); - } - else - I_OutputMsg("Could not get a CONOUT$ HANDLE\n"); -} - - -// -// Do that Windows initialization stuff... -// -static HWND OpenMainWindow (HINSTANCE hInstance, LPSTR wTitle) -{ - const LONG styles = WS_CAPTION|WS_POPUP|WS_SYSMENU, exstyles = 0; - HWND hWnd; - WNDCLASSEXA wc; - RECT bounds; - - // Set up and register window class - ZeroMemory(&wc, sizeof(wc)); - wc.cbSize = sizeof(wc); - wc.style = CS_HREDRAW | CS_VREDRAW /*| CS_DBLCLKS*/; - wc.lpfnWndProc = MainWndproc; - wc.hInstance = hInstance; - wc.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_DLICON1)); - windowCursor = LoadCursor(NULL, IDC_WAIT); //LoadCursor(hInstance, MAKEINTRESOURCE(IDC_DLCURSOR1)); - wc.hCursor = windowCursor; - wc.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH); - wc.lpszClassName = wClassName; - - if (!RegisterClassExA(&wc)) - { - I_OutputMsg("Error doing RegisterClassExA\n"); - I_ShowLastError(TRUE); - return INVALID_HANDLE_VALUE; - } - - // Create a window - // CreateWindowEx - seems to create just the interior, not the borders - - bounds.left = 0; - bounds.right = dedicated ? 0 : specialmodes[0].width; - bounds.top = 0; - bounds.bottom = dedicated ? 0 : specialmodes[0].height; - - AdjustWindowRectEx(&bounds, styles, FALSE, exstyles); - - hWnd = CreateWindowExA( - exstyles, //ExStyle - wClassName, //Classname - wTitle, //Windowname - styles, //dwStyle //WS_VISIBLE|WS_POPUP for bAppFullScreen - 0, - 0, - bounds.right - bounds.left, //GetSystemMetrics(SM_CXSCREEN), - bounds.bottom - bounds.top, //GetSystemMetrics(SM_CYSCREEN), - NULL, //hWnd Parent - NULL, //hMenu Menu - hInstance, - NULL); - - if (hWnd == INVALID_HANDLE_VALUE) - { - I_OutputMsg("Error doing CreateWindowExA\n"); - I_ShowLastError(TRUE); - } - - return hWnd; -} - - -static inline BOOL tlErrorMessage(const TCHAR *err) -{ - /* make the cursor visible */ - SetCursor(LoadCursor(NULL, IDC_ARROW)); - - // - // warn user if there is one - // - printf("Error %s..\n", err); - fflush(stdout); - - MessageBox(hWndMain, err, TEXT("ERROR"), MB_OK); - return FALSE; -} - - -// ------------------ -// Command line stuff -// ------------------ -#define MAXCMDLINEARGS 64 -static char * myWargv[MAXCMDLINEARGS+1]; -static char myCmdline[512]; - -static VOID GetArgcArgv (LPSTR cmdline) -{ - LPSTR tokenstr; - size_t i = 0, len; - char cSep = ' '; - BOOL bCvar = FALSE, prevCvar = FALSE; - - // split arguments of command line into argv - strlcpy (myCmdline, cmdline, sizeof(myCmdline)); // in case window's cmdline is in protected memory..for strtok - len = strlen (myCmdline); - - myargc = 0; - while (myargc < MAXCMDLINEARGS) - { - // get token - while (myCmdline[i] == cSep) - i++; - if (i >= len) - break; - tokenstr = myCmdline + i; - if (myCmdline[i] == '"') - { - cSep = '"'; - i++; - if (!prevCvar) //cvar leave the "" in - tokenstr++; - } - else - cSep = ' '; - - //cvar - if (myCmdline[i] == '+' && cSep == ' ') //a + begins a cvarname, but not after quotes - bCvar = TRUE; - else - bCvar = FALSE; - - while (myCmdline[i] && - myCmdline[i] != cSep) - i++; - - if (myCmdline[i] == '"') - { - cSep = ' '; - if (prevCvar) - i++; // get ending " quote in arg - } - - prevCvar = bCvar; - - if (myCmdline + i > tokenstr) - { - myWargv[myargc++] = tokenstr; - } - - if (!myCmdline[i] || i >= len) - break; - - myCmdline[i++] = '\0'; - } - myWargv[myargc] = NULL; - - // m_argv.c uses myargv[], we used myWargv because we fill the arguments ourselves - // and myargv is just a pointer, so we set it to point myWargv - myargv = myWargv; -} - -static inline VOID MakeCodeWritable(VOID) -{ -#ifdef USEASM // Disable write-protection of code segment - DWORD OldRights; - const DWORD NewRights = PAGE_EXECUTE_READWRITE; - PBYTE pBaseOfImage = (PBYTE)GetModuleHandle(NULL); - PIMAGE_DOS_HEADER dosH =(PIMAGE_DOS_HEADER)pBaseOfImage; - PIMAGE_NT_HEADERS ntH = (PIMAGE_NT_HEADERS)(pBaseOfImage + dosH->e_lfanew); - PIMAGE_OPTIONAL_HEADER oH = (PIMAGE_OPTIONAL_HEADER) - ((PBYTE)ntH + sizeof (IMAGE_NT_SIGNATURE) + sizeof (IMAGE_FILE_HEADER)); - LPVOID pA = pBaseOfImage+oH->BaseOfCode; - SIZE_T pS = oH->SizeOfCode; -#if 1 // try to find the text section - PIMAGE_SECTION_HEADER ntS = IMAGE_FIRST_SECTION (ntH); - WORD s; - for (s = 0; s < ntH->FileHeader.NumberOfSections; s++) - { - if (memcmp (ntS[s].Name, ".text\0\0", 8) == 0) - { - pA = pBaseOfImage+ntS[s].VirtualAddress; - pS = ntS[s].Misc.VirtualSize; - break; - } - } -#endif - - if (!VirtualProtect(pA,pS,NewRights,&OldRights)) - I_Error("Could not make code writable\n"); -#endif -} - -// ----------------------------------------------------------------------------- -// HandledWinMain : called by exception handler -// ----------------------------------------------------------------------------- -static int WINAPI HandledWinMain(HINSTANCE hInstance) -{ - LPSTR args; - -#ifdef LOGMESSAGES - // DEBUG!!! - set logstream to NULL to disable debug log - // Replace WIN32 filehandle with standard C calls, because WIN32 doesn't handle \n properly. - logstream = fopen(va("%s"PATHSEP"%s", srb2home, "log.txt"), "wt"); -#endif - - // fill myargc,myargv for m_argv.c retrieval of cmdline arguments - args = GetCommandLineA(); - CONS_Printf("Command line arguments: '%s'\n", args); - GetArgcArgv(args); - // Create a text console window - OpenTextConsole(); - -#ifdef _DEBUG - { - int i; - CONS_Printf("Myargc: %d\n", myargc); - for (i = 0; i < myargc; i++) - CONS_Printf("myargv[%d] : '%s'\n", i, myargv[i]); - } -#endif - - // open a dummy window, both OpenGL and DirectX need one. - if ((hWndMain = OpenMainWindow(hInstance, va("SRB2 "VERSIONSTRING))) == INVALID_HANDLE_VALUE) - { - tlErrorMessage(TEXT("Couldn't open window")); - return FALSE; - } - - // currently starts DirectInput - CONS_Printf("I_StartupSystem() ...\n"); - I_StartupSystem(); - MakeCodeWritable(); - - // startup SRB2 - CONS_Printf("Setting up SRB2...\n"); - D_SRB2Main(); - CONS_Printf("Entering main game loop...\n"); - // never return - D_SRB2Loop(); - - // back to Windoze - return 0; -} - -// ----------------------------------------------------------------------------- -// Exception handler calls WinMain for catching exceptions -// ----------------------------------------------------------------------------- -int WINAPI WinMain (HINSTANCE hInstance, - HINSTANCE hPrevInstance, - LPSTR lpCmdLine, - int nCmdShow) -{ - int Result = -1; - UNREFERENCED_PARAMETER(hPrevInstance); - UNREFERENCED_PARAMETER(lpCmdLine); - UNREFERENCED_PARAMETER(nCmdShow); - - { -#if 0 - p_IsDebuggerPresent pfnIsDebuggerPresent = (p_IsDebuggerPresent)GetProcAddress(GetModuleHandleA("kernel32.dll"),"IsDebuggerPresent"); - if((!pfnIsDebuggerPresent || !pfnIsDebuggerPresent()) -#ifdef BUGTRAP - && !InitBugTrap() -#endif - ) -#endif - { - LoadLibraryA("exchndl.dll"); - } - } -#ifndef __MINGW32__ - prevExceptionFilter = SetUnhandledExceptionFilter(RecordExceptionInfo); -#endif - Result = HandledWinMain(hInstance); -#ifdef BUGTRAP - // This is safe even if BT didn't start. - ShutdownBugTrap(); -#endif - - return Result; -} -#endif //_WINDOWS diff --git a/src/win32/win_main.h b/src/win32/win_main.h deleted file mode 100644 index 326a813dd..000000000 --- a/src/win32/win_main.h +++ /dev/null @@ -1,45 +0,0 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- -// -// Copyright (C) 1998-2000 by DooM Legacy Team. -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -//----------------------------------------------------------------------------- -/// \file -/// \brief Win32 Sharing - -//#define WIN32_LEAN_AND_MEAN -#define RPC_NO_WINDOWS_H -#include -#include - -extern HWND hWndMain; - -extern INT appActive; - -VOID I_GetSysMouseEvents(INT mouse_state); -extern UINT MSHWheelMessage; - -extern BOOL nodinput; -BOOL LoadDirectInput(VOID); - -//faB: midi channel Volume set is delayed by the MIDI stream callback thread, see win_snd.c -#define WM_MSTREAM_UPDATEVOLUME (WM_USER + 101) - -// defined in win_sys.c -VOID I_BeginProfile(VOID); //for timing code -DWORD I_EndProfile(VOID); - -VOID I_ShowLastError(BOOL MB); -VOID I_LoadingScreen (LPCSTR msg); - -VOID I_RestartSysMouse(VOID); -VOID I_DoStartupMouse(VOID); diff --git a/src/win32/win_net.c b/src/win32/win_net.c deleted file mode 100644 index 62c081bbe..000000000 --- a/src/win32/win_net.c +++ /dev/null @@ -1,42 +0,0 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- -// -// Copyright (C) 1998-2000 by DooM Legacy Team. -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -//----------------------------------------------------------------------------- -/// \file -/// \brief Win32 network interface - -#include "../doomdef.h" -#include "../m_argv.h" -#include "../i_net.h" - -#ifdef _WINDOWS - -// -// NETWORKING -// - -// -// I_InitNetwork -// -boolean I_InitNetwork(void) -{ - if (M_CheckParm ("-net")) - { - I_Error("The Win32 version of SRB2 doesn't work with external drivers like ipxsetup, sersetup, or doomatic\n" - "Read the documentation about \"-server\" and \"-connect\" parameters or just use the launcher\n"); - } - - return false; -} -#endif diff --git a/src/win32/win_snd.c b/src/win32/win_snd.c deleted file mode 100644 index 13f766728..000000000 --- a/src/win32/win_snd.c +++ /dev/null @@ -1,959 +0,0 @@ -/// \file -/// \brief FMOD Ex interface for sound -#include "../doomdef.h" -#include "../sounds.h" -#include "../i_sound.h" -#include "../s_sound.h" -#include "../w_wad.h" -#include "../z_zone.h" -#include "../byteptr.h" - -#include // FMOD Ex -#define errcode _errcode -#include -#undef errcode - -#ifdef HAVE_LIBGME -#include "gme/gme.h" -#define GME_TREBLE 5.0 -#define GME_BASS 1.0 - -#ifdef HAVE_ZLIB -#ifndef _MSC_VER -#ifndef _LARGEFILE64_SOURCE -#define _LARGEFILE64_SOURCE -#endif -#endif - -#ifndef _LFS64_LARGEFILE -#define _LFS64_LARGEFILE -#endif - -#ifndef _FILE_OFFSET_BITS -#define _FILE_OFFSET_BITS 0 -#endif - -#include "zlib.h" -#endif // HAVE_ZLIB -#endif // HAVE_LIBGME - -static FMOD_SYSTEM *fsys; -static FMOD_SOUND *music_stream; -static FMOD_CHANNEL *music_channel; - -static UINT8 music_volume, midi_volume, sfx_volume; -static INT32 current_track; - -#ifdef HAVE_LIBGME -static Music_Emu *gme; -#endif - -// -// SYSTEM -// - -// spew console messages for general errors. -static void FMR_Debug(FMOD_RESULT e, int line) -{ - if (e != FMOD_OK) - CONS_Alert(CONS_ERROR, "FMOD:%d - %s\n", line, FMOD_ErrorString(e)); -} -#define FMR(x) FMR_Debug(x, __LINE__) - -// for operations on music_channel ONLY. -// returns false if music was released. -// (in other words, if !FMR_MUSIC(op) return immediately, -// because music_stream and music_channel are no longer valid.) -static boolean FMR_Music_Debug(FMOD_RESULT e, int line) -{ - switch(e) - { - case FMOD_ERR_INVALID_HANDLE: // non-looping song ended - case FMOD_ERR_CHANNEL_STOLEN: // song ended and then sfx was played - FMOD_Sound_Release(music_stream); - music_stream = NULL; - return false; - default: - FMR_Debug(e, line); - break; - } - return true; -} -#define FMR_MUSIC(x) FMR_Music_Debug(x, __LINE__) - -void I_StartupSound(void) -{ - I_Assert(!sound_started); - sound_started = true; - - FMR(FMOD_System_Create(&fsys)); - FMR(FMOD_System_SetDSPBufferSize(fsys, 44100 / 30, 2)); - FMR(FMOD_System_Init(fsys, 64, FMOD_INIT_VOL0_BECOMES_VIRTUAL, NULL)); - music_stream = NULL; -#ifdef HAVE_LIBGME - gme = NULL; -#endif - current_track = -1; -} - -void I_ShutdownSound(void) -{ - I_Assert(sound_started); - sound_started = false; - -#ifdef HAVE_LIBGME - if (gme) - gme_delete(gme); -#endif - FMR(FMOD_System_Release(fsys)); -} - -void I_UpdateSound(void) -{ - FMR(FMOD_System_Update(fsys)); -} - -#ifdef HAVE_LIBGME -// Callback hook to read streaming GME data. -static FMOD_RESULT F_CALLBACK GMEReadCallback(FMOD_SOUND *sound, void *data, unsigned int datalen) -{ - Music_Emu *emu; - void *emuvoid = NULL; - // get our emu - FMR(FMOD_Sound_GetUserData(sound, &emuvoid)); - emu = emuvoid; - // no emu? no play. - if (!emu) - return FMOD_ERR_FILE_EOF; - if (gme_track_ended(emu)) - { - // don't delete the primary music stream - if (emu == gme) - return FMOD_ERR_FILE_EOF; - // do delete sfx streams - FMR(FMOD_Sound_SetUserData(sound, NULL)); - gme_delete(emu); - return FMOD_ERR_FILE_EOF; - } - // play beautiful musics theme of ancient land. - if (gme_play(emu, datalen/2, data)) - return FMOD_ERR_FILE_BAD; - // O.K - return FMOD_OK; -} -#endif - -// -// SFX -// - -// convert doom format sound (signed 8bit) -// to an fmod format sound (unsigned 8bit) -// and return the FMOD_SOUND. -static inline FMOD_SOUND *ds2fmod(char *stream) -{ - FMOD_SOUND *sound; - UINT16 ver; - UINT16 freq; - UINT32 samples; - FMOD_CREATESOUNDEXINFO fmt; - UINT32 i; - UINT8 *p; - - // lump header - ver = READUINT16(stream); // sound version format? - if (ver != 3) // It should be 3 if it's a doomsound... - return NULL; // onos! it's not a doomsound! - freq = READUINT16(stream); - samples = READUINT32(stream); - //CONS_Printf("FMT: v%d f%d, s%d, b%d\n", ver, freq, samples, bps); - - memset(&fmt, 0, sizeof(FMOD_CREATESOUNDEXINFO)); - fmt.cbsize = sizeof(FMOD_CREATESOUNDEXINFO); - - // convert to unsigned - fmt.format = FMOD_SOUND_FORMAT_PCM8; // 8bit - fmt.length = samples*1; // 1 bps - fmt.numchannels = 1; // mono - fmt.defaultfrequency = freq; - - // Make a duplicate of the stream to change format. - p = Z_Malloc(fmt.length, PU_SOUND, NULL); - for (i = 0; i < fmt.length; i++) - p[i] = (UINT8)(stream[i]+0x80); // convert from signed to unsigned - stream = (char *)p; - - // Create FMOD_SOUND. - FMR(FMOD_System_CreateSound(fsys, stream, FMOD_CREATESAMPLE|FMOD_OPENMEMORY|FMOD_OPENRAW|FMOD_SOFTWARE|FMOD_LOWMEM, &fmt, &sound)); - - Z_Free(stream); // FMOD made its own copy, so we don't need this anymore. - return sound; -} - -void *I_GetSfx(sfxinfo_t *sfx) -{ - FMOD_SOUND *sound; - char *lump; - FMOD_CREATESOUNDEXINFO fmt; -#ifdef HAVE_LIBGME - Music_Emu *emu; - gme_info_t *info; -#endif - - if (sfx->lumpnum == LUMPERROR) - sfx->lumpnum = S_GetSfxLumpNum(sfx); - sfx->length = W_LumpLength(sfx->lumpnum); - - lump = W_CacheLumpNum(sfx->lumpnum, PU_SOUND); - sound = ds2fmod(lump); - if (sound) - { - Z_Free(lump); - return sound; - } - - // It's not a doom sound. - // Try to read it as an FMOD sound? - - memset(&fmt, 0, sizeof(FMOD_CREATESOUNDEXINFO)); - fmt.cbsize = sizeof(FMOD_CREATESOUNDEXINFO); - fmt.length = sfx->length; - -#ifdef HAVE_LIBGME - // VGZ format - if ((UINT8)lump[0] == 0x1F - && (UINT8)lump[1] == 0x8B) - { -#ifdef HAVE_ZLIB - UINT8 *inflatedData; - size_t inflatedLen; - z_stream stream; - int zErr; // Somewhere to handle any error messages zlib tosses out - - memset(&stream, 0x00, sizeof (z_stream)); // Init zlib stream - // Begin the inflation process - inflatedLen = *(UINT32 *)(lump + (sfx->length-4)); // Last 4 bytes are the decompressed size, typically - inflatedData = (UINT8 *)Z_Malloc(inflatedLen, PU_SOUND, NULL); // Make room for the decompressed data - stream.total_in = stream.avail_in = sfx->length; - stream.total_out = stream.avail_out = inflatedLen; - stream.next_in = (UINT8 *)lump; - stream.next_out = inflatedData; - - zErr = inflateInit2(&stream, 32 + MAX_WBITS); - if (zErr == Z_OK) // We're good to go - { - zErr = inflate(&stream, Z_FINISH); - if (zErr == Z_STREAM_END) { - // Run GME on new data - if (!gme_open_data(inflatedData, inflatedLen, &emu, 44100)) - { - Z_Free(inflatedData); // GME supposedly makes a copy for itself, so we don't need this lying around - Z_Free(lump); // We're done with the uninflated lump now, too. - - gme_start_track(emu, 0); - gme_track_info(emu, &info, 0); - - fmt.format = FMOD_SOUND_FORMAT_PCM16; - fmt.defaultfrequency = 44100; - fmt.numchannels = 2; - fmt.length = ((UINT32)info->play_length * 441 / 10) * 4; - fmt.decodebuffersize = (44100 * 2) / 35; - fmt.pcmreadcallback = GMEReadCallback; - fmt.userdata = emu; - - FMR(FMOD_System_CreateSound(fsys, NULL, FMOD_CREATESAMPLE|FMOD_OPENUSER|FMOD_SOFTWARE|FMOD_LOWMEM, &fmt, &sound)); - return sound; - } - } - else - { - const char *errorType; - switch (zErr) - { - case Z_ERRNO: - errorType = "Z_ERRNO"; break; - case Z_STREAM_ERROR: - errorType = "Z_STREAM_ERROR"; break; - case Z_DATA_ERROR: - errorType = "Z_DATA_ERROR"; break; - case Z_MEM_ERROR: - errorType = "Z_MEM_ERROR"; break; - case Z_BUF_ERROR: - errorType = "Z_BUF_ERROR"; break; - case Z_VERSION_ERROR: - errorType = "Z_VERSION_ERROR"; break; - default: - errorType = "unknown error"; - } - CONS_Alert(CONS_ERROR,"Encountered %s when running inflate: %s\n", errorType, stream.msg); - } - (void)inflateEnd(&stream); - } - else // Hold up, zlib's got a problem - { - const char *errorType; - switch (zErr) - { - case Z_ERRNO: - errorType = "Z_ERRNO"; break; - case Z_STREAM_ERROR: - errorType = "Z_STREAM_ERROR"; break; - case Z_DATA_ERROR: - errorType = "Z_DATA_ERROR"; break; - case Z_MEM_ERROR: - errorType = "Z_MEM_ERROR"; break; - case Z_BUF_ERROR: - errorType = "Z_BUF_ERROR"; break; - case Z_VERSION_ERROR: - errorType = "Z_VERSION_ERROR"; break; - default: - errorType = "unknown error"; - } - CONS_Alert(CONS_ERROR,"Encountered %s when running inflateInit: %s\n", errorType, stream.msg); - } - Z_Free(inflatedData); // GME didn't open jack, but don't let that stop us from freeing this up -#else - //CONS_Alert(CONS_ERROR,"Cannot decompress VGZ; no zlib support\n"); -#endif - } - // Try to read it as a GME sound - else if (!gme_open_data(lump, sfx->length, &emu, 44100)) - { - Z_Free(lump); - - gme_start_track(emu, 0); - gme_track_info(emu, &info, 0); - - fmt.format = FMOD_SOUND_FORMAT_PCM16; - fmt.defaultfrequency = 44100; - fmt.numchannels = 2; - fmt.length = ((UINT32)info->play_length * 441 / 10) * 4; - fmt.decodebuffersize = (44100 * 2) / 35; - fmt.pcmreadcallback = GMEReadCallback; - fmt.userdata = emu; - - gme_free_info(info); - - FMR(FMOD_System_CreateSound(fsys, NULL, FMOD_CREATESAMPLE|FMOD_OPENUSER|FMOD_SOFTWARE|FMOD_LOWMEM, &fmt, &sound)); - return sound; - } -#endif - - // Ogg, Mod, Midi, etc. - FMR(FMOD_System_CreateSound(fsys, lump, FMOD_CREATESAMPLE|FMOD_OPENMEMORY|FMOD_SOFTWARE|FMOD_LOWMEM, &fmt, &sound)); - Z_Free(lump); // We're done with the lump now, at least. - return sound; -} - -void I_FreeSfx(sfxinfo_t *sfx) -{ - if (sfx->data) - FMOD_Sound_Release(sfx->data); - sfx->data = NULL; -} - -INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority, INT32 channel) -{ - FMOD_SOUND *sound; - FMOD_CHANNEL *chan; - INT32 i; - float frequency; - (void)channel; - - sound = (FMOD_SOUND *)S_sfx[id].data; - I_Assert(sound != NULL); - - FMR(FMOD_System_PlaySound(fsys, FMOD_CHANNEL_FREE, sound, true, &chan)); - - if (sep == 0) - sep = 1; - - FMR(FMOD_Channel_SetVolume(chan, (vol / 255.0) * (sfx_volume / 31.0))); - FMR(FMOD_Channel_SetPan(chan, (sep - 128) / 127.0)); - - FMR(FMOD_Sound_GetDefaults(sound, &frequency, NULL, NULL, NULL)); - FMR(FMOD_Channel_SetFrequency(chan, (pitch / 128.0) * frequency)); - - FMR(FMOD_Channel_SetPriority(chan, priority)); - //UNREFERENCED_PARAMETER(priority); - //FMR(FMOD_Channel_SetPriority(chan, 1 + ((0xff-vol)>>1))); // automatic priority 1 - 128 based on volume (priority 0 is music) - - FMR(FMOD_Channel_GetIndex(chan, &i)); - FMR(FMOD_Channel_SetPaused(chan, false)); - return i; -} - -void I_StopSound(INT32 handle) -{ - FMOD_CHANNEL *chan; - FMR(FMOD_System_GetChannel(fsys, handle, &chan)); - if (music_stream && chan == music_channel) - return; - FMR(FMOD_Channel_Stop(chan)); -} - -boolean I_SoundIsPlaying(INT32 handle) -{ - FMOD_CHANNEL *chan; - FMOD_BOOL playing; - FMOD_RESULT e; - FMR(FMOD_System_GetChannel(fsys, handle, &chan)); - if (music_stream && chan == music_channel) - return false; - e = FMOD_Channel_IsPlaying(chan, &playing); - switch(e) - { - case FMOD_ERR_INVALID_HANDLE: // Sound effect finished. - case FMOD_ERR_CHANNEL_STOLEN: // Sound effect interrupted. -- technically impossible due to GetChannel by handle. :( - return false; // therefore, it's not playing anymore. - default: - FMR(e); - break; - } - return (boolean)playing; -} - -// seems to never be called on an invalid channel (calls I_SoundIsPlaying first?) -// so I'm not gonna worry about it. -void I_UpdateSoundParams(INT32 handle, UINT8 vol, UINT8 sep, UINT8 pitch) -{ - FMOD_CHANNEL *chan; - FMOD_SOUND *sound; - float frequency; - - FMR(FMOD_System_GetChannel(fsys, handle, &chan)); - FMR(FMOD_Channel_SetVolume(chan, (vol / 255.0) * (sfx_volume / 31.0))); - FMR(FMOD_Channel_SetPan(chan, (sep - 128) / 127.0)); - - FMR(FMOD_Channel_GetCurrentSound(chan, &sound)); - FMR(FMOD_Sound_GetDefaults(sound, &frequency, NULL, NULL, NULL)); - FMR(FMOD_Channel_SetFrequency(chan, (pitch / 128.0) * frequency)); - - //FMR(FMOD_Channel_SetPriority(chan, 1 + ((0xff-vol)>>1))); // automatic priority 1 - 128 based on volume (priority 0 is music) -} - -void I_SetSfxVolume(UINT8 volume) -{ - // volume is 0 to 31. - sfx_volume = volume; -} - -/// ------------------------ -// MUSIC SYSTEM -/// ------------------------ - -void I_InitMusic(void) -{ -} - -void I_ShutdownMusic(void) -{ - I_StopSong(); -} - -/// ------------------------ -// MUSIC PROPERTIES -/// ------------------------ - -musictype_t I_SongType(void) -{ - FMOD_SOUND_TYPE type; - -#ifdef HAVE_LIBGME - if (gme) - return MU_GME; -#endif - - if (!music_stream) - return MU_NONE; - - if (FMOD_Sound_GetFormat(music_stream, &type, NULL, NULL, NULL) == FMOD_OK) - { - switch(type) - { - case FMOD_SOUND_TYPE_WAV: - return MU_WAV; - case FMOD_SOUND_TYPE_MOD: - return MU_MOD; - case FMOD_SOUND_TYPE_MIDI: - return MU_MID; - case FMOD_SOUND_TYPE_OGGVORBIS: - return MU_OGG; - case FMOD_SOUND_TYPE_MPEG: - return MU_MP3; - case FMOD_SOUND_TYPE_FLAC: - return MU_FLAC; - default: - return MU_NONE; - } - } - else - return MU_NONE; -} - -boolean I_SongPlaying(void) -{ - return (music_stream != NULL); -} - -boolean I_SongPaused(void) -{ - FMOD_BOOL fmpaused = false; - if (music_stream) - FMOD_Channel_GetPaused(music_channel, &fmpaused); - return (boolean)fmpaused; -} - -/// ------------------------ -// MUSIC EFFECTS -/// ------------------------ - -boolean I_SetSongSpeed(float speed) -{ - FMOD_RESULT e; - float frequency; - if (!music_stream) - return false; - if (speed > 250.0f) - speed = 250.0f; //limit speed up to 250x - -#ifdef HAVE_LIBGME - // Try to set GME speed - if (gme) - { - gme_set_tempo(gme, speed); - return true; - } -#endif - - // Try to set Mod/Midi speed - e = FMOD_Sound_SetMusicSpeed(music_stream, speed); - - if (e == FMOD_ERR_FORMAT) - { - // Just change pitch instead for Ogg/etc. - FMR(FMOD_Sound_GetDefaults(music_stream, &frequency, NULL, NULL, NULL)); - FMR_MUSIC(FMOD_Channel_SetFrequency(music_channel, speed*frequency)); - } - else - FMR_MUSIC(e); - - return true; -} - -/// ------------------------ -// MUSIC PLAYBACK -/// ------------------------ - -boolean I_LoadSong(char *data, size_t len) -{ - FMOD_CREATESOUNDEXINFO fmt; - FMOD_RESULT e; - FMOD_TAG tag; - unsigned int loopstart, loopend; - - if ( -#ifdef HAVE_LIBGME - gme || -#endif - music_stream - ) - I_UnloadSong(); - - memset(&fmt, 0, sizeof(FMOD_CREATESOUNDEXINFO)); - fmt.cbsize = sizeof(FMOD_CREATESOUNDEXINFO); - -#ifdef HAVE_LIBGME - if ((UINT8)data[0] == 0x1F - && (UINT8)data[1] == 0x8B) - { -#ifdef HAVE_ZLIB - UINT8 *inflatedData; - size_t inflatedLen; - z_stream stream; - int zErr; // Somewhere to handle any error messages zlib tosses out - - memset(&stream, 0x00, sizeof (z_stream)); // Init zlib stream - // Begin the inflation process - inflatedLen = *(UINT32 *)(data + (len-4)); // Last 4 bytes are the decompressed size, typically - inflatedData = (UINT8 *)Z_Calloc(inflatedLen, PU_MUSIC, NULL); // Make room for the decompressed data - stream.total_in = stream.avail_in = len; - stream.total_out = stream.avail_out = inflatedLen; - stream.next_in = (UINT8 *)data; - stream.next_out = inflatedData; - - zErr = inflateInit2(&stream, 32 + MAX_WBITS); - if (zErr == Z_OK) // We're good to go - { - zErr = inflate(&stream, Z_FINISH); - if (zErr == Z_STREAM_END) { - // Run GME on new data - if (!gme_open_data(inflatedData, inflatedLen, &gme, 44100)) - { - gme_equalizer_t gmeq = {GME_TREBLE, GME_BASS, 0,0,0,0,0,0,0,0}; - Z_Free(inflatedData); // GME supposedly makes a copy for itself, so we don't need this lying around - Z_Free(data); // We don't need this, either. - gme_set_equalizer(gme,&gmeq); - fmt.format = FMOD_SOUND_FORMAT_PCM16; - fmt.defaultfrequency = 44100; - fmt.numchannels = 2; - fmt.length = -1; - fmt.decodebuffersize = (44100 * 2) / 35; - fmt.pcmreadcallback = GMEReadCallback; - fmt.userdata = gme; - FMR(FMOD_System_CreateStream(fsys, NULL, FMOD_OPENUSER, &fmt, &music_stream)); - return true; - } - } - else - { - const char *errorType; - switch (zErr) - { - case Z_ERRNO: - errorType = "Z_ERRNO"; break; - case Z_STREAM_ERROR: - errorType = "Z_STREAM_ERROR"; break; - case Z_DATA_ERROR: - errorType = "Z_DATA_ERROR"; break; - case Z_MEM_ERROR: - errorType = "Z_MEM_ERROR"; break; - case Z_BUF_ERROR: - errorType = "Z_BUF_ERROR"; break; - case Z_VERSION_ERROR: - errorType = "Z_VERSION_ERROR"; break; - default: - errorType = "unknown error"; - } - CONS_Alert(CONS_ERROR,"Encountered %s when running inflate: %s\n", errorType, stream.msg); - } - (void)inflateEnd(&stream); - } - else // Hold up, zlib's got a problem - { - const char *errorType; - switch (zErr) - { - case Z_ERRNO: - errorType = "Z_ERRNO"; break; - case Z_STREAM_ERROR: - errorType = "Z_STREAM_ERROR"; break; - case Z_DATA_ERROR: - errorType = "Z_DATA_ERROR"; break; - case Z_MEM_ERROR: - errorType = "Z_MEM_ERROR"; break; - case Z_BUF_ERROR: - errorType = "Z_BUF_ERROR"; break; - case Z_VERSION_ERROR: - errorType = "Z_VERSION_ERROR"; break; - default: - errorType = "unknown error"; - } - CONS_Alert(CONS_ERROR,"Encountered %s when running inflateInit: %s\n", errorType, stream.msg); - } - Z_Free(inflatedData); // GME didn't open jack, but don't let that stop us from freeing this up -#else - //CONS_Alert(CONS_ERROR,"Cannot decompress VGZ; no zlib support\n"); -#endif - } - else if (!gme_open_data(data, len, &gme, 44100)) - { - gme_equalizer_t gmeq = {GME_TREBLE, GME_BASS, 0,0,0,0,0,0,0,0}; - Z_Free(data); // We don't need this anymore. - gme_set_equalizer(gme,&gmeq); - fmt.format = FMOD_SOUND_FORMAT_PCM16; - fmt.defaultfrequency = 44100; - fmt.numchannels = 2; - fmt.length = -1; - fmt.decodebuffersize = (44100 * 2) / 35; - fmt.pcmreadcallback = GMEReadCallback; - fmt.userdata = gme; - FMR(FMOD_System_CreateStream(fsys, NULL, FMOD_OPENUSER, &fmt, &music_stream)); - return true; - } -#endif - - fmt.length = len; - - e = FMOD_System_CreateStream(fsys, data, FMOD_OPENMEMORY_POINT, &fmt, &music_stream); - if (e != FMOD_OK) - { - if (e == FMOD_ERR_FORMAT) - CONS_Alert(CONS_WARNING, "Failed to play music lump due to invalid format.\n"); - else - FMR(e); - return false; - } - - // Try to find a loop point in streaming music formats (ogg, mp3) - - // A proper LOOPPOINT is its own tag, stupid. - e = FMOD_Sound_GetTag(music_stream, "LOOPPOINT", 0, &tag); - if (e != FMOD_ERR_TAGNOTFOUND) - { - FMR(e); - loopstart = atoi((char *)tag.data); // assumed to be a string data tag. - FMR(FMOD_Sound_GetLoopPoints(music_stream, NULL, FMOD_TIMEUNIT_PCM, &loopend, FMOD_TIMEUNIT_PCM)); - if (loopstart > 0) - FMR(FMOD_Sound_SetLoopPoints(music_stream, loopstart, FMOD_TIMEUNIT_PCM, loopend, FMOD_TIMEUNIT_PCM)); - return true; - } - - // Use LOOPMS for time in miliseconds. - e = FMOD_Sound_GetTag(music_stream, "LOOPMS", 0, &tag); - if (e != FMOD_ERR_TAGNOTFOUND) - { - FMR(e); - loopstart = atoi((char *)tag.data); // assumed to be a string data tag. - FMR(FMOD_Sound_GetLoopPoints(music_stream, NULL, FMOD_TIMEUNIT_MS, &loopend, FMOD_TIMEUNIT_PCM)); - if (loopstart > 0) - FMR(FMOD_Sound_SetLoopPoints(music_stream, loopstart, FMOD_TIMEUNIT_MS, loopend, FMOD_TIMEUNIT_PCM)); - return true; - } - - // Try to fetch it from the COMMENT tag, like A.J. Freda - e = FMOD_Sound_GetTag(music_stream, "COMMENT", 0, &tag); - if (e != FMOD_ERR_TAGNOTFOUND) - { - char *loopText; - // Handle any errors that arose, first - FMR(e); - // Figure out where the number starts - loopText = strstr((char *)tag.data,"LOOPPOINT="); - if (loopText != NULL) - { - // Skip the "LOOPPOINT=" part. - loopText += 10; - // Convert it to our looppoint - // FMOD seems to ensure the tag is properly NULL-terminated. - // atoi will stop when it reaches anything that's not a number. - loopstart = atoi(loopText); - // Now do the rest like above - FMR(FMOD_Sound_GetLoopPoints(music_stream, NULL, FMOD_TIMEUNIT_PCM, &loopend, FMOD_TIMEUNIT_PCM)); - if (loopstart > 0) - FMR(FMOD_Sound_SetLoopPoints(music_stream, loopstart, FMOD_TIMEUNIT_PCM, loopend, FMOD_TIMEUNIT_PCM)); - } - return true; - } - - // No special loop point - return true; -} - -void I_UnloadSong(void) -{ - I_StopSong(); -#ifdef HAVE_LIBGME - if (gme) - { - gme_delete(gme); - gme = NULL; - } -#endif - if (music_stream) - { - FMR(FMOD_Sound_Release(music_stream)); - music_stream = NULL; - } -} - -boolean I_PlaySong(boolean looping) -{ -#ifdef HAVE_LIBGME - if (gme) - { - gme_start_track(gme, 0); - current_track = 0; - FMR(FMOD_System_PlaySound(fsys, FMOD_CHANNEL_FREE, music_stream, false, &music_channel)); - FMR(FMOD_Channel_SetVolume(music_channel, music_volume / 31.0)); - FMR(FMOD_Channel_SetPriority(music_channel, 0)); - return true; - } -#endif - - FMR(FMOD_Sound_SetMode(music_stream, (looping ? FMOD_LOOP_NORMAL : FMOD_LOOP_OFF))); - FMR(FMOD_System_PlaySound(fsys, FMOD_CHANNEL_FREE, music_stream, false, &music_channel)); - if (I_SongType() != MU_MID) - FMR(FMOD_Channel_SetVolume(music_channel, midi_volume / 31.0)); - else - FMR(FMOD_Channel_SetVolume(music_channel, music_volume / 31.0)); - FMR(FMOD_Channel_SetPriority(music_channel, 0)); - current_track = 0; - - return true; -} - -void I_StopSong(void) -{ - if (music_channel) - FMR_MUSIC(FMOD_Channel_Stop(music_channel)); -} - -void I_PauseSong(void) -{ - if (music_channel) - FMR_MUSIC(FMOD_Channel_SetPaused(music_channel, true)); -} - -void I_ResumeSong(void) -{ - if (music_channel) - FMR_MUSIC(FMOD_Channel_SetPaused(music_channel, false)); -} - -void I_SetMusicVolume(UINT8 volume) -{ - if (!music_channel) - return; - - // volume is 0 to 31. - if (I_SongType() == MU_MID) - music_volume = 31; // windows bug hack - else - music_volume = volume; - - FMR_MUSIC(FMOD_Channel_SetVolume(music_channel, music_volume / 31.0)); -} - -UINT32 I_GetSongLength(void) -{ - UINT32 length; - if (I_SongType() == MU_MID) - return 0; - FMR_MUSIC(FMOD_Sound_GetLength(music_stream, &length, FMOD_TIMEUNIT_MS)); - return length; -} - -boolean I_SetSongLoopPoint(UINT32 looppoint) -{ - (void)looppoint; - return false; -} - -UINT32 I_GetSongLoopPoint(void) -{ - return 0; -} - -boolean I_SetSongPosition(UINT32 position) -{ - FMOD_RESULT e; - if(I_SongType() == MU_MID) - // Dummy out; this works for some MIDI, but not others. - // SDL does not support this for any MIDI. - return false; - - e = FMOD_Channel_SetPosition(music_channel, position, FMOD_TIMEUNIT_MS); - if (e == FMOD_OK) - return true; - else if (e == FMOD_ERR_UNSUPPORTED // Only music modules, numbnuts! - || e == FMOD_ERR_INVALID_POSITION) // Out-of-bounds! - return false; - else // Congrats, you horribly broke it somehow - { - FMR_MUSIC(e); - return false; - } -} - -UINT32 I_GetSongPosition(void) -{ - FMOD_RESULT e; - unsigned int fmposition = 0; - if(I_SongType() == MU_MID) - // Dummy out because unsupported, even though FMOD does this correctly. - return 0; - e = FMOD_Channel_GetPosition(music_channel, &fmposition, FMOD_TIMEUNIT_MS); - if (e == FMOD_OK) - return (UINT32)fmposition; - else - return 0; -} - -boolean I_SetSongTrack(INT32 track) -{ - if (track != current_track) // If the track's already playing, then why bother? - { - FMOD_RESULT e; - - #ifdef HAVE_LIBGME - // If the specified track is within the number of tracks playing, then change it - if (gme) - { - if (track >= 0 - && track < gme_track_count(gme)) - { - gme_err_t gme_e = gme_start_track(gme,track); - if (gme_e == NULL) - { - current_track = track; - return true; - } - else - CONS_Alert(CONS_ERROR, "Encountered GME error: %s\n", gme_e); - } - return false; - } - #endif // HAVE_LIBGME - - // Try to set it via FMOD - e = FMOD_Channel_SetPosition(music_channel, (UINT32)track, FMOD_TIMEUNIT_MODORDER); - if (e == FMOD_OK) // We good - { - current_track = track; - return true; - } - else if (e == FMOD_ERR_UNSUPPORTED // Only music modules, numbnuts! - || e == FMOD_ERR_INVALID_POSITION) // Out-of-bounds! - return false; - else // Congrats, you horribly broke it somehow - { - FMR_MUSIC(e); - return false; - } - } - return false; -} - -/// ------------------------ -/// MUSIC FADING -/// ------------------------ - -void I_SetInternalMusicVolume(UINT8 volume) -{ - (void)volume; -} - -void I_StopFadingSong(void) -{ -} - -boolean I_FadeSongFromVolume(UINT8 target_volume, UINT8 source_volume, UINT32 ms, void (*callback)(void)) -{ - (void)target_volume; - (void)source_volume; - (void)ms; - (void)callback; - return false; -} - -boolean I_FadeSong(UINT8 target_volume, UINT32 ms, void (*callback)(void)) -{ - (void)target_volume; - (void)ms; - (void)callback; - return false; -} - -boolean I_FadeOutStopSong(UINT32 ms) -{ - (void)ms; - return false; -} - -boolean I_FadeInPlaySong(UINT32 ms, boolean looping) -{ - (void)ms; - (void)looping; - return false; -} diff --git a/src/win32/win_sys.c b/src/win32/win_sys.c deleted file mode 100644 index da0d5b47e..000000000 --- a/src/win32/win_sys.c +++ /dev/null @@ -1,3707 +0,0 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- -// -// Copyright (C) 1998-2000 by DooM Legacy Team. -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -//----------------------------------------------------------------------------- -/// \file -/// \brief win32 system i/o -/// -/// Startup & Shutdown routines for music,sound,timer,keyboard,... -/// Signal handler to trap errors and exit cleanly. - -#include "../doomdef.h" - -#ifdef _WINDOWS - -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include "../m_misc.h" -#include "../i_video.h" -#include "../i_sound.h" -#include "../i_system.h" - -#include "../d_net.h" -#include "../g_game.h" - -#include "../d_main.h" - -#include "../m_argv.h" - -#include "../w_wad.h" -#include "../z_zone.h" -#include "../g_input.h" - -#include "../keys.h" - -#include "../screen.h" - -#include "../m_menu.h" - -// Wheel support for Win95/WinNT3.51 -#include - -// Taken from Win98/NT4.0 -#ifndef SM_MOUSEWHEELPRESENT -#define SM_MOUSEWHEELPRESENT 75 -#endif - -#ifndef MSH_MOUSEWHEEL -#ifdef UNICODE -#define MSH_MOUSEWHEEL L"MSWHEEL_ROLLMSG" -#else -#define MSH_MOUSEWHEEL "MSWHEEL_ROLLMSG" -#endif -#endif - -#include "win_main.h" -#include "win_dbg.h" -#include "../i_joy.h" - -#ifndef NOMUMBLE -// Mumble context string -#include "../d_clisrv.h" -#include "../byteptr.h" -#endif - -#define DIRECTINPUT_VERSION 0x0500 -// Force dinput.h to generate old DX3 headers. -#define DXVERSION_NTCOMPATIBLE 0x0300 -#include -#ifndef IDirectInputEffect_Stop -#define IDirectInputEffect_Stop(p) (p)->lpVtbl->Stop(p) -#endif -#ifndef IDirectInputEffect_SetParameters -#define IDirectInputEffect_SetParameters(p,a,b) (p)->lpVtbl->SetParameters(p,a,b) -#endif -#ifndef IDirectInputEffect_Release -#define IDirectInputEffect_Release(p) (p)->lpVtbl->Release(p) -#endif - -#include "fabdxlib.h" - -/// \brief max number of joystick buttons -#define JOYBUTTONS_MAX 32 // rgbButtons[32] -/// \brief max number of joystick button events -#define JOYBUTTONS_MIN min((JOYBUTTONS),(JOYBUTTONS_MAX)) - -/// \brief max number of joysick axies -#define JOYAXISSET_MAX 4 // (lX, lY), (lZ,lRx), (lRy, lRz), rglSlider[2] is very diff -/// \brief max number ofjoystick axis events -#define JOYAXISSET_MIN min((JOYAXISSET),(JOYAXISSET_MAX)) - -/// \brief max number of joystick hats -#define JOYHATS_MAX 4 // rgdwPOV[4]; -/// \brief max number of joystick hat events -#define JOYHATS_MIN min((JOYHATS),(JOYHATS_MAX)) - -/// \brief max number of mouse buttons -#define MOUSEBUTTONS_MAX 8 // 8 bit of BYTE and DIMOFS_BUTTON7 -/// \brief max number of muse button events -#define MOUSEBUTTONS_MIN min((MOUSEBUTTONS),(MOUSEBUTTONS_MAX)) - -// ================== -// DIRECT INPUT STUFF -// ================== -BOOL bDX0300; // if true, we created a DirectInput 0x0300 version -static LPDIRECTINPUTA lpDI = NULL; -static LPDIRECTINPUTDEVICEA lpDIK = NULL; // Keyboard -static LPDIRECTINPUTDEVICEA lpDIM = NULL; // mice -static LPDIRECTINPUTDEVICEA lpDIJ = NULL; // joystick 1P -static LPDIRECTINPUTEFFECT lpDIE[NumberofForces]; // joystick 1Es -static LPDIRECTINPUTDEVICE2A lpDIJA = NULL; // joystick 1I -static LPDIRECTINPUTDEVICEA lpDIJ2 = NULL; // joystick 2P -static LPDIRECTINPUTEFFECT lpDIE2[NumberofForces]; // joystick 1Es -static LPDIRECTINPUTDEVICE2A lpDIJ2A = NULL;// joystick 2I - -// Do not execute cleanup code more than once. See Shutdown_xxx() routines. -UINT8 graphics_started = 0; -UINT8 keyboard_started = 0; -UINT8 sound_started = 0; -static boolean mouse_enabled = false; -static boolean joystick_detected = false; -static boolean joystick2_detected = false; - -static VOID I_ShutdownKeyboard(VOID); -static VOID I_GetKeyboardEvents(VOID); -static VOID I_ShutdownJoystick(VOID); -static VOID I_ShutdownJoystick2(VOID); - -static boolean entering_con_command = false; - -// -// Why would this be system specific?? hmmmm.... -// -// it is for virtual reality system, next incoming feature :) -static ticcmd_t emptycmd; -ticcmd_t *I_BaseTiccmd(void) -{ - return &emptycmd; -} - -static ticcmd_t emptycmd2; -ticcmd_t *I_BaseTiccmd2(void) -{ - return &emptycmd2; -} - -// Allocates the base zone memory, -// this function returns a valid pointer and size, -// else it should interrupt the program immediately. -// -// now checks if mem could be allocated, this is still -// prehistoric... there's a lot to do here: memory locking, detection -// of win95 etc... -// - -// return free and total memory in the system -UINT32 I_GetFreeMem(UINT32* total) -{ - MEMORYSTATUS info; - - info.dwLength = sizeof (MEMORYSTATUS); - GlobalMemoryStatus(&info); - if (total) - *total = (UINT32)info.dwTotalPhys; - return (UINT32)info.dwAvailPhys; -} - -// --------- -// I_Profile -// Two little functions to profile our code using the high resolution timer -// --------- -static LARGE_INTEGER ProfileCount; -VOID I_BeginProfile(VOID) -{ - if (!QueryPerformanceCounter(&ProfileCount)) - I_Error("I_BeginProfile failed"); // can't profile without the high res timer -} - -// we're supposed to use this to measure very small amounts of time, -// that's why we return a DWORD and not a 64bit value -DWORD I_EndProfile(VOID) -{ - LARGE_INTEGER CurrTime; - DWORD ret; - if (!QueryPerformanceCounter (&CurrTime)) - I_Error("I_EndProfile failed"); - if (CurrTime.QuadPart - ProfileCount.QuadPart > (LONGLONG)0xFFFFFFFFUL) - I_Error("I_EndProfile overflow"); - ret = (DWORD)(CurrTime.QuadPart - ProfileCount.QuadPart); - // we can call I_EndProfile() several time, I_BeginProfile() need be called just once - ProfileCount = CurrTime; - - return ret; -} - -// --------- -// I_GetTime -// Use the High Resolution Timer if available, -// else use the multimedia timer which has 1 millisecond precision on Windowz 95, -// but lower precision on Windows NT -// --------- -static long hacktics = 0; // used locally for keyboard repeat keys -static DWORD starttickcount = 0; // hack for win2k time bug - -tic_t I_GetTime(void) -{ - tic_t newtics = 0; - - if (!starttickcount) // high precision timer - { - LARGE_INTEGER currtime; // use only LowPart if high resolution counter is not available - static LARGE_INTEGER basetime = {{0, 0}}; - - // use this if High Resolution timer is found - static LARGE_INTEGER frequency; - - if (!basetime.LowPart) - { - if (!QueryPerformanceFrequency(&frequency)) - frequency.QuadPart = 0; - else - QueryPerformanceCounter(&basetime); - } - - if (frequency.LowPart && QueryPerformanceCounter(&currtime)) - { - newtics = (int)((currtime.QuadPart - basetime.QuadPart) * NEWTICRATE - / frequency.QuadPart); - } - else - { - currtime.LowPart = timeGetTime(); - if (!basetime.LowPart) - basetime.LowPart = currtime.LowPart; - newtics = ((currtime.LowPart - basetime.LowPart)/(1000/NEWTICRATE)); - } - } - else - newtics = (GetTickCount() - starttickcount)/(1000/NEWTICRATE); - - hacktics = newtics; // a local counter for keyboard repeat key - return newtics; -} - -void I_Sleep(void) -{ - if (cv_sleep.value != -1) - Sleep(cv_sleep.value); -} - -// should move to i_video -void I_WaitVBL(INT32 count) -{ - UNREFERENCED_PARAMETER(count); -} - -// this is probably to activate the 'loading' disc icon -// it should set a flag, that I_FinishUpdate uses to know -// whether it draws a small 'loading' disc icon on the screen or not -// -// also it should explicitly draw the disc because the screen is -// possibly not refreshed while loading -// -void I_BeginRead(void) {} - -// see above, end the 'loading' disc icon, set the flag false -// -void I_EndRead(void) {} - -// =========================================================================================== -// EVENTS -// =========================================================================================== -static BOOL I_ReadyConsole(HANDLE ci) -{ - DWORD gotinput; - if (ci == INVALID_HANDLE_VALUE) return FALSE; - if (WaitForSingleObject(ci,0) != WAIT_OBJECT_0) return FALSE; - if (GetFileType(ci) != FILE_TYPE_CHAR) return FALSE; - if (!GetConsoleMode(ci, &gotinput)) return FALSE; - return (GetNumberOfConsoleInputEvents(ci, &gotinput) && gotinput); -} - -static inline VOID I_GetConsoleEvents(VOID) -{ - event_t ev = {0,0,0,0}; - HANDLE ci = GetStdHandle(STD_INPUT_HANDLE); - HANDLE co = GetStdHandle(STD_OUTPUT_HANDLE); - CONSOLE_SCREEN_BUFFER_INFO CSBI; - INPUT_RECORD input; - DWORD t; - - while (I_ReadyConsole(ci) && ReadConsoleInput(ci, &input, 1, &t) && t) - { - ZeroMemory(&ev, sizeof(ev)); - switch (input.EventType) - { - case KEY_EVENT: - if (input.Event.KeyEvent.bKeyDown) - { - ev.type = ev_console; - entering_con_command = true; - switch (input.Event.KeyEvent.wVirtualKeyCode) - { - case VK_ESCAPE: - case VK_TAB: - ev.data1 = KEY_NULL; - break; - case VK_SHIFT: - ev.data1 = KEY_LSHIFT; - break; - case VK_RETURN: - entering_con_command = false; - /* FALLTHRU */ - default: - ev.data1 = MapVirtualKey(input.Event.KeyEvent.wVirtualKeyCode,2); // convert in to char - } - if (co != INVALID_HANDLE_VALUE && GetFileType(co) == FILE_TYPE_CHAR && GetConsoleMode(co, &t)) - { - if (ev.data1 && ev.data1 != KEY_LSHIFT && ev.data1 != KEY_RSHIFT) - { -#ifdef UNICODE - WriteConsole(co, &input.Event.KeyEvent.uChar.UnicodeChar, 1, &t, NULL); -#else - WriteConsole(co, &input.Event.KeyEvent.uChar.AsciiChar, 1, &t, NULL); -#endif - } - if (input.Event.KeyEvent.wVirtualKeyCode == VK_BACK - && GetConsoleScreenBufferInfo(co,&CSBI)) - { - WriteConsoleOutputCharacterA(co, " ",1, CSBI.dwCursorPosition, &t); - } - } - } - else - { - ev.type = ev_keyup; - switch (input.Event.KeyEvent.wVirtualKeyCode) - { - case VK_SHIFT: - ev.data1 = KEY_LSHIFT; - break; - default: - break; - } - } - if (ev.data1) D_PostEvent(&ev); - break; - case MOUSE_EVENT: - case WINDOW_BUFFER_SIZE_EVENT: - case MENU_EVENT: - case FOCUS_EVENT: - break; - } - } -} - -// ---------- -// I_GetEvent -// Post new events for all sorts of user-input -// ---------- -void I_GetEvent(void) -{ - I_GetConsoleEvents(); - I_GetKeyboardEvents(); - I_GetMouseEvents(); - I_GetJoystickEvents(); - I_GetJoystick2Events(); -} - -// ---------- -// I_OsPolling -// ---------- -void I_OsPolling(void) -{ - MSG msg; - HANDLE ci = GetStdHandle(STD_INPUT_HANDLE); - - // we need to dispatch messages to the window - // so the window procedure can respond to messages and PostEvent() for keys - // during D_SRB2Main startup. - // this one replaces the main loop of windows since I_OsPolling is called in the main loop - do - { - while (PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE)) - { - if (GetMessage(&msg, NULL, 0, 0)) - { - TranslateMessage(&msg); - DispatchMessage(&msg); - } - else // winspec : this is quit message - I_Quit(); - } - if (!appActive && !netgame && !I_ReadyConsole(ci)) - WaitMessage(); - } while (!appActive && !netgame && !I_ReadyConsole(ci)); - - // this is called by the network synchronization, - // check keys and allow escaping - I_GetEvent(); - - // reset "emulated keys" - gamekeydown[KEY_MOUSEWHEELUP] = 0; - gamekeydown[KEY_MOUSEWHEELDOWN] = 0; -} - -// =========================================================================================== -// TIMER -// =========================================================================================== - -static VOID I_ShutdownTimer(VOID) -{ - timeEndPeriod(1); -} - -// -// Installs the timer interrupt handler with timer speed as TICRATE. -// -#define TIMER_ID 1 -#define TIMER_RATE (1000/TICRATE) -void I_StartupTimer(void) -{ - // for win2k time bug - if (M_CheckParm("-gettickcount")) - { - starttickcount = GetTickCount(); - CONS_Printf("Using GetTickCount()\n"); - } - timeBeginPeriod(1); - I_AddExitFunc(I_ShutdownTimer); -} - -// =========================================================================================== -// EXIT CODE, ERROR HANDLING -// =========================================================================================== - -static int errorcount = 0; // phuck recursive errors -static int shutdowning = false; - -// -// Used to trap various signals, to make sure things get shut down cleanly. -// -#ifdef NDEBUG -static void signal_handler(int num) -{ - //static char msg[] = "oh no! back to reality!\r\n"; - const char *sigmsg; - char sigdef[64]; - - D_QuitNetGame(); // Fix server freezes - CL_AbortDownloadResume(); - I_ShutdownSystem(); - - switch (num) - { - case SIGINT: - sigmsg = "interrupt"; - break; - case SIGILL: - sigmsg = "illegal instruction - invalid function image"; - break; - case SIGFPE: - sigmsg = "floating point exception"; - break; - case SIGSEGV: - sigmsg = "segment violation"; - break; - case SIGTERM: - sigmsg = "software termination signal from kill"; - break; - case SIGBREAK: - sigmsg = "Ctrl-Break sequence"; - break; - case SIGABRT: - sigmsg = "abnormal termination triggered by abort call"; - break; - default: - sprintf(sigdef, "signal number %d", num); - sigmsg = sigdef; - } - -#ifdef LOGMESSAGES - if (logstream) - { - I_OutputMsg("signal_handler() error: %s\r\n", sigmsg); - fclose(logstream); - logstream = NULL; - } -#endif - - MessageBoxA(hWndMain, va("signal_handler(): %s", sigmsg), "SRB2 error", MB_OK|MB_ICONERROR); - - signal(num, SIG_DFL); // default signal action - raise(num); -} -#endif - -// -// put an error message (with format) on stderr -// -void I_OutputMsg(const char *fmt, ...) -{ - HANDLE co = GetStdHandle(STD_OUTPUT_HANDLE); - DWORD bytesWritten; - va_list argptr; - char txt[8192]; - - va_start(argptr,fmt); - vsprintf(txt, fmt, argptr); - va_end(argptr); - -#ifdef _MSC_VER - OutputDebugStringA(txt); -#endif - -#ifdef LOGMESSAGES - if (logstream) - { - fwrite(txt, strlen(txt), 1, logstream); - fflush(logstream); - } -#endif - - if (co == INVALID_HANDLE_VALUE) - return; - - if (GetFileType(co) == FILE_TYPE_CHAR && GetConsoleMode(co, &bytesWritten)) - { - static COORD coordNextWrite = {0,0}; - LPVOID oldLines = NULL; - INT oldLength; - CONSOLE_SCREEN_BUFFER_INFO csbi; - - // Save the lines that we're going to obliterate. - GetConsoleScreenBufferInfo(co, &csbi); - oldLength = csbi.dwSize.X * (csbi.dwCursorPosition.Y - coordNextWrite.Y) + csbi.dwCursorPosition.X - coordNextWrite.X; - - if (oldLength > 0) - { - LPVOID blank = malloc(oldLength); - if (!blank) return; - memset(blank, ' ', oldLength); // Blank out. - oldLines = malloc(oldLength*sizeof(TCHAR)); - if (!oldLines) - { - free(blank); - return; - } - - ReadConsoleOutputCharacter(co, oldLines, oldLength, coordNextWrite, &bytesWritten); - - // Move to where we what to print - which is where we would've been, - // had console input not been in the way, - SetConsoleCursorPosition(co, coordNextWrite); - - WriteConsoleA(co, blank, oldLength, &bytesWritten, NULL); - free(blank); - - // And back to where we want to print again. - SetConsoleCursorPosition(co, coordNextWrite); - } - - // Actually write the string now! - WriteConsoleA(co, txt, (DWORD)strlen(txt), &bytesWritten, NULL); - - // Next time, output where we left off. - GetConsoleScreenBufferInfo(co, &csbi); - coordNextWrite = csbi.dwCursorPosition; - - // Restore what was overwritten. - if (oldLines && entering_con_command) - WriteConsole(co, oldLines, oldLength, &bytesWritten, NULL); - if (oldLines) free(oldLines); - } - else // Redirected to a file. - WriteFile(co, txt, (DWORD)strlen(txt), &bytesWritten, NULL); -} - -// display error messy after shutdowngfx -// -void I_Error(const char *error, ...) -{ - va_list argptr; - char txt[8192]; - - // added 11-2-98 recursive error detecting - if (shutdowning) - { - errorcount++; - // try to shutdown each subsystem separately - if (errorcount == 5) - I_ShutdownGraphics(); - if (errorcount == 6) - I_ShutdownSystem(); - if (errorcount == 7) - { - M_SaveConfig(NULL); - G_SaveGameData(); - } - if (errorcount > 20) - { - // Don't print garbage - va_start(argptr,error); - vsprintf(txt, error, argptr); - va_end(argptr); - - OutputDebugStringA(txt); - MessageBoxA(hWndMain, txt, "SRB2 Recursive Error", MB_OK|MB_ICONERROR); - W_Shutdown(); - exit(-1); // recursive errors detected - } - } - shutdowning = true; - - // put message to stderr - va_start(argptr, error); - wvsprintfA(txt, error, argptr); - va_end(argptr); - - CONS_Printf("I_Error(): %s\n", txt); //don't change from CONS_Printf. - - // saving one time is enough! - if (!errorcount) - { - M_SaveConfig(NULL); // save game config, cvars.. - G_SaveGameData(); - } - - // save demo, could be useful for debug - // NOTE: demos are normally not saved here. - if (demorecording) - G_CheckDemoStatus(); - if (metalrecording) - G_StopMetalRecording(false); - - D_QuitNetGame(); - CL_AbortDownloadResume(); - M_FreePlayerSetupColors(); - - // shutdown everything that was started - I_ShutdownSystem(); - -#ifdef LOGMESSAGES - if (logstream) - { - fclose(logstream); - logstream = NULL; - } -#endif - - MessageBoxA(hWndMain, txt, "SRB2 Error", MB_OK|MB_ICONERROR); - - W_Shutdown(); - exit(-1); -} - -static inline VOID ShowEndTxt(HANDLE co) -{ - int i; - UINT16 j, att = 0; - int nlflag = 1; - CONSOLE_SCREEN_BUFFER_INFO backupcon; - COORD resizewin = {80,-1}; - DWORD bytesWritten; - CHAR let = 0; - UINT16 *ptext; - LPVOID data; - lumpnum_t endoomnum = W_GetNumForName("ENDOOM"); - //HANDLE ci = GetStdHandle(STD_INPUT_HANDLE); - - /* get the lump with the text */ - data = ptext = W_CacheLumpNum(endoomnum, PU_CACHE); - - backupcon.wAttributes = FOREGROUND_RED|FOREGROUND_GREEN|FOREGROUND_BLUE; // Just in case - GetConsoleScreenBufferInfo(co, &backupcon); //Store old state - resizewin.Y = backupcon.dwSize.Y; - if (backupcon.dwSize.X < resizewin.X) - SetConsoleScreenBufferSize(co, resizewin); - - for (i = 1; i <= 80*25; i++) // print 80x25 text and deal with the attributes too - { - j = (UINT16)(*ptext >> 8); // attribute first - let = (char)(*ptext & 0xff); // text senond - if (j != att) // attribute changed? - { - att = j; // save current attribute - SetConsoleTextAttribute(co, j); //set fg and bg color for buffer - } - - WriteConsoleA(co, &let, 1, &bytesWritten, NULL); // now the text - - if (nlflag && !(i % 80) && backupcon.dwSize.X > resizewin.X) // do we need a nl? - { - att = backupcon.wAttributes; - SetConsoleTextAttribute(co, att); // all attributes off - WriteConsoleA(co, "\n", 1, &bytesWritten, NULL); // newline to console - } - ptext++; - } - SetConsoleTextAttribute(co, backupcon.wAttributes); // all attributes off - //if (nlflag) - // WriteConsoleA(co, "\n", 1, &bytesWritten, NULL); - - getchar(); //pause! - - Z_Free(data); -} - - -// -// I_Quit: shutdown everything cleanly, in reverse order of Startup. -// -void I_Quit(void) -{ - HANDLE co = GetStdHandle(STD_OUTPUT_HANDLE); - DWORD mode; - // when recording a demo, should exit using 'q', - // but sometimes we forget and use Alt+F4, so save here too. - if (demorecording) - G_CheckDemoStatus(); - if (metalrecording) - G_StopMetalRecording(false); - - M_SaveConfig(NULL); // save game config, cvars.. -#ifndef NONET - D_SaveBan(); // save the ban list -#endif - G_SaveGameData(); - - // maybe it needs that the ticcount continues, - // or something else that will be finished by I_ShutdownSystem(), - // so do it before. - D_QuitNetGame(); - CL_AbortDownloadResume(); - - M_FreePlayerSetupColors(); - - // shutdown everything that was started - I_ShutdownSystem(); - - if (shutdowning || errorcount) - I_Error("Error detected (%d)", errorcount); - -#ifdef LOGMESSAGES - if (logstream) - { - I_OutputMsg("I_Quit(): end of logstream.\n"); - fclose(logstream); - logstream = NULL; - } -#endif - if (!M_CheckParm("-noendtxt") && W_CheckNumForName("ENDOOM")!=LUMPERROR - && co != INVALID_HANDLE_VALUE && GetFileType(co) == FILE_TYPE_CHAR - && GetConsoleMode(co, &mode)) - { - printf("\r"); - ShowEndTxt(co); - } - fflush(stderr); - if (myargmalloc) - free(myargv); // Deallocate allocated memory - W_Shutdown(); - exit(0); -} - -// -------------------------------------------------------------------------- -// I_ShowLastError -// Print a GetLastError() error message, and if MB is TRUE, also display it in a MessageBox -// -------------------------------------------------------------------------- -VOID I_ShowLastError(BOOL MB) -{ - LPSTR lpMsgBuf = NULL; - const DWORD LE = GetLastError(); - - if (LE == 0xdeadbeef) return; // Not a real error - - FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, LE, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language - (LPVOID)&lpMsgBuf, 0, NULL); - - if (!lpMsgBuf) - { - I_OutputMsg("GetLastError: Unknown\n"); - return; - } - - // Display the string - if (MB && LE) MessageBoxA(NULL, lpMsgBuf, "GetLastError", MB_OK|MB_ICONINFORMATION); - - // put it in text console and log if any - I_OutputMsg("GetLastError: %s", lpMsgBuf); - - // Free the buffer. - LocalFree(lpMsgBuf); -} - -// =========================================================================================== -// CLEAN STARTUP & SHUTDOWN HANDLING, JUST CLOSE EVERYTHING YOU OPENED. -// =========================================================================================== -// -// -static quitfuncptr quit_funcs[MAX_QUIT_FUNCS] = -{ - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL -}; - -// Adds a function to the list that need to be called by I_SystemShutdown(). -// -void I_AddExitFunc(void (*func)()) -{ - int c; - - for (c = 0; c < MAX_QUIT_FUNCS; c++) - { - if (!quit_funcs[c]) - { - quit_funcs[c] = func; - break; - } - } -} - -// Removes a function from the list that need to be called by I_SystemShutdown(). -// -void I_RemoveExitFunc(void (*func)()) -{ - int c; - - for (c = 0; c < MAX_QUIT_FUNCS; c++) - { - if (quit_funcs[c] == func) - { - while (c < MAX_QUIT_FUNCS - 1) - { - quit_funcs[c] = quit_funcs[c+1]; - c++; - } - quit_funcs[MAX_QUIT_FUNCS-1] = NULL; - break; - } - } -} - -// =========================================================================================== -// DIRECT INPUT HELPER CODE -// =========================================================================================== - -// Create a DirectInputDevice interface, -// create a DirectInputDevice2 interface if possible -static VOID CreateDevice2A(LPDIRECTINPUTA di, REFGUID pguid, LPDIRECTINPUTDEVICEA* lpDEV, - LPDIRECTINPUTDEVICE2A* lpDEV2) -{ - HRESULT hr, hr2; - LPDIRECTINPUTDEVICEA lpdid1; - LPDIRECTINPUTDEVICE2A lpdid2 = NULL; - - hr = IDirectInput_CreateDevice(di, pguid, &lpdid1, NULL); - - if (SUCCEEDED(hr)) - { - // get Device2 but only if we are not in DirectInput version 3 - if (!bDX0300 && lpDEV2) - { - LPDIRECTINPUTDEVICE2A *rp = &lpdid2; - LPVOID *tp = (LPVOID *)rp; - hr2 = IDirectInputDevice_QueryInterface(lpdid1, &IID_IDirectInputDevice2, tp); - if (FAILED(hr2)) - { - CONS_Alert(CONS_ERROR, M_GetText("Could not create IDirectInput device 2")); - lpdid2 = NULL; - } - } - } - else - I_Error("Could not create IDirectInput device"); - - *lpDEV = lpdid1; - if (lpDEV2) // only if we requested it - *lpDEV2 = lpdid2; -} - -// =========================================================================================== -// DIRECT INPUT MOUSE -// =========================================================================================== - -#define DI_MOUSE_BUFFERSIZE 16 // number of data elements in mouse buffer - -// -// Initialise the mouse. -// -static void I_ShutdownMouse(VOID); - -void I_StartupMouse(VOID) -{ - // this gets called when cv_usemouse is initted - // for the win32 version, we want to startup the mouse later - if (menuactive) - { - if (cv_usemouse.value) - I_DoStartupMouse(); - else - I_ShutdownMouse(); - } -} - -static HANDLE mouse2filehandle = INVALID_HANDLE_VALUE; - -static void I_ShutdownMouse2(VOID) -{ - if (mouse2filehandle != INVALID_HANDLE_VALUE) - { - event_t event; - UINT i; - - SetCommMask(mouse2filehandle, 0); - - EscapeCommFunction(mouse2filehandle, CLRDTR); - EscapeCommFunction(mouse2filehandle, CLRRTS); - - PurgeComm(mouse2filehandle, PURGE_TXABORT|PURGE_RXABORT|PURGE_TXCLEAR|PURGE_RXCLEAR); - - CloseHandle(mouse2filehandle); - - // emulate the up of all mouse buttons - for (i = 0; i < MOUSEBUTTONS; i++) - { - event.type = ev_keyup; - event.data1 = KEY_2MOUSE1 + i; - D_PostEvent(&event); - } - - mouse2filehandle = INVALID_HANDLE_VALUE; - } -} - -#define MOUSECOMBUFFERSIZE 256 -static int handlermouse2x, handlermouse2y, handlermouse2buttons; - -static VOID I_PoolMouse2(VOID) -{ - BYTE buffer[MOUSECOMBUFFERSIZE]; - COMSTAT ComStat; - DWORD dwErrorFlags, dwLength, i; - CHAR dx, dy; - static BYTE bytenum, combytes[4]; - - ClearCommError(mouse2filehandle, &dwErrorFlags, &ComStat); - dwLength = min(MOUSECOMBUFFERSIZE, ComStat.cbInQue); - - if (dwLength > 0) - { - if (!ReadFile(mouse2filehandle, buffer, dwLength, &dwLength, NULL)) - { - CONS_Alert(CONS_ERROR, M_GetText("Read Error on secondary mouse port\n")); - return; - } - - // parse the mouse packets - for (i = 0; i < dwLength; i++) - { - if ((buffer[i] & 64) == 64) - bytenum = 0; - - if (bytenum < 4) - combytes[bytenum] = buffer[i]; - bytenum++; - - if (bytenum == 1) - { - handlermouse2buttons &= ~3; - handlermouse2buttons |= ((combytes[0] & (32+16)) >>4); - } - else if (bytenum == 3) - { - dx = (CHAR)((combytes[0] & 3) << 6); - dy = (CHAR)((combytes[0] & 12) << 4); - dx = (CHAR)(dx + combytes[1]); - dy = (CHAR)(dy + combytes[2]); - handlermouse2x += dx; - handlermouse2y += dy; - } - else if (bytenum == 4) // fourth byte (logitech mouses) - { - if (buffer[i] & 32) - handlermouse2buttons |= 4; - else - handlermouse2buttons &= ~4; - } - } - } -} - -// secondary mouse doesn't use DirectX, therefore forget all about grabbing, acquire, etc. -void I_StartupMouse2(void) -{ - DCB dcb; - - if (mouse2filehandle != INVALID_HANDLE_VALUE) - I_ShutdownMouse2(); - - if (!cv_usemouse2.value) - return; - - if (mouse2filehandle != INVALID_HANDLE_VALUE) - { - // COM file handle - mouse2filehandle = CreateFileA(cv_mouse2port.string, GENERIC_READ|GENERIC_WRITE, - 0, // exclusive access - NULL, // no security attrs - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (mouse2filehandle == INVALID_HANDLE_VALUE) - { - int e = GetLastError(); - if (e == 5) - CONS_Alert(CONS_ERROR, M_GetText("Error opening %s!\n"), cv_mouse2port.string); - else - CONS_Alert(CONS_ERROR, M_GetText("Can't open %s: error %d\n"), cv_mouse2port.string, e); - return; - } - } - - // buffers - SetupComm(mouse2filehandle, MOUSECOMBUFFERSIZE, MOUSECOMBUFFERSIZE); - - // purge buffers - PurgeComm(mouse2filehandle, PURGE_TXABORT|PURGE_RXABORT|PURGE_TXCLEAR|PURGE_RXCLEAR); - - // setup port to 1200 7N1 - dcb.DCBlength = sizeof (DCB); - - GetCommState(mouse2filehandle, &dcb); - - dcb.BaudRate = CBR_1200; - dcb.ByteSize = 7; - dcb.Parity = NOPARITY; - dcb.StopBits = ONESTOPBIT; - - dcb.fDtrControl = DTR_CONTROL_ENABLE; - dcb.fRtsControl = RTS_CONTROL_ENABLE; - - dcb.fBinary = dcb.fParity = TRUE; - - SetCommState(mouse2filehandle, &dcb); - - I_AddExitFunc(I_ShutdownMouse2); -} - -#define MAX_MOUSE_BTNS 5 -static int center_x, center_y; -static INT old_mparms[3], new_mparms[3] = {0, 0, 1}; -static BOOL restore_mouse = FALSE; -static INT old_mouse_state = 0; -UINT MSHWheelMessage = 0; - -static VOID I_DoStartupSysMouse(VOID) -{ - boolean valid; - RECT w_rect; - - valid = SystemParametersInfo(SPI_GETMOUSE, 0, old_mparms, 0); - if (valid) - { - new_mparms[2] = old_mparms[2]; - restore_mouse = SystemParametersInfo(SPI_SETMOUSE, 0, new_mparms, 0); - } - - if (bAppFullScreen) - { - w_rect.top = 0; - w_rect.left = 0; - } - else - { - w_rect.top = windowPosY; - w_rect.left = windowPosX; - } - - w_rect.bottom = w_rect.top + VIDHEIGHT; - w_rect.right = w_rect.left + VIDWIDTH; - center_x = w_rect.left + (VIDWIDTH >> 1); - center_y = w_rect.top + (VIDHEIGHT >> 1); - SetCursor(NULL); - SetCursorPos(center_x, center_y); - SetCapture(hWndMain); - ClipCursor(&w_rect); -} - -static VOID I_ShutdownSysMouse(VOID) -{ - if (restore_mouse) - SystemParametersInfo(SPI_SETMOUSE, 0, old_mparms, 0); - ClipCursor(NULL); - ReleaseCapture(); -} - -VOID I_RestartSysMouse(VOID) -{ - if (nodinput) - { - I_ShutdownSysMouse(); - I_DoStartupSysMouse(); - } -} - -VOID I_GetSysMouseEvents(INT mouse_state) -{ - UINT i; - event_t event; - int xmickeys = 0, ymickeys = 0; - POINT c_pos; - - for (i = 0; i < MAX_MOUSE_BTNS; i++) - { - // check if button pressed - if ((mouse_state & (1 << i)) && !(old_mouse_state & (1 << i))) - { - event.type = ev_keydown; - event.data1 = KEY_MOUSE1 + i; - D_PostEvent(&event); - } - // check if button released - if (!(mouse_state & (1 << i)) && (old_mouse_state & (1 << i))) - { - event.type = ev_keyup; - event.data1 = KEY_MOUSE1 + i; - D_PostEvent(&event); - } - } - old_mouse_state = mouse_state; - - // proceed mouse movements - GetCursorPos(&c_pos); - xmickeys = c_pos.x - center_x; - ymickeys = c_pos.y - center_y; - - if (xmickeys || ymickeys) - { - event.type = ev_mouse; - event.data1 = 0; - event.data2 = xmickeys; - event.data3 = -ymickeys; - D_PostEvent(&event); - SetCursorPos(center_x, center_y); - } -} - -// This is called just before entering the main game loop, -// when we are going fullscreen and the loading screen has finished. -VOID I_DoStartupMouse(VOID) -{ - DIPROPDWORD dip; - - // mouse detection may be skipped by setting usemouse false - if (!cv_usemouse.value || M_CheckParm("-nomouse")) - { - mouse_enabled = false; - return; - } - - if (nodinput) - { - CONS_Printf(M_GetText("\tMouse will not use DirectInput.\n")); - // System mouse input will be initiated by VID_SetMode - I_AddExitFunc(I_ShutdownMouse); - - MSHWheelMessage = RegisterWindowMessage(MSH_MOUSEWHEEL); - } - else if (!lpDIM) // acquire the mouse only once - { - CreateDevice2A(lpDI, &GUID_SysMouse, &lpDIM, NULL); - - if (lpDIM) - { - if (FAILED(IDirectInputDevice_SetDataFormat(lpDIM, &c_dfDIMouse))) - I_Error("Couldn't set mouse data format"); - - // create buffer for buffered data - dip.diph.dwSize = sizeof (dip); - dip.diph.dwHeaderSize = sizeof (dip.diph); - dip.diph.dwObj = 0; - dip.diph.dwHow = DIPH_DEVICE; - dip.dwData = DI_MOUSE_BUFFERSIZE; - if (FAILED(IDirectInputDevice_SetProperty(lpDIM, DIPROP_BUFFERSIZE, &dip.diph))) - I_Error("Couldn't set mouse buffer size"); - - if (FAILED(IDirectInputDevice_SetCooperativeLevel(lpDIM, hWndMain, - DISCL_EXCLUSIVE|DISCL_FOREGROUND))) - { - I_Error("Couldn't set mouse coop level"); - } - I_AddExitFunc(I_ShutdownMouse); - } - else - I_Error("Couldn't create mouse input"); - } - - // if re-enabled while running, just set mouse_enabled true again, - // do not acquire the mouse more than once - mouse_enabled = true; -} - -// -// Shutdown Mouse DirectInput device -// -static void I_ShutdownMouse(void) -{ - int i; - event_t event; - - CONS_Printf("I_ShutdownMouse()\n"); - - if (lpDIM) - { - IDirectInputDevice_Unacquire(lpDIM); - IDirectInputDevice_Release(lpDIM); - lpDIM = NULL; - } - - // emulate the up of all mouse buttons - for (i = 0; i < MOUSEBUTTONS; i++) - { - event.type = ev_keyup; - event.data1 = KEY_MOUSE1 + i; - D_PostEvent(&event); - } - if (nodinput) - I_ShutdownSysMouse(); - - mouse_enabled = false; -} - -// -// Get buffered data from the mouse -// -void I_GetMouseEvents(void) -{ - DIDEVICEOBJECTDATA rgdod[DI_MOUSE_BUFFERSIZE]; - DWORD dwItems, d; - HRESULT hr; - - event_t event; - int xmickeys, ymickeys; - - if (mouse2filehandle != INVALID_HANDLE_VALUE) - { - //mouse movement - static UINT8 lastbuttons2 = 0; - - I_PoolMouse2(); - // post key event for buttons - if (handlermouse2buttons != lastbuttons2) - { - int i, j = 1, k; - k = handlermouse2buttons ^ lastbuttons2; // only changed bit to 1 - lastbuttons2 = (UINT8)handlermouse2buttons; - - for (i = 0; i < MOUSEBUTTONS; i++, j <<= 1) - if (k & j) - { - if (handlermouse2buttons & j) - event.type = ev_keydown; - else - event.type = ev_keyup; - event.data1 = KEY_2MOUSE1 + i; - D_PostEvent(&event); - } - } - - if (handlermouse2x || handlermouse2y) - { - event.type = ev_mouse2; - event.data1 = 0; - event.data2 = handlermouse2x<<1; - event.data3 = -handlermouse2y<<1; - handlermouse2x = 0; - handlermouse2y = 0; - - D_PostEvent(&event); - } - } - - if (!mouse_enabled || nodinput) - return; - -getBufferedData: - dwItems = DI_MOUSE_BUFFERSIZE; - hr = IDirectInputDevice_GetDeviceData(lpDIM, sizeof (DIDEVICEOBJECTDATA), rgdod, &dwItems, 0); - - // If data stream was interrupted, reacquire the device and try again. - if (hr == DIERR_INPUTLOST || hr == DIERR_NOTACQUIRED) - { - hr = IDirectInputDevice_Acquire(lpDIM); - if (SUCCEEDED(hr)) - goto getBufferedData; - } - - // We got buffered input, act on it - if (SUCCEEDED(hr)) - { - xmickeys = ymickeys = 0; - - // dwItems contains number of elements read (could be 0) - for (d = 0; d < dwItems; d++) - { - if (rgdod[d].dwOfs >= DIMOFS_BUTTON0 && - rgdod[d].dwOfs < DIMOFS_BUTTON0 + MOUSEBUTTONS) - { - if (rgdod[d].dwData & 0x80) // Button down - event.type = ev_keydown; - else - event.type = ev_keyup; // Button up - - event.data1 = rgdod[d].dwOfs - DIMOFS_BUTTON0 + KEY_MOUSE1; - D_PostEvent(&event); - } - else if (rgdod[d].dwOfs == DIMOFS_X) - xmickeys += rgdod[d].dwData; - else if (rgdod[d].dwOfs == DIMOFS_Y) - ymickeys += rgdod[d].dwData; - - else if (rgdod[d].dwOfs == DIMOFS_Z) - { - // z-axes the wheel - if ((int)rgdod[d].dwData > 0) - event.data1 = KEY_MOUSEWHEELUP; - else - event.data1 = KEY_MOUSEWHEELDOWN; - event.type = ev_keydown; - D_PostEvent(&event); - } - - } - - if (xmickeys || ymickeys) - { - event.type = ev_mouse; - event.data1 = 0; - event.data2 = xmickeys; - event.data3 = -ymickeys; - D_PostEvent(&event); - } - } -} - -void I_UpdateMouseGrab(void) {} - -// =========================================================================================== -// DIRECT INPUT JOYSTICK -// =========================================================================================== - -struct DIJoyInfo_s -{ - BYTE X,Y,Z,Rx,Ry,Rz,U,V; - LONG ForceAxises; -}; -typedef struct DIJoyInfo_s DIJoyInfo_t; - -// private info - static BYTE iJoyNum; // used by enumeration - static DIJoyInfo_t JoyInfo; - static BYTE iJoy2Num; - static DIJoyInfo_t JoyInfo2; - -//----------------------------------------------------------------------------- -// Name: EnumAxesCallback() -// Desc: Callback function for enumerating the axes on a joystick and counting -// each force feedback enabled axis -//----------------------------------------------------------------------------- -static BOOL CALLBACK EnumAxesCallback(const DIDEVICEOBJECTINSTANCEA* pdidoi, - VOID* pContext) -{ - DWORD* pdwNumForceFeedbackAxis = (DWORD*) pContext; - - if ((pdidoi->dwFlags & DIDOI_FFACTUATOR) != 0) - (*pdwNumForceFeedbackAxis)++; - - return DIENUM_CONTINUE; -} - - -static HRESULT SetupForceTacile(LPDIRECTINPUTDEVICE2A DJI, LPDIRECTINPUTEFFECT *DJE, DWORD FFAXIS, FFType EffectType,REFGUID EffectGUID) -{ - HRESULT hr; - DIEFFECT eff; - DWORD rgdwAxes[2] = { DIJOFS_X, DIJOFS_Y }; - LONG rglDirection[2] = { 0, 0 }; - DICONSTANTFORCE cf = { 0 }; // LONG lMagnitude - DIRAMPFORCE rf = {0,0}; // LONG lStart, lEnd; - DIPERIODIC pf = {0,0,0,0}; - ZeroMemory(&eff, sizeof (eff)); - if (FFAXIS > 2) - FFAXIS = 2; //up to 2 FFAXIS - eff.dwSize = sizeof (DIEFFECT); - eff.dwFlags = DIEFF_CARTESIAN | DIEFF_OBJECTOFFSETS; // Cartesian and data format offsets - eff.dwDuration = INFINITE; - eff.dwSamplePeriod = 0; - eff.dwGain = DI_FFNOMINALMAX; - eff.dwTriggerButton = DIEB_NOTRIGGER; - eff.dwTriggerRepeatInterval = 0; - eff.cAxes = FFAXIS; - eff.rgdwAxes = rgdwAxes; - eff.rglDirection = rglDirection; - eff.lpEnvelope = NULL; - eff.lpvTypeSpecificParams = NULL; - if (EffectType == ConstantForce) - { - eff.cbTypeSpecificParams = sizeof (cf); - eff.lpvTypeSpecificParams = &cf; - } - else if (EffectType == RampForce) - { - eff.cbTypeSpecificParams = sizeof (rf); - eff.lpvTypeSpecificParams = &rf; - } - else if (EffectType >= SquareForce && SawtoothDownForce >= EffectType) - { - eff.cbTypeSpecificParams = sizeof (pf); - eff.lpvTypeSpecificParams = &pf; - } - - // Create the prepared effect - if (FAILED(hr = IDirectInputDevice2_CreateEffect(DJI, EffectGUID, - &eff, DJE, NULL))) - { - return hr; - } - - if (NULL == *DJE) - return E_FAIL; - - return hr; -} - -static BOOL CALLBACK DIEnumEffectsCallback1(LPCDIEFFECTINFOA pdei, LPVOID pvRef) -{ - LPDIRECTINPUTEFFECT *DJE = pvRef; - if (DIEFT_GETTYPE(pdei->dwEffType) == DIEFT_CONSTANTFORCE) - { - if (SUCCEEDED(SetupForceTacile(lpDIJA,DJE, JoyInfo.ForceAxises, ConstantForce, &pdei->guid))) - return DIENUM_STOP; - } - if (DIEFT_GETTYPE(pdei->dwEffType) == DIEFT_RAMPFORCE) - { - if (SUCCEEDED(SetupForceTacile(lpDIJA,DJE, JoyInfo.ForceAxises, RampForce, &pdei->guid))) - return DIENUM_STOP; - } - return DIENUM_CONTINUE; -} - -static BOOL CALLBACK DIEnumEffectsCallback2(LPCDIEFFECTINFOA pdei, LPVOID pvRef) -{ - LPDIRECTINPUTEFFECT *DJE = pvRef; - if (DIEFT_GETTYPE(pdei->dwEffType) == DIEFT_CONSTANTFORCE) - { - if (SUCCEEDED(SetupForceTacile(lpDIJ2A,DJE, JoyInfo2.ForceAxises, ConstantForce, &pdei->guid))) - return DIENUM_STOP; - } - if (DIEFT_GETTYPE(pdei->dwEffType) == DIEFT_RAMPFORCE) - { - if (SUCCEEDED(SetupForceTacile(lpDIJ2A,DJE, JoyInfo2.ForceAxises, RampForce, &pdei->guid))) - return DIENUM_STOP; - } - return DIENUM_CONTINUE; -} - -static REFGUID DIETable[] = -{ - &GUID_ConstantForce, //ConstantForce - &GUID_RampForce, //RampForce - &GUID_Square, //SquareForce - &GUID_Sine, //SineForce - &GUID_Triangle, //TriangleForce - &GUID_SawtoothUp, //SawtoothUpForce - &GUID_SawtoothDown, //SawtoothDownForce - (REFGUID)-1, //NumberofForces -}; - -static HRESULT SetupAllForces(LPDIRECTINPUTDEVICE2A DJI, LPDIRECTINPUTEFFECT DJE[], DWORD FFAXIS) -{ - FFType ForceType = EvilForce; - if (DJI == lpDIJA) - { - IDirectInputDevice2_EnumEffects(DJI,DIEnumEffectsCallback1,&DJE[ConstantForce],DIEFT_CONSTANTFORCE); - IDirectInputDevice2_EnumEffects(DJI,DIEnumEffectsCallback1,&DJE[RampForce],DIEFT_RAMPFORCE); - } - else if (DJI == lpDIJA) - { - IDirectInputDevice2_EnumEffects(DJI,DIEnumEffectsCallback2,&DJE[ConstantForce],DIEFT_CONSTANTFORCE); - IDirectInputDevice2_EnumEffects(DJI,DIEnumEffectsCallback2,&DJE[RampForce],DIEFT_RAMPFORCE); - } - for (ForceType = SquareForce; ForceType > NumberofForces && DIETable[ForceType] != (REFGUID)-1; ForceType++) - if (DIETable[ForceType]) - SetupForceTacile(DJI,&DJE[ForceType], FFAXIS, ForceType, DIETable[ForceType]); - return S_OK; -} - -static inline VOID LimitEffect(LPDIEFFECT eff, FFType EffectType) -{ - LPDICONSTANTFORCE pCF = eff->lpvTypeSpecificParams; - LPDIPERIODIC pDP= eff->lpvTypeSpecificParams; - if (eff->rglDirection) - { - } -/* if (eff->dwDuration != INFINITE && eff->dwDuration < 0) - { - eff->dwDuration = 0; - }*/ - if (eff->dwGain != 0) - { - if (eff->dwGain > DI_FFNOMINALMAX) - eff->dwGain = DI_FFNOMINALMAX; - //else if (eff->dwGain < -DI_FFNOMINALMAX) - // eff->dwGain = DI_FFNOMINALMAX; - } - if (EffectType == ConstantForce && pCF->lMagnitude) - { - } - else if (EffectType >= SquareForce && SawtoothDownForce >= EffectType && pDP) - { - } - -} - -static HRESULT SetForceTacile(LPDIRECTINPUTEFFECT SDIE, const JoyFF_t *FF,DWORD FFAXIS, FFType EffectType) -{ - DIEFFECT eff; - HRESULT hr; - LONG Magnitude; - LONG rglDirection[2] = { 0, 0 }; - DICONSTANTFORCE cf = { 0 }; // LONG lMagnitude - DIRAMPFORCE rf = {0,0}; // LONG lStart, lEnd; - DIPERIODIC pf = {0,0,0,0}; - if (!FF) - IDirectInputEffect_Stop(SDIE); - Magnitude = FF->Magnitude; - ZeroMemory(&eff, sizeof (eff)); - eff.dwSize = sizeof (eff); - //DIEP_START - eff.dwFlags = DIEFF_CARTESIAN | DIEFF_OBJECTOFFSETS; // Cartesian and data format offsets - //DIEP_DURATION - eff.dwDuration = FF->Duration; - //DIEP_GAIN - eff.dwGain = FF->Gain; - //DIEP_DIRECTION - eff.rglDirection = rglDirection; - //DIEP_TYPESPECIFICPARAMS - if (FFAXIS > 1) - { - double dMagnitude; - dMagnitude = (double)Magnitude; - dMagnitude = hypot(dMagnitude, dMagnitude); - Magnitude = (DWORD)dMagnitude; - rglDirection[0] = FF->ForceX; - rglDirection[1] = FF->ForceY; - } - if (EffectType == ConstantForce) - { - cf.lMagnitude = Magnitude; - eff.cbTypeSpecificParams = sizeof (cf); - eff.lpvTypeSpecificParams = &cf; - } - else if (EffectType == RampForce) - { - rf.lStart = FF->Start; - rf.lEnd = FF->End; - eff.cbTypeSpecificParams = sizeof (rf); - eff.lpvTypeSpecificParams = &rf; - } - else if (EffectType >= SquareForce && SawtoothDownForce >= EffectType) - { - pf.dwMagnitude = Magnitude; - pf.lOffset = FF->Offset; - pf.dwPhase = FF->Phase; - pf.dwPeriod = FF->Period; - eff.cbTypeSpecificParams = sizeof (pf); - eff.lpvTypeSpecificParams = &pf; - } - - LimitEffect(&eff, EffectType); - - hr = IDirectInputEffect_SetParameters(SDIE, &eff, - DIEP_START|DIEP_DURATION|DIEP_GAIN|DIEP_DIRECTION|DIEP_TYPESPECIFICPARAMS); - return hr; -} - -void I_Tactile(FFType Type, const JoyFF_t *Effect) -{ - if (!lpDIJA) return; - if (FAILED(IDirectInputDevice2_Acquire(lpDIJA))) - return; - if (Type == EvilForce) - IDirectInputDevice2_SendForceFeedbackCommand(lpDIJA,DISFFC_STOPALL); - if (Type <= EvilForce || Type > NumberofForces || !lpDIE[Type]) - return; - SetForceTacile(lpDIE[Type], Effect, JoyInfo.ForceAxises, Type); -} - -void I_Tactile2(FFType Type, const JoyFF_t *Effect) -{ - if (!lpDIJ2A) return; - if (FAILED(IDirectInputDevice2_Acquire(lpDIJ2A))) - return; - if (Type == EvilForce) - IDirectInputDevice2_SendForceFeedbackCommand(lpDIJ2A,DISFFC_STOPALL); - if (Type <= EvilForce || Type > NumberofForces || !lpDIE2[Type]) - return; - SetForceTacile(lpDIE2[Type],Effect, JoyInfo2.ForceAxises, Type); -} - -// ------------------ -// SetDIDwordProperty (HELPER) -// Set a DWORD property on a DirectInputDevice. -// ------------------ -static HRESULT SetDIDwordProperty(LPDIRECTINPUTDEVICEA pdev, - REFGUID guidProperty, - DWORD dwObject, - DWORD dwHow, - DWORD dwValue) -{ - DIPROPDWORD dipdw; - - dipdw.diph.dwSize = sizeof (dipdw); - dipdw.diph.dwHeaderSize = sizeof (dipdw.diph); - dipdw.diph.dwObj = dwObject; - dipdw.diph.dwHow = dwHow; - dipdw.dwData = dwValue; - - return IDirectInputDevice_SetProperty(pdev, guidProperty, &dipdw.diph); -} - -#define DIDEADZONE 0000 //2500 - -// --------------- -// DIEnumJoysticks -// There is no such thing as a 'system' joystick, contrary to mouse, -// we must enumerate and choose one joystick device to use -// --------------- -static BOOL CALLBACK DIEnumJoysticks (LPCDIDEVICEINSTANCEA lpddi, - LPVOID pvRef) //cv_usejoystick -{ - LPDIRECTINPUTDEVICEA pdev; - DIPROPRANGE diprg; - DIDEVCAPS caps; - BOOL bUseThisOne = FALSE; - - iJoyNum++; - - //faB: if cv holds a string description of joystick, the value from atoi() is 0 - // else, the value was probably set by user at console to one of the previously - // enumerated joysticks - if (((consvar_t *)pvRef)->value == iJoyNum || !strcmp(((consvar_t *)pvRef)->string, lpddi->tszProductName)) - bUseThisOne = TRUE; - - //I_OutputMsg(" cv joy is %s\n", ((consvar_t *)pvRef)->string); - - // print out device name - CONS_Printf("%c%d: %s\n", - (bUseThisOne) ? '\2' : ' ', // show name in white if this is the one we will use - iJoyNum, - //(GET_DIDEVICE_SUBTYPE(lpddi->dwDevType) == DIDEVTYPEJOYSTICK_GAMEPAD) ? "Gamepad " : "Joystick", - lpddi->tszProductName); //, lpddi->tszInstanceName); - - // use specified joystick (cv_usejoystick.value in pvRef) - if (!bUseThisOne) - return DIENUM_CONTINUE; - - ((consvar_t *)pvRef)->value = iJoyNum; - if (IDirectInput_CreateDevice(lpDI, &lpddi->guidInstance, - &pdev, NULL) != DI_OK) - { - // if it failed, then we can't use this joystick for some - // bizarre reason. (Maybe the user unplugged it while we - // were in the middle of enumerating it.) So continue enumerating - I_OutputMsg("DIEnumJoysticks(): CreateDevice FAILED\n"); - return DIENUM_CONTINUE; - } - - // get the Device capabilities - // - caps.dwSize = sizeof (DIDEVCAPS_DX3); - if (FAILED(IDirectInputDevice_GetCapabilities (pdev, &caps))) - { - I_OutputMsg("DIEnumJoysticks(): GetCapabilities FAILED\n"); - IDirectInputDevice_Release (pdev); - return DIENUM_CONTINUE; - } - if (!(caps.dwFlags & DIDC_ATTACHED)) // should be, since we enumerate only attached devices - return DIENUM_CONTINUE; - - Joystick.bJoyNeedPoll = ((caps.dwFlags & DIDC_POLLEDDATAFORMAT) != 0); - - if (caps.dwFlags & DIDC_FORCEFEEDBACK) - JoyInfo.ForceAxises = 0; - else - JoyInfo.ForceAxises = -1; - - Joystick.bGamepadStyle = (GET_DIDEVICE_SUBTYPE(caps.dwDevType) == DIDEVTYPEJOYSTICK_GAMEPAD); - //I_OutputMsg("Gamepad: %d\n", Joystick.bGamepadStyle); - - - CONS_Printf(M_GetText("Capabilities: %lu axes, %lu buttons, %lu POVs, poll %u, Gamepad %d\n"), caps.dwAxes, caps.dwButtons, caps.dwPOVs, Joystick.bJoyNeedPoll, Joystick.bGamepadStyle); - - // Set the data format to "simple joystick" - a predefined data format - // - // A data format specifies which controls on a device we - // are interested in, and how they should be reported. - // - // This tells DirectInput that we will be passing a - // DIJOYSTATE structure to IDirectInputDevice::GetDeviceState. - if (IDirectInputDevice_SetDataFormat (pdev, &c_dfDIJoystick) != DI_OK) - { - I_OutputMsg("DIEnumJoysticks(): SetDataFormat FAILED\n"); - IDirectInputDevice_Release (pdev); - return DIENUM_CONTINUE; - } - - // Set the cooperativity level to let DirectInput know how - // this device should interact with the system and with other - // DirectInput applications. - if (IDirectInputDevice_SetCooperativeLevel (pdev, hWndMain, - DISCL_EXCLUSIVE | DISCL_FOREGROUND) != DI_OK) - { - I_OutputMsg("DIEnumJoysticks(): SetCooperativeLevel FAILED\n"); - IDirectInputDevice_Release (pdev); - return DIENUM_CONTINUE; - } - - // set the range of the joystick axis - diprg.diph.dwSize = sizeof (DIPROPRANGE); - diprg.diph.dwHeaderSize = sizeof (DIPROPHEADER); - diprg.diph.dwHow = DIPH_BYOFFSET; - diprg.lMin = -JOYAXISRANGE; // value for extreme left - diprg.lMax = +JOYAXISRANGE; // value for extreme right - - diprg.diph.dwObj = DIJOFS_X; // set the x-axis range - if (FAILED(IDirectInputDevice_SetProperty(pdev, DIPROP_RANGE, &diprg.diph))) - { - //goto SetPropFail; - JoyInfo.X = FALSE; - } - else JoyInfo.X = TRUE; - - diprg.diph.dwObj = DIJOFS_Y; // set the y-axis range - if (FAILED(IDirectInputDevice_SetProperty(pdev, DIPROP_RANGE, &diprg.diph))) - { -//SetPropFail: -// I_OutputMsg("DIEnumJoysticks(): SetProperty FAILED\n"); -// IDirectInputDevice_Release (pdev); -// return DIENUM_CONTINUE; - JoyInfo.Y = FALSE; - } - else JoyInfo.Y = TRUE; - - diprg.diph.dwObj = DIJOFS_Z; // set the z-axis range - if (FAILED(IDirectInputDevice_SetProperty(pdev, DIPROP_RANGE, &diprg.diph))) - { - //I_OutputMsg("DIJOFS_Z not found\n"); - JoyInfo.Z = FALSE; - } - else JoyInfo.Z = TRUE; - - diprg.diph.dwObj = DIJOFS_RX; // set the x-rudder range - if (FAILED(IDirectInputDevice_SetProperty(pdev, DIPROP_RANGE, &diprg.diph))) - { - //I_OutputMsg("DIJOFS_RX (x-rudder) not found\n"); - JoyInfo.Rx = FALSE; - } - else JoyInfo.Rx = TRUE; - - diprg.diph.dwObj = DIJOFS_RY; // set the y-rudder range - if (FAILED(IDirectInputDevice_SetProperty(pdev, DIPROP_RANGE, &diprg.diph))) - { - //I_OutputMsg("DIJOFS_RY (y-rudder) not found\n"); - JoyInfo.Ry = FALSE; - } - else JoyInfo.Ry = TRUE; - - diprg.diph.dwObj = DIJOFS_RZ; // set the z-rudder range - if (FAILED(IDirectInputDevice_SetProperty(pdev, DIPROP_RANGE, &diprg.diph))) - { - //I_OutputMsg("DIJOFS_RZ (z-rudder) not found\n"); - JoyInfo.Rz = FALSE; - } - else JoyInfo.Rz = TRUE; - diprg.diph.dwObj = DIJOFS_SLIDER(0); // set the x-misc range - if (FAILED(IDirectInputDevice_SetProperty(pdev, DIPROP_RANGE, &diprg.diph))) - { - //I_OutputMsg("DIJOFS_RZ (x-misc) not found\n"); - JoyInfo.U = FALSE; - } - else JoyInfo.U = TRUE; - - diprg.diph.dwObj = DIJOFS_SLIDER(1); // set the y-misc range - if (FAILED(IDirectInputDevice_SetProperty(pdev, DIPROP_RANGE, &diprg.diph))) - { - //I_OutputMsg("DIJOFS_RZ (y-misc) not found\n"); - JoyInfo.V = FALSE; - } - else JoyInfo.V = TRUE; - - // set X axis dead zone to 25% (to avoid accidental turning) - if (!Joystick.bGamepadStyle) - { - if (JoyInfo.X) - if (FAILED(SetDIDwordProperty(pdev, DIPROP_DEADZONE, DIJOFS_X, - DIPH_BYOFFSET, DIDEADZONE))) - { - I_OutputMsg("DIEnumJoysticks(): couldn't SetProperty for X DEAD ZONE\n"); - //IDirectInputDevice_Release (pdev); - //return DIENUM_CONTINUE; - } - if (JoyInfo.Y) - if (FAILED(SetDIDwordProperty(pdev, DIPROP_DEADZONE, DIJOFS_Y, - DIPH_BYOFFSET, DIDEADZONE))) - { - I_OutputMsg("DIEnumJoysticks(): couldn't SetProperty for Y DEAD ZONE\n"); - //IDirectInputDevice_Release (pdev); - //return DIENUM_CONTINUE; - } - if (JoyInfo.Z) - if (FAILED(SetDIDwordProperty(pdev, DIPROP_DEADZONE, DIJOFS_Z, - DIPH_BYOFFSET, DIDEADZONE))) - { - I_OutputMsg("DIEnumJoysticks(): couldn't SetProperty for Z DEAD ZONE\n"); - //IDirectInputDevice_Release (pdev); - //return DIENUM_CONTINUE; - } - if (JoyInfo.Rx) - if (FAILED(SetDIDwordProperty(pdev, DIPROP_DEADZONE, DIJOFS_RX, - DIPH_BYOFFSET, DIDEADZONE))) - { - I_OutputMsg("DIEnumJoysticks(): couldn't SetProperty for RX DEAD ZONE\n"); - //IDirectInputDevice_Release (pdev); - //return DIENUM_CONTINUE; - } - if (JoyInfo.Ry) - if (FAILED(SetDIDwordProperty(pdev, DIPROP_DEADZONE, DIJOFS_RY, - DIPH_BYOFFSET, DIDEADZONE))) - { - I_OutputMsg("DIEnumJoysticks(): couldn't SetProperty for RY DEAD ZONE\n"); - //IDirectInputDevice_Release (pdev); - //return DIENUM_CONTINUE; - } - if (JoyInfo.Rz) - if (FAILED(SetDIDwordProperty(pdev, DIPROP_DEADZONE, DIJOFS_RZ, - DIPH_BYOFFSET, DIDEADZONE))) - { - I_OutputMsg("DIEnumJoysticks(): couldn't SetProperty for RZ DEAD ZONE\n"); - //IDirectInputDevice_Release (pdev); - //return DIENUM_CONTINUE; - } - if (JoyInfo.U) - if (FAILED(SetDIDwordProperty(pdev, DIPROP_DEADZONE, DIJOFS_SLIDER(0), - DIPH_BYOFFSET, DIDEADZONE))) - { - I_OutputMsg("DIEnumJoysticks(): couldn't SetProperty for U DEAD ZONE\n"); - //IDirectInputDevice_Release (pdev); - //return DIENUM_CONTINUE; - } - if (JoyInfo.V) - if (FAILED(SetDIDwordProperty(pdev, DIPROP_DEADZONE, DIJOFS_SLIDER(1), - DIPH_BYOFFSET, DIDEADZONE))) - { - I_OutputMsg("DIEnumJoysticks(): couldn't SetProperty for V DEAD ZONE\n"); - //IDirectInputDevice_Release (pdev); - //return DIENUM_CONTINUE; - } - } - - // query for IDirectInputDevice2 - we need this to poll the joystick - if (bDX0300) - { - FFType i = EvilForce; - // we won't use the poll - lpDIJA = NULL; - for (i = 0; i > NumberofForces; i++) - lpDIE[i] = NULL; - } - else - { - LPDIRECTINPUTDEVICE2A *rp = &lpDIJA; - LPVOID *tp = (LPVOID *)rp; - if (FAILED(IDirectInputDevice_QueryInterface(pdev, &IID_IDirectInputDevice2, tp))) - { - I_OutputMsg("DIEnumJoysticks(): QueryInterface FAILED\n"); - IDirectInputDevice_Release (pdev); - return DIENUM_CONTINUE; - } - - if (lpDIJA && JoyInfo.ForceAxises != -1) - { - // Since we will be playing force feedback effects, we should disable the - // auto-centering spring. - if (FAILED(SetDIDwordProperty(pdev, DIPROP_AUTOCENTER, 0, DIPH_DEVICE, FALSE))) - { - //NOP - } - - // Enumerate and count the axes of the joystick - if (FAILED(IDirectInputDevice_EnumObjects(pdev, EnumAxesCallback, - (LPVOID)&JoyInfo.ForceAxises, DIDFT_AXIS))) - { - JoyInfo.ForceAxises = -1; - } - else - { - SetupAllForces(lpDIJA,lpDIE,JoyInfo.ForceAxises); - } - } - } - - // we successfully created an IDirectInputDevice. So stop looking - // for another one. - lpDIJ = pdev; - return DIENUM_STOP; -} - -// -------------- -// I_InitJoystick -// This is called everytime the 'use_joystick' variable changes -// It is normally called at least once at startup when the config is loaded -// -------------- -void I_InitJoystick(void) -{ - HRESULT hr; - - // cleanup - I_ShutdownJoystick(); - - //joystick detection can be skipped by setting use_joystick to 0 - if (!lpDI || M_CheckParm("-nojoy")) - { - CONS_Printf(M_GetText("Joystick disabled\n")); - return; - } - else - // don't do anything at the registration of the joystick cvar, - // until config is loaded - if (!strcmp(cv_usejoystick.string, "0")) - return; - - // acquire the joystick only once - if (!lpDIJ) - { - joystick_detected = false; - - CONS_Printf(M_GetText("Looking for joystick devices:\n")); - iJoyNum = 0; - hr = IDirectInput_EnumDevices(lpDI, DIDEVTYPE_JOYSTICK, DIEnumJoysticks, - (void *)&cv_usejoystick, // our user parameter is joystick number - DIEDFL_ATTACHEDONLY); - if (FAILED(hr)) - { - CONS_Alert(CONS_WARNING, M_GetText("Joystick initialize failed.\n")); - cv_usejoystick.value = 0; - return; - } - - if (!lpDIJ) - { - if (!iJoyNum) - CONS_Printf(M_GetText("none found\n")); - else - { - CONS_Printf(M_GetText("none used\n")); - if (cv_usejoystick.value > 0 && cv_usejoystick.value > iJoyNum) - { - CONS_Alert(CONS_WARNING, M_GetText("Set the use_joystick variable to one of the enumerated joystick numbers\n")); - } - } - cv_usejoystick.value = 0; - return; - } - - I_AddExitFunc(I_ShutdownJoystick); - - // set coop level - if (FAILED(IDirectInputDevice_SetCooperativeLevel(lpDIJ, hWndMain, - DISCL_NONEXCLUSIVE|DISCL_FOREGROUND))) - { - I_Error("I_InitJoystick: SetCooperativeLevel FAILED"); - } - } - else - CONS_Printf(M_GetText("Joystick already initialized\n")); - - // we don't unacquire joystick, so let's just pretend we re-acquired it - joystick_detected = true; -} -//Joystick 2 - -// --------------- -// DIEnumJoysticks2 -// There is no such thing as a 'system' joystick, contrary to mouse, -// we must enumerate and choose one joystick device to use -// --------------- -static BOOL CALLBACK DIEnumJoysticks2 (LPCDIDEVICEINSTANCEA lpddi, - LPVOID pvRef) //cv_usejoystick -{ - LPDIRECTINPUTDEVICEA pdev; - DIPROPRANGE diprg; - DIDEVCAPS caps; - BOOL bUseThisOne = FALSE; - - iJoy2Num++; - - //faB: if cv holds a string description of joystick, the value from atoi() is 0 - // else, the value was probably set by user at console to one of the previsouly - // enumerated joysticks - if (((consvar_t *)pvRef)->value == iJoy2Num || !strcmp(((consvar_t *)pvRef)->string, lpddi->tszProductName)) - bUseThisOne = TRUE; - - //I_OutputMsg(" cv joy2 is %s\n", ((consvar_t *)pvRef)->string); - - // print out device name - CONS_Printf("%c%d: %s\n", - (bUseThisOne) ? '\2' : ' ', // show name in white if this is the one we will use - iJoy2Num, - //(GET_DIDEVICE_SUBTYPE(lpddi->dwDevType) == DIDEVTYPEJOYSTICK_GAMEPAD) ? "Gamepad " : "Joystick", - lpddi->tszProductName); //, lpddi->tszInstanceName); - - // use specified joystick (cv_usejoystick.value in pvRef) - if (!bUseThisOne) - return DIENUM_CONTINUE; - - ((consvar_t *)pvRef)->value = iJoy2Num; - if (IDirectInput_CreateDevice (lpDI, &lpddi->guidInstance, - &pdev, NULL) != DI_OK) - { - // if it failed, then we can't use this joystick for some - // bizarre reason. (Maybe the user unplugged it while we - // were in the middle of enumerating it.) So continue enumerating - I_OutputMsg("DIEnumJoysticks2(): CreateDevice FAILED\n"); - return DIENUM_CONTINUE; - } - - - // get the Device capabilities - // - caps.dwSize = sizeof (DIDEVCAPS_DX3); - if (FAILED(IDirectInputDevice_GetCapabilities (pdev, &caps))) - { - I_OutputMsg("DIEnumJoysticks2(): GetCapabilities FAILED\n"); - IDirectInputDevice_Release (pdev); - return DIENUM_CONTINUE; - } - if (!(caps.dwFlags & DIDC_ATTACHED)) // should be, since we enumerate only attached devices - return DIENUM_CONTINUE; - - Joystick2.bJoyNeedPoll = ((caps.dwFlags & DIDC_POLLEDDATAFORMAT) != 0); - - if (caps.dwFlags & DIDC_FORCEFEEDBACK) - JoyInfo2.ForceAxises = 0; - else - JoyInfo2.ForceAxises = -1; - - Joystick2.bGamepadStyle = (GET_DIDEVICE_SUBTYPE(caps.dwDevType) == DIDEVTYPEJOYSTICK_GAMEPAD); - //I_OutputMsg("Gamepad: %d\n", Joystick2.bGamepadStyle); - - CONS_Printf(M_GetText("Capabilities: %lu axes, %lu buttons, %lu POVs, poll %u, Gamepad %d\n"), caps.dwAxes, caps.dwButtons, caps.dwPOVs, Joystick2.bJoyNeedPoll, Joystick2.bGamepadStyle); - - // Set the data format to "simple joystick" - a predefined data format - // - // A data format specifies which controls on a device we - // are interested in, and how they should be reported. - // - // This tells DirectInput that we will be passing a - // DIJOYSTATE structure to IDirectInputDevice::GetDeviceState. - if (IDirectInputDevice_SetDataFormat (pdev, &c_dfDIJoystick) != DI_OK) - { - I_OutputMsg("DIEnumJoysticks2(): SetDataFormat FAILED\n"); - IDirectInputDevice_Release (pdev); - return DIENUM_CONTINUE; - } - - // Set the cooperativity level to let DirectInput know how - // this device should interact with the system and with other - // DirectInput applications. - if (IDirectInputDevice_SetCooperativeLevel (pdev, hWndMain, - DISCL_EXCLUSIVE | DISCL_FOREGROUND) != DI_OK) - { - I_OutputMsg("DIEnumJoysticks2(): SetCooperativeLevel FAILED\n"); - IDirectInputDevice_Release (pdev); - return DIENUM_CONTINUE; - } - - // set the range of the joystick axis - diprg.diph.dwSize = sizeof (DIPROPRANGE); - diprg.diph.dwHeaderSize = sizeof (DIPROPHEADER); - diprg.diph.dwHow = DIPH_BYOFFSET; - diprg.lMin = -JOYAXISRANGE; // value for extreme left - diprg.lMax = +JOYAXISRANGE; // value for extreme right - - diprg.diph.dwObj = DIJOFS_X; // set the x-axis range - if (FAILED(IDirectInputDevice_SetProperty(pdev, DIPROP_RANGE, &diprg.diph))) - { - //goto SetPropFail; - JoyInfo2.X = FALSE; - } - else JoyInfo2.X = TRUE; - - diprg.diph.dwObj = DIJOFS_Y; // set the y-axis range - if (FAILED(IDirectInputDevice_SetProperty(pdev, DIPROP_RANGE, &diprg.diph))) - { -//SetPropFail: -// I_OutputMsg("DIEnumJoysticks(): SetProperty FAILED\n"); -// IDirectInputDevice_Release (pdev); -// return DIENUM_CONTINUE; - JoyInfo2.Y = FALSE; - } - else JoyInfo2.Y = TRUE; - - diprg.diph.dwObj = DIJOFS_Z; // set the z-axis range - if (FAILED(IDirectInputDevice_SetProperty(pdev, DIPROP_RANGE, &diprg.diph))) - { - //I_OutputMsg("DIJOFS_Z not found\n"); - JoyInfo2.Z = FALSE; - } - else JoyInfo2.Z = TRUE; - - diprg.diph.dwObj = DIJOFS_RX; // set the x-rudder range - if (FAILED(IDirectInputDevice_SetProperty(pdev, DIPROP_RANGE, &diprg.diph))) - { - //I_OutputMsg("DIJOFS_RX (x-rudder) not found\n"); - JoyInfo2.Rx = FALSE; - } - else JoyInfo2.Rx = TRUE; - - diprg.diph.dwObj = DIJOFS_RY; // set the y-rudder range - if (FAILED(IDirectInputDevice_SetProperty(pdev, DIPROP_RANGE, &diprg.diph))) - { - //I_OutputMsg("DIJOFS_RY (y-rudder) not found\n"); - JoyInfo2.Ry = FALSE; - } - else JoyInfo2.Ry = TRUE; - - diprg.diph.dwObj = DIJOFS_RZ; // set the z-rudder range - if (FAILED(IDirectInputDevice_SetProperty(pdev, DIPROP_RANGE, &diprg.diph))) - { - //I_OutputMsg("DIJOFS_RZ (z-rudder) not found\n"); - JoyInfo2.Rz = FALSE; - } - else JoyInfo2.Rz = TRUE; - diprg.diph.dwObj = DIJOFS_SLIDER(0); // set the x-misc range - if (FAILED(IDirectInputDevice_SetProperty(pdev, DIPROP_RANGE, &diprg.diph))) - { - //I_OutputMsg("DIJOFS_RZ (x-misc) not found\n"); - JoyInfo2.U = FALSE; - } - else JoyInfo2.U = TRUE; - - diprg.diph.dwObj = DIJOFS_SLIDER(1); // set the y-misc range - if (FAILED(IDirectInputDevice_SetProperty(pdev, DIPROP_RANGE, &diprg.diph))) - { - //I_OutputMsg("DIJOFS_RZ (y-misc) not found\n"); - JoyInfo2.V = FALSE; - } - else JoyInfo2.V = TRUE; - - // set X axis dead zone to 25% (to avoid accidental turning) - if (!Joystick2.bGamepadStyle) - { - if (JoyInfo2.X) - if (FAILED(SetDIDwordProperty(pdev, DIPROP_DEADZONE, DIJOFS_X, - DIPH_BYOFFSET, DIDEADZONE))) - { - I_OutputMsg("DIEnumJoysticks2(): couldn't SetProperty for X DEAD ZONE"); - //IDirectInputDevice_Release (pdev); - //return DIENUM_CONTINUE; - } - if (JoyInfo2.Y) - if (FAILED(SetDIDwordProperty(pdev, DIPROP_DEADZONE, DIJOFS_Y, - DIPH_BYOFFSET, DIDEADZONE))) - { - I_OutputMsg("DIEnumJoysticks2(): couldn't SetProperty for Y DEAD ZONE\n"); - //IDirectInputDevice_Release (pdev); - //return DIENUM_CONTINUE; - } - if (JoyInfo2.Z) - if (FAILED(SetDIDwordProperty(pdev, DIPROP_DEADZONE, DIJOFS_Z, - DIPH_BYOFFSET, DIDEADZONE))) - { - I_OutputMsg("DIEnumJoysticks2(): couldn't SetProperty for Z DEAD ZONE\n"); - //IDirectInputDevice_Release (pdev); - //return DIENUM_CONTINUE; - } - if (JoyInfo2.Rx) - if (FAILED(SetDIDwordProperty(pdev, DIPROP_DEADZONE, DIJOFS_RX, - DIPH_BYOFFSET, DIDEADZONE))) - { - I_OutputMsg("DIEnumJoysticks2(): couldn't SetProperty for RX DEAD ZONE\n"); - //IDirectInputDevice_Release (pdev); - //return DIENUM_CONTINUE; - } - if (JoyInfo2.Ry) - if (FAILED(SetDIDwordProperty(pdev, DIPROP_DEADZONE, DIJOFS_RY, - DIPH_BYOFFSET, DIDEADZONE))) - { - I_OutputMsg("DIEnumJoysticks2(): couldn't SetProperty for RY DEAD ZONE\n"); - //IDirectInputDevice_Release (pdev); - //return DIENUM_CONTINUE; - } - if (JoyInfo2.Rz) - if (FAILED(SetDIDwordProperty(pdev, DIPROP_DEADZONE, DIJOFS_RZ, - DIPH_BYOFFSET, DIDEADZONE))) - { - I_OutputMsg("DIEnumJoysticks2(): couldn't SetProperty for RZ DEAD ZONE\n"); - //IDirectInputDevice_Release (pdev); - //return DIENUM_CONTINUE; - } - if (JoyInfo2.U) - if (FAILED(SetDIDwordProperty(pdev, DIPROP_DEADZONE, DIJOFS_SLIDER(0), - DIPH_BYOFFSET, DIDEADZONE))) - { - I_OutputMsg("DIEnumJoysticks2(): couldn't SetProperty for U DEAD ZONE\n"); - //IDirectInputDevice_Release (pdev); - //return DIENUM_CONTINUE; - } - if (JoyInfo2.V) - if (FAILED(SetDIDwordProperty(pdev, DIPROP_DEADZONE, DIJOFS_SLIDER(1), - DIPH_BYOFFSET, DIDEADZONE))) - { - I_OutputMsg("DIEnumJoysticks2(): couldn't SetProperty for V DEAD ZONE\n"); - //IDirectInputDevice_Release (pdev); - //return DIENUM_CONTINUE; - } - } - - // query for IDirectInputDevice2 - we need this to poll the joystick - if (bDX0300) - { - FFType i = EvilForce; - // we won't use the poll - lpDIJA = NULL; - for (i = 0; i > NumberofForces; i++) - lpDIE[i] = NULL; - } - else - { - LPDIRECTINPUTDEVICE2A *rp = &lpDIJ2A; - LPVOID *tp = (LPVOID *)rp; - if (FAILED(IDirectInputDevice_QueryInterface(pdev, &IID_IDirectInputDevice2, tp))) - { - I_OutputMsg("DIEnumJoysticks2(): QueryInterface FAILED\n"); - IDirectInputDevice_Release (pdev); - return DIENUM_CONTINUE; - } - - if (lpDIJ2A && JoyInfo2.ForceAxises != -1) - { - // Since we will be playing force feedback effects, we should disable the - // auto-centering spring. - if (FAILED(SetDIDwordProperty(pdev, DIPROP_AUTOCENTER, 0, DIPH_DEVICE, FALSE))) - { - //NOP - } - - // Enumerate and count the axes of the joystick - if (FAILED(IDirectInputDevice_EnumObjects(pdev, EnumAxesCallback, - (LPVOID)&JoyInfo2.ForceAxises, DIDFT_AXIS))) - { - JoyInfo2.ForceAxises = -1; - } - else - { - SetupAllForces(lpDIJ2A,lpDIE2,JoyInfo2.ForceAxises); - } - } - } - - // we successfully created an IDirectInputDevice. So stop looking - // for another one. - lpDIJ2 = pdev; - return DIENUM_STOP; -} - - -// -------------- -// I_InitJoystick2 -// This is called everytime the 'use_joystick2' variable changes -// It is normally called at least once at startup when the config is loaded -// -------------- -void I_InitJoystick2 (void) -{ - HRESULT hr; - - // cleanup - I_ShutdownJoystick2 (); - - joystick2_detected = false; - - // joystick detection can be skipped by setting use_joystick to 0 - if (!lpDI || M_CheckParm("-nojoy")) - { - CONS_Printf(M_GetText("Joystick2 disabled\n")); - return; - } - else - // don't do anything at the registration of the joystick cvar, - // until config is loaded - if (!strcmp(cv_usejoystick2.string, "0")) - return; - - // acquire the joystick only once - if (!lpDIJ2) - { - joystick2_detected = false; - - CONS_Printf(M_GetText("Looking for joystick devices:\n")); - iJoy2Num = 0; - hr = IDirectInput_EnumDevices(lpDI, DIDEVTYPE_JOYSTICK, - DIEnumJoysticks2, - (LPVOID)&cv_usejoystick2, // our user parameter is joystick number - DIEDFL_ATTACHEDONLY); - if (FAILED(hr)) - { - CONS_Alert(CONS_WARNING, M_GetText("Joystick initialize failed.\n")); - cv_usejoystick2.value = 0; - return; - } - - if (!lpDIJ2) - { - if (iJoy2Num == 0) - CONS_Printf(M_GetText("none found\n")); - else - { - CONS_Printf(M_GetText("none used\n")); - if (cv_usejoystick2.value > 0 && - cv_usejoystick2.value > iJoy2Num) - { - CONS_Alert(CONS_WARNING, M_GetText("Set the use_joystick2 variable to one of the enumerated joysticks number\n")); - } - } - cv_usejoystick2.value = 0; - return; - } - - I_AddExitFunc (I_ShutdownJoystick2); - - // set coop level - if (FAILED(IDirectInputDevice_SetCooperativeLevel (lpDIJ2, hWndMain, DISCL_NONEXCLUSIVE | DISCL_FOREGROUND))) - I_Error("I_InitJoystick2: SetCooperativeLevel FAILED"); - - // later - //if (FAILED(IDirectInputDevice_Acquire (lpDIJ2))) - // I_Error("Couldn't acquire Joystick2"); - - joystick2_detected = true; - } - else - CONS_Printf(M_GetText("Joystick already initialized\n")); - - //faB: we don't unacquire joystick, so let's just pretend we re-acquired it - joystick2_detected = true; -} - -/** \brief Joystick 1 buttons states -*/ -static UINT64 lastjoybuttons = 0; - -/** \brief Joystick 1 hats state -*/ -static UINT64 lastjoyhats = 0; - -static VOID I_ShutdownJoystick(VOID) -{ - int i; - event_t event; - - lastjoybuttons = lastjoyhats = 0; - - event.type = ev_keyup; - - // emulate the up of all joystick buttons - for (i = 0;i < JOYBUTTONS;i++) - { - event.data1 = KEY_JOY1+i; - D_PostEvent(&event); - } - - // emulate the up of all joystick hats - for (i = 0;i < JOYHATS*4;i++) - { - event.data1 = KEY_HAT1+i; - D_PostEvent(&event); - } - - // reset joystick position - event.type = ev_joystick; - for (i = 0;i < JOYAXISSET; i++) - { - event.data1 = i; - D_PostEvent(&event); - } - - if (joystick_detected) - CONS_Printf("I_ShutdownJoystick()\n"); - - for (i = 0; i > NumberofForces; i++) - { - if (lpDIE[i]) - { - IDirectInputEffect_Release(lpDIE[i]); - lpDIE[i] = NULL; - - } - } - if (lpDIJ) - { - IDirectInputDevice_Unacquire(lpDIJ); - IDirectInputDevice_Release(lpDIJ); - lpDIJ = NULL; - } - if (lpDIJA) - { - IDirectInputDevice2_Release(lpDIJA); - lpDIJA = NULL; - } - joystick_detected = false; -} - -/** \brief Joystick 2 buttons states -*/ -static UINT64 lastjoy2buttons = 0; - -/** \brief Joystick 2 hats state -*/ -static UINT64 lastjoy2hats = 0; - -static VOID I_ShutdownJoystick2(VOID) -{ - int i; - event_t event; - - lastjoy2buttons = lastjoy2hats = 0; - - event.type = ev_keyup; - - // emulate the up of all joystick buttons - for (i = 0;i < JOYBUTTONS;i++) - { - event.data1 = KEY_2JOY1+i; - D_PostEvent(&event); - } - - // emulate the up of all joystick hats - for (i = 0;i < JOYHATS*4;i++) - { - event.data1 = KEY_2HAT1+i; - D_PostEvent(&event); - } - - // reset joystick position - event.type = ev_joystick2; - for (i = 0;i < JOYAXISSET; i++) - { - event.data1 = i; - D_PostEvent(&event); - } - - if (joystick2_detected) - CONS_Printf("I_ShutdownJoystick2()\n"); - - for (i = 0; i > NumberofForces; i++) - { - if (lpDIE2[i]) - { - IDirectInputEffect_Release(lpDIE2[i]); - lpDIE2[i] = NULL; - } - } - if (lpDIJ2) - { - IDirectInputDevice_Unacquire(lpDIJ2); - IDirectInputDevice_Release(lpDIJ2); - lpDIJ2 = NULL; - } - if (lpDIJ2A) - { - IDirectInputDevice2_Release(lpDIJ2A); - lpDIJ2A = NULL; - } - joystick2_detected = false; -} - -// ------------------- -// I_GetJoystickEvents -// Get current joystick axis and button states -// ------------------- -void I_GetJoystickEvents(void) -{ - HRESULT hr; - DIJOYSTATE js; // DirectInput joystick state - int i; - UINT64 joybuttons = 0; - UINT64 joyhats = 0; - event_t event; - - if (!lpDIJ) - return; - - // if input is lost then acquire and keep trying - for (;;) - { - // poll the joystick to read the current state - // if the device doesn't require polling, this function returns almost instantly - if (lpDIJA) - { - hr = IDirectInputDevice2_Poll(lpDIJA); - if (hr == DIERR_INPUTLOST || hr == DIERR_NOTACQUIRED) - goto acquire; - else if (FAILED(hr)) - { - I_OutputMsg("I_GetJoystickEvents(): Poll FAILED\n"); - return; - } - } - - // get the input's device state, and put the state in dims - hr = IDirectInputDevice_GetDeviceState(lpDIJ, sizeof (DIJOYSTATE), &js); - - if (hr == DIERR_INPUTLOST || hr == DIERR_NOTACQUIRED) - { - // DirectInput is telling us that the input stream has - // been interrupted. We aren't tracking any state - // between polls, so we don't have any special reset - // that needs to be done. We just re-acquire and - // try again. - goto acquire; - } - else if (FAILED(hr)) - { - I_OutputMsg("I_GetJoystickEvents(): GetDeviceState FAILED\n"); - return; - } - - break; -acquire: - if (FAILED(IDirectInputDevice_Acquire(lpDIJ))) - return; - } - - // look for as many buttons as g_input code supports, we don't use the others - for (i = JOYBUTTONS_MIN - 1; i >= 0; i--) - { - joybuttons <<= 1; - if (js.rgbButtons[i]) - joybuttons |= 1; - } - - for (i = JOYHATS_MIN -1; i >=0; i--) - { - if (js.rgdwPOV[i] != 0xffff && js.rgdwPOV[i] != 0xffffffff) - { - if (js.rgdwPOV[i] > 270 * DI_DEGREES || js.rgdwPOV[i] < 90 * DI_DEGREES) - joyhats |= (UINT64)1<<(0 + 4*(UINT64)i); // UP - else if (js.rgdwPOV[i] > 90 * DI_DEGREES && js.rgdwPOV[i] < 270 * DI_DEGREES) - joyhats |= (UINT64)1<<(1 + 4*(UINT64)i); // DOWN - if (js.rgdwPOV[i] > 0 * DI_DEGREES && js.rgdwPOV[i] < 180 * DI_DEGREES) - joyhats |= (UINT64)1<<(3 + 4*(UINT64)i); // LEFT - else if (js.rgdwPOV[i] > 180 * DI_DEGREES && js.rgdwPOV[i] < 360 * DI_DEGREES) - joyhats |= (UINT64)1<<(2 + 4*(UINT64)i); // RIGHT - } - } - - if (joybuttons != lastjoybuttons) - { - UINT64 j = 1; // keep only bits that changed since last time - UINT64 newbuttons = joybuttons ^ lastjoybuttons; - lastjoybuttons = joybuttons; - - for (i = 0; i < JOYBUTTONS_MIN; i++, j <<= 1) - { - if (newbuttons & j) // button changed state? - { - if (joybuttons & j) - event.type = ev_keydown; - else - event.type = ev_keyup; - event.data1 = KEY_JOY1 + i; - D_PostEvent(&event); - } - } - } - - if (joyhats != lastjoyhats) - { - UINT64 j = 1; // keep only bits that changed since last time - UINT64 newhats = joyhats ^ lastjoyhats; - lastjoyhats = joyhats; - - for (i = 0; i < JOYHATS_MIN*4; i++, j <<= 1) - { - if (newhats & j) // button changed state? - { - if (joyhats & j) - event.type = ev_keydown; - else - event.type = ev_keyup; - event.data1 = KEY_HAT1 + i; - D_PostEvent(&event); - } - } - - } - - // send joystick axis positions - event.type = ev_joystick; - event.data1 = event.data2 = event.data3 = 0; - - if (Joystick.bGamepadStyle) - { - // gamepad control type, on or off, live or die - if (JoyInfo.X) - { - if (js.lX < -(JOYAXISRANGE/2)) - event.data2 = -1; - else if (js.lX > JOYAXISRANGE/2) - event.data2 = 1; - } - if (JoyInfo.Y) - { - if (js.lY < -(JOYAXISRANGE/2)) - event.data3 = -1; - else if (js.lY > JOYAXISRANGE/2) - event.data3 = 1; - } - } - else - { - // analog control style, just send the raw data - if (JoyInfo.X) event.data2 = js.lX; // x axis - if (JoyInfo.Y) event.data3 = js.lY; // y axis - } - - D_PostEvent(&event); -#if JOYAXISSET > 1 - event.data1 = 1; - event.data2 = event.data3 = 0; - - if (Joystick.bGamepadStyle) - { - // gamepad control type, on or off, live or die - if (JoyInfo.Z) - { - if (js.lZ < -(JOYAXISRANGE/2)) - event.data2 = -1; - else if (js.lZ > JOYAXISRANGE/2) - event.data2 = 1; - } - if (JoyInfo.Rx) - { - if (js.lRx < -(JOYAXISRANGE/2)) - event.data3 = -1; - else if (js.lRx > JOYAXISRANGE/2) - event.data3 = 1; - } - } - else - { - // analog control style, just send the raw data - if (JoyInfo.Z) event.data2 = js.lZ; // z axis - if (JoyInfo.Rx) event.data3 = js.lRx; // rx axis - } - - D_PostEvent(&event); -#endif -#if JOYAXISSET > 2 - event.data1 = 2; - event.data2 = event.data3 = 0; - - if (Joystick.bGamepadStyle) - { - // gamepad control type, on or off, live or die - if (JoyInfo.Rx) - { - if (js.lRy < -(JOYAXISRANGE/2)) - event.data2 = -1; - else if (js.lRy > JOYAXISRANGE/2) - event.data2 = 1; - } - if (JoyInfo.Rz) - { - if (js.lRz < -(JOYAXISRANGE/2)) - event.data3 = -1; - else if (js.lRz > JOYAXISRANGE/2) - event.data3 = 1; - } - } - else - { - // analog control style, just send the raw data - if (JoyInfo.Ry) event.data2 = js.lRy; // ry axis - if (JoyInfo.Rz) event.data3 = js.lRz; // rz axis - } - - D_PostEvent(&event); -#endif -#if JOYAXISSET > 3 - event.data1 = 3; - event.data2 = event.data3 = 0; - if (Joystick.bGamepadStyle) - { - // gamepad control type, on or off, live or die - if (JoyInfo.U) - { - if (js.rglSlider[0] < -(JOYAXISRANGE/2)) - event.data2 = -1; - else if (js.rglSlider[0] > JOYAXISRANGE/2) - event.data2 = 1; - } - if (JoyInfo.V) - { - if (js.rglSlider[1] < -(JOYAXISRANGE/2)) - event.data3 = -1; - else if (js.rglSlider[1] > JOYAXISRANGE/2) - event.data3 = 1; - } - } - else - { - // analog control style, just send the raw data - if (JoyInfo.U) event.data2 = js.rglSlider[0]; // U axis - if (JoyInfo.V) event.data3 = js.rglSlider[1]; // V axis - } - D_PostEvent(&event); -#endif -} - -// ------------------- -// I_GetJoystickEvents -// Get current joystick axis and button states -// ------------------- -void I_GetJoystick2Events(void) -{ - HRESULT hr; - DIJOYSTATE js; // DirectInput joystick state - int i; - UINT64 joybuttons = 0; - UINT64 joyhats = 0; - event_t event; - - if (!lpDIJ2) - return; - - // if input is lost then acquire and keep trying - for (;;) - { - // poll the joystick to read the current state - // if the device doesn't require polling, this function returns almost instantly - if (lpDIJ2A) - { - hr = IDirectInputDevice2_Poll(lpDIJ2A); - if (hr == DIERR_INPUTLOST || hr == DIERR_NOTACQUIRED) - goto acquire; - else if (FAILED(hr)) - { - I_OutputMsg("I_GetJoystick2Events(): Poll FAILED\n"); - return; - } - } - - // get the input's device state, and put the state in dims - hr = IDirectInputDevice_GetDeviceState(lpDIJ2, sizeof (DIJOYSTATE), &js); - - if (hr == DIERR_INPUTLOST || hr == DIERR_NOTACQUIRED) - { - // DirectInput is telling us that the input stream has - // been interrupted. We aren't tracking any state - // between polls, so we don't have any special reset - // that needs to be done. We just re-acquire and - // try again. - goto acquire; - } - else if (FAILED(hr)) - { - I_OutputMsg("I_GetJoystickEvents2(): GetDeviceState FAILED\n"); - return; - } - - break; -acquire: - if (FAILED(IDirectInputDevice_Acquire(lpDIJ2))) - return; - } - - // look for as many buttons as g_input code supports, we don't use the others - for (i = JOYBUTTONS_MIN - 1; i >= 0; i--) - { - joybuttons <<= 1; - if (js.rgbButtons[i]) - joybuttons |= 1; - } - - for (i = JOYHATS_MIN -1; i >=0; i--) - { - if (js.rgdwPOV[i] != 0xffff && js.rgdwPOV[i] != 0xffffffff) - { - if (js.rgdwPOV[i] > 270 * DI_DEGREES || js.rgdwPOV[i] < 90 * DI_DEGREES) - joyhats |= (UINT64)1<<(0 + 4*(UINT64)i); // UP - else if (js.rgdwPOV[i] > 90 * DI_DEGREES && js.rgdwPOV[i] < 270 * DI_DEGREES) - joyhats |= (UINT64)1<<(1 + 4*(UINT64)i); // DOWN - if (js.rgdwPOV[i] > 0 * DI_DEGREES && js.rgdwPOV[i] < 180 * DI_DEGREES) - joyhats |= (UINT64)1<<(3 + 4*(UINT64)i); // LEFT - else if (js.rgdwPOV[i] > 180 * DI_DEGREES && js.rgdwPOV[i] < 360 * DI_DEGREES) - joyhats |= (UINT64)1<<(2 + 4*(UINT64)i); // RIGHT - } - } - - if (joybuttons != lastjoy2buttons) - { - UINT64 j = 1; // keep only bits that changed since last time - UINT64 newbuttons = joybuttons ^ lastjoy2buttons; - lastjoy2buttons = joybuttons; - - for (i = 0; i < JOYBUTTONS_MIN; i++, j <<= 1) - { - if (newbuttons & j) // button changed state? - { - if (joybuttons & j) - event.type = ev_keydown; - else - event.type = ev_keyup; - event.data1 = KEY_2JOY1 + i; - D_PostEvent(&event); - } - } - } - - if (joyhats != lastjoy2hats) - { - UINT64 j = 1; // keep only bits that changed since last time - UINT64 newhats = joyhats ^ lastjoy2hats; - lastjoy2hats = joyhats; - - for (i = 0; i < JOYHATS_MIN*4; i++, j <<= 1) - { - if (newhats & j) // button changed state? - { - if (joyhats & j) - event.type = ev_keydown; - else - event.type = ev_keyup; - event.data1 = KEY_2HAT1 + i; - D_PostEvent(&event); - } - } - - } - - // send joystick axis positions - event.type = ev_joystick2; - event.data1 = event.data2 = event.data3 = 0; - - if (Joystick2.bGamepadStyle) - { - // gamepad control type, on or off, live or die - if (JoyInfo2.X) - { - if (js.lX < -(JOYAXISRANGE/2)) - event.data2 = -1; - else if (js.lX > JOYAXISRANGE/2) - event.data2 = 1; - } - if (JoyInfo2.Y) - { - if (js.lY < -(JOYAXISRANGE/2)) - event.data3 = -1; - else if (js.lY > JOYAXISRANGE/2) - event.data3 = 1; - } - } - else - { - // analog control style, just send the raw data - if (JoyInfo2.X) event.data2 = js.lX; // x axis - if (JoyInfo2.Y) event.data3 = js.lY; // y axis - } - - D_PostEvent(&event); -#if JOYAXISSET > 1 - event.data1 = 1; - event.data2 = event.data3 = 0; - - if (Joystick2.bGamepadStyle) - { - // gamepad control type, on or off, live or die - if (JoyInfo2.Z) - { - if (js.lZ < -(JOYAXISRANGE/2)) - event.data2 = -1; - else if (js.lZ > JOYAXISRANGE/2) - event.data2 = 1; - } - if (JoyInfo2.Rx) - { - if (js.lRx < -(JOYAXISRANGE/2)) - event.data3 = -1; - else if (js.lRx > JOYAXISRANGE/2) - event.data3 = 1; - } - } - else - { - // analog control style, just send the raw data - if (JoyInfo2.Z) event.data2 = js.lZ; // z axis - if (JoyInfo2.Rx) event.data3 = js.lRx; // rx axis - } - - D_PostEvent(&event); -#endif -#if JOYAXISSET > 2 - event.data1 = 2; - event.data2 = event.data3 = 0; - - if (Joystick2.bGamepadStyle) - { - // gamepad control type, on or off, live or die - if (JoyInfo2.Rx) - { - if (js.lRy < -(JOYAXISRANGE/2)) - event.data2 = -1; - else if (js.lRy > JOYAXISRANGE/2) - event.data2 = 1; - } - if (JoyInfo2.Rz) - { - if (js.lRz < -(JOYAXISRANGE/2)) - event.data3 = -1; - else if (js.lRz > JOYAXISRANGE/2) - event.data3 = 1; - } - } - else - { - // analog control style, just send the raw data - if (JoyInfo2.Ry) event.data2 = js.lRy; // ry axis - if (JoyInfo2.Rz) event.data3 = js.lRz; // rz axis - } - - D_PostEvent(&event); -#endif -#if JOYAXISSET > 3 - event.data1 = 3; - event.data2 = event.data3 = 0; - if (Joystick2.bGamepadStyle) - { - // gamepad control type, on or off, live or die - if (JoyInfo2.U) - { - if (js.rglSlider[0] < -(JOYAXISRANGE/2)) - event.data2 = -1; - else if (js.rglSlider[0] > JOYAXISRANGE/2) - event.data2 = 1; - } - if (JoyInfo2.V) - { - if (js.rglSlider[1] < -(JOYAXISRANGE/2)) - event.data3 = -1; - else if (js.rglSlider[1] > JOYAXISRANGE/2) - event.data3 = 1; - } - } - else - { - // analog control style, just send the raw data - if (JoyInfo2.U) event.data2 = js.rglSlider[0]; // U axis - if (JoyInfo2.V) event.data3 = js.rglSlider[1]; // V axis - } - D_PostEvent(&event); -#endif -} - -static int numofjoy = 0; -static char joyname[MAX_PATH]; -static int needjoy = -1; - -static BOOL CALLBACK DIEnumJoysticksCount (LPCDIDEVICEINSTANCEA lpddi, - LPVOID pvRef) //joyname -{ - numofjoy++; - if (needjoy == numofjoy && pvRef && pvRef == (void *)joyname && lpddi - && lpddi->tszProductName) - { - sprintf(joyname,"%s",lpddi->tszProductName); - return DIENUM_STOP; - } - //else I_OutputMsg("DIEnumJoysticksCount need help!\n"); - return DIENUM_CONTINUE; -} - -INT32 I_NumJoys(void) -{ - HRESULT hr; - needjoy = -1; - numofjoy = 0; - hr = IDirectInput_EnumDevices(lpDI, DIDEVTYPE_JOYSTICK, - DIEnumJoysticksCount, (LPVOID)&numofjoy, DIEDFL_ATTACHEDONLY); - if (FAILED(hr)) - { - I_OutputMsg("\nI_NumJoys(): EnumDevices FAILED\n"); - } - return numofjoy; - -} - -const char *I_GetJoyName(INT32 joyindex) -{ - HRESULT hr; - needjoy = joyindex; - numofjoy = 0; - ZeroMemory(joyname,sizeof (joyname)); - hr = IDirectInput_EnumDevices(lpDI, DIDEVTYPE_JOYSTICK, - DIEnumJoysticksCount, (LPVOID)joyname, DIEDFL_ATTACHEDONLY); - if (FAILED(hr)) - { - I_OutputMsg("\nI_GetJoyName(): EnumDevices FAILED\n"); - } - if (joyname[0] == 0) return NULL; - return joyname; -} - -#ifndef NOMUMBLE -// Best Mumble positional audio settings: -// Minimum distance 3.0 m -// Bloom 175% -// Maximum distance 80.0 m -// Minimum volume 50% -#define DEG2RAD (0.017453292519943295769236907684883l) // TAU/360 or PI/180 -#define MUMBLEUNIT (64.0f) // FRACUNITS in a Meter - -static struct { - UINT32 uiVersion; - DWORD uiTick; - float fAvatarPosition[3]; - float fAvatarFront[3]; - float fAvatarTop[3]; // defaults to Y-is-up (only used for leaning) - wchar_t name[256]; // game name - float fCameraPosition[3]; - float fCameraFront[3]; - float fCameraTop[3]; // defaults to Y-is-up (only used for leaning) - wchar_t identity[256]; // player id - UINT32 context_len; - unsigned char context[256]; // server/team - wchar_t description[2048]; // game description -} *mumble = NULL; - -static inline void I_SetupMumble(void) -{ - HANDLE hMap = OpenFileMappingW(FILE_MAP_ALL_ACCESS, FALSE, L"MumbleLink"); - if (!hMap) - return; - - mumble = MapViewOfFile(hMap, FILE_MAP_ALL_ACCESS, 0, 0, sizeof(*mumble)); - if (!mumble) - CloseHandle(hMap); -} - -void I_UpdateMumble(const mobj_t *mobj, const listener_t listener) -{ - double angle; - fixed_t anglef; - - if (!mumble) - return; - - if(mumble->uiVersion != 2) { - wcsncpy(mumble->name, L"SRB2 "VERSIONSTRINGW, 256); - wcsncpy(mumble->description, L"Sonic Robo Blast 2 with integrated Mumble Link support.", 2048); - mumble->uiVersion = 2; - } - mumble->uiTick++; - - if (!netgame || gamestate != GS_LEVEL) { // Zero out, but never delink. - mumble->fAvatarPosition[0] = mumble->fAvatarPosition[1] = mumble->fAvatarPosition[2] = 0.0f; - mumble->fAvatarFront[0] = 1.0f; - mumble->fAvatarFront[1] = mumble->fAvatarFront[2] = 0.0f; - mumble->fCameraPosition[0] = mumble->fCameraPosition[1] = mumble->fCameraPosition[2] = 0.0f; - mumble->fCameraFront[0] = 1.0f; - mumble->fCameraFront[1] = mumble->fCameraFront[2] = 0.0f; - return; - } - - { - UINT8 *p = mumble->context; - WRITEMEM(p, server_context, 8); - WRITEINT16(p, gamemap); - mumble->context_len = p - mumble->context; - } - - if (mobj) { - mumble->fAvatarPosition[0] = FIXED_TO_FLOAT(mobj->x) / MUMBLEUNIT; - mumble->fAvatarPosition[1] = FIXED_TO_FLOAT(mobj->z) / MUMBLEUNIT; - mumble->fAvatarPosition[2] = FIXED_TO_FLOAT(mobj->y) / MUMBLEUNIT; - - anglef = AngleFixed(mobj->angle); - angle = FIXED_TO_FLOAT(anglef)*DEG2RAD; - mumble->fAvatarFront[0] = (float)cos(angle); - mumble->fAvatarFront[1] = 0.0f; - mumble->fAvatarFront[2] = (float)sin(angle); - } else { - mumble->fAvatarPosition[0] = mumble->fAvatarPosition[1] = mumble->fAvatarPosition[2] = 0.0f; - mumble->fAvatarFront[0] = 1.0f; - mumble->fAvatarFront[1] = mumble->fAvatarFront[2] = 0.0f; - } - - mumble->fCameraPosition[0] = FIXED_TO_FLOAT(listener.x) / MUMBLEUNIT; - mumble->fCameraPosition[1] = FIXED_TO_FLOAT(listener.z) / MUMBLEUNIT; - mumble->fCameraPosition[2] = FIXED_TO_FLOAT(listener.y) / MUMBLEUNIT; - - anglef = AngleFixed(listener.angle); - angle = FIXED_TO_FLOAT(anglef)*DEG2RAD; - mumble->fCameraFront[0] = (float)cos(angle); - mumble->fCameraFront[1] = 0.0f; - mumble->fCameraFront[2] = (float)sin(angle); -} -#endif - -// =========================================================================================== -// DIRECT INPUT KEYBOARD -// =========================================================================================== - -static UINT8 ASCIINames[256] = -{ - // 0 1 2 3 4 5 6 7 - // 8 9 A B C D E F - 0, 27, '1', '2', '3', '4', '5', '6', - '7', '8', '9', '0', KEY_MINUS,KEY_EQUALS,KEY_BACKSPACE, KEY_TAB, - 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', - 'o', 'p', '[', ']',KEY_ENTER,KEY_LCTRL,'a', 's', - 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', - '\'', '`', KEY_LSHIFT,'\\', 'z', 'x', 'c', 'v', - 'b', 'n', 'm', ',', '.', '/', KEY_RSHIFT,'*', - KEY_LALT,KEY_SPACE,KEY_CAPSLOCK,KEY_F1,KEY_F2,KEY_F3,KEY_F4,KEY_F5, - KEY_F6, KEY_F7, KEY_F8, KEY_F9, KEY_F10,KEY_NUMLOCK,KEY_SCROLLLOCK,KEY_KEYPAD7, - KEY_KEYPAD8,KEY_KEYPAD9,KEY_MINUSPAD,KEY_KEYPAD4,KEY_KEYPAD5,KEY_KEYPAD6,KEY_PLUSPAD,KEY_KEYPAD1, - KEY_KEYPAD2,KEY_KEYPAD3,KEY_KEYPAD0,KEY_KPADDEL,0,0,0, KEY_F11, - KEY_F12,0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - - // 0 1 2 3 4 5 6 7 - // 8 9 A B C D E F - - 0, 0, 0, 0, 0, 0, 0, 0, // 0x80 - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, KEY_ENTER,KEY_RCTRL,0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, // 0xa0 - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, KEY_KPADDEL, 0,KEY_KPADSLASH,0, 0, - KEY_RALT, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, KEY_HOME, // 0xc0 - KEY_UPARROW,KEY_PGUP,0,KEY_LEFTARROW,0,KEY_RIGHTARROW,0,KEY_END, - KEY_DOWNARROW,KEY_PGDN, KEY_INS,KEY_DEL,0,0,0,0, - 0, 0, 0,KEY_LEFTWIN,KEY_RIGHTWIN,KEY_MENU, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, // 0xe0 - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0 -}; - -// Return a key that has been pushed, or 0 (replace getchar() at game startup) -// -INT32 I_GetKey(void) -{ - event_t *ev; - - if (eventtail != eventhead) - { - ev = &events[eventtail]; - eventtail = (eventtail+1) & (MAXEVENTS-1); - if (ev->type == ev_keydown || ev->type == ev_console) - return ev->data1; - else - return 0; - } - return 0; -} - -// ----------------- -// I_StartupKeyboard -// Installs DirectInput keyboard -// ----------------- -#define DI_KEYBOARD_BUFFERSIZE 32 // number of data elements in keyboard buffer - -static void I_StartupKeyboard(void) -{ - DIPROPDWORD dip; - - if (dedicated || !lpDI) - return; - - // make sure the app window has the focus or DirectInput acquire keyboard won't work - if (hWndMain) - { - SetFocus(hWndMain); - ShowWindow(hWndMain, SW_SHOW); - UpdateWindow(hWndMain); - } - - // detect error - if (lpDIK) - { - I_OutputMsg("I_StartupKeyboard(): called twice\n"); - return; - } - - CreateDevice2A(lpDI, &GUID_SysKeyboard, &lpDIK, NULL); - - if (lpDIK) - { - if (FAILED(IDirectInputDevice_SetDataFormat(lpDIK, &c_dfDIKeyboard))) - I_Error("Couldn't set keyboard data format"); - - // create buffer for buffered data - dip.diph.dwSize = sizeof (dip); - dip.diph.dwHeaderSize = sizeof (dip.diph); - dip.diph.dwObj = 0; - dip.diph.dwHow = DIPH_DEVICE; - dip.dwData = DI_KEYBOARD_BUFFERSIZE; - if (FAILED(IDirectInputDevice_SetProperty(lpDIK, DIPROP_BUFFERSIZE, &dip.diph))) - I_Error("Couldn't set keyboard buffer size"); - - if (FAILED(IDirectInputDevice_SetCooperativeLevel(lpDIK, hWndMain, - DISCL_NONEXCLUSIVE|DISCL_FOREGROUND))) - { - I_Error("Couldn't set keyboard coop level"); - } - } - else - I_Error("Couldn't create keyboard input"); - - I_AddExitFunc(I_ShutdownKeyboard); - hacktics = 0; // see definition - keyboard_started = true; -} - -// ------------------ -// I_ShutdownKeyboard -// Release DirectInput keyboard. -// ------------------ -static VOID I_ShutdownKeyboard(VOID) -{ - if (!keyboard_started) - return; - - CONS_Printf("I_ShutdownKeyboard()\n"); - - if (lpDIK) - { - IDirectInputDevice_Unacquire(lpDIK); - IDirectInputDevice_Release(lpDIK); - lpDIK = NULL; - } - - keyboard_started = false; -} - -// ------------------- -// I_GetKeyboardEvents -// Get buffered data from the keyboard -// ------------------- -static VOID I_GetKeyboardEvents(VOID) -{ - static BOOL KeyboardLost = false; - - // simply repeat the last pushed key every xx tics, - // make more user friendly input for Console and game Menus -#define KEY_REPEAT_DELAY (NEWTICRATE/17) // TICRATE tics, repeat every 1/3 second - static LONG RepeatKeyTics = 0; - static int RepeatKeyCode = 0; - - DIDEVICEOBJECTDATA rgdod[DI_KEYBOARD_BUFFERSIZE]; - DWORD dwItems, d; - HRESULT hr; - int ch; - - event_t event; - ZeroMemory(&event,sizeof (event)); - - if (!keyboard_started) - return; - - if (!appActive && RepeatKeyCode) // Stop when lost focus - { - event.type = ev_keyup; - event.data1 = RepeatKeyCode; - D_PostEvent(&event); - RepeatKeyCode = 0; - } -getBufferedData: - dwItems = DI_KEYBOARD_BUFFERSIZE; - hr = IDirectInputDevice_GetDeviceData(lpDIK, sizeof (DIDEVICEOBJECTDATA), rgdod, &dwItems, 0); - - // If data stream was interrupted, reacquire the device and try again. - if (hr == DIERR_INPUTLOST || hr == DIERR_NOTACQUIRED) - { - // why it succeeds to acquire just after I don't understand.. so I set the flag BEFORE - KeyboardLost = true; - - hr = IDirectInputDevice_Acquire(lpDIK); - if (SUCCEEDED(hr)) - goto getBufferedData; - return; - } - - // we lost data, get device actual state to recover lost information - if (hr == DI_BUFFEROVERFLOW) - { - /// \note either uncomment or delete block - //I_Error("DI buffer overflow (keyboard)"); - //I_RecoverKeyboardState (); - - //hr = IDirectInputDevice_GetDeviceState (lpDIM, sizeof (keys), &diMouseState); - } - - // We got buffered input, act on it - if (SUCCEEDED(hr)) - { - // if we previously lost keyboard data, recover its current state - if (KeyboardLost) - { - /// \bug hack simply clears the keys so we don't have the last pressed keys - /// still active.. to have to re-trigger it is not much trouble for the user. - ZeroMemory(gamekeydown, NUMKEYS); - KeyboardLost = false; - } - - // dwItems contains number of elements read (could be 0) - for (d = 0; d < dwItems; d++) - { - // dwOfs member is DIK_* value - // dwData member 0x80 bit set press down, clear is release - - if (rgdod[d].dwData & 0x80) - event.type = ev_keydown; - else - event.type = ev_keyup; - - ch = rgdod[d].dwOfs & 0xFF; - if (ASCIINames[ch]) - event.data1 = ASCIINames[ch]; - else - event.data1 = 0x80; - - D_PostEvent(&event); - } - - // Key Repeat - if (dwItems) - { - // new key events, so stop repeating key - RepeatKeyCode = 0; - // delay is tripled for first repeating key - RepeatKeyTics = hacktics + (KEY_REPEAT_DELAY*3); - if (event.type == ev_keydown) // use the last event! - RepeatKeyCode = event.data1; - } - else - { - // no new keys, repeat last pushed key after some time - if (RepeatKeyCode && hacktics - RepeatKeyTics > KEY_REPEAT_DELAY) - { - event.type = ev_keydown; - event.data1 = RepeatKeyCode; - D_PostEvent(&event); - - RepeatKeyTics = hacktics; - } - } - } -} - -static HINSTANCE DInputDLL = NULL; -typedef HRESULT (WINAPI *DICreateA)(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUTA *ppDI, LPUNKNOWN punkOuter); -static DICreateA pfnDirectInputCreateA = NULL; - -BOOL LoadDirectInput(VOID) -{ - // load dinput.dll - DInputDLL = LoadLibraryA("DINPUT.DLL"); - if (DInputDLL == NULL) - return false; - pfnDirectInputCreateA = (DICreateA)(LPVOID)GetProcAddress(DInputDLL, "DirectInputCreateA"); - if (pfnDirectInputCreateA == NULL) - return false; - return true; -} - -static inline VOID UnLoadDirectInput(VOID) -{ - if (!DInputDLL) - return; - FreeLibrary(DInputDLL); - pfnDirectInputCreateA = NULL; - DInputDLL = NULL; -} - - -// -// Closes DirectInput -// -static VOID I_ShutdownDirectInput(VOID) -{ - if (lpDI) - IDirectInput_Release(lpDI); - lpDI = NULL; - UnLoadDirectInput(); -} - -// This stuff should get rid of the exception and page faults when -// SRB2 bugs out with an error. Now it should exit cleanly. -// -INT32 I_StartupSystem(void) -{ - HRESULT hr; - HINSTANCE myInstance = GetModuleHandle(NULL); - - // some 'more global than globals' things to initialize here ? - graphics_started = keyboard_started = sound_started = cdaudio_started = false; - - I_StartupKeyboard(); - -#ifdef NDEBUG - -#ifdef BUGTRAP - if(!IsBugTrapLoaded()) - { -#endif - signal(SIGABRT, signal_handler); - signal(SIGFPE, signal_handler); - signal(SIGILL, signal_handler); - signal(SIGSEGV, signal_handler); - signal(SIGTERM, signal_handler); - signal(SIGINT, signal_handler); -#ifdef BUGTRAP - } -#endif - -#endif - -#ifndef NOMUMBLE - I_SetupMumble(); -#endif - - if (!pfnDirectInputCreateA) - return 1; - // create DirectInput - so that I_StartupKeyboard/Mouse can be called later on - // from D_SRB2Main just like DOS version - hr = pfnDirectInputCreateA(myInstance, DIRECTINPUT_VERSION, &lpDI, NULL); - - if (SUCCEEDED(hr)) - bDX0300 = FALSE; - else - { - // try opening DirectX3 interface for NT compatibility - hr = pfnDirectInputCreateA(myInstance, DXVERSION_NTCOMPATIBLE, &lpDI, NULL); - - if (FAILED(hr)) - { - const char *sErr; - switch (hr) - { - case DIERR_BETADIRECTINPUTVERSION: - sErr = "DIERR_BETADIRECTINPUTVERSION"; - break; - case DIERR_INVALIDPARAM: - sErr = "DIERR_INVALIDPARAM"; - break; - case DIERR_OLDDIRECTINPUTVERSION : - sErr = "DIERR_OLDDIRECTINPUTVERSION"; - break; - case DIERR_OUTOFMEMORY: - sErr = "DIERR_OUTOFMEMORY"; - break; - default: - sErr = "UNKNOWN"; - break; - } - I_Error("Couldn't create DirectInput (reason: %s)", sErr); - } - else - CONS_Printf("\x82%s", M_GetText("Using DirectX3 interface\n")); - - // only use DirectInput3 compatible structures and calls - bDX0300 = TRUE; - } - I_AddExitFunc(I_ShutdownDirectInput); - return 0; -} - -// Closes down everything. This includes restoring the initial -// palette and video mode, and removing whatever mouse, keyboard, and -// timer routines have been installed. -// -/// \bug doesn't restore wave/midi device volume -// -// Shutdown user funcs are effectively called in reverse order. -// -void I_ShutdownSystem(void) -{ - int c; - - for (c = MAX_QUIT_FUNCS - 1; c >= 0; c--) - if (quit_funcs[c]) - (*quit_funcs[c])(); -} - -// my god how win32 suck -typedef BOOL (WINAPI *p_GetDiskFreeSpaceExA)(LPCSTR, PULARGE_INTEGER, PULARGE_INTEGER, PULARGE_INTEGER); - -void I_GetDiskFreeSpace(INT64* freespace) -{ - static p_GetDiskFreeSpaceExA pfnGetDiskFreeSpaceEx = NULL; - static boolean testwin95 = false; - ULARGE_INTEGER usedbytes, lfreespace; - - if (!testwin95) - { - pfnGetDiskFreeSpaceEx = (p_GetDiskFreeSpaceExA)(LPVOID)GetProcAddress(GetModuleHandleA("kernel32.dll"), "GetDiskFreeSpaceExA"); - testwin95 = true; - } - if (pfnGetDiskFreeSpaceEx) - { - if (pfnGetDiskFreeSpaceEx(NULL, &lfreespace, &usedbytes, NULL)) - *freespace = lfreespace.QuadPart; - else - *freespace = INT32_MAX; - } - else - { - DWORD SectorsPerCluster, BytesPerSector, NumberOfFreeClusters, TotalNumberOfClusters; - GetDiskFreeSpace(NULL, &SectorsPerCluster, &BytesPerSector, - &NumberOfFreeClusters, &TotalNumberOfClusters); - *freespace = BytesPerSector * SectorsPerCluster * NumberOfFreeClusters; - } -} - -char *I_GetUserName(void) -{ - static char username[MAXPLAYERNAME+1]; - char *p; - DWORD i = MAXPLAYERNAME; - - if (!GetUserNameA(username, &i)) - { - p = getenv("USER"); - if (!p) - { - p = getenv("user"); - if (!p) - { - p = getenv("USERNAME"); - if (!p) - { - p = getenv("username"); - if (!p) - { - return NULL; - } - } - } - } - strlcpy(username, p, sizeof (username)); - } - - if (!strlen(username)) - return NULL; - return username; -} - -INT32 I_mkdir(const char *dirname, INT32 unixright) -{ - UNREFERENCED_PARAMETER(unixright); /// \todo should implement ntright under nt... - return CreateDirectoryA(dirname, NULL); -} - -char * I_GetEnv(const char *name) -{ - return getenv(name); -} - -INT32 I_PutEnv(char *variable) -{ - return putenv(variable); -} - -INT32 I_ClipboardCopy(const char *data, size_t size) -{ - (void)data; - (void)size; - return -1; -} - -const char *I_ClipboardPaste(void) -{ - return NULL; -} - -typedef BOOL (WINAPI *p_IsProcessorFeaturePresent) (DWORD); - -const CPUInfoFlags *I_CPUInfo(void) -{ - static CPUInfoFlags WIN_CPUInfo; - SYSTEM_INFO SI; - p_IsProcessorFeaturePresent pfnCPUID = (p_IsProcessorFeaturePresent)(LPVOID)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsProcessorFeaturePresent"); - - ZeroMemory(&WIN_CPUInfo,sizeof (WIN_CPUInfo)); - if (pfnCPUID) - { - WIN_CPUInfo.FPPE = pfnCPUID( 0); //PF_FLOATING_POINT_PRECISION_ERRATA - WIN_CPUInfo.FPE = pfnCPUID( 1); //PF_FLOATING_POINT_EMULATED - WIN_CPUInfo.cmpxchg = pfnCPUID( 2); //PF_COMPARE_EXCHANGE_DOUBLE - WIN_CPUInfo.MMX = pfnCPUID( 3); //PF_MMX_INSTRUCTIONS_AVAILABLE - WIN_CPUInfo.PPCMM64 = pfnCPUID( 4); //PF_PPC_MOVEMEM_64BIT_OK - WIN_CPUInfo.ALPHAbyte = pfnCPUID( 5); //PF_ALPHA_BYTE_INSTRUCTIONS - WIN_CPUInfo.SSE = pfnCPUID( 6); //PF_XMMI_INSTRUCTIONS_AVAILABLE - WIN_CPUInfo.AMD3DNow = pfnCPUID( 7); //PF_3DNOW_INSTRUCTIONS_AVAILABLE - WIN_CPUInfo.RDTSC = pfnCPUID( 8); //PF_RDTSC_INSTRUCTION_AVAILABLE - WIN_CPUInfo.PAE = pfnCPUID( 9); //PF_PAE_ENABLED - WIN_CPUInfo.SSE2 = pfnCPUID(10); //PF_XMMI64_INSTRUCTIONS_AVAILABLE - //WIN_CPUInfo.blank = pfnCPUID(11); //PF_SSE_DAZ_MODE_AVAILABLE - WIN_CPUInfo.DEP = pfnCPUID(12); //PF_NX_ENABLED - WIN_CPUInfo.SSE3 = pfnCPUID(13); //PF_SSE3_INSTRUCTIONS_AVAILABLE - WIN_CPUInfo.cmpxchg16b = pfnCPUID(14); //PF_COMPARE_EXCHANGE128 - WIN_CPUInfo.cmp8xchg16 = pfnCPUID(15); //PF_COMPARE64_EXCHANGE128 - WIN_CPUInfo.PFC = pfnCPUID(16); //PF_CHANNELS_ENABLED - } - GetSystemInfo(&SI); - WIN_CPUInfo.CPUs = SI.dwNumberOfProcessors; - WIN_CPUInfo.IA64 = (SI.dwProcessorType == 2200); // PROCESSOR_INTEL_IA64 - WIN_CPUInfo.AMD64 = (SI.dwProcessorType == 8664); // PROCESSOR_AMD_X8664 - return &WIN_CPUInfo; -} - -static void CPUAffinity_OnChange(void); -static consvar_t cv_cpuaffinity = CVAR_INIT ("cpuaffinity", "-1", CV_CALL, NULL, CPUAffinity_OnChange); - -typedef HANDLE (WINAPI *p_GetCurrentProcess) (VOID); -static p_GetCurrentProcess pfnGetCurrentProcess = NULL; -typedef BOOL (WINAPI *p_GetProcessAffinityMask) (HANDLE, PDWORD_PTR, PDWORD_PTR); -static p_GetProcessAffinityMask pfnGetProcessAffinityMask = NULL; -typedef BOOL (WINAPI *p_SetProcessAffinityMask) (HANDLE, DWORD_PTR); -static p_SetProcessAffinityMask pfnSetProcessAffinityMask = NULL; - -static inline VOID GetAffinityFuncs(VOID) -{ - HMODULE h = GetModuleHandleA("kernel32.dll"); - pfnGetCurrentProcess = (p_GetCurrentProcess)(LPVOID)GetProcAddress(h, "GetCurrentProcess"); - pfnGetProcessAffinityMask = (p_GetProcessAffinityMask)(LPVOID)GetProcAddress(h, "GetProcessAffinityMask"); - pfnSetProcessAffinityMask = (p_SetProcessAffinityMask)(LPVOID)GetProcAddress(h, "SetProcessAffinityMask"); -} - -static void CPUAffinity_OnChange(void) -{ - DWORD_PTR dwProcMask, dwSysMask; - HANDLE selfpid; - - if (!pfnGetCurrentProcess || !pfnGetProcessAffinityMask || !pfnSetProcessAffinityMask) - return; - else - selfpid = pfnGetCurrentProcess(); - - pfnGetProcessAffinityMask(selfpid, &dwProcMask, &dwSysMask); - - /* If resulting mask is zero, don't change anything and fall back to - * actual mask. - */ - if(dwSysMask & cv_cpuaffinity.value) - { - pfnSetProcessAffinityMask(selfpid, dwSysMask & cv_cpuaffinity.value); - CV_StealthSetValue(&cv_cpuaffinity, (int)(dwSysMask & cv_cpuaffinity.value)); - } - else - CV_StealthSetValue(&cv_cpuaffinity, (int)dwProcMask); -} - -void I_RegisterSysCommands(void) -{ - GetAffinityFuncs(); - CV_RegisterVar(&cv_cpuaffinity); -} -#endif diff --git a/src/win32/win_vid.c b/src/win32/win_vid.c deleted file mode 100644 index 7a33e1931..000000000 --- a/src/win32/win_vid.c +++ /dev/null @@ -1,1113 +0,0 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- -// -// Copyright (C) 1998-2000 by DooM Legacy Team. -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -//----------------------------------------------------------------------------- -/// \file -/// \brief win32 video driver for Doom Legacy - -#include "../doomdef.h" - -#ifdef _WINDOWS - -#include -#include - -#include "../d_clisrv.h" -#include "../i_system.h" -#include "../m_argv.h" -#include "../v_video.h" -#include "../st_stuff.h" -#include "../i_video.h" -#include "../z_zone.h" -#include "fabdxlib.h" -#include "../doomstat.h" -#include "win_main.h" -#include "../command.h" -#include "../screen.h" - -#ifdef HWRENDER -#include "win_dll.h" // loading the render DLL -#include "../hardware/hw_drv.h" // calling driver init & shutdown -#include "../hardware/hw_main.h" // calling HWR module init & shutdown -#endif - -// ------- -// Globals -// ------- - -// this is the CURRENT rendermode!! very important: used by w_wad, and much other code -rendermode_t rendermode = render_soft; -rendermode_t chosenrendermode = render_none; // set by command line arguments -static void OnTop_OnChange(void); -// synchronize page flipping with screen refresh -static CV_PossibleValue_t CV_NeverOnOff[] = {{-1, "Never"}, {0, "Off"}, {1, "On"}, {0, NULL}}; -consvar_t cv_vidwait = CVAR_INIT ("vid_wait", "On", CV_SAVE, CV_OnOff, OnTop_OnChange); -static consvar_t cv_stretch = CVAR_INIT ("stretch", "On", CV_SAVE|CV_NOSHOWHELP, CV_OnOff, NULL); -static consvar_t cv_ontop = CVAR_INIT ("ontop", "Never", 0, CV_NeverOnOff, NULL); - -boolean highcolor; - -static BOOL bDIBMode; // means we are using DIB instead of DirectDraw surfaces -static LPBITMAPINFO bmiMain = NULL; -static HDC hDCMain = NULL; - -// ----------------- -// Video modes stuff -// ----------------- - -#define MAX_EXTRA_MODES 36 -static vmode_t extra_modes[MAX_EXTRA_MODES] = {{NULL, NULL, 0, 0, 0, 0, 0, 0, NULL, NULL, 0}}; -static char names[MAX_EXTRA_MODES][10]; - -static INT32 numvidmodes; // total number of DirectDraw display modes -static vmode_t *pvidmodes; // start of videomodes list. -static vmode_t *pcurrentmode; // the current active videomode. -static BOOL bWinParm; -static INT32 WINAPI VID_SetWindowedDisplayMode(viddef_t *lvid, vmode_t *currentmode); - -// this holds description of the startup video mode, -// the resolution is 320x200, windowed on the desktop -static char winmodenames[NUMSPECIALMODES][11] = { - // W to make sure it's the windowed mode - "320x200W", - "640x400W", - "960x600W", - "1280x800W" -}; -vmode_t specialmodes[NUMSPECIALMODES] = -{ - { - NULL, - winmodenames[0], // hehe - 320, 200, //(200.0/320.0)*(320.0/240.0), - 320, 1, // rowbytes, bytes per pixel - 1, 2, // windowed (TRUE), numpages - NULL, - VID_SetWindowedDisplayMode, 0 - }, - { - NULL, - winmodenames[1], // haha - 640, 400, - 640, 1, // rowbytes, bytes per pixel - 1, 2, // windowed (TRUE), numpages - NULL, - VID_SetWindowedDisplayMode, 0 - }, - { - NULL, - winmodenames[2], // hihi? - 960, 600, - 960, 1, // rowbytes, bytes per pixel - 1, 2, // windowed (TRUE), numpages - NULL, - VID_SetWindowedDisplayMode, 0 - }, - { - NULL, - winmodenames[3], // hoho! - 1280, 800, - 1280, 1, // rowbytes, bytes per pixel - 1, 2, // windowed (TRUE), numpages - NULL, - VID_SetWindowedDisplayMode, 0 - } -}; - -// ------ -// Protos -// ------ -static void VID_Command_NumModes_f(void); -static void VID_Command_ModeInfo_f(void); -static void VID_Command_ModeList_f(void); -static void VID_Command_Mode_f(void); -static INT32 WINAPI VID_SetDirectDrawMode(viddef_t *lvid, vmode_t *currentmode); -static vmode_t *VID_GetModePtr(int modenum); -static VOID VID_Init(VOID); -static BOOL VID_FreeAndAllocVidbuffer(viddef_t *lvid); - -#if 0 - // Disable Composition in Vista DWM (Desktop Window Manager) ---------------- -static HMODULE DMdll = NULL; -typedef HRESULT (CALLBACK *P_DwmIsCompositionEnabled) (BOOL *pfEnabled); -static P_DwmIsCompositionEnabled pfnDwmIsCompositionEnabled = NULL; -typedef HRESULT (CALLBACK *P_DwmEnableComposition) (BOOL fEnable); -static P_DwmEnableComposition pfnDwmEnableComposition = NULL; -static BOOL AeroWasEnabled = FALSE; - -static inline VOID UnloadDM(VOID) -{ - pfnDwmEnableComposition = NULL; - pfnDwmIsCompositionEnabled = NULL; - if (DMdll) FreeLibrary(DMdll); - DMdll = NULL; -} - -static inline BOOL LoadDM(VOID) -{ - if (DMdll) - return TRUE; - - DMdll = LoadLibraryA("dwmapi.dll"); - if (DMdll) - I_OutputMsg("dmwapi.dll loaded, Vista's Desktop Window Manager API\n"); - else - return FALSE; - - pfnDwmIsCompositionEnabled = (P_DwmIsCompositionEnabled)GetProcAddress(DMdll, "DwmIsCompositionEnabled"); - if (pfnDwmIsCompositionEnabled) - I_OutputMsg("Composition Aero API found, DwmIsCompositionEnabled\n"); - - pfnDwmEnableComposition = (P_DwmEnableComposition)GetProcAddress(DMdll, "DwmEnableComposition"); - if (pfnDwmEnableComposition) - I_OutputMsg("Composition Aero API found, DwmEnableComposition\n"); - - return TRUE; -} - -static inline VOID DisableAero(VOID) -{ - BOOL pfnDwmEnableCompositiond = FALSE; - AeroWasEnabled = FALSE; - - if (!LoadDM()) - return; - - if (pfnDwmIsCompositionEnabled && SUCCEEDED(pfnDwmIsCompositionEnabled(&pfnDwmEnableCompositiond))) - I_OutputMsg("Got the result of DwmIsCompositionEnabled, %i\n", pfnDwmEnableCompositiond); - else - return; - - if ((AeroWasEnabled = pfnDwmEnableCompositiond)) - I_OutputMsg("Disable the Aero rendering\n"); - else - return; - - if (pfnDwmEnableComposition && SUCCEEDED(pfnDwmEnableComposition(FALSE))) - I_OutputMsg("Aero rendering disabled\n"); - else - I_OutputMsg("We failed to disable the Aero rendering\n"); -} - -static inline VOID ResetAero(VOID) -{ - if (pfnDwmEnableComposition && AeroWasEnabled) - { - if (SUCCEEDED(pfnDwmEnableComposition(AeroWasEnabled))) - I_OutputMsg("Aero rendering setting restored\n"); - else - I_OutputMsg("We failed to restore Aero rendering\n"); - } - UnloadDM(); -} -#endif - -// ----------------- -// I_StartupGraphics -// Initialize video mode, setup dynamic screen size variables, -// and allocate screens. -// ----------------- -void I_StartupGraphics(void) -{ - if (graphics_started) - return; - -#ifdef HWRENDER - else if (M_CheckParm("-opengl")) - rendermode = render_opengl; - else -#endif - rendermode = render_soft; - - if (dedicated) - rendermode = render_none; - else - VID_Init(); - - // register exit code for graphics - I_AddExitFunc(I_ShutdownGraphics); - if (!dedicated) graphics_started = true; -} - -void VID_StartupOpenGL(void){} - -// ------------------ -// I_ShutdownGraphics -// Close the screen, restore previous video mode. -// ------------------ -void I_ShutdownGraphics(void) -{ -#ifdef HWRENDER - const rendermode_t oldrendermode = rendermode; -#endif - -// This is BAD because it makes the I_Error box screw up! -// rendermode = render_none; - - if (!graphics_started) - return; - - CONS_Printf("I_ShutdownGraphics: "); - - //FreeConsole(); - - //ResetAero(); - - // release windowed startup stuff - if (hDCMain) - { - ReleaseDC(hWndMain, hDCMain); - hDCMain = NULL; - } - if (bmiMain) - { - GlobalFree(bmiMain); - bmiMain = NULL; - } - -#ifdef HWRENDER - if (oldrendermode != render_soft) - { - HWR_Shutdown(); // free stuff from the hardware renderer - HWD.pfnShutdown(); // close 3d card display - Shutdown3DDriver(); // free the driver DLL - } -#endif - - // free the last video mode screen buffers - if (vid.buffer) - { - GlobalFree(vid.buffer); - vid.buffer = NULL; - } - -#ifdef HWRENDER - if (rendermode == render_soft) -#endif - CloseDirectDraw(); - - graphics_started = false; -} - -// -------------- -// I_UpdateNoBlit -// -------------- -void I_UpdateNoBlit(void) -{ - // what is this? -} - -// I_SkipFrame -// -// Returns true if it thinks we can afford to skip this frame -// from PrBoom's src/SDL/i_video.c -static inline boolean I_SkipFrame(void) -{ - static boolean skip = false; - - if (render_soft != rendermode) - return false; - - skip = !skip; - switch (gamestate) - { - case GS_LEVEL: - if (!paused) - return false; - //case GS_TIMEATTACK: -- sorry optimisation but now we have a cool level platter and that being laggardly looks terrible -#ifndef NONET - /* FALLTHRU */ - case GS_WAITINGPLAYERS: -#endif - return skip; // Skip odd frames - default: - return false; - } -} - -static void OnTop_OnChange(void) -{ - const UINT uFlags = SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOSIZE|SWP_NOZORDER; - RECT bounds; - int x = 0, y = 0, w = 0, h = 0; - - if (!hWndMain || bAppFullScreen || cv_ontop.value == -1) - return; - - GetWindowRect(hWndMain, &bounds); - AdjustWindowRectEx(&bounds, GetWindowLong(hWndMain, GWL_STYLE), 0, 0); - w = bounds.right - (x = bounds.left); h = bounds.bottom - (y = bounds.top); - - if (cv_ontop.value && !paused) - SetWindowPos(hWndMain, HWND_TOP , x, y, w, h, uFlags); - else - SetWindowPos(hWndMain, HWND_NOTOPMOST, x, y, w, h, uFlags); -} - -// -------------- -// I_FinishUpdate -// -------------- -void I_FinishUpdate(void) -{ - if (rendermode == render_none) - return; - - if (I_SkipFrame()) - return; - - if (marathonmode) - SCR_DisplayMarathonInfo(); - - // draw captions if enabled - if (cv_closedcaptioning.value) - SCR_ClosedCaptions(); - - // display a graph of ticrate - if (cv_ticrate.value) - SCR_DisplayTicRate(); - - if (cv_showping.value && netgame && consoleplayer != serverplayer) - SCR_DisplayLocalPing(); - - // - if (bDIBMode) - { - // paranoia - if (!hDCMain || !bmiMain || !vid.buffer) - return; - // main game loop, still in a window (-win parm) - SetDIBitsToDevice(hDCMain, 0, 0, vid.width, vid.height, 0, 0, 0, vid.height, vid.buffer, bmiMain, - DIB_RGB_COLORS); - } - else -#ifdef HWRENDER - if (rendermode != render_soft) - HWD.pfnFinishUpdate(cv_vidwait.value); - else -#endif - { - // DIRECT DRAW - // copy virtual screen to real screen - // can fail when not active (alt-tab) - if (LockScreen()) - { - /// \todo use directX blit here!!? a blit might use hardware with access - /// to main memory on recent hardware, and software blit of directX may be - /// optimized for p2 or mmx?? - if (ScreenHeight > vid.height) - { - UINT8 *ptr = (UINT8 *)ScreenPtr; - size_t half_excess = ScreenPitch*(ScreenHeight-vid.height)/2; - memset(ptr, 0x1F, half_excess); - ptr += half_excess; - VID_BlitLinearScreen(screens[0], ptr, vid.width*vid.bpp, vid.height, - vid.width*vid.bpp, ScreenPitch); - ptr += vid.height*ScreenPitch; - memset(ptr, 0x1F, half_excess); - } - else - VID_BlitLinearScreen(screens[0], (UINT8 *)ScreenPtr, vid.width*vid.bpp, vid.height, - vid.width*vid.bpp, ScreenPitch); - - UnlockScreen(); - - // swap screens - ScreenFlip(cv_vidwait.value); - } - } -} - -// --------------- -// I_UpdateNoVsync -// --------------- -void I_UpdateNoVsync(void) -{ - int real_vidwait = cv_vidwait.value; - cv_vidwait.value = 0; - I_FinishUpdate(); - cv_vidwait.value = real_vidwait; -} - -// -// This is meant to be called only by CONS_Printf() while game startup -// -void I_LoadingScreen(LPCSTR msg) -{ - RECT rect; - - // paranoia - if (!hDCMain || !bmiMain || !vid.buffer) - return; - - GetClientRect(vid.WndParent, &rect); - - SetDIBitsToDevice(hDCMain, 0, 0, vid.width, vid.height, 0, 0, 0, vid.height, vid.buffer, bmiMain, DIB_RGB_COLORS); - - if (msg) - { - if (rect.bottom - rect.top > 32) - rect.top = rect.bottom - 32; // put msg on bottom of window - SetBkMode(hDCMain, TRANSPARENT); - SetTextColor(hDCMain, RGB(0x00, 0x00, 0x00)); - DrawTextA(hDCMain, msg, -1, &rect, DT_WORDBREAK|DT_CENTER); - } -} - -// ------------ -// I_ReadScreen -// ------------ -void I_ReadScreen(UINT8 *scr) -{ - // DEBUGGING - if (rendermode != render_soft) - I_Error("I_ReadScreen: called while in non-software mode"); - VID_BlitLinearScreen(screens[0], scr, vid.width*vid.bpp, vid.height, vid.width*vid.bpp, - vid.rowbytes); -} - -// ------------ -// I_SetPalette -// ------------ -void I_SetPalette(RGBA_t *palette) -{ - int i; - - if (bDIBMode) - { - // set palette in RGBQUAD format, NOT THE SAME ORDER as PALETTEENTRY, grmpf! - RGBQUAD *pColors; - pColors = (RGBQUAD *)((LPBYTE)bmiMain + bmiMain->bmiHeader.biSize); - ZeroMemory(pColors, sizeof (RGBQUAD)*256); - for (i = 0; i < 256; i++, pColors++, palette++) - { - pColors->rgbRed = palette->s.red; - pColors->rgbGreen = palette->s.green; - pColors->rgbBlue = palette->s.blue; - } - } - else -#ifdef HWRENDER - if (rendermode == render_soft) -#endif - { - PALETTEENTRY mainpal[256]; - - // this clears the 'flag' for each color in palette - ZeroMemory(mainpal, sizeof mainpal); - - // set palette in PALETTEENTRY format - for (i = 0; i < 256; i++, palette++) - { - mainpal[i].peRed = palette->s.red; - mainpal[i].peGreen = palette->s.green; - mainpal[i].peBlue = palette->s.blue; - } - SetDDPalette(mainpal); // set DirectDraw palette - } -} - -// -// return number of video modes in pvidmodes list -// MODES ARE ZERO INDEXED. DO NOT USE (n > nummodes). USE >= INSTEAD. -// -INT32 VID_NumModes(void) -{ - return numvidmodes; -} - -// return a video mode number from the dimensions -// returns any available video mode if the mode was not found -INT32 VID_GetModeForSize(INT32 w, INT32 h) -{ - vmode_t *pv = pvidmodes; - int modenum = 0; - - // Fullscreen resolutions exist - if (numvidmodes > NUMSPECIALMODES) - { - // skip the special modes so that it finds only fullscreen modes - for (; pv && modenum < NUMSPECIALMODES; pv = pv->pnext, ++modenum); - for (; pv; pv = pv->pnext, ++modenum) - if (pv->width == (unsigned)w && pv->height == (unsigned)h) - return modenum; - - // Try default video mode first - if (w != cv_scr_width.value || h != cv_scr_height.value) - return VID_GetModeForSize(cv_scr_width.value, cv_scr_height.value); - - // didn't find, return first fullscreen mode - return NUMSPECIALMODES; - } - - // rely only on special (windowed) modes - for (; pv && modenum < NUMSPECIALMODES; pv = pv->pnext, ++modenum) - if (pv->width == (unsigned)w && pv->height == (unsigned)h) - return modenum; - - // Try default video mode first - if (w != cv_scr_width.value || h != cv_scr_height.value) - return VID_GetModeForSize(cv_scr_width.value, cv_scr_height.value); - - // didn't find, return first windowed mode - return 0; -} - -// -// Enumerate DirectDraw modes available -// -static int nummodes = 0; -static BOOL GetExtraModesCallback(int width, int height, int bpp) -{ -#ifdef _DEBUG - CONS_Printf("mode %d x %d x %d bpp\n", width, height, bpp); -#endif - - // skip all unwanted modes - if (highcolor && bpp != 15) - goto skip; - if (!highcolor && bpp != 8) - goto skip; - - if (bpp > 16 || width > MAXVIDWIDTH || height > MAXVIDHEIGHT) - goto skip; - - // check if we have space for this mode - if (nummodes >= MAX_EXTRA_MODES) - { -#ifdef _DEBUG - CONS_Printf("mode skipped (too many)\n"); -#endif - return FALSE; - } - - // store mode info - extra_modes[nummodes].pnext = &extra_modes[nummodes+1]; - memset(names[nummodes], 0, 10); - snprintf(names[nummodes], 9, "%dx%d", width, height); - - extra_modes[nummodes].name = names[nummodes]; - extra_modes[nummodes].width = width; - extra_modes[nummodes].height = height; - - // exactly, the current FinishUdpate() gets the rowbytes itself after locking the video buffer - // so for now we put anything here - extra_modes[nummodes].rowbytes = width; - extra_modes[nummodes].windowed = false; - extra_modes[nummodes].misc = 0; // unused - extra_modes[nummodes].pextradata = NULL; - extra_modes[nummodes].setmode = VID_SetDirectDrawMode; - - extra_modes[nummodes].numpages = 3; // triple-buffer (but this value is unused) - - extra_modes[nummodes].bytesperpixel = (bpp+1)>>3; - - nummodes++; -skip: - return TRUE; -} - -// -// Collect info about DirectDraw display modes we use -// -static inline VOID VID_GetExtraModes(VOID) -{ - nummodes = 0; - EnumDirectDrawDisplayModes(GetExtraModesCallback); - - // add the extra modes (not 320x200) at the start of the mode list (if there are any) - if (nummodes) - { - extra_modes[nummodes-1].pnext = NULL; - pvidmodes = &extra_modes[0]; - numvidmodes += nummodes; - } -} - -// --------------- -// WindowMode_Init -// Add windowed modes to the start of the list, -// mode 0 is used for windowed console startup (works on all computers with no DirectX) -// --------------- -static VOID WindowMode_Init(VOID) -{ - int modenum; - - for (modenum = 0; modenum < NUMSPECIALMODES - 1; modenum++) - specialmodes[modenum].pnext = &specialmodes[modenum + 1]; - specialmodes[NUMSPECIALMODES-1].pnext = pvidmodes; - - pvidmodes = specialmodes; - numvidmodes += NUMSPECIALMODES; -} - -// ************************************************************************************* -// VID_Init -// Initialize Video modes subsystem -// ************************************************************************************* -static VOID VID_Init(VOID) -{ -#ifdef _DEBUG - vmode_t *pv; - int iMode; -#endif - - // if '-win' is specified on the command line, do not add DirectDraw modes - bWinParm = M_CheckParm("-win"); - - COM_AddCommand("vid_nummodes", VID_Command_NumModes_f); - COM_AddCommand("vid_modeinfo", VID_Command_ModeInfo_f); - COM_AddCommand("vid_modelist", VID_Command_ModeList_f); - COM_AddCommand("vid_mode", VID_Command_Mode_f); - - CV_RegisterVar(&cv_vidwait); - CV_RegisterVar(&cv_stretch); - CV_RegisterVar(&cv_ontop); - - // setup the videmodes list, - // note that mode 0 must always be VGA mode 0x13 - pvidmodes = pcurrentmode = NULL; - numvidmodes = 0; - - //DisableAero(); - - // store the main window handle in viddef struct - SetWindowPos(hWndMain, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOACTIVATE|SWP_NOSENDCHANGING|SWP_NOSIZE|SWP_NOMOVE); - vid.WndParent = hWndMain; - vid.buffer = NULL; - - // we startup in windowed mode using DIB bitmap - // we will use DirectDraw when switching fullScreen and entering main game loop - bDIBMode = TRUE; - bAppFullScreen = FALSE; - -#ifdef HWRENDER - // initialize the appropriate display device - if (rendermode != render_soft) - { - const char *drvname = NULL; - - switch (rendermode) - { - case render_opengl: - drvname = "r_opengl.dll"; - break; - default: - I_Error("Unknown hardware render mode"); - } - - // load the DLL - if (drvname && Init3DDriver(drvname)) - { - int hwdversion = HWD.pfnGetRenderVersion(); - if (hwdversion != VERSION) - CONS_Alert(CONS_WARNING, M_GetText("This r_opengl version is not supported, use it at your own risk!\n")); - - // perform initialisations - HWD.pfnInit(I_Error); - // get available display modes for the device - HWD.pfnGetModeList(&pvidmodes, &numvidmodes); - } - else - { - switch (rendermode) - { - case render_opengl: - I_Error("Error initializing OpenGL"); - default: - break; - } - rendermode = render_soft; - } - } - - if (rendermode == render_soft) -#endif - if (!bWinParm) - { - if (!CreateDirectDrawInstance()) - bWinParm = TRUE; - else // get available display modes for the device - VID_GetExtraModes(); - } - - // the game boots in 320x200 standard VGA, but - // we need a highcolor mode to run the game in highcolor - if (highcolor && !numvidmodes) - I_Error("Cannot run in highcolor - No 15bit highcolor DirectX video mode found."); - - // add windowed mode at the start of the list, very important! - WindowMode_Init(); - - if (!numvidmodes) - I_Error("No display modes available."); - -#ifdef _DEBUG // DEBUG - for (iMode = 0, pv = pvidmodes; pv; pv = pv->pnext, iMode++) - I_OutputMsg("#%02d: %dx%dx%dbpp (desc: '%s')\n", iMode, pv->width, pv->height, pv->bytesperpixel, pv->name); -#endif - - // set the startup screen in a window - VID_SetMode(0); -} - -// -------------------------- -// VID_SetWindowedDisplayMode -// Display the startup 320x200 console screen into a window on the desktop, -// switching to fullscreen display only when we will enter the main game loop. -// - we can display error message boxes for startup errors -// - we can set the last used resolution only once, when entering the main game loop -// -------------------------- -static INT32 WINAPI VID_SetWindowedDisplayMode(viddef_t *lvid, vmode_t *currentmode) -{ - RECT bounds; - int x = 0, y = 0, w = 0, h = 0; - - UNREFERENCED_PARAMETER(currentmode); - - I_OutputMsg("VID_SetWindowedDisplayMode()\n"); - - - lvid->u.numpages = 1; // not used - lvid->direct = NULL; // DOS remains - lvid->buffer = NULL; - - // allocate screens - if (!VID_FreeAndAllocVidbuffer(lvid)) - return -1; - - // lvid->buffer should be NULL here! - - bmiMain = GlobalAlloc(GPTR, sizeof (BITMAPINFO) + (sizeof (RGBQUAD)*256)); - if (!bmiMain) - I_Error("VID_SWDM(): No mem"); - - // setup a BITMAPINFO to allow copying our video buffer to the desktop, - // with color conversion as needed - bmiMain->bmiHeader.biSize = sizeof (BITMAPINFOHEADER); - bmiMain->bmiHeader.biWidth = lvid->width; - bmiMain->bmiHeader.biHeight= -(lvid->height); - bmiMain->bmiHeader.biPlanes = 1; - bmiMain->bmiHeader.biBitCount = 8; - bmiMain->bmiHeader.biCompression = BI_RGB; - - // center window on the desktop - bounds.left = 0; - bounds.right = lvid->width; - bounds.top = 0; - bounds.bottom = lvid->height; - AdjustWindowRectEx(&bounds, GetWindowLong(hWndMain, GWL_STYLE), FALSE, GetWindowLong(hWndMain, GWL_EXSTYLE)); - - w = bounds.right-bounds.left; - h = bounds.bottom-bounds.top; - x = (GetSystemMetrics(SM_CXSCREEN)-w)/2; - y = (GetSystemMetrics(SM_CYSCREEN)-h)/2; - - if (devparm) - MoveWindow(hWndMain, x<<1, y<<1, w, h, TRUE); - else - MoveWindow(hWndMain, x, y, w, h, TRUE); - - SetFocus(hWndMain); - ShowWindow(hWndMain, SW_SHOW); - - hDCMain = GetDC(hWndMain); - if (!hDCMain) - I_Error("VID_SWDM(): GetDC FAILED"); - - return 1; -} - -// ======================================================================== -// Returns a vmode_t from the video modes list, given a video mode number. -// ======================================================================== -vmode_t *VID_GetModePtr(int modenum) -{ - vmode_t *pv; - - pv = pvidmodes; - if (!pv) - I_Error("VID_error: No video mode found\n"); - - while (modenum--) - { - pv = pv->pnext; - if (!pv) - I_Error("VID_error: Mode not available\n"); - } - return pv; -} - -// -// return the name of a video mode -// -const char *VID_GetModeName(INT32 modenum) -{ - return (VID_GetModePtr(modenum))->name; -} - -// ======================================================================== -// Sets a video mode -// ======================================================================== -INT32 VID_SetMode(INT32 modenum) -{ - int vstat; - vmode_t *pnewmode; - - if (dedicated) - return 0; - - I_OutputMsg("VID_SetMode(%d)\n", modenum); - - // if mode 0 (windowed) we must not be fullscreen already, - // if other mode, check it is not mode 0 and existing - if (modenum >= numvidmodes) - { - if (!pcurrentmode) - modenum = 0; // revert to the default base vid mode - else - I_Error("Unknown video mode: %d\n", modenum); - } - else if (bAppFullScreen && modenum < NUMSPECIALMODES) - I_Error("Tried to switch from fullscreen back to windowed mode %d\n", modenum); - - pnewmode = VID_GetModePtr(modenum); - - // dont switch to the same display mode - if (pnewmode == pcurrentmode) - return 1; - - // initialize the new mode - pcurrentmode = pnewmode; - - // initialize vidbuffer size for setmode - vid.width = pcurrentmode->width; - vid.height = pcurrentmode->height; - vid.rowbytes = pcurrentmode->rowbytes; - vid.bpp = pcurrentmode->bytesperpixel; - if (modenum) // if not 320x200 windowed mode, it's actually a hack - { - if (rendermode == render_opengl) - { - // don't accept depth < 16 for OpenGL mode (too much ugly) - if (cv_scr_depth.value < 16) - CV_SetValue(&cv_scr_depth, 16); - vid.bpp = cv_scr_depth.value/8; - vid.u.windowed = (bWinParm || !cv_fullscreen.value); - pcurrentmode->bytesperpixel = vid.bpp; - pcurrentmode->windowed = vid.u.windowed; - } - } - - vstat = (*pcurrentmode->setmode)(&vid, pcurrentmode); - - if (vstat == -1) - I_Error("Not enough mem for VID_SetMode\n"); - else if (vstat == -2) - I_Error("Couldn't set video mode because it failed the test\n"); - else if (vstat == -3) - I_Error("Couldn't set video mode because it failed the change?\n"); - else if (!vstat) - I_Error("Couldn't set video mode %d (%dx%d %d bits)\n", modenum, vid.width, vid.height, (vid.bpp*8));// hardware could not setup mode - else - CONS_Printf(M_GetText("Mode changed to %d (%s)\n"), modenum, pcurrentmode->name); - - vid.modenum = modenum; - - // tell game engine to recalc all tables and realloc buffers based on new values - vid.recalc = 1; - - if (modenum < NUMSPECIALMODES) - { - // we are in startup windowed mode - bAppFullScreen = FALSE; - bDIBMode = TRUE; - } - else - { - // we switch to fullscreen - bAppFullScreen = TRUE; - bDIBMode = FALSE; -#ifdef HWRENDER - if (rendermode != render_soft) - { - // purge all patch graphics stored in software format - //Z_FreeTags (PU_PURGELEVEL, PU_PURGELEVEL+100); - HWR_Startup(); - } -#endif - } - - I_RestartSysMouse(); - return 1; -} - -boolean VID_CheckRenderer(void) -{ - return false; -} - -void VID_CheckGLLoaded(rendermode_t oldrender) -{ - (void)oldrender; -} - -// ======================================================================== -// Free the video buffer of the last video mode, -// allocate a new buffer for the video mode to set. -// ======================================================================== -static BOOL VID_FreeAndAllocVidbuffer(viddef_t *lvid) -{ - const DWORD vidbuffersize = (lvid->width * lvid->height * lvid->bpp * NUMSCREENS); - - // free allocated buffer for previous video mode - if (lvid->buffer) - GlobalFree(lvid->buffer); - - // allocate & clear the new screen buffer - lvid->buffer = GlobalAlloc(GPTR, vidbuffersize); - if (!lvid->buffer) - return FALSE; - - ZeroMemory(lvid->buffer, vidbuffersize); - I_OutputMsg("VID_FreeAndAllocVidbuffer done, vidbuffersize: %x\n",(UINT32)vidbuffersize); - - return TRUE; -} - -// ======================================================================== -// Set video mode routine for DirectDraw display modes -// Out: 1 ok, -// 0 hardware could not set mode, -// -1 no mem -// ======================================================================== -static INT32 WINAPI VID_SetDirectDrawMode(viddef_t *lvid, vmode_t *currentmode) -{ - UNREFERENCED_PARAMETER(currentmode); - - I_OutputMsg("VID_SetDirectDrawMode...\n"); - - - // DD modes do double-buffer page flipping, but the game engine doesn't need this.. - lvid->u.numpages = 2; - - // release ddraw surfaces etc.. - ReleaseChtuff(); - - // clean up any old vid buffer lying around, alloc new if needed - if (!VID_FreeAndAllocVidbuffer(lvid)) - return -1; // no mem - - // should clear video mem here - - // note use lvid->bpp instead of 8...will this be needed? will we support other than 256color - // in software ? - if (!InitDirectDrawe(hWndMain, lvid->width, lvid->height, 8, TRUE)) // TRUE currently always full screen - return 0; // could not set mode - - // this is NOT used with DirectDraw modes, game engine should never use this directly - // but rather render to memory bitmap buffer - lvid->direct = NULL; - - if (!cv_stretch.value && fabsf((float)vid.width/vid.height - ((float)BASEVIDWIDTH/BASEVIDHEIGHT)) > 1.0E-36f) - vid.height = (int)(vid.width * ((float)BASEVIDHEIGHT/BASEVIDWIDTH));// Adjust the height to match - - return 1; -} - -// ======================================================================== -// VIDEO MODE CONSOLE COMMANDS -// ======================================================================== - -// vid_nummodes -// -static void VID_Command_NumModes_f(void) -{ - CONS_Printf(M_GetText("%d video mode(s) available(s)\n"), VID_NumModes()); -} - -// vid_modeinfo -// -static void VID_Command_ModeInfo_f(void) -{ - vmode_t *pv; - int modenum; - - if (COM_Argc() != 2) - modenum = vid.modenum; // describe the current mode - else - modenum = atoi(COM_Argv(1)); // the given mode number - - if (modenum >= VID_NumModes() - || (!bWinParm && modenum < NUMSPECIALMODES)) // don't accept the windowed modes - { - CONS_Printf(M_GetText("Video mode not present\n")); - return; - } - - pv = VID_GetModePtr(modenum); - - CONS_Printf("\x82" "%s\n", VID_GetModeName(modenum)); - CONS_Printf(M_GetText("width: %d\nheight: %d\n"), - pv->width, pv->height); - if (rendermode == render_soft) - CONS_Printf(M_GetText("bytes per scanline: %d\nbytes per pixel: %d\nnumpages: %d\n"), - pv->rowbytes, pv->bytesperpixel, pv->numpages); -} - -// vid_modelist -// -static void VID_Command_ModeList_f(void) -{ - int i, numodes; - const char *pinfo; - vmode_t *pv; - - numodes = VID_NumModes(); - - // hide windowed modes unless using them - i = (!bWinParm) ? NUMSPECIALMODES : 0; - - for (; i < numodes; i++) - { - pv = VID_GetModePtr(i); - pinfo = VID_GetModeName(i); - - if (pv->bytesperpixel == 1) - CONS_Printf("%d: %s\n", i, pinfo); - else - CONS_Printf("%d: %s (hicolor)\n", i, pinfo); - } -} - -// vid_mode -// -static void VID_Command_Mode_f(void) -{ - int modenum; - - if (COM_Argc() != 2) - { - CONS_Printf(M_GetText("vid_mode : set video mode, current video mode %i\n"), vid.modenum); - return; - } - - modenum = atoi(COM_Argv(1)); - - if (modenum >= VID_NumModes() - || (!bWinParm && modenum < NUMSPECIALMODES)) // don't accept the windowed modes - CONS_Printf(M_GetText("Video mode not present\n")); - else - setmodeneeded = modenum + 1; // request vid mode change -} -#endif diff --git a/src/y_inter.c b/src/y_inter.c index 6d3ec2cb5..6e7d362a7 100644 --- a/src/y_inter.c +++ b/src/y_inter.c @@ -1,6 +1,6 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- -// Copyright (C) 2004-2021 by Sonic Team Junior. +// Copyright (C) 2004-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -38,6 +38,7 @@ #include "lua_hook.h" // IntermissionThinker hook #include "lua_hud.h" +#include "lua_hudlib_drawlist.h" #ifdef HWRENDER #include "hardware/hw_main.h" @@ -83,6 +84,10 @@ typedef union INT32 passedx3; INT32 passedx4; + INT32 emeraldbounces; + INT32 emeraldmomy; + INT32 emeraldy; + y_bonus_t bonuses[2]; patch_t *bonuspatches[2]; @@ -161,6 +166,8 @@ static INT32 endtic = -1; intertype_t intertype = int_none; intertype_t intermissiontypes[NUMGAMETYPES]; +static huddrawlist_h luahuddrawlist_intermission; + static void Y_RescaleScreenBuffer(void); static void Y_AwardCoopBonuses(void); static void Y_AwardSpecialStageBonus(void); @@ -212,7 +219,7 @@ static void Y_IntermissionTokenDrawer(void) calc = (lowy - y)*2; if (calc > 0) - V_DrawCroppedPatch(32<width, calc); + V_DrawCroppedPatch(32<width<interscreen[0] != '#') interpic = W_CachePatchName(mapheaderinfo[gamemap-1]->interscreen, PU_PATCH); + else // no interscreen? use default background + bgpatch = W_CachePatchName("INTERSCR", PU_PATCH); break; } case int_spec: @@ -255,12 +262,11 @@ void Y_LoadIntermissionData(void) data.spec.pscore = W_CachePatchName("YB_SCORE", PU_PATCH); data.spec.pcontinues = W_CachePatchName("YB_CONTI", PU_PATCH); - // get background tile - bgtile = W_CachePatchName("SPECTILE", PU_PATCH); - // grab an interscreen if appropriate if (mapheaderinfo[gamemap-1]->interscreen[0] != '#') interpic = W_CachePatchName(mapheaderinfo[gamemap-1]->interscreen, PU_PATCH); + else // no interscreen? use default background + bgtile = W_CachePatchName("SPECTILE", PU_PATCH); break; } case int_ctf: @@ -430,7 +436,13 @@ void Y_IntermissionDrawer(void) else if (bgtile) V_DrawPatchFill(bgtile); - LUAh_IntermissionHUD(intertype == int_spec && stagefailed); + if (renderisnewtic) + { + LUA_HUD_ClearDrawList(luahuddrawlist_intermission); + LUA_HUDHOOK(intermission, luahuddrawlist_intermission); + } + LUA_HUD_DrawList(luahuddrawlist_intermission); + if (!LUA_HudEnabled(hud_intermissiontally)) goto skiptallydrawer; @@ -647,7 +659,6 @@ void Y_IntermissionDrawer(void) } // draw the emeralds - //if (intertic & 1) if (LUA_HudEnabled(hud_intermissionemeralds)) { boolean drawthistic = !(ALL7EMERALDS(emeralds) && (intertic & 1)); @@ -664,10 +675,6 @@ void Y_IntermissionDrawer(void) } else if (em < 7) { - static UINT8 emeraldbounces = 0; - static INT32 emeraldmomy = 20; - static INT32 emeraldy = -40; - if (drawthistic) for (i = 0; i < 7; ++i) { @@ -678,45 +685,15 @@ void Y_IntermissionDrawer(void) emeraldx = 152 + (em-3)*28; - if (intertic <= 1) + if (intertic > 1) { - emeraldbounces = 0; - emeraldmomy = 20; - emeraldy = -40; - } - else - { - if (!stagefailed) + if (stagefailed && data.spec.emeraldy < (vid.height/vid.dupy)+16) { - if (emeraldbounces < 3) - { - emeraldy += (++emeraldmomy); - if (emeraldy > 74) - { - S_StartSound(NULL, sfx_tink); // tink - emeraldbounces++; - emeraldmomy = -(emeraldmomy/2); - emeraldy = 74; - } - } - } - else - { - if (emeraldy < (vid.height/vid.dupy)+16) - { - emeraldy += (++emeraldmomy); - emeraldx += intertic - 6; - } - if (emeraldbounces < 1 && emeraldy > 74) - { - S_StartSound(NULL, sfx_shldls); // nope - emeraldbounces++; - emeraldmomy = -(emeraldmomy/2); - emeraldy = 74; - } + emeraldx += intertic - 6; } + if (drawthistic) - V_DrawScaledPatch(emeraldx, emeraldy, 0, emeraldpics[0][em]); + V_DrawScaledPatch(emeraldx, data.spec.emeraldy, 0, emeraldpics[0][em]); } } } @@ -1021,7 +998,8 @@ void Y_Ticker(void) if (paused || P_AutoPause()) return; - LUAh_IntermissionThinker(intertype == int_spec && stagefailed); + LUA_HookBool(intertype == int_spec && stagefailed, + HOOK(IntermissionThinker)); intertic++; @@ -1114,12 +1092,14 @@ void Y_Ticker(void) S_StartSound(NULL, (gottoken ? sfx_token : sfx_chchng)); // cha-ching! // Update when done with tally - if ((!modifiedgame || savemoddata) && !(netgame || multiplayer) && !demoplayback) + if (!demoplayback) { - if (M_UpdateUnlockablesAndExtraEmblems()) + M_SilentUpdateUnlockablesAndEmblems(serverGamedata); + + if (M_UpdateUnlockablesAndExtraEmblems(clientGamedata)) S_StartSound(NULL, sfx_s3k68); - G_SaveGameData(); + G_SaveGameData(clientGamedata); } } else if (!(intertic & 1)) @@ -1154,6 +1134,50 @@ void Y_Ticker(void) tallydonetic = -1; } + // emerald bounce + if (dedicated || !LUA_HudEnabled(hud_intermissionemeralds)) + { + // dedicated servers don't need this, especially since it crashes when stagefailed + // also skip this if Lua disabled intermission emeralds, so it doesn't play sounds + } + else if (intertic <= 1) + { + data.spec.emeraldbounces = 0; + data.spec.emeraldmomy = 20; + data.spec.emeraldy = -40; + } + else if (P_GetNextEmerald() < 7) + { + if (!stagefailed) + { + if (data.spec.emeraldbounces < 3) + { + data.spec.emeraldy += (++data.spec.emeraldmomy); + if (data.spec.emeraldy > 74) + { + S_StartSound(NULL, sfx_tink); // tink + data.spec.emeraldbounces++; + data.spec.emeraldmomy = -(data.spec.emeraldmomy/2); + data.spec.emeraldy = 74; + } + } + } + else + { + if (data.spec.emeraldy < (vid.height/vid.dupy)+16) + { + data.spec.emeraldy += (++data.spec.emeraldmomy); + } + if (data.spec.emeraldbounces < 1 && data.spec.emeraldy > 74) + { + S_StartSound(NULL, sfx_shldls); // nope + data.spec.emeraldbounces++; + data.spec.emeraldmomy = -(data.spec.emeraldmomy/2); + data.spec.emeraldy = 74; + } + } + } + if (intertic < 2*TICRATE) // TWO second pause before tally begins, thank you mazmazz return; @@ -1206,12 +1230,14 @@ void Y_Ticker(void) S_StartSound(NULL, (gottoken ? sfx_token : sfx_chchng)); // cha-ching! // Update when done with tally - if ((!modifiedgame || savemoddata) && !(netgame || multiplayer) && !demoplayback) + if (!demoplayback) { - if (M_UpdateUnlockablesAndExtraEmblems()) + M_SilentUpdateUnlockablesAndEmblems(serverGamedata); + + if (M_UpdateUnlockablesAndExtraEmblems(clientGamedata)) S_StartSound(NULL, sfx_s3k68); - G_SaveGameData(); + G_SaveGameData(clientGamedata); } } else if (!(intertic & 1)) @@ -1583,6 +1609,9 @@ void Y_StartIntermission(void) default: break; } + + LUA_HUD_DestroyDrawList(luahuddrawlist_intermission); + luahuddrawlist_intermission = LUA_HUD_CreateDrawList(); } // @@ -2023,7 +2052,7 @@ static void Y_AwardCoopBonuses(void) for (i = 0; i < MAXPLAYERS; ++i) { - if (!playeringame[i] || players[i].lives < 1) // not active or game over + if (!playeringame[i] || players[i].lives < 1 || players[i].bot == BOT_2PAI || players[i].bot == BOT_2PHUMAN) // not active, game over or tails bot bonusnum = 0; // all null else bonusnum = mapheaderinfo[prevmap]->bonustype + 1; // -1 is none @@ -2073,7 +2102,7 @@ static void Y_AwardSpecialStageBonus(void) { oldscore = players[i].score; - if (!playeringame[i] || players[i].lives < 1) // not active or game over + if (!playeringame[i] || players[i].lives < 1 || players[i].bot == BOT_2PAI || players[i].bot == BOT_2PHUMAN) // not active, game over or tails bot { Y_SetNullBonus(&players[i], &localbonuses[0]); Y_SetNullBonus(&players[i], &localbonuses[1]); diff --git a/src/y_inter.h b/src/y_inter.h index 871142858..6b249ca0d 100644 --- a/src/y_inter.h +++ b/src/y_inter.h @@ -1,6 +1,6 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- -// Copyright (C) 2004-2021 by Sonic Team Junior. +// Copyright (C) 2004-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/z_zone.c b/src/z_zone.c index 34ff3d37e..11c4bcb2c 100644 --- a/src/z_zone.c +++ b/src/z_zone.c @@ -1,7 +1,7 @@ // SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 2006 by Graue. -// Copyright (C) 2006-2021 by Sonic Team Junior. +// Copyright (C) 2006-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -106,20 +106,20 @@ static void Command_Memdump_f(void); */ void Z_Init(void) { - UINT32 total, memfree; + size_t total, memfree; memset(&head, 0x00, sizeof(head)); head.next = head.prev = &head; memfree = I_GetFreeMem(&total)>>20; - CONS_Printf("System memory: %uMB - Free: %uMB\n", total>>20, memfree); + CONS_Printf("System memory: %sMB - Free: %sMB\n", sizeu1(total>>20), sizeu2(memfree)); // Note: This allocates memory. Watch out. - COM_AddCommand("memfree", Command_Memfree_f); + COM_AddCommand("memfree", Command_Memfree_f, COM_LUA); #ifdef ZDEBUG - COM_AddCommand("memdump", Command_Memdump_f); + COM_AddCommand("memdump", Command_Memdump_f, COM_LUA); #endif } @@ -791,7 +791,7 @@ size_t Z_TagsUsage(INT32 lowtag, INT32 hightag) */ static void Command_Memfree_f(void) { - UINT32 freebytes, totalbytes; + size_t freebytes, totalbytes; Z_CheckHeap(-1); CONS_Printf("\x82%s", M_GetText("Memory Info\n")); @@ -824,8 +824,8 @@ static void Command_Memfree_f(void) CONS_Printf("\x82%s", M_GetText("System Memory Info\n")); freebytes = I_GetFreeMem(&totalbytes); - CONS_Printf(M_GetText(" Total physical memory: %7u KB\n"), totalbytes>>10); - CONS_Printf(M_GetText("Available physical memory: %7u KB\n"), freebytes>>10); + CONS_Printf(M_GetText(" Total physical memory: %s KB\n"), sizeu1(totalbytes>>10)); + CONS_Printf(M_GetText("Available physical memory: %s KB\n"), sizeu1(freebytes>>10)); } #ifdef ZDEBUG diff --git a/src/z_zone.h b/src/z_zone.h index be55bf994..c3cd4f011 100644 --- a/src/z_zone.h +++ b/src/z_zone.h @@ -2,7 +2,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. -// Copyright (C) 1999-2021 by Sonic Team Junior. +// Copyright (C) 1999-2023 by Sonic Team Junior. // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -39,6 +39,7 @@ enum // Tags < PU_LEVEL are not purged until freed explicitly. PU_STATIC = 1, // static entire execution time PU_LUA = 2, // static entire execution time -- used by lua so it doesn't get caught in loops forever + PU_PERFSTATS = 3, // static between changes to ps_samplesize cvar PU_SOUND = 11, // static while playing PU_MUSIC = 12, // static while playing diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt new file mode 100644 index 000000000..7aff16601 --- /dev/null +++ b/thirdparty/CMakeLists.txt @@ -0,0 +1,529 @@ +macro(export) +endmacro() + +if(SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES) + set(SRB2_INTERNAL_LIBRARY_TYPE SHARED) + set(NOT_SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES OFF) +else() + set(SRB2_INTERNAL_LIBRARY_TYPE STATIC) + set(NOT_SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES ON) +endif() + + +if(NOT "${SRB2_CONFIG_SYSTEM_LIBRARIES}") + CPMAddPackage( + NAME SDL2 + VERSION 2.24.2 + URL "https://github.com/libsdl-org/SDL/archive/refs/tags/release-2.24.2.zip" + EXCLUDE_FROM_ALL ON + OPTIONS + "BUILD_SHARED_LIBS ${SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES}" + "SDL_SHARED ${SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES}" + "SDL_STATIC ${NOT_SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES}" + "SDL_TEST OFF" + "SDL2_DISABLE_SDL2MAIN ON" + "SDL2_DISABLE_INSTALL ON" + ) +endif() + +if(NOT "${SRB2_CONFIG_SYSTEM_LIBRARIES}") + CPMAddPackage( + NAME SDL2_mixer + VERSION 2.6.2 + URL "https://github.com/libsdl-org/SDL_mixer/archive/refs/tags/release-2.6.2.zip" + EXCLUDE_FROM_ALL ON + OPTIONS + "BUILD_SHARED_LIBS ${SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES}" + "SDL2MIXER_INSTALL OFF" + "SDL2MIXER_DEPS_SHARED OFF" + "SDL2MIXER_SAMPLES OFF" + "SDL2MIXER_VENDORED ON" + "SDL2MIXER_FLAC ON" + "SDL2MIXER_FLAC_LIBFLAC OFF" + "SDL2MIXER_FLAC_DRFLAC ON" + "SDL2MIXER_MOD OFF" + "SDL2MIXER_MP3 ON" + "SDL2MIXER_MP3_DRMP3 ON" + "SDL2MIXER_MIDI ON" + "SDL2MIXER_OPUS OFF" + "SDL2MIXER_VORBIS STB" + "SDL2MIXER_WAVE ON" + ) +endif() + +if(NOT "${SRB2_CONFIG_SYSTEM_LIBRARIES}") + CPMAddPackage( + NAME ZLIB + VERSION 1.2.13 + URL "https://github.com/madler/zlib/archive/refs/tags/v1.2.13.zip" + EXCLUDE_FROM_ALL + DOWNLOAD_ONLY YES + ) + if(ZLIB_ADDED) + set(ZLIB_SRCS + crc32.h + deflate.h + gzguts.h + inffast.h + inffixed.h + inflate.h + inftrees.h + trees.h + zutil.h + + adler32.c + compress.c + crc32.c + deflate.c + gzclose.c + gzlib.c + gzread.c + gzwrite.c + inflate.c + infback.c + inftrees.c + inffast.c + trees.c + uncompr.c + zutil.c + ) + list(TRANSFORM ZLIB_SRCS PREPEND "${ZLIB_SOURCE_DIR}/") + + configure_file("${ZLIB_SOURCE_DIR}/zlib.pc.cmakein" "${ZLIB_BINARY_DIR}/zlib.pc" @ONLY) + configure_file("${ZLIB_SOURCE_DIR}/zconf.h.cmakein" "${ZLIB_BINARY_DIR}/include/zconf.h" @ONLY) + configure_file("${ZLIB_SOURCE_DIR}/zlib.h" "${ZLIB_BINARY_DIR}/include/zlib.h" @ONLY) + + add_library(ZLIB ${SRB2_INTERNAL_LIBRARY_TYPE} ${ZLIB_SRCS}) + set_target_properties(ZLIB PROPERTIES + VERSION 1.2.13 + OUTPUT_NAME "z" + ) + target_include_directories(ZLIB PRIVATE "${ZLIB_SOURCE_DIR}") + target_include_directories(ZLIB PUBLIC "${ZLIB_BINARY_DIR}/include") + if(MSVC) + target_compile_definitions(ZLIB PRIVATE -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE) + endif() + add_library(ZLIB::ZLIB ALIAS ZLIB) + endif() +endif() + +if(NOT "${SRB2_CONFIG_SYSTEM_LIBRARIES}") + CPMAddPackage( + NAME png + VERSION 1.6.38 + URL "https://github.com/glennrp/libpng/archive/refs/tags/v1.6.38.zip" + # png cmake build is broken on msys/mingw32 + DOWNLOAD_ONLY YES + ) + + if(png_ADDED) + # Since png's cmake build is broken, we're going to create a target manually + set( + PNG_SOURCES + + png.h + pngconf.h + + pngpriv.h + pngdebug.h + pnginfo.h + pngstruct.h + + png.c + pngerror.c + pngget.c + pngmem.c + pngpread.c + pngread.c + pngrio.c + pngrtran.c + pngrutil.c + pngset.c + pngtrans.c + pngwio.c + pngwrite.c + pngwtran.c + pngwutil.c + ) + list(TRANSFORM PNG_SOURCES PREPEND "${png_SOURCE_DIR}/") + + add_custom_command( + OUTPUT "${png_BINARY_DIR}/include/png.h" "${png_BINARY_DIR}/include/pngconf.h" + COMMAND ${CMAKE_COMMAND} -E copy "${png_SOURCE_DIR}/png.h" "${png_SOURCE_DIR}/pngconf.h" "${png_BINARY_DIR}/include" + DEPENDS "${png_SOURCE_DIR}/png.h" "${png_SOURCE_DIR}/pngconf.h" + VERBATIM + ) + add_custom_command( + OUTPUT "${png_BINARY_DIR}/include/pnglibconf.h" + COMMAND ${CMAKE_COMMAND} -E copy "${png_SOURCE_DIR}/scripts/pnglibconf.h.prebuilt" "${png_BINARY_DIR}/include/pnglibconf.h" + DEPENDS "${png_SOURCE_DIR}/scripts/pnglibconf.h.prebuilt" + VERBATIM + ) + list( + APPEND PNG_SOURCES + "${png_BINARY_DIR}/include/png.h" + "${png_BINARY_DIR}/include/pngconf.h" + "${png_BINARY_DIR}/include/pnglibconf.h" + ) + add_library(png "${SRB2_INTERNAL_LIBRARY_TYPE}" ${PNG_SOURCES}) + + # Disable ARM NEON since having it automatic breaks libpng external build on clang for some reason + target_compile_definitions(png PRIVATE -DPNG_ARM_NEON_OPT=0) + + # The png includes need to be available to consumers + target_include_directories(png PUBLIC "${png_BINARY_DIR}/include") + + # ... and these also need to be present only for png build + target_include_directories(png PRIVATE "${ZLIB_SOURCE_DIR}") + target_include_directories(png PRIVATE "${ZLIB_BINARY_DIR}") + target_include_directories(png PRIVATE "${png_BINARY_DIR}") + + target_link_libraries(png PRIVATE ZLIB::ZLIB) + add_library(PNG::PNG ALIAS png) + endif() +endif() + +if(NOT "${SRB2_CONFIG_SYSTEM_LIBRARIES}") + set( + internal_curl_options + + "BUILD_CURL_EXE OFF" + "BUILD_SHARED_LIBS ${SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES}" + "CURL_DISABLE_TESTS ON" + "HTTP_ONLY ON" + "CURL_DISABLE_CRYPTO_AUTH ON" + "CURL_DISABLE_NTLM ON" + "ENABLE_MANUAL OFF" + "ENABLE_THREADED_RESOLVER OFF" + "CURL_USE_LIBPSL OFF" + "CURL_USE_LIBSSH2 OFF" + "USE_LIBIDN2 OFF" + "CURL_ENABLE_EXPORT_TARGET OFF" + ) + if(${CMAKE_SYSTEM} MATCHES Windows) + list(APPEND internal_curl_options "CURL_USE_OPENSSL OFF") + list(APPEND internal_curl_options "CURL_USE_SCHANNEL ON") + endif() + if(${CMAKE_SYSTEM} MATCHES Darwin) + list(APPEND internal_curl_options "CURL_USE_OPENSSL OFF") + list(APPEND internal_curl_options "CURL_USE_SECTRANSP ON") + endif() + if(${CMAKE_SYSTEM} MATCHES Linux) + list(APPEND internal_curl_options "CURL_USE_OPENSSL ON") + endif() + + CPMAddPackage( + NAME curl + VERSION 7.86.0 + URL "https://github.com/curl/curl/archive/refs/tags/curl-7_86_0.zip" + EXCLUDE_FROM_ALL ON + OPTIONS ${internal_curl_options} + ) +endif() + +if(NOT "${SRB2_CONFIG_SYSTEM_LIBRARIES}") + CPMAddPackage( + NAME openmpt + VERSION 0.4.30 + URL "https://github.com/OpenMPT/openmpt/archive/refs/tags/libopenmpt-0.4.30.zip" + DOWNLOAD_ONLY ON + ) + + if(openmpt_ADDED) + set( + openmpt_SOURCES + + # minimp3 + # -DMPT_WITH_MINIMP3 + include/minimp3/minimp3.c + + common/mptStringParse.cpp + common/mptLibrary.cpp + common/Logging.cpp + common/Profiler.cpp + common/version.cpp + common/mptCPU.cpp + common/ComponentManager.cpp + common/mptOS.cpp + common/serialization_utils.cpp + common/mptStringFormat.cpp + common/FileReader.cpp + common/mptWine.cpp + common/mptPathString.cpp + common/mptAlloc.cpp + common/mptUUID.cpp + common/mptTime.cpp + common/mptString.cpp + common/mptFileIO.cpp + common/mptStringBuffer.cpp + common/mptRandom.cpp + common/mptIO.cpp + common/misc_util.cpp + + common/mptCRC.h + common/mptLibrary.h + common/mptIO.h + common/version.h + common/stdafx.h + common/ComponentManager.h + common/Endianness.h + common/mptStringFormat.h + common/mptMutex.h + common/mptUUID.h + common/mptExceptionText.h + common/BuildSettings.h + common/mptAlloc.h + common/mptTime.h + common/FileReaderFwd.h + common/Logging.h + common/mptException.h + common/mptWine.h + common/mptStringBuffer.h + common/misc_util.h + common/mptBaseMacros.h + common/mptMemory.h + common/mptFileIO.h + common/serialization_utils.h + common/mptSpan.h + common/mptThread.h + common/FlagSet.h + common/mptString.h + common/mptStringParse.h + common/mptBaseUtils.h + common/mptRandom.h + common/CompilerDetect.h + common/FileReader.h + common/mptAssert.h + common/mptPathString.h + common/Profiler.h + common/mptOS.h + common/mptBaseTypes.h + common/mptCPU.h + common/mptBufferIO.h + common/versionNumber.h + + soundlib/WAVTools.cpp + soundlib/ITTools.cpp + soundlib/AudioCriticalSection.cpp + soundlib/Load_stm.cpp + soundlib/MixerLoops.cpp + soundlib/Load_dbm.cpp + soundlib/ModChannel.cpp + soundlib/Load_gdm.cpp + soundlib/Snd_fx.cpp + soundlib/Load_mid.cpp + soundlib/mod_specifications.cpp + soundlib/Snd_flt.cpp + soundlib/Load_psm.cpp + soundlib/Load_far.cpp + soundlib/patternContainer.cpp + soundlib/Load_med.cpp + soundlib/Load_dmf.cpp + soundlib/Paula.cpp + soundlib/modcommand.cpp + soundlib/Message.cpp + soundlib/SoundFilePlayConfig.cpp + soundlib/Load_uax.cpp + soundlib/plugins/PlugInterface.cpp + soundlib/plugins/LFOPlugin.cpp + soundlib/plugins/PluginManager.cpp + soundlib/plugins/DigiBoosterEcho.cpp + soundlib/plugins/dmo/DMOPlugin.cpp + soundlib/plugins/dmo/Flanger.cpp + soundlib/plugins/dmo/Distortion.cpp + soundlib/plugins/dmo/ParamEq.cpp + soundlib/plugins/dmo/Gargle.cpp + soundlib/plugins/dmo/I3DL2Reverb.cpp + soundlib/plugins/dmo/Compressor.cpp + soundlib/plugins/dmo/WavesReverb.cpp + soundlib/plugins/dmo/Echo.cpp + soundlib/plugins/dmo/Chorus.cpp + soundlib/Load_ams.cpp + soundlib/tuningbase.cpp + soundlib/ContainerUMX.cpp + soundlib/Load_ptm.cpp + soundlib/ContainerXPK.cpp + soundlib/SampleFormatMP3.cpp + soundlib/tuning.cpp + soundlib/Sndfile.cpp + soundlib/ContainerMMCMP.cpp + soundlib/Load_amf.cpp + soundlib/Load_669.cpp + soundlib/modsmp_ctrl.cpp + soundlib/Load_mtm.cpp + soundlib/OggStream.cpp + soundlib/Load_plm.cpp + soundlib/Tables.cpp + soundlib/Load_c67.cpp + soundlib/Load_mod.cpp + soundlib/Load_sfx.cpp + soundlib/Sndmix.cpp + soundlib/load_j2b.cpp + soundlib/ModSequence.cpp + soundlib/SampleFormatFLAC.cpp + soundlib/ModInstrument.cpp + soundlib/Load_mo3.cpp + soundlib/ModSample.cpp + soundlib/Dlsbank.cpp + soundlib/Load_itp.cpp + soundlib/UpgradeModule.cpp + soundlib/MIDIMacros.cpp + soundlib/ContainerPP20.cpp + soundlib/RowVisitor.cpp + soundlib/Load_imf.cpp + soundlib/SampleFormatVorbis.cpp + soundlib/Load_dsm.cpp + soundlib/Load_mt2.cpp + soundlib/MixerSettings.cpp + soundlib/S3MTools.cpp + soundlib/Load_xm.cpp + soundlib/MIDIEvents.cpp + soundlib/pattern.cpp + soundlib/Load_digi.cpp + soundlib/Load_s3m.cpp + soundlib/tuningCollection.cpp + soundlib/SampleIO.cpp + soundlib/Dither.cpp + soundlib/Load_mdl.cpp + soundlib/OPL.cpp + soundlib/WindowedFIR.cpp + soundlib/SampleFormats.cpp + soundlib/Load_wav.cpp + soundlib/Load_it.cpp + soundlib/UMXTools.cpp + soundlib/Load_stp.cpp + soundlib/Load_okt.cpp + soundlib/Load_ult.cpp + soundlib/MixFuncTable.cpp + soundlib/SampleFormatOpus.cpp + soundlib/Fastmix.cpp + soundlib/Tagging.cpp + soundlib/ITCompression.cpp + soundlib/Load_dtm.cpp + soundlib/MPEGFrame.cpp + soundlib/XMTools.cpp + soundlib/SampleFormatMediaFoundation.cpp + soundlib/InstrumentExtensions.cpp + + soundlib/MixerInterface.h + soundlib/SoundFilePlayConfig.h + soundlib/ModSample.h + soundlib/MIDIEvents.h + soundlib/ModSampleCopy.h + soundlib/patternContainer.h + soundlib/ChunkReader.h + soundlib/ITCompression.h + soundlib/Dither.h + soundlib/S3MTools.h + soundlib/MPEGFrame.h + soundlib/WAVTools.h + soundlib/mod_specifications.h + soundlib/ITTools.h + soundlib/RowVisitor.h + soundlib/plugins/PluginMixBuffer.h + soundlib/plugins/PluginStructs.h + soundlib/plugins/LFOPlugin.h + soundlib/plugins/PlugInterface.h + soundlib/plugins/DigiBoosterEcho.h + soundlib/plugins/OpCodes.h + soundlib/plugins/dmo/Echo.h + soundlib/plugins/dmo/I3DL2Reverb.h + soundlib/plugins/dmo/WavesReverb.h + soundlib/plugins/dmo/ParamEq.h + soundlib/plugins/dmo/Gargle.h + soundlib/plugins/dmo/DMOPlugin.h + soundlib/plugins/dmo/Chorus.h + soundlib/plugins/dmo/Compressor.h + soundlib/plugins/dmo/Distortion.h + soundlib/plugins/dmo/Flanger.h + soundlib/plugins/PluginManager.h + soundlib/SampleIO.h + soundlib/Container.h + soundlib/ModSequence.h + soundlib/UMXTools.h + soundlib/Message.h + soundlib/modcommand.h + soundlib/XMTools.h + soundlib/Snd_defs.h + soundlib/MixFuncTable.h + soundlib/pattern.h + soundlib/modsmp_ctrl.h + soundlib/Tagging.h + soundlib/tuningcollection.h + soundlib/Mixer.h + soundlib/FloatMixer.h + soundlib/AudioCriticalSection.h + soundlib/Tables.h + soundlib/tuningbase.h + soundlib/WindowedFIR.h + soundlib/Sndfile.h + soundlib/Paula.h + soundlib/ModInstrument.h + soundlib/Dlsbank.h + soundlib/IntMixer.h + soundlib/OPL.h + soundlib/Resampler.h + soundlib/ModChannel.h + soundlib/MixerSettings.h + soundlib/AudioReadTarget.h + soundlib/MixerLoops.h + soundlib/tuning.h + soundlib/MIDIMacros.h + soundlib/OggStream.h + soundlib/Loaders.h + soundlib/BitReader.h + soundlib/opal.h + + sounddsp/AGC.cpp + sounddsp/EQ.cpp + sounddsp/DSP.cpp + sounddsp/Reverb.cpp + sounddsp/Reverb.h + sounddsp/EQ.h + sounddsp/DSP.h + sounddsp/AGC.h + + libopenmpt/libopenmpt_c.cpp + libopenmpt/libopenmpt_cxx.cpp + libopenmpt/libopenmpt_impl.cpp + libopenmpt/libopenmpt_ext_impl.cpp + ) + list(TRANSFORM openmpt_SOURCES PREPEND "${openmpt_SOURCE_DIR}/") + + # -DLIBOPENMPT_BUILD + configure_file("openmpt_svn_version.h" "svn_version.h") + add_library(openmpt "${SRB2_INTERNAL_LIBRARY_TYPE}" ${openmpt_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/svn_version.h) + if("${CMAKE_C_COMPILER_ID}" STREQUAL GNU OR "${CMAKE_C_COMPILER_ID}" STREQUAL Clang OR "${CMAKE_C_COMPILER_ID}" STREQUAL AppleClang) + target_compile_options(openmpt PRIVATE "-g0") + endif() + if("${CMAKE_SYSTEM_NAME}" STREQUAL Windows AND "${CMAKE_C_COMPILER_ID}" STREQUAL MSVC) + target_link_libraries(openmpt PRIVATE Rpcrt4) + endif() + target_compile_features(openmpt PRIVATE cxx_std_11) + target_compile_definitions(openmpt PRIVATE -DLIBOPENMPT_BUILD) + + target_include_directories(openmpt PRIVATE "${openmpt_SOURCE_DIR}/common") + target_include_directories(openmpt PRIVATE "${openmpt_SOURCE_DIR}/src") + target_include_directories(openmpt PRIVATE "${openmpt_SOURCE_DIR}/include") + target_include_directories(openmpt PRIVATE "${openmpt_SOURCE_DIR}") + target_include_directories(openmpt PRIVATE "${CMAKE_CURRENT_BINARY_DIR}") + + # I wish this wasn't necessary, but it is + target_include_directories(openmpt PUBLIC "${openmpt_SOURCE_DIR}") + endif() +endif() + +if(NOT "${SRB2_CONFIG_SYSTEM_LIBRARIES}") + CPMAddPackage( + NAME libgme + VERSION 0.6.3 + URL "https://bitbucket.org/mpyne/game-music-emu/get/e76bdc0cb916e79aa540290e6edd0c445879d3ba.zip" + EXCLUDE_FROM_ALL ON + OPTIONS + "BUILD_SHARED_LIBS ${SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES}" + "ENABLE_UBSAN OFF" + "GME_YM2612_EMU MAME" + ) + target_compile_features(gme PRIVATE cxx_std_11) + target_link_libraries(gme PRIVATE ZLIB::ZLIB) +endif() diff --git a/thirdparty/openmpt_svn_version.h b/thirdparty/openmpt_svn_version.h new file mode 100644 index 000000000..a45ed9f22 --- /dev/null +++ b/thirdparty/openmpt_svn_version.h @@ -0,0 +1,10 @@ + +#pragma once +#define OPENMPT_VERSION_SVNVERSION "17963" +#define OPENMPT_VERSION_REVISION 17963 +#define OPENMPT_VERSION_DIRTY 0 +#define OPENMPT_VERSION_MIXEDREVISIONS 0 +#define OPENMPT_VERSION_URL "https://source.openmpt.org/svn/openmpt/tags/libopenmpt-0.4.32" +#define OPENMPT_VERSION_DATE "2022-09-25T14:19:05.052596Z" +#define OPENMPT_VERSION_IS_PACKAGE 1 + diff --git a/tools/PHP/RSS1.0.php b/tools/PHP/RSS1.0.php deleted file mode 100644 index 30eb32585..000000000 --- a/tools/PHP/RSS1.0.php +++ /dev/null @@ -1,55 +0,0 @@ -'; -echo "\n"; -echo ''; -echo "\n"; -echo "\n"; -echo ' '; -echo "\n"; -echo ' SRB2 Master Server RSS Feed'; -echo "\n"; -echo ' http://srb2.servegame.org/'; -echo "\n"; -echo ' Playing around with RSS'; -echo "\n"; -//echo ' en-us'; -//echo "\n"; - $fd = fsockopen("srb2.servegame.org", 28900, $errno, $errstr, 5); -// $fd = 0; - if ($fd) - { - $buff = "000012400000"; - fwrite($fd, $buff); - while (1) - { - $content=fgets($fd, 13); // skip 13 first bytes - $content=fgets($fd, 1024); - echo "$content"; - if (feof($fd)) break; - } - fclose($fd); - } - else - { - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo "\n"; - echo ' '; - echo 'No master serverThe master server is not running'; - } -?> - \ No newline at end of file diff --git a/tools/PHP/RSS92.php b/tools/PHP/RSS92.php deleted file mode 100644 index 4dd194089..000000000 --- a/tools/PHP/RSS92.php +++ /dev/null @@ -1,37 +0,0 @@ -'; -echo "\n"; -echo ''; -echo "\n"; -echo ' '; -echo "\n"; -echo ' SRB2 Master Server RSS Feed'; -echo "\n"; -echo ' Playing around with RSS'; -echo "\n"; -echo ' http://srb2.servegame.org/'; -echo "\n"; -echo ' en-us'; -echo "\n"; - $fd = fsockopen("srb2.servegame.org", 28900, $errno, $errstr, 5); - if ($fd) - { - $buff = "000012380000"; - fwrite($fd, $buff); - while (1) - { - $content=fgets($fd, 13); // skip the next 13 bytes - $content=fgets($fd, 1024); - echo "$content"; - if (feof($fd)) break; - } - fclose($fd); - } - else - { - echo "No master serverThe master server is not running"; - } -?> - - \ No newline at end of file diff --git a/tools/PHP/index.php b/tools/PHP/index.php deleted file mode 100644 index 93bb7c92b..000000000 --- a/tools/PHP/index.php +++ /dev/null @@ -1,90 +0,0 @@ - - - - -SRB2 Master Server Status - - -
- - - - - - - - - -
-
- SRB2 logo. -
- SRB2's HomePage -
- 		-
- Chompy World logo. -
- Chompy World -
-
-
- SRB2 World logo. -
- SRB2 World -
- 		- -
-
-
- -SRB2 Master Server Status\nCurrent host: $host_addr
"; - $buff = "000043210000"; - fwrite($fd, $buff); - while (1) - { - $content=fgets($fd, 13); // skip 13 first bytes - $content=fgets($fd, 1024); - echo "$content"; - if (feof($fd)) break; - } - fclose($fd); - - } - else - { - echo 'The master server is not running
'; - echo "ERROR: $errno - $errstr
\n"; - } -?> -
-

Info:

-Win32 SRB2MSLauncher Great job, "Gregor Dick"/Oogaland of Gregorsoft Software -
-

-

Version Info:

-srb2dos.exe (DOS/Allegro/WATTCP32 version)
-srb2.exe (Windows/DirectX/FMOD version)
-srb2sdl.exe (Windows/SDL/SDL_mixer version)
-lsdlsrb2 (GNU/Linux/SDL/SDL_mixer version)
-
-Srb2win.exe v1.09.4 (use Internet search menu)
- - - diff --git a/tools/PHP/text.php b/tools/PHP/text.php deleted file mode 100644 index 282b812b7..000000000 --- a/tools/PHP/text.php +++ /dev/null @@ -1,24 +0,0 @@ - diff --git a/tools/SDL-1.2.14-gc/README b/tools/SDL-1.2.14-gc/README deleted file mode 100644 index 8ce488fa9..000000000 --- a/tools/SDL-1.2.14-gc/README +++ /dev/null @@ -1 +0,0 @@ -Once patched, run autogen.sh, configure with "./configure --without-x --disable-video-x11 --disable-video-fbcon --disable-video-aalib --disable-video-directfb --disable-video-opengl --enable-video-gc" and then compile. diff --git a/tools/SDL-1.2.14-gc/SDL-1.2.14-gc.patch b/tools/SDL-1.2.14-gc/SDL-1.2.14-gc.patch deleted file mode 100644 index 5b2b2cfa0..000000000 --- a/tools/SDL-1.2.14-gc/SDL-1.2.14-gc.patch +++ /dev/null @@ -1,641 +0,0 @@ -From 8e6ada7bc33e3cc4e1c17821ea171bf0815a505d Mon Sep 17 00:00:00 2001 -From: Alam Arias -Date: Tue, 1 Dec 2009 19:31:57 -0500 -Subject: [PATCH] SDL GC hack - ---- - configure.in | 17 ++ - include/SDL_config.h.in | 1 + - src/video/fbcon/SDL_fbgc.c | 471 +++++++++++++++++++++++++++++++++++++++++ - src/video/fbcon/SDL_fbgc.h | 35 +++ - src/video/fbcon/SDL_fbvideo.c | 10 + - src/video/fbcon/SDL_fbvideo.h | 11 + - 6 files changed, 545 insertions(+), 0 deletions(-) - create mode 100644 src/video/fbcon/SDL_fbgc.c - create mode 100644 src/video/fbcon/SDL_fbgc.h - -diff --git a/configure.in b/configure.in -index a7e9b18..a8961ba 100644 ---- a/configure.in -+++ b/configure.in -@@ -1227,6 +1227,22 @@ AC_HELP_STRING([--enable-video-fbcon], [use framebuffer console video driver [[d - fi - } - -+dnl See if we're running on Linux for the Nintendo GameCube/Wii -+dnl FIXME, perform a real test here... -+CheckGC() -+{ -+ AC_ARG_ENABLE(video-gc, -+AC_HELP_STRING([--enable-video-gc], [enable GameCube video support in FB [[default=no]]]), -+ , enable_video_gc=no) -+ if test x$enable_video = xyes -a x$enable_video_gc = xyes -a x$video_fbcon = xyes; then -+ video_gc=yes -+ AC_MSG_RESULT($video_gc) -+ if test x$video_gc = xyes; then -+ AC_DEFINE(SDL_VIDEO_DRIVER_GC) -+ fi -+ fi -+} -+ - dnl Find DirectFB - CheckDirectFB() - { -@@ -2322,6 +2338,7 @@ case "$host" in - CheckX11 - CheckNANOX - CheckFBCON -+ CheckGC - CheckDirectFB - CheckPS2GS - CheckPS3 -diff --git a/include/SDL_config.h.in b/include/SDL_config.h.in -index 58593ca..e523e9b 100644 ---- a/include/SDL_config.h.in -+++ b/include/SDL_config.h.in -@@ -262,6 +262,7 @@ - #undef SDL_VIDEO_DRIVER_DUMMY - #undef SDL_VIDEO_DRIVER_FBCON - #undef SDL_VIDEO_DRIVER_GAPI -+#undef SDL_VIDEO_DRIVER_GC - #undef SDL_VIDEO_DRIVER_GEM - #undef SDL_VIDEO_DRIVER_GGI - #undef SDL_VIDEO_DRIVER_IPOD -diff --git a/src/video/fbcon/SDL_fbgc.c b/src/video/fbcon/SDL_fbgc.c -new file mode 100644 -index 0000000..b3b72bb ---- /dev/null -+++ b/src/video/fbcon/SDL_fbgc.c -@@ -0,0 +1,471 @@ -+/* -+ SDL - Simple DirectMedia Layer -+ Copyright (C) 1997-2009 Sam Lantinga -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with this library; if not, write to the Free Software -+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -+ -+ Sam Lantinga -+ slouken@libsdl.org -+*/ -+#include "SDL_config.h" -+ -+#ifdef SDL_VIDEO_DRIVER_GC -+#include -+#include "SDL_video.h" -+#include "../SDL_blit.h" -+#include "SDL_fbgc.h" -+ -+static Uint32 r_Yr[256]; -+static Uint32 g_Yg_[256]; -+static Uint32 b_Yb[256]; -+static Uint32 r_Ur[256]; -+static Uint32 g_Ug_[256]; -+static Uint32 b_Ub[256]; -+/* static Uint32 r_Vr[256]; // space and cache optimisation */ -+#define r_Vr b_Ub -+static Uint32 g_Vg_[256]; -+static Uint32 b_Vb[256]; -+ -+static Uint8 RGB16toY[1 << 16]; -+static Uint8 RGB16toU[1 << 16]; -+static Uint8 RGB16toV[1 << 16]; -+ -+#ifndef FBIOFLIPHACK -+#define FBIOFLIPHACK 0x4623 /* gc-linux */ -+#endif -+ -+#ifndef GC_BLACK -+#define GC_BLACK 0x00800080 -+#endif -+ -+#ifdef GC_DEBUG -+# define GC_DPRINTF(fmt, args...) \ -+ fprintf(stderr,"DDD|%s: " fmt, __FUNCTION__ , ## args) -+#else -+# define GC_DPRINTF(fmt, args...) -+#endif -+ -+SDL_bool GC_Test(_THIS) -+{ -+ int fliptest; -+ if (ioctl(console_fd, FBIOFLIPHACK, &fliptest)) -+ return SDL_TRUE; -+ return SDL_FALSE; -+} -+ -+SDL_bool GC_Available(void) -+{ -+ if (access("/sys/bus/of_platform/drivers/gcn-vifb", 0) == 0) -+ return SDL_TRUE; -+ -+ return SDL_FALSE; -+} -+ -+/* -+ * -+ * Color space handling. -+ */ -+ -+#define RGB2YUV_SHIFT 16 -+#define RGB2YUV_LUMA 16 -+#define RGB2YUV_CHROMA 128 -+ -+#define Yr ((int)( 0.299*(1< y) ? y : z)) -+ -+static void GC_InitRGB2YUVTables(void) -+{ -+ unsigned int i; -+ unsigned int r, g, b; -+ -+ for (i = 0; i < 256; i++) { -+ r_Yr[i] = Yr * i; -+ g_Yg_[i] = Yg * i + (RGB2YUV_LUMA << RGB2YUV_SHIFT); -+ b_Yb[i] = Yb * i; -+ r_Ur[i] = Ur * i; -+ g_Ug_[i] = Ug * i + (RGB2YUV_CHROMA << RGB2YUV_SHIFT); -+ b_Ub[i] = Ub * i; -+ r_Vr[i] = Vr * i; -+ g_Vg_[i] = Vg * i + (RGB2YUV_CHROMA << RGB2YUV_SHIFT); -+ b_Vb[i] = Vb * i; -+ } -+ -+ for (i = 0; i < 1 << 16; i++) { -+ /* RGB565 */ -+ r = ((i >> 8) & 0xf8); -+ g = ((i >> 3) & 0xfc); -+ b = ((i << 3) & 0xf8); -+ /* extend to 8bit */ -+ r |= (r >> 5); -+ g |= (g >> 6); -+ b |= (b >> 5); -+ -+ RGB16toY[i] = -+ clamp(16, 235, -+ (r_Yr[r] + g_Yg_[g] + b_Yb[b]) >> RGB2YUV_SHIFT); -+ RGB16toU[i] = -+ clamp(16, 240, -+ (r_Ur[r] + g_Ug_[g] + b_Ub[b]) >> RGB2YUV_SHIFT); -+ RGB16toV[i] = -+ clamp(16, 240, -+ (r_Vr[r] + g_Vg_[g] + b_Vb[b]) >> RGB2YUV_SHIFT); -+ } -+} -+ -+static inline Uint32 rgbrgb16toyuy2(Uint16 rgb1, Uint16 rgb2) -+{ -+ register int Y1, Cb, Y2, Cr; -+ Uint16 rgb; -+ -+ /* fast path, thanks to bohdy */ -+ if (!(rgb1 | rgb2)) { -+ return GC_BLACK; /* black, black */ -+ } -+ -+ if (rgb1 == rgb2) { -+ /* fast path, thanks to isobel */ -+ Y1 = Y2 = RGB16toY[rgb1]; -+ Cb = RGB16toU[rgb1]; -+ Cr = RGB16toV[rgb1]; -+ } else { -+ Y1 = RGB16toY[rgb1]; -+ Y2 = RGB16toY[rgb2]; -+ -+ /* RGB565 average */ -+ rgb = ((rgb1 >> 1) & 0xFBEF) + ((rgb2 >> 1) & 0xFBEF) + -+ ((rgb1 & rgb2) & 0x0821); -+ -+ Cb = RGB16toU[rgb]; -+ Cr = RGB16toV[rgb]; -+ } -+ -+ return (((char)Y1) << 24) | (((char)Cb) << 16) | (((char)Y2) << 8) -+ | (((char)Cr) << 0); -+} -+ -+/* -+ * -+ * Blitters. -+ */ -+static void GC_UpdateRectRGB16(_THIS, SDL_Rect * rect, int pitch) -+{ -+ int width, height, left, i, mod, mod32; -+ Uint8 *src, *dst; -+ Uint32 *src32, *dst32; -+ Uint16 *rgb; -+ -+ /* XXX case width < 2 needs special treatment */ -+ -+ /* in pixel units */ -+ left = rect->x & ~1; /* 2 pixel align */ -+ width = (rect->w + 1) & ~1; /* 2 pixel align in excess */ -+ height = rect->h; -+ -+ /* in bytes, src and dest are 16bpp */ -+ src = shadow_mem + (rect->y * pitch) + left * 2; -+ dst = flip_address[back_page] + page_offset + -+ (rect->y * pitch) + left * 2; -+ mod = pitch - width * 2; -+ -+ src32 = (Uint32 *) src; -+ dst32 = (Uint32 *) dst; -+ mod32 = mod / 4; -+ -+ while (height--) { -+ i = width / 2; -+ -+ while (i--) { -+ rgb = (Uint16 *) src32; -+ *dst32++ = rgbrgb16toyuy2(rgb[0], rgb[1]); -+ src32++; -+ } -+ src32 += mod32; -+ dst32 += mod32; -+ } -+} -+ -+void GC_Init(_THIS, SDL_PixelFormat *vformat) -+{ -+ GC_InitRGB2YUVTables(); -+ -+ /* 16 bits per pixel */ -+ vformat->BitsPerPixel = 16; -+ vformat->BytesPerPixel = 2; -+ /* RGB565 */ -+ vformat->Rmask = 0x0000f800; -+ vformat->Gmask = 0x000007e0; -+ vformat->Bmask = 0x0000001f; -+ -+ shadow_fb = 1; -+} -+ -+/* -+ * -+ * Video mode handling. -+ */ -+ -+/* only 640x480 16bpp is currently supported */ -+const static SDL_Rect RECT_640x480 = { 0, 0, 640, 480 }; -+const static SDL_Rect *vid_modes[] = { -+ &RECT_640x480, -+ NULL -+}; -+ -+static SDL_Rect **GC_ListModes(_THIS, SDL_PixelFormat * format, Uint32 flags) -+{ -+ switch (format->BitsPerPixel) { -+ case 16: -+ return (SDL_Rect **) vid_modes; -+ default: -+ return NULL; -+ } -+} -+ -+SDL_Surface *GC_SetVideoMode(_THIS, SDL_Surface * current, -+ int width, int height, int bpp, Uint32 flags) -+{ -+ struct fb_fix_screeninfo finfo; -+ struct fb_var_screeninfo vinfo; -+ int i; -+ Uint32 Rmask; -+ Uint32 Gmask; -+ Uint32 Bmask; -+ Uint32 *p, *q; -+ Uint32 yres; -+ -+ GC_DPRINTF("Setting %dx%d %dbpp %smode\n", width, height, bpp, -+ (flags & SDL_DOUBLEBUF)?"(doublebuf) ":""); -+ -+ /* Set the terminal into graphics mode */ -+ if (FB_EnterGraphicsMode(this) < 0) { -+ return (NULL); -+ } -+ -+ /* Restore the original palette */ -+ //FB_RestorePalette(this); -+ -+ /* Set the video mode and get the final screen format */ -+ if (ioctl(console_fd, FBIOGET_VSCREENINFO, &vinfo) < 0) { -+ SDL_SetError("Couldn't get console screen info"); -+ return (NULL); -+ } -+ -+ yres = vinfo.yres; -+ -+ /* hack to center 640x480 resolution on PAL cubes */ -+ if (vinfo.xres == 640 && vinfo.yres == 576) { -+ page_offset = ((576 - 480) / 2) * 640 * ((bpp + 7) / 8); -+ } else { -+ page_offset = 0; -+ } -+ -+ /* clear all video memory */ -+ p = (Uint32 *)mapped_mem; -+ q = (Uint32 *)(mapped_mem + mapped_memlen); -+ while (p < q) -+ *p++ = GC_BLACK; -+ -+ if ((vinfo.xres != width) || (vinfo.yres != height) || -+ (vinfo.bits_per_pixel != bpp)) { -+ vinfo.activate = FB_ACTIVATE_NOW; -+ vinfo.accel_flags = 0; -+ vinfo.bits_per_pixel = bpp; -+ vinfo.xres = width; -+ vinfo.xres_virtual = width; -+ /* do not modify yres*, we use a fake 640x480 mode in PAL */ -+ //vinfo.yres = height; -+ //vinfo.yres_virtual = 2*height; -+ vinfo.xoffset = 0; -+ vinfo.yoffset = 0; -+ vinfo.red.length = vinfo.red.offset = 0; -+ vinfo.green.length = vinfo.green.offset = 0; -+ vinfo.blue.length = vinfo.blue.offset = 0; -+ vinfo.transp.length = vinfo.transp.offset = 0; -+ -+ if (ioctl(console_fd, FBIOPUT_VSCREENINFO, &vinfo) < 0) { -+ SDL_SetError("Couldn't set console screen info"); -+ return (NULL); -+ } -+ } else { -+ int maxheight; -+ -+ /* Figure out how much video memory is available */ -+ maxheight = 2*yres; -+ if (vinfo.yres_virtual > maxheight) { -+ vinfo.yres_virtual = maxheight; -+ } -+ } -+ cache_vinfo = vinfo; -+ -+ Rmask = 0; -+ for (i = 0; i < vinfo.red.length; ++i) { -+ Rmask <<= 1; -+ Rmask |= (0x00000001 << vinfo.red.offset); -+ } -+ Gmask = 0; -+ for (i = 0; i < vinfo.green.length; ++i) { -+ Gmask <<= 1; -+ Gmask |= (0x00000001 << vinfo.green.offset); -+ } -+ Bmask = 0; -+ for (i = 0; i < vinfo.blue.length; ++i) { -+ Bmask <<= 1; -+ Bmask |= (0x00000001 << vinfo.blue.offset); -+ } -+ if (!SDL_ReallocFormat(current, bpp, Rmask, Gmask, Bmask, 0)) { -+ return (NULL); -+ } -+ -+ /* Get the fixed information about the console hardware. -+ This is necessary since finfo.line_length changes. -+ */ -+ if (ioctl(console_fd, FBIOGET_FSCREENINFO, &finfo) < 0) { -+ SDL_SetError("Couldn't get console hardware info"); -+ return (NULL); -+ } -+ -+ /* Save hardware palette, if needed */ -+ //FB_SavePalette(this, &finfo, &vinfo); -+ -+ /* Set up the new mode framebuffer */ -+ current->flags = SDL_FULLSCREEN; -+ current->w = width; -+ current->h = height; -+ current->pitch = width * ((bpp + 7) / 8); -+ current->pixels = shadow_mem; -+ -+ flip_address[0] = mapped_mem; -+ flip_address[1] = mapped_mem + current->pitch * yres; -+ -+ back_page = 1; -+ if (flags & SDL_DOUBLEBUF) { -+ current->flags |= SDL_DOUBLEBUF; -+ flip_pending = 1; -+ } else { -+ flip_pending = 0; -+ /* make page 0 both the visible and back page */ -+ back_page = ioctl(console_fd, FBIOFLIPHACK, &back_page); -+ if (back_page < 0) -+ back_page = 0; -+ } -+ -+ /* Set the update rectangle function */ -+ switch (bpp) { -+ case 16: -+ GC_DPRINTF("Using 16bpp blitter\n"); -+ this->hidden->UpdateRect = GC_UpdateRectRGB16; -+ break; -+ default: -+ GC_DPRINTF("Using NO blitter\n"); -+ this->hidden->UpdateRect = NULL; -+ break; -+ } -+ -+ /* Handle OpenGL support */ -+#ifdef HAVE_OPENGL -+ if (flags & SDL_OPENGL) { -+ if (GC_GL_CreateWindow(this, width, height) == 0) { -+ current->flags |= (SDL_OPENGL | SDL_FULLSCREEN); -+ } else { -+ current = NULL; -+ } -+ } -+#endif /* HAVE_OPENGL */ -+ -+ /* We're done */ -+ return (current); -+} -+ -+static int GC_FlipHWSurface(_THIS, SDL_Surface * surface) -+{ -+ if (flip_pending) { -+ /* SDL_UpdateRect was not called */ -+ SDL_UpdateRect(this->screen, 0, 0, 0, 0); -+ } -+ -+ /* flip video page as soon as possible */ -+ ioctl(console_fd, FBIOFLIPHACK, NULL); -+ flip_pending = 1; -+ -+ return (0); -+} -+ -+static void GC_WaitForFlipCompletion(_THIS) -+{ -+ int visible_page; -+ int result; -+ -+ if (flip_pending) { -+ flip_pending = 0; -+ back_page ^= 1; -+ visible_page = back_page; -+ while (visible_page == back_page) { -+ /* wait until back_page is not visible */ -+ result = ioctl(console_fd, FBIOFLIPHACK, &back_page); -+ if (result < 0) { -+ if ((errno == EINTR) || (errno == EAGAIN)) -+ continue; -+ return; /* ioctl unsupported ... */ -+ } -+ visible_page = result; -+ } -+ /* -+ * At this point the back_page is not visible. We can safely -+ * write to it without tearing. -+ */ -+ } -+} -+ -+static void GC_UpdateRects(_THIS, int numrects, SDL_Rect * rects) -+{ -+ SDL_Surface *screen; -+ int pitch; -+ -+ /* external yuy2 fb is 16bpp */ -+ -+ screen = this->screen; -+ pitch = screen->pitch; /* this is the pitch of the shadow buffer */ -+ -+ if (this->hidden->UpdateRect) { -+ GC_WaitForFlipCompletion(this); -+ while (numrects--) { -+ if (rects->w <= 0 || rects->h <= 0) -+ continue; -+ this->hidden->UpdateRect(this, rects, pitch); -+ rects++; -+ } -+ } -+} -+ -+void GC_CreateDevice(SDL_VideoDevice *this) -+{ -+ this->ListModes = GC_ListModes; -+ this->SetVideoMode = GC_SetVideoMode; -+ this->FlipHWSurface = GC_FlipHWSurface; -+ this->UpdateRects = GC_UpdateRects; -+} -+ -+#endif -diff --git a/src/video/fbcon/SDL_fbgc.h b/src/video/fbcon/SDL_fbgc.h -new file mode 100644 -index 0000000..534a73e ---- /dev/null -+++ b/src/video/fbcon/SDL_fbgc.h -@@ -0,0 +1,35 @@ -+/* -+ SDL - Simple DirectMedia Layer -+ Copyright (C) 1997-2009 Sam Lantinga -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with this library; if not, write to the Free Software -+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -+ -+ Sam Lantinga -+ slouken@libsdl.org -+*/ -+#include "SDL_config.h" -+ -+ -+#ifdef SDL_VIDEO_DRIVER_GC -+/* Gamecube/Wii hardware setup for the SDL framebuffer console driver */ -+ -+#include "SDL_fbvideo.h" -+ -+extern SDL_bool GC_Available(void); -+extern void GC_CreateDevice(SDL_VideoDevice *this); -+ -+extern SDL_bool GC_Test(_THIS); -+extern void GC_Init(_THIS, SDL_PixelFormat *vformat); -+#endif -diff --git a/src/video/fbcon/SDL_fbvideo.c b/src/video/fbcon/SDL_fbvideo.c -index 81a89da..328790e 100644 ---- a/src/video/fbcon/SDL_fbvideo.c -+++ b/src/video/fbcon/SDL_fbvideo.c -@@ -272,6 +272,11 @@ static SDL_VideoDevice *FB_CreateDevice(int devindex) - - this->free = FB_DeleteDevice; - -+#ifdef SDL_VIDEO_DRIVER_GC -+ if (GC_Available(this)) -+ GC_CreateDevice(this); -+#endif -+ - return this; - } - -@@ -784,6 +789,11 @@ static int FB_VideoInit(_THIS, SDL_PixelFormat *vformat) - } - } - -+#ifdef SDL_VIDEO_DRIVER_GC -+ if (GC_Test(this)) -+ GC_Init(this, vformat); -+#endif -+ - if (shadow_fb) { - shadow_mem = (char *)SDL_malloc(mapped_memlen); - if (shadow_mem == NULL) { -diff --git a/src/video/fbcon/SDL_fbvideo.h b/src/video/fbcon/SDL_fbvideo.h -index 03b9e94..74d1460 100644 ---- a/src/video/fbcon/SDL_fbvideo.h -+++ b/src/video/fbcon/SDL_fbvideo.h -@@ -106,6 +106,12 @@ struct SDL_PrivateVideoData { - - void (*wait_vbl)(_THIS); - void (*wait_idle)(_THIS); -+#ifdef SDL_VIDEO_DRIVER_GC -+ void (*UpdateRect) (_THIS, SDL_Rect * rect, int pitch); -+ int back_page; -+ int page_offset; -+ int flip_pending; -+#endif - }; - /* Old variable names */ - #define console_fd (this->hidden->console_fd) -@@ -147,6 +153,11 @@ struct SDL_PrivateVideoData { - #define screen_palette (this->hidden->screen_palette) - #define wait_vbl (this->hidden->wait_vbl) - #define wait_idle (this->hidden->wait_idle) -+#ifdef SDL_VIDEO_DRIVER_GC -+#define back_page (this->hidden->back_page) -+#define page_offset (this->hidden->page_offset) -+#define flip_pending (this->hidden->flip_pending) -+#endif - - /* Accelerator types that are supported by the driver, but are not - necessarily in the kernel headers on the system we compile on. --- -1.6.5 - diff --git a/tools/SDL1.2.7_CE/SDL-1.27_CE.diff b/tools/SDL1.2.7_CE/SDL-1.27_CE.diff deleted file mode 100644 index 196329b84..000000000 --- a/tools/SDL1.2.7_CE/SDL-1.27_CE.diff +++ /dev/null @@ -1,2260 +0,0 @@ -diff -ruN SDL-1.2.7-orig/src/audio/windib/SDL_dibaudio.c SDL-1.2.7/src/audio/windib/SDL_dibaudio.c ---- SDL-1.2.7-orig/src/audio/windib/SDL_dibaudio.c Wed Feb 18 09:22:00 2004 -+++ SDL-1.2.7/src/audio/windib/SDL_dibaudio.c Thu Nov 18 12:07:29 2004 -@@ -146,8 +146,16 @@ - - /* Set high priority for the audio thread */ - static void DIB_ThreadInit(_THIS) --{ -- SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_HIGHEST); -+{ -+#ifdef _WIN32_WCE -+#ifdef SH3 -+ SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_NORMAL); -+#else -+ SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_ABOVE_NORMAL); -+#endif -+#else -+ SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_HIGHEST); -+#endif - } - - void DIB_WaitAudio(_THIS) -diff -ruN SDL-1.2.7-orig/src/cpuinfo/SDL_cpuinfo.c SDL-1.2.7/src/cpuinfo/SDL_cpuinfo.c ---- SDL-1.2.7-orig/src/cpuinfo/SDL_cpuinfo.c Tue Feb 10 07:31:36 2004 -+++ SDL-1.2.7/src/cpuinfo/SDL_cpuinfo.c Fri Nov 19 20:53:01 2004 -@@ -38,6 +38,10 @@ - - #ifdef MACOSX - #include /* For AltiVec check */ -+#endif -+ -+#if defined(_MSC_VER) && (defined(ARM) || defined(MIPS) || defined(SHx)) -+#undef _MSC_VER - #endif - - #define CPU_HAS_RDTSC 0x00000001 -diff -ruN SDL-1.2.7-orig/src/joystick/win32/SDL_mmjoystick.c SDL-1.2.7/src/joystick/win32/SDL_mmjoystick.c ---- SDL-1.2.7-orig/src/joystick/win32/SDL_mmjoystick.c Wed Feb 18 09:22:02 2004 -+++ SDL-1.2.7/src/joystick/win32/SDL_mmjoystick.c Fri Nov 19 20:47:22 2004 -@@ -37,6 +37,7 @@ - - #include - #include -+#include - - #define MAX_JOYSTICKS 16 - #define MAX_AXES 6 /* each joystick can have up to 6 axes */ -@@ -51,6 +52,7 @@ - /* array to hold joystick ID values */ - static UINT SYS_JoystickID[MAX_JOYSTICKS]; - static JOYCAPS SYS_Joystick[MAX_JOYSTICKS]; -+static char *SYS_JoystickName[MAX_JOYSTICKS]; - - /* The private structure used to keep track of a joystick */ - struct joystick_hwdata -@@ -69,6 +71,78 @@ - /* Convert a win32 Multimedia API return code to a text message */ - static void SetMMerror(char *function, int code); - -+static char *GetJoystickName(int index, const char *szRegKey) -+{ -+ /* added 7/24/2004 by Eckhard Stolberg */ -+ /* -+ see if there is a joystick for the current -+ index (1-16) listed in the registry -+ */ -+ char *name = NULL; -+ HKEY hKey; -+ DWORD regsize; -+ LONG regresult; -+ unsigned char regkey[256]; -+ unsigned char regvalue[256]; -+ unsigned char regname[256]; -+ -+ sprintf(regkey, "%s\\%s\\%s", -+ REGSTR_PATH_JOYCONFIG, -+ szRegKey, -+ REGSTR_KEY_JOYCURR); -+ regresult = RegOpenKeyExA(HKEY_LOCAL_MACHINE, -+ (LPTSTR) ®key, 0, KEY_READ, &hKey); -+ if (regresult == ERROR_SUCCESS) -+ { -+ /* -+ find the registry key name for the -+ joystick's properties -+ */ -+ regsize = sizeof(regname); -+ sprintf(regvalue, -+ "Joystick%d%s", index+1, -+ REGSTR_VAL_JOYOEMNAME); -+ regresult = RegQueryValueExA(hKey, -+ regvalue, 0, 0, (LPBYTE) ®name, -+ (LPDWORD) ®size); -+ RegCloseKey(hKey); -+ if (regresult == ERROR_SUCCESS) -+ { -+ /* open that registry key */ -+ sprintf(regkey, "%s\\%s", -+ REGSTR_PATH_JOYOEM, regname); -+ regresult = RegOpenKeyExA(HKEY_LOCAL_MACHINE, -+ regkey, 0, KEY_READ, &hKey); -+ if (regresult == ERROR_SUCCESS) -+ { -+ /* find the size for the OEM name text */ -+ regsize = sizeof(regvalue); -+ regresult = -+ RegQueryValueExA(hKey, -+ REGSTR_VAL_JOYOEMNAME, -+ 0, 0, NULL, -+ (LPDWORD) ®size); -+ if (regresult == ERROR_SUCCESS) -+ { -+ /* -+ allocate enough memory -+ for the OEM name text ... -+ */ -+ name = (char *) malloc(regsize); -+ /* ... and read it from the registry */ -+ regresult = -+ RegQueryValueExA(hKey, -+ REGSTR_VAL_JOYOEMNAME, 0, 0, -+ (LPBYTE) name, -+ (LPDWORD) ®size); -+ RegCloseKey(hKey); -+ } -+ } -+ } -+ } -+ return(name); -+} -+ - - /* Function to scan the system for joysticks. - * This function should set SDL_numjoysticks to the number of available -@@ -94,6 +168,7 @@ - - for ( i = 0; i < MAX_JOYSTICKS; i++ ) { - SYS_JoystickID[i] = JOYSTICKID1 + i; -+ SYS_JoystickName[i] = NULL; - } - - -@@ -110,6 +185,7 @@ - if ( result == JOYERR_NOERROR ) { - SYS_JoystickID[numdevs] = SYS_JoystickID[i]; - SYS_Joystick[numdevs] = joycaps; -+ SYS_JoystickName[numdevs] = GetJoystickName(numdevs, joycaps.szRegKey); - numdevs++; - } - } -@@ -120,8 +196,11 @@ - /* Function to get the device-dependent name of a joystick */ - const char *SDL_SYS_JoystickName(int index) - { -- /***-> test for invalid index ? */ -+ if ( SYS_JoystickName[index] != NULL ) { -+ return(SYS_JoystickName[index]); -+ } else { - return(SYS_Joystick[index].szPname); -+ } - } - - /* Function to open a joystick for use. -@@ -292,7 +371,12 @@ - /* Function to perform any system-specific joystick related cleanup */ - void SDL_SYS_JoystickQuit(void) - { -- return; -+ int i; -+ for (i = 0; i < MAX_JOYSTICKS; i++) { -+ if ( SYS_JoystickName[i] != NULL ) { -+ free(SYS_JoystickName[i]); -+ } -+ } - } - - -diff -ruN SDL-1.2.7-orig/src/video/SDL_sysvideo.h SDL-1.2.7/src/video/SDL_sysvideo.h ---- SDL-1.2.7-orig/src/video/SDL_sysvideo.h Wed Feb 18 09:22:04 2004 -+++ SDL-1.2.7/src/video/SDL_sysvideo.h Thu Nov 18 12:08:48 2004 -@@ -361,6 +361,9 @@ - #endif - #ifdef ENABLE_WINDIB - extern VideoBootStrap WINDIB_bootstrap; -+#endif -+#ifdef ENABLE_WINGAPI -+extern VideoBootStrap WINGAPI_bootstrap; - #endif - #ifdef ENABLE_DIRECTX - extern VideoBootStrap DIRECTX_bootstrap; -diff -ruN SDL-1.2.7-orig/src/video/SDL_video.c SDL-1.2.7/src/video/SDL_video.c ---- SDL-1.2.7-orig/src/video/SDL_video.c Wed Feb 18 09:22:04 2004 -+++ SDL-1.2.7/src/video/SDL_video.c Thu Nov 18 12:11:01 2004 -@@ -80,6 +80,9 @@ - #endif - #ifdef ENABLE_DIRECTX - &DIRECTX_bootstrap, -+#endif -+#ifdef ENABLE_WINGAPI -+ &WINGAPI_bootstrap, - #endif - #ifdef ENABLE_WINDIB - &WINDIB_bootstrap, -diff -ruN SDL-1.2.7-orig/src/video/wincommon/SDL_sysevents.c SDL-1.2.7/src/video/wincommon/SDL_sysevents.c ---- SDL-1.2.7-orig/src/video/wincommon/SDL_sysevents.c Wed Feb 18 09:22:10 2004 -+++ SDL-1.2.7/src/video/wincommon/SDL_sysevents.c Thu Nov 18 12:28:03 2004 -@@ -40,6 +40,9 @@ - #include "SDL_lowvideo.h" - #include "SDL_syswm_c.h" - #include "SDL_main.h" -+#ifdef _WIN32_CE -+#include "SDL_dibvideo.h" -+#endif - - #ifdef WMMSG_DEBUG - #include "wmmsg.h" -@@ -173,6 +176,39 @@ - SDL_SetModState(state); - #endif /* !NO_GETKEYBOARDSTATE */ - } -+ -+#ifdef _WIN32_CE -+void transform(SDL_RotateAttr rotate, char ozone, Sint16 *x, Sint16 *y) { -+ Sint16 rotatedX; -+ Sint16 rotatedY; -+ -+ if (ozone) { -+ *x = *x * 2; -+ *y = *y * 2; -+ } -+ -+ switch(rotate) { -+ case SDL_ROTATE_NONE: -+ break; -+ case SDL_ROTATE_LEFT: -+ if (!SDL_VideoSurface) -+ break; -+ rotatedX = SDL_VideoSurface->w - *y; -+ rotatedY = *x; -+ *x = rotatedX; -+ *y = rotatedY; -+ break; -+ case SDL_ROTATE_RIGHT: -+ if (!SDL_VideoSurface) -+ break; -+ rotatedX = *y; -+ rotatedY = SDL_VideoSurface->h - *x; -+ *x = rotatedX; -+ *y = rotatedY; -+ break; -+ } -+} -+#endif - - /* The main Win32 event handler - DJM: This is no longer static as (DX5/DIB)_CreateWindow needs it -@@ -273,7 +309,11 @@ - SetCursorPos(center.x, center.y); - posted = SDL_PrivateMouseMotion(0, 1, x, y); - } -- } else { -+ } else { -+#ifdef _WIN32_CE -+ if (SDL_VideoSurface) -+ transform(rotation, ozoneHack, &x, &y); -+#endif - posted = SDL_PrivateMouseMotion(0, 0, x, y); - } - } -@@ -361,8 +401,16 @@ - x = 0; y = 0; - } else { - x = (Sint16)LOWORD(lParam); -- y = (Sint16)HIWORD(lParam); -- } -+ y = (Sint16)HIWORD(lParam); -+#ifdef _WIN32_CE -+ if (SDL_VideoSurface) -+ transform(rotation, ozoneHack, &x, &y); -+#endif -+ } -+#ifdef _WIN32_WCE -+ /* Since stylus movements are not continuous */ -+ posted = SDL_PrivateMouseMotion(0, 0, x, y); -+#endif - posted = SDL_PrivateMouseButton( - state, button, x, y); - } -diff -ruN SDL-1.2.7-orig/src/video/wincommon/SDL_sysmouse.c SDL-1.2.7/src/video/wincommon/SDL_sysmouse.c ---- SDL-1.2.7-orig/src/video/wincommon/SDL_sysmouse.c Sat Aug 30 13:13:12 2003 -+++ SDL-1.2.7/src/video/wincommon/SDL_sysmouse.c Thu Nov 18 12:29:20 2004 -@@ -250,12 +250,16 @@ - - /* Check to see if we need to enter or leave mouse relative mode */ - void WIN_CheckMouseMode(_THIS) --{ -+{ -+#ifdef _WIN32_WCE -+ mouse_relative = 0; -+#else - /* If the mouse is hidden and input is grabbed, we use relative mode */ - if ( !(SDL_cursorstate & CURSOR_VISIBLE) && - (this->input_grab != SDL_GRAB_OFF) ) { - mouse_relative = 1; - } else { - mouse_relative = 0; -- } -+ } -+#endif - } -diff -ruN SDL-1.2.7-orig/src/video/windib/SDL_dibevents.c SDL-1.2.7/src/video/windib/SDL_dibevents.c ---- SDL-1.2.7-orig/src/video/windib/SDL_dibevents.c Wed Feb 18 09:22:10 2004 -+++ SDL-1.2.7/src/video/windib/SDL_dibevents.c Thu Nov 18 13:12:28 2004 -@@ -58,6 +58,29 @@ - /* DJM: If the user setup the window for us, we want to save his window proc, - and give him a chance to handle some messages. */ - static WNDPROC userWindowProc = NULL; -+ -+#ifdef _WIN32_WCE -+ -+WPARAM rotateKey(WPARAM key, SDL_RotateAttr direction) { -+ if (direction != SDL_ROTATE_LEFT) -+ return key; -+ -+ switch (key) { -+ case 0x26: /* up */ -+ return 0x27; -+ case 0x27: /* right */ -+ return 0x28; -+ case 0x28: /* down */ -+ return 0x25; -+ case 0x25: /* left */ -+ return 0x26; -+ } -+ -+ return key; -+} -+ -+#endif -+ - - /* The main Win32 event handler */ - LONG -@@ -69,6 +92,16 @@ - case WM_SYSKEYDOWN: - case WM_KEYDOWN: { - SDL_keysym keysym; -+ -+#ifdef _WIN32_WCE -+ // Drop GAPI artefacts -+ if (wParam == 0x84 || wParam == 0x5B) -+ return 0; -+ -+ // Rotate key if necessary -+ if (rotation != SDL_ROTATE_NONE) -+ wParam = rotateKey(wParam, rotation); -+#endif - - /* Ignore repeated keys */ - if ( lParam&REPEATED_KEYMASK ) { -@@ -129,6 +162,16 @@ - case WM_KEYUP: { - SDL_keysym keysym; - -+#ifdef _WIN32_WCE -+ // Drop GAPI artefacts -+ if (wParam == 0x84 || wParam == 0x5B) -+ return 0; -+ -+ // Rotate key if necessary -+ if (rotation != SDL_ROTATE_NONE) -+ wParam = rotateKey(wParam, rotation); -+#endif -+ - switch (wParam) { - case VK_CONTROL: - if ( lParam&EXTENDED_KEYMASK ) -@@ -333,7 +376,16 @@ - VK_keymap[VK_APPS] = SDLK_MENU; - - prev_shiftstates[0] = FALSE; -- prev_shiftstates[1] = FALSE; -+ prev_shiftstates[1] = FALSE; -+ -+#ifdef _WIN32_WCE -+ /* Hardcode the 4 magic keys to F1 F2 F3 F4 - the actual location of the keys varies ... */ -+ VK_keymap[0xC1] = SDLK_F1; -+ VK_keymap[0xC2] = SDLK_F2; -+ VK_keymap[0xC3] = SDLK_F3; -+ VK_keymap[0xC4] = SDLK_F4; -+#endif -+ - } - - static SDL_keysym *TranslateKey(UINT vkey, UINT scancode, SDL_keysym *keysym, int pressed) -@@ -364,9 +416,15 @@ - { - #ifndef CS_BYTEALIGNCLIENT - #define CS_BYTEALIGNCLIENT 0 -+#endif -+#ifdef _WIN32_CE -+ SDL_RegisterApp("SDL_app", CS_BYTEALIGNCLIENT | CS_HREDRAW | CS_VREDRAW, 0); -+#else -+ SDL_RegisterApp("SDL_app", CS_BYTEALIGNCLIENT, 0); - #endif -- SDL_RegisterApp("SDL_app", CS_BYTEALIGNCLIENT, 0); -- if ( SDL_windowid ) { -+ if ( SDL_windowid ) { -+// FIXME -+#ifndef _WIN32_WCE - SDL_Window = (HWND)strtol(SDL_windowid, NULL, 0); - - /* DJM: we want all event's for the user specified -@@ -375,11 +433,19 @@ - if (SDL_Window) { - userWindowProc = (WNDPROC)GetWindowLong(SDL_Window, GWL_WNDPROC); - SetWindowLong(SDL_Window, GWL_WNDPROC, (LONG)WinMessage); -- } -- } else { -+ } -+ #endif -+ } else { -+#ifdef _WIN32_WCE -+ -+ SDL_Window = CreateWindow(SDL_Appname, SDL_Appname, (WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_MINIMIZEBOX), -+ 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), -+ NULL, NULL, SDL_Instance, NULL); -+#else - SDL_Window = CreateWindow(SDL_Appname, SDL_Appname, - (WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_MINIMIZEBOX), -- CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, NULL, NULL, SDL_Instance, NULL); -+ CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, NULL, NULL, SDL_Instance, NULL); -+#endif - if ( SDL_Window == NULL ) { - SDL_SetError("Couldn't create window"); - return(-1); -diff -ruN SDL-1.2.7-orig/src/video/windib/SDL_dibvideo.c SDL-1.2.7/src/video/windib/SDL_dibvideo.c ---- SDL-1.2.7-orig/src/video/windib/SDL_dibvideo.c Wed Feb 18 09:22:10 2004 -+++ SDL-1.2.7/src/video/windib/SDL_dibvideo.c Mon Aug 8 18:27:52 2005 -@@ -29,15 +29,26 @@ - #include - #include - #include --#if defined(WIN32_PLATFORM_PSPC) -+#if (defined (UNDER_CE) && (UNDER_CE >= 420)) - #include // Add Pocket PC includes - #pragma comment( lib, "aygshell" ) // Link Pocket PC library - #endif -+ -+#ifdef _MSC_VER -+#pragma warning(disable: 4244) -+#define inline __inline -+#endif -+ - - /* Not yet in the mingw32 cross-compile headers */ - #ifndef CDS_FULLSCREEN - #define CDS_FULLSCREEN 4 - #endif -+ -+#ifndef WS_THICKFRAME -+#define WS_THICKFRAME 0 -+#endif -+ - - #include "SDL.h" - #include "SDL_mutex.h" -@@ -55,7 +66,18 @@ - #ifdef _WIN32_WCE - #define NO_GETDIBITS - #define NO_CHANGEDISPLAYSETTINGS --#define NO_GAMMA_SUPPORT -+#define NO_GAMMA_SUPPORT -+ -+/* uncomment this line if you target WinCE 3.x platform: */ -+//#define NO_SETDIBCOLORTABLE -+ -+/* these 2 variables are used to suport paletted DIBs on WinCE 3.x that -+ does not implement SetDIBColorTable, and when SetDIBColorTable is not working. -+ Slow. DIB is recreated every time. -+*/ -+static BITMAPINFO *last_bitmapinfo; -+static void** last_bits; -+ - #endif - #ifndef WS_MAXIMIZE - #define WS_MAXIMIZE 0 -@@ -96,6 +118,13 @@ - - /* helper fn */ - static int DIB_SussScreenDepth(); -+ -+#ifdef _WIN32_WCE -+void DIB_ShowTaskBar(BOOL taskBarShown); -+#ifdef ENABLE_WINGAPI -+extern void GAPI_GrabHardwareKeys(BOOL grab); -+#endif -+#endif - - /* DIB driver bootstrap functions */ - -@@ -352,6 +381,9 @@ - - /* Fill in some window manager capabilities */ - this->info.wm_available = 1; -+ -+ /* Rotation information */ -+ rotation = SDL_ROTATE_NONE; - - /* We're done! */ - return(0); -@@ -370,7 +402,43 @@ - } - #endif - } -- -+ -+#ifdef _WIN32_WCE -+ -+void DIB_ShowTaskBar(BOOL taskBarShown) { -+#if (UNDER_CE < 420) -+ // Hide taskbar, WinCE 2.x style - from EasyCE -+ HKEY hKey=0; -+ DWORD dwValue = 0; -+ unsigned long lSize = sizeof( DWORD ); -+ DWORD dwType = REG_DWORD; -+ HWND hWnd; -+ -+ RegOpenKeyEx( HKEY_LOCAL_MACHINE, TEXT("\\software\\microsoft\\shell"), 0, KEY_ALL_ACCESS, &hKey ); -+ RegQueryValueEx( hKey, TEXT("TBOpt"), 0, &dwType, (BYTE*)&dwValue, &lSize ); -+ if (taskBarShown) -+ dwValue &= 0xFFFFFFFF - 8; // reset bit to show taskbar -+ else -+ dwValue |= 8; // set bit to hide taskbar -+ RegSetValueEx( hKey, TEXT("TBOpt"), 0, REG_DWORD, (BYTE*)&dwValue, lSize ); -+ hWnd = FindWindow( TEXT("HHTaskBar"), NULL ); -+ SendMessage(hWnd, WM_COMMAND, 0x03EA, 0 ); -+ SetForegroundWindow(SDL_Window); -+#else -+ if (taskBarShown) -+ SHFullScreen(SDL_Window, SHFS_SHOWTASKBAR | SHFS_SHOWSIPBUTTON | SHFS_SHOWSTARTICON); -+ else -+ SHFullScreen(SDL_Window, SHFS_HIDETASKBAR | SHFS_HIDESIPBUTTON | SHFS_HIDESTARTICON); -+#endif -+ if (FindWindow(TEXT("HHTaskBar"), NULL)) { // is it valid for HPC ? -+ if (taskBarShown) -+ ShowWindow(FindWindow(TEXT("HHTaskBar"),NULL),SW_SHOWNORMAL); -+ else -+ ShowWindow(FindWindow(TEXT("HHTaskBar"),NULL),SW_HIDE); -+ } -+} -+ -+#endif - - /* - Helper fn to work out which screen depth windows is currently using. -@@ -444,7 +512,8 @@ - - - /* Various screen update functions available */ --static void DIB_NormalUpdate(_THIS, int numrects, SDL_Rect *rects); -+static void DIB_NormalUpdate(_THIS, int numrects, SDL_Rect *rects); -+static void DIB_RotatedUpdate(_THIS, int numrects, SDL_Rect *rects); - - SDL_Surface *DIB_SetVideoMode(_THIS, SDL_Surface *current, - int width, int height, int bpp, Uint32 flags) -@@ -463,12 +532,20 @@ - HDC hdc; - RECT bounds; - int x, y; -- Uint32 Rmask, Gmask, Bmask; -- -+ Uint32 Rmask, Gmask, Bmask; -+#ifdef _WIN32_CE -+ int screenWidth, screenHeight; -+#endif -+#ifdef UNDER_CE -+ int i; -+#endif -+ -+#ifdef HAVE_OPENGL - /* Clean up any GL context that may be hanging around */ - if ( current->flags & SDL_OPENGL ) { - WIN_GL_ShutDown(this); -- } -+ } -+#endif - - /* Recalculate the bitmasks if necessary */ - if ( bpp == current->format->BitsPerPixel ) { -@@ -517,20 +594,16 @@ - video->h = height; - video->pitch = SDL_CalculatePitch(video); - --#ifdef WIN32_PLATFORM_PSPC -+#ifdef _WIN32_CE - /* Stuff to hide that $#!^%#$ WinCE taskbar in fullscreen... */ - if ( flags & SDL_FULLSCREEN ) { - if ( !(prev_flags & SDL_FULLSCREEN) ) { -- SHFullScreen(SDL_Window, SHFS_HIDETASKBAR); -- SHFullScreen(SDL_Window, SHFS_HIDESIPBUTTON); -- ShowWindow(FindWindow(TEXT("HHTaskBar"),NULL),SW_HIDE); -+ DIB_ShowTaskBar(FALSE); - } - video->flags |= SDL_FULLSCREEN; - } else { - if ( prev_flags & SDL_FULLSCREEN ) { -- SHFullScreen(SDL_Window, SHFS_SHOWTASKBAR); -- SHFullScreen(SDL_Window, SHFS_SHOWSIPBUTTON); -- ShowWindow(FindWindow(TEXT("HHTaskBar"),NULL),SW_SHOWNORMAL); -+ DIB_ShowTaskBar(TRUE); - } - } - #endif -@@ -640,28 +713,82 @@ - ((Uint32*)binfo->bmiColors)[0] = video->format->Rmask; - ((Uint32*)binfo->bmiColors)[1] = video->format->Gmask; - ((Uint32*)binfo->bmiColors)[2] = video->format->Bmask; -- } else { -+ } else { -+#ifdef UNDER_CE -+ binfo->bmiHeader.biCompression = BI_RGB; /* 332 */ -+ if ( video->format->palette ) { -+ binfo->bmiHeader.biClrUsed = video->format->palette->ncolors; -+ for(i=0; iformat->palette->ncolors; i++) -+ { -+ binfo->bmiColors[i].rgbRed=i&(7<<5); -+ binfo->bmiColors[i].rgbGreen=(i&(7<<2))<<3; -+ binfo->bmiColors[i].rgbBlue=(i&3)<<5; -+ binfo->bmiColors[i].rgbReserved=0; -+ } -+ } -+#else - binfo->bmiHeader.biCompression = BI_RGB; /* BI_BITFIELDS for 565 vs 555 */ - if ( video->format->palette ) { - memset(binfo->bmiColors, 0, - video->format->palette->ncolors*sizeof(RGBQUAD)); -- } -+ } -+#endif - } - - /* Create the offscreen bitmap buffer */ -- hdc = GetDC(SDL_Window); -+ hdc = GetDC(SDL_Window); -+#ifdef _WIN32_CE -+ /* See if we need to rotate the buffer (WinCE specific) */ -+ screenWidth = GetDeviceCaps(hdc, HORZRES); -+ screenHeight = GetDeviceCaps(hdc, VERTRES); -+ rotation = SDL_ROTATE_NONE; -+ work_pixels = NULL; -+ if (rotation_pixels) { -+ free(rotation_pixels); -+ rotation_pixels = NULL; -+ } -+ -+ if ((flags & SDL_FULLSCREEN) && (width>height) && (width > screenWidth) ) { -+ /* OK, we rotate the screen */ -+ video->pixels = malloc(video->h * video->pitch); -+ rotation_pixels = video->pixels; -+ if (video->pixels) -+ rotation = SDL_ROTATE_LEFT; -+ OutputDebugString(TEXT("will rotate\r\n")); -+ } -+ screen_bmp = CreateDIBSection(hdc, binfo, DIB_RGB_COLORS, -+ (rotation == SDL_ROTATE_NONE ? (void **)(&video->pixels) : (void**)&work_pixels), NULL, 0); -+#else - screen_bmp = CreateDIBSection(hdc, binfo, DIB_RGB_COLORS, -- (void **)(&video->pixels), NULL, 0); -- ReleaseDC(SDL_Window, hdc); -- free(binfo); -+ (void **)(&video->pixels), NULL, 0); -+#endif -+ ReleaseDC(SDL_Window, hdc); -+#ifdef UNDER_CE -+/* keep bitmapinfo for palette in 8-bit modes for devices that don't have SetDIBColorTable */ -+ last_bits = (rotation == SDL_ROTATE_NONE ? (void **)(&video->pixels) : (void**)&work_pixels); -+ if(last_bitmapinfo) -+ free(last_bitmapinfo); -+ if(is16bitmode) -+ { -+ last_bitmapinfo = 0; -+ free(binfo); -+ } else -+ last_bitmapinfo = binfo; -+#else -+ free(binfo); -+#endif - if ( screen_bmp == NULL ) { - if ( video != current ) { - SDL_FreeSurface(video); - } - SDL_SetError("Couldn't create DIB section"); - return(NULL); -- } -- this->UpdateRects = DIB_NormalUpdate; -+ } -+#ifdef _WIN32_CE -+ this->UpdateRects = (work_pixels ? DIB_RotatedUpdate : DIB_NormalUpdate); -+#else -+ this->UpdateRects = DIB_NormalUpdate; -+#endif - - /* Set video surface flags */ - if ( bpp <= 8 ) { -@@ -695,7 +822,15 @@ - bounds.left = SDL_windowX; - bounds.top = SDL_windowY; - bounds.right = SDL_windowX+video->w; -- bounds.bottom = SDL_windowY+video->h; -+ bounds.bottom = SDL_windowY+video->h; -+#ifdef UNDER_CE -+ if(rotation != SDL_ROTATE_NONE) -+ { -+ int t=bounds.right; -+ bounds.right = bounds.bottom; -+ bounds.bottom=t; -+ } -+#endif - AdjustWindowRectEx(&bounds, GetWindowLong(SDL_Window, GWL_STYLE), FALSE, 0); - width = bounds.right-bounds.left; - height = bounds.bottom-bounds.top; -@@ -709,8 +844,10 @@ - x = (GetSystemMetrics(SM_CXSCREEN)-width)/2; - y = (GetSystemMetrics(SM_CYSCREEN)-height)/2; - } else { -- x = y = -1; -- swp_flags |= SWP_NOMOVE; -+ x = y = -1; -+#ifndef UNDER_CE -+ swp_flags |= SWP_NOMOVE; -+#endif - } - if ( y < 0 ) { /* Cover up title bar for more client area */ - y -= GetSystemMetrics(SM_CYCAPTION)/2; -@@ -719,19 +856,44 @@ - top = HWND_TOPMOST; - } else { - top = HWND_NOTOPMOST; -- } -- SetWindowPos(SDL_Window, top, x, y, width, height, swp_flags); -+ } -+#ifdef _WIN32_CE -+ if (flags & SDL_FULLSCREEN) { -+/* When WinCE program switches resolution from larger to smaller we should move its window so it would be visible in fullscreen */ -+// SetWindowPos(SDL_Window, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); -+ DIB_ShowTaskBar(FALSE); -+ if(x>0) x=0; // remove space from the left side of a screen in 320x200 mode -+ if(y>0) y=0; -+ SetWindowPos(SDL_Window, HWND_TOPMOST, x, y, width, height, SWP_NOCOPYBITS); -+ ShowWindow(SDL_Window, SW_SHOW); -+ } -+ else -+ SetWindowPos(SDL_Window, top, x, y, width, height, swp_flags); -+#else -+ SetWindowPos(SDL_Window, top, x, y, width, height, swp_flags); -+#endif - SDL_resizing = 0; - SetForegroundWindow(SDL_Window); - } - - /* Set up for OpenGL */ -- if ( flags & SDL_OPENGL ) { -+ if ( flags & SDL_OPENGL ) { -+#ifdef HAVE_OPENGL - if ( WIN_GL_SetupWindow(this) < 0 ) { - return(NULL); - } -- video->flags |= SDL_OPENGL; -- } -+ video->flags |= SDL_OPENGL; -+#else -+ return NULL; -+#endif -+ } -+ -+#ifdef ENABLE_WINGAPI -+ /* Grab hardware keys if necessary */ -+ if ( flags & SDL_FULLSCREEN ) { -+ GAPI_GrabHardwareKeys(TRUE); -+ } -+#endif - - /* We're live! */ - return(video); -@@ -754,22 +916,169 @@ - { - return; - } -+ -+#ifdef _WIN32_CE -+ -+static inline void rotateBlit(unsigned short *src, unsigned short *dest, SDL_Rect *rect, int pitch) { -+ int i=rect->w, j=rect->h; -+ src+=i; -+ -+ for (;i--;) { -+ register unsigned short *S=src--; -+// I use loop unrolling to spedup things a little -+ int cnt = j; -+ if(cnt&1) -+ { -+ *(dest++) = *S; -+ S+=pitch; -+ } -+ cnt>>=1; -+ if(cnt&1) -+ { -+ *(dest++) = *S; -+ S+=pitch; -+ *(dest++) = *S; -+ S+=pitch; -+ } -+ cnt>>=1; -+ for (; cnt--; ) { -+ *(dest++) = *S; -+ S+=pitch; -+ *(dest++) = *S; -+ S+=pitch; -+ *(dest++) = *S; -+ S+=pitch; -+ *(dest++) = *S; -+ S+=pitch; -+ } -+ } -+/* tiny optimization -+ int i, j; -+ src+=rect->w; -+ -+ for (i=0; iw; i++) { -+ register unsigned short *S=src--; -+ for (j=0; jh; j++) { -+ *(dest++) = *S; -+ S+=pitch; -+ } -+ } -+*/ -+/* original unoptimized version -+ int i, j; -+ -+ for (i=0; iw; i++) { -+ for (j=0; jh; j++) { -+ dest[i * rect->h + j] = src[pitch * j + (rect->w - i)]; -+ } -+ } -+*/ -+} -+ -+static inline void rotateBlit8(unsigned char *src, unsigned char *dest, SDL_Rect *rect, int pitch) { -+ int i=rect->w, j=rect->h; -+ src+=i; -+ -+ for (;i--;) { -+ register unsigned char *S=src--; -+// I use loop unrolling to spedup things a little -+ int cnt = j; -+ if(cnt&1) -+ { -+ *(dest++) = *S; -+ S+=pitch; -+ } -+ cnt>>=1; -+ if(cnt&1) -+ { -+ *(dest++) = *S; -+ S+=pitch; -+ *(dest++) = *S; -+ S+=pitch; -+ } -+ cnt>>=1; -+ for (; cnt--; ) { -+ *(dest++) = *S; -+ S+=pitch; -+ *(dest++) = *S; -+ S+=pitch; -+ *(dest++) = *S; -+ S+=pitch; -+ *(dest++) = *S; -+ S+=pitch; -+ } -+ } -+} -+ -+static void DIB_RotatedUpdate(_THIS, int numrects, SDL_Rect *rects) -+{ -+ HDC hdc, mdc; -+ HBITMAP hb, old; -+ int i; -+ -+ hdc = GetDC(SDL_Window); -+ if ( screen_pal ) { -+ SelectPalette(hdc, screen_pal, FALSE); -+ } -+ mdc = CreateCompatibleDC(hdc); -+ /*SelectObject(mdc, screen_bmp);*/ -+ if(this->screen->format->BytesPerPixel == 2) { -+ for ( i=0; iscreen->pixels; -+ rotateBlit(src + (this->screen->w * rects[i].y) + rects[i].x, work_pixels, &rects[i], this->screen->w); -+ hb = CreateBitmap(rects[i].h, rects[i].w, 1, 16, work_pixels); -+ old = (HBITMAP)SelectObject(mdc, hb); -+ BitBlt(hdc, rects[i].y, this->screen->w - (rects[i].x + rects[i].w), rects[i].h, rects[i].w, -+ mdc, 0, 0, SRCCOPY); -+ SelectObject(mdc, old); -+ DeleteObject(hb); -+ } -+ } else { -+ if ( screen_pal ) { -+ SelectPalette(mdc, screen_pal, FALSE); -+ } -+ for ( i=0; iscreen->pixels; -+ rotateBlit8(src + (this->screen->w * rects[i].y) + rects[i].x, work_pixels, &rects[i], this->screen->w); -+ hb = CreateBitmap(rects[i].h, rects[i].w, 1, 8, work_pixels); -+ old = (HBITMAP)SelectObject(mdc, hb); -+ BitBlt(hdc, rects[i].y, this->screen->w - (rects[i].x + rects[i].w), rects[i].h, rects[i].w, -+ mdc, 0, 0, SRCCOPY); -+ SelectObject(mdc, old); -+ DeleteObject(hb); -+ } -+ } -+ DeleteDC(mdc); -+ ReleaseDC(SDL_Window, hdc); -+} -+#endif -+ - - static void DIB_NormalUpdate(_THIS, int numrects, SDL_Rect *rects) - { - HDC hdc, mdc; -- int i; -+ int i; -+#ifdef _WIN32_CE -+ HBITMAP old; -+#endif - - hdc = GetDC(SDL_Window); - if ( screen_pal ) { - SelectPalette(hdc, screen_pal, FALSE); - } -- mdc = CreateCompatibleDC(hdc); -- SelectObject(mdc, screen_bmp); -+ mdc = CreateCompatibleDC(hdc); -+#ifdef _WIN32_CE -+ old = (HBITMAP)SelectObject(mdc, screen_bmp); -+#else -+ SelectObject(mdc, screen_bmp); -+#endif - for ( i=0; ibmiHeader.biClrUsed=256; -+ for ( i=firstcolor; ibmiColors[i]=pal[i]; -+ screen_bmp = CreateDIBSection(hdc, last_bitmapinfo, DIB_RGB_COLORS, -+ last_bits, NULL, 0); -+ } -+#else - SelectObject(mdc, screen_bmp); -- SetDIBColorTable(mdc, firstcolor, ncolors, pal); -+ SetDIBColorTable(mdc, firstcolor, ncolors, pal); -+#endif -+#ifndef UNDER_CE - BitBlt(hdc, 0, 0, this->screen->w, this->screen->h, -- mdc, 0, 0, SRCCOPY); -+ mdc, 0, 0, SRCCOPY); -+#else -+ { -+ SDL_Rect rect; -+ rect.x=0; rect.y=0; -+ rect.w=this->screen->w; rect.h=this->screen->h; -+// Fixme: screen flickers: (this->UpdateRects)(this, 1, &rect) ; -+ } -+#endif - DeleteDC(mdc); --#endif - ReleaseDC(SDL_Window, hdc); - return(1); - } -@@ -937,27 +1270,27 @@ - - void DIB_VideoQuit(_THIS) - { -- /* Destroy the window and everything associated with it */ -+ /* Destroy the window and everything associated with it */ -+#ifdef _WIN32_CE -+ DIB_ShowTaskBar(TRUE); -+#ifdef ENABLE_WINGAPI -+ GAPI_GrabHardwareKeys(FALSE); -+#endif -+#endif - if ( SDL_Window ) { - /* Delete the screen bitmap (also frees screen->pixels) */ - if ( this->screen ) { --#ifdef WIN32_PLATFORM_PSPC -- if ( this->screen->flags & SDL_FULLSCREEN ) { -- /* Unhide taskbar, etc. */ -- SHFullScreen(SDL_Window, SHFS_SHOWTASKBAR); -- SHFullScreen(SDL_Window, SHFS_SHOWSIPBUTTON); -- ShowWindow(FindWindow(TEXT("HHTaskBar"),NULL),SW_SHOWNORMAL); -- } --#endif - #ifndef NO_CHANGEDISPLAYSETTINGS - if ( this->screen->flags & SDL_FULLSCREEN ) { - ChangeDisplaySettings(NULL, 0); - ShowWindow(SDL_Window, SW_HIDE); - } --#endif -+#endif -+#ifdef HAVE_OPENGL - if ( this->screen->flags & SDL_OPENGL ) { - WIN_GL_ShutDown(this); -- } -+ } -+#endif - this->screen->pixels = NULL; - } - if ( screen_bmp ) { -diff -ruN SDL-1.2.7-orig/src/video/windib/SDL_dibvideo.h SDL-1.2.7/src/video/windib/SDL_dibvideo.h ---- SDL-1.2.7-orig/src/video/windib/SDL_dibvideo.h Wed Feb 18 09:22:10 2004 -+++ SDL-1.2.7/src/video/windib/SDL_dibvideo.h Thu Nov 18 13:13:42 2004 -@@ -29,11 +29,26 @@ - #define _SDL_dibvideo_h - - #include -+ -+//#ifdef _WIN32_CE -+/* Rotation direction */ -+typedef enum { -+ SDL_ROTATE_NONE, -+ SDL_ROTATE_LEFT, -+ SDL_ROTATE_RIGHT -+} SDL_RotateAttr; -+//#endif - - /* Private display data */ - struct SDL_PrivateVideoData { - HBITMAP screen_bmp; -- HPALETTE screen_pal; -+ HPALETTE screen_pal; -+//#ifdef _WIN32_CE -+ void *work_pixels; /* if the display needs to be rotated, memory allocated by the API */ -+ void *rotation_pixels; /* if the display needs to be rotated, memory allocated by the code */ -+ SDL_RotateAttr rotation; -+ char ozoneHack; /* force stylus translation if running without Hi Res flag */ -+//#endif - - #define NUM_MODELISTS 4 /* 8, 16, 24, and 32 bits-per-pixel */ - int SDL_nummodes[NUM_MODELISTS]; -@@ -43,6 +58,12 @@ - #define screen_bmp (this->hidden->screen_bmp) - #define screen_pal (this->hidden->screen_pal) - #define SDL_nummodes (this->hidden->SDL_nummodes) --#define SDL_modelist (this->hidden->SDL_modelist) -+#define SDL_modelist (this->hidden->SDL_modelist) -+//#ifdef _WIN32_CE -+#define work_pixels (this->hidden->work_pixels) -+#define rotation (this->hidden->rotation) -+#define rotation_pixels (this->hidden->rotation_pixels) -+#define ozoneHack (this->hidden->ozoneHack) -+//#endif - - #endif /* _SDL_dibvideo_h */ -diff -ruN SDL-1.2.7-orig/src/video/wingapi/SDL_gapivideo.c SDL-1.2.7/src/video/wingapi/SDL_gapivideo.c ---- SDL-1.2.7-orig/src/video/wingapi/SDL_gapivideo.c Wed Dec 31 19:00:00 1969 -+++ SDL-1.2.7/src/video/wingapi/SDL_gapivideo.c Thu Nov 18 13:43:27 2004 -@@ -0,0 +1,956 @@ -+/* -+ SDL - Simple DirectMedia Layer -+ Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Library General Public -+ License as published by the Free Software Foundation; either -+ version 2 of the License, or (at your option) any later version. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Library General Public License for more details. -+ -+ You should have received a copy of the GNU Library General Public -+ License along with this library; if not, write to the Free -+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ -+ Sam Lantinga -+ slouken@libsdl.org -+*/ -+ -+#ifdef SAVE_RCSID -+static char rcsid = -+ "@(#) $Id: SDL_gapivideo.c,v 1.5 2004/02/29 21:54:11 lemure Exp $"; -+#endif -+ -+/* Dummy SDL video driver implementation; this is just enough to make an -+ * SDL-based application THINK it's got a working video driver, for -+ * applications that call SDL_Init(SDL_INIT_VIDEO) when they don't need it, -+ * and also for use as a collection of stubs when porting SDL to a new -+ * platform for which you haven't yet written a valid video driver. -+ * -+ * This is also a great way to determine bottlenecks: if you think that SDL -+ * is a performance problem for a given platform, enable this driver, and -+ * then see if your application runs faster without video overhead. -+ * -+ * Initial work by Ryan C. Gordon (icculus@linuxgames.com). A good portion -+ * of this was cut-and-pasted from Stephane Peter's work in the AAlib -+ * SDL video driver. Renamed to "DUMMY" by Sam Lantinga. -+ */ -+ -+#include -+#include -+#include -+#include -+ -+/* Not yet in the mingw32 cross-compile headers */ -+#ifndef CDS_FULLSCREEN -+#define CDS_FULLSCREEN 4 -+#endif -+ -+#ifndef WS_THICKFRAME -+#define WS_THICKFRAME 0 -+#endif -+ -+#include "SDL.h" -+#include "SDL_mutex.h" -+#include "SDL_syswm.h" -+#include "SDL_sysvideo.h" -+#include "SDL_sysevents.h" -+#include "SDL_events_c.h" -+#include "SDL_pixels_c.h" -+#include "SDL_syswm_c.h" -+#include "SDL_sysmouse_c.h" -+#include "SDL_dibevents_c.h" -+#include "SDL_gapivideo.h" -+ -+#if defined(WIN32_PLATFORM_PSPC) -+#include // Add Pocket PC includes -+#pragma comment( lib, "aygshell" ) // Link Pocket PC library -+#endif -+ -+#ifdef _WIN32_WCE -+extern void DIB_ShowTaskBar(BOOL taskBarShown); -+#endif -+ -+ -+/* Initialization/Query functions */ -+static int GAPI_VideoInit(_THIS, SDL_PixelFormat *vformat); -+static SDL_Rect **GAPI_ListModes(_THIS, SDL_PixelFormat *format, Uint32 flags); -+static SDL_Surface *GAPI_SetVideoMode(_THIS, SDL_Surface *current, int width, int height, int bpp, Uint32 flags); -+static int GAPI_SetColors(_THIS, int firstcolor, int ncolors, SDL_Color *colors); -+static void GAPI_VideoQuit(_THIS); -+ -+ -+/* Hardware surface functions */ -+static int GAPI_AllocHWSurface(_THIS, SDL_Surface *surface); -+static int GAPI_LockHWSurface(_THIS, SDL_Surface *surface); -+static void GAPI_UnlockHWSurface(_THIS, SDL_Surface *surface); -+static void GAPI_FreeHWSurface(_THIS, SDL_Surface *surface); -+ -+/* Windows message handling functions, will not be processed */ -+static void GAPI_RealizePalette(_THIS); -+static void GAPI_PaletteChanged(_THIS, HWND window); -+static void GAPI_WinPAINT(_THIS, HDC hdc); -+ -+static void GAPI_UpdateRects(_THIS, int numrects, SDL_Rect *rects); -+/*static void GAPI_UpdateRectsMono(_THIS, int numrects, SDL_Rect *rects);*/ -+ -+static int GAPI_Available(void); -+static SDL_VideoDevice *GAPI_CreateDevice(int devindex); -+ -+void GAPI_GrabHardwareKeys(BOOL grab); -+ -+VideoBootStrap WINGAPI_bootstrap = { -+ "wingapi", "WinCE GAPI", -+ GAPI_Available, GAPI_CreateDevice -+}; -+ -+/* 2003 SE GAPI emulation */ -+ -+#define GETRAWFRAMEBUFFER 0x00020001 -+ -+#define FORMAT_565 1 -+#define FORMAT_555 2 -+#define FORMAT_OTHER 3 -+ -+static void* _OzoneFrameBuffer = NULL; -+static struct GXDisplayProperties _OzoneDisplayProperties; -+static char _OzoneAvailable = 0; -+ -+typedef struct _RawFrameBufferInfo -+{ -+ WORD wFormat; -+ WORD wBPP; -+ VOID *pFramePointer; -+ int cxStride; -+ int cyStride; -+ int cxPixels; -+ int cyPixels; -+} RawFrameBufferInfo; -+ -+ -+struct GXDisplayProperties Ozone_GetDisplayProperties(void) { -+ return _OzoneDisplayProperties; -+} -+ -+int Ozone_OpenDisplay(HWND window, unsigned long flag) { -+ return 1; -+} -+ -+int Ozone_CloseDisplay(void) { -+ return 1; -+} -+ -+void* Ozone_BeginDraw(void) { -+ return _OzoneFrameBuffer; -+} -+ -+int Ozone_EndDraw(void) { -+ return 1; -+} -+ -+int Ozone_Suspend(void) { -+ return 1; -+} -+ -+int Ozone_Resume(void) { -+ return 1; -+} -+ -+static HINSTANCE checkOzone(tGXDisplayProperties *gxGetDisplayProperties, tGXOpenDisplay *gxOpenDisplay, -+ tGXVoidFunction *gxCloseDisplay, tGXBeginDraw *gxBeginDraw, -+ tGXVoidFunction *gxEndDraw, tGXVoidFunction *gxSuspend, tGXVoidFunction *gxResume) { -+#ifdef ARM -+ -+ int result; -+ RawFrameBufferInfo frameBufferInfo; -+ HDC hdc = GetDC(NULL); -+ result = ExtEscape(hdc, GETRAWFRAMEBUFFER, 0, NULL, sizeof(RawFrameBufferInfo), (char *)&frameBufferInfo); -+ ReleaseDC(NULL, hdc); -+ if (result < 0) -+ return NULL; -+ OutputDebugString(TEXT("Running on Ozone\r\n")); -+ _OzoneAvailable = 1; -+ -+ // Initializing global parameters -+ _OzoneFrameBuffer = frameBufferInfo.pFramePointer; -+ _OzoneDisplayProperties.cBPP = frameBufferInfo.wBPP; -+ _OzoneDisplayProperties.cbxPitch = frameBufferInfo.cxStride; -+ _OzoneDisplayProperties.cbyPitch = frameBufferInfo.cyStride; -+ _OzoneDisplayProperties.cxWidth = frameBufferInfo.cxPixels; -+ _OzoneDisplayProperties.cyHeight = frameBufferInfo.cyPixels; -+ if (frameBufferInfo.wFormat == FORMAT_565) -+ _OzoneDisplayProperties.ffFormat = kfDirect565; -+ else -+ if (frameBufferInfo.wFormat == FORMAT_555) -+ _OzoneDisplayProperties.ffFormat = kfDirect555; -+ else { -+ OutputDebugString(TEXT("Ozone unknown screen format")); -+ return NULL; -+ } -+ -+ if (gxGetDisplayProperties) -+ *gxGetDisplayProperties = Ozone_GetDisplayProperties; -+ if (gxOpenDisplay) -+ *gxOpenDisplay = Ozone_OpenDisplay; -+ if (gxCloseDisplay) -+ *gxCloseDisplay = Ozone_CloseDisplay; -+ if (gxBeginDraw) -+ *gxBeginDraw = Ozone_BeginDraw; -+ if (gxEndDraw) -+ *gxEndDraw = Ozone_EndDraw; -+ if (gxSuspend) -+ *gxSuspend = Ozone_Suspend; -+ if (gxResume) -+ *gxResume = Ozone_Resume; -+ -+ return (HINSTANCE)1; -+ -+#else -+ -+ return NULL; -+ -+#endif -+} -+ -+int getScreenWidth() { -+ return (_OzoneFrameBuffer ? _OzoneDisplayProperties.cxWidth : GetSystemMetrics(SM_CXSCREEN)); -+} -+ -+int getScreenHeight() { -+ return (_OzoneFrameBuffer ? _OzoneDisplayProperties.cyHeight : GetSystemMetrics(SM_CYSCREEN)); -+} -+ -+ -+/* Check GAPI library */ -+ -+#define IMPORT(Handle,Variable,Type,Function, Store) \ -+ Variable = GetProcAddress(Handle, TEXT(Function)); \ -+ if (!Variable) { \ -+ FreeLibrary(Handle); \ -+ return NULL; \ -+ } \ -+ if (Store) \ -+ *Store = (Type)Variable; -+ -+static HINSTANCE checkGAPI(tGXDisplayProperties *gxGetDisplayProperties, tGXOpenDisplay *gxOpenDisplay, -+ tGXVoidFunction *gxCloseDisplay, tGXBeginDraw *gxBeginDraw, -+ tGXVoidFunction *gxEndDraw, tGXVoidFunction *gxSuspend, tGXVoidFunction *gxResume, -+ BOOL bypassOzone) { -+ HMODULE gapiLibrary; -+ FARPROC proc; -+ HINSTANCE result; -+ // FIXME paletted ! -+ tGXDisplayProperties temp_gxGetDisplayProperties; -+ -+ // Workaround for Windows Mobile 2003 SE -+ _OzoneFrameBuffer = NULL; -+ if (!bypassOzone) { -+ result = checkOzone(gxGetDisplayProperties, gxOpenDisplay, gxCloseDisplay, gxBeginDraw, gxEndDraw, gxSuspend, gxResume); -+ if (result) -+ return result; -+ } -+ -+ gapiLibrary = LoadLibrary(TEXT("gx.dll")); -+ if (!gapiLibrary) -+ return NULL; -+ -+ IMPORT(gapiLibrary, proc, tGXDisplayProperties, "?GXGetDisplayProperties@@YA?AUGXDisplayProperties@@XZ", gxGetDisplayProperties) -+ IMPORT(gapiLibrary, proc, tGXOpenDisplay, "?GXOpenDisplay@@YAHPAUHWND__@@K@Z", gxOpenDisplay) -+ IMPORT(gapiLibrary, proc, tGXVoidFunction, "?GXCloseDisplay@@YAHXZ", gxCloseDisplay) -+ IMPORT(gapiLibrary, proc, tGXBeginDraw, "?GXBeginDraw@@YAPAXXZ", gxBeginDraw) -+ IMPORT(gapiLibrary, proc, tGXVoidFunction, "?GXEndDraw@@YAHXZ", gxEndDraw) -+ IMPORT(gapiLibrary, proc, tGXVoidFunction, "?GXSuspend@@YAHXZ", gxSuspend) -+ IMPORT(gapiLibrary, proc, tGXVoidFunction, "?GXResume@@YAHXZ", gxResume) -+ -+ // FIXME paletted ! for the moment we just bail out -+ if (!gxGetDisplayProperties) { -+ IMPORT(gapiLibrary, proc, tGXDisplayProperties, "?GXGetDisplayProperties@@YA?AUGXDisplayProperties@@XZ", &temp_gxGetDisplayProperties) -+ if (temp_gxGetDisplayProperties().ffFormat & kfPalette) { -+ FreeLibrary(gapiLibrary); -+ return NULL; -+ } -+ FreeLibrary(gapiLibrary); -+ gapiLibrary = (HINSTANCE)1; -+ } -+ -+ return gapiLibrary; -+} -+ -+ -+/* GAPI driver bootstrap functions */ -+ -+static int GAPI_Available(void) -+{ -+ /* Check if the GAPI library is available */ -+ -+ if (!checkGAPI(NULL, NULL, NULL, NULL, NULL, NULL, NULL, FALSE)) { -+ OutputDebugString(TEXT("GAPI driver not available\r\n")); -+ return 0; -+ } -+ else { -+ OutputDebugString(TEXT("GAPI driver available\r\n")); -+ return 1; -+ } -+} -+ -+static void GAPI_DeleteDevice(SDL_VideoDevice *device) -+{ -+ if (device && device->hidden && device->hidden->gapiFuncs.dynamicGXCloseDisplay) -+ device->hidden->gapiFuncs.dynamicGXCloseDisplay(); -+ -+ if (device && device->hidden) -+ free(device->hidden); -+ if (device) -+ free(device); -+ -+} -+ -+static SDL_VideoDevice *GAPI_CreateDevice(int devindex) -+{ -+ SDL_VideoDevice *device; -+ -+ /* Initialize all variables that we clean on shutdown */ -+ device = (SDL_VideoDevice *)malloc(sizeof(SDL_VideoDevice)); -+ if ( device ) { -+ memset(device, 0, (sizeof *device)); -+ device->hidden = (struct SDL_PrivateVideoData *) -+ malloc((sizeof *device->hidden)); -+ } -+ if ( (device == NULL) || (device->hidden == NULL) ) { -+ SDL_OutOfMemory(); -+ if ( device ) { -+ free(device); -+ } -+ return(0); -+ } -+ memset(device->hidden, 0, (sizeof *device->hidden)); -+ -+ /* Set GAPI pointers */ -+ -+ checkGAPI(&device->hidden->gapiFuncs.dynamicGXGetDisplayProperties, -+ &device->hidden->gapiFuncs.dynamicGXOpenDisplay, -+ &device->hidden->gapiFuncs.dynamicGXCloseDisplay, -+ &device->hidden->gapiFuncs.dynamicGXBeginDraw, -+ &device->hidden->gapiFuncs.dynamicGXEndDraw, -+ &device->hidden->gapiFuncs.dynamicGXSuspend, -+ &device->hidden->gapiFuncs.dynamicGXResume, -+ FALSE); -+ device->hidden->displayProps = device->hidden->gapiFuncs.dynamicGXGetDisplayProperties(); -+ -+ /* Set the function pointers */ -+ -+ device->VideoInit = GAPI_VideoInit; -+ device->ListModes = GAPI_ListModes; -+ device->SetVideoMode = GAPI_SetVideoMode; -+ device->UpdateMouse = WIN_UpdateMouse; -+ device->SetColors = GAPI_SetColors; -+ device->UpdateRects = NULL; -+ device->VideoQuit = GAPI_VideoQuit; -+ device->AllocHWSurface = GAPI_AllocHWSurface; -+ device->CheckHWBlit = NULL; -+ device->FillHWRect = NULL; -+ device->SetHWColorKey = NULL; -+ device->SetHWAlpha = NULL; -+ device->LockHWSurface = GAPI_LockHWSurface; -+ device->UnlockHWSurface = GAPI_UnlockHWSurface; -+ device->FlipHWSurface = NULL; -+ device->FreeHWSurface = GAPI_FreeHWSurface; -+ device->SetCaption = WIN_SetWMCaption; -+ device->SetIcon = WIN_SetWMIcon; -+ device->IconifyWindow = WIN_IconifyWindow; -+ device->GrabInput = WIN_GrabInput; -+ device->GetWMInfo = WIN_GetWMInfo; -+ device->FreeWMCursor = WIN_FreeWMCursor; -+ device->CreateWMCursor = WIN_CreateWMCursor; -+ device->ShowWMCursor = WIN_ShowWMCursor; -+ device->WarpWMCursor = WIN_WarpWMCursor; -+ device->CheckMouseMode = WIN_CheckMouseMode; -+ device->InitOSKeymap = DIB_InitOSKeymap; -+ device->PumpEvents = DIB_PumpEvents; -+ -+ device->SetColors = GAPI_SetColors; -+ -+ /* Set up the windows message handling functions */ -+ WIN_RealizePalette = GAPI_RealizePalette; -+ WIN_PaletteChanged = GAPI_PaletteChanged; -+ WIN_WinPAINT = GAPI_WinPAINT; -+ HandleMessage = DIB_HandleMessage; -+ -+ device->free = GAPI_DeleteDevice; -+ -+ -+ /* -+ device->VideoInit = GAPI_VideoInit; -+ device->ListModes = GAPI_ListModes; -+ device->SetVideoMode = GAPI_SetVideoMode; -+ device->CreateYUVOverlay = NULL; -+ device->SetColors = DUMMY_SetColors; -+ device->UpdateRects = DUMMY_UpdateRects; -+ device->VideoQuit = DUMMY_VideoQuit; -+ device->AllocHWSurface = DUMMY_AllocHWSurface; -+ device->CheckHWBlit = NULL; -+ device->FillHWRect = NULL; -+ device->SetHWColorKey = NULL; -+ device->SetHWAlpha = NULL; -+ device->LockHWSurface = DUMMY_LockHWSurface; -+ device->UnlockHWSurface = DUMMY_UnlockHWSurface; -+ device->FlipHWSurface = NULL; -+ device->FreeHWSurface = DUMMY_FreeHWSurface; -+ device->SetCaption = NULL; -+ device->SetIcon = NULL; -+ device->IconifyWindow = NULL; -+ device->GrabInput = NULL; -+ device->GetWMInfo = NULL; -+ device->InitOSKeymap = DUMMY_InitOSKeymap; -+ device->PumpEvents = DUMMY_PumpEvents; -+ -+ device->free = DUMMY_DeleteDevice; -+ */ -+ -+ return device; -+} -+ -+ -+int GAPI_VideoInit(_THIS, SDL_PixelFormat *vformat) -+{ -+ -+ /* Create the window */ -+ if ( DIB_CreateWindow(this) < 0 ) { -+ return(-1); -+ } -+ -+ vformat->BitsPerPixel = (unsigned char)displayProperties.cBPP; -+ -+ // Get color mask -+ if (displayProperties.ffFormat & kfDirect565) { -+ vformat->BitsPerPixel = 16; -+ vformat->Rmask = 0x0000f800; -+ vformat->Gmask = 0x000007e0; -+ vformat->Bmask = 0x0000001f; -+ videoMode = GAPI_DIRECT_565; -+ } -+ else -+ if (displayProperties.ffFormat & kfDirect555) { -+ vformat->BitsPerPixel = 16; -+ vformat->Rmask = 0x00007c00; -+ vformat->Gmask = 0x000003e0; -+ vformat->Bmask = 0x0000001f; -+ videoMode = GAPI_DIRECT_555; -+ } -+ else -+ if ((displayProperties.ffFormat & kfDirect) && (displayProperties.cBPP <= 8)) { -+ // We'll perform the conversion -+ vformat->BitsPerPixel = 24; -+ vformat->Rmask = 0x00ff0000; -+ vformat->Gmask = 0x0000ff00; -+ vformat->Bmask = 0x000000ff; -+ if (displayProperties.ffFormat & kfDirectInverted) -+ invert = (1 << displayProperties.cBPP) - 1; -+ colorscale = displayProperties.cBPP < 8 ? 8 - displayProperties.cBPP : 0; -+ videoMode = GAPI_MONO; -+ } -+ else -+ if (displayProperties.ffFormat & kfPalette) { -+ videoMode = GAPI_PALETTE; -+ } -+ -+ /* Set UpdateRect callback */ -+ // FIXME -+ /* -+ if (videoMode != GAPI_MONO) -+ this->UpdateRects = GAPI_UpdateRects; -+ else -+ this->UpdateRects = GAPI_UpdateRectsMono; -+ */ -+ -+ this->UpdateRects = GAPI_UpdateRects; -+ -+ /* We're done! */ -+ return(0); -+} -+ -+SDL_Rect **GAPI_ListModes(_THIS, SDL_PixelFormat *format, Uint32 flags) -+{ -+ return (SDL_Rect **) -1; -+} -+ -+SDL_Surface *GAPI_SetVideoMode(_THIS, SDL_Surface *current, -+ int width, int height, int bpp, Uint32 flags) -+{ -+ SDL_Surface *video; -+ Uint32 Rmask, Gmask, Bmask; -+ Uint32 prev_flags; -+ DWORD style; -+ const DWORD directstyle = -+ (WS_POPUP); -+ const DWORD windowstyle = -+ (WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_MINIMIZEBOX); -+ const DWORD resizestyle = -+ (WS_THICKFRAME|WS_MAXIMIZEBOX); -+ int screenWidth, screenHeight; -+ BOOL was_visible; -+ -+ /* We negociate legacy GAPI if we want a screen that fits in QVGA */ -+ if (_OzoneAvailable && _OzoneFrameBuffer && (width <= GetSystemMetrics(SM_CXSCREEN) || width <= GetSystemMetrics(SM_CYSCREEN)) && -+ (height <= GetSystemMetrics(SM_CXSCREEN) || height <= GetSystemMetrics(SM_CYSCREEN))) { -+ OutputDebugString(TEXT("Ozone workaround, switching back to GAPI\r\n")); -+ ozoneHack = 0; -+ checkGAPI(&this->hidden->gapiFuncs.dynamicGXGetDisplayProperties, -+ &this->hidden->gapiFuncs.dynamicGXOpenDisplay, -+ &this->hidden->gapiFuncs.dynamicGXCloseDisplay, -+ &this->hidden->gapiFuncs.dynamicGXBeginDraw, -+ &this->hidden->gapiFuncs.dynamicGXEndDraw, -+ &this->hidden->gapiFuncs.dynamicGXSuspend, -+ &this->hidden->gapiFuncs.dynamicGXResume, -+ TRUE); -+ this->hidden->displayProps = this->hidden->gapiFuncs.dynamicGXGetDisplayProperties(); -+ } -+ /* Otherwise we'll use the new system call */ -+ if (_OzoneAvailable && !_OzoneFrameBuffer && (width > GetSystemMetrics(SM_CXSCREEN) && width > GetSystemMetrics(SM_CYSCREEN)) && -+ (height > GetSystemMetrics(SM_CXSCREEN) && height > GetSystemMetrics(SM_CYSCREEN))) { -+ OutputDebugString(TEXT("Ozone workaround, switching back to true Ozone\r\n")); -+ checkGAPI(&this->hidden->gapiFuncs.dynamicGXGetDisplayProperties, -+ &this->hidden->gapiFuncs.dynamicGXOpenDisplay, -+ &this->hidden->gapiFuncs.dynamicGXCloseDisplay, -+ &this->hidden->gapiFuncs.dynamicGXBeginDraw, -+ &this->hidden->gapiFuncs.dynamicGXEndDraw, -+ &this->hidden->gapiFuncs.dynamicGXSuspend, -+ &this->hidden->gapiFuncs.dynamicGXResume, -+ FALSE); -+ this->hidden->displayProps = this->hidden->gapiFuncs.dynamicGXGetDisplayProperties(); -+ } -+ /* Which will need a tiny input hack if the original code does not have the "Hi Res" aware ressource property set */ -+ ozoneHack = 0; -+ if (_OzoneFrameBuffer && (GetSystemMetrics(SM_CXSCREEN) != (signed) _OzoneDisplayProperties.cxWidth || -+ GetSystemMetrics(SM_CYSCREEN) != (signed) _OzoneDisplayProperties.cyHeight)) { -+ OutputDebugString(TEXT("Running true Ozone with stylus hack\r\n")); -+ ozoneHack = 1; -+ } -+ -+ /* See whether or not we should center the window */ -+ was_visible = IsWindowVisible(SDL_Window); -+ -+ /* Recalculate bitmasks if necessary */ -+ if (bpp == current->format->BitsPerPixel) { -+ video = current; -+ } -+ else { -+ switch(bpp) { -+ case 8: -+ Rmask = 0; -+ Gmask = 0; -+ Bmask = 0; -+ break; -+ case 15: -+ case 16: -+ /* Default is 565 unless the display is specifically 555 */ -+ if (displayProperties.ffFormat & kfDirect555) { -+ Rmask = 0x00007c00; -+ Gmask = 0x000003e0; -+ Bmask = 0x0000001f; -+ } -+ else { -+ Rmask = 0x0000f800; -+ Gmask = 0x000007e0; -+ Bmask = 0x0000001f; -+ } -+ break; -+ case 24: -+ case 32: -+ Rmask = 0x00ff0000; -+ Gmask = 0x0000ff00; -+ Bmask = 0x000000ff; -+ break; -+ default: -+ SDL_SetError("Unsupported Bits Per Pixel format requested"); -+ return NULL; -+ } -+ video = SDL_CreateRGBSurface(SDL_SWSURFACE, -+ 0, 0, bpp, Rmask, Gmask, Bmask, 0); -+ if ( video == NULL ) { -+ SDL_OutOfMemory(); -+ return(NULL); -+ } -+ } -+ -+ /* Fill in part of the video surface */ -+ prev_flags = video->flags; -+ video->flags = 0; /* Clear flags */ -+ video->w = width; -+ video->h = height; -+ video->pitch = SDL_CalculatePitch(video); -+ mainSurfaceWidth = width; -+ mainSurfaceHeight = height; -+ -+//#ifdef WIN32_PLATFORM_PSPC -+ /* Hide taskbar */ -+ if ( flags & SDL_FULLSCREEN ) { -+ if ( !(prev_flags & SDL_FULLSCREEN) ) { -+ //SHFullScreen(SDL_Window, SHFS_HIDETASKBAR | SHFS_HIDESIPBUTTON | SHFS_HIDESTARTICON); -+ //ShowWindow(FindWindow(TEXT("HHTaskBar"),NULL),SW_HIDE); -+ DIB_ShowTaskBar(FALSE); -+ } -+ video->flags |= SDL_FULLSCREEN; -+ } else { -+ if ( prev_flags & SDL_FULLSCREEN ) { -+ //SHFullScreen(SDL_Window, SHFS_SHOWTASKBAR | SHFS_SHOWSIPBUTTON | SHFS_SHOWSTARTICON); -+ //ShowWindow(FindWindow(TEXT("HHTaskBar"),NULL),SW_SHOWNORMAL); -+ DIB_ShowTaskBar(TRUE); -+ } -+ } -+//#endif -+ -+ /* Reset the palette and create a new one if necessary */ -+ if (screenPal != NULL) { -+ DeleteObject(screenPal); -+ screenPal = NULL; -+ } -+ -+ /* See if we need to create a translation palette */ -+ if (convertPalette != NULL) { -+ free(convertPalette); -+ } -+ if (bpp == 8) { -+ OutputDebugString(TEXT("creating palette\r\n")); -+ convertPalette = (unsigned short*)malloc(256 * sizeof(unsigned short)); -+ } -+ -+ if (displayProperties.ffFormat & kfPalette) { -+ /* Will only be able to support 256 colors in this mode */ -+ // FIXME -+ //screenPal = GAPI_CreatePalette(); -+ } -+ -+ /* Set Window style */ -+ style = GetWindowLong(SDL_Window, GWL_STYLE); -+ if ( (video->flags & SDL_FULLSCREEN) == SDL_FULLSCREEN ) { -+ style &= ~windowstyle; -+ style |= directstyle; -+ } else { -+ if ( flags & SDL_NOFRAME ) { -+ style &= ~windowstyle; -+ style |= directstyle; -+ video->flags |= SDL_NOFRAME; -+ } else { -+ style &= ~directstyle; -+ style |= windowstyle; -+ if ( flags & SDL_RESIZABLE ) { -+ style |= resizestyle; -+ video->flags |= SDL_RESIZABLE; -+ } -+ } -+#if WS_MAXIMIZE -+ if (IsZoomed(SDL_Window)) style |= WS_MAXIMIZE; -+#endif -+ } -+ -+ if (!SDL_windowid) -+ SetWindowLong(SDL_Window, GWL_STYLE, style); -+ -+ /* Allocate bitmap */ -+ if (gapiBuffer) { -+ free(gapiBuffer); -+ gapiBuffer = NULL; -+ } -+ gapiBuffer = malloc(video->h * video->pitch); -+ video->pixels = gapiBuffer; -+ -+ /* See if we will rotate */ -+ rotation = SDL_ROTATE_NONE; -+ screenWidth = getScreenWidth(); -+ screenHeight = getScreenHeight(); -+ if ((flags & SDL_FULLSCREEN) && -+ (width > screenWidth && width <= screenHeight) -+ ) -+ { -+ rotation = SDL_ROTATE_LEFT; -+ } -+ /* Compute the different drawing properties */ -+ switch(rotation) { -+ case SDL_ROTATE_NONE: -+ dstPixelstep = displayProperties.cbxPitch; -+ dstLinestep = displayProperties.cbyPitch; -+ startOffset = 0; -+ break; -+ case SDL_ROTATE_LEFT: -+ dstPixelstep = -displayProperties.cbyPitch; -+ dstLinestep = displayProperties.cbxPitch; -+ startOffset = displayProperties.cbyPitch * (displayProperties.cyHeight - 1); -+ break; -+ case SDL_ROTATE_RIGHT: -+ dstPixelstep = displayProperties.cbyPitch; -+ dstLinestep = -displayProperties.cbxPitch; -+ startOffset = displayProperties.cbxPitch * (displayProperties.cxWidth - 1); -+ break; -+ } -+ /* Compute padding */ -+ padWidth = 0; -+ padHeight = 0; -+ if (rotation == SDL_ROTATE_NONE) { -+ if (getScreenWidth() > width) -+ padWidth = (getScreenWidth() - width) / 2; -+ if (getScreenHeight() > height) -+ padHeight = (getScreenHeight() - height) / 2; -+ } -+ else { -+ if (getScreenWidth() > height) -+ padWidth = (getScreenWidth() - height) / 2; -+ if (getScreenHeight() > width) -+ padHeight = (getScreenHeight() - width) / 2; -+ } -+ srcLinestep = video->pitch; -+ srcPixelstep = (bpp == 15 ? 2 : bpp / 8); -+ -+ MoveWindow(SDL_Window, 0, 0, getScreenWidth(), getScreenHeight(), FALSE); -+ ShowWindow(SDL_Window, SW_SHOW); -+ -+ /* Resize the window */ -+ //if ( SDL_windowid == NULL ) { -+ if (0) { -+ HWND top; -+ UINT swp_flags; -+ RECT bounds; -+ int x,y; -+ -+ SDL_resizing = 1; -+ bounds.left = 0; -+ bounds.top = 0; -+ bounds.right = video->w; -+ bounds.bottom = video->h; -+ AdjustWindowRectEx(&bounds, GetWindowLong(SDL_Window, GWL_STYLE), FALSE, 0); -+ width = bounds.right-bounds.left; -+ height = bounds.bottom-bounds.top; -+ x = (getScreenWidth()-width)/2; -+ y = (getScreenHeight()-height)/2; -+ if ( y < 0 ) { /* Cover up title bar for more client area */ -+ y -= GetSystemMetrics(SM_CYCAPTION)/2; -+ } -+ swp_flags = (SWP_FRAMECHANGED | SWP_SHOWWINDOW); -+ if ( was_visible && !(flags & SDL_FULLSCREEN) ) { -+ swp_flags |= SWP_NOMOVE; -+ } -+ if ( flags & SDL_FULLSCREEN ) { -+ top = HWND_TOPMOST; -+ } else { -+ top = HWND_NOTOPMOST; -+ } -+ -+ if (flags & SDL_FULLSCREEN) { -+ SetWindowPos(SDL_Window, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); -+ ShowWindow(SDL_Window, SW_SHOW); -+ } -+ else -+ SetWindowPos(SDL_Window, top, x, y, width, height, swp_flags); -+ -+ SDL_resizing = 0; -+ SetForegroundWindow(SDL_Window); -+ } -+ -+ /* Open GAPI display */ -+ GXOpenDisplay(SDL_Window, (flags & SDL_FULLSCREEN ? GX_FULLSCREEN : 0)); -+ -+ /* Grab hardware keys if necessary */ -+ if (flags & SDL_FULLSCREEN) -+ GAPI_GrabHardwareKeys(TRUE); -+ -+ /* Blank screen */ -+ memset(GXBeginDraw(), 0, getScreenWidth() * getScreenHeight() * 2); -+ GXEndDraw(); -+ -+ /* We're done */ -+ return(video); -+} -+ -+/* We don't actually allow hardware surfaces other than the main one */ -+static int GAPI_AllocHWSurface(_THIS, SDL_Surface *surface) -+{ -+ return(-1); -+} -+static void GAPI_FreeHWSurface(_THIS, SDL_Surface *surface) -+{ -+ return; -+} -+ -+/* We need to wait for vertical retrace on page flipped displays */ -+static int GAPI_LockHWSurface(_THIS, SDL_Surface *surface) -+{ -+ return(0); -+} -+ -+static void GAPI_UnlockHWSurface(_THIS, SDL_Surface *surface) -+{ -+ return; -+} -+ -+static void updateLine(_THIS, unsigned char *srcPointer, unsigned char *destPointer, int width) { -+ // FIXME, we assume everything is in the correct format, either 16 bits 565 or 555, or 8 bits -+ int i; -+ for (i=0; i= 8) \ -+ { \ -+ bitshift = 0; \ -+ bitmask = (1<>= displayProperties.cBPP; -+ -+ -+static void GAPI_UpdateRectsMono(_THIS, int numrects, SDL_Rect *rects) -+{ -+ int i; -+ unsigned char *screenBuffer; -+ -+ screenBuffer = GXBeginDraw(); -+ -+ for (i=0; i>3)) -+ -+#define COLORCONV555(r,g,b) (((r&0xf8)<<(10-3))|((g&0xf8)<<(5-2))|((b&0xf8)>>3)) -+ -+int GAPI_SetColors(_THIS, int firstcolor, int ncolors, SDL_Color *colors) -+{ -+ int i; -+ /* Convert colors to appropriate 565 or 555 mapping */ -+ for (i=0; ipixels) */ -+ if ( this->screen ) { -+//#ifdef WIN32_PLATFORM_PSPC -+ if ( this->screen->flags & SDL_FULLSCREEN ) { -+ /* Unhide taskbar, etc. */ -+ //SHFullScreen(SDL_Window, SHFS_SHOWTASKBAR | SHFS_SHOWSIPBUTTON | SHFS_SHOWSTARTICON); -+ //ShowWindow(FindWindow(TEXT("HHTaskBar"),NULL),SW_SHOWNORMAL); -+ DIB_ShowTaskBar(TRUE); -+ GAPI_GrabHardwareKeys(FALSE); -+ } -+//#endif -+ -+ if (this->screen->pixels != NULL) -+ { -+ free(this->screen->pixels); -+ this->screen->pixels = NULL; -+ } -+ -+ if (GXCloseDisplay) -+ GXCloseDisplay(); -+ } -+ } -+} -+ -+void GAPI_GrabHardwareKeys(BOOL grab) { -+ HINSTANCE GAPI_handle; -+ tGXVoidFunction GAPIActionInput; -+ -+ GAPI_handle = LoadLibrary(TEXT("gx.dll")); -+ if (!GAPI_handle) -+ return; -+ GAPIActionInput = (tGXVoidFunction)GetProcAddress(GAPI_handle, (grab ? TEXT("?GXOpenInput@@YAHXZ") : TEXT("?GXCloseInput@@YAHXZ"))); -+ if (GAPIActionInput) { -+ GAPIActionInput(); -+ } -+ FreeLibrary(GAPI_handle); -+} -diff -ruN SDL-1.2.7-orig/src/video/wingapi/SDL_gapivideo.h SDL-1.2.7/src/video/wingapi/SDL_gapivideo.h ---- SDL-1.2.7-orig/src/video/wingapi/SDL_gapivideo.h Wed Dec 31 19:00:00 1969 -+++ SDL-1.2.7/src/video/wingapi/SDL_gapivideo.h Sun May 30 17:57:48 2004 -@@ -0,0 +1,192 @@ -+/* -+ SDL - Simple DirectMedia Layer -+ Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Library General Public -+ License as published by the Free Software Foundation; either -+ version 2 of the License, or (at your option) any later version. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Library General Public License for more details. -+ -+ You should have received a copy of the GNU Library General Public -+ License along with this library; if not, write to the Free -+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ -+ Sam Lantinga -+ slouken@libsdl.org -+*/ -+ -+#ifdef SAVE_RCSID -+static char rcsid = -+ "@(#) $Id: SDL_gapivideo.h,v 1.1 2004/02/02 23:25:35 lemure Exp $"; -+#endif -+ -+#ifndef _SDL_gapivideo_h -+#define _SDL_gapivideo_h -+ -+#include -+ -+/* -------------------------------------------------------------------------------------------- */ -+ -+/* From gx.h, since it's not really C compliant */ -+ -+struct GXDisplayProperties { -+ DWORD cxWidth; -+ DWORD cyHeight; // notice lack of 'th' in the word height. -+ long cbxPitch; // number of bytes to move right one x pixel - can be negative. -+ long cbyPitch; // number of bytes to move down one y pixel - can be negative. -+ long cBPP; // # of bits in each pixel -+ DWORD ffFormat; // format flags. -+}; -+ -+struct GXKeyList { -+ short vkUp; // key for up -+ POINT ptUp; // x,y position of key/button. Not on screen but in screen coordinates. -+ short vkDown; -+ POINT ptDown; -+ short vkLeft; -+ POINT ptLeft; -+ short vkRight; -+ POINT ptRight; -+ short vkA; -+ POINT ptA; -+ short vkB; -+ POINT ptB; -+ short vkC; -+ POINT ptC; -+ short vkStart; -+ POINT ptStart; -+}; -+ -+#define kfLandscape 0x8 // Screen is rotated 270 degrees -+#define kfPalette 0x10 // Pixel values are indexes into a palette -+#define kfDirect 0x20 // Pixel values contain actual level information -+#define kfDirect555 0x40 // 5 bits each for red, green and blue values in a pixel. -+#define kfDirect565 0x80 // 5 red bits, 6 green bits and 5 blue bits per pixel -+#define kfDirect888 0x100 // 8 bits each for red, green and blue values in a pixel. -+#define kfDirect444 0x200 // 4 red, 4 green, 4 blue -+#define kfDirectInverted 0x400 -+ -+#define GX_FULLSCREEN 0x01 // for OpenDisplay() -+ -+/* -------------------------------------------------------------------------------------------- */ -+ -+/* Rotation direction */ -+typedef enum { -+ SDL_ROTATE_NONE, -+ SDL_ROTATE_LEFT, -+ SDL_ROTATE_RIGHT -+} SDL_RotateAttr; -+ -+/* GAPI video mode */ -+typedef enum { -+ GAPI_NONE = 0, -+ GAPI_DIRECT_565, -+ GAPI_DIRECT_555, -+ GAPI_MONO, -+ GAPI_PALETTE -+} SDL_GAPIVideoMode; -+ -+ -+/* Hidden "this" pointer for the video functions */ -+#define _THIS SDL_VideoDevice *this -+ -+/* GAPI functions definitions */ -+ -+typedef struct GXDisplayProperties (*tGXDisplayProperties)(void); -+typedef int (*tGXOpenDisplay)(HWND, unsigned long); -+typedef void* (*tGXBeginDraw)(void); -+typedef int (*tGXVoidFunction)(void); -+ -+/* Private display data */ -+ -+struct GAPI_funcs { -+ tGXDisplayProperties dynamicGXGetDisplayProperties; -+ tGXOpenDisplay dynamicGXOpenDisplay; -+ tGXVoidFunction dynamicGXCloseDisplay; -+ tGXBeginDraw dynamicGXBeginDraw; -+ tGXVoidFunction dynamicGXEndDraw; -+ tGXVoidFunction dynamicGXSuspend; -+ tGXVoidFunction dynamicGXResume; -+}; -+ -+struct GAPI_properties { -+ unsigned char invert; -+ int colorscale; -+ int dstPixelstep; -+ int dstLinestep; -+ int startOffset; -+ SDL_GAPIVideoMode videoMode; -+}; -+ -+#define MAX_CLR 0x100 -+ -+struct palette_properties { -+ unsigned char *palRed; -+ unsigned char *palGreen; -+ unsigned char *palBlue; -+ unsigned short *pal; -+}; -+ -+ -+struct SDL_PrivateVideoData { -+ /* --- --- begin with DIB private structure to allow DIB events code sharing */ -+ HBITMAP screen_bmp; -+ HPALETTE screen_pal; -+ void *work_pixels; /* if the display needs to be rotated, memory allocated by the API */ -+ void *rotation_pixels; /* if the display needs to be rotated, memory allocated by the code */ -+ SDL_RotateAttr rotation; -+ char ozoneHack; /* force stylus translation if running without Hi Res flag */ -+ -+#define NUM_MODELISTS 4 /* 8, 16, 24, and 32 bits-per-pixel */ -+ int SDL_nummodes[NUM_MODELISTS]; -+ SDL_Rect **SDL_modelist[NUM_MODELISTS]; -+ -+ /* --- --- */ -+ -+ int w, h; -+ void *gapiBuffer; -+ HPALETTE screenPal; -+ struct GAPI_funcs gapiFuncs; -+ struct GAPI_properties gapiProperties; -+ struct GXDisplayProperties displayProps; -+ int srcLinestep; -+ int srcPixelstep; -+ -+ int padWidth; -+ int padHeight; -+ -+ unsigned short *convertPalette; -+}; -+ -+#define gapiBuffer (this->hidden->gapiBuffer) -+#define mainSurfaceWidth (this->hidden->w) -+#define mainSurfaceHeight (this->hidden->h) -+#define rotation (this->hidden->rotation) -+#define ozoneHack (this->hidden->ozoneHack) -+#define displayProperties (this->hidden->displayProps) -+#define screenPal (this->hidden->screenPal) -+#define GXGetDisplayProperties (this->hidden->gapiFuncs.dynamicGXGetDisplayProperties) -+#define GXOpenDisplay (this->hidden->gapiFuncs.dynamicGXOpenDisplay) -+#define GXCloseDisplay (this->hidden->gapiFuncs.dynamicGXCloseDisplay) -+#define GXBeginDraw (this->hidden->gapiFuncs.dynamicGXBeginDraw) -+#define GXEndDraw (this->hidden->gapiFuncs.dynamicGXEndDraw) -+#define GXSuspend (this->hidden->gapiFuncs.dynamicGXSuspend) -+#define GXResume (this->hidden->gapiFuncs.dynamicGXResume) -+#define invert (this->hidden->gapiProperties.invert) -+#define colorscale (this->hidden->gapiProperties.colorscale) -+#define videoMode (this->hidden->gapiProperties.videoMode) -+#define srcPixelstep (this->hidden->srcPixelstep) -+#define srcLinestep (this->hidden->srcLinestep) -+#define dstPixelstep (this->hidden->gapiProperties.dstPixelstep) -+#define dstLinestep (this->hidden->gapiProperties.dstLinestep) -+#define startOffset (this->hidden->gapiProperties.startOffset) -+#define padWidth (this->hidden->padWidth) -+#define padHeight (this->hidden->padHeight) -+#define convertPalette (this->hidden->convertPalette) -+ -+#endif /* _SDL_gapivideo_h */ diff --git a/tools/SDL1.2.7_CE/VisualCEv2.zip b/tools/SDL1.2.7_CE/VisualCEv2.zip deleted file mode 100644 index 816382e3b..000000000 Binary files a/tools/SDL1.2.7_CE/VisualCEv2.zip and /dev/null differ diff --git a/tools/SOCEdit/Global.bas b/tools/SOCEdit/Global.bas deleted file mode 100644 index 77bf3df2b..000000000 --- a/tools/SOCEdit/Global.bas +++ /dev/null @@ -1,96 +0,0 @@ -Attribute VB_Name = "Module1" -Option Explicit -Public SOCFile As String -Public SOCTemp As String -Public SourcePath As String - -Public Function FirstToken(ByVal line As String) - Dim index As Integer - - index = InStr(line, " ") - 1 - - If index < 1 Then - index = Len(line) - End If - - FirstToken = TrimComplete(Left(line, index)) -End Function - -Public Function SecondToken(ByVal line As String) - Dim startclip As Integer - Dim endclip As Integer - - startclip = InStr(line, " ") - - startclip = startclip + 1 - - SecondToken = TrimComplete(Mid(line, startclip, Len(line))) -End Function - -Public Function SecondTokenEqual(ByVal line As String) - Dim startclip As Integer - Dim endclip As Integer - - startclip = InStr(line, "=") - - startclip = startclip + 2 - - line = Mid(line, startclip, Len(line)) - - SecondTokenEqual = TrimComplete(line) -End Function - -Public Function TrimComplete(ByVal sValue As String) As String - Dim sAns As String - Dim sWkg As String - Dim sChar As String - Dim lLen As Long - Dim lCtr As Long - - sAns = sValue - lLen = Len(sValue) - - If lLen > 0 Then - 'Ltrim - For lCtr = 1 To lLen - sChar = Mid(sAns, lCtr, 1) - If Asc(sChar) > 32 Then Exit For - Next - - sAns = Mid(sAns, lCtr) - lLen = Len(sAns) - - 'Rtrim - If lLen > 0 Then - For lCtr = lLen To 1 Step -1 - sChar = Mid(sAns, lCtr, 1) - If Asc(sChar) > 32 Then Exit For - Next - End If - sAns = Left$(sAns, lCtr) - End If - - TrimComplete = sAns -End Function - -Public Function RTrimComplete(ByVal sValue As String) As String - Dim sAns As String - Dim sWkg As String - Dim sChar As String - Dim lLen As Long - Dim lCtr As Long - - sAns = sValue - lLen = Len(sValue) - - 'Rtrim - If lLen > 0 Then - For lCtr = lLen To 1 Step -1 - sChar = Mid(sAns, lCtr, 1) - If Asc(sChar) > 32 Then Exit For - Next - End If - sAns = Left$(sAns, lCtr) - - RTrimComplete = sAns -End Function diff --git a/tools/SOCEdit/SOCEdit.vbp b/tools/SOCEdit/SOCEdit.vbp deleted file mode 100644 index 90af0095a..000000000 --- a/tools/SOCEdit/SOCEdit.vbp +++ /dev/null @@ -1,53 +0,0 @@ -Type=Exe -Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\WINNT\system32\stdole2.tlb#OLE Automation -Reference=*\G{420B2830-E718-11CF-893D-00A0C9054228}#1.0#0#..\..\..\WINNT\system32\scrrun.dll#Microsoft Scripting Runtime -Form=Things.frm -Module=Module1; Global.bas -Form=frmStateEdit.frm -Form=frmLevelHeader.frm -Form=frmHub.frm -Form=frmMaincfg.frm -Form=frmUnlockablesEdit.frm -Form=frmEmblemEdit.frm -Form=frmSoundEdit.frm -Form=frmCharacterEdit.frm -Form=frmCutsceneEdit.frm -Form=frmHelp.frm -Form=frmHUDEdit.frm -IconForm="frmThingEdit" -Startup="frmHub" -HelpFile="" -Title="SOC Editor" -ExeName32="SOCEdit.exe" -Path32="..\..\..\srb2demo2\SOCEdit" -Command32="" -Name="SOCEditor" -HelpContextID="0" -CompatibleMode="0" -MajorVer=0 -MinorVer=7 -RevisionVer=7 -AutoIncrementVer=0 -ServerSupportFiles=0 -VersionComments="http://www.srb2.org/" -VersionCompanyName="Sonic Team Junior" -VersionFileDescription="For SRB2 v1.09.4" -CompilationType=0 -OptimizationType=0 -FavorPentiumPro(tm)=0 -CodeViewDebugInfo=0 -NoAliasing=0 -BoundsCheck=0 -OverflowCheck=0 -FlPointCheck=0 -FDIVCheck=0 -UnroundedFP=0 -StartMode=0 -Unattended=0 -Retained=0 -ThreadPerObject=0 -MaxNumberOfThreads=1 -DebugStartupOption=0 - -[MS Transaction Server] -AutoRefresh=1 diff --git a/tools/SOCEdit/Things.frm b/tools/SOCEdit/Things.frm deleted file mode 100644 index f95b6afb7..000000000 --- a/tools/SOCEdit/Things.frm +++ /dev/null @@ -1,1895 +0,0 @@ -VERSION 5.00 -Begin VB.Form frmThingEdit - Caption = "Thing Edit" - ClientHeight = 5745 - ClientLeft = 60 - ClientTop = 345 - ClientWidth = 11880 - Icon = "Things.frx":0000 - LinkTopic = "Form1" - MaxButton = 0 'False - ScaleHeight = 5745 - ScaleWidth = 11880 - StartUpPosition = 3 'Windows Default - Begin VB.CommandButton cmdCopy - Caption = "&Copy Thing" - Height = 615 - Left = 6600 - TabIndex = 77 - Top = 4920 - Width = 975 - End - Begin VB.CommandButton cmdLoadDefault - Caption = "&Load Code Default" - Height = 615 - Left = 4440 - Style = 1 'Graphical - TabIndex = 76 - Top = 4920 - Width = 975 - End - Begin VB.CommandButton cmdDelete - Caption = "&Delete Thing from SOC" - Height = 615 - Left = 3240 - Style = 1 'Graphical - TabIndex = 74 - Top = 4920 - Width = 1095 - End - Begin VB.CommandButton cmdSave - Caption = "&Save" - Height = 615 - Left = 5520 - TabIndex = 73 - Top = 4920 - Width = 975 - End - Begin VB.Frame frmFlags - Caption = "Flags" - Height = 3735 - Left = 7680 - TabIndex = 45 - Top = 1920 - Width = 4095 - Begin VB.CheckBox chkFlags - Caption = "MF_FIRE" - Height = 255 - Index = 26 - Left = 2040 - TabIndex = 72 - Tag = "4194304" - ToolTipText = "Fire object. Doesn't harm if you have red shield." - Top = 2160 - Width = 1695 - End - Begin VB.CheckBox chkFlags - Caption = "MF_NOCLIPTHING" - Height = 255 - Index = 25 - Left = 2040 - TabIndex = 71 - Tag = "1073741824" - ToolTipText = "Don't be blocked by things (partial clipping)" - Top = 3120 - Width = 1815 - End - Begin VB.CheckBox chkFlags - Caption = "MF_SCENERY" - Height = 255 - Index = 24 - Left = 2040 - TabIndex = 70 - Tag = "33554432" - ToolTipText = "Scenery (uses scenery thinker). Uses less CPU than a standard object, but generally can't move, etc." - Top = 2880 - Width = 1455 - End - Begin VB.CheckBox chkFlags - Caption = "MF_ENEMY" - Height = 255 - Index = 23 - Left = 2040 - TabIndex = 69 - Tag = "16777216" - ToolTipText = "This mobj is an enemy!" - Top = 2640 - Width = 1335 - End - Begin VB.CheckBox chkFlags - Caption = "MF_COUNTITEM" - Height = 255 - Index = 22 - Left = 2040 - TabIndex = 68 - Tag = "8388608" - ToolTipText = "On picking up, count this item object towards intermission item total." - Top = 2400 - Width = 1695 - End - Begin VB.CheckBox chkFlags - Caption = "MF_NOTHINK" - Height = 255 - Index = 21 - Left = 2040 - TabIndex = 67 - Tag = "2097152" - ToolTipText = "Don't run this thing's thinker." - Top = 1920 - Width = 1695 - End - Begin VB.CheckBox chkFlags - Caption = "MF_MONITOR" - Height = 255 - Index = 20 - Left = 2040 - TabIndex = 66 - Tag = "1048576" - ToolTipText = "Item box" - Top = 1680 - Width = 1575 - End - Begin VB.CheckBox chkFlags - Caption = "MF_HIRES" - Height = 255 - Index = 19 - Left = 2040 - TabIndex = 65 - Tag = "524288" - ToolTipText = "Object uses a high-resolution sprite" - Top = 1440 - Width = 1215 - End - Begin VB.CheckBox chkFlags - Caption = "MF_BOUNCE" - Height = 255 - Index = 18 - Left = 2040 - TabIndex = 64 - Tag = "262144" - ToolTipText = "Bounce off walls and things." - Top = 1200 - Width = 1335 - End - Begin VB.CheckBox chkFlags - Caption = "MF_SPRING" - Height = 255 - Index = 17 - Left = 2040 - TabIndex = 63 - Tag = "131072" - ToolTipText = "Item is a spring." - Top = 960 - Width = 1575 - End - Begin VB.CheckBox chkFlags - Caption = "MF_MISSILE" - Height = 255 - Index = 16 - Left = 2040 - TabIndex = 62 - Tag = "65536" - ToolTipText = "Any kind of projectile currently flying through the air, waiting to hit something" - Top = 720 - Width = 1335 - End - Begin VB.CheckBox chkFlags - Caption = "MF_BOXICON" - Height = 255 - Index = 15 - Left = 2040 - TabIndex = 61 - Tag = "32768" - ToolTipText = "Monitor powerup icon. These rise a bit." - Top = 480 - Width = 1815 - End - Begin VB.CheckBox chkFlags - Caption = "MF_FLOAT" - Height = 255 - Index = 14 - Left = 2040 - TabIndex = 60 - Tag = "16384" - ToolTipText = "Allow moves to any height, no gravity. For active floaters." - Top = 240 - Width = 1215 - End - Begin VB.CheckBox chkFlags - Caption = "MF_SPECIALFLAGS" - Height = 255 - Index = 13 - Left = 120 - TabIndex = 59 - Tag = "8192" - ToolTipText = "This object does not adhere to regular flag/z properties for object placing." - Top = 3360 - Width = 1815 - End - Begin VB.CheckBox chkFlags - Caption = "MF_NOCLIP" - Height = 255 - Index = 12 - Left = 120 - TabIndex = 58 - Tag = "4096" - ToolTipText = "Don't clip against objects, walls, etc." - Top = 3120 - Width = 1335 - End - Begin VB.CheckBox chkFlags - Caption = "MF_SLIDEME" - Height = 255 - Index = 11 - Left = 120 - TabIndex = 57 - Tag = "2048" - ToolTipText = "Slide this object when it hits a wall." - Top = 2880 - Width = 1335 - End - Begin VB.CheckBox chkFlags - Caption = "MF_AMBIENT" - Height = 255 - Index = 10 - Left = 120 - TabIndex = 56 - Tag = "1024" - ToolTipText = "This object is an ambient sound." - Top = 2640 - Width = 1695 - End - Begin VB.CheckBox chkFlags - Caption = "MF_NOGRAVITY" - Height = 255 - Index = 9 - Left = 120 - TabIndex = 55 - Tag = "512" - ToolTipText = "Don't apply gravity" - Top = 2400 - Width = 1695 - End - Begin VB.CheckBox chkFlags - Caption = "MF_SPAWNCEILING" - Height = 255 - Index = 8 - Left = 120 - TabIndex = 54 - Tag = "256" - ToolTipText = "On level spawning (initial position), hang from ceiling instead of stand on floor." - Top = 2160 - Width = 1935 - End - Begin VB.CheckBox chkFlags - Caption = "MF_BOSS" - Height = 255 - Index = 7 - Left = 120 - TabIndex = 53 - Tag = "128" - ToolTipText = "Object is a boss." - Top = 1920 - Width = 1575 - End - Begin VB.CheckBox chkFlags - Caption = "MF_PUSHABLE" - Height = 255 - Index = 6 - Left = 120 - TabIndex = 52 - Tag = "64" - ToolTipText = "You can push this object. It can activate switches and things by pushing it on top." - Top = 1680 - Width = 1575 - End - Begin VB.CheckBox chkFlags - Caption = "MF_AMBUSH" - Height = 255 - Index = 5 - Left = 120 - TabIndex = 51 - Tag = "32" - ToolTipText = "Special attributes" - Top = 1440 - Width = 1455 - End - Begin VB.CheckBox chkFlags - Caption = "MF_NOBLOCKMAP" - Height = 255 - Index = 4 - Left = 120 - TabIndex = 50 - Tag = "16" - ToolTipText = "Don't use the blocklinks (inert but displayable)" - Top = 1200 - Width = 1815 - End - Begin VB.CheckBox chkFlags - Caption = "MF_NOSECTOR" - Height = 255 - Index = 3 - Left = 120 - TabIndex = 49 - Tag = "8" - ToolTipText = "Don't use the sector links (invisible but touchable)." - Top = 960 - Width = 1575 - End - Begin VB.CheckBox chkFlags - Caption = "MF_SHOOTABLE" - Height = 255 - Index = 2 - Left = 120 - TabIndex = 48 - Tag = "4" - ToolTipText = "Can be hit." - Top = 720 - Width = 1695 - End - Begin VB.CheckBox chkFlags - Caption = "MF_SOLID" - Height = 255 - Index = 1 - Left = 120 - TabIndex = 47 - Tag = "2" - ToolTipText = "Blocks." - Top = 480 - Width = 1335 - End - Begin VB.CheckBox chkFlags - Caption = "MF_SPECIAL" - Height = 255 - Index = 0 - Left = 120 - TabIndex = 46 - Tag = "1" - ToolTipText = "Call P_TouchSpecialThing when touched." - Top = 240 - Width = 1455 - End - End - Begin VB.ComboBox cmbRaisestate - Height = 315 - Left = 4320 - TabIndex = 43 - Text = "cmbRaisestate" - Top = 4440 - Width = 3300 - End - Begin VB.ComboBox cmbActivesound - Height = 315 - Left = 4320 - TabIndex = 41 - Text = "cmbActivesound" - Top = 4080 - Width = 3300 - End - Begin VB.TextBox txtDamage - Height = 285 - Left = 10680 - TabIndex = 39 - Text = "0" - Top = 1200 - Width = 1095 - End - Begin VB.TextBox txtMass - Height = 285 - Left = 10680 - TabIndex = 37 - Text = "0" - Top = 840 - Width = 1095 - End - Begin VB.TextBox txtHeight - Height = 285 - Left = 10680 - TabIndex = 35 - Text = "0" - Top = 480 - Width = 1095 - End - Begin VB.TextBox txtRadius - Height = 285 - Left = 10680 - TabIndex = 33 - Text = "0" - Top = 120 - Width = 1095 - End - Begin VB.TextBox txtSpeed - Height = 285 - Left = 8760 - TabIndex = 31 - Text = "0" - Top = 1560 - Width = 1095 - End - Begin VB.ComboBox cmbDeathsound - Height = 315 - Left = 4320 - TabIndex = 29 - Text = "cmbDeathsound" - Top = 3720 - Width = 3300 - End - Begin VB.ComboBox cmbXdeathstate - Height = 315 - Left = 4320 - TabIndex = 27 - Text = "cmbXdeathstate" - Top = 3360 - Width = 3300 - End - Begin VB.ComboBox cmbDeathstate - Height = 315 - Left = 4320 - TabIndex = 25 - Text = "cmbDeathstate" - Top = 3000 - Width = 3300 - End - Begin VB.ComboBox cmbMissilestate - Height = 315 - Left = 4320 - TabIndex = 23 - Text = "cmbMissilestate" - Top = 2640 - Width = 3300 - End - Begin VB.ComboBox cmbMeleestate - Height = 315 - Left = 4320 - TabIndex = 21 - Text = "cmbMeleestate" - Top = 2280 - Width = 3300 - End - Begin VB.ComboBox cmbPainsound - Height = 315 - Left = 4320 - TabIndex = 19 - Text = "cmbPainsound" - Top = 1920 - Width = 3300 - End - Begin VB.TextBox txtPainchance - Height = 285 - Left = 8760 - TabIndex = 17 - Text = "0" - Top = 1200 - Width = 1095 - End - Begin VB.ComboBox cmbPainstate - Height = 315 - Left = 4320 - TabIndex = 15 - Text = "cmbPainstate" - Top = 1560 - Width = 3300 - End - Begin VB.ComboBox cmbAttacksound - Height = 315 - Left = 4320 - TabIndex = 13 - Text = "cmbAttacksound" - Top = 1200 - Width = 3300 - End - Begin VB.TextBox txtReactiontime - Height = 285 - Left = 8760 - TabIndex = 11 - Text = "0" - Top = 840 - Width = 1095 - End - Begin VB.ComboBox cmbSeesound - Height = 315 - Left = 4320 - TabIndex = 9 - Text = "cmbSeesound" - Top = 840 - Width = 3300 - End - Begin VB.ComboBox cmbSeestate - Height = 315 - Left = 4320 - TabIndex = 7 - Text = "cmbSeestate" - Top = 480 - Width = 3300 - End - Begin VB.TextBox txtSpawnhealth - Height = 285 - Left = 8760 - TabIndex = 6 - Text = "0" - Top = 480 - Width = 1095 - End - Begin VB.ComboBox cmbSpawnstate - Height = 315 - Left = 4320 - TabIndex = 3 - Text = "cmbSpawnstate" - Top = 120 - Width = 3300 - End - Begin VB.TextBox txtDoomednum - Height = 285 - Left = 8760 - TabIndex = 1 - Text = "0" - Top = 120 - Width = 1095 - End - Begin VB.ListBox lstThings - Height = 5520 - ItemData = "Things.frx":0442 - Left = 120 - List = "Things.frx":0444 - TabIndex = 0 - Top = 120 - Width = 3015 - End - Begin VB.Label lblStatusInfo - Alignment = 2 'Center - Caption = "Idle" - BeginProperty Font - Name = "MS Sans Serif" - Size = 8.25 - Charset = 0 - Weight = 700 - Underline = 0 'False - Italic = 0 'False - Strikethrough = 0 'False - EndProperty - Height = 375 - Left = 9960 - TabIndex = 75 - Top = 1560 - Width = 1815 - End - Begin VB.Label lblRaisestate - Alignment = 1 'Right Justify - Caption = "Raisestate:" - Height = 255 - Left = 3360 - TabIndex = 44 - Top = 4440 - Width = 855 - End - Begin VB.Label lblActivesound - Alignment = 1 'Right Justify - Caption = "Activesound:" - Height = 255 - Left = 3240 - TabIndex = 42 - Top = 4080 - Width = 975 - End - Begin VB.Label lblDamage - Alignment = 1 'Right Justify - Caption = "Damage:" - Height = 255 - Left = 9840 - TabIndex = 40 - Top = 1200 - Width = 735 - End - Begin VB.Label lblMass - Alignment = 1 'Right Justify - Caption = "Mass:" - Height = 255 - Left = 9960 - TabIndex = 38 - Top = 840 - Width = 615 - End - Begin VB.Label lblHeight - Alignment = 1 'Right Justify - Caption = "Height:" - Height = 255 - Left = 9960 - TabIndex = 36 - Top = 480 - Width = 615 - End - Begin VB.Label lblRadius - Alignment = 1 'Right Justify - Caption = "Radius:" - Height = 255 - Left = 9960 - TabIndex = 34 - Top = 120 - Width = 615 - End - Begin VB.Label lblSpeed - Alignment = 1 'Right Justify - Caption = "Speed:" - Height = 255 - Left = 7680 - TabIndex = 32 - Top = 1560 - Width = 975 - End - Begin VB.Label lblDeathsound - Alignment = 1 'Right Justify - Caption = "Deathsound:" - Height = 255 - Left = 3240 - TabIndex = 30 - Top = 3720 - Width = 975 - End - Begin VB.Label lblXdeathstate - Alignment = 1 'Right Justify - Caption = "Xdeathstate:" - Height = 255 - Left = 3240 - TabIndex = 28 - Top = 3360 - Width = 975 - End - Begin VB.Label lblDeathstate - Alignment = 1 'Right Justify - Caption = "Deathstate:" - Height = 255 - Left = 3240 - TabIndex = 26 - Top = 3000 - Width = 975 - End - Begin VB.Label lblMissilestate - Alignment = 1 'Right Justify - Caption = "Missilestate:" - Height = 255 - Left = 3240 - TabIndex = 24 - Top = 2640 - Width = 975 - End - Begin VB.Label lblMeleestate - Alignment = 1 'Right Justify - Caption = "Meleestate:" - Height = 255 - Left = 3240 - TabIndex = 22 - Top = 2280 - Width = 975 - End - Begin VB.Label lblPainsound - Alignment = 1 'Right Justify - Caption = "Painsound:" - Height = 255 - Left = 3240 - TabIndex = 20 - Top = 1920 - Width = 975 - End - Begin VB.Label lblPainchance - Alignment = 1 'Right Justify - Caption = "Painchance:" - Height = 255 - Left = 7680 - TabIndex = 18 - Top = 1200 - Width = 975 - End - Begin VB.Label lblPainstate - Alignment = 1 'Right Justify - Caption = "Painstate:" - Height = 255 - Left = 3240 - TabIndex = 16 - Top = 1560 - Width = 975 - End - Begin VB.Label lblAttacksound - Alignment = 1 'Right Justify - Caption = "Attacksound:" - Height = 255 - Left = 3240 - TabIndex = 14 - Top = 1200 - Width = 975 - End - Begin VB.Label lblReactiontime - Alignment = 1 'Right Justify - Caption = "Reactiontime:" - Height = 255 - Left = 7680 - TabIndex = 12 - Top = 840 - Width = 975 - End - Begin VB.Label lblSeesound - Alignment = 1 'Right Justify - Caption = "Seesound:" - Height = 255 - Left = 3240 - TabIndex = 10 - Top = 840 - Width = 975 - End - Begin VB.Label lblSeestate - Alignment = 1 'Right Justify - Caption = "Seestate:" - Height = 255 - Left = 3240 - TabIndex = 8 - Top = 480 - Width = 975 - End - Begin VB.Label lblSpawnhealth - Alignment = 1 'Right Justify - Caption = "Spawnhealth:" - Height = 255 - Left = 7680 - TabIndex = 5 - Top = 480 - Width = 975 - End - Begin VB.Label lblSpawnstate - Alignment = 1 'Right Justify - Caption = "Spawnstate:" - Height = 255 - Left = 3240 - TabIndex = 4 - Top = 120 - Width = 975 - End - Begin VB.Label lblDoomednum - Alignment = 1 'Right Justify - Caption = "Thing Map #:" - Height = 255 - Left = 7680 - TabIndex = 2 - Top = 120 - Width = 975 - End -End -Attribute VB_Name = "frmThingEdit" -Attribute VB_GlobalNameSpace = False -Attribute VB_Creatable = False -Attribute VB_PredeclaredId = True -Attribute VB_Exposed = False -Option Explicit - -Private Sub cmdCopy_Click() - Dim Response As String - - Response$ = InputBox("Copy state to #:", "Copy State") - - If Response = "" Then Exit Sub - - Response = TrimComplete(Response) - - Call WriteThing(False, Val(Response)) - - MsgBox "Thing copied to #" & Val(Response) -End Sub - -Private Sub cmdDelete_Click() - Call WriteThing(True, lstThings.ListIndex) -End Sub - -Private Sub cmdLoadDefault_Click() - Call ClearForm - If InStr(lstThings.List(lstThings.ListIndex), "MT_FREESLOT") = 0 Then - LoadObjectInfo (lstThings.ListIndex) - Else - MsgBox "Free slots do not have a code default." - End If -End Sub - -Private Sub cmdSave_Click() - Call WriteThing(False, lstThings.ListIndex) -End Sub - -Private Sub Form_Load() - Call Reload -End Sub - -Private Sub ClearForm() - Dim i As Integer - cmbSpawnstate.Text = "" - cmbSeestate.Text = "" - cmbSeesound.Text = "" - cmbAttacksound.Text = "" - cmbPainstate.Text = "" - cmbPainsound.Text = "" - cmbMeleestate.Text = "" - cmbMissilestate.Text = "" - cmbDeathstate.Text = "" - cmbXdeathstate.Text = "" - cmbDeathsound.Text = "" - cmbActivesound.Text = "" - cmbRaisestate.Text = "" - txtDoomednum.Text = "" - txtSpawnhealth.Text = "" - txtReactiontime.Text = "" - txtPainchance.Text = "" - txtSpeed.Text = "" - txtRadius.Text = "" - txtHeight.Text = "" - txtMass.Text = "" - txtDamage.Text = "" - - For i = 0 To 26 - chkFlags(i).Value = 0 - Next -End Sub - -Private Sub Reload() - lblStatusInfo.Caption = "Loading Sounds Info..." - DoEvents - LoadSounds - lblStatusInfo.Caption = "Loading Things Info..." - DoEvents - LoadThings - lblStatusInfo.Caption = "Loading States Info..." - DoEvents - LoadStates - lblStatusInfo.Caption = "Idle" - lstThings.ListIndex = 0 -End Sub - -Private Sub LoadSounds() - Dim myFSO As New Scripting.FileSystemObject - Dim ts As TextStream - Dim line As String - Dim number As Integer - Dim startclip As Integer, endclip As Integer - Dim addstring As String - Dim i As Integer, numfreeslots As Integer - - ChDir SourcePath - Set ts = myFSO.OpenTextFile("sounds.h", ForReading, False) - - Do While InStr(ts.ReadLine, "List of sounds (don't modify this comment!)") = 0 - Loop - - ts.SkipLine ' typedef enum - ts.SkipLine ' { - - line = ts.ReadLine - number = 0 - - cmbSeesound.Clear - cmbAttacksound.Clear - cmbPainsound.Clear - cmbDeathsound.Clear - cmbActivesound.Clear - - Do While InStr(line, "sfx_freeslot0") = 0 - startclip = InStr(line, "sfx_") - If InStr(line, "sfx_") <> 0 Then - endclip = InStr(line, ",") - line = Mid(line, startclip, endclip - startclip) - addstring = number & " - " & line - cmbSeesound.AddItem addstring - cmbAttacksound.AddItem addstring - cmbPainsound.AddItem addstring - cmbDeathsound.AddItem addstring - cmbActivesound.AddItem addstring - number = number + 1 - End If - line = ts.ReadLine - Loop - - ts.Close - Set myFSO = Nothing - - 'Populate the free slots! - numfreeslots = 800 - - For i = 1 To numfreeslots - If i < 10 Then - addstring = number & " - " & "sfx_fre00" & i & " (free slot)" - ElseIf i < 100 Then - addstring = number & " - " & "sfx_fre0" & i & " (free slot)" - Else - addstring = number & " - " & "sfx_fre" & i & " (free slot)" - End If - cmbSeesound.AddItem addstring - cmbAttacksound.AddItem addstring - cmbPainsound.AddItem addstring - cmbDeathsound.AddItem addstring - cmbActivesound.AddItem addstring - number = number + 1 - Next -End Sub -Private Sub LoadStates() - Dim myFSO As New Scripting.FileSystemObject - Dim ts As TextStream - Dim line As String - Dim number As Integer - Dim startclip As Integer, endclip As Integer - Dim addstring As String - Dim i As Integer - Dim numfreeslots As Integer - - ChDir SourcePath - Set ts = myFSO.OpenTextFile("info.h", ForReading, False) - - Do While InStr(ts.ReadLine, "Object states (don't modify this comment!)") = 0 - Loop - - ts.SkipLine ' typedef enum - ts.SkipLine ' { - - line = ts.ReadLine - number = 0 - - cmbSpawnstate.Clear - cmbSeestate.Clear - cmbPainstate.Clear - cmbMeleestate.Clear - cmbMissilestate.Clear - cmbDeathstate.Clear - cmbXdeathstate.Clear - cmbRaisestate.Clear - - Do While InStr(line, "S_FIRSTFREESLOT") = 0 - startclip = InStr(line, "S_") - If InStr(line, "S_") <> 0 Then - endclip = InStr(line, ",") - line = Mid(line, startclip, endclip - startclip) - addstring = number & " - " & line - cmbSpawnstate.AddItem addstring - cmbSeestate.AddItem addstring - cmbPainstate.AddItem addstring - cmbMeleestate.AddItem addstring - cmbMissilestate.AddItem addstring - cmbDeathstate.AddItem addstring - cmbXdeathstate.AddItem addstring - cmbRaisestate.AddItem addstring - number = number + 1 - End If - line = ts.ReadLine - Loop - - ts.Close - - 'Populate the free slots! - Set ts = myFSO.OpenTextFile("info.h", ForReading, False) - - line = ts.ReadLine - Do While InStr(line, "#define NUMMOBJFREESLOTS") = 0 - line = ts.ReadLine - Loop - - startclip = InStr(line, "SLOTS ") + 6 - numfreeslots = Val(Mid(line, startclip, Len(line) - startclip + 1)) * 6 - - For i = 1 To numfreeslots - addstring = number & " - " & "S_FREESLOT" & i - cmbSpawnstate.AddItem addstring - cmbSeestate.AddItem addstring - cmbPainstate.AddItem addstring - cmbMeleestate.AddItem addstring - cmbMissilestate.AddItem addstring - cmbDeathstate.AddItem addstring - cmbXdeathstate.AddItem addstring - cmbRaisestate.AddItem addstring - number = number + 1 - Next - - ts.Close - Set myFSO = Nothing -End Sub - -Private Sub LoadThings() - Dim myFSO As New Scripting.FileSystemObject - Dim ts As TextStream - Dim line As String - Dim number As Integer - Dim startclip As Integer, endclip As Integer - Dim numfreeslots As Integer, i As Integer - - ChDir SourcePath - Set ts = myFSO.OpenTextFile("info.h", ForReading, False) - - Do While InStr(ts.ReadLine, "Little flag for SOC editor (don't change this comment!)") = 0 - Loop - - ts.SkipLine ' typedef enum - ts.SkipLine ' { - - line = ts.ReadLine - number = 0 - - lstThings.Clear - - Do While InStr(line, "MT_FIRSTFREESLOT") = 0 - startclip = InStr(line, "MT_") - If InStr(line, "MT_") <> 0 Then - endclip = InStr(line, ",") - line = Mid(line, startclip, endclip - startclip) - lstThings.AddItem number & " - " & line - number = number + 1 - End If - line = ts.ReadLine - Loop - - ts.Close - - 'Populate the free slots! - Set ts = myFSO.OpenTextFile("info.h", ForReading, False) - - line = ts.ReadLine - Do While InStr(line, "#define NUMMOBJFREESLOTS") = 0 - line = ts.ReadLine - Loop - - startclip = InStr(line, "SLOTS ") + 6 - numfreeslots = Val(Mid(line, startclip, Len(line) - startclip + 1)) - - For i = 1 To numfreeslots - lstThings.AddItem number & " - " & "MT_FREESLOT" & i - number = number + 1 - Next - - ts.Close - Set myFSO = Nothing -End Sub - -Private Sub LoadObjectInfo(ThingNum As Integer) - Dim myFSO As New Scripting.FileSystemObject - Dim ts As TextStream - Dim line As String - Dim number As Integer - Dim startclip As Integer, endclip As Integer - - ChDir SourcePath - Set ts = myFSO.OpenTextFile("info.c", ForReading, False) - - Do While InStr(ts.ReadLine, "mobjinfo[NUMMOBJTYPES] =") = 0 - Loop - - number = 0 - - Do While number <> ThingNum - Do While InStr(ts.ReadLine, "}") = 0 - Loop - number = number + 1 - Loop - - Do While InStr(line, "doomednum") = 0 - line = ts.ReadLine - Loop - - endclip = InStr(line, ",") - line = Left(line, endclip - 1) - line = TrimComplete(line) - 'Check for *FRACUNIT values - endclip = InStr(line, "*FRACUNIT") - If endclip <> 0 Then - line = Left(line, endclip - 1) - line = Val(line) * 65536 - End If - 'Check for crazy-odd MT_ usage - endclip = InStr(line, "MT_") - If endclip <> 0 Then - line = FindThingNum(line) & " - " & line - End If - 'Check for crazy-odd pw_ usage - endclip = InStr(line, "pw_") - If endclip <> 0 Then - line = FindPowerNum(line) & " - " & line - End If - txtDoomednum.Text = line - - line = ts.ReadLine - Do While InStr(line, "spawnstate") = 0 - Loop - endclip = InStr(line, ",") - line = Left(line, endclip - 1) - line = TrimComplete(line) - Call FindComboIndex(cmbSpawnstate, line) - 'Check for crazy-odd MT_ usage - endclip = InStr(line, "MT_") - If endclip <> 0 Then - number = FindThingNum(line) - cmbSpawnstate.Text = number & " - " & line - End If - 'Check for crazy-odd pw_ usage - endclip = InStr(line, "pw_") - If endclip <> 0 Then - number = FindPowerNum(line) - cmbSpawnstate.Text = number & " - " & line - End If - - line = ts.ReadLine - Do While InStr(line, "spawnhealth") = 0 - Loop - endclip = InStr(line, ",") - line = Left(line, endclip - 1) - line = TrimComplete(line) - 'Check for *FRACUNIT values - endclip = InStr(line, "*FRACUNIT") - If endclip <> 0 Then - line = Left(line, endclip - 1) - line = Val(line) * 65536 - End If - 'Check for crazy-odd MT_ usage - endclip = InStr(line, "MT_") - If endclip <> 0 Then - line = FindThingNum(line) & " - " & line - End If - 'Check for crazy-odd pw_ usage - endclip = InStr(line, "pw_") - If endclip <> 0 Then - line = FindPowerNum(line) & " - " & line - End If - txtSpawnhealth.Text = line - - line = ts.ReadLine - Do While InStr(line, "seestate") = 0 - Loop - endclip = InStr(line, ",") - line = Left(line, endclip - 1) - line = TrimComplete(line) - Call FindComboIndex(cmbSeestate, line) - 'Check for crazy-odd MT_ usage - endclip = InStr(line, "MT_") - If endclip <> 0 Then - number = FindThingNum(line) - cmbSeestate.Text = number & " - " & line - End If - 'Check for crazy-odd pw_ usage - endclip = InStr(line, "pw_") - If endclip <> 0 Then - number = FindPowerNum(line) - cmbSeestate.Text = number & " - " & line - End If - - line = ts.ReadLine - Do While InStr(line, "seesound") = 0 - Loop - endclip = InStr(line, ",") - line = Left(line, endclip - 1) - line = TrimComplete(line) - Call FindComboIndex(cmbSeesound, line) - 'Check for crazy-odd MT_ usage - endclip = InStr(line, "MT_") - If endclip <> 0 Then - number = FindThingNum(line) - cmbSeesound.Text = number & " - " & line - End If - 'Check for crazy-odd pw_ usage - endclip = InStr(line, "pw_") - If endclip <> 0 Then - number = FindPowerNum(line) - cmbSeesound.Text = number & " - " & line - End If - - line = ts.ReadLine - Do While InStr(line, "reactiontime") = 0 - Loop - endclip = InStr(line, ",") - line = Left(line, endclip - 1) - line = TrimComplete(line) - 'Check for *FRACUNIT values - endclip = InStr(line, "*FRACUNIT") - If endclip <> 0 Then - line = Left(line, endclip - 1) - line = Val(line) * 65536 - End If - 'Check for crazy-odd MT_ usage - endclip = InStr(line, "MT_") - If endclip <> 0 Then - line = FindThingNum(line) & " - " & line - End If - 'Check for crazy-odd pw_ usage - endclip = InStr(line, "pw_") - If endclip <> 0 Then - line = FindPowerNum(line) & " - " & line - End If - txtReactiontime.Text = line - - line = ts.ReadLine - Do While InStr(line, "attacksound") = 0 - Loop - endclip = InStr(line, ",") - line = Left(line, endclip - 1) - line = TrimComplete(line) - Call FindComboIndex(cmbAttacksound, line) - 'Check for crazy-odd MT_ usage - endclip = InStr(line, "MT_") - If endclip <> 0 Then - number = FindThingNum(line) - cmbAttacksound.Text = number & " - " & line - End If - 'Check for crazy-odd pw_ usage - endclip = InStr(line, "pw_") - If endclip <> 0 Then - number = FindPowerNum(line) - cmbAttacksound.Text = number & " - " & line - End If - - line = ts.ReadLine - Do While InStr(line, "painstate") = 0 - Loop - endclip = InStr(line, ",") - line = Left(line, endclip - 1) - line = TrimComplete(line) - Call FindComboIndex(cmbPainstate, line) - 'Check for crazy-odd MT_ usage - endclip = InStr(line, "MT_") - If endclip <> 0 Then - number = FindThingNum(line) - cmbPainstate.Text = number & " - " & line - End If - 'Check for crazy-odd pw_ usage - endclip = InStr(line, "pw_") - If endclip <> 0 Then - number = FindPowerNum(line) - cmbPainstate.Text = number & " - " & line - End If - - line = ts.ReadLine - Do While InStr(line, "painchance") = 0 - Loop - endclip = InStr(line, ",") - line = Left(line, endclip - 1) - line = TrimComplete(line) - 'Check for *FRACUNIT values - endclip = InStr(line, "*FRACUNIT") - If endclip <> 0 Then - line = Left(line, endclip - 1) - line = Val(line) * 65536 - End If - 'Check for crazy-odd MT_ usage - endclip = InStr(line, "MT_") - If endclip <> 0 Then - line = FindThingNum(line) & " - " & line - End If - 'Check for crazy-odd pw_ usage - endclip = InStr(line, "pw_") - If endclip <> 0 Then - line = FindPowerNum(line) & " - " & line - End If - txtPainchance.Text = line - - line = ts.ReadLine - Do While InStr(line, "painsound") = 0 - Loop - endclip = InStr(line, ",") - line = Left(line, endclip - 1) - line = TrimComplete(line) - Call FindComboIndex(cmbPainsound, line) - 'Check for crazy-odd MT_ usage - endclip = InStr(line, "MT_") - If endclip <> 0 Then - number = FindThingNum(line) - cmbPainsound.Text = number & " - " & line - End If - 'Check for crazy-odd pw_ usage - endclip = InStr(line, "pw_") - If endclip <> 0 Then - number = FindPowerNum(line) - cmbPainsound.Text = number & " - " & line - End If - - line = ts.ReadLine - Do While InStr(line, "meleestate") = 0 - Loop - endclip = InStr(line, ",") - line = Left(line, endclip - 1) - line = TrimComplete(line) - Call FindComboIndex(cmbMeleestate, line) - 'Check for crazy-odd MT_ usage - endclip = InStr(line, "MT_") - If endclip <> 0 Then - number = FindThingNum(line) - cmbMeleestate.Text = number & " - " & line - End If - 'Check for crazy-odd pw_ usage - endclip = InStr(line, "pw_") - If endclip <> 0 Then - number = FindPowerNum(line) - cmbMeleestate.Text = number & " - " & line - End If - - line = ts.ReadLine - Do While InStr(line, "missilestate") = 0 - Loop - endclip = InStr(line, ",") - line = Left(line, endclip - 1) - line = TrimComplete(line) - Call FindComboIndex(cmbMissilestate, line) - 'Check for crazy-odd MT_ usage - endclip = InStr(line, "MT_") - If endclip <> 0 Then - number = FindThingNum(line) - cmbMissilestate.Text = number & " - " & line - End If - 'Check for crazy-odd pw_ usage - endclip = InStr(line, "pw_") - If endclip <> 0 Then - number = FindPowerNum(line) - cmbMissilestate.Text = number & " - " & line - End If - - line = ts.ReadLine - Do While InStr(line, "deathstate") = 0 - Loop - endclip = InStr(line, ",") - line = Left(line, endclip - 1) - line = TrimComplete(line) - Call FindComboIndex(cmbDeathstate, line) - 'Check for crazy-odd MT_ usage - endclip = InStr(line, "MT_") - If endclip <> 0 Then - number = FindThingNum(line) - cmbDeathstate.Text = number & " - " & line - End If - 'Check for crazy-odd pw_ usage - endclip = InStr(line, "pw_") - If endclip <> 0 Then - number = FindPowerNum(line) - cmbDeathstate.Text = number & " - " & line - End If - - line = ts.ReadLine - Do While InStr(line, "xdeathstate") = 0 - Loop - endclip = InStr(line, ",") - line = Left(line, endclip - 1) - line = TrimComplete(line) - Call FindComboIndex(cmbXdeathstate, line) - 'Check for crazy-odd MT_ usage - endclip = InStr(line, "MT_") - If endclip <> 0 Then - number = FindThingNum(line) - cmbXdeathstate.Text = number & " - " & line - End If - 'Check for crazy-odd pw_ usage - endclip = InStr(line, "pw_") - If endclip <> 0 Then - number = FindPowerNum(line) - cmbXdeathstate.Text = number & " - " & line - End If - - line = ts.ReadLine - Do While InStr(line, "deathsound") = 0 - Loop - endclip = InStr(line, ",") - line = Left(line, endclip - 1) - line = TrimComplete(line) - Call FindComboIndex(cmbDeathsound, line) - 'Check for crazy-odd MT_ usage - endclip = InStr(line, "MT_") - If endclip <> 0 Then - number = FindThingNum(line) - cmbDeathsound.Text = number & " - " & line - End If - 'Check for crazy-odd pw_ usage - endclip = InStr(line, "pw_") - If endclip <> 0 Then - number = FindPowerNum(line) - cmbDeathsound.Text = number & " - " & line - End If - - - line = ts.ReadLine - Do While InStr(line, "speed") = 0 - Loop - endclip = InStr(line, ",") - line = Left(line, endclip - 1) - line = TrimComplete(line) - 'Check for *FRACUNIT values - endclip = InStr(line, "*FRACUNIT") - If endclip <> 0 Then - line = Left(line, endclip - 1) - line = Val(line) * 65536 - End If - 'Check for crazy-odd MT_ usage - endclip = InStr(line, "MT_") - If endclip <> 0 Then - line = FindThingNum(line) & " - " & line - End If - 'Check for crazy-odd pw_ usage - endclip = InStr(line, "pw_") - If endclip <> 0 Then - line = FindPowerNum(line) & " - " & line - End If - txtSpeed.Text = line - - line = ts.ReadLine - Do While InStr(line, "radius") = 0 - Loop - endclip = InStr(line, ",") - line = Left(line, endclip - 1) - line = TrimComplete(line) - 'Check for *FRACUNIT values - endclip = InStr(line, "*FRACUNIT") - If endclip <> 0 Then - line = Left(line, endclip - 1) - line = Val(line) * 65536 - End If - 'Check for crazy-odd MT_ usage - endclip = InStr(line, "MT_") - If endclip <> 0 Then - line = FindThingNum(line) & " - " & line - End If - 'Check for crazy-odd pw_ usage - endclip = InStr(line, "pw_") - If endclip <> 0 Then - line = FindPowerNum(line) & " - " & line - End If - txtRadius.Text = line - - line = ts.ReadLine - Do While InStr(line, "height") = 0 - Loop - endclip = InStr(line, ",") - line = Left(line, endclip - 1) - line = TrimComplete(line) - 'Check for *FRACUNIT values - endclip = InStr(line, "*FRACUNIT") - If endclip <> 0 Then - line = Left(line, endclip - 1) - line = Val(line) * 65536 - End If - 'Check for crazy-odd MT_ usage - endclip = InStr(line, "MT_") - If endclip <> 0 Then - line = FindThingNum(line) & " - " & line - End If - 'Check for crazy-odd pw_ usage - endclip = InStr(line, "pw_") - If endclip <> 0 Then - line = FindPowerNum(line) & " - " & line - End If - txtHeight.Text = line - - line = ts.ReadLine 'Display order offset (add support, please!) - - line = ts.ReadLine - Do While InStr(line, "mass") = 0 - Loop - endclip = InStr(line, ",") - line = Left(line, endclip - 1) - line = TrimComplete(line) - 'Check for *FRACUNIT values - endclip = InStr(line, "*FRACUNIT") - If endclip <> 0 Then - line = Left(line, endclip - 1) - line = Val(line) * 65536 - End If - 'Check for crazy-odd MT_ usage - endclip = InStr(line, "MT_") - If endclip <> 0 Then - line = FindThingNum(line) & " - " & line - End If - 'Check for crazy-odd pw_ usage - endclip = InStr(line, "pw_") - If endclip <> 0 Then - line = FindPowerNum(line) & " - " & line - End If - txtMass.Text = line - - line = ts.ReadLine - Do While InStr(line, "damage") = 0 - Loop - endclip = InStr(line, ",") - line = Left(line, endclip - 1) - line = TrimComplete(line) - 'Check for *FRACUNIT values - endclip = InStr(line, "*FRACUNIT") - If endclip <> 0 Then - line = Left(line, endclip - 1) - line = Val(line) * 65536 - End If - 'Check for crazy-odd MT_ usage - endclip = InStr(line, "MT_") - If endclip <> 0 Then - line = FindThingNum(line) & " - " & line - End If - 'Check for crazy-odd pw_ usage - endclip = InStr(line, "pw_") - If endclip <> 0 Then - line = FindPowerNum(line) & " - " & line - End If - txtDamage.Text = line - - line = ts.ReadLine - Do While InStr(line, "activesound") = 0 - Loop - endclip = InStr(line, ",") - line = Left(line, endclip - 1) - line = TrimComplete(line) - Call FindComboIndex(cmbActivesound, line) - 'Check for crazy-odd MT_ usage - endclip = InStr(line, "MT_") - If endclip <> 0 Then - number = FindThingNum(line) - cmbActivesound.Text = number & " - " & line - End If - 'Check for crazy-odd pw_ usage - endclip = InStr(line, "pw_") - If endclip <> 0 Then - number = FindPowerNum(line) - cmbActivesound.Text = number & " - " & line - End If - - line = ts.ReadLine - Do While InStr(line, "flags") = 0 - Loop - endclip = InStr(line, ",") - line = Left(line, endclip - 1) - line = TrimComplete(line) - ProcessFlags (line) - - line = ts.ReadLine - Do While InStr(line, "raisestate") = 0 - Loop - endclip = InStr(line, "//") - line = Left(line, endclip - 1) - line = TrimComplete(line) - Call FindComboIndex(cmbRaisestate, line) - 'Check for crazy-odd MT_ usage - endclip = InStr(line, "MT_") - If endclip <> 0 Then - number = FindThingNum(line) - cmbRaisestate.Text = number & " - " & line - End If - 'Check for crazy-odd pw_ usage - endclip = InStr(line, "pw_") - If endclip <> 0 Then - number = FindPowerNum(line) - cmbRaisestate.Text = number & " - " & line - End If - - ts.Close - Set myFSO = Nothing -End Sub - -Private Sub ProcessFlags(flags As String) - Dim FlagList(32) As String - Dim endpoint As Integer - Dim ListCount As Integer - Dim FlagString As String - Dim myFSO As New Scripting.FileSystemObject - Dim ts As TextStream - Dim line As String - Dim j As Integer, i As Integer - Dim number As Long - Dim startclip As Integer, endclip As Integer - - For j = 0 To 26 - chkFlags(j).Value = 0 - Next j - - FlagString = flags - - flags = flags & "||" - - ListCount = 0 - - Do While Len(flags) > 3 - endpoint = InStr(flags, "|") - FlagString = Left(flags, endpoint - 1) - flags = Right(flags, Len(flags) - endpoint) - FlagList(ListCount) = FlagString - ListCount = ListCount + 1 - Loop - - ChDir SourcePath - - For i = 0 To ListCount - 1 - Set ts = myFSO.OpenTextFile("p_mobj.h", ForReading, False) - - line = ts.ReadLine - - Do While Not ts.AtEndOfStream - line = ts.ReadLine - If InStr(line, FlagList(i)) Then - If InStr(line, "//") = 0 Or (InStr(line, "//") > InStr(line, FlagList(i))) Then - Exit Do - End If - End If - Loop - - If InStr(line, FlagList(i)) Then - startclip = InStr(line, "0x") - endclip = InStr(line, ",") - line = Mid(line, startclip + 2, endclip - 1) - line = "&H" & line - TrimComplete (line) - line = Left(line, Len(line) - 1) - number = CLng(line) - - For j = 0 To 26 - If chkFlags(j).Tag = number Then - chkFlags(j).Value = 1 - End If - Next j - End If - ts.Close - Next i - - Set myFSO = Nothing -End Sub - -Private Sub FindComboIndex(ByRef Box As ComboBox, line As String) - Dim i As Integer - - For i = 0 To Box.ListCount - If InStr(Box.List(i), line) Then - Box.ListIndex = i - Exit For - End If - Next -End Sub - -Private Sub lstThings_Click() - lblStatusInfo.Caption = "Loading thing info..." - DoEvents - Call ClearForm - If InStr(lstThings.List(lstThings.ListIndex), "MT_FREESLOT") = 0 Then - LoadObjectInfo (lstThings.ListIndex) - End If - LoadSOCObjectInfo (lstThings.ListIndex) - lblStatusInfo.Caption = "Idle" -End Sub - -Private Sub LoadSOCObjectInfo(ThingNum As Integer) - Dim myFSO As New Scripting.FileSystemObject - Dim ts As TextStream - Dim line As String - Dim word As String - Dim word2 As String - Dim j As Integer - Dim temp As Long - - Set ts = myFSO.OpenTextFile(SOCFile, ForReading, False) - -SOCLoad: - Do While Not ts.AtEndOfStream - line = ts.ReadLine - - If Left(line, 1) = "#" Then GoTo SOCLoad - - If Left(line, 1) = vbCrLf Then GoTo SOCLoad - - If Len(line) < 1 Then GoTo SOCLoad - - word = FirstToken(line) - word2 = SecondToken(line) - - If UCase(word) = "THING" And Val(word2) = ThingNum Then - Do While Len(line) > 0 And Not ts.AtEndOfStream - line = ts.ReadLine - word = UCase(FirstToken(line)) - word2 = UCase(SecondTokenEqual(line)) - - If word = "MAPTHINGNUM" Then - txtDoomednum.Text = Val(word2) - ElseIf word = "SPAWNSTATE" Then - cmbSpawnstate.ListIndex = Val(word2) - ElseIf word = "SPAWNHEALTH" Then - txtSpawnhealth.Text = Val(word2) - ElseIf word = "SEESTATE" Then - cmbSeestate.ListIndex = Val(word2) - ElseIf word = "SEESOUND" Then - cmbSeesound.ListIndex = Val(word2) - ElseIf word = "REACTIONTIME" Then - txtReactiontime.Text = Val(word2) - ElseIf word = "ATTACKSOUND" Then - cmbAttacksound.ListIndex = Val(word2) - ElseIf word = "PAINSTATE" Then - cmbPainstate.ListIndex = Val(word2) - ElseIf word = "PAINCHANCE" Then - txtPainchance.Text = Val(word2) - ElseIf word = "PAINSOUND" Then - cmbPainsound.ListIndex = Val(word2) - ElseIf word = "MELEESTATE" Then - cmbMeleestate.ListIndex = Val(word2) - ElseIf word = "MISSILESTATE" Then - cmbMissilestate.ListIndex = Val(word2) - ElseIf word = "DEATHSTATE" Then - cmbDeathstate.ListIndex = Val(word2) - ElseIf word = "DEATHSOUND" Then - cmbDeathsound.ListIndex = Val(word2) - ElseIf word = "XDEATHSTATE" Then - cmbXdeathstate.ListIndex = Val(word2) - ElseIf word = "SPEED" Then - txtSpeed.Text = Val(word2) - ElseIf word = "RADIUS" Then - txtRadius.Text = Val(word2) - ElseIf word = "HEIGHT" Then - txtHeight.Text = Val(word2) - ElseIf word = "MASS" Then - txtMass.Text = Val(word2) - ElseIf word = "DAMAGE" Then - txtDamage.Text = Val(word2) - ElseIf word = "ACTIVESOUND" Then - cmbActivesound.ListIndex = Val(word2) - ElseIf word = "FLAGS" Then - For j = 0 To 26 - temp = Val(word2) - If temp And chkFlags(j).Tag Then - chkFlags(j).Value = 1 - Else - chkFlags(j).Value = 0 - End If - Next j - ElseIf word = "RAISESTATE" Then - cmbRaisestate.ListIndex = Val(word2) - ElseIf Len(line) > 0 And Left(line, 1) <> "#" Then - MsgBox "Error in SOC!" & vbCrLf & "Unknown line: " & line - End If - Loop - Exit Do - End If - Loop - - ts.Close - Set myFSO = Nothing -End Sub - -Private Function FindThingNum(ThingName As String) As Integer - Dim i As Integer - Dim temp As String - Dim startpoint As Integer - Dim endpoint As Integer - - For i = 0 To lstThings.ListCount - 1 - temp = lstThings.List(i) - startpoint = InStr(temp, "-") + 2 - endpoint = Len(temp) - startpoint + 1 - temp = Mid(temp, startpoint, endpoint) - If temp = ThingName Then - FindThingNum = Val(lstThings.List(i)) - Exit For - End If - Next -End Function - -Private Function FindPowerNum(PowerName As String) As Integer - Dim myFSO As New Scripting.FileSystemObject - Dim ts As TextStream - Dim line As String - Dim number As Integer - Dim startclip As Integer - - ChDir SourcePath - Set ts = myFSO.OpenTextFile("d_player.h", ForReading, False) - - Do While InStr(ts.ReadLine, "Player powers. (don't edit this comment)") = 0 - Loop - - ts.SkipLine ' typedef enum - ts.SkipLine ' { - - line = ts.ReadLine - number = 0 - - Do While InStr(line, "NUMPOWERS") = 0 - startclip = InStr(line, PowerName) - If startclip <> 0 Then - FindPowerNum = number - Exit Do - End If - number = number + 1 - line = ts.ReadLine - Loop - - ts.Close - Set myFSO = Nothing -End Function - -Private Sub WriteThing(Remove As Boolean, num As Integer) - Dim myFSOSource As New Scripting.FileSystemObject - Dim tsSource As TextStream - Dim myFSOTarget As New Scripting.FileSystemObject - Dim tsTarget As TextStream - Dim line As String - Dim word As String - Dim word2 As String - Dim flags As Long - Dim thingfound As Boolean - Dim i As Integer - - thingfound = False - - Set tsSource = myFSOSource.OpenTextFile(SOCFile, ForReading, False) - Set tsTarget = myFSOTarget.OpenTextFile(SOCTemp, ForWriting, True) - - Do While Not tsSource.AtEndOfStream - line = tsSource.ReadLine - word = UCase(FirstToken(line)) - word2 = UCase(SecondToken(line)) - - 'If the current thing exists in the SOC, delete it. - If word = "THING" And Val(word2) = num Then - thingfound = True - Do While Len(TrimComplete(tsSource.ReadLine)) > 0 And Not (tsSource.AtEndOfStream) - Loop - Else - tsTarget.WriteLine line - End If - Loop - - tsSource.Close - Set myFSOSource = Nothing - - If Remove = False Then - If line <> "" Then tsTarget.WriteLine "" - tsTarget.WriteLine "Thing " & num - txtDoomednum.Text = TrimComplete(txtDoomednum.Text) - cmbSpawnstate.Text = TrimComplete(cmbSpawnstate.Text) - txtSpawnhealth.Text = TrimComplete(txtSpawnhealth.Text) - cmbSeestate.Text = TrimComplete(cmbSeestate.Text) - cmbSeesound.Text = TrimComplete(cmbSeesound.Text) - txtReactiontime.Text = TrimComplete(txtReactiontime.Text) - cmbAttacksound.Text = TrimComplete(cmbAttacksound.Text) - cmbPainstate.Text = TrimComplete(cmbPainstate.Text) - txtPainchance.Text = TrimComplete(txtPainchance.Text) - cmbPainsound.Text = TrimComplete(cmbPainsound.Text) - cmbMeleestate.Text = TrimComplete(cmbMeleestate.Text) - cmbMissilestate.Text = TrimComplete(cmbMissilestate.Text) - cmbDeathstate.Text = TrimComplete(cmbDeathstate.Text) - cmbDeathsound.Text = TrimComplete(cmbDeathsound.Text) - cmbXdeathstate.Text = TrimComplete(cmbXdeathstate.Text) - txtSpeed.Text = TrimComplete(txtSpeed.Text) - txtRadius.Text = TrimComplete(txtRadius.Text) - txtHeight.Text = TrimComplete(txtHeight.Text) - txtMass.Text = TrimComplete(txtMass.Text) - txtDamage.Text = TrimComplete(txtDamage.Text) - cmbActivesound.Text = TrimComplete(cmbActivesound.Text) - cmbRaisestate.Text = TrimComplete(cmbRaisestate.Text) - flags = 0 - ' Only 31 bits can be used, because VB is stupid. - For i = 0 To 26 - If chkFlags(i).Value = 1 Then flags = flags + Val(chkFlags(i).Tag) - Next - If txtDoomednum.Text <> "" Then tsTarget.WriteLine "MAPTHINGNUM = " & Val(txtDoomednum.Text) - If cmbSpawnstate.Text <> "" Then tsTarget.WriteLine "SPAWNSTATE = " & Val(cmbSpawnstate.Text) - If txtSpawnhealth.Text <> "" Then tsTarget.WriteLine "SPAWNHEALTH = " & Val(txtSpawnhealth.Text) - If cmbSeestate.Text <> "" Then tsTarget.WriteLine "SEESTATE = " & Val(cmbSeestate.Text) - If cmbSeesound.Text <> "" Then tsTarget.WriteLine "SEESOUND = " & Val(cmbSeesound.Text) - If txtReactiontime.Text <> "" Then tsTarget.WriteLine "REACTIONTIME = " & Val(txtReactiontime.Text) - If cmbAttacksound.Text <> "" Then tsTarget.WriteLine "ATTACKSOUND = " & Val(cmbAttacksound.Text) - If cmbPainstate.Text <> "" Then tsTarget.WriteLine "PAINSTATE = " & Val(cmbPainstate.Text) - If txtPainchance.Text <> "" Then tsTarget.WriteLine "PAINCHANCE = " & Val(txtPainchance.Text) - If cmbPainsound.Text <> "" Then tsTarget.WriteLine "PAINSOUND = " & Val(cmbPainsound.Text) - If cmbMeleestate.Text <> "" Then tsTarget.WriteLine "MELEESTATE = " & Val(cmbMeleestate.Text) - If cmbMissilestate.Text <> "" Then tsTarget.WriteLine "MISSILESTATE = " & Val(cmbMissilestate.Text) - If cmbDeathstate.Text <> "" Then tsTarget.WriteLine "DEATHSTATE = " & Val(cmbDeathstate.Text) - If cmbDeathsound.Text <> "" Then tsTarget.WriteLine "DEATHSOUND = " & Val(cmbDeathsound.Text) - If cmbXdeathstate.Text <> "" Then tsTarget.WriteLine "XDEATHSTATE = " & Val(cmbXdeathstate.Text) - If txtSpeed.Text <> "" Then tsTarget.WriteLine "SPEED = " & Val(txtSpeed.Text) - If txtRadius.Text <> "" Then tsTarget.WriteLine "RADIUS = " & Val(txtRadius.Text) - If txtHeight.Text <> "" Then tsTarget.WriteLine "HEIGHT = " & Val(txtHeight.Text) - If txtMass.Text <> "" Then tsTarget.WriteLine "MASS = " & Val(txtMass.Text) - If txtDamage.Text <> "" Then tsTarget.WriteLine "DAMAGE = " & Val(txtDamage.Text) - If cmbActivesound.Text <> "" Then tsTarget.WriteLine "ACTIVESOUND = " & Val(cmbActivesound.Text) - If cmbRaisestate.Text <> "" Then tsTarget.WriteLine "RAISESTATE = " & Val(cmbRaisestate.Text) - tsTarget.WriteLine "FLAGS = " & flags - End If - - tsTarget.Close - Set myFSOTarget = Nothing - - FileCopy SOCTemp, SOCFile - - Kill SOCTemp - - If Remove = True Then - If thingfound = True Then - MsgBox "Thing removed from SOC." - Else - MsgBox "Thing not found in SOC." - End If - Else - MsgBox "Thing Saved." - End If -End Sub diff --git a/tools/SOCEdit/Things.frx b/tools/SOCEdit/Things.frx deleted file mode 100644 index 980538679..000000000 Binary files a/tools/SOCEdit/Things.frx and /dev/null differ diff --git a/tools/SOCEdit/frmCharacterEdit.frm b/tools/SOCEdit/frmCharacterEdit.frm deleted file mode 100644 index 415fcbb0f..000000000 --- a/tools/SOCEdit/frmCharacterEdit.frm +++ /dev/null @@ -1,320 +0,0 @@ -VERSION 5.00 -Begin VB.Form frmCharacterEdit - Caption = "Character Edit" - ClientHeight = 3345 - ClientLeft = 60 - ClientTop = 345 - ClientWidth = 4680 - Icon = "frmCharacterEdit.frx":0000 - LinkTopic = "Form1" - MaxButton = 0 'False - ScaleHeight = 3345 - ScaleWidth = 4680 - Begin VB.CommandButton cmdExample - Caption = "Show Me An &Example" - Height = 495 - Left = 1320 - Style = 1 'Graphical - TabIndex = 14 - Top = 2400 - Width = 975 - End - Begin VB.CheckBox chkEnabled - Caption = "Enable this player selection." - Height = 495 - Left = 1080 - TabIndex = 13 - Top = 1560 - Width = 1455 - End - Begin VB.CommandButton cmdDelete - Caption = "&Delete from SOC" - Height = 495 - Left = 120 - Style = 1 'Graphical - TabIndex = 12 - Top = 2760 - Width = 855 - End - Begin VB.CommandButton cmdSave - Caption = "&Save" - Height = 495 - Left = 120 - TabIndex = 11 - Top = 2160 - Width = 855 - End - Begin VB.TextBox txtSkinname - Height = 285 - Left = 3240 - TabIndex = 9 - Top = 1200 - Width = 1335 - End - Begin VB.TextBox txtPicname - Height = 285 - Left = 3240 - MaxLength = 8 - TabIndex = 7 - Top = 840 - Width = 1095 - End - Begin VB.TextBox txtMenuposition - Height = 285 - Left = 3240 - MaxLength = 3 - TabIndex = 5 - Top = 480 - Width = 495 - End - Begin VB.TextBox txtPlayername - Height = 285 - Left = 3240 - MaxLength = 64 - TabIndex = 3 - Top = 120 - Width = 1335 - End - Begin VB.TextBox txtPlayertext - Height = 1455 - Left = 2640 - MultiLine = -1 'True - TabIndex = 1 - Top = 1800 - Width = 1935 - End - Begin VB.ListBox lstPlayers - Height = 1815 - ItemData = "frmCharacterEdit.frx":0442 - Left = 120 - List = "frmCharacterEdit.frx":0461 - TabIndex = 0 - Top = 240 - Width = 855 - End - Begin VB.Label lblSkinname - Caption = "Name of player (skin) to use:" - Height = 255 - Left = 1080 - TabIndex = 10 - Top = 1200 - Width = 2055 - End - Begin VB.Label lblPicname - Alignment = 1 'Right Justify - Caption = "Picture to display:" - Height = 255 - Left = 1560 - TabIndex = 8 - Top = 840 - Width = 1575 - End - Begin VB.Label lblMenuposition - Alignment = 1 'Right Justify - Caption = "Vertical menu position:" - Height = 255 - Left = 1320 - TabIndex = 6 - Top = 480 - Width = 1815 - End - Begin VB.Label lblPlayername - Alignment = 1 'Right Justify - Caption = "Displayed name of player:" - Height = 255 - Left = 1320 - TabIndex = 4 - Top = 120 - Width = 1815 - End - Begin VB.Label lblPlayertext - Caption = "Short Description:" - Height = 255 - Left = 2640 - TabIndex = 2 - Top = 1560 - Width = 1455 - End -End -Attribute VB_Name = "frmCharacterEdit" -Attribute VB_GlobalNameSpace = False -Attribute VB_Creatable = False -Attribute VB_PredeclaredId = True -Attribute VB_Exposed = False -Option Explicit - -Private Sub cmdDelete_Click() - Call WriteCharacter(True) -End Sub - -Private Sub cmdExample_Click() - txtPlayername.Text = "SONIC" - txtMenuposition.Text = "20" - txtPicname.Text = "SONCCHAR" - txtSkinname.Text = "SONIC" - chkEnabled.Value = 1 - txtPlayertext.Text = " Fastest" & vbCrLf & " Speed Thok" & vbCrLf & " Not a good pick" & vbCrLf & "for starters, but when" & vbCrLf & "controlled properly," & vbCrLf & "Sonic is the most" & vbCrLf & "powerful of the three." -End Sub - -Private Sub cmdSave_Click() - Call WriteCharacter(False) -End Sub - -Private Sub ClearForm() - txtPlayername.Text = "" - txtMenuposition.Text = "" - txtPicname.Text = "" - txtSkinname.Text = "" - chkEnabled.Value = 0 - txtPlayertext.Text = "" -End Sub - -Private Sub ReadSOCPlayer(num As Integer) - Dim myFSO As New Scripting.FileSystemObject - Dim ts As TextStream - Dim line As String - Dim word As String - Dim word2 As String - - Set ts = myFSO.OpenTextFile(SOCFile, ForReading, False) - -SOCLoad: - Do While Not ts.AtEndOfStream - line = ts.ReadLine - - If Left(line, 1) = "#" Then GoTo SOCLoad - - If Left(line, 1) = vbCrLf Then GoTo SOCLoad - - If Len(line) < 1 Then GoTo SOCLoad - - word = FirstToken(line) - word2 = SecondToken(line) - - If UCase(word) = "CHARACTER" And Val(word2) = num Then - Do While Len(line) > 0 And Not ts.AtEndOfStream - line = ts.ReadLine - word = UCase(FirstToken(line)) - word2 = UCase(SecondTokenEqual(line)) - - If word = "PLAYERTEXT" Then - Dim startclip As Integer, endclip As Integer - startclip = InStr(line, "=") - - startclip = startclip + 2 - - line = Mid(line, startclip, Len(line)) - - txtPlayertext.Text = line & vbCrLf - - Do While InStr(line, "#") = 0 And Not ts.AtEndOfStream - line = ts.ReadLine & vbCrLf - txtPlayertext.Text = txtPlayertext.Text & line - Loop - - txtPlayertext.Text = RTrimComplete(txtPlayertext.Text) - If Right(txtPlayertext.Text, 1) = "#" Then - txtPlayertext.Text = Left(txtPlayertext.Text, Len(txtPlayertext.Text) - 1) - End If - ElseIf word = "PLAYERNAME" Then - txtPlayername.Text = word2 - ElseIf word = "MENUPOSITION" Then - txtMenuposition.Text = Val(word2) - ElseIf word = "PICNAME" Then - txtPicname.Text = word2 - ElseIf word = "STATUS" Then - If Val(word2) = 32 Then - chkEnabled.Value = 1 - Else - chkEnabled.Value = 0 - End If - ElseIf word = "SKINNAME" Then - txtSkinname.Text = word2 - ElseIf Len(line) > 0 And Left(line, 1) <> "#" Then - MsgBox "Error in SOC!" & vbCrLf & "Unknown line: " & line - End If - Loop - Exit Do - End If - Loop - - ts.Close - Set myFSO = Nothing -End Sub - -Private Sub lstPlayers_Click() - Call ClearForm - Call ReadSOCPlayer(lstPlayers.ListIndex) -End Sub - -Private Sub WriteCharacter(Remove As Boolean) - Dim myFSOSource As New Scripting.FileSystemObject - Dim tsSource As TextStream - Dim myFSOTarget As New Scripting.FileSystemObject - Dim tsTarget As TextStream - Dim line As String - Dim word As String - Dim word2 As String - Dim charfound As Boolean - - charfound = False - - Set tsSource = myFSOSource.OpenTextFile(SOCFile, ForReading, False) - Set tsTarget = myFSOTarget.OpenTextFile(SOCTemp, ForWriting, True) - - Do While Not tsSource.AtEndOfStream - line = tsSource.ReadLine - word = UCase(FirstToken(line)) - word2 = UCase(SecondToken(line)) - - 'If the current character exists in the SOC, delete it. - If word = "CHARACTER" And Val(word2) = lstPlayers.ListIndex Then - charfound = True - Do While Len(TrimComplete(tsSource.ReadLine)) > 0 And Not (tsSource.AtEndOfStream) - Loop - Else - tsTarget.WriteLine line - End If - Loop - - tsSource.Close - Set myFSOSource = Nothing - - If Remove = False Then - If line <> "" Then tsTarget.WriteLine "" - - tsTarget.WriteLine "CHARACTER " & lstPlayers.ListIndex - txtPlayername.Text = TrimComplete(txtPlayername.Text) - txtMenuposition.Text = TrimComplete(txtMenuposition.Text) - txtPicname.Text = TrimComplete(txtPicname.Text) - txtSkinname.Text = TrimComplete(txtSkinname.Text) - If txtPlayername.Text <> "" Then tsTarget.WriteLine "PLAYERNAME = " & txtPlayername.Text - If txtMenuposition.Text <> "" Then tsTarget.WriteLine "MENUPOSITION = " & Val(txtMenuposition.Text) - If txtPicname.Text <> "" Then tsTarget.WriteLine "PICNAME = " & txtPicname.Text - If txtSkinname.Text <> "" Then tsTarget.WriteLine "SKINNAME = " & txtSkinname.Text - If chkEnabled.Value = 1 Then - tsTarget.WriteLine "STATUS = 32" - Else - tsTarget.WriteLine "STATUS = 0" - End If - If txtPlayertext.Text <> "" Then tsTarget.WriteLine "PLAYERTEXT = " & txtPlayertext.Text & "#" - End If - - tsTarget.Close - Set myFSOTarget = Nothing - - FileCopy SOCTemp, SOCFile - - Kill SOCTemp - - If Remove = True Then - If charfound = True Then - MsgBox "Player choice removed from SOC." - Else - MsgBox "Player choice not found in SOC." - End If - Else - MsgBox "Character Saved." - End If -End Sub - diff --git a/tools/SOCEdit/frmCharacterEdit.frx b/tools/SOCEdit/frmCharacterEdit.frx deleted file mode 100644 index 5e767f4ab..000000000 Binary files a/tools/SOCEdit/frmCharacterEdit.frx and /dev/null differ diff --git a/tools/SOCEdit/frmCutsceneEdit.frm b/tools/SOCEdit/frmCutsceneEdit.frm deleted file mode 100644 index 7fb18feed..000000000 --- a/tools/SOCEdit/frmCutsceneEdit.frm +++ /dev/null @@ -1,1365 +0,0 @@ -VERSION 5.00 -Begin VB.Form frmCutsceneEdit - Caption = "Cutscene Edit" - ClientHeight = 6495 - ClientLeft = 60 - ClientTop = 345 - ClientWidth = 10410 - Icon = "frmCutsceneEdit.frx":0000 - LinkTopic = "Form1" - MaxButton = 0 'False - ScaleHeight = 6495 - ScaleWidth = 10410 - StartUpPosition = 3 'Windows Default - Begin VB.TextBox txtNumScenes - Height = 285 - Left = 3480 - MaxLength = 3 - TabIndex = 97 - Top = 240 - Width = 615 - End - Begin VB.ListBox lstScene - Height = 450 - ItemData = "frmCutsceneEdit.frx":0442 - Left = 3360 - List = "frmCutsceneEdit.frx":0444 - TabIndex = 94 - Top = 600 - Width = 735 - End - Begin VB.ComboBox cmbMusicslot - Height = 315 - Left = 8760 - TabIndex = 93 - Top = 1680 - Width = 1575 - End - Begin VB.Frame frmPic1 - Caption = "Picture 8:" - Height = 1335 - Index = 7 - Left = 7440 - TabIndex = 80 - Top = 5040 - Width = 2895 - Begin VB.TextBox txtPicycoord - Height = 285 - Index = 7 - Left = 600 - MaxLength = 3 - TabIndex = 85 - Top = 960 - Width = 495 - End - Begin VB.TextBox txtPicXcoord - Height = 285 - Index = 7 - Left = 600 - MaxLength = 3 - TabIndex = 84 - Top = 600 - Width = 495 - End - Begin VB.TextBox txtPicduration - Height = 285 - Index = 7 - Left = 2040 - MaxLength = 5 - TabIndex = 83 - Top = 600 - Width = 735 - End - Begin VB.TextBox txtPicname - Height = 285 - Index = 7 - Left = 1320 - TabIndex = 82 - Top = 240 - Width = 1455 - End - Begin VB.CheckBox chkPichires - Caption = "High-Resolution" - Height = 255 - Index = 7 - Left = 1320 - TabIndex = 81 - Top = 960 - Width = 1455 - End - Begin VB.Label lblPicycoord - Alignment = 1 'Right Justify - Caption = "Y:" - Height = 255 - Index = 7 - Left = 240 - TabIndex = 89 - Top = 960 - Width = 255 - End - Begin VB.Label lblPicxcoord - Alignment = 1 'Right Justify - Caption = "X:" - Height = 255 - Index = 7 - Left = 240 - TabIndex = 88 - Top = 600 - Width = 255 - End - Begin VB.Label lblPicduration - Alignment = 1 'Right Justify - Caption = "Duration:" - Height = 255 - Index = 7 - Left = 1200 - TabIndex = 87 - Top = 600 - Width = 735 - End - Begin VB.Label lblPicname - Alignment = 1 'Right Justify - Caption = "Picture Name:" - Height = 255 - Index = 7 - Left = 120 - TabIndex = 86 - Top = 240 - Width = 1095 - End - End - Begin VB.Frame frmPic1 - Caption = "Picture 7:" - Height = 1335 - Index = 6 - Left = 4440 - TabIndex = 70 - Top = 5040 - Width = 2895 - Begin VB.TextBox txtPicycoord - Height = 285 - Index = 6 - Left = 600 - MaxLength = 3 - TabIndex = 75 - Top = 960 - Width = 495 - End - Begin VB.TextBox txtPicXcoord - Height = 285 - Index = 6 - Left = 600 - MaxLength = 3 - TabIndex = 74 - Top = 600 - Width = 495 - End - Begin VB.TextBox txtPicduration - Height = 285 - Index = 6 - Left = 2040 - MaxLength = 5 - TabIndex = 73 - Top = 600 - Width = 735 - End - Begin VB.TextBox txtPicname - Height = 285 - Index = 6 - Left = 1320 - TabIndex = 72 - Top = 240 - Width = 1455 - End - Begin VB.CheckBox chkPichires - Caption = "High-Resolution" - Height = 255 - Index = 6 - Left = 1320 - TabIndex = 71 - Top = 960 - Width = 1455 - End - Begin VB.Label lblPicycoord - Alignment = 1 'Right Justify - Caption = "Y:" - Height = 255 - Index = 6 - Left = 240 - TabIndex = 79 - Top = 960 - Width = 255 - End - Begin VB.Label lblPicxcoord - Alignment = 1 'Right Justify - Caption = "X:" - Height = 255 - Index = 6 - Left = 240 - TabIndex = 78 - Top = 600 - Width = 255 - End - Begin VB.Label lblPicduration - Alignment = 1 'Right Justify - Caption = "Duration:" - Height = 255 - Index = 6 - Left = 1200 - TabIndex = 77 - Top = 600 - Width = 735 - End - Begin VB.Label lblPicname - Alignment = 1 'Right Justify - Caption = "Picture Name:" - Height = 255 - Index = 6 - Left = 120 - TabIndex = 76 - Top = 240 - Width = 1095 - End - End - Begin VB.Frame frmPic1 - Caption = "Picture 6:" - Height = 1335 - Index = 5 - Left = 7440 - TabIndex = 60 - Top = 3600 - Width = 2895 - Begin VB.TextBox txtPicycoord - Height = 285 - Index = 5 - Left = 600 - MaxLength = 3 - TabIndex = 65 - Top = 960 - Width = 495 - End - Begin VB.TextBox txtPicXcoord - Height = 285 - Index = 5 - Left = 600 - MaxLength = 3 - TabIndex = 64 - Top = 600 - Width = 495 - End - Begin VB.TextBox txtPicduration - Height = 285 - Index = 5 - Left = 2040 - MaxLength = 5 - TabIndex = 63 - Top = 600 - Width = 735 - End - Begin VB.TextBox txtPicname - Height = 285 - Index = 5 - Left = 1320 - TabIndex = 62 - Top = 240 - Width = 1455 - End - Begin VB.CheckBox chkPichires - Caption = "High-Resolution" - Height = 255 - Index = 5 - Left = 1320 - TabIndex = 61 - Top = 960 - Width = 1455 - End - Begin VB.Label lblPicycoord - Alignment = 1 'Right Justify - Caption = "Y:" - Height = 255 - Index = 5 - Left = 240 - TabIndex = 69 - Top = 960 - Width = 255 - End - Begin VB.Label lblPicxcoord - Alignment = 1 'Right Justify - Caption = "X:" - Height = 255 - Index = 5 - Left = 240 - TabIndex = 68 - Top = 600 - Width = 255 - End - Begin VB.Label lblPicduration - Alignment = 1 'Right Justify - Caption = "Duration:" - Height = 255 - Index = 5 - Left = 1200 - TabIndex = 67 - Top = 600 - Width = 735 - End - Begin VB.Label lblPicname - Alignment = 1 'Right Justify - Caption = "Picture Name:" - Height = 255 - Index = 5 - Left = 120 - TabIndex = 66 - Top = 240 - Width = 1095 - End - End - Begin VB.Frame frmPic1 - Caption = "Picture 5:" - Height = 1335 - Index = 4 - Left = 4440 - TabIndex = 50 - Top = 3600 - Width = 2895 - Begin VB.TextBox txtPicycoord - Height = 285 - Index = 4 - Left = 600 - MaxLength = 3 - TabIndex = 55 - Top = 960 - Width = 495 - End - Begin VB.TextBox txtPicXcoord - Height = 285 - Index = 4 - Left = 600 - MaxLength = 3 - TabIndex = 54 - Top = 600 - Width = 495 - End - Begin VB.TextBox txtPicduration - Height = 285 - Index = 4 - Left = 2040 - MaxLength = 5 - TabIndex = 53 - Top = 600 - Width = 735 - End - Begin VB.TextBox txtPicname - Height = 285 - Index = 4 - Left = 1320 - TabIndex = 52 - Top = 240 - Width = 1455 - End - Begin VB.CheckBox chkPichires - Caption = "High-Resolution" - Height = 255 - Index = 4 - Left = 1320 - TabIndex = 51 - Top = 960 - Width = 1455 - End - Begin VB.Label lblPicycoord - Alignment = 1 'Right Justify - Caption = "Y:" - Height = 255 - Index = 4 - Left = 240 - TabIndex = 59 - Top = 960 - Width = 255 - End - Begin VB.Label lblPicxcoord - Alignment = 1 'Right Justify - Caption = "X:" - Height = 255 - Index = 4 - Left = 240 - TabIndex = 58 - Top = 600 - Width = 255 - End - Begin VB.Label lblPicduration - Alignment = 1 'Right Justify - Caption = "Duration:" - Height = 255 - Index = 4 - Left = 1200 - TabIndex = 57 - Top = 600 - Width = 735 - End - Begin VB.Label lblPicname - Alignment = 1 'Right Justify - Caption = "Picture Name:" - Height = 255 - Index = 4 - Left = 120 - TabIndex = 56 - Top = 240 - Width = 1095 - End - End - Begin VB.Frame frmPic1 - Caption = "Picture 4:" - Height = 1335 - Index = 3 - Left = 1440 - TabIndex = 40 - Top = 3600 - Width = 2895 - Begin VB.CheckBox chkPichires - Caption = "High-Resolution" - Height = 255 - Index = 3 - Left = 1320 - TabIndex = 45 - Top = 960 - Width = 1455 - End - Begin VB.TextBox txtPicname - Height = 285 - Index = 3 - Left = 1320 - TabIndex = 44 - Top = 240 - Width = 1455 - End - Begin VB.TextBox txtPicduration - Height = 285 - Index = 3 - Left = 2040 - MaxLength = 5 - TabIndex = 43 - Top = 600 - Width = 735 - End - Begin VB.TextBox txtPicXcoord - Height = 285 - Index = 3 - Left = 600 - MaxLength = 3 - TabIndex = 42 - Top = 600 - Width = 495 - End - Begin VB.TextBox txtPicycoord - Height = 285 - Index = 3 - Left = 600 - MaxLength = 3 - TabIndex = 41 - Top = 960 - Width = 495 - End - Begin VB.Label lblPicname - Alignment = 1 'Right Justify - Caption = "Picture Name:" - Height = 255 - Index = 3 - Left = 120 - TabIndex = 49 - Top = 240 - Width = 1095 - End - Begin VB.Label lblPicduration - Alignment = 1 'Right Justify - Caption = "Duration:" - Height = 255 - Index = 3 - Left = 1200 - TabIndex = 48 - Top = 600 - Width = 735 - End - Begin VB.Label lblPicxcoord - Alignment = 1 'Right Justify - Caption = "X:" - Height = 255 - Index = 3 - Left = 240 - TabIndex = 47 - Top = 600 - Width = 255 - End - Begin VB.Label lblPicycoord - Alignment = 1 'Right Justify - Caption = "Y:" - Height = 255 - Index = 3 - Left = 240 - TabIndex = 46 - Top = 960 - Width = 255 - End - End - Begin VB.Frame frmPic1 - Caption = "Picture 3:" - Height = 1335 - Index = 2 - Left = 7440 - TabIndex = 30 - Top = 2160 - Width = 2895 - Begin VB.CheckBox chkPichires - Caption = "High-Resolution" - Height = 255 - Index = 2 - Left = 1320 - TabIndex = 35 - Top = 960 - Width = 1455 - End - Begin VB.TextBox txtPicname - Height = 285 - Index = 2 - Left = 1320 - TabIndex = 34 - Top = 240 - Width = 1455 - End - Begin VB.TextBox txtPicduration - Height = 285 - Index = 2 - Left = 2040 - MaxLength = 5 - TabIndex = 33 - Top = 600 - Width = 735 - End - Begin VB.TextBox txtPicXcoord - Height = 285 - Index = 2 - Left = 600 - MaxLength = 3 - TabIndex = 32 - Top = 600 - Width = 495 - End - Begin VB.TextBox txtPicycoord - Height = 285 - Index = 2 - Left = 600 - MaxLength = 3 - TabIndex = 31 - Top = 960 - Width = 495 - End - Begin VB.Label lblPicname - Alignment = 1 'Right Justify - Caption = "Picture Name:" - Height = 255 - Index = 2 - Left = 120 - TabIndex = 39 - Top = 240 - Width = 1095 - End - Begin VB.Label lblPicduration - Alignment = 1 'Right Justify - Caption = "Duration:" - Height = 255 - Index = 2 - Left = 1200 - TabIndex = 38 - Top = 600 - Width = 735 - End - Begin VB.Label lblPicxcoord - Alignment = 1 'Right Justify - Caption = "X:" - Height = 255 - Index = 2 - Left = 240 - TabIndex = 37 - Top = 600 - Width = 255 - End - Begin VB.Label lblPicycoord - Alignment = 1 'Right Justify - Caption = "Y:" - Height = 255 - Index = 2 - Left = 240 - TabIndex = 36 - Top = 960 - Width = 255 - End - End - Begin VB.Frame frmPic1 - Caption = "Picture 2:" - Height = 1335 - Index = 1 - Left = 4440 - TabIndex = 20 - Top = 2160 - Width = 2895 - Begin VB.CheckBox chkPichires - Caption = "High-Resolution" - Height = 255 - Index = 1 - Left = 1320 - TabIndex = 25 - Top = 960 - Width = 1455 - End - Begin VB.TextBox txtPicname - Height = 285 - Index = 1 - Left = 1320 - TabIndex = 24 - Top = 240 - Width = 1455 - End - Begin VB.TextBox txtPicduration - Height = 285 - Index = 1 - Left = 2040 - MaxLength = 5 - TabIndex = 23 - Top = 600 - Width = 735 - End - Begin VB.TextBox txtPicXcoord - Height = 285 - Index = 1 - Left = 600 - MaxLength = 3 - TabIndex = 22 - Top = 600 - Width = 495 - End - Begin VB.TextBox txtPicycoord - Height = 285 - Index = 1 - Left = 600 - MaxLength = 3 - TabIndex = 21 - Top = 960 - Width = 495 - End - Begin VB.Label lblPicname - Alignment = 1 'Right Justify - Caption = "Picture Name:" - Height = 255 - Index = 1 - Left = 120 - TabIndex = 29 - Top = 240 - Width = 1095 - End - Begin VB.Label lblPicduration - Alignment = 1 'Right Justify - Caption = "Duration:" - Height = 255 - Index = 1 - Left = 1200 - TabIndex = 28 - Top = 600 - Width = 735 - End - Begin VB.Label lblPicxcoord - Alignment = 1 'Right Justify - Caption = "X:" - Height = 255 - Index = 1 - Left = 240 - TabIndex = 27 - Top = 600 - Width = 255 - End - Begin VB.Label lblPicycoord - Alignment = 1 'Right Justify - Caption = "Y:" - Height = 255 - Index = 1 - Left = 240 - TabIndex = 26 - Top = 960 - Width = 255 - End - End - Begin VB.TextBox txtTextypos - Height = 285 - Left = 3120 - MaxLength = 3 - TabIndex = 19 - Top = 5880 - Width = 615 - End - Begin VB.TextBox txtTextxpos - Height = 285 - Left = 3120 - MaxLength = 3 - TabIndex = 18 - Top = 5520 - Width = 615 - End - Begin VB.Frame frmPic1 - Caption = "Picture 1:" - Height = 1335 - Index = 0 - Left = 1440 - TabIndex = 6 - Top = 2160 - Width = 2895 - Begin VB.TextBox txtPicycoord - Height = 285 - Index = 0 - Left = 600 - MaxLength = 3 - TabIndex = 14 - Top = 960 - Width = 495 - End - Begin VB.TextBox txtPicXcoord - Height = 285 - Index = 0 - Left = 600 - MaxLength = 3 - TabIndex = 12 - Top = 600 - Width = 495 - End - Begin VB.TextBox txtPicduration - Height = 285 - Index = 0 - Left = 2040 - MaxLength = 5 - TabIndex = 11 - Top = 600 - Width = 735 - End - Begin VB.TextBox txtPicname - Height = 285 - Index = 0 - Left = 1320 - TabIndex = 8 - Top = 240 - Width = 1455 - End - Begin VB.CheckBox chkPichires - Caption = "High-Resolution" - Height = 255 - Index = 0 - Left = 1320 - TabIndex = 7 - Top = 960 - Width = 1455 - End - Begin VB.Label lblPicycoord - Alignment = 1 'Right Justify - Caption = "Y:" - Height = 255 - Index = 0 - Left = 240 - TabIndex = 15 - Top = 960 - Width = 255 - End - Begin VB.Label lblPicxcoord - Alignment = 1 'Right Justify - Caption = "X:" - Height = 255 - Index = 0 - Left = 240 - TabIndex = 13 - Top = 600 - Width = 255 - End - Begin VB.Label lblPicduration - Alignment = 1 'Right Justify - Caption = "Duration:" - Height = 255 - Index = 0 - Left = 1200 - TabIndex = 10 - Top = 600 - Width = 735 - End - Begin VB.Label lblPicname - Alignment = 1 'Right Justify - Caption = "Picture Name:" - Height = 255 - Index = 0 - Left = 120 - TabIndex = 9 - Top = 240 - Width = 1095 - End - End - Begin VB.TextBox txtNumberofpics - Height = 285 - Left = 3840 - MaxLength = 1 - TabIndex = 5 - Top = 1800 - Width = 375 - End - Begin VB.TextBox txtScenetext - Height = 1815 - Left = 4440 - MultiLine = -1 'True - TabIndex = 3 - Top = 240 - Width = 3135 - End - Begin VB.CommandButton cmdSave - Caption = "&Save Scene" - Height = 495 - Left = 3360 - Style = 1 'Graphical - TabIndex = 1 - Top = 1200 - Width = 855 - End - Begin VB.ListBox lstCutscenes - Height = 6300 - ItemData = "frmCutsceneEdit.frx":0446 - Left = 120 - List = "frmCutsceneEdit.frx":0448 - TabIndex = 0 - Top = 120 - Width = 1215 - End - Begin VB.Label Label3 - Caption = "Note: The cutscene editor is not fully functional. Only use it to get an idea of the proper syntax to use." - BeginProperty Font - Name = "MS Sans Serif" - Size = 9.75 - Charset = 0 - Weight = 700 - Underline = 0 'False - Italic = 0 'False - Strikethrough = 0 'False - EndProperty - Height = 1335 - Left = 7680 - TabIndex = 98 - Top = 240 - Width = 2655 - End - Begin VB.Label Label2 - Caption = "For Scene Text:" - BeginProperty Font - Name = "MS Sans Serif" - Size = 8.25 - Charset = 0 - Weight = 400 - Underline = -1 'True - Italic = 0 'False - Strikethrough = 0 'False - EndProperty - Height = 255 - Left = 1560 - TabIndex = 96 - Top = 5160 - Width = 1695 - End - Begin VB.Label Label1 - Caption = "Enter all time durations in game tics (35 = 1 second)" - BeginProperty Font - Name = "MS Sans Serif" - Size = 8.25 - Charset = 0 - Weight = 700 - Underline = 0 'False - Italic = 0 'False - Strikethrough = 0 'False - EndProperty - Height = 855 - Left = 1560 - TabIndex = 95 - Top = 960 - Width = 1335 - End - Begin VB.Label lblMusicslot - Alignment = 1 'Right Justify - Caption = "Music to play:" - Height = 255 - Left = 7680 - TabIndex = 92 - Top = 1680 - Width = 975 - End - Begin VB.Label lblCurrentScene - Alignment = 1 'Right Justify - Caption = "Current Scene:" - Height = 255 - Left = 1920 - TabIndex = 91 - Top = 720 - Width = 1215 - End - Begin VB.Label lblNumScenes - Alignment = 1 'Right Justify - Caption = "Number of Scenes in this Cutscene:" - Height = 375 - Left = 1440 - TabIndex = 90 - Top = 120 - Width = 1935 - End - Begin VB.Label lblTextypos - Alignment = 1 'Right Justify - Caption = "Text Y Position:" - Height = 255 - Left = 1800 - TabIndex = 17 - Top = 5880 - Width = 1215 - End - Begin VB.Label lblTextxpos - Alignment = 1 'Right Justify - Caption = "Text X Position:" - Height = 255 - Left = 1800 - TabIndex = 16 - Top = 5520 - Width = 1215 - End - Begin VB.Label lblNumberofpics - Alignment = 1 'Right Justify - Caption = "Number of Pictures (max 8):" - Height = 255 - Left = 1560 - TabIndex = 4 - Top = 1800 - Width = 2175 - End - Begin VB.Label lblScenetext - Caption = "Scene Text:" - Height = 255 - Left = 4440 - TabIndex = 2 - Top = 0 - Width = 1215 - End -End -Attribute VB_Name = "frmCutsceneEdit" -Attribute VB_GlobalNameSpace = False -Attribute VB_Creatable = False -Attribute VB_PredeclaredId = True -Attribute VB_Exposed = False -Option Explicit - -Private Sub cmdSave_Click() - Call WriteScene(False) -End Sub - -Private Sub lstScene_Click() - Call ClearForm - Call LoadSOCCutscene(Val(lstCutscenes.List(lstCutscenes.ListIndex)), Val(lstScene.List(lstScene.ListIndex))) -End Sub - -Private Sub LoadMusic() - Dim myFSO As New Scripting.FileSystemObject - Dim ts As TextStream - Dim line As String - Dim number As Integer - Dim startclip As Integer, endclip As Integer - Dim addstring As String - - ChDir SourcePath - Set ts = myFSO.OpenTextFile("sounds.h", ForReading, False) - - Do While InStr(ts.ReadLine, "Music list (don't edit this comment!)") = 0 - Loop - - ts.SkipLine ' typedef enum - ts.SkipLine ' { - - line = ts.ReadLine - number = 0 - - cmbMusicslot.Clear - - Do While InStr(line, "NUMMUSIC") = 0 - startclip = InStr(line, "mus_") - If InStr(line, "mus_") <> 0 Then - endclip = InStr(line, ",") - line = Mid(line, startclip, endclip - startclip) - addstring = number & " - " & line - cmbMusicslot.AddItem addstring - number = number + 1 - End If - line = ts.ReadLine - Loop - - ts.Close - Set myFSO = Nothing -End Sub - -Private Sub cmdReload_Click() - Call Reload -End Sub - -Private Sub Form_Load() - Call Reload -End Sub - -Private Sub Reload() - ClearForm - Call ReadCutsceneSOCNumbers - Call LoadMusic - If lstCutscenes.ListCount > 0 Then - lstCutscenes.ListIndex = 0 - End If -End Sub - -Private Sub LoadSOCCutscene(CutNum As Integer, SceneNum As Integer) - Dim myFSO As New Scripting.FileSystemObject - Dim ts As TextStream - Dim line As String - Dim word As String - Dim word2 As String - Dim ind As Integer - - Set ts = myFSO.OpenTextFile(SOCFile, ForReading, False) - -SOCLoad: - Do While Not ts.AtEndOfStream - line = ts.ReadLine - - If Left(line, 1) = "#" Then GoTo SOCLoad - - If Left(line, 1) = vbCrLf Then GoTo SOCLoad - - If Len(line) < 1 Then GoTo SOCLoad - - word = FirstToken(line) - word2 = SecondToken(line) - - ' WOW! This looks fun, don't it?! - If UCase(word) = "CUTSCENE" And Val(word2) = CutNum Then - Do While Len(line) > 0 And Not ts.AtEndOfStream - line = ts.ReadLine - word = UCase(FirstToken(line)) - word2 = UCase(SecondToken(line)) - - If word = "NUMSCENES" Then - txtNumScenes.Text = Val(word2) - ElseIf UCase(word) = "SCENE" And Val(word2) = SceneNum Then - Do While Len(line) > 0 And Not ts.AtEndOfStream - line = ts.ReadLine - word = UCase(FirstToken(line)) - word2 = UCase(SecondTokenEqual(line)) - - If word = "SCENETEXT" Then - Dim startclip As Integer, endclip As Integer - startclip = InStr(line, "=") - - startclip = startclip + 2 - - line = Mid(line, startclip, Len(line)) - - txtScenetext.Text = line & vbCrLf - - Do While InStr(line, "#") = 0 And Not ts.AtEndOfStream - line = ts.ReadLine & vbCrLf - txtScenetext.Text = txtScenetext.Text & line - Loop - - txtScenetext.Text = RTrimComplete(txtScenetext.Text) - If Right(txtScenetext.Text, 1) = "#" Then - txtScenetext.Text = Left(txtScenetext.Text, Len(txtScenetext.Text) - 1) - End If - ElseIf word = "PIC1NAME" Or word = "PIC2NAME" Or word = "PIC3NAME" Or word = "PIC4NAME" Or word = "PIC5NAME" Or word = "PIC6NAME" Or word = "PIC7NAME" Or word = "PIC8NAME" Then - ind = Val(Mid(word, 4, 1)) - 1 - txtPicname(ind).Text = word2 - ElseIf word = "PIC1HIRES" Or word = "PIC2HIRES" Or word = "PIC3HIRES" Or word = "PIC4HIRES" Or word = "PIC5HIRES" Or word = "PIC6HIRES" Or word = "PIC7HIRES" Or word = "PIC8HIRES" Then - ind = Val(Mid(word, 4, 1)) - 1 - chkPichires(ind).Value = Val(word2) - ElseIf word = "PIC1DURATION" Or word = "PIC2DURATION" Or word = "PIC3DURATION" Or word = "PIC4DURATION" Or word = "PIC5DURATION" Or word = "PIC6DURATION" Or word = "PIC7DURATION" Or word = "PIC8DURATION" Then - ind = Val(Mid(word, 4, 1)) - 1 - txtPicduration(ind).Text = Val(word2) - ElseIf word = "PIC1XCOORD" Or word = "PIC2XCOORD" Or word = "PIC3XCOORD" Or word = "PIC4XCOORD" Or word = "PIC5XCOORD" Or word = "PIC6XCOORD" Or word = "PIC7XCOORD" Or word = "PIC8XCOORD" Then - ind = Val(Mid(word, 4, 1)) - 1 - txtPicXcoord(ind).Text = Val(word2) - ElseIf word = "PIC1YCOORD" Or word = "PIC2YCOORD" Or word = "PIC3YCOORD" Or word = "PIC4YCOORD" Or word = "PIC5YCOORD" Or word = "PIC6YCOORD" Or word = "PIC7YCOORD" Or word = "PIC8YCOORD" Then - ind = Val(Mid(word, 4, 1)) - 1 - txtPicycoord(ind).Text = Val(word2) - ElseIf word = "TEXTXPOS" Then - txtTextxpos.Text = Val(word2) - ElseIf word = "TEXTYPOS" Then - txtTextypos.Text = Val(word2) - ElseIf word = "MUSICSLOT" Then - cmbMusicslot.ListIndex = Val(word2) - ElseIf word = "NUMBEROFPICS" Then - txtNumberofpics.Text = Val(word2) - ElseIf word = "SCENE" Then 'End of scene data - line = "" - ElseIf Len(line) > 0 And Left(line, 1) <> "#" Then - MsgBox "Error in SOC!" & vbCrLf & "Unknown line: " & line - End If - Loop - End If - Loop - Exit Do - End If - Loop - - ts.Close - Set myFSO = Nothing -End Sub - -Private Sub ReadCutsceneSOCNumbers() - Dim myFSO As New Scripting.FileSystemObject - Dim ts As TextStream - Dim line As String - Dim word As String - Dim word2 As String - - Set ts = myFSO.OpenTextFile(SOCFile, ForReading, False) - - lstCutscenes.Clear - -CutsceneLoad: - Do While Not ts.AtEndOfStream - line = ts.ReadLine - - If Left(line, 1) = "#" Then GoTo CutsceneLoad - - If Left(line, 1) = vbCrLf Then GoTo CutsceneLoad - - If Len(line) < 1 Then GoTo CutsceneLoad - - word = FirstToken(line) - word2 = SecondToken(line) - - If UCase(word) = "CUTSCENE" Then - lstCutscenes.AddItem (Val(word2)) - End If - Loop - - ts.Close - Set myFSO = Nothing -End Sub - -Private Sub ClearForm() - Dim i As Integer - - For i = 0 To 7 - chkPichires(i).Value = 0 - txtPicXcoord(i).Text = "" - txtPicycoord(i).Text = "" - txtPicname(i).Text = "" - txtPicduration(i).Text = "" - Next - - txtScenetext.Text = "" - txtNumberofpics.Text = "" - txtTextxpos.Text = "" - txtTextypos.Text = "" - cmbMusicslot.Text = "" -End Sub - -Private Sub lstCutscenes_Click() - Dim i As Integer - - LoadNumScenes (Val(lstCutscenes.List(lstCutscenes.ListIndex))) - - lstScene.Clear - For i = 1 To Val(txtNumScenes.Text) - lstScene.AddItem i - Next - - If Val(txtNumScenes) > 0 Then - lstScene.ListIndex = lstScene.ListCount - 1 - lstScene.ListIndex = 0 - End If -End Sub - -Private Sub LoadNumScenes(CutNum As Integer) - Dim myFSO As New Scripting.FileSystemObject - Dim ts As TextStream - Dim line As String - Dim word As String - Dim word2 As String - Dim ind As Integer - - Set ts = myFSO.OpenTextFile(SOCFile, ForReading, False) - -SOCLoad: - Do While Not ts.AtEndOfStream - line = ts.ReadLine - - If Left(line, 1) = "#" Then GoTo SOCLoad - - If Left(line, 1) = vbCrLf Then GoTo SOCLoad - - If Len(line) < 1 Then GoTo SOCLoad - - word = FirstToken(line) - word2 = SecondToken(line) - - ' WOW! This looks fun, don't it?! - If UCase(word) = "CUTSCENE" And Val(word2) = CutNum Then - Do While Len(line) > 0 And Not ts.AtEndOfStream - line = ts.ReadLine - word = UCase(FirstToken(line)) - word2 = UCase(SecondToken(line)) - - If word = "NUMSCENES" Then - txtNumScenes.Text = Val(word2) - End If - Loop - Exit Do - End If - Loop - - ts.Close - Set myFSO = Nothing -End Sub - -Private Sub WriteScene(Remove As Boolean) - Dim myFSOSource As New Scripting.FileSystemObject - Dim tsSource As TextStream - Dim myFSOTarget As New Scripting.FileSystemObject - Dim tsTarget As TextStream - Dim line As String - Dim word As String - Dim word2 As String - Dim flags As Long - Dim i As Integer - Dim CutsceneNum As Integer - Dim InCutScene As Boolean - Dim scenefound As Boolean - Dim nevercheckagain As Boolean - - ' This whole sub is a mess, but it works, - ' so I'd better not touch it... - scenefound = False - nevercheckagain = False - - InCutScene = False - CutsceneNum = Val(lstCutscenes.List(lstCutscenes.ListIndex)) - - Set tsSource = myFSOSource.OpenTextFile(SOCFile, ForReading, False) - Set tsTarget = myFSOTarget.OpenTextFile(SOCTemp, ForWriting, True) - - Do While Not tsSource.AtEndOfStream - line = tsSource.ReadLine - word = UCase(FirstToken(line)) - word2 = UCase(SecondToken(line)) - - If nevercheckagain = False And word = "CUTSCENE" And Val(word2) = CutsceneNum Then - InCutScene = True - tsTarget.WriteLine "CUTSCENE " & Val(lstCutscenes.List(lstCutscenes.ListIndex)) - tsTarget.WriteLine "NUMSCENES " & Val(txtNumScenes.Text) - line = tsSource.ReadLine - word = UCase(FirstToken(line)) - word2 = UCase(SecondToken(line)) - If word = "NUMSCENES" Then - line = tsSource.ReadLine - word = UCase(FirstToken(line)) - word2 = UCase(SecondToken(line)) - End If - End If - - 'If the current scene exists in the SOC, delete it. - If nevercheckagain = False And InCutScene = True And word = "SCENE" And Val(word2) = Val(lstScene.List(lstScene.ListIndex)) Then - scenefound = True - line = tsSource.ReadLine - Do While (Left(UCase(line), 6) <> "SCENE " And Len(TrimComplete(line)) > 0) And Not (tsSource.AtEndOfStream) - line = tsSource.ReadLine - Loop - If Remove = False Then - tsTarget.WriteLine "SCENE " & Val(lstScene.List(lstScene.ListIndex)) - txtNumberofpics.Text = TrimComplete(txtNumberofpics.Text) - txtTextxpos.Text = TrimComplete(txtTextxpos.Text) - txtTextypos.Text = TrimComplete(txtTextypos.Text) - cmbMusicslot.Text = TrimComplete(cmbMusicslot.Text) - - For i = 0 To 7 - txtPicname(i).Text = TrimComplete(txtPicname(i).Text) - txtPicXcoord(i).Text = TrimComplete(txtPicXcoord(i).Text) - txtPicycoord(i).Text = TrimComplete(txtPicycoord(i).Text) - txtPicduration(i).Text = TrimComplete(txtPicduration(i).Text) - Next - - If txtNumberofpics.Text <> "" Then tsTarget.WriteLine "NUMBEROFPICS = " & Val(txtNumberofpics.Text) - If txtTextxpos.Text <> "" Then tsTarget.WriteLine "TEXTXPOS = " & Val(txtTextxpos.Text) - If txtTextypos.Text <> "" Then tsTarget.WriteLine "TEXTYPOS = " & Val(txtTextypos.Text) - If cmbMusicslot.Text <> "" Then tsTarget.WriteLine "MUSICSLOT = " & Val(cmbMusicslot.Text) - - For i = 0 To 7 - If txtPicname(i).Text <> "" Then tsTarget.WriteLine "PIC" & (i + 1) & "NAME = " & txtPicname(i).Text - - If chkPichires(i).Value = 1 Then tsTarget.WriteLine "PIC" & (i + 1) & "HIRES = 1" - - If txtPicXcoord(i).Text <> "" Then tsTarget.WriteLine "PIC" & (i + 1) & "XCOORD = " & Val(txtPicXcoord(i).Text) - If txtPicycoord(i).Text <> "" Then tsTarget.WriteLine "PIC" & (i + 1) & "YCOORD = " & Val(txtPicycoord(i).Text) - If txtPicduration(i).Text <> "" Then tsTarget.WriteLine "PIC" & (i + 1) & "DURATION = " & Val(txtPicduration(i).Text) - Next - If txtScenetext.Text <> "" Then tsTarget.WriteLine "SCENETEXT = " & txtScenetext.Text & "#" - End If - InCutScene = False - nevercheckagain = True - End If - tsTarget.WriteLine line - Loop - - tsSource.Close - Set myFSOSource = Nothing - - If Remove = False And scenefound = False Then - If line <> "" Then tsTarget.WriteLine "" - - tsTarget.WriteLine "CUTSCENE " & Val(lstCutscenes.List(lstCutscenes.ListIndex)) - tsTarget.WriteLine "NUMSCENES " & Val(txtNumScenes.Text) - tsTarget.WriteLine "SCENE " & Val(lstScene.List(lstScene.ListIndex)) - txtNumberofpics.Text = TrimComplete(txtNumberofpics.Text) - txtScenetext.Text = TrimComplete(txtScenetext.Text) - txtTextxpos.Text = TrimComplete(txtTextxpos.Text) - txtTextypos.Text = TrimComplete(txtTextypos.Text) - cmbMusicslot.Text = TrimComplete(cmbMusicslot.Text) - - For i = 0 To 7 - txtPicname(i).Text = TrimComplete(txtPicname(i).Text) - txtPicXcoord(i).Text = TrimComplete(txtPicXcoord(i).Text) - txtPicycoord(i).Text = TrimComplete(txtPicycoord(i).Text) - txtPicduration(i).Text = TrimComplete(txtPicduration(i).Text) - Next - - If txtNumberofpics.Text <> "" Then tsTarget.WriteLine "NUMBEROFPICS = " & Val(txtNumberofpics.Text) - If txtScenetext.Text <> "" Then tsTarget.WriteLine "SCENETEXT = " & txtScenetext.Text & "#" - If txtTextxpos.Text <> "" Then tsTarget.WriteLine "TEXTXPOS = " & Val(txtTextxpos.Text) - If txtTextypos.Text <> "" Then tsTarget.WriteLine "TEXTYPOS = " & Val(txtTextypos.Text) - If cmbMusicslot.Text <> "" Then tsTarget.WriteLine "MUSICSLOT = " & Val(cmbMusicslot.Text) - - For i = 0 To 7 - If txtPicname(i).Text <> "" Then tsTarget.WriteLine "PIC" & (i + 1) & "NAME = " & txtPicname(i).Text - - If chkPichires(i).Value = 1 Then tsTarget.WriteLine "PIC" & (i + 1) & "HIRES = 1" - - If txtPicXcoord(i).Text <> "" Then tsTarget.WriteLine "PIC" & (i + 1) & "XCOORD = " & Val(txtPicXcoord(i).Text) - If txtPicycoord(i).Text <> "" Then tsTarget.WriteLine "PIC" & (i + 1) & "YCOORD = " & Val(txtPicycoord(i).Text) - If txtPicduration(i).Text <> "" Then tsTarget.WriteLine "PIC" & (i + 1) & "DURATION = " & Val(txtPicduration(i).Text) - Next - End If - - tsTarget.Close - Set myFSOTarget = Nothing - - FileCopy SOCTemp, SOCFile - - Kill SOCTemp - - If Remove = True Then - If scenefound = True Then - MsgBox "Scene removed from SOC." - Else - MsgBox "Scene not found in SOC." - End If - Else - MsgBox "Scene Saved." - End If -End Sub diff --git a/tools/SOCEdit/frmCutsceneEdit.frx b/tools/SOCEdit/frmCutsceneEdit.frx deleted file mode 100644 index 6f844e643..000000000 Binary files a/tools/SOCEdit/frmCutsceneEdit.frx and /dev/null differ diff --git a/tools/SOCEdit/frmEmblemEdit.frm b/tools/SOCEdit/frmEmblemEdit.frm deleted file mode 100644 index f94255b9c..000000000 --- a/tools/SOCEdit/frmEmblemEdit.frm +++ /dev/null @@ -1,384 +0,0 @@ -VERSION 5.00 -Begin VB.Form frmEmblemEdit - Caption = "Emblem Edit" - ClientHeight = 2865 - ClientLeft = 60 - ClientTop = 345 - ClientWidth = 5160 - Icon = "frmEmblemEdit.frx":0000 - LinkTopic = "Form1" - MaxButton = 0 'False - ScaleHeight = 2865 - ScaleWidth = 5160 - StartUpPosition = 3 'Windows Default - Begin VB.CommandButton cmdDelete - Caption = "&Delete Last Emblem" - Height = 735 - Left = 1560 - Style = 1 'Graphical - TabIndex = 17 - Top = 600 - Width = 855 - End - Begin VB.CommandButton cmdAdd - Caption = "&Add" - Height = 375 - Left = 1560 - TabIndex = 16 - Top = 120 - Width = 855 - End - Begin VB.CommandButton cmdSave - Caption = "&Save Emblem" - Height = 495 - Left = 4200 - Style = 1 'Graphical - TabIndex = 13 - Top = 2280 - Width = 855 - End - Begin VB.CommandButton cmdReload - Caption = "&Reload" - Height = 495 - Left = 3120 - TabIndex = 12 - Top = 2280 - Width = 975 - End - Begin VB.TextBox txtPlayernum - Height = 285 - Left = 4320 - MaxLength = 3 - TabIndex = 9 - Top = 1800 - Width = 735 - End - Begin VB.TextBox txtMapnum - Height = 285 - Left = 4320 - MaxLength = 4 - TabIndex = 7 - Top = 1320 - Width = 735 - End - Begin VB.TextBox txtZ - Height = 285 - Left = 4320 - MaxLength = 5 - TabIndex = 3 - Top = 960 - Width = 735 - End - Begin VB.TextBox txtY - Height = 285 - Left = 4320 - MaxLength = 5 - TabIndex = 2 - Top = 600 - Width = 735 - End - Begin VB.TextBox txtX - Height = 285 - Left = 4320 - MaxLength = 5 - TabIndex = 1 - Top = 240 - Width = 735 - End - Begin VB.ListBox lstEmblems - Height = 2400 - Left = 120 - TabIndex = 0 - Top = 120 - Width = 1335 - End - Begin VB.Label Label1 - Caption = "Emblem #s must be linear, sorry!" - Height = 495 - Left = 1560 - TabIndex = 18 - Top = 2400 - Width = 1455 - End - Begin VB.Label lblNumEmblems - Caption = "# of Emblems:" - Height = 255 - Left = 120 - TabIndex = 15 - Top = 2520 - Width = 1335 - End - Begin VB.Label lblNote2 - Caption = "Don't forget to set Game Data file and # of Emblems in Global Game Settings!" - Height = 855 - Left = 1560 - TabIndex = 14 - Top = 1440 - Width = 1575 - End - Begin VB.Label lblNote - Appearance = 0 'Flat - BorderStyle = 1 'Fixed Single - Caption = "Note: Enter map coordinates, not game coordinates. (I.e., 128, not 8388608)" - ForeColor = &H80000008& - Height = 1095 - Left = 2640 - TabIndex = 11 - Top = 120 - Width = 1335 - End - Begin VB.Label lblPlayernum - Caption = "Player # (255 for all players):" - Height = 495 - Left = 3240 - TabIndex = 10 - Top = 1680 - Width = 1095 - End - Begin VB.Label lblMapnum - Alignment = 1 'Right Justify - Caption = "Map #:" - Height = 255 - Left = 3600 - TabIndex = 8 - Top = 1320 - Width = 615 - End - Begin VB.Label lblZ - Alignment = 1 'Right Justify - Caption = "Z:" - Height = 255 - Left = 3960 - TabIndex = 6 - Top = 960 - Width = 255 - End - Begin VB.Label lblY - Alignment = 1 'Right Justify - Caption = "Y:" - Height = 255 - Left = 3960 - TabIndex = 5 - Top = 600 - Width = 255 - End - Begin VB.Label lblX - Alignment = 1 'Right Justify - Caption = "X:" - Height = 255 - Left = 3960 - TabIndex = 4 - Top = 240 - Width = 255 - End -End -Attribute VB_Name = "frmEmblemEdit" -Attribute VB_GlobalNameSpace = False -Attribute VB_Creatable = False -Attribute VB_PredeclaredId = True -Attribute VB_Exposed = False -Option Explicit - -Private Sub cmdAdd_Click() - lstEmblems.AddItem "Emblem " & lstEmblems.ListCount + 1 - lstEmblems.ListIndex = lstEmblems.ListCount - 1 - lblNumEmblems.Caption = "# of Emblems: " & lstEmblems.ListCount - txtX.Text = 0 - txtY.Text = 0 - txtZ.Text = 0 - txtPlayernum.Text = 255 - txtMapnum.Text = 1 -End Sub - -Private Sub cmdDelete_Click() - Call WriteEmblem(True) - lstEmblems.RemoveItem lstEmblems.ListCount - 1 - lstEmblems.ListIndex = lstEmblems.ListCount - 1 - lblNumEmblems.Caption = "# of Emblems: " & lstEmblems.ListCount -End Sub - -Private Sub cmdReload_Click() - Call Reload -End Sub - -Private Sub Reload() - lstEmblems.Clear - txtX.Text = "" - txtY.Text = "" - txtZ.Text = "" - txtMapnum.Text = "" - txtPlayernum.Text = "" - lblNumEmblems.Caption = "# of Emblems: " & lstEmblems.ListCount - Call ReadSOCEmblems -End Sub - -Private Sub cmdSave_Click() - If lstEmblems.ListCount <= 0 Then - MsgBox "You have no emblems to save!" - Else - Call WriteEmblem(False) - End If -End Sub - -Private Sub Form_Load() - Call Reload -End Sub - -Private Sub ReadSOCEmblems() - Dim myFSO As New Scripting.FileSystemObject - Dim ts As TextStream - Dim line As String - Dim word As String - Dim word2 As String - - Set ts = myFSO.OpenTextFile(SOCFile, ForReading, False) - - lstEmblems.Clear - -EmblemLoad: - Do While Not ts.AtEndOfStream - line = ts.ReadLine - - If Left(line, 1) = "#" Then GoTo EmblemLoad - - If Left(line, 1) = vbCrLf Then GoTo EmblemLoad - - If Len(line) < 1 Then GoTo EmblemLoad - - word = FirstToken(line) - word2 = SecondToken(line) - - If UCase(word) = "EMBLEM" Then - lstEmblems.AddItem ("Emblem " & Val(word2)) - End If - Loop - - ts.Close - Set myFSO = Nothing -End Sub - -Private Sub ReadSOCEmblemNum(num As Integer) - Dim myFSO As New Scripting.FileSystemObject - Dim ts As TextStream - Dim line As String - Dim word As String - Dim word2 As String - - Set ts = myFSO.OpenTextFile(SOCFile, ForReading, False) - -EmblemLoad: - Do While Not ts.AtEndOfStream - line = ts.ReadLine - - If Left(line, 1) = "#" Then GoTo EmblemLoad - - If Left(line, 1) = vbCrLf Then GoTo EmblemLoad - - If Len(line) < 1 Then GoTo EmblemLoad - - word = UCase(FirstToken(line)) - word2 = UCase(SecondToken(line)) - - If word = "EMBLEM" Then - If Val(word2) = num Then - Do While Len(line) > 0 And Not ts.AtEndOfStream - line = ts.ReadLine - word = UCase(FirstToken(line)) - word2 = UCase(SecondTokenEqual(line)) - - If word = "X" Then - txtX.Text = Val(word2) - ElseIf word = "Y" Then - txtY.Text = Val(word2) - ElseIf word = "Z" Then - txtZ.Text = Val(word2) - ElseIf word = "PLAYERNUM" Then - txtPlayernum.Text = Val(word2) - ElseIf word = "MAPNUM" Then - txtMapnum.Text = Val(word2) - ElseIf Len(line) > 0 And Left(line, 1) <> "#" Then - MsgBox "Error in SOC with Emblem " & num & vbCrLf & "Unknown line: " & line - End If - Loop - Exit Do - End If - End If - Loop - - ts.Close - Set myFSO = Nothing -End Sub - -Private Sub lstEmblems_Click() - Dim i As Integer - - i = InStr(lstEmblems.List(lstEmblems.ListIndex), " ") + 1 - - i = Mid(lstEmblems.List(lstEmblems.ListIndex), i, Len(lstEmblems.List(lstEmblems.ListIndex)) - i + 1) - i = Val(i) - Call ReadSOCEmblemNum(i) -End Sub - -Private Sub WriteEmblem(Remove As Boolean) - Dim myFSOSource As New Scripting.FileSystemObject - Dim tsSource As TextStream - Dim myFSOTarget As New Scripting.FileSystemObject - Dim tsTarget As TextStream - Dim line As String - Dim word As String - Dim word2 As String - Dim i As Integer - - Set tsSource = myFSOSource.OpenTextFile(SOCFile, ForReading, False) - Set tsTarget = myFSOTarget.OpenTextFile(SOCTemp, ForWriting, True) - - Do While Not tsSource.AtEndOfStream - line = tsSource.ReadLine - word = UCase(FirstToken(line)) - word2 = UCase(SecondToken(line)) - i = InStr(lstEmblems.List(lstEmblems.ListIndex), " ") + 1 - - i = Mid(lstEmblems.List(lstEmblems.ListIndex), i, Len(lstEmblems.List(lstEmblems.ListIndex)) - i + 1) - i = Val(i) - - 'If the current emblem exists in the SOC, delete it. - If word = "EMBLEM" And Val(word2) = i Then - Do While Len(TrimComplete(tsSource.ReadLine)) > 0 And Not (tsSource.AtEndOfStream) - Loop - Else - tsTarget.WriteLine line - End If - Loop - - tsSource.Close - Set myFSOSource = Nothing - - If Remove = False Then - If line <> "" Then tsTarget.WriteLine "" - - tsTarget.WriteLine UCase(lstEmblems.List(lstEmblems.ListIndex)) - txtX.Text = TrimComplete(txtX.Text) - txtY.Text = TrimComplete(txtY.Text) - txtZ.Text = TrimComplete(txtZ.Text) - txtMapnum.Text = TrimComplete(txtMapnum.Text) - txtPlayernum.Text = TrimComplete(txtPlayernum.Text) - If txtX.Text <> "" Then tsTarget.WriteLine "X = " & Val(txtX.Text) - If txtY.Text <> "" Then tsTarget.WriteLine "Y = " & Val(txtY.Text) - If txtZ.Text <> "" Then tsTarget.WriteLine "Z = " & Val(txtZ.Text) - If txtMapnum.Text <> "" Then tsTarget.WriteLine "MAPNUM = " & Val(txtMapnum.Text) - If txtPlayernum.Text <> "" Then tsTarget.WriteLine "PLAYERNUM = " & Val(txtPlayernum.Text) - End If - - tsTarget.Close - Set myFSOTarget = Nothing - - FileCopy SOCTemp, SOCFile - - Kill SOCTemp - - If Remove = True Then - MsgBox "Emblem deleted." - Else - MsgBox "Emblem Saved." - End If -End Sub diff --git a/tools/SOCEdit/frmEmblemEdit.frx b/tools/SOCEdit/frmEmblemEdit.frx deleted file mode 100644 index 2ae367330..000000000 Binary files a/tools/SOCEdit/frmEmblemEdit.frx and /dev/null differ diff --git a/tools/SOCEdit/frmHUDEdit.frm b/tools/SOCEdit/frmHUDEdit.frm deleted file mode 100644 index 2b267b79b..000000000 --- a/tools/SOCEdit/frmHUDEdit.frm +++ /dev/null @@ -1,315 +0,0 @@ -VERSION 5.00 -Begin VB.Form frmHUDEdit - Caption = "HUD Edit" - ClientHeight = 2505 - ClientLeft = 60 - ClientTop = 345 - ClientWidth = 5160 - Icon = "frmHUDEdit.frx":0000 - LinkTopic = "Form1" - MaxButton = 0 'False - ScaleHeight = 2505 - ScaleWidth = 5160 - StartUpPosition = 3 'Windows Default - Begin VB.CommandButton cmdCodeDefault - Caption = "&Load Code Default" - Height = 375 - Left = 3480 - TabIndex = 9 - Top = 1080 - Width = 1575 - End - Begin VB.CommandButton cmdDelete - Caption = "&Delete from SOC" - Height = 375 - Left = 3480 - TabIndex = 7 - Top = 2040 - Width = 1575 - End - Begin VB.CommandButton cmdSave - Caption = "&Save Changes" - Height = 375 - Left = 3480 - TabIndex = 6 - Top = 1560 - Width = 1575 - End - Begin VB.TextBox txtY - Height = 285 - Left = 4080 - MaxLength = 3 - TabIndex = 3 - Top = 720 - Width = 615 - End - Begin VB.TextBox txtX - Height = 285 - Left = 4080 - MaxLength = 3 - TabIndex = 2 - Top = 360 - Width = 615 - End - Begin VB.ListBox lstHUD - Height = 2010 - Left = 120 - TabIndex = 0 - Top = 360 - Width = 3255 - End - Begin VB.Label lblNote - Caption = "HUD items are placed on a 320x200 grid." - Height = 255 - Left = 1680 - TabIndex = 8 - Top = 120 - Width = 3015 - End - Begin VB.Label lblY - Alignment = 1 'Right Justify - Caption = "Y:" - Height = 255 - Left = 3600 - TabIndex = 5 - Top = 720 - Width = 375 - End - Begin VB.Label lblX - Alignment = 1 'Right Justify - Caption = "X:" - Height = 255 - Left = 3720 - TabIndex = 4 - Top = 360 - Width = 255 - End - Begin VB.Label lblHUDItems - Caption = "HUD Items:" - Height = 255 - Left = 120 - TabIndex = 1 - Top = 120 - Width = 975 - End -End -Attribute VB_Name = "frmHUDEdit" -Attribute VB_GlobalNameSpace = False -Attribute VB_Creatable = False -Attribute VB_PredeclaredId = True -Attribute VB_Exposed = False -Option Explicit - -Private Sub cmdCodeDefault_Click() - LoadHUDInfo (lstHUD.ListIndex) -End Sub - -Private Sub cmdDelete_Click() - Call WriteHUDItem(True) -End Sub - -Private Sub cmdSave_Click() - Call WriteHUDItem(False) -End Sub - -Private Sub Form_Load() - Call Reload -End Sub - -Private Sub Reload() - txtX.Text = "" - txtY.Text = "" - Call LoadCode - lstHUD.ListIndex = 0 -End Sub - -Private Sub LoadCode() - Dim myFSO As New Scripting.FileSystemObject - Dim ts As TextStream - Dim line As String - Dim number As Integer - Dim startclip As Integer, endclip As Integer - Dim addstring As String - - ChDir SourcePath - Set ts = myFSO.OpenTextFile("st_stuff.h", ForReading, False) - - Do While ts.ReadLine <> "/** HUD location information (don't move this comment)" - Loop - - ts.ReadLine ' */ - ts.ReadLine ' typedef struct - ts.ReadLine ' { - ts.ReadLine ' int x, y; - ts.ReadLine ' } hudinfo_t; - ts.ReadLine ' - ts.ReadLine ' typedef enum - ts.ReadLine ' { - - line = ts.ReadLine - number = 0 - - lstHUD.Clear - - Do While InStr(line, "NUMHUDITEMS") = 0 - startclip = InStr(line, "HUD_") - If InStr(line, "HUD_") <> 0 Then - endclip = InStr(line, ",") - line = Mid(line, startclip, endclip - startclip) - addstring = number & " - " & line - lstHUD.AddItem addstring - number = number + 1 - End If - line = ts.ReadLine - Loop - - ts.Close - Set myFSO = Nothing -End Sub - -Private Sub lstHUD_Click() - LoadHUDInfo (lstHUD.ListIndex) - Call ReadSOC(lstHUD.ListIndex) -End Sub - -Private Sub LoadHUDInfo(HUDNum As Integer) - Dim myFSO As New Scripting.FileSystemObject - Dim ts As TextStream - Dim line As String - Dim number As Integer - Dim startclip As Integer, endclip As Integer - - ChDir SourcePath - Set ts = myFSO.OpenTextFile("st_stuff.c", ForReading, False) - - Do While InStr(ts.ReadLine, "hudinfo[NUMHUDITEMS] =") = 0 - Loop - - ts.SkipLine ' { - line = ts.ReadLine ' First HUD item - - number = 0 - - Do While number <> HUDNum - line = ts.ReadLine - number = number + 1 - Loop - - startclip = InStr(line, "{") + 1 - endclip = InStr(line, ",") - - txtX.Text = TrimComplete(Mid(line, startclip, endclip - startclip)) - - startclip = endclip + 2 - endclip = InStr(startclip, line, "}") - 1 - - txtY.Text = TrimComplete(Mid(line, startclip, endclip - startclip)) - - ts.Close - Set myFSO = Nothing -End Sub - -Private Sub ReadSOC(HUDNum As Integer) - Dim myFSO As New Scripting.FileSystemObject - Dim ts As TextStream - Dim line As String - Dim word As String - Dim word2 As String - - Set ts = myFSO.OpenTextFile(SOCFile, ForReading, False) - -SOCLoad: - Do While Not ts.AtEndOfStream - line = ts.ReadLine - - If Left(line, 1) = "#" Then GoTo SOCLoad - - If Left(line, 1) = vbCrLf Then GoTo SOCLoad - - If Len(line) < 1 Then GoTo SOCLoad - - word = FirstToken(line) - word2 = SecondToken(line) - - If UCase(word) = "HUDITEM" And Val(word2) = HUDNum Then - Do While Len(line) > 0 And Not ts.AtEndOfStream - line = ts.ReadLine - word = UCase(FirstToken(line)) - word2 = UCase(SecondTokenEqual(line)) - - If word = "X" Then - txtX.Text = Val(word2) - ElseIf word = "Y" Then - txtY.Text = Val(word2) - ElseIf Len(line) > 0 And Left(line, 1) <> "#" Then - MsgBox "Error in SOC!" & vbCrLf & "Unknown line: " & line - End If - Loop - Exit Do - End If - Loop - - ts.Close - Set myFSO = Nothing -End Sub - -Private Sub WriteHUDItem(Remove As Boolean) - Dim myFSOSource As New Scripting.FileSystemObject - Dim tsSource As TextStream - Dim myFSOTarget As New Scripting.FileSystemObject - Dim tsTarget As TextStream - Dim line As String - Dim word As String - Dim word2 As String - Dim hudremoved As Boolean - - hudremoved = False - - Set tsSource = myFSOSource.OpenTextFile(SOCFile, ForReading, False) - Set tsTarget = myFSOTarget.OpenTextFile(SOCTemp, ForWriting, True) - - Do While Not tsSource.AtEndOfStream - line = tsSource.ReadLine - word = UCase(FirstToken(line)) - word2 = UCase(SecondToken(line)) - - 'If the current item exists in the SOC, delete it. - If word = "HUDITEM" And Val(word2) = lstHUD.ListIndex Then - hudremoved = True - Do While Len(TrimComplete(tsSource.ReadLine)) > 0 And Not tsSource.AtEndOfStream - Loop - Else - tsTarget.WriteLine line - End If - Loop - - tsSource.Close - Set myFSOSource = Nothing - - If Remove = False Then - If line <> "" Then tsTarget.WriteLine "" - - tsTarget.WriteLine "HUDITEM " & lstHUD.ListIndex - txtX.Text = TrimComplete(txtX.Text) - txtY.Text = TrimComplete(txtY.Text) - If txtX.Text <> "" Then tsTarget.WriteLine "X = " & Val(txtX.Text) - If txtY.Text <> "" Then tsTarget.WriteLine "Y = " & Val(txtY.Text) - End If - - tsTarget.Close - Set myFSOTarget = Nothing - - FileCopy SOCTemp, SOCFile - - Kill SOCTemp - - If Remove = True Then - If hudremoved = True Then - MsgBox "HUD Item deleted from SOC." - Else - MsgBox "Couldn't find HUD Item in SOC." - End If - Else - MsgBox "HUD Item Saved." - End If -End Sub diff --git a/tools/SOCEdit/frmHUDEdit.frx b/tools/SOCEdit/frmHUDEdit.frx deleted file mode 100644 index 2ae367330..000000000 Binary files a/tools/SOCEdit/frmHUDEdit.frx and /dev/null differ diff --git a/tools/SOCEdit/frmHelp.frm b/tools/SOCEdit/frmHelp.frm deleted file mode 100644 index acf991057..000000000 --- a/tools/SOCEdit/frmHelp.frm +++ /dev/null @@ -1,213 +0,0 @@ -VERSION 5.00 -Begin VB.Form frmHelp - BorderStyle = 3 'Fixed Dialog - Caption = "Getting Started" - ClientHeight = 7395 - ClientLeft = 45 - ClientTop = 330 - ClientWidth = 6360 - Icon = "frmHelp.frx":0000 - LinkTopic = "Form1" - MaxButton = 0 'False - MinButton = 0 'False - ScaleHeight = 7395 - ScaleWidth = 6360 - ShowInTaskbar = 0 'False - StartUpPosition = 1 'CenterOwner - Begin VB.CommandButton cmdOK - Caption = "&OK, I know what I'm doing now." - Height = 495 - Left = 1920 - Style = 1 'Graphical - TabIndex = 8 - Top = 6840 - Width = 2535 - End - Begin VB.Line Line9 - X1 = 120 - X2 = 6120 - Y1 = 4800 - Y2 = 4800 - End - Begin VB.Line Line7 - X1 = 120 - X2 = 6120 - Y1 = 5400 - Y2 = 5400 - End - Begin VB.Label Label12 - Caption = $"frmHelp.frx":0442 - Height = 615 - Left = 120 - TabIndex = 12 - Top = 4800 - Width = 6015 - End - Begin VB.Line Line6 - X1 = 120 - X2 = 6120 - Y1 = 4200 - Y2 = 4200 - End - Begin VB.Label Label11 - Caption = $"frmHelp.frx":04F8 - Height = 615 - Left = 120 - TabIndex = 11 - Top = 4200 - Width = 6015 - End - Begin VB.Line Line8 - X1 = 120 - X2 = 6120 - Y1 = 6360 - Y2 = 6360 - End - Begin VB.Line Line5 - X1 = 120 - X2 = 6120 - Y1 = 3720 - Y2 = 3720 - End - Begin VB.Line Line4 - X1 = 120 - X2 = 6120 - Y1 = 2880 - Y2 = 2880 - End - Begin VB.Line Line3 - X1 = 120 - X2 = 6120 - Y1 = 2400 - Y2 = 2400 - End - Begin VB.Line Line2 - X1 = 120 - X2 = 6120 - Y1 = 1800 - Y2 = 1800 - End - Begin VB.Line Line1 - X1 = 120 - X2 = 6120 - Y1 = 1200 - Y2 = 1200 - End - Begin VB.Label Label10 - Caption = $"frmHelp.frx":05EC - Height = 495 - Left = 120 - TabIndex = 10 - Top = 3720 - Width = 6135 - End - Begin VB.Label Label9 - Caption = $"frmHelp.frx":068F - Height = 615 - Left = 120 - TabIndex = 9 - Top = 1200 - Width = 6135 - End - Begin VB.Label Label8 - Caption = $"frmHelp.frx":0772 - Height = 495 - Left = 120 - TabIndex = 7 - Top = 6360 - Width = 6135 - End - Begin VB.Label Label7 - Caption = "However, if you have these settings in the SOC you are using, don't worry - the editor will not erase them from your file." - Height = 495 - Left = 120 - TabIndex = 6 - Top = 5880 - Width = 6135 - End - Begin VB.Label Label6 - Caption = $"frmHelp.frx":0816 - Height = 495 - Left = 120 - TabIndex = 5 - Top = 5400 - Width = 6135 - End - Begin VB.Label Label5 - Caption = $"frmHelp.frx":08A9 - BeginProperty Font - Name = "MS Sans Serif" - Size = 8.25 - Charset = 0 - Weight = 700 - Underline = 0 'False - Italic = 0 'False - Strikethrough = 0 'False - EndProperty - Height = 855 - Left = 120 - TabIndex = 4 - Top = 2880 - Width = 6135 - End - Begin VB.Label Label4 - Caption = $"frmHelp.frx":09B1 - Height = 495 - Left = 120 - TabIndex = 3 - Top = 2400 - Width = 6135 - End - Begin VB.Label Label3 - Caption = $"frmHelp.frx":0A5A - Height = 495 - Left = 120 - TabIndex = 2 - Top = 1920 - Width = 6135 - End - Begin VB.Label Label2 - Caption = "Finally! A way to easily edit SOC files! I know you're anxious to get started, but here are some things you should know first:" - BeginProperty Font - Name = "MS Sans Serif" - Size = 9.75 - Charset = 0 - Weight = 400 - Underline = 0 'False - Italic = 0 'False - Strikethrough = 0 'False - EndProperty - Height = 495 - Left = 120 - TabIndex = 1 - Top = 600 - Width = 6135 - End - Begin VB.Label Label1 - Caption = "How To Use This Program" - BeginProperty Font - Name = "MS Sans Serif" - Size = 13.5 - Charset = 0 - Weight = 700 - Underline = -1 'True - Italic = 0 'False - Strikethrough = 0 'False - EndProperty - Height = 495 - Left = 120 - TabIndex = 0 - Top = 120 - Width = 3855 - End -End -Attribute VB_Name = "frmHelp" -Attribute VB_GlobalNameSpace = False -Attribute VB_Creatable = False -Attribute VB_PredeclaredId = True -Attribute VB_Exposed = False -Option Explicit - -Private Sub cmdOK_Click() - frmHelp.Hide -End Sub diff --git a/tools/SOCEdit/frmHelp.frx b/tools/SOCEdit/frmHelp.frx deleted file mode 100644 index 25004fe29..000000000 Binary files a/tools/SOCEdit/frmHelp.frx and /dev/null differ diff --git a/tools/SOCEdit/frmHub.frm b/tools/SOCEdit/frmHub.frm deleted file mode 100644 index 3672c62b0..000000000 --- a/tools/SOCEdit/frmHub.frm +++ /dev/null @@ -1,429 +0,0 @@ -VERSION 5.00 -Begin VB.Form frmHub - Caption = "SOC Editor" - ClientHeight = 6960 - ClientLeft = 60 - ClientTop = 345 - ClientWidth = 4920 - Icon = "frmHub.frx":0000 - LinkTopic = "Form1" - MaxButton = 0 'False - ScaleHeight = 6960 - ScaleWidth = 4920 - StartUpPosition = 3 'Windows Default - Begin VB.CommandButton cmdCreateBlank - Caption = "Make a &Blank SOC" - Height = 255 - Left = 240 - TabIndex = 22 - Top = 2520 - Width = 2055 - End - Begin VB.CommandButton cmdUnlockables - Caption = "Edit &Unlockables" - Enabled = 0 'False - Height = 495 - Left = 2760 - Style = 1 'Graphical - TabIndex = 21 - Top = 6360 - Width = 1095 - End - Begin VB.CommandButton cmdAuthor - Caption = "Enter &Author Info" - Enabled = 0 'False - Height = 495 - Left = 120 - Style = 1 'Graphical - TabIndex = 19 - Top = 3960 - Width = 1215 - End - Begin VB.CommandButton cmdHelp - Caption = "Getting Starte&d / READ ME FIRST!" - Height = 495 - Left = 480 - TabIndex = 18 - Top = 2880 - Width = 1575 - End - Begin VB.CommandButton cmdEditCutscenes - Caption = "Edit C&utscenes" - Enabled = 0 'False - Height = 495 - Left = 120 - TabIndex = 17 - Top = 6360 - Width = 1215 - End - Begin VB.CommandButton cmdCharacterEdit - Caption = "Edit &Character Select Screen" - Enabled = 0 'False - Height = 495 - Left = 120 - Style = 1 'Graphical - TabIndex = 16 - Top = 5760 - Width = 1215 - End - Begin VB.PictureBox Picture1 - Height = 1965 - Left = 2760 - Picture = "frmHub.frx":0442 - ScaleHeight = 1905 - ScaleWidth = 1905 - TabIndex = 15 - Top = 3960 - Width = 1965 - End - Begin VB.CommandButton cmdSoundEdit - Caption = "Edit &Sounds" - Enabled = 0 'False - Height = 495 - Left = 120 - TabIndex = 14 - Top = 5160 - Width = 1215 - End - Begin VB.CommandButton cmdEmblemEdit - Caption = "Edit &Emblem Locations" - Enabled = 0 'False - Height = 495 - Left = 120 - Style = 1 'Graphical - TabIndex = 13 - Top = 4560 - Width = 1215 - End - Begin VB.CommandButton cmdHUDEdit - Caption = "Edit &HUD Coordinates" - Enabled = 0 'False - Height = 495 - Left = 1440 - Style = 1 'Graphical - TabIndex = 12 - Top = 3960 - Width = 1215 - End - Begin VB.CommandButton cmdMaincfg - Caption = "Edit &Global Game Settings" - Enabled = 0 'False - Height = 495 - Left = 1440 - Style = 1 'Graphical - TabIndex = 11 - Top = 4560 - Width = 1215 - End - Begin VB.DriveListBox Drive2 - Height = 315 - Left = 2640 - TabIndex = 9 - Top = 360 - Width = 2175 - End - Begin VB.DirListBox Dir2 - Height = 1665 - Left = 2520 - TabIndex = 8 - Top = 720 - Width = 2295 - End - Begin VB.FileListBox File1 - Height = 1455 - Left = 2520 - Pattern = "*.soc" - TabIndex = 7 - Top = 2400 - Width = 2295 - End - Begin VB.DriveListBox Drive1 - Height = 315 - Left = 120 - TabIndex = 6 - Top = 360 - Width = 2295 - End - Begin VB.DirListBox Dir1 - Height = 1665 - Left = 120 - TabIndex = 4 - Top = 720 - Width = 2295 - End - Begin VB.CommandButton cmdAbout - Caption = "&About" - Height = 375 - Left = 3960 - TabIndex = 3 - Top = 6000 - Width = 735 - End - Begin VB.CommandButton cmdStateEdit - Caption = "Edit St&ates" - Enabled = 0 'False - Height = 495 - Left = 1440 - TabIndex = 2 - Top = 6360 - Width = 1215 - End - Begin VB.CommandButton cmdLevelHeader - Caption = "Edit &Level Headers" - Enabled = 0 'False - Height = 495 - Left = 1440 - Style = 1 'Graphical - TabIndex = 1 - Top = 5160 - Width = 1215 - End - Begin VB.CommandButton cmdThingEdit - Caption = "Edit &Things" - Enabled = 0 'False - Height = 495 - Left = 1440 - TabIndex = 0 - Top = 5760 - Width = 1215 - End - Begin VB.Label lblAuthor - Caption = "Modification By:" - Height = 495 - Left = 120 - TabIndex = 20 - Top = 3480 - Width = 2295 - End - Begin VB.Label lblSOCFile - Caption = "SOC File to use (double click):" - Height = 255 - Left = 2640 - TabIndex = 10 - Top = 120 - Width = 2175 - End - Begin VB.Label lblSourcePath - Caption = "Path to SRB2 Source Code:" - Height = 255 - Left = 120 - TabIndex = 5 - Top = 120 - Width = 2175 - End -End -Attribute VB_Name = "frmHub" -Attribute VB_GlobalNameSpace = False -Attribute VB_Creatable = False -Attribute VB_PredeclaredId = True -Attribute VB_Exposed = False -Option Explicit - -Private Sub cmdAbout_Click() - MsgBox App.Title & " v" & App.Major & "." & App.Minor & "." & App.Revision & vbCrLf & "By " & App.CompanyName & vbCrLf & "(SSNTails)" & vbCrLf & App.Comments & vbCrLf & App.FileDescription -End Sub - -Private Sub cmdAuthor_Click() - Dim Response As String - - Response$ = InputBox("Enter name to appear on credits (type in NOBODY to delete):", "Modification By", GetAuthor) - - If Response = "" Then Exit Sub - - Response = TrimComplete(Response) - - If UCase(Response) = "NOBODY" Then - Call WriteAuthor(True, Response) - lblAuthor.Caption = "Modification By: " - Else - Call WriteAuthor(False, Response) - lblAuthor.Caption = "Modification By: " & Response - End If -End Sub - -Private Sub cmdCharacterEdit_Click() - frmCharacterEdit.Show vbModal, Me -End Sub - -Private Sub cmdCreateBlank_Click() - Dim socname As String - - socname = InputBox("This file will be created in the directory you have selected on the main window." & vbCrLf & vbCrLf & "Enter the filename you want (do not include .SOC at the end):", "Make A Blank SOC") - Trim (socname) - - If InStr(LCase(socname), ".soc") > 0 Then - MsgBox "The thing says not to include the .SOC at the end, stupid.", vbOKOnly, "You goofed!" - Exit Sub - End If - - If Len(socname) > 0 Then - socname = socname & ".soc" - - Dim myFSOSOC As New Scripting.FileSystemObject - Dim tsSOC As TextStream - - Set tsSOC = myFSOSOC.OpenTextFile(File1.Path & "\" & socname, ForWriting, True) - tsSOC.Close - Set myFSOSOC = Nothing - - MsgBox "Blank SOC named " & socname & " created in " & File1.Path, vbOKOnly, "Success!" - End If -End Sub - -Private Sub cmdEditCutscenes_Click() - frmCutsceneEdit.Show vbModal, Me -End Sub - -Private Sub cmdEmblemEdit_Click() - frmEmblemEdit.Show vbModal, Me -End Sub - -Private Sub cmdHelp_Click() - frmHelp.Show vbModal, Me -End Sub - -Private Sub cmdHUDEdit_Click() - frmHUDEdit.Show vbModal, Me -End Sub - -Private Sub cmdLevelHeader_Click() - frmLevelHeader.Show vbModal, Me -End Sub - -Private Sub cmdMaincfg_Click() - frmMaincfg.Show vbModal, Me -End Sub - -Private Sub cmdSoundEdit_Click() - frmSoundEdit.Show vbModal, Me -End Sub - -Private Sub cmdStateEdit_Click() - frmStateEdit.Show vbModal, Me -End Sub - -Private Sub cmdThingEdit_Click() - frmThingEdit.Show vbModal, Me -End Sub - -Private Sub cmdUnlockables_Click() - frmUnlockablesEdit.Show vbModal, Me -End Sub - -Private Sub Dir1_Change() - SourcePath = Dir1.Path -End Sub - -Private Sub Dir2_Change() - File1.Path = Dir2.Path -End Sub - -Private Sub Drive1_Change() - Dir1.Path = Drive1.Drive -End Sub - -Private Sub Drive2_Change() - Dir2.Path = Drive2.Drive -End Sub - -Private Sub File1_DblClick() - SOCTemp = File1.Path & "\" & "socedit.tmp" - SOCFile = File1.Path & "\" & File1.List(File1.ListIndex) - MsgBox "You are now using the file: " & vbCrLf & SOCFile - cmdLevelHeader.Enabled = True - cmdThingEdit.Enabled = True - cmdStateEdit.Enabled = True - cmdHUDEdit.Enabled = True - cmdMaincfg.Enabled = True - cmdEmblemEdit.Enabled = True - cmdSoundEdit.Enabled = True - cmdCharacterEdit.Enabled = True - cmdEditCutscenes.Enabled = True - cmdAuthor.Enabled = True - cmdUnlockables.Enabled = True - lblAuthor.Caption = "Modification By: " & GetAuthor -End Sub - -Private Sub Form_Load() - SourcePath = App.Path - Dir1.Path = SourcePath -End Sub - -Private Function GetAuthor() As String - Dim myFSO As New Scripting.FileSystemObject - Dim ts As TextStream - Dim line As String - Dim word As String - Dim word2 As String - - Set ts = myFSO.OpenTextFile(SOCFile, ForReading, False) - -SOCLoad: - Do While Not ts.AtEndOfStream - line = ts.ReadLine - - If Left(line, 1) = "#" Then GoTo SOCLoad - - If Left(line, 1) = vbCrLf Then GoTo SOCLoad - - If Len(line) < 1 Then GoTo SOCLoad - - word = FirstToken(line) - word2 = SecondToken(line) - - If UCase(word) = "MODBY" Then - GetAuthor = word2 - Exit Do - End If - Loop - - ts.Close - Set myFSO = Nothing -End Function - -Private Sub WriteAuthor(Remove As Boolean, ModderName As String) - Dim myFSOSource As New Scripting.FileSystemObject - Dim tsSource As TextStream - Dim myFSOTarget As New Scripting.FileSystemObject - Dim tsTarget As TextStream - Dim line As String - Dim word As String - Dim word2 As String - - Set tsSource = myFSOSource.OpenTextFile(SOCFile, ForReading, False) - Set tsTarget = myFSOTarget.OpenTextFile(SOCTemp, ForWriting, True) - - Do While Not tsSource.AtEndOfStream - line = tsSource.ReadLine - word = UCase(FirstToken(line)) - word2 = UCase(SecondToken(line)) - - 'If the entry exists in the SOC, delete it. - If word <> "MODBY" Then - tsTarget.WriteLine line - End If - Loop - - tsSource.Close - Set myFSOSource = Nothing - - If Remove = False Then - If line <> "" Then tsTarget.WriteLine "" - - tsTarget.WriteLine "ModBy " & ModderName - End If - - tsTarget.Close - Set myFSOTarget = Nothing - - FileCopy SOCTemp, SOCFile - - Kill SOCTemp - - If Remove = True Then - MsgBox "Name removed." - Else - MsgBox "Name Saved." - End If -End Sub - diff --git a/tools/SOCEdit/frmHub.frx b/tools/SOCEdit/frmHub.frx deleted file mode 100644 index 176491ab6..000000000 Binary files a/tools/SOCEdit/frmHub.frx and /dev/null differ diff --git a/tools/SOCEdit/frmLevelHeader.frm b/tools/SOCEdit/frmLevelHeader.frm deleted file mode 100644 index e30acd581..000000000 --- a/tools/SOCEdit/frmLevelHeader.frm +++ /dev/null @@ -1,839 +0,0 @@ -VERSION 5.00 -Begin VB.Form frmLevelHeader - Caption = "Level Header Info" - ClientHeight = 5250 - ClientLeft = 60 - ClientTop = 345 - ClientWidth = 7650 - Icon = "frmLevelHeader.frx":0000 - LinkTopic = "Form1" - MaxButton = 0 'False - ScaleHeight = 5250 - ScaleWidth = 7650 - StartUpPosition = 3 'Windows Default - Begin VB.TextBox txtRunSOC - Height = 285 - Left = 6240 - MaxLength = 8 - TabIndex = 49 - Top = 4680 - Width = 1215 - End - Begin VB.CheckBox chkLevelSelect - Caption = "Show on Host Game selection menu" - Height = 375 - Left = 1680 - TabIndex = 48 - Top = 4800 - Width = 1935 - End - Begin VB.CheckBox chkTimeAttack - Caption = "Include in Time Attack calculations" - Height = 255 - Left = 1680 - TabIndex = 47 - Top = 4440 - Width = 2775 - End - Begin VB.CheckBox chkNoReload - Caption = "Retain level state when player dies." - Height = 255 - Left = 1680 - TabIndex = 46 - Top = 4080 - Width = 2895 - End - Begin VB.CommandButton cmdSave - Caption = "&Save Map" - Height = 735 - Left = 120 - Style = 1 'Graphical - TabIndex = 45 - Top = 4440 - Width = 1215 - End - Begin VB.CommandButton cmdRename - Caption = "&Rename Map" - Height = 375 - Left = 120 - TabIndex = 44 - Top = 3960 - Width = 1215 - End - Begin VB.CommandButton cmdDelete - Caption = "&Delete Map" - Height = 375 - Left = 120 - TabIndex = 43 - Top = 3480 - Width = 1215 - End - Begin VB.CommandButton cmdAddMap - Caption = "&Add Map" - Height = 375 - Left = 120 - TabIndex = 42 - Top = 3000 - Width = 1215 - End - Begin VB.CheckBox chkNossmusic - Caption = "Disable Super Sonic music changes" - Height = 255 - Left = 4560 - TabIndex = 29 - Top = 1200 - Width = 2895 - End - Begin VB.CheckBox chkHidden - Caption = "Don't show on level selection menu" - Height = 255 - Left = 4560 - TabIndex = 28 - Top = 480 - Width = 2895 - End - Begin VB.TextBox txtCountdown - Height = 285 - Left = 6360 - MaxLength = 3 - TabIndex = 26 - Top = 840 - Width = 735 - End - Begin VB.TextBox txtCutscenenum - Height = 285 - Left = 4440 - MaxLength = 3 - TabIndex = 25 - Top = 3720 - Width = 495 - End - Begin VB.TextBox txtPrecutscenenum - Height = 285 - Left = 2640 - MaxLength = 3 - TabIndex = 22 - Top = 3720 - Width = 495 - End - Begin VB.CheckBox chkScriptislump - Caption = "Script is a lump in WAD, not a file" - Height = 255 - Left = 1680 - TabIndex = 21 - Top = 3360 - Width = 2775 - End - Begin VB.TextBox txtScriptname - Height = 285 - Left = 2640 - MaxLength = 191 - TabIndex = 19 - Top = 3000 - Width = 1455 - End - Begin VB.TextBox txtSkynum - Height = 285 - Left = 2640 - MaxLength = 4 - TabIndex = 17 - Top = 2640 - Width = 495 - End - Begin VB.ComboBox cmbWeather - Height = 315 - ItemData = "frmLevelHeader.frx":0442 - Left = 2640 - List = "frmLevelHeader.frx":0458 - TabIndex = 15 - Top = 2280 - Width = 2295 - End - Begin VB.TextBox txtForcecharacter - Height = 285 - Left = 2640 - MaxLength = 2 - TabIndex = 13 - Top = 1920 - Width = 495 - End - Begin VB.ComboBox cmbMusicslot - Height = 315 - Left = 2640 - TabIndex = 11 - Top = 1560 - Width = 1815 - End - Begin VB.TextBox txtNextlevel - Height = 285 - Left = 2640 - MaxLength = 4 - TabIndex = 9 - Top = 1200 - Width = 615 - End - Begin VB.Frame frmTypeOfLevel - Caption = "Type of Level" - Height = 2775 - Left = 5040 - TabIndex = 8 - Top = 1680 - Width = 2535 - Begin VB.CheckBox chkTypeoflevel - Caption = "Christmas" - Height = 255 - Index = 11 - Left = 1440 - TabIndex = 41 - Tag = "1024" - Top = 960 - Width = 975 - End - Begin VB.CheckBox chkTypeoflevel - Caption = "2D" - Height = 255 - Index = 10 - Left = 1440 - TabIndex = 40 - Tag = "512" - Top = 720 - Width = 735 - End - Begin VB.CheckBox chkTypeoflevel - Caption = "Mario" - Height = 255 - Index = 9 - Left = 120 - TabIndex = 39 - Tag = "256" - Top = 2400 - Width = 1455 - End - Begin VB.CheckBox chkTypeoflevel - Caption = "Sonic Adventure" - Height = 255 - Index = 8 - Left = 120 - TabIndex = 38 - Tag = "128" - Top = 2160 - Width = 1575 - End - Begin VB.CheckBox chkTypeoflevel - Caption = "NiGHTS" - Height = 255 - Index = 7 - Left = 120 - TabIndex = 37 - Tag = "64" - Top = 1920 - Width = 1335 - End - Begin VB.CheckBox chkTypeoflevel - Caption = "Chaos" - Height = 255 - Index = 6 - Left = 120 - TabIndex = 36 - Tag = "32" - Top = 1680 - Width = 1455 - End - Begin VB.CheckBox chkTypeoflevel - Caption = "Capture the Flag" - Height = 255 - Index = 5 - Left = 120 - TabIndex = 35 - Tag = "16" - Top = 1440 - Width = 1695 - End - Begin VB.CheckBox chkTypeoflevel - Caption = "Tag" - Height = 255 - Index = 4 - Left = 120 - TabIndex = 34 - Tag = "8" - Top = 1200 - Width = 1215 - End - Begin VB.CheckBox chkTypeoflevel - Caption = "Match" - Height = 255 - Index = 3 - Left = 120 - TabIndex = 33 - Tag = "4" - Top = 960 - Width = 855 - End - Begin VB.CheckBox chkTypeoflevel - Caption = "Race" - Height = 255 - Index = 2 - Left = 120 - TabIndex = 32 - Tag = "2" - Top = 720 - Width = 855 - End - Begin VB.CheckBox chkTypeoflevel - Caption = "Cooperative" - Height = 255 - Index = 1 - Left = 120 - TabIndex = 31 - Tag = "1" - Top = 480 - Width = 1215 - End - Begin VB.CheckBox chkTypeoflevel - Caption = "Single Player" - Height = 255 - Index = 0 - Left = 120 - TabIndex = 30 - Tag = "4096" - Top = 240 - Width = 1215 - End - End - Begin VB.CheckBox chkNozone - Caption = "Don't show ""ZONE"" after Level Name" - Height = 255 - Left = 4560 - TabIndex = 7 - Top = 120 - Width = 3015 - End - Begin VB.TextBox txtAct - Height = 285 - Left = 2640 - MaxLength = 2 - TabIndex = 5 - Top = 840 - Width = 495 - End - Begin VB.TextBox txtInterscreen - Height = 285 - Left = 2640 - MaxLength = 8 - TabIndex = 3 - Top = 480 - Width = 1335 - End - Begin VB.ListBox lstMaps - Height = 2790 - Left = 120 - Sorted = -1 'True - TabIndex = 2 - Top = 120 - Width = 1215 - End - Begin VB.TextBox txtLevelName - Height = 285 - Left = 2640 - MaxLength = 32 - TabIndex = 0 - Top = 120 - Width = 1815 - End - Begin VB.Label lblRunSOC - Alignment = 1 'Right Justify - Caption = "Run SOC at level load (lump name):" - Height = 495 - Left = 4440 - TabIndex = 50 - Top = 4560 - Width = 1695 - End - Begin VB.Label lblCountdown - Alignment = 1 'Right Justify - Caption = "Level Timer (seconds):" - Height = 255 - Left = 4560 - TabIndex = 27 - Top = 840 - Width = 1695 - End - Begin VB.Label lblCutscenenum - Alignment = 1 'Right Justify - Caption = "Cutscene to play after level:" - Height = 495 - Left = 3240 - TabIndex = 24 - Top = 3600 - Width = 1095 - End - Begin VB.Label lblPrecutscenenum - Alignment = 1 'Right Justify - Caption = "Cutscene to play before level:" - Height = 375 - Left = 1320 - TabIndex = 23 - Top = 3600 - Width = 1215 - End - Begin VB.Label lblScriptName - Alignment = 1 'Right Justify - Caption = "Script Name:" - Height = 255 - Left = 1440 - TabIndex = 20 - Top = 3000 - Width = 1095 - End - Begin VB.Label lblSkynum - Alignment = 1 'Right Justify - Caption = "Sky #:" - Height = 255 - Left = 1800 - TabIndex = 18 - Top = 2640 - Width = 735 - End - Begin VB.Label Label1 - Alignment = 1 'Right Justify - Caption = "Weather:" - Height = 255 - Left = 1680 - TabIndex = 16 - Top = 2280 - Width = 855 - End - Begin VB.Label lblForcecharacter - Caption = "Force Character #:" - Height = 375 - Left = 1440 - TabIndex = 14 - Top = 1800 - Width = 1095 - End - Begin VB.Label lblMusicslot - Alignment = 1 'Right Justify - Caption = "Music:" - Height = 255 - Left = 1800 - TabIndex = 12 - Top = 1560 - Width = 735 - End - Begin VB.Label lblNextlevel - Alignment = 1 'Right Justify - Caption = "Next Level:" - Height = 255 - Left = 1440 - TabIndex = 10 - Top = 1200 - Width = 1095 - End - Begin VB.Label lblAct - Alignment = 1 'Right Justify - Caption = "Act:" - Height = 255 - Left = 2040 - TabIndex = 6 - Top = 840 - Width = 495 - End - Begin VB.Label lblInterscreen - Alignment = 1 'Right Justify - Caption = "Intermission BG:" - Height = 255 - Left = 1320 - TabIndex = 4 - Top = 480 - Width = 1215 - End - Begin VB.Label lblLevelName - Alignment = 1 'Right Justify - Caption = "Level Name:" - Height = 255 - Left = 1560 - TabIndex = 1 - Top = 120 - Width = 975 - End -End -Attribute VB_Name = "frmLevelHeader" -Attribute VB_GlobalNameSpace = False -Attribute VB_Creatable = False -Attribute VB_PredeclaredId = True -Attribute VB_Exposed = False -Option Explicit - -Private Sub cmdAddMap_Click() - Dim Response As String - Dim NewNum As Integer - - Response$ = InputBox("Enter the new level (NUMBER ONLY):") - - If Response = "" Then - Exit Sub - End If - - NewNum = Val(TrimComplete(Response)) - - lstMaps.AddItem "Level " & NewNum - lstMaps.ListIndex = lstMaps.ListCount - 1 -End Sub - -Private Sub cmdDelete_Click() - Dim i As Integer - - If MsgBox("Delete this level header?", vbYesNo) = vbNo Then - Exit Sub - End If - - i = InStr(lstMaps.List(lstMaps.ListIndex), " ") + 1 - - i = Mid(lstMaps.List(lstMaps.ListIndex), i, Len(lstMaps.List(lstMaps.ListIndex)) - i + 1) - i = Val(i) - Call WriteLevel(True, i) - lstMaps.RemoveItem lstMaps.ListIndex - - If lstMaps.ListCount > 0 Then - lstMaps.ListIndex = 0 - End If -End Sub - -Private Sub cmdRename_Click() - Dim Response As String - Dim NewNum As Integer - Dim i As Integer - - Response$ = InputBox("Rename level to (NUMBER ONLY):") - - If Response = "" Then - Exit Sub - End If - - NewNum = Val(TrimComplete(Response)) - - i = InStr(lstMaps.List(lstMaps.ListIndex), " ") + 1 - - i = Mid(lstMaps.List(lstMaps.ListIndex), i, Len(lstMaps.List(lstMaps.ListIndex)) - i + 1) - i = Val(i) - Call WriteLevel(True, i) - lstMaps.List(lstMaps.ListIndex) = "Level " & NewNum - Call cmdSave_Click -End Sub - -Private Sub cmdSave_Click() - Dim i As Integer - - i = InStr(lstMaps.List(lstMaps.ListIndex), " ") + 1 - - i = Val(Mid(lstMaps.List(lstMaps.ListIndex), i, Len(lstMaps.List(lstMaps.ListIndex)) - i + 1)) - Call WriteLevel(False, i) -End Sub - -Private Sub Form_Load() - Call LoadMusic - Call LoadSOCMaps - If lstMaps.ListCount > 0 Then lstMaps.ListIndex = 0 -End Sub - -Private Sub LoadSOCMaps() - Dim myFSO As New Scripting.FileSystemObject - Dim ts As TextStream - Dim line As String - Dim word As String - Dim word2 As String - - Set ts = myFSO.OpenTextFile(SOCFile, ForReading, False) - - lstMaps.Clear - -SOCLoad: - Do While Not ts.AtEndOfStream - line = ts.ReadLine - - If Left(line, 1) = "#" Then GoTo SOCLoad - - If Left(line, 1) = vbCrLf Then GoTo SOCLoad - - If Len(line) < 1 Then GoTo SOCLoad - - word = FirstToken(line) - word2 = SecondToken(line) - - If UCase(word) = "LEVEL" Then - lstMaps.AddItem ("Level " & Val(word2)) - End If - Loop - - ts.Close - Set myFSO = Nothing -End Sub - -Private Sub LoadMusic() - Dim myFSO As New Scripting.FileSystemObject - Dim ts As TextStream - Dim line As String - Dim number As Integer - Dim startclip As Integer, endclip As Integer - Dim addstring As String - - ChDir SourcePath - Set ts = myFSO.OpenTextFile("sounds.h", ForReading, False) - - Do While InStr(ts.ReadLine, "Music list (don't edit this comment!)") = 0 - Loop - - ts.SkipLine ' typedef enum - ts.SkipLine ' { - - line = ts.ReadLine - number = 0 - - cmbMusicslot.Clear - - Do While InStr(line, "NUMMUSIC") = 0 - startclip = InStr(line, "mus_") - If InStr(line, "mus_") <> 0 Then - endclip = InStr(line, ",") - line = Mid(line, startclip, endclip - startclip) - addstring = number & " - " & line - cmbMusicslot.AddItem addstring - number = number + 1 - End If - line = ts.ReadLine - Loop - - ts.Close - Set myFSO = Nothing -End Sub - -Private Sub ClearForm() - Dim j As Integer - - txtLevelName.Text = "" - txtInterscreen.Text = "" - txtAct.Text = "" - txtNextlevel.Text = "" - cmbMusicslot.Text = "" - txtForcecharacter.Text = "" - cmbWeather.Text = "" - txtSkynum.Text = "" - txtScriptname.Text = "" - chkScriptislump.Value = 0 - txtPrecutscenenum.Text = "" - txtCutscenenum.Text = "" - txtRunSOC.Text = "" - chkNozone.Value = 0 - chkHidden.Value = 0 - txtCountdown.Text = "" - chkNossmusic.Value = 0 - chkNoReload.Value = 0 - chkTimeAttack.Value = 0 - chkLevelSelect = 0 - - For j = 0 To 11 - chkTypeoflevel(j).Value = 0 - Next j -End Sub - -Private Sub lstMaps_Click() - Dim startclip As Integer - Call ClearForm - startclip = InStr(lstMaps.List(lstMaps.ListIndex), " ") - Call LoadSOCMapInfo(Val(Mid(lstMaps.List(lstMaps.ListIndex), startclip + 1, Len(lstMaps.List(lstMaps.ListIndex))))) -End Sub - -Private Sub LoadSOCMapInfo(num As Integer) - Dim myFSO As New Scripting.FileSystemObject - Dim ts As TextStream - Dim line As String - Dim word As String - Dim word2 As String - - Set ts = myFSO.OpenTextFile(SOCFile, ForReading, False) - -SOCLoad: - Do While Not ts.AtEndOfStream - line = ts.ReadLine - - If Left(line, 1) = "#" Then GoTo SOCLoad - - If Left(line, 1) = vbCrLf Then GoTo SOCLoad - - If Len(line) < 1 Then GoTo SOCLoad - - word = UCase(FirstToken(line)) - word2 = UCase(SecondToken(line)) - - If word = "LEVEL" Then - If Val(word2) = num Then - Do While Len(line) > 0 And Not ts.AtEndOfStream - line = ts.ReadLine - word = UCase(FirstToken(line)) - word2 = UCase(SecondTokenEqual(line)) - - If word = "LEVELNAME" Then - txtLevelName.Text = word2 - ElseIf word = "INTERSCREEN" Then - txtInterscreen.Text = word2 - ElseIf word = "ACT" Then - txtAct.Text = Val(word2) - ElseIf word = "NOZONE" Then - chkNozone.Value = Val(word2) - ElseIf word = "TYPEOFLEVEL" Then - ProcessMapFlags (Val(word2)) - ElseIf word = "NEXTLEVEL" Then - txtNextlevel.Text = Val(word2) - ElseIf word = "MUSICSLOT" Then - cmbMusicslot.ListIndex = Val(word2) - ElseIf word = "FORCECHARACTER" Then - txtForcecharacter.Text = Val(word2) - ElseIf word = "WEATHER" Then - cmbWeather.ListIndex = Val(word2) - ElseIf word = "SKYNUM" Then - txtSkynum.Text = Val(word2) - ElseIf word = "SCRIPTNAME" Then - txtScriptname.Text = word2 - ElseIf word = "SCRIPTISLUMP" Then - chkScriptislump.Value = Val(word2) - ElseIf word = "PRECUTSCENENUM" Then - txtPrecutscenenum.Text = Val(word2) - ElseIf word = "CUTSCENENUM" Then - txtCutscenenum.Text = Val(word2) - ElseIf word = "COUNTDOWN" Then - txtCountdown.Text = Val(word2) - ElseIf word = "HIDDEN" Then - chkHidden.Value = Val(word2) - ElseIf word = "NOSSMUSIC" Then - chkNossmusic.Value = Val(word2) - ElseIf word = "NORELOAD" Then - chkNoReload.Value = Val(word2) - ElseIf word = "TIMEATTACK" Then - chkTimeAttack.Value = Val(word2) - ElseIf word = "LEVELSELECT" Then - chkLevelSelect.Value = Val(word2) - ElseIf word = "RUNSOC" Then - txtRunSOC.Text = word2 - ElseIf Len(line) > 0 And Left(line, 1) <> "#" Then - MsgBox "Error in SOC!" & vbCrLf & "Unknown line: " & line - End If - Loop - Exit Do - End If - End If - Loop - - ts.Close - Set myFSO = Nothing -End Sub - -Private Sub ProcessMapFlags(flags As Long) - Dim j As Integer - - For j = 0 To 11 - If flags And chkTypeoflevel(j).Tag Then - chkTypeoflevel(j).Value = 1 - Else - chkTypeoflevel(j).Value = 0 - End If - Next j -End Sub - -Private Sub WriteLevel(Remove As Boolean, Mapnum As Integer) - Dim myFSOSource As New Scripting.FileSystemObject - Dim tsSource As TextStream - Dim myFSOTarget As New Scripting.FileSystemObject - Dim tsTarget As TextStream - Dim line As String - Dim word As String - Dim word2 As String - Dim flags As Long - Dim i As Integer - - Set tsSource = myFSOSource.OpenTextFile(SOCFile, ForReading, False) - Set tsTarget = myFSOTarget.OpenTextFile(SOCTemp, ForWriting, True) - - Do While Not tsSource.AtEndOfStream - line = tsSource.ReadLine - word = UCase(FirstToken(line)) - word2 = UCase(SecondToken(line)) - - i = InStr(lstMaps.List(lstMaps.ListIndex), " ") + 1 - - i = Mid(lstMaps.List(lstMaps.ListIndex), i, Len(lstMaps.List(lstMaps.ListIndex)) - i + 1) - i = Val(i) - 'If the current level exists in the SOC, delete it. - If word = "LEVEL" And Val(word2) = i Then - Do While Len(TrimComplete(tsSource.ReadLine)) > 0 And Not (tsSource.AtEndOfStream) - Loop - Else - tsTarget.WriteLine line - End If - Loop - - tsSource.Close - Set myFSOSource = Nothing - - If Remove = False Then - If line <> "" Then tsTarget.WriteLine "" - - tsTarget.WriteLine UCase(lstMaps.List(lstMaps.ListIndex)) - txtLevelName.Text = TrimComplete(txtLevelName.Text) - txtInterscreen.Text = TrimComplete(txtInterscreen.Text) - txtAct.Text = TrimComplete(txtAct.Text) - txtNextlevel.Text = TrimComplete(txtNextlevel.Text) - cmbMusicslot.Text = TrimComplete(cmbMusicslot.Text) - txtForcecharacter.Text = TrimComplete(txtForcecharacter.Text) - cmbWeather.Text = TrimComplete(cmbWeather.Text) - txtSkynum.Text = TrimComplete(txtSkynum.Text) - txtScriptname.Text = TrimComplete(txtScriptname.Text) - txtPrecutscenenum.Text = TrimComplete(txtPrecutscenenum.Text) - txtCutscenenum.Text = TrimComplete(txtCutscenenum.Text) - txtCountdown.Text = TrimComplete(txtCountdown.Text) - txtRunSOC.Text = TrimComplete(txtRunSOC.Text) - - If txtLevelName.Text <> "" Then tsTarget.WriteLine "LEVELNAME = " & txtLevelName.Text - If txtInterscreen.Text <> "" Then tsTarget.WriteLine "INTERSCREEN = " & txtInterscreen.Text - If txtAct.Text <> "" Then tsTarget.WriteLine "ACT = " & Val(txtAct.Text) - If txtNextlevel.Text <> "" Then tsTarget.WriteLine "NEXTLEVEL = " & Val(txtNextlevel.Text) - If cmbMusicslot.Text <> "" Then tsTarget.WriteLine "MUSICSLOT = " & cmbMusicslot.ListIndex - If txtForcecharacter.Text <> "" Then tsTarget.WriteLine "FORCECHARACTER = " & Val(txtForcecharacter.Text) - If cmbWeather.Text <> "" Then tsTarget.WriteLine "WEATHER = " & cmbWeather.ListIndex - If txtSkynum.Text <> "" Then tsTarget.WriteLine "SKYNUM = " & Val(txtSkynum.Text) - If txtScriptname.Text <> "" Then tsTarget.WriteLine "SCRIPTNAME = " & txtScriptname.Text - If txtPrecutscenenum.Text <> "" Then tsTarget.WriteLine "PRECUTSCENENUM = " & Val(txtPrecutscenenum.Text) - If txtCutscenenum.Text <> "" Then tsTarget.WriteLine "CUTSCENENUM = " & Val(txtCutscenenum.Text) - If txtCountdown.Text <> "" Then tsTarget.WriteLine "COUNTDOWN = " & Val(txtCountdown.Text) - If chkScriptislump.Value = 1 Then tsTarget.WriteLine "SCRIPTISLUMP = 1" - If chkNozone.Value = 1 Then tsTarget.WriteLine "NOZONE = 1" - If chkHidden.Value = 1 Then tsTarget.WriteLine "HIDDEN = 1" - If chkNossmusic.Value = 1 Then tsTarget.WriteLine "NOSSMUSIC = 1" - If chkNoReload.Value = 1 Then tsTarget.WriteLine "NORELOAD = 1" - If chkTimeAttack.Value = 1 Then tsTarget.WriteLine "TIMEATTACK = 1" - If chkLevelSelect.Value = 1 Then tsTarget.WriteLine "LEVELSELECT = 1" - If txtRunSOC.Text <> "" Then tsTarget.WriteLine "RUNSOC = " & txtRunSOC.Text - - flags = 0 - For i = 0 To 11 - If chkTypeoflevel(i).Value = 1 Then - flags = flags + Val(chkTypeoflevel(i).Tag) - End If - Next - - If flags > 0 Then tsTarget.WriteLine "TYPEOFLEVEL = " & flags - End If - - tsTarget.Close - Set myFSOTarget = Nothing - - FileCopy SOCTemp, SOCFile - - Kill SOCTemp - - If Remove = True Then - MsgBox "Level Deleted." - Else - MsgBox "Level Saved." - End If -End Sub - diff --git a/tools/SOCEdit/frmLevelHeader.frx b/tools/SOCEdit/frmLevelHeader.frx deleted file mode 100644 index fe81f4413..000000000 Binary files a/tools/SOCEdit/frmLevelHeader.frx and /dev/null differ diff --git a/tools/SOCEdit/frmMaincfg.frm b/tools/SOCEdit/frmMaincfg.frm deleted file mode 100644 index 3efca74a8..000000000 --- a/tools/SOCEdit/frmMaincfg.frm +++ /dev/null @@ -1,644 +0,0 @@ -VERSION 5.00 -Begin VB.Form frmMaincfg - Caption = "Global Game Settings" - ClientHeight = 5295 - ClientLeft = 60 - ClientTop = 345 - ClientWidth = 9360 - Icon = "frmMaincfg.frx":0000 - LinkTopic = "Form1" - MaxButton = 0 'False - ScaleHeight = 5295 - ScaleWidth = 9360 - StartUpPosition = 3 'Windows Default - Begin VB.Frame frmReset - Caption = "Reset Data (Be sure this is at the TOP of your SOC)" - Height = 975 - Left = 4800 - TabIndex = 43 - Top = 4200 - Width = 4455 - Begin VB.CheckBox chkReset - Caption = "Thing Properties" - Height = 255 - Index = 2 - Left = 1680 - TabIndex = 46 - Tag = "4" - Top = 240 - Width = 1575 - End - Begin VB.CheckBox chkReset - Caption = "States" - Height = 255 - Index = 1 - Left = 240 - TabIndex = 45 - Tag = "2" - Top = 600 - Width = 1335 - End - Begin VB.CheckBox chkReset - Caption = "Sprite Names" - Height = 255 - Index = 0 - Left = 240 - TabIndex = 44 - Tag = "1" - Top = 240 - Width = 1575 - End - End - Begin VB.CheckBox chkDisableSpeedAdjust - Caption = "Disable speed adjustment of player animations depending on how fast they are moving." - Height = 375 - Left = 1080 - TabIndex = 42 - Top = 4200 - Width = 3615 - End - Begin VB.TextBox txtTitleScrollSpeed - Height = 285 - Left = 4080 - TabIndex = 41 - Top = 1920 - Width = 495 - End - Begin VB.CheckBox chkLoopTitle - Caption = "Loop the title screen music?" - Height = 195 - Left = 1080 - TabIndex = 39 - Top = 3840 - Width = 2415 - End - Begin VB.TextBox txtCreditsCutscene - Height = 285 - Left = 4080 - TabIndex = 37 - Top = 1560 - Width = 495 - End - Begin VB.CommandButton cmdSave - Caption = "&Save" - Height = 495 - Left = 120 - TabIndex = 36 - Top = 3120 - Width = 735 - End - Begin VB.CommandButton cmdReload - Caption = "&Reload" - Height = 495 - Left = 120 - TabIndex = 35 - Top = 2520 - Width = 735 - End - Begin VB.TextBox txtNumemblems - Height = 285 - Left = 4080 - MaxLength = 2 - TabIndex = 33 - Top = 3360 - Width = 495 - End - Begin VB.TextBox txtGamedata - Height = 285 - Left = 3240 - MaxLength = 64 - TabIndex = 31 - Top = 2880 - Width = 1335 - End - Begin VB.TextBox txtExeccfg - Height = 285 - Left = 3240 - TabIndex = 9 - Top = 2400 - Width = 1335 - End - Begin VB.Frame frmTimers - Caption = "Timers (35 = 1 second)" - Height = 3975 - Left = 4800 - TabIndex = 8 - Top = 120 - Width = 4455 - Begin VB.TextBox txtGameovertics - Height = 285 - Left = 3000 - TabIndex = 29 - Top = 3480 - Width = 1335 - End - Begin VB.TextBox txtHelpertics - Height = 285 - Left = 3000 - TabIndex = 27 - Top = 3120 - Width = 1335 - End - Begin VB.TextBox txtParalooptics - Height = 285 - Left = 3000 - TabIndex = 25 - Top = 2760 - Width = 1335 - End - Begin VB.TextBox txtExtralifetics - Height = 285 - Left = 3000 - TabIndex = 23 - Top = 2400 - Width = 1335 - End - Begin VB.TextBox txtSpacetimetics - Height = 285 - Left = 3000 - TabIndex = 21 - Top = 2040 - Width = 1335 - End - Begin VB.TextBox txtUnderwatertics - Height = 285 - Left = 3000 - TabIndex = 19 - Top = 1680 - Width = 1335 - End - Begin VB.TextBox txtTailsflytics - Height = 285 - Left = 3000 - TabIndex = 17 - Top = 1320 - Width = 1335 - End - Begin VB.TextBox txtFlashingtics - Height = 285 - Left = 3000 - TabIndex = 15 - Top = 960 - Width = 1335 - End - Begin VB.TextBox txtSneakertics - Height = 285 - Left = 3000 - TabIndex = 13 - Top = 600 - Width = 1335 - End - Begin VB.TextBox txtInvulntics - Height = 285 - Left = 3000 - TabIndex = 11 - Top = 240 - Width = 1335 - End - Begin VB.Label lblGameovertics - Alignment = 1 'Right Justify - Caption = "Game Over Screen Time:" - Height = 255 - Left = 960 - TabIndex = 30 - Top = 3480 - Width = 1935 - End - Begin VB.Label lblHelpertics - Alignment = 1 'Right Justify - Caption = "NiGHTS Nightopian Helper Time:" - Height = 255 - Left = 240 - TabIndex = 28 - Top = 3120 - Width = 2655 - End - Begin VB.Label lblParalooptics - Alignment = 1 'Right Justify - Caption = "NiGHTS Paraloop Powerup Time:" - Height = 255 - Left = 360 - TabIndex = 26 - Top = 2760 - Width = 2535 - End - Begin VB.Label lblExtralifetics - Alignment = 1 'Right Justify - Caption = "Extra Life Music Duration:" - Height = 255 - Left = 960 - TabIndex = 24 - Top = 2400 - Width = 1935 - End - Begin VB.Label lblSpacetimetics - Alignment = 1 'Right Justify - Caption = "Space Breath Timeout:" - Height = 255 - Left = 1200 - TabIndex = 22 - Top = 2040 - Width = 1695 - End - Begin VB.Label lblUnderwatertics - Alignment = 1 'Right Justify - Caption = "Underwater Breath Timeout:" - Height = 255 - Left = 840 - TabIndex = 20 - Top = 1680 - Width = 2055 - End - Begin VB.Label lblTailsflytics - Alignment = 1 'Right Justify - Caption = "Tails Flying Time:" - Height = 255 - Left = 1440 - TabIndex = 18 - Top = 1320 - Width = 1455 - End - Begin VB.Label lblFlashingtics - Alignment = 1 'Right Justify - Caption = "Flashing Time After Being Hit:" - Height = 255 - Left = 360 - TabIndex = 16 - Top = 960 - Width = 2535 - End - Begin VB.Label lblSneakertics - Alignment = 1 'Right Justify - Caption = "Super Sneakers Time:" - Height = 255 - Left = 240 - TabIndex = 14 - Top = 600 - Width = 2655 - End - Begin VB.Label lblInvulntics - Alignment = 1 'Right Justify - Caption = "Invincibility Time:" - Height = 255 - Left = 360 - TabIndex = 12 - Top = 240 - Width = 2535 - End - End - Begin VB.TextBox txtIntrotoplay - Height = 285 - Left = 4080 - TabIndex = 6 - Top = 1200 - Width = 495 - End - Begin VB.TextBox txtRacestage_start - Height = 285 - Left = 4080 - MaxLength = 4 - TabIndex = 4 - Top = 840 - Width = 495 - End - Begin VB.TextBox txtSpstage_start - Height = 285 - Left = 4080 - MaxLength = 4 - TabIndex = 2 - Top = 480 - Width = 495 - End - Begin VB.TextBox txtSstage_start - Height = 285 - Left = 4080 - MaxLength = 4 - TabIndex = 0 - Top = 120 - Width = 495 - End - Begin VB.Label lblTitleScrollSpeed - Alignment = 1 'Right Justify - Caption = "Scroll speed of title background:" - Height = 255 - Left = 1560 - TabIndex = 40 - Top = 1920 - Width = 2415 - End - Begin VB.Label lblCreditsCutscene - Alignment = 1 'Right Justify - Caption = "Cutscene # to replace credits with:" - Height = 255 - Left = 1080 - TabIndex = 38 - Top = 1560 - Width = 2895 - End - Begin VB.Label lblNumemblems - Alignment = 1 'Right Justify - Caption = "# of LEVEL Emblems (Gamedata field must also be filled out):" - Height = 375 - Left = 1440 - TabIndex = 34 - Top = 3240 - Width = 2535 - End - Begin VB.Label lblGamedata - Alignment = 1 'Right Justify - Caption = "Gamedata file (to save mod emblems and time data):" - Height = 375 - Left = 960 - TabIndex = 32 - Top = 2760 - Width = 2175 - End - Begin VB.Label lblExeccfg - Alignment = 1 'Right Justify - Caption = "CFG file to instantly execute upon loading this SOC:" - Height = 495 - Left = 960 - TabIndex = 10 - Top = 2280 - Width = 2175 - End - Begin VB.Label lblIntrotoplay - Alignment = 1 'Right Justify - Caption = "Cutscene # to use for introduction:" - Height = 255 - Left = 1440 - TabIndex = 7 - Top = 1200 - Width = 2535 - End - Begin VB.Label lblRacestage_start - Alignment = 1 'Right Justify - Caption = "Racing mode starts/loops back to this map #:" - Height = 255 - Left = 720 - TabIndex = 5 - Top = 840 - Width = 3255 - End - Begin VB.Label lblSpstage_start - Alignment = 1 'Right Justify - Caption = "Single Player Game Starts on this map #:" - Height = 255 - Left = 1080 - TabIndex = 3 - Top = 480 - Width = 2895 - End - Begin VB.Label lblSstage_start - Alignment = 1 'Right Justify - Caption = "First Special Stage Map #:" - Height = 255 - Left = 2040 - TabIndex = 1 - Top = 120 - Width = 1935 - End -End -Attribute VB_Name = "frmMaincfg" -Attribute VB_GlobalNameSpace = False -Attribute VB_Creatable = False -Attribute VB_PredeclaredId = True -Attribute VB_Exposed = False -Private Sub cmdReload_Click() - Call Reload -End Sub - -Private Sub cmdSave_Click() - Call WriteSettings -End Sub - -Private Sub Form_Load() - Call Reload -End Sub - -Private Sub ClearForm() - Dim i As Integer - - txtSstage_start.Text = "" - txtSpstage_start.Text = "" - txtRacestage_start.Text = "" - txtIntrotoplay.Text = "" - txtExeccfg.Text = "" - txtGamedata.Text = "" - txtNumemblems.Text = "" - txtInvulntics.Text = "" - txtSneakertics.Text = "" - txtFlashingtics.Text = "" - txtTailsflytics.Text = "" - txtUnderwatertics.Text = "" - txtSpacetimetics.Text = "" - txtExtralifetics.Text = "" - txtParalooptics.Text = "" - txtHelpertics.Text = "" - txtGameovertics.Text = "" - txtCreditsCutscene.Text = "" - txtTitleScrollSpeed.Text = "" - chkLoopTitle.Value = 0 - chkDisableSpeedAdjust.Value = 0 - - For i = 0 To 2 - chkReset(i).Value = 0 - Next i -End Sub - -Private Sub Reload() - Call ClearForm - Call ReadSOCMaincfg -End Sub - -Private Sub ReadSOCMaincfg() - Dim myFSO As New Scripting.FileSystemObject - Dim ts As TextStream - Dim line As String - Dim word As String - Dim word2 As String - - Set ts = myFSO.OpenTextFile(SOCFile, ForReading, False) - -SOCLoad: - Do While Not ts.AtEndOfStream - line = ts.ReadLine - - If Left(line, 1) = "#" Then GoTo SOCLoad - - If Left(line, 1) = vbCrLf Then GoTo SOCLoad - - If Len(line) < 1 Then GoTo SOCLoad - - word = FirstToken(line) - word2 = SecondToken(line) - - If UCase(word) = "MAINCFG" Then - Do While Len(line) > 0 And Not ts.AtEndOfStream - line = ts.ReadLine - word = UCase(FirstToken(line)) - word2 = UCase(SecondTokenEqual(line)) - - If word = "SSTAGE_START" Then - txtSstage_start.Text = Val(word2) - ElseIf word = "SPSTAGE_START" Then - txtSpstage_start.Text = Val(word2) - ElseIf word = "RACESTAGE_START" Then - txtRacestage_start.Text = Val(word2) - ElseIf word = "INVULNTICS" Then - txtInvulntics.Text = Val(word2) - ElseIf word = "SNEAKERTICS" Then - txtSneakertics.Text = Val(word2) - ElseIf word = "FLASHINGTICS" Then - txtFlashingtics.Text = Val(word2) - ElseIf word = "TAILSFLYTICS" Then - txtTailsflytics.Text = Val(word2) - ElseIf word = "UNDERWATERTICS" Then - txtUnderwatertics.Text = Val(word2) - ElseIf word = "SPACETIMETICS" Then - txtSpacetimetics.Text = Val(word2) - ElseIf word = "EXTRALIFETICS" Then - txtExtralifetics.Text = Val(word2) - ElseIf word = "PARALOOPTICS" Then - txtParalooptics.Text = Val(word2) - ElseIf word = "HELPERTICS" Then - txtHelpertics.Text = Val(word2) - ElseIf word = "GAMEOVERTICS" Then - txtGameovertics.Text = Val(word2) - ElseIf word = "INTROTOPLAY" Then - txtIntrotoplay.Text = Val(word2) - ElseIf word = "CREDITSCUTSCENE" Then - txtCreditsCutscene.Text = Val(word2) - ElseIf word = "TITLESCROLLSPEED" Then - txtTitleScrollSpeed.Text = Val(word2) - ElseIf word = "LOOPTITLE" Then - chkLoopTitle.Value = Val(word2) - ElseIf word = "DISABLESPEEDADJUST" Then - chkDisableSpeedAdjust.Value = Val(word2) - ElseIf word = "GAMEDATA" Then - txtGamedata.Text = word2 - ElseIf word = "NUMEMBLEMS" Then - txtNumemblems.Text = Val(word2) - ElseIf word = "RESETDATA" Then - Dim resetflags As Integer - Dim z As Integer - - resetflags = Val(word2) - - For z = 0 To 2 - If resetflags And chkReset(z).Tag Then - chkReset(z).Value = 1 - Else - chkReset(z).Value = 0 - End If - Next z - ElseIf Len(line) > 0 And Left(line, 1) <> "#" Then - MsgBox "Error in SOC!" & vbCrLf & "Unknown line: " & line - End If - Loop - Exit Do - End If - Loop - - ts.Close - Set myFSO = Nothing -End Sub - -Private Sub WriteSettings() - Dim myFSOSource As New Scripting.FileSystemObject - Dim tsSource As TextStream - Dim myFSOTarget As New Scripting.FileSystemObject - Dim tsTarget As TextStream - Dim line As String - Dim word As String - Dim word2 As String - Dim flags As Long - Dim i As Integer - - Set tsSource = myFSOSource.OpenTextFile(SOCFile, ForReading, False) - Set tsTarget = myFSOTarget.OpenTextFile(SOCTemp, ForWriting, True) - - Do While Not tsSource.AtEndOfStream - line = tsSource.ReadLine - word = UCase(FirstToken(line)) - word2 = UCase(SecondToken(line)) - - 'If the category exists in the SOC, delete it. - If word = "MAINCFG" Then - Do While Len(TrimComplete(tsSource.ReadLine)) > 0 And Not (tsSource.AtEndOfStream) - Loop - Else - tsTarget.WriteLine line - End If - Loop - - tsSource.Close - Set myFSOSource = Nothing - - If line <> "" Then tsTarget.WriteLine "" - - tsTarget.WriteLine "MAINCFG CATEGORY" - txtSstage_start.Text = TrimComplete(txtSstage_start.Text) - txtSpstage_start.Text = TrimComplete(txtSpstage_start.Text) - txtRacestage_start.Text = TrimComplete(txtRacestage_start.Text) - txtIntrotoplay.Text = TrimComplete(txtIntrotoplay.Text) - txtCreditsCutscene.Text = TrimComplete(txtCreditsCutscene.Text) - txtExeccfg.Text = TrimComplete(txtExeccfg.Text) - txtGamedata.Text = TrimComplete(txtGamedata.Text) - txtNumemblems.Text = TrimComplete(txtNumemblems.Text) - txtInvulntics.Text = TrimComplete(txtInvulntics.Text) - txtSneakertics.Text = TrimComplete(txtSneakertics.Text) - txtFlashingtics.Text = TrimComplete(txtFlashingtics.Text) - txtTailsflytics.Text = TrimComplete(txtTailsflytics.Text) - txtUnderwatertics.Text = TrimComplete(txtUnderwatertics.Text) - txtSpacetimetics.Text = TrimComplete(txtSpacetimetics.Text) - txtExtralifetics.Text = TrimComplete(txtExtralifetics.Text) - txtParalooptics.Text = TrimComplete(txtParalooptics.Text) - txtHelpertics.Text = TrimComplete(txtHelpertics.Text) - txtGameovertics.Text = TrimComplete(txtGameovertics.Text) - txtTitleScrollSpeed.Text = TrimComplete(txtTitleScrollSpeed.Text) - - If txtSstage_start.Text <> "" Then tsTarget.WriteLine "SSTAGE_START = " & Val(txtSstage_start.Text) - If txtSpstage_start.Text <> "" Then tsTarget.WriteLine "SPSTAGE_START = " & Val(txtSpstage_start.Text) - If txtRacestage_start.Text <> "" Then tsTarget.WriteLine "RACESTAGE_START = " & Val(txtRacestage_start.Text) - If txtIntrotoplay.Text <> "" Then tsTarget.WriteLine "INTROTOPLAY = " & Val(txtIntrotoplay.Text) - If txtCreditsCutscene.Text <> "" Then tsTarget.WriteLine "CREDITSCUTSCENE = " & Val(txtCreditsCutscene.Text) - If txtExeccfg.Text <> "" Then tsTarget.WriteLine "EXECCFG = " & txtExeccfg.Text - If txtGamedata.Text <> "" Then tsTarget.WriteLine "GAMEDATA = " & txtGamedata.Text - If txtNumemblems.Text <> "" Then - tsTarget.WriteLine "NUMEMBLEMS = " & Val(txtNumemblems.Text) - EditedNumemblems = True - End If - If txtInvulntics.Text <> "" Then tsTarget.WriteLine "INVULNTICS = " & Val(txtInvulntics.Text) - If txtSneakertics.Text <> "" Then tsTarget.WriteLine "SNEAKERTICS = " & Val(txtSneakertics.Text) - If txtFlashingtics.Text <> "" Then tsTarget.WriteLine "FLASHINGTICS = " & Val(txtFlashingtics.Text) - If txtTailsflytics.Text <> "" Then tsTarget.WriteLine "TAILSFLYTICS = " & Val(txtTailsflytics.Text) - If txtUnderwatertics.Text <> "" Then tsTarget.WriteLine "UNDERWATERTICS = " & Val(txtUnderwatertics.Text) - If txtSpacetimetics.Text <> "" Then tsTarget.WriteLine "SPACETIMETICS = " & Val(txtSpacetimetics.Text) - If txtExtralifetics.Text <> "" Then tsTarget.WriteLine "EXTRALIFETICS = " & Val(txtExtralifetics.Text) - If txtParalooptics.Text <> "" Then tsTarget.WriteLine "PARALOOPTICS = " & Val(txtParalooptics.Text) - If txtHelpertics.Text <> "" Then tsTarget.WriteLine "HELPERTICS = " & Val(txtHelpertics.Text) - If txtGameovertics.Text <> "" Then tsTarget.WriteLine "GAMEOVERTICS = " & Val(txtGameovertics.Text) - If txtTitleScrollSpeed.Text <> "" Then tsTarget.WriteLine "TITLESCROLLSPEED = " & Val(txtTitleScrollSpeed.Text) - If chkLoopTitle.Value = 1 Then tsTarget.WriteLine "LOOPTITLE = " & chkLoopTitle.Value - If chkDisableSpeedAdjust.Value = 1 Then tsTarget.WriteLine "DISABLESPEEDADJUST = " & chkDisableSpeedAdjust.Value - - flags = 0 - For i = 0 To 2 - If chkReset(i).Value = 1 Then - flags = flags + Val(chkReset(i).Tag) - End If - Next - - If flags > 0 Then tsTarget.WriteLine "RESETDATA = " & flags - - tsTarget.Close - Set myFSOTarget = Nothing - - FileCopy SOCTemp, SOCFile - - Kill SOCTemp - - MsgBox "Settings Saved." -End Sub - diff --git a/tools/SOCEdit/frmMaincfg.frx b/tools/SOCEdit/frmMaincfg.frx deleted file mode 100644 index 2ae367330..000000000 Binary files a/tools/SOCEdit/frmMaincfg.frx and /dev/null differ diff --git a/tools/SOCEdit/frmSoundEdit.frm b/tools/SOCEdit/frmSoundEdit.frm deleted file mode 100644 index c91d84ed8..000000000 --- a/tools/SOCEdit/frmSoundEdit.frm +++ /dev/null @@ -1,485 +0,0 @@ -VERSION 5.00 -Begin VB.Form frmSoundEdit - Caption = "Sound Edit" - ClientHeight = 4995 - ClientLeft = 60 - ClientTop = 345 - ClientWidth = 6180 - Icon = "frmSoundEdit.frx":0000 - LinkTopic = "Form1" - MaxButton = 0 'False - ScaleHeight = 4995 - ScaleWidth = 6180 - StartUpPosition = 3 'Windows Default - Begin VB.CommandButton cmdDelete - Caption = "&Delete sound from SOC" - Height = 495 - Left = 5040 - Style = 1 'Graphical - TabIndex = 13 - Top = 4320 - Width = 1095 - End - Begin VB.CommandButton cmdSave - Caption = "&Save" - Height = 495 - Left = 3840 - TabIndex = 6 - Top = 4320 - Width = 1095 - End - Begin VB.CommandButton cmdReload - Caption = "&Load Code Default" - Height = 495 - Left = 2640 - Style = 1 'Graphical - TabIndex = 5 - Top = 4320 - Width = 1095 - End - Begin VB.Frame frmSpecial - Caption = "Special Properties" - Height = 3375 - Left = 2640 - TabIndex = 4 - Top = 840 - Width = 3495 - Begin VB.CheckBox chkTotallySingle - Caption = "Make sure only one sound of this is playing at a time on any sound channel." - Height = 615 - Left = 120 - TabIndex = 12 - Tag = "1" - Top = 2640 - Width = 3255 - End - Begin VB.CheckBox chkEightEx - Caption = "Sound can be heard across 8x the distance" - Height = 375 - Left = 120 - TabIndex = 10 - Tag = "16" - Top = 2160 - Width = 2295 - End - Begin VB.CheckBox chkOutside - Caption = "Volume dependent on how close you are to outside" - Height = 375 - Left = 120 - TabIndex = 9 - Tag = "4" - Top = 360 - Width = 2295 - End - Begin VB.CheckBox chkFourEx - Caption = "Sound can be heard across 4x the distance" - Height = 375 - Left = 120 - TabIndex = 8 - Tag = "8" - Top = 1560 - Width = 2055 - End - Begin VB.CheckBox chkMultiple - Caption = "More than one of this sound can be played per object at a time (i.e., thunder)" - Height = 615 - Left = 120 - TabIndex = 7 - Tag = "2" - Top = 840 - Width = 2535 - End - Begin VB.Label Label1 - Caption = "Combine for 32x" - Height = 495 - Left = 2760 - TabIndex = 11 - Top = 1800 - Width = 615 - End - Begin VB.Line Line4 - X1 = 2400 - X2 = 2640 - Y1 = 2400 - Y2 = 2400 - End - Begin VB.Line Line2 - X1 = 2400 - X2 = 2640 - Y1 = 1800 - Y2 = 1800 - End - Begin VB.Line Line1 - X1 = 2640 - X2 = 2640 - Y1 = 2400 - Y2 = 1800 - End - End - Begin VB.ComboBox cmbPriority - Height = 315 - ItemData = "frmSoundEdit.frx":0442 - Left = 3360 - List = "frmSoundEdit.frx":0444 - TabIndex = 2 - Top = 120 - Width = 855 - End - Begin VB.CheckBox chkSingularity - Caption = "Only one can be played at a time per object." - Height = 255 - Left = 2640 - TabIndex = 1 - Top = 480 - Width = 3495 - End - Begin VB.ListBox lstSounds - Height = 4740 - Left = 120 - TabIndex = 0 - Top = 120 - Width = 2415 - End - Begin VB.Line Line3 - X1 = 0 - X2 = 720 - Y1 = 0 - Y2 = 0 - End - Begin VB.Label lblPriority - Alignment = 1 'Right Justify - Caption = "Priority:" - Height = 255 - Left = 2640 - TabIndex = 3 - Top = 120 - Width = 615 - End -End -Attribute VB_Name = "frmSoundEdit" -Attribute VB_GlobalNameSpace = False -Attribute VB_Creatable = False -Attribute VB_PredeclaredId = True -Attribute VB_Exposed = False -Option Explicit - -Private Sub cmdDelete_Click() - Call WriteSound(True) -End Sub - -Private Sub cmdReload_Click() - Call ClearForm - If InStr(lstSounds.List(lstSounds.ListIndex), "(free slot)") = 0 Then - Call LoadSoundInfo(lstSounds.ListIndex) - Else - MsgBox "Free slots do not have a code default." - End If -End Sub - -Private Sub cmdSave_Click() - Call WriteSound(False) -End Sub - -Private Sub Form_Load() - Call Reload -End Sub - -Private Sub ClearForm() - cmbPriority.Text = "" - chkSingularity.Value = 0 - chkOutside.Value = 0 - chkMultiple.Value = 0 - chkFourEx.Value = 0 - chkEightEx.Value = 0 - chkTotallySingle.Value = 0 -End Sub - -Private Sub Reload() - Call ClearForm - Call LoadCode - lstSounds.ListIndex = 0 -End Sub - -Private Sub LoadCode() - Dim myFSO As New Scripting.FileSystemObject - Dim ts As TextStream - Dim line As String - Dim number As Integer - Dim startclip As Integer, endclip As Integer - Dim addstring As String - Dim i As Integer, numfreeslots As Integer - - ChDir SourcePath - Set ts = myFSO.OpenTextFile("sounds.h", ForReading, False) - - Do While InStr(ts.ReadLine, "List of sounds (don't modify this comment!)") = 0 - Loop - - ts.SkipLine ' typedef enum - ts.SkipLine ' { - - line = ts.ReadLine - number = 0 - - lstSounds.Clear - - Do While InStr(line, "sfx_freeslot0") = 0 - startclip = InStr(line, "sfx_") - If InStr(line, "sfx_") <> 0 Then - endclip = InStr(line, ",") - line = Mid(line, startclip, endclip - startclip) - addstring = number & " - " & line - lstSounds.AddItem addstring - number = number + 1 - End If - line = ts.ReadLine - Loop - - ts.Close - Set myFSO = Nothing - -'Populate the free slots! - numfreeslots = 800 - - For i = 1 To numfreeslots - If i < 10 Then - addstring = number & " - " & "sfx_fre00" & i & " (free slot)" - ElseIf i < 100 Then - addstring = number & " - " & "sfx_fre0" & i & " (free slot)" - Else - addstring = number & " - " & "sfx_fre" & i & " (free slot)" - End If - lstSounds.AddItem addstring - number = number + 1 - Next - - For i = 0 To 127 - cmbPriority.AddItem i - Next -End Sub - -Private Sub lstSounds_Click() - Call ClearForm - If InStr(lstSounds.List(lstSounds.ListIndex), "(free slot)") = 0 Then - Call LoadSoundInfo(lstSounds.ListIndex) - End If - Call LoadSOCSoundInfo(lstSounds.ListIndex) -End Sub - -Private Sub LoadSOCSoundInfo(SoundNum As Integer) - Dim myFSO As New Scripting.FileSystemObject - Dim ts As TextStream - Dim line As String - Dim word As String - Dim word2 As String - - Set ts = myFSO.OpenTextFile(SOCFile, ForReading, False) - -SOCLoad: - Do While Not ts.AtEndOfStream - line = ts.ReadLine - - If Left(line, 1) = "#" Then GoTo SOCLoad - - If Left(line, 1) = vbCrLf Then GoTo SOCLoad - - If Len(line) < 1 Then GoTo SOCLoad - - word = FirstToken(line) - word2 = SecondToken(line) - - If UCase(word) = "SOUND" And Val(word2) = SoundNum Then - Do While Len(line) > 0 And Not ts.AtEndOfStream - line = ts.ReadLine - word = UCase(FirstToken(line)) - word2 = UCase(SecondTokenEqual(line)) - - If word = "SINGULAR" Then - If Val(word2) = 1 Then - chkSingularity.Value = 1 - Else - chkSingularity.Value = 0 - End If - ElseIf word = "PRIORITY" Then - cmbPriority.Text = Val(word2) - ElseIf word = "FLAGS" Then - ProcessSoundFlags (Val(word2)) - ElseIf Len(line) > 0 And Left(line, 1) <> "#" Then - MsgBox "Error in SOC!" & vbCrLf & "Unknown line: " & line - End If - Loop - Exit Do - End If - Loop - - ts.Close - Set myFSO = Nothing -End Sub - -Private Sub LoadSoundInfo(StateNum As Integer) - Dim myFSO As New Scripting.FileSystemObject - Dim ts As TextStream - Dim line As String - Dim number As Integer - Dim startclip As Integer, endclip As Integer - Dim token As String - Dim frame As Long - - ChDir SourcePath - Set ts = myFSO.OpenTextFile("sounds.c", ForReading, False) - - Do While InStr(ts.ReadLine, "S_sfx[0] needs to be a dummy for odd reasons.") = 0 - Loop - - number = 0 - - Do While number <> StateNum - Do While InStr(ts.ReadLine, """") = 0 - Loop - number = number + 1 - Loop - - Do While InStr(line, """") = 0 - line = ts.ReadLine - Loop - - startclip = InStr(line, """") + 1 - line = Mid(line, startclip, Len(line) - startclip) - endclip = InStr(line, """") - 1 - token = TrimComplete(Left(line, endclip)) - - 'txtName.Text = line - - startclip = InStr(line, ",") + 1 - line = Mid(line, startclip, Len(line) - startclip) - endclip = InStr(line, ",") - 1 - token = TrimComplete(Left(line, endclip)) - - If token = "true" Then - chkSingularity.Value = 1 - Else - chkSingularity.Value = 0 - End If - - startclip = InStr(line, ",") + 1 - line = Mid(line, startclip, Len(line) - startclip) - endclip = InStr(line, ",") - 1 - token = TrimComplete(Left(line, endclip)) - cmbPriority.Text = token - - startclip = InStr(line, ",") + 1 - line = Mid(line, startclip, Len(line) - startclip) - endclip = InStr(line, ",") - 1 - token = TrimComplete(Left(line, endclip)) - - ProcessSoundFlags (Val(token)) - - ts.Close - Set myFSO = Nothing -End Sub - -Private Sub ProcessSoundFlags(flags As Long) - - chkTotallySingle.Value = 0 - chkMultiple.Value = 0 - chkOutside.Value = 0 - chkFourEx.Value = 0 - chkEightEx.Value = 0 - - If flags = -1 Then - Exit Sub - End If - - If flags And 1 Then - chkTotallySingle.Value = 1 - End If - - If flags And 2 Then - chkMultiple.Value = 1 - End If - - If flags And 4 Then - chkOutside.Value = 1 - End If - - If flags And 8 Then - chkFourEx.Value = 1 - End If - - If flags And 16 Then - chkEightEx.Value = 1 - End If - -End Sub - -Private Sub WriteSound(Remove As Boolean) - Dim myFSOSource As New Scripting.FileSystemObject - Dim tsSource As TextStream - Dim myFSOTarget As New Scripting.FileSystemObject - Dim tsTarget As TextStream - Dim line As String - Dim word As String - Dim word2 As String - Dim flags As Long - Dim soundfound As Boolean - - soundfound = False - - Set tsSource = myFSOSource.OpenTextFile(SOCFile, ForReading, False) - Set tsTarget = myFSOTarget.OpenTextFile(SOCTemp, ForWriting, True) - - Do While Not tsSource.AtEndOfStream - line = tsSource.ReadLine - word = UCase(FirstToken(line)) - word2 = UCase(SecondToken(line)) - - 'If the current sound exists in the SOC, delete it. - If word = "SOUND" And Val(word2) = lstSounds.ListIndex Then - soundfound = True - Do While Len(TrimComplete(tsSource.ReadLine)) > 0 And Not (tsSource.AtEndOfStream) - Loop - Else - tsTarget.WriteLine line - End If - Loop - - tsSource.Close - Set myFSOSource = Nothing - - If Remove = False Then - If line <> "" Then tsTarget.WriteLine "" - - tsTarget.WriteLine "SOUND " & lstSounds.ListIndex - cmbPriority.Text = TrimComplete(cmbPriority.Text) - If cmbPriority.Text <> "" Then tsTarget.WriteLine "PRIORITY = " & Val(cmbPriority.Text) - If chkSingularity.Value = 1 Then tsTarget.WriteLine "SINGULAR = 1" - - flags = 0 - - If chkOutside.Value = 1 Then flags = flags + Val(chkOutside.Tag) - If chkMultiple.Value = 1 Then flags = flags + Val(chkMultiple.Tag) - If chkFourEx.Value = 1 Then flags = flags + Val(chkFourEx.Tag) - If chkEightEx.Value = 1 Then flags = flags + Val(chkEightEx.Tag) - If chkTotallySingle.Value = 1 Then flags = flags + Val(chkTotallySingle.Tag) - - If flags > 0 Then tsTarget.WriteLine "FLAGS = " & flags - End If - - tsTarget.Close - Set myFSOTarget = Nothing - - FileCopy SOCTemp, SOCFile - - Kill SOCTemp - - If Remove = True Then - If soundfound = True Then - MsgBox "Sound removed from SOC." - Else - MsgBox "Sound not found in SOC." - End If - Else - MsgBox "Sound Saved." - End If -End Sub - diff --git a/tools/SOCEdit/frmSoundEdit.frx b/tools/SOCEdit/frmSoundEdit.frx deleted file mode 100644 index 980538679..000000000 Binary files a/tools/SOCEdit/frmSoundEdit.frx and /dev/null differ diff --git a/tools/SOCEdit/frmStateEdit.frm b/tools/SOCEdit/frmStateEdit.frm deleted file mode 100644 index 4eca5a1bc..000000000 --- a/tools/SOCEdit/frmStateEdit.frm +++ /dev/null @@ -1,940 +0,0 @@ -VERSION 5.00 -Begin VB.Form frmStateEdit - Caption = "State Edit" - ClientHeight = 6750 - ClientLeft = 60 - ClientTop = 345 - ClientWidth = 8970 - Icon = "frmStateEdit.frx":0000 - LinkTopic = "Form1" - MaxButton = 0 'False - ScaleHeight = 6750 - ScaleWidth = 8970 - StartUpPosition = 3 'Windows Default - Begin VB.TextBox lblVar2Desc - Height = 495 - Left = 4440 - Locked = -1 'True - MultiLine = -1 'True - ScrollBars = 2 'Vertical - TabIndex = 25 - Top = 3000 - Width = 4455 - End - Begin VB.TextBox lblVar1Desc - Height = 495 - Left = 4440 - Locked = -1 'True - MultiLine = -1 'True - ScrollBars = 2 'Vertical - TabIndex = 24 - Top = 2400 - Width = 4455 - End - Begin VB.TextBox lblActionDesc - Height = 735 - Left = 4440 - Locked = -1 'True - MultiLine = -1 'True - ScrollBars = 2 'Vertical - TabIndex = 23 - Top = 1560 - Width = 4455 - End - Begin VB.ListBox lstThings - Height = 450 - ItemData = "frmStateEdit.frx":0442 - Left = 7440 - List = "frmStateEdit.frx":0444 - TabIndex = 22 - Top = 6120 - Visible = 0 'False - Width = 975 - End - Begin VB.TextBox txtFuncVar2 - Height = 285 - Left = 7200 - TabIndex = 19 - Top = 3600 - Width = 1215 - End - Begin VB.TextBox txtFuncVar1 - Height = 285 - Left = 5520 - TabIndex = 18 - Top = 3600 - Width = 1095 - End - Begin VB.CommandButton cmdCopy - Caption = "&Copy state to..." - Height = 495 - Left = 6120 - Style = 1 'Graphical - TabIndex = 17 - Top = 6120 - Width = 1095 - End - Begin VB.CommandButton cmdDelete - Caption = "&Delete State from SOC" - Height = 495 - Left = 6120 - Style = 1 'Graphical - TabIndex = 16 - Top = 5520 - Width = 1095 - End - Begin VB.CommandButton cmdReload - Caption = "&Load Code Default" - Height = 495 - Left = 4920 - Style = 1 'Graphical - TabIndex = 15 - Top = 5520 - Width = 1095 - End - Begin VB.CommandButton cmdSave - Caption = "&Save" - Height = 495 - Left = 7320 - TabIndex = 14 - Top = 5520 - Width = 1095 - End - Begin VB.ComboBox cmbTranslucency - Height = 315 - ItemData = "frmStateEdit.frx":0446 - Left = 6720 - List = "frmStateEdit.frx":045C - TabIndex = 12 - Top = 5040 - Width = 1695 - End - Begin VB.CheckBox chkFullbright - Caption = "Make sprite full-brightness (unaffected by lighting)" - Height = 495 - Left = 6240 - TabIndex = 11 - Top = 4440 - Width = 2175 - End - Begin VB.ComboBox cmbNextstate - Height = 315 - Left = 6120 - TabIndex = 9 - Top = 3960 - Width = 2295 - End - Begin VB.ComboBox cmbAction - Height = 315 - Left = 6000 - TabIndex = 7 - Top = 1200 - Width = 2295 - End - Begin VB.TextBox txtTics - Height = 285 - Left = 7800 - TabIndex = 5 - Top = 720 - Width = 495 - End - Begin VB.TextBox txtFrame - Height = 285 - Left = 5880 - MaxLength = 2 - TabIndex = 3 - Top = 720 - Width = 495 - End - Begin VB.ComboBox cmbSprite - Height = 315 - Left = 5880 - TabIndex = 1 - Top = 120 - Width = 2415 - End - Begin VB.ListBox lstStates - Height = 6495 - Left = 120 - TabIndex = 0 - Top = 120 - Width = 4215 - End - Begin VB.Label lblFuncVar2 - Alignment = 1 'Right Justify - Caption = "Var2:" - Height = 255 - Left = 6600 - TabIndex = 21 - Top = 3600 - Width = 495 - End - Begin VB.Label lblFuncVar1 - Alignment = 1 'Right Justify - Caption = "Var1:" - Height = 255 - Left = 4920 - TabIndex = 20 - Top = 3600 - Width = 495 - End - Begin VB.Label lblTranslucency - Alignment = 1 'Right Justify - Caption = "Translucency:" - Height = 255 - Left = 5520 - TabIndex = 13 - Top = 5040 - Width = 1095 - End - Begin VB.Label lblNextstate - Alignment = 1 'Right Justify - Caption = "Next State:" - Height = 255 - Left = 5160 - TabIndex = 10 - Top = 3960 - Width = 855 - End - Begin VB.Label lblAction - Alignment = 1 'Right Justify - Caption = "Function to Call:" - Height = 375 - Left = 5040 - TabIndex = 8 - Top = 1080 - Width = 855 - End - Begin VB.Label lblTics - Alignment = 1 'Right Justify - Caption = "Tics (-1 for infinite duration):" - Height = 495 - Left = 6480 - TabIndex = 6 - Top = 600 - Width = 1215 - End - Begin VB.Label lblFrame - Alignment = 1 'Right Justify - Caption = "Frame:" - Height = 255 - Left = 5160 - TabIndex = 4 - Top = 720 - Width = 615 - End - Begin VB.Label lblSprite - Alignment = 1 'Right Justify - Caption = "Sprite:" - Height = 255 - Left = 5160 - TabIndex = 2 - Top = 120 - Width = 615 - End -End -Attribute VB_Name = "frmStateEdit" -Attribute VB_GlobalNameSpace = False -Attribute VB_Creatable = False -Attribute VB_PredeclaredId = True -Attribute VB_Exposed = False -Option Explicit - -Private Sub cmbAction_Click() - Dim myFSO As New Scripting.FileSystemObject - Dim ts As TextStream - Dim line As String - Dim index As Integer - Dim ActionName As String - - ActionName = cmbAction.List(cmbAction.ListIndex) - - If cmbAction.ListIndex = 0 Then - lblActionDesc.Text = "" - lblVar1Desc.Text = "" - lblVar2Desc.Text = "" - Exit Sub - End If - - ChDir SourcePath - Set ts = myFSO.OpenTextFile("p_enemy.c", ForReading, False) - - Do While Not ts.AtEndOfStream - line = ts.ReadLine - - If Mid(line, 4, 9) = "Function:" And InStr(line, ActionName) > 0 Then - ts.ReadLine ' // - line = ts.ReadLine ' // Description: - index = InStr(line, ":") - lblActionDesc.Text = Mid(line, index + 2, Len(line) - (index + 1)) - - ts.ReadLine ' // - line = ts.ReadLine ' // var1 = - If InStr(line, "var1:") Then - lblVar1Desc.Text = Mid(line, 4, Len(line) - 3) - line = ts.ReadLine - Do While Left(line, 7) <> "// var2" - lblVar1Desc.Text = lblVar1Desc.Text & vbCrLf & TrimComplete(Mid(line, 4, Len(line) - 3)) - line = ts.ReadLine - Loop - Else - lblVar1Desc.Text = Mid(line, 4, Len(line) - 3) - End If - - If Left(line, 7) <> "// var2" Then - line = ts.ReadLine ' // var2 = - End If - - If InStr(line, "var2:") Then - lblVar2Desc.Text = Mid(line, 4, Len(line) - 3) - line = ts.ReadLine - Do While Len(line) > 4 - lblVar2Desc.Text = lblVar2Desc.Text & vbCrLf & TrimComplete(Mid(line, 4, Len(line) - 3)) - line = ts.ReadLine - Loop - Else - lblVar2Desc.Text = Mid(line, 4, Len(line) - 3) - End If - End If - Loop - - ts.Close - Set myFSO = Nothing -End Sub - -Private Sub cmdCopy_Click() - Dim Response As String - - Response$ = InputBox("Copy state to #:", "Copy State") - - If Response = "" Then Exit Sub - - Response = TrimComplete(Response) - - Call WriteState(False, Val(Response)) - - MsgBox "State copied to #" & Val(Response) -End Sub - -Private Sub cmdDelete_Click() - Call WriteState(True, lstStates.ListIndex) -End Sub - -Private Sub cmdReload_Click() - Call ClearForm - - If InStr(lstStates.List(lstStates.ListIndex), "S_FREESLOT") = 0 Then - LoadStateInfo (lstStates.ListIndex) - Else - MsgBox "Free slots do not have a code default." - End If -End Sub - -Private Sub cmdSave_Click() - If TrimComplete(txtFrame.Text) = "" And (chkFullbright.Value = 1 Or cmbTranslucency.ListIndex > 0) Then - MsgBox "ERROR: Frame field required for fullbright/translucency." - Exit Sub - End If - Call WriteState(False, lstStates.ListIndex) -End Sub - -Private Sub Form_Load() - Call Reload - lstStates.ListIndex = 0 -End Sub - -Private Sub ClearForm() - cmbNextstate.Text = "" - cmbSprite.Text = "" - txtFrame.Text = "" - cmbAction.Text = "" - txtFuncVar1.Text = "" - txtFuncVar2.Text = "" - lblActionDesc.Text = "" - lblVar1Desc.Text = "" - lblVar2Desc.Text = "" - chkFullbright.Value = False - cmbTranslucency.ListIndex = 0 -End Sub - -Private Sub Reload() - LoadStates - LoadSprites - LoadActions -End Sub - -Private Sub LoadStates() - Dim myFSO As New Scripting.FileSystemObject - Dim ts As TextStream - Dim line As String - Dim number As Integer - Dim startclip As Integer, endclip As Integer - Dim addstring As String - Dim numfreeslots As Integer, i As Integer - - ChDir SourcePath - Set ts = myFSO.OpenTextFile("info.h", ForReading, False) - - Do While InStr(ts.ReadLine, "Object states (don't modify this comment!)") = 0 - Loop - - ts.SkipLine ' typedef enum - ts.SkipLine ' { - - line = ts.ReadLine - number = 0 - - lstStates.Clear - - Do While InStr(line, "S_FIRSTFREESLOT") = 0 - startclip = InStr(line, "S_") - If InStr(line, "S_") <> 0 Then - endclip = InStr(line, ",") - line = Mid(line, startclip, endclip - startclip) - addstring = number & " - " & line - lstStates.AddItem addstring - cmbNextstate.AddItem addstring - number = number + 1 - End If - line = ts.ReadLine - Loop - - ts.Close - - 'Populate the free slots! - Set ts = myFSO.OpenTextFile("info.h", ForReading, False) - - line = ts.ReadLine - Do While InStr(line, "#define NUMMOBJFREESLOTS") = 0 - line = ts.ReadLine - Loop - - startclip = InStr(line, "SLOTS ") + 6 - numfreeslots = Val(Mid(line, startclip, Len(line) - startclip + 1)) * 6 - - For i = 1 To numfreeslots - addstring = number & " - " & "S_FREESLOT" & i - lstStates.AddItem addstring - cmbNextstate.AddItem addstring - number = number + 1 - Next - - ts.Close - Set myFSO = Nothing -End Sub - -Private Sub LoadSprites() - Dim myFSO As New Scripting.FileSystemObject - Dim ts As TextStream - Dim line As String - Dim number As Integer - Dim startclip As Integer, endclip As Integer - Dim addstring As String - Dim numfreeslots As Integer, i As Integer - - ChDir SourcePath - Set ts = myFSO.OpenTextFile("info.h", ForReading, False) - - Do While InStr(ts.ReadLine, "Hey, moron! If you change this table, don't forget about") = 0 - Loop - - ts.SkipLine ' typedef enum - ts.SkipLine ' { - - line = ts.ReadLine - number = 0 - - cmbSprite.Clear - - Do While InStr(line, "SPR_FIRSTFREESLOT") = 0 - startclip = InStr(line, "SPR_") - If InStr(line, "SPR_") <> 0 Then - endclip = InStr(line, ",") - line = Mid(line, startclip, endclip - startclip) - addstring = number & " - " & line - cmbSprite.AddItem addstring - number = number + 1 - End If - line = ts.ReadLine - Loop - - ts.Close - - 'Populate the free slots! - Set ts = myFSO.OpenTextFile("info.h", ForReading, False) - - line = ts.ReadLine - Do While InStr(line, "#define NUMMOBJFREESLOTS") = 0 - line = ts.ReadLine - Loop - - startclip = InStr(line, "SLOTS ") + 6 - numfreeslots = Val(Mid(line, startclip, Len(line) - startclip + 1)) - - For i = 1 To numfreeslots - If i < 10 Then - addstring = number & " - " & "SPR_F00" & i & " (Free slot)" - ElseIf i < 100 Then - addstring = number & " - " & "SPR_F0" & i & " (Free slot)" - Else - addstring = number & " - " & "SPR_F" & i & " (Free slot)" - End If - - cmbSprite.AddItem addstring - number = number + 1 - Next - - ts.Close - - Set myFSO = Nothing -End Sub - -Private Sub LoadActions() - Dim myFSO As New Scripting.FileSystemObject - Dim ts As TextStream - Dim line As String - Dim number As Integer - Dim startclip As Integer, endclip As Integer - Dim addstring As String - - ChDir SourcePath - Set ts = myFSO.OpenTextFile("dehacked.c", ForReading, False) - - Do While InStr(ts.ReadLine, "actionpointer_t actionpointers[]") = 0 - Loop - - ts.SkipLine ' { - - line = ts.ReadLine - number = 0 - - cmbAction.Clear - - cmbAction.AddItem "None" - - Do While InStr(line, "NULL") = 0 - startclip = InStr(line, "A_") - If InStr(line, "A_") <> 0 Then - endclip = InStr(line, "}") - line = Mid(line, startclip, endclip - startclip) - cmbAction.AddItem line - number = number + 1 - End If - line = ts.ReadLine - Loop - - ts.Close - Set myFSO = Nothing -End Sub - -Private Sub lstStates_Click() - Call ClearForm - - If InStr(lstStates.List(lstStates.ListIndex), "S_FREESLOT") = 0 Then - LoadStateInfo (lstStates.ListIndex) - End If - - LoadSOCStateInfo (lstStates.ListIndex) -End Sub - -Private Sub LoadSOCStateInfo(StateNum As Integer) - Dim myFSO As New Scripting.FileSystemObject - Dim ts As TextStream - Dim line As String - Dim word As String - Dim word2 As String - Dim frameNum As Long - - Set ts = myFSO.OpenTextFile(SOCFile, ForReading, False) - -SOCLoad: - Do While Not ts.AtEndOfStream - line = ts.ReadLine - - If Left(line, 1) = "#" Then GoTo SOCLoad - - If Left(line, 1) = vbCrLf Then GoTo SOCLoad - - If Len(line) < 1 Then GoTo SOCLoad - - word = FirstToken(line) - word2 = SecondToken(line) - - If UCase(word) = "FRAME" And Val(word2) = StateNum Then - Do While Len(line) > 0 And Not ts.AtEndOfStream - line = ts.ReadLine - word = UCase(FirstToken(line)) - word2 = UCase(SecondTokenEqual(line)) - - If word = "SPRITENUMBER" Then - cmbSprite.ListIndex = Val(word2) - ElseIf word = "SPRITESUBNUMBER" Then - frameNum = Val(word2) - - If frameNum >= 327680 Then ' 5 << 16 - cmbTranslucency.ListIndex = 5 - frameNum = frameNum And Not 327680 - ElseIf frameNum >= 262144 Then ' 4 << 16 - cmbTranslucency.ListIndex = 4 - frameNum = frameNum And Not 262144 - ElseIf frameNum >= 196608 Then ' 3 << 16 - cmbTranslucency.ListIndex = 3 - frameNum = frameNum And Not 196608 - ElseIf frameNum >= 131072 Then ' 2 << 16 - cmbTranslucency.ListIndex = 2 - frameNum = frameNum And Not 131072 - ElseIf frameNum >= 65536 Then ' 1 << 16 - cmbTranslucency.ListIndex = 1 - frameNum = frameNum And Not 65536 - End If - - If frameNum >= 32768 Then - chkFullbright.Value = 1 - frameNum = frameNum And Not 32768 - Else - chkFullbright.Value = 0 - End If - - txtFrame.Text = frameNum - ElseIf word = "DURATION" Then - txtTics.Text = Val(word2) - ElseIf word = "NEXT" Then - cmbNextstate.ListIndex = Val(word2) - ElseIf word = "ACTION" Then - Call FindComboIndex(cmbAction, UCase(SecondToken(line))) - ElseIf word = "VAR1" Then - txtFuncVar1.Text = Val(word2) - ElseIf word = "VAR2" Then - txtFuncVar2.Text = Val(word2) - ElseIf Len(line) > 0 And Left(line, 1) <> "#" Then - MsgBox "Error in SOC!" & vbCrLf & "Unknown line: " & line - End If - Loop - Exit Do - End If - Loop - - ts.Close - Set myFSO = Nothing -End Sub - -Private Sub LoadStateInfo(StateNum As Integer) - Dim myFSO As New Scripting.FileSystemObject - Dim ts As TextStream - Dim line As String - Dim number As Integer - Dim startclip As Integer, endclip As Integer - Dim token As String - Dim frame As Long - Dim templine As String - - ChDir SourcePath - Set ts = myFSO.OpenTextFile("info.c", ForReading, False) - - Do While InStr(ts.ReadLine, "Keep this comment directly above S_NULL") = 0 - Loop - - number = 0 - - Do While number <> StateNum - Do While InStr(ts.ReadLine, "SPR_") = 0 - Loop - number = number + 1 - Loop - - Do While InStr(line, "SPR_") = 0 - line = ts.ReadLine - Loop - - startclip = InStr(line, "SPR_") - line = Mid(line, startclip, Len(line) - startclip) - endclip = InStr(line, ",") - 1 - token = Left(line, endclip) - Call FindComboIndex(cmbSprite, token) - - startclip = InStr(line, ",") + 1 - line = TrimComplete(Mid(line, startclip, Len(line) - startclip)) - endclip = InStr(line, ",") - 1 - frame = Val(Left(line, endclip)) - - If frame >= 32768 Then - chkFullbright.Value = 1 - frame = frame - 32768 - Else - chkFullbright.Value = 0 - End If - - txtFrame.Text = frame - - cmbTranslucency.ListIndex = 0 - - startclip = InStr(line, ",") + 1 - line = TrimComplete(Mid(line, startclip, Len(line) - startclip)) - endclip = InStr(line, ",") - 1 - txtTics.Text = Val(Left(line, endclip)) - - startclip = InStr(line, "{") + 1 - line = TrimComplete(Mid(line, startclip, Len(line) - startclip)) - endclip = InStr(line, "}") - 1 - cmbAction.Text = TrimComplete(Left(line, endclip)) - If cmbAction.Text = "NULL" Then cmbAction.Text = "None" - - startclip = InStr(line, ",") + 1 - line = TrimComplete(Mid(line, startclip, Len(line) - startclip)) - endclip = InStr(line, ",") - 1 - templine = Left(line, endclip) - - templine = TrimComplete(templine) - 'Check for *FRACUNIT values - endclip = InStr(templine, "*FRACUNIT") - If endclip <> 0 Then - templine = Left(templine, endclip - 1) - templine = Val(templine) * 65536 - End If - 'Check for crazy-odd MT_ usage - endclip = InStr(templine, "MT_") - If endclip <> 0 Then - templine = FindThingNum(templine) & " - " & templine - End If - 'Check for crazy-odd pw_ usage - endclip = InStr(templine, "pw_") - If endclip <> 0 Then - templine = FindPowerNum(templine) & " - " & templine - End If - txtFuncVar1.Text = templine - - startclip = InStr(line, ",") + 1 - line = TrimComplete(Mid(line, startclip, Len(line) - startclip)) - endclip = InStr(line, ",") - 1 - templine = Left(line, endclip) - - templine = TrimComplete(templine) - 'Check for *FRACUNIT values - endclip = InStr(templine, "*FRACUNIT") - If endclip <> 0 Then - templine = Left(templine, endclip - 1) - templine = Val(templine) * 65536 - End If - 'Check for crazy-odd MT_ usage - endclip = InStr(templine, "MT_") - If endclip <> 0 Then - templine = FindThingNum(templine) & " - " & templine - End If - 'Check for crazy-odd pw_ usage - endclip = InStr(templine, "pw_") - If endclip <> 0 Then - templine = FindPowerNum(templine) & " - " & templine - End If - txtFuncVar2.Text = templine - - startclip = InStr(line, ",") + 1 - line = TrimComplete(Mid(line, startclip, Len(line) - startclip)) - endclip = InStr(line, "}") - 1 - Call FindComboIndex(cmbNextstate, TrimComplete(Left(line, endclip))) - - ts.Close - Set myFSO = Nothing -End Sub - -Private Sub FindComboIndex(ByRef Box As ComboBox, line As String) - Dim i As Integer - - For i = 0 To Box.ListCount - If InStr(UCase(Box.List(i)), UCase(line)) Then - Box.ListIndex = i - Exit For - End If - Next -End Sub - -Private Sub WriteState(Remove As Boolean, num As Integer) - Dim myFSOSource As New Scripting.FileSystemObject - Dim tsSource As TextStream - Dim myFSOTarget As New Scripting.FileSystemObject - Dim tsTarget As TextStream - Dim line As String - Dim word As String - Dim word2 As String - Dim flags As Long - Dim statefound As Boolean - - statefound = False - - Set tsSource = myFSOSource.OpenTextFile(SOCFile, ForReading, False) - Set tsTarget = myFSOTarget.OpenTextFile(SOCTemp, ForWriting, True) - - Do While Not tsSource.AtEndOfStream - line = tsSource.ReadLine - word = UCase(FirstToken(line)) - word2 = UCase(SecondToken(line)) - - 'If the current sound exists in the SOC, delete it. - If word = "FRAME" And Val(word2) = num Then - statefound = True - Do While Len(TrimComplete(tsSource.ReadLine)) > 0 And Not (tsSource.AtEndOfStream) - Loop - Else - tsTarget.WriteLine line - End If - Loop - - tsSource.Close - Set myFSOSource = Nothing - - If Remove = False Then - If line <> "" Then tsTarget.WriteLine "" - - tsTarget.WriteLine "FRAME " & num - cmbSprite.Text = TrimComplete(cmbSprite.Text) - txtFrame.Text = TrimComplete(txtFrame.Text) - txtTics.Text = TrimComplete(txtTics.Text) - cmbAction.Text = TrimComplete(cmbAction.Text) - txtFuncVar1.Text = TrimComplete(txtFuncVar1.Text) - txtFuncVar2.Text = TrimComplete(txtFuncVar2.Text) - cmbNextstate.Text = TrimComplete(cmbNextstate.Text) - cmbTranslucency.Text = TrimComplete(cmbTranslucency.Text) - - If cmbSprite.Text <> "" Then tsTarget.WriteLine "SPRITENUMBER = " & cmbSprite.ListIndex - - flags = Val(txtFrame.Text) - If chkFullbright.Value = 1 Then flags = flags + 32768 - - ' Grrr VB doesn't have bitshifts!! - If cmbTranslucency.Text <> "" Then - flags = flags + cmbTranslucency.ListIndex * 65536 - End If - - If txtFrame.Text <> "" Then tsTarget.WriteLine "SPRITESUBNUMBER = " & flags - If txtTics.Text <> "" Then tsTarget.WriteLine "DURATION = " & Val(txtTics.Text) - If cmbNextstate.Text <> "" Then tsTarget.WriteLine "NEXT = " & cmbNextstate.ListIndex - If cmbAction.Text <> "" Then tsTarget.WriteLine "ACTION " & cmbAction.Text - If txtFuncVar1.Text <> "" Then tsTarget.WriteLine "VAR1 = " & Val(txtFuncVar1.Text) - If txtFuncVar2.Text <> "" Then tsTarget.WriteLine "VAR2 = " & Val(txtFuncVar2.Text) - End If - - tsTarget.Close - Set myFSOTarget = Nothing - - FileCopy SOCTemp, SOCFile - - Kill SOCTemp - - If Remove = True Then - If statefound = True Then - MsgBox "State removed from SOC." - Else - MsgBox "State not found in SOC." - End If - Else - MsgBox "State Saved." - End If -End Sub - -Private Sub LoadThings() - Dim myFSO As New Scripting.FileSystemObject - Dim ts As TextStream - Dim line As String - Dim number As Integer - Dim startclip As Integer, endclip As Integer - Dim numfreeslots As Integer, i As Integer - - ChDir SourcePath - Set ts = myFSO.OpenTextFile("info.h", ForReading, False) - - Do While InStr(ts.ReadLine, "Little flag for SOC editor (don't change this comment!)") = 0 - Loop - - ts.SkipLine ' typedef enum - ts.SkipLine ' { - - line = ts.ReadLine - number = 0 - - lstThings.Clear - - Do While InStr(line, "MT_FIRSTFREESLOT") = 0 - startclip = InStr(line, "MT_") - If InStr(line, "MT_") <> 0 Then - endclip = InStr(line, ",") - line = Mid(line, startclip, endclip - startclip) - lstThings.AddItem number & " - " & line - number = number + 1 - End If - line = ts.ReadLine - Loop - - ts.Close - - 'Populate the free slots! - Set ts = myFSO.OpenTextFile("info.h", ForReading, False) - - line = ts.ReadLine - Do While InStr(line, "#define NUMMOBJFREESLOTS") = 0 - line = ts.ReadLine - Loop - - startclip = InStr(line, "SLOTS ") + 6 - numfreeslots = Val(Mid(line, startclip, Len(line) - startclip + 1)) - - For i = 1 To numfreeslots - lstThings.AddItem number & " - " & "MT_FREESLOT" & i - number = number + 1 - Next - - ts.Close - Set myFSO = Nothing -End Sub - -Private Function FindThingNum(ThingName As String) As Integer - Dim i As Integer - Dim temp As String - Dim startpoint As Integer - Dim endpoint As Integer - - lstThings.Clear - LoadThings - - For i = 0 To lstThings.ListCount - 1 - temp = lstThings.List(i) - startpoint = InStr(temp, "-") + 2 - endpoint = Len(temp) - startpoint + 1 - temp = Mid(temp, startpoint, endpoint) - If temp = ThingName Then - FindThingNum = Val(lstThings.List(i)) - Exit For - End If - Next -End Function - -Private Function FindPowerNum(PowerName As String) As Integer - Dim myFSO As New Scripting.FileSystemObject - Dim ts As TextStream - Dim line As String - Dim number As Integer - Dim startclip As Integer - - ChDir SourcePath - Set ts = myFSO.OpenTextFile("d_player.h", ForReading, False) - - Do While InStr(ts.ReadLine, "Player powers. (don't edit this comment)") = 0 - Loop - - ts.SkipLine ' typedef enum - ts.SkipLine ' { - - line = ts.ReadLine - number = 0 - - Do While InStr(line, "NUMPOWERS") = 0 - startclip = InStr(line, PowerName) - If startclip <> 0 Then - FindPowerNum = number - Exit Do - End If - number = number + 1 - line = ts.ReadLine - Loop - - ts.Close - Set myFSO = Nothing -End Function diff --git a/tools/SOCEdit/frmStateEdit.frx b/tools/SOCEdit/frmStateEdit.frx deleted file mode 100644 index 8069c37e0..000000000 Binary files a/tools/SOCEdit/frmStateEdit.frx and /dev/null differ diff --git a/tools/SOCEdit/frmUnlockablesEdit.frm b/tools/SOCEdit/frmUnlockablesEdit.frm deleted file mode 100644 index f43209a78..000000000 --- a/tools/SOCEdit/frmUnlockablesEdit.frm +++ /dev/null @@ -1,391 +0,0 @@ -VERSION 5.00 -Begin VB.Form frmUnlockablesEdit - Caption = "Unlockables Edit" - ClientHeight = 3675 - ClientLeft = 60 - ClientTop = 345 - ClientWidth = 8130 - Icon = "frmUnlockablesEdit.frx":0000 - LinkTopic = "Form1" - MaxButton = 0 'False - ScaleHeight = 3675 - ScaleWidth = 8130 - StartUpPosition = 3 'Windows Default - Begin VB.CheckBox chkGrade - Caption = "Must have beaten Ultimate" - Height = 255 - Index = 4 - Left = 5400 - TabIndex = 20 - Tag = "1024" - Top = 2160 - Width = 2655 - End - Begin VB.CheckBox chkGrade - Caption = "Must have beaten Very Hard" - Height = 255 - Index = 3 - Left = 5400 - TabIndex = 19 - Tag = "128" - Top = 1800 - Width = 2655 - End - Begin VB.CheckBox chkGrade - Caption = "Must have all emblems" - Height = 255 - Index = 2 - Left = 5400 - TabIndex = 18 - Tag = "16" - Top = 1440 - Width = 2055 - End - Begin VB.CheckBox chkGrade - Caption = "Must have gotten all 7 emeralds" - Height = 255 - Index = 1 - Left = 5400 - TabIndex = 17 - Tag = "8" - Top = 1080 - Width = 2655 - End - Begin VB.CheckBox chkGrade - Caption = "Game must be completed" - Height = 255 - Index = 0 - Left = 5400 - TabIndex = 16 - Tag = "1" - Top = 720 - Width = 2175 - End - Begin VB.TextBox txtVar - Height = 285 - Left = 4320 - TabIndex = 14 - Top = 2640 - Width = 615 - End - Begin VB.ComboBox cmbType - Height = 315 - ItemData = "frmUnlockablesEdit.frx":0442 - Left = 3360 - List = "frmUnlockablesEdit.frx":044C - TabIndex = 12 - Top = 2160 - Width = 1575 - End - Begin VB.TextBox txtNeededTime - Height = 285 - Left = 4080 - TabIndex = 10 - Top = 1680 - Width = 855 - End - Begin VB.TextBox txtNeededEmblems - Height = 285 - Left = 4440 - TabIndex = 9 - Top = 1200 - Width = 495 - End - Begin VB.TextBox txtObjective - Height = 285 - Left = 3240 - TabIndex = 7 - Top = 720 - Width = 1695 - End - Begin VB.TextBox txtName - Height = 285 - Left = 3240 - TabIndex = 5 - Top = 240 - Width = 1695 - End - Begin VB.CommandButton cmdDelete - Caption = "&Delete from SOC" - Height = 375 - Left = 3480 - TabIndex = 3 - Top = 3120 - Width = 1575 - End - Begin VB.CommandButton cmdSave - Caption = "&Save Changes" - Height = 375 - Left = 1800 - TabIndex = 2 - Top = 3120 - Width = 1575 - End - Begin VB.ListBox lstUnlockables - Height = 2985 - ItemData = "frmUnlockablesEdit.frx":046A - Left = 120 - List = "frmUnlockablesEdit.frx":049B - TabIndex = 0 - Top = 480 - Width = 1215 - End - Begin VB.Label lblNote - Caption = "Note: All requirements are combinable." - Height = 495 - Left = 6000 - TabIndex = 22 - Top = 2760 - Width = 1695 - End - Begin VB.Label lblOtherReqs - Caption = "Other Requirements:" - Height = 255 - Left = 5400 - TabIndex = 21 - Top = 360 - Width = 1935 - End - Begin VB.Label lblVar - Alignment = 1 'Right Justify - Caption = "Map # to warp to:" - Height = 255 - Left = 2880 - TabIndex = 15 - Top = 2640 - Width = 1335 - End - Begin VB.Label lblType - Alignment = 1 'Right Justify - Caption = "Type of Unlockable:" - Height = 255 - Left = 1800 - TabIndex = 13 - Top = 2160 - Width = 1455 - End - Begin VB.Label lblNeededTime - Alignment = 1 'Right Justify - Caption = "Needed time on Time Attack rank (in seconds):" - Height = 375 - Left = 1440 - TabIndex = 11 - Top = 1560 - Width = 2535 - End - Begin VB.Label lblNeededEmblems - Alignment = 1 'Right Justify - Caption = "# of Emblems Needed:" - Height = 255 - Left = 2640 - TabIndex = 8 - Top = 1200 - Width = 1695 - End - Begin VB.Label lblObjective - Alignment = 1 'Right Justify - Caption = "Objective:" - Height = 255 - Left = 2400 - TabIndex = 6 - Top = 720 - Width = 735 - End - Begin VB.Label lblName - Alignment = 1 'Right Justify - Caption = "Name:" - Height = 255 - Left = 2640 - TabIndex = 4 - Top = 240 - Width = 495 - End - Begin VB.Label lblHUDItems - Caption = "Unlockables:" - Height = 255 - Left = 120 - TabIndex = 1 - Top = 240 - Width = 975 - End -End -Attribute VB_Name = "frmUnlockablesEdit" -Attribute VB_GlobalNameSpace = False -Attribute VB_Creatable = False -Attribute VB_PredeclaredId = True -Attribute VB_Exposed = False -Option Explicit - -Private Sub cmdDelete_Click() - Call WriteUnlockableItem(True) -End Sub - -Private Sub cmdSave_Click() - Call WriteUnlockableItem(False) -End Sub - -Private Sub Form_Load() - Call Reload -End Sub - -Private Sub Reload() - txtName.Text = "" - txtObjective.Text = "" - txtNeededEmblems.Text = "" - txtNeededTime.Text = "" - cmbType.Text = "" - txtVar.Text = "" - - Dim i As Integer - - For i = 0 To chkGrade.Count - 1 - chkGrade(i).Value = 0 - Next i - - lstUnlockables.ListIndex = 0 -End Sub - -Private Sub lstUnlockables_Click() - Call ReadSOC(lstUnlockables.ListIndex + 1) -End Sub - -Private Sub ReadSOC(UnlockableNum As Integer) - Dim myFSO As New Scripting.FileSystemObject - Dim ts As TextStream - Dim line As String - Dim word As String - Dim word2 As String - - Set ts = myFSO.OpenTextFile(SOCFile, ForReading, False) - -SOCLoad: - Do While Not ts.AtEndOfStream - line = ts.ReadLine - - If Left(line, 1) = "#" Then GoTo SOCLoad - - If Left(line, 1) = vbCrLf Then GoTo SOCLoad - - If Len(line) < 1 Then GoTo SOCLoad - - word = FirstToken(line) - word2 = SecondToken(line) - - If UCase(word) = "UNLOCKABLE" And Val(word2) = UnlockableNum Then - Do While Len(line) > 0 And Not ts.AtEndOfStream - line = ts.ReadLine - word = UCase(FirstToken(line)) - word2 = UCase(SecondTokenEqual(line)) - - If word = "NAME" Then - txtName.Text = word2 - ElseIf word = "OBJECTIVE" Then - txtObjective.Text = word2 - ElseIf word = "NEEDEDEMBLEMS" Then - txtNeededEmblems.Text = Val(word2) - ElseIf word = "NEEDEDTIME" Then - txtNeededTime.Text = Val(word2) - ElseIf word = "TYPE" Then - cmbType.ListIndex = Val(word2) - ElseIf word = "VAR" Then - txtVar.Text = Val(word2) - ElseIf word = "NEEDEDGRADE" Then - Dim i As Integer - - For i = 0 To chkGrade.Count - 1 - If Val(word2) And chkGrade(i).Tag Then - chkGrade(i).Tag = True - End If - Next i - ElseIf Len(line) > 0 And Left(line, 1) <> "#" Then - MsgBox "Error in SOC!" & vbCrLf & "Unknown line: " & line - End If - Loop - Exit Do - End If - Loop - - ts.Close - Set myFSO = Nothing -End Sub - -Private Sub WriteUnlockableItem(Remove As Boolean) - Dim myFSOSource As New Scripting.FileSystemObject - Dim tsSource As TextStream - Dim myFSOTarget As New Scripting.FileSystemObject - Dim tsTarget As TextStream - Dim line As String - Dim word As String - Dim word2 As String - Dim unlockableremoved As Boolean - - unlockableremoved = False - - Set tsSource = myFSOSource.OpenTextFile(SOCFile, ForReading, False) - Set tsTarget = myFSOTarget.OpenTextFile(SOCTemp, ForWriting, True) - - Do While Not tsSource.AtEndOfStream - line = tsSource.ReadLine - word = UCase(FirstToken(line)) - word2 = UCase(SecondToken(line)) - - 'If the current item exists in the SOC, delete it. - If word = "UNLOCKABLE" And Val(word2) = lstUnlockables.ListIndex + 1 Then - unlockableremoved = True - Do While Len(TrimComplete(tsSource.ReadLine)) > 0 And Not tsSource.AtEndOfStream - Loop - Else - tsTarget.WriteLine line - End If - Loop - - tsSource.Close - Set myFSOSource = Nothing - - If Remove = False Then - If line <> "" Then tsTarget.WriteLine "" - - tsTarget.WriteLine "UNLOCKABLE " & lstUnlockables.ListIndex + 1 - txtName.Text = TrimComplete(txtName.Text) - txtObjective.Text = TrimComplete(txtObjective.Text) - txtNeededEmblems.Text = TrimComplete(txtNeededEmblems.Text) - txtNeededTime.Text = TrimComplete(txtNeededTime.Text) - txtVar.Text = TrimComplete(txtVar.Text) - - If txtName.Text <> "" Then tsTarget.WriteLine "NAME = " & txtName.Text - If txtObjective.Text <> "" Then tsTarget.WriteLine "OBJECTIVE = " & txtObjective.Text - If txtNeededEmblems.Text <> "" Then tsTarget.WriteLine "NEEDEDEMBLEMS = " & txtNeededEmblems.Text - If txtNeededTime.Text <> "" Then tsTarget.WriteLine "NEEDEDTIME = " & txtNeededTime.Text - If cmbType.ListIndex <> -1 Then tsTarget.WriteLine "TYPE = " & cmbType.ListIndex - If txtVar.Text <> "" Then tsTarget.WriteLine "VAR = " & txtVar.Text - - Dim writegrade As Long - Dim i As Integer - writegrade = 0 - - For i = 0 To chkGrade.Count - 1 - If chkGrade(i).Value = 1 Then - writegrade = writegrade + chkGrade(i).Tag - End If - Next i - - If writegrade > 0 Then tsTarget.WriteLine "NEEDEDGRADE = " & writegrade - End If - - tsTarget.Close - Set myFSOTarget = Nothing - - FileCopy SOCTemp, SOCFile - - Kill SOCTemp - - If Remove = True Then - If unlockableremoved = True Then - MsgBox "Unlockable deleted from SOC." - Else - MsgBox "Couldn't find Unlockable in SOC." - End If - Else - MsgBox "Unlockable Saved." - End If -End Sub diff --git a/tools/SOCEdit/frmUnlockablesEdit.frx b/tools/SOCEdit/frmUnlockablesEdit.frx deleted file mode 100644 index d9d464d4e..000000000 Binary files a/tools/SOCEdit/frmUnlockablesEdit.frx and /dev/null differ diff --git a/tools/SOCEdit/icon1.ico b/tools/SOCEdit/icon1.ico deleted file mode 100644 index 1ea9d1005..000000000 Binary files a/tools/SOCEdit/icon1.ico and /dev/null differ diff --git a/tools/SRB2Launcher/ReadMe.txt b/tools/SRB2Launcher/ReadMe.txt deleted file mode 100644 index 9aafe08b8..000000000 --- a/tools/SRB2Launcher/ReadMe.txt +++ /dev/null @@ -1,35 +0,0 @@ -======================================================================== - WIN32 APPLICATION : SRB2Launcher -======================================================================== - - -AppWizard has created this SRB2Launcher application for you. - -This file contains a summary of what you will find in each of the files that -make up your SRB2Launcher application. - -SRB2Launcher.cpp - This is the main application source file. - -SRB2Launcher.dsp - This file (the project file) contains information at the project level and - is used to build a single project or subproject. Other users can share the - project (.dsp) file, but they should export the makefiles locally. - - -///////////////////////////////////////////////////////////////////////////// -Other standard files: - -StdAfx.h, StdAfx.cpp - These files are used to build a precompiled header (PCH) file - named SRB2Launcher.pch and a precompiled types file named StdAfx.obj. - - -///////////////////////////////////////////////////////////////////////////// -Other notes: - -AppWizard uses "TODO:" to indicate parts of the source code you -should add to or customize. - - -///////////////////////////////////////////////////////////////////////////// diff --git a/tools/SRB2Launcher/SRB2Launcher.cpp b/tools/SRB2Launcher/SRB2Launcher.cpp deleted file mode 100644 index 4138676d3..000000000 --- a/tools/SRB2Launcher/SRB2Launcher.cpp +++ /dev/null @@ -1,1155 +0,0 @@ -///////////////////////////// -// // -// Sonic Robo Blast 2 // -// Official Win32 Launcher // -// // -// By // -// SSNTails // -// ah518@tcnet.org // -// (Sonic Team Junior) // -// http://www.srb2.org // -// // -///////////////////////////// -// -// This source code is released under -// Public Domain. I hope it helps you -// learn how to write exciting Win32 -// applications in C! -// -// However, you may not alter this -// program and continue to call it -// the "Official Sonic Robo Blast 2 -// Launcher". -// -// NOTE: Not all files in this project -// are released under this license. -// Any license mentioned in accompanying -// source files overrides the license -// mentioned here, sorry! -// -// SRB2Launcher.cpp : Defines the entry point for the application. -// - -#include "stdafx.h" -#include -#include -#include "SRB2Launcher.h" - -char TempString[256]; - -char Arguments[16384]; - -HWND mainHWND; -HWND hostHWND; -HWND joinHWND; -HINSTANCE g_hInst; - -HANDLE ServerlistThread = 0; - -typedef struct -{ - char nospecialrings; - char suddendeath; - char scoringtype[16]; - char matchboxes[16]; - int respawnitemtime; - int timelimit; - int pointlimit; -} matchsettings_t; - -typedef struct -{ - char raceitemboxes[16]; - int numlaps; -} racesettings_t; - -typedef struct -{ - char nospecialrings; - char matchboxes[16]; - int respawnitemtime; - int timelimit; - int pointlimit; -} tagsettings_t; - -typedef struct -{ - char nospecialrings; - char matchboxes[16]; - int respawnitemtime; - int timelimit; - int flagtime; - int pointlimit; -} ctfsettings_t; - -typedef struct -{ - char nofile; - char nodownload; -} joinsettings_t; - -typedef struct -{ - matchsettings_t match; - racesettings_t race; - tagsettings_t tag; - ctfsettings_t ctf; - char gametype[16]; - char startmap[9]; - int maxplayers; - char advancestage[16]; - int inttime; - char forceskin; - char noautoaim; - char nosend; - char noadvertise; - - // Monitor Toggles... - char teleporters[8]; - char superring[8]; - char silverring[8]; - char supersneakers[8]; - char invincibility[8]; - char jumpshield[8]; - char watershield[8]; - char ringshield[8]; - char fireshield[8]; - char bombshield[8]; - char oneup[8]; - char eggmanbox[8]; -} hostsettings_t; - -typedef struct -{ - hostsettings_t host; - joinsettings_t join; - char EXEName[1024]; - char ConfigFile[1024]; - char ManualParameters[8192]; - char PlayerName[24]; - char PlayerColor[16]; - char PlayerSkin[24]; -} settings_t; - -// Whole structure is just dumped to a binary file when settings are saved. -settings_t launchersettings; - -#define APPTITLE "Official Sonic Robo Blast 2 Launcher" -#define APPVERSION "v0.1" -#define APPAUTHOR "SSNTails" -#define APPCOMPANY "Sonic Team Junior" - -LRESULT CALLBACK MainProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); - -// -// RunSRB2 -// -// Runs SRB2 -// returns true if successful -// -BOOL RunSRB2(void) -{ - SHELLEXECUTEINFO lpExecInfo; - BOOL result; - char EXEName[1024]; - - memset(&lpExecInfo, 0, sizeof(SHELLEXECUTEINFO)); - - lpExecInfo.cbSize = sizeof(SHELLEXECUTEINFO); - - SendMessage(GetDlgItem(mainHWND, IDC_EXENAME), WM_GETTEXT, sizeof(EXEName), (LPARAM)(LPCSTR)EXEName); - lpExecInfo.lpFile = EXEName; - lpExecInfo.lpParameters = Arguments; - lpExecInfo.nShow = SW_SHOWNORMAL; - lpExecInfo.hwnd = mainHWND; - lpExecInfo.fMask = SEE_MASK_NOCLOSEPROCESS; - lpExecInfo.lpVerb = "open"; - - result = ShellExecuteEx(&lpExecInfo); - - if(!result) - { - MessageBox(mainHWND, "Error starting the game!", "Error", MB_OK|MB_APPLMODAL|MB_ICONERROR); - return false; - } - - return true; -} - -// -// ChooseEXEName -// -// Provides a common dialog box -// for selecting the desired executable. -// -void ChooseEXEName(void) -{ - OPENFILENAME ofn; - char FileBuffer[256]; - - ZeroMemory(&ofn, sizeof(ofn)); - ofn.hwndOwner = NULL; - FileBuffer[0] = '\0'; - ofn.lpstrFilter = "Executable Files\0*.exe\0All Files\0*.*\0\0"; - ofn.lpstrInitialDir = NULL; - ofn.lpstrFile = FileBuffer; - ofn.lStructSize = sizeof(ofn); - ofn.nMaxFile = sizeof(FileBuffer); - ofn.nFilterIndex = 1; - ofn.lpstrFileTitle = NULL; - ofn.nMaxFileTitle = 0; - ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY; - - if(GetOpenFileName(&ofn)) - { - SendMessage(GetDlgItem(mainHWND, IDC_EXENAME), WM_SETTEXT, 0, (LPARAM)(LPCSTR)FileBuffer); - strcpy(launchersettings.EXEName, FileBuffer); - } -} - -// -// ChooseConfigName -// -// Provides a common dialog box -// for selecting the desired cfg file. -// -void ChooseConfigName(void) -{ - OPENFILENAME ofn; - char FileBuffer[256]; - - ZeroMemory(&ofn, sizeof(ofn)); - ofn.hwndOwner = NULL; - FileBuffer[0] = '\0'; - ofn.lpstrFilter = "Config Files\0*.cfg\0All Files\0*.*\0\0"; - ofn.lpstrInitialDir = NULL; - ofn.lpstrFile = FileBuffer; - ofn.lStructSize = sizeof(ofn); - ofn.nMaxFile = sizeof(FileBuffer); - ofn.nFilterIndex = 1; - ofn.lpstrFileTitle = NULL; - ofn.nMaxFileTitle = 0; - ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY; - - if(GetOpenFileName(&ofn)) - { - SendMessage(GetDlgItem(mainHWND, IDC_CONFIGFILE), WM_SETTEXT, 0, (LPARAM)(LPCSTR)FileBuffer); - strcpy(launchersettings.ConfigFile, FileBuffer); - } -} - -// -// Add External File -// -// Provides a common dialog box -// for adding an external file. -// -void AddExternalFile(void) -{ - OPENFILENAME ofn; - char FileBuffer[256]; - - ZeroMemory(&ofn, sizeof(ofn)); - ofn.hwndOwner = NULL; - FileBuffer[0] = '\0'; - ofn.lpstrFilter = "WAD/SOC Files\0*.soc;*.wad\0All Files\0*.*\0\0"; - ofn.lpstrInitialDir = NULL; - ofn.lpstrFile = FileBuffer; - ofn.lStructSize = sizeof(ofn); - ofn.nMaxFile = sizeof(FileBuffer); - ofn.nFilterIndex = 1; - ofn.lpstrFileTitle = NULL; - ofn.nMaxFileTitle = 0; - ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY; - - if(GetOpenFileName(&ofn) && SendMessage(GetDlgItem(mainHWND, IDC_EXTFILECOMBO), CB_FINDSTRING, -1, (LPARAM)(LPCSTR)FileBuffer) == CB_ERR) - SendMessage(GetDlgItem(mainHWND, IDC_EXTFILECOMBO), CB_ADDSTRING, 0, (LPARAM)(LPCSTR)FileBuffer); -} - -// -// CompileArguments -// -// Go through ALL of the settings -// and put them into a parameter -// string. Yikes! -// -void CompileArguments(void) -{ - HWND temp; - int numitems; - int i; - - // Clear out the arguments, if any existed. - memset(Arguments, 0, sizeof(Arguments)); - - - // WAD/SOC Files Added - temp = GetDlgItem(mainHWND, IDC_EXTFILECOMBO); - - if ((numitems = SendMessage(temp, CB_GETCOUNT, 0, 0)) > 0) - { - char tempbuffer[1024]; - - strcpy(Arguments, "-file "); - - for (i = 0; i < numitems; i++) - { - SendMessage(temp, CB_GETLBTEXT, i, (LPARAM)(LPCSTR)tempbuffer); - strcat(Arguments, tempbuffer); - strcat(Arguments, " "); - } - } - - // Manual Parameters - temp = GetDlgItem(mainHWND, IDC_PARAMETERS); - - if (SendMessage(temp, WM_GETTEXTLENGTH, 0, 0) > 0) - { - char tempbuffer[8192]; - - SendMessage(temp, WM_GETTEXT, 8192, (LPARAM)(LPCSTR)tempbuffer); - - strcat(Arguments, tempbuffer); - } -} - -// -// GetConfigVariable -// -// Pulls a value out of the chosen -// config.cfg and places it into the -// string supplied in 'dest' -// -BOOL GetConfigVariable(char* varname, char* dest) -{ - FILE* f; - int size = 0; - char* buffer; - char* posWeWant; - char* stringstart; - char varnamecpy[256]; - - varnamecpy[0] = '\n'; - - strncpy(varnamecpy+1, varname, 255); - - if(!(f = fopen(launchersettings.ConfigFile, "rb"))) - return false; // Oops! - - // Get file size - while(!feof(f)) - { - size++; - fgetc(f); - } - - fseek(f, 0, SEEK_SET); - - buffer = (char*)malloc(size); - - fread(buffer, size, 1, f); - fclose(f); - - posWeWant = strstr(buffer, varname); - - if(posWeWant == NULL) - { - free(buffer); - return false; - } - - posWeWant++; - - // We are now at the line we want. - // Get the variable from it - - while(*posWeWant != '\"') posWeWant++; - - posWeWant++; - - stringstart = posWeWant; - - while(*posWeWant != '\"') posWeWant++; - - *posWeWant = '\0'; - - strcpy(dest, stringstart); - - free(buffer); - - // Phew! - return true; -} - -SOCKET ConnectSocket(char* IPAddress, int portnumber) -{ - DWORD dwDestAddr; - SOCKADDR_IN sockAddrDest; - SOCKET sockDest; - - // Create socket - sockDest = socket(AF_INET, SOCK_STREAM, 0); - - if(sockDest == SOCKET_ERROR) - { -// printf("Could not create socket: %d\n", WSAGetLastError()); - return INVALID_SOCKET; - } - - // Convert address to in_addr (binary) format - dwDestAddr = inet_addr(IPAddress); - - if(dwDestAddr == INADDR_NONE) - { - // It's not a xxx.xxx.xxx.xxx IP, so resolve through DNS - struct hostent* pHE = gethostbyname(IPAddress); - if(pHE == 0) - { -// printf("Unable to resolve address.\n"); - return INVALID_SOCKET; - } - - dwDestAddr = *((u_long*)pHE->h_addr_list[0]); - } - - // Initialize SOCKADDR_IN with IP address, port number and address family - memcpy(&sockAddrDest.sin_addr, &dwDestAddr, sizeof(DWORD)); - - sockAddrDest.sin_port = htons(portnumber); - sockAddrDest.sin_family = AF_INET; - - // Attempt to connect to server - if(connect(sockDest, (LPSOCKADDR)&sockAddrDest, sizeof(sockAddrDest)) == SOCKET_ERROR) - { -// printf("Could not connect to server socket: %d\n", WSAGetLastError()); - closesocket(sockDest); - return INVALID_SOCKET; - } - - return sockDest; -} - -// -// MS_Write(): -// -static int MS_Write(msg_t *msg, SOCKET socket) -{ -#ifdef NONET - msg = NULL; - return MS_WRITE_ERROR; -#else - int len; - - if (msg->length < 0) - msg->length = (long)strlen(msg->buffer); - len = msg->length + HEADER_SIZE; - - msg->type = htonl(msg->type); - msg->length = htonl(msg->length); - - if (send(socket, (char *)msg, len, 0) != len) - return MS_WRITE_ERROR; - return 0; -#endif -} - -// -// MS_Read(): -// -static int MS_Read(msg_t *msg, SOCKET socket) -{ -#ifdef NONET - msg = NULL; - return MS_READ_ERROR; -#else - if (recv(socket, (char *)msg, HEADER_SIZE, 0) != HEADER_SIZE) - return MS_READ_ERROR; - - msg->type = ntohl(msg->type); - msg->length = ntohl(msg->length); - - if (!msg->length) // fix a bug in Windows 2000 - return 0; - - if (recv(socket, (char *)msg->buffer, msg->length, 0) != msg->length) - return MS_READ_ERROR; - return 0; -#endif -} - -/** Gets a list of game servers from the master server. - */ -static inline int GetServersList(SOCKET socket) -{ - msg_t msg; - int count = 0; - - msg.type = GET_SERVER_MSG; - msg.length = 0; - if (MS_Write(&msg, socket) < 0) - return MS_WRITE_ERROR; - - while (MS_Read(&msg, socket) >= 0) - { - if (!msg.length) - { -// if (!count) -// printf("No server currently running.\n"); - return MS_NO_ERROR; - } - count++; - printf(msg.buffer); - } - - return MS_READ_ERROR; -} - -// -// RunSocketStuff -// -// Thread that checks the masterserver for new games. -void RunSocketStuff(HWND hListView) -{ - WSADATA wsaData; - SOCKET sock; - int i = 0; - char ServerAddressAndPort[256]; - char Address[256]; - char Port[8]; - - if(!GetConfigVariable("masterserver", ServerAddressAndPort)) // srb2.servegame.org:28900 - { - ServerlistThread = NULL; - return; - } - - strcpy(Address, ServerAddressAndPort); - - for(i = 0; i < (signed)strlen(Address); i++) - { - if(Address[i] == ':') - { - Address[i] = '\0'; - break; - } - } - - for(i = 0; i < (signed)strlen(ServerAddressAndPort); i++) - { - if(ServerAddressAndPort[i] == ':') - { - strcpy(Port, &ServerAddressAndPort[i+1]); - break; - } - } - - // Address now contains the hostname or IP - // Port now contains the port number - - - // Initialize WinSock - if(WSAStartup(MAKEWORD(1, 1), &wsaData) != 0) - { -// printf("Could not initialize sockets.\n"); - ServerlistThread = NULL; - return; - } - - // Create socket and connect to server - sock = ConnectSocket(/*IPAddress*/0, /*PortNumber*/0); - if(sock == INVALID_SOCKET) - { -// printf("Socket Error: %d\n", WSAGetLastError()); - ServerlistThread = NULL; - return; - } - - // We're connected! - // Now get information from server - - - // Add games to listview box. - ListView_DeleteAllItems(hListView); - -/* - while (MoreServersStillExist) - { - GetTheNextServerInformation(); - AddItemToList(hListView, servername, ping, players, gametype, level); - } -*/ - - // close socket - closesocket(sock); - - // Clean up WinSock - if(WSACleanup() == SOCKET_ERROR) - { -// printf("Could not cleanup sockets: %d\n", WSAGetLastError()); - ServerlistThread = NULL; - return; - } - - printf("Winsock thread terminated successfully.\n"); - ServerlistThread = NULL; - - return; -} - -BOOL GetGameList(HWND hListView) -{ - DWORD dwThreadID; - ServerlistThread = CreateThread( NULL, // default security - 0, // default stack - (LPTHREAD_START_ROUTINE)(void*)RunSocketStuff, // thread function - hListView, // arguments - 0, // default flags - &dwThreadID); // don't need this, but it makes it happy (and compatible with old Win32 OSes) - - if(ServerlistThread == NULL) - return false; - - return true; -} - -void RegisterDialogClass(char* name, WNDPROC callback) -{ - WNDCLASS wnd; - - wnd.style = CS_HREDRAW | CS_VREDRAW; - wnd.cbWndExtra = DLGWINDOWEXTRA; - wnd.cbClsExtra = 0; - wnd.hCursor = LoadCursor(NULL,MAKEINTRESOURCE(IDC_ARROW)); - wnd.hIcon = LoadIcon(NULL,MAKEINTRESOURCE(IDI_ICON1)); - wnd.hInstance = g_hInst; - wnd.lpfnWndProc = callback; - wnd.lpszClassName = name; - wnd.lpszMenuName = NULL; - wnd.hbrBackground = (HBRUSH)(COLOR_WINDOW); - - if(!RegisterClass(&wnd)) - { - return; - } -} - -int APIENTRY WinMain(HINSTANCE hInstance, - HINSTANCE hPrevInstance, - LPSTR lpCmdLine, - int nCmdShow) -{ - // Prevent multiples instances of this app. - CreateMutex(NULL, true, APPTITLE); - - if(GetLastError() == ERROR_ALREADY_EXISTS) - return 0; - - g_hInst = hInstance; - - RegisterDialogClass("SRB2Launcher", MainProc); - - DialogBox(g_hInst, (LPCSTR)IDD_MAIN, NULL, (DLGPROC)MainProc); - - return 0; -} - -// -// InitHostOptionsComboBoxes -// -// Does what it says. -// -void InitHostOptionsComboBoxes(HWND hwnd) -{ - HWND ctrl; - - ctrl = GetDlgItem(hwnd, IDC_MATCHBOXES); - - if(ctrl) - { - SendMessage(ctrl, CB_ADDSTRING, 0, (LPARAM)(LPCSTR)"Normal (Default)"); - SendMessage(ctrl, CB_ADDSTRING, 0, (LPARAM)(LPCSTR)"Random"); - SendMessage(ctrl, CB_ADDSTRING, 0, (LPARAM)(LPCSTR)"Non-Random"); - SendMessage(ctrl, CB_ADDSTRING, 0, (LPARAM)(LPCSTR)"None"); - } - - ctrl = GetDlgItem(hwnd, IDC_RACEITEMBOXES); - - if(ctrl) - { - SendMessage(ctrl, CB_ADDSTRING, 0, (LPARAM)(LPCSTR)"Normal (Default)"); - SendMessage(ctrl, CB_ADDSTRING, 0, (LPARAM)(LPCSTR)"Random"); - SendMessage(ctrl, CB_ADDSTRING, 0, (LPARAM)(LPCSTR)"Teleports"); - SendMessage(ctrl, CB_ADDSTRING, 0, (LPARAM)(LPCSTR)"None"); - } - - ctrl = GetDlgItem(hwnd, IDC_MATCH_SCORING); - - if(ctrl) - { - SendMessage(ctrl, CB_ADDSTRING, 0, (LPARAM)(LPCSTR)"Normal (Default)"); - SendMessage(ctrl, CB_ADDSTRING, 0, (LPARAM)(LPCSTR)"Classic"); - } -} - -LRESULT CALLBACK MatchOptionsDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) -{ - switch(message) - { - case WM_INITDIALOG: - InitHostOptionsComboBoxes(hwnd); - break; - - case WM_DESTROY: - EndDialog(hwnd, LOWORD(wParam)); - break; - - case WM_COMMAND: - { - switch(LOWORD(wParam)) - { - case 2: - PostMessage(hwnd, WM_DESTROY, 0, 0); - break; - default: - break; - } - - break; - } - } - - return 0; -} - -LRESULT CALLBACK RaceOptionsDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) -{ - switch(message) - { - case WM_INITDIALOG: - InitHostOptionsComboBoxes(hwnd); - break; - - case WM_DESTROY: - EndDialog(hwnd, LOWORD(wParam)); - break; - - case WM_COMMAND: - { - switch(LOWORD(wParam)) - { - case 2: - PostMessage(hwnd, WM_DESTROY, 0, 0); - break; - default: - break; - } - - break; - } - } - - return 0; -} - -LRESULT CALLBACK TagOptionsDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) -{ - switch(message) - { - case WM_INITDIALOG: - InitHostOptionsComboBoxes(hwnd); - break; - - case WM_DESTROY: - EndDialog(hwnd, LOWORD(wParam)); - break; - - case WM_COMMAND: - { - switch(LOWORD(wParam)) - { - case 2: - PostMessage(hwnd, WM_DESTROY, 0, 0); - break; - default: - break; - } - - break; - } - } - - return 0; -} - -LRESULT CALLBACK CTFOptionsDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) -{ - switch(message) - { - case WM_INITDIALOG: - InitHostOptionsComboBoxes(hwnd); - break; - - case WM_DESTROY: - EndDialog(hwnd, LOWORD(wParam)); - break; - - case WM_COMMAND: - { - switch(LOWORD(wParam)) - { - case 2: - PostMessage(hwnd, WM_DESTROY, 0, 0); - break; - default: - break; - } - - break; - } - } - - return 0; -} - -LRESULT CALLBACK HostProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) -{ - HWND temp; - - switch(message) - { - case WM_INITDIALOG: - hostHWND = hwnd; - - temp = GetDlgItem(hwnd, IDC_ADVANCEMAP); - SendMessage(temp, CB_ADDSTRING, 0, (LPARAM)(LPCSTR)"Off"); - SendMessage(temp, CB_ADDSTRING, 0, (LPARAM)(LPCSTR)"Next (Default)"); - SendMessage(temp, CB_ADDSTRING, 0, (LPARAM)(LPCSTR)"Random"); - - temp = GetDlgItem(hwnd, IDC_GAMETYPE); - SendMessage(temp, CB_ADDSTRING, 0, (LPARAM)(LPCSTR)"Coop"); - SendMessage(temp, CB_ADDSTRING, 0, (LPARAM)(LPCSTR)"Match"); - SendMessage(temp, CB_ADDSTRING, 0, (LPARAM)(LPCSTR)"Team Match"); - SendMessage(temp, CB_ADDSTRING, 0, (LPARAM)(LPCSTR)"Race"); - SendMessage(temp, CB_ADDSTRING, 0, (LPARAM)(LPCSTR)"Time-Only Race"); - SendMessage(temp, CB_ADDSTRING, 0, (LPARAM)(LPCSTR)"Tag"); - SendMessage(temp, CB_ADDSTRING, 0, (LPARAM)(LPCSTR)"CTF"); - - break; - - case WM_CREATE: - { - - break; - } - - case WM_DESTROY: - { - hostHWND = NULL; - EndDialog(hwnd, LOWORD(wParam)); - break; - } - - case WM_COMMAND: - { - switch(LOWORD(wParam)) - { - case 2: - PostMessage(hwnd, WM_DESTROY, 0, 0); - break; - case IDC_OPTIONS: - { - int gametype; - int dialognum; - DLGPROC callbackfunc; - - // Grab the current gametype from the IDC_GAMETYPE - // combo box and then display the appropriate - // options dialog. - temp = GetDlgItem(hostHWND, IDC_GAMETYPE); - switch(SendMessage(temp, CB_GETCURSEL, 0, 0)) - { - case 0: - gametype = 0; - break; - case 1: - gametype = 1; - break; - case 2: - gametype = 1; - break; - case 3: - gametype = 2; - break; - case 4: - gametype = 2; - break; - case 5: - gametype = 3; - break; - case 6: - gametype = 4; - break; - } - - switch(gametype) - { - case 1: - dialognum = IDD_MATCHOPTIONS; - callbackfunc = (DLGPROC)MatchOptionsDlgProc; - break; - case 2: - dialognum = IDD_RACEOPTIONS; - callbackfunc = (DLGPROC)RaceOptionsDlgProc; - break; - case 3: - dialognum = IDD_TAGOPTIONS; - callbackfunc = (DLGPROC)TagOptionsDlgProc; - break; - case 4: - dialognum = IDD_CTFOPTIONS; - callbackfunc = (DLGPROC)CTFOptionsDlgProc; - break; - case 0: - default: // ??? - dialognum = 0; - callbackfunc = NULL; - MessageBox(hostHWND, "This gametype does not have any additional options.", "Not Available", MB_OK|MB_APPLMODAL); - break; - } - - if(dialognum) - DialogBox(g_hInst, (LPCSTR)dialognum, hostHWND, callbackfunc); - } - break; - default: - break; - } - - break; - } - - case WM_PAINT: - { - break; - } - } - - return 0; -} - -// -// AddItemToList -// -// Adds a game to the list view. -// -void AddItemToList(HWND hListView, char* servername, - char* ping, char* players, - char* gametype, char* level) -{ - LVITEM lvTest; - - lvTest.mask = LVIF_TEXT | LVIF_STATE; - - lvTest.pszText = servername; - lvTest.iIndent = 0; - lvTest.stateMask = 0; - lvTest.state = 0; - - lvTest.iSubItem = 0; - lvTest.iItem = ListView_InsertItem(hListView, &lvTest); - - ListView_SetItemText(hListView,lvTest.iItem,1,ping); - - ListView_SetItemText(hListView,lvTest.iItem,2,players); - - ListView_SetItemText(hListView,lvTest.iItem,3,gametype); - - ListView_SetItemText(hListView,lvTest.iItem,4,level); -} - -// -// InitJoinGameColumns -// -// Initializes the column headers on the listview control -// on the Join Game page. -// -void InitJoinGameColumns(HWND hDlg) -{ - HWND hItemList; - LVCOLUMN columns[10]; - int i = 0; - - //Create the columns in the list control - hItemList = GetDlgItem(hDlg, IDC_GAMELIST); - - columns[i].mask = LVCF_TEXT | LVCF_WIDTH; - columns[i].pszText = "Server Name"; - columns[i].cchTextMax = 256; - columns[i].cx = 120; - columns[i].fmt = LVCFMT_LEFT; - ListView_InsertColumn(hItemList, i, &columns[i]); - - i++; - - columns[i].mask = LVCF_TEXT | LVCF_WIDTH; - columns[i].pszText = "Ping"; - columns[i].cchTextMax = 256; - columns[i].cx = 80; - columns[i].fmt = LVCFMT_LEFT; - ListView_InsertColumn(hItemList, i, &columns[i]); - - i++; - - columns[i].mask = LVCF_TEXT | LVCF_WIDTH; - columns[i].pszText = "Players"; - columns[i].cchTextMax = 256; - columns[i].cx = 80; - columns[i].fmt = LVCFMT_LEFT; - ListView_InsertColumn(hItemList, i, &columns[i]); - - i++; - - columns[i].mask = LVCF_TEXT | LVCF_WIDTH; - columns[i].pszText = "Game Type"; - columns[i].cchTextMax = 256; - columns[i].cx = 80; - columns[i].fmt = LVCFMT_LEFT; - ListView_InsertColumn(hItemList, i, &columns[i]); - - i++; - - columns[i].mask = LVCF_TEXT | LVCF_WIDTH; - columns[i].pszText = "Level"; - columns[i].cchTextMax = 256; - columns[i].cx = 120; - columns[i].fmt = LVCFMT_LEFT; - ListView_InsertColumn(hItemList, i, &columns[i]); -} - -LRESULT CALLBACK JoinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) -{ - switch(message) - { - case WM_INITDIALOG: - joinHWND = hwnd; - InitJoinGameColumns(hwnd); - // Start server listing thread - // and grab game list. - GetGameList(GetDlgItem(hwnd, IDC_GAMELIST)); - break; - - case WM_DESTROY: - joinHWND = NULL; - // Terminate server listing thread. - EndDialog(hwnd, LOWORD(wParam)); - break; - - case WM_COMMAND: - { - switch(LOWORD(wParam)) - { - case 2: - PostMessage(hwnd, WM_DESTROY, 0, 0); - break; - case IDC_SEARCHGAMES: - if(ServerlistThread == NULL) - GetGameList(GetDlgItem(hwnd, IDC_GAMELIST)); - break; - default: - break; - } - - break; - } - - case WM_PAINT: - { - break; - } - } - - return 0; -} - -void InitializeDefaults(void) -{ - memset(&launchersettings, 0, sizeof(launchersettings)); - strcpy(launchersettings.EXEName, "srb2win.exe"); - strcpy(launchersettings.ConfigFile, "config.cfg"); -} - -LRESULT CALLBACK MainProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) -{ - HWND temp; - - switch(message) - { - case WM_INITDIALOG: - mainHWND = hwnd; - InitializeDefaults(); - SendMessage(GetDlgItem(hwnd, IDC_EXENAME), WM_SETTEXT, 0, (LPARAM)(LPCSTR)launchersettings.EXEName); - SendMessage(GetDlgItem(hwnd, IDC_CONFIGFILE), WM_SETTEXT, 0, (LPARAM)(LPCSTR)launchersettings.ConfigFile); - break; - - case WM_CREATE: - { - - break; - } - - case WM_DESTROY: - { - PostQuitMessage(0); - break; - } - - case WM_COMMAND: - { - switch(LOWORD(wParam)) - { - case 2: - PostMessage(hwnd, WM_DESTROY, 0, 0); - break; - case IDC_ABOUT: // The About button. - sprintf(TempString, "%s %s by %s - %s", APPTITLE, APPVERSION, APPAUTHOR, APPCOMPANY); - MessageBox(mainHWND, TempString, "About", MB_OK|MB_APPLMODAL); - break; - case IDC_FINDEXENAME: - ChooseEXEName(); - break; - case IDC_FINDCONFIGNAME: - ChooseConfigName(); - break; - case IDC_ADDFILE: - AddExternalFile(); - break; - case IDC_REMOVEFILE: - temp = GetDlgItem(mainHWND, IDC_EXTFILECOMBO); - SendMessage(temp, CB_DELETESTRING, SendMessage(temp, CB_GETCURSEL, 0, 0), 0); - break; - case IDC_HOSTGAME: - DialogBox(g_hInst, (LPCSTR)IDD_HOSTGAME, mainHWND, (DLGPROC)HostProc); - break; - case IDC_JOINGAME: - DialogBox(g_hInst, (LPCSTR)IDD_JOINGAME, mainHWND, (DLGPROC)JoinProc); - break; - case IDC_GO: - CompileArguments(); - RunSRB2(); - break; - default: - break; - } - - break; - } - - case WM_PAINT: - { - break; - } - } - - return 0; -} - diff --git a/tools/SRB2Launcher/SRB2Launcher.dsp b/tools/SRB2Launcher/SRB2Launcher.dsp deleted file mode 100644 index 386dc301c..000000000 --- a/tools/SRB2Launcher/SRB2Launcher.dsp +++ /dev/null @@ -1,144 +0,0 @@ -# Microsoft Developer Studio Project File - Name="SRB2Launcher" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=SRB2Launcher - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "SRB2Launcher.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "SRB2Launcher.mak" CFG="SRB2Launcher - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "SRB2Launcher - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "SRB2Launcher - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "SRB2Launcher - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:windows /machine:I386 - -!ELSEIF "$(CFG)" == "SRB2Launcher - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "SRB2Launcher - Win32 Release" -# Name "SRB2Launcher - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\SRB2Launcher.cpp -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.cpp -# ADD CPP /Yc"stdafx.h" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\lilsocklib.h -# End Source File -# Begin Source File - -SOURCE=.\resource.h -# End Source File -# Begin Source File - -SOURCE=.\SRB2Launcher.h -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE=.\bitmap1.bmp -# End Source File -# Begin Source File - -SOURCE=.\icon1.ico -# End Source File -# Begin Source File - -SOURCE=.\Script1.rc -# End Source File -# End Group -# Begin Source File - -SOURCE=.\ReadMe.txt -# End Source File -# End Target -# End Project diff --git a/tools/SRB2Launcher/SRB2Launcher.dsw b/tools/SRB2Launcher/SRB2Launcher.dsw deleted file mode 100644 index b716faced..000000000 --- a/tools/SRB2Launcher/SRB2Launcher.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "SRB2Launcher"=.\SRB2Launcher.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/tools/SRB2Launcher/SRB2Launcher.h b/tools/SRB2Launcher/SRB2Launcher.h deleted file mode 100644 index 3b9049f82..000000000 --- a/tools/SRB2Launcher/SRB2Launcher.h +++ /dev/null @@ -1,8 +0,0 @@ -extern char TempString[256]; -extern char EXEName[1024]; -extern char Arguments[16384]; - -#define APPTITLE "Official Sonic Robo Blast 2 Launcher" -#define APPVERSION "v0.1" -#define APPAUTHOR "SSNTails" -#define APPCOMPANY "Sonic Team Junior" diff --git a/tools/SRB2Launcher/Script1.rc b/tools/SRB2Launcher/Script1.rc deleted file mode 100644 index 1a27c0414..000000000 --- a/tools/SRB2Launcher/Script1.rc +++ /dev/null @@ -1,355 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_MAIN DIALOG DISCARDABLE 0, 0, 272, 226 -STYLE DS_3DLOOK | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU -CAPTION "Official Sonic Robo Blast 2 Launcher v0.1" -FONT 8, "MS Sans Serif" -BEGIN - COMBOBOX IDC_LAUNCHCONFIG,125,15,135,155,CBS_DROPDOWNLIST | - CBS_SORT | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Saved Launch Configuration",IDC_STATIC,120,5,145,45 - GROUPBOX "WAD/SOC Files",IDC_STATIC,120,55,145,45 - COMBOBOX IDC_EXTFILECOMBO,125,65,135,95,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - CONTROL 102,IDC_STATIC,"Static",SS_BITMAP,5,90,107,79 - PUSHBUTTON "&About",IDC_ABOUT,125,210,25,10 - DEFPUSHBUTTON "&Go!",IDC_GO,60,150,50,14 - PUSHBUTTON "Add",IDC_ADDFILE,225,80,35,15 - PUSHBUTTON "Remove",IDC_REMOVEFILE,185,80,35,15 - PUSHBUTTON "Save",IDC_SAVELAUNCHCFG,220,30,40,15 - GROUPBOX "Multiplayer",IDC_STATIC,5,5,105,50 - PUSHBUTTON "&Join A Game",IDC_JOINGAME,10,15,50,15 - PUSHBUTTON "&Host A Game",IDC_HOSTGAME,55,35,50,15 - EDITTEXT IDC_PARAMETERS,160,190,105,30,ES_MULTILINE | - ES_AUTOVSCROLL | WS_VSCROLL - RTEXT "Manual Parameters:",IDC_STATIC,115,190,40,15 - GROUPBOX "Executable Name",IDC_STATIC,120,105,145,50 - EDITTEXT IDC_EXENAME,125,115,95,12,ES_AUTOHSCROLL - PUSHBUTTON "Choose...",IDC_FINDEXENAME,225,115,35,10 - PUSHBUTTON "General &Options",IDC_OPTIONS,55,60,50,20,BS_MULTILINE - EDITTEXT IDC_CONFIGFILE,125,140,95,12,ES_AUTOHSCROLL - LTEXT "Configuration File:",IDC_STATIC,125,130,60,10 - PUSHBUTTON "Choose...",IDC_FINDCONFIGNAME,225,140,35,10 - CONTROL "List1",IDC_LIST1,"SysListView32",WS_BORDER | WS_TABSTOP, - 20,180,85,40 -END - -IDD_JOINGAME DIALOG DISCARDABLE 0, 0, 367, 166 -STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU -CAPTION "Join Game" -FONT 8, "MS Sans Serif" -BEGIN - PUSHBUTTON "&Refresh List",IDC_SEARCHGAMES,5,140,55,20,BS_MULTILINE - CONTROL "List1",IDC_GAMELIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,5,15,240,120 - EDITTEXT IDC_NAME,295,10,65,12,ES_AUTOHSCROLL - COMBOBOX IDC_COLOR,295,30,65,130,CBS_DROPDOWNLIST | CBS_SORT | - WS_VSCROLL | WS_TABSTOP - RTEXT "Name:",IDC_STATIC,265,10,25,10 - RTEXT "Color:",IDC_STATIC,265,30,25,10 - COMBOBOX IDC_SKIN,295,50,65,110,CBS_DROPDOWNLIST | CBS_SORT | - WS_VSCROLL | WS_TABSTOP - RTEXT "Character:",IDC_STATIC,255,50,35,10 - EDITTEXT IDC_ADDRESS,255,115,70,12,ES_AUTOHSCROLL - LTEXT "Manual Address:",IDC_STATIC,255,105,60,10 - CONTROL "Don't check server for files.",IDC_NOFILE,"Button", - BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,255,70,105, - 10 - DEFPUSHBUTTON "&Go!",IDC_JOINSTART,330,115,30,15 - LTEXT "Double-Click on a game to join:",IDC_STATIC,5,5,215,10 - CONTROL "Don't download files",IDC_NODOWNLOAD,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,255,90,105,10 -END - -IDD_HOSTGAME DIALOG DISCARDABLE 0, 0, 287, 156 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Host Game" -FONT 8, "MS Sans Serif" -BEGIN - GROUPBOX "Game Type",IDC_STATIC,5,5,110,65 - PUSHBUTTON "&Options...",IDC_OPTIONS,55,30,40,15 - COMBOBOX IDC_GAMETYPE,10,15,85,100,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - RTEXT "Max # of players:",IDC_STATIC,35,86,70,10 - EDITTEXT IDC_MAXPLAYERS,110,86,20,12,ES_AUTOHSCROLL - GROUPBOX "General Options",IDC_STATIC,5,75,275,75 - COMBOBOX IDC_STARTMAP,40,50,70,95,CBS_DROPDOWN | CBS_SORT | - WS_VSCROLL | WS_TABSTOP - RTEXT "Start on map #:",IDC_STATIC,10,45,25,20 - CONTROL "Force players to use host's character",IDC_FORCESKIN, - "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,140, - 85,135,10 - COMBOBOX IDC_ADVANCEMAP,45,105,85,50,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - RTEXT "Advance Stage:",IDC_STATIC,10,100,30,20 - CONTROL "Don't advertise server on Internet",IDC_INTERNETSERVER, - "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,140, - 130,120,10 - RTEXT "Intermission Delay Between Levels (in seconds):", - IDC_STATIC,10,125,90,15 - EDITTEXT IDC_INTTIME,105,130,20,12,ES_AUTOHSCROLL | ES_NUMBER - CONTROL "Don't allow autoaim",IDC_DISABLEAUTOAIM,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,140,100,75,10 - CONTROL "Disable WAD/SOC Downloading",IDC_NODOWNLOAD,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,140,115,120,10 - PUSHBUTTON "Monitor &Toggles...",IDC_MONITORTOGGLES,125,45,40,20, - BS_MULTILINE -END - -IDD_MATCHOPTIONS DIALOG DISCARDABLE 0, 0, 142, 141 -STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU -CAPTION "Match Options" -FONT 8, "MS Sans Serif" -BEGIN - CONTROL "Don't use special ring weapons.",IDC_SPECIALRINGS, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,5,115,10 - RTEXT "Item Box Behavior:",IDC_STATIC,5,50,60,10 - EDITTEXT IDC_RESPAWNITEMTIME,115,70,20,12,ES_AUTOHSCROLL | - ES_NUMBER - COMBOBOX IDC_MATCHBOXES,70,50,65,65,CBS_DROPDOWN | CBS_SORT | - WS_VSCROLL | WS_TABSTOP - RTEXT "Item Respawn Time (in seconds):",IDC_STATIC,5,70,105,10 - EDITTEXT IDC_TIMELIMIT,115,84,20,12,ES_AUTOHSCROLL | ES_NUMBER - RTEXT "Time Limit (in minutes):",IDC_STATIC,35,84,75,10 - RTEXT "Point Limit:",IDC_STATIC,70,100,40,10 - EDITTEXT IDC_POINTLIMIT,115,100,20,12,ES_AUTOHSCROLL | ES_NUMBER - CONTROL "Sudden Death Mode",IDC_SUDDENDEATH,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,15,20,80,10 - COMBOBOX IDC_MATCH_SCORING,70,35,65,65,CBS_DROPDOWNLIST | - CBS_SORT | WS_VSCROLL | WS_TABSTOP - RTEXT "Scoring Type:",IDC_STATIC,15,35,50,10 - PUSHBUTTON "Cance&l",IDC_CANCEL,100,120,35,15 - DEFPUSHBUTTON "O&K",IDC_OK,60,120,35,15 -END - -IDD_RACEOPTIONS DIALOG DISCARDABLE 0, 0, 142, 71 -STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU -CAPTION "Race Options" -FONT 8, "MS Sans Serif" -BEGIN - RTEXT "Item Box Behavior:",IDC_STATIC,5,10,60,10 - COMBOBOX IDC_RACEITEMBOXES,70,10,65,55,CBS_DROPDOWNLIST | - CBS_SORT | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_NUMLAPS,115,30,20,12,ES_AUTOHSCROLL | ES_NUMBER - RTEXT "Number of Laps:",IDC_STATIC,55,30,55,10 - PUSHBUTTON "Cance&l",IDC_CANCEL,100,50,35,15 - DEFPUSHBUTTON "O&K",IDC_OK,60,50,35,15 -END - -IDD_CTFOPTIONS DIALOG DISCARDABLE 0, 0, 142, 126 -STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU -CAPTION "CTF Options" -FONT 8, "MS Sans Serif" -BEGIN - CONTROL "Don't use special ring weapons.",IDC_SPECIALRINGS, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,5,115,10 - RTEXT "Item Box Behavior:",IDC_STATIC,5,20,60,10 - COMBOBOX IDC_MATCHBOXES,70,20,65,60,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - RTEXT "Item Respawn Time (in seconds):",IDC_STATIC,5,40,105,10 - EDITTEXT IDC_RESPAWNITEMTIME,115,40,20,12,ES_AUTOHSCROLL | - ES_NUMBER - RTEXT "Time Limit (in minutes):",IDC_STATIC,35,70,75,10 - EDITTEXT IDC_TIMELIMIT,115,70,20,12,ES_AUTOHSCROLL | ES_NUMBER - RTEXT "Point Limit:",IDC_STATIC,70,86,40,10 - EDITTEXT IDC_POINTLIMIT,115,86,20,12,ES_AUTOHSCROLL | ES_NUMBER - RTEXT "Flag Respawn Time (in seconds):",IDC_STATIC,5,55,105,10 - EDITTEXT IDC_FLAGTIME,115,55,20,12,ES_AUTOHSCROLL | ES_NUMBER - PUSHBUTTON "Cance&l",IDC_CANCEL,100,105,35,15 - DEFPUSHBUTTON "O&K",IDC_OK,60,105,35,15 -END - -IDD_TAGOPTIONS DIALOG DISCARDABLE 0, 0, 142, 111 -STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU -CAPTION "Tag Options" -FONT 8, "MS Sans Serif" -BEGIN - CONTROL "Don't use special ring weapons.",IDC_SPECIALRINGS, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,5,115,10 - COMBOBOX IDC_MATCHBOXES,70,20,65,60,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - RTEXT "Item Box Behavior:",IDC_STATIC,5,20,60,10 - DEFPUSHBUTTON "O&K",IDC_OK,60,90,35,15 - PUSHBUTTON "Cance&l",IDC_CANCEL,100,90,35,15 - RTEXT "Item Respawn Time (in seconds):",IDC_STATIC,5,40,105,10 - EDITTEXT IDC_RESPAWNITEMTIME,115,40,20,12,ES_AUTOHSCROLL | - ES_NUMBER - RTEXT "Time Limit (in minutes):",IDC_STATIC,35,55,75,10 - EDITTEXT IDC_TIMELIMIT,115,55,20,12,ES_AUTOHSCROLL | ES_NUMBER - RTEXT "Point Limit:",IDC_STATIC,70,70,40,10 - EDITTEXT IDC_POINTLIMIT,115,70,20,12,ES_AUTOHSCROLL | ES_NUMBER -END - - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_MAIN, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 265 - TOPMARGIN, 7 - BOTTOMMARGIN, 219 - END - - IDD_JOINGAME, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 360 - TOPMARGIN, 7 - BOTTOMMARGIN, 159 - END - - IDD_HOSTGAME, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 280 - TOPMARGIN, 7 - BOTTOMMARGIN, 149 - END - - IDD_MATCHOPTIONS, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 135 - TOPMARGIN, 7 - BOTTOMMARGIN, 134 - END - - IDD_RACEOPTIONS, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 135 - TOPMARGIN, 7 - BOTTOMMARGIN, 64 - END - - IDD_CTFOPTIONS, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 135 - TOPMARGIN, 7 - BOTTOMMARGIN, 119 - END - - IDD_TAGOPTIONS, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 135 - TOPMARGIN, 7 - BOTTOMMARGIN, 104 - END -END -#endif // APSTUDIO_INVOKED - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - -IDB_BITMAP1 BITMAP DISCARDABLE "bitmap1.bmp" - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON1 ICON DISCARDABLE "icon1.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog Info -// - -IDD_JOINGAME DLGINIT -BEGIN - IDC_SKIN, 0x403, 6, 0 -0x6f53, 0x696e, 0x0063, - IDC_SKIN, 0x403, 6, 0 -0x6154, 0x6c69, 0x0073, - IDC_SKIN, 0x403, 9, 0 -0x6e4b, 0x6375, 0x6c6b, 0x7365, "\000" - 0 -END - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/tools/SRB2Launcher/StdAfx.cpp b/tools/SRB2Launcher/StdAfx.cpp deleted file mode 100644 index 444cafebf..000000000 --- a/tools/SRB2Launcher/StdAfx.cpp +++ /dev/null @@ -1,8 +0,0 @@ -// stdafx.cpp : source file that includes just the standard includes -// SRB2Launcher.pch will be the pre-compiled header -// stdafx.obj will contain the pre-compiled type information - -#include "stdafx.h" - -// TODO: reference any additional headers you need in STDAFX.H -// and not in this file diff --git a/tools/SRB2Launcher/StdAfx.h b/tools/SRB2Launcher/StdAfx.h deleted file mode 100644 index 549cbf9ee..000000000 --- a/tools/SRB2Launcher/StdAfx.h +++ /dev/null @@ -1,29 +0,0 @@ -// stdafx.h : include file for standard system include files, -// or project specific include files that are used frequently, but -// are changed infrequently -// - -#if !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_) -#define AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers - -#include -#include -#include -#include -#include -#include "lilsocklib.h" -#include "resource.h" - - -// TODO: reference additional headers your program requires here - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_) diff --git a/tools/SRB2Launcher/bitmap1.bmp b/tools/SRB2Launcher/bitmap1.bmp deleted file mode 100644 index 01b7cecd9..000000000 Binary files a/tools/SRB2Launcher/bitmap1.bmp and /dev/null differ diff --git a/tools/SRB2Launcher/i_tcp.c b/tools/SRB2Launcher/i_tcp.c deleted file mode 100644 index 259b416d3..000000000 --- a/tools/SRB2Launcher/i_tcp.c +++ /dev/null @@ -1,57 +0,0 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- -// -// MSERV SDK -// -// Copyright (C) 1998-2000 by DooM Legacy Team. -// Adapted by Oogaland. -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// -// -// DESCRIPTION: -// TCP/IP stuff. -// -//----------------------------------------------------------------------------- - - - - -#include -#include - - -#include "launcher.h" -#include "mserv.h" //Hurdler: support master server - - - - -static int init_tcp_driver = 0; - - -void I_InitTcpDriver(void) -{ - if (!init_tcp_driver) - { -#ifdef __WIN32__ - WSADATA winsockdata; - if( WSAStartup(MAKEWORD(1,1),&winsockdata) ) - I_Error("No Tcp/Ip driver detected"); -#endif -#ifdef __DJGPP_ - if( !__lsck_init() ) - I_Error("No Tcp/Ip driver detected"); -#endif - init_tcp_driver = 1; - } -} diff --git a/tools/SRB2Launcher/i_tcp.h b/tools/SRB2Launcher/i_tcp.h deleted file mode 100644 index 9cd34f930..000000000 --- a/tools/SRB2Launcher/i_tcp.h +++ /dev/null @@ -1,34 +0,0 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- -// -// MSERV SDK -// -// Copyright (C) 1998-2000 by DooM Legacy Team. -// Adapted by Oogaland. -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// -// -// DESCRIPTION: -// Header file for the TCP/IP routines -// -//----------------------------------------------------------------------------- - - -#ifndef _I_TCP_H_ -#define _I_TCP_H_ - -extern int sock_port; - -void I_InitTcpDriver(void); - -#endif // !defined(_I_TCP_H_) diff --git a/tools/SRB2Launcher/icon1.ico b/tools/SRB2Launcher/icon1.ico deleted file mode 100644 index f54ce0d6a..000000000 Binary files a/tools/SRB2Launcher/icon1.ico and /dev/null differ diff --git a/tools/SRB2Launcher/launcher.c b/tools/SRB2Launcher/launcher.c deleted file mode 100644 index 4967a95cc..000000000 --- a/tools/SRB2Launcher/launcher.c +++ /dev/null @@ -1,19 +0,0 @@ -#include - -#include "launcher.h" - -int WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpvReserved) -{ - return TRUE; -} - - -void CONS_Printf(char *fmt, ...) -{ - MessageBox(NULL, fmt, "Master Server", 0); -} - -void I_Error (char *error, ...) -{ - MessageBox(NULL, error, "Master Server", MB_ICONERROR); -} diff --git a/tools/SRB2Launcher/launcher.h b/tools/SRB2Launcher/launcher.h deleted file mode 100644 index 12b10aad5..000000000 --- a/tools/SRB2Launcher/launcher.h +++ /dev/null @@ -1,34 +0,0 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- -// -// MSERV SDK -// -// Copyright (C) 1998-2000 by DooM Legacy Team. -// Adapted by Oogaland. -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// -// -// DESCRIPTION: -// Header file for the launcher routines -// -//----------------------------------------------------------------------------- - - -#ifndef _LAUNCHER_H_ -#define _LAUNCHER_H_ - - -void CONS_Printf(char *fmt, ...); -void I_Error (char *error, ...); - -#endif // !defined(_LAUNCHER_H_) diff --git a/tools/SRB2Launcher/lilsocklib.h b/tools/SRB2Launcher/lilsocklib.h deleted file mode 100644 index 232f3753a..000000000 --- a/tools/SRB2Launcher/lilsocklib.h +++ /dev/null @@ -1,52 +0,0 @@ -// Unlike lilsocklib.c, since this takes code from SRB2, -// it is under the GPL, rather than public domain. =( -// -#ifndef __LILSOCKLIB_H__ -#define __LILSOCKLIB_H__ - -#define SD_BOTH 0x02 - -#define PACKET_SIZE 1024 - -#define MS_NO_ERROR 0 -#define MS_SOCKET_ERROR -201 -#define MS_CONNECT_ERROR -203 -#define MS_WRITE_ERROR -210 -#define MS_READ_ERROR -211 -#define MS_CLOSE_ERROR -212 -#define MS_GETHOSTBYNAME_ERROR -220 -#define MS_GETHOSTNAME_ERROR -221 -#define MS_TIMEOUT_ERROR -231 - -// see master server code for the values -#define ADD_SERVER_MSG 101 -#define REMOVE_SERVER_MSG 103 -#ifdef MASTERSERVERS12 -#define ADD_SERVERv2_MSG 104 -#endif -#define GET_SERVER_MSG 200 -#define GET_SHORT_SERVER_MSG 205 -#ifdef MASTERSERVERS12 -#define ASK_SERVER_MSG 206 -#define ANSWER_ASK_SERVER_MSG 207 -#endif - -#define HEADER_SIZE ((long)sizeof (long)*3) - -#define HEADER_MSG_POS 0 -#define IP_MSG_POS 16 -#define PORT_MSG_POS 32 -#define HOSTNAME_MSG_POS 40 - -/** A message to be exchanged with the master server. - */ -typedef struct -{ - long id; ///< Unused? - long type; ///< Type of message. - long length; ///< Length of the message. - char buffer[PACKET_SIZE]; ///< Actual contents of the message. -} msg_t; - -SOCKET ConnectSocket(char* IPAddress); -#endif diff --git a/tools/SRB2Launcher/mserv.c b/tools/SRB2Launcher/mserv.c deleted file mode 100644 index 0dd00e2bb..000000000 --- a/tools/SRB2Launcher/mserv.c +++ /dev/null @@ -1,400 +0,0 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- -// -// MSERV SDK -// -// Copyright (C) 1998-2000 by DooM Legacy Team. -// Adapted by Oogaland. -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// -// -// DESCRIPTION: -// Commands used to communicate with the master server -// -//----------------------------------------------------------------------------- - - -#ifdef WIN32 -#include // socket(),... -#else -#include -#endif - - - - -#include "launcher.h" - -#include "mserv.h" -#include "i_tcp.h" - - - - - -// ================================ DEFINITIONS =============================== - -#define PACKET_SIZE 1024 - -#define MS_NO_ERROR 0 -#define MS_SOCKET_ERROR -201 -#define MS_CONNECT_ERROR -203 -#define MS_WRITE_ERROR -210 -#define MS_READ_ERROR -211 -#define MS_CLOSE_ERROR -212 -#define MS_GETHOSTBYNAME_ERROR -220 -#define MS_GETHOSTNAME_ERROR -221 -#define MS_TIMEOUT_ERROR -231 - -// see master server code for the values -#define GET_SERVER_MSG 200 - - -#define HEADER_SIZE ((long)sizeof(long)*3) - -#define HEADER_MSG_POS 0 -#define IP_MSG_POS 16 -#define PORT_MSG_POS 32 -#define HOSTNAME_MSG_POS 40 - -#ifndef SOCKET -#define SOCKET int -#endif - -typedef struct { - long id; - long type; - long length; - char buffer[PACKET_SIZE]; -} msg_t; - - -// win32 or djgpp -#if defined( WIN32) || defined( __DJGPP__ ) -#define ioctl ioctlsocket -#define close closesocket -#endif - -#if defined( WIN32) || defined( __OS2__) -// it seems windows doesn't define that... maybe some other OS? OS/2 -int inet_aton(char *hostname, struct in_addr *addr) -{ - return ( (addr->s_addr=inet_addr(hostname)) != INADDR_NONE ); -} -#endif - - - -enum { MSCS_NONE, MSCS_WAITING, MSCS_REGISTERED, MSCS_FAILED } con_state = MSCS_NONE; - - -static SOCKET socket_fd = -1; // TCP/IP socket -static struct sockaddr_in addr; -static struct timeval select_timeout; -static fd_set wset; - -int MS_Connect(char *ip_addr, char *str_port, int async); -static int MS_Read(msg_t *msg); -static int MS_Write(msg_t *msg); -static int MS_GetIP(char *); - -void ExtractServerInfo(char *serverout, struct SERVERLIST *serverlist); - - - - - - - - - - -void CloseConnection(void) -{ - if(socket_fd > 0) close(socket_fd); - socket_fd = -1; -} - - - - -/* -** MS_GetIP() -*/ -static int MS_GetIP(char *hostname) -{ - struct hostent *host_ent; - - if (!inet_aton(hostname, &addr.sin_addr)) { - //TODO: only when we are connected to Internet, or use a non bloking call - host_ent = gethostbyname(hostname); - if (host_ent==NULL) - return MS_GETHOSTBYNAME_ERROR; - memcpy(&addr.sin_addr, host_ent->h_addr_list[0], sizeof(struct in_addr)); - } - return 0; -} - - - - - - -/* -** MS_Connect() -*/ -int MS_Connect(char *ip_addr, char *str_port, int async) -{ - memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - I_InitTcpDriver(); // this is done only if not already done - - if ((socket_fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) - return MS_SOCKET_ERROR; - - if (MS_GetIP(ip_addr)==MS_GETHOSTBYNAME_ERROR) - return MS_GETHOSTBYNAME_ERROR; - addr.sin_port = htons((u_short)atoi(str_port)); - - if (async) // do asynchronous connection - { - int res = 1; - - ioctl(socket_fd, FIONBIO, &res); - res = connect(socket_fd, (struct sockaddr *) &addr, sizeof(addr)); - if (res < 0) - { - // humm, on win32 it doesn't work with EINPROGRESS (stupid windows) - if (WSAGetLastError() != WSAEWOULDBLOCK) - { - con_state = MSCS_FAILED; - CloseConnection(); - return MS_CONNECT_ERROR; - } - } - con_state = MSCS_WAITING; - FD_ZERO(&wset); - FD_SET(socket_fd, &wset); - select_timeout.tv_sec = 0, select_timeout.tv_usec = 0; - } - else - { - if (connect(socket_fd, (struct sockaddr *) &addr, sizeof(addr)) < 0) - return MS_CONNECT_ERROR; - } - - return 0; -} - - - - - - -/* - * MS_Write(): - */ -static int MS_Write(msg_t *msg) -{ - int len; - - if (msg->length < 0) - msg->length = strlen(msg->buffer); - len = msg->length+HEADER_SIZE; - - //msg->id = htonl(msg->id); - msg->type = htonl(msg->type); - msg->length = htonl(msg->length); - - if (send(socket_fd, (char*)msg, len, 0) != len) - return MS_WRITE_ERROR; - - return 0; -} - - - - - - -/* - * MS_Read(): - */ -static int MS_Read(msg_t *msg) -{ - if (recv(socket_fd, (char*)msg, HEADER_SIZE, 0) != HEADER_SIZE) - return MS_READ_ERROR; - - msg->type = ntohl(msg->type); - msg->length = ntohl(msg->length); - - if (!msg->length) //Hurdler: fix a bug in Windows 2000 - return 0; - - if (recv(socket_fd, (char*)msg->buffer, msg->length, 0) != msg->length) - return MS_READ_ERROR; - - return 0; -} - - - - - - - - -/***************************************************************************/ - - - - - - - - - -/* GetServerListEx */ -EXPORT int __stdcall GetServerListEx(char *host, char *str_port, struct SERVERLIST serverlist[], short max_servers) -{ - msg_t msg; - int count = 0; - - - /* Attempt to connect to list server. */ - MS_Connect(host, str_port, 0); - - /* Poll the list server. If it fails, depart with an error code of -1. */ - msg.type = GET_SERVER_MSG; - msg.length = 0; - if (MS_Write(&msg) < 0) - return -1; - - - - /* Get a description of each server in turn. */ - /* What we get is exactly the same as the output to the console when using LISTSERV. */ - while (MS_Read(&msg) >= 0) - { - if(msg.length == 0 || count >= max_servers) - { - CloseConnection(); - return count; - } - - ExtractServerInfo(msg.buffer, &serverlist[count]); - - count++; - } - - - CloseConnection(); - return -2; -} - - - - - - - - - - - -/* GetServerList */ -/* Warning: Large kludge follows! This function is only included for backwards-compatibility. */ -/* Use GetServerListVB or GetServerListEx instead. */ -EXPORT int __stdcall GetServerList(char *host, char *str_port, - - struct SERVERLIST *serverlist1,struct SERVERLIST *serverlist2,struct SERVERLIST *serverlist3, - struct SERVERLIST *serverlist4,struct SERVERLIST *serverlist5,struct SERVERLIST *serverlist6, - struct SERVERLIST *serverlist7,struct SERVERLIST *serverlist8,struct SERVERLIST *serverlist9, - struct SERVERLIST *serverlist10,struct SERVERLIST *serverlist11,struct SERVERLIST *serverlist12, - struct SERVERLIST *serverlist13,struct SERVERLIST *serverlist14,struct SERVERLIST *serverlist15, - struct SERVERLIST *serverlist16) -{ - msg_t msg; - int count = 0; - struct SERVERLIST *serverlist[16]; - - - /* Attempt to connect to list server. */ - MS_Connect(host, str_port, 0); - - /* Poll the list server. If it fails, bomb with an error code of -1. */ - msg.type = GET_SERVER_MSG; - msg.length = 0; - if (MS_Write(&msg) < 0) - return -1; - - serverlist[0] = serverlist1; - serverlist[1] = serverlist2; - serverlist[2] = serverlist3; - serverlist[3] = serverlist4; - serverlist[4] = serverlist5; - serverlist[5] = serverlist6; - serverlist[6] = serverlist7; - serverlist[7] = serverlist8; - serverlist[8] = serverlist9; - serverlist[9] = serverlist10; - serverlist[10] = serverlist11; - serverlist[11] = serverlist12; - serverlist[12] = serverlist13; - serverlist[13] = serverlist14; - serverlist[14] = serverlist15; - serverlist[15] = serverlist16; - - - - - while (MS_Read(&msg) >= 0 && count < 16) - { - if(msg.length == 0 || count >= 16) - { - CloseConnection(); - return count; - } - - ExtractServerInfo(msg.buffer, serverlist[count]); - - count++; - } - - - CloseConnection(); - - - return -2; -} - - - -void ExtractServerInfo(char *serverout, struct SERVERLIST *serverlist) -{ - char *lines[5]; - int i; - - i=0; - lines[0] = strtok(serverout, "\r\n"); - for(i=1; i<5; i++) - { - lines[i] = strtok(NULL, "\r\n"); - } - - strcpy(serverlist->ip, strstr(lines[0], ": ")+2); - strcpy(serverlist->port, strstr(lines[1], ": ")+2); - strcpy(serverlist->name, strstr(lines[2], ": ")+2); - strcpy(serverlist->version, strstr(lines[3], ": ")+2); - strcpy(serverlist->perm, strstr(lines[4], ": ")+2); -} diff --git a/tools/SRB2Launcher/mserv.h b/tools/SRB2Launcher/mserv.h deleted file mode 100644 index 8f32ae632..000000000 --- a/tools/SRB2Launcher/mserv.h +++ /dev/null @@ -1,64 +0,0 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- -// -// MSERV SDK -// -// Copyright (C) 1998-2000 by DooM Legacy Team. -// Adapted by Oogaland. -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// -// -// DESCRIPTION: -// Header file for the master server routines -// -//----------------------------------------------------------------------------- - -#ifndef _MSERV_H_ -#define _MSERV_H_ - - - -#ifndef EXPORT -#ifdef __cplusplus -#define EXPORT extern "C" __declspec (dllexport) -#else -#define EXPORT __declspec (dllexport) -#endif -#endif - - - -struct SERVERLIST -{ - char ip[16]; - char port[6]; - char name[32]; - char version[16]; - char perm[4]; -}; - - - -EXPORT int __stdcall GetServerListEx(char *ip_addr, char *str_port, struct SERVERLIST serverlist[], short max_servers); -EXPORT int __stdcall GetServerList(char *ip_addr, char *str_port, - struct SERVERLIST *serverlist1,struct SERVERLIST *serverlist2,struct SERVERLIST *serverlist3, - struct SERVERLIST *serverlist4,struct SERVERLIST *serverlist5,struct SERVERLIST *serverlist6, - struct SERVERLIST *serverlist7,struct SERVERLIST *serverlist8,struct SERVERLIST *serverlist9, - struct SERVERLIST *serverlist10,struct SERVERLIST *serverlist11,struct SERVERLIST *serverlist12, - struct SERVERLIST *serverlist13,struct SERVERLIST *serverlist14,struct SERVERLIST *serverlist15, - struct SERVERLIST *serverlist16); - - - - -#endif // !defined(_MSERV_H_) diff --git a/tools/SRB2Launcher/mservsdk.h b/tools/SRB2Launcher/mservsdk.h deleted file mode 100644 index 722288e0b..000000000 --- a/tools/SRB2Launcher/mservsdk.h +++ /dev/null @@ -1,65 +0,0 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- -// -// MSERV SDK -// -// Copyright (C) 1998-2000 by DooM Legacy Team. -// Adapted by Oogaland. -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// -// -// DESCRIPTION: -// Header file for the master server SDK. -// -//----------------------------------------------------------------------------- - -#ifndef _MSERVSDK_H_ -#define _MSERVSDK_H_ - - - -#ifndef IMPORT -#ifdef __cplusplus -#define IMPORT extern "C" __declspec (dllimport) -#else -#define IMPORT __declspec (dllimport) -#endif -#endif - - - - -struct SERVERLIST -{ - char ip[16]; - char port[6]; - char name[32]; - char version[16]; - char perm[4]; -}; - - - -IMPORT int __stdcall GetServerListEx(char *host, char *str_port, struct SERVERLIST serverlist[], short max_servers); -IMPORT int __stdcall GetServerList(char *host, char *str_port, - struct SERVERLIST *serverlist1,struct SERVERLIST *serverlist2,struct SERVERLIST *serverlist3, - struct SERVERLIST *serverlist4,struct SERVERLIST *serverlist5,struct SERVERLIST *serverlist6, - struct SERVERLIST *serverlist7,struct SERVERLIST *serverlist8,struct SERVERLIST *serverlist9, - struct SERVERLIST *serverlist10,struct SERVERLIST *serverlist11,struct SERVERLIST *serverlist12, - struct SERVERLIST *serverlist13,struct SERVERLIST *serverlist14,struct SERVERLIST *serverlist15, - struct SERVERLIST *serverlist16); - - - - -#endif // !defined(_MSERVSDK_H_) diff --git a/tools/SRB2Launcher/resource.h b/tools/SRB2Launcher/resource.h deleted file mode 100644 index d787fef41..000000000 --- a/tools/SRB2Launcher/resource.h +++ /dev/null @@ -1,71 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Developer Studio generated include file. -// Used by Script1.rc -// -#define IDD_MAIN 101 -#define IDB_BITMAP1 102 -#define IDI_ICON1 103 -#define IDD_JOINGAME 104 -#define IDD_HOSTGAME 106 -#define IDD_MATCHOPTIONS 108 -#define IDD_RACEOPTIONS 109 -#define IDD_CTFOPTIONS 110 -#define IDD_TAGOPTIONS 111 -#define IDC_GO 1001 -#define IDC_LAUNCHCONFIG 1002 -#define IDC_EXTFILECOMBO 1003 -#define IDC_ABOUT 1005 -#define IDC_ADDFILE 1006 -#define IDC_REMOVEFILE 1007 -#define IDC_SAVELAUNCHCFG 1008 -#define IDC_JOINGAME 1010 -#define IDC_HOSTGAME 1011 -#define IDC_SOUNDOPTS 1012 -#define IDC_PARAMETERS 1013 -#define IDC_EXENAME 1014 -#define IDC_FINDEXENAME 1015 -#define IDC_SEARCHGAMES 1016 -#define IDC_GAMELIST 1018 -#define IDC_NAME 1020 -#define IDC_COLOR 1021 -#define IDC_SKIN 1022 -#define IDC_ADDRESS 1023 -#define IDC_NOFILE 1024 -#define IDC_JOINSTART 1026 -#define IDC_NODOWNLOAD 1027 -#define IDC_OPTIONS 1028 -#define IDC_GAMETYPE 1029 -#define IDC_MAXPLAYERS 1030 -#define IDC_STARTMAP 1031 -#define IDC_FORCESKIN 1032 -#define IDC_ADVANCEMAP 1033 -#define IDC_INTERNETSERVER 1034 -#define IDC_SPECIALRINGS 1036 -#define IDC_MATCHBOXES 1037 -#define IDC_OK 1038 -#define IDC_CANCEL 1039 -#define IDC_RESPAWNITEMTIME 1040 -#define IDC_TIMELIMIT 1041 -#define IDC_POINTLIMIT 1042 -#define IDC_FLAGTIME 1048 -#define IDC_RACEITEMBOXES 1051 -#define IDC_NUMLAPS 1052 -#define IDC_SUDDENDEATH 1060 -#define IDC_MATCH_SCORING 1061 -#define IDC_INTTIME 1064 -#define IDC_DISABLEAUTOAIM 1065 -#define IDC_MONITORTOGGLES 1067 -#define IDC_CONFIGFILE 1069 -#define IDC_FINDCONFIGNAME 1070 -#define IDC_LIST1 1071 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 117 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1072 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/tools/SRB2MP/Makefile b/tools/SRB2MP/Makefile deleted file mode 100644 index 92e112d7a..000000000 --- a/tools/SRB2MP/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# Makfile of SRB2MP - -CFLAGS +=-Wall -mms-bitfields -fno-exceptions -LDFLAGS +=-mwindows -lfmod -WINDRESFLAGS= - -SRC=lump.c SRB2MP.c - -ifdef DEBUGMODE -CFLAGS +=-g -D_DEBUG -LDFLAGS +=-g -else -CFLAGS :=-Os -s $(CFLAGS) -LDFLAGS :=-s $(LDFLAGS) -endif - -OBJ=$(SRC:.c=.o) # replaces the .c from SRC with .o -EXTRAOBJ=Script1.res -EXE=SRB2MP.exe - -ifdef PREFIX -CC=$(PREFIX)-gcc -WINDRES ?=$(PREFIX)-windres -endif - -WINDRES ?=windres - -RM=rm - -%.o: %.c StdAfx.h lump.h resource.h - $(CC) $(CFLAGS) -o $@ -c $< - -%.res: %.rc resource.h - $(WINDRES) -i $< -O rc $(WINDRESFLAGS) -o $@ -O coff - -.PHONY : all # .PHONY ignores files named all -all: $(EXE) # all is dependent on $(EXE) to be complete - -$(EXE): $(OBJ) $(EXTRAOBJ) # $(EXE) is dependent on all of the files in $(OBJ) to exist - $(CC) $(OBJ) $(EXTRAOBJ) $(LDFLAGS) -o $@ - -.PHONY : clean # .PHONY ignores files named clean -clean: - -$(RM) $(OBJ) $(EXTRAOBJ) diff --git a/tools/SRB2MP/SRB2MP.c b/tools/SRB2MP/SRB2MP.c deleted file mode 100644 index 69cc21040..000000000 --- a/tools/SRB2MP/SRB2MP.c +++ /dev/null @@ -1,464 +0,0 @@ -// SRB2MP.cpp : Defines the entry point for the application. -// - -#include "StdAfx.h" -#include "lump.h" - -#define APPTITLE "SRB2 Music Player" -#define APPVERSION "v0.1" -#define APPAUTHOR "SSNTails" -#define APPCOMPANY "Sonic Team Junior" - -static FSOUND_STREAM *fmus = NULL; -static int fsoundchannel = -1; -static FMUSIC_MODULE *mod = NULL; -static struct wadfile* wfptr = NULL; - -static inline VOID M_SetVolume(int volume) -{ - if (mod && FMUSIC_GetType(mod) != FMUSIC_TYPE_NONE) - FMUSIC_SetMasterVolume(mod, volume); - if (fsoundchannel != -1) - FSOUND_SetVolume(fsoundchannel, volume); -} - -static inline BOOL M_InitMusic(VOID) -{ - if (FSOUND_GetVersion() < FMOD_VERSION) - { - printf("Error : You are using the wrong DLL version!\nYou should be using FMOD %.02f\n", FMOD_VERSION); - return FALSE; - } - -#ifdef _DEBUG - FSOUND_SetOutput(FSOUND_OUTPUT_WINMM); -#endif - - if (!FSOUND_Init(44100, 1, FSOUND_INIT_GLOBALFOCUS)) - { - printf("%s\n", FMOD_ErrorString(FSOUND_GetError())); - return FALSE; - } - return TRUE; -} - -static inline VOID M_FreeMusic(VOID) -{ - if (mod) - { - FMUSIC_StopSong(mod); - FMUSIC_FreeSong(mod); - mod = NULL; - } - if (fmus) - { - FSOUND_Stream_Stop(fmus); - FSOUND_Stream_Close(fmus); - fmus = NULL; - fsoundchannel = -1; - } -} - -static inline VOID M_ShutdownMusic(VOID) -{ - M_FreeMusic(); - FSOUND_Close(); - //remove(musicfile); // Delete the temp file -} - -static inline VOID M_PauseMusic(VOID) -{ - if (mod && !FMUSIC_GetPaused(mod)) - FMUSIC_SetPaused(mod, TRUE); - if (fsoundchannel != -1 && FSOUND_IsPlaying(fsoundchannel)) - FSOUND_SetPaused(fsoundchannel, TRUE); -} - -static inline VOID M_ResumeMusic(VOID) -{ - if (mod && FMUSIC_GetPaused(mod)) - FMUSIC_SetPaused(mod, FALSE); - if (fsoundchannel != -1 && FSOUND_GetPaused(fsoundchannel)) - FSOUND_SetPaused(fsoundchannel, FALSE); -} - -static inline VOID M_StopMusic(VOID) -{ - if (mod) - FMUSIC_StopSong(mod); - if (fsoundchannel != -1 && fmus && FSOUND_IsPlaying(fsoundchannel)) - FSOUND_Stream_Stop(fmus); -} - -static inline VOID M_StartFMODSong(LPVOID data, int len, int looping, HWND hDlg) -{ - const int loops = FSOUND_LOOP_NORMAL|FSOUND_LOADMEMORY; - const int nloop = FSOUND_LOADMEMORY; - M_FreeMusic(); - - if (looping) - mod = FMUSIC_LoadSongEx(data, 0, len, loops, NULL, 0); - else - mod = FMUSIC_LoadSongEx(data, 0, len, nloop, NULL, 0); - - if (mod) - { - FMUSIC_SetLooping(mod, (signed char)looping); - FMUSIC_SetPanSeperation(mod, 0.0f); - } - else - { - if (looping) - fmus = FSOUND_Stream_Open(data, loops, 0, len); - else - fmus = FSOUND_Stream_Open(data, nloop, 0, len); - } - - if (!fmus && !mod) - { - MessageBoxA(hDlg, FMOD_ErrorString(FSOUND_GetError()), "Error", MB_OK|MB_APPLMODAL); - return; - } - - // Scan the OGG for the COMMENT= field for a custom loop point - if (looping && fmus) - { - const BYTE *origpos, *dataum = data; - size_t scan, size = len; - - CHAR buffer[512]; - BOOL titlefound = FALSE, artistfound = FALSE; - - unsigned int loopstart = 0; - - origpos = dataum; - - for(scan = 0; scan < size; scan++) - { - if (!titlefound) - { - if (*dataum++ == 'T') - if (*dataum++ == 'I') - if (*dataum++ == 'T') - if (*dataum++ == 'L') - if (*dataum++ == 'E') - if (*dataum++ == '=') - { - size_t titlecount = 0; - CHAR title[256]; - BYTE length = *(dataum-10) - 6; - - while(titlecount < length) - title[titlecount++] = *dataum++; - - title[titlecount] = '\0'; - - sprintf(buffer, "Title: %s", title); - - SendMessage(GetDlgItem(hDlg, IDC_TITLE), WM_SETTEXT, 0, (LPARAM)(LPCSTR)buffer); - - titlefound = TRUE; - } - } - } - - dataum = origpos; - - for(scan = 0; scan < size; scan++) - { - if (!artistfound) - { - if (*dataum++ == 'A') - if (*dataum++ == 'R') - if (*dataum++ == 'T') - if (*dataum++ == 'I') - if (*dataum++ == 'S') - if (*dataum++ == 'T') - if (*dataum++ == '=') - { - size_t artistcount = 0; - CHAR artist[256]; - BYTE length = *(dataum-11) - 7; - - while(artistcount < length) - artist[artistcount++] = *dataum++; - - artist[artistcount] = '\0'; - - sprintf(buffer, "By: %s", artist); - - SendMessage(GetDlgItem(hDlg, IDC_ARTIST), WM_SETTEXT, 0, (LPARAM)(LPCSTR)buffer); - - artistfound = TRUE; - } - } - } - - dataum = origpos; - - for(scan = 0; scan < size; scan++) - { - if (*dataum++ == 'C'){ - if (*dataum++ == 'O'){ - if (*dataum++ == 'M'){ - if (*dataum++ == 'M'){ - if (*dataum++ == 'E'){ - if (*dataum++ == 'N'){ - if (*dataum++ == 'T'){ - if (*dataum++ == '='){ - if (*dataum++ == 'L'){ - if (*dataum++ == 'O'){ - if (*dataum++ == 'O'){ - if (*dataum++ == 'P'){ - if (*dataum++ == 'P'){ - if (*dataum++ == 'O'){ - if (*dataum++ == 'I'){ - if (*dataum++ == 'N'){ - if (*dataum++ == 'T'){ - if (*dataum++ == '=') - { - size_t newcount = 0; - CHAR looplength[64]; - while (*dataum != 1 && newcount < 63) - { - looplength[newcount++] = *dataum++; - } - - looplength[newcount] = '\n'; - - loopstart = atoi(looplength); - } - else - dataum--;} - else - dataum--;} - else - dataum--;} - else - dataum--;} - else - dataum--;} - else - dataum--;} - else - dataum--;} - else - dataum--;} - else - dataum--;} - else - dataum--;} - else - dataum--;} - else - dataum--;} - else - dataum--;} - else - dataum--;} - else - dataum--;} - else - dataum--;} - else - dataum--;} - } - - if (loopstart > 0) - { - const int length = FSOUND_Stream_GetLengthMs(fmus); - const int freq = 44100; - const unsigned int loopend = (unsigned int)((freq/1000.0f)*length-(freq/1000.0f)); - if (!FSOUND_Stream_SetLoopPoints(fmus, loopstart, loopend)) - { - printf("FMOD(Start,FSOUND_Stream_SetLoopPoints): %s\n", - FMOD_ErrorString(FSOUND_GetError())); - } - } - } - - if (mod) - FMUSIC_PlaySong(mod); - if (fmus) - fsoundchannel = FSOUND_Stream_PlayEx(FSOUND_FREE, fmus, NULL, FALSE); - - M_SetVolume(128); -} - -static inline VOID FreeWADLumps(VOID) -{ - M_FreeMusic(); - if (wfptr) free_wadfile(wfptr); - wfptr = NULL; -} - -static inline VOID ReadWADLumps(LPCSTR WADfilename, HWND hDlg) -{ - HWND listbox = GetDlgItem(hDlg, IDC_PLAYLIST); - FILE* f; - struct lumplist *curlump; - - SendMessage(listbox, LB_RESETCONTENT, 0, 0); - FreeWADLumps(); - f = fopen(WADfilename, "rb"); - wfptr = read_wadfile(f); - fclose(f); - - /* start of C_LIST */ - /* Loop through the lump list, printing lump info */ - for(curlump = wfptr->head->next; curlump; curlump = curlump->next) - { - LPCSTR lumpname = get_lump_name(curlump->cl); - if (!strncmp(lumpname, "O_", 2) || !strncmp(lumpname, "D_", 2)) - SendMessage(listbox, LB_ADDSTRING, 0, (LPARAM)(LPCSTR)get_lump_name(curlump->cl)); - } - /* end of C_LIST */ -} - -// -// OpenWadfile -// -// Provides a common dialog box -// for selecting the desired wad file. -// -static inline VOID OpenWadfile(HWND hDlg) -{ - OPENFILENAMEA ofn; - CHAR FileBuffer[256] = ""; - - ZeroMemory(&ofn, sizeof(ofn)); - ofn.hwndOwner = hDlg; - ofn.lpstrFilter = "WAD Files\0*.wad\0All Files\0*.*\0\0"; - ofn.lpstrInitialDir = NULL; - ofn.lpstrFile = FileBuffer; - ofn.lStructSize = sizeof(ofn); - ofn.nMaxFile = sizeof(FileBuffer); - ofn.nFilterIndex = 1; - ofn.lpstrFileTitle = NULL; - ofn.nMaxFileTitle = 0; - ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY; - - if (GetOpenFileNameA(&ofn)) - ReadWADLumps(FileBuffer, hDlg); -} - -static inline VOID PlayLump(HWND hDlg) -{ - HWND listbox = GetDlgItem(hDlg, IDC_PLAYLIST); - LRESULT cursel = SendMessage(listbox, LB_GETCURSEL, 0, 0); - - /* Start of C_EXTRACT */ - CHAR argv[9]; - - SendMessage(listbox, LB_GETTEXT, cursel, (LPARAM)(LPCSTR)argv); - - /* Extract LUMPNAME FILENAME pairs */ - if (wfptr) - { - struct lumplist *extracted; - - printf("Extracting lump %s...\n", argv); - /* Find the lump to extract */ - extracted = find_previous_lump(wfptr->head, NULL, argv); - if (extracted == NULL || (extracted = extracted->next) == NULL) - return; - - /* Extract lump */ - M_StartFMODSong(extracted->cl->data, extracted->cl->len, FALSE, hDlg); - - /* end of extracting LUMPNAME FILENAME pairs */ - - } /* end of C_EXTRACT */ - return; -} - -static LRESULT CALLBACK MainWndproc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) -{ - return DefWindowProc(hWnd, message, wParam, lParam); -} - -static INT_PTR CALLBACK DialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) -{ - switch(message) - { - case WM_INITDIALOG: - M_InitMusic(); - break; - - case WM_CLOSE: - EndDialog(hDlg, message); - break; - - case WM_DESTROY: - FreeWADLumps(); - M_ShutdownMusic(); - break; - - case WM_COMMAND: - { - switch(LOWORD(wParam)) - { - case 2: - EndDialog(hDlg, message); - return TRUE; - case IDC_ABOUT: // The About button. - { - char TempString[256]; - sprintf(TempString, "%s %s by %s - %s", APPTITLE, APPVERSION, APPAUTHOR, APPCOMPANY); - MessageBoxA(hDlg, TempString, "About", MB_OK|MB_APPLMODAL); - } - return TRUE; - case IDC_OPEN: - OpenWadfile(hDlg); - return TRUE; - case IDC_PLAY: - PlayLump(hDlg); - return TRUE; - default: - break; - } - break; - } - } - - return FALSE; -} - -static inline VOID RegisterDialogClass(LPCSTR name, WNDPROC callback, HINSTANCE hInst) -{ - WNDCLASSA wnd; - - wnd.style = CS_HREDRAW | CS_VREDRAW; - wnd.cbWndExtra = DLGWINDOWEXTRA; - wnd.cbClsExtra = 0; - wnd.hCursor = LoadCursorA(NULL,(LPCSTR)MAKEINTRESOURCE(IDC_ARROW)); - wnd.hIcon = LoadIcon(NULL,MAKEINTRESOURCE(IDI_ICON1)); - wnd.hInstance = hInst; - wnd.lpfnWndProc = callback; - wnd.lpszClassName = name; - wnd.lpszMenuName = NULL; - wnd.hbrBackground = (HBRUSH)(COLOR_WINDOW); - - if (!RegisterClassA(&wnd)) - { - return; - } -} - -int APIENTRY WinMain(HINSTANCE hInstance, - HINSTANCE hPrevInstance, - LPSTR lpCmdLine, - int nCmdShow) -{ - // Prevent multiples instances of this app. - CreateMutexA(NULL, TRUE, APPTITLE); - - if (GetLastError() == ERROR_ALREADY_EXISTS) - return 0; - - RegisterDialogClass("SRB2MP", MainWndproc, hInstance); - - DialogBoxA(hInstance, (LPCSTR)IDD_MAIN, NULL, DialogProc); - - return 0; -} diff --git a/tools/SRB2MP/SRB2MP.dsp b/tools/SRB2MP/SRB2MP.dsp deleted file mode 100644 index f2e700fb5..000000000 --- a/tools/SRB2MP/SRB2MP.dsp +++ /dev/null @@ -1,148 +0,0 @@ -# Microsoft Developer Studio Project File - Name="SRB2MP" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=SRB2MP - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "SRB2MP.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "SRB2MP.mak" CFG="SRB2MP - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "SRB2MP - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "SRB2MP - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "SRB2MP - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib fmodvc.lib /nologo /subsystem:windows /machine:I386 - -!ELSEIF "$(CFG)" == "SRB2MP - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib fmodvc.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "SRB2MP - Win32 Release" -# Name "SRB2MP - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\lump.c -# End Source File -# Begin Source File - -SOURCE=.\SRB2MP.c -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.c -# ADD CPP /Yc"stdafx.h" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\lump.h -# End Source File -# Begin Source File - -SOURCE=.\resource.h -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE=.\icon1.ico -# End Source File -# Begin Source File - -SOURCE=.\icon2.ico -# End Source File -# Begin Source File - -SOURCE=.\icon3.ico -# End Source File -# Begin Source File - -SOURCE=.\Script1.rc -# End Source File -# End Group -# Begin Source File - -SOURCE=.\ReadMe.txt -# End Source File -# End Target -# End Project diff --git a/tools/SRB2MP/SRB2MP.dsw b/tools/SRB2MP/SRB2MP.dsw deleted file mode 100644 index b73bd1ac7..000000000 --- a/tools/SRB2MP/SRB2MP.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "SRB2MP"=.\SRB2MP.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/tools/SRB2MP/Script1.aps b/tools/SRB2MP/Script1.aps deleted file mode 100644 index 994653cb1..000000000 Binary files a/tools/SRB2MP/Script1.aps and /dev/null differ diff --git a/tools/SRB2MP/Script1.rc b/tools/SRB2MP/Script1.rc deleted file mode 100644 index 3fa7bd572..000000000 --- a/tools/SRB2MP/Script1.rc +++ /dev/null @@ -1,118 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_MAIN DIALOG DISCARDABLE 0, 0, 262, 170 -STYLE DS_3DLOOK | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU -CAPTION "SRB2 Music Player" -FONT 8, "MS Sans Serif" -BEGIN - PUSHBUTTON "E&xit",IDCANCEL,205,145,50,19 - PUSHBUTTON "&About",IDC_ABOUT,230,15,23,10 - LISTBOX IDC_WADLIST,5,30,112,110,LBS_SORT | LBS_NOINTEGRALHEIGHT | - WS_VSCROLL | WS_TABSTOP - LISTBOX IDC_PLAYLIST,140,30,114,110,LBS_SORT | - LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Play",IDC_PLAY,140,145,60,20 - PUSHBUTTON "->",IDC_ADD,120,35,15,15 - PUSHBUTTON "<-",IDC_REMOVE,120,55,15,15 - PUSHBUTTON "&Open WAD...",IDC_OPEN,5,10,50,15 - ICON IDI_ICON1,IDC_STATIC,205,5,20,20 - LTEXT "Title:",IDC_TITLE,5,140,125,10 - LTEXT "By:",IDC_ARTIST,5,150,125,15 -END - - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_MAIN, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 255 - TOPMARGIN, 7 - BOTTOMMARGIN, 163 - END -END -#endif // APSTUDIO_INVOKED - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON1 ICON DISCARDABLE "icon1.ico" -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/tools/SRB2MP/StdAfx.c b/tools/SRB2MP/StdAfx.c deleted file mode 100644 index 4f305cd1a..000000000 --- a/tools/SRB2MP/StdAfx.c +++ /dev/null @@ -1,8 +0,0 @@ -// stdafx.cpp : source file that includes just the standard includes -// SRB2MP.pch will be the pre-compiled header -// stdafx.obj will contain the pre-compiled type information - -#include "StdAfx.h" - -// TODO: reference any additional headers you need in STDAFX.H -// and not in this file diff --git a/tools/SRB2MP/StdAfx.h b/tools/SRB2MP/StdAfx.h deleted file mode 100644 index 84ac428b8..000000000 --- a/tools/SRB2MP/StdAfx.h +++ /dev/null @@ -1,35 +0,0 @@ -// stdafx.h : include file for standard system include files, -// or project specific include files that are used frequently, but -// are changed infrequently -// - -#if !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_) -#define AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_ - -//#define UNICODE - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers - -#include -#include -#include -#include - -// TODO: reference additional headers your program requires here -#ifdef __MINGW32__ -#include -#include -#else -#include -#include -#endif -#include "resource.h" - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_) diff --git a/tools/SRB2MP/icon1.ico b/tools/SRB2MP/icon1.ico deleted file mode 100644 index 7548e7caf..000000000 Binary files a/tools/SRB2MP/icon1.ico and /dev/null differ diff --git a/tools/SRB2MP/lump.c b/tools/SRB2MP/lump.c deleted file mode 100644 index 4cf355401..000000000 --- a/tools/SRB2MP/lump.c +++ /dev/null @@ -1,471 +0,0 @@ -/* - LumpMod v0.21, a command-line utility for working with lumps in wad files. - Copyright (C) 2003 Thunder Palace Entertainment. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - lump.c: Provides functions for dealing with lumps -*/ - -#include "StdAfx.h" -#include -#include -#include "lump.h" - -/* Read contents of a wad file and store them in memory. - * fpoint is the file to read, opened with "rb" mode. - * A pointer to a new wadfile struct will be returned, or NULL on error. - */ -struct wadfile *read_wadfile(FILE *fpoint) { - struct wadfile *wfptr; - struct lumplist *curlump; - unsigned long diroffset, filelen; - unsigned long count; - - /* Allocate memory for wadfile struct */ - wfptr = (struct wadfile*)malloc(sizeof(struct wadfile)); - if(wfptr == NULL) return NULL; - - /* Read first four characters (PWAD or IWAD) */ - if(fread(wfptr->id, 4, 1, fpoint) < 1) { - free(wfptr); - return NULL; - } - - /* Read number of lumps */ - if(fread(&(wfptr->numlumps), 4, 1, fpoint) < 1) { - free(wfptr); - return NULL; - } - - /* If number of lumps is zero, nothing more needs to be done */ - if(wfptr->numlumps == 0) { - wfptr->head = NULL; - return wfptr; - } - - /* Read offset of directory */ - if(fread(&diroffset, 4, 1, fpoint) < 1) { - free(wfptr); - return NULL; - } - - /* Verify that the directory as long as it needs to be */ - fseek(fpoint, 0, SEEK_END); - filelen = ftell(fpoint); - if((filelen - diroffset) / DIRENTRYLEN < wfptr->numlumps) { - free(wfptr); - return NULL; - } - - /* Allocate memory for head lumplist item and set head pointer */ - curlump = (struct lumplist*)malloc(sizeof(struct lumplist)); - if(curlump == NULL) { - free(wfptr); - return NULL; - } - wfptr->head = curlump; - curlump->cl = NULL; - - /* Read directory entries and lumps */ - for(count = 0; count < wfptr->numlumps; count++) { - long lumpdataoffset; - - /* Advance to a new list item */ - curlump->next = (struct lumplist*)malloc(sizeof(struct lumplist)); - if(curlump->next == NULL) { - free_wadfile(wfptr); - return NULL; - } - curlump = curlump->next; - curlump->next = NULL; - - /* Allocate memory for the lump info */ - curlump->cl = (struct lump*)malloc(sizeof(struct lump)); - if(curlump->cl == NULL) { - free_wadfile(wfptr); - return NULL; - } - - /* Seek to the proper position in the file */ - if(fseek(fpoint, diroffset + (count * DIRENTRYLEN), SEEK_SET) != 0) { - free_wadfile(wfptr); - return NULL; - } - - /* Read offset of lump data */ - if(fread(&lumpdataoffset, 4, 1, fpoint) < 1) { - free_wadfile(wfptr); - return NULL; - } - - /* Read size of lump in bytes */ - if(fread(&(curlump->cl->len), 4, 1, fpoint) < 1) { - free_wadfile(wfptr); - return NULL; - } - - /* Read lump name */ - if(fread(curlump->cl->name, 8, 1, fpoint) < 1) { - free_wadfile(wfptr); - return NULL; - } - - /* Read actual lump data, unless lump size is 0 */ - if(curlump->cl->len > 0) { - if(fseek(fpoint, lumpdataoffset, SEEK_SET) != 0) { - free_wadfile(wfptr); - return NULL; - } - - /* Allocate memory for data */ - curlump->cl->data = (unsigned char*)malloc(curlump->cl->len); - if(curlump->cl->data == NULL) { - free_wadfile(wfptr); - return NULL; - } - - /* Fill the data buffer */ - if(fread(curlump->cl->data, curlump->cl->len, 1, fpoint) < 1) { - free_wadfile(wfptr); - return NULL; - } - } else curlump->cl->data = NULL; - } /* End of directory reading loop */ - - return wfptr; -} - -/* Free a wadfile from memory as well as all related structures. - */ -void free_wadfile(struct wadfile *wfptr) { - struct lumplist *curlump, *nextlump; - - if(wfptr == NULL) return; - curlump = wfptr->head; - - /* Free items in the lump list */ - while(curlump != NULL) { - - /* Free the actual lump and its data, if necessary */ - if(curlump->cl != NULL) { - if(curlump->cl->data != NULL) free(curlump->cl->data); - free(curlump->cl); - } - - /* Advance to next lump and free this one */ - nextlump = curlump->next; - free(curlump); - curlump = nextlump; - } - - free(wfptr); -} - -/* Write complete wadfile to a file stream, opened with "wb" mode. - * fpoint is the stream to write to. - * wfptr is a pointer to the wadfile structure to use. - * Return zero on success, nonzero on failure. - */ -int write_wadfile(FILE *fpoint, struct wadfile *wfptr) { - struct lumplist *curlump; - long lumpdataoffset, diroffset; - - if(wfptr == NULL) return 1; - - /* Write four-character ID ("PWAD" or "IWAD") */ - if(fwrite(wfptr->id, 4, 1, fpoint) < 1) return 2; - - /* Write number of lumps */ - if(fwrite(&(wfptr->numlumps), 4, 1, fpoint) < 1) return 3; - - /* Offset of directory is not known yet. For now, write number of lumps - * again, just to fill the space. - */ - if(fwrite(&(wfptr->numlumps), 4, 1, fpoint) < 1) return 4; - - /* Loop through lump list, writing lump data */ - for(curlump = wfptr->head; curlump != NULL; curlump = curlump->next) { - - /* Don't write anything for the head of the lump list or for lumps of - zero length */ - if(curlump->cl == NULL || curlump->cl->data == NULL) continue; - - /* Write the data */ - if(fwrite(curlump->cl->data, curlump->cl->len, 1, fpoint) < 1) - return 5; - } - - /* Current position is where directory will start */ - diroffset = ftell(fpoint); - - /* Offset for the first lump's data is always 12 */ - lumpdataoffset = 12; - - /* Loop through lump list again, this time writing directory entries */ - for(curlump = wfptr->head; curlump != NULL; curlump = curlump->next) { - - /* Don't write anything for the head of the lump list */ - if(curlump->cl == NULL) continue; - - /* Write offset for lump data */ - if(fwrite(&lumpdataoffset, 4, 1, fpoint) < 1) return 6; - - /* Write size of lump data */ - if(fwrite(&(curlump->cl->len), 4, 1, fpoint) < 1) return 7; - - /* Write lump name */ - if(fwrite(curlump->cl->name, 8, 1, fpoint) < 1) return 8; - - /* Increment lumpdataoffset variable as appropriate */ - lumpdataoffset += curlump->cl->len; - } - - /* Go back to header and write the proper directory offset */ - fseek(fpoint, 8, SEEK_SET); - if(fwrite(&diroffset, 4, 1, fpoint) < 1) return 9; - - return 0; -} - -/* Get the name of a lump, as a null-terminated string. - * item is a pointer to the lump (not lumplist) whose name will be obtained. - * Return NULL on error. - */ -char *get_lump_name(struct lump *item) { - char convname[9], *retname; - - if(item == NULL) return NULL; - memcpy(convname, item->name, 8); - convname[8] = '\0'; - - retname = (char*)malloc(strlen(convname) + 1); - if(retname != NULL) strcpy(retname, convname); - return retname; -} - -/* Find the lump after start and before end having a certain name. - * Return a pointer to the list item for that lump, or return NULL if no lump - * by that name is found or lumpname is too long. - * lumpname is a null-terminated string. - * If end parameter is NULL, search to the end of the entire list. - */ -struct lumplist *find_previous_lump(struct lumplist *start, struct lumplist - *end, char *lumpname) { - struct lumplist *curlump, *lastlump; - char *curname; - int found = 0; - - /* Verify that parameters are valid */ - if(start==NULL || start==end || lumpname==NULL || strlen(lumpname) > 8) - return NULL; - - /* Loop through the list from start parameter */ - lastlump = start; - for(curlump = start->next; curlump != end && curlump != NULL; - curlump = curlump->next) { - - /* Skip header lump */ - if(curlump->cl == NULL) continue; - - /* Find name of this lump */ - curname = get_lump_name(curlump->cl); - if(curname == NULL) continue; - - /* Compare names to see if this is the lump we want */ - if(strcmp(curname, lumpname) == 0) { - found = 1; - break; - } - - /* Free memory allocated to curname */ - free(curname); - - lastlump = curlump; - } - - if(found) return lastlump; - return NULL; -} - -/* Remove a lump from the list, free it, and free its data. - * before is the lump immediately preceding the lump to be removed. - * wfptr is a pointer to the wadfile structure to which the removed lump - * belongs, so that numlumps can be decreased. - */ -void remove_next_lump(struct wadfile *wfptr, struct lumplist *before) { - struct lumplist *removed; - - /* Verify that parameters are valid */ - if(before == NULL || before->next == NULL || wfptr == NULL) return; - - /* Update linked list to omit removed lump */ - removed = before->next; - before->next = removed->next; - - /* Free lump info and data if necessary */ - if(removed->cl != NULL) { - if(removed->cl->data != NULL) free(removed->cl->data); - free(removed->cl); - } - - free(removed); - - /* Decrement numlumps */ - wfptr->numlumps--; -} - -/* Add a lump. - * The lump will follow prev in the list and be named name, with a data size - * of len. - * A copy will be made of the data. - * Return zero on success or nonzero on failure. - */ -int add_lump(struct wadfile *wfptr, struct lumplist *prev, char *name, long - len, unsigned char *data) { - struct lump *newlump; - struct lumplist *newlumplist; - unsigned char *copydata; - - /* Verify that parameters are valid */ - if(wfptr == NULL || prev == NULL || name == NULL || strlen(name) > 8) - return 1; - - /* Allocate space for newlump and newlumplist */ - newlump = (struct lump*)malloc(sizeof(struct lump)); - newlumplist = (struct lumplist*)malloc(sizeof(struct lumplist)); - if(newlump == NULL || newlumplist == NULL) return 2; - - /* Copy lump data and set up newlump */ - if(len == 0 || data == NULL) { - newlump->len = 0; - newlump->data = NULL; - } else { - newlump->len = len; - copydata = (unsigned char*)malloc(len); - if(copydata == NULL) return 3; - memcpy(copydata, data, len); - newlump->data = copydata; - } - - /* Set name of newlump */ - memset(newlump->name, '\0', 8); - if(strlen(name) == 8) memcpy(newlump->name, name, 8); - else strcpy(newlump->name, name); - - /* Set up newlumplist and alter prev appropriately */ - newlumplist->cl = newlump; - newlumplist->next = prev->next; - prev->next = newlumplist; - - /* Increment numlumps */ - wfptr->numlumps++; - - return 0; -} - -/* Rename a lump. - * renamed is a pointer to the lump (not lumplist) that needs renaming. - * newname is a null-terminated string with the new name. - * Return zero on success or nonzero on failure. - */ -int rename_lump(struct lump *renamed, char *newname) { - - /* Verify that parameters are valid. */ - if(newname == NULL || renamed == NULL || strlen(newname) > 8) return 1; - - /* Do the renaming. */ - memset(renamed->name, '\0', 8); - if(strlen(newname) == 8) memcpy(renamed->name, newname, 8); - else strcpy(renamed->name, newname); - - return 0; -} - -/* Find the last lump in a wadfile structure. - * Return this lump or NULL on failure. - */ -struct lumplist *find_last_lump(struct wadfile *wfptr) { - struct lumplist *curlump; - - if(wfptr == NULL || wfptr->head == NULL) return NULL; - curlump = wfptr->head; - - while(curlump->next != NULL) curlump = curlump->next; - return curlump; -} - -/* Find the last lump between start and end. - * Return this lump or NULL on failure. - */ -struct lumplist *find_last_lump_between(struct lumplist *start, struct - lumplist *end) { - struct lumplist *curlump; - - if(start == NULL) return NULL; - curlump = start; - - while(curlump->next != end) { - curlump = curlump->next; - if(curlump == NULL) break; - } - - return curlump; -} - -/* Find the next section lump. A section lump is MAPxx (0 <= x <= 9), ExMy - * (0 <= x <= 9, 0 <= y <= 9), or any lump whose name ends in _START or _END. - * Return NULL if there are no section lumps after start. - */ -struct lumplist *find_next_section_lump(struct lumplist *start) { - struct lumplist *curlump, *found = NULL; - char *curname; - - /* Verify that parameter is valid */ - if(start == NULL || start->next == NULL) return NULL; - - /* Loop through the list from start parameter */ - for(curlump = start->next; curlump != NULL && found == NULL; - curlump = curlump->next) { - - /* Skip header lump */ - if(curlump->cl == NULL) continue; - - /* Find name of this lump */ - curname = get_lump_name(curlump->cl); - if(curname == NULL) continue; - - /* Check to see if this is a section lump */ - if(strlen(curname) == 5 && strncmp("MAP", curname, 3) == 0 && - isdigit(curname[3]) && isdigit(curname[4])) - found = curlump; - else if(strlen(curname) == 4 && curname[0] == 'E' && curname[2] == - 'M' && isdigit(curname[1]) && isdigit(curname[3])) - found = curlump; - else if(strlen(curname) == 7 && strcmp("_START", &curname[1]) == 0) - found = curlump; - else if(strlen(curname) == 8 && strcmp("_START", &curname[2]) == 0) - found = curlump; - else if(strlen(curname) == 5 && strcmp("_END", &curname[1]) == 0) - found = curlump; - else if(strlen(curname) == 6 && strcmp("_END", &curname[2]) == 0) - found = curlump; - - /* Free memory allocated to curname */ - free(curname); - } - - return found; -} diff --git a/tools/SRB2MP/lump.h b/tools/SRB2MP/lump.h deleted file mode 100644 index b36b84441..000000000 --- a/tools/SRB2MP/lump.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - LumpMod v0.21, a command-line utility for working with lumps in wad files. - Copyright (C) 2003 Thunder Palace Entertainment. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - lump.h: Defines constants, structures, and functions used in lump.c -*/ - -#ifndef __LUMP_H -#define __LUMP_H - -/* Entries in the wadfile directory are 16 bytes */ -#define DIRENTRYLEN 16 - -/* Lumps and associated info */ -struct lump { - long len; - unsigned char *data; - char name[8]; -}; - -/* Linked list of lumps */ -struct lumplist { - struct lump *cl; /* actual content of the lump */ - struct lumplist *next; -}; - -/* Structure to contain all wadfile data */ -struct wadfile { - char id[4]; /* IWAD or PWAD */ - unsigned long numlumps; /* 32-bit integer */ - struct lumplist *head; /* points to first entry */ -}; - -/* Function declarations */ -struct wadfile *read_wadfile(FILE *); -void free_wadfile(struct wadfile *); -int write_wadfile(FILE *, struct wadfile *); -char *get_lump_name(struct lump *); -struct lumplist *find_previous_lump(struct lumplist *, struct lumplist *, char *); -void remove_next_lump(struct wadfile *, struct lumplist *); -int add_lump(struct wadfile *, struct lumplist *, char *, long, unsigned char *); -int rename_lump(struct lump *, char *); -struct lumplist *find_last_lump(struct wadfile *); -struct lumplist *find_last_lump_between(struct lumplist *, struct lumplist *); -struct lumplist *find_next_section_lump(struct lumplist *); - -#endif diff --git a/tools/SRB2MP/resource.h b/tools/SRB2MP/resource.h deleted file mode 100644 index 56924e34a..000000000 --- a/tools/SRB2MP/resource.h +++ /dev/null @@ -1,26 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Developer Studio generated include file. -// Used by Script1.rc -// -#define IDD_MAIN 101 -#define IDI_ICON1 102 -#define IDC_ABOUT 1000 -#define IDC_WADLIST 1001 -#define IDC_PLAYLIST 1002 -#define IDC_PLAY 1003 -#define IDC_ADD 1004 -#define IDC_REMOVE 1005 -#define IDC_OPEN 1006 -#define IDC_TITLE 1007 -#define IDC_ARTIST 1008 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 105 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1009 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/tools/SRB2Updater/Bunny.cs b/tools/SRB2Updater/Bunny.cs deleted file mode 100644 index 71934ee31..000000000 --- a/tools/SRB2Updater/Bunny.cs +++ /dev/null @@ -1,53 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Windows.Forms; - -namespace SRB2Updater -{ - public class Bunny - { - List Keys = new List{System.Windows.Forms.Keys.Up, System.Windows.Forms.Keys.Up, - System.Windows.Forms.Keys.Down, System.Windows.Forms.Keys.Down, - System.Windows.Forms.Keys.Left, System.Windows.Forms.Keys.Right, - System.Windows.Forms.Keys.Left, System.Windows.Forms.Keys.Right, - System.Windows.Forms.Keys.B, System.Windows.Forms.Keys.A}; - private int mPosition = -1; - - public int Position - { - get { return mPosition; } - private set { mPosition = value; } - } - - public bool IsCompletedBy(Keys key) - { - - if (Keys[Position + 1] == key) - { - // move to next - Position++; - } - else if (Position == 1 && key == System.Windows.Forms.Keys.Up) - { - // stay where we are - } - else if (Keys[0] == key) - { - // restart at 1st - Position = 0; - } - else - { - // no match in sequence - Position = -1; - } - - if (Position == Keys.Count - 1) - { - Position = -1; - return true; - } - return false; - } - } -} diff --git a/tools/SRB2Updater/Debug.Designer.cs b/tools/SRB2Updater/Debug.Designer.cs deleted file mode 100644 index 6ec72f904..000000000 --- a/tools/SRB2Updater/Debug.Designer.cs +++ /dev/null @@ -1,266 +0,0 @@ -namespace SRB2Updater -{ - partial class Debug - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.lblOverallPercentage = new System.Windows.Forms.Label(); - this.lblPercent = new System.Windows.Forms.Label(); - this.lblOverall = new System.Windows.Forms.Label(); - this.lblCurrent = new System.Windows.Forms.Label(); - this.lblTotal = new System.Windows.Forms.Label(); - this.lblRead = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.label6 = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label7 = new System.Windows.Forms.Label(); - this.lblKonami = new System.Windows.Forms.Label(); - this.lblRandom = new System.Windows.Forms.Label(); - this.label9 = new System.Windows.Forms.Label(); - this.tableLayoutPanel1.SuspendLayout(); - this.SuspendLayout(); - // - // lblOverallPercentage - // - this.lblOverallPercentage.AutoSize = true; - this.lblOverallPercentage.Location = new System.Drawing.Point(176, 150); - this.lblOverallPercentage.Name = "lblOverallPercentage"; - this.lblOverallPercentage.Size = new System.Drawing.Size(21, 13); - this.lblOverallPercentage.TabIndex = 26; - this.lblOverallPercentage.Text = "0%"; - // - // lblPercent - // - this.lblPercent.AutoSize = true; - this.lblPercent.Location = new System.Drawing.Point(176, 90); - this.lblPercent.Name = "lblPercent"; - this.lblPercent.Size = new System.Drawing.Size(21, 13); - this.lblPercent.TabIndex = 25; - this.lblPercent.Text = "0%"; - // - // lblOverall - // - this.lblOverall.AutoSize = true; - this.lblOverall.Location = new System.Drawing.Point(176, 120); - this.lblOverall.Name = "lblOverall"; - this.lblOverall.Size = new System.Drawing.Size(41, 13); - this.lblOverall.TabIndex = 24; - this.lblOverall.Text = "0 bytes"; - // - // lblCurrent - // - this.lblCurrent.AutoSize = true; - this.lblCurrent.Location = new System.Drawing.Point(176, 60); - this.lblCurrent.Name = "lblCurrent"; - this.lblCurrent.Size = new System.Drawing.Size(41, 13); - this.lblCurrent.TabIndex = 23; - this.lblCurrent.Text = "0 bytes"; - // - // lblTotal - // - this.lblTotal.AutoSize = true; - this.lblTotal.Location = new System.Drawing.Point(176, 0); - this.lblTotal.Name = "lblTotal"; - this.lblTotal.Size = new System.Drawing.Size(41, 13); - this.lblTotal.TabIndex = 21; - this.lblTotal.Text = "0 bytes"; - // - // lblRead - // - this.lblRead.AutoSize = true; - this.lblRead.Location = new System.Drawing.Point(176, 30); - this.lblRead.Name = "lblRead"; - this.lblRead.Size = new System.Drawing.Size(41, 13); - this.lblRead.TabIndex = 22; - this.lblRead.Text = "0 bytes"; - this.lblRead.TextAlign = System.Drawing.ContentAlignment.TopRight; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(3, 0); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(105, 13); - this.label1.TabIndex = 27; - this.label1.Text = "Total Download Size"; - // - // tableLayoutPanel1 - // - this.tableLayoutPanel1.ColumnCount = 2; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 66.66666F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); - this.tableLayoutPanel1.Controls.Add(this.label6, 0, 5); - this.tableLayoutPanel1.Controls.Add(this.label5, 0, 4); - this.tableLayoutPanel1.Controls.Add(this.label4, 0, 3); - this.tableLayoutPanel1.Controls.Add(this.label3, 0, 2); - this.tableLayoutPanel1.Controls.Add(this.label2, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.label1, 0, 0); - this.tableLayoutPanel1.Controls.Add(this.lblOverallPercentage, 1, 5); - this.tableLayoutPanel1.Controls.Add(this.lblTotal, 1, 0); - this.tableLayoutPanel1.Controls.Add(this.lblOverall, 1, 4); - this.tableLayoutPanel1.Controls.Add(this.lblPercent, 1, 3); - this.tableLayoutPanel1.Controls.Add(this.lblRead, 1, 1); - this.tableLayoutPanel1.Controls.Add(this.lblCurrent, 1, 2); - this.tableLayoutPanel1.Controls.Add(this.label7, 0, 6); - this.tableLayoutPanel1.Controls.Add(this.lblKonami, 1, 6); - this.tableLayoutPanel1.Controls.Add(this.lblRandom, 1, 7); - this.tableLayoutPanel1.Controls.Add(this.label9, 0, 7); - this.tableLayoutPanel1.Location = new System.Drawing.Point(12, 12); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 9; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(260, 355); - this.tableLayoutPanel1.TabIndex = 28; - // - // label6 - // - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(3, 150); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(98, 13); - this.label6.TabIndex = 32; - this.label6.Text = "Overall Percentage"; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(3, 120); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(132, 13); - this.label5.TabIndex = 31; - this.label5.Text = "Bytes Downloaded Overall"; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(3, 90); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(118, 13); - this.label4.TabIndex = 30; - this.label4.Text = "Current File Percentage"; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(3, 60); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(146, 13); - this.label3.TabIndex = 29; - this.label3.Text = "Downloaded from Current File"; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(3, 30); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(62, 13); - this.label2.TabIndex = 28; - this.label2.Text = "Bytes Read"; - // - // label7 - // - this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(3, 180); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(42, 13); - this.label7.TabIndex = 33; - this.label7.Text = "Konami"; - // - // lblKonami - // - this.lblKonami.AutoSize = true; - this.lblKonami.Location = new System.Drawing.Point(176, 180); - this.lblKonami.Name = "lblKonami"; - this.lblKonami.Size = new System.Drawing.Size(16, 13); - this.lblKonami.TabIndex = 34; - this.lblKonami.Text = "-1"; - // - // lblRandom - // - this.lblRandom.AutoSize = true; - this.lblRandom.Location = new System.Drawing.Point(176, 210); - this.lblRandom.Name = "lblRandom"; - this.lblRandom.Size = new System.Drawing.Size(13, 13); - this.lblRandom.TabIndex = 37; - this.lblRandom.Text = "0"; - // - // label9 - // - this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(3, 210); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(47, 13); - this.label9.TabIndex = 38; - this.label9.Text = "Random"; - // - // Debug - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(284, 379); - this.Controls.Add(this.tableLayoutPanel1); - this.Name = "Debug"; - this.Text = "Debug"; - this.tableLayoutPanel1.ResumeLayout(false); - this.tableLayoutPanel1.PerformLayout(); - this.ResumeLayout(false); - - } - - #endregion - - private System.Windows.Forms.Label lblOverallPercentage; - private System.Windows.Forms.Label lblPercent; - private System.Windows.Forms.Label lblOverall; - private System.Windows.Forms.Label lblCurrent; - private System.Windows.Forms.Label lblTotal; - private System.Windows.Forms.Label lblRead; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; - private System.Windows.Forms.Label label6; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label7; - private System.Windows.Forms.Label lblKonami; - private System.Windows.Forms.Label lblRandom; - private System.Windows.Forms.Label label9; - } -} \ No newline at end of file diff --git a/tools/SRB2Updater/Debug.cs b/tools/SRB2Updater/Debug.cs deleted file mode 100644 index 5cb54dd37..000000000 --- a/tools/SRB2Updater/Debug.cs +++ /dev/null @@ -1,66 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Text; -using System.Windows.Forms; - -namespace SRB2Updater -{ - public partial class Debug : Form - { - public Debug() - { - InitializeComponent(); - } - - public String strOverall - { - get { return this.lblOverall.Text; } - set { this.lblOverall.Text = value; } - } - - public String strKonami - { - get { return this.lblKonami.Text; } - set { this.lblKonami.Text = value; } - } - - public String strRandom - { - get { return this.lblRandom.Text; } - set { this.lblRandom.Text = value; } - } - - public String strOverallPercentage - { - get { return this.lblOverallPercentage.Text; } - set { this.lblOverallPercentage.Text = value; } - } - - public String strCurrent - { - get { return this.lblCurrent.Text; } - set { this.lblCurrent.Text = value; } - } - - public String strPercent - { - get { return this.lblPercent.Text; } - set { this.lblPercent.Text = value; } - } - - public String strRead - { - get { return this.lblRead.Text; } - set { this.lblRead.Text = value; } - } - - public String strTotal - { - get { return this.lblTotal.Text; } - set { this.lblTotal.Text = value; } - } - } -} diff --git a/tools/SRB2Updater/Debug.resx b/tools/SRB2Updater/Debug.resx deleted file mode 100644 index ff31a6db5..000000000 --- a/tools/SRB2Updater/Debug.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/tools/SRB2Updater/Launcher.Designer.cs b/tools/SRB2Updater/Launcher.Designer.cs deleted file mode 100644 index 9126eba54..000000000 --- a/tools/SRB2Updater/Launcher.Designer.cs +++ /dev/null @@ -1,766 +0,0 @@ -namespace SRB2Updater -{ - partial class Launcher - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Launcher)); - this.panel1 = new System.Windows.Forms.Panel(); - this.panel3 = new System.Windows.Forms.Panel(); - this.btnOptions = new System.Windows.Forms.Button(); - this.btnCheckFiles = new System.Windows.Forms.Button(); - this.btnStartSRB2 = new System.Windows.Forms.Button(); - this.panel2 = new System.Windows.Forms.Panel(); - this.lblProgress = new System.Windows.Forms.Label(); - this.update_optional = new System.Windows.Forms.CheckBox(); - this.progress_overall = new System.Windows.Forms.ProgressBar(); - this.progress_currentFile = new System.Windows.Forms.ProgressBar(); - this.tab_web = new System.Windows.Forms.TabControl(); - this.tabPage1 = new System.Windows.Forms.TabPage(); - this.panel10 = new System.Windows.Forms.Panel(); - this.webBrowser3 = new System.Windows.Forms.WebBrowser(); - this.tabPage2 = new System.Windows.Forms.TabPage(); - this.panel9 = new System.Windows.Forms.Panel(); - this.webBrowser1 = new System.Windows.Forms.WebBrowser(); - this.tabPage3 = new System.Windows.Forms.TabPage(); - this.panel8 = new System.Windows.Forms.Panel(); - this.fileList = new System.Windows.Forms.DataGridView(); - this.name = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.filename = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.status = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.localmd5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.md5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.optional = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.calculated = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.serverTab = new System.Windows.Forms.TabPage(); - this.panel6 = new System.Windows.Forms.Panel(); - this.listViewServers = new System.Windows.Forms.ListView(); - this.colhdrName = new System.Windows.Forms.ColumnHeader("(none)"); - this.colhdrGametype = new System.Windows.Forms.ColumnHeader(); - this.colhdrPing = new System.Windows.Forms.ColumnHeader(); - this.colhdrPlayers = new System.Windows.Forms.ColumnHeader(); - this.colhdrVersion = new System.Windows.Forms.ColumnHeader(); - this.panel4 = new System.Windows.Forms.Panel(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.label4 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); - this.button1 = new System.Windows.Forms.Button(); - this.button3 = new System.Windows.Forms.Button(); - this.btnConnect = new System.Windows.Forms.Button(); - this.panel5 = new System.Windows.Forms.Panel(); - this.bannerRandom = new System.Windows.Forms.Panel(); - this.backgroundWorkerQueryServers = new System.ComponentModel.BackgroundWorker(); - this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); - this.webBrowser2 = new System.Windows.Forms.WebBrowser(); - this.panel1.SuspendLayout(); - this.panel3.SuspendLayout(); - this.panel2.SuspendLayout(); - this.tab_web.SuspendLayout(); - this.tabPage1.SuspendLayout(); - this.panel10.SuspendLayout(); - this.tabPage2.SuspendLayout(); - this.panel9.SuspendLayout(); - this.tabPage3.SuspendLayout(); - this.panel8.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.fileList)).BeginInit(); - this.serverTab.SuspendLayout(); - this.panel6.SuspendLayout(); - this.panel4.SuspendLayout(); - this.groupBox1.SuspendLayout(); - this.panel5.SuspendLayout(); - this.SuspendLayout(); - // - // panel1 - // - this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(212)))), ((int)(((byte)(204)))), ((int)(((byte)(187))))); - this.panel1.Controls.Add(this.panel3); - this.panel1.Controls.Add(this.panel2); - this.panel1.Location = new System.Drawing.Point(12, 415); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(772, 125); - this.panel1.TabIndex = 0; - // - // panel3 - // - this.panel3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Right))); - this.panel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(230)))), ((int)(((byte)(217))))); - this.panel3.Controls.Add(this.btnOptions); - this.panel3.Controls.Add(this.btnCheckFiles); - this.panel3.Controls.Add(this.btnStartSRB2); - this.panel3.Location = new System.Drawing.Point(557, 10); - this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(204, 104); - this.panel3.TabIndex = 1; - // - // btnOptions - // - this.btnOptions.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.btnOptions.Font = new System.Drawing.Font("Arial Rounded MT Bold", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnOptions.Location = new System.Drawing.Point(105, 72); - this.btnOptions.Name = "btnOptions"; - this.btnOptions.Size = new System.Drawing.Size(96, 29); - this.btnOptions.TabIndex = 2; - this.btnOptions.Text = "Options"; - this.btnOptions.UseVisualStyleBackColor = true; - this.btnOptions.Click += new System.EventHandler(this.btnOptions_Click); - // - // btnCheckFiles - // - this.btnCheckFiles.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.btnCheckFiles.Font = new System.Drawing.Font("Arial Rounded MT Bold", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnCheckFiles.Location = new System.Drawing.Point(4, 72); - this.btnCheckFiles.Name = "btnCheckFiles"; - this.btnCheckFiles.Size = new System.Drawing.Size(96, 29); - this.btnCheckFiles.TabIndex = 1; - this.btnCheckFiles.Text = "Check Files"; - this.btnCheckFiles.UseVisualStyleBackColor = true; - this.btnCheckFiles.Click += new System.EventHandler(this.update_Load); - // - // btnStartSRB2 - // - this.btnStartSRB2.BackColor = System.Drawing.Color.Transparent; - this.btnStartSRB2.Font = new System.Drawing.Font("Arial Rounded MT Bold", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnStartSRB2.Location = new System.Drawing.Point(4, 4); - this.btnStartSRB2.Name = "btnStartSRB2"; - this.btnStartSRB2.Size = new System.Drawing.Size(197, 62); - this.btnStartSRB2.TabIndex = 0; - this.btnStartSRB2.Text = "Start"; - this.btnStartSRB2.UseVisualStyleBackColor = false; - this.btnStartSRB2.Click += new System.EventHandler(this.btnStartSRB2_Click); - // - // panel2 - // - this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left))); - this.panel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(230)))), ((int)(((byte)(217))))); - this.panel2.Controls.Add(this.lblProgress); - this.panel2.Controls.Add(this.update_optional); - this.panel2.Controls.Add(this.progress_overall); - this.panel2.Controls.Add(this.progress_currentFile); - this.panel2.Location = new System.Drawing.Point(10, 10); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(541, 105); - this.panel2.TabIndex = 0; - // - // lblProgress - // - this.lblProgress.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.lblProgress.AutoSize = true; - this.lblProgress.Font = new System.Drawing.Font("Arial Rounded MT Bold", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblProgress.ForeColor = System.Drawing.Color.Black; - this.lblProgress.Location = new System.Drawing.Point(6, 68); - this.lblProgress.Name = "lblProgress"; - this.lblProgress.Size = new System.Drawing.Size(299, 14); - this.lblProgress.TabIndex = 14; - this.lblProgress.Text = "Click \'Check Files\' to check for and apply updates."; - // - // update_optional - // - this.update_optional.AutoSize = true; - this.update_optional.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.update_optional.Location = new System.Drawing.Point(372, 68); - this.update_optional.Name = "update_optional"; - this.update_optional.Size = new System.Drawing.Size(160, 18); - this.update_optional.TabIndex = 13; - this.update_optional.Text = "Download Optional Updates"; - this.update_optional.UseVisualStyleBackColor = true; - // - // progress_overall - // - this.progress_overall.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.progress_overall.Location = new System.Drawing.Point(9, 36); - this.progress_overall.Name = "progress_overall"; - this.progress_overall.Size = new System.Drawing.Size(522, 26); - this.progress_overall.TabIndex = 1; - // - // progress_currentFile - // - this.progress_currentFile.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.progress_currentFile.Location = new System.Drawing.Point(9, 4); - this.progress_currentFile.Name = "progress_currentFile"; - this.progress_currentFile.Size = new System.Drawing.Size(522, 26); - this.progress_currentFile.TabIndex = 0; - // - // tab_web - // - this.tab_web.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.tab_web.Controls.Add(this.tabPage1); - this.tab_web.Controls.Add(this.tabPage2); - this.tab_web.Controls.Add(this.tabPage3); - this.tab_web.Controls.Add(this.serverTab); - this.tab_web.Font = new System.Drawing.Font("Arial Rounded MT Bold", 9F); - this.tab_web.Location = new System.Drawing.Point(0, 138); - this.tab_web.Name = "tab_web"; - this.tab_web.SelectedIndex = 0; - this.tab_web.Size = new System.Drawing.Size(770, 256); - this.tab_web.TabIndex = 1; - // - // tabPage1 - // - this.tabPage1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(212)))), ((int)(((byte)(204)))), ((int)(((byte)(187))))); - this.tabPage1.Controls.Add(this.panel10); - this.tabPage1.Font = new System.Drawing.Font("Arial Rounded MT Bold", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.tabPage1.Location = new System.Drawing.Point(4, 23); - this.tabPage1.Name = "tabPage1"; - this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(762, 229); - this.tabPage1.TabIndex = 0; - this.tabPage1.Text = "News & Updates"; - // - // panel10 - // - this.panel10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(230)))), ((int)(((byte)(217))))); - this.panel10.Controls.Add(this.webBrowser3); - this.panel10.Location = new System.Drawing.Point(4, 6); - this.panel10.Name = "panel10"; - this.panel10.Padding = new System.Windows.Forms.Padding(5); - this.panel10.Size = new System.Drawing.Size(748, 217); - this.panel10.TabIndex = 14; - // - // webBrowser3 - // - this.webBrowser3.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.webBrowser3.Location = new System.Drawing.Point(8, 8); - this.webBrowser3.MinimumSize = new System.Drawing.Size(20, 20); - this.webBrowser3.Name = "webBrowser3"; - this.webBrowser3.Size = new System.Drawing.Size(732, 201); - this.webBrowser3.TabIndex = 0; - this.webBrowser3.Url = new System.Uri("http://update.srb2.org/files_beta/files_beta.xml", System.UriKind.Absolute); - // - // tabPage2 - // - this.tabPage2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(212)))), ((int)(((byte)(204)))), ((int)(((byte)(187))))); - this.tabPage2.Controls.Add(this.panel9); - this.tabPage2.Font = new System.Drawing.Font("Arial Rounded MT Bold", 9F); - this.tabPage2.Location = new System.Drawing.Point(4, 23); - this.tabPage2.Name = "tabPage2"; - this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(762, 229); - this.tabPage2.TabIndex = 1; - this.tabPage2.Text = "Change Log"; - // - // panel9 - // - this.panel9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(230)))), ((int)(((byte)(217))))); - this.panel9.Controls.Add(this.webBrowser1); - this.panel9.Location = new System.Drawing.Point(4, 6); - this.panel9.Name = "panel9"; - this.panel9.Padding = new System.Windows.Forms.Padding(5); - this.panel9.Size = new System.Drawing.Size(748, 217); - this.panel9.TabIndex = 13; - // - // webBrowser1 - // - this.webBrowser1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.webBrowser1.Location = new System.Drawing.Point(8, 8); - this.webBrowser1.MinimumSize = new System.Drawing.Size(20, 20); - this.webBrowser1.Name = "webBrowser1"; - this.webBrowser1.Size = new System.Drawing.Size(732, 201); - this.webBrowser1.TabIndex = 0; - this.webBrowser1.Url = new System.Uri("http://update.srb2.org/files_beta/changelog.html", System.UriKind.Absolute); - // - // tabPage3 - // - this.tabPage3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(212)))), ((int)(((byte)(204)))), ((int)(((byte)(187))))); - this.tabPage3.Controls.Add(this.panel8); - this.tabPage3.Location = new System.Drawing.Point(4, 23); - this.tabPage3.Name = "tabPage3"; - this.tabPage3.Padding = new System.Windows.Forms.Padding(3); - this.tabPage3.Size = new System.Drawing.Size(762, 229); - this.tabPage3.TabIndex = 2; - this.tabPage3.Text = "Download List"; - // - // panel8 - // - this.panel8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(230)))), ((int)(((byte)(217))))); - this.panel8.Controls.Add(this.fileList); - this.panel8.Location = new System.Drawing.Point(4, 6); - this.panel8.Name = "panel8"; - this.panel8.Padding = new System.Windows.Forms.Padding(5); - this.panel8.Size = new System.Drawing.Size(748, 217); - this.panel8.TabIndex = 12; - // - // fileList - // - this.fileList.AllowUserToAddRows = false; - this.fileList.AllowUserToDeleteRows = false; - this.fileList.AllowUserToResizeRows = false; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(212)))), ((int)(((byte)(204)))), ((int)(((byte)(187))))); - dataGridViewCellStyle1.Font = new System.Drawing.Font("Arial Rounded MT Bold", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle1.ForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(212)))), ((int)(((byte)(204)))), ((int)(((byte)(187))))); - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.Black; - this.fileList.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; - this.fileList.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.fileList.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; - this.fileList.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(224)))), ((int)(((byte)(206))))); - this.fileList.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(212)))), ((int)(((byte)(204)))), ((int)(((byte)(187))))); - dataGridViewCellStyle2.Font = new System.Drawing.Font("Arial Rounded MT Bold", 9F); - dataGridViewCellStyle2.ForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle2.Padding = new System.Windows.Forms.Padding(2); - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(212)))), ((int)(((byte)(204)))), ((int)(((byte)(187))))); - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.fileList.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; - this.fileList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.fileList.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.name, - this.filename, - this.status, - this.localmd5, - this.md5, - this.optional, - this.calculated}); - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(224)))), ((int)(((byte)(206))))); - dataGridViewCellStyle4.Font = new System.Drawing.Font("Arial Rounded MT Bold", 9F); - dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(224)))), ((int)(((byte)(206))))); - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.fileList.DefaultCellStyle = dataGridViewCellStyle4; - this.fileList.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(212)))), ((int)(((byte)(204)))), ((int)(((byte)(187))))); - this.fileList.Location = new System.Drawing.Point(8, 8); - this.fileList.MultiSelect = false; - this.fileList.Name = "fileList"; - this.fileList.ReadOnly = true; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(224)))), ((int)(((byte)(206))))); - dataGridViewCellStyle5.Font = new System.Drawing.Font("Arial Rounded MT Bold", 9F); - dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(224)))), ((int)(((byte)(206))))); - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.fileList.RowHeadersDefaultCellStyle = dataGridViewCellStyle5; - this.fileList.RowHeadersVisible = false; - dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(224)))), ((int)(((byte)(206))))); - dataGridViewCellStyle6.ForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(224)))), ((int)(((byte)(206))))); - dataGridViewCellStyle6.SelectionForeColor = System.Drawing.Color.Black; - this.fileList.RowsDefaultCellStyle = dataGridViewCellStyle6; - this.fileList.RowTemplate.DefaultCellStyle.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(224)))), ((int)(((byte)(206))))); - this.fileList.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.fileList.RowTemplate.DefaultCellStyle.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(224)))), ((int)(((byte)(206))))); - this.fileList.RowTemplate.DefaultCellStyle.SelectionForeColor = System.Drawing.Color.Black; - this.fileList.RowTemplate.ReadOnly = true; - this.fileList.Size = new System.Drawing.Size(732, 201); - this.fileList.TabIndex = 11; - // - // name - // - this.name.DataPropertyName = "name"; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.White; - this.name.DefaultCellStyle = dataGridViewCellStyle3; - this.name.FillWeight = 128.7982F; - this.name.HeaderText = "Name"; - this.name.Name = "name"; - this.name.ReadOnly = true; - // - // filename - // - this.filename.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.filename.DataPropertyName = "filename"; - this.filename.HeaderText = "File"; - this.filename.Name = "filename"; - this.filename.ReadOnly = true; - this.filename.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.filename.Width = 150; - // - // status - // - this.status.DataPropertyName = "status"; - this.status.FillWeight = 128.7982F; - this.status.HeaderText = "Status"; - this.status.Name = "status"; - this.status.ReadOnly = true; - // - // localmd5 - // - this.localmd5.DataPropertyName = "localmd5"; - this.localmd5.FillWeight = 13.60544F; - this.localmd5.HeaderText = "localmd5"; - this.localmd5.Name = "localmd5"; - this.localmd5.ReadOnly = true; - this.localmd5.Visible = false; - // - // md5 - // - this.md5.DataPropertyName = "md5"; - this.md5.FillWeight = 128.7982F; - this.md5.HeaderText = "md5"; - this.md5.Name = "md5"; - this.md5.ReadOnly = true; - this.md5.Visible = false; - // - // optional - // - this.optional.DataPropertyName = "optional"; - this.optional.HeaderText = "optional"; - this.optional.Name = "optional"; - this.optional.ReadOnly = true; - this.optional.Visible = false; - // - // calculated - // - this.calculated.DataPropertyName = "calculated"; - this.calculated.HeaderText = "calculated"; - this.calculated.Name = "calculated"; - this.calculated.ReadOnly = true; - this.calculated.Visible = false; - // - // serverTab - // - this.serverTab.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(212)))), ((int)(((byte)(204)))), ((int)(((byte)(187))))); - this.serverTab.Controls.Add(this.panel6); - this.serverTab.Controls.Add(this.panel4); - this.serverTab.Location = new System.Drawing.Point(4, 23); - this.serverTab.Name = "serverTab"; - this.serverTab.Padding = new System.Windows.Forms.Padding(3); - this.serverTab.Size = new System.Drawing.Size(762, 229); - this.serverTab.TabIndex = 3; - this.serverTab.Text = "Master Server"; - // - // panel6 - // - this.panel6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(230)))), ((int)(((byte)(217))))); - this.panel6.Controls.Add(this.listViewServers); - this.panel6.Location = new System.Drawing.Point(4, 6); - this.panel6.Name = "panel6"; - this.panel6.Padding = new System.Windows.Forms.Padding(5); - this.panel6.Size = new System.Drawing.Size(603, 217); - this.panel6.TabIndex = 6; - // - // listViewServers - // - this.listViewServers.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.listViewServers.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(224)))), ((int)(((byte)(206))))); - this.listViewServers.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.listViewServers.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.colhdrName, - this.colhdrGametype, - this.colhdrPing, - this.colhdrPlayers, - this.colhdrVersion}); - this.listViewServers.Font = new System.Drawing.Font("Arial Rounded MT Bold", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.listViewServers.FullRowSelect = true; - this.listViewServers.HideSelection = false; - this.listViewServers.Location = new System.Drawing.Point(9, 8); - this.listViewServers.Name = "listViewServers"; - this.listViewServers.ShowItemToolTips = true; - this.listViewServers.Size = new System.Drawing.Size(586, 201); - this.listViewServers.TabIndex = 1; - this.listViewServers.UseCompatibleStateImageBehavior = false; - this.listViewServers.View = System.Windows.Forms.View.Details; - this.listViewServers.ItemActivate += new System.EventHandler(this.listViewServers_ItemActivate); - this.listViewServers.SelectedIndexChanged += new System.EventHandler(this.listViewServers_SelectedIndexChanged); - this.listViewServers.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.listViewServers_ColumnClick); - // - // colhdrName - // - this.colhdrName.Tag = ""; - this.colhdrName.Text = "Server Name"; - this.colhdrName.Width = 231; - // - // colhdrGametype - // - this.colhdrGametype.Text = "Gametype"; - this.colhdrGametype.Width = 92; - // - // colhdrPing - // - this.colhdrPing.Text = "Ping (ms)"; - this.colhdrPing.Width = 87; - // - // colhdrPlayers - // - this.colhdrPlayers.Text = "Players"; - this.colhdrPlayers.Width = 88; - // - // colhdrVersion - // - this.colhdrVersion.Text = "Version"; - this.colhdrVersion.Width = 87; - // - // panel4 - // - this.panel4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(230)))), ((int)(((byte)(217))))); - this.panel4.Controls.Add(this.groupBox1); - this.panel4.Controls.Add(this.button1); - this.panel4.Controls.Add(this.button3); - this.panel4.Controls.Add(this.btnConnect); - this.panel4.Location = new System.Drawing.Point(613, 6); - this.panel4.Name = "panel4"; - this.panel4.Padding = new System.Windows.Forms.Padding(5); - this.panel4.Size = new System.Drawing.Size(139, 217); - this.panel4.TabIndex = 5; - // - // groupBox1 - // - this.groupBox1.Controls.Add(this.label4); - this.groupBox1.Controls.Add(this.label3); - this.groupBox1.Controls.Add(this.label2); - this.groupBox1.Controls.Add(this.label1); - this.groupBox1.Location = new System.Drawing.Point(9, 114); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(122, 95); - this.groupBox1.TabIndex = 5; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Key"; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Font = new System.Drawing.Font("Arial Rounded MT Bold", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label4.ForeColor = System.Drawing.Color.Black; - this.label4.Location = new System.Drawing.Point(6, 77); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(87, 14); - this.label4.TabIndex = 3; - this.label4.Text = "Normal Game"; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Font = new System.Drawing.Font("Arial Rounded MT Bold", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label3.ForeColor = System.Drawing.Color.DimGray; - this.label3.Location = new System.Drawing.Point(6, 57); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(78, 14); - this.label3.TabIndex = 2; - this.label3.Text = "Game is Full"; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Font = new System.Drawing.Font("Arial Rounded MT Bold", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label2.ForeColor = System.Drawing.Color.Green; - this.label2.Location = new System.Drawing.Point(6, 37); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(99, 14); - this.label2.TabIndex = 1; - this.label2.Text = "Cheats Enabled"; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Font = new System.Drawing.Font("Arial Rounded MT Bold", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.ForeColor = System.Drawing.Color.Red; - this.label1.Location = new System.Drawing.Point(6, 17); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(57, 14); - this.label1.TabIndex = 0; - this.label1.Text = "Modified"; - // - // button1 - // - this.button1.Font = new System.Drawing.Font("Arial Rounded MT Bold", 9.75F); - this.button1.Location = new System.Drawing.Point(8, 8); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(123, 29); - this.button1.TabIndex = 2; - this.button1.Text = "Refresh List"; - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.btnRefresh_Click); - // - // button3 - // - this.button3.Font = new System.Drawing.Font("Arial Rounded MT Bold", 9.75F); - this.button3.Location = new System.Drawing.Point(8, 78); - this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(123, 29); - this.button3.TabIndex = 4; - this.button3.Text = "Join Game (IP)"; - this.button3.UseVisualStyleBackColor = true; - // - // btnConnect - // - this.btnConnect.Enabled = false; - this.btnConnect.Font = new System.Drawing.Font("Arial Rounded MT Bold", 9.75F); - this.btnConnect.Location = new System.Drawing.Point(8, 43); - this.btnConnect.Name = "btnConnect"; - this.btnConnect.Size = new System.Drawing.Size(123, 29); - this.btnConnect.TabIndex = 3; - this.btnConnect.Text = "Join Game (List)"; - this.btnConnect.UseVisualStyleBackColor = true; - this.btnConnect.Click += new System.EventHandler(this.btnConnect_Click); - // - // panel5 - // - this.panel5.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.panel5.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.panel5.Controls.Add(this.tab_web); - this.panel5.Controls.Add(this.bannerRandom); - this.panel5.Location = new System.Drawing.Point(12, 13); - this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(772, 396); - this.panel5.TabIndex = 1; - // - // bannerRandom - // - this.bannerRandom.BackgroundImage = global::SRB2Updater.Properties.Resources.Banner4; - this.bannerRandom.Location = new System.Drawing.Point(0, -2); - this.bannerRandom.Name = "bannerRandom"; - this.bannerRandom.Size = new System.Drawing.Size(768, 123); - this.bannerRandom.TabIndex = 3; - // - // backgroundWorkerQueryServers - // - this.backgroundWorkerQueryServers.DoWork += new System.ComponentModel.DoWorkEventHandler(this.backgroundWorkerQueryServers_DoWork); - // - // openFileDialog1 - // - this.openFileDialog1.DefaultExt = "exe"; - this.openFileDialog1.Filter = "Executables files|*.exe|All files|*.*"; - // - // webBrowser2 - // - this.webBrowser2.Location = new System.Drawing.Point(8, 8); - this.webBrowser2.MinimumSize = new System.Drawing.Size(20, 20); - this.webBrowser2.Name = "webBrowser2"; - this.webBrowser2.Size = new System.Drawing.Size(567, 201); - this.webBrowser2.TabIndex = 0; - this.webBrowser2.Url = new System.Uri("http://update.srb2.org/files_beta/changelog.html", System.UriKind.Absolute); - // - // Launcher - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(230)))), ((int)(((byte)(217))))); - this.ClientSize = new System.Drawing.Size(796, 552); - this.Controls.Add(this.panel5); - this.Controls.Add(this.panel1); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.KeyPreview = true; - this.Name = "Launcher"; - this.Text = "Launcher"; - this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.Launcher_FormClosed); - this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.Launcher_KeyUp); - this.panel1.ResumeLayout(false); - this.panel3.ResumeLayout(false); - this.panel2.ResumeLayout(false); - this.panel2.PerformLayout(); - this.tab_web.ResumeLayout(false); - this.tabPage1.ResumeLayout(false); - this.panel10.ResumeLayout(false); - this.tabPage2.ResumeLayout(false); - this.panel9.ResumeLayout(false); - this.tabPage3.ResumeLayout(false); - this.panel8.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.fileList)).EndInit(); - this.serverTab.ResumeLayout(false); - this.panel6.ResumeLayout(false); - this.panel4.ResumeLayout(false); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); - this.panel5.ResumeLayout(false); - this.ResumeLayout(false); - - } - - #endregion - - private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.Panel panel2; - private System.Windows.Forms.Panel panel3; - private System.Windows.Forms.Button btnOptions; - private System.Windows.Forms.Button btnCheckFiles; - private System.Windows.Forms.Button btnStartSRB2; - private System.Windows.Forms.TabControl tab_web; - private System.Windows.Forms.TabPage tabPage1; - private System.Windows.Forms.TabPage tabPage2; - private System.Windows.Forms.Panel panel5; - private System.Windows.Forms.WebBrowser webBrowser1; - private System.Windows.Forms.Panel bannerRandom; - private System.Windows.Forms.ProgressBar progress_overall; - private System.Windows.Forms.ProgressBar progress_currentFile; - private System.Windows.Forms.TabPage tabPage3; - private System.Windows.Forms.DataGridView fileList; - private System.Windows.Forms.CheckBox update_optional; - private System.Windows.Forms.Label lblProgress; - private System.Windows.Forms.DataGridViewTextBoxColumn name; - private System.Windows.Forms.DataGridViewTextBoxColumn filename; - private System.Windows.Forms.DataGridViewTextBoxColumn status; - private System.Windows.Forms.DataGridViewTextBoxColumn localmd5; - private System.Windows.Forms.DataGridViewTextBoxColumn md5; - private System.Windows.Forms.DataGridViewTextBoxColumn optional; - private System.Windows.Forms.DataGridViewTextBoxColumn calculated; - private System.Windows.Forms.TabPage serverTab; - private System.Windows.Forms.ListView listViewServers; - private System.Windows.Forms.ColumnHeader colhdrName; - private System.Windows.Forms.ColumnHeader colhdrGametype; - private System.Windows.Forms.ColumnHeader colhdrPing; - private System.Windows.Forms.ColumnHeader colhdrPlayers; - private System.Windows.Forms.ColumnHeader colhdrVersion; - private System.ComponentModel.BackgroundWorker backgroundWorkerQueryServers; - private System.Windows.Forms.Panel panel4; - private System.Windows.Forms.Button button1; - private System.Windows.Forms.Button button3; - private System.Windows.Forms.Button btnConnect; - private System.Windows.Forms.OpenFileDialog openFileDialog1; - private System.Windows.Forms.Panel panel6; - private System.Windows.Forms.Panel panel8; - private System.Windows.Forms.Panel panel9; - private System.Windows.Forms.Panel panel10; - private System.Windows.Forms.WebBrowser webBrowser3; - private System.Windows.Forms.WebBrowser webBrowser2; - private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label4; - } -} \ No newline at end of file diff --git a/tools/SRB2Updater/Launcher.cs b/tools/SRB2Updater/Launcher.cs deleted file mode 100644 index df2fdf712..000000000 --- a/tools/SRB2Updater/Launcher.cs +++ /dev/null @@ -1,658 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -//using System.Data.OleDb; -using System.Xml; -//using System.Drawing; -using System.Text; -using System.Windows.Forms; -using System.Net; -using System.IO; -using System.Threading; -using System.Security.Cryptography; -//using System.Runtime.InteropServices; -using System.Diagnostics; -using System.Drawing; -using System.Media; - -namespace SRB2Updater -{ - public partial class Launcher : Form - { - private Settings settings = new Settings(); - private Debug debug = new Debug(); - // The thread inside which the download happens - private Thread thrDownload; - private Thread thrTotal; - // The stream of data retrieved from the web server - private Stream strResponse; - // The stream of data that we write to the harddrive - private Stream strLocal; - // The request to the web server for file information - private HttpWebRequest webRequest; - // The response from the web server containing information about the file - private HttpWebResponse webResponse; - // The progress of the download in percentage - private static int PercentProgress; - private static int OverallPercentProgress; - // Overall progress as a percentage - private static Int64 OverallProgress; - // Progress stored, for calculating overall - private static Int64 CurrentProgress; - // Total File Size of entire update - private static Int64 TotalSize; - // The delegate which we will call from the thread to update the form - private delegate void UpdateProgessCallback(Int64 BytesRead, Int64 TotalBytes); - private delegate void OverallProgessCallback(Int64 BytesRead); - // When to pause - bool goPause = false; - // Download Details - string downFile; - // Updating - bool filesGot = false; - bool downloadStatus = false; - bool doneCalculate = false; - string formTitle = "Sonic Robo Blast 2 Launcher"; - bool loadedBat = false; - ProcessStartInfo startinfo = new ProcessStartInfo(); - private ServerQuerier sq; - private string MSFail; - - public Launcher(string[] args) - { - InitializeComponent(); - settings.GetSettings(); - sq = new ServerQuerier(); - ServerInfoListViewAdder silva = new ServerInfoListViewAdder(sq, this); - try - { - sq.SetMasterServer(settings.msAddress, Convert.ToUInt16(settings.msPort)); - } - catch (Exception exception) - { - MSFail = exception.Message; - } - sq.StartListening(silva); - backgroundWorkerQueryServers.RunWorkerAsync(); - foreach (string arg in args) - { - if (arg == "-debug") - { - debug.Show(); - break; - } - } - RandomBanner(); - } - - public string getMD5(string filename) - { - StringBuilder sb = new StringBuilder(); - FileInfo f = new FileInfo(filename); - FileStream fs = f.OpenRead(); - MD5 md5 = new MD5CryptoServiceProvider(); - byte[] hash = md5.ComputeHash(fs); - fs.Close(); - foreach (byte hex in hash) - sb.Append(hex.ToString("x2")); - string md5sum = sb.ToString(); - return md5sum; - } - - public void PlayIt() - { - SoundPlayer player = new SoundPlayer(Properties.Resources.Kotaku); - player.Play(); - } - - public void RandomBanner() - { - Random random = new Random(); - int rand = random.Next(0, 4); - //this.bannerRandom.BackgroundImage = global::SRB2Updater.Properties.Resources.Banner; - switch (rand) - { - case 0: - bannerRandom.BackgroundImage = global::SRB2Updater.Properties.Resources.Banner; - break; - case 1: - bannerRandom.BackgroundImage = global::SRB2Updater.Properties.Resources.Banner2; - break; - case 2: - bannerRandom.BackgroundImage = global::SRB2Updater.Properties.Resources.Banner3; - break; - case 3: - bannerRandom.BackgroundImage = global::SRB2Updater.Properties.Resources.Banner4; - break; - default: - bannerRandom.BackgroundImage = global::SRB2Updater.Properties.Resources.Banner; - break; - } - - debug.strRandom = Convert.ToString(rand); - } - - private void updateList(bool doCalculate) - { - if (filesGot == false) - { - - XmlDataDocument xmlDatadoc = new XmlDataDocument(); - xmlDatadoc.DataSet.ReadXml("http://update.srb2.org/files_beta/files_beta.xml"); - DataSet ds = new DataSet("Files DataSet"); - ds = xmlDatadoc.DataSet; - fileList.DataSource = ds.DefaultViewManager; - fileList.DataMember = "File"; - filesGot = true; - } - if (downloadStatus == false) - { - foreach (DataGridViewRow fileRow in fileList.Rows) - { - if (!File.Exists(fileRow.Cells["filename"].Value.ToString()) && fileRow.Cells["filename"].Value.ToString() != "srb2update.update") - { -// fileRow.DefaultCellStyle.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - fileRow.Cells["localmd5"].Value = "not_found"; - } else { - if (fileRow.Cells["filename"].Value.ToString() == "srb2update.update") - fileRow.Cells["localmd5"].Value = getMD5("srb2update.exe"); - else - fileRow.Cells["localmd5"].Value = getMD5(fileRow.Cells["filename"].Value.ToString()); - } - if (fileRow.Cells["localmd5"].Value.ToString() != fileRow.Cells["md5"].Value.ToString()) - { -// if (fileRow.Cells["localmd5"].Value.ToString() != "not_found") -// fileRow.DefaultCellStyle.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(224)))), ((int)(((byte)(206))))); - fileRow.Cells["status"].Value = "Queued"; - - } - else - { - fileRow.Cells["status"].Value = "Up to date"; - } - } - if (doCalculate) - { - thrTotal = new Thread(new ParameterizedThreadStart(CalculateTotalSize)); - thrTotal.Start(0); - } - if (doneCalculate) - { - foreach (DataGridViewRow fileRow in fileList.Rows) - { - if (fileRow.Cells["localmd5"].Value.ToString() != fileRow.Cells["md5"].Value.ToString()) - { - if (fileRow.Cells["optional"].Value.ToString() == "1" && !update_optional.Checked) - fileRow.Cells["Status"].Value = "Skipped (Optional)"; - else - { - downFile = fileRow.Cells["filename"].Value.ToString(); - thrDownload = new Thread(new ParameterizedThreadStart(Download)); - thrDownload.Start(0); - fileRow.Cells["Status"].Value = "Downloading..."; - downloadStatus = true; - break; - } - } - else - { - fileRow.Cells["Status"].Value = "Up to date"; - } - CurrentProgress = 0; - } - } - } - } - - private void UpdateProgress(Int64 BytesRead, Int64 TotalBytes) - { - // Calculate the download progress in percentages - PercentProgress = Convert.ToInt32((BytesRead * 100) / TotalBytes); - // Make progress on the progress bar - progress_currentFile.Value = PercentProgress; - // Display the current progress on the form - lblProgress.Text = downFile + " - " + (BytesRead / 1024) + "KB of " + (TotalBytes / 1024) + "KB (" + PercentProgress + "%)"; - this.Text = formTitle + " :: Downloading " + downFile + " (" + PercentProgress + "%)"; - debug.strPercent = PercentProgress.ToString() + "%"; - if (BytesRead >= TotalBytes - 1) - updateList(false); - } - - private void UpdateOverallProgress(Int64 BytesRead) - { - // Calculate progress change and add to OverallProgress... - OverallProgress += BytesRead - CurrentProgress; - // Calculate the download progress in percentages - if (TotalSize < 1) - TotalSize = 1; - OverallPercentProgress = Convert.ToInt32((OverallProgress * 100) / TotalSize); - // Make progress on the progress bar - if (OverallPercentProgress > 100) - OverallPercentProgress = 100; - progress_overall.Value = OverallPercentProgress; - if (OverallProgress >= TotalSize) - { - lblProgress.Text = "Done"; - btnCheckFiles.Enabled = true; - } - CurrentProgress = BytesRead; - debug.strCurrent = Convert.ToString(CurrentProgress) + " bytes"; - debug.strOverall = Convert.ToString(OverallProgress) + " bytes"; - debug.strOverallPercentage = Convert.ToString(OverallPercentProgress) + "%"; - debug.strRead = Convert.ToString(BytesRead) + " bytes"; - debug.strTotal = Convert.ToString(TotalSize) + " bytes"; - } - - private void CalculateTotalSize(object startpoint) - { - foreach (DataGridViewRow fileRow in fileList.Rows) - { - if ((fileRow.Cells["optional"].Value.ToString() == "0" || update_optional.Checked) && fileRow.Cells["localmd5"].Value.ToString() != fileRow.Cells["md5"].Value.ToString()) - { - try - { - // Create a request to the file we are downloading - webRequest = (HttpWebRequest)WebRequest.Create("http://update.srb2.org/files_beta/" + fileRow.Cells["filename"].Value.ToString()); - // Set the starting point of the request - webRequest.AddRange(0); - - // Set default authentication for retrieving the file - webRequest.Credentials = CredentialCache.DefaultCredentials; - // Retrieve the response from the server - webResponse = (HttpWebResponse)webRequest.GetResponse(); - // Ask the server for the file size and store it - Int64 fileSize = webResponse.ContentLength; - TotalSize = TotalSize + fileSize; - } - finally - { - // When the above code has ended, close the streams - webResponse.Close(); - } - } - } - doneCalculate = true; - updateList(false); - } - - private void Download(object startpoint) - { - try - { - string filename = Convert.ToString(startpoint); - // Create a request to the file we are downloading - webRequest = (HttpWebRequest)WebRequest.Create("http://update.srb2.org/files_beta/" + downFile); - // Set the starting point of the request - webRequest.AddRange(0); - - // Set default authentication for retrieving the file - webRequest.Credentials = CredentialCache.DefaultCredentials; - // Retrieve the response from the server - webResponse = (HttpWebResponse)webRequest.GetResponse(); - // Ask the server for the file size and store it - Int64 fileSize = webResponse.ContentLength; - - // Open the URL for download - strResponse = webResponse.GetResponseStream(); - - // Create a new file stream where we will be saving the data (local drive) - strLocal = new FileStream(downFile, FileMode.Create, FileAccess.Write, FileShare.None); - // It will store the current number of bytes we retrieved from the server - int bytesSize = 0; - // A buffer for storing and writing the data retrieved from the server - byte[] downBuffer = new byte[2048]; - - // Loop through the buffer until the buffer is empty - while ((bytesSize = strResponse.Read(downBuffer, 0, downBuffer.Length)) > 0) - { - // Write the data from the buffer to the local hard drive - strLocal.Write(downBuffer, 0, bytesSize); - // Invoke the method that updates the form's label and progress bar - this.Invoke(new UpdateProgessCallback(this.UpdateProgress), new object[] { strLocal.Length, fileSize }); - this.Invoke(new OverallProgessCallback(this.UpdateOverallProgress), new object[] { strLocal.Length }); - - if (goPause == true) - { - break; - } - } - } - finally - { - // When the above code has ended, close the streams - strResponse.Close(); - strLocal.Close(); - // And update the row! - downloadStatus = false; - if (downFile == "srb2update.update" && loadedBat != true) - { - MessageBox.Show("The updater will now restart to apply a patch.", "Self Update", MessageBoxButtons.OK); - CreateUpdaterBat(); - startinfo.WindowStyle = ProcessWindowStyle.Hidden; - startinfo.FileName = "srb2update.bat"; - System.Diagnostics.Process.Start(startinfo); - downloadStatus = false; - Environment.Exit(0); - } else - updateList(false); - } - } - - private void CreateUpdaterBat() - { - File.WriteAllText("srb2update.bat", "ping 127.0.0.1\ncopy srb2update.update srb2update.exe\ndel srb2update.update\nsrb2update.exe\nexit"); - } - - - private void update_Load(object sender, EventArgs e) - { - lblProgress.Text = "Getting File List..."; - if (File.Exists("srb2update.bat")) - File.Delete("srb2update.bat"); - TotalSize = 0; - CurrentProgress = 0; - OverallPercentProgress = 0; - OverallProgress = 0; - btnCheckFiles.Enabled = false; - updateList(true); - } - - private void btnOptions_Click(object sender, EventArgs e) - { - new Options(settings).ShowDialog(); - } - - private class ServerInfoListViewAdder : ServerQuerier.ServerInfoReceiveHandler - { - private delegate ListViewItem AddToListCallback(ListViewItem lvi); - private Launcher form1; - private Dictionary dicGametypes = new Dictionary(); - private static Dictionary> dicDefaultFiles = - new Dictionary>(); - - static ServerInfoListViewAdder() - { - dicDefaultFiles.Add( - ServerQuerier.ServerInfoVer.SIV_PREME, - new List( - new string[] { - "srb2.srb", "sonic.plr", "tails.plr", "knux.plr", - "auto.wpn", "bomb.wpn", "home.wpn", "rail.wpn", "infn.wpn", - "drill.dta", "soar.dta", "music.dta" - }) - ); - - dicDefaultFiles.Add( - ServerQuerier.ServerInfoVer.SIV_ME, - new List( - new string[] { - "srb2.wad", "sonic.plr", "tails.plr", "knux.plr", - "rings.wpn", "drill.dta", "soar.dta", "music.dta" - }) - ); - } - - - public ServerInfoListViewAdder(ServerQuerier sq, Launcher form1) - : base(sq) - { - this.form1 = form1; - - // Gametypes. - dicGametypes.Add(0, "Co-op"); - dicGametypes.Add(1, "Match"); - dicGametypes.Add(2, "Race"); - dicGametypes.Add(3, "Tag"); - dicGametypes.Add(4, "CTF"); - dicGametypes.Add(5, "Chaos"); - - // Don't think these are actually used. - dicGametypes.Add(42, "Team Match"); - dicGametypes.Add(43, "Time-Only Race"); - } - - public override void ProcessServerInfo(ServerQuerier.SRB2ServerInfo srb2si) - { - ListView lv = form1.listViewServers; - - // Build a list item. - ListViewItem lvi = new ListViewItem(srb2si.strName); - - // So we can get address and whatever else we might need. - lvi.Tag = srb2si; - - // Gametype string, or number if not recognised. - if (dicGametypes.ContainsKey(srb2si.byGametype)) - lvi.SubItems.Add(dicGametypes[srb2si.byGametype]); - else - lvi.SubItems.Add(Convert.ToString(srb2si.byGametype)); - - lvi.SubItems.Add(Convert.ToString(srb2si.uiTime)); - lvi.SubItems.Add(srb2si.byPlayers + "/" + srb2si.byMaxplayers); - lvi.SubItems.Add(srb2si.strVersion); - - // Make the tooltip. - BuildTooltip(lvi, form1.settings.ShowDefaultWads); - - // Is the game full? - if (srb2si.byPlayers >= srb2si.byMaxplayers) - lvi.ForeColor = Color.DimGray; - // Modified? - else if (srb2si.bModified) - lvi.ForeColor = Color.Red; - - // Thread-safe goodness. - if (lv.InvokeRequired) - { - // Call ourselves in the context of the form's thread. - AddToListCallback addtolistcallback = new AddToListCallback(lv.Items.Add); - lv.Invoke(addtolistcallback, new object[] { lvi }); - } - else - { - // Add it! - lv.Items.Add(lvi); - } - - } - - public override void HandleException(Exception e) - { - - } - - public static void BuildTooltip(ListViewItem lvi, bool bShowDefaultWads) - { - string strWads = String.Empty; - ServerQuerier.SRB2ServerInfo srb2si = (ServerQuerier.SRB2ServerInfo)lvi.Tag; - - foreach (ServerQuerier.AddedWad aw in srb2si.listFiles) - { - List listDefaultFiles = dicDefaultFiles[srb2si.siv]; - - if (bShowDefaultWads || !listDefaultFiles.Contains(aw.strFilename)) - { - strWads += String.Format("\n{0} ({1:f1} KB)", aw.strFilename, Convert.ToSingle(aw.uiSize) / 1024); - if (aw.bImportant) - { - if (aw.downloadtype == ServerQuerier.DownloadTypes.DT_TOOBIG) - strWads += " (too big to download)"; - else if (aw.downloadtype == ServerQuerier.DownloadTypes.DT_DISABLED) - strWads += " (downloading disabled)"; - } - else strWads += " (unimportant)"; - } - } - - lvi.ToolTipText = "Current map: " + srb2si.strMapName + "\n"; - if (strWads != String.Empty) - lvi.ToolTipText += "Wads added:" + strWads; - else lvi.ToolTipText += "No wads added"; - } - } - - private void backgroundWorkerQueryServers_DoWork(object sender, DoWorkEventArgs e) - { - MSClient msclient = new MSClient(); - - try - { - List listServers = msclient.GetServerList(settings.msAddress, Convert.ToUInt16(settings.msPort)); - - - // Query each of the individual servers asynchronously. - foreach (MSServerEntry msse in listServers) - { - sq.Query(msse.strAddress, msse.unPort); - } - } - catch (System.Net.Sockets.SocketException sockexception) - { - MSFail = sockexception.Message; - } - catch (Exception exception) - { - MSFail = exception.Message; - } - } - - private void btnRefresh_Click(object sender, EventArgs e) - { - if (!backgroundWorkerQueryServers.IsBusy) - { - // Clear the server list. - listViewServers.Items.Clear(); - - // Disable the Connect button. - btnConnect.Enabled = false; - - // Query the MS and the individual servers in another thread. - backgroundWorkerQueryServers.RunWorkerAsync(); - } - } - - private void btnConnect_Click(object sender, EventArgs e) - { - if (listViewServers.SelectedItems.Count > 0) - { - ConnectToServerFromListItem(listViewServers.SelectedItems[0]); - } - } - - private void ConnectToServerFromListItem(ListViewItem lvi) - { - ServerQuerier.SRB2ServerInfo srb2si = (ServerQuerier.SRB2ServerInfo)lvi.Tag; - - // Prompt to get a binary if we need one. - if (!settings.HasBinaryForVersion(srb2si.strVersion) && - MessageBox.Show("To join this game, you must register an executable file for version " + srb2si.strVersion + ". Would you like to do so?", Text, MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation) == DialogResult.Yes && - openFileDialog1.ShowDialog() == DialogResult.OK) - { - settings.SetBinary(srb2si.strVersion, openFileDialog1.FileName); - settings.SaveSettings(); - } - - // Go! - ConnectToServer(srb2si.strAddress, srb2si.unPort, srb2si.strVersion); - } - - private void ConnectToServer(string strAddress, ushort unPort, string strVersion) - { - // Make sure we now have a binary. - if (settings.HasBinaryForVersion(strVersion)) - { - try - { - string strBinary = settings.GetBinary(strVersion); - string strDirectory = System.IO.Path.GetDirectoryName(strBinary); - if (strDirectory != String.Empty) - System.IO.Directory.SetCurrentDirectory(strDirectory); - System.Diagnostics.Process.Start(strBinary, System.String.Format("-connect {0}:{1} {2}", strAddress, unPort, settings.Params)).Close(); - if (settings.CloseOnStart) - Environment.Exit(0); - } - catch (Exception exception) - { - MessageBox.Show("Unable to start SRB2: " + exception.Message + ".", "SRB2 MS Launcher", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - } - - private class ListViewSorter : System.Collections.IComparer - { - private int iColumn; - public int Column { get { return iColumn; } } - public SortOrder so; - - public ListViewSorter(int iColumn) - { - this.iColumn = iColumn; - so = SortOrder.Ascending; - } - - public int Compare(object x, object y) - { - ListViewItem lviX = (ListViewItem)x; - ListViewItem lviY = (ListViewItem)y; - - return ((so == SortOrder.Ascending) ? 1 : -1) * String.Compare(lviX.SubItems[iColumn].Text, lviY.SubItems[iColumn].Text); - } - - public void ToggleSortOrder() - { - if (so != SortOrder.Ascending) - so = SortOrder.Ascending; - else - so = SortOrder.Descending; - } - } - - private void listViewServers_ColumnClick(object sender, ColumnClickEventArgs e) - { - if (listViewServers.ListViewItemSorter != null && - ((ListViewSorter)listViewServers.ListViewItemSorter).Column == e.Column) - { - ((ListViewSorter)listViewServers.ListViewItemSorter).ToggleSortOrder(); - listViewServers.Sort(); - } - else - { - listViewServers.ListViewItemSorter = new ListViewSorter(e.Column); - } - } - - private void listViewServers_SelectedIndexChanged(object sender, EventArgs e) - { - btnConnect.Enabled = (listViewServers.SelectedItems.Count > 0); - } - - private void listViewServers_ItemActivate(object sender, EventArgs e) - { - ConnectToServerFromListItem(listViewServers.SelectedItems[0]); - } - - private void Launcher_FormClosed(object sender, FormClosedEventArgs e) - { - Environment.Exit(0); - } - - private Bunny sequence = new Bunny(); - - private void Launcher_KeyUp(object sender, KeyEventArgs e) - { - if (sequence.IsCompletedBy(e.KeyCode)) - { - PlayIt(); - } - debug.strKonami = Convert.ToString(sequence.Position); - } - - private void btnStartSRB2_Click(object sender, EventArgs e) - { - System.Diagnostics.Process.Start("srb2win.exe", System.String.Format("{0}", settings.Params)).Close(); - if(settings.CloseOnStart) - Environment.Exit(0); - } - } -} diff --git a/tools/SRB2Updater/Launcher.resx b/tools/SRB2Updater/Launcher.resx deleted file mode 100644 index 464d72c21..000000000 --- a/tools/SRB2Updater/Launcher.resx +++ /dev/null @@ -1,190 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - 17, 17 - - - 585, 17 - - - - - AAABAAEAICAAAAEACACoCAAAFgAAACgAAAAgAAAAQAAAAAEACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAADg4OAIAAAABQABkAlgAAALkAAABQGQAAcwAlAJYAMQBzJQAAuQA9AJYxAACWAGIAMjIyALk9 - AAD/JSUAPj4+AFZWVgD/SEgAYmJiAABilgBubm4Aenp6AP9rawCAgIAAhoaGAJKSkgD/jo4Anp6eAKSg - oAD/jqsAqqqqAGuP/wC2trYAwMDAAI6r/wDCwsIAa8b/AM7OzgCO1P8A2traAObm5gDy8vIA////AAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAGgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFQ8PHQAAAAAAAAAAAAAAACMgJSUlJSUZ - AAAAABMNBgoPDw8AAAAAAAAAAAAAACInJycnJycnJyclFgYGBggPDw8PDwAAAAAAAAAAAAAjJycnJycn - JycnGScnFQkGCA8PDw8AAAAAAAAAAAAAISMnJycjIyMjJycnJycVDwYGDw8PDwAAAAAAAAAAAAAQAAEj - HygqKSkkHyMnJwoPDwYJDw8PAAAAAAAAAAAAACkTHxwrKysrKysrGhkMDw8PCwYJDw8AAAAAAAAAACkp - JA0pACkrKysrKyspDw8PDw8PAwYIAAAAAAAAAAAAACsiARwAISsrKysrKysSDw8PDw8PAwYAAAAAAAAA - AAAAKyIAEAAfKysrKysrKxcPDw8PDw8PDwgIABYAABcSCAArKAMPACIrKysrKysrGw8PDw8PDw8PDw8P - Dw8PDw8RACsoBA8EISsrKysrKyseDw8PDw8PDw8PDw8PDw8PDwAAKx8PDw8VKSsrKysrKxcPDw8PDw8P - Dw8PDw8PDw8AACooFQ8PDw8aKCsrKysmDw8PDw8PDw8PDw8PDw8PFQAAAAAKDw8PDw8VIigoIgoPDw8P - Dw8PDw8PDw8PDxEAAAAAAAoPDw8PDw8XFxcXEhIPDwUPDw8PDw8PDw8YAAAAAAAACA8PDw8SFxcXFxcX - FxcPFQ8PDw8PDw8KAAAAAAAAAAAACg8PEhcXFxcXFxcXFxkjBRISEhISGAAAAAAAAAAAIRcXCA8XFxcX - FxcXFxcaJyMFDwoLEQAAAAAAAAAAAAAAFxcSDxIXFxcXFxcSEyAlIwILCwsIAAAAAAAAAAAAABcXEg8A - EhIXFxcXEgoPDBUUBwsLCwsLAAAAAAAAAAAAFxcAAAAAFxIXFxcXFxIKDw8ICwsLDg4LAAAAAAAAAAAA - AAAAAAAAABISFxcXFw8PDw8PDw8PDwAAAAAAAAAAAAAAAAAAAAAAAAASEhcSDw8PDw8PDxIAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAFwoSDw8SFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAP///////////////////3////w//APAf/AAAH/gAAD/wAAA/8AAAP/AAAD/AAAB/4AA - Af+AAABYgAAAAIAAAAGAAAADAAAAA8AAAAfAAAAPwAAAP+AAAH+AAAH/wAAB/4QAAP+eAAB//4AA///g - Af//+A////////////////// - - - \ No newline at end of file diff --git a/tools/SRB2Updater/MSClient.cs b/tools/SRB2Updater/MSClient.cs deleted file mode 100644 index 40cb0d984..000000000 --- a/tools/SRB2Updater/MSClient.cs +++ /dev/null @@ -1,121 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using System.Net.Sockets; -using System.Net; -using System.IO; - -namespace SRB2Updater -{ - class MSClient - { - private Socket socket; - - /// - /// Constructs an MS client object. - /// - public MSClient() - { - socket = new Socket( - AddressFamily.InterNetwork, - SocketType.Stream, - ProtocolType.IP); - } - - /// - /// Gets list of servers reported by the MS. - /// - /// Hostname or IP address of MS. - /// Port of MS. - /// List of running servers. - public List GetServerList(string strAddress, ushort unPort) - { - // Resolve the address if necessary. - IPHostEntry iphe = Dns.GetHostEntry(strAddress); - - int iIPIndex = 0; - while (iIPIndex < iphe.AddressList.Length && - iphe.AddressList[iIPIndex].AddressFamily != socket.AddressFamily) - { - iIPIndex++; - } - - // No addresses from our family? - if (iIPIndex >= iphe.AddressList.Length) - throw new SocketException((int)SocketError.HostNotFound); - - socket.Connect(iphe.AddressList[iIPIndex], unPort); - - // Send a request for the short server list. - byte[] byPacket = new byte[12]; - BinaryWriter bw = new BinaryWriter(new MemoryStream(byPacket)); - bw.Write((uint)0); // Unused - bw.Write((uint)IPAddress.HostToNetworkOrder(205)); // GET_SHORT_SERVER_MSG - bw.Write((uint)0); // Length of tail. - socket.Send(byPacket); - - List listServers = new List(); - - // Don't sit and wait for ever. - socket.ReceiveTimeout = 10000; - - // Keep reading packets. We break if we receive the sentinel end-packet. - byte[] byServer = new byte[12 + 80]; - while (true) - { - int iLen = socket.Receive(byServer); - BinaryReader br = new BinaryReader(new MemoryStream(byServer)); - - // Ignore the first eight bytes. - br.ReadInt64(); - - // Is that the list finished? - int iTailLen = IPAddress.NetworkToHostOrder(br.ReadInt32()); - if (iTailLen == 0) - break; - else if (iTailLen != iLen - 12) - { - // MS is in a bad mood. - //throw new Exception("Bad packet."); - break; - } - - // Otherwise, add the server to the list. - MSServerEntry msse = new MSServerEntry(); - - br.ReadBytes(16); // Skip. - msse.strAddress = Encoding.ASCII.GetString(br.ReadBytes(16)); - - string str = Encoding.ASCII.GetString(br.ReadBytes(8)); - int iPos = str.IndexOf("\0"); - if (iPos >= 0) - str = str.Remove(iPos); - msse.unPort = Convert.ToUInt16(str); - - msse.strName = Encoding.ASCII.GetString(br.ReadBytes(32)); - iPos = msse.strName.IndexOf("\0"); - if (iPos >= 0) - msse.strName = msse.strName.Remove(iPos); - - msse.strVersion = Encoding.ASCII.GetString(br.ReadBytes(8)); - iPos = msse.strVersion.IndexOf("\0"); - if (iPos >= 0) - msse.strVersion = msse.strVersion.Remove(iPos); - - listServers.Add(msse); - } - - return listServers; - } - } - - public struct MSServerEntry - { - public string strAddress; - public ushort unPort; - public string strName; - public string strVersion; - public bool bPermanent; - } - -} diff --git a/tools/SRB2Updater/Options.Designer.cs b/tools/SRB2Updater/Options.Designer.cs deleted file mode 100644 index 01234549d..000000000 --- a/tools/SRB2Updater/Options.Designer.cs +++ /dev/null @@ -1,628 +0,0 @@ -namespace SRB2Updater -{ - partial class Options - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Options)); - this.groupDisplay = new System.Windows.Forms.GroupBox(); - this.label2 = new System.Windows.Forms.Label(); - this.txtHeight = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.txtWidth = new System.Windows.Forms.TextBox(); - this.chkCustomResolution = new System.Windows.Forms.CheckBox(); - this.chkDisplayWindowed = new System.Windows.Forms.CheckBox(); - this.panel1 = new System.Windows.Forms.Panel(); - this.btnCancel = new System.Windows.Forms.Button(); - this.btnSave = new System.Windows.Forms.Button(); - this.panel2 = new System.Windows.Forms.Panel(); - this.groupMS = new System.Windows.Forms.GroupBox(); - this.label4 = new System.Windows.Forms.Label(); - this.txtMSPort = new System.Windows.Forms.TextBox(); - this.label3 = new System.Windows.Forms.Label(); - this.txtMSAddress = new System.Windows.Forms.TextBox(); - this.panel3 = new System.Windows.Forms.Panel(); - this.panel7 = new System.Windows.Forms.Panel(); - this.groupBox3 = new System.Windows.Forms.GroupBox(); - this.txtParams = new System.Windows.Forms.TextBox(); - this.label9 = new System.Windows.Forms.Label(); - this.panel4 = new System.Windows.Forms.Panel(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.listviewBinaries = new System.Windows.Forms.ListView(); - this.colhdrVersion = new System.Windows.Forms.ColumnHeader(); - this.colhdrBinary = new System.Windows.Forms.ColumnHeader(); - this.textboxBinary = new System.Windows.Forms.TextBox(); - this.btnAdd = new System.Windows.Forms.Button(); - this.btnDel = new System.Windows.Forms.Button(); - this.label5 = new System.Windows.Forms.Label(); - this.label7 = new System.Windows.Forms.Label(); - this.btnBrowse = new System.Windows.Forms.Button(); - this.textboxVersion = new System.Windows.Forms.TextBox(); - this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); - this.tabControl1 = new System.Windows.Forms.TabControl(); - this.tabPage1 = new System.Windows.Forms.TabPage(); - this.tabPage2 = new System.Windows.Forms.TabPage(); - this.panel5 = new System.Windows.Forms.Panel(); - this.panel6 = new System.Windows.Forms.Panel(); - this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.chkShowDefaultWads = new System.Windows.Forms.CheckBox(); - this.chkCloseOnStart = new System.Windows.Forms.CheckBox(); - this.groupDisplay.SuspendLayout(); - this.panel1.SuspendLayout(); - this.panel2.SuspendLayout(); - this.groupMS.SuspendLayout(); - this.panel3.SuspendLayout(); - this.panel7.SuspendLayout(); - this.groupBox3.SuspendLayout(); - this.panel4.SuspendLayout(); - this.groupBox1.SuspendLayout(); - this.tabControl1.SuspendLayout(); - this.tabPage1.SuspendLayout(); - this.tabPage2.SuspendLayout(); - this.panel5.SuspendLayout(); - this.panel6.SuspendLayout(); - this.groupBox2.SuspendLayout(); - this.SuspendLayout(); - // - // groupDisplay - // - this.groupDisplay.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.groupDisplay.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(230)))), ((int)(((byte)(217))))); - this.groupDisplay.Controls.Add(this.label2); - this.groupDisplay.Controls.Add(this.txtHeight); - this.groupDisplay.Controls.Add(this.label1); - this.groupDisplay.Controls.Add(this.txtWidth); - this.groupDisplay.Controls.Add(this.chkCustomResolution); - this.groupDisplay.Controls.Add(this.chkDisplayWindowed); - this.groupDisplay.Location = new System.Drawing.Point(8, 8); - this.groupDisplay.Name = "groupDisplay"; - this.groupDisplay.Size = new System.Drawing.Size(268, 102); - this.groupDisplay.TabIndex = 1; - this.groupDisplay.TabStop = false; - this.groupDisplay.Text = "Display Settings"; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(128, 74); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(46, 15); - this.label2.TabIndex = 5; - this.label2.Text = "Height:"; - // - // txtHeight - // - this.txtHeight.Location = new System.Drawing.Point(175, 71); - this.txtHeight.MaxLength = 4; - this.txtHeight.Name = "txtHeight"; - this.txtHeight.Size = new System.Drawing.Size(46, 21); - this.txtHeight.TabIndex = 4; - this.txtHeight.Text = "768"; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(19, 74); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(41, 15); - this.label1.TabIndex = 3; - this.label1.Text = "Width:"; - // - // txtWidth - // - this.txtWidth.Location = new System.Drawing.Point(66, 71); - this.txtWidth.MaxLength = 4; - this.txtWidth.Name = "txtWidth"; - this.txtWidth.Size = new System.Drawing.Size(46, 21); - this.txtWidth.TabIndex = 2; - this.txtWidth.Text = "1024"; - // - // chkCustomResolution - // - this.chkCustomResolution.AutoSize = true; - this.chkCustomResolution.Location = new System.Drawing.Point(6, 46); - this.chkCustomResolution.Name = "chkCustomResolution"; - this.chkCustomResolution.Size = new System.Drawing.Size(159, 19); - this.chkCustomResolution.TabIndex = 1; - this.chkCustomResolution.Text = "Use Custom Resolution"; - this.chkCustomResolution.UseVisualStyleBackColor = true; - this.chkCustomResolution.CheckedChanged += new System.EventHandler(this.chkCustomResolution_CheckedChanged); - // - // chkDisplayWindowed - // - this.chkDisplayWindowed.AutoSize = true; - this.chkDisplayWindowed.Location = new System.Drawing.Point(6, 20); - this.chkDisplayWindowed.Name = "chkDisplayWindowed"; - this.chkDisplayWindowed.Size = new System.Drawing.Size(117, 19); - this.chkDisplayWindowed.TabIndex = 0; - this.chkDisplayWindowed.Text = "Windowed Mode"; - this.chkDisplayWindowed.UseVisualStyleBackColor = true; - // - // panel1 - // - this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(230)))), ((int)(((byte)(217))))); - this.panel1.Controls.Add(this.groupDisplay); - this.panel1.Location = new System.Drawing.Point(14, 13); - this.panel1.Name = "panel1"; - this.panel1.Padding = new System.Windows.Forms.Padding(5); - this.panel1.Size = new System.Drawing.Size(284, 118); - this.panel1.TabIndex = 2; - // - // btnCancel - // - this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnCancel.Font = new System.Drawing.Font("Arial Rounded MT Bold", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnCancel.Location = new System.Drawing.Point(260, 525); - this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(75, 23); - this.btnCancel.TabIndex = 3; - this.btnCancel.Text = "Cancel"; - this.btnCancel.UseVisualStyleBackColor = true; - this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); - // - // btnSave - // - this.btnSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnSave.Font = new System.Drawing.Font("Arial Rounded MT Bold", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnSave.Location = new System.Drawing.Point(174, 525); - this.btnSave.Name = "btnSave"; - this.btnSave.Size = new System.Drawing.Size(75, 23); - this.btnSave.TabIndex = 4; - this.btnSave.Text = "Ok"; - this.btnSave.UseVisualStyleBackColor = true; - this.btnSave.Click += new System.EventHandler(this.btnSave_Click); - // - // panel2 - // - this.panel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(230)))), ((int)(((byte)(217))))); - this.panel2.Controls.Add(this.groupMS); - this.panel2.Location = new System.Drawing.Point(13, 13); - this.panel2.Name = "panel2"; - this.panel2.Padding = new System.Windows.Forms.Padding(5); - this.panel2.Size = new System.Drawing.Size(286, 95); - this.panel2.TabIndex = 5; - // - // groupMS - // - this.groupMS.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.groupMS.Controls.Add(this.label4); - this.groupMS.Controls.Add(this.txtMSPort); - this.groupMS.Controls.Add(this.label3); - this.groupMS.Controls.Add(this.txtMSAddress); - this.groupMS.Location = new System.Drawing.Point(9, 8); - this.groupMS.Name = "groupMS"; - this.groupMS.Size = new System.Drawing.Size(269, 79); - this.groupMS.TabIndex = 0; - this.groupMS.TabStop = false; - this.groupMS.Text = "Connection"; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(41, 51); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(32, 15); - this.label4.TabIndex = 3; - this.label4.Text = "Port:"; - // - // txtMSPort - // - this.txtMSPort.Location = new System.Drawing.Point(79, 48); - this.txtMSPort.Name = "txtMSPort"; - this.txtMSPort.Size = new System.Drawing.Size(86, 21); - this.txtMSPort.TabIndex = 2; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(17, 23); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(56, 15); - this.label3.TabIndex = 1; - this.label3.Text = "Address:"; - // - // txtMSAddress - // - this.txtMSAddress.Location = new System.Drawing.Point(79, 20); - this.txtMSAddress.Name = "txtMSAddress"; - this.txtMSAddress.Size = new System.Drawing.Size(184, 21); - this.txtMSAddress.TabIndex = 0; - // - // panel3 - // - this.panel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(212)))), ((int)(((byte)(204)))), ((int)(((byte)(187))))); - this.panel3.Controls.Add(this.panel7); - this.panel3.Controls.Add(this.panel4); - this.panel3.Controls.Add(this.panel1); - this.panel3.Location = new System.Drawing.Point(6, 6); - this.panel3.Name = "panel3"; - this.panel3.Padding = new System.Windows.Forms.Padding(10); - this.panel3.Size = new System.Drawing.Size(312, 467); - this.panel3.TabIndex = 6; - // - // panel7 - // - this.panel7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(230)))), ((int)(((byte)(217))))); - this.panel7.Controls.Add(this.groupBox3); - this.panel7.Location = new System.Drawing.Point(15, 350); - this.panel7.Name = "panel7"; - this.panel7.Padding = new System.Windows.Forms.Padding(5); - this.panel7.Size = new System.Drawing.Size(283, 106); - this.panel7.TabIndex = 7; - // - // groupBox3 - // - this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.groupBox3.Controls.Add(this.chkCloseOnStart); - this.groupBox3.Controls.Add(this.txtParams); - this.groupBox3.Controls.Add(this.label9); - this.groupBox3.Location = new System.Drawing.Point(13, 8); - this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(258, 83); - this.groupBox3.TabIndex = 12; - this.groupBox3.TabStop = false; - this.groupBox3.Text = "Command Line"; - // - // txtParams - // - this.txtParams.Location = new System.Drawing.Point(83, 20); - this.txtParams.Name = "txtParams"; - this.txtParams.Size = new System.Drawing.Size(167, 21); - this.txtParams.TabIndex = 6; - // - // label9 - // - this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(5, 23); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(75, 15); - this.label9.TabIndex = 7; - this.label9.Text = "Parameters:"; - // - // panel4 - // - this.panel4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(230)))), ((int)(((byte)(217))))); - this.panel4.Controls.Add(this.groupBox1); - this.panel4.Location = new System.Drawing.Point(15, 137); - this.panel4.Name = "panel4"; - this.panel4.Padding = new System.Windows.Forms.Padding(5); - this.panel4.Size = new System.Drawing.Size(284, 207); - this.panel4.TabIndex = 6; - // - // groupBox1 - // - this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.groupBox1.Controls.Add(this.listviewBinaries); - this.groupBox1.Controls.Add(this.textboxBinary); - this.groupBox1.Controls.Add(this.btnAdd); - this.groupBox1.Controls.Add(this.btnDel); - this.groupBox1.Controls.Add(this.label5); - this.groupBox1.Controls.Add(this.label7); - this.groupBox1.Controls.Add(this.btnBrowse); - this.groupBox1.Controls.Add(this.textboxVersion); - this.groupBox1.Location = new System.Drawing.Point(13, 8); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(259, 191); - this.groupBox1.TabIndex = 12; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Executables"; - // - // listviewBinaries - // - this.listviewBinaries.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.listviewBinaries.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.colhdrVersion, - this.colhdrBinary}); - this.listviewBinaries.FullRowSelect = true; - this.listviewBinaries.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; - this.listviewBinaries.HideSelection = false; - this.listviewBinaries.Location = new System.Drawing.Point(6, 19); - this.listviewBinaries.Name = "listviewBinaries"; - this.listviewBinaries.Size = new System.Drawing.Size(245, 83); - this.listviewBinaries.TabIndex = 0; - this.listviewBinaries.UseCompatibleStateImageBehavior = false; - this.listviewBinaries.View = System.Windows.Forms.View.Details; - this.listviewBinaries.SelectedIndexChanged += new System.EventHandler(this.listviewBinaries_SelectedIndexChanged); - // - // colhdrVersion - // - this.colhdrVersion.Text = "Version"; - // - // colhdrBinary - // - this.colhdrBinary.Text = "Binary"; - this.colhdrBinary.Width = 198; - // - // textboxBinary - // - this.textboxBinary.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.textboxBinary.Enabled = false; - this.textboxBinary.Location = new System.Drawing.Point(84, 161); - this.textboxBinary.Name = "textboxBinary"; - this.textboxBinary.Size = new System.Drawing.Size(93, 21); - this.textboxBinary.TabIndex = 4; - this.textboxBinary.TextChanged += new System.EventHandler(this.textboxBinary_TextChanged); - // - // btnAdd - // - this.btnAdd.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.btnAdd.Location = new System.Drawing.Point(51, 104); - this.btnAdd.Name = "btnAdd"; - this.btnAdd.Size = new System.Drawing.Size(98, 25); - this.btnAdd.TabIndex = 1; - this.btnAdd.Text = "&Add"; - this.btnAdd.UseVisualStyleBackColor = true; - this.btnAdd.Click += new System.EventHandler(this.btnAdd_Click); - // - // btnDel - // - this.btnDel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.btnDel.Enabled = false; - this.btnDel.Location = new System.Drawing.Point(155, 104); - this.btnDel.Name = "btnDel"; - this.btnDel.Size = new System.Drawing.Size(98, 25); - this.btnDel.TabIndex = 2; - this.btnDel.Text = "&Delete"; - this.btnDel.UseVisualStyleBackColor = true; - this.btnDel.Click += new System.EventHandler(this.btnDel_Click); - // - // label5 - // - this.label5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(6, 138); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(51, 15); - this.label5.TabIndex = 2; - this.label5.Text = "Version:"; - // - // label7 - // - this.label7.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(6, 164); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(44, 15); - this.label7.TabIndex = 3; - this.label7.Text = "Binary:"; - // - // btnBrowse - // - this.btnBrowse.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.btnBrowse.Enabled = false; - this.btnBrowse.Location = new System.Drawing.Point(183, 161); - this.btnBrowse.Name = "btnBrowse"; - this.btnBrowse.Size = new System.Drawing.Size(68, 21); - this.btnBrowse.TabIndex = 5; - this.btnBrowse.Text = "&Browse..."; - this.btnBrowse.UseVisualStyleBackColor = true; - this.btnBrowse.Click += new System.EventHandler(this.btnBrowse_Click); - // - // textboxVersion - // - this.textboxVersion.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.textboxVersion.Enabled = false; - this.textboxVersion.Location = new System.Drawing.Point(84, 135); - this.textboxVersion.Name = "textboxVersion"; - this.textboxVersion.Size = new System.Drawing.Size(167, 21); - this.textboxVersion.TabIndex = 3; - this.textboxVersion.TextChanged += new System.EventHandler(this.textboxVersion_TextChanged); - // - // openFileDialog1 - // - this.openFileDialog1.DefaultExt = "exe"; - this.openFileDialog1.Filter = "Executable files|*.exe|All files|*.*"; - // - // tabControl1 - // - this.tabControl1.Controls.Add(this.tabPage1); - this.tabControl1.Controls.Add(this.tabPage2); - this.tabControl1.Location = new System.Drawing.Point(12, 12); - this.tabControl1.Name = "tabControl1"; - this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(332, 507); - this.tabControl1.TabIndex = 7; - // - // tabPage1 - // - this.tabPage1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(212)))), ((int)(((byte)(204)))), ((int)(((byte)(187))))); - this.tabPage1.Controls.Add(this.panel3); - this.tabPage1.Location = new System.Drawing.Point(4, 24); - this.tabPage1.Name = "tabPage1"; - this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(324, 479); - this.tabPage1.TabIndex = 0; - this.tabPage1.Text = "SRB2"; - // - // tabPage2 - // - this.tabPage2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(212)))), ((int)(((byte)(204)))), ((int)(((byte)(187))))); - this.tabPage2.Controls.Add(this.panel5); - this.tabPage2.Location = new System.Drawing.Point(4, 24); - this.tabPage2.Name = "tabPage2"; - this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(324, 479); - this.tabPage2.TabIndex = 1; - this.tabPage2.Text = "Master Server"; - // - // panel5 - // - this.panel5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(212)))), ((int)(((byte)(204)))), ((int)(((byte)(187))))); - this.panel5.Controls.Add(this.panel6); - this.panel5.Controls.Add(this.panel2); - this.panel5.Location = new System.Drawing.Point(6, 6); - this.panel5.Name = "panel5"; - this.panel5.Padding = new System.Windows.Forms.Padding(10); - this.panel5.Size = new System.Drawing.Size(312, 507); - this.panel5.TabIndex = 7; - // - // panel6 - // - this.panel6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(230)))), ((int)(((byte)(217))))); - this.panel6.Controls.Add(this.groupBox2); - this.panel6.Location = new System.Drawing.Point(13, 114); - this.panel6.Name = "panel6"; - this.panel6.Padding = new System.Windows.Forms.Padding(5); - this.panel6.Size = new System.Drawing.Size(286, 61); - this.panel6.TabIndex = 6; - // - // groupBox2 - // - this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.groupBox2.Controls.Add(this.chkShowDefaultWads); - this.groupBox2.Location = new System.Drawing.Point(9, 8); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(269, 45); - this.groupBox2.TabIndex = 0; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "List Settings"; - // - // chkShowDefaultWads - // - this.chkShowDefaultWads.AutoSize = true; - this.chkShowDefaultWads.Location = new System.Drawing.Point(6, 20); - this.chkShowDefaultWads.Name = "chkShowDefaultWads"; - this.chkShowDefaultWads.Size = new System.Drawing.Size(201, 19); - this.chkShowDefaultWads.TabIndex = 8; - this.chkShowDefaultWads.Text = "Show default files in list of wads"; - this.chkShowDefaultWads.UseVisualStyleBackColor = true; - // - // chkCloseOnStart - // - this.chkCloseOnStart.AutoSize = true; - this.chkCloseOnStart.Location = new System.Drawing.Point(9, 47); - this.chkCloseOnStart.Name = "chkCloseOnStart"; - this.chkCloseOnStart.Size = new System.Drawing.Size(216, 19); - this.chkCloseOnStart.TabIndex = 9; - this.chkCloseOnStart.Text = "Close Launcher when SRB2 starts"; - this.chkCloseOnStart.UseVisualStyleBackColor = true; - // - // Options - // - this.AcceptButton = this.btnSave; - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(230)))), ((int)(((byte)(217))))); - this.ClientSize = new System.Drawing.Size(356, 560); - this.Controls.Add(this.tabControl1); - this.Controls.Add(this.btnSave); - this.Controls.Add(this.btnCancel); - this.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Name = "Options"; - this.Text = "Options"; - this.groupDisplay.ResumeLayout(false); - this.groupDisplay.PerformLayout(); - this.panel1.ResumeLayout(false); - this.panel2.ResumeLayout(false); - this.groupMS.ResumeLayout(false); - this.groupMS.PerformLayout(); - this.panel3.ResumeLayout(false); - this.panel7.ResumeLayout(false); - this.groupBox3.ResumeLayout(false); - this.groupBox3.PerformLayout(); - this.panel4.ResumeLayout(false); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); - this.tabControl1.ResumeLayout(false); - this.tabPage1.ResumeLayout(false); - this.tabPage2.ResumeLayout(false); - this.panel5.ResumeLayout(false); - this.panel6.ResumeLayout(false); - this.groupBox2.ResumeLayout(false); - this.groupBox2.PerformLayout(); - this.ResumeLayout(false); - - } - - #endregion - - private System.Windows.Forms.GroupBox groupDisplay; - private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.CheckBox chkDisplayWindowed; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.TextBox txtWidth; - private System.Windows.Forms.CheckBox chkCustomResolution; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.TextBox txtHeight; - private System.Windows.Forms.Button btnCancel; - private System.Windows.Forms.Button btnSave; - private System.Windows.Forms.Panel panel2; - private System.Windows.Forms.GroupBox groupMS; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.TextBox txtMSAddress; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.TextBox txtMSPort; - private System.Windows.Forms.Panel panel3; - private System.Windows.Forms.OpenFileDialog openFileDialog1; - private System.Windows.Forms.Panel panel4; - private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.ListView listviewBinaries; - private System.Windows.Forms.ColumnHeader colhdrVersion; - private System.Windows.Forms.ColumnHeader colhdrBinary; - private System.Windows.Forms.TextBox textboxBinary; - private System.Windows.Forms.Button btnAdd; - private System.Windows.Forms.Button btnDel; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.Label label7; - private System.Windows.Forms.Button btnBrowse; - private System.Windows.Forms.TextBox textboxVersion; - private System.Windows.Forms.TabControl tabControl1; - private System.Windows.Forms.TabPage tabPage1; - private System.Windows.Forms.TabPage tabPage2; - private System.Windows.Forms.Panel panel5; - private System.Windows.Forms.Panel panel6; - private System.Windows.Forms.GroupBox groupBox2; - private System.Windows.Forms.CheckBox chkShowDefaultWads; - private System.Windows.Forms.Panel panel7; - private System.Windows.Forms.GroupBox groupBox3; - private System.Windows.Forms.TextBox txtParams; - private System.Windows.Forms.Label label9; - private System.Windows.Forms.CheckBox chkCloseOnStart; - } -} \ No newline at end of file diff --git a/tools/SRB2Updater/Options.cs b/tools/SRB2Updater/Options.cs deleted file mode 100644 index a45cb13af..000000000 --- a/tools/SRB2Updater/Options.cs +++ /dev/null @@ -1,134 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Text; -using System.Windows.Forms; -using System.IO; - -namespace SRB2Updater -{ - public partial class Options : Form - { - private Settings settings; - public Options(Settings settings) - { - InitializeComponent(); - this.settings = settings; - SetOptions(); - } - - private void SetOptions() - { - chkDisplayWindowed.Checked = settings.displayWindowed; - chkCustomResolution.Checked = settings.displayCustom; - txtHeight.Text = settings.displayHeight.ToString(); - txtWidth.Text = settings.displayWidth.ToString(); - txtMSPort.Text = settings.msPort.ToString(); - settings.AddBinariesToListView(listviewBinaries); - txtMSAddress.Text = settings.msAddress.ToString(); - txtParams.Text = settings.Params.ToString(); - chkCloseOnStart.Checked = settings.CloseOnStart; - chkShowDefaultWads.Checked = settings.ShowDefaultWads; - if (settings.displayCustom) - { - txtHeight.Enabled = true; - txtWidth.Enabled = true; - } - else - { - txtHeight.Enabled = false; - txtWidth.Enabled = false; - } - } - - private void chkCustomResolution_CheckedChanged(object sender, EventArgs e) - { - if (chkCustomResolution.Checked) - { - txtHeight.Enabled = true; - txtWidth.Enabled = true; - } - else - { - txtHeight.Enabled = false; - txtWidth.Enabled = false; - } - } - - private void btnSave_Click(object sender, EventArgs e) - { - settings.displayCustom = chkCustomResolution.Checked; - settings.displayHeight = Convert.ToInt32(txtHeight.Text); - settings.displayWidth = Convert.ToInt32(txtWidth.Text); - settings.displayWindowed = chkDisplayWindowed.Checked; - settings.msAddress = txtMSAddress.Text; - settings.ShowDefaultWads = chkShowDefaultWads.Checked; - settings.Params = txtParams.Text; - settings.msPort = Convert.ToInt32(txtMSPort.Text); - settings.CloseOnStart = chkCloseOnStart.Checked; - settings.SaveSettings(); - settings.SetBinariesFromListView(listviewBinaries); - Close(); - } - - private void btnCancel_Click(object sender, EventArgs e) - { - Close(); - } - - private void btnAdd_Click(object sender, EventArgs e) - { - listviewBinaries.Items.Add(new ListViewItem(new string[] { "[New Version]", "" })); - } - - private void btnDel_Click(object sender, EventArgs e) - { - if (listviewBinaries.SelectedItems.Count > 0) - listviewBinaries.Items.Remove(listviewBinaries.SelectedItems[0]); - } - - private void btnBrowse_Click(object sender, EventArgs e) - { - if (listviewBinaries.SelectedItems.Count > 0 && - openFileDialog1.ShowDialog() == DialogResult.OK) - textboxBinary.Text = openFileDialog1.FileName; - } - - private void textboxVersion_TextChanged(object sender, EventArgs e) - { - if (listviewBinaries.SelectedItems.Count > 0) - listviewBinaries.SelectedItems[0].Text = textboxVersion.Text; - } - - private void textboxBinary_TextChanged(object sender, EventArgs e) - { - if (listviewBinaries.SelectedItems.Count > 0) - listviewBinaries.SelectedItems[0].SubItems[1].Text = textboxBinary.Text; - } - - private void listviewBinaries_SelectedIndexChanged(object sender, EventArgs e) - { - if (listviewBinaries.SelectedItems.Count > 0) - { - btnDel.Enabled = true; - btnBrowse.Enabled = true; - textboxVersion.Text = listviewBinaries.SelectedItems[0].Text; - textboxBinary.Text = listviewBinaries.SelectedItems[0].SubItems[1].Text; - textboxVersion.Enabled = true; - textboxBinary.Enabled = true; - } - else - { - btnDel.Enabled = false; - btnBrowse.Enabled = false; - textboxVersion.Text = ""; - textboxBinary.Text = ""; - textboxVersion.Enabled = false; - textboxBinary.Enabled = false; - } - } - } -} diff --git a/tools/SRB2Updater/Options.resx b/tools/SRB2Updater/Options.resx deleted file mode 100644 index ee0d50c3f..000000000 --- a/tools/SRB2Updater/Options.resx +++ /dev/null @@ -1,166 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 17, 17 - - - - - AAABAAEAICAAAAEACACoCAAAFgAAACgAAAAgAAAAQAAAAAEACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAADg4OAIAAAABQABkAlgAAALkAAABQGQAAcwAlAJYAMQBzJQAAuQA9AJYxAACWAGIAMjIyALk9 - AAD/JSUAPj4+AFZWVgD/SEgAYmJiAABilgBubm4Aenp6AP9rawCAgIAAhoaGAJKSkgD/jo4Anp6eAKSg - oAD/jqsAqqqqAGuP/wC2trYAwMDAAI6r/wDCwsIAa8b/AM7OzgCO1P8A2traAObm5gDy8vIA////AAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAGgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFQ8PHQAAAAAAAAAAAAAAACMgJSUlJSUZ - AAAAABMNBgoPDw8AAAAAAAAAAAAAACInJycnJycnJyclFgYGBggPDw8PDwAAAAAAAAAAAAAjJycnJycn - JycnGScnFQkGCA8PDw8AAAAAAAAAAAAAISMnJycjIyMjJycnJycVDwYGDw8PDwAAAAAAAAAAAAAQAAEj - HygqKSkkHyMnJwoPDwYJDw8PAAAAAAAAAAAAACkTHxwrKysrKysrGhkMDw8PCwYJDw8AAAAAAAAAACkp - JA0pACkrKysrKyspDw8PDw8PAwYIAAAAAAAAAAAAACsiARwAISsrKysrKysSDw8PDw8PAwYAAAAAAAAA - AAAAKyIAEAAfKysrKysrKxcPDw8PDw8PDwgIABYAABcSCAArKAMPACIrKysrKysrGw8PDw8PDw8PDw8P - Dw8PDw8RACsoBA8EISsrKysrKyseDw8PDw8PDw8PDw8PDw8PDwAAKx8PDw8VKSsrKysrKxcPDw8PDw8P - Dw8PDw8PDw8AACooFQ8PDw8aKCsrKysmDw8PDw8PDw8PDw8PDw8PFQAAAAAKDw8PDw8VIigoIgoPDw8P - Dw8PDw8PDw8PDxEAAAAAAAoPDw8PDw8XFxcXEhIPDwUPDw8PDw8PDw8YAAAAAAAACA8PDw8SFxcXFxcX - FxcPFQ8PDw8PDw8KAAAAAAAAAAAACg8PEhcXFxcXFxcXFxkjBRISEhISGAAAAAAAAAAAIRcXCA8XFxcX - FxcXFxcaJyMFDwoLEQAAAAAAAAAAAAAAFxcSDxIXFxcXFxcSEyAlIwILCwsIAAAAAAAAAAAAABcXEg8A - EhIXFxcXEgoPDBUUBwsLCwsLAAAAAAAAAAAAFxcAAAAAFxIXFxcXFxIKDw8ICwsLDg4LAAAAAAAAAAAA - AAAAAAAAABISFxcXFw8PDw8PDw8PDwAAAAAAAAAAAAAAAAAAAAAAAAASEhcSDw8PDw8PDxIAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAFwoSDw8SFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAP///////////////////3////w//APAf/AAAH/gAAD/wAAA/8AAAP/AAAD/AAAB/4AA - Af+AAABYgAAAAIAAAAGAAAADAAAAA8AAAAfAAAAPwAAAP+AAAH+AAAH/wAAB/4QAAP+eAAB//4AA///g - Af//+A////////////////// - - - \ No newline at end of file diff --git a/tools/SRB2Updater/Program.cs b/tools/SRB2Updater/Program.cs deleted file mode 100644 index 51c0be56e..000000000 --- a/tools/SRB2Updater/Program.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Windows.Forms; - -namespace SRB2Updater -{ - static class Program - { - /// - /// The main entry point for the application. - /// - [STAThread] - static void Main(string[] args) - { - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new Launcher(args)); - } - } -} diff --git a/tools/SRB2Updater/Properties/AssemblyInfo.cs b/tools/SRB2Updater/Properties/AssemblyInfo.cs deleted file mode 100644 index abc46e8cd..000000000 --- a/tools/SRB2Updater/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using System.Resources; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("SRB2 Automatic Updater")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Sonic Team Junior")] -[assembly: AssemblyProduct("Sonic Robo Blast 2")] -[assembly: AssemblyCopyright("")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("94c164ce-02a9-4966-948f-004d35760ba1")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: NeutralResourcesLanguageAttribute("en-US")] diff --git a/tools/SRB2Updater/Properties/Resources.Designer.cs b/tools/SRB2Updater/Properties/Resources.Designer.cs deleted file mode 100644 index 246c91e52..000000000 --- a/tools/SRB2Updater/Properties/Resources.Designer.cs +++ /dev/null @@ -1,132 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:2.0.50727.4927 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace SRB2Updater.Properties { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SRB2Updater.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - internal static System.Drawing.Bitmap Banner { - get { - object obj = ResourceManager.GetObject("Banner", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - internal static System.Drawing.Bitmap Banner2 { - get { - object obj = ResourceManager.GetObject("Banner2", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - internal static System.Drawing.Bitmap Banner3 { - get { - object obj = ResourceManager.GetObject("Banner3", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - internal static System.Drawing.Bitmap Banner4 { - get { - object obj = ResourceManager.GetObject("Banner4", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - internal static System.Drawing.Bitmap CONSBACK { - get { - object obj = ResourceManager.GetObject("CONSBACK", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - internal static System.IO.UnmanagedMemoryStream Kotaku { - get { - return ResourceManager.GetStream("Kotaku", resourceCulture); - } - } - - internal static System.Drawing.Bitmap Sonic { - get { - object obj = ResourceManager.GetObject("Sonic", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - internal static System.Drawing.Bitmap sonic_bottom { - get { - object obj = ResourceManager.GetObject("sonic_bottom", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - internal static System.Drawing.Bitmap sonic_top { - get { - object obj = ResourceManager.GetObject("sonic_top", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - internal static System.Drawing.Bitmap updaterbanner { - get { - object obj = ResourceManager.GetObject("updaterbanner", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - } -} diff --git a/tools/SRB2Updater/Properties/Resources.resx b/tools/SRB2Updater/Properties/Resources.resx deleted file mode 100644 index b5c93d021..000000000 --- a/tools/SRB2Updater/Properties/Resources.resx +++ /dev/null @@ -1,151 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - ..\Resources\CONSBACK.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Sonic.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Banner.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\sonic_bottom.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\sonic_top.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\updaterbanner.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Banner2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Banner3.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Banner4.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Kotaku.wav;System.IO.MemoryStream, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/tools/SRB2Updater/Properties/Settings.Designer.cs b/tools/SRB2Updater/Properties/Settings.Designer.cs deleted file mode 100644 index 4e8aea28c..000000000 --- a/tools/SRB2Updater/Properties/Settings.Designer.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:2.0.50727.3506 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace SRB2Updater.Properties { - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default { - get { - return defaultInstance; - } - } - } -} diff --git a/tools/SRB2Updater/Properties/Settings.settings b/tools/SRB2Updater/Properties/Settings.settings deleted file mode 100644 index abf36c5d3..000000000 --- a/tools/SRB2Updater/Properties/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/tools/SRB2Updater/Resources/Banner.png b/tools/SRB2Updater/Resources/Banner.png deleted file mode 100644 index 7d8d55602..000000000 Binary files a/tools/SRB2Updater/Resources/Banner.png and /dev/null differ diff --git a/tools/SRB2Updater/Resources/Banner.psd b/tools/SRB2Updater/Resources/Banner.psd deleted file mode 100644 index eb29b8b6f..000000000 Binary files a/tools/SRB2Updater/Resources/Banner.psd and /dev/null differ diff --git a/tools/SRB2Updater/Resources/Banner2.png b/tools/SRB2Updater/Resources/Banner2.png deleted file mode 100644 index f3d3d3e6d..000000000 Binary files a/tools/SRB2Updater/Resources/Banner2.png and /dev/null differ diff --git a/tools/SRB2Updater/Resources/Banner3.png b/tools/SRB2Updater/Resources/Banner3.png deleted file mode 100644 index 04713070a..000000000 Binary files a/tools/SRB2Updater/Resources/Banner3.png and /dev/null differ diff --git a/tools/SRB2Updater/Resources/Banner4.png b/tools/SRB2Updater/Resources/Banner4.png deleted file mode 100644 index 8b2627b8d..000000000 Binary files a/tools/SRB2Updater/Resources/Banner4.png and /dev/null differ diff --git a/tools/SRB2Updater/Resources/CONSBACK.bmp b/tools/SRB2Updater/Resources/CONSBACK.bmp deleted file mode 100644 index 3c1298f08..000000000 Binary files a/tools/SRB2Updater/Resources/CONSBACK.bmp and /dev/null differ diff --git a/tools/SRB2Updater/Resources/Kotaku.wav b/tools/SRB2Updater/Resources/Kotaku.wav deleted file mode 100644 index 49e7f613a..000000000 Binary files a/tools/SRB2Updater/Resources/Kotaku.wav and /dev/null differ diff --git a/tools/SRB2Updater/Resources/Sonic.png b/tools/SRB2Updater/Resources/Sonic.png deleted file mode 100644 index a19cf225d..000000000 Binary files a/tools/SRB2Updater/Resources/Sonic.png and /dev/null differ diff --git a/tools/SRB2Updater/Resources/Srb2win.ico b/tools/SRB2Updater/Resources/Srb2win.ico deleted file mode 100644 index 0036a827a..000000000 Binary files a/tools/SRB2Updater/Resources/Srb2win.ico and /dev/null differ diff --git a/tools/SRB2Updater/Resources/sonic_bottom.png b/tools/SRB2Updater/Resources/sonic_bottom.png deleted file mode 100644 index 42c17c785..000000000 Binary files a/tools/SRB2Updater/Resources/sonic_bottom.png and /dev/null differ diff --git a/tools/SRB2Updater/Resources/sonic_top.png b/tools/SRB2Updater/Resources/sonic_top.png deleted file mode 100644 index 66d6fccaa..000000000 Binary files a/tools/SRB2Updater/Resources/sonic_top.png and /dev/null differ diff --git a/tools/SRB2Updater/Resources/updaterbanner.png b/tools/SRB2Updater/Resources/updaterbanner.png deleted file mode 100644 index 9a2f6fa38..000000000 Binary files a/tools/SRB2Updater/Resources/updaterbanner.png and /dev/null differ diff --git a/tools/SRB2Updater/SRB2Updater.csproj b/tools/SRB2Updater/SRB2Updater.csproj deleted file mode 100644 index 6e8647312..000000000 --- a/tools/SRB2Updater/SRB2Updater.csproj +++ /dev/null @@ -1,173 +0,0 @@ - - - Debug - AnyCPU - 9.0.21022 - 2.0 - {2E2F67C6-8492-4034-A142-50872504D86D} - WinExe - Properties - SRB2Updater - srb2update - - - - - 2.0 - v2.0 - - - false - Srb2win.ico - SRB2Updater.Program - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - Form - - - Debug.cs - - - Form - - - Launcher.cs - - - - Form - - - Options.cs - - - - - Debug.cs - Designer - - - Launcher.cs - Designer - - - Options.cs - Designer - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - - - False - .NET Framework Client Profile - false - - - False - .NET Framework 2.0 %28x86%29 - true - - - False - .NET Framework 3.0 %28x86%29 - false - - - False - .NET Framework 3.5 - false - - - False - .NET Framework 3.5 SP1 - false - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tools/SRB2Updater/SRB2Updater.sln b/tools/SRB2Updater/SRB2Updater.sln deleted file mode 100644 index f4e88dc64..000000000 --- a/tools/SRB2Updater/SRB2Updater.sln +++ /dev/null @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SRB2Updater", "SRB2Updater.csproj", "{2E2F67C6-8492-4034-A142-50872504D86D}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2E2F67C6-8492-4034-A142-50872504D86D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E2F67C6-8492-4034-A142-50872504D86D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E2F67C6-8492-4034-A142-50872504D86D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E2F67C6-8492-4034-A142-50872504D86D}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/tools/SRB2Updater/ServerQuerier.cs b/tools/SRB2Updater/ServerQuerier.cs deleted file mode 100644 index 51b6940f6..000000000 --- a/tools/SRB2Updater/ServerQuerier.cs +++ /dev/null @@ -1,362 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using System.Net; -using System.Net.Sockets; -using System.IO; - -namespace SRB2Updater -{ - class ServerQuerier - { - private UdpClient udpclient; - private IPEndPoint ipepMS; - - private const int MS_HOLEPUNCH_SIZE = 0; - private const int PT_ASKINFO_SIZE = 16; - private const byte PT_ASKINFO = 12; - private const byte PT_SERVERINFO = 13; - private const int MAXSERVERNAME = 32; - private const int MAX_WADPATH = 128; - - /// - /// Constructs a ServerQuerier object. - /// - public ServerQuerier() - { - udpclient = new UdpClient(0, AddressFamily.InterNetwork); - - // Fix for WSAECONNRESET. Only affects Win2k and up. If I send a - // packet to a host which replies with an ICMP Port Unreachable, - // subsequent socket operations go doo-lally. So, we enable the - // older behaviour of ignoring these ICMP messages, since we don't - // care about them anyway. - if (Environment.OSVersion.Platform == PlatformID.Win32NT && - Environment.OSVersion.Version.Major >= 5) - { - const uint IOC_IN = 0x80000000; - const uint IOC_VENDOR = 0x18000000; - const uint SIO_UDP_CONNRESET = IOC_IN | IOC_VENDOR | 12; - - udpclient.Client.IOControl(unchecked((int)SIO_UDP_CONNRESET), new byte[] { Convert.ToByte(false) }, null); - } - } - - public void StartListening(ServerInfoReceiveHandler sirh) - { - // Start listening. - udpclient.BeginReceive(new AsyncCallback(ServerInfoReceiveHandler.Receive), sirh); - } - - - /// - /// Sets the master server address. Necessary before querying via the MS. - /// - /// IP address of hostname of MS. - /// Port of MS. - public void SetMasterServer(string strAddress, ushort unPort) - { - IPAddress address = Dns.GetHostEntry(strAddress).AddressList[0]; - ipepMS = new IPEndPoint(address, unPort); - } - - public void Query(string strAddress, ushort unPort) - { - // Build the packet. - byte[] byPacket = new byte[PT_ASKINFO_SIZE]; - BinaryWriter bw = new BinaryWriter(new MemoryStream(byPacket)); - - bw.Seek(4, SeekOrigin.Begin); // Skip the checksum. - bw.Write((byte)0); // ack - bw.Write((byte)0); // ackreturn - bw.Write((byte)PT_ASKINFO); // Packet type. - bw.Write((byte)0); // Reserved. - bw.Write((byte)0); // Version. This is actually unnecessary -- the client will reply anyway. -MattW_CFI - bw.Write((byte)0); // Reserved. - bw.Write((byte)0); // Reserved. - bw.Write((byte)0); // Reserved. - // Time for ping calculation. - bw.Write(unchecked((uint)(DateTime.Now.Ticks / 10000))); - - // Calculate the checksum. - bw.Seek(0, SeekOrigin.Begin); - bw.Write(SRB2Checksum(byPacket)); - - // Send the packet. - udpclient.Send(byPacket, byPacket.Length, strAddress, unPort); - } - - /// - /// Calculates the checksum of an SRB2 packet. - /// - /// Packet. - /// Checksum. - private static uint SRB2Checksum(byte[] byPacket) - { - uint c = 0x1234567; - int i; - - for (i = 4; i < byPacket.Length; i++) - unchecked - { - c += (uint)byPacket[i] * (uint)(i - 3); - } - - return c; - } - - private static string ReadFixedLengthStr(BinaryReader br, int iLen) - { - String str = Encoding.ASCII.GetString(br.ReadBytes(iLen)); - int iPos = str.IndexOf("\0"); - if (iPos >= 0) - str = str.Remove(iPos); - - return str; - } - - public abstract class ServerInfoReceiveHandler - { - UdpClient udpclient; - IPEndPoint ipepRemote; - - /// - /// Called after a server info packet is received. - /// - /// Server info. - public abstract void ProcessServerInfo(SRB2ServerInfo srb2si); - public abstract void HandleException(Exception e); - - public ServerInfoReceiveHandler(ServerQuerier sq) - { - ipepRemote = new IPEndPoint(IPAddress.Any, 0); - - udpclient = sq.udpclient; - } - - public static void Receive(IAsyncResult ar) - { - ServerInfoReceiveHandler sirh = (ServerInfoReceiveHandler)ar.AsyncState; - - byte[] byPacket = sirh.udpclient.EndReceive(ar, ref sirh.ipepRemote); - - // Analyse the packet. - BinaryReader br = new BinaryReader(new MemoryStream(byPacket)); - - // Get the checksum. - uint uiChecksum = br.ReadUInt32(); - - // Skip ack and ackreturn and get packet type. - br.ReadBytes(2); - byte byPacketType = br.ReadByte(); - - // Only interested in valid PT_SERVERINFO packets. - if (byPacketType == PT_SERVERINFO && uiChecksum == SRB2Checksum(byPacket)) - { - bool bMalformed = true; - - // Skip padding. - br.ReadByte(); - - // Remember where we are. - long iPacketStart = br.BaseStream.Position; - - // Try to interpret the packet in each recognised format. - foreach (ServerInfoVer siv in Enum.GetValues(typeof(ServerInfoVer))) - { - SRB2ServerInfo srb2si; - byte byNumWads = 0; - - srb2si.siv = siv; - - br.BaseStream.Position = iPacketStart; - - // Get address from socket. - srb2si.strAddress = sirh.ipepRemote.Address.ToString(); - srb2si.unPort = unchecked((ushort)sirh.ipepRemote.Port); - - // Get version. - byte byVersion = br.ReadByte(); - - if (siv == ServerInfoVer.SIV_PREME) - { - br.ReadBytes(3); - - uint uiSubVersion = br.ReadUInt32(); - - // Format version. - // MattW_CFI: I hope you don't mind this exception, Oogaland, but 0.01.6 looks odd >_> - if (byVersion == 1 && uiSubVersion == 6) - srb2si.strVersion = "X.01.6"; - else - srb2si.strVersion = byVersion.ToString(); - //srb2si.strVersion = String.Format("{0}.{1:00}.{2}", byVersion / 100, byVersion % 100, uiSubVersion); - } - else - { - byte bySubVersion = br.ReadByte(); - - // Format version. - //srb2si.strVersion = String.Format("{0}.{1:00}.{2}", byVersion / 100, byVersion % 100, bySubVersion); - srb2si.strVersion = byVersion.ToString(); - } - - srb2si.byPlayers = br.ReadByte(); - srb2si.byMaxplayers = br.ReadByte(); - srb2si.byGametype = br.ReadByte(); - srb2si.bModified = (br.ReadByte() != 0); - - if (siv == ServerInfoVer.SIV_ME) - byNumWads = br.ReadByte(); - - srb2si.sbyAdminplayer = br.ReadSByte(); - - if (siv == ServerInfoVer.SIV_PREME) - br.ReadBytes(3); - - // Calculate ping. - srb2si.uiTime = unchecked((uint)((long)(DateTime.Now.Ticks / 10000 - br.ReadUInt32()) % ((long)UInt32.MaxValue + 1))); - - if (siv == ServerInfoVer.SIV_PREME) - br.ReadUInt32(); - - // Get and tidy map name. - if (siv == ServerInfoVer.SIV_PREME) - { - srb2si.strMapName = ReadFixedLengthStr(br, 8); - srb2si.strName = ReadFixedLengthStr(br, MAXSERVERNAME); - } - else - { - srb2si.strName = ReadFixedLengthStr(br, MAXSERVERNAME); - srb2si.strMapName = ReadFixedLengthStr(br, 8); - } - - if (siv == ServerInfoVer.SIV_PREME) - byNumWads = br.ReadByte(); - - // Create new list of strings of initial size equal to number of wads. - srb2si.listFiles = new List(byNumWads); - - // Get the files info. - byte[] byFiles = br.ReadBytes(siv == ServerInfoVer.SIV_PREME ? 4096 : 936); - BinaryReader brFiles = new BinaryReader(new MemoryStream(byFiles)); - - // Extract the filenames. - try - { - for (int i = 0; i < byNumWads; i++) - { - bool bFullString = false; - AddedWad aw = new AddedWad(); - - if (siv == ServerInfoVer.SIV_PREME) - { - aw.bImportant = brFiles.ReadByte() != 0; - aw.downloadtype = (DownloadTypes)brFiles.ReadByte(); - } - else - { - byte byFileStatus = brFiles.ReadByte(); - aw.bImportant = (byFileStatus & 0xF) != 0; - aw.downloadtype = (DownloadTypes)(byFileStatus >> 4); - } - - aw.uiSize = brFiles.ReadUInt32(); - - // Work out how long the string is. - int iStringPos = (int)brFiles.BaseStream.Position; - while (iStringPos < byFiles.Length && byFiles[iStringPos] != 0) iStringPos++; - - // Make sure it's not longer than the max name length. - if (iStringPos - (int)brFiles.BaseStream.Position > MAX_WADPATH) - { - bFullString = true; - iStringPos = MAX_WADPATH + (int)brFiles.BaseStream.Position; - } - - // Get the info and add it, if possible. - if (iStringPos > (int)brFiles.BaseStream.Position) - { - aw.strFilename = Encoding.ASCII.GetString(brFiles.ReadBytes(iStringPos - (int)brFiles.BaseStream.Position)); - srb2si.listFiles.Add(aw); - } - - // Skip nul. - if (!bFullString) brFiles.ReadByte(); - - // Skip the md5sum. - brFiles.ReadBytes(16); - } - - // Okay, done! Do something useful with the server info. - sirh.ProcessServerInfo(srb2si); - - // If we got this far without an exception, leave the foreach loop. - bMalformed = false; - break; - } - catch (EndOfStreamException) - { - // Packet doesn't match supposed type, so we swallow the exception - // and try remaining types. - } - catch (Exception e) - { - sirh.HandleException(e); - break; - } - } - - if (bMalformed) - sirh.HandleException(new Exception("Received invalid PT_SERVERINFO packet from " + sirh.ipepRemote.Address + ":" + sirh.ipepRemote.Port + ".")); - } - - // Resume listening. - sirh.ipepRemote = new IPEndPoint(IPAddress.Any, 0); - sirh.udpclient.BeginReceive(new AsyncCallback(Receive), sirh); - } - } - - public enum DownloadTypes - { - DT_TOOBIG = 0, - DT_OK = 1, - DT_DISABLED = 2 - } - - public struct AddedWad - { - public string strFilename; - public bool bImportant; - public uint uiSize; - public DownloadTypes downloadtype; - } - - public enum ServerInfoVer - { - SIV_PREME, - SIV_ME - }; - - public struct SRB2ServerInfo - { - public string strAddress; - public ushort unPort; - - public ServerInfoVer siv; - - public string strVersion; - public byte byPlayers; - public byte byMaxplayers; - public byte byGametype; - public bool bModified; - public sbyte sbyAdminplayer; - public uint uiTime; - public string strMapName; - public string strName; - - public List listFiles; - } - } -} diff --git a/tools/SRB2Updater/Settings.cs b/tools/SRB2Updater/Settings.cs deleted file mode 100644 index d72aeee51..000000000 --- a/tools/SRB2Updater/Settings.cs +++ /dev/null @@ -1,219 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections; -using System.Text; -using System.Data; -using Microsoft.Win32; -using System.Windows.Forms; -using System.IO; - -namespace SRB2Updater -{ - public class Settings - { - // Global Settings - public bool boolDisplayWindowed; - public bool boolDisplayCustomResolution; - public bool boolCloseOnStart; - public int intDisplayWidth; - public int intDisplayHeight; - public string strMSAddress; - public int intMSPort; - public Array arrWadList; - public string strParams; - - public string Params - { - get { return strParams; } - set { strParams = value; } - } - - public Array wadList - { - get { return arrWadList; } - set { arrWadList = value; } - } - - public bool CloseOnStart - { - get { return boolCloseOnStart; } - set { boolCloseOnStart = value; } - } - - public string msAddress - { - get { return strMSAddress; } - set { strMSAddress = value; } - } - - public int msPort - { - get { return intMSPort; } - set { intMSPort = value; } - } - - public bool displayWindowed - { - get { return boolDisplayWindowed; } - set { boolDisplayWindowed = value; } - } - - public bool displayCustom - { - get { return boolDisplayCustomResolution; } - set { boolDisplayCustomResolution = value; } - } - - public int displayWidth - { - get { return intDisplayWidth; } - set { intDisplayWidth = value; } - } - - public int displayHeight - { - get { return intDisplayHeight; } - set { intDisplayHeight = value; } - } - - bool boolShowDefaultWads; - public bool ShowDefaultWads - { - get { return boolShowDefaultWads; } - set { boolShowDefaultWads = value; } - } - - public void GetSettings() - { - RegistryKey rk = Registry.CurrentUser.CreateSubKey(@"Software\SonicTeamJunior\Launcher"); - RegistryKey rkDisplay = Registry.CurrentUser.CreateSubKey(@"Software\SonicTeamJunior\Launcher\Display"); - RegistryKey rkMS = Registry.CurrentUser.CreateSubKey(@"Software\SonicTeamJunior\Launcher\MasterServer"); - RegistryKey rkBinaries = rk.CreateSubKey("Binaries"); - rkBinaries.SetValue("2.0.4", Directory.GetCurrentDirectory() + "\\srb2win.exe"); - - try { boolDisplayCustomResolution = Convert.ToInt32(rkDisplay.GetValue("CustomResolution", 0)) != 0; } - catch { boolDisplayCustomResolution = false; } - try { boolDisplayWindowed = Convert.ToInt32(rkDisplay.GetValue("Windowed", 0)) != 0; } - catch { boolDisplayWindowed = false; } - try { boolShowDefaultWads = Convert.ToInt32(rkDisplay.GetValue("ShowDefaultWads", 0)) != 0; } - catch { boolShowDefaultWads = false; } - try { boolCloseOnStart = Convert.ToInt32(rkDisplay.GetValue("CloseOnStart", 0)) != 0; } - catch { boolCloseOnStart = false; } - intDisplayHeight = Convert.ToInt32(rkDisplay.GetValue("Height", "480")); - intDisplayWidth = Convert.ToInt32(rkDisplay.GetValue("Width", "640")); - intMSPort = Convert.ToInt32(rkMS.GetValue("Port", "28900")); - strMSAddress = Convert.ToString(rkMS.GetValue("Address", "ms.srb2.org")); - strParams = Convert.ToString(rk.GetValue("Params")); - - dicBinaries.Clear(); - foreach (string strName in rkBinaries.GetValueNames()) - dicBinaries[strName] = (string)rkBinaries.GetValue(strName); - - - rk.Close(); - rkDisplay.Close(); - rkMS.Close(); - rkBinaries.Close(); - } - - public void SaveSettings() - { - RegistryKey rk = Registry.CurrentUser.CreateSubKey(@"Software\SonicTeamJunior\Launcher"); - RegistryKey rkDisplay = rk.CreateSubKey("Display"); - RegistryKey rkMS = rk.CreateSubKey("MasterServer"); - rkDisplay.SetValue("CustomResolution", boolDisplayCustomResolution); - rkDisplay.SetValue("Windowed", boolDisplayWindowed); - rkDisplay.SetValue("Height", intDisplayHeight); - rkDisplay.SetValue("Width", intDisplayWidth); - rkMS.SetValue("Port", intMSPort); - rkMS.SetValue("Address", strMSAddress); - rkMS.SetValue("ShowDefaultWads", boolShowDefaultWads); - rk.SetValue("Params", strParams); - rk.SetValue("CloseOnStart", boolCloseOnStart); - - rk.DeleteSubKey("Binaries", false); - RegistryKey rkBinaries = rk.CreateSubKey("Binaries"); - rkBinaries.SetValue("2.0.4", Directory.GetCurrentDirectory() + "\\srb2win.exe"); - foreach (string strName in dicBinaries.Keys) - rkBinaries.SetValue(strName, dicBinaries[strName]); - - rk.Close(); - } - -/* public void WriteToRegistry() - { - RegistryKey rk = Registry.CurrentUser.CreateSubKey(@"Software\SRB2MSLauncher"); - - rk.SetValue("Params", strParams); - rk.SetValue("Masterserver", strMSAddress); - rk.SetValue("MSPort", unMSPort, RegistryValueKind.DWord); - rk.SetValue("ShowDefaultWads", Convert.ToInt32(bShowDefaultWads), RegistryValueKind.DWord); - - rk.DeleteSubKey("Binaries", false); - RegistryKey rkBinaries = rk.CreateSubKey("Binaries"); - foreach (string strName in dicBinaries.Keys) - rkBinaries.SetValue(strName, dicBinaries[strName]); - - rkBinaries.Close(); - rk.Close(); - } - - public void LoadFromRegistry() - { - RegistryKey rk = Registry.CurrentUser.CreateSubKey(@"Software\SRB2MSLauncher"); - RegistryKey rkBinaries = rk.CreateSubKey("Binaries"); - - strParams = (string)rk.GetValue("Params", ""); - strMSAddress = (string)rk.GetValue("Masterserver", "ms.srb2.org"); - - try { unMSPort = Convert.ToUInt16(rk.GetValue("MSPort", MS_DEFAULT_PORT)); } - catch { unMSPort = MS_DEFAULT_PORT; } - - try { bShowDefaultWads = Convert.ToInt32(rk.GetValue("ShowDefaultWads", 0)) != 0; } - catch { bShowDefaultWads = true; } - - dicBinaries.Clear(); - foreach (string strName in rkBinaries.GetValueNames()) - dicBinaries[strName] = (string)rkBinaries.GetValue(strName); - - rkBinaries.Close(); - rk.Close(); - }*/ - - - public List VersionStrings - { - get { return new List(dicBinaries.Keys); } - } - - public bool HasBinaryForVersion(string strVersion) - { - return dicBinaries.ContainsKey(strVersion) && dicBinaries[strVersion] != ""; - } - - public void AddBinariesToListView(ListView lv) - { - foreach (string strName in dicBinaries.Keys) - lv.Items.Add(new ListViewItem(new string[] { strName, dicBinaries[strName] })); - } - - public void SetBinariesFromListView(ListView lv) - { - dicBinaries.Clear(); - foreach (ListViewItem lvi in lv.Items) - dicBinaries[lvi.Text] = lvi.SubItems[1].Text; - } - - Dictionary dicBinaries = new Dictionary(); - - public void SetBinary(string strVersion, string strBinary) - { - dicBinaries[strVersion] = strBinary; - } - - public string GetBinary(string strVersion) - { - return dicBinaries[strVersion]; - } - } -} \ No newline at end of file diff --git a/tools/SRB2Updater/app.config b/tools/SRB2Updater/app.config deleted file mode 100644 index b7db28170..000000000 --- a/tools/SRB2Updater/app.config +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/tools/djgpp/all313.dif b/tools/djgpp/all313.dif deleted file mode 100644 index cdecf7d84..000000000 --- a/tools/djgpp/all313.dif +++ /dev/null @@ -1,812 +0,0 @@ -diff -ruN allegro.312/demo/alld/tmp.txt allegro.313/demo/alld/tmp.txt ---- allegro.312/demo/alld/tmp.txt Thu Jan 1 00:00:00 1970 -+++ allegro.313/demo/alld/tmp.txt Sat Feb 27 21:25:34 1999 -@@ -0,0 +1 @@ -+This file is needed because some unzip programs skip empty directories. -diff -ruN allegro.312/demo/alleg/tmp.txt allegro.313/demo/alleg/tmp.txt ---- allegro.312/demo/alleg/tmp.txt Thu Jan 1 00:00:00 1970 -+++ allegro.313/demo/alleg/tmp.txt Sat Feb 27 21:25:34 1999 -@@ -0,0 +1 @@ -+This file is needed because some unzip programs skip empty directories. -diff -ruN allegro.312/demo/allp/tmp.txt allegro.313/demo/allp/tmp.txt ---- allegro.312/demo/allp/tmp.txt Thu Jan 1 00:00:00 1970 -+++ allegro.313/demo/allp/tmp.txt Sat Feb 27 21:25:34 1999 -@@ -0,0 +1 @@ -+This file is needed because some unzip programs skip empty directories. -diff -ruN allegro.312/examples/alld/tmp.txt allegro.313/examples/alld/tmp.txt ---- allegro.312/examples/alld/tmp.txt Thu Jan 1 00:00:00 1970 -+++ allegro.313/examples/alld/tmp.txt Sat Feb 27 21:25:34 1999 -@@ -0,0 +1 @@ -+This file is needed because some unzip programs skip empty directories. -diff -ruN allegro.312/examples/alleg/tmp.txt allegro.313/examples/alleg/tmp.txt ---- allegro.312/examples/alleg/tmp.txt Thu Jan 1 00:00:00 1970 -+++ allegro.313/examples/alleg/tmp.txt Sat Feb 27 21:25:34 1999 -@@ -0,0 +1 @@ -+This file is needed because some unzip programs skip empty directories. -diff -ruN allegro.312/examples/allp/tmp.txt allegro.313/examples/allp/tmp.txt ---- allegro.312/examples/allp/tmp.txt Thu Jan 1 00:00:00 1970 -+++ allegro.313/examples/allp/tmp.txt Sat Feb 27 21:25:34 1999 -@@ -0,0 +1 @@ -+This file is needed because some unzip programs skip empty directories. -diff -ruN allegro.312/makefile allegro.313/makefile ---- allegro.312/makefile Sun Feb 21 00:31:48 1999 -+++ allegro.313/makefile Mon Jun 20 23:45:18 2005 -@@ -7,8 +7,10 @@ - # # - ################################################# - --# replace this definition if you are using PGCC --# PGCC=1 -+# remline this definition if need Allegro for 486 -+PGCC=1 -+ -+GCC=gcc-2 - - .PHONY: baddjgpp baddjdev badgcc badbnu badmake badtxi badpath badalleg - -@@ -22,23 +24,25 @@ - # check that the djdev package is installed - ifeq ($(wildcard $(DJDIR)/bin/djasm.exe),) - baddjdev: -- @echo Missing djgpp package! You need to install djdev201.zip (or whatever the -+ @echo Missing djgpp package! You need to install djdev203.zip (or whatever the - @echo latest version is). Download this from wherever you got djgpp, and unzip - @echo it into the root of your djgpp directory. - endif - - # check that the gcc package is installed --ifeq ($(wildcard $(DJDIR)/bin/gcc.exe),) -+ifeq ($(wildcard $(DJDIR)/bin/$(GCC).exe),) - badgcc: -- @echo Missing djgpp package! You need to install gcc2721b.zip (or whatever the -- @echo latest version is). Download this from wherever you got djgpp, and unzip -- @echo it into the root of your djgpp directory. -+ @echo Missing djgpp package! You need to install gcc2953b.zip. Download this -+ @echo from wherever you got djgpp, and unzip bin\gcc.exe , rename it as -+ @echo $(GCC).exe into the of your bin directory. - endif - -+GCC := @$(GCC) -+ - # check that the binutils package is installed - ifeq ($(wildcard $(DJDIR)/bin/ld.exe),) - badbnu: -- @echo Missing djgpp package! You need to install bnu27b.zip (or whatever the -+ @echo Missing djgpp package! You need to install bnu216b.zip (or whatever the - @echo latest version is). Download this from wherever you got djgpp, and unzip - @echo it into the root of your djgpp directory. - endif -@@ -46,7 +50,7 @@ - # check that the make package is installed - ifeq ($(wildcard $(DJDIR)/bin/make.exe),) - badmake: -- @echo Missing djgpp package! You need to install mak3761b.zip (or whatever the -+ @echo Missing djgpp package! You need to install mak3791b.zip (or whatever the - @echo latest version is). Download this from wherever you got djgpp, and unzip - @echo it into the root of your djgpp directory. - endif -@@ -54,7 +58,7 @@ - # check that the texinfo package is installed - ifeq ($(wildcard $(DJDIR)/bin/makeinfo.exe),) - badtxi: -- @echo Missing djgpp package! You need to install txi390b.zip (or whatever the -+ @echo Missing djgpp package! You need to install txi48b.zip (or whatever the - @echo latest version is). Download this from wherever you got djgpp, and unzip - @echo it into the root of your djgpp directory. If you do not need the Info - @echo documentation, run make all to ignore this error. -@@ -83,11 +87,32 @@ - endif - endif - -+# -------- check environment to see what type of library to build -------- -+ -+ifdef DEBUGMODE -+ -+# -------- build a debugging library -------- -+VERSION = alld -+ -+else -+ifdef PROFILEMODE -+ -+# -------- build a profiling library -------- -+VERSION = allp -+ -+else -+ -+# -------- build a release library -------- -+VERSION = alleg -+ -+endif -+endif -+ -+ - # set some useful paths --OBJ = obj/djgpp --DOBJ = obj\djgpp --LIB = lib/djgpp/liballeg.a --LIBDEST = $(DJDIR)/lib/liballeg.a -+LIB = lib$(VERSION).a -+OBJ = obj/djgpp/$(VERSION) -+LIBDEST = $(DJDIR)/lib/$(LIB) - INCDEST = $(DJDIR)/include/allegro.h - DOCDEST = $(DJDIR)/info/allegro.inf - INTERNAL_H = src/internal.h src/djgpp/interndj.h -@@ -113,19 +138,22 @@ - else - ifdef PROFILEMODE - # build with profiling information -+OFLAGS = -pg -O3 -ffast-math - ifdef PGCC --OFLAGS = -pg -mpentium -O6 -ffast-math -+OFLAGS := $(OFLAGS) -mcpu=pentium - else --OFLAGS = -pg -m486 -O3 -ffast-math -+OFLAGS := $(OFLAGS) -mcpu=i486 - endif - LFLAGS = -pg - -+ - else - # build a normal optimised version -+OFLAGS = -O3 -ffast-math -fomit-frame-pointer - ifdef PGCC --OFLAGS = -mpentium -O6 -ffast-math -fomit-frame-pointer -+OFLAGS := $(OFLAGS) -mcpu=pentium - else --OFLAGS = -m486 -O3 -ffast-math -fomit-frame-pointer -+OFLAGS := $(OFLAGS) -mcpu=i486 - endif - - ifdef SYMBOLMODE -@@ -179,9 +207,18 @@ - - .PHONY: all msg lib install uninstall docs clean veryclean mmxtest $(PROGRAMS) - --all: msg $(LIB) $(PROGRAMS) docs install -+all: msg lib/djgpp/$(LIB) $(PROGRAMS) docs - @echo All done. -- @echo To use Allegro, #include allegro.h and link with liballeg.a -+ifdef DEBUGMODE -+ @echo To install this version of Allegro, run make install DEBUGMODE=1 -+else -+ifdef PROFILEMODE -+ @echo To install this version of Allegro, run make install PROFILEMODE=1 -+else -+ @echo To install this version of Allegro, run make install -+endif -+endif -+ @echo To use Allegro, #include allegro.h and link with $(LIB) - @echo Example command line: gcc foobar.c -o foobar.exe -lalleg - @echo Run make compress to run DJP or UPX on the executable files - @echo Enjoy! -@@ -189,36 +226,36 @@ - msg: - @echo Compiling Allegro. Please wait... - --lib: $(LIB) -+lib: lib/djgpp/$(LIB) - - install: $(LIBDEST) $(INCDEST) $(DOCDEST) - - docs: $(DOCS) - --$(LIBDEST): $(LIB) -- copy lib\djgpp\liballeg.a $(subst /,\,$(LIBDEST)) -+$(LIBDEST): lib/djgpp/$(LIB) -+ cp lib/djgpp/$(LIB) $(LIBDEST) - - $(INCDEST): allegro.h -- copy allegro.h $(subst /,\,$(INCDEST)) -+ cp allegro.h $(INCDEST) - - $(DOCDEST): docs/allegro.inf - ifneq ($(wildcard $(DJDIR)/bin/makeinfo.exe),) -- copy docs\allegro.inf $(subst /,\,$(DOCDEST)) -+ cp docs\allegro.inf $(DOCDEST) - else - @echo makeinfo not installed: skipping copy of allegro.inf - endif - - $(OBJ)/%.o: %.c allegro.h -- gcc $(CFLAGS) -o $@ -c $< -+ $(GCC) $(CFLAGS) -o $@ -c $< - - $(OBJ)/%.o: %.S asmdefs.inc $(OBJ)/asmdef.inc -- gcc $(SFLAGS) -o $@ -c $< -+ $(GCC) $(SFLAGS) -o $@ -c $< - - $(OBJ)/%.o: %.s asmdefs.inc $(OBJ)/asmdef.inc -- gcc -x assembler-with-cpp $(SFLAGS) -o $@ -c $< -+ $(GCC) -x assembler-with-cpp $(SFLAGS) -o $@ -c $< - --*/%.exe: $(OBJ)/%.o $(LIB) -- gcc $(LFLAGS) -o $@ $< $(LIB) -+*/$(VERSION)/%.exe: $(OBJ)/%.o lib/djgpp/$(LIB) -+ $(GCC) $(LFLAGS) -o $@ $< lib/djgpp/$(LIB) - - docs/%.inf: docs/%.txi - ifneq ($(wildcard $(DJDIR)/bin/makeinfo.exe),) -@@ -252,38 +289,38 @@ - $(OBJ)/makedoc.exe -part -ascii THANKS docs/thanks._tx - - $(OBJ)/makedoc.exe: docs/makedoc.c -- gcc $(CFLAGS) $(LFLAGS) -o $@ docs/makedoc.c -+ $(GCC) $(CFLAGS) $(LFLAGS) -o $@ docs/makedoc.c - - $(OBJ)/asmdef.inc: $(OBJ)/asmdef.exe - $(OBJ)/asmdef.exe $(OBJ)/asmdef.inc - - $(OBJ)/asmdef.exe: src/asmdef.c allegro.h $(INTERNAL_H) -- gcc $(CFLAGS) $(LFLAGS) -o $@ src/asmdef.c -+ $(GCC) $(CFLAGS) $(LFLAGS) -o $@ src/asmdef.c - - mmxtest: -- @echo // no MMX > $(DOBJ)\mmx.h -- @echo .text > $(DOBJ)\mmxtest.s -- @echo emms >> $(DOBJ)\mmxtest.s -- @gcc -c $(OBJ)/mmxtest.s -o $(OBJ)/mmxtest.o -- @echo #define ALLEGRO_MMX > $(DOBJ)\mmx.h -+ @echo // no MMX > $(subst /,\,$(OBJ))\mmx.h -+ @echo .text > $(subst /,\,$(OBJ))\mmxtest.s -+ @echo emms >> $(subst /,\,$(OBJ))\mmxtest.s -+ @$(GCC) -c $(OBJ)/mmxtest.s -o $(OBJ)/mmxtest.o -+ @echo #define ALLEGRO_MMX > $(subst /,\,$(OBJ))\mmx.h - @echo Your assembler supports MMX instructions! - - $(OBJ)/mmx.h: - @echo Testing for MMX assembler support... - -$(MAKE) mmxtest - --$(OBJ)/setupdat.s $(OBJ)/setupdat.h: setup/setup.dat tools/dat2s.exe -- tools/dat2s.exe setup/setup.dat -o $(OBJ)/setupdat.s -h $(OBJ)/setupdat.h -+$(OBJ)/setupdat.s $(OBJ)/setupdat.h: setup/setup.dat tools/$(VERSION)/dat2s.exe -+ tools/$(VERSION)/dat2s.exe setup/setup.dat -o $(OBJ)/setupdat.s -h $(OBJ)/setupdat.h - - $(OBJ)/setupdat.o: $(OBJ)/setupdat.s -- gcc $(SFLAGS) -o $(OBJ)/setupdat.o -c $(OBJ)/setupdat.s -+ $(GCC) $(SFLAGS) -o $(OBJ)/setupdat.o -c $(OBJ)/setupdat.s - --setup/setup.exe: $(OBJ)/setup.o $(OBJ)/setupdat.o $(LIB) -- gcc $(LFLAGS) -o setup/setup.exe $(OBJ)/setup.o $(OBJ)/setupdat.o $(LIB) -+setup/$(VERSION)/setup.exe: $(OBJ)/setup.o $(OBJ)/setupdat.o lib/djgpp/$(LIB) -+ $(GCC) $(LFLAGS) -o setup/$(VERSION)/setup.exe $(OBJ)/setup.o $(OBJ)/setupdat.o lib/djgpp/$(LIB) - ifndef DEBUGMODE - ifndef SYMBOLMODE - ifneq ($(DJP),) -- $(DJP) setup/setup.exe -+ $(DJP) setup/$(VERSION)/setup.exe - endif - endif - endif -@@ -301,79 +338,79 @@ - endif - - $(OBJ)/plugins.h: $(wildcard tools/plugins/*.inc) -- copy tools\plugins\*.inc $(DOBJ)\plugins.h -+ cat tools/plugins/*.inc > $(OBJ)/plugins.h - --tools/dat.exe: $(OBJ)/dat.o $(DATEDIT_DEPS) $(LIB) -- gcc $(LFLAGS) -o tools/dat.exe $(OBJ)/dat.o $(DATEDIT_LINK) $(LIB) -+tools/$(VERSION)/dat.exe: $(OBJ)/dat.o $(DATEDIT_DEPS) lib/djgpp/$(LIB) -+ $(GCC) $(LFLAGS) -o tools/$(VERSION)/dat.exe $(OBJ)/dat.o $(DATEDIT_LINK) lib/djgpp/$(LIB) - --tools/dat2s.exe: $(OBJ)/dat2s.o $(DATEDIT_DEPS) $(LIB) -- gcc $(LFLAGS) -o tools/dat2s.exe $(OBJ)/dat2s.o $(DATEDIT_LINK) $(LIB) -+tools/$(VERSION)/dat2s.exe: $(OBJ)/dat2s.o $(DATEDIT_DEPS) lib/djgpp/$(LIB) -+ $(GCC) $(LFLAGS) -o tools/$(VERSION)/dat2s.exe $(OBJ)/dat2s.o $(DATEDIT_LINK) lib/djgpp/$(LIB) - --tools/grabber.exe: $(OBJ)/grabber.o $(DATEDIT_DEPS) $(LIB) -- gcc $(LFLAGS) -o tools/grabber.exe $(OBJ)/grabber.o $(DATEDIT_LINK) $(LIB) -+tools/$(VERSION)/grabber.exe: $(OBJ)/grabber.o $(DATEDIT_DEPS) lib/djgpp/$(LIB) -+ $(GCC) $(LFLAGS) -o tools/$(VERSION)/grabber.exe $(OBJ)/grabber.o $(DATEDIT_LINK) lib/djgpp/$(LIB) - --tools/pat2dat.exe: $(OBJ)/pat2dat.o $(DATEDIT_DEPS) $(LIB) -- gcc $(LFLAGS) -o tools/pat2dat.exe $(OBJ)/pat2dat.o $(DATEDIT_LINK) $(LIB) -+tools/$(VERSION)/pat2dat.exe: $(OBJ)/pat2dat.o $(DATEDIT_DEPS) lib/djgpp/$(LIB) -+ $(GCC) $(LFLAGS) -o tools/$(VERSION)/pat2dat.exe $(OBJ)/pat2dat.o $(DATEDIT_LINK) lib/djgpp/$(LIB) - --$(LIB): $(LIB_OBJS) -- ar rs $(LIB) $(LIB_OBJS) -+lib/djgpp/$(LIB): $(LIB_OBJS) -+ ar rs lib/djgpp/$(LIB) $(LIB_OBJS) - - compress: $(PROGRAMS) - ifneq ($(DJP),) -- $(DJP) demo/*.exe examples/*.exe tests/*.exe tools/*.exe setup/keyconf.exe obj/djgpp/*.exe -+ $(DJP) demo/$(VERSION)/*.exe examples/$(VERSION)/*.exe tests/$(VERSION)/*.exe tools/$(VERSION)/*.exe setup/$(VERSION)/keyconf.exe $(OBJ)*.exe - else - @echo No executable compressor found! This target requires either the - @echo DJP or UPX utilities to be installed in your djgpp bin directory. - endif - - clean: -- -rm -v obj/djgpp/*.* lib/djgpp/*.* docs/*.$(HTML) docs/*.txi docs/*.inf docs/*.rtf -+ -rm -f -v $(OBJ)/*.* lib/djgpp/*.* docs/*.$(HTML) docs/*.txi docs/*.inf docs/*.rtf - - veryclean: clean -- -rm -v allegro.txt AUTHORS CHANGES faq.txt help.txt NEWS THANKS \ -- demo/*.exe examples/*.exe setup/*.exe tests/*.exe tools/*.exe -+ -rm -f -v allegro.txt AUTHORS CHANGES faq.txt help.txt NEWS THANKS \ -+ demo/$(VERSION)/*.exe examples/$(VERSION)/*.exe setup/$(VERSION)/*.exe tests/$(VERSION)/*.exe tools/$(VERSION)/*.exe - - uninstall: -- -rm $(LIBDEST) -- -rm $(INCDEST) -- -rm $(DOCDEST) -+ -rm -f $(LIBDEST) -+ -rm -f $(INCDEST) -+ -rm -f $(DOCDEST) - @echo All gone! (sulk) - --demo: demo/demo.exe --keyconf: setup/keyconf.exe --setup: setup/setup.exe --afinfo: tests/afinfo.exe --akaitest: tests/akaitest.exe --digitest: tests/digitest.exe --mathtest: tests/mathtest.exe --miditest: tests/miditest.exe --play: tests/play.exe --playfli: tests/playfli.exe --test: tests/test.exe --vesainfo: tests/vesainfo.exe --colormap: tools/colormap.exe --dat: tools/dat.exe --dat2s: tools/dat2s.exe --exedat: tools/exedat.exe --grabber: tools/grabber.exe --pack: tools/pack.exe --pat2dat: tools/pat2dat.exe --rgbmap: tools/rgbmap.exe -- --examples: examples/ex1.exe examples/ex2.exe examples/ex3.exe \ -- examples/ex4.exe examples/ex5.exe examples/ex6.exe \ -- examples/ex7.exe examples/ex8.exe examples/ex9.exe \ -- examples/ex10.exe examples/ex11.exe examples/ex12.exe \ -- examples/ex13.exe examples/ex14.exe examples/ex15.exe \ -- examples/ex16.exe examples/ex17.exe examples/ex18.exe \ -- examples/ex19.exe examples/ex20.exe examples/ex21.exe \ -- examples/ex22.exe examples/ex23.exe examples/ex24.exe \ -- examples/ex25.exe examples/ex26.exe examples/ex27.exe \ -- examples/ex28.exe examples/ex29.exe examples/ex30.exe \ -- examples/ex31.exe examples/ex32.exe examples/ex33.exe \ -- examples/ex34.exe examples/ex35.exe examples/ex36.exe \ -- examples/ex37.exe examples/ex38.exe examples/ex39.exe \ -- examples/ex40.exe -+demo: demo/$(VERSION)/demo.exe -+keyconf: setup/$(VERSION)/keyconf.exe -+setup: setup/$(VERSION)/setup.exe -+afinfo: tests/$(VERSION)/afinfo.exe -+akaitest: tests/$(VERSION)/akaitest.exe -+digitest: tests/$(VERSION)/digitest.exe -+mathtest: tests/$(VERSION)/mathtest.exe -+miditest: tests/$(VERSION)/miditest.exe -+play: tests/$(VERSION)/play.exe -+playfli: tests/$(VERSION)/playfli.exe -+test: tests/$(VERSION)/test.exe -+vesainfo: tests/$(VERSION)/vesainfo.exe -+colormap: tools/$(VERSION)/colormap.exe -+dat: tools/$(VERSION)/dat.exe -+dat2s: tools/$(VERSION)/dat2s.exe -+exedat: tools/$(VERSION)/exedat.exe -+grabber: tools/$(VERSION)/grabber.exe -+pack: tools/$(VERSION)/pack.exe -+pat2dat: tools/$(VERSION)/pat2dat.exe -+rgbmap: tools/$(VERSION)/rgbmap.exe -+ -+examples: examples/$(VERSION)/ex1.exe examples/$(VERSION)/ex2.exe examples/$(VERSION)/ex3.exe \ -+ examples/$(VERSION)/ex4.exe examples/$(VERSION)/ex5.exe examples/$(VERSION)/ex6.exe \ -+ examples/$(VERSION)/ex7.exe examples/$(VERSION)/ex8.exe examples/$(VERSION)/ex9.exe \ -+ examples/$(VERSION)/ex10.exe examples/$(VERSION)/ex11.exe examples/$(VERSION)/ex12.exe \ -+ examples/$(VERSION)/ex13.exe examples/$(VERSION)/ex14.exe examples/$(VERSION)/ex15.exe \ -+ examples/$(VERSION)/ex16.exe examples/$(VERSION)/ex17.exe examples/$(VERSION)/ex18.exe \ -+ examples/$(VERSION)/ex19.exe examples/$(VERSION)/ex20.exe examples/$(VERSION)/ex21.exe \ -+ examples/$(VERSION)/ex22.exe examples/$(VERSION)/ex23.exe examples/$(VERSION)/ex24.exe \ -+ examples/$(VERSION)/ex25.exe examples/$(VERSION)/ex26.exe examples/$(VERSION)/ex27.exe \ -+ examples/$(VERSION)/ex28.exe examples/$(VERSION)/ex29.exe examples/$(VERSION)/ex30.exe \ -+ examples/$(VERSION)/ex31.exe examples/$(VERSION)/ex32.exe examples/$(VERSION)/ex33.exe \ -+ examples/$(VERSION)/ex34.exe examples/$(VERSION)/ex35.exe examples/$(VERSION)/ex36.exe \ -+ examples/$(VERSION)/ex37.exe examples/$(VERSION)/ex38.exe examples/$(VERSION)/ex39.exe \ -+ examples/$(VERSION)/ex40.exe - - $(OBJ)/demo.o: demo.h - $(OBJ)/adlib.o: fm_instr.h -diff -ruN allegro.312/obj/djgpp/alld/tmp.txt allegro.313/obj/djgpp/alld/tmp.txt ---- allegro.312/obj/djgpp/alld/tmp.txt Thu Jan 1 00:00:00 1970 -+++ allegro.313/obj/djgpp/alld/tmp.txt Sat Feb 27 21:25:34 1999 -@@ -0,0 +1 @@ -+This file is needed because some unzip programs skip empty directories. -diff -ruN allegro.312/obj/djgpp/alleg/tmp.txt allegro.313/obj/djgpp/alleg/tmp.txt ---- allegro.312/obj/djgpp/alleg/tmp.txt Thu Jan 1 00:00:00 1970 -+++ allegro.313/obj/djgpp/alleg/tmp.txt Sat Feb 27 21:25:34 1999 -@@ -0,0 +1 @@ -+This file is needed because some unzip programs skip empty directories. -diff -ruN allegro.312/obj/djgpp/allp/tmp.txt allegro.313/obj/djgpp/allp/tmp.txt ---- allegro.312/obj/djgpp/allp/tmp.txt Thu Jan 1 00:00:00 1970 -+++ allegro.313/obj/djgpp/allp/tmp.txt Sat Feb 27 21:25:34 1999 -@@ -0,0 +1 @@ -+This file is needed because some unzip programs skip empty directories. -diff -ruN allegro.312/obj/djgpp/tmp.txt allegro.313/obj/djgpp/tmp.txt ---- allegro.312/obj/djgpp/tmp.txt Sat Feb 27 21:25:34 1999 -+++ allegro.313/obj/djgpp/tmp.txt Thu Jan 1 00:00:00 1970 -@@ -1 +0,0 @@ --This file is needed because some unzip programs skip empty directories. -diff -ruN allegro.312/setup/alld/tmp.txt allegro.313/setup/alld/tmp.txt ---- allegro.312/setup/alld/tmp.txt Thu Jan 1 00:00:00 1970 -+++ allegro.313/setup/alld/tmp.txt Sat Feb 27 21:25:34 1999 -@@ -0,0 +1 @@ -+This file is needed because some unzip programs skip empty directories. -diff -ruN allegro.312/setup/alleg/tmp.txt allegro.313/setup/alleg/tmp.txt ---- allegro.312/setup/alleg/tmp.txt Thu Jan 1 00:00:00 1970 -+++ allegro.313/setup/alleg/tmp.txt Sat Feb 27 21:25:34 1999 -@@ -0,0 +1 @@ -+This file is needed because some unzip programs skip empty directories. -diff -ruN allegro.312/setup/allp/tmp.txt allegro.313/setup/allp/tmp.txt ---- allegro.312/setup/allp/tmp.txt Thu Jan 1 00:00:00 1970 -+++ allegro.313/setup/allp/tmp.txt Sat Feb 27 21:25:34 1999 -@@ -0,0 +1 @@ -+This file is needed because some unzip programs skip empty directories. -diff -ruN allegro.312/src/asmdefs.inc allegro.313/src/asmdefs.inc ---- allegro.312/src/asmdefs.inc Sat Feb 20 20:51:22 1999 -+++ allegro.313/src/asmdefs.inc Sun Jun 19 04:18:44 2005 -@@ -41,8 +41,8 @@ - * %eax. Registers will be unchanged, except %eax will return a pointer - * to the start of the selected scanline. - */ --#define WRITE_BANK() call BMP_WBANK(%edx) --#define READ_BANK() call BMP_RBANK(%edx) -+#define WRITE_BANK() call *BMP_WBANK(%edx) -+#define READ_BANK() call *BMP_RBANK(%edx) - - - /* Helper macro for looking up a position in the pattern bitmap. Passed -diff -ruN allegro.312/src/djgpp/gpro.c allegro.313/src/djgpp/gpro.c ---- allegro.312/src/djgpp/gpro.c Sat Feb 20 22:01:28 1999 -+++ allegro.313/src/djgpp/gpro.c Mon Jun 20 21:23:42 2005 -@@ -53,135 +53,79 @@ - */ - static int read_gpp(int pad_num) - { -- char samples[60]; -- char clock_mask, data_mask; -- int ret; -- -- asm ( -- " cmpb $0, %0 ; " -- " jne 14f ; " -- " movb $0x10, %b2 ; " -- " movb $0x20, %b3 ; " -- " jmp 15f ; " -- " 14: " -- " movb $0x40, %b2 ; " -- " movb $0x80, %b3 ; " -- -- " 15: " -- " xorl %%ebx, %%ebx ; " -- " xorl %%edi, %%edi ; " -- " movw $0x201, %%dx ; " -- -- " cli ; " -- " inb %%dx, %%al ; " -- " movb %%al, %%ah ; " -- -- " 4: " -- " xorl %%ecx, %%ecx ; " -- " 0: " -- " inb %%dx, %%al ; " -- " cmpb %%ah, %%al ; " -- " jne 1f ; " -- " incl %%ecx ; " -- " cmpl $255, %%ecx ; " -- " jl 0b ; " -- -- " 1: " -- " cmpl $255, %%ecx ; " -- " je 16f ; " -- -- " testb %%ah, %b2 ; " -- " jz 2f ; " -- " testb %%al, %b2 ; " -- " jnz 2f ; " -- -- " addl %4, %%edi ; " -- " testb %%al, %b3 ; " -- " jz 3f ; " -- " movb $1, (%%edi) ; " -- " jmp 12f ; " -- " 3: " -- " movb $0, (%%edi) ; " -- " 12: " -- " subl %4, %%edi ; " -- " incl %%edi ; " -- -- " 2: " -- " movb %%al, %%ah ; " -- " cmpl $200, %%ebx ; " -- " je 13f ; " -- " incl %%ebx ; " -- " cmpl $50, %%edi ; " -- " jl 4b ; " -- -- " 13: " -- " sti ; " -- " xorl %%ecx, %%ecx ; " -- " movl $1, %%esi ; " -- " 7: " -- " addl %4, %%esi ; " -- " movb (%%esi), %%dl ; " -- " subl %4, %%esi ; " -- " cmpb $1, %%dl ; " -- " jg 16f ; " -- " jne 6f ; " -- " incl %%ecx ; " -- " jmp 5f ; " -- " 6: " -- " xorl %%ecx, %%ecx ; " -- -- " 5: " -- " cmpl $5, %%ecx ; " -- " je 8f ; " -- " cmpl %%edi, %%esi ; " -- " je 8f ; " -- " incl %%esi ; " -- " jmp 7b ; " -- -- " 8: " -- " cmpl $5, %%ecx ; " -- " jne 16f ; " -- " addl $2, %%esi ; " -- " xorl %%eax, %%eax ; " -- " xorl %%ebx, %%ebx ; " -- " xorl %%ecx, %%ecx ; " -- " xorl %%edx, %%edx ; " -- -- " 10: " -- " incl %%ecx ; " -- " cmpl $5, %%ecx ; " -- " jne 11f ; " -- " movl $1, %%ecx ; " -- " incl %%esi ; " -- " 11: " -- " addl %4, %%esi ; " -- " movb (%%esi), %%dl ; " -- " subl %4, %%esi ; " -- " orl %%edx, %%eax ; " -- " shll $1, %%eax ; " -- " cmpl $13, %%ebx ; " -- " je 9f ; " -- " incl %%ebx ; " -- " incl %%esi ; " -- " jmp 10b ; " -- -- " 16: " -- " movl $1, %%eax ; " -- -- " 9: " -- " sti ; " -- -- : "=a" (ret) -- -- : "0" (pad_num), -- "m" (clock_mask), -- "m" (data_mask), -- "m" (samples) -+ int samples[50]; -+ int clock_mask, data_mask, data, old_data; -+ int num_samples, timeout1, timeout2, sample_pos, c; -+ -+ if (pad_num == 0) { -+ clock_mask = 0x10; -+ data_mask = 0x20; -+ } -+ else { -+ clock_mask = 0x40; -+ data_mask = 0x80; -+ } -+ -+ num_samples = 0; -+ timeout1 = 0; -+ -+ asm volatile ("cli"); -+ -+ old_data = inportb(0x201); -+ data = 0; -+ -+ while (num_samples<50) { -+ for (timeout2=0; timeout2<255; timeout2++) { -+ data = inportb(0x201); -+ if (data != old_data) -+ break; -+ } -+ -+ if (timeout2 == 255) { -+ asm volatile ("sti"); -+ return 1; -+ } -+ -+ if ((old_data & clock_mask) && (!(data & clock_mask))) { -+ samples[num_samples] = (data & data_mask) ? 1 : 0; -+ num_samples++; -+ } -+ -+ old_data = data; -+ -+ if (timeout1++ == 200) -+ break; -+ } -+ -+ asm volatile ("sti"); -+ -+ c = 0; -+ -+ for (sample_pos=1; sample_posgs), - "=m" (sregs->ss) - -- : /* no inputs */ -- -- : "%eax" /* clobbers %eax */ - ); - } - -diff -ruN allegro.312/src/gfx15.s allegro.313/src/gfx15.s ---- allegro.312/src/gfx15.s Sat Feb 20 20:50:30 1999 -+++ allegro.313/src/gfx15.s Mon Jun 20 22:46:02 2005 -@@ -367,9 +367,9 @@ - movl BMP_CT(%edx), %esi /* clip y1 */ - - vline_y1_ok: -- cmpw BMP_CB(%edx), %ecx /* test y2, bmp->cb */ -+ cmpw BMP_CB(%edx), %cx /* test y2, bmp->cb */ - jl vline_noclip -- cmpw BMP_CB(%edx), %esi /* test y1, bmp->cb */ -+ cmpw BMP_CB(%edx), %si /* test y1, bmp->cb */ - jge vline_done - movl BMP_CB(%edx), %ecx /* clip y2 */ - decl %ecx -diff -ruN allegro.312/src/gfx16.s allegro.313/src/gfx16.s ---- allegro.312/src/gfx16.s Sat Feb 20 20:50:42 1999 -+++ allegro.313/src/gfx16.s Mon Jun 20 22:47:28 2005 -@@ -417,9 +417,9 @@ - movl BMP_CT(%edx), %esi /* clip y1 */ - - vline_y1_ok: -- cmpw BMP_CB(%edx), %ecx /* test y2, bmp->cb */ -+ cmpw BMP_CB(%edx), %cx /* test y2, bmp->cb */ - jl vline_noclip -- cmpw BMP_CB(%edx), %esi /* test y1, bmp->cb */ -+ cmpw BMP_CB(%edx), %si /* test y1, bmp->cb */ - jge vline_done - movl BMP_CB(%edx), %ecx /* clip y2 */ - decl %ecx -diff -ruN allegro.312/src/gfx24.s allegro.313/src/gfx24.s ---- allegro.312/src/gfx24.s Sat Feb 20 20:46:30 1999 -+++ allegro.313/src/gfx24.s Mon Jun 20 22:48:22 2005 -@@ -265,7 +265,7 @@ - movl %eax, ARG2 /* ARG2 == 12(%ebp) */ - movl %eax, 15(%ebp) /* overwrite ARG2, ARG3, ARG4 */ - movl %eax, 18(%ebp) -- movw %eax, 21(%ebp) -+ movw %ax, 21(%ebp) - shrl $16, %eax - movb %al, 23(%ebp) - cmpl $4, %ecx -@@ -503,9 +503,9 @@ - movl BMP_CT(%edx), %esi /* clip y1 */ - - vline_y1_ok: -- cmpw BMP_CB(%edx), %ecx /* test y2, bmp->cb */ -+ cmpw BMP_CB(%edx), %cx /* test y2, bmp->cb */ - jl vline_noclip -- cmpw BMP_CB(%edx), %esi /* test y1, bmp->cb */ -+ cmpw BMP_CB(%edx), %si /* test y1, bmp->cb */ - jge vline_done - movl BMP_CB(%edx), %ecx /* clip y2 */ - decl %ecx -diff -ruN allegro.312/src/gfx32.s allegro.313/src/gfx32.s ---- allegro.312/src/gfx32.s Sat Feb 20 20:50:40 1999 -+++ allegro.313/src/gfx32.s Mon Jun 20 22:48:44 2005 -@@ -398,9 +398,9 @@ - movl BMP_CT(%edx), %esi /* clip y1 */ - - vline_y1_ok: -- cmpw BMP_CB(%edx), %ecx /* test y2, bmp->cb */ -+ cmpw BMP_CB(%edx), %cx /* test y2, bmp->cb */ - jl vline_noclip -- cmpw BMP_CB(%edx), %esi /* test y1, bmp->cb */ -+ cmpw BMP_CB(%edx), %si /* test y1, bmp->cb */ - jge vline_done - movl BMP_CB(%edx), %ecx /* clip y2 */ - decl %ecx -diff -ruN allegro.312/src/gfx8.s allegro.313/src/gfx8.s ---- allegro.312/src/gfx8.s Sat Feb 20 20:50:54 1999 -+++ allegro.313/src/gfx8.s Mon Jun 20 22:49:02 2005 -@@ -455,9 +455,9 @@ - movl BMP_CT(%edx), %esi /* clip y1 */ - - vline_y1_ok: -- cmpw BMP_CB(%edx), %ecx /* test y2, bmp->cb */ -+ cmpw BMP_CB(%edx), %cx /* test y2, bmp->cb */ - jl vline_noclip -- cmpw BMP_CB(%edx), %esi /* test y1, bmp->cb */ -+ cmpw BMP_CB(%edx), %si /* test y1, bmp->cb */ - jge vline_done - movl BMP_CB(%edx), %ecx /* clip y2 */ - decl %ecx -diff -ruN allegro.312/tests/alld/tmp.txt allegro.313/tests/alld/tmp.txt ---- allegro.312/tests/alld/tmp.txt Thu Jan 1 00:00:00 1970 -+++ allegro.313/tests/alld/tmp.txt Sat Feb 27 21:25:34 1999 -@@ -0,0 +1 @@ -+This file is needed because some unzip programs skip empty directories. -diff -ruN allegro.312/tests/alleg/tmp.txt allegro.313/tests/alleg/tmp.txt ---- allegro.312/tests/alleg/tmp.txt Thu Jan 1 00:00:00 1970 -+++ allegro.313/tests/alleg/tmp.txt Sat Feb 27 21:25:34 1999 -@@ -0,0 +1 @@ -+This file is needed because some unzip programs skip empty directories. -diff -ruN allegro.312/tests/allp/tmp.txt allegro.313/tests/allp/tmp.txt ---- allegro.312/tests/allp/tmp.txt Thu Jan 1 00:00:00 1970 -+++ allegro.313/tests/allp/tmp.txt Sat Feb 27 21:25:34 1999 -@@ -0,0 +1 @@ -+This file is needed because some unzip programs skip empty directories. -diff -ruN allegro.312/tools/alld/tmp.txt allegro.313/tools/alld/tmp.txt ---- allegro.312/tools/alld/tmp.txt Thu Jan 1 00:00:00 1970 -+++ allegro.313/tools/alld/tmp.txt Sat Feb 27 21:25:34 1999 -@@ -0,0 +1 @@ -+This file is needed because some unzip programs skip empty directories. -diff -ruN allegro.312/tools/alleg/tmp.txt allegro.313/tools/alleg/tmp.txt ---- allegro.312/tools/alleg/tmp.txt Thu Jan 1 00:00:00 1970 -+++ allegro.313/tools/alleg/tmp.txt Sat Feb 27 21:25:34 1999 -@@ -0,0 +1 @@ -+This file is needed because some unzip programs skip empty directories. -diff -ruN allegro.312/tools/allp/tmp.txt allegro.313/tools/allp/tmp.txt ---- allegro.312/tools/allp/tmp.txt Thu Jan 1 00:00:00 1970 -+++ allegro.313/tools/allp/tmp.txt Sat Feb 27 21:25:34 1999 -@@ -0,0 +1 @@ -+This file is needed because some unzip programs skip empty directories. diff --git a/tools/fmoddyn.h b/tools/fmoddyn.h deleted file mode 100644 index d1e7c43f8..000000000 --- a/tools/fmoddyn.h +++ /dev/null @@ -1,582 +0,0 @@ -/* =========================================================================================== */ -/* FMOD Dynamic DLL loading header. Copyright (c), Firelight Technologies Pty, Ltd. 1999-2004. */ -/* =========================================================================================== */ - -#ifndef _FMODDYN_H_ -#define _FMODDYN_H_ - -#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(_WIN64) - #include -#else - #include - #include -#endif -#include - -typedef struct -{ - void *module; - - signed char (F_API *FSOUND_SetOutput)(int outputtype); - signed char (F_API *FSOUND_SetDriver)(int driver); - signed char (F_API *FSOUND_SetMixer)(int mixer); - signed char (F_API *FSOUND_SetBufferSize)(int len_ms); - signed char (F_API *FSOUND_SetHWND)(void *hwnd); - signed char (F_API *FSOUND_SetMinHardwareChannels)(int min); - signed char (F_API *FSOUND_SetMaxHardwareChannels)(int max); - signed char (F_API *FSOUND_SetMemorySystem)(void *pool, int poollen, FSOUND_ALLOCCALLBACK useralloc, FSOUND_REALLOCCALLBACK userrealloc, FSOUND_FREECALLBACK userfree); - signed char (F_API *FSOUND_Init)(int mixrate, int maxsoftwarechannels, unsigned int flags); - void (F_API *FSOUND_Close)(); - void (F_API *FSOUND_Update)(); /* you must call this once a frame */ - void (F_API *FSOUND_SetSpeakerMode)(unsigned int speakermode); - void (F_API *FSOUND_SetSFXMasterVolume)(int volume); - void (F_API *FSOUND_SetPanSeperation)(float pansep); - void (F_API *FSOUND_File_SetCallbacks)(FSOUND_OPENCALLBACK useropen, FSOUND_CLOSECALLBACK userclose, FSOUND_READCALLBACK userread, FSOUND_SEEKCALLBACK userseek, FSOUND_TELLCALLBACK usertell); - int (F_API *FSOUND_GetError)(); - float (F_API *FSOUND_GetVersion)(); - int (F_API *FSOUND_GetOutput)(); - void * (F_API *FSOUND_GetOutputHandle)(); - int (F_API *FSOUND_GetDriver)(); - int (F_API *FSOUND_GetMixer)(); - int (F_API *FSOUND_GetNumDrivers)(); - const char * (F_API *FSOUND_GetDriverName)(int id); - signed char (F_API *FSOUND_GetDriverCaps)(int id, unsigned int *caps); - int (F_API *FSOUND_GetOutputRate)(); - int (F_API *FSOUND_GetMaxChannels)(); - int (F_API *FSOUND_GetMaxSamples)(); - unsigned int (F_API *FSOUND_GetSpeakerMode)(); - int (F_API *FSOUND_GetSFXMasterVolume)(); - signed char (F_API *FSOUND_GetNumHWChannels)(int *num2d, int *num3d, int *total); - int (F_API *FSOUND_GetChannelsPlaying)(); - float (F_API *FSOUND_GetCPUUsage)(); - void (F_API *FSOUND_GetMemoryStats)(unsigned int *currentalloced, unsigned int *maxalloced); - FSOUND_SAMPLE * (F_API *FSOUND_Sample_Load)(int index, const char *name_or_data, unsigned int mode, int offset, int length); - FSOUND_SAMPLE * (F_API *FSOUND_Sample_Alloc)(int index, int length, unsigned int mode, int deffreq, int defvol, int defpan, int defpri); - void (F_API *FSOUND_Sample_Free)(FSOUND_SAMPLE *sptr); - signed char (F_API *FSOUND_Sample_Upload)(FSOUND_SAMPLE *sptr, void *srcdata, unsigned int mode); - signed char (F_API *FSOUND_Sample_Lock)(FSOUND_SAMPLE *sptr, int offset, int length, void **ptr1, void **ptr2, unsigned int *len1, unsigned int *len2); - signed char (F_API *FSOUND_Sample_Unlock)(FSOUND_SAMPLE *sptr, void *ptr1, void *ptr2, unsigned int len1, unsigned int len2); - signed char (F_API *FSOUND_Sample_SetMode)(FSOUND_SAMPLE *sptr, unsigned int mode); - signed char (F_API *FSOUND_Sample_SetLoopPoints)(FSOUND_SAMPLE *sptr, int loopstart, int loopend); - signed char (F_API *FSOUND_Sample_SetDefaults)(FSOUND_SAMPLE *sptr, int deffreq, int defvol, int defpan, int defpri); - signed char (F_API *FSOUND_Sample_SetDefaultsEx)(FSOUND_SAMPLE *sptr, int deffreq, int defvol, int defpan, int defpri, int varfreq, int varvol, int varpan); - signed char (F_API *FSOUND_Sample_SetMinMaxDistance)(FSOUND_SAMPLE *sptr, float min, float max); - signed char (F_API *FSOUND_Sample_SetMaxPlaybacks)(FSOUND_SAMPLE *sptr, int max); - FSOUND_SAMPLE * (F_API *FSOUND_Sample_Get)(int sampno); - const char * (F_API *FSOUND_Sample_GetName)(FSOUND_SAMPLE *sptr); - unsigned int (F_API *FSOUND_Sample_GetLength)(FSOUND_SAMPLE *sptr); - signed char (F_API *FSOUND_Sample_GetLoopPoints)(FSOUND_SAMPLE *sptr, int *loopstart, int *loopend); - signed char (F_API *FSOUND_Sample_GetDefaults)(FSOUND_SAMPLE *sptr, int *deffreq, int *defvol, int *defpan, int *defpri); - signed char (F_API *FSOUND_Sample_GetDefaultsEx)(FSOUND_SAMPLE *sptr, int *deffreq, int *defvol, int *defpan, int *defpri, int *varfreq, int *varvol, int *varpan); - unsigned int (F_API *FSOUND_Sample_GetMode)(FSOUND_SAMPLE *sptr); - signed char (F_API *FSOUND_Sample_GetMinMaxDistance)(FSOUND_SAMPLE *sptr, float *min, float *max); - int (F_API *FSOUND_PlaySound)(int channel, FSOUND_SAMPLE *sptr); - int (F_API *FSOUND_PlaySoundEx)(int channel, FSOUND_SAMPLE *sptr, FSOUND_DSPUNIT *dsp, signed char startpaused); - signed char (F_API *FSOUND_StopSound)(int channel); - signed char (F_API *FSOUND_SetFrequency)(int channel, int freq); - signed char (F_API *FSOUND_SetVolume)(int channel, int vol); - signed char (F_API *FSOUND_SetVolumeAbsolute)(int channel, int vol); - signed char (F_API *FSOUND_SetPan)(int channel, int pan); - signed char (F_API *FSOUND_SetSurround)(int channel, signed char surround); - signed char (F_API *FSOUND_SetMute)(int channel, signed char mute); - signed char (F_API *FSOUND_SetPriority)(int channel, int priority); - signed char (F_API *FSOUND_SetReserved)(int channel, signed char reserved); - signed char (F_API *FSOUND_SetPaused)(int channel, signed char paused); - signed char (F_API *FSOUND_SetLoopMode)(int channel, unsigned int loopmode); - signed char (F_API *FSOUND_SetCurrentPosition)(int channel, unsigned int offset); - signed char (F_API *FSOUND_3D_SetAttributes)(int channel, const float *pos, const float *vel); - signed char (F_API *FSOUND_3D_SetMinMaxDistance)(int channel, float min, float max); - signed char (F_API *FSOUND_IsPlaying)(int channel); - int (F_API *FSOUND_GetFrequency)(int channel); - int (F_API *FSOUND_GetVolume)(int channel); - int (F_API *FSOUND_GetAmplitude)(int channel); - int (F_API *FSOUND_GetPan)(int channel); - signed char (F_API *FSOUND_GetSurround)(int channel); - signed char (F_API *FSOUND_GetMute)(int channel); - int (F_API *FSOUND_GetPriority)(int channel); - signed char (F_API *FSOUND_GetReserved)(int channel); - signed char (F_API *FSOUND_GetPaused)(int channel); - unsigned int (F_API *FSOUND_GetLoopMode)(int channel); - unsigned int (F_API *FSOUND_GetCurrentPosition)(int channel); - FSOUND_SAMPLE * (F_API *FSOUND_GetCurrentSample)(int channel); - signed char (F_API *FSOUND_GetCurrentLevels)(int channel, float *l, float *r); - int (F_API *FSOUND_GetNumSubChannels)(int channel); - int (F_API *FSOUND_GetSubChannel)(int channel, int subchannel); - signed char (F_API *FSOUND_3D_GetAttributes)(int channel, float *pos, float *vel); - signed char (F_API *FSOUND_3D_GetMinMaxDistance)(int channel, float *min, float *max); - void (F_API *FSOUND_3D_SetDopplerFactor)(float scale); - void (F_API *FSOUND_3D_SetDistanceFactor)(float scale); - void (F_API *FSOUND_3D_SetRolloffFactor)(float scale); - void (F_API *FSOUND_3D_Listener_SetCurrent)(int current, int numlisteners); /* use this if you use multiple listeners / splitscreen */ - void (F_API *FSOUND_3D_Listener_SetAttributes)(const float *pos, const float *vel, float fx, float fy, float fz, float tx, float ty, float tz); - void (F_API *FSOUND_3D_Listener_GetAttributes)(float *pos, float *vel, float *fx, float *fy, float *fz, float *tx, float *ty, float *tz); - int (F_API *FSOUND_FX_Enable)(int channel, unsigned int fx); /* See FSOUND_FX_MODES */ - signed char (F_API *FSOUND_FX_Disable)(int channel); - signed char (F_API *FSOUND_FX_SetChorus)(int fxid, float WetDryMix, float Depth, float Feedback, float Frequency, int Waveform, float Delay, int Phase); - signed char (F_API *FSOUND_FX_SetCompressor)(int fxid, float Gain, float Attack, float Release, float Threshold, float Ratio, float Predelay); - signed char (F_API *FSOUND_FX_SetDistortion)(int fxid, float Gain, float Edge, float PostEQCenterFrequency, float PostEQBandwidth, float PreLowpassCutoff); - signed char (F_API *FSOUND_FX_SetEcho)(int fxid, float WetDryMix, float Feedback, float LeftDelay, float RightDelay, int PanDelay); - signed char (F_API *FSOUND_FX_SetFlanger)(int fxid, float WetDryMix, float Depth, float Feedback, float Frequency, int Waveform, float Delay, int Phase); - signed char (F_API *FSOUND_FX_SetGargle)(int fxid, int RateHz, int WaveShape); - signed char (F_API *FSOUND_FX_SetI3DL2Reverb)(int fxid, int Room, int RoomHF, float RoomRolloffFactor, float DecayTime, float DecayHFRatio, int Reflections, float ReflectionsDelay, int Reverb, float ReverbDelay, float Diffusion, float Density, float HFReference); - signed char (F_API *FSOUND_FX_SetParamEQ)(int fxid, float Center, float Bandwidth, float Gain); - signed char (F_API *FSOUND_FX_SetWavesReverb)(int fxid, float InGain, float ReverbMix, float ReverbTime, float HighFreqRTRatio); - signed char (F_API *FSOUND_Stream_SetBufferSize)(int ms); /* call this before opening streams, not after */ - FSOUND_STREAM * (F_API *FSOUND_Stream_Open)(const char *name_or_data, unsigned int mode, int offset, int length); - FSOUND_STREAM * (F_API *FSOUND_Stream_Create)(FSOUND_STREAMCALLBACK callback, int length, unsigned int mode, int samplerate, void *userdata); - signed char (F_API *FSOUND_Stream_Close)(FSOUND_STREAM *stream); - int (F_API *FSOUND_Stream_Play)(int channel, FSOUND_STREAM *stream); - int (F_API *FSOUND_Stream_PlayEx)(int channel, FSOUND_STREAM *stream, FSOUND_DSPUNIT *dsp, signed char startpaused); - signed char (F_API *FSOUND_Stream_Stop)(FSOUND_STREAM *stream); - signed char (F_API *FSOUND_Stream_SetPosition)(FSOUND_STREAM *stream, unsigned int position); - unsigned int (F_API *FSOUND_Stream_GetPosition)(FSOUND_STREAM *stream); - signed char (F_API *FSOUND_Stream_SetTime)(FSOUND_STREAM *stream, int ms); - int (F_API *FSOUND_Stream_GetTime)(FSOUND_STREAM *stream); - int (F_API *FSOUND_Stream_GetLength)(FSOUND_STREAM *stream); - int (F_API *FSOUND_Stream_GetLengthMs)(FSOUND_STREAM *stream); - signed char (F_API *FSOUND_Stream_SetMode)(FSOUND_STREAM *stream, unsigned int mode); - unsigned int (F_API *FSOUND_Stream_GetMode)(FSOUND_STREAM *stream); - signed char (F_API *FSOUND_Stream_SetLoopPoints)(FSOUND_STREAM *stream, unsigned int loopstartpcm, unsigned int loopendpcm); - signed char (F_API *FSOUND_Stream_SetLoopCount)(FSOUND_STREAM *stream, int count); - int (F_API *FSOUND_Stream_GetOpenState)(FSOUND_STREAM *stream); - FSOUND_SAMPLE * (F_API *FSOUND_Stream_GetSample)(FSOUND_STREAM *stream); /* every stream contains a sample to playback on */ - FSOUND_DSPUNIT * (F_API *FSOUND_Stream_CreateDSP)(FSOUND_STREAM *stream, FSOUND_DSPCALLBACK callback, int priority, void *userdata); - signed char (F_API *FSOUND_Stream_SetEndCallback)(FSOUND_STREAM *stream, FSOUND_STREAMCALLBACK callback, void *userdata); - signed char (F_API *FSOUND_Stream_SetSyncCallback)(FSOUND_STREAM *stream, FSOUND_STREAMCALLBACK callback, void *userdata); - FSOUND_SYNCPOINT *(F_API *FSOUND_Stream_AddSyncPoint)(FSOUND_STREAM *stream, unsigned int pcmoffset, const char *name); - signed char (F_API *FSOUND_Stream_DeleteSyncPoint)(FSOUND_SYNCPOINT *point); - int (F_API *FSOUND_Stream_GetNumSyncPoints)(FSOUND_STREAM *stream); - FSOUND_SYNCPOINT *(F_API *FSOUND_Stream_GetSyncPoint)(FSOUND_STREAM *stream, int index); - char * (F_API *FSOUND_Stream_GetSyncPointInfo)(FSOUND_SYNCPOINT *point, unsigned int *pcmoffset); - signed char (F_API *FSOUND_Stream_SetSubStream)(FSOUND_STREAM *stream, int index); - int (F_API *FSOUND_Stream_GetNumSubStreams)(FSOUND_STREAM *stream); - signed char (F_API *FSOUND_Stream_SetSubStreamSentence)(FSOUND_STREAM *stream, const int *sentencelist, int numitems); - signed char (F_API *FSOUND_Stream_GetNumTagFields)(FSOUND_STREAM *stream, int *num); - signed char (F_API *FSOUND_Stream_GetTagField)(FSOUND_STREAM *stream, int num, int *type, char **name, void **value, int *length); - signed char (F_API *FSOUND_Stream_FindTagField)(FSOUND_STREAM *stream, int type, const char *name, void **value, int *length); - signed char (F_API *FSOUND_Stream_Net_SetProxy)(const char *proxy); - signed char (F_API *FSOUND_Stream_Net_SetTimeout)(int timeout); - char * (F_API *FSOUND_Stream_Net_GetLastServerStatus)(); - signed char (F_API *FSOUND_Stream_Net_SetBufferProperties)(int buffersize, int prebuffer_percent, int rebuffer_percent); - signed char (F_API *FSOUND_Stream_Net_GetBufferProperties)(int *buffersize, int *prebuffer_percent, int *rebuffer_percent); - signed char (F_API *FSOUND_Stream_Net_SetMetadataCallback)(FSOUND_STREAM *stream, FSOUND_METADATACALLBACK callback, void *userdata); - signed char (F_API *FSOUND_Stream_Net_GetStatus)(FSOUND_STREAM *stream, int *status, int *bufferpercentused, int *bitrate, unsigned int *flags); - signed char (F_API *FSOUND_CD_Play)(char drive, int track); - void (F_API *FSOUND_CD_SetPlayMode)(char drive, signed char mode); - signed char (F_API *FSOUND_CD_Stop)(char drive); - signed char (F_API *FSOUND_CD_SetPaused)(char drive, signed char paused); - signed char (F_API *FSOUND_CD_SetVolume)(char drive, int volume); - signed char (F_API *FSOUND_CD_SetTrackTime)(char drive, unsigned int ms); - signed char (F_API *FSOUND_CD_OpenTray)(char drive, signed char open); - signed char (F_API *FSOUND_CD_GetPaused)(char drive); - int (F_API *FSOUND_CD_GetTrack)(char drive); - int (F_API *FSOUND_CD_GetNumTracks)(char drive); - int (F_API *FSOUND_CD_GetVolume)(char drive); - int (F_API *FSOUND_CD_GetTrackLength)(char drive, int track); - int (F_API *FSOUND_CD_GetTrackTime)(char drive); - FSOUND_DSPUNIT * (F_API *FSOUND_DSP_Create)(FSOUND_DSPCALLBACK callback, int priority, void *userdata); - void (F_API *FSOUND_DSP_Free)(FSOUND_DSPUNIT *unit); - void (F_API *FSOUND_DSP_SetPriority)(FSOUND_DSPUNIT *unit, int priority); - int (F_API *FSOUND_DSP_GetPriority)(FSOUND_DSPUNIT *unit); - void (F_API *FSOUND_DSP_SetActive)(FSOUND_DSPUNIT *unit, signed char active); - signed char (F_API *FSOUND_DSP_GetActive)(FSOUND_DSPUNIT *unit); - FSOUND_DSPUNIT * (F_API *FSOUND_DSP_GetClearUnit)(); - FSOUND_DSPUNIT * (F_API *FSOUND_DSP_GetSFXUnit)(); - FSOUND_DSPUNIT * (F_API *FSOUND_DSP_GetMusicUnit)(); - FSOUND_DSPUNIT * (F_API *FSOUND_DSP_GetFFTUnit)(); - FSOUND_DSPUNIT * (F_API *FSOUND_DSP_GetClipAndCopyUnit)(); - signed char (F_API *FSOUND_DSP_MixBuffers)(void *destbuffer, void *srcbuffer, int len, int freq, int vol, int pan, unsigned int mode); - void (F_API *FSOUND_DSP_ClearMixBuffer)(); - int (F_API *FSOUND_DSP_GetBufferLength)(); /* Length of each DSP update */ - int (F_API *FSOUND_DSP_GetBufferLengthTotal)(); /* Total buffer length due to FSOUND_SetBufferSize */ - float * (F_API *FSOUND_DSP_GetSpectrum)(); /* Array of 512 floats - call FSOUND_DSP_SetActive(FSOUND_DSP_GetFFTUnit(), TRUE)) for this to work. */ - signed char (F_API *FSOUND_Reverb_SetProperties)(const FSOUND_REVERB_PROPERTIES *prop); - signed char (F_API *FSOUND_Reverb_GetProperties)(FSOUND_REVERB_PROPERTIES *prop); - signed char (F_API *FSOUND_Reverb_SetChannelProperties)(int channel, const FSOUND_REVERB_CHANNELPROPERTIES *prop); - signed char (F_API *FSOUND_Reverb_GetChannelProperties)(int channel, FSOUND_REVERB_CHANNELPROPERTIES *prop); - signed char (F_API *FSOUND_Record_SetDriver)(int outputtype); - int (F_API *FSOUND_Record_GetNumDrivers)(); - const char * (F_API *FSOUND_Record_GetDriverName)(int id); - int (F_API *FSOUND_Record_GetDriver)(); - signed char (F_API *FSOUND_Record_StartSample)(FSOUND_SAMPLE *sptr, signed char loop); - signed char (F_API *FSOUND_Record_Stop)(); - int (F_API *FSOUND_Record_GetPosition)(); - FMUSIC_MODULE * (F_API *FMUSIC_LoadSong)(const char *name); - FMUSIC_MODULE * (F_API *FMUSIC_LoadSongEx)(const char *name_or_data, int offset, int length, unsigned int mode, const int *samplelist, int samplelistnum); - int (F_API *FMUSIC_GetOpenState)(FMUSIC_MODULE *mod); - signed char (F_API *FMUSIC_FreeSong)(FMUSIC_MODULE *mod); - signed char (F_API *FMUSIC_PlaySong)(FMUSIC_MODULE *mod); - signed char (F_API *FMUSIC_StopSong)(FMUSIC_MODULE *mod); - void (F_API *FMUSIC_StopAllSongs)(); - signed char (F_API *FMUSIC_SetZxxCallback)(FMUSIC_MODULE *mod, FMUSIC_CALLBACK callback); - signed char (F_API *FMUSIC_SetRowCallback)(FMUSIC_MODULE *mod, FMUSIC_CALLBACK callback, int rowstep); - signed char (F_API *FMUSIC_SetOrderCallback)(FMUSIC_MODULE *mod, FMUSIC_CALLBACK callback, int orderstep); - signed char (F_API *FMUSIC_SetInstCallback)(FMUSIC_MODULE *mod, FMUSIC_CALLBACK callback, int instrument); - signed char (F_API *FMUSIC_SetSample)(FMUSIC_MODULE *mod, int sampno, FSOUND_SAMPLE *sptr); - signed char (F_API *FMUSIC_SetUserData)(FMUSIC_MODULE *mod, void *userdata); - signed char (F_API *FMUSIC_OptimizeChannels)(FMUSIC_MODULE *mod, int maxchannels, int minvolume); - signed char (F_API *FMUSIC_SetReverb)(signed char reverb); /* MIDI only */ - signed char (F_API *FMUSIC_SetLooping)(FMUSIC_MODULE *mod, signed char looping); - signed char (F_API *FMUSIC_SetOrder)(FMUSIC_MODULE *mod, int order); - signed char (F_API *FMUSIC_SetPaused)(FMUSIC_MODULE *mod, signed char pause); - signed char (F_API *FMUSIC_SetMasterVolume)(FMUSIC_MODULE *mod, int volume); - signed char (F_API *FMUSIC_SetMasterSpeed)(FMUSIC_MODULE *mode, float speed); - signed char (F_API *FMUSIC_SetPanSeperation)(FMUSIC_MODULE *mod, float pansep); - const char * (F_API *FMUSIC_GetName)(FMUSIC_MODULE *mod); - int (F_API *FMUSIC_GetType)(FMUSIC_MODULE *mod); - int (F_API *FMUSIC_GetNumOrders)(FMUSIC_MODULE *mod); - int (F_API *FMUSIC_GetNumPatterns)(FMUSIC_MODULE *mod); - int (F_API *FMUSIC_GetNumInstruments)(FMUSIC_MODULE *mod); - int (F_API *FMUSIC_GetNumSamples)(FMUSIC_MODULE *mod); - int (F_API *FMUSIC_GetNumChannels)(FMUSIC_MODULE *mod); - FSOUND_SAMPLE * (F_API *FMUSIC_GetSample)(FMUSIC_MODULE *mod, int sampno); - int (F_API *FMUSIC_GetPatternLength)(FMUSIC_MODULE *mod, int orderno); - signed char (F_API *FMUSIC_IsFinished)(FMUSIC_MODULE *mod); - signed char (F_API *FMUSIC_IsPlaying)(FMUSIC_MODULE *mod); - int (F_API *FMUSIC_GetMasterVolume)(FMUSIC_MODULE *mod); - int (F_API *FMUSIC_GetGlobalVolume)(FMUSIC_MODULE *mod); - int (F_API *FMUSIC_GetOrder)(FMUSIC_MODULE *mod); - int (F_API *FMUSIC_GetPattern)(FMUSIC_MODULE *mod); - int (F_API *FMUSIC_GetSpeed)(FMUSIC_MODULE *mod); - int (F_API *FMUSIC_GetBPM)(FMUSIC_MODULE *mod); - int (F_API *FMUSIC_GetRow)(FMUSIC_MODULE *mod); - signed char (F_API *FMUSIC_GetPaused)(FMUSIC_MODULE *mod); - int (F_API *FMUSIC_GetTime)(FMUSIC_MODULE *mod); - int (F_API *FMUSIC_GetRealChannel)(FMUSIC_MODULE *mod, int modchannel); - unsigned int (F_API *FMUSIC_GetUserData)(FMUSIC_MODULE *mod); -} FMOD_INSTANCE; - - -static FMOD_INSTANCE *FMOD_CreateInstance(char *dllName) -{ - FMOD_INSTANCE *instance; - - instance = (FMOD_INSTANCE *)calloc(sizeof(FMOD_INSTANCE), 1); - if (!instance) - { - return NULL; - } - -#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(_WIN64) - instance->module = LoadLibrary(dllName); -#else - instance->module = dlopen(dllName, RTLD_LAZY); -#endif - if (!instance->module) - { - free(instance); - return NULL; - } - -#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(_WIN64) -#ifdef __MINGW64__ - #define F_GETPROC(_x, _y) \ - { \ - char tmp[] = _y; \ - *(strchr(tmp, '@')) = 0; \ - instance->_x = (LPVOID)GetProcAddress((HMODULE)instance->module, &tmp[1]); \ - if (!instance->_x) \ - { \ - FreeLibrary((HMODULE)instance->module); \ - free(instance); \ - return NULL; \ - } \ - } -#elif defined(__MINGW32__) - #define F_GETPROC(_x, _y) \ - { \ - instance->_x = (LPVOID)GetProcAddress((HMODULE)instance->module, _y); \ - if (!instance->_x) \ - { \ - FreeLibrary((HMODULE)instance->module); \ - free(instance); \ - return NULL; \ - } \ - } -#elif defined (_X86_) - #define F_GETPROC(_x, _y) \ - { \ - instance->_x = (LPVOID)(size_t)GetProcAddress((HMODULE)instance->module, _y); \ - if (!instance->_x) \ - { \ - FreeLibrary((HMODULE)instance->module); \ - free(instance); \ - return NULL; \ - } \ - } -#else - #define F_GETPROC(_x, _y) \ - { \ - char tmp[] = _y; \ - *(strchr(tmp, '@')) = 0; \ - instance->_x = (LPVOID)(size_t)GetProcAddress((HMODULE)instance->module, &tmp[1]); \ - if (!instance->_x) \ - { \ - FreeLibrary((HMODULE)instance->module); \ - free(instance); \ - return NULL; \ - } \ - } -#endif -#else - #define F_GETPROC(_x, _y) \ - { \ - char tmp[] = _y; \ - *(strchr(tmp, '@')) = 0; \ - instance->_x = (void *)dlsym(instance->module, &tmp[1]); \ - if (!instance->_x) \ - { \ - dlclose(instance->module); \ - free(instance); \ - return NULL; \ - } \ - } -#endif - - F_GETPROC(FSOUND_SetOutput, "_FSOUND_SetOutput@4"); - F_GETPROC(FSOUND_SetDriver, "_FSOUND_SetDriver@4"); - F_GETPROC(FSOUND_SetMixer, "_FSOUND_SetMixer@4"); - F_GETPROC(FSOUND_SetBufferSize, "_FSOUND_SetBufferSize@4"); - F_GETPROC(FSOUND_SetHWND, "_FSOUND_SetHWND@4"); - F_GETPROC(FSOUND_SetMinHardwareChannels, "_FSOUND_SetMinHardwareChannels@4"); - F_GETPROC(FSOUND_SetMaxHardwareChannels, "_FSOUND_SetMaxHardwareChannels@4"); - F_GETPROC(FSOUND_SetMemorySystem, "_FSOUND_SetMemorySystem@20"); - F_GETPROC(FSOUND_Init, "_FSOUND_Init@12"); - F_GETPROC(FSOUND_Close, "_FSOUND_Close@0"); - F_GETPROC(FSOUND_Update, "_FSOUND_Update@0"); - F_GETPROC(FSOUND_SetSFXMasterVolume, "_FSOUND_SetSFXMasterVolume@4"); - F_GETPROC(FSOUND_SetPanSeperation, "_FSOUND_SetPanSeperation@4"); - F_GETPROC(FSOUND_SetSpeakerMode, "_FSOUND_SetSpeakerMode@4"); - F_GETPROC(FSOUND_GetError, "_FSOUND_GetError@0"); - F_GETPROC(FSOUND_GetVersion, "_FSOUND_GetVersion@0"); - F_GETPROC(FSOUND_GetOutput, "_FSOUND_GetOutput@0"); - F_GETPROC(FSOUND_GetOutputHandle, "_FSOUND_GetOutputHandle@0"); - F_GETPROC(FSOUND_GetDriver, "_FSOUND_GetDriver@0"); - F_GETPROC(FSOUND_GetMixer, "_FSOUND_GetMixer@0"); - F_GETPROC(FSOUND_GetNumDrivers, "_FSOUND_GetNumDrivers@0"); - F_GETPROC(FSOUND_GetDriverName, "_FSOUND_GetDriverName@4"); - F_GETPROC(FSOUND_GetDriverCaps, "_FSOUND_GetDriverCaps@8"); - F_GETPROC(FSOUND_GetOutputRate, "_FSOUND_GetOutputRate@0"); - F_GETPROC(FSOUND_GetMaxChannels, "_FSOUND_GetMaxChannels@0"); - F_GETPROC(FSOUND_GetMaxSamples, "_FSOUND_GetMaxSamples@0"); - F_GETPROC(FSOUND_GetSpeakerMode, "_FSOUND_GetSpeakerMode@0"); - F_GETPROC(FSOUND_GetSFXMasterVolume, "_FSOUND_GetSFXMasterVolume@0"); - F_GETPROC(FSOUND_GetNumHWChannels, "_FSOUND_GetNumHWChannels@12"); - F_GETPROC(FSOUND_GetChannelsPlaying, "_FSOUND_GetChannelsPlaying@0"); - F_GETPROC(FSOUND_GetCPUUsage, "_FSOUND_GetCPUUsage@0"); - F_GETPROC(FSOUND_GetMemoryStats, "_FSOUND_GetMemoryStats@8"); - F_GETPROC(FSOUND_Sample_Load, "_FSOUND_Sample_Load@20"); - F_GETPROC(FSOUND_Sample_Alloc, "_FSOUND_Sample_Alloc@28"); - F_GETPROC(FSOUND_Sample_Free, "_FSOUND_Sample_Free@4"); - F_GETPROC(FSOUND_Sample_Upload, "_FSOUND_Sample_Upload@12"); - F_GETPROC(FSOUND_Sample_Lock, "_FSOUND_Sample_Lock@28"); - F_GETPROC(FSOUND_Sample_Unlock, "_FSOUND_Sample_Unlock@20"); - F_GETPROC(FSOUND_Sample_SetMode, "_FSOUND_Sample_SetMode@8"); - F_GETPROC(FSOUND_Sample_SetLoopPoints, "_FSOUND_Sample_SetLoopPoints@12"); - F_GETPROC(FSOUND_Sample_SetDefaults, "_FSOUND_Sample_SetDefaults@20"); - F_GETPROC(FSOUND_Sample_SetDefaultsEx, "_FSOUND_Sample_SetDefaultsEx@32"); - F_GETPROC(FSOUND_Sample_SetMinMaxDistance, "_FSOUND_Sample_SetMinMaxDistance@12"); - F_GETPROC(FSOUND_Sample_SetMaxPlaybacks, "_FSOUND_Sample_SetMaxPlaybacks@8"); - F_GETPROC(FSOUND_Sample_Get, "_FSOUND_Sample_Get@4"); - F_GETPROC(FSOUND_Sample_GetName, "_FSOUND_Sample_GetName@4"); - F_GETPROC(FSOUND_Sample_GetLength, "_FSOUND_Sample_GetLength@4"); - F_GETPROC(FSOUND_Sample_GetLoopPoints, "_FSOUND_Sample_GetLoopPoints@12"); - F_GETPROC(FSOUND_Sample_GetDefaults, "_FSOUND_Sample_GetDefaults@20"); - F_GETPROC(FSOUND_Sample_GetDefaultsEx, "_FSOUND_Sample_GetDefaultsEx@32"); - F_GETPROC(FSOUND_Sample_GetMode, "_FSOUND_Sample_GetMode@4"); - F_GETPROC(FSOUND_Sample_GetMinMaxDistance, "_FSOUND_Sample_GetMinMaxDistance@12"); - F_GETPROC(FSOUND_PlaySound, "_FSOUND_PlaySound@8"); - F_GETPROC(FSOUND_PlaySoundEx, "_FSOUND_PlaySoundEx@16"); - F_GETPROC(FSOUND_StopSound, "_FSOUND_StopSound@4"); - F_GETPROC(FSOUND_SetFrequency, "_FSOUND_SetFrequency@8"); - F_GETPROC(FSOUND_SetVolume, "_FSOUND_SetVolume@8"); - F_GETPROC(FSOUND_SetVolumeAbsolute, "_FSOUND_SetVolumeAbsolute@8"); - F_GETPROC(FSOUND_SetPan, "_FSOUND_SetPan@8"); - F_GETPROC(FSOUND_SetSurround, "_FSOUND_SetSurround@8"); - F_GETPROC(FSOUND_SetMute, "_FSOUND_SetMute@8"); - F_GETPROC(FSOUND_SetPriority, "_FSOUND_SetPriority@8"); - F_GETPROC(FSOUND_SetReserved, "_FSOUND_SetReserved@8"); - F_GETPROC(FSOUND_SetPaused, "_FSOUND_SetPaused@8"); - F_GETPROC(FSOUND_SetLoopMode, "_FSOUND_SetLoopMode@8"); - F_GETPROC(FSOUND_SetCurrentPosition, "_FSOUND_SetCurrentPosition@8"); - F_GETPROC(FSOUND_3D_SetAttributes, "_FSOUND_3D_SetAttributes@12"); - F_GETPROC(FSOUND_3D_SetMinMaxDistance, "_FSOUND_3D_SetMinMaxDistance@12"); - F_GETPROC(FSOUND_IsPlaying, "_FSOUND_IsPlaying@4"); - F_GETPROC(FSOUND_GetFrequency, "_FSOUND_GetFrequency@4"); - F_GETPROC(FSOUND_GetVolume, "_FSOUND_GetVolume@4"); - F_GETPROC(FSOUND_GetAmplitude, "_FSOUND_GetAmplitude@4"); - F_GETPROC(FSOUND_GetPan, "_FSOUND_GetPan@4"); - F_GETPROC(FSOUND_GetSurround, "_FSOUND_GetSurround@4"); - F_GETPROC(FSOUND_GetMute, "_FSOUND_GetMute@4"); - F_GETPROC(FSOUND_GetPriority, "_FSOUND_GetPriority@4"); - F_GETPROC(FSOUND_GetReserved, "_FSOUND_GetReserved@4"); - F_GETPROC(FSOUND_GetPaused, "_FSOUND_GetPaused@4"); - F_GETPROC(FSOUND_GetLoopMode, "_FSOUND_GetLoopMode@4"); - F_GETPROC(FSOUND_GetCurrentPosition, "_FSOUND_GetCurrentPosition@4"); - F_GETPROC(FSOUND_GetCurrentSample, "_FSOUND_GetCurrentSample@4"); - F_GETPROC(FSOUND_GetCurrentLevels, "_FSOUND_GetCurrentLevels@12"); - F_GETPROC(FSOUND_GetNumSubChannels, "_FSOUND_GetNumSubChannels@4"); - F_GETPROC(FSOUND_GetSubChannel, "_FSOUND_GetSubChannel@8"); - F_GETPROC(FSOUND_3D_GetAttributes, "_FSOUND_3D_GetAttributes@12"); - F_GETPROC(FSOUND_3D_GetMinMaxDistance, "_FSOUND_3D_GetMinMaxDistance@12"); - F_GETPROC(FSOUND_3D_Listener_SetCurrent, "_FSOUND_3D_Listener_SetCurrent@8"); - F_GETPROC(FSOUND_3D_Listener_SetAttributes, "_FSOUND_3D_Listener_SetAttributes@32"); - F_GETPROC(FSOUND_3D_Listener_GetAttributes, "_FSOUND_3D_Listener_GetAttributes@32"); - F_GETPROC(FSOUND_3D_SetDopplerFactor, "_FSOUND_3D_SetDopplerFactor@4"); - F_GETPROC(FSOUND_3D_SetDistanceFactor, "_FSOUND_3D_SetDistanceFactor@4"); - F_GETPROC(FSOUND_3D_SetRolloffFactor, "_FSOUND_3D_SetRolloffFactor@4"); - F_GETPROC(FSOUND_FX_Enable, "_FSOUND_FX_Enable@8"); - F_GETPROC(FSOUND_FX_Disable, "_FSOUND_FX_Disable@4"); - F_GETPROC(FSOUND_FX_SetChorus, "_FSOUND_FX_SetChorus@32"); - F_GETPROC(FSOUND_FX_SetCompressor, "_FSOUND_FX_SetCompressor@28"); - F_GETPROC(FSOUND_FX_SetDistortion, "_FSOUND_FX_SetDistortion@24"); - F_GETPROC(FSOUND_FX_SetEcho, "_FSOUND_FX_SetEcho@24"); - F_GETPROC(FSOUND_FX_SetFlanger, "_FSOUND_FX_SetFlanger@32"); - F_GETPROC(FSOUND_FX_SetGargle, "_FSOUND_FX_SetGargle@12"); - F_GETPROC(FSOUND_FX_SetI3DL2Reverb, "_FSOUND_FX_SetI3DL2Reverb@52"); - F_GETPROC(FSOUND_FX_SetParamEQ, "_FSOUND_FX_SetParamEQ@16"); - F_GETPROC(FSOUND_FX_SetWavesReverb, "_FSOUND_FX_SetWavesReverb@20"); - F_GETPROC(FSOUND_Stream_Open, "_FSOUND_Stream_Open@16"); - F_GETPROC(FSOUND_Stream_Create, "_FSOUND_Stream_Create@20"); - F_GETPROC(FSOUND_Stream_Play, "_FSOUND_Stream_Play@8"); - F_GETPROC(FSOUND_Stream_PlayEx, "_FSOUND_Stream_PlayEx@16"); - F_GETPROC(FSOUND_Stream_Stop, "_FSOUND_Stream_Stop@4"); - F_GETPROC(FSOUND_Stream_Close, "_FSOUND_Stream_Close@4"); - F_GETPROC(FSOUND_Stream_SetEndCallback, "_FSOUND_Stream_SetEndCallback@12"); - F_GETPROC(FSOUND_Stream_SetSyncCallback, "_FSOUND_Stream_SetSyncCallback@12"); - F_GETPROC(FSOUND_Stream_GetSample, "_FSOUND_Stream_GetSample@4"); - F_GETPROC(FSOUND_Stream_CreateDSP, "_FSOUND_Stream_CreateDSP@16"); - F_GETPROC(FSOUND_Stream_SetBufferSize, "_FSOUND_Stream_SetBufferSize@4"); - F_GETPROC(FSOUND_Stream_SetPosition, "_FSOUND_Stream_SetPosition@8"); - F_GETPROC(FSOUND_Stream_GetPosition, "_FSOUND_Stream_GetPosition@4"); - F_GETPROC(FSOUND_Stream_SetTime, "_FSOUND_Stream_SetTime@8"); - F_GETPROC(FSOUND_Stream_GetTime, "_FSOUND_Stream_GetTime@4"); - F_GETPROC(FSOUND_Stream_GetLength, "_FSOUND_Stream_GetLength@4"); - F_GETPROC(FSOUND_Stream_GetLengthMs, "_FSOUND_Stream_GetLengthMs@4"); - F_GETPROC(FSOUND_Stream_SetMode, "_FSOUND_Stream_SetMode@8"); - F_GETPROC(FSOUND_Stream_GetMode, "_FSOUND_Stream_GetMode@4"); - F_GETPROC(FSOUND_Stream_SetSubStream, "_FSOUND_Stream_SetSubStream@8"); - F_GETPROC(FSOUND_Stream_GetNumSubStreams, "_FSOUND_Stream_GetNumSubStreams@4"); - F_GETPROC(FSOUND_Stream_SetSubStreamSentence, "_FSOUND_Stream_SetSubStreamSentence@12"); - F_GETPROC(FSOUND_Stream_SetLoopPoints, "_FSOUND_Stream_SetLoopPoints@12"); - F_GETPROC(FSOUND_Stream_SetLoopCount, "_FSOUND_Stream_SetLoopCount@8"); - F_GETPROC(FSOUND_Stream_AddSyncPoint, "_FSOUND_Stream_AddSyncPoint@12"); - F_GETPROC(FSOUND_Stream_DeleteSyncPoint, "_FSOUND_Stream_DeleteSyncPoint@4"); - F_GETPROC(FSOUND_Stream_GetNumSyncPoints, "_FSOUND_Stream_GetNumSyncPoints@4"); - F_GETPROC(FSOUND_Stream_GetSyncPoint, "_FSOUND_Stream_GetSyncPoint@8"); - F_GETPROC(FSOUND_Stream_GetSyncPointInfo, "_FSOUND_Stream_GetSyncPointInfo@8"); - F_GETPROC(FSOUND_Stream_GetOpenState, "_FSOUND_Stream_GetOpenState@4"); - F_GETPROC(FSOUND_Stream_GetNumTagFields, "_FSOUND_Stream_GetNumTagFields@8"); - F_GETPROC(FSOUND_Stream_GetTagField, "_FSOUND_Stream_GetTagField@24"); - F_GETPROC(FSOUND_Stream_FindTagField, "_FSOUND_Stream_FindTagField@20"); - F_GETPROC(FSOUND_Stream_Net_SetProxy, "_FSOUND_Stream_Net_SetProxy@4"); - F_GETPROC(FSOUND_Stream_Net_GetLastServerStatus, "_FSOUND_Stream_Net_GetLastServerStatus@0"); - F_GETPROC(FSOUND_Stream_Net_SetBufferProperties, "_FSOUND_Stream_Net_SetBufferProperties@12"); - F_GETPROC(FSOUND_Stream_Net_GetBufferProperties, "_FSOUND_Stream_Net_GetBufferProperties@12"); - F_GETPROC(FSOUND_Stream_Net_SetMetadataCallback, "_FSOUND_Stream_Net_SetMetadataCallback@12"); - F_GETPROC(FSOUND_Stream_Net_GetStatus, "_FSOUND_Stream_Net_GetStatus@20"); - F_GETPROC(FSOUND_CD_Play, "_FSOUND_CD_Play@8"); - F_GETPROC(FSOUND_CD_SetPlayMode, "_FSOUND_CD_SetPlayMode@8"); - F_GETPROC(FSOUND_CD_Stop, "_FSOUND_CD_Stop@4"); - F_GETPROC(FSOUND_CD_SetPaused, "_FSOUND_CD_SetPaused@8"); - F_GETPROC(FSOUND_CD_SetVolume, "_FSOUND_CD_SetVolume@8"); - F_GETPROC(FSOUND_CD_SetTrackTime, "_FSOUND_CD_SetTrackTime@8"); - F_GETPROC(FSOUND_CD_OpenTray, "_FSOUND_CD_OpenTray@8"); - F_GETPROC(FSOUND_CD_GetPaused, "_FSOUND_CD_GetPaused@4"); - F_GETPROC(FSOUND_CD_GetTrack, "_FSOUND_CD_GetTrack@4"); - F_GETPROC(FSOUND_CD_GetNumTracks, "_FSOUND_CD_GetNumTracks@4"); - F_GETPROC(FSOUND_CD_GetVolume, "_FSOUND_CD_GetVolume@4"); - F_GETPROC(FSOUND_CD_GetTrackLength, "_FSOUND_CD_GetTrackLength@8"); - F_GETPROC(FSOUND_CD_GetTrackTime, "_FSOUND_CD_GetTrackTime@4"); - F_GETPROC(FSOUND_DSP_Create, "_FSOUND_DSP_Create@12"); - F_GETPROC(FSOUND_DSP_Free, "_FSOUND_DSP_Free@4"); - F_GETPROC(FSOUND_DSP_SetPriority, "_FSOUND_DSP_SetPriority@8"); - F_GETPROC(FSOUND_DSP_GetPriority, "_FSOUND_DSP_GetPriority@4"); - F_GETPROC(FSOUND_DSP_SetActive, "_FSOUND_DSP_SetActive@8"); - F_GETPROC(FSOUND_DSP_GetActive, "_FSOUND_DSP_GetActive@4"); - F_GETPROC(FSOUND_DSP_GetClearUnit, "_FSOUND_DSP_GetClearUnit@0"); - F_GETPROC(FSOUND_DSP_GetSFXUnit, "_FSOUND_DSP_GetSFXUnit@0"); - F_GETPROC(FSOUND_DSP_GetMusicUnit, "_FSOUND_DSP_GetMusicUnit@0"); - F_GETPROC(FSOUND_DSP_GetClipAndCopyUnit, "_FSOUND_DSP_GetClipAndCopyUnit@0"); - F_GETPROC(FSOUND_DSP_GetFFTUnit, "_FSOUND_DSP_GetFFTUnit@0"); - F_GETPROC(FSOUND_DSP_MixBuffers, "_FSOUND_DSP_MixBuffers@28"); - F_GETPROC(FSOUND_DSP_ClearMixBuffer, "_FSOUND_DSP_ClearMixBuffer@0"); - F_GETPROC(FSOUND_DSP_GetBufferLength, "_FSOUND_DSP_GetBufferLength@0"); - F_GETPROC(FSOUND_DSP_GetBufferLengthTotal, "_FSOUND_DSP_GetBufferLengthTotal@0"); - F_GETPROC(FSOUND_DSP_GetSpectrum, "_FSOUND_DSP_GetSpectrum@0"); - F_GETPROC(FSOUND_Reverb_SetProperties, "_FSOUND_Reverb_SetProperties@4"); - F_GETPROC(FSOUND_Reverb_GetProperties, "_FSOUND_Reverb_GetProperties@4"); - F_GETPROC(FSOUND_Reverb_SetChannelProperties, "_FSOUND_Reverb_SetChannelProperties@8"); - F_GETPROC(FSOUND_Reverb_GetChannelProperties, "_FSOUND_Reverb_GetChannelProperties@8"); - F_GETPROC(FSOUND_Record_SetDriver, "_FSOUND_Record_SetDriver@4"); - F_GETPROC(FSOUND_Record_GetNumDrivers, "_FSOUND_Record_GetNumDrivers@0"); - F_GETPROC(FSOUND_Record_GetDriverName, "_FSOUND_Record_GetDriverName@4"); - F_GETPROC(FSOUND_Record_GetDriver, "_FSOUND_Record_GetDriver@0"); - F_GETPROC(FSOUND_Record_StartSample, "_FSOUND_Record_StartSample@8"); - F_GETPROC(FSOUND_Record_Stop, "_FSOUND_Record_Stop@0"); - F_GETPROC(FSOUND_Record_GetPosition, "_FSOUND_Record_GetPosition@0"); - F_GETPROC(FSOUND_File_SetCallbacks, "_FSOUND_File_SetCallbacks@20"); - F_GETPROC(FMUSIC_LoadSong, "_FMUSIC_LoadSong@4"); - F_GETPROC(FMUSIC_LoadSongEx, "_FMUSIC_LoadSongEx@24"); - F_GETPROC(FMUSIC_GetOpenState, "_FMUSIC_GetOpenState@4"); - F_GETPROC(FMUSIC_FreeSong, "_FMUSIC_FreeSong@4"); - F_GETPROC(FMUSIC_PlaySong, "_FMUSIC_PlaySong@4"); - F_GETPROC(FMUSIC_StopSong, "_FMUSIC_StopSong@4"); - F_GETPROC(FMUSIC_StopAllSongs, "_FMUSIC_StopAllSongs@0"); - F_GETPROC(FMUSIC_SetZxxCallback, "_FMUSIC_SetZxxCallback@8"); - F_GETPROC(FMUSIC_SetRowCallback, "_FMUSIC_SetRowCallback@12"); - F_GETPROC(FMUSIC_SetOrderCallback, "_FMUSIC_SetOrderCallback@12"); - F_GETPROC(FMUSIC_SetInstCallback, "_FMUSIC_SetInstCallback@12"); - F_GETPROC(FMUSIC_SetSample, "_FMUSIC_SetSample@12"); - F_GETPROC(FMUSIC_SetUserData, "_FMUSIC_SetUserData@8"); - F_GETPROC(FMUSIC_OptimizeChannels, "_FMUSIC_OptimizeChannels@12"); - F_GETPROC(FMUSIC_SetReverb, "_FMUSIC_SetReverb@4"); - F_GETPROC(FMUSIC_SetLooping, "_FMUSIC_SetLooping@8"); - F_GETPROC(FMUSIC_SetOrder, "_FMUSIC_SetOrder@8"); - F_GETPROC(FMUSIC_SetPaused, "_FMUSIC_SetPaused@8"); - F_GETPROC(FMUSIC_SetMasterVolume, "_FMUSIC_SetMasterVolume@8"); - F_GETPROC(FMUSIC_SetMasterSpeed, "_FMUSIC_SetMasterSpeed@8"); - F_GETPROC(FMUSIC_SetPanSeperation, "_FMUSIC_SetPanSeperation@8"); - F_GETPROC(FMUSIC_GetName, "_FMUSIC_GetName@4"); - F_GETPROC(FMUSIC_GetType, "_FMUSIC_GetType@4"); - F_GETPROC(FMUSIC_GetNumOrders, "_FMUSIC_GetNumOrders@4"); - F_GETPROC(FMUSIC_GetNumPatterns, "_FMUSIC_GetNumPatterns@4"); - F_GETPROC(FMUSIC_GetNumInstruments, "_FMUSIC_GetNumInstruments@4"); - F_GETPROC(FMUSIC_GetNumSamples, "_FMUSIC_GetNumSamples@4"); - F_GETPROC(FMUSIC_GetNumChannels, "_FMUSIC_GetNumChannels@4"); - F_GETPROC(FMUSIC_GetSample, "_FMUSIC_GetSample@8"); - F_GETPROC(FMUSIC_GetPatternLength, "_FMUSIC_GetPatternLength@8"); - F_GETPROC(FMUSIC_IsFinished, "_FMUSIC_IsFinished@4"); - F_GETPROC(FMUSIC_IsPlaying, "_FMUSIC_IsPlaying@4"); - F_GETPROC(FMUSIC_GetMasterVolume, "_FMUSIC_GetMasterVolume@4"); - F_GETPROC(FMUSIC_GetGlobalVolume, "_FMUSIC_GetGlobalVolume@4"); - F_GETPROC(FMUSIC_GetOrder, "_FMUSIC_GetOrder@4"); - F_GETPROC(FMUSIC_GetPattern, "_FMUSIC_GetPattern@4"); - F_GETPROC(FMUSIC_GetSpeed, "_FMUSIC_GetSpeed@4"); - F_GETPROC(FMUSIC_GetBPM, "_FMUSIC_GetBPM@4"); - F_GETPROC(FMUSIC_GetRow, "_FMUSIC_GetRow@4"); - F_GETPROC(FMUSIC_GetPaused, "_FMUSIC_GetPaused@4"); - F_GETPROC(FMUSIC_GetTime, "_FMUSIC_GetTime@4"); - F_GETPROC(FMUSIC_GetRealChannel, "_FMUSIC_GetRealChannel@8"); - F_GETPROC(FMUSIC_GetUserData, "_FMUSIC_GetUserData@4"); - - return instance; -} - -static void FMOD_FreeInstance(FMOD_INSTANCE *instance) -{ - if (instance) - { - if (instance->module) - { -#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(_WIN64) - FreeLibrary((HMODULE)instance->module); -#else - dlclose(instance->module); -#endif - } - free(instance); - } -} - -#endif diff --git a/tools/gdbst03/Makefile b/tools/gdbst03/Makefile deleted file mode 100644 index 5279e5b55..000000000 --- a/tools/gdbst03/Makefile +++ /dev/null @@ -1,83 +0,0 @@ -# -# Makefile for GDB Stub for DJGPP/Mingw 0.3 source distribution -# -# Copyright 2000 by Jonathan Brogdon -# - -include Makefile.cfg - -default: - @$(ECHO) Welcome to GDB Stub for DJGPP & Mingw 0.3 source distribution! - @$(ECHO) To make the GDB stub type: - @$(ECHO) make all - Make library and demo programs - @$(ECHO) make library - Make only library - @$(ECHO) make demo - Make demo program - @$(ECHO) make install - Install library and header files - @$(ECHO) make uninstall - Uninstall library and header files - @$(ECHO) make clean - Remove .o files - @$(ECHO) make distclean - Remove ready binaries and .o files - @$(ECHO) make dep - Make dependences - -# Inform make of phony targets -.PHONY: library demo clean blankdep dep distclean install - -all: dep library demo - @$(ECHO) Library and demo program created - -./lib/libgdbst.a: - @mkdir -p lib - @make -s -C ./src/library all - -library: ./lib/libgdbst.a - @$(ECHO) Library created - -demo: ./lib/libgdbst.a - @mkdir -p demo - @make -s -C ./src/demo all - @$(ECHO) Demo program created - -clean: - @make -s -C ./src/library clean - @make -s -C ./src/demo clean - @$(ECHO) Clean complete - -blankdep: -# Create blank depend.dep files to avoid errors - @$(ECHOBLANK) > ./src/library/depend.dep - @$(ECHOBLANK) > ./src/demo/depend.dep - -# Now carry on as usual -dep: blankdep - @make -s -C ./src/library dep - @make -s -C ./src/demo dep - @$(ECHO) Created dependency files - -# Blank all the dependencies too -distclean: blankdep - @make -s -C ./src/library distclean - @make -s -C ./src/demo distclean - @$(RM) -r ./demo/ - @$(RM) -r ./lib/ - @$(ECHO) Cleaned up files - -install: library -ifdef DJGPP - @cp lib/*.a $(DJDIR)/lib - @ginstall -d $(DJDIR)/include - @cp include/*.h $(DJDIR)/include - @$(ECHO) GDB Stub Library for DJGPP installed -endif - -uninstall: -ifdef DJGPP - @$(RM) $(DJDIR)/lib/libgdb.a - @$(RM) $(DJDIR)/include/i386-stub.h - @$(ECHO) GDB Stub Library for DJGPP uninstalled -ifdef DJGPP - - - - - - - diff --git a/tools/gdbst03/announce b/tools/gdbst03/announce deleted file mode 100644 index ac976b644..000000000 --- a/tools/gdbst03/announce +++ /dev/null @@ -1,27 +0,0 @@ -GDB Stub for DJGPP 0.1 Announcement -=================================== - -GDB Stub for DJGPP Copyright 2000 by Jonathan Brogdon - -Hello. - - I'd like to announce the GDB Stub for DJGPP for DJGPP, the latest version of -a GDB stub for DJGPP targets. The GDB Stub for DJGPP conforms to the GNU GDB stub -interface as specified in the GDB User's Manual. It allows for debugging of a -DJGPP target remotely over a serial link with GDB. - - It comes with an example program for demonstrating remote debugging of -DJGPP targets, and documentation (man and HTML pages). - - The GDB Stub for DJGPP is distributed under the GNU Library General Public License -(LGPL). - - If you have any questions relating to libsocket, please mail me and I'll -be happy to help. - - Thanks, - - Jonathan Brogdon - - - June 29th 2000 diff --git a/tools/gdbst03/include/i386-stub.h b/tools/gdbst03/include/i386-stub.h deleted file mode 100644 index 092a3dfc6..000000000 --- a/tools/gdbst03/include/i386-stub.h +++ /dev/null @@ -1,43 +0,0 @@ -/**************************************************************************** - * - * i386-stub.h - * - * Description: Data definitions and constants for low level - * GDB server support. - * - * Terms of use: This software is provided for use under the terms - * and conditions of the GNU General Public License. - * You should have received a copy of the GNU General - * Public License along with this program; if not, write - * to the Free Software Foundation, Inc., 59 Temple Place - * Suite 330, Boston, MA 02111-1307, USA. - * - * Credits: Created by Jonathan Brogdon - * - * History - * Engineer: Date: Notes: - * --------- ----- ------ - * Jonathan Brogdon 20000617 Genesis - * Gordon Schumacher 20020212 Updated for modularity - * - ****************************************************************************/ -#ifndef _GDBSTUB_H_ -#define _GDBSTUB_H_ - - -#ifdef __cplusplus -extern "C" { -#endif -extern int gdb_serial_init(unsigned int port, unsigned int speed); -extern void gdb_target_init(void); -extern void gdb_target_close(void); - -extern void set_debug_traps(void); -extern void restore_traps(void); -extern void breakpoint(void); -#ifdef __cplusplus -} -#endif - - -#endif /* _GDBSTUB_H_ */ diff --git a/tools/gdbst03/install b/tools/gdbst03/install deleted file mode 100644 index b92c39c04..000000000 --- a/tools/gdbst03/install +++ /dev/null @@ -1,20 +0,0 @@ -The makefile contains the information about the target products -available. - -Note: Makefile.cfg contains macros for various tools used during -the build process. Of particular note: some folks use the echo.exe -that is available from the DJGPP (or other) site(s). Others may not -have installed this, and therefore calls to echo during the build -will use the built-in DOS echo command. When attempting to echo a -blank line, the arguments to these two echo commands are different. -Therefore, makefile.cfg contains the macro ECHOBLANK. Please set -this macro according to the needs of your environment. If you change -this in makefile.cfg, it will be picked up by all other project -makefiles. - -Type 'make' to see a list of targets. When the 'install' -target is made, the libgdb.a will be copied into your $(DJDIR)/lib -directory. In addition, the i386-stub.h file will be copied into -your $(DJDIR)/include directory. The uninstall target will remove -these files. - diff --git a/tools/gdbst03/license b/tools/gdbst03/license deleted file mode 100644 index 4356f26ed..000000000 --- a/tools/gdbst03/license +++ /dev/null @@ -1,454 +0,0 @@ - -GNU LIBRARY GENERAL PUBLIC LICENSE -********************************** - - Version 2, June 1991 - - Copyright (C) 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - [This is the first released version of the library GPL. It is - numbered 2 because it goes with version 2 of the ordinary GPL.] - -Preamble -======== - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Library General Public License, applies to some -specially designated Free Software Foundation software, and to any -other libraries whose authors decide to use it. You can use it for -your libraries, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it in -new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the library, or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link a program with the library, you must provide -complete object files to the recipients so that they can relink them -with the library, after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - Our method of protecting your rights has two steps: (1) copyright -the library, and (2) offer you this license which gives you legal -permission to copy, distribute and/or modify the library. - - Also, for each distributor's protection, we want to make certain -that everyone understands that there is no warranty for this free -library. If the library is modified by someone else and passed on, we -want its recipients to know that what they have is not the original -version, so that any problems introduced by others will not reflect on -the original authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that companies distributing free -software will individually obtain patent licenses, thus in effect -transforming the program into proprietary software. To prevent this, -we have made it clear that any patent must be licensed for everyone's -free use or not licensed at all. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License, which was designed for utility -programs. This license, the GNU Library General Public License, -applies to certain designated libraries. This license is quite -different from the ordinary one; be sure to read it in full, and don't -assume that anything in it is the same as in the ordinary license. - - The reason we have a separate public license for some libraries is -that they blur the distinction we usually make between modifying or -adding to a program and simply using it. Linking a program with a -library, without changing the library, is in some sense simply using -the library, and is analogous to running a utility program or -application program. However, in a textual and legal sense, the linked -executable is a combined work, a derivative of the original library, -and the ordinary General Public License treats it as such. - - Because of this blurred distinction, using the ordinary General -Public License for libraries did not effectively promote software -sharing, because most developers did not use the libraries. We -concluded that weaker conditions might promote sharing better. - - However, unrestricted linking of non-free programs would deprive the -users of those programs of all benefit from the free status of the -libraries themselves. This Library General Public License is intended -to permit developers of non-free programs to use free libraries, while -preserving your freedom as a user of such programs to change the free -libraries that are incorporated in them. (We have not seen how to -achieve this as regards changes in header files, but we have achieved -it as regards changes in the actual functions of the Library.) The -hope is that this will lead to faster development of free libraries. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, while the latter only -works together with the library. - - Note that it is possible for a library to be covered by the ordinary -General Public License rather than by this special one. - - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library which - contains a notice placed by the copyright holder or other - authorized party saying it may be distributed under the terms of - this Library General Public License (also called "this License"). - Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data - prepared so as to be conveniently linked with application programs - (which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work - which has been distributed under these terms. A "work based on the - Library" means either the Library or any derivative work under - copyright law: that is to say, a work containing the Library or a - portion of it, either verbatim or with modifications and/or - translated straightforwardly into another language. (Hereinafter, - translation is included without limitation in the term - "modification".) - - "Source code" for a work means the preferred form of the work for - making modifications to it. For a library, complete source code - means all the source code for all modules it contains, plus any - associated interface definition files, plus the scripts used to - control compilation and installation of the library. - - Activities other than copying, distribution and modification are - not covered by this License; they are outside its scope. The act - of running a program using the Library is not restricted, and - output from such a program is covered only if its contents - constitute a work based on the Library (independent of the use of - the Library in a tool for writing it). Whether that is true - depends on what the Library does and what the program that uses - the Library does. - - 1. You may copy and distribute verbatim copies of the Library's - complete source code as you receive it, in any medium, provided - that you conspicuously and appropriately publish on each copy an - appropriate copyright notice and disclaimer of warranty; keep - intact all the notices that refer to this License and to the - absence of any warranty; and distribute a copy of this License - along with the Library. - - You may charge a fee for the physical act of transferring a copy, - and you may at your option offer warranty protection in exchange - for a fee. - - 2. You may modify your copy or copies of the Library or any portion - of it, thus forming a work based on the Library, and copy and - distribute such modifications or work under the terms of Section 1 - above, provided that you also meet all of these conditions: - - a. The modified work must itself be a software library. - - b. You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c. You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d. If a facility in the modified Library refers to a function or - a table of data to be supplied by an application program that - uses the facility, other than as an argument passed when the - facility is invoked, then you must make a good faith effort - to ensure that, in the event an application does not supply - such function or table, the facility still operates, and - performs whatever part of its purpose remains meaningful. - - (For example, a function in a library to compute square roots - has a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function - must be optional: if the application does not supply it, the - square root function must still compute square roots.) - - These requirements apply to the modified work as a whole. If - identifiable sections of that work are not derived from the - Library, and can be reasonably considered independent and separate - works in themselves, then this License, and its terms, do not - apply to those sections when you distribute them as separate - works. But when you distribute the same sections as part of a - whole which is a work based on the Library, the distribution of - the whole must be on the terms of this License, whose permissions - for other licensees extend to the entire whole, and thus to each - and every part regardless of who wrote it. - - Thus, it is not the intent of this section to claim rights or - contest your rights to work written entirely by you; rather, the - intent is to exercise the right to control the distribution of - derivative or collective works based on the Library. - - In addition, mere aggregation of another work not based on the - Library with the Library (or with a work based on the Library) on - a volume of a storage or distribution medium does not bring the - other work under the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public - License instead of this License to a given copy of the Library. - To do this, you must alter all the notices that refer to this - License, so that they refer to the ordinary GNU General Public - License, version 2, instead of to this License. (If a newer - version than version 2 of the ordinary GNU General Public License - has appeared, then you can specify that version instead if you - wish.) Do not make any other change in these notices. - - Once this change is made in a given copy, it is irreversible for - that copy, so the ordinary GNU General Public License applies to - all subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of - the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or - derivative of it, under Section 2) in object code or executable - form under the terms of Sections 1 and 2 above provided that you - accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software - interchange. - - If distribution of object code is made by offering access to copy - from a designated place, then offering equivalent access to copy - the source code from the same place satisfies the requirement to - distribute the source code, even though third parties are not - compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the - Library, but is designed to work with the Library by being - compiled or linked with it, is called a "work that uses the - Library". Such a work, in isolation, is not a derivative work of - the Library, and therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library - creates an executable that is a derivative of the Library (because - it contains portions of the Library), rather than a "work that - uses the library". The executable is therefore covered by this - License. Section 6 states terms for distribution of such - executables. - - When a "work that uses the Library" uses material from a header - file that is part of the Library, the object code for the work may - be a derivative work of the Library even though the source code is - not. Whether this is true is especially significant if the work - can be linked without the Library, or if the work is itself a - library. The threshold for this to be true is not precisely - defined by law. - - If such an object file uses only numerical parameters, data - structure layouts and accessors, and small macros and small inline - functions (ten lines or less in length), then the use of the object - file is unrestricted, regardless of whether it is legally a - derivative work. (Executables containing this object code plus - portions of the Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may - distribute the object code for the work under the terms of Section - 6. Any executables containing that work also fall under Section 6, - whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also compile or - link a "work that uses the Library" with the Library to produce a - work containing portions of the Library, and distribute that work - under terms of your choice, provided that the terms permit - modification of the work for the customer's own use and reverse - engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the - Library is used in it and that the Library and its use are covered - by this License. You must supply a copy of this License. If the - work during execution displays copyright notices, you must include - the copyright notice for the Library among them, as well as a - reference directing the user to the copy of this License. Also, - you must do one of these things: - - a. Accompany the work with the complete corresponding - machine-readable source code for the Library including - whatever changes were used in the work (which must be - distributed under Sections 1 and 2 above); and, if the work - is an executable linked with the Library, with the complete - machine-readable "work that uses the Library", as object code - and/or source code, so that the user can modify the Library - and then relink to produce a modified executable containing - the modified Library. (It is understood that the user who - changes the contents of definitions files in the Library will - not necessarily be able to recompile the application to use - the modified definitions.) - - b. Accompany the work with a written offer, valid for at least - three years, to give the same user the materials specified in - Subsection 6a, above, for a charge no more than the cost of - performing this distribution. - - c. If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the - above specified materials from the same place. - - d. Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the - Library" must include any data and utility programs needed for - reproducing the executable from it. However, as a special - exception, the source code distributed need not include anything - that is normally distributed (in either source or binary form) - with the major components (compiler, kernel, and so on) of the - operating system on which the executable runs, unless that - component itself accompanies the executable. - - It may happen that this requirement contradicts the license - restrictions of other proprietary libraries that do not normally - accompany the operating system. Such a contradiction means you - cannot use both them and the Library together in an executable - that you distribute. - - 7. You may place library facilities that are a work based on the - Library side-by-side in a single library together with other - library facilities not covered by this License, and distribute - such a combined library, provided that the separate distribution - of the work based on the Library and of the other library - facilities is otherwise permitted, and provided that you do these - two things: - - a. Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b. Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same - work. - - 8. You may not copy, modify, sublicense, link with, or distribute the - Library except as expressly provided under this License. Any - attempt otherwise to copy, modify, sublicense, link with, or - distribute the Library is void, and will automatically terminate - your rights under this License. However, parties who have - received copies, or rights, from you under this License will not - have their licenses terminated so long as such parties remain in - full compliance. - - 9. You are not required to accept this License, since you have not - signed it. However, nothing else grants you permission to modify - or distribute the Library or its derivative works. These actions - are prohibited by law if you do not accept this License. - Therefore, by modifying or distributing the Library (or any work - based on the Library), you indicate your acceptance of this - License to do so, and all its terms and conditions for copying, - distributing or modifying the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the - Library), the recipient automatically receives a license from the - original licensor to copy, distribute, link with or modify the - Library subject to these terms and conditions. You may not impose - any further restrictions on the recipients' exercise of the rights - granted herein. You are not responsible for enforcing compliance - by third parties to this License. - - 11. If, as a consequence of a court judgment or allegation of patent - infringement or for any other reason (not limited to patent - issues), conditions are imposed on you (whether by court order, - agreement or otherwise) that contradict the conditions of this - License, they do not excuse you from the conditions of this - License. If you cannot distribute so as to satisfy simultaneously - your obligations under this License and any other pertinent - obligations, then as a consequence you may not distribute the - Library at all. For example, if a patent license would not permit - royalty-free redistribution of the Library by all those who - receive copies directly or indirectly through you, then the only - way you could satisfy both it and this License would be to refrain - entirely from distribution of the Library. - - If any portion of this section is held invalid or unenforceable - under any particular circumstance, the balance of the section is - intended to apply, and the section as a whole is intended to apply - in other circumstances. - - It is not the purpose of this section to induce you to infringe any - patents or other property right claims or to contest validity of - any such claims; this section has the sole purpose of protecting - the integrity of the free software distribution system which is - implemented by public license practices. Many people have made - generous contributions to the wide range of software distributed - through that system in reliance on consistent application of that - system; it is up to the author/donor to decide if he or she is - willing to distribute software through any other system and a - licensee cannot impose that choice. - - This section is intended to make thoroughly clear what is believed - to be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in - certain countries either by patents or by copyrighted interfaces, - the original copyright holder who places the Library under this - License may add an explicit geographical distribution limitation - excluding those countries, so that distribution is permitted only - in or among countries not thus excluded. In such case, this - License incorporates the limitation as if written in the body of - this License. - - 13. The Free Software Foundation may publish revised and/or new - versions of the Library General Public License from time to time. - Such new versions will be similar in spirit to the present version, - but may differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the - Library specifies a version number of this License which applies - to it and "any later version", you have the option of following - the terms and conditions either of that version or of any later - version published by the Free Software Foundation. If the Library - does not specify a license version number, you may choose any - version ever published by the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free - programs whose distribution conditions are incompatible with these, - write to the author to ask for permission. For software which is - copyrighted by the Free Software Foundation, write to the Free - Software Foundation; we sometimes make exceptions for this. Our - decision will be guided by the two goals of preserving the free - status of all derivatives of our free software and of promoting - the sharing and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO - WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE - LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT - HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT - WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT - NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE - QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE - LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY - SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN - WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY - MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE - LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, - INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR - INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF - DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU - OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY - OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN - ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - diff --git a/tools/gdbst03/makefile.cfg b/tools/gdbst03/makefile.cfg deleted file mode 100644 index 4265258a7..000000000 --- a/tools/gdbst03/makefile.cfg +++ /dev/null @@ -1,67 +0,0 @@ -# -# Makefile.cfg for GDB stub for DJGPP and Mingw -# -# libgdbst Copyright 2000 by Jonathan Brogodn -# - -# -# GNU compiler & tools' flags -# -CC = gcc -CFLAGS = -Wall -Werror -march=i486 -O2 -g - -# Archiver -AR = ar -ARFLAGS = -r - -# Stripper -STRIP = strip - -# Assembler -AS = as -ASFLAGS = - -# Linker -LD = ld -LDFLAGS = - -# Remove -RM = rm -f - -# Echo -ECHO = echo - -# Echo Blank -#ECHOBLANK = echo "" -ECHOBLANK = echo. - -# -# check for OS... badly -# - -ifndef DJDIR -ifndef DJGPP - WINDOWS=1 -endif -endif - -ifndef windir -ifndef WINDOWS - DJGPP=1 -endif -endif - -# -# Rules -# -.SUFFIXES: .c .asm .o - -.asm.o: - @$(CC) $(CFLAGS) -I$(INC_PATH) -c -o ./$@ ./$< - -.s.o: - @$(AS) $(ASFLAGS) ./$< - -.c.o : - @$(CC) $(CFLAGS) -c -I$(INC_PATH) -c -o ./$@ ./$< - diff --git a/tools/gdbst03/readme b/tools/gdbst03/readme deleted file mode 100644 index 316e61cae..000000000 --- a/tools/gdbst03/readme +++ /dev/null @@ -1,171 +0,0 @@ -GDB Stub for DJGPP 0.2 Readme File -================================== - -Copyright ---------- -GDB Stub for DJGPP is distributed under the terms of the GNU Library -General Public License (GNU LGPL) - please see the document LICENSE, -which should be found in the same directory as this file. - -Copyright (c) 2000 by Jonathan Brogdon, 2002 by Gordon Schumacher - -What It Does ------------- -The GDB stub is used to debug a DJGPP target remotely over a one of -the PC COM ports. GDB, running on a host machine, communicates with -the target using the GDB serial protocol over the serial link. For -more information on the GDB stub, see "Debugging with GDB, The GNU -Source-Level Debugger", by Richard M. Stallman and Roland H. Pesch -(http://sources.redhat.com/gdb/download/onlinedocs/gdb.html) - -How It Works ------------- - -Exceptions: - -The GDB stub needs to handle all processor exceptions. Since these -exceptions already handled by DJGPP, we cannot handle them directly. -DJGPP maps all processor exceptions to signals. Therefore, we can -install the GDB stub handler as the signal handler for those signals -that represent processor exceptions. The following table shows the -processor exception to signal mapping: - - Exception/Interrupt: Exception #: Signal: - ------------------- ----------- ------ - Divide Error 0 SIGFPE - Debug Exception 1 SIGTRAP - NMI Interrupt 2 No signal defined - Breakpoint 3 SIGTRAP - INTO-detected overflow 4 SIGFPE - BOUND Range Exceeded 5 SIGSEGV - Invalid Opcode 6 No signal defined - Coprocessor not available 7 SIGNOFP - Double Fault 8 SIGSEGV - Coprocessor Seg overrun 9 SIGSEGV - Invalid Task State Seg 10 No signal defined - Segment not present 11 SIGSEGV - Stack Fault 12 SIGSEGV - General Protection Fault 13 SIGSEGV - Page Fault 14 SIGSEGV - Intel Reserved 15 No signal defined - Coprocessor Error 16 SIGFPE - -The GDB stub handler services requests from the GDB host. These -requests are seen by the GDB stub handler as command messages from -the GDB host. These commands and command formats are defined in -"Debugging with GDB, The GNU Source-Level Debugger", by Richard M. -Stallman and Roland H. Pesch (http://sources.redhat.com/gdb/ -download/onlinedocs/gdb.html -- one of many sources). - -Serial Interface: - -Interface functions for sending and receiving characters from the -serial interface must be provided by the engineer porting the GDB -stub. The following funtions must be provided to support the -implementation. - - int getDebugChar(void); - void putDebugChar(int c); - -There are a variety of serial libraries for DJGPP. The user may -already be using one of these libraries in their application, and -installing more than one serial library often causes conflicts. -To this end, a modular function layer was written that allows any -serial library to be used with the GDB stub. Layers have been -written to support SVAsync, DZComm, and the _bios_serialcom() -function. At the time of this writing, DZComm appears to work the -best for serial debugging. - -Hard Coded Breakpoint: - -A breakpoint() function is provided to manually invoke the stub. -This function, inserts a breakpoint instruction directly in the code -to invoke the GDB stub handler. - -How You Use It --------------- -First, you need to select a serial library. In the i386-supp.c file, -there are lines of the form - - // #include "some_layer.h" - -Uncomment the line for the serial library you intend to use - or add -a new include line for a file written for some other library. -In the main() function of your target program, you should initilize -the GDB serial handlers and the GDB stub. The following functions -are provided in the GDB stub library for this purpose. - - gdb_serial_init(unsigned int port, unsigned int speed); - gdb_target_init(void); - -Where, port is the COM port number, and speed is the baud rate for -the serial link. - -After initialing the GDB serial interface and target, you should -invoke the breakpoint() function somewhere. You may choose to do -this immediately after initialization, or at a specific location in -your code where you wish to set a breakpoint. By putting the -breakpoint() function in the beginning of main(), you can use the -GDB host to set a breakpoint at any place in your code. - -Make sure that you use the '-g' option when compiling your files with -gcc. - -After the target executable is running, start up gdb on the host, -passing the target executable as an argument. - - Example: gdb demo.exe - -Now, tell gdb which serial interface to use for communicating to -the target. - - Example: (gdb) target remote COM1 - -This example uses COM1 on the host to communicate with the target. -GDB is now 'listening' on COM for a valid GDB serial packet. - -Once your GDB host finds your target, you may need to tell GDB where -to find any source files which were used to generate your program. -Use the directory command to do this. - - Example: (gdb) directory ../src/demo - -That's it. You should now be able to single step through code, set -breakpoints, set variables, examine variables, any anthing else that -you would normally use GDB to accomplish. - -What You Build --------------- -Read the INSTALL file for more information on installing the GDB stub -library. After installing the library, your code should include -i386-stub.h for function prototypes. In addition, your code should -link against the libgdb.a library. The source for a demonstration -program has been included with this distributias an example. -As an alternative, you can simply include the i386-stub and i386-supp -files and the layer header for the serial library you plan to use into -your project and link them in directly. - -For More Info -------------- -See "Debugging with GDB, The GNU Source-Level Debugger", by Richard -M. Stallman and Roland H. Pesch (http://sources.redhat.com/gdb/ -download/onlinedocs/gdb.html -- one of many sources). - -TODO ----- -Port for network operation. - -Contact Info ------------- -My contact info is below. If you have any comments, suggestions, bug -reports or problems, please mail me, and I'll see what I can do. - - Regards, - Jonathan Brogdon - - 6th June 2000 - - Modular update: - Gordon Schumacher - - 12th February 2002 \ No newline at end of file diff --git a/tools/gdbst03/src/demo/crc_16.c b/tools/gdbst03/src/demo/crc_16.c deleted file mode 100644 index ad1f53cd1..000000000 --- a/tools/gdbst03/src/demo/crc_16.c +++ /dev/null @@ -1,46 +0,0 @@ -#define POLY 0x8408 -/* -// 16 12 5 -// this is the CCITT CRC 16 polynomial X + X + X + 1. -// This works out to be 0x1021, but the way the algorithm works -// lets us use 0x8408 (the reverse of the bit pattern). The high -// bit is always assumed to be set, thus we only use 16 bits to -// represent the 17 bit value. -*/ - -#include "crc.h" - -WORD crc16(char *data_p, WORD length) -{ - unsigned char i; - unsigned int data; - unsigned int crc = 0xffff; - - if (length == 0) - return (~crc); - - do - { - for (i=0, data=(unsigned int)0xff & *data_p++; - i < 8; - i++, data >>= 1) - { - if ((crc & 0x0001) ^ (data & 0x0001)) - crc = (crc >> 1) ^ POLY; - else crc >>= 1; - } - } while (--length); - - crc = ~crc; - data = crc; - crc = (crc << 8) | ((data >> 8) & 0xff); - - return (crc); -} - - - - - - - diff --git a/tools/gdbst03/src/demo/makefile b/tools/gdbst03/src/demo/makefile deleted file mode 100644 index ab48954b2..000000000 --- a/tools/gdbst03/src/demo/makefile +++ /dev/null @@ -1,42 +0,0 @@ -# -# Makefile for GDB Stub demo -# Written by Jonathan Brogodn -# -# GDB Stub for DJGPP Copyright 2000 by Jonathan Brogdon -# - -include ../../Makefile.cfg - -CFLAGS += -g -CFLAGS += -I../../include -I../include -I. -CFLAGS += -DDEBUG_COM_PORT=1 -CFLAGS += -DDEBUG_COM_PORT_SPEED=9600 -CFLAGS += -DREMOTE_DEBUGGING - -# Objects to build -OBJS = serdbg.o crc_16.o - -all: demo - -demo: $(OBJS) -ifdef DJGPP - @$(LD) $(LDFLAGS) -Map ./$@.map -o../../demo/$@.exe $(DJDIR)/lib/crt0.o $(OBJS) -L$(DJDIR)/lib -L../../lib -lgdbst -ldzcom -lc -lgcc -endif -ifdef WINDOWS - @$(LD) $(LDFLAGS) -Map ./$@.map -o../../demo/$@.exe $(DJDIR)/lib/crt0.o $(OBJS) -L../../lib -lgdbst -lwsock32 -lc -lgcc -endif - -clean: - @$(RM) $(OBJS) - @$(RM) *.map - -distclean: clean - @$(RM) $(OBJS) - @$(RM) depend.dep - @$(RM) ../../demo/*.exe - -dep: - @$(CC) $(CFLAGS) -M *.c > depend.dep - -$(OBJS): -include depend.dep diff --git a/tools/gdbst03/src/demo/serdbg.c b/tools/gdbst03/src/demo/serdbg.c deleted file mode 100644 index 01778789c..000000000 --- a/tools/gdbst03/src/demo/serdbg.c +++ /dev/null @@ -1,102 +0,0 @@ -/*********************************************************************** - * serdbg.c - * - * Description: Pretty simple demonstration program. It accomplishes - * the following. - * - * 1. Allocate a block of memory Feel free to change - * size (memBlockSize) with debugger. - * - * 2. Writes a word pattern to the entire block. Feel - * free to change the pattern (memPatternWord) with - * debugger. - * - * 3. Computes the CRC-16 on the block. Feel free to - * check the size with the debuger. - * - * 4. Free the memory block allocated in step 1. Repeat - * step 1. If you wish to exit, set doneFlag to 0 with - * the debugger. - * - * Credits: Created by Jonathan Brogdon - * - * Terms of use: Use as you will. - * - * Global Data: None. - * Global Functions: main - * - * History - * Engineer: Date: Notes: - * --------- ----- ------ - * Jonathan Brogdon 070500 Genesis - * - ***********************************************************************/ -#include -#include -#include -#include - -#define MEM_BLOCK_SIZE 100 /* Words */ -#define MEM_PATTERN_WORD 0x55AA - -void write_mem_pattern(unsigned short*, unsigned short, unsigned short); - -/************************************************************************ - * - * main() - * - ************************************************************************/ -int main(int argc, char *argv[]) -{ - volatile int doneFlag = 0; - unsigned short crcValue = 0; - unsigned short * memBlockPtr = NULL; - short memBlockSize = MEM_BLOCK_SIZE; - short memPatternWord = MEM_PATTERN_WORD; - -#ifdef REMOTE_DEBUGGING - /* Only setup if demonstrating remote debugging */ - gdb_serial_init(DEBUG_COM_PORT,DEBUG_COM_PORT_SPEED); - gdb_target_init(); - breakpoint(); -#endif - - while(doneFlag != 1) - { - memBlockSize = MEM_BLOCK_SIZE; - memPatternWord = MEM_PATTERN_WORD; - memBlockPtr = (unsigned short *) malloc((int)memBlockSize); - - write_mem_pattern(memBlockPtr, memBlockSize, memPatternWord); - - crcValue = crc16((char *)memBlockPtr,memBlockSize); - - free(memBlockPtr); - } - - exit(0); -} - -/************************************************************************ - * - * write_mem_pattern() - * - * Description: Writes a word pattern to a block of RAM. - * - ************************************************************************/ -void write_mem_pattern(unsigned short *block, unsigned short blockSize, unsigned short patternWord) -{ - int index = 0; - - for(index = 0; index < blockSize; index++) - { - block[index] = patternWord; - } -} - - - - - - - diff --git a/tools/gdbst03/src/include/crc.h b/tools/gdbst03/src/include/crc.h deleted file mode 100644 index 937d0b794..000000000 --- a/tools/gdbst03/src/include/crc.h +++ /dev/null @@ -1,20 +0,0 @@ -/* - * CRC.H - header file for CRC functions - */ - -#ifndef _CRC_H_ -#define _CRC_H_ - -#include /* For size_t */ - -typedef unsigned char BYTE; -typedef unsigned short WORD; -typedef unsigned long DWORD; - -/* -** File: CRC-16.C -*/ - -WORD crc16(char *data_p, WORD length); - -#endif /* _CRC_H_ */ diff --git a/tools/gdbst03/src/include/i386-supp.h b/tools/gdbst03/src/include/i386-supp.h deleted file mode 100644 index e1923377c..000000000 --- a/tools/gdbst03/src/include/i386-supp.h +++ /dev/null @@ -1,30 +0,0 @@ -/**************************************************************************** - * - * i386-supp.h - * - * Description: Data definitions and constants for low level - * GDB stub support. - * - * Terms of use: This software is provided for use under the terms - * and conditions of the GNU General Public License. - * You should have received a copy of the GNU General - * Public License along with this program; if not, write - * to the Free Software Foundation, Inc., 59 Temple Place - * Suite 330, Boston, MA 02111-1307, USA. - * - * Credits: Created by Jonathan Brogdon - * - * History - * Engineer: Date: Notes: - * --------- ----- ------ - * Jonathan Brogdon 20000629 Genesis - * Gordon Schumacher 20020212 Updated for modularity - * - ****************************************************************************/ -#ifndef _GDBSUPP_H_ -#define _GDBSUPP_H_ - -extern int putDebugChar(char c); -extern int getDebugChar(void); - -#endif /* _GDBSUPP_H_ */ diff --git a/tools/gdbst03/src/library/bios_layer.h b/tools/gdbst03/src/library/bios_layer.h deleted file mode 100644 index 946f40997..000000000 --- a/tools/gdbst03/src/library/bios_layer.h +++ /dev/null @@ -1,137 +0,0 @@ -//======================================================================================================= -// bios_layer.h - Serial command layer for standard BIOS calls -// It's here if you want it, but I wouldn't suggest it... -//======================================================================================================= - -//======================================================================================================= -//======================================================================================================= - -#ifndef _BIOS_LAYER_H -#define _BIOS_LAYER_H - - -//=============================================================================== -// Include files -//=============================================================================== - -#include - -//=============================================================================== -// Static variable definitions -//=============================================================================== - -unsigned comport; - -//=============================================================================== -// Inline function definitions -//=============================================================================== - -#define BIOS_SER_TIMEOUT 1000000 - -// Initialize the serial library -// Should return 0 if no error occurred -__inline int GDBStub_SerInit(int port) -{ - comport = (unsigned) port; - return 0; -} - - -// Set the serial port speed (and other configurables) -// Should return 0 if the speed is set properly -__inline int GDBStub_SerSpeed(int speed) -{ - unsigned bps; - - switch (speed) - { - case 110: - bps = _COM_110; - break; - - case 150: - bps = _COM_150; - break; - - case 300: - bps = _COM_300; - break; - - case 600: - bps = _COM_600; - break; - - case 1200: - bps = _COM_1200; - break; - - case 2400: - bps = _COM_2400; - break; - - case 4800: - bps = _COM_4800; - break; - - case 9600: - default: - bps = _COM_9600; - break; - } - - _bios_serialcom(_COM_INIT, comport, - bps | _COM_NOPARITY | _COM_CHR8 | _COM_STOP1); - return 0; -} - - -// Check to see if there's room in the buffer to send data -// Should return 0 if it is okay to send -__inline int GDBStub_SerSendOk(void) -{ - return 0; -} - - -// Send a character to the serial port -// Should return 0 if the send succeeds -__inline int GDBStub_SerSend(int c) -{ - register int ret; - register int timeout = 0; - - do - { - ret = _bios_serialcom(_COM_SEND, comport, (unsigned) c); - } while((ret != 0) && (timeout++ < BIOS_SER_TIMEOUT)); - return (timeout >= BIOS_SER_TIMEOUT); -} - - -// Check to see if there are characters waiting in the buffer -// Should return 0 if there's data waiting -__inline int GDBStub_SerRecvOk(void) -{ - return 0; -} - - -// Read a character from the serial port -// Should return the character read -__inline int GDBStub_SerRecv(void) -{ - register int data; - register int timeout = 0; - - do - { - data = _bios_serialcom(_COM_RECEIVE, comport, 0) & 0xff; - } while((data > 0xff) && (timeout++ < BIOS_SER_TIMEOUT)); - - return data; -} - - - - -#endif diff --git a/tools/gdbst03/src/library/dzc_layer.h b/tools/gdbst03/src/library/dzc_layer.h deleted file mode 100644 index cc083077f..000000000 --- a/tools/gdbst03/src/library/dzc_layer.h +++ /dev/null @@ -1,169 +0,0 @@ -//======================================================================================================= -// dzc_layer.h - Serial command layer for DZcomm -// -//======================================================================================================= - -//======================================================================================================= -//======================================================================================================= - -#ifndef _DZC_LAYER_H -#define _DZC_LAYER_H - - -//=============================================================================== -// Include files -//=============================================================================== - -#include - -//=============================================================================== -// Static variable definitions -//=============================================================================== - -comm_port *comport; - -//=============================================================================== -// Inline function definitions -//=============================================================================== - -// Initialize the serial library -// Should return 0 if no error occurred -__inline int GDBStub_SerInit(int port) -{ - int ret; - comm com; - - ret = dzcomm_init(); - if (ret != 0) - { - switch (port) - { - case 4: - com = _com4; - break; - - case 3: - com = _com3; - break; - - case 2: - com = _com2; - break; - - case 1: - default: - com = _com1; - break; - } - comport = comm_port_init(com); - } - return (ret == 0); -} - -// Set the serial port speed (and other configurables) -// Should return 0 if the speed is set properly -__inline int GDBStub_SerSpeed(int speed) -{ - baud_bits bps; - - switch (speed) - { - case 110: - bps = _110; - break; - - case 150: - bps = _150; - break; - - case 300: - bps = _300; - break; - - case 600: - bps = _600; - break; - - case 1200: - bps = _1200; - break; - - case 2400: - bps = _2400; - break; - - case 4800: - bps = _4800; - break; - - case 9600: - bps = _9600; - break; - - case 19200: - bps = _19200; - break; - - case 38400: - bps = _38400; - break; - - case 57600: - bps = _57600; - break; - - case 115200: - default: - bps = _115200; - break; - } - - comm_port_set_baud_rate(comport, bps); - comm_port_set_parity(comport, NO_PARITY); - comm_port_set_data_bits(comport, BITS_8); - comm_port_set_stop_bits(comport, STOP_1); - comm_port_set_flow_control(comport, RTS_CTS); - comm_port_install_handler(comport); - - return 0; -} - -// Check to see if there's room in the buffer to send data -// Should return 0 if it is okay to send -__inline int GDBStub_SerSendOk(void) -{ - return (comm_port_out_full(comport) == 0); -} - -// Send a character to the serial port -// Should return 0 if the send succeeds -__inline int GDBStub_SerSend(int c) -{ - return comm_port_out(comport, (unsigned char) c); -} - -// Check to see if there are characters waiting in the buffer -// Should return 0 if there's data waiting -__inline int GDBStub_SerRecvOk(void) -{ - return (comm_port_in_empty(comport) == 0); -} - -// Read a character from the serial port -// Should return the character read -__inline int GDBStub_SerRecv(void) -{ - return comm_port_test(comport); -} - - - - -#endif - -/*================================================================== - - $Log: $ - - -===============================================================*/ diff --git a/tools/gdbst03/src/library/i386-stub.c b/tools/gdbst03/src/library/i386-stub.c deleted file mode 100644 index 1ab2ceeeb..000000000 --- a/tools/gdbst03/src/library/i386-stub.c +++ /dev/null @@ -1,1555 +0,0 @@ -/**************************************************************************** - - THIS SOFTWARE IS NOT COPYRIGHTED - - HP offers the following for use in the public domain. HP makes no - warranty with regard to the software or it's performance and the - user accepts the software "AS IS" with all faults. - - HP DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED, WITH REGARD - TO THIS SOFTWARE INCLUDING BUT NOT LIMITED TO THE WARRANTIES - OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - -****************************************************************************/ - -/**************************************************************************** - * Header: remcom.c,v 1.34 91/03/09 12:29:49 glenne Exp $ - * - * Module name: remcom.c $ - * Revision: 1.34 $ - * Date: 91/03/09 12:29:49 $ - * Contributor: Lake Stevens Instrument Division$ - * - * Description: low level support for gdb debugger. $ - * - * Considerations: only works on target hardware $ - * - * Written by: Glenn Engel $ - * ModuleState: Experimental $ - * - * NOTES: See Below $ - * - * Modified for 386 by Jim Kingdon, Cygnus Support. - * - * To enable debugger support, two things need to happen. One, a - * call to set_debug_traps() is necessary in order to allow any breakpoints - * or error conditions to be properly intercepted and reported to gdb. - * Two, a breakpoint needs to be generated to begin communication. This - * is most easily accomplished by a call to breakpoint(). Breakpoint() - * simulates a breakpoint by executing a trap #1. - * - * The external function exceptionHandler() is - * used to attach a specific handler to a specific 386 vector number. - * It should use the same privilege level it runs at. It should - * install it as an interrupt gate so that interrupts are masked - * while the handler runs. - * - * Because gdb will sometimes write to the stack area to execute function - * calls, this program cannot rely on using the supervisor stack so it - * uses it's own stack area reserved in the int array remcomStack. - * - ************* - * - * The following gdb commands are supported: - * - * command function Return value - * - * g return the value of the CPU registers hex data or ENN - * G set the value of the CPU registers OK or ENN - * - * mAA..AA,LLLL Read LLLL bytes at address AA..AA hex data or ENN - * MAA..AA,LLLL: Write LLLL bytes at address AA.AA OK or ENN - * - * c Resume at current address SNN ( signal NN) - * cAA..AA Continue at address AA..AA SNN - * - * s Step one instruction SNN - * sAA..AA Step one instruction from AA..AA SNN - * - * k kill - * - * ? What was the last sigval ? SNN (signal NN) - * - * All commands and responses are sent with a packet which includes a - * checksum. A packet consists of - * - * $#. - * - * where - * :: - * :: < two hex digits computed as modulo 256 sum of > - * - * When a packet is received, it is first acknowledged with either '+' or '-'. - * '+' indicates a successful transfer. '-' indicates a failed transfer. - * - * Example: - * - * Host: Reply: - * $m0,10#2a +$00010203040506070809101112131415#42 - * - ****************************************************************************/ - -#include -#include -#ifdef DJGPP -#include -#include -#include -#include -#endif //#ifdef DJGPP - - -/* - * - * external low-level support routines - */ - -extern void putDebugChar(); /* write a single character */ -extern int getDebugChar(); /* read and return a single char */ -#ifndef DJGPP -extern void exceptionHandler(); /* assign an exception handler */ -#endif - -/* - * BUFMAX defines the maximum number of characters in inbound/outbound buffers - * at least NUMREGBYTES*2 are needed for register packets - */ -#define BUFMAX 400 - -/* - * boolean flag. != 0 means we've been initialized - */ -static char gdb_initialized; - -/* - * debug > 0 prints ill-formed commands in valid packets & checksum errors - */ -int remote_debug; - -/* - * Hexadecimal character string. - */ -#ifndef DJGPP -static const char hexchars[]="0123456789abcdef"; -#else -static char hexchars[]="0123456789abcdef"; -#endif - -/* - * Number of registers. -*/ -#define NUMREGS 16 - -/* - * Number of bytes of registers. -*/ -#define NUMREGBYTES (NUMREGS * 4) - -/* - * i386 Registers - */ -enum regnames {EAX, ECX, EDX, EBX, ESP, EBP, ESI, EDI, - PC /* also known as eip */, - PS /* also known as eflags */, - CS, SS, DS, ES, FS, GS -}; - -/* - * Register storage buffer. - */ -static int registers[NUMREGS]; - -/* - * Address of a routine to RTE to if we get a memory fault. -*/ -#ifndef DJGPP -static void (*volatile mem_fault_routine) () = NULL; -#else -static void (*mem_fault_routine)() = NULL; -#endif - -/* I/O buffers */ -static char remcomInBuffer[BUFMAX]; -static char remcomOutBuffer[BUFMAX]; - -#if !(defined(DJGPP) || defined(_WIN32)) //MF -#define STACKSIZE 10000 -int remcomStack[STACKSIZE/sizeof(int)]; -static int* stackPtr = &remcomStack[STACKSIZE/sizeof(int) - 1]; -#endif - -#ifdef DJGPP -static void lock_handler_data(void); -#endif //#ifdef DJGPP - -void _returnFromException (); - -/*************************** ASSEMBLY CODE MACROS *************************/ -/* */ - -extern void -return_to_prog (); - -/* Restore the program's registers (including the stack pointer, which - means we get the right stack and don't have to worry about popping our - return address and any stack frames and so on) and return. */ -asm(".text"); -asm(".globl _return_to_prog"); -asm("_return_to_prog:"); -asm(" movw _registers+44, %ss"); -asm(" movl _registers+16, %esp"); -asm(" movl _registers+4, %ecx"); -asm(" movl _registers+8, %edx"); -asm(" movl _registers+12, %ebx"); -asm(" movl _registers+20, %ebp"); -asm(" movl _registers+24, %esi"); -asm(" movl _registers+28, %edi"); -asm(" movw _registers+48, %ds"); -asm(" movw _registers+52, %es"); -asm(" movw _registers+56, %fs"); -asm(" movw _registers+60, %gs"); -asm(" movl _registers+36, %eax"); -asm(" pushl %eax"); /* saved eflags */ -asm(" movl _registers+40, %eax"); -asm(" pushl %eax"); /* saved cs */ -asm(" movl _registers+32, %eax"); -asm(" pushl %eax"); /* saved eip */ -asm(" movl _registers, %eax"); -/* use iret to restore pc and flags together so - that trace flag works right. */ -asm(" iret"); - -/* - * BREAKPOINT macro - */ -#ifdef _MSC_VER //MF -#define BREAKPOINT() __asm int 3; -#else -#define BREAKPOINT() asm(" int $3"); -#endif - -/* - * Store the error code here just in case the user cares. -*/ -int gdb_i386errcode; - -/* - * Store the vector number here (since GDB only gets the signal - * number through the usual means, and that's not very specific). - */ -#ifndef _WIN32 //MF -int gdb_i386vector = -1; -#endif // !_WIN32 - -#if defined(DJGPP) || defined(_WIN32) -static void handle_exception(int); -#endif - -#ifdef DJGPP - -/*********************************************************************** - * save_regs - * - * Description: Retreives the i386 registers as they were when the - * exception occurred. Registers are stored in the - * local static buffer. - * - * Inputs: None. - * Outputs: None. - * Returns: None. - * - ***********************************************************************/ -static void save_regs(void) -{ - registers[EAX] = (int) __djgpp_exception_state->__eax; - registers[ECX] = (int) __djgpp_exception_state->__ecx; - registers[EDX] = (int) __djgpp_exception_state->__edx; - registers[EBX] = (int) __djgpp_exception_state->__ebx; - registers[ESP] = (int) __djgpp_exception_state->__esp; - registers[EBP] = (int) __djgpp_exception_state->__ebp; - registers[ESI] = (int) __djgpp_exception_state->__esi; - registers[EDI] = (int) __djgpp_exception_state->__edi; - registers[PC] = (int) __djgpp_exception_state->__eip; - registers[PS] = (int) __djgpp_exception_state->__eflags; - registers[CS] = (int) __djgpp_exception_state->__cs; - registers[SS] = (int) __djgpp_exception_state->__ss; - registers[DS] = (int) __djgpp_exception_state->__ds; - registers[ES] = (int) __djgpp_exception_state->__es; - registers[FS] = (int) __djgpp_exception_state->__fs; - registers[GS] = (int) __djgpp_exception_state->__gs; -} -static void end_save_regs(void){} - -/*********************************************************************** - * set_regs - * - * Description: Restores i386 registers to the DJGPP register buffer. - * DJGPP exception handler will restore registers from - * it's buffer on exit from the handler. - * - * Inputs: None. - * Outputs: None. - * Returns: None. - * - ***********************************************************************/ -static void set_regs(void) -{ - __djgpp_exception_state->__eax = (unsigned long) registers[EAX]; - __djgpp_exception_state->__ecx = (unsigned long) registers[ECX]; - __djgpp_exception_state->__edx = (unsigned long) registers[EDX]; - __djgpp_exception_state->__ebx = (unsigned long) registers[EBX]; - __djgpp_exception_state->__esp = (unsigned long) registers[ESP]; - __djgpp_exception_state->__ebp = (unsigned long) registers[EBP]; - __djgpp_exception_state->__esi = (unsigned long) registers[ESI]; - __djgpp_exception_state->__edi = (unsigned long) registers[EDI]; - __djgpp_exception_state->__eip = (unsigned long) registers[PC]; - __djgpp_exception_state->__eflags = (unsigned long) registers[PS]; - __djgpp_exception_state->__cs = (unsigned long) registers[CS]; - __djgpp_exception_state->__ss = (unsigned long) registers[SS]; - __djgpp_exception_state->__ds = (unsigned long) registers[DS]; - __djgpp_exception_state->__es = (unsigned long) registers[ES]; - __djgpp_exception_state->__fs = (unsigned long) registers[FS]; - __djgpp_exception_state->__gs = (unsigned long) registers[GS]; -} -static void end_set_regs(void){} - -/*********************************************************************** - * sigsegv_handler - * - * Description: Handles SIGSEGV signal - * - * Inputs: None. - * Outputs: None. - * Returns: None. - * - ***********************************************************************/ -static void sigsegv_handler(int except_num){ - - /* Save general purpose registers */ - save_regs(); - - /* Dispatch memory fault handling routine if one is registered. */ - if(mem_fault_routine != 0) - { - (*mem_fault_routine)(); - mem_fault_routine = NULL; - } - else - { - /* Save error code */ - gdb_i386errcode = __djgpp_exception_state->__sigmask & 0xffff; - - /* Call the general exception handler */ - handle_exception(except_num); - } - /* Write back registers */ - set_regs(); - - /* Return from handler */ - longjmp(__djgpp_exception_state,__djgpp_exception_state->__eax); -} -static void end_sigsegv_handler(void){} - -/*********************************************************************** - * sigfpe_handler - * - * Description: Handles SIGFPE signal - * - * Inputs: None. - * Outputs: None. - * Returns: None. - * - ***********************************************************************/ -static void sigfpe_handler(int except_num){ - - /* Save general purpose registers */ - save_regs(); - - /* Call the general purpose exception handler */ - handle_exception(except_num); - - /* Write back registers */ - set_regs(); - - /* Return from handler */ - longjmp(__djgpp_exception_state,__djgpp_exception_state->__eax); -} -static void end_sigfpe_handler(void){} - -/*********************************************************************** - * sigtrap_handler - * - * Description: Handles SIGTRAP signal - * - * Inputs: None. - * Outputs: None. - * Returns: None. - * - ***********************************************************************/ -static void sigtrap_handler(int except_num) { - - /* Save general purpose registers */ - save_regs(); - - /* Call the general purpose exception handler */ - handle_exception(except_num); - - /* Write back registers */ - set_regs(); - - /* Return from handler */ - longjmp(__djgpp_exception_state,__djgpp_exception_state->__eax); -} -static void end_sigtrap_handler(int except_num){} - -/*********************************************************************** - * sigill_handler - * - * Description: Handles SIGILL signal - * - * Inputs: None. - * Outputs: None. - * Returns: None. - * - ***********************************************************************/ -static void sigill_handler(int except_num) { - - /* Save general purpose registers */ - save_regs(); - - /* Call the general purpose exception handler */ - handle_exception(except_num); - - /* Write back registers */ - set_regs(); - - /* Return from handler */ - longjmp(__djgpp_exception_state,__djgpp_exception_state->__eax); -} -static void end_sigill_handler(int except_num){} -#endif - -#ifdef _WIN32 //MF - -void win32_exception_handler(EXCEPTION_POINTERS* exc_info) -{ - PCONTEXT ctx = exc_info->ContextRecord; - - registers[EAX] = ctx->Eax; - registers[ECX] = ctx->Ecx; - registers[EDX] = ctx->Edx; - registers[EBX] = ctx->Ebx; - registers[ESP] = ctx->Esp; - registers[EBP] = ctx->Ebp; - registers[ESI] = ctx->Esi; - registers[EDI] = ctx->Edi; - registers[PC] = ctx->Eip; - registers[PS] = ctx->EFlags; - registers[CS] = ctx->SegCs; - registers[SS] = ctx->SegSs; - registers[DS] = ctx->SegDs; - registers[ES] = ctx->SegEs; - registers[FS] = ctx->SegFs; - registers[GS] = ctx->SegGs; - - handle_exception((int)(exc_info->ExceptionRecord->ExceptionCode & 0xFFFF)); - - ctx->Eax = registers[EAX]; - ctx->Ecx = registers[ECX]; - ctx->Edx = registers[EDX]; - ctx->Ebx = registers[EBX]; - ctx->Esp = registers[ESP]; - ctx->Ebp = registers[EBP]; - ctx->Esi = registers[ESI]; - ctx->Edi = registers[EDI]; - ctx->Eip = registers[PC]; - ctx->EFlags = registers[PS]; - ctx->SegCs = registers[CS]; - ctx->SegSs = registers[SS]; - ctx->SegDs = registers[DS]; - ctx->SegEs = registers[ES]; - ctx->SegFs = registers[FS]; - ctx->SegGs = registers[GS]; -} - -#endif // _WIN32 - -/*********************************************************************** - * hex - * - * Description: Convert ASCII character values, representing hex - * digits, to the integer value. - * - * Inputs: - * ch - data character - * Outputs: None. - * Returns: integer value represented by the input character. - * - ***********************************************************************/ -static int hex (char ch) -{ - if ((ch >= 'a') && (ch <= 'f')) - return (ch - 'a' + 10); - if ((ch >= '0') && (ch <= '9')) - return (ch - '0'); - if ((ch >= 'A') && (ch <= 'F')) - return (ch - 'A' + 10); - return (-1); -} -#ifdef DJGPP -static void end_hex(void) {} -#endif - -/*********************************************************************** - * getpacket - * - * Description: Retrieve GDB data packet. - * Scan for the sequence $# - * Inputs: None. - * Outputs: None. - * Returns: Beginning of packet buffer. - * - ***********************************************************************/ -static unsigned char *getpacket (void) -{ - unsigned char *buffer = &remcomInBuffer[0]; - unsigned char checksum; - unsigned char xmitcsum; - int count; - char ch; - - while (1) - { - /* wait around for the start character, ignore all other characters */ - while ((ch = getDebugChar ()) != '$') - ; - - retry: - checksum = 0; - xmitcsum = -1; - count = 0; - - /* now, read until a # or end of buffer is found */ - while (count < BUFMAX) - { - ch = getDebugChar (); - if (ch == '$') - goto retry; - if (ch == '#') - break; - checksum = checksum + ch; - buffer[count] = ch; - count = count + 1; - } - buffer[count] = 0; - - if (ch == '#') - { - ch = getDebugChar (); - xmitcsum = hex (ch) << 4; - ch = getDebugChar (); - xmitcsum += hex (ch); - - if (checksum != xmitcsum) - { - if (remote_debug) - { - fprintf (stderr, - "bad checksum. My count = 0x%x, sent=0x%x. buf=%s\n", - checksum, xmitcsum, buffer); - } - putDebugChar ('-'); /* failed checksum */ - } - else - { - putDebugChar ('+'); /* successful transfer */ - - /* if a sequence char is present, reply the sequence ID */ - if (buffer[2] == ':') - { - putDebugChar (buffer[0]); - putDebugChar (buffer[1]); - - return &buffer[3]; - } - - return &buffer[0]; - } - } - } -} -#ifdef DJGPP -static void end_getpacket(void) {} -#endif - -/*********************************************************************** - * putpacket - * - * Description: Send GDB data packet. - * - * Inputs: Buffer of data to send. - * Outputs: None. - * Returns: None. - * - ***********************************************************************/ -static void putpacket (unsigned char *buffer) -{ - unsigned char checksum; - int count; - char ch; - - /* $#. */ - do - { - putDebugChar ('$'); - checksum = 0; - count = 0; - - while ((ch = buffer[count])) - { - putDebugChar (ch); - checksum += ch; - count += 1; - } - - putDebugChar ('#'); - putDebugChar (hexchars[checksum >> 4]); - putDebugChar (hexchars[checksum % 16]); - - } - while (getDebugChar () != '+'); -} -#ifdef DJGPP -static void end_putpacket(void) {} -#endif - - -/*********************************************************************** - * debug_error - * - * Description: Log errors - * - * Inputs: - * format - Format string. - * parm - parameter string - * Outputs: None. - * Returns: None. - * - ***********************************************************************/ -static void debug_error (const char *format, char *parm) -{ - if (remote_debug) - fprintf (stderr, format, parm); -} -#ifdef DJGPP -static void end_debug_error(void) {} -#endif - -/* - * Indicate to caller of mem2hex or hex2mem that there has been an error. - */ -#ifndef DJGPP -static volatile int mem_err = 0; -#else -static int mem_err = 0; -#endif - -/*********************************************************************** - * set_mem_err - * - * Description: set memory error flag - * - * Inputs: None. - * Outputs: None. - * Returns: None. - * - ***********************************************************************/ -static void set_mem_err (void) -{ - mem_err = 1; -} -#ifdef DJGPP -static void end_set_mem_err(void) {} -#endif - -/*********************************************************************** - * get_char - * - * Description: Retreive a character from the specified address. - * These are separate functions so that they are so - * short and sweet that the compiler won't save any - * registers (if there is a fault to mem_fault, they - * won't get restored, so there better not be any saved). - * - * Inputs: addr - The address to read from. - * Outputs: None. - * Returns: data read from address. - * - ***********************************************************************/ -static int get_char (char *addr) -{ - return *addr; -} -#ifdef DJGPP -static void end_get_char(void) {} -#endif - -/*********************************************************************** - * set_char - * - * Description: Write a value to the specified address. - * These are separate functions so that they are so - * short and sweet that the compiler won't save any - * registers (if there is a fault to mem_fault, they - * won't get restored, so there better not be any saved). - * - * Inputs: - * addr - The address to read from. - * val - value to write. - * Outputs: None. - * Returns: None. - * - ***********************************************************************/ -static void set_char (char *addr, int val) -{ - *addr = val; -} -#ifdef DJGPP -static void end_set_char(void) {} -#endif - - -/*********************************************************************** - * mem2hex - * - * Description: Convert the memory pointed to by mem into hex, placing - * result in buf. Return a pointer to the last char put - * in buf (null). If MAY_FAULT is non-zero, then we should - * set mem_err in response to a fault; if zero treat a - * fault like any other fault in the stub. - * - * Inputs: - * mem - Memory address - * buf - data buffer - * count - number of bytes - * may_fault - flag indicating that the operation may cause a mem fault. - * Outputs: None. - * Returns: Pointer to last character. - * - ***********************************************************************/ -static char *mem2hex (char *mem,char *buf,int count,int may_fault) -{ - int i; - unsigned char ch; - -#ifdef _WIN32 //MF - if (IsBadReadPtr(mem, (DWORD)count)) - return mem; -#else - if (may_fault) - mem_fault_routine = set_mem_err; -#endif - for (i = 0; i < count; i++) - { - ch = get_char (mem++); - if (may_fault && mem_err) - return (buf); - *buf++ = hexchars[ch >> 4]; - *buf++ = hexchars[ch % 16]; - } - *buf = 0; -#ifndef _WIN32 //MF - if (may_fault) - mem_fault_routine = NULL; -#endif - return (buf); -} -#ifdef DJGPP -static void end_mem2hex(void) {} -#endif - -/*********************************************************************** - * hex2mem - * - * Description: Convert the hex array pointed to by buf into binary to - * be placed in mem. Return a pointer to the character - * AFTER the last byte written - * Inputs: - * buf - * mem - * count - * may_fault - * Outputs: None. - * Returns: Pointer to buffer after last byte. - * - ***********************************************************************/ -static char *hex2mem (char *buf,char *mem,int count,int may_fault) -{ - int i; - unsigned char ch; - -#ifdef _WIN32 //MF - // MinGW does not support structured exception handling, so let's - // go safe and make memory writable by default - DWORD old_protect; - - VirtualProtect(mem, (DWORD)count, PAGE_EXECUTE_READWRITE, &old_protect); -#else - if (may_fault) - mem_fault_routine = set_mem_err; -#endif - for (i = 0; i < count; i++) - { - ch = hex (*buf++) << 4; - ch = ch + hex (*buf++); - set_char (mem++, ch); - if (may_fault && mem_err) - return (mem); - } -#ifndef _WIN32 //MF - if (may_fault) - mem_fault_routine = NULL; -#endif - return (mem); -} -#ifdef DJGPP -static void end_hex2mem(void) {} -#endif - -/*********************************************************************** - * computeSignal - * - * Description: This function takes the 386 exception vector and - * attempts to translate this number into a unix - * compatible signal value. - * Inputs: - * exceptionVector - * Outputs: None. - * Returns: - * - ***********************************************************************/ -static int computeSignal (int exceptionVector) -{ - int sigval; - switch (exceptionVector) - { - case 0: - sigval = 8; - break; /* divide by zero */ - case 1: - sigval = 5; - break; /* debug exception */ - case 3: - sigval = 5; - break; /* breakpoint */ - case 4: - sigval = 16; - break; /* into instruction (overflow) */ - case 5: - sigval = 16; - break; /* bound instruction */ - case 6: - sigval = 4; - break; /* Invalid opcode */ - case 7: - sigval = 8; - break; /* coprocessor not available */ - case 8: - sigval = 7; - break; /* double fault */ - case 9: - sigval = 11; - break; /* coprocessor segment overrun */ - case 10: - sigval = 11; - break; /* Invalid TSS */ - case 11: - sigval = 11; - break; /* Segment not present */ - case 12: - sigval = 11; - break; /* stack exception */ - case 13: - sigval = 11; - break; /* general protection */ - case 14: - sigval = 11; - break; /* page fault */ - case 16: - sigval = 7; - break; /* coprocessor error */ - default: - sigval = 7; /* "software generated" */ - } - return (sigval); -} -#ifdef DJGPP -static void end_computeSignal(void) {} -#endif - -/*********************************************************************** - * hexToInt - * - * Description: Convert an ASCII string to an integer. - * - * Inputs: - * Outputs: None. - * Returns: Number of chars processed - * - ***********************************************************************/ -int hexToInt (char **ptr, int *intValue) -{ - int numChars = 0; - int hexValue; - - *intValue = 0; - - while (**ptr) - { - hexValue = hex (**ptr); - if (hexValue >= 0) - { - *intValue = (*intValue << 4) | hexValue; - numChars++; - } - else - break; - - (*ptr)++; - } - - return (numChars); -} -#ifdef DJGPP -static void end_hexToInt(void) {} -#endif - - -/*********************************************************************** - * handle_exception - * - * Description: This function does all command procesing for interfacing - * to GDB. - * Inputs: - * exceptionVector - number of the vector. - * Outputs: None. - * Returns: None. - * - ***********************************************************************/ -static void handle_exception (int exceptionVector) -{ - int sigval, stepping; - int addr, length; - char *ptr; - int newPC; - -#ifndef _WIN32 //MF - gdb_i386vector = exceptionVector; -#endif - - if (remote_debug) - { - printf ("vector=%d, sr=0x%x, pc=0x%x\n", - exceptionVector, registers[PS], registers[PC]); - } - - /* reply to host that an exception has occurred */ - sigval = computeSignal (exceptionVector); - - ptr = remcomOutBuffer; - - *ptr++ = 'T'; /* notify gdb with signo, PC, FP and SP */ - *ptr++ = hexchars[sigval >> 4]; - *ptr++ = hexchars[sigval & 0xf]; - - *ptr++ = hexchars[ESP]; - *ptr++ = ':'; - ptr = mem2hex((char *)®isters[ESP], ptr, 4, 0); /* SP */ - *ptr++ = ';'; - - *ptr++ = hexchars[EBP]; - *ptr++ = ':'; - ptr = mem2hex((char *)®isters[EBP], ptr, 4, 0); /* FP */ - *ptr++ = ';'; - - *ptr++ = hexchars[PC]; - *ptr++ = ':'; - ptr = mem2hex((char *)®isters[PC], ptr, 4, 0); /* PC */ - *ptr++ = ';'; - - *ptr = '\0'; - - putpacket (remcomOutBuffer); - - stepping = 0; - - while (1 == 1) - { - remcomOutBuffer[0] = 0; - ptr = getpacket (); - - switch (*ptr++) - { - case '?': - remcomOutBuffer[0] = 'S'; - remcomOutBuffer[1] = hexchars[sigval >> 4]; - remcomOutBuffer[2] = hexchars[sigval % 16]; - remcomOutBuffer[3] = 0; - break; - case 'd': - remote_debug = !(remote_debug); /* toggle debug flag */ - break; - case 'g': /* return the value of the CPU registers */ - mem2hex ((char *) registers, remcomOutBuffer, NUMREGBYTES, 0); - break; - case 'G': /* set the value of the CPU registers - return OK */ - hex2mem (ptr, (char *) registers, NUMREGBYTES, 0); - strcpy (remcomOutBuffer, "OK"); - break; - case 'P': /* set the value of a single CPU register - return OK */ - { - int regno; - - if (hexToInt (&ptr, ®no) && *ptr++ == '=') - if (regno >= 0 && regno < NUMREGS) - { - hex2mem (ptr, (char *) ®isters[regno], 4, 0); - strcpy (remcomOutBuffer, "OK"); - break; - } - - strcpy (remcomOutBuffer, "E01"); - break; - } - - /* mAA..AA,LLLL Read LLLL bytes at address AA..AA */ - case 'm': - /* TRY TO READ %x,%x. IF SUCCEED, SET PTR = 0 */ - if (hexToInt (&ptr, &addr)) - if (*(ptr++) == ',') - if (hexToInt (&ptr, &length)) - { - ptr = 0; - mem_err = 0; - mem2hex ((char *) addr, remcomOutBuffer, length, 1); - if (mem_err) - { - strcpy (remcomOutBuffer, "E03"); - debug_error ("%s","memory fault"); - } - } - - if (ptr) - { - strcpy (remcomOutBuffer, "E01"); - } - break; - - /* MAA..AA,LLLL: Write LLLL bytes at address AA.AA return OK */ - case 'M': - /* TRY TO READ '%x,%x:'. IF SUCCEED, SET PTR = 0 */ - if (hexToInt (&ptr, &addr)) - if (*(ptr++) == ',') - if (hexToInt (&ptr, &length)) - if (*(ptr++) == ':') - { - mem_err = 0; - hex2mem (ptr, (char *) addr, length, 1); - - if (mem_err) - { - strcpy (remcomOutBuffer, "E03"); - debug_error ("%s","memory fault"); - } - else - { - strcpy (remcomOutBuffer, "OK"); - } - - ptr = 0; - } - if (ptr) - { - strcpy (remcomOutBuffer, "E02"); - } - break; - - /* cAA..AA Continue at address AA..AA(optional) */ - /* sAA..AA Step one instruction from AA..AA(optional) */ - case 's': - stepping = 1; - case 'c': - /* try to read optional parameter, pc unchanged if no parm */ - if (hexToInt (&ptr, &addr)) - registers[PC] = addr; - - newPC = registers[PC]; - - /* clear the trace bit */ - registers[PS] &= 0xfffffeff; - - /* set the trace bit if we're stepping */ - if (stepping) - registers[PS] |= 0x100; - -#ifdef _WIN32 //MF - return; -#else - _returnFromException (); /* this is a jump */ - - break; - - /* kill the program */ - case 'k': /* do nothing */ -#if 0 - /* Huh? This doesn't look like "nothing". - m68k-stub.c and sparc-stub.c don't have it. */ - BREAKPOINT (); -#endif - break; -#endif - } /* switch */ - - /* reply to the request */ - putpacket (remcomOutBuffer); - } -} -#ifdef DJGPP -static void end_handle_exception(void) {} -#endif - -#ifndef DJGPP -/* GDB stores segment registers in 32-bit words (that's just the way - m-i386v.h is written). So zero the appropriate areas in registers. */ -#define SAVE_REGISTERS1() \ - asm ("movl %eax, _registers"); \ - asm ("movl %ecx, _registers+4"); \ - asm ("movl %edx, _registers+8"); \ - asm ("movl %ebx, _registers+12"); \ - asm ("movl %ebp, _registers+20"); \ - asm ("movl %esi, _registers+24"); \ - asm ("movl %edi, _registers+28"); \ - asm ("movw $0, %ax"); \ - asm ("movw %ds, _registers+48"); \ - asm ("movw %ax, _registers+50"); \ - asm ("movw %es, _registers+52"); \ - asm ("movw %ax, _registers+54"); \ - asm ("movw %fs, _registers+56"); \ - asm ("movw %ax, _registers+58"); \ - asm ("movw %gs, _registers+60"); \ - asm ("movw %ax, _registers+62"); -#define SAVE_ERRCODE() \ - asm ("popl %ebx"); \ - asm ("movl %ebx, _gdb_i386errcode"); -#define SAVE_REGISTERS2() \ - asm ("popl %ebx"); /* old eip */ \ - asm ("movl %ebx, _registers+32"); \ - asm ("popl %ebx"); /* old cs */ \ - asm ("movl %ebx, _registers+40"); \ - asm ("movw %ax, _registers+42"); \ - asm ("popl %ebx"); /* old eflags */ \ - asm ("movl %ebx, _registers+36"); \ - /* Now that we've done the pops, we can save the stack pointer."); */ \ - asm ("movw %ss, _registers+44"); \ - asm ("movw %ax, _registers+46"); \ - asm ("movl %esp, _registers+16"); - -/* See if mem_fault_routine is set, if so just IRET to that address. */ -#define CHECK_FAULT() \ - asm ("cmpl $0, _mem_fault_routine"); \ - asm ("jne mem_fault"); - -asm (".text"); -asm ("mem_fault:"); -/* OK to clobber temp registers; we're just going to end up in set_mem_err. */ -/* Pop error code from the stack and save it. */ -asm (" popl %eax"); -asm (" movl %eax, _gdb_i386errcode"); - -asm (" popl %eax"); /* eip */ -/* We don't want to return there, we want to return to the function - pointed to by mem_fault_routine instead. */ -asm (" movl _mem_fault_routine, %eax"); -asm (" popl %ecx"); /* cs (low 16 bits; junk in hi 16 bits). */ -asm (" popl %edx"); /* eflags */ - -/* Remove this stack frame; when we do the iret, we will be going to - the start of a function, so we want the stack to look just like it - would after a "call" instruction. */ -asm (" leave"); - -/* Push the stuff that iret wants. */ -asm (" pushl %edx"); /* eflags */ -asm (" pushl %ecx"); /* cs */ -asm (" pushl %eax"); /* eip */ - -/* Zero mem_fault_routine. */ -asm (" movl $0, %eax"); -asm (" movl %eax, _mem_fault_routine"); - -asm ("iret"); - - -#define CALL_HOOK() asm("call _remcomHandler"); - -/* This function is called when a i386 exception occurs. It saves - * all the cpu regs in the _registers array, munges the stack a bit, - * and invokes an exception handler (remcom_handler). - * - * stack on entry: stack on exit: - * old eflags vector number - * old cs (zero-filled to 32 bits) - * old eip - * - */ -extern void _catchException3(); -asm(".text"); -asm(".globl __catchException3"); -asm("__catchException3:"); -SAVE_REGISTERS1(); -SAVE_REGISTERS2(); -asm ("pushl $3"); -CALL_HOOK(); - -/* Same thing for exception 1. */ -extern void _catchException1(); -asm(".text"); -asm(".globl __catchException1"); -asm("__catchException1:"); -SAVE_REGISTERS1(); -SAVE_REGISTERS2(); -asm ("pushl $1"); -CALL_HOOK(); - -/* Same thing for exception 0. */ -extern void _catchException0(); -asm(".text"); -asm(".globl __catchException0"); -asm("__catchException0:"); -SAVE_REGISTERS1(); -SAVE_REGISTERS2(); -asm ("pushl $0"); -CALL_HOOK(); - -/* Same thing for exception 4. */ -extern void _catchException4(); -asm(".text"); -asm(".globl __catchException4"); -asm("__catchException4:"); -SAVE_REGISTERS1(); -SAVE_REGISTERS2(); -asm ("pushl $4"); -CALL_HOOK(); - -/* Same thing for exception 5. */ -extern void _catchException5(); -asm(".text"); -asm(".globl __catchException5"); -asm("__catchException5:"); -SAVE_REGISTERS1(); -SAVE_REGISTERS2(); -asm ("pushl $5"); -CALL_HOOK(); - -/* Same thing for exception 6. */ -extern void _catchException6(); -asm(".text"); -asm(".globl __catchException6"); -asm("__catchException6:"); -SAVE_REGISTERS1(); -SAVE_REGISTERS2(); -asm ("pushl $6"); -CALL_HOOK(); - -/* Same thing for exception 7. */ -extern void _catchException7(); -asm(".text"); -asm(".globl __catchException7"); -asm("__catchException7:"); -SAVE_REGISTERS1(); -SAVE_REGISTERS2(); -asm ("pushl $7"); -CALL_HOOK(); - -/* Same thing for exception 8. */ -extern void _catchException8(); -asm(".text"); -asm(".globl __catchException8"); -asm("__catchException8:"); -SAVE_REGISTERS1(); -SAVE_ERRCODE(); -SAVE_REGISTERS2(); -asm ("pushl $8"); -CALL_HOOK(); - -/* Same thing for exception 9. */ -extern void _catchException9(); -asm(".text"); -asm(".globl __catchException9"); -asm("__catchException9:"); -SAVE_REGISTERS1(); -SAVE_REGISTERS2(); -asm ("pushl $9"); -CALL_HOOK(); - -/* Same thing for exception 10. */ -extern void _catchException10(); -asm(".text"); -asm(".globl __catchException10"); -asm("__catchException10:"); -SAVE_REGISTERS1(); -SAVE_ERRCODE(); -SAVE_REGISTERS2(); -asm ("pushl $10"); -CALL_HOOK(); - -/* Same thing for exception 12. */ -extern void _catchException12(); -asm(".text"); -asm(".globl __catchException12"); -asm("__catchException12:"); -SAVE_REGISTERS1(); -SAVE_ERRCODE(); -SAVE_REGISTERS2(); -asm ("pushl $12"); -CALL_HOOK(); - -/* Same thing for exception 16. */ -extern void _catchException16(); -asm(".text"); -asm(".globl __catchException16"); -asm("__catchException16:"); -SAVE_REGISTERS1(); -SAVE_REGISTERS2(); -asm ("pushl $16"); -CALL_HOOK(); - -/* For 13, 11, and 14 we have to deal with the CHECK_FAULT stuff. */ - -/* Same thing for exception 13. */ -extern void _catchException13 (); -asm (".text"); -asm (".globl __catchException13"); -asm ("__catchException13:"); -CHECK_FAULT(); -SAVE_REGISTERS1(); -SAVE_ERRCODE(); -SAVE_REGISTERS2(); -asm ("pushl $13"); -CALL_HOOK(); - -/* Same thing for exception 11. */ -extern void _catchException11 (); -asm (".text"); -asm (".globl __catchException11"); -asm ("__catchException11:"); -CHECK_FAULT(); -SAVE_REGISTERS1(); -SAVE_ERRCODE(); -SAVE_REGISTERS2(); -asm ("pushl $11"); -CALL_HOOK(); - -/* Same thing for exception 14. */ -extern void _catchException14 (); -asm (".text"); -asm (".globl __catchException14"); -asm ("__catchException14:"); -CHECK_FAULT(); -SAVE_REGISTERS1(); -SAVE_ERRCODE(); -SAVE_REGISTERS2(); -asm ("pushl $14"); -CALL_HOOK(); - -/* - * remcomHandler is a front end for handle_exception. It moves the - * stack pointer into an area reserved for debugger use. - */ -asm("_remcomHandler:"); -asm(" popl %eax"); /* pop off return address */ -asm(" popl %eax"); /* get the exception number */ -asm(" movl _stackPtr, %esp"); /* move to remcom stack area */ -asm(" pushl %eax"); /* push exception onto stack */ -asm(" call _handle_exception"); /* this never returns */ -#endif - -void _returnFromException () -{ -#ifndef DJGPP - return_to_prog (); -#else -/* Return from handler */ - longjmp(__djgpp_exception_state,__djgpp_exception_state->__eax); -#endif -} - -/* this function is used to set up exception handlers for tracing and - breakpoints */ -#ifndef DJGPP -void -set_debug_traps (void) -{ -#ifndef _WIN32 //MF - stackPtr = &remcomStack[STACKSIZE / sizeof (int) - 1]; - - exceptionHandler (0, _catchException0); - exceptionHandler (1, _catchException1); - exceptionHandler (3, _catchException3); - exceptionHandler (4, _catchException4); - exceptionHandler (5, _catchException5); - exceptionHandler (6, _catchException6); - exceptionHandler (7, _catchException7); - exceptionHandler (8, _catchException8); - exceptionHandler (9, _catchException9); - exceptionHandler (10, _catchException10); - exceptionHandler (11, _catchException11); - exceptionHandler (12, _catchException12); - exceptionHandler (13, _catchException13); - exceptionHandler (14, _catchException14); - exceptionHandler (16, _catchException16); -#endif // _WIN32 - - gdb_initialized = 1; -} -#endif //#ifndef DJGPP - - -// DJGPP stuff -#ifdef DJGPP -/*********************************************************************** - * restore_traps - * - * Description: This function restores all used signal handlers to - * defaults. - * - * Inputs: None. - * Outputs: None. - * Returns: None. - * - ***********************************************************************/ -void restore_traps(void) -{ - /* Restore default signal handlers */ - signal(SIGSEGV,SIG_DFL); - signal(SIGTRAP,SIG_DFL); - signal(SIGFPE,SIG_DFL); - signal(SIGTRAP,SIG_DFL); - signal(SIGILL,SIG_DFL); - - /* Clear init flag */ - gdb_initialized = 0; -} - -/*********************************************************************** - * lock_handler_data - * - * Description: This function locks all data that is used by the signal - * handlers. - * - * Inputs: None. - * Outputs: None. - * Returns: None. - * - ***********************************************************************/ -static void lock_handler_data(void) -{ - _go32_dpmi_lock_data(&gdb_initialized,sizeof(gdb_initialized)); - _go32_dpmi_lock_data(&remote_debug,sizeof(remote_debug)); - _go32_dpmi_lock_data(hexchars,sizeof(hexchars)); - _go32_dpmi_lock_data(registers,sizeof(registers)); - _go32_dpmi_lock_data(&gdb_i386errcode,sizeof(gdb_i386errcode)); - _go32_dpmi_lock_data(&gdb_i386vector,sizeof(gdb_i386vector)); - - _go32_dpmi_lock_data(remcomInBuffer,sizeof(remcomInBuffer)); - _go32_dpmi_lock_data(remcomOutBuffer,sizeof(remcomOutBuffer)); - - _go32_dpmi_lock_code(getpacket,(unsigned long)end_getpacket- - (unsigned long)getpacket); - _go32_dpmi_lock_code(putpacket,(unsigned long)end_putpacket- - (unsigned long)putpacket); - _go32_dpmi_lock_code(debug_error,(unsigned long)end_debug_error- - (unsigned long)debug_error); - - _go32_dpmi_lock_data(&mem_fault_routine,sizeof(mem_fault_routine)); - _go32_dpmi_lock_data(&mem_err,sizeof(mem_err)); - - _go32_dpmi_lock_code(set_mem_err,(unsigned long)end_set_mem_err-(unsigned long)set_mem_err); - _go32_dpmi_lock_code(get_char,(unsigned long)end_get_char-(unsigned long)get_char); - _go32_dpmi_lock_code(set_char,(unsigned long)end_set_char-(unsigned long)set_char); - _go32_dpmi_lock_code(mem2hex,(unsigned long)end_hex-(unsigned long)hex); - _go32_dpmi_lock_code(mem2hex,(unsigned long)end_mem2hex-(unsigned long)mem2hex); - _go32_dpmi_lock_code(hex2mem,(unsigned long)end_hex2mem-(unsigned long)hex2mem); - _go32_dpmi_lock_code(computeSignal,(unsigned long)end_computeSignal- - (unsigned long)computeSignal); - _go32_dpmi_lock_code(hexToInt,(unsigned long)end_hexToInt-(unsigned long)hexToInt); - _go32_dpmi_lock_code(handle_exception,(unsigned long)end_handle_exception- - (unsigned long)handle_exception); - - _go32_dpmi_lock_code(sigsegv_handler, - (unsigned long)end_sigsegv_handler-(unsigned long)sigsegv_handler); - - _go32_dpmi_lock_code(sigfpe_handler, - (unsigned long)end_sigfpe_handler-(unsigned long)sigfpe_handler); - - _go32_dpmi_lock_code(sigtrap_handler, - (unsigned long)end_sigtrap_handler-(unsigned long)sigtrap_handler); - - _go32_dpmi_lock_code(sigill_handler, - (unsigned long)end_sigill_handler-(unsigned long)sigill_handler); - - _go32_dpmi_lock_code(save_regs, - (unsigned long)end_save_regs-(unsigned long)save_regs); - - _go32_dpmi_lock_code(set_regs, - (unsigned long)end_set_regs-(unsigned long)set_regs); - -} - -/*********************************************************************** - * set_debug_traps - * - * Description: This function installs signal handlers. - * - * Inputs: None. - * Outputs: None. - * Returns: None. - * - ***********************************************************************/ -void set_debug_traps(void) -{ - /* Lock any data that may be used by the trap handlers */ - lock_handler_data(); - - /* Install signal handlers here */ - signal(SIGSEGV,sigsegv_handler); - signal(SIGFPE,sigfpe_handler); - signal(SIGTRAP,sigtrap_handler); - signal(SIGILL,sigill_handler); - - /* Set init flag */ - gdb_initialized = 1; - -} -#endif //#ifdef DJGPP - -/*********************************************************************** - * breakpoint - * - * Description: This function will generate a breakpoint exception. - * It is used at the beginning of a program to sync up - * with a debugger and can be used otherwise as a quick - * means to stop program execution and "break" into the - * debugger. - * - * Inputs: None. - * Outputs: None. - * Returns: None. - * - ***********************************************************************/ -void breakpoint () -{ - if (gdb_initialized) - BREAKPOINT (); -} - diff --git a/tools/gdbst03/src/library/i386-supp.c b/tools/gdbst03/src/library/i386-supp.c deleted file mode 100644 index baf465b4e..000000000 --- a/tools/gdbst03/src/library/i386-supp.c +++ /dev/null @@ -1,424 +0,0 @@ -/*********************************************************************** - * i386-supp.c - * - * Description: Support functions for the i386 GDB target stub. - * - * Credits: Created by Jonathan Brogdon - * - * Terms of use: This software is provided for use under the terms - * and conditions of the GNU General Public License. - * You should have received a copy of the GNU General - * Public License along with this program; if not, write - * to the Free Software Foundation, Inc., 59 Temple Place - * Suite 330, Boston, MA 02111-1307, USA. - * - * Global Data: None. - * Global Functions: - * gdb_serial_init - * gdb_target_init - * gdb_target_close - * putDebugChar - * getDebugChar - * - * History - * Engineer: Date: Notes: - * --------- ----- ------ - * Jonathan Brogdon 20000617 Genesis - * Gordon Schumacher 20020212 Updated for modularity - * - ***********************************************************************/ - - -#ifdef DJGPP -#include -#endif - -#ifdef _WIN32 -#define WIN32_LEAN_AND_MEAN -#include -#include -#include -#define DEBUGBUFFERSIZE 1024 -HANDLE ser_port = (HANDLE)(-1); - -//#include "utility/utility.h" -#ifdef _MSC_VER -#ifndef DEBUG_SERIAL -#pragma comment(lib, "wsock32") -#endif -#endif -#endif - -#include -#include - -#ifdef DJGPP -//#include "bios_layer.h" // Include this for BIOS calls - NOT RECOMMENDED! -//#include "sva_layer.h" // Include this for SVAsync usage -#include "dzc_layer.h" // Include this for DZComm usage - - -#endif -#define SER_TIMEOUT 1000000 - -#ifdef _WIN32 -static LPTOP_LEVEL_EXCEPTION_FILTER s_prev_exc_handler = 0; - - -#define I386_EXCEPTION_CNT 17 - -LONG WINAPI exc_protection_handler(EXCEPTION_POINTERS* exc_info) -{ - int exc_nr = exc_info->ExceptionRecord->ExceptionCode & 0xFFFF; - - if (exc_nr < I386_EXCEPTION_CNT) { - //LOG(FmtString(TEXT("exc_protection_handler: Exception %x"), exc_nr)); - -#if 0 - if (exc_nr==11 || exc_nr==13 || exc_nr==14) { - if (mem_fault_routine) - mem_fault_routine(); - } -#endif - - ++exc_info->ContextRecord->Eip; - } - - return EXCEPTION_CONTINUE_EXECUTION; -} - -LONG WINAPI exc_handler(EXCEPTION_POINTERS* exc_info) -{ - int exc_nr = exc_info->ExceptionRecord->ExceptionCode & 0xFFFF; - - if (exc_nr < I386_EXCEPTION_CNT) { - //LOG(FmtString("Exception %x", exc_nr)); - //LOG(FmtString("EIP=%08X EFLAGS=%08X", exc_info->ContextRecord->Eip, exc_info->ContextRecord->EFlags)); - - // step over initial breakpoint - if (s_initial_breakpoint) { - s_initial_breakpoint = 0; - ++exc_info->ContextRecord->Eip; - } - - SetUnhandledExceptionFilter(exc_protection_handler); - - win32_exception_handler(exc_info); - //LOG(FmtString("EIP=%08X EFLAGS=%08X", exc_info->ContextRecord->Eip, exc_info->ContextRecord->EFlags)); - - SetUnhandledExceptionFilter(exc_handler); - - return EXCEPTION_CONTINUE_EXECUTION; - } - - return EXCEPTION_CONTINUE_SEARCH; -} - -void disable_debugging() -{ - if (s_prev_exc_handler) { - SetUnhandledExceptionFilter(s_prev_exc_handler); - s_prev_exc_handler = 0; - } -} -#endif - -#if !(defined(DJGPP) || defined(_WIN32)) -void exceptionHandler(int exc_nr, void* exc_addr) -{ - if (exc_nr>=0 && exc_nr SER_TIMEOUT) - { - if(WriteFile( ser_port, buffer, 1, &dwLength, NULL )) - return 1; - else if(timeout > SER_TIMEOUT) - return 0; - } - else timeout++; - goto retrywrite; -#endif -} - -/*********************************************************************** - * getDebugChar - * - * Description: gets a character from the debug COM port. - * - * Inputs: None. - * Outputs: None. - * Returns: character data from the serial support. - * - ***********************************************************************/ -int getDebugChar(void) -{ - register int timeout = 0; -#ifdef DJGPP - register int ret = -1; - - while ((GDBStub_SerRecvOk() == 0) && (timeout < SER_TIMEOUT)) - timeout++; - if (timeout < SER_TIMEOUT) - ret = GDBStub_SerRecv(); - - return ret; -#elif defined(_WIN32) - DWORD buffer[DEBUGBUFFERSIZE]; - COMSTAT ComStat ; - DWORD dwErrorFlags; - DWORD dwLength; - - if(ser_port == (HANDLE)-1) - return -1; - - retryread: - ClearCommError( ser_port, &dwErrorFlags, &ComStat ) ; - dwLength = min( DEBUGBUFFERSIZE, ComStat.cbInQue ) ; - - if (dwLength > 0 || timeout > SER_TIMEOUT) - { - if(ReadFile( ser_port, buffer, 1, &dwLength, NULL )) - return buffer[0]; - else if(timeout > SER_TIMEOUT) - return -1; - } - else timeout++; - goto retryread; -#endif -} - -#if 0 -static SOCKET s_rem_fd = INVALID_SOCKET; - -int init_gdb_connect() -{ -#ifdef _WIN32 - WORD wVersionRequested; - WSADATA wsa_data; -#endif - SOCKADDR_IN srv_addr; - SOCKADDR_IN rem_addr; - SOCKET srv_socket; - int rem_len; - - memset(&srv_addr,0,sizeof(srv_addr)); - s_prev_exc_handler = SetUnhandledExceptionFilter(exc_handler); - -#ifdef _WIN32 - wVersionRequested= MAKEWORD( 2, 2 ); - if (WSAStartup(wVersionRequested, &wsa_data)) { - fprintf(stderr, "WSAStartup() failed"); - return 0; - } -#endif - - srv_addr.sin_family = AF_INET; - srv_addr.sin_addr.s_addr = htonl(INADDR_ANY); - srv_addr.sin_port = htons(9999); - - srv_socket = socket(PF_INET, SOCK_STREAM, 0); - if (srv_socket == INVALID_SOCKET) { - perror("socket()"); - return 0; - } - - if (bind(srv_socket, (struct sockaddr*) &srv_addr, sizeof(srv_addr)) == -1) { - perror("bind()"); - return 0; - } - - if (listen(srv_socket, 4) == -1) { - perror("listen()"); - return 0; - } - - rem_len = sizeof(rem_addr); - - for(;;) { - s_rem_fd = accept(srv_socket, (struct sockaddr*)&rem_addr, &rem_len); - - if (s_rem_fd == INVALID_SOCKET) { - if (errno == EINTR) - continue; - - perror("accept()"); - return 0; - } - - break; - } - - return 1; -} - - -int getDebugChar() -{ - char buffer[DEBUGBUFFERSIZE]; - int r; - - if (s_rem_fd == INVALID_SOCKET) - return EOF; - - r = recv(s_rem_fd, buffer, 1, 0); - if (r == -1) { - perror("recv()"); - //LOG(TEXT("debugger connection broken")); - s_rem_fd = INVALID_SOCKET; - return EOF; - } - - if (!r) - return EOF; - - return buffer[0]; -} - -void putDebugChar(int c) -{ - if (s_rem_fd == INVALID_SOCKET) { - const char buffer[] = {c}; - - if (!send(s_rem_fd, buffer, 1, 0)) { - perror("send()"); - //LOG(TEXT("debugger connection broken")); - exit(-1); - } - } -} -#endif diff --git a/tools/gdbst03/src/library/makefile b/tools/gdbst03/src/library/makefile deleted file mode 100644 index 05e1e9030..000000000 --- a/tools/gdbst03/src/library/makefile +++ /dev/null @@ -1,30 +0,0 @@ -# -# Makefile for GDB Stub for DJGPP -# -# GDB Stub for DJGPP Copyright 2000 by Jonathan Brogdon -# - -include ../../Makefile.cfg - -CFLAGS += -I../../include -I../include - -LOBJS = i386-stub.o i386-supp.o - -all: library - -library: $(LOBJS) - @$(RM) ../../lib/libgdbst.a - @$(AR) rcs ../../lib/libgdbst.a $(LOBJS) - -dep: - @$(CC) $(CFLAGS) -M *.c > depend.dep - -clean: - @$(RM) $(LOBJS) - -distclean: clean - @$(RM) ../../lib/libgdbst.a - @$(RM) depend.dep - -$(OBJS) $(LOBJS): -include depend.dep diff --git a/tools/gdbst03/src/library/sva_layer.h b/tools/gdbst03/src/library/sva_layer.h deleted file mode 100644 index 4cdd1628b..000000000 --- a/tools/gdbst03/src/library/sva_layer.h +++ /dev/null @@ -1,83 +0,0 @@ -//======================================================================================================= -// sva_layer.h - Serial command layer for SVAsync -// -//======================================================================================================= - -//======================================================================================================= -//======================================================================================================= - -#ifndef _SVA_LAYER_H -#define _SVA_LAYER_H - - -//=============================================================================== -// Include files -//=============================================================================== - -#include "svasync.h" - -//=============================================================================== -// Inline function definitions -//=============================================================================== - -// Initialize the serial library -// Should return 0 if no error occurred -__inline int GDBStub_SerInit(int port) -{ - int ret, init; - - ret = init = SVAsyncInit(port - 1); - if (ret == 0) - ret = SVAsyncFifoInit(); - if (init == 0) - atexit(SVAsyncStop); - return ret; -} - - -// Set the serial port speed (and other configurables) -// Should return 0 if the speed is set properly -__inline int GDBStub_SerSpeed(int speed) -{ - SVAsyncSet(speed, BITS_8 | NO_PARITY | STOP_1); - SVAsyncHand(DTR | RTS); - return 0; -} - - -// Check to see if there's room in the buffer to send data -// Should return 0 if it is okay to send -__inline int GDBStub_SerSendOk(void) -{ - return !SVAsyncOutStat(); -} - - -// Send a character to the serial port -// Should return 0 if the send succeeds -__inline int GDBStub_SerSend(int c) -{ - SVAsyncOut((char) c); - return 0; -} - - -// Check to see if there are characters waiting in the buffer -// Should return 0 if there's data waiting -__inline int GDBStub_SerRecvOk(void) -{ - return SVAsyncInStat(); -} - - -// Read a character from the serial port -// Should return the character read -__inline int GDBStub_SerRecv(void) -{ - return SVAsyncIn(); -} - - - - -#endif diff --git a/tools/lumpmod/Makefile b/tools/lumpmod/Makefile deleted file mode 100644 index a01f80278..000000000 --- a/tools/lumpmod/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# Makfile for SRB2 Lumpmod -# by Alam Arias et al. - -SRC=lumpmod.c lump.c -OBJ=$(SRC:.c=.o)# replaces the .c from SRC with .o -EXE=lumpmod - -.PHONY : all # .PHONY ignores files named all -all: $(EXE) # all is dependent on $(BIN) to be complete - -$(EXE): $(OBJ) # $(EXE) is dependent on all of the files in $(OBJ) to exist - $(CC) $(OBJ) $(LDFLAGS) -o $@ - -.PHONY : clean # .PHONY ignores files named clean -clean: - -$(RM) $(OBJ) $(EXE) diff --git a/tools/lumpmod/lump.c b/tools/lumpmod/lump.c deleted file mode 100644 index ed2ff2f9d..000000000 --- a/tools/lumpmod/lump.c +++ /dev/null @@ -1,473 +0,0 @@ -/* - LumpMod v0.2.1, a command-line utility for working with lumps in wad - files. - Copyright (C) 2003 Thunder Palace Entertainment. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - lump.c: Provides functions for dealing with lumps -*/ - -#include -#include -#include -#include -#include "lump.h" - -/* Read contents of a wad file and store them in memory. - * fpoint is the file to read, opened with "rb" mode. - * A pointer to a new wadfile struct will be returned, or NULL on error. - */ -struct wadfile *read_wadfile(FILE *fpoint) { - struct wadfile *wfptr; - struct lumplist *curlump; - long diroffset, filelen; - unsigned long count; - - /* Allocate memory for wadfile struct */ - wfptr = malloc(sizeof(struct wadfile)); - if(wfptr == NULL) return NULL; - - /* Read first four characters (PWAD or IWAD) */ - if(fread(wfptr->id, 4, 1, fpoint) < 1) { - free(wfptr); - return NULL; - } - - /* Read number of lumps */ - if(fread(&(wfptr->numlumps), 4, 1, fpoint) < 1) { - free(wfptr); - return NULL; - } - - /* If number of lumps is zero, nothing more needs to be done */ - if(wfptr->numlumps == 0) { - wfptr->head = NULL; - return wfptr; - } - - /* Read offset of directory */ - if(fread(&diroffset, 4, 1, fpoint) < 1) { - free(wfptr); - return NULL; - } - - /* Verify that the directory as long as it needs to be */ - fseek(fpoint, 0, SEEK_END); - filelen = ftell(fpoint); - if((filelen - diroffset) / DIRENTRYLEN < wfptr->numlumps) { - free(wfptr); - return NULL; - } - - /* Allocate memory for head lumplist item and set head pointer */ - curlump = malloc(sizeof(struct lumplist)); - if(curlump == NULL) { - free(wfptr); - return NULL; - } - wfptr->head = curlump; - curlump->cl = NULL; - - /* Read directory entries and lumps */ - for(count = 0; count < wfptr->numlumps; count++) { - long lumpdataoffset; - - /* Advance to a new list item */ - curlump->next = malloc(sizeof(struct lumplist)); - if(curlump->next == NULL) { - free_wadfile(wfptr); - return NULL; - } - curlump = curlump->next; - curlump->next = NULL; - - /* Allocate memory for the lump info */ - curlump->cl = malloc(sizeof(struct lump)); - if(curlump->cl == NULL) { - free_wadfile(wfptr); - return NULL; - } - - /* Seek to the proper position in the file */ - if(fseek(fpoint, diroffset + (count * DIRENTRYLEN), SEEK_SET) != 0) { - free_wadfile(wfptr); - return NULL; - } - - /* Read offset of lump data */ - if(fread(&lumpdataoffset, 4, 1, fpoint) < 1) { - free_wadfile(wfptr); - return NULL; - } - - /* Read size of lump in bytes */ - if(fread(&(curlump->cl->len), 4, 1, fpoint) < 1) { - free_wadfile(wfptr); - return NULL; - } - - /* Read lump name */ - if(fread(curlump->cl->name, 8, 1, fpoint) < 1) { - free_wadfile(wfptr); - return NULL; - } - - /* Read actual lump data, unless lump size is 0 */ - if(curlump->cl->len > 0) { - if(fseek(fpoint, lumpdataoffset, SEEK_SET) != 0) { - free_wadfile(wfptr); - return NULL; - } - - /* Allocate memory for data */ - curlump->cl->data = malloc(curlump->cl->len); - if(curlump->cl->data == NULL) { - free_wadfile(wfptr); - return NULL; - } - - /* Fill the data buffer */ - if(fread(curlump->cl->data, curlump->cl->len, 1, fpoint) < 1) { - free_wadfile(wfptr); - return NULL; - } - } else curlump->cl->data = NULL; - } /* End of directory reading loop */ - - return wfptr; -} - -/* Free a wadfile from memory as well as all related structures. - */ -void free_wadfile(struct wadfile *wfptr) { - struct lumplist *curlump, *nextlump; - - if(wfptr == NULL) return; - curlump = wfptr->head; - - /* Free items in the lump list */ - while(curlump != NULL) { - - /* Free the actual lump and its data, if necessary */ - if(curlump->cl != NULL) { - if(curlump->cl->data != NULL) free(curlump->cl->data); - free(curlump->cl); - } - - /* Advance to next lump and free this one */ - nextlump = curlump->next; - free(curlump); - curlump = nextlump; - } - - free(wfptr); -} - -/* Write complete wadfile to a file stream, opened with "wb" mode. - * fpoint is the stream to write to. - * wfptr is a pointer to the wadfile structure to use. - * Return zero on success, nonzero on failure. - */ -int write_wadfile(FILE *fpoint, struct wadfile *wfptr) { - struct lumplist *curlump; - long lumpdataoffset, diroffset; - - if(wfptr == NULL) return 1; - - /* Write four-character ID ("PWAD" or "IWAD") */ - if(fwrite(wfptr->id, 4, 1, fpoint) < 1) return 2; - - /* Write number of lumps */ - if(fwrite(&(wfptr->numlumps), 4, 1, fpoint) < 1) return 3; - - /* Offset of directory is not known yet. For now, write number of lumps - * again, just to fill the space. - */ - if(fwrite(&(wfptr->numlumps), 4, 1, fpoint) < 1) return 4; - - /* Loop through lump list, writing lump data */ - for(curlump = wfptr->head; curlump != NULL; curlump = curlump->next) { - - /* Don't write anything for the head of the lump list or for lumps of - zero length */ - if(curlump->cl == NULL || curlump->cl->data == NULL) continue; - - /* Write the data */ - if(fwrite(curlump->cl->data, curlump->cl->len, 1, fpoint) < 1) - return 5; - } - - /* Current position is where directory will start */ - diroffset = ftell(fpoint); - - /* Offset for the first lump's data is always 12 */ - lumpdataoffset = 12; - - /* Loop through lump list again, this time writing directory entries */ - for(curlump = wfptr->head; curlump != NULL; curlump = curlump->next) { - - /* Don't write anything for the head of the lump list */ - if(curlump->cl == NULL) continue; - - /* Write offset for lump data */ - if(fwrite(&lumpdataoffset, 4, 1, fpoint) < 1) return 6; - - /* Write size of lump data */ - if(fwrite(&(curlump->cl->len), 4, 1, fpoint) < 1) return 7; - - /* Write lump name */ - if(fwrite(curlump->cl->name, 8, 1, fpoint) < 1) return 8; - - /* Increment lumpdataoffset variable as appropriate */ - lumpdataoffset += curlump->cl->len; - } - - /* Go back to header and write the proper directory offset */ - fseek(fpoint, 8, SEEK_SET); - if(fwrite(&diroffset, 4, 1, fpoint) < 1) return 9; - - return 0; -} - -/* Get the name of a lump, as a null-terminated string. - * item is a pointer to the lump (not lumplist) whose name will be obtained. - * Return NULL on error. - */ -char *get_lump_name(struct lump *item) { - char convname[9], *retname; - - if(item == NULL) return NULL; - memcpy(convname, item->name, 8); - convname[8] = '\0'; - - retname = malloc(strlen(convname) + 1); - if(retname != NULL) strcpy(retname, convname); - return retname; -} - -/* Find the lump after start and before end having a certain name. - * Return a pointer to the list item for that lump, or return NULL if no lump - * by that name is found or lumpname is too long. - * lumpname is a null-terminated string. - * If end parameter is NULL, search to the end of the entire list. - */ -struct lumplist *find_previous_lump(struct lumplist *start, struct lumplist - *end, char *lumpname) { - struct lumplist *curlump, *lastlump; - char *curname; - int found = 0; - - /* Verify that parameters are valid */ - if(start==NULL || start==end || lumpname==NULL || strlen(lumpname) > 8) - return NULL; - - /* Loop through the list from start parameter */ - lastlump = start; - for(curlump = start->next; curlump != end && curlump != NULL; - curlump = curlump->next) { - - /* Skip header lump */ - if(curlump->cl == NULL) continue; - - /* Find name of this lump */ - curname = get_lump_name(curlump->cl); - if(curname == NULL) continue; - - /* Compare names to see if this is the lump we want */ - if(strcmp(curname, lumpname) == 0) { - found = 1; - break; - } - - /* Free memory allocated to curname */ - free(curname); - - lastlump = curlump; - } - - if(found) return lastlump; - return NULL; -} - -/* Remove a lump from the list, free it, and free its data. - * before is the lump immediately preceding the lump to be removed. - * wfptr is a pointer to the wadfile structure to which the removed lump - * belongs, so that numlumps can be decreased. - */ -void remove_next_lump(struct wadfile *wfptr, struct lumplist *before) { - struct lumplist *removed; - - /* Verify that parameters are valid */ - if(before == NULL || before->next == NULL || wfptr == NULL) return; - - /* Update linked list to omit removed lump */ - removed = before->next; - before->next = removed->next; - - /* Free lump info and data if necessary */ - if(removed->cl != NULL) { - if(removed->cl->data != NULL) free(removed->cl->data); - free(removed->cl); - } - - free(removed); - - /* Decrement numlumps */ - wfptr->numlumps--; -} - -/* Add a lump. - * The lump will follow prev in the list and be named name, with a data size - * of len. - * A copy will be made of the data. - * Return zero on success or nonzero on failure. - */ -int add_lump(struct wadfile *wfptr, struct lumplist *prev, char *name, long - len, unsigned char *data) { - struct lump *newlump; - struct lumplist *newlumplist; - unsigned char *copydata; - - /* Verify that parameters are valid */ - if(wfptr == NULL || prev == NULL || name == NULL || strlen(name) > 8) - return 1; - - /* Allocate space for newlump and newlumplist */ - newlump = malloc(sizeof(struct lump)); - newlumplist = malloc(sizeof(struct lumplist)); - if(newlump == NULL || newlumplist == NULL) return 2; - - /* Copy lump data and set up newlump */ - if(len == 0 || data == NULL) { - newlump->len = 0; - newlump->data = NULL; - } else { - newlump->len = len; - copydata = malloc(len); - if(copydata == NULL) return 3; - memcpy(copydata, data, len); - newlump->data = copydata; - } - - /* Set name of newlump */ - memset(newlump->name, '\0', 8); - if(strlen(name) == 8) memcpy(newlump->name, name, 8); - else strcpy(newlump->name, name); - - /* Set up newlumplist and alter prev appropriately */ - newlumplist->cl = newlump; - newlumplist->next = prev->next; - prev->next = newlumplist; - - /* Increment numlumps */ - wfptr->numlumps++; - - return 0; -} - -/* Rename a lump. - * renamed is a pointer to the lump (not lumplist) that needs renaming. - * newname is a null-terminated string with the new name. - * Return zero on success or nonzero on failure. - */ -int rename_lump(struct lump *renamed, char *newname) { - - /* Verify that parameters are valid. */ - if(newname == NULL || renamed == NULL || strlen(newname) > 8) return 1; - - /* Do the renaming. */ - memset(renamed->name, '\0', 8); - if(strlen(newname) == 8) memcpy(renamed->name, newname, 8); - else strcpy(renamed->name, newname); - - return 0; -} - -/* Find the last lump in a wadfile structure. - * Return this lump or NULL on failure. - */ -struct lumplist *find_last_lump(struct wadfile *wfptr) { - struct lumplist *curlump; - - if(wfptr == NULL || wfptr->head == NULL) return NULL; - curlump = wfptr->head; - - while(curlump->next != NULL) curlump = curlump->next; - return curlump; -} - -/* Find the last lump between start and end. - * Return this lump or NULL on failure. - */ -struct lumplist *find_last_lump_between(struct lumplist *start, struct - lumplist *end) { - struct lumplist *curlump; - - if(start == NULL) return NULL; - curlump = start; - - while(curlump->next != end) { - curlump = curlump->next; - if(curlump == NULL) break; - } - - return curlump; -} - -/* Find the next section lump. A section lump is MAPxx (0 <= x <= 9), ExMy - * (0 <= x <= 9, 0 <= y <= 9), or any lump whose name ends in _START or _END. - * Return NULL if there are no section lumps after start. - */ -struct lumplist *find_next_section_lump(struct lumplist *start) { - struct lumplist *curlump, *found = NULL; - char *curname; - - /* Verify that parameter is valid */ - if(start == NULL || start->next == NULL) return NULL; - - /* Loop through the list from start parameter */ - for(curlump = start->next; curlump != NULL && found == NULL; - curlump = curlump->next) { - - /* Skip header lump */ - if(curlump->cl == NULL) continue; - - /* Find name of this lump */ - curname = get_lump_name(curlump->cl); - if(curname == NULL) continue; - - /* Check to see if this is a section lump */ - if(strlen(curname) == 5 && strncmp("MAP", curname, 3) == 0 && - isdigit(curname[3]) && isdigit(curname[4])) - found = curlump; - else if(strlen(curname) == 4 && curname[0] == 'E' && curname[2] == - 'M' && isdigit(curname[1]) && isdigit(curname[3])) - found = curlump; - else if(strlen(curname) == 7 && strcmp("_START", &curname[1]) == 0) - found = curlump; - else if(strlen(curname) == 8 && strcmp("_START", &curname[2]) == 0) - found = curlump; - else if(strlen(curname) == 5 && strcmp("_END", &curname[1]) == 0) - found = curlump; - else if(strlen(curname) == 6 && strcmp("_END", &curname[2]) == 0) - found = curlump; - - /* Free memory allocated to curname */ - free(curname); - } - - return found; -} diff --git a/tools/lumpmod/lump.h b/tools/lumpmod/lump.h deleted file mode 100644 index 88e478716..000000000 --- a/tools/lumpmod/lump.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - LumpMod v0.2.1, a command-line utility for working with lumps in wad - files. - Copyright (C) 2003 Thunder Palace Entertainment. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - lump.h: Defines constants, structures, and functions used in lump.c -*/ - -#ifndef __LUMP_H -#define __LUMP_H - -/* Entries in the wadfile directory are 16 bytes */ -#define DIRENTRYLEN 16 - -/* Lumps and associated info */ -struct lump { - long len; - unsigned char *data; - char name[8]; -}; - -/* Linked list of lumps */ -struct lumplist { - struct lump *cl; /* actual content of the lump */ - struct lumplist *next; -}; - -/* Structure to contain all wadfile data */ -struct wadfile { - char id[4]; /* IWAD or PWAD */ - long numlumps; /* 32-bit integer */ - struct lumplist *head; /* points to first entry */ -}; - -/* Function declarations */ -struct wadfile *read_wadfile(FILE *); -void free_wadfile(struct wadfile *); -int write_wadfile(FILE *, struct wadfile *); -char *get_lump_name(struct lump *); -struct lumplist *find_previous_lump(struct lumplist *, struct lumplist *, char *); -void remove_next_lump(struct wadfile *, struct lumplist *); -int add_lump(struct wadfile *, struct lumplist *, char *, long, unsigned char *); -int rename_lump(struct lump *, char *); -struct lumplist *find_last_lump(struct wadfile *); -struct lumplist *find_last_lump_between(struct lumplist *, struct lumplist *); -struct lumplist *find_next_section_lump(struct lumplist *); - -#endif diff --git a/tools/lumpmod/lumpmod.c b/tools/lumpmod/lumpmod.c deleted file mode 100644 index e9042615e..000000000 --- a/tools/lumpmod/lumpmod.c +++ /dev/null @@ -1,785 +0,0 @@ -/* - LumpMod v0.2.1, a command-line utility for working with lumps in wad - files. - Copyright (C) 2003 Thunder Palace Entertainment. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - lumpmod.c: Provides program functionality; depends on lump.c and lump.h -*/ - -#include -#include -#include -#include "lump.h" - -int main(int argc, char *argv[]) { - enum commands { C_ADD, C_ADDSECT, C_DELETE, C_DELSECT, C_EXTRACT, C_LIST, - C_RENAME, C_UPDATE } cmd; - struct wadfile *wfptr; - struct lumplist *startitem, *enditem = NULL; - FILE *fpoint; - char *progname, **params; - char *startname = NULL, *endname = NULL; - int numargs, numparams, insection = 0; - - progname = argv[0]; - numargs = argc - 1; - - /* Verify that there are enough arguments */ - if(numargs < 2) { - fprintf(stderr, "%s: not enough arguments\n", progname); - return EXIT_FAILURE; - } - - /* Identify the command used */ - if(strcmp(argv[2], "add" ) == 0) cmd = C_ADD; - else if(strcmp(argv[2], "addsect") == 0) cmd = C_ADDSECT; - else if(strcmp(argv[2], "delete" ) == 0) cmd = C_DELETE; - else if(strcmp(argv[2], "delsect") == 0) cmd = C_DELSECT; - else if(strcmp(argv[2], "extract") == 0) cmd = C_EXTRACT; - else if(strcmp(argv[2], "list" ) == 0) cmd = C_LIST; - else if(strcmp(argv[2], "rename" ) == 0) cmd = C_RENAME; - else if(strcmp(argv[2], "update" ) == 0) cmd = C_UPDATE; - else { - fprintf(stderr, "%s: invalid command %s\n", progname, argv[2]); - return EXIT_FAILURE; - } - - /* Check for -s option */ - if(numargs >= 4 && strcmp(argv[3], "-s") == 0) { - if(cmd == C_ADDSECT || cmd == C_DELSECT) { - fprintf(stderr, "%s: no option -s for command %s\n", progname, argv[2]); - return EXIT_FAILURE; - } - insection = 1; - params = &argv[5]; - numparams = numargs - 4; - - /* Assume a map name if length > 2 */ - if(strlen(argv[4]) > 2) startname = argv[4]; - else { - startname = malloc(strlen(argv[4]) + 7); - endname = malloc(strlen(argv[4]) + 5); - if(startname == NULL || endname == NULL) { - fprintf(stderr, "%s: out of memory\n", progname); - return EXIT_FAILURE; - } - sprintf(startname, "%s_START", argv[4]); - sprintf(endname, "%s_END", argv[4]); - } - } else { - params = &argv[3]; - numparams = numargs - 2; - } /* end of check for -s option */ - - /* Load the wadfile into memory, since all commands require this */ - fpoint = fopen(argv[1], "rb"); - if(fpoint == NULL) { - fprintf(stderr, "%s: unable to open file %s\n", progname, argv[1]); - return EXIT_FAILURE; - } - wfptr = read_wadfile(fpoint); - fclose(fpoint); - if(wfptr == NULL) { - fprintf(stderr, "%s: %s is not a valid wadfile\n", progname, argv[1]); - return EXIT_FAILURE; - } - - /* Find startitem and enditem, using startname and endname */ - if(startname == NULL) startitem = wfptr->head; - else { - startitem = find_previous_lump(wfptr->head, NULL, startname); - if(startitem == NULL) { - fprintf(stderr, "%s: can't find lump %s in %s", progname, - startname, argv[1]); - return EXIT_FAILURE; - } - startitem = startitem->next; - if(endname == NULL) { - if(startitem->next != NULL) { - char *itemname; - - enditem = startitem->next; - itemname = get_lump_name(enditem->cl); - while( strcmp(itemname, "THINGS" ) == 0 || - strcmp(itemname, "LINEDEFS") == 0 || - strcmp(itemname, "SIDEDEFS") == 0 || - strcmp(itemname, "VERTEXES") == 0 || - strcmp(itemname, "SEGS" ) == 0 || - strcmp(itemname, "SSECTORS") == 0 || - strcmp(itemname, "NODES" ) == 0 || - strcmp(itemname, "SECTORS" ) == 0 || - strcmp(itemname, "REJECT" ) == 0 || - strcmp(itemname, "BLOCKMAP") == 0) { - enditem = enditem->next; - if(enditem == NULL) break; - free(itemname); - itemname = get_lump_name(enditem->cl); - } - free(itemname); - if(enditem != NULL) enditem = enditem->next; - } else enditem = NULL; - } else { - enditem = find_previous_lump(startitem, NULL, endname); - if(enditem == NULL) { - fprintf(stderr, "%s: can't find lump %s in %s", progname, - endname, argv[1]); - return EXIT_FAILURE; - } - enditem = enditem->next; - } - } /* end of finding startitem and enditem */ - - /* Do stuff specific to each command */ - switch(cmd) { - case C_ADD: { - struct lumplist *startitem2, *before, *existing; - int overwrite = 1, firstentry = 0, canduplicate = 0; - char *startname2 = NULL; - - /* Parse options: -a, -b, -d, -n */ - while(numparams > 2) { - if(params[0][0] != '-') break; - if(strcmp(params[0], "-n") == 0) overwrite = 0; - else if(strcmp(params[0], "-d") == 0) canduplicate = 1; - else if(strcmp(params[0], "-b") == 0) firstentry = 1; - else if(strcmp(params[0], "-a") == 0) { - params = ¶ms[1]; - numparams--; - startname2 = params[0]; - } else { - fprintf(stderr, "%s: no option %s for command %s", - progname, params[0], argv[2]); - return EXIT_FAILURE; - } - params = ¶ms[1]; - numparams--; - } - - if(numparams < 2) { - fprintf(stderr, "%s: not enough parameters for %s", progname, - argv[2]); - return EXIT_FAILURE; - } - - /* Find the lump after which to add */ - if(firstentry) before = startitem; - else if(startname2 != NULL) { - before = find_previous_lump(startitem, enditem, startname2); - if(before == NULL) { - fprintf(stderr, "%s: can't find lump %s in %s", progname, - startname2, argv[1]); - return EXIT_FAILURE; - } - before = before->next; - } else { - if(insection) { - before = find_last_lump_between(startitem, enditem); - if(before == NULL) before = startitem; - } else before = find_last_lump(wfptr); - } - startitem2 = before; - - /* Add LUMPNAME FILENAME pairs */ - printf("Adding lumps in %s...\n", argv[1]); - for(;;) { - long newlumpsize; - unsigned char *newlumpdata; - - /* Check whether the lump already exists, unless -d is used */ - if(canduplicate) existing = NULL; - else existing = find_previous_lump(startitem, enditem, params[0]); - if(existing != NULL) existing = existing->next; - if(existing != NULL && overwrite == 0) { - printf("Lump %s already exists. Taking no action.\n", params[0]); - numparams -= 2; - if(numparams < 2) break; - params = ¶ms[2]; - continue; - } - - /* Read the file with new lump data */ - fpoint = fopen(params[1], "rb"); - if(fpoint == NULL) { - fprintf(stderr, "%s: can't open file %s\n", progname, - params[1]); - return EXIT_FAILURE; - } - - /* Find size of lump data */ - fseek(fpoint, 0, SEEK_END); - newlumpsize = ftell(fpoint); - fseek(fpoint, 0, SEEK_SET); - - /* Copy lump data to memory */ - if(newlumpsize == 0) newlumpdata = NULL; - else { - newlumpdata = malloc(newlumpsize); - if(newlumpdata == NULL) { - fprintf(stderr, "%s: out of memory\n", progname); - return EXIT_FAILURE; - } - if(fread(newlumpdata, newlumpsize, 1, fpoint) < 1) { - fprintf(stderr, "%s: unable to read file %s\n", - progname, params[1]); - return EXIT_FAILURE; - } - } - - /* Close the file */ - fclose(fpoint); - - /* Add or update lump */ - if(existing == NULL) { - if(add_lump(wfptr, before, params[0], newlumpsize, - newlumpdata) != 0) { - fprintf(stderr, "%s: unable to add lump %s\n", - progname, params[0]); - return EXIT_FAILURE; - } - printf("Lump %s added.\n", params[0]); - - /* Other lumps will be added after the new one */ - before = before->next; - } else { - existing->cl->len = newlumpsize; - free(existing->cl->data); - existing->cl->data = malloc(newlumpsize); - if(existing->cl->data == NULL) { - fprintf(stderr, "%s: out of memory\n", progname); - return EXIT_FAILURE; - } - memcpy(existing->cl->data, newlumpdata, newlumpsize); - printf("Lump %s updated.\n", params[0]); - } - - /* Advance to the next pair, if there is a next pair */ - numparams -= 2; - if(numparams < 2) break; - params = ¶ms[2]; - } /* end of adding LUMPNAME FILENAME pairs */ - - /* Save the modified wadfile */ - fpoint = fopen(argv[1], "wb"); - if(fpoint == NULL) { - fprintf(stderr, "%s: unable to open file %s for writing\n", - progname, argv[1]); - return EXIT_FAILURE; - } - if(write_wadfile(fpoint, wfptr) != 0) { - fprintf(stderr, "%s: unable to write wadfile to disk\n", - progname); - return EXIT_FAILURE; - } - fclose(fpoint); - printf("File %s successfully updated.\n", argv[1]); - } /* end of C_ADD */ - break; - - case C_UPDATE: { - struct lumplist *existing; - - /* Parse options (none) */ - if(numparams > 2 && params[0][0] == '-') { - fprintf(stderr, "%s: no option %s for command %s", - progname, params[0], argv[2]); - return EXIT_FAILURE; - } - - if(numparams < 2) { - fprintf(stderr, "%s: not enough parameters for %s", progname, - argv[2]); - return EXIT_FAILURE; - } - - /* Update LUMPNAME FILENAME pairs */ - printf("Updating lumps in %s...\n", argv[1]); - for(;;) { - long newlumpsize; - unsigned char *newlumpdata; - - /* Check whether the lump already exists */ - existing = find_previous_lump(startitem, enditem, params[0]); - if(existing == NULL) { - printf("Lump %s does not exist. Taking no action.\n", - params[0]); - numparams -= 2; - if(numparams < 2) break; - params = ¶ms[2]; - continue; - } - existing = existing->next; - - /* Read the file with new lump data */ - fpoint = fopen(params[1], "rb"); - if(fpoint == NULL) { - fprintf(stderr, "%s: can't open file %s\n", progname, - params[1]); - return EXIT_FAILURE; - } - - /* Find size of lump data */ - fseek(fpoint, 0, SEEK_END); - newlumpsize = ftell(fpoint); - fseek(fpoint, 0, SEEK_SET); - - /* Copy lump data to memory */ - if(newlumpsize == 0) newlumpdata = NULL; - else { - newlumpdata = malloc(newlumpsize); - if(newlumpdata == NULL) { - fprintf(stderr, "%s: out of memory\n", progname); - return EXIT_FAILURE; - } - if(fread(newlumpdata, newlumpsize, 1, fpoint) < 1) { - fprintf(stderr, "%s: unable to read file %s\n", - progname, params[1]); - return EXIT_FAILURE; - } - } - - /* Close the file */ - fclose(fpoint); - - /* Update lump */ - existing->cl->len = newlumpsize; - free(existing->cl->data); - existing->cl->data = malloc(newlumpsize); - if(existing->cl->data == NULL) { - fprintf(stderr, "%s: out of memory\n", progname); - return EXIT_FAILURE; - } - memcpy(existing->cl->data, newlumpdata, newlumpsize); - printf("Lump %s updated.\n", params[0]); - - /* Advance to the next pair, if there is a next pair */ - numparams -= 2; - if(numparams < 2) break; - params = ¶ms[2]; - } /* end of updating LUMPNAME FILENAME pairs */ - - /* Save the modified wadfile */ - fpoint = fopen(argv[1], "wb"); - if(fpoint == NULL) { - fprintf(stderr, "%s: unable to open file %s for writing\n", - progname, argv[1]); - return EXIT_FAILURE; - } - if(write_wadfile(fpoint, wfptr) != 0) { - fprintf(stderr, "%s: unable to write wadfile to disk\n", - progname); - return EXIT_FAILURE; - } - fclose(fpoint); - printf("File %s successfully updated.\n", argv[1]); - } /* end of C_UPDATE */ - break; - - case C_DELETE: { - struct lumplist *before; - - /* Parse options (none) */ - if(numparams > 1 && params[0][0] == '-') { - fprintf(stderr, "%s: no option %s for command %s", - progname, params[0], argv[2]); - return EXIT_FAILURE; - } - - if(numparams < 1) { - fprintf(stderr, "%s: not enough parameters for %s", progname, - argv[2]); - return EXIT_FAILURE; - } - - /* Delete LUMPNAME lumps */ - printf("Deleting lumps in %s...\n", argv[1]); - for(;;) { - - /* Find the lump to delete */ - before = find_previous_lump(startitem, enditem, params[0]); - if(before == NULL) { - printf("Lump %s does not exist. Taking no action.\n", - params[0]); - numparams--; - if(numparams < 1) break; - params = ¶ms[1]; - continue; - } - - /* Delete it */ - remove_next_lump(wfptr, before); - printf("Lump %s deleted.\n", params[0]); - - /* Advance to the next item to delete, if there is one */ - numparams--; - if(numparams < 1) break; - params = ¶ms[1]; - } /* end of deleting LUMPNAME lumps */ - - /* Save the modified wadfile */ - fpoint = fopen(argv[1], "wb"); - if(fpoint == NULL) { - fprintf(stderr, "%s: unable to open file %s for writing\n", - progname, argv[1]); - return EXIT_FAILURE; - } - if(write_wadfile(fpoint, wfptr) != 0) { - fprintf(stderr, "%s: unable to write wadfile to disk\n", - progname); - return EXIT_FAILURE; - } - fclose(fpoint); - printf("File %s successfully updated.\n", argv[1]); - } /* end of C_DELETE */ - break; - - case C_RENAME: { - struct lumplist *renamed; - - /* Parse options (none) */ - if(numparams > 2 && params[0][0] == '-') { - fprintf(stderr, "%s: no option %s for command %s", - progname, params[0], argv[2]); - return EXIT_FAILURE; - } - - if(numparams < 2) { - fprintf(stderr, "%s: not enough parameters for %s", progname, - argv[2]); - return EXIT_FAILURE; - } - - /* Rename OLDNAME NEWNAME pairs */ - printf("Renaming lumps in %s...\n", argv[1]); - for(;;) { - - /* Find the lump to rename */ - renamed = find_previous_lump(startitem, enditem, params[0]); - if(renamed == NULL) { - printf("Lump %s does not exist. Taking no action.\n", - params[0]); - numparams -= 2; - if(numparams < 2) break; - params = ¶ms[2]; - continue; - } - renamed = renamed->next; - - /* Rename lump */ - memset(renamed->cl->name, '\0', 8); - if(strlen(params[1]) >= 8) memcpy(renamed->cl->name, - params[1], 8); - else strcpy(renamed->cl->name, params[1]); - - printf("Lump %s renamed to %s.\n", params[0], params[1]); - - /* Advance to the next pair, if there is a next pair */ - numparams -= 2; - if(numparams < 2) break; - params = ¶ms[2]; - } /* end of renaming OLDNAME NEWNAME pairs */ - - /* Save the modified wadfile */ - fpoint = fopen(argv[1], "wb"); - if(fpoint == NULL) { - fprintf(stderr, "%s: unable to open file %s for writing\n", - progname, argv[1]); - return EXIT_FAILURE; - } - if(write_wadfile(fpoint, wfptr) != 0) { - fprintf(stderr, "%s: unable to write wadfile to disk\n", - progname); - return EXIT_FAILURE; - } - fclose(fpoint); - printf("File %s successfully updated.\n", argv[1]); - } /* end of C_RENAME */ - break; - - case C_EXTRACT: { - struct lumplist *extracted; - - /* Parse options (none) */ - if(numparams > 2 && params[0][0] == '-') { - fprintf(stderr, "%s: no option %s for command %s", - progname, params[0], argv[2]); - return EXIT_FAILURE; - } - - if(numparams < 2) { - fprintf(stderr, "%s: not enough parameters for %s", progname, - argv[2]); - return EXIT_FAILURE; - } - - /* Extract LUMPNAME FILENAME pairs */ - printf("Extracting lumps from %s...\n", argv[1]); - for(;;) { - - /* Find the lump to extract */ - extracted = find_previous_lump(startitem, enditem, params[0]); - if(extracted == NULL) { - printf("Lump %s does not exist. Taking no action.\n", - params[0]); - numparams -= 2; - if(numparams < 2) break; - params = ¶ms[2]; - continue; - } - extracted = extracted->next; - - /* Open the file to extract to */ - fpoint = fopen(params[1], "wb"); - if(fpoint == NULL) { - fprintf(stderr, "%s: can't open file %s for writing\n", - progname, params[1]); - return EXIT_FAILURE; - } - - /* Extract lump */ - if(fwrite(extracted->cl->data, extracted->cl->len, 1, fpoint) - < 1) { - fprintf(stderr, "%s: unable to write lump %s to disk\n", - progname, params[0]); - return EXIT_FAILURE; - } - - /* Close the file */ - fclose(fpoint); - printf("Lump %s saved as %s.\n", params[0], params[1]); - - /* Advance to the next pair, if there is a next pair */ - numparams -= 2; - if(numparams < 2) break; - params = ¶ms[2]; - } /* end of extracting LUMPNAME FILENAME pairs */ - - printf("Finished extracting lumps from file %s.\n", argv[1]); - } /* end of C_EXTRACT */ - break; - - case C_LIST: { - struct lumplist *curlump; - int verbose = 0, i = 0; - - /* Parse options: -v */ - while(numparams > 0) { - if(params[0][0] != '-') break; - if(strcmp(params[0], "-v") == 0) verbose = 1; - else { - fprintf(stderr, "%s: no option %s for command %s", - progname, params[0], argv[2]); - return EXIT_FAILURE; - } - params = ¶ms[1]; - numparams--; - } - - /* Loop through the lump list, printing lump info */ - for(curlump = startitem->next; curlump != enditem; curlump = - curlump->next) { - i++; - if(verbose) printf("%5i %-8s %7li\n", i, - get_lump_name(curlump->cl), curlump->cl->len); - else printf("%s\n", get_lump_name(curlump->cl)); - } - } /* end of C_LIST */ - break; - - case C_DELSECT: { - - /* Parse options (none) */ - if(numparams > 1 && params[0][0] == '-') { - fprintf(stderr, "%s: no option %s for command %s", - progname, params[0], argv[2]); - return EXIT_FAILURE; - } - - if(numparams < 1) { - fprintf(stderr, "%s: not enough parameters for %s", progname, - argv[2]); - return EXIT_FAILURE; - } - - /* Delete sections */ - printf("Deleting sections in %s...\n", argv[1]); - for(;;) { - struct lumplist *curlump; - - /* Assume a map name if length > 2 */ - if(strlen(params[0]) > 2) startname = params[0]; - else { - startname = malloc(strlen(params[0]) + 7); - endname = malloc(strlen(params[0]) + 5); - if(startname == NULL || endname == NULL) { - fprintf(stderr, "%s: out of memory\n", progname); - return EXIT_FAILURE; - } - sprintf(startname, "%s_START", params[0]); - sprintf(endname, "%s_END", params[0]); - } - - /* Find startitem and enditem, using startname and endname */ - startitem = find_previous_lump(wfptr->head, NULL, startname); - if(startitem == NULL) { - fprintf(stderr, "%s: can't find lump %s in %s", progname, - startname, argv[1]); - return EXIT_FAILURE; - } - if(endname == NULL && startitem->next != NULL) { - char *itemname; - - enditem = startitem->next; - itemname = get_lump_name(enditem->cl); - do { - enditem = enditem->next; - if(enditem == NULL) break; - free(itemname); - itemname = get_lump_name(enditem->cl); - } while(strcmp(itemname, "THINGS" ) == 0 || - strcmp(itemname, "LINEDEFS") == 0 || - strcmp(itemname, "SIDEDEFS") == 0 || - strcmp(itemname, "VERTEXES") == 0 || - strcmp(itemname, "SEGS" ) == 0 || - strcmp(itemname, "SSECTORS") == 0 || - strcmp(itemname, "NODES" ) == 0 || - strcmp(itemname, "SECTORS" ) == 0 || - strcmp(itemname, "REJECT" ) == 0 || - strcmp(itemname, "BLOCKMAP") == 0); - free(itemname); - } - else { - enditem = find_previous_lump(startitem, NULL, endname); - if(enditem == NULL) { - fprintf(stderr, "%s: can't find lump %s in %s", - progname, endname, argv[1]); - return EXIT_FAILURE; - } - enditem = enditem->next->next; - } /* end of finding startitem and enditem */ - - /* Loop through the section lumps, deleting them */ - curlump = startitem; - while(curlump->next != enditem) - remove_next_lump(wfptr, curlump); - printf("Deleted section %s.\n", params[0]); - - /* Move to next parameter, if it exists */ - numparams--; - if(numparams < 1) break; - params = ¶ms[1]; - } /* end of deleting sections */ - - /* Save the modified wadfile */ - fpoint = fopen(argv[1], "wb"); - if(fpoint == NULL) { - fprintf(stderr, "%s: unable to open file %s for writing\n", - progname, argv[1]); - return EXIT_FAILURE; - } - if(write_wadfile(fpoint, wfptr) != 0) { - fprintf(stderr, "%s: unable to write wadfile to disk\n", - progname); - return EXIT_FAILURE; - } - fclose(fpoint); - printf("File %s successfully updated.\n", argv[1]); - } /* end of C_DELSECT */ - break; - - case C_ADDSECT: { - - /* Parse options (none) */ - if(numparams > 1 && params[0][0] == '-') { - fprintf(stderr, "%s: no option %s for command %s", - progname, params[0], argv[2]); - return EXIT_FAILURE; - } - - if(numparams < 1) { - fprintf(stderr, "%s: not enough parameters for %s", progname, - argv[2]); - return EXIT_FAILURE; - } - - /* Add sections */ - printf("Adding sections in %s...\n", argv[1]); - for(;;) { - struct lumplist *curlump; - - /* Assume a map name if length > 2 */ - if(strlen(params[0]) > 2) startname = params[0]; - else { - startname = malloc(strlen(params[0]) + 7); - endname = malloc(strlen(params[0]) + 5); - if(startname == NULL || endname == NULL) { - fprintf(stderr, "%s: out of memory\n", progname); - return EXIT_FAILURE; - } - sprintf(startname, "%s_START", params[0]); - sprintf(endname, "%s_END", params[0]); - } - - /* Add section, unless it already exists */ - if(find_previous_lump(wfptr->head, NULL, startname) == NULL) { - struct lumplist *last; - - last = find_last_lump(wfptr); - if(add_lump(wfptr, last, startname, 0, NULL) != 0) { - fprintf(stderr, "%s: unable to add lump %s\n", - progname, startname); - return EXIT_FAILURE; - } - - if(endname != NULL) { - last = last->next; - if(add_lump(wfptr, last, endname, 0, NULL) != 0) { - fprintf(stderr, "%s: unable to add lump %s\n", - progname, endname); - return EXIT_FAILURE; - } - } - - printf("Added section %s.\n", params[0]); - } else - printf("Section %s already exists. Taking no action.\n", - params[0]); - - /* Move to next parameter, if it exists */ - numparams--; - if(numparams < 1) break; - params = ¶ms[1]; - } /* end of adding sections */ - - /* Save the modified wadfile */ - fpoint = fopen(argv[1], "wb"); - if(fpoint == NULL) { - fprintf(stderr, "%s: unable to open file %s for writing\n", - progname, argv[1]); - return EXIT_FAILURE; - } - if(write_wadfile(fpoint, wfptr) != 0) { - fprintf(stderr, "%s: unable to write wadfile to disk\n", - progname); - return EXIT_FAILURE; - } - fclose(fpoint); - printf("File %s successfully updated.\n", argv[1]); - } /* end of C_ADDSECT */ - } /* end of command-specific stuff */ - - return EXIT_SUCCESS; -} diff --git a/tools/lumpmod/lumpmod.html b/tools/lumpmod/lumpmod.html deleted file mode 100644 index 082784178..000000000 --- a/tools/lumpmod/lumpmod.html +++ /dev/null @@ -1,82 +0,0 @@ - - - - -LumpMod v0.2.1 Documentation -

LumpMod v0.2.1

-

LumpMod is a small command-line utility for working with lumps in wad -files in the format used by DOOM and DOOM 2. It can add, delete, extract, -rename, list, and update individual lumps. It can also add sections -(XX_START and XX_END, for instance) and delete entire sections.

-

Usage

-

lumpmod [wadfile] [command] [-s section] [parameters]

-

Sections are MAPxx (xx = 01-99, where that map exists in the file), ExMy -(x, y = 1-9, where that map exists in the file), and anything else will be -the section between WHATEVER_START and WHATEVER_END. Sections that do not -exist in the wad file cannot be used. The section part can be left out to -work with the whole file. Any section specified here while using the addsect -or delsect commands will cause an error.

-

Note that the []... parameters in the command listings can be repeated. -For example, you can use lumpmod clowns.wad add CLOWNS clowns.lmp to -add a CLOWNS lump, or lumpmod clowns.wad add CLOWN1 clown1.lmp CLOWN2 -clown2.lmp to add two clown-related lumps.

-

Note also that lump names and commands are case sensitive. There is an -update command, but no UPDATE command.

-

Commands

-

add [-a lumpname] [-b] [-d] [-n] [LUMPNAME FILENAME]...

-

Add a lump to the end of the wad, or after the lump specified with the -a -option. If the lump already exists, it will be overwritten (with its position -unchanged) unless the -n option is specified, in which case no action will be -taken, or the -d option is specified, in which case an additional lump with -the same name will be added. If the lump specified in the -a option does not -exist, an error will occur. The -b option will add the lump at the beginning, -overriding the -a option.

-

addsect [SECTNAME]...

-

Add a section. The name must be one or two characters long. If section -name is HX, zero-length entries HX_START and HX_END will be added to the end -of the wad file. If this section already exists, no action will be taken.

-

delete [LUMPNAME]...

-

Remove LUMPNAME from the wad.

-

delsect [SECTNAME]...

-

Delete a section and anything inside it. If the section doesn't exist, no -action will be taken.

-

extract [LUMPNAME FILENAME]...

-

Save the contents of LUMPNAME to the file named FILENAME. (Wad file will -not be changed in any way.)

-

list [-v]

-

List all lumps in the wad, in the order they appear in the directory. -With the -v option, include numbers and lump lengths.

-

rename [OLDNAME NEWNAME]...

-

Rename a lump in the wad.

-

update [LUMPNAME FILENAME]...

-

Update LUMPNAME with the contents of FILENAME. If no lump named LUMPNAME -exists in the wad, no action will be taken.

-

Changes

-

Version 0.2.1 adds the -d option to the add command.

-

Version 0.2 contains a fix to a bug involving empty sections. The initial -public release was version 0.1.

-

Bugs

-

LumpMod currently chokes on completely empty wad files (i.e., those that -contain absolutely no lumps). Let me know if you find any other bugs.

-

Author

-

Catatonic Porpoise, <graue@oceanbase.org>. -Updates can be found at http://www.thunderpalace.com/software/.

-

Thanks

-

Thanks to Matthew S. Fell for writing "The Unofficial DOOM -Specs," which were very helpful in making this program.

-

License

-

Copyright © 2003 Thunder Palace Entertainment.

-

This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version.

-

This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details.

-

You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

- diff --git a/tools/masterserver/structure.sql b/tools/masterserver/structure.sql index 013c22383..d431419aa 100644 --- a/tools/masterserver/structure.sql +++ b/tools/masterserver/structure.sql @@ -90,7 +90,7 @@ CREATE TABLE `ms_versions` ( `mod_vstring` varchar(45) NOT NULL DEFAULT 'v1.0', `mod_codebase` int(10) unsigned NOT NULL DEFAULT 205, `mod_name` varchar(255) NOT NULL DEFAULT 'Default MOD Name', - `mod_url` text NOT NULL + `mod_url` text NOT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -- @@ -118,4 +118,4 @@ COMMIT; /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; \ No newline at end of file +/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;